From 92ad4a2399bb06b36b167a60c00d2299917fca9f Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Wed, 13 Sep 2023 20:58:23 +0000
Subject: [PATCH 001/112] 8315789: Minor HexFormat performance improvements

Reviewed-by: rriggs
---
 .../share/classes/java/util/HexFormat.java    |  73 ++++----
 .../bench/java/util/HexFormatBench.java       | 156 ++++++++++++++++++
 2 files changed, 201 insertions(+), 28 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/util/HexFormatBench.java

diff --git a/src/java.base/share/classes/java/util/HexFormat.java b/src/java.base/share/classes/java/util/HexFormat.java
index 8cc1a23b81a..107c362cbc2 100644
--- a/src/java.base/share/classes/java/util/HexFormat.java
+++ b/src/java.base/share/classes/java/util/HexFormat.java
@@ -140,14 +140,6 @@ public final class HexFormat {
     // Access to create strings from a byte array.
     private static final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
 
-    private static final byte[] UPPERCASE_DIGITS = {
-            '0', '1', '2', '3', '4', '5', '6', '7',
-            '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
-    };
-    private static final byte[] LOWERCASE_DIGITS = {
-            '0', '1', '2', '3', '4', '5', '6', '7',
-            '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
-    };
     // Analysis has shown that generating the whole array allows the JIT to generate
     // better code compared to a slimmed down array, such as one cutting off after 'f'
     private static final byte[] DIGITS = {
@@ -173,14 +165,22 @@ public final class HexFormat {
      * The hexadecimal characters are from lowercase alpha digits.
      */
     private static final HexFormat HEX_FORMAT =
-            new HexFormat("", "", "", LOWERCASE_DIGITS);
+            new HexFormat("", "", "", Case.LOWERCASE);
+
+    private static final HexFormat HEX_UPPER_FORMAT =
+            new HexFormat("", "", "", Case.UPPERCASE);
 
     private static final byte[] EMPTY_BYTES = {};
 
     private final String delimiter;
     private final String prefix;
     private final String suffix;
-    private final byte[] digits;
+    private final Case digitCase;
+
+    private enum Case {
+        LOWERCASE,
+        UPPERCASE
+    }
 
     /**
      * Returns a HexFormat with a delimiter, prefix, suffix, and array of digits.
@@ -188,14 +188,14 @@ public final class HexFormat {
      * @param delimiter a delimiter, non-null
      * @param prefix a prefix, non-null
      * @param suffix a suffix, non-null
-     * @param digits byte array of digits indexed by low nibble, non-null
+     * @param digitCase enum indicating how to case digits
      * @throws NullPointerException if any argument is null
      */
-    private HexFormat(String delimiter, String prefix, String suffix, byte[] digits) {
+    private HexFormat(String delimiter, String prefix, String suffix, Case digitCase) {
         this.delimiter = Objects.requireNonNull(delimiter, "delimiter");
         this.prefix = Objects.requireNonNull(prefix, "prefix");
         this.suffix = Objects.requireNonNull(suffix, "suffix");
-        this.digits = digits;
+        this.digitCase = digitCase;
     }
 
     /**
@@ -224,7 +224,7 @@ public static HexFormat of() {
      * @return a {@link HexFormat} with the delimiter and lowercase characters
      */
     public static HexFormat ofDelimiter(String delimiter) {
-        return new HexFormat(delimiter, "", "", LOWERCASE_DIGITS);
+        return new HexFormat(delimiter, "", "", Case.LOWERCASE);
     }
 
     /**
@@ -233,7 +233,7 @@ public static HexFormat ofDelimiter(String delimiter) {
      * @return a copy of this {@code HexFormat} with the delimiter
      */
     public HexFormat withDelimiter(String delimiter) {
-        return new HexFormat(delimiter, this.prefix, this.suffix, this.digits);
+        return new HexFormat(delimiter, this.prefix, this.suffix, this.digitCase);
     }
 
     /**
@@ -243,7 +243,7 @@ public HexFormat withDelimiter(String delimiter) {
      * @return a copy of this {@code HexFormat} with the prefix
      */
     public HexFormat withPrefix(String prefix) {
-        return new HexFormat(this.delimiter, prefix, this.suffix, this.digits);
+        return new HexFormat(this.delimiter, prefix, this.suffix, this.digitCase);
     }
 
     /**
@@ -253,7 +253,7 @@ public HexFormat withPrefix(String prefix) {
      * @return a copy of this {@code HexFormat} with the suffix
      */
     public HexFormat withSuffix(String suffix) {
-        return new HexFormat(this.delimiter, this.prefix, suffix, this.digits);
+        return new HexFormat(this.delimiter, this.prefix, suffix, this.digitCase);
     }
 
     /**
@@ -263,7 +263,9 @@ public HexFormat withSuffix(String suffix) {
      * @return a copy of this {@code HexFormat} with uppercase hexadecimal characters
      */
     public HexFormat withUpperCase() {
-        return new HexFormat(this.delimiter, this.prefix, this.suffix, UPPERCASE_DIGITS);
+        if (this == HEX_FORMAT)
+            return HEX_UPPER_FORMAT;
+        return new HexFormat(this.delimiter, this.prefix, this.suffix, Case.UPPERCASE);
     }
 
     /**
@@ -273,7 +275,7 @@ public HexFormat withUpperCase() {
      * @return a copy of this {@code HexFormat} with lowercase hexadecimal characters
      */
     public HexFormat withLowerCase() {
-        return new HexFormat(this.delimiter, this.prefix, this.suffix, LOWERCASE_DIGITS);
+        return new HexFormat(this.delimiter, this.prefix, this.suffix, Case.LOWERCASE);
     }
 
     /**
@@ -311,7 +313,7 @@ public String suffix() {
      *          otherwise {@code false}
      */
     public boolean isUpperCase() {
-        return Arrays.equals(digits, UPPERCASE_DIGITS);
+        return digitCase == Case.UPPERCASE;
     }
 
     /**
@@ -401,16 +403,17 @@ public <A extends Appendable> A formatHex(A out, byte[] bytes, int fromIndex, in
         int length = toIndex - fromIndex;
         if (length > 0) {
             try {
-                String between = suffix + delimiter + prefix;
                 out.append(prefix);
                 toHexDigits(out, bytes[fromIndex]);
-                if (between.isEmpty()) {
+                if (suffix.isEmpty() && delimiter.isEmpty() && prefix.isEmpty()) {
                     for (int i = 1; i < length; i++) {
                         toHexDigits(out, bytes[fromIndex + i]);
                     }
                 } else {
                     for (int i = 1; i < length; i++) {
-                        out.append(between);
+                        out.append(suffix);
+                        out.append(delimiter);
+                        out.append(prefix);
                         toHexDigits(out, bytes[fromIndex + i]);
                     }
                 }
@@ -631,7 +634,14 @@ private static String escapeNL(String string) {
      * @return the hexadecimal character for the low 4 bits {@code 0-3} of the value
      */
     public char toLowHexDigit(int value) {
-        return (char)digits[value & 0xf];
+        value = value & 0xf;
+        if (value < 10) {
+            return (char)('0' + value);
+        }
+        if (digitCase == Case.LOWERCASE) {
+            return (char)('a' - 10 + value);
+        }
+        return (char)('A' - 10 + value);
     }
 
     /**
@@ -645,7 +655,14 @@ public char toLowHexDigit(int value) {
      * @return the hexadecimal character for the bits {@code 4-7} of the value
      */
     public char toHighHexDigit(int value) {
-        return (char)digits[(value >> 4) & 0xf];
+        value = (value >> 4) & 0xf;
+        if (value < 10) {
+            return (char)('0' + value);
+        }
+        if (digitCase == Case.LOWERCASE) {
+            return (char)('a' - 10 + value);
+        }
+        return (char)('A' - 10 + value);
     }
 
     /**
@@ -1052,7 +1069,7 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass())
             return false;
         HexFormat otherHex = (HexFormat) o;
-        return Arrays.equals(digits, otherHex.digits) &&
+        return digitCase == otherHex.digitCase &&
                 delimiter.equals(otherHex.delimiter) &&
                 prefix.equals(otherHex.prefix) &&
                 suffix.equals(otherHex.suffix);
@@ -1066,7 +1083,7 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         int result = Objects.hash(delimiter, prefix, suffix);
-        result = 31 * result + Boolean.hashCode(Arrays.equals(digits, UPPERCASE_DIGITS));
+        result = 31 * result + Boolean.hashCode(digitCase == Case.UPPERCASE);
         return result;
     }
 
@@ -1078,7 +1095,7 @@ public int hashCode() {
      */
     @Override
     public String toString() {
-        return escapeNL("uppercase: " + Arrays.equals(digits, UPPERCASE_DIGITS) +
+        return escapeNL("uppercase: " + (digitCase == Case.UPPERCASE) +
                 ", delimiter: \"" + delimiter +
                 "\", prefix: \"" + prefix +
                 "\", suffix: \"" + suffix + "\"");
diff --git a/test/micro/org/openjdk/bench/java/util/HexFormatBench.java b/test/micro/org/openjdk/bench/java/util/HexFormatBench.java
new file mode 100644
index 00000000000..c554f70c351
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/util/HexFormatBench.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.util;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.HexFormat;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests java.net.URLEncoder.encode and Decoder.decode.
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(value = 3)
+public class HexFormatBench {
+
+    @Param({"512"})
+    public int size;
+
+    public byte[] bytes;
+
+    public StringBuilder builder = new StringBuilder(size * 2);
+
+    HexFormat LOWER_FORMATTER = HexFormat.of();
+    HexFormat UPPER_FORMATTER = HexFormat.of().withUpperCase();
+
+    @Setup
+    public void setupStrings() {
+        Random random = new Random(3);
+        bytes = new byte[size];
+        for (int i = 0; i < size; i++) {
+            bytes[i] = (byte)random.nextInt(16);
+        }
+    }
+
+    @Benchmark
+    public StringBuilder appenderLower() {
+        builder.setLength(0);
+        return HexFormat.of().formatHex(builder, bytes);
+    }
+
+    @Benchmark
+    public StringBuilder appenderUpper() {
+        builder.setLength(0);
+        return HexFormat.of().withUpperCase().formatHex(builder, bytes);
+    }
+
+    @Benchmark
+    public StringBuilder appenderLowerCached() {
+        builder.setLength(0);
+        return LOWER_FORMATTER.formatHex(builder, bytes);
+    }
+
+    @Benchmark
+    public StringBuilder appenderUpperCached() {
+        builder.setLength(0);
+        return UPPER_FORMATTER.formatHex(builder, bytes);
+    }
+
+
+    @Benchmark
+    public void toHexLower(Blackhole bh) {
+        for (byte b : bytes) {
+            bh.consume(HexFormat.of().toHighHexDigit(b));
+            bh.consume(HexFormat.of().toLowHexDigit(b));
+        }
+    }
+
+    @Benchmark
+    public void toHexUpper(Blackhole bh) {
+        for (byte b : bytes) {
+            bh.consume(HexFormat.of().withUpperCase().toHighHexDigit(b));
+            bh.consume(HexFormat.of().withUpperCase().toLowHexDigit(b));
+        }
+    }
+
+    @Benchmark
+    public void toHexLowerCached(Blackhole bh) {
+        for (byte b : bytes) {
+            bh.consume(LOWER_FORMATTER.toHighHexDigit(b));
+            bh.consume(LOWER_FORMATTER.toLowHexDigit(b));
+        }
+    }
+
+    @Benchmark
+    public void toHexUpperCached(Blackhole bh) {
+        for (byte b : bytes) {
+            bh.consume(UPPER_FORMATTER.toHighHexDigit(b));
+            bh.consume(UPPER_FORMATTER.toLowHexDigit(b));
+        }
+    }
+
+    @Benchmark
+    public void toHexDigitsByte(Blackhole bh) {
+        for (byte b : bytes) {
+            bh.consume(LOWER_FORMATTER.toHexDigits(b));
+        }
+    }
+
+    @Benchmark
+    public void toHexDigitsShort(Blackhole bh) {
+        for (short b : bytes) {
+            bh.consume(LOWER_FORMATTER.toHexDigits(b));
+        }
+    }
+
+    @Benchmark
+    public void toHexDigitsInt(Blackhole bh) {
+        for (int b : bytes) {
+            bh.consume(LOWER_FORMATTER.toHexDigits(b));
+        }
+    }
+
+    @Benchmark
+    public void toHexDigitsLong(Blackhole bh) {
+        for (long b : bytes) {
+            bh.consume(LOWER_FORMATTER.toHexDigits(b));
+        }
+    }
+}

From 1741d13b1260253d1e299e8da9c42b5519a7ae48 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Wed, 13 Sep 2023 22:23:27 +0000
Subject: [PATCH 002/112] 8315726: Open source several AWT applet tests

Reviewed-by: psadhukhan, aivanov
---
 .../jdk/java/awt/Choice/ChoiceSelectTest.java | 174 ++++++++
 test/jdk/java/awt/Component/Displayable.java  | 156 +++++++
 .../java/awt/Focus/TestWindowsLFFocus.java    | 127 ++++++
 .../java/awt/geom/HitTest/PathHitTest.java    | 392 ++++++++++++++++++
 4 files changed, 849 insertions(+)
 create mode 100644 test/jdk/java/awt/Choice/ChoiceSelectTest.java
 create mode 100644 test/jdk/java/awt/Component/Displayable.java
 create mode 100644 test/jdk/java/awt/Focus/TestWindowsLFFocus.java
 create mode 100644 test/jdk/java/awt/geom/HitTest/PathHitTest.java

diff --git a/test/jdk/java/awt/Choice/ChoiceSelectTest.java b/test/jdk/java/awt/Choice/ChoiceSelectTest.java
new file mode 100644
index 00000000000..cf5b2e6d114
--- /dev/null
+++ b/test/jdk/java/awt/Choice/ChoiceSelectTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Choice;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Panel;
+
+/*
+ *  @test
+ *  @bug 4115139 4128213
+ *  @summary Tests that the (rather bizarre) rules for handling selection
+ *  in Choice components are implemented as documented in
+ *  "The Java Class Libraries 2nd Edition"
+ *  @key headful
+ */
+
+public class ChoiceSelectTest extends Panel {
+    final Choice c;
+
+    public ChoiceSelectTest() {
+        setLayout(new FlowLayout());
+        c = new Choice();
+        add(c);
+    }
+
+    private void test() {
+        testAddition();
+        testInsertion();
+        testRemoval();
+        testIndices();
+    }
+
+    public void testAddition() {
+        c.removeAll();
+
+        // check that after first item added selection is zero
+        c.addItem("zero");
+        if (c.getSelectedIndex() != 0) {
+            throw new SelectionException("selection wrong after first add");
+        }
+
+        // check that selection doesn't change for subsequent adds
+        c.addItem("one");
+        c.select(1);
+        c.addItem("two");
+        if (c.getSelectedIndex() != 1) {
+            throw new SelectionException("selection wrong after subsequent add");
+        }
+    }
+
+    public void testInsertion() {
+        c.removeAll();
+
+        // check that after first item inserted selection is zero
+        c.insert("zero", 0);
+        if (c.getSelectedIndex() != 0) {
+            throw new SelectionException("selection wrong after first insert");
+        }
+
+        // check that if selected item shifted, selection goes to zero
+        c.insert("three", 1);
+        c.select(1);
+        c.insert("one", 1);
+        if (c.getSelectedIndex() != 0) {
+            throw new SelectionException("selection wrong after selected item shifted");
+        }
+
+        // check that if selected item not shifted, selection stays the same
+        c.select(1);
+        c.insert("two", 2);
+        if (c.getSelectedIndex() != 1) {
+            throw new SelectionException("selection wrong after item inserted after selection");
+        }
+    }
+
+    public void testRemoval() {
+        c.removeAll();
+
+        // check that if removing selected item, selection goes to 0
+        c.add("zero");
+        c.add("one");
+        c.add("two");
+        c.select(2);
+        c.remove(2);
+        if (c.getSelectedIndex() != 0) {
+            throw new SelectionException("selection wrong after removing selected item");
+        }
+
+        // check that if removing item before the selection
+        // the selected index is updated
+        c.add("two");
+        c.add("three");
+        c.select(3);
+        c.remove(1);
+        if (c.getSelectedIndex() != 2) {
+            throw new SelectionException("selection wrong after removing item before it");
+        }
+    }
+
+    public void testIndices() {
+        c.removeAll();
+
+        c.addItem("zero");
+        c.addItem("one");
+        c.addItem("two");
+        c.addItem("three");
+        c.addItem("four");
+        c.addItem("five");
+
+        // Test selection of negative index
+        try {
+            c.select(-1);
+            throw new SelectionException("Negative Index Test FAILED");
+        } catch (IllegalArgumentException expected) {}
+
+        // Test selection of zero index
+        try {
+            c.select(0);
+        } catch (IllegalArgumentException iae) {
+            throw new SelectionException("Zero Index Test FAILED", iae);
+        }
+
+        // Test selection of maximum index
+        try {
+            c.select(5);
+        } catch (IllegalArgumentException iae) {
+            throw new SelectionException("Maximum Index Test FAILED", iae);
+        }
+
+        // Test selection of index that is too large
+        try {
+            c.select(6);
+            throw new SelectionException("Greater than Maximum Index Test FAILED");
+        } catch (IllegalArgumentException expected) {}
+    }
+
+    public static void main(String[] args) throws Exception {
+        EventQueue.invokeAndWait(() -> new ChoiceSelectTest().test());
+    }
+
+    class SelectionException extends RuntimeException {
+        SelectionException(String msg, Throwable cause) {
+            super(msg, cause);
+            System.out.println(
+                    "Selection item is '" + c.getSelectedItem() +
+                            "' at index " + c.getSelectedIndex());
+        }
+
+        SelectionException(String msg) {
+            this(msg, null);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Component/Displayable.java b/test/jdk/java/awt/Component/Displayable.java
new file mode 100644
index 00000000000..0c4969bb595
--- /dev/null
+++ b/test/jdk/java/awt/Component/Displayable.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Label;
+import java.awt.Panel;
+
+/*
+ * @test
+ * @key headful
+ * @summary automated test for "displayable" property on Component
+ */
+
+public class Displayable extends Panel {
+    Label status = new Label("Displayable Test started...");
+
+    public void init() {
+        setLayout(new BorderLayout());
+        add("South", status);
+
+        LightDisplayable light = new LightDisplayable();
+        shouldNotBeDisplayable(light, "before added to container ");
+
+        HeavyDisplayable heavy = new HeavyDisplayable();
+        shouldNotBeDisplayable(heavy, "before added to container ");
+
+        add("West", light);
+        add("East", heavy);
+
+        statusMessage("Displayable test completed successfully.");
+    }
+
+    protected void addImpl(Component child, Object constraints, int index) {
+        super.addImpl(child, constraints, index);
+        if (isDisplayable()) {
+            shouldBeDisplayable(child, "after added to displayable container ");
+        } else {
+            shouldNotBeDisplayable(child, "after added to undisplayable container ");
+        }
+    }
+
+    public void remove(Component child) {
+        super.remove(child);
+        shouldNotBeDisplayable(child, "after removed from displayable container ");
+    }
+
+    public void statusMessage(String msg) {
+        status.setText(msg);
+        status.invalidate();
+        validate();
+    }
+
+    public static void shouldNotBeDisplayable(Component c, String why) {
+        if (c.isDisplayable()) {
+            throw new RuntimeException("Component is displayable "+why+c.getName());
+        }
+    }
+
+    public static void shouldBeDisplayable(Component c, String why) {
+        if (!c.isDisplayable()) {
+            throw new RuntimeException("Component is NOT displayable "+why+c.getName());
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        EventQueue.invokeAndWait(() -> {
+            Frame f = new Frame();
+            try {
+                Displayable test = new Displayable();
+                test.init();
+                f.add("North", test);
+                f.pack();
+            } finally {
+                f.dispose();
+            }
+        });
+    }
+}
+
+class LightDisplayable extends Component {
+
+    public Dimension getPreferredSize() {
+        return new Dimension(50,50);
+    }
+
+    public void paint(Graphics g) {
+        Dimension size = getSize();
+        g.setColor(Color.blue);
+        g.fillRect(0, 0, size.width, size.height);
+        super.paint(g);
+    }
+
+    public void addNotify() {
+        Displayable.shouldNotBeDisplayable(this, "before addNotify ");
+        super.addNotify();
+        Displayable.shouldBeDisplayable(this, "after addNotify ");
+    }
+
+    public void removeNotify() {
+        Displayable.shouldBeDisplayable(this, "before removeNotify ");
+        super.removeNotify();
+        Displayable.shouldNotBeDisplayable(this, "after removeNotify ");
+    }
+}
+
+class HeavyDisplayable extends Panel {
+
+    public Dimension getPreferredSize() {
+        return new Dimension(50, 50);
+    }
+
+    public void paint(Graphics g) {
+        Dimension size = getSize();
+        g.setColor(Color.black);
+        g.fillRect(0, 0, size.width, size.height);
+        super.paint(g);
+    }
+
+    public void addNotify() {
+        Displayable.shouldNotBeDisplayable(this, "before addNotify ");
+        super.addNotify();
+        Displayable.shouldBeDisplayable(this, "after addNotify ");
+    }
+
+    public void removeNotify() {
+        Displayable.shouldBeDisplayable(this, "before removeNotify ");
+        super.removeNotify();
+        Displayable.shouldNotBeDisplayable(this, "after removeNotify ");
+    }
+}
diff --git a/test/jdk/java/awt/Focus/TestWindowsLFFocus.java b/test/jdk/java/awt/Focus/TestWindowsLFFocus.java
new file mode 100644
index 00000000000..8dd27f0a649
--- /dev/null
+++ b/test/jdk/java/awt/Focus/TestWindowsLFFocus.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.WindowConstants;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+
+/*
+ * @test
+ * @bug 4749659
+ * @summary Tests that popup menu doesn't steal focus from top-level
+ * @key headful
+ */
+
+public class TestWindowsLFFocus {
+    static volatile boolean actionFired;
+
+    static JFrame frame;
+    static JMenuBar bar;
+    static JMenuItem item;
+    static volatile Point frameLoc;
+
+    public static void main(String[] args) throws Exception {
+        for (UIManager.LookAndFeelInfo lookAndFeel : UIManager.getInstalledLookAndFeels()) {
+            UIManager.setLookAndFeel(lookAndFeel.getClassName());
+            test();
+        }
+
+        System.err.println("PASSED");
+    }
+
+    private static void test() throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                actionFired = false;
+                frame = new JFrame();
+                bar = new JMenuBar();
+                frame.setJMenuBar(bar);
+                JMenu menu = new JMenu("menu");
+                bar.add(menu);
+                item = new JMenuItem("item");
+                menu.add(item);
+                item.addActionListener(e -> actionFired = true);
+
+                frame.getContentPane().add(new JButton("none"));
+                frame.setBounds(100, 100, 100, 100);
+                frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+                frame.setVisible(true);
+            });
+
+            Robot robot = new Robot();
+            robot.setAutoWaitForIdle(true);
+            robot.setAutoDelay(50);
+
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                Point location = frame.getLocationOnScreen();
+                Insets insets = frame.getInsets();
+
+                location.translate(insets.left + 15, insets.top + bar.getHeight() / 2);
+
+                frameLoc = location;
+            });
+
+            robot.mouseMove(frameLoc.x, frameLoc.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                Point location = new Point(frameLoc);
+                location.y += bar.getHeight() / 2 + item.getHeight() / 2;
+
+                frameLoc = location;
+            });
+
+            robot.mouseMove(frameLoc.x, frameLoc.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+            robot.waitForIdle();
+            robot.delay(500);
+
+            if (!actionFired) {
+                throw new RuntimeException("Menu closed without action");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/java/awt/geom/HitTest/PathHitTest.java b/test/jdk/java/awt/geom/HitTest/PathHitTest.java
new file mode 100644
index 00000000000..930e7f764a6
--- /dev/null
+++ b/test/jdk/java/awt/geom/HitTest/PathHitTest.java
@@ -0,0 +1,392 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Canvas;
+import java.awt.Choice;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Panel;
+import java.awt.Polygon;
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Point2D;
+
+/*
+ * @test
+ * @bug 4210936 4214524
+ * @summary Tests the results of the hit test methods on 3 different
+ *          Shape objects - Polygon, Area, and GeneralPath.  Both an
+ *          automatic test for constraint compliance and a manual
+ *          test for correctness are included in this one class.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main PathHitTest
+ */
+
+/*
+ * @test
+ * @bug 4210936 4214524
+ * @summary Tests the results of the hit test methods on 3 different
+ *          Shape objects - Polygon, Area, and GeneralPath.  Both an
+ *          automatic test for constraint compliance and a manual
+ *          test for correctness are included in this one class.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual PathHitTest manual
+ */
+
+public class PathHitTest {
+
+    public static final int BOXSIZE = 5;
+    public static final int BOXCENTER = 2;
+    public static final int TESTSIZE = 400;
+    public static final int NUMTESTS = (TESTSIZE + BOXSIZE - 1) / BOXSIZE;
+
+    public static Shape[] testShapes = new Shape[5];
+    public static String[] testNames = {
+            "Polygon",
+            "EvenOdd GeneralPath",
+            "NonZero GeneralPath",
+            "Area from EO GeneralPath",
+            "Area from NZ GeneralPath",
+    };
+
+    static {
+        GeneralPath gpeo = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
+        Ellipse2D ell = new Ellipse2D.Float();
+        Point2D center = new Point2D.Float();
+        AffineTransform at = new AffineTransform();
+        for (int i = 0; i < 360; i += 30) {
+            center.setLocation(100, 0);
+            at.setToTranslation(200, 200);
+            at.rotate(i * Math.PI / 180);
+            at.transform(center, center);
+            ell.setFrame(center.getX() - 50, center.getY() - 50, 100, 100);
+            gpeo.append(ell, false);
+        }
+        GeneralPath side = new GeneralPath();
+        side.moveTo(0, 0);
+        side.lineTo(15, 10);
+        side.lineTo(30, 0);
+        side.lineTo(45, -10);
+        side.lineTo(60, 0);
+        append4sides(gpeo, side, 20, 20);
+        side.reset();
+        side.moveTo(0, 0);
+        side.quadTo(15, 10, 30, 0);
+        side.quadTo(45, -10, 60, 0);
+        append4sides(gpeo, side, 320, 20);
+        side.reset();
+        side.moveTo(0, 0);
+        side.curveTo(15, 10, 45, -10, 60, 0);
+        append4sides(gpeo, side, 20, 320);
+
+        GeneralPath gpnz = new GeneralPath(GeneralPath.WIND_NON_ZERO);
+        gpnz.append(gpeo, false);
+        Polygon p = new Polygon();
+        p.addPoint( 50,  50);
+        p.addPoint( 60, 350);
+        p.addPoint(250, 340);
+        p.addPoint(260, 150);
+        p.addPoint(140, 140);
+        p.addPoint(150, 260);
+        p.addPoint(340, 250);
+        p.addPoint(350,  60);
+        testShapes[0] = p;
+        testShapes[1] = gpeo;
+        testShapes[2] = gpnz;
+        testShapes[3] = new Area(gpeo);
+        testShapes[3].getPathIterator(null);
+        testShapes[4] = new Area(gpnz);
+        testShapes[4].getPathIterator(null);
+    }
+
+    private static void append4sides(GeneralPath path, GeneralPath side,
+                                     double xoff, double yoff) {
+        AffineTransform at = new AffineTransform();
+        at.setToTranslation(xoff, yoff);
+        for (int i = 0; i < 4; i++) {
+            path.append(side.getPathIterator(at), i != 0);
+            at.rotate(Math.toRadians(90), 30, 30);
+        }
+    }
+
+    public static void main(String[] argv) throws Exception {
+        if (argv.length > 0 && argv[0].equals("manual")) {
+            PathHitTestManual.doManual();
+        } else {
+            int totalerrs = 0;
+            for (int i = 0; i < testShapes.length; i++) {
+                totalerrs += testshape(testShapes[i], testNames[i]);
+            }
+            if (totalerrs != 0) {
+                throw new RuntimeException(totalerrs +
+                        " constraint conditions violated!");
+            }
+        }
+    }
+
+    public static int testshape(Shape s, String name) {
+        int numerrs = 0;
+        long start = System.currentTimeMillis();
+        for (int y = 0; y < TESTSIZE; y += BOXSIZE) {
+            for (int x = 0; x < TESTSIZE; x += BOXSIZE) {
+                boolean rectintersects = s.intersects(x, y, BOXSIZE, BOXSIZE);
+                boolean rectcontains = s.contains(x, y, BOXSIZE, BOXSIZE);
+                boolean pointcontains = s.contains(x + BOXCENTER, y + BOXCENTER);
+                if (rectcontains && !rectintersects) {
+                    System.err.println("rect is contained " +
+                            "but does not intersect!");
+                    numerrs++;
+                }
+                if (rectcontains && !pointcontains) {
+                    System.err.println("rect is contained " +
+                            "but center is not contained!");
+                    numerrs++;
+                }
+                if (pointcontains && !rectintersects) {
+                    System.err.println("center is contained " +
+                            "but rect does not intersect!");
+                    numerrs++;
+                }
+            }
+        }
+        long end = System.currentTimeMillis();
+        System.out.println(name + " completed in " +
+                (end - start) + "ms with " +
+                numerrs + " errors");
+        return numerrs;
+    }
+
+    static class PathHitTestManual extends Panel {
+        private static final String INSTRUCTIONS = """
+            This test displays the results of hit testing 5 different Shape
+            objects one at a time.
+
+            You can switch between shapes using the Choice component located
+            at the bottom of the window.
+
+            Each square in the test represents the
+            return values of the hit testing operators for that square region:
+
+                yellow - not yet tested
+                translucent blue overlay - the shape being tested
+
+                black - all outside
+                dark gray - rectangle intersects shape
+                light gray - rectangle intersects and center point is inside shape
+                white - rectangle is entirely contained in shape
+                red - some constraint was violated, including:
+                    rectangle is contained, but center point is not
+                    rectangle is contained, but rectangle.intersects is false
+                    centerpoint is contained, but rectangle.intersects is false
+
+            Visually inspect the results to see if they match the above table.
+            Note that it is not a violation for rectangles that are entirely
+            inside the path to be light gray instead of white since sometimes
+            the path is complex enough to make an exact determination expensive.
+            You might see this on the GeneralPath NonZero example where the
+            circles that make up the path cross over the interior of the shape
+            and cause the hit testing methods to guess that the rectangle is
+            not guaranteed to be contained within the shape.
+            """;
+
+        PathHitTestCanvas phtc;
+
+        public void init() {
+            setLayout(new BorderLayout());
+            phtc = new PathHitTestCanvas();
+            add("Center", phtc);
+            final Choice ch = new Choice();
+            for (int i = 0; i < PathHitTest.testNames.length; i++) {
+                ch.add(PathHitTest.testNames[i]);
+            }
+            ch.addItemListener(e -> phtc.setShape(ch.getSelectedIndex()));
+            ch.select(0);
+            phtc.setShape(0);
+            add("South", ch);
+        }
+
+        public void start() {
+            phtc.start();
+        }
+
+        public void stop() {
+            phtc.stop();
+        }
+
+        public static class PathHitTestCanvas extends Canvas implements Runnable {
+            public static final Color[] colors = {
+                                        /* contains?  point in?  intersects? */
+                    Color.black,        /*    NO         NO          NO      */
+                    Color.darkGray,     /*    NO         NO          YES     */
+                    Color.red,          /*    NO         YES         NO      */
+                    Color.lightGray,    /*    NO         YES         YES     */
+                    Color.red,          /*    YES        NO          NO      */
+                    Color.red,          /*    YES        NO          YES     */
+                    Color.red,          /*    YES        YES         NO      */
+                    Color.white,        /*    YES        YES         YES     */
+                    Color.yellow,       /*     used for untested points      */
+            };
+
+            public Dimension getPreferredSize() {
+                return new Dimension(TESTSIZE, TESTSIZE);
+            }
+
+            public synchronized void start() {
+                if (!testdone) {
+                    renderer = new Thread(this);
+                    renderer.setPriority(Thread.MIN_PRIORITY);
+                    renderer.start();
+                }
+            }
+
+            public synchronized void stop() {
+                renderer = null;
+            }
+
+            private Thread renderer;
+            private int shapeIndex = 0;
+            private byte[] indices = new byte[NUMTESTS * NUMTESTS];
+            boolean testdone = false;
+
+            private synchronized void setShape(int index) {
+                shapeIndex = index;
+                testdone = false;
+                start();
+            }
+
+            public void run() {
+                Thread me = Thread.currentThread();
+                Graphics2D g2d = (Graphics2D) getGraphics();
+                byte[] indices;
+                Shape s = testShapes[shapeIndex];
+                synchronized (this) {
+                    if (renderer != me) {
+                        return;
+                    }
+                    this.indices = new byte[NUMTESTS * NUMTESTS];
+                    java.util.Arrays.fill(this.indices, (byte) 8);
+                    indices = this.indices;
+                }
+
+                System.err.printf("%s %s\n", g2d, Color.yellow);
+                g2d.setColor(Color.yellow);
+                g2d.fillRect(0, 0, TESTSIZE, TESTSIZE);
+                int numtests = 0;
+                long start = System.currentTimeMillis();
+                for (int y = 0; renderer == me && y < TESTSIZE; y += BOXSIZE) {
+                    for (int x = 0; renderer == me && x < TESTSIZE; x += BOXSIZE) {
+                        byte index = 0;
+                        if (s.intersects(x, y, BOXSIZE, BOXSIZE)) {
+                            index += 1;
+                        }
+                        if (s.contains(x + BOXCENTER, y + BOXCENTER)) {
+                            index += 2;
+                        }
+                        if (s.contains(x, y, BOXSIZE, BOXSIZE)) {
+                            index += 4;
+                        }
+                        numtests++;
+                        int i = (y / BOXSIZE) * NUMTESTS + (x / BOXSIZE);
+                        indices[i] = index;
+                        g2d.setColor(colors[index]);
+                        g2d.fillRect(x, y, BOXSIZE, BOXSIZE);
+                    }
+                }
+                synchronized (this) {
+                    if (renderer != me) {
+                        return;
+                    }
+                    g2d.setColor(new Color(0, 0, 1, .2f));
+                    g2d.fill(s);
+                    testdone = true;
+                    long end = System.currentTimeMillis();
+                    System.out.println(numtests + " tests took " + (end - start) + "ms");
+                }
+            }
+
+            public void paint(Graphics g) {
+                g.setColor(Color.yellow);
+                g.fillRect(0, 0, TESTSIZE, TESTSIZE);
+                byte[] indices = this.indices;
+                if (indices != null) {
+                    for (int y = 0; y < TESTSIZE; y += BOXSIZE) {
+                        for (int x = 0; x < TESTSIZE; x += BOXSIZE) {
+                            int i = (y / BOXSIZE) * NUMTESTS + (x / BOXSIZE);
+                            g.setColor(colors[indices[i]]);
+                            g.fillRect(x, y, BOXSIZE, BOXSIZE);
+                        }
+                    }
+                }
+                Graphics2D g2d = (Graphics2D) g;
+                g2d.setColor(new Color(0, 0, 1, .2f));
+                g2d.fill(testShapes[shapeIndex]);
+            }
+        }
+
+        static volatile PathHitTestManual pathHitTestManual;
+
+        private static void createAndShowGUI() {
+            pathHitTestManual = new PathHitTestManual();
+            Frame frame = new Frame("PathHitTestManual test window");
+
+            frame.add(pathHitTestManual);
+            frame.setSize(400, 450);
+
+            PassFailJFrame.addTestWindow(frame);
+            PassFailJFrame.positionTestWindow(frame, PassFailJFrame.Position.HORIZONTAL);
+
+            frame.setVisible(true);
+
+            pathHitTestManual.init();
+            pathHitTestManual.start();
+        }
+
+        public static void doManual() throws Exception {
+            PassFailJFrame passFailJFrame = new PassFailJFrame.Builder()
+                    .title("PathHitTestManual Instructions")
+                    .instructions(INSTRUCTIONS)
+                    .testTimeOut(5)
+                    .rows(30)
+                    .columns(70)
+                    .screenCapture()
+                    .build();
+
+            EventQueue.invokeAndWait(PathHitTestManual::createAndShowGUI);
+            try {
+                passFailJFrame.awaitAndCheck();
+            } finally {
+                pathHitTestManual.stop();
+            }
+        }
+    }
+}

From 23fab1181b6a053efc4661d5a10caa90b109aa06 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Wed, 13 Sep 2023 22:52:01 +0000
Subject: [PATCH 003/112] 8314828: Mark 3 jcmd command-line options test as
 vm.flagless

Reviewed-by: cjplummer
---
 .../hotspot/jtreg/serviceability/dcmd/framework/HelpTest.java | 4 ++--
 .../serviceability/dcmd/framework/InvalidCommandTest.java     | 4 ++--
 .../jtreg/serviceability/dcmd/framework/VMVersionTest.java    | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/dcmd/framework/HelpTest.java b/test/hotspot/jtreg/serviceability/dcmd/framework/HelpTest.java
index 5e159aaeb9e..af2eed20516 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/framework/HelpTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/framework/HelpTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  * @test
  * @summary Test of diagnostic command help (tests all DCMD executors)
  * @library /test/lib
- *          /vmTestbase
+ * @requires vm.flagless
  * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
diff --git a/test/hotspot/jtreg/serviceability/dcmd/framework/InvalidCommandTest.java b/test/hotspot/jtreg/serviceability/dcmd/framework/InvalidCommandTest.java
index 178216fe89c..59e4bd5ccde 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/framework/InvalidCommandTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/framework/InvalidCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  * @test
  * @summary Test of invalid diagnostic command (tests all DCMD executors)
  * @library /test/lib
- *          /vmTestbase
+ * @requires vm.flagless
  * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
diff --git a/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java b/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java
index 97891d408ef..416bf512e22 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java
@@ -27,7 +27,6 @@
 import jdk.test.lib.dcmd.MainClassJcmdExecutor;
 import jdk.test.lib.dcmd.FileJcmdExecutor;
 import jdk.test.lib.dcmd.JMXExecutor;
-import nsk.share.jdi.ArgumentHandler;
 
 import org.testng.annotations.Test;
 
@@ -44,7 +43,7 @@
  *          java.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @library /test/lib
- *          /vmTestbase
+ * @requires vm.flagless
  * @run testng/othervm -XX:+UsePerfData VMVersionTest
  */
 public class VMVersionTest {

From eb37c7e361527d937cf5d461a6cca54bd894e542 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Wed, 13 Sep 2023 23:40:44 +0000
Subject: [PATCH 004/112] 8315971: ProblemList
 containers/docker/TestMemoryAwareness.java on linux-all

Reviewed-by: shade
---
 test/hotspot/jtreg/ProblemList.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index de960f4fd9c..ce78e592180 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -110,7 +110,7 @@ runtime/cds/appcds/customLoader/HelloCustom_JFR.java 8241075 linux-all,windows-x
 applications/jcstress/copy.java 8229852 linux-all
 
 containers/docker/TestJcmd.java 8278102 linux-all
-containers/docker/TestMemoryAwareness.java 8303470 linux-x64
+containers/docker/TestMemoryAwareness.java 8303470 linux-all
 
 #############################################################################
 

From 11d431b2c436d6b2a0aa7a00d676a93c1b87da0e Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Thu, 14 Sep 2023 01:20:24 +0000
Subject: [PATCH 005/112] 8316228: jcmd tests are broken by 8314828

Reviewed-by: dholmes
---
 test/hotspot/jtreg/serviceability/dcmd/framework/HelpTest.java   | 1 +
 .../jtreg/serviceability/dcmd/framework/InvalidCommandTest.java  | 1 +
 .../jtreg/serviceability/dcmd/framework/VMVersionTest.java       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/test/hotspot/jtreg/serviceability/dcmd/framework/HelpTest.java b/test/hotspot/jtreg/serviceability/dcmd/framework/HelpTest.java
index af2eed20516..7d88faaaa30 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/framework/HelpTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/framework/HelpTest.java
@@ -33,6 +33,7 @@
  * @test
  * @summary Test of diagnostic command help (tests all DCMD executors)
  * @library /test/lib
+ *          /vmTestbase
  * @requires vm.flagless
  * @modules java.base/jdk.internal.misc
  *          java.compiler
diff --git a/test/hotspot/jtreg/serviceability/dcmd/framework/InvalidCommandTest.java b/test/hotspot/jtreg/serviceability/dcmd/framework/InvalidCommandTest.java
index 59e4bd5ccde..1d44b16dcdd 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/framework/InvalidCommandTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/framework/InvalidCommandTest.java
@@ -33,6 +33,7 @@
  * @test
  * @summary Test of invalid diagnostic command (tests all DCMD executors)
  * @library /test/lib
+ *          /vmTestbase
  * @requires vm.flagless
  * @modules java.base/jdk.internal.misc
  *          java.compiler
diff --git a/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java b/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java
index 416bf512e22..4b1d486640a 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java
@@ -43,6 +43,7 @@
  *          java.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @library /test/lib
+ *          /vmTestbase
  * @requires vm.flagless
  * @run testng/othervm -XX:+UsePerfData VMVersionTest
  */

From 639ba13c4b0ada1c2ae0a46e99ed707c219b3e53 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Thu, 14 Sep 2023 07:02:29 +0000
Subject: [PATCH 006/112] 8316179: Use consistent naming for lightweight
 locking in MacroAssembler

Reviewed-by: rkennke, coleenp, dholmes
---
 src/hotspot/cpu/aarch64/aarch64.ad                   |  4 ++--
 .../cpu/aarch64/c1_MacroAssembler_aarch64.cpp        |  4 ++--
 src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp      |  4 ++--
 src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp   |  8 ++++----
 src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp   |  4 ++--
 src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp    |  4 ++--
 src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp        |  6 +++---
 src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp        |  8 ++++----
 src/hotspot/cpu/arm/interp_masm_arm.cpp              |  6 +++---
 src/hotspot/cpu/arm/macroAssembler_arm.cpp           |  8 ++++----
 src/hotspot/cpu/arm/macroAssembler_arm.hpp           |  8 ++++----
 src/hotspot/cpu/arm/sharedRuntime_arm.cpp            |  8 ++++----
 src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp        |  4 ++--
 src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp           |  4 ++--
 src/hotspot/cpu/ppc/macroAssembler_ppc.cpp           | 12 ++++++------
 src/hotspot/cpu/ppc/macroAssembler_ppc.hpp           |  4 ++--
 src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp    |  4 ++--
 src/hotspot/cpu/riscv/interp_masm_riscv.cpp          |  4 ++--
 src/hotspot/cpu/riscv/macroAssembler_riscv.cpp       |  8 ++++----
 src/hotspot/cpu/riscv/macroAssembler_riscv.hpp       |  4 ++--
 src/hotspot/cpu/riscv/riscv.ad                       |  4 ++--
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp        |  4 ++--
 src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp        |  4 ++--
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp        |  4 ++--
 src/hotspot/cpu/x86/interp_masm_x86.cpp              |  4 ++--
 src/hotspot/cpu/x86/macroAssembler_x86.cpp           |  8 ++++----
 src/hotspot/cpu/x86/macroAssembler_x86.hpp           |  4 ++--
 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp         |  4 ++--
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp         |  4 ++--
 29 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 7ce4ed9584d..2f83b2d99c7 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -3875,7 +3875,7 @@ encode %{
       __ b(cont);
     } else {
       assert(LockingMode == LM_LIGHTWEIGHT, "must be");
-      __ fast_lock(oop, disp_hdr, tmp, rscratch1, no_count);
+      __ lightweight_lock(oop, disp_hdr, tmp, rscratch1, no_count);
       __ b(count);
     }
 
@@ -3956,7 +3956,7 @@ encode %{
       __ b(cont);
     } else {
       assert(LockingMode == LM_LIGHTWEIGHT, "must be");
-      __ fast_unlock(oop, tmp, box, disp_hdr, no_count);
+      __ lightweight_unlock(oop, tmp, box, disp_hdr, no_count);
       __ b(count);
     }
 
diff --git a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
index a847289e3ab..c207d76b80a 100644
--- a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
@@ -83,7 +83,7 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
   // Load object header
   ldr(hdr, Address(obj, hdr_offset));
   if (LockingMode == LM_LIGHTWEIGHT) {
-    fast_lock(obj, hdr, rscratch1, rscratch2, slow_case);
+    lightweight_lock(obj, hdr, rscratch1, rscratch2, slow_case);
   } else if (LockingMode == LM_LEGACY) {
     Label done;
     // and mark it as unlocked
@@ -149,7 +149,7 @@ void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register disp_
     // be encoded.
     tst(hdr, markWord::monitor_value);
     br(Assembler::NE, slow_case);
-    fast_unlock(obj, hdr, rscratch1, rscratch2, slow_case);
+    lightweight_unlock(obj, hdr, rscratch1, rscratch2, slow_case);
   } else if (LockingMode == LM_LEGACY) {
     // test if object header is pointing to the displaced header, and if so, restore
     // the displaced header in the object - if the object header is not pointing to
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index 397cbfc043f..1b376a521fc 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -767,7 +767,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg)
 
     if (LockingMode == LM_LIGHTWEIGHT) {
       ldr(tmp, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
-      fast_lock(obj_reg, tmp, rscratch1, rscratch2, slow_case);
+      lightweight_lock(obj_reg, tmp, rscratch1, rscratch2, slow_case);
       b(count);
     } else if (LockingMode == LM_LEGACY) {
       // Load (object->mark() | 1) into swap_reg
@@ -898,7 +898,7 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg)
 
       ldr(header_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
       tbnz(header_reg, exact_log2(markWord::monitor_value), slow_case);
-      fast_unlock(obj_reg, header_reg, swap_reg, rscratch1, slow_case);
+      lightweight_unlock(obj_reg, header_reg, swap_reg, rscratch1, slow_case);
       b(count);
       bind(slow_case);
     } else if (LockingMode == LM_LEGACY) {
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index c6fafabc89c..ee2d9f63d73 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -6314,14 +6314,14 @@ void MacroAssembler::double_move(VMRegPair src, VMRegPair dst, Register tmp) {
   }
 }
 
-// Implements fast-locking.
+// Implements lightweight-locking.
 // Branches to slow upon failure to lock the object, with ZF cleared.
 // Falls through upon success with ZF set.
 //
 //  - obj: the object to be locked
 //  - hdr: the header, already loaded from obj, will be destroyed
 //  - t1, t2: temporary registers, will be destroyed
-void MacroAssembler::fast_lock(Register obj, Register hdr, Register t1, Register t2, Label& slow) {
+void MacroAssembler::lightweight_lock(Register obj, Register hdr, Register t1, Register t2, Label& slow) {
   assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking");
   assert_different_registers(obj, hdr, t1, t2);
 
@@ -6346,14 +6346,14 @@ void MacroAssembler::fast_lock(Register obj, Register hdr, Register t1, Register
   strw(t1, Address(rthread, JavaThread::lock_stack_top_offset()));
 }
 
-// Implements fast-unlocking.
+// Implements lightweight-unlocking.
 // Branches to slow upon failure, with ZF cleared.
 // Falls through upon success, with ZF set.
 //
 // - obj: the object to be unlocked
 // - hdr: the (pre-loaded) header of the object
 // - t1, t2: temporary registers
-void MacroAssembler::fast_unlock(Register obj, Register hdr, Register t1, Register t2, Label& slow) {
+void MacroAssembler::lightweight_unlock(Register obj, Register hdr, Register t1, Register t2, Label& slow) {
   assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking");
   assert_different_registers(obj, hdr, t1, t2);
 
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 004bed97b7f..789458943a5 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -1592,8 +1592,8 @@ class MacroAssembler: public Assembler {
   // Code for java.lang.Thread::onSpinWait() intrinsic.
   void spin_wait();
 
-  void fast_lock(Register obj, Register hdr, Register t1, Register t2, Label& slow);
-  void fast_unlock(Register obj, Register hdr, Register t1, Register t2, Label& slow);
+  void lightweight_lock(Register obj, Register hdr, Register t1, Register t2, Label& slow);
+  void lightweight_unlock(Register obj, Register hdr, Register t1, Register t2, Label& slow);
 
 private:
   // Check the current thread doesn't need a cross modify fence.
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index 47dbe0cd97a..be9c2a8fc9a 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -1812,7 +1812,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
     } else {
       assert(LockingMode == LM_LIGHTWEIGHT, "must be");
       __ ldr(swap_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
-      __ fast_lock(obj_reg, swap_reg, tmp, rscratch1, slow_path_lock);
+      __ lightweight_lock(obj_reg, swap_reg, tmp, rscratch1, slow_path_lock);
     }
     __ bind(count);
     __ increment(Address(rthread, JavaThread::held_monitor_count_offset()));
@@ -1953,7 +1953,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       assert(LockingMode == LM_LIGHTWEIGHT, "");
       __ ldr(old_hdr, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
       __ tbnz(old_hdr, exact_log2(markWord::monitor_value), slow_path_unlock);
-      __ fast_unlock(obj_reg, old_hdr, swap_reg, rscratch1, slow_path_unlock);
+      __ lightweight_unlock(obj_reg, old_hdr, swap_reg, rscratch1, slow_path_unlock);
       __ decrement(Address(rthread, JavaThread::held_monitor_count_offset()));
     }
 
diff --git a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
index cbe9057f6a2..c09e54e0e57 100644
--- a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
@@ -219,7 +219,7 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
     Register t2 = hdr;      // blow
     Register t3 = Rtemp;    // blow
 
-    fast_lock_2(obj /* obj */, t1, t2, t3, 1 /* savemask - save t1 */, slow_case);
+    lightweight_lock(obj /* obj */, t1, t2, t3, 1 /* savemask - save t1 */, slow_case);
     // Success: fall through
 
   } else if (LockingMode == LM_LEGACY) {
@@ -282,8 +282,8 @@ void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register disp_
     Register t2 = hdr;      // blow
     Register t3 = Rtemp;    // blow
 
-    fast_unlock_2(obj /* object */, t1, t2, t3, 1 /* savemask (save t1) */,
-                    slow_case);
+    lightweight_unlock(obj /* object */, t1, t2, t3, 1 /* savemask (save t1) */,
+                       slow_case);
     // Success: Fall through
 
   } else if (LockingMode == LM_LEGACY) {
diff --git a/src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp b/src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp
index f887f5d889c..1db30ce5c68 100644
--- a/src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp
@@ -93,8 +93,8 @@ void C2_MacroAssembler::fast_lock(Register Roop, Register Rbox, Register Rscratc
 
   if (LockingMode == LM_LIGHTWEIGHT) {
 
-    fast_lock_2(Roop /* obj */, Rbox /* t1 */, Rscratch /* t2 */, Rscratch2 /* t3 */,
-                1 /* savemask (save t1) */, done);
+    lightweight_lock(Roop /* obj */, Rbox /* t1 */, Rscratch /* t2 */, Rscratch2 /* t3 */,
+                     1 /* savemask (save t1) */, done);
 
     // Success: set Z
     cmp(Roop, Roop);
@@ -143,8 +143,8 @@ void C2_MacroAssembler::fast_unlock(Register Roop, Register Rbox, Register Rscra
 
   if (LockingMode == LM_LIGHTWEIGHT) {
 
-    fast_unlock_2(Roop /* obj */, Rbox /* t1 */, Rscratch /* t2 */, Rscratch2 /* t3 */,
-                  1 /* savemask (save t1) */, done);
+    lightweight_unlock(Roop /* obj */, Rbox /* t1 */, Rscratch /* t2 */, Rscratch2 /* t3 */,
+                       1 /* savemask (save t1) */, done);
 
     cmp(Roop, Roop); // Success: Set Z
     // Fall through
diff --git a/src/hotspot/cpu/arm/interp_masm_arm.cpp b/src/hotspot/cpu/arm/interp_masm_arm.cpp
index 6f4fd3de437..66281326b61 100644
--- a/src/hotspot/cpu/arm/interp_masm_arm.cpp
+++ b/src/hotspot/cpu/arm/interp_masm_arm.cpp
@@ -912,7 +912,7 @@ void InterpreterMacroAssembler::lock_object(Register Rlock) {
     }
 
     if (LockingMode == LM_LIGHTWEIGHT) {
-      fast_lock_2(Robj, R0 /* t1 */, Rmark /* t2 */, Rtemp /* t3 */, 0 /* savemask */, slow_case);
+      lightweight_lock(Robj, R0 /* t1 */, Rmark /* t2 */, Rtemp /* t3 */, 0 /* savemask */, slow_case);
       b(done);
     } else if (LockingMode == LM_LEGACY) {
       // On MP platforms the next load could return a 'stale' value if the memory location has been modified by another thread.
@@ -1034,8 +1034,8 @@ void InterpreterMacroAssembler::unlock_object(Register Rlock) {
       cmpoop(Rtemp, Robj);
       b(slow_case, ne);
 
-      fast_unlock_2(Robj /* obj */, Rlock /* t1 */, Rmark /* t2 */, Rtemp /* t3 */,
-                    1 /* savemask (save t1) */, slow_case);
+      lightweight_unlock(Robj /* obj */, Rlock /* t1 */, Rmark /* t2 */, Rtemp /* t3 */,
+                         1 /* savemask (save t1) */, slow_case);
 
       b(done);
 
diff --git a/src/hotspot/cpu/arm/macroAssembler_arm.cpp b/src/hotspot/cpu/arm/macroAssembler_arm.cpp
index 9a7735a94b8..b827e69d022 100644
--- a/src/hotspot/cpu/arm/macroAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.cpp
@@ -1748,14 +1748,14 @@ void MacroAssembler::read_polling_page(Register dest, relocInfo::relocType rtype
   POISON_REG(mask, 1, R2, poison)               \
   POISON_REG(mask, 2, R3, poison)
 
-// Attempt to fast-lock an object
+// Attempt to lightweight-lock an object
 // Registers:
 //  - obj: the object to be locked
 //  - t1, t2, t3: temp registers. If corresponding bit in savemask is set, they get saved, otherwise blown.
 // Result:
 //  - Success: fallthrough
 //  - Error:   break to slow, Z cleared.
-void MacroAssembler::fast_lock_2(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow) {
+void MacroAssembler::lightweight_lock(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow) {
   assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking");
   assert_different_registers(obj, t1, t2, t3);
 
@@ -1806,14 +1806,14 @@ void MacroAssembler::fast_lock_2(Register obj, Register t1, Register t2, Registe
   // Success: fall through
 }
 
-// Attempt to fast-unlock an object
+// Attempt to lightweight-unlock an object
 // Registers:
 //  - obj: the object to be unlocked
 //  - t1, t2, t3: temp registers. If corresponding bit in savemask is set, they get saved, otherwise blown.
 // Result:
 //  - Success: fallthrough
 //  - Error:   break to slow, Z cleared.
-void MacroAssembler::fast_unlock_2(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow) {
+void MacroAssembler::lightweight_unlock(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow) {
   assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking");
   assert_different_registers(obj, t1, t2, t3);
 
diff --git a/src/hotspot/cpu/arm/macroAssembler_arm.hpp b/src/hotspot/cpu/arm/macroAssembler_arm.hpp
index 7a9724d201c..d9e49ab986c 100644
--- a/src/hotspot/cpu/arm/macroAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.hpp
@@ -1009,23 +1009,23 @@ class MacroAssembler: public Assembler {
   void cas_for_lock_acquire(Register oldval, Register newval, Register base, Register tmp, Label &slow_case, bool allow_fallthrough_on_failure = false, bool one_shot = false);
   void cas_for_lock_release(Register oldval, Register newval, Register base, Register tmp, Label &slow_case, bool allow_fallthrough_on_failure = false, bool one_shot = false);
 
-  // Attempt to fast-lock an object
+  // Attempt to lightweight-lock an object
   // Registers:
   //  - obj: the object to be locked
   //  - t1, t2, t3: temp registers. If corresponding bit in savemask is set, they get saved, otherwise blown.
   // Result:
   //  - Success: fallthrough
   //  - Error:   break to slow, Z cleared.
-  void fast_lock_2(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow);
+  void lightweight_lock(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow);
 
-  // Attempt to fast-unlock an object
+  // Attempt to lightweight-unlock an object
   // Registers:
   //  - obj: the object to be unlocked
   //  - t1, t2, t3: temp registers. If corresponding bit in savemask is set, they get saved, otherwise blown.
   // Result:
   //  - Success: fallthrough
   //  - Error:   break to slow, Z cleared.
-  void fast_unlock_2(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow);
+  void lightweight_unlock(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow);
 
 #ifndef PRODUCT
   // Preserves flags and all registers.
diff --git a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
index 5916305a9d2..e4f4107da0f 100644
--- a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
+++ b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
@@ -1155,8 +1155,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
 
     if (LockingMode == LM_LIGHTWEIGHT) {
       log_trace(fastlock)("SharedRuntime lock fast");
-      __ fast_lock_2(sync_obj /* object */, disp_hdr /* t1 */, tmp /* t2 */, Rtemp /* t3 */,
-                     0x7 /* savemask */, slow_lock);
+      __ lightweight_lock(sync_obj /* object */, disp_hdr /* t1 */, tmp /* t2 */, Rtemp /* t3 */,
+                          0x7 /* savemask */, slow_lock);
       // Fall through to lock_done
     } else if (LockingMode == LM_LEGACY) {
       const Register mark = tmp;
@@ -1242,8 +1242,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   if (method->is_synchronized()) {
     if (LockingMode == LM_LIGHTWEIGHT) {
       log_trace(fastlock)("SharedRuntime unlock fast");
-      __ fast_unlock_2(sync_obj, R2 /* t1 */, tmp /* t2 */, Rtemp /* t3 */,
-                       7 /* savemask */, slow_unlock);
+      __ lightweight_unlock(sync_obj, R2 /* t1 */, tmp /* t2 */, Rtemp /* t3 */,
+                            7 /* savemask */, slow_unlock);
       // Fall through
     } else if (LockingMode == LM_LEGACY) {
       // See C1_MacroAssembler::unlock_object() for more comments
diff --git a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
index bf0122ee737..577dcae25f4 100644
--- a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
@@ -115,7 +115,7 @@ void C1_MacroAssembler::lock_object(Register Rmark, Register Roop, Register Rbox
   }
 
   if (LockingMode == LM_LIGHTWEIGHT) {
-    fast_lock(Roop, Rmark, Rscratch, slow_int);
+    lightweight_lock(Roop, Rmark, Rscratch, slow_int);
   } else if (LockingMode == LM_LEGACY) {
     // ... and mark it unlocked.
     ori(Rmark, Rmark, markWord::unlocked_value);
@@ -181,7 +181,7 @@ void C1_MacroAssembler::unlock_object(Register Rmark, Register Roop, Register Rb
     ld(Rmark, oopDesc::mark_offset_in_bytes(), Roop);
     andi_(R0, Rmark, markWord::monitor_value);
     bne(CCR0, slow_int);
-    fast_unlock(Roop, Rmark, slow_int);
+    lightweight_unlock(Roop, Rmark, slow_int);
   } else if (LockingMode == LM_LEGACY) {
     // Check if it is still a light weight lock, this is is true if we see
     // the stack address of the basicLock in the markWord of the object.
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
index a6d5d86b183..973c596df88 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
@@ -987,7 +987,7 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {
     }
 
     if (LockingMode == LM_LIGHTWEIGHT) {
-      fast_lock(object, /* mark word */ header, tmp, slow_case);
+      lightweight_lock(object, /* mark word */ header, tmp, slow_case);
       b(count_locking);
     } else if (LockingMode == LM_LEGACY) {
 
@@ -1137,7 +1137,7 @@ void InterpreterMacroAssembler::unlock_object(Register monitor) {
       ld(header, oopDesc::mark_offset_in_bytes(), object);
       andi_(R0, header, markWord::monitor_value);
       bne(CCR0, slow_case);
-      fast_unlock(object, header, slow_case);
+      lightweight_unlock(object, header, slow_case);
     } else {
       addi(object_mark_addr, object, oopDesc::mark_offset_in_bytes());
 
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 4e7d5cde8a5..8942199610e 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -2250,7 +2250,7 @@ void MacroAssembler::compiler_fast_lock_object(ConditionRegister flag, Register
     b(failure);
   } else {
     assert(LockingMode == LM_LIGHTWEIGHT, "must be");
-    fast_lock(oop, displaced_header, temp, failure);
+    lightweight_lock(oop, displaced_header, temp, failure);
     b(success);
   }
 
@@ -2334,7 +2334,7 @@ void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Registe
     b(success);
   } else {
     assert(LockingMode == LM_LIGHTWEIGHT, "must be");
-    fast_unlock(oop, current_header, failure);
+    lightweight_unlock(oop, current_header, failure);
     b(success);
   }
 
@@ -3993,14 +3993,14 @@ void MacroAssembler::atomically_flip_locked_state(bool is_unlock, Register obj,
   }
 }
 
-// Implements fast-locking.
+// Implements lightweight-locking.
 // Branches to slow upon failure to lock the object, with CCR0 NE.
 // Falls through upon success with CCR0 EQ.
 //
 //  - obj: the object to be locked
 //  - hdr: the header, already loaded from obj, will be destroyed
 //  - t1: temporary register
-void MacroAssembler::fast_lock(Register obj, Register hdr, Register t1, Label& slow) {
+void MacroAssembler::lightweight_lock(Register obj, Register hdr, Register t1, Label& slow) {
   assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking");
   assert_different_registers(obj, hdr, t1);
 
@@ -4026,13 +4026,13 @@ void MacroAssembler::fast_lock(Register obj, Register hdr, Register t1, Label& s
   stw(t1, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread);
 }
 
-// Implements fast-unlocking.
+// Implements lightweight-unlocking.
 // Branches to slow upon failure, with CCR0 NE.
 // Falls through upon success, with CCR0 EQ.
 //
 // - obj: the object to be unlocked
 // - hdr: the (pre-loaded) header of the object, will be destroyed
-void MacroAssembler::fast_unlock(Register obj, Register hdr, Label& slow) {
+void MacroAssembler::lightweight_unlock(Register obj, Register hdr, Label& slow) {
   assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking");
   assert_different_registers(obj, hdr);
 
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
index 249e3ad5630..52d8e7fa96d 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
@@ -606,8 +606,8 @@ class MacroAssembler: public Assembler {
   void inc_held_monitor_count(Register tmp);
   void dec_held_monitor_count(Register tmp);
   void atomically_flip_locked_state(bool is_unlock, Register obj, Register tmp, Label& failed, int semantics);
-  void fast_lock(Register obj, Register hdr, Register t1, Label& slow);
-  void fast_unlock(Register obj, Register hdr, Label& slow);
+  void lightweight_lock(Register obj, Register hdr, Register t1, Label& slow);
+  void lightweight_unlock(Register obj, Register hdr, Label& slow);
 
   // allocation (for C1)
   void tlab_allocate(
diff --git a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
index 2af629a67cd..1ab33e02487 100644
--- a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
@@ -73,7 +73,7 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
   ld(hdr, Address(obj, hdr_offset));
 
   if (LockingMode == LM_LIGHTWEIGHT) {
-    fast_lock(obj, hdr, t0, t1, slow_case);
+    lightweight_lock(obj, hdr, t0, t1, slow_case);
   } else if (LockingMode == LM_LEGACY) {
     Label done;
     // and mark it as unlocked
@@ -137,7 +137,7 @@ void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register disp_
     ld(hdr, Address(obj, oopDesc::mark_offset_in_bytes()));
     test_bit(t0, hdr, exact_log2(markWord::monitor_value));
     bnez(t0, slow_case, /* is_far */ true);
-    fast_unlock(obj, hdr, t0, t1, slow_case);
+    lightweight_unlock(obj, hdr, t0, t1, slow_case);
   } else if (LockingMode == LM_LEGACY) {
     // test if object header is pointing to the displaced header, and if so, restore
     // the displaced header in the object - if the object header is not pointing to
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
index eaae477d7e6..5580983b8d2 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -836,7 +836,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg)
 
     if (LockingMode == LM_LIGHTWEIGHT) {
       ld(tmp, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
-      fast_lock(obj_reg, tmp, t0, t1, slow_case);
+      lightweight_lock(obj_reg, tmp, t0, t1, slow_case);
       j(count);
     } else if (LockingMode == LM_LEGACY) {
       // Load (object->mark() | 1) into swap_reg
@@ -949,7 +949,7 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg)
       ld(header_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
       test_bit(t0, header_reg, exact_log2(markWord::monitor_value));
       bnez(t0, slow_case);
-      fast_unlock(obj_reg, header_reg, swap_reg, t0, slow_case);
+      lightweight_unlock(obj_reg, header_reg, swap_reg, t0, slow_case);
       j(count);
 
       bind(slow_case);
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index e52037d5036..060284c0cd4 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -4647,14 +4647,14 @@ void MacroAssembler::test_bit(Register Rd, Register Rs, uint32_t bit_pos, Regist
   andi(Rd, Rs, 1UL << bit_pos, tmp);
 }
 
-// Implements fast-locking.
+// Implements lightweight-locking.
 // Branches to slow upon failure to lock the object.
 // Falls through upon success.
 //
 //  - obj: the object to be locked
 //  - hdr: the header, already loaded from obj, will be destroyed
 //  - tmp1, tmp2: temporary registers, will be destroyed
-void MacroAssembler::fast_lock(Register obj, Register hdr, Register tmp1, Register tmp2, Label& slow) {
+void MacroAssembler::lightweight_lock(Register obj, Register hdr, Register tmp1, Register tmp2, Label& slow) {
   assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking");
   assert_different_registers(obj, hdr, tmp1, tmp2);
 
@@ -4681,14 +4681,14 @@ void MacroAssembler::fast_lock(Register obj, Register hdr, Register tmp1, Regist
   sw(tmp1, Address(xthread, JavaThread::lock_stack_top_offset()));
 }
 
-// Implements fast-unlocking.
+// Implements ligthweight-unlocking.
 // Branches to slow upon failure.
 // Falls through upon success.
 //
 // - obj: the object to be unlocked
 // - hdr: the (pre-loaded) header of the object
 // - tmp1, tmp2: temporary registers
-void MacroAssembler::fast_unlock(Register obj, Register hdr, Register tmp1, Register tmp2, Label& slow) {
+void MacroAssembler::lightweight_unlock(Register obj, Register hdr, Register tmp1, Register tmp2, Label& slow) {
   assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking");
   assert_different_registers(obj, hdr, tmp1, tmp2);
 
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index 08702f43817..da3487392e6 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -1457,8 +1457,8 @@ class MacroAssembler: public Assembler {
   void store_conditional(Register dst, Register new_val, Register addr, enum operand_size size, Assembler::Aqrl release);
 
 public:
-  void fast_lock(Register obj, Register hdr, Register tmp1, Register tmp2, Label& slow);
-  void fast_unlock(Register obj, Register hdr, Register tmp1, Register tmp2, Label& slow);
+  void lightweight_lock(Register obj, Register hdr, Register tmp1, Register tmp2, Label& slow);
+  void lightweight_unlock(Register obj, Register hdr, Register tmp1, Register tmp2, Label& slow);
 };
 
 #ifdef ASSERT
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 01979ea7efa..98d016c3668 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -2502,7 +2502,7 @@ encode %{
     } else {
       assert(LockingMode == LM_LIGHTWEIGHT, "");
       Label slow;
-      __ fast_lock(oop, disp_hdr, tmp, t0, slow);
+      __ lightweight_lock(oop, disp_hdr, tmp, t0, slow);
 
       // Indicate success on completion.
       __ mv(flag, zr);
@@ -2593,7 +2593,7 @@ encode %{
     } else {
       assert(LockingMode == LM_LIGHTWEIGHT, "");
       Label slow;
-      __ fast_unlock(oop, tmp, box, disp_hdr, slow);
+      __ lightweight_unlock(oop, tmp, box, disp_hdr, slow);
 
       // Indicate success on completion.
       __ mv(flag, zr);
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index 0c671ae1203..287c422d64f 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -1701,7 +1701,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
     } else {
       assert(LockingMode == LM_LIGHTWEIGHT, "");
       __ ld(swap_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
-      __ fast_lock(obj_reg, swap_reg, tmp, t0, slow_path_lock);
+      __ lightweight_lock(obj_reg, swap_reg, tmp, t0, slow_path_lock);
     }
 
     __ bind(count);
@@ -1829,7 +1829,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       __ ld(old_hdr, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
       __ test_bit(t0, old_hdr, exact_log2(markWord::monitor_value));
       __ bnez(t0, slow_path_unlock);
-      __ fast_unlock(obj_reg, old_hdr, swap_reg, t0, slow_path_unlock);
+      __ lightweight_unlock(obj_reg, old_hdr, swap_reg, t0, slow_path_unlock);
       __ decrement(Address(xthread, JavaThread::held_monitor_count_offset()));
     }
 
diff --git a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
index fd0cdaba5a9..78361a305ae 100644
--- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
@@ -70,7 +70,7 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
     const Register thread = disp_hdr;
     get_thread(thread);
 #endif
-    fast_lock_impl(obj, hdr, thread, tmp, slow_case);
+    lightweight_lock(obj, hdr, thread, tmp, slow_case);
   } else  if (LockingMode == LM_LEGACY) {
     Label done;
     // and mark it as unlocked
@@ -136,7 +136,7 @@ void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register disp_
   if (LockingMode == LM_LIGHTWEIGHT) {
     movptr(disp_hdr, Address(obj, hdr_offset));
     andptr(disp_hdr, ~(int32_t)markWord::lock_mask_in_place);
-    fast_unlock_impl(obj, disp_hdr, hdr, slow_case);
+    lightweight_unlock(obj, disp_hdr, hdr, slow_case);
   } else if (LockingMode == LM_LEGACY) {
     // test if object header is pointing to the displaced header, and if so, restore
     // the displaced header in the object - if the object header is not pointing to
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index c31eeeeb8af..2154601f2f2 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -622,7 +622,7 @@ void C2_MacroAssembler::fast_lock(Register objReg, Register boxReg, Register tmp
     movptr(Address(boxReg, 0), tmpReg);
   } else {
     assert(LockingMode == LM_LIGHTWEIGHT, "");
-    fast_lock_impl(objReg, tmpReg, thread, scrReg, NO_COUNT);
+    lightweight_lock(objReg, tmpReg, thread, scrReg, NO_COUNT);
     jmp(COUNT);
   }
   jmp(DONE_LABEL);
@@ -926,7 +926,7 @@ void C2_MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register t
     bind  (Stacked);
     if (LockingMode == LM_LIGHTWEIGHT) {
       mov(boxReg, tmpReg);
-      fast_unlock_impl(objReg, boxReg, tmpReg, NO_COUNT);
+      lightweight_unlock(objReg, boxReg, tmpReg, NO_COUNT);
       jmp(COUNT);
     } else if (LockingMode == LM_LEGACY) {
       movptr(tmpReg, Address (boxReg, 0));      // re-fetch
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index b10aea093dd..f8a6c5b4f19 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -1236,7 +1236,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg) {
 #endif
       // Load object header, prepare for CAS from unlocked to locked.
       movptr(swap_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
-      fast_lock_impl(obj_reg, swap_reg, thread, tmp_reg, slow_case);
+      lightweight_lock(obj_reg, swap_reg, thread, tmp_reg, slow_case);
     } else if (LockingMode == LM_LEGACY) {
       // Load immediate 1 into swap_reg %rax
       movl(swap_reg, 1);
@@ -1366,7 +1366,7 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg) {
       // Try to swing header from locked to unlocked.
       movptr(swap_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
       andptr(swap_reg, ~(int32_t)markWord::lock_mask_in_place);
-      fast_unlock_impl(obj_reg, swap_reg, header_reg, slow_case);
+      lightweight_unlock(obj_reg, swap_reg, header_reg, slow_case);
     } else if (LockingMode == LM_LEGACY) {
       // Load the old header from BasicLock structure
       movptr(header_reg, Address(swap_reg,
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 5ff2261f3f2..26135c65418 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -9789,7 +9789,7 @@ void MacroAssembler::check_stack_alignment(Register sp, const char* msg, unsigne
   bind(L_stack_ok);
 }
 
-// Implements fast-locking.
+// Implements lightweight-locking.
 // Branches to slow upon failure to lock the object, with ZF cleared.
 // Falls through upon success with unspecified ZF.
 //
@@ -9797,7 +9797,7 @@ void MacroAssembler::check_stack_alignment(Register sp, const char* msg, unsigne
 // hdr: the (pre-loaded) header of the object, must be rax
 // thread: the thread which attempts to lock obj
 // tmp: a temporary register
-void MacroAssembler::fast_lock_impl(Register obj, Register hdr, Register thread, Register tmp, Label& slow) {
+void MacroAssembler::lightweight_lock(Register obj, Register hdr, Register thread, Register tmp, Label& slow) {
   assert(hdr == rax, "header must be in rax for cmpxchg");
   assert_different_registers(obj, hdr, thread, tmp);
 
@@ -9825,14 +9825,14 @@ void MacroAssembler::fast_lock_impl(Register obj, Register hdr, Register thread,
   movl(Address(thread, JavaThread::lock_stack_top_offset()), tmp);
 }
 
-// Implements fast-unlocking.
+// Implements lightweight-unlocking.
 // Branches to slow upon failure, with ZF cleared.
 // Falls through upon success, with unspecified ZF.
 //
 // obj: the object to be unlocked
 // hdr: the (pre-loaded) header of the object, must be rax
 // tmp: a temporary register
-void MacroAssembler::fast_unlock_impl(Register obj, Register hdr, Register tmp, Label& slow) {
+void MacroAssembler::lightweight_unlock(Register obj, Register hdr, Register tmp, Label& slow) {
   assert(hdr == rax, "header must be in rax for cmpxchg");
   assert_different_registers(obj, hdr, tmp);
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index 057bb6831a0..fad9d0c7d3c 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -2023,8 +2023,8 @@ class MacroAssembler: public Assembler {
 
   void check_stack_alignment(Register sp, const char* msg, unsigned bias = 0, Register tmp = noreg);
 
-  void fast_lock_impl(Register obj, Register hdr, Register thread, Register tmp, Label& slow);
-  void fast_unlock_impl(Register obj, Register hdr, Register tmp, Label& slow);
+  void lightweight_lock(Register obj, Register hdr, Register thread, Register tmp, Label& slow);
+  void lightweight_unlock(Register obj, Register hdr, Register tmp, Label& slow);
 };
 
 /**
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
index 7995ed5b265..c391349cfa3 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
@@ -1717,7 +1717,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       assert(LockingMode == LM_LIGHTWEIGHT, "must be");
       // Load object header
       __ movptr(swap_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
-      __ fast_lock_impl(obj_reg, swap_reg, thread, lock_reg, slow_path_lock);
+      __ lightweight_lock(obj_reg, swap_reg, thread, lock_reg, slow_path_lock);
     }
     __ bind(count_mon);
     __ inc_held_monitor_count();
@@ -1876,7 +1876,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       assert(LockingMode == LM_LIGHTWEIGHT, "must be");
       __ movptr(swap_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
       __ andptr(swap_reg, ~(int32_t)markWord::lock_mask_in_place);
-      __ fast_unlock_impl(obj_reg, swap_reg, lock_reg, slow_path_unlock);
+      __ lightweight_unlock(obj_reg, swap_reg, lock_reg, slow_path_unlock);
       __ dec_held_monitor_count();
     }
 
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index 5a4174f2914..56f66284324 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -2188,7 +2188,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       assert(LockingMode == LM_LIGHTWEIGHT, "must be");
       // Load object header
       __ movptr(swap_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
-      __ fast_lock_impl(obj_reg, swap_reg, r15_thread, rscratch1, slow_path_lock);
+      __ lightweight_lock(obj_reg, swap_reg, r15_thread, rscratch1, slow_path_lock);
     }
     __ bind(count_mon);
     __ inc_held_monitor_count();
@@ -2332,7 +2332,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       assert(LockingMode == LM_LIGHTWEIGHT, "must be");
       __ movptr(swap_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
       __ andptr(swap_reg, ~(int32_t)markWord::lock_mask_in_place);
-      __ fast_unlock_impl(obj_reg, swap_reg, lock_reg, slow_path_unlock);
+      __ lightweight_unlock(obj_reg, swap_reg, lock_reg, slow_path_unlock);
       __ dec_held_monitor_count();
     }
 

From 903b9e8dd966fbb61222c59048b752ed8b42b608 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Thu, 14 Sep 2023 07:06:20 +0000
Subject: [PATCH 007/112] 8316199: Remove sun/tools/jstatd/TestJstatd* tests
 from problemlist for Windows.

Reviewed-by: lmesnik, cjplummer
---
 test/jdk/ProblemList.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 1dedbb35a08..f369d4fb434 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -722,9 +722,7 @@ java/util/concurrent/ExecutorService/CloseTest.java             8288899 macosx-a
 
 # svc_tools
 
-sun/tools/jstatd/TestJstatdDefaults.java                        8081569 windows-all
 sun/tools/jstatd/TestJstatdRmiPort.java                         8251259,8293577 generic-all
-sun/tools/jstatd/TestJstatdServer.java                          8081569 windows-all
 
 sun/tools/jstat/jstatLineCounts1.sh                             8268211 linux-aarch64
 sun/tools/jstat/jstatLineCounts2.sh                             8268211 linux-aarch64

From 14408bc8f846447312fd18dde1f8c615ddad61c0 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Thu, 14 Sep 2023 09:01:13 +0000
Subject: [PATCH 008/112] 8315973: Remove unused fields from ThreadLocalRandom

Reviewed-by: jpai
---
 .../classes/java/util/concurrent/ThreadLocalRandom.java  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
index 41f954b5b08..dd1ea70195b 100644
--- a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
@@ -39,14 +39,10 @@
 package java.util.concurrent;
 
 import java.io.ObjectStreamField;
-import java.math.BigInteger;
 import java.security.AccessControlContext;
-import java.util.Map;
 import java.util.Random;
-import java.util.Spliterator;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.random.RandomGenerator;
 import java.util.stream.DoubleStream;
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
@@ -368,11 +364,6 @@ private Object readResolve() {
      */
     private static final long SEEDER_INCREMENT = 0xbb67ae8584caa73bL;
 
-    // IllegalArgumentException messages
-    static final String BAD_BOUND = "bound must be positive";
-    static final String BAD_RANGE = "bound must be greater than origin";
-    static final String BAD_SIZE  = "size must be non-negative";
-
     // Unsafe mechanics
     private static final Unsafe U = Unsafe.getUnsafe();
     private static final long SEED

From 33c62e4fffe33a7593fd0c01de53507bfd01dc3b Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 14 Sep 2023 10:09:08 +0000
Subject: [PATCH 009/112] 8316154: Opensource JTextArea manual tests

Reviewed-by: abhiscxk, jdv
---
 .../jdk/javax/swing/JTextArea/bug4265784.java | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 test/jdk/javax/swing/JTextArea/bug4265784.java

diff --git a/test/jdk/javax/swing/JTextArea/bug4265784.java b/test/jdk/javax/swing/JTextArea/bug4265784.java
new file mode 100644
index 00000000000..3465fced595
--- /dev/null
+++ b/test/jdk/javax/swing/JTextArea/bug4265784.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4265784 4267291
+ * @summary Tests work of TAB key in JTextArea
+ * @key headful
+ * @run main bug4265784
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+public class bug4265784 {
+    static JFrame frame;
+    static JTextArea ta;
+    static volatile Point p;
+    static volatile int pos;
+    static volatile int pos1;
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+        robot.setAutoDelay(100);
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame("bug4265784");
+                ta = new JTextArea();
+                frame.getContentPane().add(ta);
+                frame.pack();
+                frame.setLocationRelativeTo(null);
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                p = ta.getLocationOnScreen();
+            });
+            robot.mouseMove(p.x + 10, p.y + 10);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            SwingUtilities.invokeAndWait(() -> {
+                pos = ta.getCaretPosition();
+            });
+            System.out.println(pos);
+            robot.keyPress(KeyEvent.VK_TAB);
+            robot.keyRelease(KeyEvent.VK_TAB);
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                pos1 = ta.getCaretPosition();
+            });
+            System.out.println(pos1);
+            if (pos == pos1) {
+                throw new RuntimeException("TAB ignored");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}

From 8f4dfc443ba5820f5799fff1418d6632d502d57b Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 14 Sep 2023 10:21:44 +0000
Subject: [PATCH 010/112] 8316164: Opensource JMenuBar manual test

Reviewed-by: tr, jdv
---
 test/jdk/javax/swing/JMenuBar/bug4403749.java | 128 ++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 test/jdk/javax/swing/JMenuBar/bug4403749.java

diff --git a/test/jdk/javax/swing/JMenuBar/bug4403749.java b/test/jdk/javax/swing/JMenuBar/bug4403749.java
new file mode 100644
index 00000000000..e98c0eaee3f
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuBar/bug4403749.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4403749
+ * @summary Tests that keyboard accelerator implementation in JMenuBar is
+            MenuElement aware
+ * @key headful
+ * @run main bug4403749
+ */
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JPanel;
+import javax.swing.KeyStroke;
+import javax.swing.MenuElement;
+import javax.swing.MenuSelectionManager;
+import javax.swing.SwingUtilities;
+
+public class bug4403749 {
+    static JFrame frame;
+    static volatile Point pt;
+    static volatile Dimension dim;
+    static volatile boolean passed;
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+        robot.setAutoDelay(100);
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame("bug4403749");
+                JMenuBar mbar = new JMenuBar();
+                JMenu menu = new JMenu("Menu");
+                JPanel panel = new TestMenuElement();
+                menu.add(panel);
+                mbar.add(menu);
+                frame.setJMenuBar(mbar);
+
+                frame.getContentPane().add(new JButton(""));
+                frame.setSize(200, 200);
+                frame.setLocationRelativeTo(null);
+                frame.setAlwaysOnTop(true);
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                pt = frame.getLocationOnScreen();
+                dim = frame.getSize();
+            });
+            robot.mouseMove(pt.x + dim.width / 2, pt.y + dim.height / 2);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+            robot.delay(200);
+            robot.keyPress(KeyEvent.VK_ALT);
+            robot.keyPress(KeyEvent.VK_A);
+            robot.keyRelease(KeyEvent.VK_A);
+            robot.keyRelease(KeyEvent.VK_ALT);
+            if (!passed) {
+                throw new RuntimeException("Failed: processKeyBinding wasn't called");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                 }
+            });
+        }
+    }
+
+    static class TestMenuElement extends JPanel implements MenuElement {
+        public void processMouseEvent(MouseEvent event,
+                                      MenuElement[] path,
+                                      MenuSelectionManager manager) {}
+
+        public void processKeyEvent(KeyEvent event,
+                                    MenuElement[] path,
+                                    MenuSelectionManager manager) {}
+
+        public void menuSelectionChanged(boolean isIncluded) {}
+
+        public MenuElement[] getSubElements() {
+            return new MenuElement[0];
+        }
+
+        public Component getComponent() {
+            return this;
+        }
+
+        protected boolean processKeyBinding(KeyStroke ks, KeyEvent e,
+                                            int condition, boolean pressed) {
+            passed = true;
+            return super.processKeyBinding(ks, e, condition, pressed);
+        }
+    }
+}

From b48dbf6bfa652ef031c35f0a85a409142563aa72 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Thu, 14 Sep 2023 11:50:24 +0000
Subject: [PATCH 011/112] 8316181: Move the fast locking implementation out of
 the .ad files

Reviewed-by: thartmann, rkennke, fyang
---
 src/hotspot/cpu/aarch64/aarch64.ad            | 204 +---------------
 .../cpu/aarch64/c2_MacroAssembler_aarch64.cpp | 196 +++++++++++++++
 .../cpu/aarch64/c2_MacroAssembler_aarch64.hpp |   5 +
 .../cpu/riscv/c2_MacroAssembler_riscv.cpp     | 217 +++++++++++++++++
 .../cpu/riscv/c2_MacroAssembler_riscv.hpp     |   5 +
 src/hotspot/cpu/riscv/riscv.ad                | 225 +-----------------
 6 files changed, 435 insertions(+), 417 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 2f83b2d99c7..6f56d0e8386 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -3816,202 +3816,6 @@ encode %{
     __ br(target_reg);
   %}
 
-  enc_class aarch64_enc_fast_lock(iRegP object, iRegP box, iRegP tmp, iRegP tmp2) %{
-    C2_MacroAssembler _masm(&cbuf);
-    Register oop = as_Register($object$$reg);
-    Register box = as_Register($box$$reg);
-    Register disp_hdr = as_Register($tmp$$reg);
-    Register tmp = as_Register($tmp2$$reg);
-    Label cont;
-    Label object_has_monitor;
-    Label count, no_count;
-
-    assert_different_registers(oop, box, tmp, disp_hdr);
-
-    // Load markWord from object into displaced_header.
-    __ ldr(disp_hdr, Address(oop, oopDesc::mark_offset_in_bytes()));
-
-    if (DiagnoseSyncOnValueBasedClasses != 0) {
-      __ load_klass(tmp, oop);
-      __ ldrw(tmp, Address(tmp, Klass::access_flags_offset()));
-      __ tstw(tmp, JVM_ACC_IS_VALUE_BASED_CLASS);
-      __ br(Assembler::NE, cont);
-    }
-
-    // Check for existing monitor
-    __ tbnz(disp_hdr, exact_log2(markWord::monitor_value), object_has_monitor);
-
-    if (LockingMode == LM_MONITOR) {
-      __ tst(oop, oop); // Set NE to indicate 'failure' -> take slow-path. We know that oop != 0.
-      __ b(cont);
-    } else if (LockingMode == LM_LEGACY) {
-      // Set tmp to be (markWord of object | UNLOCK_VALUE).
-      __ orr(tmp, disp_hdr, markWord::unlocked_value);
-
-      // Initialize the box. (Must happen before we update the object mark!)
-      __ str(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
-
-      // Compare object markWord with an unlocked value (tmp) and if
-      // equal exchange the stack address of our box with object markWord.
-      // On failure disp_hdr contains the possibly locked markWord.
-      __ cmpxchg(oop, tmp, box, Assembler::xword, /*acquire*/ true,
-                 /*release*/ true, /*weak*/ false, disp_hdr);
-      __ br(Assembler::EQ, cont);
-
-      assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
-
-      // If the compare-and-exchange succeeded, then we found an unlocked
-      // object, will have now locked it will continue at label cont
-
-      // Check if the owner is self by comparing the value in the
-      // markWord of object (disp_hdr) with the stack pointer.
-      __ mov(rscratch1, sp);
-      __ sub(disp_hdr, disp_hdr, rscratch1);
-      __ mov(tmp, (address) (~(os::vm_page_size()-1) | markWord::lock_mask_in_place));
-      // If condition is true we are cont and hence we can store 0 as the
-      // displaced header in the box, which indicates that it is a recursive lock.
-      __ ands(tmp/*==0?*/, disp_hdr, tmp);   // Sets flags for result
-      __ str(tmp/*==0, perhaps*/, Address(box, BasicLock::displaced_header_offset_in_bytes()));
-      __ b(cont);
-    } else {
-      assert(LockingMode == LM_LIGHTWEIGHT, "must be");
-      __ lightweight_lock(oop, disp_hdr, tmp, rscratch1, no_count);
-      __ b(count);
-    }
-
-    // Handle existing monitor.
-    __ bind(object_has_monitor);
-
-    // The object's monitor m is unlocked iff m->owner == NULL,
-    // otherwise m->owner may contain a thread or a stack address.
-    //
-    // Try to CAS m->owner from NULL to current thread.
-    __ add(tmp, disp_hdr, (in_bytes(ObjectMonitor::owner_offset())-markWord::monitor_value));
-    __ cmpxchg(tmp, zr, rthread, Assembler::xword, /*acquire*/ true,
-               /*release*/ true, /*weak*/ false, rscratch1); // Sets flags for result
-
-    if (LockingMode != LM_LIGHTWEIGHT) {
-      // Store a non-null value into the box to avoid looking like a re-entrant
-      // lock. The fast-path monitor unlock code checks for
-      // markWord::monitor_value so use markWord::unused_mark which has the
-      // relevant bit set, and also matches ObjectSynchronizer::enter.
-      __ mov(tmp, (address)markWord::unused_mark().value());
-      __ str(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
-    }
-    __ br(Assembler::EQ, cont); // CAS success means locking succeeded
-
-    __ cmp(rscratch1, rthread);
-    __ br(Assembler::NE, cont); // Check for recursive locking
-
-    // Recursive lock case
-    __ increment(Address(disp_hdr, in_bytes(ObjectMonitor::recursions_offset()) - markWord::monitor_value), 1);
-    // flag == EQ still from the cmp above, checking if this is a reentrant lock
-
-    __ bind(cont);
-    // flag == EQ indicates success
-    // flag == NE indicates failure
-    __ br(Assembler::NE, no_count);
-
-    __ bind(count);
-    __ increment(Address(rthread, JavaThread::held_monitor_count_offset()));
-
-    __ bind(no_count);
-  %}
-
-  enc_class aarch64_enc_fast_unlock(iRegP object, iRegP box, iRegP tmp, iRegP tmp2) %{
-    C2_MacroAssembler _masm(&cbuf);
-    Register oop = as_Register($object$$reg);
-    Register box = as_Register($box$$reg);
-    Register disp_hdr = as_Register($tmp$$reg);
-    Register tmp = as_Register($tmp2$$reg);
-    Label cont;
-    Label object_has_monitor;
-    Label count, no_count;
-
-    assert_different_registers(oop, box, tmp, disp_hdr);
-
-    if (LockingMode == LM_LEGACY) {
-      // Find the lock address and load the displaced header from the stack.
-      __ ldr(disp_hdr, Address(box, BasicLock::displaced_header_offset_in_bytes()));
-
-      // If the displaced header is 0, we have a recursive unlock.
-      __ cmp(disp_hdr, zr);
-      __ br(Assembler::EQ, cont);
-    }
-
-    // Handle existing monitor.
-    __ ldr(tmp, Address(oop, oopDesc::mark_offset_in_bytes()));
-    __ tbnz(tmp, exact_log2(markWord::monitor_value), object_has_monitor);
-
-    if (LockingMode == LM_MONITOR) {
-      __ tst(oop, oop); // Set NE to indicate 'failure' -> take slow-path. We know that oop != 0.
-      __ b(cont);
-    } else if (LockingMode == LM_LEGACY) {
-      // Check if it is still a light weight lock, this is is true if we
-      // see the stack address of the basicLock in the markWord of the
-      // object.
-
-      __ cmpxchg(oop, box, disp_hdr, Assembler::xword, /*acquire*/ false,
-                 /*release*/ true, /*weak*/ false, tmp);
-      __ b(cont);
-    } else {
-      assert(LockingMode == LM_LIGHTWEIGHT, "must be");
-      __ lightweight_unlock(oop, tmp, box, disp_hdr, no_count);
-      __ b(count);
-    }
-
-    assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
-
-    // Handle existing monitor.
-    __ bind(object_has_monitor);
-    STATIC_ASSERT(markWord::monitor_value <= INT_MAX);
-    __ add(tmp, tmp, -(int)markWord::monitor_value); // monitor
-
-    if (LockingMode == LM_LIGHTWEIGHT) {
-      // If the owner is anonymous, we need to fix it -- in an outline stub.
-      Register tmp2 = disp_hdr;
-      __ ldr(tmp2, Address(tmp, ObjectMonitor::owner_offset()));
-      // We cannot use tbnz here, the target might be too far away and cannot
-      // be encoded.
-      __ tst(tmp2, (uint64_t)ObjectMonitor::ANONYMOUS_OWNER);
-      C2HandleAnonOMOwnerStub* stub = new (Compile::current()->comp_arena()) C2HandleAnonOMOwnerStub(tmp, tmp2);
-      Compile::current()->output()->add_stub(stub);
-      __ br(Assembler::NE, stub->entry());
-      __ bind(stub->continuation());
-    }
-
-    __ ldr(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset()));
-
-    Label notRecursive;
-    __ cbz(disp_hdr, notRecursive);
-
-    // Recursive lock
-    __ sub(disp_hdr, disp_hdr, 1u);
-    __ str(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset()));
-    __ cmp(disp_hdr, disp_hdr); // Sets flags for result
-    __ b(cont);
-
-    __ bind(notRecursive);
-    __ ldr(rscratch1, Address(tmp, ObjectMonitor::EntryList_offset()));
-    __ ldr(disp_hdr, Address(tmp, ObjectMonitor::cxq_offset()));
-    __ orr(rscratch1, rscratch1, disp_hdr); // Will be 0 if both are 0.
-    __ cmp(rscratch1, zr); // Sets flags for result
-    __ cbnz(rscratch1, cont);
-    // need a release store here
-    __ lea(tmp, Address(tmp, ObjectMonitor::owner_offset()));
-    __ stlr(zr, tmp); // set unowned
-
-    __ bind(cont);
-    // flag == EQ indicates success
-    // flag == NE indicates failure
-    __ br(Assembler::NE, no_count);
-
-    __ bind(count);
-    __ decrement(Address(rthread, JavaThread::held_monitor_count_offset()));
-
-    __ bind(no_count);
-  %}
-
 %}
 
 //----------FRAME--------------------------------------------------------------
@@ -16626,7 +16430,9 @@ instruct cmpFastLock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp, iRegP
   ins_cost(5 * INSN_COST);
   format %{ "fastlock $object,$box\t! kills $tmp,$tmp2" %}
 
-  ins_encode(aarch64_enc_fast_lock(object, box, tmp, tmp2));
+  ins_encode %{
+    __ fast_lock($object$$Register, $box$$Register, $tmp$$Register, $tmp2$$Register);
+  %}
 
   ins_pipe(pipe_serial);
 %}
@@ -16639,7 +16445,9 @@ instruct cmpFastUnlock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp, iRe
   ins_cost(5 * INSN_COST);
   format %{ "fastunlock $object,$box\t! kills $tmp, $tmp2" %}
 
-  ins_encode(aarch64_enc_fast_unlock(object, box, tmp, tmp2));
+  ins_encode %{
+    __ fast_unlock($object$$Register, $box$$Register, $tmp$$Register, $tmp2$$Register);
+  %}
 
   ins_pipe(pipe_serial);
 %}
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index dbe64f8f9ca..8890b5a3411 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -45,6 +45,202 @@
 
 typedef void (MacroAssembler::* chr_insn)(Register Rt, const Address &adr);
 
+void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg, Register tmpReg,
+                                  Register tmp2Reg) {
+  Register oop = objectReg;
+  Register box = boxReg;
+  Register disp_hdr = tmpReg;
+  Register tmp = tmp2Reg;
+  Label cont;
+  Label object_has_monitor;
+  Label count, no_count;
+
+  assert_different_registers(oop, box, tmp, disp_hdr);
+
+  // Load markWord from object into displaced_header.
+  ldr(disp_hdr, Address(oop, oopDesc::mark_offset_in_bytes()));
+
+  if (DiagnoseSyncOnValueBasedClasses != 0) {
+    load_klass(tmp, oop);
+    ldrw(tmp, Address(tmp, Klass::access_flags_offset()));
+    tstw(tmp, JVM_ACC_IS_VALUE_BASED_CLASS);
+    br(Assembler::NE, cont);
+  }
+
+  // Check for existing monitor
+  tbnz(disp_hdr, exact_log2(markWord::monitor_value), object_has_monitor);
+
+  if (LockingMode == LM_MONITOR) {
+    tst(oop, oop); // Set NE to indicate 'failure' -> take slow-path. We know that oop != 0.
+    b(cont);
+  } else if (LockingMode == LM_LEGACY) {
+    // Set tmp to be (markWord of object | UNLOCK_VALUE).
+    orr(tmp, disp_hdr, markWord::unlocked_value);
+
+    // Initialize the box. (Must happen before we update the object mark!)
+    str(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+
+    // Compare object markWord with an unlocked value (tmp) and if
+    // equal exchange the stack address of our box with object markWord.
+    // On failure disp_hdr contains the possibly locked markWord.
+    cmpxchg(oop, tmp, box, Assembler::xword, /*acquire*/ true,
+            /*release*/ true, /*weak*/ false, disp_hdr);
+    br(Assembler::EQ, cont);
+
+    assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
+
+    // If the compare-and-exchange succeeded, then we found an unlocked
+    // object, will have now locked it will continue at label cont
+
+    // Check if the owner is self by comparing the value in the
+    // markWord of object (disp_hdr) with the stack pointer.
+    mov(rscratch1, sp);
+    sub(disp_hdr, disp_hdr, rscratch1);
+    mov(tmp, (address) (~(os::vm_page_size()-1) | markWord::lock_mask_in_place));
+    // If condition is true we are cont and hence we can store 0 as the
+    // displaced header in the box, which indicates that it is a recursive lock.
+    ands(tmp/*==0?*/, disp_hdr, tmp);   // Sets flags for result
+    str(tmp/*==0, perhaps*/, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+    b(cont);
+  } else {
+    assert(LockingMode == LM_LIGHTWEIGHT, "must be");
+    lightweight_lock(oop, disp_hdr, tmp, rscratch1, no_count);
+    b(count);
+  }
+
+  // Handle existing monitor.
+  bind(object_has_monitor);
+
+  // The object's monitor m is unlocked iff m->owner == NULL,
+  // otherwise m->owner may contain a thread or a stack address.
+  //
+  // Try to CAS m->owner from NULL to current thread.
+  add(tmp, disp_hdr, (in_bytes(ObjectMonitor::owner_offset())-markWord::monitor_value));
+  cmpxchg(tmp, zr, rthread, Assembler::xword, /*acquire*/ true,
+          /*release*/ true, /*weak*/ false, rscratch1); // Sets flags for result
+
+  if (LockingMode != LM_LIGHTWEIGHT) {
+    // Store a non-null value into the box to avoid looking like a re-entrant
+    // lock. The fast-path monitor unlock code checks for
+    // markWord::monitor_value so use markWord::unused_mark which has the
+    // relevant bit set, and also matches ObjectSynchronizer::enter.
+    mov(tmp, (address)markWord::unused_mark().value());
+    str(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+  }
+  br(Assembler::EQ, cont); // CAS success means locking succeeded
+
+  cmp(rscratch1, rthread);
+  br(Assembler::NE, cont); // Check for recursive locking
+
+  // Recursive lock case
+  increment(Address(disp_hdr, in_bytes(ObjectMonitor::recursions_offset()) - markWord::monitor_value), 1);
+  // flag == EQ still from the cmp above, checking if this is a reentrant lock
+
+  bind(cont);
+  // flag == EQ indicates success
+  // flag == NE indicates failure
+  br(Assembler::NE, no_count);
+
+  bind(count);
+  increment(Address(rthread, JavaThread::held_monitor_count_offset()));
+
+  bind(no_count);
+}
+
+void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg, Register tmpReg,
+                                    Register tmp2Reg) {
+  Register oop = objectReg;
+  Register box = boxReg;
+  Register disp_hdr = tmpReg;
+  Register tmp = tmp2Reg;
+  Label cont;
+  Label object_has_monitor;
+  Label count, no_count;
+
+  assert_different_registers(oop, box, tmp, disp_hdr);
+
+  if (LockingMode == LM_LEGACY) {
+    // Find the lock address and load the displaced header from the stack.
+    ldr(disp_hdr, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+
+    // If the displaced header is 0, we have a recursive unlock.
+    cmp(disp_hdr, zr);
+    br(Assembler::EQ, cont);
+  }
+
+  // Handle existing monitor.
+  ldr(tmp, Address(oop, oopDesc::mark_offset_in_bytes()));
+  tbnz(tmp, exact_log2(markWord::monitor_value), object_has_monitor);
+
+  if (LockingMode == LM_MONITOR) {
+    tst(oop, oop); // Set NE to indicate 'failure' -> take slow-path. We know that oop != 0.
+    b(cont);
+  } else if (LockingMode == LM_LEGACY) {
+    // Check if it is still a light weight lock, this is is true if we
+    // see the stack address of the basicLock in the markWord of the
+    // object.
+
+    cmpxchg(oop, box, disp_hdr, Assembler::xword, /*acquire*/ false,
+            /*release*/ true, /*weak*/ false, tmp);
+    b(cont);
+  } else {
+    assert(LockingMode == LM_LIGHTWEIGHT, "must be");
+    lightweight_unlock(oop, tmp, box, disp_hdr, no_count);
+    b(count);
+  }
+
+  assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
+
+  // Handle existing monitor.
+  bind(object_has_monitor);
+  STATIC_ASSERT(markWord::monitor_value <= INT_MAX);
+  add(tmp, tmp, -(int)markWord::monitor_value); // monitor
+
+  if (LockingMode == LM_LIGHTWEIGHT) {
+    // If the owner is anonymous, we need to fix it -- in an outline stub.
+    Register tmp2 = disp_hdr;
+    ldr(tmp2, Address(tmp, ObjectMonitor::owner_offset()));
+    // We cannot use tbnz here, the target might be too far away and cannot
+    // be encoded.
+    tst(tmp2, (uint64_t)ObjectMonitor::ANONYMOUS_OWNER);
+    C2HandleAnonOMOwnerStub* stub = new (Compile::current()->comp_arena()) C2HandleAnonOMOwnerStub(tmp, tmp2);
+    Compile::current()->output()->add_stub(stub);
+    br(Assembler::NE, stub->entry());
+    bind(stub->continuation());
+  }
+
+  ldr(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset()));
+
+  Label notRecursive;
+  cbz(disp_hdr, notRecursive);
+
+  // Recursive lock
+  sub(disp_hdr, disp_hdr, 1u);
+  str(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset()));
+  cmp(disp_hdr, disp_hdr); // Sets flags for result
+  b(cont);
+
+  bind(notRecursive);
+  ldr(rscratch1, Address(tmp, ObjectMonitor::EntryList_offset()));
+  ldr(disp_hdr, Address(tmp, ObjectMonitor::cxq_offset()));
+  orr(rscratch1, rscratch1, disp_hdr); // Will be 0 if both are 0.
+  cmp(rscratch1, zr); // Sets flags for result
+  cbnz(rscratch1, cont);
+  // need a release store here
+  lea(tmp, Address(tmp, ObjectMonitor::owner_offset()));
+  stlr(zr, tmp); // set unowned
+
+  bind(cont);
+  // flag == EQ indicates success
+  // flag == NE indicates failure
+  br(Assembler::NE, no_count);
+
+  bind(count);
+  decrement(Address(rthread, JavaThread::held_monitor_count_offset()));
+
+  bind(no_count);
+}
+
 // Search for str1 in str2 and return index or -1
 // Clobbers: rscratch1, rscratch2, rflags. May also clobber v0-v1, when icnt1==-1.
 void C2_MacroAssembler::string_indexof(Register str2, Register str1,
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
index ccfd60b1a8b..42324692de7 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
@@ -35,6 +35,11 @@
                                   enum shift_kind kind = Assembler::LSL, unsigned shift = 0);
 
  public:
+  // Code used by cmpFastLock and cmpFastUnlock mach instructions in .ad file.
+  // See full description in macroAssembler_aarch64.cpp.
+  void fast_lock(Register object, Register box, Register tmp, Register tmp2);
+  void fast_unlock(Register object, Register box, Register tmp, Register tmp2);
+
   void string_compare(Register str1, Register str2,
                       Register cnt1, Register cnt2, Register result,
                       Register tmp1, Register tmp2, FloatRegister vtmp1,
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index dfb333b7c78..c435ee66f84 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -43,6 +43,223 @@
 
 #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
 
+void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg, Register tmp1Reg,
+                                  Register tmp2Reg) {
+  // Use cr register to indicate the fast_lock result: zero for success; non-zero for failure.
+  Register flag = t1;
+  Register oop = objectReg;
+  Register box = boxReg;
+  Register disp_hdr = tmp1Reg;
+  Register tmp = tmp2Reg;
+  Label cont;
+  Label object_has_monitor;
+  Label count, no_count;
+
+  assert_different_registers(oop, box, tmp, disp_hdr, t0);
+
+  // Load markWord from object into displaced_header.
+  ld(disp_hdr, Address(oop, oopDesc::mark_offset_in_bytes()));
+
+  if (DiagnoseSyncOnValueBasedClasses != 0) {
+    load_klass(flag, oop);
+    lwu(flag, Address(flag, Klass::access_flags_offset()));
+    test_bit(flag, flag, exact_log2(JVM_ACC_IS_VALUE_BASED_CLASS), tmp /* tmp */);
+    bnez(flag, cont, true /* is_far */);
+  }
+
+  // Check for existing monitor
+  test_bit(t0, disp_hdr, exact_log2(markWord::monitor_value));
+  bnez(t0, object_has_monitor);
+
+  if (LockingMode == LM_MONITOR) {
+    mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow-path
+    j(cont);
+  } else if (LockingMode == LM_LEGACY) {
+    // Set tmp to be (markWord of object | UNLOCK_VALUE).
+    ori(tmp, disp_hdr, markWord::unlocked_value);
+
+    // Initialize the box. (Must happen before we update the object mark!)
+    sd(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+
+    // Compare object markWord with an unlocked value (tmp) and if
+    // equal exchange the stack address of our box with object markWord.
+    // On failure disp_hdr contains the possibly locked markWord.
+    cmpxchg(/*memory address*/oop, /*expected value*/tmp, /*new value*/box, Assembler::int64, Assembler::aq,
+            Assembler::rl, /*result*/disp_hdr);
+    mv(flag, zr);
+    beq(disp_hdr, tmp, cont); // prepare zero flag and goto cont if we won the cas
+
+    assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
+
+    // If the compare-and-exchange succeeded, then we found an unlocked
+    // object, will have now locked it will continue at label cont
+    // We did not see an unlocked object so try the fast recursive case.
+
+    // Check if the owner is self by comparing the value in the
+    // markWord of object (disp_hdr) with the stack pointer.
+    sub(disp_hdr, disp_hdr, sp);
+    mv(tmp, (intptr_t) (~(os::vm_page_size()-1) | (uintptr_t)markWord::lock_mask_in_place));
+    // If (mark & lock_mask) == 0 and mark - sp < page_size, we are stack-locking and goto cont,
+    // hence we can store 0 as the displaced header in the box, which indicates that it is a
+    // recursive lock.
+    andr(tmp/*==0?*/, disp_hdr, tmp);
+    sd(tmp/*==0, perhaps*/, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+    mv(flag, tmp); // we can use the value of tmp as the result here
+    j(cont);
+  } else {
+    assert(LockingMode == LM_LIGHTWEIGHT, "");
+    Label slow;
+    lightweight_lock(oop, disp_hdr, tmp, t0, slow);
+
+    // Indicate success on completion.
+    mv(flag, zr);
+    j(count);
+    bind(slow);
+    mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow-path
+    j(no_count);
+  }
+
+  // Handle existing monitor.
+  bind(object_has_monitor);
+  // The object's monitor m is unlocked iff m->owner == NULL,
+  // otherwise m->owner may contain a thread or a stack address.
+  //
+  // Try to CAS m->owner from NULL to current thread.
+  add(tmp, disp_hdr, (in_bytes(ObjectMonitor::owner_offset()) - markWord::monitor_value));
+  cmpxchg(/*memory address*/tmp, /*expected value*/zr, /*new value*/xthread, Assembler::int64, Assembler::aq,
+          Assembler::rl, /*result*/flag); // cas succeeds if flag == zr(expected)
+
+  if (LockingMode != LM_LIGHTWEIGHT) {
+    // Store a non-null value into the box to avoid looking like a re-entrant
+    // lock. The fast-path monitor unlock code checks for
+    // markWord::monitor_value so use markWord::unused_mark which has the
+    // relevant bit set, and also matches ObjectSynchronizer::slow_enter.
+    mv(tmp, (address)markWord::unused_mark().value());
+    sd(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+  }
+
+  beqz(flag, cont); // CAS success means locking succeeded
+
+  bne(flag, xthread, cont); // Check for recursive locking
+
+  // Recursive lock case
+  mv(flag, zr);
+  increment(Address(disp_hdr, in_bytes(ObjectMonitor::recursions_offset()) - markWord::monitor_value), 1, t0, tmp);
+
+  bind(cont);
+  // zero flag indicates success
+  // non-zero flag indicates failure
+  bnez(flag, no_count);
+
+  bind(count);
+  increment(Address(xthread, JavaThread::held_monitor_count_offset()), 1, t0, tmp);
+
+  bind(no_count);
+}
+
+void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg, Register tmp1Reg,
+                                    Register tmp2Reg) {
+  // Use cr register to indicate the fast_unlock result: zero for success; non-zero for failure.
+  Register flag = t1;
+  Register oop = objectReg;
+  Register box = boxReg;
+  Register disp_hdr = tmp1Reg;
+  Register tmp = tmp2Reg;
+  Label cont;
+  Label object_has_monitor;
+  Label count, no_count;
+
+  assert_different_registers(oop, box, tmp, disp_hdr, flag);
+
+  if (LockingMode == LM_LEGACY) {
+    // Find the lock address and load the displaced header from the stack.
+    ld(disp_hdr, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+
+    // If the displaced header is 0, we have a recursive unlock.
+    mv(flag, disp_hdr);
+    beqz(disp_hdr, cont);
+  }
+
+  // Handle existing monitor.
+  ld(tmp, Address(oop, oopDesc::mark_offset_in_bytes()));
+  test_bit(t0, tmp, exact_log2(markWord::monitor_value));
+  bnez(t0, object_has_monitor);
+
+  if (LockingMode == LM_MONITOR) {
+    mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow path
+    j(cont);
+  } else if (LockingMode == LM_LEGACY) {
+    // Check if it is still a light weight lock, this is true if we
+    // see the stack address of the basicLock in the markWord of the
+    // object.
+
+    cmpxchg(/*memory address*/oop, /*expected value*/box, /*new value*/disp_hdr, Assembler::int64, Assembler::relaxed,
+            Assembler::rl, /*result*/tmp);
+    xorr(flag, box, tmp); // box == tmp if cas succeeds
+    j(cont);
+  } else {
+    assert(LockingMode == LM_LIGHTWEIGHT, "");
+    Label slow;
+    lightweight_unlock(oop, tmp, box, disp_hdr, slow);
+
+    // Indicate success on completion.
+    mv(flag, zr);
+    j(count);
+    bind(slow);
+    mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow path
+    j(no_count);
+  }
+
+  assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
+
+  // Handle existing monitor.
+  bind(object_has_monitor);
+  STATIC_ASSERT(markWord::monitor_value <= INT_MAX);
+  add(tmp, tmp, -(int)markWord::monitor_value); // monitor
+
+  if (LockingMode == LM_LIGHTWEIGHT) {
+    // If the owner is anonymous, we need to fix it -- in an outline stub.
+    Register tmp2 = disp_hdr;
+    ld(tmp2, Address(tmp, ObjectMonitor::owner_offset()));
+    test_bit(t0, tmp2, exact_log2(ObjectMonitor::ANONYMOUS_OWNER));
+    C2HandleAnonOMOwnerStub* stub = new (Compile::current()->comp_arena()) C2HandleAnonOMOwnerStub(tmp, tmp2);
+    Compile::current()->output()->add_stub(stub);
+    bnez(t0, stub->entry(), /* is_far */ true);
+    bind(stub->continuation());
+  }
+
+  ld(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset()));
+
+  Label notRecursive;
+  beqz(disp_hdr, notRecursive); // Will be 0 if not recursive.
+
+  // Recursive lock
+  addi(disp_hdr, disp_hdr, -1);
+  sd(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset()));
+  mv(flag, zr);
+  j(cont);
+
+  bind(notRecursive);
+  ld(flag, Address(tmp, ObjectMonitor::EntryList_offset()));
+  ld(disp_hdr, Address(tmp, ObjectMonitor::cxq_offset()));
+  orr(flag, flag, disp_hdr); // Will be 0 if both are 0.
+  bnez(flag, cont);
+  // need a release store here
+  la(tmp, Address(tmp, ObjectMonitor::owner_offset()));
+  membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
+  sd(zr, Address(tmp)); // set unowned
+
+  bind(cont);
+  // zero flag indicates success
+  // non-zero flag indicates failure
+  bnez(flag, no_count);
+
+  bind(count);
+  decrement(Address(xthread, JavaThread::held_monitor_count_offset()), 1, t0, tmp);
+
+  bind(no_count);
+}
+
 // short string
 // StringUTF16.indexOfChar
 // StringLatin1.indexOfChar
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
index f8f3968c587..fdbdb4a2ac5 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
@@ -39,6 +39,11 @@
                        VectorRegister vrs,
                        bool is_latin, Label& DONE);
  public:
+  // Code used by cmpFastLock and cmpFastUnlock mach instructions in .ad file.
+  // See full description in macroAssembler_riscv.cpp.
+  void fast_lock(Register object, Register box, Register tmp1, Register tmp2);
+  void fast_unlock(Register object, Register box, Register tmp1, Register tmp2);
+
   void string_compare(Register str1, Register str2,
                       Register cnt1, Register cnt2, Register result,
                       Register tmp1, Register tmp2, Register tmp3,
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 98d016c3668..caf39498cf9 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -2436,223 +2436,6 @@ encode %{
     }
   %}
 
-  // Use cr register to indicate the fast_lock result: zero for success; non-zero for failure.
-  enc_class riscv_enc_fast_lock(iRegP object, iRegP box, iRegPNoSp tmp1, iRegPNoSp tmp2) %{
-    C2_MacroAssembler _masm(&cbuf);
-    Register flag = t1;
-    Register oop = as_Register($object$$reg);
-    Register box = as_Register($box$$reg);
-    Register disp_hdr = as_Register($tmp1$$reg);
-    Register tmp = as_Register($tmp2$$reg);
-    Label cont;
-    Label object_has_monitor;
-    Label count, no_count;
-
-    assert_different_registers(oop, box, tmp, disp_hdr, t0);
-
-    // Load markWord from object into displaced_header.
-    __ ld(disp_hdr, Address(oop, oopDesc::mark_offset_in_bytes()));
-
-    if (DiagnoseSyncOnValueBasedClasses != 0) {
-      __ load_klass(flag, oop);
-      __ lwu(flag, Address(flag, Klass::access_flags_offset()));
-      __ test_bit(flag, flag, exact_log2(JVM_ACC_IS_VALUE_BASED_CLASS), tmp /* tmp */);
-      __ bnez(flag, cont, true /* is_far */);
-    }
-
-    // Check for existing monitor
-    __ test_bit(t0, disp_hdr, exact_log2(markWord::monitor_value));
-    __ bnez(t0, object_has_monitor);
-
-    if (LockingMode == LM_MONITOR) {
-      __ mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow-path
-      __ j(cont);
-    } else if (LockingMode == LM_LEGACY) {
-      // Set tmp to be (markWord of object | UNLOCK_VALUE).
-      __ ori(tmp, disp_hdr, markWord::unlocked_value);
-
-      // Initialize the box. (Must happen before we update the object mark!)
-      __ sd(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
-
-      // Compare object markWord with an unlocked value (tmp) and if
-      // equal exchange the stack address of our box with object markWord.
-      // On failure disp_hdr contains the possibly locked markWord.
-      __ cmpxchg(/*memory address*/oop, /*expected value*/tmp, /*new value*/box, Assembler::int64, Assembler::aq,
-                 Assembler::rl, /*result*/disp_hdr);
-      __ mv(flag, zr);
-      __ beq(disp_hdr, tmp, cont); // prepare zero flag and goto cont if we won the cas
-
-      assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
-
-      // If the compare-and-exchange succeeded, then we found an unlocked
-      // object, will have now locked it will continue at label cont
-      // We did not see an unlocked object so try the fast recursive case.
-
-      // Check if the owner is self by comparing the value in the
-      // markWord of object (disp_hdr) with the stack pointer.
-      __ sub(disp_hdr, disp_hdr, sp);
-      __ mv(tmp, (intptr_t) (~(os::vm_page_size()-1) | (uintptr_t)markWord::lock_mask_in_place));
-      // If (mark & lock_mask) == 0 and mark - sp < page_size, we are stack-locking and goto cont,
-      // hence we can store 0 as the displaced header in the box, which indicates that it is a
-      // recursive lock.
-      __ andr(tmp/*==0?*/, disp_hdr, tmp);
-      __ sd(tmp/*==0, perhaps*/, Address(box, BasicLock::displaced_header_offset_in_bytes()));
-      __ mv(flag, tmp); // we can use the value of tmp as the result here
-      __ j(cont);
-    } else {
-      assert(LockingMode == LM_LIGHTWEIGHT, "");
-      Label slow;
-      __ lightweight_lock(oop, disp_hdr, tmp, t0, slow);
-
-      // Indicate success on completion.
-      __ mv(flag, zr);
-      __ j(count);
-      __ bind(slow);
-      __ mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow-path
-      __ j(no_count);
-    }
-
-    // Handle existing monitor.
-    __ bind(object_has_monitor);
-    // The object's monitor m is unlocked iff m->owner == NULL,
-    // otherwise m->owner may contain a thread or a stack address.
-    //
-    // Try to CAS m->owner from NULL to current thread.
-    __ add(tmp, disp_hdr, (in_bytes(ObjectMonitor::owner_offset()) - markWord::monitor_value));
-    __ cmpxchg(/*memory address*/tmp, /*expected value*/zr, /*new value*/xthread, Assembler::int64, Assembler::aq,
-             Assembler::rl, /*result*/flag); // cas succeeds if flag == zr(expected)
-
-    if (LockingMode != LM_LIGHTWEIGHT) {
-      // Store a non-null value into the box to avoid looking like a re-entrant
-      // lock. The fast-path monitor unlock code checks for
-      // markWord::monitor_value so use markWord::unused_mark which has the
-      // relevant bit set, and also matches ObjectSynchronizer::slow_enter.
-      __ mv(tmp, (address)markWord::unused_mark().value());
-      __ sd(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
-    }
-
-    __ beqz(flag, cont); // CAS success means locking succeeded
-
-    __ bne(flag, xthread, cont); // Check for recursive locking
-
-    // Recursive lock case
-    __ mv(flag, zr);
-    __ increment(Address(disp_hdr, in_bytes(ObjectMonitor::recursions_offset()) - markWord::monitor_value), 1, t0, tmp);
-
-    __ bind(cont);
-    // zero flag indicates success
-    // non-zero flag indicates failure
-    __ bnez(flag, no_count);
-
-    __ bind(count);
-    __ increment(Address(xthread, JavaThread::held_monitor_count_offset()), 1, t0, tmp);
-
-    __ bind(no_count);
-  %}
-
-  // Use cr register to indicate the fast_unlock result: zero for success; non-zero for failure.
-  enc_class riscv_enc_fast_unlock(iRegP object, iRegP box, iRegPNoSp tmp1, iRegPNoSp tmp2) %{
-    C2_MacroAssembler _masm(&cbuf);
-    Register flag = t1;
-    Register oop = as_Register($object$$reg);
-    Register box = as_Register($box$$reg);
-    Register disp_hdr = as_Register($tmp1$$reg);
-    Register tmp = as_Register($tmp2$$reg);
-    Label cont;
-    Label object_has_monitor;
-    Label count, no_count;
-
-    assert_different_registers(oop, box, tmp, disp_hdr, flag);
-
-    if (LockingMode == LM_LEGACY) {
-      // Find the lock address and load the displaced header from the stack.
-      __ ld(disp_hdr, Address(box, BasicLock::displaced_header_offset_in_bytes()));
-
-      // If the displaced header is 0, we have a recursive unlock.
-      __ mv(flag, disp_hdr);
-      __ beqz(disp_hdr, cont);
-    }
-
-    // Handle existing monitor.
-    __ ld(tmp, Address(oop, oopDesc::mark_offset_in_bytes()));
-    __ test_bit(t0, tmp, exact_log2(markWord::monitor_value));
-    __ bnez(t0, object_has_monitor);
-
-    if (LockingMode == LM_MONITOR) {
-      __ mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow path
-      __ j(cont);
-    } else if (LockingMode == LM_LEGACY) {
-      // Check if it is still a light weight lock, this is true if we
-      // see the stack address of the basicLock in the markWord of the
-      // object.
-
-      __ cmpxchg(/*memory address*/oop, /*expected value*/box, /*new value*/disp_hdr, Assembler::int64, Assembler::relaxed,
-                 Assembler::rl, /*result*/tmp);
-      __ xorr(flag, box, tmp); // box == tmp if cas succeeds
-      __ j(cont);
-    } else {
-      assert(LockingMode == LM_LIGHTWEIGHT, "");
-      Label slow;
-      __ lightweight_unlock(oop, tmp, box, disp_hdr, slow);
-
-      // Indicate success on completion.
-      __ mv(flag, zr);
-      __ j(count);
-      __ bind(slow);
-      __ mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow path
-      __ j(no_count);
-    }
-
-    assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
-
-    // Handle existing monitor.
-    __ bind(object_has_monitor);
-    STATIC_ASSERT(markWord::monitor_value <= INT_MAX);
-    __ add(tmp, tmp, -(int)markWord::monitor_value); // monitor
-
-    if (LockingMode == LM_LIGHTWEIGHT) {
-      // If the owner is anonymous, we need to fix it -- in an outline stub.
-      Register tmp2 = disp_hdr;
-      __ ld(tmp2, Address(tmp, ObjectMonitor::owner_offset()));
-      __ test_bit(t0, tmp2, exact_log2(ObjectMonitor::ANONYMOUS_OWNER));
-      C2HandleAnonOMOwnerStub* stub = new (Compile::current()->comp_arena()) C2HandleAnonOMOwnerStub(tmp, tmp2);
-      Compile::current()->output()->add_stub(stub);
-      __ bnez(t0, stub->entry(), /* is_far */ true);
-      __ bind(stub->continuation());
-    }
-
-    __ ld(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset()));
-
-    Label notRecursive;
-    __ beqz(disp_hdr, notRecursive); // Will be 0 if not recursive.
-
-    // Recursive lock
-    __ addi(disp_hdr, disp_hdr, -1);
-    __ sd(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset()));
-    __ mv(flag, zr);
-    __ j(cont);
-
-    __ bind(notRecursive);
-    __ ld(flag, Address(tmp, ObjectMonitor::EntryList_offset()));
-    __ ld(disp_hdr, Address(tmp, ObjectMonitor::cxq_offset()));
-    __ orr(flag, flag, disp_hdr); // Will be 0 if both are 0.
-    __ bnez(flag, cont);
-    // need a release store here
-    __ la(tmp, Address(tmp, ObjectMonitor::owner_offset()));
-    __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
-    __ sd(zr, Address(tmp)); // set unowned
-
-    __ bind(cont);
-    // zero flag indicates success
-    // non-zero flag indicates failure
-    __ bnez(flag, no_count);
-
-    __ bind(count);
-    __ decrement(Address(xthread, JavaThread::held_monitor_count_offset()), 1, t0, tmp);
-
-    __ bind(no_count);
-  %}
-
   // arithmetic encodings
 
   enc_class riscv_enc_divw(iRegI dst, iRegI src1, iRegI src2) %{
@@ -10416,7 +10199,9 @@ instruct cmpFastLock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp1, iReg
   ins_cost(LOAD_COST * 2 + STORE_COST * 3 + ALU_COST * 6 + BRANCH_COST * 3);
   format %{ "fastlock $object,$box\t! kills $tmp1,$tmp2, #@cmpFastLock" %}
 
-  ins_encode(riscv_enc_fast_lock(object, box, tmp1, tmp2));
+  ins_encode %{
+    __ fast_lock($object$$Register, $box$$Register, $tmp1$$Register, $tmp2$$Register);
+  %}
 
   ins_pipe(pipe_serial);
 %}
@@ -10430,7 +10215,9 @@ instruct cmpFastUnlock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp1, iR
   ins_cost(LOAD_COST * 2 + STORE_COST + ALU_COST * 2 + BRANCH_COST * 4);
   format %{ "fastunlock $object,$box\t! kills $tmp1, $tmp2, #@cmpFastUnlock" %}
 
-  ins_encode(riscv_enc_fast_unlock(object, box, tmp1, tmp2));
+  ins_encode %{
+    __ fast_unlock($object$$Register, $box$$Register, $tmp1$$Register, $tmp2$$Register);
+  %}
 
   ins_pipe(pipe_serial);
 %}

From de9b971c2e21d01586c15ad87c33dd8f24e64e29 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 14 Sep 2023 12:06:25 +0000
Subject: [PATCH 012/112] 8315933: Serial: Remove empty
 Generation::ensure_parsability

Reviewed-by: tschatzl, sjohanss
---
 src/hotspot/share/gc/shared/collectedHeap.hpp    |  2 +-
 src/hotspot/share/gc/shared/genCollectedHeap.cpp | 13 -------------
 src/hotspot/share/gc/shared/genCollectedHeap.hpp |  3 ---
 src/hotspot/share/gc/shared/generation.hpp       |  4 ----
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 217bc0cd865..19923ca9bc4 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -328,7 +328,7 @@ class CollectedHeap : public CHeapObj<mtGC> {
   // super::ensure_parsability so that the non-generational
   // part of the work gets done. See implementation of
   // CollectedHeap::ensure_parsability and, for instance,
-  // that of GenCollectedHeap::ensure_parsability().
+  // that of ParallelScavengeHeap::ensure_parsability().
   // The argument "retire_tlabs" controls whether existing TLABs
   // are merely filled or also retired, thus preventing further
   // allocation from them and necessitating allocation of new TLABs.
diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp
index 5c67fa7eb82..341b1bb77bc 100644
--- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp
@@ -1069,16 +1069,3 @@ void GenCollectedHeap::record_gen_tops_before_GC() {
   }
 }
 #endif  // not PRODUCT
-
-class GenEnsureParsabilityClosure: public GenCollectedHeap::GenClosure {
- public:
-  void do_generation(Generation* gen) {
-    gen->ensure_parsability();
-  }
-};
-
-void GenCollectedHeap::ensure_parsability(bool retire_tlabs) {
-  CollectedHeap::ensure_parsability(retire_tlabs);
-  GenEnsureParsabilityClosure ep_cl;
-  generation_iterate(&ep_cl, false);
-}
diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.hpp b/src/hotspot/share/gc/shared/genCollectedHeap.hpp
index b8d811421e1..a725a936a2c 100644
--- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp
@@ -228,9 +228,6 @@ class GenCollectedHeap : public CollectedHeap {
                               size_t requested_size,
                               size_t* actual_size) override;
 
-  // Ensure parsability
-  void ensure_parsability(bool retire_tlabs) override;
-
   // Total number of full collections completed.
   unsigned int total_full_collections_completed() {
     assert(_full_collections_completed <= _total_full_collections,
diff --git a/src/hotspot/share/gc/shared/generation.hpp b/src/hotspot/share/gc/shared/generation.hpp
index cb1d657446e..59d07cb9210 100644
--- a/src/hotspot/share/gc/shared/generation.hpp
+++ b/src/hotspot/share/gc/shared/generation.hpp
@@ -291,10 +291,6 @@ class Generation: public CHeapObj<mtGC> {
   // Save the high water marks for the used space in a generation.
   virtual void record_spaces_top() {}
 
-  // Some generations may need to be "fixed-up" after some allocation
-  // activity to make them parsable again. The default is to do nothing.
-  virtual void ensure_parsability() {}
-
   // Generations may keep statistics about collection. This method
   // updates those statistics. current_generation is the generation
   // that was most recently collected. This allows the generation to

From edd454b502b9bacde55492820e52655bbac63b89 Mon Sep 17 00:00:00 2001
From: Soumadipta Roy <roysouma@amazon.com>
Date: Thu, 14 Sep 2023 12:21:45 +0000
Subject: [PATCH 013/112] 8315766: Parallelize
 gc/stress/TestStressIHOPMultiThread.java test

Reviewed-by: shade, tschatzl
---
 .../gc/stress/TestStressIHOPMultiThread.java  | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/gc/stress/TestStressIHOPMultiThread.java b/test/hotspot/jtreg/gc/stress/TestStressIHOPMultiThread.java
index fc630e3fdb6..4c288e7b486 100644
--- a/test/hotspot/jtreg/gc/stress/TestStressIHOPMultiThread.java
+++ b/test/hotspot/jtreg/gc/stress/TestStressIHOPMultiThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 package gc.stress;
 
  /*
- * @test TestStressIHOPMultiThread
+ * @test
  * @bug 8148397
  * @key stress
  * @summary Stress test for IHOP
@@ -34,21 +34,41 @@
  *              -Xlog:gc+ihop=debug,gc+ihop+ergo=debug,gc+ergo=debug:TestStressIHOPMultiThread1.log
  *              -Dtimeout=2 -DheapUsageMinBound=30 -DheapUsageMaxBound=80
  *              -Dthreads=2 gc.stress.TestStressIHOPMultiThread
+ */
+
+/*
+ * @test
+ * @requires vm.gc.G1
  * @run main/othervm/timeout=200 -Xmx256m -XX:G1HeapWastePercent=0 -XX:G1MixedGCCountTarget=1
  *              -XX:+UseG1GC -XX:G1HeapRegionSize=2m -XX:+G1UseAdaptiveIHOP
  *              -Xlog:gc+ihop=debug,gc+ihop+ergo=debug,gc+ergo=debug:TestStressIHOPMultiThread2.log
  *              -Dtimeout=2 -DheapUsageMinBound=60 -DheapUsageMaxBound=90
  *              -Dthreads=3 gc.stress.TestStressIHOPMultiThread
+ */
+
+/*
+ * @test
+ * @requires vm.gc.G1
  * @run main/othervm/timeout=200 -Xmx256m -XX:G1HeapWastePercent=0 -XX:G1MixedGCCountTarget=1
  *              -XX:+UseG1GC -XX:G1HeapRegionSize=4m -XX:-G1UseAdaptiveIHOP
  *              -Xlog:gc+ihop=debug,gc+ihop+ergo=debug,gc+ergo=debug:TestStressIHOPMultiThread3.log
  *              -Dtimeout=2 -DheapUsageMinBound=40 -DheapUsageMaxBound=90
  *              -Dthreads=5 gc.stress.TestStressIHOPMultiThread
+ */
+
+/*
+ * @test
+ * @requires vm.gc.G1
  * @run main/othervm/timeout=200 -Xmx128m -XX:G1HeapWastePercent=0 -XX:G1MixedGCCountTarget=1
  *              -XX:+UseG1GC -XX:G1HeapRegionSize=8m -XX:+G1UseAdaptiveIHOP
  *              -Xlog:gc+ihop=debug,gc+ihop+ergo=debug,gc+ergo=debug:TestStressIHOPMultiThread4.log
  *              -Dtimeout=2 -DheapUsageMinBound=20 -DheapUsageMaxBound=90
  *              -Dthreads=10 gc.stress.TestStressIHOPMultiThread
+ */
+
+/*
+ * @test
+ * @requires vm.gc.G1
  * @run main/othervm/timeout=200 -Xmx512m -XX:G1HeapWastePercent=0 -XX:G1MixedGCCountTarget=1
  *              -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:+G1UseAdaptiveIHOP
  *              -Xlog:gc+ihop=debug,gc+ihop+ergo=debug,gc+ergo=debug:TestStressIHOPMultiThread5.log

From cfa89012ab017f3ae147094e5cab6dfd040ce042 Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Thu, 14 Sep 2023 13:50:49 +0000
Subject: [PATCH 014/112] 8315338: RISC-V: Change flags for stable extensions
 to non-experimental

Reviewed-by: fyang, luhenry, fjiang
---
 src/hotspot/cpu/riscv/globals_riscv.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index 8b98198df4a..8824b0e1f93 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -101,10 +101,10 @@ define_pd_global(intx, InlineSmallCode,          1000);
   product(bool, UseRVA20U64, true, "Use RVA20U64 profile")                       \
   product(bool, UseRVC, false, "Use RVC instructions")                           \
   product(bool, UseRVA22U64, false, EXPERIMENTAL, "Use RVA22U64 profile")        \
-  product(bool, UseRVV, false, EXPERIMENTAL, "Use RVV instructions")             \
-  product(bool, UseZba, false, EXPERIMENTAL, "Use Zba instructions")             \
-  product(bool, UseZbb, false, EXPERIMENTAL, "Use Zbb instructions")             \
-  product(bool, UseZbs, false, EXPERIMENTAL, "Use Zbs instructions")             \
+  product(bool, UseRVV, false, "Use RVV instructions")                           \
+  product(bool, UseZba, false, "Use Zba instructions")                           \
+  product(bool, UseZbb, false, "Use Zbb instructions")                           \
+  product(bool, UseZbs, false, "Use Zbs instructions")                           \
   product(bool, UseZic64b, false, EXPERIMENTAL, "Use Zic64b instructions")       \
   product(bool, UseZicbom, false, EXPERIMENTAL, "Use Zicbom instructions")       \
   product(bool, UseZicbop, false, EXPERIMENTAL, "Use Zicbop instructions")       \

From 83dca6296e3fc7b9912ef7b82e443ce1415a7bcc Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Thu, 14 Sep 2023 14:30:14 +0000
Subject: [PATCH 015/112] 8313638: Add test for dump of resolved references

Reviewed-by: ccheung, iklam
---
 src/hotspot/share/prims/whitebox.cpp          |  7 ++
 .../ResolvedReferencesNotNullTest.java        | 75 +++++++++++++++++
 .../ResolvedReferencesTestApp.java            | 31 +++++++
 .../sharedStrings/ResolvedReferencesWb.java   | 83 +++++++++++++++++++
 test/lib/jdk/test/whitebox/WhiteBox.java      |  6 ++
 5 files changed, 202 insertions(+)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesNotNullTest.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesTestApp.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesWb.java

diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 8c8469e9a47..1263d719635 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -1874,6 +1874,12 @@ WB_ENTRY(jint, WB_GetConstantPoolCacheLength(JNIEnv* env, jobject wb, jclass kla
   return cp->cache()->length();
 WB_END
 
+WB_ENTRY(jobjectArray, WB_GetResolvedReferences(JNIEnv* env, jobject wb, jclass klass))
+  InstanceKlass* ik = InstanceKlass::cast(java_lang_Class::as_Klass(JNIHandles::resolve(klass)));
+  objArrayOop resolved_refs= ik->constants()->resolved_references();
+  return (jobjectArray)JNIHandles::make_local(THREAD, resolved_refs);
+WB_END
+
 WB_ENTRY(jint, WB_ConstantPoolRemapInstructionOperandFromCache(JNIEnv* env, jobject wb, jclass klass, jint index))
   InstanceKlass* ik = InstanceKlass::cast(java_lang_Class::as_Klass(JNIHandles::resolve(klass)));
   ConstantPool* cp = ik->constants();
@@ -2801,6 +2807,7 @@ static JNINativeMethod methods[] = {
   {CC"getConstantPool0",   CC"(Ljava/lang/Class;)J",  (void*)&WB_GetConstantPool    },
   {CC"getConstantPoolCacheIndexTag0", CC"()I",  (void*)&WB_GetConstantPoolCacheIndexTag},
   {CC"getConstantPoolCacheLength0", CC"(Ljava/lang/Class;)I",  (void*)&WB_GetConstantPoolCacheLength},
+  {CC"getResolvedReferences0", CC"(Ljava/lang/Class;)[Ljava/lang/Object;", (void*)&WB_GetResolvedReferences},
   {CC"remapInstructionOperandFromCPCache0",
       CC"(Ljava/lang/Class;I)I",                      (void*)&WB_ConstantPoolRemapInstructionOperandFromCache},
   {CC"encodeConstantPoolIndyIndex0",
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesNotNullTest.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesNotNullTest.java
new file mode 100644
index 00000000000..005a1f78e0b
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesNotNullTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test ResolvedReferencesNotNullTest
+ * @bug 8313638
+ * @summary Testing resolved references array to ensure elements are non-null
+ * @requires vm.cds.write.archived.java.heap
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @build jdk.test.whitebox.WhiteBox ResolvedReferencesWb ResolvedReferencesTestApp
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run driver ResolvedReferencesNotNullTest
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.whitebox.WhiteBox;
+
+public class ResolvedReferencesNotNullTest {
+    public static void main(String[] args) throws Exception {
+        SharedStringsUtils.buildJarAndWhiteBox("ResolvedReferencesWb", "ResolvedReferencesTestApp");
+        String appJar = TestCommon.getTestJar(SharedStringsUtils.TEST_JAR_NAME_FULL);
+        String whiteboxParam = SharedStringsUtils.getWbParam();
+
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-cp",
+                                                                  appJar,
+                                                                  whiteboxParam,
+                                                                  "-XX:+UnlockDiagnosticVMOptions",
+                                                                  "-XX:+WhiteBoxAPI",
+                                                                  "ResolvedReferencesWb",
+                                                                  "false" // ResolvedReferencesTestApp is not archived
+                                                                  );
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldHaveExitValue(0);
+
+        TestCommon.dump(appJar,
+                        TestCommon.list("ResolvedReferencesWb", "ResolvedReferencesTestApp"),
+                        TestCommon.concat("-XX:SharedArchiveFile=ResolvedRef.jsa",
+                                          "-XX:+UnlockDiagnosticVMOptions",
+                                          "-XX:+WhiteBoxAPI",
+                                          whiteboxParam));
+
+        // Since ResolvedReferencesTestApp is now archived, all of the strings should be in the resolved
+        // references array
+        TestCommon.run("-cp",
+                       appJar,
+                       whiteboxParam,
+                       "-XX:SharedArchiveFile=ResolvedRef.jsa",
+                       "-XX:+UnlockDiagnosticVMOptions",
+                       "-XX:+WhiteBoxAPI",
+                       "ResolvedReferencesWb",
+                       "true" // ResolvedReferencesTestApp is archived
+                       ).assertNormalExit();
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesTestApp.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesTestApp.java
new file mode 100644
index 00000000000..4b059485bc9
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesTestApp.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+public class ResolvedReferencesTestApp {
+    // These strings must be in the resolved references array
+    static String foo = "fooString";
+    static String bar = "barString";
+
+    // This method is never called so the string should not be added to the resolved references array
+    String qux() { return "quxString"; }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesWb.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesWb.java
new file mode 100644
index 00000000000..d1e25936c3b
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesWb.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.test.whitebox.WhiteBox;
+
+public class ResolvedReferencesWb {
+    public static void main(String[] args) throws Exception {
+        WhiteBox wb = WhiteBox.getWhiteBox();
+
+        if (args.length < 1) {
+            throw new RuntimeException("Test requires arg: [true|false]");
+        }
+
+        if (!args[0].equals("true") && !args[0].equals("false")) {
+            throw new RuntimeException("Invalid argument: Test requires arg: [true|false]");
+        }
+
+        ResolvedReferencesTestApp t = new ResolvedReferencesTestApp();
+        Object[] resolvedReferences = wb.getResolvedReferences(ResolvedReferencesTestApp.class);
+        boolean isArchived = (args[0].equals("true"));
+
+        if (resolvedReferences.length <= 0) {
+            throw new RuntimeException("Resolved reference should not be null");
+        }
+
+        boolean foundFoo = false;
+        boolean foundBar = false;
+        boolean foundQux = false;
+
+        for (Object o : resolvedReferences) {
+            if (o != null) {
+                foundFoo |= (o.equals("fooString"));
+                foundBar |= (o.equals("barString"));
+                foundQux |= (o.equals("quxString"));
+            }
+        }
+
+        if (isArchived) {
+            // CDS eagerly resolves all the string literals in the ConstantPool. At this point, all
+            // three strings should be in the resolvedReferences array.
+            if (!foundFoo || !foundBar || !foundQux) {
+                throwException(resolvedReferences, "Incorrect resolved references array, all strings should be present");
+            }
+        } else {
+            // If the class is not archived, the string literals in the ConstantPool are resolved
+            // on-demand. At this point, ResolvedReferencesTestApp::<clinit> has been executed
+            // so the two strings used there should be in the resolvedReferences array.
+            // ResolvedReferencesTestApp::qux() is not executed so "quxString"
+            // should not yet be resolved.
+            if (!foundFoo || !foundBar || foundQux) {
+                throwException(resolvedReferences, "Incorrect resolved references array, quxString should not be archived");
+            }
+        }
+    }
+
+    static void throwException(Object[] resolvedRefs, String errMsg) throws RuntimeException {
+        System.out.printf("Resolved References Array Length: %d\n", resolvedRefs.length);
+        for (Object o : resolvedRefs) {
+            System.out.println(o);
+        }
+        throw new RuntimeException(errMsg);
+    }
+}
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index ce56ae4b672..dad14f9110e 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -140,6 +140,12 @@ public         int getConstantPoolCacheLength(Class<?> aClass) {
     return getConstantPoolCacheLength0(aClass);
   }
 
+  private native Object[] getResolvedReferences0(Class<?> aClass);
+  public         Object[] getResolvedReferences(Class<?> aClass) {
+    Objects.requireNonNull(aClass);
+    return getResolvedReferences0(aClass);
+  }
+
   private native int remapInstructionOperandFromCPCache0(Class<?> aClass, int index);
   public         int remapInstructionOperandFromCPCache(Class<?> aClass, int index) {
     Objects.requireNonNull(aClass);

From 3abe7982bfbc5787962863f8604ddecadf770b74 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 14 Sep 2023 14:49:40 +0000
Subject: [PATCH 016/112] 8316115: Parallel: Fix -Wconversion warnings around
 NUMA node ID

Reviewed-by: shade, tschatzl
---
 .../share/gc/parallel/mutableNUMASpace.cpp    | 24 +++++++++----------
 .../share/gc/parallel/mutableNUMASpace.hpp    | 10 ++++----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index 951c7b0ca53..0a6f1da7733 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -54,17 +54,17 @@ MutableNUMASpace::MutableNUMASpace(size_t alignment) : MutableSpace(alignment),
 #endif // LINUX
 
   size_t lgrp_limit = os::numa_get_groups_num();
-  int *lgrp_ids = NEW_C_HEAP_ARRAY(int, lgrp_limit, mtGC);
-  int lgrp_num = (int)os::numa_get_leaf_groups(lgrp_ids, lgrp_limit);
+  uint *lgrp_ids = NEW_C_HEAP_ARRAY(uint, lgrp_limit, mtGC);
+  size_t lgrp_num = os::numa_get_leaf_groups(reinterpret_cast<int*>(lgrp_ids), lgrp_limit);
   assert(lgrp_num > 0, "There should be at least one locality group");
 
-  lgrp_spaces()->reserve(lgrp_num);
+  lgrp_spaces()->reserve(checked_cast<int>(lgrp_num));
   // Add new spaces for the new nodes
-  for (int i = 0; i < lgrp_num; i++) {
+  for (size_t i = 0; i < lgrp_num; i++) {
     lgrp_spaces()->append(new LGRPSpace(lgrp_ids[i], alignment));
   }
 
-  FREE_C_HEAP_ARRAY(int, lgrp_ids);
+  FREE_C_HEAP_ARRAY(uint, lgrp_ids);
 }
 
 MutableNUMASpace::~MutableNUMASpace() {
@@ -207,7 +207,7 @@ size_t MutableNUMASpace::unsafe_max_tlab_alloc(Thread *thr) const {
 }
 
 // Bias region towards the first-touching lgrp. Set the right page sizes.
-void MutableNUMASpace::bias_region(MemRegion mr, int lgrp_id) {
+void MutableNUMASpace::bias_region(MemRegion mr, uint lgrp_id) {
   HeapWord *start = align_up(mr.start(), page_size());
   HeapWord *end = align_down(mr.end(), page_size());
   if (end > start) {
@@ -224,7 +224,7 @@ void MutableNUMASpace::bias_region(MemRegion mr, int lgrp_id) {
     // size if not using large pages or else this function does nothing.
     os::free_memory((char*)aligned_region.start(), aligned_region.byte_size(), os_align);
     // And make them local/first-touch biased.
-    os::numa_make_local((char*)aligned_region.start(), aligned_region.byte_size(), lgrp_id);
+    os::numa_make_local((char*)aligned_region.start(), aligned_region.byte_size(), checked_cast<int>(lgrp_id));
   }
 }
 
@@ -623,7 +623,7 @@ void MutableNUMASpace::print_short_on(outputStream* st) const {
   MutableSpace::print_short_on(st);
   st->print(" (");
   for (int i = 0; i < lgrp_spaces()->length(); i++) {
-    st->print("lgrp %d: ", lgrp_spaces()->at(i)->lgrp_id());
+    st->print("lgrp %u: ", lgrp_spaces()->at(i)->lgrp_id());
     lgrp_spaces()->at(i)->space()->print_short_on(st);
     if (i < lgrp_spaces()->length() - 1) {
       st->print(", ");
@@ -636,7 +636,7 @@ void MutableNUMASpace::print_on(outputStream* st) const {
   MutableSpace::print_on(st);
   for (int i = 0; i < lgrp_spaces()->length(); i++) {
     LGRPSpace *ls = lgrp_spaces()->at(i);
-    st->print("    lgrp %d", ls->lgrp_id());
+    st->print("    lgrp %u", ls->lgrp_id());
     ls->space()->print_on(st);
     if (NUMAStats) {
       for (int i = 0; i < lgrp_spaces()->length(); i++) {
@@ -679,7 +679,7 @@ void MutableNUMASpace::LGRPSpace::accumulate_statistics(size_t page_size) {
       for (size_t i = 0; i < npages; i++) {
         if (lgrp_ids[i] < 0) {
           space_stats()->_uncommited_space += os::vm_page_size();
-        } else if (lgrp_ids[i] == lgrp_id()) {
+        } else if (checked_cast<uint>(lgrp_ids[i]) == lgrp_id()) {
           space_stats()->_local_space += os::vm_page_size();
         } else {
           space_stats()->_remote_space += os::vm_page_size();
@@ -709,7 +709,7 @@ void MutableNUMASpace::LGRPSpace::scan_pages(size_t page_size, size_t page_count
 
   os::page_info page_expected, page_found;
   page_expected.size = page_size;
-  page_expected.lgrp_id = lgrp_id();
+  page_expected.lgrp_id = checked_cast<uint>(lgrp_id());
 
   char *s = scan_start;
   while (s < scan_end) {
@@ -720,7 +720,7 @@ void MutableNUMASpace::LGRPSpace::scan_pages(size_t page_size, size_t page_count
     if (e != scan_end) {
       assert(e < scan_end, "e: " PTR_FORMAT " scan_end: " PTR_FORMAT, p2i(e), p2i(scan_end));
 
-      if ((page_expected.size != page_size || page_expected.lgrp_id != lgrp_id())
+      if ((page_expected.size != page_size || checked_cast<uint>(page_expected.lgrp_id) != lgrp_id())
           && page_expected.size != 0) {
         os::free_memory(s, pointer_delta(e, s, sizeof(char)), page_size);
       }
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
index fda7321eeba..721ad35b8bc 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
@@ -65,7 +65,7 @@ class MutableNUMASpace : public MutableSpace {
   friend class VMStructs;
 
   class LGRPSpace : public CHeapObj<mtGC> {
-    int _lgrp_id;
+    uint _lgrp_id;
     MutableSpace* _space;
     AdaptiveWeightedAverage *_alloc_rate;
     bool _allocation_failed;
@@ -87,7 +87,7 @@ class MutableNUMASpace : public MutableSpace {
     char* last_page_scanned()            { return _last_page_scanned; }
     void set_last_page_scanned(char* p)  { _last_page_scanned = p;    }
    public:
-    LGRPSpace(int l, size_t alignment) : _lgrp_id(l), _allocation_failed(false), _last_page_scanned(nullptr) {
+    LGRPSpace(uint l, size_t alignment) : _lgrp_id(l), _allocation_failed(false), _last_page_scanned(nullptr) {
       _space = new MutableSpace(alignment);
       _alloc_rate = new AdaptiveWeightedAverage(NUMAChunkResizeWeight);
     }
@@ -97,7 +97,7 @@ class MutableNUMASpace : public MutableSpace {
     }
 
     static bool equals(void* lgrp_id_value, LGRPSpace* p) {
-      return *(int*)lgrp_id_value == p->lgrp_id();
+      return *(uint*)lgrp_id_value == p->lgrp_id();
     }
 
     // Report a failed allocation.
@@ -117,7 +117,7 @@ class MutableNUMASpace : public MutableSpace {
       alloc_rate()->sample(alloc_rate_sample);
     }
 
-    int lgrp_id() const                             { return _lgrp_id;             }
+    uint lgrp_id() const                            { return _lgrp_id;             }
     MutableSpace* space() const                     { return _space;               }
     AdaptiveWeightedAverage* alloc_rate() const     { return _alloc_rate;          }
     void clear_alloc_rate()                         { _alloc_rate->clear();        }
@@ -148,7 +148,7 @@ class MutableNUMASpace : public MutableSpace {
   size_t base_space_size() const                     { return _base_space_size;   }
 
   // Bias region towards the lgrp.
-  void bias_region(MemRegion mr, int lgrp_id);
+  void bias_region(MemRegion mr, uint lgrp_id);
 
   // Get current chunk size.
   size_t current_chunk_size(int i);

From a57b9dab6c02c313f3975f47d502dae270c67508 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 14 Sep 2023 15:50:03 +0000
Subject: [PATCH 017/112] 8316242: Opensource SwingGraphics manual test

Reviewed-by: kizune, abhiscxk
---
 .../swing/SwingGraphics/TranslateTest.java    | 170 ++++++++++++++++++
 1 file changed, 170 insertions(+)
 create mode 100644 test/jdk/javax/swing/SwingGraphics/TranslateTest.java

diff --git a/test/jdk/javax/swing/SwingGraphics/TranslateTest.java b/test/jdk/javax/swing/SwingGraphics/TranslateTest.java
new file mode 100644
index 00000000000..305b5c0b3a4
--- /dev/null
+++ b/test/jdk/javax/swing/SwingGraphics/TranslateTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4207383
+ * @summary This tests, in a round about manner, that SwingGraphics does
+ *          not wrongly translate the original graphics when disposed. While
+ *          this test seems rather ugly, it was possible to get this to happen
+ *          in real world apps. This test is really only valid for 1.1.x.
+ * @key headful
+ * @run main TranslateTest
+ */
+
+import java.io.File;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.ComponentUI;
+import javax.imageio.ImageIO;
+
+public class TranslateTest {
+    static JFrame frame;
+    static volatile Point pt;
+    static volatile Dimension dim;
+    static final int WIDTH = 200;
+    static final int HEIGHT = 200;
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame("TranslateTest");
+
+                // paintComponent() triggers create swing graphics which will
+                // be invoked on child.
+                MyPanel panel = new MyPanel();
+                panel.setPreferredSize(new Dimension(WIDTH, HEIGHT));
+                frame.getContentPane().add(panel);
+                frame.pack();
+                frame.setLocationRelativeTo(null);
+                panel.test();
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                pt = frame.getLocationOnScreen();
+                dim = frame.getSize();
+            });
+            BufferedImage img = robot.createScreenCapture(
+                                    new Rectangle(pt.x + dim.width / 2,
+                                                  pt.y + dim.height / 2,
+                                                  WIDTH / 2, HEIGHT / 2));
+            robot.waitForIdle();
+            robot.delay(500);
+            Color c = new Color(img.getRGB(img.getWidth() / 2, img.getHeight() / 2));
+            if (c.getRed() < 250) {
+                ImageIO.write(img, "png", new File("image.png"));
+                System.out.println("Color " + c);
+                throw new RuntimeException("Translated Color is not red");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+
+    static class MyPanel extends JPanel {
+        int            state;
+        Graphics       realG;
+        Image          image;
+
+        public void test() {
+            image = createImage(TranslateTest.WIDTH, TranslateTest.HEIGHT);
+            Graphics g = image.getGraphics();
+            g.setClip(0, 0, TranslateTest.WIDTH, TranslateTest.HEIGHT);
+            realG = g;
+            state = 1;
+            paintComponent(g);
+            state = 3;
+            paintComponent(g);
+            state = 4;
+        }
+
+
+        public void paint(Graphics g) {
+            if (state == 0) {
+                test();
+            }
+            super.paint(g);
+        }
+
+        protected void paintComponent(Graphics g) {
+            super.paintComponent(g);
+        }
+
+        public void updateUI() {
+            setUI(new ComponentUI() {
+                public void paint(Graphics g, JComponent c) {
+                    if (state == 1) {
+                        // g is the first SwingGraphics, when it is disposed
+                        // translateX/translateY will be wrong
+                        //System.out.println("FIRST:" + g);
+                        g.translate(100, 100);
+                        state = 2;
+                        paintComponent(realG);
+                    }
+                    else if (state == 2) {
+                        // g is the first SwingGraphics, when it is disposed
+                        // translateX/translateY will be wrong
+                        g.translate(100, 100);
+                        //System.out.println("Second:" + g);
+                    }
+                    else if (state == 3) {
+                        // g should be the same as the first, with the wrong
+                        // translate.
+                        // otherG should be the second graphics, again with
+                        // the wrong translation, disposing the second will
+                        // cause g to be translated to -100, -100, which
+                        // should not happen.
+                        Graphics otherG = g.create(0, 0, 100, 100);
+                        //System.out.println("THIRD:" + g);
+                        otherG.dispose();
+                        g.setColor(Color.red);
+                        //System.out.println("LAST: " + g);
+                        g.fillRect(100, 100, 100, 100);
+                    }
+                    else if (state == 4) {
+                        g.drawImage(image, 0, 0, null);
+                    }
+                }
+            });
+        }
+    }
+}

From eb1f67b160c4d2b8feb7330786ecd8e53ed53946 Mon Sep 17 00:00:00 2001
From: Soumadipta Roy <roysouma@amazon.com>
Date: Thu, 14 Sep 2023 15:59:13 +0000
Subject: [PATCH 018/112] 8315937: Enable parallelism in
 vmTestbase/nsk/stress/numeric tests

Reviewed-by: shade, lmesnik
---
 .../nsk/stress/numeric/TEST.properties        | 24 -------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/TEST.properties

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/TEST.properties
deleted file mode 100644
index 8b51b2a9115..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/TEST.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-exclusiveAccess.dirs=.

From 5cea53d372744ddf1bedaae4667415e6525ef82f Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Thu, 14 Sep 2023 16:10:55 +0000
Subject: [PATCH 019/112] 8315810: Reimplement
 sun.reflect.ReflectionFactory::newConstructorForSerialization with method
 handles

Co-authored-by: Chen Liang <liach@openjdk.org>
Reviewed-by: rriggs
---
 .../classes/java/io/ObjectStreamClass.java    | 18 ++++--
 .../java/lang/invoke/DirectMethodHandle.java  |  5 +-
 .../java/lang/invoke/MethodHandleImpl.java    |  6 ++
 .../java/lang/invoke/MethodHandles.java       | 27 +++++++++
 .../internal/access/JavaLangInvokeAccess.java |  8 +++
 .../reflect/DirectMethodHandleAccessor.java   |  3 +-
 .../reflect/MethodHandleAccessorFactory.java  | 58 ++++++++++++++++---
 .../internal/reflect/ReflectionFactory.java   | 48 ++++++++-------
 .../reflect/MethodHandleAccessorsTest.java    |  2 +-
 .../ReflectionFactoryTest.java                |  5 ++
 10 files changed, 140 insertions(+), 40 deletions(-)

diff --git a/src/java.base/share/classes/java/io/ObjectStreamClass.java b/src/java.base/share/classes/java/io/ObjectStreamClass.java
index 58841e55afb..4c171eca2ce 100644
--- a/src/java.base/share/classes/java/io/ObjectStreamClass.java
+++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java
@@ -1034,12 +1034,12 @@ Object newInstance()
                                    new AccessControlContext(domains));
                     } catch (UndeclaredThrowableException x) {
                         Throwable cause = x.getCause();
-                        if (cause instanceof InstantiationException)
-                            throw (InstantiationException) cause;
-                        if (cause instanceof InvocationTargetException)
-                            throw (InvocationTargetException) cause;
-                        if (cause instanceof IllegalAccessException)
-                            throw (IllegalAccessException) cause;
+                        if (cause instanceof InstantiationException ie)
+                            throw ie;
+                        if (cause instanceof InvocationTargetException ite)
+                            throw ite;
+                        if (cause instanceof IllegalAccessException iae)
+                            throw iae;
                         // not supposed to happen
                         throw x;
                     }
@@ -1047,6 +1047,12 @@ Object newInstance()
             } catch (IllegalAccessException ex) {
                 // should not occur, as access checks have been suppressed
                 throw new InternalError(ex);
+            } catch (InvocationTargetException ex) {
+                Throwable cause = ex.getCause();
+                if (cause instanceof Error err)
+                    throw err;
+                else
+                    throw ex;
             } catch (InstantiationError err) {
                 var ex = new InstantiationException();
                 ex.initCause(err);
diff --git a/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
index 7373b4d846e..850ed2f53f9 100644
--- a/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
@@ -128,12 +128,11 @@ static DirectMethodHandle make(Class<?> refc, MemberName member) {
     }
     static DirectMethodHandle make(MemberName member) {
         if (member.isConstructor())
-            return makeAllocator(member);
+            return makeAllocator(member.getDeclaringClass(), member);
         return make(member.getDeclaringClass(), member);
     }
-    private static DirectMethodHandle makeAllocator(MemberName ctor) {
+    static DirectMethodHandle makeAllocator(Class<?> instanceClass, MemberName ctor) {
         assert(ctor.isConstructor() && ctor.getName().equals("<init>"));
-        Class<?> instanceClass = ctor.getDeclaringClass();
         ctor = ctor.asConstructor();
         assert(ctor.isConstructor() && ctor.getReferenceKind() == REF_newInvokeSpecial) : ctor;
         MethodType mtype = ctor.getMethodType().changeReturnType(instanceClass);
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
index 48d5ff70020..e79c8463d30 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -1647,6 +1647,12 @@ public MethodHandle reflectiveInvoker(Class<?> caller) {
             public Class<?>[] exceptionTypes(MethodHandle handle) {
                 return VarHandles.exceptionTypes(handle);
             }
+
+            @Override
+            public MethodHandle serializableConstructor(Class<?> decl, Constructor<?> ctorToCall) throws IllegalAccessException {
+                return IMPL_LOOKUP.serializableConstructor(decl, ctorToCall);
+            }
+
         });
     }
 
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index c55f08564ae..49de59d7aa5 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -3525,6 +3525,33 @@ public MethodHandle unreflectConstructor(Constructor<?> c) throws IllegalAccessE
             return lookup.getDirectConstructorNoSecurityManager(ctor.getDeclaringClass(), ctor);
         }
 
+        /*
+         * Produces a method handle that is capable of creating instances of the given class
+         * and instantiated by the given constructor.  No security manager check.
+         *
+         * This method should only be used by ReflectionFactory::newConstructorForSerialization.
+         */
+        /* package-private */ MethodHandle serializableConstructor(Class<?> decl, Constructor<?> c) throws IllegalAccessException {
+            MemberName ctor = new MemberName(c);
+            assert(ctor.isConstructor() && constructorInSuperclass(decl, c));
+            checkAccess(REF_newInvokeSpecial, decl, ctor);
+            assert(!MethodHandleNatives.isCallerSensitive(ctor));  // maybeBindCaller not relevant here
+            return DirectMethodHandle.makeAllocator(decl, ctor).setVarargs(ctor);
+        }
+
+        private static boolean constructorInSuperclass(Class<?> decl, Constructor<?> ctor) {
+            if (decl == ctor.getDeclaringClass())
+                return true;
+
+            Class<?> cl = decl;
+            while ((cl = cl.getSuperclass()) != null) {
+                if (cl == ctor.getDeclaringClass()) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         /**
          * Produces a method handle giving read access to a reflected field.
          * The type of the method handle will have a return type of the field's
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java
index b359a30d606..563870381fe 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java
@@ -162,4 +162,12 @@ public interface JavaLangInvokeAccess {
      * @return an array of exceptions, or {@code null}.
      */
     Class<?>[] exceptionTypes(MethodHandle handle);
+
+    /**
+     * Returns a method handle that allocates an instance of the given class
+     * and then invoke the given constructor of one of its superclasses.
+     *
+     * This method should only be used by ReflectionFactory::newConstructorForSerialization.
+     */
+    MethodHandle serializableConstructor(Class<?> decl, Constructor<?> ctorToCall) throws IllegalAccessException;
 }
diff --git a/src/java.base/share/classes/jdk/internal/reflect/DirectMethodHandleAccessor.java b/src/java.base/share/classes/jdk/internal/reflect/DirectMethodHandleAccessor.java
index a1438bcc206..f345d4cdb71 100644
--- a/src/java.base/share/classes/jdk/internal/reflect/DirectMethodHandleAccessor.java
+++ b/src/java.base/share/classes/jdk/internal/reflect/DirectMethodHandleAccessor.java
@@ -194,7 +194,8 @@ private boolean isIllegalArgument(RuntimeException ex) {
     private void checkReceiver(Object o) {
         // NOTE: will throw NullPointerException, as specified, if o is null
         if (!declaringClass.isAssignableFrom(o.getClass())) {
-            throw new IllegalArgumentException("object is not an instance of declaring class");
+            throw new IllegalArgumentException("object of type " + o.getClass().getName()
+                    + " is not an instance of " + declaringClass.getName());
         }
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/reflect/MethodHandleAccessorFactory.java b/src/java.base/share/classes/jdk/internal/reflect/MethodHandleAccessorFactory.java
index bdcdaa672d5..3a367272315 100644
--- a/src/java.base/share/classes/jdk/internal/reflect/MethodHandleAccessorFactory.java
+++ b/src/java.base/share/classes/jdk/internal/reflect/MethodHandleAccessorFactory.java
@@ -101,23 +101,63 @@ static ConstructorAccessorImpl newConstructorAccessor(Constructor<?> ctor) {
         // Ensure class initialized outside the invocation of method handle
         // so that EIIE is propagated (not wrapped with ITE)
         ensureClassInitialized(ctor.getDeclaringClass());
+        try {
+            MethodHandle target = makeConstructorHandle(JLIA.unreflectConstructor(ctor));
+            return DirectConstructorHandleAccessor.constructorAccessor(ctor, target);
+        } catch (IllegalAccessException e) {
+            throw new InternalError(e);
+        }
+    }
+
+    /**
+     * Creates a ConstructorAccessor that is capable of creating instances
+     * of the given class and instantiated by the given constructor.
+     *
+     * @param decl the class to instantiate
+     * @param ctor the constructor to call
+     * @return an accessible constructor
+     */
+    static ConstructorAccessorImpl newSerializableConstructorAccessor(Class<?> decl, Constructor<?> ctor) {
+        if (!constructorInSuperclass(decl, ctor)) {
+            throw new UnsupportedOperationException(ctor + " not a superclass of " + decl.getName());
+        }
 
+        // ExceptionInInitializerError may be thrown during class initialization
+        // Ensure class initialized outside the invocation of method handle
+        // so that EIIE is propagated (not wrapped with ITE)
+        ensureClassInitialized(decl);
         try {
-            MethodHandle mh = JLIA.unreflectConstructor(ctor);
-            int paramCount = mh.type().parameterCount();
-            MethodHandle target = mh.asFixedArity();
-            MethodType mtype = specializedMethodTypeForConstructor(paramCount);
-            if (paramCount > SPECIALIZED_PARAM_COUNT) {
-                // spread the parameters only for the non-specialized case
-                target = target.asSpreader(Object[].class, paramCount);
-            }
-            target = target.asType(mtype);
+            MethodHandle target = makeConstructorHandle(JLIA.serializableConstructor(decl, ctor));
             return DirectConstructorHandleAccessor.constructorAccessor(ctor, target);
         } catch (IllegalAccessException e) {
             throw new InternalError(e);
         }
     }
 
+    private static boolean constructorInSuperclass(Class<?> decl, Constructor<?> ctor) {
+        if (decl == ctor.getDeclaringClass())
+            return true;
+
+        Class<?> cl = decl;
+        while ((cl = cl.getSuperclass()) != null) {
+            if (cl == ctor.getDeclaringClass()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static MethodHandle makeConstructorHandle(MethodHandle ctor) {
+        int paramCount = ctor.type().parameterCount();
+        MethodHandle target = ctor.asFixedArity();
+        MethodType mtype = specializedMethodTypeForConstructor(paramCount);
+        if (paramCount > SPECIALIZED_PARAM_COUNT) {
+            // spread the parameters only for the non-specialized case
+            target = target.asSpreader(Object[].class, paramCount);
+        }
+        return target.asType(mtype);
+    }
+
     /**
      * Creates a FieldAccessor for the given reflected field.
      *
diff --git a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java
index 905e70b7406..2222c810524 100644
--- a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java
+++ b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java
@@ -370,27 +370,27 @@ public final Constructor<?> newConstructorForSerialization(Class<?> cl) {
     private final Constructor<?> generateConstructor(Class<?> cl,
                                                      Constructor<?> constructorToCall) {
 
-
-        ConstructorAccessor acc = new SerializationConstructorAccessorGenerator().
-            generateSerializationConstructor(cl,
+        Constructor<?> ctor = newConstructor(constructorToCall.getDeclaringClass(),
                                              constructorToCall.getParameterTypes(),
+                                             constructorToCall.getExceptionTypes(),
                                              constructorToCall.getModifiers(),
-                                             constructorToCall.getDeclaringClass());
-        Constructor<?> c = newConstructor(constructorToCall.getDeclaringClass(),
-                                          constructorToCall.getParameterTypes(),
-                                          constructorToCall.getExceptionTypes(),
-                                          constructorToCall.getModifiers(),
-                                          langReflectAccess.
-                                          getConstructorSlot(constructorToCall),
-                                          langReflectAccess.
-                                          getConstructorSignature(constructorToCall),
-                                          langReflectAccess.
-                                          getConstructorAnnotations(constructorToCall),
-                                          langReflectAccess.
-                                          getConstructorParameterAnnotations(constructorToCall));
-        setConstructorAccessor(c, acc);
-        c.setAccessible(true);
-        return c;
+                                             langReflectAccess.getConstructorSlot(constructorToCall),
+                                             langReflectAccess.getConstructorSignature(constructorToCall),
+                                             langReflectAccess.getConstructorAnnotations(constructorToCall),
+                                             langReflectAccess.getConstructorParameterAnnotations(constructorToCall));
+        ConstructorAccessor acc;
+        if (useOldSerializableConstructor()) {
+            acc = new SerializationConstructorAccessorGenerator().
+                                generateSerializationConstructor(cl,
+                                                                 constructorToCall.getParameterTypes(),
+                                                                 constructorToCall.getModifiers(),
+                                                                 constructorToCall.getDeclaringClass());
+        } else {
+            acc = MethodHandleAccessorFactory.newSerializableConstructorAccessor(cl, ctor);
+        }
+        setConstructorAccessor(ctor, acc);
+        ctor.setAccessible(true);
+        return ctor;
     }
 
     public final MethodHandle readObjectForSerialization(Class<?> cl) {
@@ -548,6 +548,10 @@ static boolean useNativeAccessorOnly() {
         return config().useNativeAccessorOnly;
     }
 
+    static boolean useOldSerializableConstructor() {
+        return config().useOldSerializableConstructor;
+    }
+
     private static boolean disableSerialConstructorChecks() {
         return config().disableSerialConstructorChecks;
     }
@@ -564,6 +568,7 @@ private static boolean disableSerialConstructorChecks() {
     private static @Stable Config config;
 
     private static final Config DEFAULT_CONFIG = new Config(false, // useNativeAccessorOnly
+                                                            false,  // useOldSerializeableConstructor
                                                             false); // disableSerialConstructorChecks
 
     /**
@@ -578,6 +583,7 @@ private static boolean disableSerialConstructorChecks() {
      * is to override them.
      */
     private record Config(boolean useNativeAccessorOnly,
+                          boolean useOldSerializableConstructor,
                           boolean disableSerialConstructorChecks) {
     }
 
@@ -601,10 +607,12 @@ private static Config loadConfig() {
         Properties props = GetPropertyAction.privilegedGetProperties();
         boolean useNativeAccessorOnly =
             "true".equals(props.getProperty("jdk.reflect.useNativeAccessorOnly"));
+        boolean useOldSerializableConstructor =
+            "true".equals(props.getProperty("jdk.reflect.useOldSerializableConstructor"));
         boolean disableSerialConstructorChecks =
             "true".equals(props.getProperty("jdk.disableSerialConstructorChecks"));
 
-        return new Config(useNativeAccessorOnly, disableSerialConstructorChecks);
+        return new Config(useNativeAccessorOnly, useOldSerializableConstructor, disableSerialConstructorChecks);
     }
 
     /**
diff --git a/test/jdk/java/lang/reflect/MethodHandleAccessorsTest.java b/test/jdk/java/lang/reflect/MethodHandleAccessorsTest.java
index 410a3420b94..b7e6b52b5dc 100644
--- a/test/jdk/java/lang/reflect/MethodHandleAccessorsTest.java
+++ b/test/jdk/java/lang/reflect/MethodHandleAccessorsTest.java
@@ -397,7 +397,7 @@ static void doTest(Field f, Object target, Object oldValue, Object newValue, Thr
     };
     private static final Throwable[] mismatched_target_type = new Throwable[] {
             new IllegalArgumentException("argument type mismatch"),
-            new IllegalArgumentException("object is not an instance of declaring class"),
+            new IllegalArgumentException("object of type java.lang.Object is not an instance of MethodHandleAccessorsTest"),
     };
     private static final Throwable[] cannot_get_field = new Throwable[] {
             new IllegalArgumentException("Can not get")
diff --git a/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java b/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java
index 853b5f394ff..ebeebc1e19e 100644
--- a/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java
+++ b/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java
@@ -136,6 +136,11 @@ static void testNonSerializableConstructor(Class<?> cl,
         }
     }
 
+    @Test(expectedExceptions = UnsupportedOperationException.class)
+    static void testConstructorNotSuperClass() throws ReflectiveOperationException {
+        factory.newConstructorForSerialization(Bar.class, Baz.class.getDeclaredConstructor());
+    }
+
     static class Foo {
         private int foo;
         public Foo() {

From c11f8352e96a01b39e54080716030ec96f717cae Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Thu, 14 Sep 2023 17:51:54 +0000
Subject: [PATCH 020/112] 8315824: Open source several Swing Text/HTML related
 tests

Reviewed-by: psadhukhan, azvegint
---
 .../text/StyledEditorKit/bug4253334.java      |  87 +++++++++++++++
 .../text/StyledEditorKit/bug4329418.java      | 101 ++++++++++++++++++
 test/jdk/javax/swing/text/bug4739057.java     |  53 +++++++++
 test/jdk/javax/swing/text/bug4763466.java     |  51 +++++++++
 .../jdk/javax/swing/text/html/bug4210307.java |  96 +++++++++++++++++
 .../jdk/javax/swing/text/html/bug4839739.java |  97 +++++++++++++++++
 6 files changed, 485 insertions(+)
 create mode 100644 test/jdk/javax/swing/text/StyledEditorKit/bug4253334.java
 create mode 100644 test/jdk/javax/swing/text/StyledEditorKit/bug4329418.java
 create mode 100644 test/jdk/javax/swing/text/bug4739057.java
 create mode 100644 test/jdk/javax/swing/text/bug4763466.java
 create mode 100644 test/jdk/javax/swing/text/html/bug4210307.java
 create mode 100644 test/jdk/javax/swing/text/html/bug4839739.java

diff --git a/test/jdk/javax/swing/text/StyledEditorKit/bug4253334.java b/test/jdk/javax/swing/text/StyledEditorKit/bug4253334.java
new file mode 100644
index 00000000000..625b47055c0
--- /dev/null
+++ b/test/jdk/javax/swing/text/StyledEditorKit/bug4253334.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.Action;
+import javax.swing.JEditorPane;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.Caret;
+import javax.swing.text.Element;
+import javax.swing.text.MutableAttributeSet;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.html.HTMLDocument;
+import javax.swing.text.html.HTMLEditorKit;
+import java.awt.event.ActionEvent;
+import java.io.StringReader;
+
+/*
+ * @test
+ * @bug 4253334
+ * @summary Tests that bold attribute unsets properly
+ */
+
+public class bug4253334 {
+
+    public static void main(String[] args) throws Exception {
+        JEditorPane ep = new JEditorPane();
+        ep.setEditable(true);
+        ep.setContentType("text/html");
+
+        HTMLEditorKit kit = (HTMLEditorKit)ep.getEditorKit();
+        HTMLDocument doc = (HTMLDocument)kit.createDefaultDocument();
+        ep.setDocument(doc);
+        String text = "<html><body>somesampletext</body></html>";
+        kit.read(new StringReader(text), doc, 0);
+
+        // make some text bold & italic
+        MutableAttributeSet attrs = new SimpleAttributeSet();
+        StyleConstants.setBold(attrs, true);
+        StyleConstants.setItalic(attrs, true);
+        doc.setCharacterAttributes(3, 9, attrs, false);
+
+        Action[] as = kit.getActions();
+        Action boldAction = null;
+
+        for (Action a : as) {
+            String s = (String) (a.getValue(Action.NAME));
+            if (s.equals("font-bold")) {
+                boldAction = a;
+            }
+        }
+        Caret caret = ep.getCaret();
+        ActionEvent event = new ActionEvent(ep, ActionEvent.ACTION_PERFORMED,
+                                            "font-bold");
+        caret.setDot(3);
+        caret.moveDot(7);
+        boldAction.actionPerformed(event);
+        caret.setDot(7);
+        caret.moveDot(12);
+        boldAction.actionPerformed(event);
+
+        Element elem = doc.getCharacterElement(9);
+        AttributeSet at = elem.getAttributes();
+        if (StyleConstants.isBold(at)) {
+            throw new RuntimeException("Test Failed: bold attribute set");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/text/StyledEditorKit/bug4329418.java b/test/jdk/javax/swing/text/StyledEditorKit/bug4329418.java
new file mode 100644
index 00000000000..e06c9d36aa7
--- /dev/null
+++ b/test/jdk/javax/swing/text/StyledEditorKit/bug4329418.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Robot;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import javax.swing.text.Document;
+import javax.swing.text.MutableAttributeSet;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.StyledEditorKit;
+
+/*
+ * @test
+ * @bug 4329418
+ * @key headful
+ * @summary Tests if setCharacterAttributes() is maintained
+ *          after return in J(Editor/Text)Pane
+ */
+
+public class bug4329418 {
+    private static JFrame jf;
+    private static StyledEditorKit sek;
+
+    private static volatile boolean passed = false;
+    private static final int FONT_SIZE = 36;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoWaitForIdle(true);
+
+            SwingUtilities.invokeAndWait(bug4329418::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(500);
+
+            robot.keyPress(KeyEvent.VK_ENTER);
+            robot.keyRelease(KeyEvent.VK_ENTER);
+            robot.delay(300);
+
+            if (!passed) {
+                throw new RuntimeException("Test failed." +
+                        " setCharacterAttributes() does not work correctly");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (jf != null) {
+                    jf.dispose();
+                }
+            });
+        }
+    }
+
+    private static void createAndShowUI() {
+        jf = new JFrame("setCharacterAttributes Test");
+        sek = new StyledEditorKit();
+        JEditorPane jep = new JEditorPane();
+        jep.setEditorKit(sek);
+
+        MutableAttributeSet attrs = sek.getInputAttributes();
+        StyleConstants.setFontSize(attrs, FONT_SIZE);
+
+        jep.addKeyListener(new KeyAdapter() {
+            public void keyReleased(KeyEvent e) {
+                MutableAttributeSet attrs = sek.getInputAttributes();
+                passed = (StyleConstants.getFontSize(attrs) == FONT_SIZE);
+            }
+        });
+
+        jep.setText("aaa");
+        Document doc = jep.getDocument();
+        jep.setCaretPosition(doc.getLength());
+
+        jf.getContentPane().add(jep);
+        jf.setLocationRelativeTo(null);
+        jf.setSize(200, 200);
+        jf.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/swing/text/bug4739057.java b/test/jdk/javax/swing/text/bug4739057.java
new file mode 100644
index 00000000000..904ea8de18f
--- /dev/null
+++ b/test/jdk/javax/swing/text/bug4739057.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JFormattedTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.text.MaskFormatter;
+import java.text.ParseException;
+
+/*
+ * @test
+ * @bug 4739057
+ * @summary replaceSelection() method fails on JFormattedTextField
+ */
+
+public class bug4739057 {
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            MaskFormatter formatter;
+            try {
+                formatter = new MaskFormatter("(###) ###-####");
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+            formatter.setPlaceholderCharacter('#');
+            JFormattedTextField textField = new JFormattedTextField(formatter);
+            textField.replaceSelection("12345");
+            if (!textField.getText().equals("(123) 45#-####")) {
+                throw new RuntimeException("Test Failed! replaceSelection() didn't replace text properly");
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/text/bug4763466.java b/test/jdk/javax/swing/text/bug4763466.java
new file mode 100644
index 00000000000..db2a914cb8b
--- /dev/null
+++ b/test/jdk/javax/swing/text/bug4763466.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JFormattedTextField;
+import javax.swing.text.NumberFormatter;
+import java.text.DecimalFormat;
+
+/*
+ * @test
+ * @bug 4763466
+ * @summary JFormattedTextField and the - sign
+ */
+
+public class bug4763466 {
+
+    public static void main(String[] args) throws Exception {
+        DecimalFormat decimalFormat = new DecimalFormat("##0.00");
+        NumberFormatter textFormatter = new NumberFormatter(decimalFormat);
+        textFormatter.setAllowsInvalid(false);
+        textFormatter.setValueClass(Double.class);
+
+        JFormattedTextField ftf = new JFormattedTextField(textFormatter);
+        ftf.setCaretPosition(0);
+        ftf.setValue((double) -1);
+
+        if (ftf.getCaretPosition() == 0) {
+            throw new RuntimeException("Test Failed. Caret position shouldn't be 0" +
+                    " as the sign is literal");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/bug4210307.java b/test/jdk/javax/swing/text/html/bug4210307.java
new file mode 100644
index 00000000000..6af4e62f805
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/bug4210307.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JButton;
+import javax.swing.JEditorPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
+import javax.swing.text.html.FormView;
+
+/*
+ * @test
+ * @bug 4210307 4210308
+ * @summary Tests that FormView button text is internationalized
+ */
+
+public class bug4210307 {
+    private static final String RESET_PROPERTY = "TEST RESET";
+    private static final String SUBMIT_PROPERTY = "TEST SUBMIT";
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            Object oldReset = UIManager.put("FormView.resetButtonText",
+                    RESET_PROPERTY);
+            Object oldSubmit = UIManager.put("FormView.submitButtonText",
+                    SUBMIT_PROPERTY);
+
+            try {
+                JEditorPane ep = new JEditorPane("text/html",
+                        "<html><input type=\"submit\"></html>");
+                Document doc = ep.getDocument();
+                Element elem = findInputElement(doc.getDefaultRootElement());
+                TestView view = new TestView(elem);
+                view.test(SUBMIT_PROPERTY);
+
+                ep = new JEditorPane("text/html",
+                        "<html><input type=\"reset\"></html>");
+                doc = ep.getDocument();
+                elem = findInputElement(doc.getDefaultRootElement());
+                view = new TestView(elem);
+                view.test(RESET_PROPERTY);
+            } finally {
+                UIManager.put("FormView.resetButtonText", oldReset);
+                UIManager.put("FormView.submitButtonText", oldSubmit);
+            }
+        });
+    }
+
+    private static Element findInputElement(Element root) {
+        for (int i = 0; i < root.getElementCount(); i++) {
+            Element elem = root.getElement(i);
+            if (elem.getName().equals("input")) {
+                return elem;
+            } else {
+                Element e = findInputElement(elem);
+                if (e != null) return e;
+            }
+        }
+        return null;
+    }
+
+    static class TestView extends FormView {
+        public TestView(Element elem) {
+            super(elem);
+        }
+
+        public void test(String caption) {
+            JButton comp = (JButton) createComponent();
+            if (!comp.getText().equals(caption)) {
+                throw new RuntimeException("Failed: '" + comp.getText() +
+                        "' instead of `" + caption + "'");
+            }
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/bug4839739.java b/test/jdk/javax/swing/text/html/bug4839739.java
new file mode 100644
index 00000000000..1dc5fbef123
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/bug4839739.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import javax.swing.text.html.HTMLEditorKit;
+import java.awt.Component;
+import java.awt.KeyboardFocusManager;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+/*
+ * @test
+ * @bug 4839739
+ * @key headful
+ * @summary Tests if JEditorPane works correctly with HTML comments.
+ */
+
+public class bug4839739 {
+
+    private static JFrame jFrame;
+    private static JEditorPane jep;
+    private static volatile Point p;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoWaitForIdle(true);
+            robot.delay(50);
+
+            SwingUtilities.invokeAndWait(bug4839739::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(500);
+
+            SwingUtilities.invokeAndWait(() -> p = jep.getLocationOnScreen());
+            robot.delay(200);
+
+            robot.mouseMove(p.x + 20, p.y + 20);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.keyPress(KeyEvent.VK_TAB);
+            robot.keyRelease(KeyEvent.VK_TAB);
+            robot.delay(300);
+
+            Component comp = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+            if (!(comp instanceof JEditorPane)) {
+                throw new RuntimeException("Test failed." +
+                        " JEditorPane doesn't work as expected with HTML comments");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (jFrame != null) {
+                    jFrame.dispose();
+                }
+            });
+        }
+    }
+
+    private static void createAndShowUI() {
+        String text = "<html><head><body><!-- some comment -->" +
+                "some always visible text</body></html>";
+
+        jFrame = new JFrame("JEditorPane With HTML");
+        jep = new JEditorPane();
+        jep.setEditorKit(new HTMLEditorKit());
+        jep.setEditable(false);
+
+        jep.setText(text);
+        jFrame.getContentPane().add(jep);
+        jFrame.setSize(200,200);
+        jFrame.setLocationRelativeTo(null);
+        jFrame.setVisible(true);
+    }
+}

From c7d306c65c5ed26839b323f3dfc7e5b68e5adaa1 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 14 Sep 2023 18:27:12 +0000
Subject: [PATCH 021/112] 8315541: Classfile API TypeAnnotation.TargetInfo
 factory methods accept null labels

Reviewed-by: briangoetz
---
 .../jdk/internal/classfile/impl/TargetInfoImpl.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/TargetInfoImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/TargetInfoImpl.java
index 57c4fb4bf3e..e219e4e560d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/TargetInfoImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/TargetInfoImpl.java
@@ -29,6 +29,7 @@
 import jdk.internal.classfile.Label;
 import jdk.internal.classfile.TypeAnnotation.*;
 import static jdk.internal.classfile.Classfile.*;
+import static java.util.Objects.requireNonNull;
 
 public final class TargetInfoImpl {
 
@@ -104,6 +105,11 @@ public int size() {
 
     public record LocalVarTargetInfoImpl(Label startLabel, Label endLabel, int index)
             implements LocalVarTargetInfo {
+
+        public LocalVarTargetInfoImpl {
+            requireNonNull(startLabel);
+            requireNonNull(endLabel);
+        }
     }
 
     public record CatchTargetImpl(int exceptionTableIndex) implements CatchTarget {
@@ -117,7 +123,7 @@ public record OffsetTargetImpl(TargetType targetType, Label target) implements O
 
         public OffsetTargetImpl(TargetType targetType, Label target) {
             this.targetType = checkValid(targetType, TAT_INSTANCEOF, TAT_METHOD_REFERENCE);
-            this.target = target;
+            this.target = requireNonNull(target);
         }
     }
 
@@ -126,7 +132,7 @@ public record TypeArgumentTargetImpl(TargetType targetType, Label target, int ty
 
         public TypeArgumentTargetImpl(TargetType targetType, Label target, int typeArgumentIndex) {
             this.targetType = checkValid(targetType, TAT_CAST, TAT_METHOD_REFERENCE_TYPE_ARGUMENT);
-            this.target = target;
+            this.target = requireNonNull(target);
             this.typeArgumentIndex = typeArgumentIndex;
         }
     }

From 6d47fc6d5b81d6764af322cc17653683f79a89de Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 14 Sep 2023 18:29:01 +0000
Subject: [PATCH 022/112] 8313258:
 RuntimeInvisibleTypeAnnotationsAttribute.annotations() API Index out of Bound
 error

Reviewed-by: briangoetz
---
 .../classes/jdk/internal/classfile/impl/CodeImpl.java  |  3 +++
 test/jdk/jdk/classfile/LimitsTest.java                 | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
index bc597acf07d..c3b6cded50f 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
@@ -97,6 +97,9 @@ public void setLabelTarget(Label label, int bci) {
 
     @Override
     public Label getLabel(int bci) {
+        if (bci < 0 || bci > codeLength)
+            throw new IllegalArgumentException(String.format("Bytecode offset out of range; bci=%d, codeLength=%d",
+                                                             bci, codeLength));
         if (labels == null)
             labels = new LabelImpl[codeLength + 1];
         LabelImpl l = labels[bci];
diff --git a/test/jdk/jdk/classfile/LimitsTest.java b/test/jdk/jdk/classfile/LimitsTest.java
index 778bff770a9..856583832fd 100644
--- a/test/jdk/jdk/classfile/LimitsTest.java
+++ b/test/jdk/jdk/classfile/LimitsTest.java
@@ -30,6 +30,7 @@
 import java.lang.constant.ConstantDescs;
 import java.lang.constant.MethodTypeDesc;
 import jdk.internal.classfile.Classfile;
+import jdk.internal.classfile.impl.LabelContext;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -69,4 +70,13 @@ void testEmptyCode() {
         assertThrows(IllegalArgumentException.class, () -> Classfile.of().build(ClassDesc.of("EmptyClass"), cb -> cb.withMethodBody(
                 "emptyMethod", MethodTypeDesc.of(ConstantDescs.CD_void), 0, cob -> {})));
     }
+
+    @Test
+    void testCodeRange() {
+        var cf = Classfile.of();
+        var lc = (LabelContext)cf.parse(cf.build(ClassDesc.of("EmptyClass"), cb -> cb.withMethodBody(
+                "aMethod", MethodTypeDesc.of(ConstantDescs.CD_void), 0, cob -> cob.return_()))).methods().get(0).code().get();
+        assertThrows(IllegalArgumentException.class, () -> lc.getLabel(-1));
+        assertThrows(IllegalArgumentException.class, () -> lc.getLabel(10));
+    }
 }

From ca747f09b67071938fb101ce61742c56305af341 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 14 Sep 2023 18:30:39 +0000
Subject: [PATCH 023/112] 8315678: Classfile API ConstantPool::entryCount and
 ConstantPool::entryByIndex methods are confusing

Reviewed-by: briangoetz
---
 .../classfile/constantpool/ClassEntry.java    |  1 +
 .../constantpool/ConstantDynamicEntry.java    |  1 +
 .../classfile/constantpool/ConstantPool.java  | 37 +++++++++++++++++--
 .../classfile/constantpool/DoubleEntry.java   |  1 +
 .../classfile/constantpool/FieldRefEntry.java |  1 +
 .../classfile/constantpool/FloatEntry.java    |  1 +
 .../classfile/constantpool/IntegerEntry.java  |  1 +
 .../constantpool/InterfaceMethodRefEntry.java |  1 +
 .../constantpool/InvokeDynamicEntry.java      |  1 +
 .../classfile/constantpool/LongEntry.java     |  1 +
 .../constantpool/MethodHandleEntry.java       |  1 +
 .../constantpool/MethodRefEntry.java          |  1 +
 .../constantpool/MethodTypeEntry.java         |  1 +
 .../classfile/constantpool/ModuleEntry.java   |  1 +
 .../constantpool/NameAndTypeEntry.java        |  1 +
 .../classfile/constantpool/PackageEntry.java  |  1 +
 .../classfile/constantpool/StringEntry.java   |  1 +
 .../classfile/constantpool/Utf8Entry.java     |  1 +
 .../classfile/impl/ClassPrinterImpl.java      |  6 +--
 .../classfile/impl/ClassReaderImpl.java       |  8 +++-
 .../classfile/impl/SplitConstantPool.java     | 28 ++++++++++----
 .../classfile/impl/TemporaryConstantPool.java |  2 +-
 .../impl/verifier/VerificationWrapper.java    |  2 +-
 .../internal/plugins/StringSharingPlugin.java |  9 ++---
 .../jdk/classfile/ConstantPoolCopyTest.java   |  4 +-
 test/jdk/jdk/classfile/CorpusTest.java        | 10 ++---
 test/jdk/jdk/classfile/Utf8EntryTest.java     |  3 +-
 .../CPoolRefClassContainingInlinedCts.java    |  6 +--
 .../8000518/DuplicateConstantPoolEntry.java   | 14 +++----
 .../tools/javac/NoStringToLower.java          |  5 +--
 .../EmptyUTF8ForInnerClassNameTest.java       |  3 +-
 .../javac/classfiles/T8255757/T8255757.java   |  5 +--
 .../InnerClassesHierarchyTest.java            |  4 +-
 .../tools/javac/diags/CheckResourceKeys.java  |  4 +-
 .../jvm/ClassRefDupInConstantPoolTest.java    |  4 +-
 .../tools/javac/lambda/ByteCodeTest.java      |  2 +-
 .../javac/patterns/MatchExceptionTest.java    |  6 +--
 .../javac/records/RecordCompilationTests.java |  4 +-
 .../tools/javac/resolve/NoObjectToString.java |  3 +-
 .../tools/javap/classfile/T6887895.java       |  4 +-
 40 files changed, 120 insertions(+), 70 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/ClassEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/ClassEntry.java
index 64169051ec6..b5887d68000 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/ClassEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/ClassEntry.java
@@ -31,6 +31,7 @@
 /**
  * Models a {@code CONSTANT_Class_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.1 The CONSTANT_Class_info Structure
  */
 public sealed interface ClassEntry
         extends LoadableConstantEntry
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/ConstantDynamicEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/ConstantDynamicEntry.java
index d4d26986454..afb36eaa184 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/ConstantDynamicEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/ConstantDynamicEntry.java
@@ -34,6 +34,7 @@
 /**
  * Models a {@code CONSTANT_Dynamic_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.10 The CONSTANT_Dynamic_info and CONSTANT_InvokeDynamic_info Structures
  */
 public sealed interface ConstantDynamicEntry
         extends DynamicConstantPoolEntry, LoadableConstantEntry
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/ConstantPool.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/ConstantPool.java
index 9c2ca4b9393..b74f2c5503e 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/ConstantPool.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/ConstantPool.java
@@ -25,27 +25,56 @@
 
 package jdk.internal.classfile.constantpool;
 
+import java.util.Iterator;
+import java.util.NoSuchElementException;
 import jdk.internal.classfile.BootstrapMethodEntry;
 import jdk.internal.classfile.ClassReader;
 
 /**
  * Provides read access to the constant pool and bootstrap method table of a
  * classfile.
+ * @jvms 4.4 The Constant Pool
  */
-public sealed interface ConstantPool
+public sealed interface ConstantPool extends Iterable<PoolEntry>
         permits ClassReader, ConstantPoolBuilder {
 
     /**
      * {@return the entry at the specified index}
      *
      * @param index the index within the pool of the desired entry
+     * @throws ConstantPoolException if the index is out of range of the
+     *         constant pool, or is considered unusable
      */
     PoolEntry entryByIndex(int index);
 
     /**
-     * {@return the number of entries in the constant pool}
+     * {@return the size of the constant pool}
      */
-    int entryCount();
+    int size();
+
+    /**
+     * @{return an iterator over pool entries}
+     */
+    @Override
+    default Iterator<PoolEntry> iterator() {
+        return new Iterator<>() {
+            int index = 1;
+
+            @Override
+            public boolean hasNext() {
+                return index < size();
+            }
+
+            @Override
+            public PoolEntry next() {
+                if (!hasNext()) throw new NoSuchElementException();
+                var e = entryByIndex(index);
+                index += e.width();
+                return e;
+            }
+        };
+    }
+
 
     /**
      * {@return the {@link BootstrapMethodEntry} at the specified index within
@@ -53,6 +82,8 @@ public sealed interface ConstantPool
      *
      * @param index the index within the bootstrap method table of the desired
      *              entry
+     * @throws ConstantPoolException if the index is out of range of the
+     *         bootstrap methods
      */
     BootstrapMethodEntry bootstrapMethodEntry(int index);
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/DoubleEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/DoubleEntry.java
index 042411365f1..0fe8226a3b8 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/DoubleEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/DoubleEntry.java
@@ -30,6 +30,7 @@
 /**
  * Models a {@code CONSTANT_Double_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.5 The CONSTANT_Long_info and CONSTANT_Double_info Structures
  */
 public sealed interface DoubleEntry
         extends AnnotationConstantValueEntry, ConstantValueEntry
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/FieldRefEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/FieldRefEntry.java
index d8e6bfdd959..9b7f199cb1b 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/FieldRefEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/FieldRefEntry.java
@@ -29,6 +29,7 @@
 /**
  * Models a {@code CONSTANT_Fieldref_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.2 The CONSTANT_Fieldref_info, CONSTANT_Methodref_info, and CONSTANT_InterfaceMethodref_info Structures
  */
 public sealed interface FieldRefEntry extends MemberRefEntry
         permits AbstractPoolEntry.FieldRefEntryImpl {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/FloatEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/FloatEntry.java
index 8ac8869cde2..24b3ebf82d5 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/FloatEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/FloatEntry.java
@@ -30,6 +30,7 @@
 /**
  * Models a {@code CONSTANT_Float_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.4 The CONSTANT_Integer_info and CONSTANT_Float_info Structures
  */
 public sealed interface FloatEntry
         extends AnnotationConstantValueEntry, ConstantValueEntry
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/IntegerEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/IntegerEntry.java
index 3e9856c7345..3674984039e 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/IntegerEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/IntegerEntry.java
@@ -30,6 +30,7 @@
 /**
  * Models a {@code CONSTANT_Integer_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.4 The CONSTANT_Integer_info and CONSTANT_Float_info Structures
  */
 public sealed interface IntegerEntry
         extends AnnotationConstantValueEntry, ConstantValueEntry
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/InterfaceMethodRefEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/InterfaceMethodRefEntry.java
index f636958d965..495a33211a7 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/InterfaceMethodRefEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/InterfaceMethodRefEntry.java
@@ -29,6 +29,7 @@
 /**
  * Models a {@code CONSTANT_InterfaceMethodRef_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.2 The CONSTANT_Fieldref_info, CONSTANT_Methodref_info, and CONSTANT_InterfaceMethodref_info Structures
  */
 public sealed interface InterfaceMethodRefEntry
         extends MemberRefEntry
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/InvokeDynamicEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/InvokeDynamicEntry.java
index ffa5c601e8a..d5019569d63 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/InvokeDynamicEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/InvokeDynamicEntry.java
@@ -32,6 +32,7 @@
 
 /**
  * Models a constant pool entry for a dynamic call site.
+ * @jvms 4.4.10 The CONSTANT_Dynamic_info and CONSTANT_InvokeDynamic_info Structures
  */
 public sealed interface InvokeDynamicEntry
         extends DynamicConstantPoolEntry
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/LongEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/LongEntry.java
index 16ed5b16248..a94dd825a58 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/LongEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/LongEntry.java
@@ -30,6 +30,7 @@
 /**
  * Models a {@code CONSTANT_Long_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.5 The CONSTANT_Long_info and CONSTANT_Double_info Structures
  */
 public sealed interface LongEntry
         extends AnnotationConstantValueEntry, ConstantValueEntry
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/MethodHandleEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/MethodHandleEntry.java
index cde94e6d473..270ad872e47 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/MethodHandleEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/MethodHandleEntry.java
@@ -32,6 +32,7 @@
 /**
  * Models a {@code CONSTANT_MethodHandle_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.8 The CONSTANT_MethodHandle_info Structure
  */
 public sealed interface MethodHandleEntry
         extends LoadableConstantEntry
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/MethodRefEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/MethodRefEntry.java
index 01191402798..52f3ee18dde 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/MethodRefEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/MethodRefEntry.java
@@ -29,6 +29,7 @@
 /**
  * Models a {@code CONSTANT_MethodRef_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.2 The CONSTANT_Fieldref_info, CONSTANT_Methodref_info, and CONSTANT_InterfaceMethodref_info Structures
  */
 public sealed interface MethodRefEntry extends MemberRefEntry
         permits AbstractPoolEntry.MethodRefEntryImpl {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/MethodTypeEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/MethodTypeEntry.java
index a66e9bc779b..252ee479f2a 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/MethodTypeEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/MethodTypeEntry.java
@@ -32,6 +32,7 @@
 /**
  * Models a {@code CONSTANT_MethodType_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.9 The CONSTANT_MethodType_info Structure
  */
 public sealed interface MethodTypeEntry
         extends LoadableConstantEntry
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/ModuleEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/ModuleEntry.java
index b2a57e1e0ad..571e0e022cb 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/ModuleEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/ModuleEntry.java
@@ -30,6 +30,7 @@
 /**
  * Models a {@code CONSTANT_Module_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.11 The CONSTANT_Module_info Structure
  */
 public sealed interface ModuleEntry extends PoolEntry
         permits AbstractPoolEntry.ModuleEntryImpl {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/NameAndTypeEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/NameAndTypeEntry.java
index b6743c62064..a40d29763c7 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/NameAndTypeEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/NameAndTypeEntry.java
@@ -29,6 +29,7 @@
 /**
  * Models a {@code CONSTANT_NameAndType_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.6 The CONSTANT_NameAndType_info Structure
  */
 public sealed interface NameAndTypeEntry extends PoolEntry
         permits AbstractPoolEntry.NameAndTypeEntryImpl {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/PackageEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/PackageEntry.java
index 201fa56558a..6c132010168 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/PackageEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/PackageEntry.java
@@ -30,6 +30,7 @@
 /**
  * Models a {@code CONSTANT_Package_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.12 The CONSTANT_Package_info Structure
  */
 public sealed interface PackageEntry extends PoolEntry
         permits AbstractPoolEntry.PackageEntryImpl {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/StringEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/StringEntry.java
index 71829601237..a1a1b448236 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/StringEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/StringEntry.java
@@ -29,6 +29,7 @@
 /**
  * Models a {@code CONSTANT_String_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.3 The CONSTANT_String_info Structure
  */
 public sealed interface StringEntry
         extends ConstantValueEntry
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/Utf8Entry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/Utf8Entry.java
index f437554705e..a08e26155bf 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/Utf8Entry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/Utf8Entry.java
@@ -29,6 +29,7 @@
 /**
  * Models a {@code CONSTANT_UTF8_info} constant in the constant pool of a
  * classfile.
+ * @jvms 4.4.7 The CONSTANT_Utf8_info Structure
  */
 public sealed interface Utf8Entry
         extends CharSequence, AnnotationConstantValueEntry
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassPrinterImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassPrinterImpl.java
index 464964317d9..07fdca9f741 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassPrinterImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassPrinterImpl.java
@@ -570,9 +570,8 @@ private static MapNode classToTree(ClassModel clm, Verbosity verbosity) {
     private static Node[] constantPoolToTree(ConstantPool cp, Verbosity verbosity) {
         if (verbosity == Verbosity.TRACE_ALL) {
             var cpNode = new MapNodeImpl(BLOCK, "constant pool");
-            for (int i = 1; i < cp.entryCount();) {
-                var e = cp.entryByIndex(i);
-                cpNode.with(new MapNodeImpl(FLOW, i)
+            for (PoolEntry e : cp) {
+                cpNode.with(new MapNodeImpl(FLOW, e.index())
                         .with(leaf("tag", switch (e.tag()) {
                             case TAG_UTF8 -> "Utf8";
                             case TAG_INTEGER -> "Integer";
@@ -637,7 +636,6 @@ private static Node[] constantPoolToTree(ConstantPool cp, Verbosity verbosity) {
                                 "value", String.valueOf(ve.constantValue())
                             );
                         }));
-                i += e.width();
             }
             return new Node[]{cpNode};
         } else {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
index 7895b5b3fd8..70bd140f905 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
@@ -144,7 +144,7 @@ public Function<Utf8Entry, AttributeMapper<?>> customAttributes() {
     }
 
     @Override
-    public int entryCount() {
+    public int size() {
         return constantPoolCount;
     }
 
@@ -189,6 +189,9 @@ public int bootstrapMethodCount() {
 
     @Override
     public BootstrapMethodEntryImpl bootstrapMethodEntry(int index) {
+        if (index < 0 || index >= bootstrapMethodCount()) {
+            throw new ConstantPoolException("Bad BSM index: " + index);
+        }
         return bsmEntries().get(index);
     }
 
@@ -312,6 +315,9 @@ public PoolEntry entryByIndex(int index) {
         PoolEntry info = cp[index];
         if (info == null) {
             int offset = cpOffset[index];
+            if (offset == 0) {
+                throw new ConstantPoolException("Unusable CP index: " + index);
+            }
             int tag = readU1(offset);
             final int q = offset + 1;
             info = switch (tag) {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
index 367c7f74762..fe92d2bc5a4 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
@@ -28,6 +28,7 @@
 import java.lang.constant.MethodTypeDesc;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import jdk.internal.classfile.Attribute;
 import jdk.internal.classfile.Attributes;
@@ -75,6 +76,7 @@
 import static jdk.internal.classfile.Classfile.TAG_NAMEANDTYPE;
 import static jdk.internal.classfile.Classfile.TAG_PACKAGE;
 import static jdk.internal.classfile.Classfile.TAG_STRING;
+import jdk.internal.classfile.constantpool.ConstantPoolException;
 
 public final class SplitConstantPool implements ConstantPoolBuilder {
 
@@ -101,7 +103,7 @@ public SplitConstantPool() {
 
     public SplitConstantPool(ClassReader parent) {
         this.parent = (ClassReaderImpl) parent;
-        this.parentSize = parent.entryCount();
+        this.parentSize = parent.size();
         this.parentBsmSize = parent.bootstrapMethodCount();
         this.size = parentSize;
         this.bsmSize = parentBsmSize;
@@ -110,7 +112,7 @@ public SplitConstantPool(ClassReader parent) {
     }
 
     @Override
-    public int entryCount() {
+    public int size() {
         return size;
     }
 
@@ -121,13 +123,23 @@ public int bootstrapMethodCount() {
 
     @Override
     public PoolEntry entryByIndex(int index) {
-        return (index < parentSize)
+        if (index <= 0 || index >= size()) {
+            throw new ConstantPoolException("Bad CP index: " + index);
+        }
+        PoolEntry pe = (index < parentSize)
                ? parent.entryByIndex(index)
                : myEntries[index - parentSize];
+        if (pe == null) {
+            throw new ConstantPoolException("Unusable CP index: " + index);
+        }
+        return pe;
     }
 
     @Override
     public BootstrapMethodEntryImpl bootstrapMethodEntry(int index) {
+        if (index < 0 || index >= bootstrapMethodCount()) {
+            throw new ConstantPoolException("Bad BSM index: " + index);
+        }
         return (index < parentBsmSize)
                ? parent.bootstrapMethodEntry(index)
                : myBsmEntries[index - parentBsmSize];
@@ -170,15 +182,15 @@ public void writeBody(BufWriter b) {
     @Override
     public void writeTo(BufWriter buf) {
         int writeFrom = 1;
-        if (entryCount() >= 65536) {
-            throw new IllegalArgumentException(String.format("Constant pool is too large %d", entryCount()));
+        if (size() >= 65536) {
+            throw new IllegalArgumentException(String.format("Constant pool is too large %d", size()));
         }
-        buf.writeU2(entryCount());
+        buf.writeU2(size());
         if (parent != null && buf.constantPool().canWriteDirect(this)) {
             parent.writeConstantPoolEntries(buf);
-            writeFrom = parent.entryCount();
+            writeFrom = parent.size();
         }
-        for (int i = writeFrom; i < entryCount(); ) {
+        for (int i = writeFrom; i < size(); ) {
             PoolEntry info = entryByIndex(i);
             info.writeTo(buf);
             i += info.width();
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/TemporaryConstantPool.java b/src/java.base/share/classes/jdk/internal/classfile/impl/TemporaryConstantPool.java
index 231d8b37184..b748812ecc0 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/TemporaryConstantPool.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/TemporaryConstantPool.java
@@ -166,7 +166,7 @@ public PoolEntry entryByIndex(int index) {
     }
 
     @Override
-    public int entryCount() {
+    public int size() {
         throw new UnsupportedOperationException();
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationWrapper.java b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationWrapper.java
index fa4e7ab6d1d..b27d7818c5f 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationWrapper.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationWrapper.java
@@ -162,7 +162,7 @@ static class ConstantPoolWrapper {
         }
 
         int entryCount() {
-            return cp.entryCount();
+            return cp.size();
         }
 
         String classNameAt(int index) {
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StringSharingPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StringSharingPlugin.java
index db86695eed6..1b6345213a9 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StringSharingPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StringSharingPlugin.java
@@ -175,9 +175,8 @@ private void scanMethods(Set<Integer> utf8Descriptors)
 
             private void scanConstantPool(Set<Integer> utf8Descriptors)
                     throws Exception {
-                for (int i = 1; i < cm.constantPool().entryCount(); i += cm.constantPool().entryByIndex(i).width()) {
-                    try {
-                        PoolEntry info = cm.constantPool().entryByIndex(i);
+                try {
+                    for (PoolEntry info : cm.constantPool()) {
                         switch (info) {
                             case NameAndTypeEntry nameAndType ->
                                 utf8Descriptors.add(nameAndType.type().index());
@@ -185,9 +184,9 @@ private void scanConstantPool(Set<Integer> utf8Descriptors)
                                 utf8Descriptors.add(mt.descriptor().index());
                             default -> {}
                         }
-                    } catch (ConstantPoolException ex) {
-                        throw new IOException(ex);
                     }
+                } catch (ConstantPoolException ex) {
+                    throw new IOException(ex);
                 }
             }
         }
diff --git a/test/jdk/jdk/classfile/ConstantPoolCopyTest.java b/test/jdk/jdk/classfile/ConstantPoolCopyTest.java
index 961c23657b4..9d910275dfc 100644
--- a/test/jdk/jdk/classfile/ConstantPoolCopyTest.java
+++ b/test/jdk/jdk/classfile/ConstantPoolCopyTest.java
@@ -102,9 +102,9 @@ void cloneConstantPool(ClassModel c) throws Exception {
         ConstantPool cp = c.constantPool();
         ConstantPoolBuilder cp2 = new SplitConstantPool((ClassReader) cp);
 
-        assertEquals(cp2.entryCount(), cp.entryCount(), "Cloned constant pool must be same size");
+        assertEquals(cp2.size(), cp.size(), "Cloned constant pool must be same size");
 
-        for (int i = 1; i < cp.entryCount();) {
+        for (int i = 1; i < cp.size();) {
             PoolEntry cp1i = cp.entryByIndex(i);
             PoolEntry cp2i = cp2.entryByIndex(i);
             assertTrue(representsTheSame(cp1i, cp2i), cp2i + " does not represent the same constant pool entry as " + cp1i);
diff --git a/test/jdk/jdk/classfile/CorpusTest.java b/test/jdk/jdk/classfile/CorpusTest.java
index 55e98bcea87..b54036d821e 100644
--- a/test/jdk/jdk/classfile/CorpusTest.java
+++ b/test/jdk/jdk/classfile/CorpusTest.java
@@ -248,13 +248,13 @@ private void compareCp(byte[] orig, byte[] transformed) {
         var cp1 = cc.parse(orig).constantPool();
         var cp2 = cc.parse(transformed).constantPool();
 
-        for (int i = 1; i < cp1.entryCount(); i += cp1.entryByIndex(i).width()) {
+        for (int i = 1; i < cp1.size(); i += cp1.entryByIndex(i).width()) {
             assertEquals(cpiToString(cp1.entryByIndex(i)), cpiToString(cp2.entryByIndex(i)));
         }
 
-        if (cp1.entryCount() != cp2.entryCount()) {
-            StringBuilder failMsg = new StringBuilder("Extra entries in constant pool (" + (cp2.entryCount() - cp1.entryCount()) + "): ");
-            for (int i = cp1.entryCount(); i < cp2.entryCount(); i += cp2.entryByIndex(i).width())
+        if (cp1.size() != cp2.size()) {
+            StringBuilder failMsg = new StringBuilder("Extra entries in constant pool (" + (cp2.size() - cp1.size()) + "): ");
+            for (int i = cp1.size(); i < cp2.size(); i += cp2.entryByIndex(i).width())
                 failMsg.append("\n").append(cp2.entryByIndex(i));
             fail(failMsg.toString());
         }
@@ -272,7 +272,7 @@ private static Map<Integer, Integer> findDups(byte[] bytes) {
         var cf = Classfile.of().parse(bytes);
         var pool = cf.constantPool();
         Set<String> entryStrings = new HashSet<>();
-        for (int i = 1; i < pool.entryCount(); i += pool.entryByIndex(i).width()) {
+        for (int i = 1; i < pool.size(); i += pool.entryByIndex(i).width()) {
             String s = cpiToString(pool.entryByIndex(i));
             if (entryStrings.contains(s)) {
                 for (int j=1; j<i; j += pool.entryByIndex(j).width()) {
diff --git a/test/jdk/jdk/classfile/Utf8EntryTest.java b/test/jdk/jdk/classfile/Utf8EntryTest.java
index 2547484118d..b2eb0dbf9b8 100644
--- a/test/jdk/jdk/classfile/Utf8EntryTest.java
+++ b/test/jdk/jdk/classfile/Utf8EntryTest.java
@@ -185,8 +185,7 @@ static void replace(byte[] b, byte[] s, UnaryOperator<byte[]> f) {
     }
 
     static StringEntry obtainStringEntry(ConstantPool cp) {
-        for (int i = 1; i < cp.entryCount(); i++) {
-            PoolEntry entry = cp.entryByIndex(i);
+        for (PoolEntry entry : cp) {
             if (entry instanceof StringEntry se) {
                 return se;
             }
diff --git a/test/langtools/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java b/test/langtools/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java
index 41598200841..ed3d095be2f 100644
--- a/test/langtools/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java
+++ b/test/langtools/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java
@@ -75,14 +75,10 @@ void checkReferences() throws IOException {
         File file = new File(testClasses,
                 CPoolRefClassContainingInlinedCts.class.getName() + ".class");
         ClassModel classFile = Classfile.of().parse(file.toPath());
-        int i = 1;
-        PoolEntry cpInfo;
-        while (i < classFile.constantPool().entryCount()) {
-            cpInfo = classFile.constantPool().entryByIndex(i);
+        for (PoolEntry cpInfo : classFile.constantPool()) {
             if (cpInfo instanceof ClassEntry classEntry) {
                 checkClassName(classEntry.asInternalName());
             }
-            i += cpInfo.width();
         }
         if (numberOfReferencedClassesToBeChecked != 16) {
             throw new AssertionError("Class reference missing in the constant pool");
diff --git a/test/langtools/tools/javac/8000518/DuplicateConstantPoolEntry.java b/test/langtools/tools/javac/8000518/DuplicateConstantPoolEntry.java
index 20bd3b6fb64..cd640524d62 100644
--- a/test/langtools/tools/javac/8000518/DuplicateConstantPoolEntry.java
+++ b/test/langtools/tools/javac/8000518/DuplicateConstantPoolEntry.java
@@ -47,6 +47,7 @@
 import javax.tools.JavaFileObject;
 import javax.tools.SimpleJavaFileObject;
 import javax.tools.ToolProvider;
+import jdk.internal.classfile.constantpool.PoolEntry;
 
 /*
  * This bug was reproduced having two classes B and C referenced from a class A
@@ -96,17 +97,12 @@ void checkReference() throws IOException {
         File file = new File("A.class");
         ClassModel classFile = Classfile.of().parse(file.toPath());
         ConstantPool constantPool = classFile.constantPool();
-        for (int i = 1;
-                i < constantPool.entryCount() - 1;
-                i += constantPool.entryByIndex(i).width()) {
-            for (int j = i + constantPool.entryByIndex(i).width();
-                    j < constantPool.entryCount();
-                    j += constantPool.entryByIndex(j).width()) {
-                if (constantPool.entryByIndex(i).toString().
-                        equals(constantPool.entryByIndex(j).toString())) {
+        for (PoolEntry pe1 : constantPool) {
+            for (PoolEntry pe2 : constantPool) {
+                if (pe2.index() > pe1.index() && pe1.equals(pe2)) {
                     throw new AssertionError(
                             "Duplicate entries in the constant pool at positions " +
-                            i + " and " + j);
+                            pe1.index() + " and " + pe2.index());
                 }
             }
         }
diff --git a/test/langtools/tools/javac/NoStringToLower.java b/test/langtools/tools/javac/NoStringToLower.java
index 1caadb5849c..450a05ac707 100644
--- a/test/langtools/tools/javac/NoStringToLower.java
+++ b/test/langtools/tools/javac/NoStringToLower.java
@@ -109,9 +109,8 @@ JavaFileManager.Location findJavacLocation(JavaFileManager fm) {
     void scan(JavaFileObject fo) throws IOException {
         try (InputStream in = fo.openInputStream()) {
             ClassModel cf = Classfile.of().parse(in.readAllBytes());
-            ConstantPool cp = cf.constantPool();
-            for (int i = 1; i < cp.entryCount(); i += cp.entryByIndex(i).width()) {
-                if (cp.entryByIndex(i) instanceof MethodRefEntry ref) {
+            for (PoolEntry pe : cf.constantPool()) {
+                if (pe instanceof MethodRefEntry ref) {
                     String methodDesc = ref.owner().name().stringValue() + "." + ref.name().stringValue() + ":" + ref.type().stringValue();
 
                     if ("java/lang/String.toLowerCase:()Ljava/lang/String;".equals(methodDesc)) {
diff --git a/test/langtools/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java b/test/langtools/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java
index 30cc6d455d5..430ec1bfe61 100644
--- a/test/langtools/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java
+++ b/test/langtools/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java
@@ -58,8 +58,7 @@ void run() throws Exception {
     void checkClassFile(final Path path) throws Exception {
         ClassModel classFile = Classfile.of().parse(
                 new BufferedInputStream(Files.newInputStream(path)).readAllBytes());
-        for (int i = 1; i < classFile.constantPool().entryCount(); ++i) {
-            PoolEntry pe = classFile.constantPool().entryByIndex(i);
+        for (PoolEntry pe : classFile.constantPool()) {
             if (pe instanceof Utf8Entry utf8Info) {
                 Assert.check(utf8Info.stringValue().length() > 0,
                         "UTF8 with length 0 found at class " + classFile.thisClass().name());
diff --git a/test/langtools/tools/javac/classfiles/T8255757/T8255757.java b/test/langtools/tools/javac/classfiles/T8255757/T8255757.java
index 411ecca010d..2611b5f885a 100644
--- a/test/langtools/tools/javac/classfiles/T8255757/T8255757.java
+++ b/test/langtools/tools/javac/classfiles/T8255757/T8255757.java
@@ -80,10 +80,9 @@ void test2(Object[] o) {
                 .run();
 
         ClassModel cf = Classfile.of().parse(curPath.resolve("Test.class"));
-        ConstantPool cp = cf.constantPool();
         int num = 0;
-        for (int i = 1; i < cp.entryCount(); i += cp.entryByIndex(i).width()) {
-            if (cp.entryByIndex(i) instanceof MethodRefEntry methodRefEntry) {
+        for (PoolEntry pe : cf.constantPool()) {
+            if (pe instanceof MethodRefEntry methodRefEntry) {
                 String class_name = methodRefEntry.owner().asInternalName();
                 String method_name = methodRefEntry.name().stringValue();
                 String method_type = methodRefEntry.type().stringValue();
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java
index 6d3055e5fef..33c60171712 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java
@@ -63,8 +63,8 @@ public InnerClassesHierarchyTest() throws IOException, ConstantPoolException {
         for (File file : Arrays.asList(classDir.listFiles(filter))) {
             ClassModel classFile = readClassFile(file);
             String className = classFile.thisClass().name().stringValue();
-            for (int i = 1; i < classFile.constantPool().entryCount(); ++i) {
-                if (classFile.constantPool().entryByIndex(i) instanceof ClassEntry classInfo
+            for (PoolEntry pe : classFile.constantPool()) {
+                if (pe instanceof ClassEntry classInfo
                         && classInfo.asSymbol().isClassOrInterface()) {
                     String cpClassName = classInfo.asInternalName();
                     if (isInnerClass(cpClassName)) {
diff --git a/test/langtools/tools/javac/diags/CheckResourceKeys.java b/test/langtools/tools/javac/diags/CheckResourceKeys.java
index b3bb06ba3e4..ced98b7f666 100644
--- a/test/langtools/tools/javac/diags/CheckResourceKeys.java
+++ b/test/langtools/tools/javac/diags/CheckResourceKeys.java
@@ -497,8 +497,8 @@ JavaFileManager.Location findJavacLocation(JavaFileManager fm) {
     void scan(JavaFileObject fo, Set<String> results) throws IOException {
         try (InputStream in = fo.openInputStream()) {
             ClassModel cm = Classfile.of().parse(in.readAllBytes());
-            for (int i = 1; i < cm.constantPool().entryCount(); ++i) {
-                if (cm.constantPool().entryByIndex(i) instanceof Utf8Entry entry) {
+            for (PoolEntry pe : cm.constantPool()) {
+                if (pe instanceof Utf8Entry entry) {
                     String v = entry.stringValue();
                     if (v.matches("[A-Za-z0-9-_.]+"))
                         results.add(v);
diff --git a/test/langtools/tools/javac/jvm/ClassRefDupInConstantPoolTest.java b/test/langtools/tools/javac/jvm/ClassRefDupInConstantPoolTest.java
index a0a0c687fa2..e588978549a 100644
--- a/test/langtools/tools/javac/jvm/ClassRefDupInConstantPoolTest.java
+++ b/test/langtools/tools/javac/jvm/ClassRefDupInConstantPoolTest.java
@@ -47,8 +47,8 @@ public static void main(String[] args) throws Exception {
 
         int duplicates = 0;
         TreeSet<String> set = new TreeSet<>();
-        for (int i = 1; i < pool.entryCount(); i += pool.entryByIndex(i).width()) {
-            if (pool.entryByIndex(i) instanceof ClassEntry ce) {
+        for (PoolEntry pe : pool) {
+            if (pe instanceof ClassEntry ce) {
                 if (!set.add(ce.asInternalName())) {
                     duplicates++;
                     System.out.println("DUPLICATE CLASS REF " + ce.asInternalName());
diff --git a/test/langtools/tools/javac/lambda/ByteCodeTest.java b/test/langtools/tools/javac/lambda/ByteCodeTest.java
index 42c0be83439..1eedf9c9720 100644
--- a/test/langtools/tools/javac/lambda/ByteCodeTest.java
+++ b/test/langtools/tools/javac/lambda/ByteCodeTest.java
@@ -83,7 +83,7 @@ private static boolean verifyClassFileAttributes(File classFile, TestCases tc) {
             e.printStackTrace();
         }
         assert c != null;
-        ConstantPoolVisitor cpv = new ConstantPoolVisitor(c, c.constantPool().entryCount());
+        ConstantPoolVisitor cpv = new ConstantPoolVisitor(c, c.constantPool().size());
         Map<Integer, String> hm = cpv.getBSMMap();
 
         List<String> expectedValList = tc.getExpectedArgValues();
diff --git a/test/langtools/tools/javac/patterns/MatchExceptionTest.java b/test/langtools/tools/javac/patterns/MatchExceptionTest.java
index abc21cd880d..25b4f5f03cb 100644
--- a/test/langtools/tools/javac/patterns/MatchExceptionTest.java
+++ b/test/langtools/tools/javac/patterns/MatchExceptionTest.java
@@ -44,6 +44,7 @@
 import jdk.internal.classfile.constantpool.ClassEntry;
 import jdk.internal.classfile.constantpool.ConstantPool;
 import java.util.Arrays;
+import jdk.internal.classfile.constantpool.PoolEntry;
 
 import toolbox.JavacTask;
 import toolbox.TestRunner;
@@ -118,9 +119,8 @@ record Source(String source, boolean needs21) {}
                 cf = Classfile.of().parse(curPath.resolve("Test.class"));
                 boolean incompatibleClassChangeErrror = false;
                 boolean matchException = false;
-                ConstantPool cp = cf.constantPool();
-                for (int i = 1; i < cp.entryCount(); i += cp.entryByIndex(i).width()) {
-                    if (cp.entryByIndex(i) instanceof ClassEntry clazz) {
+                for (PoolEntry pe : cf.constantPool()) {
+                    if (pe instanceof ClassEntry clazz) {
                         incompatibleClassChangeErrror |= clazz.name().equalsString(
                                 "java/lang/IncompatibleClassChangeError");
                         matchException |= clazz.name().equalsString("java/lang/MatchException");
diff --git a/test/langtools/tools/javac/records/RecordCompilationTests.java b/test/langtools/tools/javac/records/RecordCompilationTests.java
index e2d6679dd80..f1533625d9d 100644
--- a/test/langtools/tools/javac/records/RecordCompilationTests.java
+++ b/test/langtools/tools/javac/records/RecordCompilationTests.java
@@ -1276,8 +1276,8 @@ record R(int recordComponent) {}
             for (final File fileEntry : Objects.requireNonNull(dir.listFiles())) {
                 if (fileEntry.getName().endsWith("R.class")) {
                     ClassModel classFile = Classfile.of().parse(fileEntry.toPath());
-                    for (int i = 1; i < classFile.constantPool().entryCount(); ++i) {
-                        if (classFile.constantPool().entryByIndex(i) instanceof FieldRefEntry fieldRefEntry) {
+                    for (PoolEntry pe : classFile.constantPool()) {
+                        if (pe instanceof FieldRefEntry fieldRefEntry) {
                             numberOfFieldRefs++;
                             NameAndTypeEntry nameAndType = (NameAndTypeEntry) classFile.constantPool()
                                             .entryByIndex(fieldRefEntry.nameAndType().index());
diff --git a/test/langtools/tools/javac/resolve/NoObjectToString.java b/test/langtools/tools/javac/resolve/NoObjectToString.java
index bac11f80448..0d9af699c72 100644
--- a/test/langtools/tools/javac/resolve/NoObjectToString.java
+++ b/test/langtools/tools/javac/resolve/NoObjectToString.java
@@ -49,8 +49,7 @@ void run(String... args) throws Exception {
         try (InputStream in = NoObjectToString.class.getResourceAsStream("NoObjectToString$Test.class")) {
             assert in != null;
             ClassModel cm = Classfile.of().parse(in.readAllBytes());
-            for (int i = 1; i < cm.constantPool().entryCount(); ++i) {
-                PoolEntry pe = cm.constantPool().entryByIndex(i);
+            for (PoolEntry pe : cm.constantPool()) {
                 if (pe instanceof MethodRefEntry ref) {
                     String methodDesc = ref.owner().name() + "." + ref.nameAndType().name() + ":" + ref.nameAndType().type();
 
diff --git a/test/langtools/tools/javap/classfile/T6887895.java b/test/langtools/tools/javap/classfile/T6887895.java
index cd3b41e51dd..548752e1e73 100644
--- a/test/langtools/tools/javap/classfile/T6887895.java
+++ b/test/langtools/tools/javap/classfile/T6887895.java
@@ -49,8 +49,8 @@ void run() throws Exception {
 
         ClassModel cm = getClassFile("T6887895$Test.class");
         ConstantPool cp = cm.constantPool();
-        for (int i = 1; i < cp.entryCount(); ++i) {
-            if (cp.entryByIndex(i) instanceof ClassEntry ce) {
+        for (PoolEntry pe : cp) {
+            if (pe instanceof ClassEntry ce) {
                 String name = ce.asInternalName();
                 System.out.println("found: " + name);
                 if (ce.asSymbol().isClassOrInterface())

From 2a6fb9ce59be2d06c753b920ed689c0cc6775c5b Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Thu, 14 Sep 2023 18:52:24 +0000
Subject: [PATCH 024/112] 8316147: Remove
 serviceability/sa/TestJhsdbJstackMixed.java from -Xcomp problem list

Reviewed-by: lmesnik
---
 test/hotspot/jtreg/ProblemList-Xcomp.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList-Xcomp.txt b/test/hotspot/jtreg/ProblemList-Xcomp.txt
index 64cfeff4920..562e71f350c 100644
--- a/test/hotspot/jtreg/ProblemList-Xcomp.txt
+++ b/test/hotspot/jtreg/ProblemList-Xcomp.txt
@@ -38,8 +38,6 @@ vmTestbase/vm/mlvm/mixed/stress/regression/b6969574/INDIFY_Test.java 8265295 lin
 
 serviceability/AsyncGetCallTrace/MyPackage/ASGCTBaseTest.java 8303168 linux-x64
 
-serviceability/sa/TestJhsdbJstackMixed.java 8248675 linux-aarch64
-
 serviceability/sa/ClhsdbInspect.java 8283578 windows-x64
 
 vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_a/TestDescription.java 8308367 windows-x64

From b2e91060db82a13e993227f538c8d54b41a9796b Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 14 Sep 2023 18:52:51 +0000
Subject: [PATCH 025/112] 8313452: Improve Classfile API attributes handling
 safety

Reviewed-by: briangoetz
---
 .../internal/classfile/AttributeMapper.java   |  40 +++
 .../jdk/internal/classfile/Attributes.java    | 270 +++++++++++++++---
 .../jdk/internal/classfile/Classfile.java     |  21 +-
 .../classfile/impl/AbstractDirectBuilder.java |   4 +-
 .../classfile/impl/AnnotationReader.java      |  12 +-
 .../classfile/impl/BoundAttribute.java        |  53 ++--
 .../internal/classfile/impl/ClassImpl.java    |   2 +-
 .../classfile/impl/ClassfileImpl.java         |  10 +-
 .../jdk/internal/classfile/impl/Util.java     |  19 +-
 test/jdk/jdk/classfile/OptionsTest.java       | 133 +++++++++
 10 files changed, 457 insertions(+), 107 deletions(-)
 create mode 100644 test/jdk/jdk/classfile/OptionsTest.java

diff --git a/src/java.base/share/classes/jdk/internal/classfile/AttributeMapper.java b/src/java.base/share/classes/jdk/internal/classfile/AttributeMapper.java
index 8892b56ed60..2914a9d5110 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/AttributeMapper.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/AttributeMapper.java
@@ -37,6 +37,41 @@
  */
 public interface AttributeMapper<A> {
 
+    /**
+     * Attribute stability indicator
+     */
+    enum AttributeStability {
+
+        /**
+         * The attribute contains only pure data, such as timestamps, and can always be bulk-copied.
+         */
+        STATELESS,
+
+        /**
+         * The attribute contains only pure data and CP refs, so can be bulk-copied when CP sharing is in effect,
+         * and need to be exploded and rewritten when CP sharing is not in effect.
+         */
+        CP_REFS,
+
+        /**
+         * The attribute may contain labels, so need to be exploded and rewritten when the Code array is perturbed.
+         */
+        LABELS,
+
+        /**
+         * The attribute may contain indexes into structured not managed by the library (type variable lists, etc)
+         * and so we consult the {@link Classfile.AttributesProcessingOption} option to determine whether to preserve
+         * or drop it during transformation.
+         */
+        UNSTABLE,
+
+        /**
+         * The attribute is completely unknown and so we consult the {@link Classfile.AttributesProcessingOption} option
+         * to determine whether to preserve or drop it during transformation.
+         */
+        UNKNOWN
+    }
+
     /**
      * {@return the name of the attribute}
      */
@@ -75,4 +110,9 @@ default int validSince() {
     default boolean allowMultiple() {
         return false;
     }
+
+    /**
+     * {@return attribute stability indicator}
+     */
+    AttributeStability stability();
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/Attributes.java b/src/java.base/share/classes/jdk/internal/classfile/Attributes.java
index 699da664a9b..4e230a161ac 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/Attributes.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/Attributes.java
@@ -215,6 +215,11 @@ public AnnotationDefaultAttribute readAttribute(AttributedElement e, ClassReader
                 protected void writeBody(BufWriter buf, AnnotationDefaultAttribute attr) {
                     attr.defaultValue().writeTo(buf);
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code BootstrapMethods} attribute */
@@ -229,6 +234,11 @@ public BootstrapMethodsAttribute readAttribute(AttributedElement e, ClassReader
                 protected void writeBody(BufWriter buf, BootstrapMethodsAttribute attr) {
                     buf.writeList(attr.bootstrapMethods());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code CharacterRangeTable} attribute */
@@ -251,6 +261,11 @@ protected void writeBody(BufWriter buf, CharacterRangeTableAttribute attr) {
                         buf.writeU2(info.flags());
                     }
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.LABELS;
+                }
             };
 
     /** Attribute mapper for the {@code Code} attribute */
@@ -265,6 +280,11 @@ public CodeAttribute readAttribute(AttributedElement e, ClassReader cf, int p) {
                 protected void writeBody(BufWriter buf, CodeAttribute attr) {
                     throw new UnsupportedOperationException("Code attribute does not support direct write");
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
 
@@ -280,6 +300,11 @@ public CompilationIDAttribute readAttribute(AttributedElement e, ClassReader cf,
                 protected void writeBody(BufWriter buf, CompilationIDAttribute attr) {
                     buf.writeIndex(attr.compilationId());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code ConstantValue} attribute */
@@ -294,6 +319,11 @@ public ConstantValueAttribute readAttribute(AttributedElement e, ClassReader cf,
                 protected void writeBody(BufWriter buf, ConstantValueAttribute attr) {
                     buf.writeIndex(attr.constant());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code Deprecated} attribute */
@@ -308,6 +338,11 @@ public DeprecatedAttribute readAttribute(AttributedElement e, ClassReader cf, in
                 protected void writeBody(BufWriter buf, DeprecatedAttribute attr) {
                     // empty
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.STATELESS;
+                }
             };
 
     /** Attribute mapper for the {@code EnclosingMethod} attribute */
@@ -323,6 +358,11 @@ protected void writeBody(BufWriter buf, EnclosingMethodAttribute attr) {
                     buf.writeIndex(attr.enclosingClass());
                     buf.writeIndexOrZero(attr.enclosingMethod().orElse(null));
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code Exceptions} attribute */
@@ -337,6 +377,11 @@ public ExceptionsAttribute readAttribute(AttributedElement e, ClassReader cf, in
                 protected void writeBody(BufWriter buf, ExceptionsAttribute attr) {
                     buf.writeListIndices(attr.exceptions());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code InnerClasses} attribute */
@@ -358,6 +403,11 @@ protected void writeBody(BufWriter buf, InnerClassesAttribute attr) {
                         buf.writeU2(ic.flagsMask());
                     }
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code LineNumberTable} attribute */
@@ -377,6 +427,11 @@ protected void writeBody(BufWriter buf, LineNumberTableAttribute attr) {
                         buf.writeU2(line.lineNumber());
                     }
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.LABELS;
+                }
             };
 
     /** Attribute mapper for the {@code LocalVariableTable} attribute */
@@ -399,6 +454,11 @@ protected void writeBody(BufWriter buf, LocalVariableTableAttribute attr) {
                         buf.writeU2(info.slot());
                     }
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.LABELS;
+                }
             };
 
     /** Attribute mapper for the {@code LocalVariableTypeTable} attribute */
@@ -421,6 +481,11 @@ protected void writeBody(BufWriter buf, LocalVariableTypeTableAttribute attr) {
                         buf.writeU2(info.slot());
                     }
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.LABELS;
+                }
             };
 
     /** Attribute mapper for the {@code MethodParameters} attribute */
@@ -440,47 +505,57 @@ protected void writeBody(BufWriter buf, MethodParametersAttribute attr) {
                         buf.writeU2(info.flagsMask());
                     }
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code Module} attribute */
     public static final AttributeMapper<ModuleAttribute>
             MODULE = new AbstractAttributeMapper<>(NAME_MODULE, Classfile.JAVA_9_VERSION) {
-        @Override
-        public ModuleAttribute readAttribute(AttributedElement e, ClassReader cf, int p) {
-            return new BoundAttribute.BoundModuleAttribute(cf, this, p);
-        }
+                @Override
+                public ModuleAttribute readAttribute(AttributedElement e, ClassReader cf, int p) {
+                    return new BoundAttribute.BoundModuleAttribute(cf, this, p);
+                }
 
-        @Override
-        protected void writeBody(BufWriter buf, ModuleAttribute attr) {
-            buf.writeIndex(attr.moduleName());
-            buf.writeU2(attr.moduleFlagsMask());
-            buf.writeIndexOrZero(attr.moduleVersion().orElse(null));
-            buf.writeU2(attr.requires().size());
-            for (ModuleRequireInfo require : attr.requires()) {
-                buf.writeIndex(require.requires());
-                buf.writeU2(require.requiresFlagsMask());
-                buf.writeIndexOrZero(require.requiresVersion().orElse(null));
-            }
-            buf.writeU2(attr.exports().size());
-            for (ModuleExportInfo export : attr.exports()) {
-                buf.writeIndex(export.exportedPackage());
-                buf.writeU2(export.exportsFlagsMask());
-                buf.writeListIndices(export.exportsTo());
-            }
-            buf.writeU2(attr.opens().size());
-            for (ModuleOpenInfo open : attr.opens()) {
-                buf.writeIndex(open.openedPackage());
-                buf.writeU2(open.opensFlagsMask());
-                buf.writeListIndices(open.opensTo());
-            }
-            buf.writeListIndices(attr.uses());
-            buf.writeU2(attr.provides().size());
-            for (ModuleProvideInfo provide : attr.provides()) {
-                buf.writeIndex(provide.provides());
-                buf.writeListIndices(provide.providesWith());
-            }
-        }
-    };
+                @Override
+                protected void writeBody(BufWriter buf, ModuleAttribute attr) {
+                    buf.writeIndex(attr.moduleName());
+                    buf.writeU2(attr.moduleFlagsMask());
+                    buf.writeIndexOrZero(attr.moduleVersion().orElse(null));
+                    buf.writeU2(attr.requires().size());
+                    for (ModuleRequireInfo require : attr.requires()) {
+                        buf.writeIndex(require.requires());
+                        buf.writeU2(require.requiresFlagsMask());
+                        buf.writeIndexOrZero(require.requiresVersion().orElse(null));
+                    }
+                    buf.writeU2(attr.exports().size());
+                    for (ModuleExportInfo export : attr.exports()) {
+                        buf.writeIndex(export.exportedPackage());
+                        buf.writeU2(export.exportsFlagsMask());
+                        buf.writeListIndices(export.exportsTo());
+                    }
+                    buf.writeU2(attr.opens().size());
+                    for (ModuleOpenInfo open : attr.opens()) {
+                        buf.writeIndex(open.openedPackage());
+                        buf.writeU2(open.opensFlagsMask());
+                        buf.writeListIndices(open.opensTo());
+                    }
+                    buf.writeListIndices(attr.uses());
+                    buf.writeU2(attr.provides().size());
+                    for (ModuleProvideInfo provide : attr.provides()) {
+                        buf.writeIndex(provide.provides());
+                        buf.writeListIndices(provide.providesWith());
+                    }
+                }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
+            };
 
     /** Attribute mapper for the {@code ModuleHashes} attribute */
     public static final AttributeMapper<ModuleHashesAttribute>
@@ -501,6 +576,11 @@ protected void writeBody(BufWriter buf, ModuleHashesAttribute attr) {
                         buf.writeBytes(hash.hash());
                     }
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code ModuleMainClass} attribute */
@@ -515,6 +595,11 @@ public ModuleMainClassAttribute readAttribute(AttributedElement e, ClassReader c
                 protected void writeBody(BufWriter buf, ModuleMainClassAttribute attr) {
                     buf.writeIndex(attr.mainClass());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code ModulePackages} attribute */
@@ -529,6 +614,11 @@ public ModulePackagesAttribute readAttribute(AttributedElement e, ClassReader cf
                 protected void writeBody(BufWriter buf, ModulePackagesAttribute attr) {
                     buf.writeListIndices(attr.packages());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code ModuleResolution} attribute */
@@ -543,6 +633,11 @@ public ModuleResolutionAttribute readAttribute(AttributedElement e, ClassReader
                 protected void writeBody(BufWriter buf, ModuleResolutionAttribute attr) {
                     buf.writeU2(attr.resolutionFlags());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.STATELESS;
+                }
             };
 
     /** Attribute mapper for the {@code ModuleTarget} attribute */
@@ -557,6 +652,11 @@ public ModuleTargetAttribute readAttribute(AttributedElement e, ClassReader cf,
                 protected void writeBody(BufWriter buf, ModuleTargetAttribute attr) {
                     buf.writeIndex(attr.targetPlatform());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code NestHost} attribute */
@@ -571,6 +671,11 @@ public NestHostAttribute readAttribute(AttributedElement e, ClassReader cf, int
                 protected void writeBody(BufWriter buf, NestHostAttribute attr) {
                     buf.writeIndex(attr.nestHost());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code NestMembers} attribute */
@@ -585,6 +690,11 @@ public NestMembersAttribute readAttribute(AttributedElement e, ClassReader cf, i
                 protected void writeBody(BufWriter buf, NestMembersAttribute attr) {
                     buf.writeListIndices(attr.nestMembers());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code PermittedSubclasses} attribute */
@@ -599,6 +709,11 @@ public PermittedSubclassesAttribute readAttribute(AttributedElement e, ClassRead
                 protected void writeBody(BufWriter buf, PermittedSubclassesAttribute attr) {
                     buf.writeListIndices(attr.permittedSubclasses());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code Record} attribute */
@@ -619,6 +734,11 @@ protected void writeBody(BufWriter buf, RecordAttribute attr) {
                         buf.writeList(info.attributes());
                     }
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code RuntimeInvisibleAnnotations} attribute */
@@ -633,7 +753,12 @@ public RuntimeInvisibleAnnotationsAttribute readAttribute(AttributedElement encl
                 protected void writeBody(BufWriter buf, RuntimeInvisibleAnnotationsAttribute attr) {
                     buf.writeList(attr.annotations());
                 }
-    };
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
+            };
 
     /** Attribute mapper for the {@code RuntimeInvisibleParameterAnnotations} attribute */
     public static final AttributeMapper<RuntimeInvisibleParameterAnnotationsAttribute>
@@ -650,6 +775,11 @@ protected void writeBody(BufWriter buf, RuntimeInvisibleParameterAnnotationsAttr
                     for (List<Annotation> list : lists)
                         buf.writeList(list);
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code RuntimeInvisibleTypeAnnotations} attribute */
@@ -664,21 +794,31 @@ public RuntimeInvisibleTypeAnnotationsAttribute readAttribute(AttributedElement
                 protected void writeBody(BufWriter buf, RuntimeInvisibleTypeAnnotationsAttribute attr) {
                     buf.writeList(attr.annotations());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.UNSTABLE;
+                }
             };
 
     /** Attribute mapper for the {@code RuntimeVisibleAnnotations} attribute */
     public static final AttributeMapper<RuntimeVisibleAnnotationsAttribute>
             RUNTIME_VISIBLE_ANNOTATIONS = new AbstractAttributeMapper<>(NAME_RUNTIME_VISIBLE_ANNOTATIONS, Classfile.JAVA_5_VERSION) {
-        @Override
-        public RuntimeVisibleAnnotationsAttribute readAttribute(AttributedElement enclosing, ClassReader cf, int pos) {
-            return new BoundAttribute.BoundRuntimeVisibleAnnotationsAttribute(cf, pos);
-        }
+                @Override
+                public RuntimeVisibleAnnotationsAttribute readAttribute(AttributedElement enclosing, ClassReader cf, int pos) {
+                    return new BoundAttribute.BoundRuntimeVisibleAnnotationsAttribute(cf, pos);
+                }
 
-        @Override
-        protected void writeBody(BufWriter buf, RuntimeVisibleAnnotationsAttribute attr) {
-            buf.writeList(attr.annotations());
-        }
-    };
+                @Override
+                protected void writeBody(BufWriter buf, RuntimeVisibleAnnotationsAttribute attr) {
+                    buf.writeList(attr.annotations());
+                }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
+            };
 
     /** Attribute mapper for the {@code RuntimeVisibleParameterAnnotations} attribute */
     public static final AttributeMapper<RuntimeVisibleParameterAnnotationsAttribute>
@@ -695,6 +835,11 @@ protected void writeBody(BufWriter buf, RuntimeVisibleParameterAnnotationsAttrib
                     for (List<Annotation> list : lists)
                         buf.writeList(list);
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code RuntimeVisibleTypeAnnotations} attribute */
@@ -709,6 +854,11 @@ public RuntimeVisibleTypeAnnotationsAttribute readAttribute(AttributedElement e,
                 protected void writeBody(BufWriter buf, RuntimeVisibleTypeAnnotationsAttribute attr) {
                     buf.writeList(attr.annotations());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.UNSTABLE;
+                }
             };
 
     /** Attribute mapper for the {@code Signature} attribute */
@@ -723,6 +873,11 @@ public SignatureAttribute readAttribute(AttributedElement e, ClassReader cf, int
                 protected void writeBody(BufWriter buf, SignatureAttribute attr) {
                     buf.writeIndex(attr.signature());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code SourceDebugExtension} attribute */
@@ -737,6 +892,11 @@ public SourceDebugExtensionAttribute readAttribute(AttributedElement e, ClassRea
                 protected void writeBody(BufWriter buf, SourceDebugExtensionAttribute attr) {
                     buf.writeBytes(attr.contents());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.STATELESS;
+                }
             };
 
     /** Attribute mapper for the {@code SourceFile} attribute */
@@ -751,6 +911,11 @@ public SourceFileAttribute readAttribute(AttributedElement e, ClassReader cf, in
                 protected void writeBody(BufWriter buf, SourceFileAttribute attr) {
                     buf.writeIndex(attr.sourceFile());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code SourceID} attribute */
@@ -765,6 +930,11 @@ public SourceIDAttribute readAttribute(AttributedElement e, ClassReader cf, int
                 protected void writeBody(BufWriter buf, SourceIDAttribute attr) {
                     buf.writeIndex(attr.sourceId());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.CP_REFS;
+                }
             };
 
     /** Attribute mapper for the {@code StackMapTable} attribute */
@@ -779,6 +949,11 @@ public StackMapTableAttribute readAttribute(AttributedElement e, ClassReader cf,
                 protected void writeBody(BufWriter b, StackMapTableAttribute attr) {
                     StackMapDecoder.writeFrames(b, attr.entries());
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.LABELS;
+                }
             };
 
 
@@ -794,6 +969,11 @@ public SyntheticAttribute readAttribute(AttributedElement e, ClassReader cf, int
                 protected void writeBody(BufWriter buf, SyntheticAttribute attr) {
                     // empty
                 }
+
+                @Override
+                public AttributeMapper.AttributeStability stability() {
+                    return AttributeStability.STATELESS;
+                }
             };
 
     /**
diff --git a/src/java.base/share/classes/jdk/internal/classfile/Classfile.java b/src/java.base/share/classes/jdk/internal/classfile/Classfile.java
index f8913f99b51..7ee9a8299ca 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/Classfile.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/Classfile.java
@@ -241,17 +241,22 @@ enum StackMapsOption implements Option {
     }
 
     /**
-     * Option describing whether to process or discard unrecognized attributes.
-     * Default is {@code PASS_UNKNOWN_ATTRIBUTES} to process unrecognized
-     * attributes, and deliver as instances of {@link UnknownAttribute}.
+     * Option describing whether to process or discard unrecognized or problematic
+     * original attributes when a class, record component, field, method or code is
+     * transformed in its exploded form.
+     * Default is {@code PASS_ALL_ATTRIBUTES} to process all original attributes.
+     * @see AttributeMapper.AttributeStability
      */
-    enum UnknownAttributesOption implements Option {
+    enum AttributesProcessingOption implements Option {
 
-        /** Process unknown attributes */
-        PASS_UNKNOWN_ATTRIBUTES,
+        /** Process all original attributes during transformation */
+        PASS_ALL_ATTRIBUTES,
 
-        /** Drop unknown attributes */
-        DROP_UNKNOWN_ATTRIBUTES
+        /** Drop unknown attributes during transformation */
+        DROP_UNKNOWN_ATTRIBUTES,
+
+        /** Drop unknown and unstable original attributes during transformation */
+        DROP_UNSTABLE_ATRIBUTES;
     }
 
     /**
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractDirectBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractDirectBuilder.java
index ed9268f5372..4707b4bc46a 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractDirectBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractDirectBuilder.java
@@ -52,6 +52,8 @@ public void setOriginal(M original) {
     }
 
     public void writeAttribute(Attribute<?> a) {
-        attributes.withAttribute(a);
+        if (Util.isAttributeAllowed(a, context.attributesProcessingOption())) {
+            attributes.withAttribute(a);
+        }
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java
index ca4e0b1228b..ae80c1ced00 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java
@@ -51,7 +51,7 @@ public static List<Annotation> readAnnotations(ClassReader classReader, int p) {
             annos[i] = readAnnotation(classReader, pos);
             pos = skipAnnotation(classReader, pos);
         }
-        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArrayNullsAllowed(annos);
+        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(annos);
     }
 
     public static AnnotationValue readElementValue(ClassReader classReader, int p) {
@@ -78,7 +78,7 @@ public static AnnotationValue readElementValue(ClassReader classReader, int p) {
                     values[i] = readElementValue(classReader, p);
                     p = skipElementValue(classReader, p);
                 }
-                yield new AnnotationImpl.OfArrayImpl(SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArrayNullsAllowed(values));
+                yield new AnnotationImpl.OfArrayImpl(SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(values));
             }
             default -> throw new IllegalArgumentException(
                     "Unexpected tag '%s' in AnnotationValue, pos = %d".formatted(tag, p - 1));
@@ -93,7 +93,7 @@ public static List<TypeAnnotation> readTypeAnnotations(ClassReader classReader,
             annotations[i] = readTypeAnnotation(classReader, p, lc);
             p = skipTypeAnnotation(classReader, p);
         }
-        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArrayNullsAllowed(annotations);
+        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(annotations);
     }
 
     public static List<List<Annotation>> readParameterAnnotations(ClassReader classReader, int p) {
@@ -103,7 +103,7 @@ public static List<List<Annotation>> readParameterAnnotations(ClassReader classR
             pas[i] = readAnnotations(classReader, p);
             p = skipAnnotations(classReader, p);
         }
-        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArrayNullsAllowed(pas);
+        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(pas);
     }
 
     private static int skipElementValue(ClassReader classReader, int p) {
@@ -156,7 +156,7 @@ private static List<AnnotationElement> readAnnotationElementValuePairs(ClassRead
             annotationElements[i] = new AnnotationImpl.AnnotationElementImpl(elementName, value);
             p = skipElementValue(classReader, p);
         }
-        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArrayNullsAllowed(annotationElements);
+        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(annotationElements);
     }
 
     private static int skipElementValuePairs(ClassReader classReader, int p) {
@@ -257,7 +257,7 @@ private static List<TypeAnnotation.LocalVarTargetInfo> readLocalVarEntries(Class
                     classReader.readU2(p + 4));
             p += 6;
         }
-        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArrayNullsAllowed(entries);
+        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(entries);
     }
 
     private static int skipTypeAnnotation(ClassReader classReader, int p) {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
index 9b8c579e9e2..1a518b10f4d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
@@ -26,6 +26,7 @@
 package jdk.internal.classfile.impl;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -121,15 +122,16 @@ <E> List<E> readEntryList(int p) {
         for (int i = 0; p < end; i++, p += 2) {
             entries[i] = classReader.readEntry(p);
         }
-        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArrayNullsAllowed(entries);
+        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(entries);
     }
 
     public static List<Attribute<?>> readAttributes(AttributedElement enclosing, ClassReader reader, int pos,
                                                                   Function<Utf8Entry, AttributeMapper<?>> customAttributes) {
         int size = reader.readU2(pos);
-        var filled = new Object[size];
+        var filled = new ArrayList<Attribute<?>>(size);
         int p = pos + 2;
         int cfLen = reader.classfileLength();
+        var apo = ((ClassReaderImpl)reader).context().attributesProcessingOption();
         for (int i = 0; i < size; ++i) {
             Utf8Entry name = reader.readUtf8Entry(p);
             int len = reader.readInt(p + 2);
@@ -143,8 +145,8 @@ public static List<Attribute<?>> readAttributes(AttributedElement enclosing, Cla
                 mapper = customAttributes.apply(name);
             }
             if (mapper != null) {
-                filled[i] = mapper.readAttribute(enclosing, reader, p);
-            } else if (((ClassReaderImpl)reader).context().unknownAttributesOption() == Classfile.UnknownAttributesOption.PASS_UNKNOWN_ATTRIBUTES) {
+                filled.add((Attribute)mapper.readAttribute(enclosing, reader, p));
+            } else {
                 AttributeMapper<UnknownAttribute> fakeMapper = new AttributeMapper<>() {
                     @Override
                     public String name() {
@@ -159,19 +161,27 @@ public UnknownAttribute readAttribute(AttributedElement enclosing, ClassReader c
 
                     @Override
                     public void writeAttribute(BufWriter buf, UnknownAttribute attr) {
-                        throw new UnsupportedOperationException("Write of unknown attribute " + name() + " not supported");
+                        buf.writeIndex(name);
+                        var cont = attr.contents();
+                        buf.writeInt(cont.length);
+                        buf.writeBytes(cont);
                     }
 
                     @Override
                     public boolean allowMultiple() {
                         return true;
                     }
+
+                    @Override
+                    public AttributeMapper.AttributeStability stability() {
+                        return AttributeStability.UNKNOWN;
+                    }
                 };
-                filled[i] = new BoundUnknownAttribute(reader, fakeMapper, p);
+                filled.add(new BoundUnknownAttribute(reader, fakeMapper, p));
             }
             p += len;
         }
-        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArrayNullsAllowed(filled);
+        return Collections.unmodifiableList(filled);
     }
 
     public static final class BoundUnknownAttribute extends BoundAttribute<UnknownAttribute>
@@ -179,35 +189,6 @@ public static final class BoundUnknownAttribute extends BoundAttribute<UnknownAt
         public BoundUnknownAttribute(ClassReader cf, AttributeMapper<UnknownAttribute> mapper, int pos) {
             super(cf, mapper, pos);
         }
-
-        @Override
-        public void writeTo(DirectClassBuilder builder) {
-            checkWriteSupported(builder::canWriteDirect);
-            super.writeTo(builder);
-        }
-
-        @Override
-        public void writeTo(DirectMethodBuilder builder) {
-            checkWriteSupported(builder::canWriteDirect);
-            super.writeTo(builder);
-        }
-
-        @Override
-        public void writeTo(DirectFieldBuilder builder) {
-            checkWriteSupported(builder::canWriteDirect);
-            super.writeTo(builder);
-        }
-
-        @Override
-        public void writeTo(BufWriter buf) {
-            checkWriteSupported(buf::canWriteDirect);
-            super.writeTo(buf);
-        }
-
-        private void checkWriteSupported(Function<ConstantPool, Boolean> condition) {
-            if (!condition.apply(classReader))
-                throw new UnsupportedOperationException("Write of unknown attribute " + attributeName() + " not supported to alien constant pool");
-        }
     }
 
     public static final class BoundStackMapTableAttribute
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java
index 455ad35b526..97ecda3f381 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java
@@ -138,7 +138,7 @@ public List<ClassEntry> interfaces() {
                 arr[i] = reader.readClassEntry(pos);
                 pos += 2;
             }
-            this.interfaces = SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArrayNullsAllowed(arr);
+            this.interfaces = SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(arr);
         }
         return interfaces;
     }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassfileImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassfileImpl.java
index 6610de76659..a3c6e6b1b65 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassfileImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassfileImpl.java
@@ -43,7 +43,7 @@
 public record ClassfileImpl(StackMapsOption stackMapsOption,
                             DebugElementsOption debugElementsOption,
                             LineNumbersOption lineNumbersOption,
-                            UnknownAttributesOption unknownAttributesOption,
+                            AttributesProcessingOption attributesProcessingOption,
                             ConstantPoolSharingOption constantPoolSharingOption,
                             ShortJumpsOption shortJumpsOption,
                             DeadCodeOption deadCodeOption,
@@ -55,7 +55,7 @@ public record ClassfileImpl(StackMapsOption stackMapsOption,
             StackMapsOption.STACK_MAPS_WHEN_REQUIRED,
             DebugElementsOption.PASS_DEBUG,
             LineNumbersOption.PASS_LINE_NUMBERS,
-            UnknownAttributesOption.PASS_UNKNOWN_ATTRIBUTES,
+            AttributesProcessingOption.PASS_ALL_ATTRIBUTES,
             ConstantPoolSharingOption.SHARED_POOL,
             ShortJumpsOption.FIX_SHORT_JUMPS,
             DeadCodeOption.PATCH_DEAD_CODE,
@@ -74,7 +74,7 @@ public ClassfileImpl withOptions(Option... options) {
         var smo = stackMapsOption;
         var deo = debugElementsOption;
         var lno = lineNumbersOption;
-        var uao = unknownAttributesOption;
+        var apo = attributesProcessingOption;
         var cpso = constantPoolSharingOption;
         var sjo = shortJumpsOption;
         var dco = deadCodeOption;
@@ -86,7 +86,7 @@ public ClassfileImpl withOptions(Option... options) {
                 case StackMapsOption oo -> smo = oo;
                 case DebugElementsOption oo -> deo = oo;
                 case LineNumbersOption oo -> lno = oo;
-                case UnknownAttributesOption oo -> uao = oo;
+                case AttributesProcessingOption oo -> apo = oo;
                 case ConstantPoolSharingOption oo -> cpso = oo;
                 case ShortJumpsOption oo -> sjo = oo;
                 case DeadCodeOption oo -> dco = oo;
@@ -95,7 +95,7 @@ public ClassfileImpl withOptions(Option... options) {
                 case AttributeMapperOption oo -> amo = oo;
             }
         }
-        return new ClassfileImpl(smo, deo, lno, uao, cpso, sjo, dco, dlo, chro, amo);
+        return new ClassfileImpl(smo, deo, lno, apo, cpso, sjo, dco, dlo, chro, amo);
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java b/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
index b757749b498..cd7a00b547e 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
@@ -27,9 +27,7 @@
 import java.lang.constant.ClassDesc;
 import java.lang.constant.MethodTypeDesc;
 import java.util.AbstractList;
-import java.util.BitSet;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
 
@@ -38,11 +36,13 @@
 import jdk.internal.classfile.constantpool.ModuleEntry;
 import jdk.internal.classfile.constantpool.NameAndTypeEntry;
 import java.lang.constant.ModuleDesc;
-import jdk.internal.classfile.impl.TemporaryConstantPool;
 import java.lang.reflect.AccessFlag;
 
 import static jdk.internal.classfile.Classfile.ACC_STATIC;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.classfile.Attribute;
+import jdk.internal.classfile.AttributeMapper;
+import jdk.internal.classfile.Classfile;
 
 /**
  * Helper to create and manipulate type descriptors, where type descriptors are
@@ -54,6 +54,15 @@ public class Util {
     private Util() {
     }
 
+    private static final int ATTRIBUTE_STABILITY_COUNT = AttributeMapper.AttributeStability.values().length;
+
+    public static boolean isAttributeAllowed(final Attribute<?> attr,
+                                             final Classfile.AttributesProcessingOption processingOption) {
+        return attr instanceof BoundAttribute
+                ? ATTRIBUTE_STABILITY_COUNT - attr.attributeMapper().stability().ordinal() > processingOption.ordinal()
+                : true;
+    }
+
     public static int parameterSlots(MethodTypeDesc mDesc) {
         int count = 0;
         for (int i = 0; i < mDesc.parameterCount(); i++) {
@@ -121,7 +130,7 @@ public static List<ClassEntry> entryList(List<? extends ClassDesc> list) {
         for (int i = 0; i < result.length; i++) {
             result[i] = TemporaryConstantPool.INSTANCE.classEntry(list.get(i));
         }
-        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArrayNullsAllowed(result);
+        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(result);
     }
 
     public static List<ModuleEntry> moduleEntryList(List<? extends ModuleDesc> list) {
@@ -129,7 +138,7 @@ public static List<ModuleEntry> moduleEntryList(List<? extends ModuleDesc> list)
         for (int i = 0; i < result.length; i++) {
             result[i] = TemporaryConstantPool.INSTANCE.moduleEntry(TemporaryConstantPool.INSTANCE.utf8Entry(list.get(i).name()));
         }
-        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArrayNullsAllowed(result);
+        return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(result);
     }
 
     public static void checkKind(Opcode op, Opcode.Kind k) {
diff --git a/test/jdk/jdk/classfile/OptionsTest.java b/test/jdk/jdk/classfile/OptionsTest.java
new file mode 100644
index 00000000000..12d3ccf7570
--- /dev/null
+++ b/test/jdk/jdk/classfile/OptionsTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Testing Classfile options on small Corpus.
+ * @run junit/othervm -Djunit.jupiter.execution.parallel.enabled=true OptionsTest
+ */
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+import static org.junit.jupiter.api.Assertions.*;
+
+
+import java.io.IOException;
+import java.lang.constant.ClassDesc;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import jdk.internal.classfile.AttributeMapper;
+import jdk.internal.classfile.AttributedElement;
+import jdk.internal.classfile.BufWriter;
+import jdk.internal.classfile.ClassReader;
+import jdk.internal.classfile.ClassTransform;
+import jdk.internal.classfile.Classfile;
+import jdk.internal.classfile.ClassfileElement;
+import jdk.internal.classfile.CodeTransform;
+import jdk.internal.classfile.CompoundElement;
+import jdk.internal.classfile.CustomAttribute;
+
+/**
+ * OptionsTest
+ */
+@Execution(ExecutionMode.CONCURRENT)
+class OptionsTest {
+
+    protected static final FileSystem JRT = FileSystems.getFileSystem(URI.create("jrt:/"));
+
+    static Path[] corpus() throws IOException, URISyntaxException {
+        return Files.walk(JRT.getPath("modules/java.base/java/util"))
+                .filter(p -> Files.isRegularFile(p) && p.toString().endsWith(".class"))
+                .toArray(Path[]::new);
+    }
+
+    @ParameterizedTest
+    @MethodSource("corpus")
+    void testAttributesProcessingOptionOnTransform(Path path) throws Exception {
+        testNoUnstable(path, Classfile.of().parse(
+                Classfile.of(Classfile.AttributesProcessingOption.DROP_UNSTABLE_ATRIBUTES).transform(
+                            Classfile.of().parse(path),
+                            ClassTransform.transformingMethodBodies(CodeTransform.ACCEPT_ALL))));
+    }
+
+    static class StrangeAttribute extends CustomAttribute<StrangeAttribute> {
+        public StrangeAttribute() {
+            super(STRANGE_ATTRIBUTE_MAPPER);
+        }
+    }
+
+    static final AttributeMapper<StrangeAttribute> STRANGE_ATTRIBUTE_MAPPER = new AttributeMapper<>() {
+
+        @Override
+        public String name() {
+            return "StrangeAttribute";
+        }
+
+        @Override
+        public StrangeAttribute readAttribute(AttributedElement enclosing, ClassReader cf, int pos) {
+            return new StrangeAttribute();
+        }
+
+        @Override
+        public void writeAttribute(BufWriter buf, StrangeAttribute attr) {
+            buf.writeIndex(buf.constantPool().utf8Entry(name()));
+            buf.writeInt(0);
+        }
+
+        @Override
+        public AttributeMapper.AttributeStability stability() {
+            return AttributeMapper.AttributeStability.STATELESS;
+        }
+    };
+
+    @Test
+    void testUnknownAttribute() throws Exception {
+        var classBytes = Classfile.of(Classfile.AttributeMapperOption.of(e -> {
+            return e.equalsString(STRANGE_ATTRIBUTE_MAPPER.name()) ? STRANGE_ATTRIBUTE_MAPPER : null;
+        })).build(ClassDesc.of("StrangeClass"), clb -> clb.with(new StrangeAttribute()));
+
+        //test default
+        assertFalse(Classfile.of().parse(classBytes).attributes().isEmpty());
+
+        //test drop unknown at transform
+        assertTrue(Classfile.of().parse(
+                Classfile.of(Classfile.AttributesProcessingOption.DROP_UNKNOWN_ATTRIBUTES).transform(
+                        Classfile.of().parse(classBytes),
+                        ClassTransform.ACCEPT_ALL)).attributes().isEmpty());
+    }
+
+    void testNoUnstable(Path path, ClassfileElement e) {
+        if (e instanceof AttributedElement ae) ae.attributes().forEach(a ->
+                assertTrue(AttributeMapper.AttributeStability.UNSTABLE.ordinal() >= a.attributeMapper().stability().ordinal(),
+                           () -> "class " + path + " contains unexpected " + a));
+        if (e instanceof CompoundElement ce) ce.forEachElement(ee -> testNoUnstable(path, (ClassfileElement)ee));
+    }
+}

From 4415261688dc258b6d254668bcf8818c61cc65ea Mon Sep 17 00:00:00 2001
From: Soumadipta Roy <roysouma@amazon.com>
Date: Thu, 14 Sep 2023 19:22:31 +0000
Subject: [PATCH 026/112] 8315683: Parallelize
 java/util/concurrent/tck/JSR166TestCase.java

Reviewed-by: martin, shade
---
 .../util/concurrent/tck/JSR166TestCase.java   | 37 +++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
index a5d491f6ce0..1f5a6e09683 100644
--- a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
+++ b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
@@ -35,31 +35,54 @@
  */
 
 /*
- * @test
- * @summary JSR-166 tck tests, in a number of variations.
- *          The first is the conformance testing variant,
- *          while others also test implementation details.
+ * @test id=default
+ * @summary Conformance testing variant of JSR-166 tck tests.
  * @build *
  * @modules java.management
  * @run junit/othervm/timeout=1000 JSR166TestCase
+ */
+
+/*
+ * @test id=security-manager
+ * @summary Conformance testing variant of JSR-166 tck tests
+ *          with java security manager set to allow.
+ * @build *
+ * @modules java.management
  * @run junit/othervm/timeout=1000 -Djava.security.manager=allow JSR166TestCase
+ */
+
+/*
+ * @test id=forkjoinpool-common-parallelism
+ * @summary Test implementation details variant of JSR-166
+ *          tck tests with ForkJoinPool common parallelism.
+ * @build *
+ * @modules java.management
  * @run junit/othervm/timeout=1000
  *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
  *      --add-opens java.base/java.lang=ALL-UNNAMED
  *      -Djsr166.testImplementationDetails=true
+ *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
  *      JSR166TestCase
  * @run junit/othervm/timeout=1000
  *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
  *      --add-opens java.base/java.lang=ALL-UNNAMED
  *      -Djsr166.testImplementationDetails=true
- *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
+ *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
+ *      -Djava.util.secureRandomSeed=true
  *      JSR166TestCase
+ */
+
+/*
+ * @test id=others
+ * @summary Remaining test implementation details variant of
+ *          JSR-166 tck tests apart from ForkJoinPool common
+ *          parallelism.
+ * @build *
+ * @modules java.management
  * @run junit/othervm/timeout=1000
  *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
  *      --add-opens java.base/java.lang=ALL-UNNAMED
  *      -Djsr166.testImplementationDetails=true
- *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
- *      -Djava.util.secureRandomSeed=true
  *      JSR166TestCase
  * @run junit/othervm/timeout=1000/policy=tck.policy
  *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED

From d475f61fd52b7d379260811b32d3815786858411 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Thu, 14 Sep 2023 22:03:03 +0000
Subject: [PATCH 027/112] 8315731: Open source several Swing Text related tests

Reviewed-by: psadhukhan, tr
---
 .../swing/text/CompositeView/bug4398059.java  | 114 +++++++++++++++
 .../swing/text/DefaultCaret/bug4197894.java   | 106 ++++++++++++++
 .../swing/text/DefaultCaret/bug4203175.java   | 134 ++++++++++++++++++
 .../text/DefaultEditorKit/bug4265242.java     |  52 +++++++
 .../DefaultStyledDocument/bug4472852.java     |  62 ++++++++
 5 files changed, 468 insertions(+)
 create mode 100644 test/jdk/javax/swing/text/CompositeView/bug4398059.java
 create mode 100644 test/jdk/javax/swing/text/DefaultCaret/bug4197894.java
 create mode 100644 test/jdk/javax/swing/text/DefaultCaret/bug4203175.java
 create mode 100644 test/jdk/javax/swing/text/DefaultEditorKit/bug4265242.java
 create mode 100644 test/jdk/javax/swing/text/DefaultStyledDocument/bug4472852.java

diff --git a/test/jdk/javax/swing/text/CompositeView/bug4398059.java b/test/jdk/javax/swing/text/CompositeView/bug4398059.java
new file mode 100644
index 00000000000..3ce567538be
--- /dev/null
+++ b/test/jdk/javax/swing/text/CompositeView/bug4398059.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Robot;
+import java.awt.Shape;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
+import javax.swing.text.Position;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.View;
+import javax.swing.text.ViewFactory;
+import javax.swing.text.html.HTML;
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.ParagraphView;
+
+/*
+ * @test
+ * @bug 4398059
+ * @key headful
+ * @summary Tests that CompositeView doesn't throw NPE.
+ */
+
+public class bug4398059 {
+    private static JFrame jFrame;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            SwingUtilities.invokeAndWait(bug4398059::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(1000);
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (jFrame != null) {
+                    jFrame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createAndShowUI() {
+        String text = "<H1>text";
+        jFrame = new JFrame("CompositeView Test");
+        JEditorPane jep = new JEditorPane();
+        jep.setEditorKit(new MyHTMLEditorKit());
+        jep.setText(text);
+
+        Document doc = jep.getDocument();
+        jep.setCaretPosition(doc.getLength() - 1);
+
+        jFrame.getContentPane().add(jep);
+        jFrame.setSize(200,200);
+        jFrame.setVisible(true);
+    }
+
+    static class MyHTMLEditorKit extends HTMLEditorKit {
+        private static final ViewFactory defaultFactory = new MyHTMLFactory();
+
+        public ViewFactory getViewFactory() {
+            return defaultFactory;
+        }
+
+        static class MyHTMLFactory extends HTMLEditorKit.HTMLFactory {
+            public View create(Element elem) {
+                Object obj = elem.getAttributes().getAttribute(StyleConstants.NameAttribute);
+                if (obj instanceof HTML.Tag kind) {
+                    if (kind == HTML.Tag.H1) {
+                        return new MyParagraphView(elem);
+                    }
+                }
+                return super.create(elem);
+            }
+        }
+
+        static class MyParagraphView extends ParagraphView {
+            public MyParagraphView(Element elem) {
+                super(elem);
+            }
+
+            public Shape getChildAllocation(int index, Shape a) {
+                return null;
+            }
+
+            public Shape modelToView(int pos, Shape a, Position.Bias b)
+                                      throws BadLocationException {
+                return super.modelToView(pos, a, b);
+            }
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/text/DefaultCaret/bug4197894.java b/test/jdk/javax/swing/text/DefaultCaret/bug4197894.java
new file mode 100644
index 00000000000..11bb163860b
--- /dev/null
+++ b/test/jdk/javax/swing/text/DefaultCaret/bug4197894.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import javax.swing.JFrame;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4197894
+ * @key headful
+ * @summary Tests if shift-click adjusts selection in text areas.
+ */
+
+public class bug4197894 {
+    private static JFrame jFrame;
+    private static JTextArea ta;
+
+    private static volatile Point point = null;
+    private static volatile Rectangle bounds;
+
+    private static volatile boolean passed = true;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoDelay(50);
+            robot.setAutoWaitForIdle(true);
+
+            SwingUtilities.invokeAndWait(bug4197894::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                point = ta.getLocationOnScreen();
+                bounds = ta.getBounds();
+            });
+            robot.waitForIdle();
+            robot.delay(300);
+
+            robot.mouseMove((point.x + bounds.width / 4),
+                    (point.y + bounds.height / 4));
+
+            robot.keyPress(KeyEvent.VK_SHIFT);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.keyRelease(KeyEvent.VK_SHIFT);
+            robot.delay(300);
+
+            if (!passed) {
+                throw new RuntimeException("Test failed." +
+                        " Shift-Click Text Selection does not work!");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (jFrame != null) {
+                    jFrame.dispose();
+                }
+            });
+        }
+    }
+
+    private static void createAndShowUI() {
+        jFrame = new JFrame("Shift-Click Text Selection");
+        ta = new JTextArea();
+        ta.addKeyListener(new KeyAdapter() {
+            public void keyReleased(KeyEvent e) {
+                String selText = ta.getSelectedText();
+                passed = !(selText == null || (selText.length() == 0));
+            }
+        });
+        ta.setText("12345\n12345\n12345\n12345\n12345\n12345\n12345");
+        ta.setCaretPosition(ta.getDocument().getLength());
+        jFrame.getContentPane().add(ta);
+        jFrame.pack();
+        jFrame.setLocationRelativeTo(null);
+        jFrame.setAlwaysOnTop(true);
+        jFrame.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/swing/text/DefaultCaret/bug4203175.java b/test/jdk/javax/swing/text/DefaultCaret/bug4203175.java
new file mode 100644
index 00000000000..8a15644bf91
--- /dev/null
+++ b/test/jdk/javax/swing/text/DefaultCaret/bug4203175.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Container;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4203175
+ * @key headful
+ * @summary Tests that double-click on disabled JTextField doesn't
+ *          cause other text-field to select content.
+ */
+
+public class bug4203175 {
+    private static JFrame jFrame;
+    private static JTextField tf1, tf2;
+    private static JButton b;
+    private static volatile Point point;
+    private static volatile boolean passed = true;
+    private static int clicks = 0;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoDelay(50);
+            robot.setAutoWaitForIdle(true);
+
+            SwingUtilities.invokeAndWait(bug4203175::createAndShowUI);
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> point = tf1.getLocationOnScreen());
+            robot.mouseMove(point.x, point.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.delay(200);
+
+            SwingUtilities.invokeAndWait(() -> point = b.getLocationOnScreen());
+            robot.mouseMove(point.x, point.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.delay(200);
+
+            SwingUtilities.invokeAndWait(() -> point = tf2.getLocationOnScreen());
+            robot.mouseMove(point.x, point.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.delay(200);
+
+            if (!passed) {
+                throw new RuntimeException("Test failed!! Text selection on disabled" +
+                                           " TextField does not work as expected!");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (jFrame != null) {
+                    jFrame.dispose();
+                }
+            });
+        }
+    }
+
+    private static void createAndShowUI() {
+        jFrame = new JFrame("JTextField Text Selection");
+        Container cont = jFrame.getContentPane();
+        cont.setLayout(new BoxLayout(cont, BoxLayout.Y_AXIS));
+
+        tf1 = new JTextField(20);
+        tf1.setText("sometext");
+        tf1.setName("Field 1");
+        tf1.setCaretPosition(tf1.getDocument().getLength());
+        cont.add(tf1);
+
+        tf2 = new JTextField(20);
+        tf2.setName("Field 2");
+        tf2.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                super.mouseClicked(e);
+                clicks++;
+                if (clicks == 2) {
+                    String selText = tf1.getSelectedText();
+                    passed = (selText == null || (selText.length() == 0));
+                }
+            }
+        });
+        cont.add(tf2);
+
+        b = new JButton("Toggle Enabled");
+        cont.add(b);
+        b.addActionListener(e -> {
+            if (e.getSource() == b) {
+                boolean b = tf1.isEnabled();
+                tf1.setEnabled(!b);
+                tf2.setEnabled(!b);
+            }
+        });
+
+        jFrame.pack();
+        jFrame.setLocationRelativeTo(null);
+        jFrame.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/swing/text/DefaultEditorKit/bug4265242.java b/test/jdk/javax/swing/text/DefaultEditorKit/bug4265242.java
new file mode 100644
index 00000000000..d797b587858
--- /dev/null
+++ b/test/jdk/javax/swing/text/DefaultEditorKit/bug4265242.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.event.ActionEvent;
+import javax.swing.Action;
+import javax.swing.JTextPane;
+import javax.swing.text.DefaultEditorKit;
+
+/*
+ * @test
+ * @bug 4265242
+ * @summary Tests endParagraphAction in JTextPane
+ */
+
+public class bug4265242 {
+    public static void main(String[] args) {
+        JTextPane jTextPane = new JTextPane();
+        jTextPane.setText("Merry sparrow");
+
+        Action[] actions = jTextPane.getActions();
+        Action endPara = null;
+        for (Action action : actions) {
+            String name = (String) action.getValue(Action.NAME);
+            if (name.equals(DefaultEditorKit.endParagraphAction)) {
+                endPara = action;
+            }
+        }
+        endPara.actionPerformed(new ActionEvent(jTextPane,
+                ActionEvent.ACTION_PERFORMED,
+                DefaultEditorKit.endParagraphAction));
+    }
+}
diff --git a/test/jdk/javax/swing/text/DefaultStyledDocument/bug4472852.java b/test/jdk/javax/swing/text/DefaultStyledDocument/bug4472852.java
new file mode 100644
index 00000000000..cb9b4e654b3
--- /dev/null
+++ b/test/jdk/javax/swing/text/DefaultStyledDocument/bug4472852.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Color;
+import javax.swing.text.DefaultStyledDocument;
+import javax.swing.text.Element;
+import javax.swing.text.MutableAttributeSet;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.StyledDocument;
+
+/*
+ * @test
+ * @bug 4472852
+ * @summary Tests DefaultStyledDocument.split(int, int)
+ */
+
+public class bug4472852 {
+
+    public static void main(String[] args) throws Exception {
+        // create a Document and insert some text there
+        StyledDocument doc = new DefaultStyledDocument();
+        doc.insertString(0, "this", null);
+
+        // add style to the last word
+        Element root = doc.getDefaultRootElement();
+        int end = root.getEndOffset();
+        MutableAttributeSet as = new SimpleAttributeSet();
+        StyleConstants.setBackground(as, Color.BLUE);
+        doc.setCharacterAttributes(end-5, 5, as, true);
+
+        // inspect Elements of the only Paragraph --
+        // there should be no empty Elements
+        Element para = root.getElement(0);
+        for (int i = 0; i < para.getElementCount(); i++) {
+            Element el = para.getElement(i);
+            if (el.getStartOffset() == el.getEndOffset()) {
+                throw new RuntimeException("Failed: empty Element found");
+            }
+        }
+    }
+}

From b55e418a077791b39992042411cde97f68dc39fe Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Thu, 14 Sep 2023 22:19:18 +0000
Subject: [PATCH 028/112] 8301991: Convert l10n properties resource bundles to
 UTF-8 native

Reviewed-by: naoto
---
 .../compileproperties/CompileProperties.java  |   12 +-
 .../compileproperties/CompileProperties.java  |   12 +-
 .../resources/codepoint_de.properties         |    2 +-
 .../resources/codepoint_ja.properties         |    2 +-
 .../resources/codepoint_zh_CN.properties      |    2 +-
 .../Notepad/resources/Notepad_de.properties   |   10 +-
 .../Notepad/resources/Notepad_ja.properties   |   44 +-
 .../resources/Notepad_zh_CN.properties        |   44 +-
 .../Stylepad/resources/Stylepad_de.properties |    6 +-
 .../Stylepad/resources/Stylepad_ja.properties |   42 +-
 .../resources/Stylepad_zh_CN.properties       |   38 +-
 .../resources/swingset_de.properties          |  204 +-
 .../resources/swingset_ja.properties          |  926 +++----
 .../resources/swingset_zh_CN.properties       |  888 +++----
 .../launcher/resources/launcher_de.properties |   22 +-
 .../launcher/resources/launcher_es.properties |   36 +-
 .../launcher/resources/launcher_fr.properties |   30 +-
 .../launcher/resources/launcher_it.properties |   14 +-
 .../launcher/resources/launcher_ja.properties |   60 +-
 .../launcher/resources/launcher_ko.properties |   52 +-
 .../resources/launcher_pt_BR.properties       |   42 +-
 .../launcher/resources/launcher_sv.properties |   32 +-
 .../resources/launcher_zh_CN.properties       |   56 +-
 .../resources/launcher_zh_TW.properties       |   52 +-
 .../util/resources/CurrencyNames.properties   |   22 +-
 .../sun/util/resources/LocaleNames.properties |   32 +-
 .../data/currency/CurrencyData.properties     |    4 +-
 .../apple/laf/resources/aqua_de.properties    |   48 +-
 .../apple/laf/resources/aqua_es.properties    |   42 +-
 .../apple/laf/resources/aqua_fr.properties    |   40 +-
 .../apple/laf/resources/aqua_it.properties    |    8 +-
 .../apple/laf/resources/aqua_ja.properties    |  166 +-
 .../apple/laf/resources/aqua_ko.properties    |  166 +-
 .../apple/laf/resources/aqua_pt_BR.properties |   48 +-
 .../apple/laf/resources/aqua_sv.properties    |   78 +-
 .../apple/laf/resources/aqua_zh_CN.properties |  168 +-
 .../apple/laf/resources/aqua_zh_TW.properties |  168 +-
 .../sun/awt/resources/awtosx.properties       |   68 +-
 .../resources/accessibility_de.properties     |   32 +-
 .../resources/accessibility_es.properties     |   38 +-
 .../resources/accessibility_fr.properties     |   92 +-
 .../resources/accessibility_it.properties     |    4 +-
 .../resources/accessibility_ja.properties     |  174 +-
 .../resources/accessibility_ko.properties     |  192 +-
 .../resources/accessibility_pt_BR.properties  |   70 +-
 .../resources/accessibility_sv.properties     |   44 +-
 .../resources/accessibility_zh_CN.properties  |  192 +-
 .../resources/accessibility_zh_TW.properties  |  196 +-
 .../plaf/gtk/resources/gtk_de.properties      |   16 +-
 .../plaf/gtk/resources/gtk_es.properties      |    6 +-
 .../plaf/gtk/resources/gtk_fr.properties      |   14 +-
 .../plaf/gtk/resources/gtk_ja.properties      |   64 +-
 .../plaf/gtk/resources/gtk_ko.properties      |   64 +-
 .../plaf/gtk/resources/gtk_pt_BR.properties   |    8 +-
 .../plaf/gtk/resources/gtk_sv.properties      |   28 +-
 .../plaf/gtk/resources/gtk_zh_CN.properties   |   64 +-
 .../plaf/gtk/resources/gtk_zh_TW.properties   |   64 +-
 .../plaf/motif/resources/motif_de.properties  |    8 +-
 .../plaf/motif/resources/motif_es.properties  |    2 +-
 .../plaf/motif/resources/motif_fr.properties  |   12 +-
 .../plaf/motif/resources/motif_ja.properties  |   34 +-
 .../plaf/motif/resources/motif_ko.properties  |   36 +-
 .../motif/resources/motif_pt_BR.properties    |    4 +-
 .../plaf/motif/resources/motif_sv.properties  |   12 +-
 .../motif/resources/motif_zh_CN.properties    |   36 +-
 .../motif/resources/motif_zh_TW.properties    |   36 +-
 .../plaf/basic/resources/basic_de.properties  |   52 +-
 .../plaf/basic/resources/basic_es.properties  |   40 +-
 .../plaf/basic/resources/basic_fr.properties  |   58 +-
 .../plaf/basic/resources/basic_it.properties  |   14 +-
 .../plaf/basic/resources/basic_ja.properties  |  190 +-
 .../plaf/basic/resources/basic_ko.properties  |  188 +-
 .../basic/resources/basic_pt_BR.properties    |   56 +-
 .../plaf/basic/resources/basic_sv.properties  |   82 +-
 .../basic/resources/basic_zh_CN.properties    |  184 +-
 .../basic/resources/basic_zh_TW.properties    |  190 +-
 .../plaf/metal/resources/metal_de.properties  |    8 +-
 .../plaf/metal/resources/metal_es.properties  |    2 +-
 .../plaf/metal/resources/metal_fr.properties  |   16 +-
 .../plaf/metal/resources/metal_ja.properties  |   58 +-
 .../plaf/metal/resources/metal_ko.properties  |   58 +-
 .../metal/resources/metal_pt_BR.properties    |    6 +-
 .../plaf/metal/resources/metal_sv.properties  |   10 +-
 .../metal/resources/metal_zh_CN.properties    |   58 +-
 .../metal/resources/metal_zh_TW.properties    |   58 +-
 .../plaf/synth/resources/synth_de.properties  |    6 +-
 .../plaf/synth/resources/synth_es.properties  |    2 +-
 .../plaf/synth/resources/synth_fr.properties  |   14 +-
 .../plaf/synth/resources/synth_ja.properties  |   50 +-
 .../plaf/synth/resources/synth_ko.properties  |   50 +-
 .../synth/resources/synth_pt_BR.properties    |    6 +-
 .../plaf/synth/resources/synth_sv.properties  |    6 +-
 .../synth/resources/synth_zh_CN.properties    |   50 +-
 .../synth/resources/synth_zh_TW.properties    |   50 +-
 .../sun/awt/resources/awt_de.properties       |   32 +-
 .../sun/awt/resources/awt_es.properties       |   84 +-
 .../sun/awt/resources/awt_fr.properties       |   98 +-
 .../sun/awt/resources/awt_it.properties       |   10 +-
 .../sun/awt/resources/awt_ja.properties       |  206 +-
 .../sun/awt/resources/awt_ko.properties       |  110 +-
 .../sun/awt/resources/awt_pt_BR.properties    |  100 +-
 .../sun/awt/resources/awt_sv.properties       |   80 +-
 .../sun/awt/resources/awt_zh_CN.properties    |  224 +-
 .../sun/awt/resources/awt_zh_TW.properties    |   20 +-
 .../print/resources/serviceui_de.properties   |   26 +-
 .../print/resources/serviceui_es.properties   |   60 +-
 .../print/resources/serviceui_fr.properties   |   62 +-
 .../print/resources/serviceui_it.properties   |   10 +-
 .../print/resources/serviceui_ja.properties   |  230 +-
 .../print/resources/serviceui_ko.properties   |  166 +-
 .../resources/serviceui_pt_BR.properties      |   68 +-
 .../print/resources/serviceui_sv.properties   |   44 +-
 .../resources/serviceui_zh_CN.properties      |  236 +-
 .../resources/serviceui_zh_TW.properties      |  172 +-
 .../windows/resources/windows_de.properties   |   10 +-
 .../windows/resources/windows_es.properties   |    6 +-
 .../windows/resources/windows_fr.properties   |   14 +-
 .../windows/resources/windows_ja.properties   |   54 +-
 .../windows/resources/windows_ko.properties   |   54 +-
 .../resources/windows_pt_BR.properties        |    6 +-
 .../windows/resources/windows_sv.properties   |    6 +-
 .../resources/windows_zh_CN.properties        |   54 +-
 .../resources/windows_zh_TW.properties        |   54 +-
 .../awt/windows/awtLocalization_ja.properties |    2 +-
 .../awt/windows/awtLocalization_ko.properties |    2 +-
 .../windows/awtLocalization_zh_CN.properties  |    2 +-
 .../windows/awtLocalization_zh_TW.properties  |    2 +-
 .../logging/resources/logging_es.properties   |    4 +-
 .../logging/resources/logging_fr.properties   |    8 +-
 .../logging/resources/logging_ja.properties   |   18 +-
 .../logging/resources/logging_ko.properties   |   18 +-
 .../resources/logging_pt_BR.properties        |    6 +-
 .../resources/logging_zh_CN.properties        |   18 +-
 .../resources/logging_zh_TW.properties        |   18 +-
 .../resources/rmiregistry_de.properties       |    2 +-
 .../resources/rmiregistry_es.properties       |    4 +-
 .../resources/rmiregistry_fr.properties       |    2 +-
 .../resources/rmiregistry_it.properties       |    2 +-
 .../resources/rmiregistry_ja.properties       |    4 +-
 .../resources/rmiregistry_ko.properties       |    4 +-
 .../resources/rmiregistry_pt_BR.properties    |    4 +-
 .../resources/rmiregistry_sv.properties       |    4 +-
 .../resources/rmiregistry_zh_CN.properties    |    4 +-
 .../resources/rmiregistry_zh_TW.properties    |    4 +-
 .../rowset/RowSetResourceBundle_de.properties |  146 +-
 .../rowset/RowSetResourceBundle_es.properties |  114 +-
 .../rowset/RowSetResourceBundle_fr.properties |  126 +-
 .../rowset/RowSetResourceBundle_it.properties |   38 +-
 .../rowset/RowSetResourceBundle_ja.properties |  224 +-
 .../rowset/RowSetResourceBundle_ko.properties |  226 +-
 .../RowSetResourceBundle_pt_BR.properties     |  154 +-
 .../rowset/RowSetResourceBundle_sv.properties |  172 +-
 .../RowSetResourceBundle_zh_CN.properties     |  224 +-
 .../RowSetResourceBundle_zh_TW.properties     |  224 +-
 .../resource/xmlsecurity_de.properties        |  154 +-
 .../impl/msg/DOMMessages_de.properties        |   44 +-
 .../impl/msg/DOMMessages_es.properties        |   58 +-
 .../impl/msg/DOMMessages_fr.properties        |   72 +-
 .../impl/msg/DOMMessages_it.properties        |   60 +-
 .../impl/msg/DOMMessages_ja.properties        |   82 +-
 .../impl/msg/DOMMessages_ko.properties        |   82 +-
 .../impl/msg/DOMMessages_pt_BR.properties     |   78 +-
 .../impl/msg/DOMMessages_sv.properties        |   72 +-
 .../impl/msg/DOMMessages_zh_CN.properties     |   82 +-
 .../impl/msg/DOMMessages_zh_TW.properties     |   82 +-
 .../impl/msg/DatatypeMessages_de.properties   |   16 +-
 .../impl/msg/DatatypeMessages_es.properties   |   16 +-
 .../impl/msg/DatatypeMessages_fr.properties   |   16 +-
 .../impl/msg/DatatypeMessages_it.properties   |   12 +-
 .../impl/msg/DatatypeMessages_ja.properties   |   26 +-
 .../impl/msg/DatatypeMessages_ko.properties   |   26 +-
 .../msg/DatatypeMessages_pt_BR.properties     |   22 +-
 .../impl/msg/DatatypeMessages_sv.properties   |   22 +-
 .../msg/DatatypeMessages_zh_CN.properties     |   26 +-
 .../msg/DatatypeMessages_zh_TW.properties     |   26 +-
 .../msg/JAXPValidationMessages_de.properties  |    6 +-
 .../msg/JAXPValidationMessages_es.properties  |   18 +-
 .../msg/JAXPValidationMessages_fr.properties  |   26 +-
 .../msg/JAXPValidationMessages_it.properties  |   22 +-
 .../msg/JAXPValidationMessages_ja.properties  |   28 +-
 .../msg/JAXPValidationMessages_ko.properties  |   28 +-
 .../JAXPValidationMessages_pt_BR.properties   |   26 +-
 .../msg/JAXPValidationMessages_sv.properties  |   22 +-
 .../JAXPValidationMessages_zh_CN.properties   |   28 +-
 .../JAXPValidationMessages_zh_TW.properties   |   28 +-
 .../impl/msg/SAXMessages_de.properties        |   24 +-
 .../impl/msg/SAXMessages_es.properties        |   30 +-
 .../impl/msg/SAXMessages_fr.properties        |   38 +-
 .../impl/msg/SAXMessages_it.properties        |   38 +-
 .../impl/msg/SAXMessages_ja.properties        |   42 +-
 .../impl/msg/SAXMessages_ko.properties        |   42 +-
 .../impl/msg/SAXMessages_pt_BR.properties     |   38 +-
 .../impl/msg/SAXMessages_sv.properties        |   38 +-
 .../impl/msg/SAXMessages_zh_CN.properties     |   42 +-
 .../impl/msg/SAXMessages_zh_TW.properties     |   42 +-
 .../impl/msg/XIncludeMessages_de.properties   |   34 +-
 .../impl/msg/XIncludeMessages_es.properties   |   36 +-
 .../impl/msg/XIncludeMessages_fr.properties   |   56 +-
 .../impl/msg/XIncludeMessages_it.properties   |   40 +-
 .../impl/msg/XIncludeMessages_ja.properties   |   60 +-
 .../impl/msg/XIncludeMessages_ko.properties   |   60 +-
 .../msg/XIncludeMessages_pt_BR.properties     |   52 +-
 .../impl/msg/XIncludeMessages_sv.properties   |   56 +-
 .../msg/XIncludeMessages_zh_CN.properties     |   60 +-
 .../msg/XIncludeMessages_zh_TW.properties     |   60 +-
 .../impl/msg/XMLMessages_de.properties        |  274 +--
 .../impl/msg/XMLMessages_es.properties        |  380 +--
 .../impl/msg/XMLMessages_fr.properties        |  424 ++--
 .../impl/msg/XMLMessages_it.properties        |  298 +--
 .../impl/msg/XMLMessages_ja.properties        |  474 ++--
 .../impl/msg/XMLMessages_ko.properties        |  474 ++--
 .../impl/msg/XMLMessages_pt_BR.properties     |  430 ++--
 .../impl/msg/XMLMessages_sv.properties        |  442 ++--
 .../impl/msg/XMLMessages_zh_CN.properties     |  474 ++--
 .../impl/msg/XMLMessages_zh_TW.properties     |  474 ++--
 .../impl/msg/XMLSchemaMessages_de.properties  |  350 +--
 .../impl/msg/XMLSchemaMessages_es.properties  |  402 +--
 .../impl/msg/XMLSchemaMessages_fr.properties  |  500 ++--
 .../impl/msg/XMLSchemaMessages_it.properties  |  334 +--
 .../impl/msg/XMLSchemaMessages_ja.properties  |  540 ++--
 .../impl/msg/XMLSchemaMessages_ko.properties  |  538 ++--
 .../msg/XMLSchemaMessages_pt_BR.properties    |  478 ++--
 .../impl/msg/XMLSchemaMessages_sv.properties  |  520 ++--
 .../msg/XMLSchemaMessages_zh_CN.properties    |  540 ++--
 .../msg/XMLSchemaMessages_zh_TW.properties    |  538 ++--
 .../msg/XMLSerializerMessages_de.properties   |   14 +-
 .../msg/XMLSerializerMessages_es.properties   |   24 +-
 .../msg/XMLSerializerMessages_fr.properties   |   32 +-
 .../msg/XMLSerializerMessages_it.properties   |   22 +-
 .../msg/XMLSerializerMessages_ja.properties   |   42 +-
 .../msg/XMLSerializerMessages_ko.properties   |   42 +-
 .../XMLSerializerMessages_pt_BR.properties    |   38 +-
 .../msg/XMLSerializerMessages_sv.properties   |   32 +-
 .../XMLSerializerMessages_zh_CN.properties    |   42 +-
 .../XMLSerializerMessages_zh_TW.properties    |   42 +-
 .../impl/msg/XPointerMessages_de.properties   |   26 +-
 .../impl/msg/XPointerMessages_es.properties   |   28 +-
 .../impl/msg/XPointerMessages_fr.properties   |   12 +-
 .../impl/msg/XPointerMessages_it.properties   |   18 +-
 .../impl/msg/XPointerMessages_ja.properties   |   32 +-
 .../impl/msg/XPointerMessages_ko.properties   |   32 +-
 .../msg/XPointerMessages_pt_BR.properties     |   30 +-
 .../impl/msg/XPointerMessages_sv.properties   |   30 +-
 .../msg/XPointerMessages_zh_CN.properties     |   32 +-
 .../msg/XPointerMessages_zh_TW.properties     |   32 +-
 .../impl/xpath/regex/message_de.properties    |   32 +-
 .../impl/xpath/regex/message_es.properties    |   60 +-
 .../impl/xpath/regex/message_fr.properties    |   52 +-
 .../impl/xpath/regex/message_it.properties    |   46 +-
 .../impl/xpath/regex/message_ja.properties    |   78 +-
 .../impl/xpath/regex/message_ko.properties    |   78 +-
 .../impl/xpath/regex/message_pt_BR.properties |   66 +-
 .../impl/xpath/regex/message_sv.properties    |   64 +-
 .../impl/xpath/regex/message_zh_CN.properties |   78 +-
 .../impl/xpath/regex/message_zh_TW.properties |   78 +-
 .../internal/serializer/Encodings.properties  |    4 +-
 .../xml/catalog/CatalogMessages_de.properties |   16 +-
 .../xml/catalog/CatalogMessages_es.properties |   16 +-
 .../xml/catalog/CatalogMessages_fr.properties |   24 +-
 .../xml/catalog/CatalogMessages_it.properties |   16 +-
 .../xml/catalog/CatalogMessages_ja.properties |   34 +-
 .../xml/catalog/CatalogMessages_ko.properties |   34 +-
 .../catalog/CatalogMessages_pt_BR.properties  |   28 +-
 .../xml/catalog/CatalogMessages_sv.properties |   24 +-
 .../catalog/CatalogMessages_zh_CN.properties  |   34 +-
 .../catalog/CatalogMessages_zh_TW.properties  |   34 +-
 .../javac/resources/compiler_de.properties    |  966 ++++----
 .../javac/resources/compiler_ja.properties    | 1938 +++++++--------
 .../javac/resources/compiler_zh_CN.properties | 1966 +++++++--------
 .../tools/javac/resources/javac_de.properties |  112 +-
 .../tools/javac/resources/javac_ja.properties |  244 +-
 .../javac/resources/javac_zh_CN.properties    |  266 +-
 .../javac/resources/launcher_de.properties    |   10 +-
 .../javac/resources/launcher_ja.properties    |   36 +-
 .../javac/resources/launcher_zh_CN.properties |   36 +-
 .../resources/serialver_de.properties         |    2 +-
 .../resources/serialver_ja.properties         |   12 +-
 .../resources/serialver_zh_CN.properties      |   12 +-
 .../resources/simpleserver_de.properties      |   12 +-
 .../resources/simpleserver_ja.properties      |   36 +-
 .../resources/simpleserver_zh_CN.properties   |   36 +-
 .../joptsimple/ExceptionMessages.properties   |    2 +-
 .../sun/tools/jar/resources/jar_de.properties |  118 +-
 .../sun/tools/jar/resources/jar_es.properties |  106 +-
 .../sun/tools/jar/resources/jar_fr.properties |  142 +-
 .../sun/tools/jar/resources/jar_it.properties |   46 +-
 .../sun/tools/jar/resources/jar_ja.properties |  208 +-
 .../sun/tools/jar/resources/jar_ko.properties |  194 +-
 .../tools/jar/resources/jar_pt_BR.properties  |  150 +-
 .../sun/tools/jar/resources/jar_sv.properties |  144 +-
 .../tools/jar/resources/jar_zh_CN.properties  |  208 +-
 .../tools/jar/resources/jar_zh_TW.properties  |  194 +-
 .../html/resources/standard_de.properties     |  218 +-
 .../html/resources/standard_ja.properties     |  670 ++---
 .../html/resources/standard_zh_CN.properties  |  668 ++---
 .../toolkit/resources/doclets_de.properties   |  138 +-
 .../toolkit/resources/doclets_ja.properties   |  550 ++---
 .../resources/doclets_zh_CN.properties        |  552 ++---
 .../doclint/resources/doclint_de.properties   |   82 +-
 .../doclint/resources/doclint_ja.properties   |  144 +-
 .../resources/doclint_zh_CN.properties        |  142 +-
 .../tool/resources/javadoc_de.properties      |   82 +-
 .../tool/resources/javadoc_ja.properties      |  196 +-
 .../tool/resources/javadoc_zh_CN.properties   |  262 +-
 .../jconsole/resources/messages_de.properties |   76 +-
 .../jconsole/resources/messages_ja.properties |  498 ++--
 .../resources/messages_zh_CN.properties       |  506 ++--
 .../tools/javap/resources/javap_de.properties |   44 +-
 .../tools/javap/resources/javap_ja.properties |  104 +-
 .../javap/resources/javap_zh_CN.properties    |  104 +-
 .../resources/jdeprscan_de.properties         |   10 +-
 .../resources/jdeprscan_ja.properties         |   40 +-
 .../resources/jdeprscan_zh_CN.properties      |   40 +-
 .../tools/jdeps/resources/jdeps_de.properties |   82 +-
 .../tools/jdeps/resources/jdeps_ja.properties |  136 +-
 .../jdeps/resources/jdeps_zh_CN.properties    |  136 +-
 .../sun/tools/jdi/resources/jdi_de.properties |   40 +-
 .../sun/tools/jdi/resources/jdi_ja.properties |  102 +-
 .../tools/jdi/resources/jdi_zh_CN.properties  |  102 +-
 .../tools/jlink/resources/jlink_de.properties |   48 +-
 .../tools/jlink/resources/jlink_ja.properties |  124 +-
 .../jlink/resources/jlink_zh_CN.properties    |  124 +-
 .../jlink/resources/plugins_de.properties     |   94 +-
 .../jlink/resources/plugins_ja.properties     |  172 +-
 .../jlink/resources/plugins_zh_CN.properties  |  174 +-
 .../tools/jmod/resources/jmod_de.properties   |   48 +-
 .../tools/jmod/resources/jmod_ja.properties   |  138 +-
 .../jmod/resources/jmod_zh_CN.properties      |  138 +-
 .../resources/LinuxResources_de.properties    |   26 +-
 .../resources/LinuxResources_ja.properties    |   72 +-
 .../resources/LinuxResources_zh_CN.properties |   72 +-
 .../resources/MacResources_de.properties      |   66 +-
 .../resources/MacResources_ja.properties      |  136 +-
 .../resources/MacResources_zh_CN.properties   |  136 +-
 .../resources/HelpResources_de.properties     |   20 +-
 .../resources/HelpResources_ja.properties     |   34 +-
 .../resources/HelpResources_zh_CN.properties  |   32 +-
 .../resources/MainResources_de.properties     |   70 +-
 .../resources/MainResources_ja.properties     |  156 +-
 .../resources/MainResources_zh_CN.properties  |  158 +-
 .../resources/WinResources_de.properties      |   34 +-
 .../resources/WinResources_ja.properties      |   82 +-
 .../resources/WinResources_zh_CN.properties   |   82 +-
 .../jshell/tool/resources/l10n_de.properties  |  224 +-
 .../jshell/tool/resources/l10n_ja.properties  |  478 ++--
 .../tool/resources/l10n_zh_CN.properties      |  492 ++--
 .../jdk/jshell/resources/l10n_de.properties   |   12 +-
 .../jdk/jshell/resources/l10n_ja.properties   |   18 +-
 .../jshell/resources/l10n_zh_CN.properties    |   18 +-
 .../ext/CurrencyNames_ar_AE.properties        |    2 +-
 .../ext/CurrencyNames_ar_BH.properties        |    2 +-
 .../ext/CurrencyNames_ar_DZ.properties        |    2 +-
 .../ext/CurrencyNames_ar_EG.properties        |    2 +-
 .../ext/CurrencyNames_ar_IQ.properties        |    2 +-
 .../ext/CurrencyNames_ar_JO.properties        |    2 +-
 .../ext/CurrencyNames_ar_KW.properties        |    2 +-
 .../ext/CurrencyNames_ar_LB.properties        |    2 +-
 .../ext/CurrencyNames_ar_LY.properties        |    2 +-
 .../ext/CurrencyNames_ar_MA.properties        |    2 +-
 .../ext/CurrencyNames_ar_OM.properties        |    2 +-
 .../ext/CurrencyNames_ar_QA.properties        |    2 +-
 .../ext/CurrencyNames_ar_SA.properties        |    2 +-
 .../ext/CurrencyNames_ar_SD.properties        |    4 +-
 .../ext/CurrencyNames_ar_SY.properties        |    2 +-
 .../ext/CurrencyNames_ar_TN.properties        |    2 +-
 .../ext/CurrencyNames_ar_YE.properties        |    2 +-
 .../ext/CurrencyNames_be_BY.properties        |    4 +-
 .../ext/CurrencyNames_bg_BG.properties        |    2 +-
 .../ext/CurrencyNames_ca_ES.properties        |    2 +-
 .../ext/CurrencyNames_cs_CZ.properties        |    2 +-
 .../ext/CurrencyNames_da_DK.properties        |    2 +-
 .../resources/ext/CurrencyNames_de.properties |   72 +-
 .../ext/CurrencyNames_de_AT.properties        |    4 +-
 .../ext/CurrencyNames_de_DE.properties        |    2 +-
 .../ext/CurrencyNames_de_LU.properties        |    2 +-
 .../ext/CurrencyNames_el_CY.properties        |    4 +-
 .../ext/CurrencyNames_el_GR.properties        |    4 +-
 .../ext/CurrencyNames_en_GB.properties        |    4 +-
 .../ext/CurrencyNames_en_IE.properties        |    4 +-
 .../ext/CurrencyNames_en_MT.properties        |    2 +-
 .../resources/ext/CurrencyNames_es.properties |  186 +-
 .../ext/CurrencyNames_es_ES.properties        |    2 +-
 .../ext/CurrencyNames_et_EE.properties        |    2 +-
 .../ext/CurrencyNames_fi_FI.properties        |    2 +-
 .../resources/ext/CurrencyNames_fr.properties |  164 +-
 .../ext/CurrencyNames_fr_BE.properties        |    2 +-
 .../ext/CurrencyNames_fr_FR.properties        |    2 +-
 .../ext/CurrencyNames_fr_LU.properties        |    2 +-
 .../ext/CurrencyNames_ga_IE.properties        |    2 +-
 .../ext/CurrencyNames_he_IL.properties        |    2 +-
 .../ext/CurrencyNames_hi_IN.properties        |    2 +-
 .../ext/CurrencyNames_hr_HR.properties        |    2 +-
 .../resources/ext/CurrencyNames_it.properties |   48 +-
 .../ext/CurrencyNames_it_IT.properties        |    2 +-
 .../resources/ext/CurrencyNames_ja.properties |  446 ++--
 .../ext/CurrencyNames_ja_JP.properties        |    2 +-
 .../resources/ext/CurrencyNames_ko.properties |  422 ++--
 .../ext/CurrencyNames_ko_KR.properties        |    2 +-
 .../ext/CurrencyNames_lt_LT.properties        |    2 +-
 .../ext/CurrencyNames_lv_LV.properties        |    2 +-
 .../ext/CurrencyNames_mt_MT.properties        |    2 +-
 .../ext/CurrencyNames_nl_BE.properties        |    2 +-
 .../ext/CurrencyNames_nl_NL.properties        |    2 +-
 .../ext/CurrencyNames_pl_PL.properties        |    2 +-
 .../resources/ext/CurrencyNames_pt.properties |  180 +-
 .../ext/CurrencyNames_pt_PT.properties        |    2 +-
 .../ext/CurrencyNames_ru_RU.properties        |    2 +-
 .../ext/CurrencyNames_sk_SK.properties        |    4 +-
 .../ext/CurrencyNames_sl_SI.properties        |    2 +-
 .../ext/CurrencyNames_sr_BA.properties        |    4 +-
 .../ext/CurrencyNames_sr_CS.properties        |    2 +-
 .../ext/CurrencyNames_sr_Latn_BA.properties   |    4 +-
 .../ext/CurrencyNames_sr_Latn_ME.properties   |    2 +-
 .../ext/CurrencyNames_sr_ME.properties        |    2 +-
 .../ext/CurrencyNames_sr_RS.properties        |    2 +-
 .../resources/ext/CurrencyNames_sv.properties |   84 +-
 .../ext/CurrencyNames_sv_SE.properties        |    2 +-
 .../ext/CurrencyNames_th_TH.properties        |    2 +-
 .../ext/CurrencyNames_uk_UA.properties        |    2 +-
 .../ext/CurrencyNames_vi_VN.properties        |    2 +-
 .../ext/CurrencyNames_zh_CN.properties        |  448 ++--
 .../ext/CurrencyNames_zh_TW.properties        |  426 ++--
 .../resources/ext/LocaleNames_ar.properties   |   36 +-
 .../resources/ext/LocaleNames_be.properties   |    4 +-
 .../resources/ext/LocaleNames_bg.properties   |    4 +-
 .../resources/ext/LocaleNames_ca.properties   |  282 +--
 .../resources/ext/LocaleNames_cs.properties   |    4 +-
 .../resources/ext/LocaleNames_de.properties   |  172 +-
 .../resources/ext/LocaleNames_el.properties   |  600 ++---
 .../resources/ext/LocaleNames_es.properties   |  602 ++---
 .../ext/LocaleNames_es_US.properties          |    4 +-
 .../resources/ext/LocaleNames_fi.properties   |   12 +-
 .../resources/ext/LocaleNames_fr.properties   |  568 ++---
 .../resources/ext/LocaleNames_ga.properties   |  470 ++--
 .../resources/ext/LocaleNames_he.properties   |    4 +-
 .../resources/ext/LocaleNames_hi.properties   |    8 +-
 .../resources/ext/LocaleNames_hu.properties   |    2 +-
 .../resources/ext/LocaleNames_is.properties   |    4 +-
 .../resources/ext/LocaleNames_it.properties   |   34 +-
 .../resources/ext/LocaleNames_ja.properties   | 2182 ++++++++---------
 .../resources/ext/LocaleNames_ko.properties   | 2182 ++++++++---------
 .../resources/ext/LocaleNames_lt.properties   |    2 +-
 .../resources/ext/LocaleNames_lv.properties   |    2 +-
 .../resources/ext/LocaleNames_mk.properties   |    4 +-
 .../resources/ext/LocaleNames_ms.properties   |    2 +-
 .../resources/ext/LocaleNames_mt.properties   |  198 +-
 .../resources/ext/LocaleNames_nl.properties   |   90 +-
 .../resources/ext/LocaleNames_no.properties   |    4 +-
 .../ext/LocaleNames_no_NO_NY.properties       |    4 +-
 .../resources/ext/LocaleNames_pl.properties   |  126 +-
 .../resources/ext/LocaleNames_pt.properties   |  370 +--
 .../ext/LocaleNames_pt_BR.properties          |    2 +-
 .../ext/LocaleNames_pt_PT.properties          |   50 +-
 .../resources/ext/LocaleNames_ro.properties   |    4 +-
 .../resources/ext/LocaleNames_ru.properties   |  676 ++---
 .../resources/ext/LocaleNames_sk.properties   |    2 +-
 .../resources/ext/LocaleNames_sl.properties   |    2 +-
 .../resources/ext/LocaleNames_sq.properties   |    2 +-
 .../resources/ext/LocaleNames_sr.properties   |  594 ++---
 .../ext/LocaleNames_sr_Latn.properties        |  166 +-
 .../resources/ext/LocaleNames_sv.properties   |  256 +-
 .../resources/ext/LocaleNames_th.properties   |  676 ++---
 .../resources/ext/LocaleNames_tr.properties   |    4 +-
 .../resources/ext/LocaleNames_uk.properties   |    4 +-
 .../resources/ext/LocaleNames_vi.properties   |  216 +-
 .../resources/ext/LocaleNames_zh.properties   | 2182 ++++++++---------
 .../ext/LocaleNames_zh_TW.properties          | 1910 +++++++--------
 .../agent/resources/agent_de.properties       |   20 +-
 .../agent/resources/agent_es.properties       |   42 +-
 .../agent/resources/agent_fr.properties       |   38 +-
 .../agent/resources/agent_it.properties       |    6 +-
 .../agent/resources/agent_ja.properties       |   74 +-
 .../agent/resources/agent_ko.properties       |   74 +-
 .../agent/resources/agent_pt_BR.properties    |   50 +-
 .../agent/resources/agent_sv.properties       |   48 +-
 .../agent/resources/agent_zh_CN.properties    |   74 +-
 .../agent/resources/agent_zh_TW.properties    |   74 +-
 .../Format/NumberFormat/CurrencyFormat.java   |    9 +-
 .../NumberFormat/CurrencySymbols.properties   |  174 +-
 .../com/bar/LocaleNames.properties            |    6 +-
 .../com/bar/LocaleNames_ja.properties         |   10 +-
 .../bar/LocaleNames_ja_JP_kyoto.properties    |   10 +-
 .../bar/LocaleNames_ja_JP_osaka.properties    |   10 +-
 .../com/bar/LocaleNames_xx.properties         |    2 +-
 .../util/ResourceBundle/Bug6204853.properties |    1 +
 .../src/resources/JMTest_04_ja.properties     |    6 +-
 .../src/resources/ListTest_ja.properties      |    2 +-
 .../src/resources/TextAreaTest_ja.properties  |    2 +-
 488 files changed, 28964 insertions(+), 28952 deletions(-)

diff --git a/make/jdk/src/classes/build/tools/compileproperties/CompileProperties.java b/make/jdk/src/classes/build/tools/compileproperties/CompileProperties.java
index 83e1782b72f..aabc1fc4849 100644
--- a/make/jdk/src/classes/build/tools/compileproperties/CompileProperties.java
+++ b/make/jdk/src/classes/build/tools/compileproperties/CompileProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package build.tools.compileproperties;
 
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,6 +34,9 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -220,8 +224,8 @@ private static boolean createFile(String propertiesPath, String outputPath,
             System.out.println("parsing: " + propertiesPath);
         }
         Properties p = new Properties();
-        try {
-            p.load(new FileInputStream(propertiesPath));
+        try (BufferedReader input = Files.newBufferedReader(Path.of(propertiesPath))) {
+            p.load(input);
         } catch ( FileNotFoundException e ) {
             ok = false;
             error("Cannot find file " + propertiesPath, e);
@@ -267,7 +271,7 @@ private static boolean createFile(String propertiesPath, String outputPath,
             Writer writer = null;
             try {
                 writer = new BufferedWriter(
-                        new OutputStreamWriter(new FileOutputStream(outputPath), "8859_1"));
+                        new OutputStreamWriter(new FileOutputStream(outputPath), StandardCharsets.US_ASCII));
                 MessageFormat format = new MessageFormat(FORMAT);
                 writer.write(format.format(new Object[] { packageString, className, superClass, data }));
             } catch ( IOException e ) {
diff --git a/make/langtools/tools/compileproperties/CompileProperties.java b/make/langtools/tools/compileproperties/CompileProperties.java
index de17b3ba3cf..0abf5d327cd 100644
--- a/make/langtools/tools/compileproperties/CompileProperties.java
+++ b/make/langtools/tools/compileproperties/CompileProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package compileproperties;
 
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,6 +34,9 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -199,8 +203,8 @@ private boolean createFile(String propertiesPath, String outputPath,
         boolean ok = true;
         log.verbose("parsing: " + propertiesPath);
         Properties p = new Properties();
-        try {
-            p.load(new FileInputStream(propertiesPath));
+        try (BufferedReader input = Files.newBufferedReader(Path.of(propertiesPath))) {
+            p.load(input);
         } catch ( FileNotFoundException e ) {
             ok = false;
             log.error("Cannot find file " + propertiesPath, e);
@@ -246,7 +250,7 @@ private boolean createFile(String propertiesPath, String outputPath,
             Writer writer = null;
             try {
                 writer = new BufferedWriter(
-                        new OutputStreamWriter(new FileOutputStream(outputPath), "8859_1"));
+                        new OutputStreamWriter(new FileOutputStream(outputPath), StandardCharsets.US_ASCII));
                 MessageFormat format = new MessageFormat(FORMAT);
                 writer.write(format.format(new Object[] { packageString, className, superClass, data }));
             } catch ( IOException e ) {
diff --git a/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties b/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
index 84597bb758c..bcac460b7cc 100644
--- a/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
+++ b/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
@@ -32,5 +32,5 @@
 # Resource strings for CodePointIM
 #
 
-warning=Diese Demoeingabemethode kann nicht direkt als Anwendung ausgef\u00FChrt werden.\nIn der Datei README.html in diesem Verzeichnis erfahren Sie, wie Sie diese \nEingabemethode verwenden.
+warning=Diese Demoeingabemethode kann nicht direkt als Anwendung ausgeführt werden.\nIn der Datei README.html in diesem Verzeichnis erfahren Sie, wie Sie diese \nEingabemethode verwenden.
 
diff --git a/src/demo/share/jfc/CodePointIM/resources/codepoint_ja.properties b/src/demo/share/jfc/CodePointIM/resources/codepoint_ja.properties
index bd462802310..05b2aaabc03 100644
--- a/src/demo/share/jfc/CodePointIM/resources/codepoint_ja.properties
+++ b/src/demo/share/jfc/CodePointIM/resources/codepoint_ja.properties
@@ -32,5 +32,5 @@
 # Resource strings for CodePointIM
 #
 
-warning=\u3053\u308C\u306F\u30C7\u30E2\u7528\u306E\u5165\u529B\u30E1\u30BD\u30C3\u30C9\u3067\u3059\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3068\u3057\u3066\u5358\u4F53\u3067\u5B9F\u884C\u3059\u308B\n\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u3053\u306E\u5165\u529B\u30E1\u30BD\u30C3\u30C9\u306E\u4F7F\u7528\u65B9\u6CD5\u306B\u3064\u3044\u3066\u306F\u3001\u3053\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n\u306B\u3042\u308BREADME.html\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002
+warning=これはデモ用の入力メソッドです。アプリケーションとして単体で実行する\nことはできません。この入力メソッドの使用方法については、このディレクトリ\nにあるREADME.htmlをご覧ください。
 
diff --git a/src/demo/share/jfc/CodePointIM/resources/codepoint_zh_CN.properties b/src/demo/share/jfc/CodePointIM/resources/codepoint_zh_CN.properties
index dc181a8fbf7..4bc070ff476 100644
--- a/src/demo/share/jfc/CodePointIM/resources/codepoint_zh_CN.properties
+++ b/src/demo/share/jfc/CodePointIM/resources/codepoint_zh_CN.properties
@@ -32,5 +32,5 @@
 # Resource strings for CodePointIM
 #
 
-warning=\u8FD9\u662F\u6F14\u793A\u8F93\u5165\u6CD5; \u4E0D\u80FD\u5C06\u5176\u76F4\u63A5\u4F5C\u4E3A\u5E94\u7528\u7A0B\u5E8F\u6765\u8FD0\u884C\u3002\n\u8BF7\u9605\u8BFB\u6B64\u76EE\u5F55\u4E2D\u7684 README.html \u6587\u4EF6\u4EE5\u4E86\u89E3\u5982\u4F55\u4F7F\u7528\n\u6B64\u8F93\u5165\u6CD5\u3002
+warning=这是演示输入法; 不能将其直接作为应用程序来运行。\n请阅读此目录中的 README.html 文件以了解如何使用\n此输入法。
 
diff --git a/src/demo/share/jfc/Notepad/resources/Notepad_de.properties b/src/demo/share/jfc/Notepad/resources/Notepad_de.properties
index 0c15bc05033..88ecfc94579 100644
--- a/src/demo/share/jfc/Notepad/resources/Notepad_de.properties
+++ b/src/demo/share/jfc/Notepad/resources/Notepad_de.properties
@@ -45,7 +45,7 @@ ElementTreeFrameTitle=Elemente
 # exit ->  Notepad.exitAction
 
 fileLabel=Datei
-openLabel=\u00D6ffnen
+openLabel=Öffnen
 openImage=resources/open.gif
 newLabel=Neu
 newImage=resources/new.gif
@@ -65,9 +65,9 @@ cutLabel=Ausschneiden
 cutImage=resources/cut.gif
 copyLabel=Kopieren
 copyImage=resources/copy.gif
-pasteLabel=Einf\u00FCgen
+pasteLabel=Einfügen
 pasteImage=resources/paste.gif
-undoLabel=R\u00FCckg\u00E4ngig
+undoLabel=Rückgängig
 redoLabel=Wiederherstellen
 
 #
@@ -86,8 +86,8 @@ showElementTreeLabel=Elemente anzeigen
 # with the menu items.
 
 newTooltip=Neue Datei erstellen
-openTooltip=Datei \u00F6ffnen
+openTooltip=Datei öffnen
 saveTooltip=In Datei speichern
 cutTooltip=Auswahl in Zwischenablage verschieben
 copyTooltip=Auswahl in Zwischenablage kopieren
-pasteTooltip=Zwischenablage in Auswahl einf\u00FCgen
+pasteTooltip=Zwischenablage in Auswahl einfügen
diff --git a/src/demo/share/jfc/Notepad/resources/Notepad_ja.properties b/src/demo/share/jfc/Notepad/resources/Notepad_ja.properties
index 6e3a3854d3f..b735d9997c6 100644
--- a/src/demo/share/jfc/Notepad/resources/Notepad_ja.properties
+++ b/src/demo/share/jfc/Notepad/resources/Notepad_ja.properties
@@ -31,8 +31,8 @@
 #
 # Resource strings for Notepad example
 
-Title=\u30E1\u30E2\u5E33
-ElementTreeFrameTitle=\u8981\u7D20
+Title=メモ帳
+ElementTreeFrameTitle=要素
 
 # file Menu definition
 #
@@ -44,14 +44,14 @@ ElementTreeFrameTitle=\u8981\u7D20
 # save ->  Notepad.saveAction
 # exit ->  Notepad.exitAction
 
-fileLabel=\u30D5\u30A1\u30A4\u30EB
-openLabel=\u958B\u304F
+fileLabel=ファイル
+openLabel=開く
 openImage=resources/open.gif
-newLabel=\u65B0\u898F
+newLabel=新規
 newImage=resources/new.gif
-saveLabel=\u4FDD\u5B58
+saveLabel=保存
 saveImage=resources/save.gif
-exitLabel=\u7D42\u4E86
+exitLabel=終了
 
 #
 # edit Menu definition
@@ -60,23 +60,23 @@ exitLabel=\u7D42\u4E86
 # copy  -> JTextComponent.copyAction
 # paste -> JTextComponent.pasteAction
 
-editLabel=\u7DE8\u96C6
-cutLabel=\u5207\u53D6\u308A
+editLabel=編集
+cutLabel=切取り
 cutImage=resources/cut.gif
-copyLabel=\u30B3\u30D4\u30FC
+copyLabel=コピー
 copyImage=resources/copy.gif
-pasteLabel=\u8CBC\u4ED8\u3051
+pasteLabel=貼付け
 pasteImage=resources/paste.gif
-undoLabel=\u5143\u306B\u623B\u3059
-redoLabel=\u518D\u5B9F\u884C
+undoLabel=元に戻す
+redoLabel=再実行
 
 #
 # debug Menu definition
 #
 
-debugLabel=\u30C7\u30D0\u30C3\u30B0
-dumpLabel=\u30E2\u30C7\u30EB\u3092System.err\u306B\u30C0\u30F3\u30D7
-showElementTreeLabel=\u8981\u7D20\u306E\u8868\u793A
+debugLabel=デバッグ
+dumpLabel=モデルをSystem.errにダンプ
+showElementTreeLabel=要素の表示
 
 # toolbar definition
 #
@@ -85,9 +85,9 @@ showElementTreeLabel=\u8981\u7D20\u306E\u8868\u793A
 # are of course sharable, and in this case are shared
 # with the menu items.
 
-newTooltip=\u30D5\u30A1\u30A4\u30EB\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B
-openTooltip=\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F
-saveTooltip=\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58
-cutTooltip=\u9078\u629E\u3092\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u306B\u79FB\u52D5
-copyTooltip=\u9078\u629E\u3092\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u306B\u30B3\u30D4\u30FC
-pasteTooltip=\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u3092\u9078\u629E\u306B\u8CBC\u4ED8\u3051
+newTooltip=ファイルを新規作成する
+openTooltip=ファイルを開く
+saveTooltip=ファイルに保存
+cutTooltip=選択をクリップボードに移動
+copyTooltip=選択をクリップボードにコピー
+pasteTooltip=クリップボードを選択に貼付け
diff --git a/src/demo/share/jfc/Notepad/resources/Notepad_zh_CN.properties b/src/demo/share/jfc/Notepad/resources/Notepad_zh_CN.properties
index 793928034c7..5832273d734 100644
--- a/src/demo/share/jfc/Notepad/resources/Notepad_zh_CN.properties
+++ b/src/demo/share/jfc/Notepad/resources/Notepad_zh_CN.properties
@@ -31,8 +31,8 @@
 #
 # Resource strings for Notepad example
 
-Title=\u8BB0\u4E8B\u672C
-ElementTreeFrameTitle=\u5143\u7D20
+Title=记事本
+ElementTreeFrameTitle=元素
 
 # file Menu definition
 #
@@ -44,14 +44,14 @@ ElementTreeFrameTitle=\u5143\u7D20
 # save ->  Notepad.saveAction
 # exit ->  Notepad.exitAction
 
-fileLabel=\u6587\u4EF6
-openLabel=\u6253\u5F00
+fileLabel=文件
+openLabel=打开
 openImage=resources/open.gif
-newLabel=\u65B0\u5EFA
+newLabel=新建
 newImage=resources/new.gif
-saveLabel=\u4FDD\u5B58
+saveLabel=保存
 saveImage=resources/save.gif
-exitLabel=\u9000\u51FA
+exitLabel=退出
 
 #
 # edit Menu definition
@@ -60,23 +60,23 @@ exitLabel=\u9000\u51FA
 # copy  -> JTextComponent.copyAction
 # paste -> JTextComponent.pasteAction
 
-editLabel=\u7F16\u8F91
-cutLabel=\u526A\u5207
+editLabel=编辑
+cutLabel=剪切
 cutImage=resources/cut.gif
-copyLabel=\u590D\u5236
+copyLabel=复制
 copyImage=resources/copy.gif
-pasteLabel=\u7C98\u8D34
+pasteLabel=粘贴
 pasteImage=resources/paste.gif
-undoLabel=\u64A4\u6D88
-redoLabel=\u91CD\u505A
+undoLabel=撤消
+redoLabel=重做
 
 #
 # debug Menu definition
 #
 
-debugLabel=\u8C03\u8BD5
-dumpLabel=\u5C06\u6A21\u578B\u8F6C\u50A8\u5230 System.err
-showElementTreeLabel=\u663E\u793A\u5143\u7D20
+debugLabel=调试
+dumpLabel=将模型转储到 System.err
+showElementTreeLabel=显示元素
 
 # toolbar definition
 #
@@ -85,9 +85,9 @@ showElementTreeLabel=\u663E\u793A\u5143\u7D20
 # are of course sharable, and in this case are shared
 # with the menu items.
 
-newTooltip=\u521B\u5EFA\u65B0\u6587\u4EF6
-openTooltip=\u6253\u5F00\u6587\u4EF6
-saveTooltip=\u4FDD\u5B58\u6587\u4EF6
-cutTooltip=\u526A\u5207\u9009\u5B9A\u5185\u5BB9\u5230\u526A\u5E16\u677F\u4E2D
-copyTooltip=\u590D\u5236\u9009\u5B9A\u5185\u5BB9\u5230\u526A\u5E16\u677F\u4E2D
-pasteTooltip=\u7C98\u8D34\u9009\u5B9A\u5185\u5BB9\u5230\u526A\u5E16\u677F\u4E2D
+newTooltip=创建新文件
+openTooltip=打开文件
+saveTooltip=保存文件
+cutTooltip=剪切选定内容到剪帖板中
+copyTooltip=复制选定内容到剪帖板中
+pasteTooltip=粘贴选定内容到剪帖板中
diff --git a/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties b/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
index 7ab06001f6d..8be4b8c0303 100644
--- a/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
+++ b/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
@@ -36,7 +36,7 @@ Title=Stylepad
 # Menu labels
 colorLabel=Farbe
 Red=Rot
-Green=Gr\u00FCn
+Green=Grün
 Blue=Blau
 
 boldLabel=Fett
@@ -75,11 +75,11 @@ underlineImage=resources/underline.gif
 underlineTooltip=Unterstrichen
 foregroundImage=resources/fg.gif
 leftImage=resources/left.gif
-leftTooltip=Linksb\u00FCndig
+leftTooltip=Linksbündig
 centerImage=resources/center.gif
 centerTooltip=Zentriert
 rightImage=resources/right.gif
-rightTooltip=Rechtsb\u00FCndig
+rightTooltip=Rechtsbündig
 bulletsImage=resources/bullets.gif
 
 # wonderland example images
diff --git a/src/demo/share/jfc/Stylepad/resources/Stylepad_ja.properties b/src/demo/share/jfc/Stylepad/resources/Stylepad_ja.properties
index e1d1ffb148d..8ca64893f44 100644
--- a/src/demo/share/jfc/Stylepad/resources/Stylepad_ja.properties
+++ b/src/demo/share/jfc/Stylepad/resources/Stylepad_ja.properties
@@ -31,22 +31,22 @@
 #
 # Resource strings for Stylepad example
 
-Title=\u30B9\u30BF\u30A4\u30EB\u30D1\u30C3\u30C9
+Title=スタイルパッド
 
 # Menu labels
-colorLabel=\u30AB\u30E9\u30FC
-Red=\u8D64
-Green=\u7DD1
-Blue=\u9752
+colorLabel=カラー
+Red=赤
+Green=緑
+Blue=青
 
-boldLabel=\u592A\u5B57
-italicLabel=\u30A4\u30BF\u30EA\u30C3\u30AF
+boldLabel=太字
+italicLabel=イタリック
 
 # font menu
 
-fontLabel=\u30D5\u30A9\u30F3\u30C8
+fontLabel=フォント
 family1Label=SansSerif
-family2Label=\u30E2\u30CE\u30B9\u30DA\u30FC\u30B9
+family2Label=モノスペース
 family3Label=Serif
 family4Label=Lucida Sans
 size1Label=10
@@ -54,32 +54,32 @@ size2Label=12
 size3Label=18
 size4Label=24
 size5Label=48
-boldLabel=\u592A\u5B57
-italicLabel=\u30A4\u30BF\u30EA\u30C3\u30AF
-underlineLabel=\u4E0B\u7DDA
+boldLabel=太字
+italicLabel=イタリック
+underlineLabel=下線
 
 #
 # debug Menu definition
 #
-debugLabel=\u30C7\u30D0\u30C3\u30B0
-dumpLabel=\u30E2\u30C7\u30EB\u3092System.err\u306B\u30C0\u30F3\u30D7
-showElementTreeLabel=\u8981\u7D20\u306E\u8868\u793A
+debugLabel=デバッグ
+dumpLabel=モデルをSystem.errにダンプ
+showElementTreeLabel=要素の表示
 
 
 # toolbar definition
 boldImage=resources/bold.gif
-boldTooltip=\u592A\u5B57
+boldTooltip=太字
 italicImage=resources/italic.gif
-italicTooltip=\u30A4\u30BF\u30EA\u30C3\u30AF
+italicTooltip=イタリック
 underlineImage=resources/underline.gif
-underlineTooltip=\u4E0B\u7DDA
+underlineTooltip=下線
 foregroundImage=resources/fg.gif
 leftImage=resources/left.gif
-leftTooltip=\u5DE6\u63C3\u3048
+leftTooltip=左揃え
 centerImage=resources/center.gif
-centerTooltip=\u4E2D\u592E\u63C3\u3048
+centerTooltip=中央揃え
 rightImage=resources/right.gif
-rightTooltip=\u53F3\u63C3\u3048
+rightTooltip=右揃え
 bulletsImage=resources/bullets.gif
 
 # wonderland example images
diff --git a/src/demo/share/jfc/Stylepad/resources/Stylepad_zh_CN.properties b/src/demo/share/jfc/Stylepad/resources/Stylepad_zh_CN.properties
index 6691baa3943..078b9e15874 100644
--- a/src/demo/share/jfc/Stylepad/resources/Stylepad_zh_CN.properties
+++ b/src/demo/share/jfc/Stylepad/resources/Stylepad_zh_CN.properties
@@ -34,17 +34,17 @@
 Title=StylePad
 
 # Menu labels
-colorLabel=\u989C\u8272
-Red=\u7EA2\u8272
-Green=\u7EFF\u8272
-Blue=\u84DD\u8272
+colorLabel=颜色
+Red=红色
+Green=绿色
+Blue=蓝色
 
-boldLabel=\u7C97\u4F53
-italicLabel=\u659C\u4F53
+boldLabel=粗体
+italicLabel=斜体
 
 # font menu
 
-fontLabel=\u5B57\u4F53
+fontLabel=字体
 family1Label=SansSerif
 family2Label=Monospaced
 family3Label=Serif
@@ -54,32 +54,32 @@ size2Label=12
 size3Label=18
 size4Label=24
 size5Label=48
-boldLabel=\u7C97\u4F53
-italicLabel=\u659C\u4F53
-underlineLabel=\u4E0B\u5212\u7EBF
+boldLabel=粗体
+italicLabel=斜体
+underlineLabel=下划线
 
 #
 # debug Menu definition
 #
-debugLabel=\u8C03\u8BD5
-dumpLabel=\u5C06\u6A21\u578B\u8F6C\u50A8\u5230 System.err
-showElementTreeLabel=\u663E\u793A\u5143\u7D20
+debugLabel=调试
+dumpLabel=将模型转储到 System.err
+showElementTreeLabel=显示元素
 
 
 # toolbar definition
 boldImage=resources/bold.gif
-boldTooltip=\u7C97\u4F53
+boldTooltip=粗体
 italicImage=resources/italic.gif
-italicTooltip=\u659C\u4F53
+italicTooltip=斜体
 underlineImage=resources/underline.gif
-underlineTooltip=\u4E0B\u5212\u7EBF
+underlineTooltip=下划线
 foregroundImage=resources/fg.gif
 leftImage=resources/left.gif
-leftTooltip=\u5DE6\u5BF9\u9F50
+leftTooltip=左对齐
 centerImage=resources/center.gif
-centerTooltip=\u4E2D\u95F4\u5BF9\u9F50
+centerTooltip=中间对齐
 rightImage=resources/right.gif
-rightTooltip=\u53F3\u5BF9\u9F50
+rightTooltip=右对齐
 bulletsImage=resources/bullets.gif
 
 # wonderland example images
diff --git a/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties b/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
index fca26a5cdc0..cd6de142a26 100644
--- a/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
+++ b/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
@@ -49,11 +49,11 @@ SourceCode.loading=<html><body bgcolor="#ffffff">Quellcode wird geladen und form
 ### Status ###
 
 Status.loading=Wird geladen:
-Status.popupMenuAccessible=Dr\u00FCcken Sie Umschalt-F10, um das Popup-Men\u00FC zu aktivieren
+Status.popupMenuAccessible=Drücken Sie Umschalt-F10, um das Popup-Menü zu aktivieren
 
 ### Menu Bar ###
 
-MenuBar.accessible_description=Men\u00FCleiste der Swing-Demo
+MenuBar.accessible_description=Menüleiste der Swing-Demo
 
 
 ### Frame ###
@@ -64,13 +64,13 @@ Frame.title=SwingSet2
 ### Tabbed Pane ###
 
 TabbedPane.src.labelAndMnemonic=Quellcode
-TabbedPane.src_tooltip=Quellcode f\u00FCr diese Demo anzeigen
+TabbedPane.src_tooltip=Quellcode für diese Demo anzeigen
 
 
 ### Look & Feel Menu ###
 
 LafMenu.laf.labelAndMnemonic=&Look-and-Feel
-LafMenu.laf_accessible_description=Men\u00FC, \u00FCber das Sie das Look-and-Feel wechseln k\u00F6nnen
+LafMenu.laf_accessible_description=Menü, über das Sie das Look-and-Feel wechseln können
 
 LafMenu.java.labelAndMnemonic=&Java-Look-and-Feel
 LafMenu.java_accessible_description=Das Java-Look-and-Feel
@@ -94,10 +94,10 @@ LafMenu.gtk_accessible_description=GTK-Look-and-Feel
 ### Themes Menu ###
 
 ThemesMenu.themes.labelAndMnemonic=&Themes
-ThemesMenu.themes_accessible_description=Men\u00FC zum Wechseln der Metal-Farb-Themes
+ThemesMenu.themes_accessible_description=Menü zum Wechseln der Metal-Farb-Themes
 
 ThemesMenu.aqua.labelAndMnemonic=A&qua
-ThemesMenu.aqua_accessible_description=Ein Metal-Theme mit blau-gr\u00FCnen Farben
+ThemesMenu.aqua_accessible_description=Ein Metal-Theme mit blau-grünen Farben
 
 ThemesMenu.charcoal.labelAndMnemonic=&Anthrazit
 ThemesMenu.charcoal_accessible_description=Ein Metal-Theme mit dunkelgrauen Farben
@@ -111,8 +111,8 @@ ThemesMenu.ocean_accessible_description=Das Metal-Theme "Ozean"
 ThemesMenu.steel.labelAndMnemonic=&Stahl
 ThemesMenu.steel_accessible_description=Das blaue/violette Metal-Theme
 
-ThemesMenu.emerald.labelAndMnemonic=&Smaragdgr\u00FCn
-ThemesMenu.emerald_accessible_description=Ein Metal-Theme mit gr\u00FCnen Farben
+ThemesMenu.emerald.labelAndMnemonic=&Smaragdgrün
+ThemesMenu.emerald_accessible_description=Ein Metal-Theme mit grünen Farben
 
 ThemesMenu.ruby.labelAndMnemonic=&Rubinrot
 ThemesMenu.ruby_accessible_description=Ein Metal-Theme mit roten Farben
@@ -120,33 +120,33 @@ ThemesMenu.ruby_accessible_description=Ein Metal-Theme mit roten Farben
 
 ### Font SubMenu (under Themes)
 FontMenu.fonts.labelAndMnemonic=Schri&ftarten
-FontMenu.fonts_accessible_description=Men\u00FC, in dem Sie Schriftarten f\u00FCr das Java-Look-and-Feel ausw\u00E4hlen
+FontMenu.fonts_accessible_description=Menü, in dem Sie Schriftarten für das Java-Look-and-Feel auswählen
 
 FontMenu.bold.labelAndMnemonic=&Fett
-FontMenu.bold_accessible_description=Deaktiviert fettgedruckte Schriftarten f\u00FCr das Java-Look-and-Feel
+FontMenu.bold_accessible_description=Deaktiviert fettgedruckte Schriftarten für das Java-Look-and-Feel
 
 FontMenu.plain.labelAndMnemonic=&Normal
-FontMenu.plain_accessible_description=Deaktiviert normale Schriftarten f\u00FCr das Java-Look-and-Feel
+FontMenu.plain_accessible_description=Deaktiviert normale Schriftarten für das Java-Look-and-Feel
 
 
 ### Audio SubMenu (under Themes) ###
 
 AudioMenu.audio.labelAndMnemonic=&Audio
-AudioMenu.audio_accessible_description=Men\u00FC, in dem Sie die verf\u00FCgbare Audio-Feedbackmenge im Java-Look-and-Feel \u00E4ndern
+AudioMenu.audio_accessible_description=Menü, in dem Sie die verfügbare Audio-Feedbackmenge im Java-Look-and-Feel ändern
 
 AudioMenu.on.labelAndMnemonic=&Ein
-AudioMenu.on_accessible_description=Aktiviert das gesamte Audiofeedback f\u00FCr das Java-Look-and-Feel
+AudioMenu.on_accessible_description=Aktiviert das gesamte Audiofeedback für das Java-Look-and-Feel
 
 AudioMenu.default.labelAndMnemonic=Stan&dard
-AudioMenu.default_accessible_description=Aktiviert die standardm\u00E4\u00DFige Audio-Feedbackmenge f\u00FCr das Java-Look-and-Feel
+AudioMenu.default_accessible_description=Aktiviert die standardmäßige Audio-Feedbackmenge für das Java-Look-and-Feel
 
 AudioMenu.off.labelAndMnemonic=A&us
-AudioMenu.off_accessible_description=Deaktiviert das gesamte Audiofeedback f\u00FCr das Java-Look-and-Feel
+AudioMenu.off_accessible_description=Deaktiviert das gesamte Audiofeedback für das Java-Look-and-Feel
 
 ### Options Menu ###
 
 OptionsMenu.options.labelAndMnemonic=O&ptionen
-OptionsMenu.options_accessible_description=Men\u00FC mit anderen Optionen
+OptionsMenu.options_accessible_description=Menü mit anderen Optionen
 
 OptionsMenu.tooltip.labelAndMnemonic=QuickInfo ak&tivieren
 OptionsMenu.tooltip_accessible_description=QuickInfo aktivieren oder deaktivieren
@@ -157,21 +157,21 @@ OptionsMenu.dragEnabled_accessible_description=Drag-und-Drop aktivieren oder dea
 ### File Menu ###
 
 FileMenu.file.labelAndMnemonic=Dat&ei
-FileMenu.accessible_description=Men\u00FC "Datei"
+FileMenu.accessible_description=Menü "Datei"
 FileMenu.about.labelAndMnemonic=&Info
 FileMenu.about_accessible_description=Weitere Informationen zur SwingSet2-Anwendung
-FileMenu.open.labelAndMnemonic=\u00D6&ffnen
-FileMenu.open_accessible_description=Platzhaltermen\u00FCoption zum \u00D6ffnen einer Datei
+FileMenu.open.labelAndMnemonic=Ö&ffnen
+FileMenu.open_accessible_description=Platzhaltermenüoption zum Öffnen einer Datei
 FileMenu.save.labelAndMnemonic=&Speichern
-FileMenu.save_accessible_description=Platzhaltermen\u00FCoption zum Speichern einer Datei
+FileMenu.save_accessible_description=Platzhaltermenüoption zum Speichern einer Datei
 FileMenu.save_as.labelAndMnemonic=Speichern &unter...
-FileMenu.save_as_accessible_description=Platzhaltermen\u00FCoption zum Speichern einer Datei mit einem neuen Namen
+FileMenu.save_as_accessible_description=Platzhaltermenüoption zum Speichern einer Datei mit einem neuen Namen
 FileMenu.exit.labelAndMnemonic=B&eenden
 FileMenu.exit_accessible_description=SwingSet2-Anwendung beenden
 
 ### Multi-Screen menu ###
 MultiMenu.multi.labelAndMnemonic=&Multiscreen
-MultiMenu.multi_accessible_description=Multiscreen-Men\u00FC
+MultiMenu.multi_accessible_description=Multiscreen-Menü
 MultiMenu.all.labelAndMnemonic=SwingSet2 &auf allen Bildschirmen erstellen
 MultiMenu.all_accessible_description=SwingSet2-Fenster auf jedem Bildschirm erstellen
 MultiMenu.single.labelAndMnemonic=SwingSet2 auf Bildschirm erstellen
@@ -184,23 +184,23 @@ MultiMenu.single_accessible_description=SwingSet2-Fenster auf Bildschirm erstell
 
 ### Button Demo ###
 
-ButtonDemo.accessible_description=Die ButtonDemo zeigt Beispiele f\u00FCr die Verwendung von JButton, JRadioButton, JToggleButton und JCheckBox
-ButtonDemo.tooltip=Demos f\u00FCr JButton, JRadioButton, JToggleButton, JCheckbox
-ButtonDemo.name=Schaltfl\u00E4chendemo
+ButtonDemo.accessible_description=Die ButtonDemo zeigt Beispiele für die Verwendung von JButton, JRadioButton, JToggleButton und JCheckBox
+ButtonDemo.tooltip=Demos für JButton, JRadioButton, JToggleButton, JCheckbox
+ButtonDemo.name=Schaltflächendemo
 
-ButtonDemo.buttons=Schaltfl\u00E4chen
-ButtonDemo.checkboxes=Kontrollk\u00E4stchen
+ButtonDemo.buttons=Schaltflächen
+ButtonDemo.checkboxes=Kontrollkästchen
 ButtonDemo.radiobuttons=Optionsfelder
-ButtonDemo.togglebuttons=Umschalt-Schaltfl\u00E4chen
+ButtonDemo.togglebuttons=Umschalt-Schaltflächen
 
-ButtonDemo.textbuttons=Textschaltfl\u00E4chen
-ButtonDemo.imagebuttons=Bildschaltfl\u00E4chen
+ButtonDemo.textbuttons=Textschaltflächen
+ButtonDemo.imagebuttons=Bildschaltflächen
 ButtonDemo.textradiobuttons=Textoptionsfelder
 ButtonDemo.imageradiobuttons=Bildoptionsfelder
-ButtonDemo.texttogglebuttons=Text-Umschalt-Schaltfl\u00E4chen
-ButtonDemo.imagetogglebuttons=Bild-Umschalt-Schaltfl\u00E4chen
-ButtonDemo.textcheckboxes=Textkontrollk\u00E4stchen
-ButtonDemo.imagecheckboxes=Bildkontrollk\u00E4stchen
+ButtonDemo.texttogglebuttons=Text-Umschalt-Schaltflächen
+ButtonDemo.imagetogglebuttons=Bild-Umschalt-Schaltflächen
+ButtonDemo.textcheckboxes=Textkontrollkästchen
+ButtonDemo.imagecheckboxes=Bildkontrollkästchen
 
 ButtonDemo.button1=Eins
 ButtonDemo.button2=Zwei
@@ -217,21 +217,21 @@ ButtonDemo.check3=Drei
 ButtonDemo.checkX=<html><font size=2 color=red>Drei<bold>(HTML!)</bold></font></html>
 
 ButtonDemo.customradio=Ein benutzerdefiniertes "Chrome"-Optionsfeld.
-ButtonDemo.customcheck=Ein benutzerdefinierbares Gl\u00FChbirnenkontrollk\u00E4stchen.
+ButtonDemo.customcheck=Ein benutzerdefinierbares Glühbirnenkontrollkästchen.
 
 ButtonDemo.phone=Telefon
 ButtonDemo.write=Schreiben
 ButtonDemo.peace=Peace
 
 ButtonDemo.controlpanel.labelAndMnemonic=Anzeigeoptionen:
-ButtonDemo.paintborder.labelAndMnemonic=Rahmen f\u00E4r&ben
-ButtonDemo.paintborder_tooltip=Klicken Sie hier, um die Rahmenf\u00E4rbung ein- oder auszuschalten.
-ButtonDemo.paintfocus.labelAndMnemonic=&Fokus f\u00E4rben
-ButtonDemo.paintfocus_tooltip=Klicken Sie hier, um die Fokusf\u00E4rbung ein- oder auszuschalten.
+ButtonDemo.paintborder.labelAndMnemonic=Rahmen fär&ben
+ButtonDemo.paintborder_tooltip=Klicken Sie hier, um die Rahmenfärbung ein- oder auszuschalten.
+ButtonDemo.paintfocus.labelAndMnemonic=&Fokus färben
+ButtonDemo.paintfocus_tooltip=Klicken Sie hier, um die Fokusfärbung ein- oder auszuschalten.
 ButtonDemo.enabled.labelAndMnemonic=Aktivi&ert
-ButtonDemo.enabled_tooltip=Klicken Sie hier, um die Schaltfl\u00E4chen zu aktivieren oder zu deaktivieren.
-ButtonDemo.contentfilled.labelAndMnemonic=&Inhalt gef\u00FCllt
-ButtonDemo.contentfilled_tooltip=Klicken Sie hier, um die F\u00FCllung des Inhaltsbereichs zu steuern.
+ButtonDemo.enabled_tooltip=Klicken Sie hier, um die Schaltflächen zu aktivieren oder zu deaktivieren.
+ButtonDemo.contentfilled.labelAndMnemonic=&Inhalt gefüllt
+ButtonDemo.contentfilled_tooltip=Klicken Sie hier, um die Füllung des Inhaltsbereichs zu steuern.
 
 ButtonDemo.padamount.labelAndMnemonic=Abstand:
 ButtonDemo.default.labelAndMnemonic=Stan&dard
@@ -246,10 +246,10 @@ LayoutControlPanel.contentalignment.labelAndMnemonic=Inhaltsausrichtung:
 
 ### ColorChooser Demo ###
 
-ColorChooserDemo.accessible_description=Mit dem ColorChooser k\u00F6nnen Sie eine Farbe \u00FCber eine Palette oder unter RGB- oder HSB-Werten ausw\u00E4hlen
+ColorChooserDemo.accessible_description=Mit dem ColorChooser können Sie eine Farbe über eine Palette oder unter RGB- oder HSB-Werten auswählen
 ColorChooserDemo.tooltip=JColorChooser-Demo
 ColorChooserDemo.name=ColorChooser-Demo
-ColorChooserDemo.chooser_title=Farbe w\u00E4hlen
+ColorChooserDemo.chooser_title=Farbe wählen
 ColorChooserDemo.background=Hintergrund
 ColorChooserDemo.grad_a=Farbverlauf 1
 ColorChooserDemo.grad_b=Farbverlauf 2
@@ -258,7 +258,7 @@ ColorChooserDemo.cup=Bild der Kaffeetasse der Java-Marke
 
 ### ComboBox Demo ###
 
-ComboBoxDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JComboBox-Komponente.
+ComboBoxDemo.accessible_description=Diese Demo zeigt ein Beispiel für die Verwendung der JComboBox-Komponente.
 ComboBoxDemo.tooltip=JComboBox-Demo
 ComboBoxDemo.name=ComboBox-Demo
 
@@ -300,7 +300,7 @@ ComboBoxDemo.scott=Scott
 
 ### FileChooser Demo ###
 
-FileChooserDemo.accessible_description=\u00DCber den FileChooser k\u00F6nnen Benutzer eine Datei zum \u00D6ffnen oder Erstellen/Speichern ausw\u00E4hlen.
+FileChooserDemo.accessible_description=Über den FileChooser können Benutzer eine Datei zum Öffnen oder Erstellen/Speichern auswählen.
 FileChooserDemo.tooltip=JFileChooser-Demo
 FileChooserDemo.name=FileChooser-Demo
 
@@ -308,18 +308,18 @@ FileChooserDemo.plainbutton=Einfachen JFileChooser anzeigen
 FileChooserDemo.previewbutton=Vorschau-JFileChooser anzeigen
 FileChooserDemo.custombutton=Benutzerdefinierten JFileChooser anzeigen
 
-FileChooserDemo.description=<html>&&nbsp &&nbsp Beachten Sie, dass Sie ganz einfach Ihren eigenen FileChooser<br> &&nbsp &&nbsp mit beliebig vielen Komponenten erstellen k\u00F6nnen. </html>
+FileChooserDemo.description=<html>&&nbsp &&nbsp Beachten Sie, dass Sie ganz einfach Ihren eigenen FileChooser<br> &&nbsp &&nbsp mit beliebig vielen Komponenten erstellen können. </html>
 
 FileChooserDemo.filterdescription=JPEG- und GIF-Bilddateien
 
-FileChooserDemo.nofileselected=W\u00E4hlen Sie zun\u00E4chst eine Datei aus.
+FileChooserDemo.nofileselected=Wählen Sie zunächst eine Datei aus.
 FileChooserDemo.thefile=die Datei:
 FileChooserDemo.isprobably=ist wahrscheinlich ein Bild.
 
-FileChooserDemo.helptext=<html>Suchen: Datei suchen.<br>Info: Weitere Informationen zur Datei.<br>OK: Diese Datei ausw\u00E4hlen.<br>Abbrechen: Dieses Dialogfeld ohne Aktion verlassen.</html>
+FileChooserDemo.helptext=<html>Suchen: Datei suchen.<br>Info: Weitere Informationen zur Datei.<br>OK: Diese Datei auswählen.<br>Abbrechen: Dieses Dialogfeld ohne Aktion verlassen.</html>
 
 FileChooserDemo.findquestion=Datei suchen:
-FileChooserDemo.findresponse=<html><center>Sie m\u00F6chten wirklich eine Datei suchen? <br>Das ist mit dieser Demo nicht m\u00F6glich.</center></html>
+FileChooserDemo.findresponse=<html><center>Sie möchten wirklich eine Datei suchen? <br>Das ist mit dieser Demo nicht möglich.</center></html>
 
 FileChooserDemo.dialogtitle=FileChooser mit benutzerdefiniertem Layout
 FileChooserDemo.help=Hilfe
@@ -342,8 +342,8 @@ InternalFrameDemo.accessible_description=JInternal-Framedemo
 InternalFrameDemo.create_frames.labelAndMnemonic=Angepasste interne Frames erstellen
 InternalFrameDemo.title_text_field.labelAndMnemonic=Frametitel:
 InternalFrameDemo.frame.labelAndMnemonic=Frame
-InternalFrameDemo.palette.labelAndMnemonic=Generator f\u00FCr interne Frames
-InternalFrameDemo.name=Demo f\u00FCr interne Frames
+InternalFrameDemo.palette.labelAndMnemonic=Generator für interne Frames
+InternalFrameDemo.name=Demo für interne Frames
 InternalFrameDemo.tooltip=JInternalFrame-Demo
 InternalFrameDemo.closable.labelAndMnemonic=Kann geschlossen werden
 InternalFrameDemo.resizable.labelAndMnemonic=Skalierbar
@@ -360,52 +360,52 @@ InternalFrameDemo.cab=Braucht jemand ein Taxi?
 ListDemo.accessible_description=JList-Demo
 ListDemo.name=Listendemo
 ListDemo.tooltip=JList-Demo
-ListDemo.prefixes=Pr\u00E4fixe
+ListDemo.prefixes=Präfixe
 ListDemo.suffixes=Suffixe
-ListDemo.count.labelAndMnemonic=Anzahl generierte Listeneintr\u00E4ge:
+ListDemo.count.labelAndMnemonic=Anzahl generierte Listeneinträge:
 ListDemo.all=Alle
 ListDemo.none=Kein Wert
 ListDemo.red=Rotes Firmenlogobild
 ListDemo.yellow=Rotes Firmenlogobild
 ListDemo.blue=Blaues Firmenlogobild
 ListDemo.gray=Graues Firmenlogobild
-ListDemo.green=Gr\u00FCnes Firmenlogobild
+ListDemo.green=Grünes Firmenlogobild
 ListDemo.magenta=Firmenlogobild in Magenta
 ListDemo.cyan=Firmenlogobild in Zyan
-ListDemo.description=<html><P STYLE="margin-left: .25in; margin-right: .25in">Diese Demo zeigt die Pr\u00E4sentation von Datenlisten auf zwei verschiedene Arten. Links steht eine <b>JList</b>-Komponente mit Listenelementen, die aus den Permutationen der aktivierten Pr\u00E4fixe und Suffixe bestehen. Die Kontrollk\u00E4stchenspalten f\u00FCr Pr\u00E4fix und Suffix rechts werden mit einer <b>JPanel</b>-Komponente mit einem Y-Achsen-<b>BoxLayout</b> in einer <b>JScrollPane</b>-Komponente erstellt.</P></html>
+ListDemo.description=<html><P STYLE="margin-left: .25in; margin-right: .25in">Diese Demo zeigt die Präsentation von Datenlisten auf zwei verschiedene Arten. Links steht eine <b>JList</b>-Komponente mit Listenelementen, die aus den Permutationen der aktivierten Präfixe und Suffixe bestehen. Die Kontrollkästchenspalten für Präfix und Suffix rechts werden mit einer <b>JPanel</b>-Komponente mit einem Y-Achsen-<b>BoxLayout</b> in einer <b>JScrollPane</b>-Komponente erstellt.</P></html>
 
 
 ### OptionPane Demo ###
 
-OptionPaneDemo.accessible_description=Die OptionPane-Demo zeigt Beispiele f\u00FCr die Verwendung von JOptionPane zum Generieren verschiedener g\u00E4ngiger Optionsdialogfelder
+OptionPaneDemo.accessible_description=Die OptionPane-Demo zeigt Beispiele für die Verwendung von JOptionPane zum Generieren verschiedener gängiger Optionsdialogfelder
 OptionPaneDemo.tooltip=JOptionPane-Demo
 OptionPaneDemo.name=Optionsbereichsdemo
 
 OptionPaneDemo.warningbutton=Warnungsdialogfeld anzeigen
 OptionPaneDemo.componentbutton=Komponentendialogfeld anzeigen
 OptionPaneDemo.inputbutton=Eingabedialogfeld anzeigen
-OptionPaneDemo.confirmbutton=Best\u00E4tigungsdialogfeld anzeigen
+OptionPaneDemo.confirmbutton=Bestätigungsdialogfeld anzeigen
 OptionPaneDemo.messagebutton=Meldungsdialog anzeigen
 
-OptionPaneDemo.warningtitle=Beispiel f\u00FCr Warnungsdialogfeld
-OptionPaneDemo.warningtext=<html><P><font color=black>Das ist ein Test des <font color=red><b>Notfallwarnsystems</b></font>. <i><b>Das ist<br> nur ein Test</b></i>. Der Webmaster Ihres lokalen Intranets hat dieses System in freiwilliger <br> Zusammenarbeit mit den <font color=blue><b>Bundes-</b></font> und <font color=blue><b>L\u00E4nderbeh\u00F6rden</b></font> <br> entwickelt, um Sie bei Bedarf \u00FCber <br> Notf\u00E4lle zu informieren. Bei einem tats\u00E4chlichen Notfall w\u00FCrden auf das Signal, das Sie <br> eben geh\u00F6rt haben, offizielle Informationen, Nachrichten <br> oder Anweisungen folgen. Damit ist dieser Test des <font color=red><b><br>Notfallwarnsystems</b></font> abgeschlossen.</font></P><P><br>Entwicklerhinweis: Der Text in dieser Dialogfelddemo wurde mit HTML formatiert.</P></html>
+OptionPaneDemo.warningtitle=Beispiel für Warnungsdialogfeld
+OptionPaneDemo.warningtext=<html><P><font color=black>Das ist ein Test des <font color=red><b>Notfallwarnsystems</b></font>. <i><b>Das ist<br> nur ein Test</b></i>. Der Webmaster Ihres lokalen Intranets hat dieses System in freiwilliger <br> Zusammenarbeit mit den <font color=blue><b>Bundes-</b></font> und <font color=blue><b>Länderbehörden</b></font> <br> entwickelt, um Sie bei Bedarf über <br> Notfälle zu informieren. Bei einem tatsächlichen Notfall würden auf das Signal, das Sie <br> eben gehört haben, offizielle Informationen, Nachrichten <br> oder Anweisungen folgen. Damit ist dieser Test des <font color=red><b><br>Notfallwarnsystems</b></font> abgeschlossen.</font></P><P><br>Entwicklerhinweis: Der Text in dieser Dialogfelddemo wurde mit HTML formatiert.</P></html>
 
 OptionPaneDemo.messagetext=Flaschenpost
 
 OptionPaneDemo.confirmquestion=Scheint heute die Sonne?
 OptionPaneDemo.confirmyes=<html>Warum sitzen Sie noch am Computer?<br> Gehen Sie raus! Machen Sie einen Ausflug zum Strand! Legen Sie sich in die Sonne!</html>
-OptionPaneDemo.confirmno=Gut, dass Sie hier drinnen vor dem Wetter gesch\u00FCtzt sind.
+OptionPaneDemo.confirmno=Gut, dass Sie hier drinnen vor dem Wetter geschützt sind.
 
 OptionPaneDemo.inputquestion=Was ist Ihr Lieblingsfilm?
 OptionPaneDemo.inputresponse=Das ist ein guter Film!
 
-OptionPaneDemo.componenttitle=Beispiel f\u00FCr Komponentendialogfeld
+OptionPaneDemo.componenttitle=Beispiel für Komponentendialogfeld
 OptionPaneDemo.componentmessage=<html>JOptionPane kann beliebig viele Komponenten <br> enthalten, wie ein Textfeld:</html>
 OptionPaneDemo.componenttextfield=oder ein Kombinationsfeld:
 OptionPaneDemo.component_cb1=Element 1
 OptionPaneDemo.component_cb2=Element 2
 OptionPaneDemo.component_cb3=Element 3
-OptionPaneDemo.componentmessage2=<html>JOptionPane kann au\u00DFerdem beliebig viele <br> Optionen anzeigen:</html>
+OptionPaneDemo.componentmessage2=<html>JOptionPane kann außerdem beliebig viele <br> Optionen anzeigen:</html>
 OptionPaneDemo.component_op1=Ja
 OptionPaneDemo.component_op2=Nein
 OptionPaneDemo.component_op3=Vielleicht
@@ -414,28 +414,28 @@ OptionPaneDemo.component_op5=Abbrechen
 
 OptionPaneDemo.component_r1=Optimistisch und positiv! Das ist gut.
 OptionPaneDemo.component_r2=Definitiv nicht. Da haben Sie ganz recht.
-OptionPaneDemo.component_r3=<html><font color=black> Ja, momentan ist die Situation <br> noch ungekl\u00E4rt. Sagen Sie sp\u00E4ter Bescheid, wenn Sie es genau wissen.</font></html>
-OptionPaneDemo.component_r4=<html><font color=black>Sie wollen doch "Ja" sagen. Sie h\u00E4tten sich <br> einfach darauf einlassen und "Ja" klicken sollen.</font></html>
+OptionPaneDemo.component_r3=<html><font color=black> Ja, momentan ist die Situation <br> noch ungeklärt. Sagen Sie später Bescheid, wenn Sie es genau wissen.</font></html>
+OptionPaneDemo.component_r4=<html><font color=black>Sie wollen doch "Ja" sagen. Sie hätten sich <br> einfach darauf einlassen und "Ja" klicken sollen.</font></html>
 
 ### ProgressBar Demo ###
 
-ProgressBarDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JProgressBar-Komponente.
+ProgressBarDemo.accessible_description=Diese Demo zeigt ein Beispiel für die Verwendung der JProgressBar-Komponente.
 ProgressBarDemo.tooltip=JProgressBar-Demo
 ProgressBarDemo.name=ProgressBar-Demo
 ProgressBarDemo.start_button=Laden von Text starten
 ProgressBarDemo.stop_button=Laden von Text stoppen
-ProgressBarDemo.accessible_text_loading_progress=Ladefortschritt f\u00FCr Text
+ProgressBarDemo.accessible_text_loading_progress=Ladefortschritt für Text
 ProgressBarDemo.accessible_text_area_name=Text wird progressiv geladen
 
-ProgressBarDemo.accessible_text_area_description=Diese JTextArea-Komponente wird progressiv mit Text aus einem Puffer gef\u00FCllt (ein Buchstabe nach dem anderen). Dabei wird der Ladefortschritt im Fortschrittsbalken unten im Fenster angezeigt
+ProgressBarDemo.accessible_text_area_description=Diese JTextArea-Komponente wird progressiv mit Text aus einem Puffer gefüllt (ein Buchstabe nach dem anderen). Dabei wird der Ladefortschritt im Fortschrittsbalken unten im Fenster angezeigt
 
-ProgressBarDemo.text=Man sagt ja, dass unendlich viele Affen, die unendlich lange auf unendlich vielen Schreibmaschinen herumtippen, \nirgendwann alle Meisterwerke der Menschheit schreiben w\u00FCrden. Mit den modernen Hochgeschwindigkeitsrechnern k\u00F6nnen wir \ndiese Theorie endlich testen... \n\n\tLzskd jfy 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4, th;qxhz d7yty; \n\tQ0hnlj 23&&^ (# ljask djf y92y; fy92y; Sd6y ty;q2h nl jk la gfa harvin garvel\n\tlasdfsd a83sl la8z ks8l 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4,\n\tth;qxhz d7yty; Q0hnlj 23&&^ nknod mrs88 jsd79lfm#%$JLaoz6df  lso7dj f2 jfls\n\t67d9ol1@2fou99s  1lkj2 @l.k1  2; a89o7aljf  1l3i7ou8 d8l3 lqwerty0092 #1!\n\tja9o do8lkjj139rojsd9**!l6*hd # ljasd78 l2awkjad78  3ol7asljf 3 ldif && l.js\n\tLl ls ewan la8uj 23lll7u 8l  3h hhxx8 8d  lsd fixx 891lkjno99sl d8l@@@!!8#8\n\tdfoil jarooda mklaoorj nowai the smisthliylka jkdlfjiw ladajadra lthhheeejfjl\n\tdkddooolda bub mirznod of the koojgaf!! But 2 be or not to be... that is the\n\tquestion. Then when shall we three meet again In thunder, lightning, or in\n\train? When the hurlyburly's done, When the battle's lost and won. That will\n\tbe ere the set of sun. Where the place? Upon the heath. There to meet with\n\tMacbeth. But hath forth not to want.....  a banana, or to be.... a banana.\n\tBanana, I knew him banana. Banana banana. Banana banana banana banana.\n\n\n\n\nNun, das war scheinbar eine gute Idee...
+ProgressBarDemo.text=Man sagt ja, dass unendlich viele Affen, die unendlich lange auf unendlich vielen Schreibmaschinen herumtippen, \nirgendwann alle Meisterwerke der Menschheit schreiben würden. Mit den modernen Hochgeschwindigkeitsrechnern können wir \ndiese Theorie endlich testen... \n\n\tLzskd jfy 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4, th;qxhz d7yty; \n\tQ0hnlj 23&&^ (# ljask djf y92y; fy92y; Sd6y ty;q2h nl jk la gfa harvin garvel\n\tlasdfsd a83sl la8z ks8l 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4,\n\tth;qxhz d7yty; Q0hnlj 23&&^ nknod mrs88 jsd79lfm#%$JLaoz6df  lso7dj f2 jfls\n\t67d9ol1@2fou99s  1lkj2 @l.k1  2; a89o7aljf  1l3i7ou8 d8l3 lqwerty0092 #1!\n\tja9o do8lkjj139rojsd9**!l6*hd # ljasd78 l2awkjad78  3ol7asljf 3 ldif && l.js\n\tLl ls ewan la8uj 23lll7u 8l  3h hhxx8 8d  lsd fixx 891lkjno99sl d8l@@@!!8#8\n\tdfoil jarooda mklaoorj nowai the smisthliylka jkdlfjiw ladajadra lthhheeejfjl\n\tdkddooolda bub mirznod of the koojgaf!! But 2 be or not to be... that is the\n\tquestion. Then when shall we three meet again In thunder, lightning, or in\n\train? When the hurlyburly's done, When the battle's lost and won. That will\n\tbe ere the set of sun. Where the place? Upon the heath. There to meet with\n\tMacbeth. But hath forth not to want.....  a banana, or to be.... a banana.\n\tBanana, I knew him banana. Banana banana. Banana banana banana banana.\n\n\n\n\nNun, das war scheinbar eine gute Idee...
 
 
 ### ScrollPane Demo ###
 
 ScrollPaneDemo.accessible_description=JScrollPane-Demo
-ScrollPaneDemo.name=Demo f\u00FCr Bildlaufbereich
+ScrollPaneDemo.name=Demo für Bildlaufbereich
 ScrollPaneDemo.tooltip=JScrollPane-Demo
 ScrollPaneDemo.crayons=Viele Stifte
 ScrollPaneDemo.colheader=Spaltenheader
@@ -447,7 +447,7 @@ ScrollPaneDemo.lowerleft=Unten links im Spaltenheader
 
 ### Slider Demo ###
 
-SliderDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JSlider-Komponente.
+SliderDemo.accessible_description=Diese Demo zeigt ein Beispiel für die Verwendung der JSlider-Komponente.
 SliderDemo.tooltip=JSlider-Demo
 SliderDemo.name=Schiebereglerdemo
 
@@ -474,19 +474,19 @@ SplitPaneDemo.moon=Ein Astronaut auf dem Mond
 SplitPaneDemo.vert_split.labelAndMnemonic=&Vertikal geteilt
 SplitPaneDemo.horz_split.labelAndMnemonic=Ho&rizontal geteilt
 SplitPaneDemo.cont_layout.labelAndMnemonic=Kontinuierli&ches Layout
-SplitPaneDemo.one_touch_expandable.labelAndMnemonic=&Mit einer Ber\u00FChrung einblendbar
-SplitPaneDemo.divider_size.labelAndMnemonic=Trennliniengr\u00F6\u00DFe
-SplitPaneDemo.invalid_divider_size=Ung\u00FCltige Trennliniengr\u00F6\u00DFe
+SplitPaneDemo.one_touch_expandable.labelAndMnemonic=&Mit einer Berührung einblendbar
+SplitPaneDemo.divider_size.labelAndMnemonic=Trennliniengröße
+SplitPaneDemo.invalid_divider_size=Ungültige Trennliniengröße
 SplitPaneDemo.error=Fehler
-SplitPaneDemo.first_component_min_size.labelAndMnemonic=M&indestgr\u00F6\u00DFe der ersten Komponente
-SplitPaneDemo.second_component_min_size.labelAndMnemonic=Mi&ndestgr\u00F6\u00DFe der zweiten Komponente
-SplitPaneDemo.invalid_min_size=Ung\u00FCltige Mindestgr\u00F6\u00DFe
-SplitPaneDemo.must_be_greater_than=muss gr\u00F6\u00DFer sein als
+SplitPaneDemo.first_component_min_size.labelAndMnemonic=M&indestgröße der ersten Komponente
+SplitPaneDemo.second_component_min_size.labelAndMnemonic=Mi&ndestgröße der zweiten Komponente
+SplitPaneDemo.invalid_min_size=Ungültige Mindestgröße
+SplitPaneDemo.must_be_greater_than=muss größer sein als
 
 
 ### TabbedPane Demo ###
 
-TabbedPaneDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JTabbedPane-Komponente.
+TabbedPaneDemo.accessible_description=Diese Demo zeigt ein Beispiel für die Verwendung der JTabbedPane-Komponente.
 TabbedPaneDemo.tooltip=JTabbedPane-Demo
 TabbedPaneDemo.name=TabbedPane-Demo
 
@@ -523,9 +523,9 @@ TableDemo.intercell_spacing_colon=Abstand zwischen Zellen:
 TableDemo.last_column=Letzte Spalte
 TableDemo.multiple_ranges=Mehrere Bereiche
 TableDemo.one_range=Ein Bereich
-TableDemo.reordering_allowed=Neuanordnung zul\u00E4ssig
-TableDemo.row_height=Zeilenh\u00F6he
-TableDemo.row_height_colon=Zeilenh\u00F6he:
+TableDemo.reordering_allowed=Neuanordnung zulässig
+TableDemo.row_height=Zeilenhöhe
+TableDemo.row_height_colon=Zeilenhöhe:
 TableDemo.row_selection=Zeilenauswahl
 TableDemo.selection_mode=Auswahlmodus
 TableDemo.subsequent_columns=Nachfolgende Spalten
@@ -543,45 +543,45 @@ TableDemo.aqua=Aquamarin
 TableDemo.beige=Beige
 TableDemo.black=Schwarz
 TableDemo.blue=Blau
-TableDemo.cybergreen=Gr\u00FCn
-TableDemo.darkgreen=Dunkelgr\u00FCn
+TableDemo.cybergreen=Grün
+TableDemo.darkgreen=Dunkelgrün
 TableDemo.eblue=Neonblau
-TableDemo.jfcblue=JFC prim\u00E4r
-TableDemo.jfcblue2=JFC sekund\u00E4r
-TableDemo.forestgreen=Waldgr\u00FCn
+TableDemo.jfcblue=JFC primär
+TableDemo.jfcblue2=JFC sekundär
+TableDemo.forestgreen=Waldgrün
 TableDemo.gray=Grau
-TableDemo.green=Gr\u00FCn
+TableDemo.green=Grün
 TableDemo.orange=Orange
 TableDemo.purple=Lila
 TableDemo.red=Rot
 TableDemo.rustred=Rostrot
 TableDemo.sunpurple=Purpur
 TableDemo.suspectpink=Pink
-TableDemo.turquoise=T\u00FCrkis
+TableDemo.turquoise=Türkis
 TableDemo.violet=Violett
 TableDemo.yellow=Gelb
 TableDemo.2001=2001: Odyssee im Weltraum
 TableDemo.buckaroo=Buckaroo Banzai - Die 8. Dimension
 TableDemo.firstsight=Auf den ersten Blick
-TableDemo.airplane=Die unglaubliche Reise in einem verr\u00FCckten Flugzeug (und Fortsetzung)
-TableDemo.aliens=Aliens - Die R\u00FCckkehr
+TableDemo.airplane=Die unglaubliche Reise in einem verrückten Flugzeug (und Fortsetzung)
+TableDemo.aliens=Aliens - Die Rückkehr
 TableDemo.bicycle=Fahrraddiebe
 TableDemo.bladerunner=Blade Runner (Director's Cut)
 TableDemo.bluesbros=Blues Brothers
 TableDemo.brazil=Brazil
-TableDemo.bugs=Das gro\u00DFe Krabbeln
+TableDemo.bugs=Das große Krabbeln
 TableDemo.city=Die Stadt der verlorenen Kinder
 TableDemo.chusingura=Chusingura (1962)
 TableDemo.clock=Uhrwerk Orange
-TableDemo.curse=Der Fluch des D\u00E4monen
+TableDemo.curse=Der Fluch des Dämonen
 TableDemo.dasboot=Das Boot
 TableDemo.dazed=Confusion - Sommer der Ausgeflippten
 TableDemo.defending=Rendezvous im Jenseits
 TableDemo.eraserhead=Eraserhead
-TableDemo.fifthelement=Das f\u00FCnfte Element
+TableDemo.fifthelement=Das fünfte Element
 TableDemo.goodfellas=GoodFellas - Drei Jahrzehnte in der Mafia
 TableDemo.harold=Harold und Maude
-TableDemo.joyluck=T\u00F6chter des Himmels
+TableDemo.joyluck=Töchter des Himmels
 TableDemo.jules=Jules und Jim
 TableDemo.ladyvanishes=Eine Dame verschwindet
 TableDemo.mohicans=Der letzte Mohikaner
@@ -591,14 +591,14 @@ TableDemo.musicman=Music Man
 TableDemo.dog=Mein Leben als Hund
 TableDemo.oncewest=Spiel mir das Lied vom Tod
 TableDemo.pulpfiction=Pulp Fiction
-TableDemo.raiders=J\u00E4ger des verlorenen Schatzes
+TableDemo.raiders=Jäger des verlorenen Schatzes
 TableDemo.reservoir=Reservoir Dogs - Wilde Hunde
 TableDemo.repoman=Repoman
 TableDemo.spinaltap=This is Spinal Tap
 TableDemo.schindlerslist=Schindlers Liste
 TableDemo.starwars=Star Wars
 TableDemo.stuntman=Der lange Tod des Stuntman Cameron
-TableDemo.thinman=Der d\u00FCnne Mann
+TableDemo.thinman=Der dünne Mann
 TableDemo.withnail=Withnail && I
 TableDemo.labyrinth=Die Reise ins Labyrinth
 TableDemo.shawshank=Die Verurteilten
@@ -619,7 +619,7 @@ TableDemo.pepper=Rote Paprika
 TableDemo.pickle=Essiggurke
 TableDemo.pineapple=Ananas
 TableDemo.raspberry=Himbeere
-TableDemo.sparegrass=Gr\u00FCnzeug
+TableDemo.sparegrass=Grünzeug
 TableDemo.strawberry=Erdbeere
 TableDemo.tomato=Tomate
 TableDemo.watermelon=Wassermelone
@@ -653,21 +653,21 @@ TableDemo.printingFailed=Druck nicht erfolgreich: {0}
 
 ### ToolTip Demo ###
 
-ToolTipDemo.accessible_description=QuickInfos zeigen kurze Hilfebeschreibungen f\u00FCr eine Komponente an
+ToolTipDemo.accessible_description=QuickInfos zeigen kurze Hilfebeschreibungen für eine Komponente an
 ToolTipDemo.accessible_cow=Das ist eine Kuh.
 ToolTipDemo.tooltip=QuickInfo-Demo
 ToolTipDemo.name=QuickInfo-Demo
 ToolTipDemo.bessie=Bessie, die Kuh
 ToolTipDemo.cow=Kuh.
-ToolTipDemo.got_milk=Milch gef\u00E4llig?
+ToolTipDemo.got_milk=Milch gefällig?
 ToolTipDemo.tail=Schweif.
 ToolTipDemo.moo=Muuuh
-ToolTipDemo.tooltip_features=<html>QuickInfos m\u00FCssen nicht immer<p>langweilige, einzeilige Beschreibungen sein. Das <font color=blue size=+2>Swing!</font>-Team<p> zeigt Ihnen gerne, dass es auch anders geht.<p>In Swing k\u00F6nnen QuickInfos HTML f\u00FCr Folgendes verwenden: <ul><li>Listen<li><b>fettgedruckten</b> Text<li><em>betonten</em> Text<li>Text mit <font color=red>Farben</font><li>Text in unterschiedlichen <font size=+3>Gr\u00F6\u00DFen</font><li>und <font face=AvantGarde>Schriftarten</font></ul>Au\u00DFerdem k\u00F6nnen sie auch mehrere Zeilen umfassen.</html>
+ToolTipDemo.tooltip_features=<html>QuickInfos müssen nicht immer<p>langweilige, einzeilige Beschreibungen sein. Das <font color=blue size=+2>Swing!</font>-Team<p> zeigt Ihnen gerne, dass es auch anders geht.<p>In Swing können QuickInfos HTML für Folgendes verwenden: <ul><li>Listen<li><b>fettgedruckten</b> Text<li><em>betonten</em> Text<li>Text mit <font color=red>Farben</font><li>Text in unterschiedlichen <font size=+3>Größen</font><li>und <font face=AvantGarde>Schriftarten</font></ul>Außerdem können sie auch mehrere Zeilen umfassen.</html>
 
 
 ### Tree Demo ###
 
-TreeDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung einer JTree-Komponente.
+TreeDemo.accessible_description=Diese Demo zeigt ein Beispiel für die Verwendung einer JTree-Komponente.
 TreeDemo.tooltip=JTree-Demo
 TreeDemo.name=Baumdemo
 TreeDemo.music=Musik
diff --git a/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties b/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties
index 77f97e56266..f2bdd246248 100644
--- a/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties
+++ b/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties
@@ -39,21 +39,21 @@
 
 ### About Box ###
 
-AboutBox.title=Swing\u306B\u3064\u3044\u3066
+AboutBox.title=Swingについて
 AboutBox.ok_button_text=OK
 AboutBox.accessible_description=Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 
 ### Source Code ###
-SourceCode.loading=<html><body bgcolor="#ffffff">\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306E\u8AAD\u8FBC\u307F\u304A\u3088\u3073\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u4E2D\u3067\u3059\u3002\u5C11\u3005\u304A\u5F85\u3061\u304F\u3060\u3055\u3044...</body></html>
+SourceCode.loading=<html><body bgcolor="#ffffff">ソース・コードの読込みおよびフォーマット中です。少々お待ちください...</body></html>
 
 ### Status ###
 
-Status.loading=\u8AAD\u8FBC\u307F\u4E2D:
-Status.popupMenuAccessible=Shift+F10: \u30DD\u30C3\u30D7\u30A2\u30C3\u30D7\u30FB\u30E1\u30CB\u30E5\u30FC\u306E\u6709\u52B9\u5316
+Status.loading=読込み中:
+Status.popupMenuAccessible=Shift+F10: ポップアップ・メニューの有効化
 
 ### Menu Bar ###
 
-MenuBar.accessible_description=Swing\u30C7\u30E2\u30FB\u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC
+MenuBar.accessible_description=Swingデモ・メニュー・バー
 
 
 ### Frame ###
@@ -63,119 +63,119 @@ Frame.title=SwingSet2
 
 ### Tabbed Pane ###
 
-TabbedPane.src.labelAndMnemonic=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9
-TabbedPane.src_tooltip=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306E\u53C2\u7167
+TabbedPane.src.labelAndMnemonic=ソース・コード
+TabbedPane.src_tooltip=ソース・コードの参照
 
 
 ### Look & Feel Menu ###
 
-LafMenu.laf.labelAndMnemonic=\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB(&L)
-LafMenu.laf_accessible_description=\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB\u3092\u5207\u308A\u66FF\u3048\u3089\u308C\u308B\u30E1\u30CB\u30E5\u30FC
+LafMenu.laf.labelAndMnemonic=ルック&&フィール(&L)
+LafMenu.laf_accessible_description=ルック&&フィールを切り替えられるメニュー
 
-LafMenu.java.labelAndMnemonic=Java\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB(&J)
-LafMenu.java_accessible_description=Java\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB
+LafMenu.java.labelAndMnemonic=Javaルック&&フィール(&J)
+LafMenu.java_accessible_description=Javaルック&&フィール
 
-LafMenu.nimbus.labelAndMnemonic=Nimbus\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB(&N)
-LafMenu.nimbus_accessible_description=Nimbus\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB
+LafMenu.nimbus.labelAndMnemonic=Nimbusルック&&フィール(&N)
+LafMenu.nimbus_accessible_description=Nimbusルック&&フィール
 
-LafMenu.mac.labelAndMnemonic=Mac OS X\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB(&M)
-LafMenu.mac_accessible_description=Mac OS X\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB
+LafMenu.mac.labelAndMnemonic=Mac OS Xルック&&フィール(&M)
+LafMenu.mac_accessible_description=Mac OS Xルック&&フィール
 
-LafMenu.motif.labelAndMnemonic=Motif\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB(&O)
-LafMenu.motif_accessible_description=Motif\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB
+LafMenu.motif.labelAndMnemonic=Motifルック&&フィール(&O)
+LafMenu.motif_accessible_description=Motifルック&&フィール
 
-LafMenu.windows.labelAndMnemonic=Windows\u30B9\u30BF\u30A4\u30EB\u30FB\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB(&W)
-LafMenu.windows_accessible_description=Windows\u30B9\u30BF\u30A4\u30EB\u30FB\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB
+LafMenu.windows.labelAndMnemonic=Windowsスタイル・ルック&&フィール(&W)
+LafMenu.windows_accessible_description=Windowsスタイル・ルック&&フィール
 
-LafMenu.gtk.labelAndMnemonic=GTK\u30B9\u30BF\u30A4\u30EB\u30FB\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB(&G)
-LafMenu.gtk_accessible_description=GTK\u30B9\u30BF\u30A4\u30EB\u30FB\u30EB\u30C3\u30AF&&\u30D5\u30A3\u30FC\u30EB
+LafMenu.gtk.labelAndMnemonic=GTKスタイル・ルック&&フィール(&G)
+LafMenu.gtk_accessible_description=GTKスタイル・ルック&&フィール
 
 
 ### Themes Menu ###
 
-ThemesMenu.themes.labelAndMnemonic=\u30C6\u30FC\u30DE(&T)
-ThemesMenu.themes_accessible_description=Metal\u30C6\u30FC\u30DE\u306E\u30AB\u30E9\u30FC\u5207\u66FF\u3048\u30E1\u30CB\u30E5\u30FC
+ThemesMenu.themes.labelAndMnemonic=テーマ(&T)
+ThemesMenu.themes_accessible_description=Metalテーマのカラー切替えメニュー
 
-ThemesMenu.aqua.labelAndMnemonic=\u30A2\u30AF\u30A2(&Q)
-ThemesMenu.aqua_accessible_description=\u9752\u7DD1\u3092\u57FA\u8ABF\u3068\u3057\u305FMetal\u30C6\u30FC\u30DE
+ThemesMenu.aqua.labelAndMnemonic=アクア(&Q)
+ThemesMenu.aqua_accessible_description=青緑を基調としたMetalテーマ
 
-ThemesMenu.charcoal.labelAndMnemonic=\u30C1\u30E3\u30B3\u30FC\u30EB(&C)
-ThemesMenu.charcoal_accessible_description=\u30C0\u30FC\u30AF\u30FB\u30B0\u30EC\u30FC\u3092\u57FA\u8ABF\u3068\u3057\u305FMetal\u30C6\u30FC\u30DE
+ThemesMenu.charcoal.labelAndMnemonic=チャコール(&C)
+ThemesMenu.charcoal_accessible_description=ダーク・グレーを基調としたMetalテーマ
 
-ThemesMenu.contrast.labelAndMnemonic=\u30CF\u30A4\u30FB\u30B3\u30F3\u30C8\u30E9\u30B9\u30C8(&H)
-ThemesMenu.contrast_accessible_description=\u30CF\u30A4\u30FB\u30B3\u30F3\u30C8\u30E9\u30B9\u30C8\u306E\u30C6\u30FC\u30DE
+ThemesMenu.contrast.labelAndMnemonic=ハイ・コントラスト(&H)
+ThemesMenu.contrast_accessible_description=ハイ・コントラストのテーマ
 
-ThemesMenu.ocean.labelAndMnemonic=\u30AA\u30FC\u30B7\u30E3\u30F3(&O)
-ThemesMenu.ocean_accessible_description=\u30AA\u30FC\u30B7\u30E3\u30F3\u306EMetal\u30C6\u30FC\u30DE
+ThemesMenu.ocean.labelAndMnemonic=オーシャン(&O)
+ThemesMenu.ocean_accessible_description=オーシャンのMetalテーマ
 
-ThemesMenu.steel.labelAndMnemonic=\u30B9\u30C1\u30FC\u30EB(&S)
-ThemesMenu.steel_accessible_description=\u9752\u7D2B\u306EMetal\u30C6\u30FC\u30DE
+ThemesMenu.steel.labelAndMnemonic=スチール(&S)
+ThemesMenu.steel_accessible_description=青紫のMetalテーマ
 
-ThemesMenu.emerald.labelAndMnemonic=\u30A8\u30E1\u30E9\u30EB\u30C9(&E)
-ThemesMenu.emerald_accessible_description=\u7DD1\u3092\u57FA\u8ABF\u3068\u3057\u305FMetal\u30C6\u30FC\u30DE
+ThemesMenu.emerald.labelAndMnemonic=エメラルド(&E)
+ThemesMenu.emerald_accessible_description=緑を基調としたMetalテーマ
 
-ThemesMenu.ruby.labelAndMnemonic=\u30EB\u30D3\u30FC(&R)
-ThemesMenu.ruby_accessible_description=\u8D64\u3092\u57FA\u8ABF\u3068\u3057\u305FMetal\u30C6\u30FC\u30DE
+ThemesMenu.ruby.labelAndMnemonic=ルビー(&R)
+ThemesMenu.ruby_accessible_description=赤を基調としたMetalテーマ
 
 
 ### Font SubMenu (under Themes)
-FontMenu.fonts.labelAndMnemonic=\u30D5\u30A9\u30F3\u30C8(&F)
-FontMenu.fonts_accessible_description=Java\u30EB\u30C3\u30AF&\u30D5\u30A3\u30FC\u30EB\u7528\u306E\u30D5\u30A9\u30F3\u30C8\u9078\u629E\u30E1\u30CB\u30E5\u30FC
+FontMenu.fonts.labelAndMnemonic=フォント(&F)
+FontMenu.fonts_accessible_description=Javaルック&フィール用のフォント選択メニュー
 
-FontMenu.bold.labelAndMnemonic=\u592A\u5B57(&B)
-FontMenu.bold_accessible_description=Java\u30EB\u30C3\u30AF&\u30D5\u30A3\u30FC\u30EB\u306B\u592A\u5B57\u30D5\u30A9\u30F3\u30C8\u3092\u4F7F\u7528\u3057\u307E\u3059
+FontMenu.bold.labelAndMnemonic=太字(&B)
+FontMenu.bold_accessible_description=Javaルック&フィールに太字フォントを使用します
 
-FontMenu.plain.labelAndMnemonic=\u30D7\u30EC\u30FC\u30F3(&P)
-FontMenu.plain_accessible_description=Java\u30EB\u30C3\u30AF&\u30D5\u30A3\u30FC\u30EB\u306B\u30D7\u30EC\u30FC\u30F3\u30FB\u30D5\u30A9\u30F3\u30C8\u3092\u4F7F\u7528\u3057\u307E\u3059
+FontMenu.plain.labelAndMnemonic=プレーン(&P)
+FontMenu.plain_accessible_description=Javaルック&フィールにプレーン・フォントを使用します
 
 
 ### Audio SubMenu (under Themes) ###
 
-AudioMenu.audio.labelAndMnemonic=\u30AA\u30FC\u30C7\u30A3\u30AA(&A)
-AudioMenu.audio_accessible_description=Java\u30EB\u30C3\u30AF&\u30D5\u30A3\u30FC\u30EB\u5185\u3067\u306E\u52B9\u679C\u97F3\u306E\u5207\u66FF\u3048\u30E1\u30CB\u30E5\u30FC
+AudioMenu.audio.labelAndMnemonic=オーディオ(&A)
+AudioMenu.audio_accessible_description=Javaルック&フィール内での効果音の切替えメニュー
 
-AudioMenu.on.labelAndMnemonic=\u6642\u9593(&O)
-AudioMenu.on_accessible_description=Java\u30EB\u30C3\u30AF&\u30D5\u30A3\u30FC\u30EB\u306E\u3059\u3079\u3066\u306E\u52B9\u679C\u97F3\u3092\u30AA\u30F3\u306B\u3057\u307E\u3059
+AudioMenu.on.labelAndMnemonic=時間(&O)
+AudioMenu.on_accessible_description=Javaルック&フィールのすべての効果音をオンにします
 
-AudioMenu.default.labelAndMnemonic=\u30C7\u30D5\u30A9\u30EB\u30C8(&D)
-AudioMenu.default_accessible_description=Java\u30EB\u30C3\u30AF&\u30D5\u30A3\u30FC\u30EB\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u52B9\u679C\u97F3\u306E\u8A2D\u5B9A\u306B\u623B\u3057\u307E\u3059
+AudioMenu.default.labelAndMnemonic=デフォルト(&D)
+AudioMenu.default_accessible_description=Javaルック&フィールのデフォルトの効果音の設定に戻します
 
-AudioMenu.off.labelAndMnemonic=\u30AA\u30D5(&F)
-AudioMenu.off_accessible_description=Java\u30EB\u30C3\u30AF&\u30D5\u30A3\u30FC\u30EB\u306E\u3059\u3079\u3066\u306E\u52B9\u679C\u97F3\u3092\u30AA\u30D5\u306B\u3057\u307E\u3059
+AudioMenu.off.labelAndMnemonic=オフ(&F)
+AudioMenu.off_accessible_description=Javaルック&フィールのすべての効果音をオフにします
 
 ### Options Menu ###
 
-OptionsMenu.options.labelAndMnemonic=\u30AA\u30D7\u30B7\u30E7\u30F3(&P)
-OptionsMenu.options_accessible_description=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E\u30E1\u30CB\u30E5\u30FC
+OptionsMenu.options.labelAndMnemonic=オプション(&P)
+OptionsMenu.options_accessible_description=オプションの選択メニュー
 
-OptionsMenu.tooltip.labelAndMnemonic=\u30C4\u30FC\u30EB\u30FB\u30C1\u30C3\u30D7\u306E\u6709\u52B9\u5316(&T)
-OptionsMenu.tooltip_accessible_description=\u30C4\u30FC\u30EB\u30FB\u30C1\u30C3\u30D7\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059
+OptionsMenu.tooltip.labelAndMnemonic=ツール・チップの有効化(&T)
+OptionsMenu.tooltip_accessible_description=ツール・チップを有効または無効にします
 
-OptionsMenu.dragEnabled.labelAndMnemonic=\u30C9\u30E9\u30C3\u30B0\u306E\u6709\u52B9\u5316(&D)
-OptionsMenu.dragEnabled_accessible_description=\u30C9\u30E9\u30C3\u30B0\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059
+OptionsMenu.dragEnabled.labelAndMnemonic=ドラッグの有効化(&D)
+OptionsMenu.dragEnabled_accessible_description=ドラッグを有効または無効にします
 
 ### File Menu ###
 
-FileMenu.file.labelAndMnemonic=\u30D5\u30A1\u30A4\u30EB(&F)
-FileMenu.accessible_description=\u30D5\u30A1\u30A4\u30EB\u30FB\u30E1\u30CB\u30E5\u30FC
-FileMenu.about.labelAndMnemonic=\u60C5\u5831(&B)
-FileMenu.about_accessible_description=SwingSet2\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u8A73\u7D30\u3092\u78BA\u8A8D\u3057\u307E\u3059
-FileMenu.open.labelAndMnemonic=\u958B\u304F(&O)
-FileMenu.open_accessible_description=\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F\u305F\u3081\u306E\u30E1\u30CB\u30E5\u30FC\u9805\u76EE
-FileMenu.save.labelAndMnemonic=\u4FDD\u5B58(&S)
-FileMenu.save_accessible_description=\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3059\u308B\u305F\u3081\u306E\u30E1\u30CB\u30E5\u30FC\u9805\u76EE
-FileMenu.save_as.labelAndMnemonic=\u5225\u540D\u4FDD\u5B58(&A)...
-FileMenu.save_as_accessible_description=\u30D5\u30A1\u30A4\u30EB\u3092\u5225\u540D\u4FDD\u5B58\u3059\u308B\u305F\u3081\u306E\u30E1\u30CB\u30E5\u30FC\u9805\u76EE
-FileMenu.exit.labelAndMnemonic=\u7D42\u4E86(&X)
-FileMenu.exit_accessible_description=SwingSet2\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u7D42\u4E86\u3057\u307E\u3059
+FileMenu.file.labelAndMnemonic=ファイル(&F)
+FileMenu.accessible_description=ファイル・メニュー
+FileMenu.about.labelAndMnemonic=情報(&B)
+FileMenu.about_accessible_description=SwingSet2アプリケーションの詳細を確認します
+FileMenu.open.labelAndMnemonic=開く(&O)
+FileMenu.open_accessible_description=ファイルを開くためのメニュー項目
+FileMenu.save.labelAndMnemonic=保存(&S)
+FileMenu.save_accessible_description=ファイルを保存するためのメニュー項目
+FileMenu.save_as.labelAndMnemonic=別名保存(&A)...
+FileMenu.save_as_accessible_description=ファイルを別名保存するためのメニュー項目
+FileMenu.exit.labelAndMnemonic=終了(&X)
+FileMenu.exit_accessible_description=SwingSet2アプリケーションを終了します
 
 ### Multi-Screen menu ###
-MultiMenu.multi.labelAndMnemonic=\u30B9\u30AF\u30EA\u30FC\u30F3\u30FB\u30E2\u30FC\u30C9(&M)
-MultiMenu.multi_accessible_description=\u30B9\u30AF\u30EA\u30FC\u30F3\u30FB\u30E1\u30CB\u30E5\u30FC
-MultiMenu.all.labelAndMnemonic=\u30DE\u30EB\u30C1\u30FB\u30B9\u30AF\u30EA\u30FC\u30F3(&A)
-MultiMenu.all_accessible_description=SwingSet2\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u3059\u3079\u3066\u306E\u30B9\u30AF\u30EA\u30FC\u30F3\u306B\u4F5C\u6210\u3057\u307E\u3059
-MultiMenu.single.labelAndMnemonic=\u30B7\u30F3\u30B0\u30EB\u30FB\u30B9\u30AF\u30EA\u30FC\u30F3
-MultiMenu.single_accessible_description=SwingSet2\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u30921\u3064\u306E\u30B9\u30AF\u30EA\u30FC\u30F3\u306B\u4F5C\u6210\u3057\u307E\u3059
+MultiMenu.multi.labelAndMnemonic=スクリーン・モード(&M)
+MultiMenu.multi_accessible_description=スクリーン・メニュー
+MultiMenu.all.labelAndMnemonic=マルチ・スクリーン(&A)
+MultiMenu.all_accessible_description=SwingSet2のウィンドウをすべてのスクリーンに作成します
+MultiMenu.single.labelAndMnemonic=シングル・スクリーン
+MultiMenu.single_accessible_description=SwingSet2のウィンドウを1つのスクリーンに作成します
 
 
 ################################
@@ -184,31 +184,31 @@ MultiMenu.single_accessible_description=SwingSet2\u306E\u30A6\u30A3\u30F3\u30C9\
 
 ### Button Demo ###
 
-ButtonDemo.accessible_description=ButtonDemo\u3067\u306F\u3001JButton\u3001JRadioButton\u3001JToggleButton\u304A\u3088\u3073JCheckBox\u306E\u4F7F\u7528\u4F8B\u3092\u7D39\u4ECB\u3057\u307E\u3059
-ButtonDemo.tooltip=JButton\u3001JRadioButton\u3001JToggleButton\u3001JCheckbox\u30C7\u30E2
-ButtonDemo.name=Button\u30C7\u30E2
+ButtonDemo.accessible_description=ButtonDemoでは、JButton、JRadioButton、JToggleButtonおよびJCheckBoxの使用例を紹介します
+ButtonDemo.tooltip=JButton、JRadioButton、JToggleButton、JCheckboxデモ
+ButtonDemo.name=Buttonデモ
 
-ButtonDemo.buttons=\u30DC\u30BF\u30F3
-ButtonDemo.checkboxes=\u30C1\u30A7\u30C3\u30AF\u30FB\u30DC\u30C3\u30AF\u30B9
-ButtonDemo.radiobuttons=\u30E9\u30B8\u30AA\u30FB\u30DC\u30BF\u30F3
-ButtonDemo.togglebuttons=\u30C8\u30B0\u30EB\u30FB\u30DC\u30BF\u30F3
+ButtonDemo.buttons=ボタン
+ButtonDemo.checkboxes=チェック・ボックス
+ButtonDemo.radiobuttons=ラジオ・ボタン
+ButtonDemo.togglebuttons=トグル・ボタン
 
-ButtonDemo.textbuttons=\u30C6\u30AD\u30B9\u30C8\u30FB\u30DC\u30BF\u30F3
-ButtonDemo.imagebuttons=\u30A4\u30E1\u30FC\u30B8\u30FB\u30DC\u30BF\u30F3
-ButtonDemo.textradiobuttons=\u30C6\u30AD\u30B9\u30C8\u30FB\u30E9\u30B8\u30AA\u30FB\u30DC\u30BF\u30F3
-ButtonDemo.imageradiobuttons=\u30A4\u30E1\u30FC\u30B8\u30FB\u30E9\u30B8\u30AA\u30FB\u30DC\u30BF\u30F3
-ButtonDemo.texttogglebuttons=\u30C6\u30AD\u30B9\u30C8\u30FB\u30C8\u30B0\u30EB\u30FB\u30DC\u30BF\u30F3
-ButtonDemo.imagetogglebuttons=\u30A4\u30E1\u30FC\u30B8\u30FB\u30C8\u30B0\u30EB\u30FB\u30DC\u30BF\u30F3
-ButtonDemo.textcheckboxes=\u30C6\u30AD\u30B9\u30C8\u30FB\u30C1\u30A7\u30C3\u30AF\u30FB\u30DC\u30C3\u30AF\u30B9
-ButtonDemo.imagecheckboxes=\u30A4\u30E1\u30FC\u30B8\u30FB\u30C1\u30A7\u30C3\u30AF\u30FB\u30DC\u30C3\u30AF\u30B9
+ButtonDemo.textbuttons=テキスト・ボタン
+ButtonDemo.imagebuttons=イメージ・ボタン
+ButtonDemo.textradiobuttons=テキスト・ラジオ・ボタン
+ButtonDemo.imageradiobuttons=イメージ・ラジオ・ボタン
+ButtonDemo.texttogglebuttons=テキスト・トグル・ボタン
+ButtonDemo.imagetogglebuttons=イメージ・トグル・ボタン
+ButtonDemo.textcheckboxes=テキスト・チェック・ボックス
+ButtonDemo.imagecheckboxes=イメージ・チェック・ボックス
 
 ButtonDemo.button1=1
 ButtonDemo.button2=2
 ButtonDemo.button3=<html><font size=2 color=red><bold>3</font></html>
 
-ButtonDemo.radio1=\u30DC\u30BF\u30F31
-ButtonDemo.radio2=\u30DC\u30BF\u30F32
-ButtonDemo.radio3=\u30DC\u30BF\u30F33
+ButtonDemo.radio1=ボタン1
+ButtonDemo.radio2=ボタン2
+ButtonDemo.radio3=ボタン3
 ButtonDemo.radioX=<html><font size=2 color=red>3<bold>(HTML)</bold></font></html>
 
 ButtonDemo.check1=1
@@ -216,458 +216,458 @@ ButtonDemo.check2=2
 ButtonDemo.check3=3
 ButtonDemo.checkX=<html><font size=2 color=red>3<bold>(HTML)</bold></font></html>
 
-ButtonDemo.customradio=\u30AB\u30B9\u30BF\u30E0\u306E"\u30E1\u30BF\u30EA\u30C3\u30AF\u8ABF"\u30E9\u30B8\u30AA\u30FB\u30DC\u30BF\u30F3
-ButtonDemo.customcheck=\u30AB\u30B9\u30BF\u30E0\u306E\u96FB\u7403\u30C1\u30A7\u30C3\u30AF\u30FB\u30DC\u30C3\u30AF\u30B9
-
-ButtonDemo.phone=\u96FB\u8A71
-ButtonDemo.write=\u66F8\u8FBC\u307F
-ButtonDemo.peace=\u30D4\u30FC\u30B9
-
-ButtonDemo.controlpanel.labelAndMnemonic=\u8868\u793A\u30AA\u30D7\u30B7\u30E7\u30F3:
-ButtonDemo.paintborder.labelAndMnemonic=\u30DC\u30FC\u30C0\u30FC\u8868\u793A(&B)
-ButtonDemo.paintborder_tooltip=\u3053\u3053\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u3001\u30DC\u30FC\u30C0\u30FC\u306E\u8868\u793A\u306E\u30AA\u30F3\u3068\u30AA\u30D5\u3092\u5207\u308A\u66FF\u3048\u307E\u3059\u3002
-ButtonDemo.paintfocus.labelAndMnemonic=\u30D5\u30A9\u30FC\u30AB\u30B9\u8868\u793A(&F)
-ButtonDemo.paintfocus_tooltip=\u3053\u3053\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u3001\u30D5\u30A9\u30FC\u30AB\u30B9\u306E\u8868\u793A\u306E\u30AA\u30F3\u3068\u30AA\u30D5\u3092\u5207\u308A\u66FF\u3048\u307E\u3059\u3002
-ButtonDemo.enabled.labelAndMnemonic=\u6709\u52B9(&E)
-ButtonDemo.enabled_tooltip=\u3053\u3053\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u3001\u30DC\u30BF\u30F3\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002
-ButtonDemo.contentfilled.labelAndMnemonic=\u30DA\u30A4\u30F3\u30C8(&I)
-ButtonDemo.contentfilled_tooltip=\u3053\u3053\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u3001\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30A8\u30EA\u30A2\u3092\u30DA\u30A4\u30F3\u30C8\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u9078\u629E\u3057\u307E\u3059\u3002
-
-ButtonDemo.padamount.labelAndMnemonic=\u4F59\u767D:
-ButtonDemo.default.labelAndMnemonic=\u30C7\u30D5\u30A9\u30EB\u30C8(&D)
-ButtonDemo.default_tooltip=\u30DC\u30FC\u30C0\u30FC\u304A\u3088\u3073\u30E9\u30D9\u30EB\u306E\u9593\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30D4\u30AF\u30BB\u30EB\u6570\u306E\u4F59\u767D\u3092\u5165\u308C\u307E\u3059\u3002
+ButtonDemo.customradio=カスタムの"メタリック調"ラジオ・ボタン
+ButtonDemo.customcheck=カスタムの電球チェック・ボックス
+
+ButtonDemo.phone=電話
+ButtonDemo.write=書込み
+ButtonDemo.peace=ピース
+
+ButtonDemo.controlpanel.labelAndMnemonic=表示オプション:
+ButtonDemo.paintborder.labelAndMnemonic=ボーダー表示(&B)
+ButtonDemo.paintborder_tooltip=ここをクリックして、ボーダーの表示のオンとオフを切り替えます。
+ButtonDemo.paintfocus.labelAndMnemonic=フォーカス表示(&F)
+ButtonDemo.paintfocus_tooltip=ここをクリックして、フォーカスの表示のオンとオフを切り替えます。
+ButtonDemo.enabled.labelAndMnemonic=有効(&E)
+ButtonDemo.enabled_tooltip=ここをクリックして、ボタンを有効または無効にします。
+ButtonDemo.contentfilled.labelAndMnemonic=ペイント(&I)
+ButtonDemo.contentfilled_tooltip=ここをクリックして、コンテンツ・エリアをペイントするかどうかを選択します。
+
+ButtonDemo.padamount.labelAndMnemonic=余白:
+ButtonDemo.default.labelAndMnemonic=デフォルト(&D)
+ButtonDemo.default_tooltip=ボーダーおよびラベルの間にデフォルトのピクセル数の余白を入れます。
 ButtonDemo.zero.labelAndMnemonic=&0
-ButtonDemo.zero_tooltip=\u30DC\u30FC\u30C0\u30FC\u304A\u3088\u3073\u30E9\u30D9\u30EB\u306E\u9593\u306B\u4F59\u767D\u3092\u5165\u308C\u307E\u305B\u3093\u3002
+ButtonDemo.zero_tooltip=ボーダーおよびラベルの間に余白を入れません。
 ButtonDemo.ten.labelAndMnemonic=&10
-ButtonDemo.ten_tooltip=\u30DC\u30FC\u30C0\u30FC\u304A\u3088\u3073\u30E9\u30D9\u30EB\u306E\u9593\u306B10\u30D4\u30AF\u30BB\u30EB\u306E\u4F59\u767D\u3092\u5165\u308C\u307E\u3059\u3002
+ButtonDemo.ten_tooltip=ボーダーおよびラベルの間に10ピクセルの余白を入れます。
 
-LayoutControlPanel.textposition.labelAndMnemonic=\u30C6\u30AD\u30B9\u30C8\u4F4D\u7F6E:
-LayoutControlPanel.contentalignment.labelAndMnemonic=\u30B3\u30F3\u30C6\u30F3\u30C4\u4F4D\u7F6E\u5408\u305B:
+LayoutControlPanel.textposition.labelAndMnemonic=テキスト位置:
+LayoutControlPanel.contentalignment.labelAndMnemonic=コンテンツ位置合せ:
 
 ### ColorChooser Demo ###
 
-ColorChooserDemo.accessible_description=ColorChooser\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u30D1\u30EC\u30C3\u30C8\u304B\u3089\u8272\u3092\u9078\u629E\u3057\u305F\u308A\u3001RGB\u5024\u307E\u305F\u306FHSB\u5024\u3092\u76F4\u63A5\u6307\u5B9A\u3067\u304D\u307E\u3059
-ColorChooserDemo.tooltip=JColorChooser\u30C7\u30E2
-ColorChooserDemo.name=ColorChooser\u30C7\u30E2
-ColorChooserDemo.chooser_title=\u8272\u306E\u9078\u629E
-ColorChooserDemo.background=\u80CC\u666F
-ColorChooserDemo.grad_a=\u30B0\u30E9\u30C7\u30FC\u30B7\u30E7\u30F3\u57FA\u672C\u82721
-ColorChooserDemo.grad_b=\u30B0\u30E9\u30C7\u30FC\u30B7\u30E7\u30F3\u57FA\u672C\u82722
-ColorChooserDemo.outer_line=\u5883\u754C\u7DDA
-ColorChooserDemo.cup=Java\u306E\u30C8\u30EC\u30FC\u30C9\u30DE\u30FC\u30AF\u3067\u3042\u308B\u30B3\u30FC\u30D2\u30FC\u30FB\u30AB\u30C3\u30D7\u306E\u30A4\u30E1\u30FC\u30B8
+ColorChooserDemo.accessible_description=ColorChooserを使用すると、パレットから色を選択したり、RGB値またはHSB値を直接指定できます
+ColorChooserDemo.tooltip=JColorChooserデモ
+ColorChooserDemo.name=ColorChooserデモ
+ColorChooserDemo.chooser_title=色の選択
+ColorChooserDemo.background=背景
+ColorChooserDemo.grad_a=グラデーション基本色1
+ColorChooserDemo.grad_b=グラデーション基本色2
+ColorChooserDemo.outer_line=境界線
+ColorChooserDemo.cup=Javaのトレードマークであるコーヒー・カップのイメージ
 
 ### ComboBox Demo ###
 
-ComboBoxDemo.accessible_description=\u3053\u306E\u30C7\u30E2\u3067\u306F\u3001JComboBox\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u4F7F\u7528\u4F8B\u3092\u7D39\u4ECB\u3057\u307E\u3059\u3002
-ComboBoxDemo.tooltip=JComboBox\u30C7\u30E2
-ComboBoxDemo.name=ComboBox\u30C7\u30E2
-
-ComboBoxDemo.hair=\u9AEA
-ComboBoxDemo.eyes=\u76EE
-ComboBoxDemo.mouth=\u53E3
-ComboBoxDemo.presets=\u30D7\u30EA\u30BB\u30C3\u30C8:
-
-ComboBoxDemo.preset1=\u30D5\u30A3\u30EA\u30C3\u30D7, \u30CF\u30EF\u30FC\u30C9, \u30B8\u30A7\u30D5
-ComboBoxDemo.preset2=\u30B8\u30A7\u30D5, \u30E9\u30EA\u30FC, \u30D5\u30A3\u30EA\u30C3\u30D7
-ComboBoxDemo.preset3=\u30CF\u30EF\u30FC\u30C9, \u30B9\u30B3\u30C3\u30C8, \u30CF\u30F3\u30B9
-ComboBoxDemo.preset4=\u30D5\u30A3\u30EA\u30C3\u30D7, \u30B8\u30A7\u30D5, \u30CF\u30F3\u30B9
-ComboBoxDemo.preset5=\u30D6\u30EC\u30F3\u30C8, \u30B8\u30E7\u30F3, \u30B9\u30B3\u30C3\u30C8
-ComboBoxDemo.preset6=\u30E9\u30E9, \u30E9\u30EA\u30FC, \u30EA\u30B5
-ComboBoxDemo.preset7=\u30B8\u30A7\u30FC\u30E0\u30B9 ,\u30D5\u30A3\u30EA\u30C3\u30D7, \u30DE\u30A4\u30B1\u30EB
-ComboBoxDemo.preset8=\u30D5\u30A3\u30EA\u30C3\u30D7, \u30EA\u30B5, \u30D6\u30EC\u30F3\u30C8
-ComboBoxDemo.preset9=\u30B8\u30A7\u30FC\u30E0\u30B9, \u30D5\u30A3\u30EA\u30C3\u30D7, \u30B8\u30E7\u30F3
-ComboBoxDemo.preset10=\u30E9\u30E9, \u30B8\u30E7\u30F3, \u30B9\u30B3\u30C3\u30C8
-
-
-ComboBoxDemo.hair_description=\u9AEA:
-ComboBoxDemo.eyes_description=\u76EE\u3068\u9F3B:
-ComboBoxDemo.mouth_description=\u53E3:
-
-ComboBoxDemo.amy=\u30A8\u30A4\u30DF\u30FC
-ComboBoxDemo.brent=\u30D6\u30EC\u30F3\u30C8
-ComboBoxDemo.georges=\u30B8\u30E7\u30EB\u30B8\u30E5
-ComboBoxDemo.hans=\u30CF\u30F3\u30B9
-ComboBoxDemo.howard=\u30CF\u30EF\u30FC\u30C9
-ComboBoxDemo.james=\u30B8\u30A7\u30FC\u30E0\u30B9
-ComboBoxDemo.jeff=\u30B8\u30A7\u30D5
-ComboBoxDemo.jon=\u30B8\u30E7\u30F3
-ComboBoxDemo.lara=\u30E9\u30E9
-ComboBoxDemo.larry=\u30E9\u30EA\u30FC
-ComboBoxDemo.lisa=\u30EA\u30B5
-ComboBoxDemo.michael=\u30DE\u30A4\u30B1\u30EB
-ComboBoxDemo.philip=\u30D5\u30A3\u30EA\u30C3\u30D7
-ComboBoxDemo.scott=\u30B9\u30B3\u30C3\u30C8
+ComboBoxDemo.accessible_description=このデモでは、JComboBoxコンポーネントの使用例を紹介します。
+ComboBoxDemo.tooltip=JComboBoxデモ
+ComboBoxDemo.name=ComboBoxデモ
+
+ComboBoxDemo.hair=髪
+ComboBoxDemo.eyes=目
+ComboBoxDemo.mouth=口
+ComboBoxDemo.presets=プリセット:
+
+ComboBoxDemo.preset1=フィリップ, ハワード, ジェフ
+ComboBoxDemo.preset2=ジェフ, ラリー, フィリップ
+ComboBoxDemo.preset3=ハワード, スコット, ハンス
+ComboBoxDemo.preset4=フィリップ, ジェフ, ハンス
+ComboBoxDemo.preset5=ブレント, ジョン, スコット
+ComboBoxDemo.preset6=ララ, ラリー, リサ
+ComboBoxDemo.preset7=ジェームス ,フィリップ, マイケル
+ComboBoxDemo.preset8=フィリップ, リサ, ブレント
+ComboBoxDemo.preset9=ジェームス, フィリップ, ジョン
+ComboBoxDemo.preset10=ララ, ジョン, スコット
+
+
+ComboBoxDemo.hair_description=髪:
+ComboBoxDemo.eyes_description=目と鼻:
+ComboBoxDemo.mouth_description=口:
+
+ComboBoxDemo.amy=エイミー
+ComboBoxDemo.brent=ブレント
+ComboBoxDemo.georges=ジョルジュ
+ComboBoxDemo.hans=ハンス
+ComboBoxDemo.howard=ハワード
+ComboBoxDemo.james=ジェームス
+ComboBoxDemo.jeff=ジェフ
+ComboBoxDemo.jon=ジョン
+ComboBoxDemo.lara=ララ
+ComboBoxDemo.larry=ラリー
+ComboBoxDemo.lisa=リサ
+ComboBoxDemo.michael=マイケル
+ComboBoxDemo.philip=フィリップ
+ComboBoxDemo.scott=スコット
 
 ### FileChooser Demo ###
 
-FileChooserDemo.accessible_description=FileChooser\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u958B\u304F\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u4F5C\u6210\u304A\u3088\u3073\u4FDD\u5B58\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3067\u304D\u307E\u3059\u3002
-FileChooserDemo.tooltip=JFileChooser\u30C7\u30E2
-FileChooserDemo.name=FileChooser\u30C7\u30E2
+FileChooserDemo.accessible_description=FileChooserを使用すると、開くファイルまたは作成および保存するファイルを選択できます。
+FileChooserDemo.tooltip=JFileChooserデモ
+FileChooserDemo.name=FileChooserデモ
 
-FileChooserDemo.plainbutton=\u6A19\u6E96\u306EJFileChooser\u306E\u8868\u793A
-FileChooserDemo.previewbutton=\u30D7\u30EC\u30D3\u30E5\u30FC\u4ED8\u304DJFileChooser\u306E\u8868\u793A
-FileChooserDemo.custombutton=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3057\u305FJFileChooser\u306E\u8868\u793A
+FileChooserDemo.plainbutton=標準のJFileChooserの表示
+FileChooserDemo.previewbutton=プレビュー付きJFileChooserの表示
+FileChooserDemo.custombutton=カスタマイズしたJFileChooserの表示
 
-FileChooserDemo.description=<html>&&nbsp &&nbsp\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u597D\u304D\u306A\u3060\u3051\u4F7F\u7528\u3057\u3066\u3001\u72EC\u81EA\u306EFileChooser\u3092\u7C21\u5358\u306B<br>&&nbsp &&nbsp\u4F5C\u6210\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002</html>
+FileChooserDemo.description=<html>&&nbsp &&nbspコンポーネントを好きなだけ使用して、独自のFileChooserを簡単に<br>&&nbsp &&nbsp作成することができます。</html>
 
-FileChooserDemo.filterdescription=JPEG\u304A\u3088\u3073GIF\u753B\u50CF\u30D5\u30A1\u30A4\u30EB
+FileChooserDemo.filterdescription=JPEGおよびGIF画像ファイル
 
-FileChooserDemo.nofileselected=\u6700\u521D\u306B\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-FileChooserDemo.thefile=\u30D5\u30A1\u30A4\u30EB\u540D:
-FileChooserDemo.isprobably=\u306F\u304A\u305D\u3089\u304F\u753B\u50CF\u30C7\u30FC\u30BF\u3067\u3059\u3002
+FileChooserDemo.nofileselected=最初にファイルを選択してください。
+FileChooserDemo.thefile=ファイル名:
+FileChooserDemo.isprobably=はおそらく画像データです。
 
-FileChooserDemo.helptext=<html>\u691C\u7D22: \u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3057\u307E\u3059\u3002<br>\u8A73\u7D30: \u30D5\u30A1\u30A4\u30EB\u306B\u3064\u3044\u3066\u3055\u3089\u306B\u5B66\u7FD2\u3057\u307E\u3059\u3002<br>OK: \u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u307E\u3059\u3002<br>\u53D6\u6D88: \u4F55\u3082\u305B\u305A\u306B\u3053\u306E\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u9589\u3058\u307E\u3059\u3002</html>
+FileChooserDemo.helptext=<html>検索: ファイルを検索します。<br>詳細: ファイルについてさらに学習します。<br>OK: ファイルを選択します。<br>取消: 何もせずにこのダイアログを閉じます。</html>
 
-FileChooserDemo.findquestion=\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22:
-FileChooserDemo.findresponse=<html><center>\u3042\u306A\u305F\u3001\u672C\u5F53\u306B\u79C1\u306B\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3057\u3066\u307B\u3057\u3044\u3068\u601D\u3063\u3066\u308B\u3093\u3067\u3059\u304B\u3002<br>\u305D\u3093\u306A\u3053\u3068\u3067\u304D\u306A\u3044\u3067\u3059\u3088\u3001\u3084\u308A\u65B9\u77E5\u3089\u306A\u3044\u3093\u3067\u3059\u304B\u3089\u3002\u79C1\u306F\u305F\u3060\u306E\u30C7\u30E2\u30FB\u30D7\u30ED\u30B0\u30E9\u30E0\u3067\u3059\u3088\u3002</center></html>
+FileChooserDemo.findquestion=ファイルの検索:
+FileChooserDemo.findresponse=<html><center>あなた、本当に私にファイルを検索してほしいと思ってるんですか。<br>そんなことできないですよ、やり方知らないんですから。私はただのデモ・プログラムですよ。</center></html>
 
-FileChooserDemo.dialogtitle=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3057\u305FFileChooser
-FileChooserDemo.help=\u30D8\u30EB\u30D7
-FileChooserDemo.find=\u691C\u7D22
+FileChooserDemo.dialogtitle=カスタマイズしたFileChooser
+FileChooserDemo.help=ヘルプ
+FileChooserDemo.find=検索
 FileChooserDemo.ok=OK
-FileChooserDemo.about=\u8A73\u7D30
-FileChooserDemo.cancel=\u53D6\u6D88
+FileChooserDemo.about=詳細
+FileChooserDemo.cancel=取消
 
 ### Html Demo ###
 
-HtmlDemo.accessible_description=\u3053\u306E\u30C7\u30E2\u3067\u306F\u3001JEditorPane\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3067HTML\u30C6\u30AD\u30B9\u30C8\u304C\u3069\u306E\u3088\u3046\u306B\u8868\u793A\u3055\u308C\u308B\u304B\u3092\u7D39\u4ECB\u3057\u307E\u3059\u3002
-HtmlDemo.tooltip=JEditorPane HTML\u30C7\u30E2
-HtmlDemo.name=JEditorPane HTML\u30C7\u30E2
+HtmlDemo.accessible_description=このデモでは、JEditorPaneコンポーネントでHTMLテキストがどのように表示されるかを紹介します。
+HtmlDemo.tooltip=JEditorPane HTMLデモ
+HtmlDemo.name=JEditorPane HTMLデモ
 HtmlDemo.filename=swing.html
 
 
 ### Internal Frame Demo ###
 
-InternalFrameDemo.accessible_description=JInternalFrame\u30C7\u30E2
-InternalFrameDemo.create_frames.labelAndMnemonic=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3055\u308C\u305F\u5185\u90E8\u30D5\u30EC\u30FC\u30E0\u306E\u4F5C\u6210
-InternalFrameDemo.title_text_field.labelAndMnemonic=\u30D5\u30EC\u30FC\u30E0\u306E\u30BF\u30A4\u30C8\u30EB:
-InternalFrameDemo.frame.labelAndMnemonic=\u30D5\u30EC\u30FC\u30E0
-InternalFrameDemo.palette.labelAndMnemonic=\u5185\u90E8\u30D5\u30EC\u30FC\u30E0\u306E\u4F5C\u6210
-InternalFrameDemo.name=InternalFrame\u30C7\u30E2
-InternalFrameDemo.tooltip=JInternalFrame\u30C7\u30E2
-InternalFrameDemo.closable.labelAndMnemonic=\u30AF\u30ED\u30FC\u30BA\u53EF
-InternalFrameDemo.resizable.labelAndMnemonic=\u30B5\u30A4\u30BA\u5909\u66F4\u53EF
-InternalFrameDemo.iconifiable.labelAndMnemonic=\u6700\u5C0F\u5316\u53EF
-InternalFrameDemo.maximizable.labelAndMnemonic=\u6700\u5927\u5316\u53EF
-InternalFrameDemo.toast=\u4E7E\u676F
-InternalFrameDemo.duke=\u730A\u4E0B
-InternalFrameDemo.duchess=\u516C\u7235\u592B\u4EBA
+InternalFrameDemo.accessible_description=JInternalFrameデモ
+InternalFrameDemo.create_frames.labelAndMnemonic=カスタマイズされた内部フレームの作成
+InternalFrameDemo.title_text_field.labelAndMnemonic=フレームのタイトル:
+InternalFrameDemo.frame.labelAndMnemonic=フレーム
+InternalFrameDemo.palette.labelAndMnemonic=内部フレームの作成
+InternalFrameDemo.name=InternalFrameデモ
+InternalFrameDemo.tooltip=JInternalFrameデモ
+InternalFrameDemo.closable.labelAndMnemonic=クローズ可
+InternalFrameDemo.resizable.labelAndMnemonic=サイズ変更可
+InternalFrameDemo.iconifiable.labelAndMnemonic=最小化可
+InternalFrameDemo.maximizable.labelAndMnemonic=最大化可
+InternalFrameDemo.toast=乾杯
+InternalFrameDemo.duke=猊下
+InternalFrameDemo.duchess=公爵夫人
 InternalFrameDemo.cab=Anyone need a Taxi?
 
 
 ### List Demo ###
 
-ListDemo.accessible_description=JList\u30C7\u30E2
-ListDemo.name=List\u30C7\u30E2
-ListDemo.tooltip=JList\u30C7\u30E2
-ListDemo.prefixes=\u30D7\u30EA\u30D5\u30A3\u30AF\u30B9
-ListDemo.suffixes=\u30B5\u30D5\u30A3\u30AF\u30B9
-ListDemo.count.labelAndMnemonic=\u751F\u6210\u3055\u308C\u305F\u30EA\u30B9\u30C8\u30FB\u30A8\u30F3\u30C8\u30EA\u306E\u6570:
-ListDemo.all=\u3059\u3079\u3066
-ListDemo.none=\u306A\u3057
-ListDemo.red=\u8D64\u8272\u306E\u4F1A\u793E\u30ED\u30B4\u30FB\u30A4\u30E1\u30FC\u30B8
-ListDemo.yellow=\u8D64\u8272\u306E\u4F1A\u793E\u30ED\u30B4\u30FB\u30A4\u30E1\u30FC\u30B8
-ListDemo.blue=\u9752\u8272\u306E\u4F1A\u793E\u30ED\u30B4\u30FB\u30A4\u30E1\u30FC\u30B8
-ListDemo.gray=\u30B0\u30EC\u30FC\u306E\u4F1A\u793E\u30ED\u30B4\u30FB\u30A4\u30E1\u30FC\u30B8
-ListDemo.green=\u7DD1\u8272\u306E\u4F1A\u793E\u30ED\u30B4\u30FB\u30A4\u30E1\u30FC\u30B8
-ListDemo.magenta=\u30DE\u30BC\u30F3\u30BF\u306E\u4F1A\u793E\u30ED\u30B4\u30FB\u30A4\u30E1\u30FC\u30B8
-ListDemo.cyan=\u30B7\u30A2\u30F3\u306E\u4F1A\u793E\u30ED\u30B4\u30FB\u30A4\u30E1\u30FC\u30B8
-ListDemo.description=<html><P STYLE="margin-left: .25in; margin-right: .25in">\u3053\u306E\u30C7\u30E2\u3067\u306F\u30012\u3064\u306E\u7570\u306A\u308B\u65B9\u6CD5\u3067\u4F5C\u6210\u3057\u305F\u30EA\u30B9\u30C8\u3092\u7D39\u4ECB\u3057\u307E\u3059\u3002\u5DE6\u5074\u306B\u3042\u308B<b>JList</b>\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30EA\u30B9\u30C8\u9805\u76EE\u306F\u3001\u30C1\u30A7\u30C3\u30AF\u30FB\u30DE\u30FC\u30AF\u306E\u4ED8\u3051\u3089\u308C\u305F\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u304A\u3088\u3073\u30B5\u30D5\u30A3\u30AF\u30B9\u306E\u9806\u5217\u3067\u69CB\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u53F3\u5074\u306E\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u304A\u3088\u3073\u30B5\u30D5\u30A3\u30AF\u30B9\u306E\u30C1\u30A7\u30C3\u30AF\u30FB\u30DC\u30C3\u30AF\u30B9\u306E\u5217\u306F\u3001\u5782\u76F4\u914D\u7F6E\u306E<b>BoxLayout</b>\u3092\u6301\u3064<b>JPanel</b>\u3092\u4F7F\u7528\u3057\u3066<b>JScrollPane</b>\u5185\u306B\u4F5C\u6210\u3055\u308C\u307E\u3059\u3002</P></html>
+ListDemo.accessible_description=JListデモ
+ListDemo.name=Listデモ
+ListDemo.tooltip=JListデモ
+ListDemo.prefixes=プリフィクス
+ListDemo.suffixes=サフィクス
+ListDemo.count.labelAndMnemonic=生成されたリスト・エントリの数:
+ListDemo.all=すべて
+ListDemo.none=なし
+ListDemo.red=赤色の会社ロゴ・イメージ
+ListDemo.yellow=赤色の会社ロゴ・イメージ
+ListDemo.blue=青色の会社ロゴ・イメージ
+ListDemo.gray=グレーの会社ロゴ・イメージ
+ListDemo.green=緑色の会社ロゴ・イメージ
+ListDemo.magenta=マゼンタの会社ロゴ・イメージ
+ListDemo.cyan=シアンの会社ロゴ・イメージ
+ListDemo.description=<html><P STYLE="margin-left: .25in; margin-right: .25in">このデモでは、2つの異なる方法で作成したリストを紹介します。左側にある<b>JList</b>コンポーネントのリスト項目は、チェック・マークの付けられたプレフィックスおよびサフィクスの順列で構成されています。右側のプレフィックスおよびサフィクスのチェック・ボックスの列は、垂直配置の<b>BoxLayout</b>を持つ<b>JPanel</b>を使用して<b>JScrollPane</b>内に作成されます。</P></html>
 
 
 ### OptionPane Demo ###
 
-OptionPaneDemo.accessible_description=OptionPane\u30C7\u30E2\u3067\u306F\u3001\u69D8\u3005\u306A\u5171\u901A\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u30FB\u30DC\u30C3\u30AF\u30B9\u3092\u751F\u6210\u3059\u308B\u305F\u3081\u306EJOptionPane\u306E\u4F7F\u7528\u4F8B\u3092\u7D39\u4ECB\u3057\u307E\u3059
-OptionPaneDemo.tooltip=JOptionPane\u30C7\u30E2
-OptionPaneDemo.name=OptionPane\u30C7\u30E2
-
-OptionPaneDemo.warningbutton=\u8B66\u544A\u30C0\u30A4\u30A2\u30ED\u30B0\u306E\u8868\u793A
-OptionPaneDemo.componentbutton=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u306E\u8868\u793A
-OptionPaneDemo.inputbutton=\u5165\u529B\u30C0\u30A4\u30A2\u30ED\u30B0\u306E\u8868\u793A
-OptionPaneDemo.confirmbutton=\u78BA\u8A8D\u30C0\u30A4\u30A2\u30ED\u30B0\u306E\u8868\u793A
-OptionPaneDemo.messagebutton=\u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u306E\u8868\u793A
-
-OptionPaneDemo.warningtitle=\u8B66\u544A\u30C0\u30A4\u30A2\u30ED\u30B0\u306E\u4F8B
-OptionPaneDemo.warningtext=<html><P><font color=black>\u3053\u308C\u306F<font color=red><b>\u7DCA\u6025\u653E\u9001\u30B7\u30B9\u30C6\u30E0</b></font>\u306E\u30C6\u30B9\u30C8\u3067\u3059\u3002<i><b>\u3053\u308C\u306F\u5358\u306A\u308B<br>\u30C6\u30B9\u30C8\u3067\u3059</b></i>\u3002\u30ED\u30FC\u30AB\u30EB\u30FB\u30A4\u30F3\u30C8\u30E9\u30CD\u30C3\u30C8\u306EWeb\u30DE\u30B9\u30BF\u30FC\u304C<br><font color=blue><b>\u9023\u90A6\u653F\u5E9C</b></font>\u304A\u3088\u3073<font color=blue><b>\u5DDE</b></font>\u5F53\u5C40\u3068\u81EA\u4E3B\u7684\u306B\u5354\u529B\u3057\u3001\u7DCA\u6025\u4E8B\u614B\u306E<br>\u767A\u751F\u6642\u306B\u901A\u5831\u3092\u884C\u3046\u305F\u3081\u306B\u3053\u306E\u30B7\u30B9\u30C6\u30E0\u3092\u958B\u767A\u3057\u307E\u3057\u305F\u3002<br>\u5B9F\u969B\u306E\u7DCA\u6025\u6642\u306B\u306F\u3001\u304A\u805E\u304D\u306B\u306A\u3063\u305F\u4FE1\u53F7\u306B\u7D9A\u3044\u3066\u5F53\u5C40\u304B\u3089\u306E<br>\u60C5\u5831\u3001\u30CB\u30E5\u30FC\u30B9\u307E\u305F\u306F\u6307\u793A\u304C\u901A\u77E5\u3055\u308C\u307E\u3059\u3002\u3053\u308C\u3067\u3001<br><font color=red><b>\u7DCA\u6025\u653E\u9001\u30B7\u30B9\u30C6\u30E0</b></font></font>\u306E\u30C6\u30B9\u30C8\u3092<br>\u7D42\u4E86\u3057\u307E\u3059\u3002</P><P><br>\u958B\u767A\u8005\u5411\u3051\u306E\u30CE\u30FC\u30C8: \u3053\u306E\u30C0\u30A4\u30A2\u30ED\u30B0\u306E\u30C7\u30E2\u3067\u306F\u3001\u30C6\u30AD\u30B9\u30C8\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306BHTML\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002</P></html>
-
-OptionPaneDemo.messagetext=\u74F6\u306B\u5165\u308C\u305F\u30E1\u30C3\u30BB\u30FC\u30B8
-
-OptionPaneDemo.confirmquestion=\u4ECA\u65E5\u306E\u5916\u306E\u5929\u6C17\u306F\u6674\u308C\u3067\u3059\u304B\u3002
-OptionPaneDemo.confirmyes=<html>\u30B3\u30F3\u30D4\u30E5\u30FC\u30BF\u3067\u904A\u3093\u3067\u306A\u3044\u3067\u5916\u306B\u51FA\u3088\u3046\u3002<br>\u30D3\u30FC\u30C1\u306B\u884C\u3063\u3066\u592A\u967D\u306E\u65E5\u3092\u6D74\u3073\u305F\u3089\u3069\u3046\u3067\u3057\u3087\u3046\u3002</html>
-OptionPaneDemo.confirmno=\u5C4B\u5185\u306B\u3044\u3066\u69D8\u3005\u306A\u3082\u306E\u304B\u3089\u4FDD\u8B77\u3055\u308C\u3066\u3044\u308B\u306E\u306F\u3044\u3044\u3053\u3068\u3067\u3059\u3002
-
-OptionPaneDemo.inputquestion=\u597D\u304D\u306A\u6620\u753B\u306F\u4F55\u3067\u3059\u304B\u3002
-OptionPaneDemo.inputresponse=\u305D\u308C\u306F\u3044\u3044\u6620\u753B\u3067\u3059\u306D\u3002
-
-OptionPaneDemo.componenttitle=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u306E\u4F8B
-OptionPaneDemo.componentmessage=<html>JOptionPane\u306B\u306F\u3001\u30C6\u30AD\u30B9\u30C8\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u306A\u3069\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u5FC5\u8981\u306A\u3060\u3051\u542B\u3081\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002</html>
-OptionPaneDemo.componenttextfield=\u30B3\u30F3\u30DC\u30DC\u30C3\u30AF\u30B9:
-OptionPaneDemo.component_cb1=\u9805\u76EE1
-OptionPaneDemo.component_cb2=\u9805\u76EE2
-OptionPaneDemo.component_cb3=\u9805\u76EE3
-OptionPaneDemo.componentmessage2=<html>\u307E\u305F\u3001JOptionPane\u306B\u306F\u5FC5\u8981\u306A\u6570\u3060\u3051\u30AA\u30D7\u30B7\u30E7\u30F3\u3092<br>\u542B\u3081\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002</html>
-OptionPaneDemo.component_op1=\u306F\u3044
-OptionPaneDemo.component_op2=\u3044\u3044\u3048
-OptionPaneDemo.component_op3=\u305D\u3046\u304B\u3082\u3057\u308C\u306A\u3044
-OptionPaneDemo.component_op4=\u305F\u3076\u3093
-OptionPaneDemo.component_op5=\u53D6\u6D88
-
-OptionPaneDemo.component_r1=\u660E\u308B\u304F\u3066\u697D\u89B3\u7684\u3002\u3044\u3044\u9078\u629E\u3067\u3059\u306D\u3002
-OptionPaneDemo.component_r2=\u307E\u3063\u305F\u304F\u9055\u3044\u307E\u3059\u3002\u79C1\u306A\u3089\u305D\u3093\u306A\u3053\u3068\u306F\u3057\u307E\u305B\u3093\u3002
-OptionPaneDemo.component_r3=<html><font color=black>\u3048\u3048\u3068\u3001\u306F\u3044\u3002\u73FE\u6642\u70B9\u3067\u306F\u72B6\u6CC1\u304C\u306F\u3063\u304D\u308A\u3057\u307E\u305B\u3093\u3002<br>\u306F\u3063\u304D\u308A\u3068\u6C7A\u307E\u3063\u305F\u3089\u6559\u3048\u3066\u304F\u3060\u3055\u3044\u3002</font></html>
-OptionPaneDemo.component_r4=<html><font color=black>\u305D\u3046\u3057\u305F\u3044\u306E\u306F\u308F\u304B\u3063\u3066\u3044\u308B\u306F\u305A\u3067\u3059\u3002\u4E00\u767A\u52DD\u8CA0\u3092<br>\u304B\u3051\u3066\u300C\u306F\u3044\u300D\u3092\u62BC\u3059\u3079\u304D\u3067\u3057\u305F\u3002</font></html>
+OptionPaneDemo.accessible_description=OptionPaneデモでは、様々な共通のオプション・ダイアログ・ボックスを生成するためのJOptionPaneの使用例を紹介します
+OptionPaneDemo.tooltip=JOptionPaneデモ
+OptionPaneDemo.name=OptionPaneデモ
+
+OptionPaneDemo.warningbutton=警告ダイアログの表示
+OptionPaneDemo.componentbutton=コンポーネント・ダイアログの表示
+OptionPaneDemo.inputbutton=入力ダイアログの表示
+OptionPaneDemo.confirmbutton=確認ダイアログの表示
+OptionPaneDemo.messagebutton=メッセージ・ダイアログの表示
+
+OptionPaneDemo.warningtitle=警告ダイアログの例
+OptionPaneDemo.warningtext=<html><P><font color=black>これは<font color=red><b>緊急放送システム</b></font>のテストです。<i><b>これは単なる<br>テストです</b></i>。ローカル・イントラネットのWebマスターが<br><font color=blue><b>連邦政府</b></font>および<font color=blue><b>州</b></font>当局と自主的に協力し、緊急事態の<br>発生時に通報を行うためにこのシステムを開発しました。<br>実際の緊急時には、お聞きになった信号に続いて当局からの<br>情報、ニュースまたは指示が通知されます。これで、<br><font color=red><b>緊急放送システム</b></font></font>のテストを<br>終了します。</P><P><br>開発者向けのノート: このダイアログのデモでは、テキストのフォーマットにHTMLが使用されています。</P></html>
+
+OptionPaneDemo.messagetext=瓶に入れたメッセージ
+
+OptionPaneDemo.confirmquestion=今日の外の天気は晴れですか。
+OptionPaneDemo.confirmyes=<html>コンピュータで遊んでないで外に出よう。<br>ビーチに行って太陽の日を浴びたらどうでしょう。</html>
+OptionPaneDemo.confirmno=屋内にいて様々なものから保護されているのはいいことです。
+
+OptionPaneDemo.inputquestion=好きな映画は何ですか。
+OptionPaneDemo.inputresponse=それはいい映画ですね。
+
+OptionPaneDemo.componenttitle=コンポーネント・ダイアログの例
+OptionPaneDemo.componentmessage=<html>JOptionPaneには、テキスト・フィールドなどのコンポーネントを必要なだけ含めることができます。</html>
+OptionPaneDemo.componenttextfield=コンボボックス:
+OptionPaneDemo.component_cb1=項目1
+OptionPaneDemo.component_cb2=項目2
+OptionPaneDemo.component_cb3=項目3
+OptionPaneDemo.componentmessage2=<html>また、JOptionPaneには必要な数だけオプションを<br>含めることができます。</html>
+OptionPaneDemo.component_op1=はい
+OptionPaneDemo.component_op2=いいえ
+OptionPaneDemo.component_op3=そうかもしれない
+OptionPaneDemo.component_op4=たぶん
+OptionPaneDemo.component_op5=取消
+
+OptionPaneDemo.component_r1=明るくて楽観的。いい選択ですね。
+OptionPaneDemo.component_r2=まったく違います。私ならそんなことはしません。
+OptionPaneDemo.component_r3=<html><font color=black>ええと、はい。現時点では状況がはっきりしません。<br>はっきりと決まったら教えてください。</font></html>
+OptionPaneDemo.component_r4=<html><font color=black>そうしたいのはわかっているはずです。一発勝負を<br>かけて「はい」を押すべきでした。</font></html>
 
 ### ProgressBar Demo ###
 
-ProgressBarDemo.accessible_description=\u3053\u306E\u30C7\u30E2\u3067\u306F\u3001JprogressBar\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u4F7F\u7528\u4F8B\u3092\u7D39\u4ECB\u3057\u307E\u3059\u3002
-ProgressBarDemo.tooltip=JProgressBar\u30C7\u30E2
-ProgressBarDemo.name=ProgressBar\u30C7\u30E2
-ProgressBarDemo.start_button=\u30C6\u30AD\u30B9\u30C8\u306E\u30ED\u30FC\u30C9\u958B\u59CB
-ProgressBarDemo.stop_button=\u30C6\u30AD\u30B9\u30C8\u306E\u30ED\u30FC\u30C9\u505C\u6B62
-ProgressBarDemo.accessible_text_loading_progress=\u30C6\u30AD\u30B9\u30C8\u306E\u30ED\u30FC\u30C9\u4E2D
-ProgressBarDemo.accessible_text_area_name=\u30ED\u30FC\u30C9\u4E2D\u306E\u30C6\u30AD\u30B9\u30C8
+ProgressBarDemo.accessible_description=このデモでは、JprogressBarコンポーネントの使用例を紹介します。
+ProgressBarDemo.tooltip=JProgressBarデモ
+ProgressBarDemo.name=ProgressBarデモ
+ProgressBarDemo.start_button=テキストのロード開始
+ProgressBarDemo.stop_button=テキストのロード停止
+ProgressBarDemo.accessible_text_loading_progress=テキストのロード中
+ProgressBarDemo.accessible_text_area_name=ロード中のテキスト
 
-ProgressBarDemo.accessible_text_area_description=\u3053\u306EJTextArea\u306B\u306F\u3001\u30C6\u30AD\u30B9\u30C8\u304C\u4E00\u5EA6\u306B1\u6587\u5B57\u305A\u3064\u30D0\u30C3\u30D5\u30A1\u304B\u3089\u57CB\u3081\u8FBC\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u30A6\u30A3\u30F3\u30C9\u30A6\u306E\u4E0B\u90E8\u306B\u3042\u308B\u30D7\u30ED\u30B0\u30EC\u30B9\u30FB\u30D0\u30FC\u306B\u3001\u30ED\u30FC\u30C9\u51E6\u7406\u306E\u9032\u6357\u304C\u8868\u793A\u3055\u308C\u307E\u3059
+ProgressBarDemo.accessible_text_area_description=このJTextAreaには、テキストが一度に1文字ずつバッファから埋め込まれています。ウィンドウの下部にあるプログレス・バーに、ロード処理の進捗が表示されます
 
-ProgressBarDemo.text=\u7121\u9650\u306E\u733F\u304C\u7121\u9650\u6570\u306E\u30BF\u30A4\u30D7\u30E9\u30A4\u30BF\u3067\u5165\u529B\u3057\u7D9A\u3051\u308C\u3070\u3001\u3044\u3064\u304B\u306F\u4EBA\u985E\u306E\u5049\u5927\u306A\u4F5C\u54C1\u304C\u3067\u304D\u3042\u304C\u308B\u3068\u4FD7\u306B\u3044\u308F\u308C\u3066\u3044\u307E\u3059\u3002\n\u73FE\u5728\u306E\u9AD8\u901F\u51E6\u7406\u30B3\u30F3\u30D4\u30E5\u30FC\u30BF\u3092\u4F7F\u7528\u3059\u308C\u3070\u3001\u3053\u306E\u7406\u8AD6\u3092\u30C6\u30B9\u30C8\n\u3067\u304D\u307E\u3059... \n\n\tLzskd jfy 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4, th;qxhz d7yty; \n\tQ0hnlj 23&&^ (# ljask djf y92y; fy92y; Sd6y ty;q2h nl jk la gfa harvin garvel\n\tlasdfsd a83sl la8z ks8l 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4,\n\tth;qxhz d7yty; Q0hnlj 23&&^ nknod mrs88 jsd79lfm#%$JLaoz6df  lso7dj f2 jfls\n\t67d9ol1@2fou99s  1lkj2 @l.k1  2; a89o7aljf  1l3i7ou8 d8l3 lqwerty0092 #1!\n\tja9o do8lkjj139rojsd9**!l6*hd # ljasd78 l2awkjad78  3ol7asljf 3 ldif && l.js\n\tLl ls ewan la8uj 23lll7u 8l  3h hhxx8 8d  lsd fixx 891lkjno99sl d8l@@@!!8#8\n\tdfoil jarooda mklaoorj nowai the smisthliylka jkdlfjiw ladajadra lthhheeejfjl\n\tdkddooolda bub mirznod of the koojgaf!! But 2 be or not to be... that is the\n\tquestion. Then when shall we three meet again In thunder, lightning, or in\n\train? When the hurlyburly's done, When the battle's lost and won. That will\n\tbe ere the set of sun. Where the place? Upon the heath. There to meet with\n\tMacbeth. But hath forth not to want.....  a banana, or to be.... a banana.\n\tBanana, I knew him banana. Banana banana. Banana banana banana banana.\n\n\n\n\nWell... hmm.... it seemed like a good idea...
+ProgressBarDemo.text=無限の猿が無限数のタイプライタで入力し続ければ、いつかは人類の偉大な作品ができあがると俗にいわれています。\n現在の高速処理コンピュータを使用すれば、この理論をテスト\nできます... \n\n\tLzskd jfy 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4, th;qxhz d7yty; \n\tQ0hnlj 23&&^ (# ljask djf y92y; fy92y; Sd6y ty;q2h nl jk la gfa harvin garvel\n\tlasdfsd a83sl la8z ks8l 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4,\n\tth;qxhz d7yty; Q0hnlj 23&&^ nknod mrs88 jsd79lfm#%$JLaoz6df  lso7dj f2 jfls\n\t67d9ol1@2fou99s  1lkj2 @l.k1  2; a89o7aljf  1l3i7ou8 d8l3 lqwerty0092 #1!\n\tja9o do8lkjj139rojsd9**!l6*hd # ljasd78 l2awkjad78  3ol7asljf 3 ldif && l.js\n\tLl ls ewan la8uj 23lll7u 8l  3h hhxx8 8d  lsd fixx 891lkjno99sl d8l@@@!!8#8\n\tdfoil jarooda mklaoorj nowai the smisthliylka jkdlfjiw ladajadra lthhheeejfjl\n\tdkddooolda bub mirznod of the koojgaf!! But 2 be or not to be... that is the\n\tquestion. Then when shall we three meet again In thunder, lightning, or in\n\train? When the hurlyburly's done, When the battle's lost and won. That will\n\tbe ere the set of sun. Where the place? Upon the heath. There to meet with\n\tMacbeth. But hath forth not to want.....  a banana, or to be.... a banana.\n\tBanana, I knew him banana. Banana banana. Banana banana banana banana.\n\n\n\n\nWell... hmm.... it seemed like a good idea...
 
 
 ### ScrollPane Demo ###
 
-ScrollPaneDemo.accessible_description=JScrollPane\u30C7\u30E2
-ScrollPaneDemo.name=ScrollPane\u30C7\u30E2
-ScrollPaneDemo.tooltip=JScrollPane\u30C7\u30E2
-ScrollPaneDemo.crayons=\u305F\u304F\u3055\u3093\u306E\u30AF\u30EC\u30E8\u30F3
-ScrollPaneDemo.colheader=\u5217\u30D8\u30C3\u30C0\u30FC
-ScrollPaneDemo.rowheader=\u884C\u30D8\u30C3\u30C0\u30FC
-ScrollPaneDemo.upperleft=\u5DE6\u4E0A\u30B3\u30FC\u30CA\u30FC
-ScrollPaneDemo.upperright=\u53F3\u4E0A\u306E\u5217\u30D8\u30C3\u30C0\u30FC\u30FB\u30B3\u30FC\u30CA\u30FC
-ScrollPaneDemo.lowerleft=\u5DE6\u4E0B\u306E\u884C\u30D8\u30C3\u30C0\u30FC\u30FB\u30B3\u30FC\u30CA\u30FC
+ScrollPaneDemo.accessible_description=JScrollPaneデモ
+ScrollPaneDemo.name=ScrollPaneデモ
+ScrollPaneDemo.tooltip=JScrollPaneデモ
+ScrollPaneDemo.crayons=たくさんのクレヨン
+ScrollPaneDemo.colheader=列ヘッダー
+ScrollPaneDemo.rowheader=行ヘッダー
+ScrollPaneDemo.upperleft=左上コーナー
+ScrollPaneDemo.upperright=右上の列ヘッダー・コーナー
+ScrollPaneDemo.lowerleft=左下の行ヘッダー・コーナー
 
 
 ### Slider Demo ###
 
-SliderDemo.accessible_description=\u3053\u306E\u30C7\u30E2\u3067\u306F\u3001JSlider\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u4F7F\u7528\u4F8B\u3092\u7D39\u4ECB\u3057\u307E\u3059\u3002
-SliderDemo.tooltip=JSlider\u30C7\u30E2
-SliderDemo.name=Slider\u30C7\u30E2
-
-SliderDemo.slidervalue=Slider\u306E\u5024:
-SliderDemo.horizontal=\u6C34\u5E73
-SliderDemo.vertical=\u5782\u76F4
-SliderDemo.plain=\u30D7\u30EC\u30FC\u30F3
-SliderDemo.a_plain_slider=\u30D7\u30EC\u30FC\u30F3\u306E\u30B9\u30E9\u30A4\u30C0
-SliderDemo.majorticks=\u5927\u76EE\u76DB
-SliderDemo.majorticksdescription=\u5927\u76EE\u76DB\u3092\u6301\u3064\u30B9\u30E9\u30A4\u30C0
-SliderDemo.ticks=\u5927\u5C0F\u76EE\u76DB\u3068\u30E9\u30D9\u30EB(SnapToTicks=true)
-SliderDemo.minorticks=\u5C0F\u76EE\u76DB
-SliderDemo.minorticksdescription=SnapToTicks=true\u3067\u5927\u76EE\u76DB\u3001\u5C0F\u76EE\u76DB\u304A\u3088\u3073\u30E9\u30D9\u30EB\u4ED8\u304D\u306E\u30B9\u30E9\u30A4\u30C0
-SliderDemo.disabled=\u7121\u52B9
-SliderDemo.disableddescription=\u5927\u5C0F\u306E\u76EE\u76DB\u3092\u6301\u3064\u7121\u52B9\u306A\u30B9\u30E9\u30A4\u30C0(\u64CD\u4F5C\u4E0D\u53EF)
+SliderDemo.accessible_description=このデモでは、JSliderコンポーネントの使用例を紹介します。
+SliderDemo.tooltip=JSliderデモ
+SliderDemo.name=Sliderデモ
+
+SliderDemo.slidervalue=Sliderの値:
+SliderDemo.horizontal=水平
+SliderDemo.vertical=垂直
+SliderDemo.plain=プレーン
+SliderDemo.a_plain_slider=プレーンのスライダ
+SliderDemo.majorticks=大目盛
+SliderDemo.majorticksdescription=大目盛を持つスライダ
+SliderDemo.ticks=大小目盛とラベル(SnapToTicks=true)
+SliderDemo.minorticks=小目盛
+SliderDemo.minorticksdescription=SnapToTicks=trueで大目盛、小目盛およびラベル付きのスライダ
+SliderDemo.disabled=無効
+SliderDemo.disableddescription=大小の目盛を持つ無効なスライダ(操作不可)
 
 ### SplitPane Demo ###
 
-SplitPaneDemo.accessible_description=JSplitPane\u30C7\u30E2
-SplitPaneDemo.name=SplitPane\u30C7\u30E2
-SplitPaneDemo.tooltip=JSplitPane\u30C7\u30E2
-SplitPaneDemo.earth=\u5730\u7403
-SplitPaneDemo.moon=\u5B87\u5B99\u98DB\u884C\u58EB
-SplitPaneDemo.vert_split.labelAndMnemonic=\u5782\u76F4\u5206\u5272(&V)
-SplitPaneDemo.horz_split.labelAndMnemonic=\u6C34\u5E73\u5206\u5272(&R)
-SplitPaneDemo.cont_layout.labelAndMnemonic=\u9023\u7D9A\u3057\u305F\u30EC\u30A4\u30A2\u30A6\u30C8(&C)
-SplitPaneDemo.one_touch_expandable.labelAndMnemonic=\u30EF\u30F3\u30BF\u30C3\u30C1\u62E1\u5F35\u6A5F\u80FD(&O)
-SplitPaneDemo.divider_size.labelAndMnemonic=\u30C7\u30A3\u30D0\u30A4\u30C0\u306E\u30B5\u30A4\u30BA(&Z)
-SplitPaneDemo.invalid_divider_size=\u7121\u52B9\u306A\u30C7\u30A3\u30D0\u30A4\u30C0\u306E\u30B5\u30A4\u30BA
-SplitPaneDemo.error=\u30A8\u30E9\u30FC
-SplitPaneDemo.first_component_min_size.labelAndMnemonic=\u6700\u521D\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u6700\u5C0F\u30B5\u30A4\u30BA(&I)
-SplitPaneDemo.second_component_min_size.labelAndMnemonic=2\u3064\u76EE\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u6700\u5C0F\u30B5\u30A4\u30BA(&N)
-SplitPaneDemo.invalid_min_size=\u7121\u52B9\u306A\u6700\u5C0F\u30B5\u30A4\u30BA
-SplitPaneDemo.must_be_greater_than=\u6B21\u306E\u6570\u3088\u308A\u5927\u304D\u306A\u5024\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
+SplitPaneDemo.accessible_description=JSplitPaneデモ
+SplitPaneDemo.name=SplitPaneデモ
+SplitPaneDemo.tooltip=JSplitPaneデモ
+SplitPaneDemo.earth=地球
+SplitPaneDemo.moon=宇宙飛行士
+SplitPaneDemo.vert_split.labelAndMnemonic=垂直分割(&V)
+SplitPaneDemo.horz_split.labelAndMnemonic=水平分割(&R)
+SplitPaneDemo.cont_layout.labelAndMnemonic=連続したレイアウト(&C)
+SplitPaneDemo.one_touch_expandable.labelAndMnemonic=ワンタッチ拡張機能(&O)
+SplitPaneDemo.divider_size.labelAndMnemonic=ディバイダのサイズ(&Z)
+SplitPaneDemo.invalid_divider_size=無効なディバイダのサイズ
+SplitPaneDemo.error=エラー
+SplitPaneDemo.first_component_min_size.labelAndMnemonic=最初のコンポーネントの最小サイズ(&I)
+SplitPaneDemo.second_component_min_size.labelAndMnemonic=2つ目のコンポーネントの最小サイズ(&N)
+SplitPaneDemo.invalid_min_size=無効な最小サイズ
+SplitPaneDemo.must_be_greater_than=次の数より大きな値を指定してください
 
 
 ### TabbedPane Demo ###
 
-TabbedPaneDemo.accessible_description=\u3053\u306E\u30C7\u30E2\u3067\u306F\u3001JTabbedPane\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u4F7F\u7528\u4F8B\u3092\u7D39\u4ECB\u3057\u307E\u3059\u3002
-TabbedPaneDemo.tooltip=JTabbedPane\u30C7\u30E2
-TabbedPaneDemo.name=TabbedPane\u30C7\u30E2
+TabbedPaneDemo.accessible_description=このデモでは、JTabbedPaneコンポーネントの使用例を紹介します。
+TabbedPaneDemo.tooltip=JTabbedPaneデモ
+TabbedPaneDemo.name=TabbedPaneデモ
 
-TabbedPaneDemo.bounce=<html><font color=blue><bold><center>\u5143\u6C17\u306A\u5B50\u4F9B\u9054\u3002</center></bold></font></html>
-TabbedPaneDemo.stephen=\u30B9\u30C6\u30A3\u30FC\u30F4\u30F3
-TabbedPaneDemo.david=\u30C7\u30A4\u30F4\u30A3\u30C3\u30C9
-TabbedPaneDemo.matthew=\u30DE\u30B7\u30E5\u30FC
-TabbedPaneDemo.ewan=\u30E6\u30A2\u30F3
-TabbedPaneDemo.blake=\u30D6\u30EC\u30A4\u30AF
-TabbedPaneDemo.brooke=\u30D6\u30EB\u30C3\u30AF
-TabbedPaneDemo.laine=\u30EC\u30A4\u30F3
-TabbedPaneDemo.hania=\u30CF\u30CB\u30A2
+TabbedPaneDemo.bounce=<html><font color=blue><bold><center>元気な子供達。</center></bold></font></html>
+TabbedPaneDemo.stephen=スティーヴン
+TabbedPaneDemo.david=デイヴィッド
+TabbedPaneDemo.matthew=マシュー
+TabbedPaneDemo.ewan=ユアン
+TabbedPaneDemo.blake=ブレイク
+TabbedPaneDemo.brooke=ブルック
+TabbedPaneDemo.laine=レイン
+TabbedPaneDemo.hania=ハニア
 
-TabbedPaneDemo.label=\u30BF\u30D6\u914D\u7F6E:
-TabbedPaneDemo.top=\u4E0A
-TabbedPaneDemo.bottom=\u4E0B
-TabbedPaneDemo.left=\u5DE6
-TabbedPaneDemo.right=\u53F3
+TabbedPaneDemo.label=タブ配置:
+TabbedPaneDemo.top=上
+TabbedPaneDemo.bottom=下
+TabbedPaneDemo.left=左
+TabbedPaneDemo.right=右
 
 
 ### Table Demo ###
 
-TableDemo.accessible_description=JTable\u30C7\u30E2
-TableDemo.name=Table\u30C7\u30E2
-TableDemo.tooltip=JTable\u30C7\u30E2
-TableDemo.all_columns=\u3059\u3079\u3066\u306E\u5217
-TableDemo.autoresize_mode=\u30B5\u30A4\u30BA\u81EA\u52D5\u5909\u66F4\u30E2\u30FC\u30C9
-TableDemo.cell_selection=\u30BB\u30EB\u306E\u9078\u629E
-TableDemo.column_boundaries=\u5217\u306E\u5883\u754C
-TableDemo.column_selection=\u5217\u306E\u9078\u629E
-TableDemo.horz_lines=\u6C34\u5E73\u7DDA
-TableDemo.intercell_spacing=\u30BB\u30EB\u9593\u306E\u30B9\u30DA\u30FC\u30B9
-TableDemo.intercell_spacing_colon=\u30BB\u30EB\u9593\u306E\u30B9\u30DA\u30FC\u30B9:
-TableDemo.last_column=\u6700\u5F8C\u306E\u5217
-TableDemo.multiple_ranges=\u8907\u6570\u306E\u7BC4\u56F2
-TableDemo.one_range=1\u3064\u306E\u7BC4\u56F2
-TableDemo.reordering_allowed=\u4E26\u66FF\u3048\u3092\u8A31\u53EF
-TableDemo.row_height=\u884C\u306E\u9AD8\u3055
-TableDemo.row_height_colon=\u884C\u306E\u9AD8\u3055:
-TableDemo.row_selection=\u884C\u306E\u9078\u629E
-TableDemo.selection_mode=\u9078\u629E\u30E2\u30FC\u30C9
-TableDemo.subsequent_columns=\u5F8C\u7D9A\u306E\u5217
-TableDemo.vert_lines=\u5782\u76F4\u7DDA
-TableDemo.single=\u30B7\u30F3\u30B0\u30EB
-TableDemo.none=\u306A\u3057
-TableDemo.off=\u30AA\u30D5
-TableDemo.first_name=\u540D
-TableDemo.last_name=\u59D3
-TableDemo.favorite_color=\u597D\u304D\u306A\u8272
-TableDemo.favorite_food=\u597D\u304D\u306A\u98DF\u3079\u7269
-TableDemo.favorite_movie=\u597D\u304D\u306A\u6620\u753B
-TableDemo.favorite_number=\u597D\u304D\u306A\u6570
-TableDemo.aqua=\u30A2\u30AF\u30A2
-TableDemo.beige=\u30D9\u30FC\u30B8\u30E5
-TableDemo.black=\u9ED2
-TableDemo.blue=\u9752
-TableDemo.cybergreen=\u30B5\u30A4\u30D0\u30FC\u30FB\u30B0\u30EA\u30FC\u30F3
-TableDemo.darkgreen=\u30C0\u30FC\u30AF\u30FB\u30B0\u30EA\u30FC\u30F3
-TableDemo.eblue=\u30E1\u30BF\u30EA\u30C3\u30AF\u30FB\u30D6\u30EB\u30FC
-TableDemo.jfcblue=JFC\u30D7\u30E9\u30A4\u30DE\u30EA
-TableDemo.jfcblue2=JFC\u30BB\u30AB\u30F3\u30C0\u30EA
-TableDemo.forestgreen=\u30D5\u30A9\u30EC\u30B9\u30C8\u30FB\u30B0\u30EA\u30FC\u30F3
-TableDemo.gray=\u7070\u8272
-TableDemo.green=\u7DD1
-TableDemo.orange=\u30AA\u30EC\u30F3\u30B8
-TableDemo.purple=\u7D2B
-TableDemo.red=\u8D64
-TableDemo.rustred=\u8D64\u7149\u74E6\u8272
-TableDemo.sunpurple=Sun\u30D1\u30FC\u30D7\u30EB
-TableDemo.suspectpink=\u30D4\u30F3\u30AF
-TableDemo.turquoise=\u30BF\u30FC\u30B3\u30A4\u30BA
-TableDemo.violet=\u3059\u307F\u308C\u8272
-TableDemo.yellow=\u9EC4\u8272
-TableDemo.2001=2001\u5E74\u5B87\u5B99\u306E\u65C5
-TableDemo.buckaroo=\u30D0\u30AB\u30EB\u30FC\u30FB\u30D0\u30F3\u30B6\u30A4\u306E8\u6B21\u5143\u30AE\u30E3\u30E9\u30AF\u30B7\u30FC
-TableDemo.firstsight=\u3042\u306A\u305F\u304C\u898B\u3048\u306A\u304F\u3066\u3082
-TableDemo.airplane=\u30D5\u30E9\u30A4\u30F3\u30B0\u30FB\u30CF\u30A4(\u30B7\u30EA\u30FC\u30BA)
-TableDemo.aliens=\u30A8\u30A4\u30EA\u30A2\u30F3
-TableDemo.bicycle=\u81EA\u8EE2\u8ECA\u6CE5\u68D2
-TableDemo.bladerunner=\u30D6\u30EC\u30FC\u30C9\u30FB\u30E9\u30F3\u30CA\u30FC(\u30C7\u30A3\u30EC\u30AF\u30BF\u30FC\u30BA\u30FB\u30AB\u30C3\u30C8)
-TableDemo.bluesbros=\u30D6\u30EB\u30FC\u30B9\u30FB\u30D6\u30E9\u30B6\u30FC\u30B9
-TableDemo.brazil=\u672A\u6765\u4E16\u7D00\u30D6\u30E9\u30B8\u30EB
-TableDemo.bugs=\u30D0\u30B0\u30BA\u30FB\u30E9\u30A4\u30D5
-TableDemo.city=\u30ED\u30B9\u30C8\u30FB\u30C1\u30EB\u30C9\u30EC\u30F3
-TableDemo.chusingura=\u5FE0\u81E3\u8535
-TableDemo.clock=\u6642\u8A08\u4ED5\u639B\u3051\u306E\u30AA\u30EC\u30F3\u30B8
-TableDemo.curse=\u602A\u5947\u30DF\u30A4\u30E9\u7537
-TableDemo.dasboot=U\u30DC\u30FC\u30C8
-TableDemo.dazed=\u30D0\u30C3\u30C9\u30FB\u30C1\u30E5\u30FC\u30CB\u30F3\u30B0
-TableDemo.defending=\u3042\u306A\u305F\u306E\u6B7B\u5F8C\u306B\u3054\u7528\u5FC3
-TableDemo.eraserhead=\u30A4\u30EC\u30A4\u30B6\u30FB\u30D8\u30C3\u30C9
-TableDemo.fifthelement=\u30D5\u30A3\u30D5\u30B9\u30FB\u30A8\u30EC\u30E1\u30F3\u30C8
-TableDemo.goodfellas=\u30B0\u30C3\u30C9\u30FB\u30D5\u30A7\u30ED\u30FC\u30BA
-TableDemo.harold=\u30CF\u30ED\u30EB\u30C9\u3068\u30E2\u30FC\u30C9
-TableDemo.joyluck=\u30B8\u30E7\u30A4\u30FB\u30E9\u30C3\u30AF\u30FB\u30AF\u30E9\u30D6
-TableDemo.jules=\u7A81\u7136\u708E\u306E\u3054\u3068\u304F\u30B8\u30E5\u30FC\u30EB\u3068\u30B8\u30E0
-TableDemo.ladyvanishes=\u30EC\u30C7\u30A3\u30FB\u30D0\u30CB\u30C3\u30B7\u30E5/\u6697\u53F7\u3092\u6B4C\u3046\u5973
-TableDemo.mohicans=\u30E9\u30B9\u30C8\u30FB\u30AA\u30D6\u30FB\u30E2\u30D2\u30AB\u30F3
-TableDemo.lonestar=\u771F\u5B9F\u306E\u56C1\u304D
-TableDemo.man=\u77E5\u308A\u3059\u304E\u3066\u3044\u305F\u7537
-TableDemo.musicman=\u30B6\u30FB\u30DF\u30E5\u30FC\u30B8\u30C3\u30AF\u30FB\u30DE\u30F3
-TableDemo.dog=\u30DE\u30A4\u30FB\u30E9\u30A4\u30D5\u30FB\u30A2\u30BA\u30FB\u30A2\u30FB\u30C9\u30C3\u30B0
-TableDemo.oncewest=\u30A6\u30A8\u30B9\u30BF\u30F3
-TableDemo.pulpfiction=\u30D1\u30EB\u30D7\u30FB\u30D5\u30A3\u30AF\u30B7\u30E7\u30F3
-TableDemo.raiders=\u30EC\u30A4\u30C0\u30FC\u30B9/\u5931\u308F\u308C\u305F\u30A2\u30FC\u30AF(\u8056\u6AC3)
-TableDemo.reservoir=\u30EC\u30B6\u30DC\u30A2\u30FB\u30C9\u30C3\u30B0\u30B9
-TableDemo.repoman=\u30EC\u30DD\u30FB\u30DE\u30F3
-TableDemo.spinaltap=\u30B9\u30D1\u30A4\u30CA\u30EB\u30FB\u30BF\u30C3\u30D7
-TableDemo.schindlerslist=\u30B7\u30F3\u30C9\u30E9\u30FC\u306E\u30EA\u30B9\u30C8
-TableDemo.starwars=\u30B9\u30BF\u30FC\u30FB\u30A6\u30A9\u30FC\u30BA
-TableDemo.stuntman=\u30B9\u30BF\u30F3\u30C8\u30DE\u30F3
-TableDemo.thinman=\u5F71\u306A\u304D\u7537
-TableDemo.withnail=\u30A6\u30A3\u30BA\u30FB\u30CD\u30A4\u30EB\u3068\u50D5
-TableDemo.labyrinth=\u30E9\u30D3\u30EA\u30F3\u30B9/\u9B54\u738B\u306E\u8FF7\u5BAE
-TableDemo.shawshank=\u30B7\u30E7\u30FC\u30B7\u30E3\u30F3\u30AF\u306E\u7A7A\u306B
-TableDemo.apple=\u308A\u3093\u3054
-TableDemo.asparagus=\u30A2\u30B9\u30D1\u30E9\u30AC\u30B9
-TableDemo.banana=\u30D0\u30CA\u30CA
-TableDemo.broccoli=\u30D6\u30ED\u30C3\u30B3\u30EA
-TableDemo.carrot=\u30CB\u30F3\u30B8\u30F3
-TableDemo.cantaloupe=\u30E1\u30ED\u30F3
-TableDemo.corn=\u3068\u3046\u3082\u308D\u3053\u3057
-TableDemo.grapes=\u3076\u3069\u3046
-TableDemo.grapefruit=\u30B0\u30EC\u30FC\u30D7\u30D5\u30EB\u30FC\u30C4
-TableDemo.kiwi=\u30AD\u30A6\u30A4\u30FB\u30D5\u30EB\u30FC\u30C4
-TableDemo.onion=\u7389\u306D\u304E
-TableDemo.pear=\u6D0B\u306A\u3057
-TableDemo.peach=\u6843
-TableDemo.pepper=\u3068\u3046\u304C\u3089\u3057
-TableDemo.pickle=\u30D4\u30AF\u30EB\u30B9
-TableDemo.pineapple=\u30D1\u30A4\u30CA\u30C3\u30D7\u30EB
-TableDemo.raspberry=\u30E9\u30B9\u30D9\u30EA
-TableDemo.sparegrass=\u30A2\u30B9\u30D1\u30E9\u30AC\u30B9
-TableDemo.strawberry=\u3044\u3061\u3054
-TableDemo.tomato=\u30C8\u30DE\u30C8
-TableDemo.watermelon=\u3059\u3044\u304B
-
-TableDemo.printing=\u5370\u5237\u30E1\u30CB\u30E5\u30FC
-TableDemo.fitWidth=\u6A2A\u5E45\u306B\u5408\u308F\u305B\u308B
-TableDemo.print=\u5370\u5237
-TableDemo.header=\u30D8\u30C3\u30C0\u30FC
+TableDemo.accessible_description=JTableデモ
+TableDemo.name=Tableデモ
+TableDemo.tooltip=JTableデモ
+TableDemo.all_columns=すべての列
+TableDemo.autoresize_mode=サイズ自動変更モード
+TableDemo.cell_selection=セルの選択
+TableDemo.column_boundaries=列の境界
+TableDemo.column_selection=列の選択
+TableDemo.horz_lines=水平線
+TableDemo.intercell_spacing=セル間のスペース
+TableDemo.intercell_spacing_colon=セル間のスペース:
+TableDemo.last_column=最後の列
+TableDemo.multiple_ranges=複数の範囲
+TableDemo.one_range=1つの範囲
+TableDemo.reordering_allowed=並替えを許可
+TableDemo.row_height=行の高さ
+TableDemo.row_height_colon=行の高さ:
+TableDemo.row_selection=行の選択
+TableDemo.selection_mode=選択モード
+TableDemo.subsequent_columns=後続の列
+TableDemo.vert_lines=垂直線
+TableDemo.single=シングル
+TableDemo.none=なし
+TableDemo.off=オフ
+TableDemo.first_name=名
+TableDemo.last_name=姓
+TableDemo.favorite_color=好きな色
+TableDemo.favorite_food=好きな食べ物
+TableDemo.favorite_movie=好きな映画
+TableDemo.favorite_number=好きな数
+TableDemo.aqua=アクア
+TableDemo.beige=ベージュ
+TableDemo.black=黒
+TableDemo.blue=青
+TableDemo.cybergreen=サイバー・グリーン
+TableDemo.darkgreen=ダーク・グリーン
+TableDemo.eblue=メタリック・ブルー
+TableDemo.jfcblue=JFCプライマリ
+TableDemo.jfcblue2=JFCセカンダリ
+TableDemo.forestgreen=フォレスト・グリーン
+TableDemo.gray=灰色
+TableDemo.green=緑
+TableDemo.orange=オレンジ
+TableDemo.purple=紫
+TableDemo.red=赤
+TableDemo.rustred=赤煉瓦色
+TableDemo.sunpurple=Sunパープル
+TableDemo.suspectpink=ピンク
+TableDemo.turquoise=ターコイズ
+TableDemo.violet=すみれ色
+TableDemo.yellow=黄色
+TableDemo.2001=2001年宇宙の旅
+TableDemo.buckaroo=バカルー・バンザイの8次元ギャラクシー
+TableDemo.firstsight=あなたが見えなくても
+TableDemo.airplane=フライング・ハイ(シリーズ)
+TableDemo.aliens=エイリアン
+TableDemo.bicycle=自転車泥棒
+TableDemo.bladerunner=ブレード・ランナー(ディレクターズ・カット)
+TableDemo.bluesbros=ブルース・ブラザース
+TableDemo.brazil=未来世紀ブラジル
+TableDemo.bugs=バグズ・ライフ
+TableDemo.city=ロスト・チルドレン
+TableDemo.chusingura=忠臣蔵
+TableDemo.clock=時計仕掛けのオレンジ
+TableDemo.curse=怪奇ミイラ男
+TableDemo.dasboot=Uボート
+TableDemo.dazed=バッド・チューニング
+TableDemo.defending=あなたの死後にご用心
+TableDemo.eraserhead=イレイザ・ヘッド
+TableDemo.fifthelement=フィフス・エレメント
+TableDemo.goodfellas=グッド・フェローズ
+TableDemo.harold=ハロルドとモード
+TableDemo.joyluck=ジョイ・ラック・クラブ
+TableDemo.jules=突然炎のごとくジュールとジム
+TableDemo.ladyvanishes=レディ・バニッシュ/暗号を歌う女
+TableDemo.mohicans=ラスト・オブ・モヒカン
+TableDemo.lonestar=真実の囁き
+TableDemo.man=知りすぎていた男
+TableDemo.musicman=ザ・ミュージック・マン
+TableDemo.dog=マイ・ライフ・アズ・ア・ドッグ
+TableDemo.oncewest=ウエスタン
+TableDemo.pulpfiction=パルプ・フィクション
+TableDemo.raiders=レイダース/失われたアーク(聖櫃)
+TableDemo.reservoir=レザボア・ドッグス
+TableDemo.repoman=レポ・マン
+TableDemo.spinaltap=スパイナル・タップ
+TableDemo.schindlerslist=シンドラーのリスト
+TableDemo.starwars=スター・ウォーズ
+TableDemo.stuntman=スタントマン
+TableDemo.thinman=影なき男
+TableDemo.withnail=ウィズ・ネイルと僕
+TableDemo.labyrinth=ラビリンス/魔王の迷宮
+TableDemo.shawshank=ショーシャンクの空に
+TableDemo.apple=りんご
+TableDemo.asparagus=アスパラガス
+TableDemo.banana=バナナ
+TableDemo.broccoli=ブロッコリ
+TableDemo.carrot=ニンジン
+TableDemo.cantaloupe=メロン
+TableDemo.corn=とうもろこし
+TableDemo.grapes=ぶどう
+TableDemo.grapefruit=グレープフルーツ
+TableDemo.kiwi=キウイ・フルーツ
+TableDemo.onion=玉ねぎ
+TableDemo.pear=洋なし
+TableDemo.peach=桃
+TableDemo.pepper=とうがらし
+TableDemo.pickle=ピクルス
+TableDemo.pineapple=パイナップル
+TableDemo.raspberry=ラスベリ
+TableDemo.sparegrass=アスパラガス
+TableDemo.strawberry=いちご
+TableDemo.tomato=トマト
+TableDemo.watermelon=すいか
+
+TableDemo.printing=印刷メニュー
+TableDemo.fitWidth=横幅に合わせる
+TableDemo.print=印刷
+TableDemo.header=ヘッダー
 
 # This string will be formatted by a MessageFormat and
 # printed at the top of each page of the printed result.
 # You can use {0} to insert a page number.
-TableDemo.headerText=JTable\u5370\u5237
+TableDemo.headerText=JTable印刷
 
-TableDemo.footer=\u30D5\u30C3\u30BF\u30FC
+TableDemo.footer=フッター
 
 # This string will be formatted by a MessageFormat and
 # printed at the bottom of each page of the printed result.
 # You can use {0} to insert a page number.
-TableDemo.footerText={0}\u30DA\u30FC\u30B8
+TableDemo.footerText={0}ページ
 
-TableDemo.printingResult=\u5370\u5237\u7D50\u679C
-TableDemo.printingComplete=\u5370\u5237\u5B8C\u4E86
-TableDemo.printingCancelled=\u5370\u5237\u306E\u53D6\u6D88
+TableDemo.printingResult=印刷結果
+TableDemo.printingComplete=印刷完了
+TableDemo.printingCancelled=印刷の取消
 
 # This string will be formatted by a MessageFormat and
 # and displayed when an exception occurs.
 # {0} is used to place details of the exception.
-TableDemo.printingFailed=\u5370\u5237\u30A8\u30E9\u30FC: {0}
+TableDemo.printingFailed=印刷エラー: {0}
 
 
 ### ToolTip Demo ###
 
-ToolTipDemo.accessible_description=ToolTip\u306F\u3001\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u3064\u3044\u3066\u306E\u7C21\u5358\u306A\u8AAC\u660E\u3092\u8868\u793A\u3057\u307E\u3059\u3002
-ToolTipDemo.accessible_cow=\u3053\u308C\u306F\u4E73\u725B\u3067\u3059
-ToolTipDemo.tooltip=ToolTip\u30C7\u30E2
-ToolTipDemo.name=ToolTip\u30C7\u30E2
-ToolTipDemo.bessie=\u96CC\u725B\u306E\u30A8\u30EA\u30B6\u30D9\u30B9
-ToolTipDemo.cow=\u4E73\u725B
-ToolTipDemo.got_milk=\u725B\u4E73\u98F2\u3093\u3060?
-ToolTipDemo.tail=\u3057\u3063\u307D
-ToolTipDemo.moo=\u30E2\u30A9\u30A9\u30A9\u30A9!
-ToolTipDemo.tooltip_features=<html>\u3082\u3057\u3084\u3042\u306A\u305F\u306F\u3001\u30C4\u30FC\u30EB\u30FB\u30C1\u30C3\u30D7\u306F\u300C1\u884C\u306E\u30D7\u30EC\u30A4\u30F3\u30FB\u30C6\u30AD\u30B9\u30C8\u300D\u3057\u304B<p>\u8868\u793A\u3067\u304D\u306A\u3044\u9000\u5C48\u306A\u3082\u306E\u3060\u306A\u3093\u3066\u601D\u3063\u3066\u3084\u3057\u307E\u305B\u3093\u304B\u3002<p>\u3060\u3068\u3057\u305F\u3089\u3001\u79C1\u305F\u3061<font color=blue size=+2>Swing!</font>\u30C1\u30FC\u30E0\u304C\u305D\u306E\u8AA4\u89E3\u3092\u89E3\u3044\u3066\u3042\u3052\u307E\u3057\u3087\u3046\u3002<p>Swing\u306EToolTip\u306F\u3001HTML\u3092\u4F7F\u7528\u3057\u3066<ul><li>List\u3092\u6301\u3063\u305F\u308A\u3001<li><b>\u592A\u5B57</b>\u306B\u3057\u305F\u308A\u3001<li><em>\u30A4\u30BF\u30EA\u30C3\u30AF</em>\u306B\u3057\u305F\u308A\u3001<li>\u6587\u5B57\u306B<font color=red>\u8272</font>\u3092\u4ED8\u3051\u305F\u308A\u3001<li><font size=+3>\u30B5\u30A4\u30BA</font>\u3092\u5909\u3048\u305F\u308A\u3001<li><font face=AvantGarde>\u30D5\u30A9\u30F3\u30C8</font>\u3092\u5909\u3048\u305F\u308A\u3001</ul>\u305D\u3046\u305D\u3046\u3001\u3082\u3061\u308D\u3093\u8907\u6570\u884C\u306B\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u3061\u3083\u3046\u306E\u3067\u3059\u3002\u306D\u3063\u3002</html>
+ToolTipDemo.accessible_description=ToolTipは、コンポーネントについての簡単な説明を表示します。
+ToolTipDemo.accessible_cow=これは乳牛です
+ToolTipDemo.tooltip=ToolTipデモ
+ToolTipDemo.name=ToolTipデモ
+ToolTipDemo.bessie=雌牛のエリザベス
+ToolTipDemo.cow=乳牛
+ToolTipDemo.got_milk=牛乳飲んだ?
+ToolTipDemo.tail=しっぽ
+ToolTipDemo.moo=モォォォォ!
+ToolTipDemo.tooltip_features=<html>もしやあなたは、ツール・チップは「1行のプレイン・テキスト」しか<p>表示できない退屈なものだなんて思ってやしませんか。<p>だとしたら、私たち<font color=blue size=+2>Swing!</font>チームがその誤解を解いてあげましょう。<p>SwingのToolTipは、HTMLを使用して<ul><li>Listを持ったり、<li><b>太字</b>にしたり、<li><em>イタリック</em>にしたり、<li>文字に<font color=red>色</font>を付けたり、<li><font size=+3>サイズ</font>を変えたり、<li><font face=AvantGarde>フォント</font>を変えたり、</ul>そうそう、もちろん複数行にすることもできちゃうのです。ねっ。</html>
 
 
 ### Tree Demo ###
 
-TreeDemo.accessible_description=\u3053\u306E\u30C7\u30E2\u3067\u306F\u3001JTree\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u4F7F\u7528\u4F8B\u3092\u7D39\u4ECB\u3057\u307E\u3059\u3002
-TreeDemo.tooltip=JTree\u30C7\u30E2
-TreeDemo.name=Tree\u30C7\u30E2
-TreeDemo.music=\u97F3\u697D
+TreeDemo.accessible_description=このデモでは、JTreeコンポーネントの使用例を紹介します。
+TreeDemo.tooltip=JTreeデモ
+TreeDemo.name=Treeデモ
+TreeDemo.music=音楽
diff --git a/src/demo/share/jfc/SwingSet2/resources/swingset_zh_CN.properties b/src/demo/share/jfc/SwingSet2/resources/swingset_zh_CN.properties
index 12d3c889da9..0960659dd15 100644
--- a/src/demo/share/jfc/SwingSet2/resources/swingset_zh_CN.properties
+++ b/src/demo/share/jfc/SwingSet2/resources/swingset_zh_CN.properties
@@ -39,21 +39,21 @@
 
 ### About Box ###
 
-AboutBox.title=\u5173\u4E8E Swing!
-AboutBox.ok_button_text=\u786E\u5B9A
-AboutBox.accessible_description=SwingSet2 \u6F14\u793A\u7A0B\u5E8F, \u7248\u6743\u6240\u6709 (c) 2011, Oracle \u548C/\u6216\u5176\u5B50\u516C\u53F8\u3002\u4FDD\u7559\u6240\u6709\u6743\u5229\u3002
+AboutBox.title=关于 Swing!
+AboutBox.ok_button_text=确定
+AboutBox.accessible_description=SwingSet2 演示程序, 版权所有 (c) 2011, Oracle 和/或其子公司。保留所有权利。
 
 ### Source Code ###
-SourceCode.loading=<html><body bgcolor="#ffffff">\u6B63\u5728\u52A0\u8F7D\u548C\u683C\u5F0F\u5316\u6E90\u4EE3\u7801, \u8BF7\u7A0D\u5019...</body></html>
+SourceCode.loading=<html><body bgcolor="#ffffff">正在加载和格式化源代码, 请稍候...</body></html>
 
 ### Status ###
 
-Status.loading=\u6B63\u5728\u52A0\u8F7D:
-Status.popupMenuAccessible=\u8BF7\u6309 Shift-F10 \u7EC4\u5408\u952E\u6FC0\u6D3B\u5F39\u51FA\u5F0F\u83DC\u5355
+Status.loading=正在加载:
+Status.popupMenuAccessible=请按 Shift-F10 组合键激活弹出式菜单
 
 ### Menu Bar ###
 
-MenuBar.accessible_description=Swing \u6F14\u793A\u83DC\u5355\u680F
+MenuBar.accessible_description=Swing 演示菜单栏
 
 
 ### Frame ###
@@ -63,119 +63,119 @@ Frame.title=SwingSet2
 
 ### Tabbed Pane ###
 
-TabbedPane.src.labelAndMnemonic=\u6E90\u4EE3\u7801
-TabbedPane.src_tooltip=\u67E5\u770B\u672C\u6F14\u793A\u7684\u6E90\u4EE3\u7801
+TabbedPane.src.labelAndMnemonic=源代码
+TabbedPane.src_tooltip=查看本演示的源代码
 
 
 ### Look & Feel Menu ###
 
-LafMenu.laf.labelAndMnemonic=\u5916\u89C2(&L)
-LafMenu.laf_accessible_description=\u7528\u4E8E\u5207\u6362\u5916\u89C2\u7684\u83DC\u5355
+LafMenu.laf.labelAndMnemonic=外观(&L)
+LafMenu.laf_accessible_description=用于切换外观的菜单
 
-LafMenu.java.labelAndMnemonic=Java \u5916\u89C2(&J)
-LafMenu.java_accessible_description=Java \u5916\u89C2
+LafMenu.java.labelAndMnemonic=Java 外观(&J)
+LafMenu.java_accessible_description=Java 外观
 
-LafMenu.nimbus.labelAndMnemonic=Nimbus \u5916\u89C2(&N)
-LafMenu.nimbus_accessible_description=Nimbus \u5916\u89C2
+LafMenu.nimbus.labelAndMnemonic=Nimbus 外观(&N)
+LafMenu.nimbus_accessible_description=Nimbus 外观
 
-LafMenu.mac.labelAndMnemonic=Mac OS X \u5916\u89C2(&M)
-LafMenu.mac_accessible_description=Mac OS X \u5916\u89C2
+LafMenu.mac.labelAndMnemonic=Mac OS X 外观(&M)
+LafMenu.mac_accessible_description=Mac OS X 外观
 
-LafMenu.motif.labelAndMnemonic=Motif \u5916\u89C2(&O)
-LafMenu.motif_accessible_description=Motif \u5916\u89C2
+LafMenu.motif.labelAndMnemonic=Motif 外观(&O)
+LafMenu.motif_accessible_description=Motif 外观
 
-LafMenu.windows.labelAndMnemonic=Windows \u6837\u5F0F\u5916\u89C2(&W)
-LafMenu.windows_accessible_description=Windows \u6837\u5F0F\u5916\u89C2
+LafMenu.windows.labelAndMnemonic=Windows 样式外观(&W)
+LafMenu.windows_accessible_description=Windows 样式外观
 
-LafMenu.gtk.labelAndMnemonic=GTK \u6837\u5F0F\u5916\u89C2(&G)
-LafMenu.gtk_accessible_description=GTK \u6837\u5F0F\u5916\u89C2
+LafMenu.gtk.labelAndMnemonic=GTK 样式外观(&G)
+LafMenu.gtk_accessible_description=GTK 样式外观
 
 
 ### Themes Menu ###
 
-ThemesMenu.themes.labelAndMnemonic=\u4E3B\u9898(&T)
-ThemesMenu.themes_accessible_description=\u5207\u6362\u91D1\u5C5E\u989C\u8272\u4E3B\u9898\u7684\u83DC\u5355
+ThemesMenu.themes.labelAndMnemonic=主题(&T)
+ThemesMenu.themes_accessible_description=切换金属颜色主题的菜单
 
-ThemesMenu.aqua.labelAndMnemonic=\u6C34\u7EFF(&Q)
-ThemesMenu.aqua_accessible_description=\u84DD\u7EFF\u8272\u91D1\u5C5E\u4E3B\u9898
+ThemesMenu.aqua.labelAndMnemonic=水绿(&Q)
+ThemesMenu.aqua_accessible_description=蓝绿色金属主题
 
-ThemesMenu.charcoal.labelAndMnemonic=\u70AD\u7070(&C)
-ThemesMenu.charcoal_accessible_description=\u6697\u7070\u8272\u91D1\u5C5E\u4E3B\u9898
+ThemesMenu.charcoal.labelAndMnemonic=炭灰(&C)
+ThemesMenu.charcoal_accessible_description=暗灰色金属主题
 
-ThemesMenu.contrast.labelAndMnemonic=\u9AD8\u5BF9\u6BD4\u5EA6(&H)
-ThemesMenu.contrast_accessible_description=\u9AD8\u5BF9\u6BD4\u5EA6\u4E3B\u9898
+ThemesMenu.contrast.labelAndMnemonic=高对比度(&H)
+ThemesMenu.contrast_accessible_description=高对比度主题
 
-ThemesMenu.ocean.labelAndMnemonic=\u6D77\u6D0B(&O)
-ThemesMenu.ocean_accessible_description=\u6D77\u6D0B\u91D1\u5C5E\u4E3B\u9898
+ThemesMenu.ocean.labelAndMnemonic=海洋(&O)
+ThemesMenu.ocean_accessible_description=海洋金属主题
 
-ThemesMenu.steel.labelAndMnemonic=\u94A2(&S)
-ThemesMenu.steel_accessible_description=\u84DD\u8272/\u7D2B\u8272\u91D1\u5C5E\u4E3B\u9898
+ThemesMenu.steel.labelAndMnemonic=钢(&S)
+ThemesMenu.steel_accessible_description=蓝色/紫色金属主题
 
-ThemesMenu.emerald.labelAndMnemonic=\u7956\u6BCD\u7EFF(&E)
-ThemesMenu.emerald_accessible_description=\u7EFF\u8272\u91D1\u5C5E\u4E3B\u9898
+ThemesMenu.emerald.labelAndMnemonic=祖母绿(&E)
+ThemesMenu.emerald_accessible_description=绿色金属主题
 
-ThemesMenu.ruby.labelAndMnemonic=\u5B9D\u77F3\u7EA2(&R)
-ThemesMenu.ruby_accessible_description=\u7EA2\u8272\u91D1\u5C5E\u4E3B\u9898
+ThemesMenu.ruby.labelAndMnemonic=宝石红(&R)
+ThemesMenu.ruby_accessible_description=红色金属主题
 
 
 ### Font SubMenu (under Themes)
-FontMenu.fonts.labelAndMnemonic=\u5B57\u4F53(&F)
-FontMenu.fonts_accessible_description=\u7528\u6765\u9009\u62E9 Java \u5916\u89C2\u5B57\u4F53\u7684\u83DC\u5355
+FontMenu.fonts.labelAndMnemonic=字体(&F)
+FontMenu.fonts_accessible_description=用来选择 Java 外观字体的菜单
 
-FontMenu.bold.labelAndMnemonic=\u7C97\u4F53(&B)
-FontMenu.bold_accessible_description=\u4E3A Java \u5916\u89C2\u542F\u7528\u7C97\u4F53\u5B57\u4F53
+FontMenu.bold.labelAndMnemonic=粗体(&B)
+FontMenu.bold_accessible_description=为 Java 外观启用粗体字体
 
-FontMenu.plain.labelAndMnemonic=\u65E0\u683C\u5F0F(&P)
-FontMenu.plain_accessible_description=\u4E3A Java \u5916\u89C2\u542F\u7528\u65E0\u683C\u5F0F\u5B57\u4F53
+FontMenu.plain.labelAndMnemonic=无格式(&P)
+FontMenu.plain_accessible_description=为 Java 外观启用无格式字体
 
 
 ### Audio SubMenu (under Themes) ###
 
-AudioMenu.audio.labelAndMnemonic=\u97F3\u9891(&A)
-AudioMenu.audio_accessible_description=\u7528\u6765\u5207\u6362 Java \u5916\u89C2\u4E2D\u53EF\u7528\u7684\u542C\u89C9\u53CD\u9988\u6570\u91CF\u7684\u83DC\u5355
+AudioMenu.audio.labelAndMnemonic=音频(&A)
+AudioMenu.audio_accessible_description=用来切换 Java 外观中可用的听觉反馈数量的菜单
 
-AudioMenu.on.labelAndMnemonic=\u65E5\u671F(&O)
-AudioMenu.on_accessible_description=\u4E3A Java \u5916\u89C2\u542F\u7528\u6240\u6709\u542C\u89C9\u53CD\u9988
+AudioMenu.on.labelAndMnemonic=日期(&O)
+AudioMenu.on_accessible_description=为 Java 外观启用所有听觉反馈
 
-AudioMenu.default.labelAndMnemonic=\u9ED8\u8BA4\u503C(&D)
-AudioMenu.default_accessible_description=\u4E3A Java \u5916\u89C2\u542F\u7528\u6807\u51C6\u7684\u542C\u89C9\u53CD\u9988\u6570\u91CF
+AudioMenu.default.labelAndMnemonic=默认值(&D)
+AudioMenu.default_accessible_description=为 Java 外观启用标准的听觉反馈数量
 
-AudioMenu.off.labelAndMnemonic=\u5173(&F)
-AudioMenu.off_accessible_description=\u4E3A Java \u5916\u89C2\u7981\u7528\u6240\u6709\u542C\u89C9\u53CD\u9988
+AudioMenu.off.labelAndMnemonic=关(&F)
+AudioMenu.off_accessible_description=为 Java 外观禁用所有听觉反馈
 
 ### Options Menu ###
 
-OptionsMenu.options.labelAndMnemonic=\u9009\u9879(&P)
-OptionsMenu.options_accessible_description=\u5305\u542B\u5176\u4ED6\u9009\u9879\u7684\u83DC\u5355
+OptionsMenu.options.labelAndMnemonic=选项(&P)
+OptionsMenu.options_accessible_description=包含其他选项的菜单
 
-OptionsMenu.tooltip.labelAndMnemonic=\u542F\u7528\u5DE5\u5177\u63D0\u793A(&T)
-OptionsMenu.tooltip_accessible_description=\u542F\u7528\u6216\u7981\u7528\u5DE5\u5177\u63D0\u793A
+OptionsMenu.tooltip.labelAndMnemonic=启用工具提示(&T)
+OptionsMenu.tooltip_accessible_description=启用或禁用工具提示
 
-OptionsMenu.dragEnabled.labelAndMnemonic=\u542F\u7528\u62D6\u52A8\u652F\u6301(&D)
-OptionsMenu.dragEnabled_accessible_description=\u542F\u7528\u6216\u7981\u7528\u62D6\u52A8\u652F\u6301
+OptionsMenu.dragEnabled.labelAndMnemonic=启用拖动支持(&D)
+OptionsMenu.dragEnabled_accessible_description=启用或禁用拖动支持
 
 ### File Menu ###
 
-FileMenu.file.labelAndMnemonic=\u6587\u4EF6(&F)
-FileMenu.accessible_description=\u6587\u4EF6\u83DC\u5355
-FileMenu.about.labelAndMnemonic=\u5173\u4E8E(&B)
-FileMenu.about_accessible_description=\u4E86\u89E3 SwingSet2 \u5E94\u7528\u7A0B\u5E8F
-FileMenu.open.labelAndMnemonic=\u6253\u5F00(&O)
-FileMenu.open_accessible_description=\u7528\u4E8E\u6253\u5F00\u6587\u4EF6\u7684\u5360\u4F4D\u7B26\u83DC\u5355\u9879
-FileMenu.save.labelAndMnemonic=\u4FDD\u5B58(&S)
-FileMenu.save_accessible_description=\u7528\u4E8E\u4FDD\u5B58\u6587\u4EF6\u7684\u5360\u4F4D\u7B26\u83DC\u5355\u9879
-FileMenu.save_as.labelAndMnemonic=\u53E6\u5B58\u4E3A(&A)...
-FileMenu.save_as_accessible_description=\u7528\u4E8E\u5C06\u6587\u4EF6\u53E6\u5B58\u4E3A\u4E00\u4E2A\u65B0\u6587\u4EF6\u540D\u7684\u5360\u4F4D\u7B26\u83DC\u5355\u9879
-FileMenu.exit.labelAndMnemonic=\u9000\u51FA(&X)
-FileMenu.exit_accessible_description=\u9000\u51FA SwingSet2 \u5E94\u7528\u7A0B\u5E8F
+FileMenu.file.labelAndMnemonic=文件(&F)
+FileMenu.accessible_description=文件菜单
+FileMenu.about.labelAndMnemonic=关于(&B)
+FileMenu.about_accessible_description=了解 SwingSet2 应用程序
+FileMenu.open.labelAndMnemonic=打开(&O)
+FileMenu.open_accessible_description=用于打开文件的占位符菜单项
+FileMenu.save.labelAndMnemonic=保存(&S)
+FileMenu.save_accessible_description=用于保存文件的占位符菜单项
+FileMenu.save_as.labelAndMnemonic=另存为(&A)...
+FileMenu.save_as_accessible_description=用于将文件另存为一个新文件名的占位符菜单项
+FileMenu.exit.labelAndMnemonic=退出(&X)
+FileMenu.exit_accessible_description=退出 SwingSet2 应用程序
 
 ### Multi-Screen menu ###
-MultiMenu.multi.labelAndMnemonic=\u591A\u5C4F\u5E55(&M)
-MultiMenu.multi_accessible_description=\u591A\u5C4F\u5E55\u83DC\u5355
-MultiMenu.all.labelAndMnemonic=\u5728\u6240\u6709\u5C4F\u5E55\u4E0A\u521B\u5EFA SwingSet2(&A)
-MultiMenu.all_accessible_description=\u5728\u6BCF\u4E2A\u5C4F\u5E55\u4E0A\u521B\u5EFA\u4E00\u4E2A SwingSet2 \u7A97\u53E3
-MultiMenu.single.labelAndMnemonic=\u5728\u5C4F\u5E55\u4E0A\u521B\u5EFA SwingSet2
-MultiMenu.single_accessible_description=\u5728\u5C4F\u5E55\u4E0A\u521B\u5EFA SwingSet2 \u7A97\u53E3
+MultiMenu.multi.labelAndMnemonic=多屏幕(&M)
+MultiMenu.multi_accessible_description=多屏幕菜单
+MultiMenu.all.labelAndMnemonic=在所有屏幕上创建 SwingSet2(&A)
+MultiMenu.all_accessible_description=在每个屏幕上创建一个 SwingSet2 窗口
+MultiMenu.single.labelAndMnemonic=在屏幕上创建 SwingSet2
+MultiMenu.single_accessible_description=在屏幕上创建 SwingSet2 窗口
 
 
 ################################
@@ -184,88 +184,88 @@ MultiMenu.single_accessible_description=\u5728\u5C4F\u5E55\u4E0A\u521B\u5EFA Swi
 
 ### Button Demo ###
 
-ButtonDemo.accessible_description=ButtonDemo \u663E\u793A\u4E86\u4F7F\u7528 JButton, JRadioButton, JToggleButton \u548C JCheckBox \u7684\u793A\u4F8B
-ButtonDemo.tooltip=JButton, JRadioButton, JToggleButton, JCheckbox \u6F14\u793A
-ButtonDemo.name=\u6309\u94AE\u6F14\u793A
-
-ButtonDemo.buttons=\u6309\u94AE
-ButtonDemo.checkboxes=\u590D\u9009\u6846
-ButtonDemo.radiobuttons=\u5355\u9009\u6309\u94AE
-ButtonDemo.togglebuttons=\u5207\u6362\u6309\u94AE
-
-ButtonDemo.textbuttons=\u6587\u672C\u6309\u94AE
-ButtonDemo.imagebuttons=\u56FE\u50CF\u6309\u94AE
-ButtonDemo.textradiobuttons=\u6587\u672C\u5355\u9009\u6309\u94AE
-ButtonDemo.imageradiobuttons=\u56FE\u50CF\u5355\u9009\u6309\u94AE
-ButtonDemo.texttogglebuttons=\u6587\u672C\u5207\u6362\u6309\u94AE
-ButtonDemo.imagetogglebuttons=\u56FE\u50CF\u5207\u6362\u6309\u94AE
-ButtonDemo.textcheckboxes=\u6587\u672C\u590D\u9009\u6846
-ButtonDemo.imagecheckboxes=\u56FE\u50CF\u590D\u9009\u6846
-
-ButtonDemo.button1=\u4E00
-ButtonDemo.button2=\u4E8C
-ButtonDemo.button3=<html><font size=2 color=red><bold>\u4E09!</font></html>
-
-ButtonDemo.radio1=\u5355\u9009\u4E00
-ButtonDemo.radio2=\u5355\u9009\u4E8C
-ButtonDemo.radio3=\u5355\u9009\u4E09
-ButtonDemo.radioX=<html><font size=2 color=red>\u4E09<bold> (HTML!)</bold></font></html>
-
-ButtonDemo.check1=\u4E00
-ButtonDemo.check2=\u4E8C
-ButtonDemo.check3=\u4E09
-ButtonDemo.checkX=<html><font size=2 color=red>\u4E09<bold> (HTML!)</bold></font></html>
-
-ButtonDemo.customradio=\u5B9A\u5236 "chrome" \u5355\u9009\u6309\u94AE\u3002
-ButtonDemo.customcheck=\u5B9A\u5236\u201C\u706F\u6CE1\u201D\u590D\u9009\u6846\u3002
-
-ButtonDemo.phone=\u7535\u8BDD
-ButtonDemo.write=\u5199
-ButtonDemo.peace=\u5E73\u9759
-
-ButtonDemo.controlpanel.labelAndMnemonic=\u663E\u793A\u9009\u9879:
-ButtonDemo.paintborder.labelAndMnemonic=\u7ED8\u5236\u8FB9\u6846(&B)
-ButtonDemo.paintborder_tooltip=\u5355\u51FB\u6B64\u5904\u53EF\u6253\u5F00\u6216\u5173\u95ED\u8FB9\u6846\u7ED8\u5236\u3002
-ButtonDemo.paintfocus.labelAndMnemonic=\u7ED8\u5236\u7126\u70B9(&F)
-ButtonDemo.paintfocus_tooltip=\u5355\u51FB\u6B64\u5904\u53EF\u6253\u5F00\u6216\u5173\u95ED\u7126\u70B9\u7ED8\u5236\u3002
-ButtonDemo.enabled.labelAndMnemonic=\u542F\u7528(&E)
-ButtonDemo.enabled_tooltip=\u5355\u51FB\u6B64\u5904\u53EF\u542F\u7528\u6216\u7981\u7528\u6309\u94AE\u3002
-ButtonDemo.contentfilled.labelAndMnemonic=\u586B\u5145\u5185\u5BB9(&I)
-ButtonDemo.contentfilled_tooltip=\u5355\u51FB\u6B64\u5904\u53EF\u63A7\u5236\u5185\u5BB9\u533A\u57DF\u7684\u586B\u5145\u3002
-
-ButtonDemo.padamount.labelAndMnemonic=\u586B\u5145\u91CF:
-ButtonDemo.default.labelAndMnemonic=\u9ED8\u8BA4\u503C(&D)
-ButtonDemo.default_tooltip=\u5728\u8FB9\u6846\u4E0E\u6807\u7B7E\u4E4B\u95F4\u4F7F\u7528\u9ED8\u8BA4\u586B\u5145\u3002
+ButtonDemo.accessible_description=ButtonDemo 显示了使用 JButton, JRadioButton, JToggleButton 和 JCheckBox 的示例
+ButtonDemo.tooltip=JButton, JRadioButton, JToggleButton, JCheckbox 演示
+ButtonDemo.name=按钮演示
+
+ButtonDemo.buttons=按钮
+ButtonDemo.checkboxes=复选框
+ButtonDemo.radiobuttons=单选按钮
+ButtonDemo.togglebuttons=切换按钮
+
+ButtonDemo.textbuttons=文本按钮
+ButtonDemo.imagebuttons=图像按钮
+ButtonDemo.textradiobuttons=文本单选按钮
+ButtonDemo.imageradiobuttons=图像单选按钮
+ButtonDemo.texttogglebuttons=文本切换按钮
+ButtonDemo.imagetogglebuttons=图像切换按钮
+ButtonDemo.textcheckboxes=文本复选框
+ButtonDemo.imagecheckboxes=图像复选框
+
+ButtonDemo.button1=一
+ButtonDemo.button2=二
+ButtonDemo.button3=<html><font size=2 color=red><bold>三!</font></html>
+
+ButtonDemo.radio1=单选一
+ButtonDemo.radio2=单选二
+ButtonDemo.radio3=单选三
+ButtonDemo.radioX=<html><font size=2 color=red>三<bold> (HTML!)</bold></font></html>
+
+ButtonDemo.check1=一
+ButtonDemo.check2=二
+ButtonDemo.check3=三
+ButtonDemo.checkX=<html><font size=2 color=red>三<bold> (HTML!)</bold></font></html>
+
+ButtonDemo.customradio=定制 "chrome" 单选按钮。
+ButtonDemo.customcheck=定制“灯泡”复选框。
+
+ButtonDemo.phone=电话
+ButtonDemo.write=写
+ButtonDemo.peace=平静
+
+ButtonDemo.controlpanel.labelAndMnemonic=显示选项:
+ButtonDemo.paintborder.labelAndMnemonic=绘制边框(&B)
+ButtonDemo.paintborder_tooltip=单击此处可打开或关闭边框绘制。
+ButtonDemo.paintfocus.labelAndMnemonic=绘制焦点(&F)
+ButtonDemo.paintfocus_tooltip=单击此处可打开或关闭焦点绘制。
+ButtonDemo.enabled.labelAndMnemonic=启用(&E)
+ButtonDemo.enabled_tooltip=单击此处可启用或禁用按钮。
+ButtonDemo.contentfilled.labelAndMnemonic=填充内容(&I)
+ButtonDemo.contentfilled_tooltip=单击此处可控制内容区域的填充。
+
+ButtonDemo.padamount.labelAndMnemonic=填充量:
+ButtonDemo.default.labelAndMnemonic=默认值(&D)
+ButtonDemo.default_tooltip=在边框与标签之间使用默认填充。
 ButtonDemo.zero.labelAndMnemonic=&0
-ButtonDemo.zero_tooltip=\u5728\u8FB9\u6846\u4E0E\u6807\u7B7E\u4E4B\u95F4\u4E0D\u4F7F\u7528\u586B\u5145\u3002
+ButtonDemo.zero_tooltip=在边框与标签之间不使用填充。
 ButtonDemo.ten.labelAndMnemonic=&10
-ButtonDemo.ten_tooltip=\u5728\u8FB9\u6846\u4E0E\u6807\u7B7E\u4E4B\u95F4\u4F7F\u7528 10 \u50CF\u7D20\u586B\u5145\u3002
+ButtonDemo.ten_tooltip=在边框与标签之间使用 10 像素填充。
 
-LayoutControlPanel.textposition.labelAndMnemonic=\u6587\u672C\u4F4D\u7F6E:
-LayoutControlPanel.contentalignment.labelAndMnemonic=\u5185\u5BB9\u5BF9\u9F50:
+LayoutControlPanel.textposition.labelAndMnemonic=文本位置:
+LayoutControlPanel.contentalignment.labelAndMnemonic=内容对齐:
 
 ### ColorChooser Demo ###
 
-ColorChooserDemo.accessible_description=\u4F7F\u7528 ColorChooser, \u7528\u6237\u53EF\u4EE5\u4ECE\u8C03\u8272\u677F\u6216\u8005\u901A\u8FC7\u9009\u62E9 RGB \u6216 HSB \u503C\u6765\u9009\u53D6\u989C\u8272
-ColorChooserDemo.tooltip=JColorChooser \u6F14\u793A
-ColorChooserDemo.name=ColorChooser \u6F14\u793A
-ColorChooserDemo.chooser_title=\u9009\u62E9\u989C\u8272
-ColorChooserDemo.background=\u80CC\u666F
-ColorChooserDemo.grad_a=\u6E10\u53D8 1
-ColorChooserDemo.grad_b=\u6E10\u53D8 2
-ColorChooserDemo.outer_line=\u5468\u957F
-ColorChooserDemo.cup=Java \u5546\u6807\u7684\u5496\u5561\u676F\u56FE\u50CF
+ColorChooserDemo.accessible_description=使用 ColorChooser, 用户可以从调色板或者通过选择 RGB 或 HSB 值来选取颜色
+ColorChooserDemo.tooltip=JColorChooser 演示
+ColorChooserDemo.name=ColorChooser 演示
+ColorChooserDemo.chooser_title=选择颜色
+ColorChooserDemo.background=背景
+ColorChooserDemo.grad_a=渐变 1
+ColorChooserDemo.grad_b=渐变 2
+ColorChooserDemo.outer_line=周长
+ColorChooserDemo.cup=Java 商标的咖啡杯图像
 
 ### ComboBox Demo ###
 
-ComboBoxDemo.accessible_description=\u6B64\u6F14\u793A\u663E\u793A\u4E86\u4F7F\u7528 JComboBox \u7EC4\u4EF6\u7684\u793A\u4F8B\u3002
-ComboBoxDemo.tooltip=JComboBox \u6F14\u793A
-ComboBoxDemo.name=ComboBox \u6F14\u793A
+ComboBoxDemo.accessible_description=此演示显示了使用 JComboBox 组件的示例。
+ComboBoxDemo.tooltip=JComboBox 演示
+ComboBoxDemo.name=ComboBox 演示
 
-ComboBoxDemo.hair=\u5934\u53D1
-ComboBoxDemo.eyes=\u773C\u775B
-ComboBoxDemo.mouth=\u5634
-ComboBoxDemo.presets=\u9884\u8BBE:
+ComboBoxDemo.hair=头发
+ComboBoxDemo.eyes=眼睛
+ComboBoxDemo.mouth=嘴
+ComboBoxDemo.presets=预设:
 
 ComboBoxDemo.preset1=Philip, Howard, Jeff
 ComboBoxDemo.preset2=Jeff, Larry, Philip
@@ -279,9 +279,9 @@ ComboBoxDemo.preset9=James, Philip, Jon
 ComboBoxDemo.preset10=Lara, Jon, Scott
 
 
-ComboBoxDemo.hair_description=\u5934\u53D1:
-ComboBoxDemo.eyes_description=\u773C\u775B\u548C\u9F3B\u5B50:
-ComboBoxDemo.mouth_description=\u5634:
+ComboBoxDemo.hair_description=头发:
+ComboBoxDemo.eyes_description=眼睛和鼻子:
+ComboBoxDemo.mouth_description=嘴:
 
 ComboBoxDemo.amy=Amy
 ComboBoxDemo.brent=Brent
@@ -300,197 +300,197 @@ ComboBoxDemo.scott=Scott
 
 ### FileChooser Demo ###
 
-FileChooserDemo.accessible_description=\u4F7F\u7528 FileChooser, \u7528\u6237\u53EF\u4EE5\u9009\u62E9\u6587\u4EF6, \u901A\u5E38\u662F\u7528\u4E8E\u6253\u5F00\u6216\u521B\u5EFA/\u4FDD\u5B58\u3002
-FileChooserDemo.tooltip=JFileChooser \u6F14\u793A
-FileChooserDemo.name=FileChooser \u6F14\u793A
+FileChooserDemo.accessible_description=使用 FileChooser, 用户可以选择文件, 通常是用于打开或创建/保存。
+FileChooserDemo.tooltip=JFileChooser 演示
+FileChooserDemo.name=FileChooser 演示
 
-FileChooserDemo.plainbutton=\u663E\u793A\u65E0\u683C\u5F0F JFileChooser
-FileChooserDemo.previewbutton=\u663E\u793A\u9884\u89C8 JFileChooser
-FileChooserDemo.custombutton=\u663E\u793A\u5B9A\u5236 JFileChooser
+FileChooserDemo.plainbutton=显示无格式 JFileChooser
+FileChooserDemo.previewbutton=显示预览 JFileChooser
+FileChooserDemo.custombutton=显示定制 JFileChooser
 
-FileChooserDemo.description=<html>&&nbsp &&nbsp \u8BF7\u6CE8\u610F, \u60A8\u53EF\u4EE5\u4F7F\u7528\u4EFB\u610F\u591A\u4E2A\u7EC4\u4EF6\u8F7B\u677E\u521B\u5EFA<br> &&nbsp &&nbsp \u5B9A\u5236 FileChooser\u3002</html>
+FileChooserDemo.description=<html>&&nbsp &&nbsp 请注意, 您可以使用任意多个组件轻松创建<br> &&nbsp &&nbsp 定制 FileChooser。</html>
 
-FileChooserDemo.filterdescription=JPEG \u548C GIF \u56FE\u50CF\u6587\u4EF6
+FileChooserDemo.filterdescription=JPEG 和 GIF 图像文件
 
-FileChooserDemo.nofileselected=\u8BF7\u5148\u9009\u62E9\u4E00\u4E2A\u6587\u4EF6\u3002
-FileChooserDemo.thefile=\u6587\u4EF6:
-FileChooserDemo.isprobably=\u53EF\u80FD\u662F\u4E00\u4E2A\u56FE\u50CF\u3002
+FileChooserDemo.nofileselected=请先选择一个文件。
+FileChooserDemo.thefile=文件:
+FileChooserDemo.isprobably=可能是一个图像。
 
-FileChooserDemo.helptext=<html>\u67E5\u627E: \u67E5\u627E\u67D0\u4E2A\u6587\u4EF6\u3002<br>\u5173\u4E8E: \u4E86\u89E3\u6709\u5173\u8BE5\u6587\u4EF6\u7684\u8BE6\u7EC6\u4FE1\u606F\u3002<br>\u786E\u5B9A: \u9009\u62E9\u8BE5\u6587\u4EF6\u3002<br>\u53D6\u6D88: \u9000\u51FA\u6B64\u5BF9\u8BDD\u6846, \u800C\u4E0D\u8FDB\u884C\u4EFB\u4F55\u64CD\u4F5C\u3002</html>
+FileChooserDemo.helptext=<html>查找: 查找某个文件。<br>关于: 了解有关该文件的详细信息。<br>确定: 选择该文件。<br>取消: 退出此对话框, 而不进行任何操作。</html>
 
-FileChooserDemo.findquestion=\u67E5\u627E\u6587\u4EF6:
-FileChooserDemo.findresponse=<html><center>\u662F\u5426\u786E\u5B9E\u8981\u67E5\u627E\u6587\u4EF6?!?<br>\u6211\u4E0D\u77E5\u9053\u5982\u4F55\u6267\u884C\u8BE5\u64CD\u4F5C! \u8FD9\u53EA\u662F\u4E00\u4E2A\u6F14\u793A!</center></html>
+FileChooserDemo.findquestion=查找文件:
+FileChooserDemo.findresponse=<html><center>是否确实要查找文件?!?<br>我不知道如何执行该操作! 这只是一个演示!</center></html>
 
-FileChooserDemo.dialogtitle=\u5B9A\u5236\u5E03\u5C40 FileChooser
-FileChooserDemo.help=\u5E2E\u52A9
-FileChooserDemo.find=\u67E5\u627E
-FileChooserDemo.ok=\u786E\u5B9A
-FileChooserDemo.about=\u5173\u4E8E
-FileChooserDemo.cancel=\u53D6\u6D88
+FileChooserDemo.dialogtitle=定制布局 FileChooser
+FileChooserDemo.help=帮助
+FileChooserDemo.find=查找
+FileChooserDemo.ok=确定
+FileChooserDemo.about=关于
+FileChooserDemo.cancel=取消
 
 ### Html Demo ###
 
-HtmlDemo.accessible_description=\u672C\u6F14\u793A\u8BF4\u660E\u5982\u4F55\u4F7F\u7528 JEditorPane \u7EC4\u4EF6\u663E\u793A HTML \u6587\u672C\u3002
-HtmlDemo.tooltip=JEditorPane HTML \u6F14\u793A
-HtmlDemo.name=JEditorPane HTML \u6F14\u793A
+HtmlDemo.accessible_description=本演示说明如何使用 JEditorPane 组件显示 HTML 文本。
+HtmlDemo.tooltip=JEditorPane HTML 演示
+HtmlDemo.name=JEditorPane HTML 演示
 HtmlDemo.filename=swing.html
 
 
 ### Internal Frame Demo ###
 
-InternalFrameDemo.accessible_description=JInternal Frame \u6F14\u793A
-InternalFrameDemo.create_frames.labelAndMnemonic=\u521B\u5EFA\u5B9A\u5236\u7684\u5185\u90E8\u6846\u67B6
-InternalFrameDemo.title_text_field.labelAndMnemonic=\u6846\u67B6\u6807\u9898:
-InternalFrameDemo.frame.labelAndMnemonic=\u6846\u67B6
-InternalFrameDemo.palette.labelAndMnemonic=\u5185\u90E8\u6846\u67B6\u751F\u6210\u5668
-InternalFrameDemo.name=\u5185\u90E8\u6846\u67B6\u6F14\u793A
-InternalFrameDemo.tooltip=JInternalFrame \u6F14\u793A
-InternalFrameDemo.closable.labelAndMnemonic=\u53EF\u5173\u95ED
-InternalFrameDemo.resizable.labelAndMnemonic=\u53EF\u8C03\u6574\u5927\u5C0F
-InternalFrameDemo.iconifiable.labelAndMnemonic=\u53EF\u56FE\u6807\u5316
-InternalFrameDemo.maximizable.labelAndMnemonic=\u53EF\u6700\u5927\u5316
-InternalFrameDemo.toast=\u5E72\u676F
-InternalFrameDemo.duke=\u9601\u4E0B\uFF01
-InternalFrameDemo.duchess=\u516C\u7235\u592B\u4EBA
-InternalFrameDemo.cab=\u8C01\u9700\u8981\u51FA\u79DF\u8F66?
+InternalFrameDemo.accessible_description=JInternal Frame 演示
+InternalFrameDemo.create_frames.labelAndMnemonic=创建定制的内部框架
+InternalFrameDemo.title_text_field.labelAndMnemonic=框架标题:
+InternalFrameDemo.frame.labelAndMnemonic=框架
+InternalFrameDemo.palette.labelAndMnemonic=内部框架生成器
+InternalFrameDemo.name=内部框架演示
+InternalFrameDemo.tooltip=JInternalFrame 演示
+InternalFrameDemo.closable.labelAndMnemonic=可关闭
+InternalFrameDemo.resizable.labelAndMnemonic=可调整大小
+InternalFrameDemo.iconifiable.labelAndMnemonic=可图标化
+InternalFrameDemo.maximizable.labelAndMnemonic=可最大化
+InternalFrameDemo.toast=干杯
+InternalFrameDemo.duke=阁下！
+InternalFrameDemo.duchess=公爵夫人
+InternalFrameDemo.cab=谁需要出租车?
 
 
 ### List Demo ###
 
-ListDemo.accessible_description=JList \u6F14\u793A
-ListDemo.name=List \u6F14\u793A
-ListDemo.tooltip=JList \u6F14\u793A
-ListDemo.prefixes=\u524D\u7F00
-ListDemo.suffixes=\u540E\u7F00
-ListDemo.count.labelAndMnemonic=\u751F\u6210\u7684\u5217\u8868\u6761\u76EE\u6570:
-ListDemo.all=\u5168\u90E8
-ListDemo.none=\u65E0
-ListDemo.red=\u7EA2\u8272\u516C\u53F8\u5FBD\u6807\u56FE\u50CF
-ListDemo.yellow=\u7EA2\u8272\u516C\u53F8\u5FBD\u6807\u56FE\u50CF
-ListDemo.blue=\u84DD\u8272\u516C\u53F8\u5FBD\u6807\u56FE\u50CF
-ListDemo.gray=\u7070\u8272\u516C\u53F8\u5FBD\u6807\u56FE\u50CF
-ListDemo.green=\u7EFF\u8272\u516C\u53F8\u5FBD\u6807\u56FE\u50CF
-ListDemo.magenta=\u7D2B\u7EA2\u8272\u516C\u53F8\u5FBD\u6807\u56FE\u50CF
-ListDemo.cyan=\u9752\u8272\u516C\u53F8\u5FBD\u6807\u56FE\u50CF
-ListDemo.description=<html><P STYLE="margin-left: .25in; margin-right: .25in">\u672C\u6F14\u793A\u8BF4\u660E\u5982\u4F55\u7528\u4E24\u79CD\u4E0D\u540C\u7684\u65B9\u6CD5\u6765\u5448\u73B0\u6570\u636E\u7684\u5217\u8868\u3002\u5DE6\u4FA7\u662F\u4E00\u4E2A <b>JList</b> \u7EC4\u4EF6, \u5176\u4E2D\u7684\u5217\u8868\u9879\u7531\u9009\u4E2D\u7684\u524D\u7F00\u548C\u540E\u7F00\u7EC4\u6210\u3002\u53F3\u4FA7\u7684\u524D\u7F00\u548C\u540E\u7F00\u590D\u9009\u6846\u5217\u662F\u5728 <b>JScrollPane</b> \u4E2D\u4F7F\u7528\u5E26\u6709 Y \u8F74 <b>BoxLayout</b> \u7684 <b>JPanel</b> \u521B\u5EFA\u7684\u3002</P></html>
+ListDemo.accessible_description=JList 演示
+ListDemo.name=List 演示
+ListDemo.tooltip=JList 演示
+ListDemo.prefixes=前缀
+ListDemo.suffixes=后缀
+ListDemo.count.labelAndMnemonic=生成的列表条目数:
+ListDemo.all=全部
+ListDemo.none=无
+ListDemo.red=红色公司徽标图像
+ListDemo.yellow=红色公司徽标图像
+ListDemo.blue=蓝色公司徽标图像
+ListDemo.gray=灰色公司徽标图像
+ListDemo.green=绿色公司徽标图像
+ListDemo.magenta=紫红色公司徽标图像
+ListDemo.cyan=青色公司徽标图像
+ListDemo.description=<html><P STYLE="margin-left: .25in; margin-right: .25in">本演示说明如何用两种不同的方法来呈现数据的列表。左侧是一个 <b>JList</b> 组件, 其中的列表项由选中的前缀和后缀组成。右侧的前缀和后缀复选框列是在 <b>JScrollPane</b> 中使用带有 Y 轴 <b>BoxLayout</b> 的 <b>JPanel</b> 创建的。</P></html>
 
 
 ### OptionPane Demo ###
 
-OptionPaneDemo.accessible_description=OptionPane \u6F14\u793A\u663E\u793A\u4E86\u4F7F\u7528 JOptionPane \u751F\u6210\u4E0D\u540C\u7684\u5E38\u7528\u9009\u9879\u5BF9\u8BDD\u6846\u7684\u793A\u4F8B
-OptionPaneDemo.tooltip=JOptionPane \u6F14\u793A
-OptionPaneDemo.name=\u9009\u9879\u7A97\u683C\u6F14\u793A
-
-OptionPaneDemo.warningbutton=\u663E\u793A\u8B66\u544A\u5BF9\u8BDD\u6846
-OptionPaneDemo.componentbutton=\u663E\u793A\u7EC4\u4EF6\u5BF9\u8BDD\u6846
-OptionPaneDemo.inputbutton=\u663E\u793A\u8F93\u5165\u5BF9\u8BDD\u6846
-OptionPaneDemo.confirmbutton=\u663E\u793A\u786E\u8BA4\u5BF9\u8BDD\u6846
-OptionPaneDemo.messagebutton=\u663E\u793A\u6D88\u606F\u5BF9\u8BDD\u6846
-
-OptionPaneDemo.warningtitle=\u8B66\u544A\u5BF9\u8BDD\u6846\u793A\u4F8B
-OptionPaneDemo.warningtext=<html><P><font color=black>\u8FD9\u662F\u4E00\u6B21<font color=red><b>\u7D27\u6025\u5E7F\u64AD\u7CFB\u7EDF</b></font>\u6D4B\u8BD5\u3002<i><b>\u8FD9\u53EA\u662F<br>\u4E00\u6B21\u6D4B\u8BD5</b></i>\u3002\u81EA\u613F<br>\u4E0E<font color=blue><b>\u7F8E\u56FD\u8054\u90A6\u653F\u5E9C</b></font>\u548C<font color=blue><b>\u5DDE</b></font>\u6388\u6743\u673A\u6784\u534F\u4F5C\u7684\u672C\u5730 Intranet \u7684\u7F51\u7EDC\u7BA1\u7406\u5458<br>\u5F00\u53D1\u51FA\u4E86\u6B64\u7CFB\u7EDF, \u4EE5\u4FBF\u5728\u53D1\u751F\u7D27\u6025\u4E8B\u4EF6\u65F6\u901A\u77E5<br>\u60A8\u3002\u5982\u679C\u8FD9\u662F\u4E00\u4E2A\u771F\u5B9E\u7684\u7D27\u6025\u4E8B\u4EF6, \u5219\u521A\u521A<br>\u542C\u5230\u7684\u4FE1\u53F7\u4E4B\u540E\u5C06\u4F1A\u8DDF\u6709\u5B98\u65B9\u4FE1\u606F, \u65B0\u95FB<br>\u6216\u6307\u4EE4\u3002\u8FD9\u5C06\u7EC8\u6B62\u6B64\u6B21<font color=red><b>\u7D27\u6025<br>\u5E7F\u64AD\u7CFB\u7EDF</b></font>\u6D4B\u8BD5\u3002</font></P><P><br>\u5F00\u53D1\u8005\u8BF7\u6CE8\u610F: \u6B64\u5BF9\u8BDD\u6846\u6F14\u793A\u4E86\u4F7F\u7528 HTML \u8BBE\u7F6E\u6587\u672C\u683C\u5F0F\u3002</P></html>
-
-OptionPaneDemo.messagetext=\u74F6\u4E2D\u4FE1 (\u662F)
-
-OptionPaneDemo.confirmquestion=\u4ECA\u5929\u5929\u6C14\u6674\u6717\u5417?
-OptionPaneDemo.confirmyes=<html>\u8001\u662F\u5750\u5728\u7535\u8111\u65C1\u8FB9\u6709\u4EC0\u4E48\u610F\u601D?<br>\u5230\u6237\u5916\u53BB\u5427! \u5230\u6D77\u8FB9\u65C5\u884C\u53BB\u5427! \u4EAB\u53D7\u4E00\u4E0B\u9633\u5149!</html>
-OptionPaneDemo.confirmno=\u5F85\u5728\u5BA4\u5185\u53EF\u4EE5\u514D\u53D7\u81EA\u7136\u73AF\u5883\u7684\u4FB5\u5BB3, \u662F\u4EF6\u597D\u4E8B!
-
-OptionPaneDemo.inputquestion=\u60A8\u6700\u559C\u6B22\u54EA\u4E00\u90E8\u7535\u5F71?
-OptionPaneDemo.inputresponse=\u90A3\u662F\u4E00\u90E8\u76F8\u5F53\u597D\u770B\u7684\u7535\u5F71!
-
-OptionPaneDemo.componenttitle=\u7EC4\u4EF6\u5BF9\u8BDD\u6846\u793A\u4F8B
-OptionPaneDemo.componentmessage=<html>JOptionPane \u53EF\u4EE5\u5305\u542B\u4EFB\u610F\u591A\u4E2A\u7EC4\u4EF6<br>, \u4F8B\u5982\u6587\u672C\u5B57\u6BB5:</html>
-OptionPaneDemo.componenttextfield=\u6216\u8005\u7EC4\u5408\u6846:
-OptionPaneDemo.component_cb1=\u9879 1
-OptionPaneDemo.component_cb2=\u9879 2
-OptionPaneDemo.component_cb3=\u9879 3
-OptionPaneDemo.componentmessage2=<html>JOptionPane \u8FD8\u53EF\u4EE5\u663E\u793A\u4EFB\u610F\u591A\u4E2A<br>\u9009\u9879:</html>
-OptionPaneDemo.component_op1=\u662F
-OptionPaneDemo.component_op2=\u5426
-OptionPaneDemo.component_op3=\u6216\u8BB8
-OptionPaneDemo.component_op4=\u53EF\u80FD
-OptionPaneDemo.component_op5=\u53D6\u6D88
-
-OptionPaneDemo.component_r1=\u4E50\u89C2\u79EF\u6781! \u6211\u559C\u6B22\u8FD9\u6837! \u6B63\u786E\u7684\u9009\u62E9\u3002
-OptionPaneDemo.component_r2=\u4E00\u5B9A\u4E0D\u4F1A, \u6211\u4E5F\u4E0D\u4F1A\u90A3\u6837\u505A\u3002
-OptionPaneDemo.component_r3=<html><font color=black> \u55EF, \u662F\u7684, \u73B0\u5728\u60C5\u51B5\u8FD8\u4E0D<br>\u660E\u786E\u3002\u5F53\u60A8\u4E86\u89E3\u5230\u786E\u5207\u60C5\u51B5\u540E, \u8BF7\u8FDB\u884C\u6838\u5B9E\u3002</font></html>
-OptionPaneDemo.component_r4=<html><font color=black>\u8FD9\u624D\u662F\u60A8\u771F\u6B63\u60F3\u505A\u7684\u3002\u6211\u4EE5\u4E3A\u60A8\u672C\u5E94\u8BE5<br>\u575A\u51B3\u5730\u6309\u4E0B "\u662F"\u3002</font></html>
+OptionPaneDemo.accessible_description=OptionPane 演示显示了使用 JOptionPane 生成不同的常用选项对话框的示例
+OptionPaneDemo.tooltip=JOptionPane 演示
+OptionPaneDemo.name=选项窗格演示
+
+OptionPaneDemo.warningbutton=显示警告对话框
+OptionPaneDemo.componentbutton=显示组件对话框
+OptionPaneDemo.inputbutton=显示输入对话框
+OptionPaneDemo.confirmbutton=显示确认对话框
+OptionPaneDemo.messagebutton=显示消息对话框
+
+OptionPaneDemo.warningtitle=警告对话框示例
+OptionPaneDemo.warningtext=<html><P><font color=black>这是一次<font color=red><b>紧急广播系统</b></font>测试。<i><b>这只是<br>一次测试</b></i>。自愿<br>与<font color=blue><b>美国联邦政府</b></font>和<font color=blue><b>州</b></font>授权机构协作的本地 Intranet 的网络管理员<br>开发出了此系统, 以便在发生紧急事件时通知<br>您。如果这是一个真实的紧急事件, 则刚刚<br>听到的信号之后将会跟有官方信息, 新闻<br>或指令。这将终止此次<font color=red><b>紧急<br>广播系统</b></font>测试。</font></P><P><br>开发者请注意: 此对话框演示了使用 HTML 设置文本格式。</P></html>
+
+OptionPaneDemo.messagetext=瓶中信 (是)
+
+OptionPaneDemo.confirmquestion=今天天气晴朗吗?
+OptionPaneDemo.confirmyes=<html>老是坐在电脑旁边有什么意思?<br>到户外去吧! 到海边旅行去吧! 享受一下阳光!</html>
+OptionPaneDemo.confirmno=待在室内可以免受自然环境的侵害, 是件好事!
+
+OptionPaneDemo.inputquestion=您最喜欢哪一部电影?
+OptionPaneDemo.inputresponse=那是一部相当好看的电影!
+
+OptionPaneDemo.componenttitle=组件对话框示例
+OptionPaneDemo.componentmessage=<html>JOptionPane 可以包含任意多个组件<br>, 例如文本字段:</html>
+OptionPaneDemo.componenttextfield=或者组合框:
+OptionPaneDemo.component_cb1=项 1
+OptionPaneDemo.component_cb2=项 2
+OptionPaneDemo.component_cb3=项 3
+OptionPaneDemo.componentmessage2=<html>JOptionPane 还可以显示任意多个<br>选项:</html>
+OptionPaneDemo.component_op1=是
+OptionPaneDemo.component_op2=否
+OptionPaneDemo.component_op3=或许
+OptionPaneDemo.component_op4=可能
+OptionPaneDemo.component_op5=取消
+
+OptionPaneDemo.component_r1=乐观积极! 我喜欢这样! 正确的选择。
+OptionPaneDemo.component_r2=一定不会, 我也不会那样做。
+OptionPaneDemo.component_r3=<html><font color=black> 嗯, 是的, 现在情况还不<br>明确。当您了解到确切情况后, 请进行核实。</font></html>
+OptionPaneDemo.component_r4=<html><font color=black>这才是您真正想做的。我以为您本应该<br>坚决地按下 "是"。</font></html>
 
 ### ProgressBar Demo ###
 
-ProgressBarDemo.accessible_description=\u6B64\u6F14\u793A\u663E\u793A\u4E86\u4F7F\u7528 JProgressBar \u7EC4\u4EF6\u7684\u793A\u4F8B\u3002
-ProgressBarDemo.tooltip=JProgressBar \u6F14\u793A
-ProgressBarDemo.name=ProgressBar \u6F14\u793A
-ProgressBarDemo.start_button=\u5F00\u59CB\u52A0\u8F7D\u6587\u672C
-ProgressBarDemo.stop_button=\u505C\u6B62\u52A0\u8F7D\u6587\u672C
-ProgressBarDemo.accessible_text_loading_progress=\u6587\u672C\u52A0\u8F7D\u8FDB\u5EA6
-ProgressBarDemo.accessible_text_area_name=\u52A0\u8F7D\u7684\u6587\u672C\u6B63\u5728\u9010\u6E10\u589E\u591A
+ProgressBarDemo.accessible_description=此演示显示了使用 JProgressBar 组件的示例。
+ProgressBarDemo.tooltip=JProgressBar 演示
+ProgressBarDemo.name=ProgressBar 演示
+ProgressBarDemo.start_button=开始加载文本
+ProgressBarDemo.stop_button=停止加载文本
+ProgressBarDemo.accessible_text_loading_progress=文本加载进度
+ProgressBarDemo.accessible_text_area_name=加载的文本正在逐渐增多
 
-ProgressBarDemo.accessible_text_area_description=\u8FD9\u4E2A JTextArea \u7531\u6765\u81EA\u7F13\u51B2\u533A\u7684\u6587\u672C\u9010\u4E2A\u5B57\u7B26\u5730\u586B\u5145\uFF0C\u540C\u65F6\u7A97\u53E3\u5E95\u90E8\u7684\u8FDB\u5EA6\u680F\u5C06\u663E\u793A\u52A0\u8F7D\u7684\u8FDB\u5EA6
+ProgressBarDemo.accessible_text_area_description=这个 JTextArea 由来自缓冲区的文本逐个字符地填充，同时窗口底部的进度栏将显示加载的进度
 
-ProgressBarDemo.text=\u5E38\u8A00\u9053: \u5982\u679C\u65E0\u6570\u53EA\u7334\u5B50\u5728\u65E0\u6570\u53F0\u6253\u5B57\u673A\u4E0A\u6572\u51FB\u952E\u76D8, \u6700\u7EC8\n\u5C06\u5F62\u6210\u4EBA\u7C7B\u5386\u53F2\u4E0A\u6240\u6709\u4F1F\u5927\u7684\u8457\u4F5C\u3002\u73B0\u5728, \u6211\u4EEC\u53EF\u4EE5\u4F7F\u7528\u5F53\u4ECA\u7684\u9AD8\u901F\u8BA1\u7B97\u673A\u6765\u68C0\u9A8C\n\u8FD9\u4E00\u7406\u8BBA\u4E86... \n\n\tLzskd jfy 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4, th;qxhz d7yty; \n\tQ0hnlj 23&&^ (# ljask djf y92y; fy92y; Sd6y ty;q2h nl jk la gfa harvin garvel\n\tlasdfsd a83sl la8z ks8l 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4,\n\tth;qxhz d7yty; Q0hnlj 23&&^ nknod mrs88 jsd79lfm#%$JLaoz6df  lso7dj f2 jfls\n\t67d9ol1@2fou99s  1lkj2 @l.k1  2; a89o7aljf  1l3i7ou8 d8l3 lqwerty0092 #1!\n\tja9o do8lkjj139rojsd9**!l6*hd # ljasd78 l2awkjad78  3ol7asljf 3 ldif && l.js\n\tLl ls ewan la8uj 23lll7u 8l  3h hhxx8 8d  lsd fixx 891lkjno99sl d8l@@@!!8#8\n\tdfoil jarooda mklaoorj nowai the smisthliylka jkdlfjiw ladajadra lthhheeejfjl\n\tdkddooolda bub mirznod of the koojgaf!! But 2 be or not to be... that is the\n\tquestion. Then when shall we three meet again In thunder, lightning, or in\n\train? When the hurlyburly's done, When the battle's lost and won. That will\n\tbe ere the set of sun. Where the place? Upon the heath. There to meet with\n\tMacbeth. But hath forth not to want.....  a banana, or to be.... a banana.\n\tBanana, I knew him banana. Banana banana. Banana banana banana banana.\n\n\n\n\n\u5662, \u8FD9\u770B\u8D77\u6765\u662F\u4E2A\u597D\u4E3B\u610F...
+ProgressBarDemo.text=常言道: 如果无数只猴子在无数台打字机上敲击键盘, 最终\n将形成人类历史上所有伟大的著作。现在, 我们可以使用当今的高速计算机来检验\n这一理论了... \n\n\tLzskd jfy 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4, th;qxhz d7yty; \n\tQ0hnlj 23&&^ (# ljask djf y92y; fy92y; Sd6y ty;q2h nl jk la gfa harvin garvel\n\tlasdfsd a83sl la8z ks8l 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4,\n\tth;qxhz d7yty; Q0hnlj 23&&^ nknod mrs88 jsd79lfm#%$JLaoz6df  lso7dj f2 jfls\n\t67d9ol1@2fou99s  1lkj2 @l.k1  2; a89o7aljf  1l3i7ou8 d8l3 lqwerty0092 #1!\n\tja9o do8lkjj139rojsd9**!l6*hd # ljasd78 l2awkjad78  3ol7asljf 3 ldif && l.js\n\tLl ls ewan la8uj 23lll7u 8l  3h hhxx8 8d  lsd fixx 891lkjno99sl d8l@@@!!8#8\n\tdfoil jarooda mklaoorj nowai the smisthliylka jkdlfjiw ladajadra lthhheeejfjl\n\tdkddooolda bub mirznod of the koojgaf!! But 2 be or not to be... that is the\n\tquestion. Then when shall we three meet again In thunder, lightning, or in\n\train? When the hurlyburly's done, When the battle's lost and won. That will\n\tbe ere the set of sun. Where the place? Upon the heath. There to meet with\n\tMacbeth. But hath forth not to want.....  a banana, or to be.... a banana.\n\tBanana, I knew him banana. Banana banana. Banana banana banana banana.\n\n\n\n\n噢, 这看起来是个好主意...
 
 
 ### ScrollPane Demo ###
 
-ScrollPaneDemo.accessible_description=JScrollPane \u6F14\u793A
-ScrollPaneDemo.name=Scroll Pane \u6F14\u793A
-ScrollPaneDemo.tooltip=JScrollPane \u6F14\u793A
-ScrollPaneDemo.crayons=\u5F88\u591A\u5F69\u7B14
-ScrollPaneDemo.colheader=\u5217\u6807\u9898
-ScrollPaneDemo.rowheader=\u884C\u6807\u9898
-ScrollPaneDemo.upperleft=\u5DE6\u4E0A\u89D2
-ScrollPaneDemo.upperright=\u53F3\u4E0A\u5217\u6807\u9898\u89D2
-ScrollPaneDemo.lowerleft=\u5DE6\u4E0B\u884C\u6807\u9898\u89D2
+ScrollPaneDemo.accessible_description=JScrollPane 演示
+ScrollPaneDemo.name=Scroll Pane 演示
+ScrollPaneDemo.tooltip=JScrollPane 演示
+ScrollPaneDemo.crayons=很多彩笔
+ScrollPaneDemo.colheader=列标题
+ScrollPaneDemo.rowheader=行标题
+ScrollPaneDemo.upperleft=左上角
+ScrollPaneDemo.upperright=右上列标题角
+ScrollPaneDemo.lowerleft=左下行标题角
 
 
 ### Slider Demo ###
 
-SliderDemo.accessible_description=\u6B64\u6F14\u793A\u663E\u793A\u4E86\u4F7F\u7528 JSlider \u7EC4\u4EF6\u7684\u793A\u4F8B\u3002
-SliderDemo.tooltip=JSlider \u6F14\u793A
-SliderDemo.name=\u6ED1\u5757\u6F14\u793A
-
-SliderDemo.slidervalue=\u6ED1\u5757\u503C:
-SliderDemo.horizontal=\u6C34\u5E73
-SliderDemo.vertical=\u5782\u76F4
-SliderDemo.plain=\u65E0\u683C\u5F0F
-SliderDemo.a_plain_slider=\u65E0\u683C\u5F0F\u6ED1\u5757
-SliderDemo.majorticks=\u4E3B\u523B\u5EA6
-SliderDemo.majorticksdescription=\u663E\u793A\u4E3B\u523B\u5EA6\u7684\u6ED1\u5757
-SliderDemo.ticks=\u6B21\u523B\u5EA6, \u5BF9\u9F50\u523B\u5EA6\u548C\u6807\u7B7E
-SliderDemo.minorticks=\u6B21\u523B\u5EA6
-SliderDemo.minorticksdescription=\u6ED1\u5757\u663E\u793A\u4E3B\u523B\u5EA6\u548C\u6B21\u523B\u5EA6, \u6ED1\u5757\u52A8\u4F5C\u5C06\u5BF9\u9F50\u523B\u5EA6\u7EBF, \u5E76\u660E\u663E\u5730\u6807\u8BB0\u51FA\u67D0\u4E9B\u523B\u5EA6
-SliderDemo.disabled=\u5DF2\u7981\u7528
-SliderDemo.disableddescription=\u6ED1\u5757\u663E\u793A\u672A\u542F\u7528\u7684\u4E3B\u523B\u5EA6\u548C\u6B21\u523B\u5EA6 (\u65E0\u6CD5\u64CD\u4F5C
+SliderDemo.accessible_description=此演示显示了使用 JSlider 组件的示例。
+SliderDemo.tooltip=JSlider 演示
+SliderDemo.name=滑块演示
+
+SliderDemo.slidervalue=滑块值:
+SliderDemo.horizontal=水平
+SliderDemo.vertical=垂直
+SliderDemo.plain=无格式
+SliderDemo.a_plain_slider=无格式滑块
+SliderDemo.majorticks=主刻度
+SliderDemo.majorticksdescription=显示主刻度的滑块
+SliderDemo.ticks=次刻度, 对齐刻度和标签
+SliderDemo.minorticks=次刻度
+SliderDemo.minorticksdescription=滑块显示主刻度和次刻度, 滑块动作将对齐刻度线, 并明显地标记出某些刻度
+SliderDemo.disabled=已禁用
+SliderDemo.disableddescription=滑块显示未启用的主刻度和次刻度 (无法操作
 
 ### SplitPane Demo ###
 
-SplitPaneDemo.accessible_description=JSplitPane \u6F14\u793A
-SplitPaneDemo.name=Split Pane \u6F14\u793A
-SplitPaneDemo.tooltip=JSplitPane \u6F14\u793A
-SplitPaneDemo.earth=\u5730\u7403\u6BCD\u4EB2
-SplitPaneDemo.moon=\u6708\u7403\u4E0A\u7684\u5B87\u822A\u5458
-SplitPaneDemo.vert_split.labelAndMnemonic=\u5782\u76F4\u62C6\u5206(&V)
-SplitPaneDemo.horz_split.labelAndMnemonic=\u6C34\u5E73\u62C6\u5206(&R)
-SplitPaneDemo.cont_layout.labelAndMnemonic=\u8FDE\u7EED\u5E03\u5C40(&C)
-SplitPaneDemo.one_touch_expandable.labelAndMnemonic=\u70B9\u51FB\u53EF\u5C55\u5F00(&O)
-SplitPaneDemo.divider_size.labelAndMnemonic=\u5206\u9694\u7B26\u5927\u5C0F(&Z)
-SplitPaneDemo.invalid_divider_size=\u65E0\u6548\u7684\u5206\u9694\u7B26\u5927\u5C0F
-SplitPaneDemo.error=\u9519\u8BEF
-SplitPaneDemo.first_component_min_size.labelAndMnemonic=\u7B2C\u4E00\u4E2A\u7EC4\u4EF6\u7684\u6700\u5C0F\u5927\u5C0F(&I)
-SplitPaneDemo.second_component_min_size.labelAndMnemonic=\u7B2C\u4E8C\u7EC4\u4EF6\u7684\u6700\u5C0F\u5927\u5C0F(&N)
-SplitPaneDemo.invalid_min_size=\u65E0\u6548\u7684\u6700\u5C0F\u5927\u5C0F
-SplitPaneDemo.must_be_greater_than=\u5FC5\u987B\u5927\u4E8E
+SplitPaneDemo.accessible_description=JSplitPane 演示
+SplitPaneDemo.name=Split Pane 演示
+SplitPaneDemo.tooltip=JSplitPane 演示
+SplitPaneDemo.earth=地球母亲
+SplitPaneDemo.moon=月球上的宇航员
+SplitPaneDemo.vert_split.labelAndMnemonic=垂直拆分(&V)
+SplitPaneDemo.horz_split.labelAndMnemonic=水平拆分(&R)
+SplitPaneDemo.cont_layout.labelAndMnemonic=连续布局(&C)
+SplitPaneDemo.one_touch_expandable.labelAndMnemonic=点击可展开(&O)
+SplitPaneDemo.divider_size.labelAndMnemonic=分隔符大小(&Z)
+SplitPaneDemo.invalid_divider_size=无效的分隔符大小
+SplitPaneDemo.error=错误
+SplitPaneDemo.first_component_min_size.labelAndMnemonic=第一个组件的最小大小(&I)
+SplitPaneDemo.second_component_min_size.labelAndMnemonic=第二组件的最小大小(&N)
+SplitPaneDemo.invalid_min_size=无效的最小大小
+SplitPaneDemo.must_be_greater_than=必须大于
 
 
 ### TabbedPane Demo ###
 
-TabbedPaneDemo.accessible_description=\u6B64\u6F14\u793A\u663E\u793A\u4E86\u4F7F\u7528 JTabbedPane \u7EC4\u4EF6\u7684\u793A\u4F8B\u3002
-TabbedPaneDemo.tooltip=JTabbedPane \u6F14\u793A
-TabbedPaneDemo.name=TabbedPane \u6F14\u793A
+TabbedPaneDemo.accessible_description=此演示显示了使用 JTabbedPane 组件的示例。
+TabbedPaneDemo.tooltip=JTabbedPane 演示
+TabbedPaneDemo.name=TabbedPane 演示
 
-TabbedPaneDemo.bounce=<html><font color=blue><bold><center>\u5065\u5EB7\u6D3B\u6CFC\u7684\u5A74\u513F!</center></bold></font></html>
+TabbedPaneDemo.bounce=<html><font color=blue><bold><center>健康活泼的婴儿!</center></bold></font></html>
 TabbedPaneDemo.stephen=Stephen
 TabbedPaneDemo.david=David
 TabbedPaneDemo.matthew=Matthew
@@ -500,174 +500,174 @@ TabbedPaneDemo.brooke=Brooke
 TabbedPaneDemo.laine=Laine
 TabbedPaneDemo.hania=Hania
 
-TabbedPaneDemo.label=\u5236\u8868\u7B26\u4F4D\u7F6E:
-TabbedPaneDemo.top=\u9876\u90E8
-TabbedPaneDemo.bottom=\u5E95\u90E8
-TabbedPaneDemo.left=\u5DE6\u4FA7
-TabbedPaneDemo.right=\u53F3\u4FA7
+TabbedPaneDemo.label=制表符位置:
+TabbedPaneDemo.top=顶部
+TabbedPaneDemo.bottom=底部
+TabbedPaneDemo.left=左侧
+TabbedPaneDemo.right=右侧
 
 
 ### Table Demo ###
 
-TableDemo.accessible_description=JTable \u6F14\u793A
-TableDemo.name=Table \u6F14\u793A
-TableDemo.tooltip=JTable \u6F14\u793A
-TableDemo.all_columns=\u6240\u6709\u5217
-TableDemo.autoresize_mode=\u81EA\u52A8\u8C03\u6574\u5927\u5C0F\u6A21\u5F0F
-TableDemo.cell_selection=\u5355\u5143\u9009\u62E9
-TableDemo.column_boundaries=\u5217\u8FB9\u754C
-TableDemo.column_selection=\u5217\u9009\u62E9
-TableDemo.horz_lines=\u6C34\u5E73\u7EBF
-TableDemo.intercell_spacing=\u5355\u5143\u95F4\u8DDD
-TableDemo.intercell_spacing_colon=\u5355\u5143\u95F4\u8DDD:
-TableDemo.last_column=\u6700\u540E\u4E00\u5217
-TableDemo.multiple_ranges=\u591A\u4E2A\u533A\u57DF
-TableDemo.one_range=\u4E00\u4E2A\u533A\u57DF
-TableDemo.reordering_allowed=\u5141\u8BB8\u91CD\u6392
-TableDemo.row_height=\u884C\u9AD8
-TableDemo.row_height_colon=\u884C\u9AD8:
-TableDemo.row_selection=\u884C\u9009\u62E9
-TableDemo.selection_mode=\u9009\u62E9\u6A21\u5F0F
-TableDemo.subsequent_columns=\u540E\u7EED\u5217
-TableDemo.vert_lines=\u5782\u76F4\u7EBF
-TableDemo.single=\u5355\u4E00
-TableDemo.none=\u65E0
-TableDemo.off=\u5173
-TableDemo.first_name=\u540D
-TableDemo.last_name=\u59D3
-TableDemo.favorite_color=\u559C\u7231\u7684\u989C\u8272
-TableDemo.favorite_food=\u559C\u7231\u7684\u98DF\u54C1
-TableDemo.favorite_movie=\u559C\u7231\u7684\u7535\u5F71
-TableDemo.favorite_number=\u559C\u7231\u7684\u6570\u5B57
-TableDemo.aqua=\u6C34\u7EFF
-TableDemo.beige=\u6DE1\u68D5
-TableDemo.black=\u9ED1\u8272
-TableDemo.blue=\u84DD\u8272
-TableDemo.cybergreen=\u4EBA\u5DE5\u7EFF
-TableDemo.darkgreen=\u58A8\u7EFF
-TableDemo.eblue=\u7535\u5668\u84DD
-TableDemo.jfcblue=JFC \u57FA\u672C
-TableDemo.jfcblue2=JFC \u8F85\u52A9
-TableDemo.forestgreen=\u68EE\u6797\u7EFF
-TableDemo.gray=\u7070\u8272
-TableDemo.green=\u7EFF\u8272
-TableDemo.orange=\u6A59\u8272
-TableDemo.purple=\u7D2B\u8272
-TableDemo.red=\u7EA2\u8272
-TableDemo.rustred=\u9508\u7EA2
-TableDemo.sunpurple=\u592A\u9633\u7D2B
-TableDemo.suspectpink=\u7591\u60D1\u7C89\u7EA2
-TableDemo.turquoise=\u9752\u7EFF\u8272
-TableDemo.violet=\u7D2B\u7F57\u5170\u8272
-TableDemo.yellow=\u9EC4\u8272
-TableDemo.2001=2001 \u592A\u7A7A\u6F2B\u6E38
-TableDemo.buckaroo=\u5929\u751F\u7231\u795E
-TableDemo.firstsight=\u771F\u60C5\u96BE\u820D
-TableDemo.airplane=\u7A7A\u524D\u7EDD\u540E\u6EE1\u5929\u98DE (\u5168\u7CFB\u5217)
-TableDemo.aliens=\u5F02\u5F62
-TableDemo.bicycle=\u5077\u81EA\u884C\u8F66\u7684\u4EBA
-TableDemo.bladerunner=\u94F6\u7FFC\u6740\u624B (\u526A\u8F91)
-TableDemo.bluesbros=\u798F\u7984\u53CC\u9738\u5929
-TableDemo.brazil=\u5DF4\u897F
-TableDemo.bugs=\u866B\u866B\u7279\u653B\u961F
-TableDemo.city=\u7AE5\u68A6\u5931\u9B42\u591C
-TableDemo.chusingura=\u6700\u540E\u7684\u5FE0\u81E3\u85CF (1962)
-TableDemo.clock=\u53D1\u6761\u6A59
-TableDemo.curse=\u9B54\u9B3C\u7684\u8BC5\u5492
-TableDemo.dasboot=\u4ECE\u6D77\u5E95\u51FA\u51FB
-TableDemo.dazed=\u5E74\u5C11\u8F7B\u72C2
-TableDemo.defending=\u9634\u9633\u754C\u751F\u6B7B\u604B
-TableDemo.eraserhead=\u6A61\u76AE\u5934
-TableDemo.fifthelement=\u7B2C\u4E94\u5143\u7D20
-TableDemo.goodfellas=\u597D\u5BB6\u4F19
-TableDemo.harold=\u54C8\u6D1B\u4E0E\u6155\u5FB7
-TableDemo.joyluck=\u559C\u798F\u4F1A
-TableDemo.jules=\u7956\u4E0E\u5360
-TableDemo.ladyvanishes=\u8D35\u5987\u5931\u8E2A\u6848
-TableDemo.mohicans=\u6700\u540E\u7684\u6469\u6839\u6218\u58EB
-TableDemo.lonestar=\u5C0F\u9547\u7591\u4E91
-TableDemo.man=\u64D2\u51F6\u8BB0
-TableDemo.musicman=\u6B22\u4E50\u97F3\u4E50\u5999\u65E0\u7A77
-TableDemo.dog=\u72D7\u8138\u7684\u5C81\u6708
-TableDemo.oncewest=\u897F\u90E8\u5F80\u4E8B
-TableDemo.pulpfiction=\u4F4E\u4FD7\u5C0F\u8BF4
-TableDemo.raiders=\u593A\u5B9D\u5947\u5175
-TableDemo.reservoir=\u843D\u6C34\u72D7
-TableDemo.repoman=\u91CD\u751F\u7537\u4EBA
-TableDemo.spinaltap=\u6447\u6EDA\u4E07\u4E07\u5C81
-TableDemo.schindlerslist=\u8F9B\u5FB7\u52D2\u540D\u5355
-TableDemo.starwars=\u661F\u7403\u5927\u6218
-TableDemo.stuntman=\u7279\u6280\u66FF\u8EAB
-TableDemo.thinman=\u7626\u5B50
-TableDemo.withnail=\u6211\u4E0E\u957F\u6307\u7532
-TableDemo.labyrinth=\u9B54\u738B\u8FF7\u5BAB
-TableDemo.shawshank=\u8096\u7533\u514B\u7684\u6551\u8D4E
-TableDemo.apple=\u82F9\u679C
-TableDemo.asparagus=\u82A6\u7B0B
-TableDemo.banana=\u9999\u8549
-TableDemo.broccoli=\u7518\u84DD
-TableDemo.carrot=\u80E1\u841D\u535C
-TableDemo.cantaloupe=\u9999\u74DC
-TableDemo.corn=\u7389\u7C73
-TableDemo.grapes=\u8461\u8404
-TableDemo.grapefruit=\u67DA\u5B50
-TableDemo.kiwi=\u5947\u5F02\u679C
-TableDemo.onion=\u6D0B\u8471
-TableDemo.pear=\u68A8
-TableDemo.peach=\u6843\u5B50
-TableDemo.pepper=\u8FA3\u6912
-TableDemo.pickle=\u6CE1\u83DC
-TableDemo.pineapple=\u83E0\u841D
-TableDemo.raspberry=\u8986\u76C6\u5B50
-TableDemo.sparegrass=\u7FBD\u72B6\u79BE\u8349
-TableDemo.strawberry=\u8349\u8393
-TableDemo.tomato=\u756A\u8304
-TableDemo.watermelon=\u897F\u74DC
-
-TableDemo.printing=\u6253\u5370
-TableDemo.fitWidth=\u9002\u5408\u5BBD\u5EA6
-TableDemo.print=\u6253\u5370
-TableDemo.header=\u9875\u7709
+TableDemo.accessible_description=JTable 演示
+TableDemo.name=Table 演示
+TableDemo.tooltip=JTable 演示
+TableDemo.all_columns=所有列
+TableDemo.autoresize_mode=自动调整大小模式
+TableDemo.cell_selection=单元选择
+TableDemo.column_boundaries=列边界
+TableDemo.column_selection=列选择
+TableDemo.horz_lines=水平线
+TableDemo.intercell_spacing=单元间距
+TableDemo.intercell_spacing_colon=单元间距:
+TableDemo.last_column=最后一列
+TableDemo.multiple_ranges=多个区域
+TableDemo.one_range=一个区域
+TableDemo.reordering_allowed=允许重排
+TableDemo.row_height=行高
+TableDemo.row_height_colon=行高:
+TableDemo.row_selection=行选择
+TableDemo.selection_mode=选择模式
+TableDemo.subsequent_columns=后续列
+TableDemo.vert_lines=垂直线
+TableDemo.single=单一
+TableDemo.none=无
+TableDemo.off=关
+TableDemo.first_name=名
+TableDemo.last_name=姓
+TableDemo.favorite_color=喜爱的颜色
+TableDemo.favorite_food=喜爱的食品
+TableDemo.favorite_movie=喜爱的电影
+TableDemo.favorite_number=喜爱的数字
+TableDemo.aqua=水绿
+TableDemo.beige=淡棕
+TableDemo.black=黑色
+TableDemo.blue=蓝色
+TableDemo.cybergreen=人工绿
+TableDemo.darkgreen=墨绿
+TableDemo.eblue=电器蓝
+TableDemo.jfcblue=JFC 基本
+TableDemo.jfcblue2=JFC 辅助
+TableDemo.forestgreen=森林绿
+TableDemo.gray=灰色
+TableDemo.green=绿色
+TableDemo.orange=橙色
+TableDemo.purple=紫色
+TableDemo.red=红色
+TableDemo.rustred=锈红
+TableDemo.sunpurple=太阳紫
+TableDemo.suspectpink=疑惑粉红
+TableDemo.turquoise=青绿色
+TableDemo.violet=紫罗兰色
+TableDemo.yellow=黄色
+TableDemo.2001=2001 太空漫游
+TableDemo.buckaroo=天生爱神
+TableDemo.firstsight=真情难舍
+TableDemo.airplane=空前绝后满天飞 (全系列)
+TableDemo.aliens=异形
+TableDemo.bicycle=偷自行车的人
+TableDemo.bladerunner=银翼杀手 (剪辑)
+TableDemo.bluesbros=福禄双霸天
+TableDemo.brazil=巴西
+TableDemo.bugs=虫虫特攻队
+TableDemo.city=童梦失魂夜
+TableDemo.chusingura=最后的忠臣藏 (1962)
+TableDemo.clock=发条橙
+TableDemo.curse=魔鬼的诅咒
+TableDemo.dasboot=从海底出击
+TableDemo.dazed=年少轻狂
+TableDemo.defending=阴阳界生死恋
+TableDemo.eraserhead=橡皮头
+TableDemo.fifthelement=第五元素
+TableDemo.goodfellas=好家伙
+TableDemo.harold=哈洛与慕德
+TableDemo.joyluck=喜福会
+TableDemo.jules=祖与占
+TableDemo.ladyvanishes=贵妇失踪案
+TableDemo.mohicans=最后的摩根战士
+TableDemo.lonestar=小镇疑云
+TableDemo.man=擒凶记
+TableDemo.musicman=欢乐音乐妙无穷
+TableDemo.dog=狗脸的岁月
+TableDemo.oncewest=西部往事
+TableDemo.pulpfiction=低俗小说
+TableDemo.raiders=夺宝奇兵
+TableDemo.reservoir=落水狗
+TableDemo.repoman=重生男人
+TableDemo.spinaltap=摇滚万万岁
+TableDemo.schindlerslist=辛德勒名单
+TableDemo.starwars=星球大战
+TableDemo.stuntman=特技替身
+TableDemo.thinman=瘦子
+TableDemo.withnail=我与长指甲
+TableDemo.labyrinth=魔王迷宫
+TableDemo.shawshank=肖申克的救赎
+TableDemo.apple=苹果
+TableDemo.asparagus=芦笋
+TableDemo.banana=香蕉
+TableDemo.broccoli=甘蓝
+TableDemo.carrot=胡萝卜
+TableDemo.cantaloupe=香瓜
+TableDemo.corn=玉米
+TableDemo.grapes=葡萄
+TableDemo.grapefruit=柚子
+TableDemo.kiwi=奇异果
+TableDemo.onion=洋葱
+TableDemo.pear=梨
+TableDemo.peach=桃子
+TableDemo.pepper=辣椒
+TableDemo.pickle=泡菜
+TableDemo.pineapple=菠萝
+TableDemo.raspberry=覆盆子
+TableDemo.sparegrass=羽状禾草
+TableDemo.strawberry=草莓
+TableDemo.tomato=番茄
+TableDemo.watermelon=西瓜
+
+TableDemo.printing=打印
+TableDemo.fitWidth=适合宽度
+TableDemo.print=打印
+TableDemo.header=页眉
 
 # This string will be formatted by a MessageFormat and
 # printed at the top of each page of the printed result.
 # You can use {0} to insert a page number.
-TableDemo.headerText=JTable \u6253\u5370
+TableDemo.headerText=JTable 打印
 
-TableDemo.footer=\u9875\u811A
+TableDemo.footer=页脚
 
 # This string will be formatted by a MessageFormat and
 # printed at the bottom of each page of the printed result.
 # You can use {0} to insert a page number.
-TableDemo.footerText=\u7B2C {0} \u9875
+TableDemo.footerText=第 {0} 页
 
-TableDemo.printingResult=\u6253\u5370\u7ED3\u679C
-TableDemo.printingComplete=\u6253\u5370\u5B8C\u6210
-TableDemo.printingCancelled=\u6253\u5370\u5DF2\u53D6\u6D88
+TableDemo.printingResult=打印结果
+TableDemo.printingComplete=打印完成
+TableDemo.printingCancelled=打印已取消
 
 # This string will be formatted by a MessageFormat and
 # and displayed when an exception occurs.
 # {0} is used to place details of the exception.
-TableDemo.printingFailed=\u6253\u5370\u5931\u8D25: {0}
+TableDemo.printingFailed=打印失败: {0}
 
 
 ### ToolTip Demo ###
 
-ToolTipDemo.accessible_description=\u5DE5\u5177\u63D0\u793A\u4E2D\u663E\u793A\u7EC4\u4EF6\u7684\u7B80\u77ED\u5E2E\u52A9\u8BF4\u660E
-ToolTipDemo.accessible_cow=\u8FD9\u662F\u5976\u725B\u3002
-ToolTipDemo.tooltip=\u5DE5\u5177\u63D0\u793A\u6F14\u793A
-ToolTipDemo.name=\u5DE5\u5177\u63D0\u793A\u6F14\u793A
-ToolTipDemo.bessie=\u5976\u725B Bessie
-ToolTipDemo.cow=\u5976\u725B\u3002
-ToolTipDemo.got_milk=\u5F97\u5230\u5976\u4E86\u5417?
-ToolTipDemo.tail=\u5C3E\u5DF4\u3002
-ToolTipDemo.moo=\u54DE
-ToolTipDemo.tooltip_features=<html>\u5982\u679C\u60A8\u4EE5\u524D\u8BA4\u4E3A\u5DE5\u5177\u6307\u793A\u662F<p>\u975E\u5E38\u4E4F\u5473\u7684\u5355\u884C\u8BF4\u660E, \u90A3\u4E48 <font color=blue size=+2>Swing!</font> \u5C0F\u7EC4<p>\u4F1A\u8BA9\u60A8\u5BF9\u5DE5\u5177\u63D0\u793A\u6709\u4E00\u79CD\u5168\u65B0\u7684\u8BA4\u8BC6\u3002<p>\u5728 Swing \u4E2D, \u53EF\u4EE5\u4F7F\u7528 HTML \u6765\u5B9E\u73B0:<ul><li>\u5217\u8868\u5F62\u5F0F<li><b>\u7C97\u4F53</b>\u6587\u672C<li><em>\u5F3A\u8C03\u6027</em>\u6587\u672C<li><font color=red>\u5F69\u8272</font>\u6587\u672C<li>\u4E0D\u540C<font size=+3>\u5B57\u53F7</font>\u7684\u6587\u672C<li>\u4EE5\u53CA\u4E0D\u540C\u7684<font face=AvantGarde>\u5B57\u4F53</font></ul>\u5BF9\u4E86, \u8FD9\u4E9B\u6587\u672C\u4E5F\u53EF\u4EE5\u662F\u591A\u884C\u6587\u672C\u3002</html>
+ToolTipDemo.accessible_description=工具提示中显示组件的简短帮助说明
+ToolTipDemo.accessible_cow=这是奶牛。
+ToolTipDemo.tooltip=工具提示演示
+ToolTipDemo.name=工具提示演示
+ToolTipDemo.bessie=奶牛 Bessie
+ToolTipDemo.cow=奶牛。
+ToolTipDemo.got_milk=得到奶了吗?
+ToolTipDemo.tail=尾巴。
+ToolTipDemo.moo=哞
+ToolTipDemo.tooltip_features=<html>如果您以前认为工具指示是<p>非常乏味的单行说明, 那么 <font color=blue size=+2>Swing!</font> 小组<p>会让您对工具提示有一种全新的认识。<p>在 Swing 中, 可以使用 HTML 来实现:<ul><li>列表形式<li><b>粗体</b>文本<li><em>强调性</em>文本<li><font color=red>彩色</font>文本<li>不同<font size=+3>字号</font>的文本<li>以及不同的<font face=AvantGarde>字体</font></ul>对了, 这些文本也可以是多行文本。</html>
 
 
 ### Tree Demo ###
 
-TreeDemo.accessible_description=\u6B64\u6F14\u793A\u663E\u793A\u4E86\u4F7F\u7528 JTree \u7EC4\u4EF6\u7684\u793A\u4F8B\u3002
-TreeDemo.tooltip=JTree \u6F14\u793A
-TreeDemo.name=\u6811\u6F14\u793A
-TreeDemo.music=\u97F3\u4E50
+TreeDemo.accessible_description=此演示显示了使用 JTree 组件的示例。
+TreeDemo.tooltip=JTree 演示
+TreeDemo.name=树演示
+TreeDemo.music=音乐
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
index 2aea0b47e67..d6c988b1752 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
@@ -24,37 +24,37 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Verwendung: {0} [Optionen] <Hauptklasse> [args...]\n           (zur Ausf\u00FChrung einer Klasse)\n   oder  {0} [Optionen] -jar <JAR-Datei> [args...]\n           (zur Ausf\u00FChrung einer JAR-Datei)\n   oder  {0} [Optionen] -m <Modul>[/<Hauptklasse>] [args...]\n       {0} [Optionen] --module <Modul>[/<Hauptklasse>] [args...]\n            (zur Ausf\u00FChrung der Hauptklasse in einem Modul)\n   oder  {0} [Optionen] <Quelldatei> [args]\n           (zur Ausf\u00FChrung eines Programms mit einer einzelnen Quelldatei)\n\n Argumente, die auf die Hauptklasse, die Quelldatei, -jar <JAR-Datei>, -m oder --module\n <Modul>/<Hauptklasse> folgen, werden als Argumente f\u00FCr die\nHauptklasse \u00FCbergeben.\n\n Dabei umfasst "Optionen" Folgendes:\n\n
+java.launcher.opt.header  =   Verwendung: {0} [Optionen] <Hauptklasse> [args...]\n           (zur Ausführung einer Klasse)\n   oder  {0} [Optionen] -jar <JAR-Datei> [args...]\n           (zur Ausführung einer JAR-Datei)\n   oder  {0} [Optionen] -m <Modul>[/<Hauptklasse>] [args...]\n       {0} [Optionen] --module <Modul>[/<Hauptklasse>] [args...]\n            (zur Ausführung der Hauptklasse in einem Modul)\n   oder  {0} [Optionen] <Quelldatei> [args]\n           (zur Ausführung eines Programms mit einer einzelnen Quelldatei)\n\n Argumente, die auf die Hauptklasse, die Quelldatei, -jar <JAR-Datei>, -m oder --module\n <Modul>/<Hauptklasse> folgen, werden als Argumente für die\nHauptklasse übergeben.\n\n Dabei umfasst "Optionen" Folgendes:\n\n
 
 java.launcher.opt.vmselect   =\    {0}\t  zur Auswahl der "{1}" VM\n
-java.launcher.opt.hotspot    =\    {0}\t  ist ein Synonym f\u00FCr die "{1}" VM  [verworfen]\n
+java.launcher.opt.hotspot    =\    {0}\t  ist ein Synonym für die "{1}" VM  [verworfen]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    --class-path <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven, in denen nach Klassendateien gesucht wird.\n    -p <Modulpfad>\n    --module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Elementen, von denen jedes Element ein Dateipfad\n                  zu einem Modul oder einem Verzeichnis mit Modulen ist. Jedes Modul ist entweder\n                  ein modulares JAR oder ein entpacktes Modulverzeichnis.\n    --upgrade-module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Elementen, von denen jedes Element ein Dateipfad\n                  zu einem Modul oder einem Verzeichnis mit Modulen ist,\n                  um upgradef\u00E4hige Module im Laufzeitimage zu ersetzen. Jedes Modul ist entweder\n                  ein modulares JAR oder ein entpacktes Modulverzeichnis.\n    --add-modules <Modulname>[,<Modulname>...]\n                  Root-Module, die zus\u00E4tzlich zum anf\u00E4nglichen Modul aufgel\u00F6st werden sollen.\n                  <Modulname> kann auch wie folgt lauten: ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <Modulname>[,<Modulname>...]\n                  Module, die eingeschr\u00E4nkte native Vorg\u00E4nge ausf\u00FChren d\u00FCrfen.\n                  <Modulname> kann auch ALL-UNNAMED lauten.\n    --list-modules\n                  Listet beobachtbare Module auf und beendet den Vorgang\n    -d <Modulname>\n    --describe-module <Modulname>\n                  Beschreibt ein Modul und beendet den Vorgang\n    --dry-run     Erstellt eine VM und l\u00E4dt die Hauptklasse, f\u00FChrt aber nicht die Hauptmethode aus.\n                  Die Option "--dry-run" kann n\u00FCtzlich sein, um die\n                  Befehlszeilenoptionen, wie die Modulsystemkonfiguration, zu validieren.\n    --validate-modules\n                  Validiert alle Module und beendet den Vorgang\n                  Die Option "--validate-modules" kann n\u00FCtzlich sein, um\n                  Konflikte und andere Fehler mit Modulen auf dem Modulpfad zu ermitteln.\n    -D<Name>=<Wert>\n                  Legt eine Systemeigenschaft fest\n    -verbose:[class|module|gc|jni]\n                  Aktiviert die Verbose-Ausgabe f\u00FCr das angegebene Subsystem\n    -version      Gibt die Produktversion an den Fehlerstream aus und beendet den Vorgang\n    --version      Gibt die Produktversion an den Outputstream aus und beendet den Vorgang\n    -showversion  Gibt die Produktversion an den Fehlerstream aus und setzt den Vorgang fort\n    --show-version\n                  Gibt die Produktversion an den Outputstream aus und setzt den Vorgang fort\n    --show-module-resolution\n                  Zeigt die Modulaufl\u00F6sungsausgabe beim Start an\n    -? -h -help\n                  Gibt diese Hilfemeldung an den Fehlerstream aus\n    --help        Gibt diese Hilfemeldung an den Outputstream aus\n    -X            Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Fehlerstream aus\n    --help-extra  Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Outputstream aus\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertions mit angegebener Granularit\u00E4t\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertions mit angegebener Granularit\u00E4t\n    -esa | -enablesystemassertions\n                  Aktiviert System-Assertions\n    -dsa | -disablesystemassertions\n                  Deaktiviert System-Assertions\n    -agentlib:<libname>[=<options>]\n                  L\u00E4dt die native Agent Library <libname>. \
-Beispiel: -agentlib:jdwp\n                  siehe auch -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  L\u00E4dt die native Agent Library mit dem vollst\u00E4ndigen Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  L\u00E4dt den Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt den Startbildschirm mit einem angegebenen Bild an\n                  Skalierte HiDPI-Bilder werden automatisch unterst\u00FCtzt und verwendet,\n                  falls verf\u00FCgbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n                  muss immer als Argument an die Option "-splash" \u00FCbergeben werden.\n                  Das am besten geeignete angegebene skalierte Bild wird\n                  automatisch ausgew\u00E4hlt.\n                  Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n    @argument files\n                  Eine oder mehrere Argumentdateien mit Optionen\n    --disable-@files\n                  Verhindert die weitere Erweiterung von Argumentdateien\n    --enable-preview\n                  L\u00E4sst zu, das Klassen von Vorschaufeatures dieses Release abh\u00E4ngig sind\nUm ein Argument f\u00FCr eine lange Option anzugeben, k\u00F6nnen Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
+java.launcher.opt.footer = \    -cp <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    --class-path <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven, in denen nach Klassendateien gesucht wird.\n    -p <Modulpfad>\n    --module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Elementen, von denen jedes Element ein Dateipfad\n                  zu einem Modul oder einem Verzeichnis mit Modulen ist. Jedes Modul ist entweder\n                  ein modulares JAR oder ein entpacktes Modulverzeichnis.\n    --upgrade-module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Elementen, von denen jedes Element ein Dateipfad\n                  zu einem Modul oder einem Verzeichnis mit Modulen ist,\n                  um upgradefähige Module im Laufzeitimage zu ersetzen. Jedes Modul ist entweder\n                  ein modulares JAR oder ein entpacktes Modulverzeichnis.\n    --add-modules <Modulname>[,<Modulname>...]\n                  Root-Module, die zusätzlich zum anfänglichen Modul aufgelöst werden sollen.\n                  <Modulname> kann auch wie folgt lauten: ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <Modulname>[,<Modulname>...]\n                  Module, die eingeschränkte native Vorgänge ausführen dürfen.\n                  <Modulname> kann auch ALL-UNNAMED lauten.\n    --list-modules\n                  Listet beobachtbare Module auf und beendet den Vorgang\n    -d <Modulname>\n    --describe-module <Modulname>\n                  Beschreibt ein Modul und beendet den Vorgang\n    --dry-run     Erstellt eine VM und lädt die Hauptklasse, führt aber nicht die Hauptmethode aus.\n                  Die Option "--dry-run" kann nützlich sein, um die\n                  Befehlszeilenoptionen, wie die Modulsystemkonfiguration, zu validieren.\n    --validate-modules\n                  Validiert alle Module und beendet den Vorgang\n                  Die Option "--validate-modules" kann nützlich sein, um\n                  Konflikte und andere Fehler mit Modulen auf dem Modulpfad zu ermitteln.\n    -D<Name>=<Wert>\n                  Legt eine Systemeigenschaft fest\n    -verbose:[class|module|gc|jni]\n                  Aktiviert die Verbose-Ausgabe für das angegebene Subsystem\n    -version      Gibt die Produktversion an den Fehlerstream aus und beendet den Vorgang\n    --version      Gibt die Produktversion an den Outputstream aus und beendet den Vorgang\n    -showversion  Gibt die Produktversion an den Fehlerstream aus und setzt den Vorgang fort\n    --show-version\n                  Gibt die Produktversion an den Outputstream aus und setzt den Vorgang fort\n    --show-module-resolution\n                  Zeigt die Modulauflösungsausgabe beim Start an\n    -? -h -help\n                  Gibt diese Hilfemeldung an den Fehlerstream aus\n    --help        Gibt diese Hilfemeldung an den Outputstream aus\n    -X            Gibt Hilfe zu zusätzlichen Optionen an den Fehlerstream aus\n    --help-extra  Gibt Hilfe zu zusätzlichen Optionen an den Outputstream aus\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertions mit angegebener Granularität\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertions mit angegebener Granularität\n    -esa | -enablesystemassertions\n                  Aktiviert System-Assertions\n    -dsa | -disablesystemassertions\n                  Deaktiviert System-Assertions\n    -agentlib:<libname>[=<options>]\n                  Lädt die native Agent Library <libname>. \
+Beispiel: -agentlib:jdwp\n                  siehe auch -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  Lädt die native Agent Library mit dem vollständigen Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  Lädt den Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt den Startbildschirm mit einem angegebenen Bild an\n                  Skalierte HiDPI-Bilder werden automatisch unterstützt und verwendet,\n                  falls verfügbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n                  muss immer als Argument an die Option "-splash" übergeben werden.\n                  Das am besten geeignete angegebene skalierte Bild wird\n                  automatisch ausgewählt.\n                  Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n    @argument files\n                  Eine oder mehrere Argumentdateien mit Optionen\n    --disable-@files\n                  Verhindert die weitere Erweiterung von Argumentdateien\n    --enable-preview\n                  Lässt zu, das Klassen von Vorschaufeatures dieses Release abhängig sind\nUm ein Argument für eine lange Option anzugeben, können Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           Deaktiviert die Hintergrundkompilierung\n    -Xbootclasspath/a:<durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n                      An das Ende des Bootstrap Classpaths anh\u00E4ngen\n    -Xcheck:jni       F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen aus\n    -Xcomp            Erzwingt die Kompilierung von Methoden beim ersten Aufruf\n    -Xdebug           F\u00FChrt keine Aktion aus. Ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt.\n    -Xdiag            Zeigt zus\u00E4tzliche Diagnosemeldungen an\n    -Xfuture          Aktiviert strengste Pr\u00FCfungen, als m\u00F6glicher zuk\u00FCnftiger Standardwert erwartet.\n                      Diese Option ist veraltet und kann in einem\n                      zuk\u00FCnftigen Release entfernt werden.\n    -Xint             Nur Ausf\u00FChrung im interpretierten Modus\n    -Xinternalversion\n                      Zeigt detailliertere JVM-Versionsinformationen an als die\n                      Option -version\n    -Xlog:<Optionen>      Konfiguriert oder aktiviert Logging mit dem einheitlichen Java Virtual\n                      Machine-(JVM-)Logging-Framework. Verwenden Sie -Xlog:help\n                      f\u00FCr weitere Einzelheiten.\n    -Xloggc:<Datei>    Protokolliert den GC-Status in einer Datei mit Zeitstempeln.\n                      Diese Option ist veraltet und kann in einem\n                      zuk\u00FCnftigen Release entfernt werden. Wird durch -Xlog:gc:<Datei> ersetzt.\n    -Xmixed           Ausf\u00FChrung im gemischten Modus (Standard)\n    -Xmn<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche und maximale Gr\u00F6\u00DFe (in Byte) des Heaps\n                      f\u00FCr die Young Generation (Nursery) fest\n    -Xms<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche Java-Heap-Gr\u00F6\u00DFe fest\n    -Xmx<Gr\u00F6\u00DFe>        Legt die maximale Java-Heap-Gr\u00F6\u00DFe fest\n    -Xnoclassgc       Deaktiviert die Klassen-Garbage Collection\n    -Xrs               Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n    -Xshare:auto      Verwendet freigegebene Klassendaten, wenn m\u00F6glich (Standard)\n    -Xshare:off       Versucht nicht, freigegebene Klassendaten zu verwenden\n    -Xshare:on        Erfordert die Verwendung freigegebener Klassendaten, verl\u00E4uft sonst nicht erfolgreich.\n                      Diese Testoption kann zeitweise zu\n                      Fehlern f\u00FChren. Sie darf nicht in Produktionsumgebungen verwendet werden.\n    -XshowSettings    Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:all\n                      Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:locale\n                      Zeigt alle gebietsschemabezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:properties\n                      Zeigt alle Eigenschaftseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:vm\n                      Zeigt alle VM-bezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:security\n                      Zeigt alle Sicherheitseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:security:all\n                      Zeigt alle Sicherheitseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:security:properties\n                      Zeigt Sicherheitseigenschaften an und f\u00E4hrt fort\n    -XshowSettings:security:providers\n                      Zeigt statische Sicherheitsprovidereinstellungen an und f\u00E4hrt fort\n    -XshowSettings:security:tls\n                      Zeigt TLS-bezogene Sicherheitseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:system\n                      (Nur Linux) Zeigt die Konfiguration des Hostsystems oder Containers an\n                      und f\u00E4hrt fort\n    -Xss<Gr\u00F6\u00DFe>        Legt die Stackgr\u00F6\u00DFe des Java-Threads fest\n                      Die tats\u00E4chliche Gr\u00F6\u00DFe \
-kann auf ein Vielfaches der\n                      Systemseitengr\u00F6\u00DFe aufgerundet werden, wenn f\u00FCr das Betriebssystem erforderlich.\n    -Xverify          Legt den Modus der Bytecodeverifizierung fest\n                      Beachten Sie, dass die Option -Xverify:none veraltet ist und\n                      in einem zuk\u00FCnftigen Release entfernt werden kann.\n    --add-reads <Modul>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, damit <Zielmodul> gelesen wird, ungeachtet\n                      der Moduldeklaration. \n                      <Zielmodul> kann ALL-UNNAMED sein, um alle unbenannten\n                      Module zu lesen.\n    --add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in <Zielmodul> zu exportieren,\n                      ungeachtet der Moduldeklaration.\n                      <Zielmodul> kann ALL-UNNAMED sein, um in alle\n                      unbenannten Module zu exportieren.\n    --add-opens <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in\n                      <Zielmodul> zu \u00F6ffnen, ungeachtet der Moduldeklaration.\n    --limit-modules <Modulname>[,<Modulname>...]\n                      Grenzt die Gesamtmenge der beobachtbaren Module ein\n    --patch-module <Modul>=<Datei>({0}<Datei>)*\n                      \u00DCberschreibt oder erweitert ein Modul mit Klassen und Ressourcen\n                      in JAR-Dateien oder Verzeichnissen.\n    --source <Version>\n                      Legt die Version der Quelle im Quelldateimodus fest.\n    --finalization=<Wert>\n                      Steuert, ob die JVM Objekte finalisiert.\n                      Dabei ist <Wert> entweder "enabled" oder "disabled".\n                      Die Finalisierung ist standardm\u00E4\u00DFig aktiviert.\n\nDiese zus\u00E4tzlichen Optionen k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.\n
+java.launcher.X.usage=\n    -Xbatch           Deaktiviert die Hintergrundkompilierung\n    -Xbootclasspath/a:<durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n                      An das Ende des Bootstrap Classpaths anhängen\n    -Xcheck:jni       Führt zusätzliche Prüfungen für JNI-Funktionen aus\n    -Xcomp            Erzwingt die Kompilierung von Methoden beim ersten Aufruf\n    -Xdebug           Führt keine Aktion aus. Ist veraltet und wird in einem zukünftigen Release entfernt.\n    -Xdiag            Zeigt zusätzliche Diagnosemeldungen an\n    -Xfuture          Aktiviert strengste Prüfungen, als möglicher zukünftiger Standardwert erwartet.\n                      Diese Option ist veraltet und kann in einem\n                      zukünftigen Release entfernt werden.\n    -Xint             Nur Ausführung im interpretierten Modus\n    -Xinternalversion\n                      Zeigt detailliertere JVM-Versionsinformationen an als die\n                      Option -version\n    -Xlog:<Optionen>      Konfiguriert oder aktiviert Logging mit dem einheitlichen Java Virtual\n                      Machine-(JVM-)Logging-Framework. Verwenden Sie -Xlog:help\n                      für weitere Einzelheiten.\n    -Xloggc:<Datei>    Protokolliert den GC-Status in einer Datei mit Zeitstempeln.\n                      Diese Option ist veraltet und kann in einem\n                      zukünftigen Release entfernt werden. Wird durch -Xlog:gc:<Datei> ersetzt.\n    -Xmixed           Ausführung im gemischten Modus (Standard)\n    -Xmn<Größe>        Legt die anfängliche und maximale Größe (in Byte) des Heaps\n                      für die Young Generation (Nursery) fest\n    -Xms<Größe>        Legt die anfängliche Java-Heap-Größe fest\n    -Xmx<Größe>        Legt die maximale Java-Heap-Größe fest\n    -Xnoclassgc       Deaktiviert die Klassen-Garbage Collection\n    -Xrs               Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n    -Xshare:auto      Verwendet freigegebene Klassendaten, wenn möglich (Standard)\n    -Xshare:off       Versucht nicht, freigegebene Klassendaten zu verwenden\n    -Xshare:on        Erfordert die Verwendung freigegebener Klassendaten, verläuft sonst nicht erfolgreich.\n                      Diese Testoption kann zeitweise zu\n                      Fehlern führen. Sie darf nicht in Produktionsumgebungen verwendet werden.\n    -XshowSettings    Zeigt alle Einstellungen an und fährt fort\n    -XshowSettings:all\n                      Zeigt alle Einstellungen an und fährt fort\n    -XshowSettings:locale\n                      Zeigt alle gebietsschemabezogenen Einstellungen an und fährt fort\n    -XshowSettings:properties\n                      Zeigt alle Eigenschaftseinstellungen an und fährt fort\n    -XshowSettings:vm\n                      Zeigt alle VM-bezogenen Einstellungen an und fährt fort\n    -XshowSettings:security\n                      Zeigt alle Sicherheitseinstellungen an und fährt fort\n    -XshowSettings:security:all\n                      Zeigt alle Sicherheitseinstellungen an und fährt fort\n    -XshowSettings:security:properties\n                      Zeigt Sicherheitseigenschaften an und fährt fort\n    -XshowSettings:security:providers\n                      Zeigt statische Sicherheitsprovidereinstellungen an und fährt fort\n    -XshowSettings:security:tls\n                      Zeigt TLS-bezogene Sicherheitseinstellungen an und fährt fort\n    -XshowSettings:system\n                      (Nur Linux) Zeigt die Konfiguration des Hostsystems oder Containers an\n                      und fährt fort\n    -Xss<Größe>        Legt die Stackgröße des Java-Threads fest\n                      Die tatsächliche Größe \
+kann auf ein Vielfaches der\n                      Systemseitengröße aufgerundet werden, wenn für das Betriebssystem erforderlich.\n    -Xverify          Legt den Modus der Bytecodeverifizierung fest\n                      Beachten Sie, dass die Option -Xverify:none veraltet ist und\n                      in einem zukünftigen Release entfernt werden kann.\n    --add-reads <Modul>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, damit <Zielmodul> gelesen wird, ungeachtet\n                      der Moduldeklaration. \n                      <Zielmodul> kann ALL-UNNAMED sein, um alle unbenannten\n                      Module zu lesen.\n    --add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in <Zielmodul> zu exportieren,\n                      ungeachtet der Moduldeklaration.\n                      <Zielmodul> kann ALL-UNNAMED sein, um in alle\n                      unbenannten Module zu exportieren.\n    --add-opens <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in\n                      <Zielmodul> zu öffnen, ungeachtet der Moduldeklaration.\n    --limit-modules <Modulname>[,<Modulname>...]\n                      Grenzt die Gesamtmenge der beobachtbaren Module ein\n    --patch-module <Modul>=<Datei>({0}<Datei>)*\n                      Überschreibt oder erweitert ein Modul mit Klassen und Ressourcen\n                      in JAR-Dateien oder Verzeichnissen.\n    --source <Version>\n                      Legt die Version der Quelle im Quelldateimodus fest.\n    --finalization=<Wert>\n                      Steuert, ob die JVM Objekte finalisiert.\n                      Dabei ist <Wert> entweder "enabled" oder "disabled".\n                      Die Finalisierung ist standardmäßig aktiviert.\n\nDiese zusätzlichen Optionen können jederzeit ohne vorherige Ankündigung geändert werden.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr macOS spezifisch:\n    -XstartOnFirstThread\n                      F\u00FChrt die main()-Methode f\u00FCr den ersten (AppKit-)Thread aus\n    -Xdock:name=<Anwendungsname>\n                      Setzt den im Dock angezeigten Standardanwendungsnamen au\u00DFer Kraft\n    -Xdock:icon=<Pfad zu Symboldatei>\n                      Setzt das im Dock angezeigte Standardsymbol au\u00DFer Kraft\n\n
+java.launcher.X.macosx.usage=\nDie folgenden Optionen sind für macOS spezifisch:\n    -XstartOnFirstThread\n                      Führt die main()-Methode für den ersten (AppKit-)Thread aus\n    -Xdock:name=<Anwendungsname>\n                      Setzt den im Dock angezeigten Standardanwendungsnamen außer Kraft\n    -Xdock:icon=<Pfad zu Symboldatei>\n                      Setzt das im Dock angezeigte Standardsymbol außer Kraft\n\n
 
 java.launcher.cls.error1=Fehler: Hauptklasse {0} konnte nicht gefunden oder geladen werden\nUrsache: {1}: {2}
 java.launcher.cls.error2=Fehler: Hauptmethode ist nicht {0} in Klasse {1}. Definieren Sie die Hauptmethode als:\n   public static void main(String[] args)
-java.launcher.cls.error3=Fehler: Hauptmethode muss einen Wert vom Typ void in Klasse {0} zur\u00FCckgeben. Definieren Sie \ndie Hauptmethode als:\n   public static void main(String[] args)
+java.launcher.cls.error3=Fehler: Hauptmethode muss einen Wert vom Typ void in Klasse {0} zurückgeben. Definieren Sie \ndie Hauptmethode als:\n   public static void main(String[] args)
 java.launcher.cls.error4=Fehler: Hauptmethode in Klasse {0} nicht gefunden. Definieren Sie die Hauptmethode als:\n   public static void main(String[] args):\noder eine JavaFX-Anwendung muss {1} erweitern
-java.launcher.cls.error5=Fehler: Zum Ausf\u00FChren dieser Anwendung ben\u00F6tigte JavaFX-Runtime-Komponenten fehlen
+java.launcher.cls.error5=Fehler: Zum Ausführen dieser Anwendung benötigte JavaFX-Runtime-Komponenten fehlen
 java.launcher.cls.error6=Fehler: Beim Laden der Klasse {0} ist ein LinkageError aufgetreten\n\t{1}
 java.launcher.cls.error7=Fehler: Hauptklasse {0} kann nicht initialisiert werden\nUrsache: {1}: {2}
 java.launcher.cls.error8=Fehler: Kein nicht privater Null-Argument-Konstruktor in Klasse {0} gefunden\nEntfernen Sie die Eigenschaft "private" aus dem vorhandenen Konstruktor, oder definieren Sie ihn als:\n   public {0}()
 java.launcher.cls.error9=Fehler: Konstruktor mit nicht statischer innerer Klasse {0} kann nicht aufgerufen werden \nLegen Sie die innere Klasse als statisch fest, oder verschieben Sie sie in eine separate Quelldatei
-java.launcher.jar.error1=Fehler: Beim Versuch, Datei {0} zu \u00F6ffnen, ist ein unerwarteter Fehler aufgetreten
+java.launcher.jar.error1=Fehler: Beim Versuch, Datei {0} zu öffnen, ist ein unerwarteter Fehler aufgetreten
 java.launcher.jar.error2=Manifest in {0} nicht gefunden
 java.launcher.jar.error3=kein Hauptmanifestattribut, in {0}
 java.launcher.jar.error4=Fehler beim Laden des Java-Agents in {0}
 java.launcher.init.error=Initialisierungsfehler
-java.launcher.javafx.error1=Fehler: Die JavaFX-Methode launchApplication hat die falsche Signatur, sie\nmuss als statisch deklariert werden und einen Wert vom Typ VOID zur\u00FCckgeben
+java.launcher.javafx.error1=Fehler: Die JavaFX-Methode launchApplication hat die falsche Signatur, sie\nmuss als statisch deklariert werden und einen Wert vom Typ VOID zurückgeben
 java.launcher.module.error1=Modul {0} weist kein ModuleMainClass-Attribut auf. Verwenden Sie -m <module>/<main-class>
 java.launcher.module.error2=Fehler: Hauptklasse {0} konnte in Modul {1} nicht gefunden oder geladen werden
 java.launcher.module.error3=Fehler: Hauptklasse {0} kann nicht in Modul {1} geladen werden\n\t{2}
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_es.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_es.properties
index 8f08f315250..66270f21d4f 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_es.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_es.properties
@@ -24,37 +24,37 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Sintaxis: {0} [opciones] <clase principal> [argumentos...]\n           (para ejecutar una clase)\n   o  {0} [opciones] -jar <archivo jar> [argumentos...]\n           (para ejecutar un archivo jar)\n   o  {0} [opciones] -m <m\u00F3dulo>[/<clase principal>] [argumentos...]\n       {0} [opciones] --module <m\u00F3dulo>[/<clase principal>] [argumentos...]\n           (para ejecutar la clase principal en un m\u00F3dulo)\n\n Argumentos que siguen la clase principal, -jar <archivo jar>, -m o --module\n <m\u00F3dulo>/<clase principal> se transfieren como argumentos a una clase principal.\n\n donde las opciones incluyen:\n\n
+java.launcher.opt.header  =   Sintaxis: {0} [opciones] <clase principal> [argumentos...]\n           (para ejecutar una clase)\n   o  {0} [opciones] -jar <archivo jar> [argumentos...]\n           (para ejecutar un archivo jar)\n   o  {0} [opciones] -m <módulo>[/<clase principal>] [argumentos...]\n       {0} [opciones] --module <módulo>[/<clase principal>] [argumentos...]\n           (para ejecutar la clase principal en un módulo)\n\n Argumentos que siguen la clase principal, -jar <archivo jar>, -m o --module\n <módulo>/<clase principal> se transfieren como argumentos a una clase principal.\n\n donde las opciones incluyen:\n\n
 
 java.launcher.opt.vmselect   =\    {0}\t  para seleccionar la VM "{1}"\n
-java.launcher.opt.hotspot    =\    {0}\t  es un sin\u00F3nimo de la VM "{1}" [en desuso]\n
+java.launcher.opt.hotspot    =\    {0}\t  es un sinónimo de la VM "{1}" [en desuso]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <ruta de b\u00FAsqueda de clase de directorios y archivos zip/jar>\n    -classpath <ruta de b\u00FAsqueda de clase de directorios y archivos zip/jar>\n    --class-path <ruta de b\u00FAsqueda de clase de directorios y archivos zip/jar>\n                  Una lista separada por el car\u00E1cter {0}, archivos JAR\n                  y archivos ZIP para buscar archivos de clases.\n    -p <ruta m\u00F3dulo>\n    --module-path <ruta m\u00F3dulo>...\n                  Una lista de directorios separada por el car\u00E1cter {0}, cada directorio\n                  es un directorio de m\u00F3dulos.\n    --upgrade-module-path <ruta m\u00F3dulo>...\n                  Una lista de directorios separada por el car\u00E1cter {0}, cada directorio\n                  es un directorio de m\u00F3dulos que sustituye a\n                  los m\u00F3dulos actualizables en la imagen de tiempo de ejecuci\u00F3n\n    --add-modules <nombre m\u00F3dulo>[,<nombre m\u00F3dulo>...]\n                  m\u00F3dulos de ra\u00EDz que resolver, adem\u00E1s del m\u00F3dulo inicial.\n                  <nombre m\u00F3dulo> tambi\u00E9n puede ser ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  mostrar m\u00F3dulos observables y salir\n    -d <nombre de m\u00F3dulo>\n    --describe-module <nombre m\u00F3dulo>\n                  describir un m\u00F3dulo y salir\n    --dry-run     crear VM y cargar la clase principal pero sin ejecutar el m\u00E9todo principal.\n                  La opci\u00F3n --dry-run puede ser \u00FAtil para validar\n                  las opciones de l\u00EDnea de comandos, como la configuraci\u00F3n del sistema de m\u00F3dulos.\n    --validate-modules\n                  validar todos los m\u00F3dulos y salir\n                  La opci\u00F3n --validate-modules puede ser \u00FAtil para encontrar\n                  conflictos y otros errores con m\u00F3dulos en la ruta de m\u00F3dulos.\n    -D<nombre>=<valor>\n                  definir una propiedad de sistema\n    -verbose:[class|module|gc|jni]\n                  activar la salida en modo verbose\n    -version      imprimir versi\u00F3n de producto en el flujo de errores y salir\n    --version     imprimir versi\u00F3n de producto en el flujo de salida y salir\n    -showversion  imprimir versi\u00F3n de producto en el flujo de errores y continuar\n    --show-version\n                  -showversion  imprimir versi\u00F3n de producto en el flujo de salida y continuar\n    --show-module-resolution\n                  mostrar la salida de resoluci\u00F3n de m\u00F3dulo durante el inicio\n    -? -h -help\n                  imprimir este mensaje de ayuda en el flujo de errores\n    --help        imprimir este mensaje de ayuda en el flujo de salida\n    -X            imprimir ayuda de opciones adicionales en el flujo de errores\n    --help-extra  imprimir ayuda de opciones adicionales en el flujo de salida\n    -ea[:<nombre paquete>...|:<nombre clase>]\n    -enableassertions[:<nombre paquete>...|:<nombre clase>]\n                  activar afirmaciones con una granularidad especificada\n    -da[:<nombre paquete>...|:<nombre clase>]\n    -disableassertions[:<nombre paquete>...|:<nombre clase>]\n                  desactivar afirmaciones con una granularidad especificada\n    -esa | -enablesystemassertions\n                  activar afirmaciones del sistema\n    -dsa | -disablesystemassertions\n                  desactivar afirmaciones del sistema\n    -agentlib:<nombre bib>[=<opciones>]\n                  cargar biblioteca de agente nativo <nombre bib>, por ejemplo, -agentlib:jdwp\n                  ver tambi\u00E9n -agentlib:jdwp=help\n    -agentpath:<nombre ruta>[=<opciones>]\n                  cargar biblioteca de agente nativo por nombre completo de ruta\n    -javaagent:<ruta jar>[=<opciones>]\n                  cargar agente de lenguaje de programaci\u00F3n Java, ver java.lang.instrument\n    -splash:<ruta imagen>\n       \
-           mostrar pantalla de presentaci\u00F3n con imagen especificada\n                  Las im\u00E1genes a escala HiDPI est\u00E1n soportadas y se usan autom\u00E1ticamente\n                  si est\u00E1n disponibles. El nombre de archivo de la imagen sin escala, por ejemplo, image.ext,\n                  siempre debe transmitirse como el argumento para la opci\u00F3n -splash.\n                  La imagen a escala m\u00E1s adecuada que se haya proporcionado se escoger\u00E1\n                  autom\u00E1ticamente.\n                  Consulte la documentaci\u00F3n de la API de la pantalla de presentaci\u00F3n para obtener m\u00E1s informaci\u00F3n.\n    @argument files\n                  uno o m\u00E1s archivos de argumentos que contienen opciones\n    --disable-@files\n                  evitar una mayor expansi\u00F3n del archivo de argumentos\nPara especificar un argumento para una opci\u00F3n larga, puede usar --<nombre>=<valor> o\n--<nombre> <valor>.\n
+java.launcher.opt.footer = \    -cp <ruta de búsqueda de clase de directorios y archivos zip/jar>\n    -classpath <ruta de búsqueda de clase de directorios y archivos zip/jar>\n    --class-path <ruta de búsqueda de clase de directorios y archivos zip/jar>\n                  Una lista separada por el carácter {0}, archivos JAR\n                  y archivos ZIP para buscar archivos de clases.\n    -p <ruta módulo>\n    --module-path <ruta módulo>...\n                  Una lista de directorios separada por el carácter {0}, cada directorio\n                  es un directorio de módulos.\n    --upgrade-module-path <ruta módulo>...\n                  Una lista de directorios separada por el carácter {0}, cada directorio\n                  es un directorio de módulos que sustituye a\n                  los módulos actualizables en la imagen de tiempo de ejecución\n    --add-modules <nombre módulo>[,<nombre módulo>...]\n                  módulos de raíz que resolver, además del módulo inicial.\n                  <nombre módulo> también puede ser ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  mostrar módulos observables y salir\n    -d <nombre de módulo>\n    --describe-module <nombre módulo>\n                  describir un módulo y salir\n    --dry-run     crear VM y cargar la clase principal pero sin ejecutar el método principal.\n                  La opción --dry-run puede ser útil para validar\n                  las opciones de línea de comandos, como la configuración del sistema de módulos.\n    --validate-modules\n                  validar todos los módulos y salir\n                  La opción --validate-modules puede ser útil para encontrar\n                  conflictos y otros errores con módulos en la ruta de módulos.\n    -D<nombre>=<valor>\n                  definir una propiedad de sistema\n    -verbose:[class|module|gc|jni]\n                  activar la salida en modo verbose\n    -version      imprimir versión de producto en el flujo de errores y salir\n    --version     imprimir versión de producto en el flujo de salida y salir\n    -showversion  imprimir versión de producto en el flujo de errores y continuar\n    --show-version\n                  -showversion  imprimir versión de producto en el flujo de salida y continuar\n    --show-module-resolution\n                  mostrar la salida de resolución de módulo durante el inicio\n    -? -h -help\n                  imprimir este mensaje de ayuda en el flujo de errores\n    --help        imprimir este mensaje de ayuda en el flujo de salida\n    -X            imprimir ayuda de opciones adicionales en el flujo de errores\n    --help-extra  imprimir ayuda de opciones adicionales en el flujo de salida\n    -ea[:<nombre paquete>...|:<nombre clase>]\n    -enableassertions[:<nombre paquete>...|:<nombre clase>]\n                  activar afirmaciones con una granularidad especificada\n    -da[:<nombre paquete>...|:<nombre clase>]\n    -disableassertions[:<nombre paquete>...|:<nombre clase>]\n                  desactivar afirmaciones con una granularidad especificada\n    -esa | -enablesystemassertions\n                  activar afirmaciones del sistema\n    -dsa | -disablesystemassertions\n                  desactivar afirmaciones del sistema\n    -agentlib:<nombre bib>[=<opciones>]\n                  cargar biblioteca de agente nativo <nombre bib>, por ejemplo, -agentlib:jdwp\n                  ver también -agentlib:jdwp=help\n    -agentpath:<nombre ruta>[=<opciones>]\n                  cargar biblioteca de agente nativo por nombre completo de ruta\n    -javaagent:<ruta jar>[=<opciones>]\n                  cargar agente de lenguaje de programación Java, ver java.lang.instrument\n    -splash:<ruta imagen>\n       \
+           mostrar pantalla de presentación con imagen especificada\n                  Las imágenes a escala HiDPI están soportadas y se usan automáticamente\n                  si están disponibles. El nombre de archivo de la imagen sin escala, por ejemplo, image.ext,\n                  siempre debe transmitirse como el argumento para la opción -splash.\n                  La imagen a escala más adecuada que se haya proporcionado se escogerá\n                  automáticamente.\n                  Consulte la documentación de la API de la pantalla de presentación para obtener más información.\n    @argument files\n                  uno o más archivos de argumentos que contienen opciones\n    --disable-@files\n                  evitar una mayor expansión del archivo de argumentos\nPara especificar un argumento para una opción larga, puede usar --<nombre>=<valor> o\n--<nombre> <valor>.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=-Xbatch           desactivar compilaci\u00F3n de fondo\n    -Xbootclasspath/a:<directorios y archivos zip/jar separados por {0}>\n                      agregar al final de la ruta de clase de inicializaci\u00F3n de datos\n    -Xcheck:jni       realizar comprobaciones adicionales para las funciones de JNI\n    -Xcomp            fuerza la compilaci\u00F3n de m\u00E9todos en la primera llamada\n    -Xdebug           se proporciona para ofrecer compatibilidad con versiones anteriores\n    -Xdiag            mostrar mensajes de diagn\u00F3stico adicionales\n    -Xfuture          activar las comprobaciones m\u00E1s estrictas, anticip\u00E1ndose al futuro valor por defecto\n    -Xint             solo ejecuci\u00F3n de modo interpretado\n    -Xinternalversionn\n                      muestra informaci\u00F3n de la versi\u00F3n de JVM m\u00E1s detallada que la\n                      opci\u00F3n -version\n    -Xloggc:    registrar el estado de GC en un archivo con registros de hora\n    -Xmixed           ejecuci\u00F3n de modo mixto (por defecto)\n    -Xmn<tama\u00F1o>        define el tama\u00F1o inicial y m\u00E1ximo (en bytes) de la pila\n                      para la generaci\u00F3n m\u00E1s joven (incubadora)\n    -Xms<size>        define el tama\u00F1o inicial de la pila de Java\n    -Xmx<size>        define el tama\u00F1o m\u00E1ximo de la pila de Java\n    -Xnoclassgc       desactivar la recolecci\u00F3n de basura de clases\n    -Xrs              reducir el uso de se\u00F1ales de sistema operativo por parte de Java/VM (consulte la documentaci\u00F3n)\n    -Xshare:auto      usar datos de clase compartidos si es posible (valor por defecto)\n    -Xshare:off       no intentar usar datos de clase compartidos\n    -Xshare:on        es obligatorio el uso de datos de clase compartidos, de lo contrario se producir\u00E1 un fallo.\n    -XshowSettings    mostrar toda la configuraci\u00F3n y continuar\n    -XshowSettings:all\n                      mostrar todos los valores y continuar\n    -XshowSettings:locale\n                      mostrar todos los valores relacionados con la configuraci\u00F3n regional y continuar\n    -XshowSettings:properties\n                      mostrar todos los valores de propiedad y continuar\n    -XshowSettings:vm mostrar todos los valores relacionados con vm y continuar\n    -Xss<tama\u00F1o>        definir tama\u00F1o de la pila del thread de Java\n    -Xverify          define el modo del verificador de c\u00F3digo de bytes\n    --add-reads <m\u00F3dulo>=<m\u00F3dulo-destino>(,<m\u00F3dulo-destino>)*\n                      actualiza <m\u00F3dulo> para leer <m\u00F3dulo-destino>, independientemente\n                      de la declaraci\u00F3n del m\u00F3dulo. \n                      <m\u00F3dulo-destino> puede ser ALL-UNNAMED para leer todos los\n                      m\u00F3dulos sin nombre.\n    --add-exports <m\u00F3dulo>/<paquete>=<m\u00F3dulo-destino>(,<m\u00F3dulo-destino>)*\n                      actualiza <m\u00F3dulo> para exportar <paquete> en <m\u00F3dulo-destino>,\n                      independientemente de la declaraci\u00F3n del m\u00F3dulo.\n                      <m\u00F3dulo-destino> puede ser ALL-UNNAMED para exportar a todos los\n                      m\u00F3dulos sin nombre.\n    --add-opens <m\u00F3dulo>/<paquete>=<m\u00F3dulo-destino>(,<m\u00F3dulo-destino>)*\n                      actualiza <m\u00F3dulo> para abrir <paquete> en\n                      <m\u00F3dulo-destino>, independientemente de la declaraci\u00F3n del m\u00F3dulo.\n    --illegal-access=<valor>\n                      permitir or denegar el acceso a miembros de tipos en m\u00F3dulos con nombre.\n                      por c\u00F3digo en m\u00F3dulos sin nombre.\n                      <value> es "denegar", "permitir", "advertir" o "depurar"\n                      Esta opci\u00F3n se eliminar\u00E1 en la pr\u00F3xima versi\u00F3n.\n    --limit-modules <nombre m\u00F3dulo>[,<nombre m\u00F3dulo>...]\n       \
-               limitar el universo de m\u00F3dulos observables\n    --patch-module <m\u00F3dulo>=({0})*\n\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0 aumentar o anular un m\u00F3dulo con clases y recursos\n                      en directorios o archivos JAR\n\nEstas opciones est\u00E1n sujetas a cambio sin previo aviso.
+java.launcher.X.usage=-Xbatch           desactivar compilación de fondo\n    -Xbootclasspath/a:<directorios y archivos zip/jar separados por {0}>\n                      agregar al final de la ruta de clase de inicialización de datos\n    -Xcheck:jni       realizar comprobaciones adicionales para las funciones de JNI\n    -Xcomp            fuerza la compilación de métodos en la primera llamada\n    -Xdebug           se proporciona para ofrecer compatibilidad con versiones anteriores\n    -Xdiag            mostrar mensajes de diagnóstico adicionales\n    -Xfuture          activar las comprobaciones más estrictas, anticipándose al futuro valor por defecto\n    -Xint             solo ejecución de modo interpretado\n    -Xinternalversionn\n                      muestra información de la versión de JVM más detallada que la\n                      opción -version\n    -Xloggc:    registrar el estado de GC en un archivo con registros de hora\n    -Xmixed           ejecución de modo mixto (por defecto)\n    -Xmn<tamaño>        define el tamaño inicial y máximo (en bytes) de la pila\n                      para la generación más joven (incubadora)\n    -Xms<size>        define el tamaño inicial de la pila de Java\n    -Xmx<size>        define el tamaño máximo de la pila de Java\n    -Xnoclassgc       desactivar la recolección de basura de clases\n    -Xrs              reducir el uso de señales de sistema operativo por parte de Java/VM (consulte la documentación)\n    -Xshare:auto      usar datos de clase compartidos si es posible (valor por defecto)\n    -Xshare:off       no intentar usar datos de clase compartidos\n    -Xshare:on        es obligatorio el uso de datos de clase compartidos, de lo contrario se producirá un fallo.\n    -XshowSettings    mostrar toda la configuración y continuar\n    -XshowSettings:all\n                      mostrar todos los valores y continuar\n    -XshowSettings:locale\n                      mostrar todos los valores relacionados con la configuración regional y continuar\n    -XshowSettings:properties\n                      mostrar todos los valores de propiedad y continuar\n    -XshowSettings:vm mostrar todos los valores relacionados con vm y continuar\n    -Xss<tamaño>        definir tamaño de la pila del thread de Java\n    -Xverify          define el modo del verificador de código de bytes\n    --add-reads <módulo>=<módulo-destino>(,<módulo-destino>)*\n                      actualiza <módulo> para leer <módulo-destino>, independientemente\n                      de la declaración del módulo. \n                      <módulo-destino> puede ser ALL-UNNAMED para leer todos los\n                      módulos sin nombre.\n    --add-exports <módulo>/<paquete>=<módulo-destino>(,<módulo-destino>)*\n                      actualiza <módulo> para exportar <paquete> en <módulo-destino>,\n                      independientemente de la declaración del módulo.\n                      <módulo-destino> puede ser ALL-UNNAMED para exportar a todos los\n                      módulos sin nombre.\n    --add-opens <módulo>/<paquete>=<módulo-destino>(,<módulo-destino>)*\n                      actualiza <módulo> para abrir <paquete> en\n                      <módulo-destino>, independientemente de la declaración del módulo.\n    --illegal-access=<valor>\n                      permitir or denegar el acceso a miembros de tipos en módulos con nombre.\n                      por código en módulos sin nombre.\n                      <value> es "denegar", "permitir", "advertir" o "depurar"\n                      Esta opción se eliminará en la próxima versión.\n    --limit-modules <nombre módulo>[,<nombre módulo>...]\n       \
+               limitar el universo de módulos observables\n    --patch-module <módulo>=({0})*\n                      aumentar o anular un módulo con clases y recursos\n                      en directorios o archivos JAR\n\nEstas opciones están sujetas a cambio sin previo aviso.
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\nLas siguientes opciones son espec\u00EDficas para Mac OS X:\n    -XstartOnFirstThread\n                      ejecutar el m\u00E9todo main() del primer thread (AppKit)\n    -Xdock:name=<application name>\n                      sustituir al nombre por defecto de la aplicaci\u00F3n que se muestra en el Dock\n    -Xdock:icon=<ruta de acceso a archivo de icono>\n                      sustituir al icono por defecto que se muestra en el Dock\n\n
+java.launcher.X.macosx.usage=\nLas siguientes opciones son específicas para Mac OS X:\n    -XstartOnFirstThread\n                      ejecutar el método main() del primer thread (AppKit)\n    -Xdock:name=<application name>\n                      sustituir al nombre por defecto de la aplicación que se muestra en el Dock\n    -Xdock:icon=<ruta de acceso a archivo de icono>\n                      sustituir al icono por defecto que se muestra en el Dock\n\n
 
 java.launcher.cls.error1=Error: no se ha encontrado o cargado la clase principal {0}\nCausado por: {1}: {2}
-java.launcher.cls.error2=Error: el m\u00E9todo principal no es {0} en la clase {1}, defina el m\u00E9todo principal del siguiente modo:\n   public static void main(String[] args)
-java.launcher.cls.error3=Error: el m\u00E9todo principal debe devolver un valor del tipo void en la clase {0}, \ndefina el m\u00E9todo principal del siguiente modo:\n   public static void main(String[] args)
-java.launcher.cls.error4=Error: no se ha encontrado el m\u00E9todo principal en la clase {0}, defina el m\u00E9todo principal del siguiente modo:\\n   public static void main(String[] args)\\nde lo contrario, se deber\u00E1 ampliar una clase de aplicaci\u00F3n JavaFX {1}
-java.launcher.cls.error5=Error: faltan los componentes de JavaFX runtime y son necesarios para ejecutar esta aplicaci\u00F3n
+java.launcher.cls.error2=Error: el método principal no es {0} en la clase {1}, defina el método principal del siguiente modo:\n   public static void main(String[] args)
+java.launcher.cls.error3=Error: el método principal debe devolver un valor del tipo void en la clase {0}, \ndefina el método principal del siguiente modo:\n   public static void main(String[] args)
+java.launcher.cls.error4=Error: no se ha encontrado el método principal en la clase {0}, defina el método principal del siguiente modo:\\n   public static void main(String[] args)\\nde lo contrario, se deberá ampliar una clase de aplicación JavaFX {1}
+java.launcher.cls.error5=Error: faltan los componentes de JavaFX runtime y son necesarios para ejecutar esta aplicación
 java.launcher.cls.error6=Error: Se ha producido un error de enlace al cargar la clase principal {0}\n\t{1}
 java.launcher.cls.error7=Error: no se ha podido inicializar la clase principal {0}\nCausado por: {1}: {2}
 java.launcher.jar.error1=Error: se ha producido un error inesperado al intentar abrir el archivo {0}
 java.launcher.jar.error2=no se ha encontrado el manifiesto en {0}
-java.launcher.jar.error3=no hay ning\u00FAn atributo de manifiesto principal en {0}
+java.launcher.jar.error3=no hay ningún atributo de manifiesto principal en {0}
 java.launcher.jar.error4=error al cargar el agente de java en {0}
-java.launcher.init.error=error de inicializaci\u00F3n
-java.launcher.javafx.error1=Error: el m\u00E9todo launchApplication de JavaFX tiene una firma que no es correcta.\\nSe debe declarar est\u00E1tico y devolver un valor de tipo nulo
-java.launcher.module.error1=el m\u00F3dulo {0} no tiene ning\u00FAn atributo MainClass, utilice -m <m\u00F3dulo>/<clase-principal>
-java.launcher.module.error2=Error: no se ha encontrado o cargado la clase principal {0} en el m\u00F3dulo {1}
-java.launcher.module.error3=Error: no se ha podido cargar la clase principal {0} del m\u00F3dulo {1}\n\t{2}
+java.launcher.init.error=error de inicialización
+java.launcher.javafx.error1=Error: el método launchApplication de JavaFX tiene una firma que no es correcta.\\nSe debe declarar estático y devolver un valor de tipo nulo
+java.launcher.module.error1=el módulo {0} no tiene ningún atributo MainClass, utilice -m <módulo>/<clase-principal>
+java.launcher.module.error2=Error: no se ha encontrado o cargado la clase principal {0} en el módulo {1}
+java.launcher.module.error3=Error: no se ha podido cargar la clase principal {0} del módulo {1}\n\t{2}
 java.launcher.module.error4=No se ha encontrado {0}
-java.launcher.module.error5=Error: no se ha podido inicializar la clase principal {0} del m\u00F3dulo {1}\nCausado por: {1}: {2}
+java.launcher.module.error5=Error: no se ha podido inicializar la clase principal {0} del módulo {1}\nCausado por: {1}: {2}
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_fr.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_fr.properties
index 0a32f0cc9ad..09a4172189c 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_fr.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_fr.properties
@@ -24,37 +24,37 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Syntaxe : {0} [options] <mainclass> [args...]\n           (pour ex\u00E9cuter une classe)\n   ou  {0} [options] -jar <jarfile> [args...]\n           (pour ex\u00E9cuter un fichier JAR)\n   ou  {0} [options] -m <module>[/<mainclass>] [args...]\n       {0} [options] --module <module>[/<mainclass>] [args...]\n           (pour ex\u00E9cuter la classe principale dans un module)\n\n Les arguments suivant la classe principale -jar <jarfile>, -m ou --module\n <module>/<mainclass> sont transmis en tant qu''arguments \u00E0 la classe principale.\n\n o\u00F9 options comprend les \u00E9l\u00E9ments suivants :\n\n
+java.launcher.opt.header  =   Syntaxe : {0} [options] <mainclass> [args...]\n           (pour exécuter une classe)\n   ou  {0} [options] -jar <jarfile> [args...]\n           (pour exécuter un fichier JAR)\n   ou  {0} [options] -m <module>[/<mainclass>] [args...]\n       {0} [options] --module <module>[/<mainclass>] [args...]\n           (pour exécuter la classe principale dans un module)\n\n Les arguments suivant la classe principale -jar <jarfile>, -m ou --module\n <module>/<mainclass> sont transmis en tant qu''arguments à la classe principale.\n\n où options comprend les éléments suivants :\n\n
 
-java.launcher.opt.vmselect   =\    {0}\t  pour s\u00E9lectionner la machine virtuelle "{1}"\n
+java.launcher.opt.vmselect   =\    {0}\t  pour sélectionner la machine virtuelle "{1}"\n
 java.launcher.opt.hotspot    =\    {0}\t  est un synonyme pour la machine virtuelle "{1}"  [en phase d''abandon]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <chemin de recherche de classe de r\u00E9pertoires et de fichiers ZIP/JAR>\n    -classpath <chemin de recherche de classe de r\u00E9pertoires et de fichiers ZIP/JAR>\n    --class-path <chemin de recherche de classe de r\u00E9pertoires et de fichiers ZIP/JAR>\n                  Liste, avec s\u00E9parateur {0}, de r\u00E9pertoires, d''archives JAR\n                  et d'archives ZIP pour rechercher des fichiers de classe.\n    -p <chemin de modules>\n    --module-path <chemin de modules>...\n                  Liste, avec s\u00E9parateur {0}, de r\u00E9pertoires, chaque r\u00E9pertoire\n                  est un r\u00E9pertoire de modules.\n    --upgrade-module-path <chemin de modules>...\n                  Liste, avec s\u00E9parateur {0}, de r\u00E9pertoires, chaque r\u00E9pertoire\n                  est un r\u00E9pertoire de module qui remplace les modules\n                  pouvant \u00EAtre mis \u00E0 niveau dans l'image d'ex\u00E9cution\n    --add-modules <nom de module>[,<nom de module>...]\n                  modules racine \u00E0 r\u00E9soudre en plus du module initial.\n                  <nom de module> peut \u00E9galement \u00EAtre ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  r\u00E9pertorier les modules observables et quitter\n    -d <nom de module>\n    --describe-module <nom de module>\n                  d\u00E9crire un module et quitter\n    --dry-run     cr\u00E9er une machine virtuelle et charger la classe principale mais ne pas ex\u00E9cuter la m\u00E9thode principale.\n                  L'option--dry-run peut \u00EAtre utile pour la validation des\n                  options de ligne de commande telles que la configuration du syst\u00E8me de modules.\n    --validate-modules\n                  valider tous les modules et quitter\n                  L'option --validate-modules peut \u00EAtre utile pour la recherche de\n                  conflits et d'autres erreurs avec des modules dans le chemin de modules.\n    -D<name>=<value>\n                  d\u00E9finir une propri\u00E9t\u00E9 syst\u00E8me\n    -verbose:[class|module|gc|jni]\n                  activer la sortie en mode verbose\n    -version      afficher la version de produit dans le flux d'erreur et quitter\n    --version     afficher la version de produit dans le flux de sortie et quitter\n    -showversion  afficher la version de produit dans le flux d'erreur et continuer\n    --show-version\n                  afficher la version de produit dans le flux de sortie et continuer\n    --show-module-resolution\n                  afficher la sortie de r\u00E9solution de module lors du d\u00E9marrage\n    -? -h -help\n                  afficher ce message d'aide dans le flux d'erreur\n    --help        afficher ce message d'erreur dans le flux de sortie\n    -X            afficher l'aide sur des options suppl\u00E9mentaires dans le flux d'erreur\n    --help-extra  afficher l'aide sur des options suppl\u00E9mentaires dans le flux de sortie\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  activer des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  d\u00E9sactiver des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n    -esa | -enablesystemassertions\n                  activer des assertions syst\u00E8me\n    -dsa | -disablesystemassertions\n                  d\u00E9sactiver des assertions syst\u00E8me\n    -agentlib:<libname>[=<options>]\n                  charger la biblioth\u00E8que d'agent natif <libname>, par ex. -agentlib:jdwp\n                  voir \u00E9galement -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  charger la biblioth\u00E8que d'agent natif par nom de chemin complet\n    -javaagent:<jarpath>[=<options>]\n                  charger \
-l'agent de langage de programmation, voir java.lang.instrument\n    -splash:<imagepath>\n                  afficher l'\u00E9cran d'accueil avec l'image indiqu\u00E9e\n                  Les images redimensionn\u00E9es HiDPI sont automatiquement prises en charge et utilis\u00E9es\n                  si elles sont disponibles. Le nom de fichier d'une image non redimensionn\u00E9e, par ex. image.ext,\n                  doit toujours \u00EAtre transmis comme argument \u00E0 l'option -splash.\n                  L'image redimensionn\u00E9e fournie la plus appropri\u00E9e sera automatiquement\n                  s\u00E9lectionn\u00E9e.\n                  Pour plus d'informations, reportez-vous \u00E0 la documentation relative \u00E0 l'API SplashScreen\n    fichiers @argument\n                  fichiers d'arguments contenant des options\n    --disable-@files\n                  emp\u00EAcher le d\u00E9veloppement suppl\u00E9mentaire de fichiers d'arguments\nAfin d'indiquer un argument pour une option longue, vous pouvez utiliser --<name>=<value> ou\n--<name> <value>.\n
+java.launcher.opt.footer = \    -cp <chemin de recherche de classe de répertoires et de fichiers ZIP/JAR>\n    -classpath <chemin de recherche de classe de répertoires et de fichiers ZIP/JAR>\n    --class-path <chemin de recherche de classe de répertoires et de fichiers ZIP/JAR>\n                  Liste, avec séparateur {0}, de répertoires, d''archives JAR\n                  et d'archives ZIP pour rechercher des fichiers de classe.\n    -p <chemin de modules>\n    --module-path <chemin de modules>...\n                  Liste, avec séparateur {0}, de répertoires, chaque répertoire\n                  est un répertoire de modules.\n    --upgrade-module-path <chemin de modules>...\n                  Liste, avec séparateur {0}, de répertoires, chaque répertoire\n                  est un répertoire de module qui remplace les modules\n                  pouvant être mis à niveau dans l'image d'exécution\n    --add-modules <nom de module>[,<nom de module>...]\n                  modules racine à résoudre en plus du module initial.\n                  <nom de module> peut également être ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  répertorier les modules observables et quitter\n    -d <nom de module>\n    --describe-module <nom de module>\n                  décrire un module et quitter\n    --dry-run     créer une machine virtuelle et charger la classe principale mais ne pas exécuter la méthode principale.\n                  L'option--dry-run peut être utile pour la validation des\n                  options de ligne de commande telles que la configuration du système de modules.\n    --validate-modules\n                  valider tous les modules et quitter\n                  L'option --validate-modules peut être utile pour la recherche de\n                  conflits et d'autres erreurs avec des modules dans le chemin de modules.\n    -D<name>=<value>\n                  définir une propriété système\n    -verbose:[class|module|gc|jni]\n                  activer la sortie en mode verbose\n    -version      afficher la version de produit dans le flux d'erreur et quitter\n    --version     afficher la version de produit dans le flux de sortie et quitter\n    -showversion  afficher la version de produit dans le flux d'erreur et continuer\n    --show-version\n                  afficher la version de produit dans le flux de sortie et continuer\n    --show-module-resolution\n                  afficher la sortie de résolution de module lors du démarrage\n    -? -h -help\n                  afficher ce message d'aide dans le flux d'erreur\n    --help        afficher ce message d'erreur dans le flux de sortie\n    -X            afficher l'aide sur des options supplémentaires dans le flux d'erreur\n    --help-extra  afficher l'aide sur des options supplémentaires dans le flux de sortie\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  activer des assertions avec la granularité spécifiée\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  désactiver des assertions avec la granularité spécifiée\n    -esa | -enablesystemassertions\n                  activer des assertions système\n    -dsa | -disablesystemassertions\n                  désactiver des assertions système\n    -agentlib:<libname>[=<options>]\n                  charger la bibliothèque d'agent natif <libname>, par ex. -agentlib:jdwp\n                  voir également -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  charger la bibliothèque d'agent natif par nom de chemin complet\n    -javaagent:<jarpath>[=<options>]\n                  charger \
+l'agent de langage de programmation, voir java.lang.instrument\n    -splash:<imagepath>\n                  afficher l'écran d'accueil avec l'image indiquée\n                  Les images redimensionnées HiDPI sont automatiquement prises en charge et utilisées\n                  si elles sont disponibles. Le nom de fichier d'une image non redimensionnée, par ex. image.ext,\n                  doit toujours être transmis comme argument à l'option -splash.\n                  L'image redimensionnée fournie la plus appropriée sera automatiquement\n                  sélectionnée.\n                  Pour plus d'informations, reportez-vous à la documentation relative à l'API SplashScreen\n    fichiers @argument\n                  fichiers d'arguments contenant des options\n    --disable-@files\n                  empêcher le développement supplémentaire de fichiers d'arguments\nAfin d'indiquer un argument pour une option longue, vous pouvez utiliser --<name>=<value> ou\n--<name> <value>.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           d\u00E9sactivation de la compilation en arri\u00E8re-plan\n    -Xbootclasspath/a:<r\u00E9pertoires et fichiers ZIP/JAR s\u00E9par\u00E9s par des {0}>\n                      ajout \u00E0 la fin du chemin de classe bootstrap\n    -Xcheck:jni       ex\u00E9cution de contr\u00F4les suppl\u00E9mentaires pour les fonctions JNI\n    -Xcomp            force la compilation de m\u00E9thodes au premier appel\n    -Xdebug           fourni pour la compatibilit\u00E9 amont\n    -Xdiag            affichage de messages de diagnostic suppl\u00E9mentaires\n    -Xfuture          activation des contr\u00F4les les plus stricts en vue d''anticiper la future valeur par d\u00E9faut\n    -Xint             ex\u00E9cution en mode interpr\u00E9t\u00E9 uniquement\n    -Xinternalversion\n                      affiche des informations de version JVM plus d\u00E9taill\u00E9es que\n                      l''option -version\n    -Xloggc:<file>    journalisation du statut de l''op\u00E9ration de ramasse-miette dans un fichier avec horodatages\n    -Xmixed           ex\u00E9cution en mode mixte (valeur par d\u00E9faut)\n    -Xmn<size>        d\u00E9finit les tailles initiale et maximale (en octets) de la portion de m\u00E9moire\n                      pour la jeune g\u00E9n\u00E9ration (nursery)\n    -Xms<size>        d\u00E9finition de la taille initiale des portions de m\u00E9moire Java\n    -Xmx<size>        d\u00E9finition de la taille maximale des portions de m\u00E9moire Java\n    -Xnoclassgc       d\u00E9sactivation de l''op\u00E9ration de ramasse-miette de la classe\n    -Xrs               r\u00E9duction de l''utilisation des signaux OS par Java/la machine virtuelle (voir documentation)\n    -Xshare:auto      utilisation des donn\u00E9es de classe partag\u00E9es si possible (valeur par d\u00E9faut)\n    -Xshare:off       aucune tentative d''utilisation des donn\u00E9es de classe partag\u00E9es\n    -Xshare:on        utilisation des donn\u00E9es de classe partag\u00E9es obligatoire ou \u00E9chec de l''op\u00E9ration.\n    -XshowSettings    affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n    -XshowSettings:all\n                      affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n    -XshowSettings:locale\n                       affichage de tous les param\u00E8tres d''environnement local et poursuite de l''op\u00E9ration\n    -XshowSettings:properties\n                       affichage de tous les param\u00E8tres de propri\u00E9t\u00E9 et poursuite de l''op\u00E9ration\n    -XshowSettings:vm affichage de tous les param\u00E8tres de machine virtuelle et poursuite de l''op\u00E9ration\n    -Xss<size>        d\u00E9finition de la taille de pile de thread Java\n    -Xverify          d\u00E9finit le mode du v\u00E9rificateur de code ex\u00E9cutable\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      met \u00E0 jour <module> pour lire <target-module>, sans tenir compte\n                      de la d\u00E9claration de module. \n                      <target-module> peut \u00EAtre ALL-UNNAMED pour lire tous les\n                      modules sans nom.\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      met \u00E0 jour <module> pour exporter <package> vers <target-module>,\n                      sans tenir compte de la d\u00E9claration de module.\n                      <target-module> peut \u00EAtre ALL-UNNAMED pour effectuer un export vers tous\n                      les modules sans nom.\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      met \u00E0 jour <module> pour ouvrir <package> vers\n                      <target-module>, sans tenir compte de la d\u00E9claration de module.\n    --illegal-access=<value>\n                      autorise ou refuse l''acc\u00E8s \u00E0 des membres de types dans des modules nomm\u00E9s\n                      par code \
-dans des modules sans nom.\n                      <value> est l''une des valeurs suivantes : "deny", "permit", "warn" ou "debug"\n                      Cette option sera enlev\u00E9e dans une version ult\u00E9rieure.\n    --limit-modules <module name>[,<module name>...]\n                      limite l''univers des modules observables\n    --patch-module <module>=<file>({0}<file>)*\n                      remplace ou augmente un module avec des classes et des ressources\n                      dans des fichiers JAR ou des r\u00E9pertoires.\n    --disable-@files  d\u00E9sactive d''autres d\u00E9veloppements de fichier d''argument\n\nCes options suppl\u00E9mentaires peuvent \u00EAtre modifi\u00E9es sans pr\u00E9avis.\n
+java.launcher.X.usage=\n    -Xbatch           désactivation de la compilation en arrière-plan\n    -Xbootclasspath/a:<répertoires et fichiers ZIP/JAR séparés par des {0}>\n                      ajout à la fin du chemin de classe bootstrap\n    -Xcheck:jni       exécution de contrôles supplémentaires pour les fonctions JNI\n    -Xcomp            force la compilation de méthodes au premier appel\n    -Xdebug           fourni pour la compatibilité amont\n    -Xdiag            affichage de messages de diagnostic supplémentaires\n    -Xfuture          activation des contrôles les plus stricts en vue d''anticiper la future valeur par défaut\n    -Xint             exécution en mode interprété uniquement\n    -Xinternalversion\n                      affiche des informations de version JVM plus détaillées que\n                      l''option -version\n    -Xloggc:<file>    journalisation du statut de l''opération de ramasse-miette dans un fichier avec horodatages\n    -Xmixed           exécution en mode mixte (valeur par défaut)\n    -Xmn<size>        définit les tailles initiale et maximale (en octets) de la portion de mémoire\n                      pour la jeune génération (nursery)\n    -Xms<size>        définition de la taille initiale des portions de mémoire Java\n    -Xmx<size>        définition de la taille maximale des portions de mémoire Java\n    -Xnoclassgc       désactivation de l''opération de ramasse-miette de la classe\n    -Xrs               réduction de l''utilisation des signaux OS par Java/la machine virtuelle (voir documentation)\n    -Xshare:auto      utilisation des données de classe partagées si possible (valeur par défaut)\n    -Xshare:off       aucune tentative d''utilisation des données de classe partagées\n    -Xshare:on        utilisation des données de classe partagées obligatoire ou échec de l''opération.\n    -XshowSettings    affichage de tous les paramètres et poursuite de l''opération\n    -XshowSettings:all\n                      affichage de tous les paramètres et poursuite de l''opération\n    -XshowSettings:locale\n                       affichage de tous les paramètres d''environnement local et poursuite de l''opération\n    -XshowSettings:properties\n                       affichage de tous les paramètres de propriété et poursuite de l''opération\n    -XshowSettings:vm affichage de tous les paramètres de machine virtuelle et poursuite de l''opération\n    -Xss<size>        définition de la taille de pile de thread Java\n    -Xverify          définit le mode du vérificateur de code exécutable\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      met à jour <module> pour lire <target-module>, sans tenir compte\n                      de la déclaration de module. \n                      <target-module> peut être ALL-UNNAMED pour lire tous les\n                      modules sans nom.\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      met à jour <module> pour exporter <package> vers <target-module>,\n                      sans tenir compte de la déclaration de module.\n                      <target-module> peut être ALL-UNNAMED pour effectuer un export vers tous\n                      les modules sans nom.\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      met à jour <module> pour ouvrir <package> vers\n                      <target-module>, sans tenir compte de la déclaration de module.\n    --illegal-access=<value>\n                      autorise ou refuse l''accès à des membres de types dans des modules nommés\n                      par code \
+dans des modules sans nom.\n                      <value> est l''une des valeurs suivantes : "deny", "permit", "warn" ou "debug"\n                      Cette option sera enlevée dans une version ultérieure.\n    --limit-modules <module name>[,<module name>...]\n                      limite l''univers des modules observables\n    --patch-module <module>=<file>({0}<file>)*\n                      remplace ou augmente un module avec des classes et des ressources\n                      dans des fichiers JAR ou des répertoires.\n    --disable-@files  désactive d''autres développements de fichier d''argument\n\nCes options supplémentaires peuvent être modifiées sans préavis.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\nLes options suivantes sont propres \u00E0 Mac OS X :\n    -XstartOnFirstThread\n                      ex\u00E9cute la m\u00E9thode main() sur le premier thread (AppKit)\n    -Xdock:name=<nom d'application>\n                      remplace le nom d'application par d\u00E9faut affich\u00E9 dans l'ancrage\n    -Xdock:icon=<chemin vers le fichier d'ic\u00F4ne>\n                      remplace l'ic\u00F4ne par d\u00E9faut affich\u00E9e dans l'ancrage\n\n
+java.launcher.X.macosx.usage=\nLes options suivantes sont propres à Mac OS X :\n    -XstartOnFirstThread\n                      exécute la méthode main() sur le premier thread (AppKit)\n    -Xdock:name=<nom d'application>\n                      remplace le nom d'application par défaut affiché dans l'ancrage\n    -Xdock:icon=<chemin vers le fichier d'icône>\n                      remplace l'icône par défaut affichée dans l'ancrage\n\n
 
-java.launcher.cls.error1=Erreur : impossible de trouver ou de charger la classe principale {0}\nCaus\u00E9 par : {1}: {2}
-java.launcher.cls.error2=Erreur : la m\u00E9thode principale n''est pas {0} dans la classe {1}, d\u00E9finissez la m\u00E9thode principale comme suit :\n   public static void main(String[] args)
-java.launcher.cls.error3=Erreur : la m\u00E9thode principale doit renvoyer une valeur de type void dans la classe {0}, \nd\u00E9finissez la m\u00E9thode principale comme suit :\n   public static void main(String[] args)
-java.launcher.cls.error4=Erreur : la m\u00E9thode principale est introuvable dans la classe {0}, d\u00E9finissez la m\u00E9thode principale comme suit :\n   public static void main(String[] args)\nou une classe d''applications JavaFX doit \u00E9tendre {1}
-java.launcher.cls.error5=Erreur : des composants d'ex\u00E9cution JavaFX obligatoires pour ex\u00E9cuter cette application sont manquants.
+java.launcher.cls.error1=Erreur : impossible de trouver ou de charger la classe principale {0}\nCausé par : {1}: {2}
+java.launcher.cls.error2=Erreur : la méthode principale n''est pas {0} dans la classe {1}, définissez la méthode principale comme suit :\n   public static void main(String[] args)
+java.launcher.cls.error3=Erreur : la méthode principale doit renvoyer une valeur de type void dans la classe {0}, \ndéfinissez la méthode principale comme suit :\n   public static void main(String[] args)
+java.launcher.cls.error4=Erreur : la méthode principale est introuvable dans la classe {0}, définissez la méthode principale comme suit :\n   public static void main(String[] args)\nou une classe d''applications JavaFX doit étendre {1}
+java.launcher.cls.error5=Erreur : des composants d'exécution JavaFX obligatoires pour exécuter cette application sont manquants.
 java.launcher.cls.error6=Erreur : LinkageError lors du chargement de la classe principale {0}\n\t{1}
-java.launcher.cls.error7=Erreur : impossible d''initialiser la classe principale {0}\nCaus\u00E9 par : {1}: {2}
+java.launcher.cls.error7=Erreur : impossible d''initialiser la classe principale {0}\nCausé par : {1}: {2}
 java.launcher.jar.error1=Erreur : une erreur inattendue est survenue lors de la tentative d''ouverture du fichier {0}
 java.launcher.jar.error2=fichier manifeste introuvable dans {0}
 java.launcher.jar.error3=aucun attribut manifest principal dans {0}
 java.launcher.jar.error4=erreur lors du chargement de l''agent Java dans {0}
 java.launcher.init.error=erreur d'initialisation
-java.launcher.javafx.error1=Erreur : la signature de la m\u00E9thode launchApplication JavaFX est incorrecte, la\nm\u00E9thode doit \u00EAtre d\u00E9clar\u00E9e statique et renvoyer une valeur de type void
+java.launcher.javafx.error1=Erreur : la signature de la méthode launchApplication JavaFX est incorrecte, la\nméthode doit être déclarée statique et renvoyer une valeur de type void
 java.launcher.module.error1=le module {0} n''a pas d''attribut MainClass, utilisez -m <module>/<main-class>
 java.launcher.module.error2=Erreur : impossible de trouver ou charger la classe principale {0} dans le module {1}
 java.launcher.module.error3=Erreur : impossible de charger la classe principale {0} dans le module {1}\n\t{2}
 java.launcher.module.error4={0} introuvable
-java.launcher.module.error5=Erreur : impossible d''initialiser la classe principale {0} dans le module {1}\nCaus\u00E9 par : {1}: {2}
+java.launcher.module.error5=Erreur : impossible d''initialiser la classe principale {0} dans le module {1}\nCausé par : {1}: {2}
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_it.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_it.properties
index 23c27446bf9..3f0930bb941 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_it.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_it.properties
@@ -27,27 +27,27 @@
 java.launcher.opt.header  =   Uso: {0} [opzioni] <classe principale> [argomenti...]\n           (per eseguire una classe)\n   oppure  {0} [opzioni] -jar <file jar> [argomenti...]\n           (per eseguire un file jar)\n   oppure  {0} [opzioni] -m <modulo>[/<classe principale>] [argomenti...]\n       {0} [opzioni] --module <modulo>[/<classe principale>] [argomenti...]\n           (per eseguire la classe principale in un modulo)\n\n Gli argomenti specificati dopo la classe principale, dopo -jar <file jar>, -m o --module\n <modulo>/<classe principale> vengono passati come argomenti alla classe principale.\n\n dove opzioni include:\n\n
 
 java.launcher.opt.vmselect   =\    {0}\t  per selezionare la VM "{1}"\n
-java.launcher.opt.hotspot    =\    {0}\t  \u00E8 un sinonimo per la VM "{1}" [non valido]\n
+java.launcher.opt.hotspot    =\    {0}\t  è un sinonimo per la VM "{1}" [non valido]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <classpath di ricerca di directory e file zip/jar>\n    -classpath <classpath di ricerca di directory e file zip/jar>\n    -class-path <classpath di ricerca di directory e file zip/jar>\n                  Una lista separata da {0} di directory, archivi JAR\n                  e archivi ZIP in cui cercare i file di classe.\n    -p <percorso modulo>\n    --module-path <percorso modulo>...\n                  Una lista separata da {0} di directory. Ogni directory\n                  \u00E8 una directory di moduli.\n    --upgrade-module-path <percorso modulo>...\n                  Una lista separata da {0} di directory. Ogni directory\n                  \u00E8 una directory di moduli che sostituiscono i moduli\n                  aggiornabili nell'immagine in fase di esecuzione\n    --add-modules <nome modulo>[,<nome modulo>...]\n                  I moduli radice da risolvere in aggiunta al modulo iniziale.\n                  <nome modulo> pu\u00F2 essere anche ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  Elenca i moduli osservabili ed esce\n    -d <nome modulo>\n    --describe-module <nome modulo>\n                  Descrive un modulo ed esce\n    --dry-run      Crea la VM e carica la classe principale ma non esegue il metodo principale.\n                  L'opzione --dry-run pu\u00F2 essere utile per la convalida delle\n                  opzioni della riga di comando, ad esempio quelle utilizzate per la configurazione del sistema di moduli.\n    --validate-modules\n                  Convalida tutti i moduli ed esce\n                  L'opzione --validate-modules pu\u00F2 essere utile per rilevare\n                  conflitti e altri errori con i moduli nel percorso dei moduli.\n    -D<nome>=<valore>\n                  Imposta una propriet\u00E0 di sistema\n    -verbose:[class|module|gc|jni]\n                  abilitare output descrittivo\n    -version      Visualizza la versione del prodotto nel flusso di errori ed esce\n    -version      Visualizza la versione del prodotto nel flusso di output ed esce\n    -showversion      Visualizza la versione del prodotto nel flusso di errori e continua\n    --show-version\n                  Visualizza la versione del prodotto nel flusso di output e continua\n    --show-module-resolution\n                  Mostra l'output della risoluzione del modulo durante l'avvio\n    -? -h -help\n                  Visualizza questo messaggio della Guida nel flusso di errori\n    --help        Visualizza questo messaggio della Guida nel flusso di output\n    -X            Visualizza la Guida relativa alle opzioni non standard nel flusso di errori\n    --help-extra  Visualizza la Guida relativa alle opzioni non standard nel flusso di output\n    -ea[:<nome package>...|:<nome classe>]\n    -enableassertions[:<nome package>...|:<nome classe>]\n                  Abilita le asserzioni con la granularit\u00E0 specificata\n    -da[:<nome package>...|:<nome classe>]\n    -disableassertions[:<nome package>...|:<nome classe>]\n                  Disabilita le asserzioni con la granularit\u00E0 specificata\n    -esa | -enablesystemassertions\n                  Abilita le asserzioni di sistema\n    -dsa | -disablesystemassertions\n                  Disabilita le asserzioni di sistema\n    -agentlib:<nome libreria>[=<opzioni>]\n                  Carica la libreria agenti nativa <nome libreria>, ad esempio -agentlib:jdwp\n                  Vedere anche -agentlib:jdwp=help\n    -agentpath:<nome percorso>[=<opzioni>]\n                  Carica la libreria agenti nativa con il percorso completo\n    -javaagent:<percorso jar>[=<opzioni>]\n                  Carica l'agente del linguaggio di programmazione Java, vedere java.lang.instrument\n    -splash:<percorso immagine>\n                  Mostra la schermata iniziale con l'immagine specificata\n                  Le immagini ridimensionate HiDPI sono supportate e utilizzate \
-automaticamente\n                  se disponibili. I nomi file delle immagini non ridimensionate, ad esempio image.ext,\n                  devono essere sempre passati come argomenti all'opzione -splash.\n                  Verr\u00E0 scelta automaticamente l'immagine ridimensionata pi\u00F9 appropriata\n                  fornita.\n                  Per ulteriori informazioni, vedere la documentazione relativa all'API SplashScreen\n    @file argomenti\n                  Uno o pi\u00F9 file argomenti contenenti opzioni\n    --disable-@files\n                  Impedisce l'ulteriore espansione di file argomenti\nPer specificare un argomento per un'opzione lunga, \u00E8 possibile usare --<nome>=<valore> oppure\n--<nome> <valore>.\n
+java.launcher.opt.footer = \    -cp <classpath di ricerca di directory e file zip/jar>\n    -classpath <classpath di ricerca di directory e file zip/jar>\n    -class-path <classpath di ricerca di directory e file zip/jar>\n                  Una lista separata da {0} di directory, archivi JAR\n                  e archivi ZIP in cui cercare i file di classe.\n    -p <percorso modulo>\n    --module-path <percorso modulo>...\n                  Una lista separata da {0} di directory. Ogni directory\n                  è una directory di moduli.\n    --upgrade-module-path <percorso modulo>...\n                  Una lista separata da {0} di directory. Ogni directory\n                  è una directory di moduli che sostituiscono i moduli\n                  aggiornabili nell'immagine in fase di esecuzione\n    --add-modules <nome modulo>[,<nome modulo>...]\n                  I moduli radice da risolvere in aggiunta al modulo iniziale.\n                  <nome modulo> può essere anche ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  Elenca i moduli osservabili ed esce\n    -d <nome modulo>\n    --describe-module <nome modulo>\n                  Descrive un modulo ed esce\n    --dry-run      Crea la VM e carica la classe principale ma non esegue il metodo principale.\n                  L'opzione --dry-run può essere utile per la convalida delle\n                  opzioni della riga di comando, ad esempio quelle utilizzate per la configurazione del sistema di moduli.\n    --validate-modules\n                  Convalida tutti i moduli ed esce\n                  L'opzione --validate-modules può essere utile per rilevare\n                  conflitti e altri errori con i moduli nel percorso dei moduli.\n    -D<nome>=<valore>\n                  Imposta una proprietà di sistema\n    -verbose:[class|module|gc|jni]\n                  abilitare output descrittivo\n    -version      Visualizza la versione del prodotto nel flusso di errori ed esce\n    -version      Visualizza la versione del prodotto nel flusso di output ed esce\n    -showversion      Visualizza la versione del prodotto nel flusso di errori e continua\n    --show-version\n                  Visualizza la versione del prodotto nel flusso di output e continua\n    --show-module-resolution\n                  Mostra l'output della risoluzione del modulo durante l'avvio\n    -? -h -help\n                  Visualizza questo messaggio della Guida nel flusso di errori\n    --help        Visualizza questo messaggio della Guida nel flusso di output\n    -X            Visualizza la Guida relativa alle opzioni non standard nel flusso di errori\n    --help-extra  Visualizza la Guida relativa alle opzioni non standard nel flusso di output\n    -ea[:<nome package>...|:<nome classe>]\n    -enableassertions[:<nome package>...|:<nome classe>]\n                  Abilita le asserzioni con la granularità specificata\n    -da[:<nome package>...|:<nome classe>]\n    -disableassertions[:<nome package>...|:<nome classe>]\n                  Disabilita le asserzioni con la granularità specificata\n    -esa | -enablesystemassertions\n                  Abilita le asserzioni di sistema\n    -dsa | -disablesystemassertions\n                  Disabilita le asserzioni di sistema\n    -agentlib:<nome libreria>[=<opzioni>]\n                  Carica la libreria agenti nativa <nome libreria>, ad esempio -agentlib:jdwp\n                  Vedere anche -agentlib:jdwp=help\n    -agentpath:<nome percorso>[=<opzioni>]\n                  Carica la libreria agenti nativa con il percorso completo\n    -javaagent:<percorso jar>[=<opzioni>]\n                  Carica l'agente del linguaggio di programmazione Java, vedere java.lang.instrument\n    -splash:<percorso immagine>\n                  Mostra la schermata iniziale con l'immagine specificata\n                  Le immagini ridimensionate HiDPI sono supportate e utilizzate \
+automaticamente\n                  se disponibili. I nomi file delle immagini non ridimensionate, ad esempio image.ext,\n                  devono essere sempre passati come argomenti all'opzione -splash.\n                  Verrà scelta automaticamente l'immagine ridimensionata più appropriata\n                  fornita.\n                  Per ulteriori informazioni, vedere la documentazione relativa all'API SplashScreen\n    @file argomenti\n                  Uno o più file argomenti contenenti opzioni\n    --disable-@files\n                  Impedisce l'ulteriore espansione di file argomenti\nPer specificare un argomento per un'opzione lunga, è possibile usare --<nome>=<valore> oppure\n--<nome> <valore>.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           Disabilita la compilazione in background.\n    -Xbootclasspath/a:<directory e file zip/jar separati da {0}>\n                      Aggiunge alla fine del classpath di bootstrap.\n   -Xcheck:jni       Esegue controlli aggiuntivi per le funzioni JNI.\n    -Xcomp            Forza la compilazione dei metodi al primo richiamo.\n    -Xdebug           Fornito per la compatibilit\u00E0 con le versioni precedenti.\n    -Xdiag            Mostra ulteriori messaggi diagnostici.\n    -Xfuture          Abilita i controlli pi\u00F9 limitativi anticipando le impostazioni predefinite future.\n    -Xint             Esecuzione solo in modalit\u00E0 convertita.\n    -Xinternalversion\n                      Visualizza informazioni pi\u00F9 dettagliate sulla versione JVM rispetto\n                      all''opzione -version.\n    -Xloggc:<file>    Registra lo stato GC in un file con indicatori orari.\n    -Xmixed           Esecuzione in modalit\u00E0 mista (impostazione predefinita).\n    -Xmn<size>        Imposta le dimensioni iniziale e massima (in byte) dell''heap\n                      per la young generation (nursery).\n    -Xms<size>        Imposta la dimensione heap Java iniziale.\n    -Xmx<size>        Imposta la dimensione heap Java massima.\n    -Xnoclassgc       Disabilta la garbage collection della classe.\n    -Xrs              Riduce l''uso di segnali del sistema operativo da Java/VM (vedere la documentazione).\n    -Xshare:auto      Utilizza i dati di classe condivisi se possibile (impostazione predefinita).\n     -Xshare:off       Non tenta di utilizzare i dati di classe condivisi.\n    -Xshare:on        Richiede l''uso dei dati di classe condivisi, altrimenti l''esecuzione non riesce.\n    -XshowSettings    Mostra tutte le impostazioni e continua.\n    -XshowSettings:all\n                      Mostra tutte le impostazioni e continua.\n    -XshowSettings:locale\n                      Mostra tutte le impostazioni correlate alle impostazioni nazionali e continua.\n    -XshowSettings:properties\n                      Mostra tutte le impostazioni delle propriet\u00E0 e continua.\n    -XshowSettings:vm Mostra tutte le impostazioni correlate alla VM e continua.\n    -Xss<size>        Imposta la dimensione dello stack di thread Java.\n     -Xverify          Imposta la modalit\u00E0 del verificatore bytecode.\n    --add-reads:<module>=<target-module>(,<target-module>)*\n                      Aggiorna <module> per leggere <target-module>, indipendentemente\n                      dalla dichiarazione del modulo. \n                      <target-module> pu\u00F2 essere ALL-UNNAMED per leggere tutti i\n                      moduli senza nome.\n   -add-exports:<module>/<package>=<target-module>(,<target-module>)*\n                      Aggiorna <module> per esportare <package> in <target-module>,\n                      indipendentemente dalla dichiarazione del modulo.\n                      <target-module> pu\u00F2 essere ALL-UNNAMED per esportare tutti i\n                      moduli senza nome.\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      Aggiorna <module> per aprire <package> in\n                      <target-module>, indipendentemente dalla dichiarazione del modulo.\n    --illegal-access=<value>\n                      Consente o nega l''accesso ai membri dei tipi nei moduli denominati\n                      mediante codice nei moduli senza nome.\n                      <value> pu\u00F2 essere "deny", "permit", "warn" o "debug".\n                      Questa opzione verr\u00E0 rimossa in una release futura.\n    --limit-modules <module name>[,<module name>...]\n                      Limita l''universo dei moduli osservabili.\n    -patch-module <module>=<file>({0}<file>)*\n                      Sostituisce o migliora un modulo con classi e risorse\n                      in file JAR o directory.\n    --disable-@files  Disabilita l''ulteriore espansione \
+java.launcher.X.usage=\n    -Xbatch           Disabilita la compilazione in background.\n    -Xbootclasspath/a:<directory e file zip/jar separati da {0}>\n                      Aggiunge alla fine del classpath di bootstrap.\n   -Xcheck:jni       Esegue controlli aggiuntivi per le funzioni JNI.\n    -Xcomp            Forza la compilazione dei metodi al primo richiamo.\n    -Xdebug           Fornito per la compatibilità con le versioni precedenti.\n    -Xdiag            Mostra ulteriori messaggi diagnostici.\n    -Xfuture          Abilita i controlli più limitativi anticipando le impostazioni predefinite future.\n    -Xint             Esecuzione solo in modalità convertita.\n    -Xinternalversion\n                      Visualizza informazioni più dettagliate sulla versione JVM rispetto\n                      all''opzione -version.\n    -Xloggc:<file>    Registra lo stato GC in un file con indicatori orari.\n    -Xmixed           Esecuzione in modalità mista (impostazione predefinita).\n    -Xmn<size>        Imposta le dimensioni iniziale e massima (in byte) dell''heap\n                      per la young generation (nursery).\n    -Xms<size>        Imposta la dimensione heap Java iniziale.\n    -Xmx<size>        Imposta la dimensione heap Java massima.\n    -Xnoclassgc       Disabilta la garbage collection della classe.\n    -Xrs              Riduce l''uso di segnali del sistema operativo da Java/VM (vedere la documentazione).\n    -Xshare:auto      Utilizza i dati di classe condivisi se possibile (impostazione predefinita).\n     -Xshare:off       Non tenta di utilizzare i dati di classe condivisi.\n    -Xshare:on        Richiede l''uso dei dati di classe condivisi, altrimenti l''esecuzione non riesce.\n    -XshowSettings    Mostra tutte le impostazioni e continua.\n    -XshowSettings:all\n                      Mostra tutte le impostazioni e continua.\n    -XshowSettings:locale\n                      Mostra tutte le impostazioni correlate alle impostazioni nazionali e continua.\n    -XshowSettings:properties\n                      Mostra tutte le impostazioni delle proprietà e continua.\n    -XshowSettings:vm Mostra tutte le impostazioni correlate alla VM e continua.\n    -Xss<size>        Imposta la dimensione dello stack di thread Java.\n     -Xverify          Imposta la modalità del verificatore bytecode.\n    --add-reads:<module>=<target-module>(,<target-module>)*\n                      Aggiorna <module> per leggere <target-module>, indipendentemente\n                      dalla dichiarazione del modulo. \n                      <target-module> può essere ALL-UNNAMED per leggere tutti i\n                      moduli senza nome.\n   -add-exports:<module>/<package>=<target-module>(,<target-module>)*\n                      Aggiorna <module> per esportare <package> in <target-module>,\n                      indipendentemente dalla dichiarazione del modulo.\n                      <target-module> può essere ALL-UNNAMED per esportare tutti i\n                      moduli senza nome.\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      Aggiorna <module> per aprire <package> in\n                      <target-module>, indipendentemente dalla dichiarazione del modulo.\n    --illegal-access=<value>\n                      Consente o nega l''accesso ai membri dei tipi nei moduli denominati\n                      mediante codice nei moduli senza nome.\n                      <value> può essere "deny", "permit", "warn" o "debug".\n                      Questa opzione verrà rimossa in una release futura.\n    --limit-modules <module name>[,<module name>...]\n                      Limita l''universo dei moduli osservabili.\n    -patch-module <module>=<file>({0}<file>)*\n                      Sostituisce o migliora un modulo con classi e risorse\n                      in file JAR o directory.\n    --disable-@files  Disabilita l''ulteriore espansione \
 di file argomenti.\n\nQueste opzioni non sono opzioni standard e sono soggette a modifiche senza preavviso.\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.macosx.usage=\nLe opzioni riportate di seguito sono specifiche del sistema operativo Mac OS X:\n    -XstartOnFirstThread\n                      Esegue il metodo main() sul primo thread (AppKit).\n    -Xdock:name=<nome applicazione>\n                      Sostituisce il nome applicazione predefinito visualizzato nel dock\n    -Xdock:icon=<percorso file icona>\n                      Sostituisce l'icona predefinita visualizzata nel dock\n\n
 
 java.launcher.cls.error1=Errore: impossibile trovare o caricare la classe principale {0}\nCausato da: {1}: {2}
-java.launcher.cls.error2=Errore: il metodo principale non \u00E8 {0} nella classe {1}. Definire il metodo principale come:\n   public static void main(String[] args)
+java.launcher.cls.error2=Errore: il metodo principale non è {0} nella classe {1}. Definire il metodo principale come:\n   public static void main(String[] args)
 java.launcher.cls.error3=Errore: il metodo principale deve restituire un valore di tipo void nella classe {0}. \nDefinire il metodo principale come:\n   public static void main(String[] args)
-java.launcher.cls.error4=Errore: il metodo principale non \u00E8 stato trovato nella classe {0}. Definire il metodo principale come:\n   public static void main(String[] args)\naltrimenti una classe applicazione JavaFX deve estendere {1}
+java.launcher.cls.error4=Errore: il metodo principale non è stato trovato nella classe {0}. Definire il metodo principale come:\n   public static void main(String[] args)\naltrimenti una classe applicazione JavaFX deve estendere {1}
 java.launcher.cls.error5=Errore: non sono presenti i componenti runtime di JavaFX necessari per eseguire questa applicazione
 java.launcher.cls.error6=Errore: LinkageError durante il caricamento della classe principale {0}\n\t{1}
 java.launcher.cls.error7=Errore: impossibile inizializzare la classe principale {0}\nCausato da: {1}: {2}
-java.launcher.jar.error1=Errore: si \u00E8 verificato un errore imprevisto durante il tentativo di aprire il file {0}
+java.launcher.jar.error1=Errore: si è verificato un errore imprevisto durante il tentativo di aprire il file {0}
 java.launcher.jar.error2=manifest non trovato in {0}
 java.launcher.jar.error3=nessun attributo manifest principale in {0}
 java.launcher.jar.error4=errore durante il caricamento dell''agente java in {0}
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
index eb55a920de8..68b74449518 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
@@ -24,41 +24,41 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   \u4F7F\u7528\u65B9\u6CD5: {0} [options] <mainclass> [args...]\n           (\u30AF\u30E9\u30B9\u3092\u5B9F\u884C\u3059\u308B\u5834\u5408)\n   \u307E\u305F\u306F  {0} [options] -jar <jarfile> [args...]\n           (jar\u30D5\u30A1\u30A4\u30EB\u3092\u5B9F\u884C\u3059\u308B\u5834\u5408)\n   \u307E\u305F\u306F  {0} [options] -m <module>[/<mainclass>] [args...]\n       {0} [options] --module <module>[/<mainclass>] [args...]\n           (\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u5B9F\u884C\u3059\u308B\u5834\u5408)\n   \u307E\u305F\u306F  {0} [options] <sourcefile> [args]\n           (\u5358\u4E00\u306E\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30FB\u30D7\u30ED\u30B0\u30E9\u30E0\u3092\u5B9F\u884C\u3059\u308B\u5834\u5408)\n\n \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3001\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3001-jar <jarfile>\u3001\n -m\u307E\u305F\u306F--module <module>/<mainclass>\u306B\u7D9A\u304F\u5F15\u6570\u306F\u3001\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3078\u306E\u5F15\u6570\u3068\u3057\u3066\n \u6E21\u3055\u308C\u307E\u3059\u3002\n\n \u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\n
+java.launcher.opt.header  =   使用方法: {0} [options] <mainclass> [args...]\n           (クラスを実行する場合)\n   または  {0} [options] -jar <jarfile> [args...]\n           (jarファイルを実行する場合)\n   または  {0} [options] -m <module>[/<mainclass>] [args...]\n       {0} [options] --module <module>[/<mainclass>] [args...]\n           (モジュールのメイン・クラスを実行する場合)\n   または  {0} [options] <sourcefile> [args]\n           (単一のソースファイル・プログラムを実行する場合)\n\n メイン・クラス、ソース・ファイル、-jar <jarfile>、\n -mまたは--module <module>/<mainclass>に続く引数は、メイン・クラスへの引数として\n 渡されます。\n\n オプションは次のとおりです:\n\n
 
-java.launcher.opt.vmselect   =\    {0}\t  "{1}" VM\u3092\u9078\u629E\u3059\u308B\u5834\u5408\n
-java.launcher.opt.hotspot    =\    {0}\t  \u306F"{1}" VM\u306E\u30B7\u30CE\u30CB\u30E0\u3067\u3059  [\u975E\u63A8\u5968]\n
+java.launcher.opt.vmselect   =\    {0}\t  "{1}" VMを選択する場合\n
+java.launcher.opt.hotspot    =\    {0}\t  は"{1}" VMのシノニムです  [非推奨]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    --class-path <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n                  {0}\u533A\u5207\u308A\u30EA\u30B9\u30C8(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n                  ZIP\u30A2\u30FC\u30AB\u30A4\u30D6)\u3067\u3001\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u7528\u3002\n    -p <module path>\n    --module-path <module path>...\n                  \u8981\u7D20\u3092{0}\u3067\u533A\u5207\u3063\u305F\u30EA\u30B9\u30C8\u3067\u3001\u5404\u8981\u7D20\u306F\u6B21\u3078\u306E\u30D5\u30A1\u30A4\u30EB\u30FB\u30D1\u30B9\u3067\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u683C\u7D0D\u3055\u308C\u3066\u3044\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u6B21\u306E\u3044\u305A\u308C\u304B\u3067\u3059:\n                  \u30E2\u30B8\u30E5\u30E9JAR\u307E\u305F\u306F\u5C55\u958B\u5F62\u5F0F\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\n    --upgrade-module-path <module path>...\n                  \u8981\u7D20\u3092{0}\u3067\u533A\u5207\u3063\u305F\u30EA\u30B9\u30C8\u3067\u3001\u5404\u8981\u7D20\u306F\u6B21\u3078\u306E\u30D5\u30A1\u30A4\u30EB\u30FB\u30D1\u30B9\u3067\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u683C\u7D0D\u3055\u308C\u3066\u3044\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3001\u6B21\u306E\u3082\u306E\u3092\u7F6E\u304D\u63DB\u3048\u307E\u3059:\n                  \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u6B21\u306E\u3044\u305A\u308C\u304B\u3067\u3059:\n                  \u30E2\u30B8\u30E5\u30E9JAR\u307E\u305F\u306F\u5C55\u958B\u5F62\u5F0F\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\n    --add-modules <module name>[,<module name>...]\n                  \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306B\u306F\u6B21\u3082\u6307\u5B9A\u3067\u304D\u307E\u3059: ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  \u5236\u9650\u3055\u308C\u305F\u30CD\u30A4\u30C6\u30A3\u30D6\u64CD\u4F5C\u306E\u5B9F\u884C\u3092\u8A31\u53EF\u3055\u308C\u3066\u3044\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306FALL-UNNAMED\u306B\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002\n    --list-modules\n                  \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EA\u30B9\u30C8\u3057\u7D42\u4E86\u3057\u307E\u3059\n    -d <module name>\n    --describe-module <module name>\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8AAC\u660E\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --dry-run     VM\u3092\u4F5C\u6210\u3057\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u304C\u3001\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u5B9F\u884C\u3057\u307E\u305B\u3093\u3002\n                  --dry-run\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u8A3C\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \
-\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u69CB\u6210\u306A\u3069\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3002\n    --validate-modules\n                  \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u8A3C\u3057\u7D42\u4E86\u3057\u307E\u3059\n                  --validate-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u7D22\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u4E0A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306E\u7AF6\u5408\u304A\u3088\u3073\u305D\u306E\u4ED6\u306E\u30A8\u30E9\u30FC\u3002\n    -D<name>=<value>\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -verbose:[class|module|gc|jni]\n                  \u7279\u5B9A\u306E\u30B5\u30D6\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B\n    -version      \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    --version     \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    -showversion  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-version\n                  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-module-resolution\n                  \u8D77\u52D5\u6642\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u89E3\u6C7A\u51FA\u529B\u3092\u8868\u793A\u3057\u307E\u3059\n    -? -h -help\n                  \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help        \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -X            \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help-extra  \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -esa | -enablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -dsa | -disablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -agentlib:<libname>[=<options>]\n                  \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\u4F8B: -agentlib:jdwp\n                  -agentlib:jdwp=help\u3082\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -agentpath:<pathname>[=<options>]\n                  \
-\u30D5\u30EB\u30D1\u30B9\u540D\u3092\u4F7F\u7528\u3057\u3066\u3001\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\n    -javaagent:<jarpath>[=<options>]\n                  Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002java.lang.instrument\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -splash:<imagepath>\n                  \u6307\u5B9A\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3092\u542B\u3080\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3057\u307E\u3059\n                  HiDPI\u30B9\u30B1\u30FC\u30EB\u306E\u30A4\u30E1\u30FC\u30B8\u304C\u81EA\u52D5\u7684\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n                  (\u53EF\u80FD\u306A\u5834\u5408)\u3002\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u3055\u308C\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u306E\u30D5\u30A1\u30A4\u30EB\u540D(image.ext\u306A\u3069)\u3092\n                  \u5F15\u6570\u3068\u3057\u3066-splash\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5FC5\u305A\u6E21\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n                  \u6307\u5B9A\u3055\u308C\u305F\u6700\u3082\u9069\u5207\u306A\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u6E08\u30A4\u30E1\u30FC\u30B8\u304C\u9078\u629E\u3055\u308C\u307E\u3059\n                  (\u81EA\u52D5\u7684)\u3002\n                  \u8A73\u7D30\u306F\u3001SplashScreen API\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    @argument\u30D5\u30A1\u30A4\u30EB\n                  \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u542B\u30801\u3064\u4EE5\u4E0A\u306E\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\n    --disable-@files\n                  \u3055\u3089\u306A\u308B\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    --enable-preview\n                  \u30AF\u30E9\u30B9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n\u9577\u3044\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u3001--<name>=<value>\u307E\u305F\u306F\n--<name> <value>\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n
+java.launcher.opt.footer = \    -cp <ディレクトリおよびzip/jarファイルのクラス検索パス>\n    -classpath <ディレクトリおよびzip/jarファイルのクラス検索パス>\n    --class-path <ディレクトリおよびzip/jarファイルのクラス検索パス>\n                  {0}区切りリスト(ディレクトリ、JARアーカイブ、\n                  ZIPアーカイブ)で、クラス・ファイルの検索用。\n    -p <module path>\n    --module-path <module path>...\n                  要素を{0}で区切ったリストで、各要素は次へのファイル・パスです:\n                  モジュール、またはモジュールが格納されているディレクトリ。各モジュールは次のいずれかです:\n                  モジュラJARまたは展開形式のモジュール・ディレクトリ。\n    --upgrade-module-path <module path>...\n                  要素を{0}で区切ったリストで、各要素は次へのファイル・パスです:\n                  モジュール、またはモジュールが格納されているディレクトリで、次のものを置き換えます:\n                  ランタイム・イメージのアップグレード可能なモジュール。各モジュールは次のいずれかです:\n                  モジュラJARまたは展開形式のモジュール・ディレクトリ。\n    --add-modules <module name>[,<module name>...]\n                  初期モジュールに加えて解決するルート・モジュール。\n                  <module name>には次も指定できます: ALL-DEFAULT、ALL-SYSTEM、\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  制限されたネイティブ操作の実行を許可されているモジュール。\n                  <module name>はALL-UNNAMEDにすることもできます。\n    --list-modules\n                  参照可能なモジュールをリストし終了します\n    -d <module name>\n    --describe-module <module name>\n                  モジュールを説明し終了します\n    --dry-run     VMを作成しメイン・クラスをロードしますが、メイン・メソッドは実行しません。\n                  --dry-runオプションは、次の検証に役立つ場合があります:\n                  \
+モジュール・システム構成などのコマンド行オプション。\n    --validate-modules\n                  すべてのモジュールを検証し終了します\n                  --validate-modulesオプションは、次の検索に役立つ場合があります:\n                  モジュール・パス上のモジュールでの競合およびその他のエラー。\n    -D<name>=<value>\n                  システム・プロパティを設定します\n    -verbose:[class|module|gc|jni]\n                  特定のサブシステムで詳細出力を有効にする\n    -version      製品バージョンをエラー・ストリームに出力して終了します\n    --version     製品バージョンを出力ストリームに出力して終了します\n    -showversion  製品バージョンをエラー・ストリームに出力して続行します\n    --show-version\n                  製品バージョンを出力ストリームに出力して続行します\n    --show-module-resolution\n                  起動時にモジュール解決出力を表示します\n    -? -h -help\n                  このヘルプ・メッセージをエラー・ストリームに出力します\n    --help        このヘルプ・メッセージを出力ストリームに出力します\n    -X            追加オプションのヘルプをエラー・ストリームに出力します\n    --help-extra  追加オプションのヘルプを出力ストリームに出力します\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  指定した粒度でアサーションを有効にします\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  指定した粒度でアサーションを無効にします\n    -esa | -enablesystemassertions\n                  システム・アサーションを有効にします\n    -dsa | -disablesystemassertions\n                  システム・アサーションを無効にします\n    -agentlib:<libname>[=<options>]\n                  ネイティブ・エージェント・ライブラリ<libname>をロードします。例: -agentlib:jdwp\n                  -agentlib:jdwp=helpも参照してください\n    -agentpath:<pathname>[=<options>]\n                  \
+フルパス名を使用して、ネイティブ・エージェント・ライブラリをロードします\n    -javaagent:<jarpath>[=<options>]\n                  Javaプログラミング言語エージェントをロードします。java.lang.instrumentを参照してください\n    -splash:<imagepath>\n                  指定されたイメージを含むスプラッシュ画面を表示します\n                  HiDPIスケールのイメージが自動的にサポートされて使用されます\n                  (可能な場合)。スケーリングされないイメージのファイル名(image.extなど)を\n                  引数として-splashオプションに必ず渡す必要があります。\n                  指定された最も適切なスケーリング済イメージが選択されます\n                  (自動的)。\n                  詳細は、SplashScreen APIのドキュメントを参照してください\n    @argumentファイル\n                  オプションを含む1つ以上の引数ファイル\n    --disable-@files\n                  さらなる引数ファイル拡張を無効にします\n    --enable-preview\n                  クラスをこのリリースのプレビュー機能に依存させることができます\n長いオプションの引数を指定する場合、--<name>=<value>または\n--<name> <value>を使用できます。\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30FB\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n                      \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3057\u307E\u3059\n    -Xcheck:jni       JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3057\u307E\u3059\n    -Xcomp            \u521D\u56DE\u547C\u51FA\u3057\u6642\u306B\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5F37\u5236\u3057\u307E\u3059\n    -Xdebug           \u4F55\u3082\u5B9F\u884C\u3055\u308C\u307E\u305B\u3093\u3002\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u305F\u3081\u3001\u975E\u63A8\u5968\u306B\u306A\u308A\u307E\u3057\u305F\u3002\n    -Xdiag            \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059\n    -Xfuture          \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    -Xint             \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n    -Xinternalversion\n                      -version\u30AA\u30D7\u30B7\u30E7\u30F3\u3088\u308A\u8A73\u7D30\u306AJVM\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\n                      \u8868\u793A\u3057\u307E\u3059\n    -Xlog:<opts>      Java Virtual Machine (JVM)\u7D71\u5408\u30ED\u30AE\u30F3\u30B0\u30FB\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u3067\u306E\n                      \u30ED\u30AE\u30F3\u30B0\u3092\u69CB\u6210\u307E\u305F\u306F\u6709\u52B9\u5316\u3057\u307E\u3059\u3002\u8A73\u7D30\u306F\u3001-Xlog:help\u3092\n                      \u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n    -Xloggc:<file>    \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3057\u307E\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002-Xlog:gc:<file>\u3067\u7F6E\u63DB\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n    -Xmixed           \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xmn<size>        \u82E5\u3044\u4E16\u4EE3(\u30CA\u30FC\u30B5\u30EA)\u306E\u30D2\u30FC\u30D7\u306E\u521D\u671F\u30B5\u30A4\u30BA\u304A\u3088\u3073\u6700\u5927\u30B5\u30A4\u30BA\n                      (\u30D0\u30A4\u30C8\u5358\u4F4D)\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xms<size>        Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xmx<size>        Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xnoclassgc       \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -Xrs              Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3057\u307E\u3059(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n    -Xshare:auto      \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xshare:off       \
-\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u8A66\u307F\u307E\u305B\u3093\n    -Xshare:on        \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3057\u307E\u3059\u3002\n                      \u3053\u308C\u306F\u30C6\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u3001\u65AD\u7D9A\u7684\u306A\u5931\u6557\u306B\u3064\u306A\u304C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u672C\u756A\u74B0\u5883\u3067\u306F\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n    -XshowSettings    \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:all\n                      \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:locale\n                      \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:properties\n                      \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:vm\n                      \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:security\n                      \u3059\u3079\u3066\u306E\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:security:all\n                      \u3059\u3079\u3066\u306E\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:security:properties\n                      \u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:security:providers\n                      \u9759\u7684\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:security:tls\n                      TLS\u95A2\u9023\u306E\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:system\n                      (Linux\u306E\u307F)\u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u307E\u305F\u306F\u30B3\u30F3\u30C6\u30CA\u3092\u8868\u793A\u3057\u307E\u3059\n                      \u69CB\u6210\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -Xss<size>        java\u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                      \u5B9F\u969B\u306E\u30B5\u30A4\u30BA\u306F\u3001\u6B21\u306E\u500D\u6570\u306B\u5207\u308A\u4E0A\u3052\u3089\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059: \n                      \u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u306E\u8981\u4EF6\u306B\u5FDC\u3058\u305F\u30B7\u30B9\u30C6\u30E0\u30FB\u30DA\u30FC\u30B8\u30FB\u30B5\u30A4\u30BA\u3002\n    -Xverify          \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u30FB\u30D9\u30EA\u30D5\u30A1\u30A4\u30A2\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                      \u30AA\u30D7\u30B7\u30E7\u30F3-Xverify:none\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u3001\n                      \u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\u3092\n                      \u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \
-\n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n                      \u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092\n                      <target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n    --patch-module <module>=<file>({0}<file>)*\n                      JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\u3002\n    --source <version>\n                      \u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30FB\u30E2\u30FC\u30C9\u3067\u30BD\u30FC\u30B9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n    --finalization=<value>\n                      JVM\u304C\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\n                      <value>\u306F"enabled"\u307E\u305F\u306F"disabled"\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002\n                      \u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n\n\u3053\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
+java.launcher.X.usage=\n    -Xbatch           バックグラウンド・コンパイルを無効にします\n    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n                      ブートストラップ・クラス・パスの最後に追加します\n    -Xcheck:jni       JNI関数に対する追加のチェックを実行します\n    -Xcomp            初回呼出し時にメソッドのコンパイルを強制します\n    -Xdebug           何も実行されません。将来のリリースで削除されるため、非推奨になりました。\n    -Xdiag            追加の診断メッセージを表示します\n    -Xfuture          将来のデフォルトを見越して、最も厳密なチェックを有効にします\n                      このオプションは非推奨であり、将来のリリースで削除される\n                      可能性があります。\n    -Xint             インタプリタ・モードの実行のみ\n    -Xinternalversion\n                      -versionオプションより詳細なJVMバージョン情報を\n                      表示します\n    -Xlog:<opts>      Java Virtual Machine (JVM)統合ロギング・フレームワークでの\n                      ロギングを構成または有効化します。詳細は、-Xlog:helpを\n                      使用してください。\n    -Xloggc:<file>    タイムスタンプが付いたファイルにGCステータスのログを記録します\n                      このオプションは非推奨であり、将来のリリースで削除される\n                      可能性があります。-Xlog:gc:<file>で置換されています。\n    -Xmixed           混合モードの実行(デフォルト)\n    -Xmn<size>        若い世代(ナーサリ)のヒープの初期サイズおよび最大サイズ\n                      (バイト単位)を設定します\n    -Xms<size>        Javaの初期ヒープ・サイズを設定します\n    -Xmx<size>        Javaの最大ヒープ・サイズを設定します\n    -Xnoclassgc       クラスのガベージ・コレクションを無効にします\n    -Xrs              Java/VMによるOSシグナルの使用を削減します(ドキュメントを参照)\n    -Xshare:auto      可能であれば共有クラス・データを使用します(デフォルト)\n    -Xshare:off       \
+共有クラス・データの使用を試みません\n    -Xshare:on        共有クラス・データの使用を必須にし、できなければ失敗します。\n                      これはテスト・オプションであり、断続的な失敗につながる\n                      可能性があります。本番環境では使用しないでください。\n    -XshowSettings    すべての設定を表示して続行します\n    -XshowSettings:all\n                      すべての設定を表示して続行します\n    -XshowSettings:locale\n                      すべてのロケール関連の設定を表示して続行します\n    -XshowSettings:properties\n                      すべてのプロパティ設定を表示して続行します\n    -XshowSettings:vm\n                      すべてのVM関連の設定を表示して続行します\n    -XshowSettings:security\n                      すべてのセキュリティ設定を表示して続行します\n    -XshowSettings:security:all\n                      すべてのセキュリティ設定を表示して続行します\n    -XshowSettings:security:properties\n                      セキュリティ・プロパティを表示して続行します\n    -XshowSettings:security:providers\n                      静的セキュリティ・プロバイダ設定を表示して続行します\n    -XshowSettings:security:tls\n                      TLS関連のセキュリティ設定を表示して続行します\n    -XshowSettings:system\n                      (Linuxのみ)ホスト・システムまたはコンテナを表示します\n                      構成して続行します\n    -Xss<size>        javaスレッドのスタック・サイズを設定します\n                      実際のサイズは、次の倍数に切り上げられる場合があります: \n                      オペレーティング・システムの要件に応じたシステム・ページ・サイズ。\n    -Xverify          バイトコード・ベリファイアのモードを設定します\n                      オプション-Xverify:noneは非推奨になり、\n                      将来のリリースで削除される可能性があります。\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      モジュール宣言に関係なく、<module>を更新して<target-module>を\n                      読み取ります。 \
+\n                      <target-module>をALL-UNNAMEDに設定すると、すべての名前のないモジュールを\n                      読み取ることができます。\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      モジュール宣言に関係なく、<module>を更新して<package>を<target-module>に\n                      エクスポートします。\n                      <target-module>をALL-UNNAMEDに設定すると、すべての名前のないモジュールに\n                      エクスポートできます。\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      モジュール宣言に関係なく、<module>を更新して<package>を\n                      <target-module>に開きます。\n    --limit-modules <module name>[,<module name>...]\n                      参照可能なモジュールの領域を制限します\n    --patch-module <module>=<file>({0}<file>)*\n                      JARファイルまたはディレクトリのクラスおよびリソースで\n                      モジュールをオーバーライドまたは拡張します。\n    --source <version>\n                      ソースファイル・モードでソースのバージョンを設定します。\n    --finalization=<value>\n                      JVMがオブジェクトのファイナライズを実行するかどうかを制御します\n                      <value>は"enabled"または"disabled"のいずれかです。\n                      ファイナライズはデフォルトで有効になっています。\n\nこの追加オプションは予告なしに変更されることがあります。\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\n\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306FmacOS\u56FA\u6709\u3067\u3059:\n    -XstartOnFirstThread\n                      main()\u30E1\u30BD\u30C3\u30C9\u3092\u6700\u521D(AppKit)\u306E\u30B9\u30EC\u30C3\u30C9\u3067\u5B9F\u884C\u3059\u308B\n    -Xdock:name=<application name>\n                      Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n    -Xdock:icon=<path to icon file>\n                      Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n\n
+java.launcher.X.macosx.usage=\n次のオプションはmacOS固有です:\n    -XstartOnFirstThread\n                      main()メソッドを最初(AppKit)のスレッドで実行する\n    -Xdock:name=<application name>\n                      Dockに表示されるデフォルト・アプリケーション名をオーバーライドする\n    -Xdock:icon=<path to icon file>\n                      Dockに表示されるデフォルト・アイコンをオーバーライドする\n\n
 
-java.launcher.cls.error1=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9{0}\u3092\u691C\u51FA\u304A\u3088\u3073\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\n\u539F\u56E0: {1}: {2}
-java.launcher.cls.error2=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u30AF\u30E9\u30B9{1}\u306E{0}\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n   public static void main(String[] args)
-java.launcher.cls.error3=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u30AF\u30E9\u30B9{0}\u306Evoid\u578B\u306E\u5024\u3092\u8FD4\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n   public static void main(String[] args)
-java.launcher.cls.error4=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u30AF\u30E9\u30B9{0}\u3067\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n   public static void main(String[] args)\n\u307E\u305F\u306FJavaFX\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30AF\u30E9\u30B9\u306F{1}\u3092\u62E1\u5F35\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-java.launcher.cls.error5=\u30A8\u30E9\u30FC: JavaFX\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u4E0D\u8DB3\u3057\u3066\u304A\u308A\u3001\u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5B9F\u884C\u306B\u5FC5\u8981\u3067\u3059
-java.launcher.cls.error6=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306BLinkageError\u304C\u767A\u751F\u3057\u307E\u3057\u305F\n\t{1}
-java.launcher.cls.error7=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9{0}\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\n\u539F\u56E0: {1}: {2}
-java.launcher.cls.error8=\u30A8\u30E9\u30FC: \u975Eprivate\u306E\u30BC\u30ED\u5F15\u6570\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u30AF\u30E9\u30B9{0}\u306B\u898B\u3064\u304B\u308A\u307E\u305B\u3093\n\u65E2\u5B58\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304B\u3089private\u3092\u524A\u9664\u3059\u308B\u304B\u3001\u6B21\u306E\u3088\u3046\u306B\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044:\n   public {0}()
-java.launcher.cls.error9=\u30A8\u30E9\u30FC: static\u3067\u306A\u3044\u5185\u90E8\u30AF\u30E9\u30B9{0}\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093 \n\u5185\u90E8\u30AF\u30E9\u30B9\u3092static\u306B\u3059\u308B\u304B\u3001\u5185\u90E8\u30AF\u30E9\u30B9\u3092\u5916\u90E8\u306B\u51FA\u3057\u3066\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u533A\u5225\u3057\u3066\u304F\u3060\u3055\u3044
-java.launcher.jar.error1=\u30A8\u30E9\u30FC: \u30D5\u30A1\u30A4\u30EB{0}\u3092\u958B\u3053\u3046\u3068\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u3001\u4E88\u671F\u3057\u306A\u3044\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-java.launcher.jar.error2={0}\u306B\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-java.launcher.jar.error3={0}\u306B\u30E1\u30A4\u30F3\u30FB\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093
-java.launcher.jar.error4={0}\u5185\u306EJava\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-java.launcher.init.error=\u521D\u671F\u5316\u30A8\u30E9\u30FC
-java.launcher.javafx.error1=\u30A8\u30E9\u30FC: JavaFX launchApplication\u30E1\u30BD\u30C3\u30C9\u306B\u8AA4\u3063\u305F\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u3042\u308A\u3001\nstatic\u3092\u5BA3\u8A00\u3057\u3066void\u578B\u306E\u5024\u3092\u8FD4\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-java.launcher.module.error1=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306BModuleMainClass\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093\u3002-m <module>/<main-class>\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-java.launcher.module.error2=\u30A8\u30E9\u30FC: \u30E2\u30B8\u30E5\u30FC\u30EB{1}\u306B\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u3089\u306A\u304B\u3063\u305F\u304B\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-java.launcher.module.error3=\u30A8\u30E9\u30FC: \u30E2\u30B8\u30E5\u30FC\u30EB{1}\u306E\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9{0}\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\n\t{2}
-java.launcher.module.error4={0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-java.launcher.module.error5=\u30A8\u30E9\u30FC: \u30E2\u30B8\u30E5\u30FC\u30EB{1}\u306E\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9{0}\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\n\u539F\u56E0: {2}: {3}
+java.launcher.cls.error1=エラー: メイン・クラス{0}を検出およびロードできませんでした\n原因: {1}: {2}
+java.launcher.cls.error2=エラー: メイン・メソッドがクラス{1}の{0}ではありません。次のようにメイン・メソッドを定義してください。\n   public static void main(String[] args)
+java.launcher.cls.error3=エラー: メイン・メソッドはクラス{0}のvoid型の値を返す必要があります。\n次のようにメイン・メソッドを定義してください。\n   public static void main(String[] args)
+java.launcher.cls.error4=エラー: メイン・メソッドがクラス{0}で見つかりません。次のようにメイン・メソッドを定義してください。\n   public static void main(String[] args)\nまたはJavaFXアプリケーション・クラスは{1}を拡張する必要があります
+java.launcher.cls.error5=エラー: JavaFXランタイム・コンポーネントが不足しており、このアプリケーションの実行に必要です
+java.launcher.cls.error6=エラー: メイン・クラス{0}のロード中にLinkageErrorが発生しました\n\t{1}
+java.launcher.cls.error7=エラー: メイン・クラス{0}を初期化できません\n原因: {1}: {2}
+java.launcher.cls.error8=エラー: 非privateのゼロ引数コンストラクタがクラス{0}に見つかりません\n既存のコンストラクタからprivateを削除するか、次のように定義してください:\n   public {0}()
+java.launcher.cls.error9=エラー: staticでない内部クラス{0}コンストラクタを起動できません \n内部クラスをstaticにするか、内部クラスを外部に出してソース・ファイルを区別してください
+java.launcher.jar.error1=エラー: ファイル{0}を開こうとしているときに、予期しないエラーが発生しました
+java.launcher.jar.error2={0}にマニフェストが見つかりません
+java.launcher.jar.error3={0}にメイン・マニフェスト属性がありません
+java.launcher.jar.error4={0}内のJavaエージェントのロード中にエラーが発生しました
+java.launcher.init.error=初期化エラー
+java.launcher.javafx.error1=エラー: JavaFX launchApplicationメソッドに誤ったシグネチャがあり、\nstaticを宣言してvoid型の値を返す必要があります
+java.launcher.module.error1=モジュール{0}にModuleMainClass属性がありません。-m <module>/<main-class>を使用してください
+java.launcher.module.error2=エラー: モジュール{1}にメイン・クラス{0}が見つからなかったかロードできませんでした
+java.launcher.module.error3=エラー: モジュール{1}のメイン・クラス{0}をロードできません\n\t{2}
+java.launcher.module.error4={0}が見つかりません
+java.launcher.module.error5=エラー: モジュール{1}のメイン・クラス{0}を初期化できません\n原因: {2}: {3}
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_ko.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_ko.properties
index a1bf45efff2..f9460722f32 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_ko.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_ko.properties
@@ -24,37 +24,37 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   \uC0AC\uC6A9\uBC95: {0} [\uC635\uC158] <\uAE30\uBCF8 \uD074\uB798\uC2A4> [args...]\n           (\uD074\uB798\uC2A4 \uC2E4\uD589)\n   \uB610\uB294  {0} [\uC635\uC158] -jar <jar \uD30C\uC77C> [args...]\n           (jar \uD30C\uC77C \uC2E4\uD589)\n   \uB610\uB294  {0} [\uC635\uC158] -m <\uBAA8\uB4C8>[/<\uAE30\uBCF8 \uD074\uB798\uC2A4>] [args...]\n       {0} [\uC635\uC158] --module <\uBAA8\uB4C8>[/<\uAE30\uBCF8 \uD074\uB798\uC2A4>] [args...]\n           (\uBAA8\uB4C8\uC758 \uAE30\uBCF8 \uD074\uB798\uC2A4 \uC2E4\uD589)\n\n \uAE30\uBCF8 \uD074\uB798\uC2A4, -jar <jar \uD30C\uC77C>, -m \uB610\uB294 --module\n <\uBAA8\uB4C8>/<\uAE30\uBCF8 \uD074\uB798\uC2A4> \uB4A4\uC5D0 \uB098\uC624\uB294 \uC778\uC218\uB294 \uAE30\uBCF8 \uD074\uB798\uC2A4\uC5D0 \uC778\uC218\uB85C \uC804\uB2EC\uB429\uB2C8\uB2E4.\n\n \uC774 \uACBD\uC6B0 \uC635\uC158\uC5D0\uB294 \uB2E4\uC74C\uC774 \uD3EC\uD568\uB429\uB2C8\uB2E4.\n\n
+java.launcher.opt.header  =   사용법: {0} [옵션] <기본 클래스> [args...]\n           (클래스 실행)\n   또는  {0} [옵션] -jar <jar 파일> [args...]\n           (jar 파일 실행)\n   또는  {0} [옵션] -m <모듈>[/<기본 클래스>] [args...]\n       {0} [옵션] --module <모듈>[/<기본 클래스>] [args...]\n           (모듈의 기본 클래스 실행)\n\n 기본 클래스, -jar <jar 파일>, -m 또는 --module\n <모듈>/<기본 클래스> 뒤에 나오는 인수는 기본 클래스에 인수로 전달됩니다.\n\n 이 경우 옵션에는 다음이 포함됩니다.\n\n
 
-java.launcher.opt.vmselect   =\    {0}\t  "{1}" VM\uC744 \uC120\uD0DD\uD569\uB2C8\uB2E4.\n
-java.launcher.opt.hotspot    =\    {0}\t  "{1}" VM\uC758 \uB3D9\uC758\uC5B4\uC785\uB2C8\uB2E4[\uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC74C].\n
+java.launcher.opt.vmselect   =\    {0}\t  "{1}" VM을 선택합니다.\n
+java.launcher.opt.hotspot    =\    {0}\t  "{1}" VM의 동의어입니다[사용되지 않음].\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <\uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C\uC758 \uD074\uB798\uC2A4 \uAC80\uC0C9 \uACBD\uB85C>\n    -classpath <\uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C\uC758 \uD074\uB798\uC2A4 \uAC80\uC0C9 \uACBD\uB85C>\n    --class-path <\uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C\uC758 \uD074\uB798\uC2A4 \uAC80\uC0C9 \uACBD\uB85C>\n                  \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uAC80\uC0C9\uD558\uAE30 \uC704\uD55C \uB514\uB809\uD1A0\uB9AC, JAR \uC544\uCE74\uC774\uBE0C \uBC0F ZIP \uC544\uCE74\uC774\uBE0C\uC758 {0}(\uC73C)\uB85C\n                  \uAD6C\uBD84\uB41C \uBAA9\uB85D\uC785\uB2C8\uB2E4.\n    -p <\uBAA8\uB4C8 \uACBD\uB85C>\n    --module-path <\uBAA8\uB4C8 \uACBD\uB85C>...\n                  \uB514\uB809\uD1A0\uB9AC\uC758 {0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uBAA9\uB85D\uC785\uB2C8\uB2E4. \uAC01 \uB514\uB809\uD1A0\uB9AC\uB294\n                  \uBAA8\uB4C8\uC758 \uB514\uB809\uD1A0\uB9AC\uC785\uB2C8\uB2E4.\n    --upgrade-module-path <\uBAA8\uB4C8 \uACBD\uB85C>...\n                  \uB514\uB809\uD1A0\uB9AC\uC758 {0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uBAA9\uB85D\uC785\uB2C8\uB2E4. \uAC01 \uB514\uB809\uD1A0\uB9AC\uB294\n                  \uB7F0\uD0C0\uC784 \uC774\uBBF8\uC9C0\uC5D0\uC11C \uC5C5\uADF8\uB808\uC774\uB4DC \uAC00\uB2A5\uD55C \uBAA8\uB4C8\uC744 \uB300\uCCB4\uD558\uB294\n                  \uBAA8\uB4C8\uC758 \uB514\uB809\uD1A0\uB9AC\uC785\uB2C8\uB2E4.\n    --add-modules <\uBAA8\uB4C8 \uC774\uB984>[,<\uBAA8\uB4C8 \uC774\uB984>...]\n                  \uCD08\uAE30 \uBAA8\uB4C8 \uC774\uC678\uC758 \uD574\uACB0\uD560 \uB8E8\uD2B8 \uBAA8\uB4C8\uC785\uB2C8\uB2E4.\n                  <\uBAA8\uB4C8 \uC774\uB984>\uC740 ALL-DEFAULT, ALL-SYSTEM\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n                  ALL-MODULE-PATH.\n    --list-modules\n                  \uAD00\uCC30 \uAC00\uB2A5\uD55C \uBAA8\uB4C8\uC744 \uB098\uC5F4\uD558\uACE0 \uC885\uB8CC\uD569\uB2C8\uB2E4.\n    -d <\uBAA8\uB4C8 \uC774\uB984>\n    --describe-module <\uBAA8\uB4C8 \uC774\uB984>\n                  \uBAA8\uB4C8\uC744 \uC124\uBA85\uD558\uACE0 \uC885\uB8CC\uD569\uB2C8\uB2E4.\n    --dry-run     VM\uC744 \uC0DD\uC131\uD558\uACE0 \uAE30\uBCF8 \uD074\uB798\uC2A4\uB97C \uB85C\uB4DC\uD558\uC9C0\uB9CC \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC2E4\uD589\uD558\uC9C0\uB294 \uC54A\uC2B5\uB2C8\uB2E4.\n                  --dry-run \uC635\uC158\uC740 \uBAA8\uB4C8 \uC2DC\uC2A4\uD15C \uAD6C\uC131\uACFC \uAC19\uC740\n                  \uBA85\uB839\uC904 \uC635\uC158 \uAC80\uC99D\uC5D0 \uC720\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n    --validate-modules\n                  \uBAA8\uB4E0 \uBAA8\uB4C8\uC744 \uAC80\uC99D\uD558\uACE0 \uC885\uB8CC\uD569\uB2C8\uB2E4.\n                  --validate-modules \uC635\uC158\uC740 \uBAA8\uB4C8 \uACBD\uB85C\uC5D0\uC11C \uBAA8\uB4C8\uC5D0 \uB300\uD55C\n                  \uCDA9\uB3CC \uBC0F \uAE30\uD0C0 \uC624\uB958\uB97C \uCC3E\uB294 \uB370 \uC720\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n    -D<\uC774\uB984>=<\uAC12>\n                  \uC2DC\uC2A4\uD15C \uC18D\uC131\uC744 \uC124\uC815\uD569\uB2C8\uB2E4.\n    -verbose:[class|module|gc|jni]\n                  \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\n    -version      \uC624\uB958 \uC2A4\uD2B8\uB9BC\uC5D0 \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD558\uACE0 \uC885\uB8CC\uD569\uB2C8\uB2E4.\n    --version     \uCD9C\uB825 \uC2A4\uD2B8\uB9BC\uC5D0 \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD558\uACE0 \uC885\uB8CC\uD569\uB2C8\uB2E4.\n    -showversion  \uC624\uB958 \uC2A4\uD2B8\uB9BC\uC5D0 \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD558\uACE0 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n    --show-version\n                  \uCD9C\uB825 \uC2A4\uD2B8\uB9BC\uC5D0 \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD558\uACE0 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n    --show-module-resolution\n                  \uC2DC\uC791 \uC911 \uBAA8\uB4C8 \uBD84\uC11D \uCD9C\uB825\uC744 \
-\uD45C\uC2DC\uD569\uB2C8\uB2E4.\n    -? -h -help\n                  \uC624\uB958 \uC2A4\uD2B8\uB9BC\uC5D0 \uC774 \uB3C4\uC6C0\uB9D0 \uBA54\uC2DC\uC9C0\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4.\n    --help        \uCD9C\uB825 \uC2A4\uD2B8\uB9BC\uC5D0 \uC774 \uB3C4\uC6C0\uB9D0 \uBA54\uC2DC\uC9C0\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4.\n    -X            \uC624\uB958 \uC2A4\uD2B8\uB9BC\uC5D0 \uCD94\uAC00 \uC635\uC158\uC5D0 \uB300\uD55C \uB3C4\uC6C0\uB9D0\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.\n    --help-extra  \uCD9C\uB825 \uC2A4\uD2B8\uB9BC\uC5D0 \uCD94\uAC00 \uC635\uC158\uC5D0 \uB300\uD55C \uB3C4\uC6C0\uB9D0\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.\n    -ea[:<\uD328\uD0A4\uC9C0 \uC774\uB984>...|:<\uD074\uB798\uC2A4 \uC774\uB984>]\n    -enableassertions[:<\uD328\uD0A4\uC9C0 \uC774\uB984>...|:<\uD074\uB798\uC2A4 \uC774\uB984>]\n                  \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -da[:<\uD328\uD0A4\uC9C0 \uC774\uB984>...|:<\uD074\uB798\uC2A4 \uC774\uB984>]\n    -disableassertions[:<\uD328\uD0A4\uC9C0 \uC774\uB984>...|:<\uD074\uB798\uC2A4 \uC774\uB984>]\n                  \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -esa | -enablesystemassertions\n                  \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -dsa | -disablesystemassertions\n                  \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -agentlib:<\uB77C\uC774\uBE0C\uB7EC\uB9AC \uC774\uB984>[=<\uC635\uC158>]\n                  \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC <\uB77C\uC774\uBE0C\uB7EC\uB9AC \uC774\uB984>\uC744 \uB85C\uB4DC\uD569\uB2C8\uB2E4(\uC608: -agentlib:jdwp).\n                  -agentlib:jdwp=help\uB3C4 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n    -agentpath:<\uACBD\uB85C \uC774\uB984>[=<\uC635\uC158>]\n                  \uC804\uCCB4 \uACBD\uB85C \uC774\uB984\uC744 \uC0AC\uC6A9\uD558\uC5EC \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4.\n    -javaagent:<jar \uACBD\uB85C>[=<\uC635\uC158>]\n                  Java \uD504\uB85C\uADF8\uB798\uBC0D \uC5B8\uC5B4 \uC5D0\uC774\uC804\uD2B8\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4. java.lang.instrument\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n    -splash:<\uC774\uBBF8\uC9C0 \uACBD\uB85C>\n                  \uC774\uBBF8\uC9C0\uAC00 \uC9C0\uC815\uB41C \uC2A4\uD50C\uB798\uC2DC \uD654\uBA74\uC744 \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n                  HiDPI\uB85C \uC870\uC815\uB41C \uC774\uBBF8\uC9C0\uAC00 \uC790\uB3D9\uC73C\uB85C \uC9C0\uC6D0\uB418\uACE0 \uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uACBD\uC6B0\n                  \uC0AC\uC6A9\uB429\uB2C8\uB2E4. \uBBF8\uC870\uC815 \uC774\uBBF8\uC9C0 \uD30C\uC77C \uC774\uB984(\uC608: image.ext)\uC740\n                  \uD56D\uC0C1 -splash \uC635\uC158\uC5D0 \uC778\uC218\uB85C \uC804\uB2EC\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.\n                  \uAC00\uC7A5 \uC801\uC808\uD788 \uC870\uC815\uB41C \uC774\uBBF8\uC9C0\uAC00 \uC790\uB3D9\uC73C\uB85C\n                  \uCC44\uD0DD\uB429\uB2C8\uB2E4.\n                  \uC790\uC138\uD55C \uB0B4\uC6A9\uC740 SplashScreen API \uC124\uBA85\uC11C\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n    @\uC778\uC218 \uD30C\uC77C\n                  --disable-@files \uC635\uC158\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uB294 \uD558\uB098 \uC774\uC0C1\uC758\n    \uC778\uC218 \uD30C\uC77C\n                  \uCD94\uAC00 \uC778\uC218 \uD30C\uC77C \uD655\uC7A5\uC744 \uBC29\uC9C0\uD569\uB2C8\uB2E4.\nlong \uC635\uC158\uC5D0 \uB300\uD55C \uC778\uC218\uB97C \uC9C0\uC815\uD558\uB824\uBA74 --<\uC774\uB984>=<\uAC12> \uB610\uB294\n--<\uC774\uB984> <\uAC12>\uC744 \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n
+java.launcher.opt.footer = \    -cp <디렉토리 및 zip/jar 파일의 클래스 검색 경로>\n    -classpath <디렉토리 및 zip/jar 파일의 클래스 검색 경로>\n    --class-path <디렉토리 및 zip/jar 파일의 클래스 검색 경로>\n                  클래스 파일을 검색하기 위한 디렉토리, JAR 아카이브 및 ZIP 아카이브의 {0}(으)로\n                  구분된 목록입니다.\n    -p <모듈 경로>\n    --module-path <모듈 경로>...\n                  디렉토리의 {0}(으)로 구분된 목록입니다. 각 디렉토리는\n                  모듈의 디렉토리입니다.\n    --upgrade-module-path <모듈 경로>...\n                  디렉토리의 {0}(으)로 구분된 목록입니다. 각 디렉토리는\n                  런타임 이미지에서 업그레이드 가능한 모듈을 대체하는\n                  모듈의 디렉토리입니다.\n    --add-modules <모듈 이름>[,<모듈 이름>...]\n                  초기 모듈 이외의 해결할 루트 모듈입니다.\n                  <모듈 이름>은 ALL-DEFAULT, ALL-SYSTEM일 수 있습니다.\n                  ALL-MODULE-PATH.\n    --list-modules\n                  관찰 가능한 모듈을 나열하고 종료합니다.\n    -d <모듈 이름>\n    --describe-module <모듈 이름>\n                  모듈을 설명하고 종료합니다.\n    --dry-run     VM을 생성하고 기본 클래스를 로드하지만 기본 메소드를 실행하지는 않습니다.\n                  --dry-run 옵션은 모듈 시스템 구성과 같은\n                  명령줄 옵션 검증에 유용할 수 있습니다.\n    --validate-modules\n                  모든 모듈을 검증하고 종료합니다.\n                  --validate-modules 옵션은 모듈 경로에서 모듈에 대한\n                  충돌 및 기타 오류를 찾는 데 유용할 수 있습니다.\n    -D<이름>=<값>\n                  시스템 속성을 설정합니다.\n    -verbose:[class|module|gc|jni]\n                  상세 정보 출력을 사용으로 설정\n    -version      오류 스트림에 제품 버전을 인쇄하고 종료합니다.\n    --version     출력 스트림에 제품 버전을 인쇄하고 종료합니다.\n    -showversion  오류 스트림에 제품 버전을 인쇄하고 계속합니다.\n    --show-version\n                  출력 스트림에 제품 버전을 인쇄하고 계속합니다.\n    --show-module-resolution\n                  시작 중 모듈 분석 출력을 \
+표시합니다.\n    -? -h -help\n                  오류 스트림에 이 도움말 메시지를 인쇄합니다.\n    --help        출력 스트림에 이 도움말 메시지를 인쇄합니다.\n    -X            오류 스트림에 추가 옵션에 대한 도움말을 인쇄합니다.\n    --help-extra  출력 스트림에 추가 옵션에 대한 도움말을 인쇄합니다.\n    -ea[:<패키지 이름>...|:<클래스 이름>]\n    -enableassertions[:<패키지 이름>...|:<클래스 이름>]\n                  세분성이 지정된 검증을 사용으로 설정합니다.\n    -da[:<패키지 이름>...|:<클래스 이름>]\n    -disableassertions[:<패키지 이름>...|:<클래스 이름>]\n                  세분성이 지정된 검증을 사용 안함으로 설정합니다.\n    -esa | -enablesystemassertions\n                  시스템 검증을 사용으로 설정합니다.\n    -dsa | -disablesystemassertions\n                  시스템 검증을 사용 안함으로 설정합니다.\n    -agentlib:<라이브러리 이름>[=<옵션>]\n                  고유 에이전트 라이브러리 <라이브러리 이름>을 로드합니다(예: -agentlib:jdwp).\n                  -agentlib:jdwp=help도 참조하십시오.\n    -agentpath:<경로 이름>[=<옵션>]\n                  전체 경로 이름을 사용하여 고유 에이전트 라이브러리를 로드합니다.\n    -javaagent:<jar 경로>[=<옵션>]\n                  Java 프로그래밍 언어 에이전트를 로드합니다. java.lang.instrument를 참조하십시오.\n    -splash:<이미지 경로>\n                  이미지가 지정된 스플래시 화면을 표시합니다.\n                  HiDPI로 조정된 이미지가 자동으로 지원되고 사용 가능한 경우\n                  사용됩니다. 미조정 이미지 파일 이름(예: image.ext)은\n                  항상 -splash 옵션에 인수로 전달되어야 합니다.\n                  가장 적절히 조정된 이미지가 자동으로\n                  채택됩니다.\n                  자세한 내용은 SplashScreen API 설명서를 참조하십시오.\n    @인수 파일\n                  --disable-@files 옵션이 포함되어 있는 하나 이상의\n    인수 파일\n                  추가 인수 파일 확장을 방지합니다.\nlong 옵션에 대한 인수를 지정하려면 --<이름>=<값> 또는\n--<이름> <값>을 사용할 수 있습니다.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           \uBC31\uADF8\uB77C\uC6B4\uB4DC \uCEF4\uD30C\uC77C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xbootclasspath/a:<{0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C>\n                      \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uB05D\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n    -Xcheck:jni       JNI \uD568\uC218\uC5D0 \uB300\uD55C \uCD94\uAC00 \uAC80\uC0AC\uB97C \uC218\uD589\uD569\uB2C8\uB2E4.\n    -Xcomp            \uCCAB\uBC88\uC9F8 \uD638\uCD9C\uC5D0\uC11C \uBA54\uC18C\uB4DC \uCEF4\uD30C\uC77C\uC744 \uAC15\uC81C\uD569\uB2C8\uB2E4.\n    -Xdebug           \uC5ED \uD638\uD658\uC131\uC744 \uC704\uD574 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.\n    -Xdiag            \uCD94\uAC00 \uC9C4\uB2E8 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n    -Xfuture          \uBBF8\uB798 \uAE30\uBCF8\uAC12\uC744 \uC608\uCE21\uD558\uC5EC \uAC00\uC7A5 \uC5C4\uACA9\uD55C \uAC80\uC0AC\uB97C \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xint             \uD574\uC11D\uB41C \uBAA8\uB4DC\uB9CC \uC2E4\uD589\uD569\uB2C8\uB2E4.\n    -Xinternalversion\n                      -version \uC635\uC158\uBCF4\uB2E4 \uC0C1\uC138\uD55C JVM \uBC84\uC804 \uC815\uBCF4\uB97C\n                      \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n    -Xloggc:<file>    \uC2DC\uAC04\uAE30\uB85D\uACFC \uD568\uAED8 \uD30C\uC77C\uC5D0 GC \uC0C1\uD0DC\uB97C \uAE30\uB85D\uD569\uB2C8\uB2E4.\n    -Xmixed           \uD63C\uD569 \uBAA8\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n    -Xmn<size>        \uC80A\uC740 \uC138\uB300(Nursery)\uB97C \uC704\uD574 \uD799\uC758 \uCD08\uAE30 \uBC0F \uCD5C\uB300\n                      \uD06C\uAE30(\uBC14\uC774\uD2B8)\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xms<size>        \uCD08\uAE30 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xmx<size>        \uCD5C\uB300 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xnoclassgc       \uD074\uB798\uC2A4\uC758 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xrs              Java/VM\uC5D0 \uC758\uD55C OS \uC2E0\uD638 \uC0AC\uC6A9\uC744 \uC904\uC785\uB2C8\uB2E4(\uC124\uBA85\uC11C \uCC38\uC870).\n    -Xshare:auto      \uAC00\uB2A5\uD55C \uACBD\uC6B0 \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n    -Xshare:off       \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130 \uC0AC\uC6A9\uC744 \uC2DC\uB3C4\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n    -Xshare:on        \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD574\uC57C \uD569\uB2C8\uB2E4. \uADF8\uB807\uC9C0 \uC54A\uC744 \uACBD\uC6B0 \uC2E4\uD328\uD569\uB2C8\uB2E4.\n    -XshowSettings    \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n    -XshowSettings:all\n                      \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n    -XshowSettings:locale\n                      \uBAA8\uB4E0 \uB85C\uCF00\uC77C \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n    -XshowSettings:properties\n                      \uBAA8\uB4E0 \uC18D\uC131 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n    -XshowSettings:vm \uBAA8\uB4E0 VM \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n    -Xss<size>        Java \uC2A4\uB808\uB4DC \uC2A4\uD0DD \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xverify          \uBC14\uC774\uD2B8\uCF54\uB4DC \uAC80\uC99D\uC790\uC758 \uBAA8\uB4DC\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \uBAA8\uB4C8 \uC120\uC5B8\uC5D0 \uAD00\uACC4\uC5C6\uC774 <target-module>\uC744 \
-\uC77D\uB3C4\uB85D\n                      <module>\uC744 \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4. \n                      <target-module>\uC740 \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC740 \uBAA8\uB4E0 \uBAA8\uB4C8\uC744 \uC77D\uC744 \uC218 \uC788\uB294\n                      ALL-UNNAMED\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n\n                      \uBAA8\uB4C8 \uC120\uC5B8\uC5D0 \uAD00\uACC4\uC5C6\uC774 <package>\uB97C <target-module>\uB85C \uC775\uC2A4\uD3EC\uD2B8\uD558\uB3C4\uB85D\n                      <module>\uC744 \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.\n                      <target-module>\uC740 \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC740 \uBAA8\uB4E0 \uBAA8\uB4C8\uB85C \uC775\uC2A4\uD3EC\uD2B8\uD560 \uC218 \uC788\uB294\n                      ALL-UNNAMED\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \uBAA8\uB4C8 \uC120\uC5B8\uC5D0 \uAD00\uACC4\uC5C6\uC774 <package>\uB97C <target-module>\uB85C \uC5F4\uB3C4\uB85D\n                      <module>\uC744 \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.\n    --illegal-access=<value>\n                      \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC740 \uBAA8\uB4C8\uC758 \uCF54\uB4DC\uB97C \uC0AC\uC6A9\uD558\uC5EC \uC774\uB984\uC774 \uC9C0\uC815\uB41C \uBAA8\uB4C8\uC758 \uC720\uD615 \uBA64\uBC84\uC5D0 \uB300\uD55C\n                      \uC561\uC138\uC2A4 \uAD8C\uD55C\uC744 \uD5C8\uC6A9 \uB610\uB294 \uAC70\uBD80\uD569\uB2C8\uB2E4.\n                      <value>\uB294 "deny", "permit", "warn" \uB610\uB294 "debug" \uC911 \uD558\uB098\uC785\uB2C8\uB2E4.\n                      \uC774 \uC635\uC158\uC740 \uC774\uD6C4 \uB9B4\uB9AC\uC2A4\uC5D0\uC11C \uC81C\uAC70\uB429\uB2C8\uB2E4.\n    --limit-modules <module name>[,<module name>...]\n                      \uAD00\uCC30 \uAC00\uB2A5\uD55C \uBAA8\uB4C8\uC758 \uACF5\uC6A9\uC744 \uC81C\uD55C\uD569\uB2C8\uB2E4.\n    --patch-module <module>=<file>({0}<file>)*\n                      JAR \uD30C\uC77C \uB610\uB294 \uB514\uB809\uD1A0\uB9AC\uC758 \uD074\uB798\uC2A4\uC640 \uB9AC\uC18C\uC2A4\uB85C \uBAA8\uB4C8\uC744\n                      \uBB34\uD6A8\uD654\uD558\uAC70\uB098 \uC778\uC218\uD654\uD569\uB2C8\uB2E4.\n    --disable-@files  \uCD94\uAC00 \uC778\uC218 \uD30C\uC77C \uD655\uC7A5\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\n\uC774\uB7EC\uD55C \uCD94\uAC00 \uC635\uC158\uC740 \uD1B5\uC9C0 \uC5C6\uC774 \uBCC0\uACBD\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n
+java.launcher.X.usage=\n    -Xbatch           백그라운드 컴파일을 사용 안함으로 설정합니다.\n    -Xbootclasspath/a:<{0}(으)로 구분된 디렉토리 및 zip/jar 파일>\n                      부트스트랩 클래스 경로 끝에 추가합니다.\n    -Xcheck:jni       JNI 함수에 대한 추가 검사를 수행합니다.\n    -Xcomp            첫번째 호출에서 메소드 컴파일을 강제합니다.\n    -Xdebug           역 호환성을 위해 제공되었습니다.\n    -Xdiag            추가 진단 메시지를 표시합니다.\n    -Xfuture          미래 기본값을 예측하여 가장 엄격한 검사를 사용으로 설정합니다.\n    -Xint             해석된 모드만 실행합니다.\n    -Xinternalversion\n                      -version 옵션보다 상세한 JVM 버전 정보를\n                      표시합니다.\n    -Xloggc:<file>    시간기록과 함께 파일에 GC 상태를 기록합니다.\n    -Xmixed           혼합 모드를 실행합니다(기본값).\n    -Xmn<size>        젊은 세대(Nursery)를 위해 힙의 초기 및 최대\n                      크기(바이트)를 설정합니다.\n    -Xms<size>        초기 Java 힙 크기를 설정합니다.\n    -Xmx<size>        최대 Java 힙 크기를 설정합니다.\n    -Xnoclassgc       클래스의 불필요한 정보 모음을 사용 안함으로 설정합니다.\n    -Xrs              Java/VM에 의한 OS 신호 사용을 줄입니다(설명서 참조).\n    -Xshare:auto      가능한 경우 공유 클래스 데이터를 사용합니다(기본값).\n    -Xshare:off       공유 클래스 데이터 사용을 시도하지 않습니다.\n    -Xshare:on        공유 클래스 데이터를 사용해야 합니다. 그렇지 않을 경우 실패합니다.\n    -XshowSettings    모든 설정을 표시한 후 계속합니다.\n    -XshowSettings:all\n                      모든 설정을 표시한 후 계속합니다.\n    -XshowSettings:locale\n                      모든 로케일 관련 설정을 표시한 후 계속합니다.\n    -XshowSettings:properties\n                      모든 속성 설정을 표시한 후 계속합니다.\n    -XshowSettings:vm 모든 VM 관련 설정을 표시한 후 계속합니다.\n    -Xss<size>        Java 스레드 스택 크기를 설정합니다.\n    -Xverify          바이트코드 검증자의 모드를 설정합니다.\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      모듈 선언에 관계없이 <target-module>을 \
+읽도록\n                      <module>을 업데이트합니다. \n                      <target-module>은 이름이 지정되지 않은 모든 모듈을 읽을 수 있는\n                      ALL-UNNAMED일 수 있습니다.\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n\n                      모듈 선언에 관계없이 <package>를 <target-module>로 익스포트하도록\n                      <module>을 업데이트합니다.\n                      <target-module>은 이름이 지정되지 않은 모든 모듈로 익스포트할 수 있는\n                      ALL-UNNAMED일 수 있습니다.\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      모듈 선언에 관계없이 <package>를 <target-module>로 열도록\n                      <module>을 업데이트합니다.\n    --illegal-access=<value>\n                      이름이 지정되지 않은 모듈의 코드를 사용하여 이름이 지정된 모듈의 유형 멤버에 대한\n                      액세스 권한을 허용 또는 거부합니다.\n                      <value>는 "deny", "permit", "warn" 또는 "debug" 중 하나입니다.\n                      이 옵션은 이후 릴리스에서 제거됩니다.\n    --limit-modules <module name>[,<module name>...]\n                      관찰 가능한 모듈의 공용을 제한합니다.\n    --patch-module <module>=<file>({0}<file>)*\n                      JAR 파일 또는 디렉토리의 클래스와 리소스로 모듈을\n                      무효화하거나 인수화합니다.\n    --disable-@files  추가 인수 파일 확장을 사용 안함으로 설정합니다.\n\n이러한 추가 옵션은 통지 없이 변경될 수 있습니다.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\n\uB2E4\uC74C\uC740 Mac OS X\uC5D0 \uD2B9\uC815\uB41C \uC635\uC158\uC785\uB2C8\uB2E4.\n    -XstartOnFirstThread\n                      \uCCAB\uBC88\uC9F8 (AppKit) \uC2A4\uB808\uB4DC\uC5D0 main() \uBA54\uC18C\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4.\n    -Xdock:name=<application name>\n                      \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC560\uD50C\uB9AC\uCF00\uC774\uC158 \uC774\uB984\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n    -Xdock:icon=<path to icon file>\n                      \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC544\uC774\uCF58\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n\n
+java.launcher.X.macosx.usage=\n다음은 Mac OS X에 특정된 옵션입니다.\n    -XstartOnFirstThread\n                      첫번째 (AppKit) 스레드에 main() 메소드를 실행합니다.\n    -Xdock:name=<application name>\n                      고정으로 표시된 기본 애플리케이션 이름을 무효화합니다.\n    -Xdock:icon=<path to icon file>\n                      고정으로 표시된 기본 아이콘을 무효화합니다.\n\n
 
-java.launcher.cls.error1=\uC624\uB958: \uAE30\uBCF8 \uD074\uB798\uC2A4 {0}\uC744(\uB97C) \uCC3E\uAC70\uB098 \uB85C\uB4DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n\uC6D0\uC778: {1}: {2}
-java.launcher.cls.error2=\uC624\uB958: {1} \uD074\uB798\uC2A4\uC5D0\uC11C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uAC00 {0}\uC774(\uAC00) \uC544\uB2D9\uB2C8\uB2E4. \uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\n   public static void main(String[] args)
-java.launcher.cls.error3=\uC624\uB958: \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB294 {0} \uD074\uB798\uC2A4\uC5D0\uC11C void \uC720\uD615\uC758 \uAC12\uC744 \uBC18\uD658\uD574\uC57C \uD569\uB2C8\uB2E4. \n\uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\n   public static void main(String[] args)
-java.launcher.cls.error4=\uC624\uB958: {0} \uD074\uB798\uC2A4\uC5D0\uC11C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\r\n   public static void main(String[] args)\r\n\uB610\uB294 JavaFX \uC560\uD50C\uB9AC\uCF00\uC774\uC158 \uD074\uB798\uC2A4\uB294 {1}\uC744(\uB97C) \uD655\uC7A5\uD574\uC57C \uD569\uB2C8\uB2E4.
-java.launcher.cls.error5=\uC624\uB958: \uC774 \uC560\uD50C\uB9AC\uCF00\uC774\uC158\uC744 \uC2E4\uD589\uD558\uB294 \uB370 \uD544\uC694\uD55C JavaFX \uB7F0\uD0C0\uC784 \uAD6C\uC131\uC694\uC18C\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-java.launcher.cls.error6=\uC624\uB958: \uAE30\uBCF8 \uD074\uB798\uC2A4 {0}\uC744(\uB97C) \uB85C\uB4DC\uD558\uB294 \uC911 LinkageError\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n\t{1}
-java.launcher.cls.error7=\uC624\uB958: \uAE30\uBCF8 \uD074\uB798\uC2A4 {0}\uC744(\uB97C) \uCD08\uAE30\uD654\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n\uC6D0\uC778: {1}: {2}
-java.launcher.jar.error1=\uC624\uB958: {0} \uD30C\uC77C\uC744 \uC5F4\uB824\uACE0 \uC2DC\uB3C4\uD558\uB294 \uC911 \uC608\uC0C1\uCE58 \uC54A\uC740 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
-java.launcher.jar.error2={0}\uC5D0\uC11C Manifest\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-java.launcher.jar.error3={0}\uC5D0 \uAE30\uBCF8 Manifest \uC18D\uC131\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-java.launcher.jar.error4={0}\uC5D0\uC11C Java \uC5D0\uC774\uC804\uD2B8\uB97C \uB85C\uB4DC\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
-java.launcher.init.error=\uCD08\uAE30\uD654 \uC624\uB958
-java.launcher.javafx.error1=\uC624\uB958: JavaFX launchApplication \uBA54\uC18C\uB4DC\uC5D0 \uC798\uBABB\uB41C \uC11C\uBA85\uC774 \uC788\uC2B5\uB2C8\uB2E4.\\n\uB530\uB77C\uC11C static\uC73C\uB85C \uC120\uC5B8\uD558\uACE0 void \uC720\uD615\uC758 \uAC12\uC744 \uBC18\uD658\uD574\uC57C \uD569\uB2C8\uB2E4.
-java.launcher.module.error1={0} \uBAA8\uB4C8\uC5D0 MainClass \uC18D\uC131\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. -m <module>/<main-class>\uB97C \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
-java.launcher.module.error2=\uC624\uB958: {1} \uBAA8\uB4C8\uC758 \uAE30\uBCF8 \uD074\uB798\uC2A4 {0}\uC744(\uB97C) \uCC3E\uAC70\uB098 \uB85C\uB4DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-java.launcher.module.error3=\uC624\uB958: {1} \uBAA8\uB4C8\uC758 \uAE30\uBCF8 \uD074\uB798\uC2A4 {0}\uC744(\uB97C) \uB85C\uB4DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n\t{2}
-java.launcher.module.error4={0}\uC744(\uB97C) \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-java.launcher.module.error5=\uC624\uB958: {1} \uBAA8\uB4C8\uC758 \uAE30\uBCF8 \uD074\uB798\uC2A4 {0}\uC744(\uB97C) \uCD08\uAE30\uD654\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n\uC6D0\uC778: {1}: {2}
+java.launcher.cls.error1=오류: 기본 클래스 {0}을(를) 찾거나 로드할 수 없습니다.\n원인: {1}: {2}
+java.launcher.cls.error2=오류: {1} 클래스에서 기본 메소드가 {0}이(가) 아닙니다. 다음 형식으로 기본 메소드를 정의하십시오.\n   public static void main(String[] args)
+java.launcher.cls.error3=오류: 기본 메소드는 {0} 클래스에서 void 유형의 값을 반환해야 합니다. \n다음 형식으로 기본 메소드를 정의하십시오.\n   public static void main(String[] args)
+java.launcher.cls.error4=오류: {0} 클래스에서 기본 메소드를 찾을 수 없습니다. 다음 형식으로 기본 메소드를 정의하십시오.\r\n   public static void main(String[] args)\r\n또는 JavaFX 애플리케이션 클래스는 {1}을(를) 확장해야 합니다.
+java.launcher.cls.error5=오류: 이 애플리케이션을 실행하는 데 필요한 JavaFX 런타임 구성요소가 누락되었습니다.
+java.launcher.cls.error6=오류: 기본 클래스 {0}을(를) 로드하는 중 LinkageError가 발생했습니다.\n\t{1}
+java.launcher.cls.error7=오류: 기본 클래스 {0}을(를) 초기화할 수 없습니다.\n원인: {1}: {2}
+java.launcher.jar.error1=오류: {0} 파일을 열려고 시도하는 중 예상치 않은 오류가 발생했습니다.
+java.launcher.jar.error2={0}에서 Manifest를 찾을 수 없습니다.
+java.launcher.jar.error3={0}에 기본 Manifest 속성이 없습니다.
+java.launcher.jar.error4={0}에서 Java 에이전트를 로드하는 중 오류가 발생했습니다.
+java.launcher.init.error=초기화 오류
+java.launcher.javafx.error1=오류: JavaFX launchApplication 메소드에 잘못된 서명이 있습니다.\\n따라서 static으로 선언하고 void 유형의 값을 반환해야 합니다.
+java.launcher.module.error1={0} 모듈에 MainClass 속성이 없습니다. -m <module>/<main-class>를 사용하십시오.
+java.launcher.module.error2=오류: {1} 모듈의 기본 클래스 {0}을(를) 찾거나 로드할 수 없습니다.
+java.launcher.module.error3=오류: {1} 모듈의 기본 클래스 {0}을(를) 로드할 수 없습니다.\n\t{2}
+java.launcher.module.error4={0}을(를) 찾을 수 없습니다.
+java.launcher.module.error5=오류: {1} 모듈의 기본 클래스 {0}을(를) 초기화할 수 없습니다.\n원인: {1}: {2}
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_pt_BR.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_pt_BR.properties
index 0f49ecca715..15f986d991e 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_pt_BR.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_pt_BR.properties
@@ -24,37 +24,37 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Uso: {0} [options] <mainclass> [args...]\n           (para executar uma classe)\n   ou  {0} [options] -jar <jarfile> [args...]\n           (para executar um arquivo jar)\n   ou  {0} [options] -m <module>[/<mainclass>] [args...]\n       {0} [options] --module <module>[/<mainclass>] [args...]\n           (para executar a classe principal em um m\u00F3dulo)\n\n Os argumentos ap\u00F3s a classe principal, -jar <jarfile>, -m ou --module\n <module>/<mainclass> s\u00E3o especificados como os argumentos para a classe principal.\n\n em que as op\u00E7\u00F5es incluem:\n\n
+java.launcher.opt.header  =   Uso: {0} [options] <mainclass> [args...]\n           (para executar uma classe)\n   ou  {0} [options] -jar <jarfile> [args...]\n           (para executar um arquivo jar)\n   ou  {0} [options] -m <module>[/<mainclass>] [args...]\n       {0} [options] --module <module>[/<mainclass>] [args...]\n           (para executar a classe principal em um módulo)\n\n Os argumentos após a classe principal, -jar <jarfile>, -m ou --module\n <module>/<mainclass> são especificados como os argumentos para a classe principal.\n\n em que as opções incluem:\n\n
 
 java.launcher.opt.vmselect   =\    {0}\t  para selecionar a VM "{1}"\n
-java.launcher.opt.hotspot    =\    {0}\t  \u00E9 um sin\u00F4nimo da VM "{1}" [obsoleto]\n
+java.launcher.opt.hotspot    =\    {0}\t  é um sinônimo da VM "{1}" [obsoleto]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <caminho de pesquisa de classe de diret\u00F3rios e arquivos zip/jar>\n    -classpath <caminho de pesquisa de classe de diret\u00F3rios e arquivos zip/jar>\n    --class-path <caminho de pesquisa de classe de diret\u00F3rios e arquivos zip/jar>\n                  Uma lista separada por {0} de diret\u00F3rios, arquivos compactados JAR\n                  e arquivos compactados ZIP para procurar arquivos de classe.\n    -p <caminho do m\u00F3dulo>\n    --module-path <caminho do m\u00F3dulo>...\n                  Uma lista separada por {0} de diret\u00F3rios, cada um\n                  sendo um diret\u00F3rio de m\u00F3dulos.\n    --upgrade-module-path <caminho do m\u00F3dulo>...\n                  Uma lista separada por {0} de diret\u00F3rios, cada um\n                  sendo um diret\u00F3rio de m\u00F3dulos que substituem m\u00F3dulos\n                  pass\u00EDveis de upgrade na imagem de runtime\n    --add-modules <nome do m\u00F3dulo>[,<nome do m\u00F3dulo>...]\n                  m\u00F3dulos-raiz a serem resolvidos al\u00E9m do m\u00F3dulo inicial.\n                  <nome do m\u00F3dulo> tamb\u00E9m pode ser ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  lista os m\u00F3dulos observ\u00E1veis e sai\n    -d <nome do m\u00F3dulo>\n    --describe-module <nome do m\u00F3dulo>\n                  descreve um m\u00F3dulo e sai\n    --dry-run     cria VM e carrega classe principal, mas n\u00E3o executa o m\u00E9todo principal.\n                  A op\u00E7\u00E3o --dry-run pode ser \u00FAtil para validar as\n                  op\u00E7\u00F5es de linha de comando como a configura\u00E7\u00E3o do sistema do m\u00F3dulo.\n    --validate-modules\n                  valida todos os m\u00F3dulos e sai\n                  A op\u00E7\u00E3o --validate-modules pode ser \u00FAtil para localizar\n                  conflitos e outros erros com m\u00F3dulos no caminho do m\u00F3dulo.\n    -D<name>=<value>\n                  define uma propriedade de sistema\n    -verbose:[class|module|gc|jni]\n                  ativar sa\u00EDda verbosa\n    -version      imprime a vers\u00E3o do produto no fluxo de erros e sai\n    -version      imprime a vers\u00E3o do produto no fluxo de sa\u00EDda e sai\n    -showversion  imprime a vers\u00E3o do produto no fluxo de erros e continua\n    --show-version\n                  imprime a vers\u00E3o do produto no fluxo de sa\u00EDda e continua\n    --show-module-resolution\n                  mostra a sa\u00EDda da resolu\u00E7\u00E3o do m\u00F3dulo durante a inicializa\u00E7\u00E3o\n    -? -h -help\n                  imprime esta mensagem de ajuda no fluxo de erros\n    --help        imprime esta mensagem de ajuda no fluxo de sa\u00EDda\n    -X            imprime ajuda sobre op\u00E7\u00F5es extras no fluxo de erros\n    --help-extra  imprime ajuda sobre op\u00E7\u00F5es extras no fluxo de sa\u00EDda\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  ativa asser\u00E7\u00F5es com granularidade especificada\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  desativa asser\u00E7\u00F5es com granularidade especificada\n    -esa | -enablesystemassertions\n                  ativa asser\u00E7\u00F5es de sistema\n    -dsa | -disablesystemassertions\n                  desativa asser\u00E7\u00F5es de sistema\n    -agentlib:<libname>[=<options>]\n                  carrega biblioteca de agente nativo <libname>, por exemplo, -agentlib:jdwp\n                  consulte tamb\u00E9m -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  carrega biblioteca de agente nativo por nome do caminho completo\n    -javaagent:<jarpath>[=<options>]\n                  carrega agente de linguagem de programa\u00E7\u00E3o Java, consulte java.lang.instrument\n    -splash:<imagepath>\n                  mostra \
-a tela inicial com a imagem especificada\n                  Imagens HiDPI dimensionadas s\u00E3o suportadas automaticamente e utilizadas,\n                  se dispon\u00EDveis. O nome do arquivo de imagem n\u00E3o dimensionada, por exemplo, image.ext,\n                  deve ser informado sempre como argumento para a op\u00E7\u00E3o -splash.\n                  A imagem dimensionada mais apropriada fornecida ser\u00E1 selecionada\n                  automaticamente.\n                  Consulte a documenta\u00E7\u00E3o da API de Tela Inicial para obter mais informa\u00E7\u00F5es\n    @arquivos de argumento\n                  Um ou mais arquivos de argumentos que cont\u00EAm op\u00E7\u00F5es\n    --disable-@files\n                  impede expans\u00E3o adicional de arquivo de argumentos\nnPara especificar um argumento para uma op\u00E7\u00E3o longa, voc\u00EA pode usar --<name>=<value> ou\n--<name> <value>.\n
+java.launcher.opt.footer = \    -cp <caminho de pesquisa de classe de diretórios e arquivos zip/jar>\n    -classpath <caminho de pesquisa de classe de diretórios e arquivos zip/jar>\n    --class-path <caminho de pesquisa de classe de diretórios e arquivos zip/jar>\n                  Uma lista separada por {0} de diretórios, arquivos compactados JAR\n                  e arquivos compactados ZIP para procurar arquivos de classe.\n    -p <caminho do módulo>\n    --module-path <caminho do módulo>...\n                  Uma lista separada por {0} de diretórios, cada um\n                  sendo um diretório de módulos.\n    --upgrade-module-path <caminho do módulo>...\n                  Uma lista separada por {0} de diretórios, cada um\n                  sendo um diretório de módulos que substituem módulos\n                  passíveis de upgrade na imagem de runtime\n    --add-modules <nome do módulo>[,<nome do módulo>...]\n                  módulos-raiz a serem resolvidos além do módulo inicial.\n                  <nome do módulo> também pode ser ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  lista os módulos observáveis e sai\n    -d <nome do módulo>\n    --describe-module <nome do módulo>\n                  descreve um módulo e sai\n    --dry-run     cria VM e carrega classe principal, mas não executa o método principal.\n                  A opção --dry-run pode ser útil para validar as\n                  opções de linha de comando como a configuração do sistema do módulo.\n    --validate-modules\n                  valida todos os módulos e sai\n                  A opção --validate-modules pode ser útil para localizar\n                  conflitos e outros erros com módulos no caminho do módulo.\n    -D<name>=<value>\n                  define uma propriedade de sistema\n    -verbose:[class|module|gc|jni]\n                  ativar saída verbosa\n    -version      imprime a versão do produto no fluxo de erros e sai\n    -version      imprime a versão do produto no fluxo de saída e sai\n    -showversion  imprime a versão do produto no fluxo de erros e continua\n    --show-version\n                  imprime a versão do produto no fluxo de saída e continua\n    --show-module-resolution\n                  mostra a saída da resolução do módulo durante a inicialização\n    -? -h -help\n                  imprime esta mensagem de ajuda no fluxo de erros\n    --help        imprime esta mensagem de ajuda no fluxo de saída\n    -X            imprime ajuda sobre opções extras no fluxo de erros\n    --help-extra  imprime ajuda sobre opções extras no fluxo de saída\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  ativa asserções com granularidade especificada\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  desativa asserções com granularidade especificada\n    -esa | -enablesystemassertions\n                  ativa asserções de sistema\n    -dsa | -disablesystemassertions\n                  desativa asserções de sistema\n    -agentlib:<libname>[=<options>]\n                  carrega biblioteca de agente nativo <libname>, por exemplo, -agentlib:jdwp\n                  consulte também -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  carrega biblioteca de agente nativo por nome do caminho completo\n    -javaagent:<jarpath>[=<options>]\n                  carrega agente de linguagem de programação Java, consulte java.lang.instrument\n    -splash:<imagepath>\n                  mostra \
+a tela inicial com a imagem especificada\n                  Imagens HiDPI dimensionadas são suportadas automaticamente e utilizadas,\n                  se disponíveis. O nome do arquivo de imagem não dimensionada, por exemplo, image.ext,\n                  deve ser informado sempre como argumento para a opção -splash.\n                  A imagem dimensionada mais apropriada fornecida será selecionada\n                  automaticamente.\n                  Consulte a documentação da API de Tela Inicial para obter mais informações\n    @arquivos de argumento\n                  Um ou mais arquivos de argumentos que contêm opções\n    --disable-@files\n                  impede expansão adicional de arquivo de argumentos\nnPara especificar um argumento para uma opção longa, você pode usar --<name>=<value> ou\n--<name> <value>.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           desativa a compila\u00E7\u00E3o em segundo plano\n    -Xbootclasspath/a:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n                      anexa ao final do caminho de classe de bootstrap\n    -Xcheck:jni       executa verifica\u00E7\u00F5es adicionais de fun\u00E7\u00F5es JNI\n    -Xcomp            for\u00E7a a compila\u00E7\u00E3o de m\u00E9todos na primeira chamada\n    -Xdebug           fornecido para compatibilidade reversa\n    -Xdiag            mostra mensagens adicionais de diagn\u00F3stico\n        -Xfuture          ativa verifica\u00E7\u00F5es de n\u00EDvel m\u00E1ximo, antecipando padr\u00E3o futuro\n    -Xint             somente execu\u00E7\u00E3o de modo interpretado\n    -Xinternalversion\n                      exibe informa\u00E7\u00F5es mais detalhadas da vers\u00E3o da JVM do que a\n                      op\u00E7\u00E3o -version\n    -Xloggc:<file>    registra o status do GC em um arquivo com timestamps\n    -Xmixed           execu\u00E7\u00E3o em modo misto (padr\u00E3o)\n    -Xmn<size>        define o tamanho inicial e m\u00E1ximo (em bytes) do heap\n                      para a gera\u00E7\u00E3o jovem (infantil)\n    -Xms<size>        define o tamanho inicial do heap Java\n    -Xmx<size>        define o tamanho m\u00E1ximo do heap Java\n    -Xnoclassgc       desativa a coleta de lixo de classe\n    -Xrs              reduz o uso de sinais do SO por Java/VM (consulte a documenta\u00E7\u00E3o)\n    -Xshare:auto      usa dados de classe compartilhados se poss\u00EDvel (padr\u00E3o)\n    -Xshare:off       n\u00E3o tenta usar dados de classe compartilhados\n    -Xshare:on        exige o uso de dados de classe compartilhados; caso contr\u00E1rio, falhar\u00E1.\n    -XshowSettings    mostra todas as defini\u00E7\u00F5es e continua\n    -XshowSettings:all\n                      mostra todas as defini\u00E7\u00F5es e continua\n    -XshowSettings:locale\n                      mostra todas as defini\u00E7\u00F5es relacionadas \u00E0 configura\u00E7\u00E3o regional e continua\n    -XshowSettings:properties\n                      mostra todas as defini\u00E7\u00F5es de propriedade e continua\n    -XshowSettings:vm mostra todas as defini\u00E7\u00F5es relacionadas a vm e continua\n    -Xss<size>        define o tamanho da pilha de thread java\n    -Xverify          define o modo do verificador de c\u00F3digo de byte\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      atualiza <module> para ler <target-module>, independentemente\n                      da declara\u00E7\u00E3o de m\u00F3dulo. \n                      <target-module> pode ser ALL-UNNAMED para ler todos os m\u00F3dulos\n                      sem nome.\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      atualiza <module> para exportar <package> para <target-module>,\n                      independentemente da declara\u00E7\u00E3o de m\u00F3dulo.\n                      <target-module> pode ser ALL-UNNAMED para exportar para todos os\n                      m\u00F3dulos sem nome.\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      atualiza <module> para abrir <package> para\n                      <target-module>, independentemente da declara\u00E7\u00E3o de m\u00F3dulo.\n    --illegal-access=<value>\n                      permite ou nega acesso aos membros dos tipos nos m\u00F3dulos com nome\n                     por c\u00F3digo nos m\u00F3dulos sem nomes.\n                      <value> \u00E9 um entre "deny", "permit", "warn" ou "debug"\n                       Esta op\u00E7\u00E3o ser\u00E1 removida em uma futura release.\n    --limit-modules <module name>[,<module name>...]\n                      limita o universo de m\u00F3dulos observ\u00E1veis\n--patch-module <module>=<file>({0}<file>)*\n                      substitui ou amplia um m\u00F3dulo com classes e recursos\n                      \
-em arquivos ou diret\u00F3rios JAR.\n   --disable-@files  desativa uma maior expans\u00E3o do arquivo de argumento\n\nEssas op\u00E7\u00F5es extras est\u00E3o sujeitas a altera\u00E7\u00E3o sem aviso.\n
+java.launcher.X.usage=\n    -Xbatch           desativa a compilação em segundo plano\n    -Xbootclasspath/a:<diretórios e arquivos zip/jar separados por {0}>\n                      anexa ao final do caminho de classe de bootstrap\n    -Xcheck:jni       executa verificações adicionais de funções JNI\n    -Xcomp            força a compilação de métodos na primeira chamada\n    -Xdebug           fornecido para compatibilidade reversa\n    -Xdiag            mostra mensagens adicionais de diagnóstico\n        -Xfuture          ativa verificações de nível máximo, antecipando padrão futuro\n    -Xint             somente execução de modo interpretado\n    -Xinternalversion\n                      exibe informações mais detalhadas da versão da JVM do que a\n                      opção -version\n    -Xloggc:<file>    registra o status do GC em um arquivo com timestamps\n    -Xmixed           execução em modo misto (padrão)\n    -Xmn<size>        define o tamanho inicial e máximo (em bytes) do heap\n                      para a geração jovem (infantil)\n    -Xms<size>        define o tamanho inicial do heap Java\n    -Xmx<size>        define o tamanho máximo do heap Java\n    -Xnoclassgc       desativa a coleta de lixo de classe\n    -Xrs              reduz o uso de sinais do SO por Java/VM (consulte a documentação)\n    -Xshare:auto      usa dados de classe compartilhados se possível (padrão)\n    -Xshare:off       não tenta usar dados de classe compartilhados\n    -Xshare:on        exige o uso de dados de classe compartilhados; caso contrário, falhará.\n    -XshowSettings    mostra todas as definições e continua\n    -XshowSettings:all\n                      mostra todas as definições e continua\n    -XshowSettings:locale\n                      mostra todas as definições relacionadas à configuração regional e continua\n    -XshowSettings:properties\n                      mostra todas as definições de propriedade e continua\n    -XshowSettings:vm mostra todas as definições relacionadas a vm e continua\n    -Xss<size>        define o tamanho da pilha de thread java\n    -Xverify          define o modo do verificador de código de byte\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      atualiza <module> para ler <target-module>, independentemente\n                      da declaração de módulo. \n                      <target-module> pode ser ALL-UNNAMED para ler todos os módulos\n                      sem nome.\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      atualiza <module> para exportar <package> para <target-module>,\n                      independentemente da declaração de módulo.\n                      <target-module> pode ser ALL-UNNAMED para exportar para todos os\n                      módulos sem nome.\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      atualiza <module> para abrir <package> para\n                      <target-module>, independentemente da declaração de módulo.\n    --illegal-access=<value>\n                      permite ou nega acesso aos membros dos tipos nos módulos com nome\n                     por código nos módulos sem nomes.\n                      <value> é um entre "deny", "permit", "warn" ou "debug"\n                       Esta opção será removida em uma futura release.\n    --limit-modules <module name>[,<module name>...]\n                      limita o universo de módulos observáveis\n--patch-module <module>=<file>({0}<file>)*\n                      substitui ou amplia um módulo com classes e recursos\n                      \
+em arquivos ou diretórios JAR.\n   --disable-@files  desativa uma maior expansão do arquivo de argumento\n\nEssas opções extras estão sujeitas a alteração sem aviso.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\nAs op\u00E7\u00F5es a seguir s\u00E3o espec\u00EDficas para o Mac OS X:\n    -XstartOnFirstThread\n                      executa o m\u00E9todo main() no primeiro thread (AppKit)\n    -Xdock:name=<nome do aplicativo>\n                      substitui o nome do aplicativo padr\u00E3o exibido no encaixe\n    -Xdock:icon=<caminho para o arquivo do \u00EDcone>\n                      substitui o \u00EDcone exibido no encaixe\n\n
+java.launcher.X.macosx.usage=\nAs opções a seguir são específicas para o Mac OS X:\n    -XstartOnFirstThread\n                      executa o método main() no primeiro thread (AppKit)\n    -Xdock:name=<nome do aplicativo>\n                      substitui o nome do aplicativo padrão exibido no encaixe\n    -Xdock:icon=<caminho para o arquivo do ícone>\n                      substitui o ícone exibido no encaixe\n\n
 
-java.launcher.cls.error1=Erro: N\u00E3o foi poss\u00EDvel localizar nem carregar a classe principal {0}\nCausada por: {1}: {2}
-java.launcher.cls.error2=Erro: o m\u00E9todo main n\u00E3o \u00E9 {0} na classe {1}; defina o m\u00E9todo main como:\n   public static void main(String[] args)
-java.launcher.cls.error3=Erro: o m\u00E9todo main deve retornar um valor do tipo void na classe {0}; \ndefina o m\u00E9todo main como:\n   public static void main(String[] args)
-java.launcher.cls.error4=Erro: o m\u00E9todo main n\u00E3o foi encontrado na classe {0}; defina o m\u00E9todo main como:\n   public static void main(String[] args)\nou uma classe de aplicativo JavaFX deve expandir {1}
-java.launcher.cls.error5=Erro: os componentes de runtime do JavaFX n\u00E3o foram encontrados. Eles s\u00E3o obrigat\u00F3rios para executar este aplicativo
+java.launcher.cls.error1=Erro: Não foi possível localizar nem carregar a classe principal {0}\nCausada por: {1}: {2}
+java.launcher.cls.error2=Erro: o método main não é {0} na classe {1}; defina o método main como:\n   public static void main(String[] args)
+java.launcher.cls.error3=Erro: o método main deve retornar um valor do tipo void na classe {0}; \ndefina o método main como:\n   public static void main(String[] args)
+java.launcher.cls.error4=Erro: o método main não foi encontrado na classe {0}; defina o método main como:\n   public static void main(String[] args)\nou uma classe de aplicativo JavaFX deve expandir {1}
+java.launcher.cls.error5=Erro: os componentes de runtime do JavaFX não foram encontrados. Eles são obrigatórios para executar este aplicativo
 java.launcher.cls.error6=Erro: ocorreu LinkageError ao carregar a classe principal {0}\n\t{1}
-java.launcher.cls.error7=Erro: N\u00E3o \u00E9 poss\u00EDvel inicializar a classe principal {0}\nCausado por: {1}: {2}
+java.launcher.cls.error7=Erro: Não é possível inicializar a classe principal {0}\nCausado por: {1}: {2}
 java.launcher.jar.error1=Erro: ocorreu um erro inesperado ao tentar abrir o arquivo {0}
-java.launcher.jar.error2=manifesto n\u00E3o encontrado em {0}
+java.launcher.jar.error2=manifesto não encontrado em {0}
 java.launcher.jar.error3=nenhum atributo de manifesto principal em {0}
 java.launcher.jar.error4=erro ao carregar o agente java em {0}
-java.launcher.init.error=erro de inicializa\u00E7\u00E3o
-java.launcher.javafx.error1=Erro: O m\u00E9todo launchApplication do JavaFX tem a assinatura errada. Ele\\ndeve ser declarado como est\u00E1tico e retornar um valor do tipo void
-java.launcher.module.error1=o m\u00F3dulo {0} n\u00E3o tem um atributo MainClass, use -m <module>/<main-class>
-java.launcher.module.error2=Erro: N\u00E3o foi poss\u00EDvel localizar nem carregar a classe principal {0} no m\u00F3dulo {1}
-java.launcher.module.error3=Erro: N\u00E3o \u00E9 poss\u00EDvel carregar a classe principal {0} no m\u00F3dulo {1}\n\t{2}
-java.launcher.module.error4={0} n\u00E3o encontrado.
-java.launcher.module.error5=Erro: N\u00E3o \u00E9 poss\u00EDvel inicializar a classe principal {0} no m\u00F3dulo {1}\nCausado por: {1}: {2}
+java.launcher.init.error=erro de inicialização
+java.launcher.javafx.error1=Erro: O método launchApplication do JavaFX tem a assinatura errada. Ele\\ndeve ser declarado como estático e retornar um valor do tipo void
+java.launcher.module.error1=o módulo {0} não tem um atributo MainClass, use -m <module>/<main-class>
+java.launcher.module.error2=Erro: Não foi possível localizar nem carregar a classe principal {0} no módulo {1}
+java.launcher.module.error3=Erro: Não é possível carregar a classe principal {0} no módulo {1}\n\t{2}
+java.launcher.module.error4={0} não encontrado.
+java.launcher.module.error5=Erro: Não é possível inicializar a classe principal {0} no módulo {1}\nCausado por: {1}: {2}
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_sv.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_sv.properties
index 9c1f76ded7d..2b770307d2a 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_sv.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_sv.properties
@@ -24,36 +24,36 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Syntax: {0} [options] <huvudklass>[args...]\n           (f\u00F6r att k\u00F6ra en klass)\n   eller  {0} [options] -jar <jar-fil> [args...]\n           (f\u00F6r att k\u00F6ra en jar-fil)\n   eller  {0} [options] -m <modul>[/<huvudklass>] [args...]\n       {0} [options] --module <modul>[/<huvudklass>] [args...]\n           (f\u00F6r att k\u00F6ra huvudklassen i en modul)\n\n Argument som kommer efter huvudklassen, -jar <jar-fil>, -m eller --module\n <modul>/<huvudklass> \u00F6verf\u00F6rs som argument till huvudklassen.\n\n med alternativen:\n\n
+java.launcher.opt.header  =   Syntax: {0} [options] <huvudklass>[args...]\n           (för att köra en klass)\n   eller  {0} [options] -jar <jar-fil> [args...]\n           (för att köra en jar-fil)\n   eller  {0} [options] -m <modul>[/<huvudklass>] [args...]\n       {0} [options] --module <modul>[/<huvudklass>] [args...]\n           (för att köra huvudklassen i en modul)\n\n Argument som kommer efter huvudklassen, -jar <jar-fil>, -m eller --module\n <modul>/<huvudklass> överförs som argument till huvudklassen.\n\n med alternativen:\n\n
 
-java.launcher.opt.vmselect   =\    {0}\t  f\u00F6r att v\u00E4lja "{1}" VM\n
-java.launcher.opt.hotspot    =\    {0}\t  \u00E4r en synonym f\u00F6r "{1}" VM  [inaktuell]\n
+java.launcher.opt.vmselect   =\    {0}\t  för att välja "{1}" VM\n
+java.launcher.opt.hotspot    =\    {0}\t  är en synonym för "{1}" VM  [inaktuell]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <klass\u00F6kv\u00E4g till kataloger och zip-/jar-filer>\n    -classpath <klass\u00F6kv\u00E4g till kataloger och zip-/jar-filer>\n    --class-path <klass\u00F6kv\u00E4g till kataloger och zip-/jar-filer>\n                  En {0}-avgr\u00E4nsad lista \u00F6ver kataloger, JAR-arkiv\n                  och ZIP-arkiv att s\u00F6ka efter klassfiler i.\n    -p <moduls\u00F6kv\u00E4g>\n    --module-path <moduls\u00F6kv\u00E4g>...\n                  En {0}-avgr\u00E4nsad lista \u00F6ver kataloger, d\u00E4r varje katalog\n                  \u00E4r en katalog \u00F6ver moduler.\n    --upgrade-module-path <moduls\u00F6kv\u00E4g>...\n                  En {0}-avgr\u00E4nsad lista \u00F6ver kataloger, d\u00E4r varje katalog\n                  \u00E4r en katalog \u00F6ver moduler som ers\u00E4tter uppgraderingsbara\n                  moduler i exekveringsavbilden\n    --add-modules <modulnamn>[,<modulnamn>...]\n                  rotmoduler att l\u00F6sa f\u00F6rutom den ursprungliga modulen.\n                  <modulnamn> kan \u00E4ven vara ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  visa observerbara moduler och avsluta\n    -d <modulnamn>\n    --describe-module <modulnamn>\n                  beskriv en modul och avsluta\n    --dry-run     skapa VM och ladda huvudklassen men k\u00F6r inte huvudmetoden.\n                  Alternativet --dry-run kan vara anv\u00E4ndbart f\u00F6r att validera\n                  kommandoradsalternativ, som modulsystemkonfigurationen.\n    --validate-modules\n                  validera alla moduler och avsluta\n                  Alternativet --validate-modules kan vara anv\u00E4ndbart f\u00F6r att hitta\n                  konflikter och andra fel i modulerna p\u00E5 moduls\u00F6kv\u00E4gen.\n    -D<namn>=<v\u00E4rde>\n                  ange en systemegenskap\n    -verbose:[class|module|gc|jni]\n                  aktivera utf\u00F6rliga utdata\n    -version      skriv ut produktversion till felstr\u00F6mmen och avsluta\n    --version     skriv ut produktversion till utdatastr\u00F6mmen och avsluta\n    -showversion  skriv ut produktversion till felstr\u00F6mmen och forts\u00E4tt\n    --show-version\n                  skriv ut produktversion till utdatastr\u00F6mmen och forts\u00E4tt\n    --show-module-resolution\n                  visa modull\u00F6sningsutdata vid start\n    -? -h -help\n                  skriv ut det h\u00E4r hj\u00E4lpmeddelandet till felstr\u00F6mmen\n    --help        skriv ut det h\u00E4r hj\u00E4lpmeddelandet till utdatastr\u00F6mmen\n    -X            skriv ut hj\u00E4lp f\u00F6r extraalternativ till felstr\u00F6mmen\n    --help-extra  skriv ut hj\u00E4lp f\u00F6r extraalternativ till utdatastr\u00F6mmen\n    -ea[:<paketnamn>...|:<klassnamn>]\n    -enableassertions[:<paketnamn>...|:<klassnamn>]\n                  aktivera verifieringar med den angivna detaljgraden\n    -da[:<paketnamn>...|:<klassnamn>]\n    -disableassertions[:<paketnamn>...|:<klassnamn>]\n                  avaktivera verifieringar med den angivna detaljgraden\n    -esa | -enablesystemassertions\n                  aktivera systemverifieringar\n    -dsa | -disablesystemassertions\n                  avaktivera systemverifieringar\n    -agentlib:<biblioteksnamn>[=<alternativ>]\n                  ladda det ursprungliga agentbiblioteket <biblioteksnamn>, t.ex. -agentlib:jdwp\n                  se \u00E4ven -agentlib:jdwp=help\n    -agentpath:<s\u00F6kv\u00E4gsnamn>[=<alternativ>]\n                  ladda det ursprungliga agentbiblioteket med fullst\u00E4ndigt s\u00F6kv\u00E4gsnamn\n    -javaagent:<jar-s\u00F6kv\u00E4g>[=<alternativ>]\n                  ladda Java-programmeringsspr\u00E5ksagenten, se java.lang.instrument\n    -splash:<bilds\u00F6kv\u00E4g>\n                  visa v\u00E4lkomstsk\u00E4rmen med den angivna bilden\n                  HiDPI-skal\u00E4ndrade bilder st\u00F6ds automatiskt och anv\u00E4nds om de \u00E4r\n        \
-          tillg\u00E4ngliga. Filnamnet p\u00E5 den oskal\u00E4ndrade bilden, t.ex. image.ext,\n                  ska alltid \u00F6verf\u00F6ras som argument till alternativet -splash.\n                  Den l\u00E4mpligaste skal\u00E4ndrade bilden v\u00E4ljs\n                  automatiskt.\n                  Mer information finns i dokumentationen f\u00F6r API:t SplashScreen\n    @argument filer\n                  en eller flera argumentfiler som inneh\u00E5ller alternativ\n    --disable-@files\n                  f\u00F6rhindra ytterligare ut\u00F6kning av argumentfiler\nOm du vill ange ett argument f\u00F6r ett l\u00E5ngt alternativ kan du anv\u00E4nda --<namn>=<v\u00E4rde> eller\n--<namn> <v\u00E4rde>.\n
+java.launcher.opt.footer = \    -cp <klassökväg till kataloger och zip-/jar-filer>\n    -classpath <klassökväg till kataloger och zip-/jar-filer>\n    --class-path <klassökväg till kataloger och zip-/jar-filer>\n                  En {0}-avgränsad lista över kataloger, JAR-arkiv\n                  och ZIP-arkiv att söka efter klassfiler i.\n    -p <modulsökväg>\n    --module-path <modulsökväg>...\n                  En {0}-avgränsad lista över kataloger, där varje katalog\n                  är en katalog över moduler.\n    --upgrade-module-path <modulsökväg>...\n                  En {0}-avgränsad lista över kataloger, där varje katalog\n                  är en katalog över moduler som ersätter uppgraderingsbara\n                  moduler i exekveringsavbilden\n    --add-modules <modulnamn>[,<modulnamn>...]\n                  rotmoduler att lösa förutom den ursprungliga modulen.\n                  <modulnamn> kan även vara ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  visa observerbara moduler och avsluta\n    -d <modulnamn>\n    --describe-module <modulnamn>\n                  beskriv en modul och avsluta\n    --dry-run     skapa VM och ladda huvudklassen men kör inte huvudmetoden.\n                  Alternativet --dry-run kan vara användbart för att validera\n                  kommandoradsalternativ, som modulsystemkonfigurationen.\n    --validate-modules\n                  validera alla moduler och avsluta\n                  Alternativet --validate-modules kan vara användbart för att hitta\n                  konflikter och andra fel i modulerna på modulsökvägen.\n    -D<namn>=<värde>\n                  ange en systemegenskap\n    -verbose:[class|module|gc|jni]\n                  aktivera utförliga utdata\n    -version      skriv ut produktversion till felströmmen och avsluta\n    --version     skriv ut produktversion till utdataströmmen och avsluta\n    -showversion  skriv ut produktversion till felströmmen och fortsätt\n    --show-version\n                  skriv ut produktversion till utdataströmmen och fortsätt\n    --show-module-resolution\n                  visa modullösningsutdata vid start\n    -? -h -help\n                  skriv ut det här hjälpmeddelandet till felströmmen\n    --help        skriv ut det här hjälpmeddelandet till utdataströmmen\n    -X            skriv ut hjälp för extraalternativ till felströmmen\n    --help-extra  skriv ut hjälp för extraalternativ till utdataströmmen\n    -ea[:<paketnamn>...|:<klassnamn>]\n    -enableassertions[:<paketnamn>...|:<klassnamn>]\n                  aktivera verifieringar med den angivna detaljgraden\n    -da[:<paketnamn>...|:<klassnamn>]\n    -disableassertions[:<paketnamn>...|:<klassnamn>]\n                  avaktivera verifieringar med den angivna detaljgraden\n    -esa | -enablesystemassertions\n                  aktivera systemverifieringar\n    -dsa | -disablesystemassertions\n                  avaktivera systemverifieringar\n    -agentlib:<biblioteksnamn>[=<alternativ>]\n                  ladda det ursprungliga agentbiblioteket <biblioteksnamn>, t.ex. -agentlib:jdwp\n                  se även -agentlib:jdwp=help\n    -agentpath:<sökvägsnamn>[=<alternativ>]\n                  ladda det ursprungliga agentbiblioteket med fullständigt sökvägsnamn\n    -javaagent:<jar-sökväg>[=<alternativ>]\n                  ladda Java-programmeringsspråksagenten, se java.lang.instrument\n    -splash:<bildsökväg>\n                  visa välkomstskärmen med den angivna bilden\n                  HiDPI-skaländrade bilder stöds automatiskt och används om de är\n        \
+          tillgängliga. Filnamnet på den oskaländrade bilden, t.ex. image.ext,\n                  ska alltid överföras som argument till alternativet -splash.\n                  Den lämpligaste skaländrade bilden väljs\n                  automatiskt.\n                  Mer information finns i dokumentationen för API:t SplashScreen\n    @argument filer\n                  en eller flera argumentfiler som innehåller alternativ\n    --disable-@files\n                  förhindra ytterligare utökning av argumentfiler\nOm du vill ange ett argument för ett långt alternativ kan du använda --<namn>=<värde> eller\n--<namn> <värde>.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           avaktivera bakgrundskompilering\n    -Xbootclasspath/a:<kataloger och zip-/jar-filer avgr\u00E4nsade med {0}>\n                      l\u00E4gg till sist i klass\u00F6kv\u00E4gen f\u00F6r programladdning\n    -Xcheck:jni       utf\u00F6r fler kontroller f\u00F6r JNI-funktioner\n    -Xcomp            tvingar kompilering av metoder vid det f\u00F6rsta anropet\n    -Xdebug           tillhandah\u00E5lls f\u00F6r bak\u00E5tkompatibilitet\n    -Xdiag            visa fler diagnostiska meddelanden\n    -Xfuture          aktivera str\u00E4ngaste kontroller, f\u00F6rv\u00E4ntad framtida standard\n    -Xint             endast exekvering i tolkat l\u00E4ge\n    -Xinternalversion\n                      visar mer detaljerad information om JVM-version \u00E4n\n                      med alternativet -version\n    -Xloggc:<fil>     logga GC-status till en fil med tidsst\u00E4mplar\n    -Xmixed           exekvering i blandat l\u00E4ge (standard)\n    -Xmn<storlek>     anger ursprunglig och st\u00F6rsta storlek (i byte) f\u00F6r h\u00F6gen f\u00F6r\n                      generationen med nyare objekt (h\u00F6gen f\u00F6r tilldelning av nya objekt)\n    -Xms<storlek>     ange ursprunglig storlek f\u00F6r Java-heap-utrymmet\n    -Xmx<storlek>     ange st\u00F6rsta storlek f\u00F6r Java-heap-utrymmet\n    -Xnoclassgc       avaktivera klasskr\u00E4pinsamling\n    -Xrs              minska operativsystemssignalanv\u00E4ndning f\u00F6r Java/VM (se dokumentationen)\n    -Xshare:auto      anv\u00E4nd delade klassdata om m\u00F6jligt (standard)\n    -Xshare:off       f\u00F6rs\u00F6k inte anv\u00E4nda delade klassdata\n    -Xshare:on        kr\u00E4v anv\u00E4ndning av delade klassdata, utf\u00F6r inte i annat fall.\n    -XshowSettings    visa alla inst\u00E4llningar och forts\u00E4tt\n    -XshowSettings:all\n                      visa alla inst\u00E4llningar och forts\u00E4tt\n    -XshowSettings:locale\n                      visa alla spr\u00E5kkonventionsrelaterade inst\u00E4llningar och forts\u00E4tt\n    -XshowSettings:properties\n                      visa alla egenskapsinst\u00E4llningar och forts\u00E4tt\n    -XshowSettings:vm visa alla vm-relaterade inst\u00E4llningar och forts\u00E4tt\n    -Xss<storlek>     ange storlek f\u00F6r java-tr\u00E5dsstacken\n    -Xverify          anger l\u00E4ge f\u00F6r bytekodverifieraren\n    --add-reads <modul>=<m\u00E5lmodul>(,<m\u00E5lmodul>)*\n                      uppdaterar <modul> f\u00F6r att l\u00E4sa <m\u00E5lmodul>, oavsett\n                      moduldeklarationen. \n                      <m\u00E5lmodul> kan vara ALL-UNNAMED f\u00F6r att l\u00E4sa alla\n                      ej namngivna moduler.\n    --add-exports <modul>/<paket>=<m\u00E5lmodul>(,<m\u00E5lmodul>)*\n                      uppdaterar <modul> f\u00F6r att exportera <paket> till <m\u00E5lmodul>,\n                      oavsett moduldeklarationen.\n                      <m\u00E5lmodul> kan vara ALL-UNNAMED f\u00F6r att exportera till alla\n                      ej namngivna moduler.\n    --add-opens <modul>/<paket>=<m\u00E5lmodul>(,<m\u00E5lmodul>)*\n                      uppdaterar <modul> f\u00F6r att \u00F6ppna <paket> till\n                      <m\u00E5lmodul>, oavsett moduldeklarationen.\n    --illegal-access=<v\u00E4rde>\n                      till\u00E5t eller neka \u00E5tkomst till medlemmar av typer i namngivna\n                      moduler av kod i ej namngivna moduler.\n                      <v\u00E4rde> \u00E4r "deny", "permit", "warn" eller "debug"\n                      Det h\u00E4r alternativet tas bort i en kommande utg\u00E5va.\n    --limit-modules <modulnamn>[,<modulnamn>...]\n                      begr\u00E4nsar universumet med observerbara moduler\n    --patch-module <modul>=<fil>({0}<fil>)*\n                      \u00E5sidos\u00E4tt eller ut\u00F6ka en modul med klasser och resurser\n                      i JAR-filer eller kataloger.\n    --disable-@files  avaktivera \
-ytterligare argumentfilsut\u00F6kning\n\nDe h\u00E4r extraalternativen kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande.\n
+java.launcher.X.usage=\n    -Xbatch           avaktivera bakgrundskompilering\n    -Xbootclasspath/a:<kataloger och zip-/jar-filer avgränsade med {0}>\n                      lägg till sist i klassökvägen för programladdning\n    -Xcheck:jni       utför fler kontroller för JNI-funktioner\n    -Xcomp            tvingar kompilering av metoder vid det första anropet\n    -Xdebug           tillhandahålls för bakåtkompatibilitet\n    -Xdiag            visa fler diagnostiska meddelanden\n    -Xfuture          aktivera strängaste kontroller, förväntad framtida standard\n    -Xint             endast exekvering i tolkat läge\n    -Xinternalversion\n                      visar mer detaljerad information om JVM-version än\n                      med alternativet -version\n    -Xloggc:<fil>     logga GC-status till en fil med tidsstämplar\n    -Xmixed           exekvering i blandat läge (standard)\n    -Xmn<storlek>     anger ursprunglig och största storlek (i byte) för högen för\n                      generationen med nyare objekt (högen för tilldelning av nya objekt)\n    -Xms<storlek>     ange ursprunglig storlek för Java-heap-utrymmet\n    -Xmx<storlek>     ange största storlek för Java-heap-utrymmet\n    -Xnoclassgc       avaktivera klasskräpinsamling\n    -Xrs              minska operativsystemssignalanvändning för Java/VM (se dokumentationen)\n    -Xshare:auto      använd delade klassdata om möjligt (standard)\n    -Xshare:off       försök inte använda delade klassdata\n    -Xshare:on        kräv användning av delade klassdata, utför inte i annat fall.\n    -XshowSettings    visa alla inställningar och fortsätt\n    -XshowSettings:all\n                      visa alla inställningar och fortsätt\n    -XshowSettings:locale\n                      visa alla språkkonventionsrelaterade inställningar och fortsätt\n    -XshowSettings:properties\n                      visa alla egenskapsinställningar och fortsätt\n    -XshowSettings:vm visa alla vm-relaterade inställningar och fortsätt\n    -Xss<storlek>     ange storlek för java-trådsstacken\n    -Xverify          anger läge för bytekodverifieraren\n    --add-reads <modul>=<målmodul>(,<målmodul>)*\n                      uppdaterar <modul> för att läsa <målmodul>, oavsett\n                      moduldeklarationen. \n                      <målmodul> kan vara ALL-UNNAMED för att läsa alla\n                      ej namngivna moduler.\n    --add-exports <modul>/<paket>=<målmodul>(,<målmodul>)*\n                      uppdaterar <modul> för att exportera <paket> till <målmodul>,\n                      oavsett moduldeklarationen.\n                      <målmodul> kan vara ALL-UNNAMED för att exportera till alla\n                      ej namngivna moduler.\n    --add-opens <modul>/<paket>=<målmodul>(,<målmodul>)*\n                      uppdaterar <modul> för att öppna <paket> till\n                      <målmodul>, oavsett moduldeklarationen.\n    --illegal-access=<värde>\n                      tillåt eller neka åtkomst till medlemmar av typer i namngivna\n                      moduler av kod i ej namngivna moduler.\n                      <värde> är "deny", "permit", "warn" eller "debug"\n                      Det här alternativet tas bort i en kommande utgåva.\n    --limit-modules <modulnamn>[,<modulnamn>...]\n                      begränsar universumet med observerbara moduler\n    --patch-module <modul>=<fil>({0}<fil>)*\n                      åsidosätt eller utöka en modul med klasser och resurser\n                      i JAR-filer eller kataloger.\n    --disable-@files  avaktivera \
+ytterligare argumentfilsutökning\n\nDe här extraalternativen kan ändras utan föregående meddelande.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\nF\u00F6ljande alternativ \u00E4r Mac OS X-specifika:\n    -XstartOnFirstThread\n                      k\u00F6r main()-metoden p\u00E5 den f\u00F6rsta (AppKit)-tr\u00E5den\n    -Xdock:name=<applikationsnamn>\n                      \u00E5sidos\u00E4tt det standardapplikationsnamn som visas i dockan\n    -Xdock:icon=<s\u00F6kv\u00E4g till ikonfil>\n                      \u00E5sidos\u00E4tt den standardikon som visas i dockan\n\n
+java.launcher.X.macosx.usage=\nFöljande alternativ är Mac OS X-specifika:\n    -XstartOnFirstThread\n                      kör main()-metoden på den första (AppKit)-tråden\n    -Xdock:name=<applikationsnamn>\n                      åsidosätt det standardapplikationsnamn som visas i dockan\n    -Xdock:icon=<sökväg till ikonfil>\n                      åsidosätt den standardikon som visas i dockan\n\n
 
 java.launcher.cls.error1=Fel: kunde inte hitta eller ladda huvudklassen {0}\nOrsakades av: {1}: {2}
-java.launcher.cls.error2=Fel: Huvudmetoden \u00E4r inte {0} i klassen {1}, definiera huvudmetoden som:\n   public static void main(String[] args)
-java.launcher.cls.error3=Fel: Huvudmetoden m\u00E5ste returnera ett v\u00E4rde av typen void i klassen {0}, \ndefiniera huvudmetoden som:\n   public static void main(String[] args)
-java.launcher.cls.error4=Fel: Huvudmetoden finns inte i klassen {0}, definiera huvudmetoden som:\n   public static void main(String[] args)\neller s\u00E5 m\u00E5ste en JavaFX-applikationsklass ut\u00F6ka {1}
-java.launcher.cls.error5=Fel: JavaFX-exekveringskomponenter saknas, och de kr\u00E4vs f\u00F6r att kunna k\u00F6ra den h\u00E4r applikationen
-java.launcher.cls.error6=Fel: LinkageError intr\u00E4ffade vid laddning av huvudklassen {0}\n\t{1}
+java.launcher.cls.error2=Fel: Huvudmetoden är inte {0} i klassen {1}, definiera huvudmetoden som:\n   public static void main(String[] args)
+java.launcher.cls.error3=Fel: Huvudmetoden måste returnera ett värde av typen void i klassen {0}, \ndefiniera huvudmetoden som:\n   public static void main(String[] args)
+java.launcher.cls.error4=Fel: Huvudmetoden finns inte i klassen {0}, definiera huvudmetoden som:\n   public static void main(String[] args)\neller så måste en JavaFX-applikationsklass utöka {1}
+java.launcher.cls.error5=Fel: JavaFX-exekveringskomponenter saknas, och de krävs för att kunna köra den här applikationen
+java.launcher.cls.error6=Fel: LinkageError inträffade vid laddning av huvudklassen {0}\n\t{1}
 java.launcher.cls.error7=Fel: Kan inte initiera huvudklassen {0}\nOrsakades av: {1}: {2}
-java.launcher.jar.error1=Fel: Ett ov\u00E4ntat fel intr\u00E4ffade n\u00E4r filen {0} skulle \u00F6ppnas
+java.launcher.jar.error1=Fel: Ett oväntat fel inträffade när filen {0} skulle öppnas
 java.launcher.jar.error2=manifest finns inte i {0}
 java.launcher.jar.error3=inget huvudmanifestattribut i {0}
 java.launcher.jar.error4=fel vid laddning av java-agenten i {0}
 java.launcher.init.error=initieringsfel
-java.launcher.javafx.error1=Fel: JavaFX launchApplication-metoden har fel signatur, den \nm\u00E5ste ha deklarerats som statisk och returnera ett v\u00E4rde av typen void
-java.launcher.module.error1=modulen {0} har inget MainClass-attribut, anv\u00E4nd -m <module>/<main-class>
+java.launcher.javafx.error1=Fel: JavaFX launchApplication-metoden har fel signatur, den \nmåste ha deklarerats som statisk och returnera ett värde av typen void
+java.launcher.module.error1=modulen {0} har inget MainClass-attribut, använd -m <module>/<main-class>
 java.launcher.module.error2=Fel: kunde inte hitta eller ladda huvudklassen {0} i modulen {1}
 java.launcher.module.error3=Fel: Kan inte ladda huvudklassen {0} i modulen {1}\n\t{2}
 java.launcher.module.error4={0} hittades inte
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
index 73dfe65ba94..02116bb6d3f 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
@@ -24,39 +24,39 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   \u7528\u6CD5\uFF1A{0} [options] <\u4E3B\u7C7B> [args...]\n           \uFF08\u6267\u884C\u7C7B\uFF09\n   \u6216  {0} [options] -jar <jar \u6587\u4EF6> [args...]\n           \uFF08\u6267\u884C jar \u6587\u4EF6\uFF09\n   \u6216  {0} [options] -m <\u6A21\u5757>[/<\u4E3B\u7C7B>] [args...]\n       {0} [options] --module <\u6A21\u5757>[/<\u4E3B\u7C7B>] [args...]\n           \uFF08\u6267\u884C\u6A21\u5757\u4E2D\u7684\u4E3B\u7C7B\uFF09\n   \u6216  {0} [options] <\u6E90\u6587\u4EF6> [args]\n           \uFF08\u6267\u884C\u5355\u4E2A\u6E90\u6587\u4EF6\u7A0B\u5E8F\uFF09\n\n \u5C06\u4E3B\u7C7B\u3001\u6E90\u6587\u4EF6\u3001-jar <jar \u6587\u4EF6>\u3001-m \u6216\n --module <\u6A21\u5757>/<\u4E3B\u7C7B> \u540E\u7684\u53C2\u6570\u4F5C\u4E3A\u53C2\u6570\n \u4F20\u9012\u5230\u4E3B\u7C7B\u3002\n\n \u5176\u4E2D\uFF0C\u9009\u9879\u5305\u62EC\uFF1A\n\n
+java.launcher.opt.header  =   用法：{0} [options] <主类> [args...]\n           （执行类）\n   或  {0} [options] -jar <jar 文件> [args...]\n           （执行 jar 文件）\n   或  {0} [options] -m <模块>[/<主类>] [args...]\n       {0} [options] --module <模块>[/<主类>] [args...]\n           （执行模块中的主类）\n   或  {0} [options] <源文件> [args]\n           （执行单个源文件程序）\n\n 将主类、源文件、-jar <jar 文件>、-m 或\n --module <模块>/<主类> 后的参数作为参数\n 传递到主类。\n\n 其中，选项包括：\n\n
 
-java.launcher.opt.vmselect   =\    {0}\t  \u9009\u62E9 "{1}" VM\n
-java.launcher.opt.hotspot    =\    {0}\t  \u662F "{1}" VM \u7684\u540C\u4E49\u8BCD [\u5DF2\u8FC7\u65F6]\n
+java.launcher.opt.vmselect   =\    {0}\t  选择 "{1}" VM\n
+java.launcher.opt.hotspot    =\    {0}\t  是 "{1}" VM 的同义词 [已过时]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    --class-path <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n                  \u4F7F\u7528 {0} \u5206\u9694\u7684, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u76EE\u5F55, JAR \u6863\u6848\n                  \u548C ZIP \u6863\u6848\u5217\u8868\u3002\n    -p <\u6A21\u5757\u8DEF\u5F84>\n    --module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  {0} \u5206\u9694\u7684\u5143\u7D20\u5217\u8868\uFF0C\u6BCF\u4E2A\u5143\u7D20\u90FD\u662F\n                  \u6A21\u5757\u6216\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55\u7684\u6587\u4EF6\u8DEF\u5F84\u3002\u6BCF\u4E2A\u6A21\u5757\u90FD\u662F\n                  \u6A21\u5757\u5316 JAR \u6216\u5C55\u5F00\u7684\u6A21\u5757\u76EE\u5F55\u3002\n    --upgrade-module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  {0} \u5206\u9694\u7684\u5143\u7D20\u5217\u8868\uFF0C\u6BCF\u4E2A\u5143\u7D20\u90FD\u662F\n                  \u6A21\u5757\u6216\u5305\u542B\u6A21\u5757\uFF08\u7528\u4E8E\u66FF\u6362\u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\u7684\n                  \u53EF\u5347\u7EA7\u6A21\u5757\uFF09\u7684\u76EE\u5F55\u7684\u6587\u4EF6\u8DEF\u5F84\u3002\u6BCF\u4E2A\u6A21\u5757\u90FD\u662F\n                  \u6A21\u5757\u5316 JAR \u6216\u5C55\u5F00\u7684\u6A21\u5757\u76EE\u5F55\u3002\n    --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n                  \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757\u3002\n                  <\u6A21\u5757\u540D\u79F0> \u8FD8\u53EF\u4EE5\u4E3A ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  \u5141\u8BB8\u6267\u884C\u53D7\u9650\u672C\u673A\u64CD\u4F5C\u7684\u6A21\u5757\u3002\n                  <module name> \u8FD8\u53EF\u4EE5\u4E3A ALL-UNNAMED\u3002\n    --list-modules\n                  \u5217\u51FA\u53EF\u89C2\u5BDF\u6A21\u5757\u5E76\u9000\u51FA\n    -d <module name>\n    --describe-module <\u6A21\u5757\u540D\u79F0>\n                  \u63CF\u8FF0\u6A21\u5757\u5E76\u9000\u51FA\n    --dry-run     \u521B\u5EFA VM \u5E76\u52A0\u8F7D\u4E3B\u7C7B, \u4F46\u4E0D\u6267\u884C main \u65B9\u6CD5\u3002\n                  \u6B64 --dry-run \u9009\u9879\u5BF9\u4E8E\u9A8C\u8BC1\u8BF8\u5982\n                  \u6A21\u5757\u7CFB\u7EDF\u914D\u7F6E\u8FD9\u6837\u7684\u547D\u4EE4\u884C\u9009\u9879\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    --validate-modules\n                  \u9A8C\u8BC1\u6240\u6709\u6A21\u5757\u5E76\u9000\u51FA\n                  --validate-modules \u9009\u9879\u5BF9\u4E8E\u67E5\u627E\n                  \u6A21\u5757\u8DEF\u5F84\u4E2D\u6A21\u5757\u7684\u51B2\u7A81\u53CA\u5176\u4ED6\u9519\u8BEF\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    -D<\u540D\u79F0>=<\u503C>\n                  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -verbose:[class|module|gc|jni]\n                  \u4E3A\u7ED9\u5B9A\u5B50\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n    -version      \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u9000\u51FA\n    --version     \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\n    -showversion  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u7EE7\u7EED\n    --show-version\n                  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u7EE7\u7EED\n    --show-module-resolution\n                  \u5728\u542F\u52A8\u8FC7\u7A0B\u4E2D\u663E\u793A\u6A21\u5757\u89E3\u6790\u8F93\u51FA\n    -? -h -help\n                  \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help        \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -X            \
-\u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help-extra  \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -ea[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -enableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n    -da[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -disableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u7981\u7528\u65AD\u8A00\n    -esa | -enablesystemassertions\n                  \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -dsa | -disablesystemassertions\n                  \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -agentlib:<\u5E93\u540D>[=<\u9009\u9879>]\n                  \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <\u5E93\u540D>, \u4F8B\u5982 -agentlib:jdwp\n                  \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help\n    -agentpath:<\u8DEF\u5F84\u540D>[=<\u9009\u9879>]\n                  \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n    -javaagent:<jar \u8DEF\u5F84>[=<\u9009\u9879>]\n                  \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n    -splash:<\u56FE\u50CF\u8DEF\u5F84>\n                  \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n                  \u81EA\u52A8\u652F\u6301\u548C\u4F7F\u7528 HiDPI \u7F29\u653E\u56FE\u50CF\n                  (\u5982\u679C\u53EF\u7528)\u3002\u5E94\u59CB\u7EC8\u5C06\u672A\u7F29\u653E\u7684\u56FE\u50CF\u6587\u4EF6\u540D (\u4F8B\u5982, image.ext)\n                  \u4F5C\u4E3A\u53C2\u6570\u4F20\u9012\u7ED9 -splash \u9009\u9879\u3002\n                  \u5C06\u81EA\u52A8\u9009\u53D6\u63D0\u4F9B\u7684\u6700\u5408\u9002\u7684\u7F29\u653E\n                  \u56FE\u50CF\u3002\n                  \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 SplashScreen API \u6587\u6863\n    @argument \u6587\u4EF6\n                  \u4E00\u4E2A\u6216\u591A\u4E2A\u5305\u542B\u9009\u9879\u7684\u53C2\u6570\u6587\u4EF6\n    --disable-@files\n                  \u963B\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n    --enable-preview\n                  \u5141\u8BB8\u7C7B\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n\u8981\u4E3A\u957F\u9009\u9879\u6307\u5B9A\u53C2\u6570, \u53EF\u4EE5\u4F7F\u7528 --<\u540D\u79F0>=<\u503C> \u6216\n--<\u540D\u79F0> <\u503C>\u3002\n
+java.launcher.opt.footer = \    -cp <目录和 zip/jar 文件的类搜索路径>\n    -classpath <目录和 zip/jar 文件的类搜索路径>\n    --class-path <目录和 zip/jar 文件的类搜索路径>\n                  使用 {0} 分隔的, 用于搜索类文件的目录, JAR 档案\n                  和 ZIP 档案列表。\n    -p <模块路径>\n    --module-path <模块路径>...\n                  {0} 分隔的元素列表，每个元素都是\n                  模块或包含模块的目录的文件路径。每个模块都是\n                  模块化 JAR 或展开的模块目录。\n    --upgrade-module-path <模块路径>...\n                  {0} 分隔的元素列表，每个元素都是\n                  模块或包含模块（用于替换运行时映像中的\n                  可升级模块）的目录的文件路径。每个模块都是\n                  模块化 JAR 或展开的模块目录。\n    --add-modules <模块名称>[,<模块名称>...]\n                  除了初始模块之外要解析的根模块。\n                  <模块名称> 还可以为 ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  允许执行受限本机操作的模块。\n                  <module name> 还可以为 ALL-UNNAMED。\n    --list-modules\n                  列出可观察模块并退出\n    -d <module name>\n    --describe-module <模块名称>\n                  描述模块并退出\n    --dry-run     创建 VM 并加载主类, 但不执行 main 方法。\n                  此 --dry-run 选项对于验证诸如\n                  模块系统配置这样的命令行选项可能非常有用。\n    --validate-modules\n                  验证所有模块并退出\n                  --validate-modules 选项对于查找\n                  模块路径中模块的冲突及其他错误可能非常有用。\n    -D<名称>=<值>\n                  设置系统属性\n    -verbose:[class|module|gc|jni]\n                  为给定子系统启用详细输出\n    -version      将产品版本输出到错误流并退出\n    --version     将产品版本输出到输出流并退出\n    -showversion  将产品版本输出到错误流并继续\n    --show-version\n                  将产品版本输出到输出流并继续\n    --show-module-resolution\n                  在启动过程中显示模块解析输出\n    -? -h -help\n                  将此帮助消息输出到错误流\n    --help        将此帮助消息输出到输出流\n    -X            \
+将额外选项的帮助输出到错误流\n    --help-extra  将额外选项的帮助输出到输出流\n    -ea[:<程序包名称>...|:<类名>]\n    -enableassertions[:<程序包名称>...|:<类名>]\n                  按指定的粒度启用断言\n    -da[:<程序包名称>...|:<类名>]\n    -disableassertions[:<程序包名称>...|:<类名>]\n                  按指定的粒度禁用断言\n    -esa | -enablesystemassertions\n                  启用系统断言\n    -dsa | -disablesystemassertions\n                  禁用系统断言\n    -agentlib:<库名>[=<选项>]\n                  加载本机代理库 <库名>, 例如 -agentlib:jdwp\n                  另请参阅 -agentlib:jdwp=help\n    -agentpath:<路径名>[=<选项>]\n                  按完整路径名加载本机代理库\n    -javaagent:<jar 路径>[=<选项>]\n                  加载 Java 编程语言代理, 请参阅 java.lang.instrument\n    -splash:<图像路径>\n                  使用指定的图像显示启动屏幕\n                  自动支持和使用 HiDPI 缩放图像\n                  (如果可用)。应始终将未缩放的图像文件名 (例如, image.ext)\n                  作为参数传递给 -splash 选项。\n                  将自动选取提供的最合适的缩放\n                  图像。\n                  有关详细信息, 请参阅 SplashScreen API 文档\n    @argument 文件\n                  一个或多个包含选项的参数文件\n    --disable-@files\n                  阻止进一步扩展参数文件\n    --enable-preview\n                  允许类依赖于此发行版的预览功能\n要为长选项指定参数, 可以使用 --<名称>=<值> 或\n--<名称> <值>。\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           \u7981\u7528\u540E\u53F0\u7F16\u8BD1\n    -Xbootclasspath/a:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n                      \u9644\u52A0\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u672B\u5C3E\n    -Xcheck:jni       \u5BF9 JNI \u51FD\u6570\u6267\u884C\u5176\u4ED6\u68C0\u67E5\n    -Xcomp            \u5F3A\u5236\u5728\u9996\u6B21\u8C03\u7528\u65F6\u7F16\u8BD1\u65B9\u6CD5\n    -Xdebug           \u4E0D\u6267\u884C\u4EFB\u4F55\u64CD\u4F5C\uFF1B\u5DF2\u8FC7\u65F6\uFF0C\u5C06\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    -Xdiag            \u663E\u793A\u9644\u52A0\u8BCA\u65AD\u6D88\u606F\n    -Xfuture          \u542F\u7528\u6700\u4E25\u683C\u7684\u68C0\u67E5\uFF0C\u9884\u671F\u5C06\u6765\u7684\u9ED8\u8BA4\u503C\u3002\n                      \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n                      \u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    -Xint             \u4EC5\u89E3\u91CA\u6A21\u5F0F\u6267\u884C\n    -Xinternalversion\n                      \u663E\u793A\u6BD4 -version \u9009\u9879\u66F4\u8BE6\u7EC6\u7684\n                      JVM \u7248\u672C\u4FE1\u606F\n    -Xlog:<opts>      \u914D\u7F6E\u6216\u542F\u7528\u91C7\u7528 Java \u865A\u62DF\n                      \u673A (Java Virtual Machine, JVM) \u7EDF\u4E00\u8BB0\u5F55\u6846\u67B6\u8FDB\u884C\u4E8B\u4EF6\u8BB0\u5F55\u3002\u4F7F\u7528 -Xlog:help\n                      \u53EF\u4E86\u89E3\u8BE6\u7EC6\u4FE1\u606F\u3002\n    -Xloggc:<file>    \u5C06 GC \u72B6\u6001\u8BB0\u5F55\u5728\u6587\u4EF6\u4E2D\uFF08\u5E26\u65F6\u95F4\u6233\uFF09\u3002\n                      \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n                      \u5C06\u6765\u7684\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\u5B83\u5C06\u66FF\u6362\u4E3A -Xlog:gc:<file>\u3002\n    -Xmixed           \u6DF7\u5408\u6A21\u5F0F\u6267\u884C\uFF08\u9ED8\u8BA4\u503C\uFF09\n    -Xmn<size>        \u4E3A\u5E74\u8F7B\u4EE3\uFF08\u65B0\u751F\u4EE3\uFF09\u8BBE\u7F6E\u521D\u59CB\u548C\u6700\u5927\u5806\u5927\u5C0F\n                      \uFF08\u4EE5\u5B57\u8282\u4E3A\u5355\u4F4D\uFF09\n    -Xms<size>        \u8BBE\u7F6E\u521D\u59CB Java \u5806\u5927\u5C0F\n    -Xmx<size>        \u8BBE\u7F6E\u6700\u5927 Java \u5806\u5927\u5C0F\n    -Xnoclassgc       \u7981\u7528\u7C7B\u5783\u573E\u6536\u96C6\n    -Xrs              \u51CF\u5C11 Java/VM \u5BF9\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u53F7\u7684\u4F7F\u7528\uFF08\u8BF7\u53C2\u89C1\u6587\u6863\uFF09\n    -Xshare:auto      \u5728\u53EF\u80FD\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF08\u9ED8\u8BA4\u503C\uFF09\n    -Xshare:off       \u4E0D\u5C1D\u8BD5\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\n    -Xshare:on        \u8981\u6C42\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF0C\u5426\u5219\u5C06\u5931\u8D25\u3002\n                      \u8FD9\u662F\u4E00\u4E2A\u6D4B\u8BD5\u9009\u9879\uFF0C\u53EF\u80FD\u5BFC\u81F4\u95F4\u6B47\u6027\n                      \u6545\u969C\u3002\u4E0D\u5E94\u5728\u751F\u4EA7\u73AF\u5883\u4E2D\u4F7F\u7528\u5B83\u3002\n    -XshowSettings    \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:all\n                      \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:locale\n                      \u663E\u793A\u6240\u6709\u4E0E\u533A\u57DF\u8BBE\u7F6E\u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:properties\n                      \u663E\u793A\u6240\u6709\u5C5E\u6027\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:vm\n                      \u663E\u793A\u6240\u6709\u4E0E vm \u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:security\n                      \u663E\u793A\u6240\u6709\u5B89\u5168\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:security:all\n                      \u663E\u793A\u6240\u6709\u5B89\u5168\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:security:properties\n                      \
-\u663E\u793A\u5B89\u5168\u5C5E\u6027\u5E76\u7EE7\u7EED\n    -XshowSettings:security:providers\n                      \u663E\u793A\u9759\u6001\u5B89\u5168\u63D0\u4F9B\u65B9\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:security:tls\n                      \u663E\u793A\u4E0E TLS \u76F8\u5173\u7684\u5B89\u5168\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:system\n                      \uFF08\u4EC5 Linux\uFF09\u663E\u793A\u4E3B\u673A\u7CFB\u7EDF\u6216\u5BB9\u5668\n                      \u914D\u7F6E\u5E76\u7EE7\u7EED\n    -Xss<size>        \u8BBE\u7F6E Java \u7EBF\u7A0B\u5806\u6808\u5927\u5C0F\n                      \u5B9E\u9645\u5927\u5C0F\u53EF\u4EE5\u820D\u5165\u5230\n                      \u64CD\u4F5C\u7CFB\u7EDF\u8981\u6C42\u7684\u7CFB\u7EDF\u9875\u9762\u5927\u5C0F\u7684\u500D\u6570\u3002\n    -Xverify          \u8BBE\u7F6E\u5B57\u8282\u7801\u9A8C\u8BC1\u5668\u7684\u6A21\u5F0F\n                      \u8BF7\u6CE8\u610F\uFF0C\u9009\u9879 -Xverify:none \u5DF2\u8FC7\u65F6\uFF0C\n                      \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u8BFB\u53D6 <target-module>\uFF0C\u800C\u65E0\u8BBA\n                      \u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002 \n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u8BFB\u53D6\u6240\u6709\u672A\u547D\u540D\n                      \u6A21\u5757\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5C06 <package> \u5BFC\u51FA\u5230 <target-module>\uFF0C\n                      \u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u5BFC\u51FA\u5230\u6240\u6709\n                      \u672A\u547D\u540D\u6A21\u5757\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5728 <target-module> \u4E2D\u6253\u5F00\n                      <package>\uFF0C\u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n    --patch-module <module>=<file>({0}<file>)*\n                      \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n                      \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n    --source <version>\n                      \u8BBE\u7F6E\u6E90\u6587\u4EF6\u6A21\u5F0F\u4E2D\u6E90\u7684\u7248\u672C\u3002\n    --finalization=<value>\n                      \u63A7\u5236 JVM \u662F\u5426\u6267\u884C\u5BF9\u8C61\u6700\u7EC8\u5904\u7406\uFF0C\n                      \u5176\u4E2D <value> \u4E3A "enabled" \u6216 "disabled" \u4E4B\u4E00\u3002\n                      \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6700\u7EC8\u5904\u7406\u5904\u4E8E\u542F\u7528\u72B6\u6001\u3002\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
+java.launcher.X.usage=\n    -Xbatch           禁用后台编译\n    -Xbootclasspath/a:<以 {0} 分隔的目录和 zip/jar 文件>\n                      附加在引导类路径末尾\n    -Xcheck:jni       对 JNI 函数执行其他检查\n    -Xcomp            强制在首次调用时编译方法\n    -Xdebug           不执行任何操作；已过时，将在未来发行版中删除。\n    -Xdiag            显示附加诊断消息\n    -Xfuture          启用最严格的检查，预期将来的默认值。\n                      此选项已过时，可能会在\n                      未来发行版中删除。\n    -Xint             仅解释模式执行\n    -Xinternalversion\n                      显示比 -version 选项更详细的\n                      JVM 版本信息\n    -Xlog:<opts>      配置或启用采用 Java 虚拟\n                      机 (Java Virtual Machine, JVM) 统一记录框架进行事件记录。使用 -Xlog:help\n                      可了解详细信息。\n    -Xloggc:<file>    将 GC 状态记录在文件中（带时间戳）。\n                      此选项已过时，可能会在\n                      将来的发行版中删除。它将替换为 -Xlog:gc:<file>。\n    -Xmixed           混合模式执行（默认值）\n    -Xmn<size>        为年轻代（新生代）设置初始和最大堆大小\n                      （以字节为单位）\n    -Xms<size>        设置初始 Java 堆大小\n    -Xmx<size>        设置最大 Java 堆大小\n    -Xnoclassgc       禁用类垃圾收集\n    -Xrs              减少 Java/VM 对操作系统信号的使用（请参见文档）\n    -Xshare:auto      在可能的情况下使用共享类数据（默认值）\n    -Xshare:off       不尝试使用共享类数据\n    -Xshare:on        要求使用共享类数据，否则将失败。\n                      这是一个测试选项，可能导致间歇性\n                      故障。不应在生产环境中使用它。\n    -XshowSettings    显示所有设置并继续\n    -XshowSettings:all\n                      显示所有设置并继续\n    -XshowSettings:locale\n                      显示所有与区域设置相关的设置并继续\n    -XshowSettings:properties\n                      显示所有属性设置并继续\n    -XshowSettings:vm\n                      显示所有与 vm 相关的设置并继续\n    -XshowSettings:security\n                      显示所有安全设置并继续\n    -XshowSettings:security:all\n                      显示所有安全设置并继续\n    -XshowSettings:security:properties\n                      \
+显示安全属性并继续\n    -XshowSettings:security:providers\n                      显示静态安全提供方设置并继续\n    -XshowSettings:security:tls\n                      显示与 TLS 相关的安全设置并继续\n    -XshowSettings:system\n                      （仅 Linux）显示主机系统或容器\n                      配置并继续\n    -Xss<size>        设置 Java 线程堆栈大小\n                      实际大小可以舍入到\n                      操作系统要求的系统页面大小的倍数。\n    -Xverify          设置字节码验证器的模式\n                      请注意，选项 -Xverify:none 已过时，\n                      可能会在未来发行版中删除。\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      更新 <module> 以读取 <target-module>，而无论\n                      模块如何声明。 \n                      <target-module> 可以是 ALL-UNNAMED，将读取所有未命名\n                      模块。\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      更新 <module> 以将 <package> 导出到 <target-module>，\n                      而无论模块如何声明。\n                      <target-module> 可以是 ALL-UNNAMED，将导出到所有\n                      未命名模块。\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      更新 <module> 以在 <target-module> 中打开\n                      <package>，而无论模块如何声明。\n    --limit-modules <module name>[,<module name>...]\n                      限制可观察模块的领域\n    --patch-module <module>=<file>({0}<file>)*\n                      使用 JAR 文件或目录中的类和资源\n                      覆盖或增强模块。\n    --source <version>\n                      设置源文件模式中源的版本。\n    --finalization=<value>\n                      控制 JVM 是否执行对象最终处理，\n                      其中 <value> 为 "enabled" 或 "disabled" 之一。\n                      默认情况下，最终处理处于启用状态。\n\n这些额外选项如有更改, 恕不另行通知。\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\n\u4EE5\u4E0B\u9009\u9879\u662F\u7279\u5B9A\u4E8E macOS \u7684\u9009\u9879\uFF1A\n    -XstartOnFirstThread\n                      \u5728\u7B2C\u4E00\u4E2A (AppKit) \u7EBF\u7A0B\u4E0A\u8FD0\u884C main() \u65B9\u6CD5\n    -Xdock:name=<application name>\n                      \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n    -Xdock:icon=<path to icon file>\n                     \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u56FE\u6807\n\n
+java.launcher.X.macosx.usage=\n以下选项是特定于 macOS 的选项：\n    -XstartOnFirstThread\n                      在第一个 (AppKit) 线程上运行 main() 方法\n    -Xdock:name=<application name>\n                      覆盖停靠栏中显示的默认应用程序名称\n    -Xdock:icon=<path to icon file>\n                     覆盖停靠栏中显示的默认图标\n\n
 
-java.launcher.cls.error1=\u9519\u8BEF: \u627E\u4E0D\u5230\u6216\u65E0\u6CD5\u52A0\u8F7D\u4E3B\u7C7B {0}\n\u539F\u56E0: {1}: {2}
-java.launcher.cls.error2=\u9519\u8BEF: main \u65B9\u6CD5\u4E0D\u662F\u7C7B {1} \u4E2D\u7684{0}, \u8BF7\u5C06 main \u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n   public static void main(String[] args)
-java.launcher.cls.error3=\u9519\u8BEF: main \u65B9\u6CD5\u5FC5\u987B\u8FD4\u56DE\u7C7B {0} \u4E2D\u7684\u7A7A\u7C7B\u578B\u503C, \u8BF7\n\u5C06 main \u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n   public static void main(String[] args)
-java.launcher.cls.error4=\u9519\u8BEF: \u5728\u7C7B {0} \u4E2D\u627E\u4E0D\u5230 main \u65B9\u6CD5, \u8BF7\u5C06 main \u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n   public static void main(String[] args)\n\u5426\u5219 JavaFX \u5E94\u7528\u7A0B\u5E8F\u7C7B\u5FC5\u987B\u6269\u5C55{1}
-java.launcher.cls.error5=\u9519\u8BEF: \u7F3A\u5C11 JavaFX \u8FD0\u884C\u65F6\u7EC4\u4EF6, \u9700\u8981\u4F7F\u7528\u8BE5\u7EC4\u4EF6\u6765\u8FD0\u884C\u6B64\u5E94\u7528\u7A0B\u5E8F
-java.launcher.cls.error6=\u9519\u8BEF: \u52A0\u8F7D\u4E3B\u7C7B {0} \u65F6\u51FA\u73B0 LinkageError\n\t{1}
-java.launcher.cls.error7=\u9519\u8BEF: \u65E0\u6CD5\u521D\u59CB\u5316\u4E3B\u7C7B {0}\n\u539F\u56E0: {1}: {2}
-java.launcher.cls.error8=\u9519\u8BEF\uFF1A\u5728\u7C7B {0} \u4E2D\u672A\u627E\u5230\u975E private \u96F6\u53C2\u6570\u6784\u9020\u5668\n\u8BF7\u4ECE\u73B0\u6709\u6784\u9020\u5668\u4E2D\u5220\u9664 private\uFF0C\u6216\u8005\u5B9A\u4E49\u4E3A\uFF1A\n   public {0}()
-java.launcher.cls.error9=\u9519\u8BEF\uFF1A\u65E0\u6CD5\u8C03\u7528\u975E\u9759\u6001\u5185\u90E8\u7C7B {0} \u6784\u9020\u5668\n\u8BF7\u5C06\u5185\u90E8\u7C7B\u8BBE\u4E3A\u9759\u6001\u6216\u5C06\u5185\u90E8\u7C7B\u79FB\u51FA\u5230\u5355\u72EC\u7684\u6E90\u6587\u4EF6
-java.launcher.jar.error1=\u9519\u8BEF: \u5C1D\u8BD5\u6253\u5F00\u6587\u4EF6{0}\u65F6\u51FA\u73B0\u610F\u5916\u9519\u8BEF
-java.launcher.jar.error2=\u5728{0}\u4E2D\u627E\u4E0D\u5230\u6E05\u5355
-java.launcher.jar.error3={0}\u4E2D\u6CA1\u6709\u4E3B\u6E05\u5355\u5C5E\u6027
-java.launcher.jar.error4=\u5728 {0} \u4E2D\u52A0\u8F7D Java \u4EE3\u7406\u65F6\u51FA\u9519
-java.launcher.init.error=\u521D\u59CB\u5316\u9519\u8BEF
-java.launcher.javafx.error1=\u9519\u8BEF: JavaFX launchApplication \u65B9\u6CD5\u5177\u6709\u9519\u8BEF\u7684\u7B7E\u540D, \u5FC5\u987B\n\u5C06\u65B9\u6CD5\u58F0\u660E\u4E3A\u9759\u6001\u65B9\u6CD5\u5E76\u8FD4\u56DE\u7A7A\u7C7B\u578B\u7684\u503C
-java.launcher.module.error1=\u6A21\u5757 {0} \u4E0D\u5177\u6709 ModuleMainClass \u5C5E\u6027\uFF0C\u8BF7\u4F7F\u7528 -m <\u6A21\u5757>/<\u4E3B\u7C7B>
-java.launcher.module.error2=\u9519\u8BEF: \u5728\u6A21\u5757 {1} \u4E2D\u627E\u4E0D\u5230\u6216\u65E0\u6CD5\u52A0\u8F7D\u4E3B\u7C7B {0}
-java.launcher.module.error3=\u9519\u8BEF: \u65E0\u6CD5\u5C06\u4E3B\u7C7B {0} \u52A0\u8F7D\u5230\u6A21\u5757 {1} \u4E2D\n\t{2}
-java.launcher.module.error4=\u627E\u4E0D\u5230{0}
-java.launcher.module.error5=\u9519\u8BEF: \u65E0\u6CD5\u521D\u59CB\u5316\u6A21\u5757 {1} \u4E2D\u7684\u4E3B\u7C7B {0}\n\u539F\u56E0: {2}: {3}
+java.launcher.cls.error1=错误: 找不到或无法加载主类 {0}\n原因: {1}: {2}
+java.launcher.cls.error2=错误: main 方法不是类 {1} 中的{0}, 请将 main 方法定义为:\n   public static void main(String[] args)
+java.launcher.cls.error3=错误: main 方法必须返回类 {0} 中的空类型值, 请\n将 main 方法定义为:\n   public static void main(String[] args)
+java.launcher.cls.error4=错误: 在类 {0} 中找不到 main 方法, 请将 main 方法定义为:\n   public static void main(String[] args)\n否则 JavaFX 应用程序类必须扩展{1}
+java.launcher.cls.error5=错误: 缺少 JavaFX 运行时组件, 需要使用该组件来运行此应用程序
+java.launcher.cls.error6=错误: 加载主类 {0} 时出现 LinkageError\n\t{1}
+java.launcher.cls.error7=错误: 无法初始化主类 {0}\n原因: {1}: {2}
+java.launcher.cls.error8=错误：在类 {0} 中未找到非 private 零参数构造器\n请从现有构造器中删除 private，或者定义为：\n   public {0}()
+java.launcher.cls.error9=错误：无法调用非静态内部类 {0} 构造器\n请将内部类设为静态或将内部类移出到单独的源文件
+java.launcher.jar.error1=错误: 尝试打开文件{0}时出现意外错误
+java.launcher.jar.error2=在{0}中找不到清单
+java.launcher.jar.error3={0}中没有主清单属性
+java.launcher.jar.error4=在 {0} 中加载 Java 代理时出错
+java.launcher.init.error=初始化错误
+java.launcher.javafx.error1=错误: JavaFX launchApplication 方法具有错误的签名, 必须\n将方法声明为静态方法并返回空类型的值
+java.launcher.module.error1=模块 {0} 不具有 ModuleMainClass 属性，请使用 -m <模块>/<主类>
+java.launcher.module.error2=错误: 在模块 {1} 中找不到或无法加载主类 {0}
+java.launcher.module.error3=错误: 无法将主类 {0} 加载到模块 {1} 中\n\t{2}
+java.launcher.module.error4=找不到{0}
+java.launcher.module.error5=错误: 无法初始化模块 {1} 中的主类 {0}\n原因: {2}: {3}
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_TW.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_TW.properties
index 48bcef4896b..bd2fc3c8064 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_TW.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_TW.properties
@@ -24,37 +24,37 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   \u7528\u6CD5: {0} [options] <mainclass> [args...]\n           (\u7528\u65BC\u57F7\u884C\u985E\u5225)\n   \u6216\u8005  {0} [options] -jar <jarfile> [args...]\n           (\u7528\u65BC\u57F7\u884C jar \u6A94\u6848)\n   \u6216\u8005  {0} [options] -m <module>[/<mainclass>] [args...]\n       {0} [options] --module <module>[/<mainclass>] [args...]\n           (\u7528\u65BC\u57F7\u884C\u6A21\u7D44\u4E2D\u7684\u4E3B\u8981\u985E\u5225)\n\n \u4E3B\u8981\u985E\u5225\u3001-jar <jarfile>\u3001-m \u6216 --module <module>/<mainclass>\n \u4E4B\u5F8C\u7684\u5F15\u6578\u6703\u7576\u6210\u5F15\u6578\u50B3\u9001\u81F3\u4E3B\u8981\u985E\u5225\u3002\n\n \u5176\u4E2D\u9078\u9805\u5305\u62EC:\n\n
+java.launcher.opt.header  =   用法: {0} [options] <mainclass> [args...]\n           (用於執行類別)\n   或者  {0} [options] -jar <jarfile> [args...]\n           (用於執行 jar 檔案)\n   或者  {0} [options] -m <module>[/<mainclass>] [args...]\n       {0} [options] --module <module>[/<mainclass>] [args...]\n           (用於執行模組中的主要類別)\n\n 主要類別、-jar <jarfile>、-m 或 --module <module>/<mainclass>\n 之後的引數會當成引數傳送至主要類別。\n\n 其中選項包括:\n\n
 
-java.launcher.opt.vmselect   =\    {0}\t  \u9078\u53D6 "{1}" VM\n
-java.launcher.opt.hotspot    =\    {0}\t  \u662F "{1}" VM \u7684\u540C\u7FA9\u5B57  [\u5DF2\u4E0D\u518D\u4F7F\u7528]\n
+java.launcher.opt.vmselect   =\    {0}\t  選取 "{1}" VM\n
+java.launcher.opt.hotspot    =\    {0}\t  是 "{1}" VM 的同義字  [已不再使用]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <\u76EE\u9304\u548C zip/jar \u6A94\u6848\u7684\u985E\u5225\u641C\u5C0B\u8DEF\u5F91>\n    -classpath <\u76EE\u9304\u548C zip/jar \u6A94\u6848\u7684\u985E\u5225\u641C\u5C0B\u8DEF\u5F91>\n    --class-path <\u76EE\u9304\u548C zip/jar \u6A94\u6848\u7684\u985E\u5225\u641C\u5C0B\u8DEF\u5F91>\n                  \u4EE5 {0} \u5340\u9694\u7684\u76EE\u9304\u3001JAR \u5B58\u6A94\n                  \u4EE5\u53CA ZIP \u5B58\u6A94\u6E05\u55AE (\u5C07\u65BC\u5176\u4E2D\u641C\u5C0B\u985E\u5225\u6A94\u6848)\u3002\n    -p <\u6A21\u7D44\u8DEF\u5F91>\n    --module-path <\u6A21\u7D44\u8DEF\u5F91>...\n                  \u4EE5 {0} \u5340\u9694\u7684\u76EE\u9304\u6E05\u55AE\uFF0C\u6BCF\u500B\u76EE\u9304\n                  \u90FD\u662F\u4E00\u500B\u6A21\u7D44\u76EE\u9304\u3002\n    --upgrade-module-path <\u6A21\u7D44\u8DEF\u5F91>...\n                  \u4EE5 {0} \u5340\u9694\u7684\u76EE\u9304\u6E05\u55AE\uFF0C\u6BCF\u500B\u76EE\u9304\n                  \u90FD\u662F\u4E00\u500B\u6A21\u7D44\u76EE\u9304\uFF0C\u7576\u4E2D\u7684\u6A21\u7D44\u53EF\u53D6\u4EE3\u53EF\u5347\u7D1A\n                  \u6A21\u7D44 (\u5728\u7A0B\u5F0F\u5BE6\u969B\u57F7\u884C\u5F71\u50CF\u4E2D)\n    --add-modules <module name>[,<module name>...]\n                  \u9664\u4E86\u8D77\u59CB\u6A21\u7D44\u4E4B\u5916\uFF0C\u8981\u89E3\u6790\u7684\u6839\u6A21\u7D44\u3002\n                  <module name> \u4E5F\u53EF\u4EE5\u662F ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n                  ALL-MODULE-PATH.\n    --list-modules\n                  \u5217\u51FA\u53EF\u76E3\u6E2C\u7684\u6A21\u7D44\u4E26\u7D50\u675F\n    -d <\u6A21\u7D44\u540D\u7A31>\n    --describe-module <\u6A21\u7D44\u540D\u7A31>\n                  \u63CF\u8FF0\u6A21\u7D44\u4E26\u7D50\u675F\n    --dry-run     \u5EFA\u7ACB VM \u4E26\u8F09\u5165\u4E3B\u8981\u985E\u5225\uFF0C\u4F46\u4E0D\u57F7\u884C\u4E3B\u8981\u65B9\u6CD5\u3002\n                  --dry-run \u9078\u9805\u9069\u5408\u7528\u5728\u9A57\u8B49\n                  \u50CF\u6A21\u7D44\u7CFB\u7D71\u7D44\u614B\u7684\u547D\u4EE4\u884C\u9078\u9805\u3002\n    --validate-modules\n                  \u9A57\u8B49\u6240\u6709\u6A21\u7D44\u4E26\u7D50\u675F\n                  --validate-modules \u9078\u9805\u9069\u5408\u7528\u5728\u5C0B\u627E\n                  \u6A21\u7D44\u8DEF\u5F91\u4E0A\u4E4B\u6A21\u7D44\u7684\u885D\u7A81\u548C\u5176\u4ED6\u932F\u8AA4\u3002\n    -D<name>=<value>\n                  \u8A2D\u5B9A\u7CFB\u7D71\u7279\u6027\n    -verbose:[class|module|gc|jni]\n                  \u555F\u7528\u8A73\u7D30\u8CC7\u8A0A\u8F38\u51FA\n    -version      \u5728\u932F\u8AA4\u4E32\u6D41\u5370\u51FA\u7522\u54C1\u7248\u672C\u4E26\u7D50\u675F\n    --version      \u5728\u8F38\u51FA\u4E32\u6D41\u5370\u51FA\u7522\u54C1\u7248\u672C\u4E26\u7D50\u675F\n    -showversion  \u5728\u932F\u8AA4\u4E32\u6D41\u5370\u51FA\u7522\u54C1\u7248\u672C\u4E26\u7E7C\u7E8C\u9032\u884C\u4F5C\u696D\n    --show-version\n                  \u5728\u8F38\u51FA\u4E32\u6D41\u5370\u51FA\u7522\u54C1\u7248\u672C\u4E26\u7E7C\u7E8C\u9032\u884C\u4F5C\u696D\n    --show-module-resolution\n                  \u5728\u555F\u52D5\u6642\u986F\u793A\u6A21\u7D44\u89E3\u6790\u8F38\u51FA\n    -? -h -help\n                  \u5728\u932F\u8AA4\u4E32\u6D41\u5370\u51FA\u6B64\u8AAA\u660E\u8A0A\u606F\n    --help        \u5728\u8F38\u51FA\u4E32\u6D41\u5370\u51FA\u6B64\u8AAA\u660E\u8A0A\u606F\n    -X            \u5728\u932F\u8AA4\u4E32\u6D41\u5370\u51FA\u984D\u5916\u9078\u9805\u7684\u8AAA\u660E\n    --help-extra  \u5728\u8F38\u51FA\u4E32\u6D41\u5370\u51FA\u984D\u5916\u9078\u9805\u7684\u8AAA\u660E\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  \u555F\u7528\u6307\u5B9A\u4E4B\u8A73\u7D30\u7A0B\u5EA6\u7684\u5BA3\u544A\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  \u505C\u7528\u6307\u5B9A\u4E4B\u8A73\u7D30\u7A0B\u5EA6\u7684\u5BA3\u544A\n    -esa | -enablesystemassertions\n                \
-  \u555F\u7528\u7CFB\u7D71\u5BA3\u544A\n    -dsa | -disablesystemassertions\n                  \u505C\u7528\u7CFB\u7D71\u5BA3\u544A\n    -agentlib:<libname>[=<options>]\n                  \u8F09\u5165\u539F\u751F\u4EE3\u7406\u7A0B\u5F0F\u7A0B\u5F0F\u5EAB <libname>\uFF0C\u4F8B\u5982 -agentlib:jdwp\n                  \u53E6\u8ACB\u53C3\u95B1 -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  \u4F9D\u5B8C\u6574\u8DEF\u5F91\u540D\u7A31\u8F09\u5165\u539F\u751F\u4EE3\u7406\u7A0B\u5F0F\u7A0B\u5F0F\u5EAB\n    -javaagent:<jarpath>[=<options>]\n                  \u8F09\u5165 Java \u7A0B\u5F0F\u8A9E\u8A00\u4EE3\u7406\u7A0B\u5F0F\uFF0C\u8ACB\u53C3\u95B1 java.lang.instrument\n    -splash:<imagepath>\n                  \u986F\u793A\u542B\u6307\u5B9A\u5F71\u50CF\u7684\u8EDF\u9AD4\u8CC7\u8A0A\u756B\u9762\n                  \u7CFB\u7D71\u6703\u81EA\u52D5\u652F\u63F4\u4E26\u4F7F\u7528 HiDPI \u7E2E\u653E\u7684\u5F71\u50CF\n                  (\u82E5\u6709\u7684\u8A71)\u3002\u672A\u7E2E\u653E\u5F71\u50CF\u6A94\u6848\u540D\u7A31 (\u4F8B\u5982 image.ext)\n                  \u61C9\u4E00\u5F8B\u4EE5\u5F15\u6578\u7684\u5F62\u5F0F\u50B3\u9001\u7D66 -splash \u9078\u9805\u3002\n                  \u7CFB\u7D71\u5C07\u6703\u81EA\u52D5\u9078\u64C7\u4F7F\u7528\u6700\u9069\u5408\u7684\u7E2E\u653E\u5F71\u50CF\n                  \u3002\n                  \u8ACB\u53C3\u95B1 SplashScreen API \u6587\u4EF6\u77AD\u89E3\u8A73\u7D30\u8CC7\u8A0A\u3002\n    @argument files\n                  \u4E00\u6216\u591A\u500B\u5305\u542B\u9078\u9805\u7684\u5F15\u6578\u6A94\u6848\n    --disable-@files\n                  \u505C\u7528\u9032\u4E00\u6B65\u7684\u5F15\u6578\u6A94\u6848\u64F4\u5145\n\u82E5\u8981\u6307\u5B9A\u9577\u9078\u9805\u7684\u5F15\u6578\uFF0C\u53EF\u4EE5\u4F7F\u7528 --<name>=<value> \u6216\n--<name> <value>\u3002\n
+java.launcher.opt.footer = \    -cp <目錄和 zip/jar 檔案的類別搜尋路徑>\n    -classpath <目錄和 zip/jar 檔案的類別搜尋路徑>\n    --class-path <目錄和 zip/jar 檔案的類別搜尋路徑>\n                  以 {0} 區隔的目錄、JAR 存檔\n                  以及 ZIP 存檔清單 (將於其中搜尋類別檔案)。\n    -p <模組路徑>\n    --module-path <模組路徑>...\n                  以 {0} 區隔的目錄清單，每個目錄\n                  都是一個模組目錄。\n    --upgrade-module-path <模組路徑>...\n                  以 {0} 區隔的目錄清單，每個目錄\n                  都是一個模組目錄，當中的模組可取代可升級\n                  模組 (在程式實際執行影像中)\n    --add-modules <module name>[,<module name>...]\n                  除了起始模組之外，要解析的根模組。\n                  <module name> 也可以是 ALL-DEFAULT、ALL-SYSTEM、\n                  ALL-MODULE-PATH.\n    --list-modules\n                  列出可監測的模組並結束\n    -d <模組名稱>\n    --describe-module <模組名稱>\n                  描述模組並結束\n    --dry-run     建立 VM 並載入主要類別，但不執行主要方法。\n                  --dry-run 選項適合用在驗證\n                  像模組系統組態的命令行選項。\n    --validate-modules\n                  驗證所有模組並結束\n                  --validate-modules 選項適合用在尋找\n                  模組路徑上之模組的衝突和其他錯誤。\n    -D<name>=<value>\n                  設定系統特性\n    -verbose:[class|module|gc|jni]\n                  啟用詳細資訊輸出\n    -version      在錯誤串流印出產品版本並結束\n    --version      在輸出串流印出產品版本並結束\n    -showversion  在錯誤串流印出產品版本並繼續進行作業\n    --show-version\n                  在輸出串流印出產品版本並繼續進行作業\n    --show-module-resolution\n                  在啟動時顯示模組解析輸出\n    -? -h -help\n                  在錯誤串流印出此說明訊息\n    --help        在輸出串流印出此說明訊息\n    -X            在錯誤串流印出額外選項的說明\n    --help-extra  在輸出串流印出額外選項的說明\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  啟用指定之詳細程度的宣告\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  停用指定之詳細程度的宣告\n    -esa | -enablesystemassertions\n                \
+  啟用系統宣告\n    -dsa | -disablesystemassertions\n                  停用系統宣告\n    -agentlib:<libname>[=<options>]\n                  載入原生代理程式程式庫 <libname>，例如 -agentlib:jdwp\n                  另請參閱 -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  依完整路徑名稱載入原生代理程式程式庫\n    -javaagent:<jarpath>[=<options>]\n                  載入 Java 程式語言代理程式，請參閱 java.lang.instrument\n    -splash:<imagepath>\n                  顯示含指定影像的軟體資訊畫面\n                  系統會自動支援並使用 HiDPI 縮放的影像\n                  (若有的話)。未縮放影像檔案名稱 (例如 image.ext)\n                  應一律以引數的形式傳送給 -splash 選項。\n                  系統將會自動選擇使用最適合的縮放影像\n                  。\n                  請參閱 SplashScreen API 文件瞭解詳細資訊。\n    @argument files\n                  一或多個包含選項的引數檔案\n    --disable-@files\n                  停用進一步的引數檔案擴充\n若要指定長選項的引數，可以使用 --<name>=<value> 或\n--<name> <value>。\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           \u505C\u7528\u80CC\u666F\u7DE8\u8B6F\n    -Xbootclasspath/a:<\u4EE5 {0} \u5340\u9694\u7684\u76EE\u9304\u548C zip/jar \u6A94\u6848>\n                      \u9644\u52A0\u81F3\u555F\u52D5\u5B89\u88DD\u985E\u5225\u8DEF\u5F91\u7684\u7D50\u5C3E\n    -Xcheck:jni       \u57F7\u884C\u984D\u5916\u7684 JNI \u51FD\u6578\u6AA2\u67E5\n    -Xcomp            \u5F37\u5236\u7DE8\u8B6F\u7B2C\u4E00\u500B\u547C\u53EB\u7684\u65B9\u6CD5\n    -Xdebug           \u91DD\u5C0D\u56DE\u6EAF\u76F8\u5BB9\u6027\u63D0\u4F9B\n    -Xdiag            \u986F\u793A\u984D\u5916\u7684\u8A3A\u65B7\u8A0A\u606F\n    -Xfuture          \u555F\u7528\u6700\u56B4\u683C\u7684\u6AA2\u67E5\uFF0C\u9810\u5148\u4F5C\u70BA\u5C07\u4F86\u7684\u9810\u8A2D\n    -Xint             \u50C5\u9650\u89E3\u8B6F\u6A21\u5F0F\u57F7\u884C\n    -Xinternalversion\n                      \u986F\u793A\u6BD4 -version \u9078\u9805\u66F4\u70BA\u8A73\u7D30\u7684\n                      JVM \u7248\u672C\u8CC7\u8A0A\n    -Xloggc:<file>    \u9023\u540C\u6642\u6233\u5C07 GC \u72C0\u614B\u8A18\u9304\u81F3\u6A94\u6848\n    -Xmixed           \u6DF7\u5408\u6A21\u5F0F\u57F7\u884C (\u9810\u8A2D)\n    -Xmn<size>        \u8A2D\u5B9A\u65B0\u751F\u4EE3 (\u990A\u6210\u5340) \u4E4B\u5806\u96C6\u7684\u8D77\u59CB\u5927\u5C0F\u548C\n                      \u5927\u5C0F\u4E0A\u9650 (\u4F4D\u5143\u7D44)\n    -Xms<size>        \u8A2D\u5B9A\u8D77\u59CB Java \u5806\u96C6\u5927\u5C0F\n    -Xmx<size>        \u8A2D\u5B9A Java \u5806\u96C6\u5927\u5C0F\u4E0A\u9650\n    -Xnoclassgc       \u505C\u7528\u985E\u5225\u8CC7\u6E90\u56DE\u6536\n    -Xrs              \u6E1B\u5C11 Java/VM \u4F7F\u7528\u7684\u4F5C\u696D\u7CFB\u7D71\u4FE1\u865F (\u8ACB\u53C3\u95B1\u6587\u4EF6)\n    -Xshare:auto      \u5728\u53EF\u80FD\u7684\u60C5\u6CC1\u4E0B\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599 (\u9810\u8A2D)\n    -Xshare:off       \u4E0D\u5617\u8A66\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599\n    -Xshare:on        \u9700\u8981\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599\uFF0C\u5426\u5247\u6703\u5931\u6557\u3002\n    -XshowSettings    \u986F\u793A\u6240\u6709\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\u9032\u884C\u4F5C\u696D\n    -XshowSettings:all\n                      \u986F\u793A\u6240\u6709\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\u9032\u884C\u4F5C\u696D\n    -XshowSettings:locale\n                      \u986F\u793A\u6240\u6709\u5730\u5340\u8A2D\u5B9A\u76F8\u95DC\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\u9032\u884C\u4F5C\u696D\n    -XshowSettings:properties\n                      \u986F\u793A\u6240\u6709\u5C6C\u6027\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\u9032\u884C\u4F5C\u696D\n    -XshowSettings:vm \u986F\u793A\u6240\u6709 VM \u76F8\u95DC\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\u9032\u884C\u4F5C\u696D\n    -Xss<size>        \u8A2D\u5B9A Java \u57F7\u884C\u7DD2\u5806\u758A\u5927\u5C0F\n    -Xverify          \u8A2D\u5B9A Bytecode \u9A57\u8B49\u7A0B\u5F0F\u7684\u6A21\u5F0F\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u8B80\u53D6 <target-module>\uFF0C\u4E0D\u8AD6\n                      \u6A21\u7D44\u5BA3\u544A\u70BA\u4F55\u3002 \n                      \u53EF\u5C07 <target-module> \u8A2D\u70BA ALL-UNNAMED \u4EE5\u8B80\u53D6\u6240\u6709\u672A\u547D\u540D\u7684\n                      \u6A21\u7D44\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u4FBF\u5C07 <package> \u532F\u51FA\u81F3 <target-module>\uFF0C\n                      \u4E0D\u8AD6\u6A21\u7D44\u5BA3\u544A\u70BA\u4F55\u3002\n                      \u53EF\u5C07 <target-module> \u8A2D\u70BA ALL-UNNAMED \u4EE5\u532F\u51FA\u81F3\u6240\u6709\n                      \u672A\u547D\u540D\u7684\u6A21\u7D44\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u4FBF\u5C07 <package> \u958B\u555F\u81F3\n                      \
-<target-module>\uFF0C\u4E0D\u8AD6\u6A21\u7D44\u5BA3\u544A\u70BA\u4F55\u3002\n    --illegal-access=<value>\n                      \u5141\u8A31\u6216\u62D2\u7D55\u672A\u547D\u540D\u6A21\u7D44\u4E2D\u7684\u7A0B\u5F0F\u78BC\u5C0D\u5DF2\u547D\u540D\u6A21\u7D44\u4E2D\u7684\n                      \u985E\u578B\u6210\u54E1\u9032\u884C\u5B58\u53D6\u3002\n                      <value> \u70BA "deny"\u3001"permit"\u3001"warn" \u6216 "debug" \u5176\u4E2D\u4E4B\u4E00\n                      \u6B64\u9078\u9805\u5C07\u5728\u672A\u4F86\u7248\u672C\u4E2D\u79FB\u9664\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u9650\u5236\u53EF\u76E3\u6E2C\u6A21\u7D44\u7684\u7BC4\u570D\n    --patch-module <module>=<file>({0}<file>)*\n                      \u8986\u5BEB\u6216\u52A0\u5F37\u542B\u6709 JAR \u6A94\u6848\u6216\u76EE\u9304\u4E2D\n                      \u985E\u5225\u548C\u8CC7\u6E90\u7684\u6A21\u7D44\u3002\n    --disable-@files  \u505C\u7528\u9032\u4E00\u6B65\u7684\u5F15\u6578\u6A94\u6848\u64F4\u5145\n\n\u4E0A\u8FF0\u7684\u984D\u5916\u9078\u9805\u82E5\u6709\u8B8A\u66F4\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
+java.launcher.X.usage=\n    -Xbatch           停用背景編譯\n    -Xbootclasspath/a:<以 {0} 區隔的目錄和 zip/jar 檔案>\n                      附加至啟動安裝類別路徑的結尾\n    -Xcheck:jni       執行額外的 JNI 函數檢查\n    -Xcomp            強制編譯第一個呼叫的方法\n    -Xdebug           針對回溯相容性提供\n    -Xdiag            顯示額外的診斷訊息\n    -Xfuture          啟用最嚴格的檢查，預先作為將來的預設\n    -Xint             僅限解譯模式執行\n    -Xinternalversion\n                      顯示比 -version 選項更為詳細的\n                      JVM 版本資訊\n    -Xloggc:<file>    連同時戳將 GC 狀態記錄至檔案\n    -Xmixed           混合模式執行 (預設)\n    -Xmn<size>        設定新生代 (養成區) 之堆集的起始大小和\n                      大小上限 (位元組)\n    -Xms<size>        設定起始 Java 堆集大小\n    -Xmx<size>        設定 Java 堆集大小上限\n    -Xnoclassgc       停用類別資源回收\n    -Xrs              減少 Java/VM 使用的作業系統信號 (請參閱文件)\n    -Xshare:auto      在可能的情況下使用共用類別資料 (預設)\n    -Xshare:off       不嘗試使用共用類別資料\n    -Xshare:on        需要使用共用類別資料，否則會失敗。\n    -XshowSettings    顯示所有設定值並繼續進行作業\n    -XshowSettings:all\n                      顯示所有設定值並繼續進行作業\n    -XshowSettings:locale\n                      顯示所有地區設定相關設定值並繼續進行作業\n    -XshowSettings:properties\n                      顯示所有屬性設定值並繼續進行作業\n    -XshowSettings:vm 顯示所有 VM 相關設定值並繼續進行作業\n    -Xss<size>        設定 Java 執行緒堆疊大小\n    -Xverify          設定 Bytecode 驗證程式的模式\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      更新 <module> 以讀取 <target-module>，不論\n                      模組宣告為何。 \n                      可將 <target-module> 設為 ALL-UNNAMED 以讀取所有未命名的\n                      模組。\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      更新 <module> 以便將 <package> 匯出至 <target-module>，\n                      不論模組宣告為何。\n                      可將 <target-module> 設為 ALL-UNNAMED 以匯出至所有\n                      未命名的模組。\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      更新 <module> 以便將 <package> 開啟至\n                      \
+<target-module>，不論模組宣告為何。\n    --illegal-access=<value>\n                      允許或拒絕未命名模組中的程式碼對已命名模組中的\n                      類型成員進行存取。\n                      <value> 為 "deny"、"permit"、"warn" 或 "debug" 其中之一\n                      此選項將在未來版本中移除。\n    --limit-modules <module name>[,<module name>...]\n                      限制可監測模組的範圍\n    --patch-module <module>=<file>({0}<file>)*\n                      覆寫或加強含有 JAR 檔案或目錄中\n                      類別和資源的模組。\n    --disable-@files  停用進一步的引數檔案擴充\n\n上述的額外選項若有變更不另行通知。\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\n\u4E0B\u5217\u662F Mac OS X \u7279\u5B9A\u9078\u9805:\n    -XstartOnFirstThread\n                      \u5728\u7B2C\u4E00\u500B (AppKit) \u57F7\u884C\u7DD2\u57F7\u884C main() \u65B9\u6CD5\n    -Xdock:name=<application name>\n                      \u8986\u5BEB\u7D50\u5408\u8AAA\u660E\u756B\u9762\u4E2D\u986F\u793A\u7684\u9810\u8A2D\u61C9\u7528\u7A0B\u5F0F\u540D\u7A31\n    -Xdock:icon=<path to icon file>\n                      \u8986\u5BEB\u7D50\u5408\u8AAA\u660E\u756B\u9762\u4E2D\u986F\u793A\u7684\u9810\u8A2D\u5716\u793A\n\n
+java.launcher.X.macosx.usage=\n下列是 Mac OS X 特定選項:\n    -XstartOnFirstThread\n                      在第一個 (AppKit) 執行緒執行 main() 方法\n    -Xdock:name=<application name>\n                      覆寫結合說明畫面中顯示的預設應用程式名稱\n    -Xdock:icon=<path to icon file>\n                      覆寫結合說明畫面中顯示的預設圖示\n\n
 
-java.launcher.cls.error1=\u932F\u8AA4: \u627E\u4E0D\u5230\u6216\u7121\u6CD5\u8F09\u5165\u4E3B\u8981\u985E\u5225 {0}\n\u539F\u56E0: {1}: {2}
-java.launcher.cls.error2=\u932F\u8AA4: \u4E3B\u8981\u65B9\u6CD5\u4E0D\u662F\u985E\u5225 {1} \u4E2D\u7684 {0}\uFF0C\u8ACB\u5B9A\u7FA9\u4E3B\u8981\u65B9\u6CD5\u70BA:\n   public static void main(String[] args)
-java.launcher.cls.error3=\u932F\u8AA4: \u4E3B\u8981\u65B9\u6CD5\u5FC5\u9808\u50B3\u56DE\u985E\u5225 {0} \u4E2D void \u985E\u578B\u7684\u503C\uFF0C\n\u8ACB\u5B9A\u7FA9\u4E3B\u8981\u65B9\u6CD5\u70BA:\n   public static void main(String[] args)
-java.launcher.cls.error4=\u932F\u8AA4: \u5728\u985E\u5225 {0} \u4E2D\u627E\u4E0D\u5230\u4E3B\u8981\u65B9\u6CD5\uFF0C\u8ACB\u5B9A\u7FA9\u4E3B\u8981\u65B9\u6CD5\u70BA:\n   public static void main(String[] args)\n\u6216\u8005 JavaFX \u61C9\u7528\u7A0B\u5F0F\u985E\u5225\u5FC5\u9808\u64F4\u5145 {1}
-java.launcher.cls.error5=\u932F\u8AA4: \u907A\u6F0F\u57F7\u884C\u6B64\u61C9\u7528\u7A0B\u5F0F\u6240\u9700\u7684 JavaFX \u7A0B\u5F0F\u5BE6\u969B\u57F7\u884C\u5143\u4EF6
-java.launcher.cls.error6=\u932F\u8AA4: \u8F09\u5165\u4E3B\u8981\u985E\u5225 {0} \u6642\u767C\u751F LinkageError\n\t{1}
-java.launcher.cls.error7=\u932F\u8AA4: \u7121\u6CD5\u8D77\u59CB\u4E3B\u8981\u985E\u5225 {0}\n\u539F\u56E0: {1}: {2}
-java.launcher.jar.error1=\u932F\u8AA4: \u5617\u8A66\u958B\u555F\u6A94\u6848 {0} \u6642\u767C\u751F\u672A\u9810\u671F\u7684\u932F\u8AA4
-java.launcher.jar.error2=\u5728 {0} \u4E2D\u627E\u4E0D\u5230\u8CC7\u8A0A\u6E05\u55AE
-java.launcher.jar.error3={0} \u4E2D\u6C92\u6709\u4E3B\u8981\u8CC7\u8A0A\u6E05\u55AE\u5C6C\u6027
-java.launcher.jar.error4=\u8F09\u5165 {0} \u4E2D\u7684 Java \u4EE3\u7406\u7A0B\u5F0F\u6642\u767C\u751F\u932F\u8AA4
-java.launcher.init.error=\u521D\u59CB\u5316\u932F\u8AA4
-java.launcher.javafx.error1=\u932F\u8AA4: JavaFX launchApplication \u65B9\u6CD5\u7684\u7C3D\u7AE0\u932F\u8AA4\uFF0C\u5B83\n\u5FC5\u9808\u5BA3\u544A\u70BA\u975C\u614B\u4E26\u50B3\u56DE void \u985E\u578B\u7684\u503C
-java.launcher.module.error1=\u6A21\u7D44 {0} \u4E0D\u542B MainClass \u5C6C\u6027\uFF0C\u8ACB\u4F7F\u7528 -m <module>/<main-class>
-java.launcher.module.error2=\u932F\u8AA4: \u627E\u4E0D\u5230\u6216\u7121\u6CD5\u8F09\u5165\u6A21\u7D44 {1} \u4E2D\u7684\u4E3B\u8981\u985E\u5225 {0}
-java.launcher.module.error3=\u932F\u8AA4: \u7121\u6CD5\u8F09\u5165\u6A21\u7D44 {1} \u4E2D\u7684\u4E3B\u8981\u985E\u5225 {0}\n\t{2}
-java.launcher.module.error4=\u627E\u4E0D\u5230 {0}
-java.launcher.module.error5=\u932F\u8AA4: \u7121\u6CD5\u8D77\u59CB\u6A21\u7D44 {1} \u4E2D\u7684\u4E3B\u8981\u985E\u5225 {0}\n\u539F\u56E0: {1}: {2}
+java.launcher.cls.error1=錯誤: 找不到或無法載入主要類別 {0}\n原因: {1}: {2}
+java.launcher.cls.error2=錯誤: 主要方法不是類別 {1} 中的 {0}，請定義主要方法為:\n   public static void main(String[] args)
+java.launcher.cls.error3=錯誤: 主要方法必須傳回類別 {0} 中 void 類型的值，\n請定義主要方法為:\n   public static void main(String[] args)
+java.launcher.cls.error4=錯誤: 在類別 {0} 中找不到主要方法，請定義主要方法為:\n   public static void main(String[] args)\n或者 JavaFX 應用程式類別必須擴充 {1}
+java.launcher.cls.error5=錯誤: 遺漏執行此應用程式所需的 JavaFX 程式實際執行元件
+java.launcher.cls.error6=錯誤: 載入主要類別 {0} 時發生 LinkageError\n\t{1}
+java.launcher.cls.error7=錯誤: 無法起始主要類別 {0}\n原因: {1}: {2}
+java.launcher.jar.error1=錯誤: 嘗試開啟檔案 {0} 時發生未預期的錯誤
+java.launcher.jar.error2=在 {0} 中找不到資訊清單
+java.launcher.jar.error3={0} 中沒有主要資訊清單屬性
+java.launcher.jar.error4=載入 {0} 中的 Java 代理程式時發生錯誤
+java.launcher.init.error=初始化錯誤
+java.launcher.javafx.error1=錯誤: JavaFX launchApplication 方法的簽章錯誤，它\n必須宣告為靜態並傳回 void 類型的值
+java.launcher.module.error1=模組 {0} 不含 MainClass 屬性，請使用 -m <module>/<main-class>
+java.launcher.module.error2=錯誤: 找不到或無法載入模組 {1} 中的主要類別 {0}
+java.launcher.module.error3=錯誤: 無法載入模組 {1} 中的主要類別 {0}\n\t{2}
+java.launcher.module.error4=找不到 {0}
+java.launcher.module.error5=錯誤: 無法起始模組 {1} 中的主要類別 {0}\n原因: {1}: {2}
diff --git a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
index b9e9098023e..76ad70e34c8 100644
--- a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
+++ b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
@@ -330,7 +330,7 @@ clf=Chilean Unit of Account (UF)
 clp=Chilean Peso
 cny=Chinese Yuan
 cop=Colombian Peso
-crc=Costa Rican Col\u00f3n
+crc=Costa Rican Colón
 csd=Serbian Dinar (2002-2006)
 cuc=Cuban Convertible Peso
 cup=Cuban Peso
@@ -374,7 +374,7 @@ ils=Israeli New Sheqel
 inr=Indian Rupee
 iqd=Iraqi Dinar
 irr=Iranian Rial
-isk=Icelandic Kr\u00f3na
+isk=Icelandic Króna
 itl=Italian Lira
 jmd=Jamaican Dollar
 jod=Jordanian Dinar
@@ -418,7 +418,7 @@ mzm=Mozambican Metical (1980-2006)
 mzn=Mozambican Metical
 nad=Namibian Dollar
 ngn=Nigerian Naira
-nio=Nicaraguan C\u00f3rdoba
+nio=Nicaraguan Córdoba
 nlg=Dutch Guilder
 nok=Norwegian Krone
 npr=Nepalese Rupee
@@ -455,9 +455,9 @@ sos=Somali Shilling
 srd=Surinamese Dollar
 srg=Surinamese Guilder
 ssp=South Sudanese Pound
-std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
-stn=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
-svc=Salvadoran Col\u00f3n
+std=São Tomé and Príncipe Dobra
+stn=São Tomé and Príncipe Dobra
+svc=Salvadoran Colón
 syp=Syrian Pound
 szl=Swazi Lilangeni
 thb=Thai Baht
@@ -465,7 +465,7 @@ tjs=Tajikistani Somoni
 tmm=Turkmenistani Manat (1993-2009)
 tmt=Turkmenistani Manat
 tnd=Tunisian Dinar
-top=Tongan Pa\u02bbanga
+top=Tongan Paʻanga
 tpe=Timorese Escudo
 trl=Turkish Lira (1922-2005)
 try=Turkish Lira
@@ -479,10 +479,10 @@ usn=US Dollar (Next day)
 uss=US Dollar (Same day)
 uyu=Uruguayan Peso
 uzs=Uzbekistan Som
-veb=Venezuelan Bol\u00edvar (1871-2008)
-ved=Venezuelan Bol\u00edvar Soberano
-vef=Venezuelan Bol\u00edvar
-ves=Venezuelan Bol\u00edvar Soberano
+veb=Venezuelan Bolívar (1871-2008)
+ved=Venezuelan Bolívar Soberano
+vef=Venezuelan Bolívar
+ves=Venezuelan Bolívar Soberano
 vnd=Vietnamese Dong
 vuv=Vanuatu Vatu
 wst=Samoan Tala
diff --git a/src/java.base/share/classes/sun/util/resources/LocaleNames.properties b/src/java.base/share/classes/sun/util/resources/LocaleNames.properties
index ed568afd09e..44fbd8f3b57 100644
--- a/src/java.base/share/classes/sun/util/resources/LocaleNames.properties
+++ b/src/java.base/share/classes/sun/util/resources/LocaleNames.properties
@@ -154,7 +154,7 @@ ms=Malay
 mt=Maltese
 my=Burmese
 na=Nauru
-nb=Norwegian Bokm\u00e5l
+nb=Norwegian Bokmål
 nd=North Ndebele
 ne=Nepali
 ng=Ndonga
@@ -218,7 +218,7 @@ ur=Urdu
 uz=Uzbek
 ve=Venda
 vi=Vietnamese
-vo=Volap\u00fck
+vo=Volapük
 wa=Walloon
 wo=Wolof
 xh=Xhosa
@@ -396,7 +396,7 @@ gre=Greek, Modern (1453-)
 grn=Guarani
 gsw=Swiss German
 guj=Gujarati
-gwi=Gwich\u02bcin
+gwi=Gwichʼin
 hai=Haida
 hat=Haitian
 hau=Hausa
@@ -541,11 +541,11 @@ nia=Nias
 nic=Niger-Kordofanian
 niu=Niuean
 nno=Norwegian Nynorsk
-nob=Bokm\u00e5l, Norwegian
+nob=Bokmål, Norwegian
 nog=Nogai
 non=Old Norse
 nor=Norwegian
-nqo=N\u2019Ko
+nqo=N’Ko
 nso=Northern Sotho
 nub=Nubian
 nwc=Classical Newari
@@ -578,7 +578,7 @@ pol=Polish
 pon=Pohnpeian
 por=Portuguese
 pra=Prakrit
-pro=Old Proven\u00e7al
+pro=Old Provençal
 pus=Pushto; Pashto
 que=Quechua
 raj=Rajasthani
@@ -687,7 +687,7 @@ uzb=Uzbek
 vai=Vai
 ven=Venda
 vie=Vietnamese
-vol=Volap\u00fck
+vol=Volapük
 vot=Votic
 wak=Wakashan
 wal=Wolaytta
@@ -807,7 +807,7 @@ Mymr=Myanmar
 Narb=Old North Arabian
 Nbat=Nabataean
 Nkgb=Naxi Geba
-Nkoo=N\u2019Ko
+Nkoo=N’Ko
 Ogam=Ogham
 Olck=Ol Chiki
 Orkh=Orkhon
@@ -883,7 +883,7 @@ AS=American Samoa
 AT=Austria
 AU=Australia
 AW=Aruba
-AX=\u00c5land Islands
+AX=Åland Islands
 AZ=Azerbaijan
 BA=Bosnia & Herzegovina
 BB=Barbados
@@ -894,7 +894,7 @@ BG=Bulgaria
 BH=Bahrain
 BI=Burundi
 BJ=Benin
-BL=St. Barth\u00e9lemy
+BL=St. Barthélemy
 BM=Bermuda
 BN=Brunei
 BO=Bolivia
@@ -912,7 +912,7 @@ CD=Congo - Kinshasa
 CF=Central African Republic
 CG=Congo - Brazzaville
 CH=Switzerland
-CI=C\u00f4te d\u2019Ivoire
+CI=Côte d’Ivoire
 CK=Cook Islands
 CL=Chile
 CM=Cameroon
@@ -922,7 +922,7 @@ CR=Costa Rica
 CS=Serbia and Montenegro
 CU=Cuba
 CV=Cape Verde
-CW=Cura\u00e7ao
+CW=Curaçao
 CX=Christmas Island
 CY=Cyprus
 CZ=Czechia
@@ -1057,7 +1057,7 @@ PT=Portugal
 PW=Palau
 PY=Paraguay
 QA=Qatar
-RE=R\u00e9union
+RE=Réunion
 RO=Romania
 RS=Serbia
 RU=Russia
@@ -1078,7 +1078,7 @@ SN=Senegal
 SO=Somalia
 SR=Suriname
 SS=South Sudan
-ST=S\u00e3o Tom\u00e9 & Pr\u00edncipe
+ST=São Tomé & Príncipe
 SV=El Salvador
 SX=Sint Maarten
 SY=Syria
@@ -1094,7 +1094,7 @@ TL=Timor-Leste
 TM=Turkmenistan
 TN=Tunisia
 TO=Tonga
-TR=T\u00fcrkiye
+TR=Türkiye
 TT=Trinidad & Tobago
 TV=Tuvalu
 TW=Taiwan
@@ -1159,7 +1159,7 @@ ZW=Zimbabwe
 # rarely localized
 
 %%EURO=Euro
-%%B=Bokm\u00e5l
+%%B=Bokmål
 %%NY=Nynorsk
 
 
diff --git a/src/java.base/share/data/currency/CurrencyData.properties b/src/java.base/share/data/currency/CurrencyData.properties
index 12c0c69801e..dbfbe799b47 100644
--- a/src/java.base/share/data/currency/CurrencyData.properties
+++ b/src/java.base/share/data/currency/CurrencyData.properties
@@ -80,7 +80,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
 
 # AFGHANISTAN
 AF=AFN
-# \u00c5LAND ISLANDS
+# ÅLAND ISLANDS
 AX=EUR
 # ALBANIA
 AL=ALL
@@ -192,7 +192,7 @@ CI=XOF
 HR=HRK;2022-12-31-23-00-00;EUR
 # CUBA
 CU=CUP
-# Cura\u00e7ao
+# Curaçao
 CW=ANG
 # CYPRUS
 CY=EUR
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
index c24154bea07..872a74a2f66 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
@@ -43,12 +43,12 @@ FileChooser.newFolderErrorSeparator= :
 FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien
 FileChooser.cancelButton.textAndMnemonic=Abbrechen
 FileChooser.saveButton.textAndMnemonic=Speichern
-FileChooser.openButton.textAndMnemonic=\u00D6ffnen
+FileChooser.openButton.textAndMnemonic=Öffnen
 FileChooser.saveDialogTitle.textAndMnemonic=Speichern
-FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.openDialogTitle.textAndMnemonic=Öffnen
 FileChooser.updateButton.textAndMnemonic=Aktualisieren
 FileChooser.helpButton.textAndMnemonic=Hilfe
-FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ffnen
+FileChooser.directoryOpenButton.textAndMnemonic=Öffnen
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -57,10 +57,10 @@ FileChooser.fileSizeGigaBytes={0} GB
 
 # Mac-specific strings
 FileChooser.saveTitle.textAndMnemonic=Speichern
-FileChooser.openTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.openTitle.textAndMnemonic=Öffnen
 FileChooser.newFolderExistsError.textAndMnemonic=Dieser Name ist bereits vergeben
-FileChooser.chooseButton.textAndMnemonic=Ausw\u00E4hlen
-FileChooser.chooseButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei ausw\u00E4hlen
+FileChooser.chooseButton.textAndMnemonic=Auswählen
+FileChooser.chooseButtonToolTip.textAndMnemonic=Ausgewählte Datei auswählen
 
 FileChooser.newFolderButton.textAndMnemonic=Neuer Ordner
 FileChooser.newFolderTitle.textAndMnemonic=Neuer Ordner
@@ -74,7 +74,7 @@ FileChooser.untitledFolderName=unbenannter Ordner
 FileChooser.untitledFileName=unbenannt
 FileChooser.createButton.textAndMnemonic=Erstellen
 
-FileChooser.byDate.textAndMnemonic=\u00C4nderungsdatum
+FileChooser.byDate.textAndMnemonic=Änderungsdatum
 FileChooser.by.textAndMnemonic=Name
 FileChooser.newFolderAccessibleName=Neuer Ordner
 
@@ -86,7 +86,7 @@ FileChooser.mac.newFolder.subsequent=unbenannter Ordner {0}
 ColorChooser.preview.textAndMnemonic=Vorschau
 ColorChooser.ok.textAndMnemonic=OK
 ColorChooser.cancel.textAndMnemonic=Abbrechen
-ColorChooser.reset.textAndMnemonic=&Zur\u00FCcksetzen
+ColorChooser.reset.textAndMnemonic=&Zurücksetzen
 ColorChooser.sample.textAndMnemonic=Beispieltext  Beispieltext
 ColorChooser.swatches.textAndMnemonic=&Muster
 ColorChooser.swatchesRecent.textAndMnemonic=Aktuell:
@@ -99,7 +99,7 @@ ColorChooser.hsbGreen.textAndMnemonic=G
 ColorChooser.hsbBlue.textAndMnemonic=B
 ColorChooser.rgb.textAndMnemonic=R&GB
 ColorChooser.rgbRed.textAndMnemonic=Ro&t
-ColorChooser.rgbGreen.textAndMnemonic=Gr\u00FC&n
+ColorChooser.rgbGreen.textAndMnemonic=Grü&n
 ColorChooser.rgbBlue.textAndMnemonic=&Blau
 
 ############ OPTION PANE STRINGS #############
@@ -109,7 +109,7 @@ OptionPane.yesButton.textAndMnemonic=&Ja
 OptionPane.noButton.textAndMnemonic=&Nein
 OptionPane.okButton.textAndMnemonic=OK
 OptionPane.cancelButton.textAndMnemonic=Abbrechen
-OptionPane.title.textAndMnemonic=Option ausw\u00E4hlen
+OptionPane.title.textAndMnemonic=Option auswählen
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
 OptionPane.inputDialog.titleAndMnemonic=Eingabe
@@ -121,7 +121,7 @@ OptionPane.messageDialog.titleAndMnemonic=Meldung
 PrintingDialog.titleProgress.textAndMnemonic=Drucken
 PrintingDialog.titleAborting.textAndMnemonic=Drucken (wird abgebrochen)
 
-PrintingDialog.contentInitial.textAndMnemonic=Druckvorgang l\u00E4uft...
+PrintingDialog.contentInitial.textAndMnemonic=Druckvorgang läuft...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
@@ -136,34 +136,34 @@ PrintingDialog.abortButtonToolTip.textAndMnemonic=Druckvorgang abbrechen
 InternalFrame.iconButtonToolTip=Minimieren
 InternalFrame.maxButtonToolTip=Maximieren
 InternalFrame.restoreButtonToolTip=Wiederherstellen
-InternalFrame.closeButtonToolTip=Schlie\u00DFen
+InternalFrame.closeButtonToolTip=Schließen
 
 ############ Internal Frame Title Pane Strings ############
 InternalFrameTitlePane.restoreButton.textAndMnemonic=Wiederherstellen
 InternalFrameTitlePane.moveButton.textAndMnemonic=Verschieben
-InternalFrameTitlePane.sizeButton.textAndMnemonic=Gr\u00F6\u00DFe
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Größe
 InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimieren
 InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximieren
-InternalFrameTitlePane.closeButton.textAndMnemonic=Schlie\u00DFen
+InternalFrameTitlePane.closeButton.textAndMnemonic=Schließen
 
 ############ Text strings #############
 # Used for html forms
 FormView.submitButton.textAndMnemonic=Abfrage weiterleiten
-FormView.resetButton.textAndMnemonic=Zur\u00FCcksetzen
+FormView.resetButton.textAndMnemonic=Zurücksetzen
 FormView.browseFileButton.textAndMnemonic=Durchsuchen...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=Formatvorlagen\u00E4nderung
-AbstractDocument.addition.textAndMnemonic=Hinzuf\u00FCgen
-AbstractDocument.deletion.textAndMnemonic=L\u00F6schen
-AbstractDocument.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractDocument.styleChange.textAndMnemonic=Formatvorlagenänderung
+AbstractDocument.addition.textAndMnemonic=Hinzufügen
+AbstractDocument.deletion.textAndMnemonic=Löschen
+AbstractDocument.undo.textAndMnemonic=Rückgängig
 AbstractDocument.redo.textAndMnemonic=Wiederherstellen
 
 ############ Abstract Button Strings ############
 AbstractButton.click.textAndMnemonic=Klicken
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractUndoableEdit.undo.textAndMnemonic=Rückgängig
 AbstractUndoableEdit.redo.textAndMnemonic=Wiederherstellen
 
 ############ Combo Box Strings ############
@@ -173,12 +173,12 @@ ComboBox.togglePopup.textAndMnemonic=togglePopup
 ProgressMonitor.progress.textAndMnemonic=Fortschritt...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=linke Schaltfl\u00E4che
-SplitPane.rightButton.textAndMnemonic=rechte Schaltfl\u00E4che
+SplitPane.leftButton.textAndMnemonic=linke Schaltfläche
+SplitPane.rightButton.textAndMnemonic=rechte Schaltfläche
 # Used for Isindex
-IsindexView.prompt=Dieser Index kann durchsucht werden. Geben Sie Schl\u00FCsselw\u00F6rter f\u00FCr die Suche ein:
+IsindexView.prompt=Dieser Index kann durchsucht werden. Geben Sie Schlüsselwörter für die Suche ein:
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=Als Symbol darstellen
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximieren
-InternalFrameTitlePane.closeButtonAccessibleName=Schlie\u00DFen
+InternalFrameTitlePane.closeButtonAccessibleName=Schließen
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_es.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_es.properties
index 837c074d882..e70dfa64dc1 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_es.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_es.properties
@@ -36,9 +36,9 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=Archivo Gen\u00E9rico
+FileChooser.fileDescription.textAndMnemonic=Archivo Genérico
 FileChooser.directoryDescription.textAndMnemonic=Directorio
-FileChooser.newFolderError.textAndMnemonic=Se ha producido un error durante la creaci\u00F3n de carpetas
+FileChooser.newFolderError.textAndMnemonic=Se ha producido un error durante la creación de carpetas
 FileChooser.newFolderErrorSeparator= :
 FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos
 FileChooser.cancelButton.textAndMnemonic=Cancelar
@@ -69,16 +69,16 @@ FileChooser.filesOfTypeLabel.textAndMnemonic=Formato de Archivo:
 
 FileChooser.desktopName=Escritorio
 FileChooser.newFolderPrompt.textAndMnemonic=Nombre de la Nueva Carpeta:
-FileChooser.untitledFolderName=carpeta sin t\u00EDtulo
-FileChooser.untitledFileName=sin t\u00EDtulo
+FileChooser.untitledFolderName=carpeta sin título
+FileChooser.untitledFileName=sin título
 FileChooser.createButton.textAndMnemonic=Crear
 
-FileChooser.byDate.textAndMnemonic=Fecha de Modificaci\u00F3n
+FileChooser.byDate.textAndMnemonic=Fecha de Modificación
 FileChooser.by.textAndMnemonic=Nombre
 FileChooser.newFolderAccessibleName=Nueva Carpeta
 
-FileChooser.mac.newFolder=carpeta sin t\u00EDtulo
-FileChooser.mac.newFolder.subsequent=carpeta sin t\u00EDtulo {0}
+FileChooser.mac.newFolder=carpeta sin título
+FileChooser.mac.newFolder.subsequent=carpeta sin título {0}
 
 
 ############ COLOR CHOOSER STRINGS #############
@@ -104,11 +104,11 @@ ColorChooser.rgbBlue.textAndMnemonic=A&zul
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=&S\u00ED
+OptionPane.yesButton.textAndMnemonic=&Sí
 OptionPane.noButton.textAndMnemonic=&No
 OptionPane.okButton.textAndMnemonic=Aceptar
 OptionPane.cancelButton.textAndMnemonic=Cancelar
-OptionPane.title.textAndMnemonic=Seleccionar una Opci\u00F3n
+OptionPane.title.textAndMnemonic=Seleccionar una Opción
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
 OptionPane.inputDialog.titleAndMnemonic=Entrada
@@ -117,19 +117,19 @@ OptionPane.inputDialog.titleAndMnemonic=Entrada
 OptionPane.messageDialog.titleAndMnemonic=Mensaje
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=Impresi\u00F3n
-PrintingDialog.titleAborting.textAndMnemonic=Impresi\u00F3n (Abortando)
+PrintingDialog.titleProgress.textAndMnemonic=Impresión
+PrintingDialog.titleAborting.textAndMnemonic=Impresión (Abortando)
 
-PrintingDialog.contentInitial.textAndMnemonic=Impresi\u00F3n en curso...
+PrintingDialog.contentInitial.textAndMnemonic=Impresión en curso...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina {0} impresa...
+PrintingDialog.contentProgress.textAndMnemonic=Página {0} impresa...
 
-PrintingDialog.contentAborting.textAndMnemonic=Abortando la impresi\u00F3n...
+PrintingDialog.contentAborting.textAndMnemonic=Abortando la impresión...
 
 PrintingDialog.abortButton.textAndMnemonic=&Abortar
-PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impresi\u00F3n
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impresión
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimizar
@@ -140,7 +140,7 @@ InternalFrame.closeButtonToolTip=Cerrar
 ############ Internal Frame Title Pane Strings ############
 InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
 InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
-InternalFrameTitlePane.sizeButton.textAndMnemonic=Tama\u00F1o
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Tamaño
 InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
 InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
 InternalFrameTitlePane.closeButton.textAndMnemonic=Cerrar
@@ -153,8 +153,8 @@ FormView.browseFileButton.textAndMnemonic=Examinar...
 
 ############ Abstract Document Strings ############
 AbstractDocument.styleChange.textAndMnemonic=cambio de estilo
-AbstractDocument.addition.textAndMnemonic=adici\u00F3n
-AbstractDocument.deletion.textAndMnemonic=supresi\u00F3n
+AbstractDocument.addition.textAndMnemonic=adición
+AbstractDocument.deletion.textAndMnemonic=supresión
 AbstractDocument.undo.textAndMnemonic=Deshacer
 AbstractDocument.redo.textAndMnemonic=Rehacer
 
@@ -172,10 +172,10 @@ ComboBox.togglePopup.textAndMnemonic=togglePopup
 ProgressMonitor.progress.textAndMnemonic=Progreso...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=bot\u00F3n: izquierda
-SplitPane.rightButton.textAndMnemonic=bot\u00F3n: derecha
+SplitPane.leftButton.textAndMnemonic=botón: izquierda
+SplitPane.rightButton.textAndMnemonic=botón: derecha
 # Used for Isindex
-IsindexView.prompt=En este \u00EDndice se pueden efectuar b\u00FAsquedas. Escriba las palabras clave de b\u00FAsqueda:
+IsindexView.prompt=En este índice se pueden efectuar búsquedas. Escriba las palabras clave de búsqueda:
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=Convertir en Icono
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_fr.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_fr.properties
index 7ce989138cf..8340ac7d101 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_fr.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_fr.properties
@@ -36,9 +36,9 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=Fichier g\u00E9n\u00E9rique
-FileChooser.directoryDescription.textAndMnemonic=R\u00E9pertoire
-FileChooser.newFolderError.textAndMnemonic=Erreur lors de la cr\u00E9ation du dossier
+FileChooser.fileDescription.textAndMnemonic=Fichier générique
+FileChooser.directoryDescription.textAndMnemonic=Répertoire
+FileChooser.newFolderError.textAndMnemonic=Erreur lors de la création du dossier
 FileChooser.newFolderErrorSeparator= :
 FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
 FileChooser.cancelButton.textAndMnemonic=Annuler
@@ -46,7 +46,7 @@ FileChooser.saveButton.textAndMnemonic=Enregistrer
 FileChooser.openButton.textAndMnemonic=Ouvrir
 FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
 FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
-FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jour
+FileChooser.updateButton.textAndMnemonic=Mettre à jour
 FileChooser.helpButton.textAndMnemonic=Aide
 FileChooser.directoryOpenButton.textAndMnemonic=Ouvrir
 
@@ -58,7 +58,7 @@ FileChooser.fileSizeGigaBytes={0} GB
 # Mac-specific strings
 FileChooser.saveTitle.textAndMnemonic=Enregistrer
 FileChooser.openTitle.textAndMnemonic=Ouvrir
-FileChooser.newFolderExistsError.textAndMnemonic=Ce nom est d\u00E9j\u00E0 utilis\u00E9
+FileChooser.newFolderExistsError.textAndMnemonic=Ce nom est déjà utilisé
 FileChooser.chooseButton.textAndMnemonic=Choisir
 
 FileChooser.newFolderButton.textAndMnemonic=Nouveau dossier
@@ -71,7 +71,7 @@ FileChooser.desktopName=Bureau
 FileChooser.newFolderPrompt.textAndMnemonic=Nom du nouveau dossier :
 FileChooser.untitledFolderName=dossier sans titre
 FileChooser.untitledFileName=sans titre
-FileChooser.createButton.textAndMnemonic=Cr\u00E9er
+FileChooser.createButton.textAndMnemonic=Créer
 
 FileChooser.byDate.textAndMnemonic=Date de modification
 FileChooser.by.textAndMnemonic=Nom
@@ -82,10 +82,10 @@ FileChooser.mac.newFolder.subsequent=dossier {0} sans titre
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=Aper\u00E7u
+ColorChooser.preview.textAndMnemonic=Aperçu
 ColorChooser.ok.textAndMnemonic=OK
 ColorChooser.cancel.textAndMnemonic=Annuler
-ColorChooser.reset.textAndMnemonic=&R\u00E9initialiser
+ColorChooser.reset.textAndMnemonic=&Réinitialiser
 ColorChooser.sample.textAndMnemonic=Echantillon de texte  Echantillon de texte
 ColorChooser.swatches.textAndMnemonic=&Echantillons
 ColorChooser.swatchesRecent.textAndMnemonic=Dernier :
@@ -108,10 +108,10 @@ OptionPane.yesButton.textAndMnemonic=&Oui
 OptionPane.noButton.textAndMnemonic=&Non
 OptionPane.okButton.textAndMnemonic=OK
 OptionPane.cancelButton.textAndMnemonic=Annuler
-OptionPane.title.textAndMnemonic=S\u00E9lectionner une option
+OptionPane.title.textAndMnemonic=Sélectionner une option
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=Entr\u00E9e
+OptionPane.inputDialog.titleAndMnemonic=Entrée
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
 OptionPane.messageDialog.titleAndMnemonic=Message
@@ -124,7 +124,7 @@ PrintingDialog.contentInitial.textAndMnemonic=Impression en cours...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=Page {0} imprim\u00E9e...
+PrintingDialog.contentProgress.textAndMnemonic=Page {0} imprimée...
 
 PrintingDialog.contentAborting.textAndMnemonic=Abandon de l'impression...
 
@@ -132,23 +132,23 @@ PrintingDialog.abortButton.textAndMnemonic=&Abandonner
 PrintingDialog.abortButtonToolTip.textAndMnemonic=Abandonner l'impression
 
 ############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=R\u00E9duire
+InternalFrame.iconButtonToolTip=Réduire
 InternalFrame.maxButtonToolTip=Agrandir
 InternalFrame.restoreButtonToolTip=Restaurer
 InternalFrame.closeButtonToolTip=Fermer
 
 ############ Internal Frame Title Pane Strings ############
 InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurer
-InternalFrameTitlePane.moveButton.textAndMnemonic=D\u00E9placer
+InternalFrameTitlePane.moveButton.textAndMnemonic=Déplacer
 InternalFrameTitlePane.sizeButton.textAndMnemonic=Taille
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=R\u00E9duire
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Réduire
 InternalFrameTitlePane.maximizeButton.textAndMnemonic=Agrandir
 InternalFrameTitlePane.closeButton.textAndMnemonic=Fermer
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButton.textAndMnemonic=Soumettre la requ\u00EAte
-FormView.resetButton.textAndMnemonic=R\u00E9initialiser
+FormView.submitButton.textAndMnemonic=Soumettre la requête
+FormView.resetButton.textAndMnemonic=Réinitialiser
 FormView.browseFileButton.textAndMnemonic=Parcourir...
 
 ############ Abstract Document Strings ############
@@ -156,14 +156,14 @@ AbstractDocument.styleChange.textAndMnemonic=modification de style
 AbstractDocument.addition.textAndMnemonic=ajout
 AbstractDocument.deletion.textAndMnemonic=suppression
 AbstractDocument.undo.textAndMnemonic=Annuler
-AbstractDocument.redo.textAndMnemonic=R\u00E9tablir
+AbstractDocument.redo.textAndMnemonic=Rétablir
 
 ############ Abstract Button Strings ############
 AbstractButton.click.textAndMnemonic=cliquer
 
 ############ Abstract Undoable Edit Strings ############
 AbstractUndoableEdit.undo.textAndMnemonic=Annuler
-AbstractUndoableEdit.redo.textAndMnemonic=R\u00E9tablir
+AbstractUndoableEdit.redo.textAndMnemonic=Rétablir
 
 ############ Combo Box Strings ############
 ComboBox.togglePopup.textAndMnemonic=togglePopup
@@ -175,9 +175,9 @@ ProgressMonitor.progress.textAndMnemonic=Progression...
 SplitPane.leftButton.textAndMnemonic=bouton gauche
 SplitPane.rightButton.textAndMnemonic=bouton droit
 # Used for Isindex
-IsindexView.prompt=Ceci est un index de recherche. Tapez des mots-cl\u00E9s pour la recherche :
+IsindexView.prompt=Ceci est un index de recherche. Tapez des mots-clés pour la recherche :
 
 ############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=R\u00E9duire
+InternalFrameTitlePane.iconifyButtonAccessibleName=Réduire
 InternalFrameTitlePane.maximizeButtonAccessibleName=Agrandir
 InternalFrameTitlePane.closeButtonAccessibleName=Fermer
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_it.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_it.properties
index 29805e5fe10..c7af7518e13 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_it.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_it.properties
@@ -38,7 +38,7 @@
 ############ FILE CHOOSER STRINGS #############
 FileChooser.fileDescription.textAndMnemonic=File generico
 FileChooser.directoryDescription.textAndMnemonic=Directory
-FileChooser.newFolderError.textAndMnemonic=Si \u00E8 verificato un errore durante la creazione della cartella
+FileChooser.newFolderError.textAndMnemonic=Si è verificato un errore durante la creazione della cartella
 FileChooser.newFolderErrorSeparator= :
 FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file
 FileChooser.cancelButton.textAndMnemonic=Annulla
@@ -58,7 +58,7 @@ FileChooser.fileSizeGigaBytes={0} GB
 # Mac-specific strings
 FileChooser.saveTitle.textAndMnemonic=Salva
 FileChooser.openTitle.textAndMnemonic=Apri
-FileChooser.newFolderExistsError.textAndMnemonic=Il nome \u00E8 gi\u00E0 stato assegnato
+FileChooser.newFolderExistsError.textAndMnemonic=Il nome è già stato assegnato
 FileChooser.chooseButton.textAndMnemonic=Scegli
 
 FileChooser.newFolderButton.textAndMnemonic=Nuova cartella
@@ -104,7 +104,7 @@ ColorChooser.rgbBlue.textAndMnemonic=&Blu
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=&S\u00EC
+OptionPane.yesButton.textAndMnemonic=&Sì
 OptionPane.noButton.textAndMnemonic=&No
 OptionPane.okButton.textAndMnemonic=OK
 OptionPane.cancelButton.textAndMnemonic=Annulla
@@ -175,7 +175,7 @@ ProgressMonitor.progress.textAndMnemonic=In corso...
 SplitPane.leftButton.textAndMnemonic=pulsante sinistro
 SplitPane.rightButton.textAndMnemonic=pulsante destro
 # Used for Isindex
-IsindexView.prompt=Questo \u00E8 un indice di ricerca. Immettere le parole chiave:
+IsindexView.prompt=Questo è un indice di ricerca. Immettere le parole chiave:
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=Riduci a icona
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ja.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ja.properties
index 14734183b69..699b88fce87 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ja.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ja.properties
@@ -36,19 +36,19 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB
-FileChooser.directoryDescription.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
-FileChooser.newFolderError.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+FileChooser.fileDescription.textAndMnemonic=汎用ファイル
+FileChooser.directoryDescription.textAndMnemonic=ディレクトリ
+FileChooser.newFolderError.textAndMnemonic=フォルダの作成中にエラーが発生しました
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
-FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openButton.textAndMnemonic=\u958B\u304F
-FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
-FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
-FileChooser.helpButton.textAndMnemonic=\u30D8\u30EB\u30D7
-FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u304F
+FileChooser.acceptAllFileFilter.textAndMnemonic=すべてのファイル
+FileChooser.cancelButton.textAndMnemonic=取消
+FileChooser.saveButton.textAndMnemonic=保存
+FileChooser.openButton.textAndMnemonic=開く
+FileChooser.saveDialogTitle.textAndMnemonic=保存
+FileChooser.openDialogTitle.textAndMnemonic=開く
+FileChooser.updateButton.textAndMnemonic=更新
+FileChooser.helpButton.textAndMnemonic=ヘルプ
+FileChooser.directoryOpenButton.textAndMnemonic=開く
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -56,40 +56,40 @@ FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
 # Mac-specific strings
-FileChooser.saveTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openTitle.textAndMnemonic=\u958B\u304F
-FileChooser.newFolderExistsError.textAndMnemonic=\u305D\u306E\u540D\u524D\u306F\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
-FileChooser.chooseButton.textAndMnemonic=\u9078\u629E
-FileChooser.chooseButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u307E\u3059
+FileChooser.saveTitle.textAndMnemonic=保存
+FileChooser.openTitle.textAndMnemonic=開く
+FileChooser.newFolderExistsError.textAndMnemonic=その名前はすでに使用されています
+FileChooser.chooseButton.textAndMnemonic=選択
+FileChooser.chooseButtonToolTip.textAndMnemonic=選択したファイルを選択します
 
-FileChooser.newFolderButton.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.newFolderTitle.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB:
-FileChooser.saveDialogFileNameLabel.textAndMnemonic=\u5225\u540D\u4FDD\u5B58:
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F:
+FileChooser.newFolderButton.textAndMnemonic=新規フォルダ
+FileChooser.newFolderTitle.textAndMnemonic=新規フォルダ
+FileChooser.fileNameLabel.textAndMnemonic=ファイル:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=別名保存:
+FileChooser.filesOfTypeLabel.textAndMnemonic=ファイル形式:
 
-FileChooser.desktopName=\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7
-FileChooser.newFolderPrompt.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D:
-FileChooser.untitledFolderName=\u7121\u984C\u306E\u30D5\u30A9\u30EB\u30C0
-FileChooser.untitledFileName=\u7121\u984C
-FileChooser.createButton.textAndMnemonic=\u4F5C\u6210
+FileChooser.desktopName=デスクトップ
+FileChooser.newFolderPrompt.textAndMnemonic=新規フォルダの名前:
+FileChooser.untitledFolderName=無題のフォルダ
+FileChooser.untitledFileName=無題
+FileChooser.createButton.textAndMnemonic=作成
 
-FileChooser.byDate.textAndMnemonic=\u5909\u66F4\u65E5
-FileChooser.by.textAndMnemonic=\u540D\u524D
-FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.byDate.textAndMnemonic=変更日
+FileChooser.by.textAndMnemonic=名前
+FileChooser.newFolderAccessibleName=新規フォルダ
 
-FileChooser.mac.newFolder=\u7121\u984C\u306E\u30D5\u30A9\u30EB\u30C0
-FileChooser.mac.newFolder.subsequent=\u7121\u984C\u306E\u30D5\u30A9\u30EB\u30C0{0}
+FileChooser.mac.newFolder=無題のフォルダ
+FileChooser.mac.newFolder.subsequent=無題のフォルダ{0}
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=\u30D7\u30EC\u30D3\u30E5\u30FC
+ColorChooser.preview.textAndMnemonic=プレビュー
 ColorChooser.ok.textAndMnemonic=OK
-ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
-ColorChooser.reset.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8(&R)
-ColorChooser.sample.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8  \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8
-ColorChooser.swatches.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB(&S)
-ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0:
+ColorChooser.cancel.textAndMnemonic=取消
+ColorChooser.reset.textAndMnemonic=リセット(&R)
+ColorChooser.sample.textAndMnemonic=サンプル・テキスト  サンプル・テキスト
+ColorChooser.swatches.textAndMnemonic=サンプル(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=最新:
 ColorChooser.hsb.textAndMnemonic=HSB(&H)
 ColorChooser.hsbHue.textAndMnemonic=H
 ColorChooser.hsbSaturation.textAndMnemonic=S
@@ -98,87 +98,87 @@ ColorChooser.hsbRed.textAndMnemonic=R
 ColorChooser.hsbGreen.textAndMnemonic=G
 ColorChooser.hsbBlue.textAndMnemonic=B
 ColorChooser.rgb.textAndMnemonic=RGB(&G)
-ColorChooser.rgbRed.textAndMnemonic=\u8D64(&D)
-ColorChooser.rgbGreen.textAndMnemonic=\u7DD1(&N)
-ColorChooser.rgbBlue.textAndMnemonic=\u9752(&B)
+ColorChooser.rgbRed.textAndMnemonic=赤(&D)
+ColorChooser.rgbGreen.textAndMnemonic=緑(&N)
+ColorChooser.rgbBlue.textAndMnemonic=青(&B)
 
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=\u306F\u3044(&Y)
-OptionPane.noButton.textAndMnemonic=\u3044\u3044\u3048(&N)
+OptionPane.yesButton.textAndMnemonic=はい(&Y)
+OptionPane.noButton.textAndMnemonic=いいえ(&N)
 OptionPane.okButton.textAndMnemonic=OK
-OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
-OptionPane.title.textAndMnemonic=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
+OptionPane.cancelButton.textAndMnemonic=取消
+OptionPane.title.textAndMnemonic=オプションの選択
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=\u5165\u529B
+OptionPane.inputDialog.titleAndMnemonic=入力
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=\u30E1\u30C3\u30BB\u30FC\u30B8
+OptionPane.messageDialog.titleAndMnemonic=メッセージ
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=\u5370\u5237\u3057\u3066\u3044\u307E\u3059
-PrintingDialog.titleAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059
+PrintingDialog.titleProgress.textAndMnemonic=印刷しています
+PrintingDialog.titleAborting.textAndMnemonic=印刷を中止しています
 
-PrintingDialog.contentInitial.textAndMnemonic=\u5370\u5237\u4E2D...
+PrintingDialog.contentInitial.textAndMnemonic=印刷中...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F...
+PrintingDialog.contentProgress.textAndMnemonic=ページ{0}を印刷しました...
 
-PrintingDialog.contentAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059...
+PrintingDialog.contentAborting.textAndMnemonic=印刷を中止しています...
 
-PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
-PrintingDialog.abortButtonToolTip.textAndMnemonic=\u5370\u5237\u306E\u4E2D\u6B62
+PrintingDialog.abortButton.textAndMnemonic=中止(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=印刷の中止
 
 ############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
-InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
-InternalFrame.restoreButtonToolTip=\u5FA9\u5143
-InternalFrame.closeButtonToolTip=\u9589\u3058\u308B
+InternalFrame.iconButtonToolTip=最小化
+InternalFrame.maxButtonToolTip=最大化
+InternalFrame.restoreButtonToolTip=復元
+InternalFrame.closeButtonToolTip=閉じる
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u5143
-InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
-InternalFrameTitlePane.sizeButton.textAndMnemonic=\u30B5\u30A4\u30BA
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButton.textAndMnemonic=\u9589\u3058\u308B
+InternalFrameTitlePane.restoreButton.textAndMnemonic=復元
+InternalFrameTitlePane.moveButton.textAndMnemonic=移動
+InternalFrameTitlePane.sizeButton.textAndMnemonic=サイズ
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=最小化
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=最大化
+InternalFrameTitlePane.closeButton.textAndMnemonic=閉じる
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButton.textAndMnemonic=\u554F\u5408\u305B\u306E\u5B9F\u884C
-FormView.resetButton.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8
-FormView.browseFileButton.textAndMnemonic=\u53C2\u7167...
+FormView.submitButton.textAndMnemonic=問合せの実行
+FormView.resetButton.textAndMnemonic=リセット
+FormView.browseFileButton.textAndMnemonic=参照...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4
-AbstractDocument.addition.textAndMnemonic=\u8FFD\u52A0
-AbstractDocument.deletion.textAndMnemonic=\u524A\u9664
-AbstractDocument.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
-AbstractDocument.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
+AbstractDocument.styleChange.textAndMnemonic=スタイル変更
+AbstractDocument.addition.textAndMnemonic=追加
+AbstractDocument.deletion.textAndMnemonic=削除
+AbstractDocument.undo.textAndMnemonic=元に戻す
+AbstractDocument.redo.textAndMnemonic=やり直し
 
 ############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=\u30AF\u30EA\u30C3\u30AF
+AbstractButton.click.textAndMnemonic=クリック
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
-AbstractUndoableEdit.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
+AbstractUndoableEdit.undo.textAndMnemonic=元に戻す
+AbstractUndoableEdit.redo.textAndMnemonic=やり直し
 
 ############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7
+ComboBox.togglePopup.textAndMnemonic=トグル・ポップアップ
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=\u9032\u884C\u4E2D...
+ProgressMonitor.progress.textAndMnemonic=進行中...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=\u5DE6\u30DC\u30BF\u30F3
-SplitPane.rightButton.textAndMnemonic=\u53F3\u30DC\u30BF\u30F3
+SplitPane.leftButton.textAndMnemonic=左ボタン
+SplitPane.rightButton.textAndMnemonic=右ボタン
 # Used for Isindex
-IsindexView.prompt=\u691C\u7D22\u7528\u306E\u7D22\u5F15\u3067\u3059\u3002\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:
+IsindexView.prompt=検索用の索引です。検索するキーワードを入力してください:
 
 ############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=\u30A2\u30A4\u30B3\u30F3\u5316
-InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonAccessibleName=\u9589\u3058\u308B
+InternalFrameTitlePane.iconifyButtonAccessibleName=アイコン化
+InternalFrameTitlePane.maximizeButtonAccessibleName=最大化
+InternalFrameTitlePane.closeButtonAccessibleName=閉じる
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ko.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ko.properties
index 597b5b636f3..9795bc0f8cb 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ko.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_ko.properties
@@ -36,19 +36,19 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\uC77C\uBC18 \uD30C\uC77C
-FileChooser.directoryDescription.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC
-FileChooser.newFolderError.textAndMnemonic=\uD3F4\uB354 \uC0DD\uC131 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+FileChooser.fileDescription.textAndMnemonic=일반 파일
+FileChooser.directoryDescription.textAndMnemonic=디렉토리
+FileChooser.newFolderError.textAndMnemonic=폴더 생성 중 오류가 발생했습니다.
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C
-FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C
-FileChooser.saveButton.textAndMnemonic=\uC800\uC7A5
-FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30
-FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
-FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
-FileChooser.updateButton.textAndMnemonic=\uC5C5\uB370\uC774\uD2B8
-FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0
-FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30
+FileChooser.acceptAllFileFilter.textAndMnemonic=모든 파일
+FileChooser.cancelButton.textAndMnemonic=취소
+FileChooser.saveButton.textAndMnemonic=저장
+FileChooser.openButton.textAndMnemonic=열기
+FileChooser.saveDialogTitle.textAndMnemonic=저장
+FileChooser.openDialogTitle.textAndMnemonic=열기
+FileChooser.updateButton.textAndMnemonic=업데이트
+FileChooser.helpButton.textAndMnemonic=도움말
+FileChooser.directoryOpenButton.textAndMnemonic=열기
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -56,39 +56,39 @@ FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
 # Mac-specific strings
-FileChooser.saveTitle.textAndMnemonic=\uC800\uC7A5
-FileChooser.openTitle.textAndMnemonic=\uC5F4\uAE30
-FileChooser.newFolderExistsError.textAndMnemonic=\uD574\uB2F9 \uC774\uB984\uC740 \uC774\uBBF8 \uC0AC\uC6A9 \uC911\uC785\uB2C8\uB2E4.
-FileChooser.chooseButton.textAndMnemonic=\uC120\uD0DD
+FileChooser.saveTitle.textAndMnemonic=저장
+FileChooser.openTitle.textAndMnemonic=열기
+FileChooser.newFolderExistsError.textAndMnemonic=해당 이름은 이미 사용 중입니다.
+FileChooser.chooseButton.textAndMnemonic=선택
 
-FileChooser.newFolderButton.textAndMnemonic=\uC0C8 \uD3F4\uB354
-FileChooser.newFolderTitle.textAndMnemonic=\uC0C8 \uD3F4\uB354
-FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C:
-FileChooser.saveDialogFileNameLabel.textAndMnemonic=\uB2E4\uB978 \uC774\uB984\uC73C\uB85C \uC800\uC7A5:
-FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uD615\uC2DD:
+FileChooser.newFolderButton.textAndMnemonic=새 폴더
+FileChooser.newFolderTitle.textAndMnemonic=새 폴더
+FileChooser.fileNameLabel.textAndMnemonic=파일:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=다른 이름으로 저장:
+FileChooser.filesOfTypeLabel.textAndMnemonic=파일 형식:
 
-FileChooser.desktopName=\uB370\uC2A4\uD06C\uD1B1
-FileChooser.newFolderPrompt.textAndMnemonic=\uC0C8 \uD3F4\uB354\uC758 \uC774\uB984:
-FileChooser.untitledFolderName=\uC81C\uBAA9 \uC5C6\uB294 \uD3F4\uB354
-FileChooser.untitledFileName=\uC81C\uBAA9 \uC5C6\uC74C
-FileChooser.createButton.textAndMnemonic=\uC0DD\uC131
+FileChooser.desktopName=데스크톱
+FileChooser.newFolderPrompt.textAndMnemonic=새 폴더의 이름:
+FileChooser.untitledFolderName=제목 없는 폴더
+FileChooser.untitledFileName=제목 없음
+FileChooser.createButton.textAndMnemonic=생성
 
-FileChooser.byDate.textAndMnemonic=\uC218\uC815\uB41C \uB0A0\uC9DC
-FileChooser.by.textAndMnemonic=\uC774\uB984
-FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
+FileChooser.byDate.textAndMnemonic=수정된 날짜
+FileChooser.by.textAndMnemonic=이름
+FileChooser.newFolderAccessibleName=새 폴더
 
-FileChooser.mac.newFolder=\uC81C\uBAA9 \uC5C6\uB294 \uD3F4\uB354
-FileChooser.mac.newFolder.subsequent=\uC81C\uBAA9 \uC5C6\uB294 \uD3F4\uB354 {0}
+FileChooser.mac.newFolder=제목 없는 폴더
+FileChooser.mac.newFolder.subsequent=제목 없는 폴더 {0}
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=\uBBF8\uB9AC\uBCF4\uAE30
-ColorChooser.ok.textAndMnemonic=\uD655\uC778
-ColorChooser.cancel.textAndMnemonic=\uCDE8\uC18C
-ColorChooser.reset.textAndMnemonic=\uC7AC\uC124\uC815(&R)
-ColorChooser.sample.textAndMnemonic=\uC0D8\uD50C \uD14D\uC2A4\uD2B8  \uC0D8\uD50C \uD14D\uC2A4\uD2B8
-ColorChooser.swatches.textAndMnemonic=\uACAC\uBCF8(&S)
-ColorChooser.swatchesRecent.textAndMnemonic=\uCD5C\uADFC \uBAA9\uB85D:
+ColorChooser.preview.textAndMnemonic=미리보기
+ColorChooser.ok.textAndMnemonic=확인
+ColorChooser.cancel.textAndMnemonic=취소
+ColorChooser.reset.textAndMnemonic=재설정(&R)
+ColorChooser.sample.textAndMnemonic=샘플 텍스트  샘플 텍스트
+ColorChooser.swatches.textAndMnemonic=견본(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=최근 목록:
 ColorChooser.hsb.textAndMnemonic=HSB(&H)
 ColorChooser.hsbHue.textAndMnemonic=H
 ColorChooser.hsbSaturation.textAndMnemonic=S
@@ -97,87 +97,87 @@ ColorChooser.hsbRed.textAndMnemonic=R
 ColorChooser.hsbGreen.textAndMnemonic=G
 ColorChooser.hsbBlue.textAndMnemonic=B
 ColorChooser.rgb.textAndMnemonic=RGB(&G)
-ColorChooser.rgbRed.textAndMnemonic=\uBE68\uAC04\uC0C9(&D)
-ColorChooser.rgbGreen.textAndMnemonic=\uB179\uC0C9(&N)
-ColorChooser.rgbBlue.textAndMnemonic=\uD30C\uB780\uC0C9(&B)
+ColorChooser.rgbRed.textAndMnemonic=빨간색(&D)
+ColorChooser.rgbGreen.textAndMnemonic=녹색(&N)
+ColorChooser.rgbBlue.textAndMnemonic=파란색(&B)
 
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=\uC608(&Y)
-OptionPane.noButton.textAndMnemonic=\uC544\uB2C8\uC624(&N)
-OptionPane.okButton.textAndMnemonic=\uD655\uC778
-OptionPane.cancelButton.textAndMnemonic=\uCDE8\uC18C
-OptionPane.title.textAndMnemonic=\uC635\uC158 \uC120\uD0DD
+OptionPane.yesButton.textAndMnemonic=예(&Y)
+OptionPane.noButton.textAndMnemonic=아니오(&N)
+OptionPane.okButton.textAndMnemonic=확인
+OptionPane.cancelButton.textAndMnemonic=취소
+OptionPane.title.textAndMnemonic=옵션 선택
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=\uC785\uB825
+OptionPane.inputDialog.titleAndMnemonic=입력
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=\uBA54\uC2DC\uC9C0
+OptionPane.messageDialog.titleAndMnemonic=메시지
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=\uC778\uC1C4
-PrintingDialog.titleAborting.textAndMnemonic=\uC778\uC1C4(\uC911\uB2E8 \uC911)
+PrintingDialog.titleProgress.textAndMnemonic=인쇄
+PrintingDialog.titleAborting.textAndMnemonic=인쇄(중단 중)
 
-PrintingDialog.contentInitial.textAndMnemonic=\uC778\uC1C4 \uC9C4\uD589 \uC911...
+PrintingDialog.contentInitial.textAndMnemonic=인쇄 진행 중...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}...
+PrintingDialog.contentProgress.textAndMnemonic=인쇄된 페이지 {0}...
 
-PrintingDialog.contentAborting.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8 \uC911...
+PrintingDialog.contentAborting.textAndMnemonic=인쇄 중단 중...
 
-PrintingDialog.abortButton.textAndMnemonic=\uC911\uB2E8(&A)
-PrintingDialog.abortButtonToolTip.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8
+PrintingDialog.abortButton.textAndMnemonic=중단(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=인쇄 중단
 
 ############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=\uCD5C\uC18C\uD654
-InternalFrame.maxButtonToolTip=\uCD5C\uB300\uD654
-InternalFrame.restoreButtonToolTip=\uBCF5\uC6D0
-InternalFrame.closeButtonToolTip=\uB2EB\uAE30
+InternalFrame.iconButtonToolTip=최소화
+InternalFrame.maxButtonToolTip=최대화
+InternalFrame.restoreButtonToolTip=복원
+InternalFrame.closeButtonToolTip=닫기
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\uBCF5\uC6D0
-InternalFrameTitlePane.moveButton.textAndMnemonic=\uC774\uB3D9
-InternalFrameTitlePane.sizeButton.textAndMnemonic=\uD06C\uAE30
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=\uCD5C\uC18C\uD654
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=\uCD5C\uB300\uD654
-InternalFrameTitlePane.closeButton.textAndMnemonic=\uB2EB\uAE30
+InternalFrameTitlePane.restoreButton.textAndMnemonic=복원
+InternalFrameTitlePane.moveButton.textAndMnemonic=이동
+InternalFrameTitlePane.sizeButton.textAndMnemonic=크기
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=최소화
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=최대화
+InternalFrameTitlePane.closeButton.textAndMnemonic=닫기
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButton.textAndMnemonic=\uC9C8\uC758 \uC81C\uCD9C
-FormView.resetButton.textAndMnemonic=\uC7AC\uC124\uC815
-FormView.browseFileButton.textAndMnemonic=\uCC3E\uC544\uBCF4\uAE30...
+FormView.submitButton.textAndMnemonic=질의 제출
+FormView.resetButton.textAndMnemonic=재설정
+FormView.browseFileButton.textAndMnemonic=찾아보기...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=\uC2A4\uD0C0\uC77C \uBCC0\uACBD
-AbstractDocument.addition.textAndMnemonic=\uCD94\uAC00
-AbstractDocument.deletion.textAndMnemonic=\uC0AD\uC81C
-AbstractDocument.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
-AbstractDocument.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
+AbstractDocument.styleChange.textAndMnemonic=스타일 변경
+AbstractDocument.addition.textAndMnemonic=추가
+AbstractDocument.deletion.textAndMnemonic=삭제
+AbstractDocument.undo.textAndMnemonic=실행 취소
+AbstractDocument.redo.textAndMnemonic=재실행
 
 ############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=\uB204\uB974\uAE30
+AbstractButton.click.textAndMnemonic=누르기
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
-AbstractUndoableEdit.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
+AbstractUndoableEdit.undo.textAndMnemonic=실행 취소
+AbstractUndoableEdit.redo.textAndMnemonic=재실행
 
 ############ Combo Box Strings ############
 ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=\uC9C4\uD589...
+ProgressMonitor.progress.textAndMnemonic=진행...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=\uC67C\uCABD \uB2E8\uCD94
-SplitPane.rightButton.textAndMnemonic=\uC624\uB978\uCABD \uB2E8\uCD94
+SplitPane.leftButton.textAndMnemonic=왼쪽 단추
+SplitPane.rightButton.textAndMnemonic=오른쪽 단추
 # Used for Isindex
-IsindexView.prompt=\uB2E4\uC74C\uC740 \uAC80\uC0C9 \uAC00\uB2A5\uD55C \uC778\uB371\uC2A4\uC785\uB2C8\uB2E4. \uAC80\uC0C9 \uD0A4\uC6CC\uB4DC \uC785\uB825:
+IsindexView.prompt=다음은 검색 가능한 인덱스입니다. 검색 키워드 입력:
 
 ############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=\uC544\uC774\uCF58\uD654
-InternalFrameTitlePane.maximizeButtonAccessibleName=\uCD5C\uB300\uD654
-InternalFrameTitlePane.closeButtonAccessibleName=\uB2EB\uAE30
+InternalFrameTitlePane.iconifyButtonAccessibleName=아이콘화
+InternalFrameTitlePane.maximizeButtonAccessibleName=최대화
+InternalFrameTitlePane.closeButtonAccessibleName=닫기
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties
index 5a2d021eb48..a42fed2b6f3 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties
@@ -36,9 +36,9 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=Arquivo Gen\u00E9rico
-FileChooser.directoryDescription.textAndMnemonic=Diret\u00F3rio
-FileChooser.newFolderError.textAndMnemonic=Ocorreu um erro durante a cria\u00E7\u00E3o da pasta
+FileChooser.fileDescription.textAndMnemonic=Arquivo Genérico
+FileChooser.directoryDescription.textAndMnemonic=Diretório
+FileChooser.newFolderError.textAndMnemonic=Ocorreu um erro durante a criação da pasta
 FileChooser.newFolderErrorSeparator= :
 FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos
 FileChooser.cancelButton.textAndMnemonic=Cancelar
@@ -58,7 +58,7 @@ FileChooser.fileSizeGigaBytes={0} GB
 # Mac-specific strings
 FileChooser.saveTitle.textAndMnemonic=Salvar
 FileChooser.openTitle.textAndMnemonic=Abrir
-FileChooser.newFolderExistsError.textAndMnemonic=Este nome j\u00E1 foi utilizado
+FileChooser.newFolderExistsError.textAndMnemonic=Este nome já foi utilizado
 FileChooser.chooseButton.textAndMnemonic=Escolher
 
 FileChooser.newFolderButton.textAndMnemonic=Nova Pasta
@@ -67,18 +67,18 @@ FileChooser.fileNameLabel.textAndMnemonic=Arquivo:
 FileChooser.saveDialogFileNameLabel.textAndMnemonic=Salvar como:
 FileChooser.filesOfTypeLabel.textAndMnemonic=Formato do Arquivo:
 
-FileChooser.desktopName=\u00C1rea de Trabalho
+FileChooser.desktopName=Área de Trabalho
 FileChooser.newFolderPrompt.textAndMnemonic=Nome da nova pasta:
-FileChooser.untitledFolderName=pasta sem t\u00EDtulo
-FileChooser.untitledFileName=sem t\u00EDtulo
+FileChooser.untitledFolderName=pasta sem título
+FileChooser.untitledFileName=sem título
 FileChooser.createButton.textAndMnemonic=Criar
 
-FileChooser.byDate.textAndMnemonic=Data da Modifica\u00E7\u00E3o
+FileChooser.byDate.textAndMnemonic=Data da Modificação
 FileChooser.by.textAndMnemonic=Nome
 FileChooser.newFolderAccessibleName=Nova Pasta
 
-FileChooser.mac.newFolder=pasta sem t\u00EDtulo
-FileChooser.mac.newFolder.subsequent=pasta sem t\u00EDtulo {0}
+FileChooser.mac.newFolder=pasta sem título
+FileChooser.mac.newFolder.subsequent=pasta sem título {0}
 
 
 ############ COLOR CHOOSER STRINGS #############
@@ -105,10 +105,10 @@ ColorChooser.rgbBlue.textAndMnemonic=&Azul
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
 OptionPane.yesButton.textAndMnemonic=&Sim
-OptionPane.noButton.textAndMnemonic=&N\u00E3o
+OptionPane.noButton.textAndMnemonic=&Não
 OptionPane.okButton.textAndMnemonic=OK
 OptionPane.cancelButton.textAndMnemonic=Cancelar
-OptionPane.title.textAndMnemonic=Selecionar uma Op\u00E7\u00E3o
+OptionPane.title.textAndMnemonic=Selecionar uma Opção
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
 OptionPane.inputDialog.titleAndMnemonic=Entrada
@@ -117,19 +117,19 @@ OptionPane.inputDialog.titleAndMnemonic=Entrada
 OptionPane.messageDialog.titleAndMnemonic=Mensagem
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=Impress\u00E3o
-PrintingDialog.titleAborting.textAndMnemonic=Impress\u00E3o (Abortando)
+PrintingDialog.titleProgress.textAndMnemonic=Impressão
+PrintingDialog.titleAborting.textAndMnemonic=Impressão (Abortando)
 
-PrintingDialog.contentInitial.textAndMnemonic=Impress\u00E3o em andamento...
+PrintingDialog.contentInitial.textAndMnemonic=Impressão em andamento...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impressa {0}...
+PrintingDialog.contentProgress.textAndMnemonic=Página impressa {0}...
 
-PrintingDialog.contentAborting.textAndMnemonic=Abortando impress\u00E3o...
+PrintingDialog.contentAborting.textAndMnemonic=Abortando impressão...
 
 PrintingDialog.abortButton.textAndMnemonic=&Abortar
-PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impress\u00E3o
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impressão
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimizar
@@ -152,9 +152,9 @@ FormView.resetButton.textAndMnemonic=Redefinir
 FormView.browseFileButton.textAndMnemonic=Procurar...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=altera\u00E7\u00E3o de estilo
-AbstractDocument.addition.textAndMnemonic=adi\u00E7\u00E3o
-AbstractDocument.deletion.textAndMnemonic=exclus\u00E3o
+AbstractDocument.styleChange.textAndMnemonic=alteração de estilo
+AbstractDocument.addition.textAndMnemonic=adição
+AbstractDocument.deletion.textAndMnemonic=exclusão
 AbstractDocument.undo.textAndMnemonic=Desfazer
 AbstractDocument.redo.textAndMnemonic=Refazer
 
@@ -172,10 +172,10 @@ ComboBox.togglePopup.textAndMnemonic=togglePopup
 ProgressMonitor.progress.textAndMnemonic=Andamento...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=bot\u00E3o esquerdo
-SplitPane.rightButton.textAndMnemonic=bot\u00E3o direito
+SplitPane.leftButton.textAndMnemonic=botão esquerdo
+SplitPane.rightButton.textAndMnemonic=botão direito
 # Used for Isindex
-IsindexView.prompt=Trata-se de um \u00EDndice pesquis\u00E1vel. Informe as palavras-chave de pesquisa:
+IsindexView.prompt=Trata-se de um índice pesquisável. Informe as palavras-chave de pesquisa:
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=Iconizar
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_sv.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_sv.properties
index 774548f6521..28d4270020f 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_sv.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_sv.properties
@@ -38,17 +38,17 @@
 ############ FILE CHOOSER STRINGS #############
 FileChooser.fileDescription.textAndMnemonic=Generisk fil
 FileChooser.directoryDescription.textAndMnemonic=Katalog
-FileChooser.newFolderError.textAndMnemonic=Ett fel intr\u00E4ffade n\u00E4r en mapp skulle skapas
+FileChooser.newFolderError.textAndMnemonic=Ett fel inträffade när en mapp skulle skapas
 FileChooser.newFolderErrorSeparator= :
 FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
 FileChooser.cancelButton.textAndMnemonic=Avbryt
 FileChooser.saveButton.textAndMnemonic=Spara
-FileChooser.openButton.textAndMnemonic=\u00D6ppna
+FileChooser.openButton.textAndMnemonic=Öppna
 FileChooser.saveDialogTitle.textAndMnemonic=Spara
-FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
+FileChooser.openDialogTitle.textAndMnemonic=Öppna
 FileChooser.updateButton.textAndMnemonic=Uppdatera
-FileChooser.helpButton.textAndMnemonic=Hj\u00E4lp
-FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ppna
+FileChooser.helpButton.textAndMnemonic=Hjälp
+FileChooser.directoryOpenButton.textAndMnemonic=Öppna
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -57,9 +57,9 @@ FileChooser.fileSizeGigaBytes={0} GB
 
 # Mac-specific strings
 FileChooser.saveTitle.textAndMnemonic=Spara
-FileChooser.openTitle.textAndMnemonic=\u00D6ppna
+FileChooser.openTitle.textAndMnemonic=Öppna
 FileChooser.newFolderExistsError.textAndMnemonic=Namnet finns redan
-FileChooser.chooseButton.textAndMnemonic=V\u00E4lj
+FileChooser.chooseButton.textAndMnemonic=Välj
 
 FileChooser.newFolderButton.textAndMnemonic=Ny mapp
 FileChooser.newFolderTitle.textAndMnemonic=Ny mapp
@@ -68,24 +68,24 @@ FileChooser.saveDialogFileNameLabel.textAndMnemonic=Spara som:
 FileChooser.filesOfTypeLabel.textAndMnemonic=Filformat:
 
 FileChooser.desktopName=Klientdator
-FileChooser.newFolderPrompt.textAndMnemonic=Namn p\u00E5 ny mapp:
-FileChooser.untitledFolderName=namnl\u00F6s mapp
-FileChooser.untitledFileName=namnl\u00F6s
+FileChooser.newFolderPrompt.textAndMnemonic=Namn på ny mapp:
+FileChooser.untitledFolderName=namnlös mapp
+FileChooser.untitledFileName=namnlös
 FileChooser.createButton.textAndMnemonic=Skapa
 
-FileChooser.byDate.textAndMnemonic=\u00C4ndringsdatum
+FileChooser.byDate.textAndMnemonic=Ändringsdatum
 FileChooser.by.textAndMnemonic=Namn
 FileChooser.newFolderAccessibleName=Ny mapp
 
-FileChooser.mac.newFolder=namnl\u00F6s mapp
-FileChooser.mac.newFolder.subsequent=namnl\u00F6s mapp {0}
+FileChooser.mac.newFolder=namnlös mapp
+FileChooser.mac.newFolder.subsequent=namnlös mapp {0}
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=F\u00F6rhandsgranska
+ColorChooser.preview.textAndMnemonic=Förhandsgranska
 ColorChooser.ok.textAndMnemonic=OK
 ColorChooser.cancel.textAndMnemonic=Avbryt
-ColorChooser.reset.textAndMnemonic=&\u00C5terst\u00E4ll
+ColorChooser.reset.textAndMnemonic=&Återställ
 ColorChooser.sample.textAndMnemonic=Exempeltext  Exempeltext
 ColorChooser.swatches.textAndMnemonic=&Prov
 ColorChooser.swatchesRecent.textAndMnemonic=Senaste:
@@ -97,9 +97,9 @@ ColorChooser.hsbRed.textAndMnemonic=R
 ColorChooser.hsbGreen.textAndMnemonic=G
 ColorChooser.hsbBlue.textAndMnemonic=B
 ColorChooser.rgb.textAndMnemonic=R&GB
-ColorChooser.rgbRed.textAndMnemonic=R\u00F6&d
-ColorChooser.rgbGreen.textAndMnemonic=Gr\u00F6&n
-ColorChooser.rgbBlue.textAndMnemonic=&Bl\u00E5
+ColorChooser.rgbRed.textAndMnemonic=Rö&d
+ColorChooser.rgbGreen.textAndMnemonic=Grö&n
+ColorChooser.rgbBlue.textAndMnemonic=&Blå
 
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
@@ -108,7 +108,7 @@ OptionPane.yesButton.textAndMnemonic=&Ja
 OptionPane.noButton.textAndMnemonic=&Nej
 OptionPane.okButton.textAndMnemonic=OK
 OptionPane.cancelButton.textAndMnemonic=Avbryt
-OptionPane.title.textAndMnemonic=V\u00E4lj ett alternativ
+OptionPane.title.textAndMnemonic=Välj ett alternativ
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
 OptionPane.inputDialog.titleAndMnemonic=Indata
@@ -120,7 +120,7 @@ OptionPane.messageDialog.titleAndMnemonic=Meddelande
 PrintingDialog.titleProgress.textAndMnemonic=Skriver ut
 PrintingDialog.titleAborting.textAndMnemonic=Skriver ut (avbryter)
 
-PrintingDialog.contentInitial.textAndMnemonic=Utskrift p\u00E5g\u00E5r...
+PrintingDialog.contentInitial.textAndMnemonic=Utskrift pågår...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
@@ -134,50 +134,50 @@ PrintingDialog.abortButtonToolTip.textAndMnemonic=Avbryt utskrift
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimera
 InternalFrame.maxButtonToolTip=Maximera
-InternalFrame.restoreButtonToolTip=\u00C5terst\u00E4ll
-InternalFrame.closeButtonToolTip=St\u00E4ng
+InternalFrame.restoreButtonToolTip=Återställ
+InternalFrame.closeButtonToolTip=Stäng
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\u00C5terst\u00E4ll
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Återställ
 InternalFrameTitlePane.moveButton.textAndMnemonic=Flytta
 InternalFrameTitlePane.sizeButton.textAndMnemonic=Storlek
 InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimera
 InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximera
-InternalFrameTitlePane.closeButton.textAndMnemonic=St\u00E4ng
+InternalFrameTitlePane.closeButton.textAndMnemonic=Stäng
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButton.textAndMnemonic=Skicka fr\u00E5ga
-FormView.resetButton.textAndMnemonic=\u00C5terst\u00E4ll
-FormView.browseFileButton.textAndMnemonic=Bl\u00E4ddra...
+FormView.submitButton.textAndMnemonic=Skicka fråga
+FormView.resetButton.textAndMnemonic=Återställ
+FormView.browseFileButton.textAndMnemonic=Bläddra...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=format\u00E4ndring
-AbstractDocument.addition.textAndMnemonic=till\u00E4gg
+AbstractDocument.styleChange.textAndMnemonic=formatändring
+AbstractDocument.addition.textAndMnemonic=tillägg
 AbstractDocument.deletion.textAndMnemonic=borttagning
-AbstractDocument.undo.textAndMnemonic=\u00C5ngra
-AbstractDocument.redo.textAndMnemonic=G\u00F6r om
+AbstractDocument.undo.textAndMnemonic=Ångra
+AbstractDocument.redo.textAndMnemonic=Gör om
 
 ############ Abstract Button Strings ############
 AbstractButton.click.textAndMnemonic=klicka
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\u00C5ngra
-AbstractUndoableEdit.redo.textAndMnemonic=G\u00F6r om
+AbstractUndoableEdit.undo.textAndMnemonic=Ångra
+AbstractUndoableEdit.redo.textAndMnemonic=Gör om
 
 ############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=v\u00E4xlaPopup
+ComboBox.togglePopup.textAndMnemonic=växlaPopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=P\u00E5g\u00E5r...
+ProgressMonitor.progress.textAndMnemonic=Pågår...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=v\u00E4nsterknapp
-SplitPane.rightButton.textAndMnemonic=h\u00F6gerknapp
+SplitPane.leftButton.textAndMnemonic=vänsterknapp
+SplitPane.rightButton.textAndMnemonic=högerknapp
 # Used for Isindex
-IsindexView.prompt=Detta \u00E4r ett s\u00F6kbart index. Ange s\u00F6kord:
+IsindexView.prompt=Detta är ett sökbart index. Ange sökord:
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=Minimera
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximera
-InternalFrameTitlePane.closeButtonAccessibleName=St\u00E4ng
+InternalFrameTitlePane.closeButtonAccessibleName=Stäng
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties
index d6207879b12..34ce4738f70 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties
@@ -36,19 +36,19 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\u901A\u7528\u6587\u4EF6
-FileChooser.directoryDescription.textAndMnemonic=\u76EE\u5F55
-FileChooser.newFolderError.textAndMnemonic=\u521B\u5EFA\u6587\u4EF6\u5939\u65F6\u51FA\u9519
+FileChooser.fileDescription.textAndMnemonic=通用文件
+FileChooser.directoryDescription.textAndMnemonic=目录
+FileChooser.newFolderError.textAndMnemonic=创建文件夹时出错
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
-FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openButton.textAndMnemonic=\u6253\u5F00
-FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
-FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
-FileChooser.helpButton.textAndMnemonic=\u5E2E\u52A9
-FileChooser.directoryOpenButton.textAndMnemonic=\u6253\u5F00
+FileChooser.acceptAllFileFilter.textAndMnemonic=所有文件
+FileChooser.cancelButton.textAndMnemonic=取消
+FileChooser.saveButton.textAndMnemonic=保存
+FileChooser.openButton.textAndMnemonic=打开
+FileChooser.saveDialogTitle.textAndMnemonic=保存
+FileChooser.openDialogTitle.textAndMnemonic=打开
+FileChooser.updateButton.textAndMnemonic=更新
+FileChooser.helpButton.textAndMnemonic=帮助
+FileChooser.directoryOpenButton.textAndMnemonic=打开
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -56,40 +56,40 @@ FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
 # Mac-specific strings
-FileChooser.saveTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openTitle.textAndMnemonic=\u6253\u5F00
-FileChooser.newFolderExistsError.textAndMnemonic=\u8BE5\u540D\u79F0\u5DF2\u88AB\u4F7F\u7528
-FileChooser.chooseButton.textAndMnemonic=\u9009\u62E9
-FileChooser.chooseButtonToolTip.textAndMnemonic=\u9009\u62E9\u6240\u9009\u6587\u4EF6
+FileChooser.saveTitle.textAndMnemonic=保存
+FileChooser.openTitle.textAndMnemonic=打开
+FileChooser.newFolderExistsError.textAndMnemonic=该名称已被使用
+FileChooser.chooseButton.textAndMnemonic=选择
+FileChooser.chooseButtonToolTip.textAndMnemonic=选择所选文件
 
-FileChooser.newFolderButton.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.newFolderTitle.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6:
-FileChooser.saveDialogFileNameLabel.textAndMnemonic=\u53E6\u5B58\u4E3A:
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u683C\u5F0F:
+FileChooser.newFolderButton.textAndMnemonic=新建文件夹
+FileChooser.newFolderTitle.textAndMnemonic=新建文件夹
+FileChooser.fileNameLabel.textAndMnemonic=文件:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=另存为:
+FileChooser.filesOfTypeLabel.textAndMnemonic=文件格式:
 
-FileChooser.desktopName=\u684C\u9762
-FileChooser.newFolderPrompt.textAndMnemonic=\u65B0\u6587\u4EF6\u5939\u7684\u540D\u79F0:
-FileChooser.untitledFolderName=\u65E0\u6807\u9898\u7684\u6587\u4EF6\u5939
-FileChooser.untitledFileName=\u65E0\u6807\u9898
-FileChooser.createButton.textAndMnemonic=\u521B\u5EFA
+FileChooser.desktopName=桌面
+FileChooser.newFolderPrompt.textAndMnemonic=新文件夹的名称:
+FileChooser.untitledFolderName=无标题的文件夹
+FileChooser.untitledFileName=无标题
+FileChooser.createButton.textAndMnemonic=创建
 
-FileChooser.byDate.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.by.textAndMnemonic=\u540D\u79F0
-FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.byDate.textAndMnemonic=修改日期
+FileChooser.by.textAndMnemonic=名称
+FileChooser.newFolderAccessibleName=新建文件夹
 
-FileChooser.mac.newFolder=\u65E0\u6807\u9898\u7684\u6587\u4EF6\u5939
-FileChooser.mac.newFolder.subsequent=\u65E0\u6807\u9898\u7684\u6587\u4EF6\u5939 {0}
+FileChooser.mac.newFolder=无标题的文件夹
+FileChooser.mac.newFolder.subsequent=无标题的文件夹 {0}
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=\u9884\u89C8
-ColorChooser.ok.textAndMnemonic=\u786E\u5B9A
-ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
-ColorChooser.reset.textAndMnemonic=\u91CD\u7F6E(&R)
-ColorChooser.sample.textAndMnemonic=\u793A\u4F8B\u6587\u672C  \u793A\u4F8B\u6587\u672C
-ColorChooser.swatches.textAndMnemonic=\u6837\u672C(&S)
-ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u8FD1:
+ColorChooser.preview.textAndMnemonic=预览
+ColorChooser.ok.textAndMnemonic=确定
+ColorChooser.cancel.textAndMnemonic=取消
+ColorChooser.reset.textAndMnemonic=重置(&R)
+ColorChooser.sample.textAndMnemonic=示例文本  示例文本
+ColorChooser.swatches.textAndMnemonic=样本(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=最近:
 ColorChooser.hsb.textAndMnemonic=HSB(&H)
 ColorChooser.hsbHue.textAndMnemonic=H
 ColorChooser.hsbSaturation.textAndMnemonic=S
@@ -98,87 +98,87 @@ ColorChooser.hsbRed.textAndMnemonic=R
 ColorChooser.hsbGreen.textAndMnemonic=G
 ColorChooser.hsbBlue.textAndMnemonic=B
 ColorChooser.rgb.textAndMnemonic=RGB(&G)
-ColorChooser.rgbRed.textAndMnemonic=\u7EA2\u8272(&D)
-ColorChooser.rgbGreen.textAndMnemonic=\u7EFF\u8272(&N)
-ColorChooser.rgbBlue.textAndMnemonic=\u84DD\u8272(&B)
+ColorChooser.rgbRed.textAndMnemonic=红色(&D)
+ColorChooser.rgbGreen.textAndMnemonic=绿色(&N)
+ColorChooser.rgbBlue.textAndMnemonic=蓝色(&B)
 
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
-OptionPane.noButton.textAndMnemonic=\u5426(&N)
-OptionPane.okButton.textAndMnemonic=\u786E\u5B9A
-OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
-OptionPane.title.textAndMnemonic=\u9009\u62E9\u4E00\u4E2A\u9009\u9879
+OptionPane.yesButton.textAndMnemonic=是(&Y)
+OptionPane.noButton.textAndMnemonic=否(&N)
+OptionPane.okButton.textAndMnemonic=确定
+OptionPane.cancelButton.textAndMnemonic=取消
+OptionPane.title.textAndMnemonic=选择一个选项
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=\u8F93\u5165
+OptionPane.inputDialog.titleAndMnemonic=输入
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=\u6D88\u606F
+OptionPane.messageDialog.titleAndMnemonic=消息
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=\u6253\u5370
-PrintingDialog.titleAborting.textAndMnemonic=\u6253\u5370 (\u6B63\u5728\u4E2D\u6B62)
+PrintingDialog.titleProgress.textAndMnemonic=打印
+PrintingDialog.titleAborting.textAndMnemonic=打印 (正在中止)
 
-PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u8FDB\u884C\u6253\u5370...
+PrintingDialog.contentInitial.textAndMnemonic=正在进行打印...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u6253\u5370\u9875 {0}...
+PrintingDialog.contentProgress.textAndMnemonic=已打印页 {0}...
 
-PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u6253\u5370...
+PrintingDialog.contentAborting.textAndMnemonic=正在中止打印...
 
-PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
-PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6253\u5370
+PrintingDialog.abortButton.textAndMnemonic=中止(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=中止打印
 
 ############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
-InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
-InternalFrame.restoreButtonToolTip=\u8FD8\u539F
-InternalFrame.closeButtonToolTip=\u5173\u95ED
+InternalFrame.iconButtonToolTip=最小化
+InternalFrame.maxButtonToolTip=最大化
+InternalFrame.restoreButtonToolTip=还原
+InternalFrame.closeButtonToolTip=关闭
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\u8FD8\u539F
-InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52A8
-InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButton.textAndMnemonic=\u5173\u95ED
+InternalFrameTitlePane.restoreButton.textAndMnemonic=还原
+InternalFrameTitlePane.moveButton.textAndMnemonic=移动
+InternalFrameTitlePane.sizeButton.textAndMnemonic=大小
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=最小化
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=最大化
+InternalFrameTitlePane.closeButton.textAndMnemonic=关闭
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButton.textAndMnemonic=\u63D0\u4EA4\u67E5\u8BE2
-FormView.resetButton.textAndMnemonic=\u91CD\u7F6E
-FormView.browseFileButton.textAndMnemonic=\u6D4F\u89C8...
+FormView.submitButton.textAndMnemonic=提交查询
+FormView.resetButton.textAndMnemonic=重置
+FormView.browseFileButton.textAndMnemonic=浏览...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=\u6837\u5F0F\u66F4\u6539
-AbstractDocument.addition.textAndMnemonic=\u6DFB\u52A0
-AbstractDocument.deletion.textAndMnemonic=\u5220\u9664
-AbstractDocument.undo.textAndMnemonic=\u64A4\u6D88
-AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
+AbstractDocument.styleChange.textAndMnemonic=样式更改
+AbstractDocument.addition.textAndMnemonic=添加
+AbstractDocument.deletion.textAndMnemonic=删除
+AbstractDocument.undo.textAndMnemonic=撤消
+AbstractDocument.redo.textAndMnemonic=重做
 
 ############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=\u5355\u51FB
+AbstractButton.click.textAndMnemonic=单击
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\u64A4\u6D88
-AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
+AbstractUndoableEdit.undo.textAndMnemonic=撤消
+AbstractUndoableEdit.redo.textAndMnemonic=重做
 
 ############ Combo Box Strings ############
 ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=\u8FDB\u5EA6...
+ProgressMonitor.progress.textAndMnemonic=进度...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=\u5DE6\u952E
-SplitPane.rightButton.textAndMnemonic=\u53F3\u952E
+SplitPane.leftButton.textAndMnemonic=左键
+SplitPane.rightButton.textAndMnemonic=右键
 # Used for Isindex
-IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57:
+IsindexView.prompt=这是可搜索索引。请输入搜索关键字:
 
 ############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=\u56FE\u6807\u5316
-InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonAccessibleName=\u5173\u95ED
+InternalFrameTitlePane.iconifyButtonAccessibleName=图标化
+InternalFrameTitlePane.maximizeButtonAccessibleName=最大化
+InternalFrameTitlePane.closeButtonAccessibleName=关闭
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties
index 89274ab45c3..6688852db91 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties
@@ -36,19 +36,19 @@
 # support.
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\u4E00\u822C\u6A94\u6848
-FileChooser.directoryDescription.textAndMnemonic=\u76EE\u9304
-FileChooser.newFolderError.textAndMnemonic=\u5EFA\u7ACB\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4
+FileChooser.fileDescription.textAndMnemonic=一般檔案
+FileChooser.directoryDescription.textAndMnemonic=目錄
+FileChooser.newFolderError.textAndMnemonic=建立資料夾時發生錯誤
 FileChooser.newFolderErrorSeparator= :
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
-FileChooser.saveButton.textAndMnemonic=\u5132\u5B58
-FileChooser.openButton.textAndMnemonic=\u958B\u555F
-FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F
-FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
-FileChooser.helpButton.textAndMnemonic=\u8AAA\u660E
-FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u555F
+FileChooser.acceptAllFileFilter.textAndMnemonic=所有檔案
+FileChooser.cancelButton.textAndMnemonic=取消
+FileChooser.saveButton.textAndMnemonic=儲存
+FileChooser.openButton.textAndMnemonic=開啟
+FileChooser.saveDialogTitle.textAndMnemonic=儲存
+FileChooser.openDialogTitle.textAndMnemonic=開啟
+FileChooser.updateButton.textAndMnemonic=更新
+FileChooser.helpButton.textAndMnemonic=說明
+FileChooser.directoryOpenButton.textAndMnemonic=開啟
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -56,39 +56,39 @@ FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
 # Mac-specific strings
-FileChooser.saveTitle.textAndMnemonic=\u5132\u5B58
-FileChooser.openTitle.textAndMnemonic=\u958B\u555F
-FileChooser.newFolderExistsError.textAndMnemonic=\u8A72\u540D\u7A31\u5DF2\u7D93\u88AB\u4F7F\u7528
-FileChooser.chooseButton.textAndMnemonic=\u9078\u64C7
+FileChooser.saveTitle.textAndMnemonic=儲存
+FileChooser.openTitle.textAndMnemonic=開啟
+FileChooser.newFolderExistsError.textAndMnemonic=該名稱已經被使用
+FileChooser.chooseButton.textAndMnemonic=選擇
 
-FileChooser.newFolderButton.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderTitle.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
-FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848:
-FileChooser.saveDialogFileNameLabel.textAndMnemonic=\u53E6\u5B58\u65B0\u6A94:
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u683C\u5F0F:
+FileChooser.newFolderButton.textAndMnemonic=新資料夾
+FileChooser.newFolderTitle.textAndMnemonic=新資料夾
+FileChooser.fileNameLabel.textAndMnemonic=檔案:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=另存新檔:
+FileChooser.filesOfTypeLabel.textAndMnemonic=檔案格式:
 
-FileChooser.desktopName=\u684C\u9762
-FileChooser.newFolderPrompt.textAndMnemonic=\u65B0\u8CC7\u6599\u593E\u540D\u7A31:
-FileChooser.untitledFolderName=\u672A\u547D\u540D\u7684\u8CC7\u6599\u593E
-FileChooser.untitledFileName=\u672A\u547D\u540D
-FileChooser.createButton.textAndMnemonic=\u5EFA\u7ACB
+FileChooser.desktopName=桌面
+FileChooser.newFolderPrompt.textAndMnemonic=新資料夾名稱:
+FileChooser.untitledFolderName=未命名的資料夾
+FileChooser.untitledFileName=未命名
+FileChooser.createButton.textAndMnemonic=建立
 
-FileChooser.byDate.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.by.textAndMnemonic=\u540D\u7A31
-FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
+FileChooser.byDate.textAndMnemonic=修改日期
+FileChooser.by.textAndMnemonic=名稱
+FileChooser.newFolderAccessibleName=新資料夾
 
-FileChooser.mac.newFolder=\u672A\u547D\u540D\u7684\u8CC7\u6599\u593E
-FileChooser.mac.newFolder.subsequent=\u672A\u547D\u540D\u7684\u8CC7\u6599\u593E {0}
+FileChooser.mac.newFolder=未命名的資料夾
+FileChooser.mac.newFolder.subsequent=未命名的資料夾 {0}
 
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=\u9810\u89BD
-ColorChooser.ok.textAndMnemonic=\u78BA\u5B9A
-ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
-ColorChooser.reset.textAndMnemonic=\u91CD\u8A2D(&R)
-ColorChooser.sample.textAndMnemonic=\u7BC4\u4F8B\u6587\u5B57  \u7BC4\u4F8B\u6587\u5B57
-ColorChooser.swatches.textAndMnemonic=\u8ABF\u8272\u677F(&S)
-ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0\u9078\u64C7:
+ColorChooser.preview.textAndMnemonic=預覽
+ColorChooser.ok.textAndMnemonic=確定
+ColorChooser.cancel.textAndMnemonic=取消
+ColorChooser.reset.textAndMnemonic=重設(&R)
+ColorChooser.sample.textAndMnemonic=範例文字  範例文字
+ColorChooser.swatches.textAndMnemonic=調色板(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=最新選擇:
 ColorChooser.hsb.textAndMnemonic=HSB(&H)
 ColorChooser.hsbHue.textAndMnemonic=H
 ColorChooser.hsbSaturation.textAndMnemonic=S
@@ -97,87 +97,87 @@ ColorChooser.hsbRed.textAndMnemonic=R
 ColorChooser.hsbGreen.textAndMnemonic=G
 ColorChooser.hsbBlue.textAndMnemonic=B
 ColorChooser.rgb.textAndMnemonic=RGB(&G)
-ColorChooser.rgbRed.textAndMnemonic=\u7D05(&D)
-ColorChooser.rgbGreen.textAndMnemonic=\u7DA0(&N)
-ColorChooser.rgbBlue.textAndMnemonic=\u85CD(&B)
+ColorChooser.rgbRed.textAndMnemonic=紅(&D)
+ColorChooser.rgbGreen.textAndMnemonic=綠(&N)
+ColorChooser.rgbBlue.textAndMnemonic=藍(&B)
 
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
-OptionPane.noButton.textAndMnemonic=\u5426(&N)
-OptionPane.okButton.textAndMnemonic=\u78BA\u5B9A
-OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
-OptionPane.title.textAndMnemonic=\u9078\u53D6\u4E00\u500B\u9078\u9805
+OptionPane.yesButton.textAndMnemonic=是(&Y)
+OptionPane.noButton.textAndMnemonic=否(&N)
+OptionPane.okButton.textAndMnemonic=確定
+OptionPane.cancelButton.textAndMnemonic=取消
+OptionPane.title.textAndMnemonic=選取一個選項
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=\u8F38\u5165
+OptionPane.inputDialog.titleAndMnemonic=輸入
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=\u8A0A\u606F
+OptionPane.messageDialog.titleAndMnemonic=訊息
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=\u5217\u5370\u4E2D
-PrintingDialog.titleAborting.textAndMnemonic=\u5217\u5370 (\u4E2D\u6B62\u4E2D)
+PrintingDialog.titleProgress.textAndMnemonic=列印中
+PrintingDialog.titleAborting.textAndMnemonic=列印 (中止中)
 
-PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u5217\u5370...
+PrintingDialog.contentInitial.textAndMnemonic=正在列印...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u5217\u5370\u7B2C {0} \u9801...
+PrintingDialog.contentProgress.textAndMnemonic=已列印第 {0} 頁...
 
-PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u5217\u5370...
+PrintingDialog.contentAborting.textAndMnemonic=正在中止列印...
 
-PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
-PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u5217\u5370
+PrintingDialog.abortButton.textAndMnemonic=中止(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=中止列印
 
 ############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
-InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
-InternalFrame.restoreButtonToolTip=\u5FA9\u539F
-InternalFrame.closeButtonToolTip=\u95DC\u9589
+InternalFrame.iconButtonToolTip=最小化
+InternalFrame.maxButtonToolTip=最大化
+InternalFrame.restoreButtonToolTip=復原
+InternalFrame.closeButtonToolTip=關閉
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u539F
-InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
-InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButton.textAndMnemonic=\u95DC\u9589
+InternalFrameTitlePane.restoreButton.textAndMnemonic=復原
+InternalFrameTitlePane.moveButton.textAndMnemonic=移動
+InternalFrameTitlePane.sizeButton.textAndMnemonic=大小
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=最小化
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=最大化
+InternalFrameTitlePane.closeButton.textAndMnemonic=關閉
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButton.textAndMnemonic=\u9001\u51FA\u67E5\u8A62
-FormView.resetButton.textAndMnemonic=\u91CD\u8A2D
-FormView.browseFileButton.textAndMnemonic=\u700F\u89BD...
+FormView.submitButton.textAndMnemonic=送出查詢
+FormView.resetButton.textAndMnemonic=重設
+FormView.browseFileButton.textAndMnemonic=瀏覽...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=\u6A23\u5F0F\u8B8A\u66F4
-AbstractDocument.addition.textAndMnemonic=\u9644\u52A0
-AbstractDocument.deletion.textAndMnemonic=\u522A\u9664
-AbstractDocument.undo.textAndMnemonic=\u9084\u539F
-AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
+AbstractDocument.styleChange.textAndMnemonic=樣式變更
+AbstractDocument.addition.textAndMnemonic=附加
+AbstractDocument.deletion.textAndMnemonic=刪除
+AbstractDocument.undo.textAndMnemonic=還原
+AbstractDocument.redo.textAndMnemonic=重做
 
 ############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=\u6309\u4E00\u4E0B
+AbstractButton.click.textAndMnemonic=按一下
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\u9084\u539F
-AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
+AbstractUndoableEdit.undo.textAndMnemonic=還原
+AbstractUndoableEdit.redo.textAndMnemonic=重做
 
 ############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=\u5207\u63DB\u5373\u73FE\u5F0F\u8996\u7A97
+ComboBox.togglePopup.textAndMnemonic=切換即現式視窗
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=\u9032\u5EA6...
+ProgressMonitor.progress.textAndMnemonic=進度...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=\u5DE6\u6309\u9215
-SplitPane.rightButton.textAndMnemonic=\u53F3\u6309\u9215
+SplitPane.leftButton.textAndMnemonic=左按鈕
+SplitPane.rightButton.textAndMnemonic=右按鈕
 # Used for Isindex
-IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57:
+IsindexView.prompt=這是一個可搜尋的索引。輸入搜尋關鍵字:
 
 ############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=\u5716\u793A\u5316
-InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonAccessibleName=\u95DC\u9589
+InternalFrameTitlePane.iconifyButtonAccessibleName=圖示化
+InternalFrameTitlePane.maximizeButtonAccessibleName=最大化
+InternalFrameTitlePane.closeButtonAccessibleName=關閉
diff --git a/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties b/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties
index bfc3bd01b3b..80528239ae6 100644
--- a/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties
+++ b/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties
@@ -3,46 +3,46 @@
 #
 
 # Modifier names
-AWT.shift=\u21e7
-AWT.control=\u2303
-AWT.alt=\u2325
-AWT.meta=\u2318
-AWT.altGraph=\u2325
+AWT.shift=⇧
+AWT.control=⌃
+AWT.alt=⌥
+AWT.meta=⌘
+AWT.altGraph=⌥
 
 # Key names
-AWT.enter=\u23ce
-AWT.backSpace=\u232b
-AWT.tab=\u21e5
-AWT.cancel=\u238b
-AWT.clear=\u2327
-AWT.capsLock=\u21ea
-AWT.escape=\u238b
-AWT.space=\u2423
-AWT.pgup=\u21de
-AWT.pgdn=\u21df
-AWT.end=\u2198
-AWT.home=\u2196
-AWT.left=\u2190
-AWT.up=\u2191
-AWT.right=\u2192
-AWT.down=\u2193
+AWT.enter=⏎
+AWT.backSpace=⌫
+AWT.tab=⇥
+AWT.cancel=⎋
+AWT.clear=⌧
+AWT.capsLock=⇪
+AWT.escape=⎋
+AWT.space=␣
+AWT.pgup=⇞
+AWT.pgdn=⇟
+AWT.end=↘
+AWT.home=↖
+AWT.left=←
+AWT.up=↑
+AWT.right=→
+AWT.down=↓
 AWT.comma=,
 AWT.period=.
 AWT.slash=/
 AWT.semicolon=;
-AWT.equals=\u003d
+AWT.equals==
 AWT.openBracket=[
 AWT.backSlash=\\
 AWT.closeBracket=]
-AWT.multiply=\u2328 *
-AWT.add=\u2328 +
-AWT.separator=\u2328 ,
-AWT.separater=\u2328 ,
-AWT.subtract=\u2328 -
-AWT.decimal=\u2328 .
-AWT.divide=\u2328 /
-AWT.delete=\u2326
-AWT.printScreen=\u2399
+AWT.multiply=⌨ *
+AWT.add=⌨ +
+AWT.separator=⌨ ,
+AWT.separater=⌨ ,
+AWT.subtract=⌨ -
+AWT.decimal=⌨ .
+AWT.divide=⌨ /
+AWT.delete=⌦
+AWT.printScreen=⎙
 AWT.backQuote=`
 AWT.quote='
 AWT.ampersand=&
@@ -56,9 +56,9 @@ AWT.at=@
 AWT.colon=:
 AWT.circumflex=^
 AWT.dollar=$
-AWT.euro=\u20ac
+AWT.euro=€
 AWT.exclamationMark=!
-AWT.invertedExclamationMark=\u00a1
+AWT.invertedExclamationMark=¡
 AWT.leftParenthesis=(
 AWT.numberSign=#
 AWT.plus=+
@@ -67,5 +67,5 @@ AWT.rightParenthesis=)
 AWT.underscore=_
 
 # Numeric Keypad
-AWT.numpad=\u2328
+AWT.numpad=⌨
 
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
index 6c3fd2f0ff1..1589aec9e30 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
@@ -40,7 +40,7 @@
 #
 alert=Alert
 awtcomponent=AWT-Komponente
-checkbox=Kontrollk\u00E4stchen
+checkbox=Kontrollkästchen
 colorchooser=Farbauswahl
 columnheader=Spaltenheader
 combobox=Kombinationsfeld
@@ -51,24 +51,24 @@ dialog=Dialogfeld
 directorypane=Verzeichnisbereich
 glasspane=Glass Pane
 filechooser=Dateiauswahl
-filler=F\u00FCllbereich
+filler=Füllbereich
 frame=Rahmen
 internalframe=Innerer Rahmen
 label=Label
 layeredpane=Layered Pane
 list=Liste
 listitem=Listenelement
-menubar=Men\u00FCleiste
-menu=Men\u00FC
-menuitem=Men\u00FCpunkt
+menubar=Menüleiste
+menu=Menü
+menuitem=Menüpunkt
 optionpane=Optionsbereich
 pagetab=Registerkarte
 pagetablist=Registerkartenliste
 panel=Bereich
 passwordtext=Kennworttext
-popupmenu=Popup-Men\u00FC
+popupmenu=Popup-Menü
 progressbar=Fortschrittsbalken
-pushbutton=Schaltfl\u00E4che
+pushbutton=Schaltfläche
 radiobutton=Optionsfeld
 rootpane=Root-Bereich
 rowheader=Zeilenheader
@@ -81,7 +81,7 @@ swingcomponent=Swing-Komponente
 table=Tabelle
 text=Text
 tree=Baumstruktur
-togglebutton=Umschaltfl\u00E4che
+togglebutton=Umschaltfläche
 toolbar=Symbolleiste
 tooltip=QuickInfo
 unknown=Unbekannt
@@ -90,7 +90,7 @@ window=Fenster
 #
 # accessible relations
 #
-labelFor=Label f\u00FCr
+labelFor=Label für
 labeledBy=gelabelt von
 memberOf=Mitglied von
 controlledBy=controlledBy
@@ -112,12 +112,12 @@ focused=fokussiert
 iconified=minimiert
 modal=modal
 multiline=mehrzeilig
-multiselectable=mehrfach ausw\u00E4hlbar
+multiselectable=mehrfach auswählbar
 opaque=nicht transparent
-pressed=gedr\u00FCckt
+pressed=gedrückt
 resizable=skalierbar
-selectable=w\u00E4hlbar
-selected=ausgew\u00E4hlt
+selectable=wählbar
+selected=ausgewählt
 showing=angezeigt
 singleline=einzeilig
 transient=transient
@@ -134,10 +134,10 @@ toggleexpand=einblenden umschalten
 #
 # accessible relations
 #
-flowsTo=flie\u00DFt zu
-flowsFrom=flie\u00DFt von
+flowsTo=fließt zu
+flowsFrom=fließt von
 subwindowOf=Unterfenster von
-parentWindowOf=\u00FCbergeordnetes Fenster von
+parentWindowOf=übergeordnetes Fenster von
 embeds=bettet ein
 embeddedBy=eingebettet in
 childNodeOf=untergeordneter Knoten von
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties
index 6480a349705..3b99c58ff73 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties
@@ -47,7 +47,7 @@ combobox=cuadro combinado
 canvas=lienzo
 desktopicon=icono de escritorio
 desktoppane=panel de escritorio
-dialog=cuadro de di\u00E1logo
+dialog=cuadro de diálogo
 directorypane=panel de directorio
 glasspane=panel de cristal
 filechooser=selector de archivos
@@ -58,30 +58,30 @@ label=etiqueta
 layeredpane=panel en capas
 list=lista
 listitem=elemento de lista
-menubar=barra de men\u00FAs
-menu=men\u00FA
-menuitem=elemento de men\u00FA
+menubar=barra de menús
+menu=menú
+menuitem=elemento de menú
 optionpane=panel de opciones
-pagetab=separador de p\u00E1gina
-pagetablist=lista de separadores de p\u00E1gina
+pagetab=separador de página
+pagetablist=lista de separadores de página
 panel=panel
-passwordtext=texto de contrase\u00F1a
-popupmenu=men\u00FA emergente
+passwordtext=texto de contraseña
+popupmenu=menú emergente
 progressbar=barra de progreso
-pushbutton=bot\u00F3n
-radiobutton=bot\u00F3n de radio
-rootpane=panel ra\u00EDz
+pushbutton=botón
+radiobutton=botón de radio
+rootpane=panel raíz
 rowheader=cabecera de filas
 scrollbar=barra de desplazamiento
 scrollpane=panel de desplazamiento
 separator=separador
 slider=deslizador
-splitpane=panel de divisi\u00F3n
+splitpane=panel de división
 swingcomponent=componente swing
 table=tabla
 text=texto
-tree=\u00E1rbol
-togglebutton=bot\u00F3n conmutador
+tree=árbol
+togglebutton=botón conmutador
 toolbar=barra de herramientas
 tooltip=ayuda de burbuja
 unknown=desconocido
@@ -111,7 +111,7 @@ focusable=enfocable
 focused=enfocado
 iconified=convertido en icono
 modal=modal
-multiline=l\u00EDnea m\u00FAltiple
+multiline=línea múltiple
 multiselectable=multiseleccionable
 opaque=opaco
 pressed=pulsado
@@ -119,7 +119,7 @@ resizable=redimensionable
 selectable=seleccionable
 selected=seleccionado
 showing=mostrando
-singleline=l\u00EDnea \u00FAnica
+singleline=línea única
 transient=transitorio
 visible=visible
 vertical=vertical
@@ -127,7 +127,7 @@ horizontal=horizontal
 #
 # accessible actions
 #
-toggleexpand=conmutar ampliaci\u00F3n
+toggleexpand=conmutar ampliación
 
 # new relations, roles and states for J2SE 1.5.0
 
@@ -147,9 +147,9 @@ childNodeOf=nodo secundario de
 #
 header=cabecera
 footer=pie
-paragraph=p\u00E1rrafo
+paragraph=párrafo
 ruler=regla
-editbar=barra de edici\u00F3n
+editbar=barra de edición
 progressMonitor=monitor de progreso
 
 #
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties
index 08f113728fd..69db44645a7 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties
@@ -40,24 +40,24 @@
 #
 alert=alerte
 awtcomponent=composant AWT
-checkbox=case \u00E0 cocher
-colorchooser=s\u00E9lecteur de couleurs
-columnheader=en-t\u00EAte de colonne
-combobox=liste d\u00E9roulante
+checkbox=case à cocher
+colorchooser=sélecteur de couleurs
+columnheader=en-tête de colonne
+combobox=liste déroulante
 canvas=canevas
-desktopicon=ic\u00F4ne de bureau
+desktopicon=icône de bureau
 desktoppane=panneau de bureau
-dialog=bo\u00EEte de dialogue
-directorypane=panneau de r\u00E9pertoires
+dialog=boîte de dialogue
+directorypane=panneau de répertoires
 glasspane=panneau de grossissement
-filechooser=s\u00E9lecteur de fichiers
-filler=\u00E9l\u00E9ment de remplissage
+filechooser=sélecteur de fichiers
+filler=élément de remplissage
 frame=cadre
 internalframe=cadre interne
-label=libell\u00E9
-layeredpane=panneau superpos\u00E9
+label=libellé
+layeredpane=panneau superposé
 list=liste
-listitem=\u00E9l\u00E9ment de liste
+listitem=élément de liste
 menubar=barre de menus
 menu=menu
 menuitem=option de menu
@@ -71,12 +71,12 @@ progressbar=barre de progression
 pushbutton=bouton
 radiobutton=bouton radio
 rootpane=panneau racine
-rowheader=en-t\u00EAte de ligne
-scrollbar=barre de d\u00E9filement
-scrollpane=panneau de d\u00E9filement
-separator=s\u00E9parateur
+rowheader=en-tête de ligne
+scrollbar=barre de défilement
+scrollpane=panneau de défilement
+separator=séparateur
 slider=curseur
-splitpane=panneau divis\u00E9
+splitpane=panneau divisé
 swingcomponent=composant Swing
 table=tableau
 text=texte
@@ -86,38 +86,38 @@ toolbar=barre d'outils
 tooltip=info-bulle
 unknown=inconnu
 viewport=lucarne
-window=fen\u00EAtre
+window=fenêtre
 #
 # accessible relations
 #
-labelFor=libell\u00E9 de
-labeledBy=libell\u00E9 par
+labelFor=libellé de
+labeledBy=libellé par
 memberOf=membre de
-controlledBy=contr\u00F4l\u00E9 par
-controllerFor=contr\u00F4leur pour
+controlledBy=contrôlé par
+controllerFor=contrôleur pour
 #
 # accessible states
 #
 active=actif
-armed=arm\u00E9
-busy=occup\u00E9
-checked=coch\u00E9
-collapsed=r\u00E9duit
+armed=armé
+busy=occupé
+checked=coché
+collapsed=réduit
 editable=modifiable
 expandable=extensible
-expanded=d\u00E9velopp\u00E9
-enabled=activ\u00E9
-focusable=zone d'entr\u00E9e possible
-focused=avec zone d'entr\u00E9e
-iconified=r\u00E9duit \u00E0 une ic\u00F4ne
+expanded=développé
+enabled=activé
+focusable=zone d'entrée possible
+focused=avec zone d'entrée
+iconified=réduit à une icône
 modal=modal
 multiline=ligne multiple
-multiselectable=multis\u00E9lectionnable
+multiselectable=multisélectionnable
 opaque=opaque
-pressed=enfonc\u00E9
+pressed=enfoncé
 resizable=redimensionnable
-selectable=s\u00E9lectionnable
-selected=s\u00E9lectionn\u00E9
+selectable=sélectionnable
+selected=sélectionné
 showing=montrant
 singleline=ligne unique
 transient=non persistant
@@ -127,7 +127,7 @@ horizontal=horizontal
 #
 # accessible actions
 #
-toggleexpand=activer/d\u00E9sactiver d\u00E9veloppement
+toggleexpand=activer/désactiver développement
 
 # new relations, roles and states for J2SE 1.5.0
 
@@ -136,28 +136,28 @@ toggleexpand=activer/d\u00E9sactiver d\u00E9veloppement
 #
 flowsTo=flux vers
 flowsFrom=flux depuis
-subwindowOf=sous-fen\u00EAtre de
-parentWindowOf=fen\u00EAtre parente de
+subwindowOf=sous-fenêtre de
+parentWindowOf=fenêtre parente de
 embeds=incorpore
-embeddedBy=incorpor\u00E9 par
+embeddedBy=incorporé par
 childNodeOf=noeud enfant de
 
 #
 # accessible roles
 #
-header=en-t\u00EAte
+header=en-tête
 footer=pied de page
 paragraph=paragraphe
-ruler=r\u00E8gle
-editbar=barre d'\u00E9dition
-progressMonitor=contr\u00F4le de la progression
+ruler=règle
+editbar=barre d'édition
+progressMonitor=contrôle de la progression
 
 #
 # accessible states
 #
-managesDescendants=g\u00E8re les descendants
-indeterminate=ind\u00E9termin\u00E9
-truncated=tronqu\u00E9
+managesDescendants=gère les descendants
+indeterminate=indéterminé
+truncated=tronqué
 
 # new for J2SE 1.6.0
 
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties
index 96e4f38368c..c71619e14f4 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties
@@ -51,7 +51,7 @@ dialog=finestra di dialogo
 directorypane=riquadro directory
 glasspane=riquadro trasparente
 filechooser=selezione file
-filler=utilit\u00E0 riempimento
+filler=utilità riempimento
 frame=cornice
 internalframe=cornice interna
 label=etichetta
@@ -146,7 +146,7 @@ childNodeOf=nodo figlio di
 # accessible roles
 #
 header=intestazione
-footer=pi\u00E8 di pagina
+footer=piè di pagina
 paragraph=paragrafo
 ruler=righello
 editbar=barra di modifica
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties
index 671a5bc8df0..b2d7fd06317 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties
@@ -38,55 +38,55 @@
 #
 # accessible roles
 #
-alert=\u30A2\u30E9\u30FC\u30C8
-awtcomponent=AWT\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
-checkbox=\u30C1\u30A7\u30C3\u30AF\u30FB\u30DC\u30C3\u30AF\u30B9
-colorchooser=\u30AB\u30E9\u30FC\u30FB\u30C1\u30E5\u30FC\u30B6
-columnheader=\u5217\u30D8\u30C3\u30C0\u30FC
-combobox=\u30B3\u30F3\u30DC\u30FB\u30DC\u30C3\u30AF\u30B9
-canvas=\u30AD\u30E3\u30F3\u30D0\u30B9
-desktopicon=\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\u30FB\u30A2\u30A4\u30B3\u30F3
-desktoppane=\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\u533A\u753B
-dialog=\u30C0\u30A4\u30A2\u30ED\u30B0
-directorypane=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u533A\u753B
-glasspane=\u30AC\u30E9\u30B9\u533A\u753B
-filechooser=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6
-filler=\u30D5\u30A3\u30E9\u30FC
-frame=\u30D5\u30EC\u30FC\u30E0
-internalframe=\u5185\u90E8\u30D5\u30EC\u30FC\u30E0
-label=\u30E9\u30D9\u30EB
-layeredpane=\u968E\u5C64\u5316\u3055\u308C\u305F\u533A\u753B
-list=\u30EA\u30B9\u30C8
-listitem=\u30EA\u30B9\u30C8\u9805\u76EE
-menubar=\u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC
-menu=\u30E1\u30CB\u30E5\u30FC
-menuitem=\u30E1\u30CB\u30E5\u30FC\u9805\u76EE
-optionpane=\u30AA\u30D7\u30B7\u30E7\u30F3\u533A\u753B
-pagetab=\u30DA\u30FC\u30B8\u30FB\u30BF\u30D6
-pagetablist=\u30DA\u30FC\u30B8\u30FB\u30BF\u30D6\u30FB\u30EA\u30B9\u30C8
-panel=\u30D1\u30CD\u30EB
-passwordtext=\u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30C6\u30AD\u30B9\u30C8
-popupmenu=\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7\u30FB\u30E1\u30CB\u30E5\u30FC
-progressbar=\u9032\u6357\u30D0\u30FC
-pushbutton=\u30D7\u30C3\u30B7\u30E5\u30FB\u30DC\u30BF\u30F3
-radiobutton=\u30E9\u30B8\u30AA\u30FB\u30DC\u30BF\u30F3
-rootpane=\u30EB\u30FC\u30C8\u533A\u753B
-rowheader=\u884C\u30D8\u30C3\u30C0\u30FC
-scrollbar=\u30B9\u30AF\u30ED\u30FC\u30EB\u30FB\u30D0\u30FC
-scrollpane=\u30B9\u30AF\u30ED\u30FC\u30EB\u533A\u753B
-separator=\u30BB\u30D1\u30EC\u30FC\u30BF
-slider=\u30B9\u30E9\u30A4\u30C0
-splitpane=\u5206\u5272\u533A\u753B
-swingcomponent=Swing\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
-table=\u8868
-text=\u30C6\u30AD\u30B9\u30C8
-tree=\u30C4\u30EA\u30FC
-togglebutton=\u30C8\u30B0\u30EB\u30FB\u30DC\u30BF\u30F3
-toolbar=\u30C4\u30FC\u30EB\u30D0\u30FC
-tooltip=\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7
-unknown=\u4E0D\u660E
-viewport=\u30D3\u30E5\u30FC\u30DD\u30FC\u30C8
-window=\u30A6\u30A3\u30F3\u30C9\u30A6
+alert=アラート
+awtcomponent=AWTコンポーネント
+checkbox=チェック・ボックス
+colorchooser=カラー・チューザ
+columnheader=列ヘッダー
+combobox=コンボ・ボックス
+canvas=キャンバス
+desktopicon=デスクトップ・アイコン
+desktoppane=デスクトップ区画
+dialog=ダイアログ
+directorypane=ディレクトリ区画
+glasspane=ガラス区画
+filechooser=ファイル・チューザ
+filler=フィラー
+frame=フレーム
+internalframe=内部フレーム
+label=ラベル
+layeredpane=階層化された区画
+list=リスト
+listitem=リスト項目
+menubar=メニュー・バー
+menu=メニュー
+menuitem=メニュー項目
+optionpane=オプション区画
+pagetab=ページ・タブ
+pagetablist=ページ・タブ・リスト
+panel=パネル
+passwordtext=パスワード・テキスト
+popupmenu=ポップアップ・メニュー
+progressbar=進捗バー
+pushbutton=プッシュ・ボタン
+radiobutton=ラジオ・ボタン
+rootpane=ルート区画
+rowheader=行ヘッダー
+scrollbar=スクロール・バー
+scrollpane=スクロール区画
+separator=セパレータ
+slider=スライダ
+splitpane=分割区画
+swingcomponent=Swingコンポーネント
+table=表
+text=テキスト
+tree=ツリー
+togglebutton=トグル・ボタン
+toolbar=ツールバー
+tooltip=ツールチップ
+unknown=不明
+viewport=ビューポート
+window=ウィンドウ
 #
 # accessible relations
 #
@@ -98,36 +98,36 @@ controllerFor=controllerFor
 #
 # accessible states
 #
-active=\u30A2\u30AF\u30C6\u30A3\u30D6
-armed=\u4F5C\u52D5\u6E96\u5099\u5B8C\u4E86
-busy=\u30D3\u30B8\u30FC
-checked=\u30C1\u30A7\u30C3\u30AF
-collapsed=\u77ED\u7E2E
-editable=\u7DE8\u96C6\u53EF\u80FD
-expandable=\u5C55\u958B\u53EF\u80FD
-expanded=\u5C55\u958B
-enabled=\u6709\u52B9
-focusable=\u30D5\u30A9\u30FC\u30AB\u30B9\u53EF\u80FD
-focused=\u30D5\u30A9\u30FC\u30AB\u30B9
-iconified=\u30A2\u30A4\u30B3\u30F3\u5316
-modal=\u30E2\u30FC\u30C0\u30EB
-multiline=\u8907\u6570\u884C
-multiselectable=\u8907\u6570\u9078\u629E\u53EF\u80FD
-opaque=\u4E0D\u900F\u660E
-pressed=\u62BC\u4E0B
-resizable=\u30B5\u30A4\u30BA\u5909\u66F4\u53EF\u80FD
-selectable=\u9078\u629E\u53EF\u80FD
-selected=\u9078\u629E
-showing=\u8868\u793A
-singleline=\u5358\u4E00\u884C
-transient=\u4E00\u6642
-visible=\u53EF\u8996
-vertical=\u5782\u76F4
-horizontal=\u6C34\u5E73
+active=アクティブ
+armed=作動準備完了
+busy=ビジー
+checked=チェック
+collapsed=短縮
+editable=編集可能
+expandable=展開可能
+expanded=展開
+enabled=有効
+focusable=フォーカス可能
+focused=フォーカス
+iconified=アイコン化
+modal=モーダル
+multiline=複数行
+multiselectable=複数選択可能
+opaque=不透明
+pressed=押下
+resizable=サイズ変更可能
+selectable=選択可能
+selected=選択
+showing=表示
+singleline=単一行
+transient=一時
+visible=可視
+vertical=垂直
+horizontal=水平
 #
 # accessible actions
 #
-toggleexpand=\u5C55\u958B\u306E\u30C8\u30B0\u30EB
+toggleexpand=展開のトグル
 
 # new relations, roles and states for J2SE 1.5.0
 
@@ -138,33 +138,33 @@ flowsTo=flows to
 flowsFrom=flows from
 subwindowOf=subwindow of
 parentWindowOf=parent window of
-embeds=\u57CB\u8FBC\u307F
+embeds=埋込み
 embeddedBy=embedded by
 childNodeOf=child node of
 
 #
 # accessible roles
 #
-header=\u30D8\u30C3\u30C0\u30FC
-footer=\u30D5\u30C3\u30BF\u30FC
-paragraph=\u6BB5\u843D
-ruler=\u30EB\u30FC\u30E9\u30FC
-editbar=\u7DE8\u96C6\u30D0\u30FC
-progressMonitor=\u9032\u6357\u30E2\u30CB\u30BF\u30FC
+header=ヘッダー
+footer=フッター
+paragraph=段落
+ruler=ルーラー
+editbar=編集バー
+progressMonitor=進捗モニター
 
 #
 # accessible states
 #
-managesDescendants=\u5B50\u5B6B\u3092\u7BA1\u7406
-indeterminate=\u4E0D\u78BA\u5B9A
-truncated=\u4E0D\u5B8C\u5168
+managesDescendants=子孫を管理
+indeterminate=不確定
+truncated=不完全
 
 # new for J2SE 1.6.0
 
 #
 # accessible roles
 #
-htmlcontainer=HTML\u30B3\u30F3\u30C6\u30CA
+htmlcontainer=HTMLコンテナ
 
 #
 # END OF MATERIAL TO LOCALIZE
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties
index ed1119d97c0..8e31c1490b8 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties
@@ -38,133 +38,133 @@
 #
 # accessible roles
 #
-alert=\uACBD\uBCF4
-awtcomponent=AWT \uAD6C\uC131\uC694\uC18C
-checkbox=\uCCB4\uD06C\uBC15\uC2A4
-colorchooser=\uC0C9\uC0C1 \uC120\uD0DD\uAE30
-columnheader=\uC5F4 \uBA38\uB9AC\uAE00
-combobox=\uCF64\uBCF4 \uC0C1\uC790
-canvas=\uCE94\uBC84\uC2A4
-desktopicon=\uBC14\uD0D5\uD654\uBA74 \uC544\uC774\uCF58
-desktoppane=\uBC14\uD0D5\uD654\uBA74 \uCC3D
-dialog=\uB300\uD654\uC0C1\uC790
-directorypane=\uB514\uB809\uD1A0\uB9AC \uCC3D
-glasspane=\uAE00\uB798\uC2A4 \uCC3D
-filechooser=\uD30C\uC77C \uC120\uD0DD\uAE30
-filler=\uD544\uB7EC
-frame=\uD504\uB808\uC784
-internalframe=\uB0B4\uBD80 \uD504\uB808\uC784
-label=\uB808\uC774\uBE14
-layeredpane=\uACC4\uCE35\uC801 \uCC3D
-list=\uBAA9\uB85D
-listitem=\uBAA9\uB85D \uD56D\uBAA9
-menubar=\uBA54\uB274 \uD45C\uC2DC\uC904
-menu=\uBA54\uB274
-menuitem=\uBA54\uB274 \uD56D\uBAA9
-optionpane=\uC635\uC158 \uCC3D
-pagetab=\uD398\uC774\uC9C0 \uD0ED
-pagetablist=\uD398\uC774\uC9C0 \uD0ED \uBAA9\uB85D
-panel=\uD328\uB110
-passwordtext=\uBE44\uBC00\uBC88\uD638 \uD14D\uC2A4\uD2B8
-popupmenu=\uD31D\uC5C5 \uBA54\uB274
-progressbar=\uC9C4\uD589 \uB9C9\uB300
-pushbutton=\uB204\uB984 \uB2E8\uCD94
-radiobutton=\uB77C\uB514\uC624 \uB2E8\uCD94
-rootpane=\uB8E8\uD2B8 \uCC3D
-rowheader=\uD589 \uBA38\uB9AC\uAE00
-scrollbar=\uC2A4\uD06C\uB864 \uB9C9\uB300
-scrollpane=\uC2A4\uD06C\uB864 \uCC3D
-separator=\uAD6C\uBD84 \uAE30\uD638
-slider=\uC2AC\uB77C\uC774\uB354
-splitpane=\uBD84\uD560 \uCC3D
-swingcomponent=\uD68C\uC804 \uAD6C\uC131\uC694\uC18C
-table=\uD14C\uC774\uBE14
-text=\uD14D\uC2A4\uD2B8
-tree=\uD2B8\uB9AC
-togglebutton=\uD1A0\uAE00 \uB2E8\uCD94
-toolbar=\uB3C4\uAD6C \uBAA8\uC74C
-tooltip=\uB3C4\uAD6C \uC124\uBA85
-unknown=\uC54C \uC218 \uC5C6\uC74C
-viewport=\uBDF0\uD3EC\uD2B8
-window=\uCC3D
+alert=경보
+awtcomponent=AWT 구성요소
+checkbox=체크박스
+colorchooser=색상 선택기
+columnheader=열 머리글
+combobox=콤보 상자
+canvas=캔버스
+desktopicon=바탕화면 아이콘
+desktoppane=바탕화면 창
+dialog=대화상자
+directorypane=디렉토리 창
+glasspane=글래스 창
+filechooser=파일 선택기
+filler=필러
+frame=프레임
+internalframe=내부 프레임
+label=레이블
+layeredpane=계층적 창
+list=목록
+listitem=목록 항목
+menubar=메뉴 표시줄
+menu=메뉴
+menuitem=메뉴 항목
+optionpane=옵션 창
+pagetab=페이지 탭
+pagetablist=페이지 탭 목록
+panel=패널
+passwordtext=비밀번호 텍스트
+popupmenu=팝업 메뉴
+progressbar=진행 막대
+pushbutton=누름 단추
+radiobutton=라디오 단추
+rootpane=루트 창
+rowheader=행 머리글
+scrollbar=스크롤 막대
+scrollpane=스크롤 창
+separator=구분 기호
+slider=슬라이더
+splitpane=분할 창
+swingcomponent=회전 구성요소
+table=테이블
+text=텍스트
+tree=트리
+togglebutton=토글 단추
+toolbar=도구 모음
+tooltip=도구 설명
+unknown=알 수 없음
+viewport=뷰포트
+window=창
 #
 # accessible relations
 #
-labelFor=\uB808\uC774\uBE14 \uB300\uC0C1
-labeledBy=\uB808\uC774\uBE14 \uC9C0\uC815\uC790
-memberOf=\uC18C\uC18D \uADF8\uB8F9
+labelFor=레이블 대상
+labeledBy=레이블 지정자
+memberOf=소속 그룹
 controlledBy=controlledBy
 controllerFor=controllerFor
 #
 # accessible states
 #
-active=\uD65C\uC131
-armed=\uD06C\uAE30
-busy=\uC0AC\uC6A9 \uC911
-checked=\uC120\uD0DD\uB428
-collapsed=\uCD95\uC18C\uB428
-editable=\uD3B8\uC9D1 \uAC00\uB2A5
-expandable=\uD655\uC7A5 \uAC00\uB2A5
-expanded=\uD655\uC7A5\uB428
-enabled=\uC0AC\uC6A9
-focusable=\uD3EC\uCEE4\uC2A4 \uAC00\uB2A5
-focused=\uD3EC\uCEE4\uC2A4\uB428
-iconified=\uC544\uC774\uCF58\uD654\uB428
-modal=\uBAA8\uB2EC
-multiline=\uBCF5\uC218 \uD589
-multiselectable=\uB2E4\uC911 \uC120\uD0DD \uAC00\uB2A5
-opaque=\uBD88\uD22C\uBA85
-pressed=\uB204\uB984
-resizable=\uD06C\uAE30 \uC870\uC815 \uAC00\uB2A5
-selectable=\uC120\uD0DD \uAC00\uB2A5
-selected=\uC120\uD0DD\uB428
-showing=\uD45C\uC2DC
-singleline=\uD55C \uC904
-transient=\uC77C\uC2DC
-visible=\uD45C\uC2DC \uAC00\uB2A5
-vertical=\uC138\uB85C
-horizontal=\uAC00\uB85C
+active=활성
+armed=크기
+busy=사용 중
+checked=선택됨
+collapsed=축소됨
+editable=편집 가능
+expandable=확장 가능
+expanded=확장됨
+enabled=사용
+focusable=포커스 가능
+focused=포커스됨
+iconified=아이콘화됨
+modal=모달
+multiline=복수 행
+multiselectable=다중 선택 가능
+opaque=불투명
+pressed=누름
+resizable=크기 조정 가능
+selectable=선택 가능
+selected=선택됨
+showing=표시
+singleline=한 줄
+transient=일시
+visible=표시 가능
+vertical=세로
+horizontal=가로
 #
 # accessible actions
 #
-toggleexpand=\uD1A0\uAE00 \uD655\uC7A5
+toggleexpand=토글 확장
 
 # new relations, roles and states for J2SE 1.5.0
 
 #
 # accessible relations
 #
-flowsTo=\uD750\uB984 \uB300\uC0C1
-flowsFrom=\uD750\uB984 \uCD9C\uCC98
-subwindowOf=\uD558\uC704 \uCC3D
-parentWindowOf=\uC0C1\uC704 \uCC3D
-embeds=\uD3EC\uD568
-embeddedBy=\uD3EC\uD568 \uC8FC\uCCB4
-childNodeOf=\uD558\uC704 \uB178\uB4DC
+flowsTo=흐름 대상
+flowsFrom=흐름 출처
+subwindowOf=하위 창
+parentWindowOf=상위 창
+embeds=포함
+embeddedBy=포함 주체
+childNodeOf=하위 노드
 
 #
 # accessible roles
 #
-header=\uBA38\uB9AC\uAE00
-footer=\uBC14\uB2E5\uAE00
-paragraph=\uB2E8\uB77D
-ruler=\uB208\uAE08\uC790
-editbar=\uD3B8\uC9D1 \uB3C4\uAD6C
-progressMonitor=\uC9C4\uD589 \uBAA8\uB2C8\uD130
+header=머리글
+footer=바닥글
+paragraph=단락
+ruler=눈금자
+editbar=편집 도구
+progressMonitor=진행 모니터
 
 #
 # accessible states
 #
-managesDescendants=\uC885\uC18D \uD56D\uBAA9 \uAD00\uB9AC
-indeterminate=\uD655\uC815\uB418\uC9C0 \uC54A\uC74C
-truncated=\uC798\uB9BC
+managesDescendants=종속 항목 관리
+indeterminate=확정되지 않음
+truncated=잘림
 
 # new for J2SE 1.6.0
 
 #
 # accessible roles
 #
-htmlcontainer=HTML \uCEE8\uD14C\uC774\uB108
+htmlcontainer=HTML 컨테이너
 
 #
 # END OF MATERIAL TO LOCALIZE
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties
index a26e0e88f3b..82ccfe71436 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties
@@ -40,38 +40,38 @@
 #
 alert=alerta
 awtcomponent=componente AWT
-checkbox=caixa de sele\u00E7\u00E3o
+checkbox=caixa de seleção
 colorchooser=seletor de cores
-columnheader=cabe\u00E7alho da coluna
-combobox=caixa de combina\u00E7\u00E3o
+columnheader=cabeçalho da coluna
+combobox=caixa de combinação
 canvas=tela
-desktopicon=\u00EDcone da \u00E1rea de trabalho
-desktoppane=painel da \u00E1rea de trabalho
-dialog=caixa de di\u00E1logo
-directorypane=painel do diret\u00F3rio
+desktopicon=ícone da área de trabalho
+desktoppane=painel da área de trabalho
+dialog=caixa de diálogo
+directorypane=painel do diretório
 glasspane=painel transparente
 filechooser=seletor de arquivos
 filler=preenchedor
 frame=quadro
 internalframe=quadro interno
-label=r\u00F3tulo
+label=rótulo
 layeredpane=painel em camadas
 list=lista
 listitem=item da lista
 menubar=barra de menus
 menu=menu
 menuitem=item do menu
-optionpane=painel de op\u00E7\u00F5es
-pagetab=guia da p\u00E1gina
-pagetablist=lista de guias da p\u00E1gina
+optionpane=painel de opções
+pagetab=guia da página
+pagetablist=lista de guias da página
 panel=painel
 passwordtext=texto da senha
 popupmenu=menu pop-up
 progressbar=barra de progresso
-pushbutton=bot\u00E3o de a\u00E7\u00E3o
-radiobutton=bot\u00E3o de op\u00E7\u00E3o
+pushbutton=botão de ação
+radiobutton=botão de opção
 rootpane=painel base
-rowheader=cabe\u00E7alho da linha
+rowheader=cabeçalho da linha
 scrollbar=barra de rolagem
 scrollpane=painel de rolagem
 separator=separador
@@ -80,17 +80,17 @@ splitpane=painel dividido
 swingcomponent=componente swing
 table=tabela
 text=texto
-tree=\u00E1rvore
-togglebutton=bot\u00E3o de altern\u00E2ncia
+tree=árvore
+togglebutton=botão de alternância
 toolbar=barra de ferramentas
 tooltip=dica de ferramenta
 unknown=desconhecido
-viewport=janela de visualiza\u00E7\u00E3o
+viewport=janela de visualização
 window=janela
 #
 # accessible relations
 #
-labelFor=r\u00F3tulo de
+labelFor=rótulo de
 labeledBy=rotulado por
 memberOf=membro de
 controlledBy=controlledBy
@@ -102,26 +102,26 @@ active=ativo
 armed=armado
 busy=ocupado
 checked=selecionado
-collapsed=contra\u00EDdo
-editable=edit\u00E1vel
-expandable=expans\u00EDvel
+collapsed=contraído
+editable=editável
+expandable=expansível
 expanded=expandido
 enabled=ativado
-focusable=focaliz\u00E1vel
+focusable=focalizável
 focused=focalizado
 iconified=iconizado
 modal=modal
-multiline=v\u00E1rias linhas
-multiselectable=m\u00FAltipla escolha
+multiline=várias linhas
+multiselectable=múltipla escolha
 opaque=opaco
 pressed=pressionado
-resizable=redimension\u00E1vel
-selectable=selecion\u00E1vel
+resizable=redimensionável
+selectable=selecionável
 selected=selecionado
 showing=mostrando
-singleline=linha \u00FAnica
-transient=transit\u00F3rio
-visible=vis\u00EDvel
+singleline=linha única
+transient=transitório
+visible=visível
 vertical=vertical
 horizontal=horizontal
 #
@@ -140,16 +140,16 @@ subwindowOf=subjanela de
 parentWindowOf=janela pai de
 embeds=integra
 embeddedBy=integrado por
-childNodeOf=n\u00F3 filho de
+childNodeOf=nó filho de
 
 #
 # accessible roles
 #
-header=cabe\u00E7alho
-footer=rodap\u00E9
-paragraph=par\u00E1grafo
-ruler=r\u00E9gua
-editbar=barra de edi\u00E7\u00E3o
+header=cabeçalho
+footer=rodapé
+paragraph=parágrafo
+ruler=régua
+editbar=barra de edição
 progressMonitor=monitor de progresso
 
 #
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties
index dbc8b52f9da..89705a5c8b7 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties
@@ -41,7 +41,7 @@
 alert=avisering
 awtcomponent=AWT-komponent
 checkbox=kryssruta
-colorchooser=f\u00E4rgv\u00E4ljare
+colorchooser=färgväljare
 columnheader=kolumnrubrik
 combobox=kombinationsruta
 canvas=rityta
@@ -50,7 +50,7 @@ desktoppane=skrivbordsruta
 dialog=dialogruta
 directorypane=katalogruta
 glasspane=glasruta
-filechooser=filv\u00E4ljare
+filechooser=filväljare
 filler=utfyllnad
 frame=ram
 internalframe=intern ram
@@ -65,7 +65,7 @@ optionpane=alternativruta
 pagetab=sidflik
 pagetablist=sidflikslista
 panel=panel
-passwordtext=l\u00F6senordstext
+passwordtext=lösenordstext
 popupmenu=snabbmeny
 progressbar=statusrad
 pushbutton=knapp
@@ -80,17 +80,17 @@ splitpane=delad ruta
 swingcomponent=swing-komponent
 table=tabell
 text=text
-tree=tr\u00E4d
-togglebutton=v\u00E4xlingsknapp
+tree=träd
+togglebutton=växlingsknapp
 toolbar=verktygsrad
 tooltip=knappbeskrivning
-unknown=ok\u00E4nd
+unknown=okänd
 viewport=vyport
-window=f\u00F6nster
+window=fönster
 #
 # accessible relations
 #
-labelFor=etikett f\u00F6r
+labelFor=etikett för
 labeledBy=etikett av
 memberOf=medlem i
 controlledBy=controlledBy
@@ -104,8 +104,8 @@ busy=upptagen
 checked=markerad
 collapsed=komprimerad
 editable=redigerbar
-expandable=ut\u00F6kningsbar
-expanded=ut\u00F6kad
+expandable=utökningsbar
+expanded=utökad
 enabled=aktiverad
 focusable=fokuseringsbar
 focused=fokuserad
@@ -115,32 +115,32 @@ multiline=flera rader
 multiselectable=flerval
 opaque=ogenomskinlig
 pressed=nedtryckt
-resizable=storleks\u00E4ndringsbar
+resizable=storleksändringsbar
 selectable=valbar
 selected=vald
 showing=visar
 singleline=en rad
-transient=tillf\u00E4llig
+transient=tillfällig
 visible=synlig
 vertical=vertikal
 horizontal=horisontell
 #
 # accessible actions
 #
-toggleexpand=v\u00E4xla expandering
+toggleexpand=växla expandering
 
 # new relations, roles and states for J2SE 1.5.0
 
 #
 # accessible relations
 #
-flowsTo=fl\u00F6dar till
-flowsFrom=fl\u00F6dar fr\u00E5n
-subwindowOf=delf\u00F6nster av
-parentWindowOf=\u00F6verordnat f\u00F6nster f\u00F6r
-embeds=b\u00E4ddar in
-embeddedBy=b\u00E4ddas in av
-childNodeOf=underordnad nod f\u00F6r
+flowsTo=flödar till
+flowsFrom=flödar från
+subwindowOf=delfönster av
+parentWindowOf=överordnat fönster för
+embeds=bäddar in
+embeddedBy=bäddas in av
+childNodeOf=underordnad nod för
 
 #
 # accessible roles
@@ -150,13 +150,13 @@ footer=sidfot
 paragraph=stycke
 ruler=linjal
 editbar=redigeringslist
-progressMonitor=f\u00F6rlopps\u00F6vervakare
+progressMonitor=förloppsövervakare
 
 #
 # accessible states
 #
 managesDescendants=hanterar underordnade
-indeterminate=obest\u00E4mt
+indeterminate=obestämt
 truncated=kapad
 
 # new for J2SE 1.6.0
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties
index c5c02b96397..a72b60b0ed7 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties
@@ -38,133 +38,133 @@
 #
 # accessible roles
 #
-alert=\u9884\u8B66
-awtcomponent=AWT \u7EC4\u4EF6
-checkbox=\u590D\u9009\u6846
-colorchooser=\u989C\u8272\u9009\u62E9\u5668
-columnheader=\u5217\u6807\u9898
-combobox=\u7EC4\u5408\u6846
-canvas=\u753B\u5E03
-desktopicon=\u684C\u9762\u56FE\u6807
-desktoppane=\u684C\u9762\u7A97\u683C
-dialog=\u5BF9\u8BDD
-directorypane=\u76EE\u5F55\u7A97\u683C
-glasspane=\u73BB\u7483\u7A97\u683C
-filechooser=\u6587\u4EF6\u9009\u62E9\u5668
-filler=\u6F0F\u6597
-frame=\u6846\u67B6
-internalframe=\u5185\u90E8\u6846\u67B6
-label=\u6807\u7B7E
-layeredpane=\u5206\u5C42\u7A97\u683C
-list=\u5217\u8868
-listitem=\u5217\u8868\u9879
-menubar=\u83DC\u5355\u680F
-menu=\u83DC\u5355
-menuitem=\u83DC\u5355\u9879
-optionpane=\u9009\u9879\u7A97\u683C
-pagetab=\u9875\u6807\u7B7E
-pagetablist=\u9875\u6807\u7B7E\u5217\u8868
-panel=\u9762\u677F
-passwordtext=\u53E3\u4EE4\u6587\u672C
-popupmenu=\u5F39\u51FA\u5F0F\u83DC\u5355
-progressbar=\u8FDB\u5EA6\u680F
-pushbutton=\u6309\u94AE
-radiobutton=\u5355\u9009\u6309\u94AE
-rootpane=\u6839\u7A97\u683C
-rowheader=\u884C\u6807\u9898
-scrollbar=\u6EDA\u52A8\u6761
-scrollpane=\u6EDA\u52A8\u7A97\u683C
-separator=\u5206\u9694\u6761
-slider=\u6ED1\u5757
-splitpane=\u62C6\u5206\u7A97\u683C
-swingcomponent=\u65CB\u8F6C\u7EC4\u4EF6
-table=\u8868
-text=\u6587\u672C
-tree=\u6811
-togglebutton=\u5207\u6362\u6309\u94AE
-toolbar=\u5DE5\u5177\u680F
-tooltip=\u5DE5\u5177\u63D0\u793A
-unknown=\u672A\u77E5
-viewport=\u89C6\u7A97
-window=\u7A97\u53E3
+alert=预警
+awtcomponent=AWT 组件
+checkbox=复选框
+colorchooser=颜色选择器
+columnheader=列标题
+combobox=组合框
+canvas=画布
+desktopicon=桌面图标
+desktoppane=桌面窗格
+dialog=对话
+directorypane=目录窗格
+glasspane=玻璃窗格
+filechooser=文件选择器
+filler=漏斗
+frame=框架
+internalframe=内部框架
+label=标签
+layeredpane=分层窗格
+list=列表
+listitem=列表项
+menubar=菜单栏
+menu=菜单
+menuitem=菜单项
+optionpane=选项窗格
+pagetab=页标签
+pagetablist=页标签列表
+panel=面板
+passwordtext=口令文本
+popupmenu=弹出式菜单
+progressbar=进度栏
+pushbutton=按钮
+radiobutton=单选按钮
+rootpane=根窗格
+rowheader=行标题
+scrollbar=滚动条
+scrollpane=滚动窗格
+separator=分隔条
+slider=滑块
+splitpane=拆分窗格
+swingcomponent=旋转组件
+table=表
+text=文本
+tree=树
+togglebutton=切换按钮
+toolbar=工具栏
+tooltip=工具提示
+unknown=未知
+viewport=视窗
+window=窗口
 #
 # accessible relations
 #
-labelFor=\u6807\u7B7E\u5C5E\u4E8E
-labeledBy=\u6807\u7B7E\u5236\u4F5C\u8005
-memberOf=\u5C5E\u4E8E
+labelFor=标签属于
+labeledBy=标签制作者
+memberOf=属于
 controlledBy=controlledBy
 controllerFor=controllerFor
 #
 # accessible states
 #
-active=\u6D3B\u52A8
-armed=\u5F85\u547D
-busy=\u5FD9
-checked=\u5DF2\u9009\u4E2D
-collapsed=\u5DF2\u6536\u7F29
-editable=\u53EF\u7F16\u8F91
-expandable=\u53EF\u5C55\u5F00
-expanded=\u5DF2\u5C55\u5F00
-enabled=\u542F\u7528
-focusable=\u53EF\u96C6\u4E2D
-focused=\u5DF2\u96C6\u4E2D
-iconified=\u56FE\u6807\u5F0F
-modal=\u6A21\u6001
-multiline=\u591A\u884C
-multiselectable=\u591A\u9009\u62E9
-opaque=\u4E0D\u900F\u660E
-pressed=\u5DF2\u6309\u4E0B
-resizable=\u53EF\u8C03\u6574\u5927\u5C0F
-selectable=\u53EF\u9009\u62E9
-selected=\u6240\u9009
-showing=\u6B63\u5728\u663E\u793A
-singleline=\u5355\u884C
-transient=\u77AC\u65F6
-visible=\u53EF\u89C1
-vertical=\u5782\u76F4
-horizontal=\u6C34\u5E73
+active=活动
+armed=待命
+busy=忙
+checked=已选中
+collapsed=已收缩
+editable=可编辑
+expandable=可展开
+expanded=已展开
+enabled=启用
+focusable=可集中
+focused=已集中
+iconified=图标式
+modal=模态
+multiline=多行
+multiselectable=多选择
+opaque=不透明
+pressed=已按下
+resizable=可调整大小
+selectable=可选择
+selected=所选
+showing=正在显示
+singleline=单行
+transient=瞬时
+visible=可见
+vertical=垂直
+horizontal=水平
 #
 # accessible actions
 #
-toggleexpand=\u5207\u6362\u5C55\u5F00
+toggleexpand=切换展开
 
 # new relations, roles and states for J2SE 1.5.0
 
 #
 # accessible relations
 #
-flowsTo=\u6D41\u5411
-flowsFrom=\u6D41\u81EA
-subwindowOf=\u5B50\u7A97\u53E3
-parentWindowOf=\u7236\u7A97\u53E3
-embeds=\u5D4C\u5165\u9879
-embeddedBy=\u5D4C\u5165\u8005
-childNodeOf=\u5B50\u8282\u70B9
+flowsTo=流向
+flowsFrom=流自
+subwindowOf=子窗口
+parentWindowOf=父窗口
+embeds=嵌入项
+embeddedBy=嵌入者
+childNodeOf=子节点
 
 #
 # accessible roles
 #
-header=\u9875\u7709
-footer=\u9875\u811A
-paragraph=\u6BB5\u843D
-ruler=\u6807\u5C3A
-editbar=\u7F16\u8F91\u680F
-progressMonitor=\u8FDB\u5EA6\u76D1\u89C6\u5668
+header=页眉
+footer=页脚
+paragraph=段落
+ruler=标尺
+editbar=编辑栏
+progressMonitor=进度监视器
 
 #
 # accessible states
 #
-managesDescendants=\u7BA1\u7406\u5B50\u9879
-indeterminate=\u4E0D\u786E\u5B9A
-truncated=\u5DF2\u622A\u65AD
+managesDescendants=管理子项
+indeterminate=不确定
+truncated=已截断
 
 # new for J2SE 1.6.0
 
 #
 # accessible roles
 #
-htmlcontainer=HTML \u5BB9\u5668
+htmlcontainer=HTML 容器
 
 #
 # END OF MATERIAL TO LOCALIZE
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties
index 40152f2d0d9..5f0fae382b4 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties
@@ -38,133 +38,133 @@
 #
 # accessible roles
 #
-alert=\u8B66\u793A
-awtcomponent=AWT \u5143\u4EF6
-checkbox=\u6838\u53D6\u65B9\u584A
-colorchooser=\u8272\u5F69\u9078\u64C7\u5668
-columnheader=\u76F4\u6B04\u6A19\u984C
-combobox=\u4E0B\u62C9\u5F0F\u6E05\u55AE\u65B9\u584A
-canvas=\u756B\u5E03
-desktopicon=\u684C\u9762\u5716\u793A
-desktoppane=\u684C\u9762\u7A97\u683C
-dialog=\u5C0D\u8A71\u65B9\u584A
-directorypane=\u76EE\u9304\u7A97\u683C
-glasspane=\u6AA2\u8996\u7A97\u683C
-filechooser=\u6A94\u6848\u9078\u64C7\u5668
-filler=\u586B\u5145\u7269
-frame=\u6846\u67B6
-internalframe=\u5167\u90E8\u6846\u67B6
-label=\u6A19\u7C64
-layeredpane=\u5206\u5C64\u7A97\u683C
-list=\u6E05\u55AE
-listitem=\u6E05\u55AE\u9805\u76EE
-menubar=\u529F\u80FD\u8868\u5217
-menu=\u529F\u80FD\u8868
-menuitem=\u529F\u80FD\u8868\u9805\u76EE
-optionpane=\u9078\u9805\u7A97\u683C
-pagetab=\u9801\u9762\u9801\u7C64
-pagetablist=\u9801\u9762\u9801\u7C64\u6E05\u55AE
-panel=\u9762\u677F
-passwordtext=\u5BC6\u78BC\u6587\u5B57
-popupmenu=\u5373\u73FE\u5F0F\u529F\u80FD\u8868
-progressbar=\u9032\u5EA6\u5217
-pushbutton=\u4E0B\u58D3\u6309\u9215
-radiobutton=\u5713\u9215
-rootpane=root \u7A97\u683C
-rowheader=\u5217\u6A19\u984C
-scrollbar=\u6372\u8EF8
-scrollpane=\u6372\u52D5\u7A97\u683C
-separator=\u5206\u9694\u5143
-slider=\u6ED1\u52D5\u8EF8
-splitpane=\u5206\u5272\u7A97\u683C
-swingcomponent=Swing \u5143\u4EF6
-table=\u8868\u683C
-text=\u6587\u5B57
-tree=\u6A39\u72C0\u7D50\u69CB
-togglebutton=\u5207\u63DB\u6309\u9215
-toolbar=\u5DE5\u5177\u5217
-tooltip=\u5DE5\u5177\u63D0\u793A
-unknown=\u4E0D\u660E\u7684
-viewport=\u6AA2\u8996\u5340
-window=\u8996\u7A97
+alert=警示
+awtcomponent=AWT 元件
+checkbox=核取方塊
+colorchooser=色彩選擇器
+columnheader=直欄標題
+combobox=下拉式清單方塊
+canvas=畫布
+desktopicon=桌面圖示
+desktoppane=桌面窗格
+dialog=對話方塊
+directorypane=目錄窗格
+glasspane=檢視窗格
+filechooser=檔案選擇器
+filler=填充物
+frame=框架
+internalframe=內部框架
+label=標籤
+layeredpane=分層窗格
+list=清單
+listitem=清單項目
+menubar=功能表列
+menu=功能表
+menuitem=功能表項目
+optionpane=選項窗格
+pagetab=頁面頁籤
+pagetablist=頁面頁籤清單
+panel=面板
+passwordtext=密碼文字
+popupmenu=即現式功能表
+progressbar=進度列
+pushbutton=下壓按鈕
+radiobutton=圓鈕
+rootpane=root 窗格
+rowheader=列標題
+scrollbar=捲軸
+scrollpane=捲動窗格
+separator=分隔元
+slider=滑動軸
+splitpane=分割窗格
+swingcomponent=Swing 元件
+table=表格
+text=文字
+tree=樹狀結構
+togglebutton=切換按鈕
+toolbar=工具列
+tooltip=工具提示
+unknown=不明的
+viewport=檢視區
+window=視窗
 #
 # accessible relations
 #
-labelFor=\u6A19\u793A\u5C0D\u8C61
-labeledBy=\u6A19\u793A\u8005
-memberOf=\u6240\u5C6C\u6210\u54E1
-controlledBy=\u63A7\u5236\u8005
-controllerFor=\u63A7\u5236\u5C0D\u8C61
+labelFor=標示對象
+labeledBy=標示者
+memberOf=所屬成員
+controlledBy=控制者
+controllerFor=控制對象
 #
 # accessible states
 #
-active=\u4F5C\u7528\u4E2D
-armed=\u5DF2\u914D\u5099
-busy=\u5FD9\u788C\u4E2D
-checked=\u5DF2\u6838\u9078
-collapsed=\u5DF2\u6536\u7E2E
-editable=\u53EF\u7DE8\u8F2F
-expandable=\u53EF\u64F4\u5C55
-expanded=\u5DF2\u64F4\u5C55
-enabled=\u5DF2\u555F\u7528
-focusable=\u53EF\u805A\u7126
-focused=\u5DF2\u805A\u7126
-iconified=\u5DF2\u5716\u793A\u5316
-modal=\u6A21\u614B
-multiline=\u591A\u884C
-multiselectable=\u53EF\u591A\u91CD\u9078\u53D6
-opaque=\u4E0D\u900F\u660E
-pressed=\u5DF2\u6309\u4E0B
-resizable=\u53EF\u8ABF\u6574\u5927\u5C0F
-selectable=\u53EF\u9078\u53D6
-selected=\u5DF2\u9078\u53D6
-showing=\u986F\u793A
-singleline=\u55AE\u884C
-transient=\u66AB\u6642\u7684
-visible=\u53EF\u898B\u7684
-vertical=\u5782\u76F4
-horizontal=\u6C34\u5E73
+active=作用中
+armed=已配備
+busy=忙碌中
+checked=已核選
+collapsed=已收縮
+editable=可編輯
+expandable=可擴展
+expanded=已擴展
+enabled=已啟用
+focusable=可聚焦
+focused=已聚焦
+iconified=已圖示化
+modal=模態
+multiline=多行
+multiselectable=可多重選取
+opaque=不透明
+pressed=已按下
+resizable=可調整大小
+selectable=可選取
+selected=已選取
+showing=顯示
+singleline=單行
+transient=暫時的
+visible=可見的
+vertical=垂直
+horizontal=水平
 #
 # accessible actions
 #
-toggleexpand=\u5207\u63DB\u64F4\u5C55
+toggleexpand=切換擴展
 
 # new relations, roles and states for J2SE 1.5.0
 
 #
 # accessible relations
 #
-flowsTo=\u6D41\u52D5\u81F3
-flowsFrom=\u6D41\u52D5\u81EA
-subwindowOf=\u5B50\u8996\u7A97
-parentWindowOf=\u7236\u7CFB\u8996\u7A97
-embeds=\u5167\u5D4C
-embeddedBy=\u5167\u5D4C\u8005
-childNodeOf=\u5B50\u7BC0\u9EDE
+flowsTo=流動至
+flowsFrom=流動自
+subwindowOf=子視窗
+parentWindowOf=父系視窗
+embeds=內嵌
+embeddedBy=內嵌者
+childNodeOf=子節點
 
 #
 # accessible roles
 #
-header=\u9801\u9996
-footer=\u9801\u5C3E
-paragraph=\u6BB5\u843D
-ruler=\u5C3A\u898F
-editbar=\u7DE8\u8F2F\u5217
-progressMonitor=\u9032\u5EA6\u76E3\u8996\u5668
+header=頁首
+footer=頁尾
+paragraph=段落
+ruler=尺規
+editbar=編輯列
+progressMonitor=進度監視器
 
 #
 # accessible states
 #
-managesDescendants=\u7BA1\u7406\u5B50\u4EE3
-indeterminate=\u4E0D\u78BA\u5B9A
-truncated=\u5DF2\u622A\u65B7
+managesDescendants=管理子代
+indeterminate=不確定
+truncated=已截斷
 
 # new for J2SE 1.6.0
 
 #
 # accessible roles
 #
-htmlcontainer=HTML \u5BB9\u5668
+htmlcontainer=HTML 容器
 
 #
 # END OF MATERIAL TO LOCALIZE
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
index 1a5047c76f0..232d38dd22e 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
@@ -38,9 +38,9 @@ GTKColorChooserPanel.hue.textAndMnemonic=&Farbton:
 
 GTKColorChooserPanel.red.textAndMnemonic=R&ot:
 
-GTKColorChooserPanel.saturation.textAndMnemonic=&S\u00E4ttigung:
+GTKColorChooserPanel.saturation.textAndMnemonic=&Sättigung:
 
-GTKColorChooserPanel.green.textAndMnemonic=&Gr\u00FCn:
+GTKColorChooserPanel.green.textAndMnemonic=&Grün:
 
 GTKColorChooserPanel.value.textAndMnemonic=&Wert:
 
@@ -57,21 +57,21 @@ FileChooser.newFolderButton.textAndMnemonic=&Neuer Ordner
 FileChooser.newFolderDialog.textAndMnemonic=Ordnername:
 FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Fehler
 FileChooser.newFolderNoDirectoryError.textAndMnemonic=Fehler beim Erstellen von Verzeichnis "{0}": Datei oder Verzeichnis nicht vorhanden
-FileChooser.deleteFileButton.textAndMnemonic=Datei &l\u00F6schen
+FileChooser.deleteFileButton.textAndMnemonic=Datei &löschen
 FileChooser.renameFileButton.textAndMnemonic=Datei &umbenennen
 FileChooser.cancelButton.textAndMnemonic=Abbrechen
 FileChooser.saveButton.textAndMnemonic=Speichern
-FileChooser.openButton.textAndMnemonic=\u00D6ffnen
+FileChooser.openButton.textAndMnemonic=Öffnen
 FileChooser.saveDialogTitle.textAndMnemonic=Speichern
-FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.openDialogTitle.textAndMnemonic=Öffnen
 FileChooser.pathLabel.textAndMnemonic=Aus&wahl:
 FileChooser.filterLabel.textAndMnemonic=Filter:
 FileChooser.foldersLabel.textAndMnemonic=O&rdner
 FileChooser.filesLabel.textAndMnemonic=&Dateien
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
-FileChooser.saveButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei speichern.
-FileChooser.openButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei \u00F6ffnen.
+FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld für Dateiauswahl schließen.
+FileChooser.saveButtonToolTip.textAndMnemonic=Ausgewählte Datei speichern.
+FileChooser.openButtonToolTip.textAndMnemonic=Ausgewählte Datei öffnen.
 
 FileChooser.renameFileDialog.textAndMnemonic=Datei "{0}" umbenennen in
 FileChooser.renameFileError.titleAndMnemonic=Fehler
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
index f8a31ab66ba..69e60f67935 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
@@ -38,7 +38,7 @@ GTKColorChooserPanel.hue.textAndMnemonic=&Mat:
 
 GTKColorChooserPanel.red.textAndMnemonic=Ro&jo:
 
-GTKColorChooserPanel.saturation.textAndMnemonic=&Saturaci\u00F3n:
+GTKColorChooserPanel.saturation.textAndMnemonic=&Saturación:
 
 GTKColorChooserPanel.green.textAndMnemonic=&Verde:
 
@@ -64,12 +64,12 @@ FileChooser.saveButton.textAndMnemonic=Aceptar
 FileChooser.openButton.textAndMnemonic=Aceptar
 FileChooser.saveDialogTitle.textAndMnemonic=Guardar
 FileChooser.openDialogTitle.textAndMnemonic=Abrir
-FileChooser.pathLabel.textAndMnemonic=&Selecci\u00F3n:
+FileChooser.pathLabel.textAndMnemonic=&Selección:
 FileChooser.filterLabel.textAndMnemonic=Filtro:
 FileChooser.foldersLabel.textAndMnemonic=Carpe&tas
 FileChooser.filesLabel.textAndMnemonic=&Archivos
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar cuadro de di\u00E1logo del selector de archivos.
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar cuadro de diálogo del selector de archivos.
 FileChooser.saveButtonToolTip.textAndMnemonic=Guardar el archivo seleccionado.
 FileChooser.openButtonToolTip.textAndMnemonic=Abrir el archivo seleccionado.
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
index 96874d51f69..a35f033dc72 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
@@ -31,12 +31,12 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=S\u00E9lecteur de couleurs &GTK
+GTKColorChooserPanel.textAndMnemonic=Sélecteur de couleurs &GTK
 # mnemonic as a VK_ constant
 
 GTKColorChooserPanel.hue.textAndMnemonic=&Teinte :
 
-GTKColorChooserPanel.red.textAndMnemonic=Roug&e\u00A0:
+GTKColorChooserPanel.red.textAndMnemonic=Roug&e :
 
 GTKColorChooserPanel.saturation.textAndMnemonic=&Saturation :
 
@@ -56,7 +56,7 @@ FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
 FileChooser.newFolderButton.textAndMnemonic=&Nouveau dossier
 FileChooser.newFolderDialog.textAndMnemonic=Nom du dossier :
 FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Erreur
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=Erreur lors de la cr\u00E9ation du r\u00E9pertoire "{0}" : ce fichier ou r\u00E9pertoire n''existe pas
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Erreur lors de la création du répertoire "{0}" : ce fichier ou répertoire n''existe pas
 FileChooser.deleteFileButton.textAndMnemonic=Supprimer &le fichier
 FileChooser.renameFileButton.textAndMnemonic=&Renommer le fichier
 FileChooser.cancelButton.textAndMnemonic=Annuler
@@ -64,14 +64,14 @@ FileChooser.saveButton.textAndMnemonic=OK
 FileChooser.openButton.textAndMnemonic=OK
 FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
 FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
-FileChooser.pathLabel.textAndMnemonic=&S\u00E9lection :
+FileChooser.pathLabel.textAndMnemonic=&Sélection :
 FileChooser.filterLabel.textAndMnemonic=Filtre :
 FileChooser.foldersLabel.textAndMnemonic=&Dossiers
 FileChooser.filesLabel.textAndMnemonic=&Fichiers
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers.
-FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier s\u00E9lectionn\u00E9.
-FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier s\u00E9lectionn\u00E9.
+FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la boîte de dialogue du sélecteur de fichiers.
+FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier sélectionné.
+FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier sélectionné.
 
 FileChooser.renameFileDialog.textAndMnemonic=Renomme le fichier "{0}" en
 FileChooser.renameFileError.titleAndMnemonic=Erreur
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
index 56b0e5c8f19..dd849546b5a 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
@@ -31,49 +31,49 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=GTK\u30AB\u30E9\u30FC\u30FB\u30C1\u30E5\u30FC\u30B6(&G)
+GTKColorChooserPanel.textAndMnemonic=GTKカラー・チューザ(&G)
 # mnemonic as a VK_ constant
 
-GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u76F8(&H):
+GTKColorChooserPanel.hue.textAndMnemonic=色相(&H):
 
-GTKColorChooserPanel.red.textAndMnemonic=\u8D64(&E):
+GTKColorChooserPanel.red.textAndMnemonic=赤(&E):
 
-GTKColorChooserPanel.saturation.textAndMnemonic=\u5F69\u5EA6(&S):
+GTKColorChooserPanel.saturation.textAndMnemonic=彩度(&S):
 
-GTKColorChooserPanel.green.textAndMnemonic=\u7DD1(&G):
+GTKColorChooserPanel.green.textAndMnemonic=緑(&G):
 
-GTKColorChooserPanel.value.textAndMnemonic=\u5024(&V):
+GTKColorChooserPanel.value.textAndMnemonic=値(&V):
 
-GTKColorChooserPanel.blue.textAndMnemonic=\u9752(&B):
+GTKColorChooserPanel.blue.textAndMnemonic=青(&B):
 
-GTKColorChooserPanel.color.textAndMnemonic=\u8272\u540D(&N):
+GTKColorChooserPanel.color.textAndMnemonic=色名(&N):
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
-FileChooser.newFolderButton.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0(&N)
-FileChooser.newFolderDialog.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u30A8\u30E9\u30FC
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: \u3053\u306E\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-FileChooser.deleteFileButton.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u524A\u9664(&L)
-FileChooser.renameFileButton.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(&R)
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
-FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openButton.textAndMnemonic=\u958B\u304F
-FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
-FileChooser.pathLabel.textAndMnemonic=\u9078\u629E(&S):
-FileChooser.filterLabel.textAndMnemonic=\u30D5\u30A3\u30EB\u30BF:
-FileChooser.foldersLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0(&D)
-FileChooser.filesLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB(&F)
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002
-FileChooser.saveButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002
-FileChooser.openButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059\u3002
-
-FileChooser.renameFileDialog.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB"{0}"\u3092\u6B21\u306E\u540D\u524D\u306B\u5909\u66F4:
-FileChooser.renameFileError.titleAndMnemonic=\u30A8\u30E9\u30FC
-FileChooser.renameFileError.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB"{0}"\u306E"{1}"\u3078\u306E\u5909\u66F4\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+FileChooser.acceptAllFileFilter.textAndMnemonic=すべてのファイル
+FileChooser.newFolderButton.textAndMnemonic=新規フォルダ(&N)
+FileChooser.newFolderDialog.textAndMnemonic=フォルダ名:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=エラー
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=ディレクトリ"{0}"の作成中にエラーが発生しました: このファイルまたはディレクトリは存在しません
+FileChooser.deleteFileButton.textAndMnemonic=ファイルの削除(&L)
+FileChooser.renameFileButton.textAndMnemonic=ファイルの名前変更(&R)
+FileChooser.cancelButton.textAndMnemonic=取消
+FileChooser.saveButton.textAndMnemonic=保存
+FileChooser.openButton.textAndMnemonic=開く
+FileChooser.saveDialogTitle.textAndMnemonic=保存
+FileChooser.openDialogTitle.textAndMnemonic=開く
+FileChooser.pathLabel.textAndMnemonic=選択(&S):
+FileChooser.filterLabel.textAndMnemonic=フィルタ:
+FileChooser.foldersLabel.textAndMnemonic=フォルダ(&D)
+FileChooser.filesLabel.textAndMnemonic=ファイル(&F)
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=ファイル・チューザ・ダイアログを終了します。
+FileChooser.saveButtonToolTip.textAndMnemonic=選択したファイルを保存します。
+FileChooser.openButtonToolTip.textAndMnemonic=選択したファイルを開きます。
+
+FileChooser.renameFileDialog.textAndMnemonic=ファイル"{0}"を次の名前に変更:
+FileChooser.renameFileError.titleAndMnemonic=エラー
+FileChooser.renameFileError.textAndMnemonic=ファイル"{0}"の"{1}"への変更中にエラーが発生しました
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
index 8856dfc3b2b..a1c404fc0a5 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
@@ -31,49 +31,49 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=GTK \uC0C9\uC0C1 \uC120\uD0DD\uAE30(&G)
+GTKColorChooserPanel.textAndMnemonic=GTK 색상 선택기(&G)
 # mnemonic as a VK_ constant
 
-GTKColorChooserPanel.hue.textAndMnemonic=\uC0C9\uC870(&H):
+GTKColorChooserPanel.hue.textAndMnemonic=색조(&H):
 
-GTKColorChooserPanel.red.textAndMnemonic=\uBE68\uAC04\uC0C9(&E):
+GTKColorChooserPanel.red.textAndMnemonic=빨간색(&E):
 
-GTKColorChooserPanel.saturation.textAndMnemonic=\uCC44\uB3C4(&S):
+GTKColorChooserPanel.saturation.textAndMnemonic=채도(&S):
 
-GTKColorChooserPanel.green.textAndMnemonic=\uB179\uC0C9(&G):
+GTKColorChooserPanel.green.textAndMnemonic=녹색(&G):
 
-GTKColorChooserPanel.value.textAndMnemonic=\uAC12(&V):
+GTKColorChooserPanel.value.textAndMnemonic=값(&V):
 
-GTKColorChooserPanel.blue.textAndMnemonic=\uD30C\uB780\uC0C9(&B):
+GTKColorChooserPanel.blue.textAndMnemonic=파란색(&B):
 
-GTKColorChooserPanel.color.textAndMnemonic=\uC0C9\uC0C1 \uC774\uB984(&N):
+GTKColorChooserPanel.color.textAndMnemonic=색상 이름(&N):
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C
-FileChooser.newFolderButton.textAndMnemonic=\uC0C8 \uD3F4\uB354(&N)
-FileChooser.newFolderDialog.textAndMnemonic=\uD3F4\uB354 \uC774\uB984:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\uC624\uB958
-FileChooser.newFolderNoDirectoryError.textAndMnemonic="{0}" \uB514\uB809\uD1A0\uB9AC\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: \uD574\uB2F9 \uD30C\uC77C \uB610\uB294 \uB514\uB809\uD1A0\uB9AC\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
-FileChooser.deleteFileButton.textAndMnemonic=\uD30C\uC77C \uC0AD\uC81C(&L)
-FileChooser.renameFileButton.textAndMnemonic=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30(&R)
-FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C
-FileChooser.saveButton.textAndMnemonic=\uD655\uC778
-FileChooser.openButton.textAndMnemonic=\uD655\uC778
-FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
-FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
-FileChooser.pathLabel.textAndMnemonic=\uC120\uD0DD\uC0AC\uD56D(&S):
-FileChooser.filterLabel.textAndMnemonic=\uD544\uD130:
-FileChooser.foldersLabel.textAndMnemonic=\uD3F4\uB354(&D)
-FileChooser.filesLabel.textAndMnemonic=\uD30C\uC77C(&F)
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
-FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4.
-FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4.
-
-FileChooser.renameFileDialog.textAndMnemonic="{0}" \uD30C\uC77C\uC758 \uC774\uB984 \uBC14\uAFB8\uAE30
-FileChooser.renameFileError.titleAndMnemonic=\uC624\uB958
-FileChooser.renameFileError.textAndMnemonic="{0}" \uD30C\uC77C\uC758 \uC774\uB984\uC744 "{1}"(\uC73C)\uB85C \uBC14\uAFB8\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+FileChooser.acceptAllFileFilter.textAndMnemonic=모든 파일
+FileChooser.newFolderButton.textAndMnemonic=새 폴더(&N)
+FileChooser.newFolderDialog.textAndMnemonic=폴더 이름:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=오류
+FileChooser.newFolderNoDirectoryError.textAndMnemonic="{0}" 디렉토리를 생성하는 중 오류 발생: 해당 파일 또는 디렉토리가 없습니다.
+FileChooser.deleteFileButton.textAndMnemonic=파일 삭제(&L)
+FileChooser.renameFileButton.textAndMnemonic=파일 이름 바꾸기(&R)
+FileChooser.cancelButton.textAndMnemonic=취소
+FileChooser.saveButton.textAndMnemonic=확인
+FileChooser.openButton.textAndMnemonic=확인
+FileChooser.saveDialogTitle.textAndMnemonic=저장
+FileChooser.openDialogTitle.textAndMnemonic=열기
+FileChooser.pathLabel.textAndMnemonic=선택사항(&S):
+FileChooser.filterLabel.textAndMnemonic=필터:
+FileChooser.foldersLabel.textAndMnemonic=폴더(&D)
+FileChooser.filesLabel.textAndMnemonic=파일(&F)
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=파일 선택기 대화상자를 중단합니다.
+FileChooser.saveButtonToolTip.textAndMnemonic=선택된 파일을 저장합니다.
+FileChooser.openButtonToolTip.textAndMnemonic=선택된 파일을 엽니다.
+
+FileChooser.renameFileDialog.textAndMnemonic="{0}" 파일의 이름 바꾸기
+FileChooser.renameFileError.titleAndMnemonic=오류
+FileChooser.renameFileError.textAndMnemonic="{0}" 파일의 이름을 "{1}"(으)로 바꾸는 중 오류가 발생했습니다.
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
index 4064325a74a..081c379a221 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
@@ -38,7 +38,7 @@ GTKColorChooserPanel.hue.textAndMnemonic=&Matiz:
 
 GTKColorChooserPanel.red.textAndMnemonic=V&ermelho:
 
-GTKColorChooserPanel.saturation.textAndMnemonic=&Satura\u00E7\u00E3o:
+GTKColorChooserPanel.saturation.textAndMnemonic=&Saturação:
 
 GTKColorChooserPanel.green.textAndMnemonic=&Verde:
 
@@ -56,7 +56,7 @@ FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos
 FileChooser.newFolderButton.textAndMnemonic=&Nova Pasta
 FileChooser.newFolderDialog.textAndMnemonic=Nome da pasta:
 FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Erro
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=Erro ao criar o diret\u00F3rio "{0}": N\u00E3o h\u00E1 arquivo ou diret\u00F3rio
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Erro ao criar o diretório "{0}": Não há arquivo ou diretório
 FileChooser.deleteFileButton.textAndMnemonic=De&letar Arquivo
 FileChooser.renameFileButton.textAndMnemonic=&Renomear Arquivo
 FileChooser.cancelButton.textAndMnemonic=Cancelar
@@ -64,12 +64,12 @@ FileChooser.saveButton.textAndMnemonic=OK
 FileChooser.openButton.textAndMnemonic=OK
 FileChooser.saveDialogTitle.textAndMnemonic=Salvar
 FileChooser.openDialogTitle.textAndMnemonic=Abrir
-FileChooser.pathLabel.textAndMnemonic=&Sele\u00E7\u00E3o:
+FileChooser.pathLabel.textAndMnemonic=&Seleção:
 FileChooser.filterLabel.textAndMnemonic=Filtro:
 FileChooser.foldersLabel.textAndMnemonic=&Pastas
 FileChooser.filesLabel.textAndMnemonic=&Arquivos
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos.
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de diálogo do seletor de arquivos.
 FileChooser.saveButtonToolTip.textAndMnemonic=Salvar arquivo selecionado.
 FileChooser.openButtonToolTip.textAndMnemonic=Abrir arquivo selecionado.
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
index 527e8b61a6d..f0045e69041 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
@@ -31,22 +31,22 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=&GTK-f\u00E4rgv\u00E4ljaren
+GTKColorChooserPanel.textAndMnemonic=&GTK-färgväljaren
 # mnemonic as a VK_ constant
 
 GTKColorChooserPanel.hue.textAndMnemonic=&Nyans:
 
-GTKColorChooserPanel.red.textAndMnemonic=R&\u00F6d:
+GTKColorChooserPanel.red.textAndMnemonic=R&öd:
 
-GTKColorChooserPanel.saturation.textAndMnemonic=&M\u00E4ttnad:
+GTKColorChooserPanel.saturation.textAndMnemonic=&Mättnad:
 
-GTKColorChooserPanel.green.textAndMnemonic=&Gr\u00F6n:
+GTKColorChooserPanel.green.textAndMnemonic=&Grön:
 
-GTKColorChooserPanel.value.textAndMnemonic=&V\u00E4rde:
+GTKColorChooserPanel.value.textAndMnemonic=&Värde:
 
-GTKColorChooserPanel.blue.textAndMnemonic=&Bl\u00E5:
+GTKColorChooserPanel.blue.textAndMnemonic=&Blå:
 
-GTKColorChooserPanel.color.textAndMnemonic=F\u00E4rg&namn:
+GTKColorChooserPanel.color.textAndMnemonic=Färg&namn:
 
 
 
@@ -56,24 +56,24 @@ FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
 FileChooser.newFolderButton.textAndMnemonic=&Ny mapp
 FileChooser.newFolderDialog.textAndMnemonic=Mapp:
 FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Fel
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att skapa katalogen "{0}": Filen eller katalogen finns inte
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Ett fel inträffade vid försök att skapa katalogen "{0}": Filen eller katalogen finns inte
 FileChooser.deleteFileButton.textAndMnemonic=Ta &bort fil
-FileChooser.renameFileButton.textAndMnemonic=&\u00C4ndra namn p\u00E5 filen
+FileChooser.renameFileButton.textAndMnemonic=&Ändra namn på filen
 FileChooser.cancelButton.textAndMnemonic=Avbryt
 FileChooser.saveButton.textAndMnemonic=OK
 FileChooser.openButton.textAndMnemonic=OK
 FileChooser.saveDialogTitle.textAndMnemonic=Spara
-FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
+FileChooser.openDialogTitle.textAndMnemonic=Öppna
 FileChooser.pathLabel.textAndMnemonic=&Urval:
 FileChooser.filterLabel.textAndMnemonic=Filter:
 FileChooser.foldersLabel.textAndMnemonic=Map&par
 FileChooser.filesLabel.textAndMnemonic=&Filer
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan f\u00F6r filval.
+FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan för filval.
 FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil.
-FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil.
+FileChooser.openButtonToolTip.textAndMnemonic=Öppna vald fil.
 
-FileChooser.renameFileDialog.textAndMnemonic=\u00C4ndra namn p\u00E5 fil "{0}" till
+FileChooser.renameFileDialog.textAndMnemonic=Ändra namn på fil "{0}" till
 FileChooser.renameFileError.titleAndMnemonic=Fel
-FileChooser.renameFileError.textAndMnemonic=Fel vid namn\u00E4ndring av fil "{0}" till "{1}"
+FileChooser.renameFileError.textAndMnemonic=Fel vid namnändring av fil "{0}" till "{1}"
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
index af46b2ea493..5ac2104f623 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
@@ -31,49 +31,49 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=GTK \u989C\u8272\u9009\u62E9\u5668(&G)
+GTKColorChooserPanel.textAndMnemonic=GTK 颜色选择器(&G)
 # mnemonic as a VK_ constant
 
-GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u8C03(&H):
+GTKColorChooserPanel.hue.textAndMnemonic=色调(&H):
 
-GTKColorChooserPanel.red.textAndMnemonic=\u7EA2\u8272(&E):
+GTKColorChooserPanel.red.textAndMnemonic=红色(&E):
 
-GTKColorChooserPanel.saturation.textAndMnemonic=\u9971\u548C\u5EA6(&S):
+GTKColorChooserPanel.saturation.textAndMnemonic=饱和度(&S):
 
-GTKColorChooserPanel.green.textAndMnemonic=\u7EFF\u8272(&G):
+GTKColorChooserPanel.green.textAndMnemonic=绿色(&G):
 
-GTKColorChooserPanel.value.textAndMnemonic=\u503C(&V):
+GTKColorChooserPanel.value.textAndMnemonic=值(&V):
 
-GTKColorChooserPanel.blue.textAndMnemonic=\u84DD\u8272(&B):
+GTKColorChooserPanel.blue.textAndMnemonic=蓝色(&B):
 
-GTKColorChooserPanel.color.textAndMnemonic=\u989C\u8272\u540D(&N):
+GTKColorChooserPanel.color.textAndMnemonic=颜色名(&N):
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6
-FileChooser.newFolderButton.textAndMnemonic=\u65B0\u6587\u4EF6\u5939(&N)
-FileChooser.newFolderDialog.textAndMnemonic=\u6587\u4EF6\u5939\u540D:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u9519\u8BEF
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u521B\u5EFA\u76EE\u5F55 "{0}" \u65F6\u51FA\u9519: \u6CA1\u6709\u6B64\u7C7B\u6587\u4EF6\u6216\u76EE\u5F55
-FileChooser.deleteFileButton.textAndMnemonic=\u5220\u9664\u6587\u4EF6(&L)
-FileChooser.renameFileButton.textAndMnemonic=\u91CD\u547D\u540D\u6587\u4EF6(&R)
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
-FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openButton.textAndMnemonic=\u6253\u5F00
-FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
-FileChooser.pathLabel.textAndMnemonic=\u9009\u5B9A\u5185\u5BB9(&S):
-FileChooser.filterLabel.textAndMnemonic=\u7B5B\u9009\u5668:
-FileChooser.foldersLabel.textAndMnemonic=\u6587\u4EF6\u5939(&D)
-FileChooser.filesLabel.textAndMnemonic=\u6587\u4EF6(&F)
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
-FileChooser.saveButtonToolTip.textAndMnemonic=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6\u3002
-FileChooser.openButtonToolTip.textAndMnemonic=\u6253\u5F00\u6240\u9009\u6587\u4EF6\u3002
-
-FileChooser.renameFileDialog.textAndMnemonic=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A
-FileChooser.renameFileError.titleAndMnemonic=\u9519\u8BEF
-FileChooser.renameFileError.textAndMnemonic=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519
+FileChooser.acceptAllFileFilter.textAndMnemonic=所有文件
+FileChooser.newFolderButton.textAndMnemonic=新文件夹(&N)
+FileChooser.newFolderDialog.textAndMnemonic=文件夹名:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=错误
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=创建目录 "{0}" 时出错: 没有此类文件或目录
+FileChooser.deleteFileButton.textAndMnemonic=删除文件(&L)
+FileChooser.renameFileButton.textAndMnemonic=重命名文件(&R)
+FileChooser.cancelButton.textAndMnemonic=取消
+FileChooser.saveButton.textAndMnemonic=保存
+FileChooser.openButton.textAndMnemonic=打开
+FileChooser.saveDialogTitle.textAndMnemonic=保存
+FileChooser.openDialogTitle.textAndMnemonic=打开
+FileChooser.pathLabel.textAndMnemonic=选定内容(&S):
+FileChooser.filterLabel.textAndMnemonic=筛选器:
+FileChooser.foldersLabel.textAndMnemonic=文件夹(&D)
+FileChooser.filesLabel.textAndMnemonic=文件(&F)
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=中止文件选择器对话框。
+FileChooser.saveButtonToolTip.textAndMnemonic=保存所选文件。
+FileChooser.openButtonToolTip.textAndMnemonic=打开所选文件。
+
+FileChooser.renameFileDialog.textAndMnemonic=将文件 "{0}" 重命名为
+FileChooser.renameFileError.titleAndMnemonic=错误
+FileChooser.renameFileError.textAndMnemonic=将文件 "{0}" 重命名为 "{1}" 时出错
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
index 8cb45c03cdb..4a6be72b1ab 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
@@ -31,49 +31,49 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=GTK \u8272\u5F69\u9078\u64C7\u5668(&G)
+GTKColorChooserPanel.textAndMnemonic=GTK 色彩選擇器(&G)
 # mnemonic as a VK_ constant
 
-GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u8ABF(&H):
+GTKColorChooserPanel.hue.textAndMnemonic=色調(&H):
 
-GTKColorChooserPanel.red.textAndMnemonic=\u7D05(&E):
+GTKColorChooserPanel.red.textAndMnemonic=紅(&E):
 
-GTKColorChooserPanel.saturation.textAndMnemonic=\u5F69\u5EA6(&S):
+GTKColorChooserPanel.saturation.textAndMnemonic=彩度(&S):
 
-GTKColorChooserPanel.green.textAndMnemonic=\u7DA0(&G):
+GTKColorChooserPanel.green.textAndMnemonic=綠(&G):
 
-GTKColorChooserPanel.value.textAndMnemonic=\u503C(&V):
+GTKColorChooserPanel.value.textAndMnemonic=值(&V):
 
-GTKColorChooserPanel.blue.textAndMnemonic=\u85CD(&B):
+GTKColorChooserPanel.blue.textAndMnemonic=藍(&B):
 
-GTKColorChooserPanel.color.textAndMnemonic=\u984F\u8272\u540D\u7A31(&N):
+GTKColorChooserPanel.color.textAndMnemonic=顏色名稱(&N):
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848
-FileChooser.newFolderButton.textAndMnemonic=\u65B0\u5EFA\u8CC7\u6599\u593E(&N)
-FileChooser.newFolderDialog.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u932F\u8AA4
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u5EFA\u7ACB\u76EE\u9304 "{0}" \u6642\u767C\u751F\u932F\u8AA4: \u6C92\u6709\u6B64\u6A94\u6848\u6216\u76EE\u9304
-FileChooser.deleteFileButton.textAndMnemonic=\u522A\u9664\u6A94\u6848(&L)
-FileChooser.renameFileButton.textAndMnemonic=\u91CD\u65B0\u547D\u540D\u6A94\u6848(&R)
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
-FileChooser.saveButton.textAndMnemonic=\u78BA\u5B9A
-FileChooser.openButton.textAndMnemonic=\u78BA\u5B9A
-FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F
-FileChooser.pathLabel.textAndMnemonic=\u9078\u53D6(&S):
-FileChooser.filterLabel.textAndMnemonic=\u7BE9\u9078:
-FileChooser.foldersLabel.textAndMnemonic=\u8CC7\u6599\u593E(&D)
-FileChooser.filesLabel.textAndMnemonic=\u6A94\u6848(&F)
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002
-FileChooser.saveButtonToolTip.textAndMnemonic=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848\u3002
-FileChooser.openButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848\u3002
-
-FileChooser.renameFileDialog.textAndMnemonic=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA
-FileChooser.renameFileError.titleAndMnemonic=\u932F\u8AA4
-FileChooser.renameFileError.textAndMnemonic=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4
+FileChooser.acceptAllFileFilter.textAndMnemonic=所有檔案
+FileChooser.newFolderButton.textAndMnemonic=新建資料夾(&N)
+FileChooser.newFolderDialog.textAndMnemonic=資料夾名稱:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=錯誤
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=建立目錄 "{0}" 時發生錯誤: 沒有此檔案或目錄
+FileChooser.deleteFileButton.textAndMnemonic=刪除檔案(&L)
+FileChooser.renameFileButton.textAndMnemonic=重新命名檔案(&R)
+FileChooser.cancelButton.textAndMnemonic=取消
+FileChooser.saveButton.textAndMnemonic=確定
+FileChooser.openButton.textAndMnemonic=確定
+FileChooser.saveDialogTitle.textAndMnemonic=儲存
+FileChooser.openDialogTitle.textAndMnemonic=開啟
+FileChooser.pathLabel.textAndMnemonic=選取(&S):
+FileChooser.filterLabel.textAndMnemonic=篩選:
+FileChooser.foldersLabel.textAndMnemonic=資料夾(&D)
+FileChooser.filesLabel.textAndMnemonic=檔案(&F)
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=中止檔案選擇器對話方塊。
+FileChooser.saveButtonToolTip.textAndMnemonic=儲存選取的檔案。
+FileChooser.openButtonToolTip.textAndMnemonic=開啟選取的檔案。
+
+FileChooser.renameFileDialog.textAndMnemonic=將檔案 "{0}" 重新命名為
+FileChooser.renameFileError.titleAndMnemonic=錯誤
+FileChooser.renameFileError.textAndMnemonic=將檔案 "{0}" 重新命名為 "{1}" 時出現錯誤
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties
index 8499c14488a..b7881cf8002 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties
@@ -48,7 +48,7 @@ FileChooser.cancelButton.textAndMnemonic=Abbrechen
 FileChooser.saveButton.textAndMnemonic=Speichern
 FileChooser.openButton.textAndMnemonic=OK
 FileChooser.saveDialogTitle.textAndMnemonic=Speichern
-FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.openDialogTitle.textAndMnemonic=Öffnen
 FileChooser.updateButton.textAndMnemonic=Aktualisieren
 FileChooser.helpButton.textAndMnemonic=Hilfe
 FileChooser.pathLabel.textAndMnemonic=&Pfad- oder Ordnername eingeben:
@@ -58,8 +58,8 @@ FileChooser.filesLabel.textAndMnemonic=Date&ien
 FileChooser.enterFileNameLabel.textAndMnemonic=Dateina&me eingeben:
 FileChooser.enterFolderNameLabel.textAndMnemonic=Ordnernamen eingeben:
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
-FileChooser.saveButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei speichern.
-FileChooser.openButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei \u00F6ffnen.
+FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld für Dateiauswahl schließen.
+FileChooser.saveButtonToolTip.textAndMnemonic=Ausgewählte Datei speichern.
+FileChooser.openButtonToolTip.textAndMnemonic=Ausgewählte Datei öffnen.
 FileChooser.updateButtonToolTip.textAndMnemonic=Verzeichnisliste aktualisieren.
 FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser-Hilfe.
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties
index 9bb30643370..3485270e533 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties
@@ -58,7 +58,7 @@ FileChooser.filesLabel.textAndMnemonic=Arch&ivos
 FileChooser.enterFileNameLabel.textAndMnemonic=I&ntroducir nombre de archivo:
 FileChooser.enterFolderNameLabel.textAndMnemonic=Introducir nombre de carpeta:
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar cuadro de di\u00E1logo del selector de archivos.
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar cuadro de diálogo del selector de archivos.
 FileChooser.saveButtonToolTip.textAndMnemonic=Guardar archivo seleccionado.
 FileChooser.openButtonToolTip.textAndMnemonic=Abrir archivo seleccionado.
 FileChooser.updateButtonToolTip.textAndMnemonic=Actualizar lista de directorios.
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties
index c41748e3dd2..ce301af120d 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties
@@ -49,7 +49,7 @@ FileChooser.saveButton.textAndMnemonic=Enregistrer
 FileChooser.openButton.textAndMnemonic=OK
 FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
 FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
-FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jour
+FileChooser.updateButton.textAndMnemonic=Mettre à jour
 FileChooser.helpButton.textAndMnemonic=Aide
 FileChooser.pathLabel.textAndMnemonic=Entrez le c&hemin ou le nom du dossier :
 FileChooser.filterLabel.textAndMnemonic=Filt&re
@@ -58,8 +58,8 @@ FileChooser.filesLabel.textAndMnemonic=F&ichiers
 FileChooser.enterFileNameLabel.textAndMnemonic=E&ntrez le nom du fichier :
 FileChooser.enterFolderNameLabel.textAndMnemonic=Entrez le nom du dossier :
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers.
-FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier s\u00E9lectionn\u00E9.
-FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier s\u00E9lectionn\u00E9.
-FileChooser.updateButtonToolTip.textAndMnemonic=Met \u00E0 jour la liste des r\u00E9pertoires.
-FileChooser.helpButtonToolTip.textAndMnemonic=Aide du s\u00E9lecteur de fichiers
+FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la boîte de dialogue du sélecteur de fichiers.
+FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier sélectionné.
+FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier sélectionné.
+FileChooser.updateButtonToolTip.textAndMnemonic=Met à jour la liste des répertoires.
+FileChooser.helpButtonToolTip.textAndMnemonic=Aide du sélecteur de fichiers
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties
index 611388551cc..9dda247978f 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties
@@ -44,22 +44,22 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.acceptAllFileFilter.textAndMnemonic=*
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
-FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
+FileChooser.cancelButton.textAndMnemonic=取消
+FileChooser.saveButton.textAndMnemonic=保存
 FileChooser.openButton.textAndMnemonic=OK
-FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
-FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
-FileChooser.helpButton.textAndMnemonic=\u30D8\u30EB\u30D7
-FileChooser.pathLabel.textAndMnemonic=\u30D1\u30B9\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u540D\u3092\u5165\u529B(&P):
-FileChooser.filterLabel.textAndMnemonic=\u30D5\u30A3\u30EB\u30BF(&R)
-FileChooser.foldersLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0(&L)
-FileChooser.filesLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB(&I)
-FileChooser.enterFileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u5165\u529B(&N):
-FileChooser.enterFolderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D\u3092\u5165\u529B:
+FileChooser.saveDialogTitle.textAndMnemonic=保存
+FileChooser.openDialogTitle.textAndMnemonic=開く
+FileChooser.updateButton.textAndMnemonic=更新
+FileChooser.helpButton.textAndMnemonic=ヘルプ
+FileChooser.pathLabel.textAndMnemonic=パスまたはフォルダ名を入力(&P):
+FileChooser.filterLabel.textAndMnemonic=フィルタ(&R)
+FileChooser.foldersLabel.textAndMnemonic=フォルダ(&L)
+FileChooser.filesLabel.textAndMnemonic=ファイル(&I)
+FileChooser.enterFileNameLabel.textAndMnemonic=ファイル名を入力(&N):
+FileChooser.enterFolderNameLabel.textAndMnemonic=フォルダ名を入力:
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002
-FileChooser.saveButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002
-FileChooser.openButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059\u3002
-FileChooser.updateButtonToolTip.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30EA\u30B9\u30C8\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
-FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser\u306E\u30D8\u30EB\u30D7\u3067\u3059\u3002
+FileChooser.cancelButtonToolTip.textAndMnemonic=ファイル・チューザ・ダイアログを終了します。
+FileChooser.saveButtonToolTip.textAndMnemonic=選択したファイルを保存します。
+FileChooser.openButtonToolTip.textAndMnemonic=選択したファイルを開きます。
+FileChooser.updateButtonToolTip.textAndMnemonic=ディレクトリのリストを更新します。
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooserのヘルプです。
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties
index 4ede78b6f00..9233d20ed64 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties
@@ -44,22 +44,22 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.acceptAllFileFilter.textAndMnemonic=*
-FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C
-FileChooser.saveButton.textAndMnemonic=\uC800\uC7A5
-FileChooser.openButton.textAndMnemonic=\uD655\uC778
-FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
-FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
-FileChooser.updateButton.textAndMnemonic=\uC5C5\uB370\uC774\uD2B8
-FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0
-FileChooser.pathLabel.textAndMnemonic=\uACBD\uB85C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uC785\uB825(&P):
-FileChooser.filterLabel.textAndMnemonic=\uD544\uD130(&R)
-FileChooser.foldersLabel.textAndMnemonic=\uD3F4\uB354(&L)
-FileChooser.filesLabel.textAndMnemonic=\uD30C\uC77C(&I)
-FileChooser.enterFileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984 \uC785\uB825(&N):
-FileChooser.enterFolderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984 \uC785\uB825:
+FileChooser.cancelButton.textAndMnemonic=취소
+FileChooser.saveButton.textAndMnemonic=저장
+FileChooser.openButton.textAndMnemonic=확인
+FileChooser.saveDialogTitle.textAndMnemonic=저장
+FileChooser.openDialogTitle.textAndMnemonic=열기
+FileChooser.updateButton.textAndMnemonic=업데이트
+FileChooser.helpButton.textAndMnemonic=도움말
+FileChooser.pathLabel.textAndMnemonic=경로 또는 폴더 이름 입력(&P):
+FileChooser.filterLabel.textAndMnemonic=필터(&R)
+FileChooser.foldersLabel.textAndMnemonic=폴더(&L)
+FileChooser.filesLabel.textAndMnemonic=파일(&I)
+FileChooser.enterFileNameLabel.textAndMnemonic=파일 이름 입력(&N):
+FileChooser.enterFolderNameLabel.textAndMnemonic=폴더 이름 입력:
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
-FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4.
-FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4.
-FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D\uC744 \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.
-FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \uB3C4\uC6C0\uB9D0\uC785\uB2C8\uB2E4.
+FileChooser.cancelButtonToolTip.textAndMnemonic=파일 선택기 대화상자를 중단합니다.
+FileChooser.saveButtonToolTip.textAndMnemonic=선택된 파일을 저장합니다.
+FileChooser.openButtonToolTip.textAndMnemonic=선택된 파일을 엽니다.
+FileChooser.updateButtonToolTip.textAndMnemonic=디렉토리 목록을 업데이트합니다.
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser 도움말입니다.
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties
index 19510057008..296d2902c2f 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties
@@ -58,8 +58,8 @@ FileChooser.filesLabel.textAndMnemonic=Arqu&ivos
 FileChooser.enterFileNameLabel.textAndMnemonic=I&nforme o nome do arquivo:
 FileChooser.enterFolderNameLabel.textAndMnemonic=Informar nome da pasta:
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos.
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de diálogo do seletor de arquivos.
 FileChooser.saveButtonToolTip.textAndMnemonic=Salvar arquivo selecionado.
 FileChooser.openButtonToolTip.textAndMnemonic=Abrir arquivo selecionado.
-FileChooser.updateButtonToolTip.textAndMnemonic=Atualizar lista de diret\u00F3rios.
+FileChooser.updateButtonToolTip.textAndMnemonic=Atualizar lista de diretórios.
 FileChooser.helpButtonToolTip.textAndMnemonic=Ajuda do FileChooser.
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties
index e30d3d0dee9..0756b72de50 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties
@@ -48,18 +48,18 @@ FileChooser.cancelButton.textAndMnemonic=Avbryt
 FileChooser.saveButton.textAndMnemonic=Spara
 FileChooser.openButton.textAndMnemonic=OK
 FileChooser.saveDialogTitle.textAndMnemonic=Spara
-FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
+FileChooser.openDialogTitle.textAndMnemonic=Öppna
 FileChooser.updateButton.textAndMnemonic=Uppdatera
-FileChooser.helpButton.textAndMnemonic=Hj\u00E4lp
-FileChooser.pathLabel.textAndMnemonic=Ange &s\u00F6kv\u00E4g eller mappnamn:
+FileChooser.helpButton.textAndMnemonic=Hjälp
+FileChooser.pathLabel.textAndMnemonic=Ange &sökväg eller mappnamn:
 FileChooser.filterLabel.textAndMnemonic=Filte&r
 FileChooser.foldersLabel.textAndMnemonic=Ma&ppar
 FileChooser.filesLabel.textAndMnemonic=F&iler
 FileChooser.enterFileNameLabel.textAndMnemonic=A&nge filnamn:
 FileChooser.enterFolderNameLabel.textAndMnemonic=Ange ett mappnamn:
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan f\u00F6r filval.
+FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan för filval.
 FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil.
-FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil.
+FileChooser.openButtonToolTip.textAndMnemonic=Öppna vald fil.
 FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglistan.
-FileChooser.helpButtonToolTip.textAndMnemonic=Hj\u00E4lp f\u00F6r val av fil.
+FileChooser.helpButtonToolTip.textAndMnemonic=Hjälp för val av fil.
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties
index 9b3f037d894..28dffeea0d1 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties
@@ -44,22 +44,22 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.acceptAllFileFilter.textAndMnemonic=*
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
-FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openButton.textAndMnemonic=\u786E\u5B9A
-FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
-FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
-FileChooser.helpButton.textAndMnemonic=\u5E2E\u52A9
-FileChooser.pathLabel.textAndMnemonic=\u8F93\u5165\u8DEF\u5F84\u6216\u6587\u4EF6\u5939\u540D(&P):
-FileChooser.filterLabel.textAndMnemonic=\u7B5B\u9009\u5668(&R)
-FileChooser.foldersLabel.textAndMnemonic=\u6587\u4EF6\u5939(&L)
-FileChooser.filesLabel.textAndMnemonic=\u6587\u4EF6(&I)
-FileChooser.enterFileNameLabel.textAndMnemonic=\u8F93\u5165\u6587\u4EF6\u540D(&N):
-FileChooser.enterFolderNameLabel.textAndMnemonic=\u8F93\u5165\u6587\u4EF6\u5939\u540D:
+FileChooser.cancelButton.textAndMnemonic=取消
+FileChooser.saveButton.textAndMnemonic=保存
+FileChooser.openButton.textAndMnemonic=确定
+FileChooser.saveDialogTitle.textAndMnemonic=保存
+FileChooser.openDialogTitle.textAndMnemonic=打开
+FileChooser.updateButton.textAndMnemonic=更新
+FileChooser.helpButton.textAndMnemonic=帮助
+FileChooser.pathLabel.textAndMnemonic=输入路径或文件夹名(&P):
+FileChooser.filterLabel.textAndMnemonic=筛选器(&R)
+FileChooser.foldersLabel.textAndMnemonic=文件夹(&L)
+FileChooser.filesLabel.textAndMnemonic=文件(&I)
+FileChooser.enterFileNameLabel.textAndMnemonic=输入文件名(&N):
+FileChooser.enterFolderNameLabel.textAndMnemonic=输入文件夹名:
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
-FileChooser.saveButtonToolTip.textAndMnemonic=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6\u3002
-FileChooser.openButtonToolTip.textAndMnemonic=\u6253\u5F00\u6240\u9009\u6587\u4EF6\u3002
-FileChooser.updateButtonToolTip.textAndMnemonic=\u66F4\u65B0\u76EE\u5F55\u5217\u8868\u3002
-FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \u5E2E\u52A9\u3002
+FileChooser.cancelButtonToolTip.textAndMnemonic=中止文件选择器对话框。
+FileChooser.saveButtonToolTip.textAndMnemonic=保存所选文件。
+FileChooser.openButtonToolTip.textAndMnemonic=打开所选文件。
+FileChooser.updateButtonToolTip.textAndMnemonic=更新目录列表。
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser 帮助。
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties
index 5e4cee87d8a..69ae2a3b133 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties
@@ -44,22 +44,22 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.acceptAllFileFilter.textAndMnemonic=*
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
-FileChooser.saveButton.textAndMnemonic=\u5132\u5B58
-FileChooser.openButton.textAndMnemonic=\u78BA\u5B9A
-FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F
-FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
-FileChooser.helpButton.textAndMnemonic=\u8AAA\u660E
-FileChooser.pathLabel.textAndMnemonic=\u8F38\u5165\u8DEF\u5F91\u6216\u8CC7\u6599\u593E\u540D\u7A31(&P):
-FileChooser.filterLabel.textAndMnemonic=\u7BE9\u9078(&R)
-FileChooser.foldersLabel.textAndMnemonic=\u8CC7\u6599\u593E(&L)
-FileChooser.filesLabel.textAndMnemonic=\u6A94\u6848(&I)
-FileChooser.enterFileNameLabel.textAndMnemonic=\u8F38\u5165\u6A94\u6848\u540D\u7A31(&N):
-FileChooser.enterFolderNameLabel.textAndMnemonic=\u8F38\u5165\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.cancelButton.textAndMnemonic=取消
+FileChooser.saveButton.textAndMnemonic=儲存
+FileChooser.openButton.textAndMnemonic=確定
+FileChooser.saveDialogTitle.textAndMnemonic=儲存
+FileChooser.openDialogTitle.textAndMnemonic=開啟
+FileChooser.updateButton.textAndMnemonic=更新
+FileChooser.helpButton.textAndMnemonic=說明
+FileChooser.pathLabel.textAndMnemonic=輸入路徑或資料夾名稱(&P):
+FileChooser.filterLabel.textAndMnemonic=篩選(&R)
+FileChooser.foldersLabel.textAndMnemonic=資料夾(&L)
+FileChooser.filesLabel.textAndMnemonic=檔案(&I)
+FileChooser.enterFileNameLabel.textAndMnemonic=輸入檔案名稱(&N):
+FileChooser.enterFolderNameLabel.textAndMnemonic=輸入資料夾名稱:
 
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002
-FileChooser.saveButtonToolTip.textAndMnemonic=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848\u3002
-FileChooser.openButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848\u3002
-FileChooser.updateButtonToolTip.textAndMnemonic=\u66F4\u65B0\u76EE\u9304\u6E05\u55AE\u3002
-FileChooser.helpButtonToolTip.textAndMnemonic=\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E\u3002
+FileChooser.cancelButtonToolTip.textAndMnemonic=中止檔案選擇器對話方塊。
+FileChooser.saveButtonToolTip.textAndMnemonic=儲存選取的檔案。
+FileChooser.openButtonToolTip.textAndMnemonic=開啟選取的檔案。
+FileChooser.updateButtonToolTip.textAndMnemonic=更新目錄清單。
+FileChooser.helpButtonToolTip.textAndMnemonic=「檔案選擇器」說明。
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties
index 47894420111..af271ec6464 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties
@@ -68,12 +68,12 @@ FileChooser.renameErrorFileExists.textAndMnemonic={0} kann nicht umbenannt werde
 FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien
 FileChooser.cancelButton.textAndMnemonic=Abbrechen
 FileChooser.saveButton.textAndMnemonic=Speichern
-FileChooser.openButton.textAndMnemonic=\u00D6ffnen
+FileChooser.openButton.textAndMnemonic=Öffnen
 FileChooser.saveDialogTitle.textAndMnemonic=Speichern
-FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.openDialogTitle.textAndMnemonic=Öffnen
 FileChooser.updateButton.textAndMnemonic=A&ktualisieren
 FileChooser.helpButton.textAndMnemonic=&Hilfe
-FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ffnen
+FileChooser.directoryOpenButton.textAndMnemonic=Öffnen
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -88,12 +88,12 @@ FileChooser.other.newFolder.subsequent=NewFolder.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen
-FileChooser.saveButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei speichern
-FileChooser.openButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei \u00F6ffnen
+FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld für Dateiauswahl schließen
+FileChooser.saveButtonToolTip.textAndMnemonic=Ausgewählte Datei speichern
+FileChooser.openButtonToolTip.textAndMnemonic=Ausgewählte Datei öffnen
 FileChooser.updateButtonToolTip.textAndMnemonic=Verzeichnisliste aktualisieren
 FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser-Hilfe
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ausgew\u00E4hltes Verzeichnis \u00F6ffnen
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ausgewähltes Verzeichnis öffnen
 
 FileChooser.filesListAccessibleName=Dateiliste
 FileChooser.filesDetailsAccessibleName=Dateidetails
@@ -102,23 +102,23 @@ FileChooser.filesDetailsAccessibleName=Dateidetails
 ColorChooser.preview.textAndMnemonic=Vorschau
 ColorChooser.ok.textAndMnemonic=OK
 ColorChooser.cancel.textAndMnemonic=Abbrechen
-ColorChooser.reset.textAndMnemonic=&Zur\u00FCcksetzen
+ColorChooser.reset.textAndMnemonic=&Zurücksetzen
 ColorChooser.sample.textAndMnemonic=Beispieltext  Beispieltext
 ColorChooser.swatches.textAndMnemonic=&Swatches
 ColorChooser.swatchesRecent.textAndMnemonic=Aktuell:
 ColorChooser.hsv.textAndMnemonic=&HSV
 ColorChooser.hsvHue.textAndMnemonic=Farbton
-ColorChooser.hsvSaturation.textAndMnemonic=S\u00E4ttigung
+ColorChooser.hsvSaturation.textAndMnemonic=Sättigung
 ColorChooser.hsvValue.textAndMnemonic=Wert
 ColorChooser.hsvTransparency.textAndMnemonic=Transparenz
 ColorChooser.hsl.textAndMnemonic=HS&L
 ColorChooser.hslHue.textAndMnemonic=Farbton
-ColorChooser.hslSaturation.textAndMnemonic=S\u00E4ttigung
+ColorChooser.hslSaturation.textAndMnemonic=Sättigung
 ColorChooser.hslLightness.textAndMnemonic=Helligkeit
 ColorChooser.hslTransparency.textAndMnemonic=Transparenz
 ColorChooser.rgb.textAndMnemonic=R&GB
 ColorChooser.rgbRed.textAndMnemonic=Ro&t
-ColorChooser.rgbGreen.textAndMnemonic=Gr\u00FC&n
+ColorChooser.rgbGreen.textAndMnemonic=Grü&n
 ColorChooser.rgbBlue.textAndMnemonic=&Blau
 ColorChooser.rgbAlpha.textAndMnemonic=Alpha
 ColorChooser.rgbHexCode.textAndMnemonic=&Farbcode
@@ -138,7 +138,7 @@ OptionPane.okButton.textAndMnemonic=OK
 #OptionPane.okButtonMnemonic=0
 OptionPane.cancelButton.textAndMnemonic=Abbrechen
 #OptionPane.cancelButtonMnemonic=0
-OptionPane.title.textAndMnemonic=Option ausw\u00E4hlen
+OptionPane.title.textAndMnemonic=Option auswählen
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
 OptionPane.inputDialog.titleAndMnemonic=Eingabe
@@ -150,7 +150,7 @@ OptionPane.messageDialog.titleAndMnemonic=Meldung
 PrintingDialog.titleProgress.textAndMnemonic=Drucken
 PrintingDialog.titleAborting.textAndMnemonic=Drucken (Abbruch)
 
-PrintingDialog.contentInitial.textAndMnemonic=Druckvorgang l\u00E4uft...
+PrintingDialog.contentInitial.textAndMnemonic=Druckvorgang läuft...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
@@ -165,34 +165,34 @@ PrintingDialog.abortButtonToolTip.textAndMnemonic=Druckvorgang abbrechen
 InternalFrame.iconButtonToolTip=Minimieren
 InternalFrame.maxButtonToolTip=Maximieren
 InternalFrame.restoreButtonToolTip=Wiederherstellen
-InternalFrame.closeButtonToolTip=Schlie\u00DFen
+InternalFrame.closeButtonToolTip=Schließen
 
 ############ Internal Frame Title Pane Strings ############
 InternalFrameTitlePane.restoreButton.textAndMnemonic=&Wiederherstellen
 InternalFrameTitlePane.moveButton.textAndMnemonic=&Verschieben
-InternalFrameTitlePane.sizeButton.textAndMnemonic=&Gr\u00F6\u00DFe
+InternalFrameTitlePane.sizeButton.textAndMnemonic=&Größe
 InternalFrameTitlePane.minimizeButton.textAndMnemonic=Mi&nimieren
 InternalFrameTitlePane.maximizeButton.textAndMnemonic=Ma&ximieren
-InternalFrameTitlePane.closeButton.textAndMnemonic=&Schlie\u00DFen
+InternalFrameTitlePane.closeButton.textAndMnemonic=&Schließen
 
 ############ Text strings #############
 # Used for html forms
 FormView.submitButton.textAndMnemonic=Abfrage weiterleiten
-FormView.resetButton.textAndMnemonic=Zur\u00FCcksetzen
+FormView.resetButton.textAndMnemonic=Zurücksetzen
 FormView.browseFileButton.textAndMnemonic=Durchsuchen...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=Formatvorlagen\u00E4nderung
-AbstractDocument.addition.textAndMnemonic=Hinzuf\u00FCgen
-AbstractDocument.deletion.textAndMnemonic=L\u00F6schen
-AbstractDocument.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractDocument.styleChange.textAndMnemonic=Formatvorlagenänderung
+AbstractDocument.addition.textAndMnemonic=Hinzufügen
+AbstractDocument.deletion.textAndMnemonic=Löschen
+AbstractDocument.undo.textAndMnemonic=Rückgängig
 AbstractDocument.redo.textAndMnemonic=Wiederherstellen
 
 ############ Abstract Button Strings ############
 AbstractButton.click.textAndMnemonic=Klicken
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractUndoableEdit.undo.textAndMnemonic=Rückgängig
 AbstractUndoableEdit.redo.textAndMnemonic=Wiederherstellen
 
 ############ Combo Box Strings ############
@@ -202,12 +202,12 @@ ComboBox.togglePopup.textAndMnemonic=togglePopup
 ProgressMonitor.progress.textAndMnemonic=Fortschritt...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=linke Schaltfl\u00E4che
-SplitPane.rightButton.textAndMnemonic=rechte Schaltfl\u00E4che
+SplitPane.leftButton.textAndMnemonic=linke Schaltfläche
+SplitPane.rightButton.textAndMnemonic=rechte Schaltfläche
 # Used for Isindex
-IsindexView.prompt=Dieser Index kann durchsucht werden. Geben Sie Schl\u00FCsselw\u00F6rter f\u00FCr die Suche ein:
+IsindexView.prompt=Dieser Index kann durchsucht werden. Geben Sie Schlüsselwörter für die Suche ein:
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=Als Symbol darstellen
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximieren
-InternalFrameTitlePane.closeButtonAccessibleName=Schlie\u00DFen
+InternalFrameTitlePane.closeButtonAccessibleName=Schließen
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
index 32740a15f5b..547338bf518 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
@@ -56,7 +56,7 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=Archivo Gen\u00E9rico
+FileChooser.fileDescription.textAndMnemonic=Archivo Genérico
 FileChooser.directoryDescription.textAndMnemonic=Directorio
 FileChooser.newFolderError.textAndMnemonic=Error al crear una nueva carpeta
 FileChooser.newFolderErrorSeparator= :
@@ -88,7 +88,7 @@ FileChooser.other.newFolder.subsequent=Nueva Carpeta.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=Cuadro de di\u00E1logo para abortar el selector de archivos
+FileChooser.cancelButtonToolTip.textAndMnemonic=Cuadro de diálogo para abortar el selector de archivos
 FileChooser.saveButtonToolTip.textAndMnemonic=Guardar archivo seleccionado
 FileChooser.openButtonToolTip.textAndMnemonic=Abrir archivo seleccionado
 FileChooser.updateButtonToolTip.textAndMnemonic=Actualizar lista de directorios
@@ -108,20 +108,20 @@ ColorChooser.swatches.textAndMnemonic=Mue&stras
 ColorChooser.swatchesRecent.textAndMnemonic=Reciente:
 ColorChooser.hsv.textAndMnemonic=&HSV
 ColorChooser.hsvHue.textAndMnemonic=Matiz
-ColorChooser.hsvSaturation.textAndMnemonic=Saturaci\u00F3n
+ColorChooser.hsvSaturation.textAndMnemonic=Saturación
 ColorChooser.hsvValue.textAndMnemonic=Valor
 ColorChooser.hsvTransparency.textAndMnemonic=Transparencia
 ColorChooser.hsl.textAndMnemonic=HS&L
 ColorChooser.hslHue.textAndMnemonic=Matiz
-ColorChooser.hslSaturation.textAndMnemonic=Saturaci\u00F3n
-ColorChooser.hslLightness.textAndMnemonic=Iluminaci\u00F3n
+ColorChooser.hslSaturation.textAndMnemonic=Saturación
+ColorChooser.hslLightness.textAndMnemonic=Iluminación
 ColorChooser.hslTransparency.textAndMnemonic=Transparencia
 ColorChooser.rgb.textAndMnemonic=R&GB
 ColorChooser.rgbRed.textAndMnemonic=Ro&jo
 ColorChooser.rgbGreen.textAndMnemonic=&Verde
 ColorChooser.rgbBlue.textAndMnemonic=A&zul
 ColorChooser.rgbAlpha.textAndMnemonic=Alfa
-ColorChooser.rgbHexCode.textAndMnemonic=&C\u00F3digo de Color
+ColorChooser.rgbHexCode.textAndMnemonic=&Código de Color
 ColorChooser.cmyk.textAndMnemonic=C&MYK
 ColorChooser.cmykCyan.textAndMnemonic=Cian
 ColorChooser.cmykMagenta.textAndMnemonic=Magenta
@@ -132,13 +132,13 @@ ColorChooser.cmykAlpha.textAndMnemonic=Alfa
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=&S\u00ED
+OptionPane.yesButton.textAndMnemonic=&Sí
 OptionPane.noButton.textAndMnemonic=&No
 OptionPane.okButton.textAndMnemonic=Aceptar
 #OptionPane.okButtonMnemonic=0
 OptionPane.cancelButton.textAndMnemonic=Cancelar
 #OptionPane.cancelButtonMnemonic=0
-OptionPane.title.textAndMnemonic=Seleccionar una Opci\u00F3n
+OptionPane.title.textAndMnemonic=Seleccionar una Opción
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
 OptionPane.inputDialog.titleAndMnemonic=Entrada
@@ -147,19 +147,19 @@ OptionPane.inputDialog.titleAndMnemonic=Entrada
 OptionPane.messageDialog.titleAndMnemonic=Mensaje
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=Impresi\u00F3n
-PrintingDialog.titleAborting.textAndMnemonic=Impresi\u00F3n (Abortando)
+PrintingDialog.titleProgress.textAndMnemonic=Impresión
+PrintingDialog.titleAborting.textAndMnemonic=Impresión (Abortando)
 
-PrintingDialog.contentInitial.textAndMnemonic=Impresi\u00F3n en curso...
+PrintingDialog.contentInitial.textAndMnemonic=Impresión en curso...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina {0} impresa...
+PrintingDialog.contentProgress.textAndMnemonic=Página {0} impresa...
 
-PrintingDialog.contentAborting.textAndMnemonic=Abortando la impresi\u00F3n...
+PrintingDialog.contentAborting.textAndMnemonic=Abortando la impresión...
 
 PrintingDialog.abortButton.textAndMnemonic=&Abortar
-PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impresi\u00F3n
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impresión
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimizar
@@ -170,7 +170,7 @@ InternalFrame.closeButtonToolTip=Cerrar
 ############ Internal Frame Title Pane Strings ############
 InternalFrameTitlePane.restoreButton.textAndMnemonic=&Restaurar
 InternalFrameTitlePane.moveButton.textAndMnemonic=&Mover
-InternalFrameTitlePane.sizeButton.textAndMnemonic=&Tama\u00F1o
+InternalFrameTitlePane.sizeButton.textAndMnemonic=&Tamaño
 InternalFrameTitlePane.minimizeButton.textAndMnemonic=Mi&nimizar
 InternalFrameTitlePane.maximizeButton.textAndMnemonic=Ma&ximizar
 InternalFrameTitlePane.closeButton.textAndMnemonic=&Cerrar
@@ -183,8 +183,8 @@ FormView.browseFileButton.textAndMnemonic=Examinar...
 
 ############ Abstract Document Strings ############
 AbstractDocument.styleChange.textAndMnemonic=cambio de estilo
-AbstractDocument.addition.textAndMnemonic=agregaci\u00F3n
-AbstractDocument.deletion.textAndMnemonic=supresi\u00F3n
+AbstractDocument.addition.textAndMnemonic=agregación
+AbstractDocument.deletion.textAndMnemonic=supresión
 AbstractDocument.undo.textAndMnemonic=Deshacer
 AbstractDocument.redo.textAndMnemonic=Rehacer
 
@@ -202,10 +202,10 @@ ComboBox.togglePopup.textAndMnemonic=togglePopup
 ProgressMonitor.progress.textAndMnemonic=Progreso...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=bot\u00F3n izquierdo
-SplitPane.rightButton.textAndMnemonic=bot\u00F3n derecho
+SplitPane.leftButton.textAndMnemonic=botón izquierdo
+SplitPane.rightButton.textAndMnemonic=botón derecho
 # Used for Isindex
-IsindexView.prompt=En este \u00EDndice se pueden efectuar b\u00FAsquedas. Escriba las palabras clave de b\u00FAsqueda:
+IsindexView.prompt=En este índice se pueden efectuar búsquedas. Escriba las palabras clave de búsqueda:
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=Convertir en Icono
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties
index a208a11416c..9cca507fa4f 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties
@@ -56,22 +56,22 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=Fichier g\u00E9n\u00E9rique
-FileChooser.directoryDescription.textAndMnemonic=R\u00E9pertoire
-FileChooser.newFolderError.textAndMnemonic=Erreur lors de la cr\u00E9ation du dossier
+FileChooser.fileDescription.textAndMnemonic=Fichier générique
+FileChooser.directoryDescription.textAndMnemonic=Répertoire
+FileChooser.newFolderError.textAndMnemonic=Erreur lors de la création du dossier
 FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Impossible de cr\u00E9er le dossier
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossible de cr\u00E9er le dossier.\n\nLe syst\u00E8me ne parvient pas \u00E0 trouver le chemin indiqu\u00E9.
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Impossible de créer le dossier
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossible de créer le dossier.\n\nLe système ne parvient pas à trouver le chemin indiqué.
 FileChooser.renameErrorTitle.textAndMnemonic=Erreur lors du changement de nom du fichier ou du dossier
 FileChooser.renameError.textAndMnemonic=Impossible de renommer {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=Impossible de renommer {0} : il existe d\u00E9j\u00E0 un fichier portant le nom indiqu\u00E9. Indiquez-en un autre.
+FileChooser.renameErrorFileExists.textAndMnemonic=Impossible de renommer {0} : il existe déjà un fichier portant le nom indiqué. Indiquez-en un autre.
 FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
 FileChooser.cancelButton.textAndMnemonic=Annuler
 FileChooser.saveButton.textAndMnemonic=Enregistrer
 FileChooser.openButton.textAndMnemonic=Ouvrir
 FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
 FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
-FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jo&ur
+FileChooser.updateButton.textAndMnemonic=Mettre à jo&ur
 FileChooser.helpButton.textAndMnemonic=&Aide
 FileChooser.directoryOpenButton.textAndMnemonic=Ouvrir
 
@@ -88,21 +88,21 @@ FileChooser.other.newFolder.subsequent=NewFolder.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers
-FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier s\u00E9lectionn\u00E9
-FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier s\u00E9lectionn\u00E9
-FileChooser.updateButtonToolTip.textAndMnemonic=Met \u00E0 jour la liste des r\u00E9pertoires
-FileChooser.helpButtonToolTip.textAndMnemonic=Aide du s\u00E9lecteur de fichiers
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ouvre le r\u00E9pertoire s\u00E9lectionn\u00E9
+FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la boîte de dialogue du sélecteur de fichiers
+FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier sélectionné
+FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier sélectionné
+FileChooser.updateButtonToolTip.textAndMnemonic=Met à jour la liste des répertoires
+FileChooser.helpButtonToolTip.textAndMnemonic=Aide du sélecteur de fichiers
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ouvre le répertoire sélectionné
 
 FileChooser.filesListAccessibleName=Liste des fichiers
-FileChooser.filesDetailsAccessibleName=D\u00E9tails des fichiers
+FileChooser.filesDetailsAccessibleName=Détails des fichiers
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=Aper\u00E7u
+ColorChooser.preview.textAndMnemonic=Aperçu
 ColorChooser.ok.textAndMnemonic=OK
 ColorChooser.cancel.textAndMnemonic=Annuler
-ColorChooser.reset.textAndMnemonic=&R\u00E9initialiser
+ColorChooser.reset.textAndMnemonic=&Réinitialiser
 ColorChooser.sample.textAndMnemonic=Echantillon de texte  Echantillon de texte
 ColorChooser.swatches.textAndMnemonic=&Echantillons
 ColorChooser.swatchesRecent.textAndMnemonic=Dernier :
@@ -114,7 +114,7 @@ ColorChooser.hsvTransparency.textAndMnemonic=Transparence
 ColorChooser.hsl.textAndMnemonic=TS&L
 ColorChooser.hslHue.textAndMnemonic=Teinte
 ColorChooser.hslSaturation.textAndMnemonic=Saturation
-ColorChooser.hslLightness.textAndMnemonic=Lumi\u00E8re
+ColorChooser.hslLightness.textAndMnemonic=Lumière
 ColorChooser.hslTransparency.textAndMnemonic=Transparence
 ColorChooser.rgb.textAndMnemonic=R&VB
 ColorChooser.rgbRed.textAndMnemonic=R&ouge
@@ -138,10 +138,10 @@ OptionPane.okButton.textAndMnemonic=OK
 #OptionPane.okButtonMnemonic=0
 OptionPane.cancelButton.textAndMnemonic=Annuler
 #OptionPane.cancelButtonMnemonic=0
-OptionPane.title.textAndMnemonic=S\u00E9lectionner une option
+OptionPane.title.textAndMnemonic=Sélectionner une option
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=Entr\u00E9e
+OptionPane.inputDialog.titleAndMnemonic=Entrée
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
 OptionPane.messageDialog.titleAndMnemonic=Message
@@ -154,7 +154,7 @@ PrintingDialog.contentInitial.textAndMnemonic=Impression en cours...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=Page {0} imprim\u00E9e...
+PrintingDialog.contentProgress.textAndMnemonic=Page {0} imprimée...
 
 PrintingDialog.contentAborting.textAndMnemonic=Abandon de l'impression...
 
@@ -162,23 +162,23 @@ PrintingDialog.abortButton.textAndMnemonic=&Abandonner
 PrintingDialog.abortButtonToolTip.textAndMnemonic=Abandonner l'impression
 
 ############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=R\u00E9duire
+InternalFrame.iconButtonToolTip=Réduire
 InternalFrame.maxButtonToolTip=Agrandir
 InternalFrame.restoreButtonToolTip=Restaurer
 InternalFrame.closeButtonToolTip=Fermer
 
 ############ Internal Frame Title Pane Strings ############
 InternalFrameTitlePane.restoreButton.textAndMnemonic=&Restaurer
-InternalFrameTitlePane.moveButton.textAndMnemonic=D\u00E9p&lacer
+InternalFrameTitlePane.moveButton.textAndMnemonic=Dép&lacer
 InternalFrameTitlePane.sizeButton.textAndMnemonic=Re&dimensionner
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=&R\u00E9duire
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=&Réduire
 InternalFrameTitlePane.maximizeButton.textAndMnemonic=&Agrandir
 InternalFrameTitlePane.closeButton.textAndMnemonic=&Fermer
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButton.textAndMnemonic=Soumettre la requ\u00EAte
-FormView.resetButton.textAndMnemonic=R\u00E9initialiser
+FormView.submitButton.textAndMnemonic=Soumettre la requête
+FormView.resetButton.textAndMnemonic=Réinitialiser
 FormView.browseFileButton.textAndMnemonic=Parcourir...
 
 ############ Abstract Document Strings ############
@@ -186,14 +186,14 @@ AbstractDocument.styleChange.textAndMnemonic=modification de style
 AbstractDocument.addition.textAndMnemonic=ajout
 AbstractDocument.deletion.textAndMnemonic=suppression
 AbstractDocument.undo.textAndMnemonic=Annuler
-AbstractDocument.redo.textAndMnemonic=R\u00E9tablir
+AbstractDocument.redo.textAndMnemonic=Rétablir
 
 ############ Abstract Button Strings ############
 AbstractButton.click.textAndMnemonic=cliquer
 
 ############ Abstract Undoable Edit Strings ############
 AbstractUndoableEdit.undo.textAndMnemonic=Annuler
-AbstractUndoableEdit.redo.textAndMnemonic=R\u00E9tablir
+AbstractUndoableEdit.redo.textAndMnemonic=Rétablir
 
 ############ Combo Box Strings ############
 ComboBox.togglePopup.textAndMnemonic=togglePopup
@@ -205,9 +205,9 @@ ProgressMonitor.progress.textAndMnemonic=Progression...
 SplitPane.leftButton.textAndMnemonic=bouton gauche
 SplitPane.rightButton.textAndMnemonic=bouton droit
 # Used for Isindex
-IsindexView.prompt=Ceci est un index de recherche. Tapez des mots-cl\u00E9s pour la recherche :
+IsindexView.prompt=Ceci est un index de recherche. Tapez des mots-clés pour la recherche :
 
 ############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=R\u00E9duire
+InternalFrameTitlePane.iconifyButtonAccessibleName=Réduire
 InternalFrameTitlePane.maximizeButtonAccessibleName=Agrandir
 InternalFrameTitlePane.closeButtonAccessibleName=Fermer
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties
index ae021e515b6..ec016fb6f85 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties
@@ -61,10 +61,10 @@ FileChooser.directoryDescription.textAndMnemonic=Directory
 FileChooser.newFolderError.textAndMnemonic=Errore durante la creazione della nuova cartella
 FileChooser.newFolderErrorSeparator= :
 FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Impossibile creare la cartella
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossibile creare la cartella.\n\nIl sistema non \u00E8 in grado di trovare il percorso specificato.
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossibile creare la cartella.\n\nIl sistema non è in grado di trovare il percorso specificato.
 FileChooser.renameErrorTitle.textAndMnemonic=Errore durante la ridenominazione del file o della cartella
 FileChooser.renameError.textAndMnemonic=Impossibile rinominare {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=Impossibile rinominare {0}: esiste gi\u00E0 un file con il nome specificato. Specificare un altro nome.
+FileChooser.renameErrorFileExists.textAndMnemonic=Impossibile rinominare {0}: esiste già un file con il nome specificato. Specificare un altro nome.
 FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file
 FileChooser.cancelButton.textAndMnemonic=Annulla
 FileChooser.saveButton.textAndMnemonic=Salva
@@ -107,14 +107,14 @@ ColorChooser.sample.textAndMnemonic=Testo di prova          Testo di prova
 ColorChooser.swatches.textAndMnemonic=Colori cam&pione
 ColorChooser.swatchesRecent.textAndMnemonic=Recenti:
 ColorChooser.hsv.textAndMnemonic=&HSV
-ColorChooser.hsvHue.textAndMnemonic=Tonalit\u00E0
+ColorChooser.hsvHue.textAndMnemonic=Tonalità
 ColorChooser.hsvSaturation.textAndMnemonic=Saturazione
 ColorChooser.hsvValue.textAndMnemonic=Valore
 ColorChooser.hsvTransparency.textAndMnemonic=Trasparenza
 ColorChooser.hsl.textAndMnemonic=HS&L
-ColorChooser.hslHue.textAndMnemonic=Tonalit\u00E0
+ColorChooser.hslHue.textAndMnemonic=Tonalità
 ColorChooser.hslSaturation.textAndMnemonic=Saturazione
-ColorChooser.hslLightness.textAndMnemonic=Luminosit\u00E0
+ColorChooser.hslLightness.textAndMnemonic=Luminosità
 ColorChooser.hslTransparency.textAndMnemonic=Trasparenza
 ColorChooser.rgb.textAndMnemonic=R&GB
 ColorChooser.rgbRed.textAndMnemonic=Ro&sso
@@ -132,7 +132,7 @@ ColorChooser.cmykAlpha.textAndMnemonic=Alfa
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=&S\u00EC
+OptionPane.yesButton.textAndMnemonic=&Sì
 OptionPane.noButton.textAndMnemonic=&No
 OptionPane.okButton.textAndMnemonic=OK
 #OptionPane.okButtonMnemonic=0
@@ -205,7 +205,7 @@ ProgressMonitor.progress.textAndMnemonic=Avanzamento...
 SplitPane.leftButton.textAndMnemonic=tasto sinistro
 SplitPane.rightButton.textAndMnemonic=tasto destro
 # Used for Isindex
-IsindexView.prompt=Questo \u00E8 un indice di ricerca. Immettere le parole chiave:
+IsindexView.prompt=Questo è un indice di ricerca. Immettere le parole chiave:
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=Riduci a icona
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
index 821de6bfec3..45d79c7ba51 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
@@ -56,24 +56,24 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB
-FileChooser.directoryDescription.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
-FileChooser.newFolderError.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u30A8\u30E9\u30FC
+FileChooser.fileDescription.textAndMnemonic=汎用ファイル
+FileChooser.directoryDescription.textAndMnemonic=ディレクトリ
+FileChooser.newFolderError.textAndMnemonic=新規フォルダの作成エラー
 FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002\n\n\u6307\u5B9A\u3057\u305F\u30D1\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-FileChooser.renameErrorTitle.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D\u5909\u66F4\u30A8\u30E9\u30FC
-FileChooser.renameError.textAndMnemonic={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093
-FileChooser.renameErrorFileExists.textAndMnemonic={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093: \u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
-FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openButton.textAndMnemonic=\u958B\u304F
-FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
-FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U)
-FileChooser.helpButton.textAndMnemonic=\u30D8\u30EB\u30D7(&H)
-FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u304F
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=フォルダを作成できません
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=フォルダを作成できません。\n\n指定したパスが見つかりません。
+FileChooser.renameErrorTitle.textAndMnemonic=ファイルまたはフォルダの名前変更エラー
+FileChooser.renameError.textAndMnemonic={0}の名前を変更できません
+FileChooser.renameErrorFileExists.textAndMnemonic={0}の名前を変更できません: 指定した名前のファイルはすでに存在します。別のファイル名を指定してください。
+FileChooser.acceptAllFileFilter.textAndMnemonic=すべてのファイル
+FileChooser.cancelButton.textAndMnemonic=取消
+FileChooser.saveButton.textAndMnemonic=保存
+FileChooser.openButton.textAndMnemonic=開く
+FileChooser.saveDialogTitle.textAndMnemonic=保存
+FileChooser.openDialogTitle.textAndMnemonic=開く
+FileChooser.updateButton.textAndMnemonic=更新(&U)
+FileChooser.helpButton.textAndMnemonic=ヘルプ(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=開く
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -81,133 +81,133 @@ FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
 # These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.win32.newFolder.subsequent=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0({0})
-FileChooser.other.newFolder=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.other.newFolder.subsequent=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0.{0}
+FileChooser.win32.newFolder=新規フォルダ
+FileChooser.win32.newFolder.subsequent=新規フォルダ({0})
+FileChooser.other.newFolder=新規フォルダ
+FileChooser.other.newFolder.subsequent=新規フォルダ.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059
-FileChooser.saveButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059
-FileChooser.openButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059
-FileChooser.updateButtonToolTip.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30EA\u30B9\u30C8\u3092\u66F4\u65B0\u3057\u307E\u3059
-FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser\u306E\u30D8\u30EB\u30D7\u3067\u3059
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u958B\u304D\u307E\u3059
+FileChooser.cancelButtonToolTip.textAndMnemonic=ファイル・チューザ・ダイアログを終了します
+FileChooser.saveButtonToolTip.textAndMnemonic=選択したファイルを保存します
+FileChooser.openButtonToolTip.textAndMnemonic=選択したファイルを開きます
+FileChooser.updateButtonToolTip.textAndMnemonic=ディレクトリのリストを更新します
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooserのヘルプです
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=選択したディレクトリを開きます
 
-FileChooser.filesListAccessibleName=\u30D5\u30A1\u30A4\u30EB\u30FB\u30EA\u30B9\u30C8
-FileChooser.filesDetailsAccessibleName=\u30D5\u30A1\u30A4\u30EB\u306E\u8A73\u7D30
+FileChooser.filesListAccessibleName=ファイル・リスト
+FileChooser.filesDetailsAccessibleName=ファイルの詳細
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=\u30D7\u30EC\u30D3\u30E5\u30FC
+ColorChooser.preview.textAndMnemonic=プレビュー
 ColorChooser.ok.textAndMnemonic=OK
-ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
-ColorChooser.reset.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8(&R)
-ColorChooser.sample.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8  \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8
-ColorChooser.swatches.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB(&S)
-ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0:
+ColorChooser.cancel.textAndMnemonic=取消
+ColorChooser.reset.textAndMnemonic=リセット(&R)
+ColorChooser.sample.textAndMnemonic=サンプル・テキスト  サンプル・テキスト
+ColorChooser.swatches.textAndMnemonic=サンプル(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=最新:
 ColorChooser.hsv.textAndMnemonic=HSV(&H)
-ColorChooser.hsvHue.textAndMnemonic=\u8272\u76F8
-ColorChooser.hsvSaturation.textAndMnemonic=\u5F69\u5EA6
-ColorChooser.hsvValue.textAndMnemonic=\u5024
-ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.hsvHue.textAndMnemonic=色相
+ColorChooser.hsvSaturation.textAndMnemonic=彩度
+ColorChooser.hsvValue.textAndMnemonic=値
+ColorChooser.hsvTransparency.textAndMnemonic=透明度
 ColorChooser.hsl.textAndMnemonic=HSL(&L)
-ColorChooser.hslHue.textAndMnemonic=\u8272\u76F8
-ColorChooser.hslSaturation.textAndMnemonic=\u5F69\u5EA6
-ColorChooser.hslLightness.textAndMnemonic=\u660E\u5EA6
-ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.hslHue.textAndMnemonic=色相
+ColorChooser.hslSaturation.textAndMnemonic=彩度
+ColorChooser.hslLightness.textAndMnemonic=明度
+ColorChooser.hslTransparency.textAndMnemonic=透明度
 ColorChooser.rgb.textAndMnemonic=RGB(&G)
-ColorChooser.rgbRed.textAndMnemonic=\u8D64(&D)
-ColorChooser.rgbGreen.textAndMnemonic=\u7DD1(&N)
-ColorChooser.rgbBlue.textAndMnemonic=\u9752(&B)
-ColorChooser.rgbAlpha.textAndMnemonic=\u30A2\u30EB\u30D5\u30A1
-ColorChooser.rgbHexCode.textAndMnemonic=\u8272\u30B3\u30FC\u30C9(&C)
+ColorChooser.rgbRed.textAndMnemonic=赤(&D)
+ColorChooser.rgbGreen.textAndMnemonic=緑(&N)
+ColorChooser.rgbBlue.textAndMnemonic=青(&B)
+ColorChooser.rgbAlpha.textAndMnemonic=アルファ
+ColorChooser.rgbHexCode.textAndMnemonic=色コード(&C)
 ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=\u30B7\u30A2\u30F3
-ColorChooser.cmykMagenta.textAndMnemonic=\u30DE\u30BC\u30F3\u30BF
-ColorChooser.cmykYellow.textAndMnemonic=\u9EC4
-ColorChooser.cmykBlack.textAndMnemonic=\u9ED2
-ColorChooser.cmykAlpha.textAndMnemonic=\u30A2\u30EB\u30D5\u30A1
+ColorChooser.cmykCyan.textAndMnemonic=シアン
+ColorChooser.cmykMagenta.textAndMnemonic=マゼンタ
+ColorChooser.cmykYellow.textAndMnemonic=黄
+ColorChooser.cmykBlack.textAndMnemonic=黒
+ColorChooser.cmykAlpha.textAndMnemonic=アルファ
 
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=\u306F\u3044(&Y)
-OptionPane.noButton.textAndMnemonic=\u3044\u3044\u3048(&N)
+OptionPane.yesButton.textAndMnemonic=はい(&Y)
+OptionPane.noButton.textAndMnemonic=いいえ(&N)
 OptionPane.okButton.textAndMnemonic=OK
 #OptionPane.okButtonMnemonic=0
-OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.cancelButton.textAndMnemonic=取消
 #OptionPane.cancelButtonMnemonic=0
-OptionPane.title.textAndMnemonic=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
+OptionPane.title.textAndMnemonic=オプションの選択
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=\u5165\u529B
+OptionPane.inputDialog.titleAndMnemonic=入力
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=\u30E1\u30C3\u30BB\u30FC\u30B8
+OptionPane.messageDialog.titleAndMnemonic=メッセージ
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=\u5370\u5237\u3057\u3066\u3044\u307E\u3059
-PrintingDialog.titleAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059
+PrintingDialog.titleProgress.textAndMnemonic=印刷しています
+PrintingDialog.titleAborting.textAndMnemonic=印刷を中止しています
 
-PrintingDialog.contentInitial.textAndMnemonic=\u5370\u5237\u4E2D...
+PrintingDialog.contentInitial.textAndMnemonic=印刷中...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F...
+PrintingDialog.contentProgress.textAndMnemonic=ページ{0}を印刷しました...
 
-PrintingDialog.contentAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059...
+PrintingDialog.contentAborting.textAndMnemonic=印刷を中止しています...
 
-PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
-PrintingDialog.abortButtonToolTip.textAndMnemonic=\u5370\u5237\u306E\u4E2D\u6B62
+PrintingDialog.abortButton.textAndMnemonic=中止(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=印刷の中止
 
 ############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
-InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
-InternalFrame.restoreButtonToolTip=\u5FA9\u5143
-InternalFrame.closeButtonToolTip=\u9589\u3058\u308B
+InternalFrame.iconButtonToolTip=最小化
+InternalFrame.maxButtonToolTip=最大化
+InternalFrame.restoreButtonToolTip=復元
+InternalFrame.closeButtonToolTip=閉じる
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u5143(&R)
-InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5(&M)
-InternalFrameTitlePane.sizeButton.textAndMnemonic=\u30B5\u30A4\u30BA(&S)
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316(&N)
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316(&X)
-InternalFrameTitlePane.closeButton.textAndMnemonic=\u9589\u3058\u308B(&C)
+InternalFrameTitlePane.restoreButton.textAndMnemonic=復元(&R)
+InternalFrameTitlePane.moveButton.textAndMnemonic=移動(&M)
+InternalFrameTitlePane.sizeButton.textAndMnemonic=サイズ(&S)
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=最小化(&N)
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=最大化(&X)
+InternalFrameTitlePane.closeButton.textAndMnemonic=閉じる(&C)
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButton.textAndMnemonic=\u554F\u5408\u305B\u306E\u5B9F\u884C
-FormView.resetButton.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8
-FormView.browseFileButton.textAndMnemonic=\u53C2\u7167...
+FormView.submitButton.textAndMnemonic=問合せの実行
+FormView.resetButton.textAndMnemonic=リセット
+FormView.browseFileButton.textAndMnemonic=参照...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4
-AbstractDocument.addition.textAndMnemonic=\u8FFD\u52A0
-AbstractDocument.deletion.textAndMnemonic=\u524A\u9664
-AbstractDocument.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
-AbstractDocument.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
+AbstractDocument.styleChange.textAndMnemonic=スタイル変更
+AbstractDocument.addition.textAndMnemonic=追加
+AbstractDocument.deletion.textAndMnemonic=削除
+AbstractDocument.undo.textAndMnemonic=元に戻す
+AbstractDocument.redo.textAndMnemonic=やり直し
 
 ############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=\u30AF\u30EA\u30C3\u30AF
+AbstractButton.click.textAndMnemonic=クリック
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
-AbstractUndoableEdit.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
+AbstractUndoableEdit.undo.textAndMnemonic=元に戻す
+AbstractUndoableEdit.redo.textAndMnemonic=やり直し
 
 ############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7
+ComboBox.togglePopup.textAndMnemonic=トグル・ポップアップ
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=\u9032\u884C\u4E2D...
+ProgressMonitor.progress.textAndMnemonic=進行中...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=\u5DE6\u30DC\u30BF\u30F3
-SplitPane.rightButton.textAndMnemonic=\u53F3\u30DC\u30BF\u30F3
+SplitPane.leftButton.textAndMnemonic=左ボタン
+SplitPane.rightButton.textAndMnemonic=右ボタン
 # Used for Isindex
-IsindexView.prompt=\u691C\u7D22\u7528\u306E\u7D22\u5F15\u3067\u3059\u3002\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:
+IsindexView.prompt=検索用の索引です。検索するキーワードを入力してください:
 
 ############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=\u30A2\u30A4\u30B3\u30F3\u5316
-InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonAccessibleName=\u9589\u3058\u308B
+InternalFrameTitlePane.iconifyButtonAccessibleName=アイコン化
+InternalFrameTitlePane.maximizeButtonAccessibleName=最大化
+InternalFrameTitlePane.closeButtonAccessibleName=閉じる
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
index 0e8edbfe75a..2cb13143d79 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
@@ -56,24 +56,24 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\uC77C\uBC18 \uD30C\uC77C
-FileChooser.directoryDescription.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC
-FileChooser.newFolderError.textAndMnemonic=\uC0C8 \uD3F4\uB354\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+FileChooser.fileDescription.textAndMnemonic=일반 파일
+FileChooser.directoryDescription.textAndMnemonic=디렉토리
+FileChooser.newFolderError.textAndMnemonic=새 폴더를 생성하는 중 오류가 발생했습니다.
 FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC74C
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n\n\uC2DC\uC2A4\uD15C\uC5D0\uC11C \uC9C0\uC815\uB41C \uACBD\uB85C\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FileChooser.renameErrorTitle.textAndMnemonic=\uD30C\uC77C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uBC14\uAFB8\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD
-FileChooser.renameError.textAndMnemonic={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FileChooser.renameErrorFileExists.textAndMnemonic={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC74C: \uC9C0\uC815\uD55C \uC774\uB984\uC744 \uC0AC\uC6A9\uD558\uB294 \uD30C\uC77C\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uB2E4\uB978 \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624.
-FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C
-FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C
-FileChooser.saveButton.textAndMnemonic=\uC800\uC7A5
-FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30
-FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
-FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
-FileChooser.updateButton.textAndMnemonic=\uC5C5\uB370\uC774\uD2B8(&U)
-FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0(&H)
-FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=폴더를 생성할 수 없음
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=폴더를 생성할 수 없습니다.\n\n시스템에서 지정된 경로를 찾을 수 없습니다.
+FileChooser.renameErrorTitle.textAndMnemonic=파일 또는 폴더 이름 바꾸는 중 오류 발생
+FileChooser.renameError.textAndMnemonic={0}의 이름을 바꿀 수 없습니다.
+FileChooser.renameErrorFileExists.textAndMnemonic={0}의 이름을 바꿀 수 없음: 지정한 이름을 사용하는 파일이 존재합니다. 다른 파일 이름을 지정하십시오.
+FileChooser.acceptAllFileFilter.textAndMnemonic=모든 파일
+FileChooser.cancelButton.textAndMnemonic=취소
+FileChooser.saveButton.textAndMnemonic=저장
+FileChooser.openButton.textAndMnemonic=열기
+FileChooser.saveDialogTitle.textAndMnemonic=저장
+FileChooser.openDialogTitle.textAndMnemonic=열기
+FileChooser.updateButton.textAndMnemonic=업데이트(&U)
+FileChooser.helpButton.textAndMnemonic=도움말(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=열기
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -81,133 +81,133 @@ FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
 # These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=\uC0C8 \uD3F4\uB354
-FileChooser.win32.newFolder.subsequent=\uC0C8 \uD3F4\uB354({0})
+FileChooser.win32.newFolder=새 폴더
+FileChooser.win32.newFolder.subsequent=새 폴더({0})
 FileChooser.other.newFolder=NewFolder
 FileChooser.other.newFolder.subsequent=NewFolder.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790 \uC911\uB2E8
-FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC800\uC7A5
-FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC5F4\uAE30
-FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D \uC5C5\uB370\uC774\uD2B8
-FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \uB3C4\uC6C0\uB9D0
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uB514\uB809\uD1A0\uB9AC \uC5F4\uAE30
+FileChooser.cancelButtonToolTip.textAndMnemonic=파일 선택기 대화상자 중단
+FileChooser.saveButtonToolTip.textAndMnemonic=선택된 파일 저장
+FileChooser.openButtonToolTip.textAndMnemonic=선택된 파일 열기
+FileChooser.updateButtonToolTip.textAndMnemonic=디렉토리 목록 업데이트
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser 도움말
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=선택된 디렉토리 열기
 
-FileChooser.filesListAccessibleName=\uD30C\uC77C \uBAA9\uB85D
-FileChooser.filesDetailsAccessibleName=\uD30C\uC77C \uC138\uBD80\uC815\uBCF4
+FileChooser.filesListAccessibleName=파일 목록
+FileChooser.filesDetailsAccessibleName=파일 세부정보
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=\uBBF8\uB9AC\uBCF4\uAE30
-ColorChooser.ok.textAndMnemonic=\uD655\uC778
-ColorChooser.cancel.textAndMnemonic=\uCDE8\uC18C
-ColorChooser.reset.textAndMnemonic=\uC7AC\uC124\uC815(&R)
-ColorChooser.sample.textAndMnemonic=\uC0D8\uD50C \uD14D\uC2A4\uD2B8  \uC0D8\uD50C \uD14D\uC2A4\uD2B8
-ColorChooser.swatches.textAndMnemonic=\uACAC\uBCF8(&S)
-ColorChooser.swatchesRecent.textAndMnemonic=\uCD5C\uADFC \uBAA9\uB85D:
+ColorChooser.preview.textAndMnemonic=미리보기
+ColorChooser.ok.textAndMnemonic=확인
+ColorChooser.cancel.textAndMnemonic=취소
+ColorChooser.reset.textAndMnemonic=재설정(&R)
+ColorChooser.sample.textAndMnemonic=샘플 텍스트  샘플 텍스트
+ColorChooser.swatches.textAndMnemonic=견본(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=최근 목록:
 ColorChooser.hsv.textAndMnemonic=HSV(&H)
-ColorChooser.hsvHue.textAndMnemonic=\uC0C9\uC870
-ColorChooser.hsvSaturation.textAndMnemonic=\uCC44\uB3C4
-ColorChooser.hsvValue.textAndMnemonic=\uAC12
-ColorChooser.hsvTransparency.textAndMnemonic=\uD22C\uBA85
+ColorChooser.hsvHue.textAndMnemonic=색조
+ColorChooser.hsvSaturation.textAndMnemonic=채도
+ColorChooser.hsvValue.textAndMnemonic=값
+ColorChooser.hsvTransparency.textAndMnemonic=투명
 ColorChooser.hsl.textAndMnemonic=HSL(&L)
-ColorChooser.hslHue.textAndMnemonic=\uC0C9\uC870
-ColorChooser.hslSaturation.textAndMnemonic=\uCC44\uB3C4
-ColorChooser.hslLightness.textAndMnemonic=\uBC1D\uAE30
-ColorChooser.hslTransparency.textAndMnemonic=\uD22C\uBA85
+ColorChooser.hslHue.textAndMnemonic=색조
+ColorChooser.hslSaturation.textAndMnemonic=채도
+ColorChooser.hslLightness.textAndMnemonic=밝기
+ColorChooser.hslTransparency.textAndMnemonic=투명
 ColorChooser.rgb.textAndMnemonic=RGB(&G)
-ColorChooser.rgbRed.textAndMnemonic=\uBE68\uAC04\uC0C9(&D)
-ColorChooser.rgbGreen.textAndMnemonic=\uB179\uC0C9(&N)
-ColorChooser.rgbBlue.textAndMnemonic=\uD30C\uB780\uC0C9(&B)
-ColorChooser.rgbAlpha.textAndMnemonic=\uC54C\uD30C
-ColorChooser.rgbHexCode.textAndMnemonic=\uC0C9\uC0C1 \uCF54\uB4DC(&C)
+ColorChooser.rgbRed.textAndMnemonic=빨간색(&D)
+ColorChooser.rgbGreen.textAndMnemonic=녹색(&N)
+ColorChooser.rgbBlue.textAndMnemonic=파란색(&B)
+ColorChooser.rgbAlpha.textAndMnemonic=알파
+ColorChooser.rgbHexCode.textAndMnemonic=색상 코드(&C)
 ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=\uCCAD\uB85D\uC0C9
-ColorChooser.cmykMagenta.textAndMnemonic=\uC9C4\uD64D\uC0C9
-ColorChooser.cmykYellow.textAndMnemonic=\uB178\uB780\uC0C9
-ColorChooser.cmykBlack.textAndMnemonic=\uAC80\uC815\uC0C9
-ColorChooser.cmykAlpha.textAndMnemonic=\uC54C\uD30C
+ColorChooser.cmykCyan.textAndMnemonic=청록색
+ColorChooser.cmykMagenta.textAndMnemonic=진홍색
+ColorChooser.cmykYellow.textAndMnemonic=노란색
+ColorChooser.cmykBlack.textAndMnemonic=검정색
+ColorChooser.cmykAlpha.textAndMnemonic=알파
 
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=\uC608(&Y)
-OptionPane.noButton.textAndMnemonic=\uC544\uB2C8\uC624(&N)
-OptionPane.okButton.textAndMnemonic=\uD655\uC778
+OptionPane.yesButton.textAndMnemonic=예(&Y)
+OptionPane.noButton.textAndMnemonic=아니오(&N)
+OptionPane.okButton.textAndMnemonic=확인
 #OptionPane.okButtonMnemonic=0
-OptionPane.cancelButton.textAndMnemonic=\uCDE8\uC18C
+OptionPane.cancelButton.textAndMnemonic=취소
 #OptionPane.cancelButtonMnemonic=0
-OptionPane.title.textAndMnemonic=\uC635\uC158 \uC120\uD0DD
+OptionPane.title.textAndMnemonic=옵션 선택
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=\uC785\uB825
+OptionPane.inputDialog.titleAndMnemonic=입력
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=\uBA54\uC2DC\uC9C0
+OptionPane.messageDialog.titleAndMnemonic=메시지
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=\uC778\uC1C4
-PrintingDialog.titleAborting.textAndMnemonic=\uC778\uC1C4(\uC911\uB2E8 \uC911)
+PrintingDialog.titleProgress.textAndMnemonic=인쇄
+PrintingDialog.titleAborting.textAndMnemonic=인쇄(중단 중)
 
-PrintingDialog.contentInitial.textAndMnemonic=\uC778\uC1C4 \uC9C4\uD589 \uC911...
+PrintingDialog.contentInitial.textAndMnemonic=인쇄 진행 중...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}...
+PrintingDialog.contentProgress.textAndMnemonic=인쇄된 페이지 {0}...
 
-PrintingDialog.contentAborting.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8 \uC911...
+PrintingDialog.contentAborting.textAndMnemonic=인쇄 중단 중...
 
-PrintingDialog.abortButton.textAndMnemonic=\uC911\uB2E8(&A)
-PrintingDialog.abortButtonToolTip.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8
+PrintingDialog.abortButton.textAndMnemonic=중단(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=인쇄 중단
 
 ############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=\uCD5C\uC18C\uD654
-InternalFrame.maxButtonToolTip=\uCD5C\uB300\uD654
-InternalFrame.restoreButtonToolTip=\uBCF5\uC6D0
-InternalFrame.closeButtonToolTip=\uB2EB\uAE30
+InternalFrame.iconButtonToolTip=최소화
+InternalFrame.maxButtonToolTip=최대화
+InternalFrame.restoreButtonToolTip=복원
+InternalFrame.closeButtonToolTip=닫기
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\uBCF5\uC6D0(&R)
-InternalFrameTitlePane.moveButton.textAndMnemonic=\uC774\uB3D9(&M)
-InternalFrameTitlePane.sizeButton.textAndMnemonic=\uD06C\uAE30(&S)
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=\uCD5C\uC18C\uD654(&N)
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=\uCD5C\uB300\uD654(&X)
-InternalFrameTitlePane.closeButton.textAndMnemonic=\uB2EB\uAE30(&C)
+InternalFrameTitlePane.restoreButton.textAndMnemonic=복원(&R)
+InternalFrameTitlePane.moveButton.textAndMnemonic=이동(&M)
+InternalFrameTitlePane.sizeButton.textAndMnemonic=크기(&S)
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=최소화(&N)
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=최대화(&X)
+InternalFrameTitlePane.closeButton.textAndMnemonic=닫기(&C)
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButton.textAndMnemonic=\uC9C8\uC758 \uC81C\uCD9C
-FormView.resetButton.textAndMnemonic=\uC7AC\uC124\uC815
-FormView.browseFileButton.textAndMnemonic=\uCC3E\uC544\uBCF4\uAE30...
+FormView.submitButton.textAndMnemonic=질의 제출
+FormView.resetButton.textAndMnemonic=재설정
+FormView.browseFileButton.textAndMnemonic=찾아보기...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=\uC2A4\uD0C0\uC77C \uBCC0\uACBD
-AbstractDocument.addition.textAndMnemonic=\uCD94\uAC00
-AbstractDocument.deletion.textAndMnemonic=\uC0AD\uC81C
-AbstractDocument.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
-AbstractDocument.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
+AbstractDocument.styleChange.textAndMnemonic=스타일 변경
+AbstractDocument.addition.textAndMnemonic=추가
+AbstractDocument.deletion.textAndMnemonic=삭제
+AbstractDocument.undo.textAndMnemonic=실행 취소
+AbstractDocument.redo.textAndMnemonic=재실행
 
 ############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=\uB204\uB974\uAE30
+AbstractButton.click.textAndMnemonic=누르기
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
-AbstractUndoableEdit.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
+AbstractUndoableEdit.undo.textAndMnemonic=실행 취소
+AbstractUndoableEdit.redo.textAndMnemonic=재실행
 
 ############ Combo Box Strings ############
 ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=\uC9C4\uD589...
+ProgressMonitor.progress.textAndMnemonic=진행...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=\uC67C\uCABD \uB2E8\uCD94
-SplitPane.rightButton.textAndMnemonic=\uC624\uB978\uCABD \uB2E8\uCD94
+SplitPane.leftButton.textAndMnemonic=왼쪽 단추
+SplitPane.rightButton.textAndMnemonic=오른쪽 단추
 # Used for Isindex
-IsindexView.prompt=\uB2E4\uC74C\uC740 \uAC80\uC0C9 \uAC00\uB2A5\uD55C \uC778\uB371\uC2A4\uC785\uB2C8\uB2E4. \uAC80\uC0C9 \uD0A4\uC6CC\uB4DC \uC785\uB825:
+IsindexView.prompt=다음은 검색 가능한 인덱스입니다. 검색 키워드 입력:
 
 ############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=\uC544\uC774\uCF58\uD654
-InternalFrameTitlePane.maximizeButtonAccessibleName=\uCD5C\uB300\uD654
-InternalFrameTitlePane.closeButtonAccessibleName=\uB2EB\uAE30
+InternalFrameTitlePane.iconifyButtonAccessibleName=아이콘화
+InternalFrameTitlePane.maximizeButtonAccessibleName=최대화
+InternalFrameTitlePane.closeButtonAccessibleName=닫기
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties
index b6e63788733..73859db92d2 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties
@@ -56,15 +56,15 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=Arquivo Gen\u00E9rico
-FileChooser.directoryDescription.textAndMnemonic=Diret\u00F3rio
+FileChooser.fileDescription.textAndMnemonic=Arquivo Genérico
+FileChooser.directoryDescription.textAndMnemonic=Diretório
 FileChooser.newFolderError.textAndMnemonic=Erro ao criar nova pasta
 FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel criar a pasta
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel criar a pasta.\n\nO sistema n\u00E3o pode localizar o caminho especificado.
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Não é possível criar a pasta
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Não é possível criar a pasta.\n\nO sistema não pode localizar o caminho especificado.
 FileChooser.renameErrorTitle.textAndMnemonic=Erro ao Renomear o Arquivo ou a Pasta
-FileChooser.renameError.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel renomear {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel renomear {0}: Um arquivo com o nome especificado j\u00E1 existe. Especifique outro nome de arquivo.
+FileChooser.renameError.textAndMnemonic=Não é possível renomear {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=Não é possível renomear {0}: Um arquivo com o nome especificado já existe. Especifique outro nome de arquivo.
 FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos
 FileChooser.cancelButton.textAndMnemonic=Cancelar
 FileChooser.saveButton.textAndMnemonic=Salvar
@@ -88,12 +88,12 @@ FileChooser.other.newFolder.subsequent=NewFolder.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de diálogo do seletor de arquivos
 FileChooser.saveButtonToolTip.textAndMnemonic=Salvar arquivo selecionado
 FileChooser.openButtonToolTip.textAndMnemonic=Abrir arquivo selecionado
-FileChooser.updateButtonToolTip.textAndMnemonic=Atualizar lista de diret\u00F3rios
+FileChooser.updateButtonToolTip.textAndMnemonic=Atualizar lista de diretórios
 FileChooser.helpButtonToolTip.textAndMnemonic=Ajuda do FileChooser
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Abrir diret\u00F3rio selecionado
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Abrir diretório selecionado
 
 FileChooser.filesListAccessibleName=Lista de Arquivos
 FileChooser.filesDetailsAccessibleName=Detalhes do Arquivo
@@ -108,20 +108,20 @@ ColorChooser.swatches.textAndMnemonic=Amo&stras
 ColorChooser.swatchesRecent.textAndMnemonic=Recente:
 ColorChooser.hsv.textAndMnemonic=&HSV
 ColorChooser.hsvHue.textAndMnemonic=Matiz
-ColorChooser.hsvSaturation.textAndMnemonic=Satura\u00E7\u00E3o
+ColorChooser.hsvSaturation.textAndMnemonic=Saturação
 ColorChooser.hsvValue.textAndMnemonic=Valor
-ColorChooser.hsvTransparency.textAndMnemonic=Transpar\u00EAncia
+ColorChooser.hsvTransparency.textAndMnemonic=Transparência
 ColorChooser.hsl.textAndMnemonic=HS&L
 ColorChooser.hslHue.textAndMnemonic=Matiz
-ColorChooser.hslSaturation.textAndMnemonic=Satura\u00E7\u00E3o
+ColorChooser.hslSaturation.textAndMnemonic=Saturação
 ColorChooser.hslLightness.textAndMnemonic=Clareza
-ColorChooser.hslTransparency.textAndMnemonic=Transpar\u00EAncia
+ColorChooser.hslTransparency.textAndMnemonic=Transparência
 ColorChooser.rgb.textAndMnemonic=R&GB
 ColorChooser.rgbRed.textAndMnemonic=&Vermelho
 ColorChooser.rgbGreen.textAndMnemonic=&Verde
 ColorChooser.rgbBlue.textAndMnemonic=&Azul
 ColorChooser.rgbAlpha.textAndMnemonic=Alfa
-ColorChooser.rgbHexCode.textAndMnemonic=&C\u00F3digo da Cor
+ColorChooser.rgbHexCode.textAndMnemonic=&Código da Cor
 ColorChooser.cmyk.textAndMnemonic=C&MYK
 ColorChooser.cmykCyan.textAndMnemonic=Ciano
 ColorChooser.cmykMagenta.textAndMnemonic=Magenta
@@ -133,12 +133,12 @@ ColorChooser.cmykAlpha.textAndMnemonic=Alfa
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
 OptionPane.yesButton.textAndMnemonic=&Sim
-OptionPane.noButton.textAndMnemonic=&N\u00E3o
+OptionPane.noButton.textAndMnemonic=&Não
 OptionPane.okButton.textAndMnemonic=OK
 #OptionPane.okButtonMnemonic=0
 OptionPane.cancelButton.textAndMnemonic=Cancelar
 #OptionPane.cancelButtonMnemonic=0
-OptionPane.title.textAndMnemonic=Selecionar uma Op\u00E7\u00E3o
+OptionPane.title.textAndMnemonic=Selecionar uma Opção
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
 OptionPane.inputDialog.titleAndMnemonic=Entrada
@@ -147,19 +147,19 @@ OptionPane.inputDialog.titleAndMnemonic=Entrada
 OptionPane.messageDialog.titleAndMnemonic=Mensagem
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=Impress\u00E3o
-PrintingDialog.titleAborting.textAndMnemonic=Impress\u00E3o (Abortando)
+PrintingDialog.titleProgress.textAndMnemonic=Impressão
+PrintingDialog.titleAborting.textAndMnemonic=Impressão (Abortando)
 
-PrintingDialog.contentInitial.textAndMnemonic=Impress\u00E3o em andamento...
+PrintingDialog.contentInitial.textAndMnemonic=Impressão em andamento...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impressa {0}...
+PrintingDialog.contentProgress.textAndMnemonic=Página impressa {0}...
 
-PrintingDialog.contentAborting.textAndMnemonic=Abortando impress\u00E3o...
+PrintingDialog.contentAborting.textAndMnemonic=Abortando impressão...
 
 PrintingDialog.abortButton.textAndMnemonic=&Abortar
-PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impress\u00E3o
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impressão
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimizar
@@ -182,9 +182,9 @@ FormView.resetButton.textAndMnemonic=Redefinir
 FormView.browseFileButton.textAndMnemonic=Procurar...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=altera\u00E7\u00E3o de estilo
-AbstractDocument.addition.textAndMnemonic=adi\u00E7\u00E3o
-AbstractDocument.deletion.textAndMnemonic=exclus\u00E3o
+AbstractDocument.styleChange.textAndMnemonic=alteração de estilo
+AbstractDocument.addition.textAndMnemonic=adição
+AbstractDocument.deletion.textAndMnemonic=exclusão
 AbstractDocument.undo.textAndMnemonic=Desfazer
 AbstractDocument.redo.textAndMnemonic=Refazer
 
@@ -202,10 +202,10 @@ ComboBox.togglePopup.textAndMnemonic=togglePopup
 ProgressMonitor.progress.textAndMnemonic=Andamento...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=bot\u00E3o esquerdo
-SplitPane.rightButton.textAndMnemonic=bot\u00E3o direito
+SplitPane.leftButton.textAndMnemonic=botão esquerdo
+SplitPane.rightButton.textAndMnemonic=botão direito
 # Used for Isindex
-IsindexView.prompt=Trata-se de um \u00EDndice pesquis\u00E1vel. Informe as palavras-chave de pesquisa:
+IsindexView.prompt=Trata-se de um índice pesquisável. Informe as palavras-chave de pesquisa:
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=Iconizar
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
index ad5fa101226..7fe4fa30b2a 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
@@ -61,19 +61,19 @@ FileChooser.directoryDescription.textAndMnemonic=Katalog
 FileChooser.newFolderError.textAndMnemonic=Kan inte skapa ny mapp
 FileChooser.newFolderErrorSeparator= :
 FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Kan inte skapa mappen
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=Kan inte skapa mappen.\n\nSystemet kan inte hitta angiven s\u00F6kv\u00E4g.
-FileChooser.renameErrorTitle.textAndMnemonic=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att \u00E4ndra namn p\u00E5 fil eller mapp
-FileChooser.renameError.textAndMnemonic=Kan inte namn\u00E4ndra {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=Kan inte namn\u00E4ndra {0}: En fil med angivet namn finns redan. Ange ett annat filnamn.
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Kan inte skapa mappen.\n\nSystemet kan inte hitta angiven sökväg.
+FileChooser.renameErrorTitle.textAndMnemonic=Ett fel inträffade vid försök att ändra namn på fil eller mapp
+FileChooser.renameError.textAndMnemonic=Kan inte namnändra {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=Kan inte namnändra {0}: En fil med angivet namn finns redan. Ange ett annat filnamn.
 FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
 FileChooser.cancelButton.textAndMnemonic=Avbryt
 FileChooser.saveButton.textAndMnemonic=Spara
-FileChooser.openButton.textAndMnemonic=\u00D6ppna
+FileChooser.openButton.textAndMnemonic=Öppna
 FileChooser.saveDialogTitle.textAndMnemonic=Spara
-FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
+FileChooser.openDialogTitle.textAndMnemonic=Öppna
 FileChooser.updateButton.textAndMnemonic=Upp&datera
-FileChooser.helpButton.textAndMnemonic=&Hj\u00E4lp
-FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ppna
+FileChooser.helpButton.textAndMnemonic=&Hjälp
+FileChooser.directoryOpenButton.textAndMnemonic=Öppna
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -88,12 +88,12 @@ FileChooser.other.newFolder.subsequent=Ny mapp {0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan f\u00F6r filval
+FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan för filval
 FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil
-FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil
+FileChooser.openButtonToolTip.textAndMnemonic=Öppna vald fil
 FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglista
-FileChooser.helpButtonToolTip.textAndMnemonic=Hj\u00E4lp f\u00F6r val av fil
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u00D6ppna vald katalog
+FileChooser.helpButtonToolTip.textAndMnemonic=Hjälp för val av fil
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Öppna vald katalog
 
 FileChooser.filesListAccessibleName=Fillista
 FileChooser.filesDetailsAccessibleName=Fildetaljer
@@ -102,26 +102,26 @@ FileChooser.filesDetailsAccessibleName=Fildetaljer
 ColorChooser.preview.textAndMnemonic=Granska
 ColorChooser.ok.textAndMnemonic=OK
 ColorChooser.cancel.textAndMnemonic=Avbryt
-ColorChooser.reset.textAndMnemonic=&\u00C5terst\u00E4ll
+ColorChooser.reset.textAndMnemonic=&Återställ
 ColorChooser.sample.textAndMnemonic=Exempeltext  Exempeltext
 ColorChooser.swatches.textAndMnemonic=&Prov
 ColorChooser.swatchesRecent.textAndMnemonic=Senaste:
 ColorChooser.hsv.textAndMnemonic=&HSV
 ColorChooser.hsvHue.textAndMnemonic=Nyans
-ColorChooser.hsvSaturation.textAndMnemonic=M\u00E4ttnad
-ColorChooser.hsvValue.textAndMnemonic=V\u00E4rde
+ColorChooser.hsvSaturation.textAndMnemonic=Mättnad
+ColorChooser.hsvValue.textAndMnemonic=Värde
 ColorChooser.hsvTransparency.textAndMnemonic=Transparens
 ColorChooser.hsl.textAndMnemonic=HS&L
 ColorChooser.hslHue.textAndMnemonic=Nyans
-ColorChooser.hslSaturation.textAndMnemonic=M\u00E4ttnad
+ColorChooser.hslSaturation.textAndMnemonic=Mättnad
 ColorChooser.hslLightness.textAndMnemonic=Ljusstyrka
 ColorChooser.hslTransparency.textAndMnemonic=Transparens
 ColorChooser.rgb.textAndMnemonic=R&GB
-ColorChooser.rgbRed.textAndMnemonic=R\u00F6&d
-ColorChooser.rgbGreen.textAndMnemonic=Gr\u00F6&n
-ColorChooser.rgbBlue.textAndMnemonic=&Bl\u00E5
+ColorChooser.rgbRed.textAndMnemonic=Rö&d
+ColorChooser.rgbGreen.textAndMnemonic=Grö&n
+ColorChooser.rgbBlue.textAndMnemonic=&Blå
 ColorChooser.rgbAlpha.textAndMnemonic=Alfa
-ColorChooser.rgbHexCode.textAndMnemonic=&F\u00E4rgkod
+ColorChooser.rgbHexCode.textAndMnemonic=&Färgkod
 ColorChooser.cmyk.textAndMnemonic=C&MYK
 ColorChooser.cmykCyan.textAndMnemonic=Cyan
 ColorChooser.cmykMagenta.textAndMnemonic=Magenta
@@ -138,7 +138,7 @@ OptionPane.okButton.textAndMnemonic=OK
 #OptionPane.okButtonMnemonic=0
 OptionPane.cancelButton.textAndMnemonic=Avbryt
 #OptionPane.cancelButtonMnemonic=0
-OptionPane.title.textAndMnemonic=V\u00E4lj ett alternativ
+OptionPane.title.textAndMnemonic=Välj ett alternativ
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
 OptionPane.inputDialog.titleAndMnemonic=Indata
@@ -150,7 +150,7 @@ OptionPane.messageDialog.titleAndMnemonic=Meddelande
 PrintingDialog.titleProgress.textAndMnemonic=Skriver ut
 PrintingDialog.titleAborting.textAndMnemonic=Skriver ut (avbryter)
 
-PrintingDialog.contentInitial.textAndMnemonic=Utskrift p\u00E5g\u00E5r...
+PrintingDialog.contentInitial.textAndMnemonic=Utskrift pågår...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
@@ -164,50 +164,50 @@ PrintingDialog.abortButtonToolTip.textAndMnemonic=Avbryt utskrift
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimera
 InternalFrame.maxButtonToolTip=Maximera
-InternalFrame.restoreButtonToolTip=\u00C5terst\u00E4ll
-InternalFrame.closeButtonToolTip=St\u00E4ng
+InternalFrame.restoreButtonToolTip=Återställ
+InternalFrame.closeButtonToolTip=Stäng
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=&\u00C5terst\u00E4ll
+InternalFrameTitlePane.restoreButton.textAndMnemonic=&Återställ
 InternalFrameTitlePane.moveButton.textAndMnemonic=&Flytta
 InternalFrameTitlePane.sizeButton.textAndMnemonic=&Storlek
 InternalFrameTitlePane.minimizeButton.textAndMnemonic=Mi&nimera
 InternalFrameTitlePane.maximizeButton.textAndMnemonic=Ma&ximera
-InternalFrameTitlePane.closeButton.textAndMnemonic=&St\u00E4ng
+InternalFrameTitlePane.closeButton.textAndMnemonic=&Stäng
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButton.textAndMnemonic=Skicka fr\u00E5ga
-FormView.resetButton.textAndMnemonic=\u00C5terst\u00E4ll
-FormView.browseFileButton.textAndMnemonic=Bl\u00E4ddra...
+FormView.submitButton.textAndMnemonic=Skicka fråga
+FormView.resetButton.textAndMnemonic=Återställ
+FormView.browseFileButton.textAndMnemonic=Bläddra...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=format\u00E4ndring
-AbstractDocument.addition.textAndMnemonic=till\u00E4gg
+AbstractDocument.styleChange.textAndMnemonic=formatändring
+AbstractDocument.addition.textAndMnemonic=tillägg
 AbstractDocument.deletion.textAndMnemonic=borttagning
-AbstractDocument.undo.textAndMnemonic=\u00C5ngra
-AbstractDocument.redo.textAndMnemonic=G\u00F6r om
+AbstractDocument.undo.textAndMnemonic=Ångra
+AbstractDocument.redo.textAndMnemonic=Gör om
 
 ############ Abstract Button Strings ############
 AbstractButton.click.textAndMnemonic=klicka
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\u00C5ngra
-AbstractUndoableEdit.redo.textAndMnemonic=G\u00F6r om
+AbstractUndoableEdit.undo.textAndMnemonic=Ångra
+AbstractUndoableEdit.redo.textAndMnemonic=Gör om
 
 ############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=v\u00E4xlaPopup
+ComboBox.togglePopup.textAndMnemonic=växlaPopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=P\u00E5g\u00E5r...
+ProgressMonitor.progress.textAndMnemonic=Pågår...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=v\u00E4nsterknapp
-SplitPane.rightButton.textAndMnemonic=h\u00F6gerknapp
+SplitPane.leftButton.textAndMnemonic=vänsterknapp
+SplitPane.rightButton.textAndMnemonic=högerknapp
 # Used for Isindex
-IsindexView.prompt=Detta \u00E4r ett s\u00F6kbart index. Ange s\u00F6kord:
+IsindexView.prompt=Detta är ett sökbart index. Ange sökord:
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=Minimera
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximera
-InternalFrameTitlePane.closeButtonAccessibleName=St\u00E4ng
+InternalFrameTitlePane.closeButtonAccessibleName=Stäng
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
index 08b7a2df572..b7349b888ef 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
@@ -56,24 +56,24 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\u901A\u7528\u6587\u4EF6
-FileChooser.directoryDescription.textAndMnemonic=\u76EE\u5F55
-FileChooser.newFolderError.textAndMnemonic=\u521B\u5EFA\u65B0\u7684\u6587\u4EF6\u5939\u65F6\u51FA\u9519
+FileChooser.fileDescription.textAndMnemonic=通用文件
+FileChooser.directoryDescription.textAndMnemonic=目录
+FileChooser.newFolderError.textAndMnemonic=创建新的文件夹时出错
 FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939\u3002\n\n\u7CFB\u7EDF\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F84\u3002
-FileChooser.renameErrorTitle.textAndMnemonic=\u91CD\u547D\u540D\u6587\u4EF6\u6216\u6587\u4EF6\u5939\u65F6\u51FA\u9519
-FileChooser.renameError.textAndMnemonic=\u65E0\u6CD5\u91CD\u547D\u540D{0}
-FileChooser.renameErrorFileExists.textAndMnemonic=\u65E0\u6CD5\u91CD\u547D\u540D{0}: \u5DF2\u5B58\u5728\u5177\u6709\u6240\u6307\u5B9A\u540D\u79F0\u7684\u6587\u4EF6\u3002\u8BF7\u6307\u5B9A\u5176\u4ED6\u6587\u4EF6\u540D\u3002
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
-FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openButton.textAndMnemonic=\u6253\u5F00
-FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
-FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U)
-FileChooser.helpButton.textAndMnemonic=\u5E2E\u52A9(&H)
-FileChooser.directoryOpenButton.textAndMnemonic=\u6253\u5F00
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=无法创建文件夹
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=无法创建文件夹。\n\n系统找不到指定的路径。
+FileChooser.renameErrorTitle.textAndMnemonic=重命名文件或文件夹时出错
+FileChooser.renameError.textAndMnemonic=无法重命名{0}
+FileChooser.renameErrorFileExists.textAndMnemonic=无法重命名{0}: 已存在具有所指定名称的文件。请指定其他文件名。
+FileChooser.acceptAllFileFilter.textAndMnemonic=所有文件
+FileChooser.cancelButton.textAndMnemonic=取消
+FileChooser.saveButton.textAndMnemonic=保存
+FileChooser.openButton.textAndMnemonic=打开
+FileChooser.saveDialogTitle.textAndMnemonic=保存
+FileChooser.openDialogTitle.textAndMnemonic=打开
+FileChooser.updateButton.textAndMnemonic=更新(&U)
+FileChooser.helpButton.textAndMnemonic=帮助(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=打开
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -81,133 +81,133 @@ FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
 # These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.win32.newFolder.subsequent=\u65B0\u5EFA\u6587\u4EF6\u5939 ({0})
+FileChooser.win32.newFolder=新建文件夹
+FileChooser.win32.newFolder.subsequent=新建文件夹 ({0})
 FileChooser.other.newFolder=NewFolder
 FileChooser.other.newFolder.subsequent=NewFolder.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846
-FileChooser.saveButtonToolTip.textAndMnemonic=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6
-FileChooser.openButtonToolTip.textAndMnemonic=\u6253\u5F00\u6240\u9009\u6587\u4EF6
-FileChooser.updateButtonToolTip.textAndMnemonic=\u66F4\u65B0\u76EE\u5F55\u5217\u8868
-FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \u5E2E\u52A9
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u6253\u5F00\u9009\u62E9\u7684\u76EE\u5F55
+FileChooser.cancelButtonToolTip.textAndMnemonic=中止文件选择器对话框
+FileChooser.saveButtonToolTip.textAndMnemonic=保存所选文件
+FileChooser.openButtonToolTip.textAndMnemonic=打开所选文件
+FileChooser.updateButtonToolTip.textAndMnemonic=更新目录列表
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser 帮助
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=打开选择的目录
 
-FileChooser.filesListAccessibleName=\u6587\u4EF6\u5217\u8868
-FileChooser.filesDetailsAccessibleName=\u6587\u4EF6\u8BE6\u7EC6\u4FE1\u606F
+FileChooser.filesListAccessibleName=文件列表
+FileChooser.filesDetailsAccessibleName=文件详细信息
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=\u9884\u89C8
-ColorChooser.ok.textAndMnemonic=\u786E\u5B9A
-ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
-ColorChooser.reset.textAndMnemonic=\u91CD\u7F6E(&R)
-ColorChooser.sample.textAndMnemonic=\u793A\u4F8B\u6587\u672C  \u793A\u4F8B\u6587\u672C
-ColorChooser.swatches.textAndMnemonic=\u6837\u672C(&S)
-ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u8FD1:
+ColorChooser.preview.textAndMnemonic=预览
+ColorChooser.ok.textAndMnemonic=确定
+ColorChooser.cancel.textAndMnemonic=取消
+ColorChooser.reset.textAndMnemonic=重置(&R)
+ColorChooser.sample.textAndMnemonic=示例文本  示例文本
+ColorChooser.swatches.textAndMnemonic=样本(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=最近:
 ColorChooser.hsv.textAndMnemonic=HSV(&H)
-ColorChooser.hsvHue.textAndMnemonic=\u8272\u8C03
-ColorChooser.hsvSaturation.textAndMnemonic=\u9971\u548C\u5EA6
-ColorChooser.hsvValue.textAndMnemonic=\u503C
-ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.hsvHue.textAndMnemonic=色调
+ColorChooser.hsvSaturation.textAndMnemonic=饱和度
+ColorChooser.hsvValue.textAndMnemonic=值
+ColorChooser.hsvTransparency.textAndMnemonic=透明度
 ColorChooser.hsl.textAndMnemonic=HSL(&L)
-ColorChooser.hslHue.textAndMnemonic=\u8272\u8C03
-ColorChooser.hslSaturation.textAndMnemonic=\u9971\u548C\u5EA6
-ColorChooser.hslLightness.textAndMnemonic=\u4EAE\u5EA6
-ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.hslHue.textAndMnemonic=色调
+ColorChooser.hslSaturation.textAndMnemonic=饱和度
+ColorChooser.hslLightness.textAndMnemonic=亮度
+ColorChooser.hslTransparency.textAndMnemonic=透明度
 ColorChooser.rgb.textAndMnemonic=RGB(&G)
-ColorChooser.rgbRed.textAndMnemonic=\u7EA2\u8272(&D)
-ColorChooser.rgbGreen.textAndMnemonic=\u7EFF\u8272(&N)
-ColorChooser.rgbBlue.textAndMnemonic=\u84DD\u8272(&B)
+ColorChooser.rgbRed.textAndMnemonic=红色(&D)
+ColorChooser.rgbGreen.textAndMnemonic=绿色(&N)
+ColorChooser.rgbBlue.textAndMnemonic=蓝色(&B)
 ColorChooser.rgbAlpha.textAndMnemonic=Alpha
-ColorChooser.rgbHexCode.textAndMnemonic=\u989C\u8272\u4EE3\u7801(&C)
+ColorChooser.rgbHexCode.textAndMnemonic=颜色代码(&C)
 ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=\u9752\u8272
-ColorChooser.cmykMagenta.textAndMnemonic=\u7D2B\u7EA2\u8272
-ColorChooser.cmykYellow.textAndMnemonic=\u9EC4\u8272
-ColorChooser.cmykBlack.textAndMnemonic=\u9ED1\u8272
+ColorChooser.cmykCyan.textAndMnemonic=青色
+ColorChooser.cmykMagenta.textAndMnemonic=紫红色
+ColorChooser.cmykYellow.textAndMnemonic=黄色
+ColorChooser.cmykBlack.textAndMnemonic=黑色
 ColorChooser.cmykAlpha.textAndMnemonic=Alpha
 
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
-OptionPane.noButton.textAndMnemonic=\u5426(&N)
-OptionPane.okButton.textAndMnemonic=\u786E\u5B9A
+OptionPane.yesButton.textAndMnemonic=是(&Y)
+OptionPane.noButton.textAndMnemonic=否(&N)
+OptionPane.okButton.textAndMnemonic=确定
 #OptionPane.okButtonMnemonic=0
-OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.cancelButton.textAndMnemonic=取消
 #OptionPane.cancelButtonMnemonic=0
-OptionPane.title.textAndMnemonic=\u9009\u62E9\u4E00\u4E2A\u9009\u9879
+OptionPane.title.textAndMnemonic=选择一个选项
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=\u8F93\u5165
+OptionPane.inputDialog.titleAndMnemonic=输入
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=\u6D88\u606F
+OptionPane.messageDialog.titleAndMnemonic=消息
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=\u6253\u5370
-PrintingDialog.titleAborting.textAndMnemonic=\u6253\u5370 (\u6B63\u5728\u4E2D\u6B62)
+PrintingDialog.titleProgress.textAndMnemonic=打印
+PrintingDialog.titleAborting.textAndMnemonic=打印 (正在中止)
 
-PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u8FDB\u884C\u6253\u5370...
+PrintingDialog.contentInitial.textAndMnemonic=正在进行打印...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u6253\u5370\u9875 {0}...
+PrintingDialog.contentProgress.textAndMnemonic=已打印页 {0}...
 
-PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u6253\u5370...
+PrintingDialog.contentAborting.textAndMnemonic=正在中止打印...
 
-PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
-PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6253\u5370
+PrintingDialog.abortButton.textAndMnemonic=中止(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=中止打印
 
 ############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
-InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
-InternalFrame.restoreButtonToolTip=\u8FD8\u539F
-InternalFrame.closeButtonToolTip=\u5173\u95ED
+InternalFrame.iconButtonToolTip=最小化
+InternalFrame.maxButtonToolTip=最大化
+InternalFrame.restoreButtonToolTip=还原
+InternalFrame.closeButtonToolTip=关闭
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\u8FD8\u539F(&R)
-InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52A8(&M)
-InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F(&S)
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316(&N)
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316(&X)
-InternalFrameTitlePane.closeButton.textAndMnemonic=\u5173\u95ED(&C)
+InternalFrameTitlePane.restoreButton.textAndMnemonic=还原(&R)
+InternalFrameTitlePane.moveButton.textAndMnemonic=移动(&M)
+InternalFrameTitlePane.sizeButton.textAndMnemonic=大小(&S)
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=最小化(&N)
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=最大化(&X)
+InternalFrameTitlePane.closeButton.textAndMnemonic=关闭(&C)
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButton.textAndMnemonic=\u63D0\u4EA4\u67E5\u8BE2
-FormView.resetButton.textAndMnemonic=\u91CD\u7F6E
-FormView.browseFileButton.textAndMnemonic=\u6D4F\u89C8...
+FormView.submitButton.textAndMnemonic=提交查询
+FormView.resetButton.textAndMnemonic=重置
+FormView.browseFileButton.textAndMnemonic=浏览...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=\u6837\u5F0F\u66F4\u6539
-AbstractDocument.addition.textAndMnemonic=\u6DFB\u52A0
-AbstractDocument.deletion.textAndMnemonic=\u5220\u9664
-AbstractDocument.undo.textAndMnemonic=\u64A4\u6D88
-AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
+AbstractDocument.styleChange.textAndMnemonic=样式更改
+AbstractDocument.addition.textAndMnemonic=添加
+AbstractDocument.deletion.textAndMnemonic=删除
+AbstractDocument.undo.textAndMnemonic=撤消
+AbstractDocument.redo.textAndMnemonic=重做
 
 ############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=\u5355\u51FB
+AbstractButton.click.textAndMnemonic=单击
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\u64A4\u6D88
-AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
+AbstractUndoableEdit.undo.textAndMnemonic=撤消
+AbstractUndoableEdit.redo.textAndMnemonic=重做
 
 ############ Combo Box Strings ############
 ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=\u8FDB\u5EA6...
+ProgressMonitor.progress.textAndMnemonic=进度...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=\u5DE6\u952E
-SplitPane.rightButton.textAndMnemonic=\u53F3\u952E
+SplitPane.leftButton.textAndMnemonic=左键
+SplitPane.rightButton.textAndMnemonic=右键
 # Used for Isindex
-IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57:
+IsindexView.prompt=这是可搜索索引。请输入搜索关键字:
 
 ############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=\u56FE\u6807\u5316
-InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonAccessibleName=\u5173\u95ED
+InternalFrameTitlePane.iconifyButtonAccessibleName=图标化
+InternalFrameTitlePane.maximizeButtonAccessibleName=最大化
+InternalFrameTitlePane.closeButtonAccessibleName=关闭
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
index 47085362cf7..c317cb31810 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
@@ -56,24 +56,24 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\u4E00\u822C\u6A94\u6848
-FileChooser.directoryDescription.textAndMnemonic=\u76EE\u9304
-FileChooser.newFolderError.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4
+FileChooser.fileDescription.textAndMnemonic=一般檔案
+FileChooser.directoryDescription.textAndMnemonic=目錄
+FileChooser.newFolderError.textAndMnemonic=建立新資料夾時發生錯誤
 FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E
-FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E\u3002\n\n\u7CFB\u7D71\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F91\u3002
-FileChooser.renameErrorTitle.textAndMnemonic=\u91CD\u65B0\u547D\u540D\u6A94\u6848\u6216\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4\u3002
-FileChooser.renameError.textAndMnemonic=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}: \u5DF2\u7D93\u5B58\u5728\u60A8\u6240\u6307\u5B9A\u540D\u7A31\u7684\u6A94\u6848\u3002\u8ACB\u6307\u5B9A\u4E0D\u540C\u7684\u540D\u7A31\u3002
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
-FileChooser.saveButton.textAndMnemonic=\u5132\u5B58
-FileChooser.openButton.textAndMnemonic=\u958B\u555F
-FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F
-FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U)
-FileChooser.helpButton.textAndMnemonic=\u8AAA\u660E(&H)
-FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u555F
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=無法建立資料夾
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=無法建立資料夾。\n\n系統找不到指定的路徑。
+FileChooser.renameErrorTitle.textAndMnemonic=重新命名檔案或資料夾時發生錯誤。
+FileChooser.renameError.textAndMnemonic=無法重新命名 {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=無法重新命名 {0}: 已經存在您所指定名稱的檔案。請指定不同的名稱。
+FileChooser.acceptAllFileFilter.textAndMnemonic=所有檔案
+FileChooser.cancelButton.textAndMnemonic=取消
+FileChooser.saveButton.textAndMnemonic=儲存
+FileChooser.openButton.textAndMnemonic=開啟
+FileChooser.saveDialogTitle.textAndMnemonic=儲存
+FileChooser.openDialogTitle.textAndMnemonic=開啟
+FileChooser.updateButton.textAndMnemonic=更新(&U)
+FileChooser.helpButton.textAndMnemonic=說明(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=開啟
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -81,133 +81,133 @@ FileChooser.fileSizeMegaBytes={0} MB
 FileChooser.fileSizeGigaBytes={0} GB
 
 # These strings are platform dependent not look and feel dependent.
-FileChooser.win32.newFolder=\u65B0\u8CC7\u6599\u593E
-FileChooser.win32.newFolder.subsequent=\u65B0\u8CC7\u6599\u593E ({0})
-FileChooser.other.newFolder=\u65B0\u8CC7\u6599\u593E
-FileChooser.other.newFolder.subsequent=\u65B0\u8CC7\u6599\u593E.{0}
+FileChooser.win32.newFolder=新資料夾
+FileChooser.win32.newFolder.subsequent=新資料夾 ({0})
+FileChooser.other.newFolder=新資料夾
+FileChooser.other.newFolder.subsequent=新資料夾.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A
-FileChooser.saveButtonToolTip.textAndMnemonic=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848
-FileChooser.openButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848
-FileChooser.updateButtonToolTip.textAndMnemonic=\u66F4\u65B0\u76EE\u9304\u6E05\u55AE
-FileChooser.helpButtonToolTip.textAndMnemonic=\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E
-FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u76EE\u9304
+FileChooser.cancelButtonToolTip.textAndMnemonic=中止檔案選擇器對話方塊
+FileChooser.saveButtonToolTip.textAndMnemonic=儲存選取的檔案
+FileChooser.openButtonToolTip.textAndMnemonic=開啟選取的檔案
+FileChooser.updateButtonToolTip.textAndMnemonic=更新目錄清單
+FileChooser.helpButtonToolTip.textAndMnemonic=「檔案選擇器」說明
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=開啟選取的目錄
 
-FileChooser.filesListAccessibleName=\u6A94\u6848\u6E05\u55AE
-FileChooser.filesDetailsAccessibleName=\u6A94\u6848\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.filesListAccessibleName=檔案清單
+FileChooser.filesDetailsAccessibleName=檔案詳細資訊
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=\u9810\u89BD
-ColorChooser.ok.textAndMnemonic=\u78BA\u5B9A
-ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
-ColorChooser.reset.textAndMnemonic=\u91CD\u8A2D(&R)
-ColorChooser.sample.textAndMnemonic=\u7BC4\u4F8B\u6587\u5B57  \u7BC4\u4F8B\u6587\u5B57
-ColorChooser.swatches.textAndMnemonic=\u8ABF\u8272\u677F(&S)
-ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0\u9078\u64C7:
+ColorChooser.preview.textAndMnemonic=預覽
+ColorChooser.ok.textAndMnemonic=確定
+ColorChooser.cancel.textAndMnemonic=取消
+ColorChooser.reset.textAndMnemonic=重設(&R)
+ColorChooser.sample.textAndMnemonic=範例文字  範例文字
+ColorChooser.swatches.textAndMnemonic=調色板(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=最新選擇:
 ColorChooser.hsv.textAndMnemonic=HSV(&H)
-ColorChooser.hsvHue.textAndMnemonic=\u8272\u8ABF
-ColorChooser.hsvSaturation.textAndMnemonic=\u5F69\u5EA6
-ColorChooser.hsvValue.textAndMnemonic=\u6578\u503C
-ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.hsvHue.textAndMnemonic=色調
+ColorChooser.hsvSaturation.textAndMnemonic=彩度
+ColorChooser.hsvValue.textAndMnemonic=數值
+ColorChooser.hsvTransparency.textAndMnemonic=透明度
 ColorChooser.hsl.textAndMnemonic=HSL(&L)
-ColorChooser.hslHue.textAndMnemonic=\u8272\u8ABF
-ColorChooser.hslSaturation.textAndMnemonic=\u5F69\u5EA6
-ColorChooser.hslLightness.textAndMnemonic=\u4EAE\u5EA6
-ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.hslHue.textAndMnemonic=色調
+ColorChooser.hslSaturation.textAndMnemonic=彩度
+ColorChooser.hslLightness.textAndMnemonic=亮度
+ColorChooser.hslTransparency.textAndMnemonic=透明度
 ColorChooser.rgb.textAndMnemonic=RGB(&G)
-ColorChooser.rgbRed.textAndMnemonic=\u7D05(&D)
-ColorChooser.rgbGreen.textAndMnemonic=\u7DA0(&N)
-ColorChooser.rgbBlue.textAndMnemonic=\u85CD(&B)
+ColorChooser.rgbRed.textAndMnemonic=紅(&D)
+ColorChooser.rgbGreen.textAndMnemonic=綠(&N)
+ColorChooser.rgbBlue.textAndMnemonic=藍(&B)
 ColorChooser.rgbAlpha.textAndMnemonic=Alpha
-ColorChooser.rgbHexCode.textAndMnemonic=\u984F\u8272\u4EE3\u78BC(&C)
+ColorChooser.rgbHexCode.textAndMnemonic=顏色代碼(&C)
 ColorChooser.cmyk.textAndMnemonic=C&MYK
-ColorChooser.cmykCyan.textAndMnemonic=\u85CD\u7DA0\u8272
-ColorChooser.cmykMagenta.textAndMnemonic=\u7D2B\u7D05\u8272
-ColorChooser.cmykYellow.textAndMnemonic=\u9EC3\u8272
-ColorChooser.cmykBlack.textAndMnemonic=\u9ED1\u8272
+ColorChooser.cmykCyan.textAndMnemonic=藍綠色
+ColorChooser.cmykMagenta.textAndMnemonic=紫紅色
+ColorChooser.cmykYellow.textAndMnemonic=黃色
+ColorChooser.cmykBlack.textAndMnemonic=黑色
 ColorChooser.cmykAlpha.textAndMnemonic=Alpha
 
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
-OptionPane.noButton.textAndMnemonic=\u5426(&N)
-OptionPane.okButton.textAndMnemonic=\u78BA\u5B9A
+OptionPane.yesButton.textAndMnemonic=是(&Y)
+OptionPane.noButton.textAndMnemonic=否(&N)
+OptionPane.okButton.textAndMnemonic=確定
 #OptionPane.okButtonMnemonic=0
-OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.cancelButton.textAndMnemonic=取消
 #OptionPane.cancelButtonMnemonic=0
-OptionPane.title.textAndMnemonic=\u9078\u53D6\u4E00\u500B\u9078\u9805
+OptionPane.title.textAndMnemonic=選取一個選項
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialog.titleAndMnemonic=\u8F38\u5165
+OptionPane.inputDialog.titleAndMnemonic=輸入
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialog.titleAndMnemonic=\u8A0A\u606F
+OptionPane.messageDialog.titleAndMnemonic=訊息
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgress.textAndMnemonic=\u5217\u5370
-PrintingDialog.titleAborting.textAndMnemonic=\u5217\u5370 (\u4E2D\u6B62)
+PrintingDialog.titleProgress.textAndMnemonic=列印
+PrintingDialog.titleAborting.textAndMnemonic=列印 (中止)
 
-PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u5217\u5370...
+PrintingDialog.contentInitial.textAndMnemonic=正在列印...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u5217\u5370\u7684\u9801\u9762 {0}...
+PrintingDialog.contentProgress.textAndMnemonic=已列印的頁面 {0}...
 
-PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u5217\u5370...
+PrintingDialog.contentAborting.textAndMnemonic=正在中止列印...
 
-PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
-PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u5217\u5370
+PrintingDialog.abortButton.textAndMnemonic=中止(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=中止列印
 
 ############ Internal Frame Strings ############
-InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
-InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
-InternalFrame.restoreButtonToolTip=\u5FA9\u539F
-InternalFrame.closeButtonToolTip=\u95DC\u9589
+InternalFrame.iconButtonToolTip=最小化
+InternalFrame.maxButtonToolTip=最大化
+InternalFrame.restoreButtonToolTip=復原
+InternalFrame.closeButtonToolTip=關閉
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButton.textAndMnemonic=\u56DE\u5FA9(&R)
-InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5(&M)
-InternalFrameTitlePane.sizeButton.textAndMnemonic=\u8ABF\u6574\u5927\u5C0F(&S)
-InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316(&N)
-InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316(&X)
-InternalFrameTitlePane.closeButton.textAndMnemonic=\u95DC\u9589(&C)
+InternalFrameTitlePane.restoreButton.textAndMnemonic=回復(&R)
+InternalFrameTitlePane.moveButton.textAndMnemonic=移動(&M)
+InternalFrameTitlePane.sizeButton.textAndMnemonic=調整大小(&S)
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=最小化(&N)
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=最大化(&X)
+InternalFrameTitlePane.closeButton.textAndMnemonic=關閉(&C)
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButton.textAndMnemonic=\u9001\u51FA\u67E5\u8A62
-FormView.resetButton.textAndMnemonic=\u91CD\u8A2D
-FormView.browseFileButton.textAndMnemonic=\u700F\u89BD...
+FormView.submitButton.textAndMnemonic=送出查詢
+FormView.resetButton.textAndMnemonic=重設
+FormView.browseFileButton.textAndMnemonic=瀏覽...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChange.textAndMnemonic=\u6A23\u5F0F\u8B8A\u66F4
-AbstractDocument.addition.textAndMnemonic=\u9644\u52A0
-AbstractDocument.deletion.textAndMnemonic=\u522A\u9664
-AbstractDocument.undo.textAndMnemonic=\u9084\u539F
-AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
+AbstractDocument.styleChange.textAndMnemonic=樣式變更
+AbstractDocument.addition.textAndMnemonic=附加
+AbstractDocument.deletion.textAndMnemonic=刪除
+AbstractDocument.undo.textAndMnemonic=還原
+AbstractDocument.redo.textAndMnemonic=重做
 
 ############ Abstract Button Strings ############
-AbstractButton.click.textAndMnemonic=\u6309\u4E00\u4E0B
+AbstractButton.click.textAndMnemonic=按一下
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undo.textAndMnemonic=\u9084\u539F
-AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
+AbstractUndoableEdit.undo.textAndMnemonic=還原
+AbstractUndoableEdit.redo.textAndMnemonic=重做
 
 ############ Combo Box Strings ############
-ComboBox.togglePopup.textAndMnemonic=\u5207\u63DB\u5373\u73FE\u5F0F\u8996\u7A97
+ComboBox.togglePopup.textAndMnemonic=切換即現式視窗
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=\u9032\u5EA6...
+ProgressMonitor.progress.textAndMnemonic=進度...
 
 ############ Split Pane Strings ############
-SplitPane.leftButton.textAndMnemonic=\u5DE6\u6309\u9215
-SplitPane.rightButton.textAndMnemonic=\u53F3\u6309\u9215
+SplitPane.leftButton.textAndMnemonic=左按鈕
+SplitPane.rightButton.textAndMnemonic=右按鈕
 # Used for Isindex
-IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57:
+IsindexView.prompt=這是一個可搜尋的索引。輸入搜尋關鍵字:
 
 ############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=\u5716\u793A\u5316
-InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonAccessibleName=\u95DC\u9589
+InternalFrameTitlePane.iconifyButtonAccessibleName=圖示化
+InternalFrameTitlePane.maximizeButtonAccessibleName=最大化
+InternalFrameTitlePane.closeButtonAccessibleName=關閉
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
index 59a872f6550..519f4369ed0 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
@@ -48,7 +48,7 @@ FileChooser.saveInLabel.textAndMnemonic=Speichern in:
 FileChooser.fileNameLabel.textAndMnemonic=&Dateiname:
 FileChooser.folderNameLabel.textAndMnemonic=Ordner&name:
 FileChooser.filesOfTypeLabel.textAndMnemonic=Datei&typ:
-FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
+FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene höher
 FileChooser.upFolderAccessibleName=Nach oben
 FileChooser.homeFolderToolTip.textAndMnemonic=Home
 FileChooser.homeFolderAccessibleName=Home
@@ -64,13 +64,13 @@ FileChooser.detailsViewActionLabel.textAndMnemonic=Details
 FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren
 FileChooser.viewMenuLabel.textAndMnemonic=Ansicht
 FileChooser.fileNameHeader.textAndMnemonic=Name
-FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe
+FileChooser.fileSizeHeader.textAndMnemonic=Größe
 FileChooser.fileTypeHeader.textAndMnemonic=Typ
-FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert
+FileChooser.fileDateHeader.textAndMnemonic=Geändert
 FileChooser.fileAttrHeader.textAndMnemonic=Attribute
 
 ############ Used by MetalTitlePane if rendering window decorations############
 MetalTitlePane.restore.titleAndMnemonic=&Wiederherstellen
 MetalTitlePane.iconify.titleAndMnemonic=Minimie&ren
 MetalTitlePane.maximize.titleAndMnemonic=Ma&ximieren
-MetalTitlePane.close.titleAndMnemonic=&Schlie\u00DFen
+MetalTitlePane.close.titleAndMnemonic=&Schließen
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
index 04525387a8f..98b45c76370 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
@@ -64,7 +64,7 @@ FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles
 FileChooser.refreshActionLabel.textAndMnemonic=Refrescar
 FileChooser.viewMenuLabel.textAndMnemonic=Ver
 FileChooser.fileNameHeader.textAndMnemonic=Nombre
-FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o
+FileChooser.fileSizeHeader.textAndMnemonic=Tamaño
 FileChooser.fileTypeHeader.textAndMnemonic=Tipo
 FileChooser.fileDateHeader.textAndMnemonic=Modificado
 FileChooser.fileAttrHeader.textAndMnemonic=Atributos
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
index 4b14d7b5b6e..178fa03e802 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
@@ -50,27 +50,27 @@ FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier :
 FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier :
 FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
 FileChooser.upFolderAccessibleName=Monter
-FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire de base
-FileChooser.homeFolderAccessibleName=R\u00E9pertoire de base
-FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
+FileChooser.homeFolderToolTip.textAndMnemonic=Répertoire de base
+FileChooser.homeFolderAccessibleName=Répertoire de base
+FileChooser.newFolderToolTip.textAndMnemonic=Crée un dossier.
 FileChooser.newFolderAccessibleName=Nouveau dossier
 FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
 FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
 FileChooser.listViewButtonAccessibleName=Liste
 FileChooser.listViewActionLabel.textAndMnemonic=Liste
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails
-FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
-FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Détails
+FileChooser.detailsViewButtonAccessibleName=Détails
+FileChooser.detailsViewActionLabel.textAndMnemonic=Détails
 FileChooser.refreshActionLabel.textAndMnemonic=Actualiser
 FileChooser.viewMenuLabel.textAndMnemonic=Affichage
 FileChooser.fileNameHeader.textAndMnemonic=Nom
 FileChooser.fileSizeHeader.textAndMnemonic=Taille
 FileChooser.fileTypeHeader.textAndMnemonic=Type
-FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9
+FileChooser.fileDateHeader.textAndMnemonic=Modifié
 FileChooser.fileAttrHeader.textAndMnemonic=Attributs
 
 ############ Used by MetalTitlePane if rendering window decorations############
 MetalTitlePane.restore.titleAndMnemonic=&Restaurer
-MetalTitlePane.iconify.titleAndMnemonic=R\u00E9&duire
+MetalTitlePane.iconify.titleAndMnemonic=Ré&duire
 MetalTitlePane.maximize.titleAndMnemonic=&Agrandir
 MetalTitlePane.close.titleAndMnemonic=&Fermer
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
index 9d709cddb49..2685a148523 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
@@ -43,34 +43,34 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
-FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078
-FileChooser.upFolderAccessibleName=\u4E0A\u3078
-FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
-FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0
-FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
-FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8
-FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8
-FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30
-FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30
-FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
-FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D
-FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA
-FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
+FileChooser.lookInLabel.textAndMnemonic=ファイルの場所(&I):
+FileChooser.saveInLabel.textAndMnemonic=保存:
+FileChooser.fileNameLabel.textAndMnemonic=ファイル名(&N):
+FileChooser.folderNameLabel.textAndMnemonic=フォルダ名(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=ファイルのタイプ(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=1レベル上へ
+FileChooser.upFolderAccessibleName=上へ
+FileChooser.homeFolderToolTip.textAndMnemonic=ホーム
+FileChooser.homeFolderAccessibleName=ホーム
+FileChooser.newFolderToolTip.textAndMnemonic=新規フォルダの作成
+FileChooser.newFolderAccessibleName=新規フォルダ
+FileChooser.newFolderActionLabel.textAndMnemonic=新規フォルダ
+FileChooser.listViewButtonToolTip.textAndMnemonic=リスト
+FileChooser.listViewButtonAccessibleName=リスト
+FileChooser.listViewActionLabel.textAndMnemonic=リスト
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=詳細
+FileChooser.detailsViewButtonAccessibleName=詳細
+FileChooser.detailsViewActionLabel.textAndMnemonic=詳細
+FileChooser.refreshActionLabel.textAndMnemonic=リフレッシュ
+FileChooser.viewMenuLabel.textAndMnemonic=表示
+FileChooser.fileNameHeader.textAndMnemonic=名前
+FileChooser.fileSizeHeader.textAndMnemonic=サイズ
+FileChooser.fileTypeHeader.textAndMnemonic=タイプ
+FileChooser.fileDateHeader.textAndMnemonic=修正日
+FileChooser.fileAttrHeader.textAndMnemonic=属性
 
 ############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=\u5FA9\u5143(&R)
-MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
-MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
-MetalTitlePane.close.titleAndMnemonic=\u9589\u3058\u308B(&C)
+MetalTitlePane.restore.titleAndMnemonic=復元(&R)
+MetalTitlePane.iconify.titleAndMnemonic=最小化(&E)
+MetalTitlePane.maximize.titleAndMnemonic=最大化(&X)
+MetalTitlePane.close.titleAndMnemonic=閉じる(&C)
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
index 43c56cc1edb..e99e15dadd9 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
@@ -43,34 +43,34 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\uCC3E\uB294 \uC704\uCE58(&I):
-FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
-FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C
-FileChooser.upFolderAccessibleName=\uC704\uB85C
-FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
-FileChooser.homeFolderAccessibleName=\uD648
-FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
-FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
-FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354
-FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D
-FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D
-FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80\uC815\uBCF4
-FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80\uC815\uBCF4
-FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80\uC815\uBCF4
-FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C\uACE0\uCE68
-FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30
-FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984
-FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30
-FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615
-FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC
-FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131
+FileChooser.lookInLabel.textAndMnemonic=찾는 위치(&I):
+FileChooser.saveInLabel.textAndMnemonic=저장 위치:
+FileChooser.fileNameLabel.textAndMnemonic=파일 이름(&N):
+FileChooser.folderNameLabel.textAndMnemonic=폴더 이름(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=파일 유형(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=한 레벨 위로
+FileChooser.upFolderAccessibleName=위로
+FileChooser.homeFolderToolTip.textAndMnemonic=홈
+FileChooser.homeFolderAccessibleName=홈
+FileChooser.newFolderToolTip.textAndMnemonic=새 폴더 생성
+FileChooser.newFolderAccessibleName=새 폴더
+FileChooser.newFolderActionLabel.textAndMnemonic=새 폴더
+FileChooser.listViewButtonToolTip.textAndMnemonic=목록
+FileChooser.listViewButtonAccessibleName=목록
+FileChooser.listViewActionLabel.textAndMnemonic=목록
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=세부정보
+FileChooser.detailsViewButtonAccessibleName=세부정보
+FileChooser.detailsViewActionLabel.textAndMnemonic=세부정보
+FileChooser.refreshActionLabel.textAndMnemonic=새로고침
+FileChooser.viewMenuLabel.textAndMnemonic=보기
+FileChooser.fileNameHeader.textAndMnemonic=이름
+FileChooser.fileSizeHeader.textAndMnemonic=크기
+FileChooser.fileTypeHeader.textAndMnemonic=유형
+FileChooser.fileDateHeader.textAndMnemonic=수정 날짜
+FileChooser.fileAttrHeader.textAndMnemonic=속성
 
 ############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=\uBCF5\uC6D0(&R)
-MetalTitlePane.iconify.titleAndMnemonic=\uCD5C\uC18C\uD654(&E)
-MetalTitlePane.maximize.titleAndMnemonic=\uCD5C\uB300\uD654(&X)
-MetalTitlePane.close.titleAndMnemonic=\uB2EB\uAE30(&C)
+MetalTitlePane.restore.titleAndMnemonic=복원(&R)
+MetalTitlePane.iconify.titleAndMnemonic=최소화(&E)
+MetalTitlePane.maximize.titleAndMnemonic=최대화(&X)
+MetalTitlePane.close.titleAndMnemonic=닫기(&C)
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
index ab5c6640a52..383dd31e56b 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
@@ -48,10 +48,10 @@ FileChooser.saveInLabel.textAndMnemonic=Salvar Em:
 FileChooser.fileNameLabel.textAndMnemonic=&Nome do Arquivo:
 FileChooser.folderNameLabel.textAndMnemonic=&Nome da pasta:
 FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do &Tipo:
-FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima
+FileChooser.upFolderToolTip.textAndMnemonic=Um Nível Acima
 FileChooser.upFolderAccessibleName=Acima
-FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
-FileChooser.homeFolderAccessibleName=In\u00EDcio
+FileChooser.homeFolderToolTip.textAndMnemonic=Início
+FileChooser.homeFolderAccessibleName=Início
 FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta
 FileChooser.newFolderAccessibleName=Nova Pasta
 FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
index f40f07d9e24..d4572d1cce3 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
@@ -48,7 +48,7 @@ FileChooser.saveInLabel.textAndMnemonic=Spara i:
 FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
 FileChooser.folderNameLabel.textAndMnemonic=&Mapp:
 FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typen:
-FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
+FileChooser.upFolderToolTip.textAndMnemonic=Upp en nivå
 FileChooser.upFolderAccessibleName=Upp
 FileChooser.homeFolderToolTip.textAndMnemonic=Hem
 FileChooser.homeFolderAccessibleName=Hem
@@ -61,16 +61,16 @@ FileChooser.listViewActionLabel.textAndMnemonic=Lista
 FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detaljer
 FileChooser.detailsViewButtonAccessibleName=Detaljer
 FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer
-FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya
+FileChooser.refreshActionLabel.textAndMnemonic=Förnya
 FileChooser.viewMenuLabel.textAndMnemonic=Vy
 FileChooser.fileNameHeader.textAndMnemonic=Namn
 FileChooser.fileSizeHeader.textAndMnemonic=Storlek
 FileChooser.fileTypeHeader.textAndMnemonic=Typ
-FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad
+FileChooser.fileDateHeader.textAndMnemonic=Ändrad
 FileChooser.fileAttrHeader.textAndMnemonic=Attribut
 
 ############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=&\u00C5terst\u00E4ll
+MetalTitlePane.restore.titleAndMnemonic=&Återställ
 MetalTitlePane.iconify.titleAndMnemonic=Minim&era
 MetalTitlePane.maximize.titleAndMnemonic=Ma&ximera
-MetalTitlePane.close.titleAndMnemonic=&St\u00E4ng
+MetalTitlePane.close.titleAndMnemonic=&Stäng
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
index 341ceda1f64..59e5399683f 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
@@ -43,34 +43,34 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u627E(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
-FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7
-FileChooser.upFolderAccessibleName=\u5411\u4E0A
-FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
-FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55
-FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
-FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
-FileChooser.listViewButtonAccessibleName=\u5217\u8868
-FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u4FE1\u606F
-FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u4FE1\u606F
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u4FE1\u606F
-FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
-FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
-FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
-FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
+FileChooser.lookInLabel.textAndMnemonic=查找(&I):
+FileChooser.saveInLabel.textAndMnemonic=保存:
+FileChooser.fileNameLabel.textAndMnemonic=文件名(&N):
+FileChooser.folderNameLabel.textAndMnemonic=文件夹名(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=文件类型(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=向上一级
+FileChooser.upFolderAccessibleName=向上
+FileChooser.homeFolderToolTip.textAndMnemonic=主目录
+FileChooser.homeFolderAccessibleName=主目录
+FileChooser.newFolderToolTip.textAndMnemonic=创建新文件夹
+FileChooser.newFolderAccessibleName=新建文件夹
+FileChooser.newFolderActionLabel.textAndMnemonic=新建文件夹
+FileChooser.listViewButtonToolTip.textAndMnemonic=列表
+FileChooser.listViewButtonAccessibleName=列表
+FileChooser.listViewActionLabel.textAndMnemonic=列表
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=详细信息
+FileChooser.detailsViewButtonAccessibleName=详细信息
+FileChooser.detailsViewActionLabel.textAndMnemonic=详细信息
+FileChooser.refreshActionLabel.textAndMnemonic=刷新
+FileChooser.viewMenuLabel.textAndMnemonic=视图
+FileChooser.fileNameHeader.textAndMnemonic=名称
+FileChooser.fileSizeHeader.textAndMnemonic=大小
+FileChooser.fileTypeHeader.textAndMnemonic=类型
+FileChooser.fileDateHeader.textAndMnemonic=修改日期
+FileChooser.fileAttrHeader.textAndMnemonic=属性
 
 ############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=\u8FD8\u539F(&R)
-MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
-MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
-MetalTitlePane.close.titleAndMnemonic=\u5173\u95ED(&C)
+MetalTitlePane.restore.titleAndMnemonic=还原(&R)
+MetalTitlePane.iconify.titleAndMnemonic=最小化(&E)
+MetalTitlePane.maximize.titleAndMnemonic=最大化(&X)
+MetalTitlePane.close.titleAndMnemonic=关闭(&C)
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
index 0cf6763727b..0d32c7a6af5 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
@@ -43,34 +43,34 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC:
-FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64
-FileChooser.upFolderAccessibleName=\u5F80\u4E0A
-FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
-FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304
-FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE
-FileChooser.listViewButtonAccessibleName=\u6E05\u55AE
-FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406
-FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31
-FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
-FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027
+FileChooser.lookInLabel.textAndMnemonic=查詢(&I):
+FileChooser.saveInLabel.textAndMnemonic=儲存於:
+FileChooser.fileNameLabel.textAndMnemonic=檔案名稱(&N):
+FileChooser.folderNameLabel.textAndMnemonic=資料夾名稱(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=檔案類型(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=往上一層
+FileChooser.upFolderAccessibleName=往上
+FileChooser.homeFolderToolTip.textAndMnemonic=主目錄
+FileChooser.homeFolderAccessibleName=主目錄
+FileChooser.newFolderToolTip.textAndMnemonic=建立新資料夾
+FileChooser.newFolderAccessibleName=新資料夾
+FileChooser.newFolderActionLabel.textAndMnemonic=新資料夾
+FileChooser.listViewButtonToolTip.textAndMnemonic=清單
+FileChooser.listViewButtonAccessibleName=清單
+FileChooser.listViewActionLabel.textAndMnemonic=清單
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=詳細資訊
+FileChooser.detailsViewButtonAccessibleName=詳細資訊
+FileChooser.detailsViewActionLabel.textAndMnemonic=詳細資訊
+FileChooser.refreshActionLabel.textAndMnemonic=重新整理
+FileChooser.viewMenuLabel.textAndMnemonic=檢視
+FileChooser.fileNameHeader.textAndMnemonic=名稱
+FileChooser.fileSizeHeader.textAndMnemonic=大小
+FileChooser.fileTypeHeader.textAndMnemonic=類型
+FileChooser.fileDateHeader.textAndMnemonic=修改日期
+FileChooser.fileAttrHeader.textAndMnemonic=屬性
 
 ############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=\u56DE\u5FA9(&R)
-MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
-MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
-MetalTitlePane.close.titleAndMnemonic=\u95DC\u9589(&C)
+MetalTitlePane.restore.titleAndMnemonic=回復(&R)
+MetalTitlePane.iconify.titleAndMnemonic=最小化(&E)
+MetalTitlePane.maximize.titleAndMnemonic=最大化(&X)
+MetalTitlePane.close.titleAndMnemonic=關閉(&C)
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties
index bbf2f992acc..2564a6b7448 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties
@@ -48,7 +48,7 @@ FileChooser.saveInLabel.textAndMnemonic=Speichern in:
 FileChooser.fileNameLabel.textAndMnemonic=&Dateiname:
 FileChooser.folderNameLabel.textAndMnemonic=&Ordnername:
 FileChooser.filesOfTypeLabel.textAndMnemonic=Datei&typ:
-FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
+FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene höher
 FileChooser.upFolderAccessibleName=Nach oben
 FileChooser.homeFolderToolTip.textAndMnemonic=Home
 FileChooser.homeFolderAccessibleName=Home
@@ -64,7 +64,7 @@ FileChooser.detailsViewActionLabel.textAndMnemonic=Details
 FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren
 FileChooser.viewMenuLabel.textAndMnemonic=Ansicht
 FileChooser.fileNameHeader.textAndMnemonic=Name
-FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe
+FileChooser.fileSizeHeader.textAndMnemonic=Größe
 FileChooser.fileTypeHeader.textAndMnemonic=Typ
-FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert
+FileChooser.fileDateHeader.textAndMnemonic=Geändert
 FileChooser.fileAttrHeader.textAndMnemonic=Attribute
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties
index 332cdf8e367..c9ba9c40e2b 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties
@@ -64,7 +64,7 @@ FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles
 FileChooser.refreshActionLabel.textAndMnemonic=Refrescar
 FileChooser.viewMenuLabel.textAndMnemonic=Ver
 FileChooser.fileNameHeader.textAndMnemonic=Nombre
-FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o
+FileChooser.fileSizeHeader.textAndMnemonic=Tamaño
 FileChooser.fileTypeHeader.textAndMnemonic=Tipo
 FileChooser.fileDateHeader.textAndMnemonic=Modificado
 FileChooser.fileAttrHeader.textAndMnemonic=Atributos
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties
index a51cb31abd5..a93f6b55591 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties
@@ -50,21 +50,21 @@ FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier :
 FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier :
 FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
 FileChooser.upFolderAccessibleName=Monter
-FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire de base
-FileChooser.homeFolderAccessibleName=R\u00E9pertoire de base
-FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
+FileChooser.homeFolderToolTip.textAndMnemonic=Répertoire de base
+FileChooser.homeFolderAccessibleName=Répertoire de base
+FileChooser.newFolderToolTip.textAndMnemonic=Crée un dossier.
 FileChooser.newFolderAccessibleName=Nouveau dossier
 FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
 FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
 FileChooser.listViewButtonAccessibleName=Liste
 FileChooser.listViewActionLabel.textAndMnemonic=Liste
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails
-FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
-FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Détails
+FileChooser.detailsViewButtonAccessibleName=Détails
+FileChooser.detailsViewActionLabel.textAndMnemonic=Détails
 FileChooser.refreshActionLabel.textAndMnemonic=Actualiser
 FileChooser.viewMenuLabel.textAndMnemonic=Affichage
 FileChooser.fileNameHeader.textAndMnemonic=Nom
 FileChooser.fileSizeHeader.textAndMnemonic=Taille
 FileChooser.fileTypeHeader.textAndMnemonic=Type
-FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9
+FileChooser.fileDateHeader.textAndMnemonic=Modifié
 FileChooser.fileAttrHeader.textAndMnemonic=Attributs
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties
index 4a4f66060d9..baa2044cd3e 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties
@@ -43,28 +43,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
-FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078
-FileChooser.upFolderAccessibleName=\u4E0A\u3078
-FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
-FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0
-FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
-FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8
-FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8
-FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30
-FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30
-FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
-FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D
-FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA
-FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
+FileChooser.lookInLabel.textAndMnemonic=ファイルの場所(&I):
+FileChooser.saveInLabel.textAndMnemonic=保存:
+FileChooser.fileNameLabel.textAndMnemonic=ファイル名(&N):
+FileChooser.folderNameLabel.textAndMnemonic=フォルダ名(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=ファイルのタイプ(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=1レベル上へ
+FileChooser.upFolderAccessibleName=上へ
+FileChooser.homeFolderToolTip.textAndMnemonic=ホーム
+FileChooser.homeFolderAccessibleName=ホーム
+FileChooser.newFolderToolTip.textAndMnemonic=新規フォルダの作成
+FileChooser.newFolderAccessibleName=新規フォルダ
+FileChooser.newFolderActionLabel.textAndMnemonic=新規フォルダ
+FileChooser.listViewButtonToolTip.textAndMnemonic=リスト
+FileChooser.listViewButtonAccessibleName=リスト
+FileChooser.listViewActionLabel.textAndMnemonic=リスト
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=詳細
+FileChooser.detailsViewButtonAccessibleName=詳細
+FileChooser.detailsViewActionLabel.textAndMnemonic=詳細
+FileChooser.refreshActionLabel.textAndMnemonic=リフレッシュ
+FileChooser.viewMenuLabel.textAndMnemonic=表示
+FileChooser.fileNameHeader.textAndMnemonic=名前
+FileChooser.fileSizeHeader.textAndMnemonic=サイズ
+FileChooser.fileTypeHeader.textAndMnemonic=タイプ
+FileChooser.fileDateHeader.textAndMnemonic=修正日
+FileChooser.fileAttrHeader.textAndMnemonic=属性
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties
index 46fac15f6d1..4ede15569d4 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties
@@ -43,28 +43,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\uCC3E\uB294 \uC704\uCE58(&I):
-FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
-FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C
-FileChooser.upFolderAccessibleName=\uC704\uB85C
-FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
-FileChooser.homeFolderAccessibleName=\uD648
-FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
-FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
-FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354
-FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D
-FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D
-FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80\uC815\uBCF4
-FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80\uC815\uBCF4
-FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80\uC815\uBCF4
-FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C\uACE0\uCE68
-FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30
-FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984
-FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30
-FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615
-FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC
-FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131
+FileChooser.lookInLabel.textAndMnemonic=찾는 위치(&I):
+FileChooser.saveInLabel.textAndMnemonic=저장 위치:
+FileChooser.fileNameLabel.textAndMnemonic=파일 이름(&N):
+FileChooser.folderNameLabel.textAndMnemonic=폴더 이름(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=파일 유형(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=한 레벨 위로
+FileChooser.upFolderAccessibleName=위로
+FileChooser.homeFolderToolTip.textAndMnemonic=홈
+FileChooser.homeFolderAccessibleName=홈
+FileChooser.newFolderToolTip.textAndMnemonic=새 폴더 생성
+FileChooser.newFolderAccessibleName=새 폴더
+FileChooser.newFolderActionLabel.textAndMnemonic=새 폴더
+FileChooser.listViewButtonToolTip.textAndMnemonic=목록
+FileChooser.listViewButtonAccessibleName=목록
+FileChooser.listViewActionLabel.textAndMnemonic=목록
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=세부정보
+FileChooser.detailsViewButtonAccessibleName=세부정보
+FileChooser.detailsViewActionLabel.textAndMnemonic=세부정보
+FileChooser.refreshActionLabel.textAndMnemonic=새로고침
+FileChooser.viewMenuLabel.textAndMnemonic=보기
+FileChooser.fileNameHeader.textAndMnemonic=이름
+FileChooser.fileSizeHeader.textAndMnemonic=크기
+FileChooser.fileTypeHeader.textAndMnemonic=유형
+FileChooser.fileDateHeader.textAndMnemonic=수정 날짜
+FileChooser.fileAttrHeader.textAndMnemonic=속성
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties
index e69d873a68f..9409c73f9e5 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties
@@ -48,10 +48,10 @@ FileChooser.saveInLabel.textAndMnemonic=Salvar Em:
 FileChooser.fileNameLabel.textAndMnemonic=&Nome do Arquivo:
 FileChooser.folderNameLabel.textAndMnemonic=&Nome da Pasta:
 FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do &Tipo:
-FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima
+FileChooser.upFolderToolTip.textAndMnemonic=Um Nível Acima
 FileChooser.upFolderAccessibleName=Acima
-FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
-FileChooser.homeFolderAccessibleName=In\u00EDcio
+FileChooser.homeFolderToolTip.textAndMnemonic=Início
+FileChooser.homeFolderAccessibleName=Início
 FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta
 FileChooser.newFolderAccessibleName=Nova Pasta
 FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties
index 683973d8dc8..85c7e68a0c4 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties
@@ -48,7 +48,7 @@ FileChooser.saveInLabel.textAndMnemonic=Spara i:
 FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
 FileChooser.folderNameLabel.textAndMnemonic=Mapp&namn:
 FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typen:
-FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
+FileChooser.upFolderToolTip.textAndMnemonic=Upp en nivå
 FileChooser.upFolderAccessibleName=Upp
 FileChooser.homeFolderToolTip.textAndMnemonic=Hem
 FileChooser.homeFolderAccessibleName=Hem
@@ -61,10 +61,10 @@ FileChooser.listViewActionLabel.textAndMnemonic=Lista
 FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detaljer
 FileChooser.detailsViewButtonAccessibleName=Detaljer
 FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer
-FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya
+FileChooser.refreshActionLabel.textAndMnemonic=Förnya
 FileChooser.viewMenuLabel.textAndMnemonic=Vy
 FileChooser.fileNameHeader.textAndMnemonic=Namn
 FileChooser.fileSizeHeader.textAndMnemonic=Storlek
 FileChooser.fileTypeHeader.textAndMnemonic=Typ
-FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad
+FileChooser.fileDateHeader.textAndMnemonic=Ändrad
 FileChooser.fileAttrHeader.textAndMnemonic=Attribut
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties
index bd4b32b1eef..4e74d3152f6 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties
@@ -43,28 +43,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u627E(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
-FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7
-FileChooser.upFolderAccessibleName=\u5411\u4E0A
-FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
-FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55
-FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
-FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
-FileChooser.listViewButtonAccessibleName=\u5217\u8868
-FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u4FE1\u606F
-FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u4FE1\u606F
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u4FE1\u606F
-FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
-FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
-FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
-FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
+FileChooser.lookInLabel.textAndMnemonic=查找(&I):
+FileChooser.saveInLabel.textAndMnemonic=保存:
+FileChooser.fileNameLabel.textAndMnemonic=文件名(&N):
+FileChooser.folderNameLabel.textAndMnemonic=文件夹名(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=文件类型(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=向上一级
+FileChooser.upFolderAccessibleName=向上
+FileChooser.homeFolderToolTip.textAndMnemonic=主目录
+FileChooser.homeFolderAccessibleName=主目录
+FileChooser.newFolderToolTip.textAndMnemonic=创建新文件夹
+FileChooser.newFolderAccessibleName=新建文件夹
+FileChooser.newFolderActionLabel.textAndMnemonic=新建文件夹
+FileChooser.listViewButtonToolTip.textAndMnemonic=列表
+FileChooser.listViewButtonAccessibleName=列表
+FileChooser.listViewActionLabel.textAndMnemonic=列表
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=详细信息
+FileChooser.detailsViewButtonAccessibleName=详细信息
+FileChooser.detailsViewActionLabel.textAndMnemonic=详细信息
+FileChooser.refreshActionLabel.textAndMnemonic=刷新
+FileChooser.viewMenuLabel.textAndMnemonic=视图
+FileChooser.fileNameHeader.textAndMnemonic=名称
+FileChooser.fileSizeHeader.textAndMnemonic=大小
+FileChooser.fileTypeHeader.textAndMnemonic=类型
+FileChooser.fileDateHeader.textAndMnemonic=修改日期
+FileChooser.fileAttrHeader.textAndMnemonic=属性
diff --git a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties
index 2f4373b1eba..5eb2973c381 100644
--- a/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties
+++ b/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties
@@ -43,28 +43,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC:
-FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64
-FileChooser.upFolderAccessibleName=\u5F80\u4E0A
-FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
-FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304
-FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE
-FileChooser.listViewButtonAccessibleName=\u6E05\u55AE
-FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406
-FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31
-FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
-FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027
+FileChooser.lookInLabel.textAndMnemonic=查詢(&I):
+FileChooser.saveInLabel.textAndMnemonic=儲存於:
+FileChooser.fileNameLabel.textAndMnemonic=檔案名稱(&N):
+FileChooser.folderNameLabel.textAndMnemonic=資料夾名稱(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=檔案類型(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=往上一層
+FileChooser.upFolderAccessibleName=往上
+FileChooser.homeFolderToolTip.textAndMnemonic=主目錄
+FileChooser.homeFolderAccessibleName=主目錄
+FileChooser.newFolderToolTip.textAndMnemonic=建立新資料夾
+FileChooser.newFolderAccessibleName=新資料夾
+FileChooser.newFolderActionLabel.textAndMnemonic=新資料夾
+FileChooser.listViewButtonToolTip.textAndMnemonic=清單
+FileChooser.listViewButtonAccessibleName=清單
+FileChooser.listViewActionLabel.textAndMnemonic=清單
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=詳細資訊
+FileChooser.detailsViewButtonAccessibleName=詳細資訊
+FileChooser.detailsViewActionLabel.textAndMnemonic=詳細資訊
+FileChooser.refreshActionLabel.textAndMnemonic=重新整理
+FileChooser.viewMenuLabel.textAndMnemonic=檢視
+FileChooser.fileNameHeader.textAndMnemonic=名稱
+FileChooser.fileSizeHeader.textAndMnemonic=大小
+FileChooser.fileTypeHeader.textAndMnemonic=類型
+FileChooser.fileDateHeader.textAndMnemonic=修改日期
+FileChooser.fileAttrHeader.textAndMnemonic=屬性
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
index 80e22e5c8cf..58d4973373c 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
@@ -37,10 +37,10 @@ AWT.altGraph=Alt Gr
 
 # Key names
 AWT.enter=Eingabe
-AWT.backSpace=R\u00FCcktaste
+AWT.backSpace=Rücktaste
 AWT.tab=Tabulator
 AWT.cancel=Abbrechen
-AWT.clear=L\u00F6schen
+AWT.clear=Löschen
 AWT.pause=Pause
 AWT.capsLock=Feststelltaste
 AWT.escape=ESC
@@ -56,12 +56,12 @@ AWT.down=Unten
 AWT.begin=Anfang
 AWT.comma=Komma
 AWT.period=Punkt
-AWT.slash=Schr\u00E4gstrich
+AWT.slash=Schrägstrich
 AWT.semicolon=Semikolon
 AWT.equals=Entspricht
-AWT.openBracket=\u00D6ffnende Klammer
-AWT.backSlash=Umgekehrter Schr\u00E4gstrich
-AWT.closeBracket=Schlie\u00DFende Klammer
+AWT.openBracket=Öffnende Klammer
+AWT.backSlash=Umgekehrter Schrägstrich
+AWT.closeBracket=Schließende Klammer
 AWT.multiply=NumPad *
 AWT.add=NumPad +
 AWT.separator=NumPad ,
@@ -100,9 +100,9 @@ AWT.printScreen=Druck
 AWT.insert=Einfg
 AWT.help=Hilfe
 AWT.windows=Windows
-AWT.context=Kontextmen\u00FC
-AWT.backQuote=Schlie\u00DFendes Anf\u00FChrungszeichen
-AWT.quote=Anf\u00FChrungszeichen
+AWT.context=Kontextmenü
+AWT.backQuote=Schließendes Anführungszeichen
+AWT.quote=Anführungszeichen
 AWT.deadGrave=Gravis (Dead)
 AWT.deadAcute=Akut (Dead)
 AWT.deadCircumflex=Zirkumflex (Dead)
@@ -121,9 +121,9 @@ AWT.deadVoicedSound=Stimmhaft (Dead)
 AWT.deadSemivoicedSound=Halbstimmhaft (Dead)
 AWT.ampersand=Et-Zeichen
 AWT.asterisk=Sternchen
-AWT.quoteDbl=Doppelte Anf\u00FChrungszeichen
+AWT.quoteDbl=Doppelte Anführungszeichen
 AWT.Less=Kleiner als
-AWT.greater=Gr\u00F6\u00DFer als
+AWT.greater=Größer als
 AWT.braceLeft=Linke geschweifte Klammer
 AWT.braceRight=Rechte geschweifte Klammer
 AWT.at=Klammeraffe
@@ -143,7 +143,7 @@ AWT.final=Abschluss
 AWT.convert=Konvertieren
 AWT.noconvert=Nicht konvertieren
 AWT.accept=Akzeptieren
-AWT.modechange=Modus\u00E4nderung
+AWT.modechange=Modusänderung
 AWT.kana=Kana
 AWT.kanji=Kanji
 AWT.alphanumeric=Alphanumerisch
@@ -161,9 +161,9 @@ AWT.japaneseRoman=Japanisch (Latein)
 AWT.kanaLock=Kana Lock
 AWT.inputMethodOnOff=Eingabemethode ein/aus
 AWT.again=Wiederholen
-AWT.undo=R\u00FCckg\u00E4ngig
+AWT.undo=Rückgängig
 AWT.copy=Kopieren
-AWT.paste=Einf\u00FCgen
+AWT.paste=Einfügen
 AWT.cut=Ausschneiden
 AWT.find=Suchen
 AWT.props=Eigenschaften
@@ -196,7 +196,7 @@ AWT.DefaultDropCursor=Standardcursor beim Ablegen
 
 # Input method related strings
 AWT.CompositionWindowTitle=Eingabefenster
-AWT.InputMethodSelectionMenu=Eingabemethode ausw\u00E4hlen
+AWT.InputMethodSelectionMenu=Eingabemethode auswählen
 AWT.HostInputMethodDisplayName=Systemeingabemethoden
 AWT.InputMethodLanguage.ja=Japanisch
 AWT.InputMethodLanguage.ko=Koreanisch
@@ -213,5 +213,5 @@ java.awt.im.style=On-the-Spot
 java.awt.def.delay=30
 
 # Warnings
-AWT.InconsistentDLLsWarning=Textbasierte Vorg\u00E4nge funktionieren m\u00F6glicherweise nicht richtig, weil inkonsistente Dynamic Linking Librarys (DLLs) auf dem System installiert sind. Weitere Informationen zu diesem Problem sowie eine Empfehlung zu der Umgehung finden Sie in den Java(TM) 2 SDK, Standard Edition Release Notes unter java.sun.com.
+AWT.InconsistentDLLsWarning=Textbasierte Vorgänge funktionieren möglicherweise nicht richtig, weil inkonsistente Dynamic Linking Librarys (DLLs) auf dem System installiert sind. Weitere Informationen zu diesem Problem sowie eine Empfehlung zu der Umgehung finden Sie in den Java(TM) 2 SDK, Standard Edition Release Notes unter java.sun.com.
 
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_es.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_es.properties
index 894869a366d..ec6f21a1aef 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_es.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_es.properties
@@ -29,7 +29,7 @@
 #
 
 # Modifier names
-AWT.shift=May\u00FAs
+AWT.shift=Mayús
 AWT.control=Ctrl
 AWT.alt=Alt
 AWT.meta=Meta
@@ -42,11 +42,11 @@ AWT.tab=Tabulador
 AWT.cancel=Cancelar
 AWT.clear=Borrar
 AWT.pause=Pausa
-AWT.capsLock=Bloqueo de May\u00FAsculas
+AWT.capsLock=Bloqueo de Mayúsculas
 AWT.escape=Escape
 AWT.space=Espacio
-AWT.pgup=ReP\u00E1g
-AWT.pgdn=AvP\u00E1g
+AWT.pgup=RePág
+AWT.pgdn=AvPág
 AWT.end=Fin
 AWT.home=Inicio
 AWT.left=Izquierda
@@ -59,18 +59,18 @@ AWT.period=Punto
 AWT.slash=Barra
 AWT.semicolon=Punto y coma
 AWT.equals=Igual
-AWT.openBracket=Par\u00E9ntesis de Apertura
+AWT.openBracket=Paréntesis de Apertura
 AWT.backSlash=Barra Invertida
-AWT.closeBracket=Par\u00E9ntesis de Cierre
-AWT.multiply=* de Teclado Num\u00E9rico
-AWT.add=+ de Teclado Num\u00E9rico
-AWT.separator=, de Teclado Num\u00E9rico
-AWT.separater=, de Teclado Num\u00E9rico
-AWT.subtract=- de Teclado Num\u00E9rico
-AWT.decimal=. de Teclado Num\u00E9rico
-AWT.divide=/ de Teclado Num\u00E9rico
+AWT.closeBracket=Paréntesis de Cierre
+AWT.multiply=* de Teclado Numérico
+AWT.add=+ de Teclado Numérico
+AWT.separator=, de Teclado Numérico
+AWT.separater=, de Teclado Numérico
+AWT.subtract=- de Teclado Numérico
+AWT.decimal=. de Teclado Numérico
+AWT.divide=/ de Teclado Numérico
 AWT.delete=Suprimir
-AWT.numLock=Bloqueo Num\u00E9rico
+AWT.numLock=Bloqueo Numérico
 AWT.scrollLock=Bloqueo de Desplazamiento
 AWT.f1=F1
 AWT.f2=F2
@@ -100,22 +100,22 @@ AWT.printScreen=Imprimir Pantalla
 AWT.insert=Insertar
 AWT.help=Ayuda
 AWT.windows=Windows
-AWT.context=Men\u00FA Contextual
+AWT.context=Menú Contextual
 AWT.backQuote=Comilla Invertida
 AWT.quote=Comilla
 AWT.deadGrave=Acento Grave (Tecla Muerta)
 AWT.deadAcute=Acento Agudo Muerto
 AWT.deadCircumflex=Circunflejo (Tecla Muerta)
 AWT.deadTilde=Tilde (Tecla Muerta)
-AWT.deadMacron=Macr\u00F3n (Tecla Muerta)
+AWT.deadMacron=Macrón (Tecla Muerta)
 AWT.deadBreve=Acento Breve (Tecla Muerta)
 AWT.deadAboveDot=Punto Superior (Tecla Muerta)
-AWT.deadDiaeresis=Di\u00E9resis (Tecla Muerta)
-AWT.deadAboveRing=C\u00EDrculo Superior (Tecla Muerta)
+AWT.deadDiaeresis=Diéresis (Tecla Muerta)
+AWT.deadAboveRing=Círculo Superior (Tecla Muerta)
 AWT.deadDoubleAcute=Acento Agudo Doble (Tecla Muerta)
 AWT.deadCaron=Acento Articircunflejo (Tecla Muerta)
 AWT.deadCedilla=Cedilla (Tecla Muerta)
-AWT.deadOgonek=Esp\u00EDritu \u00C1spero (Tecla Muerta)
+AWT.deadOgonek=Espíritu Áspero (Tecla Muerta)
 AWT.deadIota=Iota (Tecla Muerta)
 AWT.deadVoicedSound=Sonido Sonoro (Tecla Muerta)
 AWT.deadSemivoicedSound=Sonido Semisonoro (Tecla Muerta)
@@ -129,15 +129,15 @@ AWT.braceRight=Llave de Cierre
 AWT.at=Arroba
 AWT.colon=Dos puntos
 AWT.circumflex=Circunflejo
-AWT.dollar=D\u00F3lar
+AWT.dollar=Dólar
 AWT.euro=Euro
-AWT.exclamationMark=Signo de Exclamaci\u00F3n de Cierre
-AWT.invertedExclamationMark=Signo de Exclamaci\u00F3n de Apertura
-AWT.leftParenthesis=Par\u00E9ntesis Izquierdo
-AWT.numberSign=Signo de N\u00FAmero
-AWT.plus=M\u00E1s
+AWT.exclamationMark=Signo de Exclamación de Cierre
+AWT.invertedExclamationMark=Signo de Exclamación de Apertura
+AWT.leftParenthesis=Paréntesis Izquierdo
+AWT.numberSign=Signo de Número
+AWT.plus=Más
 AWT.minus=Menos
-AWT.rightParenthesis=Par\u00E9ntesis Derecho
+AWT.rightParenthesis=Paréntesis Derecho
 AWT.underscore=Subrayado
 AWT.final=Final
 AWT.convert=Convertir
@@ -146,7 +146,7 @@ AWT.accept=Aceptar
 AWT.modechange=Cambio de Modo
 AWT.kana=Kana
 AWT.kanji=Kanji
-AWT.alphanumeric=Alfanum\u00E9rico
+AWT.alphanumeric=Alfanumérico
 AWT.katakana=Katakana
 AWT.hiragana=Hiragana
 AWT.fullWidth=Anchura Completa
@@ -154,12 +154,12 @@ AWT.halfWidth=Media Anchura
 AWT.romanCharacters=Caracteres Romanos
 AWT.allCandidates=Todos los Candidatos
 AWT.previousCandidate=Candidato Anterior
-AWT.codeInput=Entrada de C\u00F3digo
+AWT.codeInput=Entrada de Código
 AWT.japaneseKatakana=Caracteres Katakana Japoneses
 AWT.japaneseHiragana=Caracteres Hiragana Japoneses
 AWT.japaneseRoman=Caracteres Romanos Japoneses
 AWT.kanaLock=Bloqueo Kana
-AWT.inputMethodOnOff=Activar/Desactivar M\u00E9todo de Entrada
+AWT.inputMethodOnOff=Activar/Desactivar Método de Entrada
 AWT.again=Repetir
 AWT.undo=Deshacer
 AWT.copy=Copiar
@@ -171,7 +171,7 @@ AWT.stop=Parar
 AWT.compose=Componer
 
 # Numeric Keypad
-AWT.numpad=Teclado Num\u00E9rico
+AWT.numpad=Teclado Numérico
 AWT.unknown=Desconocido
 AWT.undefined=No Definido
 
@@ -180,14 +180,14 @@ AWT.DefaultCursor=Cursor Por defecto
 AWT.CrosshairCursor=Cursor de Punto de Mira
 AWT.TextCursor=Cursor de Texto
 AWT.WaitCursor=Cursor de Espera
-AWT.SWResizeCursor=Cursor de Cambio de Tama\u00F1o Suroeste
-AWT.SEResizeCursor=Cursor de Cambio de Tama\u00F1o Sudeste
-AWT.NWResizeCursor=Cursor de Cambio de Tama\u00F1o Noroeste
-AWT.NEResizeCursor=Cursor de Cambio de Tama\u00F1o Nordeste
-AWT.NResizeCursor=Cursor de Cambio de Tama\u00F1o Norte
-AWT.SResizeCursor=Cursor de Cambio de Tama\u00F1o Sur
-AWT.WResizeCursor=Cursor de Cambio de Tama\u00F1o Oeste
-AWT.EResizeCursor=Cursor de Cambio de Tama\u00F1o este
+AWT.SWResizeCursor=Cursor de Cambio de Tamaño Suroeste
+AWT.SEResizeCursor=Cursor de Cambio de Tamaño Sudeste
+AWT.NWResizeCursor=Cursor de Cambio de Tamaño Noroeste
+AWT.NEResizeCursor=Cursor de Cambio de Tamaño Nordeste
+AWT.NResizeCursor=Cursor de Cambio de Tamaño Norte
+AWT.SResizeCursor=Cursor de Cambio de Tamaño Sur
+AWT.WResizeCursor=Cursor de Cambio de Tamaño Oeste
+AWT.EResizeCursor=Cursor de Cambio de Tamaño este
 AWT.HandCursor=Cursor de Mano
 AWT.MoveCursor=Cursor de Movimiento
 AWT.DefaultDragCursor=Cursor de Arrastrar Por defecto
@@ -196,9 +196,9 @@ AWT.DefaultDropCursor=Cursor de Soltar Por Defecto
 
 # Input method related strings
 AWT.CompositionWindowTitle=Ventana de Entrada
-AWT.InputMethodSelectionMenu=Seleccionar M\u00E9todo de Entrada
-AWT.HostInputMethodDisplayName=M\u00E9todos de Entrada del Sistema
-AWT.InputMethodLanguage.ja=Japon\u00E9s
+AWT.InputMethodSelectionMenu=Seleccionar Método de Entrada
+AWT.HostInputMethodDisplayName=Métodos de Entrada del Sistema
+AWT.InputMethodLanguage.ja=Japonés
 AWT.InputMethodLanguage.ko=Coreano
 AWT.InputMethodLanguage.zh=chino
 AWT.InputMethodLanguage.zh_CN=Chino Simplificado
@@ -213,5 +213,5 @@ java.awt.im.style=en el lugar
 java.awt.def.delay=30
 
 # Warnings
-AWT.InconsistentDLLsWarning=Puede que las operaciones textuales no funcionen correctamente debido a un juego incoherente de bibliotecas de enlaces din\u00E1micos (DLL) instaladas en su sistema. Para obtener m\u00E1s informaci\u00F3n acerca de este problema y de la soluci\u00F3n alternativa sugerida, consulte Java(TM) 2 SDK, Standard Edition Release Notes en java.sun.com.
+AWT.InconsistentDLLsWarning=Puede que las operaciones textuales no funcionen correctamente debido a un juego incoherente de bibliotecas de enlaces dinámicos (DLL) instaladas en su sistema. Para obtener más información acerca de este problema y de la solución alternativa sugerida, consulte Java(TM) 2 SDK, Standard Edition Release Notes en java.sun.com.
 
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_fr.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_fr.properties
index 94ff9229fb3..68cd3af78e3 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_fr.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_fr.properties
@@ -32,12 +32,12 @@
 AWT.shift=Maj
 AWT.control=Ctrl
 AWT.alt=Alt
-AWT.meta=M\u00E9ta
+AWT.meta=Méta
 AWT.altGraph=Alt graphique
 
 # Key names
-AWT.enter=Entr\u00E9e
-AWT.backSpace=Retour arri\u00E8re
+AWT.enter=Entrée
+AWT.backSpace=Retour arrière
 AWT.tab=Tab
 AWT.cancel=Annuler
 AWT.clear=Effacer
@@ -45,7 +45,7 @@ AWT.pause=Pause
 AWT.capsLock=Verrouillage des majuscules
 AWT.escape=Echap
 AWT.space=Espace
-AWT.pgup=Page pr\u00E9c\u00E9dente
+AWT.pgup=Page précédente
 AWT.pgdn=Page suivante
 AWT.end=Fin
 AWT.home=Origine
@@ -53,7 +53,7 @@ AWT.left=Gauche
 AWT.up=Haut
 AWT.right=Droite
 AWT.down=Bas
-AWT.begin=D\u00E9but
+AWT.begin=Début
 AWT.comma=Virgule
 AWT.period=Point
 AWT.slash=Barre oblique
@@ -62,16 +62,16 @@ AWT.equals=Egal
 AWT.openBracket=Crochet ouvrant
 AWT.backSlash=Barre oblique inverse
 AWT.closeBracket=Crochet fermant
-AWT.multiply=Pav\u00E9 num\u00E9rique *
-AWT.add=Pav\u00E9 num\u00E9rique +
-AWT.separator=Pav\u00E9 num\u00E9rique ,
-AWT.separater=Pav\u00E9 num\u00E9rique ,
-AWT.subtract=Pav\u00E9 num\u00E9rique -
-AWT.decimal=Pav\u00E9 num\u00E9rique .
-AWT.divide=Pav\u00E9 num\u00E9rique /
+AWT.multiply=Pavé numérique *
+AWT.add=Pavé numérique +
+AWT.separator=Pavé numérique ,
+AWT.separater=Pavé numérique ,
+AWT.subtract=Pavé numérique -
+AWT.decimal=Pavé numérique .
+AWT.divide=Pavé numérique /
 AWT.delete=Supprimer
-AWT.numLock=Verrouillage du pav\u00E9 num\u00E9rique
-AWT.scrollLock=Verrouillage du d\u00E9filement
+AWT.numLock=Verrouillage du pavé numérique
+AWT.scrollLock=Verrouillage du défilement
 AWT.f1=F1
 AWT.f2=F2
 AWT.f3=F3
@@ -96,8 +96,8 @@ AWT.f21=F21
 AWT.f22=F22
 AWT.f23=F23
 AWT.f24=F24
-AWT.printScreen=Impression d'\u00E9cran
-AWT.insert=Ins\u00E9rer
+AWT.printScreen=Impression d'écran
+AWT.insert=Insérer
 AWT.help=Aide
 AWT.windows=Windows
 AWT.context=Menu contextuel
@@ -110,20 +110,20 @@ AWT.deadTilde=Tilde
 AWT.deadMacron=Macron
 AWT.deadBreve=Dead Breve
 AWT.deadAboveDot=Point en chef
-AWT.deadDiaeresis=Tr\u00E9ma
+AWT.deadDiaeresis=Tréma
 AWT.deadAboveRing=Anneau en chef
 AWT.deadDoubleAcute=Double accent aigu
 AWT.deadCaron=Caron
-AWT.deadCedilla=C\u00E9dille
+AWT.deadCedilla=Cédille
 AWT.deadOgonek=Ogonek
 AWT.deadIota=Iota
-AWT.deadVoicedSound=Son vois\u00E9
-AWT.deadSemivoicedSound=Son semi-vois\u00E9
+AWT.deadVoicedSound=Son voisé
+AWT.deadSemivoicedSound=Son semi-voisé
 AWT.ampersand=Esperluette
-AWT.asterisk=Ast\u00E9risque
+AWT.asterisk=Astérisque
 AWT.quoteDbl=Guillemets
-AWT.Less=Inf\u00E9rieur \u00E0
-AWT.greater=Sup\u00E9rieur \u00E0
+AWT.Less=Inférieur à
+AWT.greater=Supérieur à
 AWT.braceLeft=Accolade ouvrante
 AWT.braceRight=Accolade fermante
 AWT.at=A commercial
@@ -132,12 +132,12 @@ AWT.circumflex=Circonflexe
 AWT.dollar=Dollar
 AWT.euro=Euro
 AWT.exclamationMark=Point d'exclamation
-AWT.invertedExclamationMark=Point d'exclamation invers\u00E9
-AWT.leftParenthesis=Parenth\u00E8se ouvrante
-AWT.numberSign=Di\u00E8se
+AWT.invertedExclamationMark=Point d'exclamation inversé
+AWT.leftParenthesis=Parenthèse ouvrante
+AWT.numberSign=Dièse
 AWT.plus=Plus
 AWT.minus=Moins
-AWT.rightParenthesis=Parenth\u00E8se fermante
+AWT.rightParenthesis=Parenthèse fermante
 AWT.underscore=Trait de soulignement
 AWT.final=Final
 AWT.convert=Convertir
@@ -146,38 +146,38 @@ AWT.accept=Accepter
 AWT.modechange=Changement de mode
 AWT.kana=Kana
 AWT.kanji=Kanji
-AWT.alphanumeric=Alphanum\u00E9rique
+AWT.alphanumeric=Alphanumérique
 AWT.katakana=Katakana
 AWT.hiragana=Hiragana
 AWT.fullWidth=Pleine largeur
 AWT.halfWidth=Demi-largeur
-AWT.romanCharacters=Caract\u00E8res romains
+AWT.romanCharacters=Caractères romains
 AWT.allCandidates=Tous les candidats
-AWT.previousCandidate=Candidat pr\u00E9c\u00E9dent
-AWT.codeInput=Entr\u00E9e de code
+AWT.previousCandidate=Candidat précédent
+AWT.codeInput=Entrée de code
 AWT.japaneseKatakana=Japonais Katakana
 AWT.japaneseHiragana=Japonais Hiragana
 AWT.japaneseRoman=Japonais romain
 AWT.kanaLock=Verrouiller Kana
-AWT.inputMethodOnOff=Activation/d\u00E9sactivation de la m\u00E9thode d'entr\u00E9e
-AWT.again=R\u00E9p\u00E9ter
+AWT.inputMethodOnOff=Activation/désactivation de la méthode d'entrée
+AWT.again=Répéter
 AWT.undo=Annuler
 AWT.copy=Copier
 AWT.paste=Coller
 AWT.cut=Couper
 AWT.find=Rechercher
 AWT.props=Props
-AWT.stop=Arr\u00EAter
+AWT.stop=Arrêter
 AWT.compose=Composer
 
 # Numeric Keypad
-AWT.numpad=Pav\u00E9 num\u00E9rique
+AWT.numpad=Pavé numérique
 AWT.unknown=Inconnu
-AWT.undefined=Non d\u00E9fini
+AWT.undefined=Non défini
 
 # Predefined cursor names
-AWT.DefaultCursor=Curseur par d\u00E9faut
-AWT.CrosshairCursor=Curseur r\u00E9ticulaire
+AWT.DefaultCursor=Curseur par défaut
+AWT.CrosshairCursor=Curseur réticulaire
 AWT.TextCursor=Curseur de texte
 AWT.WaitCursor=Curseur d'attente
 AWT.SWResizeCursor=Curseur de redimensionnement sud-ouest
@@ -189,21 +189,21 @@ AWT.SResizeCursor=Curseur de redimensionnement sud
 AWT.WResizeCursor=Curseur de redimensionnement ouest
 AWT.EResizeCursor=Curseur de redimensionnement est
 AWT.HandCursor=Curseur en forme de main
-AWT.MoveCursor=Curseur de d\u00E9placement
-AWT.DefaultDragCursor=Curseur de d\u00E9placement par d\u00E9faut
-AWT.DefaultNoDropCursor=Curseur non d\u00E9pla\u00E7ant par d\u00E9faut
-AWT.DefaultDropCursor=Curseur de pose par d\u00E9faut
+AWT.MoveCursor=Curseur de déplacement
+AWT.DefaultDragCursor=Curseur de déplacement par défaut
+AWT.DefaultNoDropCursor=Curseur non déplaçant par défaut
+AWT.DefaultDropCursor=Curseur de pose par défaut
 
 # Input method related strings
-AWT.CompositionWindowTitle=Fen\u00EAtre d'entr\u00E9e
-AWT.InputMethodSelectionMenu=S\u00E9lectionner la m\u00E9thode d'entr\u00E9e
-AWT.HostInputMethodDisplayName=M\u00E9thodes d'entr\u00E9e syst\u00E8me
+AWT.CompositionWindowTitle=Fenêtre d'entrée
+AWT.InputMethodSelectionMenu=Sélectionner la méthode d'entrée
+AWT.HostInputMethodDisplayName=Méthodes d'entrée système
 AWT.InputMethodLanguage.ja=Japonais
-AWT.InputMethodLanguage.ko=Cor\u00E9en
+AWT.InputMethodLanguage.ko=Coréen
 AWT.InputMethodLanguage.zh=Chinois
-AWT.InputMethodLanguage.zh_CN=Chinois simplifi\u00E9
+AWT.InputMethodLanguage.zh_CN=Chinois simplifié
 AWT.InputMethodLanguage.zh_TW=Chinois traditionnel
-AWT.InputMethodCreationFailed=Impossible de cr\u00E9er {0}.  Raison\u00A0: {1}
+AWT.InputMethodCreationFailed=Impossible de créer {0}.  Raison : {1}
 
 # Property to select between on-the-spot and below-the-spot
 # composition with input methods. Valid values:
@@ -213,5 +213,5 @@ java.awt.im.style=sur place
 java.awt.def.delay=30
 
 # Warnings
-AWT.InconsistentDLLsWarning=Il se peut que les op\u00E9rations li\u00E9es au texte ne fonctionnent pas correctement lorsqu'un ensemble incoh\u00E9rent de DLL est install\u00E9 sur le syst\u00E8me. Vous trouverez plus de d\u00E9tails sur ce probl\u00E8me et sur sa solution dans le document Java(TM) 2 SDK, Standard Edition Release Notes sur java.sun.com.
+AWT.InconsistentDLLsWarning=Il se peut que les opérations liées au texte ne fonctionnent pas correctement lorsqu'un ensemble incohérent de DLL est installé sur le système. Vous trouverez plus de détails sur ce problème et sur sa solution dans le document Java(TM) 2 SDK, Standard Edition Release Notes sur java.sun.com.
 
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_it.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_it.properties
index 3c8bf2b0002..b908af19c66 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_it.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_it.properties
@@ -46,13 +46,13 @@ AWT.capsLock=Bloc Maiusc
 AWT.escape=Esc
 AWT.space=Barra spaziatrice
 AWT.pgup=Pg Su
-AWT.pgdn=Pg Gi\u00F9
+AWT.pgdn=Pg Giù
 AWT.end=Fine
 AWT.home=Home
 AWT.left=Sinistra
 AWT.up=Su
 AWT.right=Destra
-AWT.down=Gi\u00F9
+AWT.down=Giù
 AWT.begin=Inizio
 AWT.comma=Virgola
 AWT.period=Punto
@@ -135,7 +135,7 @@ AWT.exclamationMark=Punto esclamativo
 AWT.invertedExclamationMark=Punto esclamativo invertito
 AWT.leftParenthesis=Parentesi aperta
 AWT.numberSign=Cancelletto
-AWT.plus=Pi\u00F9
+AWT.plus=Più
 AWT.minus=Meno
 AWT.rightParenthesis=Parentesi chiusa
 AWT.underscore=Sottolineatura
@@ -143,7 +143,7 @@ AWT.final=Finale
 AWT.convert=Converti
 AWT.noconvert=Non convertire
 AWT.accept=Accetto
-AWT.modechange=Modifica modalit\u00E0
+AWT.modechange=Modifica modalità
 AWT.kana=Kana
 AWT.kanji=Kanji
 AWT.alphanumeric=Alfanumerico
@@ -166,7 +166,7 @@ AWT.copy=Copia
 AWT.paste=Incolla
 AWT.cut=Taglia
 AWT.find=Trova
-AWT.props=Propriet\u00E0
+AWT.props=Proprietà
 AWT.stop=Arresta
 AWT.compose=Componi
 
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_ja.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_ja.properties
index 0ae262eaa45..5797439519f 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_ja.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_ja.properties
@@ -32,36 +32,36 @@
 AWT.shift=Shift
 AWT.control=Ctrl
 AWT.alt=Alt
-AWT.meta=\u30E1\u30BF
-AWT.altGraph=Alt\u30B0\u30E9\u30D5
+AWT.meta=メタ
+AWT.altGraph=Altグラフ
 
 # Key names
 AWT.enter=Enter
 AWT.backSpace=Backspace
 AWT.tab=Tab
-AWT.cancel=\u53D6\u6D88
-AWT.clear=\u30AF\u30EA\u30A2
-AWT.pause=\u4E00\u6642\u505C\u6B62
+AWT.cancel=取消
+AWT.clear=クリア
+AWT.pause=一時停止
 AWT.capsLock=Caps Lock
 AWT.escape=Esc
-AWT.space=\u30B9\u30DA\u30FC\u30B9
+AWT.space=スペース
 AWT.pgup=Page Up
 AWT.pgdn=Page Down
 AWT.end=End
 AWT.home=Home
-AWT.left=\u5DE6
-AWT.up=\u4E0A
-AWT.right=\u53F3
-AWT.down=\u4E0B
-AWT.begin=\u958B\u59CB
-AWT.comma=\u30AB\u30F3\u30DE
-AWT.period=\u30D4\u30EA\u30AA\u30C9
-AWT.slash=\u30B9\u30E9\u30C3\u30B7\u30E5
-AWT.semicolon=\u30BB\u30DF\u30B3\u30ED\u30F3
-AWT.equals=\u7B49\u53F7
-AWT.openBracket=\u5DE6\u5927\u30AB\u30C3\u30B3
-AWT.backSlash=\u30D0\u30C3\u30AF\u30B9\u30E9\u30C3\u30B7\u30E5
-AWT.closeBracket=\u53F3\u5927\u30AB\u30C3\u30B3
+AWT.left=左
+AWT.up=上
+AWT.right=右
+AWT.down=下
+AWT.begin=開始
+AWT.comma=カンマ
+AWT.period=ピリオド
+AWT.slash=スラッシュ
+AWT.semicolon=セミコロン
+AWT.equals=等号
+AWT.openBracket=左大カッコ
+AWT.backSlash=バックスラッシュ
+AWT.closeBracket=右大カッコ
 AWT.multiply=NumPad *
 AWT.add=NumPad +
 AWT.separator=NumPad ,
@@ -98,11 +98,11 @@ AWT.f23=F23
 AWT.f24=F24
 AWT.printScreen=Print Screen
 AWT.insert=Insert
-AWT.help=\u30D8\u30EB\u30D7
+AWT.help=ヘルプ
 AWT.windows=Windows
-AWT.context=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30E1\u30CB\u30E5\u30FC
-AWT.backQuote=\u9006\u5F15\u7528\u7B26
-AWT.quote=\u5F15\u7528\u7B26
+AWT.context=コンテキスト・メニュー
+AWT.backQuote=逆引用符
+AWT.quote=引用符
 AWT.deadGrave=Dead Grave
 AWT.deadAcute=Dead Acute
 AWT.deadCircumflex=Dead Circumflex
@@ -119,99 +119,99 @@ AWT.deadOgonek=Dead Ogonek
 AWT.deadIota=Dead Iota
 AWT.deadVoicedSound=Dead Voiced Sound
 AWT.deadSemivoicedSound=Dead Semivoiced Sound
-AWT.ampersand=\u30A2\u30F3\u30D1\u30B5\u30F3\u30C9
-AWT.asterisk=\u30A2\u30B9\u30BF\u30EA\u30B9\u30AF
-AWT.quoteDbl=\u4E8C\u91CD\u5F15\u7528\u7B26
-AWT.Less=\u3088\u308A\u5C0F\u3055\u3044
-AWT.greater=\u3088\u308A\u5927\u304D\u3044
-AWT.braceLeft=\u5DE6\u4E2D\u30AB\u30C3\u30B3
-AWT.braceRight=\u53F3\u4E2D\u30AB\u30C3\u30B3
-AWT.at=\u30A2\u30C3\u30C8
-AWT.colon=\u30B3\u30ED\u30F3
-AWT.circumflex=\u66F2\u6298\u30A2\u30AF\u30BB\u30F3\u30C8\u8A18\u53F7
-AWT.dollar=\u30C9\u30EB
-AWT.euro=\u30E6\u30FC\u30ED
-AWT.exclamationMark=\u611F\u5606\u7B26
-AWT.invertedExclamationMark=\u9006\u611F\u5606\u7B26
-AWT.leftParenthesis=\u5DE6\u4E38\u30AB\u30C3\u30B3
-AWT.numberSign=\u756A\u53F7\u8A18\u53F7
-AWT.plus=\u30D7\u30E9\u30B9
-AWT.minus=\u30DE\u30A4\u30CA\u30B9
-AWT.rightParenthesis=\u53F3\u4E38\u30AB\u30C3\u30B3
-AWT.underscore=\u30A2\u30F3\u30C0\u30FC\u30B9\u30B3\u30A2
-AWT.final=\u6700\u7D42
-AWT.convert=\u5909\u63DB
-AWT.noconvert=\u7121\u5909\u63DB
-AWT.accept=\u78BA\u5B9A
-AWT.modechange=\u30E2\u30FC\u30C9\u5909\u66F4
-AWT.kana=\u304B\u306A
-AWT.kanji=\u6F22\u5B57
-AWT.alphanumeric=\u82F1\u6570\u5B57
-AWT.katakana=\u30AB\u30BF\u30AB\u30CA
-AWT.hiragana=\u3072\u3089\u304C\u306A
-AWT.fullWidth=\u5168\u89D2
-AWT.halfWidth=\u534A\u89D2
-AWT.romanCharacters=\u30ED\u30FC\u30DE\u5B57
-AWT.allCandidates=\u5168\u5019\u88DC
-AWT.previousCandidate=\u524D\u5019\u88DC
-AWT.codeInput=\u30B3\u30FC\u30C9\u5165\u529B
-AWT.japaneseKatakana=\u65E5\u672C\u8A9E\u306E\u30AB\u30BF\u30AB\u30CA
-AWT.japaneseHiragana=\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A
-AWT.japaneseRoman=\u65E5\u672C\u8A9E\u306E\u30ED\u30FC\u30DE\u5B57
-AWT.kanaLock=\u30AB\u30CA\u30FB\u30ED\u30C3\u30AF
-AWT.inputMethodOnOff=\u5165\u529B\u30E1\u30BD\u30C3\u30C9On-Off
-AWT.again=\u518D\u5EA6
-AWT.undo=\u5143\u306B\u623B\u3059
-AWT.copy=\u30B3\u30D4\u30FC
-AWT.paste=\u8CBC\u4ED8\u3051
-AWT.cut=\u5207\u53D6\u308A
-AWT.find=\u691C\u7D22
-AWT.props=\u30D7\u30ED\u30D1\u30C6\u30A3
-AWT.stop=\u505C\u6B62
-AWT.compose=\u4F5C\u6210
+AWT.ampersand=アンパサンド
+AWT.asterisk=アスタリスク
+AWT.quoteDbl=二重引用符
+AWT.Less=より小さい
+AWT.greater=より大きい
+AWT.braceLeft=左中カッコ
+AWT.braceRight=右中カッコ
+AWT.at=アット
+AWT.colon=コロン
+AWT.circumflex=曲折アクセント記号
+AWT.dollar=ドル
+AWT.euro=ユーロ
+AWT.exclamationMark=感嘆符
+AWT.invertedExclamationMark=逆感嘆符
+AWT.leftParenthesis=左丸カッコ
+AWT.numberSign=番号記号
+AWT.plus=プラス
+AWT.minus=マイナス
+AWT.rightParenthesis=右丸カッコ
+AWT.underscore=アンダースコア
+AWT.final=最終
+AWT.convert=変換
+AWT.noconvert=無変換
+AWT.accept=確定
+AWT.modechange=モード変更
+AWT.kana=かな
+AWT.kanji=漢字
+AWT.alphanumeric=英数字
+AWT.katakana=カタカナ
+AWT.hiragana=ひらがな
+AWT.fullWidth=全角
+AWT.halfWidth=半角
+AWT.romanCharacters=ローマ字
+AWT.allCandidates=全候補
+AWT.previousCandidate=前候補
+AWT.codeInput=コード入力
+AWT.japaneseKatakana=日本語のカタカナ
+AWT.japaneseHiragana=日本語のひらがな
+AWT.japaneseRoman=日本語のローマ字
+AWT.kanaLock=カナ・ロック
+AWT.inputMethodOnOff=入力メソッドOn-Off
+AWT.again=再度
+AWT.undo=元に戻す
+AWT.copy=コピー
+AWT.paste=貼付け
+AWT.cut=切取り
+AWT.find=検索
+AWT.props=プロパティ
+AWT.stop=停止
+AWT.compose=作成
 
 # Numeric Keypad
 AWT.numpad=NumPad
-AWT.unknown=\u4E0D\u660E
-AWT.undefined=\u672A\u5B9A\u7FA9
+AWT.unknown=不明
+AWT.undefined=未定義
 
 # Predefined cursor names
-AWT.DefaultCursor=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30AB\u30FC\u30BD\u30EB
-AWT.CrosshairCursor=\u5341\u5B57\u30AB\u30FC\u30BD\u30EB
-AWT.TextCursor=\u30C6\u30AD\u30B9\u30C8\u30FB\u30AB\u30FC\u30BD\u30EB
-AWT.WaitCursor=\u5F85\u6A5F\u30AB\u30FC\u30BD\u30EB
-AWT.SWResizeCursor=\u5357\u897F\u65B9\u5411\u306E\u30EA\u30B5\u30A4\u30BA\u30FB\u30AB\u30FC\u30BD\u30EB
-AWT.SEResizeCursor=\u5357\u6771\u65B9\u5411\u306E\u30EA\u30B5\u30A4\u30BA\u30FB\u30AB\u30FC\u30BD\u30EB
-AWT.NWResizeCursor=\u5317\u897F\u65B9\u5411\u306E\u30EA\u30B5\u30A4\u30BA\u30FB\u30AB\u30FC\u30BD\u30EB
-AWT.NEResizeCursor=\u5317\u6771\u65B9\u5411\u306E\u30EA\u30B5\u30A4\u30BA\u30FB\u30AB\u30FC\u30BD\u30EB
-AWT.NResizeCursor=\u5317\u65B9\u5411\u306E\u30EA\u30B5\u30A4\u30BA\u30FB\u30AB\u30FC\u30BD\u30EB
-AWT.SResizeCursor=\u5357\u65B9\u5411\u306E\u30EA\u30B5\u30A4\u30BA\u30FB\u30AB\u30FC\u30BD\u30EB
-AWT.WResizeCursor=\u897F\u65B9\u5411\u306E\u30EA\u30B5\u30A4\u30BA\u30FB\u30AB\u30FC\u30BD\u30EB
-AWT.EResizeCursor=\u6771\u65B9\u5411\u306E\u30EA\u30B5\u30A4\u30BA\u30FB\u30AB\u30FC\u30BD\u30EB
-AWT.HandCursor=\u6307\u578B\u30AB\u30FC\u30BD\u30EB
-AWT.MoveCursor=\u79FB\u52D5\u30AB\u30FC\u30BD\u30EB
-AWT.DefaultDragCursor=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30C9\u30E9\u30C3\u30B0\u30FB\u30AB\u30FC\u30BD\u30EB
-AWT.DefaultNoDropCursor=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30C9\u30E9\u30C3\u30B0\u7981\u6B62\u30AB\u30FC\u30BD\u30EB
-AWT.DefaultDropCursor=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30C9\u30ED\u30C3\u30D7\u30FB\u30AB\u30FC\u30BD\u30EB
+AWT.DefaultCursor=デフォルトのカーソル
+AWT.CrosshairCursor=十字カーソル
+AWT.TextCursor=テキスト・カーソル
+AWT.WaitCursor=待機カーソル
+AWT.SWResizeCursor=南西方向のリサイズ・カーソル
+AWT.SEResizeCursor=南東方向のリサイズ・カーソル
+AWT.NWResizeCursor=北西方向のリサイズ・カーソル
+AWT.NEResizeCursor=北東方向のリサイズ・カーソル
+AWT.NResizeCursor=北方向のリサイズ・カーソル
+AWT.SResizeCursor=南方向のリサイズ・カーソル
+AWT.WResizeCursor=西方向のリサイズ・カーソル
+AWT.EResizeCursor=東方向のリサイズ・カーソル
+AWT.HandCursor=指型カーソル
+AWT.MoveCursor=移動カーソル
+AWT.DefaultDragCursor=デフォルトのドラッグ・カーソル
+AWT.DefaultNoDropCursor=デフォルトのドラッグ禁止カーソル
+AWT.DefaultDropCursor=デフォルトのドロップ・カーソル
 
 # Input method related strings
-AWT.CompositionWindowTitle=\u5165\u529B\u30A6\u30A3\u30F3\u30C9\u30A6
-AWT.InputMethodSelectionMenu=\u5165\u529B\u30E1\u30BD\u30C3\u30C9\u306E\u9078\u629E
-AWT.HostInputMethodDisplayName=\u30B7\u30B9\u30C6\u30E0\u5165\u529B\u30E1\u30BD\u30C3\u30C9
-AWT.InputMethodLanguage.ja=\u65E5\u672C\u8A9E
-AWT.InputMethodLanguage.ko=\u97D3\u56FD\u8A9E
-AWT.InputMethodLanguage.zh=\u4E2D\u56FD\u8A9E
-AWT.InputMethodLanguage.zh_CN=\u4E2D\u56FD\u8A9E(\u7C21\u4F53\u5B57)
-AWT.InputMethodLanguage.zh_TW=\u4E2D\u56FD\u8A9E(\u7E41\u4F53\u5B57)
-AWT.InputMethodCreationFailed={0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u7406\u7531: {1}
+AWT.CompositionWindowTitle=入力ウィンドウ
+AWT.InputMethodSelectionMenu=入力メソッドの選択
+AWT.HostInputMethodDisplayName=システム入力メソッド
+AWT.InputMethodLanguage.ja=日本語
+AWT.InputMethodLanguage.ko=韓国語
+AWT.InputMethodLanguage.zh=中国語
+AWT.InputMethodLanguage.zh_CN=中国語(簡体字)
+AWT.InputMethodLanguage.zh_TW=中国語(繁体字)
+AWT.InputMethodCreationFailed={0}を作成できませんでした。理由: {1}
 
 # Property to select between on-the-spot and below-the-spot
 # composition with input methods. Valid values:
 # "on-the-spot", "below-the-spot".
 # May be overridden from command line.
-java.awt.im.style=\u5373\u5EA7
+java.awt.im.style=即座
 java.awt.def.delay=30
 
 # Warnings
-AWT.InconsistentDLLsWarning=\u30B7\u30B9\u30C6\u30E0\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u3066\u3044\u308B\u4E00\u9023\u306E\u30C0\u30A4\u30CA\u30DF\u30C3\u30AF\u30FB\u30EA\u30F3\u30AF\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA(DLL)\u306B\u77DB\u76FE\u304C\u3042\u308B\u305F\u3081\u3001\u30C6\u30AD\u30B9\u30C8\u30FB\u30D9\u30FC\u30B9\u306E\u64CD\u4F5C\u304C\u6B63\u3057\u304F\u52D5\u4F5C\u3057\u307E\u305B\u3093\u3002\u3053\u306E\u554F\u984C\u306E\u8A73\u7D30\u3068\u56DE\u907F\u7B56\u306F\u3001java.sun.com\u4E0A\u306B\u3042\u308BJava(TM) 2 SDK, Standard Edition\u306E\u30EA\u30EA\u30FC\u30B9\u30FB\u30CE\u30FC\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+AWT.InconsistentDLLsWarning=システムにインストールされている一連のダイナミック・リンク・ライブラリ(DLL)に矛盾があるため、テキスト・ベースの操作が正しく動作しません。この問題の詳細と回避策は、java.sun.com上にあるJava(TM) 2 SDK, Standard Editionのリリース・ノートを参照してください。
 
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_ko.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_ko.properties
index 143e1cc3c4e..fe616e0b1a1 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_ko.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_ko.properties
@@ -140,70 +140,70 @@ AWT.minus=Minus
 AWT.rightParenthesis=Right Parenthesis
 AWT.underscore=Underscore
 AWT.final=Final
-AWT.convert=\uBCC0\uD658
-AWT.noconvert=\uBCC0\uD658 \uC548\uD568
-AWT.accept=\uB3D9\uC758
-AWT.modechange=\uBAA8\uB4DC \uBCC0\uACBD
-AWT.kana=\uAC00\uB098
-AWT.kanji=\uAC04\uC9C0
-AWT.alphanumeric=\uC601\uC22B\uC790
-AWT.katakana=\uAC00\uD0C0\uCE74\uB098
-AWT.hiragana=\uD788\uB77C\uAC00\uB098
+AWT.convert=변환
+AWT.noconvert=변환 안함
+AWT.accept=동의
+AWT.modechange=모드 변경
+AWT.kana=가나
+AWT.kanji=간지
+AWT.alphanumeric=영숫자
+AWT.katakana=가타카나
+AWT.hiragana=히라가나
 AWT.fullWidth=Full-Width
 AWT.halfWidth=Half-Width
-AWT.romanCharacters=\uB85C\uB9C8 \uBB38\uC790
-AWT.allCandidates=\uBAA8\uB4E0 \uD6C4\uBCF4
-AWT.previousCandidate=\uC774\uC804 \uD6C4\uBCF4
-AWT.codeInput=\uCF54\uB4DC \uC785\uB825
-AWT.japaneseKatakana=\uC77C\uBCF8\uC5B4 \uAC00\uD0C0\uCE74\uB098
-AWT.japaneseHiragana=\uC77C\uBCF8\uC5B4 \uD788\uB77C\uAC00\uB098
-AWT.japaneseRoman=\uC77C\uBCF8\uC5B4 \uB85C\uB9C8 \uBB38\uC790
-AWT.kanaLock=\uAC00\uB098 \uC7A0\uAE08
-AWT.inputMethodOnOff=\uC785\uB825 \uBC29\uBC95 \uC124\uC815/\uD574\uC81C
-AWT.again=\uB2E4\uC2DC
-AWT.undo=\uC2E4\uD589 \uCDE8\uC18C
-AWT.copy=\uBCF5\uC0AC
-AWT.paste=\uBD99\uC5EC\uB123\uAE30
-AWT.cut=\uC798\uB77C\uB0B4\uAE30
-AWT.find=\uCC3E\uAE30
+AWT.romanCharacters=로마 문자
+AWT.allCandidates=모든 후보
+AWT.previousCandidate=이전 후보
+AWT.codeInput=코드 입력
+AWT.japaneseKatakana=일본어 가타카나
+AWT.japaneseHiragana=일본어 히라가나
+AWT.japaneseRoman=일본어 로마 문자
+AWT.kanaLock=가나 잠금
+AWT.inputMethodOnOff=입력 방법 설정/해제
+AWT.again=다시
+AWT.undo=실행 취소
+AWT.copy=복사
+AWT.paste=붙여넣기
+AWT.cut=잘라내기
+AWT.find=찾기
 AWT.props=Props
-AWT.stop=\uC815\uC9C0
-AWT.compose=\uAD6C\uC131
+AWT.stop=정지
+AWT.compose=구성
 
 # Numeric Keypad
 AWT.numpad=NumPad
-AWT.unknown=\uC54C \uC218 \uC5C6\uC74C
-AWT.undefined=\uC815\uC758\uB418\uC9C0 \uC54A\uC74C
+AWT.unknown=알 수 없음
+AWT.undefined=정의되지 않음
 
 # Predefined cursor names
-AWT.DefaultCursor=\uAE30\uBCF8 \uCEE4\uC11C
-AWT.CrosshairCursor=\uC2ED\uC790 \uCEE4\uC11C
-AWT.TextCursor=\uD14D\uC2A4\uD2B8 \uCEE4\uC11C
-AWT.WaitCursor=\uB300\uAE30 \uCEE4\uC11C
-AWT.SWResizeCursor=\uB0A8\uC11C \uBC29\uD5A5 \uD06C\uAE30 \uC870\uC815 \uCEE4\uC11C
-AWT.SEResizeCursor=\uB0A8\uB3D9 \uBC29\uD5A5 \uD06C\uAE30 \uC870\uC815 \uCEE4\uC11C
-AWT.NWResizeCursor=\uBD81\uC11C \uBC29\uD5A5 \uD06C\uAE30 \uC870\uC815 \uCEE4\uC11C
-AWT.NEResizeCursor=\uBD81\uB3D9 \uBC29\uD5A5 \uD06C\uAE30 \uC870\uC815 \uCEE4\uC11C
-AWT.NResizeCursor=\uBD81\uCABD \uBC29\uD5A5 \uD06C\uAE30 \uC870\uC815 \uCEE4\uC11C
-AWT.SResizeCursor=\uB0A8\uCABD \uBC29\uD5A5 \uD06C\uAE30 \uC870\uC815 \uCEE4\uC11C
-AWT.WResizeCursor=\uC11C\uCABD \uBC29\uD5A5 \uD06C\uAE30 \uC870\uC815 \uCEE4\uC11C
-AWT.EResizeCursor=\uB3D9\uCABD \uBC29\uD5A5 \uD06C\uAE30 \uC870\uC815 \uCEE4\uC11C
-AWT.HandCursor=\uC190 \uCEE4\uC11C
-AWT.MoveCursor=\uC774\uB3D9 \uCEE4\uC11C
-AWT.DefaultDragCursor=\uAE30\uBCF8 \uB04C\uAE30 \uCEE4\uC11C
-AWT.DefaultNoDropCursor=\uAE30\uBCF8 NoDrag \uCEE4\uC11C
-AWT.DefaultDropCursor=\uAE30\uBCF8 \uB193\uAE30 \uCEE4\uC11C
+AWT.DefaultCursor=기본 커서
+AWT.CrosshairCursor=십자 커서
+AWT.TextCursor=텍스트 커서
+AWT.WaitCursor=대기 커서
+AWT.SWResizeCursor=남서 방향 크기 조정 커서
+AWT.SEResizeCursor=남동 방향 크기 조정 커서
+AWT.NWResizeCursor=북서 방향 크기 조정 커서
+AWT.NEResizeCursor=북동 방향 크기 조정 커서
+AWT.NResizeCursor=북쪽 방향 크기 조정 커서
+AWT.SResizeCursor=남쪽 방향 크기 조정 커서
+AWT.WResizeCursor=서쪽 방향 크기 조정 커서
+AWT.EResizeCursor=동쪽 방향 크기 조정 커서
+AWT.HandCursor=손 커서
+AWT.MoveCursor=이동 커서
+AWT.DefaultDragCursor=기본 끌기 커서
+AWT.DefaultNoDropCursor=기본 NoDrag 커서
+AWT.DefaultDropCursor=기본 놓기 커서
 
 # Input method related strings
-AWT.CompositionWindowTitle=\uC785\uB825 \uCC3D
-AWT.InputMethodSelectionMenu=\uC785\uB825 \uBC29\uBC95 \uC120\uD0DD
-AWT.HostInputMethodDisplayName=\uC2DC\uC2A4\uD15C \uC785\uB825 \uBC29\uBC95
-AWT.InputMethodLanguage.ja=\uC77C\uBCF8\uC5B4
-AWT.InputMethodLanguage.ko=\uD55C\uAD6D\uC5B4
-AWT.InputMethodLanguage.zh=\uC911\uAD6D\uC5B4
-AWT.InputMethodLanguage.zh_CN=\uC911\uAD6D\uC5B4 \uAC04\uCCB4
-AWT.InputMethodLanguage.zh_TW=\uC911\uAD6D\uC5B4 \uBC88\uCCB4
-AWT.InputMethodCreationFailed={0}\uC744(\uB97C) \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC6D0\uC778: {1}
+AWT.CompositionWindowTitle=입력 창
+AWT.InputMethodSelectionMenu=입력 방법 선택
+AWT.HostInputMethodDisplayName=시스템 입력 방법
+AWT.InputMethodLanguage.ja=일본어
+AWT.InputMethodLanguage.ko=한국어
+AWT.InputMethodLanguage.zh=중국어
+AWT.InputMethodLanguage.zh_CN=중국어 간체
+AWT.InputMethodLanguage.zh_TW=중국어 번체
+AWT.InputMethodCreationFailed={0}을(를) 생성할 수 없습니다. 원인: {1}
 
 # Property to select between on-the-spot and below-the-spot
 # composition with input methods. Valid values:
@@ -213,5 +213,5 @@ java.awt.im.style=on-the-spot
 java.awt.def.delay=30
 
 # Warnings
-AWT.InconsistentDLLsWarning=\uC2DC\uC2A4\uD15C\uC5D0 \uC124\uCE58\uB41C DLL(Dynamic Linking Libraries) \uC9D1\uD569\uC774 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC544 \uD14D\uC2A4\uD2B8 \uAE30\uBC18 \uC791\uC5C5\uC774 \uC81C\uB300\uB85C \uC791\uB3D9\uD558\uC9C0 \uC54A\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uC774 \uBB38\uC81C\uC5D0 \uB300\uD55C \uC790\uC138\uD55C \uB0B4\uC6A9\uACFC \uD574\uACB0 \uBC29\uBC95 \uC81C\uC548 \uC0AC\uD56D\uC740 java.sun.com\uC758 Java(TM) 2 SDK, Standard Edition Release Notes\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
+AWT.InconsistentDLLsWarning=시스템에 설치된 DLL(Dynamic Linking Libraries) 집합이 일치하지 않아 텍스트 기반 작업이 제대로 작동하지 않을 수 있습니다. 이 문제에 대한 자세한 내용과 해결 방법 제안 사항은 java.sun.com의 Java(TM) 2 SDK, Standard Edition Release Notes를 참조하십시오.
 
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_pt_BR.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_pt_BR.properties
index 2456ec0f3b5..3b070baff6b 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_pt_BR.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_pt_BR.properties
@@ -44,31 +44,31 @@ AWT.clear=Limpar
 AWT.pause=Pausar
 AWT.capsLock=Caps Lock
 AWT.escape=Escape
-AWT.space=Espa\u00E7o
-AWT.pgup=P\u00E1gina Acima
-AWT.pgdn=P\u00E1gina Abaixo
+AWT.space=Espaço
+AWT.pgup=Página Acima
+AWT.pgdn=Página Abaixo
 AWT.end=Fim
-AWT.home=In\u00EDcio
+AWT.home=Início
 AWT.left=Esquerda
 AWT.up=Acima
 AWT.right=Direita
 AWT.down=Abaixo
-AWT.begin=Come\u00E7ar
-AWT.comma=V\u00EDrgula
+AWT.begin=Começar
+AWT.comma=Vírgula
 AWT.period=Ponto Final
 AWT.slash=Barra
-AWT.semicolon=Ponto-e-V\u00EDrgula
+AWT.semicolon=Ponto-e-Vírgula
 AWT.equals=Igual
-AWT.openBracket=Par\u00EAntese de Abertura
+AWT.openBracket=Parêntese de Abertura
 AWT.backSlash=Barra Invertida
-AWT.closeBracket=Par\u00EAntese de Fechamento
-AWT.multiply=Teclado Num\u00E9rico *
-AWT.add=Teclado Num\u00E9rico +
-AWT.separator=Teclado Num\u00E9rico ,
-AWT.separater=Teclado Num\u00E9rico ,
-AWT.subtract=Teclado Num\u00E9rico -
-AWT.decimal=Teclado Num\u00E9rico .
-AWT.divide=Teclado Num\u00E9rico /
+AWT.closeBracket=Parêntese de Fechamento
+AWT.multiply=Teclado Numérico *
+AWT.add=Teclado Numérico +
+AWT.separator=Teclado Numérico ,
+AWT.separater=Teclado Numérico ,
+AWT.subtract=Teclado Numérico -
+AWT.decimal=Teclado Numérico .
+AWT.divide=Teclado Numérico /
 AWT.delete=Excluir
 AWT.numLock=Num Lock
 AWT.scrollLock=Scroll Lock
@@ -107,15 +107,15 @@ AWT.deadGrave=Acento Grave
 AWT.deadAcute=Acento Agudo
 AWT.deadCircumflex=Acento Circunflexo
 AWT.deadTilde=Til
-AWT.deadMacron=M\u00E1cron
+AWT.deadMacron=Mácron
 AWT.deadBreve=Braquia
 AWT.deadAboveDot=Ponto em Cima
 AWT.deadDiaeresis=Trema
-AWT.deadAboveRing=S\u00EDmbolo de Grau
+AWT.deadAboveRing=Símbolo de Grau
 AWT.deadDoubleAcute=Acento Agudo Duplo
 AWT.deadCaron=Acento Circunflexo Invertido
 AWT.deadCedilla=Cedilha
-AWT.deadOgonek=Gancho Polon\u00EAs
+AWT.deadOgonek=Gancho Polonês
 AWT.deadIota=Lota
 AWT.deadVoicedSound=Sonoro (Som)
 AWT.deadSemivoicedSound=Surdo (Som)
@@ -127,26 +127,26 @@ AWT.greater=Maior
 AWT.braceLeft=Chave Esquerda
 AWT.braceRight=Chave Direta
 AWT.at=Arroba
-AWT.colon=V\u00EDrgula
+AWT.colon=Vírgula
 AWT.circumflex=Circunflexo
-AWT.dollar=D\u00F3lar
+AWT.dollar=Dólar
 AWT.euro=Euro
-AWT.exclamationMark=Ponto de Exclama\u00E7\u00E3o
-AWT.invertedExclamationMark=Ponto de Exclama\u00E7\u00E3o Invertido
-AWT.leftParenthesis=Par\u00EAntese Esquerdo
-AWT.numberSign=Sinal Num\u00E9rico
+AWT.exclamationMark=Ponto de Exclamação
+AWT.invertedExclamationMark=Ponto de Exclamação Invertido
+AWT.leftParenthesis=Parêntese Esquerdo
+AWT.numberSign=Sinal Numérico
 AWT.plus=Mais
 AWT.minus=Menos
-AWT.rightParenthesis=Par\u00EAntese Direito
+AWT.rightParenthesis=Parêntese Direito
 AWT.underscore=Sublinhado
 AWT.final=Final
 AWT.convert=Converter
-AWT.noconvert=N\u00E3o Converter
+AWT.noconvert=Não Converter
 AWT.accept=Aceitar
-AWT.modechange=Altera\u00E7\u00E3o de Modo
+AWT.modechange=Alteração de Modo
 AWT.kana=Kana
 AWT.kanji=Kanji
-AWT.alphanumeric=Alfanum\u00E9rico
+AWT.alphanumeric=Alfanumérico
 AWT.katakana=Katakana
 AWT.hiragana=Hiragana
 AWT.fullWidth=Largura Total
@@ -154,12 +154,12 @@ AWT.halfWidth=Meia Largura
 AWT.romanCharacters=Caracteres Romanos
 AWT.allCandidates=Todos os Candidatos
 AWT.previousCandidate=Candidato Anterior
-AWT.codeInput=Entrada de C\u00F3digo
-AWT.japaneseKatakana=Katakana Japon\u00EAs
-AWT.japaneseHiragana=Hiragana Japon\u00EAs
-AWT.japaneseRoman=Romano Japon\u00EAs
+AWT.codeInput=Entrada de Código
+AWT.japaneseKatakana=Katakana Japonês
+AWT.japaneseHiragana=Hiragana Japonês
+AWT.japaneseRoman=Romano Japonês
 AWT.kanaLock=Kana Lock
-AWT.inputMethodOnOff=M\u00E9todo de Entrada Ativado/Desativado
+AWT.inputMethodOnOff=Método de Entrada Ativado/Desativado
 AWT.again=Novamente
 AWT.undo=Desfazer
 AWT.copy=Copiar
@@ -171,12 +171,12 @@ AWT.stop=Interromper
 AWT.compose=Compor
 
 # Numeric Keypad
-AWT.numpad=Teclado Num\u00E9rico
+AWT.numpad=Teclado Numérico
 AWT.unknown=Desconhecido
 AWT.undefined=Indefinido
 
 # Predefined cursor names
-AWT.DefaultCursor=Cursor Padr\u00E3o
+AWT.DefaultCursor=Cursor Padrão
 AWT.CrosshairCursor=Cursor em Forma de Cruz
 AWT.TextCursor=Cursor de Texto
 AWT.WaitCursor=Cursor em Forma de Ampulheta
@@ -186,24 +186,24 @@ AWT.NWResizeCursor=Cursor de Seta Que Aponta para Noroeste
 AWT.NEResizeCursor=Cursor de Seta Que Aponta para Nordeste
 AWT.NResizeCursor=Cursor de Seta Que Aponta para Cima
 AWT.SResizeCursor=Cursor de Seta Que Aponta para Baixo
-AWT.WResizeCursor=Cursor de Seta Que Aponta \u00E0 Esquerda
-AWT.EResizeCursor=Cursor de Seta Que Aponta \u00E0 Direita
-AWT.HandCursor=Cursor em Forma de M\u00E3o
+AWT.WResizeCursor=Cursor de Seta Que Aponta à Esquerda
+AWT.EResizeCursor=Cursor de Seta Que Aponta à Direita
+AWT.HandCursor=Cursor em Forma de Mão
 AWT.MoveCursor=Cursor de Movimento
-AWT.DefaultDragCursor=Cursor Padr\u00E3o de Arrastar
-AWT.DefaultNoDropCursor=Cursor Padr\u00E3o sem Arrastar
-AWT.DefaultDropCursor=Cursor Padr\u00E3o de Soltar
+AWT.DefaultDragCursor=Cursor Padrão de Arrastar
+AWT.DefaultNoDropCursor=Cursor Padrão sem Arrastar
+AWT.DefaultDropCursor=Cursor Padrão de Soltar
 
 # Input method related strings
 AWT.CompositionWindowTitle=Janela de Entrada
-AWT.InputMethodSelectionMenu=Selecionar M\u00E9todo de Entrada
-AWT.HostInputMethodDisplayName=M\u00E9todos de Entrada do Sistema
-AWT.InputMethodLanguage.ja=Japon\u00EAs
+AWT.InputMethodSelectionMenu=Selecionar Método de Entrada
+AWT.HostInputMethodDisplayName=Métodos de Entrada do Sistema
+AWT.InputMethodLanguage.ja=Japonês
 AWT.InputMethodLanguage.ko=Coreano
-AWT.InputMethodLanguage.zh=Chin\u00EAs
-AWT.InputMethodLanguage.zh_CN=Chin\u00EAs Simplificado
-AWT.InputMethodLanguage.zh_TW=Chin\u00EAs Tradicional
-AWT.InputMethodCreationFailed=N\u00E3o foi poss\u00EDvel criar {0}. Motivo: {1}
+AWT.InputMethodLanguage.zh=Chinês
+AWT.InputMethodLanguage.zh_CN=Chinês Simplificado
+AWT.InputMethodLanguage.zh_TW=Chinês Tradicional
+AWT.InputMethodCreationFailed=Não foi possível criar {0}. Motivo: {1}
 
 # Property to select between on-the-spot and below-the-spot
 # composition with input methods. Valid values:
@@ -213,5 +213,5 @@ java.awt.im.style=no momento
 java.awt.def.delay=30
 
 # Warnings
-AWT.InconsistentDLLsWarning=Pode ser que as opera\u00E7\u00F5es baseadas em texto n\u00E3o funcionem corretamente devido a um conjunto incoerente de bibliotecas de vincula\u00E7\u00E3o din\u00E2mica (DLLs) instalado no seu sistema. Para obter mais informa\u00E7\u00F5es sobre este problema e uma solu\u00E7\u00E3o recomendada, consulte as Notas de Vers\u00E3o do Java(TM) 2 SDK, Standard Edition, em java.sun.com.
+AWT.InconsistentDLLsWarning=Pode ser que as operações baseadas em texto não funcionem corretamente devido a um conjunto incoerente de bibliotecas de vinculação dinâmica (DLLs) instalado no seu sistema. Para obter mais informações sobre este problema e uma solução recomendada, consulte as Notas de Versão do Java(TM) 2 SDK, Standard Edition, em java.sun.com.
 
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_sv.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_sv.properties
index 0edf21e3533..a81762fca64 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_sv.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_sv.properties
@@ -49,9 +49,9 @@ AWT.pgup=Sida upp
 AWT.pgdn=Sida ned
 AWT.end=End
 AWT.home=Hem
-AWT.left=V\u00E4nster
+AWT.left=Vänster
 AWT.up=Upp
-AWT.right=H\u00F6ger
+AWT.right=Höger
 AWT.down=Nedpil
 AWT.begin=Begin
 AWT.comma=Kommatecken
@@ -60,7 +60,7 @@ AWT.slash=Snedstreck
 AWT.semicolon=Semikolon
 AWT.equals=Lika med
 AWT.openBracket=Parentes
-AWT.backSlash=Omv\u00E4nt snedstreck
+AWT.backSlash=Omvänt snedstreck
 AWT.closeBracket=Hakparentes
 AWT.multiply=NUM *
 AWT.add=NUM +
@@ -96,12 +96,12 @@ AWT.f21=F21
 AWT.f22=F22
 AWT.f23=F23
 AWT.f24=F24
-AWT.printScreen=Sk\u00E4rmutskrift
+AWT.printScreen=Skärmutskrift
 AWT.insert=Insert
-AWT.help=Hj\u00E4lp
+AWT.help=Hjälp
 AWT.windows=Windows
 AWT.context=Snabbmeny
-AWT.backQuote=V\u00E4nster citattecken
+AWT.backQuote=Vänster citattecken
 AWT.quote=Citattecken
 AWT.deadGrave=Dead Grave
 AWT.deadAcute=Dead Acute
@@ -123,9 +123,9 @@ AWT.ampersand=Et-tecken
 AWT.asterisk=Asterisk
 AWT.quoteDbl=Dubbelt citattecken
 AWT.Less=Mindre
-AWT.greater=St\u00F6rre
-AWT.braceLeft=V\u00E4nster klammerparentes
-AWT.braceRight=H\u00F6ger klammerparentes
+AWT.greater=Större
+AWT.braceLeft=Vänster klammerparentes
+AWT.braceRight=Höger klammerparentes
 AWT.at=Vid
 AWT.colon=Kolon
 AWT.circumflex=Cirkumflex
@@ -133,17 +133,17 @@ AWT.dollar=Dollar
 AWT.euro=Euro
 AWT.exclamationMark=Utropstecken
 AWT.invertedExclamationMark=Inverterat utropstecken
-AWT.leftParenthesis=V\u00E4nsterparentes
+AWT.leftParenthesis=Vänsterparentes
 AWT.numberSign=Nummertecken
 AWT.plus=Plus
 AWT.minus=Minus
-AWT.rightParenthesis=H\u00F6gerparentes
+AWT.rightParenthesis=Högerparentes
 AWT.underscore=Understreck
 AWT.final=Slutlig
 AWT.convert=Konvertera
 AWT.noconvert=Ingen konvertering
 AWT.accept=Acceptera
-AWT.modechange=\u00C4ndring av l\u00E4ge
+AWT.modechange=Ändring av läge
 AWT.kana=Kana
 AWT.kanji=Kanji
 AWT.alphanumeric=Alfanumerisk
@@ -153,55 +153,55 @@ AWT.fullWidth=Full bredd
 AWT.halfWidth=Halv bredd
 AWT.romanCharacters=Latinska tecken
 AWT.allCandidates=Alla kandidater
-AWT.previousCandidate=F\u00F6reg\u00E5ende kandidat
+AWT.previousCandidate=Föregående kandidat
 AWT.codeInput=Kodindata
 AWT.japaneseKatakana=Japansk Katakana
 AWT.japaneseHiragana=Japansk Hiragana
 AWT.japaneseRoman=Japanska-latinska
-AWT.kanaLock=Kana-l\u00E5s
-AWT.inputMethodOnOff=Indatametod p\u00E5/av
+AWT.kanaLock=Kana-lås
+AWT.inputMethodOnOff=Indatametod på/av
 AWT.again=Upprepa
-AWT.undo=\u00C5ngra
+AWT.undo=Ångra
 AWT.copy=Kopiera
 AWT.paste=Klistra in
 AWT.cut=Klipp ut
-AWT.find=S\u00F6k
+AWT.find=Sök
 AWT.props=Egenskaper
 AWT.stop=Stopp
 AWT.compose=Skriv
 
 # Numeric Keypad
 AWT.numpad=NumPad
-AWT.unknown=Ok\u00E4nd
+AWT.unknown=Okänd
 AWT.undefined=Odefinierad
 
 # Predefined cursor names
-AWT.DefaultCursor=Standardmark\u00F6r
-AWT.CrosshairCursor=H\u00E5rkorsmark\u00F6r
-AWT.TextCursor=Textmark\u00F6r
-AWT.WaitCursor=V\u00E4ntemark\u00F6r
-AWT.SWResizeCursor=Mark\u00F6r f\u00F6r storleks\u00E4ndring (sydv\u00E4st)
-AWT.SEResizeCursor=Mark\u00F6r f\u00F6r storleks\u00E4ndring (sydost)
-AWT.NWResizeCursor=Mark\u00F6r f\u00F6r storleks\u00E4ndring (nordv\u00E4st)
-AWT.NEResizeCursor=Mark\u00F6r f\u00F6r storleks\u00E4ndring (nordost)
-AWT.NResizeCursor=Mark\u00F6r f\u00F6r storleks\u00E4ndring (nord)
-AWT.SResizeCursor=Mark\u00F6r f\u00F6r storleks\u00E4ndring (syd)
-AWT.WResizeCursor=Mark\u00F6r f\u00F6r storleks\u00E4ndring (v\u00E4st)
-AWT.EResizeCursor=Mark\u00F6r f\u00F6r storleks\u00E4ndring (\u00F6st)
-AWT.HandCursor=Handmark\u00F6r
-AWT.MoveCursor=Flyttmark\u00F6r
-AWT.DefaultDragCursor=Standarddragmark\u00F6r
-AWT.DefaultNoDropCursor=Standardmark\u00F6r (ej drag)
-AWT.DefaultDropCursor=Standardsl\u00E4ppmark\u00F6r
+AWT.DefaultCursor=Standardmarkör
+AWT.CrosshairCursor=Hårkorsmarkör
+AWT.TextCursor=Textmarkör
+AWT.WaitCursor=Väntemarkör
+AWT.SWResizeCursor=Markör för storleksändring (sydväst)
+AWT.SEResizeCursor=Markör för storleksändring (sydost)
+AWT.NWResizeCursor=Markör för storleksändring (nordväst)
+AWT.NEResizeCursor=Markör för storleksändring (nordost)
+AWT.NResizeCursor=Markör för storleksändring (nord)
+AWT.SResizeCursor=Markör för storleksändring (syd)
+AWT.WResizeCursor=Markör för storleksändring (väst)
+AWT.EResizeCursor=Markör för storleksändring (öst)
+AWT.HandCursor=Handmarkör
+AWT.MoveCursor=Flyttmarkör
+AWT.DefaultDragCursor=Standarddragmarkör
+AWT.DefaultNoDropCursor=Standardmarkör (ej drag)
+AWT.DefaultDropCursor=Standardsläppmarkör
 
 # Input method related strings
-AWT.CompositionWindowTitle=Inmatningsf\u00F6nster
-AWT.InputMethodSelectionMenu=V\u00E4lj inmatningsmetod
+AWT.CompositionWindowTitle=Inmatningsfönster
+AWT.InputMethodSelectionMenu=Välj inmatningsmetod
 AWT.HostInputMethodDisplayName=Systeminmatningsmetoder
 AWT.InputMethodLanguage.ja=Japanska
 AWT.InputMethodLanguage.ko=Koreanska
 AWT.InputMethodLanguage.zh=Kinesiska
-AWT.InputMethodLanguage.zh_CN=F\u00F6renklad kinesiska
+AWT.InputMethodLanguage.zh_CN=Förenklad kinesiska
 AWT.InputMethodLanguage.zh_TW=Traditionell kinesiska
 AWT.InputMethodCreationFailed=Kan inte skapa {0}.  Orsak: {1}
 
@@ -209,9 +209,9 @@ AWT.InputMethodCreationFailed=Kan inte skapa {0}.  Orsak: {1}
 # composition with input methods. Valid values:
 # "on-the-spot", "below-the-spot".
 # May be overridden from command line.
-java.awt.im.style=p\u00E5 st\u00E4llet
+java.awt.im.style=på stället
 java.awt.def.delay=30
 
 # Warnings
-AWT.InconsistentDLLsWarning=Textbaserade \u00E5tg\u00E4rder kanske inte fungerar korrekt p\u00E5 grund av en inkonsekvent upps\u00E4ttning dynamiskt l\u00E4nkade bibliotek (DLL) som \u00E4r installerade i systemet. F\u00F6r mer information om detta problem och en tillf\u00E4llig l\u00F6sning, se Java(TM) 2 SDK, Standard Edition Release Notes p\u00E5 java.sun.com.
+AWT.InconsistentDLLsWarning=Textbaserade åtgärder kanske inte fungerar korrekt på grund av en inkonsekvent uppsättning dynamiskt länkade bibliotek (DLL) som är installerade i systemet. För mer information om detta problem och en tillfällig lösning, se Java(TM) 2 SDK, Standard Edition Release Notes på java.sun.com.
 
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_zh_CN.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_zh_CN.properties
index d89c7f66748..8880e2be518 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_zh_CN.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_zh_CN.properties
@@ -44,24 +44,24 @@ AWT.clear=Clear
 AWT.pause=Pause
 AWT.capsLock=Caps Lock
 AWT.escape=Esc
-AWT.space=\u7A7A\u683C
+AWT.space=空格
 AWT.pgup=Page Up
 AWT.pgdn=Page Down
 AWT.end=End
 AWT.home=Home
-AWT.left=\u5411\u5DE6\u7BAD\u5934
-AWT.up=\u5411\u4E0A\u7BAD\u5934
-AWT.right=\u5411\u53F3\u7BAD\u5934
-AWT.down=\u5411\u4E0B\u7BAD\u5934
-AWT.begin=\u5F00\u59CB
-AWT.comma=\u9017\u53F7
-AWT.period=\u53E5\u70B9
-AWT.slash=\u659C\u6760
-AWT.semicolon=\u5206\u53F7
-AWT.equals=\u7B49\u53F7
-AWT.openBracket=\u5DE6\u65B9\u62EC\u53F7
-AWT.backSlash=\u53CD\u659C\u6760
-AWT.closeBracket=\u53F3\u65B9\u62EC\u53F7
+AWT.left=向左箭头
+AWT.up=向上箭头
+AWT.right=向右箭头
+AWT.down=向下箭头
+AWT.begin=开始
+AWT.comma=逗号
+AWT.period=句点
+AWT.slash=斜杠
+AWT.semicolon=分号
+AWT.equals=等号
+AWT.openBracket=左方括号
+AWT.backSlash=反斜杠
+AWT.closeBracket=右方括号
 AWT.multiply=NumPad *
 AWT.add=NumPad +
 AWT.separator=NumPad ,
@@ -98,112 +98,112 @@ AWT.f23=F23
 AWT.f24=F24
 AWT.printScreen=Print Screen
 AWT.insert=Insert
-AWT.help=\u5E2E\u52A9
+AWT.help=帮助
 AWT.windows=Windows
-AWT.context=\u4E0A\u4E0B\u6587\u83DC\u5355
-AWT.backQuote=\u540E\u5F15\u53F7
-AWT.quote=\u5F15\u53F7
-AWT.deadGrave=\u6291\u97F3\u7B26\u53F7
-AWT.deadAcute=\u5E26\u5C16\u97F3\u7B26\u53F7
-AWT.deadCircumflex=\u5E26\u6291\u626C\u7B26\u53F7
-AWT.deadTilde=\u816D\u5316\u7B26\u53F7
-AWT.deadMacron=\u957F\u97F3\u7B26\u53F7
-AWT.deadBreve=\u77ED\u97F3\u7B26\u53F7
-AWT.deadAboveDot=\u4E0A\u6807\u70B9
-AWT.deadDiaeresis=\u5206\u97F3\u7B26\u53F7
-AWT.deadAboveRing=\u4E0A\u6807\u5706\u5708
-AWT.deadDoubleAcute=\u53CC\u5C16\u97F3\u7B26\u53F7
-AWT.deadCaron=\u5012\u7F6E\u97F3\u8C03\u7B26\u53F7
-AWT.deadCedilla=\u53D8\u97F3\u7B26\u53F7
-AWT.deadOgonek=\u53CD\u5C3E\u5F62\u7B26
-AWT.deadIota=\u963F\u5C14\u5854\u7B26\u53F7
-AWT.deadVoicedSound=\u6D4A\u97F3\u7B26\u53F7
-AWT.deadSemivoicedSound=\u534A\u6D4A\u97F3\u7B26\u53F7
-AWT.ampersand=& \u7B26\u53F7
-AWT.asterisk=\u661F\u53F7
-AWT.quoteDbl=\u53CC\u5F15\u53F7
-AWT.Less=\u5C0F\u4E8E\u53F7
-AWT.greater=\u5927\u4E8E\u53F7
-AWT.braceLeft=\u5DE6\u82B1\u62EC\u53F7
-AWT.braceRight=\u53F3\u82B1\u62EC\u53F7
-AWT.at=@ \u7B26\u53F7
-AWT.colon=\u5192\u53F7
-AWT.circumflex=\u6291\u626C\u7B26\u53F7
-AWT.dollar=\u7F8E\u5143
-AWT.euro=\u6B27\u5143
-AWT.exclamationMark=\u611F\u53F9\u53F7
-AWT.invertedExclamationMark=\u5012\u7F6E\u611F\u53F9\u53F7
-AWT.leftParenthesis=\u5DE6\u62EC\u53F7
-AWT.numberSign=\u4E95\u53F7
-AWT.plus=\u52A0\u53F7
-AWT.minus=\u51CF\u53F7
-AWT.rightParenthesis=\u53F3\u62EC\u53F7
-AWT.underscore=\u4E0B\u5212\u7EBF
-AWT.final=\u6700\u7EC8
-AWT.convert=\u8F6C\u6362
-AWT.noconvert=\u4E0D\u8F6C\u6362
-AWT.accept=\u63A5\u53D7
-AWT.modechange=\u6A21\u5F0F\u66F4\u6539
-AWT.kana=\u5047\u540D
-AWT.kanji=\u65E5\u672C\u6C49\u5B57
-AWT.alphanumeric=\u5B57\u6BCD\u6570\u5B57
-AWT.katakana=\u7247\u5047\u540D
-AWT.hiragana=\u5E73\u5047\u540D
-AWT.fullWidth=\u5168\u89D2
-AWT.halfWidth=\u534A\u89D2
-AWT.romanCharacters=\u7F57\u9A6C\u5B57\u7B26
-AWT.allCandidates=\u6240\u6709\u5019\u9009\u9879
-AWT.previousCandidate=\u4E0A\u4E00\u4E2A\u5019\u9009\u9879
-AWT.codeInput=\u4EE3\u7801\u8F93\u5165
-AWT.japaneseKatakana=\u65E5\u8BED\u7247\u5047\u540D
-AWT.japaneseHiragana=\u65E5\u8BED\u5E73\u5047\u540D
-AWT.japaneseRoman=\u65E5\u8BED\u7F57\u9A6C\u5B57\u7B26
+AWT.context=上下文菜单
+AWT.backQuote=后引号
+AWT.quote=引号
+AWT.deadGrave=抑音符号
+AWT.deadAcute=带尖音符号
+AWT.deadCircumflex=带抑扬符号
+AWT.deadTilde=腭化符号
+AWT.deadMacron=长音符号
+AWT.deadBreve=短音符号
+AWT.deadAboveDot=上标点
+AWT.deadDiaeresis=分音符号
+AWT.deadAboveRing=上标圆圈
+AWT.deadDoubleAcute=双尖音符号
+AWT.deadCaron=倒置音调符号
+AWT.deadCedilla=变音符号
+AWT.deadOgonek=反尾形符
+AWT.deadIota=阿尔塔符号
+AWT.deadVoicedSound=浊音符号
+AWT.deadSemivoicedSound=半浊音符号
+AWT.ampersand=& 符号
+AWT.asterisk=星号
+AWT.quoteDbl=双引号
+AWT.Less=小于号
+AWT.greater=大于号
+AWT.braceLeft=左花括号
+AWT.braceRight=右花括号
+AWT.at=@ 符号
+AWT.colon=冒号
+AWT.circumflex=抑扬符号
+AWT.dollar=美元
+AWT.euro=欧元
+AWT.exclamationMark=感叹号
+AWT.invertedExclamationMark=倒置感叹号
+AWT.leftParenthesis=左括号
+AWT.numberSign=井号
+AWT.plus=加号
+AWT.minus=减号
+AWT.rightParenthesis=右括号
+AWT.underscore=下划线
+AWT.final=最终
+AWT.convert=转换
+AWT.noconvert=不转换
+AWT.accept=接受
+AWT.modechange=模式更改
+AWT.kana=假名
+AWT.kanji=日本汉字
+AWT.alphanumeric=字母数字
+AWT.katakana=片假名
+AWT.hiragana=平假名
+AWT.fullWidth=全角
+AWT.halfWidth=半角
+AWT.romanCharacters=罗马字符
+AWT.allCandidates=所有候选项
+AWT.previousCandidate=上一个候选项
+AWT.codeInput=代码输入
+AWT.japaneseKatakana=日语片假名
+AWT.japaneseHiragana=日语平假名
+AWT.japaneseRoman=日语罗马字符
 AWT.kanaLock=Kana Lock
-AWT.inputMethodOnOff=\u6253\u5F00/\u5173\u95ED\u8F93\u5165\u65B9\u6CD5
-AWT.again=\u91CD\u65B0
-AWT.undo=\u64A4\u6D88
-AWT.copy=\u590D\u5236
-AWT.paste=\u7C98\u8D34
-AWT.cut=\u526A\u5207
-AWT.find=\u67E5\u627E
-AWT.props=\u5C0F\u9053\u5177
-AWT.stop=\u505C\u6B62
-AWT.compose=\u7F16\u5199
+AWT.inputMethodOnOff=打开/关闭输入方法
+AWT.again=重新
+AWT.undo=撤消
+AWT.copy=复制
+AWT.paste=粘贴
+AWT.cut=剪切
+AWT.find=查找
+AWT.props=小道具
+AWT.stop=停止
+AWT.compose=编写
 
 # Numeric Keypad
 AWT.numpad=NumPad
-AWT.unknown=\u672A\u77E5
-AWT.undefined=\u672A\u5B9A\u4E49
+AWT.unknown=未知
+AWT.undefined=未定义
 
 # Predefined cursor names
-AWT.DefaultCursor=\u9ED8\u8BA4\u5149\u6807
-AWT.CrosshairCursor=\u5341\u5B57\u5149\u6807
-AWT.TextCursor=\u6587\u672C\u5149\u6807
-AWT.WaitCursor=\u6C99\u6F0F\u5149\u6807
-AWT.SWResizeCursor=\u201C\u5411\u897F\u5357\u65B9\u5411\u8C03\u6574\u5927\u5C0F\u201D\u5149\u6807
-AWT.SEResizeCursor=\u201C\u5411\u4E1C\u5357\u65B9\u5411\u8C03\u6574\u5927\u5C0F\u201D\u5149\u6807
-AWT.NWResizeCursor=\u201C\u5411\u897F\u5317\u65B9\u5411\u8C03\u6574\u5927\u5C0F\u201D\u5149\u6807
-AWT.NEResizeCursor=\u201C\u5411\u4E1C\u5317\u65B9\u5411\u8C03\u6574\u5927\u5C0F\u201D\u5149\u6807
-AWT.NResizeCursor=\u201C\u5411\u5317\u8C03\u6574\u5927\u5C0F\u201D\u5149\u6807
-AWT.SResizeCursor=\u201C\u5411\u5357\u8C03\u6574\u5927\u5C0F\u201D\u5149\u6807
-AWT.WResizeCursor=\u201C\u5411\u897F\u8C03\u6574\u5927\u5C0F\u201D\u5149\u6807
-AWT.EResizeCursor=\u201C\u5411\u4E1C\u8C03\u6574\u5927\u5C0F\u201D\u5149\u6807
-AWT.HandCursor=\u624B\u578B\u5149\u6807
-AWT.MoveCursor=\u79FB\u52A8\u5149\u6807
-AWT.DefaultDragCursor=\u9ED8\u8BA4\u62D6\u52A8\u5149\u6807
-AWT.DefaultNoDropCursor=\u9ED8\u8BA4\u65E0\u62D6\u52A8\u5149\u6807
-AWT.DefaultDropCursor=\u9ED8\u8BA4\u653E\u7F6E\u5149\u6807
+AWT.DefaultCursor=默认光标
+AWT.CrosshairCursor=十字光标
+AWT.TextCursor=文本光标
+AWT.WaitCursor=沙漏光标
+AWT.SWResizeCursor=“向西南方向调整大小”光标
+AWT.SEResizeCursor=“向东南方向调整大小”光标
+AWT.NWResizeCursor=“向西北方向调整大小”光标
+AWT.NEResizeCursor=“向东北方向调整大小”光标
+AWT.NResizeCursor=“向北调整大小”光标
+AWT.SResizeCursor=“向南调整大小”光标
+AWT.WResizeCursor=“向西调整大小”光标
+AWT.EResizeCursor=“向东调整大小”光标
+AWT.HandCursor=手型光标
+AWT.MoveCursor=移动光标
+AWT.DefaultDragCursor=默认拖动光标
+AWT.DefaultNoDropCursor=默认无拖动光标
+AWT.DefaultDropCursor=默认放置光标
 
 # Input method related strings
-AWT.CompositionWindowTitle=\u8F93\u5165\u7A97\u53E3
-AWT.InputMethodSelectionMenu=\u9009\u62E9\u8F93\u5165\u7A97\u53E3
-AWT.HostInputMethodDisplayName=\u7CFB\u7EDF\u8F93\u5165\u6CD5
-AWT.InputMethodLanguage.ja=\u65E5\u6587
-AWT.InputMethodLanguage.ko=\u671D\u9C9C\u6587
-AWT.InputMethodLanguage.zh=\u4E2D\u6587
-AWT.InputMethodLanguage.zh_CN=\u7B80\u4F53\u4E2D\u6587
-AWT.InputMethodLanguage.zh_TW=\u7E41\u4F53\u4E2D\u6587
-AWT.InputMethodCreationFailed=\u65E0\u6CD5\u521B\u5EFA{0}\u3002\u539F\u56E0: {1}
+AWT.CompositionWindowTitle=输入窗口
+AWT.InputMethodSelectionMenu=选择输入窗口
+AWT.HostInputMethodDisplayName=系统输入法
+AWT.InputMethodLanguage.ja=日文
+AWT.InputMethodLanguage.ko=朝鲜文
+AWT.InputMethodLanguage.zh=中文
+AWT.InputMethodLanguage.zh_CN=简体中文
+AWT.InputMethodLanguage.zh_TW=繁体中文
+AWT.InputMethodCreationFailed=无法创建{0}。原因: {1}
 
 # Property to select between on-the-spot and below-the-spot
 # composition with input methods. Valid values:
@@ -213,5 +213,5 @@ java.awt.im.style=on-the-spot
 java.awt.def.delay=30
 
 # Warnings
-AWT.InconsistentDLLsWarning=\u57FA\u4E8E\u6587\u672C\u7684\u64CD\u4F5C\u53EF\u80FD\u4E0D\u80FD\u6B63\u5E38\u8FD0\u884C, \u56E0\u4E3A\u7CFB\u7EDF\u4E0A\u5B89\u88C5\u4E86\u4E00\u5957\u4E0D\u4E00\u81F4\u7684\u52A8\u6001\u94FE\u63A5\u5E93 (DLL)\u3002\u6709\u5173\u6B64\u95EE\u9898\u7684\u8BE6\u7EC6\u4FE1\u606F\u548C\u5EFA\u8BAE\u7684\u89E3\u51B3\u65B9\u6848, \u8BF7\u53C2\u9605 java.sun.com \u7F51\u7AD9\u4E0A\u7684 Java(TM) 2 SDK, \u6807\u51C6\u7248\u53D1\u884C\u8BF4\u660E\u3002
+AWT.InconsistentDLLsWarning=基于文本的操作可能不能正常运行, 因为系统上安装了一套不一致的动态链接库 (DLL)。有关此问题的详细信息和建议的解决方案, 请参阅 java.sun.com 网站上的 Java(TM) 2 SDK, 标准版发行说明。
 
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_zh_TW.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_zh_TW.properties
index b67932ac540..223195927cd 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_zh_TW.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_zh_TW.properties
@@ -195,15 +195,15 @@ AWT.DefaultNoDropCursor=Default NoDrag Cursor
 AWT.DefaultDropCursor=Default Drop Cursor
 
 # Input method related strings
-AWT.CompositionWindowTitle=\u8F38\u5165\u8996\u7A97
-AWT.InputMethodSelectionMenu=\u9078\u64C7\u8F38\u5165\u6CD5
-AWT.HostInputMethodDisplayName=\u7CFB\u7D71\u8F38\u5165\u6CD5
-AWT.InputMethodLanguage.ja=\u65E5\u6587
-AWT.InputMethodLanguage.ko=\u97D3\u6587
-AWT.InputMethodLanguage.zh=\u4E2D\u6587
-AWT.InputMethodLanguage.zh_CN=\u7C21\u9AD4\u4E2D\u6587
-AWT.InputMethodLanguage.zh_TW=\u7E41\u9AD4\u4E2D\u6587
-AWT.InputMethodCreationFailed=\u7121\u6CD5\u5EFA\u7ACB {0}\u3002\u539F\u56E0: {1}
+AWT.CompositionWindowTitle=輸入視窗
+AWT.InputMethodSelectionMenu=選擇輸入法
+AWT.HostInputMethodDisplayName=系統輸入法
+AWT.InputMethodLanguage.ja=日文
+AWT.InputMethodLanguage.ko=韓文
+AWT.InputMethodLanguage.zh=中文
+AWT.InputMethodLanguage.zh_CN=簡體中文
+AWT.InputMethodLanguage.zh_TW=繁體中文
+AWT.InputMethodCreationFailed=無法建立 {0}。原因: {1}
 
 # Property to select between on-the-spot and below-the-spot
 # composition with input methods. Valid values:
@@ -213,5 +213,5 @@ java.awt.im.style=on-the-spot
 java.awt.def.delay=30
 
 # Warnings
-AWT.InconsistentDLLsWarning=\u4EE5\u6587\u5B57\u70BA\u57FA\u790E\u7684\u4F5C\u696D\u53EF\u80FD\u7121\u6CD5\u6B63\u78BA\u904B\u4F5C\uFF0C\u56E0\u70BA\u60A8\u7CFB\u7D71\u4E0A\u6709\u4E00\u7D44\u52D5\u614B\u9023\u7D50\u7A0B\u5F0F\u5EAB (DLL) \u4E0D\u4E00\u81F4\u3002\u82E5\u8981\u53D6\u5F97\u6709\u95DC\u6B64\u554F\u984C\u53CA\u5EFA\u8B70\u89E3\u6C7A\u65B9\u6CD5\u7684\u5176\u4ED6\u8CC7\u8A0A\uFF0C\u8ACB\u53C3\u95B1 java.sun.com \u7DB2\u7AD9\u4E0A\u7684 Java(TM) 2 SDK, Standard Edition Release Notes
+AWT.InconsistentDLLsWarning=以文字為基礎的作業可能無法正確運作，因為您系統上有一組動態連結程式庫 (DLL) 不一致。若要取得有關此問題及建議解決方法的其他資訊，請參閱 java.sun.com 網站上的 Java(TM) 2 SDK, Standard Edition Release Notes
 
diff --git a/src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties
index 6478a753fb3..72e73ad4735 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties
@@ -32,9 +32,9 @@ border.media=Medien
 border.orientation=Ausrichtung
 border.printrange=Druckbereich
 border.printservice=Druckservice
-border.quality=Qualit\u00E4t
+border.quality=Qualität
 border.sides=Seiten
-border.margins=R\u00E4nder
+border.margins=Ränder
 #
 button.cancel=Abbrechen
 button.ok=OK
@@ -47,20 +47,20 @@ checkbox.printtofile=Aus&gabe in Datei
 #
 dialog.printtitle=Drucken
 dialog.pstitle=Seite einrichten
-dialog.overwrite=Diese Datei ist bereits vorhanden. M\u00F6chten Sie die vorhandene Datei \u00FCberschreiben?
+dialog.overwrite=Diese Datei ist bereits vorhanden. Möchten Sie die vorhandene Datei überschreiben?
 dialog.owtitle=In Datei drucken
 dialog.printtofile=In Datei drucken
 dialog.noprintermsg=Kein Druckservice gefunden.
-dialog.writeerror=Schreiben in Datei nicht m\u00F6glich:
+dialog.writeerror=Schreiben in Datei nicht möglich:
 #
 label.info=Info:
 label.jobname=&Jobname:
 label.numcopies=Anzahl &Kopien:
-label.priority=P&riorit\u00E4t:
+label.priority=P&riorität:
 label.psname=&Name:
 label.pstype=Typ:
 label.rangeto=Bis
-label.size=G&r\u00F6\u00DFe:
+label.size=G&röße:
 label.source=&Quelle:
 label.status=Status:
 label.username=&Benutzername:
@@ -91,8 +91,8 @@ tab.appearance=&Darstellung
 tab.general=&Allgemein
 tab.pagesetup=Seite &einrichten
 #
-error.pagerange=Ung\u00FCltiger Seitenbereich. Geben Sie die Werte erneut ein (Beispiel: 1-3,5,7-10)
-error.destination=Ung\u00FCltiger Dateiname. Wiederholen Sie den Vorgang
+error.pagerange=Ungültiger Seitenbereich. Geben Sie die Werte erneut ein (Beispiel: 1-3,5,7-10)
+error.destination=Ungültiger Dateiname. Wiederholen Sie den Vorgang
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
 # (in some cases the space character is replaced by '-' and the pound
@@ -164,7 +164,7 @@ italian-envelope=Italy-Umschlag
 italy-envelope=Italy-Umschlag
 invite-envelope=Einladungsumschlag
 monarch-envelope=Monarch-Umschlag
-personal-envelope=Pers\u00F6nlicher Umschlag
+personal-envelope=Persönlicher Umschlag
 na-number-9-envelope=Umschlag Nr. 9
 na-number-10-envelope=Umschlag Nr. 10
 na-number-11-envelope=Umschlag Nr. 11
@@ -188,15 +188,15 @@ middle=Mitte
 bottom=Unten
 envelope=Umschlag
 manual=Manuell
-large-capacity=Hohe Kapazit\u00E4t
+large-capacity=Hohe Kapazität
 main=Haupt
 side=Seite
 # Add the additional standard bins defined by win32
-Manual-Envelope=Manuelle Umschlagzuf\u00FChrung
-Automatic-Feeder=Automatische Zuf\u00FChrung
+Manual-Envelope=Manuelle Umschlagzuführung
+Automatic-Feeder=Automatische Zuführung
 Tractor-Feeder=Endlospapiereinzug
 Small-Format=Kleinformat
-Large-Format=Gro\u00DFformat
+Large-Format=Großformat
 Cassette=Kassette
 Form-Source=Formularquelle
 #
diff --git a/src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties
index 51f3e3b5511..0b229790165 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties
@@ -29,12 +29,12 @@ border.chromaticity=Apariencia del Color
 border.copies=Copias
 border.jobattributes=Atributos del Trabajo
 border.media=Soporte
-border.orientation=Orientaci\u00F3n
-border.printrange=Rango de Impresi\u00F3n
-border.printservice=Servicio de Impresi\u00F3n
+border.orientation=Orientación
+border.printrange=Rango de Impresión
+border.printservice=Servicio de Impresión
 border.quality=Calidad
 border.sides=Caras
-border.margins=M\u00E1rgenes
+border.margins=Márgenes
 #
 button.cancel=Cancelar
 button.ok=Aceptar
@@ -42,25 +42,25 @@ button.print=Imprimir
 button.properties=P&ropiedades...
 #
 checkbox.collate=Inter&calar
-checkbox.jobsheets=P\u00E1gina de R\u00F3tu&lo
+checkbox.jobsheets=Página de Rótu&lo
 checkbox.printtofile=I&mprimir en Archivo
 #
 dialog.printtitle=Imprimir
-dialog.pstitle=Preparar P\u00E1gina
-dialog.overwrite=Este archivo ya existe. \u00BFDesea sobrescribirlo?
+dialog.pstitle=Preparar Página
+dialog.overwrite=Este archivo ya existe. ¿Desea sobrescribirlo?
 dialog.owtitle=Imprimir en Archivo
 dialog.printtofile=Imprimir en Archivo
-dialog.noprintermsg=No se ha encontrado el servicio de impresi\u00F3n.
+dialog.noprintermsg=No se ha encontrado el servicio de impresión.
 dialog.writeerror=No se puede escribir en el archivo:
 #
-label.info=Informaci\u00F3n:
+label.info=Información:
 label.jobname=&Nombre del Trabajo:
-label.numcopies=N\u00FAmero de C&opias:
+label.numcopies=Número de C&opias:
 label.priority=Prior&idad:
 label.psname=&Nombre:
 label.pstype=Tipo:
 label.rangeto=A
-label.size=Tama&\u00F1o:
+label.size=Tama&ño:
 label.source=Orig&en:
 label.status=Estado:
 label.username=&Usuario:
@@ -73,7 +73,7 @@ label.rightmargin=d&erecho
 #
 radiobutton.color=&Color
 radiobutton.draftq=B&orrador
-radiobutton.duplex=&D\u00FAplex
+radiobutton.duplex=&Dúplex
 radiobutton.highq=Al&ta
 radiobutton.landscape=Hori&zontal
 radiobutton.monochrome=&Monocromo
@@ -81,7 +81,7 @@ radiobutton.normalq=&Normal
 radiobutton.oneside=Una Ca&ra
 radiobutton.portrait=&Vertical
 radiobutton.rangeall=&Todo
-radiobutton.rangepages=P\u00E1gina&s
+radiobutton.rangepages=Página&s
 radiobutton.revlandscape=&Horizontal Inverso
 radiobutton.revportrait=Vertical I&nverso
 radiobutton.tumble=Cam&bio de Cara
@@ -89,10 +89,10 @@ radiobutton.tumble=Cam&bio de Cara
 # 65 = KeyEvent.VK_A
 tab.appearance=&Apariencia
 tab.general=&General
-tab.pagesetup=&Preparar P\u00E1gina
+tab.pagesetup=&Preparar Página
 #
-error.pagerange=Rango de p\u00E1ginas no v\u00E1lido; vuelva a introducir los valores (por ejemplo, 1-3, 5, 7-10)
-error.destination=Nombre de archivo no v\u00E1lido; int\u00E9ntelo de nuevo
+error.pagerange=Rango de páginas no válido; vuelva a introducir los valores (por ejemplo, 1-3, 5, 7-10)
+error.destination=Nombre de archivo no válido; inténtelo de nuevo
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
 # (in some cases the space character is replaced by '-' and the pound
@@ -154,22 +154,22 @@ folio=Folio
 quarto=Cuarto
 japanese-postcard=Postal (JIS)
 oufuko-postcard=Postal Doble (JIS)
-a=Ingenier\u00EDa A
-b=Ingenier\u00EDa B
-c=Ingenier\u00EDa C
-d=Ingenier\u00EDa D
-e=Ingenier\u00EDa E
+a=Ingeniería A
+b=Ingeniería B
+c=Ingeniería C
+d=Ingeniería D
+e=Ingeniería E
 iso-designated-long=Largo Designado ISO
 italian-envelope=Sobre Italiano
 italy-envelope=Sobre Italiano
-invite-envelope=Sobre de Invitaci\u00F3n
+invite-envelope=Sobre de Invitación
 monarch-envelope=Sobre Monarch
 personal-envelope=Sobre Personal
-na-number-9-envelope=Sobre N\u00BA 9
-na-number-10-envelope=Sobre N\u00BA 10
-na-number-11-envelope=Sobre N\u00BA 11
-na-number-12-envelope=Sobre N\u00BA 12
-na-number-14-envelope=Sobre N\u00BA 14
+na-number-9-envelope=Sobre Nº 9
+na-number-10-envelope=Sobre Nº 10
+na-number-11-envelope=Sobre Nº 11
+na-number-12-envelope=Sobre Nº 12
+na-number-14-envelope=Sobre Nº 14
 na-6x9-envelope=Sobre 6x9
 na-7x9-envelope=Sobre 6x7
 na-9x11-envelope=Sobre 9x11
@@ -182,7 +182,7 @@ na-8x10=Papel 8" x 10"
 #
 # The following keys match the Strings returned by MediaTray.toString()
 #
-auto-select=Seleccionar Autom\u00E1ticamente
+auto-select=Seleccionar Automáticamente
 top=Arriba
 middle=Centro
 bottom=Abajo
@@ -193,9 +193,9 @@ main=Principal
 side=Cara
 # Add the additional standard bins defined by win32
 Manual-Envelope=Sobre Manual
-Automatic-Feeder=Alimentador Autom\u00E1tico
+Automatic-Feeder=Alimentador Automático
 Tractor-Feeder=Alimentador de Arrastre
-Small-Format=Formato Peque\u00F1o
+Small-Format=Formato Pequeño
 Large-Format=Formato Grande
 Cassette=Casete
 Form-Source=Origen de Formulario
diff --git a/src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties
index b9982e09ef3..3a77589e8b3 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties
@@ -27,36 +27,36 @@
 #
 border.chromaticity=Couleur
 border.copies=Copies
-border.jobattributes=Attributs de t\u00E2che
+border.jobattributes=Attributs de tâche
 border.media=Support
 border.orientation=Orientation
 border.printrange=Plage d'impression
 border.printservice=Service d'impression
-border.quality=Qualit\u00E9
-border.sides=C\u00F4t\u00E9s
+border.quality=Qualité
+border.sides=Côtés
 border.margins=Marges
 #
 button.cancel=Annuler
 button.ok=OK
 button.print=Imprimer
-button.properties=P&ropri\u00E9t\u00E9s...
+button.properties=P&ropriétés...
 #
 checkbox.collate=&Collationner
-checkbox.jobsheets=Page de &banni\u00E8re
+checkbox.jobsheets=Page de &bannière
 checkbox.printtofile=Imprimer dans un &fichier
 #
 dialog.printtitle=Imprimer
 dialog.pstitle=Mise en page
-dialog.overwrite=Ce fichier existe d\u00E9j\u00E0. Remplacer le fichier existant ?
+dialog.overwrite=Ce fichier existe déjà. Remplacer le fichier existant ?
 dialog.owtitle=Imprimer dans un fichier
 dialog.printtofile=Imprimer dans un fichier
 dialog.noprintermsg=Service d'impression introuvable.
-dialog.writeerror=Impossible d'\u00E9crire dans le fichier :
+dialog.writeerror=Impossible d'écrire dans le fichier :
 #
 label.info=Infos :
 label.jobname=Nom du tra&vail :
 label.numcopies=Nombre de c&opies :
-label.priority=P&riorit\u00E9 :
+label.priority=P&riorité :
 label.psname=&Nom :
 label.pstype=Type :
 label.rangeto=A
@@ -78,20 +78,20 @@ radiobutton.highq=Ma&x.
 radiobutton.landscape=Pa&ysage
 radiobutton.monochrome=Monoc&hrome
 radiobutton.normalq=&Normal
-radiobutton.oneside=Un &c\u00F4t\u00E9
+radiobutton.oneside=Un &côté
 radiobutton.portrait=&Portrait
 radiobutton.rangeall=&Tout
 radiobutton.rangepages=Pag&es
-radiobutton.revlandscape=Paysage i&nvers\u00E9
-radiobutton.revportrait=Portrait &invers\u00E9
-radiobutton.tumble=&T\u00EAte-b\u00EAche
+radiobutton.revlandscape=Paysage i&nversé
+radiobutton.revportrait=Portrait &inversé
+radiobutton.tumble=&Tête-bêche
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
 tab.appearance=&Apparence
-tab.general=&G\u00E9n\u00E9ral
+tab.general=&Général
 tab.pagesetup=&Mise en page
 #
-error.pagerange=Plage de pages non valide. Sp\u00E9cifiez les valeurs de nouveau (ex. : 1-3,5,7-10)
+error.pagerange=Plage de pages non valide. Spécifiez les valeurs de nouveau (ex. : 1-3,5,7-10)
 error.destination=Nom de fichier non valide ; recommencez
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
@@ -145,31 +145,31 @@ iso-c8=C8 (ISO/DIN)
 iso-c9=C9 (ISO/DIN)
 iso-c10=C10 (ISO/DIN)
 na-letter=Lettre
-na-legal=L\u00E9gal
+na-legal=Légal
 executive=Administratif
 ledger=Fiche
-tabloid=Tablo\u00EFd
+tabloid=Tabloïd
 invoice=Facture
 folio=Folio
 quarto=Quarto
 japanese-postcard=Carte postale (JIS)
 oufuko-postcard=Carte postale double (JIS)
-a=Ing\u00E9nierie A
-b=Ing\u00E9nierie B
-c=Ing\u00E9nierie C
-d=Ing\u00E9nierie D
-e=Ing\u00E9nierie E
+a=Ingénierie A
+b=Ingénierie B
+c=Ingénierie C
+d=Ingénierie D
+e=Ingénierie E
 iso-designated-long=Long ISO
 italian-envelope=Enveloppe Italie
 italy-envelope=Enveloppe Italie
 invite-envelope=Enveloppe invitation
 monarch-envelope=Enveloppe Monarch
 personal-envelope=Enveloppe personnelle
-na-number-9-envelope=Enveloppe n\u00B09
-na-number-10-envelope=Enveloppe n\u00B010
-na-number-11-envelope=Enveloppe n\u00B011
-na-number-12-envelope=Enveloppe n\u00B012
-na-number-14-envelope=Enveloppe n\u00B014
+na-number-9-envelope=Enveloppe n°9
+na-number-10-envelope=Enveloppe n°10
+na-number-11-envelope=Enveloppe n°11
+na-number-12-envelope=Enveloppe n°12
+na-number-14-envelope=Enveloppe n°14
 na-6x9-envelope=Enveloppe 6x9
 na-7x9-envelope=Enveloppe 6x7
 na-9x11-envelope=Enveloppe 9x11
@@ -182,15 +182,15 @@ na-8x10=Papier 8x10 po
 #
 # The following keys match the Strings returned by MediaTray.toString()
 #
-auto-select=S\u00E9lection automatique
+auto-select=Sélection automatique
 top=Haut
 middle=Centre
 bottom=Bas
 envelope=Enveloppe
 manual=Manuel
-large-capacity=Grande capacit\u00E9
+large-capacity=Grande capacité
 main=Principal
-side=C\u00F4t\u00E9
+side=Côté
 # Add the additional standard bins defined by win32
 Manual-Envelope=Enveloppe (manuel)
 Automatic-Feeder=Alimentation automatique
@@ -203,5 +203,5 @@ Form-Source=Source du formulaire
 # The following keys match the Strings returned by
 # PrinterIsAcceptingJobs.toString()
 #
-accepting-jobs=Acceptation des t\u00E2ches
-not-accepting-jobs=Refus des t\u00E2ches
+accepting-jobs=Acceptation des tâches
+not-accepting-jobs=Refus des tâches
diff --git a/src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties
index 83a49139a70..2f029b7bfc9 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties
@@ -32,14 +32,14 @@ border.media=Supporti
 border.orientation=Orientamento
 border.printrange=Intervallo di stampa
 border.printservice=Servizio di stampa
-border.quality=Qualit\u00E0
+border.quality=Qualità
 border.sides=Lati
 border.margins=Margini
 #
 button.cancel=Annulla
 button.ok=OK
 button.print=Stampa
-button.properties=P&ropriet\u00E0...
+button.properties=P&roprietà...
 #
 checkbox.collate=Fascico&la
 checkbox.jobsheets=Pagina &banner
@@ -47,7 +47,7 @@ checkbox.printtofile=Stampa su &file
 #
 dialog.printtitle=Stampa
 dialog.pstitle=Imposta pagina
-dialog.overwrite=Il file esiste gi\u00E0. Sovrascrivere il file esistente?
+dialog.overwrite=Il file esiste già. Sovrascrivere il file esistente?
 dialog.owtitle=Stampa su file
 dialog.printtofile=Stampa su file
 dialog.noprintermsg=Nessun servizio di stampa trovato
@@ -56,7 +56,7 @@ dialog.writeerror=Impossibile scrivere nel file:
 label.info=Informazioni:
 label.jobname=Nome &job:
 label.numcopies=Numero di c&opie:
-label.priority=P&riorit\u00E0:
+label.priority=P&riorità:
 label.psname=&Nome:
 label.pstype=Tipo:
 label.rangeto=A
@@ -188,7 +188,7 @@ middle=Medio
 bottom=Basso
 envelope=Busta
 manual=Manuale
-large-capacity=Grande capacit\u00E0
+large-capacity=Grande capacità
 main=Principale
 side=Laterale
 # Add the additional standard bins defined by win32
diff --git a/src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties
index ab8046e1615..889df230161 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties
@@ -25,74 +25,74 @@
 
 #
 #
-border.chromaticity=\u8272\u306E\u8868\u73FE
-border.copies=\u5370\u5237\u90E8\u6570
-border.jobattributes=\u30B8\u30E7\u30D6\u306E\u5C5E\u6027
-border.media=\u30E1\u30C7\u30A3\u30A2
-border.orientation=\u7528\u7D19\u306E\u5411\u304D
-border.printrange=\u5370\u5237\u7BC4\u56F2
-border.printservice=\u5370\u5237\u30B5\u30FC\u30D3\u30B9
-border.quality=\u54C1\u8CEA
-border.sides=\u9762
-border.margins=\u30DE\u30FC\u30B8\u30F3
-#
-button.cancel=\u53D6\u6D88
+border.chromaticity=色の表現
+border.copies=印刷部数
+border.jobattributes=ジョブの属性
+border.media=メディア
+border.orientation=用紙の向き
+border.printrange=印刷範囲
+border.printservice=印刷サービス
+border.quality=品質
+border.sides=面
+border.margins=マージン
+#
+button.cancel=取消
 button.ok=OK
-button.print=\u5370\u5237
-button.properties=\u30D7\u30ED\u30D1\u30C6\u30A3(&R)...
-#
-checkbox.collate=\u4E01\u5408\u3044(&C)
-checkbox.jobsheets=\u30D0\u30CA\u30FC\u30FB\u30DA\u30FC\u30B8(&B)
-checkbox.printtofile=\u30D5\u30A1\u30A4\u30EB\u306B\u51FA\u529B(&F)
-#
-dialog.printtitle=\u5370\u5237
-dialog.pstitle=\u30DA\u30FC\u30B8\u8A2D\u5B9A
-dialog.overwrite=\u3053\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u65E2\u5B58\u306E\u30D5\u30A1\u30A4\u30EB\u306B\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\u3002
-dialog.owtitle=\u30D5\u30A1\u30A4\u30EB\u306B\u51FA\u529B
-dialog.printtofile=\u30D5\u30A1\u30A4\u30EB\u306B\u51FA\u529B
-dialog.noprintermsg=\u5370\u5237\u30B5\u30FC\u30D3\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-dialog.writeerror=\u30D5\u30A1\u30A4\u30EB\u306B\u66F8\u304D\u8FBC\u3081\u307E\u305B\u3093:
-#
-label.info=\u60C5\u5831:
-label.jobname=\u30B8\u30E7\u30D6\u540D(&J):
-label.numcopies=\u5370\u5237\u90E8\u6570(&O):
-label.priority=\u512A\u5148\u5EA6(&R):
-label.psname=\u540D\u524D(&N):
-label.pstype=\u30BF\u30A4\u30D7:
-label.rangeto=\u5370\u5237\u7BC4\u56F2
-label.size=\u30B5\u30A4\u30BA(&Z):
-label.source=\u30BD\u30FC\u30B9(&C):
-label.status=\u72B6\u614B:
-label.username=\u30E6\u30FC\u30B6\u30FC\u540D(&U):
+button.print=印刷
+button.properties=プロパティ(&R)...
+#
+checkbox.collate=丁合い(&C)
+checkbox.jobsheets=バナー・ページ(&B)
+checkbox.printtofile=ファイルに出力(&F)
+#
+dialog.printtitle=印刷
+dialog.pstitle=ページ設定
+dialog.overwrite=このファイルはすでに存在します。既存のファイルに上書きしますか。
+dialog.owtitle=ファイルに出力
+dialog.printtofile=ファイルに出力
+dialog.noprintermsg=印刷サービスが見つかりません。
+dialog.writeerror=ファイルに書き込めません:
+#
+label.info=情報:
+label.jobname=ジョブ名(&J):
+label.numcopies=印刷部数(&O):
+label.priority=優先度(&R):
+label.psname=名前(&N):
+label.pstype=タイプ:
+label.rangeto=印刷範囲
+label.size=サイズ(&Z):
+label.source=ソース(&C):
+label.status=状態:
+label.username=ユーザー名(&U):
 label.millimetres=(mm)
 label.inches=(in)
-label.topmargin=\u4E0A(&T)
-label.bottommargin=\u4E0B(&B)
-label.leftmargin=\u5DE6(&F)
-label.rightmargin=\u53F3(&R)
-#
-radiobutton.color=\u30AB\u30E9\u30FC(&C)
-radiobutton.draftq=\u30C9\u30E9\u30D5\u30C8(&F)
-radiobutton.duplex=\u4E21\u9762(&D)
-radiobutton.highq=\u9AD8(&H)
-radiobutton.landscape=\u6A2A(&L)
-radiobutton.monochrome=\u30E2\u30CE\u30AF\u30ED(&M)
-radiobutton.normalq=\u6A19\u6E96(&N)
-radiobutton.oneside=\u7247\u9762(&O)
-radiobutton.portrait=\u7E26(&P)
-radiobutton.rangeall=\u3059\u3079\u3066(&L)
-radiobutton.rangepages=\u30DA\u30FC\u30B8(&E)
-radiobutton.revlandscape=\u30E9\u30F3\u30C9\u30B9\u30B1\u30FC\u30D7(\u53CD\u8EE2)(&N)
-radiobutton.revportrait=\u30DD\u30FC\u30C8\u30EC\u30A4\u30C8(\u53CD\u8EE2)(&I)
-radiobutton.tumble=\u53CD\u8EE2(&T)
+label.topmargin=上(&T)
+label.bottommargin=下(&B)
+label.leftmargin=左(&F)
+label.rightmargin=右(&R)
+#
+radiobutton.color=カラー(&C)
+radiobutton.draftq=ドラフト(&F)
+radiobutton.duplex=両面(&D)
+radiobutton.highq=高(&H)
+radiobutton.landscape=横(&L)
+radiobutton.monochrome=モノクロ(&M)
+radiobutton.normalq=標準(&N)
+radiobutton.oneside=片面(&O)
+radiobutton.portrait=縦(&P)
+radiobutton.rangeall=すべて(&L)
+radiobutton.rangepages=ページ(&E)
+radiobutton.revlandscape=ランドスケープ(反転)(&N)
+radiobutton.revportrait=ポートレイト(反転)(&I)
+radiobutton.tumble=反転(&T)
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=\u5916\u89B3(&A)
-tab.general=\u4E00\u822C(&G)
-tab.pagesetup=\u30DA\u30FC\u30B8\u8A2D\u5B9A(&S)
+tab.appearance=外観(&A)
+tab.general=一般(&G)
+tab.pagesetup=ページ設定(&S)
 #
-error.pagerange=\u7121\u52B9\u306A\u30DA\u30FC\u30B8\u7BC4\u56F2\u3002\u5024\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044(\u4F8B\u30011-3,5,7-10)
-error.destination=\u7121\u52B9\u306A\u30D5\u30A1\u30A4\u30EB\u540D\u3002\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.pagerange=無効なページ範囲。値を再入力してください(例、1-3,5,7-10)
+error.destination=無効なファイル名。ファイル名を再入力してください
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
 # (in some cases the space character is replaced by '-' and the pound
@@ -144,64 +144,64 @@ iso-c7=C7 (ISO/DIN)
 iso-c8=C8 (ISO/DIN)
 iso-c9=C9 (ISO/DIN)
 iso-c10=C10 (ISO/DIN)
-na-letter=\u30EC\u30BF\u30FC
-na-legal=\u30EA\u30FC\u30AC\u30EB
-executive=\u30A8\u30B0\u30BC\u30AF\u30C6\u30A3\u30D6
-ledger=\u30EC\u30C3\u30B8\u30E3
-tabloid=\u30BF\u30D6\u30ED\u30A4\u30C9
-invoice=\u30A4\u30F3\u30DC\u30A4\u30B9
-folio=\u30D5\u30A9\u30EA\u30AA
-quarto=\u30AF\u30A9\u30FC\u30C8
-japanese-postcard=\u306F\u304C\u304D(JIS)
-oufuko-postcard=\u5F80\u5FA9\u306F\u304C\u304D(JIS)
-a=\u30A8\u30F3\u30B8\u30CB\u30A2\u30EA\u30F3\u30B0A
-b=\u30A8\u30F3\u30B8\u30CB\u30A2\u30EA\u30F3\u30B0B
-c=\u30A8\u30F3\u30B8\u30CB\u30A2\u30EA\u30F3\u30B0C
-d=\u30A8\u30F3\u30B8\u30CB\u30A2\u30EA\u30F3\u30B0D
-e=\u30A8\u30F3\u30B8\u30CB\u30A2\u30EA\u30F3\u30B0E
-iso-designated-long=ISO DL(\u9577\u5BF8)
-italian-envelope=\u30A4\u30BF\u30EA\u30A2\u5C01\u7B52
-italy-envelope=\u30A4\u30BF\u30EA\u30A2\u5C01\u7B52
-invite-envelope=\u62DB\u5F85\u5C01\u7B52
-monarch-envelope=\u30E2\u30CA\u30FC\u30AF\u5C01\u7B52
-personal-envelope=\u500B\u4EBA\u7528\u5C01\u7B52
-na-number-9-envelope=No. 9\u5C01\u7B52
-na-number-10-envelope=No. 10\u5C01\u7B52
-na-number-11-envelope=No. 11\u5C01\u7B52
-na-number-12-envelope=No. 12\u5C01\u7B52
-na-number-14-envelope=No. 14\u5C01\u7B52
-na-6x9-envelope=6x9\u5C01\u7B52
-na-7x9-envelope=6x7\u5C01\u7B52
-na-9x11-envelope=9x11\u5C01\u7B52
-na-9x12-envelope=9x12\u5C01\u7B52
-na-10x13-envelope=10x15\u5C01\u7B52
-na-10x14-envelope=10x15\u5C01\u7B52
-na-10x15-envelope=10x15\u5C01\u7B52
-na-5x7=5x7\u30A4\u30F3\u30C1\u7528\u7D19
-na-8x10=8x10\u30A4\u30F3\u30C1\u7528\u7D19
+na-letter=レター
+na-legal=リーガル
+executive=エグゼクティブ
+ledger=レッジャ
+tabloid=タブロイド
+invoice=インボイス
+folio=フォリオ
+quarto=クォート
+japanese-postcard=はがき(JIS)
+oufuko-postcard=往復はがき(JIS)
+a=エンジニアリングA
+b=エンジニアリングB
+c=エンジニアリングC
+d=エンジニアリングD
+e=エンジニアリングE
+iso-designated-long=ISO DL(長寸)
+italian-envelope=イタリア封筒
+italy-envelope=イタリア封筒
+invite-envelope=招待封筒
+monarch-envelope=モナーク封筒
+personal-envelope=個人用封筒
+na-number-9-envelope=No. 9封筒
+na-number-10-envelope=No. 10封筒
+na-number-11-envelope=No. 11封筒
+na-number-12-envelope=No. 12封筒
+na-number-14-envelope=No. 14封筒
+na-6x9-envelope=6x9封筒
+na-7x9-envelope=6x7封筒
+na-9x11-envelope=9x11封筒
+na-9x12-envelope=9x12封筒
+na-10x13-envelope=10x15封筒
+na-10x14-envelope=10x15封筒
+na-10x15-envelope=10x15封筒
+na-5x7=5x7インチ用紙
+na-8x10=8x10インチ用紙
 #
 # The following keys match the Strings returned by MediaTray.toString()
 #
-auto-select=\u81EA\u52D5\u9078\u629E
-top=\u4E0A\u90E8
-middle=\u4E2D\u9593
-bottom=\u4E0B\u90E8
-envelope=\u5C01\u7B52
-manual=\u30DE\u30CB\u30E5\u30A2\u30EB
-large-capacity=\u5927\u5BB9\u91CF
-main=\u30E1\u30A4\u30F3
-side=\u9762
+auto-select=自動選択
+top=上部
+middle=中間
+bottom=下部
+envelope=封筒
+manual=マニュアル
+large-capacity=大容量
+main=メイン
+side=面
 # Add the additional standard bins defined by win32
-Manual-Envelope=\u30DE\u30CB\u30E5\u30A2\u30EB\u5C01\u7B52
-Automatic-Feeder=\u81EA\u52D5\u30D5\u30A3\u30FC\u30C0
-Tractor-Feeder=\u30C8\u30E9\u30AF\u30BF\u30FB\u30D5\u30A3\u30FC\u30C0
-Small-Format=\u30B9\u30E2\u30FC\u30EB\u30FB\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8
-Large-Format=\u30E9\u30FC\u30B8\u30FB\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8
-Cassette=\u30AB\u30BB\u30C3\u30C8
-Form-Source=\u30D5\u30A9\u30FC\u30E0\u30FB\u30BD\u30FC\u30B9
+Manual-Envelope=マニュアル封筒
+Automatic-Feeder=自動フィーダ
+Tractor-Feeder=トラクタ・フィーダ
+Small-Format=スモール・フォーマット
+Large-Format=ラージ・フォーマット
+Cassette=カセット
+Form-Source=フォーム・ソース
 #
 # The following keys match the Strings returned by
 # PrinterIsAcceptingJobs.toString()
 #
-accepting-jobs=\u30B8\u30E7\u30D6\u3092\u53D7\u3051\u4ED8\u3051\u3066\u3044\u307E\u3059
-not-accepting-jobs=\u30B8\u30E7\u30D6\u3092\u53D7\u3051\u4ED8\u3051\u307E\u305B\u3093
+accepting-jobs=ジョブを受け付けています
+not-accepting-jobs=ジョブを受け付けません
diff --git a/src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties
index 0fd80bbae98..61d38f52953 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties
@@ -25,74 +25,74 @@
 
 #
 #
-border.chromaticity=\uC0C9\uC0C1 \uBAA8\uC591
-border.copies=\uBCF5\uC0AC
-border.jobattributes=\uC791\uC5C5 \uC18D\uC131
-border.media=\uB9E4\uCCB4
-border.orientation=\uBC29\uD5A5
-border.printrange=\uC778\uC1C4 \uBC94\uC704
-border.printservice=\uC778\uC1C4 \uC11C\uBE44\uC2A4
-border.quality=\uD488\uC9C8
-border.sides=\uCE21\uBA74
-border.margins=\uC5EC\uBC31
-#
-button.cancel=\uCDE8\uC18C
-button.ok=\uD655\uC778
-button.print=\uC778\uC1C4
-button.properties=\uC18D\uC131(&R)...
-#
-checkbox.collate=\uD55C \uBD80\uC529 \uC778\uC1C4(&C)
-checkbox.jobsheets=\uBC30\uB108 \uD398\uC774\uC9C0(&B)
-checkbox.printtofile=\uD30C\uC77C\uB85C \uC778\uC1C4(&F)
-#
-dialog.printtitle=\uC778\uC1C4
-dialog.pstitle=\uD398\uC774\uC9C0 \uC124\uC815
-dialog.overwrite=\uC774 \uD30C\uC77C\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uAE30\uC874 \uD30C\uC77C\uC744 \uACB9\uCCD0 \uC4F0\uACA0\uC2B5\uB2C8\uAE4C?
-dialog.owtitle=\uD30C\uC77C\uB85C \uC778\uC1C4
-dialog.printtofile=\uD30C\uC77C\uB85C \uC778\uC1C4
-dialog.noprintermsg=\uC778\uC1C4 \uC11C\uBE44\uC2A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-dialog.writeerror=\uD30C\uC77C\uC5D0 \uC4F8 \uC218 \uC5C6\uC74C:
-#
-label.info=\uC815\uBCF4:
-label.jobname=\uC791\uC5C5 \uC774\uB984(&J):
-label.numcopies=\uB9E4\uC218(&O):
-label.priority=\uC6B0\uC120\uC21C\uC704(&R):
-label.psname=\uC774\uB984(&N):
-label.pstype=\uC720\uD615:
-label.rangeto=\uC885\uB8CC
-label.size=\uD06C\uAE30(&Z):
-label.source=\uC18C\uC2A4(&C):
-label.status=\uC0C1\uD0DC:
-label.username=\uC0AC\uC6A9\uC790 \uC774\uB984(&U):
+border.chromaticity=색상 모양
+border.copies=복사
+border.jobattributes=작업 속성
+border.media=매체
+border.orientation=방향
+border.printrange=인쇄 범위
+border.printservice=인쇄 서비스
+border.quality=품질
+border.sides=측면
+border.margins=여백
+#
+button.cancel=취소
+button.ok=확인
+button.print=인쇄
+button.properties=속성(&R)...
+#
+checkbox.collate=한 부씩 인쇄(&C)
+checkbox.jobsheets=배너 페이지(&B)
+checkbox.printtofile=파일로 인쇄(&F)
+#
+dialog.printtitle=인쇄
+dialog.pstitle=페이지 설정
+dialog.overwrite=이 파일이 존재합니다. 기존 파일을 겹쳐 쓰겠습니까?
+dialog.owtitle=파일로 인쇄
+dialog.printtofile=파일로 인쇄
+dialog.noprintermsg=인쇄 서비스를 찾을 수 없습니다.
+dialog.writeerror=파일에 쓸 수 없음:
+#
+label.info=정보:
+label.jobname=작업 이름(&J):
+label.numcopies=매수(&O):
+label.priority=우선순위(&R):
+label.psname=이름(&N):
+label.pstype=유형:
+label.rangeto=종료
+label.size=크기(&Z):
+label.source=소스(&C):
+label.status=상태:
+label.username=사용자 이름(&U):
 label.millimetres=(mm)
-label.inches=(\uC778\uCE58)
-label.topmargin=\uC704\uCABD(&T)
-label.bottommargin=\uC544\uB798\uCABD(&B)
-label.leftmargin=\uC67C\uCABD(&F)
-label.rightmargin=\uC624\uB978\uCABD(&R)
-#
-radiobutton.color=\uC0C9\uC0C1(&C)
-radiobutton.draftq=\uCD08\uC548(&F)
-radiobutton.duplex=\uC591\uBA74(&D)
-radiobutton.highq=\uB192\uC74C(&H)
-radiobutton.landscape=\uAC00\uB85C(&L)
-radiobutton.monochrome=\uB2E8\uC0C9(&M)
-radiobutton.normalq=\uBCF4\uD1B5(&N)
-radiobutton.oneside=\uB2E8\uBA74(&O)
-radiobutton.portrait=\uC138\uB85C(&P)
-radiobutton.rangeall=\uC804\uCCB4(&L)
-radiobutton.rangepages=\uD398\uC774\uC9C0(&E)
-radiobutton.revlandscape=\uAC00\uB85C \uBC18\uC804(&N)
-radiobutton.revportrait=\uC138\uB85C \uBC18\uC804(&I)
-radiobutton.tumble=\uD68C\uC804\uC2DD(&T)
+label.inches=(인치)
+label.topmargin=위쪽(&T)
+label.bottommargin=아래쪽(&B)
+label.leftmargin=왼쪽(&F)
+label.rightmargin=오른쪽(&R)
+#
+radiobutton.color=색상(&C)
+radiobutton.draftq=초안(&F)
+radiobutton.duplex=양면(&D)
+radiobutton.highq=높음(&H)
+radiobutton.landscape=가로(&L)
+radiobutton.monochrome=단색(&M)
+radiobutton.normalq=보통(&N)
+radiobutton.oneside=단면(&O)
+radiobutton.portrait=세로(&P)
+radiobutton.rangeall=전체(&L)
+radiobutton.rangepages=페이지(&E)
+radiobutton.revlandscape=가로 반전(&N)
+radiobutton.revportrait=세로 반전(&I)
+radiobutton.tumble=회전식(&T)
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=\uBAA8\uC591(&A)
-tab.general=\uC77C\uBC18 \uC0AC\uD56D(&G)
-tab.pagesetup=\uD398\uC774\uC9C0 \uC124\uC815(&S)
+tab.appearance=모양(&A)
+tab.general=일반 사항(&G)
+tab.pagesetup=페이지 설정(&S)
 #
-error.pagerange=\uBD80\uC801\uD569\uD55C \uD398\uC774\uC9C0 \uBC94\uC704: \uAC12\uC744 \uB2E4\uC2DC \uC785\uB825\uD558\uC2ED\uC2DC\uC624(\uC608: 1-3,5,7-10).
-error.destination=\uBD80\uC801\uD569\uD55C \uD30C\uC77C \uC774\uB984: \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624.
+error.pagerange=부적합한 페이지 범위: 값을 다시 입력하십시오(예: 1-3,5,7-10).
+error.destination=부적합한 파일 이름: 다시 시도하십시오.
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
 # (in some cases the space character is replaced by '-' and the pound
@@ -177,31 +177,31 @@ na-9x12-envelope=9x12 Envelope
 na-10x13-envelope=10x15 Envelope
 na-10x14-envelope=10x15 Envelope
 na-10x15-envelope=10x15 Envelope
-na-5x7=5" x 7" \uC6A9\uC9C0
-na-8x10=8" x 10" \uC6A9\uC9C0
+na-5x7=5" x 7" 용지
+na-8x10=8" x 10" 용지
 #
 # The following keys match the Strings returned by MediaTray.toString()
 #
-auto-select=\uC790\uB3D9 \uC120\uD0DD
-top=\uC704\uCABD
-middle=\uAC00\uC6B4\uB370
-bottom=\uC544\uB798\uCABD
+auto-select=자동 선택
+top=위쪽
+middle=가운데
+bottom=아래쪽
 envelope=Envelope
-manual=\uC218\uB3D9
-large-capacity=\uD070 \uC6A9\uB7C9
-main=\uC8FC
-side=\uCE21\uBA74
+manual=수동
+large-capacity=큰 용량
+main=주
+side=측면
 # Add the additional standard bins defined by win32
-Manual-Envelope=\uC218\uB3D9 \uBD09\uD22C
-Automatic-Feeder=\uC790\uB3D9 \uACF5\uAE09\uAE30
-Tractor-Feeder=\uD2B8\uB799\uD130 \uACF5\uAE09\uAE30
-Small-Format=\uC791\uC740 \uD615\uC2DD
-Large-Format=\uD070 \uD615\uC2DD
-Cassette=\uCE74\uC138\uD2B8
-Form-Source=\uC591\uC2DD \uC18C\uC2A4
+Manual-Envelope=수동 봉투
+Automatic-Feeder=자동 공급기
+Tractor-Feeder=트랙터 공급기
+Small-Format=작은 형식
+Large-Format=큰 형식
+Cassette=카세트
+Form-Source=양식 소스
 #
 # The following keys match the Strings returned by
 # PrinterIsAcceptingJobs.toString()
 #
-accepting-jobs=\uC791\uC5C5 \uC2B9\uC778
-not-accepting-jobs=\uC791\uC5C5 \uC2B9\uC778 \uC548\uD568
+accepting-jobs=작업 승인
+not-accepting-jobs=작업 승인 안함
diff --git a/src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties
index 9e7d99962e4..0617aa2e005 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties
@@ -25,13 +25,13 @@
 
 #
 #
-border.chromaticity=Apar\u00EAncia da Cor
-border.copies=C\u00F3pias
+border.chromaticity=Aparência da Cor
+border.copies=Cópias
 border.jobattributes=Atributos do Job
-border.media=M\u00EDdia
-border.orientation=Orienta\u00E7\u00E3o
-border.printrange=Faixa de Impress\u00E3o
-border.printservice=Servi\u00E7o de Impress\u00E3o
+border.media=Mídia
+border.orientation=Orientação
+border.printrange=Faixa de Impressão
+border.printservice=Serviço de Impressão
 border.quality=Qualidade
 border.sides=Lados
 border.margins=Margens
@@ -42,28 +42,28 @@ button.print=Imprimir
 button.properties=P&ropriedades...
 #
 checkbox.collate=&Agrupar
-checkbox.jobsheets=P\u00E1gina com &Banner
+checkbox.jobsheets=Página com &Banner
 checkbox.printtofile=&Imprimir em Arquivo
 #
 dialog.printtitle=Imprimir
-dialog.pstitle=Configura\u00E7\u00E3o da P\u00E1gina
-dialog.overwrite=Este arquivo j\u00E1 existe. Deseja substituir o arquivo existente?
+dialog.pstitle=Configuração da Página
+dialog.overwrite=Este arquivo já existe. Deseja substituir o arquivo existente?
 dialog.owtitle=Imprimir em Arquivo
 dialog.printtofile=Imprimir em Arquivo
-dialog.noprintermsg=Nenhum servi\u00E7o de impress\u00E3o encontrado.
-dialog.writeerror=N\u00E3o \u00E9 poss\u00EDvel gravar no arquivo:
+dialog.noprintermsg=Nenhum serviço de impressão encontrado.
+dialog.writeerror=Não é possível gravar no arquivo:
 #
-label.info=Informa\u00E7\u00F5es:
+label.info=Informações:
 label.jobname=Nome do &Job:
-label.numcopies=N\u00FAmer&o de c\u00F3pias:
+label.numcopies=Númer&o de cópias:
 label.priority=Pri&oridade:
 label.psname=&Nome:
 label.pstype=Tipo:
-label.rangeto=At\u00E9
+label.rangeto=Até
 label.size=Ta&manho:
 label.source=&Origem:
 label.status=Status:
-label.username=Nome do &Usu\u00E1rio:
+label.username=Nome do &Usuário:
 label.millimetres=(mm)
 label.inches=(pol)
 label.topmargin=&superior
@@ -76,23 +76,23 @@ radiobutton.draftq=Rascun&ho
 radiobutton.duplex=Duple&x
 radiobutton.highq=A&lta
 radiobutton.landscape=&Paisagem
-radiobutton.monochrome=&Monocrom\u00E1tico
+radiobutton.monochrome=&Monocromático
 radiobutton.normalq=&Normal
 radiobutton.oneside=Um La&do
 radiobutton.portrait=Re&trato
 radiobutton.rangeall=T&udo
-radiobutton.rangepages=&P\u00E1ginas
+radiobutton.rangepages=&Páginas
 radiobutton.revlandscape=Paisagem I&nvertida
 radiobutton.revportrait=Retrato In&vertido
 radiobutton.tumble=&Virar
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=Apa&r\u00EAncia
+tab.appearance=Apa&rência
 tab.general=&Geral
-tab.pagesetup=Con&figura\u00E7\u00E3o da P\u00E1gina
+tab.pagesetup=Con&figuração da Página
 #
-error.pagerange=Faixa de p\u00E1ginas inv\u00E1lida; insira novamente os valores (por exemplo, 1-3,5,7-10)
-error.destination=Nome de arquivo inv\u00E1lido; tente novamente
+error.pagerange=Faixa de páginas inválida; insira novamente os valores (por exemplo, 1-3,5,7-10)
+error.destination=Nome de arquivo inválido; tente novamente
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
 # (in some cases the space character is replaced by '-' and the pound
@@ -145,15 +145,15 @@ iso-c8=C8 (ISO/DIN)
 iso-c9=C9 (ISO/DIN)
 iso-c10=C10 (ISO/DIN)
 na-letter=Carta
-na-legal=Of\u00EDcio
+na-legal=Ofício
 executive=Executivo
 ledger=Duplo Carta
-tabloid=Tabl\u00F3ide
+tabloid=Tablóide
 invoice=Fatura
-folio=F\u00F3lio
+folio=Fólio
 quarto=Quarto
-japanese-postcard=Cart\u00E3o Postal (JIS)
-oufuko-postcard=Cart\u00E3o Postal Duplo (JIS)
+japanese-postcard=Cartão Postal (JIS)
+oufuko-postcard=Cartão Postal Duplo (JIS)
 a=Engenharia A
 b=Engenharia B
 c=Engenharia C
@@ -165,11 +165,11 @@ italy-envelope=Envelope Italiano
 invite-envelope=Envelope de Convite
 monarch-envelope=Envelope Monarca
 personal-envelope=Envelope Personalizado
-na-number-9-envelope=Envelope n\u00BA 9
-na-number-10-envelope=Envelope n\u00BA 10
-na-number-11-envelope=Envelope n\u00BA 11
-na-number-12-envelope=Envelope n\u00BA 12
-na-number-14-envelope=Envelope n\u00BA 14
+na-number-9-envelope=Envelope nº 9
+na-number-10-envelope=Envelope nº 10
+na-number-11-envelope=Envelope nº 11
+na-number-12-envelope=Envelope nº 12
+na-number-14-envelope=Envelope nº 14
 na-6x9-envelope=Envelope 6x9
 na-7x9-envelope=Envelope 6x7
 na-9x11-envelope=Envelope 9x11
@@ -193,15 +193,15 @@ main=Principal
 side=Lado
 # Add the additional standard bins defined by win32
 Manual-Envelope=Envelope Manual
-Automatic-Feeder=Alimentador Autom\u00E1tico
+Automatic-Feeder=Alimentador Automático
 Tractor-Feeder=Alimentador por Tracionador
 Small-Format=Formato Pequeno
 Large-Format=Formato Grande
 Cassette=Cassete
-Form-Source=Origem do Formul\u00E1rio
+Form-Source=Origem do Formulário
 #
 # The following keys match the Strings returned by
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Aceitando jobs
-not-accepting-jobs=N\u00E3o aceitando jobs
+not-accepting-jobs=Não aceitando jobs
diff --git a/src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties
index 4a085d341d8..eac40fa6744 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties
@@ -25,13 +25,13 @@
 
 #
 #
-border.chromaticity=F\u00E4rg
+border.chromaticity=Färg
 border.copies=Antal exemplar
 border.jobattributes=Utskriftsattribut
 border.media=Media
 border.orientation=Orientering
 border.printrange=Utskriftsintervall
-border.printservice=Utskriftstj\u00E4nst
+border.printservice=Utskriftstjänst
 border.quality=Kvalitet
 border.sides=Sidor
 border.margins=Marginaler
@@ -42,15 +42,15 @@ button.print=Skriv ut
 button.properties=&Egenskaper...
 #
 checkbox.collate=&Sortera
-checkbox.jobsheets=F&\u00F6rs\u00E4ttsblad
+checkbox.jobsheets=F&örsättsblad
 checkbox.printtofile=Skriv ut till &fil
 #
 dialog.printtitle=Skriv ut
 dialog.pstitle=Utskriftsformat
-dialog.overwrite=Denna fil finns redan.  Vill du skriva \u00F6ver den befintliga filen?
+dialog.overwrite=Denna fil finns redan.  Vill du skriva över den befintliga filen?
 dialog.owtitle=Skriv till fil
 dialog.printtofile=Skriv till fil
-dialog.noprintermsg=Hittade ingen utskriftstj\u00E4nst.
+dialog.noprintermsg=Hittade ingen utskriftstjänst.
 dialog.writeerror=Kan inte skriva till filen:
 #
 label.info=Info:
@@ -61,38 +61,38 @@ label.psname=&Namn:
 label.pstype=Typ:
 label.rangeto=Till
 label.size=Stor&lek:
-label.source=&K\u00E4lla:
+label.source=&Källa:
 label.status=Status:
-label.username=A&nv\u00E4ndarnamn:
+label.username=A&nvändarnamn:
 label.millimetres=(mm)
 label.inches=(tum)
-label.topmargin=&\u00F6verkant
+label.topmargin=&överkant
 label.bottommargin=&nederkant
-label.leftmargin=v&\u00E4nster
-label.rightmargin=&h\u00F6ger
+label.leftmargin=v&änster
+label.rightmargin=&höger
 #
-radiobutton.color=&F\u00E4rg
+radiobutton.color=&Färg
 radiobutton.draftq=Utka&st
 radiobutton.duplex=&Dubbelsidig
-radiobutton.highq=&H\u00F6g
+radiobutton.highq=&Hög
 radiobutton.landscape=Liggan&de
 radiobutton.monochrome=&Monokrom
 radiobutton.normalq=&Normal
 radiobutton.oneside=&Ensidig
-radiobutton.portrait=&St\u00E5ende
+radiobutton.portrait=&Stående
 radiobutton.rangeall=A&lla
 radiobutton.rangepages=Sid&or
-radiobutton.revlandscape=Omv\u00E4nt li&ggande
-radiobutton.revportrait=Omv\u00E4nt st\u00E5en&de
-radiobutton.tumble=&V\u00E4nd
+radiobutton.revlandscape=Omvänt li&ggande
+radiobutton.revportrait=Omvänt ståen&de
+radiobutton.tumble=&Vänd
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
 tab.appearance=Fo&rmat
-tab.general=&Allm\u00E4nt
+tab.general=&Allmänt
 tab.pagesetup=&Utskriftsformat
 #
-error.pagerange=Ogiltigt sidintervall. Skriv in v\u00E4rdena igen (t ex 1-3,5,7-10)
-error.destination=Ogiltigt filnamn. F\u00F6rs\u00F6k igen.
+error.pagerange=Ogiltigt sidintervall. Skriv in värdena igen (t ex 1-3,5,7-10)
+error.destination=Ogiltigt filnamn. Försök igen.
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
 # (in some cases the space character is replaced by '-' and the pound
@@ -182,13 +182,13 @@ na-8x10=8x10-tumspapper
 #
 # The following keys match the Strings returned by MediaTray.toString()
 #
-auto-select=V\u00E4lj automatiskt
+auto-select=Välj automatiskt
 top=Topp
 middle=Mitten
 bottom=Botten
 envelope=Kuvert
 manual=Manuell
-large-capacity=H\u00F6g kapacitet
+large-capacity=Hög kapacitet
 main=Huvud
 side=Sida
 # Add the additional standard bins defined by win32
@@ -198,7 +198,7 @@ Tractor-Feeder=Traktormatning
 Small-Format=Litet format
 Large-Format=Stort format
 Cassette=Kassett
-Form-Source=Formul\u00E4rk\u00E4lla
+Form-Source=Formulärkälla
 #
 # The following keys match the Strings returned by
 # PrinterIsAcceptingJobs.toString()
diff --git a/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties
index 87faf666c91..598441e24d9 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties
@@ -25,74 +25,74 @@
 
 #
 #
-border.chromaticity=\u989C\u8272\u5916\u89C2
-border.copies=\u4EFD\u6570
-border.jobattributes=\u4F5C\u4E1A\u5C5E\u6027
-border.media=\u4ECB\u8D28
-border.orientation=\u65B9\u5411
-border.printrange=\u6253\u5370\u533A\u57DF
-border.printservice=\u6253\u5370\u670D\u52A1
-border.quality=\u8D28\u91CF
-border.sides=\u8FB9
-border.margins=\u8FB9\u8DDD
-#
-button.cancel=\u53D6\u6D88
-button.ok=\u786E\u5B9A
-button.print=\u6253\u5370
-button.properties=\u5C5E\u6027(&R)...
-#
-checkbox.collate=\u9010\u4EFD\u6253\u5370(&C)
-checkbox.jobsheets=\u6807\u5E1C\u9875(&B)
-checkbox.printtofile=\u6253\u5370\u5230\u6587\u4EF6(&F)
-#
-dialog.printtitle=\u6253\u5370
-dialog.pstitle=\u9875\u9762\u8BBE\u7F6E
-dialog.overwrite=\u8BE5\u6587\u4EF6\u5DF2\u7ECF\u5B58\u5728\u3002\u662F\u5426\u8981\u8986\u76D6\u73B0\u6709\u6587\u4EF6?
-dialog.owtitle=\u6253\u5370\u5230\u6587\u4EF6
-dialog.printtofile=\u6253\u5370\u5230\u6587\u4EF6
-dialog.noprintermsg=\u627E\u4E0D\u5230\u6253\u5370\u670D\u52A1\u3002
-dialog.writeerror=\u65E0\u6CD5\u5199\u5165\u6587\u4EF6:
-#
-label.info=\u4FE1\u606F:
-label.jobname=\u4F5C\u4E1A\u540D(&J):
-label.numcopies=\u6253\u5370\u4EFD\u6570(&O):
-label.priority=\u4F18\u5148\u7EA7(&R):
-label.psname=\u540D\u79F0(&N):
-label.pstype=\u7C7B\u578B:
-label.rangeto=\u81F3
-label.size=\u5927\u5C0F(&Z):
-label.source=\u6765\u6E90(&C):
-label.status=\u72B6\u6001:
-label.username=\u7528\u6237\u540D(&U):
-label.millimetres=(\u6BEB\u7C73)
-label.inches=(\u82F1\u5BF8)
-label.topmargin=\u4E0A\u8FB9\u8DDD(&T)
-label.bottommargin=\u4E0B\u8FB9\u8DDD(&B)
-label.leftmargin=\u5DE6\u8FB9\u8DDD(&F)
-label.rightmargin=\u53F3\u8FB9\u8DDD(&R)
-#
-radiobutton.color=\u989C\u8272(&C)
-radiobutton.draftq=\u8349\u56FE(&F)
-radiobutton.duplex=\u53CC\u9762\u6253\u5370(&D)
-radiobutton.highq=\u9AD8(&H)
-radiobutton.landscape=\u6A2A\u5411(&L)
-radiobutton.monochrome=\u5355\u8272(&M)
-radiobutton.normalq=\u6B63\u5E38(&N)
-radiobutton.oneside=\u5355\u9762(&O)
-radiobutton.portrait=\u7EB5\u5411(&P)
-radiobutton.rangeall=\u5168\u90E8(&L)
-radiobutton.rangepages=\u9875\u7801\u8303\u56F4(&E)
-radiobutton.revlandscape=\u6A2A\u5411\u53CD\u9762\u6253\u5370(&N)
-radiobutton.revportrait=\u7EB5\u5411\u53CD\u9762\u6253\u5370(&I)
-radiobutton.tumble=\u7FFB\u8F6C(&T)
+border.chromaticity=颜色外观
+border.copies=份数
+border.jobattributes=作业属性
+border.media=介质
+border.orientation=方向
+border.printrange=打印区域
+border.printservice=打印服务
+border.quality=质量
+border.sides=边
+border.margins=边距
+#
+button.cancel=取消
+button.ok=确定
+button.print=打印
+button.properties=属性(&R)...
+#
+checkbox.collate=逐份打印(&C)
+checkbox.jobsheets=标帜页(&B)
+checkbox.printtofile=打印到文件(&F)
+#
+dialog.printtitle=打印
+dialog.pstitle=页面设置
+dialog.overwrite=该文件已经存在。是否要覆盖现有文件?
+dialog.owtitle=打印到文件
+dialog.printtofile=打印到文件
+dialog.noprintermsg=找不到打印服务。
+dialog.writeerror=无法写入文件:
+#
+label.info=信息:
+label.jobname=作业名(&J):
+label.numcopies=打印份数(&O):
+label.priority=优先级(&R):
+label.psname=名称(&N):
+label.pstype=类型:
+label.rangeto=至
+label.size=大小(&Z):
+label.source=来源(&C):
+label.status=状态:
+label.username=用户名(&U):
+label.millimetres=(毫米)
+label.inches=(英寸)
+label.topmargin=上边距(&T)
+label.bottommargin=下边距(&B)
+label.leftmargin=左边距(&F)
+label.rightmargin=右边距(&R)
+#
+radiobutton.color=颜色(&C)
+radiobutton.draftq=草图(&F)
+radiobutton.duplex=双面打印(&D)
+radiobutton.highq=高(&H)
+radiobutton.landscape=横向(&L)
+radiobutton.monochrome=单色(&M)
+radiobutton.normalq=正常(&N)
+radiobutton.oneside=单面(&O)
+radiobutton.portrait=纵向(&P)
+radiobutton.rangeall=全部(&L)
+radiobutton.rangepages=页码范围(&E)
+radiobutton.revlandscape=横向反面打印(&N)
+radiobutton.revportrait=纵向反面打印(&I)
+radiobutton.tumble=翻转(&T)
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=\u5916\u89C2(&A)
-tab.general=\u4E00\u822C\u4FE1\u606F(&G)
-tab.pagesetup=\u9875\u9762\u8BBE\u7F6E(&S)
+tab.appearance=外观(&A)
+tab.general=一般信息(&G)
+tab.pagesetup=页面设置(&S)
 #
-error.pagerange=\u65E0\u6548\u7684\u9875\u9762\u8303\u56F4; \u8BF7\u91CD\u65B0\u8F93\u5165\u6570\u503C (\u4F8B\u5982 1-3,5,7-10)
-error.destination=\u65E0\u6548\u7684\u6587\u4EF6\u540D; \u8BF7\u91CD\u8BD5
+error.pagerange=无效的页面范围; 请重新输入数值 (例如 1-3,5,7-10)
+error.destination=无效的文件名; 请重试
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
 # (in some cases the space character is replaced by '-' and the pound
@@ -144,64 +144,64 @@ iso-c7=C7 (ISO/DIN)
 iso-c8=C8 (ISO/DIN)
 iso-c9=C9 (ISO/DIN)
 iso-c10=C10 (ISO/DIN)
-na-letter=\u4FE1\u51FD
-na-legal=\u6CD5\u5F8B\u6587\u4E66
-executive=\u6267\u884C\u7A0B\u5E8F
-ledger=\u5E10\u76EE
-tabloid=\u5C0F\u62A5
-invoice=\u53D1\u7968
-folio=\u5BF9\u5F00\u9875
-quarto=\u56DB\u5F00\u9875
-japanese-postcard=\u660E\u4FE1\u7247 (JIS)
-oufuko-postcard=\u53CC\u9762\u660E\u4FE1\u7247 (JIS)
-a=\u5DE5\u7A0B A
-b=\u5DE5\u7A0B B
-c=\u5DE5\u7A0B C
-d=\u5DE5\u7A0B D
-e=\u5DE5\u7A0B E
-iso-designated-long=ISO \u6307\u5B9A\u957F\u5EA6
-italian-envelope=\u610F\u5927\u5229\u4FE1\u5C01
-italy-envelope=\u610F\u5927\u5229\u4FE1\u5C01
-invite-envelope=\u9080\u8BF7\u51FD\u4FE1\u5C01
-monarch-envelope=Monarch \u4FE1\u5C01
-personal-envelope=\u4E2A\u4EBA\u4FE1\u5C01
-na-number-9-envelope=9 \u53F7\u4FE1\u5C01
-na-number-10-envelope=10 \u53F7\u4FE1\u5C01
-na-number-11-envelope=11 \u53F7\u4FE1\u5C01
-na-number-12-envelope=12 \u53F7\u4FE1\u5C01
-na-number-14-envelope=14 \u53F7\u4FE1\u5C01
-na-6x9-envelope=6x9 \u4FE1\u5C01
-na-7x9-envelope=6x7 \u4FE1\u5C01
-na-9x11-envelope=9x11 \u4FE1\u5C01
-na-9x12-envelope=9x12 \u4FE1\u5C01
-na-10x13-envelope=10x15 \u4FE1\u5C01
-na-10x14-envelope=10x15 \u4FE1\u5C01
-na-10x15-envelope=10x15 \u4FE1\u5C01
-na-5x7=5" x 7" \u7EB8\u5F20
-na-8x10=8" x 10" \u7EB8\u5F20
+na-letter=信函
+na-legal=法律文书
+executive=执行程序
+ledger=帐目
+tabloid=小报
+invoice=发票
+folio=对开页
+quarto=四开页
+japanese-postcard=明信片 (JIS)
+oufuko-postcard=双面明信片 (JIS)
+a=工程 A
+b=工程 B
+c=工程 C
+d=工程 D
+e=工程 E
+iso-designated-long=ISO 指定长度
+italian-envelope=意大利信封
+italy-envelope=意大利信封
+invite-envelope=邀请函信封
+monarch-envelope=Monarch 信封
+personal-envelope=个人信封
+na-number-9-envelope=9 号信封
+na-number-10-envelope=10 号信封
+na-number-11-envelope=11 号信封
+na-number-12-envelope=12 号信封
+na-number-14-envelope=14 号信封
+na-6x9-envelope=6x9 信封
+na-7x9-envelope=6x7 信封
+na-9x11-envelope=9x11 信封
+na-9x12-envelope=9x12 信封
+na-10x13-envelope=10x15 信封
+na-10x14-envelope=10x15 信封
+na-10x15-envelope=10x15 信封
+na-5x7=5" x 7" 纸张
+na-8x10=8" x 10" 纸张
 #
 # The following keys match the Strings returned by MediaTray.toString()
 #
-auto-select=\u81EA\u52A8\u9009\u62E9
-top=\u4E0A
-middle=\u4E2D
-bottom=\u4E0B
-envelope=\u4FE1\u5C01
-manual=\u624B\u52A8
-large-capacity=\u5927\u5BB9\u91CF
-main=\u4E3B
-side=\u4FA7
+auto-select=自动选择
+top=上
+middle=中
+bottom=下
+envelope=信封
+manual=手动
+large-capacity=大容量
+main=主
+side=侧
 # Add the additional standard bins defined by win32
-Manual-Envelope=\u624B\u52A8\u4FE1\u5C01
-Automatic-Feeder=\u81EA\u52A8\u9988\u9001\u5668
-Tractor-Feeder=\u7275\u5F15\u5F0F\u9988\u9001\u5668
-Small-Format=\u5C0F\u53F7\u7248\u5F0F
-Large-Format=\u5927\u53F7\u7248\u5F0F
-Cassette=\u7EB8\u76D2
-Form-Source=\u8868\u683C\u6765\u6E90
+Manual-Envelope=手动信封
+Automatic-Feeder=自动馈送器
+Tractor-Feeder=牵引式馈送器
+Small-Format=小号版式
+Large-Format=大号版式
+Cassette=纸盒
+Form-Source=表格来源
 #
 # The following keys match the Strings returned by
 # PrinterIsAcceptingJobs.toString()
 #
-accepting-jobs=\u63A5\u53D7\u4F5C\u4E1A
-not-accepting-jobs=\u4E0D\u63A5\u53D7\u4F5C\u4E1A
+accepting-jobs=接受作业
+not-accepting-jobs=不接受作业
diff --git a/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties
index 393a9eca667..845122a0eb2 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties
@@ -25,74 +25,74 @@
 
 #
 #
-border.chromaticity=\u8272\u5F69\u5916\u89C0
-border.copies=\u4EFD\u6578
-border.jobattributes=\u5DE5\u4F5C\u5C6C\u6027
-border.media=\u5A92\u9AD4
-border.orientation=\u65B9\u5411
-border.printrange=\u5217\u5370\u7BC4\u570D
-border.printservice=\u5217\u5370\u670D\u52D9
-border.quality=\u54C1\u8CEA
-border.sides=\u908A
-border.margins=\u908A\u8DDD
-#
-button.cancel=\u53D6\u6D88
-button.ok=\u78BA\u5B9A
-button.print=\u5217\u5370
-button.properties=\u7279\u6027(&R)...
-#
-checkbox.collate=\u7406\u5E8F(&C)
-checkbox.jobsheets=\u6A19\u984C\u9801(&B)
-checkbox.printtofile=\u5217\u5370\u81F3\u6A94\u6848(&F)
-#
-dialog.printtitle=\u5217\u5370
-dialog.pstitle=\u9801\u9762\u8A2D\u5B9A
-dialog.overwrite=\u9019\u500B\u6A94\u6848\u5DF2\u7D93\u5B58\u5728\u3002\u60A8\u8981\u8986\u5BEB\u5DF2\u5B58\u5728\u7684\u6A94\u6848\u55CE\uFF1F
-dialog.owtitle=\u5217\u5370\u81F3\u6A94\u6848
-dialog.printtofile=\u5217\u5370\u81F3\u6A94\u6848
-dialog.noprintermsg=\u627E\u4E0D\u5230\u5217\u5370\u670D\u52D9\u3002
-dialog.writeerror=\u7121\u6CD5\u5BEB\u5165\u81F3\u6A94\u6848:
-#
-label.info=\u8CC7\u8A0A:
-label.jobname=\u5DE5\u4F5C\u540D\u7A31(&J):
-label.numcopies=\u5217\u5370\u4EFD\u6578(&O):
-label.priority=\u512A\u5148\u6B0A(&R):
-label.psname=\u540D\u7A31(&N):
-label.pstype=\u985E\u578B:
-label.rangeto=\u81F3
-label.size=\u5927\u5C0F(&Z):
-label.source=\u4F86\u6E90(&C):
-label.status=\u72C0\u614B:
-label.username=\u4F7F\u7528\u8005\u540D\u7A31(&U):
+border.chromaticity=色彩外觀
+border.copies=份數
+border.jobattributes=工作屬性
+border.media=媒體
+border.orientation=方向
+border.printrange=列印範圍
+border.printservice=列印服務
+border.quality=品質
+border.sides=邊
+border.margins=邊距
+#
+button.cancel=取消
+button.ok=確定
+button.print=列印
+button.properties=特性(&R)...
+#
+checkbox.collate=理序(&C)
+checkbox.jobsheets=標題頁(&B)
+checkbox.printtofile=列印至檔案(&F)
+#
+dialog.printtitle=列印
+dialog.pstitle=頁面設定
+dialog.overwrite=這個檔案已經存在。您要覆寫已存在的檔案嗎？
+dialog.owtitle=列印至檔案
+dialog.printtofile=列印至檔案
+dialog.noprintermsg=找不到列印服務。
+dialog.writeerror=無法寫入至檔案:
+#
+label.info=資訊:
+label.jobname=工作名稱(&J):
+label.numcopies=列印份數(&O):
+label.priority=優先權(&R):
+label.psname=名稱(&N):
+label.pstype=類型:
+label.rangeto=至
+label.size=大小(&Z):
+label.source=來源(&C):
+label.status=狀態:
+label.username=使用者名稱(&U):
 label.millimetres=(mm)
 label.inches=(in)
-label.topmargin=\u9802\u7AEF\u908A\u8DDD(&T)
-label.bottommargin=\u5E95\u90E8\u908A\u8DDD(&B)
-label.leftmargin=\u5DE6\u908A\u8DDD(&F)
-label.rightmargin=\u53F3\u908A\u8DDD(&R)
-#
-radiobutton.color=\u984F\u8272(&C)
-radiobutton.draftq=\u8349\u7A3F(&F)
-radiobutton.duplex=\u96D9\u9762\u5217\u5370(&D)
-radiobutton.highq=\u9AD8(&H)
-radiobutton.landscape=\u6A6B\u5411(&L)
-radiobutton.monochrome=\u55AE\u8272(&M)
-radiobutton.normalq=\u6B63\u5E38(&N)
-radiobutton.oneside=\u55AE\u9762(&O)
-radiobutton.portrait=\u76F4\u5411(&P)
-radiobutton.rangeall=\u5168\u90E8(&L)
-radiobutton.rangepages=\u9801\u9762(&E)
-radiobutton.revlandscape=\u53CD\u5411\u6A6B\u5370(&N)
-radiobutton.revportrait=\u53CD\u5411\u76F4\u5370(&I)
-radiobutton.tumble=\u7FFB\u8F49(&T)
+label.topmargin=頂端邊距(&T)
+label.bottommargin=底部邊距(&B)
+label.leftmargin=左邊距(&F)
+label.rightmargin=右邊距(&R)
+#
+radiobutton.color=顏色(&C)
+radiobutton.draftq=草稿(&F)
+radiobutton.duplex=雙面列印(&D)
+radiobutton.highq=高(&H)
+radiobutton.landscape=橫向(&L)
+radiobutton.monochrome=單色(&M)
+radiobutton.normalq=正常(&N)
+radiobutton.oneside=單面(&O)
+radiobutton.portrait=直向(&P)
+radiobutton.rangeall=全部(&L)
+radiobutton.rangepages=頁面(&E)
+radiobutton.revlandscape=反向橫印(&N)
+radiobutton.revportrait=反向直印(&I)
+radiobutton.tumble=翻轉(&T)
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=\u5916\u89C0(&A)
-tab.general=\u4E00\u822C(&G)
-tab.pagesetup=\u9801\u9762\u8A2D\u5B9A(&S)
+tab.appearance=外觀(&A)
+tab.general=一般(&G)
+tab.pagesetup=頁面設定(&S)
 #
-error.pagerange=\u7121\u6548\u7684\u9801\u9762\u7BC4\u570D; \u8ACB\u91CD\u65B0\u8F38\u5165\u6578\u503C (\u4F8B\u5982 1-3,5,7-10)
-error.destination=\u7121\u6548\u7684\u6A94\u540D; \u8ACB\u518D\u8A66\u4E00\u6B21
+error.pagerange=無效的頁面範圍; 請重新輸入數值 (例如 1-3,5,7-10)
+error.destination=無效的檔名; 請再試一次
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
 # (in some cases the space character is replaced by '-' and the pound
@@ -154,11 +154,11 @@ folio=Folio
 quarto=Quarto
 japanese-postcard=Postcard (JIS)
 oufuko-postcard=Double Postcard (JIS)
-a=\u5DE5\u7A0B A
-b=\u5DE5\u7A0B B
-c=\u5DE5\u7A0B C
-d=\u5DE5\u7A0B D
-e=\u5DE5\u7A0B E
+a=工程 A
+b=工程 B
+c=工程 C
+d=工程 D
+e=工程 E
 iso-designated-long=ISO Designated Long
 italian-envelope=Italy Envelope
 italy-envelope=Italy Envelope
@@ -182,26 +182,26 @@ na-8x10=8" x 10" Paper
 #
 # The following keys match the Strings returned by MediaTray.toString()
 #
-auto-select=\u81EA\u52D5\u9078\u53D6
-top=\u4E0A
-middle=\u4E2D
-bottom=\u4E0B
-envelope=\u5C01\u5957
-manual=\u624B\u9001
-large-capacity=\u5927\u5BB9\u91CF
-main=\u4E3B
-side=\u908A
+auto-select=自動選取
+top=上
+middle=中
+bottom=下
+envelope=封套
+manual=手送
+large-capacity=大容量
+main=主
+side=邊
 # Add the additional standard bins defined by win32
-Manual-Envelope=\u624B\u9001\u5C01\u5957
-Automatic-Feeder=\u81EA\u52D5\u994B\u7D19\u5668
-Tractor-Feeder=\u62D6\u66F3\u994B\u7D19\u5668
-Small-Format=\u5C0F\u683C\u5F0F
-Large-Format=\u5927\u683C\u5F0F
-Cassette=\u5361\u5F0F\u78C1\u5E36\u6A5F
-Form-Source=\u8868\u683C\u4F86\u6E90
+Manual-Envelope=手送封套
+Automatic-Feeder=自動饋紙器
+Tractor-Feeder=拖曳饋紙器
+Small-Format=小格式
+Large-Format=大格式
+Cassette=卡式磁帶機
+Form-Source=表格來源
 #
 # The following keys match the Strings returned by
 # PrinterIsAcceptingJobs.toString()
 #
-accepting-jobs=\u63A5\u53D7\u7684\u5DE5\u4F5C
-not-accepting-jobs=\u4E0D\u63A5\u53D7\u7684\u5DE5\u4F5C
+accepting-jobs=接受的工作
+not-accepting-jobs=不接受的工作
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties
index 2524aadb301..1bb8f4a6281 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties
@@ -48,7 +48,7 @@ FileChooser.saveInLabel.textAndMnemonic=Speichern in:
 FileChooser.fileNameLabel.textAndMnemonic=&Dateiname:
 FileChooser.folderNameLabel.textAndMnemonic=Ordner&name:
 FileChooser.filesOfTypeLabel.textAndMnemonic=Datei&typ:
-FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
+FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene höher
 FileChooser.upFolderAccessibleName=Nach oben
 FileChooser.homeFolderToolTip.textAndMnemonic=Home
 FileChooser.homeFolderAccessibleName=Home
@@ -60,13 +60,13 @@ FileChooser.listViewButtonAccessibleName=Liste
 FileChooser.listViewActionLabel.textAndMnemonic=Liste
 FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details
 FileChooser.detailsViewButtonAccessibleName=Details
-FileChooser.viewMenuButtonToolTipText = Ansichtsmen\u00FC
-FileChooser.viewMenuButtonAccessibleName = Ansichtsmen\u00FC
+FileChooser.viewMenuButtonToolTipText = Ansichtsmenü
+FileChooser.viewMenuButtonAccessibleName = Ansichtsmenü
 FileChooser.detailsViewActionLabel.textAndMnemonic=Details
 FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren
 FileChooser.viewMenuLabel.textAndMnemonic=Ansicht
 FileChooser.fileNameHeader.textAndMnemonic=Name
-FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe
+FileChooser.fileSizeHeader.textAndMnemonic=Größe
 FileChooser.fileTypeHeader.textAndMnemonic=Typ
-FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert
+FileChooser.fileDateHeader.textAndMnemonic=Geändert
 FileChooser.fileAttrHeader.textAndMnemonic=Attribute
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties
index fbb335625fb..49cf834fb51 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties
@@ -60,13 +60,13 @@ FileChooser.listViewButtonAccessibleName=Lista
 FileChooser.listViewActionLabel.textAndMnemonic=Lista
 FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalles
 FileChooser.detailsViewButtonAccessibleName=Detalles
-FileChooser.viewMenuButtonToolTipText = Men\u00FA Ver
-FileChooser.viewMenuButtonAccessibleName = Men\u00FA Ver
+FileChooser.viewMenuButtonToolTipText = Menú Ver
+FileChooser.viewMenuButtonAccessibleName = Menú Ver
 FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles
 FileChooser.refreshActionLabel.textAndMnemonic=Refrescar
 FileChooser.viewMenuLabel.textAndMnemonic=Ver
 FileChooser.fileNameHeader.textAndMnemonic=Nombre
-FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o
+FileChooser.fileSizeHeader.textAndMnemonic=Tamaño
 FileChooser.fileTypeHeader.textAndMnemonic=Tipo
 FileChooser.fileDateHeader.textAndMnemonic=Modificado
 FileChooser.fileAttrHeader.textAndMnemonic=Atributos
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties
index 3573a1ce989..02995950929 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties
@@ -50,23 +50,23 @@ FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier :
 FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier :
 FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
 FileChooser.upFolderAccessibleName=Monter
-FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire de base
-FileChooser.homeFolderAccessibleName=R\u00E9pertoire de base
-FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
+FileChooser.homeFolderToolTip.textAndMnemonic=Répertoire de base
+FileChooser.homeFolderAccessibleName=Répertoire de base
+FileChooser.newFolderToolTip.textAndMnemonic=Crée un dossier.
 FileChooser.newFolderAccessibleName=Nouveau dossier
 FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
 FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
 FileChooser.listViewButtonAccessibleName=Liste
 FileChooser.listViewActionLabel.textAndMnemonic=Liste
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails
-FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Détails
+FileChooser.detailsViewButtonAccessibleName=Détails
 FileChooser.viewMenuButtonToolTipText = Menu Affichage
 FileChooser.viewMenuButtonAccessibleName = Menu Affichage
-FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails
+FileChooser.detailsViewActionLabel.textAndMnemonic=Détails
 FileChooser.refreshActionLabel.textAndMnemonic=Actualiser
 FileChooser.viewMenuLabel.textAndMnemonic=Affichage
 FileChooser.fileNameHeader.textAndMnemonic=Nom
 FileChooser.fileSizeHeader.textAndMnemonic=Taille
 FileChooser.fileTypeHeader.textAndMnemonic=Type
-FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9
+FileChooser.fileDateHeader.textAndMnemonic=Modifié
 FileChooser.fileAttrHeader.textAndMnemonic=Attributs
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties
index 36e96afce7f..d85381addb9 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties
@@ -43,30 +43,30 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
-FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078
-FileChooser.upFolderAccessibleName=\u4E0A\u3078
-FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
-FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0
-FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
-FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8
-FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8
-FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30
-FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30
-FileChooser.viewMenuButtonToolTipText = \u8868\u793A\u30E1\u30CB\u30E5\u30FC
-FileChooser.viewMenuButtonAccessibleName = \u8868\u793A\u30E1\u30CB\u30E5\u30FC
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30
-FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
-FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D
-FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA
-FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
+FileChooser.lookInLabel.textAndMnemonic=ファイルの場所(&I):
+FileChooser.saveInLabel.textAndMnemonic=保存:
+FileChooser.fileNameLabel.textAndMnemonic=ファイル名(&N):
+FileChooser.folderNameLabel.textAndMnemonic=フォルダ名(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=ファイルのタイプ(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=1レベル上へ
+FileChooser.upFolderAccessibleName=上へ
+FileChooser.homeFolderToolTip.textAndMnemonic=ホーム
+FileChooser.homeFolderAccessibleName=ホーム
+FileChooser.newFolderToolTip.textAndMnemonic=新規フォルダの作成
+FileChooser.newFolderAccessibleName=新規フォルダ
+FileChooser.newFolderActionLabel.textAndMnemonic=新規フォルダ
+FileChooser.listViewButtonToolTip.textAndMnemonic=リスト
+FileChooser.listViewButtonAccessibleName=リスト
+FileChooser.listViewActionLabel.textAndMnemonic=リスト
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=詳細
+FileChooser.detailsViewButtonAccessibleName=詳細
+FileChooser.viewMenuButtonToolTipText = 表示メニュー
+FileChooser.viewMenuButtonAccessibleName = 表示メニュー
+FileChooser.detailsViewActionLabel.textAndMnemonic=詳細
+FileChooser.refreshActionLabel.textAndMnemonic=リフレッシュ
+FileChooser.viewMenuLabel.textAndMnemonic=表示
+FileChooser.fileNameHeader.textAndMnemonic=名前
+FileChooser.fileSizeHeader.textAndMnemonic=サイズ
+FileChooser.fileTypeHeader.textAndMnemonic=タイプ
+FileChooser.fileDateHeader.textAndMnemonic=修正日
+FileChooser.fileAttrHeader.textAndMnemonic=属性
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties
index 4fe5cc2509b..788f3a998a4 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties
@@ -43,30 +43,30 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\uCC3E\uB294 \uC704\uCE58(&I):
-FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
-FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C
-FileChooser.upFolderAccessibleName=\uC704\uB85C
-FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
-FileChooser.homeFolderAccessibleName=\uD648
-FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
-FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
-FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354
-FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D
-FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D
-FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80\uC815\uBCF4
-FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80\uC815\uBCF4
-FileChooser.viewMenuButtonToolTipText = \uBCF4\uAE30 \uBA54\uB274
-FileChooser.viewMenuButtonAccessibleName = \uBCF4\uAE30 \uBA54\uB274
-FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80\uC815\uBCF4
-FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C\uACE0\uCE68
-FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30
-FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984
-FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30
-FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615
-FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC
-FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131
+FileChooser.lookInLabel.textAndMnemonic=찾는 위치(&I):
+FileChooser.saveInLabel.textAndMnemonic=저장 위치:
+FileChooser.fileNameLabel.textAndMnemonic=파일 이름(&N):
+FileChooser.folderNameLabel.textAndMnemonic=폴더 이름(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=파일 유형(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=한 레벨 위로
+FileChooser.upFolderAccessibleName=위로
+FileChooser.homeFolderToolTip.textAndMnemonic=홈
+FileChooser.homeFolderAccessibleName=홈
+FileChooser.newFolderToolTip.textAndMnemonic=새 폴더 생성
+FileChooser.newFolderAccessibleName=새 폴더
+FileChooser.newFolderActionLabel.textAndMnemonic=새 폴더
+FileChooser.listViewButtonToolTip.textAndMnemonic=목록
+FileChooser.listViewButtonAccessibleName=목록
+FileChooser.listViewActionLabel.textAndMnemonic=목록
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=세부정보
+FileChooser.detailsViewButtonAccessibleName=세부정보
+FileChooser.viewMenuButtonToolTipText = 보기 메뉴
+FileChooser.viewMenuButtonAccessibleName = 보기 메뉴
+FileChooser.detailsViewActionLabel.textAndMnemonic=세부정보
+FileChooser.refreshActionLabel.textAndMnemonic=새로고침
+FileChooser.viewMenuLabel.textAndMnemonic=보기
+FileChooser.fileNameHeader.textAndMnemonic=이름
+FileChooser.fileSizeHeader.textAndMnemonic=크기
+FileChooser.fileTypeHeader.textAndMnemonic=유형
+FileChooser.fileDateHeader.textAndMnemonic=수정 날짜
+FileChooser.fileAttrHeader.textAndMnemonic=속성
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties
index 1c0e77f785f..de42d3dc4e0 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties
@@ -48,10 +48,10 @@ FileChooser.saveInLabel.textAndMnemonic=Salvar em:
 FileChooser.fileNameLabel.textAndMnemonic=&Nome do arquivo:
 FileChooser.folderNameLabel.textAndMnemonic=&Nome da pasta:
 FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do &tipo:
-FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima
+FileChooser.upFolderToolTip.textAndMnemonic=Um Nível Acima
 FileChooser.upFolderAccessibleName=Acima
-FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
-FileChooser.homeFolderAccessibleName=In\u00EDcio
+FileChooser.homeFolderToolTip.textAndMnemonic=Início
+FileChooser.homeFolderAccessibleName=Início
 FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta
 FileChooser.newFolderAccessibleName=Nova Pasta
 FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties
index 45d7ebcfa27..af43e11f958 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties
@@ -48,7 +48,7 @@ FileChooser.saveInLabel.textAndMnemonic=Spara i:
 FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
 FileChooser.folderNameLabel.textAndMnemonic=Mapp&namn:
 FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typen:
-FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
+FileChooser.upFolderToolTip.textAndMnemonic=Upp en nivå
 FileChooser.upFolderAccessibleName=Upp
 FileChooser.homeFolderToolTip.textAndMnemonic=Hem
 FileChooser.homeFolderAccessibleName=Hem
@@ -63,10 +63,10 @@ FileChooser.detailsViewButtonAccessibleName=Detaljer
 FileChooser.viewMenuButtonToolTipText = Menyn Visa
 FileChooser.viewMenuButtonAccessibleName = Menyn Visa
 FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer
-FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya
+FileChooser.refreshActionLabel.textAndMnemonic=Förnya
 FileChooser.viewMenuLabel.textAndMnemonic=Vy
 FileChooser.fileNameHeader.textAndMnemonic=Namn
 FileChooser.fileSizeHeader.textAndMnemonic=Storlek
 FileChooser.fileTypeHeader.textAndMnemonic=Typ
-FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad
+FileChooser.fileDateHeader.textAndMnemonic=Ändrad
 FileChooser.fileAttrHeader.textAndMnemonic=Attribut
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties
index 3dca99dfda4..8c6706b477c 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties
@@ -43,30 +43,30 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u627E(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
-FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7
-FileChooser.upFolderAccessibleName=\u5411\u4E0A
-FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
-FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55
-FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
-FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
-FileChooser.listViewButtonAccessibleName=\u5217\u8868
-FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u4FE1\u606F
-FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u4FE1\u606F
-FileChooser.viewMenuButtonToolTipText = \u67E5\u770B\u83DC\u5355
-FileChooser.viewMenuButtonAccessibleName = \u67E5\u770B\u83DC\u5355
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u4FE1\u606F
-FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
-FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
-FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
-FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
+FileChooser.lookInLabel.textAndMnemonic=查找(&I):
+FileChooser.saveInLabel.textAndMnemonic=保存:
+FileChooser.fileNameLabel.textAndMnemonic=文件名(&N):
+FileChooser.folderNameLabel.textAndMnemonic=文件夹名(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=文件类型(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=向上一级
+FileChooser.upFolderAccessibleName=向上
+FileChooser.homeFolderToolTip.textAndMnemonic=主目录
+FileChooser.homeFolderAccessibleName=主目录
+FileChooser.newFolderToolTip.textAndMnemonic=创建新文件夹
+FileChooser.newFolderAccessibleName=新建文件夹
+FileChooser.newFolderActionLabel.textAndMnemonic=新建文件夹
+FileChooser.listViewButtonToolTip.textAndMnemonic=列表
+FileChooser.listViewButtonAccessibleName=列表
+FileChooser.listViewActionLabel.textAndMnemonic=列表
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=详细信息
+FileChooser.detailsViewButtonAccessibleName=详细信息
+FileChooser.viewMenuButtonToolTipText = 查看菜单
+FileChooser.viewMenuButtonAccessibleName = 查看菜单
+FileChooser.detailsViewActionLabel.textAndMnemonic=详细信息
+FileChooser.refreshActionLabel.textAndMnemonic=刷新
+FileChooser.viewMenuLabel.textAndMnemonic=视图
+FileChooser.fileNameHeader.textAndMnemonic=名称
+FileChooser.fileSizeHeader.textAndMnemonic=大小
+FileChooser.fileTypeHeader.textAndMnemonic=类型
+FileChooser.fileDateHeader.textAndMnemonic=修改日期
+FileChooser.fileAttrHeader.textAndMnemonic=属性
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties
index 90bff7bf3e5..343910a69d9 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties
@@ -43,30 +43,30 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC:
-FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64
-FileChooser.upFolderAccessibleName=\u5F80\u4E0A
-FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
-FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304
-FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE
-FileChooser.listViewButtonAccessibleName=\u6E05\u55AE
-FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.viewMenuButtonToolTipText = \u6AA2\u8996\u529F\u80FD\u8868
-FileChooser.viewMenuButtonAccessibleName = \u6AA2\u8996\u529F\u80FD\u8868
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406
-FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31
-FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
-FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027
+FileChooser.lookInLabel.textAndMnemonic=查詢(&I):
+FileChooser.saveInLabel.textAndMnemonic=儲存於:
+FileChooser.fileNameLabel.textAndMnemonic=檔案名稱(&N):
+FileChooser.folderNameLabel.textAndMnemonic=資料夾名稱(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=檔案類型(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=往上一層
+FileChooser.upFolderAccessibleName=往上
+FileChooser.homeFolderToolTip.textAndMnemonic=主目錄
+FileChooser.homeFolderAccessibleName=主目錄
+FileChooser.newFolderToolTip.textAndMnemonic=建立新資料夾
+FileChooser.newFolderAccessibleName=新資料夾
+FileChooser.newFolderActionLabel.textAndMnemonic=新資料夾
+FileChooser.listViewButtonToolTip.textAndMnemonic=清單
+FileChooser.listViewButtonAccessibleName=清單
+FileChooser.listViewActionLabel.textAndMnemonic=清單
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=詳細資訊
+FileChooser.detailsViewButtonAccessibleName=詳細資訊
+FileChooser.viewMenuButtonToolTipText = 檢視功能表
+FileChooser.viewMenuButtonAccessibleName = 檢視功能表
+FileChooser.detailsViewActionLabel.textAndMnemonic=詳細資訊
+FileChooser.refreshActionLabel.textAndMnemonic=重新整理
+FileChooser.viewMenuLabel.textAndMnemonic=檢視
+FileChooser.fileNameHeader.textAndMnemonic=名稱
+FileChooser.fileSizeHeader.textAndMnemonic=大小
+FileChooser.fileTypeHeader.textAndMnemonic=類型
+FileChooser.fileDateHeader.textAndMnemonic=修改日期
+FileChooser.fileAttrHeader.textAndMnemonic=屬性
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ja.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ja.properties
index 4a928ccdc19..596477eed87 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ja.properties
+++ b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ja.properties
@@ -32,4 +32,4 @@
 menuFont=SansSerif-plain-11
 
 # Value for "All files" for FileDialog
-allFiles=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
+allFiles=すべてのファイル
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ko.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ko.properties
index 9e2df51d1ec..e134cf774ff 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ko.properties
+++ b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_ko.properties
@@ -32,4 +32,4 @@
 menuFont=SansSerif-plain-11
 
 # Value for "All files" for FileDialog
-allFiles=\uBAA8\uB4E0 \uD30C\uC77C
+allFiles=모든 파일
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties
index 38994e9d536..f956ae87670 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties
+++ b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties
@@ -32,4 +32,4 @@
 menuFont=SansSerif-plain-11
 
 # Value for "All files" for FileDialog
-allFiles=\u6240\u6709\u6587\u4EF6
+allFiles=所有文件
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties
index deb4bff9c02..eabcb1cb266 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties
+++ b/src/java.desktop/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties
@@ -32,4 +32,4 @@
 menuFont=SansSerif-plain-12
 
 # Value for "All files" for FileDialog
-allFiles=\u6240\u6709\u6A94\u6848
+allFiles=所有檔案
diff --git a/src/java.logging/share/classes/sun/util/logging/resources/logging_es.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_es.properties
index f115321c996..5454f09bf87 100644
--- a/src/java.logging/share/classes/sun/util/logging/resources/logging_es.properties
+++ b/src/java.logging/share/classes/sun/util/logging/resources/logging_es.properties
@@ -33,7 +33,7 @@ SEVERE=Grave
 # The following ALL CAPS words should be translated.
 WARNING=Advertencia
 # The following ALL CAPS words should be translated.
-INFO=Informaci\u00F3n
+INFO=Información
 # The following ALL CAPS words should be translated.
 CONFIG= Configurar
 # The following ALL CAPS words should be translated.
@@ -41,6 +41,6 @@ FINE=Detallado
 # The following ALL CAPS words should be translated.
 FINER=Muy Detallado
 # The following ALL CAPS words should be translated.
-FINEST=M\u00E1s Detallado
+FINEST=Más Detallado
 # The following ALL CAPS words should be translated.
 OFF=Desactivado
diff --git a/src/java.logging/share/classes/sun/util/logging/resources/logging_fr.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_fr.properties
index f4d308d4e2c..44676b6bf9e 100644
--- a/src/java.logging/share/classes/sun/util/logging/resources/logging_fr.properties
+++ b/src/java.logging/share/classes/sun/util/logging/resources/logging_fr.properties
@@ -37,10 +37,10 @@ INFO=Infos
 # The following ALL CAPS words should be translated.
 CONFIG= Config
 # The following ALL CAPS words should be translated.
-FINE=Pr\u00E9cis
+FINE=Précis
 # The following ALL CAPS words should be translated.
-FINER=Plus pr\u00E9cis
+FINER=Plus précis
 # The following ALL CAPS words should be translated.
-FINEST=Le plus pr\u00E9cis
+FINEST=Le plus précis
 # The following ALL CAPS words should be translated.
-OFF=D\u00E9sactiv\u00E9
+OFF=Désactivé
diff --git a/src/java.logging/share/classes/sun/util/logging/resources/logging_ja.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_ja.properties
index 508afbd86ba..6d49076f482 100644
--- a/src/java.logging/share/classes/sun/util/logging/resources/logging_ja.properties
+++ b/src/java.logging/share/classes/sun/util/logging/resources/logging_ja.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=\u3059\u3079\u3066
+ALL=すべて
 # The following ALL CAPS words should be translated.
-SEVERE=\u91CD\u5927
+SEVERE=重大
 # The following ALL CAPS words should be translated.
-WARNING=\u8B66\u544A
+WARNING=警告
 # The following ALL CAPS words should be translated.
-INFO=\u60C5\u5831
+INFO=情報
 # The following ALL CAPS words should be translated.
-CONFIG= \u69CB\u6210
+CONFIG= 構成
 # The following ALL CAPS words should be translated.
-FINE=\u666E\u901A
+FINE=普通
 # The following ALL CAPS words should be translated.
-FINER=\u8A73\u7D30
+FINER=詳細
 # The following ALL CAPS words should be translated.
-FINEST=\u6700\u3082\u8A73\u7D30
+FINEST=最も詳細
 # The following ALL CAPS words should be translated.
-OFF=\u30AA\u30D5
+OFF=オフ
diff --git a/src/java.logging/share/classes/sun/util/logging/resources/logging_ko.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_ko.properties
index ef69b1cbd7c..e6afe731b51 100644
--- a/src/java.logging/share/classes/sun/util/logging/resources/logging_ko.properties
+++ b/src/java.logging/share/classes/sun/util/logging/resources/logging_ko.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=\uBAA8\uB450
+ALL=모두
 # The following ALL CAPS words should be translated.
-SEVERE=\uC2EC\uAC01
+SEVERE=심각
 # The following ALL CAPS words should be translated.
-WARNING=\uACBD\uACE0
+WARNING=경고
 # The following ALL CAPS words should be translated.
-INFO=\uC815\uBCF4
+INFO=정보
 # The following ALL CAPS words should be translated.
-CONFIG= \uAD6C\uC131
+CONFIG= 구성
 # The following ALL CAPS words should be translated.
-FINE=\uBBF8\uC138
+FINE=미세
 # The following ALL CAPS words should be translated.
-FINER=\uBCF4\uB2E4 \uBBF8\uC138
+FINER=보다 미세
 # The following ALL CAPS words should be translated.
-FINEST=\uAC00\uC7A5 \uBBF8\uC138
+FINEST=가장 미세
 # The following ALL CAPS words should be translated.
-OFF=\uD574\uC81C
+OFF=해제
diff --git a/src/java.logging/share/classes/sun/util/logging/resources/logging_pt_BR.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_pt_BR.properties
index 8bb18b757ab..2a7db4a0d37 100644
--- a/src/java.logging/share/classes/sun/util/logging/resources/logging_pt_BR.properties
+++ b/src/java.logging/share/classes/sun/util/logging/resources/logging_pt_BR.properties
@@ -31,11 +31,11 @@ ALL=Tudo
 # The following ALL CAPS words should be translated.
 SEVERE=Grave
 # The following ALL CAPS words should be translated.
-WARNING=Advert\u00EAncia
+WARNING=Advertência
 # The following ALL CAPS words should be translated.
-INFO=Informa\u00E7\u00F5es
+INFO=Informações
 # The following ALL CAPS words should be translated.
-CONFIG= Configura\u00E7\u00E3o
+CONFIG= Configuração
 # The following ALL CAPS words should be translated.
 FINE=Detalhado
 # The following ALL CAPS words should be translated.
diff --git a/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_CN.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_CN.properties
index dc6f241ab83..62155bf6120 100644
--- a/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_CN.properties
+++ b/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_CN.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=\u5168\u90E8
+ALL=全部
 # The following ALL CAPS words should be translated.
-SEVERE=\u4E25\u91CD
+SEVERE=严重
 # The following ALL CAPS words should be translated.
-WARNING=\u8B66\u544A
+WARNING=警告
 # The following ALL CAPS words should be translated.
-INFO=\u4FE1\u606F
+INFO=信息
 # The following ALL CAPS words should be translated.
-CONFIG= \u914D\u7F6E
+CONFIG= 配置
 # The following ALL CAPS words should be translated.
-FINE=\u8BE6\u7EC6
+FINE=详细
 # The following ALL CAPS words should be translated.
-FINER=\u8F83\u8BE6\u7EC6
+FINER=较详细
 # The following ALL CAPS words should be translated.
-FINEST=\u975E\u5E38\u8BE6\u7EC6
+FINEST=非常详细
 # The following ALL CAPS words should be translated.
-OFF=\u7981\u7528
+OFF=禁用
diff --git a/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_TW.properties b/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_TW.properties
index c407828b941..3ec4812d7c6 100644
--- a/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_TW.properties
+++ b/src/java.logging/share/classes/sun/util/logging/resources/logging_zh_TW.properties
@@ -27,20 +27,20 @@
 # these are the same as the non-localized level name.
 
 # The following ALL CAPS words should be translated.
-ALL=\u6240\u6709
+ALL=所有
 # The following ALL CAPS words should be translated.
-SEVERE=\u56B4\u91CD
+SEVERE=嚴重
 # The following ALL CAPS words should be translated.
-WARNING=\u8B66\u544A
+WARNING=警告
 # The following ALL CAPS words should be translated.
-INFO=\u8CC7\u8A0A
+INFO=資訊
 # The following ALL CAPS words should be translated.
-CONFIG= \u7D44\u614B
+CONFIG= 組態
 # The following ALL CAPS words should be translated.
-FINE=\u8A73\u7D30
+FINE=詳細
 # The following ALL CAPS words should be translated.
-FINER=\u8F03\u8A73\u7D30
+FINER=較詳細
 # The following ALL CAPS words should be translated.
-FINEST=\u6700\u8A73\u7D30
+FINEST=最詳細
 # The following ALL CAPS words should be translated.
-OFF=\u95DC\u9589
+OFF=關閉
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
index ae2c6bf5cd1..e69ba4603b0 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
@@ -24,5 +24,5 @@
 # questions.
 #
 
-rmiregistry.usage=Verwendung: {0} <Optionen> <Port>\n\nwobei die <Optionen> Folgendes beinhalten:\n  -J<Laufzeitkennzeichen> Argument an den Java-Interpreter \u00FCbergeben
+rmiregistry.usage=Verwendung: {0} <Optionen> <Port>\n\nwobei die <Optionen> Folgendes beinhalten:\n  -J<Laufzeitkennzeichen> Argument an den Java-Interpreter übergeben
 rmiregistry.port.badnumber=Portargument {0} ist keine Zahl.
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties
index 21f95309ed9..a5dd1c9313b 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties
@@ -24,5 +24,5 @@
 # questions.
 #
 
-rmiregistry.usage=Sintaxis: {0} <opciones> <puerto>\n\ndonde las <opciones> son:\n  -J<indicador de tiempo de ejecuci\u00F3n> Pasar argumento al int\u00E9rprete de java
-rmiregistry.port.badnumber=argumento de puerto, {0}, no es un n\u00FAmero.
+rmiregistry.usage=Sintaxis: {0} <opciones> <puerto>\n\ndonde las <opciones> son:\n  -J<indicador de tiempo de ejecución> Pasar argumento al intérprete de java
+rmiregistry.port.badnumber=argumento de puerto, {0}, no es un número.
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties
index 788b28fe131..fdb6bb4fce1 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties
@@ -24,5 +24,5 @@
 # questions.
 #
 
-rmiregistry.usage=Syntaxe : {0} <options> <port>\n\no\u00F9 <options> comprend :\n  -J<indicateur d''ex\u00E9cution> Transmettre l''argument \u00E0 l''interpr\u00E9teur Java
+rmiregistry.usage=Syntaxe : {0} <options> <port>\n\noù <options> comprend :\n  -J<indicateur d''exécution> Transmettre l''argument à l''interpréteur Java
 rmiregistry.port.badnumber=l''argument port, {0}, n''est pas un nombre.
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties
index 40b9c65974e..e8fe2a6d859 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties
@@ -25,4 +25,4 @@
 #
 
 rmiregistry.usage=Uso: {0} <opzioni> <porta>\n\ndove <opzioni> include:\n  -J<flag fase di esecuzione> Passa l''argomento all''interprete java
-rmiregistry.port.badnumber=l''argomento della porta, {0}, non \u00E8 un numero.
+rmiregistry.port.badnumber=l''argomento della porta, {0}, non è un numero.
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
index 46261e666e4..c0388f0c064 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
@@ -24,5 +24,5 @@
 # questions.
 #
 
-rmiregistry.usage=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <port>\n\n<options>\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059\u3002\n -J<runtime flag> java\u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u306B\u5F15\u6570\u3092\u6E21\u3059
-rmiregistry.port.badnumber=\u30DD\u30FC\u30C8\u5F15\u6570{0}\u306F\u756A\u53F7\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+rmiregistry.usage=使用方法: {0} <options> <port>\n\n<options>には次のものがあります。\n -J<runtime flag> javaインタプリタに引数を渡す
+rmiregistry.port.badnumber=ポート引数{0}は番号ではありません。
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties
index 3f0aa5d9d11..c4524227f29 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties
@@ -24,5 +24,5 @@
 # questions.
 #
 
-rmiregistry.usage=\uC0AC\uC6A9\uBC95: {0} <options> <port>\n\n\uC5EC\uAE30\uC11C <options>\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n  -J<runtime flag> Java \uC778\uD130\uD504\uB9AC\uD130\uC5D0 \uC778\uC218\uB97C \uC804\uB2EC\uD569\uB2C8\uB2E4.
-rmiregistry.port.badnumber=\uD3EC\uD2B8 \uC778\uC218 {0}\uC740(\uB294) \uC22B\uC790\uAC00 \uC544\uB2D9\uB2C8\uB2E4.
+rmiregistry.usage=사용법: {0} <options> <port>\n\n여기서 <options>는 다음과 같습니다.\n  -J<runtime flag> Java 인터프리터에 인수를 전달합니다.
+rmiregistry.port.badnumber=포트 인수 {0}은(는) 숫자가 아닙니다.
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties
index a4784a18073..4b79fdd6f5b 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties
@@ -24,5 +24,5 @@
 # questions.
 #
 
-rmiregistry.usage=Uso: {0} <op\u00E7\u00F5es> <porta>\n\nem que <op\u00E7\u00F5es> inclui:\n  -J<flag de runtime> Especifica o argumento para o int\u00E9rprete de java
-rmiregistry.port.badnumber=o argumento da porta, {0}, n\u00E3o \u00E9 um n\u00FAmero.
+rmiregistry.usage=Uso: {0} <opções> <porta>\n\nem que <opções> inclui:\n  -J<flag de runtime> Especifica o argumento para o intérprete de java
+rmiregistry.port.badnumber=o argumento da porta, {0}, não é um número.
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties
index ea95f501997..c531721c2f2 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties
@@ -24,5 +24,5 @@
 # questions.
 #
 
-rmiregistry.usage=Syntax: {0} <alternativ> <port>\n\nd\u00E4r <alternativ> inkluderar:\n  -J<k\u00F6rningsflagga>   Skicka argumentet till Javatolken
-rmiregistry.port.badnumber=portargumentet, {0}, \u00E4r inte ett tal.
+rmiregistry.usage=Syntax: {0} <alternativ> <port>\n\ndär <alternativ> inkluderar:\n  -J<körningsflagga>   Skicka argumentet till Javatolken
+rmiregistry.port.badnumber=portargumentet, {0}, är inte ett tal.
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
index 9a5a2bf4af4..be0ad7a88ec 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
@@ -24,5 +24,5 @@
 # questions.
 #
 
-rmiregistry.usage=\u7528\u6CD5: {0} <\u9009\u9879> <\u7AEF\u53E3>\n\n\u5176\u4E2D, <\u9009\u9879> \u5305\u62EC: \n  -J<runtime \u6807\u8BB0> \u5C06\u53C2\u6570\u4F20\u9012\u5230 java \u89E3\u91CA\u5668
-rmiregistry.port.badnumber=\u7AEF\u53E3\u53C2\u6570 {0} \u4E0D\u662F\u6570\u5B57\u3002
+rmiregistry.usage=用法: {0} <选项> <端口>\n\n其中, <选项> 包括: \n  -J<runtime 标记> 将参数传递到 java 解释器
+rmiregistry.port.badnumber=端口参数 {0} 不是数字。
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties
index f98c2bc2638..84609b1f39a 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties
@@ -24,5 +24,5 @@
 # questions.
 #
 
-rmiregistry.usage=\u7528\u6CD5: {0} <options> <port>\n\n\u5176\u4E2D <options> \u5305\u62EC:\n  -J<runtime flag> \u50B3\u905E\u5F15\u6578\u5230 java \u76F4\u8B6F\u5668
-rmiregistry.port.badnumber=\u9023\u63A5\u57E0\u5F15\u6578\uFF0C{0}\uFF0C\u4E0D\u662F\u4E00\u500B\u6578\u5B57
+rmiregistry.usage=用法: {0} <options> <port>\n\n其中 <options> 包括:\n  -J<runtime flag> 傳遞引數到 java 直譯器
+rmiregistry.port.badnumber=連接埠引數，{0}，不是一個數字
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
index 1b11186a95a..333a5c9e4fa 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
@@ -24,16 +24,16 @@
 #
 
 # CacheRowSetImpl exceptions
-cachedrowsetimpl.populate = Ung\u00FCltiges ResultSet-Objekt zum Auff\u00FCllen der Methode angegeben
-cachedrowsetimpl.invalidp = Ung\u00FCltiger Persistence-Provider generiert
-cachedrowsetimpl.nullhash = CachedRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hashtabelle f\u00FCr Constructor angegeben
-cachedrowsetimpl.invalidop = Ung\u00FCltiger Vorgang beim Zeileneinf\u00FCgen
+cachedrowsetimpl.populate = Ungültiges ResultSet-Objekt zum Auffüllen der Methode angegeben
+cachedrowsetimpl.invalidp = Ungültiger Persistence-Provider generiert
+cachedrowsetimpl.nullhash = CachedRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hashtabelle für Constructor angegeben
+cachedrowsetimpl.invalidop = Ungültiger Vorgang beim Zeileneinfügen
 cachedrowsetimpl.accfailed = acceptChanges nicht erfolgreich
-cachedrowsetimpl.invalidcp = Ung\u00FCltige Cursorposition
-cachedrowsetimpl.illegalop = Unzul\u00E4ssiger Vorgang bei nicht eingef\u00FCgter Zeile
+cachedrowsetimpl.invalidcp = Ungültige Cursorposition
+cachedrowsetimpl.illegalop = Unzulässiger Vorgang bei nicht eingefügter Zeile
 cachedrowsetimpl.clonefail = Klonen nicht erfolgreich: {0}
-cachedrowsetimpl.invalidcol = Ung\u00FCltiger Spaltenindex
-cachedrowsetimpl.invalcolnm = Ung\u00FCltiger Spaltenname
+cachedrowsetimpl.invalidcol = Ungültiger Spaltenindex
+cachedrowsetimpl.invalcolnm = Ungültiger Spaltenname
 cachedrowsetimpl.boolfail = getBoolen bei Wert ( {0} ) in Spalte {1} nicht erfolgreich
 cachedrowsetimpl.bytefail = getByte bei Wert ( {0} ) in Spalte {1} nicht erfolgreich
 cachedrowsetimpl.shortfail = getShort bei Wert ( {0} ) in Spalte {1} nicht erfolgreich
@@ -41,80 +41,80 @@ cachedrowsetimpl.intfail = getInt bei Wert ( {0} ) in Spalte {1} nicht erfolgrei
 cachedrowsetimpl.longfail = getLong bei Wert ( {0} ) in Spalte {1} nicht erfolgreich
 cachedrowsetimpl.floatfail = getFloat bei Wert ( {0} ) in Spalte {1} nicht erfolgreich
 cachedrowsetimpl.doublefail = getDouble bei Wert ( {0} ) in Spalte {1} nicht erfolgreich
-cachedrowsetimpl.dtypemismt = Keine Datentyp\u00FCbereinstimmung 
-cachedrowsetimpl.datefail = getDate bei Wert ( {0} ) in Spalte {1} nicht erfolgreich. Keine Konvertierung m\u00F6glich
-cachedrowsetimpl.timefail = getTime bei Wert ( {0} ) in Spalte {1} nicht erfolgreich. Keine Konvertierung m\u00F6glich
-cachedrowsetimpl.posupdate = Positionierte Updates werden nicht unterst\u00FCtzt
-cachedrowsetimpl.unableins = Keine Instanziierung m\u00F6glich: {0}
-cachedrowsetimpl.beforefirst = beforeFirst: Ung\u00FCltiger Cursorvorgang
-cachedrowsetimpl.first = First: Ung\u00FCltiger Cursorvorgang
+cachedrowsetimpl.dtypemismt = Keine Datentypübereinstimmung 
+cachedrowsetimpl.datefail = getDate bei Wert ( {0} ) in Spalte {1} nicht erfolgreich. Keine Konvertierung möglich
+cachedrowsetimpl.timefail = getTime bei Wert ( {0} ) in Spalte {1} nicht erfolgreich. Keine Konvertierung möglich
+cachedrowsetimpl.posupdate = Positionierte Updates werden nicht unterstützt
+cachedrowsetimpl.unableins = Keine Instanziierung möglich: {0}
+cachedrowsetimpl.beforefirst = beforeFirst: Ungültiger Cursorvorgang
+cachedrowsetimpl.first = First: Ungültiger Cursorvorgang
 cachedrowsetimpl.last = last: TYPE_FORWARD_ONLY
-cachedrowsetimpl.absolute = absolute: Ung\u00FCltige Cursorposition
-cachedrowsetimpl.relative = relative: Ung\u00FCltige Cursorposition
+cachedrowsetimpl.absolute = absolute: Ungültige Cursorposition
+cachedrowsetimpl.relative = relative: Ungültige Cursorposition
 cachedrowsetimpl.asciistream = Lesen von ASCII-Stream nicht erfolgreich
-cachedrowsetimpl.binstream = Lesen von Bin\u00E4r-Stream nicht erfolgreich
-cachedrowsetimpl.failedins = Fehler beim Zeileneinf\u00FCgen
-cachedrowsetimpl.updateins = updateRow beim Zeileneinf\u00FCgen aufgerufen
+cachedrowsetimpl.binstream = Lesen von Binär-Stream nicht erfolgreich
+cachedrowsetimpl.failedins = Fehler beim Zeileneinfügen
+cachedrowsetimpl.updateins = updateRow beim Zeileneinfügen aufgerufen
 cachedrowsetimpl.movetoins = moveToInsertRow: CONCUR_READ_ONLY
 cachedrowsetimpl.movetoins1 = moveToInsertRow: keine Metadaten
-cachedrowsetimpl.movetoins2 = moveToInsertRow: ung\u00FCltige Spaltenanzahl
+cachedrowsetimpl.movetoins2 = moveToInsertRow: ungültige Spaltenanzahl
 cachedrowsetimpl.tablename = Tabellenname darf nicht null sein
-cachedrowsetimpl.keycols = Ung\u00FCltige Schl\u00FCsselspalten
-cachedrowsetimpl.opnotsupp = Vorgang nicht von Datenbank unterst\u00FCtzt
-cachedrowsetimpl.matchcols = \u00DCbereinstimmungsspalten entsprechen nicht den festgelegten Spalten
-cachedrowsetimpl.setmatchcols = \u00DCbereinstimmungsspalten m\u00FCssen vor dem Abrufen festgelegt werden
-cachedrowsetimpl.matchcols1 = Wert f\u00FCr \u00DCbereinstimmungsspalten muss gr\u00F6\u00DFer als 0 sein
-cachedrowsetimpl.matchcols2 = \u00DCbereinstimmungsspalten m\u00FCssen leer sein oder eine Nullzeichenfolge aufweisen
+cachedrowsetimpl.keycols = Ungültige Schlüsselspalten
+cachedrowsetimpl.opnotsupp = Vorgang nicht von Datenbank unterstützt
+cachedrowsetimpl.matchcols = Übereinstimmungsspalten entsprechen nicht den festgelegten Spalten
+cachedrowsetimpl.setmatchcols = Übereinstimmungsspalten müssen vor dem Abrufen festgelegt werden
+cachedrowsetimpl.matchcols1 = Wert für Übereinstimmungsspalten muss größer als 0 sein
+cachedrowsetimpl.matchcols2 = Übereinstimmungsspalten müssen leer sein oder eine Nullzeichenfolge aufweisen
 cachedrowsetimpl.unsetmatch = Spalten, deren Wert aufgehoben wird, entsprechen nicht den festgelegten Spalten
-cachedrowsetimpl.unsetmatch1 = Spaltenname als Argument f\u00FCr unsetMatchColumn verwenden
-cachedrowsetimpl.unsetmatch2 = Spalten-ID als Argument f\u00FCr unsetMatchColumn verwenden
-cachedrowsetimpl.numrows = Zeilenanzahl ist kleiner als null oder kleiner als Abrufgr\u00F6\u00DFe
+cachedrowsetimpl.unsetmatch1 = Spaltenname als Argument für unsetMatchColumn verwenden
+cachedrowsetimpl.unsetmatch2 = Spalten-ID als Argument für unsetMatchColumn verwenden
+cachedrowsetimpl.numrows = Zeilenanzahl ist kleiner als null oder kleiner als Abrufgröße
 cachedrowsetimpl.startpos = Startposition darf keinen Negativwert aufweisen
-cachedrowsetimpl.nextpage = Daten m\u00FCssen vor dem Aufruf ausgef\u00FCllt werden 
-cachedrowsetimpl.pagesize = Seitengr\u00F6\u00DFe darf nicht kleiner als null sein
-cachedrowsetimpl.pagesize1 = Seitengr\u00F6\u00DFe darf nicht gr\u00F6\u00DFer als maxRows sein
-cachedrowsetimpl.fwdonly = ResultSet kann nur vorw\u00E4rts gerichtet sein
+cachedrowsetimpl.nextpage = Daten müssen vor dem Aufruf ausgefüllt werden 
+cachedrowsetimpl.pagesize = Seitengröße darf nicht kleiner als null sein
+cachedrowsetimpl.pagesize1 = Seitengröße darf nicht größer als maxRows sein
+cachedrowsetimpl.fwdonly = ResultSet kann nur vorwärts gerichtet sein
 cachedrowsetimpl.type = Typ ist: {0}
-cachedrowsetimpl.opnotysupp = Vorgang noch nicht unterst\u00FCtzt
-cachedrowsetimpl.featnotsupp = Feature nicht unterst\u00FCtzt
+cachedrowsetimpl.opnotysupp = Vorgang noch nicht unterstützt
+cachedrowsetimpl.featnotsupp = Feature nicht unterstützt
 
 # WebRowSetImpl exceptions
-webrowsetimpl.nullhash = WebRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hashtabelle f\u00FCr Constructor angegeben
-webrowsetimpl.invalidwr = Ung\u00FCltiger Writer
-webrowsetimpl.invalidrd = Ung\u00FCltiger Reader
+webrowsetimpl.nullhash = WebRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hashtabelle für Constructor angegeben
+webrowsetimpl.invalidwr = Ungültiger Writer
+webrowsetimpl.invalidrd = Ungültiger Reader
 
 #FilteredRowSetImpl exceptions
-filteredrowsetimpl.relative = relative: Ung\u00FCltiger Cursorvorgang 
-filteredrowsetimpl.absolute = absolute: Ung\u00FCltiger Cursorvorgang
-filteredrowsetimpl.notallowed = Kein zul\u00E4ssiger Wert im Filter
+filteredrowsetimpl.relative = relative: Ungültiger Cursorvorgang 
+filteredrowsetimpl.absolute = absolute: Ungültiger Cursorvorgang
+filteredrowsetimpl.notallowed = Kein zulässiger Wert im Filter
 
 #JoinRowSetImpl exceptions
 joinrowsetimpl.notinstance = Keine Instanz von rowset
-joinrowsetimpl.matchnotset = \u00DCbereinstimmungsspalte wurde nicht f\u00FCr Join festgelegt
-joinrowsetimpl.numnotequal = Elementanzahl in rowset nicht gleich \u00DCbereinstimmungsspalte
+joinrowsetimpl.matchnotset = Übereinstimmungsspalte wurde nicht für Join festgelegt
+joinrowsetimpl.numnotequal = Elementanzahl in rowset nicht gleich Übereinstimmungsspalte
 joinrowsetimpl.notdefined = Kein definierter Join-Typ
-joinrowsetimpl.notsupported = Join-Typ wird nicht unterst\u00FCtzt
+joinrowsetimpl.notsupported = Join-Typ wird nicht unterstützt
 joinrowsetimpl.initerror = JoinRowSet-Initialisierungsfehler
 joinrowsetimpl.genericerr = Generischer JoinRowSet-Initialisierungsfehler
-joinrowsetimpl.emptyrowset = Leeres rowset kann nicht zu diesem JoinRowSet hinzugef\u00FCgt werden
+joinrowsetimpl.emptyrowset = Leeres rowset kann nicht zu diesem JoinRowSet hinzugefügt werden
 
 #JdbcRowSetImpl exceptions
-jdbcrowsetimpl.invalstate = Ung\u00FCltiger Status
-jdbcrowsetimpl.connect = JdbcRowSet (verbinden), keine JNDI-Verbindung m\u00F6glich
+jdbcrowsetimpl.invalstate = Ungültiger Status
+jdbcrowsetimpl.connect = JdbcRowSet (verbinden), keine JNDI-Verbindung möglich
 jdbcrowsetimpl.paramtype = Parametertyp kann nicht abgeleitet werden
-jdbcrowsetimpl.matchcols = \u00DCbereinstimmungsspalten entsprechen nicht den festgelegten Spalten
-jdbcrowsetimpl.setmatchcols = \u00DCbereinstimmungsspalten m\u00FCssen vor dem Abrufen festgelegt werden
-jdbcrowsetimpl.matchcols1 = Wert f\u00FCr \u00DCbereinstimmungsspalten muss gr\u00F6\u00DFer als 0 sein
-jdbcrowsetimpl.matchcols2 = \u00DCbereinstimmungsspalten k\u00F6nnen keine Null- oder leere Zeichenfolge aufweisen
+jdbcrowsetimpl.matchcols = Übereinstimmungsspalten entsprechen nicht den festgelegten Spalten
+jdbcrowsetimpl.setmatchcols = Übereinstimmungsspalten müssen vor dem Abrufen festgelegt werden
+jdbcrowsetimpl.matchcols1 = Wert für Übereinstimmungsspalten muss größer als 0 sein
+jdbcrowsetimpl.matchcols2 = Übereinstimmungsspalten können keine Null- oder leere Zeichenfolge aufweisen
 jdbcrowsetimpl.unsetmatch = Spalten, deren Wert aufgehoben wird, entsprechen nicht den festgelegten Spalten
-jdbcrowsetimpl.usecolname = Spaltenname als Argument f\u00FCr unsetMatchColumn verwenden
-jdbcrowsetimpl.usecolid = Spalten-ID als Argument f\u00FCr unsetMatchColumn verwenden
+jdbcrowsetimpl.usecolname = Spaltenname als Argument für unsetMatchColumn verwenden
+jdbcrowsetimpl.usecolid = Spalten-ID als Argument für unsetMatchColumn verwenden
 jdbcrowsetimpl.resnotupd = ResultSet kann nicht aktualisiert werden
-jdbcrowsetimpl.opnotysupp = Vorgang noch nicht unterst\u00FCtzt
-jdbcrowsetimpl.featnotsupp = Feature nicht unterst\u00FCtzt
+jdbcrowsetimpl.opnotysupp = Vorgang noch nicht unterstützt
+jdbcrowsetimpl.featnotsupp = Feature nicht unterstützt
 
 #CachedRowSetReader exceptions
-crsreader.connect = (JNDI) Verbindung nicht m\u00F6glich
+crsreader.connect = (JNDI) Verbindung nicht möglich
 crsreader.paramtype = Parametertyp kann nicht abgeleitet werden
 crsreader.connecterr = Interner Fehler in RowSetReader: Keine Verbindung oder kein Befehl
 crsreader.datedetected = Datum festgestellt
@@ -123,21 +123,21 @@ crsreader.caldetected = Kalender festgestellt
 #CachedRowSetWriter exceptions
 crswriter.connect = Verbindung kann nicht hergestellt werden
 crswriter.tname = writeData kann Tabellennamen nicht bestimmen
-crswriter.params1 = Wert f\u00FCr params1: {0} 
-crswriter.params2 = Wert f\u00FCr params2: {0} 
+crswriter.params1 = Wert für params1: {0} 
+crswriter.params2 = Wert für params2: {0} 
 crswriter.conflictsno =  Konflikte beim Synchronisieren 
 
 #InsertRow exceptions
-insertrow.novalue = Es wurde kein Wert eingef\u00FCgt
+insertrow.novalue = Es wurde kein Wert eingefügt
 
 #SyncResolverImpl exceptions
-syncrsimpl.indexval = Indexwert liegt au\u00DFerhalb des Bereichs  
+syncrsimpl.indexval = Indexwert liegt außerhalb des Bereichs  
 syncrsimpl.noconflict = Kein Konflikt bei dieser Spalte
-syncrsimpl.syncnotpos = Keine Synchronisierung m\u00F6glich
-syncrsimpl.valtores = Aufzul\u00F6sender Wert kann sich entweder in der Datenbank oder in cachedrowset befinden
+syncrsimpl.syncnotpos = Keine Synchronisierung möglich
+syncrsimpl.valtores = Aufzulösender Wert kann sich entweder in der Datenbank oder in cachedrowset befinden
 
 #WebRowSetXmlReader exception
-wrsxmlreader.invalidcp = Ende von RowSet wurde erreicht. Ung\u00FCltige Cursorposition
+wrsxmlreader.invalidcp = Ende von RowSet wurde erreicht. Ungültige Cursorposition
 wrsxmlreader.readxml = readXML: {0}
 wrsxmlreader.parseerr = ** Parsingfehler: {0}, Zeile: {1} , URI: {2}
 
@@ -145,25 +145,25 @@ wrsxmlreader.parseerr = ** Parsingfehler: {0}, Zeile: {1} , URI: {2}
 wrsxmlwriter.ioex = IOException: {0}
 wrsxmlwriter.sqlex = SQLException: {0}
 wrsxmlwriter.failedwrite = Schreiben des Wertes nicht erfolgreich
-wsrxmlwriter.notproper = Kein zul\u00E4ssiger Typ
+wsrxmlwriter.notproper = Kein zulässiger Typ
 
 #XmlReaderContentHandler exceptions
 xmlrch.errmap = Fehler beim Festlegen der Zuordnung: {0}
 xmlrch.errmetadata = Fehler beim Festlegen der Metadaten: {0}
-xmlrch.errinsertval = Fehler beim Einf\u00FCgen der Werte: {0}
+xmlrch.errinsertval = Fehler beim Einfügen der Werte: {0}
 xmlrch.errconstr = Fehler beim Erstellen der Zeile: {0}
-xmlrch.errdel = Fehler beim L\u00F6schen der Zeile: {0}
-xmlrch.errinsert = Fehler beim Erstellen der Einf\u00FCgezeile: {0}
-xmlrch.errinsdel = Fehler beim Erstellen der Einf\u00FCge- oder L\u00F6schzeile: {0}
+xmlrch.errdel = Fehler beim Löschen der Zeile: {0}
+xmlrch.errinsert = Fehler beim Erstellen der Einfügezeile: {0}
+xmlrch.errinsdel = Fehler beim Erstellen der Einfüge- oder Löschzeile: {0}
 xmlrch.errupdate = Fehler beim Erstellen der Updatezeile: {0}
 xmlrch.errupdrow = Fehler beim Aktualisieren der Zeile: {0}
 xmlrch.chars = Zeichen:
-xmlrch.badvalue = Ung\u00FCltiger Wert. Eigenschaft kann nicht auf null gesetzt werden
-xmlrch.badvalue1 = Ung\u00FCltiger Wert. Metadaten k\u00F6nnen nicht auf null gesetzt werden
+xmlrch.badvalue = Ungültiger Wert. Eigenschaft kann nicht auf null gesetzt werden
+xmlrch.badvalue1 = Ungültiger Wert. Metadaten können nicht auf null gesetzt werden
 xmlrch.warning =  ** Warnung: {0}, Zeile: {1} , URI: {2}
 
 #RIOptimisticProvider Exceptions
-riop.locking = Sperren der Klassifizierung wird nicht unterst\u00FCtzt
+riop.locking = Sperren der Klassifizierung wird nicht unterstützt
 
 #RIXMLProvider exceptions
-rixml.unsupp = Keine Unterst\u00FCtzung bei RIXMLProvider
+rixml.unsupp = Keine Unterstützung bei RIXMLProvider
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
index a07408974a3..f60fdc07675 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
@@ -24,16 +24,16 @@
 #
 
 # CacheRowSetImpl exceptions
-cachedrowsetimpl.populate = Se ha proporcionado un objeto ResultSet no v\u00E1lido para el m\u00E9todo de relleno
-cachedrowsetimpl.invalidp = El proveedor de persistencia generado no es v\u00E1lido
+cachedrowsetimpl.populate = Se ha proporcionado un objeto ResultSet no válido para el método de relleno
+cachedrowsetimpl.invalidp = El proveedor de persistencia generado no es válido
 cachedrowsetimpl.nullhash = La instancia CachedRowSetImpl no se puede crear. Se ha proporcionado una tabla hash nula al constructor
-cachedrowsetimpl.invalidop = Operaci\u00F3n no v\u00E1lida al insertar fila
+cachedrowsetimpl.invalidop = Operación no válida al insertar fila
 cachedrowsetimpl.accfailed = Fallo de acceptChanges
-cachedrowsetimpl.invalidcp = Posici\u00F3n de cursor no v\u00E1lida
-cachedrowsetimpl.illegalop = Operaci\u00F3n no permitida en fila no insertada
-cachedrowsetimpl.clonefail = Fallo en la clonaci\u00F3n: {0}
-cachedrowsetimpl.invalidcol = \u00CDndice de columnas no v\u00E1lido
-cachedrowsetimpl.invalcolnm = Nombre de columna no v\u00E1lido
+cachedrowsetimpl.invalidcp = Posición de cursor no válida
+cachedrowsetimpl.illegalop = Operación no permitida en fila no insertada
+cachedrowsetimpl.clonefail = Fallo en la clonación: {0}
+cachedrowsetimpl.invalidcol = Índice de columnas no válido
+cachedrowsetimpl.invalcolnm = Nombre de columna no válido
 cachedrowsetimpl.boolfail = Fallo de getBoolen en valor ( {0} ) de columna {1}
 cachedrowsetimpl.bytefail = Fallo de getByte en valor ( {0} ) de columna {1}
 cachedrowsetimpl.shortfail = Fallo de getShort en valor ( {0} ) de columna {1}
@@ -46,100 +46,100 @@ cachedrowsetimpl.datefail = Fallo de getDate en valor ( {0} ) de columna {1}. No
 cachedrowsetimpl.timefail = Fallo de getTime en valor ( {0} ) de columna {1}. No es posible convertir
 cachedrowsetimpl.posupdate = Actualizaciones posicionadas no soportadas
 cachedrowsetimpl.unableins = No se ha podido crear la instancia: {0}
-cachedrowsetimpl.beforefirst = beforeFirst: Operaci\u00F3n de cursor no v\u00E1lida
-cachedrowsetimpl.first = First: Operaci\u00F3n de cursor no v\u00E1lida
+cachedrowsetimpl.beforefirst = beforeFirst: Operación de cursor no válida
+cachedrowsetimpl.first = First: Operación de cursor no válida
 cachedrowsetimpl.last = last : TYPE_FORWARD_ONLY
-cachedrowsetimpl.absolute = absolute: Posici\u00F3n de cursor no v\u00E1lida
-cachedrowsetimpl.relative = relative: Posici\u00F3n de cursor no v\u00E1lida
+cachedrowsetimpl.absolute = absolute: Posición de cursor no válida
+cachedrowsetimpl.relative = relative: Posición de cursor no válida
 cachedrowsetimpl.asciistream = fallo en lectura de flujo de caracteres ascii
 cachedrowsetimpl.binstream = fallo de lectura de flujo binario
-cachedrowsetimpl.failedins = Fallo en inserci\u00F3n de fila
+cachedrowsetimpl.failedins = Fallo en inserción de fila
 cachedrowsetimpl.updateins = llamada a updateRow mientras se insertaba fila
 cachedrowsetimpl.movetoins = moveToInsertRow : CONCUR_READ_ONLY
 cachedrowsetimpl.movetoins1 = moveToInsertRow: no hay metadatos
-cachedrowsetimpl.movetoins2 = moveToInsertRow: n\u00FAmero de columnas no v\u00E1lido
+cachedrowsetimpl.movetoins2 = moveToInsertRow: número de columnas no válido
 cachedrowsetimpl.tablename = El nombre de la tabla no puede ser nulo
-cachedrowsetimpl.keycols = Columnas clave no v\u00E1lidas
-cachedrowsetimpl.opnotsupp = La base de datos no admite esta operaci\u00F3n
+cachedrowsetimpl.keycols = Columnas clave no válidas
+cachedrowsetimpl.opnotsupp = La base de datos no admite esta operación
 cachedrowsetimpl.matchcols = Las columnas coincidentes no concuerdan con las definidas
 cachedrowsetimpl.setmatchcols = Defina las columnas coincidentes antes de obtenerlas
 cachedrowsetimpl.matchcols1 = Las columnas coincidentes deben ser mayores que 0
-cachedrowsetimpl.matchcols2 = Las columnas coincidentes deben estar vac\u00EDas o ser una cadena nula
-cachedrowsetimpl.unsetmatch = Las columnas cuya definici\u00F3n se est\u00E1 anulando no concuerdan con las definidas
+cachedrowsetimpl.matchcols2 = Las columnas coincidentes deben estar vacías o ser una cadena nula
+cachedrowsetimpl.unsetmatch = Las columnas cuya definición se está anulando no concuerdan con las definidas
 cachedrowsetimpl.unsetmatch1 = Use el nombre de columna como argumento en unsetMatchColumn
 cachedrowsetimpl.unsetmatch2 = Use el identificador de columna como argumento en unsetMatchColumn
-cachedrowsetimpl.numrows = El n\u00FAmero de filas es menor que cero o menor que el tama\u00F1o recuperado
-cachedrowsetimpl.startpos = La posici\u00F3n de inicio no puede ser negativa
+cachedrowsetimpl.numrows = El número de filas es menor que cero o menor que el tamaño recuperado
+cachedrowsetimpl.startpos = La posición de inicio no puede ser negativa
 cachedrowsetimpl.nextpage = Rellene los datos antes de realizar la llamada 
-cachedrowsetimpl.pagesize = El tama\u00F1o de p\u00E1gina no puede ser menor que cero
-cachedrowsetimpl.pagesize1 = El tama\u00F1o de p\u00E1gina no puede ser mayor que maxRows
-cachedrowsetimpl.fwdonly = ResultSet s\u00F3lo se reenv\u00EDa
+cachedrowsetimpl.pagesize = El tamaño de página no puede ser menor que cero
+cachedrowsetimpl.pagesize1 = El tamaño de página no puede ser mayor que maxRows
+cachedrowsetimpl.fwdonly = ResultSet sólo se reenvía
 cachedrowsetimpl.type = El tipo es: {0}
-cachedrowsetimpl.opnotysupp = Operaci\u00F3n no soportada todav\u00EDa
-cachedrowsetimpl.featnotsupp = Funci\u00F3n no soportada
+cachedrowsetimpl.opnotysupp = Operación no soportada todavía
+cachedrowsetimpl.featnotsupp = Función no soportada
 
 # WebRowSetImpl exceptions
 webrowsetimpl.nullhash = La instancia WebRowSetImpl no se puede crear. Se ha proporcionado una tabla hash nula al constructor
-webrowsetimpl.invalidwr = Escritor no v\u00E1lido
-webrowsetimpl.invalidrd = Lector no v\u00E1lido
+webrowsetimpl.invalidwr = Escritor no válido
+webrowsetimpl.invalidrd = Lector no válido
 
 #FilteredRowSetImpl exceptions
-filteredrowsetimpl.relative = relative: Operaci\u00F3n de cursor no v\u00E1lida 
-filteredrowsetimpl.absolute = absolute: Operaci\u00F3n de cursor no v\u00E1lida
+filteredrowsetimpl.relative = relative: Operación de cursor no válida 
+filteredrowsetimpl.absolute = absolute: Operación de cursor no válida
 filteredrowsetimpl.notallowed = El filtro no admite este valor
 
 #JoinRowSetImpl exceptions
 joinrowsetimpl.notinstance = No es una instancia de rowset
-joinrowsetimpl.matchnotset = Las columnas coincidentes no est\u00E1n definidas para la uni\u00F3n
-joinrowsetimpl.numnotequal = El n\u00FAmero de elementos de rowset y el de columnas coincidentes no es el mismo
-joinrowsetimpl.notdefined = No es un tipo de uni\u00F3n definido
-joinrowsetimpl.notsupported = Este tipo de uni\u00F3n no est\u00E1 soportado
-joinrowsetimpl.initerror = Error de inicializaci\u00F3n de JoinRowSet
-joinrowsetimpl.genericerr = Error de inicializaci\u00F3n gen\u00E9rico de joinrowset
-joinrowsetimpl.emptyrowset = No se puede agregar un juego de filas vac\u00EDo a este JoinRowSet
+joinrowsetimpl.matchnotset = Las columnas coincidentes no están definidas para la unión
+joinrowsetimpl.numnotequal = El número de elementos de rowset y el de columnas coincidentes no es el mismo
+joinrowsetimpl.notdefined = No es un tipo de unión definido
+joinrowsetimpl.notsupported = Este tipo de unión no está soportado
+joinrowsetimpl.initerror = Error de inicialización de JoinRowSet
+joinrowsetimpl.genericerr = Error de inicialización genérico de joinrowset
+joinrowsetimpl.emptyrowset = No se puede agregar un juego de filas vacío a este JoinRowSet
 
 #JdbcRowSetImpl exceptions
-jdbcrowsetimpl.invalstate = Estado no v\u00E1lido
+jdbcrowsetimpl.invalstate = Estado no válido
 jdbcrowsetimpl.connect = JdbcRowSet (connect): JNDI no se puede conectar
-jdbcrowsetimpl.paramtype = No se puede deducir el tipo de par\u00E1metro
+jdbcrowsetimpl.paramtype = No se puede deducir el tipo de parámetro
 jdbcrowsetimpl.matchcols = Las columnas coincidentes no concuerdan con las definidas
 jdbcrowsetimpl.setmatchcols = Defina las columnas coincidentes antes de obtenerlas
 jdbcrowsetimpl.matchcols1 = Las columnas coincidentes deben ser mayores que 0
-jdbcrowsetimpl.matchcols2 = Las columnas coincidentes no pueden estar vac\u00EDas ni ser una cadena nula
-jdbcrowsetimpl.unsetmatch = Las columnas cuya definici\u00F3n se est\u00E1 anulando no concuerdan con las definidas
+jdbcrowsetimpl.matchcols2 = Las columnas coincidentes no pueden estar vacías ni ser una cadena nula
+jdbcrowsetimpl.unsetmatch = Las columnas cuya definición se está anulando no concuerdan con las definidas
 jdbcrowsetimpl.usecolname = Use el nombre de columna como argumento en unsetMatchColumn
 jdbcrowsetimpl.usecolid = Use el identificador de columna como argumento en unsetMatchColumn
 jdbcrowsetimpl.resnotupd = ResultSet no se puede actualizar
-jdbcrowsetimpl.opnotysupp = Operaci\u00F3n no soportada todav\u00EDa
-jdbcrowsetimpl.featnotsupp = Funci\u00F3n no soportada
+jdbcrowsetimpl.opnotysupp = Operación no soportada todavía
+jdbcrowsetimpl.featnotsupp = Función no soportada
 
 #CachedRowSetReader exceptions
 crsreader.connect = (JNDI) No se ha podido conectar
-crsreader.paramtype = No se ha podido deducir el tipo de par\u00E1metro
-crsreader.connecterr = Error interno en RowSetReader: no hay conexi\u00F3n o comando
+crsreader.paramtype = No se ha podido deducir el tipo de parámetro
+crsreader.connecterr = Error interno en RowSetReader: no hay conexión o comando
 crsreader.datedetected = Fecha Detectada
 crsreader.caldetected = Calendario Detectado
 
 #CachedRowSetWriter exceptions
-crswriter.connect = No se ha podido obtener una conexi\u00F3n
+crswriter.connect = No se ha podido obtener una conexión
 crswriter.tname = writeData no puede determinar el nombre de tabla
 crswriter.params1 = Valor de params1: {0} 
 crswriter.params2 = Valor de params2: {0} 
-crswriter.conflictsno =  conflictos en la sincronizaci\u00F3n 
+crswriter.conflictsno =  conflictos en la sincronización 
 
 #InsertRow exceptions
-insertrow.novalue = No se ha insertado ning\u00FAn valor
+insertrow.novalue = No se ha insertado ningún valor
 
 #SyncResolverImpl exceptions
-syncrsimpl.indexval = El valor de \u00EDndice est\u00E1 fuera de rango  
-syncrsimpl.noconflict = Esta columna no est\u00E1 en conflicto
+syncrsimpl.indexval = El valor de índice está fuera de rango  
+syncrsimpl.noconflict = Esta columna no está en conflicto
 syncrsimpl.syncnotpos = No se puede sincronizar
 syncrsimpl.valtores = El valor que se debe resolver puede estar en la base de datos o en cachedrowset
 
 #WebRowSetXmlReader exception
-wrsxmlreader.invalidcp = Se ha llegado al final de RowSet. Posici\u00F3n de cursor no v\u00E1lida
+wrsxmlreader.invalidcp = Se ha llegado al final de RowSet. Posición de cursor no válida
 wrsxmlreader.readxml = readXML : {0}
-wrsxmlreader.parseerr = ** Error de an\u00E1lisis: {0} , l\u00EDnea: {1} , uri: {2}
+wrsxmlreader.parseerr = ** Error de análisis: {0} , línea: {1} , uri: {2}
 
 #WebRowSetXmlWriter exceptions
 wrsxmlwriter.ioex = IOException : {0}
@@ -148,22 +148,22 @@ wrsxmlwriter.failedwrite = Error al escribir el valor
 wsrxmlwriter.notproper = Tipo incorrecto
 
 #XmlReaderContentHandler exceptions
-xmlrch.errmap = Error al definir la asignaci\u00F3n: {0}
+xmlrch.errmap = Error al definir la asignación: {0}
 xmlrch.errmetadata = Error al definir metadatos: {0}
 xmlrch.errinsertval = Error al insertar los valores: {0}
 xmlrch.errconstr = Error al construir la fila: {0}
 xmlrch.errdel = Error al suprimir la fila: {0}
-xmlrch.errinsert = Error al construir la fila de inserci\u00F3n: {0}
-xmlrch.errinsdel = Error al construir la fila de inserci\u00F3n o supresi\u00F3n: {0}
-xmlrch.errupdate = Error al construir la fila de actualizaci\u00F3n: {0}
+xmlrch.errinsert = Error al construir la fila de inserción: {0}
+xmlrch.errinsdel = Error al construir la fila de inserción o supresión: {0}
+xmlrch.errupdate = Error al construir la fila de actualización: {0}
 xmlrch.errupdrow = Error al actualizar la fila: {0}
 xmlrch.chars = caracteres:
 xmlrch.badvalue = Valor incorrecto; la propiedad no puede ser nula
 xmlrch.badvalue1 = Valor incorrecto; los metadatos no pueden ser nulos
-xmlrch.warning =  ** Advertencia: {0} , l\u00EDnea: {1} , uri: {2}
+xmlrch.warning =  ** Advertencia: {0} , línea: {1} , uri: {2}
 
 #RIOptimisticProvider Exceptions
-riop.locking = No se permite bloquear la clasificaci\u00F3n
+riop.locking = No se permite bloquear la clasificación
 
 #RIXMLProvider exceptions
 rixml.unsupp = No soportado con RIXMLProvider
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
index 585ed33b035..358ab13f1eb 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
@@ -24,13 +24,13 @@
 #
 
 # CacheRowSetImpl exceptions
-cachedrowsetimpl.populate = L'objet ResultSet fourni en entr\u00E9e de la m\u00E9thode n'est pas valide
-cachedrowsetimpl.invalidp = Le fournisseur de persistance g\u00E9n\u00E9r\u00E9 n'est pas valide
-cachedrowsetimpl.nullhash = Impossible de cr\u00E9er une instance de CachedRowSetImpl. Table de hachage NULL fournie au constructeur
-cachedrowsetimpl.invalidop = Op\u00E9ration non valide lors de l'insertion de ligne
+cachedrowsetimpl.populate = L'objet ResultSet fourni en entrée de la méthode n'est pas valide
+cachedrowsetimpl.invalidp = Le fournisseur de persistance généré n'est pas valide
+cachedrowsetimpl.nullhash = Impossible de créer une instance de CachedRowSetImpl. Table de hachage NULL fournie au constructeur
+cachedrowsetimpl.invalidop = Opération non valide lors de l'insertion de ligne
 cachedrowsetimpl.accfailed = Echec de acceptChanges
 cachedrowsetimpl.invalidcp = Position du curseur non valide
-cachedrowsetimpl.illegalop = Op\u00E9ration non admise sur une ligne non ins\u00E9r\u00E9e
+cachedrowsetimpl.illegalop = Opération non admise sur une ligne non insérée
 cachedrowsetimpl.clonefail = Echec du clonage : {0}
 cachedrowsetimpl.invalidcol = Index de colonne non valide
 cachedrowsetimpl.invalcolnm = Nom de colonne non valide
@@ -41,100 +41,100 @@ cachedrowsetimpl.intfail = Echec de getInt pour la valeur ({0}) de la colonne {1
 cachedrowsetimpl.longfail = Echec de getLong pour la valeur ({0}) de la colonne {1}
 cachedrowsetimpl.floatfail = Echec de getFloat pour la valeur ({0}) de la colonne {1}
 cachedrowsetimpl.doublefail = Echec de getDouble pour la valeur ({0}) de la colonne {1}
-cachedrowsetimpl.dtypemismt = Le type de donn\u00E9es ne correspond pas 
+cachedrowsetimpl.dtypemismt = Le type de données ne correspond pas 
 cachedrowsetimpl.datefail = Echec de getDate pour la valeur ({0}) de la colonne {1} - Aucune conversion possible
 cachedrowsetimpl.timefail = Echec de getTime pour la valeur ({0}) de la colonne {1} - Aucune conversion possible
-cachedrowsetimpl.posupdate = Mises \u00E0 jour choisies non prises en charge
+cachedrowsetimpl.posupdate = Mises à jour choisies non prises en charge
 cachedrowsetimpl.unableins = Instanciation impossible : {0}
-cachedrowsetimpl.beforefirst = beforeFirst : op\u00E9ration de curseur non valide
-cachedrowsetimpl.first = First : op\u00E9ration de curseur non valide
+cachedrowsetimpl.beforefirst = beforeFirst : opération de curseur non valide
+cachedrowsetimpl.first = First : opération de curseur non valide
 cachedrowsetimpl.last = last : TYPE_FORWARD_ONLY
 cachedrowsetimpl.absolute = absolute : position de curseur non valide
 cachedrowsetimpl.relative = relative : position de curseur non valide
-cachedrowsetimpl.asciistream = \u00E9chec de la lecture pour le flux ASCII
-cachedrowsetimpl.binstream = \u00E9chec de la lecture pour le flux binaire
+cachedrowsetimpl.asciistream = échec de la lecture pour le flux ASCII
+cachedrowsetimpl.binstream = échec de la lecture pour le flux binaire
 cachedrowsetimpl.failedins = Echec de l'insertion de ligne
 cachedrowsetimpl.updateins = appel de updateRow lors de l'insertion de ligne
 cachedrowsetimpl.movetoins = moveToInsertRow : CONCUR_READ_ONLY
-cachedrowsetimpl.movetoins1 = moveToInsertRow : aucune m\u00E9tadonn\u00E9e
+cachedrowsetimpl.movetoins1 = moveToInsertRow : aucune métadonnée
 cachedrowsetimpl.movetoins2 = moveToInsertRow : nombre de colonnes non valide
-cachedrowsetimpl.tablename = Le nom de la table ne peut pas \u00EAtre NULL
-cachedrowsetimpl.keycols = Colonnes de cl\u00E9 non valides
-cachedrowsetimpl.opnotsupp = Op\u00E9ration non prise en charge par la base de donn\u00E9es
-cachedrowsetimpl.matchcols = Les colonnes correspondantes ne sont pas les m\u00EAmes que les colonnes d\u00E9finies
-cachedrowsetimpl.setmatchcols = D\u00E9finir les colonnes correspondantes avant de les prendre
-cachedrowsetimpl.matchcols1 = Les colonnes correspondantes doivent \u00EAtre sup\u00E9rieures \u00E0 z\u00E9ro
-cachedrowsetimpl.matchcols2 = Les colonnes correspondantes doivent \u00EAtres vides ou ne contenir que des cha\u00EEnes NULL
-cachedrowsetimpl.unsetmatch = Les colonnes d\u00E9finies et non d\u00E9finies sont diff\u00E9rentes
+cachedrowsetimpl.tablename = Le nom de la table ne peut pas être NULL
+cachedrowsetimpl.keycols = Colonnes de clé non valides
+cachedrowsetimpl.opnotsupp = Opération non prise en charge par la base de données
+cachedrowsetimpl.matchcols = Les colonnes correspondantes ne sont pas les mêmes que les colonnes définies
+cachedrowsetimpl.setmatchcols = Définir les colonnes correspondantes avant de les prendre
+cachedrowsetimpl.matchcols1 = Les colonnes correspondantes doivent être supérieures à zéro
+cachedrowsetimpl.matchcols2 = Les colonnes correspondantes doivent êtres vides ou ne contenir que des chaînes NULL
+cachedrowsetimpl.unsetmatch = Les colonnes définies et non définies sont différentes
 cachedrowsetimpl.unsetmatch1 = Utiliser le nom de colonne comme argument pour unsetMatchColumn
 cachedrowsetimpl.unsetmatch2 = Utiliser l'ID de colonne comme argument pour unsetMatchColumn
-cachedrowsetimpl.numrows = Le nombre de lignes est inf\u00E9rieur \u00E0 z\u00E9ro ou \u00E0 la taille d'extraction
-cachedrowsetimpl.startpos = La position de d\u00E9part ne peut pas \u00EAtre n\u00E9gative
-cachedrowsetimpl.nextpage = Entrer les donn\u00E9es avant l'appel 
-cachedrowsetimpl.pagesize = La taille de la page ne peut pas \u00EAtre n\u00E9gative
-cachedrowsetimpl.pagesize1 = La taille de la page ne peut pas \u00EAtre sup\u00E9rieure \u00E0 maxRows
+cachedrowsetimpl.numrows = Le nombre de lignes est inférieur à zéro ou à la taille d'extraction
+cachedrowsetimpl.startpos = La position de départ ne peut pas être négative
+cachedrowsetimpl.nextpage = Entrer les données avant l'appel 
+cachedrowsetimpl.pagesize = La taille de la page ne peut pas être négative
+cachedrowsetimpl.pagesize1 = La taille de la page ne peut pas être supérieure à maxRows
 cachedrowsetimpl.fwdonly = ResultSet va en avant seulement
 cachedrowsetimpl.type = Le type est : {0}
-cachedrowsetimpl.opnotysupp = Op\u00E9ration non encore prise en charge
-cachedrowsetimpl.featnotsupp = Fonctionnalit\u00E9 non prise en charge
+cachedrowsetimpl.opnotysupp = Opération non encore prise en charge
+cachedrowsetimpl.featnotsupp = Fonctionnalité non prise en charge
 
 # WebRowSetImpl exceptions
-webrowsetimpl.nullhash = Impossible de cr\u00E9er une instance de WebRowSetImpl. Table de hachage NULL fournie au constructeur
-webrowsetimpl.invalidwr = Processus d'\u00E9criture non valide
+webrowsetimpl.nullhash = Impossible de créer une instance de WebRowSetImpl. Table de hachage NULL fournie au constructeur
+webrowsetimpl.invalidwr = Processus d'écriture non valide
 webrowsetimpl.invalidrd = Processus de lecture non valide
 
 #FilteredRowSetImpl exceptions
-filteredrowsetimpl.relative = relative : op\u00E9ration de curseur non valide 
-filteredrowsetimpl.absolute = absolute : op\u00E9ration de curseur non valide
-filteredrowsetimpl.notallowed = Cette valeur n'est pas autoris\u00E9e via le filtre
+filteredrowsetimpl.relative = relative : opération de curseur non valide 
+filteredrowsetimpl.absolute = absolute : opération de curseur non valide
+filteredrowsetimpl.notallowed = Cette valeur n'est pas autorisée via le filtre
 
 #JoinRowSetImpl exceptions
 joinrowsetimpl.notinstance = N'est pas une instance de RowSet
-joinrowsetimpl.matchnotset = Les colonnes correspondantes ne sont pas d\u00E9finies pour la jointure
-joinrowsetimpl.numnotequal = Le nombre d'\u00E9l\u00E9ments dans RowSet est diff\u00E9rent du nombre de colonnes correspondantes
-joinrowsetimpl.notdefined = Ce n'est pas un type de jointure d\u00E9fini
+joinrowsetimpl.matchnotset = Les colonnes correspondantes ne sont pas définies pour la jointure
+joinrowsetimpl.numnotequal = Le nombre d'éléments dans RowSet est différent du nombre de colonnes correspondantes
+joinrowsetimpl.notdefined = Ce n'est pas un type de jointure défini
 joinrowsetimpl.notsupported = Ce type de jointure n'est pas pris en charge
 joinrowsetimpl.initerror = Erreur d'initialisation de JoinRowSet
-joinrowsetimpl.genericerr = Erreur initiale g\u00E9n\u00E9rique de JoinRowSet
-joinrowsetimpl.emptyrowset = Impossible d'ajouter un objet RowSet vide \u00E0 ce JoinRowSet
+joinrowsetimpl.genericerr = Erreur initiale générique de JoinRowSet
+joinrowsetimpl.emptyrowset = Impossible d'ajouter un objet RowSet vide à ce JoinRowSet
 
 #JdbcRowSetImpl exceptions
 jdbcrowsetimpl.invalstate = Etat non valide
 jdbcrowsetimpl.connect = Impossible de connecter JNDI JdbcRowSet (connexion)
-jdbcrowsetimpl.paramtype = Impossible de d\u00E9duire le type de param\u00E8tre
-jdbcrowsetimpl.matchcols = Les colonnes correspondantes ne sont pas les m\u00EAmes que les colonnes d\u00E9finies
-jdbcrowsetimpl.setmatchcols = D\u00E9finir les colonnes correspondantes avant de les prendre
-jdbcrowsetimpl.matchcols1 = Les colonnes correspondantes doivent \u00EAtre sup\u00E9rieures \u00E0 z\u00E9ro
-jdbcrowsetimpl.matchcols2 = Les colonnes correspondantes ne doivent pas \u00EAtres NULL ni contenir des cha\u00EEnes vides
-jdbcrowsetimpl.unsetmatch = Les colonnes non d\u00E9finies ne sont pas les m\u00EAmes que les colonnes d\u00E9finies
+jdbcrowsetimpl.paramtype = Impossible de déduire le type de paramètre
+jdbcrowsetimpl.matchcols = Les colonnes correspondantes ne sont pas les mêmes que les colonnes définies
+jdbcrowsetimpl.setmatchcols = Définir les colonnes correspondantes avant de les prendre
+jdbcrowsetimpl.matchcols1 = Les colonnes correspondantes doivent être supérieures à zéro
+jdbcrowsetimpl.matchcols2 = Les colonnes correspondantes ne doivent pas êtres NULL ni contenir des chaînes vides
+jdbcrowsetimpl.unsetmatch = Les colonnes non définies ne sont pas les mêmes que les colonnes définies
 jdbcrowsetimpl.usecolname = Utiliser le nom de colonne comme argument pour unsetMatchColumn
 jdbcrowsetimpl.usecolid = Utiliser l'ID de colonne comme argument pour unsetMatchColumn
-jdbcrowsetimpl.resnotupd = La mise \u00E0 jour de ResultSet est interdite
-jdbcrowsetimpl.opnotysupp = Op\u00E9ration non encore prise en charge
-jdbcrowsetimpl.featnotsupp = Fonctionnalit\u00E9 non prise en charge
+jdbcrowsetimpl.resnotupd = La mise à jour de ResultSet est interdite
+jdbcrowsetimpl.opnotysupp = Opération non encore prise en charge
+jdbcrowsetimpl.featnotsupp = Fonctionnalité non prise en charge
 
 #CachedRowSetReader exceptions
 crsreader.connect = Impossible de connecter (JNDI)
-crsreader.paramtype = Impossible de d\u00E9duire le type de param\u00E8tre
-crsreader.connecterr = Erreur interne dans RowSetReader\u00A0: pas de connexion ni de commande
-crsreader.datedetected = Une date a \u00E9t\u00E9 d\u00E9tect\u00E9e
-crsreader.caldetected = Un calendrier a \u00E9t\u00E9 d\u00E9tect\u00E9
+crsreader.paramtype = Impossible de déduire le type de paramètre
+crsreader.connecterr = Erreur interne dans RowSetReader : pas de connexion ni de commande
+crsreader.datedetected = Une date a été détectée
+crsreader.caldetected = Un calendrier a été détecté
 
 #CachedRowSetWriter exceptions
 crswriter.connect = Impossible d'obtenir la connexion
-crswriter.tname = writeData ne peut pas d\u00E9terminer le nom de la table
+crswriter.tname = writeData ne peut pas déterminer le nom de la table
 crswriter.params1 = Valeur de params1 : {0} 
 crswriter.params2 = Valeur de params2 : {0} 
 crswriter.conflictsno =  conflits lors de la synchronisation 
 
 #InsertRow exceptions
-insertrow.novalue = Aucune valeur n'a \u00E9t\u00E9 ins\u00E9r\u00E9e
+insertrow.novalue = Aucune valeur n'a été insérée
 
 #SyncResolverImpl exceptions
 syncrsimpl.indexval = Valeur d'index hors plage  
 syncrsimpl.noconflict = Cette colonne n'est pas en conflit
 syncrsimpl.syncnotpos = La synchronisation est impossible
-syncrsimpl.valtores = La valeur \u00E0 r\u00E9soudre peut \u00EAtre soit dans la base de donn\u00E9es, soit dans CachedrowSet
+syncrsimpl.valtores = La valeur à résoudre peut être soit dans la base de données, soit dans CachedrowSet
 
 #WebRowSetXmlReader exception
 wrsxmlreader.invalidcp = Fin de RowSet atteinte. Position de curseur non valide
@@ -144,22 +144,22 @@ wrsxmlreader.parseerr = ** Erreur d''analyse : {0} , ligne : {1} , URI : {2}
 #WebRowSetXmlWriter exceptions
 wrsxmlwriter.ioex = Exception d''E/S : {0}
 wrsxmlwriter.sqlex = Exception SQL : {0}
-wrsxmlwriter.failedwrite = Echec d'\u00E9criture de la valeur
+wrsxmlwriter.failedwrite = Echec d'écriture de la valeur
 wsrxmlwriter.notproper = N'est pas un type correct
 
 #XmlReaderContentHandler exceptions
-xmlrch.errmap = Erreur lors de la d\u00E9finition du mappage : {0}
-xmlrch.errmetadata = Erreur lors de la d\u00E9finition des m\u00E9tadonn\u00E9es : {0}
-xmlrch.errinsertval = Erreur lors de l''insertion des valeurs\u00A0: {0}
+xmlrch.errmap = Erreur lors de la définition du mappage : {0}
+xmlrch.errmetadata = Erreur lors de la définition des métadonnées : {0}
+xmlrch.errinsertval = Erreur lors de l''insertion des valeurs : {0}
 xmlrch.errconstr = Erreur lors de la construction de la ligne : {0}
 xmlrch.errdel = Erreur lors de la suppression de la ligne : {0}
-xmlrch.errinsert = Erreur lors de la construction de la ligne \u00E0 ins\u00E9rer : {0}
+xmlrch.errinsert = Erreur lors de la construction de la ligne à insérer : {0}
 xmlrch.errinsdel = Erreur lors de la construction de la ligne insdel : {0}
-xmlrch.errupdate = Erreur lors de la construction de la ligne \u00E0 mettre \u00E0 jour : {0}
-xmlrch.errupdrow = Erreur lors de la mise \u00E0 jour de la ligne\u00A0: {0}
-xmlrch.chars = caract\u00E8res :
-xmlrch.badvalue = Valeur incorrecte ; cette propri\u00E9t\u00E9 ne peut pas \u00EAtre NULL
-xmlrch.badvalue1 = Valeur incorrecte ; ces m\u00E9tadonn\u00E9es ne peuvent pas \u00EAtre NULL
+xmlrch.errupdate = Erreur lors de la construction de la ligne à mettre à jour : {0}
+xmlrch.errupdrow = Erreur lors de la mise à jour de la ligne : {0}
+xmlrch.chars = caractères :
+xmlrch.badvalue = Valeur incorrecte ; cette propriété ne peut pas être NULL
+xmlrch.badvalue1 = Valeur incorrecte ; ces métadonnées ne peuvent pas être NULL
 xmlrch.warning =  ** Avertissement : {0} , ligne : {1} , URI : {2}
 
 #RIOptimisticProvider Exceptions
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
index f971660d290..88580523199 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
@@ -58,7 +58,7 @@ cachedrowsetimpl.updateins = updateRow chiamato nella riga di inserimento
 cachedrowsetimpl.movetoins = moveToInsertRow: CONCUR_READ_ONLY
 cachedrowsetimpl.movetoins1 = moveToInsertRow: nessun metadato
 cachedrowsetimpl.movetoins2 = moveToInsertRow: numero di colonne non valido
-cachedrowsetimpl.tablename = Il nome di tabella non pu\u00F2 essere nullo
+cachedrowsetimpl.tablename = Il nome di tabella non può essere nullo
 cachedrowsetimpl.keycols = Colonne chiave non valide
 cachedrowsetimpl.opnotsupp = Operazione non supportata dal database
 cachedrowsetimpl.matchcols = Le colonne di corrispondenza non coincidono con le colonne impostate
@@ -68,13 +68,13 @@ cachedrowsetimpl.matchcols2 = Le colonne di corrispondenza devono essere una str
 cachedrowsetimpl.unsetmatch = Le colonne rimosse non coincidono con le colonne impostate
 cachedrowsetimpl.unsetmatch1 = Utilizzare il nome di colonna come argomento per unsetMatchColumn
 cachedrowsetimpl.unsetmatch2 = Utilizzare l'ID di colonna come argomento per unsetMatchColumn
-cachedrowsetimpl.numrows = Il numero di righe \u00E8 inferiore a zero o alla dimensione di recupero
-cachedrowsetimpl.startpos = La posizione iniziale non pu\u00F2 essere negativa
+cachedrowsetimpl.numrows = Il numero di righe è inferiore a zero o alla dimensione di recupero
+cachedrowsetimpl.startpos = La posizione iniziale non può essere negativa
 cachedrowsetimpl.nextpage = Inserire i dati prima di chiamare 
-cachedrowsetimpl.pagesize = La dimensione della pagina non pu\u00F2 essere inferiore a zero
-cachedrowsetimpl.pagesize1 = La dimensione della pagina non pu\u00F2 essere superiore a maxRows
-cachedrowsetimpl.fwdonly = ResultSet \u00E8 a solo inoltro
-cachedrowsetimpl.type = Il tipo \u00E8: {0}
+cachedrowsetimpl.pagesize = La dimensione della pagina non può essere inferiore a zero
+cachedrowsetimpl.pagesize1 = La dimensione della pagina non può essere superiore a maxRows
+cachedrowsetimpl.fwdonly = ResultSet è a solo inoltro
+cachedrowsetimpl.type = Il tipo è: {0}
 cachedrowsetimpl.opnotysupp = Operazione attualmente non supportata
 cachedrowsetimpl.featnotsupp = Funzione non supportata
 
@@ -86,14 +86,14 @@ webrowsetimpl.invalidrd = Processo di lettura non valido
 #FilteredRowSetImpl exceptions
 filteredrowsetimpl.relative = relative: operazione cursore non valida 
 filteredrowsetimpl.absolute = absolute: operazione cursore non valida
-filteredrowsetimpl.notallowed = Questo valore non \u00E8 consentito nel filtro
+filteredrowsetimpl.notallowed = Questo valore non è consentito nel filtro
 
 #JoinRowSetImpl exceptions
-joinrowsetimpl.notinstance = Non \u00E8 un'istanza di rowset
+joinrowsetimpl.notinstance = Non è un'istanza di rowset
 joinrowsetimpl.matchnotset = Colonna di corrispondenza non impostata per l'unione
 joinrowsetimpl.numnotequal = Numero di elementi in rowset diverso dalla colonna di corrispondenza
-joinrowsetimpl.notdefined = Non \u00E8 un tipo di unione definito
-joinrowsetimpl.notsupported = Questo tipo di unione non \u00E8 supportato
+joinrowsetimpl.notdefined = Non è un tipo di unione definito
+joinrowsetimpl.notsupported = Questo tipo di unione non è supportato
 joinrowsetimpl.initerror = Errore di inizializzazione di JoinRowSet
 joinrowsetimpl.genericerr = Errore iniziale di joinrowset generico
 joinrowsetimpl.emptyrowset = Impossibile aggiungere un set di righe vuoto al JoinRowSet corrente
@@ -109,7 +109,7 @@ jdbcrowsetimpl.matchcols2 = Le colonne di corrispondenza non possono essere una
 jdbcrowsetimpl.unsetmatch = Le colonne rimosse non coincidono con le colonne impostate
 jdbcrowsetimpl.usecolname = Utilizzare il nome di colonna come argomento per unsetMatchColumn
 jdbcrowsetimpl.usecolid = Utilizzare l'ID di colonna come argomento per unsetMatchColumn
-jdbcrowsetimpl.resnotupd = ResultSet non \u00E8 aggiornabile
+jdbcrowsetimpl.resnotupd = ResultSet non è aggiornabile
 jdbcrowsetimpl.opnotysupp = Operazione attualmente non supportata
 jdbcrowsetimpl.featnotsupp = Funzione non supportata
 
@@ -117,8 +117,8 @@ jdbcrowsetimpl.featnotsupp = Funzione non supportata
 crsreader.connect = (JNDI) Impossibile stabilire una connessione
 crsreader.paramtype = Impossibile dedurre il tipo di parametro
 crsreader.connecterr = Errore interno in RowSetReader: nessuna connessione o comando
-crsreader.datedetected = \u00C8 stata rilevata una data
-crsreader.caldetected = \u00C8 stato rilevato un calendario
+crsreader.datedetected = È stata rilevata una data
+crsreader.caldetected = È stato rilevato un calendario
 
 #CachedRowSetWriter exceptions
 crswriter.connect = Impossibile stabilire una connessione
@@ -128,13 +128,13 @@ crswriter.params2 = Valore dei parametri 2: {0}
 crswriter.conflictsno =  Conflitti durante la sincronizzazione 
 
 #InsertRow exceptions
-insertrow.novalue = Non \u00E8 stato inserito alcun valore
+insertrow.novalue = Non è stato inserito alcun valore
 
 #SyncResolverImpl exceptions
 syncrsimpl.indexval = Valore indice non compreso nell'intervallo  
-syncrsimpl.noconflict = Questa colonna non \u00E8 in conflitto
+syncrsimpl.noconflict = Questa colonna non è in conflitto
 syncrsimpl.syncnotpos = Impossibile eseguire la sincronizzazione
-syncrsimpl.valtores = Il valore da risolvere pu\u00F2 essere nel database o in cachedrowset
+syncrsimpl.valtores = Il valore da risolvere può essere nel database o in cachedrowset
 
 #WebRowSetXmlReader exception
 wrsxmlreader.invalidcp = Raggiunta la fine di RowSet. Posizione cursore non valida
@@ -158,12 +158,12 @@ xmlrch.errinsdel = Errore durante la costruzione della riga insdel: {0}
 xmlrch.errupdate = Errore durante la costruzione della riga di aggiornamento: {0}
 xmlrch.errupdrow = Errore durante l''aggiornamento della riga: {0}
 xmlrch.chars = caratteri:
-xmlrch.badvalue = valore non valido; propriet\u00E0 non annullabile
+xmlrch.badvalue = valore non valido; proprietà non annullabile
 xmlrch.badvalue1 = valore non valido; metadati non annullabili
 xmlrch.warning =  **Avvertenza: {0}, riga: {1}, URI: {2}
 
 #RIOptimisticProvider Exceptions
-riop.locking = La classificazione di blocco non \u00E8 supportata
+riop.locking = La classificazione di blocco non è supportata
 
 #RIXMLProvider exceptions
 rixml.unsupp = Non supportato con RIXMLProvider
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
index ef439225771..e5aebb2904e 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
@@ -24,146 +24,146 @@
 #
 
 # CacheRowSetImpl exceptions
-cachedrowsetimpl.populate = populate\u30E1\u30BD\u30C3\u30C9\u306B\u7121\u52B9\u306AResultSet\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304C\u4F7F\u7528\u3055\u308C\u307E\u3057\u305F
-cachedrowsetimpl.invalidp = \u7121\u52B9\u306A\u6C38\u7D9A\u6027\u30D7\u30ED\u30D0\u30A4\u30C0\u304C\u751F\u6210\u3055\u308C\u307E\u3057\u305F
-cachedrowsetimpl.nullhash = CachedRowSetImpl\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093\u3002\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306Bnull\u306EHashtable\u304C\u4F7F\u7528\u3055\u308C\u307E\u3057\u305F
-cachedrowsetimpl.invalidop = \u633F\u5165\u884C\u3067\u306E\u7121\u52B9\u306A\u64CD\u4F5C
-cachedrowsetimpl.accfailed = acceptChanges\u306E\u5931\u6557
-cachedrowsetimpl.invalidcp = \u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u4F4D\u7F6E
-cachedrowsetimpl.illegalop = \u633F\u5165\u3055\u308C\u306A\u304B\u3063\u305F\u884C\u306E\u4E0D\u6B63\u306A\u64CD\u4F5C
-cachedrowsetimpl.clonefail = \u30AF\u30ED\u30FC\u30F3\u306E\u5931\u6557: {0}
-cachedrowsetimpl.invalidcol = \u7121\u52B9\u306A\u5217\u7D22\u5F15
-cachedrowsetimpl.invalcolnm = \u7121\u52B9\u306A\u5217\u540D
-cachedrowsetimpl.boolfail = \u5217{1}\u306E\u5024({0})\u3067getBoolean\u304C\u5931\u6557\u3057\u307E\u3057\u305F
-cachedrowsetimpl.bytefail = \u5217{1}\u306E\u5024({0})\u3067getByte\u304C\u5931\u6557\u3057\u307E\u3057\u305F
-cachedrowsetimpl.shortfail = \u5217{1}\u306E\u5024({0})\u3067getShort\u304C\u5931\u6557\u3057\u307E\u3057\u305F
-cachedrowsetimpl.intfail = \u5217{1}\u306E\u5024({0})\u3067getInt\u304C\u5931\u6557\u3057\u307E\u3057\u305F
-cachedrowsetimpl.longfail = \u5217{1}\u306E\u5024({0})\u3067getLong\u304C\u5931\u6557\u3057\u307E\u3057\u305F
-cachedrowsetimpl.floatfail = \u5217{1}\u306E\u5024({0})\u3067getFloat\u304C\u5931\u6557\u3057\u307E\u3057\u305F
-cachedrowsetimpl.doublefail = \u5217{1}\u306E\u5024({0})\u3067getDouble\u304C\u5931\u6557\u3057\u307E\u3057\u305F
-cachedrowsetimpl.dtypemismt = \u30C7\u30FC\u30BF\u578B\u306E\u4E0D\u4E00\u81F4 
-cachedrowsetimpl.datefail = \u5217{1}\u306E\u5024({0})\u3067getDate\u304C\u5931\u6557\u3002\u5909\u63DB\u3067\u304D\u307E\u305B\u3093
-cachedrowsetimpl.timefail = \u5217{1}\u306E\u5024({0})\u3067getTime\u304C\u5931\u6557\u3002\u5909\u63DB\u3067\u304D\u307E\u305B\u3093
-cachedrowsetimpl.posupdate = \u4F4D\u7F6E\u6C7A\u3081\u3055\u308C\u305F\u66F4\u65B0\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093
-cachedrowsetimpl.unableins = \u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u306A\u3044: {0}
-cachedrowsetimpl.beforefirst = beforeFirst: \u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u64CD\u4F5C
-cachedrowsetimpl.first = First: \u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u64CD\u4F5C
+cachedrowsetimpl.populate = populateメソッドに無効なResultSetオブジェクトが使用されました
+cachedrowsetimpl.invalidp = 無効な永続性プロバイダが生成されました
+cachedrowsetimpl.nullhash = CachedRowSetImplインスタンスをインスタンス化できません。コンストラクタにnullのHashtableが使用されました
+cachedrowsetimpl.invalidop = 挿入行での無効な操作
+cachedrowsetimpl.accfailed = acceptChangesの失敗
+cachedrowsetimpl.invalidcp = 無効なカーソル位置
+cachedrowsetimpl.illegalop = 挿入されなかった行の不正な操作
+cachedrowsetimpl.clonefail = クローンの失敗: {0}
+cachedrowsetimpl.invalidcol = 無効な列索引
+cachedrowsetimpl.invalcolnm = 無効な列名
+cachedrowsetimpl.boolfail = 列{1}の値({0})でgetBooleanが失敗しました
+cachedrowsetimpl.bytefail = 列{1}の値({0})でgetByteが失敗しました
+cachedrowsetimpl.shortfail = 列{1}の値({0})でgetShortが失敗しました
+cachedrowsetimpl.intfail = 列{1}の値({0})でgetIntが失敗しました
+cachedrowsetimpl.longfail = 列{1}の値({0})でgetLongが失敗しました
+cachedrowsetimpl.floatfail = 列{1}の値({0})でgetFloatが失敗しました
+cachedrowsetimpl.doublefail = 列{1}の値({0})でgetDoubleが失敗しました
+cachedrowsetimpl.dtypemismt = データ型の不一致 
+cachedrowsetimpl.datefail = 列{1}の値({0})でgetDateが失敗。変換できません
+cachedrowsetimpl.timefail = 列{1}の値({0})でgetTimeが失敗。変換できません
+cachedrowsetimpl.posupdate = 位置決めされた更新がサポートされません
+cachedrowsetimpl.unableins = インスタンス化できない: {0}
+cachedrowsetimpl.beforefirst = beforeFirst: 無効なカーソル操作
+cachedrowsetimpl.first = First: 無効なカーソル操作
 cachedrowsetimpl.last = last: TYPE_FORWARD_ONLY
-cachedrowsetimpl.absolute = absolute: \u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u4F4D\u7F6E
-cachedrowsetimpl.relative = relative: \u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u4F4D\u7F6E
-cachedrowsetimpl.asciistream = ascii\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u8AAD\u8FBC\u307F\u304C\u5931\u6557\u3057\u307E\u3057\u305F
-cachedrowsetimpl.binstream = \u30D0\u30A4\u30CA\u30EA\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u8AAD\u8FBC\u307F\u304C\u5931\u6557\u3057\u307E\u3057\u305F
-cachedrowsetimpl.failedins = \u884C\u306E\u633F\u5165\u306B\u5931\u6557
-cachedrowsetimpl.updateins = \u633F\u5165\u884C\u306B\u304A\u3044\u3066updateRow\u304C\u547C\u3073\u51FA\u3055\u308C\u307E\u3057\u305F
+cachedrowsetimpl.absolute = absolute: 無効なカーソル位置
+cachedrowsetimpl.relative = relative: 無効なカーソル位置
+cachedrowsetimpl.asciistream = asciiストリームの読込みが失敗しました
+cachedrowsetimpl.binstream = バイナリ・ストリームの読込みが失敗しました
+cachedrowsetimpl.failedins = 行の挿入に失敗
+cachedrowsetimpl.updateins = 挿入行においてupdateRowが呼び出されました
 cachedrowsetimpl.movetoins = moveToInsertRow: CONCUR_READ_ONLY
-cachedrowsetimpl.movetoins1 = moveToInsertRow: \u30E1\u30BF\u30C7\u30FC\u30BF\u306A\u3057
-cachedrowsetimpl.movetoins2 = moveToInsertRow: \u7121\u52B9\u306A\u5217\u6570
-cachedrowsetimpl.tablename = \u8868\u540D\u306Bnull\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-cachedrowsetimpl.keycols = \u7121\u52B9\u306A\u30AD\u30FC\u5217
-cachedrowsetimpl.opnotsupp = \u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u3044\u64CD\u4F5C
-cachedrowsetimpl.matchcols = \u4E00\u81F4\u5217\u304C\u5217\u306E\u30BB\u30C3\u30C8\u3068\u540C\u3058\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-cachedrowsetimpl.setmatchcols = \u4E00\u81F4\u5217\u3092\u53D6\u5F97\u3059\u308B\u524D\u306B\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
-cachedrowsetimpl.matchcols1 = \u4E00\u81F4\u5217\u306F0\u3088\u308A\u5927\u304D\u3044\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-cachedrowsetimpl.matchcols2 = \u4E00\u81F4\u5217\u306F\u7A7A\u304Bnull\u6587\u5B57\u5217\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-cachedrowsetimpl.unsetmatch = \u8A2D\u5B9A\u89E3\u9664\u3055\u308C\u3066\u3044\u308B\u5217\u306F\u30BB\u30C3\u30C8\u3068\u540C\u3058\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-cachedrowsetimpl.unsetmatch1 = unsetMatchColumn\u3078\u306E\u5F15\u6570\u3068\u3057\u3066\u5217\u540D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-cachedrowsetimpl.unsetmatch2 = unsetMatchColumn\u3078\u306E\u5F15\u6570\u3068\u3057\u3066\u5217ID\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-cachedrowsetimpl.numrows = \u884C\u6570\u304C\u30BC\u30ED\u307E\u305F\u306F\u30D5\u30A7\u30C3\u30C1\u30FB\u30B5\u30A4\u30BA\u3088\u308A\u5C0F\u3055\u3044\u3067\u3059
-cachedrowsetimpl.startpos = \u958B\u59CB\u4F4D\u7F6E\u3092\u8CA0\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-cachedrowsetimpl.nextpage = \u547C\u51FA\u3057\u524D\u306B\u30C7\u30FC\u30BF\u3092\u79FB\u5165\u3057\u307E\u3059 
-cachedrowsetimpl.pagesize = \u30DA\u30FC\u30B8\u30FB\u30B5\u30A4\u30BA\u3092\u30BC\u30ED\u3088\u308A\u5C0F\u3055\u304F\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-cachedrowsetimpl.pagesize1 = \u30DA\u30FC\u30B8\u30FB\u30B5\u30A4\u30BA\u3092maxRows\u3088\u308A\u5927\u304D\u304F\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
-cachedrowsetimpl.fwdonly = ResultSet\u306F\u9806\u65B9\u5411\u306E\u307F\u3067\u3059
-cachedrowsetimpl.type = \u30BF\u30A4\u30D7: {0}
-cachedrowsetimpl.opnotysupp = \u307E\u3060\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u64CD\u4F5C
-cachedrowsetimpl.featnotsupp = \u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u6A5F\u80FD
+cachedrowsetimpl.movetoins1 = moveToInsertRow: メタデータなし
+cachedrowsetimpl.movetoins2 = moveToInsertRow: 無効な列数
+cachedrowsetimpl.tablename = 表名にnullは使用できません
+cachedrowsetimpl.keycols = 無効なキー列
+cachedrowsetimpl.opnotsupp = データベースでサポートされない操作
+cachedrowsetimpl.matchcols = 一致列が列のセットと同じではありません
+cachedrowsetimpl.setmatchcols = 一致列を取得する前に設定してください
+cachedrowsetimpl.matchcols1 = 一致列は0より大きい必要があります
+cachedrowsetimpl.matchcols2 = 一致列は空かnull文字列である必要があります
+cachedrowsetimpl.unsetmatch = 設定解除されている列はセットと同じではありません
+cachedrowsetimpl.unsetmatch1 = unsetMatchColumnへの引数として列名を使用してください
+cachedrowsetimpl.unsetmatch2 = unsetMatchColumnへの引数として列IDを使用してください
+cachedrowsetimpl.numrows = 行数がゼロまたはフェッチ・サイズより小さいです
+cachedrowsetimpl.startpos = 開始位置を負にすることはできません
+cachedrowsetimpl.nextpage = 呼出し前にデータを移入します 
+cachedrowsetimpl.pagesize = ページ・サイズをゼロより小さくすることはできません
+cachedrowsetimpl.pagesize1 = ページ・サイズをmaxRowsより大きくすることができません
+cachedrowsetimpl.fwdonly = ResultSetは順方向のみです
+cachedrowsetimpl.type = タイプ: {0}
+cachedrowsetimpl.opnotysupp = まだサポートされていない操作
+cachedrowsetimpl.featnotsupp = サポートされていない機能
 
 # WebRowSetImpl exceptions
-webrowsetimpl.nullhash = WebRowSetImpl\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093\u3002\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306Bnull\u306EHashtable\u304C\u4F7F\u7528\u3055\u308C\u307E\u3057\u305F
-webrowsetimpl.invalidwr = \u7121\u52B9\u306A\u30E9\u30A4\u30BF\u30FC
-webrowsetimpl.invalidrd = \u7121\u52B9\u306A\u30EA\u30FC\u30C0\u30FC
+webrowsetimpl.nullhash = WebRowSetImplインスタンスをインスタンス化できません。コンストラクタにnullのHashtableが使用されました
+webrowsetimpl.invalidwr = 無効なライター
+webrowsetimpl.invalidrd = 無効なリーダー
 
 #FilteredRowSetImpl exceptions
-filteredrowsetimpl.relative = relative: \u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u64CD\u4F5C 
-filteredrowsetimpl.absolute = absolute: \u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u64CD\u4F5C
-filteredrowsetimpl.notallowed = \u3053\u306E\u5024\u306F\u30D5\u30A3\u30EB\u30BF\u3067\u8A31\u5BB9\u3055\u308C\u307E\u305B\u3093
+filteredrowsetimpl.relative = relative: 無効なカーソル操作 
+filteredrowsetimpl.absolute = absolute: 無効なカーソル操作
+filteredrowsetimpl.notallowed = この値はフィルタで許容されません
 
 #JoinRowSetImpl exceptions
-joinrowsetimpl.notinstance = \u884C\u30BB\u30C3\u30C8\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-joinrowsetimpl.matchnotset = \u4E00\u81F4\u5217\u304C\u7D50\u5408\u7528\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-joinrowsetimpl.numnotequal = \u884C\u30BB\u30C3\u30C8\u306E\u8981\u7D20\u6570\u304C\u4E00\u81F4\u5217\u3068\u7B49\u3057\u304F\u3042\u308A\u307E\u305B\u3093
-joinrowsetimpl.notdefined = \u5B9A\u7FA9\u3055\u308C\u305F\u7D50\u5408\u306E\u30BF\u30A4\u30D7\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-joinrowsetimpl.notsupported = \u3053\u306E\u30BF\u30A4\u30D7\u306E\u7D50\u5408\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-joinrowsetimpl.initerror = JoinRowSet\u521D\u671F\u5316\u30A8\u30E9\u30FC
-joinrowsetimpl.genericerr = \u4E00\u822C\u7684\u306Ajoinrowset\u521D\u671F\u30A8\u30E9\u30FC
-joinrowsetimpl.emptyrowset = \u3053\u306EJoinRowSet\u306B\u7A7A\u306E\u884C\u30BB\u30C3\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+joinrowsetimpl.notinstance = 行セットのインスタンスではありません
+joinrowsetimpl.matchnotset = 一致列が結合用に設定されていません
+joinrowsetimpl.numnotequal = 行セットの要素数が一致列と等しくありません
+joinrowsetimpl.notdefined = 定義された結合のタイプではありません
+joinrowsetimpl.notsupported = このタイプの結合はサポートされていません
+joinrowsetimpl.initerror = JoinRowSet初期化エラー
+joinrowsetimpl.genericerr = 一般的なjoinrowset初期エラー
+joinrowsetimpl.emptyrowset = このJoinRowSetに空の行セットを追加することはできません
 
 #JdbcRowSetImpl exceptions
-jdbcrowsetimpl.invalstate = \u7121\u52B9\u306A\u72B6\u614B
-jdbcrowsetimpl.connect = JdbcRowSet (connect): JNDI\u304C\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093
-jdbcrowsetimpl.paramtype = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093
-jdbcrowsetimpl.matchcols = \u4E00\u81F4\u5217\u304C\u5217\u306E\u30BB\u30C3\u30C8\u3068\u540C\u3058\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-jdbcrowsetimpl.setmatchcols = \u4E00\u81F4\u5217\u3092\u53D6\u5F97\u3059\u308B\u524D\u306B\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
-jdbcrowsetimpl.matchcols1 = \u4E00\u81F4\u5217\u306F0\u3088\u308A\u5927\u304D\u3044\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-jdbcrowsetimpl.matchcols2 = \u4E00\u81F4\u5217\u3092\u7A7A\u307E\u305F\u306Fnull\u6587\u5B57\u5217\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-jdbcrowsetimpl.unsetmatch = \u8A2D\u5B9A\u89E3\u9664\u3055\u308C\u3066\u3044\u308B\u5217\u306F\u30BB\u30C3\u30C8\u3068\u540C\u3058\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-jdbcrowsetimpl.usecolname = unsetMatchColumn\u3078\u306E\u5F15\u6570\u3068\u3057\u3066\u5217\u540D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-jdbcrowsetimpl.usecolid = unsetMatchColumn\u3078\u306E\u5F15\u6570\u3068\u3057\u3066\u5217ID\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-jdbcrowsetimpl.resnotupd = ResultSet\u306F\u66F4\u65B0\u3067\u304D\u307E\u305B\u3093
-jdbcrowsetimpl.opnotysupp = \u307E\u3060\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u64CD\u4F5C
-jdbcrowsetimpl.featnotsupp = \u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u6A5F\u80FD
+jdbcrowsetimpl.invalstate = 無効な状態
+jdbcrowsetimpl.connect = JdbcRowSet (connect): JNDIが接続できません
+jdbcrowsetimpl.paramtype = パラメータ・タイプを推定できません
+jdbcrowsetimpl.matchcols = 一致列が列のセットと同じではありません
+jdbcrowsetimpl.setmatchcols = 一致列を取得する前に設定してください
+jdbcrowsetimpl.matchcols1 = 一致列は0より大きい必要があります
+jdbcrowsetimpl.matchcols2 = 一致列を空またはnull文字列にすることはできません
+jdbcrowsetimpl.unsetmatch = 設定解除されている列はセットと同じではありません
+jdbcrowsetimpl.usecolname = unsetMatchColumnへの引数として列名を使用してください
+jdbcrowsetimpl.usecolid = unsetMatchColumnへの引数として列IDを使用してください
+jdbcrowsetimpl.resnotupd = ResultSetは更新できません
+jdbcrowsetimpl.opnotysupp = まだサポートされていない操作
+jdbcrowsetimpl.featnotsupp = サポートされていない機能
 
 #CachedRowSetReader exceptions
-crsreader.connect = (JNDI)\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093
-crsreader.paramtype = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093
-crsreader.connecterr = RowSetReader\u306E\u5185\u90E8\u30A8\u30E9\u30FC: \u63A5\u7D9A\u307E\u305F\u306F\u30B3\u30DE\u30F3\u30C9\u306A\u3057
-crsreader.datedetected = \u65E5\u4ED8\u3092\u691C\u51FA\u3057\u307E\u3057\u305F
-crsreader.caldetected = \u30AB\u30EC\u30F3\u30C0\u3092\u691C\u51FA\u3057\u307E\u3057\u305F
+crsreader.connect = (JNDI)接続できません
+crsreader.paramtype = パラメータ・タイプを推定できません
+crsreader.connecterr = RowSetReaderの内部エラー: 接続またはコマンドなし
+crsreader.datedetected = 日付を検出しました
+crsreader.caldetected = カレンダを検出しました
 
 #CachedRowSetWriter exceptions
-crswriter.connect = \u63A5\u7D9A\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
-crswriter.tname = writeData\u304C\u8868\u540D\u3092\u5224\u5225\u3067\u304D\u307E\u305B\u3093
-crswriter.params1 = params1\u306E\u5024: {0} 
-crswriter.params2 = params2\u306E\u5024: {0} 
-crswriter.conflictsno =  \u540C\u671F\u4E2D\u306B\u7AF6\u5408\u304C\u767A\u751F\u3057\u307E\u3059 
+crswriter.connect = 接続を取得できません
+crswriter.tname = writeDataが表名を判別できません
+crswriter.params1 = params1の値: {0} 
+crswriter.params2 = params2の値: {0} 
+crswriter.conflictsno =  同期中に競合が発生します 
 
 #InsertRow exceptions
-insertrow.novalue = \u5024\u306F\u633F\u5165\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+insertrow.novalue = 値は挿入されていません
 
 #SyncResolverImpl exceptions
-syncrsimpl.indexval = \u7BC4\u56F2\u5916\u306E\u7D22\u5F15\u5024  
-syncrsimpl.noconflict = \u3053\u306E\u5217\u306F\u7AF6\u5408\u3057\u3066\u3044\u307E\u305B\u3093
-syncrsimpl.syncnotpos = \u540C\u671F\u3067\u304D\u307E\u305B\u3093
-syncrsimpl.valtores = \u89E3\u6C7A\u3055\u308C\u308B\u5024\u306F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u307E\u305F\u306Fcachedrowset\u306B\u3042\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+syncrsimpl.indexval = 範囲外の索引値  
+syncrsimpl.noconflict = この列は競合していません
+syncrsimpl.syncnotpos = 同期できません
+syncrsimpl.valtores = 解決される値はデータベースまたはcachedrowsetにある可能性があります
 
 #WebRowSetXmlReader exception
-wrsxmlreader.invalidcp = RowSet\u306E\u6700\u5F8C\u306B\u5230\u9054\u3057\u307E\u3057\u305F\u3002\u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u4F4D\u7F6E
+wrsxmlreader.invalidcp = RowSetの最後に到達しました。無効なカーソル位置
 wrsxmlreader.readxml = readXML: {0}
-wrsxmlreader.parseerr = **\u89E3\u6790\u30A8\u30E9\u30FC: {0}\u3001\u884C: {1}\u3001URI: {2}
+wrsxmlreader.parseerr = **解析エラー: {0}、行: {1}、URI: {2}
 
 #WebRowSetXmlWriter exceptions
 wrsxmlwriter.ioex = IOException: {0}
 wrsxmlwriter.sqlex = SQLException: {0}
-wrsxmlwriter.failedwrite = \u5024\u306E\u66F8\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-wsrxmlwriter.notproper = \u9069\u5207\u306A\u30BF\u30A4\u30D7\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+wrsxmlwriter.failedwrite = 値の書込みに失敗しました
+wsrxmlwriter.notproper = 適切なタイプではありません
 
 #XmlReaderContentHandler exceptions
-xmlrch.errmap = Map\u8A2D\u5B9A\u30A8\u30E9\u30FC: {0}
-xmlrch.errmetadata = \u30E1\u30BF\u30C7\u30FC\u30BF\u8A2D\u5B9A\u30A8\u30E9\u30FC: {0}
-xmlrch.errinsertval = \u5024\u306E\u633F\u5165\u30A8\u30E9\u30FC: {0}
-xmlrch.errconstr = \u884C\u306E\u751F\u6210\u30A8\u30E9\u30FC: {0}
-xmlrch.errdel = \u884C\u306E\u524A\u9664\u30A8\u30E9\u30FC: {0}
-xmlrch.errinsert = \u633F\u5165\u884C\u306E\u751F\u6210\u30A8\u30E9\u30FC: {0}
-xmlrch.errinsdel = insdel\u884C\u306E\u751F\u6210\u30A8\u30E9\u30FC: {0}
-xmlrch.errupdate = \u66F4\u65B0\u884C\u306E\u751F\u6210\u30A8\u30E9\u30FC: {0}
-xmlrch.errupdrow = \u884C\u306E\u66F4\u65B0\u30A8\u30E9\u30FC: {0}
-xmlrch.chars = \u6587\u5B57:
-xmlrch.badvalue = \u4E0D\u6B63\u306A\u5024: null\u306B\u3067\u304D\u306A\u3044\u30D7\u30ED\u30D1\u30C6\u30A3
-xmlrch.badvalue1 = \u4E0D\u6B63\u306A\u5024: null\u306B\u3067\u304D\u306A\u3044\u30E1\u30BF\u30C7\u30FC\u30BF
-xmlrch.warning =  **\u8B66\u544A: {0}\u3001\u884C: {1}\u3001URI: {2}
+xmlrch.errmap = Map設定エラー: {0}
+xmlrch.errmetadata = メタデータ設定エラー: {0}
+xmlrch.errinsertval = 値の挿入エラー: {0}
+xmlrch.errconstr = 行の生成エラー: {0}
+xmlrch.errdel = 行の削除エラー: {0}
+xmlrch.errinsert = 挿入行の生成エラー: {0}
+xmlrch.errinsdel = insdel行の生成エラー: {0}
+xmlrch.errupdate = 更新行の生成エラー: {0}
+xmlrch.errupdrow = 行の更新エラー: {0}
+xmlrch.chars = 文字:
+xmlrch.badvalue = 不正な値: nullにできないプロパティ
+xmlrch.badvalue1 = 不正な値: nullにできないメタデータ
+xmlrch.warning =  **警告: {0}、行: {1}、URI: {2}
 
 #RIOptimisticProvider Exceptions
-riop.locking = \u30ED\u30C3\u30AF\u306E\u5206\u985E\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+riop.locking = ロックの分類はサポートされていません
 
 #RIXMLProvider exceptions
-rixml.unsupp = RIXMLProvider\u3067\u306F\u672A\u30B5\u30DD\u30FC\u30C8
+rixml.unsupp = RIXMLProviderでは未サポート
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
index 9041d671483..f52cbead252 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
@@ -24,146 +24,146 @@
 #
 
 # CacheRowSetImpl exceptions
-cachedrowsetimpl.populate = \uBD80\uC801\uD569\uD55C ResultSet \uAC1D\uCCB4\uAC00 \uC81C\uACF5\uB418\uC5B4 \uBA54\uC18C\uB4DC\uB97C \uCC44\uC6B8 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.invalidp = \uBD80\uC801\uD569\uD55C \uC9C0\uC18D\uC131 \uC81C\uACF5\uC790\uAC00 \uC0DD\uC131\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.nullhash = CachedRowSetImpl \uC778\uC2A4\uD134\uC2A4\uB97C \uC778\uC2A4\uD134\uC2A4\uD654\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC0DD\uC131\uC790\uC5D0 \uB110 Hashtable\uC774 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.invalidop = \uD589\uC744 \uC0BD\uC785\uD558\uB294 \uC911 \uBD80\uC801\uD569\uD55C \uC791\uC5C5\uC774 \uC218\uD589\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.accfailed = acceptChanges\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.invalidcp = \uCEE4\uC11C \uC704\uCE58\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-cachedrowsetimpl.illegalop = \uC0BD\uC785\uB41C \uD589\uC774 \uC544\uB2CC \uD589\uC5D0\uC11C \uC798\uBABB\uB41C \uC791\uC5C5\uC774 \uC218\uD589\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.clonefail = \uBCF5\uC81C \uC2E4\uD328: {0}
-cachedrowsetimpl.invalidcol = \uC5F4 \uC778\uB371\uC2A4\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-cachedrowsetimpl.invalcolnm = \uC5F4 \uC774\uB984\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-cachedrowsetimpl.boolfail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getBoolen\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.bytefail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getByte\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.shortfail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getShort\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.intfail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getInt\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.longfail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getLong\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.floatfail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getFloat\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.doublefail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getDouble\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.dtypemismt = \uB370\uC774\uD130 \uC720\uD615\uC774 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. 
-cachedrowsetimpl.datefail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getDate\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uBCC0\uD658\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.timefail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getTime\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uBCC0\uD658\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.posupdate = \uC704\uCE58\uAC00 \uC9C0\uC815\uB41C \uC5C5\uB370\uC774\uD2B8\uAC00 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.unableins = \uC778\uC2A4\uD134\uC2A4\uD654\uD560 \uC218 \uC5C6\uC74C: {0}
-cachedrowsetimpl.beforefirst = beforeFirst: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-cachedrowsetimpl.first = \uCC98\uC74C: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-cachedrowsetimpl.last = \uB9C8\uC9C0\uB9C9: TYPE_FORWARD_ONLY
-cachedrowsetimpl.absolute = \uC808\uB300: \uCEE4\uC11C \uC704\uCE58\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-cachedrowsetimpl.relative = \uC0C1\uB300: \uCEE4\uC11C \uC704\uCE58\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-cachedrowsetimpl.asciistream = ASCII \uC2A4\uD2B8\uB9BC\uC5D0 \uB300\uD55C \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.binstream = \uBC14\uC774\uB108\uB9AC \uC2A4\uD2B8\uB9BC\uC5D0\uC11C \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.failedins = \uD589 \uC0BD\uC785\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.updateins = \uD589\uC744 \uC0BD\uC785\uD558\uB294 \uC911 updateRow\uAC00 \uD638\uCD9C\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+cachedrowsetimpl.populate = 부적합한 ResultSet 객체가 제공되어 메소드를 채울 수 없습니다.
+cachedrowsetimpl.invalidp = 부적합한 지속성 제공자가 생성되었습니다.
+cachedrowsetimpl.nullhash = CachedRowSetImpl 인스턴스를 인스턴스화할 수 없습니다. 생성자에 널 Hashtable이 제공되었습니다.
+cachedrowsetimpl.invalidop = 행을 삽입하는 중 부적합한 작업이 수행되었습니다.
+cachedrowsetimpl.accfailed = acceptChanges를 실패했습니다.
+cachedrowsetimpl.invalidcp = 커서 위치가 부적합합니다.
+cachedrowsetimpl.illegalop = 삽입된 행이 아닌 행에서 잘못된 작업이 수행되었습니다.
+cachedrowsetimpl.clonefail = 복제 실패: {0}
+cachedrowsetimpl.invalidcol = 열 인덱스가 부적합합니다.
+cachedrowsetimpl.invalcolnm = 열 이름이 부적합합니다.
+cachedrowsetimpl.boolfail = {1} 열의 값({0})에서 getBoolen을 실패했습니다.
+cachedrowsetimpl.bytefail = {1} 열의 값({0})에서 getByte를 실패했습니다.
+cachedrowsetimpl.shortfail = {1} 열의 값({0})에서 getShort를 실패했습니다.
+cachedrowsetimpl.intfail = {1} 열의 값({0})에서 getInt를 실패했습니다.
+cachedrowsetimpl.longfail = {1} 열의 값({0})에서 getLong을 실패했습니다.
+cachedrowsetimpl.floatfail = {1} 열의 값({0})에서 getFloat를 실패했습니다.
+cachedrowsetimpl.doublefail = {1} 열의 값({0})에서 getDouble을 실패했습니다.
+cachedrowsetimpl.dtypemismt = 데이터 유형이 일치하지 않습니다. 
+cachedrowsetimpl.datefail = {1} 열의 값({0})에서 getDate를 실패했습니다. 변환할 수 없습니다.
+cachedrowsetimpl.timefail = {1} 열의 값({0})에서 getTime을 실패했습니다. 변환할 수 없습니다.
+cachedrowsetimpl.posupdate = 위치가 지정된 업데이트가 지원되지 않습니다.
+cachedrowsetimpl.unableins = 인스턴스화할 수 없음: {0}
+cachedrowsetimpl.beforefirst = beforeFirst: 커서 작업이 부적합합니다.
+cachedrowsetimpl.first = 처음: 커서 작업이 부적합합니다.
+cachedrowsetimpl.last = 마지막: TYPE_FORWARD_ONLY
+cachedrowsetimpl.absolute = 절대: 커서 위치가 부적합합니다.
+cachedrowsetimpl.relative = 상대: 커서 위치가 부적합합니다.
+cachedrowsetimpl.asciistream = ASCII 스트림에 대한 읽기를 실패했습니다.
+cachedrowsetimpl.binstream = 바이너리 스트림에서 읽기를 실패했습니다.
+cachedrowsetimpl.failedins = 행 삽입을 실패했습니다.
+cachedrowsetimpl.updateins = 행을 삽입하는 중 updateRow가 호출되었습니다.
 cachedrowsetimpl.movetoins = moveToInsertRow: CONCUR_READ_ONLY
-cachedrowsetimpl.movetoins1 = moveToInsertRow: \uBA54\uD0C0\uB370\uC774\uD130\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.movetoins2 = moveToInsertRow: \uC5F4 \uC218\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-cachedrowsetimpl.tablename = \uD14C\uC774\uBE14 \uC774\uB984\uC740 \uB110\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.keycols = \uD0A4 \uC5F4\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-cachedrowsetimpl.opnotsupp = \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0\uC11C \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uB294 \uC791\uC5C5\uC785\uB2C8\uB2E4.
-cachedrowsetimpl.matchcols = \uC77C\uCE58 \uC5F4\uC774 \uC124\uC815\uB41C \uC5F4\uACFC \uB3D9\uC77C\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.setmatchcols = \uC77C\uCE58 \uC5F4\uC744 \uC124\uC815\uD55C \uD6C4 \uAC00\uC838\uC624\uC2ED\uC2DC\uC624.
-cachedrowsetimpl.matchcols1 = \uC77C\uCE58 \uC5F4\uC740 0\uAC1C \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-cachedrowsetimpl.matchcols2 = \uC77C\uCE58 \uC5F4\uC740 \uBE44\uC5B4 \uC788\uAC70\uB098 \uB110 \uBB38\uC790\uC5F4\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-cachedrowsetimpl.unsetmatch = \uC124\uC815\uC744 \uD574\uC81C\uD558\uB824\uB294 \uC5F4\uC774 \uC124\uC815\uB41C \uC5F4\uACFC \uB2E4\uB985\uB2C8\uB2E4.
-cachedrowsetimpl.unsetmatch1 = \uC5F4 \uC774\uB984\uC744 unsetMatchColumn\uC758 \uC778\uC218\uB85C \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
-cachedrowsetimpl.unsetmatch2 = \uC5F4 ID\uB97C unsetMatchColumn\uC758 \uC778\uC218\uB85C \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
-cachedrowsetimpl.numrows = \uD589 \uC218\uAC00 0\uBCF4\uB2E4 \uC791\uAC70\uB098 \uC778\uCD9C \uD06C\uAE30\uBCF4\uB2E4 \uC791\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.startpos = \uC2DC\uC791 \uC704\uCE58\uB294 \uC74C\uC218\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.nextpage = \uD638\uCD9C\uD558\uAE30 \uC804\uC5D0 \uB370\uC774\uD130\uB97C \uCC44\uC6B0\uC2ED\uC2DC\uC624. 
-cachedrowsetimpl.pagesize = \uD398\uC774\uC9C0 \uD06C\uAE30\uB294 0\uBCF4\uB2E4 \uC791\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.pagesize1 = \uD398\uC774\uC9C0 \uD06C\uAE30\uB294 maxRows\uBCF4\uB2E4 \uD074 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.fwdonly = ResultSet\uB294 \uC804\uB2EC \uC804\uC6A9\uC785\uB2C8\uB2E4.
-cachedrowsetimpl.type = \uC720\uD615: {0}
-cachedrowsetimpl.opnotysupp = \uC791\uC5C5\uC774 \uC544\uC9C1 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-cachedrowsetimpl.featnotsupp = \uAE30\uB2A5\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+cachedrowsetimpl.movetoins1 = moveToInsertRow: 메타데이터가 없습니다.
+cachedrowsetimpl.movetoins2 = moveToInsertRow: 열 수가 부적합합니다.
+cachedrowsetimpl.tablename = 테이블 이름은 널일 수 없습니다.
+cachedrowsetimpl.keycols = 키 열이 부적합합니다.
+cachedrowsetimpl.opnotsupp = 데이터베이스에서 지원하지 않는 작업입니다.
+cachedrowsetimpl.matchcols = 일치 열이 설정된 열과 동일하지 않습니다.
+cachedrowsetimpl.setmatchcols = 일치 열을 설정한 후 가져오십시오.
+cachedrowsetimpl.matchcols1 = 일치 열은 0개 이상이어야 합니다.
+cachedrowsetimpl.matchcols2 = 일치 열은 비어 있거나 널 문자열이어야 합니다.
+cachedrowsetimpl.unsetmatch = 설정을 해제하려는 열이 설정된 열과 다릅니다.
+cachedrowsetimpl.unsetmatch1 = 열 이름을 unsetMatchColumn의 인수로 사용하십시오.
+cachedrowsetimpl.unsetmatch2 = 열 ID를 unsetMatchColumn의 인수로 사용하십시오.
+cachedrowsetimpl.numrows = 행 수가 0보다 작거나 인출 크기보다 작습니다.
+cachedrowsetimpl.startpos = 시작 위치는 음수일 수 없습니다.
+cachedrowsetimpl.nextpage = 호출하기 전에 데이터를 채우십시오. 
+cachedrowsetimpl.pagesize = 페이지 크기는 0보다 작을 수 없습니다.
+cachedrowsetimpl.pagesize1 = 페이지 크기는 maxRows보다 클 수 없습니다.
+cachedrowsetimpl.fwdonly = ResultSet는 전달 전용입니다.
+cachedrowsetimpl.type = 유형: {0}
+cachedrowsetimpl.opnotysupp = 작업이 아직 지원되지 않습니다.
+cachedrowsetimpl.featnotsupp = 기능이 지원되지 않습니다.
 
 # WebRowSetImpl exceptions
-webrowsetimpl.nullhash = WebRowSetImpl \uC778\uC2A4\uD134\uC2A4\uB97C \uC778\uC2A4\uD134\uC2A4\uD654\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC0DD\uC131\uC790\uC5D0 \uB110 Hashtable\uC774 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-webrowsetimpl.invalidwr = \uAE30\uB85D \uC7A5\uCE58\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-webrowsetimpl.invalidrd = \uC77D\uAE30 \uD504\uB85C\uADF8\uB7A8\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+webrowsetimpl.nullhash = WebRowSetImpl 인스턴스를 인스턴스화할 수 없습니다. 생성자에 널 Hashtable이 제공되었습니다.
+webrowsetimpl.invalidwr = 기록 장치가 부적합합니다.
+webrowsetimpl.invalidrd = 읽기 프로그램이 부적합합니다.
 
 #FilteredRowSetImpl exceptions
-filteredrowsetimpl.relative = \uC0C1\uB300: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. 
-filteredrowsetimpl.absolute = \uC808\uB300: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-filteredrowsetimpl.notallowed = \uC774 \uAC12\uC740 \uD544\uD130\uB97C \uD1B5\uACFC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+filteredrowsetimpl.relative = 상대: 커서 작업이 부적합합니다. 
+filteredrowsetimpl.absolute = 절대: 커서 작업이 부적합합니다.
+filteredrowsetimpl.notallowed = 이 값은 필터를 통과할 수 없습니다.
 
 #JoinRowSetImpl exceptions
-joinrowsetimpl.notinstance = Rowset\uC758 \uC778\uC2A4\uD134\uC2A4\uAC00 \uC544\uB2D9\uB2C8\uB2E4.
-joinrowsetimpl.matchnotset = \uC870\uC778\uD560 \uC77C\uCE58 \uC5F4\uC774 \uC124\uC815\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-joinrowsetimpl.numnotequal = Rowset\uC758 \uC694\uC18C \uC218\uAC00 \uC77C\uCE58 \uC5F4\uACFC \uAC19\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-joinrowsetimpl.notdefined = \uC815\uC758\uB41C \uC870\uC778 \uC720\uD615\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-joinrowsetimpl.notsupported = \uC774 \uC870\uC778 \uC720\uD615\uC740 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-joinrowsetimpl.initerror = JoinRowSet \uCD08\uAE30\uD654 \uC624\uB958
-joinrowsetimpl.genericerr = \uC77C\uBC18 joinrowset \uCD08\uAE30 \uC624\uB958
-joinrowsetimpl.emptyrowset = \uBE48 rowset\uB97C \uC774 JoinRowSet\uC5D0 \uCD94\uAC00\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+joinrowsetimpl.notinstance = Rowset의 인스턴스가 아닙니다.
+joinrowsetimpl.matchnotset = 조인할 일치 열이 설정되지 않았습니다.
+joinrowsetimpl.numnotequal = Rowset의 요소 수가 일치 열과 같지 않습니다.
+joinrowsetimpl.notdefined = 정의된 조인 유형이 아닙니다.
+joinrowsetimpl.notsupported = 이 조인 유형은 지원되지 않습니다.
+joinrowsetimpl.initerror = JoinRowSet 초기화 오류
+joinrowsetimpl.genericerr = 일반 joinrowset 초기 오류
+joinrowsetimpl.emptyrowset = 빈 rowset를 이 JoinRowSet에 추가할 수 없습니다.
 
 #JdbcRowSetImpl exceptions
-jdbcrowsetimpl.invalstate = \uC0C1\uD0DC\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-jdbcrowsetimpl.connect = JdbcRowSet(\uC811\uC18D) JNDI\uAC00 \uC811\uC18D\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-jdbcrowsetimpl.paramtype = \uB9E4\uAC1C\uBCC0\uC218 \uC720\uD615\uC744 \uCD94\uB860\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-jdbcrowsetimpl.matchcols = \uC77C\uCE58 \uC5F4\uC774 \uC124\uC815\uB41C \uC5F4\uACFC \uB3D9\uC77C\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-jdbcrowsetimpl.setmatchcols = \uC77C\uCE58 \uC5F4\uC744 \uC124\uC815\uD55C \uD6C4 \uAC00\uC838\uC624\uC2ED\uC2DC\uC624.
-jdbcrowsetimpl.matchcols1 = \uC77C\uCE58 \uC5F4\uC740 0\uAC1C \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-jdbcrowsetimpl.matchcols2 = \uC77C\uCE58 \uC5F4\uC740 \uB110 \uB610\uB294 \uBE48 \uBB38\uC790\uC5F4\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-jdbcrowsetimpl.unsetmatch = \uC124\uC815\uC744 \uD574\uC81C\uD558\uB824\uB294 \uC5F4\uC774 \uC124\uC815\uB41C \uC5F4\uACFC \uB2E4\uB985\uB2C8\uB2E4.
-jdbcrowsetimpl.usecolname = \uC5F4 \uC774\uB984\uC744 unsetMatchColumn\uC758 \uC778\uC218\uB85C \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
-jdbcrowsetimpl.usecolid = \uC5F4 ID\uB97C unsetMatchColumn\uC758 \uC778\uC218\uB85C \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
-jdbcrowsetimpl.resnotupd = ResultSet\uB97C \uC5C5\uB370\uC774\uD2B8\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-jdbcrowsetimpl.opnotysupp = \uC791\uC5C5\uC774 \uC544\uC9C1 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-jdbcrowsetimpl.featnotsupp = \uAE30\uB2A5\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+jdbcrowsetimpl.invalstate = 상태가 부적합합니다.
+jdbcrowsetimpl.connect = JdbcRowSet(접속) JNDI가 접속할 수 없습니다.
+jdbcrowsetimpl.paramtype = 매개변수 유형을 추론할 수 없습니다.
+jdbcrowsetimpl.matchcols = 일치 열이 설정된 열과 동일하지 않습니다.
+jdbcrowsetimpl.setmatchcols = 일치 열을 설정한 후 가져오십시오.
+jdbcrowsetimpl.matchcols1 = 일치 열은 0개 이상이어야 합니다.
+jdbcrowsetimpl.matchcols2 = 일치 열은 널 또는 빈 문자열일 수 없습니다.
+jdbcrowsetimpl.unsetmatch = 설정을 해제하려는 열이 설정된 열과 다릅니다.
+jdbcrowsetimpl.usecolname = 열 이름을 unsetMatchColumn의 인수로 사용하십시오.
+jdbcrowsetimpl.usecolid = 열 ID를 unsetMatchColumn의 인수로 사용하십시오.
+jdbcrowsetimpl.resnotupd = ResultSet를 업데이트할 수 없습니다.
+jdbcrowsetimpl.opnotysupp = 작업이 아직 지원되지 않습니다.
+jdbcrowsetimpl.featnotsupp = 기능이 지원되지 않습니다.
 
 #CachedRowSetReader exceptions
-crsreader.connect = (JNDI) \uC811\uC18D\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-crsreader.paramtype = \uB9E4\uAC1C\uBCC0\uC218 \uC720\uD615\uC744 \uCD94\uB860\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-crsreader.connecterr = RowSetReader\uC5D0 \uB0B4\uBD80 \uC624\uB958 \uBC1C\uC0DD: \uC811\uC18D \uB610\uB294 \uBA85\uB839\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-crsreader.datedetected = \uB0A0\uC9DC\uB97C \uAC10\uC9C0\uD568
-crsreader.caldetected = \uB2EC\uB825\uC744 \uAC10\uC9C0\uD568
+crsreader.connect = (JNDI) 접속할 수 없습니다.
+crsreader.paramtype = 매개변수 유형을 추론할 수 없습니다.
+crsreader.connecterr = RowSetReader에 내부 오류 발생: 접속 또는 명령이 없습니다.
+crsreader.datedetected = 날짜를 감지함
+crsreader.caldetected = 달력을 감지함
 
 #CachedRowSetWriter exceptions
-crswriter.connect = \uC811\uC18D\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-crswriter.tname = writeData\uC5D0\uC11C \uD14C\uC774\uBE14 \uC774\uB984\uC744 \uD655\uC778\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-crswriter.params1 = params1\uC758 \uAC12: {0} 
-crswriter.params2 = params2\uC758 \uAC12: {0} 
-crswriter.conflictsno =  \uB3D9\uAE30\uD654\uD558\uB294 \uC911 \uCDA9\uB3CC\uD568 
+crswriter.connect = 접속할 수 없습니다.
+crswriter.tname = writeData에서 테이블 이름을 확인할 수 없습니다.
+crswriter.params1 = params1의 값: {0} 
+crswriter.params2 = params2의 값: {0} 
+crswriter.conflictsno =  동기화하는 중 충돌함 
 
 #InsertRow exceptions
-insertrow.novalue = \uAC12\uC774 \uC0BD\uC785\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
+insertrow.novalue = 값이 삽입되지 않았습니다.
 
 #SyncResolverImpl exceptions
-syncrsimpl.indexval = \uC778\uB371\uC2A4 \uAC12\uC774 \uBC94\uC704\uB97C \uBC97\uC5B4\uB0AC\uC2B5\uB2C8\uB2E4.  
-syncrsimpl.noconflict = \uC774 \uC5F4\uC740 \uCDA9\uB3CC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-syncrsimpl.syncnotpos = \uB3D9\uAE30\uD654\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-syncrsimpl.valtores = \uBD84\uC11D\uD560 \uAC12\uC774 \uB370\uC774\uD130\uBCA0\uC774\uC2A4 \uB610\uB294 cachedrowset\uC5D0 \uC788\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
+syncrsimpl.indexval = 인덱스 값이 범위를 벗어났습니다.  
+syncrsimpl.noconflict = 이 열은 충돌하지 않습니다.
+syncrsimpl.syncnotpos = 동기화할 수 없습니다.
+syncrsimpl.valtores = 분석할 값이 데이터베이스 또는 cachedrowset에 있을 수 있습니다.
 
 #WebRowSetXmlReader exception
-wrsxmlreader.invalidcp = RowSet\uC758 \uB05D\uC5D0 \uB3C4\uB2EC\uD588\uC2B5\uB2C8\uB2E4. \uCEE4\uC11C \uC704\uCE58\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+wrsxmlreader.invalidcp = RowSet의 끝에 도달했습니다. 커서 위치가 부적합합니다.
 wrsxmlreader.readxml = readXML: {0}
-wrsxmlreader.parseerr = ** \uAD6C\uBB38\uBD84\uC11D \uC624\uB958: {0}, \uD589: {1}, URI: {2}
+wrsxmlreader.parseerr = ** 구문분석 오류: {0}, 행: {1}, URI: {2}
 
 #WebRowSetXmlWriter exceptions
 wrsxmlwriter.ioex = IOException : {0}
 wrsxmlwriter.sqlex = SQLException : {0}
-wrsxmlwriter.failedwrite = \uAC12 \uC4F0\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-wsrxmlwriter.notproper = \uC801\uC808\uD55C \uC720\uD615\uC774 \uC544\uB2D9\uB2C8\uB2E4.
+wrsxmlwriter.failedwrite = 값 쓰기를 실패했습니다.
+wsrxmlwriter.notproper = 적절한 유형이 아닙니다.
 
 #XmlReaderContentHandler exceptions
-xmlrch.errmap = \uB9F5\uC744 \uC124\uC815\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
-xmlrch.errmetadata = \uBA54\uD0C0\uB370\uC774\uD130\uB97C \uC124\uC815\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
-xmlrch.errinsertval = \uAC12\uC744 \uC0BD\uC785\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
-xmlrch.errconstr = \uD589\uC744 \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
-xmlrch.errdel = \uD589\uC744 \uC0AD\uC81C\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
-xmlrch.errinsert = insert \uD589\uC744 \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
-xmlrch.errinsdel = insdel \uD589\uC744 \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
-xmlrch.errupdate = update \uD589\uC744 \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
-xmlrch.errupdrow = \uD589\uC744 \uC5C5\uB370\uC774\uD2B8\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
-xmlrch.chars = \uBB38\uC790:
-xmlrch.badvalue = \uC798\uBABB\uB41C \uAC12: \uB110\uC77C \uC218 \uC5C6\uB294 \uC18D\uC131\uC785\uB2C8\uB2E4.
-xmlrch.badvalue1 = \uC798\uBABB\uB41C \uAC12: \uB110\uC77C \uC218 \uC5C6\uB294 \uBA54\uD0C0\uB370\uC774\uD130\uC785\uB2C8\uB2E4.
-xmlrch.warning =  ** \uACBD\uACE0: {0}, \uD589: {1}, URI: {2}
+xmlrch.errmap = 맵을 설정하는 중 오류 발생: {0}
+xmlrch.errmetadata = 메타데이터를 설정하는 중 오류 발생: {0}
+xmlrch.errinsertval = 값을 삽입하는 중 오류 발생: {0}
+xmlrch.errconstr = 행을 생성하는 중 오류 발생: {0}
+xmlrch.errdel = 행을 삭제하는 중 오류 발생: {0}
+xmlrch.errinsert = insert 행을 생성하는 중 오류 발생: {0}
+xmlrch.errinsdel = insdel 행을 생성하는 중 오류 발생: {0}
+xmlrch.errupdate = update 행을 생성하는 중 오류 발생: {0}
+xmlrch.errupdrow = 행을 업데이트하는 중 오류 발생: {0}
+xmlrch.chars = 문자:
+xmlrch.badvalue = 잘못된 값: 널일 수 없는 속성입니다.
+xmlrch.badvalue1 = 잘못된 값: 널일 수 없는 메타데이터입니다.
+xmlrch.warning =  ** 경고: {0}, 행: {1}, URI: {2}
 
 #RIOptimisticProvider Exceptions
-riop.locking = \uBD84\uB958 \uC7A0\uAE08\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+riop.locking = 분류 잠금이 지원되지 않습니다.
 
 #RIXMLProvider exceptions
-rixml.unsupp = RIXMLProvider\uC5D0\uC11C \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+rixml.unsupp = RIXMLProvider에서 지원되지 않습니다.
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
index 05a783ee8fc..fb24edc87cd 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
@@ -24,16 +24,16 @@
 #
 
 # CacheRowSetImpl exceptions
-cachedrowsetimpl.populate = Objeto ResultSet inv\u00E1lido fornecido para preencher o m\u00E9todo
-cachedrowsetimpl.invalidp = Fornecedor de persist\u00EAncias inv\u00E1lido gerado
-cachedrowsetimpl.nullhash = N\u00E3o \u00E9 poss\u00EDvel instanciar a inst\u00E2ncia CachedRowSetImpl. Hashtable Nulo fornecido ao construtor
-cachedrowsetimpl.invalidop = Opera\u00E7\u00E3o inv\u00E1lida durante a inser\u00E7\u00E3o de linha
+cachedrowsetimpl.populate = Objeto ResultSet inválido fornecido para preencher o método
+cachedrowsetimpl.invalidp = Fornecedor de persistências inválido gerado
+cachedrowsetimpl.nullhash = Não é possível instanciar a instância CachedRowSetImpl. Hashtable Nulo fornecido ao construtor
+cachedrowsetimpl.invalidop = Operação inválida durante a inserção de linha
 cachedrowsetimpl.accfailed = Falha em acceptChanges
-cachedrowsetimpl.invalidcp = Posi\u00E7\u00E3o inv\u00E1lida do cursor
-cachedrowsetimpl.illegalop = Opera\u00E7\u00E3o inv\u00E1lida em linha n\u00E3o inserida
+cachedrowsetimpl.invalidcp = Posição inválida do cursor
+cachedrowsetimpl.illegalop = Operação inválida em linha não inserida
 cachedrowsetimpl.clonefail = Falha ao clonar: {0}
-cachedrowsetimpl.invalidcol = \u00CDndice de coluna inv\u00E1lido
-cachedrowsetimpl.invalcolnm = Nome de coluna inv\u00E1lido
+cachedrowsetimpl.invalidcol = Índice de coluna inválido
+cachedrowsetimpl.invalcolnm = Nome de coluna inválido
 cachedrowsetimpl.boolfail = Falha em getBoolen no valor ( {0} ) na coluna {1}
 cachedrowsetimpl.bytefail = Falha em getByte no valor ( {0} ) na coluna {1}
 cachedrowsetimpl.shortfail = Falha em getShort no valor ( {0} ) na coluna {1}
@@ -41,103 +41,103 @@ cachedrowsetimpl.intfail = Falha em getInt no valor ( {0} ) na coluna {1}
 cachedrowsetimpl.longfail = Falha em getLong no valor ( {0} ) na coluna {1}
 cachedrowsetimpl.floatfail = Falha em getFloat no valor ( {0} ) na coluna {1}
 cachedrowsetimpl.doublefail = Falha em getDouble no valor ( {0} ) na coluna {1}
-cachedrowsetimpl.dtypemismt = Tipo de Dados Incompat\u00EDvel 
-cachedrowsetimpl.datefail = Falha em getDate no valor ( {0} ) na coluna {1} sem convers\u00E3o dispon\u00EDvel
-cachedrowsetimpl.timefail = Falha em getTime no valor ( {0} ) na coluna {1} sem convers\u00E3o dispon\u00EDvel
-cachedrowsetimpl.posupdate = Atualiza\u00E7\u00F5es posicionadas n\u00E3o suportadas
-cachedrowsetimpl.unableins = N\u00E3o \u00E9 poss\u00EDvel instanciar : {0}
-cachedrowsetimpl.beforefirst = beforeFirst : Opera\u00E7\u00E3o do cursor inv\u00E1lida
-cachedrowsetimpl.first = First : Opera\u00E7\u00E3o inv\u00E1lida do cursor
+cachedrowsetimpl.dtypemismt = Tipo de Dados Incompatível 
+cachedrowsetimpl.datefail = Falha em getDate no valor ( {0} ) na coluna {1} sem conversão disponível
+cachedrowsetimpl.timefail = Falha em getTime no valor ( {0} ) na coluna {1} sem conversão disponível
+cachedrowsetimpl.posupdate = Atualizações posicionadas não suportadas
+cachedrowsetimpl.unableins = Não é possível instanciar : {0}
+cachedrowsetimpl.beforefirst = beforeFirst : Operação do cursor inválida
+cachedrowsetimpl.first = First : Operação inválida do cursor
 cachedrowsetimpl.last = last : TYPE_FORWARD_ONLY
-cachedrowsetimpl.absolute = absolute : Posi\u00E7\u00E3o inv\u00E1lida do cursor
-cachedrowsetimpl.relative = relative : Posi\u00E7\u00E3o inv\u00E1lida do cursor
+cachedrowsetimpl.absolute = absolute : Posição inválida do cursor
+cachedrowsetimpl.relative = relative : Posição inválida do cursor
 cachedrowsetimpl.asciistream = falha na leitura do fluxo ascii
-cachedrowsetimpl.binstream = falha na leitura do fluxo bin\u00E1rio
+cachedrowsetimpl.binstream = falha na leitura do fluxo binário
 cachedrowsetimpl.failedins = Falha ao inserir a linha
-cachedrowsetimpl.updateins = updateRow chamado durante a inser\u00E7\u00E3o de linha
+cachedrowsetimpl.updateins = updateRow chamado durante a inserção de linha
 cachedrowsetimpl.movetoins = moveToInsertRow : CONCUR_READ_ONLY
 cachedrowsetimpl.movetoins1 = moveToInsertRow : sem metadados
-cachedrowsetimpl.movetoins2 = moveToInsertRow : n\u00FAmero de colunas inv\u00E1lido
-cachedrowsetimpl.tablename = O nome da tabela n\u00E3o pode ser nulo
-cachedrowsetimpl.keycols = Colunas de chaves inv\u00E1lidas
-cachedrowsetimpl.opnotsupp = Opera\u00E7\u00E3o n\u00E3o suportada pelo Banco de Dados
-cachedrowsetimpl.matchcols = As colunas correspondentes n\u00E3o s\u00E3o iguais \u00E0s colunas definidas
-cachedrowsetimpl.setmatchcols = Definir Colunas correspondentes antes de obt\u00EA-las
+cachedrowsetimpl.movetoins2 = moveToInsertRow : número de colunas inválido
+cachedrowsetimpl.tablename = O nome da tabela não pode ser nulo
+cachedrowsetimpl.keycols = Colunas de chaves inválidas
+cachedrowsetimpl.opnotsupp = Operação não suportada pelo Banco de Dados
+cachedrowsetimpl.matchcols = As colunas correspondentes não são iguais às colunas definidas
+cachedrowsetimpl.setmatchcols = Definir Colunas correspondentes antes de obtê-las
 cachedrowsetimpl.matchcols1 = As colunas correspondentes devem ser maior do que 0
 cachedrowsetimpl.matchcols2 = As colunas correspondentes devem ser strings vazias ou nulas
-cachedrowsetimpl.unsetmatch = As colunas n\u00E3o definidas n\u00E3o s\u00E3o iguais \u00E0s colunas definidas
+cachedrowsetimpl.unsetmatch = As colunas não definidas não são iguais às colunas definidas
 cachedrowsetimpl.unsetmatch1 = Usar o nome da coluna como argumento para unsetMatchColumn
 cachedrowsetimpl.unsetmatch2 = Usar o ID da coluna como argumento para unsetMatchColumn
-cachedrowsetimpl.numrows = O n\u00FAmero de linhas \u00E9 menor do que zero ou menor do que o tamanho obtido
-cachedrowsetimpl.startpos = A posi\u00E7\u00E3o de in\u00EDcio n\u00E3o pode ser negativa
+cachedrowsetimpl.numrows = O número de linhas é menor do que zero ou menor do que o tamanho obtido
+cachedrowsetimpl.startpos = A posição de início não pode ser negativa
 cachedrowsetimpl.nextpage = Preencher dados antes de chamar 
-cachedrowsetimpl.pagesize = O tamanho da p\u00E1gina n\u00E3o pode ser menor do que zero
-cachedrowsetimpl.pagesize1 = O tamanho da p\u00E1gina n\u00E3o pode ser maior do que maxRows
-cachedrowsetimpl.fwdonly = ResultSet \u00E9 somente para frente
-cachedrowsetimpl.type = O tipo \u00E9 : {0}
-cachedrowsetimpl.opnotysupp = Opera\u00E7\u00E3o ainda n\u00E3o suportada
-cachedrowsetimpl.featnotsupp = Recurso n\u00E3o suportado
+cachedrowsetimpl.pagesize = O tamanho da página não pode ser menor do que zero
+cachedrowsetimpl.pagesize1 = O tamanho da página não pode ser maior do que maxRows
+cachedrowsetimpl.fwdonly = ResultSet é somente para frente
+cachedrowsetimpl.type = O tipo é : {0}
+cachedrowsetimpl.opnotysupp = Operação ainda não suportada
+cachedrowsetimpl.featnotsupp = Recurso não suportado
 
 # WebRowSetImpl exceptions
-webrowsetimpl.nullhash = N\u00E3o \u00E9 poss\u00EDvel instanciar a inst\u00E2ncia WebRowSetImpl. Hashtable nulo fornecido ao construtor
-webrowsetimpl.invalidwr = Gravador inv\u00E1lido
-webrowsetimpl.invalidrd = Leitor inv\u00E1lido
+webrowsetimpl.nullhash = Não é possível instanciar a instância WebRowSetImpl. Hashtable nulo fornecido ao construtor
+webrowsetimpl.invalidwr = Gravador inválido
+webrowsetimpl.invalidrd = Leitor inválido
 
 #FilteredRowSetImpl exceptions
-filteredrowsetimpl.relative = relative : Opera\u00E7\u00E3o inv\u00E1lida do cursor 
-filteredrowsetimpl.absolute = absolute : Opera\u00E7\u00E3o inv\u00E1lida do cursor
-filteredrowsetimpl.notallowed = Este valor n\u00E3o \u00E9 permitido no filtro
+filteredrowsetimpl.relative = relative : Operação inválida do cursor 
+filteredrowsetimpl.absolute = absolute : Operação inválida do cursor
+filteredrowsetimpl.notallowed = Este valor não é permitido no filtro
 
 #JoinRowSetImpl exceptions
-joinrowsetimpl.notinstance = N\u00E3o \u00E9 uma inst\u00E2ncia do conjunto de linhas
-joinrowsetimpl.matchnotset = Coluna Correspondente n\u00E3o definida para jun\u00E7\u00E3o
-joinrowsetimpl.numnotequal = N\u00FAmero de elementos no conjunto de linhas diferente da coluna correspondente
-joinrowsetimpl.notdefined = N\u00E3o \u00E9 um tipo definido de jun\u00E7\u00E3o
-joinrowsetimpl.notsupported = Este tipo de jun\u00E7\u00E3o n\u00E3o \u00E9 suportada
-joinrowsetimpl.initerror = Erro de inicializa\u00E7\u00E3o do JoinRowSet
-joinrowsetimpl.genericerr = Erro inicial de joinrowset gen\u00E9rico
-joinrowsetimpl.emptyrowset = O conjunto de linha vazio n\u00E3o pode ser adicionado a este JoinRowSet
+joinrowsetimpl.notinstance = Não é uma instância do conjunto de linhas
+joinrowsetimpl.matchnotset = Coluna Correspondente não definida para junção
+joinrowsetimpl.numnotequal = Número de elementos no conjunto de linhas diferente da coluna correspondente
+joinrowsetimpl.notdefined = Não é um tipo definido de junção
+joinrowsetimpl.notsupported = Este tipo de junção não é suportada
+joinrowsetimpl.initerror = Erro de inicialização do JoinRowSet
+joinrowsetimpl.genericerr = Erro inicial de joinrowset genérico
+joinrowsetimpl.emptyrowset = O conjunto de linha vazio não pode ser adicionado a este JoinRowSet
 
 #JdbcRowSetImpl exceptions
-jdbcrowsetimpl.invalstate = Estado inv\u00E1lido
-jdbcrowsetimpl.connect = N\u00E3o \u00E9 poss\u00EDvel conectar JdbcRowSet (connect) a JNDI
-jdbcrowsetimpl.paramtype = N\u00E3o \u00E9 poss\u00EDvel deduzir o tipo de par\u00E2metro
-jdbcrowsetimpl.matchcols = As Colunas Correspondentes n\u00E3o s\u00E3o iguais \u00E0s colunas definidas
-jdbcrowsetimpl.setmatchcols = Definir as colunas correspondentes antes de obt\u00EA-las
+jdbcrowsetimpl.invalstate = Estado inválido
+jdbcrowsetimpl.connect = Não é possível conectar JdbcRowSet (connect) a JNDI
+jdbcrowsetimpl.paramtype = Não é possível deduzir o tipo de parâmetro
+jdbcrowsetimpl.matchcols = As Colunas Correspondentes não são iguais às colunas definidas
+jdbcrowsetimpl.setmatchcols = Definir as colunas correspondentes antes de obtê-las
 jdbcrowsetimpl.matchcols1 = As colunas correspondentes devem ser maior do que 0
-jdbcrowsetimpl.matchcols2 = As colunas correspondentes n\u00E3o podem ser strings vazias ou nulas
-jdbcrowsetimpl.unsetmatch = As colunas n\u00E3o definidas n\u00E3o s\u00E3o iguais \u00E0s colunas definidas
+jdbcrowsetimpl.matchcols2 = As colunas correspondentes não podem ser strings vazias ou nulas
+jdbcrowsetimpl.unsetmatch = As colunas não definidas não são iguais às colunas definidas
 jdbcrowsetimpl.usecolname = Usar o nome da coluna como argumento para unsetMatchColumn
 jdbcrowsetimpl.usecolid = Usar o ID da coluna como argumento para unsetMatchColumn
-jdbcrowsetimpl.resnotupd = ResultSet n\u00E3o \u00E9 atualiz\u00E1vel
-jdbcrowsetimpl.opnotysupp = Opera\u00E7\u00E3o ainda n\u00E3o suportada
-jdbcrowsetimpl.featnotsupp = Recurso n\u00E3o suportado
+jdbcrowsetimpl.resnotupd = ResultSet não é atualizável
+jdbcrowsetimpl.opnotysupp = Operação ainda não suportada
+jdbcrowsetimpl.featnotsupp = Recurso não suportado
 
 #CachedRowSetReader exceptions
-crsreader.connect = (JNDI) N\u00E3o \u00E9 poss\u00EDvel conectar
-crsreader.paramtype = N\u00E3o \u00E9 poss\u00EDvel deduzir o tipo de par\u00E2metro
-crsreader.connecterr = Erro Interno no RowSetReader: sem conex\u00E3o ou comando
+crsreader.connect = (JNDI) Não é possível conectar
+crsreader.paramtype = Não é possível deduzir o tipo de parâmetro
+crsreader.connecterr = Erro Interno no RowSetReader: sem conexão ou comando
 crsreader.datedetected = Data Detectada
-crsreader.caldetected = Calend\u00E1rio Detectado
+crsreader.caldetected = Calendário Detectado
 
 #CachedRowSetWriter exceptions
-crswriter.connect = N\u00E3o \u00E9 poss\u00EDvel obter a conex\u00E3o
-crswriter.tname = writeData n\u00E3o pode determinar o nome da tabela
+crswriter.connect = Não é possível obter a conexão
+crswriter.tname = writeData não pode determinar o nome da tabela
 crswriter.params1 = Valor de params1 : {0} 
 crswriter.params2 = Valor de params2 : {0} 
-crswriter.conflictsno =  conflitos durante a sincroniza\u00E7\u00E3o 
+crswriter.conflictsno =  conflitos durante a sincronização 
 
 #InsertRow exceptions
 insertrow.novalue = Nenhum valor foi inserido
 
 #SyncResolverImpl exceptions
-syncrsimpl.indexval = Valor de \u00EDndice fora da faixa  
-syncrsimpl.noconflict = Est\u00E1 coluna n\u00E3o est\u00E1 em conflito
-syncrsimpl.syncnotpos = A sincroniza\u00E7\u00E3o n\u00E3o \u00E9 poss\u00EDvel
+syncrsimpl.indexval = Valor de índice fora da faixa  
+syncrsimpl.noconflict = Está coluna não está em conflito
+syncrsimpl.syncnotpos = A sincronização não é possível
 syncrsimpl.valtores = O valor a ser decidido pode estar no banco de dados ou no conjunto de linhas armazenado no cache
 
 #WebRowSetXmlReader exception
-wrsxmlreader.invalidcp = Fim de RowSet atingido. Posi\u00E7\u00E3o inv\u00E1lida do cursor
+wrsxmlreader.invalidcp = Fim de RowSet atingido. Posição inválida do cursor
 wrsxmlreader.readxml = readXML : {0}
 wrsxmlreader.parseerr = ** Erro de Parsing : {0} , linha : {1} , uri : {2}
 
@@ -145,7 +145,7 @@ wrsxmlreader.parseerr = ** Erro de Parsing : {0} , linha : {1} , uri : {2}
 wrsxmlwriter.ioex = IOException : {0}
 wrsxmlwriter.sqlex = SQLException : {0}
 wrsxmlwriter.failedwrite = Falha ao gravar o valor
-wsrxmlwriter.notproper = N\u00E3o \u00E9 um tipo adequado
+wsrxmlwriter.notproper = Não é um tipo adequado
 
 #XmlReaderContentHandler exceptions
 xmlrch.errmap = Erro ao definir o Mapa : {0}
@@ -153,17 +153,17 @@ xmlrch.errmetadata = Erro ao definir metadados : {0}
 xmlrch.errinsertval = Erro ao inserir valores : {0}
 xmlrch.errconstr = Erro ao construir a linha : {0}
 xmlrch.errdel = Erro ao excluir a linha : {0}
-xmlrch.errinsert = Erro ao construir a linha de inser\u00E7\u00E3o : {0}
+xmlrch.errinsert = Erro ao construir a linha de inserção : {0}
 xmlrch.errinsdel = Erro ao construir a linha insdel : {0}
-xmlrch.errupdate = Erro ao construir a linha de atualiza\u00E7\u00E3o : {0}
+xmlrch.errupdate = Erro ao construir a linha de atualização : {0}
 xmlrch.errupdrow = Erro ao atualizar a linha : {0}
 xmlrch.chars = caracteres :
-xmlrch.badvalue = Valor incorreto ; propriedade n\u00E3o anul\u00E1vel
-xmlrch.badvalue1 = Valor incorreto ; metadado n\u00E3o anul\u00E1vel
-xmlrch.warning =  ** Advert\u00EAncia : {0} , linha : {1} , uri : {2}
+xmlrch.badvalue = Valor incorreto ; propriedade não anulável
+xmlrch.badvalue1 = Valor incorreto ; metadado não anulável
+xmlrch.warning =  ** Advertência : {0} , linha : {1} , uri : {2}
 
 #RIOptimisticProvider Exceptions
-riop.locking = O bloqueio de classifica\u00E7\u00E3o n\u00E3o \u00E9 suportado
+riop.locking = O bloqueio de classificação não é suportado
 
 #RIXMLProvider exceptions
-rixml.unsupp = N\u00E3o suportado com RIXMLProvider
+rixml.unsupp = Não suportado com RIXMLProvider
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
index 5cac0f3c502..8529c9169b4 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
@@ -25,145 +25,145 @@
 
 # CacheRowSetImpl exceptions
 cachedrowsetimpl.populate = Ifyllningsmetoden fick ett ogiltigt ResultSet-objekt
-cachedrowsetimpl.invalidp = En ogiltig best\u00E4ndig leverant\u00F6r genererades
+cachedrowsetimpl.invalidp = En ogiltig beständig leverantör genererades
 cachedrowsetimpl.nullhash = Kan inte instansiera CachedRowSetImpl. Null-hashtabell skickades till konstruktor
-cachedrowsetimpl.invalidop = En ogiltig \u00E5tg\u00E4rd utf\u00F6rdes p\u00E5 infogad rad
-cachedrowsetimpl.accfailed = acceptChanges utf\u00F6rdes inte
-cachedrowsetimpl.invalidcp = Ogiltigt mark\u00F6rl\u00E4ge
-cachedrowsetimpl.illegalop = En otill\u00E5ten \u00E5tg\u00E4rd utf\u00F6rdes p\u00E5 en icke infogad rad
-cachedrowsetimpl.clonefail = Kloningen utf\u00F6rdes inte: {0}
+cachedrowsetimpl.invalidop = En ogiltig åtgärd utfördes på infogad rad
+cachedrowsetimpl.accfailed = acceptChanges utfördes inte
+cachedrowsetimpl.invalidcp = Ogiltigt markörläge
+cachedrowsetimpl.illegalop = En otillåten åtgärd utfördes på en icke infogad rad
+cachedrowsetimpl.clonefail = Kloningen utfördes inte: {0}
 cachedrowsetimpl.invalidcol = Ogiltigt kolumnindex
 cachedrowsetimpl.invalcolnm = Ogiltigt kolumnnamn
-cachedrowsetimpl.boolfail = getBoolen utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
-cachedrowsetimpl.bytefail = getByte utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
-cachedrowsetimpl.shortfail = getShort utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
-cachedrowsetimpl.intfail = getInt utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
-cachedrowsetimpl.longfail = getLong utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
-cachedrowsetimpl.floatfail = getFloat utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
-cachedrowsetimpl.doublefail = getDouble utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
+cachedrowsetimpl.boolfail = getBoolen utfördes inte för värdet ({0}) i kolumnen {1}
+cachedrowsetimpl.bytefail = getByte utfördes inte för värdet ({0}) i kolumnen {1}
+cachedrowsetimpl.shortfail = getShort utfördes inte för värdet ({0}) i kolumnen {1}
+cachedrowsetimpl.intfail = getInt utfördes inte för värdet ({0}) i kolumnen {1}
+cachedrowsetimpl.longfail = getLong utfördes inte för värdet ({0}) i kolumnen {1}
+cachedrowsetimpl.floatfail = getFloat utfördes inte för värdet ({0}) i kolumnen {1}
+cachedrowsetimpl.doublefail = getDouble utfördes inte för värdet ({0}) i kolumnen {1}
 cachedrowsetimpl.dtypemismt = Felmatchad datatyp 
-cachedrowsetimpl.datefail = getDate utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}, ingen konvertering tillg\u00E4nglig
-cachedrowsetimpl.timefail = getTime utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}, ingen konvertering tillg\u00E4nglig
-cachedrowsetimpl.posupdate = Det finns inte st\u00F6d f\u00F6r positionerad uppdatering
+cachedrowsetimpl.datefail = getDate utfördes inte för värdet ({0}) i kolumnen {1}, ingen konvertering tillgänglig
+cachedrowsetimpl.timefail = getTime utfördes inte för värdet ({0}) i kolumnen {1}, ingen konvertering tillgänglig
+cachedrowsetimpl.posupdate = Det finns inte stöd för positionerad uppdatering
 cachedrowsetimpl.unableins = Kan inte instansiera {0}
-cachedrowsetimpl.beforefirst = beforeFirst: Ogiltig mark\u00F6r\u00E5tg\u00E4rd
-cachedrowsetimpl.first = First: Ogiltig mark\u00F6r\u00E5tg\u00E4rd
+cachedrowsetimpl.beforefirst = beforeFirst: Ogiltig marköråtgärd
+cachedrowsetimpl.first = First: Ogiltig marköråtgärd
 cachedrowsetimpl.last = last: TYPE_FORWARD_ONLY
-cachedrowsetimpl.absolute = absolute: Mark\u00F6rpositionen \u00E4r ogiltig
-cachedrowsetimpl.relative = relative: Mark\u00F6rpositionen \u00E4r ogiltig
-cachedrowsetimpl.asciistream = kunde inte l\u00E4sa ASCII-str\u00F6mmen
-cachedrowsetimpl.binstream = kunde inte l\u00E4sa den bin\u00E4ra str\u00F6mmen
+cachedrowsetimpl.absolute = absolute: Markörpositionen är ogiltig
+cachedrowsetimpl.relative = relative: Markörpositionen är ogiltig
+cachedrowsetimpl.asciistream = kunde inte läsa ASCII-strömmen
+cachedrowsetimpl.binstream = kunde inte läsa den binära strömmen
 cachedrowsetimpl.failedins = Kunde inte infoga rad
-cachedrowsetimpl.updateins = updateRow anropades fr\u00E5n infogad rad
+cachedrowsetimpl.updateins = updateRow anropades från infogad rad
 cachedrowsetimpl.movetoins = moveToInsertRow : CONCUR_READ_ONLY
 cachedrowsetimpl.movetoins1 = moveToInsertRow: inga metadata
 cachedrowsetimpl.movetoins2 = moveToInsertRow: ogiltigt antal kolumner
 cachedrowsetimpl.tablename = Tabellnamnet kan inte vara null
 cachedrowsetimpl.keycols = Ogiltiga nyckelkolumner
-cachedrowsetimpl.opnotsupp = Databasen har inte st\u00F6d f\u00F6r denna \u00E5tg\u00E4rd
-cachedrowsetimpl.matchcols = Matchningskolumnerna \u00E4r inte samma som de som st\u00E4llts in
-cachedrowsetimpl.setmatchcols = St\u00E4ll in matchningskolumnerna innan du h\u00E4mtar dem
-cachedrowsetimpl.matchcols1 = Matchningskolumnerna m\u00E5ste vara st\u00F6rre \u00E4n 0
-cachedrowsetimpl.matchcols2 = Matchningskolumnerna m\u00E5ste vara tomma eller en null-str\u00E4ng
-cachedrowsetimpl.unsetmatch = Kolumnerna som \u00E5terst\u00E4lls \u00E4r inte samma som de som st\u00E4llts in
-cachedrowsetimpl.unsetmatch1 = Anv\u00E4nd kolumnnamn som argument f\u00F6r unsetMatchColumn
-cachedrowsetimpl.unsetmatch2 = Anv\u00E4nd kolumn-id som argument f\u00F6r unsetMatchColumn
-cachedrowsetimpl.numrows = Antalet rader understiger noll eller \u00E4r mindre \u00E4n h\u00E4mtningsstorleken
-cachedrowsetimpl.startpos = Startpositionen f\u00E5r inte vara negativ
+cachedrowsetimpl.opnotsupp = Databasen har inte stöd för denna åtgärd
+cachedrowsetimpl.matchcols = Matchningskolumnerna är inte samma som de som ställts in
+cachedrowsetimpl.setmatchcols = Ställ in matchningskolumnerna innan du hämtar dem
+cachedrowsetimpl.matchcols1 = Matchningskolumnerna måste vara större än 0
+cachedrowsetimpl.matchcols2 = Matchningskolumnerna måste vara tomma eller en null-sträng
+cachedrowsetimpl.unsetmatch = Kolumnerna som återställs är inte samma som de som ställts in
+cachedrowsetimpl.unsetmatch1 = Använd kolumnnamn som argument för unsetMatchColumn
+cachedrowsetimpl.unsetmatch2 = Använd kolumn-id som argument för unsetMatchColumn
+cachedrowsetimpl.numrows = Antalet rader understiger noll eller är mindre än hämtningsstorleken
+cachedrowsetimpl.startpos = Startpositionen får inte vara negativ
 cachedrowsetimpl.nextpage = Fyll i data innan anrop 
-cachedrowsetimpl.pagesize = Sidstorleken f\u00E5r inte understiga noll
-cachedrowsetimpl.pagesize1 = Sidstorleken f\u00E5r inte \u00F6verstiga maxRows
-cachedrowsetimpl.fwdonly = ResultSet kan endast g\u00E5 fram\u00E5t
+cachedrowsetimpl.pagesize = Sidstorleken får inte understiga noll
+cachedrowsetimpl.pagesize1 = Sidstorleken får inte överstiga maxRows
+cachedrowsetimpl.fwdonly = ResultSet kan endast gå framåt
 cachedrowsetimpl.type = Typ: {0}
-cachedrowsetimpl.opnotysupp = Det finns \u00E4nnu inget st\u00F6d f\u00F6r denna \u00E5tg\u00E4rd
-cachedrowsetimpl.featnotsupp = Funktionen st\u00F6ds inte
+cachedrowsetimpl.opnotysupp = Det finns ännu inget stöd för denna åtgärd
+cachedrowsetimpl.featnotsupp = Funktionen stöds inte
 
 # WebRowSetImpl exceptions
 webrowsetimpl.nullhash = Kan inte instansiera WebRowSetImpl. Null-hashtabell skickades till konstruktor.
 webrowsetimpl.invalidwr = Ogiltig skrivfunktion
-webrowsetimpl.invalidrd = Ogiltig l\u00E4sare
+webrowsetimpl.invalidrd = Ogiltig läsare
 
 #FilteredRowSetImpl exceptions
-filteredrowsetimpl.relative = relative: Ogiltig mark\u00F6r\u00E5tg\u00E4rd 
-filteredrowsetimpl.absolute = absolute: Ogiltig mark\u00F6r\u00E5tg\u00E4rd
-filteredrowsetimpl.notallowed = Detta v\u00E4rde kommer att filtreras bort
+filteredrowsetimpl.relative = relative: Ogiltig marköråtgärd 
+filteredrowsetimpl.absolute = absolute: Ogiltig marköråtgärd
+filteredrowsetimpl.notallowed = Detta värde kommer att filtreras bort
 
 #JoinRowSetImpl exceptions
-joinrowsetimpl.notinstance = Detta \u00E4r inte en instans av radupps\u00E4ttning
-joinrowsetimpl.matchnotset = Matchningskolumnen \u00E4r inte inst\u00E4lld p\u00E5 koppling
-joinrowsetimpl.numnotequal = Antal objekt i radupps\u00E4ttning st\u00E4mmer inte med matchningskolumnens
-joinrowsetimpl.notdefined = Detta \u00E4r inte n\u00E5gon definierad kopplingstyp
-joinrowsetimpl.notsupported = Det finns inget st\u00F6d f\u00F6r denna kopplingstyp
-joinrowsetimpl.initerror = Initieringsfel f\u00F6r JoinRowSet
-joinrowsetimpl.genericerr = Allm\u00E4nt initieringsfel f\u00F6r JoinRowSet
-joinrowsetimpl.emptyrowset = Tomma radupps\u00E4ttningar kan inte l\u00E4ggas till i denna JoinRowSet
+joinrowsetimpl.notinstance = Detta är inte en instans av raduppsättning
+joinrowsetimpl.matchnotset = Matchningskolumnen är inte inställd på koppling
+joinrowsetimpl.numnotequal = Antal objekt i raduppsättning stämmer inte med matchningskolumnens
+joinrowsetimpl.notdefined = Detta är inte någon definierad kopplingstyp
+joinrowsetimpl.notsupported = Det finns inget stöd för denna kopplingstyp
+joinrowsetimpl.initerror = Initieringsfel för JoinRowSet
+joinrowsetimpl.genericerr = Allmänt initieringsfel för JoinRowSet
+joinrowsetimpl.emptyrowset = Tomma raduppsättningar kan inte läggas till i denna JoinRowSet
 
 #JdbcRowSetImpl exceptions
-jdbcrowsetimpl.invalstate = Ogiltigt tillst\u00E5nd
+jdbcrowsetimpl.invalstate = Ogiltigt tillstånd
 jdbcrowsetimpl.connect = JdbcRowSet (anslut) JNDI kan inte anslutas
-jdbcrowsetimpl.paramtype = Kan inte h\u00E4rleda parametertypen
-jdbcrowsetimpl.matchcols = Matchningskolumnerna \u00E4r inte samma som de som st\u00E4llts in
-jdbcrowsetimpl.setmatchcols = St\u00E4ll in matchningskolumnerna innan du h\u00E4mtar dem
-jdbcrowsetimpl.matchcols1 = Matchningskolumnerna m\u00E5ste vara st\u00F6rre \u00E4n 0
-jdbcrowsetimpl.matchcols2 = Matchningskolumnerna kan inte vara en null-str\u00E4ng eller tomma
-jdbcrowsetimpl.unsetmatch = Kolumnerna som \u00E5terst\u00E4lls \u00E4r inte samma som de som st\u00E4llts in
-jdbcrowsetimpl.usecolname = Anv\u00E4nd kolumnnamn som argument f\u00F6r unsetMatchColumn
-jdbcrowsetimpl.usecolid = Anv\u00E4nd kolumn-id som argument f\u00F6r unsetMatchColumn
-jdbcrowsetimpl.resnotupd = ResultSet \u00E4r inte uppdateringsbart
-jdbcrowsetimpl.opnotysupp = Det finns \u00E4nnu inget st\u00F6d f\u00F6r denna \u00E5tg\u00E4rd
-jdbcrowsetimpl.featnotsupp = Funktionen st\u00F6ds inte
+jdbcrowsetimpl.paramtype = Kan inte härleda parametertypen
+jdbcrowsetimpl.matchcols = Matchningskolumnerna är inte samma som de som ställts in
+jdbcrowsetimpl.setmatchcols = Ställ in matchningskolumnerna innan du hämtar dem
+jdbcrowsetimpl.matchcols1 = Matchningskolumnerna måste vara större än 0
+jdbcrowsetimpl.matchcols2 = Matchningskolumnerna kan inte vara en null-sträng eller tomma
+jdbcrowsetimpl.unsetmatch = Kolumnerna som återställs är inte samma som de som ställts in
+jdbcrowsetimpl.usecolname = Använd kolumnnamn som argument för unsetMatchColumn
+jdbcrowsetimpl.usecolid = Använd kolumn-id som argument för unsetMatchColumn
+jdbcrowsetimpl.resnotupd = ResultSet är inte uppdateringsbart
+jdbcrowsetimpl.opnotysupp = Det finns ännu inget stöd för denna åtgärd
+jdbcrowsetimpl.featnotsupp = Funktionen stöds inte
 
 #CachedRowSetReader exceptions
 crsreader.connect = (JNDI) kan inte anslutas
-crsreader.paramtype = Kan inte h\u00E4rleda parametertypen
+crsreader.paramtype = Kan inte härleda parametertypen
 crsreader.connecterr = Internt fel i RowSetReader: ingen anslutning eller inget kommando
 crsreader.datedetected = Ett datum har identifierats
 crsreader.caldetected = En kalender har identifierats
 
 #CachedRowSetWriter exceptions
-crswriter.connect = Kan inte uppr\u00E4tta anslutning
-crswriter.tname = writeData kan inte fastst\u00E4lla tabellnamnet
-crswriter.params1 = Parameterv\u00E4rde1: {0} 
-crswriter.params2 = Parameterv\u00E4rde2: {0} 
+crswriter.connect = Kan inte upprätta anslutning
+crswriter.tname = writeData kan inte fastställa tabellnamnet
+crswriter.params1 = Parametervärde1: {0} 
+crswriter.params2 = Parametervärde2: {0} 
 crswriter.conflictsno =  orsakar konflikt vid synkronisering 
 
 #InsertRow exceptions
-insertrow.novalue = Inget v\u00E4rde har infogats
+insertrow.novalue = Inget värde har infogats
 
 #SyncResolverImpl exceptions
-syncrsimpl.indexval = Indexv\u00E4rdet ligger utanf\u00F6r intervallet  
+syncrsimpl.indexval = Indexvärdet ligger utanför intervallet  
 syncrsimpl.noconflict = Kolumnen orsakar ingen konflikt
-syncrsimpl.syncnotpos = Synkronisering \u00E4r inte m\u00F6jlig
-syncrsimpl.valtores = V\u00E4rdet som ska fastst\u00E4llas kan antingen finnas i databasen eller i cachedrowset
+syncrsimpl.syncnotpos = Synkronisering är inte möjlig
+syncrsimpl.valtores = Värdet som ska fastställas kan antingen finnas i databasen eller i cachedrowset
 
 #WebRowSetXmlReader exception
-wrsxmlreader.invalidcp = Slutet p\u00E5 RowSet har n\u00E5tts. Mark\u00F6rpositionen \u00E4r ogiltig.
+wrsxmlreader.invalidcp = Slutet på RowSet har nåtts. Markörpositionen är ogiltig.
 wrsxmlreader.readxml = readXML: {0}
 wrsxmlreader.parseerr = ** Tolkningsfel: {0}, rad: {1}, URI: {2}
 
 #WebRowSetXmlWriter exceptions
 wrsxmlwriter.ioex = IOException: {0}
 wrsxmlwriter.sqlex = SQLException: {0}
-wrsxmlwriter.failedwrite = Kunde inte skriva v\u00E4rdet
+wrsxmlwriter.failedwrite = Kunde inte skriva värdet
 wsrxmlwriter.notproper = Ingen riktig typ
 
 #XmlReaderContentHandler exceptions
-xmlrch.errmap = Ett fel intr\u00E4ffade vid inst\u00E4llning av mappning: {0}
-xmlrch.errmetadata = Ett fel intr\u00E4ffade vid inst\u00E4llning av metadata: {0}
-xmlrch.errinsertval = Ett fel intr\u00E4ffade vid infogning av v\u00E4rden: {0}
-xmlrch.errconstr = Ett fel intr\u00E4ffade vid konstruktion av rad: {0}
-xmlrch.errdel = Ett fel intr\u00E4ffade vid borttagning av rad: {0}
-xmlrch.errinsert = Ett fel intr\u00E4ffade vid konstruktion av infogad rad: {0}
-xmlrch.errinsdel = Ett fel intr\u00E4ffade vid konstruktion av insdel-rad: {0}
-xmlrch.errupdate = Ett fel intr\u00E4ffade vid konstruktion av uppdateringsrad: {0}
-xmlrch.errupdrow = Ett fel intr\u00E4ffade vid uppdatering av rad: {0}
+xmlrch.errmap = Ett fel inträffade vid inställning av mappning: {0}
+xmlrch.errmetadata = Ett fel inträffade vid inställning av metadata: {0}
+xmlrch.errinsertval = Ett fel inträffade vid infogning av värden: {0}
+xmlrch.errconstr = Ett fel inträffade vid konstruktion av rad: {0}
+xmlrch.errdel = Ett fel inträffade vid borttagning av rad: {0}
+xmlrch.errinsert = Ett fel inträffade vid konstruktion av infogad rad: {0}
+xmlrch.errinsdel = Ett fel inträffade vid konstruktion av insdel-rad: {0}
+xmlrch.errupdate = Ett fel inträffade vid konstruktion av uppdateringsrad: {0}
+xmlrch.errupdrow = Ett fel inträffade vid uppdatering av rad: {0}
 xmlrch.chars = tecken:
-xmlrch.badvalue = Felaktigt v\u00E4rde; egenskapen f\u00E5r inte ha v\u00E4rdet null
-xmlrch.badvalue1 = Felaktigt v\u00E4rde; metadata f\u00E5r inte ha v\u00E4rdet null
+xmlrch.badvalue = Felaktigt värde; egenskapen får inte ha värdet null
+xmlrch.badvalue1 = Felaktigt värde; metadata får inte ha värdet null
 xmlrch.warning =  ** Varning! {0}, rad: {1}, URI: {2}
 
 #RIOptimisticProvider Exceptions
-riop.locking = Det finns inte st\u00F6d f\u00F6r denna l\u00E5sningsklassificering
+riop.locking = Det finns inte stöd för denna låsningsklassificering
 
 #RIXMLProvider exceptions
-rixml.unsupp = RIXMLProvider har inte st\u00F6d f\u00F6r detta
+rixml.unsupp = RIXMLProvider har inte stöd för detta
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
index 2e6cd2e6ca6..c7469edd5c4 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
@@ -24,146 +24,146 @@
 #
 
 # CacheRowSetImpl exceptions
-cachedrowsetimpl.populate = \u63D0\u4F9B\u7ED9\u586B\u5145\u65B9\u6CD5\u7684 ResultSet \u5BF9\u8C61\u65E0\u6548
-cachedrowsetimpl.invalidp = \u751F\u6210\u7684\u6301\u4E45\u6027\u63D0\u4F9B\u65B9\u65E0\u6548
-cachedrowsetimpl.nullhash = \u65E0\u6CD5\u5B9E\u4F8B\u5316 CachedRowSetImpl \u5B9E\u4F8B\u3002\u63D0\u4F9B\u7ED9\u6784\u9020\u5668\u7684 Hashtable \u4E3A\u7A7A\u503C
-cachedrowsetimpl.invalidop = \u5BF9\u63D2\u5165\u884C\u6267\u884C\u7684\u64CD\u4F5C\u65E0\u6548
-cachedrowsetimpl.accfailed = acceptChanges \u5931\u8D25
-cachedrowsetimpl.invalidcp = \u5149\u6807\u4F4D\u7F6E\u65E0\u6548
-cachedrowsetimpl.illegalop = \u5BF9\u975E\u63D2\u5165\u884C\u6267\u884C\u7684\u64CD\u4F5C\u975E\u6CD5
-cachedrowsetimpl.clonefail = \u514B\u9686\u5931\u8D25: {0}
-cachedrowsetimpl.invalidcol = \u5217\u7D22\u5F15\u65E0\u6548
-cachedrowsetimpl.invalcolnm = \u5217\u540D\u65E0\u6548
-cachedrowsetimpl.boolfail = \u5BF9\u5217 {1} \u4E2D\u7684\u503C ({0}) \u6267\u884C getBoolen \u5931\u8D25
-cachedrowsetimpl.bytefail = \u5BF9\u5217 {1} \u4E2D\u7684\u503C ({0}) \u6267\u884C getByte \u5931\u8D25
-cachedrowsetimpl.shortfail = \u5BF9\u5217 {1} \u4E2D\u7684\u503C ({0}) \u6267\u884C getShort \u5931\u8D25
-cachedrowsetimpl.intfail = \u5BF9\u5217 {1} \u4E2D\u7684\u503C ({0}) \u6267\u884C getInt \u5931\u8D25
-cachedrowsetimpl.longfail = \u5BF9\u5217 {1} \u4E2D\u7684\u503C ({0}) \u6267\u884C getLong \u5931\u8D25
-cachedrowsetimpl.floatfail = \u5BF9\u5217 {1} \u4E2D\u7684\u503C ({0}) \u6267\u884C getFloat \u5931\u8D25
-cachedrowsetimpl.doublefail = \u5BF9\u5217 {1} \u4E2D\u7684\u503C ({0}) \u6267\u884C getDouble \u5931\u8D25
-cachedrowsetimpl.dtypemismt = \u6570\u636E\u7C7B\u578B\u4E0D\u5339\u914D 
-cachedrowsetimpl.datefail = \u5BF9\u5217 {1} \u4E2D\u7684\u503C ({0}) \u6267\u884C getDate \u5931\u8D25, \u65E0\u53EF\u7528\u8F6C\u6362
-cachedrowsetimpl.timefail = \u5BF9\u5217 {1} \u4E2D\u7684\u503C ({0}) \u6267\u884C getTime \u5931\u8D25, \u65E0\u53EF\u7528\u8F6C\u6362
-cachedrowsetimpl.posupdate = \u4E0D\u652F\u6301\u5B9A\u4F4D\u66F4\u65B0
-cachedrowsetimpl.unableins = \u65E0\u6CD5\u5B9E\u4F8B\u5316: {0}
-cachedrowsetimpl.beforefirst = beforeFirst: \u5149\u6807\u64CD\u4F5C\u65E0\u6548
-cachedrowsetimpl.first = First: \u5149\u6807\u64CD\u4F5C\u65E0\u6548
+cachedrowsetimpl.populate = 提供给填充方法的 ResultSet 对象无效
+cachedrowsetimpl.invalidp = 生成的持久性提供方无效
+cachedrowsetimpl.nullhash = 无法实例化 CachedRowSetImpl 实例。提供给构造器的 Hashtable 为空值
+cachedrowsetimpl.invalidop = 对插入行执行的操作无效
+cachedrowsetimpl.accfailed = acceptChanges 失败
+cachedrowsetimpl.invalidcp = 光标位置无效
+cachedrowsetimpl.illegalop = 对非插入行执行的操作非法
+cachedrowsetimpl.clonefail = 克隆失败: {0}
+cachedrowsetimpl.invalidcol = 列索引无效
+cachedrowsetimpl.invalcolnm = 列名无效
+cachedrowsetimpl.boolfail = 对列 {1} 中的值 ({0}) 执行 getBoolen 失败
+cachedrowsetimpl.bytefail = 对列 {1} 中的值 ({0}) 执行 getByte 失败
+cachedrowsetimpl.shortfail = 对列 {1} 中的值 ({0}) 执行 getShort 失败
+cachedrowsetimpl.intfail = 对列 {1} 中的值 ({0}) 执行 getInt 失败
+cachedrowsetimpl.longfail = 对列 {1} 中的值 ({0}) 执行 getLong 失败
+cachedrowsetimpl.floatfail = 对列 {1} 中的值 ({0}) 执行 getFloat 失败
+cachedrowsetimpl.doublefail = 对列 {1} 中的值 ({0}) 执行 getDouble 失败
+cachedrowsetimpl.dtypemismt = 数据类型不匹配 
+cachedrowsetimpl.datefail = 对列 {1} 中的值 ({0}) 执行 getDate 失败, 无可用转换
+cachedrowsetimpl.timefail = 对列 {1} 中的值 ({0}) 执行 getTime 失败, 无可用转换
+cachedrowsetimpl.posupdate = 不支持定位更新
+cachedrowsetimpl.unableins = 无法实例化: {0}
+cachedrowsetimpl.beforefirst = beforeFirst: 光标操作无效
+cachedrowsetimpl.first = First: 光标操作无效
 cachedrowsetimpl.last = last: TYPE_FORWARD_ONLY
-cachedrowsetimpl.absolute = absolute: \u5149\u6807\u4F4D\u7F6E\u65E0\u6548
-cachedrowsetimpl.relative = relative: \u5149\u6807\u4F4D\u7F6E\u65E0\u6548
-cachedrowsetimpl.asciistream = \u672A\u80FD\u8BFB\u53D6 ASCII \u6D41
-cachedrowsetimpl.binstream = \u672A\u80FD\u8BFB\u53D6\u4E8C\u8FDB\u5236\u6D41
-cachedrowsetimpl.failedins = \u5BF9\u63D2\u5165\u884C\u6267\u884C\u64CD\u4F5C\u5931\u8D25
-cachedrowsetimpl.updateins = \u4E3A\u63D2\u5165\u884C\u8C03\u7528 updateRow
+cachedrowsetimpl.absolute = absolute: 光标位置无效
+cachedrowsetimpl.relative = relative: 光标位置无效
+cachedrowsetimpl.asciistream = 未能读取 ASCII 流
+cachedrowsetimpl.binstream = 未能读取二进制流
+cachedrowsetimpl.failedins = 对插入行执行操作失败
+cachedrowsetimpl.updateins = 为插入行调用 updateRow
 cachedrowsetimpl.movetoins = moveToInsertRow: CONCUR_READ_ONLY
-cachedrowsetimpl.movetoins1 = moveToInsertRow: \u65E0\u5143\u6570\u636E
-cachedrowsetimpl.movetoins2 = moveToInsertRow: \u5217\u6570\u65E0\u6548
-cachedrowsetimpl.tablename = \u8868\u540D\u4E0D\u80FD\u4E3A\u7A7A\u503C
-cachedrowsetimpl.keycols = \u5173\u952E\u5B57\u5217\u65E0\u6548
-cachedrowsetimpl.opnotsupp = \u64CD\u4F5C\u4E0D\u53D7\u6570\u636E\u5E93\u652F\u6301
-cachedrowsetimpl.matchcols = \u5339\u914D\u5217\u4E0E\u8BBE\u7F6E\u7684\u90A3\u4E9B\u5339\u914D\u5217\u4E0D\u540C
-cachedrowsetimpl.setmatchcols = \u5728\u83B7\u53D6\u5339\u914D\u5217\u4E4B\u524D\u5148\u8BBE\u7F6E\u5339\u914D\u5217
-cachedrowsetimpl.matchcols1 = \u5339\u914D\u5217\u6570\u5E94\u5F53\u5927\u4E8E 0
-cachedrowsetimpl.matchcols2 = \u5339\u914D\u5217\u6570\u5E94\u5F53\u4E3A\u7A7A\u6216\u7A7A\u503C\u5B57\u7B26\u4E32
-cachedrowsetimpl.unsetmatch = \u8981\u53D6\u6D88\u8BBE\u7F6E\u7684\u5217\u4E0E\u8BBE\u7F6E\u7684\u5217\u4E0D\u540C
-cachedrowsetimpl.unsetmatch1 = \u4F7F\u7528\u5217\u540D\u4F5C\u4E3A unsetMatchColumn \u7684\u53C2\u6570
-cachedrowsetimpl.unsetmatch2 = \u4F7F\u7528\u5217 ID \u4F5C\u4E3A unsetMatchColumn \u7684\u53C2\u6570
-cachedrowsetimpl.numrows = \u884C\u6570\u5C0F\u4E8E\u96F6\u6216\u5C0F\u4E8E\u8981\u63D0\u53D6\u7684\u884C\u6570
-cachedrowsetimpl.startpos = \u8D77\u59CB\u4F4D\u7F6E\u4E0D\u80FD\u4E3A\u8D1F\u6570
-cachedrowsetimpl.nextpage = \u5728\u8C03\u7528\u4E4B\u524D\u5148\u586B\u5145\u6570\u636E 
-cachedrowsetimpl.pagesize = \u9875\u9762\u5927\u5C0F\u4E0D\u80FD\u5C0F\u4E8E\u96F6
-cachedrowsetimpl.pagesize1 = \u9875\u9762\u5927\u5C0F\u4E0D\u80FD\u5927\u4E8E maxRows
-cachedrowsetimpl.fwdonly = ResultSet \u7684\u7C7B\u578B\u4E3A\u4EC5\u5411\u524D\u7C7B\u578B
-cachedrowsetimpl.type = \u7C7B\u578B\u4E3A: {0}
-cachedrowsetimpl.opnotysupp = \u5C1A\u4E0D\u652F\u6301\u8BE5\u64CD\u4F5C
-cachedrowsetimpl.featnotsupp = \u5C1A\u4E0D\u652F\u6301\u8BE5\u529F\u80FD
+cachedrowsetimpl.movetoins1 = moveToInsertRow: 无元数据
+cachedrowsetimpl.movetoins2 = moveToInsertRow: 列数无效
+cachedrowsetimpl.tablename = 表名不能为空值
+cachedrowsetimpl.keycols = 关键字列无效
+cachedrowsetimpl.opnotsupp = 操作不受数据库支持
+cachedrowsetimpl.matchcols = 匹配列与设置的那些匹配列不同
+cachedrowsetimpl.setmatchcols = 在获取匹配列之前先设置匹配列
+cachedrowsetimpl.matchcols1 = 匹配列数应当大于 0
+cachedrowsetimpl.matchcols2 = 匹配列数应当为空或空值字符串
+cachedrowsetimpl.unsetmatch = 要取消设置的列与设置的列不同
+cachedrowsetimpl.unsetmatch1 = 使用列名作为 unsetMatchColumn 的参数
+cachedrowsetimpl.unsetmatch2 = 使用列 ID 作为 unsetMatchColumn 的参数
+cachedrowsetimpl.numrows = 行数小于零或小于要提取的行数
+cachedrowsetimpl.startpos = 起始位置不能为负数
+cachedrowsetimpl.nextpage = 在调用之前先填充数据 
+cachedrowsetimpl.pagesize = 页面大小不能小于零
+cachedrowsetimpl.pagesize1 = 页面大小不能大于 maxRows
+cachedrowsetimpl.fwdonly = ResultSet 的类型为仅向前类型
+cachedrowsetimpl.type = 类型为: {0}
+cachedrowsetimpl.opnotysupp = 尚不支持该操作
+cachedrowsetimpl.featnotsupp = 尚不支持该功能
 
 # WebRowSetImpl exceptions
-webrowsetimpl.nullhash = \u65E0\u6CD5\u5B9E\u4F8B\u5316 WebRowSetImpl \u5B9E\u4F8B\u3002\u63D0\u4F9B\u7ED9\u6784\u9020\u5668\u7684 Hashtable \u4E3A\u7A7A\u503C
-webrowsetimpl.invalidwr = \u5199\u8FDB\u7A0B\u65E0\u6548
-webrowsetimpl.invalidrd = \u8BFB\u8FDB\u7A0B\u65E0\u6548
+webrowsetimpl.nullhash = 无法实例化 WebRowSetImpl 实例。提供给构造器的 Hashtable 为空值
+webrowsetimpl.invalidwr = 写进程无效
+webrowsetimpl.invalidrd = 读进程无效
 
 #FilteredRowSetImpl exceptions
-filteredrowsetimpl.relative = relative: \u5149\u6807\u64CD\u4F5C\u65E0\u6548 
-filteredrowsetimpl.absolute = absolute: \u5149\u6807\u64CD\u4F5C\u65E0\u6548
-filteredrowsetimpl.notallowed = \u4E0D\u5141\u8BB8\u6B64\u503C\u901A\u8FC7\u7B5B\u9009\u5668
+filteredrowsetimpl.relative = relative: 光标操作无效 
+filteredrowsetimpl.absolute = absolute: 光标操作无效
+filteredrowsetimpl.notallowed = 不允许此值通过筛选器
 
 #JoinRowSetImpl exceptions
-joinrowsetimpl.notinstance = \u4E0D\u662F RowSet \u7684\u5B9E\u4F8B
-joinrowsetimpl.matchnotset = \u672A\u8BBE\u7F6E\u5339\u914D\u5217\u4EE5\u8FDB\u884C\u8054\u63A5
-joinrowsetimpl.numnotequal = RowSet \u4E2D\u7684\u5143\u7D20\u4E2A\u6570\u4E0D\u7B49\u4E8E\u5339\u914D\u5217\u6570
-joinrowsetimpl.notdefined = \u8FD9\u4E0D\u662F\u5B9A\u4E49\u7684\u8054\u63A5\u7C7B\u578B
-joinrowsetimpl.notsupported = \u4E0D\u652F\u6301\u6B64\u8054\u63A5\u7C7B\u578B
-joinrowsetimpl.initerror = JoinRowSet \u521D\u59CB\u5316\u9519\u8BEF
-joinrowsetimpl.genericerr = \u4E00\u822C joinrowset \u521D\u59CB\u9519\u8BEF
-joinrowsetimpl.emptyrowset = \u65E0\u6CD5\u5C06\u7A7A RowSet \u6DFB\u52A0\u5230\u6B64 JoinRowSet
+joinrowsetimpl.notinstance = 不是 RowSet 的实例
+joinrowsetimpl.matchnotset = 未设置匹配列以进行联接
+joinrowsetimpl.numnotequal = RowSet 中的元素个数不等于匹配列数
+joinrowsetimpl.notdefined = 这不是定义的联接类型
+joinrowsetimpl.notsupported = 不支持此联接类型
+joinrowsetimpl.initerror = JoinRowSet 初始化错误
+joinrowsetimpl.genericerr = 一般 joinrowset 初始错误
+joinrowsetimpl.emptyrowset = 无法将空 RowSet 添加到此 JoinRowSet
 
 #JdbcRowSetImpl exceptions
-jdbcrowsetimpl.invalstate = \u72B6\u6001\u65E0\u6548
-jdbcrowsetimpl.connect = JdbcRowSet (\u8FDE\u63A5) JNDI \u65E0\u6CD5\u8FDE\u63A5
-jdbcrowsetimpl.paramtype = \u65E0\u6CD5\u63A8\u65AD\u53C2\u6570\u7C7B\u578B
-jdbcrowsetimpl.matchcols = \u5339\u914D\u5217\u4E0E\u8BBE\u7F6E\u7684\u90A3\u4E9B\u5339\u914D\u5217\u4E0D\u540C
-jdbcrowsetimpl.setmatchcols = \u5728\u83B7\u53D6\u5339\u914D\u5217\u4E4B\u524D\u5148\u8BBE\u7F6E\u5339\u914D\u5217
-jdbcrowsetimpl.matchcols1 = \u5339\u914D\u5217\u6570\u5E94\u5F53\u5927\u4E8E 0
-jdbcrowsetimpl.matchcols2 = \u5339\u914D\u5217\u4E0D\u80FD\u4E3A\u7A7A\u503C\u6216\u7A7A\u5B57\u7B26\u4E32
-jdbcrowsetimpl.unsetmatch = \u8981\u53D6\u6D88\u8BBE\u7F6E\u7684\u5217\u4E0E\u8BBE\u7F6E\u7684\u5217\u4E0D\u540C
-jdbcrowsetimpl.usecolname = \u4F7F\u7528\u5217\u540D\u4F5C\u4E3A unsetMatchColumn \u7684\u53C2\u6570
-jdbcrowsetimpl.usecolid = \u4F7F\u7528\u5217 ID \u4F5C\u4E3A unsetMatchColumn \u7684\u53C2\u6570
-jdbcrowsetimpl.resnotupd = ResultSet \u4E0D\u53EF\u66F4\u65B0
-jdbcrowsetimpl.opnotysupp = \u5C1A\u4E0D\u652F\u6301\u8BE5\u64CD\u4F5C
-jdbcrowsetimpl.featnotsupp = \u5C1A\u4E0D\u652F\u6301\u8BE5\u529F\u80FD
+jdbcrowsetimpl.invalstate = 状态无效
+jdbcrowsetimpl.connect = JdbcRowSet (连接) JNDI 无法连接
+jdbcrowsetimpl.paramtype = 无法推断参数类型
+jdbcrowsetimpl.matchcols = 匹配列与设置的那些匹配列不同
+jdbcrowsetimpl.setmatchcols = 在获取匹配列之前先设置匹配列
+jdbcrowsetimpl.matchcols1 = 匹配列数应当大于 0
+jdbcrowsetimpl.matchcols2 = 匹配列不能为空值或空字符串
+jdbcrowsetimpl.unsetmatch = 要取消设置的列与设置的列不同
+jdbcrowsetimpl.usecolname = 使用列名作为 unsetMatchColumn 的参数
+jdbcrowsetimpl.usecolid = 使用列 ID 作为 unsetMatchColumn 的参数
+jdbcrowsetimpl.resnotupd = ResultSet 不可更新
+jdbcrowsetimpl.opnotysupp = 尚不支持该操作
+jdbcrowsetimpl.featnotsupp = 尚不支持该功能
 
 #CachedRowSetReader exceptions
-crsreader.connect = (JNDI) \u65E0\u6CD5\u8FDE\u63A5
-crsreader.paramtype = \u65E0\u6CD5\u63A8\u65AD\u53C2\u6570\u7C7B\u578B
-crsreader.connecterr = RowSetReader \u4E2D\u51FA\u73B0\u5185\u90E8\u9519\u8BEF: \u65E0\u8FDE\u63A5\u6216\u547D\u4EE4
-crsreader.datedetected = \u68C0\u6D4B\u5230\u65E5\u671F
-crsreader.caldetected = \u68C0\u6D4B\u5230\u65E5\u5386
+crsreader.connect = (JNDI) 无法连接
+crsreader.paramtype = 无法推断参数类型
+crsreader.connecterr = RowSetReader 中出现内部错误: 无连接或命令
+crsreader.datedetected = 检测到日期
+crsreader.caldetected = 检测到日历
 
 #CachedRowSetWriter exceptions
-crswriter.connect = \u65E0\u6CD5\u83B7\u53D6\u8FDE\u63A5
-crswriter.tname = writeData \u65E0\u6CD5\u786E\u5B9A\u8868\u540D
-crswriter.params1 = params1 \u7684\u503C: {0} 
-crswriter.params2 = params2 \u7684\u503C: {0} 
-crswriter.conflictsno =  \u540C\u6B65\u65F6\u53D1\u751F\u51B2\u7A81 
+crswriter.connect = 无法获取连接
+crswriter.tname = writeData 无法确定表名
+crswriter.params1 = params1 的值: {0} 
+crswriter.params2 = params2 的值: {0} 
+crswriter.conflictsno =  同步时发生冲突 
 
 #InsertRow exceptions
-insertrow.novalue = \u5C1A\u672A\u63D2\u5165\u4EFB\u4F55\u503C
+insertrow.novalue = 尚未插入任何值
 
 #SyncResolverImpl exceptions
-syncrsimpl.indexval = \u7D22\u5F15\u503C\u8D85\u51FA\u8303\u56F4  
-syncrsimpl.noconflict = \u6B64\u5217\u4E0D\u51B2\u7A81
-syncrsimpl.syncnotpos = \u4E0D\u80FD\u540C\u6B65
-syncrsimpl.valtores = \u8981\u89E3\u6790\u7684\u503C\u53EF\u4EE5\u5728\u6570\u636E\u5E93\u4E2D, \u4E5F\u53EF\u4EE5\u5728 CachedRowSet \u4E2D
+syncrsimpl.indexval = 索引值超出范围  
+syncrsimpl.noconflict = 此列不冲突
+syncrsimpl.syncnotpos = 不能同步
+syncrsimpl.valtores = 要解析的值可以在数据库中, 也可以在 CachedRowSet 中
 
 #WebRowSetXmlReader exception
-wrsxmlreader.invalidcp = \u5DF2\u5230\u8FBE RowSet \u7684\u7ED3\u5C3E\u3002\u5149\u6807\u4F4D\u7F6E\u65E0\u6548
+wrsxmlreader.invalidcp = 已到达 RowSet 的结尾。光标位置无效
 wrsxmlreader.readxml = readXML: {0}
-wrsxmlreader.parseerr = ** \u89E3\u6790\u9519\u8BEF: {0}, \u884C: {1}, URI: {2}
+wrsxmlreader.parseerr = ** 解析错误: {0}, 行: {1}, URI: {2}
 
 #WebRowSetXmlWriter exceptions
 wrsxmlwriter.ioex = IOException: {0}
 wrsxmlwriter.sqlex = SQLException: {0}
-wrsxmlwriter.failedwrite = \u65E0\u6CD5\u5199\u5165\u503C
-wsrxmlwriter.notproper = \u7C7B\u578B\u4E0D\u6B63\u786E
+wrsxmlwriter.failedwrite = 无法写入值
+wsrxmlwriter.notproper = 类型不正确
 
 #XmlReaderContentHandler exceptions
-xmlrch.errmap = \u8BBE\u7F6E\u6620\u5C04\u65F6\u51FA\u9519: {0}
-xmlrch.errmetadata = \u8BBE\u7F6E\u5143\u6570\u636E\u65F6\u51FA\u9519: {0}
-xmlrch.errinsertval = \u63D2\u5165\u503C\u65F6\u51FA\u9519: {0}
-xmlrch.errconstr = \u6784\u9020\u884C\u65F6\u51FA\u9519: {0}
-xmlrch.errdel = \u5220\u9664\u884C\u65F6\u51FA\u9519: {0}
-xmlrch.errinsert = \u6784\u9020\u63D2\u5165\u884C\u65F6\u51FA\u9519: {0}
-xmlrch.errinsdel = \u6784\u9020 insdel \u884C\u65F6\u51FA\u9519: {0}
-xmlrch.errupdate = \u6784\u9020\u66F4\u65B0\u884C\u65F6\u51FA\u9519: {0}
-xmlrch.errupdrow = \u66F4\u65B0\u884C\u65F6\u51FA\u9519: {0}
-xmlrch.chars = \u5B57\u7B26:
-xmlrch.badvalue = \u503C\u9519\u8BEF; \u5C5E\u6027\u4E0D\u53EF\u4E3A\u7A7A\u503C
-xmlrch.badvalue1 = \u503C\u9519\u8BEF; \u5143\u6570\u636E\u4E0D\u53EF\u4E3A\u7A7A\u503C
-xmlrch.warning =  ** \u8B66\u544A: {0}, \u884C: {1}, URI: {2}
+xmlrch.errmap = 设置映射时出错: {0}
+xmlrch.errmetadata = 设置元数据时出错: {0}
+xmlrch.errinsertval = 插入值时出错: {0}
+xmlrch.errconstr = 构造行时出错: {0}
+xmlrch.errdel = 删除行时出错: {0}
+xmlrch.errinsert = 构造插入行时出错: {0}
+xmlrch.errinsdel = 构造 insdel 行时出错: {0}
+xmlrch.errupdate = 构造更新行时出错: {0}
+xmlrch.errupdrow = 更新行时出错: {0}
+xmlrch.chars = 字符:
+xmlrch.badvalue = 值错误; 属性不可为空值
+xmlrch.badvalue1 = 值错误; 元数据不可为空值
+xmlrch.warning =  ** 警告: {0}, 行: {1}, URI: {2}
 
 #RIOptimisticProvider Exceptions
-riop.locking = \u4E0D\u652F\u6301\u9501\u5B9A\u5206\u7C7B
+riop.locking = 不支持锁定分类
 
 #RIXMLProvider exceptions
-rixml.unsupp = \u4E0D\u652F\u6301 RIXMLProvider
+rixml.unsupp = 不支持 RIXMLProvider
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
index afad376655e..c9a38a280e3 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
@@ -24,146 +24,146 @@
 #
 
 # CacheRowSetImpl exceptions
-cachedrowsetimpl.populate = \u70BA\u690D\u5165\u65B9\u6CD5\u63D0\u4F9B\u7684 ResultSet \u7269\u4EF6\u7121\u6548
-cachedrowsetimpl.invalidp = \u7522\u751F\u7684\u6301\u7E8C\u6027\u63D0\u4F9B\u8005\u7121\u6548
-cachedrowsetimpl.nullhash = \u7121\u6CD5\u5EFA\u7ACB CachedRowSetImpl \u57F7\u884C\u8655\u7406\u3002\u70BA\u5EFA\u69CB\u5B50\u63D0\u4F9B\u7684 Hashtable \u70BA\u7A7A\u503C
-cachedrowsetimpl.invalidop = \u63D2\u5165\u5217\u6642\u7684\u4F5C\u696D\u7121\u6548
-cachedrowsetimpl.accfailed = acceptChanges \u5931\u6557
-cachedrowsetimpl.invalidcp = \u6E38\u6A19\u4F4D\u7F6E\u7121\u6548
-cachedrowsetimpl.illegalop = \u975E\u63D2\u5165\u5217\u4E0A\u5B58\u5728\u7121\u6548\u4F5C\u696D
-cachedrowsetimpl.clonefail = \u8907\u88FD\u5931\u6557: {0}
-cachedrowsetimpl.invalidcol = \u6B04\u7D22\u5F15\u7121\u6548
-cachedrowsetimpl.invalcolnm = \u6B04\u540D\u7121\u6548
-cachedrowsetimpl.boolfail = \u5C0D\u6B04 {1} \u4E2D\u7684\u503C ( {0} ) \u57F7\u884C getBoolen \u5931\u6557
-cachedrowsetimpl.bytefail = \u5C0D\u6B04 {1} \u4E2D\u7684\u503C ( {0} ) \u57F7\u884C getByte \u5931\u6557
-cachedrowsetimpl.shortfail = \u5C0D\u6B04 {1} \u4E2D\u7684\u503C ( {0} ) \u57F7\u884C getShort \u5931\u6557
-cachedrowsetimpl.intfail = \u5C0D\u6B04 {1} \u4E2D\u7684\u503C ( {0} ) \u57F7\u884C getInt \u5931\u6557
-cachedrowsetimpl.longfail = \u5C0D\u6B04 {1} \u4E2D\u7684\u503C ( {0} ) \u57F7\u884C getLong \u5931\u6557
-cachedrowsetimpl.floatfail = \u5C0D\u6B04 {1} \u4E2D\u7684\u503C ( {0} ) \u57F7\u884C getFloat \u5931\u6557
-cachedrowsetimpl.doublefail = \u5C0D\u6B04 {1} \u4E2D\u7684\u503C ( {0} ) \u57F7\u884C getDouble \u5931\u6557
-cachedrowsetimpl.dtypemismt = \u8CC7\u6599\u985E\u578B\u4E0D\u76F8\u7B26
-cachedrowsetimpl.datefail = \u5C0D\u6B04 {1} \u4E2D\u7684\u503C ( {0} ) \u57F7\u884C getDate \u5931\u6557\uFF0C\u672A\u9032\u884C\u8F49\u63DB
-cachedrowsetimpl.timefail = \u5C0D\u6B04 {1} \u4E2D\u7684\u503C ( {0} ) \u57F7\u884C getTime \u5931\u6557\uFF0C\u672A\u9032\u884C\u8F49\u63DB
-cachedrowsetimpl.posupdate = \u4E0D\u652F\u63F4\u5B9A\u4F4D\u7684\u66F4\u65B0
-cachedrowsetimpl.unableins = \u7121\u6CD5\u5EFA\u7ACB: {0}
-cachedrowsetimpl.beforefirst = beforeFirst: \u6E38\u6A19\u4F5C\u696D\u7121\u6548
-cachedrowsetimpl.first = First: \u6E38\u6A19\u4F5C\u696D\u7121\u6548
+cachedrowsetimpl.populate = 為植入方法提供的 ResultSet 物件無效
+cachedrowsetimpl.invalidp = 產生的持續性提供者無效
+cachedrowsetimpl.nullhash = 無法建立 CachedRowSetImpl 執行處理。為建構子提供的 Hashtable 為空值
+cachedrowsetimpl.invalidop = 插入列時的作業無效
+cachedrowsetimpl.accfailed = acceptChanges 失敗
+cachedrowsetimpl.invalidcp = 游標位置無效
+cachedrowsetimpl.illegalop = 非插入列上存在無效作業
+cachedrowsetimpl.clonefail = 複製失敗: {0}
+cachedrowsetimpl.invalidcol = 欄索引無效
+cachedrowsetimpl.invalcolnm = 欄名無效
+cachedrowsetimpl.boolfail = 對欄 {1} 中的值 ( {0} ) 執行 getBoolen 失敗
+cachedrowsetimpl.bytefail = 對欄 {1} 中的值 ( {0} ) 執行 getByte 失敗
+cachedrowsetimpl.shortfail = 對欄 {1} 中的值 ( {0} ) 執行 getShort 失敗
+cachedrowsetimpl.intfail = 對欄 {1} 中的值 ( {0} ) 執行 getInt 失敗
+cachedrowsetimpl.longfail = 對欄 {1} 中的值 ( {0} ) 執行 getLong 失敗
+cachedrowsetimpl.floatfail = 對欄 {1} 中的值 ( {0} ) 執行 getFloat 失敗
+cachedrowsetimpl.doublefail = 對欄 {1} 中的值 ( {0} ) 執行 getDouble 失敗
+cachedrowsetimpl.dtypemismt = 資料類型不相符
+cachedrowsetimpl.datefail = 對欄 {1} 中的值 ( {0} ) 執行 getDate 失敗，未進行轉換
+cachedrowsetimpl.timefail = 對欄 {1} 中的值 ( {0} ) 執行 getTime 失敗，未進行轉換
+cachedrowsetimpl.posupdate = 不支援定位的更新
+cachedrowsetimpl.unableins = 無法建立: {0}
+cachedrowsetimpl.beforefirst = beforeFirst: 游標作業無效
+cachedrowsetimpl.first = First: 游標作業無效
 cachedrowsetimpl.last = last : TYPE_FORWARD_ONLY
-cachedrowsetimpl.absolute = absolute: \u6E38\u6A19\u4F4D\u7F6E\u7121\u6548
-cachedrowsetimpl.relative = relative: \u6E38\u6A19\u4F4D\u7F6E\u7121\u6548
-cachedrowsetimpl.asciistream = \u8B80\u53D6 ascii \u4E32\u6D41\u5931\u6557
-cachedrowsetimpl.binstream = \u8B80\u53D6\u4E8C\u9032\u4F4D\u4E32\u6D41\u5931\u6557
-cachedrowsetimpl.failedins = \u63D2\u5165\u5217\u5931\u6557
-cachedrowsetimpl.updateins = \u63D2\u5165\u5217\u6642\u547C\u53EB updateRow
+cachedrowsetimpl.absolute = absolute: 游標位置無效
+cachedrowsetimpl.relative = relative: 游標位置無效
+cachedrowsetimpl.asciistream = 讀取 ascii 串流失敗
+cachedrowsetimpl.binstream = 讀取二進位串流失敗
+cachedrowsetimpl.failedins = 插入列失敗
+cachedrowsetimpl.updateins = 插入列時呼叫 updateRow
 cachedrowsetimpl.movetoins = moveToInsertRow: CONCUR_READ_ONLY
-cachedrowsetimpl.movetoins1 = moveToInsertRow: \u6C92\u6709\u63CF\u8FF0\u8CC7\u6599
-cachedrowsetimpl.movetoins2 = moveToInsertRow: \u6B04\u6578\u7121\u6548
-cachedrowsetimpl.tablename = \u8868\u683C\u540D\u7A31\u4E0D\u80FD\u70BA\u7A7A\u503C
-cachedrowsetimpl.keycols = \u95DC\u9375\u6B04\u7121\u6548
-cachedrowsetimpl.opnotsupp = \u8CC7\u6599\u5EAB\u4E0D\u652F\u63F4\u4F5C\u696D
-cachedrowsetimpl.matchcols = \u5339\u914D\u6B04\u548C\u8A2D\u5B9A\u7684\u6B04\u4E0D\u540C
-cachedrowsetimpl.setmatchcols = \u5728\u53D6\u5F97\u5339\u914D\u6B04\u4E4B\u524D\u8A2D\u5B9A\u5B83\u5011
-cachedrowsetimpl.matchcols1 = \u5339\u914D\u6B04\u61C9\u5927\u65BC 0
-cachedrowsetimpl.matchcols2 = \u5339\u914D\u6B04\u61C9\u70BA\u7A7A\u767D\u5B57\u4E32\u6216\u7A7A\u503C\u5B57\u4E32
-cachedrowsetimpl.unsetmatch = \u53D6\u6D88\u8A2D\u5B9A\u7684\u6B04\u548C\u8A2D\u5B9A\u7684\u6B04\u4E0D\u540C
-cachedrowsetimpl.unsetmatch1 = \u4F7F\u7528\u6B04\u540D\u4F5C\u70BA unsetMatchColumn \u7684\u5F15\u6578
-cachedrowsetimpl.unsetmatch2 = \u4F7F\u7528\u6B04 ID \u4F5C\u70BA unsetMatchColumn \u7684\u5F15\u6578
-cachedrowsetimpl.numrows = \u5217\u6578\u5C0F\u65BC\u96F6\u6216\u5C0F\u65BC\u64F7\u53D6\u5927\u5C0F
-cachedrowsetimpl.startpos = \u8D77\u59CB\u4F4D\u7F6E\u4E0D\u80FD\u70BA\u8CA0\u6578
-cachedrowsetimpl.nextpage = \u5728\u547C\u53EB\u4E4B\u524D\u690D\u5165\u8CC7\u6599 
-cachedrowsetimpl.pagesize = \u9801\u9762\u5927\u5C0F\u4E0D\u80FD\u5C0F\u65BC\u96F6
-cachedrowsetimpl.pagesize1 = \u9801\u9762\u5927\u5C0F\u4E0D\u80FD\u5927\u65BC maxRows
-cachedrowsetimpl.fwdonly = ResultSet \u53EA\u80FD\u5411\u524D\u9032\u884C
-cachedrowsetimpl.type = \u985E\u578B\u662F: {0}
-cachedrowsetimpl.opnotysupp = \u5C1A\u4E0D\u652F\u63F4\u8A72\u4F5C\u696D
-cachedrowsetimpl.featnotsupp = \u4E0D\u652F\u63F4\u8A72\u529F\u80FD
+cachedrowsetimpl.movetoins1 = moveToInsertRow: 沒有描述資料
+cachedrowsetimpl.movetoins2 = moveToInsertRow: 欄數無效
+cachedrowsetimpl.tablename = 表格名稱不能為空值
+cachedrowsetimpl.keycols = 關鍵欄無效
+cachedrowsetimpl.opnotsupp = 資料庫不支援作業
+cachedrowsetimpl.matchcols = 匹配欄和設定的欄不同
+cachedrowsetimpl.setmatchcols = 在取得匹配欄之前設定它們
+cachedrowsetimpl.matchcols1 = 匹配欄應大於 0
+cachedrowsetimpl.matchcols2 = 匹配欄應為空白字串或空值字串
+cachedrowsetimpl.unsetmatch = 取消設定的欄和設定的欄不同
+cachedrowsetimpl.unsetmatch1 = 使用欄名作為 unsetMatchColumn 的引數
+cachedrowsetimpl.unsetmatch2 = 使用欄 ID 作為 unsetMatchColumn 的引數
+cachedrowsetimpl.numrows = 列數小於零或小於擷取大小
+cachedrowsetimpl.startpos = 起始位置不能為負數
+cachedrowsetimpl.nextpage = 在呼叫之前植入資料 
+cachedrowsetimpl.pagesize = 頁面大小不能小於零
+cachedrowsetimpl.pagesize1 = 頁面大小不能大於 maxRows
+cachedrowsetimpl.fwdonly = ResultSet 只能向前進行
+cachedrowsetimpl.type = 類型是: {0}
+cachedrowsetimpl.opnotysupp = 尚不支援該作業
+cachedrowsetimpl.featnotsupp = 不支援該功能
 
 # WebRowSetImpl exceptions
-webrowsetimpl.nullhash = \u7121\u6CD5\u5EFA\u7ACB WebRowSetImpl \u57F7\u884C\u8655\u7406\u3002\u70BA\u5EFA\u69CB\u5B50\u63D0\u4F9B\u7684 Hashtable \u70BA\u7A7A\u503C
-webrowsetimpl.invalidwr = \u5BEB\u5165\u5668\u7121\u6548
-webrowsetimpl.invalidrd = \u8B80\u53D6\u5668\u7121\u6548
+webrowsetimpl.nullhash = 無法建立 WebRowSetImpl 執行處理。為建構子提供的 Hashtable 為空值
+webrowsetimpl.invalidwr = 寫入器無效
+webrowsetimpl.invalidrd = 讀取器無效
 
 #FilteredRowSetImpl exceptions
-filteredrowsetimpl.relative = relative: \u6E38\u6A19\u4F5C\u696D\u7121\u6548 
-filteredrowsetimpl.absolute = absolute: \u6E38\u6A19\u4F5C\u696D\u7121\u6548
-filteredrowsetimpl.notallowed = \u4E0D\u5141\u8A31\u6B64\u503C\u901A\u904E\u7BE9\u9078
+filteredrowsetimpl.relative = relative: 游標作業無效 
+filteredrowsetimpl.absolute = absolute: 游標作業無效
+filteredrowsetimpl.notallowed = 不允許此值通過篩選
 
 #JoinRowSetImpl exceptions
-joinrowsetimpl.notinstance = \u4E0D\u662F rowset \u7684\u57F7\u884C\u8655\u7406
-joinrowsetimpl.matchnotset = \u672A\u8A2D\u5B9A\u7528\u65BC\u9023\u7D50\u7684\u5339\u914D\u6B04
-joinrowsetimpl.numnotequal = rowset \u4E2D\u7684\u5143\u7D20\u6578\u4E0D\u7B49\u65BC\u5339\u914D\u6B04
-joinrowsetimpl.notdefined = \u9019\u4E0D\u662F\u9023\u7D50\u7684\u5DF2\u5B9A\u7FA9\u985E\u578B
-joinrowsetimpl.notsupported = \u4E0D\u652F\u63F4\u6B64\u985E\u9023\u7D50
-joinrowsetimpl.initerror = JoinRowSet \u521D\u59CB\u5316\u932F\u8AA4
-joinrowsetimpl.genericerr = \u4E00\u822C\u7684 joinrowset \u521D\u59CB\u5316\u932F\u8AA4
-joinrowsetimpl.emptyrowset = \u7121\u6CD5\u5C07\u7A7A rowset \u65B0\u589E\u81F3\u6B64 JoinRowSet
+joinrowsetimpl.notinstance = 不是 rowset 的執行處理
+joinrowsetimpl.matchnotset = 未設定用於連結的匹配欄
+joinrowsetimpl.numnotequal = rowset 中的元素數不等於匹配欄
+joinrowsetimpl.notdefined = 這不是連結的已定義類型
+joinrowsetimpl.notsupported = 不支援此類連結
+joinrowsetimpl.initerror = JoinRowSet 初始化錯誤
+joinrowsetimpl.genericerr = 一般的 joinrowset 初始化錯誤
+joinrowsetimpl.emptyrowset = 無法將空 rowset 新增至此 JoinRowSet
 
 #JdbcRowSetImpl exceptions
-jdbcrowsetimpl.invalstate = \u72C0\u614B\u7121\u6548
-jdbcrowsetimpl.connect = JdbcRowSet (\u9023\u7DDA) JNDI \u7121\u6CD5\u9023\u7DDA
-jdbcrowsetimpl.paramtype = \u7121\u6CD5\u63A8\u65B7\u53C3\u6578\u985E\u578B
-jdbcrowsetimpl.matchcols = \u5339\u914D\u6B04\u548C\u8A2D\u5B9A\u7684\u6B04\u4E0D\u540C
-jdbcrowsetimpl.setmatchcols = \u8981\u5148\u8A2D\u5B9A\u5339\u914D\u6B04\uFF0C\u624D\u80FD\u53D6\u5F97\u5B83\u5011
-jdbcrowsetimpl.matchcols1 = \u5339\u914D\u6B04\u61C9\u5927\u65BC 0
-jdbcrowsetimpl.matchcols2 = \u5339\u914D\u6B04\u4E0D\u80FD\u70BA\u7A7A\u767D\u5B57\u4E32\u6216\u7A7A\u503C\u5B57\u4E32
-jdbcrowsetimpl.unsetmatch = \u53D6\u6D88\u8A2D\u5B9A\u7684\u6B04\u548C\u8A2D\u5B9A\u7684\u6B04\u4E0D\u540C
-jdbcrowsetimpl.usecolname = \u4F7F\u7528\u6B04\u540D\u4F5C\u70BA unsetMatchColumn \u7684\u5F15\u6578
-jdbcrowsetimpl.usecolid = \u4F7F\u7528\u6B04 ID \u4F5C\u70BA unsetMatchColumn \u7684\u5F15\u6578
-jdbcrowsetimpl.resnotupd = ResultSet \u4E0D\u53EF\u66F4\u65B0
-jdbcrowsetimpl.opnotysupp = \u5C1A\u4E0D\u652F\u63F4\u8A72\u4F5C\u696D
-jdbcrowsetimpl.featnotsupp = \u4E0D\u652F\u63F4\u8A72\u529F\u80FD
+jdbcrowsetimpl.invalstate = 狀態無效
+jdbcrowsetimpl.connect = JdbcRowSet (連線) JNDI 無法連線
+jdbcrowsetimpl.paramtype = 無法推斷參數類型
+jdbcrowsetimpl.matchcols = 匹配欄和設定的欄不同
+jdbcrowsetimpl.setmatchcols = 要先設定匹配欄，才能取得它們
+jdbcrowsetimpl.matchcols1 = 匹配欄應大於 0
+jdbcrowsetimpl.matchcols2 = 匹配欄不能為空白字串或空值字串
+jdbcrowsetimpl.unsetmatch = 取消設定的欄和設定的欄不同
+jdbcrowsetimpl.usecolname = 使用欄名作為 unsetMatchColumn 的引數
+jdbcrowsetimpl.usecolid = 使用欄 ID 作為 unsetMatchColumn 的引數
+jdbcrowsetimpl.resnotupd = ResultSet 不可更新
+jdbcrowsetimpl.opnotysupp = 尚不支援該作業
+jdbcrowsetimpl.featnotsupp = 不支援該功能
 
 #CachedRowSetReader exceptions
-crsreader.connect = (JNDI) \u7121\u6CD5\u9023\u7DDA
-crsreader.paramtype = \u7121\u6CD5\u63A8\u65B7\u53C3\u6578\u985E\u578B
-crsreader.connecterr = RowSetReader \u4E2D\u51FA\u73FE\u5167\u90E8\u932F\u8AA4: \u7121\u9023\u7DDA\u6216\u547D\u4EE4
-crsreader.datedetected = \u5075\u6E2C\u5230\u65E5\u671F
-crsreader.caldetected = \u5075\u6E2C\u5230\u884C\u4E8B\u66C6
+crsreader.connect = (JNDI) 無法連線
+crsreader.paramtype = 無法推斷參數類型
+crsreader.connecterr = RowSetReader 中出現內部錯誤: 無連線或命令
+crsreader.datedetected = 偵測到日期
+crsreader.caldetected = 偵測到行事曆
 
 #CachedRowSetWriter exceptions
-crswriter.connect = \u7121\u6CD5\u53D6\u5F97\u9023\u7DDA
-crswriter.tname = writeData \u4E0D\u80FD\u6C7A\u5B9A\u8868\u683C\u540D\u7A31
-crswriter.params1 = params1 \u7684\u503C: {0} 
-crswriter.params2 = params2 \u7684\u503C: {0} 
-crswriter.conflictsno =  \u540C\u6B65\u5316\u6642\u767C\u751F\u885D\u7A81 
+crswriter.connect = 無法取得連線
+crswriter.tname = writeData 不能決定表格名稱
+crswriter.params1 = params1 的值: {0} 
+crswriter.params2 = params2 的值: {0} 
+crswriter.conflictsno =  同步化時發生衝突 
 
 #InsertRow exceptions
-insertrow.novalue = \u5C1A\u672A\u63D2\u5165\u503C
+insertrow.novalue = 尚未插入值
 
 #SyncResolverImpl exceptions
-syncrsimpl.indexval = \u7D22\u5F15\u503C\u8D85\u51FA\u7BC4\u570D  
-syncrsimpl.noconflict = \u6B64\u6B04\u4E0D\u885D\u7A81
-syncrsimpl.syncnotpos = \u4E0D\u53EF\u80FD\u540C\u6B65\u5316
-syncrsimpl.valtores = \u8981\u89E3\u6790\u7684\u503C\u53EF\u4F4D\u65BC\u8CC7\u6599\u5EAB\u6216 cachedrowset \u4E2D
+syncrsimpl.indexval = 索引值超出範圍  
+syncrsimpl.noconflict = 此欄不衝突
+syncrsimpl.syncnotpos = 不可能同步化
+syncrsimpl.valtores = 要解析的值可位於資料庫或 cachedrowset 中
 
 #WebRowSetXmlReader exception
-wrsxmlreader.invalidcp = \u5DF2\u5230\u9054 RowSet \u7D50\u5C3E\u3002\u6E38\u6A19\u4F4D\u7F6E\u7121\u6548
+wrsxmlreader.invalidcp = 已到達 RowSet 結尾。游標位置無效
 wrsxmlreader.readxml = readXML: {0}
-wrsxmlreader.parseerr = ** \u5256\u6790\u932F\u8AA4: {0}\uFF0C\u884C: {1}\uFF0Curi: {2}
+wrsxmlreader.parseerr = ** 剖析錯誤: {0}，行: {1}，uri: {2}
 
 #WebRowSetXmlWriter exceptions
 wrsxmlwriter.ioex = IOException : {0}
 wrsxmlwriter.sqlex = SQLException : {0}
-wrsxmlwriter.failedwrite = \u5BEB\u5165\u503C\u5931\u6557
-wsrxmlwriter.notproper = \u4E0D\u662F\u6B63\u78BA\u985E\u578B
+wrsxmlwriter.failedwrite = 寫入值失敗
+wsrxmlwriter.notproper = 不是正確類型
 
 #XmlReaderContentHandler exceptions
-xmlrch.errmap = \u8A2D\u5B9A\u5C0D\u6620\u6642\u767C\u751F\u932F\u8AA4: {0}
-xmlrch.errmetadata = \u8A2D\u5B9A\u63CF\u8FF0\u8CC7\u6599\u6642\u767C\u751F\u932F\u8AA4: {0}
-xmlrch.errinsertval = \u63D2\u5165\u503C\u6642\u767C\u751F\u932F\u8AA4: {0}
-xmlrch.errconstr = \u5EFA\u69CB\u5217\u6642\u767C\u751F\u932F\u8AA4: {0}
-xmlrch.errdel = \u522A\u9664\u5217\u6642\u767C\u751F\u932F\u8AA4: {0}
-xmlrch.errinsert = \u5EFA\u69CB\u63D2\u5165\u5217\u6642\u767C\u751F\u932F\u8AA4 : {0}
-xmlrch.errinsdel = \u5EFA\u69CB insdel \u5217\u6642\u767C\u751F\u932F\u8AA4: {0}
-xmlrch.errupdate = \u5EFA\u69CB\u66F4\u65B0\u5217\u6642\u767C\u751F\u932F\u8AA4: {0}
-xmlrch.errupdrow = \u66F4\u65B0\u5217\u6642\u767C\u751F\u932F\u8AA4: {0}
-xmlrch.chars = \u5B57\u5143:
-xmlrch.badvalue = \u932F\u8AA4\u7684\u503C; \u5C6C\u6027\u4E0D\u80FD\u70BA\u7A7A\u503C
-xmlrch.badvalue1 = \u932F\u8AA4\u7684\u503C; \u63CF\u8FF0\u8CC7\u6599\u4E0D\u80FD\u70BA\u7A7A\u503C
-xmlrch.warning =  ** \u8B66\u544A: {0}\uFF0C\u884C: {1}\uFF0Curi: {2}
+xmlrch.errmap = 設定對映時發生錯誤: {0}
+xmlrch.errmetadata = 設定描述資料時發生錯誤: {0}
+xmlrch.errinsertval = 插入值時發生錯誤: {0}
+xmlrch.errconstr = 建構列時發生錯誤: {0}
+xmlrch.errdel = 刪除列時發生錯誤: {0}
+xmlrch.errinsert = 建構插入列時發生錯誤 : {0}
+xmlrch.errinsdel = 建構 insdel 列時發生錯誤: {0}
+xmlrch.errupdate = 建構更新列時發生錯誤: {0}
+xmlrch.errupdrow = 更新列時發生錯誤: {0}
+xmlrch.chars = 字元:
+xmlrch.badvalue = 錯誤的值; 屬性不能為空值
+xmlrch.badvalue1 = 錯誤的值; 描述資料不能為空值
+xmlrch.warning =  ** 警告: {0}，行: {1}，uri: {2}
 
 #RIOptimisticProvider Exceptions
-riop.locking = \u4E0D\u652F\u63F4\u9396\u5B9A\u5206\u985E
+riop.locking = 不支援鎖定分類
 
 #RIXMLProvider exceptions
-rixml.unsupp = RIXMLProvider \u4E0D\u652F\u63F4
+rixml.unsupp = RIXMLProvider 不支援
diff --git a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties
index 47b867889f5..1373f3bfa5f 100644
--- a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties
+++ b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties
@@ -20,36 +20,36 @@
 #
 
 algorithm.alreadyRegistered = URI {0} wurde bereits an die Klasse {1} gebunden
-algorithm.classDoesNotExist = Kann URI {0} nicht f\u00fcr Klasse {1} registrieren weil sie nicht existiert
+algorithm.classDoesNotExist = Kann URI {0} nicht für Klasse {1} registrieren weil sie nicht existiert
 algorithm.ClassDoesNotExist = Klasse {0} existiert nicht
-algorithm.extendsWrongClass = Kann URI {0} nicht f\u00fcr Klasse {1} registrieren weil sie nicht von {2} abgeleitet ist
-algorithms.CannotUseAlgorithmParameterSpecOnDSA = AlgorithmParameterSpec kann nicht f\u00fcr DSA Signaturen benutzt werden.
-algorithms.CannotUseAlgorithmParameterSpecOnRSA = AlgorithmParameterSpec kann nicht f\u00fcr RSA Signaturen benutzt werden.
-algorithms.CannotUseSecureRandomOnMAC = SecureRandom kann nicht f\u00fcr MAC's angewandt werden.
+algorithm.extendsWrongClass = Kann URI {0} nicht für Klasse {1} registrieren weil sie nicht von {2} abgeleitet ist
+algorithms.CannotUseAlgorithmParameterSpecOnDSA = AlgorithmParameterSpec kann nicht für DSA Signaturen benutzt werden.
+algorithms.CannotUseAlgorithmParameterSpecOnRSA = AlgorithmParameterSpec kann nicht für RSA Signaturen benutzt werden.
+algorithms.CannotUseSecureRandomOnMAC = SecureRandom kann nicht für MAC's angewandt werden.
 algorithms.HMACOutputLengthMax = HMACOutputLength darf nicht grosser als {0} sein
 algorithms.HMACOutputLengthMin = HMACOutputLength darf nicht kleiner als {0} sein
-algorithms.HMACOutputLengthOnlyForHMAC = Die HMACOutputLength kann nur bei HMAC integrit\u00e4ts Algorithmen angegeben werden
+algorithms.HMACOutputLengthOnlyForHMAC = Die HMACOutputLength kann nur bei HMAC integritäts Algorithmen angegeben werden
 algorithms.MissingRSAPSSParams = RSAPSSParams is a required Element for http://www.w3.org/2007/05/xmldsig-more#rsa-pss
-algorithms.NoSuchAlgorithm = Der Algorithmus {0} ist nicht verf\u00fcgbar.
-algorithms.NoSuchAlgorithm = Der Algorithmus {0} ist nicht verf\u00fcgbar. Original Nachricht war\: {1}
+algorithms.NoSuchAlgorithm = Der Algorithmus {0} ist nicht verfügbar.
+algorithms.NoSuchAlgorithm = Der Algorithmus {0} ist nicht verfügbar. Original Nachricht war\: {1}
 algorithms.NoSuchMap = Algorithmus URI "{0}" konnte auf keinen JCE Algorithmus gemappt werden
 algorithms.NoSuchProvider = Der angegebene Provider {0} existiert nicht. Original Nachricht war\: {1}
-algorithms.operationOnlyVerification = Ein \u00f6ffentlicher Schl\u00fcssel (public key) kann nur zur Verifizierung einer Signatur verwendet werden.
-algorithms.WrongKeyForThisOperation = Der angegebene Schl\u00fcssel-Typ kann nicht f\u00fcr diese Operation verwendet werden. Angegeben wurde {0} aber ein {1} wird ben\u00f6tigt.
+algorithms.operationOnlyVerification = Ein öffentlicher Schlüssel (public key) kann nur zur Verifizierung einer Signatur verwendet werden.
+algorithms.WrongKeyForThisOperation = Der angegebene Schlüssel-Typ kann nicht für diese Operation verwendet werden. Angegeben wurde {0} aber ein {1} wird benötigt.
 attributeValueIllegal = Das Attribut {0} hat den Wert {1} muss aber {2} sein.
-c14n.Canonicalizer.Exception = Fehler w\u00e4hrend der Kanonisierung\:  Original Nachricht war {0}
-c14n.Canonicalizer.IllegalNode = Unzul\u00e4ssiger NodeType {0}, NodeName lautete {1}
+c14n.Canonicalizer.Exception = Fehler während der Kanonisierung\:  Original Nachricht war {0}
+c14n.Canonicalizer.IllegalNode = Unzulässiger NodeType {0}, NodeName lautete {1}
 c14n.Canonicalizer.NoSuchCanonicalizer = Kein Kanonisierer mit dem URI {0} gefunden
-c14n.Canonicalizer.ParserConfigurationException = ParserConfigurationException w\u00e4hrend der Kanonisierung\:  Original Nachricht war {0}
+c14n.Canonicalizer.ParserConfigurationException = ParserConfigurationException während der Kanonisierung\:  Original Nachricht war {0}
 c14n.Canonicalizer.RelativeNamespace = Das Element {0} hat einen relativen Namespace: {1}="{2}"
-c14n.Canonicalizer.SAXException = SAXException w\u00e4hrend der Kanonisierung\:  Original Nachricht war {0}
-c14n.Canonicalizer.TraversalNotSupported = Das DOM Dokument unterst\u00fctzt keine Traversal {0}
-c14n.Canonicalizer.UnsupportedEncoding = Nicht unterst\u00fctzte Kodierung {0}
-c14n.Canonicalizer.UnsupportedOperation = Der Kanonisierer unterst\u00fctzt diese Operation nicht
-c14n.XMLUtils.circumventBug2650forgotten = Die Baumstruktur wurde nicht vorbereitet f\u00fcr die Kanonisierung mit XMLUtils\#circumventBug2650(Document)
+c14n.Canonicalizer.SAXException = SAXException während der Kanonisierung\:  Original Nachricht war {0}
+c14n.Canonicalizer.TraversalNotSupported = Das DOM Dokument unterstützt keine Traversal {0}
+c14n.Canonicalizer.UnsupportedEncoding = Nicht unterstützte Kodierung {0}
+c14n.Canonicalizer.UnsupportedOperation = Der Kanonisierer unterstützt diese Operation nicht
+c14n.XMLUtils.circumventBug2650forgotten = Die Baumstruktur wurde nicht vorbereitet für die Kanonisierung mit XMLUtils\#circumventBug2650(Document)
 certificate.noSki.lowVersion = Das Zertifikat dard kein SubjectKeyIdentifier enthalten da es nur ein X509v{0} ist
 certificate.noSki.notOctetString = Der SubjectKeyIdentifier des Zertifikates ist kein "OctetString"
-certificate.noSki.null = Das Zertifikat enth\u00e4lt kein SubjectKeyIdentifier
+certificate.noSki.null = Das Zertifikat enthält kein SubjectKeyIdentifier
 defaultNamespaceCannotBeSetHere = Standard Namespace kann hier nicht gesetzt werden
 ElementProxy.nullElement = Kann keinen ElementProxy aus einem null Argument erzeugen
 empty = {0}
@@ -57,23 +57,23 @@ encryption.algorithmCannotBeUsedForEncryptedData = encryption.algorithmCannotBeU
 encryption.algorithmCannotEatInitParams = encryption.algorithmCannotEatInitParams
 encryption.algorithmCannotEncryptDecrypt = encryption.algorithmCannotEncryptDecrypt
 encryption.algorithmCannotWrapUnWrap = encryption.algorithmCannotWrapUnWrap
-encryption.ExplicitKeySizeMismatch = Das xenc\:KeySize Element fordert eine Schl\u00fcssel-L\u00e4nge von {0} bits aber der Algorithmus besitzt {1} bits
-encryption.nonceLongerThanDecryptedPlaintext = Das angegebene "Nonce" ist l\u00e4nger als der verf\u00fcgbare Plaintext.
+encryption.ExplicitKeySizeMismatch = Das xenc\:KeySize Element fordert eine Schlüssel-Länge von {0} bits aber der Algorithmus besitzt {1} bits
+encryption.nonceLongerThanDecryptedPlaintext = Das angegebene "Nonce" ist länger als der verfügbare Plaintext.
 encryption.RSAOAEP.dataHashWrong = Falscher Hash-Wert
 encryption.RSAOAEP.dataStartWrong = Falscher Start Input {0}
 encryption.RSAOAEP.dataTooShort = Zu wenig Input
 encryption.RSAPKCS15.blockTruncated = Block abgeschnitten
 encryption.RSAPKCS15.noDataInBlock = Im Block sind keine Daten enthalten
 encryption.RSAPKCS15.unknownBlockType = Unbekannter Block Typ
-encryption.nokey = Es ist kein verschl\u00fcsselungs Schl\u00fcssel geladen und es konnte kein Schl\u00fcssel mit Hilfe der "key resolvers" gefunden werden.
-endorsed.jdk1.4.0 = Leider scheint niemand unsere Installations-Anleitung zu lesen, deshalb m\u00fcssen wir es \u00fcber die Exception machen\: Du hast den "endorsing" Mechanismus vom JDK 1.4 nicht richtig angewandt. Schaue unter <http\://xml.apache.org/security/Java/installation.html> nach wie man das Problem l\u00f6st.
-errorMessages.InvalidDigestValueException = Ung\u00fcltige Signatur\: Referen-Validierung fehlgeschlagen.
-errorMessages.InvalidSignatureValueException = Ung\u00fcltige Signatur\: Core Validierung fehlgeschlagen.
+encryption.nokey = Es ist kein verschlüsselungs Schlüssel geladen und es konnte kein Schlüssel mit Hilfe der "key resolvers" gefunden werden.
+endorsed.jdk1.4.0 = Leider scheint niemand unsere Installations-Anleitung zu lesen, deshalb müssen wir es über die Exception machen\: Du hast den "endorsing" Mechanismus vom JDK 1.4 nicht richtig angewandt. Schaue unter <http\://xml.apache.org/security/Java/installation.html> nach wie man das Problem löst.
+errorMessages.InvalidDigestValueException = Ungültige Signatur\: Referen-Validierung fehlgeschlagen.
+errorMessages.InvalidSignatureValueException = Ungültige Signatur\: Core Validierung fehlgeschlagen.
 errorMessages.IOException = Datei oder Resource kann nicht gelesen werden.
-errorMessages.MissingKeyFailureException = Verifizierung fehlgeschlagen, weil der \u00f6ffentliche Schl\u00fcssel (public key) nicht verf\u00fcgbar ist. Resourcen via addResource() hinzuf\u00fcgen und erneut versuchen.
-errorMessages.MissingResourceFailureException = Verifizierung fehlgeschlagen, weil Resourcen nicht verf\u00fcgbar sind. Resourcen via addResource() hinzuf\u00fcgen und erneut versuchen.
+errorMessages.MissingKeyFailureException = Verifizierung fehlgeschlagen, weil der öffentliche Schlüssel (public key) nicht verfügbar ist. Resourcen via addResource() hinzufügen und erneut versuchen.
+errorMessages.MissingResourceFailureException = Verifizierung fehlgeschlagen, weil Resourcen nicht verfügbar sind. Resourcen via addResource() hinzufügen und erneut versuchen.
 errorMessages.NoSuchAlgorithmException = Unbekannter Algorithmus {0}
-errorMessages.NotYetImplementedException = Funktionalit\u00e4t noch nicht implementiert.
+errorMessages.NotYetImplementedException = Funktionalität noch nicht implementiert.
 errorMessages.XMLSignatureException = Verifizierung aus unbekanntem Grund fehlgeschlagen.
 decoding.divisible.four = It should be divisible by four
 decoding.general = Fehler beim Decodieren
@@ -84,70 +84,70 @@ FileKeyStorageImpl.NoCert.SubjName = Kein X509-Zertifikat mit SubjectName {0} ge
 generic.dontHaveConstructionElement = Konstruktions-Element fehlt
 generic.EmptyMessage = {0}
 generic.NotYetImplemented = {0} Leider noch nicht implementiert ;-((
-java.security.InvalidKeyException = Ung\u00fcltiger Schl\u00fcssel
-java.security.NoSuchProviderException = Unbekannter oder nicht unterst\u00fctzter Provider
-java.security.UnknownKeyType = Unbekannter oder nicht unterst\u00fctzter Schl\u00fcssel-Typ {0}
+java.security.InvalidKeyException = Ungültiger Schlüssel
+java.security.NoSuchProviderException = Unbekannter oder nicht unterstützter Provider
+java.security.UnknownKeyType = Unbekannter oder nicht unterstützter Schlüssel-Typ {0}
 KeyInfo.error = Error loading Key Info
-KeyInfo.needKeyResolver = Es m\u00fcssen mehrere KeyResolver registriert sein
-KeyInfo.nokey = Kann keinen Schl\u00fcssel aus {0} gewinnen
-KeyInfo.noKey = Kann keinen \u00f6ffentlichen Schl\u00fcssel finden
-KeyInfo.wrongNumberOfObject = Ben\u00f6tige {0} keyObjects
+KeyInfo.needKeyResolver = Es müssen mehrere KeyResolver registriert sein
+KeyInfo.nokey = Kann keinen Schlüssel aus {0} gewinnen
+KeyInfo.noKey = Kann keinen öffentlichen Schlüssel finden
+KeyInfo.wrongNumberOfObject = Benötige {0} keyObjects
 KeyInfo.wrongUse = Dieses Objekt wird verwendet, um {0} zu gewinnen
-keyResolver.alreadyRegistered = Die Klasse {1} wurde bereits registriert f\u00fcr {0}
-KeyResolver.needStorageResolver = Es wird ein StorageResolver ben\u00f6tigt um ein Zertifikat aus {0} zu holen
+keyResolver.alreadyRegistered = Die Klasse {1} wurde bereits registriert für {0}
+KeyResolver.needStorageResolver = Es wird ein StorageResolver benötigt um ein Zertifikat aus {0} zu holen
 KeyResoverSpiImpl.cannotGetCert = Cannot get the Certificate that include or in {1} in implement class {0}
 KeyResoverSpiImpl.elementGeneration = Cannot make {1} element in implement class {0}
 KeyResoverSpiImpl.getPoublicKey = Cannot get the public key from implement class {0}
 KeyResoverSpiImpl.InvalidElement = Cannot set (2) Element in implement class {0}
 KeyResoverSpiImpl.keyStore = KeyStorage Fehler in der implementierenden Klasse {0}
-KeyResoverSpiImpl.need.Element = Es wird der Typ {1} ben\u00f6tigt in der implementierenden Klasse {0}
+KeyResoverSpiImpl.need.Element = Es wird der Typ {1} benötigt in der implementierenden Klasse {0}
 KeyResoverSpiImpl.wrongCRLElement = Cannot make CRL from {1} in implement class {0}
 KeyResoverSpiImpl.wrongKeyObject =  Need {1} type of KeyObject for generation Element in implement class{0}
 KeyResoverSpiImpl.wrongNumberOfObject = Need {1} keyObject in implement class {0}
-KeyStore.alreadyRegistered = Klasse {0} bereits registriert f\u00fcr {1}
+KeyStore.alreadyRegistered = Klasse {0} bereits registriert für {1}
 KeyStore.register = {1} type class register error in class {0}
-KeyStore.registerStore.register = Registrierungsfehler f\u00fcr Typ {0}
+KeyStore.registerStore.register = Registrierungsfehler für Typ {0}
 KeyValue.IllegalArgument = Kann kein {0} aus {1} erzeugen
 namespacePrefixAlreadyUsedByOtherURI = Namespace {0} wird bereits von einer anderen URI {1} gebraucht
 notYetInitialized = Das Modul {0} ist noch nicht initialisiert
 prefix.AlreadyAssigned = Sie binden den Prefix {0} an den Namespace {1} aber er ist bereits an {2} zugewiesen
-signature.Canonicalizer.UnknownCanonicalizer = Unbekannter Kanonisierer. Kein Handler installiert f\u00fcr URI {0}
-signature.DSA.invalidFormat = Ung\u00fcltige ASN.1 Kodierung der DSA Signatur
+signature.Canonicalizer.UnknownCanonicalizer = Unbekannter Kanonisierer. Kein Handler installiert für URI {0}
+signature.DSA.invalidFormat = Ungültige ASN.1 Kodierung der DSA Signatur
 signature.Generation.signBeforeGetValue = Es muss zuerst XMLSignature.sign(java.security.PrivateKey) aufgerufen werden
 signature.Reference.ForbiddenResolver = Der "Resolver" {0} ist bei aktivierter "secure validation" nicht erlaubt
 signature.Reference.NoDigestMethod = A Signature Reference Element must contain a DigestMethod child
 signature.Reference.NoDigestValue = A Signature Reference Element must contain a DigestValue child
 signature.signatureAlgorithm = Der Algorithmus {0} ist bei aktivierter "secure validation" nicht erlaubt
 signature.signaturePropertyHasNoTarget = Das Target Attribut der SignatureProperty muss gesetzt sein
-signature.tooManyReferences = Das Manifest enth\u00e4lt {0} Referenzen, bei aktivierter "secure validation" sind aber maximal {1} erlaubt
-signature.tooManyTransforms = Die Referenz enth\u00e4lt {0} Transformationen, bei aktivierter "secure validation" sind aber maximal {1} erlaubt
-signature.Transform.ErrorDuringTransform = W\u00e4hrend der Transformation {0} trat eine {1} auf.
+signature.tooManyReferences = Das Manifest enthält {0} Referenzen, bei aktivierter "secure validation" sind aber maximal {1} erlaubt
+signature.tooManyTransforms = Die Referenz enthält {0} Transformationen, bei aktivierter "secure validation" sind aber maximal {1} erlaubt
+signature.Transform.ErrorDuringTransform = Während der Transformation {0} trat eine {1} auf.
 signature.Transform.ForbiddenTransform = Die Transformation {0} ist bei aktivierter "secure validation" nicht erlaubt
 signature.Transform.NotYetImplemented = Transform {0} noch nicht implementiert
-signature.Transform.NullPointerTransform = Null pointer als URI \u00fcbergeben. Programmierfehler?
-signature.Transform.UnknownTransform = Unbekannte Transformation. Kein Handler installiert f\u00fcr URI {0}
+signature.Transform.NullPointerTransform = Null pointer als URI übergeben. Programmierfehler?
+signature.Transform.UnknownTransform = Unbekannte Transformation. Kein Handler installiert für URI {0}
 signature.Util.BignumNonPositive = bigInteger.signum() muss positiv sein
 signature.Util.NonTextNode = Keine Text Node
 signature.Util.TooManyChilds = Zu viele Kind-Elemente vom Typ {0} in {1}
 signature.Verification.certificateError = Zertifikatsfehler
 signature.Verification.IndexOutOfBounds = Index {0} illegal. Es sind nur {1} Referenzen vorhanden
 signature.Verification.internalError = Interner Fehler
-signature.Verification.InvalidDigestOrReference = Ung\u00fcltiger Digest Wert der Referenz {0}
+signature.Verification.InvalidDigestOrReference = Ungültiger Digest Wert der Referenz {0}
 signature.Verification.InvalidElement = Current Node {0} is not permitted in this location in the Signature
-signature.Verification.keyStore = \u00d6ffnen des KeyStore fehlgeschlagen
+signature.Verification.keyStore = Öffnen des KeyStore fehlgeschlagen
 signature.Verification.MissingID = Element mit der ID {0} nicht gefunden
-signature.Verification.MissingResources = Kann die externe Resource {0} nicht aufl\u00f6sen
+signature.Verification.MissingResources = Kann die externe Resource {0} nicht auflösen
 signature.Verification.MultipleIDs = Mehrere Elemente mit der ID {0} gefunden
-signature.Verification.NoSignatureElement = Input Dokument enth\u00e4lt kein {0} Element mit dem Namespace {1}
-signature.Verification.Reference.NoInput = Die Referenz f\u00fcr den URI {0} hat keinen XMLSignatureInput erhalten.
+signature.Verification.NoSignatureElement = Input Dokument enthält kein {0} Element mit dem Namespace {1}
+signature.Verification.Reference.NoInput = Die Referenz für den URI {0} hat keinen XMLSignatureInput erhalten.
 signature.Verification.SignatureError = Signatur Fehler
 signature.XMLSignatureInput.MissingConstuctor = Kann aus der Klasse {0} keinen XMLSignatureInput erzeugen
 signature.XMLSignatureInput.SerializeDOM = Input mit einem DOM Dokument initialisiert. Muss mit C14N serialisiert werden
-transform.Init.IllegalContextArgument = Unzul\u00e4ssiges Kontext Argument der Klasse {0}. Muss String, org.w3c.dom.NodeList oder java.io.InputStream sein.
+transform.Init.IllegalContextArgument = Unzulässiges Kontext Argument der Klasse {0}. Muss String, org.w3c.dom.NodeList oder java.io.InputStream sein.
 transform.init.NotInitialized =
 transform.init.wrongURI = Initialisiert mit dem falschen URI. Das sollte nie passieren. Die Transformation implementiert {0} aber {1} wurde bei der Instantiierung verwendet.
-utils.Base64.IllegalBitlength = Ung\u00fcltige Byte-L\u00e4nge; Muss ein vielfaches von 4 sein
-utils.resolver.noClass = Keinen Resolver f\u00fcr URI {0} und Base {1} gefunden
+utils.Base64.IllegalBitlength = Ungültige Byte-Länge; Muss ein vielfaches von 4 sein
+utils.resolver.noClass = Keinen Resolver für URI {0} und Base {1} gefunden
 xml.WrongContent = Kann {0} nicht finden in {1}
 xml.WrongElement = Kann kein {0} aus einem {1} Element erzeugen
 xpath.funcHere.documentsDiffer = Der XPath ist nicht im selben Dokument wie der Kontext Node
@@ -157,43 +157,43 @@ signature.Transform.nodeAndType = Aktuelle Node\: {0}, Typ\: {1}
 signature.XMLSignatureInput.nodesetReference = Das Node-Set der Referenz konnte nicht konvertieren werden
 transform.envelopedSignatureTransformNotInSignatureElement = Enveloped Transform konnte kein Signatur Element finden
 Base64Decoding = Fehler bei der Decodierung
-secureProcessing.MaximumAllowedTransformsPerReference = Die Referenz enth\u00e4lt {0} Transformationen. Es sind aber maximal {1} erlaubt. Die Limite kann \u00fcber das Konfigurations-Property "MaximumAllowedTransformsPerReference" erh\u00f6ht werden.
-secureProcessing.MaximumAllowedReferencesPerManifest = Das Manifest enh\u00e4lt {0} Referenzen. Es sind aber maximal {1} erlaubt. Die Limite kann \u00fcber das Konfigurations-Property "MaximumAllowedReferencesPerManifest" erh\u00f6ht werden.
-secureProcessing.DoNotThrowExceptionForManifests = Signatur-Manifests werden nicht unterst\u00fctzt. Das werfen dieser Exception kann durch das Konfigurations-Property "DoNotThrowExceptionForManifests" verhindert werden.
-secureProcessing.AllowMD5Algorithm = Vom Einsatz des MD5 Algorithmus wird strengstens abgeraten. Trotzdem kann er \u00fcber das Konfigurations-Property "AllowMD5Algorithm" erlaubt werden.
-secureProcessing.AllowNotSameDocumentReferences = Externe Referenzen gefunden. Die Verarbeitung von externen Referenzen ist standardm\u00e4ssig ausgeschaltet. Es kann \u00fcber das Konfigurations-Property "AllowNotSameDocumentReferences" aktiviert werden.
-secureProcessing.MaximumAllowedXMLStructureDepth = Die Maximum erlaubte Dokumenten-Tiefe von ({0}) wurde erreicht. Die Limite kann \u00fcber das Konfigurations-Property "MaximumAllowedXMLStructureDepth" erh\u00f6ht werden.
+secureProcessing.MaximumAllowedTransformsPerReference = Die Referenz enthält {0} Transformationen. Es sind aber maximal {1} erlaubt. Die Limite kann über das Konfigurations-Property "MaximumAllowedTransformsPerReference" erhöht werden.
+secureProcessing.MaximumAllowedReferencesPerManifest = Das Manifest enhält {0} Referenzen. Es sind aber maximal {1} erlaubt. Die Limite kann über das Konfigurations-Property "MaximumAllowedReferencesPerManifest" erhöht werden.
+secureProcessing.DoNotThrowExceptionForManifests = Signatur-Manifests werden nicht unterstützt. Das werfen dieser Exception kann durch das Konfigurations-Property "DoNotThrowExceptionForManifests" verhindert werden.
+secureProcessing.AllowMD5Algorithm = Vom Einsatz des MD5 Algorithmus wird strengstens abgeraten. Trotzdem kann er über das Konfigurations-Property "AllowMD5Algorithm" erlaubt werden.
+secureProcessing.AllowNotSameDocumentReferences = Externe Referenzen gefunden. Die Verarbeitung von externen Referenzen ist standardmässig ausgeschaltet. Es kann über das Konfigurations-Property "AllowNotSameDocumentReferences" aktiviert werden.
+secureProcessing.MaximumAllowedXMLStructureDepth = Die Maximum erlaubte Dokumenten-Tiefe von ({0}) wurde erreicht. Die Limite kann über das Konfigurations-Property "MaximumAllowedXMLStructureDepth" erhöht werden.
 secureProcessing.inputStreamLimitReached = Maximal erlaubte Anzahl bytes ({0}) erreicht.
 stax.duplicateActions=Doppelte Actions sind nicht erlaubt.
 stax.missingSecurityProperties = SecurityProperties darf nicht null sein\!
 stax.noOutputAction = Keine ausgehenden "Actions" definiert.
-stax.noKey = Kein Schl\u00fcssel geladen und es konnte kein Schl\u00fcssel gefunden werden f\u00fcr {0}
-stax.keyNotFound = Schl\u00fcssel nicht gefunden.
-stax.unsupportedKeyValue = Kein oder ung\u00fcltiger KeyValue.
-stax.emptyReferenceURI = Referenz enth\u00e4lt kein URI Attribut.
-stax.encryption.unprocessedReferences = Es wurden nicht alle Verschl\u00fcsselungs-Referenzen verarbeitet...
+stax.noKey = Kein Schlüssel geladen und es konnte kein Schlüssel gefunden werden für {0}
+stax.keyNotFound = Schlüssel nicht gefunden.
+stax.unsupportedKeyValue = Kein oder ungültiger KeyValue.
+stax.emptyReferenceURI = Referenz enthält kein URI Attribut.
+stax.encryption.unprocessedReferences = Es wurden nicht alle Verschlüsselungs-Referenzen verarbeitet...
 stax.signature.unprocessedReferences = Es wurden nicht alle Signatur-Referenzen verarbeitet...
-stax.unsupportedToken = {0} nicht unterst\u00fctzt.
+stax.unsupportedToken = {0} nicht unterstützt.
 stax.xmlStructureSizeExceeded = Maximal erlaubte ({0}) XML-Struktur Tiefe erreicht.
 stax.unexpectedXMLEvent = Unerwarteter StAX-Event\: {0}
-stax.encryption.noEncAlgo = xenc\:EncryptedKey enth\u00e4lt kein xenc\:EncryptionMethod/@Algorithm.
-stax.encryption.noCipherValue = EncryptedKey enth\u00e4lt kein xenc\:CipherData/xenc\:CipherValue.
+stax.encryption.noEncAlgo = xenc\:EncryptedKey enthält kein xenc\:EncryptionMethod/@Algorithm.
+stax.encryption.noCipherValue = EncryptedKey enthält kein xenc\:CipherData/xenc\:CipherValue.
 stax.unsecuredMessage = Ungesicherte Nachricht. Weder ein Signatur- noch ein EncryptedData- Element wurde gefunden.
 stax.signature.signedInfoMissing = SignedInfo Element fehlt.
 stax.signature.signatureMethodMissing = Signature method fehlt.
 stax.signature.canonicalizationMethodMissing = Signature canonicalization method fehlt.
 stax.signature.signatureValueMissing = Signature value fehlt.
 stax.signature.publicKeyOrCertificateMissing = Weder ein Zertifikat noch ein public-key wurde konfiguriert.
-stax.encryption.encryptionKeyMissing = Kein Schl\u00fcssel f\u00fcr die Verschl\u00fcsselung wurde konfiguriert.
-stax.unsupportedKeyTransp = Der public-key Algorithmus ist zu kurz um den symmetrischen Schl\u00fcssel zu verschl\u00fcsseln.
-stax.recursiveKeyReference = Rekursive Schl\u00fcssel referenzierung detektiert.
-stax.ecParametersNotSupported = ECParameters werden nicht unterst\u00fctzt.
+stax.encryption.encryptionKeyMissing = Kein Schlüssel für die Verschlüsselung wurde konfiguriert.
+stax.unsupportedKeyTransp = Der public-key Algorithmus ist zu kurz um den symmetrischen Schlüssel zu verschlüsseln.
+stax.recursiveKeyReference = Rekursive Schlüssel referenzierung detektiert.
+stax.ecParametersNotSupported = ECParameters werden nicht unterstützt.
 stax.namedCurveMissing = NamedCurve fehlt.
-stax.encryption.securePartNotFound = Part zum Verschl\u00fcsseln nicht gefunden: {0}
+stax.encryption.securePartNotFound = Part zum Verschlüsseln nicht gefunden: {0}
 stax.signature.securePartNotFound = Part zum Signieren nicht gefunden: {0}
 stax.multipleSignaturesNotSupported = Mehrere Signaturen werden nicht unterstützt.
 stax.signature.keyNameMissing = KeyName nicht konfiguriert.
-stax.keyNotFoundForName = Kein Schl\u00fcssel für Schl\u00fcsselname konfiguriert: {0}
-stax.keyTypeNotSupported = Key vom Typ {0} nicht f\u00fcr einen Key-Namenssuche unterst\u00fctzt
+stax.keyNotFoundForName = Kein Schlüssel für Schlüsselname konfiguriert: {0}
+stax.keyTypeNotSupported = Key vom Typ {0} nicht für einen Key-Namenssuche unterstützt
 stax.idsetbutnotgenerated = An Id attribute is specified, but Id generation is disabled
-stax.idgenerationdisablewithmultipleparts = Id generation must not be disabled when multiple parts need signing
\ No newline at end of file
+stax.idgenerationdisablewithmultipleparts = Id generation must not be disabled when multiple parts need signing
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
index eb0b17ad682..2c3e7226b30 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
@@ -20,29 +20,29 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
+        BadMessageKey = Die zum Meldungsschlüssel gehörige Fehlermeldung kann nicht gefunden werden.
         FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n  
 
 # DOM Core
 
 # exception codes
 DOMSTRING_SIZE_ERR = Der angegebene Textbereich passt nicht in eine DOMString. 
-HIERARCHY_REQUEST_ERR  = Es wurde versucht, einen Knoten an einer Stelle einzuf\u00FCgen, an der dies nicht zul\u00E4ssig ist. 
-INDEX_SIZE_ERR = Index oder Gr\u00F6\u00DFe ist negativ oder gr\u00F6\u00DFer als der zul\u00E4ssige Wert.
-INUSE_ATTRIBUTE_ERR = Es wurde versucht, ein Attribut hinzuzuf\u00FCgen, das bereits an einer anderen Stelle verwendet wird.
-INVALID_ACCESS_ERR  = Ein Parameter oder Vorgang wird nicht vom zugrunde liegenden Objekt unterst\u00FCtzt. 
-INVALID_CHARACTER_ERR = Ung\u00FCltiges oder unzul\u00E4ssiges XML-Zeichen angegeben. 
-INVALID_MODIFICATION_ERR =  Es wurde versucht, den Typ des zugrunde liegenden Objekts zu \u00E4ndern. 
-INVALID_STATE_ERR = Es wurde versucht, ein Objekt zu \u00E4ndern, das nicht verwendet werden kann. 
-NAMESPACE_ERR = Es wurde versucht, ein Objekt auf eine Weise zu erstellen oder zu \u00E4ndern, die falsch in Bezug auf Namespaces ist.
+HIERARCHY_REQUEST_ERR  = Es wurde versucht, einen Knoten an einer Stelle einzufügen, an der dies nicht zulässig ist. 
+INDEX_SIZE_ERR = Index oder Größe ist negativ oder größer als der zulässige Wert.
+INUSE_ATTRIBUTE_ERR = Es wurde versucht, ein Attribut hinzuzufügen, das bereits an einer anderen Stelle verwendet wird.
+INVALID_ACCESS_ERR  = Ein Parameter oder Vorgang wird nicht vom zugrunde liegenden Objekt unterstützt. 
+INVALID_CHARACTER_ERR = Ungültiges oder unzulässiges XML-Zeichen angegeben. 
+INVALID_MODIFICATION_ERR =  Es wurde versucht, den Typ des zugrunde liegenden Objekts zu ändern. 
+INVALID_STATE_ERR = Es wurde versucht, ein Objekt zu ändern, das nicht verwendet werden kann. 
+NAMESPACE_ERR = Es wurde versucht, ein Objekt auf eine Weise zu erstellen oder zu ändern, die falsch in Bezug auf Namespaces ist.
 NOT_FOUND_ERR = Es wurde versucht, einen Knoten in einem Kontext zu referenzieren, in dem er nicht vorhanden ist.
-NOT_SUPPORTED_ERR = Der angeforderte Typ des Objekts oder Vorgangs wird nicht von der Implementierung unterst\u00FCtzt. 
-NO_DATA_ALLOWED_ERR = Daten wurden f\u00FCr einen Knoten angegeben, der keine Daten unterst\u00FCtzt.
-NO_MODIFICATION_ALLOWED_ERR = Es wurde versucht, ein Objekt zu \u00E4ndern, bei dem \u00C4nderungen nicht zul\u00E4ssig sind.
-SYNTAX_ERR = Ung\u00FCltige oder unzul\u00E4ssige Zeichenfolge angegeben. 
-VALIDATION_ERR = Aufruf einer Methode wie insertBefore oder removeChild w\u00FCrde die Dokumentgrammatik des Knotens ung\u00FCltig machen.
+NOT_SUPPORTED_ERR = Der angeforderte Typ des Objekts oder Vorgangs wird nicht von der Implementierung unterstützt. 
+NO_DATA_ALLOWED_ERR = Daten wurden für einen Knoten angegeben, der keine Daten unterstützt.
+NO_MODIFICATION_ALLOWED_ERR = Es wurde versucht, ein Objekt zu ändern, bei dem Änderungen nicht zulässig sind.
+SYNTAX_ERR = Ungültige oder unzulässige Zeichenfolge angegeben. 
+VALIDATION_ERR = Aufruf einer Methode wie insertBefore oder removeChild würde die Dokumentgrammatik des Knotens ungültig machen.
 WRONG_DOCUMENT_ERR = Ein Knoten wird in einem anderen Dokument verwendet als dem, von dem er erstellt wurde.
-TYPE_MISMATCH_ERR = Der Werttyp f\u00FCr diesen Parameternamen ist nicht mit dem erwarteten Werttyp kompatibel. 
+TYPE_MISMATCH_ERR = Der Werttyp für diesen Parameternamen ist nicht mit dem erwarteten Werttyp kompatibel. 
 
 #error messages or exceptions
 FEATURE_NOT_SUPPORTED = Parameter {0} wird erkannt, aber der angeforderte Wert kann nicht festgelegt werden.
@@ -50,14 +50,14 @@ FEATURE_NOT_FOUND = Parameter {0} ist unbekannt.
 STRING_TOO_LONG   = Die resultierende Zeichenfolge ist zu lang, um in eine DOMString zupassen: "{0}".
 
 #DOM Level 3 DOMError codes
-wf-invalid-character =  Text {0} des {1}-Knotens enth\u00E4lt ung\u00FCltige XML-Zeichen.
-wf-invalid-character-in-node-name = {0}-Knoten mit dem Namen {1} enth\u00E4lt ung\u00FCltige XML-Zeichen.
+wf-invalid-character =  Text {0} des {1}-Knotens enthält ungültige XML-Zeichen.
+wf-invalid-character-in-node-name = {0}-Knoten mit dem Namen {1} enthält ungültige XML-Zeichen.
 cdata-sections-splitted =  CDATA-Abschnitt mit dem CDATA-Abschnittsabschlusszeichen "]]>"
-doctype-not-allowed = DOCTYPE-Deklaration ist nicht zul\u00E4ssig.
-unsupported-encoding = Codierung {0} wird nicht unterst\u00FCtzt.
+doctype-not-allowed = DOCTYPE-Deklaration ist nicht zulässig.
+unsupported-encoding = Codierung {0} wird nicht unterstützt.
 
 #Error codes used in DOM Normalizer
-InvalidXMLCharInDOM = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde bei der Normalisierung im DOM gefunden.
+InvalidXMLCharInDOM = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde bei der Normalisierung im DOM gefunden.
 UndeclaredEntRefInAttrValue = Attribut "{0}" Wert "{1}" referenzierte eine nicht deklarierte Entity.
 NullLocalElementName = Lokaler Nullname wurde bei der Namespace-Normalisierung von Element {0} gefunden.
 NullLocalAttrName = Lokaler Nullname wurde bei der Namespace-Normalisierung von Attribut {0} gefunden.
@@ -73,7 +73,7 @@ jaxp-null-input-source = Angegebene Quelle darf nicht null sein.
 
 #Ranges
 BAD_BOUNDARYPOINTS_ERR = Grenzwerte eines Bereichs entsprechen nicht den speziellen Anforderungen.
-INVALID_NODE_TYPE_ERR = Container eines Grenzwertes eines Bereichs wird entweder auf einen Knoten mit einem ung\u00FCltigen Typ oder auf einen Knoten mit einem Vorg\u00E4nge eines ung\u00FCltigen Typs gesetzt.
+INVALID_NODE_TYPE_ERR = Container eines Grenzwertes eines Bereichs wird entweder auf einen Knoten mit einem ungültigen Typ oder auf einen Knoten mit einem Vorgänge eines ungültigen Typs gesetzt.
 
 
 #Events
@@ -82,4 +82,4 @@ UNSPECIFIED_EVENT_TYPE_ERR = Der Ereignistyp wurde nicht durch Initialisieren de
 
 jaxp-schema-support=setSchema-Methode und schemaLanguage-Eigenschaft werden verwendet
 
-jaxp_feature_not_supported=Feature "{0}" wird nicht unterst\u00FCtzt.
+jaxp_feature_not_supported=Feature "{0}" wird nicht unterstützt.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties
index 495695485ea..deebc5b808b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties
@@ -35,44 +35,44 @@
 
 # exception codes
 DOMSTRING_SIZE_ERR = El rango especificado de texto no cabe en una cadena DOM. 
-HIERARCHY_REQUEST_ERR  = Se ha realizado un intento de insertar un nodo donde no est\u00E1 permitido. 
-INDEX_SIZE_ERR = El \u00EDndice o tama\u00F1o es negativo o superior al valor permitido.
-INUSE_ATTRIBUTE_ERR = Se ha realizado un intento de agregar un atributo que ya se est\u00E1 utilizando en otro lugar.
-INVALID_ACCESS_ERR  = El objeto subyacente no soporta un par\u00E1metro o una operaci\u00F3n. 
-INVALID_CHARACTER_ERR = Se ha especificado un car\u00E1cter XML no v\u00E1lido o no permitido. 
+HIERARCHY_REQUEST_ERR  = Se ha realizado un intento de insertar un nodo donde no está permitido. 
+INDEX_SIZE_ERR = El índice o tamaño es negativo o superior al valor permitido.
+INUSE_ATTRIBUTE_ERR = Se ha realizado un intento de agregar un atributo que ya se está utilizando en otro lugar.
+INVALID_ACCESS_ERR  = El objeto subyacente no soporta un parámetro o una operación. 
+INVALID_CHARACTER_ERR = Se ha especificado un carácter XML no válido o no permitido. 
 INVALID_MODIFICATION_ERR =  Se ha realizado un intento de modificar el tipo de objeto subyacente. 
 INVALID_STATE_ERR = Se ha realizado un intento de utilizar un objeto que ya no se puede utilizar. 
 NAMESPACE_ERR = Se ha realizado un intento de crear o cambiar un objeto de un modo incorrecto con respecto a los espacios de nombres.
 NOT_FOUND_ERR = Se ha realizado un intento de hacer referencia a un nodo en un contexto en el que no existe.
-NOT_SUPPORTED_ERR = La implantaci\u00F3n no soporta el tipo solicitado de objeto u operaci\u00F3n. 
+NOT_SUPPORTED_ERR = La implantación no soporta el tipo solicitado de objeto u operación. 
 NO_DATA_ALLOWED_ERR = Se han especificado datos para un nodo que no soporta datos.
-NO_MODIFICATION_ALLOWED_ERR = Se ha realizado un intento de modificar un objeto en el que no est\u00E1n permitidas las modificaciones.
-SYNTAX_ERR = Se ha especificado una cadena no v\u00E1lida o no permitida. 
-VALIDATION_ERR = Una llamada a un m\u00E9todo como insertBefore o removeChild invalidar\u00EDa el nodo con respecto a la gram\u00E1tica del documento.
-WRONG_DOCUMENT_ERR = Se ha utilizado un nodo en un documento distinto al que lo cre\u00F3.
-TYPE_MISMATCH_ERR = El tipo de valor para este nombre de par\u00E1metro no es compatible con el tipo de valor esperado. 
+NO_MODIFICATION_ALLOWED_ERR = Se ha realizado un intento de modificar un objeto en el que no están permitidas las modificaciones.
+SYNTAX_ERR = Se ha especificado una cadena no válida o no permitida. 
+VALIDATION_ERR = Una llamada a un método como insertBefore o removeChild invalidaría el nodo con respecto a la gramática del documento.
+WRONG_DOCUMENT_ERR = Se ha utilizado un nodo en un documento distinto al que lo creó.
+TYPE_MISMATCH_ERR = El tipo de valor para este nombre de parámetro no es compatible con el tipo de valor esperado. 
 
 #error messages or exceptions
-FEATURE_NOT_SUPPORTED = Se reconoce el par\u00E1metro {0} pero no se puede definir el valor solicitado.
-FEATURE_NOT_FOUND = No se reconoce el par\u00E1metro {0}.
+FEATURE_NOT_SUPPORTED = Se reconoce el parámetro {0} pero no se puede definir el valor solicitado.
+FEATURE_NOT_FOUND = No se reconoce el parámetro {0}.
 STRING_TOO_LONG   = La cadena resultante es demasiado larga para que quepa en una cadena DOM: ''{0}''.
 
 #DOM Level 3 DOMError codes
-wf-invalid-character =  El texto {0} del nodo {1} contiene caracteres XML no v\u00E1lidos.
-wf-invalid-character-in-node-name = El nodo {0} con el nombre {1} contiene caracteres XML no v\u00E1lidos.
-cdata-sections-splitted =  Las secciones CDATA contienen el marcador de terminaci\u00F3n de secci\u00F3n CDATA '']]>''
-doctype-not-allowed = La declaraci\u00F3n DOCTYPE no est\u00E1 permitida.
-unsupported-encoding = La codificaci\u00F3n {0} no est\u00E1 soportada.
+wf-invalid-character =  El texto {0} del nodo {1} contiene caracteres XML no válidos.
+wf-invalid-character-in-node-name = El nodo {0} con el nombre {1} contiene caracteres XML no válidos.
+cdata-sections-splitted =  Las secciones CDATA contienen el marcador de terminación de sección CDATA '']]>''
+doctype-not-allowed = La declaración DOCTYPE no está permitida.
+unsupported-encoding = La codificación {0} no está soportada.
 
 #Error codes used in DOM Normalizer
-InvalidXMLCharInDOM = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en DOM durante la normalizaci\u00F3n.
-UndeclaredEntRefInAttrValue = El atributo "{0}" con valor "{1}" ha hecho referencia a una entidad que no se declar\u00F3.
-NullLocalElementName = Se ha encontrado un nombre local nulo durante la normalizaci\u00F3n del espacio de nombres del elemento {0}.
-NullLocalAttrName = Se ha encontrado un nombre local nulo durante la normalizaci\u00F3n del espacio de nombres del atributo {0}.
+InvalidXMLCharInDOM = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en DOM durante la normalización.
+UndeclaredEntRefInAttrValue = El atributo "{0}" con valor "{1}" ha hecho referencia a una entidad que no se declaró.
+NullLocalElementName = Se ha encontrado un nombre local nulo durante la normalización del espacio de nombres del elemento {0}.
+NullLocalAttrName = Se ha encontrado un nombre local nulo durante la normalización del espacio de nombres del atributo {0}.
 
 #Error codes used in DOMParser
-InvalidDocumentClassName = El nombre de clase de la f\u00E1brica de documentos "{0}" utilizado para construir el \u00E1rbol DOM no es del tipo org.w3c.dom.Document.
-MissingDocumentClassName = No se ha encontrado el nombre de clase de la f\u00E1brica de documentos "{0}" utilizado para construir el \u00E1rbol DOM.
+InvalidDocumentClassName = El nombre de clase de la fábrica de documentos "{0}" utilizado para construir el árbol DOM no es del tipo org.w3c.dom.Document.
+MissingDocumentClassName = No se ha encontrado el nombre de clase de la fábrica de documentos "{0}" utilizado para construir el árbol DOM.
 CannotCreateDocumentClass = No se ha podido construir la clase con el nombre "{0}" como un org.w3c.dom.Document.
 
 # Error codes used by JAXP DocumentBuilder
@@ -80,14 +80,14 @@ jaxp-order-not-supported = La propiedad ''{0}'' debe definirse antes de definir
 jaxp-null-input-source = El origen especificado no puede ser nulo.
 
 #Ranges
-BAD_BOUNDARYPOINTS_ERR = Los puntos de l\u00EDmite de un rango no cumplen los requisitos espec\u00EDficos.
-INVALID_NODE_TYPE_ERR = El contenedor de un punto de l\u00EDmite de un rango se est\u00E1 definiendo en un nodo de un tipo no v\u00E1lido o un nodo con un ascendiente de un tipo no v\u00E1lido.
+BAD_BOUNDARYPOINTS_ERR = Los puntos de límite de un rango no cumplen los requisitos específicos.
+INVALID_NODE_TYPE_ERR = El contenedor de un punto de límite de un rango se está definiendo en un nodo de un tipo no válido o un nodo con un ascendiente de un tipo no válido.
 
 
 #Events
-UNSPECIFIED_EVENT_TYPE_ERR = No se ha especificado el tipo de evento mediante la inicializaci\u00F3n del evento antes de que se llame al m\u00E9todo. 
+UNSPECIFIED_EVENT_TYPE_ERR = No se ha especificado el tipo de evento mediante la inicialización del evento antes de que se llame al método. 
 
 
-jaxp-schema-support=Se utiliza tanto el m\u00E9todo setSchema como la propiedad schemaLanguage
+jaxp-schema-support=Se utiliza tanto el método setSchema como la propiedad schemaLanguage
 
-jaxp_feature_not_supported=La funci\u00F3n "{0}" no est\u00E1 soportada.
+jaxp_feature_not_supported=La función "{0}" no está soportada.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties
index 087ddcdb78f..24e427d88ec 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties
@@ -28,66 +28,66 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
+        BadMessageKey = Le message d'erreur correspondant à la clé de message est introuvable.
         FormatFailed = Une erreur interne est survenue lors du formatage du message suivant :\n  
 
 # DOM Core
 
 # exception codes
-DOMSTRING_SIZE_ERR = La plage de texte indiqu\u00E9e ne tient pas dans un \u00E9l\u00E9ment DOMString. 
-HIERARCHY_REQUEST_ERR  = Tentative d'insertion d'un noeud \u00E0 un emplacement non autoris\u00E9. 
-INDEX_SIZE_ERR = L'index ou la taille est n\u00E9gatif ou d\u00E9passe la valeur autoris\u00E9e.
-INUSE_ATTRIBUTE_ERR = Tentative d'ajout d'un attribut d\u00E9j\u00E0 utilis\u00E9 ailleurs.
-INVALID_ACCESS_ERR  = Un param\u00E8tre ou une op\u00E9ration n'est pas pris en charge par l'objet sous-jacent. 
-INVALID_CHARACTER_ERR = Un caract\u00E8re XML non valide ou non admis est indiqu\u00E9. 
+DOMSTRING_SIZE_ERR = La plage de texte indiquée ne tient pas dans un élément DOMString. 
+HIERARCHY_REQUEST_ERR  = Tentative d'insertion d'un noeud à un emplacement non autorisé. 
+INDEX_SIZE_ERR = L'index ou la taille est négatif ou dépasse la valeur autorisée.
+INUSE_ATTRIBUTE_ERR = Tentative d'ajout d'un attribut déjà utilisé ailleurs.
+INVALID_ACCESS_ERR  = Un paramètre ou une opération n'est pas pris en charge par l'objet sous-jacent. 
+INVALID_CHARACTER_ERR = Un caractère XML non valide ou non admis est indiqué. 
 INVALID_MODIFICATION_ERR =  Tentative de modification du type de l'objet sous-jacent. 
 INVALID_STATE_ERR = Tentative d'utilisation d'un objet qui n'est pas ou plus utilisable. 
-NAMESPACE_ERR = Tentative de cr\u00E9ation ou de modification d'un objet incorrecte par rapport aux espaces de noms.
-NOT_FOUND_ERR = Tentative de r\u00E9f\u00E9rencement d'un noeud dans un contexte o\u00F9 il n'existe pas.
-NOT_SUPPORTED_ERR = L'impl\u00E9mentation ne prend pas en charge le type d'objet ou d'op\u00E9ration demand\u00E9. 
-NO_DATA_ALLOWED_ERR = Des donn\u00E9es ont \u00E9t\u00E9 indiqu\u00E9es pour un noeud ne prenant pas en charge les donn\u00E9es.
-NO_MODIFICATION_ALLOWED_ERR = Tentative de modification d'un objet pour lequel les modifications ne sont pas autoris\u00E9es.
-SYNTAX_ERR = Une cha\u00EEne non valide ou non admise est indiqu\u00E9e. 
-VALIDATION_ERR = L'appel d'une m\u00E9thode comme insertBefore ou removeChild risque de rendre le noeud non valide par rapport \u00E0 la grammaire de document.
-WRONG_DOCUMENT_ERR = Un noeud est utilis\u00E9 dans un document diff\u00E9rent de celui l'ayant cr\u00E9\u00E9.
-TYPE_MISMATCH_ERR = Le type de valeur pour ce nom de param\u00E8tre n'est pas compatible avec le type de valeur attendu. 
+NAMESPACE_ERR = Tentative de création ou de modification d'un objet incorrecte par rapport aux espaces de noms.
+NOT_FOUND_ERR = Tentative de référencement d'un noeud dans un contexte où il n'existe pas.
+NOT_SUPPORTED_ERR = L'implémentation ne prend pas en charge le type d'objet ou d'opération demandé. 
+NO_DATA_ALLOWED_ERR = Des données ont été indiquées pour un noeud ne prenant pas en charge les données.
+NO_MODIFICATION_ALLOWED_ERR = Tentative de modification d'un objet pour lequel les modifications ne sont pas autorisées.
+SYNTAX_ERR = Une chaîne non valide ou non admise est indiquée. 
+VALIDATION_ERR = L'appel d'une méthode comme insertBefore ou removeChild risque de rendre le noeud non valide par rapport à la grammaire de document.
+WRONG_DOCUMENT_ERR = Un noeud est utilisé dans un document différent de celui l'ayant créé.
+TYPE_MISMATCH_ERR = Le type de valeur pour ce nom de paramètre n'est pas compatible avec le type de valeur attendu. 
 
 #error messages or exceptions
-FEATURE_NOT_SUPPORTED = Le param\u00E8tre {0} est reconnu mais la valeur demand\u00E9e ne peut pas \u00EAtre d\u00E9finie.
-FEATURE_NOT_FOUND = Le param\u00E8tre {0} n''est pas reconnu.
-STRING_TOO_LONG   = La cha\u00EEne obtenue est trop longue pour tenir dans un \u00E9l\u00E9ment DOMString : ''{0}''.
+FEATURE_NOT_SUPPORTED = Le paramètre {0} est reconnu mais la valeur demandée ne peut pas être définie.
+FEATURE_NOT_FOUND = Le paramètre {0} n''est pas reconnu.
+STRING_TOO_LONG   = La chaîne obtenue est trop longue pour tenir dans un élément DOMString : ''{0}''.
 
 #DOM Level 3 DOMError codes
-wf-invalid-character =  Le texte {0} du noeud {1} contient des caract\u00E8res XML non valides.
-wf-invalid-character-in-node-name = Le noeud {0} nomm\u00E9 {1} contient des caract\u00E8res XML non valides.
+wf-invalid-character =  Le texte {0} du noeud {1} contient des caractères XML non valides.
+wf-invalid-character-in-node-name = Le noeud {0} nommé {1} contient des caractères XML non valides.
 cdata-sections-splitted =  Sections CDATA contenant le marqueur de fin de section CDATA '']]>''
-doctype-not-allowed = La d\u00E9claration DOCTYPE n'est pas autoris\u00E9e.
+doctype-not-allowed = La déclaration DOCTYPE n'est pas autorisée.
 unsupported-encoding = L''encodage {0} n''est pas pris en charge.
 
 #Error codes used in DOM Normalizer
-InvalidXMLCharInDOM = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 trouv\u00E9 dans le DOM au cours de la normalisation.
-UndeclaredEntRefInAttrValue = La valeur de l''attribut "{0}", "{1}", r\u00E9f\u00E9ren\u00E7ait une entit\u00E9 non d\u00E9clar\u00E9e.
-NullLocalElementName = Un nom local NULL a \u00E9t\u00E9 d\u00E9tect\u00E9 au cours de la normalisation de l''espace de noms de l''\u00E9l\u00E9ment {0}.
-NullLocalAttrName = Un nom local NULL a \u00E9t\u00E9 d\u00E9tect\u00E9 au cours de la normalisation de l''espace de noms de l''attribut {0}.
+InvalidXMLCharInDOM = Un caractère XML non valide (Unicode : 0x{0}) a été trouvé dans le DOM au cours de la normalisation.
+UndeclaredEntRefInAttrValue = La valeur de l''attribut "{0}", "{1}", référençait une entité non déclarée.
+NullLocalElementName = Un nom local NULL a été détecté au cours de la normalisation de l''espace de noms de l''élément {0}.
+NullLocalAttrName = Un nom local NULL a été détecté au cours de la normalisation de l''espace de noms de l''attribut {0}.
 
 #Error codes used in DOMParser
-InvalidDocumentClassName = Le nom de classe de la fabrique de documents "{0}" utilis\u00E9e pour construire l''arborescence DOM n''est pas de type org.w3c.dom.Document.
-MissingDocumentClassName = Le nom de classe de la fabrique de documents "{0}" utilis\u00E9e pour construire l''arborescence DOM est introuvable.
-CannotCreateDocumentClass = La classe nomm\u00E9e "{0}" n''a pas pu \u00EAtre construite en tant que org.w3c.dom.Document.
+InvalidDocumentClassName = Le nom de classe de la fabrique de documents "{0}" utilisée pour construire l''arborescence DOM n''est pas de type org.w3c.dom.Document.
+MissingDocumentClassName = Le nom de classe de la fabrique de documents "{0}" utilisée pour construire l''arborescence DOM est introuvable.
+CannotCreateDocumentClass = La classe nommée "{0}" n''a pas pu être construite en tant que org.w3c.dom.Document.
 
 # Error codes used by JAXP DocumentBuilder
-jaxp-order-not-supported = La propri\u00E9t\u00E9 ''{0}'' doit \u00EAtre d\u00E9finie avant la propri\u00E9t\u00E9 ''{1}''.
-jaxp-null-input-source = La source indiqu\u00E9e ne peut pas \u00EAtre NULL.
+jaxp-order-not-supported = La propriété ''{0}'' doit être définie avant la propriété ''{1}''.
+jaxp-null-input-source = La source indiquée ne peut pas être NULL.
 
 #Ranges
-BAD_BOUNDARYPOINTS_ERR = Les points de limite d'une plage ne r\u00E9pondent pas aux exigences sp\u00E9cifiques.
-INVALID_NODE_TYPE_ERR = Le conteneur d'un point de limite d'une plage est d\u00E9fini sur un noeud de type non valide ou sur un noeud ayant un anc\u00EAtre de type non valide.
+BAD_BOUNDARYPOINTS_ERR = Les points de limite d'une plage ne répondent pas aux exigences spécifiques.
+INVALID_NODE_TYPE_ERR = Le conteneur d'un point de limite d'une plage est défini sur un noeud de type non valide ou sur un noeud ayant un ancêtre de type non valide.
 
 
 #Events
-UNSPECIFIED_EVENT_TYPE_ERR = Le type d'\u00E9v\u00E9nement n'a pas \u00E9t\u00E9 indiqu\u00E9 en initialisant l'\u00E9v\u00E9nement avant l'appel de la m\u00E9thode. 
+UNSPECIFIED_EVENT_TYPE_ERR = Le type d'événement n'a pas été indiqué en initialisant l'événement avant l'appel de la méthode. 
 
 
-jaxp-schema-support=La m\u00E9thode setSchema et la propri\u00E9t\u00E9 schemaLanguage sont utilis\u00E9es
+jaxp-schema-support=La méthode setSchema et la propriété schemaLanguage sont utilisées
 
-jaxp_feature_not_supported=La fonctionnalit\u00E9 ''{0}'' n''est pas prise en charge.
+jaxp_feature_not_supported=La fonctionnalité ''{0}'' n''est pas prise en charge.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties
index e67887ac38e..29afb91340f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties
@@ -29,65 +29,65 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
         BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
-        FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n  
+        FormatFailed = Si è verificato un errore interno durante la formattazione del seguente messaggio:\n  
 
 # DOM Core
 
 # exception codes
 DOMSTRING_SIZE_ERR = L'intervallo di testo specificato non si adatta in DOMString. 
-HIERARCHY_REQUEST_ERR  = Si \u00E8 tentato di inserire un nodo in un punto in cui non \u00E8 consentito. 
-INDEX_SIZE_ERR = L'indice o la dimensione \u00E8 negativa o maggiore del valore consentito.
-INUSE_ATTRIBUTE_ERR = Si \u00E8 tentato di aggiungere un attributo gi\u00E0 in uso altrove.
-INVALID_ACCESS_ERR  = Un parametro o un'operazione non \u00E8 supportata dall'oggetto di base. 
-INVALID_CHARACTER_ERR = \u00C8 stato specificato un carattere XML non valido. 
-INVALID_MODIFICATION_ERR =  Si \u00E8 tentato di modificare il tipo dell'oggetto di base. 
-INVALID_STATE_ERR = Si \u00E8 tentato di utilizzare un oggetto che non \u00E8 o non \u00E8 pi\u00F9 utilizzabile. 
-NAMESPACE_ERR = Si \u00E8 tentato di creare o modificare un oggetto in modo errato per quel che riguarda gli spazi di nomi.
-NOT_FOUND_ERR = Si \u00E8 tentato di fare riferimento a un nodo in un contesto in cui non esiste.
+HIERARCHY_REQUEST_ERR  = Si è tentato di inserire un nodo in un punto in cui non è consentito. 
+INDEX_SIZE_ERR = L'indice o la dimensione è negativa o maggiore del valore consentito.
+INUSE_ATTRIBUTE_ERR = Si è tentato di aggiungere un attributo già in uso altrove.
+INVALID_ACCESS_ERR  = Un parametro o un'operazione non è supportata dall'oggetto di base. 
+INVALID_CHARACTER_ERR = È stato specificato un carattere XML non valido. 
+INVALID_MODIFICATION_ERR =  Si è tentato di modificare il tipo dell'oggetto di base. 
+INVALID_STATE_ERR = Si è tentato di utilizzare un oggetto che non è o non è più utilizzabile. 
+NAMESPACE_ERR = Si è tentato di creare o modificare un oggetto in modo errato per quel che riguarda gli spazi di nomi.
+NOT_FOUND_ERR = Si è tentato di fare riferimento a un nodo in un contesto in cui non esiste.
 NOT_SUPPORTED_ERR = L'implementazione non supporta il tipo richiesto di oggetto o operazione. 
 NO_DATA_ALLOWED_ERR = Sono stati specificati dati per un nodo che non supporta dati.
-NO_MODIFICATION_ALLOWED_ERR = Si \u00E8 tentato di modificare un oggetto non modificabile.
-SYNTAX_ERR = \u00C8 stata specificata una stringa non valida. 
-VALIDATION_ERR = Se si richiama un metodo come insertBefore o removeChild, il nodo non sar\u00E0 valido per quel che riguarda la grammatica del documento.
-WRONG_DOCUMENT_ERR = Un nodo \u00E8 utilizzato in un documento diverso da quello che lo ha creato.
-TYPE_MISMATCH_ERR = Il tipo di valore per questo nome parametro non \u00E8 compatibile con il tipo di valore previsto. 
+NO_MODIFICATION_ALLOWED_ERR = Si è tentato di modificare un oggetto non modificabile.
+SYNTAX_ERR = È stata specificata una stringa non valida. 
+VALIDATION_ERR = Se si richiama un metodo come insertBefore o removeChild, il nodo non sarà valido per quel che riguarda la grammatica del documento.
+WRONG_DOCUMENT_ERR = Un nodo è utilizzato in un documento diverso da quello che lo ha creato.
+TYPE_MISMATCH_ERR = Il tipo di valore per questo nome parametro non è compatibile con il tipo di valore previsto. 
 
 #error messages or exceptions
-FEATURE_NOT_SUPPORTED = Il parametro {0} \u00E8 stato riconosciuto, ma non \u00E8 possibile impostare il valore richiesto.
-FEATURE_NOT_FOUND = Il parametro {0} non \u00E8 riconosciuto.
-STRING_TOO_LONG   = La stringa risultante \u00E8 troppo lunga per adattarsi in DOMString: ''{0}''.
+FEATURE_NOT_SUPPORTED = Il parametro {0} è stato riconosciuto, ma non è possibile impostare il valore richiesto.
+FEATURE_NOT_FOUND = Il parametro {0} non è riconosciuto.
+STRING_TOO_LONG   = La stringa risultante è troppo lunga per adattarsi in DOMString: ''{0}''.
 
 #DOM Level 3 DOMError codes
 wf-invalid-character =  Il testo {0} del nodo {1} contiene caratteri XML non validi.
 wf-invalid-character-in-node-name = Il nodo {0} denominato {1} contiene caratteri XML non validi.
 cdata-sections-splitted =  Sezioni CDATA che contengono l'indicatore di fine della sezione CDATA '']]>''
 doctype-not-allowed = Dichiarazione DOCTYPE non consentita.
-unsupported-encoding = La codifica {0} non \u00E8 supportata.
+unsupported-encoding = La codifica {0} non è supportata.
 
 #Error codes used in DOM Normalizer
-InvalidXMLCharInDOM = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) in DOM durante la normalizzazione.
-UndeclaredEntRefInAttrValue = L''attributo "{0}" con valore "{1}" fa riferimento a un''entit\u00E0 non dichiarata.
-NullLocalElementName = \u00C8 stato rilevato un nome locale nullo durante la normalizzazione dello spazio di nomi dell''elemento {0}.
-NullLocalAttrName = \u00C8 stato rilevato un nome locale nullo durante la normalizzazione dello spazio di nomi dell''attributo {0}.
+InvalidXMLCharInDOM = È stato trovato un carattere XML non valido (Unicode: 0x{0}) in DOM durante la normalizzazione.
+UndeclaredEntRefInAttrValue = L''attributo "{0}" con valore "{1}" fa riferimento a un''entità non dichiarata.
+NullLocalElementName = È stato rilevato un nome locale nullo durante la normalizzazione dello spazio di nomi dell''elemento {0}.
+NullLocalAttrName = È stato rilevato un nome locale nullo durante la normalizzazione dello spazio di nomi dell''attributo {0}.
 
 #Error codes used in DOMParser
-InvalidDocumentClassName = Il nome classe del document factory "{0}" utilizzato per creare la struttura DOM non \u00E8 di tipo org.w3c.dom.Document.
+InvalidDocumentClassName = Il nome classe del document factory "{0}" utilizzato per creare la struttura DOM non è di tipo org.w3c.dom.Document.
 MissingDocumentClassName = Impossibile trovare il nome classe del document factory "{0}" utilizzato per creare la struttura DOM.
 CannotCreateDocumentClass = Impossibile creare la classe denominata "{0}" come org.w3c.dom.Document.
 
 # Error codes used by JAXP DocumentBuilder
-jaxp-order-not-supported = Impostare la propriet\u00E0 ''{0}'' prima di impostare la propriet\u00E0 ''{1}''.
-jaxp-null-input-source = L'origine specificata non pu\u00F2 essere nulla.
+jaxp-order-not-supported = Impostare la proprietà ''{0}'' prima di impostare la proprietà ''{1}''.
+jaxp-null-input-source = L'origine specificata non può essere nulla.
 
 #Ranges
 BAD_BOUNDARYPOINTS_ERR = I punti limite di un intervallo non rispettano i requisiti specifici.
-INVALID_NODE_TYPE_ERR = Il contenitore di un punto limite di un intervallo \u00E8 stato impostato su un nodo di tipo non valido o su un nodo con un predecessore di tipo non valido.
+INVALID_NODE_TYPE_ERR = Il contenitore di un punto limite di un intervallo è stato impostato su un nodo di tipo non valido o su un nodo con un predecessore di tipo non valido.
 
 
 #Events
-UNSPECIFIED_EVENT_TYPE_ERR = Il tipo di evento non \u00E8 stato specificato inizializzando l'evento prima che fosse richiamato il metodo. 
+UNSPECIFIED_EVENT_TYPE_ERR = Il tipo di evento non è stato specificato inizializzando l'evento prima che fosse richiamato il metodo. 
 
 
-jaxp-schema-support=Sono stati utilizzati sia il metodo setSchema che la propriet\u00E0 schemaLanguage
+jaxp-schema-support=Sono stati utilizzati sia il metodo setSchema che la proprietà schemaLanguage
 
-jaxp_feature_not_supported=La funzione "{0}" non \u00E8 supportata.
+jaxp_feature_not_supported=La funzione "{0}" non è supportata.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
index 458d4f9d3b3..b358fc8a324 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
@@ -20,66 +20,66 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-        FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n  
+        BadMessageKey = メッセージ・キーに対応するエラー・メッセージが見つかりません。
+        FormatFailed = 次のメッセージの書式設定中に内部エラーが発生しました:\n  
 
 # DOM Core
 
 # exception codes
-DOMSTRING_SIZE_ERR = \u6307\u5B9A\u3057\u305F\u30C6\u30AD\u30B9\u30C8\u7BC4\u56F2\u306FDOMString\u306B\u53CE\u307E\u308A\u307E\u305B\u3093\u3002 
-HIERARCHY_REQUEST_ERR  = \u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u6240\u3067\u30CE\u30FC\u30C9\u3092\u633F\u5165\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002 
-INDEX_SIZE_ERR = \u7D22\u5F15\u307E\u305F\u306F\u30B5\u30A4\u30BA\u304C\u8CA0\u304B\u3001\u8A31\u5BB9\u5024\u3088\u308A\u5927\u304D\u304F\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-INUSE_ATTRIBUTE_ERR = \u4ED6\u306E\u5834\u6240\u3067\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5C5E\u6027\u3092\u8FFD\u52A0\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002
-INVALID_ACCESS_ERR  = \u57FA\u790E\u3068\u306A\u308B\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3067\u30D1\u30E9\u30E1\u30FC\u30BF\u307E\u305F\u306F\u64CD\u4F5C\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 
-INVALID_CHARACTER_ERR = \u7121\u52B9\u307E\u305F\u306F\u4E0D\u6B63\u306AXML\u6587\u5B57\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002 
-INVALID_MODIFICATION_ERR =  \u57FA\u790E\u3068\u306A\u308B\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30BF\u30A4\u30D7\u3092\u5909\u66F4\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002 
-INVALID_STATE_ERR = \u4F7F\u7528\u3067\u304D\u306A\u3044\u304B\u3001\u4ECA\u5F8C\u4F7F\u7528\u3067\u304D\u306A\u304F\u306A\u308B\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002 
-NAMESPACE_ERR = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u95A2\u3057\u3066\u4E0D\u9069\u5207\u306A\u65B9\u6CD5\u3067\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u4F5C\u6210\u307E\u305F\u306F\u5909\u66F4\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002
-NOT_FOUND_ERR = \u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u5B58\u5728\u3057\u306A\u3044\u30CE\u30FC\u30C9\u3092\u53C2\u7167\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002
-NOT_SUPPORTED_ERR = \u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u305F\u30BF\u30A4\u30D7\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u307E\u305F\u306F\u64CD\u4F5C\u306F\u5B9F\u88C5\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 
-NO_DATA_ALLOWED_ERR = \u30C7\u30FC\u30BF\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u306A\u3044\u30CE\u30FC\u30C9\u306B\u5BFE\u3057\u3066\u30C7\u30FC\u30BF\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-NO_MODIFICATION_ALLOWED_ERR = \u5909\u66F4\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u5909\u66F4\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002
-SYNTAX_ERR = \u7121\u52B9\u307E\u305F\u306F\u4E0D\u6B63\u306A\u6587\u5B57\u5217\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002 
-VALIDATION_ERR = insertBefore\u3001removeChild\u306A\u3069\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u547C\u3073\u51FA\u3059\u3068\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6587\u306B\u95A2\u3057\u3066\u30CE\u30FC\u30C9\u304C\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002
-WRONG_DOCUMENT_ERR = \u30CE\u30FC\u30C9\u304C\u3001\u305D\u306E\u30CE\u30FC\u30C9\u3092\u4F5C\u6210\u3057\u305F\u3082\u306E\u3068\u306F\u7570\u306A\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-TYPE_MISMATCH_ERR = \u3053\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u540D\u306E\u5024\u30BF\u30A4\u30D7\u306F\u3001\u4E88\u60F3\u3057\u305F\u5024\u30BF\u30A4\u30D7\u3068\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093\u3002 
+DOMSTRING_SIZE_ERR = 指定したテキスト範囲はDOMStringに収まりません。 
+HIERARCHY_REQUEST_ERR  = 許可されていない場所でノードを挿入しようとしました。 
+INDEX_SIZE_ERR = 索引またはサイズが負か、許容値より大きくなっています。
+INUSE_ATTRIBUTE_ERR = 他の場所ですでに使用されている属性を追加しようとしました。
+INVALID_ACCESS_ERR  = 基礎となるオブジェクトでパラメータまたは操作がサポートされていません。 
+INVALID_CHARACTER_ERR = 無効または不正なXML文字が指定されています。 
+INVALID_MODIFICATION_ERR =  基礎となるオブジェクトのタイプを変更しようとしました。 
+INVALID_STATE_ERR = 使用できないか、今後使用できなくなるオブジェクトを使用しようとしました。 
+NAMESPACE_ERR = ネームスペースに関して不適切な方法でオブジェクトを作成または変更しようとしました。
+NOT_FOUND_ERR = コンテキストに存在しないノードを参照しようとしました。
+NOT_SUPPORTED_ERR = リクエストしたタイプのオブジェクトまたは操作は実装でサポートされていません。 
+NO_DATA_ALLOWED_ERR = データをサポートしていないノードに対してデータが指定されています。
+NO_MODIFICATION_ALLOWED_ERR = 変更が許可されていないオブジェクトを変更しようとしました。
+SYNTAX_ERR = 無効または不正な文字列が指定されています。 
+VALIDATION_ERR = insertBefore、removeChildなどのメソッドを呼び出すと、ドキュメントの構文に関してノードが無効になります。
+WRONG_DOCUMENT_ERR = ノードが、そのノードを作成したものとは異なるドキュメントで使用されています。
+TYPE_MISMATCH_ERR = このパラメータ名の値タイプは、予想した値タイプと互換性がありません。 
 
 #error messages or exceptions
-FEATURE_NOT_SUPPORTED = \u30D1\u30E9\u30E1\u30FC\u30BF{0}\u306F\u8A8D\u8B58\u3055\u308C\u307E\u3059\u304C\u3001\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u305F\u5024\u306F\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-FEATURE_NOT_FOUND = \u30D1\u30E9\u30E1\u30FC\u30BF{0}\u306F\u8A8D\u8B58\u3055\u308C\u307E\u305B\u3093\u3002
-STRING_TOO_LONG   = \u7D50\u679C\u306E\u6587\u5B57\u5217\u306F\u9577\u3059\u304E\u308B\u305F\u3081\u3001DOMString\u306B\u53CE\u307E\u308A\u307E\u305B\u3093: ''{0}''\u3002
+FEATURE_NOT_SUPPORTED = パラメータ{0}は認識されますが、リクエストした値は設定できません。
+FEATURE_NOT_FOUND = パラメータ{0}は認識されません。
+STRING_TOO_LONG   = 結果の文字列は長すぎるため、DOMStringに収まりません: ''{0}''。
 
 #DOM Level 3 DOMError codes
-wf-invalid-character =  {1}\u30CE\u30FC\u30C9\u306E\u30C6\u30AD\u30B9\u30C8{0}\u306B\u7121\u52B9\u306AXML\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-wf-invalid-character-in-node-name = {1}\u3068\u3044\u3046\u540D\u524D\u306E{0}\u30CE\u30FC\u30C9\u306B\u7121\u52B9\u306AXML\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-cdata-sections-splitted =  CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306BCDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u7D42\u4E86\u30DE\u30FC\u30AB\u30FC'']]>''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-doctype-not-allowed = DOCTYPE\u5BA3\u8A00\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-unsupported-encoding = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0{0}\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+wf-invalid-character =  {1}ノードのテキスト{0}に無効なXML文字が含まれています。
+wf-invalid-character-in-node-name = {1}という名前の{0}ノードに無効なXML文字が含まれています。
+cdata-sections-splitted =  CDATAセクションにCDATAセクション終了マーカー'']]>''が含まれています
+doctype-not-allowed = DOCTYPE宣言は許可されていません。
+unsupported-encoding = エンコーディング{0}はサポートされていません。
 
 #Error codes used in DOM Normalizer
-InvalidXMLCharInDOM = \u6B63\u898F\u5316\u4E2D\u306BDOM\u5185\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-UndeclaredEntRefInAttrValue = \u5C5E\u6027"{0}"\u306E\u5024"{1}"\u3067\u53C2\u7167\u3055\u308C\u3066\u3044\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-NullLocalElementName = \u8981\u7D20{0}\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306E\u6B63\u898F\u5316\u4E2D\u306Bnull\u306E\u30ED\u30FC\u30AB\u30EB\u540D\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-NullLocalAttrName = \u5C5E\u6027{0}\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306E\u6B63\u898F\u5316\u4E2D\u306Bnull\u306E\u30ED\u30FC\u30AB\u30EB\u540D\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
+InvalidXMLCharInDOM = 正規化中にDOM内に無効なXML文字(Unicode: 0x{0})が見つかりました。
+UndeclaredEntRefInAttrValue = 属性"{0}"の値"{1}"で参照されているエンティティが宣言されていません。
+NullLocalElementName = 要素{0}のネームスペースの正規化中にnullのローカル名が見つかりました。
+NullLocalAttrName = 属性{0}のネームスペースの正規化中にnullのローカル名が見つかりました。
 
 #Error codes used in DOMParser
-InvalidDocumentClassName = DOM\u30C4\u30EA\u30FC\u306E\u69CB\u7BC9\u306B\u4F7F\u7528\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30D5\u30A1\u30AF\u30C8\u30EA"{0}"\u306E\u30AF\u30E9\u30B9\u540D\u304C\u30BF\u30A4\u30D7org.w3c.dom.Document\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-MissingDocumentClassName = DOM\u30C4\u30EA\u30FC\u306E\u69CB\u7BC9\u306B\u4F7F\u7528\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30D5\u30A1\u30AF\u30C8\u30EA"{0}"\u306E\u30AF\u30E9\u30B9\u540D\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-CannotCreateDocumentClass = "{0}"\u3068\u3044\u3046\u540D\u524D\u306E\u30AF\u30E9\u30B9\u3092org.w3c.dom.Document\u3068\u3057\u3066\u69CB\u7BC9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+InvalidDocumentClassName = DOMツリーの構築に使用されるドキュメント・ファクトリ"{0}"のクラス名がタイプorg.w3c.dom.Documentではありません。
+MissingDocumentClassName = DOMツリーの構築に使用されるドキュメント・ファクトリ"{0}"のクラス名が見つかりませんでした。
+CannotCreateDocumentClass = "{0}"という名前のクラスをorg.w3c.dom.Documentとして構築できませんでした。
 
 # Error codes used by JAXP DocumentBuilder
-jaxp-order-not-supported = \u30D7\u30ED\u30D1\u30C6\u30A3''{1}''\u3092\u8A2D\u5B9A\u3059\u308B\u524D\u306B\u30D7\u30ED\u30D1\u30C6\u30A3''{0}''\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-jaxp-null-input-source = \u6307\u5B9A\u3057\u305F\u30BD\u30FC\u30B9\u306Fnull\u306B\u3067\u304D\u307E\u305B\u3093\u3002
+jaxp-order-not-supported = プロパティ''{1}''を設定する前にプロパティ''{0}''を設定する必要があります。
+jaxp-null-input-source = 指定したソースはnullにできません。
 
 #Ranges
-BAD_BOUNDARYPOINTS_ERR = Range\u306E\u5883\u754C\u70B9\u304C\u7279\u5B9A\u306E\u8981\u4EF6\u3092\u6E80\u305F\u3057\u3066\u3044\u307E\u305B\u3093\u3002
-INVALID_NODE_TYPE_ERR = Range\u306E\u5883\u754C\u70B9\u306E\u30B3\u30F3\u30C6\u30CA\u304C\u3001\u7121\u52B9\u306A\u30BF\u30A4\u30D7\u306E\u30CE\u30FC\u30C9\u307E\u305F\u306F\u7121\u52B9\u306A\u30BF\u30A4\u30D7\u306E\u7956\u5148\u3092\u6301\u3064\u30CE\u30FC\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+BAD_BOUNDARYPOINTS_ERR = Rangeの境界点が特定の要件を満たしていません。
+INVALID_NODE_TYPE_ERR = Rangeの境界点のコンテナが、無効なタイプのノードまたは無効なタイプの祖先を持つノードに設定されています。
 
 
 #Events
-UNSPECIFIED_EVENT_TYPE_ERR = \u30E1\u30BD\u30C3\u30C9\u3092\u547C\u3073\u51FA\u3059\u524D\u306E\u30A4\u30D9\u30F3\u30C8\u306E\u521D\u671F\u5316\u3067\u3001\u30A4\u30D9\u30F3\u30C8\u306E\u30BF\u30A4\u30D7\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002 
+UNSPECIFIED_EVENT_TYPE_ERR = メソッドを呼び出す前のイベントの初期化で、イベントのタイプが指定されませんでした。 
 
 
-jaxp-schema-support=setSchema\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073schemaLanguage\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u4E21\u65B9\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
+jaxp-schema-support=setSchemaメソッドおよびschemaLanguageプロパティの両方が使用されています
 
-jaxp_feature_not_supported=\u6A5F\u80FD"{0}"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+jaxp_feature_not_supported=機能"{0}"はサポートされていません。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties
index c81308bdf4a..3d56d383201 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties
@@ -28,66 +28,66 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n  
+        BadMessageKey = 메시지 키에 해당하는 오류 메시지를 찾을 수 없습니다.
+        FormatFailed = 다음 메시지의 형식을 지정하는 중 내부 오류가 발생했습니다.\n  
 
 # DOM Core
 
 # exception codes
-DOMSTRING_SIZE_ERR = \uD14D\uC2A4\uD2B8\uC758 \uC9C0\uC815\uB41C \uBC94\uC704\uAC00 DOMString\uC5D0 \uB9DE\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. 
-HIERARCHY_REQUEST_ERR  = \uC0BD\uC785\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uB294 \uB178\uB4DC\uB97C \uC0BD\uC785\uD558\uB824\uACE0 \uC2DC\uB3C4\uD588\uC2B5\uB2C8\uB2E4. 
-INDEX_SIZE_ERR = \uC778\uB371\uC2A4 \uB610\uB294 \uD06C\uAE30\uAC00 \uC74C\uC218\uC774\uAC70\uB098 \uD5C8\uC6A9\uB418\uB294 \uAC12\uBCF4\uB2E4 \uD07D\uB2C8\uB2E4.
-INUSE_ATTRIBUTE_ERR = \uB2E4\uB978 \uC704\uCE58\uC5D0\uC11C \uC774\uBBF8 \uC0AC\uC6A9 \uC911\uC778 \uC18D\uC131\uC744 \uCD94\uAC00\uD558\uB824\uACE0 \uC2DC\uB3C4\uD588\uC2B5\uB2C8\uB2E4.
-INVALID_ACCESS_ERR  = \uAE30\uBCF8 \uAC1D\uCCB4\uC5D0\uC11C \uB9E4\uAC1C\uBCC0\uC218 \uB610\uB294 \uC791\uC5C5\uC744 \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. 
-INVALID_CHARACTER_ERR = \uBD80\uC801\uD569\uD558\uAC70\uB098 \uC798\uBABB\uB41C XML \uBB38\uC790\uAC00 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. 
-INVALID_MODIFICATION_ERR =  \uAE30\uBCF8 \uAC1D\uCCB4\uC758 \uC720\uD615\uC744 \uC218\uC815\uD558\uB824\uACE0 \uC2DC\uB3C4\uD588\uC2B5\uB2C8\uB2E4. 
-INVALID_STATE_ERR = \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uAC70\uB098 \uB354 \uC774\uC0C1 \uC0AC\uC6A9\uC774 \uD5C8\uAC00\uB418\uC9C0 \uC54A\uC740 \uAC1D\uCCB4\uB97C \uC0AC\uC6A9\uD558\uB824\uACE0 \uC2DC\uB3C4\uD588\uC2B5\uB2C8\uB2E4. 
-NAMESPACE_ERR = \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uB300\uD574 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC740 \uBC29\uC2DD\uC73C\uB85C \uAC1D\uCCB4\uB97C \uC0DD\uC131\uD558\uAC70\uB098 \uBCC0\uACBD\uD558\uB824\uACE0 \uC2DC\uB3C4\uD588\uC2B5\uB2C8\uB2E4.
-NOT_FOUND_ERR = \uC874\uC7AC\uD558\uC9C0 \uC54A\uB294 \uCEE8\uD14D\uC2A4\uD2B8\uC758 \uB178\uB4DC\uB97C \uCC38\uC870\uD558\uB824\uACE0 \uC2DC\uB3C4\uD588\uC2B5\uB2C8\uB2E4.
-NOT_SUPPORTED_ERR = \uAD6C\uD604\uC5D0\uC11C \uC694\uCCAD\uB41C \uC720\uD615\uC758 \uAC1D\uCCB4 \uB610\uB294 \uC791\uC5C5\uC744 \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. 
-NO_DATA_ALLOWED_ERR = \uB370\uC774\uD130\uB97C \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uB294 \uB178\uB4DC\uC5D0 \uB300\uD574 \uB370\uC774\uD130\uAC00 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-NO_MODIFICATION_ALLOWED_ERR = \uC218\uC815\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uB294 \uAC1D\uCCB4\uB97C \uC218\uC815\uD558\uB824\uACE0 \uC2DC\uB3C4\uD588\uC2B5\uB2C8\uB2E4.
-SYNTAX_ERR = \uBD80\uC801\uD569\uD558\uAC70\uB098 \uC798\uBABB\uB41C \uBB38\uC790\uC5F4\uC774 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. 
-VALIDATION_ERR = insertBefore \uB610\uB294 removeChild\uC640 \uAC19\uC740 \uBA54\uC18C\uB4DC\uB97C \uD638\uCD9C\uD558\uBA74 \uB178\uB4DC\uAC00 \uBB38\uC11C \uBB38\uBC95\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD574\uC9D1\uB2C8\uB2E4.
-WRONG_DOCUMENT_ERR = \uB178\uB4DC\uAC00 \uC0DD\uC131\uB41C \uBB38\uC11C\uAC00 \uC544\uB2CC \uB2E4\uB978 \uBB38\uC11C\uC5D0\uC11C \uC0AC\uC6A9\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-TYPE_MISMATCH_ERR = \uC774 \uB9E4\uAC1C\uBCC0\uC218 \uC774\uB984\uC5D0 \uB300\uD55C \uAC12 \uC720\uD615\uC774 \uD544\uC694\uD55C \uAC12 \uC720\uD615\uACFC \uD638\uD658\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. 
+DOMSTRING_SIZE_ERR = 텍스트의 지정된 범위가 DOMString에 맞지 않습니다. 
+HIERARCHY_REQUEST_ERR  = 삽입이 허용되지 않는 노드를 삽입하려고 시도했습니다. 
+INDEX_SIZE_ERR = 인덱스 또는 크기가 음수이거나 허용되는 값보다 큽니다.
+INUSE_ATTRIBUTE_ERR = 다른 위치에서 이미 사용 중인 속성을 추가하려고 시도했습니다.
+INVALID_ACCESS_ERR  = 기본 객체에서 매개변수 또는 작업을 지원하지 않습니다. 
+INVALID_CHARACTER_ERR = 부적합하거나 잘못된 XML 문자가 지정되었습니다. 
+INVALID_MODIFICATION_ERR =  기본 객체의 유형을 수정하려고 시도했습니다. 
+INVALID_STATE_ERR = 사용할 수 없거나 더 이상 사용이 허가되지 않은 객체를 사용하려고 시도했습니다. 
+NAMESPACE_ERR = 네임스페이스에 대해 올바르지 않은 방식으로 객체를 생성하거나 변경하려고 시도했습니다.
+NOT_FOUND_ERR = 존재하지 않는 컨텍스트의 노드를 참조하려고 시도했습니다.
+NOT_SUPPORTED_ERR = 구현에서 요청된 유형의 객체 또는 작업을 지원하지 않습니다. 
+NO_DATA_ALLOWED_ERR = 데이터를 지원하지 않는 노드에 대해 데이터가 지정되었습니다.
+NO_MODIFICATION_ALLOWED_ERR = 수정이 허용되지 않는 객체를 수정하려고 시도했습니다.
+SYNTAX_ERR = 부적합하거나 잘못된 문자열이 지정되었습니다. 
+VALIDATION_ERR = insertBefore 또는 removeChild와 같은 메소드를 호출하면 노드가 문서 문법에 대해 부적합해집니다.
+WRONG_DOCUMENT_ERR = 노드가 생성된 문서가 아닌 다른 문서에서 사용되었습니다.
+TYPE_MISMATCH_ERR = 이 매개변수 이름에 대한 값 유형이 필요한 값 유형과 호환되지 않습니다. 
 
 #error messages or exceptions
-FEATURE_NOT_SUPPORTED = {0} \uB9E4\uAC1C\uBCC0\uC218\uAC00 \uC778\uC2DD\uB418\uC5C8\uC9C0\uB9CC \uC694\uCCAD\uB41C \uAC12\uC744 \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FEATURE_NOT_FOUND = {0} \uB9E4\uAC1C\uBCC0\uC218\uB97C \uC778\uC2DD\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-STRING_TOO_LONG   = \uACB0\uACFC \uBB38\uC790\uC5F4\uC774 \uB108\uBB34 \uCEE4\uC11C DOMString\uC5D0 \uB9DE\uC9C0 \uC54A\uC74C: ''{0}''.
+FEATURE_NOT_SUPPORTED = {0} 매개변수가 인식되었지만 요청된 값을 설정할 수 없습니다.
+FEATURE_NOT_FOUND = {0} 매개변수를 인식할 수 없습니다.
+STRING_TOO_LONG   = 결과 문자열이 너무 커서 DOMString에 맞지 않음: ''{0}''.
 
 #DOM Level 3 DOMError codes
-wf-invalid-character =  {1} \uB178\uB4DC\uC758 {0} \uD14D\uC2A4\uD2B8\uC5D0 \uBD80\uC801\uD569\uD55C XML \uBB38\uC790\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-wf-invalid-character-in-node-name = \uC774\uB984\uC774 {1}\uC778 {0} \uB178\uB4DC\uC5D0 \uBD80\uC801\uD569\uD55C XML \uBB38\uC790\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-cdata-sections-splitted =  CDATA \uC139\uC158 \uC885\uB8CC \uD45C\uC2DC\uC790 '']]>''\uB97C \uD3EC\uD568\uD558\uB294 CDATA \uC139\uC158
-doctype-not-allowed = DOCTYPE \uC120\uC5B8\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-unsupported-encoding = {0} \uC778\uCF54\uB529\uC740 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+wf-invalid-character =  {1} 노드의 {0} 텍스트에 부적합한 XML 문자가 포함되어 있습니다.
+wf-invalid-character-in-node-name = 이름이 {1}인 {0} 노드에 부적합한 XML 문자가 포함되어 있습니다.
+cdata-sections-splitted =  CDATA 섹션 종료 표시자 '']]>''를 포함하는 CDATA 섹션
+doctype-not-allowed = DOCTYPE 선언은 허용되지 않습니다.
+unsupported-encoding = {0} 인코딩은 지원되지 않습니다.
 
 #Error codes used in DOM Normalizer
-InvalidXMLCharInDOM = \uC815\uADDC\uD654 \uC911 DOM\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-UndeclaredEntRefInAttrValue = \uC18D\uC131 "{0}" \uAC12 "{1}"\uC774(\uAC00) \uC120\uC5B8\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0\uB97C \uCC38\uC870\uD588\uC2B5\uB2C8\uB2E4.
-NullLocalElementName = {0} \uC694\uC18C\uC758 \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC815\uADDC\uD654 \uC911 \uB110 \uB85C\uCEEC \uC774\uB984\uC774 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-NullLocalAttrName = {0} \uC18D\uC131\uC758 \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC815\uADDC\uD654 \uC911 \uB110 \uB85C\uCEEC \uC774\uB984\uC774 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+InvalidXMLCharInDOM = 정규화 중 DOM에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
+UndeclaredEntRefInAttrValue = 속성 "{0}" 값 "{1}"이(가) 선언되지 않은 엔티티를 참조했습니다.
+NullLocalElementName = {0} 요소의 네임스페이스 정규화 중 널 로컬 이름이 발견되었습니다.
+NullLocalAttrName = {0} 속성의 네임스페이스 정규화 중 널 로컬 이름이 발견되었습니다.
 
 #Error codes used in DOMParser
-InvalidDocumentClassName = DOM \uD2B8\uB9AC \uC0DD\uC131\uC5D0 \uC0AC\uC6A9\uB41C \uBB38\uC11C \uD329\uD1A0\uB9AC "{0}"\uC758 \uD074\uB798\uC2A4 \uC774\uB984\uC740 org.w3c.dom.Document \uC720\uD615\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-MissingDocumentClassName = DOM \uD2B8\uB9AC \uC0DD\uC131\uC5D0 \uC0AC\uC6A9\uB41C \uBB38\uC11C \uD329\uD1A0\uB9AC "{0}"\uC758 \uD074\uB798\uC2A4 \uC774\uB984\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-CannotCreateDocumentClass = \uC774\uB984\uC774 "{0}"\uC778 \uD074\uB798\uC2A4\uB97C org.w3c.dom.Document\uB85C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+InvalidDocumentClassName = DOM 트리 생성에 사용된 문서 팩토리 "{0}"의 클래스 이름은 org.w3c.dom.Document 유형이 아닙니다.
+MissingDocumentClassName = DOM 트리 생성에 사용된 문서 팩토리 "{0}"의 클래스 이름을 찾을 수 없습니다.
+CannotCreateDocumentClass = 이름이 "{0}"인 클래스를 org.w3c.dom.Document로 생성할 수 없습니다.
 
 # Error codes used by JAXP DocumentBuilder
-jaxp-order-not-supported = ''{1}'' \uC18D\uC131\uC744 \uC124\uC815\uD558\uAE30 \uC804\uC5D0 ''{0}'' \uC18D\uC131\uC744 \uC124\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.
-jaxp-null-input-source = \uC9C0\uC815\uB41C \uC18C\uC2A4\uB294 \uB110\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+jaxp-order-not-supported = ''{1}'' 속성을 설정하기 전에 ''{0}'' 속성을 설정해야 합니다.
+jaxp-null-input-source = 지정된 소스는 널일 수 없습니다.
 
 #Ranges
-BAD_BOUNDARYPOINTS_ERR = \uBC94\uC704\uC758 \uACBD\uACC4 \uC9C0\uC810\uC774 \uD2B9\uC815 \uC694\uAD6C \uC0AC\uD56D\uC744 \uCDA9\uC871\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-INVALID_NODE_TYPE_ERR = \uBC94\uC704\uC758 \uACBD\uACC4 \uC9C0\uC810 \uCEE8\uD14C\uC774\uB108\uAC00 \uBD80\uC801\uD569\uD55C \uC720\uD615\uC758 \uB178\uB4DC \uB610\uB294 \uBD80\uC801\uD569\uD55C \uC720\uD615\uC758 \uC870\uC0C1\uC744 \uAC00\uC9C4 \uB178\uB4DC\uB85C \uC124\uC815\uB418\uACE0 \uC788\uC2B5\uB2C8\uB2E4.
+BAD_BOUNDARYPOINTS_ERR = 범위의 경계 지점이 특정 요구 사항을 충족하지 않습니다.
+INVALID_NODE_TYPE_ERR = 범위의 경계 지점 컨테이너가 부적합한 유형의 노드 또는 부적합한 유형의 조상을 가진 노드로 설정되고 있습니다.
 
 
 #Events
-UNSPECIFIED_EVENT_TYPE_ERR = \uBA54\uC18C\uB4DC\uAC00 \uD638\uCD9C\uB418\uAE30 \uC804\uC5D0 \uC774\uBCA4\uD2B8\uB97C \uCD08\uAE30\uD654\uD558\uC5EC \uC774\uBCA4\uD2B8 \uC720\uD615\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4. 
+UNSPECIFIED_EVENT_TYPE_ERR = 메소드가 호출되기 전에 이벤트를 초기화하여 이벤트 유형이 지정되지 않았습니다. 
 
 
-jaxp-schema-support=setSchema \uBA54\uC18C\uB4DC\uC640 schemaLanguage \uC18D\uC131\uC774 \uBAA8\uB450 \uC0AC\uC6A9\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+jaxp-schema-support=setSchema 메소드와 schemaLanguage 속성이 모두 사용되었습니다.
 
-jaxp_feature_not_supported="{0}" \uAE30\uB2A5\uC740 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+jaxp_feature_not_supported="{0}" 기능은 지원되지 않습니다.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties
index 615d5c418be..6ddb17e4e94 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties
@@ -28,66 +28,66 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
+        BadMessageKey = Não foi possível encontrar a mensagem de erro correspondente à chave da mensagem.
         FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n  
 
 # DOM Core
 
 # exception codes
-DOMSTRING_SIZE_ERR = A faixa de texto especificada n\u00E3o se ajusta a DOMString. 
-HIERARCHY_REQUEST_ERR  = Houve uma tentativa de inserir um n\u00F3 onde n\u00E3o era permitido. 
-INDEX_SIZE_ERR = O \u00EDndice ou o tamanho \u00E9 negativo ou maior que o valor permitido.
-INUSE_ATTRIBUTE_ERR = Houve uma tentativa de adicionar um atributo que j\u00E1 est\u00E1 sendo usado em outro lugar.
-INVALID_ACCESS_ERR  = Um par\u00E2metro ou uma opera\u00E7\u00E3o n\u00E3o suportado pelo objeto subjacente. 
-INVALID_CHARACTER_ERR = Um caractere XML inv\u00E1lido ou ilegal foi especificado. 
+DOMSTRING_SIZE_ERR = A faixa de texto especificada não se ajusta a DOMString. 
+HIERARCHY_REQUEST_ERR  = Houve uma tentativa de inserir um nó onde não era permitido. 
+INDEX_SIZE_ERR = O índice ou o tamanho é negativo ou maior que o valor permitido.
+INUSE_ATTRIBUTE_ERR = Houve uma tentativa de adicionar um atributo que já está sendo usado em outro lugar.
+INVALID_ACCESS_ERR  = Um parâmetro ou uma operação não suportado pelo objeto subjacente. 
+INVALID_CHARACTER_ERR = Um caractere XML inválido ou ilegal foi especificado. 
 INVALID_MODIFICATION_ERR =  Houve uma tentativa de modificar o tipo de objeto subjacente. 
-INVALID_STATE_ERR = Houve uma tentativa de usar um objeto que n\u00E3o \u00E9 mais utiliz\u00E1vel. 
-NAMESPACE_ERR = Houve uma tentativa de criar ou alterar um objeto de uma forma incorreta em rela\u00E7\u00E3o aos namespaces.
-NOT_FOUND_ERR = Houve uma tentativa de fazer refer\u00EAncia a um n\u00F3 em um contexto no qual ele n\u00E3o existe.
-NOT_SUPPORTED_ERR = A implementa\u00E7\u00E3o n\u00E3o suporta o tipo solicitado de objeto ou opera\u00E7\u00E3o. 
-NO_DATA_ALLOWED_ERR = Os dados foram especificados para um n\u00F3 que n\u00E3o suporta dados.
-NO_MODIFICATION_ALLOWED_ERR = Foi feita uma tentativa de modificar um objeto no qual n\u00E3o s\u00E3o permitidas modifica\u00E7\u00F5es.
-SYNTAX_ERR = Uma string inv\u00E1lida ou ilegal foi especificada. 
-VALIDATION_ERR = Uma chamada para um m\u00E9todo como insertBefore ou removeChild tornaria o N\u00F3 inv\u00E1lido em rela\u00E7\u00E3o \u00E0 gram\u00E1tica do documento.
-WRONG_DOCUMENT_ERR = Um n\u00F3 \u00E9 usado em um documento diferente daquele que foi criado.
-TYPE_MISMATCH_ERR = O tipo de valor do nome deste par\u00E2metro \u00E9 incompat\u00EDvel com o tipo de valor esperado. 
+INVALID_STATE_ERR = Houve uma tentativa de usar um objeto que não é mais utilizável. 
+NAMESPACE_ERR = Houve uma tentativa de criar ou alterar um objeto de uma forma incorreta em relação aos namespaces.
+NOT_FOUND_ERR = Houve uma tentativa de fazer referência a um nó em um contexto no qual ele não existe.
+NOT_SUPPORTED_ERR = A implementação não suporta o tipo solicitado de objeto ou operação. 
+NO_DATA_ALLOWED_ERR = Os dados foram especificados para um nó que não suporta dados.
+NO_MODIFICATION_ALLOWED_ERR = Foi feita uma tentativa de modificar um objeto no qual não são permitidas modificações.
+SYNTAX_ERR = Uma string inválida ou ilegal foi especificada. 
+VALIDATION_ERR = Uma chamada para um método como insertBefore ou removeChild tornaria o Nó inválido em relação à gramática do documento.
+WRONG_DOCUMENT_ERR = Um nó é usado em um documento diferente daquele que foi criado.
+TYPE_MISMATCH_ERR = O tipo de valor do nome deste parâmetro é incompatível com o tipo de valor esperado. 
 
 #error messages or exceptions
-FEATURE_NOT_SUPPORTED = O par\u00E2metro {0} \u00E9 reconhecido, mas o valor solicitado n\u00E3o pode ser definido.
-FEATURE_NOT_FOUND = O par\u00E2metro {0} n\u00E3o \u00E9 reconhecido.
-STRING_TOO_LONG   = A string resultante \u00E9 muito longa para se ajustar a uma DOMString: ''{0}''.
+FEATURE_NOT_SUPPORTED = O parâmetro {0} é reconhecido, mas o valor solicitado não pode ser definido.
+FEATURE_NOT_FOUND = O parâmetro {0} não é reconhecido.
+STRING_TOO_LONG   = A string resultante é muito longa para se ajustar a uma DOMString: ''{0}''.
 
 #DOM Level 3 DOMError codes
-wf-invalid-character =  O texto {0} do n\u00F3 {1} cont\u00E9m caracteres XML inv\u00E1lidos.
-wf-invalid-character-in-node-name = O n\u00F3 {0} com o nome {1} cont\u00E9m caracteres XML inv\u00E1lidos.
-cdata-sections-splitted =  Se\u00E7\u00F5es CDATA que cont\u00EAm o marcador '']]>'' de termina\u00E7\u00E3o de se\u00E7\u00E3o CDATA
-doctype-not-allowed = A declara\u00E7\u00E3o DOCTYPE n\u00E3o \u00E9 permitida.
-unsupported-encoding = A codifica\u00E7\u00E3o {0} n\u00E3o \u00E9 suportada.
+wf-invalid-character =  O texto {0} do nó {1} contém caracteres XML inválidos.
+wf-invalid-character-in-node-name = O nó {0} com o nome {1} contém caracteres XML inválidos.
+cdata-sections-splitted =  Seções CDATA que contêm o marcador '']]>'' de terminação de seção CDATA
+doctype-not-allowed = A declaração DOCTYPE não é permitida.
+unsupported-encoding = A codificação {0} não é suportada.
 
 #Error codes used in DOM Normalizer
-InvalidXMLCharInDOM = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no DOM durante a normaliza\u00E7\u00E3o.
-UndeclaredEntRefInAttrValue = O atributo "{0}" valor "{1}" mencionou uma entidade que n\u00E3o foi declarada.
-NullLocalElementName = Um nome de local nulo foi encontrado durante a normaliza\u00E7\u00E3o do namespace do elemento {0}.
-NullLocalAttrName = Um nome de local nulo foi encontrado durante a normaliza\u00E7\u00E3o do namespace do atributo {0}.
+InvalidXMLCharInDOM = Um caractere XML inválido (Unicode: 0x {0}) foi encontrado no DOM durante a normalização.
+UndeclaredEntRefInAttrValue = O atributo "{0}" valor "{1}" mencionou uma entidade que não foi declarada.
+NullLocalElementName = Um nome de local nulo foi encontrado durante a normalização do namespace do elemento {0}.
+NullLocalAttrName = Um nome de local nulo foi encontrado durante a normalização do namespace do atributo {0}.
 
 #Error codes used in DOMParser
-InvalidDocumentClassName = O nome da classe do factory do documento "{0}" usado para construir a \u00E1rvore DOM n\u00E3o \u00E9 do tipo org.w3c.dom.Document.
-MissingDocumentClassName = N\u00E3o foi poss\u00EDvel encontrar o nome da classe do factory do documento "{0}" usado para construir a \u00E1rvore DOM.
-CannotCreateDocumentClass = N\u00E3o foi poss\u00EDvel construir a classe com o nome "{0}" como um org.w3c.dom.Document.
+InvalidDocumentClassName = O nome da classe do factory do documento "{0}" usado para construir a árvore DOM não é do tipo org.w3c.dom.Document.
+MissingDocumentClassName = Não foi possível encontrar o nome da classe do factory do documento "{0}" usado para construir a árvore DOM.
+CannotCreateDocumentClass = Não foi possível construir a classe com o nome "{0}" como um org.w3c.dom.Document.
 
 # Error codes used by JAXP DocumentBuilder
-jaxp-order-not-supported = A propriedade ''{0}'' deve ser estabelecida antes da defini\u00E7\u00E3o da propriedade ''{1}''.
-jaxp-null-input-source = A origem especificada n\u00E3o pode ser nula.
+jaxp-order-not-supported = A propriedade ''{0}'' deve ser estabelecida antes da definição da propriedade ''{1}''.
+jaxp-null-input-source = A origem especificada não pode ser nula.
 
 #Ranges
-BAD_BOUNDARYPOINTS_ERR = Os pontos-limite de uma Faixa n\u00E3o atendem aos requisitos espec\u00EDficos.
-INVALID_NODE_TYPE_ERR = O container de um ponto-limite de uma Faixa est\u00E1 sendo definido para um n\u00F3 de um tipo inv\u00E1lido ou um n\u00F3 com um ancestral de um tipo inv\u00E1lido.
+BAD_BOUNDARYPOINTS_ERR = Os pontos-limite de uma Faixa não atendem aos requisitos específicos.
+INVALID_NODE_TYPE_ERR = O container de um ponto-limite de uma Faixa está sendo definido para um nó de um tipo inválido ou um nó com um ancestral de um tipo inválido.
 
 
 #Events
-UNSPECIFIED_EVENT_TYPE_ERR = O tipo de Evento n\u00E3o foi especificado por meio da inicializa\u00E7\u00E3o do evento antes do m\u00E9todo ser chamado. 
+UNSPECIFIED_EVENT_TYPE_ERR = O tipo de Evento não foi especificado por meio da inicialização do evento antes do método ser chamado. 
 
 
-jaxp-schema-support=O m\u00E9todo setSchema e a propriedade schemaLanguage foram usados
+jaxp-schema-support=O método setSchema e a propriedade schemaLanguage foram usados
 
-jaxp_feature_not_supported=O recurso "{0}" n\u00E3o \u00E9 suportado.
+jaxp_feature_not_supported=O recurso "{0}" não é suportado.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties
index ef5062bd795..c4e3e4238f7 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties
@@ -29,65 +29,65 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
         BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
-        FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n  
+        FormatFailed = Ett internt fel inträffade vid formatering av följande meddelande:\n  
 
 # DOM Core
 
 # exception codes
 DOMSTRING_SIZE_ERR = Angivet textintervall ryms inte i DOMString. 
-HIERARCHY_REQUEST_ERR  = Ett f\u00F6rs\u00F6k gjordes att infoga nod d\u00E4r det inte \u00E4r till\u00E5tet. 
-INDEX_SIZE_ERR = Index eller storlek \u00E4r negativt tal eller st\u00F6rre \u00E4n till\u00E5tet v\u00E4rde.
-INUSE_ATTRIBUTE_ERR = Ett f\u00F6rs\u00F6k g\u00F6rs att l\u00E4gga till ett attribut som redan anv\u00E4nds p\u00E5 annan plats.
-INVALID_ACCESS_ERR  = En parameter eller en \u00E5tg\u00E4rd st\u00F6ds inte av underliggande objekt. 
-INVALID_CHARACTER_ERR = Ett ogiltigt eller otill\u00E5tet XML-tecken har angetts. 
-INVALID_MODIFICATION_ERR =  Ett f\u00F6rs\u00F6k g\u00F6rs att \u00E4ndra typ av underliggande objekt. 
-INVALID_STATE_ERR = Ett f\u00F6rs\u00F6k g\u00F6rs att anv\u00E4nda ett objekt som inte (l\u00E4ngre) \u00E4r anv\u00E4ndbar. 
-NAMESPACE_ERR = Ett f\u00F6rs\u00F6k g\u00F6rs att skapa eller \u00E4ndra ett objekt p\u00E5 ett felaktigt s\u00E4tt avseende namnrymder.
-NOT_FOUND_ERR = Ett f\u00F6rs\u00F6k g\u00F6rs att skapa referens till en nod i ett sammanhang d\u00E4r den inte finns.
-NOT_SUPPORTED_ERR = Implementeringen saknar st\u00F6d f\u00F6r beg\u00E4rd typ av objekt eller \u00E5tg\u00E4rd. 
-NO_DATA_ALLOWED_ERR = Data anges f\u00F6r en nod som inte st\u00F6der data.
-NO_MODIFICATION_ALLOWED_ERR = F\u00F6rs\u00F6ker \u00E4ndra ett objekt d\u00E4r \u00E4ndringar inte \u00E4r till\u00E5tna.
-SYNTAX_ERR = En ogiltig eller otill\u00E5ten str\u00E4ng anges. 
-VALIDATION_ERR = Ett anrop till en metod som insertBefore eller removeChild skulle g\u00F6ra noden ogiltig med aktuell dokumentgrammatik.
-WRONG_DOCUMENT_ERR = En nod anv\u00E4nds i ett annat dokument \u00E4n det som skapade noden.
-TYPE_MISMATCH_ERR = V\u00E4rdetypen f\u00F6r detta parameternamn \u00E4r inkompatibelt med f\u00F6rv\u00E4ntad v\u00E4rdetyp. 
+HIERARCHY_REQUEST_ERR  = Ett försök gjordes att infoga nod där det inte är tillåtet. 
+INDEX_SIZE_ERR = Index eller storlek är negativt tal eller större än tillåtet värde.
+INUSE_ATTRIBUTE_ERR = Ett försök görs att lägga till ett attribut som redan används på annan plats.
+INVALID_ACCESS_ERR  = En parameter eller en åtgärd stöds inte av underliggande objekt. 
+INVALID_CHARACTER_ERR = Ett ogiltigt eller otillåtet XML-tecken har angetts. 
+INVALID_MODIFICATION_ERR =  Ett försök görs att ändra typ av underliggande objekt. 
+INVALID_STATE_ERR = Ett försök görs att använda ett objekt som inte (längre) är användbar. 
+NAMESPACE_ERR = Ett försök görs att skapa eller ändra ett objekt på ett felaktigt sätt avseende namnrymder.
+NOT_FOUND_ERR = Ett försök görs att skapa referens till en nod i ett sammanhang där den inte finns.
+NOT_SUPPORTED_ERR = Implementeringen saknar stöd för begärd typ av objekt eller åtgärd. 
+NO_DATA_ALLOWED_ERR = Data anges för en nod som inte stöder data.
+NO_MODIFICATION_ALLOWED_ERR = Försöker ändra ett objekt där ändringar inte är tillåtna.
+SYNTAX_ERR = En ogiltig eller otillåten sträng anges. 
+VALIDATION_ERR = Ett anrop till en metod som insertBefore eller removeChild skulle göra noden ogiltig med aktuell dokumentgrammatik.
+WRONG_DOCUMENT_ERR = En nod används i ett annat dokument än det som skapade noden.
+TYPE_MISMATCH_ERR = Värdetypen för detta parameternamn är inkompatibelt med förväntad värdetyp. 
 
 #error messages or exceptions
-FEATURE_NOT_SUPPORTED = Parametern {0} kan identifieras, men det beg\u00E4rda v\u00E4rdet kan inte anges.
+FEATURE_NOT_SUPPORTED = Parametern {0} kan identifieras, men det begärda värdet kan inte anges.
 FEATURE_NOT_FOUND = Parametern {0} kan inte identifieras.
-STRING_TOO_LONG   = Resultatstr\u00E4ngen \u00E4r f\u00F6r l\u00E5ng och ryms inte i DOMString: ''{0}''.
+STRING_TOO_LONG   = Resultatsträngen är för lång och ryms inte i DOMString: ''{0}''.
 
 #DOM Level 3 DOMError codes
-wf-invalid-character =  Texten {0} i noden {1} inneh\u00E5ller ogiltiga XML-tecken.
-wf-invalid-character-in-node-name = Noden {0} med namnet {1} inneh\u00E5ller ogiltiga XML-tecken.
-cdata-sections-splitted =  CDATA-sektioner inneh\u00E5ller avslutningsmark\u00F6ren '']]>''
-doctype-not-allowed = DOCTYPE-deklaration \u00E4r inte till\u00E5tet.
-unsupported-encoding = Kodningen {0} st\u00F6ds inte.
+wf-invalid-character =  Texten {0} i noden {1} innehåller ogiltiga XML-tecken.
+wf-invalid-character-in-node-name = Noden {0} med namnet {1} innehåller ogiltiga XML-tecken.
+cdata-sections-splitted =  CDATA-sektioner innehåller avslutningsmarkören '']]>''
+doctype-not-allowed = DOCTYPE-deklaration är inte tillåtet.
+unsupported-encoding = Kodningen {0} stöds inte.
 
 #Error codes used in DOM Normalizer
 InvalidXMLCharInDOM = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i DOM vid normalisering.
-UndeclaredEntRefInAttrValue = Attributet "{0}" med v\u00E4rdet "{1}" refererade en enhet som inte har deklarerats.
-NullLocalElementName = Ett lokalt namn med null-v\u00E4rde p\u00E5tr\u00E4ffades vid namnrymdsnormalisering av elementet {0}.
-NullLocalAttrName = Ett lokalt namn med null-v\u00E4rde p\u00E5tr\u00E4ffades vid namnrymdsnormalisering av attributet {0}.
+UndeclaredEntRefInAttrValue = Attributet "{0}" med värdet "{1}" refererade en enhet som inte har deklarerats.
+NullLocalElementName = Ett lokalt namn med null-värde påträffades vid namnrymdsnormalisering av elementet {0}.
+NullLocalAttrName = Ett lokalt namn med null-värde påträffades vid namnrymdsnormalisering av attributet {0}.
 
 #Error codes used in DOMParser
-InvalidDocumentClassName = Klassnamnet p\u00E5 dokumentfabrik "{0}" som anv\u00E4nds vid konstruktion av DOM-tr\u00E4det \u00E4r inte typ org.w3c.dom.Document.
-MissingDocumentClassName = Hittade inte klassnamnet p\u00E5 dokumentfabrik "{0}" som anv\u00E4nds vid konstruktion av DOM-tr\u00E4det.
+InvalidDocumentClassName = Klassnamnet på dokumentfabrik "{0}" som används vid konstruktion av DOM-trädet är inte typ org.w3c.dom.Document.
+MissingDocumentClassName = Hittade inte klassnamnet på dokumentfabrik "{0}" som används vid konstruktion av DOM-trädet.
 CannotCreateDocumentClass = Klassen "{0}" kunde inte konstrueras som org.w3c.dom.Document.
 
 # Error codes used by JAXP DocumentBuilder
-jaxp-order-not-supported = Egenskapen ''{0}'' m\u00E5ste anges f\u00F6re inst\u00E4llning av egenskapen ''{1}''.
-jaxp-null-input-source = Angiven k\u00E4lla f\u00E5r inte vara null.
+jaxp-order-not-supported = Egenskapen ''{0}'' måste anges före inställning av egenskapen ''{1}''.
+jaxp-null-input-source = Angiven källa får inte vara null.
 
 #Ranges
-BAD_BOUNDARYPOINTS_ERR = Gr\u00E4nspunkterna i ett intervall uppfyller inte de specifika kraven.
-INVALID_NODE_TYPE_ERR = En container med gr\u00E4nspunktsintervall anges till nod av ogiltig typ eller nod med \u00F6verordnad av ogiltig typ.
+BAD_BOUNDARYPOINTS_ERR = Gränspunkterna i ett intervall uppfyller inte de specifika kraven.
+INVALID_NODE_TYPE_ERR = En container med gränspunktsintervall anges till nod av ogiltig typ eller nod med överordnad av ogiltig typ.
 
 
 #Events
-UNSPECIFIED_EVENT_TYPE_ERR = H\u00E4ndelsetyp specificerades inte n\u00E4r h\u00E4ndelsen initierades f\u00F6re metodanrop. 
+UNSPECIFIED_EVENT_TYPE_ERR = Händelsetyp specificerades inte när händelsen initierades före metodanrop. 
 
 
-jaxp-schema-support=B\u00E5de setSchema-metoden och schemaLanguage-egenskapen anv\u00E4nds
+jaxp-schema-support=Både setSchema-metoden och schemaLanguage-egenskapen används
 
-jaxp_feature_not_supported=Funktionen "{0}" st\u00F6ds inte.
+jaxp_feature_not_supported=Funktionen "{0}" stöds inte.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
index a8809434b5d..dac97e7fe40 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
@@ -20,66 +20,66 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
-        FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n  
+        BadMessageKey = 找不到与消息关键字对应的错误消息。
+        FormatFailed = 设置以下消息的格式时出现内部错误:\n  
 
 # DOM Core
 
 # exception codes
-DOMSTRING_SIZE_ERR = \u6307\u5B9A\u7684\u6587\u672C\u8303\u56F4\u4E0D\u9002\u5408 DOMString\u3002
-HIERARCHY_REQUEST_ERR  = \u5C1D\u8BD5\u5728\u4E0D\u5141\u8BB8\u7684\u4F4D\u7F6E\u63D2\u5165\u8282\u70B9\u3002
-INDEX_SIZE_ERR = \u7D22\u5F15\u6216\u5927\u5C0F\u4E3A\u8D1F\u503C, \u6216\u8005\u5927\u4E8E\u5141\u8BB8\u7684\u503C\u3002
-INUSE_ATTRIBUTE_ERR = \u5C1D\u8BD5\u6DFB\u52A0\u5DF2\u5728\u5176\u4ED6\u4F4D\u7F6E\u4F7F\u7528\u7684\u5C5E\u6027\u3002
-INVALID_ACCESS_ERR  = \u57FA\u7840\u5BF9\u8C61\u4E0D\u652F\u6301\u53C2\u6570\u6216\u64CD\u4F5C\u3002
-INVALID_CHARACTER_ERR = \u6307\u5B9A\u7684 XML \u5B57\u7B26\u65E0\u6548\u6216\u975E\u6CD5\u3002
-INVALID_MODIFICATION_ERR =  \u5C1D\u8BD5\u4FEE\u6539\u57FA\u7840\u5BF9\u8C61\u7684\u7C7B\u578B\u3002
-INVALID_STATE_ERR = \u5C1D\u8BD5\u4F7F\u7528\u65E0\u6CD5\u4F7F\u7528\u6216\u4E0D\u518D\u53EF\u7528\u7684\u5BF9\u8C61\u3002
-NAMESPACE_ERR = \u5C1D\u8BD5\u4EE5\u9519\u8BEF\u7684\u540D\u79F0\u7A7A\u95F4\u521B\u5EFA\u6216\u66F4\u6539\u65B9\u5F0F\u6765\u521B\u5EFA\u6216\u66F4\u6539\u5BF9\u8C61\u3002
-NOT_FOUND_ERR = \u5C1D\u8BD5\u5728\u4E0A\u4E0B\u6587\u4E2D\u5F15\u7528\u4E0D\u5B58\u5728\u7684\u8282\u70B9\u3002
-NOT_SUPPORTED_ERR = \u5B9E\u73B0\u4E0D\u652F\u6301\u8BF7\u6C42\u7684\u5BF9\u8C61\u6216\u64CD\u4F5C\u7C7B\u578B\u3002
-NO_DATA_ALLOWED_ERR = \u5DF2\u4E3A\u4E0D\u652F\u6301\u6570\u636E\u7684\u8282\u70B9\u6307\u5B9A\u6570\u636E\u3002
-NO_MODIFICATION_ALLOWED_ERR = \u5C1D\u8BD5\u4FEE\u6539\u4E0D\u5141\u8BB8\u4FEE\u6539\u7684\u5BF9\u8C61\u3002
-SYNTAX_ERR = \u6307\u5B9A\u7684\u5B57\u7B26\u4E32\u65E0\u6548\u6216\u975E\u6CD5\u3002
-VALIDATION_ERR = \u5C31\u6587\u6863\u8BED\u6CD5\u65B9\u9762\u800C\u8A00, \u8C03\u7528 insertBefore \u6216 removeChild \u7B49\u65B9\u6CD5\u5C06\u5BFC\u81F4 Node \u65E0\u6548\u3002
-WRONG_DOCUMENT_ERR = \u4F7F\u7528\u8282\u70B9\u7684\u6587\u6863\u4E0E\u521B\u5EFA\u8282\u70B9\u7684\u6587\u6863\u4E0D\u76F8\u540C\u3002
-TYPE_MISMATCH_ERR = \u6B64\u53C2\u6570\u540D\u79F0\u7684\u503C\u7C7B\u578B\u4E0E\u9884\u671F\u7684\u503C\u7C7B\u578B\u4E0D\u517C\u5BB9\u3002
+DOMSTRING_SIZE_ERR = 指定的文本范围不适合 DOMString。
+HIERARCHY_REQUEST_ERR  = 尝试在不允许的位置插入节点。
+INDEX_SIZE_ERR = 索引或大小为负值, 或者大于允许的值。
+INUSE_ATTRIBUTE_ERR = 尝试添加已在其他位置使用的属性。
+INVALID_ACCESS_ERR  = 基础对象不支持参数或操作。
+INVALID_CHARACTER_ERR = 指定的 XML 字符无效或非法。
+INVALID_MODIFICATION_ERR =  尝试修改基础对象的类型。
+INVALID_STATE_ERR = 尝试使用无法使用或不再可用的对象。
+NAMESPACE_ERR = 尝试以错误的名称空间创建或更改方式来创建或更改对象。
+NOT_FOUND_ERR = 尝试在上下文中引用不存在的节点。
+NOT_SUPPORTED_ERR = 实现不支持请求的对象或操作类型。
+NO_DATA_ALLOWED_ERR = 已为不支持数据的节点指定数据。
+NO_MODIFICATION_ALLOWED_ERR = 尝试修改不允许修改的对象。
+SYNTAX_ERR = 指定的字符串无效或非法。
+VALIDATION_ERR = 就文档语法方面而言, 调用 insertBefore 或 removeChild 等方法将导致 Node 无效。
+WRONG_DOCUMENT_ERR = 使用节点的文档与创建节点的文档不相同。
+TYPE_MISMATCH_ERR = 此参数名称的值类型与预期的值类型不兼容。
 
 #error messages or exceptions
-FEATURE_NOT_SUPPORTED = \u5DF2\u8BC6\u522B\u53C2\u6570{0}, \u4F46\u65E0\u6CD5\u8BBE\u7F6E\u8BF7\u6C42\u7684\u503C\u3002
-FEATURE_NOT_FOUND = \u65E0\u6CD5\u8BC6\u522B\u53C2\u6570{0}\u3002
-STRING_TOO_LONG   = \u751F\u6210\u7684\u5B57\u7B26\u4E32\u592A\u957F, \u4E0D\u9002\u5408 DOMString: ''{0}''\u3002
+FEATURE_NOT_SUPPORTED = 已识别参数{0}, 但无法设置请求的值。
+FEATURE_NOT_FOUND = 无法识别参数{0}。
+STRING_TOO_LONG   = 生成的字符串太长, 不适合 DOMString: ''{0}''。
 
 #DOM Level 3 DOMError codes
-wf-invalid-character =  {1}\u8282\u70B9\u7684\u6587\u672C{0}\u5305\u542B\u65E0\u6548 XML \u5B57\u7B26\u3002
-wf-invalid-character-in-node-name = \u540D\u4E3A{1}\u7684{0}\u8282\u70B9\u5305\u542B\u65E0\u6548 XML \u5B57\u7B26\u3002
-cdata-sections-splitted =  \u5305\u542B CDATA \u8282\u7EC8\u6B62\u6807\u8BB0 '']]>'' \u7684 CDATA \u8282
-doctype-not-allowed = \u4E0D\u5141\u8BB8 DOCTYPE \u58F0\u660E\u3002
-unsupported-encoding = \u4E0D\u652F\u6301\u7F16\u7801{0}\u3002
+wf-invalid-character =  {1}节点的文本{0}包含无效 XML 字符。
+wf-invalid-character-in-node-name = 名为{1}的{0}节点包含无效 XML 字符。
+cdata-sections-splitted =  包含 CDATA 节终止标记 '']]>'' 的 CDATA 节
+doctype-not-allowed = 不允许 DOCTYPE 声明。
+unsupported-encoding = 不支持编码{0}。
 
 #Error codes used in DOM Normalizer
-InvalidXMLCharInDOM = \u8FDB\u884C\u89C4\u8303\u5316\u65F6, \u5728 DOM \u4E2D\u627E\u5230\u7684 XML \u5B57\u7B26 (Unicode: 0x{0}) \u65E0\u6548\u3002
-UndeclaredEntRefInAttrValue = \u5C5E\u6027 "{0}" \u503C "{1}" \u5F15\u7528\u4E86\u672A\u58F0\u660E\u7684\u5B9E\u4F53\u3002
-NullLocalElementName = \u5BF9\u5143\u7D20{0}\u8FDB\u884C\u540D\u79F0\u7A7A\u95F4\u89C4\u8303\u5316\u65F6\u9047\u5230\u4E86\u7A7A\u672C\u5730\u540D\u79F0\u3002
-NullLocalAttrName = \u5BF9\u5C5E\u6027{0}\u8FDB\u884C\u540D\u79F0\u7A7A\u95F4\u89C4\u8303\u5316\u65F6\u9047\u5230\u4E86\u7A7A\u672C\u5730\u540D\u79F0\u3002
+InvalidXMLCharInDOM = 进行规范化时, 在 DOM 中找到的 XML 字符 (Unicode: 0x{0}) 无效。
+UndeclaredEntRefInAttrValue = 属性 "{0}" 值 "{1}" 引用了未声明的实体。
+NullLocalElementName = 对元素{0}进行名称空间规范化时遇到了空本地名称。
+NullLocalAttrName = 对属性{0}进行名称空间规范化时遇到了空本地名称。
 
 #Error codes used in DOMParser
-InvalidDocumentClassName = \u7528\u4E8E\u6784\u9020 DOM \u6811\u7684\u6587\u6863\u5DE5\u5382 "{0}" \u7684\u7C7B\u540D\u4E0D\u662F org.w3c.dom.Document \u7C7B\u578B\u3002
-MissingDocumentClassName = \u627E\u4E0D\u5230\u7528\u4E8E\u6784\u9020 DOM \u6811\u7684\u6587\u6863\u5DE5\u5382 "{0}" \u7684\u7C7B\u540D\u3002
-CannotCreateDocumentClass = \u540D\u4E3A "{0}" \u7684\u7C7B\u65E0\u6CD5\u6784\u9020\u4E3A org.w3c.dom.Document\u3002
+InvalidDocumentClassName = 用于构造 DOM 树的文档工厂 "{0}" 的类名不是 org.w3c.dom.Document 类型。
+MissingDocumentClassName = 找不到用于构造 DOM 树的文档工厂 "{0}" 的类名。
+CannotCreateDocumentClass = 名为 "{0}" 的类无法构造为 org.w3c.dom.Document。
 
 # Error codes used by JAXP DocumentBuilder
-jaxp-order-not-supported = \u5FC5\u987B\u5728\u8BBE\u7F6E\u5C5E\u6027 ''{1}'' \u4E4B\u524D\u8BBE\u7F6E\u5C5E\u6027 ''{0}''\u3002
-jaxp-null-input-source = \u6307\u5B9A\u7684\u6E90\u4E0D\u80FD\u4E3A\u7A7A\u503C\u3002
+jaxp-order-not-supported = 必须在设置属性 ''{1}'' 之前设置属性 ''{0}''。
+jaxp-null-input-source = 指定的源不能为空值。
 
 #Ranges
-BAD_BOUNDARYPOINTS_ERR = Range \u7684\u8FB9\u754C\u70B9\u4E0D\u7B26\u5408\u7279\u5B9A\u8981\u6C42\u3002
-INVALID_NODE_TYPE_ERR = Range \u7684\u8FB9\u754C\u70B9\u7684\u5BB9\u5668\u8BBE\u7F6E\u4E3A\u65E0\u6548\u7C7B\u578B\u7684\u8282\u70B9\u6216\u5177\u6709\u65E0\u6548\u7C7B\u578B\u7684\u539F\u7EA7\u7684\u8282\u70B9\u3002
+BAD_BOUNDARYPOINTS_ERR = Range 的边界点不符合特定要求。
+INVALID_NODE_TYPE_ERR = Range 的边界点的容器设置为无效类型的节点或具有无效类型的原级的节点。
 
 
 #Events
-UNSPECIFIED_EVENT_TYPE_ERR = Event \u7C7B\u578B\u4E0D\u662F\u901A\u8FC7\u5728\u8C03\u7528\u65B9\u6CD5\u524D\u521D\u59CB\u5316\u6B64\u4E8B\u4EF6\u6307\u5B9A\u7684\u3002
+UNSPECIFIED_EVENT_TYPE_ERR = Event 类型不是通过在调用方法前初始化此事件指定的。
 
 
-jaxp-schema-support=\u540C\u65F6\u4F7F\u7528\u4E86 setSchema \u65B9\u6CD5\u548C schemaLanguage \u5C5E\u6027
+jaxp-schema-support=同时使用了 setSchema 方法和 schemaLanguage 属性
 
-jaxp_feature_not_supported=\u4E0D\u652F\u6301\u529F\u80FD "{0}"\u3002
+jaxp_feature_not_supported=不支持功能 "{0}"。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties
index 13344590f85..f2502366142 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties
@@ -28,66 +28,66 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
-        FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
+        BadMessageKey = 找不到對應訊息索引鍵的錯誤訊息。
+        FormatFailed = 格式化下列訊息時發生內部錯誤:\n
 
 # DOM Core
 
 # exception codes
-DOMSTRING_SIZE_ERR = \u6307\u5B9A\u7684\u6587\u5B57\u7BC4\u570D\u7121\u6CD5\u7D0D\u5165 DOMString\u3002
-HIERARCHY_REQUEST_ERR  = \u5617\u8A66\u5728\u4E0D\u5141\u8A31\u7684\u4F4D\u7F6E\u63D2\u5165\u7BC0\u9EDE\u3002
-INDEX_SIZE_ERR = \u7D22\u5F15\u6216\u5927\u5C0F\u70BA\u8CA0\u503C\uFF0C\u6216\u662F\u5927\u65BC\u5141\u8A31\u7684\u503C\u3002
-INUSE_ATTRIBUTE_ERR = \u5617\u8A66\u65B0\u589E\u5DF2\u7D93\u5728\u4ED6\u8655\u4F7F\u7528\u7684\u5C6C\u6027\u3002
-INVALID_ACCESS_ERR  = \u5E95\u5C64\u7269\u4EF6\u4E0D\u652F\u63F4\u7684\u53C3\u6578\u6216\u4F5C\u696D\u3002
-INVALID_CHARACTER_ERR = \u6307\u5B9A\u4E86\u7121\u6548\u7684 XML \u5B57\u5143\u3002
-INVALID_MODIFICATION_ERR =  \u5617\u8A66\u4FEE\u6539\u5E95\u5C64\u7269\u4EF6\u7684\u985E\u578B\u3002
-INVALID_STATE_ERR = \u5617\u8A66\u4F7F\u7528\u4E0D\u53EF\u7528\u6216\u7121\u6CD5\u518D\u4F7F\u7528\u7684\u7269\u4EF6\u3002
-NAMESPACE_ERR = \u5C0D\u65BC\u547D\u540D\u7A7A\u9593\u800C\u8A00\uFF0C\u5617\u8A66\u4F7F\u7528\u4E0D\u6B63\u78BA\u7684\u65B9\u5F0F\u4F86\u5EFA\u7ACB\u6216\u8B8A\u66F4\u7269\u4EF6\u3002
-NOT_FOUND_ERR = \u5617\u8A66\u5728\u76F8\u95DC\u8CC7\u8A0A\u74B0\u5883\u4E2D\u53C3\u7167\u4E0D\u5B58\u5728\u7684\u7BC0\u9EDE\u3002
-NOT_SUPPORTED_ERR = \u5BE6\u884C\u4E0D\u652F\u63F4\u8981\u6C42\u7684\u7269\u4EF6\u6216\u4F5C\u696D\u985E\u578B\u3002
-NO_DATA_ALLOWED_ERR = \u70BA\u4E0D\u652F\u63F4\u8CC7\u6599\u7684\u7BC0\u9EDE\u6307\u5B9A\u4E86\u8CC7\u6599\u3002
-NO_MODIFICATION_ALLOWED_ERR = \u5617\u8A66\u4FEE\u6539\u4E0D\u5141\u8A31\u4FEE\u6539\u7684\u7269\u4EF6\u3002
-SYNTAX_ERR = \u6307\u5B9A\u4E86\u7121\u6548\u7684\u5B57\u4E32\u3002
-VALIDATION_ERR = \u5C0D\u65BC\u6587\u4EF6\u6587\u6CD5\u800C\u8A00\uFF0C\u547C\u53EB insertBefore \u6216 removeChild \u4E4B\u985E\u7684\u65B9\u6CD5\uFF0C\u6703\u4F7F\u5F97\u7BC0\u9EDE\u7121\u6548\u3002
-WRONG_DOCUMENT_ERR = \u7BC0\u9EDE\u7528\u5728\u6709\u5225\u65BC\u5EFA\u7ACB\u8A72\u7BC0\u9EDE\u6587\u4EF6\u7684\u4E0D\u540C\u6587\u4EF6\u3002
-TYPE_MISMATCH_ERR = \u6B64\u53C3\u6578\u540D\u7A31\u7684\u503C\u985E\u578B\u8207\u9810\u671F\u7684\u503C\u985E\u578B\u4E0D\u76F8\u5BB9\u3002
+DOMSTRING_SIZE_ERR = 指定的文字範圍無法納入 DOMString。
+HIERARCHY_REQUEST_ERR  = 嘗試在不允許的位置插入節點。
+INDEX_SIZE_ERR = 索引或大小為負值，或是大於允許的值。
+INUSE_ATTRIBUTE_ERR = 嘗試新增已經在他處使用的屬性。
+INVALID_ACCESS_ERR  = 底層物件不支援的參數或作業。
+INVALID_CHARACTER_ERR = 指定了無效的 XML 字元。
+INVALID_MODIFICATION_ERR =  嘗試修改底層物件的類型。
+INVALID_STATE_ERR = 嘗試使用不可用或無法再使用的物件。
+NAMESPACE_ERR = 對於命名空間而言，嘗試使用不正確的方式來建立或變更物件。
+NOT_FOUND_ERR = 嘗試在相關資訊環境中參照不存在的節點。
+NOT_SUPPORTED_ERR = 實行不支援要求的物件或作業類型。
+NO_DATA_ALLOWED_ERR = 為不支援資料的節點指定了資料。
+NO_MODIFICATION_ALLOWED_ERR = 嘗試修改不允許修改的物件。
+SYNTAX_ERR = 指定了無效的字串。
+VALIDATION_ERR = 對於文件文法而言，呼叫 insertBefore 或 removeChild 之類的方法，會使得節點無效。
+WRONG_DOCUMENT_ERR = 節點用在有別於建立該節點文件的不同文件。
+TYPE_MISMATCH_ERR = 此參數名稱的值類型與預期的值類型不相容。
 
 #error messages or exceptions
-FEATURE_NOT_SUPPORTED = \u53EF\u8FA8\u8B58\u53C3\u6578 {0}\uFF0C\u4F46\u7121\u6CD5\u8A2D\u5B9A\u8981\u6C42\u7684\u503C\u3002
-FEATURE_NOT_FOUND = \u7121\u6CD5\u8FA8\u8B58\u53C3\u6578 {0}\u3002
-STRING_TOO_LONG   = \u7D50\u679C\u5B57\u4E32\u592A\u9577\uFF0C\u7121\u6CD5\u7D0D\u5165 DOMString: ''{0}''\u3002
+FEATURE_NOT_SUPPORTED = 可辨識參數 {0}，但無法設定要求的值。
+FEATURE_NOT_FOUND = 無法辨識參數 {0}。
+STRING_TOO_LONG   = 結果字串太長，無法納入 DOMString: ''{0}''。
 
 #DOM Level 3 DOMError codes
-wf-invalid-character =  {1} \u7BC0\u9EDE\u7684\u6587\u5B57 {0} \u5305\u542B\u7121\u6548\u7684 XML \u5B57\u5143\u3002
-wf-invalid-character-in-node-name = \u540D\u7A31\u70BA {1} \u7684 {0} \u7BC0\u9EDE\u5305\u542B\u7121\u6548\u7684 XML \u5B57\u5143\u3002
-cdata-sections-splitted =  \u5305\u542B CDATA \u6BB5\u843D\u7D42\u6B62\u6A19\u8A18 '']]>'' \u7684 CDATA \u6BB5\u843D
-doctype-not-allowed = \u4E0D\u5141\u8A31 DOCTYPE \u5BA3\u544A\u3002
-unsupported-encoding = \u4E0D\u652F\u63F4\u7DE8\u78BC {0}\u3002
+wf-invalid-character =  {1} 節點的文字 {0} 包含無效的 XML 字元。
+wf-invalid-character-in-node-name = 名稱為 {1} 的 {0} 節點包含無效的 XML 字元。
+cdata-sections-splitted =  包含 CDATA 段落終止標記 '']]>'' 的 CDATA 段落
+doctype-not-allowed = 不允許 DOCTYPE 宣告。
+unsupported-encoding = 不支援編碼 {0}。
 
 #Error codes used in DOM Normalizer
-InvalidXMLCharInDOM = \u6B63\u898F\u5316\u671F\u9593\u5728 DOM \u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-UndeclaredEntRefInAttrValue = \u5C6C\u6027 "{0}" \u503C "{1}" \u53C3\u7167\u672A\u5BA3\u544A\u7684\u5BE6\u9AD4\u3002
-NullLocalElementName = \u5143\u7D20 {0} \u547D\u540D\u7A7A\u9593\u6B63\u898F\u5316\u671F\u9593\uFF0C\u51FA\u73FE\u7A7A\u503C\u5340\u57DF\u540D\u7A31\u3002
-NullLocalAttrName = \u5C6C\u6027 {0} \u547D\u540D\u7A7A\u9593\u6B63\u898F\u5316\u671F\u9593\uFF0C\u51FA\u73FE\u7A7A\u503C\u5340\u57DF\u540D\u7A31\u3002
+InvalidXMLCharInDOM = 正規化期間在 DOM 中找到無效的 XML 字元 (Unicode: 0x{0})。
+UndeclaredEntRefInAttrValue = 屬性 "{0}" 值 "{1}" 參照未宣告的實體。
+NullLocalElementName = 元素 {0} 命名空間正規化期間，出現空值區域名稱。
+NullLocalAttrName = 屬性 {0} 命名空間正規化期間，出現空值區域名稱。
 
 #Error codes used in DOMParser
-InvalidDocumentClassName = \u7528\u65BC\u5EFA\u69CB DOM \u6A39\u72C0\u7D50\u69CB\u7684\u6587\u4EF6\u8655\u7406\u7AD9 "{0}" \u985E\u5225\u540D\u7A31\u4E26\u975E\u985E\u578B org.w3c.dom.Document\u3002
-MissingDocumentClassName = \u627E\u4E0D\u5230\u7528\u65BC\u5EFA\u69CB DOM \u6A39\u72C0\u7D50\u69CB\u7684\u6587\u4EF6\u8655\u7406\u7AD9 "{0}" \u985E\u5225\u540D\u7A31\u3002
-CannotCreateDocumentClass = \u540D\u7A31\u70BA "{0}" \u7684\u985E\u5225\u7121\u6CD5\u5EFA\u69CB\u70BA org.w3c.dom.Document\u3002
+InvalidDocumentClassName = 用於建構 DOM 樹狀結構的文件處理站 "{0}" 類別名稱並非類型 org.w3c.dom.Document。
+MissingDocumentClassName = 找不到用於建構 DOM 樹狀結構的文件處理站 "{0}" 類別名稱。
+CannotCreateDocumentClass = 名稱為 "{0}" 的類別無法建構為 org.w3c.dom.Document。
 
 # Error codes used by JAXP DocumentBuilder
-jaxp-order-not-supported = \u8A2D\u5B9A\u5C6C\u6027 ''{1}'' \u4E4B\u524D\uFF0C\u5FC5\u9808\u8A2D\u5B9A\u5C6C\u6027 ''{0}''\u3002
-jaxp-null-input-source = \u6307\u5B9A\u7684\u4F86\u6E90\u4E0D\u53EF\u70BA\u7A7A\u503C\u3002
+jaxp-order-not-supported = 設定屬性 ''{1}'' 之前，必須設定屬性 ''{0}''。
+jaxp-null-input-source = 指定的來源不可為空值。
 
 #Ranges
-BAD_BOUNDARYPOINTS_ERR = \u7BC4\u570D\u7684\u754C\u9650\u9EDE\u4E0D\u7B26\u5408\u7279\u5B9A\u7684\u9700\u6C42\u3002
-INVALID_NODE_TYPE_ERR = \u7BC4\u570D\u7684\u754C\u9650\u9EDE\u5BB9\u5668\u88AB\u8A2D\u70BA\u7121\u6548\u985E\u578B\u7684\u7BC0\u9EDE\uFF0C\u6216\u662F\u7956\u7CFB\u70BA\u7121\u6548\u985E\u578B\u7684\u7BC0\u9EDE\u3002
+BAD_BOUNDARYPOINTS_ERR = 範圍的界限點不符合特定的需求。
+INVALID_NODE_TYPE_ERR = 範圍的界限點容器被設為無效類型的節點，或是祖系為無效類型的節點。
 
 
 #Events
-UNSPECIFIED_EVENT_TYPE_ERR = \u547C\u53EB\u65B9\u6CD5\u4E4B\u524D\u8D77\u59CB\u4E8B\u4EF6\uFF0C\u4E0D\u6703\u6307\u5B9A\u4E8B\u4EF6\u7684\u985E\u578B\u3002
+UNSPECIFIED_EVENT_TYPE_ERR = 呼叫方法之前起始事件，不會指定事件的類型。
 
 
-jaxp-schema-support=\u540C\u6642\u4F7F\u7528 setSchema \u65B9\u6CD5\u8207 schemaLanguage \u5C6C\u6027
+jaxp-schema-support=同時使用 setSchema 方法與 schemaLanguage 屬性
 
-jaxp_feature_not_supported=\u4E0D\u652F\u63F4\u529F\u80FD "{0}"\u3002
+jaxp_feature_not_supported=不支援功能 "{0}"。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
index be92cdd2015..fa6088c4baf 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
@@ -19,27 +19,27 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
+BadMessageKey = Die zum Meldungsschlüssel gehörige Fehlermeldung kann nicht gefunden werden.
 FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n
 
 FieldCannotBeNull={0} kann nicht mit "Null"-Parameter aufgerufen werden.
 UnknownField={0} mit unbekanntem Feld aufgerufen:{1}
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-milli=Jahr = {0}, Monat = {1}, Tag = {2}, Stunde= {3}, Minute = {4}, Sekunde = {5}, fractionalSecond = {6}, Zeitzone = {7} ist keine g\u00FCltige Darstellung eines XML-Wertes f\u00FCr einen gregorianischen Kalender.
+InvalidXGCValue-milli=Jahr = {0}, Monat = {1}, Tag = {2}, Stunde= {3}, Minute = {4}, Sekunde = {5}, fractionalSecond = {6}, Zeitzone = {7} ist keine gültige Darstellung eines XML-Wertes für einen gregorianischen Kalender.
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-fractional=Jahr = {0}, Monat = {1}, Tag = {2}, Stunde= {3}, Minute = {4}, Sekunde = {5}, fractionalSecond = {6}, Zeitzone = {7} ist keine g\u00FCltige Darstellung eines XML-Wertes f\u00FCr einen gregorianischen Kalender.
+InvalidXGCValue-fractional=Jahr = {0}, Monat = {1}, Tag = {2}, Stunde= {3}, Minute = {4}, Sekunde = {5}, fractionalSecond = {6}, Zeitzone = {7} ist keine gültige Darstellung eines XML-Wertes für einen gregorianischen Kalender.
 
-InvalidXGCFields=Ung\u00FCltige Gruppe von Feldern f\u00FCr XMLGregorianCalendar festgelegt
+InvalidXGCFields=Ungültige Gruppe von Feldern für XMLGregorianCalendar festgelegt
 
-InvalidFractional=Ung\u00FCltiger Wert {0} f\u00FCr Sekundenbruchteil.
+InvalidFractional=Ungültiger Wert {0} für Sekundenbruchteil.
 
 #XGC stands for XML Gregorian Calendar
-InvalidXGCRepresentation="{0}" ist keine g\u00FCltige Darstellung eines XML-Wertes f\u00FCr einen gregorianischen Kalender.
+InvalidXGCRepresentation="{0}" ist keine gültige Darstellung eines XML-Wertes für einen gregorianischen Kalender.
 
-InvalidFieldValue=Ung\u00FCltiger Wert {0} f\u00FCr Feld {1}.
+InvalidFieldValue=Ungültiger Wert {0} für Feld {1}.
 
 NegativeField= Feld {0} ist negativ
 
 AllFieldsNull=Alle Felder (javax.xml.datatype.DatatypeConstants.Field) sind null.
 
-TooLarge={0}-Wert "{1}" zu gro\u00DF, um von dieser Implementierung unterst\u00FCtzt zu werden
+TooLarge={0}-Wert "{1}" zu groß, um von dieser Implementierung unterstützt zu werden
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties
index e9dcc900a04..a8cdecad8e2 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties
@@ -30,24 +30,24 @@
 BadMessageKey = No se ha encontrado el mensaje de error correspondiente a la clave de mensaje.
 FormatFailed = Se ha producido un error interno al formatear el siguiente mensaje:\n
 
-FieldCannotBeNull=no se puede llamar a {0} con un par\u00E1metro ''nulo''.
+FieldCannotBeNull=no se puede llamar a {0} con un parámetro ''nulo''.
 UnknownField=se ha llamado a {0} con un campo desconocido:{1}
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-milli=A\u00F1o = {0}, Mes = {1}, D\u00EDa = {2}, Hora = {3}, Minuto = {4}, Segundo = {5}, Segundo Fraccionario = {6}, Zona Horaria = {7} , no es una representaci\u00F3n v\u00E1lida de un valor del calendario gregoriano XML.
+InvalidXGCValue-milli=Año = {0}, Mes = {1}, Día = {2}, Hora = {3}, Minuto = {4}, Segundo = {5}, Segundo Fraccionario = {6}, Zona Horaria = {7} , no es una representación válida de un valor del calendario gregoriano XML.
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-fractional=A\u00F1o = {0}, Mes = {1}, D\u00EDa = {2}, Hora = {3}, Minuto = {4}, Segundo = {5}, Segundo Fraccionario = {6}, Zona Horaria = {7} , no es una representaci\u00F3n v\u00E1lida de un valor del calendario gregoriano XML.
+InvalidXGCValue-fractional=Año = {0}, Mes = {1}, Día = {2}, Hora = {3}, Minuto = {4}, Segundo = {5}, Segundo Fraccionario = {6}, Zona Horaria = {7} , no es una representación válida de un valor del calendario gregoriano XML.
 
-InvalidXGCFields=Juego de campos no v\u00E1lido definido para el calendario gregoriano XML
+InvalidXGCFields=Juego de campos no válido definido para el calendario gregoriano XML
 
-InvalidFractional=Valor no v\u00E1lido {0} para el segundo fraccionario.
+InvalidFractional=Valor no válido {0} para el segundo fraccionario.
 
 #XGC stands for XML Gregorian Calendar
-InvalidXGCRepresentation="{0}" no es una representaci\u00F3n v\u00E1lida de un valor del calendario gregoriano XML.
+InvalidXGCRepresentation="{0}" no es una representación válida de un valor del calendario gregoriano XML.
 
-InvalidFieldValue=Valor no v\u00E1lido {0} para el campo {1}.
+InvalidFieldValue=Valor no válido {0} para el campo {1}.
 
 NegativeField= El campo {0} es negativo
 
 AllFieldsNull=Todos los campos (javax.xml.datatype.DatatypeConstants.Field) son nulos.
 
-TooLarge=El valor "{1}" de {0} es demasiado largo para que esta implantaci\u00F3n pueda soportarlo
+TooLarge=El valor "{1}" de {0} es demasiado largo para que esta implantación pueda soportarlo
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties
index 231b13d8952..cbdd2cdbc85 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties
@@ -27,27 +27,27 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
+BadMessageKey = Le message d'erreur correspondant à la clé de message est introuvable.
 FormatFailed = Une erreur interne est survenue lors du formatage du message suivant :\n
 
-FieldCannotBeNull=Impossible d''appeler {0} avec le param\u00E8tre ''null''.
-UnknownField={0} a \u00E9t\u00E9 appel\u00E9 avec un champ inconnu : {1}
+FieldCannotBeNull=Impossible d''appeler {0} avec le paramètre ''null''.
+UnknownField={0} a été appelé avec un champ inconnu : {1}
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-milli=Ann\u00E9e = {0}, Mois = {1}, Jour = {2}, Heure = {3}, Minute = {4}, Seconde = {5}, Fraction de seconde = {6}, Fuseau horaire = {7} ne repr\u00E9sentent pas des valeurs de calendrier gr\u00E9gorien XML valides.
+InvalidXGCValue-milli=Année = {0}, Mois = {1}, Jour = {2}, Heure = {3}, Minute = {4}, Seconde = {5}, Fraction de seconde = {6}, Fuseau horaire = {7} ne représentent pas des valeurs de calendrier grégorien XML valides.
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-fractional=Ann\u00E9e = {0}, Mois = {1}, Jour = {2}, Heure = {3}, Minute = {4}, Seconde = {5}, Fraction de seconde = {6}, Fuseau horaire = {7} ne repr\u00E9sentent pas des valeurs de calendrier gr\u00E9gorien XML valides.
+InvalidXGCValue-fractional=Année = {0}, Mois = {1}, Jour = {2}, Heure = {3}, Minute = {4}, Seconde = {5}, Fraction de seconde = {6}, Fuseau horaire = {7} ne représentent pas des valeurs de calendrier grégorien XML valides.
 
 InvalidXGCFields=Ensemble de champs non valide pour XMLGregorianCalendar
 
 InvalidFractional=Valeur non valide {0} pour la fraction de seconde.
 
 #XGC stands for XML Gregorian Calendar
-InvalidXGCRepresentation="{0}" ne repr\u00E9sente pas une valeur de calendrier gr\u00E9gorien XML valide.
+InvalidXGCRepresentation="{0}" ne représente pas une valeur de calendrier grégorien XML valide.
 
 InvalidFieldValue=Valeur {0} non valide pour le champ {1}.
 
-NegativeField= Le champ {0} est n\u00E9gatif
+NegativeField= Le champ {0} est négatif
 
 AllFieldsNull=Tous les champs (javax.xml.datatype.DatatypeConstants.Field) sont NULL.
 
-TooLarge=La valeur {0} "{1}" est trop \u00E9lev\u00E9e pour \u00EAtre prise en charge par cette impl\u00E9mentation
+TooLarge=La valeur {0} "{1}" est trop élevée pour être prise en charge par cette implémentation
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties
index 4793921f9d4..30d285ac94b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties
@@ -28,26 +28,26 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
-FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n
+FormatFailed = Si è verificato un errore interno durante la formattazione del seguente messaggio:\n
 
 FieldCannotBeNull=Impossibile richiamare {0} con un parametro ''null''.
 UnknownField={0} richiamato con un campo sconosciuto:{1}
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-milli=Anno = {0}, mese = {1}, giorno = {2}, ora = {3}, minuto = {4}, secondo = {5}, frazione di secondo = {6}, fuso orario = {7} non \u00E8 una rappresentazione valida di un valore di calendario gregoriano XML.
+InvalidXGCValue-milli=Anno = {0}, mese = {1}, giorno = {2}, ora = {3}, minuto = {4}, secondo = {5}, frazione di secondo = {6}, fuso orario = {7} non è una rappresentazione valida di un valore di calendario gregoriano XML.
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-fractional=Anno = {0}, mese = {1}, giorno = {2}, ora = {3}, minuto = {4}, secondo = {5}, frazione di secondo = {6}, fuso orario = {7} non \u00E8 una rappresentazione valida di un valore di calendario gregoriano XML.
+InvalidXGCValue-fractional=Anno = {0}, mese = {1}, giorno = {2}, ora = {3}, minuto = {4}, secondo = {5}, frazione di secondo = {6}, fuso orario = {7} non è una rappresentazione valida di un valore di calendario gregoriano XML.
 
 InvalidXGCFields=Impostato set di campi non valido per XMLGregorianCalendar
 
 InvalidFractional=Valore {0} non valido per la frazione di secondo.
 
 #XGC stands for XML Gregorian Calendar
-InvalidXGCRepresentation="{0}" non \u00E8 una rappresentazione valida di un valore di calendario gregoriano XML.
+InvalidXGCRepresentation="{0}" non è una rappresentazione valida di un valore di calendario gregoriano XML.
 
 InvalidFieldValue=Valore {0} non valido per il campo {1}.
 
-NegativeField= Il campo {0} \u00E8 negativo
+NegativeField= Il campo {0} è negativo
 
 AllFieldsNull=Tutti i campi (javax.xml.datatype.DatatypeConstants.Field) sono nulli.
 
-TooLarge=Il valore {0} "{1}" \u00E8 troppo grande per essere supportato da questa implementazione
+TooLarge=Il valore {0} "{1}" è troppo grande per essere supportato da questa implementazione
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
index 38da17fc51a..91050bb20a1 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
@@ -19,27 +19,27 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n
+BadMessageKey = メッセージ・キーに対応するエラー・メッセージが見つかりません。
+FormatFailed = 次のメッセージの書式設定中に内部エラーが発生しました:\n
 
-FieldCannotBeNull={0}\u306F''null''\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F\u547C\u3073\u51FA\u305B\u307E\u305B\u3093\u3002
-UnknownField={0}\u306F\u4E0D\u660E\u306A\u30D5\u30A3\u30FC\u30EB\u30C9\u3067\u547C\u3073\u51FA\u3055\u308C\u307E\u3057\u305F: {1}
+FieldCannotBeNull={0}は''null''パラメータでは呼び出せません。
+UnknownField={0}は不明なフィールドで呼び出されました: {1}
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-milli=\u5E74={0}\u3001\u6708={1}\u3001\u65E5={2}\u3001\u6642={3}\u3001\u5206={4}\u3001\u79D2={5}\u3001\u5C0F\u6570\u79D2={6}\u3001\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3={7}\u306F\u3001XML\u30B0\u30EC\u30B4\u30EA\u30AA\u66A6\u306E\u5024\u306E\u6709\u52B9\u306A\u8868\u73FE\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+InvalidXGCValue-milli=年={0}、月={1}、日={2}、時={3}、分={4}、秒={5}、小数秒={6}、タイムゾーン={7}は、XMLグレゴリオ暦の値の有効な表現ではありません。
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-fractional=\u5E74={0}\u3001\u6708={1}\u3001\u65E5={2}\u3001\u6642={3}\u3001\u5206={4}\u3001\u79D2={5}\u3001\u5C0F\u6570\u79D2={6}\u3001\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3={7}\u306F\u3001XML\u30B0\u30EC\u30B4\u30EA\u30AA\u66A6\u306E\u5024\u306E\u6709\u52B9\u306A\u8868\u73FE\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+InvalidXGCValue-fractional=年={0}、月={1}、日={2}、時={3}、分={4}、秒={5}、小数秒={6}、タイムゾーン={7}は、XMLグレゴリオ暦の値の有効な表現ではありません。
 
-InvalidXGCFields=XMLGregorianCalendar\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u30FB\u30BB\u30C3\u30C8\u304C\u7121\u52B9\u3067\u3059
+InvalidXGCFields=XMLGregorianCalendarのフィールド・セットが無効です
 
-InvalidFractional=\u5C0F\u6570\u79D2\u306E\u5024{0}\u304C\u7121\u52B9\u3067\u3059\u3002
+InvalidFractional=小数秒の値{0}が無効です。
 
 #XGC stands for XML Gregorian Calendar
-InvalidXGCRepresentation="{0}"\u306F\u3001XML\u30B0\u30EC\u30B4\u30EA\u30AA\u66A6\u306E\u5024\u306E\u6709\u52B9\u306A\u8868\u73FE\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+InvalidXGCRepresentation="{0}"は、XMLグレゴリオ暦の値の有効な表現ではありません。
 
-InvalidFieldValue={1}\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u5024{0}\u304C\u7121\u52B9\u3067\u3059\u3002
+InvalidFieldValue={1}フィールドの値{0}が無効です。
 
-NegativeField= {0}\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u8CA0\u3067\u3059
+NegativeField= {0}フィールドが負です
 
-AllFieldsNull=\u3059\u3079\u3066\u306E\u30D5\u30A3\u30FC\u30EB\u30C9(javax.xml.datatype.DatatypeConstants.Field)\u304Cnull\u3067\u3059\u3002
+AllFieldsNull=すべてのフィールド(javax.xml.datatype.DatatypeConstants.Field)がnullです。
 
-TooLarge={0}\u306E\u5024"{1}"\u304C\u5927\u304D\u3059\u304E\u308B\u305F\u3081\u3001\u3053\u306E\u5B9F\u88C5\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093
+TooLarge={0}の値"{1}"が大きすぎるため、この実装ではサポートされません
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties
index 837faae29cb..5b808459ea5 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties
@@ -27,27 +27,27 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n
+BadMessageKey = 메시지 키에 해당하는 오류 메시지를 찾을 수 없습니다.
+FormatFailed = 다음 메시지의 형식을 지정하는 중 내부 오류가 발생했습니다.\n
 
-FieldCannotBeNull={0}\uC740(\uB294) ''null'' \uB9E4\uAC1C\uBCC0\uC218\uB85C \uD638\uCD9C\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-UnknownField={0}\uC774(\uAC00) \uC54C \uC218 \uC5C6\uB294 \uD544\uB4DC\uB85C \uD638\uCD9C\uB428:{1}
+FieldCannotBeNull={0}은(는) ''null'' 매개변수로 호출할 수 없습니다.
+UnknownField={0}이(가) 알 수 없는 필드로 호출됨:{1}
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-milli=\uC5F0\uB3C4 = {0}, \uC6D4 = {1}, \uB0A0\uC9DC = {2}, \uC2DC\uAC04 = {3}, \uBD84 = {4}, \uCD08 = {5}, \uC18C\uC218\uC810 \uC774\uD558 \uCD08 = {6}, \uC2DC\uAC04\uB300 = {7}\uC740(\uB294) XML \uC591\uB825 \uAC12\uC5D0 \uBD80\uC801\uD569\uD55C \uD615\uC2DD\uC785\uB2C8\uB2E4.
+InvalidXGCValue-milli=연도 = {0}, 월 = {1}, 날짜 = {2}, 시간 = {3}, 분 = {4}, 초 = {5}, 소수점 이하 초 = {6}, 시간대 = {7}은(는) XML 양력 값에 부적합한 형식입니다.
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-fractional=\uC5F0\uB3C4 = {0}, \uC6D4 = {1}, \uB0A0\uC9DC = {2}, \uC2DC\uAC04 = {3}, \uBD84 = {4}, \uCD08 = {5}, \uC18C\uC218\uC810 \uC774\uD558 \uCD08 = {6}, \uC2DC\uAC04\uB300 = {7}\uC740(\uB294) XML \uC591\uB825 \uAC12\uC5D0 \uBD80\uC801\uD569\uD55C \uD615\uC2DD\uC785\uB2C8\uB2E4.
+InvalidXGCValue-fractional=연도 = {0}, 월 = {1}, 날짜 = {2}, 시간 = {3}, 분 = {4}, 초 = {5}, 소수점 이하 초 = {6}, 시간대 = {7}은(는) XML 양력 값에 부적합한 형식입니다.
 
-InvalidXGCFields=XMLGregorianCalendar\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD55C \uD544\uB4DC \uC9D1\uD569\uC774 \uC124\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+InvalidXGCFields=XMLGregorianCalendar에 대해 부적합한 필드 집합이 설정되었습니다.
 
-InvalidFractional={0}\uC740(\uB294) \uC18C\uC218\uC810 \uC774\uD558 \uCD08\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD55C \uAC12\uC785\uB2C8\uB2E4.
+InvalidFractional={0}은(는) 소수점 이하 초에 대해 부적합한 값입니다.
 
 #XGC stands for XML Gregorian Calendar
-InvalidXGCRepresentation="{0}"\uC740(\uB294) XML \uC591\uB825 \uAC12\uC5D0 \uBD80\uC801\uD569\uD55C \uD615\uC2DD\uC785\uB2C8\uB2E4.
+InvalidXGCRepresentation="{0}"은(는) XML 양력 값에 부적합한 형식입니다.
 
-InvalidFieldValue={0}\uC740(\uB294) {1} \uD544\uB4DC\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD55C \uAC12\uC785\uB2C8\uB2E4.
+InvalidFieldValue={0}은(는) {1} 필드에 대해 부적합한 값입니다.
 
-NegativeField= {0} \uD544\uB4DC\uAC00 \uC74C\uC218\uC785\uB2C8\uB2E4.
+NegativeField= {0} 필드가 음수입니다.
 
-AllFieldsNull=\uBAA8\uB4E0 \uD544\uB4DC(javax.xml.datatype.DatatypeConstants.Field)\uAC00 \uB110\uC785\uB2C8\uB2E4.
+AllFieldsNull=모든 필드(javax.xml.datatype.DatatypeConstants.Field)가 널입니다.
 
-TooLarge={0} \uAC12 "{1}"\uC774(\uAC00) \uC774 \uAD6C\uD604\uC5D0\uC11C \uC9C0\uC6D0\uB418\uB294 \uAC12\uC5D0 \uBE44\uD574 \uB108\uBB34 \uD07D\uB2C8\uB2E4.
+TooLarge={0} 값 "{1}"이(가) 이 구현에서 지원되는 값에 비해 너무 큽니다.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties
index e617790c015..63e59588f7b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties
@@ -27,27 +27,27 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
+BadMessageKey = Não foi possível encontrar a mensagem de erro correspondente à chave da mensagem.
 FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n
 
-FieldCannotBeNull={0} n\u00E3o pode ser chamado com o par\u00E2metro ''null''.
+FieldCannotBeNull={0} não pode ser chamado com o parâmetro ''null''.
 UnknownField={0} chamado com um campo desconhecido:{1}
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-milli=Ano = {0}, M\u00EAs = {1}, Dia = {2}, Hora = {3}, Minuto = {4}, Segundo = {5}, fractionalSecond = {6}, Fuso hor\u00E1rio = {7} , n\u00E3o \u00E9 uma representa\u00E7\u00E3o v\u00E1lida de um valor do Calend\u00E1rio Gregoriano XML.
+InvalidXGCValue-milli=Ano = {0}, Mês = {1}, Dia = {2}, Hora = {3}, Minuto = {4}, Segundo = {5}, fractionalSecond = {6}, Fuso horário = {7} , não é uma representação válida de um valor do Calendário Gregoriano XML.
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-fractional=Ano = {0}, M\u00EAs = {1}, Dia = {2}, Hora = {3}, Minuto = {4}, Segundo = {5}, fractionalSecond = {6}, Fuso hor\u00E1rio = {7} , n\u00E3o \u00E9 uma representa\u00E7\u00E3o v\u00E1lida de um valor do Calend\u00E1rio Gregoriano XML.
+InvalidXGCValue-fractional=Ano = {0}, Mês = {1}, Dia = {2}, Hora = {3}, Minuto = {4}, Segundo = {5}, fractionalSecond = {6}, Fuso horário = {7} , não é uma representação válida de um valor do Calendário Gregoriano XML.
 
-InvalidXGCFields=Conjunto inv\u00E1lido de conjunto de campos para XMLGregorianCalendar
+InvalidXGCFields=Conjunto inválido de conjunto de campos para XMLGregorianCalendar
 
-InvalidFractional=Valor inv\u00E1lido {0} para segundo fracional.
+InvalidFractional=Valor inválido {0} para segundo fracional.
 
 #XGC stands for XML Gregorian Calendar
-InvalidXGCRepresentation="{0}" n\u00E3o \u00E9 uma representa\u00E7\u00E3o v\u00E1lida de um valor do Calend\u00E1rio Gregoriano XML.
+InvalidXGCRepresentation="{0}" não é uma representação válida de um valor do Calendário Gregoriano XML.
 
-InvalidFieldValue=Valor inv\u00E1lido {0} para o campo {1}.
+InvalidFieldValue=Valor inválido {0} para o campo {1}.
 
-NegativeField= o campo {0} \u00E9 negativo
+NegativeField= o campo {0} é negativo
 
-AllFieldsNull=Todos os campos (javax.xml.datatype.DatatypeConstants.Field) s\u00E3o nulos.
+AllFieldsNull=Todos os campos (javax.xml.datatype.DatatypeConstants.Field) são nulos.
 
-TooLarge=valor {0} "{1}" muito grande para ser suportado por esta implementa\u00E7\u00E3o
+TooLarge=valor {0} "{1}" muito grande para ser suportado por esta implementação
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties
index 122e0add0b7..ebfc4c6b1c6 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties
@@ -28,26 +28,26 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
-FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
+FormatFailed = Ett internt fel inträffade vid formatering av följande meddelande:\n
 
 FieldCannotBeNull={0} kan inte anropas med null-parameter.
-UnknownField={0} anropades med ok\u00E4nt f\u00E4lt:{1}
+UnknownField={0} anropades med okänt fält:{1}
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-milli=\u00C5r = {0}, m\u00E5nad = {1}, dag = {2}, timme = {3}, minut = {4}, sekund = {5}, br\u00E5kdelssekund = {6}, tidszon = {7} \u00E4r ogiltigt v\u00E4rde f\u00F6r gregoriansk kalender i XML.
+InvalidXGCValue-milli=År = {0}, månad = {1}, dag = {2}, timme = {3}, minut = {4}, sekund = {5}, bråkdelssekund = {6}, tidszon = {7} är ogiltigt värde för gregoriansk kalender i XML.
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-fractional=\u00C5r = {0}, m\u00E5nad = {1}, dag = {2}, timme = {3}, minut = {4}, sekund = {5}, br\u00E5kdelssekund = {6}, tidszon = {7} \u00E4r ogiltigt v\u00E4rde f\u00F6r gregoriansk kalender i XML.
+InvalidXGCValue-fractional=År = {0}, månad = {1}, dag = {2}, timme = {3}, minut = {4}, sekund = {5}, bråkdelssekund = {6}, tidszon = {7} är ogiltigt värde för gregoriansk kalender i XML.
 
-InvalidXGCFields=Ogiltig upps\u00E4ttning med f\u00E4lt angivet i XMLGregorianCalendar
+InvalidXGCFields=Ogiltig uppsättning med fält angivet i XMLGregorianCalendar
 
-InvalidFractional=Ogiltigt v\u00E4rde {0} angivet f\u00F6r br\u00E5kdelssekund.
+InvalidFractional=Ogiltigt värde {0} angivet för bråkdelssekund.
 
 #XGC stands for XML Gregorian Calendar
-InvalidXGCRepresentation="{0}" \u00E4r ogiltigt v\u00E4rde f\u00F6r gregoriansk kalender i XML.
+InvalidXGCRepresentation="{0}" är ogiltigt värde för gregoriansk kalender i XML.
 
-InvalidFieldValue={0} \u00E4r ett ogiltigt v\u00E4rde i f\u00E4ltet {1}.
+InvalidFieldValue={0} är ett ogiltigt värde i fältet {1}.
 
-NegativeField= F\u00E4ltet {0} \u00E4r negativt
+NegativeField= Fältet {0} är negativt
 
-AllFieldsNull=Alla f\u00E4lt (javax.xml.datatype.DatatypeConstants.Field) \u00E4r null.
+AllFieldsNull=Alla fält (javax.xml.datatype.DatatypeConstants.Field) är null.
 
-TooLarge={0}-v\u00E4rdet "{1}" \u00E4r f\u00F6r stort och kan inte anv\u00E4ndas i denna implementering
+TooLarge={0}-värdet "{1}" är för stort och kan inte användas i denna implementering
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
index fabcd1973f1..6cef66ffb99 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
@@ -19,27 +19,27 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
-FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n
+BadMessageKey = 找不到与消息关键字对应的错误消息。
+FormatFailed = 设置以下消息的格式时出现内部错误:\n
 
-FieldCannotBeNull=\u65E0\u6CD5\u4F7F\u7528 ''null'' \u53C2\u6570\u8C03\u7528{0}\u3002
-UnknownField=\u4F7F\u7528\u672A\u77E5\u5B57\u6BB5\u8C03\u7528\u4E86{0}: {1}
+FieldCannotBeNull=无法使用 ''null'' 参数调用{0}。
+UnknownField=使用未知字段调用了{0}: {1}
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-milli=\u5E74 = {0}, \u6708 = {1}, \u65E5 = {2}, \u5C0F\u65F6 = {3}, \u5206 = {4}, \u79D2 = {5}, \u5C0F\u6570\u79D2 = {6}, \u65F6\u533A = {7} \u4E0D\u662F XML \u683C\u91CC\u5386\u503C\u7684\u6709\u6548\u8868\u793A\u3002
+InvalidXGCValue-milli=年 = {0}, 月 = {1}, 日 = {2}, 小时 = {3}, 分 = {4}, 秒 = {5}, 小数秒 = {6}, 时区 = {7} 不是 XML 格里历值的有效表示。
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-fractional=\u5E74 = {0}, \u6708 = {1}, \u65E5 = {2}, \u5C0F\u65F6 = {3}, \u5206 = {4}, \u79D2 = {5}, \u5C0F\u6570\u79D2 = {6}, \u65F6\u533A = {7} \u4E0D\u662F XML \u683C\u91CC\u5386\u503C\u7684\u6709\u6548\u8868\u793A\u3002
+InvalidXGCValue-fractional=年 = {0}, 月 = {1}, 日 = {2}, 小时 = {3}, 分 = {4}, 秒 = {5}, 小数秒 = {6}, 时区 = {7} 不是 XML 格里历值的有效表示。
 
-InvalidXGCFields=\u4E3A XMLGregorianCalendar \u8BBE\u7F6E\u7684\u5B57\u6BB5\u96C6\u65E0\u6548
+InvalidXGCFields=为 XMLGregorianCalendar 设置的字段集无效
 
-InvalidFractional=\u5C0F\u6570\u79D2\u7684\u503C {0} \u65E0\u6548\u3002
+InvalidFractional=小数秒的值 {0} 无效。
 
 #XGC stands for XML Gregorian Calendar
-InvalidXGCRepresentation="{0}" \u4E0D\u662F XML \u683C\u91CC\u5386\u503C\u7684\u6709\u6548\u8868\u793A\u3002
+InvalidXGCRepresentation="{0}" 不是 XML 格里历值的有效表示。
 
-InvalidFieldValue={1}\u5B57\u6BB5\u7684\u503C{0}\u65E0\u6548\u3002
+InvalidFieldValue={1}字段的值{0}无效。
 
-NegativeField= {0}\u5B57\u6BB5\u4E3A\u8D1F\u503C
+NegativeField= {0}字段为负值
 
-AllFieldsNull=\u6240\u6709\u5B57\u6BB5 (javax.xml.datatype.DatatypeConstants.Field) \u5747\u4E3A\u7A7A\u503C\u3002
+AllFieldsNull=所有字段 (javax.xml.datatype.DatatypeConstants.Field) 均为空值。
 
-TooLarge={0}\u503C "{1}" \u592A\u5927, \u65E0\u6CD5\u7531\u6B64\u5B9E\u73B0\u652F\u6301
+TooLarge={0}值 "{1}" 太大, 无法由此实现支持
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties
index cb23f872a1b..8f91597ac60 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties
@@ -27,27 +27,27 @@
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
-FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
+BadMessageKey = 找不到對應訊息索引鍵的錯誤訊息。
+FormatFailed = 格式化下列訊息時發生內部錯誤:\n
 
-FieldCannotBeNull=\u7121\u6CD5\u4F7F\u7528 ''null'' \u53C3\u6578\u547C\u53EB {0}
-UnknownField=\u4F7F\u7528\u4E0D\u660E\u7684\u6B04\u4F4D\u547C\u53EB {0}:{1}
+FieldCannotBeNull=無法使用 ''null'' 參數呼叫 {0}
+UnknownField=使用不明的欄位呼叫 {0}:{1}
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-milli=\u5E74 = {0}\u3001\u6708 = {1}\u3001\u65E5 = {2}\u3001\u5C0F\u6642 = {3}\u3001\u5206\u9418 = {4}\u3001\u79D2 = {5}\u3001\u5C0F\u6578\u79D2 = {6}\u3001\u6642\u5340 = {7}\uFF0C\u4E0D\u662F XML \u516C\u66C6\u503C\u7684\u6709\u6548\u8868\u793A\u6CD5\u3002
+InvalidXGCValue-milli=年 = {0}、月 = {1}、日 = {2}、小時 = {3}、分鐘 = {4}、秒 = {5}、小數秒 = {6}、時區 = {7}，不是 XML 公曆值的有效表示法。
 #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
-InvalidXGCValue-fractional=\u5E74 = {0}\u3001\u6708 = {1}\u3001\u65E5 = {2}\u3001\u5C0F\u6642 = {3}\u3001\u5206\u9418 = {4}\u3001\u79D2 = {5}\u3001\u5C0F\u6578\u79D2 = {6}\u3001\u6642\u5340 = {7}\uFF0C\u4E0D\u662F XML \u516C\u66C6\u503C\u7684\u6709\u6548\u8868\u793A\u6CD5\u3002
+InvalidXGCValue-fractional=年 = {0}、月 = {1}、日 = {2}、小時 = {3}、分鐘 = {4}、秒 = {5}、小數秒 = {6}、時區 = {7}，不是 XML 公曆值的有效表示法。
 
-InvalidXGCFields=XMLGregorianCalendar \u8A2D\u5B9A\u4E86\u7121\u6548\u7684\u6B04\u4F4D\u96C6
+InvalidXGCFields=XMLGregorianCalendar 設定了無效的欄位集
 
-InvalidFractional=\u5C0F\u6578\u79D2\u7684\u503C {0} \u7121\u6548\u3002
+InvalidFractional=小數秒的值 {0} 無效。
 
 #XGC stands for XML Gregorian Calendar
-InvalidXGCRepresentation="{0}" \u4E0D\u662F XML \u516C\u66C6\u503C\u7684\u6709\u6548\u8868\u793A\u6CD5\u3002
+InvalidXGCRepresentation="{0}" 不是 XML 公曆值的有效表示法。
 
-InvalidFieldValue={1} \u6B04\u4F4D\u7684\u503C {0} \u7121\u6548\u3002
+InvalidFieldValue={1} 欄位的值 {0} 無效。
 
-NegativeField= {0} \u6B04\u4F4D\u70BA\u8CA0\u503C
+NegativeField= {0} 欄位為負值
 
-AllFieldsNull=\u6240\u6709\u6B04\u4F4D (javax.xml.datatype.DatatypeConstants.Field) \u7686\u70BA\u7A7A\u503C\u3002
+AllFieldsNull=所有欄位 (javax.xml.datatype.DatatypeConstants.Field) 皆為空值。
 
-TooLarge={0} \u503C "{1}" \u592A\u5927\uFF0C\u6B64\u5BE6\u884C\u4E0D\u652F\u63F4
+TooLarge={0} 值 "{1}" 太大，此實行不支援
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
index 4573321f537..48176f6b9fb 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
@@ -20,7 +20,7 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
+BadMessageKey = Die zum Meldungsschlüssel gehörige Fehlermeldung kann nicht gefunden werden.
 FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n
 
 # SchemaFactory error messages
@@ -36,10 +36,10 @@ SourceNotAccepted = Quellparameter des Typs "{0}" wird von diesem Validator nich
 SourceResultMismatch = Quellparameter des Typs "{0}" ist nicht mit dem Ergebnisparameter des Typs "{1}" kompatibel.
 
 # TypeInfoProvider error messages
-TypeInfoProviderIllegalState = TypeInfoProvider kann nicht au\u00DFerhalb eines startElement-R\u00FCckrufs abgefragt werden.
+TypeInfoProviderIllegalState = TypeInfoProvider kann nicht außerhalb eines startElement-Rückrufs abgefragt werden.
 
 # General error messages
 FeatureNameNull = Featurename darf nicht null sein.
 ProperyNameNull = Eigenschaftsname darf nicht null sein.
-SAXSourceNullInputSource = Angegebene SAXSource enth\u00E4lt keine InputSource.
+SAXSourceNullInputSource = Angegebene SAXSource enthält keine InputSource.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties
index 0bac87ccbf3..36d7e8126a0 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties
@@ -34,20 +34,20 @@ FormatFailed = Se ha producido un error interno al formatear el siguiente mensaj
 # SchemaFactory error messages
 SchemaLanguageNull = El idioma del esquema especificado no puede ser nulo.
 SchemaLanguageLengthZero = El idioma del esquema especificado no puede tener una longitud de cero caracteres.
-SchemaSourceArrayNull = El par\u00E1metro de matriz de origen no puede ser nulo.
-SchemaSourceArrayMemberNull = El par\u00E1metro de matriz de origen no puede contener ning\u00FAn elemento que sea nulo.
-SchemaFactorySourceUnrecognized = Este SchemaFactory no reconoce el par\u00E1metro de origen del tipo ''{0}''.
+SchemaSourceArrayNull = El parámetro de matriz de origen no puede ser nulo.
+SchemaSourceArrayMemberNull = El parámetro de matriz de origen no puede contener ningún elemento que sea nulo.
+SchemaFactorySourceUnrecognized = Este SchemaFactory no reconoce el parámetro de origen del tipo ''{0}''.
 
 # Validator error messages
-SourceParameterNull = El par\u00E1metro de origen no puede ser nulo.
-SourceNotAccepted = Este validador no acepta el par\u00E1metro de origen del tipo ''{0}''.
-SourceResultMismatch = El par\u00E1metro de origen del tipo ''{0}'' no es compatible con el par\u00E1metro de resultado del tipo ''{1}''.
+SourceParameterNull = El parámetro de origen no puede ser nulo.
+SourceNotAccepted = Este validador no acepta el parámetro de origen del tipo ''{0}''.
+SourceResultMismatch = El parámetro de origen del tipo ''{0}'' no es compatible con el parámetro de resultado del tipo ''{1}''.
 
 # TypeInfoProvider error messages
-TypeInfoProviderIllegalState = Un TypeInfoProvider no puede consultarse fuera de una devoluci\u00F3n de llamada de startElement.
+TypeInfoProviderIllegalState = Un TypeInfoProvider no puede consultarse fuera de una devolución de llamada de startElement.
 
 # General error messages
-FeatureNameNull = El nombre de la funci\u00F3n no puede ser nulo.
+FeatureNameNull = El nombre de la función no puede ser nulo.
 ProperyNameNull = El nombre de la propiedad no puede ser nulo.
-SAXSourceNullInputSource = El SAXSource especificado no contiene ning\u00FAn valor de InputSource.
+SAXSourceNullInputSource = El SAXSource especificado no contiene ningún valor de InputSource.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties
index a48dd9437df..d6a0ca0fa56 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties
@@ -28,26 +28,26 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
+BadMessageKey = Le message d'erreur correspondant à la clé de message est introuvable.
 FormatFailed = Une erreur interne est survenue lors du formatage du message suivant :\n
 
 # SchemaFactory error messages
-SchemaLanguageNull = La langue de sch\u00E9ma indiqu\u00E9e ne peut pas \u00EAtre NULL.
-SchemaLanguageLengthZero = La longueur de la langue de sch\u00E9ma indiqu\u00E9e ne peut \u00EAtre de z\u00E9ro caract\u00E8re.
-SchemaSourceArrayNull = Le param\u00E8tre de tableau source ne peut pas \u00EAtre NULL.
-SchemaSourceArrayMemberNull = Le param\u00E8tre de tableau source ne peut pas contenir d'\u00E9l\u00E9ment NULL.
-SchemaFactorySourceUnrecognized = Le param\u00E8tre source de type ''{0}'' n''est pas reconnu par cet \u00E9l\u00E9ment SchemaFactory.
+SchemaLanguageNull = La langue de schéma indiquée ne peut pas être NULL.
+SchemaLanguageLengthZero = La longueur de la langue de schéma indiquée ne peut être de zéro caractère.
+SchemaSourceArrayNull = Le paramètre de tableau source ne peut pas être NULL.
+SchemaSourceArrayMemberNull = Le paramètre de tableau source ne peut pas contenir d'élément NULL.
+SchemaFactorySourceUnrecognized = Le paramètre source de type ''{0}'' n''est pas reconnu par cet élément SchemaFactory.
 
 # Validator error messages
-SourceParameterNull = Le param\u00E8tre source ne peut pas \u00EAtre NULL.
-SourceNotAccepted = Le param\u00E8tre source de type ''{0}'' n''est pas accept\u00E9 par ce valideur.
-SourceResultMismatch = Le param\u00E8tre source de type ''{0}'' n''est pas compatible avec le param\u00E8tre de r\u00E9sultat de type ''{1}''.
+SourceParameterNull = Le paramètre source ne peut pas être NULL.
+SourceNotAccepted = Le paramètre source de type ''{0}'' n''est pas accepté par ce valideur.
+SourceResultMismatch = Le paramètre source de type ''{0}'' n''est pas compatible avec le paramètre de résultat de type ''{1}''.
 
 # TypeInfoProvider error messages
-TypeInfoProviderIllegalState = Un \u00E9l\u00E9ment TypeInfoProvider ne peut pas \u00EAtre interrog\u00E9 en dehors d'un callback startElement.
+TypeInfoProviderIllegalState = Un élément TypeInfoProvider ne peut pas être interrogé en dehors d'un callback startElement.
 
 # General error messages
-FeatureNameNull = Le nom de fonctionnalit\u00E9 ne peut pas \u00EAtre NULL.
-ProperyNameNull = Le nom de propri\u00E9t\u00E9 ne peut pas \u00EAtre NULL.
-SAXSourceNullInputSource = L'\u00E9l\u00E9ment SAXSource indiqu\u00E9 ne contient aucun \u00E9l\u00E9ment InputSource.
+FeatureNameNull = Le nom de fonctionnalité ne peut pas être NULL.
+ProperyNameNull = Le nom de propriété ne peut pas être NULL.
+SAXSourceNullInputSource = L'élément SAXSource indiqué ne contient aucun élément InputSource.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties
index 8829cf1e019..07814b73e4a 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties
@@ -29,25 +29,25 @@
 
 # Messages for message reporting
 BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
-FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n
+FormatFailed = Si è verificato un errore interno durante la formattazione del seguente messaggio:\n
 
 # SchemaFactory error messages
-SchemaLanguageNull = La lingua dello schema specificata non pu\u00F2 essere nulla.
-SchemaLanguageLengthZero = La lingua dello schema specificata non pu\u00F2 avere una lunghezza di zero caratteri.
-SchemaSourceArrayNull = Il parametro di array di origine non pu\u00F2 essere nullo.
-SchemaSourceArrayMemberNull = Il parametro di array di origine non pu\u00F2 contenere elementi nulli.
-SchemaFactorySourceUnrecognized = Il parametro di origine di tipo ''{0}'' non \u00E8 riconosciuto in questo SchemaFactory.
+SchemaLanguageNull = La lingua dello schema specificata non può essere nulla.
+SchemaLanguageLengthZero = La lingua dello schema specificata non può avere una lunghezza di zero caratteri.
+SchemaSourceArrayNull = Il parametro di array di origine non può essere nullo.
+SchemaSourceArrayMemberNull = Il parametro di array di origine non può contenere elementi nulli.
+SchemaFactorySourceUnrecognized = Il parametro di origine di tipo ''{0}'' non è riconosciuto in questo SchemaFactory.
 
 # Validator error messages
-SourceParameterNull = Il parametro di origine non pu\u00F2 essere nullo.
-SourceNotAccepted = Il parametro di origine di tipo ''{0}'' non \u00E8 accettato da questo validator.
-SourceResultMismatch = Il parametro di origine di tipo ''{0}'' non \u00E8 compatibile con il parametro dei risultati di tipo ''{1}''.
+SourceParameterNull = Il parametro di origine non può essere nullo.
+SourceNotAccepted = Il parametro di origine di tipo ''{0}'' non è accettato da questo validator.
+SourceResultMismatch = Il parametro di origine di tipo ''{0}'' non è compatibile con il parametro dei risultati di tipo ''{1}''.
 
 # TypeInfoProvider error messages
 TypeInfoProviderIllegalState = Impossibile eseguire una query su TypeInfoProvider al di fuori di un callback startElement.
 
 # General error messages
-FeatureNameNull = Il nome funzione non pu\u00F2 essere nullo.
-ProperyNameNull = Il nome propriet\u00E0 non pu\u00F2 essere nullo.
+FeatureNameNull = Il nome funzione non può essere nullo.
+ProperyNameNull = Il nome proprietà non può essere nullo.
 SAXSourceNullInputSource = Il valore specificato per SAXSource non contiene InputSource.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
index f088d5e08a5..0b57216666e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
@@ -20,26 +20,26 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n
+BadMessageKey = メッセージ・キーに対応するエラー・メッセージが見つかりません。
+FormatFailed = 次のメッセージの書式設定中に内部エラーが発生しました:\n
 
 # SchemaFactory error messages
-SchemaLanguageNull = \u6307\u5B9A\u3057\u305F\u30B9\u30AD\u30FC\u30DE\u8A00\u8A9E\u306Fnull\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-SchemaLanguageLengthZero = \u6307\u5B9A\u3057\u305F\u30B9\u30AD\u30FC\u30DE\u8A00\u8A9E\u306E\u9577\u3055\u306F\u30BC\u30ED\u6587\u5B57\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-SchemaSourceArrayNull = Source\u914D\u5217\u30D1\u30E9\u30E1\u30FC\u30BF\u306Fnull\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-SchemaSourceArrayMemberNull = Source\u914D\u5217\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u306F\u3001null\u306E\u30A2\u30A4\u30C6\u30E0\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-SchemaFactorySourceUnrecognized = \u30BF\u30A4\u30D7''{0}''\u306ESource\u30D1\u30E9\u30E1\u30FC\u30BF\u306F\u3001\u3053\u306ESchemaFactory\u3067\u306F\u8A8D\u8B58\u3055\u308C\u307E\u305B\u3093\u3002
+SchemaLanguageNull = 指定したスキーマ言語はnullにできません。
+SchemaLanguageLengthZero = 指定したスキーマ言語の長さはゼロ文字にできません。
+SchemaSourceArrayNull = Source配列パラメータはnullにできません。
+SchemaSourceArrayMemberNull = Source配列パラメータには、nullのアイテムを含めることはできません。
+SchemaFactorySourceUnrecognized = タイプ''{0}''のSourceパラメータは、このSchemaFactoryでは認識されません。
 
 # Validator error messages
-SourceParameterNull = Source\u30D1\u30E9\u30E1\u30FC\u30BF\u306Fnull\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-SourceNotAccepted = \u30BF\u30A4\u30D7''{0}''\u306ESource\u30D1\u30E9\u30E1\u30FC\u30BF\u306F\u3001\u3053\u306E\u30D0\u30EA\u30C7\u30FC\u30BF\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-SourceResultMismatch = \u30BF\u30A4\u30D7''{0}''\u306ESource\u30D1\u30E9\u30E1\u30FC\u30BF\u306F\u3001\u30BF\u30A4\u30D7''{1}''\u306E\u7D50\u679C\u30D1\u30E9\u30E1\u30FC\u30BF\u3068\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+SourceParameterNull = Sourceパラメータはnullにできません。
+SourceNotAccepted = タイプ''{0}''のSourceパラメータは、このバリデータでは使用できません。
+SourceResultMismatch = タイプ''{0}''のSourceパラメータは、タイプ''{1}''の結果パラメータと互換性がありません。
 
 # TypeInfoProvider error messages
-TypeInfoProviderIllegalState = TypeInfoProvider\u306F\u3001startElement\u30B3\u30FC\u30EB\u30D0\u30C3\u30AF\u306E\u5916\u3067\u554F\u3044\u5408\u305B\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
+TypeInfoProviderIllegalState = TypeInfoProviderは、startElementコールバックの外で問い合せることはできません。
 
 # General error messages
-FeatureNameNull = \u6A5F\u80FD\u540D\u306Fnull\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-ProperyNameNull = \u30D7\u30ED\u30D1\u30C6\u30A3\u540D\u306Fnull\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-SAXSourceNullInputSource = \u6307\u5B9A\u3057\u305FSAXSource\u306B\u306F\u3001InputSource\u306F\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+FeatureNameNull = 機能名はnullにできません。
+ProperyNameNull = プロパティ名はnullにできません。
+SAXSourceNullInputSource = 指定したSAXSourceには、InputSourceは含まれていません。
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties
index bfdcfcb8e60..efa5809174a 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties
@@ -28,26 +28,26 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n
+BadMessageKey = 메시지 키에 해당하는 오류 메시지를 찾을 수 없습니다.
+FormatFailed = 다음 메시지의 형식을 지정하는 중 내부 오류가 발생했습니다.\n
 
 # SchemaFactory error messages
-SchemaLanguageNull = \uC9C0\uC815\uB41C \uC2A4\uD0A4\uB9C8 \uC5B8\uC5B4\uB294 \uB110\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-SchemaLanguageLengthZero = \uC9C0\uC815\uB41C \uC2A4\uD0A4\uB9C8 \uC5B8\uC5B4\uC758 \uAE38\uC774\uB294 0\uC790\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-SchemaSourceArrayNull = \uC18C\uC2A4 \uBC30\uC5F4 \uB9E4\uAC1C\uBCC0\uC218\uB294 \uB110\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-SchemaSourceArrayMemberNull = \uC18C\uC2A4 \uBC30\uC5F4 \uB9E4\uAC1C\uBCC0\uC218\uC5D0\uB294 \uB110\uC778 \uD56D\uBAA9\uC774 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-SchemaFactorySourceUnrecognized = \uC774 SchemaFactory\uAC00 ''{0}'' \uC720\uD615\uC758 \uC18C\uC2A4 \uB9E4\uAC1C\uBCC0\uC218\uB97C \uC778\uC2DD\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+SchemaLanguageNull = 지정된 스키마 언어는 널일 수 없습니다.
+SchemaLanguageLengthZero = 지정된 스키마 언어의 길이는 0자일 수 없습니다.
+SchemaSourceArrayNull = 소스 배열 매개변수는 널일 수 없습니다.
+SchemaSourceArrayMemberNull = 소스 배열 매개변수에는 널인 항목이 포함될 수 없습니다.
+SchemaFactorySourceUnrecognized = 이 SchemaFactory가 ''{0}'' 유형의 소스 매개변수를 인식할 수 없습니다.
 
 # Validator error messages
-SourceParameterNull = \uC18C\uC2A4 \uB9E4\uAC1C\uBCC0\uC218\uB294 \uB110\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-SourceNotAccepted = \uC774 \uAC80\uC99D\uAE30\uB294 ''{0}'' \uC720\uD615\uC758 \uC18C\uC2A4 \uB9E4\uAC1C\uBCC0\uC218\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-SourceResultMismatch = ''{0}'' \uC720\uD615\uC758 \uC18C\uC2A4 \uB9E4\uAC1C\uBCC0\uC218\uAC00 ''{1}'' \uC720\uD615\uC758 \uACB0\uACFC \uB9E4\uAC1C\uBCC0\uC218\uC640 \uD638\uD658\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+SourceParameterNull = 소스 매개변수는 널일 수 없습니다.
+SourceNotAccepted = 이 검증기는 ''{0}'' 유형의 소스 매개변수를 사용할 수 없습니다.
+SourceResultMismatch = ''{0}'' 유형의 소스 매개변수가 ''{1}'' 유형의 결과 매개변수와 호환되지 않습니다.
 
 # TypeInfoProvider error messages
-TypeInfoProviderIllegalState = TypeInfoProvider\uB294 startElement \uCF5C\uBC31 \uC678\uBD80\uC5D0\uC11C \uC9C8\uC758\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+TypeInfoProviderIllegalState = TypeInfoProvider는 startElement 콜백 외부에서 질의할 수 없습니다.
 
 # General error messages
-FeatureNameNull = \uAE30\uB2A5 \uC774\uB984\uC740 \uB110\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-ProperyNameNull = \uC18D\uC131 \uC774\uB984\uC740 \uB110\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-SAXSourceNullInputSource = \uC9C0\uC815\uB41C SAXSource\uC5D0 InputSource\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+FeatureNameNull = 기능 이름은 널일 수 없습니다.
+ProperyNameNull = 속성 이름은 널일 수 없습니다.
+SAXSourceNullInputSource = 지정된 SAXSource에 InputSource가 포함되어 있지 않습니다.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties
index 47ba42f6d4d..68bf0427747 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties
@@ -28,26 +28,26 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
+BadMessageKey = Não foi possível encontrar a mensagem de erro correspondente à chave da mensagem.
 FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n
 
 # SchemaFactory error messages
-SchemaLanguageNull = O idioma do esquema especificado n\u00E3o pode ser nulo.
-SchemaLanguageLengthZero = O idioma do esquema especificado n\u00E3o pode ter um tamanho de zero caracteres.
-SchemaSourceArrayNull = O par\u00E2metro do array de Origem n\u00E3o pode ser nulo.
-SchemaSourceArrayMemberNull = O par\u00E2metro do array de Origem n\u00E3o pode conter nenhum item que seja nulo.
-SchemaFactorySourceUnrecognized = O par\u00E2metro de origem do tipo ''{0}'' n\u00E3o reconheceu este SchemaFactory.
+SchemaLanguageNull = O idioma do esquema especificado não pode ser nulo.
+SchemaLanguageLengthZero = O idioma do esquema especificado não pode ter um tamanho de zero caracteres.
+SchemaSourceArrayNull = O parâmetro do array de Origem não pode ser nulo.
+SchemaSourceArrayMemberNull = O parâmetro do array de Origem não pode conter nenhum item que seja nulo.
+SchemaFactorySourceUnrecognized = O parâmetro de origem do tipo ''{0}'' não reconheceu este SchemaFactory.
 
 # Validator error messages
-SourceParameterNull = O par\u00E2metro de origem n\u00E3o pode ser nulo.
-SourceNotAccepted = O par\u00E2metro de origem do tipo ''{0}'' n\u00E3o \u00E9 aceito por este validador.
-SourceResultMismatch = O par\u00E2metro do origem do tipo ''{0}'' n\u00E3o \u00E9 compat\u00EDvel com o par\u00E2metro de resultado do tipo ''{1}''.
+SourceParameterNull = O parâmetro de origem não pode ser nulo.
+SourceNotAccepted = O parâmetro de origem do tipo ''{0}'' não é aceito por este validador.
+SourceResultMismatch = O parâmetro do origem do tipo ''{0}'' não é compatível com o parâmetro de resultado do tipo ''{1}''.
 
 # TypeInfoProvider error messages
-TypeInfoProviderIllegalState = Um TypeInfoProvider n\u00E3o pode ser consultado fora de um callback startElement.
+TypeInfoProviderIllegalState = Um TypeInfoProvider não pode ser consultado fora de um callback startElement.
 
 # General error messages
-FeatureNameNull = O nome do recurso n\u00E3o pode ser nulo.
-ProperyNameNull = O nome da propriedade n\u00E3o pode ser nulo.
-SAXSourceNullInputSource = O SAXSource especificado n\u00E3o cont\u00E9m InputSource.
+FeatureNameNull = O nome do recurso não pode ser nulo.
+ProperyNameNull = O nome da propriedade não pode ser nulo.
+SAXSourceNullInputSource = O SAXSource especificado não contém InputSource.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties
index 22556779bfc..f2af535878b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties
@@ -29,25 +29,25 @@
 
 # Messages for message reporting
 BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
-FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
+FormatFailed = Ett internt fel inträffade vid formatering av följande meddelande:\n
 
 # SchemaFactory error messages
-SchemaLanguageNull = Angivet schemaspr\u00E5k f\u00E5r inte vara null.
-SchemaLanguageLengthZero = Angivet schemaspr\u00E5k f\u00E5r inte ha en l\u00E4ngd som \u00E4r noll tecken.
-SchemaSourceArrayNull = Parametern f\u00F6r Source-uppst\u00E4llning f\u00E5r inte vara null.
-SchemaSourceArrayMemberNull = Parametern f\u00F6r Source-uppst\u00E4llning f\u00E5r inte inneh\u00E5lla n\u00E5gra objekt som \u00E4r null.
+SchemaLanguageNull = Angivet schemaspråk får inte vara null.
+SchemaLanguageLengthZero = Angivet schemaspråk får inte ha en längd som är noll tecken.
+SchemaSourceArrayNull = Parametern för Source-uppställning får inte vara null.
+SchemaSourceArrayMemberNull = Parametern för Source-uppställning får inte innehålla några objekt som är null.
 SchemaFactorySourceUnrecognized = Source-parametrar av typ ''{0}'' identifieras inte av SchemaFactory.
 
 # Validator error messages
-SourceParameterNull = Source-parameter f\u00E5r inte vara null.
+SourceParameterNull = Source-parameter får inte vara null.
 SourceNotAccepted = Source-parametrar av typ ''{0}'' accepteras inte av valideraren.
-SourceResultMismatch = Source-parametrar av typ ''{0}'' \u00E4r inte kompatibla med resultatparametrar av typ ''{1}''.
+SourceResultMismatch = Source-parametrar av typ ''{0}'' är inte kompatibla med resultatparametrar av typ ''{1}''.
 
 # TypeInfoProvider error messages
-TypeInfoProviderIllegalState = TypeInfoProvider f\u00E5r inte ta emot fr\u00E5gor utanf\u00F6r respons fr\u00E5n startElement.
+TypeInfoProviderIllegalState = TypeInfoProvider får inte ta emot frågor utanför respons från startElement.
 
 # General error messages
-FeatureNameNull = Funktionsnamn f\u00E5r inte vara null.
-ProperyNameNull = Egenskapsnamn f\u00E5r inte vara null.
-SAXSourceNullInputSource = Angiven SAXSource inneh\u00E5ller ingen InputSource.
+FeatureNameNull = Funktionsnamn får inte vara null.
+ProperyNameNull = Egenskapsnamn får inte vara null.
+SAXSourceNullInputSource = Angiven SAXSource innehåller ingen InputSource.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
index 8de5743830d..f51a7aa99d0 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
@@ -20,26 +20,26 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
-FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n
+BadMessageKey = 找不到与消息关键字对应的错误消息。
+FormatFailed = 设置以下消息的格式时出现内部错误:\n
 
 # SchemaFactory error messages
-SchemaLanguageNull = \u6307\u5B9A\u7684\u65B9\u6848\u8BED\u8A00\u4E0D\u80FD\u4E3A\u7A7A\u503C\u3002
-SchemaLanguageLengthZero = \u6307\u5B9A\u7684\u65B9\u6848\u8BED\u8A00\u7684\u957F\u5EA6\u4E0D\u80FD\u4E3A\u96F6\u4E2A\u5B57\u7B26\u3002
-SchemaSourceArrayNull = Source \u6570\u7EC4\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A\u503C\u3002
-SchemaSourceArrayMemberNull = Source \u6570\u7EC4\u53C2\u6570\u4E0D\u80FD\u5305\u542B\u4EFB\u4F55\u4E3A\u7A7A\u503C\u7684\u9879\u3002
-SchemaFactorySourceUnrecognized = \u6B64 SchemaFactory \u65E0\u6CD5\u8BC6\u522B\u7C7B\u578B\u4E3A ''{0}'' \u7684 Source \u53C2\u6570\u3002
+SchemaLanguageNull = 指定的方案语言不能为空值。
+SchemaLanguageLengthZero = 指定的方案语言的长度不能为零个字符。
+SchemaSourceArrayNull = Source 数组参数不能为空值。
+SchemaSourceArrayMemberNull = Source 数组参数不能包含任何为空值的项。
+SchemaFactorySourceUnrecognized = 此 SchemaFactory 无法识别类型为 ''{0}'' 的 Source 参数。
 
 # Validator error messages
-SourceParameterNull = Source \u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A\u503C\u3002
-SourceNotAccepted = \u6B64\u9A8C\u8BC1\u7A0B\u5E8F\u4E0D\u63A5\u53D7\u7C7B\u578B\u4E3A ''{0}'' \u7684 Source \u53C2\u6570\u3002
-SourceResultMismatch = \u7C7B\u578B\u4E3A ''{0}'' \u7684 Source \u53C2\u6570\u4E0E\u7C7B\u578B\u4E3A ''{1}'' \u7684\u7ED3\u679C\u53C2\u6570\u4E0D\u517C\u5BB9\u3002
+SourceParameterNull = Source 参数不能为空值。
+SourceNotAccepted = 此验证程序不接受类型为 ''{0}'' 的 Source 参数。
+SourceResultMismatch = 类型为 ''{0}'' 的 Source 参数与类型为 ''{1}'' 的结果参数不兼容。
 
 # TypeInfoProvider error messages
-TypeInfoProviderIllegalState = \u65E0\u6CD5\u5728 startElement \u56DE\u8C03\u5916\u90E8\u67E5\u8BE2 TypeInfoProvider\u3002
+TypeInfoProviderIllegalState = 无法在 startElement 回调外部查询 TypeInfoProvider。
 
 # General error messages
-FeatureNameNull = \u529F\u80FD\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\u503C\u3002
-ProperyNameNull = \u5C5E\u6027\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\u503C\u3002
-SAXSourceNullInputSource = \u6307\u5B9A\u7684 SAXSource \u4E0D\u5305\u542B InputSource\u3002
+FeatureNameNull = 功能名称不能为空值。
+ProperyNameNull = 属性名称不能为空值。
+SAXSourceNullInputSource = 指定的 SAXSource 不包含 InputSource。
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties
index f0ee4f06be3..aea7aad57b3 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties
@@ -28,26 +28,26 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
-FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
+BadMessageKey = 找不到對應訊息索引鍵的錯誤訊息。
+FormatFailed = 格式化下列訊息時發生內部錯誤:\n
 
 # SchemaFactory error messages
-SchemaLanguageNull = \u6307\u5B9A\u7684\u7DB1\u8981\u8A9E\u8A00\u4E0D\u53EF\u70BA\u7A7A\u503C\u3002
-SchemaLanguageLengthZero = \u6307\u5B9A\u7684\u7DB1\u8981\u8A9E\u8A00\u4E0D\u53EF\u70BA\u96F6\u5B57\u5143\u9577\u5EA6\u3002
-SchemaSourceArrayNull = \u4F86\u6E90\u9663\u5217\u53C3\u6578\u4E0D\u53EF\u70BA\u7A7A\u503C\u3002
-SchemaSourceArrayMemberNull = \u4F86\u6E90\u9663\u5217\u53C3\u6578\u4E0D\u53EF\u5305\u542B\u4EFB\u4F55\u7A7A\u503C\u9805\u76EE\u3002
-SchemaFactorySourceUnrecognized = \u985E\u578B ''{0}'' \u7684\u4F86\u6E90\u53C3\u6578\u7121\u6CD5\u8FA8\u8B58\u6B64 SchemaFactory\u3002
+SchemaLanguageNull = 指定的綱要語言不可為空值。
+SchemaLanguageLengthZero = 指定的綱要語言不可為零字元長度。
+SchemaSourceArrayNull = 來源陣列參數不可為空值。
+SchemaSourceArrayMemberNull = 來源陣列參數不可包含任何空值項目。
+SchemaFactorySourceUnrecognized = 類型 ''{0}'' 的來源參數無法辨識此 SchemaFactory。
 
 # Validator error messages
-SourceParameterNull = \u4F86\u6E90\u53C3\u6578\u4E0D\u53EF\u70BA\u7A7A\u503C\u3002
-SourceNotAccepted = \u6B64\u9A57\u8B49\u7A0B\u5F0F\u4E0D\u63A5\u53D7\u985E\u578B ''{0}'' \u7684\u4F86\u6E90\u53C3\u6578\u3002
-SourceResultMismatch = \u985E\u578B ''{0}'' \u7684\u4F86\u6E90\u53C3\u6578\u8207\u985E\u578B ''{1}'' \u7684\u7D50\u679C\u53C3\u6578\u4E0D\u76F8\u5BB9\u3002
+SourceParameterNull = 來源參數不可為空值。
+SourceNotAccepted = 此驗證程式不接受類型 ''{0}'' 的來源參數。
+SourceResultMismatch = 類型 ''{0}'' 的來源參數與類型 ''{1}'' 的結果參數不相容。
 
 # TypeInfoProvider error messages
-TypeInfoProviderIllegalState = \u4E0D\u53EF\u5728 startElement \u56DE\u547C\u4E4B\u5916\u67E5\u8A62 TypeInfoProvider\u3002
+TypeInfoProviderIllegalState = 不可在 startElement 回呼之外查詢 TypeInfoProvider。
 
 # General error messages
-FeatureNameNull = \u529F\u80FD\u540D\u7A31\u4E0D\u53EF\u70BA\u7A7A\u503C\u3002
-ProperyNameNull = \u5C6C\u6027\u540D\u7A31\u4E0D\u53EF\u70BA\u7A7A\u503C\u3002
-SAXSourceNullInputSource = \u6307\u5B9A\u7684 SAXSource \u672A\u5305\u542B InputSource\u3002
+FeatureNameNull = 功能名稱不可為空值。
+ProperyNameNull = 屬性名稱不可為空值。
+SAXSourceNullInputSource = 指定的 SAXSource 未包含 InputSource。
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
index 60a03e533bb..9196318a418 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
@@ -21,31 +21,31 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 
-BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
+BadMessageKey = Die zum Meldungsschlüssel gehörige Fehlermeldung kann nicht gefunden werden.
 FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n
 
 # JAXP messages
-schema-not-supported = Die angegebene Schemasprache wird nicht unterst\u00FCtzt.
+schema-not-supported = Die angegebene Schemasprache wird nicht unterstützt.
 jaxp-order-not-supported = Eigenschaft "{0}" muss vor der Eigenschaft "{1}" festgelegt werden. 
 schema-already-specified = Eigenschaft "{0}" kann nicht festgelegt werden, wenn bereits ein Schemaobjekt ungleich null angegeben wurde.
 
 # feature messages
-feature-not-supported = Feature "{0}" wird nicht unterst\u00FCtzt.
+feature-not-supported = Feature "{0}" wird nicht unterstützt.
 feature-not-recognized = Feature "{0}" ist unbekannt.
-true-not-supported = Status "True" f\u00FCr Feature "{0}" wird nicht unterst\u00FCtzt.
-false-not-supported = Status "False" f\u00FCr Feature "{0}" wird nicht unterst\u00FCtzt.
-feature-read-only = Feature "{0}" ist schreibgesch\u00FCtzt.
+true-not-supported = Status "True" für Feature "{0}" wird nicht unterstützt.
+false-not-supported = Status "False" für Feature "{0}" wird nicht unterstützt.
+feature-read-only = Feature "{0}" ist schreibgeschützt.
 jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: Feature kann nicht auf "false" gesetzt werden, wenn Security Manager vorhanden ist.
 
 # property messages
-property-not-supported = Eigenschaft "{0}" wird nicht unterst\u00FCtzt.
+property-not-supported = Eigenschaft "{0}" wird nicht unterstützt.
 property-not-recognized = Eigenschaft "{0}" ist unbekannt.
-property-read-only = Eigenschaft "{0}" ist schreibgesch\u00FCtzt.
-property-not-parsing-supported = Eigenschaft "{0}" wird beim Parsen nicht unterst\u00FCtzt.
+property-read-only = Eigenschaft "{0}" ist schreibgeschützt.
+property-not-parsing-supported = Eigenschaft "{0}" wird beim Parsen nicht unterstützt.
 dom-node-read-not-supported = DOM-Knoteneigenschaft kann nicht gelesen werden. Kein DOM-Baum vorhanden.
-incompatible-class = Der f\u00FCr Eigenschaft "{0}" angegebene Wert kann nicht in {1} konvertiert werden.
+incompatible-class = Der für Eigenschaft "{0}" angegebene Wert kann nicht in {1} konvertiert werden.
 
-start-document-not-called=Eigenschaft "{0}" sollte aufgerufen werden, nachdem das startDocument-Ereignis ausgel\u00F6st wurde
-nullparameter=Namensparameter f\u00FCr "{0}" ist null
+start-document-not-called=Eigenschaft "{0}" sollte aufgerufen werden, nachdem das startDocument-Ereignis ausgelöst wurde
+nullparameter=Namensparameter für "{0}" ist null
 errorHandlerNotSet=Warnung: Validierung wurde eingeschaltet, aber es wurde kein org.xml.sax.ErrorHandler festgelegt. Dies ist wahrscheinlich nicht beabsichtigt. Parser druckt die ersten {0} Fehler mit einem Standard-ErrorHandler. Rufen Sie die Methode "setErrorHandler" auf, um dies zu beheben.
 errorHandlerDebugMsg=Fehler: URI = "{0}", Zeile = "{1}", : {2} 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties
index 5493f01cfc0..fa89d4adeaa 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties
@@ -33,27 +33,27 @@ BadMessageKey = No se ha encontrado el mensaje de error correspondiente a la cla
 FormatFailed = Se ha producido un error interno al formatear el siguiente mensaje:\n
 
 # JAXP messages
-schema-not-supported = El idioma del esquema especificado no est\u00E1 soportado.
+schema-not-supported = El idioma del esquema especificado no está soportado.
 jaxp-order-not-supported = La propiedad ''{0}'' debe definirse antes de definir la propiedad ''{1}''. 
 schema-already-specified = La propiedad ''{0}'' no puede definirse cuando un objeto de esquema no nulo ya se haya especificado.
 
 # feature messages
-feature-not-supported = La funci\u00F3n "{0}" no est\u00E1 soportada.
-feature-not-recognized = La funci\u00F3n "{0}" no se ha reconocido.
-true-not-supported = El estado true para la funci\u00F3n ''{0}'' no est\u00E1 soportado.
-false-not-supported = El estado false para la funci\u00F3n ''{0}'' no est\u00E1 soportado.
-feature-read-only = La funci\u00F3n "{0}" es de s\u00F3lo lectura.
-jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: no se puede definir la funci\u00F3n en false cuando est\u00E1 presente el gestor de seguridad.
+feature-not-supported = La función "{0}" no está soportada.
+feature-not-recognized = La función "{0}" no se ha reconocido.
+true-not-supported = El estado true para la función ''{0}'' no está soportado.
+false-not-supported = El estado false para la función ''{0}'' no está soportado.
+feature-read-only = La función "{0}" es de sólo lectura.
+jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: no se puede definir la función en false cuando está presente el gestor de seguridad.
 
 # property messages
-property-not-supported = La propiedad "{0}" no est\u00E1 soportada.
+property-not-supported = La propiedad "{0}" no está soportada.
 property-not-recognized = La propiedad "{0}" no se ha reconocido.
-property-read-only = La propiedad "{0}" es de s\u00F3lo lectura.
-property-not-parsing-supported = La propiedad "{0}" no est\u00E1 soportada durante el an\u00E1lisis.
-dom-node-read-not-supported = No se puede leer la propiedad del nodo DOM. No existe el \u00E1rbol DOM.
+property-read-only = La propiedad "{0}" es de sólo lectura.
+property-not-parsing-supported = La propiedad "{0}" no está soportada durante el análisis.
+dom-node-read-not-supported = No se puede leer la propiedad del nodo DOM. No existe el árbol DOM.
 incompatible-class = El valor especificado para la propiedad ''{0}'' no se puede convertir en {1}.
 
-start-document-not-called=La propiedad "{0}" debe llamarse despu\u00E9s de que se haya devuelto el evento startDocument
-nullparameter=el par\u00E1metro de nombre para "{0}" es nulo
-errorHandlerNotSet=Advertencia: se activ\u00F3 la validaci\u00F3n pero no se defini\u00F3 un org.xml.sax.ErrorHandler, lo cual probablemente sea un resultado no deseado. El analizador utilizar\u00E1 un ErrorHandler por defecto para imprimir los primeros {0} errores. Llame al m\u00E9todo ''setErrorHandler'' para solucionarlo.
-errorHandlerDebugMsg=Error: URI = "{0}", L\u00EDnea = "{1}", : {2} 
+start-document-not-called=La propiedad "{0}" debe llamarse después de que se haya devuelto el evento startDocument
+nullparameter=el parámetro de nombre para "{0}" es nulo
+errorHandlerNotSet=Advertencia: se activó la validación pero no se definió un org.xml.sax.ErrorHandler, lo cual probablemente sea un resultado no deseado. El analizador utilizará un ErrorHandler por defecto para imprimir los primeros {0} errores. Llame al método ''setErrorHandler'' para solucionarlo.
+errorHandlerDebugMsg=Error: URI = "{0}", Línea = "{1}", : {2} 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties
index 17cecded65e..1f0e371e45f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties
@@ -29,31 +29,31 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 
-BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
+BadMessageKey = Le message d'erreur correspondant à la clé de message est introuvable.
 FormatFailed = Une erreur interne est survenue lors du formatage du message suivant :\n
 
 # JAXP messages
-schema-not-supported = La langue de sch\u00E9ma indiqu\u00E9e n'est pas prise en charge.
-jaxp-order-not-supported = La propri\u00E9t\u00E9 ''{0}'' doit \u00EAtre d\u00E9finie avant la propri\u00E9t\u00E9 ''{1}''. 
-schema-already-specified = La propri\u00E9t\u00E9 ''{0}'' ne peut pas \u00EAtre d\u00E9finie lorsqu''un objet de sch\u00E9ma non NULL a d\u00E9j\u00E0 \u00E9t\u00E9 indiqu\u00E9.
+schema-not-supported = La langue de schéma indiquée n'est pas prise en charge.
+jaxp-order-not-supported = La propriété ''{0}'' doit être définie avant la propriété ''{1}''. 
+schema-already-specified = La propriété ''{0}'' ne peut pas être définie lorsqu''un objet de schéma non NULL a déjà été indiqué.
 
 # feature messages
-feature-not-supported = La fonctionnalit\u00E9 ''{0}'' n''est pas prise en charge.
-feature-not-recognized = La fonctionnalit\u00E9 ''{0}'' n''est pas reconnue.
-true-not-supported = L''\u00E9tat True de la fonctionnalit\u00E9 ''{0}'' n''est pas pris en charge.
-false-not-supported = L''\u00E9tat False de la fonctionnalit\u00E9 ''{0}'' n''est pas pris en charge.
-feature-read-only = La fonctionnalit\u00E9 ''{0}''est accessible en lecture seule.
-jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING : impossible de d\u00E9finir la fonctionnalit\u00E9 sur False en pr\u00E9sence du gestionnaire de s\u00E9curit\u00E9.
+feature-not-supported = La fonctionnalité ''{0}'' n''est pas prise en charge.
+feature-not-recognized = La fonctionnalité ''{0}'' n''est pas reconnue.
+true-not-supported = L''état True de la fonctionnalité ''{0}'' n''est pas pris en charge.
+false-not-supported = L''état False de la fonctionnalité ''{0}'' n''est pas pris en charge.
+feature-read-only = La fonctionnalité ''{0}''est accessible en lecture seule.
+jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING : impossible de définir la fonctionnalité sur False en présence du gestionnaire de sécurité.
 
 # property messages
-property-not-supported = La propri\u00E9t\u00E9 ''{0}'' n''est pas prise en charge.
-property-not-recognized = La propri\u00E9t\u00E9 ''{0}'' n''est pas reconnue.
-property-read-only = La propri\u00E9t\u00E9 ''{0}'' est accessible en lecture seule.
-property-not-parsing-supported = La propri\u00E9t\u00E9 ''{0}'' n''est pas prise en charge au cours de l''analyse.
-dom-node-read-not-supported = Impossible de lire la propri\u00E9t\u00E9 de noeud DOM. Aucune arborescence DOM n'existe.
-incompatible-class = La valeur indiqu\u00E9e pour la propri\u00E9t\u00E9 ''{0}'' ne peut pas \u00EAtre convertie en {1}.
+property-not-supported = La propriété ''{0}'' n''est pas prise en charge.
+property-not-recognized = La propriété ''{0}'' n''est pas reconnue.
+property-read-only = La propriété ''{0}'' est accessible en lecture seule.
+property-not-parsing-supported = La propriété ''{0}'' n''est pas prise en charge au cours de l''analyse.
+dom-node-read-not-supported = Impossible de lire la propriété de noeud DOM. Aucune arborescence DOM n'existe.
+incompatible-class = La valeur indiquée pour la propriété ''{0}'' ne peut pas être convertie en {1}.
 
-start-document-not-called=La propri\u00E9t\u00E9 "{0}" doit \u00EAtre appel\u00E9e apr\u00E8s qu''un \u00E9v\u00E9nement startDocument est g\u00E9n\u00E9r\u00E9
-nullparameter=le param\u00E8tre de nom pour "{0}" est NULL
-errorHandlerNotSet=Avertissement : la validation a \u00E9t\u00E9 activ\u00E9e mais aucun \u00E9l\u00E9ment org.xml.sax.ErrorHandler n''a \u00E9t\u00E9 d\u00E9fini, ce qui devrait probablement \u00EAtre le cas. L''analyseur utilisera un gestionnaire d''erreurs par d\u00E9faut pour imprimer les {0} premi\u00E8res erreurs. Appelez la m\u00E9thode ''setErrorHandler'' pour r\u00E9soudre ce probl\u00E8me.
+start-document-not-called=La propriété "{0}" doit être appelée après qu''un événement startDocument est généré
+nullparameter=le paramètre de nom pour "{0}" est NULL
+errorHandlerNotSet=Avertissement : la validation a été activée mais aucun élément org.xml.sax.ErrorHandler n''a été défini, ce qui devrait probablement être le cas. L''analyseur utilisera un gestionnaire d''erreurs par défaut pour imprimer les {0} premières erreurs. Appelez la méthode ''setErrorHandler'' pour résoudre ce problème.
 errorHandlerDebugMsg=Erreur : URI = "{0}", ligne = "{1}", : {2} 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties
index c779be68515..ea999e0171b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties
@@ -30,30 +30,30 @@
 
 
 BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
-FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n
+FormatFailed = Si è verificato un errore interno durante la formattazione del seguente messaggio:\n
 
 # JAXP messages
-schema-not-supported = La lingua dello schema specificata non \u00E8 supportata.
-jaxp-order-not-supported = Impostare la propriet\u00E0 ''{0}'' prima di impostare la propriet\u00E0 ''{1}''. 
-schema-already-specified = Impossibile impostare la propriet\u00E0 ''{0}'' se \u00E8 gi\u00E0 stato specificato un oggetto di schema non nullo.
+schema-not-supported = La lingua dello schema specificata non è supportata.
+jaxp-order-not-supported = Impostare la proprietà ''{0}'' prima di impostare la proprietà ''{1}''. 
+schema-already-specified = Impossibile impostare la proprietà ''{0}'' se è già stato specificato un oggetto di schema non nullo.
 
 # feature messages
-feature-not-supported = La funzione "{0}" non \u00E8 supportata.
-feature-not-recognized = La funzione "{0}" non \u00E8 riconosciuta.
-true-not-supported = Lo stato true per la funzione "{0}" non \u00E8 supportato.
-false-not-supported = Lo stato false per la funzione "{0}" non \u00E8 supportato.
-feature-read-only = La funzione "{0}" \u00E8 di sola lettura.
-jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: impossibile impostare la funzione su false se \u00E8 presente Security Manager.
+feature-not-supported = La funzione "{0}" non è supportata.
+feature-not-recognized = La funzione "{0}" non è riconosciuta.
+true-not-supported = Lo stato true per la funzione "{0}" non è supportato.
+false-not-supported = Lo stato false per la funzione "{0}" non è supportato.
+feature-read-only = La funzione "{0}" è di sola lettura.
+jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: impossibile impostare la funzione su false se è presente Security Manager.
 
 # property messages
-property-not-supported = La propriet\u00E0 "{0}" non \u00E8 supportata.
-property-not-recognized = La propriet\u00E0 "{0}" non \u00E8 riconosciuta.
-property-read-only = La propriet\u00E0 "{0}" \u00E8 di sola lettura.
-property-not-parsing-supported = La propriet\u00E0 "{0}" non \u00E8 supportata durante l''analisi.
-dom-node-read-not-supported = Impossibile leggere la propriet\u00E0 di nodo DOM. Non esiste alcuna struttura DOM.
-incompatible-class = Impossibile eseguire la conversione cast del valore specificato per la propriet\u00E0 ''{0}'' in {1}.
+property-not-supported = La proprietà "{0}" non è supportata.
+property-not-recognized = La proprietà "{0}" non è riconosciuta.
+property-read-only = La proprietà "{0}" è di sola lettura.
+property-not-parsing-supported = La proprietà "{0}" non è supportata durante l''analisi.
+dom-node-read-not-supported = Impossibile leggere la proprietà di nodo DOM. Non esiste alcuna struttura DOM.
+incompatible-class = Impossibile eseguire la conversione cast del valore specificato per la proprietà ''{0}'' in {1}.
 
-start-document-not-called=Richiamare la propriet\u00E0 "{0}" dopo l''esecuzione dell''evento startDocument
-nullparameter=il parametro del nome per "{0}" \u00E8 nullo
-errorHandlerNotSet=Avvertenza: la convalida \u00E8 stata attivata, ma org.xml.sax.ErrorHandler non \u00E8 stato impostato, il che potrebbe essere un errore. Il parser utilizzer\u00E0 un ErrorHandler predefinito per visualizzare i primi {0} errori. Richiamare il metodo ''setErrorHandler'' per correggere questo problema.
+start-document-not-called=Richiamare la proprietà "{0}" dopo l''esecuzione dell''evento startDocument
+nullparameter=il parametro del nome per "{0}" è nullo
+errorHandlerNotSet=Avvertenza: la convalida è stata attivata, ma org.xml.sax.ErrorHandler non è stato impostato, il che potrebbe essere un errore. Il parser utilizzerà un ErrorHandler predefinito per visualizzare i primi {0} errori. Richiamare il metodo ''setErrorHandler'' per correggere questo problema.
 errorHandlerDebugMsg=Errore: URI = "{0}", riga = "{1}", : {2} 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
index beddd1ae0c7..ed8af93692c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
@@ -21,31 +21,31 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 
-BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n
+BadMessageKey = メッセージ・キーに対応するエラー・メッセージが見つかりません。
+FormatFailed = 次のメッセージの書式設定中に内部エラーが発生しました:\n
 
 # JAXP messages
-schema-not-supported = \u6307\u5B9A\u3057\u305F\u30B9\u30AD\u30FC\u30DE\u8A00\u8A9E\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-jaxp-order-not-supported = \u30D7\u30ED\u30D1\u30C6\u30A3''{1}''\u3092\u8A2D\u5B9A\u3059\u308B\u524D\u306B\u30D7\u30ED\u30D1\u30C6\u30A3''{0}''\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 
-schema-already-specified = null\u4EE5\u5916\u306E\u30B9\u30AD\u30FC\u30DE\u30FB\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304C\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30D7\u30ED\u30D1\u30C6\u30A3''{0}''\u306F\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
+schema-not-supported = 指定したスキーマ言語はサポートされていません。
+jaxp-order-not-supported = プロパティ''{1}''を設定する前にプロパティ''{0}''を設定する必要があります。 
+schema-already-specified = null以外のスキーマ・オブジェクトがすでに指定されている場合、プロパティ''{0}''は設定できません。
 
 # feature messages
-feature-not-supported = \u6A5F\u80FD''{0}''\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-feature-not-recognized = \u6A5F\u80FD''{0}''\u306F\u8A8D\u8B58\u3055\u308C\u307E\u305B\u3093\u3002
-true-not-supported = \u6A5F\u80FD''{0}''\u306Etrue\u306E\u72B6\u614B\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-false-not-supported = \u6A5F\u80FD''{0}''\u306Efalse\u306E\u72B6\u614B\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-feature-read-only = \u6A5F\u80FD''{0}''\u306F\u8AAD\u53D6\u308A\u5C02\u7528\u3067\u3059\u3002
-jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: \u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u304C\u5B58\u5728\u3059\u308B\u3068\u304D\u3001\u6A5F\u80FD\u3092false\u306B\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
+feature-not-supported = 機能''{0}''はサポートされていません。
+feature-not-recognized = 機能''{0}''は認識されません。
+true-not-supported = 機能''{0}''のtrueの状態はサポートされていません。
+false-not-supported = 機能''{0}''のfalseの状態はサポートされていません。
+feature-read-only = 機能''{0}''は読取り専用です。
+jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: セキュリティ・マネージャが存在するとき、機能をfalseに設定できません。
 
 # property messages
-property-not-supported = \u30D7\u30ED\u30D1\u30C6\u30A3''{0}''\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-property-not-recognized = \u30D7\u30ED\u30D1\u30C6\u30A3''{0}''\u306F\u8A8D\u8B58\u3055\u308C\u307E\u305B\u3093\u3002
-property-read-only = \u30D7\u30ED\u30D1\u30C6\u30A3''{0}''\u306F\u8AAD\u53D6\u308A\u5C02\u7528\u3067\u3059\u3002
-property-not-parsing-supported = \u89E3\u6790\u4E2D\u306B\u306F\u30D7\u30ED\u30D1\u30C6\u30A3''{0}''\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-dom-node-read-not-supported = DOM\u30CE\u30FC\u30C9\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093\u3002DOM\u30C4\u30EA\u30FC\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
-incompatible-class = \u30D7\u30ED\u30D1\u30C6\u30A3''{0}''\u306B\u6307\u5B9A\u3057\u305F\u5024\u306F{1}\u306B\u30AD\u30E3\u30B9\u30C8\u3067\u304D\u307E\u305B\u3093\u3002
+property-not-supported = プロパティ''{0}''はサポートされていません。
+property-not-recognized = プロパティ''{0}''は認識されません。
+property-read-only = プロパティ''{0}''は読取り専用です。
+property-not-parsing-supported = 解析中にはプロパティ''{0}''はサポートされていません。
+dom-node-read-not-supported = DOMノード・プロパティを読み取れません。DOMツリーが存在しません。
+incompatible-class = プロパティ''{0}''に指定した値は{1}にキャストできません。
 
-start-document-not-called=startDocument\u30A4\u30D9\u30F3\u30C8\u304C\u30B9\u30ED\u30FC\u3055\u308C\u305F\u5F8C\u3001\u30D7\u30ED\u30D1\u30C6\u30A3"{0}"\u3092\u547C\u3073\u51FA\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-nullparameter="{0}"\u306E\u540D\u524D\u30D1\u30E9\u30E1\u30FC\u30BF\u304Cnull\u3067\u3059
-errorHandlerNotSet=\u8B66\u544A: \u691C\u8A3C\u306F\u30AA\u30F3\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u304C\u3001org.xml.sax.ErrorHandler\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5FC5\u8981\u3068\u3055\u308C\u3066\u3044\u308B\u30CF\u30F3\u30C9\u30E9\u306F\u3053\u306E\u30CF\u30F3\u30C9\u30E9\u3067\u306F\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u30D1\u30FC\u30B5\u30FC\u3067\u306F\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306EErrorHandler\u3092\u4F7F\u7528\u3057\u3066\u6700\u521D\u306E{0}\u30A8\u30E9\u30FC\u304C\u51FA\u529B\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u554F\u984C\u3092\u4FEE\u6B63\u3059\u308B\u306B\u306F\u3001''setErrorHandler''\u30E1\u30BD\u30C3\u30C9\u3092\u547C\u3073\u51FA\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-errorHandlerDebugMsg=\u30A8\u30E9\u30FC: URI = "{0}"\u3001\u884C = "{1}"\u3001: {2} 
+start-document-not-called=startDocumentイベントがスローされた後、プロパティ"{0}"を呼び出す必要があります
+nullparameter="{0}"の名前パラメータがnullです
+errorHandlerNotSet=警告: 検証はオンになっていますが、org.xml.sax.ErrorHandlerが設定されていません。必要とされているハンドラはこのハンドラではない可能性があります。パーサーでは、デフォルトのErrorHandlerを使用して最初の{0}エラーが出力されます。この問題を修正するには、''setErrorHandler''メソッドを呼び出してください。
+errorHandlerDebugMsg=エラー: URI = "{0}"、行 = "{1}"、: {2} 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties
index 284791f5129..5b9e80a351f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties
@@ -29,31 +29,31 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 
-BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n
+BadMessageKey = 메시지 키에 해당하는 오류 메시지를 찾을 수 없습니다.
+FormatFailed = 다음 메시지의 형식을 지정하는 중 내부 오류가 발생했습니다.\n
 
 # JAXP messages
-schema-not-supported = \uC9C0\uC815\uB41C \uC2A4\uD0A4\uB9C8 \uC5B8\uC5B4\uB294 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-jaxp-order-not-supported = ''{1}'' \uC18D\uC131\uC744 \uC124\uC815\uD558\uAE30 \uC804\uC5D0 ''{0}'' \uC18D\uC131\uC744 \uC124\uC815\uD574\uC57C \uD569\uB2C8\uB2E4. 
-schema-already-specified = \uB110\uC774 \uC544\uB2CC \uC2A4\uD0A4\uB9C8 \uAC1D\uCCB4\uAC00 \uC774\uBBF8 \uC9C0\uC815\uB41C \uACBD\uC6B0 ''{0}'' \uC18D\uC131\uC744 \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+schema-not-supported = 지정된 스키마 언어는 지원되지 않습니다.
+jaxp-order-not-supported = ''{1}'' 속성을 설정하기 전에 ''{0}'' 속성을 설정해야 합니다. 
+schema-already-specified = 널이 아닌 스키마 객체가 이미 지정된 경우 ''{0}'' 속성을 설정할 수 없습니다.
 
 # feature messages
-feature-not-supported = ''{0}'' \uAE30\uB2A5\uC740 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-feature-not-recognized = ''{0}'' \uAE30\uB2A5\uC744 \uC778\uC2DD\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-true-not-supported = ''{0}'' \uAE30\uB2A5\uC758 True \uC0C1\uD0DC\uB294 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-false-not-supported = ''{0}'' \uAE30\uB2A5\uC758 False \uC0C1\uD0DC\uB294 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-feature-read-only = ''{0}'' \uAE30\uB2A5\uC740 \uC77D\uAE30 \uC804\uC6A9\uC785\uB2C8\uB2E4.
-jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: \uBCF4\uC548 \uAD00\uB9AC\uC790\uAC00 \uC788\uC744 \uACBD\uC6B0 \uAE30\uB2A5\uC744 false\uB85C \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+feature-not-supported = ''{0}'' 기능은 지원되지 않습니다.
+feature-not-recognized = ''{0}'' 기능을 인식할 수 없습니다.
+true-not-supported = ''{0}'' 기능의 True 상태는 지원되지 않습니다.
+false-not-supported = ''{0}'' 기능의 False 상태는 지원되지 않습니다.
+feature-read-only = ''{0}'' 기능은 읽기 전용입니다.
+jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: 보안 관리자가 있을 경우 기능을 false로 설정할 수 없습니다.
 
 # property messages
-property-not-supported = ''{0}'' \uC18D\uC131\uC740 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-property-not-recognized = ''{0}'' \uC18D\uC131\uC744 \uC778\uC2DD\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-property-read-only = ''{0}'' \uC18D\uC131\uC740 \uC77D\uAE30 \uC804\uC6A9\uC785\uB2C8\uB2E4.
-property-not-parsing-supported = \uAD6C\uBB38 \uBD84\uC11D \uC911 ''{0}'' \uC18D\uC131\uC740 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-dom-node-read-not-supported = DOM \uB178\uB4DC \uC18D\uC131\uC744 \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. DOM \uD2B8\uB9AC\uAC00 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-incompatible-class = ''{0}'' \uC18D\uC131\uC5D0 \uB300\uD574 \uC9C0\uC815\uB41C \uAC12\uC758 \uB370\uC774\uD130\uD615\uC744 {1}(\uC73C)\uB85C \uBCC0\uD658\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+property-not-supported = ''{0}'' 속성은 지원되지 않습니다.
+property-not-recognized = ''{0}'' 속성을 인식할 수 없습니다.
+property-read-only = ''{0}'' 속성은 읽기 전용입니다.
+property-not-parsing-supported = 구문 분석 중 ''{0}'' 속성은 지원되지 않습니다.
+dom-node-read-not-supported = DOM 노드 속성을 읽을 수 없습니다. DOM 트리가 존재하지 않습니다.
+incompatible-class = ''{0}'' 속성에 대해 지정된 값의 데이터형을 {1}(으)로 변환할 수 없습니다.
 
-start-document-not-called="{0}" \uC18D\uC131\uC740 startDocument \uC774\uBCA4\uD2B8\uAC00 \uBC1C\uC0DD\uB41C \uD6C4 \uD638\uCD9C\uD574\uC57C \uD569\uB2C8\uB2E4.
-nullparameter="{0}"\uC5D0 \uB300\uD55C \uC774\uB984 \uB9E4\uAC1C\uBCC0\uC218\uAC00 \uB110\uC785\uB2C8\uB2E4.
-errorHandlerNotSet=\uACBD\uACE0: \uAC80\uC99D\uC774 \uC124\uC815\uB418\uC5C8\uC9C0\uB9CC org.xml.sax.ErrorHandler\uAC00 \uC801\uC808\uD788 \uC124\uC815\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4. \uAD6C\uBB38 \uBD84\uC11D\uAE30\uAC00 \uAE30\uBCF8 ErrorHandler\uB97C \uC0AC\uC6A9\uD558\uC5EC \uCC98\uC74C {0}\uAC1C\uC758 \uC624\uB958\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4. \uC774 \uC624\uB958\uB97C \uC218\uC815\uD558\uB824\uBA74 ''setErrorHandler'' \uBA54\uC18C\uB4DC\uB97C \uD638\uCD9C\uD558\uC2ED\uC2DC\uC624.
-errorHandlerDebugMsg=\uC624\uB958: URI = "{0}", \uD589 = "{1}", : {2} 
+start-document-not-called="{0}" 속성은 startDocument 이벤트가 발생된 후 호출해야 합니다.
+nullparameter="{0}"에 대한 이름 매개변수가 널입니다.
+errorHandlerNotSet=경고: 검증이 설정되었지만 org.xml.sax.ErrorHandler가 적절히 설정되지 않았습니다. 구문 분석기가 기본 ErrorHandler를 사용하여 처음 {0}개의 오류를 인쇄합니다. 이 오류를 수정하려면 ''setErrorHandler'' 메소드를 호출하십시오.
+errorHandlerDebugMsg=오류: URI = "{0}", 행 = "{1}", : {2} 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties
index 6e708459485..b60b2f5e553 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties
@@ -29,31 +29,31 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 
-BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
+BadMessageKey = Não foi possível encontrar a mensagem de erro correspondente à chave da mensagem.
 FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n
 
 # JAXP messages
-schema-not-supported = O idioma do esquema especificado n\u00E3o \u00E9 suportado.
-jaxp-order-not-supported = A propriedade ''{0}'' deve ser definida antes da defini\u00E7\u00E3o da propriedade ''{1}''. 
-schema-already-specified = A propriedade ''{0}'' n\u00E3o pode ser definida quando um objeto do Esquema n\u00E3o nulo j\u00E1 tiver sido especificado.
+schema-not-supported = O idioma do esquema especificado não é suportado.
+jaxp-order-not-supported = A propriedade ''{0}'' deve ser definida antes da definição da propriedade ''{1}''. 
+schema-already-specified = A propriedade ''{0}'' não pode ser definida quando um objeto do Esquema não nulo já tiver sido especificado.
 
 # feature messages
-feature-not-supported = O recurso ''{0}'' n\u00E3o \u00E9 suportado.
-feature-not-recognized = O recurso ''{0}'' n\u00E3o \u00E9 reconhecido.
-true-not-supported = Estado verdadeiro do recurso ''{0}'' n\u00E3o suportado.
-false-not-supported = Estado falso do recurso ''{0}'' n\u00E3o suportado.
-feature-read-only = O recurso ''{0}'' \u00E9 somente para leitura.
-jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: N\u00E3o \u00E9 poss\u00EDvel definir o recurso como falso quando o gerenciador de seguran\u00E7a est\u00E1 presente.
+feature-not-supported = O recurso ''{0}'' não é suportado.
+feature-not-recognized = O recurso ''{0}'' não é reconhecido.
+true-not-supported = Estado verdadeiro do recurso ''{0}'' não suportado.
+false-not-supported = Estado falso do recurso ''{0}'' não suportado.
+feature-read-only = O recurso ''{0}'' é somente para leitura.
+jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: Não é possível definir o recurso como falso quando o gerenciador de segurança está presente.
 
 # property messages
-property-not-supported = A propriedade ''{0}'' n\u00E3o \u00E9 suportada.
-property-not-recognized = A propriedade ''{0}'' n\u00E3o \u00E9 reconhecida.
-property-read-only = A propriedade ''{0}'' \u00E9 somente para leitura.
-property-not-parsing-supported = A propriedade ''{0}'' n\u00E3o \u00E9 suportada durante o parsing.
-dom-node-read-not-supported = N\u00E3o \u00E9 poss\u00EDvel ler a propriedade do n\u00F3 de DOM. N\u00E3o existe uma \u00E1rvore de DOM.
-incompatible-class = O valor especificado para a propriedade ''{0}'' n\u00E3o pode ser transmitido para ''{1}''.
+property-not-supported = A propriedade ''{0}'' não é suportada.
+property-not-recognized = A propriedade ''{0}'' não é reconhecida.
+property-read-only = A propriedade ''{0}'' é somente para leitura.
+property-not-parsing-supported = A propriedade ''{0}'' não é suportada durante o parsing.
+dom-node-read-not-supported = Não é possível ler a propriedade do nó de DOM. Não existe uma árvore de DOM.
+incompatible-class = O valor especificado para a propriedade ''{0}'' não pode ser transmitido para ''{1}''.
 
-start-document-not-called=A propriedade "{0}" deve ser chamada ap\u00F3s o evento startDocument ser lan\u00E7ado
-nullparameter=o par\u00E2metro de nome de "{0}" \u00E9 nulo
-errorHandlerNotSet=Advert\u00EAncia: A valida\u00E7\u00E3o foi ativada, mas um org.xml.sax.ErrorHandler n\u00E3o foi definido, provavelmente porque n\u00E3o era necess\u00E1rio. O parser usar\u00E1 um ErrorHandler padr\u00E3o para imprimir os primeiros {0} erros. Chame o m\u00E9todo ''setErrorHandler'' para corrigir o problema.
+start-document-not-called=A propriedade "{0}" deve ser chamada após o evento startDocument ser lançado
+nullparameter=o parâmetro de nome de "{0}" é nulo
+errorHandlerNotSet=Advertência: A validação foi ativada, mas um org.xml.sax.ErrorHandler não foi definido, provavelmente porque não era necessário. O parser usará um ErrorHandler padrão para imprimir os primeiros {0} erros. Chame o método ''setErrorHandler'' para corrigir o problema.
 errorHandlerDebugMsg=Erro: URI = "{0}", Linha = "{1}", : {2} 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties
index 5088946e609..cdd56145d37 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties
@@ -30,30 +30,30 @@
 
 
 BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
-FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
+FormatFailed = Ett internt fel inträffade vid formatering av följande meddelande:\n
 
 # JAXP messages
-schema-not-supported = Angivet schemaspr\u00E5k st\u00F6ds inte.
-jaxp-order-not-supported = Egenskapen ''{0}'' m\u00E5ste anges f\u00F6re inst\u00E4llning av egenskapen ''{1}''. 
-schema-already-specified = Egenskapen ''{0}'' kan inte anges om ett Schema-objekt som \u00E4r icke-null redan har angetts.
+schema-not-supported = Angivet schemaspråk stöds inte.
+jaxp-order-not-supported = Egenskapen ''{0}'' måste anges före inställning av egenskapen ''{1}''. 
+schema-already-specified = Egenskapen ''{0}'' kan inte anges om ett Schema-objekt som är icke-null redan har angetts.
 
 # feature messages
-feature-not-supported = Funktionen ''{0}'' st\u00F6ds inte.
-feature-not-recognized = Funktionen ''{0}'' \u00E4r ok\u00E4nd.
-true-not-supported = True-tillst\u00E5nd f\u00F6r funktionen ''{0}'' st\u00F6ds inte.
-false-not-supported = False-tillst\u00E5nd f\u00F6r funktionen ''{0}'' st\u00F6ds inte.
-feature-read-only = Funktionen ''{0}'' \u00E4r skrivskyddad.
-jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: Funktionen kan inte anges till false om s\u00E4kerhetshanteraren anv\u00E4nds.
+feature-not-supported = Funktionen ''{0}'' stöds inte.
+feature-not-recognized = Funktionen ''{0}'' är okänd.
+true-not-supported = True-tillstånd för funktionen ''{0}'' stöds inte.
+false-not-supported = False-tillstånd för funktionen ''{0}'' stöds inte.
+feature-read-only = Funktionen ''{0}'' är skrivskyddad.
+jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: Funktionen kan inte anges till false om säkerhetshanteraren används.
 
 # property messages
-property-not-supported = Egenskapen ''{0}'' st\u00F6ds inte.
-property-not-recognized = Egenskapen ''{0}'' \u00E4r ok\u00E4nd.
-property-read-only = Egenskapen ''{0}'' \u00E4r skrivskyddad.
-property-not-parsing-supported = Egenskapen ''{0}'' st\u00F6ds inte vid tolkning.
-dom-node-read-not-supported = Kan inte l\u00E4sa egenskap f\u00F6r DOM-nod. Det finns inget DOM-tr\u00E4d.
-incompatible-class = V\u00E4rdet angivet f\u00F6r egenskapen ''{0}'' kan inte omvandlas till {1}.
+property-not-supported = Egenskapen ''{0}'' stöds inte.
+property-not-recognized = Egenskapen ''{0}'' är okänd.
+property-read-only = Egenskapen ''{0}'' är skrivskyddad.
+property-not-parsing-supported = Egenskapen ''{0}'' stöds inte vid tolkning.
+dom-node-read-not-supported = Kan inte läsa egenskap för DOM-nod. Det finns inget DOM-träd.
+incompatible-class = Värdet angivet för egenskapen ''{0}'' kan inte omvandlas till {1}.
 
-start-document-not-called=Egenskapen "{0}" b\u00F6r anropas efter startDocument-h\u00E4ndelsen utl\u00F6ses
-nullparameter=namnparametern f\u00F6r "{0}" \u00E4r null
-errorHandlerNotSet=Varning: valideringen startades, men det fanns ingen angiven org.xml.sax.ErrorHandler. Parser anv\u00E4nder ErrorHandler av standardtyp vid utskrift av de f\u00F6rsta {0} felen. Korrigera felet genom anrop av setErrorHandler-metoden.
+start-document-not-called=Egenskapen "{0}" bör anropas efter startDocument-händelsen utlöses
+nullparameter=namnparametern för "{0}" är null
+errorHandlerNotSet=Varning: valideringen startades, men det fanns ingen angiven org.xml.sax.ErrorHandler. Parser använder ErrorHandler av standardtyp vid utskrift av de första {0} felen. Korrigera felet genom anrop av setErrorHandler-metoden.
 errorHandlerDebugMsg=Fel: URI = "{0}", Rad = "{1}", : {2} 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
index 39f23c199ab..617839234d5 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
@@ -21,31 +21,31 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 
-BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
-FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n
+BadMessageKey = 找不到与消息关键字对应的错误消息。
+FormatFailed = 设置以下消息的格式时出现内部错误:\n
 
 # JAXP messages
-schema-not-supported = \u4E0D\u652F\u6301\u6307\u5B9A\u7684\u65B9\u6848\u8BED\u8A00\u3002
-jaxp-order-not-supported = \u5FC5\u987B\u5728\u8BBE\u7F6E\u5C5E\u6027 ''{1}'' \u4E4B\u524D\u8BBE\u7F6E\u5C5E\u6027 ''{0}''\u3002
-schema-already-specified = \u65E0\u6CD5\u5728\u6307\u5B9A\u4E86\u975E\u7A7A Schema \u5BF9\u8C61\u7684\u60C5\u51B5\u4E0B\u8BBE\u7F6E\u5C5E\u6027 ''{0}''\u3002
+schema-not-supported = 不支持指定的方案语言。
+jaxp-order-not-supported = 必须在设置属性 ''{1}'' 之前设置属性 ''{0}''。
+schema-already-specified = 无法在指定了非空 Schema 对象的情况下设置属性 ''{0}''。
 
 # feature messages
-feature-not-supported = \u4E0D\u652F\u6301\u529F\u80FD ''{0}''\u3002
-feature-not-recognized = \u65E0\u6CD5\u8BC6\u522B\u529F\u80FD ''{0}''\u3002
-true-not-supported = \u4E0D\u652F\u6301\u529F\u80FD ''{0}'' \u7684\u201C\u771F\u201D\u72B6\u6001\u3002
-false-not-supported = \u4E0D\u652F\u6301\u529F\u80FD ''{0}'' \u7684\u201C\u5047\u201D\u72B6\u6001\u3002
-feature-read-only = \u529F\u80FD ''{0}'' \u4E3A\u53EA\u8BFB\u3002
-jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: \u5B58\u5728 Security Manager \u65F6, \u65E0\u6CD5\u5C06\u6B64\u529F\u80FD\u8BBE\u7F6E\u4E3A\u201C\u5047\u201D\u3002
+feature-not-supported = 不支持功能 ''{0}''。
+feature-not-recognized = 无法识别功能 ''{0}''。
+true-not-supported = 不支持功能 ''{0}'' 的“真”状态。
+false-not-supported = 不支持功能 ''{0}'' 的“假”状态。
+feature-read-only = 功能 ''{0}'' 为只读。
+jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: 存在 Security Manager 时, 无法将此功能设置为“假”。
 
 # property messages
-property-not-supported = \u4E0D\u652F\u6301\u5C5E\u6027 ''{0}''\u3002
-property-not-recognized = \u65E0\u6CD5\u8BC6\u522B\u5C5E\u6027 ''{0}''\u3002
-property-read-only = \u5C5E\u6027 ''{0}'' \u4E3A\u53EA\u8BFB\u3002
-property-not-parsing-supported = \u89E3\u6790\u65F6\u4E0D\u652F\u6301\u5C5E\u6027 ''{0}''\u3002
-dom-node-read-not-supported = \u65E0\u6CD5\u8BFB\u53D6 DOM \u8282\u70B9\u5C5E\u6027\u3002\u4E0D\u5B58\u5728 DOM \u6811\u3002
-incompatible-class = \u4E3A\u5C5E\u6027 ''{0}'' \u6307\u5B9A\u7684\u503C\u4E0D\u80FD\u8F6C\u6362\u4E3A{1}\u3002
+property-not-supported = 不支持属性 ''{0}''。
+property-not-recognized = 无法识别属性 ''{0}''。
+property-read-only = 属性 ''{0}'' 为只读。
+property-not-parsing-supported = 解析时不支持属性 ''{0}''。
+dom-node-read-not-supported = 无法读取 DOM 节点属性。不存在 DOM 树。
+incompatible-class = 为属性 ''{0}'' 指定的值不能转换为{1}。
 
-start-document-not-called=\u5E94\u5728\u629B\u51FA startDocument \u4E8B\u4EF6\u540E\u8C03\u7528\u5C5E\u6027 "{0}"
-nullparameter="{0}" \u7684\u540D\u79F0\u53C2\u6570\u4E3A\u7A7A\u503C
-errorHandlerNotSet=\u8B66\u544A: \u5DF2\u542F\u7528\u9A8C\u8BC1, \u4F46\u672A\u8BBE\u7F6E org.xml.sax.ErrorHandler, \u8FD9\u53EF\u80FD\u4E0D\u662F\u9884\u671F\u7ED3\u679C\u3002\u89E3\u6790\u5668\u5C06\u4F7F\u7528\u9ED8\u8BA4 ErrorHandler \u6765\u8F93\u51FA\u524D {0} \u4E2A\u9519\u8BEF\u3002\u8BF7\u8C03\u7528 ''setErrorHandler'' \u65B9\u6CD5\u4EE5\u89E3\u51B3\u6B64\u95EE\u9898\u3002
-errorHandlerDebugMsg=\u9519\u8BEF: URI = "{0}", \u884C = "{1}", : {2} 
+start-document-not-called=应在抛出 startDocument 事件后调用属性 "{0}"
+nullparameter="{0}" 的名称参数为空值
+errorHandlerNotSet=警告: 已启用验证, 但未设置 org.xml.sax.ErrorHandler, 这可能不是预期结果。解析器将使用默认 ErrorHandler 来输出前 {0} 个错误。请调用 ''setErrorHandler'' 方法以解决此问题。
+errorHandlerDebugMsg=错误: URI = "{0}", 行 = "{1}", : {2} 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties
index 91902b973b7..e98bda31111 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties
@@ -29,31 +29,31 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 
-BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
-FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
+BadMessageKey = 找不到對應訊息索引鍵的錯誤訊息。
+FormatFailed = 格式化下列訊息時發生內部錯誤:\n
 
 # JAXP messages
-schema-not-supported = \u4E0D\u652F\u63F4\u6307\u5B9A\u7684\u7DB1\u8981\u8A9E\u8A00\u3002
-jaxp-order-not-supported = \u8A2D\u5B9A\u5C6C\u6027 ''{1}'' \u4E4B\u524D\uFF0C\u5FC5\u9808\u8A2D\u5B9A\u5C6C\u6027 ''{0}''\u3002
-schema-already-specified = \u5DF2\u7D93\u6307\u5B9A\u975E\u7A7A\u503C\u7DB1\u8981\u7269\u4EF6\u6642\uFF0C\u7121\u6CD5\u8A2D\u5B9A\u5C6C\u6027 ''{0}''\u3002
+schema-not-supported = 不支援指定的綱要語言。
+jaxp-order-not-supported = 設定屬性 ''{1}'' 之前，必須設定屬性 ''{0}''。
+schema-already-specified = 已經指定非空值綱要物件時，無法設定屬性 ''{0}''。
 
 # feature messages
-feature-not-supported = \u4E0D\u652F\u63F4\u529F\u80FD ''{0}''\u3002
-feature-not-recognized = \u7121\u6CD5\u8FA8\u8B58\u529F\u80FD ''{0}''\u3002
-true-not-supported = \u4E0D\u652F\u63F4\u529F\u80FD ''{0}'' \u7684\u771F\u72C0\u614B\u3002
-false-not-supported = \u4E0D\u652F\u63F4\u529F\u80FD ''{0}'' \u7684\u507D\u72C0\u614B\u3002
-feature-read-only = \u529F\u80FD ''{0}'' \u70BA\u552F\u8B80\u3002
-jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: \u5B89\u5168\u7BA1\u7406\u7A0B\u5F0F\u5B58\u5728\u6642\uFF0C\u7121\u6CD5\u5C07\u529F\u80FD\u8A2D\u70BA\u507D\u3002
+feature-not-supported = 不支援功能 ''{0}''。
+feature-not-recognized = 無法辨識功能 ''{0}''。
+true-not-supported = 不支援功能 ''{0}'' 的真狀態。
+false-not-supported = 不支援功能 ''{0}'' 的偽狀態。
+feature-read-only = 功能 ''{0}'' 為唯讀。
+jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: 安全管理程式存在時，無法將功能設為偽。
 
 # property messages
-property-not-supported = \u4E0D\u652F\u63F4\u5C6C\u6027 ''{0}''\u3002
-property-not-recognized = \u7121\u6CD5\u8FA8\u8B58\u5C6C\u6027 ''{0}''\u3002
-property-read-only = \u5C6C\u6027 ''{0}'' \u70BA\u552F\u8B80\u3002
-property-not-parsing-supported = \u5256\u6790\u6642\u4E0D\u652F\u63F4\u5C6C\u6027 ''{0}''\u3002
-dom-node-read-not-supported = \u7121\u6CD5\u8B80\u53D6 DOM \u7BC0\u9EDE\u5C6C\u6027\u3002DOM \u6A39\u72C0\u7D50\u69CB\u4E0D\u5B58\u5728\u3002
-incompatible-class = \u70BA\u5C6C\u6027 ''{0}'' \u6307\u5B9A\u7684\u503C\u4E0D\u53EF\u8F49\u63DB\u70BA {1}\u3002
+property-not-supported = 不支援屬性 ''{0}''。
+property-not-recognized = 無法辨識屬性 ''{0}''。
+property-read-only = 屬性 ''{0}'' 為唯讀。
+property-not-parsing-supported = 剖析時不支援屬性 ''{0}''。
+dom-node-read-not-supported = 無法讀取 DOM 節點屬性。DOM 樹狀結構不存在。
+incompatible-class = 為屬性 ''{0}'' 指定的值不可轉換為 {1}。
 
-start-document-not-called=\u767C\u751F startDocument \u4E8B\u4EF6\u4E4B\u5F8C\uFF0C\u61C9\u547C\u53EB\u5C6C\u6027 "{0}"\u3002
-nullparameter="{0}" \u7684\u540D\u7A31\u53C3\u6578\u70BA\u7A7A\u503C
-errorHandlerNotSet=\u8B66\u544A: \u5DF2\u958B\u555F\u9A57\u8B49\uFF0C\u4F46\u662F\u672A\u8A2D\u5B9A org.xml.sax.ErrorHandler\uFF0C\u9019\u53EF\u80FD\u4E0D\u662F\u6240\u8981\u7684\u72C0\u614B\u3002\u5256\u6790\u5668\u5C07\u4F7F\u7528\u9810\u8A2D\u7684 ErrorHandler \u4F86\u5217\u5370\u7B2C\u4E00\u500B {0} \u932F\u8AA4\u3002\u8ACB\u547C\u53EB ''setErrorHandler'' \u65B9\u6CD5\u4F86\u4FEE\u6B63\u6B64\u554F\u984C\u3002
-errorHandlerDebugMsg=\u932F\u8AA4: URI = "{0}"\uFF0C\u884C = "{1}"\uFF0C: {2} 
+start-document-not-called=發生 startDocument 事件之後，應呼叫屬性 "{0}"。
+nullparameter="{0}" 的名稱參數為空值
+errorHandlerNotSet=警告: 已開啟驗證，但是未設定 org.xml.sax.ErrorHandler，這可能不是所要的狀態。剖析器將使用預設的 ErrorHandler 來列印第一個 {0} 錯誤。請呼叫 ''setErrorHandler'' 方法來修正此問題。
+errorHandlerDebugMsg=錯誤: URI = "{0}"，行 = "{1}"，: {2} 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
index 59a94a7c48b..90ae689b949 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
@@ -16,37 +16,37 @@
 #
 
 # Messages for message reporting
-BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
+BadMessageKey = Die zum Meldungsschlüssel gehörige Fehlermeldung kann nicht gefunden werden.
 FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n  
 
 # Messages for erroneous input
 NoFallback = "include" mit href "{0}" nicht erfolgreich, und es wurde kein "fallback"-Element gefunden.
-MultipleFallbacks = Die [untergeordneten Elemente] eines "include"-Elements k\u00F6nnen nicht mehrere "fallback"-Elemente enthalten.
-FallbackParent = Ein "fallback"-Element wurde gefunden, f\u00FCr das "include" nicht das \u00FCbergeordnete Element war.
-IncludeChild = Andere Elemente aus Namespace "http://www.w3.org/2001/XInclude" als "fallback" d\u00FCrfen keine untergeordneten Elemente von "include"-Elementen sein. Es wurde aber "{0}" gefunden.
-FallbackChild = Andere Elemente aus Namespace "http://www.w3.org/2001/XInclude" als "include" d\u00FCrfen keine untergeordneten Elemente von "fallback"-Elementen sein. Es wurde aber "{0}" gefunden.
+MultipleFallbacks = Die [untergeordneten Elemente] eines "include"-Elements können nicht mehrere "fallback"-Elemente enthalten.
+FallbackParent = Ein "fallback"-Element wurde gefunden, für das "include" nicht das übergeordnete Element war.
+IncludeChild = Andere Elemente aus Namespace "http://www.w3.org/2001/XInclude" als "fallback" dürfen keine untergeordneten Elemente von "include"-Elementen sein. Es wurde aber "{0}" gefunden.
+FallbackChild = Andere Elemente aus Namespace "http://www.w3.org/2001/XInclude" als "include" dürfen keine untergeordneten Elemente von "fallback"-Elementen sein. Es wurde aber "{0}" gefunden.
 HrefMissing = "href"-Attribut eines "include"-Elements fehlt.
 RecursiveInclude = Rekursives "include" ermittelt. Dokument "{0}" wurde bereits verarbeitet.
-InvalidParseValue = Ung\u00FCltiger Wert f\u00FCr "parse"-Attribut bei "include"-Element: "{0}".
+InvalidParseValue = Ungültiger Wert für "parse"-Attribut bei "include"-Element: "{0}".
 XMLParseError = Fehler beim Versuch, XML-Datei zu parsen (href=''{0}''). Ursache: {1}
-XMLResourceError = Include-Vorgang nicht erfolgreich. Zur\u00FCck zu Fallback. Ressourcenfehler beim Lesen der Datei als XML (href="{0}"). Grund: {1}
-TextResourceError = Include-Vorgang nicht erfolgreich. Zur\u00FCck zu Fallback. Ressourcenfehler beim Lesen der Datei als Text (href="{0}"). Grund: {1}
-NO_XPointerSchema = Schema f\u00FCr "{0}" wird standardm\u00E4\u00DFig nicht unterst\u00FCtzt. Definieren Sie Ihr eigenes Schema f\u00FCr {0}. Siehe http://apache.org/xml/properties/xpointer-schema
-NO_SubResourceIdentified = Keine Subressource von XPointer-Prozessor f\u00FCr Zeiger {0} identifiziert.
+XMLResourceError = Include-Vorgang nicht erfolgreich. Zurück zu Fallback. Ressourcenfehler beim Lesen der Datei als XML (href="{0}"). Grund: {1}
+TextResourceError = Include-Vorgang nicht erfolgreich. Zurück zu Fallback. Ressourcenfehler beim Lesen der Datei als Text (href="{0}"). Grund: {1}
+NO_XPointerSchema = Schema für "{0}" wird standardmäßig nicht unterstützt. Definieren Sie Ihr eigenes Schema für {0}. Siehe http://apache.org/xml/properties/xpointer-schema
+NO_SubResourceIdentified = Keine Subressource von XPointer-Prozessor für Zeiger {0} identifiziert.
 NonDuplicateNotation = Mehrere Notationen mit dem Namen "{0}" wurden verwendet, die aber nicht als Duplikate ermittelt wurden.
 NonDuplicateUnparsedEntity = Mehrere nicht geparste Entitys mit dem Namen "{0}" wurden verwendet, die aber nicht als Duplikate ermittelt wurden.
 XpointerMissing = xpointer-Attribut muss vorhanden sein, wenn href-Attribut fehlt.
-AcceptMalformed = Zeichen au\u00DFerhalb des Bereichs #x20 bis #x7E sind im Wert des "accept"-Attributs eines "include"-Elements nicht zul\u00E4ssig.
-AcceptLanguageMalformed = Zeichen au\u00DFerhalb des Bereichs #x20 bis #x7E sind im Wert des "accept-language"-Attributs eines "include"-Elements nicht zul\u00E4ssig.
-RootElementRequired = F\u00FCr ein ordnungsgem\u00E4\u00DF formatiertes Dokument ist ein Root-Element erforderlich.
-MultipleRootElements = Ein ordnungsgem\u00E4\u00DF formatiertes Dokument darf nicht mehrere Root-Elemente enthalten.
+AcceptMalformed = Zeichen außerhalb des Bereichs #x20 bis #x7E sind im Wert des "accept"-Attributs eines "include"-Elements nicht zulässig.
+AcceptLanguageMalformed = Zeichen außerhalb des Bereichs #x20 bis #x7E sind im Wert des "accept-language"-Attributs eines "include"-Elements nicht zulässig.
+RootElementRequired = Für ein ordnungsgemäß formatiertes Dokument ist ein Root-Element erforderlich.
+MultipleRootElements = Ein ordnungsgemäß formatiertes Dokument darf nicht mehrere Root-Elemente enthalten.
 ContentIllegalAtTopLevel = Der Ersatz eines "include"-Elements, das als Dokumentelement im Quell-Infoset der obersten Ebene angezeigt wird, darf keine Zeichen enthalten.
 UnexpandedEntityReferenceIllegal = Der Ersatz eines "include"-Elements, das als Dokumentelement im Quell-Infoset der obersten Ebene angezeigt wird, darf keine nicht erweiterten Entityreferenzen enthalten.
-HrefFragmentIdentifierIllegal = Fragment-IDs d\u00FCrfen nicht verwendet werden. Der "href"-Attributwert "{0}" ist nicht zul\u00E4ssig.
-HrefSyntacticallyInvalid = "href"-Attributwert "{0}" hat eine ung\u00FCltige Syntax. Nach Anwenden der Escape-Regeln ist der Wert keine syntaktisch korrekte URI oder IRI.
+HrefFragmentIdentifierIllegal = Fragment-IDs dürfen nicht verwendet werden. Der "href"-Attributwert "{0}" ist nicht zulässig.
+HrefSyntacticallyInvalid = "href"-Attributwert "{0}" hat eine ungültige Syntax. Nach Anwenden der Escape-Regeln ist der Wert keine syntaktisch korrekte URI oder IRI.
 XPointerStreamability = Es wurde ein xpointer angegeben, der auf eine Stelle im Quell-Infoset verweist. Auf diese Stelle kann aufgrund des Streamingcharakters des Prozessors nicht zugegriffen werden.
 
-XPointerResolutionUnsuccessful = XPointer-Aufl\u00F6sung nicht erfolgreich.
+XPointerResolutionUnsuccessful = XPointer-Auflösung nicht erfolgreich.
 
 # Messages from erroneous set-up
 IncompatibleNamespaceContext = Typ des NamespaceContext ist nicht mit der Verwendung von XInclude kompatibel. Muss eine Instanz von XIncludeNamespaceSupport sein
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties
index 26ccc9aef76..73267cde355 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties
@@ -28,33 +28,33 @@ BadMessageKey = No se ha encontrado el mensaje de error correspondiente a la cla
 FormatFailed = Se ha producido un error interno al formatear el siguiente mensaje:\n  
 
 # Messages for erroneous input
-NoFallback = Ha fallado un elemento ''include'' con href ''{0}'' y no se ha encontrado ning\u00FAn elemento ''fallback''.
-MultipleFallbacks = Los [secundarios] de un elemento 'include' no pueden contener m\u00E1s de un elemento 'fallback'.
-FallbackParent = Se ha encontrado un elemento 'fallback' que no ten\u00EDa un elemento 'include' como principal.
+NoFallback = Ha fallado un elemento ''include'' con href ''{0}'' y no se ha encontrado ningún elemento ''fallback''.
+MultipleFallbacks = Los [secundarios] de un elemento 'include' no pueden contener más de un elemento 'fallback'.
+FallbackParent = Se ha encontrado un elemento 'fallback' que no tenía un elemento 'include' como principal.
 IncludeChild = No se permite que los elementos del espacio de nombres ''http://www.w3.org/2001/XInclude'', distintos de los elementos ''fallback'' sean secundarios de los elementos ''include''. Sin embargo, se ha encontrado ''{0}''.
 FallbackChild = No se permite que los elementos del espacio de nombres ''http://www.w3.org/2001/XInclude'', distintos de los elementos ''include'' sean secundarios de los elementos ''fallback''. Sin embargo, se ha encontrado ''{0}''.
 HrefMissing = Falta el atributo 'href' de un elemento 'include'.
 RecursiveInclude = Se ha detectado un elemento include recursivo. El documento ''{0}'' ya se ha procesado.
-InvalidParseValue = Valor no v\u00E1lido para el atributo ''parse'' en el elemento ''include'': ''{0}''.
+InvalidParseValue = Valor no válido para el atributo ''parse'' en el elemento ''include'': ''{0}''.
 XMLParseError = Error al intentar analizar el archivo XML (href=''{0}''). Motivo: {1}
-XMLResourceError = Fallo de la operaci\u00F3n include, conversi\u00F3n a fallback. Error del recurso al leer el archivo como XML (href=''{0}''). Motivo: {1}
-TextResourceError = Fallo de la operaci\u00F3n include, conversi\u00F3n a fallback. Error del recurso al leer el archivo como texto (href=''{0}''). Motivo: {1}
-NO_XPointerSchema = El esquema para "{0}" no est\u00E1 soportado por defecto. Defina su propio esquema para {0}. Consulte http://apache.org/xml/properties/xpointer-schema
+XMLResourceError = Fallo de la operación include, conversión a fallback. Error del recurso al leer el archivo como XML (href=''{0}''). Motivo: {1}
+TextResourceError = Fallo de la operación include, conversión a fallback. Error del recurso al leer el archivo como texto (href=''{0}''). Motivo: {1}
+NO_XPointerSchema = El esquema para "{0}" no está soportado por defecto. Defina su propio esquema para {0}. Consulte http://apache.org/xml/properties/xpointer-schema
 NO_SubResourceIdentified = El procesador XPointer no ha identificado el subrecurso para el puntero {0}.
 NonDuplicateNotation = Se han utilizado varias notaciones con el nombre''{0}'', pero no se ha determinado que sean duplicados.
 NonDuplicateUnparsedEntity = Se han utilizado varias entidades no analizadas con el nombre''{0}'', pero no se ha determinado que sean duplicados.
-XpointerMissing = el atributo xpointer debe estar presente cuando el atributo href est\u00E9 ausente.
-AcceptMalformed = Los caracteres fuera del rango de #x20 a #x7E no est\u00E1n permitidos en el valor del atributo 'accept' de un elemento 'include'.
-AcceptLanguageMalformed = Los caracteres fuera del rango #x20 through #x7E no est\u00E1n permitidos en el valor del atributo 'accept-language' de un elemento 'include'.
-RootElementRequired = Un documento con formato correcto necesita un elemento ra\u00EDz.
-MultipleRootElements = Un documento con formato correcto no debe contener varios elementos ra\u00EDz.
-ContentIllegalAtTopLevel = La sustituci\u00F3n de un elemento 'include' que aparece como el elemento de documento en el juego de informaci\u00F3n de origen de nivel superior no puede contener caracteres.
-UnexpandedEntityReferenceIllegal = La sustituci\u00F3n de un elemento 'include' que aparece como el elemento de documento en el juego de informaci\u00F3n de origen de nivel superior no puede contener referencias de entidad no ampliadas.
-HrefFragmentIdentifierIllegal = Los identificadores de fragmento no deben utilizarse. El valor del atributo ''href'' ''{0}'' no est\u00E1 permitido.
-HrefSyntacticallyInvalid = El valor del atributo ''href'' ''{0}'' no es v\u00E1lido sint\u00E1cticamente. Despu\u00E9s de aplicar las reglas de escape, el valor no es un URI ni un IRI sint\u00E1cticamente correctos.
-XPointerStreamability = Se ha especificado un xpointer que apunta a una ubicaci\u00F3n en el juego de informaci\u00F3n de origen. No se puede acceder a esta ubicaci\u00F3n debido a la naturaleza de flujo del procesador.
+XpointerMissing = el atributo xpointer debe estar presente cuando el atributo href esté ausente.
+AcceptMalformed = Los caracteres fuera del rango de #x20 a #x7E no están permitidos en el valor del atributo 'accept' de un elemento 'include'.
+AcceptLanguageMalformed = Los caracteres fuera del rango #x20 through #x7E no están permitidos en el valor del atributo 'accept-language' de un elemento 'include'.
+RootElementRequired = Un documento con formato correcto necesita un elemento raíz.
+MultipleRootElements = Un documento con formato correcto no debe contener varios elementos raíz.
+ContentIllegalAtTopLevel = La sustitución de un elemento 'include' que aparece como el elemento de documento en el juego de información de origen de nivel superior no puede contener caracteres.
+UnexpandedEntityReferenceIllegal = La sustitución de un elemento 'include' que aparece como el elemento de documento en el juego de información de origen de nivel superior no puede contener referencias de entidad no ampliadas.
+HrefFragmentIdentifierIllegal = Los identificadores de fragmento no deben utilizarse. El valor del atributo ''href'' ''{0}'' no está permitido.
+HrefSyntacticallyInvalid = El valor del atributo ''href'' ''{0}'' no es válido sintácticamente. Después de aplicar las reglas de escape, el valor no es un URI ni un IRI sintácticamente correctos.
+XPointerStreamability = Se ha especificado un xpointer que apunta a una ubicación en el juego de información de origen. No se puede acceder a esta ubicación debido a la naturaleza de flujo del procesador.
 
-XPointerResolutionUnsuccessful = Resoluci\u00F3n de XPointer incorrecta.
+XPointerResolutionUnsuccessful = Resolución de XPointer incorrecta.
 
 # Messages from erroneous set-up
 IncompatibleNamespaceContext = El tipo de NamespaceContext es incompatible con el uso de XInclude; debe ser una instancia de XIncludeNamespaceSupport
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties
index fa5962f5147..1057584d33b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties
@@ -24,38 +24,38 @@
 #
 
 # Messages for message reporting
-BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
+BadMessageKey = Le message d'erreur correspondant à la clé de message est introuvable.
 FormatFailed = Une erreur interne est survenue lors du formatage du message suivant :\n  
 
 # Messages for erroneous input
-NoFallback = Echec d''un \u00E9l\u00E9ment ''include'' avec l''attribut href ''{0}'' ; aucun \u00E9l\u00E9ment ''fallback'' n''a \u00E9t\u00E9 trouv\u00E9.
-MultipleFallbacks = Les [enfants] d'un \u00E9l\u00E9ment 'include' ne doivent pas contenir plusieurs \u00E9l\u00E9ments 'fallback'.
-FallbackParent = Un \u00E9l\u00E9ment 'fallback' n'ayant pas l'\u00E9l\u00E9ment 'include' comme parent \u00E9t\u00E9 trouv\u00E9.
-IncludeChild = Les \u00E9l\u00E9ments de l''espace de noms ''http://www.w3.org/2001/XInclude'', autres que ''fallback'', ne peuvent pas \u00EAtre des enfants des \u00E9l\u00E9ments ''include''. Cependant, ''{0}'' a \u00E9t\u00E9 trouv\u00E9.
-FallbackChild = Les \u00E9l\u00E9ments de l''espace de noms ''http://www.w3.org/2001/XInclude'', autres que ''include'', ne peuvent pas \u00EAtre des enfants des \u00E9l\u00E9ments ''fallback''. Cependant, ''{0}'' a \u00E9t\u00E9 trouv\u00E9.
-HrefMissing = L'attribut 'href' d'un \u00E9l\u00E9ment 'include' est manquant.
-RecursiveInclude = El\u00E9ment "include" r\u00E9cursif d\u00E9tect\u00E9. Le document ''{0}'' a d\u00E9j\u00E0 \u00E9t\u00E9 trait\u00E9.
-InvalidParseValue = Valeur non valide pour l''attribut ''parse'' sur l''\u00E9l\u00E9ment ''include'' : ''{0}''.
+NoFallback = Echec d''un élément ''include'' avec l''attribut href ''{0}'' ; aucun élément ''fallback'' n''a été trouvé.
+MultipleFallbacks = Les [enfants] d'un élément 'include' ne doivent pas contenir plusieurs éléments 'fallback'.
+FallbackParent = Un élément 'fallback' n'ayant pas l'élément 'include' comme parent été trouvé.
+IncludeChild = Les éléments de l''espace de noms ''http://www.w3.org/2001/XInclude'', autres que ''fallback'', ne peuvent pas être des enfants des éléments ''include''. Cependant, ''{0}'' a été trouvé.
+FallbackChild = Les éléments de l''espace de noms ''http://www.w3.org/2001/XInclude'', autres que ''include'', ne peuvent pas être des enfants des éléments ''fallback''. Cependant, ''{0}'' a été trouvé.
+HrefMissing = L'attribut 'href' d'un élément 'include' est manquant.
+RecursiveInclude = Elément "include" récursif détecté. Le document ''{0}'' a déjà été traité.
+InvalidParseValue = Valeur non valide pour l''attribut ''parse'' sur l''élément ''include'' : ''{0}''.
 XMLParseError = Erreur lors de la tentative d''analyse du fichier XML (href=''{0}''). Raison : {1}
-XMLResourceError = Echec de l''op\u00E9ration Include, r\u00E9tablissement de l''\u00E9l\u00E9ment fallback. Erreur de ressource lors de la lecture du fichier en tant que XML (href=''{0}''). Raison : {1}
-TextResourceError = Echec de l''op\u00E9ration Include, r\u00E9tablissement de l''\u00E9l\u00E9ment fallback. Erreur de ressource lors de la lecture du fichier en tant que texte (href=''{0}''). Raison : {1}
-NO_XPointerSchema = Par d\u00E9faut, le sch\u00E9ma pour "{0}" n''est pas pris en charge. D\u00E9finissez votre propre sch\u00E9ma pour {0}. Reportez-vous \u00E0 l''adresse http://apache.org/xml/properties/xpointer-schema
-NO_SubResourceIdentified = Aucune sous-ressource n''est identifi\u00E9e par le processeur XPointer pour le pointeur {0}.
-NonDuplicateNotation = Plusieurs notations portant le nom ''{0}'' ont \u00E9t\u00E9 utilis\u00E9es, mais elles n''ont pas \u00E9t\u00E9 consid\u00E9r\u00E9es comme des doublons.
-NonDuplicateUnparsedEntity = Plusieurs entit\u00E9s non analys\u00E9es portant le nom ''{0}'' ont \u00E9t\u00E9 utilis\u00E9es, mais elles n''ont pas \u00E9t\u00E9 consid\u00E9r\u00E9es comme des doublons.
-XpointerMissing = l'attribut xpointer doit \u00EAtre pr\u00E9sent lorsque l'attribut href est absent.
-AcceptMalformed = Les caract\u00E8res non compris entre #x20 et #x7E ne sont pas autoris\u00E9s comme valeur de l'attribut 'accept' d'un \u00E9l\u00E9ment 'include'.
-AcceptLanguageMalformed = Les caract\u00E8res non compris entre #x20 et #x7E ne sont pas autoris\u00E9s comme valeur de l'attribut 'accept-language' d'un \u00E9l\u00E9ment 'include'.
-RootElementRequired = Un document dont le format est correct requiert un \u00E9l\u00E9ment racine.
-MultipleRootElements = Un document dont le format est correct ne doit pas contenir plusieurs \u00E9l\u00E9ments racine.
-ContentIllegalAtTopLevel = Le remplacement d'un \u00E9l\u00E9ment 'include' affich\u00E9 en tant qu'\u00E9l\u00E9ment de document dans l'ensemble d'information source de niveau sup\u00E9rieur ne doit pas contenir de caract\u00E8res.
-UnexpandedEntityReferenceIllegal = Le remplacement d'un \u00E9l\u00E9ment 'include' affich\u00E9 en tant qu'\u00E9l\u00E9ment de document dans l'ensemble d'information source de niveau sup\u00E9rieur ne doit pas contenir de r\u00E9f\u00E9rences d'entit\u00E9 non d\u00E9velopp\u00E9es.
-HrefFragmentIdentifierIllegal = Les identificateurs de fragment ne doivent pas \u00EAtre utilis\u00E9s. La valeur d''attribut ''href'' ''{0}'' n''est pas autoris\u00E9e.
-HrefSyntacticallyInvalid = La syntaxe de la valeur d''attribut ''href'' ''{0}'' est incorrecte. Apr\u00E8s l''application des r\u00E8gles d''\u00E9chappement, la valeur n''est pas un URI ou un IRI exprim\u00E9 dans une syntaxe correcte.
-XPointerStreamability = Un XPointer pointant sur un emplacement de l'ensemble d'information source a \u00E9t\u00E9 indiqu\u00E9. Cet emplacement est inaccessible en raison des caract\u00E9ristiques de transmission en continu du processeur.
+XMLResourceError = Echec de l''opération Include, rétablissement de l''élément fallback. Erreur de ressource lors de la lecture du fichier en tant que XML (href=''{0}''). Raison : {1}
+TextResourceError = Echec de l''opération Include, rétablissement de l''élément fallback. Erreur de ressource lors de la lecture du fichier en tant que texte (href=''{0}''). Raison : {1}
+NO_XPointerSchema = Par défaut, le schéma pour "{0}" n''est pas pris en charge. Définissez votre propre schéma pour {0}. Reportez-vous à l''adresse http://apache.org/xml/properties/xpointer-schema
+NO_SubResourceIdentified = Aucune sous-ressource n''est identifiée par le processeur XPointer pour le pointeur {0}.
+NonDuplicateNotation = Plusieurs notations portant le nom ''{0}'' ont été utilisées, mais elles n''ont pas été considérées comme des doublons.
+NonDuplicateUnparsedEntity = Plusieurs entités non analysées portant le nom ''{0}'' ont été utilisées, mais elles n''ont pas été considérées comme des doublons.
+XpointerMissing = l'attribut xpointer doit être présent lorsque l'attribut href est absent.
+AcceptMalformed = Les caractères non compris entre #x20 et #x7E ne sont pas autorisés comme valeur de l'attribut 'accept' d'un élément 'include'.
+AcceptLanguageMalformed = Les caractères non compris entre #x20 et #x7E ne sont pas autorisés comme valeur de l'attribut 'accept-language' d'un élément 'include'.
+RootElementRequired = Un document dont le format est correct requiert un élément racine.
+MultipleRootElements = Un document dont le format est correct ne doit pas contenir plusieurs éléments racine.
+ContentIllegalAtTopLevel = Le remplacement d'un élément 'include' affiché en tant qu'élément de document dans l'ensemble d'information source de niveau supérieur ne doit pas contenir de caractères.
+UnexpandedEntityReferenceIllegal = Le remplacement d'un élément 'include' affiché en tant qu'élément de document dans l'ensemble d'information source de niveau supérieur ne doit pas contenir de références d'entité non développées.
+HrefFragmentIdentifierIllegal = Les identificateurs de fragment ne doivent pas être utilisés. La valeur d''attribut ''href'' ''{0}'' n''est pas autorisée.
+HrefSyntacticallyInvalid = La syntaxe de la valeur d''attribut ''href'' ''{0}'' est incorrecte. Après l''application des règles d''échappement, la valeur n''est pas un URI ou un IRI exprimé dans une syntaxe correcte.
+XPointerStreamability = Un XPointer pointant sur un emplacement de l'ensemble d'information source a été indiqué. Cet emplacement est inaccessible en raison des caractéristiques de transmission en continu du processeur.
 
-XPointerResolutionUnsuccessful = Echec de la r\u00E9solution de XPointer.
+XPointerResolutionUnsuccessful = Echec de la résolution de XPointer.
 
 # Messages from erroneous set-up
-IncompatibleNamespaceContext = Le type de l'\u00E9l\u00E9ment NamespaceContext n'est pas compatible avec l'utilisation de l'\u00E9l\u00E9ment XInclude ; il doit s'agir d'une instance de XIncludeNamespaceSupport
-ExpandedSystemId = Impossible de d\u00E9velopper l'ID syst\u00E8me de la ressource incluse
+IncompatibleNamespaceContext = Le type de l'élément NamespaceContext n'est pas compatible avec l'utilisation de l'élément XInclude ; il doit s'agir d'une instance de XIncludeNamespaceSupport
+ExpandedSystemId = Impossible de développer l'ID système de la ressource incluse
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties
index 38e08cb92a9..de42b2936a9 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties
@@ -25,37 +25,37 @@
 
 # Messages for message reporting
 BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
-FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n  
+FormatFailed = Si è verificato un errore interno durante la formattazione del seguente messaggio:\n  
 
 # Messages for erroneous input
-NoFallback = Errore dell''elemento ''include'' con href ''{0}''. Non \u00E8 stato trovato alcune elemento ''fallback''.
-MultipleFallbacks = [children] di un elemento 'include' non possono contenere pi\u00F9 elementi 'fallback'.
-FallbackParent = \u00C8 stato trovato un elemento 'fallback' che non ha un elemento 'include' come padre.
-IncludeChild = Gli elementi dello spazio di nomi ''http://www.w3.org/2001/XInclude'' diversi da ''fallback'' non possono avere elementi figlio di elementi ''include''.  Tuttavia, \u00E8 stato trovato ''{0}''.
-FallbackChild = Gli elementi dello spazio di nomi ''http://www.w3.org/2001/XInclude'' diversi da ''include'' non possono avere elementi figlio di elementi ''fallback''.  Tuttavia, \u00E8 stato trovato ''{0}''.
+NoFallback = Errore dell''elemento ''include'' con href ''{0}''. Non è stato trovato alcune elemento ''fallback''.
+MultipleFallbacks = [children] di un elemento 'include' non possono contenere più elementi 'fallback'.
+FallbackParent = È stato trovato un elemento 'fallback' che non ha un elemento 'include' come padre.
+IncludeChild = Gli elementi dello spazio di nomi ''http://www.w3.org/2001/XInclude'' diversi da ''fallback'' non possono avere elementi figlio di elementi ''include''.  Tuttavia, è stato trovato ''{0}''.
+FallbackChild = Gli elementi dello spazio di nomi ''http://www.w3.org/2001/XInclude'' diversi da ''include'' non possono avere elementi figlio di elementi ''fallback''.  Tuttavia, è stato trovato ''{0}''.
 HrefMissing = Manca l'attributo 'href' di un elemento 'include'.
-RecursiveInclude = Inclusione ricorsiva rilevata. Il documento ''{0}'' \u00E8 gi\u00E0 stato elaborato.
+RecursiveInclude = Inclusione ricorsiva rilevata. Il documento ''{0}'' è già stato elaborato.
 InvalidParseValue = Valore non valido per l''attributo ''parse'' nell''elemento ''include'': ''{0}''.
 XMLParseError = Errore durante il tentativo di analizzare il file XML (href=''{0}''). Causa: {1}
-XMLResourceError = Operazione di inclusione non riuscita. Verr\u00E0 ripristinato il fallback. Errore di risorsa durante la lettura del file come XML (href=''{0}''). Motivo: {1}
-TextResourceError = Operazione di inclusione non riuscita. Verr\u00E0 ripristinato il fallback. Errore di risorsa durante la lettura del file come testo (href=''{0}''). Motivo: {1}
-NO_XPointerSchema = Lo schema per "{0}" non \u00E8 supportato per impostazione predefinita. Definire il proprio schema per {0}. Vedere http://apache.org/xml/properties/xpointer-schema.
+XMLResourceError = Operazione di inclusione non riuscita. Verrà ripristinato il fallback. Errore di risorsa durante la lettura del file come XML (href=''{0}''). Motivo: {1}
+TextResourceError = Operazione di inclusione non riuscita. Verrà ripristinato il fallback. Errore di risorsa durante la lettura del file come testo (href=''{0}''). Motivo: {1}
+NO_XPointerSchema = Lo schema per "{0}" non è supportato per impostazione predefinita. Definire il proprio schema per {0}. Vedere http://apache.org/xml/properties/xpointer-schema.
 NO_SubResourceIdentified = Nessuna risorsa secondaria identificata dal processore XPointer per il puntatore {0}.
-NonDuplicateNotation = Sono state utilizzate pi\u00F9 notazioni con il nome ''{0}'', ma \u00E8 stato determinato che non sono duplicati.
-NonDuplicateUnparsedEntity = Sono state utilizzate pi\u00F9 entit\u00E0 non analizzate con il nome ''{0}'', ma \u00E8 stato determinato che non sono duplicati.
-XpointerMissing = L'attributo xpointer deve essere presente se \u00E8 assente l'attributo href.
+NonDuplicateNotation = Sono state utilizzate più notazioni con il nome ''{0}'', ma è stato determinato che non sono duplicati.
+NonDuplicateUnparsedEntity = Sono state utilizzate più entità non analizzate con il nome ''{0}'', ma è stato determinato che non sono duplicati.
+XpointerMissing = L'attributo xpointer deve essere presente se è assente l'attributo href.
 AcceptMalformed = I caratteri che non rientrano tra #x20 e #x7E non sono consentiti nel valore dell'attributo 'accept' di un elemento 'include'.
 AcceptLanguageMalformed = I caratteri che non rientrano tra #x20 e #x7E non sono consentiti nel valore dell'attributo 'accept-language' di un elemento 'include'.
 RootElementRequired = Un documento con formato corretto richiede un elemento radice.
-MultipleRootElements = Un documento con formato corretto non deve contenere pi\u00F9 elementi radice.
-ContentIllegalAtTopLevel = La sostituzione di un elemento 'include' indicato come elemento di documento nel set di informazioni di origine nel livello superiore non pu\u00F2 contenere caratteri.
-UnexpandedEntityReferenceIllegal = La sostituzione di un elemento 'include' indicato come elemento di documento nel set di informazioni di origine nel livello superiore non pu\u00F2 contenere riferimenti di entit\u00E0 non espansi.
-HrefFragmentIdentifierIllegal = Non utilizzare gli identificativi di frammento. Il valore ''{0}'' dell''attributo ''href'' non \u00E8 consentito.
-HrefSyntacticallyInvalid = Il valore ''{0}'' dell''attributo ''href'' non \u00E8 valido a livello di sintassi. Dopo aver applicato le regole di escape, il valore non \u00E8 un URI o un IRI con sintassi corretta.
-XPointerStreamability = \u00C8 stato specificato un xpointer che punta a una posizione nel set di informazioni di origine. Non \u00E8 possibile accedere a questa posizione poich\u00E9 il processore \u00E8 di tipo streaming.
+MultipleRootElements = Un documento con formato corretto non deve contenere più elementi radice.
+ContentIllegalAtTopLevel = La sostituzione di un elemento 'include' indicato come elemento di documento nel set di informazioni di origine nel livello superiore non può contenere caratteri.
+UnexpandedEntityReferenceIllegal = La sostituzione di un elemento 'include' indicato come elemento di documento nel set di informazioni di origine nel livello superiore non può contenere riferimenti di entità non espansi.
+HrefFragmentIdentifierIllegal = Non utilizzare gli identificativi di frammento. Il valore ''{0}'' dell''attributo ''href'' non è consentito.
+HrefSyntacticallyInvalid = Il valore ''{0}'' dell''attributo ''href'' non è valido a livello di sintassi. Dopo aver applicato le regole di escape, il valore non è un URI o un IRI con sintassi corretta.
+XPointerStreamability = È stato specificato un xpointer che punta a una posizione nel set di informazioni di origine. Non è possibile accedere a questa posizione poiché il processore è di tipo streaming.
 
 XPointerResolutionUnsuccessful = Risoluzione di XPointer non riuscita.
 
 # Messages from erroneous set-up
-IncompatibleNamespaceContext = Il tipo di NamespaceContext non \u00E8 compatibile con l'uso di XInclude; deve essere un'istanza di XIncludeNamespaceSupport.
+IncompatibleNamespaceContext = Il tipo di NamespaceContext non è compatibile con l'uso di XInclude; deve essere un'istanza di XIncludeNamespaceSupport.
 ExpandedSystemId = Impossibile espandere l'ID di sistema della risorsa inclusa
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
index 30c510189e0..f9d95d50ec4 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
@@ -16,38 +16,38 @@
 #
 
 # Messages for message reporting
-BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n  
+BadMessageKey = メッセージ・キーに対応するエラー・メッセージが見つかりません。
+FormatFailed = 次のメッセージの書式設定中に内部エラーが発生しました:\n  
 
 # Messages for erroneous input
-NoFallback = href ''{0}''\u3092\u542B\u3080''include''\u304C\u5931\u6557\u3057\u3001''fallback''\u8981\u7D20\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-MultipleFallbacks = 'include'\u8981\u7D20\u306E[children]\u306B\u306F\u3001\u8907\u6570\u306E'fallback'\u8981\u7D20\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-FallbackParent = \u89AA\u3068\u3057\u3066'include'\u3092\u6301\u305F\u306A\u3044'fallback'\u8981\u7D20\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-IncludeChild = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''http://www.w3.org/2001/XInclude''\u304B\u3089\u306E\u8981\u7D20\u306F\u3001''fallback''\u3092\u9664\u3044\u3066\u3001''include''\u8981\u7D20\u306E\u5B50\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u305D\u308C\u306B\u3082\u304B\u304B\u308F\u3089\u305A\u3001''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-FallbackChild = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''http://www.w3.org/2001/XInclude''\u304B\u3089\u306E\u8981\u7D20\u306F\u3001''include''\u3092\u9664\u3044\u3066\u3001''fallback''\u8981\u7D20\u306E\u5B50\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u305D\u308C\u306B\u3082\u304B\u304B\u308F\u3089\u305A\u3001''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-HrefMissing = 'include'\u8981\u7D20\u306E'href'\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-RecursiveInclude = \u518D\u5E30\u7684\u306Ainclude\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u306F\u3059\u3067\u306B\u51E6\u7406\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-InvalidParseValue = ''include''\u8981\u7D20\u306E''parse''\u5C5E\u6027\u306E\u5024\u304C\u7121\u52B9\u3067\u3059: ''{0}''\u3002
-XMLParseError = XML\u30D5\u30A1\u30A4\u30EB\u306E\u89E3\u6790\u8A66\u884C\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F(href=''{0}'')\u3002\u7406\u7531: {1}
-XMLResourceError = \u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u64CD\u4F5C\u304C\u5931\u6557\u3057\u3001\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u306B\u623B\u308A\u307E\u3059\u3002\u30D5\u30A1\u30A4\u30EB\u3092XML\u3068\u3057\u3066\u8AAD\u53D6\u308A\u4E2D\u306B\u30EA\u30BD\u30FC\u30B9\u30FB\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F(href=''{0}'')\u3002\u7406\u7531: {1}
-TextResourceError = \u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u64CD\u4F5C\u304C\u5931\u6557\u3057\u3001\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u306B\u623B\u308A\u307E\u3059\u3002\u30D5\u30A1\u30A4\u30EB\u3092\u30C6\u30AD\u30B9\u30C8\u3068\u3057\u3066\u8AAD\u53D6\u308A\u4E2D\u306B\u30EA\u30BD\u30FC\u30B9\u30FB\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F(href=''{0}'')\u3002\u7406\u7531: {1}
-NO_XPointerSchema = \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001"{0}"\u306E\u30B9\u30AD\u30FC\u30DE\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002{0}\u306B\u5BFE\u3057\u3066\u72EC\u81EA\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002http://apache.org/xml/properties/xpointer-schema\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
-NO_SubResourceIdentified = \u30DD\u30A4\u30F3\u30BF{0}\u306EXPointer\u30D7\u30ED\u30BB\u30C3\u30B5\u3067\u306F\u30B5\u30D6\u30EA\u30BD\u30FC\u30B9\u306F\u8B58\u5225\u3055\u308C\u307E\u305B\u3093\u3002
-NonDuplicateNotation = \u540D\u524D\u304C''{0}''\u306E\u8907\u6570\u306E\u8868\u8A18\u6CD5\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u3053\u308C\u3089\u306E\u8868\u8A18\u6CD5\u306F\u91CD\u8907\u3068\u307F\u306A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-NonDuplicateUnparsedEntity = \u540D\u524D\u304C''{0}''\u306E\u8907\u6570\u306E\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u3053\u308C\u3089\u306E\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306F\u91CD\u8907\u3068\u307F\u306A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-XpointerMissing = href\u5C5E\u6027\u304C\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u3001xpointer\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002
-AcceptMalformed = #x20\u304B\u3089#x7E\u306E\u7BC4\u56F2\u306B\u542B\u307E\u308C\u306A\u3044\u6587\u5B57\u306F\u3001'include'\u8981\u7D20\u306E'accept'\u5C5E\u6027\u306E\u5024\u306B\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-AcceptLanguageMalformed = #x20\u304B\u3089#x7E\u306E\u7BC4\u56F2\u306B\u542B\u307E\u308C\u306A\u3044\u6587\u5B57\u306F\u3001'include'\u8981\u7D20\u306E'accept-language'\u5C5E\u6027\u306E\u5024\u306B\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-RootElementRequired = \u6574\u5F62\u5F0F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u30EB\u30FC\u30C8\u8981\u7D20\u304C\u5FC5\u8981\u3067\u3059\u3002
-MultipleRootElements = \u6574\u5F62\u5F0F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u8907\u6570\u306E\u30EB\u30FC\u30C8\u8981\u7D20\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-ContentIllegalAtTopLevel = \u30C8\u30C3\u30D7\u30EC\u30D9\u30EB\u306E\u30BD\u30FC\u30B9\u60C5\u5831\u30BB\u30C3\u30C8\u306B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u8981\u7D20\u3068\u3057\u3066\u51FA\u73FE\u3059\u308B'include'\u8981\u7D20\u306E\u7F6E\u63DB\u306B\u306F\u3001\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-UnexpandedEntityReferenceIllegal = \u30C8\u30C3\u30D7\u30EC\u30D9\u30EB\u306E\u30BD\u30FC\u30B9\u60C5\u5831\u30BB\u30C3\u30C8\u306B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u8981\u7D20\u3068\u3057\u3066\u51FA\u73FE\u3059\u308B'include'\u8981\u7D20\u306E\u7F6E\u63DB\u306B\u306F\u3001\u5C55\u958B\u3057\u3066\u3044\u306A\u3044\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-HrefFragmentIdentifierIllegal = \u30D5\u30E9\u30B0\u30E1\u30F3\u30C8\u8B58\u5225\u5B50\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002''href''\u5C5E\u6027\u306E\u5024''{0}''\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-HrefSyntacticallyInvalid = ''href''\u5C5E\u6027\u306E\u5024''{0}''\u306E\u69CB\u6587\u304C\u7121\u52B9\u3067\u3059\u3002\u30A8\u30B9\u30B1\u30FC\u30D7\u30FB\u30EB\u30FC\u30EB\u3092\u9069\u7528\u3059\u308B\u3068\u3001\u5024\u306F\u6B63\u3057\u3044\u69CB\u6587\u306EURI\u307E\u305F\u306FIRI\u306B\u306A\u308A\u307E\u305B\u3093\u3002
-XPointerStreamability = \u30BD\u30FC\u30B9\u60C5\u5831\u30BB\u30C3\u30C8\u5185\u306E\u5834\u6240\u3092\u6307\u3059xpointer\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D7\u30ED\u30BB\u30C3\u30B5\u306E\u30B9\u30C8\u30EA\u30FC\u30DF\u30F3\u30B0\u306E\u6027\u8CEA\u4E0A\u3001\u3053\u306E\u5834\u6240\u306B\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\u3002
+NoFallback = href ''{0}''を含む''include''が失敗し、''fallback''要素が見つかりませんでした。
+MultipleFallbacks = 'include'要素の[children]には、複数の'fallback'要素を含めることはできません。
+FallbackParent = 親として'include'を持たない'fallback'要素が見つかりました。
+IncludeChild = ネームスペース''http://www.w3.org/2001/XInclude''からの要素は、''fallback''を除いて、''include''要素の子にすることはできません。それにもかかわらず、''{0}''が見つかりました。
+FallbackChild = ネームスペース''http://www.w3.org/2001/XInclude''からの要素は、''include''を除いて、''fallback''要素の子にすることはできません。それにもかかわらず、''{0}''が見つかりました。
+HrefMissing = 'include'要素の'href'属性がありません。
+RecursiveInclude = 再帰的なincludeが検出されました。ドキュメント''{0}''はすでに処理されています。
+InvalidParseValue = ''include''要素の''parse''属性の値が無効です: ''{0}''。
+XMLParseError = XMLファイルの解析試行中にエラーが発生しました(href=''{0}'')。理由: {1}
+XMLResourceError = インクルード操作が失敗し、フォールバックに戻ります。ファイルをXMLとして読取り中にリソース・エラーが発生しました(href=''{0}'')。理由: {1}
+TextResourceError = インクルード操作が失敗し、フォールバックに戻ります。ファイルをテキストとして読取り中にリソース・エラーが発生しました(href=''{0}'')。理由: {1}
+NO_XPointerSchema = デフォルトでは、"{0}"のスキーマはサポートされていません。{0}に対して独自のスキーマを定義してください。http://apache.org/xml/properties/xpointer-schemaを参照してください
+NO_SubResourceIdentified = ポインタ{0}のXPointerプロセッサではサブリソースは識別されません。
+NonDuplicateNotation = 名前が''{0}''の複数の表記法が使用されていますが、これらの表記法は重複とみなされていません。
+NonDuplicateUnparsedEntity = 名前が''{0}''の複数の未解析エンティティが使用されていますが、これらのエンティティは重複とみなされていません。
+XpointerMissing = href属性が存在しない場合は、xpointer属性が必要です。
+AcceptMalformed = #x20から#x7Eの範囲に含まれない文字は、'include'要素の'accept'属性の値には使用できません。
+AcceptLanguageMalformed = #x20から#x7Eの範囲に含まれない文字は、'include'要素の'accept-language'属性の値には使用できません。
+RootElementRequired = 整形式ドキュメントにはルート要素が必要です。
+MultipleRootElements = 整形式ドキュメントには、複数のルート要素を含めることはできません。
+ContentIllegalAtTopLevel = トップレベルのソース情報セットにドキュメント要素として出現する'include'要素の置換には、文字を含めることはできません。
+UnexpandedEntityReferenceIllegal = トップレベルのソース情報セットにドキュメント要素として出現する'include'要素の置換には、展開していないエンティティ参照を含めることはできません。
+HrefFragmentIdentifierIllegal = フラグメント識別子は使用できません。''href''属性の値''{0}''は許可されていません。
+HrefSyntacticallyInvalid = ''href''属性の値''{0}''の構文が無効です。エスケープ・ルールを適用すると、値は正しい構文のURIまたはIRIになりません。
+XPointerStreamability = ソース情報セット内の場所を指すxpointerが指定されています。プロセッサのストリーミングの性質上、この場所にはアクセスできません。
 
-XPointerResolutionUnsuccessful = XPointer\u306E\u89E3\u6C7A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
+XPointerResolutionUnsuccessful = XPointerの解決に失敗しました。
 
 # Messages from erroneous set-up
-IncompatibleNamespaceContext = NamespaceContext\u306E\u30BF\u30A4\u30D7\u306F\u3001XInclude\u306E\u4F7F\u7528\u3068\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093\u3002XIncludeNamespaceSupport\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-ExpandedSystemId = \u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u3055\u308C\u305F\u30EA\u30BD\u30FC\u30B9\u306E\u30B7\u30B9\u30C6\u30E0ID\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+IncompatibleNamespaceContext = NamespaceContextのタイプは、XIncludeの使用と互換性がありません。XIncludeNamespaceSupportのインスタンスである必要があります
+ExpandedSystemId = インクルードされたリソースのシステムIDを拡張できませんでした
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties
index 40783603303..ea4863bd912 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties
@@ -24,38 +24,38 @@
 #
 
 # Messages for message reporting
-BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n  
+BadMessageKey = 메시지 키에 해당하는 오류 메시지를 찾을 수 없습니다.
+FormatFailed = 다음 메시지의 형식을 지정하는 중 내부 오류가 발생했습니다.\n  
 
 # Messages for erroneous input
-NoFallback = href ''{0}''\uC744(\uB97C) \uC0AC\uC6A9\uD55C ''include''\uB97C \uC2E4\uD328\uD588\uC73C\uBA70 ''fallback'' \uC694\uC18C\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-MultipleFallbacks = 'include' \uC694\uC18C\uC758 [children]\uC5D0\uB294 \uB450 \uAC1C \uC774\uC0C1\uC758 'fallback' \uC694\uC18C\uAC00 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FallbackParent = \uC0C1\uC704\uB85C 'include'\uB97C \uD3EC\uD568\uD558\uC9C0 \uC54A\uC740 'fallback' \uC694\uC18C\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-IncludeChild = ''fallback'' \uC678\uC5D0 \uB2E4\uB978 ''http://www.w3.org/2001/XInclude'' \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC758 \uC694\uC18C\uB294 ''include'' \uC694\uC18C\uC758 \uD558\uC704 \uD56D\uBAA9\uC77C \uC218 \uC5C6\uC9C0\uB9CC, ''{0}''\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-FallbackChild = ''include'' \uC678\uC5D0 \uB2E4\uB978 ''http://www.w3.org/2001/XInclude'' \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC758 \uC694\uC18C\uB294 ''fallback'' \uC694\uC18C\uC758 \uD558\uC704 \uD56D\uBAA9\uC77C \uC218 \uC5C6\uC9C0\uB9CC, ''{0}''\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-HrefMissing = 'include' \uC694\uC18C\uC758 'href' \uC18D\uC131\uC774 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-RecursiveInclude = \uC21C\uD658 include\uAC00 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4. ''{0}'' \uBB38\uC11C\uAC00 \uC774\uBBF8 \uCC98\uB9AC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-InvalidParseValue = ''include'' \uC694\uC18C\uC5D0 ''parse'' \uC18D\uC131\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD55C \uAC12\uC774 \uC788\uC74C: ''{0}''.
-XMLParseError = XML \uD30C\uC77C(href=''{0}'')\uC758 \uAD6C\uBB38\uC744 \uBD84\uC11D\uD558\uB824\uACE0 \uC2DC\uB3C4\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC6D0\uC778: {1}
-XMLResourceError = Include \uC791\uC5C5\uC744 \uC2E4\uD328\uD558\uC5EC fallback\uC73C\uB85C \uBCF5\uC6D0\uD558\uB294 \uC911\uC785\uB2C8\uB2E4. \uD30C\uC77C\uC744 XML(href=''{0}'')\uB85C \uC77D\uB294 \uC911 \uB9AC\uC18C\uC2A4 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC6D0\uC778: {1}
-TextResourceError = Include \uC791\uC5C5\uC744 \uC2E4\uD328\uD558\uC5EC fallback\uC73C\uB85C \uBCF5\uC6D0\uD558\uB294 \uC911\uC785\uB2C8\uB2E4. \uD30C\uC77C\uC744 \uD14D\uC2A4\uD2B8(href=''{0}'')\uB85C \uC77D\uB294 \uC911 \uB9AC\uC18C\uC2A4 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC6D0\uC778: {1}
-NO_XPointerSchema = \uAE30\uBCF8\uC801\uC73C\uB85C "{0}"\uC5D0 \uB300\uD55C \uC2A4\uD0A4\uB9C8\uB294 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. {0}\uC5D0 \uB300\uD574 \uACE0\uC720\uD55C \uC2A4\uD0A4\uB9C8\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624. http://apache.org/xml/properties/xpointer-schema\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
-NO_SubResourceIdentified = {0} \uD3EC\uC778\uD130\uC5D0 \uB300\uD55C XPointer \uD504\uB85C\uC138\uC11C\uAC00 \uC2DD\uBCC4\uD55C \uD558\uC704 \uB9AC\uC18C\uC2A4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
-NonDuplicateNotation = \uC774\uB984\uC774 ''{0}''\uC774\uC9C0\uB9CC \uC911\uBCF5\uB41C \uAC83\uC73C\uB85C \uD655\uC778\uB418\uC9C0 \uC54A\uC740 \uD45C\uAE30\uBC95\uC774 \uC5EC\uB7EC \uAC1C \uC0AC\uC6A9\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-NonDuplicateUnparsedEntity = \uC774\uB984\uC774 ''{0}''\uC774\uC9C0\uB9CC \uC911\uBCF5\uB41C \uAC83\uC73C\uB85C \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC73C\uBA70 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0\uAC00 \uC5EC\uB7EC \uAC1C \uC0AC\uC6A9\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-XpointerMissing = href \uC18D\uC131\uC774 \uC5C6\uC744 \uACBD\uC6B0 xpointer \uC18D\uC131\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-AcceptMalformed = 'include' \uC694\uC18C\uC758 'accept' \uC18D\uC131\uAC12\uC5D0\uC11C\uB294 #x20 - #x7E \uBC94\uC704\uC5D0 \uC18D\uD558\uC9C0 \uC54A\uB294 \uBB38\uC790\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-AcceptLanguageMalformed = 'include' \uC694\uC18C\uC758 'accept-language' \uC18D\uC131\uAC12\uC5D0\uC11C\uB294 #x20 - #x7E \uBC94\uC704\uC5D0 \uC18D\uD558\uC9C0 \uC54A\uB294 \uBB38\uC790\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-RootElementRequired = \uC62C\uBC14\uB978 \uD615\uC2DD\uC758 \uBB38\uC11C\uC5D0\uB294 \uB8E8\uD2B8 \uC694\uC18C\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-MultipleRootElements = \uC62C\uBC14\uB978 \uD615\uC2DD\uC758 \uBB38\uC11C\uC5D0\uB294 \uB8E8\uD2B8 \uC694\uC18C\uAC00 \uC5EC\uB7EC \uAC1C \uD3EC\uD568\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-ContentIllegalAtTopLevel = \uCD5C\uC0C1\uC704 \uB808\uBCA8 \uC18C\uC2A4 infoset\uC5D0\uC11C \uBB38\uC11C \uC694\uC18C\uB85C \uB098\uD0C0\uB098\uB294 'include' \uC694\uC18C\uC758 \uB300\uCCB4\uC5D0\uB294 \uBB38\uC790\uAC00 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-UnexpandedEntityReferenceIllegal = \uCD5C\uC0C1\uC704 \uB808\uBCA8 \uC18C\uC2A4 infoset\uC5D0\uC11C \uBB38\uC11C \uC694\uC18C\uB85C \uB098\uD0C0\uB098\uB294 'include' \uC694\uC18C\uC758 \uB300\uCCB4\uC5D0\uB294 \uD655\uC7A5\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uAC00 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-HrefFragmentIdentifierIllegal = \uBD80\uBD84 \uC2DD\uBCC4\uC790\uB294 \uC0AC\uC6A9\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4. ''href'' \uC18D\uC131\uAC12 ''{0}''\uC740(\uB294) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-HrefSyntacticallyInvalid = ''href'' \uC18D\uC131\uAC12 ''{0}''\uC774(\uAC00) \uAD6C\uBB38\uC801\uC73C\uB85C \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC774\uC2A4\uCF00\uC774\uD504 \uADDC\uCE59\uC744 \uC801\uC6A9\uD55C \uD6C4 \uAC12\uC774 \uAD6C\uBB38\uC801\uC73C\uB85C \uC62C\uBC14\uB978 URI \uB610\uB294 IRI\uAC00 \uC544\uB2CC \uAC83\uC73C\uB85C \uD655\uC778\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-XPointerStreamability = \uC18C\uC2A4 infoset\uC758 \uC704\uCE58\uB97C \uAC00\uB9AC\uD0A4\uB294 xpointer\uAC00 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uD504\uB85C\uC138\uC11C\uC758 \uC2A4\uD2B8\uB9AC\uBC0D \uD2B9\uC131\uC73C\uB85C \uC778\uD574 \uC774 \uC704\uCE58\uC5D0 \uC561\uC138\uC2A4\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+NoFallback = href ''{0}''을(를) 사용한 ''include''를 실패했으며 ''fallback'' 요소를 찾을 수 없습니다.
+MultipleFallbacks = 'include' 요소의 [children]에는 두 개 이상의 'fallback' 요소가 포함될 수 없습니다.
+FallbackParent = 상위로 'include'를 포함하지 않은 'fallback' 요소가 발견되었습니다.
+IncludeChild = ''fallback'' 외에 다른 ''http://www.w3.org/2001/XInclude'' 네임스페이스의 요소는 ''include'' 요소의 하위 항목일 수 없지만, ''{0}''이(가) 발견되었습니다.
+FallbackChild = ''include'' 외에 다른 ''http://www.w3.org/2001/XInclude'' 네임스페이스의 요소는 ''fallback'' 요소의 하위 항목일 수 없지만, ''{0}''이(가) 발견되었습니다.
+HrefMissing = 'include' 요소의 'href' 속성이 누락되었습니다.
+RecursiveInclude = 순환 include가 감지되었습니다. ''{0}'' 문서가 이미 처리되었습니다.
+InvalidParseValue = ''include'' 요소에 ''parse'' 속성에 대해 부적합한 값이 있음: ''{0}''.
+XMLParseError = XML 파일(href=''{0}'')의 구문을 분석하려고 시도하는 중 오류가 발생했습니다. 원인: {1}
+XMLResourceError = Include 작업을 실패하여 fallback으로 복원하는 중입니다. 파일을 XML(href=''{0}'')로 읽는 중 리소스 오류가 발생했습니다. 원인: {1}
+TextResourceError = Include 작업을 실패하여 fallback으로 복원하는 중입니다. 파일을 텍스트(href=''{0}'')로 읽는 중 리소스 오류가 발생했습니다. 원인: {1}
+NO_XPointerSchema = 기본적으로 "{0}"에 대한 스키마는 지원되지 않습니다. {0}에 대해 고유한 스키마를 정의하십시오. http://apache.org/xml/properties/xpointer-schema를 참조하십시오.
+NO_SubResourceIdentified = {0} 포인터에 대한 XPointer 프로세서가 식별한 하위 리소스가 없습니다.
+NonDuplicateNotation = 이름이 ''{0}''이지만 중복된 것으로 확인되지 않은 표기법이 여러 개 사용되었습니다.
+NonDuplicateUnparsedEntity = 이름이 ''{0}''이지만 중복된 것으로 확인되지 않았으며 구문이 분석되지 않은 엔티티가 여러 개 사용되었습니다.
+XpointerMissing = href 속성이 없을 경우 xpointer 속성이 있어야 합니다.
+AcceptMalformed = 'include' 요소의 'accept' 속성값에서는 #x20 - #x7E 범위에 속하지 않는 문자가 허용되지 않습니다.
+AcceptLanguageMalformed = 'include' 요소의 'accept-language' 속성값에서는 #x20 - #x7E 범위에 속하지 않는 문자가 허용되지 않습니다.
+RootElementRequired = 올바른 형식의 문서에는 루트 요소가 필요합니다.
+MultipleRootElements = 올바른 형식의 문서에는 루트 요소가 여러 개 포함되지 않아야 합니다.
+ContentIllegalAtTopLevel = 최상위 레벨 소스 infoset에서 문서 요소로 나타나는 'include' 요소의 대체에는 문자가 포함될 수 없습니다.
+UnexpandedEntityReferenceIllegal = 최상위 레벨 소스 infoset에서 문서 요소로 나타나는 'include' 요소의 대체에는 확장되지 않은 엔티티 참조가 포함될 수 없습니다.
+HrefFragmentIdentifierIllegal = 부분 식별자는 사용하지 않아야 합니다. ''href'' 속성값 ''{0}''은(는) 허용되지 않습니다.
+HrefSyntacticallyInvalid = ''href'' 속성값 ''{0}''이(가) 구문적으로 부적합합니다. 이스케이프 규칙을 적용한 후 값이 구문적으로 올바른 URI 또는 IRI가 아닌 것으로 확인되었습니다.
+XPointerStreamability = 소스 infoset의 위치를 가리키는 xpointer가 지정되었습니다. 프로세서의 스트리밍 특성으로 인해 이 위치에 액세스할 수 없습니다.
 
-XPointerResolutionUnsuccessful = XPointer \uBD84\uC11D\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
+XPointerResolutionUnsuccessful = XPointer 분석을 실패했습니다.
 
 # Messages from erroneous set-up
-IncompatibleNamespaceContext = NamespaceContext\uC758 \uC720\uD615\uC774 \uC0AC\uC6A9 \uC911\uC778 XInclude\uC640 \uD638\uD658\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XIncludeNamespaceSupport\uC758 \uC778\uC2A4\uD134\uC2A4\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-ExpandedSystemId = \uD3EC\uD568\uB41C \uB9AC\uC18C\uC2A4\uC758 \uC2DC\uC2A4\uD15C ID\uB97C \uD655\uC7A5\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+IncompatibleNamespaceContext = NamespaceContext의 유형이 사용 중인 XInclude와 호환되지 않습니다. XIncludeNamespaceSupport의 인스턴스여야 합니다.
+ExpandedSystemId = 포함된 리소스의 시스템 ID를 확장할 수 없습니다.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties
index 3a09b10b7a5..dcf3c0ddafb 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties
@@ -24,38 +24,38 @@
 #
 
 # Messages for message reporting
-BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
+BadMessageKey = Não foi possível encontrar a mensagem de erro correspondente à chave da mensagem.
 FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n  
 
 # Messages for erroneous input
-NoFallback = Falha em um ''include'' com href ''{0}'' e n\u00E3o foi encontrado elemento ''fallback''.
-MultipleFallbacks = O [children] de um elemento 'include' n\u00E3o pode conter mais de um elemento 'fallback'.
-FallbackParent = Um elemento 'fallback' que foi encontrado n\u00E3o tinha 'include' como pai.
-IncludeChild = Elementos do namespace ''http://www.w3.org/2001/XInclude'', diferentes de ''fallback'', n\u00E3o podem ser filhos dos elementos ''include''. No entanto, ''{0}'' foi encontrado.
-FallbackChild = Elementos do namespace ''http://www.w3.org/2001/XInclude'', diferentes de ''include'', n\u00E3o podem ser filhos dos elementos ''fallback''. No entanto, ''{0}'' foi encontrado.
-HrefMissing = O atributo 'href' de um elemento 'include' n\u00E3o foi encontrado.
-RecursiveInclude = Inclus\u00E3o recursiva detectada. O documento ''{0}'' j\u00E1 foi processado.
-InvalidParseValue = Valor inv\u00E1lido para o atributo ''parse'' no elemento ''include'': ''{0}''.
+NoFallback = Falha em um ''include'' com href ''{0}'' e não foi encontrado elemento ''fallback''.
+MultipleFallbacks = O [children] de um elemento 'include' não pode conter mais de um elemento 'fallback'.
+FallbackParent = Um elemento 'fallback' que foi encontrado não tinha 'include' como pai.
+IncludeChild = Elementos do namespace ''http://www.w3.org/2001/XInclude'', diferentes de ''fallback'', não podem ser filhos dos elementos ''include''. No entanto, ''{0}'' foi encontrado.
+FallbackChild = Elementos do namespace ''http://www.w3.org/2001/XInclude'', diferentes de ''include'', não podem ser filhos dos elementos ''fallback''. No entanto, ''{0}'' foi encontrado.
+HrefMissing = O atributo 'href' de um elemento 'include' não foi encontrado.
+RecursiveInclude = Inclusão recursiva detectada. O documento ''{0}'' já foi processado.
+InvalidParseValue = Valor inválido para o atributo ''parse'' no elemento ''include'': ''{0}''.
 XMLParseError = Erro ao tentar fazer parse do arquivo XML (href=''{0}''). Motivo: {1}
-XMLResourceError = Falha na opera\u00E7\u00E3o de inclus\u00E3o; revertendo para fallback. Erro do recurso ao ler o arquivo como XML (href=''{0}''). Motivo: {1}
-TextResourceError = Falha na opera\u00E7\u00E3o de inclus\u00E3o; revertendo para fallback. Erro do recurso ao ler o arquivo como texto (href=''{0}''). Motivo: {1}
-NO_XPointerSchema = Por padr\u00E3o, o esquema para "{0}" n\u00E3o \u00E9 suportado. Defina seu pr\u00F3prio esquema para {0}. Consulte http://apache.org/xml/properties/xpointer-schema
+XMLResourceError = Falha na operação de inclusão; revertendo para fallback. Erro do recurso ao ler o arquivo como XML (href=''{0}''). Motivo: {1}
+TextResourceError = Falha na operação de inclusão; revertendo para fallback. Erro do recurso ao ler o arquivo como texto (href=''{0}''). Motivo: {1}
+NO_XPointerSchema = Por padrão, o esquema para "{0}" não é suportado. Defina seu próprio esquema para {0}. Consulte http://apache.org/xml/properties/xpointer-schema
 NO_SubResourceIdentified = Nenhum Sub-recurso foi identificado pelo Processador XPointer do Ponteiro {0}.
-NonDuplicateNotation = Foram usadas v\u00E1rias nota\u00E7\u00F5es que tinham o nome ''{0}'', mas n\u00E3o foram determinadas como duplica\u00E7\u00F5es.
-NonDuplicateUnparsedEntity = Foram usadas v\u00E1rias entidades que tinham o nome ''{0}'', mas n\u00E3o foram determinadas como duplica\u00E7\u00F5es.
-XpointerMissing = o atributo xpointer dever\u00E1 estar presente quando o atributo href estiver ausente.
-AcceptMalformed = N\u00E3o s\u00E3o permitidos caracteres fora da faixa #x20 at\u00E9 #x7E no valor do atributo 'accept' de um elemento 'include'.
-AcceptLanguageMalformed = N\u00E3o s\u00E3o permitidos caracteres fora da faixa #x20 at\u00E9 #x7E no valor do atributo 'accept-language' de um elemento 'include'.
+NonDuplicateNotation = Foram usadas várias notações que tinham o nome ''{0}'', mas não foram determinadas como duplicações.
+NonDuplicateUnparsedEntity = Foram usadas várias entidades que tinham o nome ''{0}'', mas não foram determinadas como duplicações.
+XpointerMissing = o atributo xpointer deverá estar presente quando o atributo href estiver ausente.
+AcceptMalformed = Não são permitidos caracteres fora da faixa #x20 até #x7E no valor do atributo 'accept' de um elemento 'include'.
+AcceptLanguageMalformed = Não são permitidos caracteres fora da faixa #x20 até #x7E no valor do atributo 'accept-language' de um elemento 'include'.
 RootElementRequired = Um documento correto requer um elemento-raiz.
-MultipleRootElements = Um documento correto n\u00E3o deve conter v\u00E1rios elementos-raiz.
-ContentIllegalAtTopLevel = A substitui\u00E7\u00E3o de um elemento 'include' que aparece como o elemento do documento no conjunto de informa\u00E7\u00F5es de origem de n\u00EDvel superior n\u00E3o pode conter caracteres.
-UnexpandedEntityReferenceIllegal = A substitui\u00E7\u00E3o de um elemento 'include' que aparece como o elemento do documento no conjunto de informa\u00E7\u00F5es de origem de n\u00EDvel superior n\u00E3o pode conter refer\u00EAncias da entidade n\u00E3o expandidas.
-HrefFragmentIdentifierIllegal = Os identificadores de fragmento n\u00E3o devem ser usados. O valor do atributo ''href'' "{0}'' n\u00E3o \u00E9 permitido.
-HrefSyntacticallyInvalid = o valor do atributo ''href'' ''{0}'' \u00E9 inv\u00E1lido sintaticamente. Ap\u00F3s aplicar as regras de escape, o valor n\u00E3o \u00E9 um URI ou IRI correto.
-XPointerStreamability = Foi especificado um xpointer que aponta para uma localiza\u00E7\u00E3o no conjunto de informa\u00E7\u00F5es de origem. Esta localiza\u00E7\u00E3o n\u00E3o pode ser acessada em decorr\u00EAncia da natureza do fluxo do processador.
+MultipleRootElements = Um documento correto não deve conter vários elementos-raiz.
+ContentIllegalAtTopLevel = A substituição de um elemento 'include' que aparece como o elemento do documento no conjunto de informações de origem de nível superior não pode conter caracteres.
+UnexpandedEntityReferenceIllegal = A substituição de um elemento 'include' que aparece como o elemento do documento no conjunto de informações de origem de nível superior não pode conter referências da entidade não expandidas.
+HrefFragmentIdentifierIllegal = Os identificadores de fragmento não devem ser usados. O valor do atributo ''href'' "{0}'' não é permitido.
+HrefSyntacticallyInvalid = o valor do atributo ''href'' ''{0}'' é inválido sintaticamente. Após aplicar as regras de escape, o valor não é um URI ou IRI correto.
+XPointerStreamability = Foi especificado um xpointer que aponta para uma localização no conjunto de informações de origem. Esta localização não pode ser acessada em decorrência da natureza do fluxo do processador.
 
-XPointerResolutionUnsuccessful = Resolu\u00E7\u00E3o de XPointer malsucedida.
+XPointerResolutionUnsuccessful = Resolução de XPointer malsucedida.
 
 # Messages from erroneous set-up
-IncompatibleNamespaceContext = O tipo de NamespaceContext \u00E9 incompat\u00EDvel ao usar XInclude. Deve ser uma inst\u00E2ncia de XIncludeNamespaceSupport
-ExpandedSystemId = N\u00E3o foi poss\u00EDvel expandir o id do sistema do recurso inclu\u00EDdo
+IncompatibleNamespaceContext = O tipo de NamespaceContext é incompatível ao usar XInclude. Deve ser uma instância de XIncludeNamespaceSupport
+ExpandedSystemId = Não foi possível expandir o id do sistema do recurso incluído
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
index 2560731caad..6dcef94cca6 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
@@ -25,37 +25,37 @@
 
 # Messages for message reporting
 BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
-FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n  
+FormatFailed = Ett internt fel inträffade vid formatering av följande meddelande:\n  
 
 # Messages for erroneous input
-NoFallback = Ett ''include'' med href ''{0}'' utf\u00F6rdes inte, hittade inget \u00E5terskapningselement (''fallback'').
-MultipleFallbacks = [underordnade] i ett 'include'-element f\u00E5r inte inneh\u00E5lla fler \u00E4n ett 'fallback'-element.
-FallbackParent = Ett 'fallback'-element hittades utan n\u00E5got 'include' som \u00F6verordnat element.
-IncludeChild = Element fr\u00E5n namnrymd ''http://www.w3.org/2001/XInclude'', ut\u00F6ver ''fallback'', \u00E4r inte till\u00E5tna som underordnade i ''include''-element. Hittade d\u00E4remot ''{0}''.
-FallbackChild = Element fr\u00E5n namnrymd ''http://www.w3.org/2001/XInclude'', ut\u00F6ver ''include'', \u00E4r inte till\u00E5tna som underordnade i ''fallback''-element. Hittade d\u00E4remot ''{0}''.
+NoFallback = Ett ''include'' med href ''{0}'' utfördes inte, hittade inget återskapningselement (''fallback'').
+MultipleFallbacks = [underordnade] i ett 'include'-element får inte innehålla fler än ett 'fallback'-element.
+FallbackParent = Ett 'fallback'-element hittades utan något 'include' som överordnat element.
+IncludeChild = Element från namnrymd ''http://www.w3.org/2001/XInclude'', utöver ''fallback'', är inte tillåtna som underordnade i ''include''-element. Hittade däremot ''{0}''.
+FallbackChild = Element från namnrymd ''http://www.w3.org/2001/XInclude'', utöver ''include'', är inte tillåtna som underordnade i ''fallback''-element. Hittade däremot ''{0}''.
 HrefMissing = Ett 'href'-attribut i ett 'include'-element saknas.
-RecursiveInclude = Rekursiv inkludering uppt\u00E4cktes. Dokumentet ''{0}'' har redan bearbetats.
-InvalidParseValue = Ogiltigt v\u00E4rde f\u00F6r ''parse''-attribut i ''include''-element: ''{0}''.
-XMLParseError = Fel vid f\u00F6rs\u00F6k att tolka XML-fil (href=''{0}''). Orsak: {1}
-XMLResourceError = Inkluderings\u00E5tg\u00E4rden utf\u00F6rdes inte, \u00E5terst\u00E4ller genom att \u00E5terskapa. Resursfel vid l\u00E4sning av fil som XML (href=''{0}''). Orsak: {1}
-TextResourceError = Inkluderings\u00E5tg\u00E4rden utf\u00F6rdes inte, \u00E5terst\u00E4ller genom att \u00E5terskapa. Resursfel vid l\u00E4sning av fil som text (href=''{0}''). Orsak: {1}
-NO_XPointerSchema = Schema f\u00F6r "{0}" st\u00F6ds inte som standard. Definiera ett eget schema f\u00F6r {0}.Se http://apache.org/xml/properties/xpointer-schema
-NO_SubResourceIdentified = Ingen Subresource har identifierats av XPointer-processorn f\u00F6r pekare {0}.
-NonDuplicateNotation = Flera noteringar anv\u00E4nds med namnet ''{0}'', men som inte fastst\u00E4lls som dubbletter.
-NonDuplicateUnparsedEntity = Flera otolkade enheter anv\u00E4nds med namnet ''{0}'', men som inte fastst\u00E4lls som dubbletter.
-XpointerMissing = Om href-attribut saknas m\u00E5ste det finnas ett xpointer-attribut.
-AcceptMalformed = Tecken utanf\u00F6r intervallet #x20 till #x7E till\u00E5ts inte i v\u00E4rdet f\u00F6r 'accept'-attributet i 'include'-element.
-AcceptLanguageMalformed = Tecken utanf\u00F6r intervallet #x20 till #x7E till\u00E5ts inte i v\u00E4rdet f\u00F6r 'accept-language'-attributet i 'include'-element.
-RootElementRequired = Ett v\u00E4lformulerat dokument kr\u00E4ver ett rotelement.
-MultipleRootElements = Ett v\u00E4lformulerat dokument f\u00E5r inte inneh\u00E5lla flera rotelement.
-ContentIllegalAtTopLevel = Ers\u00E4ttningen av ett 'include'-element som f\u00F6rekommer som dokumentelement i k\u00E4llans informationsupps\u00E4ttning p\u00E5 toppniv\u00E5n f\u00E5r inte inneh\u00E5lla tecken.
-UnexpandedEntityReferenceIllegal = Ers\u00E4ttningen av ett 'include'-element som f\u00F6rekommer som dokumentelement i k\u00E4llans informationsupps\u00E4ttning p\u00E5 toppniv\u00E5n f\u00E5r inte inneh\u00E5lla ut\u00F6kade enhetsreferenser.
-HrefFragmentIdentifierIllegal = Fragmentidentifierare f\u00E5r inte anv\u00E4ndas. ''href''-attributv\u00E4rdet ''{0}'' \u00E4r inte till\u00E5tet.
-HrefSyntacticallyInvalid = ''href''-attributv\u00E4rdet ''{0}'' \u00E4r syntaktiskt ogiltigt. Efter till\u00E4mpning av avbrottsregler har v\u00E4rdet varken syntaktiskt korrekt URI eller IRI.
-XPointerStreamability = En xpointer har angetts som pekar till en plats i k\u00E4llans informationsupps\u00E4ttning. Det finns ingen \u00E5tkomst till denna plats p\u00E5 grund av processorns str\u00F6mningsmetod.
+RecursiveInclude = Rekursiv inkludering upptäcktes. Dokumentet ''{0}'' har redan bearbetats.
+InvalidParseValue = Ogiltigt värde för ''parse''-attribut i ''include''-element: ''{0}''.
+XMLParseError = Fel vid försök att tolka XML-fil (href=''{0}''). Orsak: {1}
+XMLResourceError = Inkluderingsåtgärden utfördes inte, återställer genom att återskapa. Resursfel vid läsning av fil som XML (href=''{0}''). Orsak: {1}
+TextResourceError = Inkluderingsåtgärden utfördes inte, återställer genom att återskapa. Resursfel vid läsning av fil som text (href=''{0}''). Orsak: {1}
+NO_XPointerSchema = Schema för "{0}" stöds inte som standard. Definiera ett eget schema för {0}.Se http://apache.org/xml/properties/xpointer-schema
+NO_SubResourceIdentified = Ingen Subresource har identifierats av XPointer-processorn för pekare {0}.
+NonDuplicateNotation = Flera noteringar används med namnet ''{0}'', men som inte fastställs som dubbletter.
+NonDuplicateUnparsedEntity = Flera otolkade enheter används med namnet ''{0}'', men som inte fastställs som dubbletter.
+XpointerMissing = Om href-attribut saknas måste det finnas ett xpointer-attribut.
+AcceptMalformed = Tecken utanför intervallet #x20 till #x7E tillåts inte i värdet för 'accept'-attributet i 'include'-element.
+AcceptLanguageMalformed = Tecken utanför intervallet #x20 till #x7E tillåts inte i värdet för 'accept-language'-attributet i 'include'-element.
+RootElementRequired = Ett välformulerat dokument kräver ett rotelement.
+MultipleRootElements = Ett välformulerat dokument får inte innehålla flera rotelement.
+ContentIllegalAtTopLevel = Ersättningen av ett 'include'-element som förekommer som dokumentelement i källans informationsuppsättning på toppnivån får inte innehålla tecken.
+UnexpandedEntityReferenceIllegal = Ersättningen av ett 'include'-element som förekommer som dokumentelement i källans informationsuppsättning på toppnivån får inte innehålla utökade enhetsreferenser.
+HrefFragmentIdentifierIllegal = Fragmentidentifierare får inte användas. ''href''-attributvärdet ''{0}'' är inte tillåtet.
+HrefSyntacticallyInvalid = ''href''-attributvärdet ''{0}'' är syntaktiskt ogiltigt. Efter tillämpning av avbrottsregler har värdet varken syntaktiskt korrekt URI eller IRI.
+XPointerStreamability = En xpointer har angetts som pekar till en plats i källans informationsuppsättning. Det finns ingen åtkomst till denna plats på grund av processorns strömningsmetod.
 
-XPointerResolutionUnsuccessful = XPointer-matchningen utf\u00F6rdes inte.
+XPointerResolutionUnsuccessful = XPointer-matchningen utfördes inte.
 
 # Messages from erroneous set-up
-IncompatibleNamespaceContext = Typ av NamespaceContext \u00E4r inkompatibel med XInclude; det kr\u00E4vs en instans av XIncludeNamespaceSupport
-ExpandedSystemId = Kunde inte ut\u00F6ka system-id:t f\u00F6r inkluderad resurs
+IncompatibleNamespaceContext = Typ av NamespaceContext är inkompatibel med XInclude; det krävs en instans av XIncludeNamespaceSupport
+ExpandedSystemId = Kunde inte utöka system-id:t för inkluderad resurs
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
index 15c677e3198..0efe76a5df5 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
@@ -16,38 +16,38 @@
 #
 
 # Messages for message reporting
-BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
-FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n  
+BadMessageKey = 找不到与消息关键字对应的错误消息。
+FormatFailed = 设置以下消息的格式时出现内部错误:\n  
 
 # Messages for erroneous input
-NoFallback = \u5E26\u6709 href ''{0}'' \u7684 ''include'' \u5931\u8D25, \u5E76\u4E14\u627E\u4E0D\u5230 ''fallback'' \u5143\u7D20\u3002
-MultipleFallbacks = 'include' \u5143\u7D20\u7684 [children] \u4E0D\u80FD\u5305\u542B\u591A\u4E2A 'fallback' \u5143\u7D20\u3002
-FallbackParent = \u627E\u5230\u672A\u5C06 'include' \u4F5C\u4E3A\u7236\u7EA7\u7684 'fallback' \u5143\u7D20\u3002
-IncludeChild = \u4E0D\u5141\u8BB8\u5C06\u540D\u79F0\u7A7A\u95F4 ''http://www.w3.org/2001/XInclude'' (\u800C\u975E ''fallback'') \u4E2D\u7684\u5143\u7D20\u4F5C\u4E3A ''include'' \u5143\u7D20\u7684\u5B50\u7EA7\u3002\u4F46\u662F, \u627E\u5230 ''{0}''\u3002
-FallbackChild = \u4E0D\u5141\u8BB8\u5C06\u540D\u79F0\u7A7A\u95F4 ''http://www.w3.org/2001/XInclude'' (\u800C\u975E ''include'') \u4E2D\u7684\u5143\u7D20\u4F5C\u4E3A ''fallback'' \u5143\u7D20\u7684\u5B50\u7EA7\u3002\u4F46\u662F, \u627E\u5230 ''{0}''\u3002
-HrefMissing = \u7F3A\u5C11 'include' \u5143\u7D20\u7684 'href' \u5C5E\u6027\u3002
-RecursiveInclude = \u68C0\u6D4B\u5230\u9012\u5F52 include\u3002\u5DF2\u5904\u7406\u6587\u6863 ''{0}''\u3002
-InvalidParseValue = ''include'' \u5143\u7D20\u7684 ''parse'' \u5C5E\u6027\u7684\u503C\u65E0\u6548: ''{0}''\u3002
-XMLParseError = \u5C1D\u8BD5\u89E3\u6790 XML \u6587\u4EF6 (href=''{0}'') \u65F6\u51FA\u9519\u3002\u539F\u56E0: {1}
-XMLResourceError = Include \u64CD\u4F5C\u5931\u8D25, \u5E76\u8FD8\u539F\u4E3A fallback\u3002\u4EE5 XML (href=''{0}'') \u683C\u5F0F\u8BFB\u53D6\u6587\u4EF6\u65F6\u51FA\u73B0\u8D44\u6E90\u9519\u8BEF\u3002\u539F\u56E0: {1}
-TextResourceError = Include \u64CD\u4F5C\u5931\u8D25, \u5E76\u8FD8\u539F\u4E3A fallback\u3002\u4EE5\u6587\u672C (href=''{0}'') \u683C\u5F0F\u8BFB\u53D6\u6587\u4EF6\u65F6\u51FA\u73B0\u8D44\u6E90\u9519\u8BEF\u3002\u539F\u56E0: {1}
-NO_XPointerSchema = \u9ED8\u8BA4\u60C5\u51B5\u4E0B, \u4E0D\u652F\u6301 "{0}" \u7684\u65B9\u6848\u3002\u8BF7\u4E3A{0}\u5B9A\u4E49\u60A8\u81EA\u5DF1\u7684\u65B9\u6848\u3002\u8BF7\u8BBF\u95EE http://apache.org/xml/properties/xpointer-schema
-NO_SubResourceIdentified = \u65E0\u6CD5\u901A\u8FC7 XPointer Processor for Pointer {0} \u8BC6\u522B Subresource\u3002
-NonDuplicateNotation = \u4F7F\u7528\u4E86\u591A\u4E2A\u540D\u4E3A ''{0}'' \u7684\u8BB0\u53F7, \u4F46\u672A\u5C06\u8FD9\u4E9B\u8BB0\u53F7\u786E\u5B9A\u4E3A\u91CD\u590D\u9879\u3002
-NonDuplicateUnparsedEntity = \u4F7F\u7528\u4E86\u591A\u4E2A\u540D\u4E3A ''{0}'' \u7684\u672A\u89E3\u6790\u5B9E\u4F53, \u4F46\u672A\u5C06\u8FD9\u4E9B\u5B9E\u4F53\u786E\u5B9A\u4E3A\u91CD\u590D\u9879\u3002
-XpointerMissing = \u7F3A\u5C11 href \u5C5E\u6027\u65F6, \u5FC5\u987B\u5B58\u5728 xpointer \u5C5E\u6027\u3002
-AcceptMalformed = 'include' \u5143\u7D20\u7684 'accept' \u5C5E\u6027\u7684\u503C\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u8303\u56F4 #x20 \u81F3 #x7E \u4EE5\u5916\u7684\u5B57\u7B26\u3002
-AcceptLanguageMalformed = 'include' \u5143\u7D20\u7684 'accept-language' \u5C5E\u6027\u7684\u503C\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u8303\u56F4 #x20 \u81F3 #x7E \u4EE5\u5916\u7684\u5B57\u7B26\u3002
-RootElementRequired = \u683C\u5F0F\u6B63\u786E\u7684\u6587\u6863\u9700\u8981\u4E00\u4E2A\u6839\u5143\u7D20\u3002
-MultipleRootElements = \u683C\u5F0F\u6B63\u786E\u7684\u6587\u6863\u4E0D\u80FD\u5305\u542B\u591A\u4E2A\u6839\u5143\u7D20\u3002
-ContentIllegalAtTopLevel = \u5728\u9876\u7EA7\u6E90\u4FE1\u606F\u96C6\u4E2D\u663E\u793A\u4E3A\u6587\u6863\u5143\u7D20\u7684 'include' \u5143\u7D20\u7684\u66FF\u4EE3\u9879\u4E0D\u80FD\u5305\u542B\u5B57\u7B26\u3002
-UnexpandedEntityReferenceIllegal = \u5728\u9876\u7EA7\u6E90\u4FE1\u606F\u96C6\u4E2D\u663E\u793A\u4E3A\u6587\u6863\u5143\u7D20\u7684 'include' \u5143\u7D20\u7684\u66FF\u4EE3\u9879\u4E0D\u80FD\u5305\u542B\u672A\u5C55\u5F00\u7684\u5B9E\u4F53\u5F15\u7528\u3002
-HrefFragmentIdentifierIllegal = \u4E0D\u80FD\u4F7F\u7528\u7247\u6BB5\u6807\u8BC6\u7B26\u3002\u4E0D\u5141\u8BB8\u4F7F\u7528 ''href'' \u5C5E\u6027\u503C ''{0}''\u3002
-HrefSyntacticallyInvalid = ''href'' \u5C5E\u6027\u503C ''{0}'' \u7684\u8BED\u6CD5\u65E0\u6548\u3002\u5E94\u7528\u8F6C\u4E49\u89C4\u5219\u540E, \u8BE5\u503C\u4E0D\u662F\u8BED\u6CD5\u6B63\u786E\u7684 URI \u6216 IRI\u3002
-XPointerStreamability = \u5DF2\u6307\u5B9A\u6307\u5411\u6E90\u4FE1\u606F\u96C6\u4E2D\u7684\u4F4D\u7F6E\u7684 xpointer\u3002\u7531\u4E8E\u5904\u7406\u7A0B\u5E8F\u7684\u6D41\u5F0F\u6027\u8D28, \u65E0\u6CD5\u8BBF\u95EE\u6B64\u4F4D\u7F6E\u3002
+NoFallback = 带有 href ''{0}'' 的 ''include'' 失败, 并且找不到 ''fallback'' 元素。
+MultipleFallbacks = 'include' 元素的 [children] 不能包含多个 'fallback' 元素。
+FallbackParent = 找到未将 'include' 作为父级的 'fallback' 元素。
+IncludeChild = 不允许将名称空间 ''http://www.w3.org/2001/XInclude'' (而非 ''fallback'') 中的元素作为 ''include'' 元素的子级。但是, 找到 ''{0}''。
+FallbackChild = 不允许将名称空间 ''http://www.w3.org/2001/XInclude'' (而非 ''include'') 中的元素作为 ''fallback'' 元素的子级。但是, 找到 ''{0}''。
+HrefMissing = 缺少 'include' 元素的 'href' 属性。
+RecursiveInclude = 检测到递归 include。已处理文档 ''{0}''。
+InvalidParseValue = ''include'' 元素的 ''parse'' 属性的值无效: ''{0}''。
+XMLParseError = 尝试解析 XML 文件 (href=''{0}'') 时出错。原因: {1}
+XMLResourceError = Include 操作失败, 并还原为 fallback。以 XML (href=''{0}'') 格式读取文件时出现资源错误。原因: {1}
+TextResourceError = Include 操作失败, 并还原为 fallback。以文本 (href=''{0}'') 格式读取文件时出现资源错误。原因: {1}
+NO_XPointerSchema = 默认情况下, 不支持 "{0}" 的方案。请为{0}定义您自己的方案。请访问 http://apache.org/xml/properties/xpointer-schema
+NO_SubResourceIdentified = 无法通过 XPointer Processor for Pointer {0} 识别 Subresource。
+NonDuplicateNotation = 使用了多个名为 ''{0}'' 的记号, 但未将这些记号确定为重复项。
+NonDuplicateUnparsedEntity = 使用了多个名为 ''{0}'' 的未解析实体, 但未将这些实体确定为重复项。
+XpointerMissing = 缺少 href 属性时, 必须存在 xpointer 属性。
+AcceptMalformed = 'include' 元素的 'accept' 属性的值中不允许使用范围 #x20 至 #x7E 以外的字符。
+AcceptLanguageMalformed = 'include' 元素的 'accept-language' 属性的值中不允许使用范围 #x20 至 #x7E 以外的字符。
+RootElementRequired = 格式正确的文档需要一个根元素。
+MultipleRootElements = 格式正确的文档不能包含多个根元素。
+ContentIllegalAtTopLevel = 在顶级源信息集中显示为文档元素的 'include' 元素的替代项不能包含字符。
+UnexpandedEntityReferenceIllegal = 在顶级源信息集中显示为文档元素的 'include' 元素的替代项不能包含未展开的实体引用。
+HrefFragmentIdentifierIllegal = 不能使用片段标识符。不允许使用 ''href'' 属性值 ''{0}''。
+HrefSyntacticallyInvalid = ''href'' 属性值 ''{0}'' 的语法无效。应用转义规则后, 该值不是语法正确的 URI 或 IRI。
+XPointerStreamability = 已指定指向源信息集中的位置的 xpointer。由于处理程序的流式性质, 无法访问此位置。
 
-XPointerResolutionUnsuccessful = XPointer \u89E3\u6790\u672A\u6210\u529F\u3002
+XPointerResolutionUnsuccessful = XPointer 解析未成功。
 
 # Messages from erroneous set-up
-IncompatibleNamespaceContext = NamespaceContext \u7684\u7C7B\u578B\u4E0E\u4F7F\u7528 XInclude \u4E0D\u517C\u5BB9; \u5B83\u5FC5\u987B\u662F XIncludeNamespaceSupport \u7684\u5B9E\u4F8B
-ExpandedSystemId = \u65E0\u6CD5\u6269\u5C55\u5305\u542B\u8D44\u6E90\u7684\u7CFB\u7EDF ID
+IncompatibleNamespaceContext = NamespaceContext 的类型与使用 XInclude 不兼容; 它必须是 XIncludeNamespaceSupport 的实例
+ExpandedSystemId = 无法扩展包含资源的系统 ID
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties
index 949992305f9..a96a4f47b6b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties
@@ -24,38 +24,38 @@
 #
 
 # Messages for message reporting
-BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
-FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
+BadMessageKey = 找不到對應訊息索引鍵的錯誤訊息。
+FormatFailed = 格式化下列訊息時發生內部錯誤:\n
 
 # Messages for erroneous input
-NoFallback = \u542B\u6709 href ''{0}'' \u7684 ''include'' \u5931\u6557\uFF0C\u627E\u4E0D\u5230 ''fallback'' \u5143\u7D20\u3002
-MultipleFallbacks = 'include' \u5143\u7D20\u7684 [children] \u4E0D\u53EF\u5305\u542B\u8D85\u904E\u4E00\u500B\u4EE5\u4E0A\u7684 'fallback' \u5143\u7D20\u3002
-FallbackParent = \u627E\u5230\u4E00\u500B\u4E0D\u5177\u6709 'include' \u4F5C\u70BA\u7236\u9805\u7684 'fallback' \u5143\u7D20\u3002
-IncludeChild = \u4F86\u81EA\u547D\u540D\u7A7A\u9593 ''http://www.w3.org/2001/XInclude'' \u4E14\u4E0D\u662F ''fallback'' \u7684\u5143\u7D20\uFF0C\u4E0D\u5141\u8A31\u6210\u70BA ''include'' \u5143\u7D20\u7684\u5B50\u9805\u3002\u4E0D\u904E\uFF0C\u537B\u627E\u5230 ''{0}''\u3002
-FallbackChild = \u4F86\u81EA\u547D\u540D\u7A7A\u9593 ''http://www.w3.org/2001/XInclude'' \u4E14\u4E0D\u662F ''include'' \u7684\u5143\u7D20\uFF0C\u4E0D\u5141\u8A31\u6210\u70BA ''fallback'' \u5143\u7D20\u7684\u5B50\u9805\u3002\u4E0D\u904E\uFF0C\u537B\u627E\u5230 ''{0}''\u3002
-HrefMissing = \u907A\u6F0F 'include' \u5143\u7D20\u7684 'href' \u5C6C\u6027\u3002
-RecursiveInclude = \u5075\u6E2C\u5230\u905E\u8FF4\u5305\u542B\u3002\u5DF2\u7D93\u8655\u7406\u6587\u4EF6 ''{0}''\u3002
-InvalidParseValue = ''include'' \u5143\u7D20\u4E0A ''parse'' \u5C6C\u6027\u7684\u7121\u6548\u503C: ''{0}''\u3002
-XMLParseError = \u5617\u8A66\u5256\u6790 XML \u6A94\u6848 (href=''{0}'') \u6642\u767C\u751F\u932F\u8AA4\u3002\u539F\u56E0: {1}
-XMLResourceError = \u5305\u542B\u4F5C\u696D\u5931\u6557\uFF0C\u56DE\u5FA9\u81F3\u5F8C\u63F4\u3002\u4EE5 XML (href=''{0}'') \u65B9\u5F0F\u8B80\u53D6\u6A94\u6848\u6642\u767C\u751F\u8CC7\u6E90\u932F\u8AA4\u3002\u539F\u56E0: {1}
-TextResourceError = \u5305\u542B\u4F5C\u696D\u5931\u6557\uFF0C\u56DE\u5FA9\u81F3\u5F8C\u63F4\u3002\u4EE5\u6587\u5B57 (href=''{0}'') \u65B9\u5F0F\u8B80\u53D6\u6A94\u6848\u6642\u767C\u751F\u8CC7\u6E90\u932F\u8AA4\u3002\u539F\u56E0: {1}
-NO_XPointerSchema = \u9810\u8A2D\u4E0D\u652F\u63F4 "{0}" \u7684\u7DB1\u8981\u3002\u8ACB\u70BA {0} \u5B9A\u7FA9\u60A8\u81EA\u5DF1\u7684\u7DB1\u8981\u3002\u8ACB\u53C3\u95B1 http://apache.org/xml/properties/xpointer-schema
-NO_SubResourceIdentified = XPointer \u8655\u7406\u5668\u672A\u80FD\u70BA\u6307\u6A19 {0} \u8B58\u5225\u4EFB\u4F55\u5B50\u8CC7\u6E90\u3002
-NonDuplicateNotation = \u4F7F\u7528\u540D\u7A31\u70BA ''{0}'' \u7684\u591A\u500B\u8868\u793A\u6CD5\uFF0C\u4F46\u662F\u672A\u80FD\u5224\u65B7\u9019\u4E9B\u8868\u793A\u6CD5\u91CD\u8907\u3002
-NonDuplicateUnparsedEntity = \u4F7F\u7528\u540D\u7A31\u70BA ''{0}'' \u7684\u591A\u500B\u672A\u5256\u6790\u5BE6\u9AD4\uFF0C\u4F46\u662F\u672A\u80FD\u5224\u65B7\u9019\u4E9B\u5BE6\u9AD4\u91CD\u8907\u3002
-XpointerMissing = \u6C92\u6709 href \u5C6C\u6027\u6642\uFF0C\u5FC5\u9808\u6709 xpointer \u5C6C\u6027\u3002
-AcceptMalformed = 'include' \u5143\u7D20\u7684 'accept' \u5C6C\u6027\u503C\u4E2D\uFF0C\u4E0D\u5141\u8A31\u7BC4\u570D #x20 \u81F3 #x7E \u4E4B\u5916\u7684\u5B57\u5143\u3002
-AcceptLanguageMalformed = 'include' \u5143\u7D20\u7684 'accept-language' \u5C6C\u6027\u503C\u4E2D\uFF0C\u4E0D\u5141\u8A31\u7BC4\u570D #x20 \u81F3 #x7E \u4E4B\u5916\u7684\u5B57\u5143\u3002
-RootElementRequired = \u683C\u5F0F\u6B63\u78BA\u7684\u6587\u4EF6\u9700\u8981\u6839\u5143\u7D20\u3002
-MultipleRootElements = \u683C\u5F0F\u6B63\u78BA\u7684\u6587\u4EF6\u4E0D\u53EF\u5305\u542B\u591A\u500B\u6839\u5143\u7D20\u3002
-ContentIllegalAtTopLevel = \u53D6\u4EE3 'include' \u5143\u7D20\u4F5C\u70BA\u6700\u4E0A\u5C64\u4F86\u6E90 infoset \u7684\u6587\u4EF6\u5143\u7D20\u4E0D\u80FD\u5305\u542B\u5B57\u5143\u3002
-UnexpandedEntityReferenceIllegal = \u53D6\u4EE3 'include' \u5143\u7D20\u4F5C\u70BA\u6700\u4E0A\u5C64\u4F86\u6E90 infoset \u7684\u6587\u4EF6\u5143\u7D20\u4E0D\u80FD\u5305\u542B\u672A\u5C55\u958B\u7684\u5BE6\u9AD4\u53C3\u7167\u3002
-HrefFragmentIdentifierIllegal = \u4E0D\u53EF\u4F7F\u7528\u7247\u6BB5 ID\u3002\u4E0D\u5141\u8A31 ''href'' \u5C6C\u6027\u503C ''{0}''\u3002
-HrefSyntacticallyInvalid = ''href'' \u5C6C\u6027\u503C ''{0}'' \u53E5\u6CD5\u7121\u6548\u3002\u5957\u7528\u9041\u96E2\u898F\u5247\u4E4B\u5F8C\uFF0C\u503C\u70BA\u53E5\u6CD5\u6B63\u78BA\u7684 URI \u6216 IRI\u3002
-XPointerStreamability = \u6307\u5B9A xpointer \u6307\u5411\u4F86\u6E90 infoset \u4E2D\u7684\u4F4D\u7F6E\u3002\u7531\u65BC\u8655\u7406\u5668\u4E32\u6D41\u7279\u6027\uFF0C\u56E0\u6B64\u7121\u6CD5\u5B58\u53D6\u6B64\u4F4D\u7F6E\u3002
+NoFallback = 含有 href ''{0}'' 的 ''include'' 失敗，找不到 ''fallback'' 元素。
+MultipleFallbacks = 'include' 元素的 [children] 不可包含超過一個以上的 'fallback' 元素。
+FallbackParent = 找到一個不具有 'include' 作為父項的 'fallback' 元素。
+IncludeChild = 來自命名空間 ''http://www.w3.org/2001/XInclude'' 且不是 ''fallback'' 的元素，不允許成為 ''include'' 元素的子項。不過，卻找到 ''{0}''。
+FallbackChild = 來自命名空間 ''http://www.w3.org/2001/XInclude'' 且不是 ''include'' 的元素，不允許成為 ''fallback'' 元素的子項。不過，卻找到 ''{0}''。
+HrefMissing = 遺漏 'include' 元素的 'href' 屬性。
+RecursiveInclude = 偵測到遞迴包含。已經處理文件 ''{0}''。
+InvalidParseValue = ''include'' 元素上 ''parse'' 屬性的無效值: ''{0}''。
+XMLParseError = 嘗試剖析 XML 檔案 (href=''{0}'') 時發生錯誤。原因: {1}
+XMLResourceError = 包含作業失敗，回復至後援。以 XML (href=''{0}'') 方式讀取檔案時發生資源錯誤。原因: {1}
+TextResourceError = 包含作業失敗，回復至後援。以文字 (href=''{0}'') 方式讀取檔案時發生資源錯誤。原因: {1}
+NO_XPointerSchema = 預設不支援 "{0}" 的綱要。請為 {0} 定義您自己的綱要。請參閱 http://apache.org/xml/properties/xpointer-schema
+NO_SubResourceIdentified = XPointer 處理器未能為指標 {0} 識別任何子資源。
+NonDuplicateNotation = 使用名稱為 ''{0}'' 的多個表示法，但是未能判斷這些表示法重複。
+NonDuplicateUnparsedEntity = 使用名稱為 ''{0}'' 的多個未剖析實體，但是未能判斷這些實體重複。
+XpointerMissing = 沒有 href 屬性時，必須有 xpointer 屬性。
+AcceptMalformed = 'include' 元素的 'accept' 屬性值中，不允許範圍 #x20 至 #x7E 之外的字元。
+AcceptLanguageMalformed = 'include' 元素的 'accept-language' 屬性值中，不允許範圍 #x20 至 #x7E 之外的字元。
+RootElementRequired = 格式正確的文件需要根元素。
+MultipleRootElements = 格式正確的文件不可包含多個根元素。
+ContentIllegalAtTopLevel = 取代 'include' 元素作為最上層來源 infoset 的文件元素不能包含字元。
+UnexpandedEntityReferenceIllegal = 取代 'include' 元素作為最上層來源 infoset 的文件元素不能包含未展開的實體參照。
+HrefFragmentIdentifierIllegal = 不可使用片段 ID。不允許 ''href'' 屬性值 ''{0}''。
+HrefSyntacticallyInvalid = ''href'' 屬性值 ''{0}'' 句法無效。套用遁離規則之後，值為句法正確的 URI 或 IRI。
+XPointerStreamability = 指定 xpointer 指向來源 infoset 中的位置。由於處理器串流特性，因此無法存取此位置。
 
-XPointerResolutionUnsuccessful = XPointer \u89E3\u6790\u5931\u6557\u3002
+XPointerResolutionUnsuccessful = XPointer 解析失敗。
 
 # Messages from erroneous set-up
-IncompatibleNamespaceContext = NamespaceContext \u985E\u578B\u8207\u4F7F\u7528 XInclude \u4E0D\u76F8\u5BB9; \u5B83\u5FC5\u9808\u662F XIncludeNamespaceSupport \u7684\u57F7\u884C\u8655\u7406
-ExpandedSystemId = \u7121\u6CD5\u5C55\u958B\u5305\u542B\u8CC7\u6E90\u7684\u7CFB\u7D71 ID
+IncompatibleNamespaceContext = NamespaceContext 類型與使用 XInclude 不相容; 它必須是 XIncludeNamespaceSupport 的執行處理
+ExpandedSystemId = 無法展開包含資源的系統 ID
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
index 5fdc9d301fa..c66d659a350 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
@@ -20,22 +20,22 @@
 #
 # @version
 
-        BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
+        BadMessageKey = Die zum Meldungsschlüssel gehörige Fehlermeldung kann nicht gefunden werden.
         FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n  
 
 # Document messages
         PrematureEOF=Vorzeitiges Dateiende.
 # 2.1 Well-Formed XML Documents
-        RootElementRequired = Root-Element ist in einem ordnungsgem\u00E4\u00DF formatierten Dokument erforderlich.
+        RootElementRequired = Root-Element ist in einem ordnungsgemäß formatierten Dokument erforderlich.
 # 2.2 Characters
 
-        InvalidCharInCDSect = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im CDATA-Abschnitt gefunden.
-        InvalidCharInContent = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im Elementcontent des Dokuments gefunden.
-        TwoColonsInQName = Ung\u00FCltiger zweiter ":" wurde im Elementtyp oder Attributnamen gefunden.
-        ColonNotLegalWithNS = Doppelpunkt nicht zul\u00E4ssig im Namen "{0}", wenn Namespaces aktiviert sind.
-        InvalidCharInMisc = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im Markup nach Ende des Elementcontents gefunden.
-        InvalidCharInProlog = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im Prolog des Dokuments gefunden.
-        InvalidCharInXMLDecl = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der XML-Deklaration gefunden.
+        InvalidCharInCDSect = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde im CDATA-Abschnitt gefunden.
+        InvalidCharInContent = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde im Elementcontent des Dokuments gefunden.
+        TwoColonsInQName = Ungültiger zweiter ":" wurde im Elementtyp oder Attributnamen gefunden.
+        ColonNotLegalWithNS = Doppelpunkt nicht zulässig im Namen "{0}", wenn Namespaces aktiviert sind.
+        InvalidCharInMisc = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde im Markup nach Ende des Elementcontents gefunden.
+        InvalidCharInProlog = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde im Prolog des Dokuments gefunden.
+        InvalidCharInXMLDecl = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde in der XML-Deklaration gefunden.
 # 2.4 Character Data and Markup
         CDEndInContent = Zeichenfolge""]]>" darf nur im Content enthalten sein, wenn sie das Ende eines CDATA-Abschnitts markiert.
 # 2.7 CDATA Sections
@@ -43,161 +43,161 @@
 # 2.8 Prolog and Document Type Declaration
         XMLDeclMustBeFirst = XML-Deklaration darf nur ganz am Anfang des Dokuments enthalten sein.
         EqRequiredInXMLDecl = Zeichen " = " muss auf "{0}" in der XML-Deklaration folgen.
-        QuoteRequiredInXMLDecl = Der Wert nach "{0}" in der XML-Deklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
+        QuoteRequiredInXMLDecl = Der Wert nach "{0}" in der XML-Deklaration muss eine Zeichenfolge in Anführungszeichen sein.
         XMLDeclUnterminated = XML-Deklaration muss mit "?>" enden.
         VersionInfoRequired = Version ist in der XML-Deklaration erforderlich.
         SpaceRequiredBeforeVersionInXMLDecl = Leerstelle vor dem Versionspseudoattribut in der XML-Deklaration erforderlich.
         SpaceRequiredBeforeEncodingInXMLDecl = Leerstelle vor dem Codierungspseudoattribut in der XML-Deklaration erforderlich.
         SpaceRequiredBeforeStandalone = Leerstelle vor dem Codierungspseudoattribut in der XML-Deklaration erforderlich.
-        MarkupNotRecognizedInProlog = Markup im Dokument vor dem Root-Element muss ordnungsgem\u00E4\u00DF formatiert sein.
-        MarkupNotRecognizedInMisc = Markup im Dokument nach dem Root-Element muss ordnungsgem\u00E4\u00DF formatiert sein.
+        MarkupNotRecognizedInProlog = Markup im Dokument vor dem Root-Element muss ordnungsgemäß formatiert sein.
+        MarkupNotRecognizedInMisc = Markup im Dokument nach dem Root-Element muss ordnungsgemäß formatiert sein.
         AlreadySeenDoctype = doctype bereits gesehen.
-        DoctypeNotAllowed = DOCTYPE ist nicht zul\u00E4ssig, wenn das Feature "http://apache.org/xml/features/disallow-doctype-decl" auf "true" gesetzt ist.
-        ContentIllegalInProlog = Content ist nicht zul\u00E4ssig in Prolog.
-        ReferenceIllegalInProlog = Referenz ist nicht zul\u00E4ssig in Prolog.
+        DoctypeNotAllowed = DOCTYPE ist nicht zulässig, wenn das Feature "http://apache.org/xml/features/disallow-doctype-decl" auf "true" gesetzt ist.
+        ContentIllegalInProlog = Content ist nicht zulässig in Prolog.
+        ReferenceIllegalInProlog = Referenz ist nicht zulässig in Prolog.
 # Trailing Misc
-        ContentIllegalInTrailingMisc=Content ist nicht zul\u00E4ssig in angeh\u00E4ngtem Abschnitt.
-        ReferenceIllegalInTrailingMisc=Referenz ist nicht zul\u00E4ssig in angeh\u00E4ngtem Abschnitt.
+        ContentIllegalInTrailingMisc=Content ist nicht zulässig in angehängtem Abschnitt.
+        ReferenceIllegalInTrailingMisc=Referenz ist nicht zulässig in angehängtem Abschnitt.
 
 # 2.9 Standalone Document Declaration
         SDDeclInvalid = Standalone-Dokumentdeklarationswert muss "Ja" oder "Nein" und nicht "{0}" sein.
-        SDDeclNameInvalid = Der Standalone-Name in der XML-Deklaration ist m\u00F6glicherweise falsch geschrieben.
+        SDDeclNameInvalid = Der Standalone-Name in der XML-Deklaration ist möglicherweise falsch geschrieben.
 # 2.12 Language Identification
-        XMLLangInvalid = xml:lang-Attributwert "{0}" ist eine ung\u00FCltige Sprach-ID.
+        XMLLangInvalid = xml:lang-Attributwert "{0}" ist eine ungültige Sprach-ID.
 # 3. Logical Structures
         ETagRequired = Elementtyp "{0}" muss mit dem entsprechenden Endtag "</{0}>" beendet werden.
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ElementUnterminated = Auf Elementtyp "{0}" m\u00FCssen entweder Attributspezifikationen, ">" oder "/>" folgen.
-        EqRequiredInAttribute = Mit Elementtyp "{0}" verkn\u00FCpfter Attributname "{1}" muss vom Zeichen " = " gefolgt werden.
-        OpenQuoteExpected = \u00D6ffnendes Anf\u00FChrungszeichen wird f\u00FCr Attribut "{1}" erwartet, das mit Elementtyp "{0}" verkn\u00FCpft ist.
-        CloseQuoteExpected = Schlie\u00DFendes Anf\u00FChrungszeichen wird f\u00FCr Attribut "{1}" erwartet, das mit Elementtyp "{0}" verkn\u00FCpft ist.
-        AttributeNotUnique = Attribut "{1}" wurde bereits f\u00FCr Element "{0}" angegeben.
-        AttributeNSNotUnique = An Namespace "{2}" gebundenes Attribut "{1}" wurde bereits f\u00FCr Element "{0}" angegeben.
-        ETagUnterminated = Endtag f\u00FCr Elementtyp "{0}" muss mit einem ">"-Begrenzungszeichen enden.
-        MarkupNotRecognizedInContent = Der Content von Elementen muss aus ordnungsgem\u00E4\u00DF formatierten Zeichendaten oder Markups bestehen.
-        DoctypeIllegalInContent = DOCTYPE ist nicht zul\u00E4ssig in Content.
+        ElementUnterminated = Auf Elementtyp "{0}" müssen entweder Attributspezifikationen, ">" oder "/>" folgen.
+        EqRequiredInAttribute = Mit Elementtyp "{0}" verknüpfter Attributname "{1}" muss vom Zeichen " = " gefolgt werden.
+        OpenQuoteExpected = Öffnendes Anführungszeichen wird für Attribut "{1}" erwartet, das mit Elementtyp "{0}" verknüpft ist.
+        CloseQuoteExpected = Schließendes Anführungszeichen wird für Attribut "{1}" erwartet, das mit Elementtyp "{0}" verknüpft ist.
+        AttributeNotUnique = Attribut "{1}" wurde bereits für Element "{0}" angegeben.
+        AttributeNSNotUnique = An Namespace "{2}" gebundenes Attribut "{1}" wurde bereits für Element "{0}" angegeben.
+        ETagUnterminated = Endtag für Elementtyp "{0}" muss mit einem ">"-Begrenzungszeichen enden.
+        MarkupNotRecognizedInContent = Der Content von Elementen muss aus ordnungsgemäß formatierten Zeichendaten oder Markups bestehen.
+        DoctypeIllegalInContent = DOCTYPE ist nicht zulässig in Content.
 # 4.1 Character and Entity References
         ReferenceUnterminated = Referenz muss mit einem ";"-Begrenzungszeichen beendet werden.
 # 4.3.2 Well-Formed Parsed Entities
-        ReferenceNotInOneEntity = Referenz muss vollst\u00E4ndig in derselben geparsten Entity enthalten sein.
+        ReferenceNotInOneEntity = Referenz muss vollständig in derselben geparsten Entity enthalten sein.
         ElementEntityMismatch = Element "{0}" muss innerhalb derselben Entity beginnen und enden.
-        MarkupEntityMismatch=XML-Dokumentstrukturen m\u00FCssen innerhalb derselben Entity beginnen und enden.
+        MarkupEntityMismatch=XML-Dokumentstrukturen müssen innerhalb derselben Entity beginnen und enden.
 
 # Messages common to Document and DTD
 # 2.2 Characters
-        InvalidCharInAttValue = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{2}) wurde im Wert des Attributs "{1}" gefunden. Element ist "{0}".
-        InvalidCharInComment = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im Kommentar gefunden.
-        InvalidCharInPI = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der Verarbeitungsanweisung gefunden.
-        InvalidCharInInternalSubset = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der internen Teilmenge der DTD gefunden.
-        InvalidCharInTextDecl = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der Textdeklaration gefunden.
+        InvalidCharInAttValue = Ungültiges XML-Zeichen (Unicode: 0x{2}) wurde im Wert des Attributs "{1}" gefunden. Element ist "{0}".
+        InvalidCharInComment = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde im Kommentar gefunden.
+        InvalidCharInPI = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde in der Verarbeitungsanweisung gefunden.
+        InvalidCharInInternalSubset = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde in der internen Teilmenge der DTD gefunden.
+        InvalidCharInTextDecl = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde in der Textdeklaration gefunden.
 # 2.3 Common Syntactic Constructs
-        QuoteRequiredInAttValue = Wert des Attributs "{1}" muss mit einem einzelnen oder doppelten Anf\u00FChrungszeichen beginnen.
-        LessthanInAttValue = Wert des Attributs "{1}", das mit Elementtyp "{0}" verkn\u00FCpft ist, darf nicht das Zeichen "<" enthalten.
-        AttributeValueUnterminated = Wert f\u00FCr Attribut "{1}" muss mit dem entsprechenden Anf\u00FChrungszeichen enden.
+        QuoteRequiredInAttValue = Wert des Attributs "{1}" muss mit einem einzelnen oder doppelten Anführungszeichen beginnen.
+        LessthanInAttValue = Wert des Attributs "{1}", das mit Elementtyp "{0}" verknüpft ist, darf nicht das Zeichen "<" enthalten.
+        AttributeValueUnterminated = Wert für Attribut "{1}" muss mit dem entsprechenden Anführungszeichen enden.
 # 2.5 Comments
         InvalidCommentStart = Kommentar muss mit "<!--" beginnen.
-        DashDashInComment = Zeichenfolge "--" ist in Kommentaren nicht zul\u00E4ssig.
+        DashDashInComment = Zeichenfolge "--" ist in Kommentaren nicht zulässig.
         CommentUnterminated = Kommentar muss mit "-->" enden.
         COMMENT_NOT_IN_ONE_ENTITY = Kommentar ist nicht in derselben Entity enthalten.
 # 2.6 Processing Instructions
         PITargetRequired = Verarbeitungsanweisung muss mit dem Namen des Ziels beginnen.
         SpaceRequiredInPI = Leerstelle ist zwischen dem Ziel der Verarbeitungsanweisung und den Daten erforderlich.
         PIUnterminated = Verarbeitungsanweisung muss mit "?>" enden.
-        ReservedPITarget = Verarbeitungsanweisungsziel, das "[xX][mM][lL]" entspricht, ist nicht zul\u00E4ssig.
+        ReservedPITarget = Verarbeitungsanweisungsziel, das "[xX][mM][lL]" entspricht, ist nicht zulässig.
         PI_NOT_IN_ONE_ENTITY = Verarbeitungsanweisung ist nicht in derselben Entity enthalten.
 # 2.8 Prolog and Document Type Declaration
-        VersionInfoInvalid = Ung\u00FCltige Version "{0}".
-        VersionNotSupported = XML-Version "{0}" wird nicht unterst\u00FCtzt. Nur XML 1.0 wird unterst\u00FCtzt.
-        VersionNotSupported11 = XML-Version "{0}" wird nicht unterst\u00FCtzt. Nur XML 1.0 und XML 1.1 werden unterst\u00FCtzt.
-        VersionMismatch= Eine Entity kann keine andere Entity einer sp\u00E4teren Version enthalten.
+        VersionInfoInvalid = Ungültige Version "{0}".
+        VersionNotSupported = XML-Version "{0}" wird nicht unterstützt. Nur XML 1.0 wird unterstützt.
+        VersionNotSupported11 = XML-Version "{0}" wird nicht unterstützt. Nur XML 1.0 und XML 1.1 werden unterstützt.
+        VersionMismatch= Eine Entity kann keine andere Entity einer späteren Version enthalten.
 # 4.1 Character and Entity References
         DigitRequiredInCharRef = Auf "&#" in einer Zeichenreferenz muss umgehend eine Dezimaldarstellung folgen.
         HexdigitRequiredInCharRef = Auf "&#x" in einer Zeichenreferenz muss umgehend eine hexadezimale Darstellung folgen.
         SemicolonRequiredInCharRef = Zeichenreferenz muss mit dem Begrenzungszeichen ";" enden.
-        InvalidCharRef = Zeichenreferenz "&#{0}" ist ein ung\u00FCltiges XML-Zeichen.
+        InvalidCharRef = Zeichenreferenz "&#{0}" ist ein ungültiges XML-Zeichen.
         NameRequiredInReference = Auf "&" in der Entityreferenz muss umgehend der Entityname folgen.
         SemicolonRequiredInReference = Referenz zu Entity "{0}" muss mit dem Begrenzungszeichen ";" enden.
 # 4.3.1 The Text Declaration
         TextDeclMustBeFirst = Textdeklaration darf nur ganz am Anfang der externen geparsten Entity enthalten sein.
         EqRequiredInTextDecl = Zeichen " = " muss auf "{0}" in der Textdeklaration folgen.
-        QuoteRequiredInTextDecl = Der Wert nach "{0}" in der Textdeklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
-        CloseQuoteMissingInTextDecl = Schlie\u00DFendes Anf\u00FChrungszeichen im Wert nach "{0}" in der Textdeklaration fehlt.
+        QuoteRequiredInTextDecl = Der Wert nach "{0}" in der Textdeklaration muss eine Zeichenfolge in Anführungszeichen sein.
+        CloseQuoteMissingInTextDecl = Schließendes Anführungszeichen im Wert nach "{0}" in der Textdeklaration fehlt.
         SpaceRequiredBeforeVersionInTextDecl = Leerstelle vor dem Versionspseudoattribut in der Textdeklaration erforderlich.
         SpaceRequiredBeforeEncodingInTextDecl = Leerstelle vor dem Codierungspseudoattribut in der Textdeklaration erforderlich.
         TextDeclUnterminated = Textdeklaration muss mit "?>" enden.
         EncodingDeclRequired = Codierungsdeklaration ist in der Textdeklaration erforderlich.
-        NoMorePseudoAttributes = Es sind keine weiteren Pseudoattribute zul\u00E4ssig.
+        NoMorePseudoAttributes = Es sind keine weiteren Pseudoattribute zulässig.
         MorePseudoAttributes = Es werden weitere Pseudoattribute erwartet.
         PseudoAttrNameExpected = Pseudoattributname wird erwartet. 
 # 4.3.2 Well-Formed Parsed Entities
-        CommentNotInOneEntity = Kommentar muss vollst\u00E4ndig in derselben geparsten Entity enthalten sein.
-        PINotInOneEntity = Verarbeitungsanweisung muss vollst\u00E4ndig in derselben geparsten Entity enthalten sein.
+        CommentNotInOneEntity = Kommentar muss vollständig in derselben geparsten Entity enthalten sein.
+        PINotInOneEntity = Verarbeitungsanweisung muss vollständig in derselben geparsten Entity enthalten sein.
 # 4.3.3 Character Encoding in Entities
-        EncodingDeclInvalid = Ung\u00FCltiger Codierungsname "{0}".
-        EncodingByteOrderUnsupported = Angegebene Bytereihenfolge f\u00FCr die Codierung von "{0}" wird nicht unterst\u00FCtzt.
-        InvalidByte = Ung\u00FCltiges Byte {0} von {1}-Byte-UTF-8-Sequenz.
+        EncodingDeclInvalid = Ungültiger Codierungsname "{0}".
+        EncodingByteOrderUnsupported = Angegebene Bytereihenfolge für die Codierung von "{0}" wird nicht unterstützt.
+        InvalidByte = Ungültiges Byte {0} von {1}-Byte-UTF-8-Sequenz.
         ExpectedByte = Byte {0} von {1}-Byte-UTF-8-Sequenz erwartet.  
-        InvalidHighSurrogate = High-Surrogate-Bits in UTF-8-Sequenz d\u00FCrfen 0x10 nicht \u00FCberschreiten, gefunden wurde aber 0x{0}.
-        OperationNotSupported = Vorgang "{0}" nicht unterst\u00FCtzt von {1}-Reader.
-        InvalidASCII = Byte "{0}" geh\u00F6rt nicht zum (7-Bit) ASCII-Zeichensatz.
-        CharConversionFailure = Eine Entity, f\u00FCr die eine bestimmte Codierung ermittelt wurde, darf keine Sequenzen enthalten, die in dieser Codierung unzul\u00E4ssig sind.
+        InvalidHighSurrogate = High-Surrogate-Bits in UTF-8-Sequenz dürfen 0x10 nicht überschreiten, gefunden wurde aber 0x{0}.
+        OperationNotSupported = Vorgang "{0}" nicht unterstützt von {1}-Reader.
+        InvalidASCII = Byte "{0}" gehört nicht zum (7-Bit) ASCII-Zeichensatz.
+        CharConversionFailure = Eine Entity, für die eine bestimmte Codierung ermittelt wurde, darf keine Sequenzen enthalten, die in dieser Codierung unzulässig sind.
 
 # DTD Messages
 # 2.2 Characters
-        InvalidCharInEntityValue = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im literalen Entitywert gefunden.
-        InvalidCharInExternalSubset = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der externen Teilmenge der DTD gefunden.
-        InvalidCharInIgnoreSect = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im ausgeschlossenen Bedingungsabschnitt gefunden.
-        InvalidCharInPublicID = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der \u00F6ffentlichen ID gefunden.
-        InvalidCharInSystemID = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der System-ID gefunden.
+        InvalidCharInEntityValue = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde im literalen Entitywert gefunden.
+        InvalidCharInExternalSubset = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde in der externen Teilmenge der DTD gefunden.
+        InvalidCharInIgnoreSect = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde im ausgeschlossenen Bedingungsabschnitt gefunden.
+        InvalidCharInPublicID = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde in der öffentlichen ID gefunden.
+        InvalidCharInSystemID = Ungültiges XML-Zeichen (Unicode: 0x{0}) wurde in der System-ID gefunden.
 # 2.3 Common Syntactic Constructs
-        SpaceRequiredAfterSYSTEM = Leerstelle nach Schl\u00FCsselwort SYSTEM in DOCTYPE-Deklaration erforderlich.
-        QuoteRequiredInSystemID = System-ID muss mit einem einzelnen oder doppelten Anf\u00FChrungszeichen beginnen.
-        SystemIDUnterminated = System-ID muss mit dem entsprechenden Anf\u00FChrungszeichen enden.
-        SpaceRequiredAfterPUBLIC = Leerstellen nach Schl\u00FCsselwort PUBLIC in DOCTYPE-Deklaration erforderlich.
-        QuoteRequiredInPublicID = \u00D6ffentliche ID muss mit einem einzelnen oder doppelten Anf\u00FChrungszeichen beginnen.
-        PublicIDUnterminated = \u00D6ffentliche ID muss mit dem entsprechenden Anf\u00FChrungszeichen enden.
-        PubidCharIllegal = Zeichen (Unicode: 0x{0}) ist nicht zul\u00E4ssig in der \u00F6ffentlichen ID.
+        SpaceRequiredAfterSYSTEM = Leerstelle nach Schlüsselwort SYSTEM in DOCTYPE-Deklaration erforderlich.
+        QuoteRequiredInSystemID = System-ID muss mit einem einzelnen oder doppelten Anführungszeichen beginnen.
+        SystemIDUnterminated = System-ID muss mit dem entsprechenden Anführungszeichen enden.
+        SpaceRequiredAfterPUBLIC = Leerstellen nach Schlüsselwort PUBLIC in DOCTYPE-Deklaration erforderlich.
+        QuoteRequiredInPublicID = Öffentliche ID muss mit einem einzelnen oder doppelten Anführungszeichen beginnen.
+        PublicIDUnterminated = Öffentliche ID muss mit dem entsprechenden Anführungszeichen enden.
+        PubidCharIllegal = Zeichen (Unicode: 0x{0}) ist nicht zulässig in der öffentlichen ID.
         SpaceRequiredBetweenPublicAndSystem = Leerstellen erforderlich zwischen publicId und systemId.
 # 2.8 Prolog and Document Type Declaration
         MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Leerstelle nach "<!DOCTYPE" in der Dokumenttypdeklaration erforderlich.
         MSG_ROOT_ELEMENT_TYPE_REQUIRED = Root-Elementtyp muss nach "<!DOCTYPE" in der Dokumenttypdeklaration enthalten sein.
-        DoctypedeclUnterminated = Dokumenttypdeklaration f\u00FCr Root-Elementtyp "{0}" muss mit ">" enden.
-        DoctypedeclNotClosed = Dokumenttypdeklaration f\u00FCr Root-Elementtyp "{0}" muss mit '']'' enden.
+        DoctypedeclUnterminated = Dokumenttypdeklaration für Root-Elementtyp "{0}" muss mit ">" enden.
+        DoctypedeclNotClosed = Dokumenttypdeklaration für Root-Elementtyp "{0}" muss mit '']'' enden.
         PEReferenceWithinMarkup = Parameterentityreferenz "%{0};" darf nicht in Markup in der internen Teilmenge der DTD vorkommen.
-        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Die Markup-Deklarationen, die in der Dokumenttypdeklaration enthalten sind bzw. auf die von der Dokumenttypdeklaration verwiesen wird, m\u00FCssen ordnungsgem\u00E4\u00DF formatiert sein.
+        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Die Markup-Deklarationen, die in der Dokumenttypdeklaration enthalten sind bzw. auf die von der Dokumenttypdeklaration verwiesen wird, müssen ordnungsgemäß formatiert sein.
 # 2.10 White Space Handling
-        MSG_XML_SPACE_DECLARATION_ILLEGAL = Attributdeklaration f\u00FCr "xml:space" muss als aufgez\u00E4hlter Typ angegeben werden, dessen einzigen m\u00F6glichen Werte "default" und "preserve" sind.
+        MSG_XML_SPACE_DECLARATION_ILLEGAL = Attributdeklaration für "xml:space" muss als aufgezählter Typ angegeben werden, dessen einzigen möglichen Werte "default" und "preserve" sind.
 # 3.2 Element Type Declarations
         MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Leerstelle nach "<!ELEMENT" in der Elementtypdeklaration erforderlich.
         MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Elementtyp ist in der Elementtypdeklaration erforderlich.
         MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Leerstelle nach Elementtyp "{0}" in der Elementtypdeklaration erforderlich.
         MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Constraint ist nach dem Elementtyp "{0}" in der Elementtypdeklaration erforderlich.
-        ElementDeclUnterminated = Deklaration f\u00FCr Elementtyp "{0}" muss mit ">" enden.
+        ElementDeclUnterminated = Deklaration für Elementtyp "{0}" muss mit ">" enden.
 # 3.2.1 Element Content
         MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Das Zeichen "(" oder ein Elementtyp ist in der Deklaration des Elementtyps "{0}" erforderlich.
         MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Das Zeichen ")" ist in der Deklaration des Elementtyps "{0}" erforderlich.
 # 3.2.2 Mixed Content
         MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Ein Elementtyp ist in der Deklaration des Elementtyps "{0}" erforderlich.
         MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Das Zeichen ")" ist in der Deklaration des Elementtyps "{0}" erforderlich.
-        MixedContentUnterminated = Das Mischcontentmodell "{0}" muss mit ")*" enden, wenn die Typen der untergeordneten Elemente eingeschr\u00E4nkt sind.
+        MixedContentUnterminated = Das Mischcontentmodell "{0}" muss mit ")*" enden, wenn die Typen der untergeordneten Elemente eingeschränkt sind.
 # 3.3 Attribute-List Declarations
         MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Leerstelle nach "<!ATTLIST" in der Attributlistendeklaration erforderlich.
         MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Elementtyp ist in der Attributlistendeklaration erforderlich.
-        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Leerstelle vor dem Attributnamen in der Attributlistendeklaration f\u00FCr Element "{0}" erforderlich.
-        AttNameRequiredInAttDef = Attributname muss in der Attributlistendeklaration f\u00FCr Element "{0}" angegeben werden.
-        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Leerstelle vor dem Attributtyp in der Deklaration des Attributs "{1}" f\u00FCr Element "{0}" erforderlich.
-        AttTypeRequiredInAttDef = Attributtyp ist in der Deklaration des Attributs "{1}" f\u00FCr Element "{0}" erforderlich.
-        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Leerstelle vor dem Attributstandard in der Deklaration des Attributs "{1}" f\u00FCr Element "{0}" erforderlich.
-        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mehrere Attributdefinitionen f\u00FCr dasselbe Attribut "{1}" eines Elements "{0}" angegeben.
+        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Leerstelle vor dem Attributnamen in der Attributlistendeklaration für Element "{0}" erforderlich.
+        AttNameRequiredInAttDef = Attributname muss in der Attributlistendeklaration für Element "{0}" angegeben werden.
+        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Leerstelle vor dem Attributtyp in der Deklaration des Attributs "{1}" für Element "{0}" erforderlich.
+        AttTypeRequiredInAttDef = Attributtyp ist in der Deklaration des Attributs "{1}" für Element "{0}" erforderlich.
+        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Leerstelle vor dem Attributstandard in der Deklaration des Attributs "{1}" für Element "{0}" erforderlich.
+        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mehrere Attributdefinitionen für dasselbe Attribut "{1}" eines Elements "{0}" angegeben.
 # 3.3.1 Attribute Types
         MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Leerstelle nach "NOTATION" in der "{1}"-Attributdeklaration erforderlich.
         MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Das Zeichen "(" muss auf "NOTATION" in der "{1}"-Attributdeklaration folgen.
-        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsname ist in der Notationstypliste f\u00FCr die "{1}"-Attributdeklaration erforderlich.
+        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsname ist in der Notationstypliste für die "{1}"-Attributdeklaration erforderlich.
         NotationTypeUnterminated = Notationstypliste muss mit ")" in der"{1}"-Attributdeklaration enden.
-        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namenstoken ist in der aufgez\u00E4hlten Typliste f\u00FCr die "{1}"-Attributdeklaration erforderlich.
-        EnumerationUnterminated = Aufgez\u00E4hlte Typliste muss mit ")" in der"{1}"-Attributdeklaration enden.
-        MSG_DISTINCT_TOKENS_IN_ENUMERATION = Enumerationswert "{1}" wurde mehrmals in der Deklaration des Attributs "{2}" f\u00FCr Element "{0}" angegeben. Die NMTOKENS in einer einzelnen "Enumeration"-Attributdeklaration m\u00FCssen alle eindeutig sein.
-        MSG_DISTINCT_NOTATION_IN_ENUMERATION = Enumerationswert "{1}" wurde mehrmals in der Deklaration des Attributs "{2}" f\u00FCr Element "{0}" angegeben. Die NOTATION-Namen in einer einzelnen NotationType-Attributdeklaration m\u00FCssen alle eindeutig sein.
+        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namenstoken ist in der aufgezählten Typliste für die "{1}"-Attributdeklaration erforderlich.
+        EnumerationUnterminated = Aufgezählte Typliste muss mit ")" in der"{1}"-Attributdeklaration enden.
+        MSG_DISTINCT_TOKENS_IN_ENUMERATION = Enumerationswert "{1}" wurde mehrmals in der Deklaration des Attributs "{2}" für Element "{0}" angegeben. Die NMTOKENS in einer einzelnen "Enumeration"-Attributdeklaration müssen alle eindeutig sein.
+        MSG_DISTINCT_NOTATION_IN_ENUMERATION = Enumerationswert "{1}" wurde mehrmals in der Deklaration des Attributs "{2}" für Element "{0}" angegeben. Die NOTATION-Namen in einer einzelnen NotationType-Attributdeklaration müssen alle eindeutig sein.
 # 3.3.2 Attribute Defaults
         MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Leerstelle nach "FIXED" in der "{1}"-Attributdeklaration erforderlich.
 # 3.4 Conditional Sections
@@ -212,23 +212,23 @@
         MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Leerstelle zwischen "%" und dem Entitynamen in der Parameterentitydeklaration erforderlich.
         MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Name der Entity ist in der Entitydeklaration erforderlich.
         MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Leerstelle zwischen dem Entitynamen "{0}" und der Definition in der Entitydeklaration erforderlich.
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Leerstelle zwischen "NDATA" und dem Notationsnamen in der Deklaration f\u00FCr die Entity "{0} erforderlich.
-        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Leerstelle vor "NDATA" in der Deklaration f\u00FCr die Entity "{0} erforderlich.
-        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Notationsname ist nach "NDATA" in der Deklaration f\u00FCr die Entity "{0} erforderlich.
-        EntityDeclUnterminated = Deklaration f\u00FCr Entity "{0}" muss mit ">" enden.
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Leerstelle zwischen "NDATA" und dem Notationsnamen in der Deklaration für die Entity "{0} erforderlich.
+        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Leerstelle vor "NDATA" in der Deklaration für die Entity "{0} erforderlich.
+        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Notationsname ist nach "NDATA" in der Deklaration für die Entity "{0} erforderlich.
+        EntityDeclUnterminated = Deklaration für Entity "{0}" muss mit ">" enden.
 	MSG_DUPLICATE_ENTITY_DEFINITION = Entity "{0}" wurde mehrmals deklariert.        
 # 4.2.2 External Entities
         ExternalIDRequired = Externe Entitydeklaration muss mit "SYSTEM" oder "PUBLIC" beginnen.
-        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Leerstelle zwischen "PUBLIC" und der \u00F6ffentlichen ID erforderlich.
-        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Leerstelle zwischen der \u00F6ffentlichen ID und der System-ID erforderlich.
+        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Leerstelle zwischen "PUBLIC" und der öffentlichen ID erforderlich.
+        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Leerstelle zwischen der öffentlichen ID und der System-ID erforderlich.
         MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Leerstelle zwischen "SYSTEM" und der System-ID erforderlich.
         MSG_URI_FRAGMENT_IN_SYSTEMID = Fragment-ID darf nicht als Teil der System-ID "{0}" angegeben werden.
 # 4.7 Notation Declarations
         MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Leerstelle nach "<!NOTATION" in der Notationsdeklaration erforderlich.
         MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Name der Notation ist in der Notationsdeklaration erforderlich.
         MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Leerstelle nach dem Notationsnamen "{0}" in der Notationsdeklaration erforderlich.
-        ExternalIDorPublicIDRequired = Deklaration f\u00FCr die Notation "{0}" muss eine System- oder eine \u00F6ffentliche ID enthalten.
-        NotationDeclUnterminated = Deklaration f\u00FCr die Notation "{0}" muss mit ">" enden.
+        ExternalIDorPublicIDRequired = Deklaration für die Notation "{0}" muss eine System- oder eine öffentliche ID enthalten.
+        NotationDeclUnterminated = Deklaration für die Notation "{0}" muss mit ">" enden.
 
 # Validation messages
         DuplicateTypeInMixedContent = Elementtyp "{1}" wurde bereits im Contentmodell der Elementdeklaration"{0}" angegeben.
@@ -241,69 +241,69 @@
         IDREFInvalid = Attributwert "{0}" mit dem Typ IDREF muss ein Name sein.
         IDREFInvalidWithNamespaces = Attributwert "{0}" mit dem Typ IDREF muss ein NCName sein, wenn Namespaces aktiviert sind.
         IDREFSInvalid = Attributwert "{0}" mit dem Typ IDREFS muss mindestens ein Name sein.
-        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Ersatztext der Parameterentity "{0}" muss ordnungsgem\u00E4\u00DF verschachtelte Deklarationen enthalten, wenn die Entityreferenz als vollst\u00E4ndige Deklaration verwendet wird.
-        ImproperDeclarationNesting = Ersatztext der Parameterentity "{0}" muss ordnungsgem\u00E4\u00DF verschachtelte Deklarationen enthalten.
-        ImproperGroupNesting = Ersatztext der Parameterentity "{0}" muss ordnungsgem\u00E4\u00DF verschachtelte Klammernpaare enthalten.
+        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Ersatztext der Parameterentity "{0}" muss ordnungsgemäß verschachtelte Deklarationen enthalten, wenn die Entityreferenz als vollständige Deklaration verwendet wird.
+        ImproperDeclarationNesting = Ersatztext der Parameterentity "{0}" muss ordnungsgemäß verschachtelte Deklarationen enthalten.
+        ImproperGroupNesting = Ersatztext der Parameterentity "{0}" muss ordnungsgemäß verschachtelte Klammernpaare enthalten.
         INVALID_PE_IN_CONDITIONAL = Ersatztext der Parameterentity "{0}" muss den gesamten Bedingungsabschnitt oder nur INCLUDE oder IGNORE enthalten.
-        MSG_ATTRIBUTE_NOT_DECLARED = Attribut "{1}" muss f\u00FCr Elementtyp "{0}" deklariert werden.
+        MSG_ATTRIBUTE_NOT_DECLARED = Attribut "{1}" muss für Elementtyp "{0}" deklariert werden.
         MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = Attribut "{0}" mit Wert "{1}" muss einen Wert aus der Liste "{2}" haben.
-        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = Der Wert "{1}" des Attributs "{0}" darf nicht von der Normalisierung (zu "{2}") in einem Standalone-Dokument ge\u00E4ndert werden.
-        MSG_CONTENT_INCOMPLETE = Content des Elementtyps "{0}" ist unvollst\u00E4ndig. Muss "{1}" entsprechen.
+        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = Der Wert "{1}" des Attributs "{0}" darf nicht von der Normalisierung (zu "{2}") in einem Standalone-Dokument geändert werden.
+        MSG_CONTENT_INCOMPLETE = Content des Elementtyps "{0}" ist unvollständig. Muss "{1}" entsprechen.
         MSG_CONTENT_INVALID = Content des Elementtyps "{0}" muss "{1}" entsprechen.
-        MSG_CONTENT_INVALID_SPECIFIED = Content des Elementtyps "{0}" muss "{1}" entsprechen. Untergeordnete Elemente mit dem Typ "{2}" sind nicht zul\u00E4ssig.
-        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = Attribut "{1}" f\u00FCr Elementtyp "{0}" hat einen Standardwert und muss in einem Standalone-Dokument angegeben werden.
-        MSG_DUPLICATE_ATTDEF = Attribut "{1}" ist bereits deklariert f\u00FCr Elementtyp "{0}".
+        MSG_CONTENT_INVALID_SPECIFIED = Content des Elementtyps "{0}" muss "{1}" entsprechen. Untergeordnete Elemente mit dem Typ "{2}" sind nicht zulässig.
+        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = Attribut "{1}" für Elementtyp "{0}" hat einen Standardwert und muss in einem Standalone-Dokument angegeben werden.
+        MSG_DUPLICATE_ATTDEF = Attribut "{1}" ist bereits deklariert für Elementtyp "{0}".
         MSG_ELEMENT_ALREADY_DECLARED = Elementtyp "{0}" darf nicht mehrmals deklariert werden.
         MSG_ELEMENT_NOT_DECLARED = Elementtyp "{0}" muss deklariert werden.
-        MSG_GRAMMAR_NOT_FOUND = Dokument ist ung\u00FCltig. Keine Grammatik gefunden.
+        MSG_GRAMMAR_NOT_FOUND = Dokument ist ungültig. Keine Grammatik gefunden.
         MSG_ELEMENT_WITH_ID_REQUIRED = Element mit "{0}" ist im Dokument erforderlich.
-        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Referenz zur externen Entity "{0}" ist in einem Standalone-Dokument nicht zul\u00E4ssig.
+        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Referenz zur externen Entity "{0}" ist in einem Standalone-Dokument nicht zulässig.
         MSG_FIXED_ATTVALUE_INVALID = Attribut "{1}" mit Wert "{2}" muss den Wert"{3}" haben.
-        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Elementtyp "{0}" hat bereits ein Attribut "{1}" mit dem Typ ID. Ein zweites Attribut "{2}" mit dem Typ ID ist nicht zul\u00E4ssig.
-        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Elementtyp "{0}" hat bereits ein Attribut "{1}" mit dem Typ NOTATION. Ein zweites Attribut "{2}" mit dem Typ NOTATION ist nicht zul\u00E4ssig.
-        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = Notation "{1}" muss deklariert werden, wenn sie in der Notationstypliste f\u00FCr Attribut "{0}" referenziert wird.
-        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = Notation "{1}" muss deklariert werden, wenn sie in der Deklaration der nicht geparsten Entity f\u00FCr "{0}" referenziert wird.
-        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referenz zur Entity "{0}", die in einer externen geparsten Entity deklariert wird, ist in einem Standalone-Dokument nicht zul\u00E4ssig.
-        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attribut "{1}" ist erforderlich und muss f\u00FCr Elementtyp "{0}" angegeben werden.
-        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Es d\u00FCrfen keine Leerstellen zwischen Elementen in einem Standalone-Dokument vorkommen, die in einer externen geparsten Entity mit Elementcontent deklariert sind.
+        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Elementtyp "{0}" hat bereits ein Attribut "{1}" mit dem Typ ID. Ein zweites Attribut "{2}" mit dem Typ ID ist nicht zulässig.
+        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Elementtyp "{0}" hat bereits ein Attribut "{1}" mit dem Typ NOTATION. Ein zweites Attribut "{2}" mit dem Typ NOTATION ist nicht zulässig.
+        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = Notation "{1}" muss deklariert werden, wenn sie in der Notationstypliste für Attribut "{0}" referenziert wird.
+        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = Notation "{1}" muss deklariert werden, wenn sie in der Deklaration der nicht geparsten Entity für "{0}" referenziert wird.
+        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referenz zur Entity "{0}", die in einer externen geparsten Entity deklariert wird, ist in einem Standalone-Dokument nicht zulässig.
+        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attribut "{1}" ist erforderlich und muss für Elementtyp "{0}" angegeben werden.
+        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Es dürfen keine Leerstellen zwischen Elementen in einem Standalone-Dokument vorkommen, die in einer externen geparsten Entity mit Elementcontent deklariert sind.
         NMTOKENInvalid = Attributwert "{0}" mit dem Typ NMTOKEN muss ein Namenstoken sein.
         NMTOKENSInvalid = Attributwert "{0}" mit dem Typ NMTOKENS muss mindestens ein Namenstoken sein.
         NoNotationOnEmptyElement = Elementtyp "{0}", der als EMPTY deklariert wurde, kann nicht das Attribut "{1}" mit dem Typ NOTATION deklarieren.
-        RootElementTypeMustMatchDoctypedecl = Document Root-Element "{1}"muss mit DOCTYPE-Root "{0}" \u00FCbereinstimmen.
+        RootElementTypeMustMatchDoctypedecl = Document Root-Element "{1}"muss mit DOCTYPE-Root "{0}" übereinstimmen.
         UndeclaredElementInContentSpec = Contentmodell des Elements "{0}" verweist auf das nicht deklarierte Element "{1}".
-        UniqueNotationName = Deklaration f\u00FCr die Notation "{0}" ist nicht eindeutig. Ein jeweiliger Name darf nicht in mehreren Notationsdeklarationen deklariert werden.
-        ENTITYFailedInitializeGrammar =  ENTITYDatatype-Validator: Nicht erfolgreich. Initialisierungsmethode muss mit einer g\u00FCltigen Grammatikreferenz aufgerufen werden. \t
+        UniqueNotationName = Deklaration für die Notation "{0}" ist nicht eindeutig. Ein jeweiliger Name darf nicht in mehreren Notationsdeklarationen deklariert werden.
+        ENTITYFailedInitializeGrammar =  ENTITYDatatype-Validator: Nicht erfolgreich. Initialisierungsmethode muss mit einer gültigen Grammatikreferenz aufgerufen werden. \t
         ENTITYNotUnparsed = ENTITY "{0}" ist geparst.
-        ENTITYNotValid = ENTITY "{0}" ist nicht g\u00FCltig.
-        EmptyList = Werte der Typen ENTITIES, IDREFS und NMTOKENS d\u00FCrfen keine leeren Listen sein.
+        ENTITYNotValid = ENTITY "{0}" ist nicht gültig.
+        EmptyList = Werte der Typen ENTITIES, IDREFS und NMTOKENS dürfen keine leeren Listen sein.
 
 # Entity related messages
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ReferenceToExternalEntity = Externe Entityreferenz "&{0};" ist in einem Attributwert nicht zul\u00E4ssig.
-        AccessExternalDTD = Externe DTD: Lesen von externer DTD "{0}" nicht erfolgreich, da "{1}"-Zugriff wegen der von der Eigenschaft "accessExternalDTD" festgelegten Einschr\u00E4nkung nicht zul\u00E4ssig ist.
-        AccessExternalEntity = Externe Entity: Lesen des externen Dokuments "{0}" nicht erfolgreich, da "{1}"-Zugriff wegen der von der Eigenschaft "accessExternalDTD" festgelegten Einschr\u00E4nkung nicht zul\u00E4ssig ist.
+        ReferenceToExternalEntity = Externe Entityreferenz "&{0};" ist in einem Attributwert nicht zulässig.
+        AccessExternalDTD = Externe DTD: Lesen von externer DTD "{0}" nicht erfolgreich, da "{1}"-Zugriff wegen der von der Eigenschaft "accessExternalDTD" festgelegten Einschränkung nicht zulässig ist.
+        AccessExternalEntity = Externe Entity: Lesen des externen Dokuments "{0}" nicht erfolgreich, da "{1}"-Zugriff wegen der von der Eigenschaft "accessExternalDTD" festgelegten Einschränkung nicht zulässig ist.
 
 # 4.1 Character and Entity References
         EntityNotDeclared = Entity "{0}" wurde referenziert aber nicht deklariert.
-        ReferenceToUnparsedEntity = Nicht geparste Entityreferenz "&{0};" ist nicht zul\u00E4ssig.
+        ReferenceToUnparsedEntity = Nicht geparste Entityreferenz "&{0};" ist nicht zulässig.
         RecursiveReference = Rekursive Entityreferenz "{0}". (Referenzpfad: {1}),
         RecursiveGeneralReference = Rekursive allgemeine Entityreferenz "&{0};". (Referenzpfad: {1}),
         RecursivePEReference = Rekursive Parameterentityreferenz "%{0};". (Referenzpfad: {1}),
 # 4.3.3 Character Encoding in Entities
-        EncodingNotSupported = Codierung "{0}" wird nicht unterst\u00FCtzt.
+        EncodingNotSupported = Codierung "{0}" wird nicht unterstützt.
         EncodingRequired = Eine nicht in UTF-8 oder UTF-16 codierte geparste Entity muss eine Codierungsdeklaration enthalten.
 
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = Element oder Attribut "{0}" stimmt nicht mit QName-Produktion \u00FCberein: QName::=(NCName'':'')?NCName.
-        ElementXMLNSPrefix = Element "{0}" darf nicht "xmlns" als Pr\u00E4fix enthalten.
-        ElementPrefixUnbound = Pr\u00E4fix "{0}" f\u00FCr Element "{1}" ist nicht gebunden.
-        AttributePrefixUnbound = Pr\u00E4fix "{2}" f\u00FCr Attribut "{1}", das mit Elementtyp "{0}" verkn\u00FCpft ist, ist nicht gebunden.
-        EmptyPrefixedAttName = Wert des Attributs "{0}" ist ung\u00FCltig. Namespace Bindings mit Pr\u00E4fix d\u00FCrfen nicht leer sein.
-        PrefixDeclared = Namespace-Pr\u00E4fix "{0}" wurde nicht deklariert.
-        CantBindXMLNS = Pr\u00E4fix "xmlns" kann nicht explizit an einen Namespace gebunden werden. Umgekehrt kann auch der Namespace f\u00FCr "xmlns" nicht explizit an ein Pr\u00E4fix gebunden werden.
-        CantBindXML = Pr\u00E4fix "xml" kann nicht an einen anderen Namespace als den gew\u00F6hnlichen gebunden werden. Umgekehrt kann auch der Namespace f\u00FCr "xml" nicht an ein anderes Pr\u00E4fix als "xml" gebunden werden.
-        MSG_ATT_DEFAULT_INVALID = defaultValue "{1}" von Attribut "{0}" ist aufgrund der lexikalischen Constraints dieses Attributtyps nicht g\u00FCltig.
+        IllegalQName = Element oder Attribut "{0}" stimmt nicht mit QName-Produktion überein: QName::=(NCName'':'')?NCName.
+        ElementXMLNSPrefix = Element "{0}" darf nicht "xmlns" als Präfix enthalten.
+        ElementPrefixUnbound = Präfix "{0}" für Element "{1}" ist nicht gebunden.
+        AttributePrefixUnbound = Präfix "{2}" für Attribut "{1}", das mit Elementtyp "{0}" verknüpft ist, ist nicht gebunden.
+        EmptyPrefixedAttName = Wert des Attributs "{0}" ist ungültig. Namespace Bindings mit Präfix dürfen nicht leer sein.
+        PrefixDeclared = Namespace-Präfix "{0}" wurde nicht deklariert.
+        CantBindXMLNS = Präfix "xmlns" kann nicht explizit an einen Namespace gebunden werden. Umgekehrt kann auch der Namespace für "xmlns" nicht explizit an ein Präfix gebunden werden.
+        CantBindXML = Präfix "xml" kann nicht an einen anderen Namespace als den gewöhnlichen gebunden werden. Umgekehrt kann auch der Namespace für "xml" nicht an ein anderes Präfix als "xml" gebunden werden.
+        MSG_ATT_DEFAULT_INVALID = defaultValue "{1}" von Attribut "{0}" ist aufgrund der lexikalischen Constraints dieses Attributtyps nicht gültig.
 
 # REVISIT: These need messages
         MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
@@ -314,12 +314,12 @@
 # Implementation limits
         EntityExpansionLimit=JAXP00010001: Der Parser hat mehr als {0} Entityerweiterungen in diesem Dokument gefunden. Dies ist der von JDK vorgeschriebene Grenzwert.
         ElementAttributeLimit=JAXP00010002: Element "{0}" hat mehr als {1} Attribute. "{1}" ist der von JDK vorgeschriebene Grenzwert.
-        MaxEntitySizeLimit=JAXP00010003: Die L\u00E4nge von Entity "{0}" ist "{1}" und \u00FCberschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
-        TotalEntitySizeLimit=JAXP00010004: Die akkumulierte Gr\u00F6\u00DFe von Entitys ist "{0}" und \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde.
-        MaxXMLNameLimit=JAXP00010005: Die L\u00E4nge von Entity "{0}" ist "{1}" und \u00FCberschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
-        MaxElementDepthLimit=JAXP00010006: Die Tiefe von Element "{0}" ist "{1}" und \u00FCberschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
-        EntityReplacementLimit=JAXP00010007: Die Gesamtanzahl von Knoten in Entityreferenzen betr\u00E4gt "{0}". Das liegt \u00FCber dem von "{2}" festgelegten Grenzwert "{1}".
+        MaxEntitySizeLimit=JAXP00010003: Die Länge von Entity "{0}" ist "{1}" und überschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
+        TotalEntitySizeLimit=JAXP00010004: Die akkumulierte Größe von Entitys ist "{0}" und überschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde.
+        MaxXMLNameLimit=JAXP00010005: Die Länge von Entity "{0}" ist "{1}" und überschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
+        MaxElementDepthLimit=JAXP00010006: Die Tiefe von Element "{0}" ist "{1}" und überschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
+        EntityReplacementLimit=JAXP00010007: Die Gesamtanzahl von Knoten in Entityreferenzen beträgt "{0}". Das liegt über dem von "{2}" festgelegten Grenzwert "{1}".
 
 # Catalog 09
 # Technical term, do not translate: catalog
-        CatalogException=JAXP00090001: CatalogResolver ist mit dem Katalog "{0}" aktiviert, eine CatalogException wird jedoch zur\u00FCckgegeben.
+        CatalogException=JAXP00090001: CatalogResolver ist mit dem Katalog "{0}" aktiviert, eine CatalogException wird jedoch zurückgegeben.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
index 98254381c62..9639bf0b564 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
@@ -9,55 +9,55 @@
 # Document messages
         PrematureEOF=Final de archivo prematuro.
 # 2.1 Well-Formed XML Documents
-        RootElementRequired = El elemento ra\u00EDz es necesario en un documento con formato correcto.
+        RootElementRequired = El elemento raíz es necesario en un documento con formato correcto.
 # 2.2 Characters
 
-        InvalidCharInCDSect = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la secci\u00F3n CDATA.
-        InvalidCharInContent = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el contenido del elemento del documento.
-        TwoColonsInQName = Se ha encontrado un segundo ':' no v\u00E1lido en el tipo de elemento o en el nombre del atributo.
+        InvalidCharInCDSect = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en la sección CDATA.
+        InvalidCharInContent = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en el contenido del elemento del documento.
+        TwoColonsInQName = Se ha encontrado un segundo ':' no válido en el tipo de elemento o en el nombre del atributo.
         ColonNotLegalWithNS = No se permite incluir dos puntos en el nombre ''{0}'' cuando se activan los espacios de nombres.
-        InvalidCharInMisc = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el marcador al finalizar el contenido del elemento.
-        InvalidCharInProlog = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el pr\u00F3logo del documento.
-        InvalidCharInXMLDecl = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la declaraci\u00F3n XML.
+        InvalidCharInMisc = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en el marcador al finalizar el contenido del elemento.
+        InvalidCharInProlog = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en el prólogo del documento.
+        InvalidCharInXMLDecl = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en la declaración XML.
 # 2.4 Character Data and Markup
-        CDEndInContent = La secuencia de caracteres "]]>" no debe aparecer en el contenido, a menos que se utilice para marcar el final de una secci\u00F3n CDATA.
+        CDEndInContent = La secuencia de caracteres "]]>" no debe aparecer en el contenido, a menos que se utilice para marcar el final de una sección CDATA.
 # 2.7 CDATA Sections
-        CDSectUnterminated = La secci\u00F3n CDATA debe finalizar en "]]>".
+        CDSectUnterminated = La sección CDATA debe finalizar en "]]>".
 # 2.8 Prolog and Document Type Declaration
-        XMLDeclMustBeFirst = La declaraci\u00F3n XML s\u00F3lo puede aparecer al principio del documento.
-        EqRequiredInXMLDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de "{0}" en la declaraci\u00F3n XML.
-        QuoteRequiredInXMLDecl = El valor despu\u00E9s de "{0}" en la declaraci\u00F3n XML debe ser una cadena con comillas.
-        XMLDeclUnterminated = La declaraci\u00F3n XML debe finalizar en "?>".
-        VersionInfoRequired = La versi\u00F3n es necesaria en la declaraci\u00F3n XML.
-        SpaceRequiredBeforeVersionInXMLDecl = Es necesario un espacio en blanco antes del pseudo atributo version en la declaraci\u00F3n XML.
-        SpaceRequiredBeforeEncodingInXMLDecl = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaraci\u00F3n XML.
-        SpaceRequiredBeforeStandalone = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaraci\u00F3n XML.
-        MarkupNotRecognizedInProlog = El marcador en el documento que precede al elemento ra\u00EDz debe tener el formato correcto.
-        MarkupNotRecognizedInMisc = El marcador en el documento que aparece tras el elemento ra\u00EDz debe tener el formato correcto.
+        XMLDeclMustBeFirst = La declaración XML sólo puede aparecer al principio del documento.
+        EqRequiredInXMLDecl = El carácter '' = '' debe aparecer después de "{0}" en la declaración XML.
+        QuoteRequiredInXMLDecl = El valor después de "{0}" en la declaración XML debe ser una cadena con comillas.
+        XMLDeclUnterminated = La declaración XML debe finalizar en "?>".
+        VersionInfoRequired = La versión es necesaria en la declaración XML.
+        SpaceRequiredBeforeVersionInXMLDecl = Es necesario un espacio en blanco antes del pseudo atributo version en la declaración XML.
+        SpaceRequiredBeforeEncodingInXMLDecl = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaración XML.
+        SpaceRequiredBeforeStandalone = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaración XML.
+        MarkupNotRecognizedInProlog = El marcador en el documento que precede al elemento raíz debe tener el formato correcto.
+        MarkupNotRecognizedInMisc = El marcador en el documento que aparece tras el elemento raíz debe tener el formato correcto.
         AlreadySeenDoctype = Tipo de documento ya consultado.
-        DoctypeNotAllowed = DOCTYPE no est\u00E1 permitido cuando la funci\u00F3n "http://apache.org/xml/features/disallow-doctype-decl" se ha definido en true.
-        ContentIllegalInProlog = El contenido no est\u00E1 permitido en el pr\u00F3logo.
-        ReferenceIllegalInProlog = La referencia no est\u00E1 permitida en el pr\u00F3logo.
+        DoctypeNotAllowed = DOCTYPE no está permitido cuando la función "http://apache.org/xml/features/disallow-doctype-decl" se ha definido en true.
+        ContentIllegalInProlog = El contenido no está permitido en el prólogo.
+        ReferenceIllegalInProlog = La referencia no está permitida en el prólogo.
 # Trailing Misc
-        ContentIllegalInTrailingMisc=El contenido no est\u00E1 permitido en la secci\u00F3n final.
-        ReferenceIllegalInTrailingMisc=La referencia no est\u00E1 permitida en la secci\u00F3n final.
+        ContentIllegalInTrailingMisc=El contenido no está permitido en la sección final.
+        ReferenceIllegalInTrailingMisc=La referencia no está permitida en la sección final.
 
 # 2.9 Standalone Document Declaration
-        SDDeclInvalid = El valor de declaraci\u00F3n del documento aut\u00F3nomo debe ser "yes" o "no", pero nunca "{0}".
-        SDDeclNameInvalid = Puede que el nombre aut\u00F3nomo de la declaraci\u00F3n XML est\u00E9 mal escrito.
+        SDDeclInvalid = El valor de declaración del documento autónomo debe ser "yes" o "no", pero nunca "{0}".
+        SDDeclNameInvalid = Puede que el nombre autónomo de la declaración XML esté mal escrito.
 # 2.12 Language Identification
-        XMLLangInvalid = El valor del atributo xml:lang "{0}" es un identificador de idioma no v\u00E1lido.
+        XMLLangInvalid = El valor del atributo xml:lang "{0}" es un identificador de idioma no válido.
 # 3. Logical Structures
         ETagRequired = El tipo de elemento "{0}" debe finalizar por la etiqueta final coincidente "</{0}>".
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
         ElementUnterminated = El tipo de elemento "{0}" debe ir seguido de una de estas especificaciones de atributo: ">" o "/>".
-        EqRequiredInAttribute = El nombre de atributo "{1}" asociado a un tipo de elemento "{0}" debe ir seguido del car\u00E1cter '' = ''.
+        EqRequiredInAttribute = El nombre de atributo "{1}" asociado a un tipo de elemento "{0}" debe ir seguido del carácter '' = ''.
         OpenQuoteExpected = Las comillas de apertura se deben utilizar para el atributo "{1}" asociado a un tipo de elemento "{0}".
         CloseQuoteExpected = Las comillas de cierre se deben utilizar para el atributo "{1}" asociado a un tipo de elemento "{0}".
         AttributeNotUnique = El atributo "{1}" ya se ha especificado para el elemento "{0}".
         AttributeNSNotUnique = El atributo "{1}" enlazado al espacio de nombres "{2}" ya se ha especificado para el elemento "{0}".
         ETagUnterminated = La etiqueta final para el tipo de elemento "{0}" debe finalizar en un delimitador ''>''.
-        MarkupNotRecognizedInContent = El contenido de los elementos debe constar de marcadores o datos de car\u00E1cter con un formato correcto.
+        MarkupNotRecognizedInContent = El contenido de los elementos debe constar de marcadores o datos de carácter con un formato correcto.
         DoctypeIllegalInContent = No se permite un DOCTYPE en el contenido.
 # 4.1 Character and Entity References
         ReferenceUnterminated = La referencia debe finalizar con un delimitador ';'.
@@ -68,225 +68,225 @@
 
 # Messages common to Document and DTD
 # 2.2 Characters
-        InvalidCharInAttValue = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{2}) no v\u00E1lido en el valor del atributo "{1}" y el elemento es "{0}".
-        InvalidCharInComment = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el comentario.
-        InvalidCharInPI = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la instrucci\u00F3n de procesamiento.
-        InvalidCharInInternalSubset = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el subconjunto interno del DTD.
-        InvalidCharInTextDecl = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la declaraci\u00F3n de texto.
+        InvalidCharInAttValue = Se ha encontrado un carácter XML (Unicode: 0x{2}) no válido en el valor del atributo "{1}" y el elemento es "{0}".
+        InvalidCharInComment = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en el comentario.
+        InvalidCharInPI = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en la instrucción de procesamiento.
+        InvalidCharInInternalSubset = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en el subconjunto interno del DTD.
+        InvalidCharInTextDecl = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en la declaración de texto.
 # 2.3 Common Syntactic Constructs
-        QuoteRequiredInAttValue = El valor del atributo "{1}" debe empezar por un car\u00E1cter de comillas dobles o simples.
-        LessthanInAttValue = El valor del atributo "{1}" asociado a un tipo de elemento "{0}" no debe contener el car\u00E1cter ''<''.
-        AttributeValueUnterminated = El valor para el atributo "{1}" debe finalizar en un car\u00E1cter de comillas coincidentes.
+        QuoteRequiredInAttValue = El valor del atributo "{1}" debe empezar por un carácter de comillas dobles o simples.
+        LessthanInAttValue = El valor del atributo "{1}" asociado a un tipo de elemento "{0}" no debe contener el carácter ''<''.
+        AttributeValueUnterminated = El valor para el atributo "{1}" debe finalizar en un carácter de comillas coincidentes.
 # 2.5 Comments
         InvalidCommentStart = El comentario debe empezar por "<!--".
-        DashDashInComment = La cadena "--" no est\u00E1 permitida en los comentarios.
+        DashDashInComment = La cadena "--" no está permitida en los comentarios.
         CommentUnterminated = El comentario debe finalizar en "-->".
-        COMMENT_NOT_IN_ONE_ENTITY = El comentario no est\u00E1 incluido en la misma entidad.
+        COMMENT_NOT_IN_ONE_ENTITY = El comentario no está incluido en la misma entidad.
 # 2.6 Processing Instructions
-        PITargetRequired = La instrucci\u00F3n de procesamiento debe empezar por el nombre del destino.
-        SpaceRequiredInPI = Es necesario un espacio en blanco entre el destino de la instrucci\u00F3n de procesamiento y los datos.
-        PIUnterminated = La instrucci\u00F3n de procesamiento debe finalizar en "?>".
-        ReservedPITarget = El destino de la instrucci\u00F3n de procesamiento que coincide con "[xX][mM][lL]" no est\u00E1 permitido.
-        PI_NOT_IN_ONE_ENTITY = La instrucci\u00F3n de procesamiento no est\u00E1 incluida en la misma entidad.
+        PITargetRequired = La instrucción de procesamiento debe empezar por el nombre del destino.
+        SpaceRequiredInPI = Es necesario un espacio en blanco entre el destino de la instrucción de procesamiento y los datos.
+        PIUnterminated = La instrucción de procesamiento debe finalizar en "?>".
+        ReservedPITarget = El destino de la instrucción de procesamiento que coincide con "[xX][mM][lL]" no está permitido.
+        PI_NOT_IN_ONE_ENTITY = La instrucción de procesamiento no está incluida en la misma entidad.
 # 2.8 Prolog and Document Type Declaration
-        VersionInfoInvalid = Versi\u00F3n no v\u00E1lida "{0}".
-        VersionNotSupported = La versi\u00F3n XML "{0}" no est\u00E1 soportada, s\u00F3lo la versi\u00F3n XML 1.0 est\u00E1 soportada.
-        VersionNotSupported11 = La versi\u00F3n XML "{0}" no est\u00E1 soportada, s\u00F3lo las versiones XML 1.0 y XML 1.1 est\u00E1n soportadas.
-        VersionMismatch= Una entidad no puede incluir otra entidad de una versi\u00F3n posterior.
+        VersionInfoInvalid = Versión no válida "{0}".
+        VersionNotSupported = La versión XML "{0}" no está soportada, sólo la versión XML 1.0 está soportada.
+        VersionNotSupported11 = La versión XML "{0}" no está soportada, sólo las versiones XML 1.0 y XML 1.1 están soportadas.
+        VersionMismatch= Una entidad no puede incluir otra entidad de una versión posterior.
 # 4.1 Character and Entity References
-        DigitRequiredInCharRef = Una representaci\u00F3n decimal debe aparecer inmediatamente despu\u00E9s de "&#" en una referencia de caracteres.
-        HexdigitRequiredInCharRef = Una representaci\u00F3n hexadecimal debe aparecer inmediatamente despu\u00E9s de "&#" en una referencia de caracteres.
+        DigitRequiredInCharRef = Una representación decimal debe aparecer inmediatamente después de "&#" en una referencia de caracteres.
+        HexdigitRequiredInCharRef = Una representación hexadecimal debe aparecer inmediatamente después de "&#" en una referencia de caracteres.
         SemicolonRequiredInCharRef = La referencia de caracteres debe finalizar en el delimitador ';'.
-        InvalidCharRef = La referencia de caracteres "&#{0}" es un car\u00E1cter XML no v\u00E1lido.
-        NameRequiredInReference = El nombre de la entidad debe aparecer inmediatamente despu\u00E9s de '&' en la referencia de entidades.
+        InvalidCharRef = La referencia de caracteres "&#{0}" es un carácter XML no válido.
+        NameRequiredInReference = El nombre de la entidad debe aparecer inmediatamente después de '&' en la referencia de entidades.
         SemicolonRequiredInReference = La referencia a la entidad "{0}" debe finalizar en el delimitador '';''.
 # 4.3.1 The Text Declaration
-        TextDeclMustBeFirst = La declaraci\u00F3n de texto s\u00F3lo puede aparecer al principio de la entidad analizada externa.
-        EqRequiredInTextDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de "{0}" en la declaraci\u00F3n de texto.
-        QuoteRequiredInTextDecl = El valor despu\u00E9s de "{0}" en la declaraci\u00F3n de texto debe ser una cadena con comillas.
-        CloseQuoteMissingInTextDecl = Faltan las comillas de cierre en el valor despu\u00E9s de "{0}" en la declaraci\u00F3n de texto.
-        SpaceRequiredBeforeVersionInTextDecl = Es necesario un espacio en blanco antes del pseudo atributo version en la declaraci\u00F3n de texto.
-        SpaceRequiredBeforeEncodingInTextDecl = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaraci\u00F3n de texto.
-        TextDeclUnterminated = La declaraci\u00F3n de texto debe finalizar en "?>".
-        EncodingDeclRequired = La declaraci\u00F3n de codificaci\u00F3n es necesaria en la declaraci\u00F3n de texto.
-        NoMorePseudoAttributes = No se permiten m\u00E1s pseudo atributos.
-        MorePseudoAttributes = Se esperan m\u00E1s pseudo atributos.
+        TextDeclMustBeFirst = La declaración de texto sólo puede aparecer al principio de la entidad analizada externa.
+        EqRequiredInTextDecl = El carácter '' = '' debe aparecer después de "{0}" en la declaración de texto.
+        QuoteRequiredInTextDecl = El valor después de "{0}" en la declaración de texto debe ser una cadena con comillas.
+        CloseQuoteMissingInTextDecl = Faltan las comillas de cierre en el valor después de "{0}" en la declaración de texto.
+        SpaceRequiredBeforeVersionInTextDecl = Es necesario un espacio en blanco antes del pseudo atributo version en la declaración de texto.
+        SpaceRequiredBeforeEncodingInTextDecl = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaración de texto.
+        TextDeclUnterminated = La declaración de texto debe finalizar en "?>".
+        EncodingDeclRequired = La declaración de codificación es necesaria en la declaración de texto.
+        NoMorePseudoAttributes = No se permiten más pseudo atributos.
+        MorePseudoAttributes = Se esperan más pseudo atributos.
         PseudoAttrNameExpected = Se espera el nombre de un pseudo atributo. 
 # 4.3.2 Well-Formed Parsed Entities
         CommentNotInOneEntity = El comentario debe incluirse totalmente en la misma entidad analizada.
-        PINotInOneEntity = La instrucci\u00F3n de procesamiento debe incluirse totalmente en la misma entidad analizada.
+        PINotInOneEntity = La instrucción de procesamiento debe incluirse totalmente en la misma entidad analizada.
 # 4.3.3 Character Encoding in Entities
-        EncodingDeclInvalid = Nombre de codificaci\u00F3n no v\u00E1lido "{0}".
-        EncodingByteOrderUnsupported = El orden de bytes proporcionado para la codificaci\u00F3n "{0}" no est\u00E1 soportado.
-        InvalidByte = Byte no v\u00E1lido {0} de la secuencia UTF-8 de {1} bytes
+        EncodingDeclInvalid = Nombre de codificación no válido "{0}".
+        EncodingByteOrderUnsupported = El orden de bytes proporcionado para la codificación "{0}" no está soportado.
+        InvalidByte = Byte no válido {0} de la secuencia UTF-8 de {1} bytes
         ExpectedByte = Byte esperado {0} de la secuencia UTF-8 de {1} bytes.  
-        InvalidHighSurrogate = Los bits de sustituci\u00F3n superior en la secuencia UTF-8 no deben exceder 0x10 pero se han encontrado 0x{0}.
-        OperationNotSupported = La operaci\u00F3n "{0}" no est\u00E1 soportada por el lector {1}.
+        InvalidHighSurrogate = Los bits de sustitución superior en la secuencia UTF-8 no deben exceder 0x10 pero se han encontrado 0x{0}.
+        OperationNotSupported = La operación "{0}" no está soportada por el lector {1}.
         InvalidASCII = El byte "{0}"no es un miembro del juego de caracteres ASCII (7 bits).
-        CharConversionFailure = Una entidad con una codificaci\u00F3n determinada no debe contener secuencias no permitidas en dicha codificaci\u00F3n.
+        CharConversionFailure = Una entidad con una codificación determinada no debe contener secuencias no permitidas en dicha codificación.
 
 # DTD Messages
 # 2.2 Characters
-        InvalidCharInEntityValue = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el valor de entidad literal.
-        InvalidCharInExternalSubset = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el subjuego externo del DTD.
-        InvalidCharInIgnoreSect = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la secci\u00F3n condicional excluida.
-        InvalidCharInPublicID = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el identificador p\u00FAblico.
-        InvalidCharInSystemID = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el identificador del sistema.
+        InvalidCharInEntityValue = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en el valor de entidad literal.
+        InvalidCharInExternalSubset = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en el subjuego externo del DTD.
+        InvalidCharInIgnoreSect = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en la sección condicional excluida.
+        InvalidCharInPublicID = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en el identificador público.
+        InvalidCharInSystemID = Se ha encontrado un carácter XML (Unicode: 0x{0}) no válido en el identificador del sistema.
 # 2.3 Common Syntactic Constructs
-        SpaceRequiredAfterSYSTEM = Es necesario un espacio en blanco despu\u00E9s de la palabra clave SYSTEM en la declaraci\u00F3n DOCTYPE.
-        QuoteRequiredInSystemID = El identificador del sistema debe empezar por un car\u00E1cter de comillas dobles o simples.
-        SystemIDUnterminated = El identificador del sistema debe finalizar en un car\u00E1cter de comillas coincidente.
-        SpaceRequiredAfterPUBLIC = Son necesarios espacios en blanco despu\u00E9s de la palabra clave PUBLIC en la declaraci\u00F3n DOCTYPE.
-        QuoteRequiredInPublicID = El identificador p\u00FAblico debe empezar por un car\u00E1cter de comillas dobles o simples.
-        PublicIDUnterminated = El identificador p\u00FAblico debe finalizar en un car\u00E1cter de comillas coincidente.
-        PubidCharIllegal = El car\u00E1cter (Unicode: 0x{0}) no est\u00E1 permitido en el identificador p\u00FAblico.
+        SpaceRequiredAfterSYSTEM = Es necesario un espacio en blanco después de la palabra clave SYSTEM en la declaración DOCTYPE.
+        QuoteRequiredInSystemID = El identificador del sistema debe empezar por un carácter de comillas dobles o simples.
+        SystemIDUnterminated = El identificador del sistema debe finalizar en un carácter de comillas coincidente.
+        SpaceRequiredAfterPUBLIC = Son necesarios espacios en blanco después de la palabra clave PUBLIC en la declaración DOCTYPE.
+        QuoteRequiredInPublicID = El identificador público debe empezar por un carácter de comillas dobles o simples.
+        PublicIDUnterminated = El identificador público debe finalizar en un carácter de comillas coincidente.
+        PubidCharIllegal = El carácter (Unicode: 0x{0}) no está permitido en el identificador público.
         SpaceRequiredBetweenPublicAndSystem = Son necesarios espacios en blanco entre publicId y systemId.
 # 2.8 Prolog and Document Type Declaration
-        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Es necesario un espacio en blanco despu\u00E9s de "<!DOCTYPE" en la declaraci\u00F3n de tipo de documento.
-        MSG_ROOT_ELEMENT_TYPE_REQUIRED = El tipo de elemento ra\u00EDz debe aparecer despu\u00E9s de "<!DOCTYPE" en la declaraci\u00F3n de tipo de documento.
-        DoctypedeclUnterminated = La declaraci\u00F3n de tipo de documento para el tipo de elemento ra\u00EDz "{0}" debe finalizar en ''>''.
-        DoctypedeclNotClosed = La declaraci\u00F3n de tipo de documento para el tipo de elemento ra\u00EDz "{0}" debe finalizar en '']''.
-        PEReferenceWithinMarkup = La referencia de entidad del par\u00E1metro "%{0};" no puede producirse en el marcador en el subconjunto interno del DTD.
-        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Las declaraciones de marcador que se incluyen o a las que apunta la declaraci\u00F3n de tipo de documento deben tener el formato correcto.
+        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Es necesario un espacio en blanco después de "<!DOCTYPE" en la declaración de tipo de documento.
+        MSG_ROOT_ELEMENT_TYPE_REQUIRED = El tipo de elemento raíz debe aparecer después de "<!DOCTYPE" en la declaración de tipo de documento.
+        DoctypedeclUnterminated = La declaración de tipo de documento para el tipo de elemento raíz "{0}" debe finalizar en ''>''.
+        DoctypedeclNotClosed = La declaración de tipo de documento para el tipo de elemento raíz "{0}" debe finalizar en '']''.
+        PEReferenceWithinMarkup = La referencia de entidad del parámetro "%{0};" no puede producirse en el marcador en el subconjunto interno del DTD.
+        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Las declaraciones de marcador que se incluyen o a las que apunta la declaración de tipo de documento deben tener el formato correcto.
 # 2.10 White Space Handling
-        MSG_XML_SPACE_DECLARATION_ILLEGAL = La declaraci\u00F3n de atributo para "xml:space" debe ofrecerse como un tipo enumerado cuyos \u00FAnicos valores posibles son "default" y "preserve".
+        MSG_XML_SPACE_DECLARATION_ILLEGAL = La declaración de atributo para "xml:space" debe ofrecerse como un tipo enumerado cuyos únicos valores posibles son "default" y "preserve".
 # 3.2 Element Type Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Es necesario un espacio en blanco despu\u00E9s de "<!ELEMENT" en la declaraci\u00F3n de tipo de elemento.
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = El tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento.
-        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Es necesario un espacio en blanco despu\u00E9s del tipo de elemento "{0}" en la declaraci\u00F3n de tipo de elemento.
-        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Es necesaria la restricci\u00F3n despu\u00E9s del tipo de elemento "{0}" en la declaraci\u00F3n de tipo de elemento.
-        ElementDeclUnterminated = La declaraci\u00F3n para el tipo de elemento "{0}" debe finalizar en ''>''.
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Es necesario un espacio en blanco después de "<!ELEMENT" en la declaración de tipo de elemento.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = El tipo de elemento es necesario en la declaración de tipo de elemento.
+        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Es necesario un espacio en blanco después del tipo de elemento "{0}" en la declaración de tipo de elemento.
+        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Es necesaria la restricción después del tipo de elemento "{0}" en la declaración de tipo de elemento.
+        ElementDeclUnterminated = La declaración para el tipo de elemento "{0}" debe finalizar en ''>''.
 # 3.2.1 Element Content
-        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un car\u00E1cter ''('' o un tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento "{0}".
-        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un car\u00E1cter '')'' es necesario en la declaraci\u00F3n de tipo de elemento "{0}".
+        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un carácter ''('' o un tipo de elemento es necesario en la declaración de tipo de elemento "{0}".
+        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un carácter '')'' es necesario en la declaración de tipo de elemento "{0}".
 # 3.2.2 Mixed Content
-        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento "{0}".
-        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un car\u00E1cter '')'' es necesario en la declaraci\u00F3n de tipo de elemento "{0}".
-        MixedContentUnterminated = El modelo de contenido mixto "{0}" debe finalizar en ")*" cuando los tipos de elementos secundarios est\u00E1n restringidos.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un tipo de elemento es necesario en la declaración de tipo de elemento "{0}".
+        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un carácter '')'' es necesario en la declaración de tipo de elemento "{0}".
+        MixedContentUnterminated = El modelo de contenido mixto "{0}" debe finalizar en ")*" cuando los tipos de elementos secundarios están restringidos.
 # 3.3 Attribute-List Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Es necesario un espacio en blanco despu\u00E9s de "<!ATTLIST" en la declaraci\u00F3n de la lista de atributos.
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = El tipo de elemento es necesario en la declaraci\u00F3n de la lista de atributos.
-        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Es necesario un espacio en blanco antes del nombre de atributo en la declaraci\u00F3n de la lista de atributos para el elemento "{0}".
-        AttNameRequiredInAttDef = Se debe especificar el nombre del atributo en la declaraci\u00F3n de la lista de atributos para el elemento "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Es necesario un espacio en blanco antes del tipo de atributo en la declaraci\u00F3n del atributo "{1}" para el elemento "{0}".
-        AttTypeRequiredInAttDef = Es necesario el tipo de atributo en la declaraci\u00F3n del atributo "{1}" para el elemento "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Es necesario un espacio en blanco antes del atributo por defecto en la declaraci\u00F3n del atributo "{1}" para el elemento "{0}".
-        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Se ha proporcionado m\u00E1s de una definici\u00F3n de atributo para el mismo atributo "{1}" de un elemento determinado "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Es necesario un espacio en blanco después de "<!ATTLIST" en la declaración de la lista de atributos.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = El tipo de elemento es necesario en la declaración de la lista de atributos.
+        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Es necesario un espacio en blanco antes del nombre de atributo en la declaración de la lista de atributos para el elemento "{0}".
+        AttNameRequiredInAttDef = Se debe especificar el nombre del atributo en la declaración de la lista de atributos para el elemento "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Es necesario un espacio en blanco antes del tipo de atributo en la declaración del atributo "{1}" para el elemento "{0}".
+        AttTypeRequiredInAttDef = Es necesario el tipo de atributo en la declaración del atributo "{1}" para el elemento "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Es necesario un espacio en blanco antes del atributo por defecto en la declaración del atributo "{1}" para el elemento "{0}".
+        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Se ha proporcionado más de una definición de atributo para el mismo atributo "{1}" de un elemento determinado "{0}".
 # 3.3.1 Attribute Types
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Debe aparecer un espacio en blanco despu\u00E9s de "NOTATION" en la declaraci\u00F3n de atributo "{1}".
-        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = El car\u00E1cter ''('' debe aparecer despu\u00E9s de "NOTATION" en la declaraci\u00F3n de atributo "{1}".
-        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = El nombre de notaci\u00F3n es necesario en la lista de tipos de notaci\u00F3n para la declaraci\u00F3n de atributo "{1}".
-        NotationTypeUnterminated = La lista de tipos de notaciones debe finalizar en '')'' en la declaraci\u00F3n del atributo "{1}".
-        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = El token de nombre es necesario en la lista de tipos enumerados para la declaraci\u00F3n del atributo "{1}".
-        EnumerationUnterminated = La lista de tipos enumerados debe finalizar en '')'' en la declaraci\u00F3n del atributo "{1}".
-        MSG_DISTINCT_TOKENS_IN_ENUMERATION = El valor de enumeraci\u00F3n "{1}" se especific\u00F3 m\u00E1s de una vez en la declaraci\u00F3n del atributo "{2}" para el token "{0}". Todos los NMTOKENS en una declaraci\u00F3n del atributo Enumeration \u00FAnico deben ser distintos.
-        MSG_DISTINCT_NOTATION_IN_ENUMERATION = El valor de enumeraci\u00F3n "{1}" se especific\u00F3 m\u00E1s de una vez en la declaraci\u00F3n del atributo "{2}" para el elemento "{0}". Todos los nombres NOTATION en una declaraci\u00F3n del atributo NotationType \u00FAnico deben ser distintos.
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Debe aparecer un espacio en blanco después de "NOTATION" en la declaración de atributo "{1}".
+        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = El carácter ''('' debe aparecer después de "NOTATION" en la declaración de atributo "{1}".
+        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = El nombre de notación es necesario en la lista de tipos de notación para la declaración de atributo "{1}".
+        NotationTypeUnterminated = La lista de tipos de notaciones debe finalizar en '')'' en la declaración del atributo "{1}".
+        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = El token de nombre es necesario en la lista de tipos enumerados para la declaración del atributo "{1}".
+        EnumerationUnterminated = La lista de tipos enumerados debe finalizar en '')'' en la declaración del atributo "{1}".
+        MSG_DISTINCT_TOKENS_IN_ENUMERATION = El valor de enumeración "{1}" se especificó más de una vez en la declaración del atributo "{2}" para el token "{0}". Todos los NMTOKENS en una declaración del atributo Enumeration único deben ser distintos.
+        MSG_DISTINCT_NOTATION_IN_ENUMERATION = El valor de enumeración "{1}" se especificó más de una vez en la declaración del atributo "{2}" para el elemento "{0}". Todos los nombres NOTATION en una declaración del atributo NotationType único deben ser distintos.
 # 3.3.2 Attribute Defaults
-        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Debe aparecer un espacio en blanco despu\u00E9s de "FIXED" en la declaraci\u00F3n de atributo "{1}".
+        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Debe aparecer un espacio en blanco después de "FIXED" en la declaración de atributo "{1}".
 # 3.4 Conditional Sections
-        IncludeSectUnterminated = La secci\u00F3n condicional incluida debe finalizar en "]]>".
-        IgnoreSectUnterminated = La secci\u00F3n condicional excluida debe finalizar en "]]>".
+        IncludeSectUnterminated = La sección condicional incluida debe finalizar en "]]>".
+        IgnoreSectUnterminated = La sección condicional excluida debe finalizar en "]]>".
 # 4.1 Character and Entity References
-        NameRequiredInPEReference = El nombre de la entidad debe aparecer inmediatamente despu\u00E9s de '%' en la referencia de entidad de par\u00E1metro.
-        SemicolonRequiredInPEReference = La referencia de entidad de par\u00E1metro "%{0};" debe finalizar en el delimitador '';''.
+        NameRequiredInPEReference = El nombre de la entidad debe aparecer inmediatamente después de '%' en la referencia de entidad de parámetro.
+        SemicolonRequiredInPEReference = La referencia de entidad de parámetro "%{0};" debe finalizar en el delimitador '';''.
 # 4.2 Entity Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Es necesario un espacio en blanco despu\u00E9s de "<!ENTITY" en la declaraci\u00F3n de entidad.
-        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Es necesario un espacio en blanco entre "<!ENTITY" y el car\u00E1cter '%' en la declaraci\u00F3n de entidad de par\u00E1metro.
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Es necesario un espacio en blanco entre '%' y el nombre de entidad en la declaraci\u00F3n de entidad de par\u00E1metro.
-        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = El nombre de la entidad es necesario en la declaraci\u00F3n de entidad.
-        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Es necesario un espacio en blanco entre el nombre de entidad "{0}" y la definici\u00F3n en la declaraci\u00F3n de entidad.
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Es necesario un espacio en blanco entre "NDATA" y el nombre de notaci\u00F3n en la declaraci\u00F3n para la entidad "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Es necesario un espacio en blanco antes de "NDATA" en la declaraci\u00F3n para la entidad "{0}".
-        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = El nombre de notaci\u00F3n es necesario despu\u00E9s de "NDATA" en la declaraci\u00F3n para la entidad "{0}".
-        EntityDeclUnterminated = La declaraci\u00F3n para la entidad "{0}" debe finalizar en ''>''.
-	MSG_DUPLICATE_ENTITY_DEFINITION = La entidad "{0}" se ha declarado m\u00E1s de una vez.        
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Es necesario un espacio en blanco después de "<!ENTITY" en la declaración de entidad.
+        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Es necesario un espacio en blanco entre "<!ENTITY" y el carácter '%' en la declaración de entidad de parámetro.
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Es necesario un espacio en blanco entre '%' y el nombre de entidad en la declaración de entidad de parámetro.
+        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = El nombre de la entidad es necesario en la declaración de entidad.
+        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Es necesario un espacio en blanco entre el nombre de entidad "{0}" y la definición en la declaración de entidad.
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Es necesario un espacio en blanco entre "NDATA" y el nombre de notación en la declaración para la entidad "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Es necesario un espacio en blanco antes de "NDATA" en la declaración para la entidad "{0}".
+        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = El nombre de notación es necesario después de "NDATA" en la declaración para la entidad "{0}".
+        EntityDeclUnterminated = La declaración para la entidad "{0}" debe finalizar en ''>''.
+	MSG_DUPLICATE_ENTITY_DEFINITION = La entidad "{0}" se ha declarado más de una vez.        
 # 4.2.2 External Entities
-        ExternalIDRequired = La declaraci\u00F3n de entidad externa debe empezar por "SYSTEM" o "PUBLIC".
-        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre "PUBLIC" y el identificador p\u00FAblico.
-        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre el identificador p\u00FAblico y el identificador del sistema.
+        ExternalIDRequired = La declaración de entidad externa debe empezar por "SYSTEM" o "PUBLIC".
+        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre "PUBLIC" y el identificador público.
+        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre el identificador público y el identificador del sistema.
         MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre "SYSTEM" y el identificador del sistema.
         MSG_URI_FRAGMENT_IN_SYSTEMID = No se debe especificar el identificador del fragmento como parte del identificador del sistema "{0}".
 # 4.7 Notation Declarations
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Es necesario un espacio en blanco despu\u00E9s de "<!NOTATION" en la declaraci\u00F3n de notaci\u00F3n.
-        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = El nombre de la notaci\u00F3n es necesario en la declaraci\u00F3n de notaci\u00F3n.
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Es necesario un espacio en blanco despu\u00E9s del nombre de la notaci\u00F3n "{0}" en la declaraci\u00F3n de notaci\u00F3n.
-        ExternalIDorPublicIDRequired = La declaraci\u00F3n para la notaci\u00F3n "{0}" debe incluir un identificador p\u00FAblico o del sistema.
-        NotationDeclUnterminated = La declaraci\u00F3n para la notaci\u00F3n "{0}" debe finalizar en ''>''.
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Es necesario un espacio en blanco después de "<!NOTATION" en la declaración de notación.
+        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = El nombre de la notación es necesario en la declaración de notación.
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Es necesario un espacio en blanco después del nombre de la notación "{0}" en la declaración de notación.
+        ExternalIDorPublicIDRequired = La declaración para la notación "{0}" debe incluir un identificador público o del sistema.
+        NotationDeclUnterminated = La declaración para la notación "{0}" debe finalizar en ''>''.
 
 # Validation messages
-        DuplicateTypeInMixedContent = El tipo de elemento "{1}" ya se especific\u00F3 en el modelo de contenido de la declaraci\u00F3n de elementos "{0}".
-        ENTITIESInvalid = El valor de atributo "{1}" del tipo ENTITIES debe ser el nombre de una o m\u00E1s entidades no analizadas.
+        DuplicateTypeInMixedContent = El tipo de elemento "{1}" ya se especificó en el modelo de contenido de la declaración de elementos "{0}".
+        ENTITIESInvalid = El valor de atributo "{1}" del tipo ENTITIES debe ser el nombre de una o más entidades no analizadas.
         ENTITYInvalid = El valor de atributo "{1}" del tipo ENTITY debe ser el nombre de una entidad no analizada.
         IDDefaultTypeInvalid = El atributo de identificador "{0}" debe tener un valor por defecto declarado de "#IMPLIED" o "#REQUIRED".
         IDInvalid = El valor de atributo "{0}" del tipo ID debe ser un nombre.
-        IDInvalidWithNamespaces = El valor de atributo "{0}" del tipo ID debe ser un NCName cuando los espacios de nombres est\u00E9n activados.
-        IDNotUnique = El valor de atributo "{0}" del tipo ID debe ser \u00FAnico en el documento.
+        IDInvalidWithNamespaces = El valor de atributo "{0}" del tipo ID debe ser un NCName cuando los espacios de nombres estén activados.
+        IDNotUnique = El valor de atributo "{0}" del tipo ID debe ser único en el documento.
         IDREFInvalid = El valor de atributo "{0}" del tipo IDREF debe ser un nombre.
-        IDREFInvalidWithNamespaces = El valor de atributo "{0}" del tipo IDREF debe ser un NCName cuando los espacios de nombres est\u00E9n activados.
-        IDREFSInvalid = El valor de atributo "{0}" del tipo IDREFS debe ser uno o m\u00E1s nombres.
-        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = El texto de sustituci\u00F3n de la entidad del par\u00E1metro "{0}" debe incluir declaraciones correctamente anidadas cuando la referencia de entidad se utiliza como una declaraci\u00F3n completa.
-        ImproperDeclarationNesting = El texto de sustituci\u00F3n de la entidad del par\u00E1metro "{0}" debe incluir declaraciones correctamente anidadas.
-        ImproperGroupNesting = El texto de sustituci\u00F3n de la entidad del par\u00E1metro "{0}" debe incluir pares de par\u00E9ntesis correctamente anidados.
-        INVALID_PE_IN_CONDITIONAL = El texto de sustituci\u00F3n de la entidad del par\u00E1metro "{0}" debe incluir la secci\u00F3n condicional completa o s\u00F3lo INCLUDE o IGNORE.
+        IDREFInvalidWithNamespaces = El valor de atributo "{0}" del tipo IDREF debe ser un NCName cuando los espacios de nombres estén activados.
+        IDREFSInvalid = El valor de atributo "{0}" del tipo IDREFS debe ser uno o más nombres.
+        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = El texto de sustitución de la entidad del parámetro "{0}" debe incluir declaraciones correctamente anidadas cuando la referencia de entidad se utiliza como una declaración completa.
+        ImproperDeclarationNesting = El texto de sustitución de la entidad del parámetro "{0}" debe incluir declaraciones correctamente anidadas.
+        ImproperGroupNesting = El texto de sustitución de la entidad del parámetro "{0}" debe incluir pares de paréntesis correctamente anidados.
+        INVALID_PE_IN_CONDITIONAL = El texto de sustitución de la entidad del parámetro "{0}" debe incluir la sección condicional completa o sólo INCLUDE o IGNORE.
         MSG_ATTRIBUTE_NOT_DECLARED = El atributo "{1}" se debe haber declarado para el tipo de elemento "{0}".
         MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = El atributo "{0}" con el valor "{1}" debe tener un valor de la lista "{2}".
-        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = El valor "{1}" del atributo "{0}" no se debe cambiar mediante la normalizaci\u00F3n (a "{2}") en un documento aut\u00F3nomo.
+        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = El valor "{1}" del atributo "{0}" no se debe cambiar mediante la normalización (a "{2}") en un documento autónomo.
         MSG_CONTENT_INCOMPLETE = El contenido del tipo de elemento "{0}" es incompleto, debe coincidir con "{1}".
         MSG_CONTENT_INVALID = El contenido del tipo de elemento "{0}" debe coincidir con "{1}".
-        MSG_CONTENT_INVALID_SPECIFIED = El contenido del tipo de elemento "{0}" debe coincidir con "{1}". Los secundarios del tipo "{2}" no est\u00E1n permitidos.
-        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = El atributo "{1}" para el tipo de elemento "{0}" tiene un valor por defecto y debe especificarse en un documento aut\u00F3nomo.
+        MSG_CONTENT_INVALID_SPECIFIED = El contenido del tipo de elemento "{0}" debe coincidir con "{1}". Los secundarios del tipo "{2}" no están permitidos.
+        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = El atributo "{1}" para el tipo de elemento "{0}" tiene un valor por defecto y debe especificarse en un documento autónomo.
         MSG_DUPLICATE_ATTDEF = El atributo "{1}" ya se ha declarado para el tipo de elemento "{0}".
-        MSG_ELEMENT_ALREADY_DECLARED = El tipo de elemento "{0}" no debe declararse m\u00E1s de una vez.
+        MSG_ELEMENT_ALREADY_DECLARED = El tipo de elemento "{0}" no debe declararse más de una vez.
         MSG_ELEMENT_NOT_DECLARED = El tipo de elemento "{0}" debe declararse.
-        MSG_GRAMMAR_NOT_FOUND = El documento no es v\u00E1lido: no se ha encontrado la gram\u00E1tica.
+        MSG_GRAMMAR_NOT_FOUND = El documento no es válido: no se ha encontrado la gramática.
         MSG_ELEMENT_WITH_ID_REQUIRED = Un elemento con el identificador "{0}" debe aparecer en el documento.
-        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = La referencia a la entidad externa "{0}" no est\u00E1 permitida en un documento aut\u00F3nomo.
+        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = La referencia a la entidad externa "{0}" no está permitida en un documento autónomo.
         MSG_FIXED_ATTVALUE_INVALID = El atributo "{1}" con el valor "{2}" debe tener un valor de "{3}".
-        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = El tipo de elemento "{0}" ya tiene un atributo "{1}" del tipo ID, un segundo atributo "{2}" del tipo ID no est\u00E1 permitido.
-        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = El tipo de elemento "{0}" ya tiene un atributo "{1}" del tipo NOTATION, un segundo atributo "{2}" del tipo NOTATION no est\u00E1 permitido.
-        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notaci\u00F3n "{1}" debe declararse cuando se hace referencia a la misma en la lista de tipos de notaci\u00F3n para el atributo "{0}".
-        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notaci\u00F3n "{1}" debe declararse cuando se hace referencia a la misma en la declaraci\u00F3n de entidad no analizada para "{0}".
-        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = La referencia a la entidad "{0}" declarada en una entidad analizada externa no est\u00E1 permitida en un documento aut\u00F3nomo.
+        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = El tipo de elemento "{0}" ya tiene un atributo "{1}" del tipo ID, un segundo atributo "{2}" del tipo ID no está permitido.
+        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = El tipo de elemento "{0}" ya tiene un atributo "{1}" del tipo NOTATION, un segundo atributo "{2}" del tipo NOTATION no está permitido.
+        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notación "{1}" debe declararse cuando se hace referencia a la misma en la lista de tipos de notación para el atributo "{0}".
+        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notación "{1}" debe declararse cuando se hace referencia a la misma en la declaración de entidad no analizada para "{0}".
+        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = La referencia a la entidad "{0}" declarada en una entidad analizada externa no está permitida en un documento autónomo.
         MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = El atributo "{1}" es necesario y debe especificarse para el tipo de elemento "{0}".
-        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = No debe incluirse un espacio en blanco entre los elementos declarados en una entidad analizada externa con el contenido del elemento en un documento aut\u00F3nomo.
+        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = No debe incluirse un espacio en blanco entre los elementos declarados en una entidad analizada externa con el contenido del elemento en un documento autónomo.
         NMTOKENInvalid = El valor de atributo "{0}" del tipo NMTOKEN debe ser un token de nombre.
-        NMTOKENSInvalid = El valor de atributo "{0}" del tipo NMTOKENS debe ser uno o m\u00E1s tokens de nombre.
-        NoNotationOnEmptyElement = El tipo de elemento "{0}" que se declar\u00F3 como EMPTY no puede declarar el atributo "{1}" del tipo NOTATION.
-        RootElementTypeMustMatchDoctypedecl = El elemento ra\u00EDz del documento "{1}", debe coincidir con la ra\u00EDz DOCTYPE "{0}".
+        NMTOKENSInvalid = El valor de atributo "{0}" del tipo NMTOKENS debe ser uno o más tokens de nombre.
+        NoNotationOnEmptyElement = El tipo de elemento "{0}" que se declaró como EMPTY no puede declarar el atributo "{1}" del tipo NOTATION.
+        RootElementTypeMustMatchDoctypedecl = El elemento raíz del documento "{1}", debe coincidir con la raíz DOCTYPE "{0}".
         UndeclaredElementInContentSpec = El modelo de contenido del elemento "{0}" hace referencia al elemento no declarado "{1}".
-        UniqueNotationName = La declaraci\u00F3n de la notaci\u00F3n "{0}" no es \u00FAnica. Un nombre determinado no debe declararse en m\u00E1s de una declaraci\u00F3n de notaci\u00F3n.
-        ENTITYFailedInitializeGrammar =  Fallo del validador ENTITYDatatype. Es necesario llamar al m\u00E9todo de inicializaci\u00F3n con una referencia de gram\u00E1tica v\u00E1lida. \t
-        ENTITYNotUnparsed = ENTITY "{0}"no est\u00E1 sin analizar.
-        ENTITYNotValid = ENTITY "{0}" no es v\u00E1lida.
-        EmptyList = El valor de tipo ENTITIES, IDREFS y NMTOKENS no puede ser una lista vac\u00EDa.
+        UniqueNotationName = La declaración de la notación "{0}" no es única. Un nombre determinado no debe declararse en más de una declaración de notación.
+        ENTITYFailedInitializeGrammar =  Fallo del validador ENTITYDatatype. Es necesario llamar al método de inicialización con una referencia de gramática válida. \t
+        ENTITYNotUnparsed = ENTITY "{0}"no está sin analizar.
+        ENTITYNotValid = ENTITY "{0}" no es válida.
+        EmptyList = El valor de tipo ENTITIES, IDREFS y NMTOKENS no puede ser una lista vacía.
 
 # Entity related messages
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ReferenceToExternalEntity = La referencia de entidad externa "&{0};" no est\u00E1 permitida en un valor de atributo.
-        AccessExternalDTD = DTD externa: fallo al leer DTD externa ''{0}'' porque el acceso a ''{1}'' no est\u00E1 permitido debido a una restricci\u00F3n que ha definido la propiedad accessExternalDTD.
-        AccessExternalEntity = Entidad externa: fallo al leer el documento externo ''{0}'' porque el acceso a ''{1}'' no est\u00E1 permitido debido a una restricci\u00F3n que ha definido la propiedad accessExternalDTD.
+        ReferenceToExternalEntity = La referencia de entidad externa "&{0};" no está permitida en un valor de atributo.
+        AccessExternalDTD = DTD externa: fallo al leer DTD externa ''{0}'' porque el acceso a ''{1}'' no está permitido debido a una restricción que ha definido la propiedad accessExternalDTD.
+        AccessExternalEntity = Entidad externa: fallo al leer el documento externo ''{0}'' porque el acceso a ''{1}'' no está permitido debido a una restricción que ha definido la propiedad accessExternalDTD.
 
 # 4.1 Character and Entity References
-        EntityNotDeclared = Se hizo referencia a la entidad "{0}", pero no se declar\u00F3.
-        ReferenceToUnparsedEntity = La referencia de entidad no analizada "&{0};" no est\u00E1 permitida.
+        EntityNotDeclared = Se hizo referencia a la entidad "{0}", pero no se declaró.
+        ReferenceToUnparsedEntity = La referencia de entidad no analizada "&{0};" no está permitida.
         RecursiveReference = Referencia de entidad recursiva "{0}". (Ruta de acceso de referencia: {1}),
         RecursiveGeneralReference = Referencia de entidad general recursiva "&{0};". (Ruta de acceso de referencia: {1}),
-        RecursivePEReference = Referencia de entidad de par\u00E1metro recursiva "%{0};". (Ruta de acceso de referencia: {1}),
+        RecursivePEReference = Referencia de entidad de parámetro recursiva "%{0};". (Ruta de acceso de referencia: {1}),
 # 4.3.3 Character Encoding in Entities
-        EncodingNotSupported = La codificaci\u00F3n "{0}" no est\u00E1 soportada.
-        EncodingRequired = Una entidad analizada no codificada en UTF-8 o UTF-16 debe contener una declaraci\u00F3n de codificaci\u00F3n.
+        EncodingNotSupported = La codificación "{0}" no está soportada.
+        EncodingRequired = Una entidad analizada no codificada en UTF-8 o UTF-16 debe contener una declaración de codificación.
 
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = El elemento o el atributo no coinciden con la producci\u00F3n del QName: QName::=(NCName':')?NCName.
+        IllegalQName = El elemento o el atributo no coinciden con la producción del QName: QName::=(NCName':')?NCName.
         ElementXMLNSPrefix = El elemento "{0}" no puede tener "xmlns" como prefijo.
-        ElementPrefixUnbound = El prefijo "{0}" para el elemento "{1}" no est\u00E1 enlazado.
-        AttributePrefixUnbound = El prefijo "{2}" para el atributo "{1}" asociado a un tipo de elemento "{0}" no est\u00E1 enlazado.
-        EmptyPrefixedAttName = El valor del atributo "{0}" no es v\u00E1lido. Los enlaces de espacio de nombres utilizados de prefijo no pueden estar vac\u00EDos.
+        ElementPrefixUnbound = El prefijo "{0}" para el elemento "{1}" no está enlazado.
+        AttributePrefixUnbound = El prefijo "{2}" para el atributo "{1}" asociado a un tipo de elemento "{0}" no está enlazado.
+        EmptyPrefixedAttName = El valor del atributo "{0}" no es válido. Los enlaces de espacio de nombres utilizados de prefijo no pueden estar vacíos.
         PrefixDeclared = El prefijo de espacio de nombres "{0}" no se ha declarado.
-        CantBindXMLNS = El prefijo "xmlns" no puede enlazarse a ning\u00FAn espacio de nombres expl\u00EDcitamente; tampoco puede enlazarse el espacio de nombres para "xmlns" a cualquier prefijo expl\u00EDcitamente.
-        CantBindXML = El prefijo "xml" no puede enlazarse a ning\u00FAn espacio de nombres que no sea el habitual; tampoco puede enlazarse el espacio de nombres para "xml" a cualquier prefijo que no sea "xml".
-        MSG_ATT_DEFAULT_INVALID = El valor por defecto "{1}" del atributo "{0}" no es legal para las restricciones l\u00E9xicas de este tipo de atributo.
+        CantBindXMLNS = El prefijo "xmlns" no puede enlazarse a ningún espacio de nombres explícitamente; tampoco puede enlazarse el espacio de nombres para "xmlns" a cualquier prefijo explícitamente.
+        CantBindXML = El prefijo "xml" no puede enlazarse a ningún espacio de nombres que no sea el habitual; tampoco puede enlazarse el espacio de nombres para "xml" a cualquier prefijo que no sea "xml".
+        MSG_ATT_DEFAULT_INVALID = El valor por defecto "{1}" del atributo "{0}" no es legal para las restricciones léxicas de este tipo de atributo.
 
 # REVISIT: These need messages
         MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
@@ -295,14 +295,14 @@
 
 
 # Implementation limits
-        EntityExpansionLimit=JAXP00010001: el analizador ha encontrado m\u00E1s de "{0}"ampliaciones de entidad en este documento; \u00E9ste es el l\u00EDmite impuesto por el JDK.
-        ElementAttributeLimit=JAXP00010002: el elemento "{0}" tiene m\u00E1s de "{1}" atributos, "{1}" es el l\u00EDmite impuesto por el JDK.
-        MaxEntitySizeLimit=JAXP00010003: la longitud de la entidad "{0}" es "{1}", que excede el l\u00EDmite de "{2}" que ha definido "{3}".
-        TotalEntitySizeLimit=JAXP00010004: el tama\u00F1o acumulado de las entidades es "{0}" y excede el l\u00EDmite de "{1}" definido por "{2}".
-        MaxXMLNameLimit=JAXP00010005: la longitud de la entidad "{0}" es "{1}" y excede el l\u00EDmite de "{2}" definido por "{3}".
-        MaxElementDepthLimit=JAXP00010006: El elemento "{0}" tiene una profundidad de "{1}" que excede el l\u00EDmite "{2}" definido por "{3}".
-        EntityReplacementLimit=JAXP00010007: El n\u00FAmero total de nodos en las referencias de entidad es de "{0}" que supera el l\u00EDmite de "{1}" definido por "{2}".
+        EntityExpansionLimit=JAXP00010001: el analizador ha encontrado más de "{0}"ampliaciones de entidad en este documento; éste es el límite impuesto por el JDK.
+        ElementAttributeLimit=JAXP00010002: el elemento "{0}" tiene más de "{1}" atributos, "{1}" es el límite impuesto por el JDK.
+        MaxEntitySizeLimit=JAXP00010003: la longitud de la entidad "{0}" es "{1}", que excede el límite de "{2}" que ha definido "{3}".
+        TotalEntitySizeLimit=JAXP00010004: el tamaño acumulado de las entidades es "{0}" y excede el límite de "{1}" definido por "{2}".
+        MaxXMLNameLimit=JAXP00010005: la longitud de la entidad "{0}" es "{1}" y excede el límite de "{2}" definido por "{3}".
+        MaxElementDepthLimit=JAXP00010006: El elemento "{0}" tiene una profundidad de "{1}" que excede el límite "{2}" definido por "{3}".
+        EntityReplacementLimit=JAXP00010007: El número total de nodos en las referencias de entidad es de "{0}" que supera el límite de "{1}" definido por "{2}".
 
 # Catalog 09
 # Technical term, do not translate: catalog
-        CatalogException=JAXP00090001: CatalogResolver est\u00E1 activado con el cat\u00E1logo "{0}", pero se ha devuelto una excepci\u00F3n CatalogException.
+        CatalogException=JAXP00090001: CatalogResolver está activado con el catálogo "{0}", pero se ha devuelto una excepción CatalogException.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
index bf4bdd3b2a0..4300c2f7e45 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
@@ -3,290 +3,290 @@
 #
 # @version
 
-        BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
+        BadMessageKey = Le message d'erreur correspondant à la clé de message est introuvable.
         FormatFailed = Une erreur interne s'est produite pendant la mise en forme du message suivant :\n  
 
 # Document messages
-        PrematureEOF=Fin pr\u00E9matur\u00E9e du fichier.
+        PrematureEOF=Fin prématurée du fichier.
 # 2.1 Well-Formed XML Documents
-        RootElementRequired = L'\u00E9l\u00E9ment racine est obligatoire dans un document au format correct.
+        RootElementRequired = L'élément racine est obligatoire dans un document au format correct.
 # 2.2 Characters
 
-        InvalidCharInCDSect = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la section CDATA.
-        InvalidCharInContent = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le contenu d''\u00E9l\u00E9ment du document.
-        TwoColonsInQName = Un deuxi\u00E8me ":" non valide a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le type d'\u00E9l\u00E9ment ou le nom d'attribut.
-        ColonNotLegalWithNS = Les deux-points ne sont pas autoris\u00E9s dans le nom ''{0}'' lorsque les espaces de noms sont activ\u00E9s.
-        InvalidCharInMisc = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le balisage apr\u00E8s la fin du contenu d''\u00E9l\u00E9ment.
-        InvalidCharInProlog = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le prologue du document.
-        InvalidCharInXMLDecl = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la d\u00E9claration XML.
+        InvalidCharInCDSect = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans la section CDATA.
+        InvalidCharInContent = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans le contenu d''élément du document.
+        TwoColonsInQName = Un deuxième ":" non valide a été détecté dans le type d'élément ou le nom d'attribut.
+        ColonNotLegalWithNS = Les deux-points ne sont pas autorisés dans le nom ''{0}'' lorsque les espaces de noms sont activés.
+        InvalidCharInMisc = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans le balisage après la fin du contenu d''élément.
+        InvalidCharInProlog = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans le prologue du document.
+        InvalidCharInXMLDecl = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans la déclaration XML.
 # 2.4 Character Data and Markup
-        CDEndInContent = La s\u00E9quence de caract\u00E8res "]]>" ne doit pas figurer dans le contenu sauf si elle est utilis\u00E9e pour baliser la fin d'une section CDATA.
+        CDEndInContent = La séquence de caractères "]]>" ne doit pas figurer dans le contenu sauf si elle est utilisée pour baliser la fin d'une section CDATA.
 # 2.7 CDATA Sections
         CDSectUnterminated = La section CDATA doit se terminer par "]]>".
 # 2.8 Prolog and Document Type Declaration
-        XMLDeclMustBeFirst = La d\u00E9claration XML ne peut figurer qu'au d\u00E9but du document.
-        EqRequiredInXMLDecl = Le caract\u00E8re ''='' doit suivre "{0}" dans la d\u00E9claration XML.
-        QuoteRequiredInXMLDecl = La valeur suivant "{0}" dans la d\u00E9claration XML doit \u00EAtre une cha\u00EEne entre guillemets.
-        XMLDeclUnterminated = La d\u00E9claration XML doit se terminer par "?>".
-        VersionInfoRequired = La version est obligatoire dans la d\u00E9claration XML.
-        SpaceRequiredBeforeVersionInXMLDecl = Un espace est obligatoire devant le pseudo-attribut version dans la d\u00E9claration XML.
-        SpaceRequiredBeforeEncodingInXMLDecl = Un espace est obligatoire devant le pseudo-attribut encoding dans la d\u00E9claration XML.
-        SpaceRequiredBeforeStandalone = Un espace est obligatoire devant le pseudo-attribut encoding dans la d\u00E9claration XML.
-        MarkupNotRecognizedInProlog = Le balisage du document pr\u00E9c\u00E9dant l'\u00E9l\u00E9ment racine doit avoir un format correct.
-        MarkupNotRecognizedInMisc = Le balisage du document suivant l'\u00E9l\u00E9ment racine doit avoir un format correct.
-        AlreadySeenDoctype = DOCTYPE d\u00E9j\u00E0 vu.
-        DoctypeNotAllowed = DOCTYPE n'est pas autoris\u00E9 lorsque la fonctionnalit\u00E9 "http://apache.org/xml/features/disallow-doctype-decl" est d\u00E9finie sur True.
-        ContentIllegalInProlog = Contenu non autoris\u00E9 dans le prologue.
-        ReferenceIllegalInProlog = R\u00E9f\u00E9rence non autoris\u00E9e dans le prologue.
+        XMLDeclMustBeFirst = La déclaration XML ne peut figurer qu'au début du document.
+        EqRequiredInXMLDecl = Le caractère ''='' doit suivre "{0}" dans la déclaration XML.
+        QuoteRequiredInXMLDecl = La valeur suivant "{0}" dans la déclaration XML doit être une chaîne entre guillemets.
+        XMLDeclUnterminated = La déclaration XML doit se terminer par "?>".
+        VersionInfoRequired = La version est obligatoire dans la déclaration XML.
+        SpaceRequiredBeforeVersionInXMLDecl = Un espace est obligatoire devant le pseudo-attribut version dans la déclaration XML.
+        SpaceRequiredBeforeEncodingInXMLDecl = Un espace est obligatoire devant le pseudo-attribut encoding dans la déclaration XML.
+        SpaceRequiredBeforeStandalone = Un espace est obligatoire devant le pseudo-attribut encoding dans la déclaration XML.
+        MarkupNotRecognizedInProlog = Le balisage du document précédant l'élément racine doit avoir un format correct.
+        MarkupNotRecognizedInMisc = Le balisage du document suivant l'élément racine doit avoir un format correct.
+        AlreadySeenDoctype = DOCTYPE déjà vu.
+        DoctypeNotAllowed = DOCTYPE n'est pas autorisé lorsque la fonctionnalité "http://apache.org/xml/features/disallow-doctype-decl" est définie sur True.
+        ContentIllegalInProlog = Contenu non autorisé dans le prologue.
+        ReferenceIllegalInProlog = Référence non autorisée dans le prologue.
 # Trailing Misc
-        ContentIllegalInTrailingMisc=Contenu non autoris\u00E9 dans la section de fin.
-        ReferenceIllegalInTrailingMisc=R\u00E9f\u00E9rence non autoris\u00E9e dans la section de fin.
+        ContentIllegalInTrailingMisc=Contenu non autorisé dans la section de fin.
+        ReferenceIllegalInTrailingMisc=Référence non autorisée dans la section de fin.
 
 # 2.9 Standalone Document Declaration
-        SDDeclInvalid = La valeur de d\u00E9claration de document autonome doit \u00EAtre "oui" ou "non", mais pas "{0}".
-        SDDeclNameInvalid = Le nom de document autonome contenu dans la d\u00E9claration XML est peut-\u00EAtre mal orthographi\u00E9.
+        SDDeclInvalid = La valeur de déclaration de document autonome doit être "oui" ou "non", mais pas "{0}".
+        SDDeclNameInvalid = Le nom de document autonome contenu dans la déclaration XML est peut-être mal orthographié.
 # 2.12 Language Identification
         XMLLangInvalid = La valeur d''attribut xml:lang "{0}" est un identificateur de langue non valide.
 # 3. Logical Structures
-        ETagRequired = Le type d''\u00E9l\u00E9ment "{0}" doit se terminer par la balise de fin correspondante "</{0}>".
+        ETagRequired = Le type d''élément "{0}" doit se terminer par la balise de fin correspondante "</{0}>".
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ElementUnterminated = Le type d''\u00E9l\u00E9ment "{0}" doit \u00EAtre suivi des sp\u00E9cifications d''attribut, ">" ou "/>".
-        EqRequiredInAttribute = Le nom d''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}" doit \u00EAtre suivi du caract\u00E8re ''=''.
-        OpenQuoteExpected = Des guillemets ouvrants sont attendus pour l''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}".
-        CloseQuoteExpected = Des guillemets fermants sont attendus pour l''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}".
-        AttributeNotUnique = L''attribut "{1}" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 pour l''\u00E9l\u00E9ment "{0}".
-        AttributeNSNotUnique = L''attribut "{1}" li\u00E9 \u00E0 l''espace de noms "{2}" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 pour l''\u00E9l\u00E9ment "{0}".
-        ETagUnterminated = La balise de fin pour le type d''\u00E9l\u00E9ment "{0}" doit se terminer par un d\u00E9limiteur ''>''.
-        MarkupNotRecognizedInContent = Le contenu des \u00E9l\u00E9ments doit inclure un balisage ou des caract\u00E8res au format correct.
-        DoctypeIllegalInContent = Un DOCTYPE n'est pas autoris\u00E9 dans le contenu.
+        ElementUnterminated = Le type d''élément "{0}" doit être suivi des spécifications d''attribut, ">" ou "/>".
+        EqRequiredInAttribute = Le nom d''attribut "{1}" associé à un type d''élément "{0}" doit être suivi du caractère ''=''.
+        OpenQuoteExpected = Des guillemets ouvrants sont attendus pour l''attribut "{1}" associé à un type d''élément "{0}".
+        CloseQuoteExpected = Des guillemets fermants sont attendus pour l''attribut "{1}" associé à un type d''élément "{0}".
+        AttributeNotUnique = L''attribut "{1}" a déjà été spécifié pour l''élément "{0}".
+        AttributeNSNotUnique = L''attribut "{1}" lié à l''espace de noms "{2}" a déjà été spécifié pour l''élément "{0}".
+        ETagUnterminated = La balise de fin pour le type d''élément "{0}" doit se terminer par un délimiteur ''>''.
+        MarkupNotRecognizedInContent = Le contenu des éléments doit inclure un balisage ou des caractères au format correct.
+        DoctypeIllegalInContent = Un DOCTYPE n'est pas autorisé dans le contenu.
 # 4.1 Character and Entity References
-        ReferenceUnterminated = La r\u00E9f\u00E9rence doit se terminer par un d\u00E9limiteur ';'.
+        ReferenceUnterminated = La référence doit se terminer par un délimiteur ';'.
 # 4.3.2 Well-Formed Parsed Entities
-        ReferenceNotInOneEntity = La r\u00E9f\u00E9rence doit \u00EAtre enti\u00E8rement incluse dans la m\u00EAme entit\u00E9 analys\u00E9e.
-        ElementEntityMismatch = L''\u00E9l\u00E9ment "{0}" doit commencer et se terminer dans la m\u00EAme entit\u00E9.
-        MarkupEntityMismatch=Les structures de document XML doivent commencer et se terminer dans la m\u00EAme entit\u00E9.
+        ReferenceNotInOneEntity = La référence doit être entièrement incluse dans la même entité analysée.
+        ElementEntityMismatch = L''élément "{0}" doit commencer et se terminer dans la même entité.
+        MarkupEntityMismatch=Les structures de document XML doivent commencer et se terminer dans la même entité.
 
 # Messages common to Document and DTD
 # 2.2 Characters
-        InvalidCharInAttValue = Un caract\u00E8re XML non valide (Unicode : 0x{2}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la valeur de l''attribut "{1}" et l''\u00E9l\u00E9ment est "{0}".
-        InvalidCharInComment = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le commentaire.
-        InvalidCharInPI = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans l''instruction de traitement.
-        InvalidCharInInternalSubset = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le sous-ensemble interne de la DTD.
-        InvalidCharInTextDecl = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la d\u00E9claration textuelle.
+        InvalidCharInAttValue = Un caractère XML non valide (Unicode : 0x{2}) a été détecté dans la valeur de l''attribut "{1}" et l''élément est "{0}".
+        InvalidCharInComment = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans le commentaire.
+        InvalidCharInPI = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans l''instruction de traitement.
+        InvalidCharInInternalSubset = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans le sous-ensemble interne de la DTD.
+        InvalidCharInTextDecl = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans la déclaration textuelle.
 # 2.3 Common Syntactic Constructs
         QuoteRequiredInAttValue = La valeur de l''attribut "{1}" doit commencer par une apostrophe ou des guillemets.
-        LessthanInAttValue = La valeur de l''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}" ne doit pas contenir le caract\u00E8re ''<''.
+        LessthanInAttValue = La valeur de l''attribut "{1}" associé à un type d''élément "{0}" ne doit pas contenir le caractère ''<''.
         AttributeValueUnterminated = La valeur de l''attribut "{1}" doit se terminer par les guillemets correspondants.
 # 2.5 Comments
         InvalidCommentStart = Le commentaire doit commencer par "<!--".
-        DashDashInComment = La cha\u00EEne "--" n'est pas autoris\u00E9e dans les commentaires.
+        DashDashInComment = La chaîne "--" n'est pas autorisée dans les commentaires.
         CommentUnterminated = Le commentaire doit se terminer par "-->".
-        COMMENT_NOT_IN_ONE_ENTITY = Le commentaire n'est pas compris dans la m\u00EAme entit\u00E9.
+        COMMENT_NOT_IN_ONE_ENTITY = Le commentaire n'est pas compris dans la même entité.
 # 2.6 Processing Instructions
         PITargetRequired = L'instruction de traitement doit commencer par le nom de la cible.
-        SpaceRequiredInPI = Un espace est obligatoire entre les donn\u00E9es et la cible de l'instruction de traitement.
+        SpaceRequiredInPI = Un espace est obligatoire entre les données et la cible de l'instruction de traitement.
         PIUnterminated = L'instruction de traitement doit se terminer par "?>".
-        ReservedPITarget = La cible de l'instruction de traitement correspondant \u00E0 "[xX][mM][lL]" n'est pas autoris\u00E9e.
-        PI_NOT_IN_ONE_ENTITY = L'instruction de traitement n'est pas comprise dans la m\u00EAme entit\u00E9.
+        ReservedPITarget = La cible de l'instruction de traitement correspondant à "[xX][mM][lL]" n'est pas autorisée.
+        PI_NOT_IN_ONE_ENTITY = L'instruction de traitement n'est pas comprise dans la même entité.
 # 2.8 Prolog and Document Type Declaration
         VersionInfoInvalid = Version "{0}" non valide.
         VersionNotSupported = La version XML "{0}" n''est pas prise en charge. Seule la version XML 1.0 est prise en charge.
         VersionNotSupported11 = La version XML "{0}" n''est pas prise en charge. Seules les versions XML 1.0 et XML 1.1 sont prises en charge.
-        VersionMismatch= Une entit\u00E9 ne peut pas inclure une autre entit\u00E9 d'une version ult\u00E9rieure.
+        VersionMismatch= Une entité ne peut pas inclure une autre entité d'une version ultérieure.
 # 4.1 Character and Entity References
-        DigitRequiredInCharRef = Une repr\u00E9sentation d\u00E9cimale doit imm\u00E9diatement suivre la cha\u00EEne "&#" dans une r\u00E9f\u00E9rence de caract\u00E8re.
-        HexdigitRequiredInCharRef = Une repr\u00E9sentation hexad\u00E9cimale doit imm\u00E9diatement suivre la cha\u00EEne "&#x" dans une r\u00E9f\u00E9rence de caract\u00E8re.
-        SemicolonRequiredInCharRef = La r\u00E9f\u00E9rence de caract\u00E8re doit se terminer par le d\u00E9limiteur ';'.
-        InvalidCharRef = La r\u00E9f\u00E9rence de caract\u00E8re "&#{0}" est un caract\u00E8re XML non valide.
-        NameRequiredInReference = Le nom de l'identit\u00E9 doit imm\u00E9diatement suivre le caract\u00E8re "&" dans la r\u00E9f\u00E9rence d'entit\u00E9.
-        SemicolonRequiredInReference = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 "{0}" doit se terminer par le d\u00E9limiteur '';''.
+        DigitRequiredInCharRef = Une représentation décimale doit immédiatement suivre la chaîne "&#" dans une référence de caractère.
+        HexdigitRequiredInCharRef = Une représentation hexadécimale doit immédiatement suivre la chaîne "&#x" dans une référence de caractère.
+        SemicolonRequiredInCharRef = La référence de caractère doit se terminer par le délimiteur ';'.
+        InvalidCharRef = La référence de caractère "&#{0}" est un caractère XML non valide.
+        NameRequiredInReference = Le nom de l'identité doit immédiatement suivre le caractère "&" dans la référence d'entité.
+        SemicolonRequiredInReference = La référence à l''entité "{0}" doit se terminer par le délimiteur '';''.
 # 4.3.1 The Text Declaration
-        TextDeclMustBeFirst = La d\u00E9claration textuelle ne doit figurer qu'au d\u00E9but de l'entit\u00E9 analys\u00E9e externe.
-        EqRequiredInTextDecl = Le caract\u00E8re ''='' doit suivre "{0}" dans la d\u00E9claration textuelle.
-        QuoteRequiredInTextDecl = La valeur suivant "{0}" dans la d\u00E9claration textuelle doit \u00EAtre une cha\u00EEne entre guillemets.
-        CloseQuoteMissingInTextDecl = Dans la valeur suivant "{0}" dans la d\u00E9claration textuelle, il manque les guillemets fermants.
-        SpaceRequiredBeforeVersionInTextDecl = Un espace est obligatoire devant le pseudo-attribut version dans la d\u00E9claration textuelle.
-        SpaceRequiredBeforeEncodingInTextDecl = Un espace est obligatoire devant le pseudo-attribut encoding dans la d\u00E9claration textuelle.
-        TextDeclUnterminated = La d\u00E9claration textuelle doit se terminer par "?>".
-        EncodingDeclRequired = La d\u00E9claration d'encodage est obligatoire dans la d\u00E9claration textuelle.
-        NoMorePseudoAttributes = Aucun autre pseudo-attribut n'est autoris\u00E9.
+        TextDeclMustBeFirst = La déclaration textuelle ne doit figurer qu'au début de l'entité analysée externe.
+        EqRequiredInTextDecl = Le caractère ''='' doit suivre "{0}" dans la déclaration textuelle.
+        QuoteRequiredInTextDecl = La valeur suivant "{0}" dans la déclaration textuelle doit être une chaîne entre guillemets.
+        CloseQuoteMissingInTextDecl = Dans la valeur suivant "{0}" dans la déclaration textuelle, il manque les guillemets fermants.
+        SpaceRequiredBeforeVersionInTextDecl = Un espace est obligatoire devant le pseudo-attribut version dans la déclaration textuelle.
+        SpaceRequiredBeforeEncodingInTextDecl = Un espace est obligatoire devant le pseudo-attribut encoding dans la déclaration textuelle.
+        TextDeclUnterminated = La déclaration textuelle doit se terminer par "?>".
+        EncodingDeclRequired = La déclaration d'encodage est obligatoire dans la déclaration textuelle.
+        NoMorePseudoAttributes = Aucun autre pseudo-attribut n'est autorisé.
         MorePseudoAttributes = D'autres pseudo-attributs sont attendus.
         PseudoAttrNameExpected = Un nom de pseudo-attribut est attendu. 
 # 4.3.2 Well-Formed Parsed Entities
-        CommentNotInOneEntity = Le commentaire doit \u00EAtre enti\u00E8rement inclus dans la m\u00EAme entit\u00E9 analys\u00E9e.
-        PINotInOneEntity = L'instruction de traitement doit \u00EAtre enti\u00E8rement incluse dans la m\u00EAme entit\u00E9 analys\u00E9e.
+        CommentNotInOneEntity = Le commentaire doit être entièrement inclus dans la même entité analysée.
+        PINotInOneEntity = L'instruction de traitement doit être entièrement incluse dans la même entité analysée.
 # 4.3.3 Character Encoding in Entities
         EncodingDeclInvalid = Nom d''encodage "{0}" non valide.
-        EncodingByteOrderUnsupported = L''ordre des octets donn\u00E9 pour encoder "{0}" n''est pas pris en charge.
-        InvalidByte = Octet {0} de la s\u00E9quence UTF-8 \u00E0 {1} octets non valide.
-        ExpectedByte = Octet {0} de la s\u00E9quence UTF-8 \u00E0 {1} octets attendu.  
-        InvalidHighSurrogate = Les bits de substitution sup\u00E9rieurs (High surrogate) dans la s\u00E9quence UTF-8 ne doivent pas d\u00E9passer 0x10 mais des bits 0x{0} ont \u00E9t\u00E9 d\u00E9tect\u00E9s.
-        OperationNotSupported = Op\u00E9ration "{0}" non prise en charge par le lecteur {1}.
-        InvalidASCII = L''octet "{0}" n''appartient pas au jeu de caract\u00E8res ASCII (7 bits).
-        CharConversionFailure = Une entit\u00E9 respectant un certain encodage ne doit pas contenir de s\u00E9quences non admises dans cet encodage.
+        EncodingByteOrderUnsupported = L''ordre des octets donné pour encoder "{0}" n''est pas pris en charge.
+        InvalidByte = Octet {0} de la séquence UTF-8 à {1} octets non valide.
+        ExpectedByte = Octet {0} de la séquence UTF-8 à {1} octets attendu.  
+        InvalidHighSurrogate = Les bits de substitution supérieurs (High surrogate) dans la séquence UTF-8 ne doivent pas dépasser 0x10 mais des bits 0x{0} ont été détectés.
+        OperationNotSupported = Opération "{0}" non prise en charge par le lecteur {1}.
+        InvalidASCII = L''octet "{0}" n''appartient pas au jeu de caractères ASCII (7 bits).
+        CharConversionFailure = Une entité respectant un certain encodage ne doit pas contenir de séquences non admises dans cet encodage.
 
 # DTD Messages
 # 2.2 Characters
-        InvalidCharInEntityValue = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la valeur d''entit\u00E9 litt\u00E9rale.
-        InvalidCharInExternalSubset = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le sous-ensemble externe de la DTD.
-        InvalidCharInIgnoreSect = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la section conditionnelle exclue.
-        InvalidCharInPublicID = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans l''identificateur public.
-        InvalidCharInSystemID = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans l''identificateur syst\u00E8me.
+        InvalidCharInEntityValue = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans la valeur d''entité littérale.
+        InvalidCharInExternalSubset = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans le sous-ensemble externe de la DTD.
+        InvalidCharInIgnoreSect = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans la section conditionnelle exclue.
+        InvalidCharInPublicID = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans l''identificateur public.
+        InvalidCharInSystemID = Un caractère XML non valide (Unicode : 0x{0}) a été détecté dans l''identificateur système.
 # 2.3 Common Syntactic Constructs
-        SpaceRequiredAfterSYSTEM = Un espace est obligatoire apr\u00E8s le mot-cl\u00E9 SYSTEM dans la d\u00E9claration DOCTYPE.
-        QuoteRequiredInSystemID = L'identificateur syst\u00E8me doit commencer par une apostrophe ou des guillemets.
-        SystemIDUnterminated = L'identificateur syst\u00E8me doit se terminer par les guillemets correspondants.
-        SpaceRequiredAfterPUBLIC = Un espace est obligatoire apr\u00E8s le mot-cl\u00E9 PUBLIC dans la d\u00E9claration DOCTYPE.
+        SpaceRequiredAfterSYSTEM = Un espace est obligatoire après le mot-clé SYSTEM dans la déclaration DOCTYPE.
+        QuoteRequiredInSystemID = L'identificateur système doit commencer par une apostrophe ou des guillemets.
+        SystemIDUnterminated = L'identificateur système doit se terminer par les guillemets correspondants.
+        SpaceRequiredAfterPUBLIC = Un espace est obligatoire après le mot-clé PUBLIC dans la déclaration DOCTYPE.
         QuoteRequiredInPublicID = L'identificateur public doit commencer par une apostrophe ou des guillemets.
         PublicIDUnterminated = L'identificateur public doit se terminer par les guillemets correspondants.
-        PubidCharIllegal = Ce caract\u00E8re (Unicode : 0x{0}) n''est pas autoris\u00E9 dans l''identificateur public.
+        PubidCharIllegal = Ce caractère (Unicode : 0x{0}) n''est pas autorisé dans l''identificateur public.
         SpaceRequiredBetweenPublicAndSystem = Des espaces sont obligatoires entre les ID publicId et systemId.
 # 2.8 Prolog and Document Type Declaration
-        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Un espace est obligatoire apr\u00E8s "<!DOCTYPE" dans la d\u00E9claration de type de document.
-        MSG_ROOT_ELEMENT_TYPE_REQUIRED = Le type d'\u00E9l\u00E9ment racine doit figurer apr\u00E8s "<!DOCTYPE" dans la d\u00E9claration de type de document.
-        DoctypedeclUnterminated = La d\u00E9claration de type de document pour le type d''\u00E9l\u00E9ment racine "{0}" doit se terminer par ''>''.
-        DoctypedeclNotClosed = La d\u00E9claration de type de document pour le type d''\u00E9l\u00E9ment racine "{0}" doit se terminer par '']''.
-        PEReferenceWithinMarkup = La r\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre "%{0};" ne peut pas survenir dans le balisage du sous-ensemble interne de la DTD.
-        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Les d\u00E9clarations de balisage contenues dans la d\u00E9claration de type de document ou sur lesquelles pointe cette derni\u00E8re doivent avoir un format correct.
+        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Un espace est obligatoire après "<!DOCTYPE" dans la déclaration de type de document.
+        MSG_ROOT_ELEMENT_TYPE_REQUIRED = Le type d'élément racine doit figurer après "<!DOCTYPE" dans la déclaration de type de document.
+        DoctypedeclUnterminated = La déclaration de type de document pour le type d''élément racine "{0}" doit se terminer par ''>''.
+        DoctypedeclNotClosed = La déclaration de type de document pour le type d''élément racine "{0}" doit se terminer par '']''.
+        PEReferenceWithinMarkup = La référence d''entité de paramètre "%{0};" ne peut pas survenir dans le balisage du sous-ensemble interne de la DTD.
+        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Les déclarations de balisage contenues dans la déclaration de type de document ou sur lesquelles pointe cette dernière doivent avoir un format correct.
 # 2.10 White Space Handling
-        MSG_XML_SPACE_DECLARATION_ILLEGAL = La d\u00E9claration d'attribut pour "xml:space" doit \u00EAtre pr\u00E9sent\u00E9e comme type \u00E9num\u00E9r\u00E9 dont les seules valeurs possibles sont "default" et "preserve".
+        MSG_XML_SPACE_DECLARATION_ILLEGAL = La déclaration d'attribut pour "xml:space" doit être présentée comme type énuméré dont les seules valeurs possibles sont "default" et "preserve".
 # 3.2 Element Type Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Un espace est obligatoire apr\u00E8s "<!ELEMENT" dans la d\u00E9claration de type d'\u00E9l\u00E9ment.
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Le type d'\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration de type d'\u00E9l\u00E9ment.
-        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Un espace est obligatoire apr\u00E8s le type d''\u00E9l\u00E9ment "{0}" dans la d\u00E9claration de type d''\u00E9l\u00E9ment.
-        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = La contrainte est obligatoire apr\u00E8s le type d''\u00E9l\u00E9ment "{0}" dans la d\u00E9claration de type d''\u00E9l\u00E9ment.
-        ElementDeclUnterminated = La d\u00E9claration du type d''\u00E9l\u00E9ment "{0}" doit se terminer par ''>''.
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Un espace est obligatoire après "<!ELEMENT" dans la déclaration de type d'élément.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Le type d'élément est obligatoire dans la déclaration de type d'élément.
+        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Un espace est obligatoire après le type d''élément "{0}" dans la déclaration de type d''élément.
+        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = La contrainte est obligatoire après le type d''élément "{0}" dans la déclaration de type d''élément.
+        ElementDeclUnterminated = La déclaration du type d''élément "{0}" doit se terminer par ''>''.
 # 3.2.1 Element Content
-        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un caract\u00E8re ''('' ou un type d''\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment "{0}".
-        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un caract\u00E8re '')'' est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment "{0}".
+        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un caractère ''('' ou un type d''élément est obligatoire dans la déclaration du type d''élément "{0}".
+        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un caractère '')'' est obligatoire dans la déclaration du type d''élément "{0}".
 # 3.2.2 Mixed Content
-        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un type d''\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment "{0}".
-        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un caract\u00E8re '')'' est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment "{0}".
-        MixedContentUnterminated = Le mod\u00E8le de contenu mixte "{0}" doit se terminer par ")*" lorsque les types d''\u00E9l\u00E9ment enfant sont contraints.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un type d''élément est obligatoire dans la déclaration du type d''élément "{0}".
+        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un caractère '')'' est obligatoire dans la déclaration du type d''élément "{0}".
+        MixedContentUnterminated = Le modèle de contenu mixte "{0}" doit se terminer par ")*" lorsque les types d''élément enfant sont contraints.
 # 3.3 Attribute-List Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Un espace est obligatoire apr\u00E8s "<!ATTLIST" dans la d\u00E9claration de liste d'attributs.
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Le type d'\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration de liste d'attributs.
-        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Un espace est obligatoire avant le nom d''attribut dans la d\u00E9claration de liste d''attributs de l''\u00E9l\u00E9ment "{0}".
-        AttNameRequiredInAttDef = Le nom d''attribut doit \u00EAtre sp\u00E9cifi\u00E9 dans la d\u00E9claration de liste d''attributs de l''\u00E9l\u00E9ment "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Un espace est obligatoire avant le type d''attribut dans la d\u00E9claration de l''attribut "{1}" de l''\u00E9l\u00E9ment "{0}".
-        AttTypeRequiredInAttDef = Le type d''attribut est obligatoire dans la d\u00E9claration de l''attribut "{1}" de l''\u00E9l\u00E9ment "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Un espace est obligatoire avant la valeur par d\u00E9faut de l''attribut dans la d\u00E9claration de l''attribut "{1}" de l''\u00E9l\u00E9ment "{0}".
-        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Plusieurs d\u00E9finitions d''attribut sont fournies pour le m\u00EAme attribut "{1}" d''un \u00E9l\u00E9ment donn\u00E9 "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Un espace est obligatoire après "<!ATTLIST" dans la déclaration de liste d'attributs.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Le type d'élément est obligatoire dans la déclaration de liste d'attributs.
+        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Un espace est obligatoire avant le nom d''attribut dans la déclaration de liste d''attributs de l''élément "{0}".
+        AttNameRequiredInAttDef = Le nom d''attribut doit être spécifié dans la déclaration de liste d''attributs de l''élément "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Un espace est obligatoire avant le type d''attribut dans la déclaration de l''attribut "{1}" de l''élément "{0}".
+        AttTypeRequiredInAttDef = Le type d''attribut est obligatoire dans la déclaration de l''attribut "{1}" de l''élément "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Un espace est obligatoire avant la valeur par défaut de l''attribut dans la déclaration de l''attribut "{1}" de l''élément "{0}".
+        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Plusieurs définitions d''attribut sont fournies pour le même attribut "{1}" d''un élément donné "{0}".
 # 3.3.1 Attribute Types
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Un espace doit figurer apr\u00E8s "NOTATION" dans la d\u00E9claration d''attribut "{1}".
-        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Le caract\u00E8re ''('' doit suivre "NOTATION" dans la d\u00E9claration d''attribut "{1}".
-        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Le nom de notation est obligatoire dans la liste des types de notation de la d\u00E9claration d''attribut "{1}".
-        NotationTypeUnterminated = La liste des types de notation doit se terminer par '')'' dans la d\u00E9claration d''attribut "{1}".
-        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Le jeton de nom est obligatoire dans la liste des types \u00E9num\u00E9r\u00E9s pour la d\u00E9claration d''attribut "{1}".
-        EnumerationUnterminated = La liste des types \u00E9num\u00E9r\u00E9s doit se terminer par '')'' dans la d\u00E9claration d''attribut "{1}".
-        MSG_DISTINCT_TOKENS_IN_ENUMERATION = La valeur d''\u00E9num\u00E9ration "{1}" a \u00E9t\u00E9 indiqu\u00E9e plusieurs fois dans la d\u00E9claration de l''attribut "{2}" pour l''\u00E9l\u00E9ment "{0}". Les valeurs NMTOKENS d''une d\u00E9claration d''attribut Enumeration unique doivent toutes \u00EAtre distinctes.
-        MSG_DISTINCT_NOTATION_IN_ENUMERATION = La valeur d''\u00E9num\u00E9ration "{1}" a \u00E9t\u00E9 indiqu\u00E9e plusieurs fois dans la d\u00E9claration de l''attribut "{2}" pour l''\u00E9l\u00E9ment "{0}". Les noms NOTATION d''une d\u00E9claration d''attribut NotationType unique doivent tous \u00EAtre distincts.
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Un espace doit figurer après "NOTATION" dans la déclaration d''attribut "{1}".
+        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Le caractère ''('' doit suivre "NOTATION" dans la déclaration d''attribut "{1}".
+        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Le nom de notation est obligatoire dans la liste des types de notation de la déclaration d''attribut "{1}".
+        NotationTypeUnterminated = La liste des types de notation doit se terminer par '')'' dans la déclaration d''attribut "{1}".
+        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Le jeton de nom est obligatoire dans la liste des types énumérés pour la déclaration d''attribut "{1}".
+        EnumerationUnterminated = La liste des types énumérés doit se terminer par '')'' dans la déclaration d''attribut "{1}".
+        MSG_DISTINCT_TOKENS_IN_ENUMERATION = La valeur d''énumération "{1}" a été indiquée plusieurs fois dans la déclaration de l''attribut "{2}" pour l''élément "{0}". Les valeurs NMTOKENS d''une déclaration d''attribut Enumeration unique doivent toutes être distinctes.
+        MSG_DISTINCT_NOTATION_IN_ENUMERATION = La valeur d''énumération "{1}" a été indiquée plusieurs fois dans la déclaration de l''attribut "{2}" pour l''élément "{0}". Les noms NOTATION d''une déclaration d''attribut NotationType unique doivent tous être distincts.
 # 3.3.2 Attribute Defaults
-        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Un espace doit figurer apr\u00E8s "FIXED" dans la d\u00E9claration d''attribut "{1}".
+        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Un espace doit figurer après "FIXED" dans la déclaration d''attribut "{1}".
 # 3.4 Conditional Sections
         IncludeSectUnterminated = La section conditionnelle incluse doit se terminer par "]]>".
         IgnoreSectUnterminated = La section conditionnelle exclue doit se terminer par "]]>".
 # 4.1 Character and Entity References
-        NameRequiredInPEReference = Le nom de l'entit\u00E9 doit imm\u00E9diatement suivre le caract\u00E8re "%" dans la r\u00E9f\u00E9rence d'entit\u00E9 de param\u00E8tre.
-        SemicolonRequiredInPEReference = La r\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre "%{0};" doit se terminer par le d\u00E9limiteur '';''.
+        NameRequiredInPEReference = Le nom de l'entité doit immédiatement suivre le caractère "%" dans la référence d'entité de paramètre.
+        SemicolonRequiredInPEReference = La référence d''entité de paramètre "%{0};" doit se terminer par le délimiteur '';''.
 # 4.2 Entity Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Un espace est obligatoire apr\u00E8s "<!ENTITY" dans la d\u00E9claration d'entit\u00E9.
-        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Un espace est obligatoire entre "<!ENTITY" et le caract\u00E8re "%" dans la d\u00E9claration d'entit\u00E9 de param\u00E8tre.
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Un espace est obligatoire entre "%" et le nom de l'entit\u00E9 dans la d\u00E9claration d'entit\u00E9 de param\u00E8tre.
-        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Le nom de l'entit\u00E9 est obligatoire dans la d\u00E9claration d'entit\u00E9.
-        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Un espace est obligatoire entre le nom de l''entit\u00E9 "{0}" et la d\u00E9finition dans la d\u00E9claration d''entit\u00E9.
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Un espace est obligatoire entre "NDATA" et le nom de notation dans la d\u00E9claration de l''entit\u00E9 "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Un espace est obligatoire avant "NDATA" dans la d\u00E9claration de l''entit\u00E9 "{0}".
-        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Le nom de notation est obligatoire apr\u00E8s "NDATA" dans la d\u00E9claration de l''entit\u00E9 "{0}".
-        EntityDeclUnterminated = La d\u00E9claration de l''entit\u00E9 "{0}" doit se terminer par ''>''.
-	MSG_DUPLICATE_ENTITY_DEFINITION = L''entit\u00E9 "{0}" est d\u00E9clar\u00E9e plusieurs fois.        
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Un espace est obligatoire après "<!ENTITY" dans la déclaration d'entité.
+        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Un espace est obligatoire entre "<!ENTITY" et le caractère "%" dans la déclaration d'entité de paramètre.
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Un espace est obligatoire entre "%" et le nom de l'entité dans la déclaration d'entité de paramètre.
+        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Le nom de l'entité est obligatoire dans la déclaration d'entité.
+        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Un espace est obligatoire entre le nom de l''entité "{0}" et la définition dans la déclaration d''entité.
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Un espace est obligatoire entre "NDATA" et le nom de notation dans la déclaration de l''entité "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Un espace est obligatoire avant "NDATA" dans la déclaration de l''entité "{0}".
+        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Le nom de notation est obligatoire après "NDATA" dans la déclaration de l''entité "{0}".
+        EntityDeclUnterminated = La déclaration de l''entité "{0}" doit se terminer par ''>''.
+	MSG_DUPLICATE_ENTITY_DEFINITION = L''entité "{0}" est déclarée plusieurs fois.        
 # 4.2.2 External Entities
-        ExternalIDRequired = La d\u00E9claration d'entit\u00E9 externe doit commencer par "SYSTEM" ou "PUBLIC".
+        ExternalIDRequired = La déclaration d'entité externe doit commencer par "SYSTEM" ou "PUBLIC".
         MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Un espace est obligatoire entre "PUBLIC" et l'identificateur public.
-        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Un espace est obligatoire entre l'identificateur public et l'identificateur syst\u00E8me.
-        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Un espace est obligatoire entre "SYSTEM" et l'identificateur syst\u00E8me.
-        MSG_URI_FRAGMENT_IN_SYSTEMID = L''identificateur du fragment ne doit pas \u00EAtre sp\u00E9cifi\u00E9 comme faisant partie de l''identificateur syst\u00E8me "{0}".
+        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Un espace est obligatoire entre l'identificateur public et l'identificateur système.
+        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Un espace est obligatoire entre "SYSTEM" et l'identificateur système.
+        MSG_URI_FRAGMENT_IN_SYSTEMID = L''identificateur du fragment ne doit pas être spécifié comme faisant partie de l''identificateur système "{0}".
 # 4.7 Notation Declarations
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Un espace est obligatoire apr\u00E8s "<!NOTATION" dans la d\u00E9claration de notation.
-        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Le nom de la notation est obligatoire dans la d\u00E9claration de notation.
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Un espace est obligatoire apr\u00E8s le nom de notation "{0}" dans la d\u00E9claration de notation.
-        ExternalIDorPublicIDRequired = La d\u00E9claration de la notation "{0}" doit inclure un identificateur syst\u00E8me ou public.
-        NotationDeclUnterminated = La d\u00E9claration de la notation "{0}" doit se terminer par ''>''.
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Un espace est obligatoire après "<!NOTATION" dans la déclaration de notation.
+        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Le nom de la notation est obligatoire dans la déclaration de notation.
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Un espace est obligatoire après le nom de notation "{0}" dans la déclaration de notation.
+        ExternalIDorPublicIDRequired = La déclaration de la notation "{0}" doit inclure un identificateur système ou public.
+        NotationDeclUnterminated = La déclaration de la notation "{0}" doit se terminer par ''>''.
 
 # Validation messages
-        DuplicateTypeInMixedContent = Le type d''\u00E9l\u00E9ment "{1}" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 dans le mod\u00E8le de contenu de la d\u00E9claration d''\u00E9l\u00E9ment "{0}".
-        ENTITIESInvalid = La valeur d''attribut "{1}" de type ENTITIES doit correspondre au nom d''au moins une entit\u00E9 non analys\u00E9e.
-        ENTITYInvalid = La valeur d''attribut "{1}" de type ENTITY doit correspondre au nom d''une entit\u00E9 non analys\u00E9e.
-        IDDefaultTypeInvalid = L''attribut d''ID "{0}" doit avoir une valeur par d\u00E9faut d\u00E9clar\u00E9e de "#IMPLIED" ou "#REQUIRED".
-        IDInvalid = La valeur d''attribut "{0}" de type ID doit \u00EAtre un nom.
-        IDInvalidWithNamespaces = La valeur d''attribut "{0}" de type ID doit \u00EAtre un NCName lorsque les espaces de noms sont activ\u00E9s.
-        IDNotUnique = La valeur d''attribut "{0}" de type ID doit \u00EAtre unique dans le document.
-        IDREFInvalid = La valeur d''attribut "{0}" de type IDREF doit \u00EAtre un nom.
-        IDREFInvalidWithNamespaces = La valeur d''attribut "{0}" de type IDREF doit \u00EAtre un NCName lorsque les espaces de noms sont activ\u00E9s.
-        IDREFSInvalid = Une valeur d''attribut "{0}" de type IDREFS doit correspondre \u00E0 au moins un nom.
-        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre "{0}" doit inclure des d\u00E9clarations correctement imbriqu\u00E9es lorsque la r\u00E9f\u00E9rence d''entit\u00E9 est utilis\u00E9e comme d\u00E9claration compl\u00E8te.
-        ImproperDeclarationNesting = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre "{0}" doit inclure des d\u00E9clarations correctement imbriqu\u00E9es.
-        ImproperGroupNesting = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre "{0}" doit inclure des paires de parenth\u00E8ses correctement imbriqu\u00E9es.
-        INVALID_PE_IN_CONDITIONAL = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre "{0}" doit inclure la section conditionnelle compl\u00E8te ou seulement INCLUDE ou IGNORE.
-        MSG_ATTRIBUTE_NOT_DECLARED = L''attribut "{1}" doit \u00EAtre d\u00E9clar\u00E9 pour le type d''\u00E9l\u00E9ment "{0}".
+        DuplicateTypeInMixedContent = Le type d''élément "{1}" a déjà été spécifié dans le modèle de contenu de la déclaration d''élément "{0}".
+        ENTITIESInvalid = La valeur d''attribut "{1}" de type ENTITIES doit correspondre au nom d''au moins une entité non analysée.
+        ENTITYInvalid = La valeur d''attribut "{1}" de type ENTITY doit correspondre au nom d''une entité non analysée.
+        IDDefaultTypeInvalid = L''attribut d''ID "{0}" doit avoir une valeur par défaut déclarée de "#IMPLIED" ou "#REQUIRED".
+        IDInvalid = La valeur d''attribut "{0}" de type ID doit être un nom.
+        IDInvalidWithNamespaces = La valeur d''attribut "{0}" de type ID doit être un NCName lorsque les espaces de noms sont activés.
+        IDNotUnique = La valeur d''attribut "{0}" de type ID doit être unique dans le document.
+        IDREFInvalid = La valeur d''attribut "{0}" de type IDREF doit être un nom.
+        IDREFInvalidWithNamespaces = La valeur d''attribut "{0}" de type IDREF doit être un NCName lorsque les espaces de noms sont activés.
+        IDREFSInvalid = Une valeur d''attribut "{0}" de type IDREFS doit correspondre à au moins un nom.
+        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Le texte de remplacement de l''entité de paramètre "{0}" doit inclure des déclarations correctement imbriquées lorsque la référence d''entité est utilisée comme déclaration complète.
+        ImproperDeclarationNesting = Le texte de remplacement de l''entité de paramètre "{0}" doit inclure des déclarations correctement imbriquées.
+        ImproperGroupNesting = Le texte de remplacement de l''entité de paramètre "{0}" doit inclure des paires de parenthèses correctement imbriquées.
+        INVALID_PE_IN_CONDITIONAL = Le texte de remplacement de l''entité de paramètre "{0}" doit inclure la section conditionnelle complète ou seulement INCLUDE ou IGNORE.
+        MSG_ATTRIBUTE_NOT_DECLARED = L''attribut "{1}" doit être déclaré pour le type d''élément "{0}".
         MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = L''attribut "{0}" de valeur "{1}" doit avoir une valeur issue de la liste "{2}".
-        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = La valeur "{1}" de l''attribut "{0}" ne doit pas \u00EAtre modifi\u00E9e par normalisation (et devenir "{2}") dans un document autonome.
-        MSG_CONTENT_INCOMPLETE = Le contenu du type d''\u00E9l\u00E9ment "{0}" est incomplet. Il doit correspondre \u00E0 "{1}".
-        MSG_CONTENT_INVALID = Le contenu du type d''\u00E9l\u00E9ment "{0}" doit correspondre \u00E0 "{1}".
-        MSG_CONTENT_INVALID_SPECIFIED = Le contenu du type d''\u00E9l\u00E9ment "{0}" doit correspondre \u00E0 "{1}". Les enfants de type "{2}" ne sont pas autoris\u00E9s.
-        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = L''attribut "{1}" du type d''\u00E9l\u00E9ment "{0}" a une valeur par d\u00E9faut et doit \u00EAtre sp\u00E9cifi\u00E9 dans un document autonome.
-        MSG_DUPLICATE_ATTDEF = L''attribut "{1}" est d\u00E9j\u00E0 d\u00E9clar\u00E9 pour le type d''\u00E9l\u00E9ment "{0}".
-        MSG_ELEMENT_ALREADY_DECLARED = Le type d''\u00E9l\u00E9ment "{0}" ne doit pas \u00EAtre d\u00E9clar\u00E9 plusieurs fois.
-        MSG_ELEMENT_NOT_DECLARED = Le type d''\u00E9l\u00E9ment "{0}" doit \u00EAtre d\u00E9clar\u00E9.
-        MSG_GRAMMAR_NOT_FOUND = Le document n'est pas valide : aucune grammaire d\u00E9tect\u00E9e.
-        MSG_ELEMENT_WITH_ID_REQUIRED = Un \u00E9l\u00E9ment avec l''identificateur "{0}" doit figurer dans le document.
-        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 externe "{0}" n''est pas autoris\u00E9e dans le document autonome.
+        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = La valeur "{1}" de l''attribut "{0}" ne doit pas être modifiée par normalisation (et devenir "{2}") dans un document autonome.
+        MSG_CONTENT_INCOMPLETE = Le contenu du type d''élément "{0}" est incomplet. Il doit correspondre à "{1}".
+        MSG_CONTENT_INVALID = Le contenu du type d''élément "{0}" doit correspondre à "{1}".
+        MSG_CONTENT_INVALID_SPECIFIED = Le contenu du type d''élément "{0}" doit correspondre à "{1}". Les enfants de type "{2}" ne sont pas autorisés.
+        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = L''attribut "{1}" du type d''élément "{0}" a une valeur par défaut et doit être spécifié dans un document autonome.
+        MSG_DUPLICATE_ATTDEF = L''attribut "{1}" est déjà déclaré pour le type d''élément "{0}".
+        MSG_ELEMENT_ALREADY_DECLARED = Le type d''élément "{0}" ne doit pas être déclaré plusieurs fois.
+        MSG_ELEMENT_NOT_DECLARED = Le type d''élément "{0}" doit être déclaré.
+        MSG_GRAMMAR_NOT_FOUND = Le document n'est pas valide : aucune grammaire détectée.
+        MSG_ELEMENT_WITH_ID_REQUIRED = Un élément avec l''identificateur "{0}" doit figurer dans le document.
+        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = La référence à l''entité externe "{0}" n''est pas autorisée dans le document autonome.
         MSG_FIXED_ATTVALUE_INVALID = L''attribut "{1}" de valeur "{2}" doit avoir une valeur de "{3}".
-        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Le type d''\u00E9l\u00E9ment "{0}" a d\u00E9j\u00E0 l''attribut "{1}" de type ID. Un deuxi\u00E8me attribut "{2}" de type ID n''est pas autoris\u00E9.
-        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Le type d''\u00E9l\u00E9ment "{0}" a d\u00E9j\u00E0 l''attribut "{1}" de type NOTATION. Un deuxi\u00E8me attribut "{2}" de type NOTATION n''est pas autoris\u00E9.
-        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notation "{1}" doit \u00EAtre d\u00E9clar\u00E9e lorsqu''elle est r\u00E9f\u00E9renc\u00E9e dans la liste des types de notation de l''attribut "{0}".
-        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notation "{1}" doit \u00EAtre d\u00E9clar\u00E9e lorsqu''elle est r\u00E9f\u00E9renc\u00E9e dans la d\u00E9claration d''entit\u00E9 non analys\u00E9e pour "{0}".
-        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 "{0}" d\u00E9clar\u00E9e dans une entit\u00E9 analys\u00E9e externe n''est pas autoris\u00E9e dans un document autonome.
-        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = L''attribut "{1}" est obligatoire et doit \u00EAtre sp\u00E9cifi\u00E9 pour le type d''\u00E9l\u00E9ment "{0}".
-        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Aucun espace ne doit figurer entre les \u00E9l\u00E9ments d\u00E9clar\u00E9s dans une entit\u00E9 analys\u00E9e externe avec le contenu des \u00E9l\u00E9ments dans un document autonome.
-        NMTOKENInvalid = La valeur d''attribut "{0}" de type NMTOKEN doit correspondre \u00E0 un jeton de nom.
-        NMTOKENSInvalid = La valeur d''attribut "{0}" de type NMTOKENS doit correspondre \u00E0 au moins un jeton de nom.
-        NoNotationOnEmptyElement = Le type d''\u00E9l\u00E9ment "{0}" d\u00E9clar\u00E9 EMPTY ne peut pas d\u00E9clarer un attribut "{1}" de type NOTATION.
-        RootElementTypeMustMatchDoctypedecl = L''\u00E9l\u00E9ment racine de document "{1}" doit correspondre \u00E0 la racine DOCTYPE "{0}".
-        UndeclaredElementInContentSpec = Le mod\u00E8le de contenu de l''\u00E9l\u00E9ment "{0}" fait r\u00E9f\u00E9rence \u00E0 l''\u00E9l\u00E9ment non d\u00E9clar\u00E9 "{1}".
-        UniqueNotationName = La d\u00E9claration de la notation "{0}" n''est pas unique. Une valeur Name donn\u00E9e ne doit pas \u00EAtre d\u00E9clar\u00E9e dans plusieurs d\u00E9clarations de notation.
-        ENTITYFailedInitializeGrammar =  Valideur ENTITYDatatype : \u00E9chec. Besoin d'appeler une m\u00E9thode d'initialisation avec une r\u00E9f\u00E9rence de grammaire valide. \t
-        ENTITYNotUnparsed = La valeur ENTITY "{0}" est analys\u00E9e.
+        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Le type d''élément "{0}" a déjà l''attribut "{1}" de type ID. Un deuxième attribut "{2}" de type ID n''est pas autorisé.
+        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Le type d''élément "{0}" a déjà l''attribut "{1}" de type NOTATION. Un deuxième attribut "{2}" de type NOTATION n''est pas autorisé.
+        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notation "{1}" doit être déclarée lorsqu''elle est référencée dans la liste des types de notation de l''attribut "{0}".
+        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notation "{1}" doit être déclarée lorsqu''elle est référencée dans la déclaration d''entité non analysée pour "{0}".
+        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = La référence à l''entité "{0}" déclarée dans une entité analysée externe n''est pas autorisée dans un document autonome.
+        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = L''attribut "{1}" est obligatoire et doit être spécifié pour le type d''élément "{0}".
+        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Aucun espace ne doit figurer entre les éléments déclarés dans une entité analysée externe avec le contenu des éléments dans un document autonome.
+        NMTOKENInvalid = La valeur d''attribut "{0}" de type NMTOKEN doit correspondre à un jeton de nom.
+        NMTOKENSInvalid = La valeur d''attribut "{0}" de type NMTOKENS doit correspondre à au moins un jeton de nom.
+        NoNotationOnEmptyElement = Le type d''élément "{0}" déclaré EMPTY ne peut pas déclarer un attribut "{1}" de type NOTATION.
+        RootElementTypeMustMatchDoctypedecl = L''élément racine de document "{1}" doit correspondre à la racine DOCTYPE "{0}".
+        UndeclaredElementInContentSpec = Le modèle de contenu de l''élément "{0}" fait référence à l''élément non déclaré "{1}".
+        UniqueNotationName = La déclaration de la notation "{0}" n''est pas unique. Une valeur Name donnée ne doit pas être déclarée dans plusieurs déclarations de notation.
+        ENTITYFailedInitializeGrammar =  Valideur ENTITYDatatype : échec. Besoin d'appeler une méthode d'initialisation avec une référence de grammaire valide. \t
+        ENTITYNotUnparsed = La valeur ENTITY "{0}" est analysée.
         ENTITYNotValid = La valeur ENTITY "{0}" n''est pas valide.
-        EmptyList = Une valeur de type ENTITIES, IDREFS et NMTOKENS ne peut pas correspondre \u00E0 une liste vide.
+        EmptyList = Une valeur de type ENTITIES, IDREFS et NMTOKENS ne peut pas correspondre à une liste vide.
 
 # Entity related messages
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ReferenceToExternalEntity = La r\u00E9f\u00E9rence d''entit\u00E9 externe "&{0};" n''est pas autoris\u00E9e dans une valeur d''attribut.
-        AccessExternalDTD = DTD externe : \u00E9chec de la lecture de la DTD externe ''{0}'', car l''acc\u00E8s ''{1}'' n''est pas autoris\u00E9 en raison d''une restriction d\u00E9finie par la propri\u00E9t\u00E9 accessExternalDTD.
-        AccessExternalEntity = Entit\u00E9 externe : \u00E9chec de la lecture du document externe ''{0}'', car l''acc\u00E8s ''{1}'' n''est pas autoris\u00E9 en raison d''une restriction d\u00E9finie par la propri\u00E9t\u00E9 accessExternalDTD.
+        ReferenceToExternalEntity = La référence d''entité externe "&{0};" n''est pas autorisée dans une valeur d''attribut.
+        AccessExternalDTD = DTD externe : échec de la lecture de la DTD externe ''{0}'', car l''accès ''{1}'' n''est pas autorisé en raison d''une restriction définie par la propriété accessExternalDTD.
+        AccessExternalEntity = Entité externe : échec de la lecture du document externe ''{0}'', car l''accès ''{1}'' n''est pas autorisé en raison d''une restriction définie par la propriété accessExternalDTD.
 
 # 4.1 Character and Entity References
-        EntityNotDeclared = L''entit\u00E9 "{0}" \u00E9tait r\u00E9f\u00E9renc\u00E9e, mais pas d\u00E9clar\u00E9e.
-        ReferenceToUnparsedEntity = La r\u00E9f\u00E9rence d''entit\u00E9 non analys\u00E9e "&{0};" n''est pas autoris\u00E9e.
-        RecursiveReference = R\u00E9f\u00E9rence d''entit\u00E9 r\u00E9cursive "{0}". (Chemin de r\u00E9f\u00E9rence : {1}),
-        RecursiveGeneralReference = R\u00E9f\u00E9rence d''entit\u00E9 g\u00E9n\u00E9rale r\u00E9cursive "&{0};". (Chemin de r\u00E9f\u00E9rence : {1}),
-        RecursivePEReference = R\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre r\u00E9cursive "%{0};". (Chemin de r\u00E9f\u00E9rence : {1}),
+        EntityNotDeclared = L''entité "{0}" était référencée, mais pas déclarée.
+        ReferenceToUnparsedEntity = La référence d''entité non analysée "&{0};" n''est pas autorisée.
+        RecursiveReference = Référence d''entité récursive "{0}". (Chemin de référence : {1}),
+        RecursiveGeneralReference = Référence d''entité générale récursive "&{0};". (Chemin de référence : {1}),
+        RecursivePEReference = Référence d''entité de paramètre récursive "%{0};". (Chemin de référence : {1}),
 # 4.3.3 Character Encoding in Entities
         EncodingNotSupported = L''encodage "{0}" n''est pas pris en charge.
-        EncodingRequired = Une entit\u00E9 analys\u00E9e sans encodage UTF-8 ou UTF-16 doit contenir une d\u00E9claration d'encodage.
+        EncodingRequired = Une entité analysée sans encodage UTF-8 ou UTF-16 doit contenir une déclaration d'encodage.
 
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = L'\u00E9l\u00E9ment ou l'attribut ne correspond pas \u00E0 la production QName : QName::=(NCName':')?NCName.
-        ElementXMLNSPrefix = L''\u00E9l\u00E9ment "{0}" ne peut pas avoir "xmlns" comme pr\u00E9fixe.
-        ElementPrefixUnbound = Le pr\u00E9fixe "{0}" de l''\u00E9l\u00E9ment "{1}" n''est pas li\u00E9.
-        AttributePrefixUnbound = Le pr\u00E9fixe "{2}" de l''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}" n''est pas li\u00E9.
-        EmptyPrefixedAttName = La valeur de l''attribut "{0}" n''est pas valide. Les liaisons d''espaces de noms pr\u00E9fix\u00E9s ne peuvent pas \u00EAtre vides.
-        PrefixDeclared = Le pr\u00E9fixe d''espace de noms "{0}" n''\u00E9tait pas d\u00E9clar\u00E9.
-        CantBindXMLNS = Le pr\u00E9fixe "xmlns" ne peut pas \u00EAtre li\u00E9 \u00E0 un espace de noms de fa\u00E7on explicite, pas plus que l'espace de noms de "xmlns" \u00E0 un pr\u00E9fixe quelconque.
-        CantBindXML = Le pr\u00E9fixe "xml" ne peut pas \u00EAtre li\u00E9 \u00E0 un autre espace de noms que son espace de noms habituel. L'espace de noms de "xml" ne peut pas non plus \u00EAtre li\u00E9 \u00E0 un autre pr\u00E9fixe que "xml".
-        MSG_ATT_DEFAULT_INVALID = La valeur par d\u00E9faut "{1}" de l''attribut "{0}" n''est pas admise conform\u00E9ment aux contraintes lexicales de ce type d''attribut.
+        IllegalQName = L'élément ou l'attribut ne correspond pas à la production QName : QName::=(NCName':')?NCName.
+        ElementXMLNSPrefix = L''élément "{0}" ne peut pas avoir "xmlns" comme préfixe.
+        ElementPrefixUnbound = Le préfixe "{0}" de l''élément "{1}" n''est pas lié.
+        AttributePrefixUnbound = Le préfixe "{2}" de l''attribut "{1}" associé à un type d''élément "{0}" n''est pas lié.
+        EmptyPrefixedAttName = La valeur de l''attribut "{0}" n''est pas valide. Les liaisons d''espaces de noms préfixés ne peuvent pas être vides.
+        PrefixDeclared = Le préfixe d''espace de noms "{0}" n''était pas déclaré.
+        CantBindXMLNS = Le préfixe "xmlns" ne peut pas être lié à un espace de noms de façon explicite, pas plus que l'espace de noms de "xmlns" à un préfixe quelconque.
+        CantBindXML = Le préfixe "xml" ne peut pas être lié à un autre espace de noms que son espace de noms habituel. L'espace de noms de "xml" ne peut pas non plus être lié à un autre préfixe que "xml".
+        MSG_ATT_DEFAULT_INVALID = La valeur par défaut "{1}" de l''attribut "{0}" n''est pas admise conformément aux contraintes lexicales de ce type d''attribut.
 
 # REVISIT: These need messages
         MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
@@ -295,14 +295,14 @@
 
 
 # Implementation limits
-        EntityExpansionLimit=JAXP00010001 : L''analyseur a rencontr\u00E9 plus de "{0}" d\u00E9veloppements d''entit\u00E9 dans ce document. Il s''agit de la limite impos\u00E9e par le JDK.
-        ElementAttributeLimit=JAXP00010002 : L''\u00E9l\u00E9ment "{0}" a plus de "{1}" attributs. "{1}" est la limite impos\u00E9e par le JDK.
-        MaxEntitySizeLimit=JAXP00010003 : La longueur de l''entit\u00E9 "{0}" est de "{1}". Cette valeur d\u00E9passe la limite de "{2}" d\u00E9finie par "{3}".
-        TotalEntitySizeLimit=JAXP00010004 : La taille cumul\u00E9e des entit\u00E9s est "{0}" et d\u00E9passe la limite de "{1}" d\u00E9finie par "{2}".
-        MaxXMLNameLimit=JAXP00010005 : La longueur de l''entit\u00E9 "{0}" est de "{1}". Cette valeur d\u00E9passe la limite de "{2}" d\u00E9finie par "{3}".
-        MaxElementDepthLimit=JAXP00010006 : l''\u00E9l\u00E9ment "{0}" a une profondeur de "{1}" qui d\u00E9passe la limite de "{2}" d\u00E9finie par "{3}".
-        EntityReplacementLimit=JAXP00010007 : Le nombre total de noeuds dans les r\u00E9f\u00E9rences d''entit\u00E9 est "{0}", soit plus que la limite de "{1}" d\u00E9finie par "{2}".
+        EntityExpansionLimit=JAXP00010001 : L''analyseur a rencontré plus de "{0}" développements d''entité dans ce document. Il s''agit de la limite imposée par le JDK.
+        ElementAttributeLimit=JAXP00010002 : L''élément "{0}" a plus de "{1}" attributs. "{1}" est la limite imposée par le JDK.
+        MaxEntitySizeLimit=JAXP00010003 : La longueur de l''entité "{0}" est de "{1}". Cette valeur dépasse la limite de "{2}" définie par "{3}".
+        TotalEntitySizeLimit=JAXP00010004 : La taille cumulée des entités est "{0}" et dépasse la limite de "{1}" définie par "{2}".
+        MaxXMLNameLimit=JAXP00010005 : La longueur de l''entité "{0}" est de "{1}". Cette valeur dépasse la limite de "{2}" définie par "{3}".
+        MaxElementDepthLimit=JAXP00010006 : l''élément "{0}" a une profondeur de "{1}" qui dépasse la limite de "{2}" définie par "{3}".
+        EntityReplacementLimit=JAXP00010007 : Le nombre total de noeuds dans les références d''entité est "{0}", soit plus que la limite de "{1}" définie par "{2}".
 
 # Catalog 09
 # Technical term, do not translate: catalog
-        CatalogException=JAXP00090001 : le CatalogResolver est activ\u00E9 avec le catalogue "{0}", mais une exception CatalogException est renvoy\u00E9e.
+        CatalogException=JAXP00090001 : le CatalogResolver est activé avec le catalogue "{0}", mais une exception CatalogException est renvoyée.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
index 32b3f4b01a8..0ec786a1bbb 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
@@ -4,288 +4,288 @@
 # @version
 
         BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
-        FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n  
+        FormatFailed = Si è verificato un errore interno durante la formattazione del seguente messaggio:\n  
 
 # Document messages
         PrematureEOF=Fine del file anticipata.
 # 2.1 Well-Formed XML Documents
-        RootElementRequired = L'elemento radice \u00E8 obbligatorio in un documento con formato corretto.
+        RootElementRequired = L'elemento radice è obbligatorio in un documento con formato corretto.
 # 2.2 Characters
 
-        InvalidCharInCDSect = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nella sezione CDATA.
-        InvalidCharInContent = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel contenuto dell''elemento del documento.
-        TwoColonsInQName = \u00C8 stato trovato un secondo carattere dei due punti (':') non valido nel tipo di elemento o nel nome attributo.
+        InvalidCharInCDSect = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nella sezione CDATA.
+        InvalidCharInContent = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nel contenuto dell''elemento del documento.
+        TwoColonsInQName = È stato trovato un secondo carattere dei due punti (':') non valido nel tipo di elemento o nel nome attributo.
         ColonNotLegalWithNS = Non sono consentiti i due punti nel nome "{0}" se sono abilitati gli spazi di nomi.
-        InvalidCharInMisc = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel markup dopo la fine del contenuto dell''elemento.
-        InvalidCharInProlog = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel prologo del documento.
-        InvalidCharInXMLDecl = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nella dichiarazione XML.
+        InvalidCharInMisc = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nel markup dopo la fine del contenuto dell''elemento.
+        InvalidCharInProlog = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nel prologo del documento.
+        InvalidCharInXMLDecl = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nella dichiarazione XML.
 # 2.4 Character Data and Markup
         CDEndInContent = La sequenza di caratteri "]]>" non deve essere presente nel contenuto a meno che non sia utilizzata per contrassegnare la fine di una sezione CDATA.
 # 2.7 CDATA Sections
         CDSectUnterminated = La sezione CDATA deve terminare con "]]>".
 # 2.8 Prolog and Document Type Declaration
-        XMLDeclMustBeFirst = La dichiarazione XML pu\u00F2 comparire solo all'inizio del documento.
+        XMLDeclMustBeFirst = La dichiarazione XML può comparire solo all'inizio del documento.
         EqRequiredInXMLDecl = Il carattere '' = '' deve seguire "{0}" nella dichiarazione XML.
         QuoteRequiredInXMLDecl = Il valore che segue "{0}" nella dichiarazione XML deve essere una stringa compresa tra apici.
         XMLDeclUnterminated = La dichiarazione XML deve terminare con "?>".
-        VersionInfoRequired = La versione \u00E8 obbligatoria nella dichiarazione XML.
-        SpaceRequiredBeforeVersionInXMLDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo della versione nella dichiarazione XML.
-        SpaceRequiredBeforeEncodingInXMLDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo di codifica nella dichiarazione XML.
-        SpaceRequiredBeforeStandalone = \u00C8 richiesto uno spazio prima dell'attributo pseudo di codifica nella dichiarazione XML.
+        VersionInfoRequired = La versione è obbligatoria nella dichiarazione XML.
+        SpaceRequiredBeforeVersionInXMLDecl = È richiesto uno spazio prima dell'attributo pseudo della versione nella dichiarazione XML.
+        SpaceRequiredBeforeEncodingInXMLDecl = È richiesto uno spazio prima dell'attributo pseudo di codifica nella dichiarazione XML.
+        SpaceRequiredBeforeStandalone = È richiesto uno spazio prima dell'attributo pseudo di codifica nella dichiarazione XML.
         MarkupNotRecognizedInProlog = Il markup nel documento che precede l'elemento radice deve avere un formato corretto.
         MarkupNotRecognizedInMisc = Il markup nel documento che segue l'elemento radice deve avere un formato corretto.
-        AlreadySeenDoctype = Doctype gi\u00E0 presente.
-        DoctypeNotAllowed = DOCTYPE non \u00E8 consentito se la funzione "http://apache.org/xml/features/disallow-doctype-decl" \u00E8 impostata su true.
-        ContentIllegalInProlog = Il contenuto non \u00E8 consentito nel prologo.
-        ReferenceIllegalInProlog = Il riferimento non \u00E8 consentito nel prologo.
+        AlreadySeenDoctype = Doctype già presente.
+        DoctypeNotAllowed = DOCTYPE non è consentito se la funzione "http://apache.org/xml/features/disallow-doctype-decl" è impostata su true.
+        ContentIllegalInProlog = Il contenuto non è consentito nel prologo.
+        ReferenceIllegalInProlog = Il riferimento non è consentito nel prologo.
 # Trailing Misc
-        ContentIllegalInTrailingMisc=Il contenuto non \u00E8 consentito nella sezione finale.
-        ReferenceIllegalInTrailingMisc=Il riferimento non \u00E8 consentito nella sezione finale.
+        ContentIllegalInTrailingMisc=Il contenuto non è consentito nella sezione finale.
+        ReferenceIllegalInTrailingMisc=Il riferimento non è consentito nella sezione finale.
 
 # 2.9 Standalone Document Declaration
         SDDeclInvalid = Il valore della dichiarazione del documento standalone deve essere "yes" o "no", non "{0}".
         SDDeclNameInvalid = Il nome standalone nella dichiarazione XML potrebbe essere stato digitato in modo errato.
 # 2.12 Language Identification
-        XMLLangInvalid = Il valore dell''attributo xml:lang "{0}" \u00E8 un identificativo di lingua non valido.
+        XMLLangInvalid = Il valore dell''attributo xml:lang "{0}" è un identificativo di lingua non valido.
 # 3. Logical Structures
         ETagRequired = Il tipo di elemento "{0}" deve terminare con la corrispondente tag finale "</{0}>".
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
         ElementUnterminated = Il tipo di elemento "{0}" deve essere seguito dalle specifiche di attributo ">" o "/>".
         EqRequiredInAttribute = Il nome attributo "{1}" associato a un tipo di elemento "{0}" deve essere seguito dal carattere '' = ''.
-        OpenQuoteExpected = \u00C8 previsto un apice di apertura per l''attributo "{1}" associato a un tipo di elemento "{0}".
-        CloseQuoteExpected = \u00C8 previsto un apice di chiusura per l''attributo "{1}" associato a un tipo di elemento "{0}".
-        AttributeNotUnique = L''attributo "{1}" \u00E8 gi\u00E0 stato specificato per l''elemento "{0}".
-        AttributeNSNotUnique = L''attributo "{1}" associato allo spazio di nomi "{2}" \u00E8 gi\u00E0 stato specificato per l''elemento "{0}".
+        OpenQuoteExpected = È previsto un apice di apertura per l''attributo "{1}" associato a un tipo di elemento "{0}".
+        CloseQuoteExpected = È previsto un apice di chiusura per l''attributo "{1}" associato a un tipo di elemento "{0}".
+        AttributeNotUnique = L''attributo "{1}" è già stato specificato per l''elemento "{0}".
+        AttributeNSNotUnique = L''attributo "{1}" associato allo spazio di nomi "{2}" è già stato specificato per l''elemento "{0}".
         ETagUnterminated = La tag finale per il tipo di elemento "{0}" deve terminare con un delimitatore ''>''.
         MarkupNotRecognizedInContent = Il contenuto degli elementi deve essere composto da dati o markup di caratteri con formato corretto.
-        DoctypeIllegalInContent = DOCTYPE non \u00E8 consentito nel contenuto.
+        DoctypeIllegalInContent = DOCTYPE non è consentito nel contenuto.
 # 4.1 Character and Entity References
         ReferenceUnterminated = Il riferimento deve terminare con un delimitatore ';'.
 # 4.3.2 Well-Formed Parsed Entities
-        ReferenceNotInOneEntity = Il riferimento deve essere compreso completamente all'interno della stessa entit\u00E0 analizzata.
-        ElementEntityMismatch = L''elemento "{0}" deve iniziare e finire con la stessa entit\u00E0.
-        MarkupEntityMismatch=Le strutture di documenti XML devono iniziare e finire con la stessa entit\u00E0.
+        ReferenceNotInOneEntity = Il riferimento deve essere compreso completamente all'interno della stessa entità analizzata.
+        ElementEntityMismatch = L''elemento "{0}" deve iniziare e finire con la stessa entità.
+        MarkupEntityMismatch=Le strutture di documenti XML devono iniziare e finire con la stessa entità.
 
 # Messages common to Document and DTD
 # 2.2 Characters
-        InvalidCharInAttValue = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{2}) nel valore dell''attributo "{1}". L''elemento \u00E8 "{0}".
-        InvalidCharInComment = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel commento.
-        InvalidCharInPI = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nell''istruzione di elaborazione.
-        InvalidCharInInternalSubset = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel set secondario interno del DTD.
-        InvalidCharInTextDecl = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nella dichiarazione testuale.
+        InvalidCharInAttValue = È stato trovato un carattere XML non valido (Unicode: 0x{2}) nel valore dell''attributo "{1}". L''elemento è "{0}".
+        InvalidCharInComment = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nel commento.
+        InvalidCharInPI = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nell''istruzione di elaborazione.
+        InvalidCharInInternalSubset = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nel set secondario interno del DTD.
+        InvalidCharInTextDecl = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nella dichiarazione testuale.
 # 2.3 Common Syntactic Constructs
         QuoteRequiredInAttValue = Il valore dell''attributo "{1}" deve iniziare con un apice o una virgoletta.
         LessthanInAttValue = Il valore dell''attributo "{1}" associato a un tipo di elemento "{0}" non deve essere contenere il carattere ''<''.
         AttributeValueUnterminated = Il valore dell''attributo "{1}" deve terminare con un apice corrispondente.
 # 2.5 Comments
         InvalidCommentStart = Il commento deve iniziare con "<!--".
-        DashDashInComment = La stringa "--" non \u00E8 consentita nei commenti.
+        DashDashInComment = La stringa "--" non è consentita nei commenti.
         CommentUnterminated = Il commento deve terminare con "-->".
-        COMMENT_NOT_IN_ONE_ENTITY = Il commento non \u00E8 compreso all'interno della stessa entit\u00E0.
+        COMMENT_NOT_IN_ONE_ENTITY = Il commento non è compreso all'interno della stessa entità.
 # 2.6 Processing Instructions
         PITargetRequired = L'istruzione di elaborazione deve iniziare con il nome della destinazione.
-        SpaceRequiredInPI = \u00C8 richiesto uno spazio tra la destinazione delle istruzioni di elaborazione e i dati.
+        SpaceRequiredInPI = È richiesto uno spazio tra la destinazione delle istruzioni di elaborazione e i dati.
         PIUnterminated = L'istruzione di elaborazione deve terminare con "?>".
-        ReservedPITarget = Non \u00E8 consentita una destinazione di istruzione di elaborazione corrispondente a "[xX][mM][lL]".
-        PI_NOT_IN_ONE_ENTITY = L'istruzione di elaborazione non \u00E8 compresa all'interno della stessa entit\u00E0.
+        ReservedPITarget = Non è consentita una destinazione di istruzione di elaborazione corrispondente a "[xX][mM][lL]".
+        PI_NOT_IN_ONE_ENTITY = L'istruzione di elaborazione non è compresa all'interno della stessa entità.
 # 2.8 Prolog and Document Type Declaration
         VersionInfoInvalid = Versione "{0}" non valida.
-        VersionNotSupported = La versione XML "{0}" non \u00E8 supportata. Solo la versione XML 1.0 \u00E8 supportata.
-        VersionNotSupported11 = La versione XML "{0}" non \u00E8 supportata. Solo le versioni XML 1.0 e XML 1.1 sono supportate.
-        VersionMismatch= Un'entit\u00E0 non pu\u00F2 includerne un'altra con una versione successiva.
+        VersionNotSupported = La versione XML "{0}" non è supportata. Solo la versione XML 1.0 è supportata.
+        VersionNotSupported11 = La versione XML "{0}" non è supportata. Solo le versioni XML 1.0 e XML 1.1 sono supportate.
+        VersionMismatch= Un'entità non può includerne un'altra con una versione successiva.
 # 4.1 Character and Entity References
         DigitRequiredInCharRef = Una rappresentazione decimale deve seguire immediatamente "&#" in un riferimento di carattere.
         HexdigitRequiredInCharRef = Una rappresentazione esadecimale deve seguire immediatamente "&#" in un riferimento di carattere.
         SemicolonRequiredInCharRef = Il riferimento di carattere deve terminare con il delimitatore ';'.
-        InvalidCharRef = Il riferimento di carattere "&#{0}" \u00E8 un carattere XML non valido.
-        NameRequiredInReference = Il nome entit\u00E0 deve seguire immediatamente '&' nel riferimento di entit\u00E0.
-        SemicolonRequiredInReference = Il riferimento di entit\u00E0 "{0}" deve terminare con il delimitatore '';''.
+        InvalidCharRef = Il riferimento di carattere "&#{0}" è un carattere XML non valido.
+        NameRequiredInReference = Il nome entità deve seguire immediatamente '&' nel riferimento di entità.
+        SemicolonRequiredInReference = Il riferimento di entità "{0}" deve terminare con il delimitatore '';''.
 # 4.3.1 The Text Declaration
-        TextDeclMustBeFirst = La dichiarazione di testo pu\u00F2 comparire solo all'inizio dell'entit\u00E0 esterna analizzata.
+        TextDeclMustBeFirst = La dichiarazione di testo può comparire solo all'inizio dell'entità esterna analizzata.
         EqRequiredInTextDecl = Il carattere '' = '' deve seguire "{0}" nella dichiarazione di testo.
         QuoteRequiredInTextDecl = Il valore che segue "{0}" nella dichiarazione di testo deve essere una stringa compresa tra apici.
         CloseQuoteMissingInTextDecl = manca l''apice di chiusura nel valore che segue "{0}" nella dichiarazione di testo.
-        SpaceRequiredBeforeVersionInTextDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo della versione nella dichiarazione del testo.
-        SpaceRequiredBeforeEncodingInTextDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo di codifica nella dichiarazione del testo.
+        SpaceRequiredBeforeVersionInTextDecl = È richiesto uno spazio prima dell'attributo pseudo della versione nella dichiarazione del testo.
+        SpaceRequiredBeforeEncodingInTextDecl = È richiesto uno spazio prima dell'attributo pseudo di codifica nella dichiarazione del testo.
         TextDeclUnterminated = La dichiarazione di testo deve terminare con "?>".
-        EncodingDeclRequired = La dichiarazione di codifica \u00E8 obbligatoria nella dichiarazione di testo.
+        EncodingDeclRequired = La dichiarazione di codifica è obbligatoria nella dichiarazione di testo.
         NoMorePseudoAttributes = Non sono consentiti altri attributi pseudo.
         MorePseudoAttributes = Sono previsti altri attributi pseudo.
-        PseudoAttrNameExpected = \u00C8 previsto un nome attributo pseudo. 
+        PseudoAttrNameExpected = È previsto un nome attributo pseudo. 
 # 4.3.2 Well-Formed Parsed Entities
-        CommentNotInOneEntity = Il commento deve essere compreso completamente all'interno della stessa entit\u00E0 analizzata.
-        PINotInOneEntity = L'istruzione di elaborazione deve essere compresa completamente all'interno della stessa entit\u00E0 analizzata.
+        CommentNotInOneEntity = Il commento deve essere compreso completamente all'interno della stessa entità analizzata.
+        PINotInOneEntity = L'istruzione di elaborazione deve essere compresa completamente all'interno della stessa entità analizzata.
 # 4.3.3 Character Encoding in Entities
         EncodingDeclInvalid = Nome codifica "{0}" non valido.
-        EncodingByteOrderUnsupported = L''ordine di byte specificato per la codifica "{0}" non \u00E8 supportato.
+        EncodingByteOrderUnsupported = L''ordine di byte specificato per la codifica "{0}" non è supportato.
         InvalidByte = Byte non valido {0} della sequenza UTF-8 a {1} byte.
-        ExpectedByte = \u00C8 previsto il byte {0} della sequenza UTF-8 a {1} byte.  
-        InvalidHighSurrogate = I bit per surrogato alto nella sequenza UTF-8 non devono superare 0x10, ma \u00E8 stato trovato 0x{0}.
+        ExpectedByte = È previsto il byte {0} della sequenza UTF-8 a {1} byte.  
+        InvalidHighSurrogate = I bit per surrogato alto nella sequenza UTF-8 non devono superare 0x10, ma è stato trovato 0x{0}.
         OperationNotSupported = Operazione "{0}" non supportata dal processo di lettura {1}.
         InvalidASCII = Il byte "{0}" non fa parte del set di caratteri ASCII (a 7 bit).
-        CharConversionFailure = Un'entit\u00E0 che deve trovarsi in una determinata codifica non pu\u00F2 contenere sequenze non valide in quella codifica.
+        CharConversionFailure = Un'entità che deve trovarsi in una determinata codifica non può contenere sequenze non valide in quella codifica.
 
 # DTD Messages
 # 2.2 Characters
-        InvalidCharInEntityValue = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel valore dell''entit\u00E0.
-        InvalidCharInExternalSubset = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel set secondario esterno del DTD.
-        InvalidCharInIgnoreSect = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nella sezione condizionale esclusa.
-        InvalidCharInPublicID = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nell''identificativo pubblico.
-        InvalidCharInSystemID = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nell''identificativo di sistema.
+        InvalidCharInEntityValue = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nel valore dell''entità.
+        InvalidCharInExternalSubset = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nel set secondario esterno del DTD.
+        InvalidCharInIgnoreSect = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nella sezione condizionale esclusa.
+        InvalidCharInPublicID = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nell''identificativo pubblico.
+        InvalidCharInSystemID = È stato trovato un carattere XML non valido (Unicode: 0x{0}) nell''identificativo di sistema.
 # 2.3 Common Syntactic Constructs
-        SpaceRequiredAfterSYSTEM = \u00C8 richiesto uno spazio dopo la parola chiave SYSTEM nella dichiarazione DOCTYPE.
+        SpaceRequiredAfterSYSTEM = È richiesto uno spazio dopo la parola chiave SYSTEM nella dichiarazione DOCTYPE.
         QuoteRequiredInSystemID = L'identificativo di sistema deve iniziare con un apice o con virgolette.
         SystemIDUnterminated = L'identificativo di sistema deve terminare con un apice corrispondente.
         SpaceRequiredAfterPUBLIC = Sono richiesti spazi dopo la parola chiave PUBLIC nella dichiarazione DOCTYPE.
         QuoteRequiredInPublicID = L'identificativo pubblico deve iniziare con un apice o con le virgolette.
         PublicIDUnterminated = L'identificativo pubblico deve terminare con un apice corrispondente.
-        PubidCharIllegal = Il carattere (Unicode: 0x{0}) non \u00E8 consentito nell''identificativo pubblico.
+        PubidCharIllegal = Il carattere (Unicode: 0x{0}) non è consentito nell''identificativo pubblico.
         SpaceRequiredBetweenPublicAndSystem = Sono richiesti spazi tra publicId e systemId.
 # 2.8 Prolog and Document Type Declaration
-        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u00C8 richiesto uno spazio dopo "<!DOCTYPE" nella dichiarazione del tipo di documento.
+        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = È richiesto uno spazio dopo "<!DOCTYPE" nella dichiarazione del tipo di documento.
         MSG_ROOT_ELEMENT_TYPE_REQUIRED = Il tipo di elemento radice deve comparire dopo "<!DOCTYPE" nella dichiarazione del tipo di documento.
         DoctypedeclUnterminated = La dichiarazione del tipo di documento per il tipo di elemento radice "{0}" deve terminare con ''>''.
         DoctypedeclNotClosed = La dichiarazione del tipo di documento per il tipo di elemento radice "{0}" deve terminare con '']''.
-        PEReferenceWithinMarkup = Il riferimento di entit\u00E0 di parametro "%{0};" non pu\u00F2 essere presente nel markup del set secondario interno del DTD.
+        PEReferenceWithinMarkup = Il riferimento di entità di parametro "%{0};" non può essere presente nel markup del set secondario interno del DTD.
         MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Le dichiarazioni di markup contenute o indicate dalla dichiarazione del tipo di documento devono avere un formato corretto.
 # 2.10 White Space Handling
         MSG_XML_SPACE_DECLARATION_ILLEGAL = La dichiarazione di attributo "xml:space" deve essere specificata come tipo enumerato, i cui unici possibili valori sono "default" e "preserve".
 # 3.2 Element Type Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u00C8 richiesto uno spazio dopo "<!ELEMENT" nella dichiarazione del tipo di elemento.
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Il tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento.
-        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u00C8 richiesto uno spazio dopo il tipo di elemento "{0}" nella dichiarazione del tipo di elemento.
-        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u00C8 richiesto uno vincolo dopo il tipo di elemento "{0}" nella dichiarazione del tipo di elemento.
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = È richiesto uno spazio dopo "<!ELEMENT" nella dichiarazione del tipo di elemento.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Il tipo di elemento è obbligatorio nella dichiarazione del tipo di elemento.
+        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = È richiesto uno spazio dopo il tipo di elemento "{0}" nella dichiarazione del tipo di elemento.
+        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = È richiesto uno vincolo dopo il tipo di elemento "{0}" nella dichiarazione del tipo di elemento.
         ElementDeclUnterminated = La dichiarazione per il tipo di elemento "{0}" deve terminare con ''>''.
 # 3.2.1 Element Content
-        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un carattere ''('' o un tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento "{0}".
-        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un carattere '')'' \u00E8 obbligatorio nella dichiarazione del tipo di elemento "{0}".
+        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un carattere ''('' o un tipo di elemento è obbligatorio nella dichiarazione del tipo di elemento "{0}".
+        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un carattere '')'' è obbligatorio nella dichiarazione del tipo di elemento "{0}".
 # 3.2.2 Mixed Content
-        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento "{0}".
-        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un carattere '')'' \u00E8 obbligatorio nella dichiarazione del tipo di elemento "{0}".
+        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un tipo di elemento è obbligatorio nella dichiarazione del tipo di elemento "{0}".
+        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un carattere '')'' è obbligatorio nella dichiarazione del tipo di elemento "{0}".
         MixedContentUnterminated = Il modello di contenuto misto "{0}" deve terminare con ")*" se i tipi di elementi figlio hanno vincoli.
 # 3.3 Attribute-List Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u00C8 richiesto uno spazio dopo "<!ATTLIST" nella dichiarazione della lista di attributi.
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Il tipo di elemento \u00E8 obbligatorio nella dichiarazione della lista di attributi.
-        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u00C8 richiesto uno spazio prima del nome attributo nella dichiarazione della lista di attributi per l''elemento "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = È richiesto uno spazio dopo "<!ATTLIST" nella dichiarazione della lista di attributi.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Il tipo di elemento è obbligatorio nella dichiarazione della lista di attributi.
+        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = È richiesto uno spazio prima del nome attributo nella dichiarazione della lista di attributi per l''elemento "{0}".
         AttNameRequiredInAttDef = Specificare il nome attributo nella dichiarazione della lista di attributi per l''elemento "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u00C8 richiesto uno spazio prima del tipo di attributo nella dichiarazione dell''attributo "{1}" per l''elemento "{0}".
-        AttTypeRequiredInAttDef = Il tipo di attributo \u00E8 obbligatorio nella dichiarazione dell''attributo "{1}" per l''elemento "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C8 richiesto uno spazio prima del valore predefinito di attributo nella dichiarazione dell''attributo "{1}" per l''elemento "{0}".
-        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Sono state specificate pi\u00F9 definizioni di attributo per lo stesso attributo "{1}" dell''elemento "{0}" specificato.
+        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = È richiesto uno spazio prima del tipo di attributo nella dichiarazione dell''attributo "{1}" per l''elemento "{0}".
+        AttTypeRequiredInAttDef = Il tipo di attributo è obbligatorio nella dichiarazione dell''attributo "{1}" per l''elemento "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = È richiesto uno spazio prima del valore predefinito di attributo nella dichiarazione dell''attributo "{1}" per l''elemento "{0}".
+        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Sono state specificate più definizioni di attributo per lo stesso attributo "{1}" dell''elemento "{0}" specificato.
 # 3.3.1 Attribute Types
         MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Deve essere presente uno spazio dopo "NOTATION" nella dichiarazione di attributo "{1}".
         MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Il carattere ''('' deve seguire "NOTATION" nella dichiarazione di attributo "{1}".
-        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Il nome notazione \u00E8 obbligatorio nella lista di tipi di notazione per la dichiarazione di attributo "{1}".
+        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Il nome notazione è obbligatorio nella lista di tipi di notazione per la dichiarazione di attributo "{1}".
         NotationTypeUnterminated = La lista di tipi di notazione deve terminare con '')'' nella dichiarazione di attributo "{1}".
-        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Il nome token \u00E8 obbligatorio nella lista di tipi enumerati per la dichiarazione di attributo "{1}".
+        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Il nome token è obbligatorio nella lista di tipi enumerati per la dichiarazione di attributo "{1}".
         EnumerationUnterminated = La lista di tipi enumerati deve terminare con '')'' nella dichiarazione di attributo "{1}".
-        MSG_DISTINCT_TOKENS_IN_ENUMERATION = Il valore di enumerazione "{1}" \u00E8 stato specificato pi\u00F9 volte nella dichiarazione dell''attributo "{2}" per l''elemento "{0}". I valori di NMTOKENS in una dichiarazione singola di attributo Enumeration devono essere tutti diversi.
-        MSG_DISTINCT_NOTATION_IN_ENUMERATION = Il valore di enumerazione "{1}" \u00E8 stato specificato pi\u00F9 volte nella dichiarazione dell''attributo "{2}" per l''elemento "{0}". I nomi NOTATION in una dichiarazione singola di attributo NotationType devono essere tutti diversi.
+        MSG_DISTINCT_TOKENS_IN_ENUMERATION = Il valore di enumerazione "{1}" è stato specificato più volte nella dichiarazione dell''attributo "{2}" per l''elemento "{0}". I valori di NMTOKENS in una dichiarazione singola di attributo Enumeration devono essere tutti diversi.
+        MSG_DISTINCT_NOTATION_IN_ENUMERATION = Il valore di enumerazione "{1}" è stato specificato più volte nella dichiarazione dell''attributo "{2}" per l''elemento "{0}". I nomi NOTATION in una dichiarazione singola di attributo NotationType devono essere tutti diversi.
 # 3.3.2 Attribute Defaults
         MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Deve essere presente uno spazio dopo "FIXED" nella dichiarazione di attributo "{1}".
 # 3.4 Conditional Sections
         IncludeSectUnterminated = La sezione condizionale inclusa deve terminare con "]]>".
         IgnoreSectUnterminated = La sezione condizionale esclusa deve terminare con "]]>".
 # 4.1 Character and Entity References
-        NameRequiredInPEReference = Il nome entit\u00E0 deve seguire immediatamente '%' nel riferimento di entit\u00E0 di parametro.
-        SemicolonRequiredInPEReference = Il riferimento di entit\u00E0 di parametro "%{0};" deve terminare con il delimitatore '';''.
+        NameRequiredInPEReference = Il nome entità deve seguire immediatamente '%' nel riferimento di entità di parametro.
+        SemicolonRequiredInPEReference = Il riferimento di entità di parametro "%{0};" deve terminare con il delimitatore '';''.
 # 4.2 Entity Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u00C8 richiesto uno spazio dopo "<!ENTITY" nella dichiarazione dell'entit\u00E0.
-        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u00C8 richiesto uno spazio tra "<!ENTITY" e il carattere '%' nella dichiarazione dell'entit\u00E0 di parametro.
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u00C8 richiesto uno spazio tra '%' e il nome entit\u00E0 nella dichiarazione dell'entit\u00E0 di parametro.
-        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Il nome dell'entit\u00E0 \u00E8 obbligatorio nella dichiarazione di entit\u00E0.
-        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u00C8 richiesto uno spazio tra il nome entit\u00E0 "{0}" e la definizione nella dichiarazione dell''entit\u00E0:
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u00C8 richiesto uno spazio tra "NDATA" e il nome notazione nella dichiarazione dell''entit\u00E0 "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u00C8 richiesto uno spazio prima di "NDATA" nella dichiarazione dell''entit\u00E0 "{0}".
-        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Il nome notazione \u00E8 obbligatorio dopo "NDATA" nella dichiarazione dell''entit\u00E0 "{0}".
-        EntityDeclUnterminated = La dichiarazione per l''entit\u00E0 "{0}" deve terminare con ''>''.
-	MSG_DUPLICATE_ENTITY_DEFINITION = L''entit\u00E0 "{0}" \u00E8 stata dichiarata pi\u00F9 volte.        
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = È richiesto uno spazio dopo "<!ENTITY" nella dichiarazione dell'entità.
+        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = È richiesto uno spazio tra "<!ENTITY" e il carattere '%' nella dichiarazione dell'entità di parametro.
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = È richiesto uno spazio tra '%' e il nome entità nella dichiarazione dell'entità di parametro.
+        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Il nome dell'entità è obbligatorio nella dichiarazione di entità.
+        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = È richiesto uno spazio tra il nome entità "{0}" e la definizione nella dichiarazione dell''entità:
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = È richiesto uno spazio tra "NDATA" e il nome notazione nella dichiarazione dell''entità "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = È richiesto uno spazio prima di "NDATA" nella dichiarazione dell''entità "{0}".
+        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Il nome notazione è obbligatorio dopo "NDATA" nella dichiarazione dell''entità "{0}".
+        EntityDeclUnterminated = La dichiarazione per l''entità "{0}" deve terminare con ''>''.
+	MSG_DUPLICATE_ENTITY_DEFINITION = L''entità "{0}" è stata dichiarata più volte.        
 # 4.2.2 External Entities
-        ExternalIDRequired = La dichiarazione di entit\u00E0 esterna deve iniziare con "SYSTEM" o "PUBLIC".
-        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra "PUBLIC" e l'identificativo pubblico.
-        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra l'identificativo pubblico e quello di sistema.
-        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra "SYSTEM" e l'identificativo di sistema.
+        ExternalIDRequired = La dichiarazione di entità esterna deve iniziare con "SYSTEM" o "PUBLIC".
+        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = È richiesto uno spazio tra "PUBLIC" e l'identificativo pubblico.
+        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = È richiesto uno spazio tra l'identificativo pubblico e quello di sistema.
+        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = È richiesto uno spazio tra "SYSTEM" e l'identificativo di sistema.
         MSG_URI_FRAGMENT_IN_SYSTEMID = L''identificativo di frammento non deve essere specificato nell''identificativo di sistema "{0}".
 # 4.7 Notation Declarations
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u00C8 richiesto uno spazio dopo "<!NOTATION" nella dichiarazione della notazione.
-        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Il nome della notazione \u00E8 obbligatorio nella dichiarazione di notazione.
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u00C8 richiesto uno spazio dopo il nome notazione "{0}" nella dichiarazione della notazione.
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = È richiesto uno spazio dopo "<!NOTATION" nella dichiarazione della notazione.
+        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Il nome della notazione è obbligatorio nella dichiarazione di notazione.
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = È richiesto uno spazio dopo il nome notazione "{0}" nella dichiarazione della notazione.
         ExternalIDorPublicIDRequired = La dichiarazione per la notazione "{0}" deve includere un identificativo di sistema o pubblico.
         NotationDeclUnterminated = La dichiarazione per la notazione "{0}" deve terminare con ''>''.
 
 # Validation messages
-        DuplicateTypeInMixedContent = Il tipo di elemento "{1}" \u00E8 gi\u00E0 stato specificato nel modello di contenuto della dichiarazione di elemento "{0}".
-        ENTITIESInvalid = Il valore di attributo "{1}" di tipo ENTITIES deve corrispondere ai nomi di una o pi\u00F9 entit\u00E0 non analizzate.
-        ENTITYInvalid = Il valore di attributo "{1}" di tipo ENTITY deve corrispondere al nome di un''entit\u00E0 non analizzata.
+        DuplicateTypeInMixedContent = Il tipo di elemento "{1}" è già stato specificato nel modello di contenuto della dichiarazione di elemento "{0}".
+        ENTITIESInvalid = Il valore di attributo "{1}" di tipo ENTITIES deve corrispondere ai nomi di una o più entità non analizzate.
+        ENTITYInvalid = Il valore di attributo "{1}" di tipo ENTITY deve corrispondere al nome di un''entità non analizzata.
         IDDefaultTypeInvalid = Nell''attributo ID "{0}" deve essere dichiarato un valore predefinito "#IMPLIED" o "#REQUIRED".
         IDInvalid = Il valore di attributo "{0}" di tipo ID deve essere un nome.
         IDInvalidWithNamespaces = Il valore di attributo "{0}" di tipo ID deve essere un NCName se sono abilitati gli spazi di nomi.
         IDNotUnique = Il valore di attributo "{0}" di tipo ID deve essere univoco all''interno del documento.
         IDREFInvalid = Il valore di attributo "{0}" di tipo IDREF deve essere un nome.
         IDREFInvalidWithNamespaces = Il valore di attributo "{0}" di tipo IDREF deve essere un NCName se sono abilitati gli spazi di nomi.
-        IDREFSInvalid = Il valore di attributo "{0}" di tipo IDREFS deve corrispondere a uno o pi\u00F9 nomi.
-        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Il testo di sostituzione dell''entit\u00E0 di parametro "{0}" deve includere dichiarazioni nidificate correttamente se il riferimento dell''entit\u00E0 \u00E8 utilizzato come dichiarazione completa.
-        ImproperDeclarationNesting = Il testo di sostituzione dell''entit\u00E0 di parametro "{0}" deve includere dichiarazioni nidificate correttamente.
-        ImproperGroupNesting = Il testo di sostituzione dell''entit\u00E0 di parametro "{0}" deve includere coppie di parentesi nidificate correttamente.
-        INVALID_PE_IN_CONDITIONAL = Il testo di sostituzione dell''entit\u00E0 di parametro "{0}" deve includere tutta la sezione condizionale oppure solo INCLUDE o IGNORE.
+        IDREFSInvalid = Il valore di attributo "{0}" di tipo IDREFS deve corrispondere a uno o più nomi.
+        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Il testo di sostituzione dell''entità di parametro "{0}" deve includere dichiarazioni nidificate correttamente se il riferimento dell''entità è utilizzato come dichiarazione completa.
+        ImproperDeclarationNesting = Il testo di sostituzione dell''entità di parametro "{0}" deve includere dichiarazioni nidificate correttamente.
+        ImproperGroupNesting = Il testo di sostituzione dell''entità di parametro "{0}" deve includere coppie di parentesi nidificate correttamente.
+        INVALID_PE_IN_CONDITIONAL = Il testo di sostituzione dell''entità di parametro "{0}" deve includere tutta la sezione condizionale oppure solo INCLUDE o IGNORE.
         MSG_ATTRIBUTE_NOT_DECLARED = Dichiarare l''attributo "{1}" per il tipo di elemento "{0}".
         MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = L''attributo "{0}" con valore "{1}" deve avere un valore della lista "{2}".
         MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = Il valore "{1}" dell''attributo "{0}" non deve essere modificato dalla normalizzazione (in "{2}") in un documento standalone.
-        MSG_CONTENT_INCOMPLETE = Il contenuto del tipo di elemento "{0}" \u00E8 incompleto. Deve corrispondere a "{1}".
+        MSG_CONTENT_INCOMPLETE = Il contenuto del tipo di elemento "{0}" è incompleto. Deve corrispondere a "{1}".
         MSG_CONTENT_INVALID = Il contenuto del tipo di elemento "{0}" deve corrispondere a "{1}".
         MSG_CONTENT_INVALID_SPECIFIED = Il contenuto del tipo di elemento "{0}" deve corrispondere a "{1}". Non sono consentiti elementi figlio di tipo "{2}".
         MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = L''attributo "{1}" per il tipo di elemento "{0}" ha un valore predefinito e deve essere specificato in un documento standalone.
-        MSG_DUPLICATE_ATTDEF = L''attributo "{1}" \u00E8 gi\u00E0 stato dichiarato per il tipo di elemento "{0}".
-        MSG_ELEMENT_ALREADY_DECLARED = Il tipo di elemento "{0}" non deve essere dichiarato pi\u00F9 volte.
+        MSG_DUPLICATE_ATTDEF = L''attributo "{1}" è già stato dichiarato per il tipo di elemento "{0}".
+        MSG_ELEMENT_ALREADY_DECLARED = Il tipo di elemento "{0}" non deve essere dichiarato più volte.
         MSG_ELEMENT_NOT_DECLARED = Il tipo di elemento "{0}" deve essere dichiarato.
         MSG_GRAMMAR_NOT_FOUND = Documento non valido: nessuna grammatica trovata.
         MSG_ELEMENT_WITH_ID_REQUIRED = Un elemento con identificativo "{0}" deve esistere nel documento.
-        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Il riferimento all''entit\u00E0 esterna "{0}" non \u00E8 consentito in un documento standalone.
+        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Il riferimento all''entità esterna "{0}" non è consentito in un documento standalone.
         MSG_FIXED_ATTVALUE_INVALID = L''attributo "{1}" con valore "{2}" deve avere un valore "{3}".
-        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Il tipo di elemento "{0}" ha gi\u00E0 un attributo "{1}" di tipo ID. Non \u00E8 consentito un secondo attributo "{2}" di tipo ID.
-        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Il tipo di elemento "{0}" ha gi\u00E0 un attributo "{1}" di tipo NOTATION. Non \u00E8 consentito un secondo attributo "{2}" di tipo NOTATION.
+        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Il tipo di elemento "{0}" ha già un attributo "{1}" di tipo ID. Non è consentito un secondo attributo "{2}" di tipo ID.
+        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Il tipo di elemento "{0}" ha già un attributo "{1}" di tipo NOTATION. Non è consentito un secondo attributo "{2}" di tipo NOTATION.
         MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notazione "{1}" deve essere dichiarata se vi viene fatto riferimento nella lista dei tipi di notazione per l''attributo "{0}".
-        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notazione "{1}" deve essere dichiarata se vi viene fatto riferimento dichiarazione di entit\u00E0 non analizzata per "{0}".
-        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Il riferimento all''entit\u00E0 "{0}" dichiarata in un''entit\u00E0 esterna analizzata non \u00E8 consentito in un documento standalone.
-        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = L''attributo "{1}" \u00E8 obbligatorio e deve essere specificato per il tipo di elemento "{0}".
-        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Non deve esistere nessuno spazio tra gli elementi dichiarati in un'entit\u00E0 esterna analizzata con il contenuto dell'elemento in un documento standalone.
+        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notazione "{1}" deve essere dichiarata se vi viene fatto riferimento dichiarazione di entità non analizzata per "{0}".
+        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Il riferimento all''entità "{0}" dichiarata in un''entità esterna analizzata non è consentito in un documento standalone.
+        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = L''attributo "{1}" è obbligatorio e deve essere specificato per il tipo di elemento "{0}".
+        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Non deve esistere nessuno spazio tra gli elementi dichiarati in un'entità esterna analizzata con il contenuto dell'elemento in un documento standalone.
         NMTOKENInvalid = Il valore di attributo "{0}" di tipo NMTOKEN deve essere un token di nome.
-        NMTOKENSInvalid = Il valore di attributo "{0}" di tipo NMTOKENS deve corrispondere a uno o pi\u00F9 token di nomi.
-        NoNotationOnEmptyElement = Il tipo di elemento "{0}" dichiarato come EMPTY non pu\u00F2 dichiarare l''attributo "{1}" di tipo NOTATION.
+        NMTOKENSInvalid = Il valore di attributo "{0}" di tipo NMTOKENS deve corrispondere a uno o più token di nomi.
+        NoNotationOnEmptyElement = Il tipo di elemento "{0}" dichiarato come EMPTY non può dichiarare l''attributo "{1}" di tipo NOTATION.
         RootElementTypeMustMatchDoctypedecl = L''elemento radice "{1}" del documento deve corrispondere alla radice DOCTYPE "{0}".
         UndeclaredElementInContentSpec = Il modello di contenuto dell''elemento "{0}" fa riferimento a un elemento "{1}" non dichiarato.
-        UniqueNotationName = La dichiarazione per la notazione "{0}" non \u00E8 univoca. Un nome non deve essere dichiarato pi\u00F9 volte nella dichiarazione di una notazione.
-        ENTITYFailedInitializeGrammar =  ENTITYDatatype Validator: errore. \u00C8 necessario richiamare il metodo di inizializzazione con un riferimento di grammatica valido. \t
+        UniqueNotationName = La dichiarazione per la notazione "{0}" non è univoca. Un nome non deve essere dichiarato più volte nella dichiarazione di una notazione.
+        ENTITYFailedInitializeGrammar =  ENTITYDatatype Validator: errore. È necessario richiamare il metodo di inizializzazione con un riferimento di grammatica valido. \t
         ENTITYNotUnparsed = ENTITY "{0}" non analizzata.
         ENTITYNotValid = ENTITY "{0}" non valida.
         EmptyList = I valori di tipo ENTITIES, IDREFS e NMTOKENS non possono essere una lista vuota.
 
 # Entity related messages
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ReferenceToExternalEntity = Il riferimento di entit\u00E0 esterna "&{0};" non \u00E8 consentito in un valore di attributo.
-        AccessExternalDTD = DTD esterna: lettura della DTD esterna ''{0}'' non riuscita. Accesso ''{1}'' non consentito a causa della limitazione definita dalla propriet\u00E0 accessExternalDTD.
-        AccessExternalEntity = Entit\u00E0 esterna: lettura del documento esterno ''{0}'' non riuscita. Accesso ''{1}'' non consentito a causa della limitazione definita dalla propriet\u00E0 accessExternalDTD.
+        ReferenceToExternalEntity = Il riferimento di entità esterna "&{0};" non è consentito in un valore di attributo.
+        AccessExternalDTD = DTD esterna: lettura della DTD esterna ''{0}'' non riuscita. Accesso ''{1}'' non consentito a causa della limitazione definita dalla proprietà accessExternalDTD.
+        AccessExternalEntity = Entità esterna: lettura del documento esterno ''{0}'' non riuscita. Accesso ''{1}'' non consentito a causa della limitazione definita dalla proprietà accessExternalDTD.
 
 # 4.1 Character and Entity References
-        EntityNotDeclared = L''entit\u00E0 "{0}" \u00E8 indicata da un riferimento, ma non \u00E8 dichiarata.
-        ReferenceToUnparsedEntity = Il riferimento di entit\u00E0 non analizzata "&{0};" non \u00E8 consentito.
-        RecursiveReference = Riferimento di entit\u00E0 ricorsivo "{0}" (percorso riferimento: {1}).
-        RecursiveGeneralReference = Riferimento di entit\u00E0 generale ricorsivo "&{0};" (percorso riferimento: {1}).
-        RecursivePEReference = Riferimento di entit\u00E0 parametro ricorsivo "%{0};" (percorso riferimento: {1}).
+        EntityNotDeclared = L''entità "{0}" è indicata da un riferimento, ma non è dichiarata.
+        ReferenceToUnparsedEntity = Il riferimento di entità non analizzata "&{0};" non è consentito.
+        RecursiveReference = Riferimento di entità ricorsivo "{0}" (percorso riferimento: {1}).
+        RecursiveGeneralReference = Riferimento di entità generale ricorsivo "&{0};" (percorso riferimento: {1}).
+        RecursivePEReference = Riferimento di entità parametro ricorsivo "%{0};" (percorso riferimento: {1}).
 # 4.3.3 Character Encoding in Entities
-        EncodingNotSupported = La codifica "{0}" non \u00E8 supportata.
-        EncodingRequired = Un'entit\u00E0 analizzata non codificata in UTF-8 o UTF-16 deve contenere una dichiarazione di codifica.
+        EncodingNotSupported = La codifica "{0}" non è supportata.
+        EncodingRequired = Un'entità analizzata non codificata in UTF-8 o UTF-16 deve contenere una dichiarazione di codifica.
 
 # Namespaces support
 # 4. Using Qualified Names
         IllegalQName = L'elemento o l'attributo non corrisponde alla produzione del QName: QName::=(NCName':')?NCName.
-        ElementXMLNSPrefix = L''elemento "{0}" non pu\u00F2 avere "xmlns" come prefisso.
-        ElementPrefixUnbound = Il prefisso "{0}" per l''elemento "{1}" non \u00E8 associato.
-        AttributePrefixUnbound = Il prefisso "{2}" per l''attributo "{1}" associato a un tipo di elemento "{0}" non \u00E8 associato.
-        EmptyPrefixedAttName = Il valore dell''attributo "{0}" non \u00E8 valido. Le associazioni di spazi di nomi con prefisso non possono essere vuote.
-        PrefixDeclared = Il prefisso spazio di nomi "{0}" non \u00E8 stato dichiarato.
-        CantBindXMLNS = Il prefisso "xmlns" non pu\u00F2 essere associato esplicitamente a uno spazio di nomi, n\u00E9 lo spazio di nomi per "xmlns" pu\u00F2 essere associato esplicitamente a un prefisso.
-        CantBindXML = Il prefisso "xml" non pu\u00F2 essere associato a uno spazio di nomi diverso da quello al quale appartiene, n\u00E9 lo spazio di nomi per "xml" pu\u00F2 essere associato a un prefisso diverso da "xml".
+        ElementXMLNSPrefix = L''elemento "{0}" non può avere "xmlns" come prefisso.
+        ElementPrefixUnbound = Il prefisso "{0}" per l''elemento "{1}" non è associato.
+        AttributePrefixUnbound = Il prefisso "{2}" per l''attributo "{1}" associato a un tipo di elemento "{0}" non è associato.
+        EmptyPrefixedAttName = Il valore dell''attributo "{0}" non è valido. Le associazioni di spazi di nomi con prefisso non possono essere vuote.
+        PrefixDeclared = Il prefisso spazio di nomi "{0}" non è stato dichiarato.
+        CantBindXMLNS = Il prefisso "xmlns" non può essere associato esplicitamente a uno spazio di nomi, né lo spazio di nomi per "xmlns" può essere associato esplicitamente a un prefisso.
+        CantBindXML = Il prefisso "xml" non può essere associato a uno spazio di nomi diverso da quello al quale appartiene, né lo spazio di nomi per "xml" può essere associato a un prefisso diverso da "xml".
         MSG_ATT_DEFAULT_INVALID = defaultValue "{1}" dell''attributo "{0}" non valido per i vincoli lessicali di questo tipo di attributo.
 
 # REVISIT: These need messages
@@ -295,14 +295,14 @@
 
 
 # Implementation limits
-        EntityExpansionLimit=JAXP00010001: il parser ha rilevato pi\u00F9 "{0}" espansioni di entit\u00E0 nel documento. Questo \u00E8 il limite imposto dal kit JDK.
-        ElementAttributeLimit=JAXP00010002: l''elemento "{0}" contiene pi\u00F9 di "{1}" attributi. "{1}" \u00E8 il limite imposto dal kit JDK.
-        MaxEntitySizeLimit=JAXP00010003: la lunghezza dell''entit\u00E0 "{0}" \u00E8 "{1}". Tale valore supera il limite "{2}" definito da "{3}".
-        TotalEntitySizeLimit=JAXP00010004: le dimensioni accumulate delle entit\u00E0 sono pari a "{0}". Tale valore supera il limite "{1}" definito da "{2}".
-        MaxXMLNameLimit=JAXP00010005: la lunghezza dell''entit\u00E0 "{0}" \u00E8 "{1}". Tale valore supera il limite "{2}" definito da "{3}".
-        MaxElementDepthLimit=JAXP00010006: la profondit\u00E0 dell''elemento "{0}" \u00E8 "{1}". Tale valore supera il limite "{2}" definito da "{3}".
-        EntityReplacementLimit=JAXP00010007: il numero totale di nodi nei riferimenti entit\u00E0 \u00E8 "{0}". Tale valore supera il limite di "{1}" impostato da "{2}".
+        EntityExpansionLimit=JAXP00010001: il parser ha rilevato più "{0}" espansioni di entità nel documento. Questo è il limite imposto dal kit JDK.
+        ElementAttributeLimit=JAXP00010002: l''elemento "{0}" contiene più di "{1}" attributi. "{1}" è il limite imposto dal kit JDK.
+        MaxEntitySizeLimit=JAXP00010003: la lunghezza dell''entità "{0}" è "{1}". Tale valore supera il limite "{2}" definito da "{3}".
+        TotalEntitySizeLimit=JAXP00010004: le dimensioni accumulate delle entità sono pari a "{0}". Tale valore supera il limite "{1}" definito da "{2}".
+        MaxXMLNameLimit=JAXP00010005: la lunghezza dell''entità "{0}" è "{1}". Tale valore supera il limite "{2}" definito da "{3}".
+        MaxElementDepthLimit=JAXP00010006: la profondità dell''elemento "{0}" è "{1}". Tale valore supera il limite "{2}" definito da "{3}".
+        EntityReplacementLimit=JAXP00010007: il numero totale di nodi nei riferimenti entità è "{0}". Tale valore supera il limite di "{1}" impostato da "{2}".
 
 # Catalog 09
 # Technical term, do not translate: catalog
-        CatalogException=JAXP00090001: il CatalogResolver \u00E8 abilitato con il catalogo "{0}", ma viene restituita una CatalogException.
+        CatalogException=JAXP00090001: il CatalogResolver è abilitato con il catalogo "{0}", ma viene restituita una CatalogException.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
index f78a3241f20..23926b1884b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
@@ -20,290 +20,290 @@
 #
 # @version
 
-        BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-        FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n  
+        BadMessageKey = メッセージ・キーに対応するエラー・メッセージが見つかりません。
+        FormatFailed = 次のメッセージの書式設定中に内部エラーが発生しました:\n  
 
 # Document messages
-        PrematureEOF=\u9014\u4E2D\u3067\u30D5\u30A1\u30A4\u30EB\u306E\u672B\u5C3E\u306B\u9054\u3057\u307E\u3057\u305F\u3002
+        PrematureEOF=途中でファイルの末尾に達しました。
 # 2.1 Well-Formed XML Documents
-        RootElementRequired = \u6574\u5F62\u5F0F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u30EB\u30FC\u30C8\u8981\u7D20\u304C\u5FC5\u8981\u3067\u3059\u3002
+        RootElementRequired = 整形式ドキュメントにはルート要素が必要です。
 # 2.2 Characters
 
-        InvalidCharInCDSect = CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        InvalidCharInContent = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u8981\u7D20\u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        TwoColonsInQName = \u8981\u7D20\u30BF\u30A4\u30D7\u307E\u305F\u306F\u5C5E\u6027\u540D\u306B\u7121\u52B9\u306A':'\u304C\u3082\u30461\u3064\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        ColonNotLegalWithNS = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u3001\u540D\u524D''{0}''\u306B\u30B3\u30ED\u30F3\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-        InvalidCharInMisc = \u8981\u7D20\u30B3\u30F3\u30C6\u30F3\u30C4\u306E\u7D42\u308F\u308A\u306E\u5F8C\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        InvalidCharInProlog = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D7\u30ED\u30ED\u30FC\u30B0\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        InvalidCharInXMLDecl = XML\u5BA3\u8A00\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
+        InvalidCharInCDSect = CDATAセクションに無効なXML文字(Unicode: 0x{0})が見つかりました。
+        InvalidCharInContent = ドキュメントの要素コンテンツに無効なXML文字(Unicode: 0x{0})が見つかりました。
+        TwoColonsInQName = 要素タイプまたは属性名に無効な':'がもう1つ見つかりました。
+        ColonNotLegalWithNS = ネームスペースが有効になっている場合、名前''{0}''にコロンは使用できません。
+        InvalidCharInMisc = 要素コンテンツの終わりの後のマークアップに無効なXML文字(Unicode: 0x{0})が見つかりました。
+        InvalidCharInProlog = ドキュメントのプロローグに無効なXML文字(Unicode: 0x{0})が見つかりました。
+        InvalidCharInXMLDecl = XML宣言に無効なXML文字(Unicode: 0x{0})が見つかりました。
 # 2.4 Character Data and Markup
-        CDEndInContent = \u6587\u5B57\u30B7\u30FC\u30B1\u30F3\u30B9"]]>"\u306F\u3001CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u7D42\u308F\u308A\u3092\u793A\u3059\u76EE\u7684\u4EE5\u5916\u3067\u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
+        CDEndInContent = 文字シーケンス"]]>"は、CDATAセクションの終わりを示す目的以外でコンテンツに使用しないでください。
 # 2.7 CDATA Sections
-        CDSectUnterminated = CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306F"]]>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        CDSectUnterminated = CDATAセクションは"]]>"で終了する必要があります。
 # 2.8 Prolog and Document Type Declaration
-        XMLDeclMustBeFirst = XML\u5BA3\u8A00\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u5148\u982D\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-        EqRequiredInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001"{0}"\u306E\u5F8C\u306B'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-        QuoteRequiredInXMLDecl = XML\u5BA3\u8A00\u306E"{0}"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306F\u3001\u5F15\u7528\u7B26\u3067\u56F2\u3093\u3060\u6587\u5B57\u5217\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        XMLDeclUnterminated = XML\u5BA3\u8A00\u306F"?>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        VersionInfoRequired = XML\u5BA3\u8A00\u306B\u306F\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002
-        SpaceRequiredBeforeVersionInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        SpaceRequiredBeforeEncodingInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        SpaceRequiredBeforeStandalone = XML\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MarkupNotRecognizedInProlog = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u30EB\u30FC\u30C8\u8981\u7D20\u3088\u308A\u524D\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u306F\u6574\u5F62\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MarkupNotRecognizedInMisc = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u30EB\u30FC\u30C8\u8981\u7D20\u306B\u7D9A\u304F\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u306F\u6574\u5F62\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        AlreadySeenDoctype = DOCTYPE\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002
-        DoctypeNotAllowed = \u6A5F\u80FD"http://apache.org/xml/features/disallow-doctype-decl"\u304Ctrue\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001DOCTYPE\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-        ContentIllegalInProlog = \u30D7\u30ED\u30ED\u30FC\u30B0\u306B\u306F\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-        ReferenceIllegalInProlog = \u30D7\u30ED\u30ED\u30FC\u30B0\u306B\u306F\u53C2\u7167\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
+        XMLDeclMustBeFirst = XML宣言は、ドキュメントの先頭でのみ使用できます。
+        EqRequiredInXMLDecl = XML宣言では、"{0}"の後に'' = ''文字が必要です。
+        QuoteRequiredInXMLDecl = XML宣言の"{0}"の後に続く値は、引用符で囲んだ文字列にする必要があります。
+        XMLDeclUnterminated = XML宣言は"?>"で終了する必要があります。
+        VersionInfoRequired = XML宣言にはバージョンが必要です。
+        SpaceRequiredBeforeVersionInXMLDecl = XML宣言では、バージョン疑似属性の前に空白が必要です。
+        SpaceRequiredBeforeEncodingInXMLDecl = XML宣言では、エンコーディング疑似属性の前に空白が必要です。
+        SpaceRequiredBeforeStandalone = XML宣言では、エンコーディング疑似属性の前に空白が必要です。
+        MarkupNotRecognizedInProlog = ドキュメント内のルート要素より前のマークアップは整形式である必要があります。
+        MarkupNotRecognizedInMisc = ドキュメント内のルート要素に続くマークアップは整形式である必要があります。
+        AlreadySeenDoctype = DOCTYPEはすでに存在します。
+        DoctypeNotAllowed = 機能"http://apache.org/xml/features/disallow-doctype-decl"がtrueに設定されている場合、DOCTYPEは指定できません。
+        ContentIllegalInProlog = プロローグにはコンテンツを指定できません。
+        ReferenceIllegalInProlog = プロローグには参照を指定できません。
 # Trailing Misc
-        ContentIllegalInTrailingMisc=\u5F8C\u7D9A\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u306F\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-        ReferenceIllegalInTrailingMisc=\u5F8C\u7D9A\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u306F\u53C2\u7167\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
+        ContentIllegalInTrailingMisc=後続セクションにはコンテンツを指定できません。
+        ReferenceIllegalInTrailingMisc=後続セクションには参照を指定できません。
 
 # 2.9 Standalone Document Declaration
-        SDDeclInvalid = \u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5BA3\u8A00\u306E\u5024\u306F\u3001"{0}"\u3067\u306F\u306A\u304F\u3001"yes"\u307E\u305F\u306F"no"\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        SDDeclNameInvalid = XML\u5BA3\u8A00\u306E\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u540D\u304C\u9593\u9055\u3063\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+        SDDeclInvalid = スタンドアロン・ドキュメント宣言の値は、"{0}"ではなく、"yes"または"no"にする必要があります。
+        SDDeclNameInvalid = XML宣言のスタンドアロン名が間違っている可能性があります。
 # 2.12 Language Identification
-        XMLLangInvalid = xml:lang\u5C5E\u6027\u306E\u5024"{0}"\u306F\u7121\u52B9\u306A\u8A00\u8A9E\u8B58\u5225\u5B50\u3067\u3059\u3002
+        XMLLangInvalid = xml:lang属性の値"{0}"は無効な言語識別子です。
 # 3. Logical Structures
-        ETagRequired = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u7D42\u4E86\u30BF\u30B0"</{0}>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        ETagRequired = 要素タイプ"{0}"は、対応する終了タグ"</{0}>"で終了する必要があります。
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ElementUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5F8C\u306B\u306F\u3001\u5C5E\u6027\u6307\u5B9A">"\u307E\u305F\u306F"/>"\u304C\u5FC5\u8981\u3067\u3059\u3002
-        EqRequiredInAttribute = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\u540D"{1}"\u306E\u5F8C\u306B\u306F\u3001'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-        OpenQuoteExpected = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306B\u306F\u3001\u958B\u59CB\u5F15\u7528\u7B26\u304C\u5FC5\u8981\u3067\u3059\u3002
-        CloseQuoteExpected = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306B\u306F\u3001\u7D42\u4E86\u5F15\u7528\u7B26\u304C\u5FC5\u8981\u3067\u3059\u3002
-        AttributeNotUnique = \u5C5E\u6027"{1}"\u306F\u8981\u7D20"{0}"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        AttributeNSNotUnique = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9"{2}"\u306B\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u305F\u5C5E\u6027"{1}"\u306F\u8981\u7D20"{0}"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        ETagUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u7D42\u4E86\u30BF\u30B0\u306F''>''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MarkupNotRecognizedInContent = \u8981\u7D20\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\u3001\u6574\u5F62\u5F0F\u306E\u6587\u5B57\u30C7\u30FC\u30BF\u307E\u305F\u306F\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u3067\u69CB\u6210\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        DoctypeIllegalInContent = \u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u306FDOCTYPE\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
+        ElementUnterminated = 要素タイプ"{0}"の後には、属性指定">"または"/>"が必要です。
+        EqRequiredInAttribute = 要素タイプ"{0}"に関連付けられている属性名"{1}"の後には、'' = ''文字が必要です。
+        OpenQuoteExpected = 要素タイプ"{0}"に関連付けられている属性"{1}"には、開始引用符が必要です。
+        CloseQuoteExpected = 要素タイプ"{0}"に関連付けられている属性"{1}"には、終了引用符が必要です。
+        AttributeNotUnique = 属性"{1}"は要素"{0}"に対してすでに指定されています。
+        AttributeNSNotUnique = ネームスペース"{2}"にバインドされた属性"{1}"は要素"{0}"に対してすでに指定されています。
+        ETagUnterminated = 要素タイプ"{0}"の終了タグは''>''デリミタで終了する必要があります。
+        MarkupNotRecognizedInContent = 要素のコンテンツは、整形式の文字データまたはマークアップで構成されている必要があります。
+        DoctypeIllegalInContent = コンテンツにはDOCTYPEを指定できません。
 # 4.1 Character and Entity References
-        ReferenceUnterminated = \u53C2\u7167\u306F';'\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        ReferenceUnterminated = 参照は';'デリミタで終了する必要があります。
 # 4.3.2 Well-Formed Parsed Entities
-        ReferenceNotInOneEntity = \u53C2\u7167\u306F\u3001\u540C\u3058\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u306B\u5B8C\u5168\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        ElementEntityMismatch = \u8981\u7D20"{0}"\u306F\u3001\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u3067\u958B\u59CB\u304A\u3088\u3073\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MarkupEntityMismatch=XML\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u69CB\u9020\u306F\u3001\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u3067\u958B\u59CB\u304A\u3088\u3073\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        ReferenceNotInOneEntity = 参照は、同じ解析済エンティティ内に完全に含まれている必要があります。
+        ElementEntityMismatch = 要素"{0}"は、同じエンティティ内で開始および終了する必要があります。
+        MarkupEntityMismatch=XMLドキュメント構造は、同じエンティティ内で開始および終了する必要があります。
 
 # Messages common to Document and DTD
 # 2.2 Characters
-        InvalidCharInAttValue = \u5C5E\u6027"{1}"\u306E\u5024\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{2})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u8981\u7D20\u306F"{0}"\u3067\u3059\u3002
-        InvalidCharInComment = \u30B3\u30E1\u30F3\u30C8\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        InvalidCharInPI = \u51E6\u7406\u547D\u4EE4\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        InvalidCharInInternalSubset = DTD\u306E\u5185\u90E8\u30B5\u30D6\u30BB\u30C3\u30C8\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        InvalidCharInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
+        InvalidCharInAttValue = 属性"{1}"の値に無効なXML文字(Unicode: 0x{2})が見つかりました。要素は"{0}"です。
+        InvalidCharInComment = コメントに無効なXML文字(Unicode: 0x{0})が見つかりました。
+        InvalidCharInPI = 処理命令に無効なXML文字(Unicode: 0x{0})が見つかりました。
+        InvalidCharInInternalSubset = DTDの内部サブセットに無効なXML文字(Unicode: 0x{0})が見つかりました。
+        InvalidCharInTextDecl = テキスト宣言に無効なXML文字(Unicode: 0x{0})が見つかりました。
 # 2.3 Common Syntactic Constructs
-        QuoteRequiredInAttValue = \u5C5E\u6027"{1}"\u306E\u5024\u306E\u5148\u982D\u306B\u306F\u3001\u4E00\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u307E\u305F\u306F\u4E8C\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-        LessthanInAttValue = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306E\u5024\u306B\u306F\u3001''<''\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        AttributeValueUnterminated = \u5C5E\u6027"{1}"\u306E\u5024\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u5F15\u7528\u7B26\u6587\u5B57\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        QuoteRequiredInAttValue = 属性"{1}"の値の先頭には、一重引用符文字または二重引用符文字が必要です。
+        LessthanInAttValue = 要素タイプ"{0}"に関連付けられている属性"{1}"の値には、''<''文字を含めることはできません。
+        AttributeValueUnterminated = 属性"{1}"の値は、対応する引用符文字で終了する必要があります。
 # 2.5 Comments
-        InvalidCommentStart = \u30B3\u30E1\u30F3\u30C8\u306E\u5148\u982D\u306B\u306F"<!--"\u304C\u5FC5\u8981\u3067\u3059\u3002
-        DashDashInComment = \u30B3\u30E1\u30F3\u30C8\u5185\u3067\u306F\u6587\u5B57\u5217"--"\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-        CommentUnterminated = \u30B3\u30E1\u30F3\u30C8\u306F"-->"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        COMMENT_NOT_IN_ONE_ENTITY = \u30B3\u30E1\u30F3\u30C8\u304C\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u56F2\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+        InvalidCommentStart = コメントの先頭には"<!--"が必要です。
+        DashDashInComment = コメント内では文字列"--"は使用できません。
+        CommentUnterminated = コメントは"-->"で終了する必要があります。
+        COMMENT_NOT_IN_ONE_ENTITY = コメントが同じエンティティで囲まれていません。
 # 2.6 Processing Instructions
-        PITargetRequired = \u51E6\u7406\u547D\u4EE4\u306E\u5148\u982D\u306B\u306F\u30BF\u30FC\u30B2\u30C3\u30C8\u306E\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        SpaceRequiredInPI = \u51E6\u7406\u547D\u4EE4\u30BF\u30FC\u30B2\u30C3\u30C8\u3068\u30C7\u30FC\u30BF\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        PIUnterminated = \u51E6\u7406\u547D\u4EE4\u306F"?>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        ReservedPITarget = "[xX][mM][lL]"\u3068\u4E00\u81F4\u3059\u308B\u51E6\u7406\u547D\u4EE4\u30BF\u30FC\u30B2\u30C3\u30C8\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        PI_NOT_IN_ONE_ENTITY = \u51E6\u7406\u547D\u4EE4\u304C\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u56F2\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+        PITargetRequired = 処理命令の先頭にはターゲットの名前が必要です。
+        SpaceRequiredInPI = 処理命令ターゲットとデータの間には空白が必要です。
+        PIUnterminated = 処理命令は"?>"で終了する必要があります。
+        ReservedPITarget = "[xX][mM][lL]"と一致する処理命令ターゲットは許可されていません。
+        PI_NOT_IN_ONE_ENTITY = 処理命令が同じエンティティで囲まれていません。
 # 2.8 Prolog and Document Type Declaration
-        VersionInfoInvalid = \u30D0\u30FC\u30B8\u30E7\u30F3"{0}"\u306F\u7121\u52B9\u3067\u3059\u3002
-        VersionNotSupported = XML\u30D0\u30FC\u30B8\u30E7\u30F3"{0}"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u306E\u306FXML 1.0\u306E\u307F\u3067\u3059\u3002
-        VersionNotSupported11 = XML\u30D0\u30FC\u30B8\u30E7\u30F3"{0}"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u306E\u306FXML 1.0\u304A\u3088\u3073XML 1.1\u306E\u307F\u3067\u3059\u3002
-        VersionMismatch= \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306B\u306F\u3001\u5F8C\u7D9A\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u5225\u306E\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
+        VersionInfoInvalid = バージョン"{0}"は無効です。
+        VersionNotSupported = XMLバージョン"{0}"はサポートされていません。サポートされているのはXML 1.0のみです。
+        VersionNotSupported11 = XMLバージョン"{0}"はサポートされていません。サポートされているのはXML 1.0およびXML 1.1のみです。
+        VersionMismatch= エンティティには、後続バージョンの別のエンティティを含めることはできません。
 # 4.1 Character and Entity References
-        DigitRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u3067\u306F\u300110\u9032\u8868\u73FE\u306F"&#"\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        HexdigitRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u3067\u306F\u300116\u9032\u8868\u73FE\u306F"&#x"\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        SemicolonRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u306F';'\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        InvalidCharRef = \u6587\u5B57\u53C2\u7167"&#{0}"\u306F\u7121\u52B9\u306AXML\u6587\u5B57\u3067\u3059\u3002
-        NameRequiredInReference = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u3067\u306F\u3001\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D\u306F'&'\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        SemicolonRequiredInReference = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u3078\u306E\u53C2\u7167\u306F'';''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        DigitRequiredInCharRef = 文字参照では、10進表現は"&#"の直後に指定する必要があります。
+        HexdigitRequiredInCharRef = 文字参照では、16進表現は"&#x"の直後に指定する必要があります。
+        SemicolonRequiredInCharRef = 文字参照は';'デリミタで終了する必要があります。
+        InvalidCharRef = 文字参照"&#{0}"は無効なXML文字です。
+        NameRequiredInReference = エンティティ参照では、エンティティ名は'&'の直後に指定する必要があります。
+        SemicolonRequiredInReference = エンティティ"{0}"への参照は'';''デリミタで終了する必要があります。
 # 4.3.1 The Text Declaration
-        TextDeclMustBeFirst = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306F\u3001\u5916\u90E8\u306E\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u5148\u982D\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-        EqRequiredInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001"{0}"\u306E\u5F8C\u306B'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-        QuoteRequiredInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306E"{0}"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306F\u3001\u5F15\u7528\u7B26\u3067\u56F2\u3093\u3060\u6587\u5B57\u5217\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        CloseQuoteMissingInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306E"{0}"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306B\u7D42\u4E86\u5F15\u7528\u7B26\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-        SpaceRequiredBeforeVersionInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        SpaceRequiredBeforeEncodingInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        TextDeclUnterminated = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306F"?>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        EncodingDeclRequired = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306B\u306F\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u5BA3\u8A00\u304C\u5FC5\u8981\u3067\u3059\u3002
-        NoMorePseudoAttributes = \u3053\u308C\u4EE5\u4E0A\u306E\u7591\u4F3C\u5C5E\u6027\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-        MorePseudoAttributes = \u7591\u4F3C\u5C5E\u6027\u304C\u3055\u3089\u306B\u5FC5\u8981\u3067\u3059\u3002
-        PseudoAttrNameExpected = \u7591\u4F3C\u5C5E\u6027\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002 
+        TextDeclMustBeFirst = テキスト宣言は、外部の解析済エンティティの先頭でのみ使用できます。
+        EqRequiredInTextDecl = テキスト宣言では、"{0}"の後に'' = ''文字が必要です。
+        QuoteRequiredInTextDecl = テキスト宣言の"{0}"の後に続く値は、引用符で囲んだ文字列にする必要があります。
+        CloseQuoteMissingInTextDecl = テキスト宣言の"{0}"の後に続く値に終了引用符がありません。
+        SpaceRequiredBeforeVersionInTextDecl = テキスト宣言では、バージョン疑似属性の前に空白が必要です。
+        SpaceRequiredBeforeEncodingInTextDecl = テキスト宣言では、エンコーディング疑似属性の前に空白が必要です。
+        TextDeclUnterminated = テキスト宣言は"?>"で終了する必要があります。
+        EncodingDeclRequired = テキスト宣言にはエンコーディング宣言が必要です。
+        NoMorePseudoAttributes = これ以上の疑似属性は指定できません。
+        MorePseudoAttributes = 疑似属性がさらに必要です。
+        PseudoAttrNameExpected = 疑似属性名が必要です。 
 # 4.3.2 Well-Formed Parsed Entities
-        CommentNotInOneEntity = \u30B3\u30E1\u30F3\u30C8\u306F\u3001\u540C\u3058\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u306B\u5B8C\u5168\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        PINotInOneEntity = \u51E6\u7406\u547D\u4EE4\u306F\u3001\u540C\u3058\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u306B\u5B8C\u5168\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        CommentNotInOneEntity = コメントは、同じ解析済エンティティ内に完全に含まれている必要があります。
+        PINotInOneEntity = 処理命令は、同じ解析済エンティティ内に完全に含まれている必要があります。
 # 4.3.3 Character Encoding in Entities
-        EncodingDeclInvalid = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D"{0}"\u304C\u7121\u52B9\u3067\u3059\u3002
-        EncodingByteOrderUnsupported = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0"{0}"\u306B\u6307\u5B9A\u3055\u308C\u305F\u30D0\u30A4\u30C8\u9806\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        InvalidByte = {1}\u30D0\u30A4\u30C8\u306EUTF-8\u30B7\u30FC\u30B1\u30F3\u30B9\u306E\u30D0\u30A4\u30C8{0}\u304C\u7121\u52B9\u3067\u3059\u3002
-        ExpectedByte = {1}\u30D0\u30A4\u30C8\u306EUTF-8\u30B7\u30FC\u30B1\u30F3\u30B9\u306E\u30D0\u30A4\u30C8{0}\u304C\u5FC5\u8981\u3067\u3059\u3002  
-        InvalidHighSurrogate = UTF-8\u30B7\u30FC\u30B1\u30F3\u30B9\u306E\u4E0A\u4F4D\u30B5\u30ED\u30B2\u30FC\u30C8\u30FB\u30D3\u30C3\u30C8\u306E\u4E0A\u9650\u306F0x10\u3067\u3059\u304C\u30010x{0}\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
-        OperationNotSupported = \u64CD\u4F5C"{0}"\u306F{1}\u30EA\u30FC\u30C0\u30FC\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        InvalidASCII = \u30D0\u30A4\u30C8"{0}"\u306F\u3001(7\u30D3\u30C3\u30C8) ASCII\u6587\u5B57\u30BB\u30C3\u30C8\u306E\u30E1\u30F3\u30D0\u30FC\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        CharConversionFailure = \u7279\u5B9A\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u3042\u308B\u3068\u78BA\u5B9A\u3055\u308C\u305F\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306B\u306F\u3001\u305D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u4E0D\u6B63\u306A\u30B7\u30FC\u30B1\u30F3\u30B9\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
+        EncodingDeclInvalid = エンコーディング名"{0}"が無効です。
+        EncodingByteOrderUnsupported = エンコーディング"{0}"に指定されたバイト順はサポートされていません。
+        InvalidByte = {1}バイトのUTF-8シーケンスのバイト{0}が無効です。
+        ExpectedByte = {1}バイトのUTF-8シーケンスのバイト{0}が必要です。  
+        InvalidHighSurrogate = UTF-8シーケンスの上位サロゲート・ビットの上限は0x10ですが、0x{0}が検出されました。
+        OperationNotSupported = 操作"{0}"は{1}リーダーでサポートされていません。
+        InvalidASCII = バイト"{0}"は、(7ビット) ASCII文字セットのメンバーではありません。
+        CharConversionFailure = 特定のエンコーディングであると確定されたエンティティには、そのエンコーディングで不正なシーケンスを含めることはできません。
 
 # DTD Messages
 # 2.2 Characters
-        InvalidCharInEntityValue = \u30EA\u30C6\u30E9\u30EB\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5024\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        InvalidCharInExternalSubset = DTD\u306E\u5916\u90E8\u30B5\u30D6\u30BB\u30C3\u30C8\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        InvalidCharInIgnoreSect = \u9664\u5916\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        InvalidCharInPublicID = \u516C\u958B\u8B58\u5225\u5B50\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        InvalidCharInSystemID = \u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
+        InvalidCharInEntityValue = リテラル・エンティティ値に無効なXML文字(Unicode: 0x{0})が見つかりました。
+        InvalidCharInExternalSubset = DTDの外部サブセットに無効なXML文字(Unicode: 0x{0})が見つかりました。
+        InvalidCharInIgnoreSect = 除外条件付きセクションに無効なXML文字(Unicode: 0x{0})が見つかりました。
+        InvalidCharInPublicID = 公開識別子に無効なXML文字(Unicode: 0x{0})が見つかりました。
+        InvalidCharInSystemID = システム識別子に無効なXML文字(Unicode: 0x{0})が見つかりました。
 # 2.3 Common Syntactic Constructs
-        SpaceRequiredAfterSYSTEM = DOCTYPE\u5BA3\u8A00\u3067\u306F\u3001\u30AD\u30FC\u30EF\u30FC\u30C9SYSTEM\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        QuoteRequiredInSystemID = \u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u5148\u982D\u306B\u306F\u3001\u4E00\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u307E\u305F\u306F\u4E8C\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-        SystemIDUnterminated = \u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u5F15\u7528\u7B26\u6587\u5B57\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        SpaceRequiredAfterPUBLIC = DOCTYPE\u5BA3\u8A00\u3067\u306F\u3001\u30AD\u30FC\u30EF\u30FC\u30C9PUBLIC\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        QuoteRequiredInPublicID = \u516C\u958B\u8B58\u5225\u5B50\u306E\u5148\u982D\u306B\u306F\u3001\u4E00\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u307E\u305F\u306F\u4E8C\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-        PublicIDUnterminated = \u516C\u958B\u8B58\u5225\u5B50\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u5F15\u7528\u7B26\u6587\u5B57\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        PubidCharIllegal = \u516C\u958B\u8B58\u5225\u5B50\u3067\u306F\u3001\u6587\u5B57(Unicode: 0x{0})\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-        SpaceRequiredBetweenPublicAndSystem = \u516C\u958B\u8B58\u5225\u5B50\u3068\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+        SpaceRequiredAfterSYSTEM = DOCTYPE宣言では、キーワードSYSTEMの後に空白が必要です。
+        QuoteRequiredInSystemID = システム識別子の先頭には、一重引用符文字または二重引用符文字が必要です。
+        SystemIDUnterminated = システム識別子は、対応する引用符文字で終了する必要があります。
+        SpaceRequiredAfterPUBLIC = DOCTYPE宣言では、キーワードPUBLICの後に空白が必要です。
+        QuoteRequiredInPublicID = 公開識別子の先頭には、一重引用符文字または二重引用符文字が必要です。
+        PublicIDUnterminated = 公開識別子は、対応する引用符文字で終了する必要があります。
+        PubidCharIllegal = 公開識別子では、文字(Unicode: 0x{0})は使用できません。
+        SpaceRequiredBetweenPublicAndSystem = 公開識別子とシステム識別子の間には空白が必要です。
 # 2.8 Prolog and Document Type Declaration
-        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001"<!DOCTYPE"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001"<!DOCTYPE"\u306E\u5F8C\u306B\u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-        DoctypedeclUnterminated = \u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        DoctypedeclNotClosed = \u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306F'']''\u3067\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        PEReferenceWithinMarkup = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"%{0};"\u306F\u3001DTD\u306E\u5185\u90E8\u30B5\u30D6\u30BB\u30C3\u30C8\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u5185\u306B\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306B\u542B\u307E\u308C\u308B\u304B\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u304C\u6307\u3057\u3066\u3044\u308B\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u5BA3\u8A00\u306F\u6574\u5F62\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = ドキュメント・タイプ宣言では、"<!DOCTYPE"の後に空白が必要です。
+        MSG_ROOT_ELEMENT_TYPE_REQUIRED = ドキュメント・タイプ宣言では、"<!DOCTYPE"の後にルート要素タイプが必要です。
+        DoctypedeclUnterminated = ルート要素タイプ"{0}"のドキュメント・タイプ宣言は''>''で終了する必要があります。
+        DoctypedeclNotClosed = ルート要素タイプ"{0}"のドキュメント・タイプ宣言は'']''で閉じる必要があります。
+        PEReferenceWithinMarkup = パラメータ・エンティティ参照"%{0};"は、DTDの内部サブセットのマークアップ内には指定できません。
+        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = ドキュメント・タイプ宣言に含まれるか、ドキュメント・タイプ宣言が指しているマークアップ宣言は整形式である必要があります。
 # 2.10 White Space Handling
-        MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space"\u306E\u5C5E\u6027\u5BA3\u8A00\u306F\u3001"default"\u304A\u3088\u3073"preserve"\u306E\u307F\u3092\u4F7F\u7528\u3067\u304D\u308B\u5217\u6319\u30BF\u30A4\u30D7\u3068\u3057\u3066\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space"の属性宣言は、"default"および"preserve"のみを使用できる列挙タイプとして指定する必要があります。
 # 3.2 Element Type Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001"<!ELEMENT"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u306B\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5F8C\u306B\u5236\u7D04\u304C\u5FC5\u8981\u3067\u3059\u3002
-        ElementDeclUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = 要素タイプ宣言では、"<!ELEMENT"の後に空白が必要です。
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = 要素タイプ宣言には要素タイプが必要です。
+        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = 要素タイプ宣言では、要素タイプ"{0}"の後に空白が必要です。
+        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = 要素タイプ宣言では、要素タイプ"{0}"の後に制約が必要です。
+        ElementDeclUnterminated = 要素タイプ"{0}"の宣言は''>''で終了する必要があります。
 # 3.2.1 Element Content
-        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306B\u306F''(''\u6587\u5B57\u307E\u305F\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306B\u306F'')''\u304C\u5FC5\u8981\u3067\u3059\u3002
+        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = 要素タイプ"{0}"の宣言には''(''文字または要素タイプが必要です。
+        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = 要素タイプ"{0}"の宣言には'')''が必要です。
 # 3.2.2 Mixed Content
-        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306B\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306B\u306F'')''\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MixedContentUnterminated = \u5B50\u8981\u7D20\u306E\u30BF\u30A4\u30D7\u304C\u5236\u7D04\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u6DF7\u5408\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB"{0}"\u306F")*"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = 要素タイプ"{0}"の宣言には要素タイプが必要です。
+        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = 要素タイプ"{0}"の宣言には'')''が必要です。
+        MixedContentUnterminated = 子要素のタイプが制約されている場合、混合コンテンツ・モデル"{0}"は")*"で終了する必要があります。
 # 3.3 Attribute-List Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001"<!ATTLIST"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = \u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u306B\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u8981\u7D20"{0}"\u306E\u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u540D\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        AttNameRequiredInAttDef = \u8981\u7D20"{0}"\u306E\u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u306B\u306F\u5C5E\u6027\u540D\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{1}"\u306E\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u30BF\u30A4\u30D7\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        AttTypeRequiredInAttDef = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{1}"\u306E\u5BA3\u8A00\u306B\u306F\u5C5E\u6027\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{1}"\u306E\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u7279\u5B9A\u306E\u8981\u7D20"{0}"\u306E\u540C\u4E00\u5C5E\u6027"{1}"\u306B\u8907\u6570\u306E\u5C5E\u6027\u5B9A\u7FA9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = 属性リスト宣言では、"<!ATTLIST"の後に空白が必要です。
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = 属性リスト宣言には要素タイプが必要です。
+        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = 要素"{0}"の属性リスト宣言では、属性名の前に空白が必要です。
+        AttNameRequiredInAttDef = 要素"{0}"の属性リスト宣言には属性名を指定する必要があります。
+        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = 要素"{0}"の属性"{1}"の宣言では、属性タイプの前に空白が必要です。
+        AttTypeRequiredInAttDef = 要素"{0}"の属性"{1}"の宣言には属性タイプが必要です。
+        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = 要素"{0}"の属性"{1}"の宣言では、属性デフォルトの前に空白が必要です。
+        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = 特定の要素"{0}"の同一属性"{1}"に複数の属性定義が指定されています。
 # 3.3.1 Attribute Types
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = "{1}"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001"NOTATION"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = "{1}"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001"NOTATION"\u306E\u5F8C\u306B''(''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = "{1}"\u5C5E\u6027\u5BA3\u8A00\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306B\u306F\u8868\u8A18\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        NotationTypeUnterminated = "{1}"\u5C5E\u6027\u5BA3\u8A00\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306F'')''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = "{1}"\u5C5E\u6027\u5BA3\u8A00\u306E\u5217\u6319\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306B\u306F\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002
-        EnumerationUnterminated = "{1}"\u5C5E\u6027\u5BA3\u8A00\u306E\u5217\u6319\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306F'')''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{2}"\u306E\u5BA3\u8A00\u3067\u5217\u6319\u5024"{1}"\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u5358\u4E00\u306EEnumeration\u5C5E\u6027\u5BA3\u8A00\u306B\u304A\u3051\u308BNMTOKENS\u306F\u3059\u3079\u3066\u7570\u306A\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{2}"\u306E\u5BA3\u8A00\u3067\u5217\u6319\u5024"{1}"\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u5358\u4E00\u306ENotationType\u5C5E\u6027\u5BA3\u8A00\u306B\u304A\u3051\u308BNOTATION\u306E\u540D\u524D\u306F\u3059\u3079\u3066\u7570\u306A\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = "{1}"属性宣言では、"NOTATION"の後に空白が必要です。
+        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = "{1}"属性宣言では、"NOTATION"の後に''(''文字が必要です。
+        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = "{1}"属性宣言の表記法タイプ・リストには表記名が必要です。
+        NotationTypeUnterminated = "{1}"属性宣言の表記法タイプ・リストは'')''で終了する必要があります。
+        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = "{1}"属性宣言の列挙タイプ・リストには名前トークンが必要です。
+        EnumerationUnterminated = "{1}"属性宣言の列挙タイプ・リストは'')''で終了する必要があります。
+        MSG_DISTINCT_TOKENS_IN_ENUMERATION = 要素"{0}"の属性"{2}"の宣言で列挙値"{1}"が複数回指定されています。単一のEnumeration属性宣言におけるNMTOKENSはすべて異なる必要があります。
+        MSG_DISTINCT_NOTATION_IN_ENUMERATION = 要素"{0}"の属性"{2}"の宣言で列挙値"{1}"が複数回指定されています。単一のNotationType属性宣言におけるNOTATIONの名前はすべて異なる必要があります。
 # 3.3.2 Attribute Defaults
-        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = "{1}"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001"FIXED"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = "{1}"属性宣言では、"FIXED"の後に空白が必要です。
 # 3.4 Conditional Sections
-        IncludeSectUnterminated = \u5305\u542B\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u306F"]]>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        IgnoreSectUnterminated = \u9664\u5916\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u6700\u5F8C\u306F"]]>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        IncludeSectUnterminated = 包含条件付きセクションは"]]>"で終了する必要があります。
+        IgnoreSectUnterminated = 除外条件付きセクションの最後は"]]>"で終了する必要があります。
 # 4.1 Character and Entity References
-        NameRequiredInPEReference = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u3067\u306F\u3001\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D\u306F'%'\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        SemicolonRequiredInPEReference = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"%{0};"\u306F'';''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        NameRequiredInPEReference = パラメータ・エンティティ参照では、エンティティ名は'%'の直後に指定する必要があります。
+        SemicolonRequiredInPEReference = パラメータ・エンティティ参照"%{0};"は'';''デリミタで終了する必要があります。
 # 4.2 Entity Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001"<!ENTITY"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001"<!ENTITY"\u3068'%'\u6587\u5B57\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001'%'\u3068\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u306B\u306F\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D"{0}"\u3068\u5B9A\u7FA9\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u5BA3\u8A00\u3067\u306F\u3001"NDATA"\u3068\u8868\u8A18\u540D\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u5BA3\u8A00\u3067\u306F\u3001"NDATA"\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u5BA3\u8A00\u3067\u306F\u3001"NDATA"\u306E\u5F8C\u306B\u8868\u8A18\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        EntityDeclUnterminated = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-	MSG_DUPLICATE_ENTITY_DEFINITION = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u304C\u8907\u6570\u56DE\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002        
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = エンティティ宣言では、"<!ENTITY"の後に空白が必要です。
+        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = パラメータ・エンティティ宣言では、"<!ENTITY"と'%'文字の間に空白が必要です。
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = パラメータ・エンティティ宣言では、'%'とエンティティ名の間に空白が必要です。
+        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = エンティティ宣言にはエンティティの名前が必要です。
+        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = エンティティ宣言では、エンティティ名"{0}"と定義の間に空白が必要です。
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = エンティティ"{0}"の宣言では、"NDATA"と表記名の間に空白が必要です。
+        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = エンティティ"{0}"の宣言では、"NDATA"の前に空白が必要です。
+        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = エンティティ"{0}"の宣言では、"NDATA"の後に表記名が必要です。
+        EntityDeclUnterminated = エンティティ"{0}"の宣言は''>''で終了する必要があります。
+	MSG_DUPLICATE_ENTITY_DEFINITION = エンティティ"{0}"が複数回宣言されています。        
 # 4.2.2 External Entities
-        ExternalIDRequired = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u306E\u5148\u982D\u306B\u306F"SYSTEM"\u307E\u305F\u306F"PUBLIC"\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = "PUBLIC"\u3068\u516C\u958B\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \u516C\u958B\u8B58\u5225\u5B50\u3068\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = "SYSTEM"\u3068\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_URI_FRAGMENT_IN_SYSTEMID = \u30D5\u30E9\u30B0\u30E1\u30F3\u30C8\u8B58\u5225\u5B50\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50"{0}"\u306E\u4E00\u90E8\u3068\u3057\u3066\u6307\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
+        ExternalIDRequired = 外部エンティティ宣言の先頭には"SYSTEM"または"PUBLIC"が必要です。
+        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = "PUBLIC"と公開識別子の間には空白が必要です。
+        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = 公開識別子とシステム識別子の間には空白が必要です。
+        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = "SYSTEM"とシステム識別子の間には空白が必要です。
+        MSG_URI_FRAGMENT_IN_SYSTEMID = フラグメント識別子は、システム識別子"{0}"の一部として指定しないでください。
 # 4.7 Notation Declarations
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u306F\u3001"<!NOTATION"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u306B\u306F\u8868\u8A18\u306E\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u306F\u3001\u8868\u8A18\u540D"{0}"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-        ExternalIDorPublicIDRequired = \u8868\u8A18\u6CD5"{0}"\u306E\u5BA3\u8A00\u306B\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u307E\u305F\u306F\u516C\u958B\u8B58\u5225\u5B50\u3092\u542B\u3081\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        NotationDeclUnterminated = \u8868\u8A18\u6CD5"{0}"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = 表記法宣言では、"<!NOTATION"の後に空白が必要です。
+        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = 表記法宣言には表記の名前が必要です。
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = 表記法宣言では、表記名"{0}"の後に空白が必要です。
+        ExternalIDorPublicIDRequired = 表記法"{0}"の宣言には、システム識別子または公開識別子を含める必要があります。
+        NotationDeclUnterminated = 表記法"{0}"の宣言は''>''で終了する必要があります。
 
 # Validation messages
-        DuplicateTypeInMixedContent = \u8981\u7D20\u30BF\u30A4\u30D7"{1}"\u306F\u3001\u8981\u7D20\u5BA3\u8A00"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u3067\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        ENTITIESInvalid = \u30BF\u30A4\u30D7ENTITIES\u306E\u5C5E\u6027\u5024"{1}"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        ENTITYInvalid = \u30BF\u30A4\u30D7ENTITY\u306E\u5C5E\u6027\u5024"{1}"\u306F\u3001\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        IDDefaultTypeInvalid = ID\u5C5E\u6027"{0}"\u306B\u306F\u3001"#IMPLIED"\u307E\u305F\u306F"#REQUIRED"\u306E\u5BA3\u8A00\u6E08\u30C7\u30D5\u30A9\u30EB\u30C8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        IDInvalid = \u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024"{0}"\u306F\u3001\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        IDInvalidWithNamespaces = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u3001\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024"{0}"\u306FNCName\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        IDNotUnique = \u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024"{0}"\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u4E00\u610F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        IDREFInvalid = \u30BF\u30A4\u30D7IDREF\u306E\u5C5E\u6027\u5024"{0}"\u306F\u3001\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        IDREFInvalidWithNamespaces = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u3001\u30BF\u30A4\u30D7IDREF\u306E\u5C5E\u6027\u5024"{0}"\u306FNCName\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        IDREFSInvalid = \u30BF\u30A4\u30D7IDREFS\u306E\u5C5E\u6027\u5024"{0}"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u304C\u5B8C\u5168\u306A\u5BA3\u8A00\u3068\u3057\u3066\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        ImproperDeclarationNesting = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        ImproperGroupNesting = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u4E38\u30AB\u30C3\u30B3\u306E\u30DA\u30A2\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        INVALID_PE_IN_CONDITIONAL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u5168\u4F53\u304B\u3001INCLUDE\u307E\u305F\u306FIGNORE\u306E\u307F\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_ATTRIBUTE_NOT_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u5BFE\u3057\u3066\u5C5E\u6027"{1}"\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u5024"{1}"\u3092\u6301\u3064\u5C5E\u6027"{0}"\u306B\u306F\u3001\u30EA\u30B9\u30C8"{2}"\u304B\u3089\u306E\u5024\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5C5E\u6027"{0}"\u306E\u5024"{1}"\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u6B63\u898F\u5316\u306B\u3088\u3063\u3066("{2}"\u306B)\u5909\u66F4\u3055\u308C\u306A\u3044\u3088\u3046\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_CONTENT_INCOMPLETE = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u4E0D\u5B8C\u5168\u3067\u3059\u3002"{1}"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_CONTENT_INVALID = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F"{1}"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_CONTENT_INVALID_SPECIFIED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F"{1}"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7"{2}"\u306E\u5B50\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5C5E\u6027"{1}"\u306F\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u6301\u3061\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_DUPLICATE_ATTDEF = \u5C5E\u6027"{1}"\u306F\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        MSG_ELEMENT_ALREADY_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306F\u8907\u6570\u56DE\u5BA3\u8A00\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
-        MSG_ELEMENT_NOT_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_GRAMMAR_NOT_FOUND = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u7121\u52B9\u3067\u3059: \u69CB\u6587\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-        MSG_ELEMENT_WITH_ID_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u8B58\u5225\u5B50"{0}"\u3092\u6301\u3064\u8981\u7D20\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u3078\u306E\u53C2\u7167\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        MSG_FIXED_ATTVALUE_INVALID = \u5024"{2}"\u3092\u6301\u3064\u5C5E\u6027"{1}"\u306B\u306F\u3001"{3}"\u306E\u5024\u304C\u5FC5\u8981\u3067\u3059\u3002
-        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u306F\u3001\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027"{1}"\u304C\u3059\u3067\u306B\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027"{2}"\u3092\u3082\u30461\u3064\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u306F\u3001\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027"{1}"\u304C\u3059\u3067\u306B\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027"{2}"\u3092\u3082\u30461\u3064\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u5C5E\u6027"{0}"\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u3067\u53C2\u7167\u3055\u308C\u308B\u5834\u5408\u3001\u8868\u8A18\u6CD5"{1}"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = "{0}"\u306E\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u53C2\u7167\u3055\u308C\u308B\u5834\u5408\u3001\u8868\u8A18\u6CD5"{1}"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5916\u90E8\u306E\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u3078\u306E\u53C2\u7167\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u5C5E\u6027"{1}"\u304C\u5FC5\u8981\u3067\u3059\u3002\u3053\u306E\u5C5E\u6027\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u5BFE\u3057\u3066\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u3001\u8981\u7D20\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u6301\u3064\u5916\u90E8\u306E\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u5BA3\u8A00\u3055\u308C\u308B\u8981\u7D20\u9593\u306B\u7A7A\u767D\u306F\u4E0D\u8981\u3067\u3059\u3002
-        NMTOKENInvalid = \u30BF\u30A4\u30D7NMTOKEN\u306E\u5C5E\u6027\u5024"{0}"\u306F\u3001\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        NMTOKENSInvalid = \u30BF\u30A4\u30D7NMTOKENS\u306E\u5C5E\u6027\u5024"{0}"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        NoNotationOnEmptyElement = EMPTY\u3068\u5BA3\u8A00\u3055\u308C\u305F\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u3067\u306F\u3001\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027"{1}"\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093\u3002
-        RootElementTypeMustMatchDoctypedecl = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30EB\u30FC\u30C8\u8981\u7D20"{1}"\u306FDOCTYPE\u30EB\u30FC\u30C8"{0}"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        UndeclaredElementInContentSpec = \u8981\u7D20"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u3067\u672A\u5BA3\u8A00\u306E\u8981\u7D20"{1}"\u304C\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        UniqueNotationName = \u8868\u8A18\u6CD5"{0}"\u306E\u5BA3\u8A00\u304C\u4E00\u610F\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u540C\u3058\u540D\u524D\u3092\u8907\u6570\u306E\u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u5BA3\u8A00\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
-        ENTITYFailedInitializeGrammar =  ENTITYDatatype\u30D0\u30EA\u30C7\u30FC\u30BF: \u6709\u52B9\u306A\u69CB\u6587\u53C2\u7167\u306B\u3088\u308B\u521D\u671F\u5316\u30E1\u30BD\u30C3\u30C9\u306E\u547C\u51FA\u3057\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002 \t
-        ENTITYNotUnparsed = ENTITY "{0}"\u306F\u672A\u89E3\u6790\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        ENTITYNotValid = ENTITY "{0}"\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        EmptyList = \u30BF\u30A4\u30D7ENTITIES\u3001IDREFS\u304A\u3088\u3073NMTOKENS\u306E\u5024\u306F\u7A7A\u306E\u30EA\u30B9\u30C8\u306B\u3067\u304D\u307E\u305B\u3093\u3002
+        DuplicateTypeInMixedContent = 要素タイプ"{1}"は、要素宣言"{0}"のコンテンツ・モデルですでに指定されています。
+        ENTITIESInvalid = タイプENTITIESの属性値"{1}"は、1つ以上の未解析エンティティの名前にする必要があります。
+        ENTITYInvalid = タイプENTITYの属性値"{1}"は、未解析エンティティの名前にする必要があります。
+        IDDefaultTypeInvalid = ID属性"{0}"には、"#IMPLIED"または"#REQUIRED"の宣言済デフォルトが含まれている必要があります。
+        IDInvalid = タイプIDの属性値"{0}"は、名前にする必要があります。
+        IDInvalidWithNamespaces = ネームスペースが有効になっている場合、タイプIDの属性値"{0}"はNCNameにする必要があります。
+        IDNotUnique = タイプIDの属性値"{0}"は、ドキュメント内で一意である必要があります。
+        IDREFInvalid = タイプIDREFの属性値"{0}"は、名前にする必要があります。
+        IDREFInvalidWithNamespaces = ネームスペースが有効になっている場合、タイプIDREFの属性値"{0}"はNCNameにする必要があります。
+        IDREFSInvalid = タイプIDREFSの属性値"{0}"は、1つ以上の名前にする必要があります。
+        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = エンティティ参照が完全な宣言として使用されている場合、パラメータ・エンティティ"{0}"の置換テキストには、適切にネストされた宣言が含まれている必要があります。
+        ImproperDeclarationNesting = パラメータ・エンティティ"{0}"の置換テキストには、適切にネストされた宣言が含まれている必要があります。
+        ImproperGroupNesting = パラメータ・エンティティ"{0}"の置換テキストには、適切にネストされた丸カッコのペアが含まれている必要があります。
+        INVALID_PE_IN_CONDITIONAL = パラメータ・エンティティ"{0}"の置換テキストには、条件付きセクション全体か、INCLUDEまたはIGNOREのみが含まれている必要があります。
+        MSG_ATTRIBUTE_NOT_DECLARED = 要素タイプ"{0}"に対して属性"{1}"が宣言されている必要があります。
+        MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = 値"{1}"を持つ属性"{0}"には、リスト"{2}"からの値が必要です。
+        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = 属性"{0}"の値"{1}"は、スタンドアロン・ドキュメントで正規化によって("{2}"に)変更されないようにする必要があります。
+        MSG_CONTENT_INCOMPLETE = 要素タイプ"{0}"のコンテンツが不完全です。"{1}"と一致する必要があります。
+        MSG_CONTENT_INVALID = 要素タイプ"{0}"のコンテンツは"{1}"と一致する必要があります。
+        MSG_CONTENT_INVALID_SPECIFIED = 要素タイプ"{0}"のコンテンツは"{1}"と一致する必要があります。タイプ"{2}"の子は許可されていません。
+        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = 要素タイプ"{0}"の属性"{1}"は、デフォルト値を持ち、スタンドアロン・ドキュメントで指定する必要があります。
+        MSG_DUPLICATE_ATTDEF = 属性"{1}"は要素タイプ"{0}"に対してすでに宣言されています。
+        MSG_ELEMENT_ALREADY_DECLARED = 要素タイプ"{0}"は複数回宣言しないでください。
+        MSG_ELEMENT_NOT_DECLARED = 要素タイプ"{0}"を宣言する必要があります。
+        MSG_GRAMMAR_NOT_FOUND = ドキュメントが無効です: 構文が見つかりません。
+        MSG_ELEMENT_WITH_ID_REQUIRED = ドキュメントには識別子"{0}"を持つ要素が必要です。
+        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = 外部エンティティ"{0}"への参照は、スタンドアロン・ドキュメントでは許可されていません。
+        MSG_FIXED_ATTVALUE_INVALID = 値"{2}"を持つ属性"{1}"には、"{3}"の値が必要です。
+        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = 要素タイプ"{0}"には、タイプIDの属性"{1}"がすでにあります。タイプIDの属性"{2}"をもう1つ指定することはできません。
+        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = 要素タイプ"{0}"には、タイプNOTATIONの属性"{1}"がすでにあります。タイプNOTATIONの属性"{2}"をもう1つ指定することはできません。
+        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = 属性"{0}"の表記法タイプ・リストで参照される場合、表記法"{1}"を宣言する必要があります。
+        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = "{0}"の未解析エンティティ宣言で参照される場合、表記法"{1}"を宣言する必要があります。
+        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = 外部の解析済エンティティで宣言されているエンティティ"{0}"への参照は、スタンドアロン・ドキュメントでは許可されていません。
+        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = 属性"{1}"が必要です。この属性は、要素タイプ"{0}"に対して指定する必要があります。
+        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = スタンドアロン・ドキュメントでは、要素コンテンツを持つ外部の解析済エンティティで宣言される要素間に空白は不要です。
+        NMTOKENInvalid = タイプNMTOKENの属性値"{0}"は、名前トークンにする必要があります。
+        NMTOKENSInvalid = タイプNMTOKENSの属性値"{0}"は、1つ以上の名前トークンにする必要があります。
+        NoNotationOnEmptyElement = EMPTYと宣言された要素タイプ"{0}"では、タイプNOTATIONの属性"{1}"を宣言できません。
+        RootElementTypeMustMatchDoctypedecl = ドキュメント・ルート要素"{1}"はDOCTYPEルート"{0}"と一致する必要があります。
+        UndeclaredElementInContentSpec = 要素"{0}"のコンテンツ・モデルで未宣言の要素"{1}"が参照されています。
+        UniqueNotationName = 表記法"{0}"の宣言が一意ではありません。同じ名前を複数の表記法宣言で宣言しないでください。
+        ENTITYFailedInitializeGrammar =  ENTITYDatatypeバリデータ: 有効な構文参照による初期化メソッドの呼出しに失敗しました。 \t
+        ENTITYNotUnparsed = ENTITY "{0}"は未解析ではありません。
+        ENTITYNotValid = ENTITY "{0}"は有効ではありません。
+        EmptyList = タイプENTITIES、IDREFSおよびNMTOKENSの値は空のリストにできません。
 
 # Entity related messages
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ReferenceToExternalEntity = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"&{0};"\u306F\u3001\u5C5E\u6027\u5024\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        AccessExternalDTD = \u5916\u90E8DTD: accessExternalDTD\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650\u306B\u3088\u308A''{1}''\u30A2\u30AF\u30BB\u30B9\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u5916\u90E8DTD ''{0}''\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
-        AccessExternalEntity = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3: accessExternalDTD\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650\u306B\u3088\u308A''{1}''\u30A2\u30AF\u30BB\u30B9\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u5916\u90E8\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
+        ReferenceToExternalEntity = 外部エンティティ参照"&{0};"は、属性値では許可されていません。
+        AccessExternalDTD = 外部DTD: accessExternalDTDプロパティで設定された制限により''{1}''アクセスが許可されていないため、外部DTD ''{0}''の読取りに失敗しました。
+        AccessExternalEntity = 外部エンティティ: accessExternalDTDプロパティで設定された制限により''{1}''アクセスが許可されていないため、外部ドキュメント''{0}''の読取りに失敗しました。
 
 # 4.1 Character and Entity References
-        EntityNotDeclared = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u304C\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        ReferenceToUnparsedEntity = \u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"&{0};"\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        RecursiveReference = \u518D\u5E30\u7684\u306A\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"{0}"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
-        RecursiveGeneralReference = \u518D\u5E30\u7684\u306A\u4E00\u822C\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"&{0};"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
-        RecursivePEReference = \u518D\u5E30\u7684\u306A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"%{0};"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
+        EntityNotDeclared = エンティティ"{0}"が参照されていますが、宣言されていません。
+        ReferenceToUnparsedEntity = 未解析エンティティ参照"&{0};"は許可されていません。
+        RecursiveReference = 再帰的なエンティティ参照"{0}"です。(参照パス: {1})、
+        RecursiveGeneralReference = 再帰的な一般エンティティ参照"&{0};"です。(参照パス: {1})、
+        RecursivePEReference = 再帰的なパラメータ・エンティティ参照"%{0};"です。(参照パス: {1})、
 # 4.3.3 Character Encoding in Entities
-        EncodingNotSupported = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0"{0}"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        EncodingRequired = \u30A8\u30F3\u30B3\u30FC\u30C9\u304CUTF-8\u3068UTF-16\u306E\u3044\u305A\u308C\u3067\u3082\u306A\u3044\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306B\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        EncodingNotSupported = エンコーディング"{0}"はサポートされていません。
+        EncodingRequired = エンコードがUTF-8とUTF-16のいずれでもない解析済エンティティには、エンコーディング宣言が含まれている必要があります。
 
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = \u8981\u7D20\u307E\u305F\u306F\u5C5E\u6027"{0}"\u304CQName\u751F\u6210\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093: QName::=(NCName'':'')?NCName\u3002
-        ElementXMLNSPrefix = \u8981\u7D20"{0}"\u306E\u63A5\u982D\u8F9E\u3068\u3057\u3066"xmlns"\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-        ElementPrefixUnbound = \u8981\u7D20"{1}"\u306E\u63A5\u982D\u8F9E"{0}"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        AttributePrefixUnbound = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306E\u63A5\u982D\u8F9E"{2}"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        EmptyPrefixedAttName = \u5C5E\u6027"{0}"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059\u3002\u63A5\u982D\u8F9E\u306E\u4ED8\u3044\u305F\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u30FB\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u306F\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-        PrefixDeclared = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306E\u63A5\u982D\u8F9E"{0}"\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        CantBindXMLNS = \u63A5\u982D\u8F9E"xmlns"\u306F\u3001\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u660E\u793A\u7684\u306B\u30D0\u30A4\u30F3\u30C9\u3067\u304D\u307E\u305B\u3093\u3002\u307E\u305F\u3001"xmlns"\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3082\u3001\u63A5\u982D\u8F9E\u306B\u660E\u793A\u7684\u306B\u30D0\u30A4\u30F3\u30C9\u3067\u304D\u307E\u305B\u3093\u3002
-        CantBindXML = \u63A5\u982D\u8F9E"xml"\u306F\u3001\u901A\u5E38\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u4EE5\u5916\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u30D0\u30A4\u30F3\u30C9\u3067\u304D\u307E\u305B\u3093\u3002\u307E\u305F\u3001"xml"\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3082\u3001"xml"\u4EE5\u5916\u306E\u63A5\u982D\u8F9E\u306B\u30D0\u30A4\u30F3\u30C9\u3067\u304D\u307E\u305B\u3093\u3002
-        MSG_ATT_DEFAULT_INVALID = \u5C5E\u6027"{0}"\u306EdefaultValue "{1}"\u306F\u3001\u3053\u306E\u5C5E\u6027\u30BF\u30A4\u30D7\u306E\u5B57\u53E5\u5236\u7D04\u306B\u95A2\u3057\u3066\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+        IllegalQName = 要素または属性"{0}"がQName生成と一致しません: QName::=(NCName'':'')?NCName。
+        ElementXMLNSPrefix = 要素"{0}"の接頭辞として"xmlns"は指定できません。
+        ElementPrefixUnbound = 要素"{1}"の接頭辞"{0}"がバインドされていません。
+        AttributePrefixUnbound = 要素タイプ"{0}"に関連付けられている属性"{1}"の接頭辞"{2}"がバインドされていません。
+        EmptyPrefixedAttName = 属性"{0}"の値が無効です。接頭辞の付いたネームスペース・バインディングは空にできません。
+        PrefixDeclared = ネームスペースの接頭辞"{0}"が宣言されていません。
+        CantBindXMLNS = 接頭辞"xmlns"は、ネームスペースに明示的にバインドできません。また、"xmlns"のネームスペースも、接頭辞に明示的にバインドできません。
+        CantBindXML = 接頭辞"xml"は、通常のネームスペース以外のネームスペースにバインドできません。また、"xml"のネームスペースも、"xml"以外の接頭辞にバインドできません。
+        MSG_ATT_DEFAULT_INVALID = 属性"{0}"のdefaultValue "{1}"は、この属性タイプの字句制約に関して有効ではありません。
 
 # REVISIT: These need messages
         MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
@@ -312,14 +312,14 @@
 
 
 # Implementation limits
-        EntityExpansionLimit=JAXP00010001: \u30D1\u30FC\u30B5\u30FC\u306B\u3088\u3063\u3066\u3001\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067"{0}"\u3092\u8D85\u3048\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u62E1\u5F35\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u3053\u308C\u306F\u3001JDK\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
-        ElementAttributeLimit=JAXP00010002: \u8981\u7D20"{0}"\u306B"{1}"\u3092\u8D85\u3048\u308B\u5C5E\u6027\u304C\u5B58\u5728\u3057\u307E\u3059\u3002"{1}"\u306F\u3001JDK\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
-        MaxEntitySizeLimit=JAXP00010003: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u9577\u3055\u306F"{1}"\u3067\u3001"{3}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{2}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
-        TotalEntitySizeLimit=JAXP00010004: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u7D2F\u7A4D\u30B5\u30A4\u30BA"{0}"\u306F\u3001"{2}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{1}"\u3092\u8D85\u3048\u307E\u3057\u305F\u3002
-        MaxXMLNameLimit=JAXP00010005: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u9577\u3055\u306F"{1}"\u3067\u3001"{3}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{2}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
-        MaxElementDepthLimit=JAXP00010006: \u8981\u7D20"{0}"\u306E\u6DF1\u3055\u306F"{1}"\u3067\u3001"{3}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{2}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
-        EntityReplacementLimit=JAXP00010007: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u306E\u5408\u8A08\u30CE\u30FC\u30C9\u6570\u306F"{0}"\u3067\u3001"{2}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{1}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
+        EntityExpansionLimit=JAXP00010001: パーサーによって、このドキュメント内で"{0}"を超えるエンティティ拡張が検出されました。これは、JDKによる制限です。
+        ElementAttributeLimit=JAXP00010002: 要素"{0}"に"{1}"を超える属性が存在します。"{1}"は、JDKによる制限です。
+        MaxEntitySizeLimit=JAXP00010003: エンティティ"{0}"の長さは"{1}"で、"{3}"で設定された制限"{2}"を超えています。
+        TotalEntitySizeLimit=JAXP00010004: エンティティの累積サイズ"{0}"は、"{2}"で設定された制限"{1}"を超えました。
+        MaxXMLNameLimit=JAXP00010005: エンティティ"{0}"の長さは"{1}"で、"{3}"で設定された制限"{2}"を超えています。
+        MaxElementDepthLimit=JAXP00010006: 要素"{0}"の深さは"{1}"で、"{3}"で設定された制限"{2}"を超えています。
+        EntityReplacementLimit=JAXP00010007: エンティティ参照の合計ノード数は"{0}"で、"{2}"で設定された制限"{1}"を超えています。
 
 # Catalog 09
 # Technical term, do not translate: catalog
-        CatalogException=JAXP00090001: CatalogResolver\u306F\u30AB\u30BF\u30ED\u30B0"{0}"\u3067\u6709\u52B9\u3067\u3059\u304C\u3001CatalogException\u304C\u8FD4\u3055\u308C\u307E\u3059\u3002
+        CatalogException=JAXP00090001: CatalogResolverはカタログ"{0}"で有効ですが、CatalogExceptionが返されます。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
index cfff6fb1aed..4dbf9a5fb29 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
@@ -3,290 +3,290 @@
 #
 # @version
 
-        BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n  
+        BadMessageKey = 메시지 키에 해당하는 오류 메시지를 찾을 수 없습니다.
+        FormatFailed = 다음 메시지의 형식을 지정하는 중 내부 오류가 발생했습니다.\n  
 
 # Document messages
-        PrematureEOF=\uC608\uAE30\uCE58 \uC54A\uC740 \uD30C\uC77C\uC758 \uB05D\uC785\uB2C8\uB2E4.
+        PrematureEOF=예기치 않은 파일의 끝입니다.
 # 2.1 Well-Formed XML Documents
-        RootElementRequired = \uC62C\uBC14\uB978 \uD615\uC2DD\uC758 \uBB38\uC11C\uC5D0\uB294 \uB8E8\uD2B8 \uC694\uC18C\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
+        RootElementRequired = 올바른 형식의 문서에는 루트 요소가 필요합니다.
 # 2.2 Characters
 
-        InvalidCharInCDSect = CDATA \uC139\uC158\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        InvalidCharInContent = \uBB38\uC11C\uC758 \uC694\uC18C \uCF58\uD150\uCE20\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        TwoColonsInQName = \uC694\uC18C \uC720\uD615 \uB610\uB294 \uC18D\uC131 \uC774\uB984\uC5D0\uC11C \uBD80\uC801\uD569\uD55C \uB450\uBC88\uC9F8 ':'\uC774 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        ColonNotLegalWithNS = \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 ''{0}'' \uC774\uB984\uC5D0\uC11C\uB294 \uCF5C\uB860\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        InvalidCharInMisc = \uC694\uC18C \uCF58\uD150\uCE20 \uB05D\uAE4C\uC9C0 \uC77D\uC740 \uD6C4 \uB9C8\uD06C\uC5C5\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        InvalidCharInProlog = \uBB38\uC11C\uC758 \uD504\uB864\uB85C\uADF8\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        InvalidCharInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+        InvalidCharInCDSect = CDATA 섹션에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
+        InvalidCharInContent = 문서의 요소 콘텐츠에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
+        TwoColonsInQName = 요소 유형 또는 속성 이름에서 부적합한 두번째 ':'이 발견되었습니다.
+        ColonNotLegalWithNS = 네임스페이스가 사용으로 설정된 경우 ''{0}'' 이름에서는 콜론이 허용되지 않습니다.
+        InvalidCharInMisc = 요소 콘텐츠 끝까지 읽은 후 마크업에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
+        InvalidCharInProlog = 문서의 프롤로그에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
+        InvalidCharInXMLDecl = XML 선언에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
 # 2.4 Character Data and Markup
-        CDEndInContent = \uBB38\uC790 \uC2DC\uD000\uC2A4 "]]>"\uB294 CDATA \uC139\uC158 \uB05D\uC744 \uD45C\uC2DC\uD558\uB294 \uB370 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uB294 \uACBD\uC6B0 \uCF58\uD150\uCE20\uC5D0 \uB098\uD0C0\uB098\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
+        CDEndInContent = 문자 시퀀스 "]]>"는 CDATA 섹션 끝을 표시하는 데 사용되지 않는 경우 콘텐츠에 나타나지 않아야 합니다.
 # 2.7 CDATA Sections
-        CDSectUnterminated = CDATA \uC139\uC158\uC740 "]]>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+        CDSectUnterminated = CDATA 섹션은 "]]>"로 끝나야 합니다.
 # 2.8 Prolog and Document Type Declaration
-        XMLDeclMustBeFirst = XML \uC120\uC5B8\uC740 \uBB38\uC11C \uB9E8 \uC55E\uC5D0\uB9CC \uB098\uD0C0\uB0A0 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
-        EqRequiredInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 "{0}" \uB2E4\uC74C\uC5D0 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-        QuoteRequiredInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C "{0}" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC740 \uB530\uC634\uD45C\uAC00 \uBD99\uC740 \uBB38\uC790\uC5F4\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        XMLDeclUnterminated = XML \uC120\uC5B8\uC740 "?>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        VersionInfoRequired = XML \uC120\uC5B8\uC5D0\uB294 \uBC84\uC804\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        SpaceRequiredBeforeVersionInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 \uBC84\uC804 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        SpaceRequiredBeforeEncodingInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 \uC778\uCF54\uB529 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        SpaceRequiredBeforeStandalone = XML \uC120\uC5B8\uC5D0\uC11C\uB294 \uC778\uCF54\uB529 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MarkupNotRecognizedInProlog = \uBB38\uC11C\uC5D0\uC11C \uB8E8\uD2B8 \uC694\uC18C \uC55E\uC5D0 \uC624\uB294 \uB9C8\uD06C\uC5C5\uC740 \uC62C\uBC14\uB978 \uD615\uC2DD\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        MarkupNotRecognizedInMisc = \uBB38\uC11C\uC5D0\uC11C \uB8E8\uD2B8 \uC694\uC18C \uB2E4\uC74C\uC5D0 \uC624\uB294 \uB9C8\uD06C\uC5C5\uC740 \uC62C\uBC14\uB978 \uD615\uC2DD\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        AlreadySeenDoctype = doctype\uC774 \uC774\uBBF8 \uD45C\uC2DC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        DoctypeNotAllowed = DOCTYPE\uC740 "http://apache.org/xml/features/disallow-doctype-decl" \uAE30\uB2A5\uC774 true\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        ContentIllegalInProlog = \uD504\uB864\uB85C\uADF8\uC5D0\uC11C\uB294 \uCF58\uD150\uCE20\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        ReferenceIllegalInProlog = \uD504\uB864\uB85C\uADF8\uC5D0\uC11C\uB294 \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+        XMLDeclMustBeFirst = XML 선언은 문서 맨 앞에만 나타날 수 있습니다.
+        EqRequiredInXMLDecl = XML 선언에서는 "{0}" 다음에 '' = '' 문자가 와야 합니다.
+        QuoteRequiredInXMLDecl = XML 선언에서 "{0}" 다음에 오는 값은 따옴표가 붙은 문자열이어야 합니다.
+        XMLDeclUnterminated = XML 선언은 "?>"로 끝나야 합니다.
+        VersionInfoRequired = XML 선언에는 버전이 필요합니다.
+        SpaceRequiredBeforeVersionInXMLDecl = XML 선언에서는 버전 의사 속성 앞에 공백이 필요합니다.
+        SpaceRequiredBeforeEncodingInXMLDecl = XML 선언에서는 인코딩 의사 속성 앞에 공백이 필요합니다.
+        SpaceRequiredBeforeStandalone = XML 선언에서는 인코딩 의사 속성 앞에 공백이 필요합니다.
+        MarkupNotRecognizedInProlog = 문서에서 루트 요소 앞에 오는 마크업은 올바른 형식이어야 합니다.
+        MarkupNotRecognizedInMisc = 문서에서 루트 요소 다음에 오는 마크업은 올바른 형식이어야 합니다.
+        AlreadySeenDoctype = doctype이 이미 표시되었습니다.
+        DoctypeNotAllowed = DOCTYPE은 "http://apache.org/xml/features/disallow-doctype-decl" 기능이 true로 설정된 경우 허용되지 않습니다.
+        ContentIllegalInProlog = 프롤로그에서는 콘텐츠가 허용되지 않습니다.
+        ReferenceIllegalInProlog = 프롤로그에서는 참조가 허용되지 않습니다.
 # Trailing Misc
-        ContentIllegalInTrailingMisc=\uD6C4\uD589 \uC139\uC158\uC5D0\uC11C\uB294 \uCF58\uD150\uCE20\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        ReferenceIllegalInTrailingMisc=\uD6C4\uD589 \uC139\uC158\uC5D0\uC11C\uB294 \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+        ContentIllegalInTrailingMisc=후행 섹션에서는 콘텐츠가 허용되지 않습니다.
+        ReferenceIllegalInTrailingMisc=후행 섹션에서는 참조가 허용되지 않습니다.
 
 # 2.9 Standalone Document Declaration
-        SDDeclInvalid = \uB3C5\uB9BD\uD615 \uBB38\uC11C \uC120\uC5B8 \uAC12\uC740 "{0}"\uC774(\uAC00) \uC544\uB2CC "yes" \uB610\uB294 "no"\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-        SDDeclNameInvalid = XML \uC120\uC5B8\uC758 \uB3C5\uB9BD\uD615 \uC774\uB984\uC758 \uCCA0\uC790\uAC00 \uC798\uBABB\uB418\uC5C8\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
+        SDDeclInvalid = 독립형 문서 선언 값은 "{0}"이(가) 아닌 "yes" 또는 "no"여야 합니다.
+        SDDeclNameInvalid = XML 선언의 독립형 이름의 철자가 잘못되었을 수 있습니다.
 # 2.12 Language Identification
-        XMLLangInvalid = xml:lang \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uC5B8\uC5B4 \uC2DD\uBCC4\uC790\uC785\uB2C8\uB2E4.
+        XMLLangInvalid = xml:lang 속성값 "{0}"은(는) 부적합한 언어 식별자입니다.
 # 3. Logical Structures
-        ETagRequired = \uC694\uC18C \uC720\uD615 "{0}"\uC740(\uB294) \uC9DD\uC774 \uB9DE\uB294 \uC885\uB8CC \uD0DC\uADF8 "</{0}>"(\uC73C)\uB85C \uC885\uB8CC\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+        ETagRequired = 요소 유형 "{0}"은(는) 짝이 맞는 종료 태그 "</{0}>"(으)로 종료되어야 합니다.
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ElementUnterminated = \uC694\uC18C \uC720\uD615 "{0}" \uB2E4\uC74C\uC5D0\uB294 \uC18D\uC131 \uC0AC\uC591 ">" \uB610\uB294 "/>"\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-        EqRequiredInAttribute = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C \uC18D\uC131 \uC774\uB984 "{1}" \uB2E4\uC74C\uC5D0\uB294 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-        OpenQuoteExpected = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C "{1}" \uC18D\uC131\uC5D0\uB294 \uC5EC\uB294 \uB530\uC634\uD45C\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-        CloseQuoteExpected = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C "{1}" \uC18D\uC131\uC5D0\uB294 \uB2EB\uB294 \uB530\uC634\uD45C\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-        AttributeNotUnique = "{1}" \uC18D\uC131\uC774 "{0}" \uC694\uC18C\uC5D0 \uB300\uD574 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        AttributeNSNotUnique = "{2}" \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uB41C "{1}" \uC18D\uC131\uC774 "{0}" \uC694\uC18C\uC5D0 \uB300\uD574 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        ETagUnterminated = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uC885\uB8CC \uD0DC\uADF8\uB294 ''>'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        MarkupNotRecognizedInContent = \uC694\uC18C \uCF58\uD150\uCE20\uB294 \uC62C\uBC14\uB978 \uD615\uC2DD\uC758 \uBB38\uC790 \uB370\uC774\uD130 \uB610\uB294 \uB9C8\uD06C\uC5C5\uC73C\uB85C \uAD6C\uC131\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        DoctypeIllegalInContent = \uCF58\uD150\uCE20\uC5D0\uC11C\uB294 DOCTYPE\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+        ElementUnterminated = 요소 유형 "{0}" 다음에는 속성 사양 ">" 또는 "/>"가 와야 합니다.
+        EqRequiredInAttribute = 요소 유형 "{0}"과(와) 연관된 속성 이름 "{1}" 다음에는 '' = '' 문자가 와야 합니다.
+        OpenQuoteExpected = 요소 유형 "{0}"과(와) 연관된 "{1}" 속성에는 여는 따옴표가 필요합니다.
+        CloseQuoteExpected = 요소 유형 "{0}"과(와) 연관된 "{1}" 속성에는 닫는 따옴표가 필요합니다.
+        AttributeNotUnique = "{1}" 속성이 "{0}" 요소에 대해 이미 지정되었습니다.
+        AttributeNSNotUnique = "{2}" 네임스페이스에 바인드된 "{1}" 속성이 "{0}" 요소에 대해 이미 지정되었습니다.
+        ETagUnterminated = 요소 유형 "{0}"에 대한 종료 태그는 ''>'' 구분자로 끝나야 합니다.
+        MarkupNotRecognizedInContent = 요소 콘텐츠는 올바른 형식의 문자 데이터 또는 마크업으로 구성되어야 합니다.
+        DoctypeIllegalInContent = 콘텐츠에서는 DOCTYPE이 허용되지 않습니다.
 # 4.1 Character and Entity References
-        ReferenceUnterminated = \uCC38\uC870\uB294 ';' \uAD6C\uBD84\uC790\uB85C \uC885\uB8CC\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+        ReferenceUnterminated = 참조는 ';' 구분자로 종료되어야 합니다.
 # 4.3.2 Well-Formed Parsed Entities
-        ReferenceNotInOneEntity = \uCC38\uC870\uB294 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0 \uC644\uC804\uD788 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        ElementEntityMismatch = "{0}" \uC694\uC18C\uB294 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC2DC\uC791\uB418\uACE0 \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        MarkupEntityMismatch=XML \uBB38\uC11C \uAD6C\uC870\uB294 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC2DC\uC791\uB418\uACE0 \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+        ReferenceNotInOneEntity = 참조는 구문이 분석된 동일한 엔티티에 완전히 포함되어야 합니다.
+        ElementEntityMismatch = "{0}" 요소는 동일한 엔티티에서 시작되고 끝나야 합니다.
+        MarkupEntityMismatch=XML 문서 구조는 동일한 엔티티에서 시작되고 끝나야 합니다.
 
 # Messages common to Document and DTD
 # 2.2 Characters
-        InvalidCharInAttValue = "{1}" \uC18D\uC131\uC758 \uAC12\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{2})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC73C\uBA70 \uC694\uC18C\uAC00 "{0}"\uC785\uB2C8\uB2E4.
-        InvalidCharInComment = \uC8FC\uC11D\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        InvalidCharInPI = \uCC98\uB9AC \uBA85\uB839\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        InvalidCharInInternalSubset = DTD\uC758 \uB0B4\uBD80 \uBD80\uBD84 \uC9D1\uD569\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        InvalidCharInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+        InvalidCharInAttValue = "{1}" 속성의 값에서 부적합한 XML 문자(유니코드: 0x{2})가 발견되었으며 요소가 "{0}"입니다.
+        InvalidCharInComment = 주석에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
+        InvalidCharInPI = 처리 명령에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
+        InvalidCharInInternalSubset = DTD의 내부 부분 집합에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
+        InvalidCharInTextDecl = 텍스트 선언에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
 # 2.3 Common Syntactic Constructs
-        QuoteRequiredInAttValue = "{1}" \uC18D\uC131\uC758 \uAC12\uC740 \uC791\uC740 \uB530\uC634\uD45C \uB610\uB294 \uD070 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
-        LessthanInAttValue = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C "{1}" \uC18D\uC131\uC758 \uAC12\uC5D0\uB294 ''<'' \uBB38\uC790\uAC00 \uD3EC\uD568\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-        AttributeValueUnterminated = "{1}" \uC18D\uC131\uC758 \uAC12\uC740 \uC9DD\uC774 \uB9DE\uB294 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+        QuoteRequiredInAttValue = "{1}" 속성의 값은 작은 따옴표 또는 큰 따옴표 문자로 시작해야 합니다.
+        LessthanInAttValue = 요소 유형 "{0}"과(와) 연관된 "{1}" 속성의 값에는 ''<'' 문자가 포함되지 않아야 합니다.
+        AttributeValueUnterminated = "{1}" 속성의 값은 짝이 맞는 따옴표 문자로 끝나야 합니다.
 # 2.5 Comments
-        InvalidCommentStart = \uC8FC\uC11D\uC740 "<!--"\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
-        DashDashInComment = \uC8FC\uC11D\uC5D0\uC11C\uB294 "--" \uBB38\uC790\uC5F4\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        CommentUnterminated = \uC8FC\uC11D\uC740 "-->"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        COMMENT_NOT_IN_ONE_ENTITY = \uC8FC\uC11D\uC774 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0 \uC548\uC5D0 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+        InvalidCommentStart = 주석은 "<!--"로 시작해야 합니다.
+        DashDashInComment = 주석에서는 "--" 문자열이 허용되지 않습니다.
+        CommentUnterminated = 주석은 "-->"로 끝나야 합니다.
+        COMMENT_NOT_IN_ONE_ENTITY = 주석이 동일한 엔티티 안에 있지 않습니다.
 # 2.6 Processing Instructions
-        PITargetRequired = \uCC98\uB9AC \uBA85\uB839\uC740 \uB300\uC0C1 \uC774\uB984\uC73C\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
-        SpaceRequiredInPI = \uCC98\uB9AC \uBA85\uB839 \uB300\uC0C1\uACFC \uB370\uC774\uD130 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        PIUnterminated = \uCC98\uB9AC \uBA85\uB839\uC740 "?>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        ReservedPITarget = "[xX][mM][lL]"\uACFC \uC77C\uCE58\uD558\uB294 \uCC98\uB9AC \uBA85\uB839 \uB300\uC0C1\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        PI_NOT_IN_ONE_ENTITY = \uCC98\uB9AC \uBA85\uB839\uC774 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0 \uC548\uC5D0 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+        PITargetRequired = 처리 명령은 대상 이름으로 시작해야 합니다.
+        SpaceRequiredInPI = 처리 명령 대상과 데이터 사이에는 공백이 필요합니다.
+        PIUnterminated = 처리 명령은 "?>"로 끝나야 합니다.
+        ReservedPITarget = "[xX][mM][lL]"과 일치하는 처리 명령 대상은 허용되지 않습니다.
+        PI_NOT_IN_ONE_ENTITY = 처리 명령이 동일한 엔티티 안에 있지 않습니다.
 # 2.8 Prolog and Document Type Declaration
-        VersionInfoInvalid = "{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uBC84\uC804\uC785\uB2C8\uB2E4.
-        VersionNotSupported = XML \uBC84\uC804 "{0}"\uC740(\uB294) \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XML 1.0\uB9CC \uC9C0\uC6D0\uB429\uB2C8\uB2E4.
-        VersionNotSupported11 = XML \uBC84\uC804 "{0}"\uC740(\uB294) \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XML 1.0 \uBC0F XML 1.1\uB9CC \uC9C0\uC6D0\uB429\uB2C8\uB2E4.
-        VersionMismatch= \uD558\uB098\uC758 \uC5D4\uD2F0\uD2F0\uC5D0\uB294 \uC774\uD6C4 \uBC84\uC804\uC758 \uB2E4\uB978 \uC5D4\uD2F0\uD2F0\uAC00 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+        VersionInfoInvalid = "{0}"은(는) 부적합한 버전입니다.
+        VersionNotSupported = XML 버전 "{0}"은(는) 지원되지 않습니다. XML 1.0만 지원됩니다.
+        VersionNotSupported11 = XML 버전 "{0}"은(는) 지원되지 않습니다. XML 1.0 및 XML 1.1만 지원됩니다.
+        VersionMismatch= 하나의 엔티티에는 이후 버전의 다른 엔티티가 포함될 수 없습니다.
 # 4.1 Character and Entity References
-        DigitRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uC5D0\uC11C\uB294 "&#" \uBC14\uB85C \uB2E4\uC74C\uC5D0 \uC2ED\uC9C4\uC218 \uD45C\uD604\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
-        HexdigitRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uC5D0\uC11C\uB294 "&#x" \uBC14\uB85C \uB2E4\uC74C\uC5D0 16\uC9C4\uC218 \uD45C\uD604\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
-        SemicolonRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uB294 ';' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        InvalidCharRef = \uBB38\uC790 \uCC38\uC870 "&#{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C XML \uBB38\uC790\uC785\uB2C8\uB2E4.
-        NameRequiredInReference = \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC5D0\uC11C\uB294 '&' \uBC14\uB85C \uB2E4\uC74C\uC5D0 \uC5D4\uD2F0\uD2F0 \uC774\uB984\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
-        SemicolonRequiredInReference = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uCC38\uC870\uB294 '';'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+        DigitRequiredInCharRef = 문자 참조에서는 "&#" 바로 다음에 십진수 표현이 와야 합니다.
+        HexdigitRequiredInCharRef = 문자 참조에서는 "&#x" 바로 다음에 16진수 표현이 와야 합니다.
+        SemicolonRequiredInCharRef = 문자 참조는 ';' 구분자로 끝나야 합니다.
+        InvalidCharRef = 문자 참조 "&#{0}"은(는) 부적합한 XML 문자입니다.
+        NameRequiredInReference = 엔티티 참조에서는 '&' 바로 다음에 엔티티 이름이 와야 합니다.
+        SemicolonRequiredInReference = "{0}" 엔티티에 대한 참조는 '';'' 구분자로 끝나야 합니다.
 # 4.3.1 The Text Declaration
-        TextDeclMustBeFirst = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uB9E8 \uC55E\uC5D0\uB9CC \uB098\uD0C0\uB0A0 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
-        EqRequiredInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C\uB294 "{0}" \uB2E4\uC74C\uC5D0 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-        QuoteRequiredInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C "{0}" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC740 \uB530\uC634\uD45C\uAC00 \uBD99\uC740 \uBB38\uC790\uC5F4\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        CloseQuoteMissingInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C "{0}" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC758 \uB2EB\uB294 \uB530\uC634\uD45C\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        SpaceRequiredBeforeVersionInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 \uBC84\uC804 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        SpaceRequiredBeforeEncodingInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 \uC778\uCF54\uB529 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        TextDeclUnterminated = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 "?>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        EncodingDeclRequired = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uB294 \uC778\uCF54\uB529 \uC120\uC5B8\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        NoMorePseudoAttributes = \uC758\uC0AC \uC18D\uC131\uC740 \uB354 \uC774\uC0C1 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        MorePseudoAttributes = \uC758\uC0AC \uC18D\uC131\uC774 \uB354 \uD544\uC694\uD569\uB2C8\uB2E4.
-        PseudoAttrNameExpected = \uC758\uC0AC \uC18D\uC131 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. 
+        TextDeclMustBeFirst = 텍스트 선언은 구문이 분석된 외부 엔티티 맨 앞에만 나타날 수 있습니다.
+        EqRequiredInTextDecl = 텍스트 선언에서는 "{0}" 다음에 '' = '' 문자가 와야 합니다.
+        QuoteRequiredInTextDecl = 텍스트 선언에서 "{0}" 다음에 오는 값은 따옴표가 붙은 문자열이어야 합니다.
+        CloseQuoteMissingInTextDecl = 텍스트 선언에서 "{0}" 다음에 오는 값의 닫는 따옴표가 누락되었습니다.
+        SpaceRequiredBeforeVersionInTextDecl = 텍스트 선언은 버전 의사 속성 앞에 공백이 필요합니다.
+        SpaceRequiredBeforeEncodingInTextDecl = 텍스트 선언은 인코딩 의사 속성 앞에 공백이 필요합니다.
+        TextDeclUnterminated = 텍스트 선언은 "?>"로 끝나야 합니다.
+        EncodingDeclRequired = 텍스트 선언에는 인코딩 선언이 필요합니다.
+        NoMorePseudoAttributes = 의사 속성은 더 이상 허용되지 않습니다.
+        MorePseudoAttributes = 의사 속성이 더 필요합니다.
+        PseudoAttrNameExpected = 의사 속성 이름이 필요합니다. 
 # 4.3.2 Well-Formed Parsed Entities
-        CommentNotInOneEntity = \uC8FC\uC11D\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0 \uC644\uC804\uD788 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        PINotInOneEntity = \uCC98\uB9AC \uBA85\uB839\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0 \uC644\uC804\uD788 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+        CommentNotInOneEntity = 주석은 구문이 분석된 동일한 엔티티에 완전히 포함되어야 합니다.
+        PINotInOneEntity = 처리 명령은 구문이 분석된 동일한 엔티티에 완전히 포함되어야 합니다.
 # 4.3.3 Character Encoding in Entities
-        EncodingDeclInvalid = "{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uC778\uCF54\uB529 \uC774\uB984\uC785\uB2C8\uB2E4.
-        EncodingByteOrderUnsupported = "{0}" \uC778\uCF54\uB529\uC5D0 \uB300\uD574 \uC81C\uACF5\uB41C \uBC14\uC774\uD2B8 \uC21C\uC11C\uB294 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        InvalidByte = {0}\uC740(\uB294) {1}\uBC14\uC774\uD2B8 UTF-8 \uC2DC\uD000\uC2A4\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD55C \uBC14\uC774\uD2B8\uC785\uB2C8\uB2E4.
-        ExpectedByte = {1}\uBC14\uC774\uD2B8 UTF-8 \uC2DC\uD000\uC2A4\uC5D0 \uD544\uC694\uD55C \uBC14\uC774\uD2B8\uB294 {0}\uC785\uB2C8\uB2E4.  
-        InvalidHighSurrogate = UTF-8 \uC2DC\uD000\uC2A4\uC758 \uB192\uC740 \uB300\uB9AC \uBE44\uD2B8\uB294 0x10\uC744 \uCD08\uACFC\uD558\uC9C0 \uC54A\uC544\uC57C \uD558\uC9C0\uB9CC 0x{0}\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        OperationNotSupported = {1} \uC77D\uAE30 \uD504\uB85C\uADF8\uB7A8\uC740 "{0}" \uC791\uC5C5\uC744 \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        InvalidASCII = \uBC14\uC774\uD2B8 "{0}"\uC740(\uB294) (7\uBE44\uD2B8) ASCII \uBB38\uC790 \uC9D1\uD569\uC5D0 \uC18D\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        CharConversionFailure = \uD2B9\uC815 \uC778\uCF54\uB529 \uD615\uC2DD\uC774\uC5B4\uC57C \uD558\uB294 \uAC83\uC73C\uB85C \uD655\uC778\uB41C \uC5D4\uD2F0\uD2F0\uC5D0\uB294 \uD574\uB2F9 \uC778\uCF54\uB529\uC5D0 \uBD80\uC801\uD569\uD55C \uC2DC\uD000\uC2A4\uAC00 \uD3EC\uD568\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
+        EncodingDeclInvalid = "{0}"은(는) 부적합한 인코딩 이름입니다.
+        EncodingByteOrderUnsupported = "{0}" 인코딩에 대해 제공된 바이트 순서는 지원되지 않습니다.
+        InvalidByte = {0}은(는) {1}바이트 UTF-8 시퀀스에 대해 부적합한 바이트입니다.
+        ExpectedByte = {1}바이트 UTF-8 시퀀스에 필요한 바이트는 {0}입니다.  
+        InvalidHighSurrogate = UTF-8 시퀀스의 높은 대리 비트는 0x10을 초과하지 않아야 하지만 0x{0}이(가) 발견되었습니다.
+        OperationNotSupported = {1} 읽기 프로그램은 "{0}" 작업을 지원하지 않습니다.
+        InvalidASCII = 바이트 "{0}"은(는) (7비트) ASCII 문자 집합에 속하지 않습니다.
+        CharConversionFailure = 특정 인코딩 형식이어야 하는 것으로 확인된 엔티티에는 해당 인코딩에 부적합한 시퀀스가 포함되지 않아야 합니다.
 
 # DTD Messages
 # 2.2 Characters
-        InvalidCharInEntityValue = \uB9AC\uD130\uB7F4 \uC5D4\uD2F0\uD2F0 \uAC12\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        InvalidCharInExternalSubset = DTD\uC758 \uC678\uBD80 \uBD80\uBD84 \uC9D1\uD569\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        InvalidCharInIgnoreSect = \uC81C\uC678\uB41C \uC870\uAC74\uBD80 \uC139\uC158\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        InvalidCharInPublicID = \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uC5D0 \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        InvalidCharInSystemID = \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790\uC5D0 \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+        InvalidCharInEntityValue = 리터럴 엔티티 값에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
+        InvalidCharInExternalSubset = DTD의 외부 부분 집합에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
+        InvalidCharInIgnoreSect = 제외된 조건부 섹션에서 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
+        InvalidCharInPublicID = 공용 식별자에 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
+        InvalidCharInSystemID = 시스템 식별자에 부적합한 XML 문자(유니코드: 0x{0})가 발견되었습니다.
 # 2.3 Common Syntactic Constructs
-        SpaceRequiredAfterSYSTEM = DOCTYPE \uC120\uC5B8\uC5D0\uB294 SYSTEM \uD0A4\uC6CC\uB4DC \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        QuoteRequiredInSystemID = \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790\uB294 \uC791\uC740 \uB530\uC634\uD45C \uB610\uB294 \uD070 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
-        SystemIDUnterminated = \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790\uB294 \uC9DD\uC774 \uB9DE\uB294 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        SpaceRequiredAfterPUBLIC = DOCTYPE \uC120\uC5B8\uC5D0\uB294 PUBLIC \uD0A4\uC6CC\uB4DC \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        QuoteRequiredInPublicID = \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uB294 \uC791\uC740 \uB530\uC634\uD45C \uB610\uB294 \uD070 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
-        PublicIDUnterminated = \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uB294 \uC9DD\uC774 \uB9DE\uB294 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        PubidCharIllegal = \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uC5D0\uB294 \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        SpaceRequiredBetweenPublicAndSystem = publicId\uC640 systemId \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+        SpaceRequiredAfterSYSTEM = DOCTYPE 선언에는 SYSTEM 키워드 다음에 공백이 필요합니다.
+        QuoteRequiredInSystemID = 시스템 식별자는 작은 따옴표 또는 큰 따옴표 문자로 시작해야 합니다.
+        SystemIDUnterminated = 시스템 식별자는 짝이 맞는 따옴표 문자로 끝나야 합니다.
+        SpaceRequiredAfterPUBLIC = DOCTYPE 선언에는 PUBLIC 키워드 다음에 공백이 필요합니다.
+        QuoteRequiredInPublicID = 공용 식별자는 작은 따옴표 또는 큰 따옴표 문자로 시작해야 합니다.
+        PublicIDUnterminated = 공용 식별자는 짝이 맞는 따옴표 문자로 끝나야 합니다.
+        PubidCharIllegal = 공용 식별자에는 문자(유니코드: 0x{0})가 허용되지 않습니다.
+        SpaceRequiredBetweenPublicAndSystem = publicId와 systemId 사이에는 공백이 필요합니다.
 # 2.8 Prolog and Document Type Declaration
-        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!DOCTYPE" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_ROOT_ELEMENT_TYPE_REQUIRED = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!DOCTYPE" \uB2E4\uC74C\uC5D0 \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-        DoctypedeclUnterminated = \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        DoctypedeclNotClosed = \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC740 '']''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        PEReferenceWithinMarkup = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "%{0};"\uC740 DTD\uC758 \uB0B4\uBD80 \uBD80\uBD84 \uC9D1\uD569\uC5D0 \uC788\uB294 \uB9C8\uD06C\uC5C5 \uC548\uC5D0 \uD45C\uC2DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC744 \uD3EC\uD568\uD558\uAC70\uB098 \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC774 \uAC00\uB9AC\uD0A4\uB294 \uB9C8\uD06C\uC5C5 \uC120\uC5B8\uC740 \uC62C\uBC14\uB978 \uD615\uC2DD\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = 문서 유형 선언에서는 "<!DOCTYPE" 다음에 공백이 필요합니다.
+        MSG_ROOT_ELEMENT_TYPE_REQUIRED = 문서 유형 선언에서는 "<!DOCTYPE" 다음에 루트 요소 유형이 나타나야 합니다.
+        DoctypedeclUnterminated = 루트 요소 유형 "{0}"에 대한 문서 유형 선언은 ''>''로 끝나야 합니다.
+        DoctypedeclNotClosed = 루트 요소 유형 "{0}"에 대한 문서 유형 선언은 '']''로 끝나야 합니다.
+        PEReferenceWithinMarkup = 매개변수 엔티티 참조 "%{0};"은 DTD의 내부 부분 집합에 있는 마크업 안에 표시될 수 없습니다.
+        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = 문서 유형 선언을 포함하거나 문서 유형 선언이 가리키는 마크업 선언은 올바른 형식이어야 합니다.
 # 2.10 White Space Handling
-        MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space"\uC5D0 \uB300\uD55C \uC18D\uC131 \uC120\uC5B8\uC740 "default" \uBC0F "preserve" \uAC12\uB9CC \uAC00\uB2A5\uD55C \uC5F4\uAC70 \uC720\uD615\uC73C\uB85C \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+        MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space"에 대한 속성 선언은 "default" 및 "preserve" 값만 가능한 열거 유형으로 지정되어야 합니다.
 # 3.2 Element Type Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!ELEMENT" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC694\uC18C \uC720\uD615 "{0}" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC694\uC18C \uC720\uD615 "{0}" \uB2E4\uC74C\uC5D0 \uC81C\uC57D \uC870\uAC74\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        ElementDeclUnterminated = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = 요소 유형 선언에서는 "<!ELEMENT" 다음에 공백이 필요합니다.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = 요소 유형 선언에는 요소 유형이 필요합니다.
+        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = 요소 유형 선언에서는 요소 유형 "{0}" 다음에 공백이 필요합니다.
+        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = 요소 유형 선언에서는 요소 유형 "{0}" 다음에 제약 조건이 필요합니다.
+        ElementDeclUnterminated = 요소 유형 "{0}"에 대한 선언은 ''>''로 끝나야 합니다.
 # 3.2.1 Element Content
-        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uC120\uC5B8\uC5D0\uB294 ''('' \uBB38\uC790 \uB610\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uC120\uC5B8\uC5D0\uB294 '')''\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
+        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = 요소 유형 "{0}"의 선언에는 ''('' 문자 또는 요소 유형이 필요합니다.
+        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = 요소 유형 "{0}"의 선언에는 '')''가 필요합니다.
 # 3.2.2 Mixed Content
-        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uC120\uC5B8\uC5D0\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uC120\uC5B8\uC5D0\uB294 '')''\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MixedContentUnterminated = \uD558\uC704 \uC694\uC18C \uC720\uD615\uC774 \uC81C\uD55C\uB418\uB294 \uACBD\uC6B0 \uD63C\uD569 \uCF58\uD150\uCE20 \uBAA8\uB378 "{0}"\uC740(\uB294) ")*"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = 요소 유형 "{0}"의 선언에는 요소 유형이 필요합니다.
+        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = 요소 유형 "{0}"의 선언에는 '')''가 필요합니다.
+        MixedContentUnterminated = 하위 요소 유형이 제한되는 경우 혼합 콘텐츠 모델 "{0}"은(는) ")*"로 끝나야 합니다.
 # 3.3 Attribute-List Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = attribute-list \uC120\uC5B8\uC5D0\uC11C\uB294 "<!ATTLIST" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = attribute-list \uC120\uC5B8\uC5D0\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C attribute-list \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uC774\uB984 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        AttNameRequiredInAttDef = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C attribute-list \uC120\uC5B8\uC5D0\uB294 \uC18D\uC131 \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uC720\uD615 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        AttTypeRequiredInAttDef = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uB294 \uC18D\uC131 \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uAE30\uBCF8\uAC12 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \uC81C\uACF5\uB41C \uC694\uC18C "{0}"\uC758 \uB3D9\uC77C\uD55C \uC18D\uC131 "{1}"\uC5D0 \uB300\uD574 \uC18D\uC131 \uC815\uC758\uAC00 \uB450 \uAC1C \uC774\uC0C1 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = attribute-list 선언에서는 "<!ATTLIST" 다음에 공백이 필요합니다.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = attribute-list 선언에는 요소 유형이 필요합니다.
+        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = "{0}" 요소에 대한 attribute-list 선언에서는 속성 이름 앞에 공백이 필요합니다.
+        AttNameRequiredInAttDef = "{0}" 요소에 대한 attribute-list 선언에는 속성 이름이 지정되어야 합니다.
+        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = "{0}" 요소에 대한 "{1}" 속성의 선언에서는 속성 유형 앞에 공백이 필요합니다.
+        AttTypeRequiredInAttDef = "{0}" 요소에 대한 "{1}" 속성의 선언에는 속성 유형이 필요합니다.
+        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = "{0}" 요소에 대한 "{1}" 속성의 선언에서는 속성 기본값 앞에 공백이 필요합니다.
+        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = 제공된 요소 "{0}"의 동일한 속성 "{1}"에 대해 속성 정의가 두 개 이상 제공되었습니다.
 # 3.3.1 Attribute Types
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 "NOTATION" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 "NOTATION" \uB2E4\uC74C\uC5D0 ''('' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0 \uB300\uD55C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC5D0\uB294 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        NotationTypeUnterminated = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC740 '')''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0 \uB300\uD55C \uC5F4\uAC70 \uC720\uD615 \uBAA9\uB85D\uC5D0\uB294 \uC774\uB984 \uD1A0\uD070\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        EnumerationUnterminated = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uC5F4\uAC70 \uC720\uD615 \uBAA9\uB85D\uC740 '')''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        MSG_DISTINCT_TOKENS_IN_ENUMERATION = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{2}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C \uBAA9\uB85D \uAC12 "{1}"\uC774(\uAC00) \uB450 \uBC88 \uC774\uC0C1 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB2E8\uC77C \uBAA9\uB85D \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C NMTOKENS\uB294 \uBAA8\uB450 \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
-        MSG_DISTINCT_NOTATION_IN_ENUMERATION = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{2}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C \uBAA9\uB85D \uAC12 "{1}"\uC774(\uAC00) \uB450 \uBC88 \uC774\uC0C1 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB2E8\uC77C NotationType \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C NOTATION \uC774\uB984\uC740 \uBAA8\uB450 \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = "{1}" 속성 선언에서는 "NOTATION" 다음에 공백이 나타나야 합니다.
+        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = "{1}" 속성 선언에서는 "NOTATION" 다음에 ''('' 문자가 와야 합니다.
+        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = "{1}" 속성 선언에 대한 표기법 유형 목록에는 표기법 이름이 필요합니다.
+        NotationTypeUnterminated = "{1}" 속성 선언에서 표기법 유형 목록은 '')''로 끝나야 합니다.
+        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = "{1}" 속성 선언에 대한 열거 유형 목록에는 이름 토큰이 필요합니다.
+        EnumerationUnterminated = "{1}" 속성 선언에서 열거 유형 목록은 '')''로 끝나야 합니다.
+        MSG_DISTINCT_TOKENS_IN_ENUMERATION = "{0}" 요소에 대한 "{2}" 속성의 선언에서 목록 값 "{1}"이(가) 두 번 이상 지정되었습니다. 단일 목록 속성 선언에서 NMTOKENS는 모두 고유해야 합니다.
+        MSG_DISTINCT_NOTATION_IN_ENUMERATION = "{0}" 요소에 대한 "{2}" 속성의 선언에서 목록 값 "{1}"이(가) 두 번 이상 지정되었습니다. 단일 NotationType 속성 선언에서 NOTATION 이름은 모두 고유해야 합니다.
 # 3.3.2 Attribute Defaults
-        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 "FIXED" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
+        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = "{1}" 속성 선언에서는 "FIXED" 다음에 공백이 나타나야 합니다.
 # 3.4 Conditional Sections
-        IncludeSectUnterminated = \uD3EC\uD568\uB41C \uC870\uAC74\uBD80 \uC139\uC158\uC740 "]]>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-        IgnoreSectUnterminated = \uC81C\uC678\uB41C \uC870\uAC74\uBD80 \uC139\uC158\uC740 "]]>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+        IncludeSectUnterminated = 포함된 조건부 섹션은 "]]>"로 끝나야 합니다.
+        IgnoreSectUnterminated = 제외된 조건부 섹션은 "]]>"로 끝나야 합니다.
 # 4.1 Character and Entity References
-        NameRequiredInPEReference = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC5D0\uC11C\uB294 '%' \uBC14\uB85C \uB2E4\uC74C\uC5D0 \uC5D4\uD2F0\uD2F0 \uC774\uB984\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
-        SemicolonRequiredInPEReference = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "%{0};"\uC740 '';'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+        NameRequiredInPEReference = 매개변수 엔티티 참조에서는 '%' 바로 다음에 엔티티 이름이 와야 합니다.
+        SemicolonRequiredInPEReference = 매개변수 엔티티 참조 "%{0};"은 '';'' 구분자로 끝나야 합니다.
 # 4.2 Entity Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!ENTITY" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!ENTITY"\uC640 '%' \uBB38\uC790 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 '%'\uC640 \uC5D4\uD2F0\uD2F0 \uC774\uB984 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uB294 \uC5D4\uD2F0\uD2F0 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC5D4\uD2F0\uD2F0 \uC774\uB984 "{0}"\uACFC(\uC640) \uC815\uC758 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 "NDATA"\uC640 \uD45C\uAE30\uBC95 \uC774\uB984 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 "NDATA" \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 "NDATA" \uB2E4\uC74C\uC5D0 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        EntityDeclUnterminated = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-	MSG_DUPLICATE_ENTITY_DEFINITION = "{0}" \uC5D4\uD2F0\uD2F0\uAC00 \uB450 \uBC88 \uC774\uC0C1 \uC120\uC5B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4.        
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = 엔티티 선언에서는 "<!ENTITY" 다음에 공백이 필요합니다.
+        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = 매개변수 엔티티 선언에서는 "<!ENTITY"와 '%' 문자 사이에 공백이 필요합니다.
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = 매개변수 엔티티 선언에서는 '%'와 엔티티 이름 사이에 공백이 필요합니다.
+        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = 엔티티 선언에는 엔티티 이름이 필요합니다.
+        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = 엔티티 선언에서는 엔티티 이름 "{0}"과(와) 정의 사이에 공백이 필요합니다.
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = "{0}" 엔티티에 대한 선언에서는 "NDATA"와 표기법 이름 사이에 공백이 필요합니다.
+        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = "{0}" 엔티티에 대한 선언에서는 "NDATA" 앞에 공백이 필요합니다.
+        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = "{0}" 엔티티에 대한 선언에서는 "NDATA" 다음에 표기법 이름이 필요합니다.
+        EntityDeclUnterminated = "{0}" 엔티티에 대한 선언은 ''>''로 끝나야 합니다.
+	MSG_DUPLICATE_ENTITY_DEFINITION = "{0}" 엔티티가 두 번 이상 선언되었습니다.        
 # 4.2.2 External Entities
-        ExternalIDRequired = \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC740 "SYSTEM" \uB610\uB294 "PUBLIC"\uC73C\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = "PUBLIC"\uACFC \uACF5\uC6A9 \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uC640 \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = "SYSTEM"\uACFC \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_URI_FRAGMENT_IN_SYSTEMID = \uBD80\uBD84 \uC2DD\uBCC4\uC790\uB294 \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 "{0}"\uC758 \uC77C\uBD80\uB85C \uC9C0\uC815\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
+        ExternalIDRequired = 외부 엔티티 선언은 "SYSTEM" 또는 "PUBLIC"으로 시작해야 합니다.
+        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = "PUBLIC"과 공용 식별자 사이에는 공백이 필요합니다.
+        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = 공용 식별자와 시스템 식별자 사이에는 공백이 필요합니다.
+        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = "SYSTEM"과 시스템 식별자 사이에는 공백이 필요합니다.
+        MSG_URI_FRAGMENT_IN_SYSTEMID = 부분 식별자는 시스템 식별자 "{0}"의 일부로 지정되지 않아야 합니다.
 # 4.7 Notation Declarations
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!NOTATION" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uB294 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C\uB294 \uD45C\uAE30\uBC95 \uC774\uB984 "{0}" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-        ExternalIDorPublicIDRequired = "{0}" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uB294 \uC2DC\uC2A4\uD15C \uB610\uB294 \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uAC00 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        NotationDeclUnterminated = "{0}" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = 표기법 선언에서는 "<!NOTATION" 다음에 공백이 필요합니다.
+        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = 표기법 선언에는 표기법 이름이 필요합니다.
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = 표기법 선언에서는 표기법 이름 "{0}" 다음에 공백이 필요합니다.
+        ExternalIDorPublicIDRequired = "{0}" 표기법에 대한 선언에는 시스템 또는 공용 식별자가 포함되어야 합니다.
+        NotationDeclUnterminated = "{0}" 표기법에 대한 선언은 ''>''로 끝나야 합니다.
 
 # Validation messages
-        DuplicateTypeInMixedContent = \uC694\uC18C \uC720\uD615 "{1}"\uC774(\uAC00) \uC694\uC18C \uC120\uC5B8 "{0}"\uC758 \uCF58\uD150\uCE20 \uBAA8\uB378\uC5D0 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        ENTITIESInvalid = ENTITIES \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{1}"\uC740(\uB294) \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uD558\uB098 \uC774\uC0C1\uC758 \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        ENTITYInvalid = ENTITY \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{1}"\uC740(\uB294) \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        IDDefaultTypeInvalid = ID \uC18D\uC131 "{0}"\uC758 \uC120\uC5B8\uB41C \uAE30\uBCF8\uAC12\uC740 "#IMPLIED" \uB610\uB294 "#REQUIRED"\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-        IDInvalid = ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        IDInvalidWithNamespaces = \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) NCName\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        IDNotUnique = ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uBB38\uC11C \uB0B4\uC5D0\uC11C \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
-        IDREFInvalid = IDREF \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        IDREFInvalidWithNamespaces = \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 IDREF \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) NCName\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        IDREFSInvalid = IDREFS \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uD558\uB098 \uC774\uC0C1\uC758 \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uAC00 \uC804\uCCB4 \uC120\uC5B8\uC73C\uB85C \uC0AC\uC6A9\uB41C \uACBD\uC6B0 \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 "{0}"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        ImproperDeclarationNesting = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 "{0}"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        ImproperGroupNesting = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 "{0}"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uAD04\uD638 \uC30D\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        INVALID_PE_IN_CONDITIONAL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 "{0}"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC804\uCCB4 \uC870\uAC74\uBD80 \uC139\uC158\uC774 \uD3EC\uD568\uB418\uAC70\uB098 INCLUDE \uB610\uB294 IGNORE\uB9CC \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        MSG_ATTRIBUTE_NOT_DECLARED = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC744 \uC120\uC5B8\uD574\uC57C \uD569\uB2C8\uB2E4.
-        MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \uAC12\uC774 "{1}"\uC778 "{0}" \uC18D\uC131\uC5D0\uB294 "{2}" \uBAA9\uB85D\uC758 \uAC12\uC774 \uC0AC\uC6A9\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = "{0}" \uC18D\uC131\uC758 "{1}" \uAC12\uC740 \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C \uC815\uADDC\uD654\uC5D0 \uC758\uD574 "{2}"(\uC73C)\uB85C \uBCC0\uACBD\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-        MSG_CONTENT_INCOMPLETE = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uCF58\uD150\uCE20\uAC00 \uBD88\uC644\uC804\uD569\uB2C8\uB2E4. \uD574\uB2F9 \uCF58\uD150\uCE20\uB294 "{1}"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-        MSG_CONTENT_INVALID = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uCF58\uD150\uCE20\uB294 "{1}"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-        MSG_CONTENT_INVALID_SPECIFIED = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uCF58\uD150\uCE20\uB294 "{1}"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4. "{2}" \uC720\uD615\uC758 \uD558\uC704 \uD56D\uBAA9\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC5D0 \uAE30\uBCF8\uAC12\uC774 \uC788\uC73C\uBA70 \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        MSG_DUPLICATE_ATTDEF = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC774 \uC774\uBBF8 \uC120\uC5B8\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-        MSG_ELEMENT_ALREADY_DECLARED = \uC694\uC18C \uC720\uD615 "{0}"\uC740(\uB294) \uB450 \uBC88 \uC774\uC0C1 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-        MSG_ELEMENT_NOT_DECLARED = \uC694\uC18C \uC720\uD615 "{0}"\uC744(\uB97C) \uC120\uC5B8\uD574\uC57C \uD569\uB2C8\uB2E4.
-        MSG_GRAMMAR_NOT_FOUND = \uBB38\uC11C\uAC00 \uBD80\uC801\uD569\uD568: \uBB38\uBC95\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        MSG_ELEMENT_WITH_ID_REQUIRED = \uC2DD\uBCC4\uC790\uAC00 "{0}"\uC778 \uC694\uC18C\uAC00 \uBB38\uC11C\uC5D0 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uC678\uBD80 \uC5D4\uD2F0\uD2F0 "{0}"\uC5D0 \uB300\uD55C \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        MSG_FIXED_ATTVALUE_INVALID = \uAC12\uC774 "{2}"\uC778 "{1}" \uC18D\uC131\uC758 \uAC12\uC740 "{3}"\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 ID \uC720\uD615\uC758 "{1}" \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC73C\uBBC0\uB85C ID \uC720\uD615\uC758 \uB450\uBC88\uC9F8 \uC18D\uC131 "{2}"\uC774(\uAC00) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 NOTATION \uC720\uD615\uC758 "{1}" \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC73C\uBBC0\uB85C NOTATION \uC720\uD615\uC758 \uB450\uBC88\uC9F8 \uC18D\uC131 "{2}"\uC774(\uAC00) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = "{1}" \uD45C\uAE30\uBC95\uC740 "{0}" \uC18D\uC131\uC5D0 \uB300\uD55C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC5D0\uC11C \uCC38\uC870\uB418\uB294 \uACBD\uC6B0 \uC120\uC5B8\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = "{1}" \uD45C\uAE30\uBC95\uC740 "{0}"\uC5D0 \uB300\uD574 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C \uCC38\uC870\uB418\uB294 \uACBD\uC6B0 \uC120\uC5B8\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC678\uBD80 \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC120\uC5B8\uB41C "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = "{1}" \uC18D\uC131\uC774 \uD544\uC694\uD558\uBA70 \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD574 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uC694\uC18C \uCF58\uD150\uCE20\uB97C \uAC00\uC9C0\uBA70 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC678\uBD80 \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC120\uC5B8\uB41C \uC694\uC18C \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        NMTOKENInvalid = NMTOKEN \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uC774\uB984 \uD1A0\uD070\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        NMTOKENSInvalid = NMTOKENS \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uD558\uB098 \uC774\uC0C1\uC758 \uC774\uB984 \uD1A0\uD070\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        NoNotationOnEmptyElement = EMPTY\uB85C \uC120\uC5B8\uB41C \uC694\uC18C \uC720\uD615 "{0}"\uC740(\uB294) NOTATION \uC720\uD615\uC758 "{1}" \uC18D\uC131\uC744 \uC120\uC5B8\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        RootElementTypeMustMatchDoctypedecl = \uBB38\uC11C \uB8E8\uD2B8 \uC694\uC18C "{1}"\uC740(\uB294) DOCTYPE \uB8E8\uD2B8 "{0}"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-        UndeclaredElementInContentSpec = "{0}" \uC694\uC18C\uC758 \uCF58\uD150\uCE20 \uBAA8\uB378\uC774 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC740 \uC694\uC18C "{1}"\uC744(\uB97C) \uCC38\uC870\uD569\uB2C8\uB2E4.
-        UniqueNotationName = "{0}" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC774 \uACE0\uC720\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC81C\uACF5\uB41C \uC774\uB984\uC740 \uB450 \uAC1C \uC774\uC0C1\uC758 \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C \uC120\uC5B8\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-        ENTITYFailedInitializeGrammar =  ENTITYDatatype \uAC80\uC99D\uAE30: \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uC801\uD569\uD55C \uBB38\uBC95 \uCC38\uC870\uB85C \uCD08\uAE30\uD654 \uBA54\uC18C\uB4DC\uB97C \uD638\uCD9C\uD574\uC57C \uD569\uB2C8\uB2E4. \t
-        ENTITYNotUnparsed = ENTITY "{0}"\uC758 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-        ENTITYNotValid = ENTITY "{0}"\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-        EmptyList = ENTITIES, IDREFS \uBC0F NMTOKENS \uC720\uD615\uC758 \uAC12\uC740 \uBE48 \uBAA9\uB85D\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+        DuplicateTypeInMixedContent = 요소 유형 "{1}"이(가) 요소 선언 "{0}"의 콘텐츠 모델에 이미 지정되었습니다.
+        ENTITIESInvalid = ENTITIES 유형의 속성값 "{1}"은(는) 구문이 분석되지 않은 하나 이상의 엔티티에 대한 이름이어야 합니다.
+        ENTITYInvalid = ENTITY 유형의 속성값 "{1}"은(는) 구문이 분석되지 않은 엔티티에 대한 이름이어야 합니다.
+        IDDefaultTypeInvalid = ID 속성 "{0}"의 선언된 기본값은 "#IMPLIED" 또는 "#REQUIRED"여야 합니다.
+        IDInvalid = ID 유형의 속성값 "{0}"은(는) 이름이어야 합니다.
+        IDInvalidWithNamespaces = 네임스페이스가 사용으로 설정된 경우 ID 유형의 속성값 "{0}"은(는) NCName이어야 합니다.
+        IDNotUnique = ID 유형의 속성값 "{0}"은(는) 문서 내에서 고유해야 합니다.
+        IDREFInvalid = IDREF 유형의 속성값 "{0}"은(는) 이름이어야 합니다.
+        IDREFInvalidWithNamespaces = 네임스페이스가 사용으로 설정된 경우 IDREF 유형의 속성값 "{0}"은(는) NCName이어야 합니다.
+        IDREFSInvalid = IDREFS 유형의 속성값 "{0}"은(는) 하나 이상의 이름이어야 합니다.
+        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = 엔티티 참조가 전체 선언으로 사용된 경우 매개변수 엔티티 "{0}"의 대체 텍스트에는 제대로 중첩된 선언이 포함되어야 합니다.
+        ImproperDeclarationNesting = 매개변수 엔티티 "{0}"의 대체 텍스트에는 제대로 중첩된 선언이 포함되어야 합니다.
+        ImproperGroupNesting = 매개변수 엔티티 "{0}"의 대체 텍스트에는 제대로 중첩된 괄호 쌍이 포함되어야 합니다.
+        INVALID_PE_IN_CONDITIONAL = 매개변수 엔티티 "{0}"의 대체 텍스트에는 전체 조건부 섹션이 포함되거나 INCLUDE 또는 IGNORE만 포함되어야 합니다.
+        MSG_ATTRIBUTE_NOT_DECLARED = 요소 유형 "{0}"에 대한 "{1}" 속성을 선언해야 합니다.
+        MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = 값이 "{1}"인 "{0}" 속성에는 "{2}" 목록의 값이 사용되어야 합니다.
+        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = "{0}" 속성의 "{1}" 값은 독립형 문서에서 정규화에 의해 "{2}"(으)로 변경되지 않아야 합니다.
+        MSG_CONTENT_INCOMPLETE = 요소 유형 "{0}"의 콘텐츠가 불완전합니다. 해당 콘텐츠는 "{1}"과(와) 일치해야 합니다.
+        MSG_CONTENT_INVALID = 요소 유형 "{0}"의 콘텐츠는 "{1}"과(와) 일치해야 합니다.
+        MSG_CONTENT_INVALID_SPECIFIED = 요소 유형 "{0}"의 콘텐츠는 "{1}"과(와) 일치해야 합니다. "{2}" 유형의 하위 항목은 허용되지 않습니다.
+        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = 요소 유형 "{0}"에 대한 "{1}" 속성에 기본값이 있으며 독립형 문서에 지정되어야 합니다.
+        MSG_DUPLICATE_ATTDEF = 요소 유형 "{0}"에 대한 "{1}" 속성이 이미 선언되어 있습니다.
+        MSG_ELEMENT_ALREADY_DECLARED = 요소 유형 "{0}"은(는) 두 번 이상 선언되지 않아야 합니다.
+        MSG_ELEMENT_NOT_DECLARED = 요소 유형 "{0}"을(를) 선언해야 합니다.
+        MSG_GRAMMAR_NOT_FOUND = 문서가 부적합함: 문법을 찾을 수 없습니다.
+        MSG_ELEMENT_WITH_ID_REQUIRED = 식별자가 "{0}"인 요소가 문서에 나타나야 합니다.
+        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = 독립형 문서에서는 외부 엔티티 "{0}"에 대한 참조가 허용되지 않습니다.
+        MSG_FIXED_ATTVALUE_INVALID = 값이 "{2}"인 "{1}" 속성의 값은 "{3}"이어야 합니다.
+        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = 요소 유형 "{0}"에 ID 유형의 "{1}" 속성이 이미 있으므로 ID 유형의 두번째 속성 "{2}"이(가) 허용되지 않습니다.
+        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = 요소 유형 "{0}"에 NOTATION 유형의 "{1}" 속성이 이미 있으므로 NOTATION 유형의 두번째 속성 "{2}"이(가) 허용되지 않습니다.
+        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = "{1}" 표기법은 "{0}" 속성에 대한 표기법 유형 목록에서 참조되는 경우 선언되어야 합니다.
+        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = "{1}" 표기법은 "{0}"에 대해 구문이 분석되지 않은 엔티티 선언에서 참조되는 경우 선언되어야 합니다.
+        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = 독립형 문서에서는 구문이 분석된 외부 엔티티에서 선언된 "{0}" 엔티티에 대한 참조가 허용되지 않습니다.
+        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = "{1}" 속성이 필요하며 요소 유형 "{0}"에 대해 지정되어야 합니다.
+        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = 독립형 문서에서는 요소 콘텐츠를 가지며 구문이 분석된 외부 엔티티에서 선언된 요소 사이에 공백이 없어야 합니다.
+        NMTOKENInvalid = NMTOKEN 유형의 속성값 "{0}"은(는) 이름 토큰이어야 합니다.
+        NMTOKENSInvalid = NMTOKENS 유형의 속성값 "{0}"은(는) 하나 이상의 이름 토큰이어야 합니다.
+        NoNotationOnEmptyElement = EMPTY로 선언된 요소 유형 "{0}"은(는) NOTATION 유형의 "{1}" 속성을 선언할 수 없습니다.
+        RootElementTypeMustMatchDoctypedecl = 문서 루트 요소 "{1}"은(는) DOCTYPE 루트 "{0}"과(와) 일치해야 합니다.
+        UndeclaredElementInContentSpec = "{0}" 요소의 콘텐츠 모델이 선언되지 않은 요소 "{1}"을(를) 참조합니다.
+        UniqueNotationName = "{0}" 표기법에 대한 선언이 고유하지 않습니다. 제공된 이름은 두 개 이상의 표기법 선언에서 선언되지 않아야 합니다.
+        ENTITYFailedInitializeGrammar =  ENTITYDatatype 검증기: 실패했습니다. 적합한 문법 참조로 초기화 메소드를 호출해야 합니다. \t
+        ENTITYNotUnparsed = ENTITY "{0}"의 구문이 분석되지 않았습니다.
+        ENTITYNotValid = ENTITY "{0}"이(가) 부적합합니다.
+        EmptyList = ENTITIES, IDREFS 및 NMTOKENS 유형의 값은 빈 목록일 수 없습니다.
 
 # Entity related messages
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ReferenceToExternalEntity = \uC18D\uC131\uAC12\uC5D0\uC11C\uB294 \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "&{0};"\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        AccessExternalDTD = \uC678\uBD80 DTD: accessExternalDTD \uC18D\uC131\uC73C\uB85C \uC124\uC815\uB41C \uC81C\uD55C\uC73C\uB85C \uC778\uD574 ''{1}'' \uC561\uC138\uC2A4\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC73C\uBBC0\uB85C \uC678\uBD80 DTD ''{0}'' \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-        AccessExternalEntity = \uC678\uBD80 \uC5D4\uD2F0\uD2F0: accessExternalDTD \uC18D\uC131\uC73C\uB85C \uC124\uC815\uB41C \uC81C\uD55C\uC73C\uB85C \uC778\uD574 ''{1}'' \uC561\uC138\uC2A4\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC73C\uBBC0\uB85C \uC678\uBD80 \uBB38\uC11C ''{0}'' \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
+        ReferenceToExternalEntity = 속성값에서는 외부 엔티티 참조 "&{0};"이 허용되지 않습니다.
+        AccessExternalDTD = 외부 DTD: accessExternalDTD 속성으로 설정된 제한으로 인해 ''{1}'' 액세스가 허용되지 않으므로 외부 DTD ''{0}'' 읽기를 실패했습니다.
+        AccessExternalEntity = 외부 엔티티: accessExternalDTD 속성으로 설정된 제한으로 인해 ''{1}'' 액세스가 허용되지 않으므로 외부 문서 ''{0}'' 읽기를 실패했습니다.
 
 # 4.1 Character and Entity References
-        EntityNotDeclared = "{0}" \uC5D4\uD2F0\uD2F0\uAC00 \uCC38\uC870\uB418\uC5C8\uC9C0\uB9CC \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-        ReferenceToUnparsedEntity = \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "&{0};"\uC740(\uB294) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        RecursiveReference = "{0}"\uC740(\uB294) \uC21C\uD658 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
-        RecursiveGeneralReference = "&{0};"\uC740 \uC21C\uD658 \uC77C\uBC18 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
-        RecursivePEReference = "%{0};"\uC740 \uC21C\uD658 \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
+        EntityNotDeclared = "{0}" 엔티티가 참조되었지만 선언되지 않았습니다.
+        ReferenceToUnparsedEntity = 구문이 분석되지 않은 엔티티 참조 "&{0};"은(는) 허용되지 않습니다.
+        RecursiveReference = "{0}"은(는) 순환 엔티티 참조입니다(참조 경로: {1}).
+        RecursiveGeneralReference = "&{0};"은 순환 일반 엔티티 참조입니다(참조 경로: {1}).
+        RecursivePEReference = "%{0};"은 순환 매개변수 엔티티 참조입니다(참조 경로: {1}).
 # 4.3.3 Character Encoding in Entities
-        EncodingNotSupported = "{0}" \uC778\uCF54\uB529\uC740 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        EncodingRequired = UTF-8 \uB610\uB294 UTF-16\uC73C\uB85C \uC778\uCF54\uB529\uB418\uC9C0 \uC54A\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC5D4\uD2F0\uD2F0\uC5D0\uB294 \uC778\uCF54\uB529 \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+        EncodingNotSupported = "{0}" 인코딩은 지원되지 않습니다.
+        EncodingRequired = UTF-8 또는 UTF-16으로 인코딩되지 않은 구문이 분석된 엔티티에는 인코딩 선언이 포함되어야 합니다.
 
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = \uC694\uC18C \uB610\uB294 \uC18D\uC131\uC774 QName \uC791\uC131\uACFC \uC77C\uCE58\uD558\uC9C0 \uC54A\uC74C: QName::=(NCName':')?NCName.
-        ElementXMLNSPrefix = "{0}" \uC694\uC18C\uC5D0\uB294 "xmlns"\uAC00 \uC811\uB450\uC5B4\uB85C \uC0AC\uC6A9\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        ElementPrefixUnbound = "{1}" \uC694\uC18C\uC5D0 \uB300\uD55C "{0}" \uC811\uB450\uC5B4\uAC00 \uBC14\uC778\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-        AttributePrefixUnbound = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C "{1}" \uC18D\uC131\uC758 "{2}" \uC811\uB450\uC5B4\uAC00 \uBC14\uC778\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-        EmptyPrefixedAttName = "{0}" \uC18D\uC131\uC758 \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC811\uB450\uC5B4\uAC00 \uC9C0\uC815\uB41C \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uBC14\uC778\uB529\uC740 \uBE44\uC6CC \uB458 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        PrefixDeclared = \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC811\uB450\uC5B4 "{0}"\uC774(\uAC00) \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-        CantBindXMLNS = "xmlns" \uC811\uB450\uC5B4\uB294 \uBA85\uC2DC\uC801\uC73C\uB85C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "xmlns"\uC5D0 \uB300\uD55C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uB3C4 \uBA85\uC2DC\uC801\uC73C\uB85C \uC811\uB450\uC5B4\uC5D0 \uBC14\uC778\uB4DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        CantBindXML = "xml" \uC811\uB450\uC5B4\uB294 \uC77C\uBC18 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC544\uB2CC \uB2E4\uB978 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "xml"\uC5D0 \uB300\uD55C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uB3C4 "xml" \uC774\uC678\uC758 \uC811\uB450\uC5B4\uC5D0 \uBC14\uC778\uB4DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        MSG_ATT_DEFAULT_INVALID = "{0}" \uC18D\uC131\uC758 defaultValue "{1}"\uC740(\uB294) \uC774 \uC18D\uC131 \uC720\uD615\uC758 \uB809\uC2DC\uCE7C \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD55C \uAC12\uC73C\uB85C \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+        IllegalQName = 요소 또는 속성이 QName 작성과 일치하지 않음: QName::=(NCName':')?NCName.
+        ElementXMLNSPrefix = "{0}" 요소에는 "xmlns"가 접두어로 사용될 수 없습니다.
+        ElementPrefixUnbound = "{1}" 요소에 대한 "{0}" 접두어가 바인드되지 않았습니다.
+        AttributePrefixUnbound = 요소 유형 "{0}"과(와) 연관된 "{1}" 속성의 "{2}" 접두어가 바인드되지 않았습니다.
+        EmptyPrefixedAttName = "{0}" 속성의 값이 부적합합니다. 접두어가 지정된 네임스페이스 바인딩은 비워 둘 수 없습니다.
+        PrefixDeclared = 네임스페이스 접두어 "{0}"이(가) 선언되지 않았습니다.
+        CantBindXMLNS = "xmlns" 접두어는 명시적으로 네임스페이스에 바인드될 수 없습니다. "xmlns"에 대한 네임스페이스도 명시적으로 접두어에 바인드될 수 없습니다.
+        CantBindXML = "xml" 접두어는 일반 네임스페이스가 아닌 다른 네임스페이스에 바인드될 수 없습니다. "xml"에 대한 네임스페이스도 "xml" 이외의 접두어에 바인드될 수 없습니다.
+        MSG_ATT_DEFAULT_INVALID = "{0}" 속성의 defaultValue "{1}"은(는) 이 속성 유형의 렉시칼 제약 조건에 대한 값으로 부적합합니다.
 
 # REVISIT: These need messages
         MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
@@ -295,14 +295,14 @@
 
 
 # Implementation limits
-        EntityExpansionLimit=JAXP00010001: \uAD6C\uBB38 \uBD84\uC11D\uAE30\uAC00 \uC774 \uBB38\uC11C\uC5D0\uC11C "{0}"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC5D4\uD2F0\uD2F0 \uD655\uC7A5\uC744 \uBC1C\uACAC\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB294 JDK\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
-        ElementAttributeLimit=JAXP00010002:  "{0}" \uC694\uC18C\uC5D0 "{1}"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC18D\uC131\uC774 \uC788\uC2B5\uB2C8\uB2E4. "{1}"\uC740(\uB294) JDK\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
-        MaxEntitySizeLimit=JAXP00010003: "{0}" \uC5D4\uD2F0\uD2F0\uC758 \uAE38\uC774\uAC00 "{3}"\uC5D0\uC11C \uC124\uC815\uB41C "{2}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{1}"\uC785\uB2C8\uB2E4.
-        TotalEntitySizeLimit=JAXP00010004: \uC5D4\uD2F0\uD2F0\uC758 \uB204\uC801 \uD06C\uAE30\uAC00 "{2}"\uC5D0\uC11C \uC124\uC815\uD55C "{1}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{0}"\uC785\uB2C8\uB2E4.
-        MaxXMLNameLimit=JAXP00010005: "{0}" \uC5D4\uD2F0\uD2F0\uC758 \uAE38\uC774\uAC00 "{3}"\uC5D0\uC11C \uC124\uC815\uD55C "{2}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{1}"\uC785\uB2C8\uB2E4.
-        MaxElementDepthLimit=JAXP00010006: "{0}" \uC694\uC18C\uC758 \uAE4A\uC774\uAC00 "{3}"\uC5D0\uC11C \uC124\uC815\uB41C "{2}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{1}"\uC785\uB2C8\uB2E4.
-        EntityReplacementLimit=JAXP00010007: \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC758 \uCD1D \uB178\uB4DC \uC218\uAC00 "{2}"\uC5D0\uC11C \uC124\uC815\uD55C "{1}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{0}"\uC785\uB2C8\uB2E4.
+        EntityExpansionLimit=JAXP00010001: 구문 분석기가 이 문서에서 "{0}"개를 초과하는 엔티티 확장을 발견했습니다. 이는 JDK에서 적용하는 제한입니다.
+        ElementAttributeLimit=JAXP00010002:  "{0}" 요소에 "{1}"개를 초과하는 속성이 있습니다. "{1}"은(는) JDK에서 적용하는 제한입니다.
+        MaxEntitySizeLimit=JAXP00010003: "{0}" 엔티티의 길이가 "{3}"에서 설정된 "{2}" 제한을 초과하는 "{1}"입니다.
+        TotalEntitySizeLimit=JAXP00010004: 엔티티의 누적 크기가 "{2}"에서 설정한 "{1}" 제한을 초과하는 "{0}"입니다.
+        MaxXMLNameLimit=JAXP00010005: "{0}" 엔티티의 길이가 "{3}"에서 설정한 "{2}" 제한을 초과하는 "{1}"입니다.
+        MaxElementDepthLimit=JAXP00010006: "{0}" 요소의 깊이가 "{3}"에서 설정된 "{2}" 제한을 초과하는 "{1}"입니다.
+        EntityReplacementLimit=JAXP00010007: 엔티티 참조의 총 노드 수가 "{2}"에서 설정한 "{1}" 제한을 초과하는 "{0}"입니다.
 
 # Catalog 09
 # Technical term, do not translate: catalog
-        CatalogException=JAXP00090001: CatalogResolver\uAC00 "{0}" \uCE74\uD0C8\uB85C\uADF8\uC5D0 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB418\uC5C8\uC9C0\uB9CC CatalogException\uC774 \uBC18\uD658\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+        CatalogException=JAXP00090001: CatalogResolver가 "{0}" 카탈로그에 사용으로 설정되었지만 CatalogException이 반환되었습니다.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
index a74c44bdccf..4dbf741007f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
@@ -3,290 +3,290 @@
 #
 # @version
 
-        BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
+        BadMessageKey = Não foi possível encontrar a mensagem de erro correspondente à chave da mensagem.
         FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n  
 
 # Document messages
         PrematureEOF=Fim prematuro do arquivo.
 # 2.1 Well-Formed XML Documents
-        RootElementRequired = O elemento-raiz \u00E9 necess\u00E1rio em um documento correto.
+        RootElementRequired = O elemento-raiz é necessário em um documento correto.
 # 2.2 Characters
 
-        InvalidCharInCDSect = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na se\u00E7\u00E3o CDATA.
-        InvalidCharInContent = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no conte\u00FAdo do elemento do documento.
-        TwoColonsInQName = Um segundo ':' inv\u00E1lido foi encontrado no tipo de elemento ou no nome do atributo.
-        ColonNotLegalWithNS = N\u00E3o \u00E9 permitido usar dois-pontos no nome ''{0}'' quando namespaces estiverem ativados.
-        InvalidCharInMisc = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado na marca\u00E7\u00E3o ap\u00F3s o fim do conte\u00FAdo do elemento.
-        InvalidCharInProlog = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no pr\u00F3logo do documento.
-        InvalidCharInXMLDecl = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na declara\u00E7\u00E3o XML.
+        InvalidCharInCDSect = Um caractere XML inválido (Unicode: 0x{0}) foi encontrado na seção CDATA.
+        InvalidCharInContent = Um caractere XML inválido (Unicode: 0x {0}) foi encontrado no conteúdo do elemento do documento.
+        TwoColonsInQName = Um segundo ':' inválido foi encontrado no tipo de elemento ou no nome do atributo.
+        ColonNotLegalWithNS = Não é permitido usar dois-pontos no nome ''{0}'' quando namespaces estiverem ativados.
+        InvalidCharInMisc = Um caractere XML inválido (Unicode: 0x {0}) foi encontrado na marcação após o fim do conteúdo do elemento.
+        InvalidCharInProlog = Um caractere XML inválido (Unicode: 0x {0}) foi encontrado no prólogo do documento.
+        InvalidCharInXMLDecl = Um caractere XML inválido (Unicode: 0x{0}) foi encontrado na declaração XML.
 # 2.4 Character Data and Markup
-        CDEndInContent = A sequ\u00EAncia de caracteres "]]>" n\u00E3o deve aparecer no conte\u00FAdo, a menos que seja usada para marcar o fim de uma se\u00E7\u00E3o CDATA.
+        CDEndInContent = A sequência de caracteres "]]>" não deve aparecer no conteúdo, a menos que seja usada para marcar o fim de uma seção CDATA.
 # 2.7 CDATA Sections
-        CDSectUnterminated = A se\u00E7\u00E3o CDATA deve terminar com "]]>".
+        CDSectUnterminated = A seção CDATA deve terminar com "]]>".
 # 2.8 Prolog and Document Type Declaration
-        XMLDeclMustBeFirst = A declara\u00E7\u00E3o XML pode aparecer somente bem no in\u00EDcio do documento.
-        EqRequiredInXMLDecl = O caractere '' = '' deve estar ap\u00F3s "{0}" na declara\u00E7\u00E3o XML.
-        QuoteRequiredInXMLDecl = O valor ap\u00F3s "{0}" na declara\u00E7\u00E3o XML deve ser uma string entre aspas.
-        XMLDeclUnterminated = A declara\u00E7\u00E3o XML deve terminar com "?>".
-        VersionInfoRequired = A vers\u00E3o \u00E9 obrigat\u00F3ria na declara\u00E7\u00E3o XML.
-        SpaceRequiredBeforeVersionInXMLDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes do pseudo-atributo da vers\u00E3o na declara\u00E7\u00E3o XML.
-        SpaceRequiredBeforeEncodingInXMLDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de codificar o pseudo-atributo na declara\u00E7\u00E3o XML.
-        SpaceRequiredBeforeStandalone = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de codificar o pseudo-atributo na declara\u00E7\u00E3o XML.
-        MarkupNotRecognizedInProlog = A marca\u00E7\u00E3o no documento que precede o elemento-raiz deve estar correta.
-        MarkupNotRecognizedInMisc = A marca\u00E7\u00E3o no documento ap\u00F3s o elemento-raiz deve estar correta.
-        AlreadySeenDoctype = Tipo de documento j\u00E1 visto.
-        DoctypeNotAllowed = DOCTYPE fica desativado quando o recurso "http://apache.org/xml/features/disallow-doctype-decl" \u00E9 definido como verdadeiro.
-        ContentIllegalInProlog = O conte\u00FAdo n\u00E3o \u00E9 permitido no pr\u00F3logo.
-        ReferenceIllegalInProlog = A refer\u00EAncia n\u00E3o \u00E9 permitida no pr\u00F3logo.
+        XMLDeclMustBeFirst = A declaração XML pode aparecer somente bem no início do documento.
+        EqRequiredInXMLDecl = O caractere '' = '' deve estar após "{0}" na declaração XML.
+        QuoteRequiredInXMLDecl = O valor após "{0}" na declaração XML deve ser uma string entre aspas.
+        XMLDeclUnterminated = A declaração XML deve terminar com "?>".
+        VersionInfoRequired = A versão é obrigatória na declaração XML.
+        SpaceRequiredBeforeVersionInXMLDecl = O espaço em branco é necessário antes do pseudo-atributo da versão na declaração XML.
+        SpaceRequiredBeforeEncodingInXMLDecl = O espaço em branco é necessário antes de codificar o pseudo-atributo na declaração XML.
+        SpaceRequiredBeforeStandalone = O espaço em branco é necessário antes de codificar o pseudo-atributo na declaração XML.
+        MarkupNotRecognizedInProlog = A marcação no documento que precede o elemento-raiz deve estar correta.
+        MarkupNotRecognizedInMisc = A marcação no documento após o elemento-raiz deve estar correta.
+        AlreadySeenDoctype = Tipo de documento já visto.
+        DoctypeNotAllowed = DOCTYPE fica desativado quando o recurso "http://apache.org/xml/features/disallow-doctype-decl" é definido como verdadeiro.
+        ContentIllegalInProlog = O conteúdo não é permitido no prólogo.
+        ReferenceIllegalInProlog = A referência não é permitida no prólogo.
 # Trailing Misc
-        ContentIllegalInTrailingMisc=O conte\u00FAdo n\u00E3o \u00E9 permitido na se\u00E7\u00E3o \u00E0 esquerda.
-        ReferenceIllegalInTrailingMisc=A refer\u00EAncia n\u00E3o \u00E9 permitida na se\u00E7\u00E3o \u00E0 esquerda.
+        ContentIllegalInTrailingMisc=O conteúdo não é permitido na seção à esquerda.
+        ReferenceIllegalInTrailingMisc=A referência não é permitida na seção à esquerda.
 
 # 2.9 Standalone Document Declaration
-        SDDeclInvalid = O valor da declara\u00E7\u00E3o do documento stand-alone deve ser "sim" ou "n\u00E3o", mas n\u00E3o deve ser "{0}".
-        SDDeclNameInvalid = O nome standalone na declara\u00E7\u00E3o XML pode estar grafado incorretamente.
+        SDDeclInvalid = O valor da declaração do documento stand-alone deve ser "sim" ou "não", mas não deve ser "{0}".
+        SDDeclNameInvalid = O nome standalone na declaração XML pode estar grafado incorretamente.
 # 2.12 Language Identification
-        XMLLangInvalid = O valor do atributo xml:lang "{0}" \u00E9 um identificador de idioma inv\u00E1lido.
+        XMLLangInvalid = O valor do atributo xml:lang "{0}" é um identificador de idioma inválido.
 # 3. Logical Structures
         ETagRequired = O tipo de elemento {0}" deve ser encerrado pela tag final correspondente "</{0}>".
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ElementUnterminated = O tipo de elemento "{0}" deve ser seguido pelas especifica\u00E7\u00F5es do atributo, ">" ou "/>".
+        ElementUnterminated = O tipo de elemento "{0}" deve ser seguido pelas especificações do atributo, ">" ou "/>".
         EqRequiredInAttribute = O nome do atributo "{1}" associado a um tipo de elemento "{0}" deve ser seguido do caractere '' = ''.
-        OpenQuoteExpected = S\u00E3o esperadas aspas de abertura para o atributo "{1}" associado a um tipo de elemento "{0}".
-        CloseQuoteExpected = S\u00E3o esperadas aspas de fechamento para o atributo "{1}" associado a um tipo de elemento "{0}".
-        AttributeNotUnique = O atributo "{1}" j\u00E1 foi especificado para o elemento "{0}".
-        AttributeNSNotUnique = O atributo "{1}" vinculado ao namespace "{2}" j\u00E1 foi especificado para o elemento "{0}".
+        OpenQuoteExpected = São esperadas aspas de abertura para o atributo "{1}" associado a um tipo de elemento "{0}".
+        CloseQuoteExpected = São esperadas aspas de fechamento para o atributo "{1}" associado a um tipo de elemento "{0}".
+        AttributeNotUnique = O atributo "{1}" já foi especificado para o elemento "{0}".
+        AttributeNSNotUnique = O atributo "{1}" vinculado ao namespace "{2}" já foi especificado para o elemento "{0}".
         ETagUnterminated = A tag final do tipo de elemento "{0}" deve terminar com um delimitador ''>".
-        MarkupNotRecognizedInContent = O conte\u00FAdo dos elementos deve consistir em dados ou marca\u00E7\u00E3o do caractere correto.
-        DoctypeIllegalInContent = Um DOCTYPE n\u00E3o \u00E9 permitido no conte\u00FAdo.
+        MarkupNotRecognizedInContent = O conteúdo dos elementos deve consistir em dados ou marcação do caractere correto.
+        DoctypeIllegalInContent = Um DOCTYPE não é permitido no conteúdo.
 # 4.1 Character and Entity References
-        ReferenceUnterminated = A refer\u00EAncia deve ser encerrada por um delimitador ';'.
+        ReferenceUnterminated = A referência deve ser encerrada por um delimitador ';'.
 # 4.3.2 Well-Formed Parsed Entities
-        ReferenceNotInOneEntity = A refer\u00EAncia deve estar totalmente contida na mesma entidade submetida a parsing.
-        ElementEntityMismatch = O elemento "{0}" deve come\u00E7ar e terminar com a mesma entidade.
-        MarkupEntityMismatch=As estruturas do documento XML devem come\u00E7ar e terminar com a mesma entidade.
+        ReferenceNotInOneEntity = A referência deve estar totalmente contida na mesma entidade submetida a parsing.
+        ElementEntityMismatch = O elemento "{0}" deve começar e terminar com a mesma entidade.
+        MarkupEntityMismatch=As estruturas do documento XML devem começar e terminar com a mesma entidade.
 
 # Messages common to Document and DTD
 # 2.2 Characters
-        InvalidCharInAttValue = Um caractere XML inv\u00E1lido (Unicode: 0x {2}) foi encontrado no valor do atributo "{1}" e o elemento \u00E9 "{0}".
-        InvalidCharInComment = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado no coment\u00E1rio.
-        InvalidCharInPI = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na instru\u00E7\u00E3o de processamento.
-        InvalidCharInInternalSubset = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no subconjunto interno do DTD.
-        InvalidCharInTextDecl = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na declara\u00E7\u00E3o de texto.
+        InvalidCharInAttValue = Um caractere XML inválido (Unicode: 0x {2}) foi encontrado no valor do atributo "{1}" e o elemento é "{0}".
+        InvalidCharInComment = Um caractere XML inválido (Unicode: 0x{0}) foi encontrado no comentário.
+        InvalidCharInPI = Um caractere XML inválido (Unicode: 0x{0}) foi encontrado na instrução de processamento.
+        InvalidCharInInternalSubset = Um caractere XML inválido (Unicode: 0x {0}) foi encontrado no subconjunto interno do DTD.
+        InvalidCharInTextDecl = Um caractere XML inválido (Unicode: 0x{0}) foi encontrado na declaração de texto.
 # 2.3 Common Syntactic Constructs
-        QuoteRequiredInAttValue = O valor do atributo "{1}" deve come\u00E7ar com aspas simples ou duplas.
-        LessthanInAttValue = O valor do atributo "{1}" associado a um tipo de elemento "{0}" n\u00E3o deve conter o caractere ''<''.
+        QuoteRequiredInAttValue = O valor do atributo "{1}" deve começar com aspas simples ou duplas.
+        LessthanInAttValue = O valor do atributo "{1}" associado a um tipo de elemento "{0}" não deve conter o caractere ''<''.
         AttributeValueUnterminated = O valor do atributo "{1}" deve terminar com as aspas correspondentes.
 # 2.5 Comments
-        InvalidCommentStart = O coment\u00E1rio deve come\u00E7ar com "<!--".
-        DashDashInComment = A string "--" n\u00E3o \u00E9 permitida nos coment\u00E1rios.
-        CommentUnterminated = O coment\u00E1rio deve terminar com "-->".
-        COMMENT_NOT_IN_ONE_ENTITY = O coment\u00E1rio n\u00E3o est\u00E1 entre chaves na mesma entidade.
+        InvalidCommentStart = O comentário deve começar com "<!--".
+        DashDashInComment = A string "--" não é permitida nos comentários.
+        CommentUnterminated = O comentário deve terminar com "-->".
+        COMMENT_NOT_IN_ONE_ENTITY = O comentário não está entre chaves na mesma entidade.
 # 2.6 Processing Instructions
-        PITargetRequired = A instru\u00E7\u00E3o de processamento deve come\u00E7ar com o nome do destino.
-        SpaceRequiredInPI = O espa\u00E7o em branco \u00E9 obrigat\u00F3rio entre o destino da instru\u00E7\u00E3o de processamento e os dados.
-        PIUnterminated = A instru\u00E7\u00E3o de processamento deve terminar com "?>".
-        ReservedPITarget = O destino da instru\u00E7\u00E3o de processamento correspondente "[xX][mM][lL]" n\u00E3o \u00E9 permitido.
-        PI_NOT_IN_ONE_ENTITY = A instru\u00E7\u00E3o de processamento n\u00E3o est\u00E1 entre chaves na mesma entidade.
+        PITargetRequired = A instrução de processamento deve começar com o nome do destino.
+        SpaceRequiredInPI = O espaço em branco é obrigatório entre o destino da instrução de processamento e os dados.
+        PIUnterminated = A instrução de processamento deve terminar com "?>".
+        ReservedPITarget = O destino da instrução de processamento correspondente "[xX][mM][lL]" não é permitido.
+        PI_NOT_IN_ONE_ENTITY = A instrução de processamento não está entre chaves na mesma entidade.
 # 2.8 Prolog and Document Type Declaration
-        VersionInfoInvalid = Vers\u00E3o inv\u00E1lida "{0}".
-        VersionNotSupported = Vers\u00E3o XML "{0}" n\u00E3o suportada; somente XML 1.0 \u00E9 suportada.
-        VersionNotSupported11 = Vers\u00E3o XML "{0}" n\u00E3o suportada, somente XML 1.0 e XML 1.1 s\u00E3o suportadas.
-        VersionMismatch= Uma entidade n\u00E3o pode incluir outra entidade de uma vers\u00E3o posterior.
+        VersionInfoInvalid = Versão inválida "{0}".
+        VersionNotSupported = Versão XML "{0}" não suportada; somente XML 1.0 é suportada.
+        VersionNotSupported11 = Versão XML "{0}" não suportada, somente XML 1.0 e XML 1.1 são suportadas.
+        VersionMismatch= Uma entidade não pode incluir outra entidade de uma versão posterior.
 # 4.1 Character and Entity References
-        DigitRequiredInCharRef = Uma representa\u00E7\u00E3o decimal deve seguir imediatamente o "&#" em uma refer\u00EAncia de caractere.
-        HexdigitRequiredInCharRef = Uma representa\u00E7\u00E3o hexadecimal deve seguir imediatamente o "&#" em uma refer\u00EAncia de caractere.
-        SemicolonRequiredInCharRef = A refer\u00EAncia de caractere deve terminar com o delimitador ';'.
-        InvalidCharRef = A refer\u00EAncia do caractere "&#{0}" \u00E9 um caractere XML inv\u00E1lido.
-        NameRequiredInReference = O nome da entidade deve seguir imediatamente o '&' na refer\u00EAncia da entidade.
-        SemicolonRequiredInReference = A refer\u00EAncia \u00E0 entidade "{0}" deve terminar com o delimitador '';''.
+        DigitRequiredInCharRef = Uma representação decimal deve seguir imediatamente o "&#" em uma referência de caractere.
+        HexdigitRequiredInCharRef = Uma representação hexadecimal deve seguir imediatamente o "&#" em uma referência de caractere.
+        SemicolonRequiredInCharRef = A referência de caractere deve terminar com o delimitador ';'.
+        InvalidCharRef = A referência do caractere "&#{0}" é um caractere XML inválido.
+        NameRequiredInReference = O nome da entidade deve seguir imediatamente o '&' na referência da entidade.
+        SemicolonRequiredInReference = A referência à entidade "{0}" deve terminar com o delimitador '';''.
 # 4.3.1 The Text Declaration
-        TextDeclMustBeFirst = A declara\u00E7\u00E3o de texto somente pode aparecer bem no in\u00EDcio da entidade externa submetida a parsing.
-        EqRequiredInTextDecl = O caractere '' = '' deve estar ap\u00F3s "{0}" na declara\u00E7\u00E3o de texto.
-        QuoteRequiredInTextDecl = O valor ap\u00F3s "{0}" na declara\u00E7\u00E3o de texto deve ser uma string entre aspas.
-        CloseQuoteMissingInTextDecl = n\u00E3o foi encontrada a aspa de fechamento no valor ap\u00F3s "{0}" na declara\u00E7\u00E3o de texto.
-        SpaceRequiredBeforeVersionInTextDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes do pseudo-atributo da vers\u00E3o na declara\u00E7\u00E3o de texto.
-        SpaceRequiredBeforeEncodingInTextDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de codificar o pseudo-atributo na declara\u00E7\u00E3o de texto.
-        TextDeclUnterminated = A declara\u00E7\u00E3o de texto deve terminar com "?>".
-        EncodingDeclRequired = A declara\u00E7\u00E3o de codifica\u00E7\u00E3o \u00E9 necess\u00E1ria na declara\u00E7\u00E3o de texto.
-        NoMorePseudoAttributes = N\u00E3o s\u00E3o mais permitidos pseudo-atributos.
-        MorePseudoAttributes = S\u00E3o esperados mais pseudo-atributos.
-        PseudoAttrNameExpected = \u00C9 esperado um nome de um pseudo-atributo. 
+        TextDeclMustBeFirst = A declaração de texto somente pode aparecer bem no início da entidade externa submetida a parsing.
+        EqRequiredInTextDecl = O caractere '' = '' deve estar após "{0}" na declaração de texto.
+        QuoteRequiredInTextDecl = O valor após "{0}" na declaração de texto deve ser uma string entre aspas.
+        CloseQuoteMissingInTextDecl = não foi encontrada a aspa de fechamento no valor após "{0}" na declaração de texto.
+        SpaceRequiredBeforeVersionInTextDecl = O espaço em branco é necessário antes do pseudo-atributo da versão na declaração de texto.
+        SpaceRequiredBeforeEncodingInTextDecl = O espaço em branco é necessário antes de codificar o pseudo-atributo na declaração de texto.
+        TextDeclUnterminated = A declaração de texto deve terminar com "?>".
+        EncodingDeclRequired = A declaração de codificação é necessária na declaração de texto.
+        NoMorePseudoAttributes = Não são mais permitidos pseudo-atributos.
+        MorePseudoAttributes = São esperados mais pseudo-atributos.
+        PseudoAttrNameExpected = É esperado um nome de um pseudo-atributo. 
 # 4.3.2 Well-Formed Parsed Entities
-        CommentNotInOneEntity = O coment\u00E1rio deve estar totalmente contido na mesma entidade submetida a parsing.
-        PINotInOneEntity = A instru\u00E7\u00E3o de processamento deve estar totalmente contida na mesma entidade submetida a parsing.
+        CommentNotInOneEntity = O comentário deve estar totalmente contido na mesma entidade submetida a parsing.
+        PINotInOneEntity = A instrução de processamento deve estar totalmente contida na mesma entidade submetida a parsing.
 # 4.3.3 Character Encoding in Entities
-        EncodingDeclInvalid = Nome da codifica\u00E7\u00E3o inv\u00E1lida "{0}".
-        EncodingByteOrderUnsupported = A ordem de bytes fornecida para codifica\u00E7\u00E3o "{0}" n\u00E3o \u00E9 suportada.
-        InvalidByte = Byte inv\u00E1lido {0} da sequ\u00EAncia UTF-8 do byte {1}.
-        ExpectedByte = Esperava {0} byte da sequ\u00EAncia UTF-8 do byte {1}.  
-        InvalidHighSurrogate = Os bits substitutos altos na sequ\u00EAncia da UTF-8 n\u00E3o devem exceder 0x10 mas foi encontrado 0x{0}.
-        OperationNotSupported = A opera\u00E7\u00E3o "{0}" n\u00E3o \u00E9 suportada pelo leitor {1}.
-        InvalidASCII = O byte "{0}" n\u00E3o \u00E9 membro do conjunto de caracteres ASCII (7 bits).
-        CharConversionFailure = Uma entidade destinada a estar em uma determinada codifica\u00E7\u00E3o n\u00E3o deve conter sequ\u00EAncias inv\u00E1lidas na referida codifica\u00E7\u00E3o.
+        EncodingDeclInvalid = Nome da codificação inválida "{0}".
+        EncodingByteOrderUnsupported = A ordem de bytes fornecida para codificação "{0}" não é suportada.
+        InvalidByte = Byte inválido {0} da sequência UTF-8 do byte {1}.
+        ExpectedByte = Esperava {0} byte da sequência UTF-8 do byte {1}.  
+        InvalidHighSurrogate = Os bits substitutos altos na sequência da UTF-8 não devem exceder 0x10 mas foi encontrado 0x{0}.
+        OperationNotSupported = A operação "{0}" não é suportada pelo leitor {1}.
+        InvalidASCII = O byte "{0}" não é membro do conjunto de caracteres ASCII (7 bits).
+        CharConversionFailure = Uma entidade destinada a estar em uma determinada codificação não deve conter sequências inválidas na referida codificação.
 
 # DTD Messages
 # 2.2 Characters
-        InvalidCharInEntityValue = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no valor da entidade da literal.
-        InvalidCharInExternalSubset = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no subconjunto externo do DTD.
-        InvalidCharInIgnoreSect = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na se\u00E7\u00E3o condicional exclu\u00EDda.
-        InvalidCharInPublicID = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado no identificador p\u00FAblico.
-        InvalidCharInSystemID = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado no identificador do sistema.
+        InvalidCharInEntityValue = Um caractere XML inválido (Unicode: 0x {0}) foi encontrado no valor da entidade da literal.
+        InvalidCharInExternalSubset = Um caractere XML inválido (Unicode: 0x {0}) foi encontrado no subconjunto externo do DTD.
+        InvalidCharInIgnoreSect = Um caractere XML inválido (Unicode: 0x{0}) foi encontrado na seção condicional excluída.
+        InvalidCharInPublicID = Um caractere XML inválido (Unicode: 0x{0}) foi encontrado no identificador público.
+        InvalidCharInSystemID = Um caractere XML inválido (Unicode: 0x{0}) foi encontrado no identificador do sistema.
 # 2.3 Common Syntactic Constructs
-        SpaceRequiredAfterSYSTEM = \u00C9 necess\u00E1rio um espa\u00E7o em branco ap\u00F3s a palavra-chave SYTEM na declara\u00E7\u00E3o DOCTYPE.
-        QuoteRequiredInSystemID = O identificador do sistema deve come\u00E7ar com aspas simples ou duplas.
+        SpaceRequiredAfterSYSTEM = É necessário um espaço em branco após a palavra-chave SYTEM na declaração DOCTYPE.
+        QuoteRequiredInSystemID = O identificador do sistema deve começar com aspas simples ou duplas.
         SystemIDUnterminated = O identificador do sistema deve terminar com as aspas correspondentes.
-        SpaceRequiredAfterPUBLIC = S\u00E3o necess\u00E1rios espa\u00E7os em branco ap\u00F3s a palavra-chave PUBLIC na declara\u00E7\u00E3o DOCTYPE.
-        QuoteRequiredInPublicID = O identificador p\u00FAblico deve come\u00E7ar com aspas simples ou duplas.
-        PublicIDUnterminated = O identificador p\u00FAblico deve terminar com as aspas correspondentes.
-        PubidCharIllegal = O caractere XML (Unicode: 0x{0}) n\u00E3o \u00E9 permitido no identificador p\u00FAblico.
-        SpaceRequiredBetweenPublicAndSystem = Espa\u00E7os em branco s\u00E3o necess\u00E1rios entre publicId e systemId.
+        SpaceRequiredAfterPUBLIC = São necessários espaços em branco após a palavra-chave PUBLIC na declaração DOCTYPE.
+        QuoteRequiredInPublicID = O identificador público deve começar com aspas simples ou duplas.
+        PublicIDUnterminated = O identificador público deve terminar com as aspas correspondentes.
+        PubidCharIllegal = O caractere XML (Unicode: 0x{0}) não é permitido no identificador público.
+        SpaceRequiredBetweenPublicAndSystem = Espaços em branco são necessários entre publicId e systemId.
 # 2.8 Prolog and Document Type Declaration
-        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!DOCTYPE" na declara\u00E7\u00E3o do tipo de documento.
-        MSG_ROOT_ELEMENT_TYPE_REQUIRED = O tipo de elemento-raiz deve aparecer ap\u00F3s "<!DOCTYPE" na declara\u00E7\u00E3o do tipo de documento.
-        DoctypedeclUnterminated = A declara\u00E7\u00E3o do tipo de documento do tipo de elemento "{0}" deve terminar com ''>''.
-        DoctypedeclNotClosed = A declara\u00E7\u00E3o do tipo de documento do tipo de elemento "{0}" deve terminar com '']''.
-        PEReferenceWithinMarkup = A refer\u00EAncia da entidade do par\u00E2metro "%{0};" n\u00E3o pode ocorrer na marca\u00E7\u00E3o no subconjunto interno do DTD.
-        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = As declara\u00E7\u00F5es de marca\u00E7\u00E3o contidas ou apontadas pela declara\u00E7\u00E3o do tipo de documento devem estar corretas.
+        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = O espaço em branco é necessário após "<!DOCTYPE" na declaração do tipo de documento.
+        MSG_ROOT_ELEMENT_TYPE_REQUIRED = O tipo de elemento-raiz deve aparecer após "<!DOCTYPE" na declaração do tipo de documento.
+        DoctypedeclUnterminated = A declaração do tipo de documento do tipo de elemento "{0}" deve terminar com ''>''.
+        DoctypedeclNotClosed = A declaração do tipo de documento do tipo de elemento "{0}" deve terminar com '']''.
+        PEReferenceWithinMarkup = A referência da entidade do parâmetro "%{0};" não pode ocorrer na marcação no subconjunto interno do DTD.
+        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = As declarações de marcação contidas ou apontadas pela declaração do tipo de documento devem estar corretas.
 # 2.10 White Space Handling
-        MSG_XML_SPACE_DECLARATION_ILLEGAL = Deve ser fornecida a declara\u00E7\u00E3o do atributo para "xml:space" como um tipo enumerado, cujo os \u00FAnicos valores poss\u00EDveis s\u00E3o "padr\u00E3o" e "preserve".
+        MSG_XML_SPACE_DECLARATION_ILLEGAL = Deve ser fornecida a declaração do atributo para "xml:space" como um tipo enumerado, cujo os únicos valores possíveis são "padrão" e "preserve".
 # 3.2 Element Type Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!ELEMENT" na declara\u00E7\u00E3o do tipo de elemento.
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = O tipo de elemento \u00E9 necess\u00E1rio na declara\u00E7\u00E3o do tipo de elemento.
-        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s o tipo de elemento "{0}" na declara\u00E7\u00E3o do tipo de elemento.
-        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = A restri\u00E7\u00E3o \u00E9 necess\u00E1ria ap\u00F3s o tipo de elemento "{0}" na declara\u00E7\u00E3o do tipo de elemento.
-        ElementDeclUnterminated = A declara\u00E7\u00E3o do tipo de elemento "{0}" deve terminar com ''>''.
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = O espaço em branco é necessário após "<!ELEMENT" na declaração do tipo de elemento.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = O tipo de elemento é necessário na declaração do tipo de elemento.
+        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = O espaço em branco é necessário após o tipo de elemento "{0}" na declaração do tipo de elemento.
+        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = A restrição é necessária após o tipo de elemento "{0}" na declaração do tipo de elemento.
+        ElementDeclUnterminated = A declaração do tipo de elemento "{0}" deve terminar com ''>''.
 # 3.2.1 Element Content
-        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u00C9 necess\u00E1rio um caractere ''('' ou um tipo de elemento na declara\u00E7\u00E3o do tipo de elemento "{0}".
-        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u00C9 necess\u00E1rio um caractere '')'' na declara\u00E7\u00E3o do tipo de elemento "{0}".
+        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = É necessário um caractere ''('' ou um tipo de elemento na declaração do tipo de elemento "{0}".
+        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = É necessário um caractere '')'' na declaração do tipo de elemento "{0}".
 # 3.2.2 Mixed Content
-        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u00C9 necess\u00E1rio um tipo de elemento na declara\u00E7\u00E3o do tipo de elemento "{0}".
-        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u00C9 necess\u00E1rio um caractere '')'' na declara\u00E7\u00E3o do tipo de elemento "{0}".
-        MixedContentUnterminated = O modelo de conte\u00FAdo misto "{0}" deve terminar com ")*" quando os tipos de elementos filhos forem restringidos.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = É necessário um tipo de elemento na declaração do tipo de elemento "{0}".
+        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = É necessário um caractere '')'' na declaração do tipo de elemento "{0}".
+        MixedContentUnterminated = O modelo de conteúdo misto "{0}" deve terminar com ")*" quando os tipos de elementos filhos forem restringidos.
 # 3.3 Attribute-List Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!ATTLIST" na declara\u00E7\u00E3o da lista de atributos.
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = \u00C9 necess\u00E1rio o tipo de elemento na declara\u00E7\u00E3o da lista de atributos.
-        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do nome do atributo na declara\u00E7\u00E3o da lista de atributos do elemento "{0}".
-        AttNameRequiredInAttDef = O nome do atributo deve ser especificado na declara\u00E7\u00E3o da lista de atributos do elemento "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do tipo de atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
-        AttTypeRequiredInAttDef = \u00C9 necess\u00E1rio o tipo de atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do padr\u00E3o do atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
-        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mais de uma defini\u00E7\u00E3o de atributo fornecida para o mesmo atributo "{1}" de um determinado elemento "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = O espaço em branco é necessário após "<!ATTLIST" na declaração da lista de atributos.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = É necessário o tipo de elemento na declaração da lista de atributos.
+        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = É necessário o espaço em branco antes do nome do atributo na declaração da lista de atributos do elemento "{0}".
+        AttNameRequiredInAttDef = O nome do atributo deve ser especificado na declaração da lista de atributos do elemento "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = É necessário o espaço em branco antes do tipo de atributo na declaração do atributo "{1}" do elemento "{0}".
+        AttTypeRequiredInAttDef = É necessário o tipo de atributo na declaração do atributo "{1}" do elemento "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = É necessário o espaço em branco antes do padrão do atributo na declaração do atributo "{1}" do elemento "{0}".
+        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mais de uma definição de atributo fornecida para o mesmo atributo "{1}" de um determinado elemento "{0}".
 # 3.3.1 Attribute Types
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = O espa\u00E7o em branco deve aparecer ap\u00F3s "NOTATION" na declara\u00E7\u00E3o do atributo "{1}".
-        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = O caractere ''('' deve estar ap\u00F3s "NOTATION" na declara\u00E7\u00E3o do atributo "{1}".
-        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \u00C9 necess\u00E1rio o nome da nota\u00E7\u00E3o na lista de tipos de nota\u00E7\u00E3o para a declara\u00E7\u00E3o do atributo "{1}".
-        NotationTypeUnterminated = A lista de tipos de nota\u00E7\u00E3o deve terminar com '')'' na declara\u00E7\u00E3o do atributo "{1}".
-        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = O token do nome \u00E9 obrigat\u00F3rio na lista de tipos enumerada para a declara\u00E7\u00E3o do atributo "{1}".
-        EnumerationUnterminated = A lista de tipos enumerada deve terminar com '')'' na declara\u00E7\u00E3o do atributo "{1}".
-        MSG_DISTINCT_TOKENS_IN_ENUMERATION = O valor da enumera\u00E7\u00E3o "{1}" foi especificado mais de uma vez na declara\u00E7\u00E3o do atributo "{2}" do elemento "{0}". Os NMTOKENS em uma declara\u00E7\u00E3o de atributo de Enumera\u00E7\u00E3o \u00FAnica devem ser todos distintos.
-        MSG_DISTINCT_NOTATION_IN_ENUMERATION = O valor da enumera\u00E7\u00E3o "{1}" foi especificado mais de uma vez na declara\u00E7\u00E3o do atributo "{2}" do elemento "{0}". Os nomes da NOTATION em uma declara\u00E7\u00E3o do atributo NotationType \u00FAnica devem ser todos distintos.
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = O espaço em branco deve aparecer após "NOTATION" na declaração do atributo "{1}".
+        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = O caractere ''('' deve estar após "NOTATION" na declaração do atributo "{1}".
+        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = É necessário o nome da notação na lista de tipos de notação para a declaração do atributo "{1}".
+        NotationTypeUnterminated = A lista de tipos de notação deve terminar com '')'' na declaração do atributo "{1}".
+        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = O token do nome é obrigatório na lista de tipos enumerada para a declaração do atributo "{1}".
+        EnumerationUnterminated = A lista de tipos enumerada deve terminar com '')'' na declaração do atributo "{1}".
+        MSG_DISTINCT_TOKENS_IN_ENUMERATION = O valor da enumeração "{1}" foi especificado mais de uma vez na declaração do atributo "{2}" do elemento "{0}". Os NMTOKENS em uma declaração de atributo de Enumeração única devem ser todos distintos.
+        MSG_DISTINCT_NOTATION_IN_ENUMERATION = O valor da enumeração "{1}" foi especificado mais de uma vez na declaração do atributo "{2}" do elemento "{0}". Os nomes da NOTATION em uma declaração do atributo NotationType única devem ser todos distintos.
 # 3.3.2 Attribute Defaults
-        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = O espa\u00E7o em branco deve aparecer ap\u00F3s "FIXED" na declara\u00E7\u00E3o do atributo "{1}".
+        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = O espaço em branco deve aparecer após "FIXED" na declaração do atributo "{1}".
 # 3.4 Conditional Sections
-        IncludeSectUnterminated = A se\u00E7\u00E3o condicional inclu\u00EDda deve terminar com "]]>".
-        IgnoreSectUnterminated = A se\u00E7\u00E3o condicional exclu\u00EDda deve terminar com "]]>".
+        IncludeSectUnterminated = A seção condicional incluída deve terminar com "]]>".
+        IgnoreSectUnterminated = A seção condicional excluída deve terminar com "]]>".
 # 4.1 Character and Entity References
-        NameRequiredInPEReference = O nome da entidade deve seguir imediatamente o '%' na refer\u00EAncia da entidade do par\u00E2metro.
-        SemicolonRequiredInPEReference = A refer\u00EAncia da entidade do par\u00E2metro "%{0};" deve terminar com o delimitador '';".
+        NameRequiredInPEReference = O nome da entidade deve seguir imediatamente o '%' na referência da entidade do parâmetro.
+        SemicolonRequiredInPEReference = A referência da entidade do parâmetro "%{0};" deve terminar com o delimitador '';".
 # 4.2 Entity Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!ENTITY" na declara\u00E7\u00E3o da entidade.
-        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre "<!ENTITY" e o caractere '%' na declara\u00E7\u00E3o da entidade do par\u00E2metro.
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre '%' e o nome da entidade na declara\u00E7\u00E3o da entidade do par\u00E2metro.
-        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = O nome da entidade \u00E9 necess\u00E1rio na declara\u00E7\u00E3o da entidade.
-        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre o nome da entidade "{0}" e a defini\u00E7\u00E3o da declara\u00E7\u00E3o da entidade.
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u00C9 necess\u00E1rio um espa\u00E7o em branco entre "NDATA" e o nome da nota\u00E7\u00E3o na declara\u00E7\u00E3o da entidade "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de "NDATA" na declara\u00E7\u00E3o da entidade "{0}".
-        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = O nome da nota\u00E7\u00E3o \u00E9 necess\u00E1rio ap\u00F3s "NDATA" na declara\u00E7\u00E3o da entidade "{0}".
-        EntityDeclUnterminated = A declara\u00E7\u00E3o da entidade "{0}" deve terminar com ''>''.
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = O espaço em branco é necessário após "<!ENTITY" na declaração da entidade.
+        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = O espaço em branco é necessário entre "<!ENTITY" e o caractere '%' na declaração da entidade do parâmetro.
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = O espaço em branco é necessário entre '%' e o nome da entidade na declaração da entidade do parâmetro.
+        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = O nome da entidade é necessário na declaração da entidade.
+        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = O espaço em branco é necessário entre o nome da entidade "{0}" e a definição da declaração da entidade.
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = É necessário um espaço em branco entre "NDATA" e o nome da notação na declaração da entidade "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = O espaço em branco é necessário antes de "NDATA" na declaração da entidade "{0}".
+        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = O nome da notação é necessário após "NDATA" na declaração da entidade "{0}".
+        EntityDeclUnterminated = A declaração da entidade "{0}" deve terminar com ''>''.
 	MSG_DUPLICATE_ENTITY_DEFINITION = A entidade "{0}" foi declarada mais de uma vez.        
 # 4.2.2 External Entities
-        ExternalIDRequired = A declara\u00E7\u00E3o da entidade externa deve come\u00E7ar com "SYSTEM" ou "PUBLIC".
-        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre "PUBLIC" e o identificador p\u00FAblico.
-        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre o identificador p\u00FAblico e o identificador do sistema.
-        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre "SYSTEM" e o identificador do sistema.
-        MSG_URI_FRAGMENT_IN_SYSTEMID = O identificador do fragmento n\u00E3o deve ser especificado como parte do identificador do sistema "{0}".
+        ExternalIDRequired = A declaração da entidade externa deve começar com "SYSTEM" ou "PUBLIC".
+        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = O espaço em branco é necessário entre "PUBLIC" e o identificador público.
+        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = O espaço em branco é necessário entre o identificador público e o identificador do sistema.
+        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = O espaço em branco é necessário entre "SYSTEM" e o identificador do sistema.
+        MSG_URI_FRAGMENT_IN_SYSTEMID = O identificador do fragmento não deve ser especificado como parte do identificador do sistema "{0}".
 # 4.7 Notation Declarations
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!NOTATION" na declara\u00E7\u00E3o da nota\u00E7\u00E3o.
-        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = O nome da nota\u00E7\u00E3o \u00E9 obrigat\u00F3rio na declara\u00E7\u00E3o de nota\u00E7\u00E3o.
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s o nome da nota\u00E7\u00E3o "{0}" na declara\u00E7\u00E3o de nota\u00E7\u00E3o.
-        ExternalIDorPublicIDRequired = A declara\u00E7\u00E3o da nota\u00E7\u00E3o "{0}" deve incluir um identificador p\u00FAblico ou do sistema.
-        NotationDeclUnterminated = A declara\u00E7\u00E3o da nota\u00E7\u00E3o "{0}" deve terminar com ''>''.
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = O espaço em branco é necessário após "<!NOTATION" na declaração da notação.
+        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = O nome da notação é obrigatório na declaração de notação.
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = O espaço em branco é necessário após o nome da notação "{0}" na declaração de notação.
+        ExternalIDorPublicIDRequired = A declaração da notação "{0}" deve incluir um identificador público ou do sistema.
+        NotationDeclUnterminated = A declaração da notação "{0}" deve terminar com ''>''.
 
 # Validation messages
-        DuplicateTypeInMixedContent = O tipo de elemento "{1}" j\u00E1 foi especificado no modelo de conte\u00FAdo da declara\u00E7\u00E3o do elemento "{0}".
-        ENTITIESInvalid = O valor do atributo "{1}" do tipo ENTITIES deve ser o nome de uma ou mais entidades n\u00E3o submetidas a parsing.
-        ENTITYInvalid = O valor do atributo "{1}" do tipo ENTITY deve ser o nome de uma entidade n\u00E3o submetida a parsing.
-        IDDefaultTypeInvalid = O atributo do ID "{0}" deve ter um padr\u00E3o declarado "#IMPLIED" ou "#REQUIRED".
+        DuplicateTypeInMixedContent = O tipo de elemento "{1}" já foi especificado no modelo de conteúdo da declaração do elemento "{0}".
+        ENTITIESInvalid = O valor do atributo "{1}" do tipo ENTITIES deve ser o nome de uma ou mais entidades não submetidas a parsing.
+        ENTITYInvalid = O valor do atributo "{1}" do tipo ENTITY deve ser o nome de uma entidade não submetida a parsing.
+        IDDefaultTypeInvalid = O atributo do ID "{0}" deve ter um padrão declarado "#IMPLIED" ou "#REQUIRED".
         IDInvalid = O valor do atributo "{0}" do ID de tipo deve ser um nome.
         IDInvalidWithNamespaces = O valor do atributo "{0}" do ID de tipo deve ser um NCName quando os namespaces estiverem ativados.
         IDNotUnique = O valor do atributo "{0}" do ID de tipo deve ser exclusivo no documento.
         IDREFInvalid = O valor do atributo "{0}" do IDREF de tipo deve ser um nome.
         IDREFInvalidWithNamespaces = O valor do atributo "{0}" do IDREF de tipo deve ser um NCName quando os namespaces estiverem ativados.
         IDREFSInvalid = O valor do atributo "{0}" de tipo IDREFS deve ter um ou mais nomes.
-        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro "{0}" deve incluir as declara\u00E7\u00F5es aninhadas corretamente quando a refer\u00EAncia da entidade for usada como uma declara\u00E7\u00E3o completa.
-        ImproperDeclarationNesting = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro "{0}" deve incluir as declara\u00E7\u00F5es aninhadas corretamente.
-        ImproperGroupNesting = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro "{0}" deve incluir pares de par\u00EAnteses aninhados corretamente.
-        INVALID_PE_IN_CONDITIONAL = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro "{0}" deve incluir a se\u00E7\u00E3o condicional inteira ou apenas INCLUDE ou IGNORE.
+        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = O texto de substituição da entidade do parâmetro "{0}" deve incluir as declarações aninhadas corretamente quando a referência da entidade for usada como uma declaração completa.
+        ImproperDeclarationNesting = O texto de substituição da entidade do parâmetro "{0}" deve incluir as declarações aninhadas corretamente.
+        ImproperGroupNesting = O texto de substituição da entidade do parâmetro "{0}" deve incluir pares de parênteses aninhados corretamente.
+        INVALID_PE_IN_CONDITIONAL = O texto de substituição da entidade do parâmetro "{0}" deve incluir a seção condicional inteira ou apenas INCLUDE ou IGNORE.
         MSG_ATTRIBUTE_NOT_DECLARED = O atributo "{1}" deve ser declarado para o tipo de elemento "{0}".
         MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = O atributo "{0}" com o valor "{1}" deve ter um valor da lista "{2}".
-        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = O valor "{1}" do atributo "{0}" n\u00E3o deve ser alterado por meio da normaliza\u00E7\u00E3o (para "{2}") em um documento stand-alone.
-        MSG_CONTENT_INCOMPLETE = O conte\u00FAdo do tipo de elemento "{0}" est\u00E1 incompleto; ele deve corresponder a "{1}".
-        MSG_CONTENT_INVALID = O conte\u00FAdo do tipo de elemento "{0}" deve corresponder a "{1}".
-        MSG_CONTENT_INVALID_SPECIFIED = O conte\u00FAdo do tipo de elemento "{0}" deve corresponder a "{1}". N\u00E3o s\u00E3o permitidos os filhos do tipo "{2}".
-        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = O atributo "{1}" do tipo de elemento "{0}" tem um valor padr\u00E3o e deve ser especificado em um documento stand-alone.
-        MSG_DUPLICATE_ATTDEF = O atributo "{1}" j\u00E1 foi declarado para o tipo de elemento "{0}".
-        MSG_ELEMENT_ALREADY_DECLARED = O tipo de elemento "{0}" n\u00E3o deve ser declarado mais de uma vez.
+        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = O valor "{1}" do atributo "{0}" não deve ser alterado por meio da normalização (para "{2}") em um documento stand-alone.
+        MSG_CONTENT_INCOMPLETE = O conteúdo do tipo de elemento "{0}" está incompleto; ele deve corresponder a "{1}".
+        MSG_CONTENT_INVALID = O conteúdo do tipo de elemento "{0}" deve corresponder a "{1}".
+        MSG_CONTENT_INVALID_SPECIFIED = O conteúdo do tipo de elemento "{0}" deve corresponder a "{1}". Não são permitidos os filhos do tipo "{2}".
+        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = O atributo "{1}" do tipo de elemento "{0}" tem um valor padrão e deve ser especificado em um documento stand-alone.
+        MSG_DUPLICATE_ATTDEF = O atributo "{1}" já foi declarado para o tipo de elemento "{0}".
+        MSG_ELEMENT_ALREADY_DECLARED = O tipo de elemento "{0}" não deve ser declarado mais de uma vez.
         MSG_ELEMENT_NOT_DECLARED = O tipo de elemento "{0}" deve ser declarado.
-        MSG_GRAMMAR_NOT_FOUND = O documento \u00E9 inv\u00E1lido: nenhuma gram\u00E1tica encontrada.
+        MSG_GRAMMAR_NOT_FOUND = O documento é inválido: nenhuma gramática encontrada.
         MSG_ELEMENT_WITH_ID_REQUIRED = Um elemento com o identificador "{0}" deve aparecer no documento.
-        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = A refer\u00EAncia \u00E0 entidade externa "{0}" n\u00E3o \u00E9 permitida em um documento stand-alone.
+        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = A referência à entidade externa "{0}" não é permitida em um documento stand-alone.
         MSG_FIXED_ATTVALUE_INVALID = O atributo "{1}" com o valor "{2}" deve ter um valor "{3}".
-        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = O tipo de elemento "{0}" j\u00E1 tem o atributo "{1}" do ID do tipo; um segundo atributo "{2}" do ID de tipo n\u00E3o \u00E9 permitido.
-        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = O tipo de elemento "{0}" j\u00E1 tem o atributo "{1}" do tipo NOTATION; um segundo atributo "{2}" do tipo NOTATION n\u00E3o \u00E9 permitido.
-        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = A nota\u00E7\u00E3o "{1}" deve ser declarada quando referenciada na lista de tipos de nota\u00E7\u00E3o do atributo "{0}".
-        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = A nota\u00E7\u00E3o "{1}" deve ser declarada quando referenciada na declara\u00E7\u00E3o da entidade n\u00E3o submetida a parsing para "{0}".
-        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = A refer\u00EAncia \u00E0 entidade "{0}" declarada em uma entidade externa submetida a parsing n\u00E3o \u00E9 permitida em um documento stand-alone.
-        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = O atributo "{1}" \u00E9 necess\u00E1rio e deve ser especificado para o tipo de elemento "{0}".
-        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = N\u00E3o deve haver espa\u00E7o em branco entre os elementos declarados em uma entidade externa submetida a parsing com o conte\u00FAdo do elemento em um documento stand-alone.
+        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = O tipo de elemento "{0}" já tem o atributo "{1}" do ID do tipo; um segundo atributo "{2}" do ID de tipo não é permitido.
+        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = O tipo de elemento "{0}" já tem o atributo "{1}" do tipo NOTATION; um segundo atributo "{2}" do tipo NOTATION não é permitido.
+        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = A notação "{1}" deve ser declarada quando referenciada na lista de tipos de notação do atributo "{0}".
+        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = A notação "{1}" deve ser declarada quando referenciada na declaração da entidade não submetida a parsing para "{0}".
+        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = A referência à entidade "{0}" declarada em uma entidade externa submetida a parsing não é permitida em um documento stand-alone.
+        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = O atributo "{1}" é necessário e deve ser especificado para o tipo de elemento "{0}".
+        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Não deve haver espaço em branco entre os elementos declarados em uma entidade externa submetida a parsing com o conteúdo do elemento em um documento stand-alone.
         NMTOKENInvalid = O valor do atributo "{0}" do tipo NMTOKEN deve ser um token de nome.
         NMTOKENSInvalid = O valor do atributo "{0}" do tipo NMTOKENS deve ter um ou mais tokens de nome.
-        NoNotationOnEmptyElement = O tipo de elemento "{0}" que foi declarado EMPTY n\u00E3o pode declarar o atributo "{1}" do tipo NOTATION.
-        RootElementTypeMustMatchDoctypedecl = O elemento-raiz do documento "{1}" deve corresponder \u00E0 raiz de DOCTYPE "{0}".
-        UndeclaredElementInContentSpec = O modelo do conte\u00FAdo do elemento "{0}" refere-se ao elemento n\u00E3o declarado "{1}".
-        UniqueNotationName = A declara\u00E7\u00E3o da nota\u00E7\u00E3o "{0}" n\u00E3o \u00E9 exclusiva. Um Nome fornecido n\u00E3o deve ser declarado em mais de uma declara\u00E7\u00E3o de nota\u00E7\u00E3o.
-        ENTITYFailedInitializeGrammar =  Validador de ENTITYDatatype: Falha ao chamar o m\u00E9todo de inicializa\u00E7\u00E3o com uma refer\u00EAncia de Gram\u00E1tica v\u00E1lida. \t
-        ENTITYNotUnparsed = ENTITY "{0}" n\u00E3o \u00E9 submetida a parsing.
-        ENTITYNotValid = ENTITY "{0}" n\u00E3o \u00E9 v\u00E1lida.
-        EmptyList = O valor dos tipos ENTITIES, IDREFS e NMTOKENS n\u00E3o pode estar na lista vazia.
+        NoNotationOnEmptyElement = O tipo de elemento "{0}" que foi declarado EMPTY não pode declarar o atributo "{1}" do tipo NOTATION.
+        RootElementTypeMustMatchDoctypedecl = O elemento-raiz do documento "{1}" deve corresponder à raiz de DOCTYPE "{0}".
+        UndeclaredElementInContentSpec = O modelo do conteúdo do elemento "{0}" refere-se ao elemento não declarado "{1}".
+        UniqueNotationName = A declaração da notação "{0}" não é exclusiva. Um Nome fornecido não deve ser declarado em mais de uma declaração de notação.
+        ENTITYFailedInitializeGrammar =  Validador de ENTITYDatatype: Falha ao chamar o método de inicialização com uma referência de Gramática válida. \t
+        ENTITYNotUnparsed = ENTITY "{0}" não é submetida a parsing.
+        ENTITYNotValid = ENTITY "{0}" não é válida.
+        EmptyList = O valor dos tipos ENTITIES, IDREFS e NMTOKENS não pode estar na lista vazia.
 
 # Entity related messages
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ReferenceToExternalEntity = A refer\u00EAncia da entidade externa "&{0};" n\u00E3o \u00E9 permitida em um valor do atributo.
-        AccessExternalDTD = DTD Externo: falha ao ler o DTD ''{0}'' externo porque o acesso a ''{1}'' n\u00E3o \u00E9 permitido em decorr\u00EAncia de uma restri\u00E7\u00E3o definida pela propriedade accessExternalDTD.
-        AccessExternalEntity = Entidade Externa: falha ao ler o documento ''{0}'' externo porque o acesso a ''{1}'' n\u00E3o \u00E9 permitido em decorr\u00EAncia de uma restri\u00E7\u00E3o definida pela propriedade accessExternalDTD.
+        ReferenceToExternalEntity = A referência da entidade externa "&{0};" não é permitida em um valor do atributo.
+        AccessExternalDTD = DTD Externo: falha ao ler o DTD ''{0}'' externo porque o acesso a ''{1}'' não é permitido em decorrência de uma restrição definida pela propriedade accessExternalDTD.
+        AccessExternalEntity = Entidade Externa: falha ao ler o documento ''{0}'' externo porque o acesso a ''{1}'' não é permitido em decorrência de uma restrição definida pela propriedade accessExternalDTD.
 
 # 4.1 Character and Entity References
-        EntityNotDeclared = A entidade "{0}" foi referenciada, mas n\u00E3o declarada.
-        ReferenceToUnparsedEntity = A refer\u00EAncia da entidade n\u00E3o submetida a parsing "&{0};" n\u00E3o \u00E9 permitida.
-        RecursiveReference = Refer\u00EAncia da entidade recursiva "{0}". (Caminho de refer\u00EAncia: {1}),
-        RecursiveGeneralReference = Refer\u00EAncia geral da entidade recursiva "&{0};". (Caminho de refer\u00EAncia: {1}),
-        RecursivePEReference = Refer\u00EAncia da entidade do par\u00E2metro recursivo "%{0};". (Caminho de refer\u00EAncia: {1}),
+        EntityNotDeclared = A entidade "{0}" foi referenciada, mas não declarada.
+        ReferenceToUnparsedEntity = A referência da entidade não submetida a parsing "&{0};" não é permitida.
+        RecursiveReference = Referência da entidade recursiva "{0}". (Caminho de referência: {1}),
+        RecursiveGeneralReference = Referência geral da entidade recursiva "&{0};". (Caminho de referência: {1}),
+        RecursivePEReference = Referência da entidade do parâmetro recursivo "%{0};". (Caminho de referência: {1}),
 # 4.3.3 Character Encoding in Entities
-        EncodingNotSupported = A codifica\u00E7\u00E3o "{0}" n\u00E3o \u00E9 suportada.
-        EncodingRequired = Uma entidade submetida a parsing n\u00E3o codificada em UTF-8 nem em UTF-16 deve conter uma declara\u00E7\u00E3o de codifica\u00E7\u00E3o.
+        EncodingNotSupported = A codificação "{0}" não é suportada.
+        EncodingRequired = Uma entidade submetida a parsing não codificada em UTF-8 nem em UTF-16 deve conter uma declaração de codificação.
 
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = O elemento ou o atributo n\u00E3o correspondem \u00E0 produ\u00E7\u00E3o QName: QName::=(NCName':')?NCName.
-        ElementXMLNSPrefix = O elemento "{0}" n\u00E3o pode ter "xmlns" como seu prefixo.
-        ElementPrefixUnbound = O prefixo "{0}" do elemento "{1}" n\u00E3o est\u00E1 vinculado.
-        AttributePrefixUnbound = O prefixo "{2}" do atributo "{1}" associado a um tipo de elemento "{0}" n\u00E3o est\u00E1 vinculado.
-        EmptyPrefixedAttName = O valor do atributo "{0}" \u00E9 inv\u00E1lido. Associa\u00E7\u00F5es de namespace prefixadas n\u00E3o podem ficar vazias.
-        PrefixDeclared = O prefixo do namespace "{0}" n\u00E3o foi declarado.
-        CantBindXMLNS = O prefixo "xmlns" n\u00E3o pode ser vinculado a um namespace explicitamente, assim como o namespace de "xmlns" n\u00E3o pode ser vinculado a um prefixo explicitamente.
-        CantBindXML = O prefixo "xml" n\u00E3o pode ser vinculado a um namespace diferente do namespace comum, assim como o namespace de "xml" n\u00E3o pode ser vinculado a um prefixo diferente de "xml".
-        MSG_ATT_DEFAULT_INVALID = O defaultValue "{1}" do atributo "{0}" n\u00E3o \u00E9 v\u00E1lido para as restri\u00E7\u00F5es l\u00E9xicas deste tipo de atributo.
+        IllegalQName = O elemento ou o atributo não correspondem à produção QName: QName::=(NCName':')?NCName.
+        ElementXMLNSPrefix = O elemento "{0}" não pode ter "xmlns" como seu prefixo.
+        ElementPrefixUnbound = O prefixo "{0}" do elemento "{1}" não está vinculado.
+        AttributePrefixUnbound = O prefixo "{2}" do atributo "{1}" associado a um tipo de elemento "{0}" não está vinculado.
+        EmptyPrefixedAttName = O valor do atributo "{0}" é inválido. Associações de namespace prefixadas não podem ficar vazias.
+        PrefixDeclared = O prefixo do namespace "{0}" não foi declarado.
+        CantBindXMLNS = O prefixo "xmlns" não pode ser vinculado a um namespace explicitamente, assim como o namespace de "xmlns" não pode ser vinculado a um prefixo explicitamente.
+        CantBindXML = O prefixo "xml" não pode ser vinculado a um namespace diferente do namespace comum, assim como o namespace de "xml" não pode ser vinculado a um prefixo diferente de "xml".
+        MSG_ATT_DEFAULT_INVALID = O defaultValue "{1}" do atributo "{0}" não é válido para as restrições léxicas deste tipo de atributo.
 
 # REVISIT: These need messages
         MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
@@ -295,14 +295,14 @@
 
 
 # Implementation limits
-        EntityExpansionLimit=JAXP00010001: O parser detectou mais de "{0}" expans\u00F5es da entidade neste documento. Este \u00E9 o limite imposto pelo JDK.
-        ElementAttributeLimit=JAXP00010002: o elemento "{0}" tem mais de "{1}" atributos. "{1}" \u00E9 o limite imposto pelo JDK.
-        MaxEntitySizeLimit=JAXP00010003: o tamanho da entidade "{0}" \u00E9 "{1}", o que excede o limite de "{2}" definido por "{3}".
-        TotalEntitySizeLimit=JAXP00010004: o tamanho acumulado de entidades \u00E9 "{0}", o que excedeu o limite de "{1}" definido por "{2}".
-        MaxXMLNameLimit=JAXP00010005: o tamanho da entidade "{0}" \u00E9 "{1}", o que excede o limite de "{2}" definido por "{3}".
+        EntityExpansionLimit=JAXP00010001: O parser detectou mais de "{0}" expansões da entidade neste documento. Este é o limite imposto pelo JDK.
+        ElementAttributeLimit=JAXP00010002: o elemento "{0}" tem mais de "{1}" atributos. "{1}" é o limite imposto pelo JDK.
+        MaxEntitySizeLimit=JAXP00010003: o tamanho da entidade "{0}" é "{1}", o que excede o limite de "{2}" definido por "{3}".
+        TotalEntitySizeLimit=JAXP00010004: o tamanho acumulado de entidades é "{0}", o que excedeu o limite de "{1}" definido por "{2}".
+        MaxXMLNameLimit=JAXP00010005: o tamanho da entidade "{0}" é "{1}", o que excede o limite de "{2}" definido por "{3}".
         MaxElementDepthLimit=JAXP00010006: o elemento "{0}" tem uma profundidade de "{1}" que excede o limite de "{2}" definido por "{3}".
-        EntityReplacementLimit=JAXP00010007: O n\u00FAmero total de n\u00F3s nas refer\u00EAncias da entidade \u00E9 de "{0}", o que est\u00E1 acima do limite de "{1}" definido por "{2}".
+        EntityReplacementLimit=JAXP00010007: O número total de nós nas referências da entidade é de "{0}", o que está acima do limite de "{1}" definido por "{2}".
 
 # Catalog 09
 # Technical term, do not translate: catalog
-        CatalogException=JAXP00090001: O CatalogResolver foi ativado com o cat\u00E1logo "{0}", mas uma CatalogException foi retornada.
+        CatalogException=JAXP00090001: O CatalogResolver foi ativado com o catálogo "{0}", mas uma CatalogException foi retornada.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
index d0ea7ba30a3..b94d0f982a3 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
@@ -4,289 +4,289 @@
 # @version
 
         BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
-        FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n  
+        FormatFailed = Ett internt fel inträffade vid formatering av följande meddelande:\n  
 
 # Document messages
-        PrematureEOF=Filen har avslutats f\u00F6r tidigt.
+        PrematureEOF=Filen har avslutats för tidigt.
 # 2.1 Well-Formed XML Documents
-        RootElementRequired = Rotelementet kr\u00E4vs i ett v\u00E4lformulerat dokument.
+        RootElementRequired = Rotelementet krävs i ett välformulerat dokument.
 # 2.2 Characters
 
         InvalidCharInCDSect = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i CDATA-sektionen.
-        InvalidCharInContent = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i dokumentets elementinneh\u00E5ll.
-        TwoColonsInQName = En ogiltig andra f\u00F6rekomst av ':' hittades i elementtyp eller attributnamn.
-        ColonNotLegalWithNS = Kolon \u00E4r inte till\u00E5tet i namnet ''{0}'' om namnrymder \u00E4r aktiverade.
-        InvalidCharInMisc = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i kodtext efter elementinneh\u00E5llet.
+        InvalidCharInContent = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i dokumentets elementinnehåll.
+        TwoColonsInQName = En ogiltig andra förekomst av ':' hittades i elementtyp eller attributnamn.
+        ColonNotLegalWithNS = Kolon är inte tillåtet i namnet ''{0}'' om namnrymder är aktiverade.
+        InvalidCharInMisc = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i kodtext efter elementinnehållet.
         InvalidCharInProlog = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i dokumentets prolog.
         InvalidCharInXMLDecl = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i XML-deklarationen.
 # 2.4 Character Data and Markup
-        CDEndInContent = Teckensekvensen "]]>" f\u00E5r inte f\u00F6rekomma i inneh\u00E5llet, s\u00E5vida det inte anv\u00E4nds f\u00F6r att markera slut av CDATA-sektion.
+        CDEndInContent = Teckensekvensen "]]>" får inte förekomma i innehållet, såvida det inte används för att markera slut av CDATA-sektion.
 # 2.7 CDATA Sections
-        CDSectUnterminated = CDATA-sektionen m\u00E5ste sluta med "]]>".
+        CDSectUnterminated = CDATA-sektionen måste sluta med "]]>".
 # 2.8 Prolog and Document Type Declaration
-        XMLDeclMustBeFirst = XML-deklarationen f\u00E5r endast f\u00F6rekomma allra \u00F6verst i dokumentet.
-        EqRequiredInXMLDecl = Tecknet '' = '' m\u00E5ste anges efter "{0}" i XML-deklarationen.
-        QuoteRequiredInXMLDecl = V\u00E4rdet som f\u00F6ljer "{0}" i XML-deklarationen m\u00E5ste omges av citattecken.
-        XMLDeclUnterminated = XML-deklarationen m\u00E5ste avslutas med "?>".
-        VersionInfoRequired = Versionen kr\u00E4vs i XML-deklarationen.
-        SpaceRequiredBeforeVersionInXMLDecl = Tomt utrymme kr\u00E4vs f\u00F6re versionens pseudoattribut i XML-deklarationen.
-        SpaceRequiredBeforeEncodingInXMLDecl = Tomt utrymme kr\u00E4vs f\u00F6re kodningens pseudoattribut i XML-deklarationen.
-        SpaceRequiredBeforeStandalone = Tomt utrymme kr\u00E4vs f\u00F6re kodningens pseudoattribut i XML-deklarationen.
-        MarkupNotRecognizedInProlog = Dokumentets kodtext f\u00F6re rotelementet m\u00E5ste vara v\u00E4lformulerad.
-        MarkupNotRecognizedInMisc = Dokumentets kodtext efter rotelementet m\u00E5ste vara v\u00E4lformulerad.
+        XMLDeclMustBeFirst = XML-deklarationen får endast förekomma allra överst i dokumentet.
+        EqRequiredInXMLDecl = Tecknet '' = '' måste anges efter "{0}" i XML-deklarationen.
+        QuoteRequiredInXMLDecl = Värdet som följer "{0}" i XML-deklarationen måste omges av citattecken.
+        XMLDeclUnterminated = XML-deklarationen måste avslutas med "?>".
+        VersionInfoRequired = Versionen krävs i XML-deklarationen.
+        SpaceRequiredBeforeVersionInXMLDecl = Tomt utrymme krävs före versionens pseudoattribut i XML-deklarationen.
+        SpaceRequiredBeforeEncodingInXMLDecl = Tomt utrymme krävs före kodningens pseudoattribut i XML-deklarationen.
+        SpaceRequiredBeforeStandalone = Tomt utrymme krävs före kodningens pseudoattribut i XML-deklarationen.
+        MarkupNotRecognizedInProlog = Dokumentets kodtext före rotelementet måste vara välformulerad.
+        MarkupNotRecognizedInMisc = Dokumentets kodtext efter rotelementet måste vara välformulerad.
         AlreadySeenDoctype = DOCTYPE har redan tagits emot.
-        DoctypeNotAllowed = DOCTYPE \u00E4r inte till\u00E5tet om funktionen "http://apache.org/xml/features/disallow-doctype-decl" anges som true.
-        ContentIllegalInProlog = Inneh\u00E5llet \u00E4r inte till\u00E5tet i prologen.
-        ReferenceIllegalInProlog = Referensen \u00E4r inte till\u00E5ten i prologen.
+        DoctypeNotAllowed = DOCTYPE är inte tillåtet om funktionen "http://apache.org/xml/features/disallow-doctype-decl" anges som true.
+        ContentIllegalInProlog = Innehållet är inte tillåtet i prologen.
+        ReferenceIllegalInProlog = Referensen är inte tillåten i prologen.
 # Trailing Misc
-        ContentIllegalInTrailingMisc=Inneh\u00E5llet \u00E4r inte till\u00E5tet i efterf\u00F6ljande sektion.
-        ReferenceIllegalInTrailingMisc=Referensen \u00E4r inte till\u00E5ten i efterf\u00F6ljande sektion.
+        ContentIllegalInTrailingMisc=Innehållet är inte tillåtet i efterföljande sektion.
+        ReferenceIllegalInTrailingMisc=Referensen är inte tillåten i efterföljande sektion.
 
 # 2.9 Standalone Document Declaration
-        SDDeclInvalid = Deklarationsv\u00E4rdet f\u00F6r frist\u00E5ende dokument m\u00E5ste vara "yes" eller "no", inte "{0}".
-        SDDeclNameInvalid = Det frist\u00E5ende namnet i XML-deklarationen kan vara felstavat.
+        SDDeclInvalid = Deklarationsvärdet för fristående dokument måste vara "yes" eller "no", inte "{0}".
+        SDDeclNameInvalid = Det fristående namnet i XML-deklarationen kan vara felstavat.
 # 2.12 Language Identification
-        XMLLangInvalid = Attributv\u00E4rdet "{0}" f\u00F6r xml:lang \u00E4r en ogiltig spr\u00E5kidentifierare.
+        XMLLangInvalid = Attributvärdet "{0}" för xml:lang är en ogiltig språkidentifierare.
 # 3. Logical Structures
-        ETagRequired = Elementtyp "{0}" m\u00E5ste avslutas med matchande sluttagg "</{0}>".
+        ETagRequired = Elementtyp "{0}" måste avslutas med matchande sluttagg "</{0}>".
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ElementUnterminated = Elementtyp "{0}" m\u00E5ste f\u00F6ljas av n\u00E5gondera av attributspecifikationerna ">" eller "/>".
-        EqRequiredInAttribute = Attributnamnet "{1}" som associeras med elementtyp "{0}" m\u00E5ste f\u00F6ljas av likhetstecknet ('' = '').
-        OpenQuoteExpected = \u00D6ppningscitattecken f\u00F6rv\u00E4ntas f\u00F6r attributet "{1}" som associeras med elementtyp "{0}".
-        CloseQuoteExpected = Slutcitattecken f\u00F6rv\u00E4ntas f\u00F6r attributet "{1}" som associeras med elementtyp "{0}".
-        AttributeNotUnique = Attributet "{1}" har redan angetts f\u00F6r elementet "{0}".
-        AttributeNSNotUnique = Attributet "{1}" bundet till namnrymden "{2}" har redan angetts f\u00F6r elementet "{0}".
-        ETagUnterminated = Sluttaggen f\u00F6r elementtyp "{0}" m\u00E5ste avslutas med en ''>''-avgr\u00E4nsare.
-        MarkupNotRecognizedInContent = Elementinneh\u00E5llet m\u00E5ste best\u00E5 av v\u00E4lformulerad(e) teckendata eller kodtext.
-        DoctypeIllegalInContent = DOCTYPE \u00E4r inte till\u00E5tet i inneh\u00E5llet.
+        ElementUnterminated = Elementtyp "{0}" måste följas av någondera av attributspecifikationerna ">" eller "/>".
+        EqRequiredInAttribute = Attributnamnet "{1}" som associeras med elementtyp "{0}" måste följas av likhetstecknet ('' = '').
+        OpenQuoteExpected = Öppningscitattecken förväntas för attributet "{1}" som associeras med elementtyp "{0}".
+        CloseQuoteExpected = Slutcitattecken förväntas för attributet "{1}" som associeras med elementtyp "{0}".
+        AttributeNotUnique = Attributet "{1}" har redan angetts för elementet "{0}".
+        AttributeNSNotUnique = Attributet "{1}" bundet till namnrymden "{2}" har redan angetts för elementet "{0}".
+        ETagUnterminated = Sluttaggen för elementtyp "{0}" måste avslutas med en ''>''-avgränsare.
+        MarkupNotRecognizedInContent = Elementinnehållet måste bestå av välformulerad(e) teckendata eller kodtext.
+        DoctypeIllegalInContent = DOCTYPE är inte tillåtet i innehållet.
 # 4.1 Character and Entity References
-        ReferenceUnterminated = Referensen m\u00E5ste avslutas med en ';'-avgr\u00E4nsare.
+        ReferenceUnterminated = Referensen måste avslutas med en ';'-avgränsare.
 # 4.3.2 Well-Formed Parsed Entities
-        ReferenceNotInOneEntity = Referensen m\u00E5ste finnas med inom samma tolkade enhet.
-        ElementEntityMismatch = Elementet "{0}" m\u00E5ste b\u00F6rja och sluta inom samma enhet.
-        MarkupEntityMismatch=XML-dokumentstrukturer m\u00E5ste b\u00F6rja och sluta inom samma enhet.
+        ReferenceNotInOneEntity = Referensen måste finnas med inom samma tolkade enhet.
+        ElementEntityMismatch = Elementet "{0}" måste börja och sluta inom samma enhet.
+        MarkupEntityMismatch=XML-dokumentstrukturer måste börja och sluta inom samma enhet.
 
 # Messages common to Document and DTD
 # 2.2 Characters
-        InvalidCharInAttValue = Ett ogiltigt XML-tecken (Unicode: 0x{2}) hittades i attributv\u00E4rdet "{1}" och elementet \u00E4r "{0}".
+        InvalidCharInAttValue = Ett ogiltigt XML-tecken (Unicode: 0x{2}) hittades i attributvärdet "{1}" och elementet är "{0}".
         InvalidCharInComment = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i kommentaren.
         InvalidCharInPI = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i bearbetningsinstruktionen.
-        InvalidCharInInternalSubset = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i den interna delm\u00E4ngden i DTD.
+        InvalidCharInInternalSubset = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i den interna delmängden i DTD.
         InvalidCharInTextDecl = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i textdeklarationen.
 # 2.3 Common Syntactic Constructs
-        QuoteRequiredInAttValue = Attributv\u00E4rdet "{1}" m\u00E5ste b\u00F6rja med antingen enkelt eller dubbelt citattecken.
-        LessthanInAttValue = Attributv\u00E4rdet "{1}" som associeras med elementtyp "{0}" f\u00E5r inte inneh\u00E5lla n\u00E5got ''<''-tecken.
-        AttributeValueUnterminated = Attributv\u00E4rdet "{1}" m\u00E5ste avslutas med matchande citattecken.
+        QuoteRequiredInAttValue = Attributvärdet "{1}" måste börja med antingen enkelt eller dubbelt citattecken.
+        LessthanInAttValue = Attributvärdet "{1}" som associeras med elementtyp "{0}" får inte innehålla något ''<''-tecken.
+        AttributeValueUnterminated = Attributvärdet "{1}" måste avslutas med matchande citattecken.
 # 2.5 Comments
-        InvalidCommentStart = Kommentarer m\u00E5ste inledas med "<!--".
-        DashDashInComment = Str\u00E4ngen "--" \u00E4r inte till\u00E5ten inom kommentarer.
-        CommentUnterminated = Kommentaren m\u00E5ste avslutas med "-->".
+        InvalidCommentStart = Kommentarer måste inledas med "<!--".
+        DashDashInComment = Strängen "--" är inte tillåten inom kommentarer.
+        CommentUnterminated = Kommentaren måste avslutas med "-->".
         COMMENT_NOT_IN_ONE_ENTITY = Kommentaren innesluts inte i samma enhet.
 # 2.6 Processing Instructions
-        PITargetRequired = Bearbetningsinstruktionen m\u00E5ste b\u00F6rja med m\u00E5lnamnet.
-        SpaceRequiredInPI = Tomt utrymme kr\u00E4vs mellan bearbetningsinstruktionens m\u00E5l och data.
-        PIUnterminated = Bearbetningsinstruktionen m\u00E5ste avslutas med "?>".
-        ReservedPITarget = Bearbetningsinstruktionens m\u00E5lmatchning "[xX][mM][lL]" \u00E4r inte till\u00E5ten.
+        PITargetRequired = Bearbetningsinstruktionen måste börja med målnamnet.
+        SpaceRequiredInPI = Tomt utrymme krävs mellan bearbetningsinstruktionens mål och data.
+        PIUnterminated = Bearbetningsinstruktionen måste avslutas med "?>".
+        ReservedPITarget = Bearbetningsinstruktionens målmatchning "[xX][mM][lL]" är inte tillåten.
         PI_NOT_IN_ONE_ENTITY = Bearbetningsinstruktionen innesluts inte i samma enhet.
 # 2.8 Prolog and Document Type Declaration
         VersionInfoInvalid = Ogiltig version "{0}".
-        VersionNotSupported = XML-versionen "{0}" st\u00F6ds inte, endast XML 1.0 st\u00F6ds.
-        VersionNotSupported11 = XML-versionen "{0}" st\u00F6ds inte, endast XML 1.0 och XML 1.1 st\u00F6ds.
-        VersionMismatch= En enhet kan inte inkludera n\u00E5gon annan enhet som har en senare version.
+        VersionNotSupported = XML-versionen "{0}" stöds inte, endast XML 1.0 stöds.
+        VersionNotSupported11 = XML-versionen "{0}" stöds inte, endast XML 1.0 och XML 1.1 stöds.
+        VersionMismatch= En enhet kan inte inkludera någon annan enhet som har en senare version.
 # 4.1 Character and Entity References
-        DigitRequiredInCharRef = Ett decimalt uttryck m\u00E5ste anges direkt efter "&#" i en teckenreferens.
-        HexdigitRequiredInCharRef = Ett hexadecimalt uttryck m\u00E5ste anges direkt efter "&#x" i en teckenreferens.
-        SemicolonRequiredInCharRef = Teckenreferensen m\u00E5ste avslutas med ';'-avgr\u00E4nsare.
-        InvalidCharRef = Teckenreferensen "&#{0}" \u00E4r ett ogiltigt XML-tecken.
-        NameRequiredInReference = Enhetsnamnet m\u00E5ste omedelbart f\u00F6ljas av '&' i enhetsreferensen.
-        SemicolonRequiredInReference = Referensen till enhet "{0}" m\u00E5ste avslutas med '';''-avgr\u00E4nsare.
+        DigitRequiredInCharRef = Ett decimalt uttryck måste anges direkt efter "&#" i en teckenreferens.
+        HexdigitRequiredInCharRef = Ett hexadecimalt uttryck måste anges direkt efter "&#x" i en teckenreferens.
+        SemicolonRequiredInCharRef = Teckenreferensen måste avslutas med ';'-avgränsare.
+        InvalidCharRef = Teckenreferensen "&#{0}" är ett ogiltigt XML-tecken.
+        NameRequiredInReference = Enhetsnamnet måste omedelbart följas av '&' i enhetsreferensen.
+        SemicolonRequiredInReference = Referensen till enhet "{0}" måste avslutas med '';''-avgränsare.
 # 4.3.1 The Text Declaration
-        TextDeclMustBeFirst = Textdeklarationen m\u00E5ste anges direkt i b\u00F6rjan av externt tolkad enhet.
-        EqRequiredInTextDecl = Ett likhetstecken ('' = '') m\u00E5ste anges efter "{0}" i textdeklarationen.
-        QuoteRequiredInTextDecl = V\u00E4rdet som f\u00F6ljer "{0}" i textdeklarationen m\u00E5ste omges av citattecken.
-        CloseQuoteMissingInTextDecl = avslutande citattecken saknas f\u00F6r v\u00E4rdet efter "{0}" i textdeklarationen.
-        SpaceRequiredBeforeVersionInTextDecl = Tomt utrymme kr\u00E4vs f\u00F6re versionens pseudoattribut i textdeklarationen.
-        SpaceRequiredBeforeEncodingInTextDecl = Tomt utrymme kr\u00E4vs f\u00F6re kodningens pseudoattribut i textdeklarationen.
-        TextDeclUnterminated = Textdeklarationen m\u00E5ste avslutas med "?>".
-        EncodingDeclRequired = Koddeklaration kr\u00E4vs i textdeklarationen.
-        NoMorePseudoAttributes = Inga fler pseudoattribut \u00E4r till\u00E5tna.
-        MorePseudoAttributes = Ytterligare pseudoattribut f\u00F6rv\u00E4ntas.
-        PseudoAttrNameExpected = Ett pseudoattributnamn f\u00F6rv\u00E4ntas. 
+        TextDeclMustBeFirst = Textdeklarationen måste anges direkt i början av externt tolkad enhet.
+        EqRequiredInTextDecl = Ett likhetstecken ('' = '') måste anges efter "{0}" i textdeklarationen.
+        QuoteRequiredInTextDecl = Värdet som följer "{0}" i textdeklarationen måste omges av citattecken.
+        CloseQuoteMissingInTextDecl = avslutande citattecken saknas för värdet efter "{0}" i textdeklarationen.
+        SpaceRequiredBeforeVersionInTextDecl = Tomt utrymme krävs före versionens pseudoattribut i textdeklarationen.
+        SpaceRequiredBeforeEncodingInTextDecl = Tomt utrymme krävs före kodningens pseudoattribut i textdeklarationen.
+        TextDeclUnterminated = Textdeklarationen måste avslutas med "?>".
+        EncodingDeclRequired = Koddeklaration krävs i textdeklarationen.
+        NoMorePseudoAttributes = Inga fler pseudoattribut är tillåtna.
+        MorePseudoAttributes = Ytterligare pseudoattribut förväntas.
+        PseudoAttrNameExpected = Ett pseudoattributnamn förväntas. 
 # 4.3.2 Well-Formed Parsed Entities
-        CommentNotInOneEntity = Kommentaren m\u00E5ste finnas med inom samma tolkade enhet.
-        PINotInOneEntity = Bearbetningsinstruktionen m\u00E5ste finnas med inom samma tolkade enhet.
+        CommentNotInOneEntity = Kommentaren måste finnas med inom samma tolkade enhet.
+        PINotInOneEntity = Bearbetningsinstruktionen måste finnas med inom samma tolkade enhet.
 # 4.3.3 Character Encoding in Entities
         EncodingDeclInvalid = Ogiltigt kodnamn, "{0}".
-        EncodingByteOrderUnsupported = Angiven byteordningsf\u00F6ljd i kodning "{0}" st\u00F6ds inte.
-        InvalidByte = Ogiltig byte {0} i UTF-8-sekvensen f\u00F6r {1}-byte.
-        ExpectedByte = F\u00F6rv\u00E4ntad byte {0} i UTF-8-sekvensen f\u00F6r {1}-byte.  
-        InvalidHighSurrogate = H\u00F6ga surrogatbitar i UTF-8-sekvens f\u00E5r inte \u00F6verskrida 0x10, men 0x{0} hittades.
-        OperationNotSupported = \u00C5tg\u00E4rden "{0}" st\u00F6ds inte i l\u00E4saren {1}.
-        InvalidASCII = Byte "{0}" ing\u00E5r inte i ASCII-teckenupps\u00E4ttningen (7 bitar).
-        CharConversionFailure = En enhet som fastst\u00E4lls anv\u00E4nda ett visst kodformat f\u00E5r inte inneh\u00E5lla sekvenser som \u00E4r otill\u00E5tna i kodningen.
+        EncodingByteOrderUnsupported = Angiven byteordningsföljd i kodning "{0}" stöds inte.
+        InvalidByte = Ogiltig byte {0} i UTF-8-sekvensen för {1}-byte.
+        ExpectedByte = Förväntad byte {0} i UTF-8-sekvensen för {1}-byte.  
+        InvalidHighSurrogate = Höga surrogatbitar i UTF-8-sekvens får inte överskrida 0x10, men 0x{0} hittades.
+        OperationNotSupported = Åtgärden "{0}" stöds inte i läsaren {1}.
+        InvalidASCII = Byte "{0}" ingår inte i ASCII-teckenuppsättningen (7 bitar).
+        CharConversionFailure = En enhet som fastställs använda ett visst kodformat får inte innehålla sekvenser som är otillåtna i kodningen.
 
 # DTD Messages
 # 2.2 Characters
-        InvalidCharInEntityValue = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i det litterala enhetsv\u00E4rdet.
-        InvalidCharInExternalSubset = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i den externa delm\u00E4ngden i DTD.
-        InvalidCharInIgnoreSect = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i sektionen f\u00F6r exkluderade villkor.
-        InvalidCharInPublicID = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i allm\u00E4n identifierare.
+        InvalidCharInEntityValue = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i det litterala enhetsvärdet.
+        InvalidCharInExternalSubset = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i den externa delmängden i DTD.
+        InvalidCharInIgnoreSect = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i sektionen för exkluderade villkor.
+        InvalidCharInPublicID = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i allmän identifierare.
         InvalidCharInSystemID = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i systemidentifierare.
 # 2.3 Common Syntactic Constructs
-        SpaceRequiredAfterSYSTEM = Tomt utrymme kr\u00E4vs efter nyckelordet SYSTEM i DOCTYPE-deklarationen.
-        QuoteRequiredInSystemID = Systemidentifieraren m\u00E5ste inledas med antingen enkelt eller dubbelt citattecken.
-        SystemIDUnterminated = Systemidentifieraren m\u00E5ste avslutas med matchande citattecken.
-        SpaceRequiredAfterPUBLIC = Tomma utrymmen kr\u00E4vs efter nyckelordet PUBLIC i DOCTYPE-deklarationen.
-        QuoteRequiredInPublicID = Den allm\u00E4nna identifieraren m\u00E5ste inledas med antingen enkelt eller dubbelt citattecken.
-        PublicIDUnterminated = Den allm\u00E4nna identifieraren m\u00E5ste avslutas med matchande citattecken.
-        PubidCharIllegal = Tecknet (Unicode: 0x{0}) \u00E4r inte till\u00E5tet i den allm\u00E4nna identifieraren.
-        SpaceRequiredBetweenPublicAndSystem = Tomma utrymmen kr\u00E4vs mellan publicId och systemId.
+        SpaceRequiredAfterSYSTEM = Tomt utrymme krävs efter nyckelordet SYSTEM i DOCTYPE-deklarationen.
+        QuoteRequiredInSystemID = Systemidentifieraren måste inledas med antingen enkelt eller dubbelt citattecken.
+        SystemIDUnterminated = Systemidentifieraren måste avslutas med matchande citattecken.
+        SpaceRequiredAfterPUBLIC = Tomma utrymmen krävs efter nyckelordet PUBLIC i DOCTYPE-deklarationen.
+        QuoteRequiredInPublicID = Den allmänna identifieraren måste inledas med antingen enkelt eller dubbelt citattecken.
+        PublicIDUnterminated = Den allmänna identifieraren måste avslutas med matchande citattecken.
+        PubidCharIllegal = Tecknet (Unicode: 0x{0}) är inte tillåtet i den allmänna identifieraren.
+        SpaceRequiredBetweenPublicAndSystem = Tomma utrymmen krävs mellan publicId och systemId.
 # 2.8 Prolog and Document Type Declaration
-        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Tomt utrymme kr\u00E4vs efter "<!DOCTYPE" i dokumenttypdeklarationen.
-        MSG_ROOT_ELEMENT_TYPE_REQUIRED = Rotelementtyp m\u00E5ste anges efter "<!DOCTYPE" i dokumenttypdeklarationen.
-        DoctypedeclUnterminated = Dokumenttypdeklarationen f\u00F6r rotelementtyp "{0}" m\u00E5ste avslutas med ''>''.
-        DoctypedeclNotClosed = Dokumenttypsdeklarationen f\u00F6r rotelementtypen "{0}" m\u00E5ste st\u00E4ngas med '']''.
-        PEReferenceWithinMarkup = Parameterreferensen "%{0};" f\u00E5r inte f\u00F6rekomma i kodtexten i den interna delm\u00E4ngden i DTD.
-        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Kodtextdeklarationerna som finns med eller pekas till fr\u00E5n dokumenttypdeklarationen m\u00E5ste vara v\u00E4lformulerade.
+        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Tomt utrymme krävs efter "<!DOCTYPE" i dokumenttypdeklarationen.
+        MSG_ROOT_ELEMENT_TYPE_REQUIRED = Rotelementtyp måste anges efter "<!DOCTYPE" i dokumenttypdeklarationen.
+        DoctypedeclUnterminated = Dokumenttypdeklarationen för rotelementtyp "{0}" måste avslutas med ''>''.
+        DoctypedeclNotClosed = Dokumenttypsdeklarationen för rotelementtypen "{0}" måste stängas med '']''.
+        PEReferenceWithinMarkup = Parameterreferensen "%{0};" får inte förekomma i kodtexten i den interna delmängden i DTD.
+        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Kodtextdeklarationerna som finns med eller pekas till från dokumenttypdeklarationen måste vara välformulerade.
 # 2.10 White Space Handling
-        MSG_XML_SPACE_DECLARATION_ILLEGAL = Attributdeklarationen f\u00F6r "xml:space" m\u00E5ste anges som uppr\u00E4kningstyp vars enda m\u00F6jliga v\u00E4rden \u00E4r "default" och "preserve".
+        MSG_XML_SPACE_DECLARATION_ILLEGAL = Attributdeklarationen för "xml:space" måste anges som uppräkningstyp vars enda möjliga värden är "default" och "preserve".
 # 3.2 Element Type Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Tomt utrymme kr\u00E4vs efter "<!ELEMENT" i elementtypdeklarationen.
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Elementtyp m\u00E5ste anges i elementtypdeklarationen.
-        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Tomt utrymme kr\u00E4vs efter elementtyp "{0}" i elementtypdeklarationen.
-        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Begr\u00E4nsningen kr\u00E4vs efter elementtyp "{0}" i elementtypdeklarationen.
-        ElementDeclUnterminated = Deklarationen f\u00F6r elementtyp "{0}" m\u00E5ste avslutas med ''>''.
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Tomt utrymme krävs efter "<!ELEMENT" i elementtypdeklarationen.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Elementtyp måste anges i elementtypdeklarationen.
+        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Tomt utrymme krävs efter elementtyp "{0}" i elementtypdeklarationen.
+        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Begränsningen krävs efter elementtyp "{0}" i elementtypdeklarationen.
+        ElementDeclUnterminated = Deklarationen för elementtyp "{0}" måste avslutas med ''>''.
 # 3.2.1 Element Content
-        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Tecknet ''('' eller en elementtyp m\u00E5ste anges i deklarationen av elementtyp "{0}".
-        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Tecknet '')'' m\u00E5ste anges i deklarationen av elementtyp "{0}".
+        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Tecknet ''('' eller en elementtyp måste anges i deklarationen av elementtyp "{0}".
+        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Tecknet '')'' måste anges i deklarationen av elementtyp "{0}".
 # 3.2.2 Mixed Content
-        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = En elementtyp m\u00E5ste anges i deklarationen av elementtyp "{0}".
-        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Tecknet '')'' m\u00E5ste anges i deklarationen av elementtyp "{0}".
-        MixedContentUnterminated = Modellen med blandat inneh\u00E5ll "{0}" m\u00E5ste avslutas med ")*" om typer av underordnade element \u00E4r begr\u00E4nsade.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = En elementtyp måste anges i deklarationen av elementtyp "{0}".
+        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Tecknet '')'' måste anges i deklarationen av elementtyp "{0}".
+        MixedContentUnterminated = Modellen med blandat innehåll "{0}" måste avslutas med ")*" om typer av underordnade element är begränsade.
 # 3.3 Attribute-List Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Tomt utrymme kr\u00E4vs efter "<!ATTLIST" i deklarationen f\u00F6r attributlista.
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Elementtyp m\u00E5ste anges i deklarationen f\u00F6r attributlista.
-        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributnamnet i deklarationen f\u00F6r attributlista f\u00F6r elementet "{0}".
-        AttNameRequiredInAttDef = Attributnamnet m\u00E5ste anges i deklarationen f\u00F6r attributlista f\u00F6r elementet "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributtyp i deklarationen f\u00F6r attributet "{1}" f\u00F6r elementet "{0}".
-        AttTypeRequiredInAttDef = Attributtyp m\u00E5ste anges i deklarationen f\u00F6r attributet "{1}" f\u00F6r elementet "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributstandardv\u00E4rde i deklarationen f\u00F6r attributet "{1}" f\u00F6r elementet "{0}".
-        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Det finns fler \u00E4n en attributdefinition f\u00F6r samma attribut "{1}" f\u00F6r angivet element "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Tomt utrymme krävs efter "<!ATTLIST" i deklarationen för attributlista.
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Elementtyp måste anges i deklarationen för attributlista.
+        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Tomt utrymme krävs före attributnamnet i deklarationen för attributlista för elementet "{0}".
+        AttNameRequiredInAttDef = Attributnamnet måste anges i deklarationen för attributlista för elementet "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Tomt utrymme krävs före attributtyp i deklarationen för attributet "{1}" för elementet "{0}".
+        AttTypeRequiredInAttDef = Attributtyp måste anges i deklarationen för attributet "{1}" för elementet "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Tomt utrymme krävs före attributstandardvärde i deklarationen för attributet "{1}" för elementet "{0}".
+        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Det finns fler än en attributdefinition för samma attribut "{1}" för angivet element "{0}".
 # 3.3.1 Attribute Types
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Tomt utrymme m\u00E5ste anges efter "NOTATION" i attributdeklarationen "{1}".
-        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Tecknet ''('' m\u00E5ste anges efter "NOTATION" i attributdeklarationen "{1}".
-        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsnamn m\u00E5ste anges i notationstyplistan f\u00F6r attributdeklarationen "{1}".
-        NotationTypeUnterminated = Notationstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen "{1}".
-        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namntecken m\u00E5ste anges i uppr\u00E4kningstyplistan f\u00F6r attributdeklarationen "{1}".
-        EnumerationUnterminated = Uppr\u00E4kningstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen "{1}".
-        MSG_DISTINCT_TOKENS_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet "{1}" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen "{2}" f\u00F6r elementet "{0}". Alla NMTOKENS i en och samma attributdeklaration f\u00F6r Enumeration m\u00E5ste vara unika.
-        MSG_DISTINCT_NOTATION_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet "{1}" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen "{2}" f\u00F6r elementet "{0}". Alla NOTATION-namn i en och samma attributdeklaration f\u00F6r NotationType m\u00E5ste vara unika.
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Tomt utrymme måste anges efter "NOTATION" i attributdeklarationen "{1}".
+        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Tecknet ''('' måste anges efter "NOTATION" i attributdeklarationen "{1}".
+        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsnamn måste anges i notationstyplistan för attributdeklarationen "{1}".
+        NotationTypeUnterminated = Notationstyplistan måste avslutas med '')'' i attributdeklarationen "{1}".
+        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namntecken måste anges i uppräkningstyplistan för attributdeklarationen "{1}".
+        EnumerationUnterminated = Uppräkningstyplistan måste avslutas med '')'' i attributdeklarationen "{1}".
+        MSG_DISTINCT_TOKENS_IN_ENUMERATION = Uppräkningsvärdet "{1}" har angetts fler än en gång i attributdeklarationen "{2}" för elementet "{0}". Alla NMTOKENS i en och samma attributdeklaration för Enumeration måste vara unika.
+        MSG_DISTINCT_NOTATION_IN_ENUMERATION = Uppräkningsvärdet "{1}" har angetts fler än en gång i attributdeklarationen "{2}" för elementet "{0}". Alla NOTATION-namn i en och samma attributdeklaration för NotationType måste vara unika.
 # 3.3.2 Attribute Defaults
-        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Tomt utrymme m\u00E5ste anges efter "FIXED" i attributdeklarationen "{1}".
+        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Tomt utrymme måste anges efter "FIXED" i attributdeklarationen "{1}".
 # 3.4 Conditional Sections
-        IncludeSectUnterminated = Sektionen f\u00F6r inkluderade villkor m\u00E5ste avslutas med "]]>".
-        IgnoreSectUnterminated = Sektionen f\u00F6r exkluderade villkor m\u00E5ste avslutas med "]]>".
+        IncludeSectUnterminated = Sektionen för inkluderade villkor måste avslutas med "]]>".
+        IgnoreSectUnterminated = Sektionen för exkluderade villkor måste avslutas med "]]>".
 # 4.1 Character and Entity References
-        NameRequiredInPEReference = Enhetsnamnet m\u00E5ste omedelbart f\u00F6ljas av '%' i parameterreferensen.
-        SemicolonRequiredInPEReference = Parameterreferensen "%{0};" m\u00E5ste avslutas med '';''-avgr\u00E4nsare.
+        NameRequiredInPEReference = Enhetsnamnet måste omedelbart följas av '%' i parameterreferensen.
+        SemicolonRequiredInPEReference = Parameterreferensen "%{0};" måste avslutas med '';''-avgränsare.
 # 4.2 Entity Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Tomt utrymme kr\u00E4vs efter "<!ENTITY" i enhetsdeklarationen.
-        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Tomt utrymme kr\u00E4vs mellan "<!ENTITY" och '%'-tecknet i parameterdeklarationen.
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Tomt utrymme kr\u00E4vs mellan '%' och enhetsnamnet i parameterdeklarationen.
-        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Namnet p\u00E5 enheten m\u00E5ste anges i enhetsdeklarationen.
-        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Tomt utrymme kr\u00E4vs mellan enhetsnamnet "{0}" och definitionen i enhetsdeklarationen.
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Tomt utrymme kr\u00E4vs mellan "NDATA" och notationsnamnet i deklarationen f\u00F6r enheten "{0}".
-        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Tomt utrymme kr\u00E4vs f\u00F6re "NDATA" i deklarationen f\u00F6r enheten "{0}".
-        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Notationsnamnet m\u00E5ste anges efter "NDATA" i deklarationen f\u00F6r enheten "{0}".
-        EntityDeclUnterminated = Deklarationen f\u00F6r enheten "{0}" m\u00E5ste avslutas med ''>''.
-	MSG_DUPLICATE_ENTITY_DEFINITION = Enheten "{0}" har deklarerats mer \u00E4n en g\u00E5ng.        
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Tomt utrymme krävs efter "<!ENTITY" i enhetsdeklarationen.
+        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Tomt utrymme krävs mellan "<!ENTITY" och '%'-tecknet i parameterdeklarationen.
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Tomt utrymme krävs mellan '%' och enhetsnamnet i parameterdeklarationen.
+        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Namnet på enheten måste anges i enhetsdeklarationen.
+        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Tomt utrymme krävs mellan enhetsnamnet "{0}" och definitionen i enhetsdeklarationen.
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Tomt utrymme krävs mellan "NDATA" och notationsnamnet i deklarationen för enheten "{0}".
+        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Tomt utrymme krävs före "NDATA" i deklarationen för enheten "{0}".
+        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Notationsnamnet måste anges efter "NDATA" i deklarationen för enheten "{0}".
+        EntityDeclUnterminated = Deklarationen för enheten "{0}" måste avslutas med ''>''.
+	MSG_DUPLICATE_ENTITY_DEFINITION = Enheten "{0}" har deklarerats mer än en gång.        
 # 4.2.2 External Entities
-        ExternalIDRequired = Den externa enhetsdeklarationen m\u00E5ste inledas med antingen "SYSTEM" eller "PUBLIC".
-        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan "PUBLIC" och den allm\u00E4nna identifieraren.
-        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan den allm\u00E4nna identifieraren och systemidentifieraren.
-        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan "SYSTEM" och systemidentifieraren.
-        MSG_URI_FRAGMENT_IN_SYSTEMID = Fragmentidentifieraren f\u00E5r inte anges som del av systemidentifieraren "{0}".
+        ExternalIDRequired = Den externa enhetsdeklarationen måste inledas med antingen "SYSTEM" eller "PUBLIC".
+        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Tomt utrymme krävs mellan "PUBLIC" och den allmänna identifieraren.
+        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Tomt utrymme krävs mellan den allmänna identifieraren och systemidentifieraren.
+        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Tomt utrymme krävs mellan "SYSTEM" och systemidentifieraren.
+        MSG_URI_FRAGMENT_IN_SYSTEMID = Fragmentidentifieraren får inte anges som del av systemidentifieraren "{0}".
 # 4.7 Notation Declarations
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Tomt utrymme kr\u00E4vs efter "<!NOTATION" i notationsdeklarationen.
-        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Namnet p\u00E5 notationen m\u00E5ste anges i notationsdeklarationen.
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Tomt utrymme kr\u00E4vs efter notationsnamnet "{0}" i notationsdeklarationen.
-        ExternalIDorPublicIDRequired = Deklarationen f\u00F6r notationen "{0}" m\u00E5ste inkludera systemidentifierare eller allm\u00E4n identifierare.
-        NotationDeclUnterminated = Deklarationen f\u00F6r notationen "{0}" m\u00E5ste avslutas med ''>''.
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Tomt utrymme krävs efter "<!NOTATION" i notationsdeklarationen.
+        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Namnet på notationen måste anges i notationsdeklarationen.
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Tomt utrymme krävs efter notationsnamnet "{0}" i notationsdeklarationen.
+        ExternalIDorPublicIDRequired = Deklarationen för notationen "{0}" måste inkludera systemidentifierare eller allmän identifierare.
+        NotationDeclUnterminated = Deklarationen för notationen "{0}" måste avslutas med ''>''.
 
 # Validation messages
-        DuplicateTypeInMixedContent = Elementtyp "{1}" har redan angetts i modellen med inneh\u00E5ll f\u00F6r elementdeklarationen "{0}".
-        ENTITIESInvalid = Attributv\u00E4rdet "{1}" av typen ENTITIES m\u00E5ste motsvara namnen p\u00E5 en eller flera otolkade enheter.
-        ENTITYInvalid = Attributv\u00E4rdet "{1}" av typen ENTITY m\u00E5ste motsvara namnet p\u00E5 en otolkad enhet.
-        IDDefaultTypeInvalid = Id-attributet "{0}" m\u00E5ste inneh\u00E5lla deklarerat standardv\u00E4rde "#IMPLIED" eller "#REQUIRED".
-        IDInvalid = Attributv\u00E4rdet "{0}" av typen ID m\u00E5ste vara ett namn.
-        IDInvalidWithNamespaces = Attributv\u00E4rdet "{0}" av typen ID m\u00E5ste vara NCName om namnrymder anv\u00E4nds.
-        IDNotUnique = Attributv\u00E4rdet "{0}" av typen ID m\u00E5ste vara unikt inom dokumentet.
-        IDREFInvalid = Attributv\u00E4rdet "{0}" av typen IDREF m\u00E5ste vara ett namn.
-        IDREFInvalidWithNamespaces = Attributv\u00E4rdet "{0}" av typen IDREF m\u00E5ste vara NCName om namnrymder anv\u00E4nds.
-        IDREFSInvalid = Attributv\u00E4rdet "{0}" av typen IDREFS m\u00E5ste vara ett eller flera namn.
-        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Ers\u00E4ttningstexten f\u00F6r parameterenheten "{0}" m\u00E5ste inkludera korrekt kapslade deklarationer om enhetsreferensen anv\u00E4nds som fullst\u00E4ndig deklaration.
-        ImproperDeclarationNesting = Ers\u00E4ttningstexten f\u00F6r parameterenheten "{0}" m\u00E5ste inkludera deklarationer som \u00E4r korrekt kapslade.
-        ImproperGroupNesting = Ers\u00E4ttningstexten f\u00F6r parameterenheten "{0}" m\u00E5ste inkludera parentespar som \u00E4r korrekt kapslade.
-        INVALID_PE_IN_CONDITIONAL = Ers\u00E4ttningstexten f\u00F6r parameterenheten "{0}" m\u00E5st inkludera hela villkorssektionen eller endast INCLUDE eller IGNORE.
-        MSG_ATTRIBUTE_NOT_DECLARED = Attributet "{1}" m\u00E5ste deklareras f\u00F6r elementtyp "{0}".
-        MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = Attributet "{0}" med v\u00E4rdet "{1}" m\u00E5ste ha ett v\u00E4rde fr\u00E5n listan "{2}".
-        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = V\u00E4rdet "{1}" f\u00F6r attributet "{0}" f\u00E5r inte \u00E4ndras vid normalisering (till "{2}") i ett frist\u00E5ende dokument.
-        MSG_CONTENT_INCOMPLETE = Inneh\u00E5llet i elementtyp "{0}" \u00E4r ofullst\u00E4ndigt, det m\u00E5ste matcha "{1}".
-        MSG_CONTENT_INVALID = Inneh\u00E5llet i elementtyp "{0}" m\u00E5ste matcha "{1}".
-        MSG_CONTENT_INVALID_SPECIFIED = Inneh\u00E5llet i elementtyp "{0}" m\u00E5ste matcha "{1}". Underordnade till typ "{2}" \u00E4r inte till\u00E5tna.
-        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = Attributet "{1}" f\u00F6r elementtyp "{0}" har ett standardv\u00E4rde och m\u00E5ste anges i ett frist\u00E5ende dokument.
-        MSG_DUPLICATE_ATTDEF = Attributet "{1}" har redan deklarerats f\u00F6r elementtyp "{0}".
-        MSG_ELEMENT_ALREADY_DECLARED = Elementtyp "{0}" f\u00E5r deklareras endast en g\u00E5ng.
-        MSG_ELEMENT_NOT_DECLARED = Elementtyp "{0}" m\u00E5ste deklareras.
-        MSG_GRAMMAR_NOT_FOUND = Dokumentet \u00E4r ogiltigt: hittade ingen grammatik.
-        MSG_ELEMENT_WITH_ID_REQUIRED = Ett element med identifieraren "{0}" m\u00E5ste finnas med i dokumentet.
-        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Referens till den externa enheten "{0}" \u00E4r inte till\u00E5tet i frist\u00E5ende dokument.
-        MSG_FIXED_ATTVALUE_INVALID = Attributet "{1}" med v\u00E4rdet "{2}" m\u00E5ste ha v\u00E4rdet "{3}".
-        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Elementtyp "{0}" har redan attributet "{1}" av id-typ, ett andra attribut "{2}" av samma typ \u00E4r inte till\u00E5tet.
-        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Elementtyp "{0}" har redan attributet "{1}" av NOTATION-typ, ett andra attribut "{2}" av samma typ \u00E4r inte till\u00E5tet.
-        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = Notationen "{1}" m\u00E5ste deklareras vid referens i notationstyplistan f\u00F6r attributet "{0}".
-        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = Notationen "{1}" m\u00E5ste deklareras vid referens i otolkad enhetsdeklaration f\u00F6r "{0}".
-        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referensen till enheten "{0}" som har deklarerats i en externt tolkad enhet \u00E4r inte till\u00E5tet i frist\u00E5ende dokument.
-        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attributet "{1}" m\u00E5ste anges f\u00F6r elementtyp "{0}".
-        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Tomt utrymme f\u00E5r inte f\u00F6rekomma mellan element som har deklarerats i en externt tolkad enhet med elementinneh\u00E5ll i frist\u00E5ende dokument.
-        NMTOKENInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKEN m\u00E5ste vara ett namntecken.
-        NMTOKENSInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKENS m\u00E5ste vara ett eller flera namntecken.
+        DuplicateTypeInMixedContent = Elementtyp "{1}" har redan angetts i modellen med innehåll för elementdeklarationen "{0}".
+        ENTITIESInvalid = Attributvärdet "{1}" av typen ENTITIES måste motsvara namnen på en eller flera otolkade enheter.
+        ENTITYInvalid = Attributvärdet "{1}" av typen ENTITY måste motsvara namnet på en otolkad enhet.
+        IDDefaultTypeInvalid = Id-attributet "{0}" måste innehålla deklarerat standardvärde "#IMPLIED" eller "#REQUIRED".
+        IDInvalid = Attributvärdet "{0}" av typen ID måste vara ett namn.
+        IDInvalidWithNamespaces = Attributvärdet "{0}" av typen ID måste vara NCName om namnrymder används.
+        IDNotUnique = Attributvärdet "{0}" av typen ID måste vara unikt inom dokumentet.
+        IDREFInvalid = Attributvärdet "{0}" av typen IDREF måste vara ett namn.
+        IDREFInvalidWithNamespaces = Attributvärdet "{0}" av typen IDREF måste vara NCName om namnrymder används.
+        IDREFSInvalid = Attributvärdet "{0}" av typen IDREFS måste vara ett eller flera namn.
+        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Ersättningstexten för parameterenheten "{0}" måste inkludera korrekt kapslade deklarationer om enhetsreferensen används som fullständig deklaration.
+        ImproperDeclarationNesting = Ersättningstexten för parameterenheten "{0}" måste inkludera deklarationer som är korrekt kapslade.
+        ImproperGroupNesting = Ersättningstexten för parameterenheten "{0}" måste inkludera parentespar som är korrekt kapslade.
+        INVALID_PE_IN_CONDITIONAL = Ersättningstexten för parameterenheten "{0}" måst inkludera hela villkorssektionen eller endast INCLUDE eller IGNORE.
+        MSG_ATTRIBUTE_NOT_DECLARED = Attributet "{1}" måste deklareras för elementtyp "{0}".
+        MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = Attributet "{0}" med värdet "{1}" måste ha ett värde från listan "{2}".
+        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = Värdet "{1}" för attributet "{0}" får inte ändras vid normalisering (till "{2}") i ett fristående dokument.
+        MSG_CONTENT_INCOMPLETE = Innehållet i elementtyp "{0}" är ofullständigt, det måste matcha "{1}".
+        MSG_CONTENT_INVALID = Innehållet i elementtyp "{0}" måste matcha "{1}".
+        MSG_CONTENT_INVALID_SPECIFIED = Innehållet i elementtyp "{0}" måste matcha "{1}". Underordnade till typ "{2}" är inte tillåtna.
+        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = Attributet "{1}" för elementtyp "{0}" har ett standardvärde och måste anges i ett fristående dokument.
+        MSG_DUPLICATE_ATTDEF = Attributet "{1}" har redan deklarerats för elementtyp "{0}".
+        MSG_ELEMENT_ALREADY_DECLARED = Elementtyp "{0}" får deklareras endast en gång.
+        MSG_ELEMENT_NOT_DECLARED = Elementtyp "{0}" måste deklareras.
+        MSG_GRAMMAR_NOT_FOUND = Dokumentet är ogiltigt: hittade ingen grammatik.
+        MSG_ELEMENT_WITH_ID_REQUIRED = Ett element med identifieraren "{0}" måste finnas med i dokumentet.
+        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Referens till den externa enheten "{0}" är inte tillåtet i fristående dokument.
+        MSG_FIXED_ATTVALUE_INVALID = Attributet "{1}" med värdet "{2}" måste ha värdet "{3}".
+        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Elementtyp "{0}" har redan attributet "{1}" av id-typ, ett andra attribut "{2}" av samma typ är inte tillåtet.
+        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Elementtyp "{0}" har redan attributet "{1}" av NOTATION-typ, ett andra attribut "{2}" av samma typ är inte tillåtet.
+        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = Notationen "{1}" måste deklareras vid referens i notationstyplistan för attributet "{0}".
+        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = Notationen "{1}" måste deklareras vid referens i otolkad enhetsdeklaration för "{0}".
+        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referensen till enheten "{0}" som har deklarerats i en externt tolkad enhet är inte tillåtet i fristående dokument.
+        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attributet "{1}" måste anges för elementtyp "{0}".
+        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Tomt utrymme får inte förekomma mellan element som har deklarerats i en externt tolkad enhet med elementinnehåll i fristående dokument.
+        NMTOKENInvalid = Attributvärdet "{0}" av typen NMTOKEN måste vara ett namntecken.
+        NMTOKENSInvalid = Attributvärdet "{0}" av typen NMTOKENS måste vara ett eller flera namntecken.
         NoNotationOnEmptyElement = Elementtyp "{0}" med deklarationen EMPTY kan inte deklareras med attributet "{1}" av typen NOTATION.
-        RootElementTypeMustMatchDoctypedecl = Dokumentrotelementet "{1}" m\u00E5ste matcha DOCTYPE-roten "{0}".
-        UndeclaredElementInContentSpec = Modellen med inneh\u00E5ll f\u00F6r elementet "{0}" refererar till elementet "{1}" som inte har deklarerats.
-        UniqueNotationName = Deklarationen f\u00F6r notationen "{0}" \u00E4r inte unik. Ett namn f\u00E5r inte deklareras i fler \u00E4n en notationsdeklaration.
-        ENTITYFailedInitializeGrammar =  ENTITYDatatype-validerare: Behov att anropa initieringsmetod med giltig grammatikreferens utf\u00F6rdes inte. \t
-        ENTITYNotUnparsed = ENTITY "{0}" \u00E4r otolkat.
-        ENTITYNotValid = ENTITY "{0}" \u00E4r inte giltigt.
-        EmptyList = V\u00E4rdet f\u00F6r typ ENTITIES, IDREFS och NMTOKENS f\u00E5r inte vara en tom lista.
+        RootElementTypeMustMatchDoctypedecl = Dokumentrotelementet "{1}" måste matcha DOCTYPE-roten "{0}".
+        UndeclaredElementInContentSpec = Modellen med innehåll för elementet "{0}" refererar till elementet "{1}" som inte har deklarerats.
+        UniqueNotationName = Deklarationen för notationen "{0}" är inte unik. Ett namn får inte deklareras i fler än en notationsdeklaration.
+        ENTITYFailedInitializeGrammar =  ENTITYDatatype-validerare: Behov att anropa initieringsmetod med giltig grammatikreferens utfördes inte. \t
+        ENTITYNotUnparsed = ENTITY "{0}" är otolkat.
+        ENTITYNotValid = ENTITY "{0}" är inte giltigt.
+        EmptyList = Värdet för typ ENTITIES, IDREFS och NMTOKENS får inte vara en tom lista.
 
 # Entity related messages
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ReferenceToExternalEntity = Den externa enhetsreferensen "&{0};" till\u00E5ts inte i ett attributv\u00E4rde.
-        AccessExternalDTD = Extern DTD: Kunde inte l\u00E4sa extern DTD ''{0}'', eftersom ''{1}'' \u00E5tkomst inte till\u00E5ts p\u00E5 grund av begr\u00E4nsning som anges av accessExternalDTD-egenskapen.
-        AccessExternalEntity = Extern enhet: Kunde inte l\u00E4sa externt dokument ''{0}'', eftersom ''{1}'' \u00E5tkomst inte till\u00E5ts p\u00E5 grund av begr\u00E4nsning som anges av accessExternalDTD-egenskapen.
+        ReferenceToExternalEntity = Den externa enhetsreferensen "&{0};" tillåts inte i ett attributvärde.
+        AccessExternalDTD = Extern DTD: Kunde inte läsa extern DTD ''{0}'', eftersom ''{1}'' åtkomst inte tillåts på grund av begränsning som anges av accessExternalDTD-egenskapen.
+        AccessExternalEntity = Extern enhet: Kunde inte läsa externt dokument ''{0}'', eftersom ''{1}'' åtkomst inte tillåts på grund av begränsning som anges av accessExternalDTD-egenskapen.
 
 # 4.1 Character and Entity References
-        EntityNotDeclared = Enheten "{0}" har refererats, men \u00E4r inte deklarerad.
-        ReferenceToUnparsedEntity = Den otolkade enhetsreferensen "&{0};" \u00E4r inte till\u00E5ten.
-        RecursiveReference = Rekursiv enhetsreferens "{0}". (Referenss\u00F6kv\u00E4g: {1}),
-        RecursiveGeneralReference = Rekursiv allm\u00E4n enhetsreferens "&{0};". (Referenss\u00F6kv\u00E4g: {1}),
-        RecursivePEReference = Rekursiv parameterreferens "%{0};". (Referenss\u00F6kv\u00E4g: {1}),
+        EntityNotDeclared = Enheten "{0}" har refererats, men är inte deklarerad.
+        ReferenceToUnparsedEntity = Den otolkade enhetsreferensen "&{0};" är inte tillåten.
+        RecursiveReference = Rekursiv enhetsreferens "{0}". (Referenssökväg: {1}),
+        RecursiveGeneralReference = Rekursiv allmän enhetsreferens "&{0};". (Referenssökväg: {1}),
+        RecursivePEReference = Rekursiv parameterreferens "%{0};". (Referenssökväg: {1}),
 # 4.3.3 Character Encoding in Entities
-        EncodingNotSupported = Kodningen "{0}" st\u00F6ds inte.
-        EncodingRequired = En tolkad enhet som inte \u00E4r kodad i varken UTF-8 eller UTF-16 m\u00E5ste ha en kodningsdeklaration.
+        EncodingNotSupported = Kodningen "{0}" stöds inte.
+        EncodingRequired = En tolkad enhet som inte är kodad i varken UTF-8 eller UTF-16 måste ha en kodningsdeklaration.
 
 # Namespaces support
 # 4. Using Qualified Names
         IllegalQName = Element eller attribut matchar inte QName-produktion: QName::=(NCName':')?NCName.
-        ElementXMLNSPrefix = Elementet "{0}" kan inte anv\u00E4ndas med "xmlns" som prefix.
-        ElementPrefixUnbound = Prefixet "{0}" f\u00F6r elementet "{1}" \u00E4r inte bundet.
-        AttributePrefixUnbound = Prefixet "{2}" f\u00F6r attributet "{1}" som associeras med elementtyp "{0}" \u00E4r inte bundet.
-        EmptyPrefixedAttName = Ogiltigt v\u00E4rde f\u00F6r attributet "{0}". Namnrymdsbindningar som prefix kanske inte \u00E4r tomma.
+        ElementXMLNSPrefix = Elementet "{0}" kan inte användas med "xmlns" som prefix.
+        ElementPrefixUnbound = Prefixet "{0}" för elementet "{1}" är inte bundet.
+        AttributePrefixUnbound = Prefixet "{2}" för attributet "{1}" som associeras med elementtyp "{0}" är inte bundet.
+        EmptyPrefixedAttName = Ogiltigt värde för attributet "{0}". Namnrymdsbindningar som prefix kanske inte är tomma.
         PrefixDeclared = Namnrymdsprefixet "{0}" har inte deklarerats.
-        CantBindXMLNS = Prefixet "xmlns" kan inte bindas till en specifik namnrymd och namnrymden f\u00F6r "xmlns" kan inte heller bindas till ett specifikt prefix.
-        CantBindXML = Prefixet "xml" kan inte bindas till en namnrymd ut\u00F6ver den vanliga och namnrymden f\u00F6r "xml" kan inte heller bindas till n\u00E5got annat prefix \u00E4n "xml".
-        MSG_ATT_DEFAULT_INVALID = defaultValue "{1}" f\u00F6r attributet "{0}" \u00E4r inte till\u00E5tet vad g\u00E4ller de lexikala begr\u00E4nsningarna f\u00F6r denna attributtyp.
+        CantBindXMLNS = Prefixet "xmlns" kan inte bindas till en specifik namnrymd och namnrymden för "xmlns" kan inte heller bindas till ett specifikt prefix.
+        CantBindXML = Prefixet "xml" kan inte bindas till en namnrymd utöver den vanliga och namnrymden för "xml" kan inte heller bindas till något annat prefix än "xml".
+        MSG_ATT_DEFAULT_INVALID = defaultValue "{1}" för attributet "{0}" är inte tillåtet vad gäller de lexikala begränsningarna för denna attributtyp.
 
 # REVISIT: These need messages
         MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
@@ -295,14 +295,14 @@
 
 
 # Implementation limits
-        EntityExpansionLimit=JAXP00010001: Parsern har p\u00E5tr\u00E4ffat fler \u00E4n "{0}" enhetstill\u00E4gg i dokumentet - gr\u00E4nsv\u00E4rdet f\u00F6r JDK har uppn\u00E5tts.
-        ElementAttributeLimit=JAXP00010002:  Elementet "{0}" har fler \u00E4n "{1}" attribut, "{1}" \u00E4r gr\u00E4nsv\u00E4rdet f\u00F6r JDK.
-        MaxEntitySizeLimit=JAXP00010003: L\u00E4ngden p\u00E5 enheten "{0}" \u00E4r "{1}" som \u00F6verskriver gr\u00E4nsv\u00E4rdet p\u00E5 "{2}" som anges av "{3}".
-        TotalEntitySizeLimit=JAXP00010004: Den ackumulerade storleken f\u00F6r enheter \u00E4r "{0}", vilket \u00F6verskrider gr\u00E4nsv\u00E4rdet "{1}" som anges av "{2}".
-        MaxXMLNameLimit=JAXP00010005: L\u00E4ngden p\u00E5 enheten "{0}" \u00E4r "{1}", vilket \u00F6verskrider gr\u00E4nsv\u00E4rdet "{2}" som anges av "{3}".
-        MaxElementDepthLimit=JAXP00010006: Elementet "{0}" har djupet "{1}" vilket \u00E4r st\u00F6rre \u00E4n gr\u00E4nsen "{2}" som anges av "{3}".
-        EntityReplacementLimit=JAXP00010007: Det totala antalet noder i enhetsreferenser \u00E4r "{0}", vilket \u00E4r \u00F6ver gr\u00E4nsen "{1}" som har angetts av "{2}".
+        EntityExpansionLimit=JAXP00010001: Parsern har påträffat fler än "{0}" enhetstillägg i dokumentet - gränsvärdet för JDK har uppnåtts.
+        ElementAttributeLimit=JAXP00010002:  Elementet "{0}" har fler än "{1}" attribut, "{1}" är gränsvärdet för JDK.
+        MaxEntitySizeLimit=JAXP00010003: Längden på enheten "{0}" är "{1}" som överskriver gränsvärdet på "{2}" som anges av "{3}".
+        TotalEntitySizeLimit=JAXP00010004: Den ackumulerade storleken för enheter är "{0}", vilket överskrider gränsvärdet "{1}" som anges av "{2}".
+        MaxXMLNameLimit=JAXP00010005: Längden på enheten "{0}" är "{1}", vilket överskrider gränsvärdet "{2}" som anges av "{3}".
+        MaxElementDepthLimit=JAXP00010006: Elementet "{0}" har djupet "{1}" vilket är större än gränsen "{2}" som anges av "{3}".
+        EntityReplacementLimit=JAXP00010007: Det totala antalet noder i enhetsreferenser är "{0}", vilket är över gränsen "{1}" som har angetts av "{2}".
 
 # Catalog 09
 # Technical term, do not translate: catalog
-        CatalogException=JAXP00090001: CatalogResolver \u00E4r aktiverat med katalogen "{0}", men ett CatalogException returneras.
+        CatalogException=JAXP00090001: CatalogResolver är aktiverat med katalogen "{0}", men ett CatalogException returneras.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
index 4baa37c395d..8df40728646 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
@@ -20,290 +20,290 @@
 #
 # @version
 
-        BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
-        FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n  
+        BadMessageKey = 找不到与消息关键字对应的错误消息。
+        FormatFailed = 设置以下消息的格式时出现内部错误:\n  
 
 # Document messages
-        PrematureEOF=\u6587\u4EF6\u63D0\u524D\u7ED3\u675F\u3002
+        PrematureEOF=文件提前结束。
 # 2.1 Well-Formed XML Documents
-        RootElementRequired = \u6839\u5143\u7D20\u5E94\u8BE5\u4F4D\u4E8E\u683C\u5F0F\u6B63\u786E\u7684\u6587\u6863\u4E2D\u3002
+        RootElementRequired = 根元素应该位于格式正确的文档中。
 # 2.2 Characters
 
-        InvalidCharInCDSect = \u5728 CDATA \u8282\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
-        InvalidCharInContent = \u5728\u6587\u6863\u7684\u5143\u7D20\u5185\u5BB9\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
-        TwoColonsInQName = \u5728\u5143\u7D20\u5185\u5BB9\u6216\u5C5E\u6027\u540D\u4E2D\u627E\u5230\u65E0\u6548\u7684\u7B2C\u4E8C\u4E2A ':'\u3002
-        ColonNotLegalWithNS = \u5F53\u542F\u7528\u540D\u79F0\u7A7A\u95F4\u65F6, \u4E0D\u5141\u8BB8\u5728\u540D\u79F0 ''{0}'' \u4E2D\u4F7F\u7528\u5192\u53F7\u3002
-        InvalidCharInMisc = \u5728\u5143\u7D20\u5185\u5BB9\u7ED3\u5C3E\u540E\u7684\u6807\u8BB0\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
-        InvalidCharInProlog = \u5728\u6587\u6863\u524D\u8A00\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
-        InvalidCharInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
+        InvalidCharInCDSect = 在 CDATA 节中找到无效的 XML 字符 (Unicode: 0x{0})。
+        InvalidCharInContent = 在文档的元素内容中找到无效的 XML 字符 (Unicode: 0x{0})。
+        TwoColonsInQName = 在元素内容或属性名中找到无效的第二个 ':'。
+        ColonNotLegalWithNS = 当启用名称空间时, 不允许在名称 ''{0}'' 中使用冒号。
+        InvalidCharInMisc = 在元素内容结尾后的标记中找到无效的 XML 字符 (Unicode: 0x{0})。
+        InvalidCharInProlog = 在文档前言中找到无效的 XML 字符 (Unicode: 0x{0})。
+        InvalidCharInXMLDecl = 在 XML 声明中找到无效的 XML 字符 (Unicode: 0x{0})。
 # 2.4 Character Data and Markup
-        CDEndInContent = \u9664\u975E\u4F7F\u7528\u5B57\u7B26\u5E8F\u5217 "]]>" \u6765\u6807\u8BB0 CDATA \u8282\u7684\u7ED3\u5C3E, \u5426\u5219\u8BE5\u5B57\u7B26\u5E8F\u5217\u4E0D\u80FD\u51FA\u73B0\u5728\u5185\u5BB9\u4E2D\u3002
+        CDEndInContent = 除非使用字符序列 "]]>" 来标记 CDATA 节的结尾, 否则该字符序列不能出现在内容中。
 # 2.7 CDATA Sections
-        CDSectUnterminated = CDATA \u8282\u5FC5\u987B\u4EE5 "]]>" \u7ED3\u5C3E\u3002
+        CDSectUnterminated = CDATA 节必须以 "]]>" 结尾。
 # 2.8 Prolog and Document Type Declaration
-        XMLDeclMustBeFirst = XML \u58F0\u660E\u53EA\u80FD\u51FA\u73B0\u5728\u6587\u6863\u7684\u6700\u5F00\u5934\u5904\u3002
-        EqRequiredInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D, "{0}" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 '' = '' \u5B57\u7B26\u3002
-        QuoteRequiredInXMLDecl = XML \u58F0\u660E\u4E2D "{0}" \u540E\u9762\u8DDF\u968F\u7684\u503C\u5FC5\u987B\u662F\u7528\u5F15\u53F7\u62EC\u8D77\u6765\u7684\u5B57\u7B26\u4E32\u3002
-        XMLDeclUnterminated = XML \u58F0\u660E\u5FC5\u987B\u4EE5 "?>" \u7ED3\u5C3E\u3002
-        VersionInfoRequired = XML \u58F0\u660E\u4E2D\u9700\u8981\u6B64\u7248\u672C\u3002
-        SpaceRequiredBeforeVersionInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D\u7684\u7248\u672C\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
-        SpaceRequiredBeforeEncodingInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D\u7684\u7F16\u7801\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
-        SpaceRequiredBeforeStandalone = \u5728 XML \u58F0\u660E\u4E2D\u7684\u7F16\u7801\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
-        MarkupNotRecognizedInProlog = \u6587\u6863\u4E2D\u6839\u5143\u7D20\u524D\u9762\u7684\u6807\u8BB0\u5FC5\u987B\u683C\u5F0F\u6B63\u786E\u3002
-        MarkupNotRecognizedInMisc = \u6587\u6863\u4E2D\u6839\u5143\u7D20\u540E\u9762\u7684\u6807\u8BB0\u5FC5\u987B\u683C\u5F0F\u6B63\u786E\u3002
-        AlreadySeenDoctype = \u5DF2\u7ECF\u770B\u5230 doctype\u3002
-        DoctypeNotAllowed = \u5C06\u529F\u80FD "http://apache.org/xml/features/disallow-doctype-decl" \u8BBE\u7F6E\u4E3A\u201C\u771F\u201D\u65F6, \u4E0D\u5141\u8BB8\u4F7F\u7528 DOCTYPE\u3002
-        ContentIllegalInProlog = \u524D\u8A00\u4E2D\u4E0D\u5141\u8BB8\u6709\u5185\u5BB9\u3002
-        ReferenceIllegalInProlog = \u524D\u8A00\u4E2D\u4E0D\u5141\u8BB8\u6709\u5F15\u7528\u3002
+        XMLDeclMustBeFirst = XML 声明只能出现在文档的最开头处。
+        EqRequiredInXMLDecl = 在 XML 声明中, "{0}" 后面必须跟有 '' = '' 字符。
+        QuoteRequiredInXMLDecl = XML 声明中 "{0}" 后面跟随的值必须是用引号括起来的字符串。
+        XMLDeclUnterminated = XML 声明必须以 "?>" 结尾。
+        VersionInfoRequired = XML 声明中需要此版本。
+        SpaceRequiredBeforeVersionInXMLDecl = 在 XML 声明中的版本伪属性前面必须有空格。
+        SpaceRequiredBeforeEncodingInXMLDecl = 在 XML 声明中的编码伪属性前面必须有空格。
+        SpaceRequiredBeforeStandalone = 在 XML 声明中的编码伪属性前面必须有空格。
+        MarkupNotRecognizedInProlog = 文档中根元素前面的标记必须格式正确。
+        MarkupNotRecognizedInMisc = 文档中根元素后面的标记必须格式正确。
+        AlreadySeenDoctype = 已经看到 doctype。
+        DoctypeNotAllowed = 将功能 "http://apache.org/xml/features/disallow-doctype-decl" 设置为“真”时, 不允许使用 DOCTYPE。
+        ContentIllegalInProlog = 前言中不允许有内容。
+        ReferenceIllegalInProlog = 前言中不允许有引用。
 # Trailing Misc
-        ContentIllegalInTrailingMisc=\u5C3E\u968F\u8282\u4E2D\u4E0D\u5141\u8BB8\u6709\u5185\u5BB9\u3002
-        ReferenceIllegalInTrailingMisc=\u5C3E\u968F\u8282\u4E2D\u4E0D\u5141\u8BB8\u6709\u5F15\u7528\u3002
+        ContentIllegalInTrailingMisc=尾随节中不允许有内容。
+        ReferenceIllegalInTrailingMisc=尾随节中不允许有引用。
 
 # 2.9 Standalone Document Declaration
-        SDDeclInvalid = \u72EC\u7ACB\u6587\u6863\u58F0\u660E\u503C\u5FC5\u987B\u4E3A "\u662F" \u6216 "\u5426", \u4E0D\u80FD\u4E3A "{0}"\u3002
-        SDDeclNameInvalid = XML \u58F0\u660E\u4E2D\u7684\u72EC\u7ACB\u540D\u79F0\u53EF\u80FD\u62FC\u5199\u6709\u8BEF\u3002
+        SDDeclInvalid = 独立文档声明值必须为 "是" 或 "否", 不能为 "{0}"。
+        SDDeclNameInvalid = XML 声明中的独立名称可能拼写有误。
 # 2.12 Language Identification
-        XMLLangInvalid = xml:lang \u5C5E\u6027\u503C "{0}" \u662F\u65E0\u6548\u7684\u8BED\u8A00\u6807\u8BC6\u7B26\u3002
+        XMLLangInvalid = xml:lang 属性值 "{0}" 是无效的语言标识符。
 # 3. Logical Structures
-        ETagRequired = \u5143\u7D20\u7C7B\u578B "{0}" \u5FC5\u987B\u7531\u5339\u914D\u7684\u7ED3\u675F\u6807\u8BB0 "</{0}>" \u7EC8\u6B62\u3002
+        ETagRequired = 元素类型 "{0}" 必须由匹配的结束标记 "</{0}>" 终止。
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ElementUnterminated = \u5143\u7D20\u7C7B\u578B "{0}" \u5FC5\u987B\u540E\u8DDF\u5C5E\u6027\u89C4\u8303 ">" \u6216 "/>"\u3002
-        EqRequiredInAttribute = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027\u540D "{1}" \u5FC5\u987B\u540E\u8DDF '' = '' \u5B57\u7B26\u3002
-        OpenQuoteExpected = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027 "{1}" \u5E94\u6709\u5DE6\u5F15\u53F7\u3002
-        CloseQuoteExpected = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027 "{1}" \u5E94\u6709\u53F3\u5F15\u53F7\u3002
-        AttributeNotUnique = \u5DF2\u7ECF\u4E3A\u5143\u7D20 "{0}" \u6307\u5B9A\u5C5E\u6027 "{1}"\u3002
-        AttributeNSNotUnique = \u5DF2\u7ECF\u4E3A\u5143\u7D20 "{0}" \u6307\u5B9A\u7ED1\u5B9A\u5230\u540D\u79F0\u7A7A\u95F4 "{2}" \u7684\u5C5E\u6027 "{1}"\u3002
-        ETagUnterminated = \u5143\u7D20\u7C7B\u578B "{0}" \u7684\u7ED3\u675F\u6807\u8BB0\u5FC5\u987B\u4EE5 ''>'' \u5206\u9694\u7B26\u7ED3\u675F\u3002
-        MarkupNotRecognizedInContent = \u5143\u7D20\u5185\u5BB9\u5FC5\u987B\u7531\u683C\u5F0F\u6B63\u786E\u7684\u5B57\u7B26\u6570\u636E\u6216\u6807\u8BB0\u7EC4\u6210\u3002
-        DoctypeIllegalInContent = \u5185\u5BB9\u4E2D\u4E0D\u5141\u8BB8\u6709 DOCTYPE\u3002
+        ElementUnterminated = 元素类型 "{0}" 必须后跟属性规范 ">" 或 "/>"。
+        EqRequiredInAttribute = 与元素类型 "{0}" 相关联的属性名 "{1}" 必须后跟 '' = '' 字符。
+        OpenQuoteExpected = 与元素类型 "{0}" 相关联的属性 "{1}" 应有左引号。
+        CloseQuoteExpected = 与元素类型 "{0}" 相关联的属性 "{1}" 应有右引号。
+        AttributeNotUnique = 已经为元素 "{0}" 指定属性 "{1}"。
+        AttributeNSNotUnique = 已经为元素 "{0}" 指定绑定到名称空间 "{2}" 的属性 "{1}"。
+        ETagUnterminated = 元素类型 "{0}" 的结束标记必须以 ''>'' 分隔符结束。
+        MarkupNotRecognizedInContent = 元素内容必须由格式正确的字符数据或标记组成。
+        DoctypeIllegalInContent = 内容中不允许有 DOCTYPE。
 # 4.1 Character and Entity References
-        ReferenceUnterminated = \u5F15\u7528\u5FC5\u987B\u4EE5 ';' \u5206\u9694\u7B26\u7EC8\u6B62\u3002
+        ReferenceUnterminated = 引用必须以 ';' 分隔符终止。
 # 4.3.2 Well-Formed Parsed Entities
-        ReferenceNotInOneEntity = \u5F15\u7528\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u89E3\u6790\u5B9E\u4F53\u5185\u3002
-        ElementEntityMismatch = \u5143\u7D20 "{0}" \u5FC5\u987B\u4ECE\u5934\u81F3\u5C3E\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
-        MarkupEntityMismatch=XML \u6587\u6863\u7ED3\u6784\u5FC5\u987B\u4ECE\u5934\u81F3\u5C3E\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
+        ReferenceNotInOneEntity = 引用必须完全包含在同一个已解析实体内。
+        ElementEntityMismatch = 元素 "{0}" 必须从头至尾包含在同一个实体内。
+        MarkupEntityMismatch=XML 文档结构必须从头至尾包含在同一个实体内。
 
 # Messages common to Document and DTD
 # 2.2 Characters
-        InvalidCharInAttValue = \u5728 "{1}" \u5C5E\u6027\u503C\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{2}), \u5E76\u4E14\u5143\u7D20\u4E3A "{0}"\u3002
-        InvalidCharInComment = \u5728\u6CE8\u91CA\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
-        InvalidCharInPI = \u5728\u5904\u7406\u6307\u4EE4\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
-        InvalidCharInInternalSubset = \u5728 DTD \u7684\u5185\u90E8\u5B50\u96C6\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
-        InvalidCharInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
+        InvalidCharInAttValue = 在 "{1}" 属性值中找到无效的 XML 字符 (Unicode: 0x{2}), 并且元素为 "{0}"。
+        InvalidCharInComment = 在注释中找到无效的 XML 字符 (Unicode: 0x{0})。
+        InvalidCharInPI = 在处理指令中找到无效的 XML 字符 (Unicode: 0x{0})。
+        InvalidCharInInternalSubset = 在 DTD 的内部子集中找到无效的 XML 字符 (Unicode: 0x{0})。
+        InvalidCharInTextDecl = 在文本声明中找到无效的 XML 字符 (Unicode: 0x{0})。
 # 2.3 Common Syntactic Constructs
-        QuoteRequiredInAttValue = "{1}" \u5C5E\u6027\u503C\u5FC5\u987B\u4EE5\u5355\u5F15\u53F7\u5B57\u7B26\u6216\u53CC\u5F15\u53F7\u5B57\u7B26\u5F00\u5934\u3002
-        LessthanInAttValue = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684 "{1}" \u5C5E\u6027\u503C\u4E0D\u80FD\u5305\u542B ''<'' \u5B57\u7B26\u3002
-        AttributeValueUnterminated = "{1}" \u5C5E\u6027\u503C\u5FC5\u987B\u4EE5\u5339\u914D\u7684\u5F15\u53F7\u5B57\u7B26\u7ED3\u5C3E\u3002
+        QuoteRequiredInAttValue = "{1}" 属性值必须以单引号字符或双引号字符开头。
+        LessthanInAttValue = 与元素类型 "{0}" 相关联的 "{1}" 属性值不能包含 ''<'' 字符。
+        AttributeValueUnterminated = "{1}" 属性值必须以匹配的引号字符结尾。
 # 2.5 Comments
-        InvalidCommentStart = \u6CE8\u91CA\u5FC5\u987B\u4EE5 "<!--" \u5F00\u5934\u3002
-        DashDashInComment = \u6CE8\u91CA\u4E2D\u4E0D\u5141\u8BB8\u51FA\u73B0\u5B57\u7B26\u4E32 "--"\u3002
-        CommentUnterminated = \u6CE8\u91CA\u5FC5\u987B\u4EE5 "-->" \u7ED3\u5C3E\u3002
-        COMMENT_NOT_IN_ONE_ENTITY = \u6CE8\u91CA\u6CA1\u6709\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
+        InvalidCommentStart = 注释必须以 "<!--" 开头。
+        DashDashInComment = 注释中不允许出现字符串 "--"。
+        CommentUnterminated = 注释必须以 "-->" 结尾。
+        COMMENT_NOT_IN_ONE_ENTITY = 注释没有包含在同一个实体内。
 # 2.6 Processing Instructions
-        PITargetRequired = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u4EE5\u76EE\u6807\u540D\u79F0\u5F00\u5934\u3002
-        SpaceRequiredInPI = \u5728\u5904\u7406\u6307\u4EE4\u76EE\u6807\u548C\u6570\u636E\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-        PIUnterminated = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u4EE5 "?>" \u7ED3\u5C3E\u3002
-        ReservedPITarget = \u4E0D\u5141\u8BB8\u6709\u5339\u914D "[xX][mM][lL]" \u7684\u5904\u7406\u6307\u4EE4\u76EE\u6807\u3002
-        PI_NOT_IN_ONE_ENTITY = \u5904\u7406\u6307\u4EE4\u6CA1\u6709\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
+        PITargetRequired = 处理指令必须以目标名称开头。
+        SpaceRequiredInPI = 在处理指令目标和数据之间需要有空格。
+        PIUnterminated = 处理指令必须以 "?>" 结尾。
+        ReservedPITarget = 不允许有匹配 "[xX][mM][lL]" 的处理指令目标。
+        PI_NOT_IN_ONE_ENTITY = 处理指令没有包含在同一个实体内。
 # 2.8 Prolog and Document Type Declaration
-        VersionInfoInvalid = \u7248\u672C "{0}" \u65E0\u6548\u3002
-        VersionNotSupported = \u4E0D\u652F\u6301 XML \u7248\u672C "{0}", \u53EA\u652F\u6301 XML 1.0\u3002
-        VersionNotSupported11 = \u4E0D\u652F\u6301 XML \u7248\u672C "{0}", \u53EA\u652F\u6301 XML 1.0 \u548C XML 1.1\u3002
-        VersionMismatch= \u5B9E\u4F53\u4E0D\u80FD\u5305\u542B\u8F83\u9AD8\u7248\u672C\u7684\u53E6\u4E00\u4E2A\u5B9E\u4F53\u3002
+        VersionInfoInvalid = 版本 "{0}" 无效。
+        VersionNotSupported = 不支持 XML 版本 "{0}", 只支持 XML 1.0。
+        VersionNotSupported11 = 不支持 XML 版本 "{0}", 只支持 XML 1.0 和 XML 1.1。
+        VersionMismatch= 实体不能包含较高版本的另一个实体。
 # 4.1 Character and Entity References
-        DigitRequiredInCharRef = \u5728\u5B57\u7B26\u5F15\u7528\u4E2D, \u5341\u8FDB\u5236\u8868\u793A\u65B9\u6CD5\u5FC5\u987B\u7D27\u8DDF\u5728 "&#" \u540E\u9762\u3002
-        HexdigitRequiredInCharRef = \u5728\u5B57\u7B26\u5F15\u7528\u4E2D, \u5341\u516D\u8FDB\u5236\u8868\u793A\u65B9\u6CD5\u5FC5\u987B\u7D27\u8DDF\u5728 "&#x" \u540E\u9762\u3002
-        SemicolonRequiredInCharRef = \u5B57\u7B26\u5F15\u7528\u5FC5\u987B\u4EE5 ';' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
-        InvalidCharRef = \u5B57\u7B26\u5F15\u7528 "&#{0}" \u662F\u65E0\u6548\u7684 XML \u5B57\u7B26\u3002
-        NameRequiredInReference = \u5728\u5B9E\u4F53\u5F15\u7528\u4E2D, \u5B9E\u4F53\u540D\u79F0\u5FC5\u987B\u7D27\u8DDF\u5728 '&' \u540E\u9762\u3002
-        SemicolonRequiredInReference = \u5BF9\u5B9E\u4F53 "{0}" \u7684\u5F15\u7528\u5FC5\u987B\u4EE5 '';'' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
+        DigitRequiredInCharRef = 在字符引用中, 十进制表示方法必须紧跟在 "&#" 后面。
+        HexdigitRequiredInCharRef = 在字符引用中, 十六进制表示方法必须紧跟在 "&#x" 后面。
+        SemicolonRequiredInCharRef = 字符引用必须以 ';' 分隔符结尾。
+        InvalidCharRef = 字符引用 "&#{0}" 是无效的 XML 字符。
+        NameRequiredInReference = 在实体引用中, 实体名称必须紧跟在 '&' 后面。
+        SemicolonRequiredInReference = 对实体 "{0}" 的引用必须以 '';'' 分隔符结尾。
 # 4.3.1 The Text Declaration
-        TextDeclMustBeFirst = \u6587\u672C\u58F0\u660E\u53EA\u80FD\u51FA\u73B0\u5728\u5DF2\u89E3\u6790\u7684\u5916\u90E8\u5B9E\u4F53\u7684\u6700\u5F00\u5934\u5904\u3002
-        EqRequiredInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D, "{0}" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 '' = '' \u5B57\u7B26\u3002
-        QuoteRequiredInTextDecl = \u6587\u672C\u58F0\u660E\u4E2D "{0}" \u540E\u9762\u8DDF\u968F\u7684\u503C\u5FC5\u987B\u662F\u7528\u5F15\u53F7\u62EC\u8D77\u6765\u7684\u5B57\u7B26\u4E32\u3002
-        CloseQuoteMissingInTextDecl = \u6587\u672C\u58F0\u660E\u4E2D "{0}" \u540E\u9762\u8DDF\u968F\u7684\u503C\u7F3A\u5C11\u53F3\u5F15\u53F7\u3002
-        SpaceRequiredBeforeVersionInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D\u7684\u7248\u672C\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
-        SpaceRequiredBeforeEncodingInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D\u7684\u7F16\u7801\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
-        TextDeclUnterminated = \u6587\u672C\u58F0\u660E\u5FC5\u987B\u4EE5 "?>" \u7ED3\u5C3E\u3002
-        EncodingDeclRequired = \u6587\u672C\u58F0\u660E\u4E2D\u9700\u8981\u7F16\u7801\u58F0\u660E\u3002
-        NoMorePseudoAttributes = \u4E0D\u5141\u8BB8\u4F7F\u7528\u66F4\u591A\u7684\u4F2A\u5C5E\u6027\u3002
-        MorePseudoAttributes = \u5E94\u8BE5\u6709\u66F4\u591A\u7684\u4F2A\u5C5E\u6027\u3002
-        PseudoAttrNameExpected = \u5E94\u8BE5\u6709\u4F2A\u5C5E\u6027\u540D\u3002
+        TextDeclMustBeFirst = 文本声明只能出现在已解析的外部实体的最开头处。
+        EqRequiredInTextDecl = 在文本声明中, "{0}" 后面必须跟有 '' = '' 字符。
+        QuoteRequiredInTextDecl = 文本声明中 "{0}" 后面跟随的值必须是用引号括起来的字符串。
+        CloseQuoteMissingInTextDecl = 文本声明中 "{0}" 后面跟随的值缺少右引号。
+        SpaceRequiredBeforeVersionInTextDecl = 在文本声明中的版本伪属性前面必须有空格。
+        SpaceRequiredBeforeEncodingInTextDecl = 在文本声明中的编码伪属性前面必须有空格。
+        TextDeclUnterminated = 文本声明必须以 "?>" 结尾。
+        EncodingDeclRequired = 文本声明中需要编码声明。
+        NoMorePseudoAttributes = 不允许使用更多的伪属性。
+        MorePseudoAttributes = 应该有更多的伪属性。
+        PseudoAttrNameExpected = 应该有伪属性名。
 # 4.3.2 Well-Formed Parsed Entities
-        CommentNotInOneEntity = \u6CE8\u91CA\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u89E3\u6790\u5B9E\u4F53\u5185\u3002
-        PINotInOneEntity = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u89E3\u6790\u5B9E\u4F53\u5185\u3002
+        CommentNotInOneEntity = 注释必须完全包含在同一个已解析实体内。
+        PINotInOneEntity = 处理指令必须完全包含在同一个已解析实体内。
 # 4.3.3 Character Encoding in Entities
-        EncodingDeclInvalid = \u7F16\u7801\u540D\u79F0 "{0}" \u65E0\u6548\u3002
-        EncodingByteOrderUnsupported = \u4E0D\u652F\u6301\u7F16\u7801 "{0}" \u7684\u7ED9\u5B9A\u5B57\u8282\u987A\u5E8F\u3002
-        InvalidByte = {1} \u5B57\u8282\u7684 UTF-8 \u5E8F\u5217\u7684\u5B57\u8282 {0} \u65E0\u6548\u3002
-        ExpectedByte = \u5E94\u4E3A {1} \u5B57\u8282\u7684 UTF-8 \u5E8F\u5217\u7684\u5B57\u8282 {0}\u3002
-        InvalidHighSurrogate = UTF-8 \u5E8F\u5217\u4E2D\u7684\u9AD8\u4EE3\u7406\u4F4D\u4E0D\u80FD\u8D85\u8FC7 0x10, \u4F46\u627E\u5230 0x{0}\u3002
-        OperationNotSupported = {1}\u8BFB\u8FDB\u7A0B\u4E0D\u652F\u6301\u64CD\u4F5C "{0}"\u3002
-        InvalidASCII = \u5B57\u8282 "{0}" \u4E0D\u662F (7 \u4F4D) ASCII \u5B57\u7B26\u96C6\u7684\u6210\u5458\u3002
-        CharConversionFailure = \u786E\u5B9A\u5C5E\u4E8E\u67D0\u4E2A\u7F16\u7801\u7684\u5B9E\u4F53\u4E0D\u80FD\u5305\u542B\u5728\u8BE5\u7F16\u7801\u4E2D\u975E\u6CD5\u7684\u5E8F\u5217\u3002
+        EncodingDeclInvalid = 编码名称 "{0}" 无效。
+        EncodingByteOrderUnsupported = 不支持编码 "{0}" 的给定字节顺序。
+        InvalidByte = {1} 字节的 UTF-8 序列的字节 {0} 无效。
+        ExpectedByte = 应为 {1} 字节的 UTF-8 序列的字节 {0}。
+        InvalidHighSurrogate = UTF-8 序列中的高代理位不能超过 0x10, 但找到 0x{0}。
+        OperationNotSupported = {1}读进程不支持操作 "{0}"。
+        InvalidASCII = 字节 "{0}" 不是 (7 位) ASCII 字符集的成员。
+        CharConversionFailure = 确定属于某个编码的实体不能包含在该编码中非法的序列。
 
 # DTD Messages
 # 2.2 Characters
-        InvalidCharInEntityValue = \u5728\u6587\u5B57\u5B9E\u4F53\u503C\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
-        InvalidCharInExternalSubset = \u5728 DTD \u7684\u5916\u90E8\u5B50\u96C6\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
-        InvalidCharInIgnoreSect = \u5728\u6392\u9664\u7684\u6761\u4EF6\u8282\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
-        InvalidCharInPublicID = \u5728\u516C\u5171\u6807\u8BC6\u7B26\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
-        InvalidCharInSystemID = \u5728\u7CFB\u7EDF\u6807\u8BC6\u7B26\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
+        InvalidCharInEntityValue = 在文字实体值中找到无效的 XML 字符 (Unicode: 0x{0})。
+        InvalidCharInExternalSubset = 在 DTD 的外部子集中找到无效的 XML 字符 (Unicode: 0x{0})。
+        InvalidCharInIgnoreSect = 在排除的条件节中找到无效的 XML 字符 (Unicode: 0x{0})。
+        InvalidCharInPublicID = 在公共标识符中找到无效的 XML 字符 (Unicode: 0x{0})。
+        InvalidCharInSystemID = 在系统标识符中找到无效的 XML 字符 (Unicode: 0x{0})。
 # 2.3 Common Syntactic Constructs
-        SpaceRequiredAfterSYSTEM = \u5728 DOCTYPE \u58F0\u660E\u4E2D\u7684\u5173\u952E\u5B57 SYSTEM \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        QuoteRequiredInSystemID = \u7CFB\u7EDF\u6807\u8BC6\u7B26\u5FC5\u987B\u4EE5\u5355\u5F15\u53F7\u5B57\u7B26\u6216\u53CC\u5F15\u53F7\u5B57\u7B26\u5F00\u5934\u3002
-        SystemIDUnterminated = \u7CFB\u7EDF\u6807\u8BC6\u7B26\u5FC5\u987B\u4EE5\u5339\u914D\u7684\u5F15\u53F7\u5B57\u7B26\u7ED3\u5C3E\u3002
-        SpaceRequiredAfterPUBLIC = \u5728 DOCTYPE \u58F0\u660E\u4E2D\u7684\u5173\u952E\u5B57 PUBLIC \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        QuoteRequiredInPublicID = \u516C\u5171\u6807\u8BC6\u7B26\u5FC5\u987B\u4EE5\u5355\u5F15\u53F7\u5B57\u7B26\u6216\u53CC\u5F15\u53F7\u5B57\u7B26\u5F00\u5934\u3002
-        PublicIDUnterminated = \u516C\u5171\u6807\u8BC6\u7B26\u5FC5\u987B\u4EE5\u5339\u914D\u7684\u5F15\u53F7\u5B57\u7B26\u7ED3\u5C3E\u3002
-        PubidCharIllegal = \u516C\u5171\u6807\u8BC6\u7B26\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u8BE5\u5B57\u7B26 (Unicode: 0x{0})\u3002
-        SpaceRequiredBetweenPublicAndSystem = \u5728 publicId \u548C systemId \u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
+        SpaceRequiredAfterSYSTEM = 在 DOCTYPE 声明中的关键字 SYSTEM 后面需要有空格。
+        QuoteRequiredInSystemID = 系统标识符必须以单引号字符或双引号字符开头。
+        SystemIDUnterminated = 系统标识符必须以匹配的引号字符结尾。
+        SpaceRequiredAfterPUBLIC = 在 DOCTYPE 声明中的关键字 PUBLIC 后面需要有空格。
+        QuoteRequiredInPublicID = 公共标识符必须以单引号字符或双引号字符开头。
+        PublicIDUnterminated = 公共标识符必须以匹配的引号字符结尾。
+        PubidCharIllegal = 公共标识符中不允许使用该字符 (Unicode: 0x{0})。
+        SpaceRequiredBetweenPublicAndSystem = 在 publicId 和 systemId 之间需要有空格。
 # 2.8 Prolog and Document Type Declaration
-        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D\u7684 "<!DOCTYPE" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D, \u6839\u5143\u7D20\u7C7B\u578B\u5FC5\u987B\u51FA\u73B0\u5728 "<!DOCTYPE" \u540E\u9762\u3002
-        DoctypedeclUnterminated = \u6839\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u6587\u6863\u7C7B\u578B\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
-        DoctypedeclNotClosed = \u6839\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u6587\u6863\u7C7B\u578B\u58F0\u660E\u5FC5\u987B\u4EE5 '']'' \u7ED3\u5C3E\u3002
-        PEReferenceWithinMarkup = \u53C2\u6570\u5B9E\u4F53\u5F15\u7528 "%{0};" \u4E0D\u80FD\u51FA\u73B0\u5728 DTD \u7684\u5185\u90E8\u5B50\u96C6\u4E2D\u7684\u6807\u8BB0\u5185\u3002
-        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u6587\u6863\u7C7B\u578B\u58F0\u660E\u5305\u542B\u6216\u6307\u5411\u7684\u6807\u8BB0\u58F0\u660E\u5FC5\u987B\u683C\u5F0F\u6B63\u786E\u3002
+        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = 在文档类型声明中的 "<!DOCTYPE" 后面需要有空格。
+        MSG_ROOT_ELEMENT_TYPE_REQUIRED = 在文档类型声明中, 根元素类型必须出现在 "<!DOCTYPE" 后面。
+        DoctypedeclUnterminated = 根元素类型 "{0}" 的文档类型声明必须以 ''>'' 结尾。
+        DoctypedeclNotClosed = 根元素类型 "{0}" 的文档类型声明必须以 '']'' 结尾。
+        PEReferenceWithinMarkup = 参数实体引用 "%{0};" 不能出现在 DTD 的内部子集中的标记内。
+        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = 文档类型声明包含或指向的标记声明必须格式正确。
 # 2.10 White Space Handling
-        MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space" \u7684\u5C5E\u6027\u58F0\u660E\u5FC5\u987B\u6307\u5B9A\u4E3A\u679A\u4E3E\u7C7B\u578B, \u5B83\u7684\u53EF\u80FD\u503C\u53EA\u6709 "default" \u548C "preserve"\u3002
+        MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space" 的属性声明必须指定为枚举类型, 它的可能值只有 "default" 和 "preserve"。
 # 3.2 Element Type Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684 "<!ELEMENT" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = \u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5143\u7D20\u7C7B\u578B\u3002
-        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u7C7B\u578B "{0}" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u7C7B\u578B "{0}" \u540E\u9762\u9700\u8981\u6709\u7EA6\u675F\u6761\u4EF6\u3002
-        ElementDeclUnterminated = \u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = 在元素类型声明中的 "<!ELEMENT" 后面需要有空格。
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = 元素类型声明中需要有元素类型。
+        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = 在元素类型声明中的元素类型 "{0}" 后面需要有空格。
+        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = 在元素类型声明中的元素类型 "{0}" 后面需要有约束条件。
+        ElementDeclUnterminated = 元素类型 "{0}" 的声明必须以 ''>'' 结尾。
 # 3.2.1 Element Content
-        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u5728\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 ''('' \u5B57\u7B26\u6216\u5143\u7D20\u7C7B\u578B\u3002
-        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u5728\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 '')''\u3002
+        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = 在元素类型 "{0}" 的声明中需要有 ''('' 字符或元素类型。
+        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = 在元素类型 "{0}" 的声明中需要有 '')''。
 # 3.2.2 Mixed Content
-        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u5728\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5143\u7D20\u7C7B\u578B\u3002
-        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u5728\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 '')''\u3002
-        MixedContentUnterminated = \u5F53\u5B50\u5143\u7D20\u7C7B\u578B\u53D7\u7EA6\u675F\u65F6, \u6DF7\u5408\u5185\u5BB9\u6A21\u578B "{0}" \u5FC5\u987B\u4EE5 ")*" \u7ED3\u5C3E\u3002
+        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = 在元素类型 "{0}" 的声明中需要有元素类型。
+        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = 在元素类型 "{0}" 的声明中需要有 '')''。
+        MixedContentUnterminated = 当子元素类型受约束时, 混合内容模型 "{0}" 必须以 ")*" 结尾。
 # 3.3 Attribute-List Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5728\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u7684 "<!ATTLIST" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = \u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5143\u7D20\u7C7B\u578B\u3002
-        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u7684\u5C5E\u6027\u540D\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        AttNameRequiredInAttDef = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u5FC5\u987B\u6307\u5B9A\u5C5E\u6027\u540D\u3002
-        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{1}" \u7684\u58F0\u660E\u4E2D, \u5728\u5C5E\u6027\u7C7B\u578B\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        AttTypeRequiredInAttDef = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{1}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5C5E\u6027\u7C7B\u578B\u3002
-        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{1}" \u7684\u58F0\u660E\u4E2D, \u5728\u5C5E\u6027\u9ED8\u8BA4\u503C\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u4E3A\u6307\u5B9A\u5143\u7D20 "{0}" \u7684\u540C\u4E00\u5C5E\u6027 "{1}" \u63D0\u4F9B\u4E86\u591A\u4E2A\u5C5E\u6027\u5B9A\u4E49\u3002
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = 在属性列表声明中的 "<!ATTLIST" 后面需要有空格。
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = 属性列表声明中需要有元素类型。
+        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = 在元素 "{0}" 的属性列表声明中的属性名前面需要有空格。
+        AttNameRequiredInAttDef = 在元素 "{0}" 的属性列表声明中必须指定属性名。
+        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = 在元素 "{0}" 的属性 "{1}" 的声明中, 在属性类型前面需要有空格。
+        AttTypeRequiredInAttDef = 在元素 "{0}" 的属性 "{1}" 的声明中需要有属性类型。
+        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = 在元素 "{0}" 的属性 "{1}" 的声明中, 在属性默认值前面需要有空格。
+        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = 为指定元素 "{0}" 的同一属性 "{1}" 提供了多个属性定义。
 # 3.3.1 Attribute Types
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, \u7A7A\u683C\u5FC5\u987B\u51FA\u73B0\u5728 "NOTATION" \u540E\u9762\u3002
-        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, "NOTATION" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 ''('' \u5B57\u7B26\u3002
-        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u7684\u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u4E2D\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
-        NotationTypeUnterminated = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, \u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u5FC5\u987B\u4EE5 '')'' \u7ED3\u5C3E\u3002
-        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u7684\u679A\u4E3E\u7C7B\u578B\u5217\u8868\u4E2D\u9700\u8981\u6709\u540D\u79F0\u6807\u8BB0\u3002
-        EnumerationUnterminated = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, \u679A\u4E3E\u7C7B\u578B\u5217\u8868\u5FC5\u987B\u4EE5 '')'' \u7ED3\u5C3E\u3002
-        MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{2}" \u7684\u58F0\u660E\u4E2D, \u679A\u4E3E\u503C "{1}" \u6307\u5B9A\u4E86\u591A\u6B21\u3002\u5355\u4E2A\u679A\u4E3E\u5C5E\u6027\u58F0\u660E\u4E2D\u7684 NMTOKENS \u5FC5\u987B\u5168\u90E8\u4E0D\u76F8\u540C\u3002
-        MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{2}" \u7684\u58F0\u660E\u4E2D, \u679A\u4E3E\u503C "{1}" \u6307\u5B9A\u4E86\u591A\u6B21\u3002\u5355\u4E2A NotationType \u5C5E\u6027\u58F0\u660E\u4E2D\u7684 NOTATION \u540D\u79F0\u5FC5\u987B\u5168\u90E8\u4E0D\u76F8\u540C\u3002
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = 在 "{1}" 属性声明中, 空格必须出现在 "NOTATION" 后面。
+        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = 在 "{1}" 属性声明中, "NOTATION" 后面必须跟有 ''('' 字符。
+        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = 在 "{1}" 属性声明的记号类型列表中需要有记号名称。
+        NotationTypeUnterminated = 在 "{1}" 属性声明中, 记号类型列表必须以 '')'' 结尾。
+        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = 在 "{1}" 属性声明的枚举类型列表中需要有名称标记。
+        EnumerationUnterminated = 在 "{1}" 属性声明中, 枚举类型列表必须以 '')'' 结尾。
+        MSG_DISTINCT_TOKENS_IN_ENUMERATION = 在元素 "{0}" 的属性 "{2}" 的声明中, 枚举值 "{1}" 指定了多次。单个枚举属性声明中的 NMTOKENS 必须全部不相同。
+        MSG_DISTINCT_NOTATION_IN_ENUMERATION = 在元素 "{0}" 的属性 "{2}" 的声明中, 枚举值 "{1}" 指定了多次。单个 NotationType 属性声明中的 NOTATION 名称必须全部不相同。
 # 3.3.2 Attribute Defaults
-        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, \u7A7A\u683C\u5FC5\u987B\u51FA\u73B0\u5728 "FIXED" \u540E\u9762\u3002
+        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = 在 "{1}" 属性声明中, 空格必须出现在 "FIXED" 后面。
 # 3.4 Conditional Sections
-        IncludeSectUnterminated = \u5305\u542B\u7684\u6761\u4EF6\u8282\u5FC5\u987B\u4EE5 "]]>" \u7ED3\u5C3E\u3002
-        IgnoreSectUnterminated = \u6392\u9664\u7684\u6761\u4EF6\u8282\u5FC5\u987B\u4EE5 "]]>" \u7ED3\u5C3E\u3002
+        IncludeSectUnterminated = 包含的条件节必须以 "]]>" 结尾。
+        IgnoreSectUnterminated = 排除的条件节必须以 "]]>" 结尾。
 # 4.1 Character and Entity References
-        NameRequiredInPEReference = \u5728\u53C2\u6570\u5B9E\u4F53\u5F15\u7528\u4E2D, \u5B9E\u4F53\u540D\u79F0\u5FC5\u987B\u7D27\u8DDF\u5728 '%' \u540E\u9762\u3002
-        SemicolonRequiredInPEReference = \u53C2\u6570\u5B9E\u4F53\u5F15\u7528 "%{0};" \u5FC5\u987B\u4EE5 '';'' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
+        NameRequiredInPEReference = 在参数实体引用中, 实体名称必须紧跟在 '%' 后面。
+        SemicolonRequiredInPEReference = 参数实体引用 "%{0};" 必须以 '';'' 分隔符结尾。
 # 4.2 Entity Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 "<!ENTITY" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u5728\u53C2\u6570\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 "<!ENTITY" \u548C '%' \u5B57\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u5728\u53C2\u6570\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 '%' \u548C\u5B9E\u4F53\u540D\u79F0\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \u5B9E\u4F53\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5B9E\u4F53\u540D\u79F0\u3002
-        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684\u5B9E\u4F53\u540D\u79F0 "{0}" \u548C\u5B9A\u4E49\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 "{0}" \u7684\u58F0\u660E\u4E2D\u7684 "NDATA" \u548C\u8BB0\u53F7\u540D\u79F0\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 "{0}" \u7684\u58F0\u660E\u4E2D\u7684 "NDATA" \u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 "{0}" \u7684\u58F0\u660E\u4E2D\u7684 "NDATA" \u540E\u9762\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
-        EntityDeclUnterminated = \u5B9E\u4F53 "{0}" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
-	MSG_DUPLICATE_ENTITY_DEFINITION = \u5B9E\u4F53 "{0}" \u58F0\u660E\u4E86\u591A\u6B21\u3002        
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = 在实体声明中的 "<!ENTITY" 后面需要有空格。
+        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = 在参数实体声明中的 "<!ENTITY" 和 '%' 字符之间需要有空格。
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = 在参数实体声明中的 '%' 和实体名称之间需要有空格。
+        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = 实体声明中需要有实体名称。
+        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = 在实体声明中的实体名称 "{0}" 和定义之间需要有空格。
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = 在实体 "{0}" 的声明中的 "NDATA" 和记号名称之间需要有空格。
+        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = 在实体 "{0}" 的声明中的 "NDATA" 前面需要有空格。
+        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = 在实体 "{0}" 的声明中的 "NDATA" 后面需要有记号名称。
+        EntityDeclUnterminated = 实体 "{0}" 的声明必须以 ''>'' 结尾。
+	MSG_DUPLICATE_ENTITY_DEFINITION = 实体 "{0}" 声明了多次。        
 # 4.2.2 External Entities
-        ExternalIDRequired = \u5916\u90E8\u5B9E\u4F53\u58F0\u660E\u5FC5\u987B\u4EE5 "SYSTEM" \u6216 "PUBLIC" \u5F00\u5934\u3002
-        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \u5728 "PUBLIC" \u548C\u516C\u5171\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \u5728\u516C\u5171\u6807\u8BC6\u7B26\u548C\u7CFB\u7EDF\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \u5728 "SYSTEM" \u548C\u7CFB\u7EDF\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_URI_FRAGMENT_IN_SYSTEMID = \u7247\u6BB5\u6807\u8BC6\u7B26\u4E0D\u80FD\u6307\u5B9A\u4E3A\u7CFB\u7EDF\u6807\u8BC6\u7B26 "{0}" \u7684\u4E00\u90E8\u5206\u3002
+        ExternalIDRequired = 外部实体声明必须以 "SYSTEM" 或 "PUBLIC" 开头。
+        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = 在 "PUBLIC" 和公共标识符之间需要有空格。
+        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = 在公共标识符和系统标识符之间需要有空格。
+        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = 在 "SYSTEM" 和系统标识符之间需要有空格。
+        MSG_URI_FRAGMENT_IN_SYSTEMID = 片段标识符不能指定为系统标识符 "{0}" 的一部分。
 # 4.7 Notation Declarations
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8BB0\u53F7\u58F0\u660E\u4E2D\u7684 "<!NOTATION" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = \u8BB0\u53F7\u58F0\u660E\u4E2D\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8BB0\u53F7\u58F0\u660E\u4E2D\u7684\u8BB0\u53F7\u540D\u79F0 "{0}" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-        ExternalIDorPublicIDRequired = \u8BB0\u53F7 "{0}" \u7684\u58F0\u660E\u5FC5\u987B\u5305\u542B\u7CFB\u7EDF\u6807\u8BC6\u7B26\u6216\u516C\u5171\u6807\u8BC6\u7B26\u3002
-        NotationDeclUnterminated = \u8BB0\u53F7 "{0}" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = 在记号声明中的 "<!NOTATION" 后面需要有空格。
+        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = 记号声明中需要有记号名称。
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = 在记号声明中的记号名称 "{0}" 后面需要有空格。
+        ExternalIDorPublicIDRequired = 记号 "{0}" 的声明必须包含系统标识符或公共标识符。
+        NotationDeclUnterminated = 记号 "{0}" 的声明必须以 ''>'' 结尾。
 
 # Validation messages
-        DuplicateTypeInMixedContent = \u5728\u5143\u7D20\u58F0\u660E "{0}" \u7684\u5185\u5BB9\u6A21\u578B\u4E2D\u5DF2\u7ECF\u6307\u5B9A\u4E86\u5143\u7D20\u7C7B\u578B "{1}"\u3002
-        ENTITIESInvalid = \u7C7B\u578B\u4E3A ENTITIES \u7684\u5C5E\u6027\u503C "{1}" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u672A\u89E3\u6790\u5B9E\u4F53\u7684\u540D\u79F0\u3002
-        ENTITYInvalid = \u7C7B\u578B\u4E3A ENTITY \u7684\u5C5E\u6027\u503C "{1}" \u5FC5\u987B\u662F\u672A\u89E3\u6790\u5B9E\u4F53\u7684\u540D\u79F0\u3002
-        IDDefaultTypeInvalid = ID \u5C5E\u6027 "{0}" \u5FC5\u987B\u5177\u6709\u5DF2\u58F0\u660E\u7684\u9ED8\u8BA4\u503C "#IMPLIED" \u6216 "#REQUIRED"\u3002
-        IDInvalid = \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u540D\u79F0\u3002
-        IDInvalidWithNamespaces = \u542F\u7528\u540D\u79F0\u7A7A\u95F4\u65F6, \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F NCName\u3002
-        IDNotUnique = \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C "{0}" \u5728\u6587\u6863\u5185\u5FC5\u987B\u662F\u552F\u4E00\u7684\u3002
-        IDREFInvalid = \u7C7B\u578B\u4E3A IDREF \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u540D\u79F0\u3002
-        IDREFInvalidWithNamespaces = \u542F\u7528\u540D\u79F0\u7A7A\u95F4\u65F6, \u7C7B\u578B\u4E3A IDREF \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F NCName\u3002
-        IDREFSInvalid = \u7C7B\u578B\u4E3A IDREFS \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u540D\u79F0\u3002
-        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u5F53\u5B9E\u4F53\u5F15\u7528\u7528\u4F5C\u5B8C\u6574\u58F0\u660E\u65F6, \u53C2\u6570\u5B9E\u4F53 "{0}" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u58F0\u660E\u3002
-        ImproperDeclarationNesting = \u53C2\u6570\u5B9E\u4F53 "{0}" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u58F0\u660E\u3002
-        ImproperGroupNesting = \u53C2\u6570\u5B9E\u4F53 "{0}" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u62EC\u53F7\u5BF9\u3002
-        INVALID_PE_IN_CONDITIONAL = \u53C2\u6570\u5B9E\u4F53 "{0}" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6574\u4E2A\u6761\u4EF6\u8282, \u6216\u8005\u4EC5\u5305\u542B INCLUDE \u6216 IGNORE\u3002
-        MSG_ATTRIBUTE_NOT_DECLARED = \u5FC5\u987B\u4E3A\u5143\u7D20\u7C7B\u578B "{0}" \u58F0\u660E\u5C5E\u6027 "{1}"\u3002
-        MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u503C\u4E3A "{1}" \u7684\u5C5E\u6027 "{0}" \u5FC5\u987B\u5177\u6709\u5217\u8868 "{2}" \u4E2D\u7684\u503C\u3002
-        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D, \u5C5E\u6027 "{0}" \u7684\u503C "{1}" \u4E0D\u80FD\u901A\u8FC7\u89C4\u8303\u5316\u8FDB\u884C\u66F4\u6539 (\u66F4\u6539\u4E3A "{2}")\u3002
-        MSG_CONTENT_INCOMPLETE = \u5143\u7D20\u7C7B\u578B\u4E3A "{0}" \u7684\u5185\u5BB9\u4E0D\u5B8C\u6574, \u5B83\u5FC5\u987B\u5339\u914D "{1}"\u3002
-        MSG_CONTENT_INVALID = \u5143\u7D20\u7C7B\u578B\u4E3A "{0}" \u7684\u5185\u5BB9\u5FC5\u987B\u5339\u914D "{1}"\u3002
-        MSG_CONTENT_INVALID_SPECIFIED = \u5143\u7D20\u7C7B\u578B\u4E3A "{0}" \u7684\u5185\u5BB9\u5FC5\u987B\u5339\u914D "{1}"\u3002\u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A "{2}" \u7684\u5B50\u7EA7\u3002
-        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u7C7B\u578B\u4E3A "{0}" \u7684\u5C5E\u6027 "{1}" \u5177\u6709\u9ED8\u8BA4\u503C, \u5E76\u4E14\u5FC5\u987B\u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u6307\u5B9A\u3002
-        MSG_DUPLICATE_ATTDEF = \u5DF2\u7ECF\u4E3A\u5143\u7D20\u7C7B\u578B "{0}" \u58F0\u660E\u5C5E\u6027 "{1}"\u3002
-        MSG_ELEMENT_ALREADY_DECLARED = \u5143\u7D20\u7C7B\u578B "{0}" \u4E0D\u80FD\u58F0\u660E\u591A\u6B21\u3002
-        MSG_ELEMENT_NOT_DECLARED = \u5FC5\u987B\u58F0\u660E\u5143\u7D20\u7C7B\u578B "{0}"\u3002
-        MSG_GRAMMAR_NOT_FOUND = \u6587\u6863\u65E0\u6548: \u627E\u4E0D\u5230\u8BED\u6CD5\u3002
-        MSG_ELEMENT_WITH_ID_REQUIRED = \u6587\u6863\u4E2D\u5FC5\u987B\u5305\u542B\u6807\u8BC6\u7B26\u4E3A "{0}" \u7684\u5143\u7D20\u3002
-        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u4E0D\u5141\u8BB8\u5F15\u7528\u5916\u90E8\u5B9E\u4F53 "{0}"\u3002
-        MSG_FIXED_ATTVALUE_INVALID = \u503C\u4E3A "{2}" \u7684\u5C5E\u6027 "{1}" \u5FC5\u987B\u5177\u6709 "{3}" \u7684\u503C\u3002
-        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u5143\u7D20\u7C7B\u578B "{0}" \u5DF2\u7ECF\u5177\u6709\u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027 "{1}", \u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A ID \u7684\u53E6\u4E00\u4E2A\u5C5E\u6027 "{2}"\u3002
-        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u5143\u7D20\u7C7B\u578B "{0}" \u5DF2\u7ECF\u5177\u6709\u7C7B\u578B\u4E3A NOTATION \u7684\u5C5E\u6027 "{1}", \u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A NOTATION \u7684\u53E6\u4E00\u4E2A\u5C5E\u6027 "{2}"\u3002
-        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u5728\u5C5E\u6027 "{0}" \u7684\u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u4E2D\u5F15\u7528\u8BB0\u53F7 "{1}" \u65F6, \u5FC5\u987B\u58F0\u660E\u8BE5\u8BB0\u53F7\u3002
-        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \u5728 "{0}" \u7684\u672A\u89E3\u6790\u5B9E\u4F53\u58F0\u660E\u4E2D\u5F15\u7528\u8BB0\u53F7 "{1}" \u65F6, \u5FC5\u987B\u58F0\u660E\u8BE5\u8BB0\u53F7\u3002
-        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u4E0D\u5141\u8BB8\u5F15\u7528\u5DF2\u89E3\u6790\u7684\u5916\u90E8\u5B9E\u4F53\u4E2D\u58F0\u660E\u7684\u5B9E\u4F53 "{0}"\u3002
-        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u9700\u8981\u5C5E\u6027 "{1}", \u5E76\u4E14\u5FC5\u987B\u4E3A\u5143\u7D20\u7C7B\u578B "{0}" \u6307\u5B9A\u8BE5\u5C5E\u6027\u3002
-        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u5BF9\u4E8E\u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u5177\u6709\u5143\u7D20\u5185\u5BB9\u7684\u5DF2\u89E3\u6790\u7684\u5916\u90E8\u5B9E\u4F53, \u5728\u8BE5\u5B9E\u4F53\u4E2D\u58F0\u660E\u7684\u5143\u7D20\u4E4B\u95F4\u4E0D\u80FD\u51FA\u73B0\u7A7A\u683C\u3002
-        NMTOKENInvalid = \u7C7B\u578B\u4E3A NMTOKEN \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u540D\u79F0\u6807\u8BB0\u3002
-        NMTOKENSInvalid = \u7C7B\u578B\u4E3A NMTOKENS \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u540D\u79F0\u6807\u8BB0\u3002
-        NoNotationOnEmptyElement = \u5DF2\u58F0\u660E\u4E3A EMPTY \u7684\u5143\u7D20\u7C7B\u578B "{0}" \u4E0D\u80FD\u58F0\u660E\u7C7B\u578B\u4E3A NOTATION \u7684\u5C5E\u6027 "{1}"\u3002
-        RootElementTypeMustMatchDoctypedecl = \u6587\u6863\u6839\u5143\u7D20 "{1}" \u5FC5\u987B\u5339\u914D DOCTYPE \u6839 "{0}"\u3002
-        UndeclaredElementInContentSpec = \u5143\u7D20 "{0}" \u7684\u5185\u5BB9\u6A21\u578B\u5F15\u7528\u672A\u58F0\u660E\u7684\u5143\u7D20 "{1}"\u3002
-        UniqueNotationName = \u8BB0\u53F7 "{0}" \u7684\u58F0\u660E\u4E0D\u662F\u552F\u4E00\u7684\u3002\u4E0D\u80FD\u5728\u591A\u4E2A\u8BB0\u53F7\u58F0\u660E\u4E2D\u58F0\u660E\u6307\u5B9A\u7684\u540D\u79F0\u3002
-        ENTITYFailedInitializeGrammar =  ENTITYDatatype \u9A8C\u8BC1\u7A0B\u5E8F: \u672A\u80FD\u4F7F\u7528\u6709\u6548\u7684\u8BED\u6CD5\u5F15\u7528\u8C03\u7528\u521D\u59CB\u5316\u65B9\u6CD5\u3002\t
-        ENTITYNotUnparsed = ENTITY "{0}" \u4E0D\u662F\u672A\u89E3\u6790\u7684\u3002
-        ENTITYNotValid = ENTITY "{0}" \u65E0\u6548\u3002
-        EmptyList = \u7C7B\u578B\u4E3A ENTITIES, IDREFS \u548C NMTOKENS \u7684\u503C\u4E0D\u80FD\u662F\u7A7A\u5217\u8868\u3002
+        DuplicateTypeInMixedContent = 在元素声明 "{0}" 的内容模型中已经指定了元素类型 "{1}"。
+        ENTITIESInvalid = 类型为 ENTITIES 的属性值 "{1}" 必须是一个或多个未解析实体的名称。
+        ENTITYInvalid = 类型为 ENTITY 的属性值 "{1}" 必须是未解析实体的名称。
+        IDDefaultTypeInvalid = ID 属性 "{0}" 必须具有已声明的默认值 "#IMPLIED" 或 "#REQUIRED"。
+        IDInvalid = 类型为 ID 的属性值 "{0}" 必须是名称。
+        IDInvalidWithNamespaces = 启用名称空间时, 类型为 ID 的属性值 "{0}" 必须是 NCName。
+        IDNotUnique = 类型为 ID 的属性值 "{0}" 在文档内必须是唯一的。
+        IDREFInvalid = 类型为 IDREF 的属性值 "{0}" 必须是名称。
+        IDREFInvalidWithNamespaces = 启用名称空间时, 类型为 IDREF 的属性值 "{0}" 必须是 NCName。
+        IDREFSInvalid = 类型为 IDREFS 的属性值 "{0}" 必须是一个或多个名称。
+        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = 当实体引用用作完整声明时, 参数实体 "{0}" 的替换文本必须包含正确嵌套的声明。
+        ImproperDeclarationNesting = 参数实体 "{0}" 的替换文本必须包含正确嵌套的声明。
+        ImproperGroupNesting = 参数实体 "{0}" 的替换文本必须包含正确嵌套的括号对。
+        INVALID_PE_IN_CONDITIONAL = 参数实体 "{0}" 的替换文本必须包含整个条件节, 或者仅包含 INCLUDE 或 IGNORE。
+        MSG_ATTRIBUTE_NOT_DECLARED = 必须为元素类型 "{0}" 声明属性 "{1}"。
+        MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = 值为 "{1}" 的属性 "{0}" 必须具有列表 "{2}" 中的值。
+        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = 在独立文档中, 属性 "{0}" 的值 "{1}" 不能通过规范化进行更改 (更改为 "{2}")。
+        MSG_CONTENT_INCOMPLETE = 元素类型为 "{0}" 的内容不完整, 它必须匹配 "{1}"。
+        MSG_CONTENT_INVALID = 元素类型为 "{0}" 的内容必须匹配 "{1}"。
+        MSG_CONTENT_INVALID_SPECIFIED = 元素类型为 "{0}" 的内容必须匹配 "{1}"。不允许使用类型为 "{2}" 的子级。
+        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = 元素类型为 "{0}" 的属性 "{1}" 具有默认值, 并且必须在独立文档中指定。
+        MSG_DUPLICATE_ATTDEF = 已经为元素类型 "{0}" 声明属性 "{1}"。
+        MSG_ELEMENT_ALREADY_DECLARED = 元素类型 "{0}" 不能声明多次。
+        MSG_ELEMENT_NOT_DECLARED = 必须声明元素类型 "{0}"。
+        MSG_GRAMMAR_NOT_FOUND = 文档无效: 找不到语法。
+        MSG_ELEMENT_WITH_ID_REQUIRED = 文档中必须包含标识符为 "{0}" 的元素。
+        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = 在独立文档中不允许引用外部实体 "{0}"。
+        MSG_FIXED_ATTVALUE_INVALID = 值为 "{2}" 的属性 "{1}" 必须具有 "{3}" 的值。
+        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = 元素类型 "{0}" 已经具有类型为 ID 的属性 "{1}", 不允许使用类型为 ID 的另一个属性 "{2}"。
+        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = 元素类型 "{0}" 已经具有类型为 NOTATION 的属性 "{1}", 不允许使用类型为 NOTATION 的另一个属性 "{2}"。
+        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = 在属性 "{0}" 的记号类型列表中引用记号 "{1}" 时, 必须声明该记号。
+        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = 在 "{0}" 的未解析实体声明中引用记号 "{1}" 时, 必须声明该记号。
+        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = 在独立文档中不允许引用已解析的外部实体中声明的实体 "{0}"。
+        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = 需要属性 "{1}", 并且必须为元素类型 "{0}" 指定该属性。
+        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = 对于在独立文档中具有元素内容的已解析的外部实体, 在该实体中声明的元素之间不能出现空格。
+        NMTOKENInvalid = 类型为 NMTOKEN 的属性值 "{0}" 必须是名称标记。
+        NMTOKENSInvalid = 类型为 NMTOKENS 的属性值 "{0}" 必须是一个或多个名称标记。
+        NoNotationOnEmptyElement = 已声明为 EMPTY 的元素类型 "{0}" 不能声明类型为 NOTATION 的属性 "{1}"。
+        RootElementTypeMustMatchDoctypedecl = 文档根元素 "{1}" 必须匹配 DOCTYPE 根 "{0}"。
+        UndeclaredElementInContentSpec = 元素 "{0}" 的内容模型引用未声明的元素 "{1}"。
+        UniqueNotationName = 记号 "{0}" 的声明不是唯一的。不能在多个记号声明中声明指定的名称。
+        ENTITYFailedInitializeGrammar =  ENTITYDatatype 验证程序: 未能使用有效的语法引用调用初始化方法。\t
+        ENTITYNotUnparsed = ENTITY "{0}" 不是未解析的。
+        ENTITYNotValid = ENTITY "{0}" 无效。
+        EmptyList = 类型为 ENTITIES, IDREFS 和 NMTOKENS 的值不能是空列表。
 
 # Entity related messages
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ReferenceToExternalEntity = \u5C5E\u6027\u503C\u4E2D\u4E0D\u5141\u8BB8\u91C7\u7528\u5916\u90E8\u5B9E\u4F53\u5F15\u7528 "&{0};"\u3002
-        AccessExternalDTD = \u5916\u90E8 DTD: \u65E0\u6CD5\u8BFB\u53D6\u5916\u90E8 DTD ''{0}'', \u56E0\u4E3A accessExternalDTD \u5C5E\u6027\u8BBE\u7F6E\u7684\u9650\u5236\u5BFC\u81F4\u4E0D\u5141\u8BB8 ''{1}'' \u8BBF\u95EE\u3002
-        AccessExternalEntity = \u5916\u90E8\u5B9E\u4F53: \u65E0\u6CD5\u8BFB\u53D6\u5916\u90E8\u6587\u6863 ''{0}'', \u56E0\u4E3A accessExternalDTD \u5C5E\u6027\u8BBE\u7F6E\u7684\u9650\u5236\u5BFC\u81F4\u4E0D\u5141\u8BB8 ''{1}'' \u8BBF\u95EE\u3002
+        ReferenceToExternalEntity = 属性值中不允许采用外部实体引用 "&{0};"。
+        AccessExternalDTD = 外部 DTD: 无法读取外部 DTD ''{0}'', 因为 accessExternalDTD 属性设置的限制导致不允许 ''{1}'' 访问。
+        AccessExternalEntity = 外部实体: 无法读取外部文档 ''{0}'', 因为 accessExternalDTD 属性设置的限制导致不允许 ''{1}'' 访问。
 
 # 4.1 Character and Entity References
-        EntityNotDeclared = \u5F15\u7528\u4E86\u5B9E\u4F53 "{0}", \u4F46\u672A\u58F0\u660E\u5B83\u3002
-        ReferenceToUnparsedEntity = \u4E0D\u5141\u8BB8\u4F7F\u7528\u672A\u89E3\u6790\u7684\u5B9E\u4F53\u5F15\u7528 "&{0};"\u3002
-        RecursiveReference = \u9012\u5F52\u5B9E\u4F53\u5F15\u7528 "{0}"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
-        RecursiveGeneralReference = \u9012\u5F52\u4E00\u822C\u5B9E\u4F53\u5F15\u7528 "&{0};"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
-        RecursivePEReference = \u9012\u5F52\u53C2\u6570\u5B9E\u4F53\u5F15\u7528 "%{0};"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
+        EntityNotDeclared = 引用了实体 "{0}", 但未声明它。
+        ReferenceToUnparsedEntity = 不允许使用未解析的实体引用 "&{0};"。
+        RecursiveReference = 递归实体引用 "{0}"。(引用路径: {1}),
+        RecursiveGeneralReference = 递归一般实体引用 "&{0};"。(引用路径: {1}),
+        RecursivePEReference = 递归参数实体引用 "%{0};"。(引用路径: {1}),
 # 4.3.3 Character Encoding in Entities
-        EncodingNotSupported = \u4E0D\u652F\u6301\u7F16\u7801 "{0}"\u3002
-        EncodingRequired = \u5982\u679C\u5DF2\u89E3\u6790\u7684\u5B9E\u4F53\u672A\u4F7F\u7528 UTF-8 \u6216 UTF-16 \u8FDB\u884C\u7F16\u7801, \u5219\u8BE5\u5B9E\u4F53\u5FC5\u987B\u5305\u542B\u7F16\u7801\u58F0\u660E\u3002
+        EncodingNotSupported = 不支持编码 "{0}"。
+        EncodingRequired = 如果已解析的实体未使用 UTF-8 或 UTF-16 进行编码, 则该实体必须包含编码声明。
 
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = \u5143\u7D20\u6216\u5C5E\u6027 "{0}" \u4E0D\u5339\u914D QName \u751F\u4EA7\uFF1AQName::=(NCName'':'')?NCName\u3002
-        ElementXMLNSPrefix = \u5143\u7D20 "{0}" \u4E0D\u80FD\u4F7F\u7528 "xmlns" \u4F5C\u4E3A\u524D\u7F00\u3002
-        ElementPrefixUnbound = \u5143\u7D20 "{1}" \u7684\u524D\u7F00 "{0}" \u672A\u7ED1\u5B9A\u3002
-        AttributePrefixUnbound = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027 "{1}" \u7684\u524D\u7F00 "{2}" \u672A\u7ED1\u5B9A\u3002
-        EmptyPrefixedAttName = \u5C5E\u6027 "{0}" \u7684\u503C\u65E0\u6548\u3002\u5E26\u524D\u7F00\u7684\u540D\u79F0\u7A7A\u95F4\u7ED1\u5B9A\u4E0D\u80FD\u4E3A\u7A7A\u3002
-        PrefixDeclared = \u672A\u58F0\u660E\u540D\u79F0\u7A7A\u95F4\u524D\u7F00 "{0}"\u3002
-        CantBindXMLNS = \u524D\u7F00 "xmlns" \u4E0D\u80FD\u663E\u5F0F\u7ED1\u5B9A\u5230\u4EFB\u4F55\u540D\u79F0\u7A7A\u95F4; "xmlns" \u7684\u540D\u79F0\u7A7A\u95F4\u4E5F\u4E0D\u80FD\u663E\u5F0F\u7ED1\u5B9A\u5230\u4EFB\u4F55\u524D\u7F00\u3002
-        CantBindXML = \u524D\u7F00 "xml" \u4E0D\u80FD\u7ED1\u5B9A\u5230\u9664\u5B83\u7684\u5E38\u7528\u540D\u79F0\u7A7A\u95F4\u5916\u7684\u4EFB\u4F55\u540D\u79F0\u7A7A\u95F4; "xml" \u7684\u540D\u79F0\u7A7A\u95F4\u4E5F\u4E0D\u80FD\u7ED1\u5B9A\u5230\u9664 "xml" \u5916\u7684\u4EFB\u4F55\u524D\u7F00\u3002
-        MSG_ATT_DEFAULT_INVALID = \u5C5E\u6027 "{0}" \u7684 defaultValue "{1}" \u975E\u6CD5, \u56E0\u4E3A\u6B64\u5C5E\u6027\u7C7B\u578B\u5177\u6709\u8BCD\u6C47\u7EA6\u675F\u6761\u4EF6\u3002
+        IllegalQName = 元素或属性 "{0}" 不匹配 QName 生产：QName::=(NCName'':'')?NCName。
+        ElementXMLNSPrefix = 元素 "{0}" 不能使用 "xmlns" 作为前缀。
+        ElementPrefixUnbound = 元素 "{1}" 的前缀 "{0}" 未绑定。
+        AttributePrefixUnbound = 与元素类型 "{0}" 相关联的属性 "{1}" 的前缀 "{2}" 未绑定。
+        EmptyPrefixedAttName = 属性 "{0}" 的值无效。带前缀的名称空间绑定不能为空。
+        PrefixDeclared = 未声明名称空间前缀 "{0}"。
+        CantBindXMLNS = 前缀 "xmlns" 不能显式绑定到任何名称空间; "xmlns" 的名称空间也不能显式绑定到任何前缀。
+        CantBindXML = 前缀 "xml" 不能绑定到除它的常用名称空间外的任何名称空间; "xml" 的名称空间也不能绑定到除 "xml" 外的任何前缀。
+        MSG_ATT_DEFAULT_INVALID = 属性 "{0}" 的 defaultValue "{1}" 非法, 因为此属性类型具有词汇约束条件。
 
 # REVISIT: These need messages
         MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
@@ -312,14 +312,14 @@
 
 
 # Implementation limits
-        EntityExpansionLimit=JAXP00010001: \u89E3\u6790\u5668\u5728\u6B64\u6587\u6863\u4E2D\u9047\u5230\u591A\u4E2A "{0}" \u5B9E\u4F53\u6269\u5C55; \u8FD9\u662F JDK \u65BD\u52A0\u7684\u9650\u5236\u3002
-        ElementAttributeLimit=JAXP00010002: \u5143\u7D20 "{0}" \u5177\u6709\u591A\u4E2A "{1}" \u5C5E\u6027, "{1}" \u662F JDK \u65BD\u52A0\u7684\u9650\u5236\u3002
-        MaxEntitySizeLimit=JAXP00010003: \u5B9E\u4F53 "{0}" \u7684\u957F\u5EA6\u4E3A "{1}", \u8D85\u8FC7\u4E86 "{3}" \u8BBE\u7F6E\u7684 "{2}" \u9650\u5236\u3002
-        TotalEntitySizeLimit=JAXP00010004: \u5B9E\u4F53\u7684\u7D2F\u8BA1\u5927\u5C0F\u4E3A "{0}", \u8D85\u8FC7\u4E86 "{2}" \u8BBE\u7F6E\u7684 "{1}" \u9650\u5236\u3002
-        MaxXMLNameLimit=JAXP00010005: \u5B9E\u4F53 "{0}" \u7684\u957F\u5EA6\u4E3A "{1}", \u8D85\u8FC7\u4E86 "{3}" \u8BBE\u7F6E\u7684 "{2}" \u9650\u5236\u3002
-        MaxElementDepthLimit=JAXP00010006: \u5143\u7D20 "{0}" \u7684\u6DF1\u5EA6 "{1}" \u8D85\u8FC7\u4E86 "{3}" \u8BBE\u7F6E\u7684\u9650\u5236 "{2}"\u3002
-        EntityReplacementLimit=JAXP00010007: \u5B9E\u4F53\u5F15\u7528\u4E2D\u7684\u8282\u70B9\u603B\u6570\u4E3A "{0}", \u8D85\u8FC7\u4E86 "{2}" \u8BBE\u7F6E\u7684\u9650\u5236 "{1}"\u3002
+        EntityExpansionLimit=JAXP00010001: 解析器在此文档中遇到多个 "{0}" 实体扩展; 这是 JDK 施加的限制。
+        ElementAttributeLimit=JAXP00010002: 元素 "{0}" 具有多个 "{1}" 属性, "{1}" 是 JDK 施加的限制。
+        MaxEntitySizeLimit=JAXP00010003: 实体 "{0}" 的长度为 "{1}", 超过了 "{3}" 设置的 "{2}" 限制。
+        TotalEntitySizeLimit=JAXP00010004: 实体的累计大小为 "{0}", 超过了 "{2}" 设置的 "{1}" 限制。
+        MaxXMLNameLimit=JAXP00010005: 实体 "{0}" 的长度为 "{1}", 超过了 "{3}" 设置的 "{2}" 限制。
+        MaxElementDepthLimit=JAXP00010006: 元素 "{0}" 的深度 "{1}" 超过了 "{3}" 设置的限制 "{2}"。
+        EntityReplacementLimit=JAXP00010007: 实体引用中的节点总数为 "{0}", 超过了 "{2}" 设置的限制 "{1}"。
 
 # Catalog 09
 # Technical term, do not translate: catalog
-        CatalogException=JAXP00090001: \u5DF2\u5BF9\u76EE\u5F55 "{0}" \u542F\u7528 CatalogResolver, \u4F46\u8FD4\u56DE\u4E86 CatalogException\u3002
+        CatalogException=JAXP00090001: 已对目录 "{0}" 启用 CatalogResolver, 但返回了 CatalogException。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
index 2bdc2fa4b08..44671abcfd8 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
@@ -3,290 +3,290 @@
 #
 # @version
 
-        BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
-        FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
+        BadMessageKey = 找不到對應訊息索引鍵的錯誤訊息。
+        FormatFailed = 格式化下列訊息時發生內部錯誤:\n
 
 # Document messages
-        PrematureEOF=\u6A94\u6848\u63D0\u65E9\u7D50\u675F\u3002
+        PrematureEOF=檔案提早結束。
 # 2.1 Well-Formed XML Documents
-        RootElementRequired = \u683C\u5F0F\u6B63\u78BA\u7684\u6587\u4EF6\u9700\u8981\u6839\u5143\u7D20\u3002
+        RootElementRequired = 格式正確的文件需要根元素。
 # 2.2 Characters
 
-        InvalidCharInCDSect = \u5728 CDATA \u6BB5\u843D\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-        InvalidCharInContent = \u5728\u6587\u4EF6\u5143\u7D20\u5167\u5BB9\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-        TwoColonsInQName = \u5728\u5143\u7D20\u985E\u578B\u6216\u5C6C\u6027\u540D\u7A31\u4E2D\u627E\u5230\u7121\u6548\u7684\u7B2C\u4E8C\u500B ':'\u3002
-        ColonNotLegalWithNS = \u555F\u7528\u547D\u540D\u7A7A\u9593\u6642\uFF0C\u540D\u7A31 ''{0}'' \u4E2D\u4E0D\u5141\u8A31\u5192\u865F\u3002
-        InvalidCharInMisc = \u5728\u5143\u7D20\u5167\u5BB9\u7D50\u675F\u5F8C\u7684\u6A19\u8A18\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-        InvalidCharInProlog = \u5728\u6587\u4EF6\u5BA3\u544A\u96C6\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-        InvalidCharInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+        InvalidCharInCDSect = 在 CDATA 段落中找到無效的 XML 字元 (Unicode: 0x{0})。
+        InvalidCharInContent = 在文件元素內容中找到無效的 XML 字元 (Unicode: 0x{0})。
+        TwoColonsInQName = 在元素類型或屬性名稱中找到無效的第二個 ':'。
+        ColonNotLegalWithNS = 啟用命名空間時，名稱 ''{0}'' 中不允許冒號。
+        InvalidCharInMisc = 在元素內容結束後的標記中找到無效的 XML 字元 (Unicode: 0x{0})。
+        InvalidCharInProlog = 在文件宣告集中找到無效的 XML 字元 (Unicode: 0x{0})。
+        InvalidCharInXMLDecl = 在 XML 宣告中找到無效的 XML 字元 (Unicode: 0x{0})。
 # 2.4 Character Data and Markup
-        CDEndInContent = \u5B57\u5143\u9806\u5E8F "]]>" \u4E0D\u53EF\u51FA\u73FE\u5728\u5167\u5BB9\u4E2D\uFF0C\u9664\u975E\u7528\u65BC\u6A19\u793A CDATA \u6BB5\u843D\u7684\u7D50\u5C3E\u3002
+        CDEndInContent = 字元順序 "]]>" 不可出現在內容中，除非用於標示 CDATA 段落的結尾。
 # 2.7 CDATA Sections
-        CDSectUnterminated = CDATA \u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F "]]>"\u3002
+        CDSectUnterminated = CDATA 段落結尾必須是 "]]>"。
 # 2.8 Prolog and Document Type Declaration
-        XMLDeclMustBeFirst = XML \u5BA3\u544A\u50C5\u80FD\u51FA\u73FE\u5728\u6587\u4EF6\u7684\u958B\u982D\u3002
-        EqRequiredInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C'' = '' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 "{0}" \u4E4B\u5F8C\u3002
-        QuoteRequiredInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C"{0}" \u4E4B\u5F8C\u7684\u503C\u5FC5\u9808\u662F\u4EE5\u5F15\u865F\u62EC\u4F4F\u7684\u5B57\u4E32\u3002
-        XMLDeclUnterminated = XML \u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u662F "?>"\u3002
-        VersionInfoRequired = XML \u5BA3\u544A\u4E2D\u9700\u8981\u7248\u672C\u3002
-        SpaceRequiredBeforeVersionInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C\u7248\u672C\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
-        SpaceRequiredBeforeEncodingInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C\u7DE8\u78BC\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
-        SpaceRequiredBeforeStandalone = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C\u7DE8\u78BC\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
-        MarkupNotRecognizedInProlog = \u6587\u4EF6\u4E2D\u6839\u5143\u7D20\u524D\u7684\u6A19\u8A18\u5FC5\u9808\u683C\u5F0F\u6B63\u78BA\u3002
-        MarkupNotRecognizedInMisc = \u6587\u4EF6\u4E2D\u6839\u5143\u7D20\u5F8C\u7684\u6A19\u8A18\u5FC5\u9808\u683C\u5F0F\u6B63\u78BA\u3002
-        AlreadySeenDoctype = doctype \u5DF2\u7D93\u51FA\u73FE\u904E\u3002
-        DoctypeNotAllowed = \u7576\u529F\u80FD "http://apache.org/xml/features/disallow-doctype-decl" \u8A2D\u70BA\u771F\u6642\uFF0C\u4E0D\u5141\u8A31 DOCTYPE\u3002
-        ContentIllegalInProlog = \u5BA3\u544A\u96C6\u4E2D\u4E0D\u5141\u8A31\u5167\u5BB9\u3002
-        ReferenceIllegalInProlog = \u5BA3\u544A\u96C6\u4E2D\u4E0D\u5141\u8A31\u53C3\u7167\u3002
+        XMLDeclMustBeFirst = XML 宣告僅能出現在文件的開頭。
+        EqRequiredInXMLDecl = 在 XML 宣告中，'' = '' 字元必須緊接在 "{0}" 之後。
+        QuoteRequiredInXMLDecl = 在 XML 宣告中，"{0}" 之後的值必須是以引號括住的字串。
+        XMLDeclUnterminated = XML 宣告結尾必須是 "?>"。
+        VersionInfoRequired = XML 宣告中需要版本。
+        SpaceRequiredBeforeVersionInXMLDecl = 在 XML 宣告中，版本虛擬屬性之前需要有空格。
+        SpaceRequiredBeforeEncodingInXMLDecl = 在 XML 宣告中，編碼虛擬屬性之前需要有空格。
+        SpaceRequiredBeforeStandalone = 在 XML 宣告中，編碼虛擬屬性之前需要有空格。
+        MarkupNotRecognizedInProlog = 文件中根元素前的標記必須格式正確。
+        MarkupNotRecognizedInMisc = 文件中根元素後的標記必須格式正確。
+        AlreadySeenDoctype = doctype 已經出現過。
+        DoctypeNotAllowed = 當功能 "http://apache.org/xml/features/disallow-doctype-decl" 設為真時，不允許 DOCTYPE。
+        ContentIllegalInProlog = 宣告集中不允許內容。
+        ReferenceIllegalInProlog = 宣告集中不允許參照。
 # Trailing Misc
-        ContentIllegalInTrailingMisc=\u5C3E\u7AEF\u6BB5\u843D\u4E2D\u4E0D\u5141\u8A31\u5167\u5BB9\u3002
-        ReferenceIllegalInTrailingMisc=\u5C3E\u7AEF\u6BB5\u843D\u4E2D\u4E0D\u5141\u8A31\u53C3\u7167\u3002
+        ContentIllegalInTrailingMisc=尾端段落中不允許內容。
+        ReferenceIllegalInTrailingMisc=尾端段落中不允許參照。
 
 # 2.9 Standalone Document Declaration
-        SDDeclInvalid = \u7368\u7ACB\u6587\u4EF6\u5BA3\u544A\u503C\u5FC5\u9808\u662F "yes" \u6216 "no"\uFF0C\u800C\u975E "{0}"\u3002
-        SDDeclNameInvalid = XML \u5BA3\u544A\u4E2D\u7684\u7368\u7ACB\u540D\u7A31\u53EF\u80FD\u62FC\u932F\u4E86\u3002
+        SDDeclInvalid = 獨立文件宣告值必須是 "yes" 或 "no"，而非 "{0}"。
+        SDDeclNameInvalid = XML 宣告中的獨立名稱可能拼錯了。
 # 2.12 Language Identification
-        XMLLangInvalid = xml:lang \u5C6C\u6027\u503C "{0}" \u70BA\u7121\u6548\u7684\u8A9E\u8A00 ID\u3002
+        XMLLangInvalid = xml:lang 屬性值 "{0}" 為無效的語言 ID。
 # 3. Logical Structures
-        ETagRequired = \u5143\u7D20\u985E\u578B "{0}" \u5FC5\u9808\u7531\u914D\u5C0D\u7684\u7D50\u675F\u6A19\u8A18 "</{0}>" \u7D42\u6B62\u3002
+        ETagRequired = 元素類型 "{0}" 必須由配對的結束標記 "</{0}>" 終止。
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ElementUnterminated = \u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5F8C\u5FC5\u9808\u7DCA\u63A5\u5C6C\u6027\u8A2D\u5B9A ">" \u6216 "/>"\u3002
-        EqRequiredInAttribute = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u7684\u5C6C\u6027\u540D\u7A31 "{1}" \u4E4B\u5F8C\u5FC5\u9808\u7DCA\u63A5 '' = '' \u5B57\u5143\u3002
-        OpenQuoteExpected = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u7684\u5C6C\u6027 "{1}" \u9810\u671F\u6709\u958B\u982D\u5F15\u865F\u3002
-        CloseQuoteExpected = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u7684\u5C6C\u6027 "{1}" \u9810\u671F\u6709\u7D50\u675F\u5F15\u865F\u3002
-        AttributeNotUnique = \u5DF2\u7D93\u70BA\u5143\u7D20 "{0}" \u6307\u5B9A\u5C6C\u6027 "{1}"\u3002
-        AttributeNSNotUnique = \u5DF2\u7D93\u70BA\u5143\u7D20 "{0}" \u6307\u5B9A\u9023\u7D50\u547D\u540D\u7A7A\u9593 "{2}" \u7684\u5C6C\u6027 "{1}"\u3002
-        ETagUnterminated = \u5143\u7D20\u985E\u578B "{0}" \u7684\u7D50\u675F\u6A19\u8A18\u7D50\u5C3E\u5FC5\u9808\u662F ''>'' \u5206\u754C\u5B57\u5143\u3002
-        MarkupNotRecognizedInContent = \u5143\u7D20\u7684\u5167\u5BB9\u5FC5\u9808\u7531\u683C\u5F0F\u6B63\u78BA\u7684\u4F4D\u63CF\u8FF0\u8CC7\u6599\u6216\u6A19\u8A18\u6240\u7D44\u6210\u3002
-        DoctypeIllegalInContent = \u5167\u5BB9\u4E0D\u5141\u8A31 DOCTYPE\u3002
+        ElementUnterminated = 元素類型 "{0}" 之後必須緊接屬性設定 ">" 或 "/>"。
+        EqRequiredInAttribute = 關聯元素類型 "{0}" 的屬性名稱 "{1}" 之後必須緊接 '' = '' 字元。
+        OpenQuoteExpected = 關聯元素類型 "{0}" 的屬性 "{1}" 預期有開頭引號。
+        CloseQuoteExpected = 關聯元素類型 "{0}" 的屬性 "{1}" 預期有結束引號。
+        AttributeNotUnique = 已經為元素 "{0}" 指定屬性 "{1}"。
+        AttributeNSNotUnique = 已經為元素 "{0}" 指定連結命名空間 "{2}" 的屬性 "{1}"。
+        ETagUnterminated = 元素類型 "{0}" 的結束標記結尾必須是 ''>'' 分界字元。
+        MarkupNotRecognizedInContent = 元素的內容必須由格式正確的位描述資料或標記所組成。
+        DoctypeIllegalInContent = 內容不允許 DOCTYPE。
 # 4.1 Character and Entity References
-        ReferenceUnterminated = \u53C3\u7167\u5FC5\u9808\u7531 ';' \u5206\u754C\u5B57\u5143\u7D42\u6B62\u3002
+        ReferenceUnterminated = 參照必須由 ';' 分界字元終止。
 # 4.3.2 Well-Formed Parsed Entities
-        ReferenceNotInOneEntity = \u53C3\u7167\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u5BE6\u9AD4\u5167\u3002
-        ElementEntityMismatch = \u5143\u7D20 "{0}" \u7684\u958B\u982D\u8207\u7D50\u5C3E\u5FC5\u9808\u5728\u76F8\u540C\u5BE6\u9AD4\u5167\u3002
-        MarkupEntityMismatch=XML \u6587\u4EF6\u7D50\u69CB\u7684\u958B\u982D\u8207\u7D50\u5C3E\u5FC5\u9808\u5728\u76F8\u540C\u5BE6\u9AD4\u5167\u3002
+        ReferenceNotInOneEntity = 參照必須整個包含在相同的剖析實體內。
+        ElementEntityMismatch = 元素 "{0}" 的開頭與結尾必須在相同實體內。
+        MarkupEntityMismatch=XML 文件結構的開頭與結尾必須在相同實體內。
 
 # Messages common to Document and DTD
 # 2.2 Characters
-        InvalidCharInAttValue = \u5728\u5C6C\u6027 "{1}" \u7684\u503C\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{2}) \u4E14\u5143\u7D20\u70BA "{0}"\u3002
-        InvalidCharInComment = \u5728\u8A3B\u89E3\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-        InvalidCharInPI = \u5728\u8655\u7406\u6307\u793A\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-        InvalidCharInInternalSubset = \u5728 DTD \u5167\u90E8\u5B50\u96C6\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-        InvalidCharInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+        InvalidCharInAttValue = 在屬性 "{1}" 的值中找到無效的 XML 字元 (Unicode: 0x{2}) 且元素為 "{0}"。
+        InvalidCharInComment = 在註解中找到無效的 XML 字元 (Unicode: 0x{0})。
+        InvalidCharInPI = 在處理指示中找到無效的 XML 字元 (Unicode: 0x{0})。
+        InvalidCharInInternalSubset = 在 DTD 內部子集中找到無效的 XML 字元 (Unicode: 0x{0})。
+        InvalidCharInTextDecl = 在文字宣告中找到無效的 XML 字元 (Unicode: 0x{0})。
 # 2.3 Common Syntactic Constructs
-        QuoteRequiredInAttValue = \u5C6C\u6027 "{1}" \u7684\u503C\u958B\u982D\u5FC5\u9808\u70BA\u55AE\u5F15\u865F\u6216\u96D9\u5F15\u865F\u5B57\u5143\u3002
-        LessthanInAttValue = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5C6C\u6027 "{1}" \u7684\u503C\u4E0D\u53EF\u5305\u542B ''<'' \u5B57\u5143\u3002
-        AttributeValueUnterminated = \u5C6C\u6027 "{1}" \u7684\u503C\u7D50\u5C3E\u5FC5\u9808\u662F\u914D\u5C0D\u7684\u5F15\u865F\u5B57\u5143\u3002
+        QuoteRequiredInAttValue = 屬性 "{1}" 的值開頭必須為單引號或雙引號字元。
+        LessthanInAttValue = 關聯元素類型 "{0}" 之屬性 "{1}" 的值不可包含 ''<'' 字元。
+        AttributeValueUnterminated = 屬性 "{1}" 的值結尾必須是配對的引號字元。
 # 2.5 Comments
-        InvalidCommentStart = \u8A3B\u89E3\u958B\u982D\u5FC5\u9808\u70BA "<!--"\u3002
-        DashDashInComment = \u8A3B\u89E3\u4E0D\u5141\u8A31\u5B57\u4E32 "--"\u3002
-        CommentUnterminated = \u8A3B\u89E3\u7D50\u5C3E\u5FC5\u9808\u70BA "-->"\u3002
-        COMMENT_NOT_IN_ONE_ENTITY = \u8A3B\u89E3\u672A\u5305\u542B\u5728\u76F8\u540C\u5BE6\u9AD4\u5167\u3002
+        InvalidCommentStart = 註解開頭必須為 "<!--"。
+        DashDashInComment = 註解不允許字串 "--"。
+        CommentUnterminated = 註解結尾必須為 "-->"。
+        COMMENT_NOT_IN_ONE_ENTITY = 註解未包含在相同實體內。
 # 2.6 Processing Instructions
-        PITargetRequired = \u8655\u7406\u6307\u793A\u7684\u958B\u982D\u5FC5\u9808\u662F\u76EE\u6A19\u7684\u540D\u7A31\u3002
-        SpaceRequiredInPI = \u8655\u7406\u6307\u793A\u76EE\u6A19\u8207\u8CC7\u6599\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-        PIUnterminated = \u8655\u7406\u6307\u793A\u7D50\u5C3E\u5FC5\u9808\u662F "?>"\u3002
-        ReservedPITarget = \u4E0D\u5141\u8A31\u7B26\u5408 "[xX][mM][lL]" \u7684\u8655\u7406\u6307\u793A\u76EE\u6A19\u3002
-        PI_NOT_IN_ONE_ENTITY = \u8655\u7406\u6307\u793A\u672A\u5305\u542B\u5728\u76F8\u540C\u5BE6\u9AD4\u5167\u3002
+        PITargetRequired = 處理指示的開頭必須是目標的名稱。
+        SpaceRequiredInPI = 處理指示目標與資料之間需要空格。
+        PIUnterminated = 處理指示結尾必須是 "?>"。
+        ReservedPITarget = 不允許符合 "[xX][mM][lL]" 的處理指示目標。
+        PI_NOT_IN_ONE_ENTITY = 處理指示未包含在相同實體內。
 # 2.8 Prolog and Document Type Declaration
-        VersionInfoInvalid = \u7121\u6548\u7684\u7248\u672C "{0}"\u3002
-        VersionNotSupported = \u4E0D\u652F\u63F4 XML \u7248\u672C "{0}"\uFF0C\u50C5\u652F\u63F4 XML 1.0\u3002
-        VersionNotSupported11 = \u4E0D\u652F\u63F4 XML \u7248\u672C "{0}"\uFF0C\u50C5\u652F\u63F4 XML 1.0 \u8207 XML 1.1\u3002
-        VersionMismatch= \u5BE6\u9AD4\u4E0D\u53EF\u5305\u542B\u8F03\u65B0\u7248\u672C\u7684\u5176\u4ED6\u5BE6\u9AD4\u3002
+        VersionInfoInvalid = 無效的版本 "{0}"。
+        VersionNotSupported = 不支援 XML 版本 "{0}"，僅支援 XML 1.0。
+        VersionNotSupported11 = 不支援 XML 版本 "{0}"，僅支援 XML 1.0 與 XML 1.1。
+        VersionMismatch= 實體不可包含較新版本的其他實體。
 # 4.1 Character and Entity References
-        DigitRequiredInCharRef = \u5728\u5B57\u5143\u53C3\u7167\u4E2D\uFF0C\u5341\u9032\u4F4D\u8868\u793A\u6CD5\u5FC5\u9808\u7DCA\u63A5\u5728 "&#" \u4E4B\u5F8C\u3002
-        HexdigitRequiredInCharRef = \u5728\u5B57\u5143\u53C3\u7167\u4E2D\uFF0C\u5341\u516D\u9032\u4F4D\u8868\u793A\u6CD5\u5FC5\u9808\u7DCA\u63A5\u5728 "&#x" \u4E4B\u5F8C\u3002
-        SemicolonRequiredInCharRef = \u5B57\u5143\u53C3\u7167\u7684\u7D50\u5C3E\u5FC5\u9808\u662F ';' \u5206\u754C\u5B57\u5143\u3002
-        InvalidCharRef = \u5B57\u5143\u53C3\u7167 "&#{0}" \u70BA\u7121\u6548\u7684 XML \u5B57\u5143\u3002
-        NameRequiredInReference = \u5728\u5BE6\u9AD4\u53C3\u7167\u4E2D\uFF0C\u5BE6\u9AD4\u540D\u7A31\u5FC5\u9808\u7DCA\u63A5\u5728 '&' \u4E4B\u5F8C\u3002
-        SemicolonRequiredInReference = \u5BE6\u9AD4 "{0}" \u7684\u53C3\u7167\u7D50\u5C3E\u5FC5\u9808\u70BA '';'' \u5206\u754C\u5B57\u5143\u3002
+        DigitRequiredInCharRef = 在字元參照中，十進位表示法必須緊接在 "&#" 之後。
+        HexdigitRequiredInCharRef = 在字元參照中，十六進位表示法必須緊接在 "&#x" 之後。
+        SemicolonRequiredInCharRef = 字元參照的結尾必須是 ';' 分界字元。
+        InvalidCharRef = 字元參照 "&#{0}" 為無效的 XML 字元。
+        NameRequiredInReference = 在實體參照中，實體名稱必須緊接在 '&' 之後。
+        SemicolonRequiredInReference = 實體 "{0}" 的參照結尾必須為 '';'' 分界字元。
 # 4.3.1 The Text Declaration
-        TextDeclMustBeFirst = \u6587\u5B57\u5BA3\u544A\u50C5\u80FD\u51FA\u73FE\u5728\u5916\u90E8\u5256\u6790\u5BE6\u9AD4\u7684\u958B\u982D\u3002
-        EqRequiredInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C'' = '' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 "{0}" \u4E4B\u5F8C\u3002
-        QuoteRequiredInTextDecl = \u6587\u5B57\u5BA3\u544A\u4E2D "{0}" \u4E4B\u5F8C\u7684\u503C\u5FC5\u9808\u662F\u4EE5\u5F15\u865F\u62EC\u4F4F\u7684\u5B57\u4E32\u3002
-        CloseQuoteMissingInTextDecl = \u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C\u907A\u6F0F "{0}" \u4E4B\u5F8C\u7684\u503C\u7684\u7D50\u675F\u5F15\u865F\u3002
-        SpaceRequiredBeforeVersionInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C\u7248\u672C\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
-        SpaceRequiredBeforeEncodingInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C\u7DE8\u78BC\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
-        TextDeclUnterminated = \u6587\u5B57\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u662F "?>"\u3002
-        EncodingDeclRequired = \u6587\u5B57\u5BA3\u544A\u4E2D\u9700\u8981\u7DE8\u78BC\u5BA3\u544A\u3002
-        NoMorePseudoAttributes = \u4E0D\u5141\u8A31\u66F4\u591A\u7684\u865B\u64EC\u5C6C\u6027\u3002
-        MorePseudoAttributes = \u9810\u671F\u66F4\u591A\u7684\u865B\u64EC\u5C6C\u6027\u3002
-        PseudoAttrNameExpected = \u9810\u671F\u4E00\u500B\u865B\u64EC\u5C6C\u6027\u540D\u7A31\u3002
+        TextDeclMustBeFirst = 文字宣告僅能出現在外部剖析實體的開頭。
+        EqRequiredInTextDecl = 在文字宣告中，'' = '' 字元必須緊接在 "{0}" 之後。
+        QuoteRequiredInTextDecl = 文字宣告中 "{0}" 之後的值必須是以引號括住的字串。
+        CloseQuoteMissingInTextDecl = 文字宣告中，遺漏 "{0}" 之後的值的結束引號。
+        SpaceRequiredBeforeVersionInTextDecl = 在文字宣告中，版本虛擬屬性之前需要有空格。
+        SpaceRequiredBeforeEncodingInTextDecl = 在文字宣告中，編碼虛擬屬性之前需要有空格。
+        TextDeclUnterminated = 文字宣告結尾必須是 "?>"。
+        EncodingDeclRequired = 文字宣告中需要編碼宣告。
+        NoMorePseudoAttributes = 不允許更多的虛擬屬性。
+        MorePseudoAttributes = 預期更多的虛擬屬性。
+        PseudoAttrNameExpected = 預期一個虛擬屬性名稱。
 # 4.3.2 Well-Formed Parsed Entities
-        CommentNotInOneEntity = \u8A3B\u89E3\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u5BE6\u9AD4\u5167\u3002
-        PINotInOneEntity = \u8655\u7406\u6307\u793A\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u5BE6\u9AD4\u5167\u3002
+        CommentNotInOneEntity = 註解必須整個包含在相同的剖析實體內。
+        PINotInOneEntity = 處理指示必須整個包含在相同的剖析實體內。
 # 4.3.3 Character Encoding in Entities
-        EncodingDeclInvalid = \u7121\u6548\u7684\u7DE8\u78BC\u540D\u7A31 "{0}"\u3002
-        EncodingByteOrderUnsupported = \u4E0D\u652F\u63F4\u7DE8\u78BC "{0}" \u7684\u6307\u5B9A\u4F4D\u5143\u7D44\u9806\u5E8F\u3002
-        InvalidByte = {1}-byte UTF-8 \u5E8F\u5217\u7684\u7121\u6548\u4F4D\u5143\u7D44 {0}\u3002
-        ExpectedByte = {1}-byte UTF-8 \u5E8F\u5217\u9810\u671F\u7684\u4F4D\u5143\u7D44 {0}\u3002
-        InvalidHighSurrogate = UTF-8 \u5E8F\u5217\u4E2D\u9AD8\u66FF\u4EE3\u4F4D\u5143\u4E0D\u53EF\u8D85\u904E 0x10\uFF0C\u4F46\u627E\u5230 0x{0}\u3002
-        OperationNotSupported = {1} \u8B80\u53D6\u5668\u4E0D\u652F\u63F4\u4F5C\u696D "{0}"\u3002
-        InvalidASCII = \u7D44\u5143\u7D44 "{0}" \u4E0D\u662F (7 \u4F4D\u5143) ASCII \u5B57\u5143\u96C6\u7684\u6210\u54E1\u3002
-        CharConversionFailure = \u6C7A\u5B9A\u4F7F\u7528\u7279\u5B9A\u7DE8\u78BC\u7684\u5BE6\u9AD4\uFF0C\u5728\u8A72\u7DE8\u78BC\u4E2D\u4E0D\u53EF\u5305\u542B\u7121\u6548\u7684\u5E8F\u5217\u3002
+        EncodingDeclInvalid = 無效的編碼名稱 "{0}"。
+        EncodingByteOrderUnsupported = 不支援編碼 "{0}" 的指定位元組順序。
+        InvalidByte = {1}-byte UTF-8 序列的無效位元組 {0}。
+        ExpectedByte = {1}-byte UTF-8 序列預期的位元組 {0}。
+        InvalidHighSurrogate = UTF-8 序列中高替代位元不可超過 0x10，但找到 0x{0}。
+        OperationNotSupported = {1} 讀取器不支援作業 "{0}"。
+        InvalidASCII = 組元組 "{0}" 不是 (7 位元) ASCII 字元集的成員。
+        CharConversionFailure = 決定使用特定編碼的實體，在該編碼中不可包含無效的序列。
 
 # DTD Messages
 # 2.2 Characters
-        InvalidCharInEntityValue = \u5728\u6587\u5B57\u5BE6\u9AD4\u503C\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-        InvalidCharInExternalSubset = \u5728 DTD \u5916\u90E8\u5B50\u96C6\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-        InvalidCharInIgnoreSect = \u5728\u6392\u9664\u7684\u689D\u4EF6\u6027\u6BB5\u843D\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-        InvalidCharInPublicID = \u5728\u516C\u7528 ID \u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-        InvalidCharInSystemID = \u5728\u7CFB\u7D71 ID \u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+        InvalidCharInEntityValue = 在文字實體值中找到無效的 XML 字元 (Unicode: 0x{0})。
+        InvalidCharInExternalSubset = 在 DTD 外部子集中找到無效的 XML 字元 (Unicode: 0x{0})。
+        InvalidCharInIgnoreSect = 在排除的條件性段落中找到無效的 XML 字元 (Unicode: 0x{0})。
+        InvalidCharInPublicID = 在公用 ID 中找到無效的 XML 字元 (Unicode: 0x{0})。
+        InvalidCharInSystemID = 在系統 ID 中找到無效的 XML 字元 (Unicode: 0x{0})。
 # 2.3 Common Syntactic Constructs
-        SpaceRequiredAfterSYSTEM = \u5728 DOCTYPE \u5BA3\u544A\u4E2D\u95DC\u9375\u5B57 SYSTEM \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-        QuoteRequiredInSystemID = \u7CFB\u7D71 ID \u7684\u958B\u982D\u5FC5\u9808\u70BA\u55AE\u5F15\u865F\u6216\u96D9\u5F15\u865F\u5B57\u5143\u3002
-        SystemIDUnterminated = \u7CFB\u7D71 ID \u7684\u7D50\u5C3E\u5FC5\u9808\u662F\u914D\u5C0D\u7684\u5F15\u865F\u5B57\u5143\u3002
-        SpaceRequiredAfterPUBLIC = \u5728 DOCTYPE \u5BA3\u544A\u4E2D\u95DC\u9375\u5B57 PUBLIC \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-        QuoteRequiredInPublicID = \u516C\u7528 ID \u7684\u958B\u982D\u5FC5\u9808\u70BA\u55AE\u5F15\u865F\u6216\u96D9\u5F15\u865F\u5B57\u5143\u3002
-        PublicIDUnterminated = \u516C\u7528 ID \u7684\u7D50\u5C3E\u5FC5\u9808\u662F\u914D\u5C0D\u7684\u5F15\u865F\u5B57\u5143\u3002
-        PubidCharIllegal = \u516C\u7528 ID \u4E2D\u4E0D\u5141\u8A31\u5B57\u5143 (Unicode: 0x{0})\u3002
-        SpaceRequiredBetweenPublicAndSystem = publicId \u8207 systemId \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
+        SpaceRequiredAfterSYSTEM = 在 DOCTYPE 宣告中關鍵字 SYSTEM 之後需要空格。
+        QuoteRequiredInSystemID = 系統 ID 的開頭必須為單引號或雙引號字元。
+        SystemIDUnterminated = 系統 ID 的結尾必須是配對的引號字元。
+        SpaceRequiredAfterPUBLIC = 在 DOCTYPE 宣告中關鍵字 PUBLIC 之後需要空格。
+        QuoteRequiredInPublicID = 公用 ID 的開頭必須為單引號或雙引號字元。
+        PublicIDUnterminated = 公用 ID 的結尾必須是配對的引號字元。
+        PubidCharIllegal = 公用 ID 中不允許字元 (Unicode: 0x{0})。
+        SpaceRequiredBetweenPublicAndSystem = publicId 與 systemId 之間需要空格。
 # 2.8 Prolog and Document Type Declaration
-        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D "<!DOCTYPE" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-        MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D\uFF0C\u6839\u5143\u7D20\u985E\u578B\u5FC5\u9808\u51FA\u73FE\u5728 "<!DOCTYPE" \u4E4B\u5F8C\u3002
-        DoctypedeclUnterminated = \u6839\u5143\u7D20\u985E\u578B "{0}" \u7684\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
-        DoctypedeclNotClosed = \u6839\u5143\u7D20\u985E\u578B "{0}" \u7684\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA '']''\u3002
-        PEReferenceWithinMarkup = DTD \u5167\u90E8\u5B57\u96C6\u7684\u6A19\u8A18\u5167\u4E0D\u80FD\u51FA\u73FE\u53C3\u6578\u5BE6\u9AD4\u53C3\u7167 "%{0};"\u3002
-        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u6587\u4EF6\u985E\u578B\u5BA3\u544A\u5305\u542B\u6216\u6307\u5411\u7684\u6A19\u8A18\u5BA3\u544A\u5FC5\u9808\u683C\u5F0F\u6B63\u78BA\u3002
+        MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = 在文件類型宣告中 "<!DOCTYPE" 之後需要空格。
+        MSG_ROOT_ELEMENT_TYPE_REQUIRED = 在文件類型宣告中，根元素類型必須出現在 "<!DOCTYPE" 之後。
+        DoctypedeclUnterminated = 根元素類型 "{0}" 的文件類型宣告結尾必須為 ''>''。
+        DoctypedeclNotClosed = 根元素類型 "{0}" 的文件類型宣告結尾必須為 '']''。
+        PEReferenceWithinMarkup = DTD 內部字集的標記內不能出現參數實體參照 "%{0};"。
+        MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = 文件類型宣告包含或指向的標記宣告必須格式正確。
 # 2.10 White Space Handling
-        MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space" \u7684\u5C6C\u6027\u5BA3\u544A\u5FC5\u9808\u6307\u5B9A\u70BA\u5217\u8209\u985E\u578B\uFF0C\u5176\u53EF\u80FD\u7684\u503C\u70BA "default" \u8207 "preserve"\u3002
+        MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space" 的屬性宣告必須指定為列舉類型，其可能的值為 "default" 與 "preserve"。
 # 3.2 Element Type Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D "<!ELEMENT" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = \u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u9700\u8981\u5143\u7D20\u985E\u578B\u3002
-        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5F8C\u9700\u8981\u9650\u5236\u689D\u4EF6\u3002
-        ElementDeclUnterminated = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = 在元素類型宣告中 "<!ELEMENT" 之後需要空格。
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = 元素類型宣告中需要元素類型。
+        MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = 在元素類型宣告中元素類型 "{0}" 之後需要空格。
+        MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = 在元素類型宣告中元素類型 "{0}" 之後需要限制條件。
+        ElementDeclUnterminated = 元素類型 "{0}" 的宣告結尾必須為 ''>''。
 # 3.2.1 Element Content
-        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B ''('' \u5B57\u5143\u6216\u5143\u7D20\u985E\u578B\u3002
-        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B '')''\u3002
+        MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = 元素類型 "{0}" 的宣告中需要一個 ''('' 字元或元素類型。
+        MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = 元素類型 "{0}" 的宣告中需要一個 '')''。
 # 3.2.2 Mixed Content
-        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B\u5143\u7D20\u985E\u578B\u3002
-        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B '')''\u3002
-        MixedContentUnterminated = \u5B50\u9805\u5143\u7D20\u7684\u985E\u578B\u53D7\u5230\u9650\u5236\u6642\uFF0C\u6DF7\u5408\u5167\u5BB9\u6A21\u578B "{0}" \u7684\u7D50\u5C3E\u5FC5\u9808\u70BA ")*"\u3002
+        MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = 元素類型 "{0}" 的宣告中需要一個元素類型。
+        MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = 元素類型 "{0}" 的宣告中需要一個 '')''。
+        MixedContentUnterminated = 子項元素的類型受到限制時，混合內容模型 "{0}" 的結尾必須為 ")*"。
 # 3.3 Attribute-List Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5728 attribute-list \u5BA3\u544A\u4E2D "<!ATTLIST" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = attribute-list \u5BA3\u544A\u4E2D\u9700\u8981\u5143\u7D20\u985E\u578B\u3002
-        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u5143\u7D20 "{0}" \u7684 attribute-list \u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u540D\u7A31\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
-        AttNameRequiredInAttDef = \u5143\u7D20 "{0}" \u7684 attribute-list \u5BA3\u544A\u5FC5\u9808\u6307\u5B9A\u5C6C\u6027\u540D\u7A31\u3002
-        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u5143\u7D20 "{0}" \u5C6C\u6027 "{1}" \u7684\u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u985E\u578B\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
-        AttTypeRequiredInAttDef = \u5143\u7D20 "{0}" \u5C6C\u6027 "{1}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u5C6C\u6027\u985E\u578B\u3002
-        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u5143\u7D20 "{0}" \u5C6C\u6027 "{1}" \u7684\u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u9810\u8A2D\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
-        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u70BA\u6307\u5B9A\u5143\u7D20 "{0}" \u7684\u76F8\u540C\u5C6C\u6027 "{1}" \u63D0\u4F9B\u4E86\u8D85\u904E\u4E00\u500B\u4EE5\u4E0A\u7684\u5C6C\u6027\u5B9A\u7FA9\u3002
+        MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = 在 attribute-list 宣告中 "<!ATTLIST" 之後需要空格。
+        MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = attribute-list 宣告中需要元素類型。
+        MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = 元素 "{0}" 的 attribute-list 宣告中，屬性名稱之前需要空格。
+        AttNameRequiredInAttDef = 元素 "{0}" 的 attribute-list 宣告必須指定屬性名稱。
+        MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = 元素 "{0}" 屬性 "{1}" 的宣告中，屬性類型之前需要空格。
+        AttTypeRequiredInAttDef = 元素 "{0}" 屬性 "{1}" 的宣告中需要屬性類型。
+        MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = 元素 "{0}" 屬性 "{1}" 的宣告中，屬性預設之前需要空格。
+        MSG_DUPLICATE_ATTRIBUTE_DEFINITION = 為指定元素 "{0}" 的相同屬性 "{1}" 提供了超過一個以上的屬性定義。
 # 3.3.1 Attribute Types
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D "NOTATION" \u4E4B\u5F8C\u5FC5\u9808\u6709\u7A7A\u683C\u3002
-        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \u5728 "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C''('' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 "NOTATION" \u4E4B\u5F8C\u3002
-        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = "{1}" \u5C6C\u6027\u5BA3\u544A\u7684\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u4E2D\uFF0C\u9700\u8981\u8868\u793A\u6CD5\u540D\u7A31\u3002
-        NotationTypeUnterminated = \u5728 "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '')''\u3002
-        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = "{1}" \u5C6C\u6027\u5BA3\u544A\u7684\u5217\u8209\u985E\u578B\u6E05\u55AE\u4E2D\uFF0C\u9700\u8981\u540D\u7A31\u8A18\u865F\u3002
-        EnumerationUnterminated = \u5728 "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u5217\u8209\u985E\u578B\u6E05\u55AE\u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '')''\u3002
-        MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u5143\u7D20 "{0}" \u7684\u5C6C\u6027 "{2}" \u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u7684\u5217\u8209\u503C "{1}"\u3002\u55AE\u4E00 Enumeration \u5C6C\u6027\u5BA3\u544A\u4E2D\u7684 NMTOKENS \u5FC5\u9808\u5168\u90E8\u90FD\u4E0D\u76F8\u540C\u3002
-        MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u5143\u7D20 "{0}" \u5C6C\u6027 "{2}" \u7684\u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u7684\u5217\u8209\u503C "{1}"\u3002\u55AE\u4E00 NotationType \u5C6C\u6027\u5BA3\u544A\u4E2D\u7684 NOTATION \u540D\u7A31\u5FC5\u9808\u5168\u90E8\u90FD\u4E0D\u76F8\u540C\u3002
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = "{1}" 屬性宣告中 "NOTATION" 之後必須有空格。
+        MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = 在 "{1}" 屬性宣告中，''('' 字元必須緊接在 "NOTATION" 之後。
+        MSG_NAME_REQUIRED_IN_NOTATIONTYPE = "{1}" 屬性宣告的表示法類型清單中，需要表示法名稱。
+        NotationTypeUnterminated = 在 "{1}" 屬性宣告中，表示法類型清單的結尾必須為 '')''。
+        MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = "{1}" 屬性宣告的列舉類型清單中，需要名稱記號。
+        EnumerationUnterminated = 在 "{1}" 屬性宣告中，列舉類型清單的結尾必須為 '')''。
+        MSG_DISTINCT_TOKENS_IN_ENUMERATION = 元素 "{0}" 的屬性 "{2}" 宣告中，指定超過一次以上的列舉值 "{1}"。單一 Enumeration 屬性宣告中的 NMTOKENS 必須全部都不相同。
+        MSG_DISTINCT_NOTATION_IN_ENUMERATION = 元素 "{0}" 屬性 "{2}" 的宣告中，指定超過一次以上的列舉值 "{1}"。單一 NotationType 屬性宣告中的 NOTATION 名稱必須全部都不相同。
 # 3.3.2 Attribute Defaults
-        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D "FIXED" \u4E4B\u5F8C\u5FC5\u9808\u6709\u7A7A\u683C\u3002
+        MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = "{1}" 屬性宣告中 "FIXED" 之後必須有空格。
 # 3.4 Conditional Sections
-        IncludeSectUnterminated = \u5305\u542B\u689D\u4EF6\u6027\u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F "]]>"\u3002
-        IgnoreSectUnterminated = \u6392\u9664\u689D\u4EF6\u6027\u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F "]]>"\u3002
+        IncludeSectUnterminated = 包含條件性段落結尾必須是 "]]>"。
+        IgnoreSectUnterminated = 排除條件性段落結尾必須是 "]]>"。
 # 4.1 Character and Entity References
-        NameRequiredInPEReference = \u5728\u53C3\u6578\u5BE6\u9AD4\u53C3\u7167\u4E2D\uFF0C\u5BE6\u9AD4\u540D\u7A31\u5FC5\u9808\u7DCA\u63A5\u5728 '%' \u4E4B\u5F8C\u3002
-        SemicolonRequiredInPEReference = \u53C3\u6578\u5BE6\u9AD4\u53C3\u7167 "%{0};" \u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '';'' \u5206\u754C\u5B57\u5143\u3002
+        NameRequiredInPEReference = 在參數實體參照中，實體名稱必須緊接在 '%' 之後。
+        SemicolonRequiredInPEReference = 參數實體參照 "%{0};" 的結尾必須為 '';'' 分界字元。
 # 4.2 Entity Declarations
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5BE6\u9AD4\u5BA3\u544A\u4E2D "<!ENTITY" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u5728\u53C3\u6578\u5BE6\u9AD4\u5BA3\u544A\u4E2D\uFF0C"<!ENTITY" \u8207 '%' \u5B57\u5143\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u5728\u53C3\u6578\u5BE6\u9AD4\u5BA3\u544A\u4E2D\uFF0C'%' \u8207\u5BE6\u9AD4\u540D\u7A31\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \u5BE6\u9AD4\u5BA3\u544A\u4E2D\u9700\u8981\u5BE6\u9AD4\u7684\u540D\u7A31\u3002
-        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5BE6\u9AD4\u5BA3\u544A\u4E2D\uFF0C\u5BE6\u9AD4\u540D\u7A31 "{0}" \u8207\u5B9A\u7FA9\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u5728\u5BE6\u9AD4 "{0}" \u7684\u5BA3\u544A\u4E2D\uFF0C"NDATA" \u8207\u8868\u793A\u6CD5\u540D\u7A31\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u5728\u5BE6\u9AD4 "{0}" \u7684\u5BA3\u544A\u4E2D\uFF0C"NDATA" \u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
-        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u5728\u5BE6\u9AD4 "{0}" \u7684\u5BA3\u544A\u4E2D\uFF0C"NDATA" \u4E4B\u5F8C\u9700\u8981\u8868\u793A\u6CD5\u540D\u7A31\u3002
-        EntityDeclUnterminated = \u5BE6\u9AD4 "{0}" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
-	MSG_DUPLICATE_ENTITY_DEFINITION = \u5BE6\u9AD4 "{0}" \u5BA3\u544A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u3002
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = 在實體宣告中 "<!ENTITY" 之後需要空格。
+        MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = 在參數實體宣告中，"<!ENTITY" 與 '%' 字元之間需要空格。
+        MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = 在參數實體宣告中，'%' 與實體名稱之間需要空格。
+        MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = 實體宣告中需要實體的名稱。
+        MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = 在實體宣告中，實體名稱 "{0}" 與定義之間需要空格。
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = 在實體 "{0}" 的宣告中，"NDATA" 與表示法名稱之間需要空格。
+        MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = 在實體 "{0}" 的宣告中，"NDATA" 之前需要空格。
+        MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = 在實體 "{0}" 的宣告中，"NDATA" 之後需要表示法名稱。
+        EntityDeclUnterminated = 實體 "{0}" 的宣告結尾必須為 ''>''。
+	MSG_DUPLICATE_ENTITY_DEFINITION = 實體 "{0}" 宣告超過一次以上。
 # 4.2.2 External Entities
-        ExternalIDRequired = \u5916\u90E8\u5BE6\u9AD4\u5BA3\u544A\u7684\u958B\u982D\u5FC5\u9808\u70BA "SYSTEM" \u6216 "PUBLIC"\u3002
-        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = "PUBLIC" \u8207\u516C\u7528 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \u516C\u7528 ID \u8207\u7CFB\u7D71 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = "SYSTEM" \u8207\u7CFB\u7D71 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-        MSG_URI_FRAGMENT_IN_SYSTEMID = \u7247\u6BB5 ID \u4E0D\u61C9\u6307\u5B9A\u70BA\u7CFB\u7D71 ID "{0}" \u7684\u4E00\u90E8\u5206\u3002
+        ExternalIDRequired = 外部實體宣告的開頭必須為 "SYSTEM" 或 "PUBLIC"。
+        MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = "PUBLIC" 與公用 ID 之間需要空格。
+        MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = 公用 ID 與系統 ID 之間需要空格。
+        MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = "SYSTEM" 與系統 ID 之間需要空格。
+        MSG_URI_FRAGMENT_IN_SYSTEMID = 片段 ID 不應指定為系統 ID "{0}" 的一部分。
 # 4.7 Notation Declarations
-        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D "<!NOTATION" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = \u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u9700\u8981\u8868\u793A\u6CD5\u7684\u540D\u7A31\u3002
-        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u8868\u793A\u6CD5\u540D\u7A31 "{0}" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-        ExternalIDorPublicIDRequired = \u8868\u793A\u6CD5 "{0}" \u7684\u5BA3\u544A\u5FC5\u9808\u5305\u542B\u7CFB\u7D71\u6216\u516C\u7528 ID\u3002
-        NotationDeclUnterminated = \u8868\u793A\u6CD5 "{0}" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
+        MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = 在表示法宣告中 "<!NOTATION" 之後需要空格。
+        MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = 表示法宣告中需要表示法的名稱。
+        MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = 在表示法宣告中表示法名稱 "{0}" 之後需要空格。
+        ExternalIDorPublicIDRequired = 表示法 "{0}" 的宣告必須包含系統或公用 ID。
+        NotationDeclUnterminated = 表示法 "{0}" 的宣告結尾必須為 ''>''。
 
 # Validation messages
-        DuplicateTypeInMixedContent = \u5143\u7D20\u5BA3\u544A "{0}" \u7684\u5167\u5BB9\u6A21\u578B\u4E2D\u5DF2\u7D93\u6307\u5B9A\u5143\u7D20\u985E\u578B "{1}"\u3002
-        ENTITIESInvalid = \u985E\u578B ENTITIES \u7684\u5C6C\u6027\u503C "{1}" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u672A\u5256\u6790\u5BE6\u9AD4\u7684\u540D\u7A31\u3002
-        ENTITYInvalid = \u985E\u578B ENTITY \u7684\u5C6C\u6027\u503C "{1}" \u5FC5\u9808\u662F\u4E00\u500B\u672A\u5256\u6790\u5BE6\u9AD4\u7684\u540D\u7A31\u3002
-        IDDefaultTypeInvalid = ID \u5C6C\u6027 "{0}" \u5FC5\u9808\u5177\u6709 "#IMPLIED" \u6216 "#REQUIRED" \u7684\u5BA3\u544A\u9810\u8A2D\u3002
-        IDInvalid = \u985E\u578B ID \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u540D\u7A31\u3002
-        IDInvalidWithNamespaces = \u555F\u7528\u547D\u540D\u7A7A\u9593\u6642\uFF0C\u985E\u578B ID \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F NCName\u3002
-        IDNotUnique = \u985E\u578B ID \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u6587\u4EF6\u5167\u7684\u552F\u4E00\u503C\u3002
-        IDREFInvalid = \u985E\u578B IDREF \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u540D\u7A31\u3002
-        IDREFInvalidWithNamespaces = \u555F\u7528\u547D\u540D\u7A7A\u9593\u6642\uFF0C\u985E\u578B IDREF \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F NCName\u3002
-        IDREFSInvalid = \u985E\u578B IDREFS \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u540D\u7A31\u3002
-        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u7576\u5BE6\u9AD4\u53C3\u7167\u7576\u4F5C\u5B8C\u6574\u5BA3\u544A\u6642\uFF0C\u53C3\u6578\u5BE6\u9AD4 "{0}" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u5BA3\u544A\u3002
-        ImproperDeclarationNesting = \u53C3\u6578\u5BE6\u9AD4 "{0}" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u5BA3\u544A\u3002
-        ImproperGroupNesting = \u53C3\u6578\u5BE6\u9AD4 "{0}" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u6210\u5C0D\u62EC\u865F\u3002
-        INVALID_PE_IN_CONDITIONAL = \u53C3\u6578\u5BE6\u9AD4 "{0}" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6574\u500B\u689D\u4EF6\u6027\u6BB5\u843D\u6216\u50C5\u5305\u542B INCLUDE \u6216 IGNORE\u3002
-        MSG_ATTRIBUTE_NOT_DECLARED = \u5143\u7D20\u985E\u578B "{0}" \u5FC5\u9808\u5BA3\u544A\u5C6C\u6027 "{1}"\u3002
-        MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u5177\u6709\u503C "{1}" \u7684\u5C6C\u6027 "{0}" \u5FC5\u9808\u5177\u6709\u4F86\u81EA\u6E05\u55AE "{2}" \u7684\u503C\u3002
-        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u5C6C\u6027 "{0}" \u7684\u503C "{1}" \u4E0D\u53EF\u900F\u904E\u6B63\u898F\u5316\u9032\u884C\u8B8A\u66F4 (\u6210\u70BA "{2}")\u3002
-        MSG_CONTENT_INCOMPLETE = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5167\u5BB9\u4E0D\u5B8C\u6574\uFF0C\u5B83\u5FC5\u9808\u914D\u5C0D "{1}"\u3002
-        MSG_CONTENT_INVALID = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5167\u5BB9\u5FC5\u9808\u914D\u5C0D "{1}"\u3002
-        MSG_CONTENT_INVALID_SPECIFIED = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5167\u5BB9\u5FC5\u9808\u914D\u5C0D "{1}"\u3002\u4E0D\u5141\u8A31\u985E\u578B "{2}" \u7684\u5B50\u9805\u3002
-        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5C6C\u6027 "{1}" \u5177\u6709\u9810\u8A2D\u503C\uFF0C\u4E14\u5FC5\u9808\u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\u6307\u5B9A\u3002
-        MSG_DUPLICATE_ATTDEF = \u5143\u7D20\u985E\u578B "{0}" \u5DF2\u7D93\u5BA3\u544A\u5C6C\u6027 "{1}"\u3002
-        MSG_ELEMENT_ALREADY_DECLARED = \u5143\u7D20\u985E\u578B "{0}" \u4E0D\u53EF\u5BA3\u544A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u3002
-        MSG_ELEMENT_NOT_DECLARED = \u5FC5\u9808\u5BA3\u544A\u5143\u7D20\u985E\u578B "{0}"\u3002
-        MSG_GRAMMAR_NOT_FOUND = \u6587\u4EF6\u7121\u6548: \u627E\u4E0D\u5230\u6587\u6CD5\u3002
-        MSG_ELEMENT_WITH_ID_REQUIRED = ID \u70BA "{0}" \u7684\u5143\u7D20\u5FC5\u9808\u51FA\u73FE\u5728\u6587\u4EF6\u4E2D\u3002
-        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u7368\u7ACB\u6587\u4EF6\u4E2D\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u5BE6\u9AD4 "{0}"\u3002
-        MSG_FIXED_ATTVALUE_INVALID = \u5177\u6709\u503C "{2}" \u7684\u5C6C\u6027 "{1}" \u5FC5\u9808\u5177\u6709 "{3}" \u7684\u503C\u3002
-        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u5143\u7D20\u985E\u578B "{0}" \u5DF2\u7D93\u5177\u6709\u985E\u578B ID \u7684\u5C6C\u6027 "{1}"\uFF0C\u4E0D\u5141\u8A31\u8A72\u985E\u578B ID \u7684\u7B2C\u4E8C\u500B\u5C6C\u6027 "{2}"\u3002
-        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u5143\u7D20\u985E\u578B "{0}" \u5DF2\u7D93\u5177\u6709\u985E\u578B NOTATION \u7684\u5C6C\u6027 "{1}"\uFF0C\u4E0D\u5141\u8A31\u8A72\u985E\u578B NOTATION \u7684\u7B2C\u4E8C\u500B\u5C6C\u6027 "{2}"\u3002
-        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u82E5\u8981\u5728\u5C6C\u6027 "{0}" \u7684\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u4E2D\u53C3\u7167\u8868\u793A\u6CD5 "{1}"\uFF0C\u5FC5\u9808\u4E88\u4EE5\u5BA3\u544A\u3002
-        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \u82E5\u8981\u5728 "{0}" \u7684\u672A\u5256\u6790\u5BE6\u9AD4\u5BA3\u544A\u4E2D\u53C3\u7167\u8868\u793A\u6CD5 "{1}"\uFF0C\u5FC5\u9808\u4E88\u4EE5\u5BA3\u544A\u3002
-        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u5256\u6790\u5BE6\u9AD4\u4E2D\u5BA3\u544A\u7684\u5BE6\u9AD4 "{0}"\u3002
-        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u985E\u578B "{0}" \u9700\u8981\u5C6C\u6027 "{1}" \u4E14\u5FC5\u9808\u4E88\u4EE5\u6307\u5B9A\u3002
-        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u5177\u6709\u5143\u7D20\u5167\u5BB9\u7684\u5916\u90E8\u5256\u6790\u5BE6\u9AD4\u4E2D\u5BA3\u544A\u7684\u5143\u7D20\u4E4B\u9593\uFF0C\u4E0D\u53EF\u6709\u7A7A\u683C\u3002
-        NMTOKENInvalid = \u985E\u578B NMTOKEN \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u540D\u7A31\u8A18\u865F\u3002
-        NMTOKENSInvalid = \u985E\u578B NMTOKENS \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u540D\u7A31\u8A18\u865F\u3002
-        NoNotationOnEmptyElement = \u5BA3\u544A EMPTY \u7684\u5143\u7D20\u985E\u578B "{0}" \u4E0D\u53EF\u5BA3\u544A\u985E\u578B NOTATION \u7684\u5C6C\u6027 "{1}"\u3002
-        RootElementTypeMustMatchDoctypedecl = \u6587\u4EF6\u6839\u5143\u7D20 "{1}" \u5FC5\u9808\u914D\u5C0D DOCTYPE \u6839 "{0}"\u3002
-        UndeclaredElementInContentSpec = \u5143\u7D20 "{0}" \u7684\u5167\u5BB9\u6A21\u578B\u53C3\u7167\u672A\u5BA3\u544A\u7684\u5143\u7D20 "{1}"\u3002
-        UniqueNotationName = \u8868\u793A\u6CD5 "{0}" \u7684\u5BA3\u544A\u4E26\u975E\u552F\u4E00\u3002\u6307\u5B9A\u7684 Name \u4E0D\u80FD\u5728\u4E00\u500B\u4EE5\u4E0A\u7684\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u5BA3\u544A\u3002
-        ENTITYFailedInitializeGrammar =  ENTITYDatatype \u9A57\u8B49\u7A0B\u5F0F: \u5931\u6557\u3002\u9700\u8981\u4F7F\u7528\u6709\u6548\u7684\u6587\u6CD5\u53C3\u7167\u4F86\u547C\u53EB\u8D77\u59CB\u65B9\u6CD5\u3002\t
-        ENTITYNotUnparsed = ENTITY "{0}" \u4E26\u975E\u672A\u7D93\u5256\u6790\u3002
-        ENTITYNotValid = ENTITY "{0}" \u7121\u6548\u3002
-        EmptyList = \u985E\u578B ENTITIES\u3001IDREFS \u8207 NMTOKENS \u7684\u503C\u4E0D\u53EF\u70BA\u7A7A\u767D\u6E05\u55AE\u3002
+        DuplicateTypeInMixedContent = 元素宣告 "{0}" 的內容模型中已經指定元素類型 "{1}"。
+        ENTITIESInvalid = 類型 ENTITIES 的屬性值 "{1}" 必須是一或多個未剖析實體的名稱。
+        ENTITYInvalid = 類型 ENTITY 的屬性值 "{1}" 必須是一個未剖析實體的名稱。
+        IDDefaultTypeInvalid = ID 屬性 "{0}" 必須具有 "#IMPLIED" 或 "#REQUIRED" 的宣告預設。
+        IDInvalid = 類型 ID 的屬性值 "{0}" 必須是名稱。
+        IDInvalidWithNamespaces = 啟用命名空間時，類型 ID 的屬性值 "{0}" 必須是 NCName。
+        IDNotUnique = 類型 ID 的屬性值 "{0}" 必須是文件內的唯一值。
+        IDREFInvalid = 類型 IDREF 的屬性值 "{0}" 必須是名稱。
+        IDREFInvalidWithNamespaces = 啟用命名空間時，類型 IDREF 的屬性值 "{0}" 必須是 NCName。
+        IDREFSInvalid = 類型 IDREFS 的屬性值 "{0}" 必須是一或多個名稱。
+        ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = 當實體參照當作完整宣告時，參數實體 "{0}" 的取代文字必須包含正確巢狀結構的宣告。
+        ImproperDeclarationNesting = 參數實體 "{0}" 的取代文字必須包含正確巢狀結構的宣告。
+        ImproperGroupNesting = 參數實體 "{0}" 的取代文字必須包含正確巢狀結構的成對括號。
+        INVALID_PE_IN_CONDITIONAL = 參數實體 "{0}" 的取代文字必須包含整個條件性段落或僅包含 INCLUDE 或 IGNORE。
+        MSG_ATTRIBUTE_NOT_DECLARED = 元素類型 "{0}" 必須宣告屬性 "{1}"。
+        MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = 具有值 "{1}" 的屬性 "{0}" 必須具有來自清單 "{2}" 的值。
+        MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = 在獨立文件中，屬性 "{0}" 的值 "{1}" 不可透過正規化進行變更 (成為 "{2}")。
+        MSG_CONTENT_INCOMPLETE = 元素類型 "{0}" 的內容不完整，它必須配對 "{1}"。
+        MSG_CONTENT_INVALID = 元素類型 "{0}" 的內容必須配對 "{1}"。
+        MSG_CONTENT_INVALID_SPECIFIED = 元素類型 "{0}" 的內容必須配對 "{1}"。不允許類型 "{2}" 的子項。
+        MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = 元素類型 "{0}" 的屬性 "{1}" 具有預設值，且必須在獨立文件中指定。
+        MSG_DUPLICATE_ATTDEF = 元素類型 "{0}" 已經宣告屬性 "{1}"。
+        MSG_ELEMENT_ALREADY_DECLARED = 元素類型 "{0}" 不可宣告超過一次以上。
+        MSG_ELEMENT_NOT_DECLARED = 必須宣告元素類型 "{0}"。
+        MSG_GRAMMAR_NOT_FOUND = 文件無效: 找不到文法。
+        MSG_ELEMENT_WITH_ID_REQUIRED = ID 為 "{0}" 的元素必須出現在文件中。
+        MSG_EXTERNAL_ENTITY_NOT_PERMITTED = 獨立文件中不允許參照外部實體 "{0}"。
+        MSG_FIXED_ATTVALUE_INVALID = 具有值 "{2}" 的屬性 "{1}" 必須具有 "{3}" 的值。
+        MSG_MORE_THAN_ONE_ID_ATTRIBUTE = 元素類型 "{0}" 已經具有類型 ID 的屬性 "{1}"，不允許該類型 ID 的第二個屬性 "{2}"。
+        MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = 元素類型 "{0}" 已經具有類型 NOTATION 的屬性 "{1}"，不允許該類型 NOTATION 的第二個屬性 "{2}"。
+        MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = 若要在屬性 "{0}" 的表示法類型清單中參照表示法 "{1}"，必須予以宣告。
+        MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = 若要在 "{0}" 的未剖析實體宣告中參照表示法 "{1}"，必須予以宣告。
+        MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = 在獨立文件中，不允許參照外部剖析實體中宣告的實體 "{0}"。
+        MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = 元素類型 "{0}" 需要屬性 "{1}" 且必須予以指定。
+        MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = 在獨立文件中，具有元素內容的外部剖析實體中宣告的元素之間，不可有空格。
+        NMTOKENInvalid = 類型 NMTOKEN 的屬性值 "{0}" 必須是名稱記號。
+        NMTOKENSInvalid = 類型 NMTOKENS 的屬性值 "{0}" 必須是一或多個名稱記號。
+        NoNotationOnEmptyElement = 宣告 EMPTY 的元素類型 "{0}" 不可宣告類型 NOTATION 的屬性 "{1}"。
+        RootElementTypeMustMatchDoctypedecl = 文件根元素 "{1}" 必須配對 DOCTYPE 根 "{0}"。
+        UndeclaredElementInContentSpec = 元素 "{0}" 的內容模型參照未宣告的元素 "{1}"。
+        UniqueNotationName = 表示法 "{0}" 的宣告並非唯一。指定的 Name 不能在一個以上的表示法宣告中宣告。
+        ENTITYFailedInitializeGrammar =  ENTITYDatatype 驗證程式: 失敗。需要使用有效的文法參照來呼叫起始方法。\t
+        ENTITYNotUnparsed = ENTITY "{0}" 並非未經剖析。
+        ENTITYNotValid = ENTITY "{0}" 無效。
+        EmptyList = 類型 ENTITIES、IDREFS 與 NMTOKENS 的值不可為空白清單。
 
 # Entity related messages
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ReferenceToExternalEntity = \u5C6C\u6027\u503C\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u5BE6\u9AD4 "&{0};"\u3002
-        AccessExternalDTD = \u5916\u90E8 DTD: \u7121\u6CD5\u8B80\u53D6\u5916\u90E8 DTD ''{0}''\uFF0C\u56E0\u70BA accessExternalDTD \u5C6C\u6027\u8A2D\u5B9A\u7684\u9650\u5236\uFF0C\u6240\u4EE5\u4E0D\u5141\u8A31 ''{1}'' \u5B58\u53D6\u3002
-        AccessExternalEntity = \u5916\u90E8\u5BE6\u9AD4: \u7121\u6CD5\u8B80\u53D6\u5916\u90E8\u6587\u4EF6 ''{0}''\uFF0C\u56E0\u70BA accessExternalDTD \u5C6C\u6027\u8A2D\u5B9A\u7684\u9650\u5236\uFF0C\u6240\u4EE5\u4E0D\u5141\u8A31 ''{1}'' \u5B58\u53D6\u3002
+        ReferenceToExternalEntity = 屬性值不允許參照外部實體 "&{0};"。
+        AccessExternalDTD = 外部 DTD: 無法讀取外部 DTD ''{0}''，因為 accessExternalDTD 屬性設定的限制，所以不允許 ''{1}'' 存取。
+        AccessExternalEntity = 外部實體: 無法讀取外部文件 ''{0}''，因為 accessExternalDTD 屬性設定的限制，所以不允許 ''{1}'' 存取。
 
 # 4.1 Character and Entity References
-        EntityNotDeclared = \u53C3\u7167\u4E86\u5BE6\u9AD4 "{0}"\uFF0C\u4F46\u662F\u672A\u5BA3\u544A\u3002
-        ReferenceToUnparsedEntity = \u4E0D\u5141\u8A31\u672A\u5256\u6790\u7684\u5BE6\u9AD4\u53C3\u7167 "&{0};"\u3002
-        RecursiveReference = \u905E\u8FF4\u5BE6\u9AD4\u53C3\u7167 "{0}"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
-        RecursiveGeneralReference = \u905E\u8FF4\u4E00\u822C\u5BE6\u9AD4\u53C3\u7167 "&{0};"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
-        RecursivePEReference = \u905E\u8FF4\u53C3\u6578\u5BE6\u9AD4\u53C3\u7167 "%{0};"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
+        EntityNotDeclared = 參照了實體 "{0}"，但是未宣告。
+        ReferenceToUnparsedEntity = 不允許未剖析的實體參照 "&{0};"。
+        RecursiveReference = 遞迴實體參照 "{0}"。(參照路徑: {1})，
+        RecursiveGeneralReference = 遞迴一般實體參照 "&{0};"。(參照路徑: {1})，
+        RecursivePEReference = 遞迴參數實體參照 "%{0};"。(參照路徑: {1})，
 # 4.3.3 Character Encoding in Entities
-        EncodingNotSupported = \u4E0D\u652F\u63F4\u7DE8\u78BC "{0}"\u3002
-        EncodingRequired = \u672A\u4F7F\u7528 UTF-8 \u6216 UTF-16 \u7DE8\u78BC\u7684\u5256\u6790\u5BE6\u9AD4\uFF0C\u5FC5\u9808\u5305\u542B\u7DE8\u78BC\u5BA3\u544A\u3002
+        EncodingNotSupported = 不支援編碼 "{0}"。
+        EncodingRequired = 未使用 UTF-8 或 UTF-16 編碼的剖析實體，必須包含編碼宣告。
 
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = \u5143\u7D20\u6216\u5C6C\u6027\u4E0D\u7B26\u5408 QName \u7522\u751F: QName::=(NCName':')?NCName\u3002
-        ElementXMLNSPrefix = \u5143\u7D20 "{0}" \u4E0D\u80FD\u4F7F\u7528 "xmlns" \u4F5C\u70BA\u524D\u7F6E\u78BC\u3002
-        ElementPrefixUnbound = \u5143\u7D20 "{1}" \u7684\u524D\u7F6E\u78BC "{0}" \u672A\u9023\u7D50\u3002
-        AttributePrefixUnbound = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5C6C\u6027 "{1}" \u7684\u524D\u7F6E\u78BC "{2}" \u672A\u9023\u7D50\u3002
-        EmptyPrefixedAttName = \u5C6C\u6027 "{0}" \u7684\u503C\u7121\u6548\u3002\u524D\u7F6E\u7684\u547D\u540D\u7A7A\u9593\u9023\u7D50\u4E0D\u53EF\u70BA\u7A7A\u767D\u3002
-        PrefixDeclared = \u672A\u5BA3\u544A\u547D\u540D\u7A7A\u9593\u524D\u7F6E\u78BC "{0}"\u3002
-        CantBindXMLNS = \u524D\u7F6E\u78BC "xmlns" \u7121\u6CD5\u660E\u78BA\u9023\u7D50\u4EFB\u4F55\u547D\u540D\u7A7A\u9593; "xmlns" \u7684\u547D\u540D\u7A7A\u9593\u4E5F\u7121\u6CD5\u660E\u78BA\u9023\u7D50\u4EFB\u4F55\u524D\u7F6E\u78BC\u3002
-        CantBindXML = \u524D\u7F6E\u78BC "xml" \u7121\u6CD5\u9023\u7D50\u4E00\u822C\u547D\u540D\u7A7A\u9593\u4E4B\u5916\u7684\u4EFB\u4F55\u547D\u540D\u7A7A\u9593; "xml" \u7684\u547D\u540D\u7A7A\u9593\u4E5F\u7121\u6CD5\u9023\u7D50 "xml" \u4E4B\u5916\u7684\u4EFB\u4F55\u547D\u540D\u7A7A\u9593\u3002
-        MSG_ATT_DEFAULT_INVALID = \u7531\u65BC\u6B64\u5C6C\u6027\u985E\u578B\u7684\u8A9E\u5F59\u9650\u5236\u689D\u4EF6\uFF0C\u5C6C\u6027 "{0}" \u7684 defaultValue "{1}" \u7121\u6548\u3002
+        IllegalQName = 元素或屬性不符合 QName 產生: QName::=(NCName':')?NCName。
+        ElementXMLNSPrefix = 元素 "{0}" 不能使用 "xmlns" 作為前置碼。
+        ElementPrefixUnbound = 元素 "{1}" 的前置碼 "{0}" 未連結。
+        AttributePrefixUnbound = 關聯元素類型 "{0}" 之屬性 "{1}" 的前置碼 "{2}" 未連結。
+        EmptyPrefixedAttName = 屬性 "{0}" 的值無效。前置的命名空間連結不可為空白。
+        PrefixDeclared = 未宣告命名空間前置碼 "{0}"。
+        CantBindXMLNS = 前置碼 "xmlns" 無法明確連結任何命名空間; "xmlns" 的命名空間也無法明確連結任何前置碼。
+        CantBindXML = 前置碼 "xml" 無法連結一般命名空間之外的任何命名空間; "xml" 的命名空間也無法連結 "xml" 之外的任何命名空間。
+        MSG_ATT_DEFAULT_INVALID = 由於此屬性類型的語彙限制條件，屬性 "{0}" 的 defaultValue "{1}" 無效。
 
 # REVISIT: These need messages
         MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
@@ -295,14 +295,14 @@
 
 
 # Implementation limits
-        EntityExpansionLimit=JAXP00010001: \u5256\u6790\u5668\u5728\u6B64\u6587\u4EF6\u4E2D\u9047\u5230 "{0}" \u500B\u4EE5\u4E0A\u7684\u5BE6\u9AD4\u64F4\u5145; \u9019\u662F JDK \u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
-        ElementAttributeLimit=JAXP00010002: \u5143\u7D20 "{0}" \u5177\u6709\u8D85\u904E "{1}" \u500B\u4EE5\u4E0A\u7684\u5C6C\u6027\uFF0C"{1}" \u662F JDK \u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
-        MaxEntitySizeLimit=JAXP00010003: \u5BE6\u9AD4 "{0}" \u7684\u9577\u5EA6\u70BA "{1}"\uFF0C\u8D85\u904E "{3}" \u6240\u8A2D\u5B9A\u7684 "{2}" \u9650\u5236\u3002
-        TotalEntitySizeLimit=JAXP00010004: \u5BE6\u9AD4\u7684\u7D2F\u7A4D\u5927\u5C0F\u70BA "{0}"\uFF0C\u8D85\u904E "{2}" \u6240\u8A2D\u5B9A\u7684 "{1}" \u9650\u5236\u3002
-        MaxXMLNameLimit=JAXP00010005: \u5BE6\u9AD4 "{0}" \u7684\u9577\u5EA6\u70BA "{1}"\uFF0C\u8D85\u904E "{3}" \u6240\u8A2D\u5B9A\u7684 "{2}" \u9650\u5236\u3002
-        MaxElementDepthLimit=JAXP00010006: \u5143\u7D20 "{0}" \u7684\u6DF1\u5EA6\u70BA "{1}"\uFF0C\u8D85\u904E "{3}" \u6240\u8A2D\u5B9A\u7684 "{2}" \u9650\u5236\u3002
-        EntityReplacementLimit=JAXP00010007: \u5BE6\u9AD4\u53C3\u7167\u4E2D\u7684\u7BC0\u9EDE\u7E3D\u6578\u70BA "{0}"\uFF0C\u8D85\u904E "{2}" \u6240\u8A2D\u5B9A\u7684 "{1}" \u9650\u5236\u3002
+        EntityExpansionLimit=JAXP00010001: 剖析器在此文件中遇到 "{0}" 個以上的實體擴充; 這是 JDK 所規定的限制。
+        ElementAttributeLimit=JAXP00010002: 元素 "{0}" 具有超過 "{1}" 個以上的屬性，"{1}" 是 JDK 所規定的限制。
+        MaxEntitySizeLimit=JAXP00010003: 實體 "{0}" 的長度為 "{1}"，超過 "{3}" 所設定的 "{2}" 限制。
+        TotalEntitySizeLimit=JAXP00010004: 實體的累積大小為 "{0}"，超過 "{2}" 所設定的 "{1}" 限制。
+        MaxXMLNameLimit=JAXP00010005: 實體 "{0}" 的長度為 "{1}"，超過 "{3}" 所設定的 "{2}" 限制。
+        MaxElementDepthLimit=JAXP00010006: 元素 "{0}" 的深度為 "{1}"，超過 "{3}" 所設定的 "{2}" 限制。
+        EntityReplacementLimit=JAXP00010007: 實體參照中的節點總數為 "{0}"，超過 "{2}" 所設定的 "{1}" 限制。
 
 # Catalog 09
 # Technical term, do not translate: catalog
-        CatalogException=JAXP00090001: CatalogResolver \u5DF2\u555F\u7528\u76EE\u9304 "{0}"\uFF0C\u4F46\u50B3\u56DE CatalogException\u3002
+        CatalogException=JAXP00090001: CatalogResolver 已啟用目錄 "{0}"，但傳回 CatalogException。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
index 39fe87255ac..9ed8feb5ef0 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
@@ -18,116 +18,116 @@
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
+        BadMessageKey = Die zum Meldungsschlüssel gehörige Fehlermeldung kann nicht gefunden werden.
         FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n
 
 # For internal use
 
         Internal-Error = Interner Fehler: {0}.
-        dt-whitespace = Leerstellen-Facet-Wert ist nicht f\u00FCr Vereinigungsmenge simpleType ''{0}'' verf\u00FCgbar
-        GrammarConflict = Eine vom Grammatikpool des Benutzers zur\u00FCckgegebene Grammatik steht im Konflikt mit einer anderen Grammatik.
+        dt-whitespace = Leerstellen-Facet-Wert ist nicht für Vereinigungsmenge simpleType ''{0}'' verfügbar
+        GrammarConflict = Eine vom Grammatikpool des Benutzers zurückgegebene Grammatik steht im Konflikt mit einer anderen Grammatik.
 
 # Identity constraints
 
-        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: Element "{0}" hat keinen Wert f\u00FCr den Schl\u00FCssel "{1}".
-        DuplicateField = Doppelte \u00DCbereinstimmung in Geltungsbereich f\u00FCr Feld ''{0}''.
-        DuplicateKey = cvc-identity-constraint.4.2.2: Doppelter Schl\u00FCsselwert [{0}] f\u00FCr Identity Constraint "{2}" des Elements "{1}"deklariert.
-        DuplicateUnique = cvc-identity-constraint.4.1: Doppelter eindeutiger Wert [{0}] f\u00FCr Identity Constraint "{2}"des Elements "{1}" deklariert.
-        FieldMultipleMatch = cvc-identity-constraint.3: Feld "{0}" von Identity Constraint "{1}" entspricht mehreren Werten im Geltungsbereich seines Selektors. Felder m\u00FCssen eindeutigen Werten entsprechen.
+        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: Element "{0}" hat keinen Wert für den Schlüssel "{1}".
+        DuplicateField = Doppelte Übereinstimmung in Geltungsbereich für Feld ''{0}''.
+        DuplicateKey = cvc-identity-constraint.4.2.2: Doppelter Schlüsselwert [{0}] für Identity Constraint "{2}" des Elements "{1}"deklariert.
+        DuplicateUnique = cvc-identity-constraint.4.1: Doppelter eindeutiger Wert [{0}] für Identity Constraint "{2}"des Elements "{1}" deklariert.
+        FieldMultipleMatch = cvc-identity-constraint.3: Feld "{0}" von Identity Constraint "{1}" entspricht mehreren Werten im Geltungsbereich seines Selektors. Felder müssen eindeutigen Werten entsprechen.
         FixedDiffersFromActual = Content dieses Elements entspricht nicht dem Wert des 'fixed'-Attributs in der Elementdeklaration im Schema.
-        KeyMatchesNillable = cvc-identity-constraint.4.2.3: Element "{0}" hat den Schl\u00FCssel "{1}", der einem Element entspricht, bei dem "nillable" auf "true" gesetzt wurde.
-        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: Nicht gen\u00FCgend Werte angegeben f\u00FCr <key name="{1}"> Identity Constraint f\u00FCr Element "{0}".
-        KeyNotFound = cvc-identity-constraint.4.3: Schl\u00FCssel "{0}" mit Wert "{1}" nicht gefunden f\u00FCr Identity Constraint des Elements "{2}".
-        KeyRefOutOfScope = Identity Constraint-Fehler: Identity Constraint ''{0}'' hat eine keyref, die zu einem Key- oder Unique-Constraint au\u00DFerhalb des Geltungsbereichs verweist.
-        KeyRefReferNotFound = Schl\u00FCsselreferenzdeklaration ''{0}'' verweist auf einen unbekannten Schl\u00FCssel mit dem Namen ''{1}''.
-        UnknownField = Interner Identity Constraint-Fehler. Unbekanntes Feld "{0}" f\u00FCr Identity Constraint "{2}", das f\u00FCr Element "{1}" angegeben wurde.
+        KeyMatchesNillable = cvc-identity-constraint.4.2.3: Element "{0}" hat den Schlüssel "{1}", der einem Element entspricht, bei dem "nillable" auf "true" gesetzt wurde.
+        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: Nicht genügend Werte angegeben für <key name="{1}"> Identity Constraint für Element "{0}".
+        KeyNotFound = cvc-identity-constraint.4.3: Schlüssel "{0}" mit Wert "{1}" nicht gefunden für Identity Constraint des Elements "{2}".
+        KeyRefOutOfScope = Identity Constraint-Fehler: Identity Constraint ''{0}'' hat eine keyref, die zu einem Key- oder Unique-Constraint außerhalb des Geltungsbereichs verweist.
+        KeyRefReferNotFound = Schlüsselreferenzdeklaration ''{0}'' verweist auf einen unbekannten Schlüssel mit dem Namen ''{1}''.
+        UnknownField = Interner Identity Constraint-Fehler. Unbekanntes Feld "{0}" für Identity Constraint "{2}", das für Element "{1}" angegeben wurde.
 
 # Ideally, we should only use the following error keys, not the ones under
 # "Identity constraints". And we should cover all of the following errors.
 
 #validation (3.X.4)
 
-        cvc-attribute.3 = cvc-attribute.3: Wert ''{2}'' des Attributs ''{1}'' bei Element ''{0}'' hat keinen g\u00FCltigen Typ ''{3}''.
-        cvc-attribute.4 = cvc-attribute.4: Wert ''{2}'' des Attributs ''{1}'' bei Element ''{0}'' hat keinen g\u00FCltigen festen '{'value constraint'}'. Attribute muss den Wert ''{3}'' haben.
+        cvc-attribute.3 = cvc-attribute.3: Wert ''{2}'' des Attributs ''{1}'' bei Element ''{0}'' hat keinen gültigen Typ ''{3}''.
+        cvc-attribute.4 = cvc-attribute.4: Wert ''{2}'' des Attributs ''{1}'' bei Element ''{0}'' hat keinen gültigen festen '{'value constraint'}'. Attribute muss den Wert ''{3}'' haben.
         cvc-complex-type.2.1 = cvc-complex-type.2.1: Element ''{0}'' darf kein Zeichen- oder Elementinformationselement [untergeordnete Elemente] haben, da der Contenttyp des Typs leer ist.
-        cvc-complex-type.2.2 = cvc-complex-type.2.2: Element ''{0}'' darf kein Element [untergeordnete Elemente] haben, und der Wert muss g\u00FCltig sein.
+        cvc-complex-type.2.2 = cvc-complex-type.2.2: Element ''{0}'' darf kein Element [untergeordnete Elemente] haben, und der Wert muss gültig sein.
         cvc-complex-type.2.3 = cvc-complex-type.2.3: Element ''{0}'' darf keine Zeichen [untergeordnete Elemente] haben, da der Contenttyp des Typs ''element-only'' ist.
-        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: Ung\u00FCltiger Content wurde beginnend mit Element ''{0}'' gefunden. ''{1}'' wird erwartet.
-        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: Content des Elements ''{0}'' ist nicht vollst\u00E4ndig. ''{1}'' wird erwartet.
-        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: \u00DCbereinstimmungsplatzhalter ist streng, aber es kann keine Deklaration f\u00FCr Element ''{0}'' gefunden werden.
-        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: Ung\u00FCltiger Content wurde beginnend mit Element ''{0}'' gefunden. An dieser Stelle wird kein untergeordnetes Element erwartet.
-        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: "{0}" darf maximal "{2}"-mal in der aktuellen Abfolge auftreten. Dieser Grenzwert wurde \u00FCberschritten. An dieser Stelle wird eines von "{1}" erwartet.
-        cvc-complex-type.2.4.f = cvc-complex-type.2.4.e: "{0}" darf maximal "{1}"-mal in der aktuellen Abfolge auftreten. Dieser Grenzwert wurde \u00FCberschritten. An dieser Stelle wird kein untergeordnetes Element erwartet.
-        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: Ung\u00FCltigen Inhalt gefunden, der mit Element "{0}" beginnt. "{1}" soll erwartungsgem\u00E4\u00DF mindestens "{2}"-mal in der aktuellen Abfolge auftreten. Eine weitere Instanz ist erforderlich, um diesen Constraint zu erf\u00FCllen.
-        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: Ung\u00FCltigen Inhalt gefunden, der mit Element "{0}" beginnt. "{1}" soll erwartungsgem\u00E4\u00DF mindestens "{2}"-mal in der aktuellen Abfolge auftreten. "{3}" weitere Instanzen sind erforderlich, um diesen Constraint zu erf\u00FCllen.
-        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: Der Inhalt von Element "{0}" ist nicht vollst\u00E4ndig. "{1}" soll erwartungsgem\u00E4\u00DF mindestens "{2}"-mal auftreten. Eine weitere Instanz ist erforderlich, um diesen Constraint zu erf\u00FCllen.
-        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: Der Inhalt von Element "{0}" ist nicht vollst\u00E4ndig. "{1}" soll erwartungsgem\u00E4\u00DF mindestens "{2}"-mal auftreten. "{3}" weitere Instanzen sind erforderlich, um diesen Constraint zu erf\u00FCllen.
-        cvc-complex-type.3.1 = cvc-complex-type.3.1: Wert ''{2}'' des Attributs ''{1}'' des Elements ''{0}'' ist ung\u00FCltig in Bezug auf die entsprechende Attributverwendung. Attribut ''{1}'' hat den festen Wert ''{3}''.
-        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: Element ''{0}'' hat keinen Attributplatzhalter f\u00FCr Attribut ''{1}''.
+        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: Ungültiger Content wurde beginnend mit Element ''{0}'' gefunden. ''{1}'' wird erwartet.
+        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: Content des Elements ''{0}'' ist nicht vollständig. ''{1}'' wird erwartet.
+        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: Übereinstimmungsplatzhalter ist streng, aber es kann keine Deklaration für Element ''{0}'' gefunden werden.
+        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: Ungültiger Content wurde beginnend mit Element ''{0}'' gefunden. An dieser Stelle wird kein untergeordnetes Element erwartet.
+        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: "{0}" darf maximal "{2}"-mal in der aktuellen Abfolge auftreten. Dieser Grenzwert wurde überschritten. An dieser Stelle wird eines von "{1}" erwartet.
+        cvc-complex-type.2.4.f = cvc-complex-type.2.4.e: "{0}" darf maximal "{1}"-mal in der aktuellen Abfolge auftreten. Dieser Grenzwert wurde überschritten. An dieser Stelle wird kein untergeordnetes Element erwartet.
+        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: Ungültigen Inhalt gefunden, der mit Element "{0}" beginnt. "{1}" soll erwartungsgemäß mindestens "{2}"-mal in der aktuellen Abfolge auftreten. Eine weitere Instanz ist erforderlich, um diesen Constraint zu erfüllen.
+        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: Ungültigen Inhalt gefunden, der mit Element "{0}" beginnt. "{1}" soll erwartungsgemäß mindestens "{2}"-mal in der aktuellen Abfolge auftreten. "{3}" weitere Instanzen sind erforderlich, um diesen Constraint zu erfüllen.
+        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: Der Inhalt von Element "{0}" ist nicht vollständig. "{1}" soll erwartungsgemäß mindestens "{2}"-mal auftreten. Eine weitere Instanz ist erforderlich, um diesen Constraint zu erfüllen.
+        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: Der Inhalt von Element "{0}" ist nicht vollständig. "{1}" soll erwartungsgemäß mindestens "{2}"-mal auftreten. "{3}" weitere Instanzen sind erforderlich, um diesen Constraint zu erfüllen.
+        cvc-complex-type.3.1 = cvc-complex-type.3.1: Wert ''{2}'' des Attributs ''{1}'' des Elements ''{0}'' ist ungültig in Bezug auf die entsprechende Attributverwendung. Attribut ''{1}'' hat den festen Wert ''{3}''.
+        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: Element ''{0}'' hat keinen Attributplatzhalter für Attribut ''{1}''.
         cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: Attribut ''{1}'' darf nicht in Element ''{0}'' vorkommen.
         cvc-complex-type.4 = cvc-complex-type.4: Attribut ''{1}'' muss in Element ''{0}'' vorkommen.
         cvc-complex-type.4_ns = cvc-complex-type.4: Attribut "{1}" von Namespace "{2}" muss in Element "{0}" vorkommen.
-        cvc-complex-type.5.1 = cvc-complex-type.5.1: In Element ''{0}'' ist Attribut ''{1}'' ein Platzhalter. Es ist aber bereits ein Platzhalter ''{2}'' vorhanden. Nur ein Platzhalter ist zul\u00E4ssig.
+        cvc-complex-type.5.1 = cvc-complex-type.5.1: In Element ''{0}'' ist Attribut ''{1}'' ein Platzhalter. Es ist aber bereits ein Platzhalter ''{2}'' vorhanden. Nur ein Platzhalter ist zulässig.
         cvc-complex-type.5.2 = cvc-complex-type.5.2: In Element ''{0}'' ist Attribut ''{1}'' ein Platzhalter. Es ist aber bereits ein Attribut ''{2}'' vorhanden, das von einer ID unter den '{'attribute uses'}' abgeleitet wurde.
-        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' ist kein g\u00FCltiger Wert f\u00FCr ''{1}''.
-        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' ist kein g\u00FCltiger Wert des Listentyps ''{1}''.
-        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' ist kein g\u00FCltiger Wert des Vereinigungsmengentyps ''{1}''.
+        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' ist kein gültiger Wert für ''{1}''.
+        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' ist kein gültiger Wert des Listentyps ''{1}''.
+        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' ist kein gültiger Wert des Vereinigungsmengentyps ''{1}''.
         cvc-elt.1.a = cvc-elt.1.a: Deklaration des Elements "{0}" kann nicht gefunden werden.
-        cvc-elt.1.b = cvc-elt.1.b: Der Name des Elements stimmt nicht mit dem Namen der Elementdeklaration \u00FCberein. Gefunden: "{0}". Erwartet: "{1}".
-        cvc-elt.2 = cvc-elt.2: Wert von '{'abstract'}' in der Elementdeklaration f\u00FCr ''{0}'' muss ''false'' sein.
+        cvc-elt.1.b = cvc-elt.1.b: Der Name des Elements stimmt nicht mit dem Namen der Elementdeklaration überein. Gefunden: "{0}". Erwartet: "{1}".
+        cvc-elt.2 = cvc-elt.2: Wert von '{'abstract'}' in der Elementdeklaration für ''{0}'' muss ''false'' sein.
         cvc-elt.3.1 = cvc-elt.3.1: Attribut ''{1}'' darf nicht in Element ''{0}'' vorkommen, da die die Eigenschaft '{'nillable'}' von ''{0}'' ''false'' ist.
         cvc-elt.3.2.1 = cvc-elt.3.2.1: Element ''{0}'' darf keine Zeichen- oder Elementinformationen [untergeordnete Elemente] haben, da ''{1}'' angegeben wurde.
-        cvc-elt.3.2.2 = cvc-elt.3.2.2: Es darf kein fester '{'value constraint'}' f\u00FCr Element ''{0}'' vorhanden sein, da ''{1}'' angegeben wurde.
-        cvc-elt.4.1 = cvc-elt.4.1: Wert ''{2}'' des Attributs ''{1}'' von Element ''{0}'' ist kein g\u00FCltiger QName.
-        cvc-elt.4.2 = cvc-elt.4.2: ''{1}'' kann nicht als Typdefinition f\u00FCr Element ''{0}'' aufgel\u00F6st werden.
-        cvc-elt.4.3 = cvc-elt.4.3: Typ ''{1}'' wurde nicht auf g\u00FCltige Weise von der Typdefinition ''{2}'' des Elements ''{0}'' abgeleitet.
-        cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'value constraint'}' ''{2}'' des Elements ''{0}'' ist kein g\u00FCltiger Standardwert f\u00FCr Typ ''{1}''.
+        cvc-elt.3.2.2 = cvc-elt.3.2.2: Es darf kein fester '{'value constraint'}' für Element ''{0}'' vorhanden sein, da ''{1}'' angegeben wurde.
+        cvc-elt.4.1 = cvc-elt.4.1: Wert ''{2}'' des Attributs ''{1}'' von Element ''{0}'' ist kein gültiger QName.
+        cvc-elt.4.2 = cvc-elt.4.2: ''{1}'' kann nicht als Typdefinition für Element ''{0}'' aufgelöst werden.
+        cvc-elt.4.3 = cvc-elt.4.3: Typ ''{1}'' wurde nicht auf gültige Weise von der Typdefinition ''{2}'' des Elements ''{0}'' abgeleitet.
+        cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'value constraint'}' ''{2}'' des Elements ''{0}'' ist kein gültiger Standardwert für Typ ''{1}''.
         cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: Element ''{0}'' darf keine Elementinformationselemente [untergeordnete Elemente] haben.
-        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: Wert ''{1}'' des Elements ''{0}'' stimmt nicht mit dem festen '{'value constraint'}'-Wert ''{2}'' \u00FCberein.
-        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: Wert ''{1}'' des Elements ''{0}'' stimmt nicht mit dem '{'value constraint'}'-Wert ''{2}'' \u00FCberein.
-        cvc-enumeration-valid = cvc-enumeration-valid: Wert ''{0}'' ist nicht Facet-g\u00FCltig in Bezug auf Enumeration ''{1}''. Er muss ein Wert aus der Enumeration sein.
-        cvc-fractionDigits-valid = cvc-fractionDigits-valid: Wert ''{0}'' enth\u00E4lt {1} Bruchziffern, die Anzahl an Bruchziffern wurde aber auf {2} beschr\u00E4nkt.
-        cvc-id.1 = cvc-id.1: Kein ID/IDREF-Binding f\u00FCr IDREF ''{0}'' vorhanden.
+        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: Wert ''{1}'' des Elements ''{0}'' stimmt nicht mit dem festen '{'value constraint'}'-Wert ''{2}'' überein.
+        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: Wert ''{1}'' des Elements ''{0}'' stimmt nicht mit dem '{'value constraint'}'-Wert ''{2}'' überein.
+        cvc-enumeration-valid = cvc-enumeration-valid: Wert ''{0}'' ist nicht Facet-gültig in Bezug auf Enumeration ''{1}''. Er muss ein Wert aus der Enumeration sein.
+        cvc-fractionDigits-valid = cvc-fractionDigits-valid: Wert ''{0}'' enthält {1} Bruchziffern, die Anzahl an Bruchziffern wurde aber auf {2} beschränkt.
+        cvc-id.1 = cvc-id.1: Kein ID/IDREF-Binding für IDREF ''{0}'' vorhanden.
         cvc-id.2 = cvc-id.2: ID-Wert ''{0}'' kommt mehrmals vor.
         cvc-id.3 = cvc-id.3: Ein Feld von Identity Constraint ''{0}'' entsprach Element ''{1}''. Dieses Element hat aber keinen Simple Type.
-        cvc-length-valid = cvc-length-valid: Wert ''{0}'' mit L\u00E4nge = ''{1}'' ist nicht Facet-g\u00FCltig in Bezug auf die L\u00E4nge ''{2}'' f\u00FCr Typ ''{3}''.
-        cvc-maxExclusive-valid = cvc-maxExclusive-valid: Wert ''{0}'' ist nicht Facet-g\u00FCltig in Bezug auf maxExclusive ''{1}'' f\u00FCr Typ ''{2}''.
-        cvc-maxInclusive-valid = cvc-maxInclusive-valid: Wert ''{0}'' ist nicht Facet-g\u00FCltig in Bezug auf maxInclusive ''{1}'' f\u00FCr Typ ''{2}''.
-        cvc-maxLength-valid = cvc-maxLength-valid: Wert ''{0}'' mit L\u00E4nge = ''{1}'' ist nicht Facet-g\u00FCltig in Bezug auf maxLength ''{2}'' f\u00FCr Typ ''{3}''.
-        cvc-minExclusive-valid = cvc-minExclusive-valid: Wert ''{0}'' ist nicht Facet-g\u00FCltig in Bezug auf minExclusive ''{1}'' f\u00FCr Typ ''{2}''.
-        cvc-minInclusive-valid = cvc-minInclusive-valid: Wert ''{0}'' ist nicht Facet-g\u00FCltig in Bezug auf minInclusive ''{1}'' f\u00FCr Typ ''{2}''.
-        cvc-minLength-valid = cvc-minLength-valid: Wert ''{0}'' mit L\u00E4nge = ''{1}'' ist nicht Facet-g\u00FCltig in Bezug auf minLength ''{2}'' f\u00FCr Typ ''{3}''.
-        cvc-pattern-valid = cvc-pattern-valid: Wert ''{0}'' ist nicht Facet-g\u00FCltig in Bezug auf Muster ''{1}'' f\u00FCr Typ ''{2}''.
-        cvc-totalDigits-valid = cvc-totalDigits-valid: Wert ''{0}'' enth\u00E4lt {1} Gesamtziffern, die Anzahl an Gesamtziffern wurde aber auf {2} beschr\u00E4nkt.
+        cvc-length-valid = cvc-length-valid: Wert ''{0}'' mit Länge = ''{1}'' ist nicht Facet-gültig in Bezug auf die Länge ''{2}'' für Typ ''{3}''.
+        cvc-maxExclusive-valid = cvc-maxExclusive-valid: Wert ''{0}'' ist nicht Facet-gültig in Bezug auf maxExclusive ''{1}'' für Typ ''{2}''.
+        cvc-maxInclusive-valid = cvc-maxInclusive-valid: Wert ''{0}'' ist nicht Facet-gültig in Bezug auf maxInclusive ''{1}'' für Typ ''{2}''.
+        cvc-maxLength-valid = cvc-maxLength-valid: Wert ''{0}'' mit Länge = ''{1}'' ist nicht Facet-gültig in Bezug auf maxLength ''{2}'' für Typ ''{3}''.
+        cvc-minExclusive-valid = cvc-minExclusive-valid: Wert ''{0}'' ist nicht Facet-gültig in Bezug auf minExclusive ''{1}'' für Typ ''{2}''.
+        cvc-minInclusive-valid = cvc-minInclusive-valid: Wert ''{0}'' ist nicht Facet-gültig in Bezug auf minInclusive ''{1}'' für Typ ''{2}''.
+        cvc-minLength-valid = cvc-minLength-valid: Wert ''{0}'' mit Länge = ''{1}'' ist nicht Facet-gültig in Bezug auf minLength ''{2}'' für Typ ''{3}''.
+        cvc-pattern-valid = cvc-pattern-valid: Wert ''{0}'' ist nicht Facet-gültig in Bezug auf Muster ''{1}'' für Typ ''{2}''.
+        cvc-totalDigits-valid = cvc-totalDigits-valid: Wert ''{0}'' enthält {1} Gesamtziffern, die Anzahl an Gesamtziffern wurde aber auf {2} beschränkt.
         cvc-type.1 = cvc-type.1: Die Typdefinition "{0}" wurde nicht gefunden.
-        cvc-type.2 = cvc-type.2: Typdefinition kann nicht abstrakt f\u00FCr Element {0} sein.
+        cvc-type.2 = cvc-type.2: Typdefinition kann nicht abstrakt für Element {0} sein.
         cvc-type.3.1.1 = cvc-type.3.1.1: Element ''{0}'' ist Simple Type und kann daher keine Attribute haben, mit Ausnahme der Attribute, deren Namespace-Name mit ''http://www.w3.org/2001/XMLSchema-instance'' identisch ist und deren [lokaler Name] ''type'', ''nil'', ''schemaLocation'' oder ''noNamespaceSchemaLocation'' lautet. Es wurde allerdings das Attribut ''{1}'' gefunden.
         cvc-type.3.1.2 = cvc-type.3.1.2: Element ''{0}'' ist Simple Type und darf daher keine Elementinformationselemente [untergeordnete Elemente] haben.
-        cvc-type.3.1.3 = cvc-type.3.1.3: Wert ''{1}'' des Elements ''{0}'' ist ung\u00FCltig.
+        cvc-type.3.1.3 = cvc-type.3.1.3: Wert ''{1}'' des Elements ''{0}'' ist ungültig.
 
 #schema valid (3.X.3)
 
-        schema_reference.access = schema_reference: Schemadokument ''{0}'' konnte nicht gelesen werden, weil der ''{1}''-Zugriff wegen der von der Eigenschaft accessExternalSchema festgelegten Einschr\u00E4nkung nicht zul\u00E4ssig ist. 
+        schema_reference.access = schema_reference: Schemadokument ''{0}'' konnte nicht gelesen werden, weil der ''{1}''-Zugriff wegen der von der Eigenschaft accessExternalSchema festgelegten Einschränkung nicht zulässig ist. 
         schema_reference.4 = schema_reference.4: Schemadokument ''{0}'' konnte nicht gelesen werden, da 1) das Dokument nicht gefunden werden konnte; 2) das Dokument nicht gelesen werden konnte; 3) das Root-Element des Dokuments nicht <xsd:schema> ist.
-        src-annotation = src-annotation: <annotation>-Elemente k\u00F6nnen nur <appinfo>- und <documentation>-Elemente enthalten, aber es wurde ''{0}'' gefunden.
-        src-attribute.1 = src-attribute.1: Die Eigenschaften ''default'' und ''fixed'' k\u00F6nnen nicht beide in der Attributdeklaration ''{0}'' vorhanden sein. Verwenden Sie nur eine dieser Eigenschaften.
+        src-annotation = src-annotation: <annotation>-Elemente können nur <appinfo>- und <documentation>-Elemente enthalten, aber es wurde ''{0}'' gefunden.
+        src-attribute.1 = src-attribute.1: Die Eigenschaften ''default'' und ''fixed'' können nicht beide in der Attributdeklaration ''{0}'' vorhanden sein. Verwenden Sie nur eine dieser Eigenschaften.
         src-attribute.2 = src-attribute.2: : Eigenschaft ''default'' ist im Attribut ''{0}'' vorhanden. Daher muss der Wert von ''use'' ''optional'' lauten.
         src-attribute.3.1 = src-attribute.3.1: 'ref' oder 'name' muss in einer lokalen Attributdeklaration vorhanden sein.
-        src-attribute.3.2 = src-attribute.3.2: Content muss mit (annotation?) f\u00FCr die Attributreferenz ''{0}'' \u00FCbereinstimmen.
-        src-attribute.4 = src-attribute.4: Attribut ''{0}'' hat sowohl das Attribut ''type'' als auch ein anonymes untergeordnetes Element ''simpleType''. Nur eins davon ist f\u00FCr Attribute zul\u00E4ssig.
-        src-attribute_group.2 = src-attribute_group.2: Schnittmenge von Platzhaltern kann nicht f\u00FCr Attributgruppe ''{0}'' ausgedr\u00FCckt werden.
-        src-attribute_group.3 = src-attribute_group.3: Zyklische Definitionen f\u00FCr Attributgruppe ''{0}'' ermittelt. Das rekursive Folgen von Attributgruppenreferenzen f\u00FChrt schlie\u00DFlich zu sich selbst zur\u00FCck.
-        src-ct.1 = src-ct.1: Darstellungsfehler bei Complex Type-Definition f\u00FCr Typ ''{0}''. Wenn <complexContent> verwendet wird, muss der Basistyp ein complexType sein. ''{1}'' ist ein simpleType.
-        src-ct.2.1 = src-ct.2.1: Darstellungsfehler bei Complex Type-Definition f\u00FCr Typ ''{0}''. Wenn <simpleContent> verwendet wird, muss der Basistyp ein complexType sein, dessen Contenttyp ''simple'' ist, oder, wenn eine Einschr\u00E4nkung angegeben wurde, ein ''complex''-Typ mit gemischtem Content und einem Partikel, das geleert werden kann, oder, wenn eine Erweiterung angegeben wurde, ein ''simple''-Typ. ''{1}'' erf\u00FCllt keine dieser Bedingungen.
-        src-ct.2.2 = src-ct.2.2: Darstellungsfehler bei Complex Type-Definition f\u00FCr Typ ''{0}''. Wenn ein complexType mit simpleContent einen complexType mit gemischtem Content und einem Partikel, das geleert werden kann, einschr\u00E4nkt, muss ein <simpleType> in den untergeordneten Elementen von <restriction> enthalten sein.
-        src-ct.4 = src-ct.4: Darstellungsfehler bei Complex Type-Definition f\u00FCr Typ ''{0}''. Die Schnittmenge der Platzhalter kann nicht ausgedr\u00FCckt werden.
-        src-ct.5 = src-ct.5: Darstellungsfehler bei Complex Type-Definition f\u00FCr Typ ''{0}''. Die Vereinigungsmenge der Platzhalter kann nicht ausgedr\u00FCckt werden.
-        src-element.1 = src-element.1: Die Eigenschaften ''default'' und ''fixed'' k\u00F6nnen nicht beide in der Elementdeklaration ''{0}'' vorhanden sein. Verwenden Sie nur eine dieser Eigenschaften.
+        src-attribute.3.2 = src-attribute.3.2: Content muss mit (annotation?) für die Attributreferenz ''{0}'' übereinstimmen.
+        src-attribute.4 = src-attribute.4: Attribut ''{0}'' hat sowohl das Attribut ''type'' als auch ein anonymes untergeordnetes Element ''simpleType''. Nur eins davon ist für Attribute zulässig.
+        src-attribute_group.2 = src-attribute_group.2: Schnittmenge von Platzhaltern kann nicht für Attributgruppe ''{0}'' ausgedrückt werden.
+        src-attribute_group.3 = src-attribute_group.3: Zyklische Definitionen für Attributgruppe ''{0}'' ermittelt. Das rekursive Folgen von Attributgruppenreferenzen führt schließlich zu sich selbst zurück.
+        src-ct.1 = src-ct.1: Darstellungsfehler bei Complex Type-Definition für Typ ''{0}''. Wenn <complexContent> verwendet wird, muss der Basistyp ein complexType sein. ''{1}'' ist ein simpleType.
+        src-ct.2.1 = src-ct.2.1: Darstellungsfehler bei Complex Type-Definition für Typ ''{0}''. Wenn <simpleContent> verwendet wird, muss der Basistyp ein complexType sein, dessen Contenttyp ''simple'' ist, oder, wenn eine Einschränkung angegeben wurde, ein ''complex''-Typ mit gemischtem Content und einem Partikel, das geleert werden kann, oder, wenn eine Erweiterung angegeben wurde, ein ''simple''-Typ. ''{1}'' erfüllt keine dieser Bedingungen.
+        src-ct.2.2 = src-ct.2.2: Darstellungsfehler bei Complex Type-Definition für Typ ''{0}''. Wenn ein complexType mit simpleContent einen complexType mit gemischtem Content und einem Partikel, das geleert werden kann, einschränkt, muss ein <simpleType> in den untergeordneten Elementen von <restriction> enthalten sein.
+        src-ct.4 = src-ct.4: Darstellungsfehler bei Complex Type-Definition für Typ ''{0}''. Die Schnittmenge der Platzhalter kann nicht ausgedrückt werden.
+        src-ct.5 = src-ct.5: Darstellungsfehler bei Complex Type-Definition für Typ ''{0}''. Die Vereinigungsmenge der Platzhalter kann nicht ausgedrückt werden.
+        src-element.1 = src-element.1: Die Eigenschaften ''default'' und ''fixed'' können nicht beide in der Elementdeklaration ''{0}'' vorhanden sein. Verwenden Sie nur eine dieser Eigenschaften.
         src-element.2.1 = src-element.2.1: : 'ref' oder 'name' muss in einer lokalen Elementdeklaration vorhanden sein.
-        src-element.2.2 = src-element.2.2: Da ''{0}'' das Attribut ''ref'' enth\u00E4lt, muss der Content (annotation?) entsprechen. Es wurde allerdings ''{1}'' gefunden.
-        src-element.3 = src-element.3: Element ''{0}'' hat sowohl das Attribut ''type'' als auch ein untergeordnetes Element ''anonymous type''. Nur eins davon ist f\u00FCr Elemente zul\u00E4ssig.
+        src-element.2.2 = src-element.2.2: Da ''{0}'' das Attribut ''ref'' enthält, muss der Content (annotation?) entsprechen. Es wurde allerdings ''{1}'' gefunden.
+        src-element.3 = src-element.3: Element ''{0}'' hat sowohl das Attribut ''type'' als auch ein untergeordnetes Element ''anonymous type''. Nur eins davon ist für Elemente zulässig.
         src-import.1.1 = src-import.1.1: Namespace-Attribut ''{0}'' eines <import>-Elementinformationselements darf nicht mit dem targetNamespace des Schemas identisch sein, in dem es vorhanden ist.
-        src-import.1.2 = src-import.1.2: Wenn das Namespace-Attribut nicht bei einem <import>-Elementinformationselement vorhanden ist, muss das einschlie\u00DFende Schema einen targetNamespace haben.
+        src-import.1.2 = src-import.1.2: Wenn das Namespace-Attribut nicht bei einem <import>-Elementinformationselement vorhanden ist, muss das einschließende Schema einen targetNamespace haben.
         src-import.2 = src-import.2: Das Root-Element des Dokuments ''{0}'' muss den Namespace-Namen ''http://www.w3.org/2001/XMLSchema'' und den lokalen Namen ''schema'' haben.
         src-import.3.1 = src-import.3.1: Namespace-Attribut ''{0}'' eines <import>-Elementinformationselements muss mit dem targetNamespace-Attribut ''{1}'' des importierten Dokuments identisch sein.
         src-import.3.2 = src-import.3.2: Es wurde ein <import>-Elementinformationselement ohne Namespace-Attribut gefunden. Daher kann das importierte Dokument kein targetNamespace-Attribut haben. targetNamespace ''{1}'' wurde aber im importierten Dokument gefunden.
@@ -135,27 +135,27 @@
         src-include.2.1 = src-include.2.1: targetNamespace des referenzierten Schemas, derzeit ''{1}'', muss mit dem im umfassenden Schema, derzeit ''{0}'', identisch sein.
         src-redefine.2 = src-redefine.2: Das Root-Element des Dokuments ''{0}'' muss den Namespace-Namen ''http://www.w3.org/2001/XMLSchema'' und den lokalen Namen ''schema'' haben.
         src-redefine.3.1 = src-redefine.3.1: targetNamespace des referenzierten Schemas, derzeit ''{1}'', muss mit dem im neu definierenden Schema, derzeit ''{0}'', identisch sein.
-        src-redefine.5.a.a = src-redefine.5.a.a: Keine untergeordneten Nicht-Annotationselemente von <simpleType> gefunden. Untergeordnete <simpleType>-Elemente von <redefine>-Elementen m\u00FCssen <restriction>-Nachkommen mit 'base'-Attributen haben, die auf sich selbst verweisen.
-        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' ist kein g\u00FCltiges untergeordnetes Element. Untergeordnete <simpleType>-Elemente von <redefine>-Elementen m\u00FCssen <restriction>-Nachkommen mit ''base''-Attributen haben, die auf sich selbst verweisen.
-        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' hat kein ''base''-Attribut, das auf das neu definierte Element ''{1}'' verweist. Untergeordnete <simpleType>-Elemente von <redefine>-Elementen m\u00FCssen <restriction>-Nachkommen mit ''base''-Attributen haben, die auf sich selbst verweisen.
-        src-redefine.5.b.a = src-redefine.5.b.a: Keine untergeordneten Nicht-Annotationselemente von <complexType> gefunden. Untergeordnete <complexType>-Elemente von <redefine>-Elementen m\u00FCssen <extension>- oder <restriction>-Nachkommen mit 'base'-Attributen haben, die auf sich selbst verweisen.
-        src-redefine.5.b.b = src-redefine.5.b.b: Keine untergeordneten Nicht-Annotationselemente der zweiten Generation von <complexType> gefunden. Untergeordnete <complexType>-Elemente von <redefine>-Elementen m\u00FCssen <extension>- oder <restriction>-Nachkommen mit 'base'-Attributen haben, die auf sich selbst verweisen.
-        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}'' ist kein g\u00FCltiges untergeordnetes Element der zweiten Generation. Untergeordnete <complexType>-Elemente von <redefine>-Elementen m\u00FCssen <extension>- oder <restriction>-Nachkommen mit ''base''-Attributen haben, die auf sich selbst verweisen.
-        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}'' hat kein ''base''-Attribut, das auf das neu definierte Element ''{1}'' verweist. Untergeordnete <complexType>-Elemente von <redefine>-Elementen m\u00FCssen <extension>- oder <restriction>-Nachkommen mit ''base''-Attributen haben, die auf sich selbst verweisen.
-        src-redefine.6.1.1 = src-redefine.6.1.1: Wenn ein untergeordnetes Gruppenelement eines <redefine>-Elements eine Gruppe enth\u00E4lt, die auf sich selbst verweist, muss genau 1 vorhanden sein. Hier sind ''{0}'' vorhanden.
-        src-redefine.6.1.2 = src-redefine.6.1.2: Bei Gruppe ''{0}'', die eine Referenz zu einer Gruppe enth\u00E4lt, die neu definiert wird, muss ''minOccurs'' = ''maxOccurs'' = 1 gelten.
+        src-redefine.5.a.a = src-redefine.5.a.a: Keine untergeordneten Nicht-Annotationselemente von <simpleType> gefunden. Untergeordnete <simpleType>-Elemente von <redefine>-Elementen müssen <restriction>-Nachkommen mit 'base'-Attributen haben, die auf sich selbst verweisen.
+        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' ist kein gültiges untergeordnetes Element. Untergeordnete <simpleType>-Elemente von <redefine>-Elementen müssen <restriction>-Nachkommen mit ''base''-Attributen haben, die auf sich selbst verweisen.
+        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' hat kein ''base''-Attribut, das auf das neu definierte Element ''{1}'' verweist. Untergeordnete <simpleType>-Elemente von <redefine>-Elementen müssen <restriction>-Nachkommen mit ''base''-Attributen haben, die auf sich selbst verweisen.
+        src-redefine.5.b.a = src-redefine.5.b.a: Keine untergeordneten Nicht-Annotationselemente von <complexType> gefunden. Untergeordnete <complexType>-Elemente von <redefine>-Elementen müssen <extension>- oder <restriction>-Nachkommen mit 'base'-Attributen haben, die auf sich selbst verweisen.
+        src-redefine.5.b.b = src-redefine.5.b.b: Keine untergeordneten Nicht-Annotationselemente der zweiten Generation von <complexType> gefunden. Untergeordnete <complexType>-Elemente von <redefine>-Elementen müssen <extension>- oder <restriction>-Nachkommen mit 'base'-Attributen haben, die auf sich selbst verweisen.
+        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}'' ist kein gültiges untergeordnetes Element der zweiten Generation. Untergeordnete <complexType>-Elemente von <redefine>-Elementen müssen <extension>- oder <restriction>-Nachkommen mit ''base''-Attributen haben, die auf sich selbst verweisen.
+        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}'' hat kein ''base''-Attribut, das auf das neu definierte Element ''{1}'' verweist. Untergeordnete <complexType>-Elemente von <redefine>-Elementen müssen <extension>- oder <restriction>-Nachkommen mit ''base''-Attributen haben, die auf sich selbst verweisen.
+        src-redefine.6.1.1 = src-redefine.6.1.1: Wenn ein untergeordnetes Gruppenelement eines <redefine>-Elements eine Gruppe enthält, die auf sich selbst verweist, muss genau 1 vorhanden sein. Hier sind ''{0}'' vorhanden.
+        src-redefine.6.1.2 = src-redefine.6.1.2: Bei Gruppe ''{0}'', die eine Referenz zu einer Gruppe enthält, die neu definiert wird, muss ''minOccurs'' = ''maxOccurs'' = 1 gelten.
         src-redefine.6.2.1 = src-redefine.6.2.1: Keine Gruppe im neu definierten Schema hat einen Namen, der ''{0}'' entspricht.
-        src-redefine.6.2.2 = src-redefine.6.2.2: Gruppe ''{0}'' schr\u00E4nkt die Gruppe, die neu definiert wird, nicht ordnungsgem\u00E4\u00DF ein. Verletzter Constraint: ''{1}''.
-        src-redefine.7.1 = src-redefine.7.1: Wenn ein untergeordnetes attributeGroup-Element eines <redefine>-Elements eine attributeGroup enth\u00E4lt, die auf sich selbst verweist, muss genau 1 vorhanden sein. Hier sind {0} vorhanden.
+        src-redefine.6.2.2 = src-redefine.6.2.2: Gruppe ''{0}'' schränkt die Gruppe, die neu definiert wird, nicht ordnungsgemäß ein. Verletzter Constraint: ''{1}''.
+        src-redefine.7.1 = src-redefine.7.1: Wenn ein untergeordnetes attributeGroup-Element eines <redefine>-Elements eine attributeGroup enthält, die auf sich selbst verweist, muss genau 1 vorhanden sein. Hier sind {0} vorhanden.
         src-redefine.7.2.1 = src-redefine.7.2.1: Keine attributeGroup im neu definierten Schema hat einen Namen, der ''{0}'' entspricht.
-        src-redefine.7.2.2 = src-redefine.7.2.2: attributeGroup ''{0}'' schr\u00E4nkt die attributeGroup, die neu definiert wird, nicht ordnungsgem\u00E4\u00DF ein. Verletzter Constraint: ''{1}''.
-        src-resolve = src-resolve: Name ''{0}'' kann nicht als ''{1}''-Komponente aufgel\u00F6st werden.
-        src-resolve.4.1 = src-resolve.4.1: Fehler beim Aufl\u00F6sen von Komponente ''{2}''. Es wurde ermittelt, dass ''{2}'' keinen Namespace hat, aber Komponenten ohne Ziel-Namespace k\u00F6nnen nicht aus Schemadokument ''{0}'' referenziert werden. Wenn ''{2}'' einen Namespace haben soll, muss m\u00F6glicherweise ein Pr\u00E4fix angegeben werden. Wenn ''{2}'' keinen Namespace haben soll, muss ein ''import'' ohne ''namespace''-Attribut zu ''{0}'' hinzugef\u00FCgt werden.
-        src-resolve.4.2 = src-resolve.4.2: Fehler beim Aufl\u00F6sen von Komponente ''{2}''. Es wurde ermittelt, dass ''{2}'' in Namespace ''{1}'' vorhanden ist, aber Komponenten aus diesem Namespace k\u00F6nnen nicht aus Schemadokument ''{0}'' referenziert werden. Wenn dies der falsche Namespace ist, muss m\u00F6glicherweise das Pr\u00E4fix von ''{2}'' ge\u00E4ndert werden. Wenn dies der richtige Namespace ist, muss ein entsprechendes ''import''-Tag zu ''{0}'' hinzugef\u00FCgt werden.
-        src-simple-type.2.a = src-simple-type.2.a: Es wurde ein <restriction>-Element gefunden, das sowohl ein 'base'-[Attribut] als auch ein <simpleType>-Element in seinen [untergeordneten Elementen] enth\u00E4lt. Nur eines davon ist zul\u00E4ssig.
-        src-simple-type.2.b = src-simple-type.2.b: Es wurde ein <restriction>-Element gefunden, das weder ein 'base'-[Attribut] noch ein <simpleType>-Element in seinen [untergeordneten Elementen] enth\u00E4lt. Eines davon ist erforderlich.
-        src-simple-type.3.a = src-simple-type.3.a: Es wurde ein <list>-Element gefunden, das sowohl ein 'itemType'-[Attribut] als auch ein <simpleType>-Element in seinen [untergeordneten Elementen] enth\u00E4lt. Nur eines davon ist zul\u00E4ssig.
-        src-simple-type.3.b = src-simple-type.3.b: Es wurde ein <list>-Element gefunden, das weder ein 'itemType'-[Attribut] noch ein <simpleType>-Element in seinen [untergeordneten Elementen] enth\u00E4lt. Eines davon ist erforderlich.
+        src-redefine.7.2.2 = src-redefine.7.2.2: attributeGroup ''{0}'' schränkt die attributeGroup, die neu definiert wird, nicht ordnungsgemäß ein. Verletzter Constraint: ''{1}''.
+        src-resolve = src-resolve: Name ''{0}'' kann nicht als ''{1}''-Komponente aufgelöst werden.
+        src-resolve.4.1 = src-resolve.4.1: Fehler beim Auflösen von Komponente ''{2}''. Es wurde ermittelt, dass ''{2}'' keinen Namespace hat, aber Komponenten ohne Ziel-Namespace können nicht aus Schemadokument ''{0}'' referenziert werden. Wenn ''{2}'' einen Namespace haben soll, muss möglicherweise ein Präfix angegeben werden. Wenn ''{2}'' keinen Namespace haben soll, muss ein ''import'' ohne ''namespace''-Attribut zu ''{0}'' hinzugefügt werden.
+        src-resolve.4.2 = src-resolve.4.2: Fehler beim Auflösen von Komponente ''{2}''. Es wurde ermittelt, dass ''{2}'' in Namespace ''{1}'' vorhanden ist, aber Komponenten aus diesem Namespace können nicht aus Schemadokument ''{0}'' referenziert werden. Wenn dies der falsche Namespace ist, muss möglicherweise das Präfix von ''{2}'' geändert werden. Wenn dies der richtige Namespace ist, muss ein entsprechendes ''import''-Tag zu ''{0}'' hinzugefügt werden.
+        src-simple-type.2.a = src-simple-type.2.a: Es wurde ein <restriction>-Element gefunden, das sowohl ein 'base'-[Attribut] als auch ein <simpleType>-Element in seinen [untergeordneten Elementen] enthält. Nur eines davon ist zulässig.
+        src-simple-type.2.b = src-simple-type.2.b: Es wurde ein <restriction>-Element gefunden, das weder ein 'base'-[Attribut] noch ein <simpleType>-Element in seinen [untergeordneten Elementen] enthält. Eines davon ist erforderlich.
+        src-simple-type.3.a = src-simple-type.3.a: Es wurde ein <list>-Element gefunden, das sowohl ein 'itemType'-[Attribut] als auch ein <simpleType>-Element in seinen [untergeordneten Elementen] enthält. Nur eines davon ist zulässig.
+        src-simple-type.3.b = src-simple-type.3.b: Es wurde ein <list>-Element gefunden, das weder ein 'itemType'-[Attribut] noch ein <simpleType>-Element in seinen [untergeordneten Elementen] enthält. Eines davon ist erforderlich.
         src-single-facet-value = src-single-facet-value: Facet ''{0}'' ist mehrmals definiert.
         src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: Ein <union>-Element muss entweder ein nicht leeres memberTypes-[Attribut] oder mindestens ein <simpleType>-Element in seinen [untergeordneten Elementen] enthalten.
 
@@ -163,72 +163,72 @@
 
         ag-props-correct.2 = ag-props-correct.2: Fehler bei Attributgruppe ''{0}''. Es wurden doppelte Attributverwendungen mit demselben Namen und Ziel-Namespace angegeben. Name der doppelten Attributverwendung lautet ''{1}''.
         ag-props-correct.3 = ag-props-correct.3: Fehler bei Attributgruppe ''{0}''. Zwei Attributdeklarationen (''{1}'' und ''{2}'') haben Typen, die aus ID abgeleitet wurden.
-        a-props-correct.2 = a-props-correct.2: Ung\u00FCltiger Werte-Constraint-Wert ''{1}'' in Attribut ''{0}''.
+        a-props-correct.2 = a-props-correct.2: Ungültiger Werte-Constraint-Wert ''{1}'' in Attribut ''{0}''.
         a-props-correct.3 = a-props-correct.3: Bei Attribut ''{0}'' kann ''fixed'' oder ''default'' nicht verwendet werden, da die '{'type definition'}' des Attributs ''ID'' ist oder aus ID abgeleitet wurde.
         au-props-correct.2 = au-props-correct.2: In der Attributdeklaration von ''{0}'' wurde der feste Wert ''{1}'' angegeben. Wenn also die Attributverwendung, die auf ''{0}'' verweist, auch einen '{'value constraint'}' hat, muss sie fest sein, und der Wert muss ''{1}'' lauten.
-        cos-all-limited.1.2 = cos-all-limited.1.2: Eine 'all'-Modellgruppe muss in einem Partikel mit '{'min occurs'}' = '{'max occurs'}' = 1 vorkommen, und dieses Partikel muss zu einem Paar geh\u00F6ren, das den '{'content type'}' einer Complex Type-Definition darstellt.
-        cos-all-limited.2 = cos-all-limited.2: '{'max occurs'}' eines Elements in einer ''all''-Modellgruppe muss 0 oder 1 sein. Der Wert ''{0}'' f\u00FCr Element ''{1}'' ist ung\u00FCltig.
-        cos-applicable-facets = cos-applicable-facets: Facet ''{0}'' ist nicht zul\u00E4ssig f\u00FCr Typ {1}.
-        cos-ct-extends.1.1 = cos-ct-extends.1.1: Typ ''{0}'' wurde durch die Erweiterung von Typ ''{1}'' abgeleitet. Das Attribut ''final'' von ''{1}'' l\u00E4sst die Ableitung durch Erweiterung aber nicht zu.
-        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: Der Contenttyp eines abgeleiteten Typs und der seiner Basis m\u00FCssen beide ''mixed'' oder ''element-only'' sein. Typ ''{0}'' ist ''element only'', aber sein Basistyp nicht.
-        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: Der Contenttyp eines abgeleiteten Typs und der seiner Basis m\u00FCssen beide ''mixed'' oder ''element-only'' sein. Typ ''{0}'' ist ''mixed'', aber sein Basistyp nicht.
+        cos-all-limited.1.2 = cos-all-limited.1.2: Eine 'all'-Modellgruppe muss in einem Partikel mit '{'min occurs'}' = '{'max occurs'}' = 1 vorkommen, und dieses Partikel muss zu einem Paar gehören, das den '{'content type'}' einer Complex Type-Definition darstellt.
+        cos-all-limited.2 = cos-all-limited.2: '{'max occurs'}' eines Elements in einer ''all''-Modellgruppe muss 0 oder 1 sein. Der Wert ''{0}'' für Element ''{1}'' ist ungültig.
+        cos-applicable-facets = cos-applicable-facets: Facet ''{0}'' ist nicht zulässig für Typ {1}.
+        cos-ct-extends.1.1 = cos-ct-extends.1.1: Typ ''{0}'' wurde durch die Erweiterung von Typ ''{1}'' abgeleitet. Das Attribut ''final'' von ''{1}'' lässt die Ableitung durch Erweiterung aber nicht zu.
+        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: Der Contenttyp eines abgeleiteten Typs und der seiner Basis müssen beide ''mixed'' oder ''element-only'' sein. Typ ''{0}'' ist ''element only'', aber sein Basistyp nicht.
+        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: Der Contenttyp eines abgeleiteten Typs und der seiner Basis müssen beide ''mixed'' oder ''element-only'' sein. Typ ''{0}'' ist ''mixed'', aber sein Basistyp nicht.
         cos-element-consistent = cos-element-consistent: Fehler bei Typ ''{0}''. Mehrere Elemente mit Namen ''{1}'' und unterschiedlichen Typen kommen in der Modellgruppe vor.
-        cos-list-of-atomic = cos-list-of-atomic: In der Definition von Listentyp ''{0}'' ist Typ ''{1}'' ein ung\u00FCltiger Listenelementtyp, da er nicht atomar ist (''{1}'' ist entweder ein Listentyp oder ein Vereinigungsmengentyp, der eine Liste enth\u00E4lt).
-        cos-nonambig = cos-nonambig: {0} und {1} (oder Elemente aus ihrer Substitutionsgruppe) verletzen ''Unique Particle Attribution''. Bei der Validierung f\u00FCr dieses Schema w\u00FCrde eine Mehrdeutigkeit f\u00FCr diese beiden Partikel erstellt.
+        cos-list-of-atomic = cos-list-of-atomic: In der Definition von Listentyp ''{0}'' ist Typ ''{1}'' ein ungültiger Listenelementtyp, da er nicht atomar ist (''{1}'' ist entweder ein Listentyp oder ein Vereinigungsmengentyp, der eine Liste enthält).
+        cos-nonambig = cos-nonambig: {0} und {1} (oder Elemente aus ihrer Substitutionsgruppe) verletzen ''Unique Particle Attribution''. Bei der Validierung für dieses Schema würde eine Mehrdeutigkeit für diese beiden Partikel erstellt.
         cos-particle-restrict.a = cos-particle-restrict.a: Abgeleitetes Partikel ist leer, und die Basis kann nicht geleert werden.
         cos-particle-restrict.b = cos-particle-restrict.b: Basispartikel ist leer, aber das abgeleitete Partikel ist nicht leer.
-        cos-particle-restrict.2 = cos-particle-restrict.2: Unzul\u00E4ssige Partikeleinschr\u00E4nkung: ''{0}''.
-        cos-st-restricts.1.1 = cos-st-restricts.1.1: Typ ''{1}'' ist atomar. Daher muss die zugeh\u00F6rige '{'base type definition'}' ''{0}'' eine atomare Simple Type-Definition oder ein integrierter primitiver Datentyp sein.
-        cos-st-restricts.2.1 = cos-st-restricts.2.1: In der Definition von Listentyp ''{0}'' ist Typ ''{1}'' ein ung\u00FCltiger Elementtyp, da er entweder ein Listentyp oder ein Vereinigungsmengentyp ist, der eine Liste enth\u00E4lt.
-        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: Komponente '{'final'}' der '{'item type definition'}' ''{0}'' enth\u00E4lt ''list''. Dies bedeutet, dass ''{0}'' nicht als Elementtyp f\u00FCr Listentyp ''{1}'' verwendet werden kann.
-        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: Komponente '{'final'}' der '{'member type definitions'}' ''{0}'' enth\u00E4lt ''union''. Dies bedeutet, dass ''{0}'' nicht als Mitgliedstyp f\u00FCr Vereinigungsmengentyp ''{1}'' verwendet werden kann.
+        cos-particle-restrict.2 = cos-particle-restrict.2: Unzulässige Partikeleinschränkung: ''{0}''.
+        cos-st-restricts.1.1 = cos-st-restricts.1.1: Typ ''{1}'' ist atomar. Daher muss die zugehörige '{'base type definition'}' ''{0}'' eine atomare Simple Type-Definition oder ein integrierter primitiver Datentyp sein.
+        cos-st-restricts.2.1 = cos-st-restricts.2.1: In der Definition von Listentyp ''{0}'' ist Typ ''{1}'' ein ungültiger Elementtyp, da er entweder ein Listentyp oder ein Vereinigungsmengentyp ist, der eine Liste enthält.
+        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: Komponente '{'final'}' der '{'item type definition'}' ''{0}'' enthält ''list''. Dies bedeutet, dass ''{0}'' nicht als Elementtyp für Listentyp ''{1}'' verwendet werden kann.
+        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: Komponente '{'final'}' der '{'member type definitions'}' ''{0}'' enthält ''union''. Dies bedeutet, dass ''{0}'' nicht als Mitgliedstyp für Vereinigungsmengentyp ''{1}'' verwendet werden kann.
         cos-valid-default.2.1 = cos-valid-default.2.1: Element ''{0}'' hat einen Werte-Constraint und muss ein Misch- oder ein einfaches Contentmodell haben.
-        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Da Element ''{0}'' einen '{'value constraint'}' hat und seine Typdefinition einen gemischten '{'content type'}' hat, muss das Partikel des '{'content type'}' geleert werden k\u00F6nnen.
-        c-props-correct.2 = c-props-correct.2: Kardinalit\u00E4t von Feldern f\u00FCr keyref ''{0}'' und Schl\u00FCssel ''{1}'' muss sich gegenseitig entsprechen.
-        ct-props-correct.3 = ct-props-correct.3: Zyklische Definitionen f\u00FCr Complex Type ''{0}'' ermittelt. Dies bedeutet, dass ''{0}'' in der eigenen Typhierarchie enthalten ist. Dies ist ein Fehler.
+        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Da Element ''{0}'' einen '{'value constraint'}' hat und seine Typdefinition einen gemischten '{'content type'}' hat, muss das Partikel des '{'content type'}' geleert werden können.
+        c-props-correct.2 = c-props-correct.2: Kardinalität von Feldern für keyref ''{0}'' und Schlüssel ''{1}'' muss sich gegenseitig entsprechen.
+        ct-props-correct.3 = ct-props-correct.3: Zyklische Definitionen für Complex Type ''{0}'' ermittelt. Dies bedeutet, dass ''{0}'' in der eigenen Typhierarchie enthalten ist. Dies ist ein Fehler.
         ct-props-correct.4 = ct-props-correct.4: Fehler bei Typ ''{0}''. Es wurden doppelte Attributverwendungen mit demselben Namen und Ziel-Namespace angegeben. Name der doppelten Attributverwendung lautet ''{1}''.
         ct-props-correct.5 = ct-props-correct.5: Fehler bei Typ ''{0}''. Zwei Attributdeklarationen (''{1}'' und ''{2}'') haben Typen, die aus ID abgeleitet wurden.
-        derivation-ok-restriction.1 = derivation-ok-restriction.1: Typ ''{0}'' wurde durch die Einschr\u00E4nkung von Typ ''{1}'' abgeleitet. ''{1}'' hat aber eine '{'final'}'-Eigenschaft, die die Ableitung durch Einschr\u00E4nkung nicht zul\u00E4sst.
-        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: Fehler bei Typ ''{0}''. Attributverwendung ''{1}'' in diesem Typ hat den ''use''-Wert ''{2}'', der nicht mit dem Wert von ''required'' in einer \u00FCbereinstimmenden Attributverwendung im Basistyp konsistent ist.
-        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: Fehler bei Typ ''{0}''. Attributverwendung ''{1}'' in diesem Typ hat den Typ ''{2}'', der nicht auf g\u00FCltige Weise von ''{3}'' abgeleitet wurde, dem Typ der \u00FCbereinstimmenden Attributverwendung im Basistyp.
-        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: Fehler bei Typ ''{0}''. Attributverwendung ''{1}'' in diesem Typ hat einen effektiven Werte-Constraint, der nicht fest ist, und der effektive Werte-Constraint der \u00FCbereinstimmenden Attributverwendung im Basistyp ist fest.
-        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: Fehler bei Typ ''{0}''. Attributverwendung ''{1}'' in diesem Typ hat einen effektiven festen Werte-Constraint mit dem Wert ''{2}''. Dies ist nicht mit dem Wert ''{3}'' f\u00FCr den festen effektiven Werte-Constraint der \u00FCbereinstimmenden Attributverwendung im Basistyp konsistent.
-        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: Fehler bei Typ ''{0}''. Attributverwendung ''{1}'' in diesem Typ hat keine \u00FCbereinstimmende Attributverwendung in der Basis, und der Basistyp hat kein Platzhalterattribut.
-        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: Fehler bei Typ ''{0}''. Attributverwendung ''{1}'' in diesem Typ hat keine \u00FCbereinstimmende Attributverwendung in der Basis, und der Platzhalter im Basistyp l\u00E4sst den Namespace ''{2}'' dieser Attributverwendung nicht zu.
-        derivation-ok-restriction.3 = derivation-ok-restriction.3: Fehler bei Typ ''{0}''. Bei Attributverwendung ''{1}'' im Basistyp ist REQUIRED ''true'', aber es ist keine \u00FCbereinstimmende Attributverwendung im abgeleiteten Typ vorhanden.
+        derivation-ok-restriction.1 = derivation-ok-restriction.1: Typ ''{0}'' wurde durch die Einschränkung von Typ ''{1}'' abgeleitet. ''{1}'' hat aber eine '{'final'}'-Eigenschaft, die die Ableitung durch Einschränkung nicht zulässt.
+        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: Fehler bei Typ ''{0}''. Attributverwendung ''{1}'' in diesem Typ hat den ''use''-Wert ''{2}'', der nicht mit dem Wert von ''required'' in einer übereinstimmenden Attributverwendung im Basistyp konsistent ist.
+        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: Fehler bei Typ ''{0}''. Attributverwendung ''{1}'' in diesem Typ hat den Typ ''{2}'', der nicht auf gültige Weise von ''{3}'' abgeleitet wurde, dem Typ der übereinstimmenden Attributverwendung im Basistyp.
+        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: Fehler bei Typ ''{0}''. Attributverwendung ''{1}'' in diesem Typ hat einen effektiven Werte-Constraint, der nicht fest ist, und der effektive Werte-Constraint der übereinstimmenden Attributverwendung im Basistyp ist fest.
+        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: Fehler bei Typ ''{0}''. Attributverwendung ''{1}'' in diesem Typ hat einen effektiven festen Werte-Constraint mit dem Wert ''{2}''. Dies ist nicht mit dem Wert ''{3}'' für den festen effektiven Werte-Constraint der übereinstimmenden Attributverwendung im Basistyp konsistent.
+        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: Fehler bei Typ ''{0}''. Attributverwendung ''{1}'' in diesem Typ hat keine übereinstimmende Attributverwendung in der Basis, und der Basistyp hat kein Platzhalterattribut.
+        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: Fehler bei Typ ''{0}''. Attributverwendung ''{1}'' in diesem Typ hat keine übereinstimmende Attributverwendung in der Basis, und der Platzhalter im Basistyp lässt den Namespace ''{2}'' dieser Attributverwendung nicht zu.
+        derivation-ok-restriction.3 = derivation-ok-restriction.3: Fehler bei Typ ''{0}''. Bei Attributverwendung ''{1}'' im Basistyp ist REQUIRED ''true'', aber es ist keine übereinstimmende Attributverwendung im abgeleiteten Typ vorhanden.
         derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: Fehler bei Typ ''{0}''. Ableitung hat einen Attributplatzhalter, aber die Basis hat keinen.
-        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: Fehler bei Typ ''{0}''. Platzhalter in der Ableitung ist keine g\u00FCltige Platzhalter-Teilmenge des Platzhalters in der Basis.
-        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: Fehler bei Typ ''{0}''. Prozesscontent des Platzhalters in der Ableitung ({1}) ist schw\u00E4cher als der Content in der Basis ({2}).
-        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: Fehler bei Typ ''{0}''. Einfacher Contenttyp dieses Typs ''{1}'' ist keine g\u00FCltige Einschr\u00E4nkung des einfachen Contenttyps der Basis ''{2}''.
+        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: Fehler bei Typ ''{0}''. Platzhalter in der Ableitung ist keine gültige Platzhalter-Teilmenge des Platzhalters in der Basis.
+        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: Fehler bei Typ ''{0}''. Prozesscontent des Platzhalters in der Ableitung ({1}) ist schwächer als der Content in der Basis ({2}).
+        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: Fehler bei Typ ''{0}''. Einfacher Contenttyp dieses Typs ''{1}'' ist keine gültige Einschränkung des einfachen Contenttyps der Basis ''{2}''.
         derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: Fehler bei Typ ''{0}''. Contenttyp dieses Typs ist leer, aber der Contenttyps der Basis ''{1}'' ist nicht leer oder kann nicht geleert werden.
         derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: Fehler bei Typ ''{0}''. Contenttyp dieses Typs ist ''mixed'', aber der Contenttyps der Basis ''{1}'' nicht.
-        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: Fehler bei Typ ''{0}''. Partikel des Typs ist keine g\u00FCltige Einschr\u00E4nkung des Partikels der Basis.
+        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: Fehler bei Typ ''{0}''. Partikel des Typs ist keine gültige Einschränkung des Partikels der Basis.
         enumeration-required-notation = enumeration-required-notation: NOTATION-Typ ''{0}'', der von {2} ''{1}'' verwendet wird, muss einen Enumerations-Facet-Wert haben, der die von diesem Typ verwendeten Notationselemente angibt.
         enumeration-valid-restriction = enumeration-valid-restriction: Enumerationswert ''{0}'' ist nicht im Wertebereich des Basistyps {1} vorhanden.
-        e-props-correct.2 = e-props-correct.2: Ung\u00FCltiger Werte-Constraint-Wert ''{1}'' in Element ''{0}''.
-        e-props-correct.4 = e-props-correct.4: '{'type definition'}' von Element ''{0}'' wurde nicht auf g\u00FCltige Weise von der '{'type definition'}' von substitutionHead ''{1}'' abgeleitet, oder die '{'substitution group exclusions'}'-Eigenschaft von ''{1}'' l\u00E4sst diese Ableitung nicht zu.
+        e-props-correct.2 = e-props-correct.2: Ungültiger Werte-Constraint-Wert ''{1}'' in Element ''{0}''.
+        e-props-correct.4 = e-props-correct.4: '{'type definition'}' von Element ''{0}'' wurde nicht auf gültige Weise von der '{'type definition'}' von substitutionHead ''{1}'' abgeleitet, oder die '{'substitution group exclusions'}'-Eigenschaft von ''{1}'' lässt diese Ableitung nicht zu.
         e-props-correct.5 = e-props-correct.5: '{'value constraint'}' darf nicht bei Element ''{0}'' vorhanden sein, da die '{'type definition'}' des Elements oder der '{'content type'}' der '{'type definition'}' ID ist oder von ID abgeleitet wurde.
-        e-props-correct.6 = e-props-correct.6: Zyklische Substitutionsgruppe f\u00FCr Element ''{0}'' ermittelt.
-        fractionDigits-valid-restriction = fractionDigits-valid-restriction: In der Definition von {2} ist der Wert ''{0}'' f\u00FCr Facet ''fractionDigits'' ung\u00FCltig, da er <= dem Wert f\u00FCr ''fractionDigits'' sein muss, der in einem der Vorg\u00E4ngertypen auf ''{1}'' gesetzt wurde.
-        fractionDigits-totalDigits = fractionDigits-totalDigits: In der Definition von {2} ist der Wert ''{0}'' f\u00FCr Facet ''fractionDigits'' ung\u00FCltig, da der Wert <= dem Wert f\u00FCr ''totalDigits'' sein muss, der ''{1}'' ist.
+        e-props-correct.6 = e-props-correct.6: Zyklische Substitutionsgruppe für Element ''{0}'' ermittelt.
+        fractionDigits-valid-restriction = fractionDigits-valid-restriction: In der Definition von {2} ist der Wert ''{0}'' für Facet ''fractionDigits'' ungültig, da er <= dem Wert für ''fractionDigits'' sein muss, der in einem der Vorgängertypen auf ''{1}'' gesetzt wurde.
+        fractionDigits-totalDigits = fractionDigits-totalDigits: In der Definition von {2} ist der Wert ''{0}'' für Facet ''fractionDigits'' ungültig, da der Wert <= dem Wert für ''totalDigits'' sein muss, der ''{1}'' ist.
         length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: Bei Typ {0} gilt es als Fehler, wenn der Wert von length ''{1}'' kleiner als der Wert von minLength ''{2}'' ist.
-        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: Bei Typ {0} gilt es als Fehler, wenn die Basis kein minLength-Facet hat, wenn die aktuelle Einschr\u00E4nkung das minLength-Facet und die aktuelle Einschr\u00E4nkung oder Basis das length-Facet hat.
+        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: Bei Typ {0} gilt es als Fehler, wenn die Basis kein minLength-Facet hat, wenn die aktuelle Einschränkung das minLength-Facet und die aktuelle Einschränkung oder Basis das length-Facet hat.
         length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: Bei Typ {0} gilt es als Fehler, wenn die aktuelle minLength ''{1}'' nicht mit der Basis-minLength ''{2}'' identisch ist.
-        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: Bei Typ {0} gilt es als Fehler, wenn der Wert von length ''{1}'' gr\u00F6\u00DFer als der Wert von maxLength ''{2}'' ist.
-        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: Bei Typ {0} gilt es als Fehler, wenn die Basis kein maxLength-Facet hat, wenn die aktuelle Einschr\u00E4nkung das maxLength-Facet und die aktuelle Einschr\u00E4nkung oder Basis das length-Facet hat.
+        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: Bei Typ {0} gilt es als Fehler, wenn der Wert von length ''{1}'' größer als der Wert von maxLength ''{2}'' ist.
+        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: Bei Typ {0} gilt es als Fehler, wenn die Basis kein maxLength-Facet hat, wenn die aktuelle Einschränkung das maxLength-Facet und die aktuelle Einschränkung oder Basis das length-Facet hat.
         length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: Bei Typ {0} gilt es als Fehler, wenn die aktuelle maxLength ''{1}'' nicht mit der Basis-maxLength ''{2}'' identisch ist.
         length-valid-restriction = length-valid-restriction: Fehler bei Typ ''{2}''. Der Wert von length = ''{0}'' muss mit dem Wert des Basistyps ''{1}'' identisch sein.
         maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: Fehler bei Typ ''{2}''. maxExclusive-Wert =''{0}'' muss <= maxExclusive des Basistyps ''{1}'' sein.
         maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: Fehler bei Typ ''{2}''. maxExclusive-Wert =''{0}'' muss <= maxInclusive des Basistyps ''{1}'' sein.
         maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: Fehler bei Typ ''{2}''. maxExclusive-Wert =''{0}'' muss > minInclusive des Basistyps ''{1}'' sein.
         maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4: Fehler bei Typ ''{2}''. maxExclusive-Wert =''{0}'' muss > minExclusive des Basistyps ''{1}'' sein.
-        maxInclusive-maxExclusive = maxInclusive-maxExclusive: Es gilt als Fehler, wenn sowohl maxInclusive als auch maxExclusive f\u00FCr denselben Datentyp angegeben werden. In {2} gilt: maxInclusive = ''{0}'' und maxExclusive = ''{1}''.
+        maxInclusive-maxExclusive = maxInclusive-maxExclusive: Es gilt als Fehler, wenn sowohl maxInclusive als auch maxExclusive für denselben Datentyp angegeben werden. In {2} gilt: maxInclusive = ''{0}'' und maxExclusive = ''{1}''.
         maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: Fehler bei Typ ''{2}''. maxInclusive-Wert =''{0}'' muss <= maxInclusive des Basistyps ''{1}'' sein.
         maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: Fehler bei Typ ''{2}''. maxInclusive-Wert =''{0}'' muss < maxExclusive des Basistyps ''{1}'' sein.
         maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: Fehler bei Typ ''{2}''. maxInclusive-Wert =''{0}'' muss >= maxInclusive des Basistyps ''{1}'' sein.
         maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: Fehler bei Typ ''{2}''. maxInclusive-Wert =''{0}'' muss > minExclusive des Basistyps ''{1}'' sein.
         maxLength-valid-restriction = maxLength-valid-restriction: In der Definition von {2} muss maxLength-Wert = ''{0}'' <= dem Wert des Basistyps ''{1}'' sein.
-        mg-props-correct.2 = mg-props-correct.2: Zyklische Definitionen f\u00FCr Gruppe ''{0}'' ermittelt. Rekursives Folgen der '{'term'}'-Werte der Partikel f\u00FChrt zu einem Partikel, dessen '{'term'}' die Gruppe selbst ist.
+        mg-props-correct.2 = mg-props-correct.2: Zyklische Definitionen für Gruppe ''{0}'' ermittelt. Rekursives Folgen der '{'term'}'-Werte der Partikel führt zu einem Partikel, dessen '{'term'}' die Gruppe selbst ist.
         minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: In der Definition von {2} muss minExclusive-Wert = ''{0}'' <= maxExclusive-Wert = ''{1}'' sein.
         minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: In der Definition von {2} muss minExclusive-Wert = ''{0}'' < maxInclusive-Wert = ''{1}'' sein.
         minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: Fehler bei Typ ''{2}''. minExclusive-Wert =''{0}'' muss >= minExclusive des Basistyps ''{1}'' sein.
@@ -237,84 +237,84 @@
         minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: Fehler bei Typ ''{2}''. minExclusive-Wert =''{0}'' muss < maxExclusive des Basistyps ''{1}'' sein.
         minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: In der Definition von {2} muss minInclusive-Wert = ''{0}'' <= maxInclusive-Wert = ''{1}'' sein.
         minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: In der Definition von {2} muss minInclusive-Wert = ''{0}'' < maxExclusive-Wert = ''{1}'' sein.
-        minInclusive-minExclusive = minInclusive-minExclusive: Es gilt als Fehler, wenn sowohl minInclusive als auch minExclusive f\u00FCr denselben Datentyp angegeben werden. In {2} gilt: minInclusive = ''{0}'' und minExclusive = ''{1}''.
+        minInclusive-minExclusive = minInclusive-minExclusive: Es gilt als Fehler, wenn sowohl minInclusive als auch minExclusive für denselben Datentyp angegeben werden. In {2} gilt: minInclusive = ''{0}'' und minExclusive = ''{1}''.
         minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: Fehler bei Typ ''{2}''. minInclusive-Wert =''{0}'' muss >= minInclusive des Basistyps ''{1}'' sein.
         minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: Fehler bei Typ ''{2}''. minInclusive-Wert =''{0}'' muss <= maxInclusive des Basistyps ''{1}'' sein.
         minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: Fehler bei Typ ''{2}''. minInclusive-Wert =''{0}'' muss > minExclusive des Basistyps ''{1}'' sein.
         minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: Fehler bei Typ ''{2}''. minInclusive-Wert =''{0}'' muss < maxExclusive des Basistyps ''{1}'' sein.
         minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: In der Definition von {2} muss der Wert von minLength = ''{0}'' < dem Wert von maxLength = ''{1}'' sein.
         minLength-valid-restriction = minLength-valid-restriction: In der Definition von {2} muss minLength = ''{0}'' >= dem Wert des Basistyps ''{1}'' sein.
-        no-xmlns = no-xmlns: {name} einer Attributdeklaration darf nicht mit 'xmlns' \u00FCbereinstimmen.
-        no-xsi = no-xsi: '{'target namespace'}' einer Attributdeklaration darf nicht mit ''{0}'' \u00FCbereinstimmen.
-        p-props-correct.2.1 = p-props-correct.2.1: In der Deklaration von ''{0}'' ist der Wert von ''minOccurs'' ''{1}'', er darf aber nicht gr\u00F6\u00DFer als der Wert von ''maxOccurs'' sein, der ''{2}'' lautet.
-        rcase-MapAndSum.1 = rcase-MapAndSum.1: Es ist keine vollst\u00E4ndige Funktionszuordnung zwischen den Partikeln vorhanden.
-        rcase-MapAndSum.2 = rcase-MapAndSum.2: Vorkommensbereich der Gruppe ({0},{1}) ist keine g\u00FCltige Einschr\u00E4nkung des Vorkommensbereichs der Basisgruppe ({2},{3}).
+        no-xmlns = no-xmlns: {name} einer Attributdeklaration darf nicht mit 'xmlns' übereinstimmen.
+        no-xsi = no-xsi: '{'target namespace'}' einer Attributdeklaration darf nicht mit ''{0}'' übereinstimmen.
+        p-props-correct.2.1 = p-props-correct.2.1: In der Deklaration von ''{0}'' ist der Wert von ''minOccurs'' ''{1}'', er darf aber nicht größer als der Wert von ''maxOccurs'' sein, der ''{2}'' lautet.
+        rcase-MapAndSum.1 = rcase-MapAndSum.1: Es ist keine vollständige Funktionszuordnung zwischen den Partikeln vorhanden.
+        rcase-MapAndSum.2 = rcase-MapAndSum.2: Vorkommensbereich der Gruppe ({0},{1}) ist keine gültige Einschränkung des Vorkommensbereichs der Basisgruppe ({2},{3}).
         rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: Elemente haben Namen und Ziel-Namespaces, die nicht identisch sind: Element ''{0}'' in Namespace ''{1}'' und Element ''{2}'' in Namespace ''{3}''.
         rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Fehler beim Partikel, dessen '{'term'}' die Elementdeklaration ''{0}'' ist. '{'nillable'}' ist bei der Elementdeklaration ''true'', aber das entsprechende Partikel im Basistyp hat eine Elementdeklaration, bei der '{'nillable'}' ''false'' ist.
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Fehler beim Partikel, dessen "{''term''}" die Elementdeklaration "{0}" ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Fehler beim Partikel, dessen "{''term''}" die Elementdeklaration "{0}" ist. Der Vorkommensbereich ({1},{2}) ist keine gültige Einschränkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
         rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: Element ''{0}'' ist nicht fest, aber das entsprechende Element im Basistyp ist fest mit Wert ''{1}''.
         rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: Element ''{0}'' ist fest mit dem Wert ''{1}'', aber das entsprechende Element im Basistyp ist fest mit Wert ''{2}''.
-        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: Identity Constraints f\u00FCr Element ''{0}'' sind keine Teilmenge der Constraints in der Basis.
-        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: Die unzul\u00E4ssigen Substitutionen f\u00FCr Element ''{0}'' sind keine Obermenge der Substitutionen in der Basis.
+        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: Identity Constraints für Element ''{0}'' sind keine Teilmenge der Constraints in der Basis.
+        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: Die unzulässigen Substitutionen für Element ''{0}'' sind keine Obermenge der Substitutionen in der Basis.
         rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: Typ des Elements ''{0}'' ''{1}'' wurde nicht vom Typ des Basiselements ''{2}'' abgeleitet.
         rcase-NSCompat.1 = rcase-NSCompat.1: Element ''{0}'' hat den Namespace ''{1}''. Dies wird vom Platzhalter in der Basis nicht zugelassen.
-        rcase-NSCompat.2 = rcase-NSCompat.2: Fehler beim Partikel, dessen "{''term''}" die Elementdeklaration "{0}" ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
-        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: Es ist keine vollst\u00E4ndige Funktionszuordnung zwischen den Partikeln vorhanden.
-        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: Vorkommensbereich der Gruppe ({0},{1}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs des Basisplatzhalters ({2},{3}).
+        rcase-NSCompat.2 = rcase-NSCompat.2: Fehler beim Partikel, dessen "{''term''}" die Elementdeklaration "{0}" ist. Der Vorkommensbereich ({1},{2}) ist keine gültige Einschränkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
+        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: Es ist keine vollständige Funktionszuordnung zwischen den Partikeln vorhanden.
+        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: Vorkommensbereich der Gruppe ({0},{1}) ist keine gültige Einschränkung des Bereichs des Basisplatzhalters ({2},{3}).
         rcase-NSSubset.1 = rcase-NSSubset.1: Platzhalter ist keine Teilmenge des entsprechenden Platzhalters in der Basis.
-        rcase-NSSubset.2 = rcase-NSSubset.2: Vorkommensbereich des Platzhalters ({0},{1}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs in der Basis ({2},{3}).
-        rcase-NSSubset.3 = rcase-NSSubset.3: Prozesscontent des Platzhalters (''{0}'') ist schw\u00E4cher als der in der Basis ''{1}''.
-        rcase-Recurse.1 = rcase-Recurse.1: Vorkommensbereich der Gruppe ({0},{1}) ist keine g\u00FCltige Einschr\u00E4nkung des Vorkommensbereichs der Basisgruppe ({2},{3}).
-        rcase-Recurse.2 = rcase-Recurse.2: Es ist keine vollst\u00E4ndige Funktionszuordnung zwischen den Partikeln vorhanden.
-        rcase-RecurseLax.1 = rcase-RecurseLax.1: Vorkommensbereich der Gruppe ({0},{1}) ist keine g\u00FCltige Einschr\u00E4nkung des Vorkommensbereichs der Basisgruppe ({2},{3}).
-        rcase-RecurseLax.2 = rcase-RecurseLax.2: Es ist keine vollst\u00E4ndige Funktionszuordnung zwischen den Partikeln vorhanden.
-        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: Vorkommensbereich der Gruppe ({0},{1}) ist keine g\u00FCltige Einschr\u00E4nkung des Vorkommensbereichs der Basisgruppe ({2},{3}).
-        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: Es ist keine vollst\u00E4ndige Funktionszuordnung zwischen den Partikeln vorhanden.
+        rcase-NSSubset.2 = rcase-NSSubset.2: Vorkommensbereich des Platzhalters ({0},{1}) ist keine gültige Einschränkung des Bereichs in der Basis ({2},{3}).
+        rcase-NSSubset.3 = rcase-NSSubset.3: Prozesscontent des Platzhalters (''{0}'') ist schwächer als der in der Basis ''{1}''.
+        rcase-Recurse.1 = rcase-Recurse.1: Vorkommensbereich der Gruppe ({0},{1}) ist keine gültige Einschränkung des Vorkommensbereichs der Basisgruppe ({2},{3}).
+        rcase-Recurse.2 = rcase-Recurse.2: Es ist keine vollständige Funktionszuordnung zwischen den Partikeln vorhanden.
+        rcase-RecurseLax.1 = rcase-RecurseLax.1: Vorkommensbereich der Gruppe ({0},{1}) ist keine gültige Einschränkung des Vorkommensbereichs der Basisgruppe ({2},{3}).
+        rcase-RecurseLax.2 = rcase-RecurseLax.2: Es ist keine vollständige Funktionszuordnung zwischen den Partikeln vorhanden.
+        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: Vorkommensbereich der Gruppe ({0},{1}) ist keine gültige Einschränkung des Vorkommensbereichs der Basisgruppe ({2},{3}).
+        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: Es ist keine vollständige Funktionszuordnung zwischen den Partikeln vorhanden.
 #        We're using sch-props-correct.2 instead of the old src-redefine.1
 #        src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
-        sch-props-correct.2 = sch-props-correct.2: Ein Schema kann nicht zwei globale Komponenten mit demselben Namen enthalten. Dieses Schema enth\u00E4lt zwei Vorkommen von ''{0}''.
-        st-props-correct.2 = st-props-correct.2: Zyklische Definitionen wurden f\u00FCr Simple Type ''{0}'' ermittelt. Dies bedeutet, dass ''{0}'' in der eigenen Typhierarchie enthalten ist. Dies ist ein Fehler.
-        st-props-correct.3 = st-props-correct.3: Fehler bei Typ ''{0}''. Der Wert von '{'final'}' der '{'base type definition'}' ''{1}'' l\u00E4sst keine Ableitung durch Einschr\u00E4nkung zu.
-        totalDigits-valid-restriction = totalDigits-valid-restriction: In der Definition von {2} ist der Wert ''{0}'' f\u00FCr Facet ''totalDigits'' ung\u00FCltig, da er <= dem Wert f\u00FCr ''totalDigits'' sein muss, der in einem der Vorg\u00E4ngertypen auf ''{1}'' gesetzt wurde.
-        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: In der Definition von {0} ist der Wert ''{1}'' f\u00FCr Facet ''whitespace'' ung\u00FCltig, da der Wert f\u00FCr ''whitespace'' in einem der Vorg\u00E4ngertypen auf ''collapse'' gesetzt wurde.
-        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: In der Definition von {0} ist der Wert ''preserve'' f\u00FCr Facet ''whitespace'' ung\u00FCltig, da der Wert f\u00FCr ''whitespace'' in einem der Vorg\u00E4ngertypen auf ''replace'' gesetzt wurde.
+        sch-props-correct.2 = sch-props-correct.2: Ein Schema kann nicht zwei globale Komponenten mit demselben Namen enthalten. Dieses Schema enthält zwei Vorkommen von ''{0}''.
+        st-props-correct.2 = st-props-correct.2: Zyklische Definitionen wurden für Simple Type ''{0}'' ermittelt. Dies bedeutet, dass ''{0}'' in der eigenen Typhierarchie enthalten ist. Dies ist ein Fehler.
+        st-props-correct.3 = st-props-correct.3: Fehler bei Typ ''{0}''. Der Wert von '{'final'}' der '{'base type definition'}' ''{1}'' lässt keine Ableitung durch Einschränkung zu.
+        totalDigits-valid-restriction = totalDigits-valid-restriction: In der Definition von {2} ist der Wert ''{0}'' für Facet ''totalDigits'' ungültig, da er <= dem Wert für ''totalDigits'' sein muss, der in einem der Vorgängertypen auf ''{1}'' gesetzt wurde.
+        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: In der Definition von {0} ist der Wert ''{1}'' für Facet ''whitespace'' ungültig, da der Wert für ''whitespace'' in einem der Vorgängertypen auf ''collapse'' gesetzt wurde.
+        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: In der Definition von {0} ist der Wert ''preserve'' für Facet ''whitespace'' ungültig, da der Wert für ''whitespace'' in einem der Vorgängertypen auf ''replace'' gesetzt wurde.
 
 #schema for Schemas
 
-        s4s-att-invalid-value = s4s-att-invalid-value: Ung\u00FCltiger Attributwert f\u00FCr ''{1}'' in Element ''{0}''. Aufgezeichneter Grund: {2}
+        s4s-att-invalid-value = s4s-att-invalid-value: Ungültiger Attributwert für ''{1}'' in Element ''{0}''. Aufgezeichneter Grund: {2}
         s4s-att-must-appear = s4s-att-must-appear: Attribut ''{1}'' muss in Element ''{0}'' vorkommen.
         s4s-att-not-allowed = s4s-att-not-allowed: Attribut ''{1}'' darf nicht in Element ''{0}'' vorkommen.
-        s4s-elt-invalid = s4s-elt-invalid: Element ''{0}'' ist kein g\u00FCltiges Element in einem Schemadokument.
+        s4s-elt-invalid = s4s-elt-invalid: Element ''{0}'' ist kein gültiges Element in einem Schemadokument.
         s4s-elt-must-match.1 = s4s-elt-must-match.1: Content von ''{0}'' muss {1} entsprechen. Beim Start bei {2} ist ein Problem aufgetreten.
-        s4s-elt-must-match.2 = s4s-elt-must-match.2: Content von ''{0}'' muss {1} entsprechen. Nicht gen\u00FCgend Elemente gefunden.
+        s4s-elt-must-match.2 = s4s-elt-must-match.2: Content von ''{0}'' muss {1} entsprechen. Nicht genügend Elemente gefunden.
         # the "invalid-content" messages provide less information than the "must-match" counterparts above. They're used for complex types when providing a "match" would be an information dump
-        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: Content von ''{0}'' ist ung\u00FCltig. Element ''{1}'' ist ung\u00FCltig, nicht an der erwarteten Stelle oder kommt zu oft vor.
-        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: Content von ''{0}'' ist ung\u00FCltig. Element ''{1}'' darf nicht leer sein.
-        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: Elemente mit dem Typ ''{0}'' k\u00F6nnen nicht nach Deklarationen als untergeordnete Elemente eines <schema>-Elements vorkommen.
+        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: Content von ''{0}'' ist ungültig. Element ''{1}'' ist ungültig, nicht an der erwarteten Stelle oder kommt zu oft vor.
+        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: Content von ''{0}'' ist ungültig. Element ''{1}'' darf nicht leer sein.
+        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: Elemente mit dem Typ ''{0}'' können nicht nach Deklarationen als untergeordnete Elemente eines <schema>-Elements vorkommen.
         s4s-elt-schema-ns = s4s-elt-schema-ns: Namespace des Elements ''{0}'' muss aus dem Schema-Namespace ''http://www.w3.org/2001/XMLSchema'' stammen.
-        s4s-elt-character = s4s-elt-character: In anderen Schemaelementen als ''xs:appinfo'' und ''xs:documentation'' sind nur Leerstellen zul\u00E4ssig. ''{0}'' gefunden.
+        s4s-elt-character = s4s-elt-character: In anderen Schemaelementen als ''xs:appinfo'' und ''xs:documentation'' sind nur Leerstellen zulässig. ''{0}'' gefunden.
 
 # codes not defined by the spec
 
-        c-fields-xpaths = c-fields-xpaths: Feldwert = ''{0}'' ist ung\u00FCltig.
-        c-general-xpath = c-general-xpath: Ausdruck ''{0}'' ist ung\u00FCltig in Bezug auf die vom XML-Schema unterst\u00FCtzte XPath-Teilmenge.
-        c-general-xpath-ns = c-general-xpath-ns: Namespace-Pr\u00E4fix in XPath-Ausdruck ''{0}'' war an einen Namespace gebunden.
-        c-selector-xpath = c-selector-xpath: Selektor-Wert = ''{0}'' ist ung\u00FCltig. Selektor-XPaths k\u00F6nnen keine Attribute enthalten.
+        c-fields-xpaths = c-fields-xpaths: Feldwert = ''{0}'' ist ungültig.
+        c-general-xpath = c-general-xpath: Ausdruck ''{0}'' ist ungültig in Bezug auf die vom XML-Schema unterstützte XPath-Teilmenge.
+        c-general-xpath-ns = c-general-xpath-ns: Namespace-Präfix in XPath-Ausdruck ''{0}'' war an einen Namespace gebunden.
+        c-selector-xpath = c-selector-xpath: Selektor-Wert = ''{0}'' ist ungültig. Selektor-XPaths können keine Attribute enthalten.
         EmptyTargetNamespace = EmptyTargetNamespace: In Schemadokument ''{0}'' kann der Wert des ''targetNamespace''-Attributs keine leere Zeichenfolge sein.
         FacetValueFromBase = FacetValueFromBase: In der Deklaration von Typ ''{0}'' muss der Wert ''{1}'' von Facet ''{2}'' aus dem Wertebereich des Basistyps ''{3}'' stammen.
-        FixedFacetValue = FixedFacetValue: In der Definition von {3} ist der Wert ''{1}'' f\u00FCr Facet ''{0}'' ung\u00FCltig, da der Wert f\u00FCr ''{0}'' in einem der Vorg\u00E4ngertypen auf ''{2}'' gesetzt wurde und ''{''fixed'}''' = true ist.
-        InvalidRegex = InvalidRegex: Musterwert "{0}" ist kein g\u00FCltiger regul\u00E4rer Ausdruck. Der gemeldete Fehler war: "{1}".
-        MaxOccurLimit = Aktuelle Konfiguration des Parsers l\u00E4sst nicht zu, dass ein Inhaltsmodell so erweitert wird, dass ein komplexer Typ mehr als {0} Knoten enth\u00E4lt.
+        FixedFacetValue = FixedFacetValue: In der Definition von {3} ist der Wert ''{1}'' für Facet ''{0}'' ungültig, da der Wert für ''{0}'' in einem der Vorgängertypen auf ''{2}'' gesetzt wurde und ''{''fixed'}''' = true ist.
+        InvalidRegex = InvalidRegex: Musterwert "{0}" ist kein gültiger regulärer Ausdruck. Der gemeldete Fehler war: "{1}".
+        MaxOccurLimit = Aktuelle Konfiguration des Parsers lässt nicht zu, dass ein Inhaltsmodell so erweitert wird, dass ein komplexer Typ mehr als {0} Knoten enthält.
         PublicSystemOnNotation = PublicSystemOnNotation: Mindestens eines der Elemente 'public' und 'system' muss im Element 'notation' vorkommen.
         SchemaLocation = SchemaLocation: schemaLocation-Wert = ''{0}'' muss eine gerade Anzahl an URIs haben.
         TargetNamespace.1 = TargetNamespace.1: Namespace ''{0}'' wird erwartet, aber der Ziel-Namespace des Schemadokuments ist ''{1}''.
         TargetNamespace.2 = TargetNamespace.2: Kein Namespace wird erwartet, aber das Schemadokument hat den Ziel-Namespace ''{1}''.
         UndeclaredEntity = UndeclaredEntity: Entity ''{0}'' ist nicht deklariert.
-        UndeclaredPrefix = UndeclaredPrefix: ''{0}'' kann nicht als QName aufgel\u00F6st werden: Pr\u00E4fix ''{1}'' ist nicht deklariert.
-        FacetsContradict = FacetsContradict: F\u00FCr simpleType-Definition "{2}" widerspricht der Enumerationswert "{0}" dem Wert von Facet "{1}".
+        UndeclaredPrefix = UndeclaredPrefix: ''{0}'' kann nicht als QName aufgelöst werden: Präfix ''{1}'' ist nicht deklariert.
+        FacetsContradict = FacetsContradict: Für simpleType-Definition "{2}" widerspricht der Enumerationswert "{0}" dem Wert von Facet "{1}".
 
 # JAXP 1.2 schema source property errors
 
-        jaxp12-schema-source-type.1 = Die Eigenschaft "http://java.sun.com/xml/jaxp/properties/schemaSource" darf keinen Wert des Typs "{0}" haben. M\u00F6gliche unterst\u00FCtzte Werttypen sind String, File, InputStream, InputSource oder ein Array dieser Typen.
-        jaxp12-schema-source-type.2 = Die Eigenschaft "http://java.sun.com/xml/jaxp/properties/schemaSource" darf keinen Arraywert des Typs "{0}" haben. M\u00F6gliche unterst\u00FCtzte Arraytypen sind Object, String, File, InputStream, InputSource.
-        jaxp12-schema-source-ns = Bei Verwendung eines Arrays von Objects als Wert der Eigenschaft "http://java.sun.com/xml/jaxp/properties/schemaSource" d\u00FCrfen keine zwei Schemas denselben Ziel-Namespace verwenden.
+        jaxp12-schema-source-type.1 = Die Eigenschaft "http://java.sun.com/xml/jaxp/properties/schemaSource" darf keinen Wert des Typs "{0}" haben. Mögliche unterstützte Werttypen sind String, File, InputStream, InputSource oder ein Array dieser Typen.
+        jaxp12-schema-source-type.2 = Die Eigenschaft "http://java.sun.com/xml/jaxp/properties/schemaSource" darf keinen Arraywert des Typs "{0}" haben. Mögliche unterstützte Arraytypen sind Object, String, File, InputStream, InputSource.
+        jaxp12-schema-source-ns = Bei Verwendung eines Arrays von Objects als Wert der Eigenschaft "http://java.sun.com/xml/jaxp/properties/schemaSource" dürfen keine zwei Schemas denselben Ziel-Namespace verwenden.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties
index 3d2f34114f4..fd3310a0442 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties
@@ -32,198 +32,198 @@
 # For internal use
 
         Internal-Error = Error interno: {0}.
-        dt-whitespace = El valor de faceta de espacio en blanco no est\u00E1 disponible para simpleType de uni\u00F3n ''{0}''
-        GrammarConflict = Una de las gram\u00E1ticas devueltas del pool de gram\u00E1tica del usuario entra en conflicto con otra gram\u00E1tica.
+        dt-whitespace = El valor de faceta de espacio en blanco no está disponible para simpleType de unión ''{0}''
+        GrammarConflict = Una de las gramáticas devueltas del pool de gramática del usuario entra en conflicto con otra gramática.
 
 # Identity constraints
 
-        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: El elemento "{0}" no tiene ning\u00FAn valor para la clave "{1}".
-        DuplicateField = Coincidencia duplicada en \u00E1mbito del campo "{0}".
-        DuplicateKey = cvc-identity-constraint.4.2.2: Valor de clave duplicado [{0}] declarado para la restricci\u00F3n de identidad "{2}" del elemento "{1}".
-        DuplicateUnique = cvc-identity-constraint.4.1: Valor \u00FAnico duplicado [{0}] declarado para la restricci\u00F3n de identidad "{2}" del elemento "{1}".
-        FieldMultipleMatch = cvc-identity-constraint.3: El campo "{0}" de la restricci\u00F3n de identidad "{1}" coincide con m\u00E1s de un valor en el \u00E1mbito de su selector; los campos deben coincidir con valores \u00FAnicos.
-        FixedDiffersFromActual = El contenido de este elemento no es equivalente al valor del atributo "fixed" en la declaraci\u00F3n del elemento del esquema.
-        KeyMatchesNillable = cvc-identity-constraint.4.2.3: El elemento "{0}" tiene una clave "{1}" que coincide con un elemento cuyo valor de Permite Nill est\u00E1 definido en true.
-        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: No se han especificado suficientes valores para la restricci\u00F3n de identidad <key name="{1}"> especificada para el elemento "{0}".
-        KeyNotFound = cvc-identity-constraint.4.3: No se ha encontrado la clave ''{0}'' con el valor ''{1}'' para la restricci\u00F3n de identidad del elemento ''{2}''.
-        KeyRefOutOfScope = Error de restricci\u00F3n de identidad: la restricci\u00F3n de identidad "{0}" tiene una referencia de clave que hace referencia a una clave o elemento \u00FAnico que se encuentra fuera de \u00E1mbito.
-        KeyRefReferNotFound = La declaraci\u00F3n de referencia de clave "{0}" hace referencia a una clave desconocida con el nombre "{1}".
-        UnknownField = Error de restricci\u00F3n de identidad interno; campo desconocido "{0}" para la restricci\u00F3n de identidad "{2}" especificada para el elemento "{1}".
+        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: El elemento "{0}" no tiene ningún valor para la clave "{1}".
+        DuplicateField = Coincidencia duplicada en ámbito del campo "{0}".
+        DuplicateKey = cvc-identity-constraint.4.2.2: Valor de clave duplicado [{0}] declarado para la restricción de identidad "{2}" del elemento "{1}".
+        DuplicateUnique = cvc-identity-constraint.4.1: Valor único duplicado [{0}] declarado para la restricción de identidad "{2}" del elemento "{1}".
+        FieldMultipleMatch = cvc-identity-constraint.3: El campo "{0}" de la restricción de identidad "{1}" coincide con más de un valor en el ámbito de su selector; los campos deben coincidir con valores únicos.
+        FixedDiffersFromActual = El contenido de este elemento no es equivalente al valor del atributo "fixed" en la declaración del elemento del esquema.
+        KeyMatchesNillable = cvc-identity-constraint.4.2.3: El elemento "{0}" tiene una clave "{1}" que coincide con un elemento cuyo valor de Permite Nill está definido en true.
+        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: No se han especificado suficientes valores para la restricción de identidad <key name="{1}"> especificada para el elemento "{0}".
+        KeyNotFound = cvc-identity-constraint.4.3: No se ha encontrado la clave ''{0}'' con el valor ''{1}'' para la restricción de identidad del elemento ''{2}''.
+        KeyRefOutOfScope = Error de restricción de identidad: la restricción de identidad "{0}" tiene una referencia de clave que hace referencia a una clave o elemento único que se encuentra fuera de ámbito.
+        KeyRefReferNotFound = La declaración de referencia de clave "{0}" hace referencia a una clave desconocida con el nombre "{1}".
+        UnknownField = Error de restricción de identidad interno; campo desconocido "{0}" para la restricción de identidad "{2}" especificada para el elemento "{1}".
 
 # Ideally, we should only use the following error keys, not the ones under
 # "Identity constraints". And we should cover all of the following errors.
 
 #validation (3.X.4)
 
-        cvc-attribute.3 = cvc-attribute.3: El valor ''{2}'' del atributo ''{1}'' del elemento ''{0}'' no es v\u00E1lido con respecto a su tipo, ''{3}''.
-        cvc-attribute.4 = cvc-attribute.4: El valor ''{2}'' del atributo ''{1}'' del elemento ''{0}'' no es v\u00E1lido con respecto a su '{'value constraint'}' fija. El atributo debe tener un valor de ''{3}''.
-        cvc-complex-type.2.1 = cvc-complex-type.2.1: El elemento ''{0}'' no debe tener ning\u00FAn car\u00E1cter ni ning\u00FAn elemento de informaci\u00F3n de elemento [secundarios], porque el tipo de contenido de tipo est\u00E1 vac\u00EDo.
-        cvc-complex-type.2.2 = cvc-complex-type.2.2: El elemento ''{0}'' no debe tener ning\u00FAn elemento [secundarios] y el valor debe ser v\u00E1lido.
-        cvc-complex-type.2.3 = cvc-complex-type.2.3: El elemento ''{0}'' no debe tener ning\u00FAn car\u00E1cter [secundarios], porque el tipo de contenido del tipo es s\u00F3lo de elemento.
-        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: Se ha encontrado contenido no v\u00E1lido a partir del elemento ''{0}''. Se esperaba uno de ''{1}''.
-        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: El contenido del elemento ''{0}'' no est\u00E1 completo. Se esperaba uno de ''{1}''.
-        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: El comod\u00EDn coincidente es estricto, pero no se ha encontrado ninguna declaraci\u00F3n para el elemento ''{0}''.
-        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: Se ha encontrado contenido no v\u00E1lido a partir del elemento ''{0}''. No se espera ning\u00FAn elemento secundario en este punto.
-        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: Se ha encontrado contenido no v\u00E1lido a partir del elemento ''{0}''. No se espera ning\u00FAn elemento secundario ''{1}'' en este punto.
-        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' puede producirse un m\u00E1ximo de ''{2}'' veces en la secuencia actual. Se ha superado este l\u00EDmite. En este punto se espera uno de ''{1}''.
-        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' puede producirse un m\u00E1ximo de ''{1}'' veces en la secuencia actual. Se ha superado este l\u00EDmite. No se espera ning\u00FAn elemento secundario en este punto.
-        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: Se ha encontrado contenido no v\u00E1lido a partir del elemento ''{0}''. Se esperaba que ''{1}'' se produjese un m\u00EDnimo de ''{2}'' veces en la secuencia actual. Se necesita una instancia m\u00E1s para cumplir este l\u00EDmite.
-        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: Se ha encontrado contenido no v\u00E1lido a partir del elemento ''{0}''. Se esperaba que ''{1}'' se produjese un m\u00EDnimo de ''{2}'' veces en la secuencia actual. Se necesitan ''{3}'' instancias m\u00E1s para cumplir este l\u00EDmite.
-        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: El contenido del elemento ''{0}'' no est\u00E1 completo. Se esperaba que ''{1}'' se produjese un m\u00EDnimo de ''{2}'' veces. Se necesita una instancia m\u00E1s para cumplir este l\u00EDmite.
-        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: El contenido del elemento ''{0}'' no est\u00E1 completo. Se esperaba que ''{1}'' se produjese un m\u00EDnimo de ''{2}'' veces. Se necesitan ''{3}'' instancias m\u00E1s para cumplir este l\u00EDmite.
-        cvc-complex-type.3.1 = cvc-complex-type.3.1: El valor ''{2}'' del atributo ''{1}'' del elemento ''{0}'' no es v\u00E1lido con respecto al uso de atributo correspondiente. El atributo ''{1}'' tiene un valor fijo de ''{3}''.
-        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: El elemento ''{0}'' no tiene un comod\u00EDn de atributo para el atributo ''{1}''.
-        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: No est\u00E1 permitido que el atributo ''{1}'' aparezca en el elemento ''{0}''.
+        cvc-attribute.3 = cvc-attribute.3: El valor ''{2}'' del atributo ''{1}'' del elemento ''{0}'' no es válido con respecto a su tipo, ''{3}''.
+        cvc-attribute.4 = cvc-attribute.4: El valor ''{2}'' del atributo ''{1}'' del elemento ''{0}'' no es válido con respecto a su '{'value constraint'}' fija. El atributo debe tener un valor de ''{3}''.
+        cvc-complex-type.2.1 = cvc-complex-type.2.1: El elemento ''{0}'' no debe tener ningún carácter ni ningún elemento de información de elemento [secundarios], porque el tipo de contenido de tipo está vacío.
+        cvc-complex-type.2.2 = cvc-complex-type.2.2: El elemento ''{0}'' no debe tener ningún elemento [secundarios] y el valor debe ser válido.
+        cvc-complex-type.2.3 = cvc-complex-type.2.3: El elemento ''{0}'' no debe tener ningún carácter [secundarios], porque el tipo de contenido del tipo es sólo de elemento.
+        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: Se ha encontrado contenido no válido a partir del elemento ''{0}''. Se esperaba uno de ''{1}''.
+        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: El contenido del elemento ''{0}'' no está completo. Se esperaba uno de ''{1}''.
+        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: El comodín coincidente es estricto, pero no se ha encontrado ninguna declaración para el elemento ''{0}''.
+        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: Se ha encontrado contenido no válido a partir del elemento ''{0}''. No se espera ningún elemento secundario en este punto.
+        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: Se ha encontrado contenido no válido a partir del elemento ''{0}''. No se espera ningún elemento secundario ''{1}'' en este punto.
+        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' puede producirse un máximo de ''{2}'' veces en la secuencia actual. Se ha superado este límite. En este punto se espera uno de ''{1}''.
+        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' puede producirse un máximo de ''{1}'' veces en la secuencia actual. Se ha superado este límite. No se espera ningún elemento secundario en este punto.
+        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: Se ha encontrado contenido no válido a partir del elemento ''{0}''. Se esperaba que ''{1}'' se produjese un mínimo de ''{2}'' veces en la secuencia actual. Se necesita una instancia más para cumplir este límite.
+        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: Se ha encontrado contenido no válido a partir del elemento ''{0}''. Se esperaba que ''{1}'' se produjese un mínimo de ''{2}'' veces en la secuencia actual. Se necesitan ''{3}'' instancias más para cumplir este límite.
+        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: El contenido del elemento ''{0}'' no está completo. Se esperaba que ''{1}'' se produjese un mínimo de ''{2}'' veces. Se necesita una instancia más para cumplir este límite.
+        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: El contenido del elemento ''{0}'' no está completo. Se esperaba que ''{1}'' se produjese un mínimo de ''{2}'' veces. Se necesitan ''{3}'' instancias más para cumplir este límite.
+        cvc-complex-type.3.1 = cvc-complex-type.3.1: El valor ''{2}'' del atributo ''{1}'' del elemento ''{0}'' no es válido con respecto al uso de atributo correspondiente. El atributo ''{1}'' tiene un valor fijo de ''{3}''.
+        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: El elemento ''{0}'' no tiene un comodín de atributo para el atributo ''{1}''.
+        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: No está permitido que el atributo ''{1}'' aparezca en el elemento ''{0}''.
         cvc-complex-type.4 = cvc-complex-type.4: El atributo ''{1}'' debe aparecer en el elemento ''{0}''.
-        cvc-complex-type.5.1 = cvc-complex-type.5.1: En el elemento ''{0}'', el atributo ''{1}'' es un identificador de comod\u00EDn, pero ya existe un identificador de comod\u00EDn ''{2}''. S\u00F3lo puede existir uno.
-        cvc-complex-type.5.2 = cvc-complex-type.5.2: En el elemento ''{0}'', el atributo ''{1}'' es un identificador de comod\u00EDn, pero ya existe un atributo ''{2}'' derivado del identificador entre los '{'attribute uses'}'.
-        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' no es un valor v\u00E1lido para ''{1}''.
-        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' no es un valor v\u00E1lido de tipo de lista ''{1}''.
-        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' no es un valor v\u00E1lido de tipo de uni\u00F3n ''{1}''.
-        cvc-elt.1.a = cvc-elt.1.a: No se ha encontrado la declaraci\u00F3n del elemento ''{0}''.
-        cvc-elt.1.b = cvc-elt.1.b: El nombre del elemento no coincide con el nombre de la declaraci\u00F3n de elemento. Se ha detectado ''{0}''. Se esperaba ''{1}''.
-        cvc-elt.2 = cvc-elt.2: El valor de '{'abstract'}' en la declaraci\u00F3n de elemento para ''{0}'' debe ser false.
+        cvc-complex-type.5.1 = cvc-complex-type.5.1: En el elemento ''{0}'', el atributo ''{1}'' es un identificador de comodín, pero ya existe un identificador de comodín ''{2}''. Sólo puede existir uno.
+        cvc-complex-type.5.2 = cvc-complex-type.5.2: En el elemento ''{0}'', el atributo ''{1}'' es un identificador de comodín, pero ya existe un atributo ''{2}'' derivado del identificador entre los '{'attribute uses'}'.
+        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' no es un valor válido para ''{1}''.
+        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' no es un valor válido de tipo de lista ''{1}''.
+        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' no es un valor válido de tipo de unión ''{1}''.
+        cvc-elt.1.a = cvc-elt.1.a: No se ha encontrado la declaración del elemento ''{0}''.
+        cvc-elt.1.b = cvc-elt.1.b: El nombre del elemento no coincide con el nombre de la declaración de elemento. Se ha detectado ''{0}''. Se esperaba ''{1}''.
+        cvc-elt.2 = cvc-elt.2: El valor de '{'abstract'}' en la declaración de elemento para ''{0}'' debe ser false.
         cvc-elt.3.1 = cvc-elt.3.1: El atributo ''{1}'' no debe aparecer en el elemento ''{0}'', porque la propiedad '{'nillable'}' de ''{0}'' tiene el valor false.
-        cvc-elt.3.2.1 = cvc-elt.3.2.1: El elemento ''{0}'' no debe tener ning\u00FAn car\u00E1cter ni informaci\u00F3n de elemento [secundarios], porque se ha especificado ''{1}''.
-        cvc-elt.3.2.2 = cvc-elt.3.2.2: No debe haber ning\u00FAn valor fijo de '{'value constraint'}' para el elemento ''{0}'', porque se ha especificado ''{1}''.
-        cvc-elt.4.1 = cvc-elt.4.1: El valor ''{2}'' del atributo ''{1}'' del elemento ''{0}'' no es un QName v\u00E1lido.
-        cvc-elt.4.2 = cvc-elt.4.2: No se puede resolver ''{1}'' en una definici\u00F3n de tipo para el elemento ''{0}''.
-        cvc-elt.4.3 = cvc-elt.4.3: El tipo ''{1}'' no se ha derivado de forma v\u00E1lida de la definici\u00F3n de tipo ''{2}'' del elemento ''{0}''.
-        cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'value constraint'}' ''{2}'' del elemento ''{0}'' no es un valor por defecto v\u00E1lido para el tipo ''{1}''.
-        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: El elemento ''{0}'' no debe tener ning\u00FAn elemento de informaci\u00F3n de elemento [secundarios].
+        cvc-elt.3.2.1 = cvc-elt.3.2.1: El elemento ''{0}'' no debe tener ningún carácter ni información de elemento [secundarios], porque se ha especificado ''{1}''.
+        cvc-elt.3.2.2 = cvc-elt.3.2.2: No debe haber ningún valor fijo de '{'value constraint'}' para el elemento ''{0}'', porque se ha especificado ''{1}''.
+        cvc-elt.4.1 = cvc-elt.4.1: El valor ''{2}'' del atributo ''{1}'' del elemento ''{0}'' no es un QName válido.
+        cvc-elt.4.2 = cvc-elt.4.2: No se puede resolver ''{1}'' en una definición de tipo para el elemento ''{0}''.
+        cvc-elt.4.3 = cvc-elt.4.3: El tipo ''{1}'' no se ha derivado de forma válida de la definición de tipo ''{2}'' del elemento ''{0}''.
+        cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'value constraint'}' ''{2}'' del elemento ''{0}'' no es un valor por defecto válido para el tipo ''{1}''.
+        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: El elemento ''{0}'' no debe tener ningún elemento de información de elemento [secundarios].
         cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: El valor ''{1}'' del elemento ''{0}'' no coincide con el valor de '{'value constraint'}' fijo ''{2}''.
         cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: El valor ''{1}'' del elemento ''{0}'' no coincide con el valor de '{'value constraint'}' ''{2}''.
-        cvc-enumeration-valid = cvc-enumeration-valid: El valor ''{0}'' no es de faceta v\u00E1lida con respecto a la enumeraci\u00F3n ''{1}''. Debe ser un valor de la enumeraci\u00F3n.
-        cvc-fractionDigits-valid = cvc-fractionDigits-valid: El valor ''{0}'' tiene {1} d\u00EDgitos fraccionarios, pero el n\u00FAmero de d\u00EDgitos fraccionarios se ha limitado a {2}.
-        cvc-id.1 = cvc-id.1: No hay ning\u00FAn enlace de identificador/IDREF para IDREF ''{0}''.
+        cvc-enumeration-valid = cvc-enumeration-valid: El valor ''{0}'' no es de faceta válida con respecto a la enumeración ''{1}''. Debe ser un valor de la enumeración.
+        cvc-fractionDigits-valid = cvc-fractionDigits-valid: El valor ''{0}'' tiene {1} dígitos fraccionarios, pero el número de dígitos fraccionarios se ha limitado a {2}.
+        cvc-id.1 = cvc-id.1: No hay ningún enlace de identificador/IDREF para IDREF ''{0}''.
         cvc-id.2 = cvc-id.2: Hay varias incidencias del valor de identificador ''{0}''.
-        cvc-id.3 = cvc-id.3: Un campo de restricci\u00F3n de identidad ''{0}'' coincide con el elemento ''{1}'', pero el elemento no es de tipo simple.
-        cvc-length-valid = cvc-length-valid: El valor ''{0}'' con la longitud = ''{1}'' no es de faceta v\u00E1lida con respecto a la longitud ''{2}'' para el tipo ''{3}''.
-        cvc-maxExclusive-valid = cvc-maxExclusive-valid: El valor ''{0}'' no es de faceta v\u00E1lida con respecto a maxExclusive ''{1}'' para el tipo ''{2}''.
-        cvc-maxInclusive-valid = cvc-maxInclusive-valid: El valor ''{0}'' no es de faceta v\u00E1lida con respecto a maxInclusive ''{1}'' para el tipo ''{2}''.
-        cvc-maxLength-valid = cvc-maxLength-valid: El valor ''{0}'' con la longitud = ''{1}'' no es de faceta v\u00E1lida con respecto a maxLength ''{2}'' para el tipo ''{3}''.
-        cvc-minExclusive-valid = cvc-minExclusive-valid: El valor ''{0}'' no es de faceta v\u00E1lida con respecto a minExclusive ''{1}''para el tipo ''{2}''.
-        cvc-minInclusive-valid = cvc-minInclusive-valid: El valor ''{0}'' no es de faceta v\u00E1lida con respecto a minInclusive ''{1}'' para el tipo ''{2}''.
-        cvc-minLength-valid = cvc-minLength-valid: El valor ''{0}'' con la longitud = ''{1}'' no es de faceta v\u00E1lida con respecto a minLength ''{2}'' para el tipo ''{3}''.
-        cvc-pattern-valid = cvc-pattern-valid: El valor ''{0}'' no es de faceta v\u00E1lida con respecto al patr\u00F3n ''{1}'' para el tipo ''{2}''.
-        cvc-totalDigits-valid = cvc-totalDigits-valid: El valor''{0}'' tiene {1} d\u00EDgitos totales, pero el n\u00FAmero de d\u00EDgitos totales se ha limitado a {2}.
-        cvc-type.1 = cvc-type.1: No se ha encontrado la definici\u00F3n de tipo ''{0}''.
-        cvc-type.2 = cvc-type.2: La definici\u00F3n de tipo no puede ser abstracta para el elemento {0}.
+        cvc-id.3 = cvc-id.3: Un campo de restricción de identidad ''{0}'' coincide con el elemento ''{1}'', pero el elemento no es de tipo simple.
+        cvc-length-valid = cvc-length-valid: El valor ''{0}'' con la longitud = ''{1}'' no es de faceta válida con respecto a la longitud ''{2}'' para el tipo ''{3}''.
+        cvc-maxExclusive-valid = cvc-maxExclusive-valid: El valor ''{0}'' no es de faceta válida con respecto a maxExclusive ''{1}'' para el tipo ''{2}''.
+        cvc-maxInclusive-valid = cvc-maxInclusive-valid: El valor ''{0}'' no es de faceta válida con respecto a maxInclusive ''{1}'' para el tipo ''{2}''.
+        cvc-maxLength-valid = cvc-maxLength-valid: El valor ''{0}'' con la longitud = ''{1}'' no es de faceta válida con respecto a maxLength ''{2}'' para el tipo ''{3}''.
+        cvc-minExclusive-valid = cvc-minExclusive-valid: El valor ''{0}'' no es de faceta válida con respecto a minExclusive ''{1}''para el tipo ''{2}''.
+        cvc-minInclusive-valid = cvc-minInclusive-valid: El valor ''{0}'' no es de faceta válida con respecto a minInclusive ''{1}'' para el tipo ''{2}''.
+        cvc-minLength-valid = cvc-minLength-valid: El valor ''{0}'' con la longitud = ''{1}'' no es de faceta válida con respecto a minLength ''{2}'' para el tipo ''{3}''.
+        cvc-pattern-valid = cvc-pattern-valid: El valor ''{0}'' no es de faceta válida con respecto al patrón ''{1}'' para el tipo ''{2}''.
+        cvc-totalDigits-valid = cvc-totalDigits-valid: El valor''{0}'' tiene {1} dígitos totales, pero el número de dígitos totales se ha limitado a {2}.
+        cvc-type.1 = cvc-type.1: No se ha encontrado la definición de tipo ''{0}''.
+        cvc-type.2 = cvc-type.2: La definición de tipo no puede ser abstracta para el elemento {0}.
         cvc-type.3.1.1 = cvc-type.3.1.1: El elemento ''{0}'' es un tipo simple, por lo que no puede tener atributos, excepto aquellos cuyo espacio de nombres sea ''http://www.w3.org/2001/XMLSchema-instance'' y cuyo [nombre local] sea de tipo ''type'', ''nil'', ''schemaLocation'' o ''noNamespaceSchemaLocation''. Sin embargo, se ha encontrado el atributo ''{1}''.
-        cvc-type.3.1.2 = cvc-type.3.1.2: El elemento''{0}'' es un tipo simple, por lo que no debe tener ning\u00FAn elemento de informaci\u00F3n de elemento [secundarios].
-        cvc-type.3.1.3 = cvc-type.3.1.3: El valor ''{1}'' del elemento ''{0}'' no es v\u00E1lido.
+        cvc-type.3.1.2 = cvc-type.3.1.2: El elemento''{0}'' es un tipo simple, por lo que no debe tener ningún elemento de información de elemento [secundarios].
+        cvc-type.3.1.3 = cvc-type.3.1.3: El valor ''{1}'' del elemento ''{0}'' no es válido.
 
 #schema valid (3.X.3)
 
-        schema_reference.access = schema_reference: fallo al leer el documento de esquema ''{0}'' porque no se permite el acceso ''{1}'' debido a una restricci\u00F3n definida por la propiedad accessExternalSchema. 
-        schema_reference.4 = schema_reference.4: Fallo al leer el documento de esquema ''{0}'', porque 1) no se ha encontrado el documento; 2) no se ha podido leer el documento; 3) el elemento ra\u00EDz del documento no es <xsd:schema>.
-        src-annotation = src-annotation: Los elementos de <annotation> s\u00F3lo pueden contener elementos de <appinfo> y <documentation>, pero se ha encontrado ''{0}''.
-        src-attribute.1 = src-attribute.1: Las propiedades ''default'' y ''fixed'' no pueden estar presentes de forma simult\u00E1nea en la declaraci\u00F3n de atributo ''{0}''. Utilice s\u00F3lo una de ellas.
-        src-attribute.2 = src-attribute.2: : La propiedad ''default'' est\u00E1 presente en el atributo ''{0}'', por lo que el valor de ''use'' debe ser ''optional''.
-        src-attribute.3.1 = src-attribute.3.1: 'ref' o 'name' deben estar presentes en una declaraci\u00F3n de atributo local.
+        schema_reference.access = schema_reference: fallo al leer el documento de esquema ''{0}'' porque no se permite el acceso ''{1}'' debido a una restricción definida por la propiedad accessExternalSchema. 
+        schema_reference.4 = schema_reference.4: Fallo al leer el documento de esquema ''{0}'', porque 1) no se ha encontrado el documento; 2) no se ha podido leer el documento; 3) el elemento raíz del documento no es <xsd:schema>.
+        src-annotation = src-annotation: Los elementos de <annotation> sólo pueden contener elementos de <appinfo> y <documentation>, pero se ha encontrado ''{0}''.
+        src-attribute.1 = src-attribute.1: Las propiedades ''default'' y ''fixed'' no pueden estar presentes de forma simultánea en la declaración de atributo ''{0}''. Utilice sólo una de ellas.
+        src-attribute.2 = src-attribute.2: : La propiedad ''default'' está presente en el atributo ''{0}'', por lo que el valor de ''use'' debe ser ''optional''.
+        src-attribute.3.1 = src-attribute.3.1: 'ref' o 'name' deben estar presentes en una declaración de atributo local.
         src-attribute.3.2 = src-attribute.3.2: El contenido debe coincidir con (annotation?) para la referencia de atributo ''{0}''.
-        src-attribute.4 = src-attribute.4: El atributo ''{0}'' tiene un atributo ''type'' y un secundario an\u00F3nimo ''simpleType''. S\u00F3lo se permite uno de estos como atributo.
-        src-attribute_group.2 = src-attribute_group.2: La intersecci\u00F3n de comodines no se puede expresar para el grupo de atributos ''{0}''.
-        src-attribute_group.3 = src-attribute_group.3: Se han detectado definiciones circulares para el grupo de atributos ''{0}''. El seguimiento de forma recurrente de las referencias de grupo de atributos vuelve de forma eventual a s\u00ED mismo.
-        src-ct.1 = src-ct.1: Error de representaci\u00F3n de definici\u00F3n de tipo complejo para el tipo ''{0}''. Si se utiliza <complexContent>, el tipo de base debe ser complexType. ''{1}'' es simpleType.
-        src-ct.2.1 = src-ct.2.1: Error de representaci\u00F3n de definici\u00F3n de tipo complejo para el tipo ''{0}''. Si se utiliza <simpleContent>, el tipo de base debe ser complexType cuyo tipo de contenido sea simple o, s\u00F3lo en caso de que se especifique una restricci\u00F3n, un tipo complejo con contenido mixto y part\u00EDcula que se pueda vaciar o, s\u00F3lo si se especifica la extensi\u00F3n, un tipo simple. ''{1}'' no cumple ninguna de estas condiciones.
-        src-ct.2.2 = src-ct.2.2: Error de representaci\u00F3n de definici\u00F3n de tipo complejo para el tipo ''{0}''. Cuando complexType con simpleContent restringe un valor de complexType con contenido mixto y part\u00EDcula que se pueda vaciar, debe haber un valor <simpleType> entre los secundarios de <restriction>.
-        src-ct.4 = src-ct.4: Error de representaci\u00F3n de definici\u00F3n de tipo complejo para el tipo ''{0}''. La intersecci\u00F3n de los comodines no se puede expresar.
-        src-ct.5 = src-ct.5: Error de representaci\u00F3n de definici\u00F3n de tipo complejo para el tipo ''{0}''. La uni\u00F3n de los comodines no se puede expresar.
-        src-element.1 = src-element.1: Las propiedades ''default'' y ''fixed'' no pueden estar presentes de forma simult\u00E1nea en la declaraci\u00F3n de elemento ''{0}''. Utilice s\u00F3lo una de ellas.
-        src-element.2.1 = src-element.2.1: : 'ref' o 'name' deben estar presentes en una declaraci\u00F3n de elemento local.
+        src-attribute.4 = src-attribute.4: El atributo ''{0}'' tiene un atributo ''type'' y un secundario anónimo ''simpleType''. Sólo se permite uno de estos como atributo.
+        src-attribute_group.2 = src-attribute_group.2: La intersección de comodines no se puede expresar para el grupo de atributos ''{0}''.
+        src-attribute_group.3 = src-attribute_group.3: Se han detectado definiciones circulares para el grupo de atributos ''{0}''. El seguimiento de forma recurrente de las referencias de grupo de atributos vuelve de forma eventual a sí mismo.
+        src-ct.1 = src-ct.1: Error de representación de definición de tipo complejo para el tipo ''{0}''. Si se utiliza <complexContent>, el tipo de base debe ser complexType. ''{1}'' es simpleType.
+        src-ct.2.1 = src-ct.2.1: Error de representación de definición de tipo complejo para el tipo ''{0}''. Si se utiliza <simpleContent>, el tipo de base debe ser complexType cuyo tipo de contenido sea simple o, sólo en caso de que se especifique una restricción, un tipo complejo con contenido mixto y partícula que se pueda vaciar o, sólo si se especifica la extensión, un tipo simple. ''{1}'' no cumple ninguna de estas condiciones.
+        src-ct.2.2 = src-ct.2.2: Error de representación de definición de tipo complejo para el tipo ''{0}''. Cuando complexType con simpleContent restringe un valor de complexType con contenido mixto y partícula que se pueda vaciar, debe haber un valor <simpleType> entre los secundarios de <restriction>.
+        src-ct.4 = src-ct.4: Error de representación de definición de tipo complejo para el tipo ''{0}''. La intersección de los comodines no se puede expresar.
+        src-ct.5 = src-ct.5: Error de representación de definición de tipo complejo para el tipo ''{0}''. La unión de los comodines no se puede expresar.
+        src-element.1 = src-element.1: Las propiedades ''default'' y ''fixed'' no pueden estar presentes de forma simultánea en la declaración de elemento ''{0}''. Utilice sólo una de ellas.
+        src-element.2.1 = src-element.2.1: : 'ref' o 'name' deben estar presentes en una declaración de elemento local.
         src-element.2.2 = src-element.2.2: Como ''{0}'' contiene el atributo ''ref'', su contenido debe coincidir con (annotation?). Sin embargo, se ha encontrado ''{1}''.
         src-element.3 = src-element.3: El elemento ''{0}'' tiene un atributo ''type'' y un secundario ''anonymous type''. Solo se permite uno de estos para un elemento.
-        src-import.1.1 = src-import.1.1: El atributo de espacio de nombres ''{0}'' de un elemento de informaci\u00F3n de elemento <import> no debe ser igual que el valor de targetNamespace del esquema en el que existe.
-        src-import.1.2 = src-import.1.2: Si el atributo de espacio de nombres no est\u00E1 presente en un elemento de informaci\u00F3n de elemento <import>, el esquema delimitador debe tener un targetNamespace.
-        src-import.2 = src-import.2: El espacio de nombres del elemento ra\u00EDz del documento ''{0}'' debe llamarse ''http://www.w3.org/2001/XMLSchema'' y el nombre local ''schema''.
-        src-import.3.1 = src-import.3.1: El atributo de espacio de nombres, ''{0}'', de un elemento de informaci\u00F3n de elemento <import> debe ser id\u00E9ntico al atributo targetNamespace, ''{1}'', del documento importado.
-        src-import.3.2 = src-import.3.2: Se ha encontrado un elemento de informaci\u00F3n de elemento <import> que no ten\u00EDa ning\u00FAn atributo de espacio de nombres, por lo que el documento importado no puede tener un atributo targetNamespace. Sin embargo, se ha encontrado el valor de targetNamespace ''{1}'' en el documento importado.
-        src-include.1 = src-include.1: El espacio de nombres del elemento ra\u00EDz del documento ''{0}'' debe llamarse ''http://www.w3.org/2001/XMLSchema'' y el nombre local ''schema''.
+        src-import.1.1 = src-import.1.1: El atributo de espacio de nombres ''{0}'' de un elemento de información de elemento <import> no debe ser igual que el valor de targetNamespace del esquema en el que existe.
+        src-import.1.2 = src-import.1.2: Si el atributo de espacio de nombres no está presente en un elemento de información de elemento <import>, el esquema delimitador debe tener un targetNamespace.
+        src-import.2 = src-import.2: El espacio de nombres del elemento raíz del documento ''{0}'' debe llamarse ''http://www.w3.org/2001/XMLSchema'' y el nombre local ''schema''.
+        src-import.3.1 = src-import.3.1: El atributo de espacio de nombres, ''{0}'', de un elemento de información de elemento <import> debe ser idéntico al atributo targetNamespace, ''{1}'', del documento importado.
+        src-import.3.2 = src-import.3.2: Se ha encontrado un elemento de información de elemento <import> que no tenía ningún atributo de espacio de nombres, por lo que el documento importado no puede tener un atributo targetNamespace. Sin embargo, se ha encontrado el valor de targetNamespace ''{1}'' en el documento importado.
+        src-include.1 = src-include.1: El espacio de nombres del elemento raíz del documento ''{0}'' debe llamarse ''http://www.w3.org/2001/XMLSchema'' y el nombre local ''schema''.
         src-include.2.1 = src-include.2.1: El valor de targetNamespace del esquema de referencia, actualmente ''{1}'', debe ser igual al del esquema incluido, que actualmente es ''{0}''.
-        src-redefine.2 = src-redefine.2: El espacio de nombres del elemento ra\u00EDz del documento ''{0}'' debe llamarse ''http://www.w3.org/2001/XMLSchema'' y el nombre local ''schema''.
+        src-redefine.2 = src-redefine.2: El espacio de nombres del elemento raíz del documento ''{0}'' debe llamarse ''http://www.w3.org/2001/XMLSchema'' y el nombre local ''schema''.
         src-redefine.3.1 = src-redefine.3.1: El valor de targetNamespace del esquema de referencia, que actualmente es ''{1}'', debe ser igual al del esquema redefinido, que actualmente es ''{0}''.
-        src-redefine.5.a.a = src-redefine.5.a.a: No se ha encontrado ning\u00FAn secundario sin anotaci\u00F3n de <simpleType>. Los secundarios de <simpleType> de los elementos <redefine> deben tener descendientes de <restriction>, con atributos de 'base' que hagan referencia a s\u00ED mismos.
-        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' no es un elemento secundario v\u00E1lido. Los secundarios de <simpleType> de los elementos <redefine> deben tener descendientes de <restriction>, con atributos de ''base'' que hagan referencia a s\u00ED mismos.
-        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' no tiene un atributo de ''base'' que hace referencia al elemento redefinido, ''{1}''. Los secundarios de <simpleType> de los elementos <redefine> deben tener descendientes de <restriction>, con atributos de ''base'' que hagan referencia a s\u00ED mismos.
-        src-redefine.5.b.a = src-redefine.5.b.a: No se ha encontrado ning\u00FAn secundario sin anotaci\u00F3n de <complexType>. Los secundarios de <complexType> de los elementos <redefine> deben tener descendientes de <extension> o <restriction>, con atributos de 'base' que hagan referencia a s\u00ED mismos.
-        src-redefine.5.b.b = src-redefine.5.b.b:No se ha encontrado ning\u00FAn terciario sin anotaci\u00F3n de <complexType>. Los secundarios de <complexType> de los elementos <redefine> deben tener descendientes de <extension> o <restriction>, con atributos de 'base' que hagan referencia a s\u00ED mismos.
-        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}'' no es un elemento terciario v\u00E1lido. Los secundarios de <complexType> de los elementos <redefine> deben tener descendientes de <extension> o <restriction>, con atributos de ''base'' que hagan referencia a s\u00ED mismos.
-        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}'' no tiene un atributo de ''base'' que hace referencia al elemento redefinido, ''{1}''. Los secundarios de <complexType> de los elementos <redefine> deben tener descendientes de <extension> o <restriction>, con atributos de ''base'' que hagan referencia a s\u00ED mismos.
-        src-redefine.6.1.1 = src-redefine.6.1.1: Si un secundario de grupo de un elemento <redefine> contiene un grupo que hace referencia a s\u00ED mismo, debe tener exactamente 1; \u00E9ste tiene ''{0}''.
-        src-redefine.6.1.2 = src-redefine.6.1.2: El grupo ''{0}'', que contiene una referencia a un grupo que se est\u00E1 redefiniendo debe tener un valor de ''minOccurs'' = ''maxOccurs'' = 1.
-        src-redefine.6.2.1 = src-redefine.6.2.1: No hay ning\u00FAn grupo en el esquema redefinido con un nombre que coincida con ''{0}''.
-        src-redefine.6.2.2 = src-redefine.6.2.2: El grupo ''{0}'' no restringe correctamente al grupo que redefine; se ha violado la restricci\u00F3n: ''{1}''.
-        src-redefine.7.1 = src-redefine.7.1: Si un secundario de attributeGroup de un elemento <redefine> contiene un valor de attributeGroup que hace referencia a s\u00ED mismo, debe tener exactamente 1; \u00E9ste tiene {0}.
-        src-redefine.7.2.1 = src-redefine.7.2.1: No hay ning\u00FAn valor de attributeGroup en el esquema redefinido con un nombre que coincida con ''{0}''.
-        src-redefine.7.2.2 = src-redefine.7.2.2: el valor de attributeGroup ''{0}'' no restringe correctamente el valor de attributeGroup que redefine; se ha violado la restricci\u00F3n: ''{1}''.
+        src-redefine.5.a.a = src-redefine.5.a.a: No se ha encontrado ningún secundario sin anotación de <simpleType>. Los secundarios de <simpleType> de los elementos <redefine> deben tener descendientes de <restriction>, con atributos de 'base' que hagan referencia a sí mismos.
+        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' no es un elemento secundario válido. Los secundarios de <simpleType> de los elementos <redefine> deben tener descendientes de <restriction>, con atributos de ''base'' que hagan referencia a sí mismos.
+        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' no tiene un atributo de ''base'' que hace referencia al elemento redefinido, ''{1}''. Los secundarios de <simpleType> de los elementos <redefine> deben tener descendientes de <restriction>, con atributos de ''base'' que hagan referencia a sí mismos.
+        src-redefine.5.b.a = src-redefine.5.b.a: No se ha encontrado ningún secundario sin anotación de <complexType>. Los secundarios de <complexType> de los elementos <redefine> deben tener descendientes de <extension> o <restriction>, con atributos de 'base' que hagan referencia a sí mismos.
+        src-redefine.5.b.b = src-redefine.5.b.b:No se ha encontrado ningún terciario sin anotación de <complexType>. Los secundarios de <complexType> de los elementos <redefine> deben tener descendientes de <extension> o <restriction>, con atributos de 'base' que hagan referencia a sí mismos.
+        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}'' no es un elemento terciario válido. Los secundarios de <complexType> de los elementos <redefine> deben tener descendientes de <extension> o <restriction>, con atributos de ''base'' que hagan referencia a sí mismos.
+        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}'' no tiene un atributo de ''base'' que hace referencia al elemento redefinido, ''{1}''. Los secundarios de <complexType> de los elementos <redefine> deben tener descendientes de <extension> o <restriction>, con atributos de ''base'' que hagan referencia a sí mismos.
+        src-redefine.6.1.1 = src-redefine.6.1.1: Si un secundario de grupo de un elemento <redefine> contiene un grupo que hace referencia a sí mismo, debe tener exactamente 1; éste tiene ''{0}''.
+        src-redefine.6.1.2 = src-redefine.6.1.2: El grupo ''{0}'', que contiene una referencia a un grupo que se está redefiniendo debe tener un valor de ''minOccurs'' = ''maxOccurs'' = 1.
+        src-redefine.6.2.1 = src-redefine.6.2.1: No hay ningún grupo en el esquema redefinido con un nombre que coincida con ''{0}''.
+        src-redefine.6.2.2 = src-redefine.6.2.2: El grupo ''{0}'' no restringe correctamente al grupo que redefine; se ha violado la restricción: ''{1}''.
+        src-redefine.7.1 = src-redefine.7.1: Si un secundario de attributeGroup de un elemento <redefine> contiene un valor de attributeGroup que hace referencia a sí mismo, debe tener exactamente 1; éste tiene {0}.
+        src-redefine.7.2.1 = src-redefine.7.2.1: No hay ningún valor de attributeGroup en el esquema redefinido con un nombre que coincida con ''{0}''.
+        src-redefine.7.2.2 = src-redefine.7.2.2: el valor de attributeGroup ''{0}'' no restringe correctamente el valor de attributeGroup que redefine; se ha violado la restricción: ''{1}''.
         src-resolve = src-resolve: No se puede resolver el nombre ''{0}'' para un componente ''{1}''.
-        src-resolve.4.1 = src-resolve.4.1: Error al resolver el componente ''{2}''. Se ha detectado que ''{2}'' no tiene espacio de nombres, pero no se puede hacer referencia a los componentes sin espacio de nombres de destino desde el documento de esquema ''{0}''. Si se pretende que''{2}'' tenga un espacio de nombres, puede que sea necesario proporcionar un prefijo. Si se pretende que ''{2}'' no tenga ning\u00FAn espacio de nombres, es necesario agregar un atributo ''import'' sin un atributo "namespace" a ''{0}''.
-        src-resolve.4.2 = src-resolve.4.2: Error al resolver el componente ''{2}''. Se ha detectado que ''{2}'' est\u00E1 en el espacio de nombres ''{1}'', pero no se puede hacer referencia a los componentes de este espacio de nombres desde el documento de esquema ''{0}''. Si es el espacio de nombres incorrecto, puede que sea necesario cambiar el prefijo ''{2}''. Si es el espacio de nombres correcto, es necesario agregar la etiqueta ''import'' correspondiente a ''{0}''.
-        src-simple-type.2.a = src-simple-type.2.a: Se ha encontrado un elemento <restriction> que tiene un [atributo] base y un elemento <simpleType> entre sus [secundarios]. S\u00F3lo se permite uno.
+        src-resolve.4.1 = src-resolve.4.1: Error al resolver el componente ''{2}''. Se ha detectado que ''{2}'' no tiene espacio de nombres, pero no se puede hacer referencia a los componentes sin espacio de nombres de destino desde el documento de esquema ''{0}''. Si se pretende que''{2}'' tenga un espacio de nombres, puede que sea necesario proporcionar un prefijo. Si se pretende que ''{2}'' no tenga ningún espacio de nombres, es necesario agregar un atributo ''import'' sin un atributo "namespace" a ''{0}''.
+        src-resolve.4.2 = src-resolve.4.2: Error al resolver el componente ''{2}''. Se ha detectado que ''{2}'' está en el espacio de nombres ''{1}'', pero no se puede hacer referencia a los componentes de este espacio de nombres desde el documento de esquema ''{0}''. Si es el espacio de nombres incorrecto, puede que sea necesario cambiar el prefijo ''{2}''. Si es el espacio de nombres correcto, es necesario agregar la etiqueta ''import'' correspondiente a ''{0}''.
+        src-simple-type.2.a = src-simple-type.2.a: Se ha encontrado un elemento <restriction> que tiene un [atributo] base y un elemento <simpleType> entre sus [secundarios]. Sólo se permite uno.
         src-simple-type.2.b = src-simple-type.2.b: Se ha encontrado un elemento <restriction> que no tiene ni un [atributo] base ni un elemento <simpleType> entre sus [secundarios]. Se requiere uno.
-        src-simple-type.3.a = src-simple-type.3.a: Se ha encontrado un elemento <list> que tiene un [atributo] itemType y un elemento <simpleType> entre sus [secundarios]. S\u00F3lo se permite uno.
+        src-simple-type.3.a = src-simple-type.3.a: Se ha encontrado un elemento <list> que tiene un [atributo] itemType y un elemento <simpleType> entre sus [secundarios]. Sólo se permite uno.
         src-simple-type.3.b = src-simple-type.3.b: Se ha encontrado un elemento <list> que no tiene ni un [atributo] itemType ni un elemento <simpleType> entre sus [secundarios]. Se requiere uno.
-        src-single-facet-value = src-single-facet-value: La faceta ''{0}'' est\u00E1 definida m\u00E1s de una vez.
-        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: Un elemento <union> debe tener un [atributo] memberTypes no vac\u00EDo o al menos un elemento <simpleType> entre sus [secundarios].
+        src-single-facet-value = src-single-facet-value: La faceta ''{0}'' está definida más de una vez.
+        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: Un elemento <union> debe tener un [atributo] memberTypes no vacío o al menos un elemento <simpleType> entre sus [secundarios].
 
 #constraint valid (3.X.6)
 
         ag-props-correct.2 = ag-props-correct.2: Error en el grupo de atributos ''{0}''. Se han especificado usos de atributo duplicados con el mismo nombre y espacio de nombres de destino. El nombre del uso de atributo duplicado es ''{1}''.
         ag-props-correct.3 = ag-props-correct.3: Error en el grupo de atributos ''{0}''. Dos declaraciones de atributo, ''{1}'' y ''{2}'', tienen tipos que se derivan del identificador.
-        a-props-correct.2 = a-props-correct.2: Valor de restricci\u00F3n de valor ''{1}'' no v\u00E1lido en el atributo ''{0}''.
+        a-props-correct.2 = a-props-correct.2: Valor de restricción de valor ''{1}'' no válido en el atributo ''{0}''.
         a-props-correct.3 = a-props-correct.3: El atributo ''{0}'' no puede utilizar ''fixed'' ni ''default'', porque el valor de '{'type definition'}' del atributo es el identificador o se deriva del identificador.
-        au-props-correct.2 = au-props-correct.2: En la declaraci\u00F3n de atributo de ''{0}'', se ha especificado un valor fijo de ''{1}''. Por lo tanto, si el uso del atributo que hace referencia a ''{0}'' tambi\u00E9n tiene un valor de '{'value constraint'}', debe fijarse y el valor debe ser ''{1}''.
-        cos-all-limited.1.2 = cos-all-limited.1.2:Debe aparecer un grupo de modelos 'all' en una part\u00EDcula con '{'min occurs'}' = '{'max occurs'}' = 1 y dicha part\u00EDcula debe formar parte de un par que constituya el valor de '{'content type'}' de una definici\u00F3n de tipo complejo.
-        cos-all-limited.2 = cos-all-limited.2: El valor de '{'max occurs'}' de un elemento de un grupo de modelos ''all'' debe ser 0 o 1. El valor ''{0}'' del elemento ''{1}'' no es v\u00E1lido.
+        au-props-correct.2 = au-props-correct.2: En la declaración de atributo de ''{0}'', se ha especificado un valor fijo de ''{1}''. Por lo tanto, si el uso del atributo que hace referencia a ''{0}'' también tiene un valor de '{'value constraint'}', debe fijarse y el valor debe ser ''{1}''.
+        cos-all-limited.1.2 = cos-all-limited.1.2:Debe aparecer un grupo de modelos 'all' en una partícula con '{'min occurs'}' = '{'max occurs'}' = 1 y dicha partícula debe formar parte de un par que constituya el valor de '{'content type'}' de una definición de tipo complejo.
+        cos-all-limited.2 = cos-all-limited.2: El valor de '{'max occurs'}' de un elemento de un grupo de modelos ''all'' debe ser 0 o 1. El valor ''{0}'' del elemento ''{1}'' no es válido.
         cos-applicable-facets = cos-applicable-facets: El tipo {1} no permite la faceta ''{0}''.
-        cos-ct-extends.1.1 = cos-ct-extends.1.1: El tipo ''{0}'' se ha derivado por extensi\u00F3n del tipo ''{1}''. Sin embargo, el atributo ''final'' de ''{1}'' proh\u00EDbe la derivaci\u00F3n por extensi\u00F3n.
-        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: El tipo de contenido de un tipo derivado y el de su base deben ser mixtos o ser ambos s\u00F3lo de elemento. El tipo ''{0}'' es de s\u00F3lo elemento, pero su tipo base no lo es.
-        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: El tipo de contenido de un tipo derivado y el de su base deben ser mixtos o ser ambos s\u00F3lo de elemento. El tipo ''{0}'' es mixto, pero su tipo base no lo es.
+        cos-ct-extends.1.1 = cos-ct-extends.1.1: El tipo ''{0}'' se ha derivado por extensión del tipo ''{1}''. Sin embargo, el atributo ''final'' de ''{1}'' prohíbe la derivación por extensión.
+        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: El tipo de contenido de un tipo derivado y el de su base deben ser mixtos o ser ambos sólo de elemento. El tipo ''{0}'' es de sólo elemento, pero su tipo base no lo es.
+        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: El tipo de contenido de un tipo derivado y el de su base deben ser mixtos o ser ambos sólo de elemento. El tipo ''{0}'' es mixto, pero su tipo base no lo es.
         cos-element-consistent = cos-element-consistent: Error para el tipo ''{0}''. Aparecen en el grupo de modelos varios elementos con el nombre ''{1}'' y con tipos diferentes.
-        cos-list-of-atomic = cos-list-of-atomic: En la definici\u00F3n de tipo de lista ''{0}'', el tipo ''{1}'' es un tipo de elemento de lista no v\u00E1lido porque no es at\u00F3mico (''{1}'' es un tipo de lista o un tipo de uni\u00F3n que contiene una lista).
-        cos-nonambig = cos-nonambig: {0} y {1} (o los elementos de su grupo de sustituci\u00F3n) violan la "atribuci\u00F3n de part\u00EDcula \u00FAnica". Durante la validaci\u00F3n a partir de este esquema, se crear\u00E1 ambig\u00FCedad para estas dos part\u00EDculas.
-        cos-particle-restrict.a = cos-particle-restrict.a: La part\u00EDcula derivada est\u00E1 vac\u00EDa y la base no se puede vaciar.
-        cos-particle-restrict.b = cos-particle-restrict.b: La part\u00EDcula base est\u00E1 vac\u00EDa, pero la part\u00EDcula derivada no.
-        cos-particle-restrict.2 = cos-particle-restrict.2: Restricci\u00F3n de part\u00EDcula prohibida: ''{0}''.
-        cos-st-restricts.1.1 = cos-st-restricts.1.1: El tipo ''{1}'' es at\u00F3mico, por lo que su '{'base type definition'}', ''{0}'', debe ser una definici\u00F3n de tipo simple at\u00F3mico o un tipo de dato primitivo incorporado.
-        cos-st-restricts.2.1 = cos-st-restricts.2.1: En la definici\u00F3n de tipo de lista ''{0}'', el tipo ''{1}'' es un tipo de elemento no v\u00E1lido porque es un tipo de lista o un tipo de uni\u00F3n que contiene una lista.
+        cos-list-of-atomic = cos-list-of-atomic: En la definición de tipo de lista ''{0}'', el tipo ''{1}'' es un tipo de elemento de lista no válido porque no es atómico (''{1}'' es un tipo de lista o un tipo de unión que contiene una lista).
+        cos-nonambig = cos-nonambig: {0} y {1} (o los elementos de su grupo de sustitución) violan la "atribución de partícula única". Durante la validación a partir de este esquema, se creará ambigüedad para estas dos partículas.
+        cos-particle-restrict.a = cos-particle-restrict.a: La partícula derivada está vacía y la base no se puede vaciar.
+        cos-particle-restrict.b = cos-particle-restrict.b: La partícula base está vacía, pero la partícula derivada no.
+        cos-particle-restrict.2 = cos-particle-restrict.2: Restricción de partícula prohibida: ''{0}''.
+        cos-st-restricts.1.1 = cos-st-restricts.1.1: El tipo ''{1}'' es atómico, por lo que su '{'base type definition'}', ''{0}'', debe ser una definición de tipo simple atómico o un tipo de dato primitivo incorporado.
+        cos-st-restricts.2.1 = cos-st-restricts.2.1: En la definición de tipo de lista ''{0}'', el tipo ''{1}'' es un tipo de elemento no válido porque es un tipo de lista o un tipo de unión que contiene una lista.
         cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: El componente '{'final'}' de '{'item type definition'}', ''{0}'', contiene ''list''. Significa que ''{0}'' no se puede utilizar como un tipo de elemento para el tipo de lista ''{1}''.
-        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: El componente '{'final'}' de '{'member type definitions'}', ''{0}'', contiene ''union''. Significa que ''{0}'' no se puede utilizar como un tipo de miembro para el tipo de uni\u00F3n ''{1}''.
-        cos-valid-default.2.1 = cos-valid-default.2.1: El elemento ''{0}'' contiene una restricci\u00F3n de valor y debe tener un modelo de contenido mixto o simple.
-        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Como el elemento ''{0}'' tiene una '{'value constraint'}' y su definici\u00F3n de tipo tiene un '{'content type'}' mixto, la part\u00EDcula de '{'content type'}' debe poder vaciarse.
+        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: El componente '{'final'}' de '{'member type definitions'}', ''{0}'', contiene ''union''. Significa que ''{0}'' no se puede utilizar como un tipo de miembro para el tipo de unión ''{1}''.
+        cos-valid-default.2.1 = cos-valid-default.2.1: El elemento ''{0}'' contiene una restricción de valor y debe tener un modelo de contenido mixto o simple.
+        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Como el elemento ''{0}'' tiene una '{'value constraint'}' y su definición de tipo tiene un '{'content type'}' mixto, la partícula de '{'content type'}' debe poder vaciarse.
         c-props-correct.2 = c-props-correct.2: La cardinalidad de los campos de la referencia de clave ''{0}'' y la clave ''{1}'' deben coincidir.
-        ct-props-correct.3 = ct-props-correct.3: Se han detectado definiciones circulares para el tipo complejo ''{0}''. Significa que ''{0}'' est\u00E1 contenido en su propia jerarqu\u00EDa de tipos, lo que es un error.
+        ct-props-correct.3 = ct-props-correct.3: Se han detectado definiciones circulares para el tipo complejo ''{0}''. Significa que ''{0}'' está contenido en su propia jerarquía de tipos, lo que es un error.
         ct-props-correct.4 = ct-props-correct.4: Error para el tipo ''{0}''. Se han especificado usos de atributo duplicados con el mismo nombre y espacio de nombres de destino. El nombre del uso de atributo duplicado es ''{1}''.
         ct-props-correct.5 = ct-props-correct.5: Error para el tipo ''{0}''. Dos declaraciones de atributo, ''{1}'' y ''{2}'','' tienen tipos que se derivan del identificador.
-        derivation-ok-restriction.1 = derivation-ok-restriction.1: El tipo ''{0}'' se ha derivado por restricci\u00F3n del tipo ''{1}''. Sin embargo, ''{1}'' tiene una propiedad '{'final'}' que proh\u00EDbe la derivaci\u00F3n por restricci\u00F3n.
+        derivation-ok-restriction.1 = derivation-ok-restriction.1: El tipo ''{0}'' se ha derivado por restricción del tipo ''{1}''. Sin embargo, ''{1}'' tiene una propiedad '{'final'}' que prohíbe la derivación por restricción.
         derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo tiene un valor ''use'' de ''{2}'', que es incoherente con el valor de ''required'' en un uso de atributo coincidente del tipo base.
-        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo tiene el tipo ''{2}'', que no se ha derivado de forma v\u00E1lida de ''{3}'', el tipo de uso de atributo coincidente del tipo base.
-        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo tiene una restricci\u00F3n de valor efectivo que no es fija y la restricci\u00F3n de valor efectivo del uso de atributo coincidente en el tipo base es fija.
-        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo tiene una restricci\u00F3n de valor efectivo fija con un valor de ''{2}'', que no es coherente con el valor de ''{3}'' para la restricci\u00F3n de valor efectivo fija del uso de atributo coincidente en el tipo base.
-        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo no tiene un uso de atributo coincidente en la base y el tipo base no tiene un atributo de comod\u00EDn.
-        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo no tiene un uso de atributo coincidente en la base y el comod\u00EDn en el tipo base no permite el espacio de nombres ''{2}'' de este uso de atributo.
-        derivation-ok-restriction.3 = derivation-ok-restriction.3: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en el tipo base tiene el valor REQUIRED como true, pero no hay ning\u00FAn uso de atributo coincidente en el tipo derivado.
-        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: Error para el tipo ''{0}''. La derivaci\u00F3n tiene un comod\u00EDn de atributo, pero la base no tiene uno.
-        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: Error para el tipo ''{0}''. El comod\u00EDn de la derivaci\u00F3n no es un subjuego de comodines v\u00E1lido del de la base.
-        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: Error para el tipo ''{0}''. El contenido del proceso del comod\u00EDn de la derivaci\u00F3n ({1}) es m\u00E1s d\u00E9bil que el de la base ({2}).
-        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: Error para el tipo ''{0}''. El tipo de contenido simple de este tipo, ''{1}'', no es una restricci\u00F3n v\u00E1lida del tipo de contenido simple de la base, ''{2}''.
-        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: Error para el tipo ''{0}''. El tipo de contenido de este tipo est\u00E1 vac\u00EDo, pero el tipo de contenido de la base, ''{1}'', no est\u00E1 vac\u00EDo o no se puede vaciar.
+        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo tiene el tipo ''{2}'', que no se ha derivado de forma válida de ''{3}'', el tipo de uso de atributo coincidente del tipo base.
+        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo tiene una restricción de valor efectivo que no es fija y la restricción de valor efectivo del uso de atributo coincidente en el tipo base es fija.
+        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo tiene una restricción de valor efectivo fija con un valor de ''{2}'', que no es coherente con el valor de ''{3}'' para la restricción de valor efectivo fija del uso de atributo coincidente en el tipo base.
+        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo no tiene un uso de atributo coincidente en la base y el tipo base no tiene un atributo de comodín.
+        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo no tiene un uso de atributo coincidente en la base y el comodín en el tipo base no permite el espacio de nombres ''{2}'' de este uso de atributo.
+        derivation-ok-restriction.3 = derivation-ok-restriction.3: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en el tipo base tiene el valor REQUIRED como true, pero no hay ningún uso de atributo coincidente en el tipo derivado.
+        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: Error para el tipo ''{0}''. La derivación tiene un comodín de atributo, pero la base no tiene uno.
+        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: Error para el tipo ''{0}''. El comodín de la derivación no es un subjuego de comodines válido del de la base.
+        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: Error para el tipo ''{0}''. El contenido del proceso del comodín de la derivación ({1}) es más débil que el de la base ({2}).
+        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: Error para el tipo ''{0}''. El tipo de contenido simple de este tipo, ''{1}'', no es una restricción válida del tipo de contenido simple de la base, ''{2}''.
+        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: Error para el tipo ''{0}''. El tipo de contenido de este tipo está vacío, pero el tipo de contenido de la base, ''{1}'', no está vacío o no se puede vaciar.
         derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: Error para el tipo ''{0}''. El tipo de contenido de este tipo es mixto, pero el tipo de contenido de la base, ''{1}'', no lo es.
-        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: Error para el tipo ''{0}''. La part\u00EDcula del tipo no es una restricci\u00F3n v\u00E1lida de la part\u00EDcula de la base.
-        enumeration-required-notation = enumeration-required-notation: El tipo NOTATION ''{0}'', utilizado por {2} ''{1}'', debe tener un valor de faceta de enumeraci\u00F3n que especifique los elementos de notaci\u00F3n que utiliza este tipo.
-        enumeration-valid-restriction = enumeration-valid-restriction: El valor de enumeraci\u00F3n ''{0}'' no se encuentra en el espacio reservado para el valor del tipo base, {1}.
-        e-props-correct.2 = e-props-correct.2: Valor de restricci\u00F3n de valor ''{1}'' no v\u00E1lido en el elemento ''{0}''.
-        e-props-correct.4 = e-props-correct.4: El valor de '{'type definition'}' del elemento ''{0}'' no se ha derivado de forma v\u00E1lida del valor de '{'type definition'}' de substitutionHead ''{1}'' o la propiedad '{'substitution group exclusions'}' de ''{1}'' no permite esta derivaci\u00F3n.
+        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: Error para el tipo ''{0}''. La partícula del tipo no es una restricción válida de la partícula de la base.
+        enumeration-required-notation = enumeration-required-notation: El tipo NOTATION ''{0}'', utilizado por {2} ''{1}'', debe tener un valor de faceta de enumeración que especifique los elementos de notación que utiliza este tipo.
+        enumeration-valid-restriction = enumeration-valid-restriction: El valor de enumeración ''{0}'' no se encuentra en el espacio reservado para el valor del tipo base, {1}.
+        e-props-correct.2 = e-props-correct.2: Valor de restricción de valor ''{1}'' no válido en el elemento ''{0}''.
+        e-props-correct.4 = e-props-correct.4: El valor de '{'type definition'}' del elemento ''{0}'' no se ha derivado de forma válida del valor de '{'type definition'}' de substitutionHead ''{1}'' o la propiedad '{'substitution group exclusions'}' de ''{1}'' no permite esta derivación.
         e-props-correct.5 = e-props-correct.5: Un valor de '{'value constraint'}' no debe estar presente en el elemento ''{0}'', porque la '{'type definition'}' del elemento o el '{'content type'}' de '{'type definition'}' es un identificador o se deriva del identificador.
-        e-props-correct.6 = e-props-correct.6: Se ha detectado un grupo de sustituci\u00F3n circular para el elemento ''{0}''.
-        fractionDigits-valid-restriction = fractionDigits-valid-restriction: En la definici\u00F3n de {2}, el valor ''{0}'' para la faceta ''fractionDigits'' no es v\u00E1lido porque debe ser menor o igual que el valor de ''fractionDigits'' que se ha definido en ''{1}'' en uno de los tipos de ascendientes.
-        fractionDigits-totalDigits = fractionDigits-totalDigits: En la definici\u00F3n de {2}, el valor ''{0}'' para la faceta ''fractionDigits'' no es v\u00E1lido porque debe ser menor o igual que el valor de ''totalDigits'', que es ''{1}''.
+        e-props-correct.6 = e-props-correct.6: Se ha detectado un grupo de sustitución circular para el elemento ''{0}''.
+        fractionDigits-valid-restriction = fractionDigits-valid-restriction: En la definición de {2}, el valor ''{0}'' para la faceta ''fractionDigits'' no es válido porque debe ser menor o igual que el valor de ''fractionDigits'' que se ha definido en ''{1}'' en uno de los tipos de ascendientes.
+        fractionDigits-totalDigits = fractionDigits-totalDigits: En la definición de {2}, el valor ''{0}'' para la faceta ''fractionDigits'' no es válido porque debe ser menor o igual que el valor de ''totalDigits'', que es ''{1}''.
         length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: Para el tipo {0}, es un error que el valor de la longitud ''{1}'' sea inferior al valor de minLength ''{2}''.
-        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: Para el tipo {0}, es un error que la base no tener una faceta de minLength si la restricci\u00F3n actual tiene la faceta de minLength y la restricci\u00F3n o base actual tiene la faceta de longitud.
+        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: Para el tipo {0}, es un error que la base no tener una faceta de minLength si la restricción actual tiene la faceta de minLength y la restricción o base actual tiene la faceta de longitud.
         length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: Para el tipo {0}, es un error que el valor de minLength actual ''{1}'' no sea igual al valor de minLength de base ''{2}''.
         length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: Para el tipo {0}, es un error que el valor de la longitud ''{1}'' sea superior al valor de maxLength ''{2}''.
-        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: Para el tipo {0}, es un error que la base no tener una faceta de maxLength si la restricci\u00F3n actual tiene la faceta de maxLength y la restricci\u00F3n o base actual tiene la faceta de longitud.
+        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: Para el tipo {0}, es un error que la base no tener una faceta de maxLength si la restricción actual tiene la faceta de maxLength y la restricción o base actual tiene la faceta de longitud.
         length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: Para el tipo {0}, es un error que el valor de maxLength actual ''{1}'' no sea igual al valor de maxLength de base ''{2}''.
         length-valid-restriction = length-valid-restriction: Error para el tipo ''{2}''. El valor de la longitud = ''{0}'' debe ser igual que el valor del tipo base ''{1}''.
         maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: Error para el tipo ''{2}''. El valor de maxExclusive =''{0}'' debe ser menor o igual que el valor de maxExclusive del tipo base ''{1}''.
@@ -235,89 +235,89 @@
         maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: Error para el tipo ''{2}''. El valor de maxInclusive =''{0}'' debe ser menor que el valor de maxExclusive del tipo base ''{1}''.
         maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: Error para el tipo ''{2}''. El valor de maxInclusive =''{0}'' debe ser mayor o igual que el valor de minInclusive del tipo base ''{1}''.
         maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: Error para el tipo ''{2}''. El valor de maxInclusive =''{0}'' debe ser mayor que el valor de minExclusive del tipo base ''{1}''.
-        maxLength-valid-restriction = maxLength-valid-restriction: En la definici\u00F3n de {2}, el valor de maxLength = ''{0}'' debe ser menor o igual que el del tipo base ''{1}''.
-        mg-props-correct.2 = mg-props-correct.2: Se han detectado definiciones circulares para el grupo ''{0}''. El seguimiento recurrente de los valores '{'term'}' de las part\u00EDculas provoca una part\u00EDcula cuyo valor de '{'term'}' es el mismo grupo.
-        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: En la definici\u00F3n de {2}, el valor de minExclusive = ''{0}'' debe ser menor o igual que el valor de maxExclusive = ''{1}''.
-        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: En la definici\u00F3n de {2}, el valor de minExclusive = ''{0}''debe ser menor que el valor de maxInclusive = ''{1}''.
+        maxLength-valid-restriction = maxLength-valid-restriction: En la definición de {2}, el valor de maxLength = ''{0}'' debe ser menor o igual que el del tipo base ''{1}''.
+        mg-props-correct.2 = mg-props-correct.2: Se han detectado definiciones circulares para el grupo ''{0}''. El seguimiento recurrente de los valores '{'term'}' de las partículas provoca una partícula cuyo valor de '{'term'}' es el mismo grupo.
+        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: En la definición de {2}, el valor de minExclusive = ''{0}'' debe ser menor o igual que el valor de maxExclusive = ''{1}''.
+        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: En la definición de {2}, el valor de minExclusive = ''{0}''debe ser menor que el valor de maxInclusive = ''{1}''.
         minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: Error para el tipo ''{2}''. El valor de minExclusive =''{0}'' debe ser mayor o igual que el valor de minExclusive del tipo base ''{1}''.
         minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2: Error para el tipo ''{2}''. El valor de minExclusive =''{0}'' debe ser menor o igual que el valor de maxInclusive del tipo base ''{1}''.
         minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3: Error para el tipo ''{2}''. El valor de minExclusive =''{0}'' debe ser mayor o igual que el valor de minInclusive del tipo base ''{1}''.
         minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: Error para el tipo ''{2}''. El valor de minExclusive =''{0}'' debe ser menor que el valor de maxExclusive del tipo base ''{1}''.
-        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: En la definici\u00F3n de {2}, el valor de minInclusive = ''{0}'' debe ser menor o igual que el valor de maxInclusive = ''{1}''.
-        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: En la definici\u00F3n de {2}, el valor de minInclusive = ''{0}'' debe ser menor que el valor de maxExclusive = ''{1}''.
+        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: En la definición de {2}, el valor de minInclusive = ''{0}'' debe ser menor o igual que el valor de maxInclusive = ''{1}''.
+        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: En la definición de {2}, el valor de minInclusive = ''{0}'' debe ser menor que el valor de maxExclusive = ''{1}''.
         minInclusive-minExclusive = minInclusive-minExclusive: Es un error especificar minInclusive y minExclusive para el mismo tipo de dato. En {2}, minInclusive = ''{0}'' y minExclusive = ''{1}''.
         minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: Error para el tipo ''{2}''. El valor de minInclusive =''{0}'' debe ser mayor o igual que el valor de minInclusive del tipo base ''{1}''.
         minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: Error para el tipo ''{2}''. El valor de minInclusive =''{0}'' debe ser menor o igual que el valor de maxInclusive del tipo base ''{1}''.
         minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: Error para el tipo ''{2}''. El valor de minInclusive =''{0}'' debe ser mayor que el valor de minExclusive del tipo base ''{1}''.
         minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: Error para el tipo ''{2}''. El valor de minInclusive =''{0}'' debe ser menor que el valor de maxExclusive del tipo base ''{1}''.
-        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: En la definici\u00F3n de {2}, el valor de minLength = ''{0}'' debe ser menor que el valor de maxLength = ''{1}''.
-        minLength-valid-restriction = minLength-valid-restriction: En la definici\u00F3n de {2}, el valor de minLength = ''{0}'' debe ser mayor o igual que el del tipo base, ''{1}''.
-        no-xmlns = no-xmlns: El valor de {name} de una declaraci\u00F3n de atributo no debe coincidir con 'xmlns'.
-        no-xsi = no-xsi: El valor de '{'target namespace'}' de una declaraci\u00F3n de atributo no debe coincidir con ''{0}''.
-        p-props-correct.2.1 = p-props-correct.2.1: En la declaraci\u00F3n de ''{0}'', el valor de ''minOccurs'' es ''{1}'', pero no debe ser superior al valor de ''maxOccurs'', que es ''{2}''.
-        rcase-MapAndSum.1 = rcase-MapAndSum.1: No existe ninguna asignaci\u00F3n funcional completa entre las part\u00EDculas.
-        rcase-MapAndSum.2 = rcase-MapAndSum.2: El rango de incidencia del grupo, ({0},{1}), no es una restricci\u00F3n v\u00E1lida del rango de incidencia del grupo base, ({2},{3}).
+        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: En la definición de {2}, el valor de minLength = ''{0}'' debe ser menor que el valor de maxLength = ''{1}''.
+        minLength-valid-restriction = minLength-valid-restriction: En la definición de {2}, el valor de minLength = ''{0}'' debe ser mayor o igual que el del tipo base, ''{1}''.
+        no-xmlns = no-xmlns: El valor de {name} de una declaración de atributo no debe coincidir con 'xmlns'.
+        no-xsi = no-xsi: El valor de '{'target namespace'}' de una declaración de atributo no debe coincidir con ''{0}''.
+        p-props-correct.2.1 = p-props-correct.2.1: En la declaración de ''{0}'', el valor de ''minOccurs'' es ''{1}'', pero no debe ser superior al valor de ''maxOccurs'', que es ''{2}''.
+        rcase-MapAndSum.1 = rcase-MapAndSum.1: No existe ninguna asignación funcional completa entre las partículas.
+        rcase-MapAndSum.2 = rcase-MapAndSum.2: El rango de incidencia del grupo, ({0},{1}), no es una restricción válida del rango de incidencia del grupo base, ({2},{3}).
         rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: Los elementos tienen nombres y espacios de nombres de destino distintos: El elemento''{0}'' en el espacio de nombres ''{1}'' y el elemento ''{2}'' en el espacio de nombres ''{3}''.
-        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Error para la part\u00EDcula cuyo valor de '{'term'}' es la declaraci\u00F3n de elemento ''{0}''. El valor de '{'nillable'}' de la declaraci\u00F3n de elemento es true, pero la part\u00EDcula correspondiente en el tipo base tiene una declaraci\u00F3n de elemento cuyo valor de '{'nillable'}' es false.
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Error para la part\u00EDcula cuyo valor de '{'term'}' es la declaraci\u00F3n de elemento ''{0}''. Su rango de incidencia, ({1},{2}), no es una restricci\u00F3n v\u00E1lida del rango, ({3},{4}, de la part\u00EDcula correspondiente en el tipo base.
+        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Error para la partícula cuyo valor de '{'term'}' es la declaración de elemento ''{0}''. El valor de '{'nillable'}' de la declaración de elemento es true, pero la partícula correspondiente en el tipo base tiene una declaración de elemento cuyo valor de '{'nillable'}' es false.
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Error para la partícula cuyo valor de '{'term'}' es la declaración de elemento ''{0}''. Su rango de incidencia, ({1},{2}), no es una restricción válida del rango, ({3},{4}, de la partícula correspondiente en el tipo base.
         rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: El elemento ''{0}'' no es fijo, pero el elemento correspondiente en el tipo base es fijo con el valor ''{1}''.
         rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: El elemento ''{0}'' es fijo con el valor ''{1}'', pero el elemento correspondiente en el tipo base es fijo con el valor ''{2}''.
         rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: Las restricciones de identidad del elemento ''{0}'' no son un subjuego de las de la base.
         rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: Las sustituciones no permitidas del elemento ''{0}'' no son un subjuego de las de la base.
-        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: El tipo de elemento ''{0}'', ''{1}'', no est\u00E1 derivado del tipo del elemento base, ''{2}''.
-        rcase-NSCompat.1 = rcase-NSCompat.1: El elemento ''{0}'' tiene un espacio de nombres ''{1}'' que no est\u00E1 permitido por el comod\u00EDn de la base.
-        rcase-NSCompat.2 = rcase-NSCompat.2: Error para la part\u00EDcula cuyo valor de '{'term'}' es la declaraci\u00F3n de elemento ''{0}''. Su rango de incidencia, ({1},{2}), no es una restricci\u00F3n v\u00E1lida del rango, ({3},{4}, de la part\u00EDcula correspondiente en el tipo base.
-        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: No existe ninguna asignaci\u00F3n funcional completa entre las part\u00EDculas.
-        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: El rango de incidencia del grupo, ({0},{1}), no es una restricci\u00F3n v\u00E1lida del rango de comod\u00EDn de la base, ({2},{3}).
-        rcase-NSSubset.1 = rcase-NSSubset.1: El comod\u00EDn no es un subjuego del comod\u00EDn correspondiente de la base.
-        rcase-NSSubset.2 = rcase-NSSubset.2: El rango de incidencia del comod\u00EDn, ({0},{1}), no es una restricci\u00F3n v\u00E1lida del de la base, ({2},{3}).
-        rcase-NSSubset.3 = rcase-NSSubset.3: El contenido del proceso del comod\u00EDn, ''{0}'', es m\u00E1s d\u00E9bil que el de la base, ''{1}''.
-        rcase-Recurse.1 = rcase-Recurse.1: El rango de incidencia del grupo, ({0},{1}), no es una restricci\u00F3n v\u00E1lida del rango de incidencia del grupo base, ({2},{3}).
-        rcase-Recurse.2 = rcase-Recurse.2: No existe ninguna asignaci\u00F3n funcional completa entre las part\u00EDculas.
-        rcase-RecurseLax.1 = rcase-RecurseLax.1: El rango de incidencia del grupo, ({0},{1}), no es una restricci\u00F3n v\u00E1lida del rango de incidencia del grupo base, ({2},{3}).
-        rcase-RecurseLax.2 = rcase-RecurseLax.2: No existe ninguna asignaci\u00F3n funcional completa entre las part\u00EDculas.
-        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: El rango de incidencia del grupo, ({0},{1}), no es una restricci\u00F3n v\u00E1lida del rango de incidencia del grupo base, ({2},{3}).
-        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: No existe ninguna asignaci\u00F3n funcional completa entre las part\u00EDculas.
+        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: El tipo de elemento ''{0}'', ''{1}'', no está derivado del tipo del elemento base, ''{2}''.
+        rcase-NSCompat.1 = rcase-NSCompat.1: El elemento ''{0}'' tiene un espacio de nombres ''{1}'' que no está permitido por el comodín de la base.
+        rcase-NSCompat.2 = rcase-NSCompat.2: Error para la partícula cuyo valor de '{'term'}' es la declaración de elemento ''{0}''. Su rango de incidencia, ({1},{2}), no es una restricción válida del rango, ({3},{4}, de la partícula correspondiente en el tipo base.
+        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: No existe ninguna asignación funcional completa entre las partículas.
+        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: El rango de incidencia del grupo, ({0},{1}), no es una restricción válida del rango de comodín de la base, ({2},{3}).
+        rcase-NSSubset.1 = rcase-NSSubset.1: El comodín no es un subjuego del comodín correspondiente de la base.
+        rcase-NSSubset.2 = rcase-NSSubset.2: El rango de incidencia del comodín, ({0},{1}), no es una restricción válida del de la base, ({2},{3}).
+        rcase-NSSubset.3 = rcase-NSSubset.3: El contenido del proceso del comodín, ''{0}'', es más débil que el de la base, ''{1}''.
+        rcase-Recurse.1 = rcase-Recurse.1: El rango de incidencia del grupo, ({0},{1}), no es una restricción válida del rango de incidencia del grupo base, ({2},{3}).
+        rcase-Recurse.2 = rcase-Recurse.2: No existe ninguna asignación funcional completa entre las partículas.
+        rcase-RecurseLax.1 = rcase-RecurseLax.1: El rango de incidencia del grupo, ({0},{1}), no es una restricción válida del rango de incidencia del grupo base, ({2},{3}).
+        rcase-RecurseLax.2 = rcase-RecurseLax.2: No existe ninguna asignación funcional completa entre las partículas.
+        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: El rango de incidencia del grupo, ({0},{1}), no es una restricción válida del rango de incidencia del grupo base, ({2},{3}).
+        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: No existe ninguna asignación funcional completa entre las partículas.
 #        We're using sch-props-correct.2 instead of the old src-redefine.1
 #        src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
-        sch-props-correct.2 = sch-props-correct.2: Un esquema no puede contener dos componentes globales con el mismo nombre; \u00E9ste contiene dos incidencias de ''{0}''.
-        st-props-correct.2 = st-props-correct.2: Se han detectado definiciones circulares para el tipo simple ''{0}''. Significa que ''{0}'' est\u00E1 contenido en su propia jerarqu\u00EDa de tipos, lo que es un error.
-        st-props-correct.3 = st-props-correct.3: Error para el tipo ''{0}''. El valor de '{'final'}' de '{'base type definition'}', ''{1}'', proh\u00EDbe la derivaci\u00F3n por restricci\u00F3n.
-        totalDigits-valid-restriction = totalDigits-valid-restriction: En la definici\u00F3n de {2}, el valor ''{0}'' para la faceta ''totalDigits'' no es v\u00E1lido porque debe ser menor o igual que el valor de ''totalDigits'' que se ha definido en ''{1}'' en uno de los tipos de ascendientes.
-        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: En la definici\u00F3n de {0}, el valor ''{1}'' para la faceta ''whitespace'' no es v\u00E1lido porque el valor de ''whitespace'' se ha definido en ''collapse'' en uno de los tipos de ascendientes.
-        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: En la definici\u00F3n de {0}, el valor ''preserve'' para la faceta ''whitespace'' no es v\u00E1lido porque el valor de ''whitespace'' se ha definido en ''replace'' en uno de los tipos de ascendientes.
+        sch-props-correct.2 = sch-props-correct.2: Un esquema no puede contener dos componentes globales con el mismo nombre; éste contiene dos incidencias de ''{0}''.
+        st-props-correct.2 = st-props-correct.2: Se han detectado definiciones circulares para el tipo simple ''{0}''. Significa que ''{0}'' está contenido en su propia jerarquía de tipos, lo que es un error.
+        st-props-correct.3 = st-props-correct.3: Error para el tipo ''{0}''. El valor de '{'final'}' de '{'base type definition'}', ''{1}'', prohíbe la derivación por restricción.
+        totalDigits-valid-restriction = totalDigits-valid-restriction: En la definición de {2}, el valor ''{0}'' para la faceta ''totalDigits'' no es válido porque debe ser menor o igual que el valor de ''totalDigits'' que se ha definido en ''{1}'' en uno de los tipos de ascendientes.
+        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: En la definición de {0}, el valor ''{1}'' para la faceta ''whitespace'' no es válido porque el valor de ''whitespace'' se ha definido en ''collapse'' en uno de los tipos de ascendientes.
+        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: En la definición de {0}, el valor ''preserve'' para la faceta ''whitespace'' no es válido porque el valor de ''whitespace'' se ha definido en ''replace'' en uno de los tipos de ascendientes.
 
 #schema for Schemas
 
-        s4s-att-invalid-value = s4s-att-invalid-value: Valor de atributo no v\u00E1lido para ''{1}'' en el elemento ''{0}''. Motivo registrado: {2}
+        s4s-att-invalid-value = s4s-att-invalid-value: Valor de atributo no válido para ''{1}'' en el elemento ''{0}''. Motivo registrado: {2}
         s4s-att-must-appear = s4s-att-must-appear: El atributo ''{1}'' debe aparecer en el elemento ''{0}''.
         s4s-att-not-allowed = s4s-att-not-allowed: El atributo ''{1}'' no puede aparecer en el elemento ''{0}''.
-        s4s-elt-invalid = s4s-elt-invalid: El elemento ''{0}'' no es un elemento v\u00E1lido en un documento de esquema.
+        s4s-elt-invalid = s4s-elt-invalid: El elemento ''{0}'' no es un elemento válido en un documento de esquema.
         s4s-elt-must-match.1 = s4s-elt-must-match.1: El contenido de ''{0}'' debe coincidir con {1}. Se ha encontrado un problema que comienza en: {2}.
         s4s-elt-must-match.2 = s4s-elt-must-match.2: El contenido de ''{0}'' debe coincidir con {1}. No se han encontrado suficientes elementos.
         # the "invalid-content" messages provide less information than the "must-match" counterparts above. They're used for complex types when providing a "match" would be an information dump
-        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: El contenido de ''{0}'' no es v\u00E1lido. El elemento ''{1}'' no es v\u00E1lido, est\u00E1 mal situado o aparece con demasiada frecuencia.
-        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: El contenido de ''{0}'' no es v\u00E1lido. El elemento ''{1}'' no puede estar vac\u00EDo.
-        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: Los elementos de tipo''{0}'' no pueden aparecer despu\u00E9s de las declaraciones como secundarios de un elemento de <schema>.
+        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: El contenido de ''{0}'' no es válido. El elemento ''{1}'' no es válido, está mal situado o aparece con demasiada frecuencia.
+        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: El contenido de ''{0}'' no es válido. El elemento ''{1}'' no puede estar vacío.
+        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: Los elementos de tipo''{0}'' no pueden aparecer después de las declaraciones como secundarios de un elemento de <schema>.
         s4s-elt-schema-ns = s4s-elt-schema-ns: El espacio de nombres del elemento ''{0}'' debe ser del espacio de nombres del esquema, ''http://www.w3.org/2001/XMLSchema''.
-        s4s-elt-character = s4s-elt-character: Los caracteres distintos de los espacios en blanco no est\u00E1n permitidos en elementos de esquema que no sean ''xs:appinfo'' y ''xs:documentation''. Se ha obtenido ''{0}''.
+        s4s-elt-character = s4s-elt-character: Los caracteres distintos de los espacios en blanco no están permitidos en elementos de esquema que no sean ''xs:appinfo'' y ''xs:documentation''. Se ha obtenido ''{0}''.
 
 # codes not defined by the spec
 
-        c-fields-xpaths = c-fields-xpaths: El valor de campo = ''{0}'' no es v\u00E1lido.
-        c-general-xpath = c-general-xpath: La expresi\u00F3n ''{0}'' no es v\u00E1lida con respecto al subjuego de XPath soportado por el esquema XML.
-        c-general-xpath-ns = c-general-xpath-ns: Un prefijo de espacio de nombres en la expresi\u00F3n XPath''{0}'' no estaba enlazado a ning\u00FAn espacio de nombres.
-        c-selector-xpath = c-selector-xpath: El valor de selector = ''{0}'' no es v\u00E1lido; los valores de Xpath en el selector no pueden contener atributos.
-        EmptyTargetNamespace = EmptyTargetNamespace: En el documento de esquema ''{0}'', el valor del atributo ''targetNamespace'' no puede ser una cadena vac\u00EDa.
-        FacetValueFromBase = FacetValueFromBase: En la declaraci\u00F3n de tipo ''{0}'', el valor ''{1}'' de la faceta ''{2}'' debe proceder del espacio reservado para el valor del tipo base, ''{3}''.
-        FixedFacetValue = FixedFacetValue: En la definici\u00F3n de {3}, el valor ''{1}'' para la faceta ''{0}'' no es v\u00E1lido porque el valor de ''{0}'' se ha definido en ''{2}'' en uno de los tipos de ascendientes y '{'fixed'}' = true.
-        InvalidRegex = InvalidRegex: El valor del patr\u00F3n ''{0}'' no es una expresi\u00F3n regular v\u00E1lida. El error registrado ha sido: ''{1}'' en la columna ''{2}''.
-        MaxOccurLimit = La configuraci\u00F3n actual del analizador no permite que la definici\u00F3n del valor del atributo maxOccurs sea mayor que {0}.
+        c-fields-xpaths = c-fields-xpaths: El valor de campo = ''{0}'' no es válido.
+        c-general-xpath = c-general-xpath: La expresión ''{0}'' no es válida con respecto al subjuego de XPath soportado por el esquema XML.
+        c-general-xpath-ns = c-general-xpath-ns: Un prefijo de espacio de nombres en la expresión XPath''{0}'' no estaba enlazado a ningún espacio de nombres.
+        c-selector-xpath = c-selector-xpath: El valor de selector = ''{0}'' no es válido; los valores de Xpath en el selector no pueden contener atributos.
+        EmptyTargetNamespace = EmptyTargetNamespace: En el documento de esquema ''{0}'', el valor del atributo ''targetNamespace'' no puede ser una cadena vacía.
+        FacetValueFromBase = FacetValueFromBase: En la declaración de tipo ''{0}'', el valor ''{1}'' de la faceta ''{2}'' debe proceder del espacio reservado para el valor del tipo base, ''{3}''.
+        FixedFacetValue = FixedFacetValue: En la definición de {3}, el valor ''{1}'' para la faceta ''{0}'' no es válido porque el valor de ''{0}'' se ha definido en ''{2}'' en uno de los tipos de ascendientes y '{'fixed'}' = true.
+        InvalidRegex = InvalidRegex: El valor del patrón ''{0}'' no es una expresión regular válida. El error registrado ha sido: ''{1}'' en la columna ''{2}''.
+        MaxOccurLimit = La configuración actual del analizador no permite que la definición del valor del atributo maxOccurs sea mayor que {0}.
         PublicSystemOnNotation = PublicSystemOnNotation: Al menos un valor de ''public'' y ''system'' debe aparecer en el elemento ''notation''.
-        SchemaLocation = SchemaLocation: El valor de schemaLocation = ''{0}'' debe tener un n\u00FAmero par de URI.
+        SchemaLocation = SchemaLocation: El valor de schemaLocation = ''{0}'' debe tener un número par de URI.
         TargetNamespace.1 = TargetNamespace.1: Se esperaba el espacio de nombres ''{0}'', pero el espacio de nombres de destino del documento de esquema es ''{1}''.
-        TargetNamespace.2 = TargetNamespace.2: No se esperaba ning\u00FAn espacio de nombres, pero el documento de esquema tiene un espacio de nombres de destino ''{1}''.
-        UndeclaredEntity = UndeclaredEntity: La entidad ''{0}'' no est\u00E1 declarada.
+        TargetNamespace.2 = TargetNamespace.2: No se esperaba ningún espacio de nombres, pero el documento de esquema tiene un espacio de nombres de destino ''{1}''.
+        UndeclaredEntity = UndeclaredEntity: La entidad ''{0}'' no está declarada.
         UndeclaredPrefix = UndeclaredPrefix: No se puede resolver ''{0}'' como QName: no se ha declarado el prefijo ''{1}''.
 
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties
index 8c56325eaac..7d320d2f187 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties
@@ -26,303 +26,303 @@
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
+        BadMessageKey = Le message d'erreur correspondant à la clé de message est introuvable.
         FormatFailed = Une erreur interne est survenue lors du formatage du message suivant :\n
 
 # For internal use
 
         Internal-Error = Erreur interne : {0}.
-        dt-whitespace = La valeur de facet de caract\u00E8re non imprimable n''est pas disponible pour le simpleType d''union ''{0}''
-        GrammarConflict = L'une des grammaires renvoy\u00E9es \u00E0 partir du pool de grammaires de l'utilisateur est en conflit avec une autre grammaire.
+        dt-whitespace = La valeur de facet de caractère non imprimable n''est pas disponible pour le simpleType d''union ''{0}''
+        GrammarConflict = L'une des grammaires renvoyées à partir du pool de grammaires de l'utilisateur est en conflit avec une autre grammaire.
 
 # Identity constraints
 
-        AbsentKeyValue = cvc-identity-constraint.4.2.1.a : L''\u00E9l\u00E9ment "{0}" n''a aucune valeur pour la cl\u00E9 "{1}".
-        DuplicateField = Correspondance en double dans la port\u00E9e du champ "{0}".
-        DuplicateKey = cvc-identity-constraint.4.2.2 : Valeur de cl\u00E9 en double [{0}] d\u00E9clar\u00E9e pour la contrainte d''identit\u00E9 "{2}" de l''\u00E9l\u00E9ment "{1}".
-        DuplicateUnique = cvc-identity-constraint.4.1 : Valeur unique en double [{0}] d\u00E9clar\u00E9e pour la contrainte d''identit\u00E9 "{2}" de l''\u00E9l\u00E9ment "{1}".
-        FieldMultipleMatch = cvc-identity-constraint.3 : Le champ "{0}" de la contrainte d''identit\u00E9 "{1}" concorde avec plusieurs valeurs dans la port\u00E9e de son s\u00E9lecteur ; les champs doivent concorder avec des valeurs uniques.
-        FixedDiffersFromActual = Le contenu de l'\u00E9l\u00E9ment n'\u00E9quivaut pas \u00E0 la valeur de l'attribut "fixed" dans la d\u00E9claration de l'\u00E9l\u00E9ment du sch\u00E9ma.
-        KeyMatchesNillable = cvc-identity-constraint.4.2.3 : L''\u00E9l\u00E9ment "{0}" dispose de la cl\u00E9 "{1}" qui concorde avec un \u00E9l\u00E9ment dont l''attribut nillable a la valeur True.
-        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b : Le nombre de valeurs indiqu\u00E9es pour la contrainte d''identit\u00E9 <key name="{1}"> de l''\u00E9l\u00E9ment "{0}" est insuffisant.
-        KeyNotFound = cvc-identity-constraint.4.3 : La cl\u00E9 ''{0}'' ayant la valeur ''{1}'' est introuvable pour la contrainte d''identit\u00E9 de l''\u00E9l\u00E9ment ''{2}''.
-        KeyRefOutOfScope = Erreur de contrainte d''identit\u00E9 : la contrainte d''identit\u00E9 "{0}" comporte une r\u00E9f\u00E9rence keyref se rapportant \u00E0 une cl\u00E9 ou \u00E0 une valeur unique hors port\u00E9e.
-        KeyRefReferNotFound = La d\u00E9claration de r\u00E9f\u00E9rence de cl\u00E9 "{0}" se rapporte \u00E0 une cl\u00E9 inconnue portant le nom "{1}".
-        UnknownField = Erreur de contrainte d''identit\u00E9 interne ; champ inconnu "{0}" pour la contrainte d''identit\u00E9 "{2}" indiqu\u00E9e pour l''\u00E9l\u00E9ment "{1}".
+        AbsentKeyValue = cvc-identity-constraint.4.2.1.a : L''élément "{0}" n''a aucune valeur pour la clé "{1}".
+        DuplicateField = Correspondance en double dans la portée du champ "{0}".
+        DuplicateKey = cvc-identity-constraint.4.2.2 : Valeur de clé en double [{0}] déclarée pour la contrainte d''identité "{2}" de l''élément "{1}".
+        DuplicateUnique = cvc-identity-constraint.4.1 : Valeur unique en double [{0}] déclarée pour la contrainte d''identité "{2}" de l''élément "{1}".
+        FieldMultipleMatch = cvc-identity-constraint.3 : Le champ "{0}" de la contrainte d''identité "{1}" concorde avec plusieurs valeurs dans la portée de son sélecteur ; les champs doivent concorder avec des valeurs uniques.
+        FixedDiffersFromActual = Le contenu de l'élément n'équivaut pas à la valeur de l'attribut "fixed" dans la déclaration de l'élément du schéma.
+        KeyMatchesNillable = cvc-identity-constraint.4.2.3 : L''élément "{0}" dispose de la clé "{1}" qui concorde avec un élément dont l''attribut nillable a la valeur True.
+        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b : Le nombre de valeurs indiquées pour la contrainte d''identité <key name="{1}"> de l''élément "{0}" est insuffisant.
+        KeyNotFound = cvc-identity-constraint.4.3 : La clé ''{0}'' ayant la valeur ''{1}'' est introuvable pour la contrainte d''identité de l''élément ''{2}''.
+        KeyRefOutOfScope = Erreur de contrainte d''identité : la contrainte d''identité "{0}" comporte une référence keyref se rapportant à une clé ou à une valeur unique hors portée.
+        KeyRefReferNotFound = La déclaration de référence de clé "{0}" se rapporte à une clé inconnue portant le nom "{1}".
+        UnknownField = Erreur de contrainte d''identité interne ; champ inconnu "{0}" pour la contrainte d''identité "{2}" indiquée pour l''élément "{1}".
 
 # Ideally, we should only use the following error keys, not the ones under
 # "Identity constraints". And we should cover all of the following errors.
 
 #validation (3.X.4)
 
-        cvc-attribute.3 = cvc-attribute.3 : La valeur ''{2}'' de l''attribut ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas valide par rapport \u00E0 son type, ''{3}''.
-        cvc-attribute.4 = cvc-attribute.4 : La valeur ''{2}'' de l''attribut ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas valide par rapport \u00E0 son attribut '{'value constraint'}' fixe. L''attribut doit avoir une valeur de ''{3}''.
-        cvc-complex-type.2.1 = cvc-complex-type.2.1 : L''\u00E9l\u00E9ment ''{0}'' ne doit comporter aucun enfant ([children]) de type caract\u00E8re ou \u00E9l\u00E9ment d''information, car le type de contenu du type est vide.
-        cvc-complex-type.2.2 = cvc-complex-type.2.2 : L''\u00E9l\u00E9ment ''{0}'' ne doit comporter aucun enfant ([children]) de type \u00E9l\u00E9ment et la valeur doit \u00EAtre valide.
-        cvc-complex-type.2.3 = cvc-complex-type.2.3 : L''\u00E9l\u00E9ment ''{0}'' ne doit comporter aucun enfant ([children]) de type caract\u00E8re, car le type porte le type de contenu "element-only".
-        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a : Contenu non valide trouv\u00E9 \u00E0 partir de l''\u00E9l\u00E9ment ''{0}''. L''une des valeurs ''{1}'' est attendue.
-        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b : Le contenu de l''\u00E9l\u00E9ment ''{0}'' n''est pas complet. L''un des \u00E9l\u00E9ments ''{1}'' est attendu.
-        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c : Le caract\u00E8re g\u00E9n\u00E9rique concordant est strict, mais aucune d\u00E9claration ne peut \u00EAtre trouv\u00E9e pour l''\u00E9l\u00E9ment ''{0}''.
-        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d : Contenu non valide trouv\u00E9 \u00E0 partir de l''\u00E9l\u00E9ment ''{0}''. Aucun \u00E9l\u00E9ment enfant n''est attendu \u00E0 cet endroit.
-        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d : Contenu non valide trouv\u00E9 \u00E0 partir de l''\u00E9l\u00E9ment ''{0}''. Aucun \u00E9l\u00E9ment enfant ''{1}'' n''est attendu \u00E0 cet endroit.
-        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e : ''{0}'' peut se produire au maximum ''{2}'' fois dans la s\u00E9quence en cours. Cette limite a \u00E9t\u00E9 d\u00E9pass\u00E9e. Un des \u00E9l\u00E9ments ''{1}'' est attendu \u00E0 cet endroit.
-        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f : ''{0}'' peut se produire au maximum ''{1}'' fois dans la s\u00E9quence en cours. Cette limite a \u00E9t\u00E9 d\u00E9pass\u00E9e. Aucun \u00E9l\u00E9ment enfant n''est attendu \u00E0 cet endroit.
-        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g : Contenu non valide trouv\u00E9 \u00E0 partir de l''\u00E9l\u00E9ment ''{0}''. ''{1}'' est cens\u00E9 se produire au minimum ''{2}'' fois dans la s\u00E9quence en cours. Une instance suppl\u00E9mentaire est requise pour respecter cette contrainte.
-        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h : Contenu non valide trouv\u00E9 \u00E0 partir de l''\u00E9l\u00E9ment ''{0}''. ''{1}'' est cens\u00E9 se produire au minimum ''{2}'' fois dans la s\u00E9quence en cours. ''{3}'' instances suppl\u00E9mentaires sont requises pour respecter cette contrainte.
-        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i : Le contenu de l''\u00E9l\u00E9ment ''{0}'' n''est pas complet. ''{1}'' est cens\u00E9 se produire au minimum ''{2}'' fois. Une instance suppl\u00E9mentaire est requise pour respecter cette contrainte.
-        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j : Le contenu de l''\u00E9l\u00E9ment ''{0}'' n''est pas complet. ''{1}'' est cens\u00E9 se produire au minimum ''{2}'' fois. ''{3}'' instances suppl\u00E9mentaires sont requises pour respecter cette contrainte.
-        cvc-complex-type.3.1 = cvc-complex-type.3.1 : La valeur ''{2}'' de l''attribut ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas valide par rapport \u00E0 la syntaxe d''attribut correspondante. L''attribut ''{1}'' a une valeur fixe de ''{3}''.
-        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1 : L''\u00E9l\u00E9ment ''{0}'' ne dispose d''aucun caract\u00E8re g\u00E9n\u00E9rique d''attribut pour l''attribut ''{1}''.
-        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2 : L''attribut ''{1}'' n''est pas autoris\u00E9 dans l''\u00E9l\u00E9ment ''{0}''.
-        cvc-complex-type.4 = cvc-complex-type.4 : L''attribut ''{1}'' doit figurer dans l''\u00E9l\u00E9ment ''{0}''.
-        cvc-complex-type.5.1 = cvc-complex-type.5.1 : Dans l''\u00E9l\u00E9ment ''{0}'', l''attribut ''{1}'' est un ID g\u00E9n\u00E9rique. Or, il existe d\u00E9j\u00E0 un ID g\u00E9n\u00E9rique ''{2}''. Il ne peut en exister qu''un seul.
-        cvc-complex-type.5.2 = cvc-complex-type.5.2 : Dans l''\u00E9l\u00E9ment ''{0}'', l''attribut ''{1}'' est un ID g\u00E9n\u00E9rique. Or, il existe d\u00E9j\u00E0 un attribut ''{2}'' d\u00E9riv\u00E9 de l''ID dans '{'attribute uses'}'.
+        cvc-attribute.3 = cvc-attribute.3 : La valeur ''{2}'' de l''attribut ''{1}'' de l''élément ''{0}'' n''est pas valide par rapport à son type, ''{3}''.
+        cvc-attribute.4 = cvc-attribute.4 : La valeur ''{2}'' de l''attribut ''{1}'' de l''élément ''{0}'' n''est pas valide par rapport à son attribut '{'value constraint'}' fixe. L''attribut doit avoir une valeur de ''{3}''.
+        cvc-complex-type.2.1 = cvc-complex-type.2.1 : L''élément ''{0}'' ne doit comporter aucun enfant ([children]) de type caractère ou élément d''information, car le type de contenu du type est vide.
+        cvc-complex-type.2.2 = cvc-complex-type.2.2 : L''élément ''{0}'' ne doit comporter aucun enfant ([children]) de type élément et la valeur doit être valide.
+        cvc-complex-type.2.3 = cvc-complex-type.2.3 : L''élément ''{0}'' ne doit comporter aucun enfant ([children]) de type caractère, car le type porte le type de contenu "element-only".
+        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a : Contenu non valide trouvé à partir de l''élément ''{0}''. L''une des valeurs ''{1}'' est attendue.
+        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b : Le contenu de l''élément ''{0}'' n''est pas complet. L''un des éléments ''{1}'' est attendu.
+        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c : Le caractère générique concordant est strict, mais aucune déclaration ne peut être trouvée pour l''élément ''{0}''.
+        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d : Contenu non valide trouvé à partir de l''élément ''{0}''. Aucun élément enfant n''est attendu à cet endroit.
+        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d : Contenu non valide trouvé à partir de l''élément ''{0}''. Aucun élément enfant ''{1}'' n''est attendu à cet endroit.
+        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e : ''{0}'' peut se produire au maximum ''{2}'' fois dans la séquence en cours. Cette limite a été dépassée. Un des éléments ''{1}'' est attendu à cet endroit.
+        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f : ''{0}'' peut se produire au maximum ''{1}'' fois dans la séquence en cours. Cette limite a été dépassée. Aucun élément enfant n''est attendu à cet endroit.
+        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g : Contenu non valide trouvé à partir de l''élément ''{0}''. ''{1}'' est censé se produire au minimum ''{2}'' fois dans la séquence en cours. Une instance supplémentaire est requise pour respecter cette contrainte.
+        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h : Contenu non valide trouvé à partir de l''élément ''{0}''. ''{1}'' est censé se produire au minimum ''{2}'' fois dans la séquence en cours. ''{3}'' instances supplémentaires sont requises pour respecter cette contrainte.
+        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i : Le contenu de l''élément ''{0}'' n''est pas complet. ''{1}'' est censé se produire au minimum ''{2}'' fois. Une instance supplémentaire est requise pour respecter cette contrainte.
+        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j : Le contenu de l''élément ''{0}'' n''est pas complet. ''{1}'' est censé se produire au minimum ''{2}'' fois. ''{3}'' instances supplémentaires sont requises pour respecter cette contrainte.
+        cvc-complex-type.3.1 = cvc-complex-type.3.1 : La valeur ''{2}'' de l''attribut ''{1}'' de l''élément ''{0}'' n''est pas valide par rapport à la syntaxe d''attribut correspondante. L''attribut ''{1}'' a une valeur fixe de ''{3}''.
+        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1 : L''élément ''{0}'' ne dispose d''aucun caractère générique d''attribut pour l''attribut ''{1}''.
+        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2 : L''attribut ''{1}'' n''est pas autorisé dans l''élément ''{0}''.
+        cvc-complex-type.4 = cvc-complex-type.4 : L''attribut ''{1}'' doit figurer dans l''élément ''{0}''.
+        cvc-complex-type.5.1 = cvc-complex-type.5.1 : Dans l''élément ''{0}'', l''attribut ''{1}'' est un ID générique. Or, il existe déjà un ID générique ''{2}''. Il ne peut en exister qu''un seul.
+        cvc-complex-type.5.2 = cvc-complex-type.5.2 : Dans l''élément ''{0}'', l''attribut ''{1}'' est un ID générique. Or, il existe déjà un attribut ''{2}'' dérivé de l''ID dans '{'attribute uses'}'.
         cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1 : ''{0}'' n''est pas une valeur valide pour ''{1}''.
         cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2 : ''{0}'' n''est pas une valeur valide du type de liste ''{1}''.
         cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3 : ''{0}'' n''est pas une valeur valide du type d''union ''{1}''.
-        cvc-elt.1.a = cvc-elt.1.a : D\u00E9claration de l''\u00E9l\u00E9ment ''{0}'' introuvable.
-        cvc-elt.1.b = cvc-elt.1.b : Le nom de l''\u00E9l\u00E9ment ne concorde pas avec le nom de la d\u00E9claration d''\u00E9l\u00E9ment. Trouv\u00E9 : ''{0}''. Attendu : ''{1}''.
-        cvc-elt.2 = cvc-elt.2 : La valeur de l''attribut '{'abstract'}' dans la d\u00E9claration de l''\u00E9l\u00E9ment pour ''{0}'' doit \u00EAtre False.
-        cvc-elt.3.1 = cvc-elt.3.1 : L''attribut ''{1}'' ne doit pas figurer dans l''\u00E9l\u00E9ment ''{0}'', car la propri\u00E9t\u00E9 '{'nillable'}' de ''{0}'' est False.
-        cvc-elt.3.2.1 = cvc-elt.3.2.1 : L''\u00E9l\u00E9ment ''{0}'' ne doit comporter aucun enfant ([children]) de type caract\u00E8re ou \u00E9l\u00E9ment d''information, car ''{1}'' est indiqu\u00E9.
-        cvc-elt.3.2.2 = cvc-elt.3.2.2 : Il ne doit y avoir aucun attribut '{'value constraint'}' fixe pour l''\u00E9l\u00E9ment ''{0}'', car ''{1}'' est indiqu\u00E9.
-        cvc-elt.4.1 = cvc-elt.4.1 : La valeur ''{2}'' de l''attribut ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas un QName valide.
-        cvc-elt.4.2 = cvc-elt.4.2 : Impossible de r\u00E9soudre ''{1}'' en une d\u00E9finition de type pour l''\u00E9l\u00E9ment ''{0}''.
-        cvc-elt.4.3 = cvc-elt.4.3 : La d\u00E9rivation du type ''{1}'' \u00E0 partir de la d\u00E9finition de type ''{2}'' de l''\u00E9l\u00E9ment "{0}" n''est pas valide.
-        cvc-elt.5.1.1 = cvc-elt.5.1.1 : L''attribut '{'value constraint'}' ''{2}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas une valeur par d\u00E9faut valide pour le type ''{1}''.
-        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1 : L''\u00E9l\u00E9ment ''{0}'' ne doit comporter aucun enfant ([children]) de type \u00E9l\u00E9ment d''information.
-        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1 : La valeur ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' ne concorde pas avec la valeur de l''attribut '{'value constraint'}' fixe ''{2}''.
-        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2 : La valeur ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' ne concorde pas avec la valeur de l''attribut '{'value constraint'}' ''{2}''.
-        cvc-enumeration-valid = cvc-enumeration-valid : La valeur ''{0}'' n''est pas un facet valide par rapport \u00E0 l''\u00E9num\u00E9ration ''{1}''. Il doit s''agir d''une valeur provenant de l''\u00E9num\u00E9ration.
-        cvc-fractionDigits-valid = cvc-fractionDigits-valid : La valeur ''{0}'' poss\u00E8de {1} chiffres apr\u00E8s la virgule, mais le nombre de chiffres apr\u00E8s la virgule ne doit pas d\u00E9passer {2}.
+        cvc-elt.1.a = cvc-elt.1.a : Déclaration de l''élément ''{0}'' introuvable.
+        cvc-elt.1.b = cvc-elt.1.b : Le nom de l''élément ne concorde pas avec le nom de la déclaration d''élément. Trouvé : ''{0}''. Attendu : ''{1}''.
+        cvc-elt.2 = cvc-elt.2 : La valeur de l''attribut '{'abstract'}' dans la déclaration de l''élément pour ''{0}'' doit être False.
+        cvc-elt.3.1 = cvc-elt.3.1 : L''attribut ''{1}'' ne doit pas figurer dans l''élément ''{0}'', car la propriété '{'nillable'}' de ''{0}'' est False.
+        cvc-elt.3.2.1 = cvc-elt.3.2.1 : L''élément ''{0}'' ne doit comporter aucun enfant ([children]) de type caractère ou élément d''information, car ''{1}'' est indiqué.
+        cvc-elt.3.2.2 = cvc-elt.3.2.2 : Il ne doit y avoir aucun attribut '{'value constraint'}' fixe pour l''élément ''{0}'', car ''{1}'' est indiqué.
+        cvc-elt.4.1 = cvc-elt.4.1 : La valeur ''{2}'' de l''attribut ''{1}'' de l''élément ''{0}'' n''est pas un QName valide.
+        cvc-elt.4.2 = cvc-elt.4.2 : Impossible de résoudre ''{1}'' en une définition de type pour l''élément ''{0}''.
+        cvc-elt.4.3 = cvc-elt.4.3 : La dérivation du type ''{1}'' à partir de la définition de type ''{2}'' de l''élément "{0}" n''est pas valide.
+        cvc-elt.5.1.1 = cvc-elt.5.1.1 : L''attribut '{'value constraint'}' ''{2}'' de l''élément ''{0}'' n''est pas une valeur par défaut valide pour le type ''{1}''.
+        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1 : L''élément ''{0}'' ne doit comporter aucun enfant ([children]) de type élément d''information.
+        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1 : La valeur ''{1}'' de l''élément ''{0}'' ne concorde pas avec la valeur de l''attribut '{'value constraint'}' fixe ''{2}''.
+        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2 : La valeur ''{1}'' de l''élément ''{0}'' ne concorde pas avec la valeur de l''attribut '{'value constraint'}' ''{2}''.
+        cvc-enumeration-valid = cvc-enumeration-valid : La valeur ''{0}'' n''est pas un facet valide par rapport à l''énumération ''{1}''. Il doit s''agir d''une valeur provenant de l''énumération.
+        cvc-fractionDigits-valid = cvc-fractionDigits-valid : La valeur ''{0}'' possède {1} chiffres après la virgule, mais le nombre de chiffres après la virgule ne doit pas dépasser {2}.
         cvc-id.1 = cvc-id.1 : Aucune liaison ID/IDREF pour l''IDREF ''{0}''.
         cvc-id.2 = cvc-id.2 : Occurrences multiples de la valeur d''ID ''{0}''.
-        cvc-id.3 = cvc-id.3 : Un champ de contrainte d''identit\u00E9 "{0}" a \u00E9t\u00E9 mis en correspondance avec l''\u00E9l\u00E9ment "{1}", mais cet \u00E9l\u00E9ment ne comporte pas de type simple.
-        cvc-length-valid = cvc-length-valid : La valeur ''{0}'', ayant pour longueur ''{1}'', n''est pas un facet valide par rapport \u00E0 la longueur ''{2}'' pour le type ''{3}''.
-        cvc-maxExclusive-valid = cvc-maxExclusive-valid : La valeur ''{0}'' n''est pas un facet valide par rapport \u00E0 maxExclusive ''{1}'' pour le type ''{2}''.
-        cvc-maxInclusive-valid = cvc-maxInclusive-valid : La valeur ''{0}'' n''est pas un facet valide par rapport \u00E0 maxInclusive ''{1}'' pour le type ''{2}''.
-        cvc-maxLength-valid = cvc-maxLength-valid : La valeur ''{0}'', ayant pour longueur ''{1}'', n''est pas un facet valide par rapport \u00E0 maxLength ''{2}'' pour le type ''{3}''.
-        cvc-minExclusive-valid = cvc-minExclusive-valid : La valeur ''{0}'' n''est pas un facet valide par rapport \u00E0 minExclusive ''{1}'' pour le type ''{2}''.
-        cvc-minInclusive-valid = cvc-minInclusive-valid : La valeur ''{0}'' n''est pas un facet valide par rapport \u00E0 minInclusive ''{1}'' pour le type ''{2}''.
-        cvc-minLength-valid = cvc-minLength-valid : La valeur ''{0}'', ayant pour longueur ''{1}'', n''est pas un facet valide par rapport \u00E0 minLength ''{2}'' pour le type ''{3}''.
-        cvc-pattern-valid = cvc-pattern-valid : La valeur ''{0}'' n''est pas un facet valide par rapport au mod\u00E8le ''{1}'' pour le type ''{2}''.
-        cvc-totalDigits-valid = cvc-totalDigits-valid : La valeur ''{0}'' poss\u00E8de un total de {1} chiffres, mais le nombre total de chiffres ne doit pas d\u00E9passer {2}.
-        cvc-type.1 = cvc-type.1 : La d\u00E9finition de type ''{0}'' est introuvable.
-        cvc-type.2 = cvc-type.2 : La d\u00E9finition de type ne doit pas \u00EAtre abstract pour l''\u00E9l\u00E9ment {0}.
-        cvc-type.3.1.1 = cvc-type.3.1.1 : L''\u00E9l\u00E9ment ''{0}'' est de type simple et ne peut donc pas avoir d''attributs, \u00E0 l''exception de ceux o\u00F9 le nom d''espace de noms est identique \u00E0 ''http://www.w3.org/2001/XMLSchema-instance'' et o\u00F9 [local name] est ''type'', ''nil'', ''schemaLocation'' ou ''noNamespaceSchemaLocation''. Cependant, l''attribut ''{1}'' a \u00E9t\u00E9 trouv\u00E9.
-        cvc-type.3.1.2 = cvc-type.3.1.2 : L''\u00E9l\u00E9ment ''{0}'' est de type simple et ne doit comporter aucun enfant ([children]) de type \u00E9l\u00E9ment d''information.
-        cvc-type.3.1.3 = cvc-type.3.1.3 : La valeur ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas valide.
+        cvc-id.3 = cvc-id.3 : Un champ de contrainte d''identité "{0}" a été mis en correspondance avec l''élément "{1}", mais cet élément ne comporte pas de type simple.
+        cvc-length-valid = cvc-length-valid : La valeur ''{0}'', ayant pour longueur ''{1}'', n''est pas un facet valide par rapport à la longueur ''{2}'' pour le type ''{3}''.
+        cvc-maxExclusive-valid = cvc-maxExclusive-valid : La valeur ''{0}'' n''est pas un facet valide par rapport à maxExclusive ''{1}'' pour le type ''{2}''.
+        cvc-maxInclusive-valid = cvc-maxInclusive-valid : La valeur ''{0}'' n''est pas un facet valide par rapport à maxInclusive ''{1}'' pour le type ''{2}''.
+        cvc-maxLength-valid = cvc-maxLength-valid : La valeur ''{0}'', ayant pour longueur ''{1}'', n''est pas un facet valide par rapport à maxLength ''{2}'' pour le type ''{3}''.
+        cvc-minExclusive-valid = cvc-minExclusive-valid : La valeur ''{0}'' n''est pas un facet valide par rapport à minExclusive ''{1}'' pour le type ''{2}''.
+        cvc-minInclusive-valid = cvc-minInclusive-valid : La valeur ''{0}'' n''est pas un facet valide par rapport à minInclusive ''{1}'' pour le type ''{2}''.
+        cvc-minLength-valid = cvc-minLength-valid : La valeur ''{0}'', ayant pour longueur ''{1}'', n''est pas un facet valide par rapport à minLength ''{2}'' pour le type ''{3}''.
+        cvc-pattern-valid = cvc-pattern-valid : La valeur ''{0}'' n''est pas un facet valide par rapport au modèle ''{1}'' pour le type ''{2}''.
+        cvc-totalDigits-valid = cvc-totalDigits-valid : La valeur ''{0}'' possède un total de {1} chiffres, mais le nombre total de chiffres ne doit pas dépasser {2}.
+        cvc-type.1 = cvc-type.1 : La définition de type ''{0}'' est introuvable.
+        cvc-type.2 = cvc-type.2 : La définition de type ne doit pas être abstract pour l''élément {0}.
+        cvc-type.3.1.1 = cvc-type.3.1.1 : L''élément ''{0}'' est de type simple et ne peut donc pas avoir d''attributs, à l''exception de ceux où le nom d''espace de noms est identique à ''http://www.w3.org/2001/XMLSchema-instance'' et où [local name] est ''type'', ''nil'', ''schemaLocation'' ou ''noNamespaceSchemaLocation''. Cependant, l''attribut ''{1}'' a été trouvé.
+        cvc-type.3.1.2 = cvc-type.3.1.2 : L''élément ''{0}'' est de type simple et ne doit comporter aucun enfant ([children]) de type élément d''information.
+        cvc-type.3.1.3 = cvc-type.3.1.3 : La valeur ''{1}'' de l''élément ''{0}'' n''est pas valide.
 
 #schema valid (3.X.3)
 
-        schema_reference.access = schema_reference : \u00E9chec de la lecture du document de sch\u00E9ma ''{0}'', car l''acc\u00E8s ''{1}'' n''est pas autoris\u00E9 en raison d''une restriction d\u00E9finie par la propri\u00E9t\u00E9 accessExternalSchema. 
-        schema_reference.4 = schema_reference.4 : Echec de la lecture du document de sch\u00E9ma ''{0}'' pour les raisons suivantes : 1) Le document est introuvable ; 2) Le document n''a pas pu \u00EAtre lu ; 3) L''\u00E9l\u00E9ment racine du document n''est pas <xsd:schema>.
-        src-annotation = src-annotation : Les \u00E9l\u00E9ments <annotation> ne peuvent contenir que des \u00E9l\u00E9ments <appinfo> et <documentation>, mais ''{0}'' a \u00E9t\u00E9 trouv\u00E9.
-        src-attribute.1 = src-attribute.1 : Les propri\u00E9t\u00E9s ''default'' et ''fixed'' ne peuvent pas figurer simultan\u00E9ment dans la d\u00E9claration d''attribut ''{0}''. Utilisez uniquement l''une d''entre elles.
-        src-attribute.2 = src-attribute.2 : La propri\u00E9t\u00E9 ''default'' figure dans l''attribut ''{0}'', la valeur de ''use'' doit donc \u00EAtre ''optional''.
-        src-attribute.3.1 = src-attribute.3.1 : 'ref' ou 'name' doit figurer dans les d\u00E9clarations d'attribut local.
-        src-attribute.3.2 = src-attribute.3.2 : Le contenu doit concorder avec (annotation?) pour la r\u00E9f\u00E9rence d''attribut ''{0}''.
-        src-attribute.4 = src-attribute.4 : L''attribut ''{0}'' pr\u00E9sente un attribut ''type'' et un enfant ''simpleType'' anonyme. Seul un d''entre eux est autoris\u00E9 dans un attribut.
-        src-attribute_group.2 = src-attribute_group.2 : L''intersection de caract\u00E8res g\u00E9n\u00E9riques ne peut pas \u00EAtre exprim\u00E9e pour le groupe d''attribut ''{0}''.
-        src-attribute_group.3 = src-attribute_group.3 : D\u00E9finitions circulaires d\u00E9tect\u00E9es pour le groupe d''attribut ''{0}''. Le suivi r\u00E9cursif des r\u00E9f\u00E9rences de groupe d''attribut conduit \u00E0 lui-m\u00EAme.
-        src-ct.1 = src-ct.1 : Erreur de repr\u00E9sentation de la d\u00E9finition de type complexe pour le type ''{0}''. Lorsque <complexContent> est utilis\u00E9, le type de base doit \u00EAtre complexType. ''{1}'' est simpleType.
-        src-ct.2.1 = src-ct.2.1 : Erreur de repr\u00E9sentation de la d\u00E9finition de type complexe pour le type ''{0}''. Lorsque <simpleContent> est utilis\u00E9, le type de base doit \u00EAtre complexType avec un type de contenu simple. Si une restriction est indiqu\u00E9e, il peut s''agir d''un type complexe avec un contenu mixte et une particule pouvant \u00EAtre vide ou, si une extension est indiqu\u00E9e, d''un type simple. ''{1}'' ne respecte aucune de ces conditions.
-        src-ct.2.2 = src-ct.2.2 : Erreur de repr\u00E9sentation de la d\u00E9finition de type complexe pour le type ''{0}''. Lorsqu''un complexType avec un simpleContent restreint un complexType comportant un contenu mixte et une particule pouvant \u00EAtre vide, un <simpleType> doit figurer parmi les enfants de <restriction>.
-        src-ct.4 = src-ct.4 : Erreur de repr\u00E9sentation de la d\u00E9finition de type complexe pour le type ''{0}''. L''intersection de caract\u00E8res g\u00E9n\u00E9riques ne peut pas \u00EAtre exprim\u00E9e.
-        src-ct.5 = src-ct.5 : Erreur de repr\u00E9sentation de la d\u00E9finition de type complexe pour le type ''{0}''. L''union de caract\u00E8res g\u00E9n\u00E9riques ne peut pas \u00EAtre exprim\u00E9e.
-        src-element.1 = src-element.1 : Les propri\u00E9t\u00E9s ''default'' et ''fixed'' ne peuvent pas figurer simultan\u00E9ment dans la d\u00E9claration d''\u00E9l\u00E9ment ''{0}''. Utilisez uniquement l''une d''entre elles.
-        src-element.2.1 = src-element.2.1 : 'ref' ou 'name' doit figurer dans les d\u00E9clarations d'\u00E9l\u00E9ment local.
-        src-element.2.2 = src-element.2.2 : Puisque ''{0}'' contient l''attribut ''ref'', son contenu doit concorder avec (annotation?). Cependant, ''{1}'' a \u00E9t\u00E9 trouv\u00E9.
-        src-element.3 = src-element.3 : L''\u00E9l\u00E9ment ''{0}'' pr\u00E9sente un attribut ''type'' et un enfant ''anonymous type''. Seul un d''entre eux est autoris\u00E9 dans un \u00E9l\u00E9ment.
-        src-import.1.1 = src-import.1.1 : L''attribut namespace "{0}" d''un \u00E9l\u00E9ment d''information d''\u00E9l\u00E9ment <import> ne doit pas \u00EAtre identique \u00E0 l''attribut targetNamespace du sch\u00E9ma dans lequel il figure.
-        src-import.1.2 = src-import.1.2 : Si l'attribut namespace ne figure pas dans un \u00E9l\u00E9ment d'information d'\u00E9l\u00E9ment <import>, le sch\u00E9ma englobant doit avoir un attribut targetNamespace.
-        src-import.2 = src-import.2 : L''\u00E9l\u00E9ment racine du document ''{0}'' doit avoir le nom d''espace de noms ''http://www.w3.org/2001/XMLSchema'' et le nom local ''schema''.
-        src-import.3.1 = src-import.3.1 : L''attribut namespace "{0}" d''un \u00E9l\u00E9ment d''information d''\u00E9l\u00E9ment <import> doit \u00EAtre identique \u00E0 l''attribut targetNamespace ''{1}'' du document import\u00E9.
-        src-import.3.2 = src-import.3.2 : Un \u00E9l\u00E9ment d''information d''\u00E9l\u00E9ment <import> sans attribut namespace a \u00E9t\u00E9 trouv\u00E9. Le document import\u00E9 ne peut donc pas avoir un attribut targetNamespace. Cependant, l''attribut targetNamespace ''{1}'' a \u00E9t\u00E9 trouv\u00E9 dans le document import\u00E9.
-        src-include.1 = src-include.1 : L''\u00E9l\u00E9ment racine du document ''{0}'' doit avoir le nom d''espace de noms ''http://www.w3.org/2001/XMLSchema'' et le nom local ''schema''.
-        src-include.2.1 = src-include.2.1: L''attribut targetNamespace du sch\u00E9ma r\u00E9f\u00E9renc\u00E9, actuellement ''{1}'', doit \u00EAtre identique \u00E0 celui du sch\u00E9ma d''inclusion, actuellement ''{0}''.
-        src-redefine.2 = src-redefine.2 : L''\u00E9l\u00E9ment racine du document ''{0}'' doit avoir le nom d''espace de noms ''http://www.w3.org/2001/XMLSchema'' et le nom local ''schema''.
-        src-redefine.3.1 = src-redefine.3.1 : L''attribut targetNamespace du sch\u00E9ma r\u00E9f\u00E9renc\u00E9, actuellement ''{1}'', doit \u00EAtre identique \u00E0 celui du sch\u00E9ma de red\u00E9finition, actuellement ''{0}''.
-        src-redefine.5.a.a = src-redefine.5.a.a : Aucun enfant de non-annotation de <simpleType> n'a \u00E9t\u00E9 trouv\u00E9. Les enfants <simpleType> des \u00E9l\u00E9ments <redefine> doivent comporter des descendants <restriction>, avec des attributs "base" faisant r\u00E9f\u00E9rence \u00E0 eux-m\u00EAmes.
-        src-redefine.5.a.b = src-redefine.5.a.b : ''{0}'' n''est pas un \u00E9l\u00E9ment enfant valide. Les enfants <simpleType> des \u00E9l\u00E9ments <redefine> doivent comporter des descendants <restriction>, avec des attributs ''base'' faisant r\u00E9f\u00E9rence \u00E0 eux-m\u00EAmes.
-        src-redefine.5.a.c = src-redefine.5.a.c : ''{0}'' ne comporte pas d''attribut ''base'' faisant r\u00E9f\u00E9rence \u00E0 l''\u00E9l\u00E9ment red\u00E9fini, ''{1}''. Les enfants <simpleType> des \u00E9l\u00E9ments <redefine> doivent comporter des descendants <restriction>, avec des attributs ''base'' faisant r\u00E9f\u00E9rence \u00E0 eux-m\u00EAmes.
-        src-redefine.5.b.a = src-redefine.5.b.a : Aucun enfant de non-annotation de <complexType> n'a \u00E9t\u00E9 trouv\u00E9. Les enfants <complexType> des \u00E9l\u00E9ments <redefine> doivent comporter des descendants <extension> ou <restriction>, avec des attributs "base" faisant r\u00E9f\u00E9rence \u00E0 eux-m\u00EAmes.
-        src-redefine.5.b.b = src-redefine.5.b.b : Aucun petit-enfant de non-annotation de <complexType> n'a \u00E9t\u00E9 trouv\u00E9. Les enfants <complexType> des \u00E9l\u00E9ments <redefine> doivent comporter des descendants <extension> ou <restriction>, avec des attributs "base" faisant r\u00E9f\u00E9rence \u00E0 eux-m\u00EAmes.
-        src-redefine.5.b.c = src-redefine.5.b.c : ''{0}'' n''est pas un \u00E9l\u00E9ment petit-enfant valide. Les enfants <complexType> des \u00E9l\u00E9ments <redefine> doivent comporter des descendants <extension> ou <restriction>, avec des attributs ''base'' faisant r\u00E9f\u00E9rence \u00E0 eux-m\u00EAmes.
-        src-redefine.5.b.d = src-redefine.5.b.d : ''{0}'' ne comporte pas d''attribut ''base'' faisant r\u00E9f\u00E9rence \u00E0 l''\u00E9l\u00E9ment red\u00E9fini, ''{1}''. Les enfants <complexType> des \u00E9l\u00E9ments <redefine> doivent comporter des descendants <extension> ou<restriction>, avec des attributs ''base'' faisant r\u00E9f\u00E9rence \u00E0 eux-m\u00EAmes.
-        src-redefine.6.1.1 = src-redefine.6.1.1 : Si un enfant de groupe d''un \u00E9l\u00E9ment <redefine> contient un groupe faisant r\u00E9f\u00E9rence \u00E0 lui-m\u00EAme, il ne doit en comporter qu''un seul ; celui-ci en comporte ''{0}''.
-        src-redefine.6.1.2 = src-redefine.6.1.2 : Le groupe ''{0}'' qui contient une r\u00E9f\u00E9rence \u00E0 un groupe en cours de red\u00E9finition doit respecter la condition ''minOccurs'' = ''maxOccurs'' = 1.
-        src-redefine.6.2.1 = src-redefine.6.2.1 : Aucun groupe dans le sch\u00E9ma red\u00E9fini ne comporte un nom concordant avec ''{0}''.
-        src-redefine.6.2.2 = src-redefine.6.2.2 : Le groupe ''{0}'' ne restreint pas correctement le groupe qu''il red\u00E9finit ; contrainte viol\u00E9e : ''{1}''.
-        src-redefine.7.1 = src-redefine.7.1 : Si un enfant attributeGroup d''un \u00E9l\u00E9ment <redefine> contient un \u00E9l\u00E9ment attributeGroup faisant r\u00E9f\u00E9rence \u00E0 lui-m\u00EAme, il ne doit en comporter qu''un seul ; celui-ci en comporte {0}.
-        src-redefine.7.2.1 = src-redefine.7.2.1 : Aucun \u00E9l\u00E9ment attributeGroup dans le sch\u00E9ma red\u00E9fini ne comporte un nom concordant avec ''{0}''.
-        src-redefine.7.2.2 = src-redefine.7.2.2 : L''\u00E9l\u00E9ment attributeGroup ''{0}'' ne restreint pas correctement l''\u00E9l\u00E9ment attributeGroup qu''il red\u00E9finit ; contrainte viol\u00E9e : ''{1}''.
-        src-resolve = src-resolve : Impossible de r\u00E9soudre le nom ''{0}'' en un composant ''{1}''.
-        src-resolve.4.1 = src-resolve.4.1 : Erreur lors de la r\u00E9solution du composant ''{2}''. ''{2}'' ne comporte pas d''espace de noms, mais les composants sans espace de noms ne peuvent pas \u00EAtre r\u00E9f\u00E9renc\u00E9s \u00E0 partir du document de sch\u00E9ma ''{0}''. Si ''{2}'' doit avoir un espace de noms, un pr\u00E9fixe doit \u00E9ventuellement \u00EAtre indiqu\u00E9. Si ''{2}'' ne doit pas avoir d''espace de noms, une balise ''import'' sans un attribut "namespace" doit \u00EAtre ajout\u00E9e \u00E0 ''{0}''.
-        src-resolve.4.2 = src-resolve.4.2 : Erreur lors de la r\u00E9solution du composant ''{2}''. ''{2}'' se trouve dans l''espace de noms ''{1}'', mais les composants de cet espace de noms ne peuvent pas \u00EAtre r\u00E9f\u00E9renc\u00E9s \u00E0 partir du document de sch\u00E9ma ''{0}''. S''il s''agit d''un espace de noms incorrect, le pr\u00E9fixe de ''{2}'' doit \u00E9ventuellement \u00EAtre modifi\u00E9. S''il est correct, une balise ''import'' appropri\u00E9e doit \u00EAtre ajout\u00E9e \u00E0 ''{0}''.
-        src-simple-type.2.a = src-simple-type.2.a : Un \u00E9l\u00E9ment <restriction> a \u00E9t\u00E9 trouv\u00E9 avec une valeur [attribute] de base et un \u00E9l\u00E9ment <simpleType> parmi ses enfants ([children]). Un seul de ces \u00E9l\u00E9ments est autoris\u00E9.
-        src-simple-type.2.b = src-simple-type.2.b : Un \u00E9l\u00E9ment <restriction> a \u00E9t\u00E9 trouv\u00E9 sans valeur [attribute] de base ni \u00E9l\u00E9ment <simpleType> parmi ses enfants ([children]). Un de ces \u00E9l\u00E9ments est obligatoire.
-        src-simple-type.3.a = src-simple-type.3.a : Un \u00E9l\u00E9ment <list> a \u00E9t\u00E9 trouv\u00E9 avec une valeur [attribute] itemType ou un \u00E9l\u00E9ment <simpleType> parmi ses enfants ([children]). Un seul de ces \u00E9l\u00E9ments est autoris\u00E9.
-        src-simple-type.3.b = src-simple-type.3.b : Un \u00E9l\u00E9ment <list> a \u00E9t\u00E9 trouv\u00E9 sans valeur [attribute] itemType ni \u00E9l\u00E9ment <simpleType> parmi ses enfants ([children]). Un de ces \u00E9l\u00E9ments est obligatoire.
-        src-single-facet-value = src-single-facet-value : Le facet ''{0}'' est d\u00E9fini plusieurs fois.
-        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes : Un \u00E9l\u00E9ment <union> doit avoir une valeur [attribute] memberTypes non vide ou au moins un \u00E9l\u00E9ment <simpleType> parmi ses enfants ([children]).
+        schema_reference.access = schema_reference : échec de la lecture du document de schéma ''{0}'', car l''accès ''{1}'' n''est pas autorisé en raison d''une restriction définie par la propriété accessExternalSchema. 
+        schema_reference.4 = schema_reference.4 : Echec de la lecture du document de schéma ''{0}'' pour les raisons suivantes : 1) Le document est introuvable ; 2) Le document n''a pas pu être lu ; 3) L''élément racine du document n''est pas <xsd:schema>.
+        src-annotation = src-annotation : Les éléments <annotation> ne peuvent contenir que des éléments <appinfo> et <documentation>, mais ''{0}'' a été trouvé.
+        src-attribute.1 = src-attribute.1 : Les propriétés ''default'' et ''fixed'' ne peuvent pas figurer simultanément dans la déclaration d''attribut ''{0}''. Utilisez uniquement l''une d''entre elles.
+        src-attribute.2 = src-attribute.2 : La propriété ''default'' figure dans l''attribut ''{0}'', la valeur de ''use'' doit donc être ''optional''.
+        src-attribute.3.1 = src-attribute.3.1 : 'ref' ou 'name' doit figurer dans les déclarations d'attribut local.
+        src-attribute.3.2 = src-attribute.3.2 : Le contenu doit concorder avec (annotation?) pour la référence d''attribut ''{0}''.
+        src-attribute.4 = src-attribute.4 : L''attribut ''{0}'' présente un attribut ''type'' et un enfant ''simpleType'' anonyme. Seul un d''entre eux est autorisé dans un attribut.
+        src-attribute_group.2 = src-attribute_group.2 : L''intersection de caractères génériques ne peut pas être exprimée pour le groupe d''attribut ''{0}''.
+        src-attribute_group.3 = src-attribute_group.3 : Définitions circulaires détectées pour le groupe d''attribut ''{0}''. Le suivi récursif des références de groupe d''attribut conduit à lui-même.
+        src-ct.1 = src-ct.1 : Erreur de représentation de la définition de type complexe pour le type ''{0}''. Lorsque <complexContent> est utilisé, le type de base doit être complexType. ''{1}'' est simpleType.
+        src-ct.2.1 = src-ct.2.1 : Erreur de représentation de la définition de type complexe pour le type ''{0}''. Lorsque <simpleContent> est utilisé, le type de base doit être complexType avec un type de contenu simple. Si une restriction est indiquée, il peut s''agir d''un type complexe avec un contenu mixte et une particule pouvant être vide ou, si une extension est indiquée, d''un type simple. ''{1}'' ne respecte aucune de ces conditions.
+        src-ct.2.2 = src-ct.2.2 : Erreur de représentation de la définition de type complexe pour le type ''{0}''. Lorsqu''un complexType avec un simpleContent restreint un complexType comportant un contenu mixte et une particule pouvant être vide, un <simpleType> doit figurer parmi les enfants de <restriction>.
+        src-ct.4 = src-ct.4 : Erreur de représentation de la définition de type complexe pour le type ''{0}''. L''intersection de caractères génériques ne peut pas être exprimée.
+        src-ct.5 = src-ct.5 : Erreur de représentation de la définition de type complexe pour le type ''{0}''. L''union de caractères génériques ne peut pas être exprimée.
+        src-element.1 = src-element.1 : Les propriétés ''default'' et ''fixed'' ne peuvent pas figurer simultanément dans la déclaration d''élément ''{0}''. Utilisez uniquement l''une d''entre elles.
+        src-element.2.1 = src-element.2.1 : 'ref' ou 'name' doit figurer dans les déclarations d'élément local.
+        src-element.2.2 = src-element.2.2 : Puisque ''{0}'' contient l''attribut ''ref'', son contenu doit concorder avec (annotation?). Cependant, ''{1}'' a été trouvé.
+        src-element.3 = src-element.3 : L''élément ''{0}'' présente un attribut ''type'' et un enfant ''anonymous type''. Seul un d''entre eux est autorisé dans un élément.
+        src-import.1.1 = src-import.1.1 : L''attribut namespace "{0}" d''un élément d''information d''élément <import> ne doit pas être identique à l''attribut targetNamespace du schéma dans lequel il figure.
+        src-import.1.2 = src-import.1.2 : Si l'attribut namespace ne figure pas dans un élément d'information d'élément <import>, le schéma englobant doit avoir un attribut targetNamespace.
+        src-import.2 = src-import.2 : L''élément racine du document ''{0}'' doit avoir le nom d''espace de noms ''http://www.w3.org/2001/XMLSchema'' et le nom local ''schema''.
+        src-import.3.1 = src-import.3.1 : L''attribut namespace "{0}" d''un élément d''information d''élément <import> doit être identique à l''attribut targetNamespace ''{1}'' du document importé.
+        src-import.3.2 = src-import.3.2 : Un élément d''information d''élément <import> sans attribut namespace a été trouvé. Le document importé ne peut donc pas avoir un attribut targetNamespace. Cependant, l''attribut targetNamespace ''{1}'' a été trouvé dans le document importé.
+        src-include.1 = src-include.1 : L''élément racine du document ''{0}'' doit avoir le nom d''espace de noms ''http://www.w3.org/2001/XMLSchema'' et le nom local ''schema''.
+        src-include.2.1 = src-include.2.1: L''attribut targetNamespace du schéma référencé, actuellement ''{1}'', doit être identique à celui du schéma d''inclusion, actuellement ''{0}''.
+        src-redefine.2 = src-redefine.2 : L''élément racine du document ''{0}'' doit avoir le nom d''espace de noms ''http://www.w3.org/2001/XMLSchema'' et le nom local ''schema''.
+        src-redefine.3.1 = src-redefine.3.1 : L''attribut targetNamespace du schéma référencé, actuellement ''{1}'', doit être identique à celui du schéma de redéfinition, actuellement ''{0}''.
+        src-redefine.5.a.a = src-redefine.5.a.a : Aucun enfant de non-annotation de <simpleType> n'a été trouvé. Les enfants <simpleType> des éléments <redefine> doivent comporter des descendants <restriction>, avec des attributs "base" faisant référence à eux-mêmes.
+        src-redefine.5.a.b = src-redefine.5.a.b : ''{0}'' n''est pas un élément enfant valide. Les enfants <simpleType> des éléments <redefine> doivent comporter des descendants <restriction>, avec des attributs ''base'' faisant référence à eux-mêmes.
+        src-redefine.5.a.c = src-redefine.5.a.c : ''{0}'' ne comporte pas d''attribut ''base'' faisant référence à l''élément redéfini, ''{1}''. Les enfants <simpleType> des éléments <redefine> doivent comporter des descendants <restriction>, avec des attributs ''base'' faisant référence à eux-mêmes.
+        src-redefine.5.b.a = src-redefine.5.b.a : Aucun enfant de non-annotation de <complexType> n'a été trouvé. Les enfants <complexType> des éléments <redefine> doivent comporter des descendants <extension> ou <restriction>, avec des attributs "base" faisant référence à eux-mêmes.
+        src-redefine.5.b.b = src-redefine.5.b.b : Aucun petit-enfant de non-annotation de <complexType> n'a été trouvé. Les enfants <complexType> des éléments <redefine> doivent comporter des descendants <extension> ou <restriction>, avec des attributs "base" faisant référence à eux-mêmes.
+        src-redefine.5.b.c = src-redefine.5.b.c : ''{0}'' n''est pas un élément petit-enfant valide. Les enfants <complexType> des éléments <redefine> doivent comporter des descendants <extension> ou <restriction>, avec des attributs ''base'' faisant référence à eux-mêmes.
+        src-redefine.5.b.d = src-redefine.5.b.d : ''{0}'' ne comporte pas d''attribut ''base'' faisant référence à l''élément redéfini, ''{1}''. Les enfants <complexType> des éléments <redefine> doivent comporter des descendants <extension> ou<restriction>, avec des attributs ''base'' faisant référence à eux-mêmes.
+        src-redefine.6.1.1 = src-redefine.6.1.1 : Si un enfant de groupe d''un élément <redefine> contient un groupe faisant référence à lui-même, il ne doit en comporter qu''un seul ; celui-ci en comporte ''{0}''.
+        src-redefine.6.1.2 = src-redefine.6.1.2 : Le groupe ''{0}'' qui contient une référence à un groupe en cours de redéfinition doit respecter la condition ''minOccurs'' = ''maxOccurs'' = 1.
+        src-redefine.6.2.1 = src-redefine.6.2.1 : Aucun groupe dans le schéma redéfini ne comporte un nom concordant avec ''{0}''.
+        src-redefine.6.2.2 = src-redefine.6.2.2 : Le groupe ''{0}'' ne restreint pas correctement le groupe qu''il redéfinit ; contrainte violée : ''{1}''.
+        src-redefine.7.1 = src-redefine.7.1 : Si un enfant attributeGroup d''un élément <redefine> contient un élément attributeGroup faisant référence à lui-même, il ne doit en comporter qu''un seul ; celui-ci en comporte {0}.
+        src-redefine.7.2.1 = src-redefine.7.2.1 : Aucun élément attributeGroup dans le schéma redéfini ne comporte un nom concordant avec ''{0}''.
+        src-redefine.7.2.2 = src-redefine.7.2.2 : L''élément attributeGroup ''{0}'' ne restreint pas correctement l''élément attributeGroup qu''il redéfinit ; contrainte violée : ''{1}''.
+        src-resolve = src-resolve : Impossible de résoudre le nom ''{0}'' en un composant ''{1}''.
+        src-resolve.4.1 = src-resolve.4.1 : Erreur lors de la résolution du composant ''{2}''. ''{2}'' ne comporte pas d''espace de noms, mais les composants sans espace de noms ne peuvent pas être référencés à partir du document de schéma ''{0}''. Si ''{2}'' doit avoir un espace de noms, un préfixe doit éventuellement être indiqué. Si ''{2}'' ne doit pas avoir d''espace de noms, une balise ''import'' sans un attribut "namespace" doit être ajoutée à ''{0}''.
+        src-resolve.4.2 = src-resolve.4.2 : Erreur lors de la résolution du composant ''{2}''. ''{2}'' se trouve dans l''espace de noms ''{1}'', mais les composants de cet espace de noms ne peuvent pas être référencés à partir du document de schéma ''{0}''. S''il s''agit d''un espace de noms incorrect, le préfixe de ''{2}'' doit éventuellement être modifié. S''il est correct, une balise ''import'' appropriée doit être ajoutée à ''{0}''.
+        src-simple-type.2.a = src-simple-type.2.a : Un élément <restriction> a été trouvé avec une valeur [attribute] de base et un élément <simpleType> parmi ses enfants ([children]). Un seul de ces éléments est autorisé.
+        src-simple-type.2.b = src-simple-type.2.b : Un élément <restriction> a été trouvé sans valeur [attribute] de base ni élément <simpleType> parmi ses enfants ([children]). Un de ces éléments est obligatoire.
+        src-simple-type.3.a = src-simple-type.3.a : Un élément <list> a été trouvé avec une valeur [attribute] itemType ou un élément <simpleType> parmi ses enfants ([children]). Un seul de ces éléments est autorisé.
+        src-simple-type.3.b = src-simple-type.3.b : Un élément <list> a été trouvé sans valeur [attribute] itemType ni élément <simpleType> parmi ses enfants ([children]). Un de ces éléments est obligatoire.
+        src-single-facet-value = src-single-facet-value : Le facet ''{0}'' est défini plusieurs fois.
+        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes : Un élément <union> doit avoir une valeur [attribute] memberTypes non vide ou au moins un élément <simpleType> parmi ses enfants ([children]).
 
 #constraint valid (3.X.6)
 
-        ag-props-correct.2 = ag-props-correct.2 : Erreur dans le groupe d''attributs ''{0}''. Des occurrences d''attributs en double avec un nom et un espace de noms cible identiques sont indiqu\u00E9es. Le nom de l''occurrence d''attribut en double est ''{1}''.
-        ag-props-correct.3 = ag-props-correct.3 : Erreur dans le groupe d''attributs ''{0}''. Deux d\u00E9clarations d''attribut, ''{1}'' et ''{2}'', ont des types d\u00E9riv\u00E9s de l''ID.
+        ag-props-correct.2 = ag-props-correct.2 : Erreur dans le groupe d''attributs ''{0}''. Des occurrences d''attributs en double avec un nom et un espace de noms cible identiques sont indiquées. Le nom de l''occurrence d''attribut en double est ''{1}''.
+        ag-props-correct.3 = ag-props-correct.3 : Erreur dans le groupe d''attributs ''{0}''. Deux déclarations d''attribut, ''{1}'' et ''{2}'', ont des types dérivés de l''ID.
         a-props-correct.2 = a-props-correct.2 : Valeur de contrainte de valeur ''{1}'' non valide dans l''attribut ''{0}''.
-        a-props-correct.3 = a-props-correct.3 : L''attribut ''{0}'' ne peut pas utiliser ''fixed'' ou ''default'', car sa valeur '{'type definition'}' est identique \u00E0 l''ID ou en est d\u00E9riv\u00E9e.
-        au-props-correct.2 = au-props-correct.2 : Dans la d\u00E9claration d''attribut de ''{0}'', la valeur fixe ''{1}'' a \u00E9t\u00E9 indiqu\u00E9e. Par cons\u00E9quent, si l''occurrence de l''attribut faisant r\u00E9f\u00E9rence \u00E0 ''{0}'' comporte \u00E9galement '{'value constraint'}', celle-ci doit \u00EAtre fixe et sa valeur doit \u00EAtre ''{1}''.
-        cos-all-limited.1.2 = cos-all-limited.1.2 : Un groupe de mod\u00E8les 'all' doit figurer dans une particule o\u00F9 '{'min occurs'}' = '{'max occurs'}' = 1. Cette particule doit en outre faire partie d'une paire constituant la valeur '{'content type'}' d'une d\u00E9finition de type complexe.
-        cos-all-limited.2 = cos-all-limited.2 : La valeur '{'max occurs'}' d''un \u00E9l\u00E9ment dans un groupe de mod\u00E8les ''all'' doit \u00EAtre 0 ou 1. La valeur ''{0}'' pour l''\u00E9l\u00E9ment ''{1}'' n''est pas valide.
-        cos-applicable-facets = cos-applicable-facets : Le facet ''{0}'' n''est pas autoris\u00E9 pour le type {1}.
-        cos-ct-extends.1.1 = cos-ct-extends.1.1 : Le type ''{0}'' est d\u00E9riv\u00E9 par l''extension du type ''{1}''. Toutefois, l''attribut ''final'' de ''{1}'' n''autorise pas la d\u00E9rivation par extension.
-        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a : Le type de contenu d''un type d\u00E9riv\u00E9 et celui de sa base doivent tous les deux \u00EAtre mixtes (mixed) ou \u00E9l\u00E9ment uniquement (element-only). Le type ''{0}'' est \u00E9l\u00E9ment uniquement, mais le type de sa base ne l''est pas.
-        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b : Le type de contenu d''un type d\u00E9riv\u00E9 et celui de sa base doivent tous les deux \u00EAtre mixtes (mixed) ou \u00E9l\u00E9ment uniquement (element-only). Le type ''{0}'' est mixte, mais le type de sa base ne l''est pas.
-        cos-element-consistent = cos-element-consistent : Erreur dans le type ''{0}''. Plusieurs \u00E9l\u00E9ments portant le nom ''{1}'', de divers types, figurent dans le groupe de mod\u00E8les.
-        cos-list-of-atomic = cos-list-of-atomic : Dans la d\u00E9finition du type de liste ''{0}'', le type ''{1}'' est un type d''\u00E9l\u00E9ment de liste non valide car il n''est pas atomique (''{1}'' est un type de liste ou un type d''union contenant une liste).
-        cos-nonambig = cos-nonambig : {0} et {1} (ou des \u00E9l\u00E9ments de leur groupe de substitution) violent la r\u00E8gle d''attribution de particule unique (Unique Particle Attribution). Au cours de la validation par rapport \u00E0 ce sch\u00E9ma, ces deux particules peuvent devenir ambigu\u00EBs.
-        cos-particle-restrict.a = cos-particle-restrict.a : La particule d\u00E9riv\u00E9e est vide et la base ne peut pas \u00EAtre vide.
-        cos-particle-restrict.b = cos-particle-restrict.b : La particule de base est vide, mais la particule d\u00E9riv\u00E9e ne l'est pas.
+        a-props-correct.3 = a-props-correct.3 : L''attribut ''{0}'' ne peut pas utiliser ''fixed'' ou ''default'', car sa valeur '{'type definition'}' est identique à l''ID ou en est dérivée.
+        au-props-correct.2 = au-props-correct.2 : Dans la déclaration d''attribut de ''{0}'', la valeur fixe ''{1}'' a été indiquée. Par conséquent, si l''occurrence de l''attribut faisant référence à ''{0}'' comporte également '{'value constraint'}', celle-ci doit être fixe et sa valeur doit être ''{1}''.
+        cos-all-limited.1.2 = cos-all-limited.1.2 : Un groupe de modèles 'all' doit figurer dans une particule où '{'min occurs'}' = '{'max occurs'}' = 1. Cette particule doit en outre faire partie d'une paire constituant la valeur '{'content type'}' d'une définition de type complexe.
+        cos-all-limited.2 = cos-all-limited.2 : La valeur '{'max occurs'}' d''un élément dans un groupe de modèles ''all'' doit être 0 ou 1. La valeur ''{0}'' pour l''élément ''{1}'' n''est pas valide.
+        cos-applicable-facets = cos-applicable-facets : Le facet ''{0}'' n''est pas autorisé pour le type {1}.
+        cos-ct-extends.1.1 = cos-ct-extends.1.1 : Le type ''{0}'' est dérivé par l''extension du type ''{1}''. Toutefois, l''attribut ''final'' de ''{1}'' n''autorise pas la dérivation par extension.
+        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a : Le type de contenu d''un type dérivé et celui de sa base doivent tous les deux être mixtes (mixed) ou élément uniquement (element-only). Le type ''{0}'' est élément uniquement, mais le type de sa base ne l''est pas.
+        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b : Le type de contenu d''un type dérivé et celui de sa base doivent tous les deux être mixtes (mixed) ou élément uniquement (element-only). Le type ''{0}'' est mixte, mais le type de sa base ne l''est pas.
+        cos-element-consistent = cos-element-consistent : Erreur dans le type ''{0}''. Plusieurs éléments portant le nom ''{1}'', de divers types, figurent dans le groupe de modèles.
+        cos-list-of-atomic = cos-list-of-atomic : Dans la définition du type de liste ''{0}'', le type ''{1}'' est un type d''élément de liste non valide car il n''est pas atomique (''{1}'' est un type de liste ou un type d''union contenant une liste).
+        cos-nonambig = cos-nonambig : {0} et {1} (ou des éléments de leur groupe de substitution) violent la règle d''attribution de particule unique (Unique Particle Attribution). Au cours de la validation par rapport à ce schéma, ces deux particules peuvent devenir ambiguës.
+        cos-particle-restrict.a = cos-particle-restrict.a : La particule dérivée est vide et la base ne peut pas être vide.
+        cos-particle-restrict.b = cos-particle-restrict.b : La particule de base est vide, mais la particule dérivée ne l'est pas.
         cos-particle-restrict.2 = cos-particle-restrict.2 : Restriction de particule interdite : ''{0}''.
-        cos-st-restricts.1.1 = cos-st-restricts.1.1 : Le type ''{1}'' \u00E9tant non d\u00E9composable, sa valeur '{'base type definition'}', ''{0}'', doit \u00EAtre une d\u00E9finition de type simple atomique ou un type de donn\u00E9es primitif int\u00E9gr\u00E9.
-        cos-st-restricts.2.1 = cos-st-restricts.2.1 : Dans la d\u00E9finition du type de liste ''{0}'', le type ''{1}'' est un type d''\u00E9l\u00E9ment non valide car il s''agit d''un type de liste ou un type d''union contenant une liste.
-        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1 : Le composant '{'final'}' de la valeur '{'item type definition'}', ''{0}'', contient ''list''. Cela signifie que la valeur ''{0}'' ne peut pas \u00EAtre utilis\u00E9e en tant que type d''\u00E9l\u00E9ment pour le type de liste ''{1}''.
-        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1 : Le composant '{'final'}' de la valeur '{'member type definitions'}', ''{0}'', contient ''union''. Cela signifie que la valeur ''{0}'' ne peut pas \u00EAtre utilis\u00E9e en tant que type de membre pour le type d''union ''{1}''.
-        cos-valid-default.2.1 = cos-valid-default.2.1 : L''\u00E9l\u00E9ment ''{0}'' comporte une contrainte de valeur et doit disposer d''un mod\u00E8le de contenu mixte ou simple.
-        cos-valid-default.2.2.2 = cos-valid-default.2.2.2 : Puisque l''\u00E9l\u00E9ment ''{0}'' comporte une valeur '{'value constraint'}' et que sa d\u00E9finition de type a la valeur '{'content type'}' mixte, la particule de '{'content type'}' doit pouvoir \u00EAtre vide.
-        c-props-correct.2 = c-props-correct.2 : La cardinalit\u00E9 des champs pour les valeurs keyref ''{0}'' et key ''{1}'' doit concorder.
-        ct-props-correct.3 = ct-props-correct.3 : D\u00E9finitions circulaires d\u00E9tect\u00E9es pour le type complexe ''{0}''. Cela signifie que ''{0}'' est contenu dans sa propre hi\u00E9rarchie des types, ce qui est une erreur.
-        ct-props-correct.4 = ct-props-correct.4 : Erreur dans le type ''{0}''. Des occurrences d''attributs en double avec un nom et un espace de noms cible identiques sont indiqu\u00E9es. Le nom de l''occurrence d''attribut en double est ''{1}''.
-        ct-props-correct.5 = ct-props-correct.5 : Erreur dans le type ''{0}''. Deux d\u00E9clarations d''attribut, ''{1}'' et ''{2}'', ont des types d\u00E9riv\u00E9s de l''ID.
-        derivation-ok-restriction.1 = derivation-ok-restriction.1 : Le type ''{0}'' a \u00E9t\u00E9 d\u00E9riv\u00E9 par restriction du type ''{1}''. Cependant, ''{1}'' comporte une propri\u00E9t\u00E9 '{'final'}' interdisant la d\u00E9rivation par restriction.
-        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1 : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type comporte une valeur ''use'' de ''{2}'', ce qui est incoh\u00E9rent avec la valeur ''required'' dans une occurrence d''attribut correspondante dans le type de base.
-        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2 : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type comporte le type ''{2}'', dont la d\u00E9rivation \u00E0 partir de ''{3}'', le type de l''occurrence d''attribut correspondante dans le type de base, n''est pas valide.
+        cos-st-restricts.1.1 = cos-st-restricts.1.1 : Le type ''{1}'' étant non décomposable, sa valeur '{'base type definition'}', ''{0}'', doit être une définition de type simple atomique ou un type de données primitif intégré.
+        cos-st-restricts.2.1 = cos-st-restricts.2.1 : Dans la définition du type de liste ''{0}'', le type ''{1}'' est un type d''élément non valide car il s''agit d''un type de liste ou un type d''union contenant une liste.
+        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1 : Le composant '{'final'}' de la valeur '{'item type definition'}', ''{0}'', contient ''list''. Cela signifie que la valeur ''{0}'' ne peut pas être utilisée en tant que type d''élément pour le type de liste ''{1}''.
+        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1 : Le composant '{'final'}' de la valeur '{'member type definitions'}', ''{0}'', contient ''union''. Cela signifie que la valeur ''{0}'' ne peut pas être utilisée en tant que type de membre pour le type d''union ''{1}''.
+        cos-valid-default.2.1 = cos-valid-default.2.1 : L''élément ''{0}'' comporte une contrainte de valeur et doit disposer d''un modèle de contenu mixte ou simple.
+        cos-valid-default.2.2.2 = cos-valid-default.2.2.2 : Puisque l''élément ''{0}'' comporte une valeur '{'value constraint'}' et que sa définition de type a la valeur '{'content type'}' mixte, la particule de '{'content type'}' doit pouvoir être vide.
+        c-props-correct.2 = c-props-correct.2 : La cardinalité des champs pour les valeurs keyref ''{0}'' et key ''{1}'' doit concorder.
+        ct-props-correct.3 = ct-props-correct.3 : Définitions circulaires détectées pour le type complexe ''{0}''. Cela signifie que ''{0}'' est contenu dans sa propre hiérarchie des types, ce qui est une erreur.
+        ct-props-correct.4 = ct-props-correct.4 : Erreur dans le type ''{0}''. Des occurrences d''attributs en double avec un nom et un espace de noms cible identiques sont indiquées. Le nom de l''occurrence d''attribut en double est ''{1}''.
+        ct-props-correct.5 = ct-props-correct.5 : Erreur dans le type ''{0}''. Deux déclarations d''attribut, ''{1}'' et ''{2}'', ont des types dérivés de l''ID.
+        derivation-ok-restriction.1 = derivation-ok-restriction.1 : Le type ''{0}'' a été dérivé par restriction du type ''{1}''. Cependant, ''{1}'' comporte une propriété '{'final'}' interdisant la dérivation par restriction.
+        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1 : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type comporte une valeur ''use'' de ''{2}'', ce qui est incohérent avec la valeur ''required'' dans une occurrence d''attribut correspondante dans le type de base.
+        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2 : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type comporte le type ''{2}'', dont la dérivation à partir de ''{3}'', le type de l''occurrence d''attribut correspondante dans le type de base, n''est pas valide.
         derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type comporte une contrainte de valeur effective qui n''est pas fixe, et la contrainte de valeur effective de l''occurrence d''attribut correspondante dans le type de base est fixe.
-        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type comporte une contrainte de valeur effective fixe ayant une valeur de ''{2}'', ce qui n''est pas coh\u00E9rent avec la valeur de ''{3}'' pour la contrainte de valeur effective fixe de l''occurrence d''attribut correspondante dans le type de base.
-        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type ne comporte pas d''occurrence d''attribut correspondante dans la base, et le type de base ne poss\u00E8de pas d''attribut de caract\u00E8re g\u00E9n\u00E9rique.
-        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type ne comporte pas d''occurrence d''attribut correspondante dans la base, et le caract\u00E8re g\u00E9n\u00E9rique dans le type de base n''accepte pas l''espace de noms ''{2}'' de cette occurrence d''attribut.
-        derivation-ok-restriction.3 = derivation-ok-restriction.3 : Erreur dans le type ''{0}''. Le param\u00E8tre REQUIRED de l''occurrence d''attribut ''{1}'' du type de base a la valeur True, mais il n''existe aucune occurrence d''attribut correspondante dans le type d\u00E9riv\u00E9.
-        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1 : Erreur dans le type ''{0}''. La d\u00E9rivation comporte un caract\u00E8re g\u00E9n\u00E9rique d''attribut mais le type de base n''en a pas.
-        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2 : Erreur dans le type ''{0}''. Le caract\u00E8re g\u00E9n\u00E9rique de la d\u00E9rivation n''est pas un sous-ensemble de caract\u00E8res g\u00E9n\u00E9riques valide de celui du type de base.
-        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3 : Erreur dans le type ''{0}''. Le contenu de processus du caract\u00E8re g\u00E9n\u00E9rique de la d\u00E9rivation ({1}) est plus faible que celui du type de base ({2}).
+        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type comporte une contrainte de valeur effective fixe ayant une valeur de ''{2}'', ce qui n''est pas cohérent avec la valeur de ''{3}'' pour la contrainte de valeur effective fixe de l''occurrence d''attribut correspondante dans le type de base.
+        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type ne comporte pas d''occurrence d''attribut correspondante dans la base, et le type de base ne possède pas d''attribut de caractère générique.
+        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type ne comporte pas d''occurrence d''attribut correspondante dans la base, et le caractère générique dans le type de base n''accepte pas l''espace de noms ''{2}'' de cette occurrence d''attribut.
+        derivation-ok-restriction.3 = derivation-ok-restriction.3 : Erreur dans le type ''{0}''. Le paramètre REQUIRED de l''occurrence d''attribut ''{1}'' du type de base a la valeur True, mais il n''existe aucune occurrence d''attribut correspondante dans le type dérivé.
+        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1 : Erreur dans le type ''{0}''. La dérivation comporte un caractère générique d''attribut mais le type de base n''en a pas.
+        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2 : Erreur dans le type ''{0}''. Le caractère générique de la dérivation n''est pas un sous-ensemble de caractères génériques valide de celui du type de base.
+        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3 : Erreur dans le type ''{0}''. Le contenu de processus du caractère générique de la dérivation ({1}) est plus faible que celui du type de base ({2}).
         derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1 : Erreur dans le type ''{0}''. Le type de contenu simple de ce type, ''{1}'', n''est pas une restriction valide du type de contenu simple du type de base, ''{2}''.
-        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2 : Erreur dans le type ''{0}''. Le type de contenu de ce type est vide, mais le type de contenu du type de base, ''{1}'', n''est pas vide ou ne peut pas \u00EAtre vide.
+        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2 : Erreur dans le type ''{0}''. Le type de contenu de ce type est vide, mais le type de contenu du type de base, ''{1}'', n''est pas vide ou ne peut pas être vide.
         derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2 : Erreur dans le type ''{0}''. Le type de contenu de ce type est mixte, mais le type de contenu du type de base, ''{1}'', ne l''est pas.
         derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2 : Erreur dans le type ''{0}''. La particule du type n''est pas une restriction valide de la particule du type de base.
-        enumeration-required-notation = enumeration-required-notation : Le type NOTATION, ''{0}'' utilis\u00E9 par {2} ''{1}'', doit comporter une valeur de facet d''\u00E9num\u00E9ration indiquant les \u00E9l\u00E9ments de notation utilis\u00E9s par ce type.
-        enumeration-valid-restriction = enumeration-valid-restriction : La valeur d''\u00E9num\u00E9ration ''{0}'' n''est pas comprise l''espace de valeurs du type de base, {1}.
-        e-props-correct.2 = e-props-correct.2 : Valeur de contrainte de valeur ''{1}'' non valide dans l''\u00E9l\u00E9ment ''{0}''.
-        e-props-correct.4 = e-props-correct.4 : La valeur '{'type definition'}' de l''\u00E9l\u00E9ment ''{0}'' n''est pas d\u00E9riv\u00E9e de fa\u00E7on valide \u00E0 partir de la valeur '{'type definition'}' de l''\u00E9l\u00E9ment substitutionHead ''{1}'', ou la propri\u00E9t\u00E9 '{'substitution group exclusions'}' de ''{1}'' n''accepte pas cette d\u00E9rivation.
-        e-props-correct.5 = e-props-correct.5 : Une valeur '{'value constraint'}' ne doit pas figurer dans l''\u00E9l\u00E9ment ''{0}'', car sa valeur '{'type definition'}' ou le '{'content type'}' de sa valeur '{'type definition'}' est identique \u00E0 l''ID ou en est d\u00E9riv\u00E9.
-        e-props-correct.6 = e-props-correct.6 : Groupe de substitution circulaire d\u00E9tect\u00E9 pour \u00E9l\u00E9ment ''{0}''.
-        fractionDigits-valid-restriction = fractionDigits-valid-restriction : Dans la d\u00E9finition de {2}, la valeur ''{0}'' pour le facet ''fractionDigits'' n''est pas valide car elle doit \u00EAtre <= \u00E0 la valeur de ''fractionDigits'', qui a \u00E9t\u00E9 d\u00E9finie sur ''{1}'' dans l''un des types d''anc\u00EAtre.
-        fractionDigits-totalDigits = fractionDigits-totalDigits : Dans la d\u00E9finition de {2}, la valeur ''{0}'' pour le facet ''fractionDigits'' n''est pas valide car elle doit \u00EAtre <= \u00E0 la valeur de ''totalDigits'', d\u00E9finie sur ''{1}''.
-        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1 : Pour le type {0}, si la valeur de longueur ''{1}'' est inf\u00E9rieure \u00E0 la valeur de minLength ''{2}'', une erreur est g\u00E9n\u00E9r\u00E9e.
-        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a : Pour le type {0}, une erreur est g\u00E9n\u00E9r\u00E9e si le type de base ne comporte pas un facet minLength lorsque la restriction en cours comporte le facet minLength, et que la restriction ou le type de base en cours comporte le facet de longueur.
-        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b : Pour le type {0}, si la valeur de minLength en cours ''{1}'' n''est pas \u00E9gale \u00E0 la valeur de minLength de base ''{2}'', une erreur est g\u00E9n\u00E9r\u00E9e.
-        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1 : Pour le type {0}, si la valeur de longueur ''{1}'' est sup\u00E9rieure \u00E0 la valeur de maxLength ''{2}'', une erreur est g\u00E9n\u00E9r\u00E9e.
-        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a : Pour le type {0}, une erreur est g\u00E9n\u00E9r\u00E9e si le type de base ne comporte pas un facet maxLength lorsque la restriction en cours comporte le facet maxLength, et que la restriction ou le type de base en cours comporte le facet de longueur.
-        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b : Pour le type {0}, si la valeur maxLength en cours ''{1}'' n''est pas \u00E9gale \u00E0 la valeur maxLength de base ''{2}'', une erreur est g\u00E9n\u00E9r\u00E9e.
-        length-valid-restriction = length-valid-restriction : Erreur dans le type ''{2}''. La valeur de longueur ''{0}'' doit \u00EAtre \u00E9gale \u00E0 la celle du type de base ''{1}''.
-        maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1 : Erreur dans le type ''{2}''. La valeur maxExclusive ''{0}'' doit \u00EAtre <= \u00E0 la valeur maxExclusive du type de base ''{1}''.
-        maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2 : Erreur dans le type ''{2}''. La valeur maxExclusive ''{0}'' doit \u00EAtre <= \u00E0 la valeur maxInclusive du type de base ''{1}''.
-        maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3 : Erreur dans le type ''{2}''. La valeur maxExclusive ''{0}'' doit \u00EAtre > \u00E0 la valeur minInclusive du type de base ''{1}''.
-        maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4 : Erreur dans le type ''{2}''. La valeur maxExclusive ''{0}'' doit \u00EAtre > \u00E0 la valeur minExclusive du type de base ''{1}''.
-        maxInclusive-maxExclusive = maxInclusive-maxExclusive : Vous ne pouvez pas indiquer \u00E0 la fois maxInclusive et maxExclusive pour le m\u00EAme type de donn\u00E9es. Dans {2}, maxInclusive = ''{0}'' et maxExclusive = ''{1}''.
-        maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1 : Erreur dans le type ''{2}''. La valeur maxInclusive ''{0}'' doit \u00EAtre <= \u00E0 la valeur maxInclusive du type de base ''{1}''.
-        maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2 : Erreur dans le type ''{2}''. La valeur maxInclusive ''{0}'' doit \u00EAtre < \u00E0 la valeur maxExclusive du type de base ''{1}''.
-        maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3 : Erreur dans le type ''{2}''. La valeur maxInclusive ''{0}'' doit \u00EAtre >= \u00E0 la valeur minInclusive du type de base ''{1}''.
-        maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4 : Erreur dans le type ''{2}''. La valeur maxInclusive ''{0}'' doit \u00EAtre > \u00E0 la valeur minExclusive du type de base ''{1}''.
-        maxLength-valid-restriction = maxLength-valid-restriction : Dans la d\u00E9finition de {2}, la valeur maxLength ''{0}'' doit \u00EAtre <= \u00E0 celle du type de base ''{1}''.
-        mg-props-correct.2 = mg-props-correct.2 : D\u00E9finitions circulaires d\u00E9tect\u00E9es pour le groupe ''{0}''. Le suivi r\u00E9cursif des valeurs '{'term'}' des particules conduit \u00E0 une particule o\u00F9 '{'term'}' est le groupe proprement dit.
-        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive : Dans la d\u00E9finition de {2}, la valeur minExclusive ''{0}'' doit \u00EAtre <= \u00E0 la valeur maxExclusive ''{1}''.
-        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive : Dans la d\u00E9finition de {2}, la valeur minExclusive ''{0}'' doit \u00EAtre < \u00E0 la valeur maxInclusive ''{1}''.
-        minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1 : Erreur dans le type ''{2}''. La valeur minExclusive ''{0}'' doit \u00EAtre >= \u00E0 la valeur minExclusive du type de base ''{1}''.
-        minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2 : Erreur dans le type ''{2}''. La valeur minExclusive ''{0}'' doit \u00EAtre <= \u00E0 la valeur maxInclusive du type de base ''{1}''.
-        minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3 : Erreur dans le type ''{2}''. La valeur minExclusive ''{0}'' doit \u00EAtre >= \u00E0 la valeur minInclusive du type de base ''{1}''.
-        minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4 : Erreur dans le type ''{2}''. La valeur minExclusive ''{0}'' doit \u00EAtre < \u00E0 la valeur maxExclusive du type de base ''{1}''.
-        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive : Dans la d\u00E9finition de {2}, la valeur minInclusive ''{0}'' doit \u00EAtre <= \u00E0 la valeur maxInclusive ''{1}''.
-        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive : Dans la d\u00E9finition de {2}, la valeur minInclusive ''{0}'' doit \u00EAtre < \u00E0 la valeur maxExclusive ''{1}''.
-        minInclusive-minExclusive = minInclusive-minExclusive : Vous ne pouvez pas indiquer \u00E0 la fois minInclusive et minExclusive pour le m\u00EAme type de donn\u00E9es. Dans {2}, minInclusive = ''{0}'' et minExclusive = ''{1}''.
-        minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1 : Erreur dans le type ''{2}''. La valeur minInclusive ''{0}'' doit \u00EAtre >= \u00E0 la valeur minInclusive du type de base ''{1}''.
-        minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2 : Erreur dans le type ''{2}''. La valeur minInclusive ''{0}'' doit \u00EAtre <= \u00E0 la valeur maxInclusive du type de base ''{1}''.
-        minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3 : Erreur dans le type ''{2}''. La valeur minInclusive ''{0}'' doit \u00EAtre > \u00E0 la valeur minExclusive du type de base ''{1}''.
-        minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4 : Erreur dans le type ''{2}''. La valeur minInclusive ''{0}'' doit \u00EAtre < \u00E0 la valeur maxExclusive du type de base ''{1}''.
-        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: Dans la d\u00E9finition de {2}, la valeur de minLength ''{0}'' doit \u00EAtre < \u00E0 la valeur de maxLength ''{1}''.
-        minLength-valid-restriction = minLength-valid-restriction : Dans la d\u00E9finition de {2}, la valeur de minLength ''{0}'' doit \u00EAtre >= \u00E0 celle du type de base, ''{1}''.
-        no-xmlns = no-xmlns : La valeur {name} d'une d\u00E9claration d'attribut ne doit pas \u00EAtre identique \u00E0 'xmlns'.
-        no-xsi = no-xsi : La valeur '{'target namespace'}' d''une d\u00E9claration d''attribut ne doit pas \u00EAtre identique \u00E0 ''{0}''.
-        p-props-correct.2.1 = p-props-correct.2.1 : Dans la d\u00E9claration de ''{0}'', la valeur de ''minOccurs'' est ''{1}'', mais elle ne doit pas \u00EAtre sup\u00E9rieure \u00E0 la valeur de ''maxOccurs'', qui est ''{2}''.
-        rcase-MapAndSum.1 = rcase-MapAndSum.1 : Aucune mise en correspondance fonctionnelle compl\u00E8te entre les particules.
+        enumeration-required-notation = enumeration-required-notation : Le type NOTATION, ''{0}'' utilisé par {2} ''{1}'', doit comporter une valeur de facet d''énumération indiquant les éléments de notation utilisés par ce type.
+        enumeration-valid-restriction = enumeration-valid-restriction : La valeur d''énumération ''{0}'' n''est pas comprise l''espace de valeurs du type de base, {1}.
+        e-props-correct.2 = e-props-correct.2 : Valeur de contrainte de valeur ''{1}'' non valide dans l''élément ''{0}''.
+        e-props-correct.4 = e-props-correct.4 : La valeur '{'type definition'}' de l''élément ''{0}'' n''est pas dérivée de façon valide à partir de la valeur '{'type definition'}' de l''élément substitutionHead ''{1}'', ou la propriété '{'substitution group exclusions'}' de ''{1}'' n''accepte pas cette dérivation.
+        e-props-correct.5 = e-props-correct.5 : Une valeur '{'value constraint'}' ne doit pas figurer dans l''élément ''{0}'', car sa valeur '{'type definition'}' ou le '{'content type'}' de sa valeur '{'type definition'}' est identique à l''ID ou en est dérivé.
+        e-props-correct.6 = e-props-correct.6 : Groupe de substitution circulaire détecté pour élément ''{0}''.
+        fractionDigits-valid-restriction = fractionDigits-valid-restriction : Dans la définition de {2}, la valeur ''{0}'' pour le facet ''fractionDigits'' n''est pas valide car elle doit être <= à la valeur de ''fractionDigits'', qui a été définie sur ''{1}'' dans l''un des types d''ancêtre.
+        fractionDigits-totalDigits = fractionDigits-totalDigits : Dans la définition de {2}, la valeur ''{0}'' pour le facet ''fractionDigits'' n''est pas valide car elle doit être <= à la valeur de ''totalDigits'', définie sur ''{1}''.
+        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1 : Pour le type {0}, si la valeur de longueur ''{1}'' est inférieure à la valeur de minLength ''{2}'', une erreur est générée.
+        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a : Pour le type {0}, une erreur est générée si le type de base ne comporte pas un facet minLength lorsque la restriction en cours comporte le facet minLength, et que la restriction ou le type de base en cours comporte le facet de longueur.
+        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b : Pour le type {0}, si la valeur de minLength en cours ''{1}'' n''est pas égale à la valeur de minLength de base ''{2}'', une erreur est générée.
+        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1 : Pour le type {0}, si la valeur de longueur ''{1}'' est supérieure à la valeur de maxLength ''{2}'', une erreur est générée.
+        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a : Pour le type {0}, une erreur est générée si le type de base ne comporte pas un facet maxLength lorsque la restriction en cours comporte le facet maxLength, et que la restriction ou le type de base en cours comporte le facet de longueur.
+        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b : Pour le type {0}, si la valeur maxLength en cours ''{1}'' n''est pas égale à la valeur maxLength de base ''{2}'', une erreur est générée.
+        length-valid-restriction = length-valid-restriction : Erreur dans le type ''{2}''. La valeur de longueur ''{0}'' doit être égale à la celle du type de base ''{1}''.
+        maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1 : Erreur dans le type ''{2}''. La valeur maxExclusive ''{0}'' doit être <= à la valeur maxExclusive du type de base ''{1}''.
+        maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2 : Erreur dans le type ''{2}''. La valeur maxExclusive ''{0}'' doit être <= à la valeur maxInclusive du type de base ''{1}''.
+        maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3 : Erreur dans le type ''{2}''. La valeur maxExclusive ''{0}'' doit être > à la valeur minInclusive du type de base ''{1}''.
+        maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4 : Erreur dans le type ''{2}''. La valeur maxExclusive ''{0}'' doit être > à la valeur minExclusive du type de base ''{1}''.
+        maxInclusive-maxExclusive = maxInclusive-maxExclusive : Vous ne pouvez pas indiquer à la fois maxInclusive et maxExclusive pour le même type de données. Dans {2}, maxInclusive = ''{0}'' et maxExclusive = ''{1}''.
+        maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1 : Erreur dans le type ''{2}''. La valeur maxInclusive ''{0}'' doit être <= à la valeur maxInclusive du type de base ''{1}''.
+        maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2 : Erreur dans le type ''{2}''. La valeur maxInclusive ''{0}'' doit être < à la valeur maxExclusive du type de base ''{1}''.
+        maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3 : Erreur dans le type ''{2}''. La valeur maxInclusive ''{0}'' doit être >= à la valeur minInclusive du type de base ''{1}''.
+        maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4 : Erreur dans le type ''{2}''. La valeur maxInclusive ''{0}'' doit être > à la valeur minExclusive du type de base ''{1}''.
+        maxLength-valid-restriction = maxLength-valid-restriction : Dans la définition de {2}, la valeur maxLength ''{0}'' doit être <= à celle du type de base ''{1}''.
+        mg-props-correct.2 = mg-props-correct.2 : Définitions circulaires détectées pour le groupe ''{0}''. Le suivi récursif des valeurs '{'term'}' des particules conduit à une particule où '{'term'}' est le groupe proprement dit.
+        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive : Dans la définition de {2}, la valeur minExclusive ''{0}'' doit être <= à la valeur maxExclusive ''{1}''.
+        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive : Dans la définition de {2}, la valeur minExclusive ''{0}'' doit être < à la valeur maxInclusive ''{1}''.
+        minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1 : Erreur dans le type ''{2}''. La valeur minExclusive ''{0}'' doit être >= à la valeur minExclusive du type de base ''{1}''.
+        minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2 : Erreur dans le type ''{2}''. La valeur minExclusive ''{0}'' doit être <= à la valeur maxInclusive du type de base ''{1}''.
+        minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3 : Erreur dans le type ''{2}''. La valeur minExclusive ''{0}'' doit être >= à la valeur minInclusive du type de base ''{1}''.
+        minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4 : Erreur dans le type ''{2}''. La valeur minExclusive ''{0}'' doit être < à la valeur maxExclusive du type de base ''{1}''.
+        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive : Dans la définition de {2}, la valeur minInclusive ''{0}'' doit être <= à la valeur maxInclusive ''{1}''.
+        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive : Dans la définition de {2}, la valeur minInclusive ''{0}'' doit être < à la valeur maxExclusive ''{1}''.
+        minInclusive-minExclusive = minInclusive-minExclusive : Vous ne pouvez pas indiquer à la fois minInclusive et minExclusive pour le même type de données. Dans {2}, minInclusive = ''{0}'' et minExclusive = ''{1}''.
+        minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1 : Erreur dans le type ''{2}''. La valeur minInclusive ''{0}'' doit être >= à la valeur minInclusive du type de base ''{1}''.
+        minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2 : Erreur dans le type ''{2}''. La valeur minInclusive ''{0}'' doit être <= à la valeur maxInclusive du type de base ''{1}''.
+        minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3 : Erreur dans le type ''{2}''. La valeur minInclusive ''{0}'' doit être > à la valeur minExclusive du type de base ''{1}''.
+        minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4 : Erreur dans le type ''{2}''. La valeur minInclusive ''{0}'' doit être < à la valeur maxExclusive du type de base ''{1}''.
+        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: Dans la définition de {2}, la valeur de minLength ''{0}'' doit être < à la valeur de maxLength ''{1}''.
+        minLength-valid-restriction = minLength-valid-restriction : Dans la définition de {2}, la valeur de minLength ''{0}'' doit être >= à celle du type de base, ''{1}''.
+        no-xmlns = no-xmlns : La valeur {name} d'une déclaration d'attribut ne doit pas être identique à 'xmlns'.
+        no-xsi = no-xsi : La valeur '{'target namespace'}' d''une déclaration d''attribut ne doit pas être identique à ''{0}''.
+        p-props-correct.2.1 = p-props-correct.2.1 : Dans la déclaration de ''{0}'', la valeur de ''minOccurs'' est ''{1}'', mais elle ne doit pas être supérieure à la valeur de ''maxOccurs'', qui est ''{2}''.
+        rcase-MapAndSum.1 = rcase-MapAndSum.1 : Aucune mise en correspondance fonctionnelle complète entre les particules.
         rcase-MapAndSum.2 = rcase-MapAndSum.2 : La plage d''occurrences du groupe, ({0},{1}), n''est pas une restriction valide de la plage d''occurrences du groupe de base, ({2},{3}).
-        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1 : Les \u00E9l\u00E9ments ont des noms (name) et des espaces de noms cible (target namespace) diff\u00E9rents : \u00E9l\u00E9ment "{0}" dans l''espace de noms "{1}" et \u00E9l\u00E9ment ''{2}'' dans l''espace de noms ''{3}''.
-        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2 : Erreur dans la particule o\u00F9 la valeur '{'term'}' est la d\u00E9claration d''\u00E9l\u00E9ment ''{0}''. La valeur '{'nillable'}' de la d\u00E9claration d''\u00E9l\u00E9ment est True, mais la particule correspondante dans le type de base comporte une d\u00E9claration d''\u00E9l\u00E9ment o\u00F9 la valeur '{'nillable'}' est False.
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3 : Erreur dans la particule o\u00F9 la valeur '{'term'}' est la d\u00E9claration d''\u00E9l\u00E9ment ''{0}''. Sa plage d''occurrences, ({1},{2}), n''est pas une restriction valide de la plage ({3},{4}) de la particule correspondante dans le type de base.
-        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a : L''\u00E9l\u00E9ment ''{0}'' n''est pas fixe, mais l''\u00E9l\u00E9ment correspondant dans le type de base est fixe avec la valeur ''{1}''.
-        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b : L''\u00E9l\u00E9ment ''{0}'' est fixe avec la valeur ''{1}'', mais l''\u00E9l\u00E9ment correspondant dans le type de base est fixe avec la valeur ''{2}''.
-        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5 : Les contraintes d''identit\u00E9 de l''\u00E9l\u00E9ment "{0}" ne sont pas un sous-ensemble de celles de la base.
-        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6 : Les substitutions non autoris\u00E9es pour l''\u00E9l\u00E9ment ''{0}'' ne sont pas un sur-ensemble de celles de la base.
-        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7 : Le type de l''\u00E9l\u00E9ment ''{0}'', ''{1}'', n''est pas d\u00E9riv\u00E9 du type de l''\u00E9l\u00E9ment de base, ''{2}''.
-        rcase-NSCompat.1 = rcase-NSCompat.1 : L''\u00E9l\u00E9ment ''{0}'' comporte un espace de noms ''{1}'' non autoris\u00E9 par le caract\u00E8re g\u00E9n\u00E9rique de la base.
-        rcase-NSCompat.2 = rcase-NSCompat.2 : Erreur dans la particule o\u00F9 la valeur '{'term'}' est la d\u00E9claration d''\u00E9l\u00E9ment ''{0}''. Sa plage d''occurrences, ({1},{2}), n''est pas une restriction valide de la plage ({3},{4}) de la particule correspondante dans le type de base.
-        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1 : Aucune mise en correspondance fonctionnelle compl\u00E8te entre les particules.
-        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2 : La plage d''occurrences du groupe, ({0},{1}), n''est pas une restriction valide de la plage \u00E0 caract\u00E8re g\u00E9n\u00E9rique de la base, ({2},{3}).
-        rcase-NSSubset.1 = rcase-NSSubset.1 : Le caract\u00E8re g\u00E9n\u00E9rique n'est pas un sous-ensemble du caract\u00E8re g\u00E9n\u00E9rique correspondant dans la base.
-        rcase-NSSubset.2 = rcase-NSSubset.2 : La plage d''occurrences du caract\u00E8re g\u00E9n\u00E9rique, ({0},{1}), n''est pas une restriction valide de celle de la base, ({2},{3}).
-        rcase-NSSubset.3 = rcase-NSSubset.3 : Le contenu de processus de caract\u00E8re g\u00E9n\u00E9rique, ''{0}'', est plus faible que celui figurant dans la base, ''{1}''.
+        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1 : Les éléments ont des noms (name) et des espaces de noms cible (target namespace) différents : élément "{0}" dans l''espace de noms "{1}" et élément ''{2}'' dans l''espace de noms ''{3}''.
+        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2 : Erreur dans la particule où la valeur '{'term'}' est la déclaration d''élément ''{0}''. La valeur '{'nillable'}' de la déclaration d''élément est True, mais la particule correspondante dans le type de base comporte une déclaration d''élément où la valeur '{'nillable'}' est False.
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3 : Erreur dans la particule où la valeur '{'term'}' est la déclaration d''élément ''{0}''. Sa plage d''occurrences, ({1},{2}), n''est pas une restriction valide de la plage ({3},{4}) de la particule correspondante dans le type de base.
+        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a : L''élément ''{0}'' n''est pas fixe, mais l''élément correspondant dans le type de base est fixe avec la valeur ''{1}''.
+        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b : L''élément ''{0}'' est fixe avec la valeur ''{1}'', mais l''élément correspondant dans le type de base est fixe avec la valeur ''{2}''.
+        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5 : Les contraintes d''identité de l''élément "{0}" ne sont pas un sous-ensemble de celles de la base.
+        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6 : Les substitutions non autorisées pour l''élément ''{0}'' ne sont pas un sur-ensemble de celles de la base.
+        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7 : Le type de l''élément ''{0}'', ''{1}'', n''est pas dérivé du type de l''élément de base, ''{2}''.
+        rcase-NSCompat.1 = rcase-NSCompat.1 : L''élément ''{0}'' comporte un espace de noms ''{1}'' non autorisé par le caractère générique de la base.
+        rcase-NSCompat.2 = rcase-NSCompat.2 : Erreur dans la particule où la valeur '{'term'}' est la déclaration d''élément ''{0}''. Sa plage d''occurrences, ({1},{2}), n''est pas une restriction valide de la plage ({3},{4}) de la particule correspondante dans le type de base.
+        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1 : Aucune mise en correspondance fonctionnelle complète entre les particules.
+        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2 : La plage d''occurrences du groupe, ({0},{1}), n''est pas une restriction valide de la plage à caractère générique de la base, ({2},{3}).
+        rcase-NSSubset.1 = rcase-NSSubset.1 : Le caractère générique n'est pas un sous-ensemble du caractère générique correspondant dans la base.
+        rcase-NSSubset.2 = rcase-NSSubset.2 : La plage d''occurrences du caractère générique, ({0},{1}), n''est pas une restriction valide de celle de la base, ({2},{3}).
+        rcase-NSSubset.3 = rcase-NSSubset.3 : Le contenu de processus de caractère générique, ''{0}'', est plus faible que celui figurant dans la base, ''{1}''.
         rcase-Recurse.1 = rcase-Recurse.1 : La plage d''occurrences du groupe, ({0},{1}), n''est pas une restriction valide de la plage d''occurrences du groupe de base, ({2},{3}).
-        rcase-Recurse.2 = rcase-Recurse.2 : Aucune mise en correspondance fonctionnelle compl\u00E8te entre les particules.
+        rcase-Recurse.2 = rcase-Recurse.2 : Aucune mise en correspondance fonctionnelle complète entre les particules.
         rcase-RecurseLax.1 = rcase-RecurseLax.1 : La plage d''occurrences du groupe, ({0},{1}), n''est pas une restriction valide de la plage d''occurrences du groupe de base, ({2},{3}).
-        rcase-RecurseLax.2 = rcase-RecurseLax.2 : Aucune mise en correspondance fonctionnelle compl\u00E8te entre les particules.
+        rcase-RecurseLax.2 = rcase-RecurseLax.2 : Aucune mise en correspondance fonctionnelle complète entre les particules.
         rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1 : La plage d''occurrences du groupe, ({0},{1}), n''est pas une restriction valide de la plage d''occurrences du groupe de base, ({2},{3}).
-        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2 : Aucune mise en correspondance fonctionnelle compl\u00E8te entre les particules.
+        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2 : Aucune mise en correspondance fonctionnelle complète entre les particules.
 #        We're using sch-props-correct.2 instead of the old src-redefine.1
 #        src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
-        sch-props-correct.2 = sch-props-correct.2 : Un sch\u00E9ma ne peut pas contenir deux composants globaux de m\u00EAme nom ; celui-ci contient deux occurrences de ''{0}''.
-        st-props-correct.2 = st-props-correct.2 : D\u00E9finitions circulaires d\u00E9tect\u00E9es pour le type simple ''{0}''. Cela signifie que ''{0}'' est contenu dans sa propre hi\u00E9rarchie des types, ce qui est une erreur.
-        st-props-correct.3 = st-props-correct.3 : Erreur dans le type ''{0}''. La valeur '{'final'}' de '{'base type definition'}', ''{1}'', n''accepte pas la d\u00E9rivation par restriction.
-        totalDigits-valid-restriction = totalDigits-valid-restriction : Dans la d\u00E9finition de {2}, la valeur ''{0}'' pour le facet ''totalDigits'' n''est pas valide car elle doit \u00EAtre <= \u00E0 la valeur de ''totalDigits'', qui a \u00E9t\u00E9 d\u00E9finie sur ''{1}'' dans l''un des types d''anc\u00EAtre.
-        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1 : Dans la d\u00E9finition de {0}, la valeur ''{1}'' du facet ''whitespace'' n''est pas valide car elle a \u00E9t\u00E9 d\u00E9finie sur ''collapse'' dans l''un des types d''anc\u00EAtre.
-        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2 : Dans la d\u00E9finition de {0}, la valeur ''preserve'' du facet ''whitespace'' n''est pas valide car la valeur de ''whitespace'' a \u00E9t\u00E9 d\u00E9finie sur ''replace'' dans l''un des types d''anc\u00EAtre.
+        sch-props-correct.2 = sch-props-correct.2 : Un schéma ne peut pas contenir deux composants globaux de même nom ; celui-ci contient deux occurrences de ''{0}''.
+        st-props-correct.2 = st-props-correct.2 : Définitions circulaires détectées pour le type simple ''{0}''. Cela signifie que ''{0}'' est contenu dans sa propre hiérarchie des types, ce qui est une erreur.
+        st-props-correct.3 = st-props-correct.3 : Erreur dans le type ''{0}''. La valeur '{'final'}' de '{'base type definition'}', ''{1}'', n''accepte pas la dérivation par restriction.
+        totalDigits-valid-restriction = totalDigits-valid-restriction : Dans la définition de {2}, la valeur ''{0}'' pour le facet ''totalDigits'' n''est pas valide car elle doit être <= à la valeur de ''totalDigits'', qui a été définie sur ''{1}'' dans l''un des types d''ancêtre.
+        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1 : Dans la définition de {0}, la valeur ''{1}'' du facet ''whitespace'' n''est pas valide car elle a été définie sur ''collapse'' dans l''un des types d''ancêtre.
+        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2 : Dans la définition de {0}, la valeur ''preserve'' du facet ''whitespace'' n''est pas valide car la valeur de ''whitespace'' a été définie sur ''replace'' dans l''un des types d''ancêtre.
 
 #schema for Schemas
 
-        s4s-att-invalid-value = s4s-att-invalid-value : Valeur d''attribut non valide pour ''{1}'' dans l''\u00E9l\u00E9ment ''{0}''. Raison enregistr\u00E9e : {2}
-        s4s-att-must-appear = s4s-att-must-appear : L''attribut ''{1}'' doit figurer dans l''\u00E9l\u00E9ment ''{0}''.
-        s4s-att-not-allowed = s4s-att-not-allowed : L''attribut ''{1}'' ne doit pas figurer dans l''\u00E9l\u00E9ment ''{0}''.
-        s4s-elt-invalid = s4s-elt-invalid : L''\u00E9l\u00E9ment ''{0}'' n''est pas un \u00E9l\u00E9ment valide dans un document de sch\u00E9ma.
-        s4s-elt-must-match.1 = s4s-elt-must-match.1 : Le contenu de ''{0}'' doit concorder avec {1}. Probl\u00E8me d\u00E9tect\u00E9 \u00E0 partir de : {2}.
-        s4s-elt-must-match.2 = s4s-elt-must-match.2 : Le contenu de ''{0}'' doit concorder avec {1}. Nombre insuffisant d''\u00E9l\u00E9ments trouv\u00E9s.
+        s4s-att-invalid-value = s4s-att-invalid-value : Valeur d''attribut non valide pour ''{1}'' dans l''élément ''{0}''. Raison enregistrée : {2}
+        s4s-att-must-appear = s4s-att-must-appear : L''attribut ''{1}'' doit figurer dans l''élément ''{0}''.
+        s4s-att-not-allowed = s4s-att-not-allowed : L''attribut ''{1}'' ne doit pas figurer dans l''élément ''{0}''.
+        s4s-elt-invalid = s4s-elt-invalid : L''élément ''{0}'' n''est pas un élément valide dans un document de schéma.
+        s4s-elt-must-match.1 = s4s-elt-must-match.1 : Le contenu de ''{0}'' doit concorder avec {1}. Problème détecté à partir de : {2}.
+        s4s-elt-must-match.2 = s4s-elt-must-match.2 : Le contenu de ''{0}'' doit concorder avec {1}. Nombre insuffisant d''éléments trouvés.
         # the "invalid-content" messages provide less information than the "must-match" counterparts above. They're used for complex types when providing a "match" would be an information dump
-        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1 : Le contenu de ''{0}'' n''est pas valide. L''\u00E9l\u00E9ment ''{1}'' n''est pas valide, est mal plac\u00E9 ou compte trop d''occurrences.
-        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2 : Le contenu de ''{0}'' n''est pas valide. L''\u00E9l\u00E9ment ''{1}'' ne peut pas \u00EAtre vide.
-        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3 : Les \u00E9l\u00E9ments de type ''{0}'' ne peuvent pas appara\u00EEtre apr\u00E8s les d\u00E9clarations en tant qu''enfants d''un \u00E9l\u00E9ment <schema>.
-        s4s-elt-schema-ns = s4s-elt-schema-ns : L''espace de noms de l''\u00E9l\u00E9ment ''{0}'' doit \u00EAtre issu de l''espace de noms du schema, ''http://www.w3.org/2001/XMLSchema''.
-        s4s-elt-character = s4s-elt-character : Les caract\u00E8res imprimables ne sont pas autoris\u00E9s dans les \u00E9l\u00E9ments de sch\u00E9ma autres que ''xs:appinfo'' et ''xs:documentation''. ''{0}'' a \u00E9t\u00E9 d\u00E9tect\u00E9.
+        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1 : Le contenu de ''{0}'' n''est pas valide. L''élément ''{1}'' n''est pas valide, est mal placé ou compte trop d''occurrences.
+        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2 : Le contenu de ''{0}'' n''est pas valide. L''élément ''{1}'' ne peut pas être vide.
+        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3 : Les éléments de type ''{0}'' ne peuvent pas apparaître après les déclarations en tant qu''enfants d''un élément <schema>.
+        s4s-elt-schema-ns = s4s-elt-schema-ns : L''espace de noms de l''élément ''{0}'' doit être issu de l''espace de noms du schema, ''http://www.w3.org/2001/XMLSchema''.
+        s4s-elt-character = s4s-elt-character : Les caractères imprimables ne sont pas autorisés dans les éléments de schéma autres que ''xs:appinfo'' et ''xs:documentation''. ''{0}'' a été détecté.
 
 # codes not defined by the spec
 
         c-fields-xpaths = c-fields-xpaths : La valeur de champ ''{0}'' n''est pas valide.
-        c-general-xpath = c-general-xpath : L''expression ''{0}'' n''est pas valide par rapport au sous-ensemble XPath pris en charge par le sch\u00E9ma XML.
-        c-general-xpath-ns = c-general-xpath-ns : Un pr\u00E9fixe d''espace de noms dans l''expression XPath ''{0}'' n''est li\u00E9 \u00E0 aucun espace de noms.
-        c-selector-xpath = c-selector-xpath : La valeur de s\u00E9lecteur ''{0}'' n''est pas valide ; les XPath de s\u00E9lecteur ne peuvent pas contenir d''attributs.
-        EmptyTargetNamespace = EmptyTargetNamespace : Dans le document de sch\u00E9ma ''{0}'', la valeur de l''attribut ''targetNamespace'' ne peut pas \u00EAtre une cha\u00EEne vide.
-        FacetValueFromBase = FacetValueFromBase : Dans la d\u00E9claration de type ''{0}'', la valeur ''{1}'' du facet ''{2}'' doit \u00EAtre issue de l''espace de valeurs du type de base, ''{3}''.
-        FixedFacetValue = FixedFacetValue : Dans la d\u00E9finition de {3}, la valeur ''{1}'' du facet ''{0}'' n''est pas valide, car la valeur de ''{0}'' a \u00E9t\u00E9 d\u00E9finie sur ''{2}'' dans l''un des types d''anc\u00EAtre, et '{'fixed'}' = true.
-        InvalidRegex = InvalidRegex : La valeur de mod\u00E8le ''{0}'' n''est pas une expression r\u00E9guli\u00E8re valide. L''erreur signal\u00E9e est ''{1}'', au niveau de la colonne ''{2}''.
-        MaxOccurLimit = La configuration en cours de l''analyseur ne permet pas de d\u00E9finir une valeur d''attribut maxOccurs sur une valeur sup\u00E9rieure \u00E0 {0}.
-        PublicSystemOnNotation = PublicSystemOnNotation : Au moins une des valeurs ''public'' et ''system'' doit figurer dans l'\u00E9l\u00E9ment ''notation''.
+        c-general-xpath = c-general-xpath : L''expression ''{0}'' n''est pas valide par rapport au sous-ensemble XPath pris en charge par le schéma XML.
+        c-general-xpath-ns = c-general-xpath-ns : Un préfixe d''espace de noms dans l''expression XPath ''{0}'' n''est lié à aucun espace de noms.
+        c-selector-xpath = c-selector-xpath : La valeur de sélecteur ''{0}'' n''est pas valide ; les XPath de sélecteur ne peuvent pas contenir d''attributs.
+        EmptyTargetNamespace = EmptyTargetNamespace : Dans le document de schéma ''{0}'', la valeur de l''attribut ''targetNamespace'' ne peut pas être une chaîne vide.
+        FacetValueFromBase = FacetValueFromBase : Dans la déclaration de type ''{0}'', la valeur ''{1}'' du facet ''{2}'' doit être issue de l''espace de valeurs du type de base, ''{3}''.
+        FixedFacetValue = FixedFacetValue : Dans la définition de {3}, la valeur ''{1}'' du facet ''{0}'' n''est pas valide, car la valeur de ''{0}'' a été définie sur ''{2}'' dans l''un des types d''ancêtre, et '{'fixed'}' = true.
+        InvalidRegex = InvalidRegex : La valeur de modèle ''{0}'' n''est pas une expression régulière valide. L''erreur signalée est ''{1}'', au niveau de la colonne ''{2}''.
+        MaxOccurLimit = La configuration en cours de l''analyseur ne permet pas de définir une valeur d''attribut maxOccurs sur une valeur supérieure à {0}.
+        PublicSystemOnNotation = PublicSystemOnNotation : Au moins une des valeurs ''public'' et ''system'' doit figurer dans l'élément ''notation''.
         SchemaLocation = SchemaLocation : La valeur schemaLocation ''{0}'' doit comporter un nombre pair d''URI.
-        TargetNamespace.1 = TargetNamespace.1 : Espace de noms "{0}" attendu mais l''espace de noms cible du document de sch\u00E9ma est ''{1}''.
-        TargetNamespace.2 = TargetNamespace.2 : Aucun espace de noms attendu mais le document de sch\u00E9ma comporte un espace de noms cible de ''{1}''.
-        UndeclaredEntity = UndeclaredEntity : L''entit\u00E9 ''{0}'' n''est pas d\u00E9clar\u00E9e.
-        UndeclaredPrefix = UndeclaredPrefix : Impossible de r\u00E9soudre ''{0}'' en un QName : le pr\u00E9fixe ''{1}'' n''est pas d\u00E9clar\u00E9.
+        TargetNamespace.1 = TargetNamespace.1 : Espace de noms "{0}" attendu mais l''espace de noms cible du document de schéma est ''{1}''.
+        TargetNamespace.2 = TargetNamespace.2 : Aucun espace de noms attendu mais le document de schéma comporte un espace de noms cible de ''{1}''.
+        UndeclaredEntity = UndeclaredEntity : L''entité ''{0}'' n''est pas déclarée.
+        UndeclaredPrefix = UndeclaredPrefix : Impossible de résoudre ''{0}'' en un QName : le préfixe ''{1}'' n''est pas déclaré.
 
 
 # JAXP 1.2 schema source property errors
 
-        jaxp12-schema-source-type.1 = La propri\u00E9t\u00E9 ''http://java.sun.com/xml/jaxp/properties/schemaSource'' ne peut pas avoir une valeur de type ''{0}''. Les types de valeur possibles pris en charge sont String, File, InputStream, InputSource ou un tableau de ces types.
-        jaxp12-schema-source-type.2 = La propri\u00E9t\u00E9 ''http://java.sun.com/xml/jaxp/properties/schemaSource'' ne peut pas avoir une valeur de tableau de type ''{0}''. Les types de tableau possibles pris en charge sont Object, String, File, InputStream et InputSource.
-        jaxp12-schema-source-ns = En cas d'utilisation d'un tableau des objets comme valeur de la propri\u00E9t\u00E9 'http://java.sun.com/xml/jaxp/properties/schemaSource', il est interdit d'avoir deux sch\u00E9mas qui partagent le m\u00EAme espace de noms cible.
+        jaxp12-schema-source-type.1 = La propriété ''http://java.sun.com/xml/jaxp/properties/schemaSource'' ne peut pas avoir une valeur de type ''{0}''. Les types de valeur possibles pris en charge sont String, File, InputStream, InputSource ou un tableau de ces types.
+        jaxp12-schema-source-type.2 = La propriété ''http://java.sun.com/xml/jaxp/properties/schemaSource'' ne peut pas avoir une valeur de tableau de type ''{0}''. Les types de tableau possibles pris en charge sont Object, String, File, InputStream et InputSource.
+        jaxp12-schema-source-ns = En cas d'utilisation d'un tableau des objets comme valeur de la propriété 'http://java.sun.com/xml/jaxp/properties/schemaSource', il est interdit d'avoir deux schémas qui partagent le même espace de noms cible.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties
index 00ae985aef6..7b640448b2c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties
@@ -27,216 +27,216 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
         BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
-        FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n
+        FormatFailed = Si è verificato un errore interno durante la formattazione del seguente messaggio:\n
 
 # For internal use
 
         Internal-Error = Errore interno: {0}.
         dt-whitespace = Spazio vuoto non disponibile come valore di facet per il simpleType di unione ''{0}''
-        GrammarConflict = Una grammatica restituita dal pool di grammatiche dell'utente \u00E8 in conflitto con un'altra grammatica.
+        GrammarConflict = Una grammatica restituita dal pool di grammatiche dell'utente è in conflitto con un'altra grammatica.
 
 # Identity constraints
 
         AbsentKeyValue = cvc-identity-constraint.4.2.1.a: l''elemento "{0}" non contiene valori per la chiave "{1}".
         DuplicateField = Corrispondenza duplicata nell''ambito per il campo "{0}".
-        DuplicateKey = cvc-identity-constraint.4.2.2: valore chiave duplicato [{0}] dichiarato per il vincolo di identit\u00E0 "{2}" dell''elemento "{1}".
-        DuplicateUnique = cvc-identity-constraint.4.1: valore univoco duplicato [{0}] dichiarato per il vincolo di identit\u00E0 "{2}" dell''elemento "{1}".
-        FieldMultipleMatch = cvc-identity-constraint.3: il campo "{0}" del vincolo di identit\u00E0 "{1}" corrisponde a pi\u00F9 valori nell''ambito del proprio selettore; i campi devono corrispondere a valori univoci.
+        DuplicateKey = cvc-identity-constraint.4.2.2: valore chiave duplicato [{0}] dichiarato per il vincolo di identità "{2}" dell''elemento "{1}".
+        DuplicateUnique = cvc-identity-constraint.4.1: valore univoco duplicato [{0}] dichiarato per il vincolo di identità "{2}" dell''elemento "{1}".
+        FieldMultipleMatch = cvc-identity-constraint.3: il campo "{0}" del vincolo di identità "{1}" corrisponde a più valori nell''ambito del proprio selettore; i campi devono corrispondere a valori univoci.
         FixedDiffersFromActual = Il contenuto di questo elemento non equivale al valore dell'attributo "fixed" nella dichiarazione dell'elemento nello schema.
         KeyMatchesNillable = cvc-identity-constraint.4.2.3: l''elemento "{0}" ha la chiave "{1}" che corrisponde a un elemento che ha l''attributo nillable impostato su true.
-        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: valori insufficienti forniti per il vincolo di identit\u00E0 <key name="{1}"> specificato per l''elemento "{0}".
-        KeyNotFound = cvc-identity-constraint.4.3: chiave ''{0}'' con valore ''{1}'' non trovata per il vincolo di identit\u00E0 dell''elemento ''{2}''.
-        KeyRefOutOfScope = Errore del vincolo di identit\u00E0: il vincolo di identit\u00E0 "{0}" ha un keyref che fa riferimento a una chiave o a un valore univoco fuori ambito.
+        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: valori insufficienti forniti per il vincolo di identità <key name="{1}"> specificato per l''elemento "{0}".
+        KeyNotFound = cvc-identity-constraint.4.3: chiave ''{0}'' con valore ''{1}'' non trovata per il vincolo di identità dell''elemento ''{2}''.
+        KeyRefOutOfScope = Errore del vincolo di identità: il vincolo di identità "{0}" ha un keyref che fa riferimento a una chiave o a un valore univoco fuori ambito.
         KeyRefReferNotFound = La dichiarazione "{0}" del riferimento chiave fa riferimento a una chiave sconosciuta denominata "{1}".
-        UnknownField = Errore interno del vincolo di identit\u00E0; campo "{0}" sconosciuto per il vincolo di identit\u00E0 "{2}" specificato per l''elemento "{1}".
+        UnknownField = Errore interno del vincolo di identità; campo "{0}" sconosciuto per il vincolo di identità "{2}" specificato per l''elemento "{1}".
 
 # Ideally, we should only use the following error keys, not the ones under
 # "Identity constraints". And we should cover all of the following errors.
 
 #validation (3.X.4)
 
-        cvc-attribute.3 = cvc-attribute.3: il valore ''{2}'' dell''attributo ''{1}'' sull''elemento ''{0}'' non \u00E8 valido rispetto al suo tipo ''{3}''.
-        cvc-attribute.4 = cvc-attribute.4: il valore ''{2}'' dell''attributo ''{1}'' sull''elemento ''{0}'' non \u00E8 valido rispetto al suo '{'value constraint'}' fisso. L''attributo deve avere un valore pari a ''{3}''.
-        cvc-complex-type.2.1 = cvc-complex-type.2.1: l''elemento "{0}" non deve avere [children] di voci di informazioni di carattere o elemento perch\u00E9 il tipo di contenuto \u00E8 vuoto.
+        cvc-attribute.3 = cvc-attribute.3: il valore ''{2}'' dell''attributo ''{1}'' sull''elemento ''{0}'' non è valido rispetto al suo tipo ''{3}''.
+        cvc-attribute.4 = cvc-attribute.4: il valore ''{2}'' dell''attributo ''{1}'' sull''elemento ''{0}'' non è valido rispetto al suo '{'value constraint'}' fisso. L''attributo deve avere un valore pari a ''{3}''.
+        cvc-complex-type.2.1 = cvc-complex-type.2.1: l''elemento "{0}" non deve avere [children] di voci di informazioni di carattere o elemento perché il tipo di contenuto è vuoto.
         cvc-complex-type.2.2 = cvc-complex-type.2.2: l''elemento "{0}" non deve avere [children] di tipo elemento e il valore deve essere valido.
-        cvc-complex-type.2.3 = cvc-complex-type.2.3: l''elemento "{0}" non deve avere [children] di tipo carattere perch\u00E9 il tipo di contenuto \u00E8 di soli elementi.
-        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: contenuto non valido che inizia con l''elemento "{0}". \u00C8 previsto un elemento "{1}".
-        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: il contenuto dell''elemento "{0}" non \u00E8 completo. \u00C8 previsto un elemento "{1}".
-        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: il carattere jolly corrispondente \u00E8 rigoroso ma non \u00E8 possibile trovare una dichiarazione per l''elemento "{0}".
+        cvc-complex-type.2.3 = cvc-complex-type.2.3: l''elemento "{0}" non deve avere [children] di tipo carattere perché il tipo di contenuto è di soli elementi.
+        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: contenuto non valido che inizia con l''elemento "{0}". È previsto un elemento "{1}".
+        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: il contenuto dell''elemento "{0}" non è completo. È previsto un elemento "{1}".
+        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: il carattere jolly corrispondente è rigoroso ma non è possibile trovare una dichiarazione per l''elemento "{0}".
         cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: contenuto non valido che inizia con l''elemento "{0}". Non sono previsti elementi figlio in questo punto.
-        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: contenuto non valido che inizia con l''elemento "{0}". Non \u00E8 previsto un elemento figlio ''{1}'' in questo punto.
-        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' si pu\u00F2 verificare massimo ''{2}'' volte nella sequenza corrente. Questo limite \u00E8 stato superato. \u00C8 previsto un elemento ''{1}'' in questo punto.
-        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' si pu\u00F2 verificare massimo ''{1}'' volte nella sequenza corrente. Questo limite \u00E8 stato superato. Non \u00E8 previsto un elemento figlio in questo punto.
-        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: contenuto non valido che inizia con l''elemento ''{0}'' trovato. \u00C8 previsto che ''{1}'' si verifichi almeno ''{2}'' volte nella sequenza corrente. Per soddisfare questo vincolo, \u00E8 necessaria un''altra istanza.
-        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: contenuto non valido che inizia con l''elemento ''{0}'' trovato. \u00C8 previsto che ''{1}'' si verifichi almeno ''{2}'' volte nella sequenza corrente. Per soddisfare questo vincolo, sono necessarie altre ''{3}'' istanze.
-        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: il contenuto dell''elemento ''{0}'' non \u00E8 completo. \u00C8 previsto che ''{1}'' si verifichi almeno ''{2}'' volte. Per soddisfare questo vincolo, \u00E8 necessaria un''altra istanza.
-        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: il contenuto dell''elemento ''{0}'' non \u00E8 completo. \u00C8 previsto che ''{1}'' si verifichi almeno ''{2}'' volte. Per soddisfare questo vincolo, sono necessarie altre ''{3}'' istanze.
-        cvc-complex-type.3.1 = cvc-complex-type.3.1: il valore "{2}" dell''attributo "{1}" dell''elemento "{0}" non \u00E8 valido rispetto al uso corrispondente dell''attributo. L''attributo ''{1}'' ha un valore fisso pari a ''{3}''.
+        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: contenuto non valido che inizia con l''elemento "{0}". Non è previsto un elemento figlio ''{1}'' in questo punto.
+        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' si può verificare massimo ''{2}'' volte nella sequenza corrente. Questo limite è stato superato. È previsto un elemento ''{1}'' in questo punto.
+        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' si può verificare massimo ''{1}'' volte nella sequenza corrente. Questo limite è stato superato. Non è previsto un elemento figlio in questo punto.
+        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: contenuto non valido che inizia con l''elemento ''{0}'' trovato. È previsto che ''{1}'' si verifichi almeno ''{2}'' volte nella sequenza corrente. Per soddisfare questo vincolo, è necessaria un''altra istanza.
+        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: contenuto non valido che inizia con l''elemento ''{0}'' trovato. È previsto che ''{1}'' si verifichi almeno ''{2}'' volte nella sequenza corrente. Per soddisfare questo vincolo, sono necessarie altre ''{3}'' istanze.
+        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: il contenuto dell''elemento ''{0}'' non è completo. È previsto che ''{1}'' si verifichi almeno ''{2}'' volte. Per soddisfare questo vincolo, è necessaria un''altra istanza.
+        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: il contenuto dell''elemento ''{0}'' non è completo. È previsto che ''{1}'' si verifichi almeno ''{2}'' volte. Per soddisfare questo vincolo, sono necessarie altre ''{3}'' istanze.
+        cvc-complex-type.3.1 = cvc-complex-type.3.1: il valore "{2}" dell''attributo "{1}" dell''elemento "{0}" non è valido rispetto al uso corrispondente dell''attributo. L''attributo ''{1}'' ha un valore fisso pari a ''{3}''.
         cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: l''elemento "{0}" non ha un carattere jolly di attributo per l''attributo "{1}".
-        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: l''attributo "{1}" non \u00E8 consentito nell''elemento "{0}".
+        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: l''attributo "{1}" non è consentito nell''elemento "{0}".
         cvc-complex-type.4 = cvc-complex-type.4: l''attributo ''{1}'' deve apparire sull''elemento "{0}".
-        cvc-complex-type.5.1 = cvc-complex-type.5.1: nell''elemento "{0}", l''attributo "{1}" \u00E8 un ID Wild ma esiste gi\u00E0 un ID Wild "{2}". Pu\u00F2 esisterne solo uno.
-        cvc-complex-type.5.2 = cvc-complex-type.5.2: nell''elemento "{0}", l''attributo "{1}" \u00E8 un ID Wild ma esiste gi\u00E0 un attributo "{2}" derivato dall''ID tra '{'attribute uses'}'.
-        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: "{0}" non \u00E8 un valore valido per "{1}".
-        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: "{0}" non \u00E8 un valore valido per il tipo di lista "{1}".
-        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: "{0}" non \u00E8 un valore valido per il tipo di unione "{1}".
+        cvc-complex-type.5.1 = cvc-complex-type.5.1: nell''elemento "{0}", l''attributo "{1}" è un ID Wild ma esiste già un ID Wild "{2}". Può esisterne solo uno.
+        cvc-complex-type.5.2 = cvc-complex-type.5.2: nell''elemento "{0}", l''attributo "{1}" è un ID Wild ma esiste già un attributo "{2}" derivato dall''ID tra '{'attribute uses'}'.
+        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: "{0}" non è un valore valido per "{1}".
+        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: "{0}" non è un valore valido per il tipo di lista "{1}".
+        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: "{0}" non è un valore valido per il tipo di unione "{1}".
         cvc-elt.1.a = cvc-elt.1.a: impossibile trovare la dichiarazione dell''elemento "{0}".
         cvc-elt.1.b = cvc-elt.1.b: il nome dell''elemento non corrisponde al nome della dichiarazione dell''elemento. Visualizzato ''{0}''. Previsto ''{1}''.
         cvc-elt.2 = cvc-elt.2: il valore di '{'abstract'}' nella dichiarazione di elemento per "{0}" deve essere false.
-        cvc-elt.3.1 = cvc-elt.3.1: l''attributo "{1}" non deve apparire sull''elemento "{0}" perch\u00E9 la propriet\u00E0 '{'nillable'}' di "{0}" \u00E8 false.
-        cvc-elt.3.2.1 = cvc-elt.3.2.1: l''elemento "{0}" non deve avere [children] di informazioni di tipo carattere o elemento perch\u00E9 \u00E8 specificato "{1}".
-        cvc-elt.3.2.2 = cvc-elt.3.2.2: non deve esistere alcun '{'value constraint'}' fisso per l''elemento "{0}" perch\u00E9 \u00E8 specificato "{1}".
-        cvc-elt.4.1 = cvc-elt.4.1: il valore "{2}" dell''attributo "{1}" per l''elemento "{0}" non \u00E8 un QName valido.
+        cvc-elt.3.1 = cvc-elt.3.1: l''attributo "{1}" non deve apparire sull''elemento "{0}" perché la proprietà '{'nillable'}' di "{0}" è false.
+        cvc-elt.3.2.1 = cvc-elt.3.2.1: l''elemento "{0}" non deve avere [children] di informazioni di tipo carattere o elemento perché è specificato "{1}".
+        cvc-elt.3.2.2 = cvc-elt.3.2.2: non deve esistere alcun '{'value constraint'}' fisso per l''elemento "{0}" perché è specificato "{1}".
+        cvc-elt.4.1 = cvc-elt.4.1: il valore "{2}" dell''attributo "{1}" per l''elemento "{0}" non è un QName valido.
         cvc-elt.4.2 = cvc-elt.4.2: impossibile risolvere "{1}" in una definizione tipo per l''elemento "{0}".
         cvc-elt.4.3 = cvc-elt.4.3: tipo "{1}" non derivato in modo valido dalla definizione tipo ''{2}'' dell''elemento "{0}".
-        cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'value constraint'}' "{2}" dell''elemento "{0}" non \u00E8 un valore predefinito valido per il tipo "{1}".
+        cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'value constraint'}' "{2}" dell''elemento "{0}" non è un valore predefinito valido per il tipo "{1}".
         cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: l''elemento "{0}" non deve avere [children] di voci di informazioni di elemento.
         cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: il valore "{1}" dell''elemento "{0}" non corrisponde al valore fisso di '{'value constraint'}' "{2}".
         cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: il valore "{1}" dell''elemento "{0}" non corrisponde al valore di '{'value constraint'}' "{2}".
-        cvc-enumeration-valid = cvc-enumeration-valid: il valore "{0}" non \u00E8 valido come facet rispetto all''enumerazione "{1}". Deve essere un valore dell''enumerazione.
-        cvc-fractionDigits-valid = cvc-fractionDigits-valid: il valore ''{0}'' ha {1} cifre di frazione, ma il numero di cifre di frazione \u00E8 stato limitato a {2}.
+        cvc-enumeration-valid = cvc-enumeration-valid: il valore "{0}" non è valido come facet rispetto all''enumerazione "{1}". Deve essere un valore dell''enumerazione.
+        cvc-fractionDigits-valid = cvc-fractionDigits-valid: il valore ''{0}'' ha {1} cifre di frazione, ma il numero di cifre di frazione è stato limitato a {2}.
         cvc-id.1 = cvc-id.1: non esiste alcuna associazione ID/IDREF per l''IDREF "{0}".
-        cvc-id.2 = cvc-id.2: esistono pi\u00F9 ricorrenze del valore di ID "{0}".
-        cvc-id.3 = cvc-id.3: un campo del vincolo di identit\u00E0 "{0}" corrispondeva all''elemento "{1}" ma questo elemento non ha un tipo semplice.
-        cvc-length-valid = cvc-length-valid: il valore "{0}" con lunghezza = "{1}" non \u00E8 valido come facet rispetto alla lunghezza "{2}" per il tipo "{3}".
-        cvc-maxExclusive-valid = cvc-maxExclusive-valid: il valore "{0}" non \u00E8 valido come facet rispetto a maxExclusive "{1}" per il tipo ''{2}''.
-        cvc-maxInclusive-valid = cvc-maxInclusive-valid: il valore "{0}" non \u00E8 valido come facet rispetto a maxInclusive "{1}" per il tipo ''{2}''.
-        cvc-maxLength-valid = cvc-maxLength-valid: il valore "{0}" con lunghezza = "{1}" non \u00E8 valido come facet rispetto a maxLength "{2}" per il tipo "{3}".
-        cvc-minExclusive-valid = cvc-minExclusive-valid: il valore "{0}" non \u00E8 valido come facet rispetto a minExclusive "{1}" per il tipo ''{2}''.
-        cvc-minInclusive-valid = cvc-minInclusive-valid: il valore "{0}" non \u00E8 valido come facet rispetto a minExclusive "{1}" per il tipo ''{2}''.
-        cvc-minLength-valid = cvc-minLength-valid: il valore "{0}" con lunghezza = "{1}" non \u00E8 valido come facet rispetto a minLength "{2}" per il tipo "{3}".
-        cvc-pattern-valid = cvc-pattern-valid: il valore "{0}" non \u00E8 valido come facet rispetto al pattern "{1}" per il tipo ''{2}''.
-        cvc-totalDigits-valid = cvc-totalDigits-valid: il valore ''{0}'' ha {1} cifre di totale, ma il numero di cifre di totale \u00E8 stato limitato a {2}.
+        cvc-id.2 = cvc-id.2: esistono più ricorrenze del valore di ID "{0}".
+        cvc-id.3 = cvc-id.3: un campo del vincolo di identità "{0}" corrispondeva all''elemento "{1}" ma questo elemento non ha un tipo semplice.
+        cvc-length-valid = cvc-length-valid: il valore "{0}" con lunghezza = "{1}" non è valido come facet rispetto alla lunghezza "{2}" per il tipo "{3}".
+        cvc-maxExclusive-valid = cvc-maxExclusive-valid: il valore "{0}" non è valido come facet rispetto a maxExclusive "{1}" per il tipo ''{2}''.
+        cvc-maxInclusive-valid = cvc-maxInclusive-valid: il valore "{0}" non è valido come facet rispetto a maxInclusive "{1}" per il tipo ''{2}''.
+        cvc-maxLength-valid = cvc-maxLength-valid: il valore "{0}" con lunghezza = "{1}" non è valido come facet rispetto a maxLength "{2}" per il tipo "{3}".
+        cvc-minExclusive-valid = cvc-minExclusive-valid: il valore "{0}" non è valido come facet rispetto a minExclusive "{1}" per il tipo ''{2}''.
+        cvc-minInclusive-valid = cvc-minInclusive-valid: il valore "{0}" non è valido come facet rispetto a minExclusive "{1}" per il tipo ''{2}''.
+        cvc-minLength-valid = cvc-minLength-valid: il valore "{0}" con lunghezza = "{1}" non è valido come facet rispetto a minLength "{2}" per il tipo "{3}".
+        cvc-pattern-valid = cvc-pattern-valid: il valore "{0}" non è valido come facet rispetto al pattern "{1}" per il tipo ''{2}''.
+        cvc-totalDigits-valid = cvc-totalDigits-valid: il valore ''{0}'' ha {1} cifre di totale, ma il numero di cifre di totale è stato limitato a {2}.
         cvc-type.1 = cvc-type.1: definizione tipo ''{0}'' non trovata.
-        cvc-type.2 = cvc-type.2: la definizione tipo non pu\u00F2 essere astratta per l''elemento {0}.
-        cvc-type.3.1.1 = cvc-type.3.1.1: l''elemento ''{0}'' \u00E8 di tipo semplice, quindi non pu\u00F2 avere attributi, tranne quelli il cui spazio di nomi \u00E8 uguale ''http://www.w3.org/2001/XMLSchema-instance'' e il cui [local name] \u00E8 uno tra ''type'', ''nil'', ''schemaLocation'' o ''noNamespaceSchemaLocation''. \u00C8 stato trovato l''attributo ''{1}''.
-        cvc-type.3.1.2 = cvc-type.3.1.2: l''elemento "{0}" \u00E8 di tipo semplice, quindi non deve avere [children] di voci di informazioni di elemento.
-        cvc-type.3.1.3 = cvc-type.3.1.3: il valore "{1}" dell''elemento "{0}" non \u00E8 valido.
+        cvc-type.2 = cvc-type.2: la definizione tipo non può essere astratta per l''elemento {0}.
+        cvc-type.3.1.1 = cvc-type.3.1.1: l''elemento ''{0}'' è di tipo semplice, quindi non può avere attributi, tranne quelli il cui spazio di nomi è uguale ''http://www.w3.org/2001/XMLSchema-instance'' e il cui [local name] è uno tra ''type'', ''nil'', ''schemaLocation'' o ''noNamespaceSchemaLocation''. È stato trovato l''attributo ''{1}''.
+        cvc-type.3.1.2 = cvc-type.3.1.2: l''elemento "{0}" è di tipo semplice, quindi non deve avere [children] di voci di informazioni di elemento.
+        cvc-type.3.1.3 = cvc-type.3.1.3: il valore "{1}" dell''elemento "{0}" non è valido.
 
 #schema valid (3.X.3)
 
-        schema_reference.access = schema_reference: lettura del documento di schema ''{0}'' non riuscita. Accesso ''{1}'' non consentito a causa della limitazione definita dalla propriet\u00E0 accessExternalSchema. 
-        schema_reference.4 = schema_reference.4: lettura del documento di schema "{0}" non riuscita perch\u00E9 1) non \u00E8 stato possibile trovare il documento; 2) non \u00E8 stato possibile leggere il documento; 3) l''elemento radice del documento non \u00E8 <xsd:schema>.
-        src-annotation = src-annotation: possono essere contenuti soltanto elementi <appinfo> e <documentation>, ma \u00E8 stato trovato ''{0}''.
-        src-attribute.1 = src-attribute.1: le propriet\u00E0 ''default'' e ''fixed'' non possono essere entrambi presenti nella dichiarazione di attributo ''{0}''. Utilizzarne solo una.
-        src-attribute.2 = src-attribute.2: la propriet\u00E0 ''default'' \u00E8 presente nell''attributo ''{0}'', quindi il valore di ''use'' deve essere ''optional''.
+        schema_reference.access = schema_reference: lettura del documento di schema ''{0}'' non riuscita. Accesso ''{1}'' non consentito a causa della limitazione definita dalla proprietà accessExternalSchema. 
+        schema_reference.4 = schema_reference.4: lettura del documento di schema "{0}" non riuscita perché 1) non è stato possibile trovare il documento; 2) non è stato possibile leggere il documento; 3) l''elemento radice del documento non è <xsd:schema>.
+        src-annotation = src-annotation: possono essere contenuti soltanto elementi <appinfo> e <documentation>, ma è stato trovato ''{0}''.
+        src-attribute.1 = src-attribute.1: le proprietà ''default'' e ''fixed'' non possono essere entrambi presenti nella dichiarazione di attributo ''{0}''. Utilizzarne solo una.
+        src-attribute.2 = src-attribute.2: la proprietà ''default'' è presente nell''attributo ''{0}'', quindi il valore di ''use'' deve essere ''optional''.
         src-attribute.3.1 = src-attribute.3.1: in una dichiarazione di attributo locale deve essere presente 'ref' o 'name'.
         src-attribute.3.2 = src-attribute.3.2: il contenuto deve corrispondere a (annotation?) per il riferimento di attributo "{0}".
-        src-attribute.4 = src-attribute.4: l''attributo "{0}" ha sia un attributo ''type'' che un elemento figlio "simpleType" anonimo. \u00C8 consentito uno solo di questi valori per un attributo.
-        src-attribute_group.2 = src-attribute_group.2: non \u00E8 possibile esprimere l''intersezione di caratteri jolly per il gruppo di attributi ''{0}''.
+        src-attribute.4 = src-attribute.4: l''attributo "{0}" ha sia un attributo ''type'' che un elemento figlio "simpleType" anonimo. È consentito uno solo di questi valori per un attributo.
+        src-attribute_group.2 = src-attribute_group.2: non è possibile esprimere l''intersezione di caratteri jolly per il gruppo di attributi ''{0}''.
         src-attribute_group.3 = src-attribute_group.3: sono state rilevate definizioni circolari per il gruppo di attributi ''{0}''. Se si seguono ricorsivamente i riferimenti ai gruppi di attributi, si torna inevitabilmente al punto di partenza.
-        src-ct.1 = src-ct.1: errore di rappresentazione della definizione di tipo complesso per il tipo ''{0}''. Se si utilizza <complexContent>, il tipo di base deve essere un complexType. ''{1}'' \u00E8 simpleType.
-        src-ct.2.1 = src-ct.2.1: errore di rappresentazione della definizione di tipo complesso per il tipo ''{0}''. Se si utilizza <complexContent>, il tipo di base deve essere un complexType con tipo di contenuto semplice oppure, se \u00E8 specificata solo la limitazione, un tipo complesso con contenuto misto e parte svuotabile oppure, se \u00E8 specificato solo l''estensione, un tipo semplice. ''{1}'' non soddisfa alcuna di queste condizioni.
+        src-ct.1 = src-ct.1: errore di rappresentazione della definizione di tipo complesso per il tipo ''{0}''. Se si utilizza <complexContent>, il tipo di base deve essere un complexType. ''{1}'' è simpleType.
+        src-ct.2.1 = src-ct.2.1: errore di rappresentazione della definizione di tipo complesso per il tipo ''{0}''. Se si utilizza <complexContent>, il tipo di base deve essere un complexType con tipo di contenuto semplice oppure, se è specificata solo la limitazione, un tipo complesso con contenuto misto e parte svuotabile oppure, se è specificato solo l''estensione, un tipo semplice. ''{1}'' non soddisfa alcuna di queste condizioni.
         src-ct.2.2 = src-ct.2.2: errore di rappresentazione della definizione di tipo complesso per il tipo "{0}". Quando un complexType con simpleContent limita un complexType con contenuto misto e parte svuotabile, deve esistere un <simpleType> tra gli elementi figlio di <restriction>.
-        src-ct.4 = src-ct.4: errore di rappresentazione della definizione di tipo complesso per il tipo ''{0}''. Non \u00E8 possibile esprimere l''intersezione di caratteri jolly.
-        src-ct.5 = src-ct.5: errore di rappresentazione della definizione di tipo complesso per il tipo ''{0}''. Non \u00E8 possibile esprimere l''unione di caratteri jolly.
-        src-element.1 = src-element.1: le propriet\u00E0 ''default'' e ''fixed'' non possono essere entrambi presenti nella dichiarazione di elemento ''{0}''. Utilizzarne solo una.
+        src-ct.4 = src-ct.4: errore di rappresentazione della definizione di tipo complesso per il tipo ''{0}''. Non è possibile esprimere l''intersezione di caratteri jolly.
+        src-ct.5 = src-ct.5: errore di rappresentazione della definizione di tipo complesso per il tipo ''{0}''. Non è possibile esprimere l''unione di caratteri jolly.
+        src-element.1 = src-element.1: le proprietà ''default'' e ''fixed'' non possono essere entrambi presenti nella dichiarazione di elemento ''{0}''. Utilizzarne solo una.
         src-element.2.1 = src-element.2.1: in una dichiarazione di elemento locale deve essere presente 'ref' o 'name'.
-        src-element.2.2 = src-element.2.2: poich\u00E9 ''{0}'' contiene l''attributo ''ref'', il suo contenuto deve corrispondere a (annotation?), ma \u00E8 stato trovato ''{1}''.
-        src-element.3 = src-element.3: l''elemento "{0}" ha sia un attributo ''type'' che un elemento figlio "anonymous type". \u00C8 consentito uno solo di questi valori per un elemento.
+        src-element.2.2 = src-element.2.2: poiché ''{0}'' contiene l''attributo ''ref'', il suo contenuto deve corrispondere a (annotation?), ma è stato trovato ''{1}''.
+        src-element.3 = src-element.3: l''elemento "{0}" ha sia un attributo ''type'' che un elemento figlio "anonymous type". È consentito uno solo di questi valori per un elemento.
         src-import.1.1 = src-import.1.1: l''attributo "{0}" dello spazio di nomi di una voce di informazioni di elemento <import> non deve essere uguale al targetNamespace dello schema in cui esiste.
-        src-import.1.2 = src-import.1.2: se l'attributo dello spazio di nomi non \u00E8 presente in una voce di informazioni di elemento <import>, lo schema che lo contiene deve avere un targetNamespace.
+        src-import.1.2 = src-import.1.2: se l'attributo dello spazio di nomi non è presente in una voce di informazioni di elemento <import>, lo schema che lo contiene deve avere un targetNamespace.
         src-import.2 = src-import.2: l''elemento radice del documento "{0}" deve avere lo spazio di nomi denominato ''http://www.w3.org/2001/XMLSchema'' e il nome locale ''schema''.
         src-import.3.1 = src-import.3.1: l''attributo "{0}" dello spazio di nomi di una voce di informazioni di elemento <import> deve essere uguale all''attributo targetNamespace ''{1}'' del documento importato.
-        src-import.3.2 = src-import.3.2: non esiste alcun attributo dello spazio di nomi nella voce di informazioni di elemento <import>, pertanto il documento importato non pu\u00F2 avere alcun attributo targetNamespace. tuttavia, \u00E8 stato trovato targetNamespace ''{1}'' nel documento importato.
+        src-import.3.2 = src-import.3.2: non esiste alcun attributo dello spazio di nomi nella voce di informazioni di elemento <import>, pertanto il documento importato non può avere alcun attributo targetNamespace. tuttavia, è stato trovato targetNamespace ''{1}'' nel documento importato.
         src-include.1 = src-include.1: l''elemento radice del documento "{0}" deve avere lo spazio di nomi denominato ''http://www.w3.org/2001/XMLSchema'' e il nome locale ''schema''.
         src-include.2.1 = src-include.2.1: targetNamespace dello schema di riferimento (attualmente "{1}") deve essere identico a quello dello schema di inclusione (attualmente "{0}").
         src-redefine.2 = src-redefine.2: l''elemento radice del documento "{0}" deve avere lo spazio di nomi denominato ''http://www.w3.org/2001/XMLSchema'' e il nome locale ''schema''.
         src-redefine.3.1 = src-redefine.3.1: targetNamespace dello schema di riferimento (attualmente "{1}") deve essere identico a quello dello schema di ridefinizione (attualmente "{0}").
-        src-redefine.5.a.a = src-redefine.5.a.a: non \u00E8 stato trovato alcun elemento figlio di non annotazione di tipo <simpleType>. Gli elementi figlio <simpleType> di elementi <redefine> devono avere discendenti <restriction>, con attributi 'base' che fanno riferimento a s\u00E9 stessi.
-        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' non \u00E8 un elemento figlio valido. Gli elementi figlio <simpleType> di elementi <redefine> devono avere discendenti <restriction>, con attributi ''base'' che fanno riferimento a s\u00E9 stessi.
-        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' non dispone di un attributo "base" che fa riferimento all''elemento ridefinito ''{1}''. Gli elementi figlio <simpleType> di elementi <redefine> devono avere discendenti <restriction>, con attributi ''base'' che fanno riferimento a s\u00E9 stessi.
-        src-redefine.5.b.a = src-redefine.5.b.a: non \u00E8 stato trovato alcun elemento figlio di non annotazione di tipo <complexType>. Gli elementi figlio <complexType> di elementi <redefine> devono avere discendenti <extension> o <restriction>, con attributi 'base' che fanno riferimento a s\u00E9 stessi.
-        src-redefine.5.b.b = src-redefine.5.b.b: non \u00E8 stato trovato alcun elemento nipote di non annotazione di tipo <complexType>. Gli elementi figlio <complexType> di elementi <redefine> devono avere discendenti <extension> o <restriction>, con attributi 'base' che fanno riferimento a s\u00E9 stessi.
-        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}'' non \u00E8 un elemento nipote valido. Gli elementi figlio <complexType> di elementi <redefine> devono avere discendenti <extension> o <restriction>, con attributi ''base'' che fanno riferimento a s\u00E9 stessi.
-        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}'' non dispone di un attributo "base" che fa riferimento all''elemento ridefinito ''{1}''. Gli elementi figlio <complexType> di elementi <redefine> devono avere discendenti <extension> o <restriction>, con attributi ''base'' che fanno riferimento a s\u00E9 stessi.
-        src-redefine.6.1.1 = src-redefine.6.1.1: se un elemento figlio del gruppo di un elemento <redefine> contiene un gruppo che fa riferimento a s\u00E9 stesso, deve averne esattamente uno, mentre questo ne ha "{0}".
+        src-redefine.5.a.a = src-redefine.5.a.a: non è stato trovato alcun elemento figlio di non annotazione di tipo <simpleType>. Gli elementi figlio <simpleType> di elementi <redefine> devono avere discendenti <restriction>, con attributi 'base' che fanno riferimento a sé stessi.
+        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' non è un elemento figlio valido. Gli elementi figlio <simpleType> di elementi <redefine> devono avere discendenti <restriction>, con attributi ''base'' che fanno riferimento a sé stessi.
+        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' non dispone di un attributo "base" che fa riferimento all''elemento ridefinito ''{1}''. Gli elementi figlio <simpleType> di elementi <redefine> devono avere discendenti <restriction>, con attributi ''base'' che fanno riferimento a sé stessi.
+        src-redefine.5.b.a = src-redefine.5.b.a: non è stato trovato alcun elemento figlio di non annotazione di tipo <complexType>. Gli elementi figlio <complexType> di elementi <redefine> devono avere discendenti <extension> o <restriction>, con attributi 'base' che fanno riferimento a sé stessi.
+        src-redefine.5.b.b = src-redefine.5.b.b: non è stato trovato alcun elemento nipote di non annotazione di tipo <complexType>. Gli elementi figlio <complexType> di elementi <redefine> devono avere discendenti <extension> o <restriction>, con attributi 'base' che fanno riferimento a sé stessi.
+        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}'' non è un elemento nipote valido. Gli elementi figlio <complexType> di elementi <redefine> devono avere discendenti <extension> o <restriction>, con attributi ''base'' che fanno riferimento a sé stessi.
+        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}'' non dispone di un attributo "base" che fa riferimento all''elemento ridefinito ''{1}''. Gli elementi figlio <complexType> di elementi <redefine> devono avere discendenti <extension> o <restriction>, con attributi ''base'' che fanno riferimento a sé stessi.
+        src-redefine.6.1.1 = src-redefine.6.1.1: se un elemento figlio del gruppo di un elemento <redefine> contiene un gruppo che fa riferimento a sé stesso, deve averne esattamente uno, mentre questo ne ha "{0}".
         src-redefine.6.1.2 = src-redefine.6.1.2: il gruppo "{0}" che contiene un riferimento a un gruppo in fase di ridefinizione deve avere minOccurs = maxOccurs = 1.
         src-redefine.6.2.1 = src-redefine.6.2.1: nessun gruppo nello schema ridefinito con nome corrispondente a "{0}".
         src-redefine.6.2.2 = src-redefine.6.2.2: il gruppo "{0}" non limita correttamente il gruppo che ridefinisce; vincolo violato: "{1}".
-        src-redefine.7.1 = src-redefine.7.1: se un elemento figlio attributeGroup di un elemento <redefine> contiene un attributeGroup che fa riferimento a s\u00E9 stesso, deve averne esattamente uno, mentre questo ne ha "{0}".
+        src-redefine.7.1 = src-redefine.7.1: se un elemento figlio attributeGroup di un elemento <redefine> contiene un attributeGroup che fa riferimento a sé stesso, deve averne esattamente uno, mentre questo ne ha "{0}".
         src-redefine.7.2.1 = src-redefine.7.2.1: nessun attributeGroup nello schema ridefinito con nome corrispondente a "{0}".
         src-redefine.7.2.2 = src-redefine.7.2.2: AttributeGroup "{0}" non limita correttamente l''AttributeGroup che ridefinisce; vincolo violato: "{1}".
         src-resolve = src-resolve: impossibile risolvere il nome "{0}" in un componente {1}.
-        src-resolve.4.1 = src-resolve.4.1: errore durante la risoluzione del componente ''{2}''. \u00C8 stato rilevato che ''{2}'' non dispone di uno spazio di nomi, ma ai componenti senza spazi di nomi di destinazione non \u00E8 possibile fare riferimento dal documento di schema ''{0}''. Se \u00E8 previsto che ''{2}'' abbia uno spazio di nomi, \u00E8 probabile che sia necessario specificare un prefisso. Se, invece, \u00E8 previsto che ''{2}'' non abbia uno spazio di nomi, aggiungere ''import'' senza un attributo "namespace" a ''{0}''.
-        src-resolve.4.2 = src-resolve.4.2: errore durante la risoluzione del componente ''{2}''. \u00C8 stato rilevato che ''{2}'' si trova nello spazio di nomi ''{1}'', ma ai componenti di questo spazio di nomi di destinazione non \u00E8 possibile fare riferimento dal documento di schema ''{0}''. Se questo spazio di nomi \u00E8 errato, \u00E8 probabile che sia necessario modificare il prefisso ''{2}''. Se lo spazio di nomi \u00E8 corretto, aggiungere la tag ''import'' adeguata a ''{0}''.
-        src-simple-type.2.a = src-simple-type.2.a: \u00E8 stato trovato un elemento <restriction> che contiene sia un [attribute] di base che un elemento <simpleType> tra i rispettivi [children]. \u00C8 consentito solo uno.
-        src-simple-type.2.b = src-simple-type.2.b: \u00E8 stato trovato un elemento <restriction> che non contiene n\u00E9 un [attribute] di base n\u00E9 un elemento <simpleType> tra i rispettivi [children]. Ne \u00E8 richiesto uno.
-        src-simple-type.3.a = src-simple-type.3.a: \u00E8 stato trovato un elemento <list> che contiene sia un [attribute] itemType che un elemento <simpleType> tra i rispettivi [children]. \u00C8 consentito solo uno.
-        src-simple-type.3.b = src-simple-type.3.b: \u00E8 stato trovato un elemento <list> che non contiene n\u00E9 un [attribute] itemType n\u00E9 un elemento <simpleType> tra i rispettivi [children]. Ne \u00E8 richiesto uno.
-        src-single-facet-value = src-single-facet-value: il facet ''{0}'' \u00E8 stato definito pi\u00F9 volte.
+        src-resolve.4.1 = src-resolve.4.1: errore durante la risoluzione del componente ''{2}''. È stato rilevato che ''{2}'' non dispone di uno spazio di nomi, ma ai componenti senza spazi di nomi di destinazione non è possibile fare riferimento dal documento di schema ''{0}''. Se è previsto che ''{2}'' abbia uno spazio di nomi, è probabile che sia necessario specificare un prefisso. Se, invece, è previsto che ''{2}'' non abbia uno spazio di nomi, aggiungere ''import'' senza un attributo "namespace" a ''{0}''.
+        src-resolve.4.2 = src-resolve.4.2: errore durante la risoluzione del componente ''{2}''. È stato rilevato che ''{2}'' si trova nello spazio di nomi ''{1}'', ma ai componenti di questo spazio di nomi di destinazione non è possibile fare riferimento dal documento di schema ''{0}''. Se questo spazio di nomi è errato, è probabile che sia necessario modificare il prefisso ''{2}''. Se lo spazio di nomi è corretto, aggiungere la tag ''import'' adeguata a ''{0}''.
+        src-simple-type.2.a = src-simple-type.2.a: è stato trovato un elemento <restriction> che contiene sia un [attribute] di base che un elemento <simpleType> tra i rispettivi [children]. È consentito solo uno.
+        src-simple-type.2.b = src-simple-type.2.b: è stato trovato un elemento <restriction> che non contiene né un [attribute] di base né un elemento <simpleType> tra i rispettivi [children]. Ne è richiesto uno.
+        src-simple-type.3.a = src-simple-type.3.a: è stato trovato un elemento <list> che contiene sia un [attribute] itemType che un elemento <simpleType> tra i rispettivi [children]. È consentito solo uno.
+        src-simple-type.3.b = src-simple-type.3.b: è stato trovato un elemento <list> che non contiene né un [attribute] itemType né un elemento <simpleType> tra i rispettivi [children]. Ne è richiesto uno.
+        src-single-facet-value = src-single-facet-value: il facet ''{0}'' è stato definito più volte.
         src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: un elemento <union> deve avere un [attribute] memberTypes non vuoto o almeno un elemento <simpleType> tra i rispettivi [children].
 
 #constraint valid (3.X.6)
 
-        ag-props-correct.2 = ag-props-correct.2: errore per il gruppo di attributi "{0}". Sono specificati usi di attributi duplicati con lo stesso nome e spazio di nomi di destinazione. Il nome dell''uso dell''attributo duplicato \u00E8 "{1}".
+        ag-props-correct.2 = ag-props-correct.2: errore per il gruppo di attributi "{0}". Sono specificati usi di attributi duplicati con lo stesso nome e spazio di nomi di destinazione. Il nome dell''uso dell''attributo duplicato è "{1}".
         ag-props-correct.3 = ag-props-correct.3: errore per il gruppo di attributi "{0}". Due dichiarazioni di attributo, "{1}" e "{2}" hanno tipi derivati dall''ID.
         a-props-correct.2 = a-props-correct.2: valore di vincolo di valore "{1}" non valido nell''attributo "{0}".
-        a-props-correct.3 = a-props-correct.3: l''attributo ''{0}'' non pu\u00F2 utilizzare il valore ''fixed'' o ''default'' poich\u00E9 la '{'type definition'}' dell''attributo \u00E8 un ID o \u00E8 derivata dall''ID.
-        au-props-correct.2 = au-props-correct.2: nella dichiarazione di attributo di ''{0}'' \u00E8 stato specificato un valore fisso ''{1}''. Se, pertanto, l''uso dell''attributo che fa riferimento a ''{0}'' ha anche un valore '{'value constraint'}', deve essere fisso e il suo valore deve essere ''{1}''.
+        a-props-correct.3 = a-props-correct.3: l''attributo ''{0}'' non può utilizzare il valore ''fixed'' o ''default'' poiché la '{'type definition'}' dell''attributo è un ID o è derivata dall''ID.
+        au-props-correct.2 = au-props-correct.2: nella dichiarazione di attributo di ''{0}'' è stato specificato un valore fisso ''{1}''. Se, pertanto, l''uso dell''attributo che fa riferimento a ''{0}'' ha anche un valore '{'value constraint'}', deve essere fisso e il suo valore deve essere ''{1}''.
         cos-all-limited.1.2 = cos-all-limited.1.2: deve apparire un gruppo di modelli 'all' in una parte con '{'min occurs'}' = '{'max occurs'}' = 1 e la parte deve far parte di una coppia che costituisca il '{'content type'}' di una definizione di tipo complesso.
-        cos-all-limited.2 = cos-all-limited.2: il valore '{'max occurs'}' di un elemento in un gruppo di modelli ''all'' deve essere 0 o 1. Il valore ''{0}'' per l''elemento ''{1}'' non \u00E8 valido.
+        cos-all-limited.2 = cos-all-limited.2: il valore '{'max occurs'}' di un elemento in un gruppo di modelli ''all'' deve essere 0 o 1. Il valore ''{0}'' per l''elemento ''{1}'' non è valido.
         cos-applicable-facets = cos-applicable-facets: facet ''{0}'' non consentito dal tipo {1}.
-        cos-ct-extends.1.1 = cos-ct-extends.1.1: il tipo ''{0}'' \u00E8 stato derivato mediante estensione dal tipo ''{1}'', ma l''attributo "final" di ''{1}'' impedisce la derivazione mediante estensione.
-        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: Il tipo di contenuto di un tipo derivato e quello della rispettiva base devono essere entrambi misti o di soli elementi. Il tipo ''{0}'' \u00E8 di soli elementi, mentre la rispettiva base non lo \u00E8.
-        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: Il tipo di contenuto di un tipo derivato e quello della rispettiva base devono essere entrambi misti o di soli elementi. Il tipo ''{0}'' \u00E8 misto, mentre la rispettiva base non lo \u00E8.
-        cos-element-consistent = cos-element-consistent: errore per il tipo "{0}". Nel gruppo di modelli appaiono pi\u00F9 elementi con nome "{1}" e tipi diversi.
-        cos-list-of-atomic = cos-list-of-atomic: nella definizione del tipo di lista ''{0}'', il tipo ''{1}'' non \u00E8 valido poich\u00E9 non \u00E8 indivisibile (''{1}'' \u00E8 un tipo di lista o un tipo di unione che contiene una lista).
-        cos-nonambig = cos-nonambig: {0} e {1} (o gli elementi derivanti dal gruppo di sostituzione) violano "Unique Particle Attribution". Durante la convalida su questo schema, si creerebbe un''ambiguit\u00E0 per le due parti.
-        cos-particle-restrict.a = cos-particle-restrict.a: la parte derivata \u00E8 vuota, mente la base non \u00E8 svuotabile.
-        cos-particle-restrict.b = cos-particle-restrict.b: la parte della base \u00E8 vuota, mente la parte derivata non lo \u00E8.
+        cos-ct-extends.1.1 = cos-ct-extends.1.1: il tipo ''{0}'' è stato derivato mediante estensione dal tipo ''{1}'', ma l''attributo "final" di ''{1}'' impedisce la derivazione mediante estensione.
+        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: Il tipo di contenuto di un tipo derivato e quello della rispettiva base devono essere entrambi misti o di soli elementi. Il tipo ''{0}'' è di soli elementi, mentre la rispettiva base non lo è.
+        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: Il tipo di contenuto di un tipo derivato e quello della rispettiva base devono essere entrambi misti o di soli elementi. Il tipo ''{0}'' è misto, mentre la rispettiva base non lo è.
+        cos-element-consistent = cos-element-consistent: errore per il tipo "{0}". Nel gruppo di modelli appaiono più elementi con nome "{1}" e tipi diversi.
+        cos-list-of-atomic = cos-list-of-atomic: nella definizione del tipo di lista ''{0}'', il tipo ''{1}'' non è valido poiché non è indivisibile (''{1}'' è un tipo di lista o un tipo di unione che contiene una lista).
+        cos-nonambig = cos-nonambig: {0} e {1} (o gli elementi derivanti dal gruppo di sostituzione) violano "Unique Particle Attribution". Durante la convalida su questo schema, si creerebbe un''ambiguità per le due parti.
+        cos-particle-restrict.a = cos-particle-restrict.a: la parte derivata è vuota, mente la base non è svuotabile.
+        cos-particle-restrict.b = cos-particle-restrict.b: la parte della base è vuota, mente la parte derivata non lo è.
         cos-particle-restrict.2 = cos-particle-restrict.2: limitazione di parte vietata: ''{0}''.
-        cos-st-restricts.1.1 = cos-st-restricts.1.1: il tipo ''{1}'' \u00E8 indivisibile, quindi la '{'base type definition'}' "{0}" deve essere una definizione di tipo semplice indivisibile o un tipo di dati predefinito incorporato.
-        cos-st-restricts.2.1 = cos-st-restricts.2.1: nella definizione del tipo di lista ''{0}'', il tipo ''{1}'' non \u00E8 valido poich\u00E9 \u00E8 un tipo di lista o un tipo di unione che contiene una lista.
-        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: il componente '{'final'}' di '{'item type definition'}' ''{0}'' contiene ''list'', pertanto ''{0}'' non pu\u00F2 essere utilizzato come tipo di elemento per il tipo di lista ''{1}''.
-        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: il componente '{'final'}' di '{'member type definitions'}' ''{0}'' contiene ''union'', pertanto ''{0}'' non pu\u00F2 essere utilizzato come tipo di membro per il tipo di unione ''{1}''.
+        cos-st-restricts.1.1 = cos-st-restricts.1.1: il tipo ''{1}'' è indivisibile, quindi la '{'base type definition'}' "{0}" deve essere una definizione di tipo semplice indivisibile o un tipo di dati predefinito incorporato.
+        cos-st-restricts.2.1 = cos-st-restricts.2.1: nella definizione del tipo di lista ''{0}'', il tipo ''{1}'' non è valido poiché è un tipo di lista o un tipo di unione che contiene una lista.
+        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: il componente '{'final'}' di '{'item type definition'}' ''{0}'' contiene ''list'', pertanto ''{0}'' non può essere utilizzato come tipo di elemento per il tipo di lista ''{1}''.
+        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: il componente '{'final'}' di '{'member type definitions'}' ''{0}'' contiene ''union'', pertanto ''{0}'' non può essere utilizzato come tipo di membro per il tipo di unione ''{1}''.
         cos-valid-default.2.1 = cos-valid-default.2.1: l''elemento "{0}" ha un vincolo di valore e deve avere un modello di contenuto misto o semplice.
         cos-valid-default.2.2.2 = cos-valid-default.2.2.2: l''elemento ''{0}'' ha un '{'value constraint'}' e la rispettiva definizione del tipo contiene '{'content type'}' misto, quindi la parte di '{'content type'}' deve essere svuotabile.
-        c-props-correct.2 = c-props-correct.2: la cardinalit\u00E0 dei campi per il keyref "{0}" e per la chiave "{1}" deve corrispondere.
-        ct-props-correct.3 = ct-props-correct.3: sono state rilevate definizioni circolari per il tipo complesso ''{0}''. Ci\u00F2 significa che ''{0}'' si trova all''interno della sua stessa gerarchia di tipi, il che \u00E8 errato.
-        ct-props-correct.4 = ct-props-correct.4: errore per il tipo "{0}". Sono specificati usi di attributi duplicati con lo stesso nome e spazio di nomi di destinazione. Il nome dell''uso dell''attributo duplicato \u00E8 "{1}".
+        c-props-correct.2 = c-props-correct.2: la cardinalità dei campi per il keyref "{0}" e per la chiave "{1}" deve corrispondere.
+        ct-props-correct.3 = ct-props-correct.3: sono state rilevate definizioni circolari per il tipo complesso ''{0}''. Ciò significa che ''{0}'' si trova all''interno della sua stessa gerarchia di tipi, il che è errato.
+        ct-props-correct.4 = ct-props-correct.4: errore per il tipo "{0}". Sono specificati usi di attributi duplicati con lo stesso nome e spazio di nomi di destinazione. Il nome dell''uso dell''attributo duplicato è "{1}".
         ct-props-correct.5 = ct-props-correct.5: errore per il tipo "{0}". Due dichiarazioni di attributo, "{1}" e "{2}" hanno tipi derivati dall''ID.
-        derivation-ok-restriction.1 = derivation-ok-restriction.1: il tipo ''{0}'' \u00E8 stato derivato mediante limitazione dal tipo ''{1}'', ma ''{1}'' ha una propriet\u00E0 '{'final'}' che impedisce la derivazione mediante limitazione.
-        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: errore per il tipo "{0}". Un uso dell''attributo ''{1}'' in questo tipo ha un valore "use" ''{2}'' che \u00E8 incoerente con il valore di ''required'' in un uso corrispondente dell''attributo nel tipo di base.
-        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.12: errore per il tipo "{0}". Un uso dell''attributo ''{1}'' in questo tipo ha un valore tipo ''{2}'' che \u00E8 stato derivato in modo valido da ''{3}'', ovvero dal tipo di uso corrispondente dell''attributo nel tipo di base.
-        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: errore per il tipo "{0}". L''uso dell''attributo ''{1}'' in questo tipo ha un vincolo di valore effettivo che \u00E8 fisso, mentre il vincolo di valore effettivo dell''uso dell''attributo corrispondente nel tipo di base \u00E8 fisso.
-        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: errore per il tipo "{0}". L''uso dell''attributo ''{1}'' in questo tipo ha un vincolo di valore effettivo fisso con valore ''{2}'', che \u00E8 incoerente con il valore ''{3}'' per il vincolo di valore effettivo fisso dell''uso dell''attributo corrispondente nel tipo di base.
+        derivation-ok-restriction.1 = derivation-ok-restriction.1: il tipo ''{0}'' è stato derivato mediante limitazione dal tipo ''{1}'', ma ''{1}'' ha una proprietà '{'final'}' che impedisce la derivazione mediante limitazione.
+        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: errore per il tipo "{0}". Un uso dell''attributo ''{1}'' in questo tipo ha un valore "use" ''{2}'' che è incoerente con il valore di ''required'' in un uso corrispondente dell''attributo nel tipo di base.
+        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.12: errore per il tipo "{0}". Un uso dell''attributo ''{1}'' in questo tipo ha un valore tipo ''{2}'' che è stato derivato in modo valido da ''{3}'', ovvero dal tipo di uso corrispondente dell''attributo nel tipo di base.
+        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: errore per il tipo "{0}". L''uso dell''attributo ''{1}'' in questo tipo ha un vincolo di valore effettivo che è fisso, mentre il vincolo di valore effettivo dell''uso dell''attributo corrispondente nel tipo di base è fisso.
+        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: errore per il tipo "{0}". L''uso dell''attributo ''{1}'' in questo tipo ha un vincolo di valore effettivo fisso con valore ''{2}'', che è incoerente con il valore ''{3}'' per il vincolo di valore effettivo fisso dell''uso dell''attributo corrispondente nel tipo di base.
         derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: errore per il tipo "{0}". L''uso dell''attributo ''{1}'' in questo tipo non ha un uso dell''attributo corrispondente nella base e il tipo di base non ha alcun attributo di carattere jolly.
         derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: errore per il tipo "{0}". L''uso dell''attributo ''{1}'' in questo tipo non ha un uso dell''attributo corrispondente nella base e il carattere jolly nel tipo di base non consente lo spazio di nomi ''{2}'' di questo uso dell''attributo.
-        derivation-ok-restriction.3 = derivation-ok-restriction.3: errore per il tipo "{0}". Nell''uso dell''attributo ''{1}'' nel tipo di base, REQUIRED \u00E8 impostato su true, ma non esiste alcun uso dell''attributo corrispondente nel tipo derivato.
+        derivation-ok-restriction.3 = derivation-ok-restriction.3: errore per il tipo "{0}". Nell''uso dell''attributo ''{1}'' nel tipo di base, REQUIRED è impostato su true, ma non esiste alcun uso dell''attributo corrispondente nel tipo derivato.
         derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: errore per il tipo "{0}". La derivazione ha un carattere jolly dell''attributo, ma la base non ne ha uno.
-        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: errore per il tipo "{0}". Il carattere jolly nella derivazione non \u00E8 un subset di caratteri jolly valido di quello nella base.
-        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: errore per il tipo "{0}". Il contenuto del processo del carattere jolly nella derivazione ({1}) \u00E8 pi\u00F9 debole di quello nella base ({2}).
-        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: errore per il tipo ''{0}''. Il tipo di contenuto semplice ''del tipo ''{1}'' non \u00E8 una limitazione valida del tipo di contenuto semplice della base ''{2}''.
-        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: errore per il tipo ''{0}''. Il tipo di contenuto di questo tipo \u00E8 vuoto, ma il tipo di contenuto della base ''{1}'' non \u00E8 vuoto o svuotabile.
-        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: errore per il tipo "{0}". Il tipo di contenuto di questo tipo \u00E8 misto, ma il tipo di contenuto della base ''{1}'' non lo \u00E8.
-        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: errore per il tipo "{0}". La parte del tipo non \u00E8 una limitazione valida della parte della base.
+        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: errore per il tipo "{0}". Il carattere jolly nella derivazione non è un subset di caratteri jolly valido di quello nella base.
+        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: errore per il tipo "{0}". Il contenuto del processo del carattere jolly nella derivazione ({1}) è più debole di quello nella base ({2}).
+        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: errore per il tipo ''{0}''. Il tipo di contenuto semplice ''del tipo ''{1}'' non è una limitazione valida del tipo di contenuto semplice della base ''{2}''.
+        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: errore per il tipo ''{0}''. Il tipo di contenuto di questo tipo è vuoto, ma il tipo di contenuto della base ''{1}'' non è vuoto o svuotabile.
+        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: errore per il tipo "{0}". Il tipo di contenuto di questo tipo è misto, ma il tipo di contenuto della base ''{1}'' non lo è.
+        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: errore per il tipo "{0}". La parte del tipo non è una limitazione valida della parte della base.
         enumeration-required-notation = enumeration-required-notation: il tipo NOTATION ''{0}'' utilizzato da {2} ''{1}'' deve avere un valore di facet di enumerazione che specifica gli elementi di notazione utilizzati da questo tipo.
-        enumeration-valid-restriction = enumeration-valid-restriction: il valore di enumerazione "{0}" non \u00E8 nello spazio dei valori del tipo di base {1}.
+        enumeration-valid-restriction = enumeration-valid-restriction: il valore di enumerazione "{0}" non è nello spazio dei valori del tipo di base {1}.
         e-props-correct.2 = e-props-correct.2: valore di vincolo di valore "{1}" non valido nell''elemento "{0}".
-        e-props-correct.4 = e-props-correct.4: '{'type definition'}' dell''elemento "{0}" non \u00E8 stata derivata in modo valido da '{'type definition'}' di substitutionHead "{1}" o la propriet\u00E0 '{'substitution group exclusions'}' di ''{1}'' non consente questa derivazione.
-        e-props-correct.5 = e-props-correct.5: non deve esistere '{'value constraint'}' sull''elemento "{0}" perch\u00E9 '{'type definition'}' dell''elemento o '{'content type'}' di '{'type definition'}' \u00E8 un ID o \u00E8 derivato da un ID.
+        e-props-correct.4 = e-props-correct.4: '{'type definition'}' dell''elemento "{0}" non è stata derivata in modo valido da '{'type definition'}' di substitutionHead "{1}" o la proprietà '{'substitution group exclusions'}' di ''{1}'' non consente questa derivazione.
+        e-props-correct.5 = e-props-correct.5: non deve esistere '{'value constraint'}' sull''elemento "{0}" perché '{'type definition'}' dell''elemento o '{'content type'}' di '{'type definition'}' è un ID o è derivato da un ID.
         e-props-correct.6 = e-props-correct.6: gruppo di sostituzione circolare rilevato per l''elemento "{0}".
-        fractionDigits-valid-restriction = fractionDigits-valid-restriction: nella definizione di {2}, il valore ''{0}'' per il facet ''fractionDigits'' non \u00E8 valido. Deve essere <= rispetto al valore per ''fractionDigits'', impostato su ''{1}'' in uno dei tipi di predecessore.
-        fractionDigits-totalDigits = fractionDigits-totalDigits: nella definizione di {2}, il valore ''{0}'' per il facet ''fractionDigits'' non \u00E8 valido. Il valore deve essere <= rispetto al valore per ''totalDigits'', impostato su ''{1}''.
-        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: per il tipo {0}, il valore di lunghezza ''{1}'' non pu\u00F2 essere minore del valore di minLength ''{2}''.
-        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: per il tipo {0}, la base non pu\u00F2 avere un facet minLength se la limitazione corrente ha un facet minLength e la limitazione corrente o la base ha un facet di lunghezza.
+        fractionDigits-valid-restriction = fractionDigits-valid-restriction: nella definizione di {2}, il valore ''{0}'' per il facet ''fractionDigits'' non è valido. Deve essere <= rispetto al valore per ''fractionDigits'', impostato su ''{1}'' in uno dei tipi di predecessore.
+        fractionDigits-totalDigits = fractionDigits-totalDigits: nella definizione di {2}, il valore ''{0}'' per il facet ''fractionDigits'' non è valido. Il valore deve essere <= rispetto al valore per ''totalDigits'', impostato su ''{1}''.
+        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: per il tipo {0}, il valore di lunghezza ''{1}'' non può essere minore del valore di minLength ''{2}''.
+        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: per il tipo {0}, la base non può avere un facet minLength se la limitazione corrente ha un facet minLength e la limitazione corrente o la base ha un facet di lunghezza.
         length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: per il tipo {0}, il valore corrente di minLength ''{1}'' deve essere uguale a valore di minLength ''{2}'' della base.
-        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: per il tipo {0}, il valore di lunghezza ''{1}'' non pu\u00F2 essere maggiore del valore di maxLength ''{2}''.
-        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: per il tipo {0}, la base non pu\u00F2 avere un facet maxLength se la limitazione corrente ha un facet maxLength e la limitazione corrente o la base ha un facet di lunghezza.
+        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: per il tipo {0}, il valore di lunghezza ''{1}'' non può essere maggiore del valore di maxLength ''{2}''.
+        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: per il tipo {0}, la base non può avere un facet maxLength se la limitazione corrente ha un facet maxLength e la limitazione corrente o la base ha un facet di lunghezza.
         length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: per il tipo {0}, il valore corrente di maxLength ''{1}'' deve essere uguale a valore di maxLength ''{2}'' della base.
         length-valid-restriction = length-valid-restriction: errore per il tipo ''{2}''. Il valore della lunghezza = "{0}" deve essere = al valore di quella del tipo di base "{1}".
         maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: errore per il tipo ''{2}''. Il valore maxExclusive ="{0}" deve essere <= maxExclusive del tipo di base "{1}".
         maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: errore per il tipo ''{2}''. Il valore maxInclusive ="{0}" deve essere <= maxExclusive del tipo di base "{1}".
         maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: errore per il tipo ''{2}''. Il valore maxExclusive ="{0}" deve essere > minInclusive del tipo di base "{1}".
         maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.2: errore per il tipo ''{2}''. Il valore maxExclusive ="{0}" deve essere > minExclusive del tipo di base "{1}".
-        maxInclusive-maxExclusive = maxInclusive-maxExclusive: non \u00E8 possibile specificare sia maxInclusive che maxExclusive per lo stesso tipo di dati. In {2}, maxInclusive = ''{0}'' e maxExclusive = ''{1}''.
+        maxInclusive-maxExclusive = maxInclusive-maxExclusive: non è possibile specificare sia maxInclusive che maxExclusive per lo stesso tipo di dati. In {2}, maxInclusive = ''{0}'' e maxExclusive = ''{1}''.
         maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: errore per il tipo ''{2}''. Il valore maxInclusive ="{0}" deve essere <= maxInclusive del tipo di base "{1}".
         maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: errore per il tipo ''{2}''. Il valore maxInclusive ="{0}" deve essere <= maxExclusive del tipo di base "{1}".
         maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: errore per il tipo ''{2}''. Il valore maxInclusive ="{0}" deve essere >= minInclusive del tipo di base "{1}".
         maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: errore per il tipo ''{2}''. Il valore maxInclusive ="{0}" deve essere > minExclusive del tipo di base "{1}".
         maxLength-valid-restriction = maxLength-valid-restriction: nella definizione di {2}, il valore maxLength = "{0}" deve essere <= rispetto a quello del tipo di base "{1}".
-        mg-props-correct.2 = mg-props-correct.2: definizioni circolari rilevate per il gruppo ''{0}''. Se si seguono in maniera ricorsiva i valori '{'term'}' delle parti, se ne avr\u00E0 una il cui '{'term'}' \u00E8 il gruppo stesso.
+        mg-props-correct.2 = mg-props-correct.2: definizioni circolari rilevate per il gruppo ''{0}''. Se si seguono in maniera ricorsiva i valori '{'term'}' delle parti, se ne avrà una il cui '{'term'}' è il gruppo stesso.
         minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: nella definizione di {2}, il valore minExclusive = ''{0}'' deve essere <= rispetto al valore maxExclusive = ''{1}''.
         minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: nella definizione di {2}, il valore minExclusive = ''{0}'' deve essere <= rispetto al valore maxInclusive = ''{1}''.
         minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: errore per il tipo ''{2}''. Il valore minExclusive ="{0}" deve essere >= minExclusive del tipo di base "{1}".
@@ -245,7 +245,7 @@
         minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: errore per il tipo ''{2}''. Il valore minExclusive ="{0}" deve essere < maxExclusive del tipo di base "{1}".
         minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: nella definizione di {2}, il valore minInclusive = ''{0}'' deve essere <= rispetto al valore maxInclusive = ''{1}''.
         minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: nella definizione di {2}, il valore minInclusive = ''{0}'' deve essere < rispetto al valore maxExclusive = ''{1}''.
-        minInclusive-minExclusive = minInclusive-minExclusive: non \u00E8 possibile specificare sia minInclusive che minExclusive per lo stesso tipo di dati. In {2}, minInclusive = ''{0}'' e minExclusive = ''{1}''.
+        minInclusive-minExclusive = minInclusive-minExclusive: non è possibile specificare sia minInclusive che minExclusive per lo stesso tipo di dati. In {2}, minInclusive = ''{0}'' e minExclusive = ''{1}''.
         minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: errore per il tipo ''{2}''. Il valore minInclusive ="{0}" deve essere >= minInclusive del tipo di base "{1}".
         minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: errore per il tipo ''{2}''. Il valore minInclusive ="{0}" deve essere <= maxInclusive del tipo di base "{1}".
         minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: errore per il tipo ''{2}''. Il valore minInclusive ="{0}" deve essere > minExclusive del tipo di base "{1}".
@@ -254,75 +254,75 @@
         minLength-valid-restriction = minLength-valid-restriction: nella definizione di {2}, minLength = ''{0}'' deve essere >= rispetto a quello del tipo di base ''{1}''.
         no-xmlns = no-xmlns: il {'name'} di una dichiarazione di attributo non deve corrispondere a 'xmlns'.
         no-xsi = no-xsi: il '{'target namespace'}' di una dichiarazione di attributo non deve corrispondere a "{0}".
-        p-props-correct.2.1 = p-props-correct.2.1: nella dichiarazione di ''{0}'', il valore di ''minOccurs'' \u00E8 ''{1}'', ma non deve essere maggiore del valore di ''maxOccurs'', che \u00E8 ''{2}''.
+        p-props-correct.2.1 = p-props-correct.2.1: nella dichiarazione di ''{0}'', il valore di ''minOccurs'' è ''{1}'', ma non deve essere maggiore del valore di ''maxOccurs'', che è ''{2}''.
         rcase-MapAndSum.1 = rcase-MapAndSum.1: non esiste un mapping funzionale completo tra le parti.
-        rcase-MapAndSum.2 = rcase-MapAndSum.2: l''intervallo di ricorrenza ({0},{1}) del gruppo non \u00E8 una limitazione valida dell''intervallo di ricorrenza ({2},{3}) del gruppo di base.
+        rcase-MapAndSum.2 = rcase-MapAndSum.2: l''intervallo di ricorrenza ({0},{1}) del gruppo non è una limitazione valida dell''intervallo di ricorrenza ({2},{3}) del gruppo di base.
         rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: alcuni elementi hanno nomi e spazi di nomi di destinazione che non sono uguali: l''elemento "{0}" nello spazio di nomi "{1}" e l''elemento "{2}" nello spazio di nomi "{3}".
-        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: errore per la parte il cui '{'term'}' \u00E8 la dichiarazione di elemento ''{0}''. Il valore '{'nillable'}' della dichiarazione di elemento \u00E8 impostato su true, ma la parte corrispondente nel tipo di base contiene una dichiarazione di elemento per la quale '{'nillable'}' \u00E8 impostato su false.
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: errore per la parte il cui '{'term'}' \u00E8 la dichiarazione di elemento ''{0}''. L''intervallo di ricorrenza ({1},{2}) non \u00E8 una limitazione valida dell''intervallo ({3},{4}) della parte corrispondente nel tipo di base.
-        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: l''elemento "{0}" non \u00E8 fisso, ma l''elemento corrispondente nel tipo di base \u00E8 fisso con il valore ''{1}''.
-        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: l''elemento "{0}" \u00E8 fisso con il valore ''{1}'', ma l''elemento corrispondente nel tipo di base \u00E8 fisso con il valore ''{2}''.
-        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: i vincoli di identit\u00E0 per l''elemento "{0}" non sono un subset di quelli nella base.
+        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: errore per la parte il cui '{'term'}' è la dichiarazione di elemento ''{0}''. Il valore '{'nillable'}' della dichiarazione di elemento è impostato su true, ma la parte corrispondente nel tipo di base contiene una dichiarazione di elemento per la quale '{'nillable'}' è impostato su false.
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: errore per la parte il cui '{'term'}' è la dichiarazione di elemento ''{0}''. L''intervallo di ricorrenza ({1},{2}) non è una limitazione valida dell''intervallo ({3},{4}) della parte corrispondente nel tipo di base.
+        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: l''elemento "{0}" non è fisso, ma l''elemento corrispondente nel tipo di base è fisso con il valore ''{1}''.
+        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: l''elemento "{0}" è fisso con il valore ''{1}'', ma l''elemento corrispondente nel tipo di base è fisso con il valore ''{2}''.
+        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: i vincoli di identità per l''elemento "{0}" non sono un subset di quelli nella base.
         rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: le sostituzioni non consentite per l''elemento "{0}" non sono un superset di quelle nella base.
         rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: il tipo "{1}" dell''elemento "{0}" non deriva dal tipo dell''elemento di base "{2}".
-        rcase-NSCompat.1 = rcase-NSCompat.1: l''elemento "{0}" ha uno spazio di nomi "{1}" che non \u00E8 consentito dal carattere jolly nella base.
-        rcase-NSCompat.2 = rcase-NSCompat.2: errore per la parte il cui '{'term'}' \u00E8 la dichiarazione di elemento ''{0}''. L''intervallo di ricorrenza ({1},{2}) non \u00E8 una limitazione valida dell''intervallo ({3},{4}) della parte corrispondente nel tipo di base.
+        rcase-NSCompat.1 = rcase-NSCompat.1: l''elemento "{0}" ha uno spazio di nomi "{1}" che non è consentito dal carattere jolly nella base.
+        rcase-NSCompat.2 = rcase-NSCompat.2: errore per la parte il cui '{'term'}' è la dichiarazione di elemento ''{0}''. L''intervallo di ricorrenza ({1},{2}) non è una limitazione valida dell''intervallo ({3},{4}) della parte corrispondente nel tipo di base.
         rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: non esiste un mapping funzionale completo tra le parti.
-        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: l''intervallo di ricorrenza ({0},{1}) del gruppo non \u00E8 una limitazione valida dell''intervallo ({2},{3}) del carattere jolly di base.
-        rcase-NSSubset.1 = rcase-NSSubset.1: il carattere jolly non \u00E8 un subset del carattere jolly corrispondente nella base.
-        rcase-NSSubset.2 = rcase-NSSubset.2: l''intervallo di ricorrenza ({0},{1}) del carattere jolly non \u00E8 una limitazione valida di quello nella base ({2},{3}).
-        rcase-NSSubset.3 = rcase-NSSubset.3: il contenuto ''{0}'' del processo del carattere jolly \u00E8 pi\u00F9 debole di quello della base ''{1}''.
-        rcase-Recurse.1 = rcase-Recurse.1: l''intervallo di ricorrenza ({0},{1}) del gruppo non \u00E8 una limitazione valida dell''intervallo di ricorrenza ({2},{3}) del gruppo di base.
+        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: l''intervallo di ricorrenza ({0},{1}) del gruppo non è una limitazione valida dell''intervallo ({2},{3}) del carattere jolly di base.
+        rcase-NSSubset.1 = rcase-NSSubset.1: il carattere jolly non è un subset del carattere jolly corrispondente nella base.
+        rcase-NSSubset.2 = rcase-NSSubset.2: l''intervallo di ricorrenza ({0},{1}) del carattere jolly non è una limitazione valida di quello nella base ({2},{3}).
+        rcase-NSSubset.3 = rcase-NSSubset.3: il contenuto ''{0}'' del processo del carattere jolly è più debole di quello della base ''{1}''.
+        rcase-Recurse.1 = rcase-Recurse.1: l''intervallo di ricorrenza ({0},{1}) del gruppo non è una limitazione valida dell''intervallo di ricorrenza ({2},{3}) del gruppo di base.
         rcase-Recurse.2 = rcase-Recurse.2: non esiste un mapping funzionale completo tra le parti.
-        rcase-RecurseLax.1 = rcase-RecurseLax.1: l''intervallo di ricorrenza ({0},{1}) del gruppo non \u00E8 una limitazione valida dell''intervallo di ricorrenza ({2},{3}) del gruppo di base.
+        rcase-RecurseLax.1 = rcase-RecurseLax.1: l''intervallo di ricorrenza ({0},{1}) del gruppo non è una limitazione valida dell''intervallo di ricorrenza ({2},{3}) del gruppo di base.
         rcase-RecurseLax.2 = rcase-RecurseLax.2: non esiste un mapping funzionale completo tra le parti.
-        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: l''intervallo di ricorrenza ({0},{1}) del gruppo non \u00E8 una limitazione valida dell''intervallo di ricorrenza ({2},{3}) del gruppo di base.
+        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: l''intervallo di ricorrenza ({0},{1}) del gruppo non è una limitazione valida dell''intervallo di ricorrenza ({2},{3}) del gruppo di base.
         rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: non esiste un mapping funzionale completo tra le parti.
 #        We're using sch-props-correct.2 instead of the old src-redefine.1
 #        src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
-        sch-props-correct.2 = sch-props-correct.2: uno schema non pu\u00F2 contenere due componenti globali con lo stesso nome; questo contiene due ricorrenze di "{0}".
-        st-props-correct.2 = st-props-correct.2: sono state rilevate definizioni circolari per il tipo semplice ''{0}''. Ci\u00F2 significa che ''{0}'' si trova all''interno della sua stessa gerarchia di tipi, il che \u00E8 errato.
+        sch-props-correct.2 = sch-props-correct.2: uno schema non può contenere due componenti globali con lo stesso nome; questo contiene due ricorrenze di "{0}".
+        st-props-correct.2 = st-props-correct.2: sono state rilevate definizioni circolari per il tipo semplice ''{0}''. Ciò significa che ''{0}'' si trova all''interno della sua stessa gerarchia di tipi, il che è errato.
         st-props-correct.3 = st-props-correct.3: errore per il tipo ''{0}''. Il valore di '{'final'}' per '{'base type definition'}', ''{1}'', impedisce la derivazione mediante limitazione.
-        totalDigits-valid-restriction = totalDigits-valid-restriction: nella definizione di {2}, il valore ''{0}'' per il facet ''totalDigits'' non \u00E8 valido. Deve essere <= rispetto al valore per ''totalDigits'', impostato su ''{1}'' in uno dei tipi di predecessore.
-        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: nella definizione di {0}, il valore ''{1}'' per il facet ''whitespace'' non \u00E8 valido. Il valore per ''whitespace'' \u00E8 stato impostato su ''collapse'' in uno dei tipi di predecessore.
-        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: nella definizione di {0}, il valore ''preserve'' per il facet ''whitespace'' non \u00E8 valido. Il valore per ''whitespace'' \u00E8 stato impostato su ''replace'' in uno dei tipi di predecessore.
+        totalDigits-valid-restriction = totalDigits-valid-restriction: nella definizione di {2}, il valore ''{0}'' per il facet ''totalDigits'' non è valido. Deve essere <= rispetto al valore per ''totalDigits'', impostato su ''{1}'' in uno dei tipi di predecessore.
+        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: nella definizione di {0}, il valore ''{1}'' per il facet ''whitespace'' non è valido. Il valore per ''whitespace'' è stato impostato su ''collapse'' in uno dei tipi di predecessore.
+        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: nella definizione di {0}, il valore ''preserve'' per il facet ''whitespace'' non è valido. Il valore per ''whitespace'' è stato impostato su ''replace'' in uno dei tipi di predecessore.
 
 #schema for Schemas
 
         s4s-att-invalid-value = s4s-att-invalid-value: valore di attributo non valido per "{1}" nell''elemento "{0}": Motivo registrato: {2}
         s4s-att-must-appear = s4s-att-must-appear: l''attributo ''{1}'' deve apparire nell''elemento "{0}".
-        s4s-att-not-allowed = s4s-att-not-allowed: l''attributo ''{1}'' non pu\u00F2 apparire nell''elemento "{0}".
-        s4s-elt-invalid = s4s-elt-invalid: l''elemento "{0}" non \u00E8 un elemento valido nel documento dello schema.
-        s4s-elt-must-match.1 = s4s-elt-must-match.1: il contenuto di "{0}" deve corrispondere a {1}. Si \u00E8 verificato un problema con inizio in {2}.
+        s4s-att-not-allowed = s4s-att-not-allowed: l''attributo ''{1}'' non può apparire nell''elemento "{0}".
+        s4s-elt-invalid = s4s-elt-invalid: l''elemento "{0}" non è un elemento valido nel documento dello schema.
+        s4s-elt-must-match.1 = s4s-elt-must-match.1: il contenuto di "{0}" deve corrispondere a {1}. Si è verificato un problema con inizio in {2}.
         s4s-elt-must-match.2 = s4s-elt-must-match.2: il contenuto di "{0}" deve corrispondere a {1}. Non sono stati trovati elementi sufficienti.
         # the "invalid-content" messages provide less information than the "must-match" counterparts above. They're used for complex types when providing a "match" would be an information dump
-        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: il contenuto di ''{0}'' non \u00E8 valido. L''elemento ''{1}'' non \u00E8 valido, si trova in una posizione errata o \u00E8 presente troppe volte.
-        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: il contenuto di ''{0}'' non \u00E8 valido. L''elemento ''{1}'' non pu\u00F2 essere vuoto.
+        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: il contenuto di ''{0}'' non è valido. L''elemento ''{1}'' non è valido, si trova in una posizione errata o è presente troppe volte.
+        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: il contenuto di ''{0}'' non è valido. L''elemento ''{1}'' non può essere vuoto.
         s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: gli elementi di tipo ''{0}'' non possono trovarsi dopo dichiarazioni come elementi figlio di un elemento <schema>.
         s4s-elt-schema-ns = s4s-elt-schema-ns: lo spazio di nomi dell''elemento ''{0}'' deve derivare dallo spazio di nomi dello schema ''http://www.w3.org/2001/XMLSchema''.
         s4s-elt-character = s4s-elt-character: non sono consentiti caratteri diversi dallo spazio negli elementi di schema diversi da ''xs:appinfo'' e ''xs:documentation''. Rilevato "{0}".
 
 # codes not defined by the spec
 
-        c-fields-xpaths = c-fields-xpaths: il valore di campo = "{0}" non \u00E8 valido.
-        c-general-xpath = c-general-xpath: l''espressione "{0}" non \u00E8 valida rispetto al subset XPath supportato dallo schema XML.
-        c-general-xpath-ns = c-general-xpath-ns: un prefisso dello spazio di nomi nell''espressione XPath "{0}" non \u00E8 associato a uno spazio di nomi.
-        c-selector-xpath = c-selector-xpath: il valore del selettore = "{0}" non \u00E8 valido; gli XPath del selettore non possono contenere attributi.
-        EmptyTargetNamespace = EmptyTargetNamespace: nel documento di schema ''{0}'' il valore dell''attributo ''targetNamespace'' non pu\u00F2 essere una stringa vuota.
+        c-fields-xpaths = c-fields-xpaths: il valore di campo = "{0}" non è valido.
+        c-general-xpath = c-general-xpath: l''espressione "{0}" non è valida rispetto al subset XPath supportato dallo schema XML.
+        c-general-xpath-ns = c-general-xpath-ns: un prefisso dello spazio di nomi nell''espressione XPath "{0}" non è associato a uno spazio di nomi.
+        c-selector-xpath = c-selector-xpath: il valore del selettore = "{0}" non è valido; gli XPath del selettore non possono contenere attributi.
+        EmptyTargetNamespace = EmptyTargetNamespace: nel documento di schema ''{0}'' il valore dell''attributo ''targetNamespace'' non può essere una stringa vuota.
         FacetValueFromBase = FacetValueFromBase: nella dichiarazione del tipo ''{0}'' il valore ''{1}'' del facet ''{2}'' deve provenire dallo spazio di valori del tipo di base ''{3}''.
-        FixedFacetValue = FixedFacetValue: nella definizione di {3}, il valore ''{1}'' per il facet ''{0}'' non \u00E8 valido. Il valore per ''{0}'' \u00E8 stato impostato su ''{2}'' in uno dei tipi di predecessore e '{'fixed'}' = true.
-        InvalidRegex = InvalidRegex: il valore di pattern "{0}" non \u00E8 un''espressione regolare valida. Errore segnalato ''{1}'' nella colonna ''{2}''.
+        FixedFacetValue = FixedFacetValue: nella definizione di {3}, il valore ''{1}'' per il facet ''{0}'' non è valido. Il valore per ''{0}'' è stato impostato su ''{2}'' in uno dei tipi di predecessore e '{'fixed'}' = true.
+        InvalidRegex = InvalidRegex: il valore di pattern "{0}" non è un''espressione regolare valida. Errore segnalato ''{1}'' nella colonna ''{2}''.
         MaxOccurLimit = La configurazione corrente del parser non consente che un valore di attributo maxOccurs sia impostato su un valore maggiore del valore {0}.
         PublicSystemOnNotation = PublicSystemOnNotation: almeno uno tra ''public'' e ''system'' deve essere presente nell'elemento ''notation''.
         SchemaLocation = SchemaLocation: il valore = ''{0}'' di schemaLocation deve avere un numero pari di URI.
-        TargetNamespace.1 = TargetNamespace.1: lo spazio di nomi previsto \u00E8 "{0}", ma lo spazio di nomi di destinazione del documento dello schema \u00E8 "{1}".
-        TargetNamespace.2 = TargetNamespace.2: non \u00E8 previsto nessuno spazio di nomi, ma il documento dello schema ha uno spazio di nomi di destinazione ''{1}''.
-        UndeclaredEntity = UndeclaredEntity: l''entit\u00E0 ''{0}'' non \u00E8 stata dichiarata.
-        UndeclaredPrefix = UndeclaredPrefix: impossibile risolvere ''{0}'' come QName. Il prefisso ''{1}'' non \u00E8 stato dichiarato.
+        TargetNamespace.1 = TargetNamespace.1: lo spazio di nomi previsto è "{0}", ma lo spazio di nomi di destinazione del documento dello schema è "{1}".
+        TargetNamespace.2 = TargetNamespace.2: non è previsto nessuno spazio di nomi, ma il documento dello schema ha uno spazio di nomi di destinazione ''{1}''.
+        UndeclaredEntity = UndeclaredEntity: l''entità ''{0}'' non è stata dichiarata.
+        UndeclaredPrefix = UndeclaredPrefix: impossibile risolvere ''{0}'' come QName. Il prefisso ''{1}'' non è stato dichiarato.
 
 
 # JAXP 1.2 schema source property errors
 
-        jaxp12-schema-source-type.1 = La propriet\u00E0 ''http://java.sun.com/xml/jaxp/properties/schemaSource'' non pu\u00F2 avere un valore di tipo ''{0}''. I tipi possibili di valori supportati sono String, File, InputStream, InputSource o un array di questi tipi.
-        jaxp12-schema-source-type.2 = La propriet\u00E0 ''http://java.sun.com/xml/jaxp/properties/schemaSource'' non pu\u00F2 avere un valore di array di tipo ''{0}''. I tipi possibili di array supportati sono Object, String, File, InputStream e InputSource.
-        jaxp12-schema-source-ns = Quando si utilizza un array di oggetti come valore della propriet\u00E0 'http://java.sun.com/xml/jaxp/properties/schemaSource', non \u00E8 possibile avere due schemi che condividono lo stesso spazio di nomi di destinazione.
+        jaxp12-schema-source-type.1 = La proprietà ''http://java.sun.com/xml/jaxp/properties/schemaSource'' non può avere un valore di tipo ''{0}''. I tipi possibili di valori supportati sono String, File, InputStream, InputSource o un array di questi tipi.
+        jaxp12-schema-source-type.2 = La proprietà ''http://java.sun.com/xml/jaxp/properties/schemaSource'' non può avere un valore di array di tipo ''{0}''. I tipi possibili di array supportati sono Object, String, File, InputStream e InputSource.
+        jaxp12-schema-source-ns = Quando si utilizza un array di oggetti come valore della proprietà 'http://java.sun.com/xml/jaxp/properties/schemaSource', non è possibile avere due schemi che condividono lo stesso spazio di nomi di destinazione.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
index 74f2198b1a2..05e945bed9b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
@@ -18,303 +18,303 @@
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-        FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n
+        BadMessageKey = メッセージ・キーに対応するエラー・メッセージが見つかりません。
+        FormatFailed = 次のメッセージの書式設定中に内部エラーが発生しました:\n
 
 # For internal use
 
-        Internal-Error = \u5185\u90E8\u30A8\u30E9\u30FC: {0}\u3002
-        dt-whitespace = \u5171\u7528\u4F53\u306EsimpleType ''{0}''\u306B\u306F\u7A7A\u767D\u306E\u30D5\u30A1\u30BB\u30C3\u30C8\u5024\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-        GrammarConflict = \u30E6\u30FC\u30B6\u30FC\u306E\u69CB\u6587\u30D7\u30FC\u30EB\u304B\u3089\u623B\u3055\u308C\u305F\u69CB\u6587\u306E\u3044\u305A\u308C\u304B\u304C\u4ED6\u306E\u69CB\u6587\u3068\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059\u3002
+        Internal-Error = 内部エラー: {0}。
+        dt-whitespace = 共用体のsimpleType ''{0}''には空白のファセット値を使用できません
+        GrammarConflict = ユーザーの構文プールから戻された構文のいずれかが他の構文と競合しています。
 
 # Identity constraints
 
-        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: \u30AD\u30FC"{1}"\u306E\u8981\u7D20"{0}"\u306B\u5024\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-        DuplicateField = \u30D5\u30A3\u30FC\u30EB\u30C9"{0}"\u306E\u30B9\u30B3\u30FC\u30D7\u5185\u3067\u4E00\u81F4\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002
-        DuplicateKey = cvc-identity-constraint.4.2.2: \u8981\u7D20"{1}"\u306E\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04"{2}"\u3067\u5BA3\u8A00\u3055\u308C\u305Fkey\u306E\u5024[{0}]\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002
-        DuplicateUnique = cvc-identity-constraint.4.1: \u8981\u7D20"{1}"\u306E\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04"{2}"\u3067\u5BA3\u8A00\u3055\u308C\u305Funique\u306E\u5024[{0}]\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002
-        FieldMultipleMatch = cvc-identity-constraint.3: \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04"{1}"\u306E\u30D5\u30A3\u30FC\u30EB\u30C9"{0}"\u304C\u30BB\u30EC\u30AF\u30BF\u306E\u30B9\u30B3\u30FC\u30D7\u5185\u306E\u8907\u6570\u306E\u5024\u3068\u4E00\u81F4\u3057\u3066\u3044\u307E\u3059\u3002\u30D5\u30A3\u30FC\u30EB\u30C9\u306Funique\u306E\u5024\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        FixedDiffersFromActual = \u3053\u306E\u8981\u7D20\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\u3001\u30B9\u30AD\u30FC\u30DE\u5185\u306E\u8981\u7D20\u5BA3\u8A00\u3067\u306E"fixed"\u5C5E\u6027\u306E\u5024\u3068\u7570\u306A\u308A\u307E\u3059\u3002
-        KeyMatchesNillable = cvc-identity-constraint.4.2.3: \u8981\u7D20"{0}"\u306B\u306F\u3001nillable\u304Ctrue\u3067\u3042\u308B\u8981\u7D20\u3068\u4E00\u81F4\u3059\u308B\u30AD\u30FC"{1}"\u304C\u3042\u308A\u307E\u3059\u3002
-        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: \u8981\u7D20"{0}"\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B<key name="{1}">\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u306B\u3001\u5341\u5206\u306A\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        KeyNotFound = cvc-identity-constraint.4.3: \u8981\u7D20''{2}''\u306E\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u3067\u3001\u5024''{1}''\u306E\u30AD\u30FC''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-        KeyRefOutOfScope = \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u30A8\u30E9\u30FC: \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04"{0}"\u306B\u3001\u30B9\u30B3\u30FC\u30D7\u5916\u306Ekey\u3084unique\u3092\u53C2\u7167\u3057\u3066\u3044\u308Bkeyref\u304C\u3042\u308A\u307E\u3059\u3002
-        KeyRefReferNotFound = \u30AD\u30FC\u53C2\u7167\u306E\u5BA3\u8A00"{0}"\u304C\u3001"{1}"\u3068\u3044\u3046\u540D\u524D\u306E\u4E0D\u660E\u306A\u30AD\u30FC\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059\u3002
-        UnknownField = \u5185\u90E8\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u30A8\u30E9\u30FC: \u8981\u7D20"{1}"\u306B\u6307\u5B9A\u3055\u308C\u305F\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04"{2}"\u306E\u30D5\u30A3\u30FC\u30EB\u30C9"{0}"\u304C\u4E0D\u660E\u3067\u3059\u3002
+        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: キー"{1}"の要素"{0}"に値がありません。
+        DuplicateField = フィールド"{0}"のスコープ内で一致が重複しています。
+        DuplicateKey = cvc-identity-constraint.4.2.2: 要素"{1}"のアイデンティティ制約"{2}"で宣言されたkeyの値[{0}]が重複しています。
+        DuplicateUnique = cvc-identity-constraint.4.1: 要素"{1}"のアイデンティティ制約"{2}"で宣言されたuniqueの値[{0}]が重複しています。
+        FieldMultipleMatch = cvc-identity-constraint.3: アイデンティティ制約"{1}"のフィールド"{0}"がセレクタのスコープ内の複数の値と一致しています。フィールドはuniqueの値と一致する必要があります。
+        FixedDiffersFromActual = この要素のコンテンツは、スキーマ内の要素宣言での"fixed"属性の値と異なります。
+        KeyMatchesNillable = cvc-identity-constraint.4.2.3: 要素"{0}"には、nillableがtrueである要素と一致するキー"{1}"があります。
+        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: 要素"{0}"に指定されている<key name="{1}">アイデンティティ制約に、十分な値が指定されていません。
+        KeyNotFound = cvc-identity-constraint.4.3: 要素''{2}''のアイデンティティ制約で、値''{1}''のキー''{0}''が見つかりません。
+        KeyRefOutOfScope = アイデンティティ制約エラー: アイデンティティ制約"{0}"に、スコープ外のkeyやuniqueを参照しているkeyrefがあります。
+        KeyRefReferNotFound = キー参照の宣言"{0}"が、"{1}"という名前の不明なキーを参照しています。
+        UnknownField = 内部アイデンティティ制約エラー: 要素"{1}"に指定されたアイデンティティ制約"{2}"のフィールド"{0}"が不明です。
 
 # Ideally, we should only use the following error keys, not the ones under
 # "Identity constraints". And we should cover all of the following errors.
 
 #validation (3.X.4)
 
-        cvc-attribute.3 = cvc-attribute.3: \u8981\u7D20''{0}''\u306E\u5C5E\u6027''{1}''\u306E\u5024''{2}''\u306F\u3001\u305D\u306E\u30BF\u30A4\u30D7''{3}''\u306B\u5BFE\u3057\u3066\u7121\u52B9\u3067\u3059\u3002
-        cvc-attribute.4 = cvc-attribute.4: \u8981\u7D20''{0}''\u306E\u5C5E\u6027''{1}''\u306E\u5024''{2}''\u306F\u3001\u56FA\u5B9A\u306E'{'value constraint'}'\u306B\u5BFE\u3057\u3066\u7121\u52B9\u3067\u3059\u3002\u5C5E\u6027\u306E\u5024\u306F''{3}''\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        cvc-complex-type.2.1 = cvc-complex-type.2.1: \u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u304C\u7A7A\u767D\u3067\u3042\u308B\u305F\u3081\u3001\u8981\u7D20''{0}''\u306B\u306F\u6587\u5B57\u3084\u8981\u7D20\u60C5\u5831\u30A2\u30A4\u30C6\u30E0[children]\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-        cvc-complex-type.2.2 = cvc-complex-type.2.2: \u8981\u7D20''{0}''\u306F\u8981\u7D20[children]\u3092\u542B\u307E\u305A\u3001\u6709\u52B9\u306A\u5024\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        cvc-complex-type.2.3 = cvc-complex-type.2.3: \u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u304C\u8981\u7D20\u306E\u307F\u3067\u3042\u308B\u305F\u3081\u3001\u8981\u7D20''{0}''\u306B\u306F\u6587\u5B57[children]\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: \u8981\u7D20''{0}''\u3067\u59CB\u307E\u308B\u7121\u52B9\u306A\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002''{1}''\u306E\u3044\u305A\u308C\u304B\u304C\u5FC5\u8981\u3067\u3059\u3002
-        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: \u8981\u7D20''{0}''\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\u4E0D\u5B8C\u5168\u3067\u3059\u3002''{1}''\u306E\u3044\u305A\u308C\u304B\u304C\u5FC5\u8981\u3067\u3059\u3002
-        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: \u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u4E00\u81F4\u306F\u53B3\u5BC6\u3067\u3059\u304C\u3001\u8981\u7D20''{0}''\u3067\u5BA3\u8A00\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: \u8981\u7D20''{0}''\u3067\u59CB\u307E\u308B\u7121\u52B9\u306A\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u3053\u3053\u3067\u306F\u5B50\u8981\u7D20\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}''\u306F\u73FE\u5728\u306E\u30B7\u30FC\u30B1\u30F3\u30B9\u3067\u6700\u5927''{2}''\u56DE\u767A\u751F\u3059\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u5236\u9650\u3092\u8D85\u3048\u307E\u3057\u305F\u3002\u3053\u3053\u3067\u306F''{1}''\u306E\u3044\u305A\u308C\u304B\u304C\u5FC5\u8981\u3067\u3059\u3002
-        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}''\u306F\u73FE\u5728\u306E\u30B7\u30FC\u30B1\u30F3\u30B9\u3067\u6700\u5927''{1}''\u56DE\u767A\u751F\u3059\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u5236\u9650\u3092\u8D85\u3048\u307E\u3057\u305F\u3002\u3053\u3053\u3067\u306F\u5B50\u8981\u7D20\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: \u8981\u7D20''{0}''\u3067\u59CB\u307E\u308B\u7121\u52B9\u306A\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002''{1}''\u306F\u73FE\u5728\u306E\u30B7\u30FC\u30B1\u30F3\u30B9\u3067\u5C11\u306A\u304F\u3068\u3082''{2}''\u56DE\u767A\u751F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u5236\u7D04\u3092\u6E80\u305F\u3059\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u3082\u30461\u3064\u5FC5\u8981\u3067\u3059\u3002
-        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: \u8981\u7D20''{0}''\u3067\u59CB\u307E\u308B\u7121\u52B9\u306A\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002''{1}''\u306F\u73FE\u5728\u306E\u30B7\u30FC\u30B1\u30F3\u30B9\u3067\u5C11\u306A\u304F\u3068\u3082''{2}''\u56DE\u767A\u751F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u5236\u7D04\u3092\u6E80\u305F\u3059\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u3082\u3046''{3}''\u500B\u5FC5\u8981\u3067\u3059\u3002
-        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: \u8981\u7D20''{0}''\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u4E0D\u5B8C\u5168\u3067\u3059\u3002''{1}''\u306F\u5C11\u306A\u304F\u3068\u3082''{2}''\u56DE\u767A\u751F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u5236\u7D04\u3092\u6E80\u305F\u3059\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u3082\u30461\u3064\u5FC5\u8981\u3067\u3059\u3002
-        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: \u8981\u7D20''{0}''\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u4E0D\u5B8C\u5168\u3067\u3059\u3002''{1}''\u306F\u5C11\u306A\u304F\u3068\u3082''{2}''\u56DE\u767A\u751F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u5236\u7D04\u3092\u6E80\u305F\u3059\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u3082\u3046''{3}''\u500B\u5FC5\u8981\u3067\u3059\u3002
-        cvc-complex-type.3.1 = cvc-complex-type.3.1: \u8981\u7D20''{0}''\u306E\u5C5E\u6027''{1}''\u306E\u5024''{2}''\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306B\u5BFE\u3057\u3066\u7121\u52B9\u3067\u3059\u3002\u5C5E\u6027''{1}''\u306B\u306F\u56FA\u5B9A\u5024''{3}"\u304C\u3042\u308A\u307E\u3059\u3002
-        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: \u8981\u7D20''{0}''\u306B\u3001\u5C5E\u6027''{1}''\u7528\u306E\u5C5E\u6027\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: \u8981\u7D20''{0}''\u306B\u5C5E\u6027''{1}''\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        cvc-complex-type.4 = cvc-complex-type.4: \u8981\u7D20''{0}''\u306B\u5C5E\u6027''{1}''\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        cvc-complex-type.4_ns = cvc-complex-type.4: \u8981\u7D20''{0}''\u306B\u3001\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''{2}''\u306B\u5C5E\u3059\u308B\u5C5E\u6027''{1}''\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        cvc-complex-type.5.1 = cvc-complex-type.5.1: \u8981\u7D20''{0}''\u3067\u306F\u5C5E\u6027''{1}''\u304CWild ID\u3067\u3059\u304C\u3001\u3059\u3067\u306BWild ID ''{2}''\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\u3002\u8A31\u53EF\u3055\u308C\u308BWild ID\u306F1\u3064\u306E\u307F\u3067\u3059\u3002
-        cvc-complex-type.5.2 = cvc-complex-type.5.2: \u8981\u7D20''{0}''\u3067\u306F\u5C5E\u6027''{1}''\u304CWild ID\u3067\u3059\u304C\u3001ID\u304B\u3089\u5C0E\u51FA\u3055\u308C\u305F\u5C5E\u6027''{2}''\u304C'{'attribute uses'}'\u306B\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\u3002
-        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}''\u306F''{1}''\u306E\u6709\u52B9\u306A\u5024\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}''\u306F\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7''{1}''\u306E\u6709\u52B9\u306A\u5024\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}''\u306F\u5171\u7528\u4F53\u30BF\u30A4\u30D7''{1}''\u306E\u6709\u52B9\u306A\u5024\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-elt.1.a = cvc-elt.1.a: \u8981\u7D20''{0}''\u306E\u5BA3\u8A00\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-        cvc-elt.1.b = cvc-elt.1.b: \u8981\u7D20\u306E\u540D\u524D\u304C\u8981\u7D20\u5BA3\u8A00\u306E\u540D\u524D\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002''{1}''\u304C\u5FC5\u8981\u3067\u3059\u3002
-        cvc-elt.2 = cvc-elt.2: ''{0}''\u306B\u5BFE\u3059\u308B\u8981\u7D20\u5BA3\u8A00\u306E\u5024'{'abstract'}'\u306F\u3001false\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        cvc-elt.3.1 = cvc-elt.3.1: \u5C5E\u6027''{1}''\u306F\u8981\u7D20''{0}''\u306B\u8868\u793A\u3055\u308C\u307E\u305B\u3093\u3002\u3053\u308C\u306F\u3001'{'nillable'}'\u30D7\u30ED\u30D1\u30C6\u30A3(''{0}'')\u304Cfalse\u3067\u3042\u308B\u305F\u3081\u3067\u3059\u3002
-        cvc-elt.3.2.1 = cvc-elt.3.2.1: ''{1}''\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u8981\u7D20''{0}''\u306B\u306F\u6587\u5B57\u3084\u8981\u7D20\u60C5\u5831[children]\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-        cvc-elt.3.2.2 = cvc-elt.3.2.2: \u56FA\u5B9A\u306E'{'value constraint'}'\u3092\u8981\u7D20''{0}''\u306B\u5BFE\u3057\u3066\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002''{1}''\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        cvc-elt.4.1 = cvc-elt.4.1: \u8981\u7D20''{0}''\u306E\u5C5E\u6027''{1}''\u306E\u5024''{2}''\u306F\u6709\u52B9\u306AQName\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-elt.4.2 = cvc-elt.4.2: ''{1}''\u3092\u8981\u7D20''{0}''\u306E\u30BF\u30A4\u30D7\u5B9A\u7FA9\u306B\u89E3\u6C7A\u3067\u304D\u307E\u305B\u3093\u3002
-        cvc-elt.4.3 = cvc-elt.4.3: \u30BF\u30A4\u30D7''{1}''\u306F\u3001\u8981\u7D20''{0}''\u306E\u30BF\u30A4\u30D7\u5B9A\u7FA9''{2}''\u304B\u3089\u6B63\u5E38\u306B\u5C0E\u51FA\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'value constraint'}' ''{2}''(\u8981\u7D20''{0}'')\u306F\u3001\u30BF\u30A4\u30D7''{1}''\u306E\u6709\u52B9\u306A\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: \u8981\u7D20''{0}''\u306B\u306F\u8981\u7D20\u60C5\u5831\u30A2\u30A4\u30C6\u30E0[children]\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: \u8981\u7D20''{0}''\u306E\u5024''{1}''\u304C\u3001\u56FA\u5B9A\u306E'{'value constraint'}'\u5024''{2}''\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002
-        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: \u8981\u7D20''{0}''\u306E\u5024''{1}''\u304C\u3001'{'value constraint'}'\u5024''{2}''\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002
-        cvc-enumeration-valid = cvc-enumeration-valid: \u5024''{0}''\u306F\u3001\u5217\u6319''{1}''\u306B\u5BFE\u3057\u3066\u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u5217\u6319\u304B\u3089\u306E\u5024\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        cvc-fractionDigits-valid = cvc-fractionDigits-valid: \u5024''{0}''\u306E\u5C0F\u6570\u306E\u6841\u6570\u306F{1}\u3067\u3059\u304C\u3001\u5C0F\u6570\u306E\u6841\u6570\u306F{2}\u306B\u5236\u9650\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        cvc-id.1 = cvc-id.1: IDREF ''{0}''\u306EID/IDREF\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-id.2 = cvc-id.2: ID\u5024''{0}''\u304C\u8907\u6570\u51FA\u73FE\u3057\u3066\u3044\u307E\u3059\u3002
-        cvc-id.3 = cvc-id.3: \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04''{0}''\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u8981\u7D20''{1}''\u306B\u4E00\u81F4\u3057\u3066\u3044\u307E\u3059\u304C\u3001\u3053\u306E\u8981\u7D20\u306B\u306F\u5358\u7D14\u578B\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        cvc-length-valid = cvc-length-valid: \u9577\u3055\u304C''{1}''\u3067\u3042\u308B\u5024''{0}''\u306F\u3001\u30BF\u30A4\u30D7''{3}''\u306E\u9577\u3055''{2}''\u306B\u5BFE\u3057\u3066\u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-maxExclusive-valid = cvc-maxExclusive-valid: \u5024''{0}''\u306F\u3001\u30BF\u30A4\u30D7''{2}''\u306EmaxExclusive ''{1}''\u306B\u5BFE\u3057\u3066\u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-maxInclusive-valid = cvc-maxInclusive-valid: \u5024''{0}''\u306F\u3001\u30BF\u30A4\u30D7''{2}''\u306EmaxInclusive ''{1}''\u306B\u5BFE\u3057\u3066\u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-maxLength-valid = cvc-maxLength-valid: \u9577\u3055\u304C''{1}''\u3067\u3042\u308B\u5024''{0}''\u306F\u3001\u30BF\u30A4\u30D7''{3}''\u306EmaxLength ''{2}''\u306B\u5BFE\u3057\u3066\u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-minExclusive-valid = cvc-minExclusive-valid: \u5024''{0}''\u306F\u3001\u30BF\u30A4\u30D7''{2}''\u306EminExclusive ''{1}''\u306B\u5BFE\u3057\u3066\u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-minInclusive-valid = cvc-minInclusive-valid: \u5024''{0}''\u306F\u3001\u30BF\u30A4\u30D7''{2}''\u306EminInclusive ''{1}''\u306B\u5BFE\u3057\u3066\u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-minLength-valid = cvc-minLength-valid: \u9577\u3055\u304C''{1}''\u3067\u3042\u308B\u5024''{0}''\u306F\u3001\u30BF\u30A4\u30D7''{3}''\u306EminLength ''{2}''\u306B\u5BFE\u3057\u3066\u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-pattern-valid = cvc-pattern-valid: \u5024''{0}''\u306F\u3001\u30BF\u30A4\u30D7''{2}''\u306E\u30D1\u30BF\u30FC\u30F3''{1}''\u306B\u5BFE\u3057\u3066\u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cvc-totalDigits-valid = cvc-totalDigits-valid: \u5024''{0}''\u306E\u7DCF\u6841\u6570\u306F{1}\u3067\u3059\u304C\u3001\u7DCF\u6841\u6570\u306F{2}\u306B\u5236\u9650\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        cvc-type.1 = cvc-type.1: \u30BF\u30A4\u30D7\u5B9A\u7FA9''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-        cvc-type.2 = cvc-type.2: \u30BF\u30A4\u30D7\u306E\u5B9A\u7FA9\u306F\u8981\u7D20{0}\u306B\u5BFE\u3057\u3066\u62BD\u8C61\u7684\u306B\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        cvc-type.3.1.1 = cvc-type.3.1.1: \u8981\u7D20''{0}''\u306F\u5358\u7D14\u578B\u3067\u3042\u308B\u305F\u3081\u3001\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u540D\u304C''http://www.w3.org/2001/XMLSchema-instance''\u3068\u540C\u4E00\u306E\u5C5E\u6027\u3068[local name]\u304C''type''\u3001''nil''\u3001''schemaLocation''\u307E\u305F\u306F''noNamespaceSchemaLocation''\u306E\u3044\u305A\u308C\u304B\u3067\u3042\u308B\u5C5E\u6027\u4EE5\u5916\u306F\u3001\u5C5E\u6027\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u305D\u308C\u306B\u3082\u304B\u304B\u308F\u3089\u305A\u5C5E\u6027''{1}''\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        cvc-type.3.1.2 = cvc-type.3.1.2: \u8981\u7D20''{0}''\u306F\u5358\u7D14\u578B\u3067\u3042\u308B\u305F\u3081\u3001\u8981\u7D20\u60C5\u5831\u30A2\u30A4\u30C6\u30E0[children]\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        cvc-type.3.1.3 = cvc-type.3.1.3: \u8981\u7D20''{0}''\u306E\u5024''{1}''\u306F\u7121\u52B9\u3067\u3059\u3002
+        cvc-attribute.3 = cvc-attribute.3: 要素''{0}''の属性''{1}''の値''{2}''は、そのタイプ''{3}''に対して無効です。
+        cvc-attribute.4 = cvc-attribute.4: 要素''{0}''の属性''{1}''の値''{2}''は、固定の'{'value constraint'}'に対して無効です。属性の値は''{3}''である必要があります。
+        cvc-complex-type.2.1 = cvc-complex-type.2.1: タイプのコンテンツ・タイプが空白であるため、要素''{0}''には文字や要素情報アイテム[children]を使用できません。
+        cvc-complex-type.2.2 = cvc-complex-type.2.2: 要素''{0}''は要素[children]を含まず、有効な値である必要があります。
+        cvc-complex-type.2.3 = cvc-complex-type.2.3: タイプのコンテンツ・タイプが要素のみであるため、要素''{0}''には文字[children]を使用できません。
+        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: 要素''{0}''で始まる無効なコンテンツが見つかりました。''{1}''のいずれかが必要です。
+        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: 要素''{0}''のコンテンツは不完全です。''{1}''のいずれかが必要です。
+        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: ワイルドカードの一致は厳密ですが、要素''{0}''で宣言が見つかりません。
+        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: 要素''{0}''で始まる無効なコンテンツが見つかりました。ここでは子要素を使用できません。
+        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}''は現在のシーケンスで最大''{2}''回発生することがあります。この制限を超えました。ここでは''{1}''のいずれかが必要です。
+        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}''は現在のシーケンスで最大''{1}''回発生することがあります。この制限を超えました。ここでは子要素は使用できません。
+        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: 要素''{0}''で始まる無効なコンテンツが見つかりました。''{1}''は現在のシーケンスで少なくとも''{2}''回発生する必要があります。この制約を満たすインスタンスがもう1つ必要です。
+        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: 要素''{0}''で始まる無効なコンテンツが見つかりました。''{1}''は現在のシーケンスで少なくとも''{2}''回発生する必要があります。この制約を満たすインスタンスがもう''{3}''個必要です。
+        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: 要素''{0}''のコンテンツが不完全です。''{1}''は少なくとも''{2}''回発生する必要があります。この制約を満たすインスタンスがもう1つ必要です。
+        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: 要素''{0}''のコンテンツが不完全です。''{1}''は少なくとも''{2}''回発生する必要があります。この制約を満たすインスタンスがもう''{3}''個必要です。
+        cvc-complex-type.3.1 = cvc-complex-type.3.1: 要素''{0}''の属性''{1}''の値''{2}''は、対応する属性使用に対して無効です。属性''{1}''には固定値''{3}"があります。
+        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: 要素''{0}''に、属性''{1}''用の属性ワイルドカードがありません。
+        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: 要素''{0}''に属性''{1}''を含めることはできません。
+        cvc-complex-type.4 = cvc-complex-type.4: 要素''{0}''に属性''{1}''が含まれている必要があります。
+        cvc-complex-type.4_ns = cvc-complex-type.4: 要素''{0}''に、ネームスペース''{2}''に属する属性''{1}''が含まれている必要があります。
+        cvc-complex-type.5.1 = cvc-complex-type.5.1: 要素''{0}''では属性''{1}''がWild IDですが、すでにWild ID ''{2}''が存在しています。許可されるWild IDは1つのみです。
+        cvc-complex-type.5.2 = cvc-complex-type.5.2: 要素''{0}''では属性''{1}''がWild IDですが、IDから導出された属性''{2}''が'{'attribute uses'}'にすでに存在しています。
+        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}''は''{1}''の有効な値ではありません。
+        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}''はリスト・タイプ''{1}''の有効な値ではありません。
+        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}''は共用体タイプ''{1}''の有効な値ではありません。
+        cvc-elt.1.a = cvc-elt.1.a: 要素''{0}''の宣言が見つかりません。
+        cvc-elt.1.b = cvc-elt.1.b: 要素の名前が要素宣言の名前と一致しません。''{0}''が見つかりました。''{1}''が必要です。
+        cvc-elt.2 = cvc-elt.2: ''{0}''に対する要素宣言の値'{'abstract'}'は、falseである必要があります。
+        cvc-elt.3.1 = cvc-elt.3.1: 属性''{1}''は要素''{0}''に表示されません。これは、'{'nillable'}'プロパティ(''{0}'')がfalseであるためです。
+        cvc-elt.3.2.1 = cvc-elt.3.2.1: ''{1}''が指定されているため、要素''{0}''には文字や要素情報[children]を使用できません。
+        cvc-elt.3.2.2 = cvc-elt.3.2.2: 固定の'{'value constraint'}'を要素''{0}''に対して使用できません。''{1}''が指定されています。
+        cvc-elt.4.1 = cvc-elt.4.1: 要素''{0}''の属性''{1}''の値''{2}''は有効なQNameではありません。
+        cvc-elt.4.2 = cvc-elt.4.2: ''{1}''を要素''{0}''のタイプ定義に解決できません。
+        cvc-elt.4.3 = cvc-elt.4.3: タイプ''{1}''は、要素''{0}''のタイプ定義''{2}''から正常に導出されていません。
+        cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'value constraint'}' ''{2}''(要素''{0}'')は、タイプ''{1}''の有効なデフォルト値ではありません。
+        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: 要素''{0}''には要素情報アイテム[children]を使用できません。
+        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: 要素''{0}''の値''{1}''が、固定の'{'value constraint'}'値''{2}''に一致しません。
+        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: 要素''{0}''の値''{1}''が、'{'value constraint'}'値''{2}''に一致しません。
+        cvc-enumeration-valid = cvc-enumeration-valid: 値''{0}''は、列挙''{1}''に対してファセットが有効ではありません。列挙からの値である必要があります。
+        cvc-fractionDigits-valid = cvc-fractionDigits-valid: 値''{0}''の小数の桁数は{1}ですが、小数の桁数は{2}に制限されています。
+        cvc-id.1 = cvc-id.1: IDREF ''{0}''のID/IDREFバインディングはありません。
+        cvc-id.2 = cvc-id.2: ID値''{0}''が複数出現しています。
+        cvc-id.3 = cvc-id.3: アイデンティティ制約''{0}''のフィールドが要素''{1}''に一致していますが、この要素には単純型が含まれていません。
+        cvc-length-valid = cvc-length-valid: 長さが''{1}''である値''{0}''は、タイプ''{3}''の長さ''{2}''に対してファセットが有効ではありません。
+        cvc-maxExclusive-valid = cvc-maxExclusive-valid: 値''{0}''は、タイプ''{2}''のmaxExclusive ''{1}''に対してファセットが有効ではありません。
+        cvc-maxInclusive-valid = cvc-maxInclusive-valid: 値''{0}''は、タイプ''{2}''のmaxInclusive ''{1}''に対してファセットが有効ではありません。
+        cvc-maxLength-valid = cvc-maxLength-valid: 長さが''{1}''である値''{0}''は、タイプ''{3}''のmaxLength ''{2}''に対してファセットが有効ではありません。
+        cvc-minExclusive-valid = cvc-minExclusive-valid: 値''{0}''は、タイプ''{2}''のminExclusive ''{1}''に対してファセットが有効ではありません。
+        cvc-minInclusive-valid = cvc-minInclusive-valid: 値''{0}''は、タイプ''{2}''のminInclusive ''{1}''に対してファセットが有効ではありません。
+        cvc-minLength-valid = cvc-minLength-valid: 長さが''{1}''である値''{0}''は、タイプ''{3}''のminLength ''{2}''に対してファセットが有効ではありません。
+        cvc-pattern-valid = cvc-pattern-valid: 値''{0}''は、タイプ''{2}''のパターン''{1}''に対してファセットが有効ではありません。
+        cvc-totalDigits-valid = cvc-totalDigits-valid: 値''{0}''の総桁数は{1}ですが、総桁数は{2}に制限されています。
+        cvc-type.1 = cvc-type.1: タイプ定義''{0}''が見つかりませんでした。
+        cvc-type.2 = cvc-type.2: タイプの定義は要素{0}に対して抽象的にはできません。
+        cvc-type.3.1.1 = cvc-type.3.1.1: 要素''{0}''は単純型であるため、ネームスペース名が''http://www.w3.org/2001/XMLSchema-instance''と同一の属性と[local name]が''type''、''nil''、''schemaLocation''または''noNamespaceSchemaLocation''のいずれかである属性以外は、属性を含めることはできません。それにもかかわらず属性''{1}''が見つかりました。
+        cvc-type.3.1.2 = cvc-type.3.1.2: 要素''{0}''は単純型であるため、要素情報アイテム[children]を含めることはできません。
+        cvc-type.3.1.3 = cvc-type.3.1.3: 要素''{0}''の値''{1}''は無効です。
 
 #schema valid (3.X.3)
 
-        schema_reference.access = schema_reference: accessExternalSchema\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650\u306B\u3088\u308A''{1}''\u30A2\u30AF\u30BB\u30B9\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u30B9\u30AD\u30FC\u30DE\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
-        schema_reference.4 = schema_reference.4: 1)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u898B\u3064\u304B\u3089\u306A\u304B\u3063\u305F\u30012)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u8AAD\u307F\u53D6\u308C\u306A\u304B\u3063\u305F\u30013)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30EB\u30FC\u30C8\u8981\u7D20\u304C<xsd:schema>\u3067\u306F\u306A\u304B\u3063\u305F\u305F\u3081\u3001\u30B9\u30AD\u30FC\u30DE\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
-        src-annotation = src-annotation: <annotation>\u8981\u7D20\u306B\u542B\u3081\u308B\u3053\u3068\u304C\u3067\u304D\u308B\u306E\u306F<appinfo>\u8981\u7D20\u304A\u3088\u3073<documentation>\u8981\u7D20\u306E\u307F\u3067\u3059\u304C\u3001''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        src-attribute.1 = src-attribute.1: ''default''\u3068''fixed''\u306E\u4E21\u65B9\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u5C5E\u6027\u5BA3\u8A00''{0}''\u306B\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u3044\u305A\u308C\u304B\u4E00\u65B9\u306E\u307F\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-        src-attribute.2 = src-attribute.2: : \u5C5E\u6027''{0}''\u306B\u30D7\u30ED\u30D1\u30C6\u30A3''default''\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001''use''\u306E\u5024\u306F''optional''\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-attribute.3.1 = src-attribute.3.1: 'ref'\u307E\u305F\u306F'name'\u306E\u3044\u305A\u308C\u304B\u304C\u30ED\u30FC\u30AB\u30EB\u5C5E\u6027\u5BA3\u8A00\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-attribute.3.2 = src-attribute.3.2: \u30B3\u30F3\u30C6\u30F3\u30C4\u306F\u5C5E\u6027\u53C2\u7167''{0}''\u306E(annotation?)\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-attribute.4 = src-attribute.4: \u5C5E\u6027''{0}''\u306B\u3001''type''\u5C5E\u6027\u3068\u533F\u540D\u306E\u5B50''simpleType''\u306E\u4E21\u65B9\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u5C5E\u6027\u306B\u306F\u3053\u308C\u3089\u306E\u3046\u3061\u3044\u305A\u308C\u304B\u4E00\u65B9\u306E\u307F\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-        src-attribute_group.2 = src-attribute_group.2: \u5C5E\u6027\u30B0\u30EB\u30FC\u30D7''{0}''\u306B\u5BFE\u3057\u3066\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u5171\u901A\u90E8\u5206\u306F\u8868\u73FE\u3067\u304D\u307E\u305B\u3093\u3002
-        src-attribute_group.3 = src-attribute_group.3: \u5C5E\u6027\u30B0\u30EB\u30FC\u30D7''{0}''\u3067\u5FAA\u74B0\u5B9A\u7FA9\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u5C5E\u6027\u30B0\u30EB\u30FC\u30D7\u53C2\u7167\u3092\u518D\u5E30\u7684\u306B\u305F\u3069\u308B\u3068\u3001\u6700\u7D42\u7684\u306B\u306F\u305D\u306E\u5C5E\u6027\u30B0\u30EB\u30FC\u30D7\u306B\u623B\u308A\u307E\u3059\u3002
-        src-ct.1 = src-ct.1: \u30BF\u30A4\u30D7''{0}''\u306B\u5BFE\u3059\u308B\u8907\u5408\u578B\u5B9A\u7FA9\u8868\u73FE\u30A8\u30E9\u30FC\u3002<complexContent>\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306FcomplexType\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002''{1}''\u306FsimpleType\u3067\u3059\u3002
-        src-ct.2.1 = src-ct.2.1: \u30BF\u30A4\u30D7''{0}''\u306B\u5BFE\u3059\u308B\u8907\u5408\u578B\u5B9A\u7FA9\u8868\u73FE\u30A8\u30E9\u30FC\u3002<simpleContent>\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306E\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306F\u3001\u5358\u7D14\u3067\u3042\u308B\u304B\u3001\u5236\u9650\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306B\u304B\u304E\u308A\u6DF7\u5408\u30B3\u30F3\u30C6\u30F3\u30C4\u3068\u7A7A\u306B\u3067\u304D\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u3092\u6301\u3064\u8907\u5408\u578B\u3067\u3042\u308B\u304B\u3001\u307E\u305F\u306F\u62E1\u5F35\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306B\u304B\u304E\u308A\u5358\u7D14\u578B\u3067\u3042\u308B\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u3092\u6301\u3064complexType\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002''{1}''\u306F\u3001\u3053\u308C\u3089\u306E\u3069\u306E\u6761\u4EF6\u3082\u6E80\u305F\u3057\u3066\u3044\u307E\u305B\u3093\u3002
-        src-ct.2.2 = src-ct.2.2: \u30BF\u30A4\u30D7''{0}''\u306B\u5BFE\u3059\u308B\u8907\u5408\u578B\u5B9A\u7FA9\u8868\u73FE\u30A8\u30E9\u30FC\u3002simpleContent\u3092\u6301\u3064complexType\u304C\u3001\u6DF7\u5408\u30B3\u30F3\u30C6\u30F3\u30C4\u3068\u7A7A\u306B\u3067\u304D\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u3092\u6301\u3064complexType\u3092\u5236\u9650\u3059\u308B\u5834\u5408\u3001<restriction>\u306E\u5B50\u306E\u4E2D\u306B<simpleType>\u304C\u5B58\u5728\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-ct.4 = src-ct.4: \u30BF\u30A4\u30D7''{0}''\u306B\u5BFE\u3059\u308B\u8907\u5408\u578B\u5B9A\u7FA9\u8868\u73FE\u30A8\u30E9\u30FC\u3002\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u5171\u901A\u90E8\u5206\u306F\u8868\u73FE\u3067\u304D\u307E\u305B\u3093\u3002
-        src-ct.5 = src-ct.5: \u30BF\u30A4\u30D7''{0}''\u306B\u5BFE\u3059\u308B\u8907\u5408\u578B\u5B9A\u7FA9\u8868\u73FE\u30A8\u30E9\u30FC\u3002\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u5171\u7528\u4F53\u306F\u8868\u73FE\u3067\u304D\u307E\u305B\u3093\u3002
-        src-element.1 = src-element.1: ''default''\u3068''fixed''\u306E\u4E21\u65B9\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8981\u7D20\u5BA3\u8A00''{0}''\u306B\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u3044\u305A\u308C\u304B\u4E00\u65B9\u306E\u307F\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-        src-element.2.1 = src-element.2.1: : 'ref'\u307E\u305F\u306F'name'\u306E\u3044\u305A\u308C\u304B\u304C\u30ED\u30FC\u30AB\u30EB\u8981\u7D20\u5BA3\u8A00\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-element.2.2 = src-element.2.2: ''{0}''\u306B''ref''\u5C5E\u6027\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u305D\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F(annotation?)\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u305F\u3060\u3057\u3001''{1}''\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        src-element.3 = src-element.3: \u8981\u7D20''{0}''\u306B''type''\u5C5E\u6027\u3068\u5B50''anonymous type''\u306E\u4E21\u65B9\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u8981\u7D20\u306B\u306F\u3053\u308C\u3089\u306E\u3046\u3061\u3044\u305A\u308C\u304B\u4E00\u65B9\u306E\u307F\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-        src-import.1.1 = src-import.1.1: <import>\u8981\u7D20\u60C5\u5831\u30A2\u30A4\u30C6\u30E0\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u5C5E\u6027''{0}''\u306F\u3001\u5C5E\u6027\u304C\u5B58\u5728\u3059\u308B\u30B9\u30AD\u30FC\u30DE\u306EtargetNamespace\u3068\u540C\u3058\u3082\u306E\u306B\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        src-import.1.2 = src-import.1.2: <import>\u8981\u7D20\u60C5\u5831\u30A2\u30A4\u30C6\u30E0\u306B\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u5C5E\u6027\u304C\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u3001\u5305\u542B\u3059\u308B\u30B9\u30AD\u30FC\u30DE\u306B\u306FtargetNamespace\u304C\u5FC5\u8981\u3067\u3059\u3002
-        src-import.2 = src-import.2: \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u306E\u30EB\u30FC\u30C8\u8981\u7D20\u306B\u306F\u3001\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u540D''http://www.w3.org/2001/XMLSchema''\u304A\u3088\u3073\u30ED\u30FC\u30AB\u30EB\u540D''schema''\u304C\u5FC5\u8981\u3067\u3059\u3002
-        src-import.3.1 = src-import.3.1: <import>\u8981\u7D20\u60C5\u5831\u30A2\u30A4\u30C6\u30E0\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u5C5E\u6027''{0}''\u306F\u3001\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306EtargetNamespace\u5C5E\u6027''{1}''\u3068\u540C\u3058\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-import.3.2 = src-import.3.2: \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u5C5E\u6027\u306E\u306A\u3044<import>\u8981\u7D20\u60C5\u5831\u30A2\u30A4\u30C6\u30E0\u304C\u898B\u3064\u304B\u3063\u305F\u305F\u3081\u3001\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306BtargetNamespace\u5C5E\u6027\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u305F\u3060\u3057\u3001\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306BtargetNamespace ''{1}''\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        src-include.1 = src-include.1: \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u306E\u30EB\u30FC\u30C8\u8981\u7D20\u306B\u306F\u3001\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u540D''http://www.w3.org/2001/XMLSchema''\u304A\u3088\u3073\u30ED\u30FC\u30AB\u30EB\u540D''schema''\u304C\u5FC5\u8981\u3067\u3059\u3002
-        src-include.2.1 = src-include.2.1: \u73FE\u5728''{1}''\u3067\u3042\u308B\u53C2\u7167\u30B9\u30AD\u30FC\u30DE\u306EtargetNamespace\u306F\u3001\u73FE\u5728''{0}''\u3067\u3042\u308B\u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u3059\u308B\u30B9\u30AD\u30FC\u30DE\u306E\u3082\u306E\u3068\u540C\u3058\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-redefine.2 = src-redefine.2: \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u306E\u30EB\u30FC\u30C8\u8981\u7D20\u306B\u306F\u3001\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u540D''http://www.w3.org/2001/XMLSchema''\u304A\u3088\u3073\u30ED\u30FC\u30AB\u30EB\u540D''schema''\u304C\u5FC5\u8981\u3067\u3059\u3002
-        src-redefine.3.1 = src-redefine.3.1: \u73FE\u5728''{1}''\u3067\u3042\u308B\u53C2\u7167\u30B9\u30AD\u30FC\u30DE\u306EtargetNamespace\u306F\u3001\u73FE\u5728''{0}''\u3067\u3042\u308B\u518D\u5B9A\u7FA9\u3059\u308B\u30B9\u30AD\u30FC\u30DE\u306E\u3082\u306E\u3068\u540C\u3058\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-redefine.5.a.a = src-redefine.5.a.a: <simpleType>\u306E\u6CE8\u91C8\u4EE5\u5916\u306E\u5B50\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002<redefine>\u8981\u7D20\u306E<simpleType>\u306E\u5B50\u306B\u306F\u3001\u305D\u308C\u81EA\u4F53\u3092\u53C2\u7167\u3059\u308B'base'\u5C5E\u6027\u3092\u6301\u3064<restriction>\u306E\u5B50\u5B6B\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}''\u306F\u6709\u52B9\u306A\u5B50\u8981\u7D20\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002<redefine>\u8981\u7D20\u306E<simpleType>\u306E\u5B50\u306B\u306F\u3001\u305D\u308C\u81EA\u4F53\u3092\u53C2\u7167\u3059\u308B''base''\u5C5E\u6027\u3092\u6301\u3064<restriction>\u306E\u5B50\u5B6B\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}''\u306B\u518D\u5B9A\u7FA9\u6E08\u306E\u8981\u7D20''{1}''\u3092\u53C2\u7167\u3059\u308B''base''\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093\u3002<redefine>\u8981\u7D20\u306E<simpleType>\u306E\u5B50\u306B\u306F\u3001\u305D\u308C\u81EA\u4F53\u3092\u53C2\u7167\u3059\u308B''base''\u5C5E\u6027\u3092\u6301\u3064<restriction>\u306E\u5B50\u5B6B\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-redefine.5.b.a = src-redefine.5.b.a: <complexType>\u306E\u6CE8\u91C8\u4EE5\u5916\u306E\u5B50\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002<redefine>\u8981\u7D20\u306E<complexType>\u306E\u5B50\u306B\u306F\u3001\u305D\u308C\u81EA\u4F53\u3092\u53C2\u7167\u3059\u308B'base'\u5C5E\u6027\u3092\u6301\u3064<extension>\u307E\u305F\u306F<restriction>\u306E\u5B50\u5B6B\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-redefine.5.b.b = src-redefine.5.b.b: <complexType>\u306E\u6CE8\u91C8\u4EE5\u5916\u306E\u5B6B\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002<redefine>\u8981\u7D20\u306E<complexType>\u306E\u5B50\u306B\u306F\u3001\u305D\u308C\u81EA\u4F53\u3092\u53C2\u7167\u3059\u308B'base'\u5C5E\u6027\u3092\u6301\u3064<extension>\u307E\u305F\u306F<restriction>\u306E\u5B50\u5B6B\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}''\u306F\u6709\u52B9\u306A\u5B6B\u8981\u7D20\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002<redefine>\u8981\u7D20\u306E<complexType>\u306E\u5B50\u306B\u306F\u3001\u305D\u308C\u81EA\u4F53\u3092\u53C2\u7167\u3059\u308B''base''\u5C5E\u6027\u3092\u6301\u3064<extension>\u307E\u305F\u306F<restriction>\u306E\u5B50\u5B6B\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}''\u306B\u518D\u5B9A\u7FA9\u6E08\u306E\u8981\u7D20''{1}''\u3092\u53C2\u7167\u3059\u308B''base''\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093\u3002<redefine>\u8981\u7D20\u306E<complexType>\u306E\u5B50\u306B\u306F\u3001\u305D\u308C\u81EA\u4F53\u3092\u53C2\u7167\u3059\u308B''base''\u5C5E\u6027\u3092\u6301\u3064<extension>\u307E\u305F\u306F<restriction>\u306E\u5B50\u5B6B\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-redefine.6.1.1 = src-redefine.6.1.1: <redefine>\u8981\u7D20\u306E\u5B50\u30B0\u30EB\u30FC\u30D7\u306B\u305D\u308C\u81EA\u4F53\u3092\u53C2\u7167\u3059\u308B\u30B0\u30EB\u30FC\u30D7\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u305D\u308C\u306F1\u3064\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u306B\u306F''{0}''\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-        src-redefine.6.1.2 = src-redefine.6.1.2: \u518D\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30B0\u30EB\u30FC\u30D7\u3078\u306E\u53C2\u7167\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u30B0\u30EB\u30FC\u30D7''{0}''\u306B\u306F''minOccurs'' = ''maxOccurs'' = 1\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-redefine.6.2.1 = src-redefine.6.2.1: \u518D\u5B9A\u7FA9\u3055\u308C\u305F\u30B9\u30AD\u30FC\u30DE\u306B\u306F\u3001''{0}''\u3068\u4E00\u81F4\u3059\u308B\u540D\u524D\u3092\u6301\u3064\u30B0\u30EB\u30FC\u30D7\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-        src-redefine.6.2.2 = src-redefine.6.2.2: \u30B0\u30EB\u30FC\u30D7''{0}''\u3067\u306F\u518D\u5B9A\u7FA9\u3057\u305F\u30B0\u30EB\u30FC\u30D7\u304C\u9069\u5207\u306B\u5236\u9650\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5236\u7D04\u9055\u53CD: ''{1}''\u3002
-        src-redefine.7.1 = src-redefine.7.1: <redefine>\u8981\u7D20\u306EattributeGroup\u306E\u5B50\u306B\u305D\u308C\u81EA\u4F53\u3092\u53C2\u7167\u3059\u308BattributeGroup\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u306F1\u3064\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u304C\u3001\u3053\u308C\u306B\u306F{0}\u542B\u307E\u308C\u307E\u3059\u3002
-        src-redefine.7.2.1 = src-redefine.7.2.1: \u518D\u5B9A\u7FA9\u3055\u308C\u305F\u30B9\u30AD\u30FC\u30DE\u306B\u306F\u3001''{0}''\u3068\u4E00\u81F4\u3059\u308B\u540D\u524D\u3092\u6301\u3064attributeGroup\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-        src-redefine.7.2.2 = src-redefine.7.2.2: AttributeGroup ''{0}''\u3067\u306F\u518D\u5B9A\u7FA9\u3057\u305FattributeGroup\u304C\u9069\u5207\u306B\u5236\u9650\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5236\u7D04\u9055\u53CD: ''{1}''\u3002
-        src-resolve = src-resolve: \u540D\u524D''{0}''\u3092''{1}''\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u89E3\u6C7A\u3067\u304D\u307E\u305B\u3093\u3002
-        src-resolve.4.1 = src-resolve.4.1: \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8''{2}''\u306E\u89E3\u6C7A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002''{2}''\u306B\u306F\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u304C\u3001\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306E\u306A\u3044\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F\u30B9\u30AD\u30FC\u30DE\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u304B\u3089\u53C2\u7167\u3067\u304D\u307E\u305B\u3093\u3002''{2}''\u306B\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u306F\u3001\u63A5\u982D\u8F9E\u306E\u8FFD\u52A0\u304C\u5FC5\u8981\u306B\u306A\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002''{2}''\u306B\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3092\u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u306F\u3001"namespace"\u5C5E\u6027\u306E\u306A\u3044''import''\u3092''{0}''\u306B\u8FFD\u52A0\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-resolve.4.2 = src-resolve.4.2: \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8''{2}''\u306E\u89E3\u6C7A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002''{2}''\u306F\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''{1}''\u306B\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u3053\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304B\u3089\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F\u30B9\u30AD\u30FC\u30DE\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u304B\u3089\u53C2\u7167\u3067\u304D\u307E\u305B\u3093\u3002\u3053\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6B63\u3057\u304F\u306A\u3044\u5834\u5408\u306F\u3001''{2}''\u306E\u63A5\u982D\u8F9E\u306E\u5909\u66F4\u304C\u5FC5\u8981\u306B\u306A\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6B63\u3057\u3044\u5834\u5408\u306F\u3001\u9069\u5207\u306A''import''\u30BF\u30B0\u3092''{0}''\u306B\u8FFD\u52A0\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        src-simple-type.2.a = src-simple-type.2.a: [children]\u306B\u30D9\u30FC\u30B9[attribute]\u3068<simpleType>\u8981\u7D20\u306E\u4E21\u65B9\u3092\u542B\u3080<restriction>\u8981\u7D20\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u3044\u305A\u308C\u304B\u4E00\u65B9\u306E\u307F\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-        src-simple-type.2.b = src-simple-type.2.b: [children]\u306B\u30D9\u30FC\u30B9[attribute]\u3082<simpleType>\u8981\u7D20\u3082\u306A\u3044<restriction>\u8981\u7D20\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u3044\u305A\u308C\u304B\u4E00\u65B9\u304C\u5FC5\u8981\u3067\u3059\u3002
-        src-simple-type.3.a = src-simple-type.3.a: [children]\u306BitemType [attribute]\u3068<simpleType>\u8981\u7D20\u306E\u4E21\u65B9\u3092\u542B\u3080<list>\u8981\u7D20\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u3044\u305A\u308C\u304B\u4E00\u65B9\u306E\u307F\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-        src-simple-type.3.b = src-simple-type.3.b: [children]\u306BitemType [attribute]\u3082<simpleType>\u8981\u7D20\u3082\u306A\u3044<list>\u8981\u7D20\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u3044\u305A\u308C\u304B\u4E00\u65B9\u304C\u5FC5\u8981\u3067\u3059\u3002
-        src-single-facet-value = src-single-facet-value: \u30D5\u30A1\u30BB\u30C3\u30C8''{0}''\u304C\u8907\u6570\u56DE\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: <union>\u8981\u7D20\u306EmemberTypes [attribute]\u304C\u7A7A\u3067\u306A\u3044\u304B\u3001[children]\u306B\u5C11\u306A\u304F\u3068\u30821\u3064\u306E<simpleType>\u8981\u7D20\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        schema_reference.access = schema_reference: accessExternalSchemaプロパティで設定された制限により''{1}''アクセスが許可されていないため、スキーマ・ドキュメント''{0}''の読取りに失敗しました。
+        schema_reference.4 = schema_reference.4: 1)ドキュメントが見つからなかった、2)ドキュメントを読み取れなかった、3)ドキュメントのルート要素が<xsd:schema>ではなかったため、スキーマ・ドキュメント''{0}''の読取りに失敗しました。
+        src-annotation = src-annotation: <annotation>要素に含めることができるのは<appinfo>要素および<documentation>要素のみですが、''{0}''が見つかりました。
+        src-attribute.1 = src-attribute.1: ''default''と''fixed''の両方のプロパティを属性宣言''{0}''に含めることはできません。いずれか一方のみを使用してください。
+        src-attribute.2 = src-attribute.2: : 属性''{0}''にプロパティ''default''が使用されているため、''use''の値は''optional''にする必要があります。
+        src-attribute.3.1 = src-attribute.3.1: 'ref'または'name'のいずれかがローカル属性宣言に使用されている必要があります。
+        src-attribute.3.2 = src-attribute.3.2: コンテンツは属性参照''{0}''の(annotation?)と一致する必要があります。
+        src-attribute.4 = src-attribute.4: 属性''{0}''に、''type''属性と匿名の子''simpleType''の両方が使用されています。属性にはこれらのうちいずれか一方のみを使用できます。
+        src-attribute_group.2 = src-attribute_group.2: 属性グループ''{0}''に対してワイルドカードの共通部分は表現できません。
+        src-attribute_group.3 = src-attribute_group.3: 属性グループ''{0}''で循環定義が検出されました。属性グループ参照を再帰的にたどると、最終的にはその属性グループに戻ります。
+        src-ct.1 = src-ct.1: タイプ''{0}''に対する複合型定義表現エラー。<complexContent>が使用されている場合、ベース・タイプはcomplexTypeである必要があります。''{1}''はsimpleTypeです。
+        src-ct.2.1 = src-ct.2.1: タイプ''{0}''に対する複合型定義表現エラー。<simpleContent>が使用されている場合のベース・タイプは、単純であるか、制限が指定されている場合にかぎり混合コンテンツと空にできるパーティクルを持つ複合型であるか、または拡張が指定されている場合にかぎり単純型であるコンテンツ・タイプを持つcomplexTypeである必要があります。''{1}''は、これらのどの条件も満たしていません。
+        src-ct.2.2 = src-ct.2.2: タイプ''{0}''に対する複合型定義表現エラー。simpleContentを持つcomplexTypeが、混合コンテンツと空にできるパーティクルを持つcomplexTypeを制限する場合、<restriction>の子の中に<simpleType>が存在する必要があります。
+        src-ct.4 = src-ct.4: タイプ''{0}''に対する複合型定義表現エラー。ワイルドカードの共通部分は表現できません。
+        src-ct.5 = src-ct.5: タイプ''{0}''に対する複合型定義表現エラー。ワイルドカードの共用体は表現できません。
+        src-element.1 = src-element.1: ''default''と''fixed''の両方のプロパティを要素宣言''{0}''に含めることはできません。いずれか一方のみを使用してください。
+        src-element.2.1 = src-element.2.1: : 'ref'または'name'のいずれかがローカル要素宣言に使用されている必要があります。
+        src-element.2.2 = src-element.2.2: ''{0}''に''ref''属性が含まれているため、そのコンテンツは(annotation?)と一致する必要があります。ただし、''{1}''が見つかりました。
+        src-element.3 = src-element.3: 要素''{0}''に''type''属性と子''anonymous type''の両方が含まれています。要素にはこれらのうちいずれか一方のみを使用できます。
+        src-import.1.1 = src-import.1.1: <import>要素情報アイテムのネームスペース属性''{0}''は、属性が存在するスキーマのtargetNamespaceと同じものにはできません。
+        src-import.1.2 = src-import.1.2: <import>要素情報アイテムにネームスペース属性が存在しない場合、包含するスキーマにはtargetNamespaceが必要です。
+        src-import.2 = src-import.2: ドキュメント''{0}''のルート要素には、ネームスペース名''http://www.w3.org/2001/XMLSchema''およびローカル名''schema''が必要です。
+        src-import.3.1 = src-import.3.1: <import>要素情報アイテムのネームスペース属性''{0}''は、インポートしたドキュメントのtargetNamespace属性''{1}''と同じである必要があります。
+        src-import.3.2 = src-import.3.2: ネームスペース属性のない<import>要素情報アイテムが見つかったため、インポートしたドキュメントにtargetNamespace属性を含めることはできません。ただし、インポートしたドキュメントにtargetNamespace ''{1}''が見つかりました。
+        src-include.1 = src-include.1: ドキュメント''{0}''のルート要素には、ネームスペース名''http://www.w3.org/2001/XMLSchema''およびローカル名''schema''が必要です。
+        src-include.2.1 = src-include.2.1: 現在''{1}''である参照スキーマのtargetNamespaceは、現在''{0}''であるインクルードするスキーマのものと同じである必要があります。
+        src-redefine.2 = src-redefine.2: ドキュメント''{0}''のルート要素には、ネームスペース名''http://www.w3.org/2001/XMLSchema''およびローカル名''schema''が必要です。
+        src-redefine.3.1 = src-redefine.3.1: 現在''{1}''である参照スキーマのtargetNamespaceは、現在''{0}''である再定義するスキーマのものと同じである必要があります。
+        src-redefine.5.a.a = src-redefine.5.a.a: <simpleType>の注釈以外の子が見つかりませんでした。<redefine>要素の<simpleType>の子には、それ自体を参照する'base'属性を持つ<restriction>の子孫が含まれている必要があります。
+        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}''は有効な子要素ではありません。<redefine>要素の<simpleType>の子には、それ自体を参照する''base''属性を持つ<restriction>の子孫が含まれている必要があります。
+        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}''に再定義済の要素''{1}''を参照する''base''属性がありません。<redefine>要素の<simpleType>の子には、それ自体を参照する''base''属性を持つ<restriction>の子孫が含まれている必要があります。
+        src-redefine.5.b.a = src-redefine.5.b.a: <complexType>の注釈以外の子が見つかりませんでした。<redefine>要素の<complexType>の子には、それ自体を参照する'base'属性を持つ<extension>または<restriction>の子孫が含まれている必要があります。
+        src-redefine.5.b.b = src-redefine.5.b.b: <complexType>の注釈以外の孫が見つかりませんでした。<redefine>要素の<complexType>の子には、それ自体を参照する'base'属性を持つ<extension>または<restriction>の子孫が含まれている必要があります。
+        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}''は有効な孫要素ではありません。<redefine>要素の<complexType>の子には、それ自体を参照する''base''属性を持つ<extension>または<restriction>の子孫が含まれている必要があります。
+        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}''に再定義済の要素''{1}''を参照する''base''属性がありません。<redefine>要素の<complexType>の子には、それ自体を参照する''base''属性を持つ<extension>または<restriction>の子孫が含まれている必要があります。
+        src-redefine.6.1.1 = src-redefine.6.1.1: <redefine>要素の子グループにそれ自体を参照するグループが含まれている場合、それは1つである必要があります。これには''{0}''が含まれます。
+        src-redefine.6.1.2 = src-redefine.6.1.2: 再定義されているグループへの参照が含まれているグループ''{0}''には''minOccurs'' = ''maxOccurs'' = 1を指定する必要があります。
+        src-redefine.6.2.1 = src-redefine.6.2.1: 再定義されたスキーマには、''{0}''と一致する名前を持つグループがありません。
+        src-redefine.6.2.2 = src-redefine.6.2.2: グループ''{0}''では再定義したグループが適切に制限されていません。制約違反: ''{1}''。
+        src-redefine.7.1 = src-redefine.7.1: <redefine>要素のattributeGroupの子にそれ自体を参照するattributeGroupが含まれている場合は1つである必要がありますが、これには{0}含まれます。
+        src-redefine.7.2.1 = src-redefine.7.2.1: 再定義されたスキーマには、''{0}''と一致する名前を持つattributeGroupがありません。
+        src-redefine.7.2.2 = src-redefine.7.2.2: AttributeGroup ''{0}''では再定義したattributeGroupが適切に制限されていません。制約違反: ''{1}''。
+        src-resolve = src-resolve: 名前''{0}''を''{1}''コンポーネントに解決できません。
+        src-resolve.4.1 = src-resolve.4.1: コンポーネント''{2}''の解決中にエラーが発生しました。''{2}''にはネームスペースが存在しませんが、ターゲット・ネームスペースのないコンポーネントはスキーマ・ドキュメント''{0}''から参照できません。''{2}''にネームスペースを指定する場合は、接頭辞の追加が必要になることがあります。''{2}''にネームスペースを指定しない場合は、"namespace"属性のない''import''を''{0}''に追加する必要があります。
+        src-resolve.4.2 = src-resolve.4.2: コンポーネント''{2}''の解決中にエラーが発生しました。''{2}''はネームスペース''{1}''に含まれていますが、このネームスペースからのコンポーネントはスキーマ・ドキュメント''{0}''から参照できません。このネームスペースが正しくない場合は、''{2}''の接頭辞の変更が必要になることがあります。このネームスペースが正しい場合は、適切な''import''タグを''{0}''に追加する必要があります。
+        src-simple-type.2.a = src-simple-type.2.a: [children]にベース[attribute]と<simpleType>要素の両方を含む<restriction>要素が見つかりました。いずれか一方のみを使用できます。
+        src-simple-type.2.b = src-simple-type.2.b: [children]にベース[attribute]も<simpleType>要素もない<restriction>要素が見つかりました。いずれか一方が必要です。
+        src-simple-type.3.a = src-simple-type.3.a: [children]にitemType [attribute]と<simpleType>要素の両方を含む<list>要素が見つかりました。いずれか一方のみを使用できます。
+        src-simple-type.3.b = src-simple-type.3.b: [children]にitemType [attribute]も<simpleType>要素もない<list>要素が見つかりました。いずれか一方が必要です。
+        src-single-facet-value = src-single-facet-value: ファセット''{0}''が複数回定義されています。
+        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: <union>要素のmemberTypes [attribute]が空でないか、[children]に少なくとも1つの<simpleType>要素が含まれている必要があります。
 
 #constraint valid (3.X.6)
 
-        ag-props-correct.2 = ag-props-correct.2: \u5C5E\u6027\u30B0\u30EB\u30FC\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u540C\u3058\u540D\u524D\u304A\u3088\u3073\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3092\u6301\u3064\u91CD\u8907\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u91CD\u8907\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306E\u540D\u524D\u306F''{1}''\u3067\u3059\u3002
-        ag-props-correct.3 = ag-props-correct.3: \u5C5E\u6027\u30B0\u30EB\u30FC\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u30022\u3064\u306E\u5C5E\u6027\u5BA3\u8A00''{1}''\u3068''{2}''\u306BID\u304B\u3089\u5C0E\u51FA\u3057\u305F\u30BF\u30A4\u30D7\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-        a-props-correct.2 = a-props-correct.2: \u5C5E\u6027''{0}''\u306E\u5024\u5236\u7D04\u306E\u5024''{1}''\u304C\u7121\u52B9\u3067\u3059\u3002
-        a-props-correct.3 = a-props-correct.3: \u5C5E\u6027''{0}''\u3067\u306F''fixed''\u3082''default''\u3082\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u3053\u308C\u306F\u3001\u5C5E\u6027\u306E'{'type definition'}'\u304CID\u3067\u3042\u308B\u304B\u3001ID\u304B\u3089\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u3042\u308B\u305F\u3081\u3067\u3059\u3002
-        au-props-correct.2 = au-props-correct.2: ''{0}''\u306E\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001\u56FA\u5B9A\u5024''{1}''\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305D\u306E\u305F\u3081\u3001''{0}''\u3092\u53C2\u7167\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306B'{'value constraint'}'\u3082\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u305D\u308C\u3092\u56FA\u5B9A\u3057\u3001\u305D\u306E\u5024\u3092''{1}''\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        cos-all-limited.1.2 = cos-all-limited.1.2: 'all'\u306E\u30E2\u30C7\u30EB\u30FB\u30B0\u30EB\u30FC\u30D7\u306F'{'min occurs'}' = '{'max occurs'}' = 1\u306E\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306B\u542B\u307E\u308C\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306F\u8907\u5408\u578B\u5B9A\u7FA9\u306E'{'content type'}'\u3092\u69CB\u6210\u3059\u308B1\u7D44\u306E\u4E00\u90E8\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        cos-all-limited.2 = cos-all-limited.2: ''all''\u306E\u30E2\u30C7\u30EB\u30FB\u30B0\u30EB\u30FC\u30D7\u306E\u8981\u7D20\u306E'{'max occurs'}'\u306F0\u304B1\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u8981\u7D20''{1}''\u306E\u5024''{0}''\u306F\u7121\u52B9\u3067\u3059\u3002
-        cos-applicable-facets = cos-applicable-facets: \u30BF\u30A4\u30D7{1}\u306B\u30D5\u30A1\u30BB\u30C3\u30C8''{0}''\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-        cos-ct-extends.1.1 = cos-ct-extends.1.1: \u30BF\u30A4\u30D7''{0}''\u306F\u30BF\u30A4\u30D7''{1}''\u306E\u62E1\u5F35\u306B\u3088\u3063\u3066\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u3059\u3002\u305F\u3060\u3057\u3001''{1}''\u306E''final''\u5C5E\u6027\u306B\u3088\u3063\u3066\u3001\u62E1\u5F35\u306B\u3088\u308B\u5C0E\u51FA\u304C\u7981\u6B62\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: \u5C0E\u51FA\u3055\u308C\u305F\u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u3068\u305D\u306E\u30D9\u30FC\u30B9\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u306F\u4E21\u65B9\u3068\u3082\u6DF7\u5408\u578B\u306B\u3059\u308B\u304B\u3001\u8981\u7D20\u306E\u307F\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7''{0}''\u306F\u8981\u7D20\u306E\u307F\u3067\u3059\u304C\u3001\u305D\u306E\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306F\u8981\u7D20\u306E\u307F\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: \u5C0E\u51FA\u3055\u308C\u305F\u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u3068\u305D\u306E\u30D9\u30FC\u30B9\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u306F\u4E21\u65B9\u3068\u3082\u6DF7\u5408\u578B\u306B\u3059\u308B\u304B\u3001\u8981\u7D20\u306E\u307F\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7''{0}''\u306F\u6DF7\u5408\u578B\u3067\u3059\u304C\u3001\u305D\u306E\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306F\u6DF7\u5408\u578B\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cos-element-consistent = cos-element-consistent: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002''{1}''\u3068\u3044\u3046\u540D\u524D\u306E\u7570\u306A\u308B\u30BF\u30A4\u30D7\u306E\u8907\u6570\u306E\u8981\u7D20\u304C\u30E2\u30C7\u30EB\u30FB\u30B0\u30EB\u30FC\u30D7\u306B\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-        cos-list-of-atomic = cos-list-of-atomic: \u30BF\u30A4\u30D7''{1}''\u306F\u30A2\u30C8\u30DF\u30C3\u30AF\u3067\u306F\u306A\u3044\u305F\u3081(''{1}''\u306F\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7\u304B\u3001\u30EA\u30B9\u30C8\u3092\u542B\u3080\u5171\u7528\u4F53\u30BF\u30A4\u30D7\u3067\u3042\u308B\u305F\u3081)\u3001\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7''{0}''\u306E\u5B9A\u7FA9\u3067\u306F\u7121\u52B9\u306A\u30EA\u30B9\u30C8\u8981\u7D20\u30BF\u30A4\u30D7\u3067\u3059\u3002
-        cos-nonambig = cos-nonambig: {0}\u3068{1} (\u307E\u305F\u306F\u7F6E\u63DB\u30B0\u30EB\u30FC\u30D7\u306E\u8981\u7D20)\u304C"Unique Particle Attribution"\u306B\u9055\u53CD\u3057\u3066\u3044\u307E\u3059\u3002\u3053\u306E\u30B9\u30AD\u30FC\u30DE\u306B\u5BFE\u3059\u308B\u691C\u8A3C\u6642\u306B\u3001\u3053\u308C\u30892\u3064\u306E\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306B\u3042\u3044\u307E\u3044\u3055\u304C\u751F\u3058\u308B\u3068\u8003\u3048\u3089\u308C\u307E\u3059\u3002
-        cos-particle-restrict.a = cos-particle-restrict.a: \u5C0E\u51FA\u3055\u308C\u305F\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u304C\u7A7A\u3067\u3042\u308A\u3001\u30D9\u30FC\u30B9\u306F\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-        cos-particle-restrict.b = cos-particle-restrict.b: \u30D9\u30FC\u30B9\u306E\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306F\u7A7A\u3067\u3059\u304C\u3001\u5C0E\u51FA\u3055\u308C\u305F\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306F\u7A7A\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        cos-particle-restrict.2 = cos-particle-restrict.2: \u7981\u6B62\u3055\u308C\u305F\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u5236\u9650: ''{0}''\u3002
-        cos-st-restricts.1.1 = cos-st-restricts.1.1: \u30BF\u30A4\u30D7''{1}''\u306F\u30A2\u30C8\u30DF\u30C3\u30AF\u3067\u3042\u308B\u305F\u3081\u3001\u305D\u306E'{'base type definition'}' ''{0}''\u306F\u30A2\u30C8\u30DF\u30C3\u30AF\u306E\u5358\u7D14\u578B\u5B9A\u7FA9\u304B\u30D7\u30EA\u30DF\u30C6\u30A3\u30D6\u306E\u7D44\u8FBC\u307F\u30C7\u30FC\u30BF\u578B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        cos-st-restricts.2.1 = cos-st-restricts.2.1: \u30BF\u30A4\u30D7''{1}''\u306F\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7\u304B\u3001\u30EA\u30B9\u30C8\u3092\u542B\u3080\u5171\u7528\u4F53\u30BF\u30A4\u30D7\u3067\u3042\u308B\u305F\u3081\u3001\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7''{0}''\u306E\u5B9A\u7FA9\u3067\u306F\u7121\u52B9\u306A\u30A2\u30A4\u30C6\u30E0\u30FB\u30BF\u30A4\u30D7\u3067\u3059\u3002
-        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: '{'item type definition'}' ''{0}''\u306E'{'final'}'\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u306F\u3001''list''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u3064\u307E\u308A\u3001''{0}''\u306F\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7''{1}''\u306E\u30A2\u30A4\u30C6\u30E0\u30FB\u30BF\u30A4\u30D7\u3068\u3057\u3066\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: '{'member type definitions'}' ''{0}''\u306E'{'final'}'\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u306F\u3001''union''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u3064\u307E\u308A\u3001''{0}''\u306F\u5171\u7528\u4F53\u30BF\u30A4\u30D7''{1}''\u306E\u30E1\u30F3\u30D0\u30FC\u30FB\u30BF\u30A4\u30D7\u3068\u3057\u3066\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-        cos-valid-default.2.1 = cos-valid-default.2.1: \u8981\u7D20''{0}''\u306B\u306F\u5024\u5236\u7D04\u304C\u542B\u307E\u308C\u3066\u304A\u308A\u3001\u6DF7\u5408\u307E\u305F\u306F\u5358\u7D14\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: \u8981\u7D20''{0}''\u306B\u306F'{'value constraint'}'\u304C\u542B\u307E\u308C\u3066\u304A\u308A\u3001\u305D\u306E\u30BF\u30A4\u30D7\u5B9A\u7FA9\u306B\u306F\u6DF7\u5408'{'content type'}'\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u305F\u3081\u3001'{'content type'}'\u306E\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306F\u7A7A\u306B\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        c-props-correct.2 = c-props-correct.2: keyref ''{0}''\u3068key ''{1}''\u306B\u5BFE\u3059\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30AB\u30FC\u30C7\u30A3\u30CA\u30EA\u30C6\u30A3\u304C\u76F8\u4E92\u306B\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        ct-props-correct.3 = ct-props-correct.3: \u8907\u5408\u578B''{0}''\u3067\u5FAA\u74B0\u5B9A\u7FA9\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u3064\u307E\u308A\u3001''{0}''\u304C\u305D\u308C\u81EA\u4F53\u306E\u30BF\u30A4\u30D7\u968E\u5C64\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u305F\u3081\u30A8\u30E9\u30FC\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-        ct-props-correct.4 = ct-props-correct.4: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u540C\u3058\u540D\u524D\u304A\u3088\u3073\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3092\u6301\u3064\u91CD\u8907\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u91CD\u8907\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306E\u540D\u524D\u306F''{1}''\u3067\u3059\u3002
-        ct-props-correct.5 = ct-props-correct.5: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u30022\u3064\u306E\u5C5E\u6027\u5BA3\u8A00''{1}''\u3068''{2}''\u306BID\u304B\u3089\u5C0E\u51FA\u3057\u305F\u30BF\u30A4\u30D7\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-        derivation-ok-restriction.1 = derivation-ok-restriction.1: \u30BF\u30A4\u30D7''{0}''\u306F\u30BF\u30A4\u30D7''{1}''\u306E\u5236\u9650\u306B\u3088\u3063\u3066\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u3059\u3002\u305F\u3060\u3057\u3001''{1}''\u306E'{'final'}'\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u3088\u3063\u3066\u3001\u5236\u9650\u306B\u3088\u308B\u5C0E\u51FA\u304C\u7981\u6B62\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5C5E\u6027\u4F7F\u7528''{1}''\u306B\u306F\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306E\u5024''required''\u3068\u4E00\u8CAB\u6027\u304C\u306A\u3044''{2}''\u306E''use''\u5024\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5C5E\u6027\u4F7F\u7528''{1}''\u306B\u306F\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306E\u30BF\u30A4\u30D7''{3}''\u304B\u3089\u6B63\u5E38\u306B\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u306F\u306A\u3044\u30BF\u30A4\u30D7''{2}''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5C5E\u6027\u4F7F\u7528''{1}''\u306B\u306F\u3001\u56FA\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u6709\u52B9\u306A\u5024\u5236\u7D04\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306E\u6709\u52B9\u306A\u5024\u5236\u7D04\u306F\u56FA\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5C5E\u6027\u4F7F\u7528''{1}''\u306B\u306F\u3001\u5024''{2}''\u3067\u56FA\u5B9A\u3055\u308C\u3066\u3044\u308B\u6709\u52B9\u306A\u5024\u5236\u7D04\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306E\u56FA\u5B9A\u3055\u308C\u3066\u3044\u308B\u6709\u52B9\u306A\u5024\u5236\u7D04\u306E\u5024''{3}''\u3068\u4E00\u8CAB\u6027\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5C5E\u6027\u4F7F\u7528''{1}''\u306F\u30D9\u30FC\u30B9\u306E\u5C5E\u6027\u4F7F\u7528\u3068\u5BFE\u5FDC\u3057\u3066\u304A\u3089\u305A\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306B\u306F\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u5C5E\u6027\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5C5E\u6027\u4F7F\u7528''{1}''\u306F\u30D9\u30FC\u30B9\u306E\u5C5E\u6027\u4F7F\u7528\u3068\u5BFE\u5FDC\u3057\u3066\u304A\u3089\u305A\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u3067\u306F\u3053\u306E\u5C5E\u6027\u4F7F\u7528\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''{2}''\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        derivation-ok-restriction.3 = derivation-ok-restriction.3: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5C5E\u6027\u4F7F\u7528''{1}''\u3067\u306FREQUIRED\u304Ctrue\u3067\u3059\u304C\u3001\u5C0E\u51FA\u3055\u308C\u305F\u30BF\u30A4\u30D7\u306B\u306F\u305D\u308C\u3068\u5BFE\u5FDC\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u5C0E\u51FA\u306B\u306F\u5C5E\u6027\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u30D9\u30FC\u30B9\u306B\u306F\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u5C0E\u51FA\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306F\u30D9\u30FC\u30B9\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u6709\u52B9\u306A\u30B5\u30D6\u30BB\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u5C0E\u51FA({1})\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u30D7\u30ED\u30BB\u30B9\u30FB\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u3001\u30D9\u30FC\u30B9({2})\u306E\u3082\u306E\u3088\u308A\u5F31\u304F\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5358\u7D14\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7''{1}''\u306F\u3001\u30D9\u30FC\u30B9\u306E\u5358\u7D14\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7''{2}''\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u306F\u7A7A\u3067\u3059\u304C\u3001\u30D9\u30FC\u30B9\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7''{1}''\u306F\u7A7A\u3067\u306F\u306A\u3044\u304B\u3001\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u306F\u6DF7\u5408\u578B\u3067\u3059\u304C\u3001\u30D9\u30FC\u30B9\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7''{1}''\u306F\u6DF7\u5408\u578B\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306F\u30D9\u30FC\u30B9\u306E\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        enumeration-required-notation = enumeration-required-notation: {2} ''{1}''\u3067\u4F7F\u7528\u3055\u308C\u308BNOTATION\u30BF\u30A4\u30D7''{0}''\u306B\u306F\u3001\u3053\u306E\u30BF\u30A4\u30D7\u3067\u4F7F\u7528\u3055\u308C\u308B\u8868\u8A18\u6CD5\u8981\u7D20\u3092\u6307\u5B9A\u3059\u308B\u5217\u6319\u30D5\u30A1\u30BB\u30C3\u30C8\u5024\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        enumeration-valid-restriction = enumeration-valid-restriction: \u5217\u6319\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5024\u7A7A\u9593{1}\u306B\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
-        e-props-correct.2 = e-props-correct.2: \u8981\u7D20''{0}''\u306E\u5024\u5236\u7D04\u306E\u5024''{1}''\u304C\u7121\u52B9\u3067\u3059\u3002
-        e-props-correct.4 = e-props-correct.4: \u8981\u7D20''{0}''\u306E'{'type definition'}'\u304CsubstitutionHead ''{1}''\u306E'{'type definition'}'\u304B\u3089\u6B63\u5E38\u306B\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u306A\u3044\u304B\u3001''{1}''\u306E'{'substitution group exclusions'}'\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u3053\u306E\u5C0E\u51FA\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        e-props-correct.5 = e-props-correct.5: \u8981\u7D20\u306E'{'type definition'}'\u307E\u305F\u306F'{'type definition'}'\u306E'{'content type'}'\u306FID\u3067\u3042\u308B\u304B\u3001ID\u304B\u3089\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u3042\u308B\u305F\u3081\u3001\u8981\u7D20''{0}''\u306B'{'value constraint'}'\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        e-props-correct.6 = e-props-correct.6: \u8981\u7D20''{0}''\u3067\u5FAA\u74B0\u7F6E\u63DB\u30B0\u30EB\u30FC\u30D7\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
-        fractionDigits-valid-restriction = fractionDigits-valid-restriction: \u30D5\u30A1\u30BB\u30C3\u30C8''fractionDigits''\u306E\u5024''{0}''\u306F\u3001\u7956\u5148\u30BF\u30A4\u30D7\u306E\u3044\u305A\u308C\u304B\u3067''{1}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B''fractionDigits''\u306E\u5024\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308B\u305F\u3081\u3001{2}\u306E\u5B9A\u7FA9\u3067\u306F\u7121\u52B9\u3067\u3059\u3002
-        fractionDigits-totalDigits = fractionDigits-totalDigits: \u30D5\u30A1\u30BB\u30C3\u30C8''fractionDigits''\u306E\u5024''{0}''\u306F\u3001''totalDigits''\u306E\u5024''{1}''\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308B\u305F\u3081\u3001{2}\u306E\u5B9A\u7FA9\u3067\u306F\u7121\u52B9\u3067\u3059\u3002
-        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: \u30BF\u30A4\u30D7{0}\u3067\u306F\u3001length\u306E\u5024''{1}''\u304CminLength\u306E\u5024''{2}''\u3088\u308A\u5C0F\u3055\u3044\u3068\u3001\u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
-        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: \u30BF\u30A4\u30D7{0}\u3067\u306F\u3001\u73FE\u5728\u306E\u5236\u9650\u306E\u30D5\u30A1\u30BB\u30C3\u30C8\u304CminLength\u3067\u3042\u308A\u3001\u73FE\u5728\u306E\u5236\u9650\u307E\u305F\u306F\u30D9\u30FC\u30B9\u306E\u30D5\u30A1\u30BB\u30C3\u30C8\u304Clength\u3067\u3042\u308B\u5834\u5408\u3001\u30D9\u30FC\u30B9\u306BminLength\u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u542B\u307E\u308C\u3066\u3044\u306A\u3044\u3068\u3001\u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
-        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: \u30BF\u30A4\u30D7{0}\u3067\u306F\u3001\u73FE\u5728\u306EminLength ''{1}''\u304C\u30D9\u30FC\u30B9\u306EminLength ''{2}''\u3068\u7B49\u3057\u304F\u306A\u3044\u3068\u3001\u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
-        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: \u30BF\u30A4\u30D7{0}\u3067\u306F\u3001length\u306E\u5024''{1}''\u304CmaxLength\u306E\u5024''{2}''\u3088\u308A\u5927\u304D\u3044\u3068\u3001\u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
-        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: \u30BF\u30A4\u30D7{0}\u3067\u306F\u3001\u73FE\u5728\u306E\u5236\u9650\u306E\u30D5\u30A1\u30BB\u30C3\u30C8\u304CmaxLength\u3067\u3042\u308A\u3001\u73FE\u5728\u306E\u5236\u9650\u307E\u305F\u306F\u30D9\u30FC\u30B9\u306E\u30D5\u30A1\u30BB\u30C3\u30C8\u304Clength\u3067\u3042\u308B\u5834\u5408\u3001\u30D9\u30FC\u30B9\u306BmaxLength\u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u542B\u307E\u308C\u3066\u3044\u306A\u3044\u3068\u3001\u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
-        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: \u30BF\u30A4\u30D7{0}\u3067\u306F\u3001\u73FE\u5728\u306EmaxLength ''{1}''\u304C\u30D9\u30FC\u30B9\u306EmaxLength ''{2}''\u3068\u7B49\u3057\u304F\u306A\u3044\u3068\u3001\u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
-        length-valid-restriction = length-valid-restriction: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002\u9577\u3055\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306Elength\u306E\u5024\u3068\u540C\u3058\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002maxExclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EmaxExclusive\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002maxExclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EmaxInclusive\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002maxExclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EminInclusive\u3088\u308A\u5927\u304D\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002maxExclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EminExclusive\u3088\u308A\u5927\u304D\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        maxInclusive-maxExclusive = maxInclusive-maxExclusive: \u540C\u3058\u30C7\u30FC\u30BF\u578B\u306B\u5BFE\u3057\u3066maxInclusive\u3068maxExclusive\u306E\u4E21\u65B9\u3092\u6307\u5B9A\u3057\u305F\u3053\u3068\u306B\u3088\u308B\u30A8\u30E9\u30FC\u3067\u3059\u3002{2}\u3067\u306F\u3001maxInclusive\u306F''{0}''\u3001maxExclusive\u306F''{1}''\u3067\u3059\u3002
-        maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002maxInclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EmaxInclusive\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002maxInclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EmaxExclusive\u3088\u308A\u5C0F\u3055\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002maxInclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EminInclusive\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002maxInclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EminExclusive\u3088\u308A\u5927\u304D\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        maxLength-valid-restriction = maxLength-valid-restriction: {2}\u306E\u5B9A\u7FA9\u3067\u306F\u3001maxLength\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306E\u5024\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        mg-props-correct.2 = mg-props-correct.2: \u30B0\u30EB\u30FC\u30D7''{0}''\u3067\u5FAA\u74B0\u5B9A\u7FA9\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E'{'term'}'\u5024\u3092\u518D\u5E30\u7684\u306B\u305F\u3069\u308B\u3068\u3001'{'term'}'\u304C\u30B0\u30EB\u30FC\u30D7\u81EA\u4F53\u3067\u3042\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306B\u9054\u3057\u307E\u3059\u3002
-        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: {2}\u306E\u5B9A\u7FA9\u3067\u306F\u3001minExclusive\u306E\u5024''{0}''\u306FmaxExclusive\u306E\u5024''{1}''\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: {2}\u306E\u5B9A\u7FA9\u3067\u306F\u3001minExclusive\u306E\u5024''{0}''\u306FmaxInclusive\u306E\u5024''{1}''\u3088\u308A\u5C0F\u3055\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002minExclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EminExclusive\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2: ''\u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002minExclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EmaxInclusive\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002minExclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EminInclusive\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002minExclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EmaxExclusive\u3088\u308A\u5C0F\u3055\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: {2}\u306E\u5B9A\u7FA9\u3067\u306F\u3001minInclusive\u306E\u5024''{0}''\u306FmaxInclusive\u306E\u5024''{1}''\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: {2}\u306E\u5B9A\u7FA9\u3067\u306F\u3001minInclusive\u306E\u5024''{0}''\u306FmaxExclusive\u306E\u5024''{1}''\u3088\u308A\u5C0F\u3055\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minInclusive-minExclusive = minInclusive-minExclusive: \u540C\u3058\u30C7\u30FC\u30BF\u578B\u306B\u5BFE\u3057\u3066minInclusive\u3068minExclusive\u306E\u4E21\u65B9\u3092\u6307\u5B9A\u3057\u305F\u3053\u3068\u306B\u3088\u308B\u30A8\u30E9\u30FC\u3067\u3059\u3002{2}\u3067\u306F\u3001minInclusive\u306F''{0}''\u3001minExclusive\u306F''{1}''\u3067\u3059\u3002
-        minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002minInclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EminInclusive\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002minInclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EmaxInclusive\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002minInclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EminExclusive\u3088\u308A\u5927\u304D\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002minInclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EmaxExclusive\u3088\u308A\u5C0F\u3055\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: {2}\u306E\u5B9A\u7FA9\u3067\u306F\u3001minLength\u306E\u5024''{0}''\u306FmaxLength\u306E\u5024''{1}''\u3088\u308A\u5C0F\u3055\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        minLength-valid-restriction = minLength-valid-restriction: {2}\u306E\u5B9A\u7FA9\u3067\u306F\u3001minLength\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306E\u5024\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        no-xmlns = no-xmlns: \u5C5E\u6027\u5BA3\u8A00\u306E{name}\u3092'xmlns'\u3068\u540C\u4E00\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        no-xsi = no-xsi: \u5C5E\u6027\u5BA3\u8A00\u306E'{'target namespace'}'\u3092''{0}''\u3068\u540C\u4E00\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        p-props-correct.2.1 = p-props-correct.2.1: ''{0}''\u306E\u5BA3\u8A00\u3067\u306F\u3001''minOccurs''\u306E\u5024\u306F''{1}''\u3067\u3059\u304C\u3001''maxOccurs''\u306E\u5024''{2}''\u3088\u308A\u5927\u304D\u304F\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        rcase-MapAndSum.1 = rcase-MapAndSum.1: \u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u9593\u306B\u5B8C\u5168\u306A\u6A5F\u80FD\u30DE\u30C3\u30D4\u30F3\u30B0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-MapAndSum.2 = rcase-MapAndSum.2: \u30B0\u30EB\u30FC\u30D7\u306E\u51FA\u73FE\u7BC4\u56F2({0},{1})\u304C\u30D9\u30FC\u30B9\u30FB\u30B0\u30EB\u30FC\u30D7\u306E\u51FA\u73FE\u7BC4\u56F2({2},{3})\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: \u8981\u7D20\u306B\u7570\u306A\u308B\u540D\u524D\u3084\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u542B\u307E\u308C\u307E\u3059: \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''{1}''\u306E\u8981\u7D20''{0}''\u304A\u3088\u3073\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''{3}''\u306E\u8981\u7D20''{2}''\u3067\u3059\u3002
-        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: '{'term'}'\u304C\u8981\u7D20\u5BA3\u8A00''{0}''\u3067\u3042\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u30A8\u30E9\u30FC\u3002\u8981\u7D20\u5BA3\u8A00\u306E'{'nillable'}'\u306Ftrue\u3067\u3059\u304C\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306B\u306F'{'nillable'}'\u304Cfalse\u306E\u8981\u7D20\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: '{'term'}'\u304C\u8981\u7D20\u5BA3\u8A00''{0}''\u3067\u3042\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u30A8\u30E9\u30FC\u3002\u51FA\u73FE\u7BC4\u56F2({1},{2})\u306F\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u7BC4\u56F2({3},{4})\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: \u8981\u7D20''{0}''\u306F\u56FA\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u304C\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u8981\u7D20\u306F\u5024''{1}''\u3067\u56FA\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: \u8981\u7D20''{0}''\u306F\u5024''{1}''\u3067\u56FA\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u8981\u7D20\u306F\u5024''{2}''\u3067\u56FA\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: \u8981\u7D20''{0}''\u306E\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u304C\u30D9\u30FC\u30B9\u306E\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u306E\u30B5\u30D6\u30BB\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: \u8981\u7D20''{0}''\u306Edisallowed substitutions\u306F\u30D9\u30FC\u30B9\u306Edisallowed substitutions\u306E\u30B9\u30FC\u30D1\u30FC\u30BB\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: \u8981\u7D20''{0}''\u306E\u30BF\u30A4\u30D7''{1}''\u306F\u3001\u30D9\u30FC\u30B9\u8981\u7D20\u306E\u30BF\u30A4\u30D7''{2}''\u304B\u3089\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-NSCompat.1 = rcase-NSCompat.1: \u8981\u7D20''{0}''\u306B\u3001\u30D9\u30FC\u30B9\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u3067\u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''{1}''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-        rcase-NSCompat.2 = rcase-NSCompat.2: '{'term'}'\u304C\u8981\u7D20\u5BA3\u8A00''{0}''\u3067\u3042\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u30A8\u30E9\u30FC\u3002\u51FA\u73FE\u7BC4\u56F2({1},{2})\u306F\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u7BC4\u56F2({3},{4})\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: \u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u9593\u306B\u5B8C\u5168\u306A\u6A5F\u80FD\u30DE\u30C3\u30D4\u30F3\u30B0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: \u30B0\u30EB\u30FC\u30D7\u306E\u51FA\u73FE\u7BC4\u56F2({0},{1})\u304C\u30D9\u30FC\u30B9\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u7BC4\u56F2({2},{3})\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-NSSubset.1 = rcase-NSSubset.1: \u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u304C\u3001\u30D9\u30FC\u30B9\u306E\u5BFE\u5FDC\u3059\u308B\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u30B5\u30D6\u30BB\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-NSSubset.2 = rcase-NSSubset.2: \u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u51FA\u73FE\u7BC4\u56F2({0},{1})\u306F\u3001\u30D9\u30FC\u30B9\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u51FA\u73FE\u7BC4\u56F2({2},{3})\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-NSSubset.3 = rcase-NSSubset.3: \u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u30D7\u30ED\u30BB\u30B9\u30FB\u30B3\u30F3\u30C6\u30F3\u30C4''{0}''\u304C\u3001\u30D9\u30FC\u30B9\u306E\u3082\u306E''{1}''\u3088\u308A\u5F31\u304F\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-        rcase-Recurse.1 = rcase-Recurse.1: \u30B0\u30EB\u30FC\u30D7\u306E\u51FA\u73FE\u7BC4\u56F2({0},{1})\u304C\u30D9\u30FC\u30B9\u30FB\u30B0\u30EB\u30FC\u30D7\u306E\u51FA\u73FE\u7BC4\u56F2({2},{3})\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-Recurse.2 = rcase-Recurse.2: \u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u9593\u306B\u5B8C\u5168\u306A\u6A5F\u80FD\u30DE\u30C3\u30D4\u30F3\u30B0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-RecurseLax.1 = rcase-RecurseLax.1: \u30B0\u30EB\u30FC\u30D7\u306E\u51FA\u73FE\u7BC4\u56F2({0},{1})\u304C\u30D9\u30FC\u30B9\u30FB\u30B0\u30EB\u30FC\u30D7\u306E\u51FA\u73FE\u7BC4\u56F2({2},{3})\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-RecurseLax.2 = rcase-RecurseLax.2: \u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u9593\u306B\u5B8C\u5168\u306A\u6A5F\u80FD\u30DE\u30C3\u30D4\u30F3\u30B0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: \u30B0\u30EB\u30FC\u30D7\u306E\u51FA\u73FE\u7BC4\u56F2({0},{1})\u304C\u30D9\u30FC\u30B9\u30FB\u30B0\u30EB\u30FC\u30D7\u306E\u51FA\u73FE\u7BC4\u56F2({2},{3})\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: \u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u9593\u306B\u5B8C\u5168\u306A\u6A5F\u80FD\u30DE\u30C3\u30D4\u30F3\u30B0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+        ag-props-correct.2 = ag-props-correct.2: 属性グループ''{0}''のエラー。同じ名前およびターゲット・ネームスペースを持つ重複する属性使用が指定されています。重複する属性使用の名前は''{1}''です。
+        ag-props-correct.3 = ag-props-correct.3: 属性グループ''{0}''のエラー。2つの属性宣言''{1}''と''{2}''にIDから導出したタイプが含まれています。
+        a-props-correct.2 = a-props-correct.2: 属性''{0}''の値制約の値''{1}''が無効です。
+        a-props-correct.3 = a-props-correct.3: 属性''{0}''では''fixed''も''default''も使用できません。これは、属性の'{'type definition'}'がIDであるか、IDから導出されたものであるためです。
+        au-props-correct.2 = au-props-correct.2: ''{0}''の属性宣言では、固定値''{1}''が指定されています。そのため、''{0}''を参照する属性使用に'{'value constraint'}'も含まれている場合は、それを固定し、その値を''{1}''にする必要があります。
+        cos-all-limited.1.2 = cos-all-limited.1.2: 'all'のモデル・グループは'{'min occurs'}' = '{'max occurs'}' = 1のパーティクルに含まれる必要があり、パーティクルは複合型定義の'{'content type'}'を構成する1組の一部である必要があります。
+        cos-all-limited.2 = cos-all-limited.2: ''all''のモデル・グループの要素の'{'max occurs'}'は0か1である必要があります。要素''{1}''の値''{0}''は無効です。
+        cos-applicable-facets = cos-applicable-facets: タイプ{1}にファセット''{0}''は使用できません。
+        cos-ct-extends.1.1 = cos-ct-extends.1.1: タイプ''{0}''はタイプ''{1}''の拡張によって導出されたものです。ただし、''{1}''の''final''属性によって、拡張による導出が禁止されています。
+        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: 導出されたタイプのコンテンツ・タイプとそのベースのコンテンツ・タイプは両方とも混合型にするか、要素のみにする必要があります。タイプ''{0}''は要素のみですが、そのベース・タイプは要素のみではありません。
+        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: 導出されたタイプのコンテンツ・タイプとそのベースのコンテンツ・タイプは両方とも混合型にするか、要素のみにする必要があります。タイプ''{0}''は混合型ですが、そのベース・タイプは混合型ではありません。
+        cos-element-consistent = cos-element-consistent: タイプ''{0}''のエラー。''{1}''という名前の異なるタイプの複数の要素がモデル・グループに含まれています。
+        cos-list-of-atomic = cos-list-of-atomic: タイプ''{1}''はアトミックではないため(''{1}''はリスト・タイプか、リストを含む共用体タイプであるため)、リスト・タイプ''{0}''の定義では無効なリスト要素タイプです。
+        cos-nonambig = cos-nonambig: {0}と{1} (または置換グループの要素)が"Unique Particle Attribution"に違反しています。このスキーマに対する検証時に、これら2つのパーティクルにあいまいさが生じると考えられます。
+        cos-particle-restrict.a = cos-particle-restrict.a: 導出されたパーティクルが空であり、ベースは空にできません。
+        cos-particle-restrict.b = cos-particle-restrict.b: ベースのパーティクルは空ですが、導出されたパーティクルは空ではありません。
+        cos-particle-restrict.2 = cos-particle-restrict.2: 禁止されたパーティクルの制限: ''{0}''。
+        cos-st-restricts.1.1 = cos-st-restricts.1.1: タイプ''{1}''はアトミックであるため、その'{'base type definition'}' ''{0}''はアトミックの単純型定義かプリミティブの組込みデータ型である必要があります。
+        cos-st-restricts.2.1 = cos-st-restricts.2.1: タイプ''{1}''はリスト・タイプか、リストを含む共用体タイプであるため、リスト・タイプ''{0}''の定義では無効なアイテム・タイプです。
+        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: '{'item type definition'}' ''{0}''の'{'final'}'コンポーネントには、''list''が含まれています。つまり、''{0}''はリスト・タイプ''{1}''のアイテム・タイプとしては使用できません。
+        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: '{'member type definitions'}' ''{0}''の'{'final'}'コンポーネントには、''union''が含まれています。つまり、''{0}''は共用体タイプ''{1}''のメンバー・タイプとしては使用できません。
+        cos-valid-default.2.1 = cos-valid-default.2.1: 要素''{0}''には値制約が含まれており、混合または単純コンテンツ・モデルが含まれている必要があります。
+        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: 要素''{0}''には'{'value constraint'}'が含まれており、そのタイプ定義には混合'{'content type'}'が含まれているため、'{'content type'}'のパーティクルは空にできる必要があります。
+        c-props-correct.2 = c-props-correct.2: keyref ''{0}''とkey ''{1}''に対するフィールドのカーディナリティが相互に一致する必要があります。
+        ct-props-correct.3 = ct-props-correct.3: 複合型''{0}''で循環定義が検出されました。つまり、''{0}''がそれ自体のタイプ階層に含まれているためエラーになっています。
+        ct-props-correct.4 = ct-props-correct.4: タイプ''{0}''のエラー。同じ名前およびターゲット・ネームスペースを持つ重複する属性使用が指定されています。重複する属性使用の名前は''{1}''です。
+        ct-props-correct.5 = ct-props-correct.5: タイプ''{0}''のエラー。2つの属性宣言''{1}''と''{2}''にIDから導出したタイプが含まれています。
+        derivation-ok-restriction.1 = derivation-ok-restriction.1: タイプ''{0}''はタイプ''{1}''の制限によって導出されたものです。ただし、''{1}''の'{'final'}'プロパティによって、制限による導出が禁止されています。
+        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: タイプ''{0}''のエラー。このタイプの属性使用''{1}''には、ベース・タイプの対応する属性使用の値''required''と一貫性がない''{2}''の''use''値が含まれています。
+        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: タイプ''{0}''のエラー。このタイプの属性使用''{1}''には、ベース・タイプの対応する属性使用のタイプ''{3}''から正常に導出されたものではないタイプ''{2}''が含まれています。
+        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: タイプ''{0}''のエラー。このタイプの属性使用''{1}''には、固定されていない有効な値制約が含まれていますが、ベース・タイプの対応する属性使用の有効な値制約は固定されています。
+        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: タイプ''{0}''のエラー。このタイプの属性使用''{1}''には、値''{2}''で固定されている有効な値制約が含まれていますが、ベース・タイプの対応する属性使用の固定されている有効な値制約の値''{3}''と一貫性がありません。
+        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: タイプ''{0}''のエラー。このタイプの属性使用''{1}''はベースの属性使用と対応しておらず、ベース・タイプにはワイルドカード属性はありません。
+        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: タイプ''{0}''のエラー。このタイプの属性使用''{1}''はベースの属性使用と対応しておらず、ベース・タイプのワイルドカードではこの属性使用のネームスペース''{2}''が許可されていません。
+        derivation-ok-restriction.3 = derivation-ok-restriction.3: タイプ''{0}''のエラー。ベース・タイプの属性使用''{1}''ではREQUIREDがtrueですが、導出されたタイプにはそれと対応する属性使用がありません。
+        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: タイプ''{0}''のエラー。導出には属性のワイルドカードが含まれていますが、ベースには含まれていません。
+        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: タイプ''{0}''のエラー。導出のワイルドカードはベースのワイルドカードの有効なサブセットではありません。
+        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: タイプ''{0}''のエラー。導出({1})のワイルドカードのプロセス・コンテンツが、ベース({2})のものより弱くなっています。
+        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: タイプ''{0}''のエラー。このタイプの単純コンテンツ・タイプ''{1}''は、ベースの単純コンテンツ・タイプ''{2}''の有効な制限ではありません。
+        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: タイプ''{0}''のエラー。このタイプのコンテンツ・タイプは空ですが、ベースのコンテンツ・タイプ''{1}''は空ではないか、空にできません。
+        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: タイプ''{0}''のエラー。このタイプのコンテンツ・タイプは混合型ですが、ベースのコンテンツ・タイプ''{1}''は混合型ではありません。
+        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: タイプ''{0}''のエラー。このタイプのパーティクルはベースのパーティクルの有効な制限ではありません。
+        enumeration-required-notation = enumeration-required-notation: {2} ''{1}''で使用されるNOTATIONタイプ''{0}''には、このタイプで使用される表記法要素を指定する列挙ファセット値が含まれている必要があります。
+        enumeration-valid-restriction = enumeration-valid-restriction: 列挙値''{0}''はベース・タイプの値空間{1}に存在しません。
+        e-props-correct.2 = e-props-correct.2: 要素''{0}''の値制約の値''{1}''が無効です。
+        e-props-correct.4 = e-props-correct.4: 要素''{0}''の'{'type definition'}'がsubstitutionHead ''{1}''の'{'type definition'}'から正常に導出されたものでないか、''{1}''の'{'substitution group exclusions'}'プロパティでこの導出が許可されていません。
+        e-props-correct.5 = e-props-correct.5: 要素の'{'type definition'}'または'{'type definition'}'の'{'content type'}'はIDであるか、IDから導出されたものであるため、要素''{0}''に'{'value constraint'}'を含めることはできません。
+        e-props-correct.6 = e-props-correct.6: 要素''{0}''で循環置換グループが検出されました。
+        fractionDigits-valid-restriction = fractionDigits-valid-restriction: ファセット''fractionDigits''の値''{0}''は、祖先タイプのいずれかで''{1}''に設定されている''fractionDigits''の値以下である必要があるため、{2}の定義では無効です。
+        fractionDigits-totalDigits = fractionDigits-totalDigits: ファセット''fractionDigits''の値''{0}''は、''totalDigits''の値''{1}''以下である必要があるため、{2}の定義では無効です。
+        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: タイプ{0}では、lengthの値''{1}''がminLengthの値''{2}''より小さいと、エラーになります。
+        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: タイプ{0}では、現在の制限のファセットがminLengthであり、現在の制限またはベースのファセットがlengthである場合、ベースにminLengthファセットが含まれていないと、エラーになります。
+        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: タイプ{0}では、現在のminLength ''{1}''がベースのminLength ''{2}''と等しくないと、エラーになります。
+        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: タイプ{0}では、lengthの値''{1}''がmaxLengthの値''{2}''より大きいと、エラーになります。
+        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: タイプ{0}では、現在の制限のファセットがmaxLengthであり、現在の制限またはベースのファセットがlengthである場合、ベースにmaxLengthファセットが含まれていないと、エラーになります。
+        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: タイプ{0}では、現在のmaxLength ''{1}''がベースのmaxLength ''{2}''と等しくないと、エラーになります。
+        length-valid-restriction = length-valid-restriction: タイプ''{2}''のエラー。長さの値''{0}''はベース・タイプ''{1}''のlengthの値と同じである必要があります。
+        maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: タイプ''{2}''のエラー。maxExclusiveの値''{0}''はベース・タイプ''{1}''のmaxExclusive以下である必要があります。
+        maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: タイプ''{2}''のエラー。maxExclusiveの値''{0}''はベース・タイプ''{1}''のmaxInclusive以下である必要があります。
+        maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: タイプ''{2}''のエラー。maxExclusiveの値''{0}''はベース・タイプ''{1}''のminInclusiveより大きくする必要があります。
+        maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4: タイプ''{2}''のエラー。maxExclusiveの値''{0}''はベース・タイプ''{1}''のminExclusiveより大きくする必要があります。
+        maxInclusive-maxExclusive = maxInclusive-maxExclusive: 同じデータ型に対してmaxInclusiveとmaxExclusiveの両方を指定したことによるエラーです。{2}では、maxInclusiveは''{0}''、maxExclusiveは''{1}''です。
+        maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: タイプ''{2}''のエラー。maxInclusiveの値''{0}''はベース・タイプ''{1}''のmaxInclusive以下である必要があります。
+        maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: タイプ''{2}''のエラー。maxInclusiveの値''{0}''はベース・タイプ''{1}''のmaxExclusiveより小さくする必要があります。
+        maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: タイプ''{2}''のエラー。maxInclusiveの値''{0}''はベース・タイプ''{1}''のminInclusive以上である必要があります。
+        maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: タイプ''{2}''のエラー。maxInclusiveの値''{0}''はベース・タイプ''{1}''のminExclusiveより大きくする必要があります。
+        maxLength-valid-restriction = maxLength-valid-restriction: {2}の定義では、maxLengthの値''{0}''はベース・タイプ''{1}''の値以下である必要があります。
+        mg-props-correct.2 = mg-props-correct.2: グループ''{0}''で循環定義が検出されました。パーティクルの'{'term'}'値を再帰的にたどると、'{'term'}'がグループ自体であるパーティクルに達します。
+        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: {2}の定義では、minExclusiveの値''{0}''はmaxExclusiveの値''{1}''以下である必要があります。
+        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: {2}の定義では、minExclusiveの値''{0}''はmaxInclusiveの値''{1}''より小さくする必要があります。
+        minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: タイプ''{2}''のエラー。minExclusiveの値''{0}''はベース・タイプ''{1}''のminExclusive以上である必要があります。
+        minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2: ''タイプ''{2}''のエラー。minExclusiveの値''{0}''はベース・タイプ''{1}''のmaxInclusive以下である必要があります。
+        minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3: タイプ''{2}''のエラー。minExclusiveの値''{0}''はベース・タイプ''{1}''のminInclusive以上である必要があります。
+        minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: タイプ''{2}''のエラー。minExclusiveの値''{0}''はベース・タイプ''{1}''のmaxExclusiveより小さくする必要があります。
+        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: {2}の定義では、minInclusiveの値''{0}''はmaxInclusiveの値''{1}''以下である必要があります。
+        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: {2}の定義では、minInclusiveの値''{0}''はmaxExclusiveの値''{1}''より小さくする必要があります。
+        minInclusive-minExclusive = minInclusive-minExclusive: 同じデータ型に対してminInclusiveとminExclusiveの両方を指定したことによるエラーです。{2}では、minInclusiveは''{0}''、minExclusiveは''{1}''です。
+        minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: タイプ''{2}''のエラー。minInclusiveの値''{0}''はベース・タイプ''{1}''のminInclusive以上である必要があります。
+        minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: タイプ''{2}''のエラー。minInclusiveの値''{0}''はベース・タイプ''{1}''のmaxInclusive以下である必要があります。
+        minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: タイプ''{2}''のエラー。minInclusiveの値''{0}''はベース・タイプ''{1}''のminExclusiveより大きくする必要があります。
+        minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: タイプ''{2}''のエラー。minInclusiveの値''{0}''はベース・タイプ''{1}''のmaxExclusiveより小さくする必要があります。
+        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: {2}の定義では、minLengthの値''{0}''はmaxLengthの値''{1}''より小さくする必要があります。
+        minLength-valid-restriction = minLength-valid-restriction: {2}の定義では、minLengthの値''{0}''はベース・タイプ''{1}''の値以上である必要があります。
+        no-xmlns = no-xmlns: 属性宣言の{name}を'xmlns'と同一にすることはできません。
+        no-xsi = no-xsi: 属性宣言の'{'target namespace'}'を''{0}''と同一にすることはできません。
+        p-props-correct.2.1 = p-props-correct.2.1: ''{0}''の宣言では、''minOccurs''の値は''{1}''ですが、''maxOccurs''の値''{2}''より大きくすることはできません。
+        rcase-MapAndSum.1 = rcase-MapAndSum.1: パーティクル間に完全な機能マッピングがありません。
+        rcase-MapAndSum.2 = rcase-MapAndSum.2: グループの出現範囲({0},{1})がベース・グループの出現範囲({2},{3})の有効な制限ではありません。
+        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: 要素に異なる名前やターゲット・ネームスペースが含まれます: ネームスペース''{1}''の要素''{0}''およびネームスペース''{3}''の要素''{2}''です。
+        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: '{'term'}'が要素宣言''{0}''であるパーティクルのエラー。要素宣言の'{'nillable'}'はtrueですが、ベース・タイプの対応するパーティクルには'{'nillable'}'がfalseの要素宣言が含まれています。
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: '{'term'}'が要素宣言''{0}''であるパーティクルのエラー。出現範囲({1},{2})は、ベース・タイプの対応するパーティクルの範囲({3},{4})の有効な制限ではありません。
+        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: 要素''{0}''は固定されていませんが、ベース・タイプの対応する要素は値''{1}''で固定されています。
+        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: 要素''{0}''は値''{1}''で固定されていますが、ベース・タイプの対応する要素は値''{2}''で固定されています。
+        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: 要素''{0}''のアイデンティティ制約がベースのアイデンティティ制約のサブセットではありません。
+        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: 要素''{0}''のdisallowed substitutionsはベースのdisallowed substitutionsのスーパーセットではありません。
+        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: 要素''{0}''のタイプ''{1}''は、ベース要素のタイプ''{2}''から導出されたものではありません。
+        rcase-NSCompat.1 = rcase-NSCompat.1: 要素''{0}''に、ベースのワイルドカードで許可されていないネームスペース''{1}''が含まれています。
+        rcase-NSCompat.2 = rcase-NSCompat.2: '{'term'}'が要素宣言''{0}''であるパーティクルのエラー。出現範囲({1},{2})は、ベース・タイプの対応するパーティクルの範囲({3},{4})の有効な制限ではありません。
+        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: パーティクル間に完全な機能マッピングがありません。
+        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: グループの出現範囲({0},{1})がベースのワイルドカードの範囲({2},{3})の有効な制限ではありません。
+        rcase-NSSubset.1 = rcase-NSSubset.1: ワイルドカードが、ベースの対応するワイルドカードのサブセットではありません。
+        rcase-NSSubset.2 = rcase-NSSubset.2: ワイルドカードの出現範囲({0},{1})は、ベースのワイルドカードの出現範囲({2},{3})の有効な制限ではありません。
+        rcase-NSSubset.3 = rcase-NSSubset.3: ワイルドカードのプロセス・コンテンツ''{0}''が、ベースのもの''{1}''より弱くなっています。
+        rcase-Recurse.1 = rcase-Recurse.1: グループの出現範囲({0},{1})がベース・グループの出現範囲({2},{3})の有効な制限ではありません。
+        rcase-Recurse.2 = rcase-Recurse.2: パーティクル間に完全な機能マッピングがありません。
+        rcase-RecurseLax.1 = rcase-RecurseLax.1: グループの出現範囲({0},{1})がベース・グループの出現範囲({2},{3})の有効な制限ではありません。
+        rcase-RecurseLax.2 = rcase-RecurseLax.2: パーティクル間に完全な機能マッピングがありません。
+        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: グループの出現範囲({0},{1})がベース・グループの出現範囲({2},{3})の有効な制限ではありません。
+        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: パーティクル間に完全な機能マッピングがありません。
 #        We're using sch-props-correct.2 instead of the old src-redefine.1
 #        src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
-        sch-props-correct.2 = sch-props-correct.2: \u30B9\u30AD\u30FC\u30DE\u306B\u306F\u540C\u3058\u540D\u524D\u3092\u6301\u30642\u3064\u306E\u30B0\u30ED\u30FC\u30D0\u30EB\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u3053\u306E\u30B9\u30AD\u30FC\u30DE\u306B\u306F''{0}''\u304C2\u3064\u3042\u308A\u307E\u3059\u3002
-        st-props-correct.2 = st-props-correct.2: \u5358\u7D14\u578B''{0}''\u3067\u5FAA\u74B0\u5B9A\u7FA9\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u3064\u307E\u308A\u3001''{0}''\u304C\u305D\u308C\u81EA\u4F53\u306E\u30BF\u30A4\u30D7\u968E\u5C64\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u305F\u3081\u30A8\u30E9\u30FC\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-        st-props-correct.3 = st-props-correct.3: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002'{'base type definition'}'\u306E'{'final'}'\u306E\u5024''{1}''\u306F\u3001\u5236\u9650\u306B\u3088\u3063\u3066\u5C0E\u51FA\u3092\u7981\u6B62\u3057\u3066\u3044\u307E\u3059\u3002
-        totalDigits-valid-restriction = totalDigits-valid-restriction: \u30D5\u30A1\u30BB\u30C3\u30C8''totalDigits''\u306E\u5024''{0}''\u306F\u3001\u7956\u5148\u30BF\u30A4\u30D7\u306E\u3044\u305A\u308C\u304B\u3067''{1}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B''totalDigits''\u306E\u5024\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308B\u305F\u3081\u3001{2}\u306E\u5B9A\u7FA9\u3067\u306F\u7121\u52B9\u3067\u3059\u3002
-        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: \u7956\u5148\u30BF\u30A4\u30D7\u306E\u3044\u305A\u308C\u304B\u3067''whitespace''\u306E\u5024\u304C''collapse''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001{0}\u306E\u5B9A\u7FA9\u3067\u306F\u30D5\u30A1\u30BB\u30C3\u30C8''whitespace''\u306E\u5024''{1}''\u306F\u7121\u52B9\u3067\u3059\u3002
-        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: \u7956\u5148\u30BF\u30A4\u30D7\u306E\u3044\u305A\u308C\u304B\u3067''whitespace''\u306E\u5024\u304C''replace''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001{0}\u306E\u5B9A\u7FA9\u3067\u306F\u30D5\u30A1\u30BB\u30C3\u30C8''whitespace''\u306E\u5024''preserve''\u306F\u7121\u52B9\u3067\u3059\u3002
+        sch-props-correct.2 = sch-props-correct.2: スキーマには同じ名前を持つ2つのグローバル・コンポーネントを含めることはできません。このスキーマには''{0}''が2つあります。
+        st-props-correct.2 = st-props-correct.2: 単純型''{0}''で循環定義が検出されました。つまり、''{0}''がそれ自体のタイプ階層に含まれているためエラーになっています。
+        st-props-correct.3 = st-props-correct.3: タイプ''{0}''のエラー。'{'base type definition'}'の'{'final'}'の値''{1}''は、制限によって導出を禁止しています。
+        totalDigits-valid-restriction = totalDigits-valid-restriction: ファセット''totalDigits''の値''{0}''は、祖先タイプのいずれかで''{1}''に設定されている''totalDigits''の値以下である必要があるため、{2}の定義では無効です。
+        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: 祖先タイプのいずれかで''whitespace''の値が''collapse''に設定されているため、{0}の定義ではファセット''whitespace''の値''{1}''は無効です。
+        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: 祖先タイプのいずれかで''whitespace''の値が''replace''に設定されているため、{0}の定義ではファセット''whitespace''の値''preserve''は無効です。
 
 #schema for Schemas
 
-        s4s-att-invalid-value = s4s-att-invalid-value: \u8981\u7D20''{0}''\u306E''{1}''\u306E\u5C5E\u6027\u5024\u304C\u7121\u52B9\u3067\u3059\u3002\u8A18\u9332\u3055\u308C\u305F\u7406\u7531: {2}
-        s4s-att-must-appear = s4s-att-must-appear: \u8981\u7D20''{0}''\u306B\u5C5E\u6027''{1}''\u3092\u542B\u3081\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        s4s-att-not-allowed = s4s-att-not-allowed: \u8981\u7D20''{0}''\u306B\u5C5E\u6027''{1}''\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        s4s-elt-invalid = s4s-elt-invalid: \u8981\u7D20''{0}''\u306F\u30B9\u30AD\u30FC\u30DE\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u6709\u52B9\u306A\u8981\u7D20\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-        s4s-elt-must-match.1 = s4s-elt-must-match.1: ''{0}''\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F{1}\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002{2}\u4EE5\u964D\u306B\u554F\u984C\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-        s4s-elt-must-match.2 = s4s-elt-must-match.2: ''{0}''\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F{1}\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u5341\u5206\u306A\u8981\u7D20\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+        s4s-att-invalid-value = s4s-att-invalid-value: 要素''{0}''の''{1}''の属性値が無効です。記録された理由: {2}
+        s4s-att-must-appear = s4s-att-must-appear: 要素''{0}''に属性''{1}''を含める必要があります。
+        s4s-att-not-allowed = s4s-att-not-allowed: 要素''{0}''に属性''{1}''を含めることはできません。
+        s4s-elt-invalid = s4s-elt-invalid: 要素''{0}''はスキーマ・ドキュメントの有効な要素ではありません。
+        s4s-elt-must-match.1 = s4s-elt-must-match.1: ''{0}''のコンテンツは{1}と一致する必要があります。{2}以降に問題が見つかりました。
+        s4s-elt-must-match.2 = s4s-elt-must-match.2: ''{0}''のコンテンツは{1}と一致する必要があります。十分な要素が見つかりませんでした。
         # the "invalid-content" messages provide less information than the "must-match" counterparts above. They're used for complex types when providing a "match" would be an information dump
-        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: ''{0}''\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\u7121\u52B9\u3067\u3059\u3002\u8981\u7D20''{1}''\u304C\u7121\u52B9\u304B\u3001\u4F4D\u7F6E\u304C\u6B63\u3057\u304F\u306A\u3044\u304B\u3001\u51FA\u73FE\u983B\u5EA6\u304C\u9AD8\u3059\u304E\u307E\u3059\u3002
-        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: ''{0}''\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\u7121\u52B9\u3067\u3059\u3002\u8981\u7D20''{1}''\u306F\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: \u30BF\u30A4\u30D7''{0}''\u306E\u8981\u7D20\u306F\u3001\u5BA3\u8A00\u306E\u5F8C\u306B<schema>\u8981\u7D20\u306E\u5B50\u3068\u3057\u3066\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        s4s-elt-schema-ns = s4s-elt-schema-ns: \u8981\u7D20''{0}''\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306F\u30B9\u30AD\u30FC\u30DE\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''http://www.w3.org/2001/XMLSchema''\u304B\u3089\u306E\u3082\u306E\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        s4s-elt-character = s4s-elt-character: ''xs:appinfo''\u3068''xs:documentation''\u4EE5\u5916\u306E\u30B9\u30AD\u30FC\u30DE\u8981\u7D20\u3067\u306F\u975E\u7A7A\u767D\u6587\u5B57\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
+        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: ''{0}''のコンテンツは無効です。要素''{1}''が無効か、位置が正しくないか、出現頻度が高すぎます。
+        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: ''{0}''のコンテンツは無効です。要素''{1}''は空にできません。
+        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: タイプ''{0}''の要素は、宣言の後に<schema>要素の子として含めることはできません。
+        s4s-elt-schema-ns = s4s-elt-schema-ns: 要素''{0}''のネームスペースはスキーマのネームスペース''http://www.w3.org/2001/XMLSchema''からのものである必要があります。
+        s4s-elt-character = s4s-elt-character: ''xs:appinfo''と''xs:documentation''以外のスキーマ要素では非空白文字は許可されていません。''{0}''が見つかりました。
 
 # codes not defined by the spec
 
-        c-fields-xpaths = c-fields-xpaths: field\u306E\u5024''{0}''\u304C\u7121\u52B9\u3067\u3059\u3002
-        c-general-xpath = c-general-xpath: \u5F0F''{0}''\u306F\u3001XML\u30B9\u30AD\u30FC\u30DE\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308BXPath\u30B5\u30D6\u30BB\u30C3\u30C8\u306B\u5BFE\u3057\u3066\u7121\u52B9\u3067\u3059\u3002
-        c-general-xpath-ns = c-general-xpath-ns: XPath\u5F0F''{0}''\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306E\u63A5\u982D\u8F9E\u304C\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-        c-selector-xpath = c-selector-xpath: selector\u306E\u5024''{0}''\u306F\u7121\u52B9\u3067\u3059\u3002selector\u306EXPath\u306B\u306F\u5C5E\u6027\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        EmptyTargetNamespace = EmptyTargetNamespace: \u30B9\u30AD\u30FC\u30DE\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u3067\u306F\u3001''targetNamespace''\u5C5E\u6027\u306E\u5024\u3092\u7A7A\u306E\u6587\u5B57\u5217\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-        FacetValueFromBase = FacetValueFromBase: \u30BF\u30A4\u30D7''{0}''\u306E\u5BA3\u8A00\u3067\u306F\u3001\u30D5\u30A1\u30BB\u30C3\u30C8''{2}''\u306E\u5024''{1}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{3}''\u306E\u5024\u7A7A\u9593\u304B\u3089\u306E\u3082\u306E\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        FixedFacetValue = FixedFacetValue: {3}\u306E\u5B9A\u7FA9\u3067\u306F\u30D5\u30A1\u30BB\u30C3\u30C8''{0}''\u306E\u5024''{1}''\u306F\u7121\u52B9\u3067\u3059\u3002\u3053\u308C\u306F\u3001''{0}''\u306E\u5024\u304C\u7956\u5148\u30BF\u30A4\u30D7\u306E\u3044\u305A\u308C\u304B\u3067''{2}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u304A\u308A\u3001'{'fixed'}' = true\u3067\u3042\u308B\u305F\u3081\u3067\u3059\u3002
-        InvalidRegex = InvalidRegex: pattern\u306E\u5024''{0}''\u306F\u7121\u52B9\u306A\u6B63\u898F\u8868\u73FE\u3067\u3059\u3002\u5831\u544A\u3055\u308C\u305F\u30A8\u30E9\u30FC: ''{1}''\u3002
-        MaxOccurLimit = \u30D1\u30FC\u30B5\u30FC\u306E\u73FE\u5728\u306E\u69CB\u6210\u3067\u306F\u3001{0}\u500B\u3092\u8D85\u3048\u308B\u30CE\u30FC\u30C9\u3092\u542B\u3081\u308B\u305F\u3081\u306B\u8907\u5408\u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u3092\u62E1\u5F35\u3059\u308B\u3053\u3068\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\u3002
-        PublicSystemOnNotation = PublicSystemOnNotation: \u8981\u7D20''notation''\u306B\u306F''public''\u304A\u3088\u3073''system''\u306E\u5C11\u306A\u304F\u3068\u30821\u3064\u304C\u5FC5\u8981\u3067\u3059\u3002
-        SchemaLocation = SchemaLocation: schemaLocation\u306E\u5024''{0}''\u306B\u306F\u5076\u6570\u500B\u306EURI\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-        TargetNamespace.1 = TargetNamespace.1: \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''{0}''\u304C\u5FC5\u8981\u3067\u3059\u304C\u3001\u30B9\u30AD\u30FC\u30DE\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306F''{1}''\u3067\u3059\u3002
-        TargetNamespace.2 = TargetNamespace.2: \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093\u304C\u3001\u30B9\u30AD\u30FC\u30DE\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B''{1}''\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-        UndeclaredEntity = UndeclaredEntity: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3''{0}''\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        UndeclaredPrefix = UndeclaredPrefix: ''{0}''\u3092QName\u3068\u3057\u3066\u89E3\u6C7A\u3067\u304D\u307E\u305B\u3093\u3002\u63A5\u982D\u8F9E''{1}''\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-        FacetsContradict = FacetsContradict: simpleType\u5B9A\u7FA9''{2}''\u3067\u306F\u3001\u5217\u6319\u5024''{0}''\u304C''{1}''\u30D5\u30A1\u30BB\u30C3\u30C8\u306E\u5024\u3068\u77DB\u76FE\u3057\u307E\u3059\u3002
+        c-fields-xpaths = c-fields-xpaths: fieldの値''{0}''が無効です。
+        c-general-xpath = c-general-xpath: 式''{0}''は、XMLスキーマでサポートされているXPathサブセットに対して無効です。
+        c-general-xpath-ns = c-general-xpath-ns: XPath式''{0}''のネームスペースの接頭辞がネームスペースにバインドされていませんでした。
+        c-selector-xpath = c-selector-xpath: selectorの値''{0}''は無効です。selectorのXPathには属性を含めることはできません。
+        EmptyTargetNamespace = EmptyTargetNamespace: スキーマ・ドキュメント''{0}''では、''targetNamespace''属性の値を空の文字列にすることはできません。
+        FacetValueFromBase = FacetValueFromBase: タイプ''{0}''の宣言では、ファセット''{2}''の値''{1}''はベース・タイプ''{3}''の値空間からのものである必要があります。
+        FixedFacetValue = FixedFacetValue: {3}の定義ではファセット''{0}''の値''{1}''は無効です。これは、''{0}''の値が祖先タイプのいずれかで''{2}''に設定されており、'{'fixed'}' = trueであるためです。
+        InvalidRegex = InvalidRegex: patternの値''{0}''は無効な正規表現です。報告されたエラー: ''{1}''。
+        MaxOccurLimit = パーサーの現在の構成では、{0}個を超えるノードを含めるために複合タイプのコンテンツ・モデルを拡張することは許可されません。
+        PublicSystemOnNotation = PublicSystemOnNotation: 要素''notation''には''public''および''system''の少なくとも1つが必要です。
+        SchemaLocation = SchemaLocation: schemaLocationの値''{0}''には偶数個のURIを指定する必要があります。
+        TargetNamespace.1 = TargetNamespace.1: ネームスペース''{0}''が必要ですが、スキーマ・ドキュメントのターゲット・ネームスペースは''{1}''です。
+        TargetNamespace.2 = TargetNamespace.2: ネームスペースは必要ありませんが、スキーマ・ドキュメントに''{1}''のターゲット・ネームスペースが含まれています。
+        UndeclaredEntity = UndeclaredEntity: エンティティ''{0}''が宣言されていません。
+        UndeclaredPrefix = UndeclaredPrefix: ''{0}''をQNameとして解決できません。接頭辞''{1}''が宣言されていません。
+        FacetsContradict = FacetsContradict: simpleType定義''{2}''では、列挙値''{0}''が''{1}''ファセットの値と矛盾します。
 
 # JAXP 1.2 schema source property errors
 
-        jaxp12-schema-source-type.1 = ''http://java.sun.com/xml/jaxp/properties/schemaSource''\u30D7\u30ED\u30D1\u30C6\u30A3\u306F\u30BF\u30A4\u30D7''{0}''\u306E\u5024\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u53EF\u80FD\u306A\u5024\u306E\u30BF\u30A4\u30D7\u306FString\u3001File\u3001InputStream\u3001InputSource\u307E\u305F\u306F\u3053\u308C\u3089\u306E\u30BF\u30A4\u30D7\u306E\u914D\u5217\u3067\u3059\u3002
-        jaxp12-schema-source-type.2 = ''http://java.sun.com/xml/jaxp/properties/schemaSource''\u30D7\u30ED\u30D1\u30C6\u30A3\u306F\u30BF\u30A4\u30D7''{0}''\u306E\u914D\u5217\u5024\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u53EF\u80FD\u306A\u914D\u5217\u306E\u30BF\u30A4\u30D7\u306FObject\u3001String\u3001File\u3001InputStream\u304A\u3088\u3073InputSource\u3067\u3059\u3002
-        jaxp12-schema-source-ns = 'http://java.sun.com/xml/jaxp/properties/schemaSource' property\u306E\u5024\u3068\u3057\u3066Objects\u306E\u914D\u5217\u3092\u4F7F\u7528\u3059\u308B\u5834\u5408\u3001\u540C\u3058\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3092\u5171\u6709\u3059\u308B\u30012\u3064\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u6301\u3064\u3053\u3068\u306F\u7121\u52B9\u3067\u3059\u3002
+        jaxp12-schema-source-type.1 = ''http://java.sun.com/xml/jaxp/properties/schemaSource''プロパティはタイプ''{0}''の値を持つことはできません。サポートされている可能な値のタイプはString、File、InputStream、InputSourceまたはこれらのタイプの配列です。
+        jaxp12-schema-source-type.2 = ''http://java.sun.com/xml/jaxp/properties/schemaSource''プロパティはタイプ''{0}''の配列値を持つことはできません。サポートされている可能な配列のタイプはObject、String、File、InputStreamおよびInputSourceです。
+        jaxp12-schema-source-ns = 'http://java.sun.com/xml/jaxp/properties/schemaSource' propertyの値としてObjectsの配列を使用する場合、同じターゲット・ネームスペースを共有する、2つのスキーマを持つことは無効です。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties
index e001ca99799..043edbf2867 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties
@@ -26,303 +26,303 @@
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n
+        BadMessageKey = 메시지 키에 해당하는 오류 메시지를 찾을 수 없습니다.
+        FormatFailed = 다음 메시지의 형식을 지정하는 중 내부 오류가 발생했습니다.\n
 
 # For internal use
 
-        Internal-Error = \uB0B4\uBD80 \uC624\uB958: {0}.
-        dt-whitespace = \uD569\uC9D1\uD569 simpleType ''{0}''\uC5D0 \uB300\uD55C \uACF5\uBC31 \uBA74 \uAC12\uC744 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        GrammarConflict = \uC0AC\uC6A9\uC790 \uBB38\uBC95 \uD480\uC5D0\uC11C \uBC18\uD658\uB41C \uBB38\uBC95 \uC911 \uD558\uB098\uAC00 \uB2E4\uB978 \uBB38\uBC95\uACFC \uCDA9\uB3CC\uD569\uB2C8\uB2E4.
+        Internal-Error = 내부 오류: {0}.
+        dt-whitespace = 합집합 simpleType ''{0}''에 대한 공백 면 값을 사용할 수 없습니다.
+        GrammarConflict = 사용자 문법 풀에서 반환된 문법 중 하나가 다른 문법과 충돌합니다.
 
 # Identity constraints
 
-        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: "{0}" \uC694\uC18C\uC5D0 "{1}" \uD0A4\uC5D0 \uB300\uD55C \uAC12\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-        DuplicateField = "{0}" \uD544\uB4DC \uBC94\uC704\uC5D0 \uC911\uBCF5 \uC0AC\uD56D\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-        DuplicateKey = cvc-identity-constraint.4.2.2: "{1}" \uC694\uC18C\uC758 ID \uC81C\uC57D \uC870\uAC74 "{2}"\uC5D0 \uB300\uD574 \uC911\uBCF5 \uD0A4 \uAC12 [{0}]\uC774(\uAC00) \uC120\uC5B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        DuplicateUnique = cvc-identity-constraint.4.1: "{1}" \uC694\uC18C\uC758 ID \uC81C\uC57D \uC870\uAC74 "{2}"\uC5D0 \uC911\uBCF5 \uACE0\uC720 \uAC12 [{0}]\uC774(\uAC00) \uC120\uC5B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        FieldMultipleMatch = cvc-identity-constraint.3: ID \uC81C\uC57D \uC870\uAC74 "{1}"\uC758 "{0}" \uD544\uB4DC\uAC00 \uD574\uB2F9 \uC120\uD0DD\uAE30 \uBC94\uC704 \uB0B4\uC758 \uAC12 \uB458 \uC774\uC0C1\uACFC \uC77C\uCE58\uD569\uB2C8\uB2E4. \uD544\uB4DC\uB294 \uACE0\uC720 \uAC12\uACFC \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-        FixedDiffersFromActual = \uC774 \uC694\uC18C\uC758 \uCF58\uD150\uCE20\uAC00 \uC2A4\uD0A4\uB9C8\uC758 \uC694\uC18C \uC120\uC5B8\uC5D0 \uC788\uB294 "fixed" \uC18D\uC131\uAC12\uACFC \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        KeyMatchesNillable = cvc-identity-constraint.4.2.3: "{0}" \uC694\uC18C\uC5D0 nillable\uC774 true\uB85C \uC124\uC815\uB41C \uC694\uC18C\uC640 \uC77C\uCE58\uD558\uB294 "{1}" \uD0A4\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: "{0}" \uC694\uC18C\uC758 <key name="{1}"> ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uC9C0\uC815\uB41C \uAC12\uC774 \uBD80\uC871\uD569\uB2C8\uB2E4.
-        KeyNotFound = cvc-identity-constraint.4.3: ''{2}'' \uC694\uC18C\uC758 ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uAC12\uC774 ''{1}''\uC778 ''{0}'' \uD0A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        KeyRefOutOfScope = ID \uC81C\uC57D \uC870\uAC74 \uC624\uB958: ID \uC81C\uC57D \uC870\uAC74 "{0}"\uC758 keyref\uAC00 \uBC94\uC704\uC5D0\uC11C \uBC97\uC5B4\uB09C \uD0A4 \uB610\uB294 \uACE0\uC720 \uD56D\uBAA9\uC744 \uCC38\uC870\uD569\uB2C8\uB2E4.
-        KeyRefReferNotFound = \uD0A4 \uCC38\uC870 \uC120\uC5B8 "{0}"\uC740(\uB294) \uC774\uB984\uC774 "{1}"\uC778 \uC54C \uC218 \uC5C6\uB294 \uD0A4\uB97C \uCC38\uC870\uD569\uB2C8\uB2E4.
-        UnknownField = \uB0B4\uBD80 ID \uC81C\uC57D \uC870\uAC74 \uC624\uB958: {1} \uC694\uC18C\uC5D0 \uB300\uD574 \uC9C0\uC815\uB41C ID \uC81C\uC57D \uC870\uAC74 "{2}"\uC5D0 \uB300\uD55C \uC54C \uC218 \uC5C6\uB294 \uD544\uB4DC "{0}"\uC785\uB2C8\uB2E4.
+        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: "{0}" 요소에 "{1}" 키에 대한 값이 없습니다.
+        DuplicateField = "{0}" 필드 범위에 중복 사항이 있습니다.
+        DuplicateKey = cvc-identity-constraint.4.2.2: "{1}" 요소의 ID 제약 조건 "{2}"에 대해 중복 키 값 [{0}]이(가) 선언되었습니다.
+        DuplicateUnique = cvc-identity-constraint.4.1: "{1}" 요소의 ID 제약 조건 "{2}"에 중복 고유 값 [{0}]이(가) 선언되었습니다.
+        FieldMultipleMatch = cvc-identity-constraint.3: ID 제약 조건 "{1}"의 "{0}" 필드가 해당 선택기 범위 내의 값 둘 이상과 일치합니다. 필드는 고유 값과 일치해야 합니다.
+        FixedDiffersFromActual = 이 요소의 콘텐츠가 스키마의 요소 선언에 있는 "fixed" 속성값과 일치하지 않습니다.
+        KeyMatchesNillable = cvc-identity-constraint.4.2.3: "{0}" 요소에 nillable이 true로 설정된 요소와 일치하는 "{1}" 키가 있습니다.
+        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: "{0}" 요소의 <key name="{1}"> ID 제약 조건에 대해 지정된 값이 부족합니다.
+        KeyNotFound = cvc-identity-constraint.4.3: ''{2}'' 요소의 ID 제약 조건에 대해 값이 ''{1}''인 ''{0}'' 키를 찾을 수 없습니다.
+        KeyRefOutOfScope = ID 제약 조건 오류: ID 제약 조건 "{0}"의 keyref가 범위에서 벗어난 키 또는 고유 항목을 참조합니다.
+        KeyRefReferNotFound = 키 참조 선언 "{0}"은(는) 이름이 "{1}"인 알 수 없는 키를 참조합니다.
+        UnknownField = 내부 ID 제약 조건 오류: {1} 요소에 대해 지정된 ID 제약 조건 "{2}"에 대한 알 수 없는 필드 "{0}"입니다.
 
 # Ideally, we should only use the following error keys, not the ones under
 # "Identity constraints". And we should cover all of the following errors.
 
 #validation (3.X.4)
 
-        cvc-attribute.3 = cvc-attribute.3: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uC18D\uC131\uC5D0 \uB300\uD55C ''{2}'' \uAC12\uC774 ''{3}'' \uC720\uD615\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-        cvc-attribute.4 = cvc-attribute.4: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uC18D\uC131\uC5D0 \uB300\uD55C ''{2}'' \uAC12\uC774 \uACE0\uC815\uB41C '{'value constraint'}'\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC18D\uC131\uC758 \uAC12\uC740 ''{3}''\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        cvc-complex-type.2.1 = cvc-complex-type.2.1: \uC720\uD615\uC758 \uCF58\uD150\uCE20 \uC720\uD615\uC774 \uBE44\uC5B4 \uC788\uC73C\uBBC0\uB85C ''{0}'' \uC694\uC18C\uC5D0\uB294 \uBB38\uC790 \uB610\uB294 \uC694\uC18C \uC815\uBCF4 \uD56D\uBAA9 [children]\uC774 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        cvc-complex-type.2.2 = cvc-complex-type.2.2: ''{0}'' \uC694\uC18C\uC5D0\uB294 \uC694\uC18C [children]\uC774 \uC5C6\uC5B4\uC57C \uD558\uBA70 \uAC12\uC774 \uC801\uD569\uD574\uC57C \uD569\uB2C8\uB2E4.
-        cvc-complex-type.2.3 = cvc-complex-type.2.3: \uC720\uD615\uC758 \uCF58\uD150\uCE20 \uC720\uD615\uC774 \uC694\uC18C \uC804\uC6A9\uC774\uBBC0\uB85C ''{0}'' \uC694\uC18C\uC5D0\uB294 \uBB38\uC790 [children]\uC774 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: ''{0}'' \uC694\uC18C\uB85C \uC2DC\uC791\uD558\uB294 \uBD80\uC801\uD569\uD55C \uCF58\uD150\uCE20\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. ''{1}'' \uC911 \uD558\uB098\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: ''{0}'' \uC694\uC18C\uC758 \uCF58\uD150\uCE20\uAC00 \uBD88\uC644\uC804\uD569\uB2C8\uB2E4. ''{1}'' \uC911 \uD558\uB098\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: \uC77C\uCE58\uD558\uB294 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uAC00 \uC5C4\uACA9\uD558\uAC8C \uC801\uC6A9\uB418\uC9C0\uB9CC ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD55C \uC120\uC5B8\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: ''{0}'' \uC694\uC18C\uB85C \uC2DC\uC791\uD558\uB294 \uBD80\uC801\uD569\uD55C \uCF58\uD150\uCE20\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC5EC\uAE30\uC5D0\uB294 \uD558\uC704 \uC694\uC18C\uAC00 \uD544\uC694\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: ''{0}'' \uC694\uC18C\uB85C \uC2DC\uC791\uD558\uB294 \uBD80\uC801\uD569\uD55C \uCF58\uD150\uCE20\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC5EC\uAE30\uC5D0\uB294 \uD558\uC704 \uC694\uC18C ''{1}''\uC774(\uAC00) \uD544\uC694\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}''\uC740(\uB294) \uD604\uC7AC \uC2DC\uD000\uC2A4\uC5D0\uC11C \uCD5C\uB300 ''{2}''\uBC88 \uBC1C\uC0DD\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uC774 \uC81C\uD55C\uC774 \uCD08\uACFC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC774 \uC9C0\uC810\uC5D0\uC11C\uB294 ''{1}'' \uC911 \uD558\uB098\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}''\uC740(\uB294) \uD604\uC7AC \uC2DC\uD000\uC2A4\uC5D0\uC11C \uCD5C\uB300 ''{1}''\uBC88 \uBC1C\uC0DD\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uC774 \uC81C\uD55C\uC774 \uCD08\uACFC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC774 \uC9C0\uC810\uC5D0\uC11C\uB294 \uD558\uC704 \uC694\uC18C\uAC00 \uD544\uC694\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: ''{0}'' \uC694\uC18C\uB85C \uC2DC\uC791\uD558\uB294 \uBD80\uC801\uD569\uD55C \uCF58\uD150\uCE20\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uD604\uC7AC \uC2DC\uD000\uC2A4\uC5D0\uC11C ''{1}''\uC740(\uB294) ''{2}''\uBC88 \uC774\uC0C1 \uBC1C\uC0DD\uD574\uC57C \uD569\uB2C8\uB2E4. \uC774 \uC81C\uC57D \uC870\uAC74\uC744 \uB9CC\uC871\uD558\uB824\uBA74 \uC778\uC2A4\uD134\uC2A4\uAC00 \uD558\uB098 \uB354 \uD544\uC694\uD569\uB2C8\uB2E4.
-        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: ''{0}'' \uC694\uC18C\uB85C \uC2DC\uC791\uD558\uB294 \uBD80\uC801\uD569\uD55C \uCF58\uD150\uCE20\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uD604\uC7AC \uC2DC\uD000\uC2A4\uC5D0\uC11C ''{1}''\uC740(\uB294) ''{2}''\uBC88 \uC774\uC0C1 \uBC1C\uC0DD\uD574\uC57C \uD569\uB2C8\uB2E4. \uC774 \uC81C\uC57D \uC870\uAC74\uC744 \uB9CC\uC871\uD558\uB824\uBA74 \uC778\uC2A4\uD134\uC2A4\uAC00 ''{3}''\uAC1C \uB354 \uD544\uC694\uD569\uB2C8\uB2E4.
-        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: ''{0}'' \uC694\uC18C\uC758 \uCF58\uD150\uCE20\uAC00 \uC644\uBCBD\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. ''{1}''\uC740(\uB294) ''{2}''\uBC88 \uC774\uC0C1 \uBC1C\uC0DD\uD574\uC57C \uD569\uB2C8\uB2E4. \uC774 \uC81C\uC57D \uC870\uAC74\uC744 \uB9CC\uC871\uD558\uB824\uBA74 \uC778\uC2A4\uD134\uC2A4\uAC00 \uD558\uB098 \uB354 \uD544\uC694\uD569\uB2C8\uB2E4.
-        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: ''{0}'' \uC694\uC18C\uC758 \uCF58\uD150\uCE20\uAC00 \uC644\uBCBD\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. ''{1}''\uC740(\uB294) ''{2}''\uBC88 \uC774\uC0C1 \uBC1C\uC0DD\uD574\uC57C \uD569\uB2C8\uB2E4. \uC774 \uC81C\uC57D \uC870\uAC74\uC744 \uB9CC\uC871\uD558\uB824\uBA74 \uC778\uC2A4\uD134\uC2A4\uAC00 ''{3}''\uAC1C \uB354 \uD544\uC694\uD569\uB2C8\uB2E4.
-        cvc-complex-type.3.1 = cvc-complex-type.3.1: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uC18D\uC131\uC5D0 \uB300\uD55C ''{2}'' \uAC12\uC774 \uD574\uB2F9 \uC18D\uC131 \uC0AC\uC6A9\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. ''{1}'' \uC18D\uC131\uC758 \uACE0\uC815\uB41C \uAC12\uC774 ''{3}''\uC785\uB2C8\uB2E4.
-        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: ''{0}'' \uC694\uC18C\uC5D0 ''{1}'' \uC18D\uC131\uC5D0 \uB300\uD55C \uC18D\uC131 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: ''{1}'' \uC18D\uC131\uC740 ''{0}'' \uC694\uC18C\uC5D0 \uB098\uD0C0\uB0A0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cvc-complex-type.4 = cvc-complex-type.4: ''{1}'' \uC18D\uC131\uC740 ''{0}'' \uC694\uC18C\uC5D0 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-        cvc-complex-type.5.1 = cvc-complex-type.5.1: ''{0}'' \uC694\uC18C\uC5D0\uC11C ''{1}'' \uC18D\uC131\uC774 \uB300\uCCB4 ID\uC774\uC9C0\uB9CC \uB300\uCCB4 ID ''{2}''\uC774(\uAC00) \uC774\uBBF8 \uC788\uC2B5\uB2C8\uB2E4. \uD558\uB098\uB9CC \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
-        cvc-complex-type.5.2 = cvc-complex-type.5.2: ''{0}'' \uC694\uC18C\uC5D0\uC11C ''{1}'' \uC18D\uC131\uC774 \uB300\uCCB4 ID\uC774\uC9C0\uB9CC '{'attribute uses'}' \uC911 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C ''{2}'' \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC2B5\uB2C8\uB2E4.
-        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}''\uC740(\uB294) ''{1}''\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uAC12\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}''\uC740(\uB294) \uBAA9\uB85D \uC720\uD615 ''{1}''\uC758 \uC801\uD569\uD55C \uAC12\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}''\uC740(\uB294) \uD569\uC9D1\uD569 \uC720\uD615 ''{1}''\uC758 \uC801\uD569\uD55C \uAC12\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-elt.1.a = cvc-elt.1.a: ''{0}'' \uC694\uC18C\uC758 \uC120\uC5B8\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cvc-elt.1.b = cvc-elt.1.b: \uC694\uC18C\uC758 \uC774\uB984\uC774 \uC694\uC18C \uC120\uC5B8 \uC774\uB984\uACFC \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. ''{0}''\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. ''{1}''\uC774(\uAC00) \uD544\uC694\uD569\uB2C8\uB2E4.
-        cvc-elt.2 = cvc-elt.2: ''{0}''\uC5D0 \uB300\uD55C \uC694\uC18C \uC120\uC5B8\uC5D0\uC11C '{'abstract'}'\uC758 \uAC12\uC740 false\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-        cvc-elt.3.1 = cvc-elt.3.1: ''{0}''\uC758 '{'nillable'}' \uC18D\uC131\uC774 false\uC774\uBBC0\uB85C ''{1}'' \uC18D\uC131\uC740 ''{0}'' \uC694\uC18C\uC5D0 \uB098\uD0C0\uB098\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-        cvc-elt.3.2.1 = cvc-elt.3.2.1: ''{1}''\uC774(\uAC00) \uC9C0\uC815\uB418\uC5C8\uC73C\uBBC0\uB85C ''{0}'' \uC694\uC18C\uC5D0\uB294 \uBB38\uC790 \uB610\uB294 \uC694\uC18C \uC815\uBCF4 [children]\uC774 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cvc-elt.3.2.2 = cvc-elt.3.2.2: ''{1}''\uC774(\uAC00) \uC9C0\uC815\uB418\uC5C8\uC73C\uBBC0\uB85C ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD574 \uACE0\uC815\uB41C '{'value constraint'}'\uAC00 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        cvc-elt.4.1 = cvc-elt.4.1: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uC18D\uC131\uC5D0 \uB300\uD55C ''{2}'' \uAC12\uC740 \uC801\uD569\uD55C QName\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-elt.4.2 = cvc-elt.4.2: ''{1}''\uC744(\uB97C) ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD55C \uC720\uD615 \uC815\uC758\uB85C \uBD84\uC11D\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cvc-elt.4.3 = cvc-elt.4.3: ''{1}'' \uC720\uD615\uC740 ''{0}'' \uC694\uC18C\uC758 \uC720\uD615 \uC815\uC758 ''{2}''\uC5D0\uC11C \uC801\uD569\uD558\uAC8C \uD30C\uC0DD\uB41C \uAC83\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-elt.5.1.1 = cvc-elt.5.1.1: ''{0}'' \uC694\uC18C\uC758 '{'value constraint'}' ''{2}''\uC740(\uB294) ''{1}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uAE30\uBCF8\uAC12\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: ''{0}'' \uC694\uC18C\uC5D0\uB294 \uC694\uC18C \uC815\uBCF4 \uD56D\uBAA9 [children]\uC774 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uAC12\uC774 \uACE0\uC815\uB41C '{'value constraint'}' \uAC12 ''{2}''\uACFC(\uC640) \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uAC12\uC774 '{'value constraint'}' \uAC12 ''{2}''\uACFC(\uC640) \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        cvc-enumeration-valid = cvc-enumeration-valid: ''{0}'' \uAC12\uC740 ''{1}'' \uBAA9\uB85D\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uBA74\uC774 \uC544\uB2D9\uB2C8\uB2E4. \uBAA9\uB85D\uC758 \uAC12\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        cvc-fractionDigits-valid = cvc-fractionDigits-valid: ''{0}'' \uAC12\uC758 \uC18C\uC218\uC810 \uC774\uD558 \uC790\uB9BF\uC218\uAC00 {1}\uC774\uC9C0\uB9CC \uC18C\uC218\uC810 \uC774\uD558 \uC790\uB9BF\uC218\uB294 {2}(\uC73C)\uB85C \uC81C\uD55C\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        cvc-id.1 = cvc-id.1: IDREF ''{0}''\uC5D0 \uB300\uD55C ID/IDREF \uBC14\uC778\uB529\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cvc-id.2 = cvc-id.2: ID \uAC12 ''{0}''\uC774(\uAC00) \uC5EC\uB7EC \uBC88 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
-        cvc-id.3 = cvc-id.3: ID \uC81C\uC57D \uC870\uAC74 ''{0}''\uC758 \uD544\uB4DC\uAC00 ''{1}'' \uC694\uC18C\uC640 \uC77C\uCE58\uD558\uC9C0\uB9CC \uC774 \uC694\uC18C\uB294 \uB2E8\uC21C \uC720\uD615\uC744 \uC0AC\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        cvc-length-valid = cvc-length-valid: length = ''{1}''\uC778 ''{0}'' \uAC12\uC740 ''{3}'' \uC720\uD615\uC758 length ''{2}''\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uBA74\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-maxExclusive-valid = cvc-maxExclusive-valid: ''{0}'' \uAC12\uC740 ''{2}'' \uC720\uD615\uC758 maxExclusive ''{1}''\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uBA74\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-maxInclusive-valid = cvc-maxInclusive-valid: ''{0}'' \uAC12\uC740 ''{2}'' \uC720\uD615\uC758 maxInclusive ''{1}''\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uBA74\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-maxLength-valid = cvc-maxLength-valid: length = ''{1}''\uC778 ''{0}'' \uAC12\uC740 ''{3}'' \uC720\uD615\uC758 maxLength ''{2}''\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uBA74\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-minExclusive-valid = cvc-minExclusive-valid: ''{0}'' \uAC12\uC740 ''{2}'' \uC720\uD615\uC758 minExclusive ''{1}''\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uBA74\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-minInclusive-valid = cvc-minInclusive-valid: ''{0}'' \uAC12\uC740 ''{2}'' \uC720\uD615\uC758 minInclusive ''{1}''\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uBA74\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-minLength-valid = cvc-minLength-valid: length = ''{1}''\uC778 ''{0}'' \uAC12\uC740 ''{3}'' \uC720\uD615\uC758 minLength ''{2}''\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uBA74\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-pattern-valid = cvc-pattern-valid: ''{0}'' \uAC12\uC740 ''{2}'' \uC720\uD615\uC758 ''{1}'' \uD328\uD134\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uBA74\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cvc-totalDigits-valid = cvc-totalDigits-valid: ''{0}'' \uAC12\uC758 \uCD1D \uC790\uB9BF\uC218\uAC00 {1}\uC774\uC9C0\uB9CC \uCD1D \uC790\uB9BF\uC218\uB294 {2}(\uC73C)\uB85C \uC81C\uD55C\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        cvc-type.1 = cvc-type.1: \uC720\uD615 \uC815\uC758 ''{0}''\uC744(\uB97C) \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cvc-type.2 = cvc-type.2: {0} \uC694\uC18C\uC5D0 \uB300\uD55C \uC720\uD615 \uC815\uC758\uB294 \uCD94\uC0C1\uC801\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cvc-type.3.1.1 = cvc-type.3.1.1: ''{0}'' \uC694\uC18C\uB294 \uB2E8\uC21C \uC720\uD615\uC774\uBBC0\uB85C \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC774\uB984\uC774 ''http://www.w3.org/2001/XMLSchema-instance''\uC774\uBA70 [local name]\uC774 ''type'', ''nil'', ''schemaLocation'' \uB610\uB294 ''noNamespaceSchemaLocation'' \uC911 \uD558\uB098\uC778 \uC18D\uC131\uC744 \uC81C\uC678\uD558\uACE0 \uB2E4\uB978 \uC18D\uC131\uC744 \uD3EC\uD568\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uD558\uC9C0\uB9CC ''{1}'' \uC18D\uC131\uC774 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        cvc-type.3.1.2 = cvc-type.3.1.2: ''{0}'' \uC694\uC18C\uB294 \uB2E8\uC21C \uC720\uD615\uC774\uBBC0\uB85C \uC694\uC18C \uC815\uBCF4 \uD56D\uBAA9 [children]\uC744 \uD3EC\uD568\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-        cvc-type.3.1.3 = cvc-type.3.1.3: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+        cvc-attribute.3 = cvc-attribute.3: ''{0}'' 요소의 ''{1}'' 속성에 대한 ''{2}'' 값이 ''{3}'' 유형에 대해 부적합합니다.
+        cvc-attribute.4 = cvc-attribute.4: ''{0}'' 요소의 ''{1}'' 속성에 대한 ''{2}'' 값이 고정된 '{'value constraint'}'에 대해 부적합합니다. 속성의 값은 ''{3}''이어야 합니다.
+        cvc-complex-type.2.1 = cvc-complex-type.2.1: 유형의 콘텐츠 유형이 비어 있으므로 ''{0}'' 요소에는 문자 또는 요소 정보 항목 [children]이 없어야 합니다.
+        cvc-complex-type.2.2 = cvc-complex-type.2.2: ''{0}'' 요소에는 요소 [children]이 없어야 하며 값이 적합해야 합니다.
+        cvc-complex-type.2.3 = cvc-complex-type.2.3: 유형의 콘텐츠 유형이 요소 전용이므로 ''{0}'' 요소에는 문자 [children]이 포함될 수 없습니다.
+        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: ''{0}'' 요소로 시작하는 부적합한 콘텐츠가 발견되었습니다. ''{1}'' 중 하나가 필요합니다.
+        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: ''{0}'' 요소의 콘텐츠가 불완전합니다. ''{1}'' 중 하나가 필요합니다.
+        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: 일치하는 와일드 카드 문자가 엄격하게 적용되지만 ''{0}'' 요소에 대한 선언을 찾을 수 없습니다.
+        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: ''{0}'' 요소로 시작하는 부적합한 콘텐츠가 발견되었습니다. 여기에는 하위 요소가 필요하지 않습니다.
+        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: ''{0}'' 요소로 시작하는 부적합한 콘텐츠가 발견되었습니다. 여기에는 하위 요소 ''{1}''이(가) 필요하지 않습니다.
+        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}''은(는) 현재 시퀀스에서 최대 ''{2}''번 발생할 수 있습니다. 이 제한이 초과되었습니다. 이 지점에서는 ''{1}'' 중 하나가 필요합니다.
+        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}''은(는) 현재 시퀀스에서 최대 ''{1}''번 발생할 수 있습니다. 이 제한이 초과되었습니다. 이 지점에서는 하위 요소가 필요하지 않습니다.
+        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: ''{0}'' 요소로 시작하는 부적합한 콘텐츠가 발견되었습니다. 현재 시퀀스에서 ''{1}''은(는) ''{2}''번 이상 발생해야 합니다. 이 제약 조건을 만족하려면 인스턴스가 하나 더 필요합니다.
+        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: ''{0}'' 요소로 시작하는 부적합한 콘텐츠가 발견되었습니다. 현재 시퀀스에서 ''{1}''은(는) ''{2}''번 이상 발생해야 합니다. 이 제약 조건을 만족하려면 인스턴스가 ''{3}''개 더 필요합니다.
+        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: ''{0}'' 요소의 콘텐츠가 완벽하지 않습니다. ''{1}''은(는) ''{2}''번 이상 발생해야 합니다. 이 제약 조건을 만족하려면 인스턴스가 하나 더 필요합니다.
+        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: ''{0}'' 요소의 콘텐츠가 완벽하지 않습니다. ''{1}''은(는) ''{2}''번 이상 발생해야 합니다. 이 제약 조건을 만족하려면 인스턴스가 ''{3}''개 더 필요합니다.
+        cvc-complex-type.3.1 = cvc-complex-type.3.1: ''{0}'' 요소의 ''{1}'' 속성에 대한 ''{2}'' 값이 해당 속성 사용에 대해 부적합합니다. ''{1}'' 속성의 고정된 값이 ''{3}''입니다.
+        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: ''{0}'' 요소에 ''{1}'' 속성에 대한 속성 와일드 카드 문자가 없습니다.
+        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: ''{1}'' 속성은 ''{0}'' 요소에 나타날 수 없습니다.
+        cvc-complex-type.4 = cvc-complex-type.4: ''{1}'' 속성은 ''{0}'' 요소에 나타나야 합니다.
+        cvc-complex-type.5.1 = cvc-complex-type.5.1: ''{0}'' 요소에서 ''{1}'' 속성이 대체 ID이지만 대체 ID ''{2}''이(가) 이미 있습니다. 하나만 사용할 수 있습니다.
+        cvc-complex-type.5.2 = cvc-complex-type.5.2: ''{0}'' 요소에서 ''{1}'' 속성이 대체 ID이지만 '{'attribute uses'}' 중 ID에서 파생된 ''{2}'' 속성이 이미 있습니다.
+        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}''은(는) ''{1}''에 대해 적합한 값이 아닙니다.
+        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}''은(는) 목록 유형 ''{1}''의 적합한 값이 아닙니다.
+        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}''은(는) 합집합 유형 ''{1}''의 적합한 값이 아닙니다.
+        cvc-elt.1.a = cvc-elt.1.a: ''{0}'' 요소의 선언을 찾을 수 없습니다.
+        cvc-elt.1.b = cvc-elt.1.b: 요소의 이름이 요소 선언 이름과 일치하지 않습니다. ''{0}''이(가) 발견되었습니다. ''{1}''이(가) 필요합니다.
+        cvc-elt.2 = cvc-elt.2: ''{0}''에 대한 요소 선언에서 '{'abstract'}'의 값은 false여야 합니다.
+        cvc-elt.3.1 = cvc-elt.3.1: ''{0}''의 '{'nillable'}' 속성이 false이므로 ''{1}'' 속성은 ''{0}'' 요소에 나타나지 않아야 합니다.
+        cvc-elt.3.2.1 = cvc-elt.3.2.1: ''{1}''이(가) 지정되었으므로 ''{0}'' 요소에는 문자 또는 요소 정보 [children]이 포함될 수 없습니다.
+        cvc-elt.3.2.2 = cvc-elt.3.2.2: ''{1}''이(가) 지정되었으므로 ''{0}'' 요소에 대해 고정된 '{'value constraint'}'가 없어야 합니다.
+        cvc-elt.4.1 = cvc-elt.4.1: ''{0}'' 요소의 ''{1}'' 속성에 대한 ''{2}'' 값은 적합한 QName이 아닙니다.
+        cvc-elt.4.2 = cvc-elt.4.2: ''{1}''을(를) ''{0}'' 요소에 대한 유형 정의로 분석할 수 없습니다.
+        cvc-elt.4.3 = cvc-elt.4.3: ''{1}'' 유형은 ''{0}'' 요소의 유형 정의 ''{2}''에서 적합하게 파생된 것이 아닙니다.
+        cvc-elt.5.1.1 = cvc-elt.5.1.1: ''{0}'' 요소의 '{'value constraint'}' ''{2}''은(는) ''{1}'' 유형에 대해 적합한 기본값이 아닙니다.
+        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: ''{0}'' 요소에는 요소 정보 항목 [children]이 없어야 합니다.
+        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: ''{0}'' 요소의 ''{1}'' 값이 고정된 '{'value constraint'}' 값 ''{2}''과(와) 일치하지 않습니다.
+        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: ''{0}'' 요소의 ''{1}'' 값이 '{'value constraint'}' 값 ''{2}''과(와) 일치하지 않습니다.
+        cvc-enumeration-valid = cvc-enumeration-valid: ''{0}'' 값은 ''{1}'' 목록에 대해 적합한 면이 아닙니다. 목록의 값이어야 합니다.
+        cvc-fractionDigits-valid = cvc-fractionDigits-valid: ''{0}'' 값의 소수점 이하 자릿수가 {1}이지만 소수점 이하 자릿수는 {2}(으)로 제한되었습니다.
+        cvc-id.1 = cvc-id.1: IDREF ''{0}''에 대한 ID/IDREF 바인딩이 없습니다.
+        cvc-id.2 = cvc-id.2: ID 값 ''{0}''이(가) 여러 번 발생했습니다.
+        cvc-id.3 = cvc-id.3: ID 제약 조건 ''{0}''의 필드가 ''{1}'' 요소와 일치하지만 이 요소는 단순 유형을 사용하지 않습니다.
+        cvc-length-valid = cvc-length-valid: length = ''{1}''인 ''{0}'' 값은 ''{3}'' 유형의 length ''{2}''에 대해 적합한 면이 아닙니다.
+        cvc-maxExclusive-valid = cvc-maxExclusive-valid: ''{0}'' 값은 ''{2}'' 유형의 maxExclusive ''{1}''에 대해 적합한 면이 아닙니다.
+        cvc-maxInclusive-valid = cvc-maxInclusive-valid: ''{0}'' 값은 ''{2}'' 유형의 maxInclusive ''{1}''에 대해 적합한 면이 아닙니다.
+        cvc-maxLength-valid = cvc-maxLength-valid: length = ''{1}''인 ''{0}'' 값은 ''{3}'' 유형의 maxLength ''{2}''에 대해 적합한 면이 아닙니다.
+        cvc-minExclusive-valid = cvc-minExclusive-valid: ''{0}'' 값은 ''{2}'' 유형의 minExclusive ''{1}''에 대해 적합한 면이 아닙니다.
+        cvc-minInclusive-valid = cvc-minInclusive-valid: ''{0}'' 값은 ''{2}'' 유형의 minInclusive ''{1}''에 대해 적합한 면이 아닙니다.
+        cvc-minLength-valid = cvc-minLength-valid: length = ''{1}''인 ''{0}'' 값은 ''{3}'' 유형의 minLength ''{2}''에 대해 적합한 면이 아닙니다.
+        cvc-pattern-valid = cvc-pattern-valid: ''{0}'' 값은 ''{2}'' 유형의 ''{1}'' 패턴에 대해 적합한 면이 아닙니다.
+        cvc-totalDigits-valid = cvc-totalDigits-valid: ''{0}'' 값의 총 자릿수가 {1}이지만 총 자릿수는 {2}(으)로 제한되었습니다.
+        cvc-type.1 = cvc-type.1: 유형 정의 ''{0}''을(를) 찾을 수 없습니다.
+        cvc-type.2 = cvc-type.2: {0} 요소에 대한 유형 정의는 추상적일 수 없습니다.
+        cvc-type.3.1.1 = cvc-type.3.1.1: ''{0}'' 요소는 단순 유형이므로 네임스페이스 이름이 ''http://www.w3.org/2001/XMLSchema-instance''이며 [local name]이 ''type'', ''nil'', ''schemaLocation'' 또는 ''noNamespaceSchemaLocation'' 중 하나인 속성을 제외하고 다른 속성을 포함할 수 없습니다. 하지만 ''{1}'' 속성이 발견되었습니다.
+        cvc-type.3.1.2 = cvc-type.3.1.2: ''{0}'' 요소는 단순 유형이므로 요소 정보 항목 [children]을 포함하지 않아야 합니다.
+        cvc-type.3.1.3 = cvc-type.3.1.3: ''{0}'' 요소의 ''{1}'' 값이 부적합합니다.
 
 #schema valid (3.X.3)
 
-        schema_reference.access = schema_reference: accessExternalSchema \uC18D\uC131\uC73C\uB85C \uC124\uC815\uB41C \uC81C\uD55C\uC73C\uB85C \uC778\uD574 ''{1}'' \uC561\uC138\uC2A4\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC73C\uBBC0\uB85C \uC2A4\uD0A4\uB9C8 \uBB38\uC11C ''{0}'' \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. 
-        schema_reference.4 = schema_reference.4: \uC2A4\uD0A4\uB9C8 \uBB38\uC11C ''{0}'' \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uC6D0\uC778: 1) \uBB38\uC11C\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. 2) \uBB38\uC11C\uB97C \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. 3) \uBB38\uC11C\uC758 \uB8E8\uD2B8 \uC694\uC18C\uAC00 <xsd:schema>\uAC00 \uC544\uB2D9\uB2C8\uB2E4.
-        src-annotation = src-annotation: <annotation> \uC694\uC18C\uC5D0\uB294 <appinfo> \uBC0F <documentation> \uC694\uC18C\uB9CC \uD3EC\uD568\uB420 \uC218 \uC788\uC9C0\uB9CC ''{0}''\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        src-attribute.1 = src-attribute.1: ''default'' \uBC0F ''fixed'' \uC18D\uC131\uC740 \uC18D\uC131 \uC120\uC5B8 ''{0}''\uC5D0 \uD568\uAED8 \uC874\uC7AC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uD558\uB098\uB9CC \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
-        src-attribute.2 = src-attribute.2: ''default'' \uC18D\uC131\uC774 ''{0}'' \uC18D\uC131\uC5D0 \uC874\uC7AC\uD558\uBBC0\uB85C ''use'' \uAC12\uC740 ''optional''\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-attribute.3.1 = src-attribute.3.1: 'ref' \uB610\uB294 'name' \uC911 \uD558\uB098\uAC00 \uB85C\uCEEC \uC18D\uC131 \uC120\uC5B8\uC5D0 \uC874\uC7AC\uD574\uC57C \uD569\uB2C8\uB2E4.
-        src-attribute.3.2 = src-attribute.3.2: \uCF58\uD150\uCE20\uAC00 \uC18D\uC131 \uCC38\uC870 ''{0}''\uC5D0 \uB300\uD55C (annotation?)\uACFC \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-        src-attribute.4 = src-attribute.4: ''{0}'' \uC18D\uC131\uC5D0 ''type'' \uC18D\uC131\uACFC \uC775\uBA85\uC758 ''simpleType'' \uD558\uC704 \uC18D\uC131\uC774 \uBAA8\uB450 \uC788\uC2B5\uB2C8\uB2E4. \uC774 \uC911 \uD558\uB098\uB9CC \uC18D\uC131\uC5D0 \uD5C8\uC6A9\uB429\uB2C8\uB2E4.
-        src-attribute_group.2 = src-attribute_group.2: \uC18D\uC131 \uADF8\uB8F9 ''{0}''\uC5D0 \uB300\uD574 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC758 \uAD50\uC9D1\uD569\uC744 \uD45C\uD604\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        src-attribute_group.3 = src-attribute_group.3: \uC18D\uC131 \uADF8\uB8F9 ''{0}''\uC5D0 \uB300\uD55C \uC21C\uD658 \uC815\uC758\uAC00 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC21C\uD658\uC801\uC73C\uB85C \uB4A4\uC5D0 \uC624\uB294 \uC18D\uC131 \uADF8\uB8F9 \uCC38\uC870\uAC00 \uACB0\uAD6D \uC790\uC2E0\uC5D0\uAC8C \uB3CC\uC544\uC635\uB2C8\uB2E4.
-        src-ct.1 = src-ct.1: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD55C \uBCF5\uD569 \uC720\uD615 \uC815\uC758 \uD45C\uD604 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. <complexContent>\uAC00 \uC0AC\uC6A9\uB418\uB294 \uACBD\uC6B0 complexType\uC774 \uAE30\uBCF8 \uC720\uD615\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4. ''{1}''\uC740(\uB294) simpleType\uC785\uB2C8\uB2E4.
-        src-ct.2.1 = src-ct.2.1: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD55C \uBCF5\uD569 \uC720\uD615 \uC815\uC758 \uD45C\uD604 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. <simpleContent>\uAC00 \uC0AC\uC6A9\uB418\uB294 \uACBD\uC6B0 \uCF58\uD150\uCE20 \uC720\uD615\uC774 \uB2E8\uC21C \uC720\uD615\uC778 complexType, \uD63C\uD569 \uCF58\uD150\uCE20 \uBC0F \uBE44\uC6B8 \uC218 \uC788\uB294 \uC870\uAC01\uC744 \uAC00\uC9C4 \uBCF5\uD569 \uC720\uD615(\uC81C\uD55C \uC0AC\uD56D\uC774 \uC9C0\uC815\uB41C \uACBD\uC6B0\uC5D0\uB9CC) \uB610\uB294 \uB2E8\uC21C \uC720\uD615(\uD655\uC7A5\uC774 \uC9C0\uC815\uB41C \uACBD\uC6B0\uC5D0\uB9CC)\uC774 \uAE30\uBCF8 \uC720\uD615\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4. ''{1}''\uC740(\uB294) \uC774\uB7EC\uD55C \uC870\uAC74\uC744 \uCDA9\uC871\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        src-ct.2.2 = src-ct.2.2: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD55C \uBCF5\uD569 \uC720\uD615 \uC815\uC758 \uD45C\uD604 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. simpleContent\uB97C \uAC00\uC9C4 complexType\uC774 \uD63C\uD569 \uCF58\uD150\uCE20 \uBC0F \uBE44\uC6B8 \uC218 \uC788\uB294 \uC870\uAC01\uC744 \uAC00\uC9C4 complexType\uC744 \uC81C\uD55C\uD558\uB294 \uACBD\uC6B0 <restriction>\uC758 \uD558\uC704 \uD56D\uBAA9 \uC911 <simpleType>\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-ct.4 = src-ct.4: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD55C \uBCF5\uD569 \uC720\uD615 \uC815\uC758 \uD45C\uD604 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC758 \uAD50\uC9D1\uD569\uC744 \uD45C\uD604\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        src-ct.5 = src-ct.5: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD55C \uBCF5\uD569 \uC720\uD615 \uC815\uC758 \uD45C\uD604 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC758 \uD569\uC9D1\uD569\uC744 \uD45C\uD604\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        src-element.1 = src-element.1: ''default'' \uBC0F ''fixed'' \uC18D\uC131\uC740 \uC694\uC18C \uC120\uC5B8 ''{0}''\uC5D0 \uD568\uAED8 \uC874\uC7AC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uD558\uB098\uB9CC \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
-        src-element.2.1 = src-element.2.1: 'ref' \uB610\uB294 'name' \uC911 \uD558\uB098\uAC00 \uB85C\uCEEC \uC694\uC18C \uC120\uC5B8\uC5D0 \uC874\uC7AC\uD574\uC57C \uD569\uB2C8\uB2E4.
-        src-element.2.2 = src-element.2.2: ''{0}''\uC5D0 ''ref'' \uC18D\uC131\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uC73C\uBBC0\uB85C \uD574\uB2F9 \uCF58\uD150\uCE20\uB294 (annotation?)\uACFC \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4. \uD558\uC9C0\uB9CC ''{1}''\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        src-element.3 = src-element.3: ''{0}'' \uC694\uC18C\uC5D0 ''type'' \uC18D\uC131\uACFC ''anonymous type'' \uD558\uC704 \uC18D\uC131\uC774 \uBAA8\uB450 \uC788\uC2B5\uB2C8\uB2E4. \uC774 \uC911 \uD558\uB098\uB9CC \uC694\uC18C\uC5D0 \uD5C8\uC6A9\uB429\uB2C8\uB2E4.
-        src-import.1.1 = src-import.1.1: <import> \uC694\uC18C \uC815\uBCF4 \uD56D\uBAA9\uC758 \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC18D\uC131 ''{0}''\uC740(\uB294) \uC874\uC7AC\uD558\uB294 \uC2A4\uD0A4\uB9C8\uC758 targetNamespace\uC640 \uB2EC\uB77C\uC57C \uD569\uB2C8\uB2E4.
-        src-import.1.2 = src-import.1.2: \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC18D\uC131\uC774 <import> \uC694\uC18C \uC815\uBCF4 \uD56D\uBAA9\uC5D0 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC744 \uACBD\uC6B0 \uD3EC\uD568\uD558\uACE0 \uC788\uB294 \uC2A4\uD0A4\uB9C8\uC5D0 targetNamespace\uAC00 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-import.2 = src-import.2: ''{0}'' \uBB38\uC11C\uC758 \uB8E8\uD2B8 \uC694\uC18C\uC5D0 \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC774\uB984 ''http://www.w3.org/2001/XMLSchema''\uC640 \uB85C\uCEEC \uC774\uB984 ''schema''\uAC00 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-import.3.1 = src-import.3.1: <import> \uC694\uC18C \uC815\uBCF4 \uD56D\uBAA9\uC758 \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC18D\uC131 ''{0}''\uC774(\uAC00) \uC784\uD3EC\uD2B8\uB41C \uBB38\uC11C\uC758 targetNamespace \uC18D\uC131 ''{1}''\uACFC(\uC640) \uB3D9\uC77C\uD574\uC57C \uD569\uB2C8\uB2E4.
-        src-import.3.2 = src-import.3.2: \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC18D\uC131\uC774 \uC5C6\uB294 <import> \uC694\uC18C \uC815\uBCF4 \uD56D\uBAA9\uC774 \uBC1C\uACAC\uB418\uC5C8\uC73C\uBBC0\uB85C \uC784\uD3EC\uD2B8\uB41C \uBB38\uC11C\uC5D0\uB294 targetNamespace \uC18D\uC131\uC774 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uD558\uC9C0\uB9CC \uC784\uD3EC\uD2B8\uB41C \uBB38\uC11C\uC5D0\uC11C targetNamespace ''{1}''\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        src-include.1 = src-include.1: ''{0}'' \uBB38\uC11C\uC758 \uB8E8\uD2B8 \uC694\uC18C\uC5D0 \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC774\uB984 ''http://www.w3.org/2001/XMLSchema''\uC640 \uB85C\uCEEC \uC774\uB984 ''schema''\uAC00 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-include.2.1 = src-include.2.1: \uCC38\uC870\uB41C \uC2A4\uD0A4\uB9C8(\uD604\uC7AC''{1}'')\uC640 \uD3EC\uD568\uD558\uB294 \uC2A4\uD0A4\uB9C8(\uD604\uC7AC ''{0}'')\uC758 targetNamespace\uB294 \uB3D9\uC77C\uD574\uC57C \uD569\uB2C8\uB2E4.
-        src-redefine.2 = src-redefine.2: ''{0}'' \uBB38\uC11C\uC758 \uB8E8\uD2B8 \uC694\uC18C\uC5D0 \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC774\uB984 ''http://www.w3.org/2001/XMLSchema''\uC640 \uB85C\uCEEC \uC774\uB984 ''schema''\uAC00 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-redefine.3.1 = src-redefine.3.1: \uCC38\uC870\uB41C \uC2A4\uD0A4\uB9C8(\uD604\uC7AC''{1}'')\uC640 \uC7AC\uC815\uC758\uD558\uB294 \uC2A4\uD0A4\uB9C8(\uD604\uC7AC ''{0}'')\uC758 targetNamespace\uB294 \uB3D9\uC77C\uD574\uC57C \uD569\uB2C8\uB2E4.
-        src-redefine.5.a.a = src-redefine.5.a.a: <simpleType>\uC758 \uBE44\uC8FC\uC11D \uD558\uC704 \uD56D\uBAA9\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. <redefine> \uC694\uC18C\uC758 <simpleType> \uD558\uC704 \uD56D\uBAA9\uC5D0\uB294 \uC790\uC2E0\uC744 \uCC38\uC870\uD558\uB294 'base' \uC18D\uC131\uC744 \uAC00\uC9C4 <restriction> \uC885\uC18D \uD56D\uBAA9\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}''\uC740(\uB294) \uC801\uD569\uD55C \uD558\uC704 \uC694\uC18C\uAC00 \uC544\uB2D9\uB2C8\uB2E4. <redefine> \uC694\uC18C\uC758 <simpleType> \uD558\uC704 \uD56D\uBAA9\uC5D0\uB294 \uC790\uC2E0\uC744 \uCC38\uC870\uD558\uB294 ''base'' \uC18D\uC131\uC744 \uAC00\uC9C4 <restriction> \uC885\uC18D \uD56D\uBAA9\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}''\uC5D0 \uC7AC\uC815\uC758\uB41C \uC694\uC18C ''{1}''\uC744(\uB97C) \uCC38\uC870\uD558\uB294 ''base'' \uC18D\uC131\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. <redefine> \uC694\uC18C\uC758 <simpleType> \uD558\uC704 \uD56D\uBAA9\uC5D0\uB294 \uC790\uC2E0\uC744 \uCC38\uC870\uD558\uB294 ''base'' \uC18D\uC131\uC744 \uAC00\uC9C4 <restriction> \uC885\uC18D \uD56D\uBAA9\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-redefine.5.b.a = src-redefine.5.b.a: <complexType>\uC758 \uBE44\uC8FC\uC11D \uD558\uC704 \uD56D\uBAA9\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. <redefine> \uC694\uC18C\uC758 <complexType> \uD558\uC704 \uD56D\uBAA9\uC5D0\uB294 \uC790\uC2E0\uC744 \uCC38\uC870\uD558\uB294 'base' \uC18D\uC131\uC744 \uAC00\uC9C4 <extension> \uB610\uB294 <restriction> \uC885\uC18D \uD56D\uBAA9\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-redefine.5.b.b = src-redefine.5.b.b: <complexType>\uC758 \uBE44\uC8FC\uC11D \uCD5C\uD558\uC704 \uD56D\uBAA9\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. <redefine> \uC694\uC18C\uC758 <complexType> \uD558\uC704 \uD56D\uBAA9\uC5D0\uB294 \uC790\uC2E0\uC744 \uCC38\uC870\uD558\uB294 'base' \uC18D\uC131\uC744 \uAC00\uC9C4 <extension> \uB610\uB294 <restriction> \uC885\uC18D \uD56D\uBAA9\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}''\uC740(\uB294) \uC801\uD569\uD55C \uCD5C\uD558\uC704 \uC694\uC18C\uAC00 \uC544\uB2D9\uB2C8\uB2E4. <redefine> \uC694\uC18C\uC758 <complexType> \uD558\uC704 \uD56D\uBAA9\uC5D0\uB294 \uC790\uC2E0\uC744 \uCC38\uC870\uD558\uB294 ''base'' \uC18D\uC131\uC744 \uAC00\uC9C4 <extension> \uB610\uB294 <restriction> \uC885\uC18D \uD56D\uBAA9\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}''\uC5D0 \uC7AC\uC815\uC758\uB41C \uC694\uC18C ''{1}''\uC744(\uB97C) \uCC38\uC870\uD558\uB294 ''base'' \uC18D\uC131\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. <redefine> \uC694\uC18C\uC758 <complexType> \uD558\uC704 \uD56D\uBAA9\uC5D0\uB294 \uC790\uC2E0\uC744 \uCC38\uC870\uD558\uB294 ''base'' \uC18D\uC131\uC744 \uAC00\uC9C4 <extension> \uB610\uB294 <restriction> \uC885\uC18D \uD56D\uBAA9\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-redefine.6.1.1 = src-redefine.6.1.1: <redefine> \uC694\uC18C\uC758 \uADF8\uB8F9 \uD558\uC704\uC5D0 \uC790\uC2E0\uC744 \uCC38\uC870\uD558\uB294 \uADF8\uB8F9\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uC744 \uACBD\uC6B0 \uC815\uD655\uD788 1\uC774\uC5B4\uC57C \uC0AC\uC6A9\uB418\uC5B4\uC57C \uD558\uC9C0\uB9CC ''{0}''\uC774(\uAC00) \uC0AC\uC6A9\uB429\uB2C8\uB2E4.
-        src-redefine.6.1.2 = src-redefine.6.1.2: \uC7AC\uC815\uC758\uD558\uB824\uB294 \uADF8\uB8F9\uC5D0 \uB300\uD55C \uCC38\uC870\uB97C \uD3EC\uD568\uD558\uB294 ''{0}'' \uADF8\uB8F9\uC5D0\uB294 ''minOccurs'' = ''maxOccurs'' = 1\uC774 \uC0AC\uC6A9\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        src-redefine.6.2.1 = src-redefine.6.2.1: \uC7AC\uC815\uC758\uB41C \uC2A4\uD0A4\uB9C8\uC5D0 \uC774\uB984\uC774 ''{0}''\uC778 \uADF8\uB8F9\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-        src-redefine.6.2.2 = src-redefine.6.2.2: ''{0}'' \uADF8\uB8F9\uC740 \uC7AC\uC815\uC758\uD558\uB294 \uADF8\uB8F9\uC744 \uC81C\uB300\uB85C \uC81C\uD55C\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC704\uBC18\uB41C \uC81C\uC57D \uC870\uAC74: ''{1}''.
-        src-redefine.7.1 = src-redefine.7.1: <redefine> \uC694\uC18C\uC758 attributeGroup \uD558\uC704\uC5D0 \uC790\uC2E0\uC744 \uCC38\uC870\uD558\uB294 attributeGroup\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uC744 \uACBD\uC6B0 \uC815\uD655\uD788 1\uC774 \uC0AC\uC6A9\uB418\uC5B4\uC57C \uD558\uC9C0\uB9CC {0}\uC774(\uAC00) \uC0AC\uC6A9\uB429\uB2C8\uB2E4.
-        src-redefine.7.2.1 = src-redefine.7.2.1: \uC7AC\uC815\uC758\uB41C \uC2A4\uD0A4\uB9C8\uC5D0 \uC774\uB984\uC774 ''{0}''\uC778 attributeGroup\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-        src-redefine.7.2.2 = src-redefine.7.2.2: AttributeGroup ''{0}''\uC740(\uB294) \uC7AC\uC815\uC758\uD558\uB294 attributeGroup\uC744 \uC81C\uB300\uB85C \uC81C\uD55C\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC704\uBC18\uB41C \uC81C\uC57D \uC870\uAC74: ''{1}''.
-        src-resolve = src-resolve: ''{0}'' \uC774\uB984\uC744 ''{1}'' \uAD6C\uC131\uC694\uC18C\uB85C \uBD84\uC11D\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        src-resolve.4.1 = src-resolve.4.1: ''{2}'' \uAD6C\uC131\uC694\uC18C\uB97C \uBD84\uC11D\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. ''{2}''\uC5D0 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC5C6\uB294 \uAC83\uC73C\uB85C \uD655\uC778\uB418\uC5C8\uC9C0\uB9CC \uC2A4\uD0A4\uB9C8 \uBB38\uC11C ''{0}''\uC5D0\uC11C \uB300\uC0C1 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC5C6\uB294 \uAD6C\uC131\uC694\uC18C\uB97C \uCC38\uC870\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. ''{2}''\uC5D0 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC788\uC5B4\uC57C \uD560 \uACBD\uC6B0 \uC811\uB450\uC5B4\uB97C \uC81C\uACF5\uD574\uC57C \uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. ''{2}''\uC5D0 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC5C6\uC5B4\uC57C \uD560 \uACBD\uC6B0 "namespace" \uC18D\uC131 \uC5C6\uC774 ''import''\uB97C ''{0}''\uC5D0 \uCD94\uAC00\uD574\uC57C \uD569\uB2C8\uB2E4.
-        src-resolve.4.2 = src-resolve.4.2: ''{2}'' \uAD6C\uC131\uC694\uC18C\uB97C \uBD84\uC11D\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. ''{2}''\uC774(\uAC00) ''{1}'' \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uC788\uB294 \uAC83\uC73C\uB85C \uD655\uC778\uB418\uC5C8\uC9C0\uB9CC \uC2A4\uD0A4\uB9C8 \uBB38\uC11C ''{0}''\uC5D0\uC11C \uC774 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC758 \uAD6C\uC131\uC694\uC18C\uB97C \uCC38\uC870\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC62C\uBC14\uB974\uC9C0 \uC54A\uC740 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC77C \uACBD\uC6B0 \uC811\uB450\uC5B4\uC778 ''{2}''\uC744(\uB97C) \uBCC0\uACBD\uD574\uC57C \uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uC62C\uBC14\uB978 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC77C \uACBD\uC6B0 \uC801\uD569\uD55C ''import'' \uD0DC\uADF8\uB97C ''{0}''\uC5D0 \uCD94\uAC00\uD574\uC57C \uD569\uB2C8\uB2E4.
-        src-simple-type.2.a = src-simple-type.2.a: \uD574\uB2F9 [children] \uC911 base [attribute]\uC640 <simpleType> \uC694\uC18C\uAC00 \uBAA8\uB450 \uC788\uB294 <restriction> \uC694\uC18C\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uD558\uB098\uB9CC \uD5C8\uC6A9\uB429\uB2C8\uB2E4.
-        src-simple-type.2.b = src-simple-type.2.b: \uD574\uB2F9 [children] \uC911 base [attribute]\uC640 <simpleType> \uC694\uC18C\uAC00 \uBAA8\uB450 \uC5C6\uB294 <restriction> \uC694\uC18C\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uD558\uB098\uB9CC \uD544\uC694\uD569\uB2C8\uB2E4.
-        src-simple-type.3.a = src-simple-type.3.a: \uD574\uB2F9 [children] \uC911 itemType [attribute]\uC640 <simpleType> \uC694\uC18C\uAC00 \uBAA8\uB450 \uC788\uB294 <list> \uC694\uC18C\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uD558\uB098\uB9CC \uD5C8\uC6A9\uB429\uB2C8\uB2E4.
-        src-simple-type.3.b = src-simple-type.3.b: \uD574\uB2F9 [children] \uC911 itemType [attribute]\uC640 <simpleType> \uC694\uC18C\uAC00 \uBAA8\uB450 \uC5C6\uB294 <list> \uC694\uC18C\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uD558\uB098\uB9CC \uD544\uC694\uD569\uB2C8\uB2E4.
-        src-single-facet-value = src-single-facet-value: ''{0}'' \uBA74\uC774 \uB450 \uBC88 \uC774\uC0C1 \uC815\uC758\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: <union> \uC694\uC18C\uC5D0\uB294 \uD574\uB2F9 [children] \uC911 \uBE44\uC5B4 \uC788\uC9C0 \uC54A\uC740 memberTypes [attribute] \uB610\uB294 \uD558\uB098 \uC774\uC0C1\uC758 <simpleType> \uC694\uC18C\uAC00 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+        schema_reference.access = schema_reference: accessExternalSchema 속성으로 설정된 제한으로 인해 ''{1}'' 액세스가 허용되지 않으므로 스키마 문서 ''{0}'' 읽기를 실패했습니다. 
+        schema_reference.4 = schema_reference.4: 스키마 문서 ''{0}'' 읽기를 실패했습니다. 원인: 1) 문서를 찾을 수 없습니다. 2) 문서를 읽을 수 없습니다. 3) 문서의 루트 요소가 <xsd:schema>가 아닙니다.
+        src-annotation = src-annotation: <annotation> 요소에는 <appinfo> 및 <documentation> 요소만 포함될 수 있지만 ''{0}''이(가) 발견되었습니다.
+        src-attribute.1 = src-attribute.1: ''default'' 및 ''fixed'' 속성은 속성 선언 ''{0}''에 함께 존재할 수 없습니다. 하나만 사용하십시오.
+        src-attribute.2 = src-attribute.2: ''default'' 속성이 ''{0}'' 속성에 존재하므로 ''use'' 값은 ''optional''이어야 합니다.
+        src-attribute.3.1 = src-attribute.3.1: 'ref' 또는 'name' 중 하나가 로컬 속성 선언에 존재해야 합니다.
+        src-attribute.3.2 = src-attribute.3.2: 콘텐츠가 속성 참조 ''{0}''에 대한 (annotation?)과 일치해야 합니다.
+        src-attribute.4 = src-attribute.4: ''{0}'' 속성에 ''type'' 속성과 익명의 ''simpleType'' 하위 속성이 모두 있습니다. 이 중 하나만 속성에 허용됩니다.
+        src-attribute_group.2 = src-attribute_group.2: 속성 그룹 ''{0}''에 대해 와일드 카드 문자의 교집합을 표현할 수 없습니다.
+        src-attribute_group.3 = src-attribute_group.3: 속성 그룹 ''{0}''에 대한 순환 정의가 감지되었습니다. 순환적으로 뒤에 오는 속성 그룹 참조가 결국 자신에게 돌아옵니다.
+        src-ct.1 = src-ct.1: ''{0}'' 유형에 대한 복합 유형 정의 표현 오류가 발생했습니다. <complexContent>가 사용되는 경우 complexType이 기본 유형이어야 합니다. ''{1}''은(는) simpleType입니다.
+        src-ct.2.1 = src-ct.2.1: ''{0}'' 유형에 대한 복합 유형 정의 표현 오류가 발생했습니다. <simpleContent>가 사용되는 경우 콘텐츠 유형이 단순 유형인 complexType, 혼합 콘텐츠 및 비울 수 있는 조각을 가진 복합 유형(제한 사항이 지정된 경우에만) 또는 단순 유형(확장이 지정된 경우에만)이 기본 유형이어야 합니다. ''{1}''은(는) 이러한 조건을 충족하지 않습니다.
+        src-ct.2.2 = src-ct.2.2: ''{0}'' 유형에 대한 복합 유형 정의 표현 오류가 발생했습니다. simpleContent를 가진 complexType이 혼합 콘텐츠 및 비울 수 있는 조각을 가진 complexType을 제한하는 경우 <restriction>의 하위 항목 중 <simpleType>이 있어야 합니다.
+        src-ct.4 = src-ct.4: ''{0}'' 유형에 대한 복합 유형 정의 표현 오류가 발생했습니다. 와일드 카드 문자의 교집합을 표현할 수 없습니다.
+        src-ct.5 = src-ct.5: ''{0}'' 유형에 대한 복합 유형 정의 표현 오류가 발생했습니다. 와일드 카드 문자의 합집합을 표현할 수 없습니다.
+        src-element.1 = src-element.1: ''default'' 및 ''fixed'' 속성은 요소 선언 ''{0}''에 함께 존재할 수 없습니다. 하나만 사용하십시오.
+        src-element.2.1 = src-element.2.1: 'ref' 또는 'name' 중 하나가 로컬 요소 선언에 존재해야 합니다.
+        src-element.2.2 = src-element.2.2: ''{0}''에 ''ref'' 속성이 포함되어 있으므로 해당 콘텐츠는 (annotation?)과 일치해야 합니다. 하지만 ''{1}''이(가) 발견되었습니다.
+        src-element.3 = src-element.3: ''{0}'' 요소에 ''type'' 속성과 ''anonymous type'' 하위 속성이 모두 있습니다. 이 중 하나만 요소에 허용됩니다.
+        src-import.1.1 = src-import.1.1: <import> 요소 정보 항목의 네임스페이스 속성 ''{0}''은(는) 존재하는 스키마의 targetNamespace와 달라야 합니다.
+        src-import.1.2 = src-import.1.2: 네임스페이스 속성이 <import> 요소 정보 항목에 존재하지 않을 경우 포함하고 있는 스키마에 targetNamespace가 있어야 합니다.
+        src-import.2 = src-import.2: ''{0}'' 문서의 루트 요소에 네임스페이스 이름 ''http://www.w3.org/2001/XMLSchema''와 로컬 이름 ''schema''가 있어야 합니다.
+        src-import.3.1 = src-import.3.1: <import> 요소 정보 항목의 네임스페이스 속성 ''{0}''이(가) 임포트된 문서의 targetNamespace 속성 ''{1}''과(와) 동일해야 합니다.
+        src-import.3.2 = src-import.3.2: 네임스페이스 속성이 없는 <import> 요소 정보 항목이 발견되었으므로 임포트된 문서에는 targetNamespace 속성이 포함될 수 없습니다. 하지만 임포트된 문서에서 targetNamespace ''{1}''이(가) 발견되었습니다.
+        src-include.1 = src-include.1: ''{0}'' 문서의 루트 요소에 네임스페이스 이름 ''http://www.w3.org/2001/XMLSchema''와 로컬 이름 ''schema''가 있어야 합니다.
+        src-include.2.1 = src-include.2.1: 참조된 스키마(현재''{1}'')와 포함하는 스키마(현재 ''{0}'')의 targetNamespace는 동일해야 합니다.
+        src-redefine.2 = src-redefine.2: ''{0}'' 문서의 루트 요소에 네임스페이스 이름 ''http://www.w3.org/2001/XMLSchema''와 로컬 이름 ''schema''가 있어야 합니다.
+        src-redefine.3.1 = src-redefine.3.1: 참조된 스키마(현재''{1}'')와 재정의하는 스키마(현재 ''{0}'')의 targetNamespace는 동일해야 합니다.
+        src-redefine.5.a.a = src-redefine.5.a.a: <simpleType>의 비주석 하위 항목을 찾을 수 없습니다. <redefine> 요소의 <simpleType> 하위 항목에는 자신을 참조하는 'base' 속성을 가진 <restriction> 종속 항목이 있어야 합니다.
+        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}''은(는) 적합한 하위 요소가 아닙니다. <redefine> 요소의 <simpleType> 하위 항목에는 자신을 참조하는 ''base'' 속성을 가진 <restriction> 종속 항목이 있어야 합니다.
+        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}''에 재정의된 요소 ''{1}''을(를) 참조하는 ''base'' 속성이 없습니다. <redefine> 요소의 <simpleType> 하위 항목에는 자신을 참조하는 ''base'' 속성을 가진 <restriction> 종속 항목이 있어야 합니다.
+        src-redefine.5.b.a = src-redefine.5.b.a: <complexType>의 비주석 하위 항목을 찾을 수 없습니다. <redefine> 요소의 <complexType> 하위 항목에는 자신을 참조하는 'base' 속성을 가진 <extension> 또는 <restriction> 종속 항목이 있어야 합니다.
+        src-redefine.5.b.b = src-redefine.5.b.b: <complexType>의 비주석 최하위 항목을 찾을 수 없습니다. <redefine> 요소의 <complexType> 하위 항목에는 자신을 참조하는 'base' 속성을 가진 <extension> 또는 <restriction> 종속 항목이 있어야 합니다.
+        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}''은(는) 적합한 최하위 요소가 아닙니다. <redefine> 요소의 <complexType> 하위 항목에는 자신을 참조하는 ''base'' 속성을 가진 <extension> 또는 <restriction> 종속 항목이 있어야 합니다.
+        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}''에 재정의된 요소 ''{1}''을(를) 참조하는 ''base'' 속성이 없습니다. <redefine> 요소의 <complexType> 하위 항목에는 자신을 참조하는 ''base'' 속성을 가진 <extension> 또는 <restriction> 종속 항목이 있어야 합니다.
+        src-redefine.6.1.1 = src-redefine.6.1.1: <redefine> 요소의 그룹 하위에 자신을 참조하는 그룹이 포함되어 있을 경우 정확히 1이어야 사용되어야 하지만 ''{0}''이(가) 사용됩니다.
+        src-redefine.6.1.2 = src-redefine.6.1.2: 재정의하려는 그룹에 대한 참조를 포함하는 ''{0}'' 그룹에는 ''minOccurs'' = ''maxOccurs'' = 1이 사용되어야 합니다.
+        src-redefine.6.2.1 = src-redefine.6.2.1: 재정의된 스키마에 이름이 ''{0}''인 그룹이 없습니다.
+        src-redefine.6.2.2 = src-redefine.6.2.2: ''{0}'' 그룹은 재정의하는 그룹을 제대로 제한하지 않습니다. 위반된 제약 조건: ''{1}''.
+        src-redefine.7.1 = src-redefine.7.1: <redefine> 요소의 attributeGroup 하위에 자신을 참조하는 attributeGroup이 포함되어 있을 경우 정확히 1이 사용되어야 하지만 {0}이(가) 사용됩니다.
+        src-redefine.7.2.1 = src-redefine.7.2.1: 재정의된 스키마에 이름이 ''{0}''인 attributeGroup이 없습니다.
+        src-redefine.7.2.2 = src-redefine.7.2.2: AttributeGroup ''{0}''은(는) 재정의하는 attributeGroup을 제대로 제한하지 않습니다. 위반된 제약 조건: ''{1}''.
+        src-resolve = src-resolve: ''{0}'' 이름을 ''{1}'' 구성요소로 분석할 수 없습니다.
+        src-resolve.4.1 = src-resolve.4.1: ''{2}'' 구성요소를 분석하는 중 오류가 발생했습니다. ''{2}''에 네임스페이스가 없는 것으로 확인되었지만 스키마 문서 ''{0}''에서 대상 네임스페이스가 없는 구성요소를 참조할 수 없습니다. ''{2}''에 네임스페이스가 있어야 할 경우 접두어를 제공해야 할 수 있습니다. ''{2}''에 네임스페이스가 없어야 할 경우 "namespace" 속성 없이 ''import''를 ''{0}''에 추가해야 합니다.
+        src-resolve.4.2 = src-resolve.4.2: ''{2}'' 구성요소를 분석하는 중 오류가 발생했습니다. ''{2}''이(가) ''{1}'' 네임스페이스에 있는 것으로 확인되었지만 스키마 문서 ''{0}''에서 이 네임스페이스의 구성요소를 참조할 수 없습니다. 올바르지 않은 네임스페이스일 경우 접두어인 ''{2}''을(를) 변경해야 할 수 있습니다. 올바른 네임스페이스일 경우 적합한 ''import'' 태그를 ''{0}''에 추가해야 합니다.
+        src-simple-type.2.a = src-simple-type.2.a: 해당 [children] 중 base [attribute]와 <simpleType> 요소가 모두 있는 <restriction> 요소가 발견되었습니다. 하나만 허용됩니다.
+        src-simple-type.2.b = src-simple-type.2.b: 해당 [children] 중 base [attribute]와 <simpleType> 요소가 모두 없는 <restriction> 요소가 발견되었습니다. 하나만 필요합니다.
+        src-simple-type.3.a = src-simple-type.3.a: 해당 [children] 중 itemType [attribute]와 <simpleType> 요소가 모두 있는 <list> 요소가 발견되었습니다. 하나만 허용됩니다.
+        src-simple-type.3.b = src-simple-type.3.b: 해당 [children] 중 itemType [attribute]와 <simpleType> 요소가 모두 없는 <list> 요소가 발견되었습니다. 하나만 필요합니다.
+        src-single-facet-value = src-single-facet-value: ''{0}'' 면이 두 번 이상 정의되었습니다.
+        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: <union> 요소에는 해당 [children] 중 비어 있지 않은 memberTypes [attribute] 또는 하나 이상의 <simpleType> 요소가 있어야 합니다.
 
 #constraint valid (3.X.6)
 
-        ag-props-correct.2 = ag-props-correct.2: \uC18D\uC131 \uADF8\uB8F9 ''{0}''\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB984 \uBC0F \uB300\uC0C1 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uB3D9\uC77C\uD55C \uC911\uBCF5 \uC18D\uC131 \uC0AC\uC6A9\uC774 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC911\uBCF5 \uC18D\uC131 \uC0AC\uC6A9\uC758 \uC774\uB984\uC740 ''{1}''\uC785\uB2C8\uB2E4.
-        ag-props-correct.3 = ag-props-correct.3: \uC18D\uC131 \uADF8\uB8F9 ''{0}''\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uB450 \uAC1C\uC758 \uC18D\uC131 \uC120\uC5B8 ''{1}'' \uBC0F ''{2}''\uC5D0 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C \uC720\uD615\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-        a-props-correct.2 = a-props-correct.2: ''{0}'' \uC18D\uC131\uC758 \uAC12 \uC81C\uC57D \uC870\uAC74 \uAC12 ''{1}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-        a-props-correct.3 = a-props-correct.3: \uC18D\uC131\uC758 '{'type definition'}'\uC774 ID\uC774\uAC70\uB098 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C \uAC83\uC774\uBBC0\uB85C ''{0}'' \uC18D\uC131\uC740 ''fixed'' \uB610\uB294 ''default''\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        au-props-correct.2 = au-props-correct.2: ''{0}''\uC758 \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uACE0\uC815\uB41C \uAC12 ''{1}''\uC774(\uAC00) \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC744(\uB97C) \uCC38\uC870\uD558\uB294 \uC18D\uC131 \uC0AC\uC6A9\uC5D0\uB3C4 '{'value constraint'}'\uAC00 \uC788\uC744 \uACBD\uC6B0 \uACE0\uC815\uB418\uC5B4\uC57C \uD558\uBA70 \uAC12\uC740 ''{1}''\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        cos-all-limited.1.2 = cos-all-limited.1.2: 'all' \uBAA8\uB378 \uADF8\uB8F9\uC774 '{'min occurs'}' = '{'max occurs'}' = 1\uC778 \uC870\uAC01\uC5D0 \uB098\uD0C0\uB098\uC57C \uD558\uBA70 \uD574\uB2F9 \uC870\uAC01\uC740 \uBCF5\uD569 \uC720\uD615 \uC815\uC758\uC758 '{'content type'}'\uC744 \uAD6C\uC131\uD558\uB294 \uC30D\uC758 \uC77C\uBD80\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-        cos-all-limited.2 = cos-all-limited.2: ''all'' \uBAA8\uB378 \uADF8\uB8F9\uC5D0 \uD3EC\uD568\uB41C \uC694\uC18C\uC758 '{'max occurs'}'\uB294 0 \uB610\uB294 1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4. ''{1}'' \uC694\uC18C\uC5D0 \uB300\uD55C ''{0}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-        cos-applicable-facets = cos-applicable-facets: {1} \uC720\uD615\uC5D0\uC11C\uB294 ''{0}'' \uBA74\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        cos-ct-extends.1.1 = cos-ct-extends.1.1: ''{0}'' \uC720\uD615\uC740 ''{1}'' \uC720\uD615\uC5D0\uC11C \uD655\uC7A5\uC5D0 \uC758\uD574 \uD30C\uC0DD\uB418\uC5C8\uC9C0\uB9CC ''{1}''\uC758 ''final'' \uC18D\uC131\uC740 \uD655\uC7A5\uC5D0 \uC758\uD55C \uD30C\uC0DD\uC744 \uAE08\uC9C0\uD569\uB2C8\uB2E4.
-        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: \uD30C\uC0DD\uB41C \uC720\uD615\uACFC \uD574\uB2F9 \uAE30\uBCF8 \uC720\uD615\uC758 \uCF58\uD150\uCE20 \uC720\uD615\uC740 \uBAA8\uB450 \uD63C\uD569\uB418\uAC70\uB098 \uBAA8\uB450 \uC694\uC18C \uC804\uC6A9\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4. ''{0}'' \uC720\uD615\uC740 \uC694\uC18C \uC804\uC6A9\uC774\uC9C0\uB9CC \uD574\uB2F9 \uAE30\uBCF8 \uC720\uD615\uC740 \uC694\uC18C \uC804\uC6A9\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: \uD30C\uC0DD\uB41C \uC720\uD615\uACFC \uD574\uB2F9 \uAE30\uBCF8 \uC720\uD615\uC758 \uCF58\uD150\uCE20 \uC720\uD615\uC740 \uBAA8\uB450 \uD63C\uD569\uB418\uAC70\uB098 \uBAA8\uB450 \uC694\uC18C \uC804\uC6A9\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4. ''{0}'' \uC720\uD615\uC740 \uD63C\uD569\uB418\uC5B4 \uC788\uC9C0\uB9CC \uD574\uB2F9 \uAE30\uBCF8 \uC720\uD615\uC740 \uD63C\uD569\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        cos-element-consistent = cos-element-consistent: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB984\uC774 ''{1}''\uC774\uBA70 \uC720\uD615\uC774 \uB2E4\uB978 \uC5EC\uB7EC \uC694\uC18C\uAC00 \uBAA8\uB378 \uADF8\uB8F9\uC5D0 \uB098\uD0C0\uB0A9\uB2C8\uB2E4.
-        cos-list-of-atomic = cos-list-of-atomic: \uBAA9\uB85D \uC720\uD615 ''{0}''\uC758 \uC815\uC758\uC5D0\uC11C ''{1}'' \uC720\uD615\uC740 \uAE30\uBCF8 \uB2E8\uC704\uAC00 \uC544\uB2C8\uBBC0\uB85C \uBD80\uC801\uD569\uD55C \uBAA9\uB85D \uC694\uC18C \uC720\uD615\uC785\uB2C8\uB2E4. ''{1}''\uC774(\uAC00) \uBAA9\uB85D \uC720\uD615\uC774\uAC70\uB098 \uBAA9\uB85D\uC744 \uD3EC\uD568\uD558\uB294 \uD569\uC9D1\uD569 \uC720\uD615\uC785\uB2C8\uB2E4.
-        cos-nonambig = cos-nonambig: {0} \uBC0F {1}(\uB610\uB294 \uD574\uB2F9 \uB300\uCCB4 \uADF8\uB8F9\uC758 \uC694\uC18C)\uC774(\uAC00) "Unique Particle Attribution"\uC744 \uC704\uBC18\uD569\uB2C8\uB2E4. \uC774 \uC2A4\uD0A4\uB9C8\uC5D0 \uB300\uD55C \uAC80\uC99D \uC911 \uC774\uB7EC\uD55C \uB450 \uC870\uAC01\uC774 \uBAA8\uD638\uD574\uC9C8 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
-        cos-particle-restrict.a = cos-particle-restrict.a: \uD30C\uC0DD\uB41C \uC870\uAC01\uC774 \uBE44\uC5B4 \uC788\uC73C\uBBC0\uB85C \uAE30\uBCF8 \uC870\uAC01\uC744 \uBE44\uC6B8 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cos-particle-restrict.b = cos-particle-restrict.b: \uAE30\uBCF8 \uC870\uAC01\uC740 \uBE44\uC5B4 \uC788\uC9C0\uB9CC \uD30C\uC0DD\uB41C \uC870\uAC01\uC740 \uBE44\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        cos-particle-restrict.2 = cos-particle-restrict.2: \uAE08\uC9C0\uB41C \uC870\uAC01 \uC81C\uD55C \uC0AC\uD56D: ''{0}''.
-        cos-st-restricts.1.1 = cos-st-restricts.1.1: ''{1}'' \uC720\uD615\uC774 \uAE30\uBCF8 \uB2E8\uC704\uC774\uBBC0\uB85C \uD574\uB2F9 '{'base type definition'}' ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uB2E8\uC21C \uC720\uD615 \uC815\uC758 \uB610\uB294 \uB0B4\uC7A5\uB41C \uAE30\uBCF8 \uB370\uC774\uD130 \uC720\uD615\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        cos-st-restricts.2.1 = cos-st-restricts.2.1: \uBAA9\uB85D \uC720\uD615 ''{0}''\uC758 \uC815\uC758\uC5D0\uC11C ''{1}'' \uC720\uD615\uC740 \uBAA9\uB85D \uC720\uD615\uC774\uAC70\uB098 \uBAA9\uB85D\uC744 \uD3EC\uD568\uD558\uB294 \uD569\uC9D1\uD569 \uC720\uD615\uC774\uBBC0\uB85C \uBD80\uC801\uD569\uD55C \uD56D\uBAA9 \uC720\uD615\uC785\uB2C8\uB2E4.
-        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: '{'item type definition'}' ''{0}''\uC758 '{'final'}' \uAD6C\uC131\uC694\uC18C\uC5D0 ''list''\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC744(\uB97C) \uBAA9\uB85D \uC720\uD615 ''{1}''\uC5D0 \uB300\uD55C \uD56D\uBAA9 \uC720\uD615\uC73C\uB85C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: '{'member type definitions'}' ''{0}''\uC758 '{'final'}' \uAD6C\uC131\uC694\uC18C\uC5D0 ''union''\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC744(\uB97C) \uD569\uC9D1\uD569 \uC720\uD615 ''{1}''\uC5D0 \uB300\uD55C \uBA64\uBC84 \uC720\uD615\uC73C\uB85C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        cos-valid-default.2.1 = cos-valid-default.2.1: ''{0}'' \uC694\uC18C\uC5D0 \uAC12 \uC81C\uC57D \uC870\uAC74\uC774 \uC788\uC73C\uBBC0\uB85C \uD63C\uD569 \uB610\uB294 \uB2E8\uC21C \uCF58\uD150\uCE20 \uBAA8\uB378\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: ''{0}'' \uC694\uC18C\uC5D0 '{'value constraint'}'\uAC00 \uC788\uC73C\uBA70 \uD574\uB2F9 \uC720\uD615 \uC815\uC758\uC5D0 \uD63C\uD569 '{'content type'}'\uC774 \uC788\uC73C\uBBC0\uB85C '{'content type'}'\uC758 \uC870\uAC01\uC744 \uBE44\uC6B8 \uC218 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        c-props-correct.2 = c-props-correct.2: keyref ''{0}''\uACFC(\uC640) \uD0A4 ''{1}''\uC5D0 \uB300\uD55C \uD544\uB4DC \uAE30\uC218\uB294 \uC11C\uB85C \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-        ct-props-correct.3 = ct-props-correct.3: \uBCF5\uD569 \uC720\uD615 ''{0}''\uC5D0 \uB300\uD55C \uC21C\uD658 \uC815\uC758\uAC00 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC740(\uB294) \uACE0\uC720\uD55C \uC720\uD615 \uACC4\uCE35\uC5D0 \uD3EC\uD568\uB41C \uAC83\uC774\uBA70 \uC774\uB294 \uC624\uB958\uC785\uB2C8\uB2E4.
-        ct-props-correct.4 = ct-props-correct.4: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB984 \uBC0F \uB300\uC0C1 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uB3D9\uC77C\uD55C \uC911\uBCF5 \uC18D\uC131 \uC0AC\uC6A9\uC774 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC911\uBCF5 \uC18D\uC131 \uC0AC\uC6A9\uC758 \uC774\uB984\uC740 ''{1}''\uC785\uB2C8\uB2E4.
-        ct-props-correct.5 = ct-props-correct.5: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uB450 \uAC1C\uC758 \uC18D\uC131 \uC120\uC5B8 ''{1}'' \uBC0F ''{2}''\uC5D0 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C \uC720\uD615\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-        derivation-ok-restriction.1 = derivation-ok-restriction.1: ''{0}'' \uC720\uD615\uC740 ''{1}'' \uC720\uD615\uC5D0\uC11C \uC81C\uD55C \uC0AC\uD56D\uC5D0 \uC758\uD574 \uD30C\uC0DD\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uD558\uC9C0\uB9CC ''{1}''\uC5D0\uB294 \uC81C\uD55C \uC0AC\uD56D\uC5D0 \uC758\uD55C \uD30C\uC0DD\uC744 \uAE08\uC9C0\uD558\uB294 '{'final'}' \uC18D\uC131\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uC720\uD615\uC758 \uC18D\uC131 \uC0AC\uC6A9 ''{1}''\uC5D0 \uB300\uD55C ''use'' \uAC12\uC774 ''{2}''\uC785\uB2C8\uB2E4. \uC774\uB294 \uAE30\uBCF8 \uC720\uD615\uC758 \uC77C\uCE58\uD558\uB294 \uC18D\uC131 \uC0AC\uC6A9\uC5D0 \uB300\uD55C \uAC12\uC778 ''required''\uC640 \uB2E4\uB985\uB2C8\uB2E4.
-        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uC720\uD615\uC758 \uC18D\uC131 \uC0AC\uC6A9 ''{1}''\uC5D0 \uB300\uD55C \uC720\uD615\uC774 ''{2}''\uC785\uB2C8\uB2E4. \uC774\uB294 \uAE30\uBCF8 \uC720\uD615\uC758 \uC77C\uCE58\uD558\uB294 \uC18D\uC131 \uC0AC\uC6A9\uC5D0 \uB300\uD55C \uC720\uD615\uC778 ''{3}''\uC5D0\uC11C \uC801\uD569\uD558\uAC8C \uD30C\uC0DD\uB41C \uAC83\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uC720\uD615\uC758 \uC18D\uC131 \uC0AC\uC6A9 ''{1}''\uC5D0\uB294 \uACE0\uC815\uB418\uC9C0 \uC54A\uC740 \uC720\uD6A8\uD55C \uAC12 \uC81C\uC57D \uC870\uAC74\uC774 \uC788\uC73C\uBA70, \uAE30\uBCF8 \uC720\uD615\uC758 \uC77C\uCE58\uD558\uB294 \uC18D\uC131 \uC0AC\uC6A9\uC5D0 \uB300\uD55C \uC720\uD6A8\uD55C \uAC12 \uC81C\uC57D \uC870\uAC74\uC740 \uACE0\uC815\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uC720\uD615\uC758 \uC18D\uC131 \uC0AC\uC6A9 ''{1}''\uC5D0 ''{2}'' \uAC12\uC73C\uB85C \uACE0\uC815\uB41C \uC720\uD6A8\uD55C \uAC12 \uC81C\uC57D \uC870\uAC74\uC774 \uC788\uC2B5\uB2C8\uB2E4. \uC774\uB294 \uAE30\uBCF8 \uC720\uD615\uC758 \uC77C\uCE58\uD558\uB294 \uC18D\uC131 \uC0AC\uC6A9\uC5D0 \uB300\uD55C \uACE0\uC815\uB41C \uC720\uD6A8\uD55C \uAC12 \uC81C\uC57D \uC870\uAC74\uC758 \uAC12\uC778 ''{3}''\uACFC(\uC640) \uB2E4\uB985\uB2C8\uB2E4.
-        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uC720\uD615\uC758 \uC18D\uC131 \uC0AC\uC6A9 ''{1}''\uACFC(\uC640) \uAE30\uBCF8 \uC720\uD615\uC758 \uC18D\uC131 \uC0AC\uC6A9\uC774 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC73C\uBA70 \uAE30\uBCF8 \uC720\uD615\uC5D0 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uC18D\uC131\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uC720\uD615\uC758 \uC18D\uC131 \uC0AC\uC6A9 ''{1}''\uACFC(\uC640) \uAE30\uBCF8 \uC720\uD615\uC758 \uC18D\uC131 \uC0AC\uC6A9\uC774 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC73C\uBA70 \uAE30\uBCF8 \uC720\uD615\uC758 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uAC00 \uC774 \uC18D\uC131 \uC0AC\uC6A9\uC758 ''{2}'' \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uB97C \uD5C8\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        derivation-ok-restriction.3 = derivation-ok-restriction.3: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uAE30\uBCF8 \uC720\uD615\uC758 \uC18D\uC131 \uC0AC\uC6A9 ''{1}''\uC5D0 \uB300\uD55C REQUIRED\uAC00 true\uC774\uC9C0\uB9CC \uD30C\uC0DD \uC720\uD615\uC5D0 \uC77C\uCE58\uD558\uB294 \uC18D\uC131 \uC0AC\uC6A9\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uD30C\uC0DD \uC720\uD615\uC5D0\uB294 \uC18D\uC131 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uAC00 \uC788\uC9C0\uB9CC \uAE30\uBCF8 \uC720\uD615\uC5D0\uB294 \uC5C6\uC2B5\uB2C8\uB2E4.
-        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uD30C\uC0DD \uC720\uD615\uC758 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uAC00 \uAE30\uBCF8 \uC720\uD615\uC758 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uBD80\uBD84 \uC9D1\uD569\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uD30C\uC0DD \uC720\uD615({1})\uC758 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC5D0 \uB300\uD55C \uD504\uB85C\uC138\uC2A4 \uCF58\uD150\uCE20\uAC00 \uAE30\uBCF8 \uC720\uD615({2})\uC758 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uBCF4\uB2E4 \uD558\uC704\uC785\uB2C8\uB2E4.
-        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uC720\uD615 ''{1}''\uC758 \uB2E8\uC21C \uCF58\uD150\uCE20 \uC720\uD615\uC774 \uAE30\uBCF8 \uC720\uD615 ''{2}''\uC758 \uB2E8\uC21C \uCF58\uD150\uCE20 \uC720\uD615\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uC720\uD615\uC758 \uCF58\uD150\uCE20 \uC720\uD615\uC774 \uBE44\uC5B4 \uC788\uC9C0\uB9CC \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 \uCF58\uD150\uCE20 \uC720\uD615\uC740 \uBE44\uC5B4 \uC788\uC9C0 \uC54A\uAC70\uB098 \uBE44\uC6B8 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uC720\uD615\uC758 \uCF58\uD150\uCE20 \uC720\uD615\uC740 \uD63C\uD569\uB418\uC5B4 \uC788\uC9C0\uB9CC \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 \uCF58\uD150\uCE20 \uC720\uD615\uC740 \uD63C\uD569\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC720\uD615 \uC870\uAC01\uC774 \uAE30\uBCF8 \uC720\uD615\uC758 \uC870\uAC01\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        enumeration-required-notation = enumeration-required-notation: {2} ''{1}''\uC5D0 \uC0AC\uC6A9\uB418\uB294 NOTATION \uC720\uD615 ''{0}''\uC5D0\uB294 \uC774 \uC720\uD615\uC5D0 \uC0AC\uC6A9\uB418\uB294 \uD45C\uAE30\uBC95 \uC694\uC18C\uB97C \uC9C0\uC815\uD558\uB294 \uBAA9\uB85D \uBA74 \uAC12\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        enumeration-valid-restriction = enumeration-valid-restriction: \uBAA9\uB85D \uAC12 ''{0}''\uC774(\uAC00) \uAE30\uBCF8 \uC720\uD615 {1}\uC758 \uAC12 \uACF5\uAC04\uC5D0 \uC5C6\uC2B5\uB2C8\uB2E4.
-        e-props-correct.2 = e-props-correct.2: ''{0}'' \uC694\uC18C\uC758 \uAC12 \uC81C\uC57D \uC870\uAC74 \uAC12 ''{1}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-        e-props-correct.4 = e-props-correct.4: ''{0}'' \uC694\uC18C\uC758 '{'type definition'}'\uC774 substitutionHead ''{1}''\uC758 '{'type definition'}'\uC5D0\uC11C \uC801\uD569\uD558\uAC8C \uD30C\uC0DD\uB41C \uAC83\uC774 \uC544\uB2C8\uAC70\uB098 ''{1}''\uC758 '{'substitution group exclusions'}' \uC18D\uC131\uC774 \uC774 \uD30C\uC0DD\uC744 \uD5C8\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-        e-props-correct.5 = e-props-correct.5: \uC694\uC18C\uC758 '{'type definition'}' \uB610\uB294 '{'type definition'}'\uC758 '{'content type'}'\uC774 ID\uC774\uAC70\uB098 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C \uAC83\uC774\uBBC0\uB85C '{'value constraint'}'\uB294 ''{0}'' \uC694\uC18C\uC5D0 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        e-props-correct.6 = e-props-correct.6: ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD55C \uC21C\uD658 \uB300\uCCB4 \uADF8\uB8F9\uC774 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        fractionDigits-valid-restriction = fractionDigits-valid-restriction: {2}\uC758 \uC815\uC758\uC5D0\uC11C ''fractionDigits'' \uBA74\uC5D0 \uB300\uD55C ''{0}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC774 \uAC12\uC740 \uC870\uC0C1 \uC720\uD615 \uC911 \uD558\uB098\uC5D0\uC11C ''{1}''(\uC73C)\uB85C \uC124\uC815\uB41C ''fractionDigits''\uC5D0 \uB300\uD55C \uAC12\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        fractionDigits-totalDigits = fractionDigits-totalDigits: {2}\uC758 \uC815\uC758\uC5D0\uC11C ''fractionDigits'' \uBA74\uC5D0 \uB300\uD55C ''{0}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC774 \uAC12\uC740 ''totalDigits''\uC5D0 \uB300\uD55C \uAC12\uC778 ''{1}''\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: {0} \uC720\uD615\uC758 \uACBD\uC6B0 length ''{1}''\uC758 \uAC12\uC740 minLength ''{2}''\uC758 \uAC12\uBCF4\uB2E4 \uC791\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: {0} \uC720\uD615\uC758 \uACBD\uC6B0 \uD604\uC7AC \uC81C\uD55C \uC0AC\uD56D\uC5D0 minLength \uBA74\uC774 \uC788\uACE0 \uD604\uC7AC \uC81C\uD55C \uC0AC\uD56D \uB610\uB294 \uAE30\uBCF8 \uC720\uD615\uC5D0 length \uBA74\uC774 \uC788\uC744 \uACBD\uC6B0 \uAE30\uBCF8 \uC720\uD615\uC5D0 minLength \uBA74\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: {0} \uC720\uD615\uC758 \uACBD\uC6B0 \uD604\uC7AC minLength ''{1}''\uC774(\uAC00) \uAE30\uBCF8 minLength ''{2}''\uACFC(\uC640) \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: {0} \uC720\uD615\uC758 \uACBD\uC6B0 length ''{1}''\uC758 \uAC12\uC740 maxLength ''{2}''\uC758 \uAC12\uBCF4\uB2E4 \uD06C\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: {0} \uC720\uD615\uC758 \uACBD\uC6B0 \uD604\uC7AC \uC81C\uD55C \uC0AC\uD56D\uC5D0 maxLength \uBA74\uC774 \uC788\uACE0 \uD604\uC7AC \uC81C\uD55C \uC0AC\uD56D \uB610\uB294 \uAE30\uBCF8 \uC720\uD615\uC5D0 length \uBA74\uC774 \uC788\uC744 \uACBD\uC6B0 \uAE30\uBCF8 \uC720\uD615\uC5D0 maxLength \uBA74\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: {0} \uC720\uD615\uC758 \uACBD\uC6B0 \uD604\uC7AC maxLength ''{1}''\uC740(\uB294) \uAE30\uBCF8 maxLength ''{2}''\uACFC(\uC640) \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        length-valid-restriction = length-valid-restriction: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. length = ''{0}''\uC778 \uAC12\uC740 \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 \uD574\uB2F9 \uAC12\uACFC \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. maxExclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 maxExclusive\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. maxExclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 maxInclusive\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. maxExclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 minInclusive\uBCF4\uB2E4 \uCEE4\uC57C \uD569\uB2C8\uB2E4.
-        maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. maxExclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 minExclusive\uBCF4\uB2E4 \uCEE4\uC57C \uD569\uB2C8\uB2E4.
-        maxInclusive-maxExclusive = maxInclusive-maxExclusive: maxInclusive\uC640 maxExclusive\uB294 \uB3D9\uC77C\uD55C \uB370\uC774\uD130 \uC720\uD615\uC5D0 \uB300\uD574 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4. {2}\uC5D0 maxInclusive = ''{0}''\uACFC(\uC640) maxExclusive = ''{1}''\uC774(\uAC00) \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. maxInclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 maxInclusive\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. maxInclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 maxExclusive\uBCF4\uB2E4 \uC791\uC544\uC57C \uD569\uB2C8\uB2E4.
-        maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. maxInclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 minInclusive\uBCF4\uB2E4 \uD06C\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. maxInclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 minExclusive\uBCF4\uB2E4 \uCEE4\uC57C \uD569\uB2C8\uB2E4.
-        maxLength-valid-restriction = maxLength-valid-restriction: {2}\uC758 \uC815\uC758\uC5D0\uC11C maxLength \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 \uAC12\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        mg-props-correct.2 = mg-props-correct.2: ''{0}'' \uADF8\uB8F9\uC5D0 \uB300\uD55C \uC21C\uD658 \uC815\uC758\uAC00 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC21C\uD658\uC801\uC73C\uB85C \uB4A4\uC5D0 \uC624\uB294 '{'term'}' \uC870\uAC01 \uAC12\uC774 '{'term'}'\uC774 \uADF8\uB8F9 \uC790\uC2E0\uC778 \uC870\uAC01\uC5D0 \uB3C4\uB2EC\uD569\uB2C8\uB2E4.
-        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: {2}\uC758 \uC815\uC758\uC5D0\uC11C minExclusive \uAC12 = ''{0}''\uC740(\uB294) maxExclusive \uAC12 = ''{1}''\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: {2}\uC758 \uC815\uC758\uC5D0\uC11C minExclusive \uAC12 = ''{0}''\uC740(\uB294) maxInclusive \uAC12 = ''{1}''\uBCF4\uB2E4 \uC791\uC544\uC57C \uD569\uB2C8\uB2E4.
-        minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. minExclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 minExclusive\uBCF4\uB2E4 \uD06C\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. minExclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 maxInclusive\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. minExclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 minInclusive\uBCF4\uB2E4 \uD06C\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. minExclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 maxExclusive\uBCF4\uB2E4 \uC791\uC544\uC57C \uD569\uB2C8\uB2E4.
-        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: {2}\uC758 \uC815\uC758\uC5D0\uC11C minInclusive \uAC12 = ''{0}''\uC740(\uB294) maxInclusive \uAC12 = ''{1}''\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: {2}\uC758 \uC815\uC758\uC5D0\uC11C minInclusive \uAC12 = ''{0}''\uC740(\uB294) maxExclusive \uAC12 = ''{1}''\uBCF4\uB2E4 \uC791\uC544\uC57C \uD569\uB2C8\uB2E4.
-        minInclusive-minExclusive = minInclusive-minExclusive: minInclusive\uC640 minExclusive\uB294 \uB3D9\uC77C\uD55C \uB370\uC774\uD130 \uC720\uD615\uC5D0 \uB300\uD574 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4. {2}\uC5D0 minInclusive = ''{0}''\uACFC(\uC640) minExclusive = ''{1}''\uC774(\uAC00) \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. minInclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 minInclusive\uBCF4\uB2E4 \uD06C\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. minInclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 maxInclusive\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. minInclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 minExclusive\uBCF4\uB2E4 \uCEE4\uC57C \uD569\uB2C8\uB2E4.
-        minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. minInclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 maxExclusive\uBCF4\uB2E4 \uC791\uC544\uC57C \uD569\uB2C8\uB2E4.
-        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: {2}\uC758 \uC815\uC758\uC5D0\uC11C minLength \uAC12 = ''{0}''\uC740(\uB294) maxLength \uAC12 = ''{1}''\uBCF4\uB2E4 \uC791\uC544\uC57C \uD569\uB2C8\uB2E4.
-        minLength-valid-restriction = minLength-valid-restriction: {2}\uC758 \uC815\uC758\uC5D0\uC11C minLength = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 \uAC12\uBCF4\uB2E4 \uD06C\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        no-xmlns = no-xmlns: \uC18D\uC131 \uC120\uC5B8\uC758 {name}\uC740 'xmlns'\uC640 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-        no-xsi = no-xsi: \uC18D\uC131 \uC120\uC5B8\uC758 '{'target namespace'}'\uB294 ''{0}''\uACFC(\uC640) \uC77C\uCE58\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-        p-props-correct.2.1 = p-props-correct.2.1: ''{0}''\uC758 \uC120\uC5B8\uC5D0\uC11C ''minOccurs'' \uAC12\uC774 ''{1}''\uC774\uC9C0\uB9CC \uC774 \uAC12\uC740 ''maxOccurs'' \uAC12 ''{2}''\uBCF4\uB2E4 \uD06C\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-        rcase-MapAndSum.1 = rcase-MapAndSum.1: \uC870\uAC01 \uAC04 \uC804\uCCB4 \uAE30\uB2A5 \uB9E4\uD551\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-        rcase-MapAndSum.2 = rcase-MapAndSum.2: \uADF8\uB8F9\uC758 \uBC1C\uC0DD \uBC94\uC704({0},{1})\uAC00 \uAE30\uBCF8 \uADF8\uB8F9\uC758 \uBC1C\uC0DD \uBC94\uC704({2},{3})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: \uC694\uC18C\uC5D0 \uB3D9\uC77C\uD558\uC9C0 \uC54A\uC740 \uC774\uB984 \uBC0F \uB300\uC0C1 \uB124\uC784\uC2A4\uD398\uC774\uC2A4(''{1}'' \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC758 ''{0}'' \uC694\uC18C \uBC0F ''{3}'' \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC758 ''{2}'' \uC694\uC18C)\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: '{'term'}'\uC774 \uC694\uC18C \uC120\uC5B8 ''{0}''\uC778 \uC870\uAC01\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC694\uC18C \uC120\uC5B8\uC758 '{'nillable'}'\uC774 true\uC774\uC9C0\uB9CC \uAE30\uBCF8 \uC720\uD615\uC758 \uD574\uB2F9 \uC870\uAC01\uC5D0 '{'nillable'}'\uC774 false\uC778 \uC694\uC18C \uC120\uC5B8\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: '{'term'}'\uC774 \uC694\uC18C \uC120\uC5B8 ''{0}''\uC778 \uC870\uAC01\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uBC18\uBCF5 \uBC94\uC704({1},{2})\uAC00 \uAE30\uBCF8 \uC720\uD615\uC5D0 \uC788\uB294 \uD574\uB2F9 \uC870\uAC01\uC758 \uBC94\uC704({3},{4})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: ''{0}'' \uC694\uC18C\uB294 \uACE0\uC815\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC9C0\uB9CC \uAE30\uBCF8 \uC720\uD615\uC758 \uD574\uB2F9 \uC694\uC18C\uB294 ''{1}'' \uAC12\uC73C\uB85C \uACE0\uC815\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: ''{0}'' \uC694\uC18C\uB294 ''{1}'' \uAC12\uC73C\uB85C \uACE0\uC815\uB418\uC5B4 \uC788\uC9C0\uB9CC \uAE30\uBCF8 \uC720\uD615\uC758 \uD574\uB2F9 \uC694\uC18C\uB294 ''{2}'' \uAC12\uC73C\uB85C \uACE0\uC815\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD55C ID \uC81C\uC57D \uC870\uAC74\uC740 \uAE30\uBCF8 \uC720\uD615\uC758 ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD55C \uBD80\uBD84 \uC9D1\uD569\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD574 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uB294 \uB300\uCCB4\uB294 \uAE30\uBCF8 \uC720\uD615\uC758 \uD574\uB2F9 \uB300\uCCB4\uC5D0 \uB300\uD55C \uB300\uC9D1\uD569\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: ''{0}'' \uC694\uC18C\uC758 \uC720\uD615 ''{1}''\uC740(\uB294) \uAE30\uBCF8 \uC694\uC18C\uC758 \uC720\uD615 ''{2}''\uC5D0\uC11C \uD30C\uC0DD\uB41C \uAC83\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        rcase-NSCompat.1 = rcase-NSCompat.1: ''{0}'' \uC694\uC18C\uC5D0\uB294 \uAE30\uBCF8 \uC720\uD615\uC758 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC5D0\uC11C \uD5C8\uC6A9\uD558\uC9C0 \uC54A\uB294 ''{1}'' \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-        rcase-NSCompat.2 = rcase-NSCompat.2: '{'term'}'\uC774 \uC694\uC18C \uC120\uC5B8 ''{0}''\uC778 \uC870\uAC01\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uBC18\uBCF5 \uBC94\uC704({1},{2})\uAC00 \uAE30\uBCF8 \uC720\uD615\uC5D0 \uC788\uB294 \uD574\uB2F9 \uC870\uAC01\uC758 \uBC94\uC704({3},{4})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: \uC870\uAC01 \uAC04 \uC804\uCCB4 \uAE30\uB2A5 \uB9E4\uD551\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: \uADF8\uB8F9\uC758 \uBC1C\uC0DD \uBC94\uC704({0},{1})\uAC00 \uAE30\uBCF8 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC758 \uBC94\uC704({2},{3})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        rcase-NSSubset.1 = rcase-NSSubset.1: \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uAC00 \uAE30\uBCF8 \uC720\uD615\uC758 \uD574\uB2F9 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC5D0 \uB300\uD55C \uBD80\uBD84 \uC9D1\uD569\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        rcase-NSSubset.2 = rcase-NSSubset.2: \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC758 \uBC1C\uC0DD \uBC94\uC704({0},{1})\uAC00 \uAE30\uBCF8 \uC720\uD615\uC758 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uBC94\uC704({2},{3})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        rcase-NSSubset.3 = rcase-NSSubset.3: \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC758 \uD504\uB85C\uC138\uC2A4 \uCF58\uD150\uCE20 ''{0}''\uC774(\uAC00) \uAE30\uBCF8 \uC720\uD615\uC758 \uCF58\uD150\uCE20 ''{1}''\uBCF4\uB2E4 \uD558\uC704\uC785\uB2C8\uB2E4.
-        rcase-Recurse.1 = rcase-Recurse.1: \uADF8\uB8F9\uC758 \uBC1C\uC0DD \uBC94\uC704({0},{1})\uAC00 \uAE30\uBCF8 \uADF8\uB8F9\uC758 \uBC1C\uC0DD \uBC94\uC704({2},{3})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        rcase-Recurse.2 = rcase-Recurse.2: \uC870\uAC01 \uAC04 \uC804\uCCB4 \uAE30\uB2A5 \uB9E4\uD551\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-        rcase-RecurseLax.1 = rcase-RecurseLax.1: \uADF8\uB8F9\uC758 \uBC1C\uC0DD \uBC94\uC704({0},{1})\uAC00 \uAE30\uBCF8 \uADF8\uB8F9\uC758 \uBC1C\uC0DD \uBC94\uC704({2},{3})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        rcase-RecurseLax.2 = rcase-RecurseLax.2: \uC870\uAC01 \uAC04 \uC804\uCCB4 \uAE30\uB2A5 \uB9E4\uD551\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: \uADF8\uB8F9\uC758 \uBC1C\uC0DD \uBC94\uC704({0},{1})\uAC00 \uAE30\uBCF8 \uADF8\uB8F9\uC758 \uBC1C\uC0DD \uBC94\uC704({2},{3})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: \uC870\uAC01 \uAC04 \uC804\uCCB4 \uAE30\uB2A5 \uB9E4\uD551\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
+        ag-props-correct.2 = ag-props-correct.2: 속성 그룹 ''{0}''에 대해 오류가 발생했습니다. 이름 및 대상 네임스페이스가 동일한 중복 속성 사용이 지정되었습니다. 중복 속성 사용의 이름은 ''{1}''입니다.
+        ag-props-correct.3 = ag-props-correct.3: 속성 그룹 ''{0}''에 대해 오류가 발생했습니다. 두 개의 속성 선언 ''{1}'' 및 ''{2}''에 ID에서 파생된 유형이 있습니다.
+        a-props-correct.2 = a-props-correct.2: ''{0}'' 속성의 값 제약 조건 값 ''{1}''이(가) 부적합합니다.
+        a-props-correct.3 = a-props-correct.3: 속성의 '{'type definition'}'이 ID이거나 ID에서 파생된 것이므로 ''{0}'' 속성은 ''fixed'' 또는 ''default''를 사용할 수 없습니다.
+        au-props-correct.2 = au-props-correct.2: ''{0}''의 속성 선언에서 고정된 값 ''{1}''이(가) 지정되었습니다. 따라서 ''{0}''을(를) 참조하는 속성 사용에도 '{'value constraint'}'가 있을 경우 고정되어야 하며 값은 ''{1}''이어야 합니다.
+        cos-all-limited.1.2 = cos-all-limited.1.2: 'all' 모델 그룹이 '{'min occurs'}' = '{'max occurs'}' = 1인 조각에 나타나야 하며 해당 조각은 복합 유형 정의의 '{'content type'}'을 구성하는 쌍의 일부여야 합니다.
+        cos-all-limited.2 = cos-all-limited.2: ''all'' 모델 그룹에 포함된 요소의 '{'max occurs'}'는 0 또는 1이어야 합니다. ''{1}'' 요소에 대한 ''{0}'' 값이 부적합합니다.
+        cos-applicable-facets = cos-applicable-facets: {1} 유형에서는 ''{0}'' 면이 허용되지 않습니다.
+        cos-ct-extends.1.1 = cos-ct-extends.1.1: ''{0}'' 유형은 ''{1}'' 유형에서 확장에 의해 파생되었지만 ''{1}''의 ''final'' 속성은 확장에 의한 파생을 금지합니다.
+        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: 파생된 유형과 해당 기본 유형의 콘텐츠 유형은 모두 혼합되거나 모두 요소 전용이어야 합니다. ''{0}'' 유형은 요소 전용이지만 해당 기본 유형은 요소 전용이 아닙니다.
+        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: 파생된 유형과 해당 기본 유형의 콘텐츠 유형은 모두 혼합되거나 모두 요소 전용이어야 합니다. ''{0}'' 유형은 혼합되어 있지만 해당 기본 유형은 혼합되어 있지 않습니다.
+        cos-element-consistent = cos-element-consistent: ''{0}'' 유형에 대해 오류가 발생했습니다. 이름이 ''{1}''이며 유형이 다른 여러 요소가 모델 그룹에 나타납니다.
+        cos-list-of-atomic = cos-list-of-atomic: 목록 유형 ''{0}''의 정의에서 ''{1}'' 유형은 기본 단위가 아니므로 부적합한 목록 요소 유형입니다. ''{1}''이(가) 목록 유형이거나 목록을 포함하는 합집합 유형입니다.
+        cos-nonambig = cos-nonambig: {0} 및 {1}(또는 해당 대체 그룹의 요소)이(가) "Unique Particle Attribution"을 위반합니다. 이 스키마에 대한 검증 중 이러한 두 조각이 모호해질 수 있습니다.
+        cos-particle-restrict.a = cos-particle-restrict.a: 파생된 조각이 비어 있으므로 기본 조각을 비울 수 없습니다.
+        cos-particle-restrict.b = cos-particle-restrict.b: 기본 조각은 비어 있지만 파생된 조각은 비어 있지 않습니다.
+        cos-particle-restrict.2 = cos-particle-restrict.2: 금지된 조각 제한 사항: ''{0}''.
+        cos-st-restricts.1.1 = cos-st-restricts.1.1: ''{1}'' 유형이 기본 단위이므로 해당 '{'base type definition'}' ''{0}''은(는) 기본 단순 유형 정의 또는 내장된 기본 데이터 유형이어야 합니다.
+        cos-st-restricts.2.1 = cos-st-restricts.2.1: 목록 유형 ''{0}''의 정의에서 ''{1}'' 유형은 목록 유형이거나 목록을 포함하는 합집합 유형이므로 부적합한 항목 유형입니다.
+        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: '{'item type definition'}' ''{0}''의 '{'final'}' 구성요소에 ''list''가 포함되어 있습니다. 따라서 ''{0}''을(를) 목록 유형 ''{1}''에 대한 항목 유형으로 사용할 수 없습니다.
+        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: '{'member type definitions'}' ''{0}''의 '{'final'}' 구성요소에 ''union''이 포함되어 있습니다. 따라서 ''{0}''을(를) 합집합 유형 ''{1}''에 대한 멤버 유형으로 사용할 수 없습니다.
+        cos-valid-default.2.1 = cos-valid-default.2.1: ''{0}'' 요소에 값 제약 조건이 있으므로 혼합 또는 단순 콘텐츠 모델이 포함되어야 합니다.
+        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: ''{0}'' 요소에 '{'value constraint'}'가 있으며 해당 유형 정의에 혼합 '{'content type'}'이 있으므로 '{'content type'}'의 조각을 비울 수 있어야 합니다.
+        c-props-correct.2 = c-props-correct.2: keyref ''{0}''과(와) 키 ''{1}''에 대한 필드 기수는 서로 일치해야 합니다.
+        ct-props-correct.3 = ct-props-correct.3: 복합 유형 ''{0}''에 대한 순환 정의가 감지되었습니다. 따라서 ''{0}''은(는) 고유한 유형 계층에 포함된 것이며 이는 오류입니다.
+        ct-props-correct.4 = ct-props-correct.4: ''{0}'' 유형에 대해 오류가 발생했습니다. 이름 및 대상 네임스페이스가 동일한 중복 속성 사용이 지정되었습니다. 중복 속성 사용의 이름은 ''{1}''입니다.
+        ct-props-correct.5 = ct-props-correct.5: ''{0}'' 유형에 대해 오류가 발생했습니다. 두 개의 속성 선언 ''{1}'' 및 ''{2}''에 ID에서 파생된 유형이 있습니다.
+        derivation-ok-restriction.1 = derivation-ok-restriction.1: ''{0}'' 유형은 ''{1}'' 유형에서 제한 사항에 의해 파생되었습니다. 하지만 ''{1}''에는 제한 사항에 의한 파생을 금지하는 '{'final'}' 속성이 있습니다.
+        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: ''{0}'' 유형에 대해 오류가 발생했습니다. 이 유형의 속성 사용 ''{1}''에 대한 ''use'' 값이 ''{2}''입니다. 이는 기본 유형의 일치하는 속성 사용에 대한 값인 ''required''와 다릅니다.
+        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: ''{0}'' 유형에 대해 오류가 발생했습니다. 이 유형의 속성 사용 ''{1}''에 대한 유형이 ''{2}''입니다. 이는 기본 유형의 일치하는 속성 사용에 대한 유형인 ''{3}''에서 적합하게 파생된 것이 아닙니다.
+        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: ''{0}'' 유형에 대해 오류가 발생했습니다. 이 유형의 속성 사용 ''{1}''에는 고정되지 않은 유효한 값 제약 조건이 있으며, 기본 유형의 일치하는 속성 사용에 대한 유효한 값 제약 조건은 고정되어 있습니다.
+        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: ''{0}'' 유형에 대해 오류가 발생했습니다. 이 유형의 속성 사용 ''{1}''에 ''{2}'' 값으로 고정된 유효한 값 제약 조건이 있습니다. 이는 기본 유형의 일치하는 속성 사용에 대한 고정된 유효한 값 제약 조건의 값인 ''{3}''과(와) 다릅니다.
+        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: ''{0}'' 유형에 대해 오류가 발생했습니다. 이 유형의 속성 사용 ''{1}''과(와) 기본 유형의 속성 사용이 일치하지 않으며 기본 유형에 와일드 카드 문자 속성이 없습니다.
+        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: ''{0}'' 유형에 대해 오류가 발생했습니다. 이 유형의 속성 사용 ''{1}''과(와) 기본 유형의 속성 사용이 일치하지 않으며 기본 유형의 와일드 카드 문자가 이 속성 사용의 ''{2}'' 네임스페이스를 허용하지 않습니다.
+        derivation-ok-restriction.3 = derivation-ok-restriction.3: ''{0}'' 유형에 대해 오류가 발생했습니다. 기본 유형의 속성 사용 ''{1}''에 대한 REQUIRED가 true이지만 파생 유형에 일치하는 속성 사용이 없습니다.
+        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: ''{0}'' 유형에 대해 오류가 발생했습니다. 파생 유형에는 속성 와일드 카드 문자가 있지만 기본 유형에는 없습니다.
+        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: ''{0}'' 유형에 대해 오류가 발생했습니다. 파생 유형의 와일드 카드 문자가 기본 유형의 와일드 카드 문자에 대해 적합한 와일드 카드 문자 부분 집합이 아닙니다.
+        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: ''{0}'' 유형에 대해 오류가 발생했습니다. 파생 유형({1})의 와일드 카드 문자에 대한 프로세스 콘텐츠가 기본 유형({2})의 와일드 카드 문자보다 하위입니다.
+        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: ''{0}'' 유형에 대해 오류가 발생했습니다. 이 유형 ''{1}''의 단순 콘텐츠 유형이 기본 유형 ''{2}''의 단순 콘텐츠 유형에 대해 적합한 제한 사항이 아닙니다.
+        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: ''{0}'' 유형에 대해 오류가 발생했습니다. 이 유형의 콘텐츠 유형이 비어 있지만 기본 유형 ''{1}''의 콘텐츠 유형은 비어 있지 않거나 비울 수 없습니다.
+        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: ''{0}'' 유형에 대해 오류가 발생했습니다. 이 유형의 콘텐츠 유형은 혼합되어 있지만 기본 유형 ''{1}''의 콘텐츠 유형은 혼합되어 있지 않습니다.
+        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: ''{0}'' 유형에 대해 오류가 발생했습니다. 유형 조각이 기본 유형의 조각에 대해 적합한 제한 사항이 아닙니다.
+        enumeration-required-notation = enumeration-required-notation: {2} ''{1}''에 사용되는 NOTATION 유형 ''{0}''에는 이 유형에 사용되는 표기법 요소를 지정하는 목록 면 값이 있어야 합니다.
+        enumeration-valid-restriction = enumeration-valid-restriction: 목록 값 ''{0}''이(가) 기본 유형 {1}의 값 공간에 없습니다.
+        e-props-correct.2 = e-props-correct.2: ''{0}'' 요소의 값 제약 조건 값 ''{1}''이(가) 부적합합니다.
+        e-props-correct.4 = e-props-correct.4: ''{0}'' 요소의 '{'type definition'}'이 substitutionHead ''{1}''의 '{'type definition'}'에서 적합하게 파생된 것이 아니거나 ''{1}''의 '{'substitution group exclusions'}' 속성이 이 파생을 허용하지 않습니다.
+        e-props-correct.5 = e-props-correct.5: 요소의 '{'type definition'}' 또는 '{'type definition'}'의 '{'content type'}'이 ID이거나 ID에서 파생된 것이므로 '{'value constraint'}'는 ''{0}'' 요소에 없어야 합니다.
+        e-props-correct.6 = e-props-correct.6: ''{0}'' 요소에 대한 순환 대체 그룹이 감지되었습니다.
+        fractionDigits-valid-restriction = fractionDigits-valid-restriction: {2}의 정의에서 ''fractionDigits'' 면에 대한 ''{0}'' 값이 부적합합니다. 이 값은 조상 유형 중 하나에서 ''{1}''(으)로 설정된 ''fractionDigits''에 대한 값보다 작거나 같아야 합니다.
+        fractionDigits-totalDigits = fractionDigits-totalDigits: {2}의 정의에서 ''fractionDigits'' 면에 대한 ''{0}'' 값이 부적합합니다. 이 값은 ''totalDigits''에 대한 값인 ''{1}''보다 작거나 같아야 합니다.
+        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: {0} 유형의 경우 length ''{1}''의 값은 minLength ''{2}''의 값보다 작을 수 없습니다.
+        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: {0} 유형의 경우 현재 제한 사항에 minLength 면이 있고 현재 제한 사항 또는 기본 유형에 length 면이 있을 경우 기본 유형에 minLength 면이 있어야 합니다.
+        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: {0} 유형의 경우 현재 minLength ''{1}''이(가) 기본 minLength ''{2}''과(와) 같아야 합니다.
+        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: {0} 유형의 경우 length ''{1}''의 값은 maxLength ''{2}''의 값보다 크지 않아야 합니다.
+        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: {0} 유형의 경우 현재 제한 사항에 maxLength 면이 있고 현재 제한 사항 또는 기본 유형에 length 면이 있을 경우 기본 유형에 maxLength 면이 있어야 합니다.
+        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: {0} 유형의 경우 현재 maxLength ''{1}''은(는) 기본 maxLength ''{2}''과(와) 같아야 합니다.
+        length-valid-restriction = length-valid-restriction: ''{2}'' 유형에 대해 오류가 발생했습니다. length = ''{0}''인 값은 기본 유형 ''{1}''의 해당 값과 같아야 합니다.
+        maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: ''{2}'' 유형에 대해 오류가 발생했습니다. maxExclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 maxExclusive보다 작거나 같아야 합니다.
+        maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: ''{2}'' 유형에 대해 오류가 발생했습니다. maxExclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 maxInclusive보다 작거나 같아야 합니다.
+        maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: ''{2}'' 유형에 대해 오류가 발생했습니다. maxExclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 minInclusive보다 커야 합니다.
+        maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4: ''{2}'' 유형에 대해 오류가 발생했습니다. maxExclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 minExclusive보다 커야 합니다.
+        maxInclusive-maxExclusive = maxInclusive-maxExclusive: maxInclusive와 maxExclusive는 동일한 데이터 유형에 대해 지정되지 않아야 합니다. {2}에 maxInclusive = ''{0}''과(와) maxExclusive = ''{1}''이(가) 지정되었습니다.
+        maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: ''{2}'' 유형에 대해 오류가 발생했습니다. maxInclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 maxInclusive보다 작거나 같아야 합니다.
+        maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: ''{2}'' 유형에 대해 오류가 발생했습니다. maxInclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 maxExclusive보다 작아야 합니다.
+        maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: ''{2}'' 유형에 대해 오류가 발생했습니다. maxInclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 minInclusive보다 크거나 같아야 합니다.
+        maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: ''{2}'' 유형에 대해 오류가 발생했습니다. maxInclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 minExclusive보다 커야 합니다.
+        maxLength-valid-restriction = maxLength-valid-restriction: {2}의 정의에서 maxLength 값 = ''{0}''은(는) 기본 유형 ''{1}''의 값보다 작거나 같아야 합니다.
+        mg-props-correct.2 = mg-props-correct.2: ''{0}'' 그룹에 대한 순환 정의가 감지되었습니다. 순환적으로 뒤에 오는 '{'term'}' 조각 값이 '{'term'}'이 그룹 자신인 조각에 도달합니다.
+        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: {2}의 정의에서 minExclusive 값 = ''{0}''은(는) maxExclusive 값 = ''{1}''보다 작거나 같아야 합니다.
+        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: {2}의 정의에서 minExclusive 값 = ''{0}''은(는) maxInclusive 값 = ''{1}''보다 작아야 합니다.
+        minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: ''{2}'' 유형에 대해 오류가 발생했습니다. minExclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 minExclusive보다 크거나 같아야 합니다.
+        minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2: ''{2}'' 유형에 대해 오류가 발생했습니다. minExclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 maxInclusive보다 작거나 같아야 합니다.
+        minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3: ''{2}'' 유형에 대해 오류가 발생했습니다. minExclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 minInclusive보다 크거나 같아야 합니다.
+        minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: ''{2}'' 유형에 대해 오류가 발생했습니다. minExclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 maxExclusive보다 작아야 합니다.
+        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: {2}의 정의에서 minInclusive 값 = ''{0}''은(는) maxInclusive 값 = ''{1}''보다 작거나 같아야 합니다.
+        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: {2}의 정의에서 minInclusive 값 = ''{0}''은(는) maxExclusive 값 = ''{1}''보다 작아야 합니다.
+        minInclusive-minExclusive = minInclusive-minExclusive: minInclusive와 minExclusive는 동일한 데이터 유형에 대해 지정되지 않아야 합니다. {2}에 minInclusive = ''{0}''과(와) minExclusive = ''{1}''이(가) 지정되었습니다.
+        minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: ''{2}'' 유형에 대해 오류가 발생했습니다. minInclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 minInclusive보다 크거나 같아야 합니다.
+        minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: ''{2}'' 유형에 대해 오류가 발생했습니다. minInclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 maxInclusive보다 작거나 같아야 합니다.
+        minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: ''{2}'' 유형에 대해 오류가 발생했습니다. minInclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 minExclusive보다 커야 합니다.
+        minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: ''{2}'' 유형에 대해 오류가 발생했습니다. minInclusive 값 = ''{0}''은(는) 기본 유형 ''{1}''의 maxExclusive보다 작아야 합니다.
+        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: {2}의 정의에서 minLength 값 = ''{0}''은(는) maxLength 값 = ''{1}''보다 작아야 합니다.
+        minLength-valid-restriction = minLength-valid-restriction: {2}의 정의에서 minLength = ''{0}''은(는) 기본 유형 ''{1}''의 값보다 크거나 같아야 합니다.
+        no-xmlns = no-xmlns: 속성 선언의 {name}은 'xmlns'와 일치하지 않아야 합니다.
+        no-xsi = no-xsi: 속성 선언의 '{'target namespace'}'는 ''{0}''과(와) 일치하지 않아야 합니다.
+        p-props-correct.2.1 = p-props-correct.2.1: ''{0}''의 선언에서 ''minOccurs'' 값이 ''{1}''이지만 이 값은 ''maxOccurs'' 값 ''{2}''보다 크지 않아야 합니다.
+        rcase-MapAndSum.1 = rcase-MapAndSum.1: 조각 간 전체 기능 매핑이 없습니다.
+        rcase-MapAndSum.2 = rcase-MapAndSum.2: 그룹의 발생 범위({0},{1})가 기본 그룹의 발생 범위({2},{3})에 대해 적합한 제한 사항이 아닙니다.
+        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: 요소에 동일하지 않은 이름 및 대상 네임스페이스(''{1}'' 네임스페이스의 ''{0}'' 요소 및 ''{3}'' 네임스페이스의 ''{2}'' 요소)가 있습니다.
+        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: '{'term'}'이 요소 선언 ''{0}''인 조각에 대해 오류가 발생했습니다. 요소 선언의 '{'nillable'}'이 true이지만 기본 유형의 해당 조각에 '{'nillable'}'이 false인 요소 선언이 있습니다.
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: '{'term'}'이 요소 선언 ''{0}''인 조각에 대해 오류가 발생했습니다. 반복 범위({1},{2})가 기본 유형에 있는 해당 조각의 범위({3},{4})에 대해 적합한 제한 사항이 아닙니다.
+        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: ''{0}'' 요소는 고정되어 있지 않지만 기본 유형의 해당 요소는 ''{1}'' 값으로 고정되어 있습니다.
+        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: ''{0}'' 요소는 ''{1}'' 값으로 고정되어 있지만 기본 유형의 해당 요소는 ''{2}'' 값으로 고정되어 있습니다.
+        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: ''{0}'' 요소에 대한 ID 제약 조건은 기본 유형의 ID 제약 조건에 대한 부분 집합이 아닙니다.
+        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: ''{0}'' 요소에 대해 허용되지 않는 대체는 기본 유형의 해당 대체에 대한 대집합이 아닙니다.
+        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: ''{0}'' 요소의 유형 ''{1}''은(는) 기본 요소의 유형 ''{2}''에서 파생된 것이 아닙니다.
+        rcase-NSCompat.1 = rcase-NSCompat.1: ''{0}'' 요소에는 기본 유형의 와일드 카드 문자에서 허용하지 않는 ''{1}'' 네임스페이스가 있습니다.
+        rcase-NSCompat.2 = rcase-NSCompat.2: '{'term'}'이 요소 선언 ''{0}''인 조각에 대해 오류가 발생했습니다. 반복 범위({1},{2})가 기본 유형에 있는 해당 조각의 범위({3},{4})에 대해 적합한 제한 사항이 아닙니다.
+        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: 조각 간 전체 기능 매핑이 없습니다.
+        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: 그룹의 발생 범위({0},{1})가 기본 와일드 카드 문자의 범위({2},{3})에 대해 적합한 제한 사항이 아닙니다.
+        rcase-NSSubset.1 = rcase-NSSubset.1: 와일드 카드 문자가 기본 유형의 해당 와일드 카드 문자에 대한 부분 집합이 아닙니다.
+        rcase-NSSubset.2 = rcase-NSSubset.2: 와일드 카드 문자의 발생 범위({0},{1})가 기본 유형의 와일드 카드 문자 범위({2},{3})에 대해 적합한 제한 사항이 아닙니다.
+        rcase-NSSubset.3 = rcase-NSSubset.3: 와일드 카드 문자의 프로세스 콘텐츠 ''{0}''이(가) 기본 유형의 콘텐츠 ''{1}''보다 하위입니다.
+        rcase-Recurse.1 = rcase-Recurse.1: 그룹의 발생 범위({0},{1})가 기본 그룹의 발생 범위({2},{3})에 대해 적합한 제한 사항이 아닙니다.
+        rcase-Recurse.2 = rcase-Recurse.2: 조각 간 전체 기능 매핑이 없습니다.
+        rcase-RecurseLax.1 = rcase-RecurseLax.1: 그룹의 발생 범위({0},{1})가 기본 그룹의 발생 범위({2},{3})에 대해 적합한 제한 사항이 아닙니다.
+        rcase-RecurseLax.2 = rcase-RecurseLax.2: 조각 간 전체 기능 매핑이 없습니다.
+        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: 그룹의 발생 범위({0},{1})가 기본 그룹의 발생 범위({2},{3})에 대해 적합한 제한 사항이 아닙니다.
+        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: 조각 간 전체 기능 매핑이 없습니다.
 #        We're using sch-props-correct.2 instead of the old src-redefine.1
 #        src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
-        sch-props-correct.2 = sch-props-correct.2: \uC2A4\uD0A4\uB9C8\uC5D0\uB294 \uB3D9\uC77C\uD55C \uC774\uB984\uC744 \uAC00\uC9C4 \uB450 \uAC1C\uC758 \uC804\uC5ED \uAD6C\uC131\uC694\uC18C\uAC00 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC774 \uC2A4\uD0A4\uB9C8\uC5D0\uB294 \uB450 \uAC1C\uC758 ''{0}''\uC774(\uAC00) \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-        st-props-correct.2 = st-props-correct.2: \uB2E8\uC21C \uC720\uD615 ''{0}''\uC5D0 \uB300\uD55C \uC21C\uD658 \uC815\uC758\uAC00 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC740(\uB294) \uACE0\uC720\uD55C \uC720\uD615 \uACC4\uCE35\uC5D0 \uD3EC\uD568\uB41C \uAC83\uC774\uBA70 \uC774\uB294 \uC624\uB958\uC785\uB2C8\uB2E4.
-        st-props-correct.3 = st-props-correct.3: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. '{'base type definition'}' ''{1}''\uC758 '{'final'}' \uAC12\uC740 \uC81C\uD55C \uC0AC\uD56D\uC5D0 \uC758\uD55C \uD30C\uC0DD\uC744 \uAE08\uC9C0\uD569\uB2C8\uB2E4.
-        totalDigits-valid-restriction = totalDigits-valid-restriction: {2}\uC758 \uC815\uC758\uC5D0\uC11C ''totalDigits'' \uBA74\uC5D0 \uB300\uD55C ''{0}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC774 \uAC12\uC740 \uC870\uC0C1 \uC720\uD615 \uC911 \uD558\uB098\uC5D0\uC11C ''{1}''(\uC73C)\uB85C \uC124\uC815\uB41C ''totalDigits''\uC5D0 \uB300\uD55C \uAC12\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: {0}\uC758 \uC815\uC758\uC5D0\uC11C ''whitespace'' \uBA74\uC5D0 \uB300\uD55C ''{1}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. ''whitespace''\uC5D0 \uB300\uD55C \uAC12\uC774 \uC870\uC0C1 \uC720\uD615 \uC911 \uD558\uB098\uC5D0\uC11C ''collapse''\uB85C \uC124\uC815\uB418\uC5C8\uAE30 \uB54C\uBB38\uC785\uB2C8\uB2E4.
-        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: {0}\uC758 \uC815\uC758\uC5D0\uC11C ''whitespace'' \uBA74\uC5D0 \uB300\uD55C ''preserve'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. ''whitespace''\uC5D0 \uB300\uD55C \uAC12\uC774 \uC870\uC0C1 \uC720\uD615 \uC911 \uD558\uB098\uC5D0\uC11C ''replace''\uB85C \uC124\uC815\uB418\uC5C8\uAE30 \uB54C\uBB38\uC785\uB2C8\uB2E4.
+        sch-props-correct.2 = sch-props-correct.2: 스키마에는 동일한 이름을 가진 두 개의 전역 구성요소가 포함될 수 없습니다. 이 스키마에는 두 개의 ''{0}''이(가) 포함되어 있습니다.
+        st-props-correct.2 = st-props-correct.2: 단순 유형 ''{0}''에 대한 순환 정의가 감지되었습니다. 따라서 ''{0}''은(는) 고유한 유형 계층에 포함된 것이며 이는 오류입니다.
+        st-props-correct.3 = st-props-correct.3: ''{0}'' 유형에 대해 오류가 발생했습니다. '{'base type definition'}' ''{1}''의 '{'final'}' 값은 제한 사항에 의한 파생을 금지합니다.
+        totalDigits-valid-restriction = totalDigits-valid-restriction: {2}의 정의에서 ''totalDigits'' 면에 대한 ''{0}'' 값이 부적합합니다. 이 값은 조상 유형 중 하나에서 ''{1}''(으)로 설정된 ''totalDigits''에 대한 값보다 작거나 같아야 합니다.
+        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: {0}의 정의에서 ''whitespace'' 면에 대한 ''{1}'' 값이 부적합합니다. ''whitespace''에 대한 값이 조상 유형 중 하나에서 ''collapse''로 설정되었기 때문입니다.
+        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: {0}의 정의에서 ''whitespace'' 면에 대한 ''preserve'' 값이 부적합합니다. ''whitespace''에 대한 값이 조상 유형 중 하나에서 ''replace''로 설정되었기 때문입니다.
 
 #schema for Schemas
 
-        s4s-att-invalid-value = s4s-att-invalid-value: ''{0}'' \uC694\uC18C\uC758 ''{1}''\uC5D0 \uB300\uD55C \uC18D\uC131\uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uAE30\uB85D\uB41C \uC6D0\uC778: {2}
-        s4s-att-must-appear = s4s-att-must-appear: ''{1}'' \uC18D\uC131\uC740 ''{0}'' \uC694\uC18C\uC5D0 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-        s4s-att-not-allowed = s4s-att-not-allowed: ''{1}'' \uC18D\uC131\uC740 ''{0}'' \uC694\uC18C\uC5D0 \uB098\uD0C0\uB0A0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        s4s-elt-invalid = s4s-elt-invalid: ''{0}'' \uC694\uC18C\uB294 \uC2A4\uD0A4\uB9C8 \uBB38\uC11C\uC5D0\uC11C \uC801\uD569\uD55C \uC694\uC18C\uAC00 \uC544\uB2D9\uB2C8\uB2E4.
-        s4s-elt-must-match.1 = s4s-elt-must-match.1: ''{0}''\uC758 \uCF58\uD150\uCE20\uB294 {1}\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4. {2}\uC5D0\uC11C \uC2DC\uC791\uB41C \uBB38\uC81C\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        s4s-elt-must-match.2 = s4s-elt-must-match.2: ''{0}''\uC758 \uCF58\uD150\uCE20\uB294 {1}\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4. \uBC1C\uACAC\uB41C \uC694\uC18C\uAC00 \uBD80\uC871\uD569\uB2C8\uB2E4.
+        s4s-att-invalid-value = s4s-att-invalid-value: ''{0}'' 요소의 ''{1}''에 대한 속성값이 부적합합니다. 기록된 원인: {2}
+        s4s-att-must-appear = s4s-att-must-appear: ''{1}'' 속성은 ''{0}'' 요소에 나타나야 합니다.
+        s4s-att-not-allowed = s4s-att-not-allowed: ''{1}'' 속성은 ''{0}'' 요소에 나타날 수 없습니다.
+        s4s-elt-invalid = s4s-elt-invalid: ''{0}'' 요소는 스키마 문서에서 적합한 요소가 아닙니다.
+        s4s-elt-must-match.1 = s4s-elt-must-match.1: ''{0}''의 콘텐츠는 {1}과(와) 일치해야 합니다. {2}에서 시작된 문제가 발견되었습니다.
+        s4s-elt-must-match.2 = s4s-elt-must-match.2: ''{0}''의 콘텐츠는 {1}과(와) 일치해야 합니다. 발견된 요소가 부족합니다.
         # the "invalid-content" messages provide less information than the "must-match" counterparts above. They're used for complex types when providing a "match" would be an information dump
-        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: ''{0}''\uC758 \uCF58\uD150\uCE20\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. ''{1}'' \uC694\uC18C\uAC00 \uBD80\uC801\uD569\uD558\uAC70\uB098 \uB108\uBB34 \uC790\uC8FC \uBC1C\uC0DD\uD558\uAC70\uB098 \uD574\uB2F9 \uC694\uC18C\uC758 \uC704\uCE58\uAC00 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: ''{0}''\uC758 \uCF58\uD150\uCE20\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. ''{1}'' \uC694\uC18C\uB294 \uBE44\uC6CC \uB458 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: ''{0}'' \uC720\uD615\uC758 \uC694\uC18C\uB294 <schema> \uC694\uC18C\uC758 \uD558\uC704 \uD56D\uBAA9\uC73C\uB85C \uC120\uC5B8 \uB4A4\uC5D0 \uB098\uD0C0\uB0A0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        s4s-elt-schema-ns = s4s-elt-schema-ns: ''{0}'' \uC694\uC18C\uC758 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uB294 \uC2A4\uD0A4\uB9C8 \uB124\uC784\uC2A4\uD398\uC774\uC2A4 ''http://www.w3.org/2001/XMLSchema''\uC5D0\uC11C \uC640\uC57C \uD569\uB2C8\uB2E4.
-        s4s-elt-character = s4s-elt-character: ''xs:appinfo'' \uBC0F ''xs:documentation'' \uC678\uC5D0 \uB2E4\uB978 \uC2A4\uD0A4\uB9C8 \uC694\uC18C\uC5D0\uC11C\uB294 \uACF5\uBC31\uC774 \uC544\uB2CC \uBB38\uC790\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. ''{0}''\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: ''{0}''의 콘텐츠가 부적합합니다. ''{1}'' 요소가 부적합하거나 너무 자주 발생하거나 해당 요소의 위치가 잘못되었습니다.
+        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: ''{0}''의 콘텐츠가 부적합합니다. ''{1}'' 요소는 비워 둘 수 없습니다.
+        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: ''{0}'' 유형의 요소는 <schema> 요소의 하위 항목으로 선언 뒤에 나타날 수 없습니다.
+        s4s-elt-schema-ns = s4s-elt-schema-ns: ''{0}'' 요소의 네임스페이스는 스키마 네임스페이스 ''http://www.w3.org/2001/XMLSchema''에서 와야 합니다.
+        s4s-elt-character = s4s-elt-character: ''xs:appinfo'' 및 ''xs:documentation'' 외에 다른 스키마 요소에서는 공백이 아닌 문자가 허용되지 않습니다. ''{0}''이(가) 발견되었습니다.
 
 # codes not defined by the spec
 
-        c-fields-xpaths = c-fields-xpaths: \uD544\uB4DC \uAC12 = ''{0}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-        c-general-xpath = c-general-xpath: ''{0}'' \uD45C\uD604\uC2DD\uC740 XML \uC2A4\uD0A4\uB9C8\uAC00 \uC9C0\uC6D0\uD558\uB294 XPath \uBD80\uBD84 \uC9D1\uD569\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-        c-general-xpath-ns = c-general-xpath-ns: XPath \uD45C\uD604\uC2DD ''{0}''\uC758 \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC811\uB450\uC5B4\uAC00 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-        c-selector-xpath = c-selector-xpath: \uC120\uD0DD\uAE30 \uAC12 = ''{0}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC120\uD0DD\uAE30 XPath\uC5D0\uB294 \uC18D\uC131\uC774 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        EmptyTargetNamespace = EmptyTargetNamespace: \uC2A4\uD0A4\uB9C8 \uBB38\uC11C ''{0}''\uC758 ''targetNamespace'' \uC18D\uC131\uAC12\uC740 \uBE48 \uBB38\uC790\uC5F4\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        FacetValueFromBase = FacetValueFromBase: ''{0}'' \uC720\uD615\uC758 \uC120\uC5B8\uC5D0\uC11C ''{2}'' \uBA74\uC758 ''{1}'' \uAC12\uC740 \uAE30\uBCF8 \uC720\uD615 ''{3}''\uC758 \uAC12 \uACF5\uBC31\uC5D0\uC11C \uC640\uC57C \uD569\uB2C8\uB2E4.
-        FixedFacetValue = FixedFacetValue: {3}\uC758 \uC815\uC758\uC5D0\uC11C ''{0}'' \uBA74\uC5D0 \uB300\uD55C ''{1}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. ''{0}''\uC5D0 \uB300\uD55C \uAC12\uC774 \uC870\uC0C1 \uC720\uD615 \uC911 \uD558\uB098\uC5D0\uC11C ''{2}''(\uC73C)\uB85C \uC124\uC815\uB418\uC5C8\uC73C\uBA70 '{'fixed'}' = true\uC774\uAE30 \uB54C\uBB38\uC785\uB2C8\uB2E4.
-        InvalidRegex = InvalidRegex: \uD328\uD134 \uAC12 ''{0}''\uC740(\uB294) \uC801\uD569\uD55C \uC815\uADDC \uD45C\uD604\uC2DD\uC774 \uC544\uB2D9\uB2C8\uB2E4. ''{2}'' \uC5F4\uC5D0\uC11C ''{1}'' \uC624\uB958\uAC00 \uBCF4\uACE0\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-        MaxOccurLimit = \uAD6C\uBB38 \uBD84\uC11D\uAE30\uC758 \uD604\uC7AC \uAD6C\uC131\uC5D0\uC11C maxOccurs \uC18D\uC131\uAC12\uC744 {0} \uAC12\uBCF4\uB2E4 \uD06C\uAC8C \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-        PublicSystemOnNotation = PublicSystemOnNotation: \uD558\uB098 \uC774\uC0C1\uC758 ''public''\uACFC ''system''\uC774 ''notation'' \uC694\uC18C\uC5D0 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-        SchemaLocation = SchemaLocation: schemaLocation \uAC12 = ''{0}''\uC5D0\uB294 \uC9DD\uC218 \uAC1C\uC758 URI\uAC00 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-        TargetNamespace.1 = TargetNamespace.1: ''{0}'' \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uD544\uC694\uD558\uC9C0\uB9CC \uC2A4\uD0A4\uB9C8 \uBB38\uC11C\uC758 \uB300\uC0C1 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 ''{1}''\uC785\uB2C8\uB2E4.
-        TargetNamespace.2 = TargetNamespace.2: \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uD544\uC694\uD558\uC9C0 \uC54A\uC9C0\uB9CC \uC2A4\uD0A4\uB9C8 \uBB38\uC11C\uC758 \uB300\uC0C1 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 ''{1}''\uC785\uB2C8\uB2E4.
-        UndeclaredEntity = UndeclaredEntity: ''{0}'' \uC5D4\uD2F0\uD2F0\uAC00 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-        UndeclaredPrefix = UndeclaredPrefix: ''{0}''\uC744(\uB97C) QName\uC73C\uB85C \uBD84\uC11D\uD560 \uC218 \uC5C6\uC74C: ''{1}'' \uC811\uB450\uC5B4\uAC00 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
+        c-fields-xpaths = c-fields-xpaths: 필드 값 = ''{0}''이(가) 부적합합니다.
+        c-general-xpath = c-general-xpath: ''{0}'' 표현식은 XML 스키마가 지원하는 XPath 부분 집합에 대해 부적합합니다.
+        c-general-xpath-ns = c-general-xpath-ns: XPath 표현식 ''{0}''의 네임스페이스 접두어가 네임스페이스에 바인드되지 않았습니다.
+        c-selector-xpath = c-selector-xpath: 선택기 값 = ''{0}''이(가) 부적합합니다. 선택기 XPath에는 속성이 포함될 수 없습니다.
+        EmptyTargetNamespace = EmptyTargetNamespace: 스키마 문서 ''{0}''의 ''targetNamespace'' 속성값은 빈 문자열일 수 없습니다.
+        FacetValueFromBase = FacetValueFromBase: ''{0}'' 유형의 선언에서 ''{2}'' 면의 ''{1}'' 값은 기본 유형 ''{3}''의 값 공백에서 와야 합니다.
+        FixedFacetValue = FixedFacetValue: {3}의 정의에서 ''{0}'' 면에 대한 ''{1}'' 값이 부적합합니다. ''{0}''에 대한 값이 조상 유형 중 하나에서 ''{2}''(으)로 설정되었으며 '{'fixed'}' = true이기 때문입니다.
+        InvalidRegex = InvalidRegex: 패턴 값 ''{0}''은(는) 적합한 정규 표현식이 아닙니다. ''{2}'' 열에서 ''{1}'' 오류가 보고되었습니다.
+        MaxOccurLimit = 구문 분석기의 현재 구성에서 maxOccurs 속성값을 {0} 값보다 크게 설정할 수 없습니다.
+        PublicSystemOnNotation = PublicSystemOnNotation: 하나 이상의 ''public''과 ''system''이 ''notation'' 요소에 나타나야 합니다.
+        SchemaLocation = SchemaLocation: schemaLocation 값 = ''{0}''에는 짝수 개의 URI가 있어야 합니다.
+        TargetNamespace.1 = TargetNamespace.1: ''{0}'' 네임스페이스가 필요하지만 스키마 문서의 대상 네임스페이스가 ''{1}''입니다.
+        TargetNamespace.2 = TargetNamespace.2: 네임스페이스가 필요하지 않지만 스키마 문서의 대상 네임스페이스가 ''{1}''입니다.
+        UndeclaredEntity = UndeclaredEntity: ''{0}'' 엔티티가 선언되지 않았습니다.
+        UndeclaredPrefix = UndeclaredPrefix: ''{0}''을(를) QName으로 분석할 수 없음: ''{1}'' 접두어가 선언되지 않았습니다.
 
 
 # JAXP 1.2 schema source property errors
 
-        jaxp12-schema-source-type.1 = ''http://java.sun.com/xml/jaxp/properties/schemaSource'' \uC18D\uC131\uC5D0 ''{0}'' \uC720\uD615\uC758 \uAC12\uC774 \uC788\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uAC00\uB2A5\uD55C \uC9C0\uC6D0\uB418\uB294 \uAC12 \uC720\uD615\uC740 String, File, InputStream, InputSource \uB610\uB294 \uC774\uB7EC\uD55C \uC720\uD615\uC758 \uBC30\uC5F4\uC785\uB2C8\uB2E4.
-        jaxp12-schema-source-type.2 = ''http://java.sun.com/xml/jaxp/properties/schemaSource'' \uC18D\uC131\uC5D0 ''{0}'' \uC720\uD615\uC758 \uBC30\uC5F4 \uAC12\uC774 \uC788\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uAC00\uB2A5\uD55C \uC9C0\uC6D0\uB418\uB294 \uAC12 \uC720\uD615\uC740 Object, String, File, InputStream \uBC0F InputSource\uC785\uB2C8\uB2E4.
-        jaxp12-schema-source-ns = \uAC1D\uCCB4 \uBC30\uC5F4\uC744 'http://java.sun.com/xml/jaxp/properties/schemaSource' \uC18D\uC131\uC758 \uAC12\uC73C\uB85C \uC0AC\uC6A9 \uC911\uC778 \uACBD\uC6B0 \uB3D9\uC77C\uD55C \uB300\uC0C1 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uB97C \uACF5\uC720\uD558\uB294 \uC2A4\uD0A4\uB9C8 \uB450 \uAC1C\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+        jaxp12-schema-source-type.1 = ''http://java.sun.com/xml/jaxp/properties/schemaSource'' 속성에 ''{0}'' 유형의 값이 있을 수 없습니다. 가능한 지원되는 값 유형은 String, File, InputStream, InputSource 또는 이러한 유형의 배열입니다.
+        jaxp12-schema-source-type.2 = ''http://java.sun.com/xml/jaxp/properties/schemaSource'' 속성에 ''{0}'' 유형의 배열 값이 있을 수 없습니다. 가능한 지원되는 값 유형은 Object, String, File, InputStream 및 InputSource입니다.
+        jaxp12-schema-source-ns = 객체 배열을 'http://java.sun.com/xml/jaxp/properties/schemaSource' 속성의 값으로 사용 중인 경우 동일한 대상 네임스페이스를 공유하는 스키마 두 개를 사용할 수 없습니다.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties
index ac226e02e25..8874db17b19 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties
@@ -26,303 +26,303 @@
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
+        BadMessageKey = Não foi possível encontrar a mensagem de erro correspondente à chave da mensagem.
         FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n
 
 # For internal use
 
         Internal-Error = Erro interno: {0}.
-        dt-whitespace = O valor do aspecto do espa\u00E7o em branco n\u00E3o est\u00E1 dispon\u00EDvel para o simpleType ''{0}'' da uni\u00E3o
-        GrammarConflict = Uma das gram\u00E1ticas retornadas do pool de gram\u00E1tica do usu\u00E1rio est\u00E1 em conflito com outra.
+        dt-whitespace = O valor do aspecto do espaço em branco não está disponível para o simpleType ''{0}'' da união
+        GrammarConflict = Uma das gramáticas retornadas do pool de gramática do usuário está em conflito com outra.
 
 # Identity constraints
 
-        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: O Elemento "{0}" n\u00E3o tem valor para a chave "{1}".
-        DuplicateField = Correspond\u00EAncia duplicada no escopo do campo "{0}".
-        DuplicateKey = cvc-identity-constraint.4.2.2: Valor de chave duplicado [{0}] declarado para a restri\u00E7\u00E3o de identidade "{2}" do elemento "{1}".
-        DuplicateUnique = cvc-identity-constraint.4.1: Valor exclusivo duplicado [{0}] declarado para a restri\u00E7\u00E3o de identidade "{2}" do elemento "{1}".
-        FieldMultipleMatch = cvc-identity-constraint.3: O campo "{0}" da restri\u00E7\u00E3o de identidade "{1}" corresponde a mais de um valor no escopo de seu seletor; os campos devem corresponder a valores exclusivos.
-        FixedDiffersFromActual = O conte\u00FAdo deste elemento n\u00E3o \u00E9 equivalente ao valor do atributo "fixed" na declara\u00E7\u00E3o do elemento do esquema.
-        KeyMatchesNillable = cvc-identity-constraint.4.2.3: O elemento "{0}" tem a chave "{1}" que corresponde a um elemento que tem o valor anul\u00E1vel definido como verdadeiro.
-        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: Valores insuficientes especificados para a restri\u00E7\u00E3o de identidade <key name="{1}"> especificada para o elemento "{0}".
-        KeyNotFound = cvc-identity-constraint.4.3: A Chave ''{0}'' com o valor ''{1}'' n\u00E3o foi encontrada para a restri\u00E7\u00E3o de identidade do elemento ''{2}''.
-        KeyRefOutOfScope = Erro de restri\u00E7\u00E3o de identidade: a restri\u00E7\u00E3o de identidade "{0}" tem uma keyref que se refere a uma chave exclusiva a qual est\u00E1 fora do escopo.
-        KeyRefReferNotFound = A declara\u00E7\u00E3o de refer\u00EAncia da chave "{0}" refere-se a uma chave com o nome "{1}".
-        UnknownField = Erro interno de restri\u00E7\u00E3o de identidade; o campo desconhecido "{0}" para a restri\u00E7\u00E3o de identidade "{2}" foi especificado para o elemento "{1}".
+        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: O Elemento "{0}" não tem valor para a chave "{1}".
+        DuplicateField = Correspondência duplicada no escopo do campo "{0}".
+        DuplicateKey = cvc-identity-constraint.4.2.2: Valor de chave duplicado [{0}] declarado para a restrição de identidade "{2}" do elemento "{1}".
+        DuplicateUnique = cvc-identity-constraint.4.1: Valor exclusivo duplicado [{0}] declarado para a restrição de identidade "{2}" do elemento "{1}".
+        FieldMultipleMatch = cvc-identity-constraint.3: O campo "{0}" da restrição de identidade "{1}" corresponde a mais de um valor no escopo de seu seletor; os campos devem corresponder a valores exclusivos.
+        FixedDiffersFromActual = O conteúdo deste elemento não é equivalente ao valor do atributo "fixed" na declaração do elemento do esquema.
+        KeyMatchesNillable = cvc-identity-constraint.4.2.3: O elemento "{0}" tem a chave "{1}" que corresponde a um elemento que tem o valor anulável definido como verdadeiro.
+        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: Valores insuficientes especificados para a restrição de identidade <key name="{1}"> especificada para o elemento "{0}".
+        KeyNotFound = cvc-identity-constraint.4.3: A Chave ''{0}'' com o valor ''{1}'' não foi encontrada para a restrição de identidade do elemento ''{2}''.
+        KeyRefOutOfScope = Erro de restrição de identidade: a restrição de identidade "{0}" tem uma keyref que se refere a uma chave exclusiva a qual está fora do escopo.
+        KeyRefReferNotFound = A declaração de referência da chave "{0}" refere-se a uma chave com o nome "{1}".
+        UnknownField = Erro interno de restrição de identidade; o campo desconhecido "{0}" para a restrição de identidade "{2}" foi especificado para o elemento "{1}".
 
 # Ideally, we should only use the following error keys, not the ones under
 # "Identity constraints". And we should cover all of the following errors.
 
 #validation (3.X.4)
 
-        cvc-attribute.3 = cvc-attribute.3: O valor ''{2}'' do atributo ''{1}'' no elemento ''{0}'' n\u00E3o \u00E9 v\u00E1lido em rela\u00E7\u00E3o ao seu tipo, ''{3}''.
-        cvc-attribute.4 = cvc-attribute.4: O valor ''{2}'' do atributo ''{1}'' no elemento ''{0}'' n\u00E3o \u00E9 v\u00E1lido em rela\u00E7\u00E3o \u00E0 sua '{'value constraint'}' fixa. O atributo deve ter um valor ''{3}''.
-        cvc-complex-type.2.1 = cvc-complex-type.2.1: O elemento ''{0}'' n\u00E3o deve ter um caractere ou um item com informa\u00E7\u00F5es do elemento [children] porque o tipo de conte\u00FAdo do tipo \u00E9 vazio.
-        cvc-complex-type.2.2 = cvc-complex-type.2.2: O elemento ''{0}'' n\u00E3o deve ter um elemento [children] e o valor deve ser v\u00E1lido.
-        cvc-complex-type.2.3 = cvc-complex-type.2.3: O elemento ''{0}'' n\u00E3o pode ter um caractere [children] porque o tipo de conte\u00FAdo do tipo \u00E9 somente elemento.
-        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: Foi detectado um conte\u00FAdo inv\u00E1lido come\u00E7ando com o elemento ''{0}''. Era esperado um dos ''{1}''.
-        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: O conte\u00FAdo do elemento ''{0}'' n\u00E3o est\u00E1 completo. Era esperado um dos ''{1}''.
-        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: O curinga correspondente \u00E9 restrito, mas nenhuma declara\u00E7\u00E3o pode ser encontrada para o elemento ''{0}''.
-        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: Conte\u00FAdo inv\u00E1lido encontrado ao iniciar com o elemento ''{0}''. Nenhum elemento filho \u00E9 esperado neste ponto.
-        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: Foi encontrado um conte\u00FAdo inv\u00E1lido come\u00E7ando com o elemento ''{0}''. Nenhum elemento filho "{1}" \u00E9 esperado neste ponto.
-        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' pode ocorrer no m\u00E1ximo ''{2}'' vezes na sequ\u00EAncia atual. Esse limite foi excedido. Nesse ponto, um de ''{1}'' \u00E9 esperado.
-        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' pode ocorrer no m\u00E1ximo ''{1}'' vezes na sequ\u00EAncia atual. Esse limite foi excedido. Nenhum elemento filho \u00E9 esperado nesse ponto.
-        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: Foi encontrado um conte\u00FAdo inv\u00E1lido que come\u00E7a com o elemento ''{0}''. O esperado era que ''{1}'' ocorresse no m\u00EDnimo ''{2}'' vezes na sequ\u00EAncia atual. Uma inst\u00E2ncia a mais \u00E9 necess\u00E1ria para satisfazer essa restri\u00E7\u00E3o.
-        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: Foi encontrado um conte\u00FAdo inv\u00E1lido que come\u00E7a com o elemento ''{0}''. O esperado era que ''{1}'' ocorresse no m\u00EDnimo ''{2}'' vezes na sequ\u00EAncia atual. ''{3}'' inst\u00E2ncias a mais s\u00E3o necess\u00E1rias para satisfazer essa restri\u00E7\u00E3o.
-        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: O conte\u00FAdo do elemento ''{0}'' n\u00E3o est\u00E1 completo. O esperado era que ''{1}'' ocorresse no m\u00EDnimo ''{2}'' vezes. Uma inst\u00E2ncia a mais \u00E9 necess\u00E1ria para satisfazer essa restri\u00E7\u00E3o.
-        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: O conte\u00FAdo do elemento ''{0}'' n\u00E3o est\u00E1 completo. O esperado era que ''{1}'' ocorresse no m\u00EDnimo ''{2}'' vezes. ''{3}'' inst\u00E2ncias a mais s\u00E3o necess\u00E1rias para satisfazer essa restri\u00E7\u00E3o.
-        cvc-complex-type.3.1 = cvc-complex-type.3.1: O valor ''{2}'' do atributo ''{1}'' do elemento ''{0}'' n\u00E3o \u00E9 v\u00E1lido em rela\u00E7\u00E3o ao uso do atributo correspondente. O atributo ''{1}'' tem um valor fixo de ''{3}''.
-        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: O elemento ''{0}'' n\u00E3o tem um curinga do atributo ''{1}''.
-        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: O atributo ''{1}'' n\u00E3o pode aparecer no elemento ''{0}''.
+        cvc-attribute.3 = cvc-attribute.3: O valor ''{2}'' do atributo ''{1}'' no elemento ''{0}'' não é válido em relação ao seu tipo, ''{3}''.
+        cvc-attribute.4 = cvc-attribute.4: O valor ''{2}'' do atributo ''{1}'' no elemento ''{0}'' não é válido em relação à sua '{'value constraint'}' fixa. O atributo deve ter um valor ''{3}''.
+        cvc-complex-type.2.1 = cvc-complex-type.2.1: O elemento ''{0}'' não deve ter um caractere ou um item com informações do elemento [children] porque o tipo de conteúdo do tipo é vazio.
+        cvc-complex-type.2.2 = cvc-complex-type.2.2: O elemento ''{0}'' não deve ter um elemento [children] e o valor deve ser válido.
+        cvc-complex-type.2.3 = cvc-complex-type.2.3: O elemento ''{0}'' não pode ter um caractere [children] porque o tipo de conteúdo do tipo é somente elemento.
+        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: Foi detectado um conteúdo inválido começando com o elemento ''{0}''. Era esperado um dos ''{1}''.
+        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: O conteúdo do elemento ''{0}'' não está completo. Era esperado um dos ''{1}''.
+        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: O curinga correspondente é restrito, mas nenhuma declaração pode ser encontrada para o elemento ''{0}''.
+        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: Conteúdo inválido encontrado ao iniciar com o elemento ''{0}''. Nenhum elemento filho é esperado neste ponto.
+        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: Foi encontrado um conteúdo inválido começando com o elemento ''{0}''. Nenhum elemento filho "{1}" é esperado neste ponto.
+        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' pode ocorrer no máximo ''{2}'' vezes na sequência atual. Esse limite foi excedido. Nesse ponto, um de ''{1}'' é esperado.
+        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' pode ocorrer no máximo ''{1}'' vezes na sequência atual. Esse limite foi excedido. Nenhum elemento filho é esperado nesse ponto.
+        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: Foi encontrado um conteúdo inválido que começa com o elemento ''{0}''. O esperado era que ''{1}'' ocorresse no mínimo ''{2}'' vezes na sequência atual. Uma instância a mais é necessária para satisfazer essa restrição.
+        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: Foi encontrado um conteúdo inválido que começa com o elemento ''{0}''. O esperado era que ''{1}'' ocorresse no mínimo ''{2}'' vezes na sequência atual. ''{3}'' instâncias a mais são necessárias para satisfazer essa restrição.
+        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: O conteúdo do elemento ''{0}'' não está completo. O esperado era que ''{1}'' ocorresse no mínimo ''{2}'' vezes. Uma instância a mais é necessária para satisfazer essa restrição.
+        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: O conteúdo do elemento ''{0}'' não está completo. O esperado era que ''{1}'' ocorresse no mínimo ''{2}'' vezes. ''{3}'' instâncias a mais são necessárias para satisfazer essa restrição.
+        cvc-complex-type.3.1 = cvc-complex-type.3.1: O valor ''{2}'' do atributo ''{1}'' do elemento ''{0}'' não é válido em relação ao uso do atributo correspondente. O atributo ''{1}'' tem um valor fixo de ''{3}''.
+        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: O elemento ''{0}'' não tem um curinga do atributo ''{1}''.
+        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: O atributo ''{1}'' não pode aparecer no elemento ''{0}''.
         cvc-complex-type.4 = cvc-complex-type.4: O atributo ''{1}'' deve aparecer no elemento ''{0}''.
-        cvc-complex-type.5.1 = cvc-complex-type.5.1: No elemento ''{0}'', o atributo ''{1}'' \u00E9 um ID Curinga, mas j\u00E1 existe um ID Curinga ''{2}''. Pode haver somente um.
-        cvc-complex-type.5.2 = cvc-complex-type.5.2: No elemento, ''{0}'', o atributo ''{1}'' \u00E9 um ID Curinga, mas j\u00E1 existe um atributo ''{2}'' obtido do ID entre os '{'attribute uses'}'.
-        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' n\u00E3o \u00E9 um valor v\u00E1lido para ''{1}''.
-        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' n\u00E3o \u00E9 um valor v\u00E1lido do tipo de lista ''{1}''.
-        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' n\u00E3o \u00E9 um valor v\u00E1lido do tipo de uni\u00E3o ''{1}''.
-        cvc-elt.1.a = cvc-elt.1.a: N\u00E3o foi poss\u00EDvel encontrar a declara\u00E7\u00E3o do elemento ''{0}''.
-        cvc-elt.1.b = cvc-elt.1.b: O nome do elemento n\u00E3o corresponde ao nome da declara\u00E7\u00E3o do elemento. Foi visto ''{0}''. Era esperado ''{1}''.
-        cvc-elt.2 = cvc-elt.2: O valor de "{"abstract"}" na declara\u00E7\u00E3o do elemento para ''{0}'' deve ser falso.
-        cvc-elt.3.1 = cvc-elt.3.1: O atributo ''{1}'' n\u00E3o deve aparecer no elemento ''{0}'' porque a propriedade '{'nillable'}' de ''{0}'' \u00E9 falsa.
-        cvc-elt.3.2.1 = cvc-elt.3.2.1: O elemento ''{0}'' n\u00E3o pode ter informa\u00E7\u00F5es de caractere ou de elemento [children] porque ''{1}'' foi especificado.
-        cvc-elt.3.2.2 = cvc-elt.3.2.2: N\u00E3o deve haver "{"value constraint"}" fixo para o elemento ''{0}'' porque ''{1}'' foi especificado.
-        cvc-elt.4.1 = cvc-elt.4.1: O valor ''{2}'' do atributo ''{1}'' do elemento ''{0}'' n\u00E3o \u00E9 um QName v\u00E1lido.
-        cvc-elt.4.2 = cvc-elt.4.2: N\u00E3o \u00E9 poss\u00EDvel resolver ''{1}'' para uma defini\u00E7\u00E3o de tipo de elemento ''{0}''.
-        cvc-elt.4.3 = cvc-elt.4.3: O tipo ''{1}'' n\u00E3o \u00E9 obtido de forma v\u00E1lida da defini\u00E7\u00E3o do tipo, ''{2}'', do elemento ''{0}''.
-        cvc-elt.5.1.1 = cvc-elt.5.1.1: "{"value constraint"}" ''{2}'' do elemento ''{0}'' n\u00E3o \u00E9 um valor padr\u00E3o v\u00E1lido para o tipo ''{1}''.
-        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: O elemento ''{0}'' n\u00E3o deve ter item de informa\u00E7\u00F5es do elemento [children].
-        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: O valor ''{1}'' do elemento ''{0}'' n\u00E3o corresponde ao valor fixo de '{'value constraint'}' ''{2}''.
-        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: O valor ''{1}'' do elemento ''{0}'' n\u00E3o corresponde ao valor de '{'value constraint'}' ''{2}'' .
-        cvc-enumeration-valid = cvc-enumeration-valid: O valor ''{0}'' n\u00E3o tem um aspecto v\u00E1lido em rela\u00E7\u00E3o \u00E0 enumera\u00E7\u00E3o ''{1}''. Deve ser um valor da enumera\u00E7\u00E3o.
-        cvc-fractionDigits-valid = cvc-fractionDigits-valid: O valor ''{0}'' tem {1} d\u00EDgitos fracion\u00E1rios, mas o n\u00FAmero de d\u00EDgitos fracion\u00E1rios foi limitado a {2}.
-        cvc-id.1 = cvc-id.1: N\u00E3o h\u00E1 associa\u00E7\u00E3o de ID/IDREF para IDREF ''{0}''.
-        cvc-id.2 = cvc-id.2: H\u00E1 v\u00E1rias ocorr\u00EAncias do valor do ID ''{0}''.
-        cvc-id.3 = cvc-id.3: Um campo da restri\u00E7\u00E3o de identidade ''{0}'' correspondia ao elemento ''{1}'', mas este elemento n\u00E3o tem um tipo simples.
-        cvc-length-valid = cvc-length-valid: O valor ''{0}'' com tamanho = ''{1}'' n\u00E3o tem um aspecto v\u00E1lido em rela\u00E7\u00E3o ao tamanho ''{2}'' do tipo ''{3}''.
-        cvc-maxExclusive-valid = cvc-maxExclusive-valid: O valor ''{0}'' n\u00E3o tem um aspecto v\u00E1lido em rela\u00E7\u00E3o ao maxExclusive ''{1}'' do tipo ''{2}''.
-        cvc-maxInclusive-valid = cvc-maxInclusive-valid: O valor ''{0}'' n\u00E3o tem um aspecto v\u00E1lido em rela\u00E7\u00E3o ao maxInclusive ''{1}'' do tipo ''{2}''.
-        cvc-maxLength-valid = cvc-maxLength-valid: O valor ''{0}'' com tamanho = ''{1}'' n\u00E3o tem um aspecto v\u00E1lido em rela\u00E7\u00E3o ao maxLength ''{2}'' do tipo ''{3}''.
-        cvc-minExclusive-valid = cvc-minExclusive-valid: O valor ''{0}'' n\u00E3o tem um aspecto v\u00E1lido em rela\u00E7\u00E3o ao minExclusive ''{1}'' do tipo ''{2}''.
-        cvc-minInclusive-valid = cvc-minInclusive-valid: O valor ''{0}'' n\u00E3o tem um aspecto v\u00E1lido em rela\u00E7\u00E3o ao minInclusive ''{1}'' do tipo ''{2}''.
-        cvc-minLength-valid = cvc-minLength-valid: O valor ''{0}'' com tamanho = ''{1}'' n\u00E3o tem um aspecto v\u00E1lido em rela\u00E7\u00E3o ao minLength ''{2}'' do tipo ''{3}''.
-        cvc-pattern-valid = cvc-pattern-valid: O valor ''{0}'' n\u00E3o tem um aspecto v\u00E1lido em rela\u00E7\u00E3o ao padr\u00E3o ''{1}'' do tipo ''{2}''.
-        cvc-totalDigits-valid = cvc-totalDigits-valid: O valor ''{0}'' tem {1} d\u00EDgitos do total, mas o n\u00FAmero de d\u00EDgitos do total foi limitado a {2}.
-        cvc-type.1 = cvc-type.1: A defini\u00E7\u00E3o ''{0}'' de tipo n\u00E3o foi encontrada.
-        cvc-type.2 = cvc-type.2: A defini\u00E7\u00E3o do tipo n\u00E3o pode ser abstrata para o elemento {0}.
-        cvc-type.3.1.1 = cvc-type.3.1.1: O elemento ''{0}'' tem um tipo simples. Dessa forma, n\u00E3o pode haver atributos, exceto aqueles cujo nome do namespace \u00E9 id\u00EAntico a ''http://www.w3.org/2001/XMLSchema-instance'' e cujo [local name] \u00E9 um dos seguintes ''type'', ''nil'', ''schemaLocation'' ou ''noNamespaceSchemaLocation''. No entanto, o atributo ''{1}'' foi encontrado.
-        cvc-type.3.1.2 = cvc-type.3.1.2: O elemento ''{0}'' tem um tipo simples. Dessa forma, n\u00E3o deve haver um item de informa\u00E7\u00F5es do elemento [children].
-        cvc-type.3.1.3 = cvc-type.3.1.3: O valor ''{1}'' do elemento ''{0}'' n\u00E3o \u00E9 v\u00E1lido.
+        cvc-complex-type.5.1 = cvc-complex-type.5.1: No elemento ''{0}'', o atributo ''{1}'' é um ID Curinga, mas já existe um ID Curinga ''{2}''. Pode haver somente um.
+        cvc-complex-type.5.2 = cvc-complex-type.5.2: No elemento, ''{0}'', o atributo ''{1}'' é um ID Curinga, mas já existe um atributo ''{2}'' obtido do ID entre os '{'attribute uses'}'.
+        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' não é um valor válido para ''{1}''.
+        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' não é um valor válido do tipo de lista ''{1}''.
+        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' não é um valor válido do tipo de união ''{1}''.
+        cvc-elt.1.a = cvc-elt.1.a: Não foi possível encontrar a declaração do elemento ''{0}''.
+        cvc-elt.1.b = cvc-elt.1.b: O nome do elemento não corresponde ao nome da declaração do elemento. Foi visto ''{0}''. Era esperado ''{1}''.
+        cvc-elt.2 = cvc-elt.2: O valor de "{"abstract"}" na declaração do elemento para ''{0}'' deve ser falso.
+        cvc-elt.3.1 = cvc-elt.3.1: O atributo ''{1}'' não deve aparecer no elemento ''{0}'' porque a propriedade '{'nillable'}' de ''{0}'' é falsa.
+        cvc-elt.3.2.1 = cvc-elt.3.2.1: O elemento ''{0}'' não pode ter informações de caractere ou de elemento [children] porque ''{1}'' foi especificado.
+        cvc-elt.3.2.2 = cvc-elt.3.2.2: Não deve haver "{"value constraint"}" fixo para o elemento ''{0}'' porque ''{1}'' foi especificado.
+        cvc-elt.4.1 = cvc-elt.4.1: O valor ''{2}'' do atributo ''{1}'' do elemento ''{0}'' não é um QName válido.
+        cvc-elt.4.2 = cvc-elt.4.2: Não é possível resolver ''{1}'' para uma definição de tipo de elemento ''{0}''.
+        cvc-elt.4.3 = cvc-elt.4.3: O tipo ''{1}'' não é obtido de forma válida da definição do tipo, ''{2}'', do elemento ''{0}''.
+        cvc-elt.5.1.1 = cvc-elt.5.1.1: "{"value constraint"}" ''{2}'' do elemento ''{0}'' não é um valor padrão válido para o tipo ''{1}''.
+        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: O elemento ''{0}'' não deve ter item de informações do elemento [children].
+        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: O valor ''{1}'' do elemento ''{0}'' não corresponde ao valor fixo de '{'value constraint'}' ''{2}''.
+        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: O valor ''{1}'' do elemento ''{0}'' não corresponde ao valor de '{'value constraint'}' ''{2}'' .
+        cvc-enumeration-valid = cvc-enumeration-valid: O valor ''{0}'' não tem um aspecto válido em relação à enumeração ''{1}''. Deve ser um valor da enumeração.
+        cvc-fractionDigits-valid = cvc-fractionDigits-valid: O valor ''{0}'' tem {1} dígitos fracionários, mas o número de dígitos fracionários foi limitado a {2}.
+        cvc-id.1 = cvc-id.1: Não há associação de ID/IDREF para IDREF ''{0}''.
+        cvc-id.2 = cvc-id.2: Há várias ocorrências do valor do ID ''{0}''.
+        cvc-id.3 = cvc-id.3: Um campo da restrição de identidade ''{0}'' correspondia ao elemento ''{1}'', mas este elemento não tem um tipo simples.
+        cvc-length-valid = cvc-length-valid: O valor ''{0}'' com tamanho = ''{1}'' não tem um aspecto válido em relação ao tamanho ''{2}'' do tipo ''{3}''.
+        cvc-maxExclusive-valid = cvc-maxExclusive-valid: O valor ''{0}'' não tem um aspecto válido em relação ao maxExclusive ''{1}'' do tipo ''{2}''.
+        cvc-maxInclusive-valid = cvc-maxInclusive-valid: O valor ''{0}'' não tem um aspecto válido em relação ao maxInclusive ''{1}'' do tipo ''{2}''.
+        cvc-maxLength-valid = cvc-maxLength-valid: O valor ''{0}'' com tamanho = ''{1}'' não tem um aspecto válido em relação ao maxLength ''{2}'' do tipo ''{3}''.
+        cvc-minExclusive-valid = cvc-minExclusive-valid: O valor ''{0}'' não tem um aspecto válido em relação ao minExclusive ''{1}'' do tipo ''{2}''.
+        cvc-minInclusive-valid = cvc-minInclusive-valid: O valor ''{0}'' não tem um aspecto válido em relação ao minInclusive ''{1}'' do tipo ''{2}''.
+        cvc-minLength-valid = cvc-minLength-valid: O valor ''{0}'' com tamanho = ''{1}'' não tem um aspecto válido em relação ao minLength ''{2}'' do tipo ''{3}''.
+        cvc-pattern-valid = cvc-pattern-valid: O valor ''{0}'' não tem um aspecto válido em relação ao padrão ''{1}'' do tipo ''{2}''.
+        cvc-totalDigits-valid = cvc-totalDigits-valid: O valor ''{0}'' tem {1} dígitos do total, mas o número de dígitos do total foi limitado a {2}.
+        cvc-type.1 = cvc-type.1: A definição ''{0}'' de tipo não foi encontrada.
+        cvc-type.2 = cvc-type.2: A definição do tipo não pode ser abstrata para o elemento {0}.
+        cvc-type.3.1.1 = cvc-type.3.1.1: O elemento ''{0}'' tem um tipo simples. Dessa forma, não pode haver atributos, exceto aqueles cujo nome do namespace é idêntico a ''http://www.w3.org/2001/XMLSchema-instance'' e cujo [local name] é um dos seguintes ''type'', ''nil'', ''schemaLocation'' ou ''noNamespaceSchemaLocation''. No entanto, o atributo ''{1}'' foi encontrado.
+        cvc-type.3.1.2 = cvc-type.3.1.2: O elemento ''{0}'' tem um tipo simples. Dessa forma, não deve haver um item de informações do elemento [children].
+        cvc-type.3.1.3 = cvc-type.3.1.3: O valor ''{1}'' do elemento ''{0}'' não é válido.
 
 #schema valid (3.X.3)
 
-        schema_reference.access = schema_reference: falha ao ler o documento de esquema ''{0}'' porque o acesso a ''{1}'' n\u00E3o \u00E9 permitido em decorr\u00EAncia de uma restri\u00E7\u00E3o definida pela propriedade accessExternalSchema. 
-        schema_reference.4 = schema_reference.4: Falha ao ler o documento do esquema ''{0}'' porque 1) n\u00E3o foi poss\u00EDvel encontrar o documento; 2) n\u00E3o foi poss\u00EDvel ler o documento; 3) o elemento-raiz do documento n\u00E3o \u00E9 <xsd:schema>.
+        schema_reference.access = schema_reference: falha ao ler o documento de esquema ''{0}'' porque o acesso a ''{1}'' não é permitido em decorrência de uma restrição definida pela propriedade accessExternalSchema. 
+        schema_reference.4 = schema_reference.4: Falha ao ler o documento do esquema ''{0}'' porque 1) não foi possível encontrar o documento; 2) não foi possível ler o documento; 3) o elemento-raiz do documento não é <xsd:schema>.
         src-annotation = src-annotation: os elementos de <annotation> podem conter somente os elementos <appinfo> e <documentation>, mas foi encontrado ''{0}''.
-        src-attribute.1 = src-attribute.1: As propriedades ''padr\u00E3o'' e ''fixed'' n\u00E3o podem estar presentes na declara\u00E7\u00E3o do atributo ''{0}''. Use somente uma delas.
-        src-attribute.2 = src-attribute.2: : A propriedade ''padr\u00E3o'' est\u00E1 presente no atributo ''{0}''. Dessa forma, o valor de ''use'' deve ser ''optional''.
-        src-attribute.3.1 = src-attribute.3.1: 'ref' ou 'name' deve estar presente na declara\u00E7\u00E3o do atributo de local.
-        src-attribute.3.2 = src-attribute.3.2: O conte\u00FAdo deve corresponder a (annotation?) da refer\u00EAncia do atributo ''{0}''.
-        src-attribute.4 = src-attribute.4: O atributo ''{0}'' tem um atributo ''type'' e um ''simpleType'' filho an\u00F4nimo. Somente um deles \u00E9 permitido para um atributo.
-        src-attribute_group.2 = src-attribute_group.2: A intersec\u00E7\u00E3o dos curingas n\u00E3o \u00E9 express\u00EDvel para o grupo de atributos ''{0}''.
-        src-attribute_group.3 = src-attribute_group.3: Defini\u00E7\u00F5es circulares detectadas para o grupo de atributos ''{0}''. Seguir as refer\u00EAncias do grupo de atributos de forma recursiva acaba conduzindo a ele pr\u00F3prio.
-        src-ct.1 = src-ct.1: Erro de Representa\u00E7\u00E3o da Defini\u00E7\u00E3o do Tipo Complexo para o tipo ''{0}''. Quando <complexContent> \u00E9 usado, o tipo base deve ser um complexType. ''{1}'' \u00E9 um simpleType.
-        src-ct.2.1 = src-ct.2.1: Erro de Representa\u00E7\u00E3o da Defini\u00E7\u00E3o do Tipo Complexo do tipo ''{0}''. Quando <simpleContent> \u00E9 usado, o tipo de base deve ser um complexType cujo tipo de conte\u00FAdo \u00E9 simples ou, somente se a restri\u00E7\u00E3o for especificada, um tipo complexo com conte\u00FAdo misto e uma part\u00EDcula esvazi\u00E1vel, ou, somente se a extens\u00E3o for especificada, um tipo simples. ''{1}'' n\u00E3o satisfaz nenhuma dessas condi\u00E7\u00F5es.
-        src-ct.2.2 = src-ct.2.2: Erro de Representa\u00E7\u00E3o de Defini\u00E7\u00E3o do Tipo Complexo do tipo ''{0}''. Quando um complexType com simpleContent \u00E9 restrito a um complexType com conte\u00FAdo misto e part\u00EDcula esvazi\u00E1vel, ent\u00E3o deve haver um <simpleType> entre os filhos de <restriction>.
-        src-ct.4 = src-ct.4: Erro de Representa\u00E7\u00E3o de Defini\u00E7\u00E3o de Tipo Complexo do tipo ''{0}''. A intersec\u00E7\u00E3o de curingas n\u00E3o \u00E9 express\u00EDvel.
-        src-ct.5 = src-ct.5: Erro de Representa\u00E7\u00E3o da Defini\u00E7\u00E3o do Tipo Complexo do tipo ''{0}''. A uni\u00E3o de curingas n\u00E3o \u00E9 express\u00EDvel.
-        src-element.1 = src-element.1: As propriedades ''padr\u00E3o'' e ''fixed'' n\u00E3o podem estar presentes na declara\u00E7\u00E3o do elemento ''{0}''. Use somente uma delas.
-        src-element.2.1 = src-attribute.2.1: 'ref' ou 'name' deve estar presente na declara\u00E7\u00E3o de elemento do local.
-        src-element.2.2 = src-element.2.2: Como ''{0}'' cont\u00E9m o atributo ''ref'', seu conte\u00FAdo deve ser correspondente (annotation?). No entanto, ''{1}'' foi encontrado.
-        src-element.3 = src-element.3: O elemento ''{0}'' tem um atributo ''type'' e um filho ''anonymous type''. Somente um deles \u00E9 permitido para um elemento.
-        src-import.1.1 = src-import.1.1: O atributo do namespace ''{0}'' de um item de informa\u00E7\u00E3o do elemento <import> n\u00E3o deve ser igual ao targetNamespace do esquema existente nele.
-        src-import.1.2 = src-import.1.2: Se o atributo do namespace n\u00E3o estiver presente em um item de informa\u00E7\u00E3o do elemento <import>, ent\u00E3o o esquema delimitador deve ter um targetNamespace.
+        src-attribute.1 = src-attribute.1: As propriedades ''padrão'' e ''fixed'' não podem estar presentes na declaração do atributo ''{0}''. Use somente uma delas.
+        src-attribute.2 = src-attribute.2: : A propriedade ''padrão'' está presente no atributo ''{0}''. Dessa forma, o valor de ''use'' deve ser ''optional''.
+        src-attribute.3.1 = src-attribute.3.1: 'ref' ou 'name' deve estar presente na declaração do atributo de local.
+        src-attribute.3.2 = src-attribute.3.2: O conteúdo deve corresponder a (annotation?) da referência do atributo ''{0}''.
+        src-attribute.4 = src-attribute.4: O atributo ''{0}'' tem um atributo ''type'' e um ''simpleType'' filho anônimo. Somente um deles é permitido para um atributo.
+        src-attribute_group.2 = src-attribute_group.2: A intersecção dos curingas não é expressível para o grupo de atributos ''{0}''.
+        src-attribute_group.3 = src-attribute_group.3: Definições circulares detectadas para o grupo de atributos ''{0}''. Seguir as referências do grupo de atributos de forma recursiva acaba conduzindo a ele próprio.
+        src-ct.1 = src-ct.1: Erro de Representação da Definição do Tipo Complexo para o tipo ''{0}''. Quando <complexContent> é usado, o tipo base deve ser um complexType. ''{1}'' é um simpleType.
+        src-ct.2.1 = src-ct.2.1: Erro de Representação da Definição do Tipo Complexo do tipo ''{0}''. Quando <simpleContent> é usado, o tipo de base deve ser um complexType cujo tipo de conteúdo é simples ou, somente se a restrição for especificada, um tipo complexo com conteúdo misto e uma partícula esvaziável, ou, somente se a extensão for especificada, um tipo simples. ''{1}'' não satisfaz nenhuma dessas condições.
+        src-ct.2.2 = src-ct.2.2: Erro de Representação de Definição do Tipo Complexo do tipo ''{0}''. Quando um complexType com simpleContent é restrito a um complexType com conteúdo misto e partícula esvaziável, então deve haver um <simpleType> entre os filhos de <restriction>.
+        src-ct.4 = src-ct.4: Erro de Representação de Definição de Tipo Complexo do tipo ''{0}''. A intersecção de curingas não é expressível.
+        src-ct.5 = src-ct.5: Erro de Representação da Definição do Tipo Complexo do tipo ''{0}''. A união de curingas não é expressível.
+        src-element.1 = src-element.1: As propriedades ''padrão'' e ''fixed'' não podem estar presentes na declaração do elemento ''{0}''. Use somente uma delas.
+        src-element.2.1 = src-attribute.2.1: 'ref' ou 'name' deve estar presente na declaração de elemento do local.
+        src-element.2.2 = src-element.2.2: Como ''{0}'' contém o atributo ''ref'', seu conteúdo deve ser correspondente (annotation?). No entanto, ''{1}'' foi encontrado.
+        src-element.3 = src-element.3: O elemento ''{0}'' tem um atributo ''type'' e um filho ''anonymous type''. Somente um deles é permitido para um elemento.
+        src-import.1.1 = src-import.1.1: O atributo do namespace ''{0}'' de um item de informação do elemento <import> não deve ser igual ao targetNamespace do esquema existente nele.
+        src-import.1.2 = src-import.1.2: Se o atributo do namespace não estiver presente em um item de informação do elemento <import>, então o esquema delimitador deve ter um targetNamespace.
         src-import.2 = src-import.2: O elemento-raiz do documento "{0}'' deve ter o nome do namespace ''http://www.w3.org/2001/XMLSchema'' e o nome do local ''schema''.
-        src-import.3.1 = src-import.3.1: O atributo do namespace, ''{0}'', de um item de informa\u00E7\u00E3o do elemento <import> deve ser id\u00EAntico ao atributo targetNamespace, ''{1}'', do documento importado.
-        src-import.3.2 = src-import.3.2: Um item de informa\u00E7\u00E3o do elemento <import> que n\u00E3o tinha atributo de namespace foi encontrado. Dessa forma, o documento importado n\u00E3o pode ter um atributo de targetNamespace. No entanto, o targetNamespace ''{1}'' foi encontrado no documento importado.
+        src-import.3.1 = src-import.3.1: O atributo do namespace, ''{0}'', de um item de informação do elemento <import> deve ser idêntico ao atributo targetNamespace, ''{1}'', do documento importado.
+        src-import.3.2 = src-import.3.2: Um item de informação do elemento <import> que não tinha atributo de namespace foi encontrado. Dessa forma, o documento importado não pode ter um atributo de targetNamespace. No entanto, o targetNamespace ''{1}'' foi encontrado no documento importado.
         src-include.1 = src-include.1: O elemento-raiz do documento "{0}'' deve ter o nome do namespace ''http://www.w3.org/2001/XMLSchema'' e o nome do local ''schema''.
-        src-include.2.1 = src-include.2.1: O targetNamespace do esquema mencionado, atualmente ''{1}'', deve ser id\u00EAntico ao do esquema de inclus\u00E3o, atualmente ''{0}''.
+        src-include.2.1 = src-include.2.1: O targetNamespace do esquema mencionado, atualmente ''{1}'', deve ser idêntico ao do esquema de inclusão, atualmente ''{0}''.
         src-redefine.2 = src-redefine.2: O elemento-raiz do documento "{0}'' deve ter o nome do namespace ''http://www.w3.org/2001/XMLSchema'' e o nome do local ''schema''.
-        src-redefine.3.1 = src-redefine.3.1: O targetNamespace do esquema mencionado, atualmente ''{1}'', deve ser id\u00EAntico ao do esquema de redefini\u00E7\u00E3o, atualmente ''{0}''.
-        src-redefine.5.a.a = src-redefine.5.a.a: N\u00E3o foram encontrados filhos sem anota\u00E7\u00E3o de <simpleType>. Os filhos <simpleType> dos elementos <redefine> devem ter descendentes de <restriction> com atributos 'base' que fazem refer\u00EAncia a eles pr\u00F3prios.
-        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' n\u00E3o \u00E9 um elemento filho v\u00E1lido. Os filhos <simpleType> dos elementos <redefine> devem ter descendentes de <restriction> com atributos ''base'' que fazem refer\u00EAncia a eles pr\u00F3prios.
-        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' n\u00E3o tem um atributo "base" que faz refer\u00EAncia ao elemento ''{1}''. <simpleType> filhos dos elementos <redefine> devem ter descendentes de <restriction> com atributos ''base'' que fazem refer\u00EAncia a eles pr\u00F3prios.
-        src-redefine.5.b.a = src-redefine.5.b.a: Nenhum filho sem anota\u00E7\u00E3o de <complexType> foi encontrado. Os filhos de <complexType> dos elementos <redefine> devem ter os descendentes <extension> ou <restriction>, com atributos 'base' que fazem refer\u00EAncia a eles pr\u00F3prios.
-        src-redefine.5.b.b = src-redefine.5.b.b: Nenhum neto sem anota\u00E7\u00E3o de <complexType> foi encontrado. Os filhos de <complexType> dos elementos <redefine> devem ter os descendentes <extension> ou <restriction> com atributos 'base' que fazem refer\u00EAncia a eles pr\u00F3prios.
-        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}'' n\u00E3o \u00E9 um elemento do neto v\u00E1lido. Os filhos de <complexType> dos elementos <redefine> devem ter os descendentes <extension> ou <restriction> com atributos ''base'' que fazem refer\u00EAncia a eles pr\u00F3prios.
-        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}'' n\u00E3o tem um atributo "base" que faz refer\u00EAncia ao elemento redefinido ''{1}''. Os filhos de <complexType> dos elementos <redefine> devem ter descendentes de <extension> ou <restriction> com atributos ''base'' que fazem refer\u00EAncia a eles pr\u00F3prios.
-        src-redefine.6.1.1 = src-redefine.6.1.1: Se um filho do grupo de um elemento <redefine> contiver um grupo que faz refer\u00EAncia a si pr\u00F3prio, ele deve ter exatamente 1; este tem ''{0}''.
-        src-redefine.6.1.2 = src-redefine.6.1.2: O grupo ''{0}'' que cont\u00E9m um refer\u00EAncia a um grupo que est\u00E1 sendo redefinido deve ter ''minOccurs'' = ''maxOccurs'' = 1.
-        src-redefine.6.2.1 = src-redefine.6.2.1: Nenhum grupo no esquema redefinido tem uma correspond\u00EAncia de nome ''{0}''.
-        src-redefine.6.2.2 = src-redefine.6.2.2: O grupo ''{0}'' n\u00E3o restringe adequadamente o grupo que ele redefine; restri\u00E7\u00E3o violada: ''{1}''.
-        src-redefine.7.1 = src-redefine.7.1: Se um filho de attributeGroup de um elemento <redefine> contiver um attributeGroup que faz refer\u00EAncia a ele pr\u00F3prio, ele deve ter exatamente 1; este tem {0}.
-        src-redefine.7.2.1 = src-redefine.7.2.1: Nenhum attributeGroup no esquema redefinido tem uma correspond\u00EAncia de nome ''{0}''.
-        src-redefine.7.2.2 = src-redefine.7.2.2: O AttributeGroup ''{0}'' n\u00E3o restringe adequadamente o attributeGroup que ele redefine; restri\u00E7\u00E3o violada: ''{1}''.
-        src-resolve = src-resolve: N\u00E3o \u00E9 poss\u00EDvel resolver o nome ''{0}'' para um componente ''{1}''.
-        src-resolve.4.1 = src-resolve.4.1: Erro ao resolver o componente ''{2}''. Foi detectado que ''{2}'' n\u00E3o tem namespace, mas n\u00E3o \u00E9 poss\u00EDvel fazer refer\u00EAncia aos componentes em namespace de destino usando o documento do esquema ''{0}''. Se ''{2}'' for destinado a um namespace, talvez seja necess\u00E1rio um prefixo. Se for determinado que ''{2}'' n\u00E3o tem namespace, ent\u00E3o uma "importa\u00E7\u00E3o" sem um atributo "namespace" dever\u00E1 ser adicionada a "{0}".
-        src-resolve.4.2 = src-resolve.4.2: Erro ao resolver o componente ''{2}''. Foi detectado que ''{2}'' est\u00E1 no namespace ''{1}'', mas n\u00E3o \u00E9 poss\u00EDvel fazer refer\u00EAncia aos componentes em namespace de destino usando o documento do esquema ''{0}''. Se este for o namespace incorreto, talvez o prefixo de ''{2}'' precise ser alterado. Se este for o namespace correto, ent\u00E3o a tag de "importa\u00E7\u00E3o" apropriada dever\u00E1 ser adicionada a ''{0}''.
-        src-simple-type.2.a = src-simple-type.2.a: Foi encontrado um elemento <restriction> que tem um [attribute] base e um elemento <simpleType> entre seus [children]. Somente um \u00E9 permitido.
-        src-simple-type.2.b = src-simple-type.2.b: Foi encontrado um elemento <restriction> que n\u00E3o tem um [attribute] base nem um elemento <simpleType> entre seus [children]. \u00C9 necess\u00E1rio um.
-        src-simple-type.3.a = src-simple-type.3.a: Foi encontrado um elemento <list> que tem um itemType [attribute] e um elemento <simpleType> entre seus [children]. Somente um \u00E9 permitido.
-        src-simple-type.3.b = src-simple-type.3.b: Foi encontrado um elemento <list> que n\u00E3o tem um itemType [attribute] nem um elemento <simpleType> entre seus [children]. Um \u00E9 necess\u00E1rio.
+        src-redefine.3.1 = src-redefine.3.1: O targetNamespace do esquema mencionado, atualmente ''{1}'', deve ser idêntico ao do esquema de redefinição, atualmente ''{0}''.
+        src-redefine.5.a.a = src-redefine.5.a.a: Não foram encontrados filhos sem anotação de <simpleType>. Os filhos <simpleType> dos elementos <redefine> devem ter descendentes de <restriction> com atributos 'base' que fazem referência a eles próprios.
+        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' não é um elemento filho válido. Os filhos <simpleType> dos elementos <redefine> devem ter descendentes de <restriction> com atributos ''base'' que fazem referência a eles próprios.
+        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' não tem um atributo "base" que faz referência ao elemento ''{1}''. <simpleType> filhos dos elementos <redefine> devem ter descendentes de <restriction> com atributos ''base'' que fazem referência a eles próprios.
+        src-redefine.5.b.a = src-redefine.5.b.a: Nenhum filho sem anotação de <complexType> foi encontrado. Os filhos de <complexType> dos elementos <redefine> devem ter os descendentes <extension> ou <restriction>, com atributos 'base' que fazem referência a eles próprios.
+        src-redefine.5.b.b = src-redefine.5.b.b: Nenhum neto sem anotação de <complexType> foi encontrado. Os filhos de <complexType> dos elementos <redefine> devem ter os descendentes <extension> ou <restriction> com atributos 'base' que fazem referência a eles próprios.
+        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}'' não é um elemento do neto válido. Os filhos de <complexType> dos elementos <redefine> devem ter os descendentes <extension> ou <restriction> com atributos ''base'' que fazem referência a eles próprios.
+        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}'' não tem um atributo "base" que faz referência ao elemento redefinido ''{1}''. Os filhos de <complexType> dos elementos <redefine> devem ter descendentes de <extension> ou <restriction> com atributos ''base'' que fazem referência a eles próprios.
+        src-redefine.6.1.1 = src-redefine.6.1.1: Se um filho do grupo de um elemento <redefine> contiver um grupo que faz referência a si próprio, ele deve ter exatamente 1; este tem ''{0}''.
+        src-redefine.6.1.2 = src-redefine.6.1.2: O grupo ''{0}'' que contém um referência a um grupo que está sendo redefinido deve ter ''minOccurs'' = ''maxOccurs'' = 1.
+        src-redefine.6.2.1 = src-redefine.6.2.1: Nenhum grupo no esquema redefinido tem uma correspondência de nome ''{0}''.
+        src-redefine.6.2.2 = src-redefine.6.2.2: O grupo ''{0}'' não restringe adequadamente o grupo que ele redefine; restrição violada: ''{1}''.
+        src-redefine.7.1 = src-redefine.7.1: Se um filho de attributeGroup de um elemento <redefine> contiver um attributeGroup que faz referência a ele próprio, ele deve ter exatamente 1; este tem {0}.
+        src-redefine.7.2.1 = src-redefine.7.2.1: Nenhum attributeGroup no esquema redefinido tem uma correspondência de nome ''{0}''.
+        src-redefine.7.2.2 = src-redefine.7.2.2: O AttributeGroup ''{0}'' não restringe adequadamente o attributeGroup que ele redefine; restrição violada: ''{1}''.
+        src-resolve = src-resolve: Não é possível resolver o nome ''{0}'' para um componente ''{1}''.
+        src-resolve.4.1 = src-resolve.4.1: Erro ao resolver o componente ''{2}''. Foi detectado que ''{2}'' não tem namespace, mas não é possível fazer referência aos componentes em namespace de destino usando o documento do esquema ''{0}''. Se ''{2}'' for destinado a um namespace, talvez seja necessário um prefixo. Se for determinado que ''{2}'' não tem namespace, então uma "importação" sem um atributo "namespace" deverá ser adicionada a "{0}".
+        src-resolve.4.2 = src-resolve.4.2: Erro ao resolver o componente ''{2}''. Foi detectado que ''{2}'' está no namespace ''{1}'', mas não é possível fazer referência aos componentes em namespace de destino usando o documento do esquema ''{0}''. Se este for o namespace incorreto, talvez o prefixo de ''{2}'' precise ser alterado. Se este for o namespace correto, então a tag de "importação" apropriada deverá ser adicionada a ''{0}''.
+        src-simple-type.2.a = src-simple-type.2.a: Foi encontrado um elemento <restriction> que tem um [attribute] base e um elemento <simpleType> entre seus [children]. Somente um é permitido.
+        src-simple-type.2.b = src-simple-type.2.b: Foi encontrado um elemento <restriction> que não tem um [attribute] base nem um elemento <simpleType> entre seus [children]. É necessário um.
+        src-simple-type.3.a = src-simple-type.3.a: Foi encontrado um elemento <list> que tem um itemType [attribute] e um elemento <simpleType> entre seus [children]. Somente um é permitido.
+        src-simple-type.3.b = src-simple-type.3.b: Foi encontrado um elemento <list> que não tem um itemType [attribute] nem um elemento <simpleType> entre seus [children]. Um é necessário.
         src-single-facet-value = src-single-facet-value: O aspecto ''{0}'' foi definido mais de uma vez.
-        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: Um elemento <union> deve ter um memberTypes [attribute] n\u00E3o vazio ou pelo menos um elemento <simpleType> entre seus [children].
+        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: Um elemento <union> deve ter um memberTypes [attribute] não vazio ou pelo menos um elemento <simpleType> entre seus [children].
 
 #constraint valid (3.X.6)
 
-        ag-props-correct.2 = ag-props-correct.2: Erro do grupo de atributos ''{0}''. Os usos do atributo duplicado com o mesmo nome e namespace de destino foram especificados. O nome de uso do atributo duplicado \u00E9 ''{1}''.
-        ag-props-correct.3 = ag-props-correct.3: Erro do grupo de atributos ''{0}''. Duas declara\u00E7\u00F5es de atributo ''{1}'' e ''{2}'' t\u00EAm tipos que s\u00E3o obtidos do ID.
-        a-props-correct.2 = a-props-correct.2: Valor de restri\u00E7\u00E3o inv\u00E1lido ''{1}'' no atributo ''{0}''.
-        a-props-correct.3 = a-props-correct.3: O atributo ''{0}'' n\u00E3o pode usar ''fixed'' ou ''padr\u00E3o'' porque o '{'type definition'}' do atributo \u00E9 ID ou \u00E9 obtida do ID.
-        au-props-correct.2 = au-props-correct.2: Na declara\u00E7\u00E3o do atributo de ''{0}'', foi especificado um valor fixo de ''{1}''. Dessa forma, se o uso do atributo que faz refer\u00EAncia a ''{0}'' tamb\u00E9m tiver uma '{'value constraint'}', ele deve ser corrigido e seu valor deve ser ''{1}''.
-        cos-all-limited.1.2 = cos-all-limited.1.2: Um grupo de modelos 'all' deve ser exibido em uma part\u00EDcula com '{'min occurs'}' = '{'max occurs'}' = 1 e essa part\u00EDcula deve fazer parte de um par que constitui o '{'content type'}' de uma defini\u00E7\u00E3o de tipo complexa.
-        cos-all-limited.2 = cos-all-limited.2: O "{"max occurs"}" de um elemento em um grupo de modelos ''all'' deve ser 0 ou 1. O valor ''{0}'' do elemento ''{1}'' \u00E9 inv\u00E1lido.
-        cos-applicable-facets = cos-applicable-facets: O aspecto ''{0}'' n\u00E3o \u00E9 permitido pelo tipo {1}.
-        cos-ct-extends.1.1 = cos-ct-extends.1.1: O tipo ''{0}'' foi obtido atrav\u00E9s da extens\u00E3o do tipo ''{1}''. No entanto, o atributo ''final'' de ''{1}'' pro\u00EDbe a obten\u00E7\u00E3o por meio da extens\u00E3o.
-        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: O tipo de conte\u00FAdo de um tipo derivado e o de sua base deve ser misto ou ambos devem ser de somente do elemento. O tipo ''{0}'' \u00E9 somente do elemento, mas sua base n\u00E3o \u00E9.
-        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: O tipo de conte\u00FAdo de um tipo derivado e sua base devem ser mistos ou ambos devem ser somente de elemento. O tipo ''{0}'' \u00E9 misto, mas seu tipo de base n\u00E3o \u00E9.
-        cos-element-consistent = cos-element-consistent: Erro do tipo ''{0}''. V\u00E1rios elementos com o nome ''{1}'' com diferentes tipos aparecem no grupo de modelos.
-        cos-list-of-atomic = cos-list-of-atomic: Na defini\u00E7\u00E3o do tipo de lista ''{0}'', o tipo ''{1}'' \u00E9 um tipo de elemento da lista inv\u00E1lido porque n\u00E3o \u00E9 at\u00F4mico (''{1}'' \u00E9 um tipo de lista ou um tipo de uni\u00E3o que cont\u00E9m uma lista).
-        cos-nonambig = cos-nonambig: {0} e {1} (ou elementos de seu grupo de substitui\u00E7\u00E3o) violam a "Unique Particle Attribution". Durante a valida\u00E7\u00E3o deste esquema, a ambiguidade ser\u00E1 criada para essas duas part\u00EDculas.
-        cos-particle-restrict.a = cos-particle-restrict.a: A part\u00EDcula obtida est\u00E1 vazia e a base n\u00E3o pode ser esvaziada.
-        cos-particle-restrict.b = cos-particle-restrict.b: A part\u00EDcula base est\u00E1 vazia, mas a part\u00EDcula obtida n\u00E3o est\u00E1.
-        cos-particle-restrict.2 = cos-particle-restrict.2: Restri\u00E7\u00E3o de part\u00EDcula proibida: ''{0}''.
-        cos-st-restricts.1.1 = cos-st-restricts.1.1: O tipo ''{1}'' \u00E9 at\u00F4mico. Dessa forma, sua '{'base type definition'}', ''{0}'', deve ser uma defini\u00E7\u00E3o de tipo simples at\u00F4mico ou um tipo de dados primitivo criado.
-        cos-st-restricts.2.1 = cos-st-restricts.2.1: Na defini\u00E7\u00E3o do tipo de lista ''{0}'', o tipo ''{1}'' \u00E9 um tipo de item inv\u00E1lido porque \u00E9 um tipo  de lista ou um tipo de uni\u00E3o que cont\u00E9m uma lista.
-        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: O componente "{"final"}" da "{"item type definition"}" ''{0}'' cont\u00E9m ''list''. Isso significa que ''{0}'' n\u00E3o pode ser usado como um tipo de item do tipo de lista ''{1}''.
-        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: O componente "{"final"}" de "{"member type definitions"}", ''{0}'', cont\u00E9m ''union''. Isso significa que ''{0}'' n\u00E3o pode ser usado como um tipo de membro do tipo de uni\u00E3o ''{1}''.
-        cos-valid-default.2.1 = cos-valid-padr\u00E3o.2.1: O elemento ''{0}'' tem uma restri\u00E7\u00E3o de valor e deve ter um modelo de conte\u00FAdo simples ou misto.
-        cos-valid-default.2.2.2 = cos-valid-padr\u00E3o.2.2.2: Como o elemento ''{0}'' tem uma '{'value constraint'}' e sua defini\u00E7\u00E3o de tipo tem {''content type'}' misto, ent\u00E3o a part\u00EDcula do '{'content type'}' deve ser esvazi\u00E1vel.
+        ag-props-correct.2 = ag-props-correct.2: Erro do grupo de atributos ''{0}''. Os usos do atributo duplicado com o mesmo nome e namespace de destino foram especificados. O nome de uso do atributo duplicado é ''{1}''.
+        ag-props-correct.3 = ag-props-correct.3: Erro do grupo de atributos ''{0}''. Duas declarações de atributo ''{1}'' e ''{2}'' têm tipos que são obtidos do ID.
+        a-props-correct.2 = a-props-correct.2: Valor de restrição inválido ''{1}'' no atributo ''{0}''.
+        a-props-correct.3 = a-props-correct.3: O atributo ''{0}'' não pode usar ''fixed'' ou ''padrão'' porque o '{'type definition'}' do atributo é ID ou é obtida do ID.
+        au-props-correct.2 = au-props-correct.2: Na declaração do atributo de ''{0}'', foi especificado um valor fixo de ''{1}''. Dessa forma, se o uso do atributo que faz referência a ''{0}'' também tiver uma '{'value constraint'}', ele deve ser corrigido e seu valor deve ser ''{1}''.
+        cos-all-limited.1.2 = cos-all-limited.1.2: Um grupo de modelos 'all' deve ser exibido em uma partícula com '{'min occurs'}' = '{'max occurs'}' = 1 e essa partícula deve fazer parte de um par que constitui o '{'content type'}' de uma definição de tipo complexa.
+        cos-all-limited.2 = cos-all-limited.2: O "{"max occurs"}" de um elemento em um grupo de modelos ''all'' deve ser 0 ou 1. O valor ''{0}'' do elemento ''{1}'' é inválido.
+        cos-applicable-facets = cos-applicable-facets: O aspecto ''{0}'' não é permitido pelo tipo {1}.
+        cos-ct-extends.1.1 = cos-ct-extends.1.1: O tipo ''{0}'' foi obtido através da extensão do tipo ''{1}''. No entanto, o atributo ''final'' de ''{1}'' proíbe a obtenção por meio da extensão.
+        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: O tipo de conteúdo de um tipo derivado e o de sua base deve ser misto ou ambos devem ser de somente do elemento. O tipo ''{0}'' é somente do elemento, mas sua base não é.
+        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: O tipo de conteúdo de um tipo derivado e sua base devem ser mistos ou ambos devem ser somente de elemento. O tipo ''{0}'' é misto, mas seu tipo de base não é.
+        cos-element-consistent = cos-element-consistent: Erro do tipo ''{0}''. Vários elementos com o nome ''{1}'' com diferentes tipos aparecem no grupo de modelos.
+        cos-list-of-atomic = cos-list-of-atomic: Na definição do tipo de lista ''{0}'', o tipo ''{1}'' é um tipo de elemento da lista inválido porque não é atômico (''{1}'' é um tipo de lista ou um tipo de união que contém uma lista).
+        cos-nonambig = cos-nonambig: {0} e {1} (ou elementos de seu grupo de substituição) violam a "Unique Particle Attribution". Durante a validação deste esquema, a ambiguidade será criada para essas duas partículas.
+        cos-particle-restrict.a = cos-particle-restrict.a: A partícula obtida está vazia e a base não pode ser esvaziada.
+        cos-particle-restrict.b = cos-particle-restrict.b: A partícula base está vazia, mas a partícula obtida não está.
+        cos-particle-restrict.2 = cos-particle-restrict.2: Restrição de partícula proibida: ''{0}''.
+        cos-st-restricts.1.1 = cos-st-restricts.1.1: O tipo ''{1}'' é atômico. Dessa forma, sua '{'base type definition'}', ''{0}'', deve ser uma definição de tipo simples atômico ou um tipo de dados primitivo criado.
+        cos-st-restricts.2.1 = cos-st-restricts.2.1: Na definição do tipo de lista ''{0}'', o tipo ''{1}'' é um tipo de item inválido porque é um tipo  de lista ou um tipo de união que contém uma lista.
+        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: O componente "{"final"}" da "{"item type definition"}" ''{0}'' contém ''list''. Isso significa que ''{0}'' não pode ser usado como um tipo de item do tipo de lista ''{1}''.
+        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: O componente "{"final"}" de "{"member type definitions"}", ''{0}'', contém ''union''. Isso significa que ''{0}'' não pode ser usado como um tipo de membro do tipo de união ''{1}''.
+        cos-valid-default.2.1 = cos-valid-padrão.2.1: O elemento ''{0}'' tem uma restrição de valor e deve ter um modelo de conteúdo simples ou misto.
+        cos-valid-default.2.2.2 = cos-valid-padrão.2.2.2: Como o elemento ''{0}'' tem uma '{'value constraint'}' e sua definição de tipo tem {''content type'}' misto, então a partícula do '{'content type'}' deve ser esvaziável.
         c-props-correct.2 = c-props-correct.2: A cardinalidade dos Campos de keyref ''{0}'' e chave ''{1}'' deve ser correspondente.
-        ct-props-correct.3 = ct-props-correct.3: Defini\u00E7\u00F5es circulares detectadas para o tipo complexo ''{0}''. Isso significa que ''{0}'' est\u00E1 contido em sua pr\u00F3pria hierarquia de tipo, o que \u00E9 um erro.
-        ct-props-correct.4 = ct-props-correct.4: Erro do tipo ''{0}''. Os usos do atributo duplicado com o mesmo nome e namespace de destino foram especificados. O nome do uso do atributo duplicado \u00E9 ''{1}''.
-        ct-props-correct.5 = ct-props-correct.5: Erro do tipo ''{0}''. Duas declara\u00E7\u00F5es do atributo ''{1}'' e ''{2}'' t\u00EAm tipos que s\u00E3o obtidos do ID.
-        derivation-ok-restriction.1 = derivation-ok-restriction.1: O tipo ''{0}'' foi obtido por meio da restri\u00E7\u00E3o do tipo ''{1}''. No entanto, ''{1}'' tem uma propriedade '{'final'}' que pro\u00EDbe a deriva\u00E7\u00E3o por restri\u00E7\u00E3o.
-        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo tem um valor de ''uso'' de ''{2}'', que \u00E9 inconsistente com o valor ''obrigat\u00F3rio'' em um uso de atributo correspondente no tipo de base.
-        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo tem o tipo ''{2}'', que \u00E9 obtido de forma v\u00E1lida de "{3}", o tipo de uso do atributo correspondente no tipo de base.
-        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo tem uma restri\u00E7\u00E3o de valor efetivo que n\u00E3o \u00E9 fixa e a restri\u00E7\u00E3o de valor efetivo do atributo correspondente no tipo de base \u00E9 fixa.
-        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo tem uma restri\u00E7\u00E3o de valor efetivo fixa com um valor de "{2}" que n\u00E3o \u00E9 consistente com o valor de "{3}" para a restri\u00E7\u00E3o de valor efetivo fixa do uso do atributo correspondente no tipo de base.
-        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo n\u00E3o tem um uso de atributo correspondente na base e o tipo de base n\u00E3o tem um atributo curinga.
-        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo n\u00E3o tem um uso de atributo correspondente na base e o curinga no tipo de base n\u00E3o permite o namespace "{2}" deste uso do atributo.
-        derivation-ok-restriction.3 = derivation-ok-restriction.3: Erro do tipo ''{0}''. O uso do atributo ''{1}'' no tipo de base tem REQUIRED como verdadeiro, mas n\u00E3o h\u00E1 uso de atributo correspondente no tipo obtido.
-        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: Erro do tipo ''{0}''. A deriva\u00E7\u00E3o tem um curinga de atributo, mas a base n\u00E3o tem.
-        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: Erro do tipo ''{0}''. O curinga na deriva\u00E7\u00E3o n\u00E3o \u00E9 um subconjunto de curingas v\u00E1lido daquele da base.
-        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: Erro do tipo ''{0}''. O conte\u00FAdo do processo do curinga na deriva\u00E7\u00E3o ({1}) \u00E9 mais fraco que aquele da base ({2}).
-        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: Erro do tipo ''{0}''. O tipo de conte\u00FAdo simples deste tipo ''{1}'' n\u00E3o se trata de uma restri\u00E7\u00E3o v\u00E1lida do tipo de conte\u00FAdo simples da base, ''{2}''.
-        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: Erro do tipo ''{0}''. O tipo de conte\u00FAdo deste tipo est\u00E1 vazio, mas o tipo de conte\u00FAdo da base, ''{1}'', n\u00E3o est\u00E1 vazio ou \u00E9 esvazi\u00E1vel.
-        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: Erro do tipo ''{0}''. O tipo de conte\u00FAdo deste tipo \u00E9 misto, mas o tipo de conte\u00FAdo da base ''{1}'' n\u00E3o \u00E9.
-        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: Erro do tipo ''{0}''. A part\u00EDcula do tipo n\u00E3o \u00E9 uma restri\u00E7\u00E3o v\u00E1lida da part\u00EDcula da base.
-        enumeration-required-notation = enumeration-required-notation: O tipo de NOTATION, ''{0}'' usado por {2} ''{1}'', deve ter um valor de aspecto de enumera\u00E7\u00E3o que especifica os elementos de nota\u00E7\u00E3o usados por este tipo.
-        enumeration-valid-restriction = enumeration-valid-restriction: O valor da enumera\u00E7\u00E3o ''{0}'' n\u00E3o \u00E9 o espa\u00E7o do valor do tipo de base, {1}.
-        e-props-correct.2 = e-props-correct.2: Valor de restri\u00E7\u00E3o de valor inv\u00E1lido ''{1}'' no elemento ''{0}''.
-        e-props-correct.4 = e-props-correct.4: A "{"type definition"}" do elemento ''{0}'' n\u00E3o \u00E9 obtida de forma v\u00E1lida a partir da "{"type definition"}" de substitutionHead ''{1}'' ou a propriedade "{"substitution group exclusions"}" de ''{1}'' n\u00E3o permite esta deriva\u00E7\u00E3o.
-        e-props-correct.5 = e-props-correct.5: Uma "{"value constraint"}" n\u00E3o deve estar presente no elemento ''{0}'' porque a "{"type definition"}" do elemento ou o "{"content type"}" da "{"type definition"}" \u00E9 ID ou obtida do ID.
-        e-props-correct.6 = e-props-correct.6: Grupo de substitui\u00E7\u00E3o circular detectada para o elemento ''{0}''.
-        fractionDigits-valid-restriction = fractionDigits-valid-restriction: Na defini\u00E7\u00E3o de {2}, o valor ''{0}'' de ''fractionDigits'' do aspecto \u00E9 inv\u00E1lido porque ele deve ser <= ao valor de ''fractionDigits'' que foi definido como ''{1}'' em um dos tipos de ancestrais.
-        fractionDigits-totalDigits = fractionDigits-totalDigits: Na defini\u00E7\u00E3o de {2}, o valor ''{0}'' do aspecto ''fractionDigits'' \u00E9 inv\u00E1lido porque o valor deve ser <= o valor de ''totalDigits'' que \u00E9 ''{1}''.
-        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: Para o tipo {0}, \u00E9 um erro para que o valor do tamanho ''{1}'' seja menor que o valor de minLength ''{2}''.
-        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: Para o tipo {0}, \u00E9 um erro para que a base n\u00E3o tenha um aspecto de minLength, se a restri\u00E7\u00E3o atual tiver o aspecto minLength e a restri\u00E7\u00E3o atual ou a base tenha o aspecto de tamanho.
-        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: Para o tipo {0}, \u00E9 um erro para que o minLength ''{1}'' atual n\u00E3o seja igual ao minLength ''{2}'' base.
-        length-minLength-maxLength.2.1 = length-minLength-maxLength.1.2: Para o tipo {0}, \u00E9 um erro para que o valor do tamanho ''{1}'' seja maior que o valor de maxLength ''{2}''.
-        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: Para o tipo {0}, \u00E9 um erro para que a base n\u00E3o tenha um aspecto de maxLength, se a restri\u00E7\u00E3o atual tiver o aspecto maxLength e a restri\u00E7\u00E3o atual ou a base tiver o aspecto de tamanho.
-        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: Para o tipo {0}, \u00E9 um erro para que o maxLength ''{1}'' atual n\u00E3o seja igual ao maxnLength ''{2}'' base.
+        ct-props-correct.3 = ct-props-correct.3: Definições circulares detectadas para o tipo complexo ''{0}''. Isso significa que ''{0}'' está contido em sua própria hierarquia de tipo, o que é um erro.
+        ct-props-correct.4 = ct-props-correct.4: Erro do tipo ''{0}''. Os usos do atributo duplicado com o mesmo nome e namespace de destino foram especificados. O nome do uso do atributo duplicado é ''{1}''.
+        ct-props-correct.5 = ct-props-correct.5: Erro do tipo ''{0}''. Duas declarações do atributo ''{1}'' e ''{2}'' têm tipos que são obtidos do ID.
+        derivation-ok-restriction.1 = derivation-ok-restriction.1: O tipo ''{0}'' foi obtido por meio da restrição do tipo ''{1}''. No entanto, ''{1}'' tem uma propriedade '{'final'}' que proíbe a derivação por restrição.
+        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo tem um valor de ''uso'' de ''{2}'', que é inconsistente com o valor ''obrigatório'' em um uso de atributo correspondente no tipo de base.
+        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo tem o tipo ''{2}'', que é obtido de forma válida de "{3}", o tipo de uso do atributo correspondente no tipo de base.
+        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo tem uma restrição de valor efetivo que não é fixa e a restrição de valor efetivo do atributo correspondente no tipo de base é fixa.
+        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo tem uma restrição de valor efetivo fixa com um valor de "{2}" que não é consistente com o valor de "{3}" para a restrição de valor efetivo fixa do uso do atributo correspondente no tipo de base.
+        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo não tem um uso de atributo correspondente na base e o tipo de base não tem um atributo curinga.
+        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo não tem um uso de atributo correspondente na base e o curinga no tipo de base não permite o namespace "{2}" deste uso do atributo.
+        derivation-ok-restriction.3 = derivation-ok-restriction.3: Erro do tipo ''{0}''. O uso do atributo ''{1}'' no tipo de base tem REQUIRED como verdadeiro, mas não há uso de atributo correspondente no tipo obtido.
+        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: Erro do tipo ''{0}''. A derivação tem um curinga de atributo, mas a base não tem.
+        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: Erro do tipo ''{0}''. O curinga na derivação não é um subconjunto de curingas válido daquele da base.
+        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: Erro do tipo ''{0}''. O conteúdo do processo do curinga na derivação ({1}) é mais fraco que aquele da base ({2}).
+        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: Erro do tipo ''{0}''. O tipo de conteúdo simples deste tipo ''{1}'' não se trata de uma restrição válida do tipo de conteúdo simples da base, ''{2}''.
+        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: Erro do tipo ''{0}''. O tipo de conteúdo deste tipo está vazio, mas o tipo de conteúdo da base, ''{1}'', não está vazio ou é esvaziável.
+        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: Erro do tipo ''{0}''. O tipo de conteúdo deste tipo é misto, mas o tipo de conteúdo da base ''{1}'' não é.
+        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: Erro do tipo ''{0}''. A partícula do tipo não é uma restrição válida da partícula da base.
+        enumeration-required-notation = enumeration-required-notation: O tipo de NOTATION, ''{0}'' usado por {2} ''{1}'', deve ter um valor de aspecto de enumeração que especifica os elementos de notação usados por este tipo.
+        enumeration-valid-restriction = enumeration-valid-restriction: O valor da enumeração ''{0}'' não é o espaço do valor do tipo de base, {1}.
+        e-props-correct.2 = e-props-correct.2: Valor de restrição de valor inválido ''{1}'' no elemento ''{0}''.
+        e-props-correct.4 = e-props-correct.4: A "{"type definition"}" do elemento ''{0}'' não é obtida de forma válida a partir da "{"type definition"}" de substitutionHead ''{1}'' ou a propriedade "{"substitution group exclusions"}" de ''{1}'' não permite esta derivação.
+        e-props-correct.5 = e-props-correct.5: Uma "{"value constraint"}" não deve estar presente no elemento ''{0}'' porque a "{"type definition"}" do elemento ou o "{"content type"}" da "{"type definition"}" é ID ou obtida do ID.
+        e-props-correct.6 = e-props-correct.6: Grupo de substituição circular detectada para o elemento ''{0}''.
+        fractionDigits-valid-restriction = fractionDigits-valid-restriction: Na definição de {2}, o valor ''{0}'' de ''fractionDigits'' do aspecto é inválido porque ele deve ser <= ao valor de ''fractionDigits'' que foi definido como ''{1}'' em um dos tipos de ancestrais.
+        fractionDigits-totalDigits = fractionDigits-totalDigits: Na definição de {2}, o valor ''{0}'' do aspecto ''fractionDigits'' é inválido porque o valor deve ser <= o valor de ''totalDigits'' que é ''{1}''.
+        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: Para o tipo {0}, é um erro para que o valor do tamanho ''{1}'' seja menor que o valor de minLength ''{2}''.
+        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: Para o tipo {0}, é um erro para que a base não tenha um aspecto de minLength, se a restrição atual tiver o aspecto minLength e a restrição atual ou a base tenha o aspecto de tamanho.
+        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: Para o tipo {0}, é um erro para que o minLength ''{1}'' atual não seja igual ao minLength ''{2}'' base.
+        length-minLength-maxLength.2.1 = length-minLength-maxLength.1.2: Para o tipo {0}, é um erro para que o valor do tamanho ''{1}'' seja maior que o valor de maxLength ''{2}''.
+        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: Para o tipo {0}, é um erro para que a base não tenha um aspecto de maxLength, se a restrição atual tiver o aspecto maxLength e a restrição atual ou a base tiver o aspecto de tamanho.
+        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: Para o tipo {0}, é um erro para que o maxLength ''{1}'' atual não seja igual ao maxnLength ''{2}'' base.
         length-valid-restriction = length-valid-restriction: Erro do tipo ''{2}''. O valor do tamanho = ''{0}'' deve ser = o valor do tipo de base ''{1}''.
         maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: Erro do tipo ''{2}''. O valor maxExclusive =''{0}'' deve ser <= maxExclusive do tipo de base ''{1}''.
         maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: Erro do tipo ''{2}''. O valor maxExclusive =''{0}'' deve ser <= maxInclusive do tipo de base ''{1}''.
         maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: Erro do tipo ''{2}''. O valor maxExclusive =''{0}'' deve ser > minExclusive do tipo de base ''{1}''.
         maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4: Erro do tipo ''{2}''. O valor maxExclusive =''{0}'' deve ser > minExclusive do tipo de base ''{1}''.
-        maxInclusive-maxExclusive = maxInclusive-maxExclusive: \u00C9 um erro para que maxInclusive e maxExclusive sejam especificados para o mesmo tipo de dados. Em {2}, maxInclusive = ''{0}'' e maxExclusive = ''{1}''.
+        maxInclusive-maxExclusive = maxInclusive-maxExclusive: É um erro para que maxInclusive e maxExclusive sejam especificados para o mesmo tipo de dados. Em {2}, maxInclusive = ''{0}'' e maxExclusive = ''{1}''.
         maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: Erro do tipo ''{2}''. O valor maxInclusive =''{0}'' deve ser <= maxInclusive do tipo de base ''{1}''.
         maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: Erro do tipo ''{2}''. O valor maxInclusive =''{0}'' deve ser <= maxExclusive do tipo de base ''{1}''.
         maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: Erro do tipo ''{2}''. O valor maxInclusive =''{0}'' deve ser > = minInclusive do tipo de base ''{1}''.
         maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: Erro do tipo ''{2}''. O valor maxInclusive =''{0}'' deve ser > minInclusive do tipo de base ''{1}''.
-        maxLength-valid-restriction = maxLength-valid-restriction: Na defini\u00E7\u00E3o de {2}, o valor maxLength = ''{0}'' deve ser <= que o do tipo de base ''{1}''.
-        mg-props-correct.2 = mg-props-correct.2: Defini\u00E7\u00F5es circulares detectadas para o grupo ''{0}''. Seguir de forma recursiva dos valores de '{'term'}' das part\u00EDculas conduz a uma part\u00EDcula cujo '{'term'}' \u00E9 o pr\u00F3prio grupo.
-        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: Na defini\u00E7\u00E3o de {2}, o valor minExclusive = ''{0}'' deve ser <= que o valor maxExclusive = ''{1}''.
-        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: Na defini\u00E7\u00E3o de {2}, o valor minExclusive = ''{0}'' deve ser <= que o valor maxInclusive = ''{1}''.
+        maxLength-valid-restriction = maxLength-valid-restriction: Na definição de {2}, o valor maxLength = ''{0}'' deve ser <= que o do tipo de base ''{1}''.
+        mg-props-correct.2 = mg-props-correct.2: Definições circulares detectadas para o grupo ''{0}''. Seguir de forma recursiva dos valores de '{'term'}' das partículas conduz a uma partícula cujo '{'term'}' é o próprio grupo.
+        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: Na definição de {2}, o valor minExclusive = ''{0}'' deve ser <= que o valor maxExclusive = ''{1}''.
+        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: Na definição de {2}, o valor minExclusive = ''{0}'' deve ser <= que o valor maxInclusive = ''{1}''.
         minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: Erro do tipo ''{2}''. O valor minExclusive =''{0}'' deve ser >= minExclusive do tipo de base ''{1}''.
         minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2: Erro do tipo ''{2}''. O valor minExclusive =''{0}'' deve ser <= maxExclusive do tipo de base ''{1}''.
         minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3: Erro do tipo ''{2}''. O valor minExclusive =''{0}'' deve ser >= minInclusive do tipo de base ''{1}''.
         minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: Erro do tipo ''{2}''. O valor minExclusive =''{0}'' deve ser < maxExclusive do tipo de base ''{1}''.
-        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: Na defini\u00E7\u00E3o de {2}, o valor minInclusive = ''{0}'' deve ser <= que o valor maxInclusive = ''{1}''.
-        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: Na defini\u00E7\u00E3o de {2}, o valor minInclusive = ''{0}'' deve ser <= que o valor maxExclusive = ''{1}''.
-        minInclusive-minExclusive = minInclusive-minExclusive: \u00C9 um erro para que minInclusive e minExclusive sejam especificados para o mesmo tipo de dados. Em {2}, minInclusive = ''{0}'' e minExclusive = ''{1}''.
+        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: Na definição de {2}, o valor minInclusive = ''{0}'' deve ser <= que o valor maxInclusive = ''{1}''.
+        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: Na definição de {2}, o valor minInclusive = ''{0}'' deve ser <= que o valor maxExclusive = ''{1}''.
+        minInclusive-minExclusive = minInclusive-minExclusive: É um erro para que minInclusive e minExclusive sejam especificados para o mesmo tipo de dados. Em {2}, minInclusive = ''{0}'' e minExclusive = ''{1}''.
         minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: Erro do tipo ''{2}''. O valor minInclusive =''{0}'' deve ser >= minInclusive do tipo de base ''{1}''.
         minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: Erro do tipo ''{2}''. O valor minInclusive =''{0}'' deve ser <= maxInclusive do tipo de base ''{1}''.
         minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: Erro do tipo ''{2}''. O valor minInclusive =''{0}'' deve ser > minExclusive do tipo de base ''{1}''.
         minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: Erro do tipo ''{2}''. O valor minInclusive =''{0}'' deve ser <= maxExclusive do tipo de base ''{1}''.
-        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: Na defini\u00E7\u00E3o de {2}, o valor minLength = ''{0}'' deve ser < o valor de maxLength = ''{1}''.
-        minLength-valid-restriction = minLength-valid-restriction: Na defini\u00E7\u00E3o de {2}, minLength = ''{0}'' deve ser >= que o do tipo de base ''{1}''.
-        no-xmlns = no-xmlns: O {name} de uma declara\u00E7\u00E3o de atributo n\u00E3o deve corresponder a 'xmlns'.
-        no-xsi = no-xsi: O "{"target namespace"}" de uma declara\u00E7\u00E3o do atributo n\u00E3o deve corresponder a ''{0}''.
-        p-props-correct.2.1 = p-props-correct.2.1: Na declara\u00E7\u00E3o de ''{0}'', o valor de ''minOccurs'' \u00E9 ''{1}'', mas n\u00E3o deve ser maior que o valor de ''maxOccurs'', que \u00E9 ''{2}''.
-        rcase-MapAndSum.1 = rcase-MapAndSum.1: N\u00E3o h\u00E1 um mapeamento funcional completo entre as part\u00EDculas.
-        rcase-MapAndSum.2 = rcase-MapAndSum.2: A faixa de ocorr\u00EAncia do grupo, ({0},{1}), n\u00E3o \u00E9 uma restri\u00E7\u00E3o v\u00E1lida da faixa de ocorr\u00EAncia do grupo base, ({2},{3}).
-        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: Os elementos t\u00EAm nomes e namespaces de destino que n\u00E3o s\u00E3o iguais: Elemento ''{0}'' no namespace ''{1}'' e elemento ''{2}'' no namespace ''{3}''.
-        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Erro da part\u00EDcula cujo "{"term"}" \u00E9 a declara\u00E7\u00E3o do elemento ''{0}''. O "{"nillable"}" da declara\u00E7\u00E3o do elemento \u00E9 verdadeiro, mas a part\u00EDcula correspondente no tipo de base tem uma declara\u00E7\u00E3o de elemento cujo "{"nillable"}" \u00E9 falso.
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Erro da part\u00EDcula cujo "{"term"}" \u00E9 a declara\u00E7\u00E3o do elemento ''{0}''. Sua faixa de ocorr\u00EAncia, ({1},{2}) n\u00E3o \u00E9 uma restri\u00E7\u00E3o v\u00E1lida da faixa, ({3},{4} da part\u00EDcula correspondente no tipo de base.
-        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: O elemento ''{0}'' n\u00E3o est\u00E1 fixado, mas o elemento correspondente no tipo de base est\u00E1 fixado com o valor ''{1}''.
-        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: O elemento ''{0}'' est\u00E1 fixado com o valor ''{1}'', mas o elemento correspondente no tipo de base est\u00E1 fixado com o valor ''{2}''.
-        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: Restri\u00E7\u00F5es de identidade do elemento ''{0}'' n\u00E3o s\u00E3o subconjuntos daquelas da base.
-        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: As substitui\u00E7\u00F5es n\u00E3o permitidas do elemento ''{0}'' n\u00E3o s\u00E3o um superconjunto daquelas da base.
-        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: O tipo de elemento ''{0}'', ''{1}'' n\u00E3o \u00E9 obtido do tipo de elemento base ''{2}''.
-        rcase-NSCompat.1 = rcase-NSCompat.1: O elemento ''{0}'' tem um namespace ''{1}'' que n\u00E3o \u00E9 permitido pelo curinga na base.
-        rcase-NSCompat.2 = rcase-NSCompat.2: Erro da part\u00EDcula cujo "{"term"}" \u00E9 a declara\u00E7\u00E3o do elemento ''{0}''. Sua faixa de ocorr\u00EAncia, ({1},{2}), n\u00E3o \u00E9 uma restri\u00E7\u00E3o v\u00E1lida da faixa, ({3},{4}, da part\u00EDcula correspondente no tipo de base.
-        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: N\u00E3o h\u00E1 um mapeamento funcional completo entre as part\u00EDculas.
-        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: A faixa de ocorr\u00EAncias do grupo, ({0},{1}), n\u00E3o \u00E9 uma restri\u00E7\u00E3o v\u00E1lida da faixa de curingas base, ({2},{3}).
-        rcase-NSSubset.1 = rcase-NSSubset.1: Curinga n\u00E3o \u00E9 um subconjunto de curingas correspondente na base.
-        rcase-NSSubset.2 = rcase-NSSubset.2: A faixa de ocorr\u00EAncias de curinga, ({0},{1}), n\u00E3o \u00E9 uma restri\u00E7\u00E3o v\u00E1lida daquela da base, ({2},{3}),.
-        rcase-NSSubset.3 = rcase-NSSubset.3: O conte\u00FAdo do processo do curinga, ''{0}'', \u00E9 mais fraco que aquele da base, ''{1}''.
-        rcase-Recurse.1 = rcase-Recurse.1: A faixa de ocorr\u00EAncia do grupo, ({0},{1}), n\u00E3o \u00E9 uma restri\u00E7\u00E3o v\u00E1lida da faixa de ocorr\u00EAncia do grupo base, ({2},{3}).
-        rcase-Recurse.2 = rcase-Recurse.2: N\u00E3o h\u00E1 um mapeamento funcional completo entre as part\u00EDculas.
-        rcase-RecurseLax.1 = rcase-RecurseLax.1: A faixa de ocorr\u00EAncias do grupo, ({0},{1}), n\u00E3o \u00E9 uma restri\u00E7\u00E3o v\u00E1lida da faixa de ocorr\u00EAncias do grupo base, ({2},{3}).
-        rcase-RecurseLax.2 = rcase-RecurseLax.2: N\u00E3o h\u00E1 um mapeamento funcional completo entre as part\u00EDculas.
-        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: A faixa de ocorr\u00EAncias do grupo, ({0},{1}), n\u00E3o \u00E9 uma restri\u00E7\u00E3o v\u00E1lida da faixa de ocorr\u00EAncias do grupo base, ({2},{3}).
-        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: N\u00E3o h\u00E1 um mapeamento funcional completo entre as part\u00EDculas.
+        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: Na definição de {2}, o valor minLength = ''{0}'' deve ser < o valor de maxLength = ''{1}''.
+        minLength-valid-restriction = minLength-valid-restriction: Na definição de {2}, minLength = ''{0}'' deve ser >= que o do tipo de base ''{1}''.
+        no-xmlns = no-xmlns: O {name} de uma declaração de atributo não deve corresponder a 'xmlns'.
+        no-xsi = no-xsi: O "{"target namespace"}" de uma declaração do atributo não deve corresponder a ''{0}''.
+        p-props-correct.2.1 = p-props-correct.2.1: Na declaração de ''{0}'', o valor de ''minOccurs'' é ''{1}'', mas não deve ser maior que o valor de ''maxOccurs'', que é ''{2}''.
+        rcase-MapAndSum.1 = rcase-MapAndSum.1: Não há um mapeamento funcional completo entre as partículas.
+        rcase-MapAndSum.2 = rcase-MapAndSum.2: A faixa de ocorrência do grupo, ({0},{1}), não é uma restrição válida da faixa de ocorrência do grupo base, ({2},{3}).
+        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: Os elementos têm nomes e namespaces de destino que não são iguais: Elemento ''{0}'' no namespace ''{1}'' e elemento ''{2}'' no namespace ''{3}''.
+        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Erro da partícula cujo "{"term"}" é a declaração do elemento ''{0}''. O "{"nillable"}" da declaração do elemento é verdadeiro, mas a partícula correspondente no tipo de base tem uma declaração de elemento cujo "{"nillable"}" é falso.
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Erro da partícula cujo "{"term"}" é a declaração do elemento ''{0}''. Sua faixa de ocorrência, ({1},{2}) não é uma restrição válida da faixa, ({3},{4} da partícula correspondente no tipo de base.
+        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: O elemento ''{0}'' não está fixado, mas o elemento correspondente no tipo de base está fixado com o valor ''{1}''.
+        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: O elemento ''{0}'' está fixado com o valor ''{1}'', mas o elemento correspondente no tipo de base está fixado com o valor ''{2}''.
+        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: Restrições de identidade do elemento ''{0}'' não são subconjuntos daquelas da base.
+        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: As substituições não permitidas do elemento ''{0}'' não são um superconjunto daquelas da base.
+        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: O tipo de elemento ''{0}'', ''{1}'' não é obtido do tipo de elemento base ''{2}''.
+        rcase-NSCompat.1 = rcase-NSCompat.1: O elemento ''{0}'' tem um namespace ''{1}'' que não é permitido pelo curinga na base.
+        rcase-NSCompat.2 = rcase-NSCompat.2: Erro da partícula cujo "{"term"}" é a declaração do elemento ''{0}''. Sua faixa de ocorrência, ({1},{2}), não é uma restrição válida da faixa, ({3},{4}, da partícula correspondente no tipo de base.
+        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: Não há um mapeamento funcional completo entre as partículas.
+        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: A faixa de ocorrências do grupo, ({0},{1}), não é uma restrição válida da faixa de curingas base, ({2},{3}).
+        rcase-NSSubset.1 = rcase-NSSubset.1: Curinga não é um subconjunto de curingas correspondente na base.
+        rcase-NSSubset.2 = rcase-NSSubset.2: A faixa de ocorrências de curinga, ({0},{1}), não é uma restrição válida daquela da base, ({2},{3}),.
+        rcase-NSSubset.3 = rcase-NSSubset.3: O conteúdo do processo do curinga, ''{0}'', é mais fraco que aquele da base, ''{1}''.
+        rcase-Recurse.1 = rcase-Recurse.1: A faixa de ocorrência do grupo, ({0},{1}), não é uma restrição válida da faixa de ocorrência do grupo base, ({2},{3}).
+        rcase-Recurse.2 = rcase-Recurse.2: Não há um mapeamento funcional completo entre as partículas.
+        rcase-RecurseLax.1 = rcase-RecurseLax.1: A faixa de ocorrências do grupo, ({0},{1}), não é uma restrição válida da faixa de ocorrências do grupo base, ({2},{3}).
+        rcase-RecurseLax.2 = rcase-RecurseLax.2: Não há um mapeamento funcional completo entre as partículas.
+        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: A faixa de ocorrências do grupo, ({0},{1}), não é uma restrição válida da faixa de ocorrências do grupo base, ({2},{3}).
+        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: Não há um mapeamento funcional completo entre as partículas.
 #        We're using sch-props-correct.2 instead of the old src-redefine.1
 #        src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
-        sch-props-correct.2 = sch-props-correct.2: Um esquema n\u00E3o pode conter dois componentes globais com o mesmo nome; este esquema cont\u00E9m duas ocorr\u00EAncias de ''{0}''.
-        st-props-correct.2 = st-props-correct.2: Defini\u00E7\u00F5es circulares detectadas para o tipo simples {0}''. Isso significa que ''{0}'' est\u00E1 contido em sua pr\u00F3pria hierarquia de tipo, o que \u00E9 um erro.
-        st-props-correct.3 = st-props-correct.3: Erro do tipo ''{0}''. O valor de '{'final'}' da '{'base type definition'}', ''{1}'', pro\u00EDbe a obten\u00E7\u00E3o por restri\u00E7\u00E3o.
-        totalDigits-valid-restriction = totalDigits-valid-restriction: Na defini\u00E7\u00E3o de {2}, o valor ''{0}'' do "totalDigits"'' do aspecto \u00E9 inv\u00E1lido porque ele deve ser <= ao valor de ''totalDigits", que foi definido como ''{1}'' em um dos tipos de ancestrais.
-        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: Na defini\u00E7\u00E3o de {0}, o valor ''{1}'' do aspecto ''whitespace'' \u00E9 inv\u00E1lido porque o valor para ''whitespace'' foi definido como ''colapse'' em um dos tipos de ancestrais.
-        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: Na defini\u00E7\u00E3o de {0}, o valor do aspecto ''preserve'' \u00E9 inv\u00E1lido para o aspecto "whitespace" porque o valor para ''whitespace'' foi definido como ''replace'' em um dos tipos de ancestrais.
+        sch-props-correct.2 = sch-props-correct.2: Um esquema não pode conter dois componentes globais com o mesmo nome; este esquema contém duas ocorrências de ''{0}''.
+        st-props-correct.2 = st-props-correct.2: Definições circulares detectadas para o tipo simples {0}''. Isso significa que ''{0}'' está contido em sua própria hierarquia de tipo, o que é um erro.
+        st-props-correct.3 = st-props-correct.3: Erro do tipo ''{0}''. O valor de '{'final'}' da '{'base type definition'}', ''{1}'', proíbe a obtenção por restrição.
+        totalDigits-valid-restriction = totalDigits-valid-restriction: Na definição de {2}, o valor ''{0}'' do "totalDigits"'' do aspecto é inválido porque ele deve ser <= ao valor de ''totalDigits", que foi definido como ''{1}'' em um dos tipos de ancestrais.
+        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: Na definição de {0}, o valor ''{1}'' do aspecto ''whitespace'' é inválido porque o valor para ''whitespace'' foi definido como ''colapse'' em um dos tipos de ancestrais.
+        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: Na definição de {0}, o valor do aspecto ''preserve'' é inválido para o aspecto "whitespace" porque o valor para ''whitespace'' foi definido como ''replace'' em um dos tipos de ancestrais.
 
 #schema for Schemas
 
-        s4s-att-invalid-value = s4s-att-invalid-value: Valor de atributo inv\u00E1lido para ''{1}'' no elemento''{0}''. Motivo gravado: {2}
+        s4s-att-invalid-value = s4s-att-invalid-value: Valor de atributo inválido para ''{1}'' no elemento''{0}''. Motivo gravado: {2}
         s4s-att-must-appear = s4s-att-must-appear: O atributo ''{1}'' deve aparecer no elemento ''{0}''.
-        s4s-att-not-allowed = s4s-att-not-allowed: O atributo ''{1}'' n\u00E3o pode aparecer no elemento ''{0}''.
-        s4s-elt-invalid = s4s-elt-invalid: O elemento ''{0}'' n\u00E3o \u00E9 um elemento v\u00E1lido em um documento do esquema.
-        s4s-elt-must-match.1 = s4s-elt-must-match.1: O conte\u00FAdo de ''{0}'' deve corresponder a {1}. Foi detectado um problema come\u00E7ando em: {2}.
-        s4s-elt-must-match.2 = s4s-elt-must-match.2: O conte\u00FAdo de ''{0}'' deve corresponder a {1}. N\u00E3o foram encontrados elementos suficientes.
+        s4s-att-not-allowed = s4s-att-not-allowed: O atributo ''{1}'' não pode aparecer no elemento ''{0}''.
+        s4s-elt-invalid = s4s-elt-invalid: O elemento ''{0}'' não é um elemento válido em um documento do esquema.
+        s4s-elt-must-match.1 = s4s-elt-must-match.1: O conteúdo de ''{0}'' deve corresponder a {1}. Foi detectado um problema começando em: {2}.
+        s4s-elt-must-match.2 = s4s-elt-must-match.2: O conteúdo de ''{0}'' deve corresponder a {1}. Não foram encontrados elementos suficientes.
         # the "invalid-content" messages provide less information than the "must-match" counterparts above. They're used for complex types when providing a "match" would be an information dump
-        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: O conte\u00FAdo de ''{0}'' \u00E9 inv\u00E1lido. O elemento ''{1}'' \u00E9 inv\u00E1lido, mal posicionado ou ocorre com muita frequ\u00EAncia.
-        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: O conte\u00FAdo de ''{0}'' \u00E9 inv\u00E1lido. O elemento ''{1}'' n\u00E3o pode ficar vazio.
-        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: Os elementos do tipo ''{0}'' n\u00E3o podem aparecer ap\u00F3s as declara\u00E7\u00F5es como filhos de um elemento de <schema>.
+        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: O conteúdo de ''{0}'' é inválido. O elemento ''{1}'' é inválido, mal posicionado ou ocorre com muita frequência.
+        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: O conteúdo de ''{0}'' é inválido. O elemento ''{1}'' não pode ficar vazio.
+        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: Os elementos do tipo ''{0}'' não podem aparecer após as declarações como filhos de um elemento de <schema>.
         s4s-elt-schema-ns = s4s-elt-schema-ns: O namespace do elemento ''{0}'' deve ser do namespace do esquema, ''http://www.w3.org/2001/XMLSchema''.
-        s4s-elt-character = s4s-elt-character: N\u00E3o s\u00E3o permitidos caracteres sem espa\u00E7o em branco nos elementos do esquema diferentes de ''xs:appinfo'' e ''xs:documentation''. Verificado ''{0}''.
+        s4s-elt-character = s4s-elt-character: Não são permitidos caracteres sem espaço em branco nos elementos do esquema diferentes de ''xs:appinfo'' e ''xs:documentation''. Verificado ''{0}''.
 
 # codes not defined by the spec
 
-        c-fields-xpaths = c-fields-xpaths: O valor do campo = ''{0}'' n\u00E3o \u00E9 v\u00E1lido.
-        c-general-xpath = c-general-xpath: A express\u00E3o ''{0}'' n\u00E3o \u00E9 v\u00E1lida em rela\u00E7\u00E3o ao subconjunto de XPath suportado pelo Esquema XML.
-        c-general-xpath-ns = c-general-xpath-ns: Um prefixo de namespace na express\u00E3o de XPath ''{0}'' n\u00E3o foi associado a um namespace.
-        c-selector-xpath = c-selector-xpath: O valor do seletor = ''{0}'' n\u00E3o \u00E9 v\u00E1lido; os xpaths do seletor n\u00E3o podem conter atributos.
-        EmptyTargetNamespace = EmptyTargetNamespace: No documento do esquema ''{0}'', o valor do atributo ''targetNamespace'' n\u00E3o pode ser uma string vazia.
-        FacetValueFromBase = FacetValueFromBase: Na declara\u00E7\u00E3o do tipo ''{0}'', o valor ''{1}'' do aspecto ''{2}'' deve ser proveniente do espa\u00E7o de valor do tipo de base, ''{3}''.
-        FixedFacetValue = FixedFacetValue: Na defini\u00E7\u00E3o de {3}, o valor ''{1}'' do aspecto ''{0}'' \u00E9 inv\u00E1lido porque o valor de ''{0}'' foi enviado para ''{2}'' em um dos tipos de ancestrais e '{'fixed'}' = true.
-        InvalidRegex = InvalidRegex: O valor do padr\u00E3o ''{0}'' n\u00E3o \u00E9 uma express\u00E3o regular v\u00E1lida. O erro reportado foi: ''{1}'' na coluna ''{2}''.
-        MaxOccurLimit = A configura\u00E7\u00E3o atual do parser n\u00E3o permite que o valor de um atributo maxOccurs seja definido como maior que o valor {0}.
+        c-fields-xpaths = c-fields-xpaths: O valor do campo = ''{0}'' não é válido.
+        c-general-xpath = c-general-xpath: A expressão ''{0}'' não é válida em relação ao subconjunto de XPath suportado pelo Esquema XML.
+        c-general-xpath-ns = c-general-xpath-ns: Um prefixo de namespace na expressão de XPath ''{0}'' não foi associado a um namespace.
+        c-selector-xpath = c-selector-xpath: O valor do seletor = ''{0}'' não é válido; os xpaths do seletor não podem conter atributos.
+        EmptyTargetNamespace = EmptyTargetNamespace: No documento do esquema ''{0}'', o valor do atributo ''targetNamespace'' não pode ser uma string vazia.
+        FacetValueFromBase = FacetValueFromBase: Na declaração do tipo ''{0}'', o valor ''{1}'' do aspecto ''{2}'' deve ser proveniente do espaço de valor do tipo de base, ''{3}''.
+        FixedFacetValue = FixedFacetValue: Na definição de {3}, o valor ''{1}'' do aspecto ''{0}'' é inválido porque o valor de ''{0}'' foi enviado para ''{2}'' em um dos tipos de ancestrais e '{'fixed'}' = true.
+        InvalidRegex = InvalidRegex: O valor do padrão ''{0}'' não é uma expressão regular válida. O erro reportado foi: ''{1}'' na coluna ''{2}''.
+        MaxOccurLimit = A configuração atual do parser não permite que o valor de um atributo maxOccurs seja definido como maior que o valor {0}.
         PublicSystemOnNotation = PublicSystemOnNotation: Pelo menos ''public'' e ''system'' devem aparecer no elemento ''notation''.
-        SchemaLocation = SchemaLocation: schemaLocation value = ''{0}''deve ter n\u00FAmero par de URIs.
-        TargetNamespace.1 = TargetNamespace.1: Esperava o namespace ''{0}'', mas o namespace de destino do documento do esquema \u00E9 ''{1}''.
+        SchemaLocation = SchemaLocation: schemaLocation value = ''{0}''deve ter número par de URIs.
+        TargetNamespace.1 = TargetNamespace.1: Esperava o namespace ''{0}'', mas o namespace de destino do documento do esquema é ''{1}''.
         TargetNamespace.2 = TargetNamespace.2: Exceto no namespace, mas o documento do esquema tem um namespace de destino ''{1}''.
-        UndeclaredEntity = UndeclaredEntity: A entidade ''{0}'' n\u00E3o foi declarada.
-        UndeclaredPrefix = UndeclaredPrefix: N\u00E3o \u00E9 poss\u00EDvel resolver ''{0}'' como um QName: o prefixo ''{1}'' n\u00E3o foi declarado.
+        UndeclaredEntity = UndeclaredEntity: A entidade ''{0}'' não foi declarada.
+        UndeclaredPrefix = UndeclaredPrefix: Não é possível resolver ''{0}'' como um QName: o prefixo ''{1}'' não foi declarado.
 
 
 # JAXP 1.2 schema source property errors
 
-        jaxp12-schema-source-type.1 = A propriedade ''http://java.sun.com/xml/jaxp/properties/schemaSource'' n\u00E3o pode ter um valor do tipo ''{0}''. Os tipos poss\u00EDveis do valor suportados s\u00E3o String, File, InputStream, InputSource ou um array desses tipos.
-        jaxp12-schema-source-type.2 = A propriedade ''http://java.sun.com/xml/jaxp/properties/schemaSource'' n\u00E3o pode ter um valor de array do tipo ''{0}''. Os tipos poss\u00EDveis do array suportados s\u00E3o Object, String, File, InputStream e InputSource.
-        jaxp12-schema-source-ns = Ao utilizar um array do tipo Object como valor da propriedade 'http://java.sun.com/xml/jaxp/properties/schemaSource', n\u00E3o \u00E9 v\u00E1lido ter dois esquemas que compartilham o mesmo namespace de destino.
+        jaxp12-schema-source-type.1 = A propriedade ''http://java.sun.com/xml/jaxp/properties/schemaSource'' não pode ter um valor do tipo ''{0}''. Os tipos possíveis do valor suportados são String, File, InputStream, InputSource ou um array desses tipos.
+        jaxp12-schema-source-type.2 = A propriedade ''http://java.sun.com/xml/jaxp/properties/schemaSource'' não pode ter um valor de array do tipo ''{0}''. Os tipos possíveis do array suportados são Object, String, File, InputStream e InputSource.
+        jaxp12-schema-source-ns = Ao utilizar um array do tipo Object como valor da propriedade 'http://java.sun.com/xml/jaxp/properties/schemaSource', não é válido ter dois esquemas que compartilham o mesmo namespace de destino.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
index d4246203a34..ca6d235f8df 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
@@ -27,302 +27,302 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
         BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
-        FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
+        FormatFailed = Ett internt fel inträffade vid formatering av följande meddelande:\n
 
 # For internal use
 
         Internal-Error = Internt fel: {0}.
-        dt-whitespace = Aspektv\u00E4rde f\u00F6r blanktecken \u00E4r inte tillg\u00E4ngligt f\u00F6r simpleType ''{0}'' med union
-        GrammarConflict = Genererad grammatik fr\u00E5n anv\u00E4ndarens grammatikpool strider mot annan grammatik.
+        dt-whitespace = Aspektvärde för blanktecken är inte tillgängligt för simpleType ''{0}'' med union
+        GrammarConflict = Genererad grammatik från användarens grammatikpool strider mot annan grammatik.
 
 # Identity constraints
 
-        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: Elementet "{0}" har inget v\u00E4rde f\u00F6r nyckeln "{1}".
-        DuplicateField = Dubblettmatchning inom omfattningen av f\u00E4ltet "{0}".
-        DuplicateKey = cvc-identity-constraint.4.2.2: Duplicerat nyckelv\u00E4rde [{0}] har deklarerats f\u00F6r identitetsbegr\u00E4nsningen "{2}" f\u00F6r elementet "{1}".
-        DuplicateUnique = cvc-identity-constraint.4.1: Duplicerat unikt v\u00E4rde [{0}] har deklarerats f\u00F6r identitetsbegr\u00E4nsningen "{2}" f\u00F6r elementet "{1}".
-        FieldMultipleMatch = cvc-identity-constraint.3: F\u00E4ltet "{0}" f\u00F6r identitetsbegr\u00E4nsningen "{1}" matchar flera v\u00E4rden inom omfattningen f\u00F6r v\u00E4ljaren. F\u00E4lt m\u00E5ste matcha unika v\u00E4rden.
-        FixedDiffersFromActual = Elementets inneh\u00E5ll motsvarar inte v\u00E4rdet av attributet som anges som "fixed" i elementdeklarationen i schemat.
-        KeyMatchesNillable = cvc-identity-constraint.4.2.3: Elementet "{0}" har nyckeln "{1}" som matchar ett element d\u00E4r nullbar \u00E4r satt till sant.
-        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: Inte tillr\u00E4ckligt m\u00E5nga v\u00E4rden har angetts f\u00F6r identitetsbegr\u00E4nsningen <key name="{1}"> som har angetts f\u00F6r elementet "{0}".
-        KeyNotFound = cvc-identity-constraint.4.3: Nyckeln ''{0}'' med v\u00E4rdet ''{1}'' hittades inte f\u00F6r identitetsbegr\u00E4nsningen f\u00F6r elementet ''{2}''.
-        KeyRefOutOfScope = Fel vid id-begr\u00E4nsning: id-begr\u00E4nsning "{0}" har en nyckelreferens som refererar till nyckel eller unikt v\u00E4rde utanf\u00F6r definitionsomr\u00E5det.
-        KeyRefReferNotFound = Nyckelreferensdeklarationen "{0}" refererar till ok\u00E4nd nyckel med namnet "{1}".
-        UnknownField = Internt identitetsbegr\u00E4nsningsfel: det ok\u00E4nda f\u00E4ltet "{0}" f\u00F6r identitetsbegr\u00E4nsningen "{2}" har angetts f\u00F6r elementet "{1}".
+        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: Elementet "{0}" har inget värde för nyckeln "{1}".
+        DuplicateField = Dubblettmatchning inom omfattningen av fältet "{0}".
+        DuplicateKey = cvc-identity-constraint.4.2.2: Duplicerat nyckelvärde [{0}] har deklarerats för identitetsbegränsningen "{2}" för elementet "{1}".
+        DuplicateUnique = cvc-identity-constraint.4.1: Duplicerat unikt värde [{0}] har deklarerats för identitetsbegränsningen "{2}" för elementet "{1}".
+        FieldMultipleMatch = cvc-identity-constraint.3: Fältet "{0}" för identitetsbegränsningen "{1}" matchar flera värden inom omfattningen för väljaren. Fält måste matcha unika värden.
+        FixedDiffersFromActual = Elementets innehåll motsvarar inte värdet av attributet som anges som "fixed" i elementdeklarationen i schemat.
+        KeyMatchesNillable = cvc-identity-constraint.4.2.3: Elementet "{0}" har nyckeln "{1}" som matchar ett element där nullbar är satt till sant.
+        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: Inte tillräckligt många värden har angetts för identitetsbegränsningen <key name="{1}"> som har angetts för elementet "{0}".
+        KeyNotFound = cvc-identity-constraint.4.3: Nyckeln ''{0}'' med värdet ''{1}'' hittades inte för identitetsbegränsningen för elementet ''{2}''.
+        KeyRefOutOfScope = Fel vid id-begränsning: id-begränsning "{0}" har en nyckelreferens som refererar till nyckel eller unikt värde utanför definitionsområdet.
+        KeyRefReferNotFound = Nyckelreferensdeklarationen "{0}" refererar till okänd nyckel med namnet "{1}".
+        UnknownField = Internt identitetsbegränsningsfel: det okända fältet "{0}" för identitetsbegränsningen "{2}" har angetts för elementet "{1}".
 
 # Ideally, we should only use the following error keys, not the ones under
 # "Identity constraints". And we should cover all of the following errors.
 
 #validation (3.X.4)
 
-        cvc-attribute.3 = cvc-attribute.3: V\u00E4rdet ''{2}'' f\u00F6r attributet ''{1}'' i elementet ''{0}'' har ogiltig typ, ''{3}''.
-        cvc-attribute.4 = cvc-attribute.4: V\u00E4rdet ''{2}'' f\u00F6r attributet ''{1}'' i elementet ''{0}'' har ogiltig fast '{'v\u00E4rdebegr\u00E4nsning'}'. Attributet m\u00E5ste ha v\u00E4rdet ''{3}''.
-        cvc-complex-type.2.1 = cvc-complex-type.2.1: Elementet ''{0}'' f\u00E5r inte ha [underordnade] objekt med tecken- eller elementinformation, eftersom inneh\u00E5llstyp \u00E4r tomt.
-        cvc-complex-type.2.2 = cvc-complex-type.2.2: Elementet ''{0}'' f\u00E5r inte ha [underordnade] element och v\u00E4rdet m\u00E5ste vara giltigt.
-        cvc-complex-type.2.3 = cvc-complex-type.2.3: Elementet ''{0}'' f\u00E5r inte ha [underordnade] tecken, eftersom inneh\u00E5llstyp \u00E4r endast element.
-        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: Ogiltigt inneh\u00E5ll hittades med b\u00F6rjan med elementet ''{0}''. N\u00E5got av ''{1}'' f\u00F6rv\u00E4ntas.
-        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: Inneh\u00E5llet i elementet ''{0}'' \u00E4r inte fullst\u00E4ndigt. N\u00E5got av ''{1}'' f\u00F6rv\u00E4ntas.
-        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: Matchningen av jokertecken \u00E4r strikt, men ingen deklaration hittades f\u00F6r elementet ''{0}''.
-        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: Ogiltigt inneh\u00E5ll hittades med b\u00F6rjan med elementet ''{0}''. Inget underordnat element f\u00F6rv\u00E4ntas i det h\u00E4r skedet.
-        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: Ogiltigt inneh\u00E5ll hittades med b\u00F6rjan med elementet ''{0}''. Det underordnade elementet ''{1}'' f\u00F6rv\u00E4ntas i det h\u00E4r skedet.
-        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' kan intr\u00E4ffa h\u00F6gst ''{2}'' g\u00E5nger i den aktuella sekvensen. Den h\u00E4r gr\u00E4nsen har \u00F6verskridits. Vid den h\u00E4r punkten f\u00F6rv\u00E4ntas n\u00E5got av ''{1}''.
-        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' kan intr\u00E4ffa h\u00F6gst ''{1}'' g\u00E5nger i den aktuella sekvensen. Den h\u00E4r gr\u00E4nsen har \u00F6verskridits. Inget underordnat element f\u00F6rv\u00E4ntas vid den h\u00E4r punkten.
-        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: Ogiltigt inneh\u00E5ll hittades med b\u00F6rjan fr\u00E5n elementet ''{0}''. ''{1}'' f\u00F6rv\u00E4ntas intr\u00E4ffa minst ''{2}'' g\u00E5nger i den aktuella sekvensen. En till instans kr\u00E4vs f\u00F6r att uppfylla den h\u00E4r begr\u00E4nsningen.
-        cvc-complex-type.2.4.h = cvc-complex-type.2.4.g: Ogiltigt inneh\u00E5ll hittades med b\u00F6rjan fr\u00E5n elementet ''{0}''. ''{1}'' f\u00F6rv\u00E4ntas intr\u00E4ffa minst ''{2}'' g\u00E5nger i den aktuella sekvensen. ''{3}'' till instanser kr\u00E4vs f\u00F6r att uppfylla den h\u00E4r begr\u00E4nsningen.
-        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: Inneh\u00E5llet i elementet ''{0}'' \u00E4r inte fullst\u00E4ndigt. ''{1}'' f\u00F6rv\u00E4ntas intr\u00E4ffa minst ''{2}'' g\u00E5nger. En till instans kr\u00E4vs f\u00F6r att uppfylla den h\u00E4r begr\u00E4nsningen.
-        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: Inneh\u00E5llet i elementet ''{0}'' \u00E4r inte fullst\u00E4ndigt. ''{1}'' f\u00F6rv\u00E4ntas intr\u00E4ffa minst ''{2}'' g\u00E5nger. ''{3}'' till instanser kr\u00E4vs f\u00F6r att uppfylla den h\u00E4r begr\u00E4nsningen.
-        cvc-complex-type.3.1 = cvc-complex-type.3.1: V\u00E4rdet ''{2}'' f\u00F6r attributet ''{1}'' i elementet ''{0}'' \u00E4r inte giltigt med motsvarande attributanv\u00E4ndning. Attributet ''{1}'' har det fasta v\u00E4rdet ''{3}''.
-        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: Elementet ''{0}'' saknar attributjokertecken f\u00F6r attributet ''{1}''.
-        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: Attributet ''{1}'' \u00E4r inte till\u00E5tet i elementet ''{0}''.
-        cvc-complex-type.4 = cvc-complex-type.4: Attributet ''{1}'' m\u00E5ste anger i elementet ''{0}''.
-        cvc-complex-type.5.1 = cvc-complex-type.5.1: I elementet ''{0}'' \u00E4r attributet ''{1}'' ett joker-id. Joker-id ''{2}'' finns redan och endast ett id kan anv\u00E4ndas.
-        cvc-complex-type.5.2 = cvc-complex-type.5.2: I elementet ''{0}'' \u00E4r attributet ''{1}'' ett joker-id. Det finns redan ett attribut ''{2}'' som tas fr\u00E5n id bland '{'attributanv\u00E4ndningar'}'.
-        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' \u00E4r inte n\u00E5got giltigt v\u00E4rde f\u00F6r ''{1}''.
-        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' \u00E4r inte n\u00E5got giltigt v\u00E4rde f\u00F6r listtyp ''{1}''.
-        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' \u00E4r inte n\u00E5got giltigt v\u00E4rde f\u00F6r uniontyp ''{1}''.
-        cvc-elt.1.a = cvc-elt.1.a: Kan inte hitta deklarationen f\u00F6r elementet ''{0}''.
-        cvc-elt.1.b = cvc-elt.1.b: Namnet p\u00E5 elementet matchar inte namnet p\u00E5 elementdeklarationen. P\u00E5tr\u00E4ffade ''{0}''. F\u00F6rv\u00E4ntade ''{1}''.
-        cvc-elt.2 = cvc-elt.2: V\u00E4rdet f\u00F6r '{'abstrakt'}' i elementdeklarationen f\u00F6r ''{0}'' m\u00E5ste anges som false.
-        cvc-elt.3.1 = cvc-elt.3.1: Attributet ''{1}'' f\u00E5r inte anges i elementet ''{0}'', eftersom '{'nullbar'}' egenskap f\u00F6r ''{0}'' har angetts som false.
-        cvc-elt.3.2.1 = cvc-elt.3.2.1: Elementet ''{0}'' f\u00E5r inte inneh\u00E5lla [underordnade] med tecken- eller elementinformation eftersom ''{1}'' har angetts.
-        cvc-elt.3.2.2 = cvc-elt.3.2.2: Det f\u00E5r inte finnas n\u00E5gon fast '{'v\u00E4rdebegr\u00E4nsning'}' f\u00F6r elementet ''{0}'' eftersom ''{1}'' har angetts.
-        cvc-elt.4.1 = cvc-elt.4.1: V\u00E4rdet ''{2}'' f\u00F6r attributet ''{1}'' i elementet ''{0}'' \u00E4r inte n\u00E5got giltigt QName.
-        cvc-elt.4.2 = cvc-elt.4.2: Kan inte matcha ''{1}'' med typdefinition f\u00F6r elementet ''{0}''.
-        cvc-elt.4.3 = cvc-elt.4.3: Typ ''{1}'' \u00E4r inte giltigt att tas fr\u00E5n typdefinitionen ''{2}'' i elementet ''{0}''.
-        cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'v\u00E4rdebegr\u00E4nsning'}' ''{2}'' i elementet ''{0}'' \u00E4r inte n\u00E5got giltigt standardv\u00E4rde f\u00F6r typ ''{1}''.
-        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: Elementet ''{0}'' f\u00E5r inte ha [underordnade] objekt med elementinformation.
-        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: V\u00E4rdet ''{1}'' i elementet ''{0}'' matchar inte v\u00E4rdet med fast '{'v\u00E4rdebegr\u00E4nsning'}', ''{2}''.
-        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: V\u00E4rdet ''{1}'' i elementet ''{0}'' matchar inte v\u00E4rdet med '{'v\u00E4rdebegr\u00E4nsning'}', ''{2}''.
-        cvc-enumeration-valid = cvc-enumeration-valid: V\u00E4rdet ''{0}'' \u00E4r ogiltigt med aktuell uppr\u00E4kning ''{1}''. V\u00E4rdet m\u00E5ste ing\u00E5 i uppr\u00E4kningen.
-        cvc-fractionDigits-valid = cvc-fractionDigits-valid: V\u00E4rdet ''{0}'' har {1} br\u00E5ktalssiffror, men antalet br\u00E5ktalssiffror \u00E4r begr\u00E4nsat till {2}.
-        cvc-id.1 = cvc-id.1: Det finns ingen ID/IDREF-bindning f\u00F6r IDREF ''{0}''.
-        cvc-id.2 = cvc-id.2: Det finns flera f\u00F6rekomster av id-v\u00E4rdet ''{0}''.
-        cvc-id.3 = cvc-id.3: Ett f\u00E4lt med id-begr\u00E4nsning ''{0}'' matchade elementet ''{1}'', men elementet saknar enkel typ.
-        cvc-length-valid = cvc-length-valid: V\u00E4rdet ''{0}'' med l\u00E4ngd = ''{1}'' \u00E4r ogiltigt med den aktuella l\u00E4ngden ''{2}'' f\u00F6r typ ''{3}''.
-        cvc-maxExclusive-valid = cvc-maxExclusive-valid: V\u00E4rdet ''{0}'' \u00E4r ogiltigt med aktuellt maxExclusive ''{1}'' f\u00F6r typ ''{2}''.
-        cvc-maxInclusive-valid = cvc-maxInclusive-valid: V\u00E4rdet ''{0}'' \u00E4r ogiltigt med aktuellt maxInclusive ''{1}'' f\u00F6r typ ''{2}''.
-        cvc-maxLength-valid = cvc-maxLength-valid: V\u00E4rdet ''{0}'' med l\u00E4ngd = ''{1}'' \u00E4r ogiltigt med aktuellt maxLength ''{2}'' f\u00F6r typ ''{3}''.
-        cvc-minExclusive-valid = cvc-minExclusive-valid: V\u00E4rdet ''{0}'' \u00E4r ogiltigt med aktuellt minExclusive ''{1}'' f\u00F6r typ ''{2}''.
-        cvc-minInclusive-valid = cvc-minInclusive-valid: V\u00E4rdet ''{0}'' \u00E4r ogiltigt med aktuellt minInclusive ''{1}'' f\u00F6r typ ''{2}''.
-        cvc-minLength-valid = cvc-minLength-valid: V\u00E4rdet ''{0}'' med l\u00E4ngd = ''{1}'' \u00E4r ogiltigt med aktuellt minLength ''{2}'' f\u00F6r typ ''{3}''.
-        cvc-pattern-valid = cvc-pattern-valid: V\u00E4rdet ''{0}'' \u00E4r ogiltigt med aktuellt m\u00F6nster ''{1}'' f\u00F6r typ ''{2}''.
-        cvc-totalDigits-valid = cvc-totalDigits-valid: V\u00E4rdet ''{0}'' har {1} siffror, men det totala antalet siffror \u00E4r begr\u00E4nsat till {2}.
+        cvc-attribute.3 = cvc-attribute.3: Värdet ''{2}'' för attributet ''{1}'' i elementet ''{0}'' har ogiltig typ, ''{3}''.
+        cvc-attribute.4 = cvc-attribute.4: Värdet ''{2}'' för attributet ''{1}'' i elementet ''{0}'' har ogiltig fast '{'värdebegränsning'}'. Attributet måste ha värdet ''{3}''.
+        cvc-complex-type.2.1 = cvc-complex-type.2.1: Elementet ''{0}'' får inte ha [underordnade] objekt med tecken- eller elementinformation, eftersom innehållstyp är tomt.
+        cvc-complex-type.2.2 = cvc-complex-type.2.2: Elementet ''{0}'' får inte ha [underordnade] element och värdet måste vara giltigt.
+        cvc-complex-type.2.3 = cvc-complex-type.2.3: Elementet ''{0}'' får inte ha [underordnade] tecken, eftersom innehållstyp är endast element.
+        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: Ogiltigt innehåll hittades med början med elementet ''{0}''. Något av ''{1}'' förväntas.
+        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: Innehållet i elementet ''{0}'' är inte fullständigt. Något av ''{1}'' förväntas.
+        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: Matchningen av jokertecken är strikt, men ingen deklaration hittades för elementet ''{0}''.
+        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: Ogiltigt innehåll hittades med början med elementet ''{0}''. Inget underordnat element förväntas i det här skedet.
+        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: Ogiltigt innehåll hittades med början med elementet ''{0}''. Det underordnade elementet ''{1}'' förväntas i det här skedet.
+        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' kan inträffa högst ''{2}'' gånger i den aktuella sekvensen. Den här gränsen har överskridits. Vid den här punkten förväntas något av ''{1}''.
+        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' kan inträffa högst ''{1}'' gånger i den aktuella sekvensen. Den här gränsen har överskridits. Inget underordnat element förväntas vid den här punkten.
+        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: Ogiltigt innehåll hittades med början från elementet ''{0}''. ''{1}'' förväntas inträffa minst ''{2}'' gånger i den aktuella sekvensen. En till instans krävs för att uppfylla den här begränsningen.
+        cvc-complex-type.2.4.h = cvc-complex-type.2.4.g: Ogiltigt innehåll hittades med början från elementet ''{0}''. ''{1}'' förväntas inträffa minst ''{2}'' gånger i den aktuella sekvensen. ''{3}'' till instanser krävs för att uppfylla den här begränsningen.
+        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: Innehållet i elementet ''{0}'' är inte fullständigt. ''{1}'' förväntas inträffa minst ''{2}'' gånger. En till instans krävs för att uppfylla den här begränsningen.
+        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: Innehållet i elementet ''{0}'' är inte fullständigt. ''{1}'' förväntas inträffa minst ''{2}'' gånger. ''{3}'' till instanser krävs för att uppfylla den här begränsningen.
+        cvc-complex-type.3.1 = cvc-complex-type.3.1: Värdet ''{2}'' för attributet ''{1}'' i elementet ''{0}'' är inte giltigt med motsvarande attributanvändning. Attributet ''{1}'' har det fasta värdet ''{3}''.
+        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: Elementet ''{0}'' saknar attributjokertecken för attributet ''{1}''.
+        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: Attributet ''{1}'' är inte tillåtet i elementet ''{0}''.
+        cvc-complex-type.4 = cvc-complex-type.4: Attributet ''{1}'' måste anger i elementet ''{0}''.
+        cvc-complex-type.5.1 = cvc-complex-type.5.1: I elementet ''{0}'' är attributet ''{1}'' ett joker-id. Joker-id ''{2}'' finns redan och endast ett id kan användas.
+        cvc-complex-type.5.2 = cvc-complex-type.5.2: I elementet ''{0}'' är attributet ''{1}'' ett joker-id. Det finns redan ett attribut ''{2}'' som tas från id bland '{'attributanvändningar'}'.
+        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' är inte något giltigt värde för ''{1}''.
+        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' är inte något giltigt värde för listtyp ''{1}''.
+        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' är inte något giltigt värde för uniontyp ''{1}''.
+        cvc-elt.1.a = cvc-elt.1.a: Kan inte hitta deklarationen för elementet ''{0}''.
+        cvc-elt.1.b = cvc-elt.1.b: Namnet på elementet matchar inte namnet på elementdeklarationen. Påträffade ''{0}''. Förväntade ''{1}''.
+        cvc-elt.2 = cvc-elt.2: Värdet för '{'abstrakt'}' i elementdeklarationen för ''{0}'' måste anges som false.
+        cvc-elt.3.1 = cvc-elt.3.1: Attributet ''{1}'' får inte anges i elementet ''{0}'', eftersom '{'nullbar'}' egenskap för ''{0}'' har angetts som false.
+        cvc-elt.3.2.1 = cvc-elt.3.2.1: Elementet ''{0}'' får inte innehålla [underordnade] med tecken- eller elementinformation eftersom ''{1}'' har angetts.
+        cvc-elt.3.2.2 = cvc-elt.3.2.2: Det får inte finnas någon fast '{'värdebegränsning'}' för elementet ''{0}'' eftersom ''{1}'' har angetts.
+        cvc-elt.4.1 = cvc-elt.4.1: Värdet ''{2}'' för attributet ''{1}'' i elementet ''{0}'' är inte något giltigt QName.
+        cvc-elt.4.2 = cvc-elt.4.2: Kan inte matcha ''{1}'' med typdefinition för elementet ''{0}''.
+        cvc-elt.4.3 = cvc-elt.4.3: Typ ''{1}'' är inte giltigt att tas från typdefinitionen ''{2}'' i elementet ''{0}''.
+        cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'värdebegränsning'}' ''{2}'' i elementet ''{0}'' är inte något giltigt standardvärde för typ ''{1}''.
+        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: Elementet ''{0}'' får inte ha [underordnade] objekt med elementinformation.
+        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: Värdet ''{1}'' i elementet ''{0}'' matchar inte värdet med fast '{'värdebegränsning'}', ''{2}''.
+        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: Värdet ''{1}'' i elementet ''{0}'' matchar inte värdet med '{'värdebegränsning'}', ''{2}''.
+        cvc-enumeration-valid = cvc-enumeration-valid: Värdet ''{0}'' är ogiltigt med aktuell uppräkning ''{1}''. Värdet måste ingå i uppräkningen.
+        cvc-fractionDigits-valid = cvc-fractionDigits-valid: Värdet ''{0}'' har {1} bråktalssiffror, men antalet bråktalssiffror är begränsat till {2}.
+        cvc-id.1 = cvc-id.1: Det finns ingen ID/IDREF-bindning för IDREF ''{0}''.
+        cvc-id.2 = cvc-id.2: Det finns flera förekomster av id-värdet ''{0}''.
+        cvc-id.3 = cvc-id.3: Ett fält med id-begränsning ''{0}'' matchade elementet ''{1}'', men elementet saknar enkel typ.
+        cvc-length-valid = cvc-length-valid: Värdet ''{0}'' med längd = ''{1}'' är ogiltigt med den aktuella längden ''{2}'' för typ ''{3}''.
+        cvc-maxExclusive-valid = cvc-maxExclusive-valid: Värdet ''{0}'' är ogiltigt med aktuellt maxExclusive ''{1}'' för typ ''{2}''.
+        cvc-maxInclusive-valid = cvc-maxInclusive-valid: Värdet ''{0}'' är ogiltigt med aktuellt maxInclusive ''{1}'' för typ ''{2}''.
+        cvc-maxLength-valid = cvc-maxLength-valid: Värdet ''{0}'' med längd = ''{1}'' är ogiltigt med aktuellt maxLength ''{2}'' för typ ''{3}''.
+        cvc-minExclusive-valid = cvc-minExclusive-valid: Värdet ''{0}'' är ogiltigt med aktuellt minExclusive ''{1}'' för typ ''{2}''.
+        cvc-minInclusive-valid = cvc-minInclusive-valid: Värdet ''{0}'' är ogiltigt med aktuellt minInclusive ''{1}'' för typ ''{2}''.
+        cvc-minLength-valid = cvc-minLength-valid: Värdet ''{0}'' med längd = ''{1}'' är ogiltigt med aktuellt minLength ''{2}'' för typ ''{3}''.
+        cvc-pattern-valid = cvc-pattern-valid: Värdet ''{0}'' är ogiltigt med aktuellt mönster ''{1}'' för typ ''{2}''.
+        cvc-totalDigits-valid = cvc-totalDigits-valid: Värdet ''{0}'' har {1} siffror, men det totala antalet siffror är begränsat till {2}.
         cvc-type.1 = cvc-type.1: Typdefinitionen ''{0}'' hittades inte.
-        cvc-type.2 = cvc-type.2: Typdefinitionen kan inte vara abstrakt f\u00F6r elementet {0}.
-        cvc-type.3.1.1 = cvc-type.3.1.1: Elementet ''{0}'' har enkel typ och f\u00E5r inte inneh\u00E5lla attribut, ut\u00F6ver s\u00E5dana vars namnrymd \u00E4r identisk med ''http://www.w3.org/2001/XMLSchema-instance'' och vars [lokala namn] har n\u00E5gotdera av ''type'', ''nil'', ''schemaLocation'' eller ''noNamespaceSchemaLocation''. Hittade dock attributet ''{1}''.
-        cvc-type.3.1.2 = cvc-type.3.1.2: Elementet ''{0}'' har enkel typ och f\u00E5r inte inneh\u00E5lla [underordnade] med elementinformation.
-        cvc-type.3.1.3 = cvc-type.3.1.3: V\u00E4rdet ''{1}'' i elementet ''{0}'' \u00E4r ogiltigt.
+        cvc-type.2 = cvc-type.2: Typdefinitionen kan inte vara abstrakt för elementet {0}.
+        cvc-type.3.1.1 = cvc-type.3.1.1: Elementet ''{0}'' har enkel typ och får inte innehålla attribut, utöver sådana vars namnrymd är identisk med ''http://www.w3.org/2001/XMLSchema-instance'' och vars [lokala namn] har någotdera av ''type'', ''nil'', ''schemaLocation'' eller ''noNamespaceSchemaLocation''. Hittade dock attributet ''{1}''.
+        cvc-type.3.1.2 = cvc-type.3.1.2: Elementet ''{0}'' har enkel typ och får inte innehålla [underordnade] med elementinformation.
+        cvc-type.3.1.3 = cvc-type.3.1.3: Värdet ''{1}'' i elementet ''{0}'' är ogiltigt.
 
 #schema valid (3.X.3)
 
-        schema_reference.access = schema_reference: Kunde inte l\u00E4sa schemadokumentet ''{0}'' eftersom ''{1}''-\u00E5tkomst inte till\u00E5ts p\u00E5 grund av begr\u00E4nsning som anges av egenskapen accessExternalSchema. 
-        schema_reference.4 = schema_reference.4: L\u00E4sning av schemadokument ''{0}'' utf\u00F6rdes inte p\u00E5 grund av 1) det g\u00E5r inte att hitta dokumentet; 2) det g\u00E5r inte att l\u00E4sa dokumentet; 3) dokumentets rotelement \u00E4r inte <xsd:schema>.
-        src-annotation = src-annotation: element f\u00F6r <anteckningar> f\u00E5r endast inneh\u00E5lla element f\u00F6r <appinfo> och <dokumentation>, men ''{0}'' hittades.
-        src-attribute.1 = src-attribute.1: B\u00E5da egenskaperna ''default'' och ''fixed'' kan inte samtidigt ing\u00E5 i attributdeklarationen ''{0}''. Anv\u00E4nd en av dem.
-        src-attribute.2 = src-attribute.2: Egenskapen ''default'' finns med i attributet ''{0}'', vilket inneb\u00E4r att v\u00E4rdet f\u00F6r ''use'' m\u00E5ste vara ''optional''.
-        src-attribute.3.1 = src-attribute.3.1: Antingen 'ref' eller 'name' m\u00E5ste finnas med i lokal attributdeklaration.
-        src-attribute.3.2 = src-attribute.3.2: Inneh\u00E5llet m\u00E5ste matcha (annotation?) f\u00F6r attributreferens ''{0}''.
-        src-attribute.4 = src-attribute.4: Attributet ''{0}'' har b\u00E5de ett ''typ''-attribut och en anonym ''simpleType''-underordnad. Endast ett av dessa till\u00E5ts som attribut.
-        src-attribute_group.2 = src-attribute_group.2: Snittet mellan jokertecken kan inte uttryckas f\u00F6r attributgruppen ''{0}''.
-        src-attribute_group.3 = src-attribute_group.3: Cirkul\u00E4ra definitioner har identifierats f\u00F6r attributgruppen ''{0}''. Rekursivt efterf\u00F6ljande attributgruppreferenser leder s\u00E5 sm\u00E5ningom tillbaka till sig sj\u00E4lv.
-        src-ct.1 = src-ct.1: Ett fel intr\u00E4ffade vid representationen av definition f\u00F6r typ ''{0}''. Om <complexContent> anv\u00E4nds m\u00E5ste bastyp vara complexType. ''{1}'' \u00E4r simpleType.
-        src-ct.2.1 = src-ct.2.1: Ett fel intr\u00E4ffade vid representationen av definition f\u00F6r typ ''{0}''. Om <simpleContent> anv\u00E4nds m\u00E5ste bastyp vara complexType vars inneh\u00E5ll \u00E4r enkelt, eller, om det finns en angiven begr\u00E4nsning, komplex typ med blandat inneh\u00E5ll och t\u00F6mningsbar partikel, eller, om det finns ett angivet till\u00E4gg, enkel typ. ''{1}'' uppfyller inget av dessa villkor.
-        src-ct.2.2 = src-ct.2.2: Ett fel intr\u00E4ffade vid representationen av definition f\u00F6r typ ''{0}''. Om complexType med simpleContent begr\u00E4nsar complexType med blandat inneh\u00E5ll och t\u00F6mningsbar partikel m\u00E5ste det finnas en <simpleType> bland underordnade i <restriction>.
-        src-ct.4 = src-ct.4: Ett fel intr\u00E4ffade vid representationen av definition f\u00F6r typ ''{0}''. Snittet mellan jokertecken kan inte uttryckas.
-        src-ct.5 = src-ct.5: Ett fel intr\u00E4ffade vid representationen av definition f\u00F6r typ ''{0}''. Unionen mellan jokertecken kan inte uttryckas.
-        src-element.1 = src-element.1: B\u00E5da egenskaperna ''default'' och ''fixed'' kan inte samtidigt ing\u00E5 i elementdeklarationen ''{0}''. Anv\u00E4nd en av dem.
-        src-element.2.1 = src-element.2.1: Antingen 'ref' eller 'name' m\u00E5ste anges i den lokala elementdeklarationen.
-        src-element.2.2 = src-element.2.2: Eftersom ''{0}'' inneh\u00E5ller ett ''ref''-attribut m\u00E5ste inneh\u00E5llet matcha (annotation?). ''{1}'' hittades dock inte.
-        src-element.3 = src-element.3: Elementet ''{0}'' inneh\u00E5ller b\u00E5de ''type''-attribut och underordnat ''anonymous type''. Endast ett av dessa \u00E4r till\u00E5tet i ett element.
-        src-import.1.1 = src-import.1.1: Namnrymdsattributet ''{0}'' i ett objekt med elementinformation f\u00F6r <import> f\u00E5r inte vara samma som targetNamespace i det schema som det ing\u00E5r i.
-        src-import.1.2 = src-import.1.2: Om namnrymdsattributet inte finns med i ett objekt med elementinformation f\u00F6r <import> m\u00E5ste omslutande schema ha ett angivet targetNamespace.
-        src-import.2 = src-import.2: Rotelementet f\u00F6r dokumentet ''{0}'' m\u00E5ste ha namnrymdsnamnet ''http://www.w3.org/2001/XMLSchema'' och det lokala namnet ''schema''.
-        src-import.3.1 = src-import.3.1: Namnrymdsattributet ''{0}'' f\u00F6r ett objekt med elementinformation f\u00F6r <import> m\u00E5ste vara identiskt med targetNamespace-attributet ''{1}'' i det importerade dokumentet.
-        src-import.3.2 = src-import.3.2: Ett objekt med elementinformation f\u00F6r <import> som saknade namnrymdsattribut hittades och d\u00E4rf\u00F6r kan importerat dokument inte anv\u00E4ndas med attributet targetNamespace. targetNamespace ''{1}'' hittades dock i importerat dokument.
-        src-include.1 = src-include.1: Rotelementet f\u00F6r dokumentet ''{0}'' m\u00E5ste ha namnrymdsnamnet ''http://www.w3.org/2001/XMLSchema'' och det lokala namnet ''schema''.
-        src-include.2.1 = src-include.2.1: targetNamespace f\u00F6r refererat schema, f\u00F6r n\u00E4rvarande ''{1}'', m\u00E5ste vara identiskt med motsvarande i inkluderat schema, f\u00F6r n\u00E4rvarande ''{0}''.
-        src-redefine.2 = src-redefine.2: Rotelementet f\u00F6r dokumentet ''{0}'' m\u00E5ste ha namnrymdsnamnet ''http://www.w3.org/2001/XMLSchema'' och det lokala namnet ''schema''.
-        src-redefine.3.1 = src-include.3.1: targetNamespace f\u00F6r refererat schema, f\u00F6r n\u00E4rvarande ''{1}'', m\u00E5ste vara identiskt med motsvarande i omdefinierande schema, f\u00F6r n\u00E4rvarande ''{0}''.
-        src-redefine.5.a.a = src-redefine.5.a.a: Hittade inga <simpleType>-underordnade med icke-anteckning. <simpleType>-underordnade i <redefine>-element m\u00E5ste ha <restriction>-underordnade, med 'base'-attribut som refererar till sig sj\u00E4lva.
-        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' \u00E4r inte n\u00E5got giltigt underordnat element. <simpleType>-underordnade i <redefine>-element m\u00E5ste ha <restriction>-underordnade, med ''base''-attribut som refererar till sig sj\u00E4lva.
-        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' saknar ett ''base''-attribut som refererar till det omdefinierade elementet ''{1}''. <simpleType>-underordnade i <redefine>-element m\u00E5ste ha <restriction>-underordnade, med ''base''-attribut som refererar till sig sj\u00E4lva.
-        src-redefine.5.b.a = src-redefine.5.b.a: Hittade inga <complexType>-underordnade med icke-anteckning. <complexType>-underordnade i <redefine>-element m\u00E5ste ha <extension>- eller <restriction>-underordnade, med 'base'-attribut som refererar till sig sj\u00E4lva.
-        src-redefine.5.b.b = src-redefine.5.b.b: Hittade inga <complexType>-underordnade p\u00E5 l\u00E4gsta niv\u00E5 med icke-anteckning. <complexType>-underordnade i <redefine>-element m\u00E5ste ha <extension>- eller <restriction>-underordnade, med 'base'-attribut som refererar till sig sj\u00E4lva.
-        src-redefine.5.b.c = src-redefine.5.a.c: ''{0}'' \u00E4r inte n\u00E5got giltigt underordnat element p\u00E5 l\u00E4gsta niv\u00E5. <complexType>-underordnade i <redefine>-element m\u00E5ste ha <extension>- eller <restriction>-underordnade, med ''base''-attribut som refererar till sig sj\u00E4lva.
-        src-redefine.5.b.d = src-redefine.5.a.d: ''{0}'' saknar ett ''base''-attribut som refererar till det omdefinierade elementet ''{1}''. <complexType>-underordnade i <redefine>-element m\u00E5ste ha <extension>- eller <restriction>-underordnade, med ''base''-attribut som refererar till sig sj\u00E4lva.
-        src-redefine.6.1.1 = src-redefine.6.1.1: Om en underordnad grupp i ett <redefine>-element inneh\u00E5ller en grupp som refererar sig sj\u00E4lv m\u00E5ste den ha exakt 1; den h\u00E4r har ''{0}''.
-        src-redefine.6.1.2 = src-redefine.6.1.2: Gruppen ''{0}'', som inneh\u00E5ller en referens till en grupp som omdefinieras, m\u00E5ste anges som ''minOccurs'' = ''maxOccurs'' = 1.
+        schema_reference.access = schema_reference: Kunde inte läsa schemadokumentet ''{0}'' eftersom ''{1}''-åtkomst inte tillåts på grund av begränsning som anges av egenskapen accessExternalSchema. 
+        schema_reference.4 = schema_reference.4: Läsning av schemadokument ''{0}'' utfördes inte på grund av 1) det går inte att hitta dokumentet; 2) det går inte att läsa dokumentet; 3) dokumentets rotelement är inte <xsd:schema>.
+        src-annotation = src-annotation: element för <anteckningar> får endast innehålla element för <appinfo> och <dokumentation>, men ''{0}'' hittades.
+        src-attribute.1 = src-attribute.1: Båda egenskaperna ''default'' och ''fixed'' kan inte samtidigt ingå i attributdeklarationen ''{0}''. Använd en av dem.
+        src-attribute.2 = src-attribute.2: Egenskapen ''default'' finns med i attributet ''{0}'', vilket innebär att värdet för ''use'' måste vara ''optional''.
+        src-attribute.3.1 = src-attribute.3.1: Antingen 'ref' eller 'name' måste finnas med i lokal attributdeklaration.
+        src-attribute.3.2 = src-attribute.3.2: Innehållet måste matcha (annotation?) för attributreferens ''{0}''.
+        src-attribute.4 = src-attribute.4: Attributet ''{0}'' har både ett ''typ''-attribut och en anonym ''simpleType''-underordnad. Endast ett av dessa tillåts som attribut.
+        src-attribute_group.2 = src-attribute_group.2: Snittet mellan jokertecken kan inte uttryckas för attributgruppen ''{0}''.
+        src-attribute_group.3 = src-attribute_group.3: Cirkulära definitioner har identifierats för attributgruppen ''{0}''. Rekursivt efterföljande attributgruppreferenser leder så småningom tillbaka till sig själv.
+        src-ct.1 = src-ct.1: Ett fel inträffade vid representationen av definition för typ ''{0}''. Om <complexContent> används måste bastyp vara complexType. ''{1}'' är simpleType.
+        src-ct.2.1 = src-ct.2.1: Ett fel inträffade vid representationen av definition för typ ''{0}''. Om <simpleContent> används måste bastyp vara complexType vars innehåll är enkelt, eller, om det finns en angiven begränsning, komplex typ med blandat innehåll och tömningsbar partikel, eller, om det finns ett angivet tillägg, enkel typ. ''{1}'' uppfyller inget av dessa villkor.
+        src-ct.2.2 = src-ct.2.2: Ett fel inträffade vid representationen av definition för typ ''{0}''. Om complexType med simpleContent begränsar complexType med blandat innehåll och tömningsbar partikel måste det finnas en <simpleType> bland underordnade i <restriction>.
+        src-ct.4 = src-ct.4: Ett fel inträffade vid representationen av definition för typ ''{0}''. Snittet mellan jokertecken kan inte uttryckas.
+        src-ct.5 = src-ct.5: Ett fel inträffade vid representationen av definition för typ ''{0}''. Unionen mellan jokertecken kan inte uttryckas.
+        src-element.1 = src-element.1: Båda egenskaperna ''default'' och ''fixed'' kan inte samtidigt ingå i elementdeklarationen ''{0}''. Använd en av dem.
+        src-element.2.1 = src-element.2.1: Antingen 'ref' eller 'name' måste anges i den lokala elementdeklarationen.
+        src-element.2.2 = src-element.2.2: Eftersom ''{0}'' innehåller ett ''ref''-attribut måste innehållet matcha (annotation?). ''{1}'' hittades dock inte.
+        src-element.3 = src-element.3: Elementet ''{0}'' innehåller både ''type''-attribut och underordnat ''anonymous type''. Endast ett av dessa är tillåtet i ett element.
+        src-import.1.1 = src-import.1.1: Namnrymdsattributet ''{0}'' i ett objekt med elementinformation för <import> får inte vara samma som targetNamespace i det schema som det ingår i.
+        src-import.1.2 = src-import.1.2: Om namnrymdsattributet inte finns med i ett objekt med elementinformation för <import> måste omslutande schema ha ett angivet targetNamespace.
+        src-import.2 = src-import.2: Rotelementet för dokumentet ''{0}'' måste ha namnrymdsnamnet ''http://www.w3.org/2001/XMLSchema'' och det lokala namnet ''schema''.
+        src-import.3.1 = src-import.3.1: Namnrymdsattributet ''{0}'' för ett objekt med elementinformation för <import> måste vara identiskt med targetNamespace-attributet ''{1}'' i det importerade dokumentet.
+        src-import.3.2 = src-import.3.2: Ett objekt med elementinformation för <import> som saknade namnrymdsattribut hittades och därför kan importerat dokument inte användas med attributet targetNamespace. targetNamespace ''{1}'' hittades dock i importerat dokument.
+        src-include.1 = src-include.1: Rotelementet för dokumentet ''{0}'' måste ha namnrymdsnamnet ''http://www.w3.org/2001/XMLSchema'' och det lokala namnet ''schema''.
+        src-include.2.1 = src-include.2.1: targetNamespace för refererat schema, för närvarande ''{1}'', måste vara identiskt med motsvarande i inkluderat schema, för närvarande ''{0}''.
+        src-redefine.2 = src-redefine.2: Rotelementet för dokumentet ''{0}'' måste ha namnrymdsnamnet ''http://www.w3.org/2001/XMLSchema'' och det lokala namnet ''schema''.
+        src-redefine.3.1 = src-include.3.1: targetNamespace för refererat schema, för närvarande ''{1}'', måste vara identiskt med motsvarande i omdefinierande schema, för närvarande ''{0}''.
+        src-redefine.5.a.a = src-redefine.5.a.a: Hittade inga <simpleType>-underordnade med icke-anteckning. <simpleType>-underordnade i <redefine>-element måste ha <restriction>-underordnade, med 'base'-attribut som refererar till sig själva.
+        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' är inte något giltigt underordnat element. <simpleType>-underordnade i <redefine>-element måste ha <restriction>-underordnade, med ''base''-attribut som refererar till sig själva.
+        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' saknar ett ''base''-attribut som refererar till det omdefinierade elementet ''{1}''. <simpleType>-underordnade i <redefine>-element måste ha <restriction>-underordnade, med ''base''-attribut som refererar till sig själva.
+        src-redefine.5.b.a = src-redefine.5.b.a: Hittade inga <complexType>-underordnade med icke-anteckning. <complexType>-underordnade i <redefine>-element måste ha <extension>- eller <restriction>-underordnade, med 'base'-attribut som refererar till sig själva.
+        src-redefine.5.b.b = src-redefine.5.b.b: Hittade inga <complexType>-underordnade på lägsta nivå med icke-anteckning. <complexType>-underordnade i <redefine>-element måste ha <extension>- eller <restriction>-underordnade, med 'base'-attribut som refererar till sig själva.
+        src-redefine.5.b.c = src-redefine.5.a.c: ''{0}'' är inte något giltigt underordnat element på lägsta nivå. <complexType>-underordnade i <redefine>-element måste ha <extension>- eller <restriction>-underordnade, med ''base''-attribut som refererar till sig själva.
+        src-redefine.5.b.d = src-redefine.5.a.d: ''{0}'' saknar ett ''base''-attribut som refererar till det omdefinierade elementet ''{1}''. <complexType>-underordnade i <redefine>-element måste ha <extension>- eller <restriction>-underordnade, med ''base''-attribut som refererar till sig själva.
+        src-redefine.6.1.1 = src-redefine.6.1.1: Om en underordnad grupp i ett <redefine>-element innehåller en grupp som refererar sig själv måste den ha exakt 1; den här har ''{0}''.
+        src-redefine.6.1.2 = src-redefine.6.1.2: Gruppen ''{0}'', som innehåller en referens till en grupp som omdefinieras, måste anges som ''minOccurs'' = ''maxOccurs'' = 1.
         src-redefine.6.2.1 = src-redefine.6.2.1: Det finns ingen grupp i det omdefinierade schemat med ett namn som matchar ''{0}''.
-        src-redefine.6.2.2 = src-redefine.6.2.2: Gruppen ''{0}'' ger ingen korrekt begr\u00E4nsning av gruppen som omdefinieras; brott mot begr\u00E4nsning: ''{1}''.
-        src-redefine.7.1 = src-redefine.7.1: Om en attributeGroup-underordnad i ett <redefine>-element inneh\u00E5ller attributeGroup som refererar till sig sj\u00E4lv m\u00E5ste den ha exakt 1; den h\u00E4r har {0}.
+        src-redefine.6.2.2 = src-redefine.6.2.2: Gruppen ''{0}'' ger ingen korrekt begränsning av gruppen som omdefinieras; brott mot begränsning: ''{1}''.
+        src-redefine.7.1 = src-redefine.7.1: Om en attributeGroup-underordnad i ett <redefine>-element innehåller attributeGroup som refererar till sig själv måste den ha exakt 1; den här har {0}.
         src-redefine.7.2.1 = src-redefine.7.2.1: Det finns ingen attributeGroup i det omdefinierade schemat med ett namn som matchar ''{0}''.
-        src-redefine.7.2.2 = src-redefine.7.2.2: AttributeGroup ''{0}'' ger ingen korrekt begr\u00E4nsning av attributeGroup som omdefinieras; brott mot begr\u00E4nsning: ''{1}''.
+        src-redefine.7.2.2 = src-redefine.7.2.2: AttributeGroup ''{0}'' ger ingen korrekt begränsning av attributeGroup som omdefinieras; brott mot begränsning: ''{1}''.
         src-resolve = src-resolve: Namnet ''{0}'' kan inte matchas med komponenten ''{1}''.
-        src-resolve.4.1 = src-resolve.4.1: Ett fel intr\u00E4ffade vid matchning av komponenten ''{2}''. Systemet uppt\u00E4ckte att ''{2}'' saknar namnrymd och komponenter utan namnrymd kan inte refereras till fr\u00E5n schemadokumentet ''{0}''. Om ''{2}'' ska anv\u00E4ndas med namnrymd kanske du beh\u00F6ver ange ett prefix. Om ''{2}'' ska anv\u00E4ndas utan namnrymd b\u00F6r du l\u00E4gga till ''import'' utan "namespace"-attribut till ''{0}''.
-        src-resolve.4.2 = src-resolve.4.2: Ett fel intr\u00E4ffade vid matchning av komponent ''{2}''. Systemet uppt\u00E4ckte att ''{2}'' finns i namnrymden ''{1}'' och komponenter fr\u00E5n denna namnrymd kan inte refereras till fr\u00E5n schemadokumentet ''{0}''. Om detta \u00E4r en felaktig namnrymd kanske du m\u00E5ste \u00E4ndra prefixet ''{2}''. Om namnrymden \u00E4r korrekt beh\u00F6ver du l\u00E4gga till l\u00E4mplig ''import''-tagg i ''{0}''.
-        src-simple-type.2.a = src-simple-type.2.a: Ett <restriction>-element hittades med b\u00E5de ett bas-[attribut] och ett <simpleType>-element bland [underordnade]. Endast ett av dem \u00E4r till\u00E5tet.
-        src-simple-type.2.b = src-simple-type.2.b: Ett <restriction>-element hittades med varken ett bas-[attribut] eller ett <simpleType>-element bland [underordnade]. N\u00E5gotdera av dem kr\u00E4vs.
-        src-simple-type.3.a = src-simple-type.3.a: Ett <list>-element hittades med b\u00E5de ett itemType-[attribut] och ett <simpleType>-element bland [underordnade]. Endast ett av dem \u00E4r till\u00E5tet.
-        src-simple-type.3.b = src-simple-type.3.b: Ett <list>-element hittades med varken ett itemType-[attribut] eller ett <simpleType>-element bland [underordnade]. N\u00E5gotdera av dem kr\u00E4vs.
-        src-single-facet-value = src-single-facet-value: Aspekten (facet) ''{0}'' har definierats fler \u00E4n en g\u00E5ng.
-        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: Ett <union>-element m\u00E5ste anges med antingen ett icke-tomt memberTypes-[attribut] eller minst ett <simpleType>-element bland [underordnade].
+        src-resolve.4.1 = src-resolve.4.1: Ett fel inträffade vid matchning av komponenten ''{2}''. Systemet upptäckte att ''{2}'' saknar namnrymd och komponenter utan namnrymd kan inte refereras till från schemadokumentet ''{0}''. Om ''{2}'' ska användas med namnrymd kanske du behöver ange ett prefix. Om ''{2}'' ska användas utan namnrymd bör du lägga till ''import'' utan "namespace"-attribut till ''{0}''.
+        src-resolve.4.2 = src-resolve.4.2: Ett fel inträffade vid matchning av komponent ''{2}''. Systemet upptäckte att ''{2}'' finns i namnrymden ''{1}'' och komponenter från denna namnrymd kan inte refereras till från schemadokumentet ''{0}''. Om detta är en felaktig namnrymd kanske du måste ändra prefixet ''{2}''. Om namnrymden är korrekt behöver du lägga till lämplig ''import''-tagg i ''{0}''.
+        src-simple-type.2.a = src-simple-type.2.a: Ett <restriction>-element hittades med både ett bas-[attribut] och ett <simpleType>-element bland [underordnade]. Endast ett av dem är tillåtet.
+        src-simple-type.2.b = src-simple-type.2.b: Ett <restriction>-element hittades med varken ett bas-[attribut] eller ett <simpleType>-element bland [underordnade]. Någotdera av dem krävs.
+        src-simple-type.3.a = src-simple-type.3.a: Ett <list>-element hittades med både ett itemType-[attribut] och ett <simpleType>-element bland [underordnade]. Endast ett av dem är tillåtet.
+        src-simple-type.3.b = src-simple-type.3.b: Ett <list>-element hittades med varken ett itemType-[attribut] eller ett <simpleType>-element bland [underordnade]. Någotdera av dem krävs.
+        src-single-facet-value = src-single-facet-value: Aspekten (facet) ''{0}'' har definierats fler än en gång.
+        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: Ett <union>-element måste anges med antingen ett icke-tomt memberTypes-[attribut] eller minst ett <simpleType>-element bland [underordnade].
 
 #constraint valid (3.X.6)
 
-        ag-props-correct.2 = ag-props-correct.2: Ett fel intr\u00E4ffade f\u00F6r attributgruppen ''{0}''. Duplicerad attributanv\u00E4ndning med samma namn och namnrymd. Namnet p\u00E5 dubbletten \u00E4r ''{1}''.
-        ag-props-correct.3 = ag-props-correct.3: Ett fel intr\u00E4ffade f\u00F6r attributgruppen ''{0}''. Tv\u00E5 attributdeklarationer, ''{1}'' och ''{2}'' har angetts med typer som h\u00E4rleds fr\u00E5n ID.
-        a-props-correct.2 = a-props-correct.2: Ogiltigt v\u00E4rde f\u00F6r begr\u00E4nsning, ''{1}'', i attributet ''{0}''.
-        a-props-correct.3 = a-props-correct.3: Attributet ''{0}'' f\u00E5r inte anv\u00E4nda ''fixed'' eller ''default'', eftersom attributets '{'typdefinition'}' \u00E4r ID eller h\u00E4rleds fr\u00E5n ID.
-        au-props-correct.2 = au-props-correct.2: Det fasta v\u00E4rdet ''{1}'' har angetts i attributdeklarationen ''{0}''. Om attributet som refererar till ''{0}'' \u00E4ven inneh\u00E5ller en '{'v\u00E4rdebegr\u00E4nsning'}' m\u00E5ste du l\u00F6sa detta och ange v\u00E4rdet ''{1}''.
-        cos-all-limited.1.2 = cos-all-limited.1.2: En 'all'-modellgrupp m\u00E5ste anges i en partikel med '{'min f\u00F6rekomster'}' = '{'max f\u00F6rekomster'}' = 1 och partikeln m\u00E5ste vara en del i ett par som utg\u00F6r '{'inneh\u00E5llstyp'}' i en komplex typdefinition.
-        cos-all-limited.2 = cos-all-limited.2: V\u00E4rdet f\u00F6r '{'max f\u00F6rekomster'}' i ett element i en ''all''-modellgrupp m\u00E5ste vara 0 eller 1. V\u00E4rdet ''{0}'' f\u00F6r elementet ''{1}'' \u00E4r ogiltigt.
-        cos-applicable-facets = cos-applicable-facets: Aspekten (facet) ''{0}'' \u00E4r inte till\u00E5ten med typ {1}.
-        cos-ct-extends.1.1 = cos-ct-extends.1.1: Typ ''{0}'' h\u00E4rleds fr\u00E5n ett till\u00E4gg fr\u00E5n typ ''{1}''. Attributet ''final'' i ''{1}'' till\u00E5ter dock inte h\u00E4rledning av till\u00E4gg.
-        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: Inneh\u00E5llstyp f\u00F6r h\u00E4rledd typ och f\u00F6r basen m\u00E5ste b\u00E5da vara blandade eller endast element. Typ ''{0}'' \u00E4r endast element, men d\u00E4remot inte basen.
-        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: Inneh\u00E5llstyp f\u00F6r h\u00E4rledd typ och f\u00F6r basen m\u00E5ste b\u00E5da vara blandade eller endast element. Typ ''{0}'' \u00E4r blandat, men d\u00E4remot inte basen.
-        cos-element-consistent = cos-element-consistent: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Flera element med namnet ''{1}'', med olika typer, har angetts i modellgruppen.
-        cos-list-of-atomic = cos-list-of-atomic: I definitionen av listtyp ''{0}'' \u00E4r typ ''{1}'' en ogiltig typ av listelement eftersom den inte \u00E4r atomisk (''{1}'' \u00E4r antingen en listtyp eller en uniontyp som inneh\u00E5ller en lista).
-        cos-nonambig = cos-nonambig: {0} och {1} (eller element fr\u00E5n ers\u00E4ttningsgruppen) bryter mot "Unique Particle Attribution". Detta skapar tvetydighet f\u00F6r partiklarna vid validering gentemot detta schema.
-        cos-particle-restrict.a = cos-particle-restrict.a: H\u00E4rledd partikel \u00E4r tom och basen \u00E4r inte t\u00F6mningsbar.
-        cos-particle-restrict.b = cos-particle-restrict.b: Baspartikeln \u00E4r tom, men den h\u00E4rledda partikeln \u00E4r inte det.
-        cos-particle-restrict.2 = cos-particle-restrict.2: F\u00F6rbjuden partikelbegr\u00E4nsning: ''{0}''.
-        cos-st-restricts.1.1 = cos-st-restricts.1.1: Typ ''{1}'' \u00E4r atomisk och d\u00E4rf\u00F6r m\u00E5ste '{'bastypdefinitionen'}', ''{0}'', anges som atomisk enkel typ eller inbyggd primitiv datatyp.
-        cos-st-restricts.2.1 = cos-st-restricts.2.1: I definitionen av listtyp ''{0}'' \u00E4r typ ''{1}'' en ogiltig objekttyp eftersom det \u00E4r antingen en listtyp eller en uniontyp som inneh\u00E5ller en lista.
-        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: Den '{'sista'}' komponenten i '{'objekttypdefinitionen'}', ''{0}'', inneh\u00E5ller ''list''. Detta betyder att ''{0}'' inte kan anv\u00E4ndas som objekttyp f\u00F6r listtyp ''{1}''.
-        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: Den '{'sista'}' komponenten i '{'medlemtypdefinitionerna'}', ''{0}'', inneh\u00E5ller ''union''. Detta betyder att ''{0}'' inte kan anv\u00E4ndas som medlemstyp f\u00F6r uniontyp ''{1}''.
-        cos-valid-default.2.1 = cos-valid-default.2.1: Elementet ''{0}'' har en v\u00E4rdebegr\u00E4nsning och m\u00E5ste ha en blandad eller enkel inneh\u00E5llsmodell.
-        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Eftersom elementet ''{0}'' har en '{'v\u00E4rdebegr\u00E4nsning'}' och typdefinitionen har blandad '{'inneh\u00E5llstyp'}' s\u00E5 m\u00E5ste partikeln av '{'inneh\u00E5llstyp'}' vara t\u00F6mningsbar.
-        c-props-correct.2 = c-props-correct.2: Kardinalitet av f\u00E4lt med nyckelreferens ''{0}'' och nyckel ''{1}'' m\u00E5ste matcha varandra.
-        ct-props-correct.3 = ct-props-correct.3: Cirkul\u00E4ra definitioner har identifierats f\u00F6r komplex typ ''{0}''. Detta inneb\u00E4r att ''{0}'' ing\u00E5r i sin egen typhierarki, vilket \u00E4r fel.
-        ct-props-correct.4 = ct-props-correct.4: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Duplicerad attributanv\u00E4ndning med samma namn och namnrymd. Namnet p\u00E5 dubbletten \u00E4r ''{1}''.
-        ct-props-correct.5 = ct-props-correct.5: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Tv\u00E5 attributdeklarationer, ''{1}'' och ''{2}'', anv\u00E4nds med typer som h\u00E4rleds fr\u00E5n ID.
-        derivation-ok-restriction.1 = derivation-ok-restriction.1: Typ ''{0}'' h\u00E4rleddes genom begr\u00E4nsning fr\u00E5n typ ''{1}''. ''{1}'' har d\u00E4remot en '{'slutlig'}' egenskap som f\u00F6rbjuder h\u00E4rledning via begr\u00E4nsning.
-        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Attributanv\u00E4ndning ''{1}'' i denna typ har ''use''-v\u00E4rdet ''{2}'' vilket inte \u00E4r konsekvent med v\u00E4rdet f\u00F6r ''required'' i matchande attributanv\u00E4ndning i bastypen.
-        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Attributanv\u00E4ndning ''{1}'' i denna typ har typ ''{2}'', som inte f\u00E5r h\u00E4rledas fr\u00E5n ''{3}'', typ i matchande attributanv\u00E4ndning i bastypen.
-        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Attributanv\u00E4ndning ''{1}'' i denna typ har en effektiv v\u00E4rdebegr\u00E4nsning som inte \u00E4r fast, medan den effektiva v\u00E4rdebegr\u00E4nsningen i matchande attributanv\u00E4ndning i bastypen \u00E4r fast.
-        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Attributanv\u00E4ndning ''{1}'' i denna typ har en effektiv v\u00E4rdebegr\u00E4nsning med det fasta v\u00E4rdet ''{2}'', vilket inte \u00E4r konsekvent med v\u00E4rdet ''{3}'' f\u00F6r den fasta effektiva v\u00E4rdebegr\u00E4nsningen f\u00F6r matchande attributanv\u00E4ndning i bastypen.
-        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Attributanv\u00E4ndning ''{1}'' i denna typ har inte n\u00E5gon matchande attributanv\u00E4ndning i basen och bastypen saknar jokerteckenattribut.
-        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Attributanv\u00E4ndning ''{1}'' i denna typ har inte n\u00E5gon matchande attributanv\u00E4ndning i basen och namnrymden ''{2}'' i denna attributanv\u00E4ndning till\u00E5ts inte av jokertecknet i bastypen.
-        derivation-ok-restriction.3 = derivation-ok-restriction.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Attributanv\u00E4ndning ''{1}'' i bastypen har REQUIRED angivet som true, men det finns ingen matchande attributanv\u00E4ndning i h\u00E4rledd typ.
-        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: Ett fel intr\u00E4ffade f\u00F6r typen ''{0}''. H\u00E4rledningen har ett attributjokertecken, men motsvarande i basen saknas.
-        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: Ett fel intr\u00E4ffade f\u00F6r typen ''{0}''. Jokertecknet i h\u00E4rledningen \u00E4r inte n\u00E5gon giltig jokerteckendel som motsvarar det i basen.
-        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Processinneh\u00E5llet f\u00F6r jokertecken i h\u00E4rledning ({1}) \u00E4r svagare \u00E4n det i basen ({2}).
-        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Den enkla inneh\u00E5llstypen f\u00F6r denna typ, ''{1}'', \u00E4r inte n\u00E5gon giltig begr\u00E4nsning av den enkla inneh\u00E5llstypen f\u00F6r basen, ''{2}''.
-        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Inneh\u00E5llstypen f\u00F6r denna typ \u00E4r tom, men inneh\u00E5llstypen f\u00F6r basen, ''{1}'', \u00E4r inte tom eller t\u00F6mningsbar.
-        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Inneh\u00E5llstypen f\u00F6r denna typ \u00E4r blandad, medan inneh\u00E5llstypen f\u00F6r basen, ''{1}'', inte \u00E4r det.
-        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Typpartikeln \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r partikeln i basen.
-        enumeration-required-notation = enumeration-required-notation: NOTATION-typ, ''{0}'' anv\u00E4nds av {2} ''{1}'', m\u00E5ste anges med uppr\u00E4kningsaspektv\u00E4rde som specificerar de notationselement som anv\u00E4nds av denna typ.
-        enumeration-valid-restriction = enumeration-valid-restriction: Uppr\u00E4kningsv\u00E4rdet ''{0}'' finns inte i bastypens, {1}, v\u00E4rdeutrymme.
-        e-props-correct.2 = e-props-correct.2: Ogiltigt v\u00E4rde f\u00F6r begr\u00E4nsningsv\u00E4rde ''{1}'' i elementet ''{0}''.
-        e-props-correct.4 = e-props-correct.4: '{'Typdefinition'}' f\u00F6r elementet ''{0}'' har en ogiltig h\u00E4rledning fr\u00E5n '{'typdefinitionen'}' f\u00F6r substitutionHead ''{1}'' eller s\u00E5 till\u00E5ts inte denna h\u00E4rledning av egenskapen ''{1}'' f\u00F6r '{'ers\u00E4ttningsgruppexkluderingar'}'.
-        e-props-correct.5 = e-props-correct.5: En '{'v\u00E4rdebegr\u00E4nsning'}' f\u00E5r inte finnas med i elementet ''{0}'' eftersom elementets '{'typdefinition'}' eller '{'typdefinitionens'}' '{'inneh\u00E5llstyp'}' \u00E4r ID, eller h\u00E4rleds fr\u00E5n ID.
-        e-props-correct.6 = e-props-correct.6: Cirkul\u00E4r ers\u00E4ttningsgrupp identifierades f\u00F6r elementet ''{0}''.
-        fractionDigits-valid-restriction = fractionDigits-valid-restriction: I definitionen f\u00F6r {2} \u00E4r v\u00E4rdet ''{0}'' f\u00F6r ''fractionDigits'' ogiltigt eftersom det m\u00E5ste vara mindre \u00E4n eller lika med v\u00E4rdet f\u00F6r ''fractionDigits'' som har angetts som ''{1}'' i n\u00E5gon typ f\u00F6r \u00F6verordnad.
-        fractionDigits-totalDigits = fractionDigits-totalDigits: I definitionen av {2} \u00E4r v\u00E4rdet ''{0}'' f\u00F6r ''fractionDigits'' ogiltigt eftersom v\u00E4rdet m\u00E5ste vara mindre \u00E4n eller lika med v\u00E4rdet f\u00F6r ''totalDigits'' som \u00E4r ''{1}''.
-        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: Vid anv\u00E4ndning av typ {0} \u00E4r det fel om l\u00E4ngdv\u00E4rdet ''{1}'' \u00E4r mindre \u00E4n v\u00E4rdet f\u00F6r minLength ''{2}''.
-        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: Vid anv\u00E4ndning av typ {0} \u00E4r det fel om basen inte har en minLength-aspekt n\u00E4r aktuell begr\u00E4nsning har minLength-aspekt och aktuell begr\u00E4nsning eller bas har angetts med l\u00E4ngdaspekt.
-        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: Vid anv\u00E4ndning av typ {0} \u00E4r det fel om aktuell minLength ''{1}'' inte \u00E4r lika med basen minLength ''{2}''.
-        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: Vid anv\u00E4ndning av typ {0} \u00E4r det fel om l\u00E4ngdv\u00E4rdet ''{1}'' \u00E4r st\u00F6rre \u00E4n v\u00E4rdet f\u00F6r maxLength ''{2}''.
-        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: Vid anv\u00E4ndning av typ {0} \u00E4r det fel om basen inte har en maxLength-aspekt n\u00E4r aktuell begr\u00E4nsning har maxLength-aspekt och aktuell begr\u00E4nsning eller bas har angetts med l\u00E4ngdaspekt.
-        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: Vid anv\u00E4ndning av typ {0} \u00E4r det fel om aktuell maxLength ''{1}'' inte \u00E4r lika med basen maxLength ''{2}''.
-        length-valid-restriction = length-valid-restriction: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. L\u00E4ngdv\u00E4rdet ''{0}'' m\u00E5ste vara lika med v\u00E4rdet f\u00F6r bastyp ''{1}''.
-        maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. maxExclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara mindre \u00E4n eller lika med maxExclusive i bastyp ''{1}''.
-        maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. maxExclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara mindre \u00E4n eller lika med maxInclusive i bastyp ''{1}''.
-        maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. maxExclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara st\u00F6rre \u00E4n minInclusive i bastyp ''{1}''.
-        maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. maxExclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara st\u00F6rre \u00E4n minExclusive i bastyp ''{1}''.
-        maxInclusive-maxExclusive = maxInclusive-maxExclusive: Det \u00E4r fel om b\u00E5de maxInclusive och maxExclusive anges f\u00F6r samma datatyp. I {2} \u00E4r maxInclusive ''{0}'' och maxExclusive ''{1}''.
-        maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. maxInclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara mindre \u00E4n eller lika med maxInclusive i bastyp ''{1}''.
-        maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. maxInclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara mindre \u00E4n maxExclusive i bastyp ''{1}''.
-        maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. maxInclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara st\u00F6rre \u00E4n eller lika med minInclusive i bastyp ''{1}''.
-        maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. maxInclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara st\u00F6rre \u00E4n minExclusive i bastyp ''{1}''.
-        maxLength-valid-restriction = maxLength-valid-restriction: I definitionen f\u00F6r {2} m\u00E5ste maxLength-v\u00E4rdet ''{0}'' vara mindre \u00E4n eller lika med v\u00E4rdet i bastyp ''{1}''.
-        mg-props-correct.2 = mg-props-correct.2: Cirkul\u00E4ra definitioner identifierades f\u00F6r gruppen ''{0}''. Rekursivt efterf\u00F6ljande v\u00E4rdena f\u00F6r '{'term'}' i partiklarna leder till en partikel vars '{'term'}' \u00E4r den ursprungliga gruppen.
-        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: I definitionen f\u00F6r {2} m\u00E5ste minExclusive-v\u00E4rdet ''{0}'' vara mindre \u00E4n eller lika med maxExclusive-v\u00E4rdet ''{1}''.
-        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: I definitionen f\u00F6r {2} m\u00E5ste minExclusive-v\u00E4rdet ''{0}'' vara mindre \u00E4n maxInclusive-v\u00E4rdet ''{1}''.
-        minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. minExclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara st\u00F6rre \u00E4n eller lika med minExclusive i bastyp ''{1}''.
-        minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. minExclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara mindre \u00E4n eller lika med maxInclusive i bastyp ''{1}''.
-        minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. minExclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara st\u00F6rre \u00E4n eller lika med minInclusive i bastyp ''{1}''.
-        minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. minExclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara mindre \u00E4n maxExclusive i bastyp ''{1}''.
-        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: I definitionen f\u00F6r {2} m\u00E5ste minInclusive-v\u00E4rdet ''{0}'' vara mindre \u00E4n eller lika med maxInclusive-v\u00E4rdet ''{1}''.
-        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: I definitionen f\u00F6r {2} m\u00E5ste minInclusive-v\u00E4rdet ''{0}'' vara mindre \u00E4n maxExclusive-v\u00E4rdet ''{1}''.
-        minInclusive-minExclusive = minInclusive-minExclusive: Det \u00E4r fel om b\u00E5de minInclusive och minExclusive anges f\u00F6r samma datatyp. I {2} \u00E4r minInclusive ''{0}'' och minExclusive ''{1}''.
-        minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. minInclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara st\u00F6rre \u00E4n eller lika med minInclusive i bastyp ''{1}''.
-        minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. minInclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara mindre \u00E4n eller lika med maxInclusive i bastyp ''{1}''.
-        minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. minInclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara st\u00F6rre \u00E4n minExclusive i bastyp ''{1}''.
-        minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. minInclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara mindre \u00E4n maxExclusive i bastyp ''{1}''.
-        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: I definitionen f\u00F6r {2} m\u00E5ste minLength-v\u00E4rdet ''{0}'' vara mindre \u00E4n maxLength-v\u00E4rdet ''{1}''.
-        minLength-valid-restriction = minLength-valid-restriction: I definitionen f\u00F6r {2} m\u00E5ste minLength-v\u00E4rdet ''{0}'' vara st\u00F6rre \u00E4n eller lika med v\u00E4rdet i bastyp ''{1}''.
-        no-xmlns = no-xmlns: Ett {namn} p\u00E5 en attributdeklaration f\u00E5r inte matcha 'xmlns'.
-        no-xsi = no-xsi: En  '{'m\u00E5lnamnrymd'}' i en attributdeklaration f\u00E5r inte matcha ''{0}''.
-        p-props-correct.2.1 = p-props-correct.2.1: I deklarationen ''{0}'' \u00E4r v\u00E4rdet f\u00F6r ''minOccurs'' ''{1}'', men det f\u00E5r inte vara st\u00F6rre \u00E4n v\u00E4rdet f\u00F6r ''maxOccurs'' (som \u00E4r ''{2}'').
-        rcase-MapAndSum.1 = rcase-MapAndSum.1: Det finns ingen fullst\u00E4ndigt fungerande mappning mellan partiklarna.
-        rcase-MapAndSum.2 = rcase-MapAndSum.2: Gruppens f\u00F6rekomstintervall ({0},{1}) \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r basgruppens f\u00F6rekomstintervall, ({2},{3}).
-        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: Element har namn och m\u00E5lnamnrymder som inte \u00E4r desamma: Elementet ''{0}'' i namnrymd ''{1}'' och elementet ''{2}'' i namnrymd ''{3}''.
-        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Ett fel intr\u00E4ffade f\u00F6r partikeln vars '{'term'}' \u00E4r elementdeklarationen ''{0}''. Elementdeklarationens v\u00E4rde som \u00E4r '{'nullbart'}' har angetts som true, men motsvarande partikel i bastypen har en elementdeklaration vars v\u00E4rde som \u00E4r '{'nullbart'}' har angetts som false.
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Ett fel intr\u00E4ffade f\u00F6r partikeln vars  '{'term'}' \u00E4r elementdeklarationen ''{0}''. F\u00F6rekomstintervallet, ({1},{2}), \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r intervallet, ({3},{4}, i motsvarande partikel i bastypen.
-        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: Elementet ''{0}'' har inte n\u00E5got fast v\u00E4rde, men motsvarande element i bastypen har angetts med det fasta v\u00E4rdet ''{1}''.
-        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: Elementet ''{0}'' har det fasta v\u00E4rdet ''{1}'', men motsvarande element i bastypen har angetts med det fasta v\u00E4rdet ''{2}''.
-        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: Identitetsbegr\u00E4nsningarna f\u00F6r elementet ''{0}'' \u00E4r inte n\u00E5gon del av de som finns i basen.
-        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: De avaktiverade ers\u00E4ttningarna f\u00F6r elementet ''{0}'' \u00E4r inte inneslutna i basen.
-        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: Elementtyp ''{0}'', ''{1}'' h\u00E4rleds inte fr\u00E5n typ av baselement, ''{2}''.
-        rcase-NSCompat.1 = rcase-NSCompat.1: Elementet ''{0}'' har namnrymden ''{1}'' som inte \u00E4r till\u00E5tet av jokertecknet i basen.
-        rcase-NSCompat.2 = rcase-NSCompat.2: Ett fel intr\u00E4ffade f\u00F6r partikeln vars '{'term'}' \u00E4r elementdeklarationen ''{0}''. F\u00F6rekomstintervallet, ({1},{2}), \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r intervallet, ({3},{4}, i motsvarande partikel i bastypen.
-        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: Det finns ingen fullst\u00E4ndigt fungerande mappning mellan partiklarna.
-        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: Gruppens f\u00F6rekomstintervall ({0},{1}) \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r basjokertecknets intervall, ({2},{3}).
-        rcase-NSSubset.1 = rcase-NSSubset.1: Jokertecknet \u00E4r inte n\u00E5gon del av motsvarande jokertecken i basen.
-        rcase-NSSubset.2 = rcase-NSSubset.2: Jokertecknets f\u00F6rekomstintervall ({0},{1}), \u00E4r inte n\u00E5gon giltig begr\u00E4nsning som motsvarar den i basen, ({2},{3}),.
-        rcase-NSSubset.3 = rcase-NSSubset.3: Jokertecknets processinneh\u00E5ll, ''{0}'', \u00E4r svagare \u00E4n det i basen, ''{1}''.
-        rcase-Recurse.1 = rcase-Recurse.1: Gruppens f\u00F6rekomstintervall ({0},{1}) \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r basgruppens f\u00F6rekomstintervall, ({2},{3}).
-        rcase-Recurse.2 = rcase-Recurse.2: Det finns ingen fullst\u00E4ndigt fungerande mappning mellan partiklarna.
-        rcase-RecurseLax.1 = rcase-RecurseLax.1: Gruppens f\u00F6rekomstintervall ({0},{1}) \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r basgruppens f\u00F6rekomstintervall, ({2},{3}).
-        rcase-RecurseLax.2 = rcase-RecurseLax.2: Det finns ingen fullst\u00E4ndigt fungerande mappning mellan partiklarna.
-        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: Gruppens f\u00F6rekomstintervall ({0},{1}) \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r basgruppens f\u00F6rekomstintervall, ({2},{3}).
-        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: Det finns ingen fullst\u00E4ndigt fungerande mappning mellan partiklarna.
+        ag-props-correct.2 = ag-props-correct.2: Ett fel inträffade för attributgruppen ''{0}''. Duplicerad attributanvändning med samma namn och namnrymd. Namnet på dubbletten är ''{1}''.
+        ag-props-correct.3 = ag-props-correct.3: Ett fel inträffade för attributgruppen ''{0}''. Två attributdeklarationer, ''{1}'' och ''{2}'' har angetts med typer som härleds från ID.
+        a-props-correct.2 = a-props-correct.2: Ogiltigt värde för begränsning, ''{1}'', i attributet ''{0}''.
+        a-props-correct.3 = a-props-correct.3: Attributet ''{0}'' får inte använda ''fixed'' eller ''default'', eftersom attributets '{'typdefinition'}' är ID eller härleds från ID.
+        au-props-correct.2 = au-props-correct.2: Det fasta värdet ''{1}'' har angetts i attributdeklarationen ''{0}''. Om attributet som refererar till ''{0}'' även innehåller en '{'värdebegränsning'}' måste du lösa detta och ange värdet ''{1}''.
+        cos-all-limited.1.2 = cos-all-limited.1.2: En 'all'-modellgrupp måste anges i en partikel med '{'min förekomster'}' = '{'max förekomster'}' = 1 och partikeln måste vara en del i ett par som utgör '{'innehållstyp'}' i en komplex typdefinition.
+        cos-all-limited.2 = cos-all-limited.2: Värdet för '{'max förekomster'}' i ett element i en ''all''-modellgrupp måste vara 0 eller 1. Värdet ''{0}'' för elementet ''{1}'' är ogiltigt.
+        cos-applicable-facets = cos-applicable-facets: Aspekten (facet) ''{0}'' är inte tillåten med typ {1}.
+        cos-ct-extends.1.1 = cos-ct-extends.1.1: Typ ''{0}'' härleds från ett tillägg från typ ''{1}''. Attributet ''final'' i ''{1}'' tillåter dock inte härledning av tillägg.
+        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: Innehållstyp för härledd typ och för basen måste båda vara blandade eller endast element. Typ ''{0}'' är endast element, men däremot inte basen.
+        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: Innehållstyp för härledd typ och för basen måste båda vara blandade eller endast element. Typ ''{0}'' är blandat, men däremot inte basen.
+        cos-element-consistent = cos-element-consistent: Ett fel inträffade för typ ''{0}''. Flera element med namnet ''{1}'', med olika typer, har angetts i modellgruppen.
+        cos-list-of-atomic = cos-list-of-atomic: I definitionen av listtyp ''{0}'' är typ ''{1}'' en ogiltig typ av listelement eftersom den inte är atomisk (''{1}'' är antingen en listtyp eller en uniontyp som innehåller en lista).
+        cos-nonambig = cos-nonambig: {0} och {1} (eller element från ersättningsgruppen) bryter mot "Unique Particle Attribution". Detta skapar tvetydighet för partiklarna vid validering gentemot detta schema.
+        cos-particle-restrict.a = cos-particle-restrict.a: Härledd partikel är tom och basen är inte tömningsbar.
+        cos-particle-restrict.b = cos-particle-restrict.b: Baspartikeln är tom, men den härledda partikeln är inte det.
+        cos-particle-restrict.2 = cos-particle-restrict.2: Förbjuden partikelbegränsning: ''{0}''.
+        cos-st-restricts.1.1 = cos-st-restricts.1.1: Typ ''{1}'' är atomisk och därför måste '{'bastypdefinitionen'}', ''{0}'', anges som atomisk enkel typ eller inbyggd primitiv datatyp.
+        cos-st-restricts.2.1 = cos-st-restricts.2.1: I definitionen av listtyp ''{0}'' är typ ''{1}'' en ogiltig objekttyp eftersom det är antingen en listtyp eller en uniontyp som innehåller en lista.
+        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: Den '{'sista'}' komponenten i '{'objekttypdefinitionen'}', ''{0}'', innehåller ''list''. Detta betyder att ''{0}'' inte kan användas som objekttyp för listtyp ''{1}''.
+        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: Den '{'sista'}' komponenten i '{'medlemtypdefinitionerna'}', ''{0}'', innehåller ''union''. Detta betyder att ''{0}'' inte kan användas som medlemstyp för uniontyp ''{1}''.
+        cos-valid-default.2.1 = cos-valid-default.2.1: Elementet ''{0}'' har en värdebegränsning och måste ha en blandad eller enkel innehållsmodell.
+        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Eftersom elementet ''{0}'' har en '{'värdebegränsning'}' och typdefinitionen har blandad '{'innehållstyp'}' så måste partikeln av '{'innehållstyp'}' vara tömningsbar.
+        c-props-correct.2 = c-props-correct.2: Kardinalitet av fält med nyckelreferens ''{0}'' och nyckel ''{1}'' måste matcha varandra.
+        ct-props-correct.3 = ct-props-correct.3: Cirkulära definitioner har identifierats för komplex typ ''{0}''. Detta innebär att ''{0}'' ingår i sin egen typhierarki, vilket är fel.
+        ct-props-correct.4 = ct-props-correct.4: Ett fel inträffade för typ ''{0}''. Duplicerad attributanvändning med samma namn och namnrymd. Namnet på dubbletten är ''{1}''.
+        ct-props-correct.5 = ct-props-correct.5: Ett fel inträffade för typ ''{0}''. Två attributdeklarationer, ''{1}'' och ''{2}'', används med typer som härleds från ID.
+        derivation-ok-restriction.1 = derivation-ok-restriction.1: Typ ''{0}'' härleddes genom begränsning från typ ''{1}''. ''{1}'' har däremot en '{'slutlig'}' egenskap som förbjuder härledning via begränsning.
+        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: Ett fel inträffade för typ ''{0}''. Attributanvändning ''{1}'' i denna typ har ''use''-värdet ''{2}'' vilket inte är konsekvent med värdet för ''required'' i matchande attributanvändning i bastypen.
+        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: Ett fel inträffade för typ ''{0}''. Attributanvändning ''{1}'' i denna typ har typ ''{2}'', som inte får härledas från ''{3}'', typ i matchande attributanvändning i bastypen.
+        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: Ett fel inträffade för typ ''{0}''. Attributanvändning ''{1}'' i denna typ har en effektiv värdebegränsning som inte är fast, medan den effektiva värdebegränsningen i matchande attributanvändning i bastypen är fast.
+        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: Ett fel inträffade för typ ''{0}''. Attributanvändning ''{1}'' i denna typ har en effektiv värdebegränsning med det fasta värdet ''{2}'', vilket inte är konsekvent med värdet ''{3}'' för den fasta effektiva värdebegränsningen för matchande attributanvändning i bastypen.
+        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: Ett fel inträffade för typ ''{0}''. Attributanvändning ''{1}'' i denna typ har inte någon matchande attributanvändning i basen och bastypen saknar jokerteckenattribut.
+        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: Ett fel inträffade för typ ''{0}''. Attributanvändning ''{1}'' i denna typ har inte någon matchande attributanvändning i basen och namnrymden ''{2}'' i denna attributanvändning tillåts inte av jokertecknet i bastypen.
+        derivation-ok-restriction.3 = derivation-ok-restriction.3: Ett fel inträffade för typ ''{0}''. Attributanvändning ''{1}'' i bastypen har REQUIRED angivet som true, men det finns ingen matchande attributanvändning i härledd typ.
+        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: Ett fel inträffade för typen ''{0}''. Härledningen har ett attributjokertecken, men motsvarande i basen saknas.
+        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: Ett fel inträffade för typen ''{0}''. Jokertecknet i härledningen är inte någon giltig jokerteckendel som motsvarar det i basen.
+        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: Ett fel inträffade för typ ''{0}''. Processinnehållet för jokertecken i härledning ({1}) är svagare än det i basen ({2}).
+        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: Ett fel inträffade för typ ''{0}''. Den enkla innehållstypen för denna typ, ''{1}'', är inte någon giltig begränsning av den enkla innehållstypen för basen, ''{2}''.
+        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: Ett fel inträffade för typ ''{0}''. Innehållstypen för denna typ är tom, men innehållstypen för basen, ''{1}'', är inte tom eller tömningsbar.
+        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: Ett fel inträffade för typ ''{0}''. Innehållstypen för denna typ är blandad, medan innehållstypen för basen, ''{1}'', inte är det.
+        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: Ett fel inträffade för typ ''{0}''. Typpartikeln är inte någon giltig begränsning för partikeln i basen.
+        enumeration-required-notation = enumeration-required-notation: NOTATION-typ, ''{0}'' används av {2} ''{1}'', måste anges med uppräkningsaspektvärde som specificerar de notationselement som används av denna typ.
+        enumeration-valid-restriction = enumeration-valid-restriction: Uppräkningsvärdet ''{0}'' finns inte i bastypens, {1}, värdeutrymme.
+        e-props-correct.2 = e-props-correct.2: Ogiltigt värde för begränsningsvärde ''{1}'' i elementet ''{0}''.
+        e-props-correct.4 = e-props-correct.4: '{'Typdefinition'}' för elementet ''{0}'' har en ogiltig härledning från '{'typdefinitionen'}' för substitutionHead ''{1}'' eller så tillåts inte denna härledning av egenskapen ''{1}'' för '{'ersättningsgruppexkluderingar'}'.
+        e-props-correct.5 = e-props-correct.5: En '{'värdebegränsning'}' får inte finnas med i elementet ''{0}'' eftersom elementets '{'typdefinition'}' eller '{'typdefinitionens'}' '{'innehållstyp'}' är ID, eller härleds från ID.
+        e-props-correct.6 = e-props-correct.6: Cirkulär ersättningsgrupp identifierades för elementet ''{0}''.
+        fractionDigits-valid-restriction = fractionDigits-valid-restriction: I definitionen för {2} är värdet ''{0}'' för ''fractionDigits'' ogiltigt eftersom det måste vara mindre än eller lika med värdet för ''fractionDigits'' som har angetts som ''{1}'' i någon typ för överordnad.
+        fractionDigits-totalDigits = fractionDigits-totalDigits: I definitionen av {2} är värdet ''{0}'' för ''fractionDigits'' ogiltigt eftersom värdet måste vara mindre än eller lika med värdet för ''totalDigits'' som är ''{1}''.
+        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: Vid användning av typ {0} är det fel om längdvärdet ''{1}'' är mindre än värdet för minLength ''{2}''.
+        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: Vid användning av typ {0} är det fel om basen inte har en minLength-aspekt när aktuell begränsning har minLength-aspekt och aktuell begränsning eller bas har angetts med längdaspekt.
+        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: Vid användning av typ {0} är det fel om aktuell minLength ''{1}'' inte är lika med basen minLength ''{2}''.
+        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: Vid användning av typ {0} är det fel om längdvärdet ''{1}'' är större än värdet för maxLength ''{2}''.
+        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: Vid användning av typ {0} är det fel om basen inte har en maxLength-aspekt när aktuell begränsning har maxLength-aspekt och aktuell begränsning eller bas har angetts med längdaspekt.
+        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: Vid användning av typ {0} är det fel om aktuell maxLength ''{1}'' inte är lika med basen maxLength ''{2}''.
+        length-valid-restriction = length-valid-restriction: Ett fel inträffade för typ ''{2}''. Längdvärdet ''{0}'' måste vara lika med värdet för bastyp ''{1}''.
+        maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: Ett fel inträffade för typ ''{2}''. maxExclusive-värdet ''{0}'' måste vara mindre än eller lika med maxExclusive i bastyp ''{1}''.
+        maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: Ett fel inträffade för typ ''{2}''. maxExclusive-värdet ''{0}'' måste vara mindre än eller lika med maxInclusive i bastyp ''{1}''.
+        maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: Ett fel inträffade för typ ''{2}''. maxExclusive-värdet ''{0}'' måste vara större än minInclusive i bastyp ''{1}''.
+        maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4: Ett fel inträffade för typ ''{2}''. maxExclusive-värdet ''{0}'' måste vara större än minExclusive i bastyp ''{1}''.
+        maxInclusive-maxExclusive = maxInclusive-maxExclusive: Det är fel om både maxInclusive och maxExclusive anges för samma datatyp. I {2} är maxInclusive ''{0}'' och maxExclusive ''{1}''.
+        maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: Ett fel inträffade för typ ''{2}''. maxInclusive-värdet ''{0}'' måste vara mindre än eller lika med maxInclusive i bastyp ''{1}''.
+        maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: Ett fel inträffade för typ ''{2}''. maxInclusive-värdet ''{0}'' måste vara mindre än maxExclusive i bastyp ''{1}''.
+        maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: Ett fel inträffade för typ ''{2}''. maxInclusive-värdet ''{0}'' måste vara större än eller lika med minInclusive i bastyp ''{1}''.
+        maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: Ett fel inträffade för typ ''{2}''. maxInclusive-värdet ''{0}'' måste vara större än minExclusive i bastyp ''{1}''.
+        maxLength-valid-restriction = maxLength-valid-restriction: I definitionen för {2} måste maxLength-värdet ''{0}'' vara mindre än eller lika med värdet i bastyp ''{1}''.
+        mg-props-correct.2 = mg-props-correct.2: Cirkulära definitioner identifierades för gruppen ''{0}''. Rekursivt efterföljande värdena för '{'term'}' i partiklarna leder till en partikel vars '{'term'}' är den ursprungliga gruppen.
+        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: I definitionen för {2} måste minExclusive-värdet ''{0}'' vara mindre än eller lika med maxExclusive-värdet ''{1}''.
+        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: I definitionen för {2} måste minExclusive-värdet ''{0}'' vara mindre än maxInclusive-värdet ''{1}''.
+        minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: Ett fel inträffade för typ ''{2}''. minExclusive-värdet ''{0}'' måste vara större än eller lika med minExclusive i bastyp ''{1}''.
+        minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2: Ett fel inträffade för typ ''{2}''. minExclusive-värdet ''{0}'' måste vara mindre än eller lika med maxInclusive i bastyp ''{1}''.
+        minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3: Ett fel inträffade för typ ''{2}''. minExclusive-värdet ''{0}'' måste vara större än eller lika med minInclusive i bastyp ''{1}''.
+        minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: Ett fel inträffade för typ ''{2}''. minExclusive-värdet ''{0}'' måste vara mindre än maxExclusive i bastyp ''{1}''.
+        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: I definitionen för {2} måste minInclusive-värdet ''{0}'' vara mindre än eller lika med maxInclusive-värdet ''{1}''.
+        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: I definitionen för {2} måste minInclusive-värdet ''{0}'' vara mindre än maxExclusive-värdet ''{1}''.
+        minInclusive-minExclusive = minInclusive-minExclusive: Det är fel om både minInclusive och minExclusive anges för samma datatyp. I {2} är minInclusive ''{0}'' och minExclusive ''{1}''.
+        minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: Ett fel inträffade för typ ''{2}''. minInclusive-värdet ''{0}'' måste vara större än eller lika med minInclusive i bastyp ''{1}''.
+        minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: Ett fel inträffade för typ ''{2}''. minInclusive-värdet ''{0}'' måste vara mindre än eller lika med maxInclusive i bastyp ''{1}''.
+        minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: Ett fel inträffade för typ ''{2}''. minInclusive-värdet ''{0}'' måste vara större än minExclusive i bastyp ''{1}''.
+        minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: Ett fel inträffade för typ ''{2}''. minInclusive-värdet ''{0}'' måste vara mindre än maxExclusive i bastyp ''{1}''.
+        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: I definitionen för {2} måste minLength-värdet ''{0}'' vara mindre än maxLength-värdet ''{1}''.
+        minLength-valid-restriction = minLength-valid-restriction: I definitionen för {2} måste minLength-värdet ''{0}'' vara större än eller lika med värdet i bastyp ''{1}''.
+        no-xmlns = no-xmlns: Ett {namn} på en attributdeklaration får inte matcha 'xmlns'.
+        no-xsi = no-xsi: En  '{'målnamnrymd'}' i en attributdeklaration får inte matcha ''{0}''.
+        p-props-correct.2.1 = p-props-correct.2.1: I deklarationen ''{0}'' är värdet för ''minOccurs'' ''{1}'', men det får inte vara större än värdet för ''maxOccurs'' (som är ''{2}'').
+        rcase-MapAndSum.1 = rcase-MapAndSum.1: Det finns ingen fullständigt fungerande mappning mellan partiklarna.
+        rcase-MapAndSum.2 = rcase-MapAndSum.2: Gruppens förekomstintervall ({0},{1}) är inte någon giltig begränsning för basgruppens förekomstintervall, ({2},{3}).
+        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: Element har namn och målnamnrymder som inte är desamma: Elementet ''{0}'' i namnrymd ''{1}'' och elementet ''{2}'' i namnrymd ''{3}''.
+        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Ett fel inträffade för partikeln vars '{'term'}' är elementdeklarationen ''{0}''. Elementdeklarationens värde som är '{'nullbart'}' har angetts som true, men motsvarande partikel i bastypen har en elementdeklaration vars värde som är '{'nullbart'}' har angetts som false.
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Ett fel inträffade för partikeln vars  '{'term'}' är elementdeklarationen ''{0}''. Förekomstintervallet, ({1},{2}), är inte någon giltig begränsning för intervallet, ({3},{4}, i motsvarande partikel i bastypen.
+        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: Elementet ''{0}'' har inte något fast värde, men motsvarande element i bastypen har angetts med det fasta värdet ''{1}''.
+        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: Elementet ''{0}'' har det fasta värdet ''{1}'', men motsvarande element i bastypen har angetts med det fasta värdet ''{2}''.
+        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: Identitetsbegränsningarna för elementet ''{0}'' är inte någon del av de som finns i basen.
+        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: De avaktiverade ersättningarna för elementet ''{0}'' är inte inneslutna i basen.
+        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: Elementtyp ''{0}'', ''{1}'' härleds inte från typ av baselement, ''{2}''.
+        rcase-NSCompat.1 = rcase-NSCompat.1: Elementet ''{0}'' har namnrymden ''{1}'' som inte är tillåtet av jokertecknet i basen.
+        rcase-NSCompat.2 = rcase-NSCompat.2: Ett fel inträffade för partikeln vars '{'term'}' är elementdeklarationen ''{0}''. Förekomstintervallet, ({1},{2}), är inte någon giltig begränsning för intervallet, ({3},{4}, i motsvarande partikel i bastypen.
+        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: Det finns ingen fullständigt fungerande mappning mellan partiklarna.
+        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: Gruppens förekomstintervall ({0},{1}) är inte någon giltig begränsning för basjokertecknets intervall, ({2},{3}).
+        rcase-NSSubset.1 = rcase-NSSubset.1: Jokertecknet är inte någon del av motsvarande jokertecken i basen.
+        rcase-NSSubset.2 = rcase-NSSubset.2: Jokertecknets förekomstintervall ({0},{1}), är inte någon giltig begränsning som motsvarar den i basen, ({2},{3}),.
+        rcase-NSSubset.3 = rcase-NSSubset.3: Jokertecknets processinnehåll, ''{0}'', är svagare än det i basen, ''{1}''.
+        rcase-Recurse.1 = rcase-Recurse.1: Gruppens förekomstintervall ({0},{1}) är inte någon giltig begränsning för basgruppens förekomstintervall, ({2},{3}).
+        rcase-Recurse.2 = rcase-Recurse.2: Det finns ingen fullständigt fungerande mappning mellan partiklarna.
+        rcase-RecurseLax.1 = rcase-RecurseLax.1: Gruppens förekomstintervall ({0},{1}) är inte någon giltig begränsning för basgruppens förekomstintervall, ({2},{3}).
+        rcase-RecurseLax.2 = rcase-RecurseLax.2: Det finns ingen fullständigt fungerande mappning mellan partiklarna.
+        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: Gruppens förekomstintervall ({0},{1}) är inte någon giltig begränsning för basgruppens förekomstintervall, ({2},{3}).
+        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: Det finns ingen fullständigt fungerande mappning mellan partiklarna.
 #        We're using sch-props-correct.2 instead of the old src-redefine.1
 #        src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
-        sch-props-correct.2 = sch-props-correct.2: Ett schema f\u00E5r inte inneh\u00E5lla tv\u00E5 globala komponenter med samma namn. Detta schema har tv\u00E5 f\u00F6rekomster av ''{0}''.
-        st-props-correct.2 = st-props-correct.2: Cirkul\u00E4ra definitioner har identifierats f\u00F6r enkel typ ''{0}''. Detta inneb\u00E4r att ''{0}'' ing\u00E5r i sin egen typhierarki, vilket \u00E4r fel.
-        st-props-correct.3 = st-props-correct.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. V\u00E4rdet f\u00F6r '{'slutgiltigt'}' i '{'bastypdefinitionen'}', ''{1}'', f\u00F6rbjuder h\u00E4rledning med begr\u00E4nsning.
-        totalDigits-valid-restriction = totalDigits-valid-restriction: I definitionen f\u00F6r {2} \u00E4r v\u00E4rdet ''{0}'' f\u00F6r ''totalDigits'' ogiltigt eftersom det m\u00E5ste vara mindre \u00E4n eller lika med v\u00E4rdet f\u00F6r ''totalDigits'' som har angetts som ''{1}'' i n\u00E5gon typ f\u00F6r \u00F6verordnad.
-        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: I definitionen f\u00F6r {0} \u00E4r v\u00E4rdet ''{1}'' f\u00F6r ''whitespace'' ogiltigt, eftersom v\u00E4rdet f\u00F6r ''whitespace'' har angetts som ''collapse'' i n\u00E5gon typ f\u00F6r \u00F6verordnad.
-        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: I definitionen f\u00F6r {0} \u00E4r v\u00E4rdet ''preserve'' f\u00F6r ''whitespace'' ogiltigt, eftersom v\u00E4rdet f\u00F6r ''whitespace'' har angetts som ''replace'' i n\u00E5gon typ f\u00F6r \u00F6verordnad.
+        sch-props-correct.2 = sch-props-correct.2: Ett schema får inte innehålla två globala komponenter med samma namn. Detta schema har två förekomster av ''{0}''.
+        st-props-correct.2 = st-props-correct.2: Cirkulära definitioner har identifierats för enkel typ ''{0}''. Detta innebär att ''{0}'' ingår i sin egen typhierarki, vilket är fel.
+        st-props-correct.3 = st-props-correct.3: Ett fel inträffade för typ ''{0}''. Värdet för '{'slutgiltigt'}' i '{'bastypdefinitionen'}', ''{1}'', förbjuder härledning med begränsning.
+        totalDigits-valid-restriction = totalDigits-valid-restriction: I definitionen för {2} är värdet ''{0}'' för ''totalDigits'' ogiltigt eftersom det måste vara mindre än eller lika med värdet för ''totalDigits'' som har angetts som ''{1}'' i någon typ för överordnad.
+        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: I definitionen för {0} är värdet ''{1}'' för ''whitespace'' ogiltigt, eftersom värdet för ''whitespace'' har angetts som ''collapse'' i någon typ för överordnad.
+        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: I definitionen för {0} är värdet ''preserve'' för ''whitespace'' ogiltigt, eftersom värdet för ''whitespace'' har angetts som ''replace'' i någon typ för överordnad.
 
 #schema for Schemas
 
-        s4s-att-invalid-value = s4s-att-invalid-value: Attributv\u00E4rdet f\u00F6r ''{1}'' i elementet ''{0}'' \u00E4r ogiltigt. Registrerad orsak: {2}
-        s4s-att-must-appear = s4s-att-must-appear: Attributet ''{1}'' m\u00E5ste anges i elementet ''{0}''.
-        s4s-att-not-allowed = s4s-att-not-allowed: Attributet ''{1}'' f\u00E5r inte anges i elementet ''{0}''.
-        s4s-elt-invalid = s4s-elt-invalid: Elementet ''{0}'' \u00E4r inte n\u00E5got giltigt element i schemadokument.
-        s4s-elt-must-match.1 = s4s-elt-must-match.1: Inneh\u00E5llet i ''{0}'' m\u00E5ste matcha {1}. Ett problem hittades med b\u00F6rjan fr\u00E5n: {2}.
-        s4s-elt-must-match.2 = s4s-elt-must-match.2: Inneh\u00E5llet i ''{0}'' m\u00E5ste matcha {1}. Hittade inte tillr\u00E4ckligt med element.
+        s4s-att-invalid-value = s4s-att-invalid-value: Attributvärdet för ''{1}'' i elementet ''{0}'' är ogiltigt. Registrerad orsak: {2}
+        s4s-att-must-appear = s4s-att-must-appear: Attributet ''{1}'' måste anges i elementet ''{0}''.
+        s4s-att-not-allowed = s4s-att-not-allowed: Attributet ''{1}'' får inte anges i elementet ''{0}''.
+        s4s-elt-invalid = s4s-elt-invalid: Elementet ''{0}'' är inte något giltigt element i schemadokument.
+        s4s-elt-must-match.1 = s4s-elt-must-match.1: Innehållet i ''{0}'' måste matcha {1}. Ett problem hittades med början från: {2}.
+        s4s-elt-must-match.2 = s4s-elt-must-match.2: Innehållet i ''{0}'' måste matcha {1}. Hittade inte tillräckligt med element.
         # the "invalid-content" messages provide less information than the "must-match" counterparts above. They're used for complex types when providing a "match" would be an information dump
-        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: Inneh\u00E5llet i ''{0}'' \u00E4r ogiltigt. Elementet ''{1}'' \u00E4r ogiltigt, felplacerat eller har f\u00F6r m\u00E5nga f\u00F6rekomster.
-        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: Inneh\u00E5llet i ''{0}'' \u00E4r ogiltigt. Elementet ''{1}'' m\u00E5ste anges.
+        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: Innehållet i ''{0}'' är ogiltigt. Elementet ''{1}'' är ogiltigt, felplacerat eller har för många förekomster.
+        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: Innehållet i ''{0}'' är ogiltigt. Elementet ''{1}'' måste anges.
         s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: Element av typ ''{0}'' kan inte anges efter deklarationer som under underordnade i <schema>element.
-        s4s-elt-schema-ns = s4s-elt-schema-ns: Namnrymden i elementet ''{0}'' m\u00E5ste komma fr\u00E5n schemats namnrymd, ''http://www.w3.org/2001/XMLSchema''.
-        s4s-elt-character = s4s-elt-character: Tecken som inte \u00E4r blanktecken till\u00E5ts inte i andra schemaelement \u00E4n ''xs:appinfo'' och ''xs:documentation''. Uppt\u00E4ckte ''{0}''.
+        s4s-elt-schema-ns = s4s-elt-schema-ns: Namnrymden i elementet ''{0}'' måste komma från schemats namnrymd, ''http://www.w3.org/2001/XMLSchema''.
+        s4s-elt-character = s4s-elt-character: Tecken som inte är blanktecken tillåts inte i andra schemaelement än ''xs:appinfo'' och ''xs:documentation''. Upptäckte ''{0}''.
 
 # codes not defined by the spec
 
-        c-fields-xpaths = c-fields-xpaths: F\u00E4ltv\u00E4rdet = ''{0}'' \u00E4r ogiltigt.
-        c-general-xpath = c-general-xpath: Uttrycket ''{0}'' \u00E4r ogiltigt med den XPath-delm\u00E4ngd som st\u00F6ds i XML-schema.
-        c-general-xpath-ns = c-general-xpath-ns: Ett namnrymdsprefix i XPath-uttrycket ''{0}'' var inte bundet till n\u00E5gon namnrymd.
-        c-selector-xpath = c-selector-xpath: V\u00E4ljarv\u00E4rdet ''{0}'' \u00E4r ogiltigt; xpath f\u00F6r v\u00E4ljare f\u00E5r inte inneh\u00E5lla attribut.
-        EmptyTargetNamespace = EmptyTargetNamespace: I schemadokumentet ''{0}'' f\u00E5r v\u00E4rdet f\u00F6r attributet ''targetNamespace'' inte vara en tom str\u00E4ng.
-        FacetValueFromBase = FacetValueFromBase: I deklarationen av typ ''{0}'' m\u00E5ste v\u00E4rdet ''{1}'' f\u00F6r aspekt ''{2}'' komma fr\u00E5n v\u00E4rdeutrymmet i bastypen ''{3}''.
-        FixedFacetValue = FixedFacetValue: I definitionen f\u00F6r {3} \u00E4r v\u00E4rdet ''{1}'' f\u00F6r aspekten ''{0}'' ogiltigt eftersom v\u00E4rdet f\u00F6r ''{0}'' har angetts som ''{2}'' i n\u00E5gon av typerna f\u00F6r \u00F6verordnade samtidigt som '{'fast'}' = true.
-        InvalidRegex = InvalidRegex: M\u00F6nsterv\u00E4rdet ''{0}'' \u00E4r inte n\u00E5got giltigt regulj\u00E4rt uttryck. Det rapporterade felet \u00E4r: ''{1}'' i kolumn ''{2}''.
-        MaxOccurLimit = Den aktuella konfigurationen f\u00F6r parsern till\u00E5ter inte att attributv\u00E4rdet f\u00F6r Occurs anges som st\u00F6rre \u00E4n v\u00E4rdet {0}.
-        PublicSystemOnNotation = PublicSystemOnNotation: \u00C5tminstone ett av ''public'' och ''system'' m\u00E5ste anges i elementets ''notation''.
-        SchemaLocation = SchemaLocation: schemaLocation-v\u00E4rdet ''{0}'' m\u00E5ste anges med ett j\u00E4mnt antal URI:er.
-        TargetNamespace.1 = TargetNamespace.1: F\u00F6rv\u00E4ntade namnrymden ''{0}'', men m\u00E5lnamnrymden f\u00F6r schemadokumentet \u00E4r ''{1}''.
-        TargetNamespace.2 = TargetNamespace.2: F\u00F6rv\u00E4ntade inte n\u00E5gon namnrymd, men schemadokumentet har angetts med m\u00E5lnamnrymden ''{1}''.
+        c-fields-xpaths = c-fields-xpaths: Fältvärdet = ''{0}'' är ogiltigt.
+        c-general-xpath = c-general-xpath: Uttrycket ''{0}'' är ogiltigt med den XPath-delmängd som stöds i XML-schema.
+        c-general-xpath-ns = c-general-xpath-ns: Ett namnrymdsprefix i XPath-uttrycket ''{0}'' var inte bundet till någon namnrymd.
+        c-selector-xpath = c-selector-xpath: Väljarvärdet ''{0}'' är ogiltigt; xpath för väljare får inte innehålla attribut.
+        EmptyTargetNamespace = EmptyTargetNamespace: I schemadokumentet ''{0}'' får värdet för attributet ''targetNamespace'' inte vara en tom sträng.
+        FacetValueFromBase = FacetValueFromBase: I deklarationen av typ ''{0}'' måste värdet ''{1}'' för aspekt ''{2}'' komma från värdeutrymmet i bastypen ''{3}''.
+        FixedFacetValue = FixedFacetValue: I definitionen för {3} är värdet ''{1}'' för aspekten ''{0}'' ogiltigt eftersom värdet för ''{0}'' har angetts som ''{2}'' i någon av typerna för överordnade samtidigt som '{'fast'}' = true.
+        InvalidRegex = InvalidRegex: Mönstervärdet ''{0}'' är inte något giltigt reguljärt uttryck. Det rapporterade felet är: ''{1}'' i kolumn ''{2}''.
+        MaxOccurLimit = Den aktuella konfigurationen för parsern tillåter inte att attributvärdet för Occurs anges som större än värdet {0}.
+        PublicSystemOnNotation = PublicSystemOnNotation: Åtminstone ett av ''public'' och ''system'' måste anges i elementets ''notation''.
+        SchemaLocation = SchemaLocation: schemaLocation-värdet ''{0}'' måste anges med ett jämnt antal URI:er.
+        TargetNamespace.1 = TargetNamespace.1: Förväntade namnrymden ''{0}'', men målnamnrymden för schemadokumentet är ''{1}''.
+        TargetNamespace.2 = TargetNamespace.2: Förväntade inte någon namnrymd, men schemadokumentet har angetts med målnamnrymden ''{1}''.
         UndeclaredEntity = UndeclaredEntity: Enhet ''{0}'' har inte deklarerats.
         UndeclaredPrefix = UndeclaredPrefix: Kan inte matcha ''{0}'' som QName: prefixet ''{1}'' har inte deklarerats.
 
 
 # JAXP 1.2 schema source property errors
 
-        jaxp12-schema-source-type.1 = Egenskapen ''http://java.sun.com/xml/jaxp/properties/schemaSource'' kan inte ha ett v\u00E4rde av typen {0}''. M\u00F6jliga typer av v\u00E4rden som st\u00F6ds \u00E4r String, File, InputStream och InputSource, och en uppst\u00E4llning av de h\u00E4r typerna.
-        jaxp12-schema-source-type.2 = Egenskapen ''http://java.sun.com/xml/jaxp/properties/schemaSource'' kan inte ha ett uppst\u00E4llningsv\u00E4rde av typen {0}''. M\u00F6jliga typer av uppst\u00E4llningar som st\u00F6ds \u00E4r Object, String, File, InputStream och InputSource.
-        jaxp12-schema-source-ns = N\u00E4r du anv\u00E4nder en uppst\u00E4llning med objekt som v\u00E4rde f\u00F6r egenskapen 'http://java.sun.com/xml/jaxp/properties/schemaSource' \u00E4r det inte till\u00E5tet att ha tv\u00E5 scheman med samma m\u00E5lnamnrymd.
+        jaxp12-schema-source-type.1 = Egenskapen ''http://java.sun.com/xml/jaxp/properties/schemaSource'' kan inte ha ett värde av typen {0}''. Möjliga typer av värden som stöds är String, File, InputStream och InputSource, och en uppställning av de här typerna.
+        jaxp12-schema-source-type.2 = Egenskapen ''http://java.sun.com/xml/jaxp/properties/schemaSource'' kan inte ha ett uppställningsvärde av typen {0}''. Möjliga typer av uppställningar som stöds är Object, String, File, InputStream och InputSource.
+        jaxp12-schema-source-ns = När du använder en uppställning med objekt som värde för egenskapen 'http://java.sun.com/xml/jaxp/properties/schemaSource' är det inte tillåtet att ha två scheman med samma målnamnrymd.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
index 5146bfdf51e..f366acbb174 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
@@ -18,303 +18,303 @@
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
-        FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n
+        BadMessageKey = 找不到与消息关键字对应的错误消息。
+        FormatFailed = 设置以下消息的格式时出现内部错误:\n
 
 # For internal use
 
-        Internal-Error = \u5185\u90E8\u9519\u8BEF: {0}\u3002
-        dt-whitespace = \u7A7A\u767D\u9762\u503C\u4E0D\u53EF\u7528\u4E8E\u8054\u5408 simpleType ''{0}''
-        GrammarConflict = \u7528\u6237\u7684\u8BED\u6CD5\u6C60\u8FD4\u56DE\u7684\u8BED\u6CD5\u4E4B\u4E00\u4E0E\u53E6\u4E00\u4E2A\u8BED\u6CD5\u51B2\u7A81\u3002
+        Internal-Error = 内部错误: {0}。
+        dt-whitespace = 空白面值不可用于联合 simpleType ''{0}''
+        GrammarConflict = 用户的语法池返回的语法之一与另一个语法冲突。
 
 # Identity constraints
 
-        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: \u5143\u7D20 "{0}" \u4E0D\u5177\u6709\u5173\u952E\u5B57 "{1}" \u7684\u503C\u3002
-        DuplicateField = \u5B57\u6BB5 "{0}" \u5728\u4F5C\u7528\u57DF\u5185\u6709\u91CD\u590D\u5339\u914D\u3002
-        DuplicateKey = cvc-identity-constraint.4.2.2: \u4E3A\u5143\u7D20 "{1}" \u7684\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6 "{2}" \u58F0\u660E\u7684\u5173\u952E\u5B57\u503C [{0}] \u91CD\u590D\u3002
-        DuplicateUnique = cvc-identity-constraint.4.1: \u4E3A\u5143\u7D20 "{1}" \u7684\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6 "{2}" \u58F0\u660E\u7684\u552F\u4E00\u503C [{0}] \u91CD\u590D\u3002
-        FieldMultipleMatch = cvc-identity-constraint.3: \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6 "{1}" \u7684\u5B57\u6BB5 "{0}" \u4E0E\u5176\u9009\u62E9\u5668\u4F5C\u7528\u57DF\u5185\u7684\u591A\u4E2A\u503C\u5339\u914D; \u5B57\u6BB5\u5FC5\u987B\u4E0E\u552F\u4E00\u503C\u5339\u914D\u3002
-        FixedDiffersFromActual = \u6B64\u5143\u7D20\u7684\u5185\u5BB9\u4E0E\u65B9\u6848\u4E2D\u5143\u7D20\u58F0\u660E\u7684 "fixed" \u5C5E\u6027\u7684\u503C\u4E0D\u76F8\u540C\u3002
-        KeyMatchesNillable = cvc-identity-constraint.4.2.3: \u5143\u7D20 "{0}" \u5177\u6709\u7684\u5173\u952E\u5B57 "{1}" \u4E0E nillable \u8BBE\u7F6E\u4E3A\u201C\u771F\u201D\u7684\u5143\u7D20\u5339\u914D\u3002
-        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: \u5BF9\u4E8E\u4E3A\u5143\u7D20 "{0}" \u6307\u5B9A\u7684 <key name="{1}"> \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6, \u6CA1\u6709\u4E3A\u5B83\u6307\u5B9A\u8DB3\u591F\u7684\u503C\u3002
-        KeyNotFound = cvc-identity-constraint.4.3: \u6CA1\u6709\u4E3A\u5143\u7D20 ''{2}'' \u7684\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u627E\u5230\u503C\u4E3A ''{1}'' \u7684\u5173\u952E\u5B57 ''{0}''\u3002
-        KeyRefOutOfScope = \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u9519\u8BEF: \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6 "{0}" \u5177\u6709\u4E00\u4E2A\u5F15\u7528\u4E86\u4F5C\u7528\u57DF\u4E4B\u5916\u7684\u5173\u952E\u5B57\u6216\u552F\u4E00\u503C\u7684 keyref\u3002
-        KeyRefReferNotFound = \u5173\u952E\u5B57\u5F15\u7528\u58F0\u660E "{0}" \u5F15\u7528\u4E86\u540D\u4E3A "{1}" \u7684\u672A\u77E5\u5173\u952E\u5B57\u3002
-        UnknownField = \u5185\u90E8\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u9519\u8BEF; \u4E3A\u5143\u7D20 "{1}" \u6307\u5B9A\u7684\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6 "{2}" \u7684\u5B57\u6BB5 "{0}" \u672A\u77E5\u3002
+        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: 元素 "{0}" 不具有关键字 "{1}" 的值。
+        DuplicateField = 字段 "{0}" 在作用域内有重复匹配。
+        DuplicateKey = cvc-identity-constraint.4.2.2: 为元素 "{1}" 的身份约束条件 "{2}" 声明的关键字值 [{0}] 重复。
+        DuplicateUnique = cvc-identity-constraint.4.1: 为元素 "{1}" 的身份约束条件 "{2}" 声明的唯一值 [{0}] 重复。
+        FieldMultipleMatch = cvc-identity-constraint.3: 身份约束条件 "{1}" 的字段 "{0}" 与其选择器作用域内的多个值匹配; 字段必须与唯一值匹配。
+        FixedDiffersFromActual = 此元素的内容与方案中元素声明的 "fixed" 属性的值不相同。
+        KeyMatchesNillable = cvc-identity-constraint.4.2.3: 元素 "{0}" 具有的关键字 "{1}" 与 nillable 设置为“真”的元素匹配。
+        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: 对于为元素 "{0}" 指定的 <key name="{1}"> 身份约束条件, 没有为它指定足够的值。
+        KeyNotFound = cvc-identity-constraint.4.3: 没有为元素 ''{2}'' 的身份约束条件找到值为 ''{1}'' 的关键字 ''{0}''。
+        KeyRefOutOfScope = 身份约束条件错误: 身份约束条件 "{0}" 具有一个引用了作用域之外的关键字或唯一值的 keyref。
+        KeyRefReferNotFound = 关键字引用声明 "{0}" 引用了名为 "{1}" 的未知关键字。
+        UnknownField = 内部身份约束条件错误; 为元素 "{1}" 指定的身份约束条件 "{2}" 的字段 "{0}" 未知。
 
 # Ideally, we should only use the following error keys, not the ones under
 # "Identity constraints". And we should cover all of the following errors.
 
 #validation (3.X.4)
 
-        cvc-attribute.3 = cvc-attribute.3: \u5728\u5143\u7D20 ''{0}'' \u4E2D, \u5C5E\u6027 ''{1}'' \u7684\u503C ''{2}'' \u4E0E\u5176\u7C7B\u578B ''{3}'' \u4E0D\u5339\u914D\u3002
-        cvc-attribute.4 = cvc-attribute.4: \u5728\u5143\u7D20 ''{0}'' \u4E2D, \u5C5E\u6027 ''{1}'' \u7684\u503C ''{2}'' \u4E0E\u5176\u56FA\u5B9A\u7684 '{'value constraint'}' \u4E0D\u5339\u914D\u3002\u8BE5\u5C5E\u6027\u7684\u503C\u5FC5\u987B\u4E3A ''{3}''\u3002
-        cvc-complex-type.2.1 = cvc-complex-type.2.1: \u5143\u7D20 ''{0}'' \u5FC5\u987B\u4E0D\u542B\u5B57\u7B26\u6216\u5143\u7D20\u4FE1\u606F\u9879 [\u5B50\u7EA7], \u56E0\u4E3A\u8BE5\u7C7B\u578B\u7684\u5185\u5BB9\u7C7B\u578B\u4E3A\u7A7A\u3002
-        cvc-complex-type.2.2 = cvc-complex-type.2.2: \u5143\u7D20 ''{0}'' \u5FC5\u987B\u4E0D\u542B\u5143\u7D20 [\u5B50\u7EA7], \u5E76\u4E14\u5176\u503C\u5FC5\u987B\u6709\u6548\u3002
-        cvc-complex-type.2.3 = cvc-complex-type.2.3: \u5143\u7D20 ''{0}'' \u5FC5\u987B\u4E0D\u542B\u5B57\u7B26 [\u5B50\u7EA7], \u56E0\u4E3A\u8BE5\u7C7B\u578B\u7684\u5185\u5BB9\u7C7B\u578B\u4E3A\u201C\u4EC5\u5143\u7D20\u201D\u3002
-        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: \u53D1\u73B0\u4E86\u4EE5\u5143\u7D20 ''{0}'' \u5F00\u5934\u7684\u65E0\u6548\u5185\u5BB9\u3002\u5E94\u4EE5 ''{1}'' \u4E4B\u4E00\u5F00\u5934\u3002
-        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: \u5143\u7D20 ''{0}'' \u7684\u5185\u5BB9\u4E0D\u5B8C\u6574\u3002\u5E94\u4E3A ''{1}'' \u4E4B\u4E00\u3002
-        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: \u901A\u914D\u7B26\u7684\u5339\u914D\u5F88\u5168\u9762, \u4F46\u65E0\u6CD5\u627E\u5230\u5143\u7D20 ''{0}'' \u7684\u58F0\u660E\u3002
-        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: \u53D1\u73B0\u4E86\u4EE5\u5143\u7D20 ''{0}'' \u5F00\u5934\u7684\u65E0\u6548\u5185\u5BB9\u3002\u6B64\u5904\u4E0D\u5E94\u542B\u6709\u5B50\u5143\u7D20\u3002
-        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' \u5728\u5F53\u524D\u5E8F\u5217\u4E2D\u6700\u591A\u53EF\u4EE5\u51FA\u73B0 ''{2}'' \u6B21\u3002\u5DF2\u8D85\u8FC7\u6B64\u9650\u5236\u3002\u6B64\u5904\u9884\u671F\u4E3A ''{1}'' \u4E4B\u4E00\u3002
-        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' \u5728\u5F53\u524D\u5E8F\u5217\u4E2D\u6700\u591A\u53EF\u4EE5\u51FA\u73B0 ''{1}'' \u6B21\u3002\u5DF2\u8D85\u8FC7\u6B64\u9650\u5236\u3002\u6B64\u5904\u9884\u671F\u6CA1\u6709\u5B50\u5143\u7D20\u3002
-        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: \u53D1\u73B0\u4E86\u4EE5\u5143\u7D20 ''{0}'' \u5F00\u5934\u7684\u65E0\u6548\u5185\u5BB9\u3002''{1}'' \u9884\u671F\u5728\u5F53\u524D\u5E8F\u5217\u4E2D\u6700\u5C11\u51FA\u73B0 ''{2}'' \u6B21\u3002\u53E6\u5916\u4E00\u4E2A\u5B9E\u4F8B\u5FC5\u987B\u6EE1\u8DB3\u6B64\u7EA6\u675F\u6761\u4EF6\u3002
-        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: \u53D1\u73B0\u4E86\u4EE5\u5143\u7D20 ''{0}'' \u5F00\u5934\u7684\u65E0\u6548\u5185\u5BB9\u3002''{1}'' \u9884\u671F\u5728\u5F53\u524D\u5E8F\u5217\u4E2D\u6700\u5C11\u51FA\u73B0 ''{2}'' \u6B21\u3002\u53E6\u5916 ''{3}'' \u4E2A\u5B9E\u4F8B\u5FC5\u987B\u6EE1\u8DB3\u6B64\u7EA6\u675F\u6761\u4EF6\u3002
-        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: \u5143\u7D20 ''{0}'' \u7684\u5185\u5BB9\u4E0D\u5B8C\u6574\u3002''{1}'' \u9884\u671F\u6700\u5C11\u51FA\u73B0 ''{2}'' \u6B21\u3002\u53E6\u5916\u4E00\u4E2A\u5B9E\u4F8B\u5FC5\u987B\u6EE1\u8DB3\u6B64\u7EA6\u675F\u6761\u4EF6\u3002
-        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: \u5143\u7D20 ''{0}'' \u7684\u5185\u5BB9\u4E0D\u5B8C\u6574\u3002''{1}'' \u9884\u671F\u6700\u5C11\u51FA\u73B0 ''{2}'' \u6B21\u3002\u53E6\u5916 ''{3}'' \u4E2A\u5B9E\u4F8B\u5FC5\u987B\u6EE1\u8DB3\u6B64\u7EA6\u675F\u6761\u4EF6\u3002
-        cvc-complex-type.3.1 = cvc-complex-type.3.1: \u5728\u5143\u7D20 ''{0}'' \u4E2D, \u5C5E\u6027 ''{1}'' \u7684\u503C ''{2}'' \u4E0E\u76F8\u5E94\u7684\u5C5E\u6027\u7528\u6CD5\u4E0D\u5339\u914D\u3002\u5C5E\u6027 ''{1}'' \u5177\u6709\u56FA\u5B9A\u503C ''{3}''\u3002
-        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: \u5143\u7D20 ''{0}'' \u6CA1\u6709\u5C5E\u6027 ''{1}'' \u7684\u5C5E\u6027\u901A\u914D\u7B26\u3002
-        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: \u5143\u7D20 ''{0}'' \u4E2D\u4E0D\u5141\u8BB8\u51FA\u73B0\u5C5E\u6027 ''{1}''\u3002
-        cvc-complex-type.4 = cvc-complex-type.4: \u5143\u7D20 ''{0}'' \u4E2D\u5FC5\u987B\u5305\u542B\u5C5E\u6027 ''{1}''\u3002
-        cvc-complex-type.4_ns = cvc-complex-type.4\uFF1A\u5143\u7D20 ''{0}'' \u4E2D\u5FC5\u987B\u5305\u542B\u5C5E\u4E8E\u540D\u79F0\u7A7A\u95F4 ''{2}'' \u7684\u5C5E\u6027 ''{1}''\u3002
-        cvc-complex-type.5.1 = cvc-complex-type.5.1: \u5728\u5143\u7D20 ''{0}'' \u4E2D, \u5C5E\u6027 ''{1}'' \u662F\u4E00\u4E2A\u901A\u7528 ID\u3002\u4F46\u5DF2\u5B58\u5728\u901A\u7528 ID ''{2}''\u3002\u53EA\u80FD\u6709\u4E00\u4E2A\u901A\u7528 ID\u3002
-        cvc-complex-type.5.2 = cvc-complex-type.5.2: \u5728\u5143\u7D20 ''{0}'' \u4E2D, \u5C5E\u6027 ''{1}'' \u662F\u4E00\u4E2A\u901A\u7528 ID\u3002\u4F46\u5DF2\u6709\u4E00\u4E2A\u5C5E\u6027 ''{2}'' \u662F\u4ECE '{'attribute uses'}' \u4E2D\u7684 ID \u6D3E\u751F\u7684\u3002
-        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' \u4E0D\u662F ''{1}'' \u7684\u6709\u6548\u503C\u3002
-        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' \u4E0D\u662F\u5217\u8868\u7C7B\u578B ''{1}'' \u7684\u6709\u6548\u503C\u3002
-        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' \u4E0D\u662F\u8054\u5408\u7C7B\u578B ''{1}'' \u7684\u6709\u6548\u503C\u3002
-        cvc-elt.1.a = cvc-elt.1.a: \u627E\u4E0D\u5230\u5143\u7D20 ''{0}'' \u7684\u58F0\u660E\u3002
-        cvc-elt.1.b = cvc-elt.1.b: \u5143\u7D20\u7684\u540D\u79F0\u4E0E\u5143\u7D20\u58F0\u660E\u7684\u540D\u79F0\u4E0D\u5339\u914D\u3002\u5B9E\u9645\u4E3A ''{0}''\u3002\u9884\u671F\u4E3A ''{1}''\u3002
-        cvc-elt.2 = cvc-elt.2: ''{0}'' \u7684\u5143\u7D20\u58F0\u660E\u4E2D '{'abstract'}' \u7684\u503C\u5FC5\u987B\u4E3A\u201C\u5047\u201D\u3002
-        cvc-elt.3.1 = cvc-elt.3.1: \u5143\u7D20 ''{0}'' \u4E2D\u4E0D\u80FD\u5305\u542B\u5C5E\u6027 ''{1}'', \u56E0\u4E3A ''{0}'' \u7684 '{'nillable'}' \u5C5E\u6027\u4E3A\u201C\u5047\u201D\u3002
-        cvc-elt.3.2.1 = cvc-elt.3.2.1: \u5143\u7D20 ''{0}'' \u5FC5\u987B\u4E0D\u542B\u5B57\u7B26\u6216\u5143\u7D20\u4FE1\u606F [\u5B50\u7EA7], \u56E0\u4E3A\u5DF2\u6307\u5B9A ''{1}''\u3002
-        cvc-elt.3.2.2 = cvc-elt.3.2.2: \u5143\u7D20 ''{0}'' \u4E0D\u80FD\u5305\u542B\u56FA\u5B9A\u7684 '{'value constraint'}', \u56E0\u4E3A\u5DF2\u6307\u5B9A ''{1}''\u3002
-        cvc-elt.4.1 = cvc-elt.4.1: \u5143\u7D20 ''{0}'' \u7684\u5C5E\u6027 ''{1}'' \u7684\u503C ''{2}'' \u4E0D\u662F\u6709\u6548\u7684\u9650\u5B9A\u540D\u3002
-        cvc-elt.4.2 = cvc-elt.4.2: \u65E0\u6CD5\u5C06 ''{1}'' \u89E3\u6790\u4E3A\u5143\u7D20 ''{0}'' \u7684\u7C7B\u578B\u5B9A\u4E49\u3002
-        cvc-elt.4.3 = cvc-elt.4.3: \u7C7B\u578B ''{1}'' \u4E0D\u662F\u4ECE\u5143\u7D20 ''{0}'' \u7684\u7C7B\u578B\u5B9A\u4E49 ''{2}'' \u6709\u6548\u6D3E\u751F\u7684\u3002
-        cvc-elt.5.1.1 = cvc-elt.5.1.1: \u5143\u7D20 ''{0}'' \u7684 '{'value constraint'}' ''{2}'' \u4E0D\u662F\u7C7B\u578B ''{1}'' \u7684\u6709\u6548\u9ED8\u8BA4\u503C\u3002
-        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: \u5143\u7D20 ''{0}'' \u5FC5\u987B\u4E0D\u542B\u5143\u7D20\u4FE1\u606F\u9879 [\u5B50\u7EA7]\u3002
-        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u4E0E\u56FA\u5B9A\u7684 '{'value constraint'}' \u503C ''{2}'' \u4E0D\u5339\u914D\u3002
-        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u4E0E '{'value constraint'}' \u503C ''{2}'' \u4E0D\u5339\u914D\u3002
-        cvc-enumeration-valid = cvc-enumeration-valid: \u5BF9\u4E8E\u679A\u4E3E ''{1}'', \u503C ''{0}'' \u4E0D\u5177\u6709\u9762\u6709\u6548\u6027\u3002\u5B83\u5FC5\u987B\u662F\u6765\u81EA\u679A\u4E3E\u7684\u503C\u3002
-        cvc-fractionDigits-valid = cvc-fractionDigits-valid: \u503C ''{0}'' \u5177\u6709 {1} \u4F4D\u5C0F\u6570, \u4F46\u5C0F\u6570\u4F4D\u6570\u5DF2\u9650\u5236\u4E3A {2}\u3002
-        cvc-id.1 = cvc-id.1: IDREF ''{0}'' \u6CA1\u6709 ID/IDREF \u7ED1\u5B9A\u3002
-        cvc-id.2 = cvc-id.2: ID \u503C ''{0}'' \u51FA\u73B0\u4E86\u591A\u6B21\u3002
-        cvc-id.3 = cvc-id.3: \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6 ''{0}'' \u7684\u5B57\u6BB5\u4E0E\u5143\u7D20 ''{1}'' \u5339\u914D, \u4F46\u6B64\u5143\u7D20\u6CA1\u6709\u7B80\u5355\u7C7B\u578B\u3002
-        cvc-length-valid = cvc-length-valid: \u5BF9\u4E8E\u7C7B\u578B\u4E3A ''{3}'' \u7684 length ''{2}'', length = ''{1}'' \u7684\u503C ''{0}'' \u4E0D\u5177\u6709\u9762\u6709\u6548\u6027\u3002
-        cvc-maxExclusive-valid = cvc-maxExclusive-valid: \u5BF9\u4E8E\u7C7B\u578B\u4E3A ''{2}'' \u7684 maxExclusive ''{1}'', \u503C ''{0}'' \u4E0D\u5177\u6709\u9762\u6709\u6548\u6027\u3002
-        cvc-maxInclusive-valid = cvc-maxInclusive-valid: \u5BF9\u4E8E\u7C7B\u578B\u4E3A ''{2}'' \u7684 maxInclusive ''{1}'', \u503C ''{0}'' \u4E0D\u5177\u6709\u9762\u6709\u6548\u6027\u3002
-        cvc-maxLength-valid = cvc-maxLength-valid: \u5BF9\u4E8E\u7C7B\u578B\u4E3A ''{3}'' \u7684 maxLength ''{2}'', length = ''{1}'' \u7684\u503C ''{0}'' \u4E0D\u5177\u6709\u9762\u6709\u6548\u6027\u3002
-        cvc-minExclusive-valid = cvc-minExclusive-valid: \u5BF9\u4E8E\u7C7B\u578B\u4E3A ''{2}'' \u7684 minExclusive ''{1}'', \u503C ''{0}'' \u4E0D\u5177\u6709\u9762\u6709\u6548\u6027\u3002
-        cvc-minInclusive-valid = cvc-minInclusive-valid: \u5BF9\u4E8E\u7C7B\u578B\u4E3A ''{2}'' \u7684 minInclusive ''{1}'', \u503C ''{0}'' \u4E0D\u5177\u6709\u9762\u6709\u6548\u6027\u3002
-        cvc-minLength-valid = cvc-minLength-valid: \u5BF9\u4E8E\u7C7B\u578B\u4E3A ''{3}'' \u7684 minLength ''{2}'', length = ''{1}'' \u7684\u503C ''{0}'' \u4E0D\u5177\u6709\u9762\u6709\u6548\u6027\u3002
-        cvc-pattern-valid = cvc-pattern-valid: \u5BF9\u4E8E\u7C7B\u578B\u4E3A ''{2}'' \u7684\u6A21\u5F0F ''{1}'', \u503C ''{0}'' \u4E0D\u5177\u6709\u9762\u6709\u6548\u6027\u3002
-        cvc-totalDigits-valid = cvc-totalDigits-valid: \u503C ''{0}'' \u603B\u5171\u6709 {1} \u4F4D, \u4F46\u603B\u4F4D\u6570\u5DF2\u9650\u5236\u4E3A {2}\u3002
-        cvc-type.1 = cvc-type.1: \u627E\u4E0D\u5230\u7C7B\u578B\u5B9A\u4E49 ''{0}''\u3002
-        cvc-type.2 = cvc-type.2: \u65E0\u6CD5\u4E3A\u5143\u7D20 {0} \u63D0\u53D6\u7C7B\u578B\u5B9A\u4E49\u3002
-        cvc-type.3.1.1 = cvc-type.3.1.1: \u5143\u7D20 ''{0}'' \u662F\u7B80\u5355\u7C7B\u578B, \u56E0\u6B64\u5FC5\u987B\u4E0D\u542B\u5C5E\u6027 (\u9664\u4E86\u90A3\u4E9B\u540D\u79F0\u7A7A\u95F4\u540D\u4E0E ''http://www.w3.org/2001/XMLSchema-instance'' \u76F8\u540C\u4E14 [\u672C\u5730\u540D\u79F0] \u4E3A ''type'', ''nil'', ''schemaLocation'' \u6216 ''noNamespaceSchemaLocation'' \u7684\u5143\u7D20)\u3002\u4F46\u662F\u53D1\u73B0\u4E86\u5C5E\u6027 ''{1}''\u3002
-        cvc-type.3.1.2 = cvc-type.3.1.2: \u5143\u7D20 ''{0}'' \u662F\u7B80\u5355\u7C7B\u578B, \u56E0\u6B64\u5B83\u5FC5\u987B\u4E0D\u542B\u5143\u7D20\u4FE1\u606F\u9879 [\u5B50\u7EA7]\u3002
-        cvc-type.3.1.3 = cvc-type.3.1.3: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u65E0\u6548\u3002
+        cvc-attribute.3 = cvc-attribute.3: 在元素 ''{0}'' 中, 属性 ''{1}'' 的值 ''{2}'' 与其类型 ''{3}'' 不匹配。
+        cvc-attribute.4 = cvc-attribute.4: 在元素 ''{0}'' 中, 属性 ''{1}'' 的值 ''{2}'' 与其固定的 '{'value constraint'}' 不匹配。该属性的值必须为 ''{3}''。
+        cvc-complex-type.2.1 = cvc-complex-type.2.1: 元素 ''{0}'' 必须不含字符或元素信息项 [子级], 因为该类型的内容类型为空。
+        cvc-complex-type.2.2 = cvc-complex-type.2.2: 元素 ''{0}'' 必须不含元素 [子级], 并且其值必须有效。
+        cvc-complex-type.2.3 = cvc-complex-type.2.3: 元素 ''{0}'' 必须不含字符 [子级], 因为该类型的内容类型为“仅元素”。
+        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: 发现了以元素 ''{0}'' 开头的无效内容。应以 ''{1}'' 之一开头。
+        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: 元素 ''{0}'' 的内容不完整。应为 ''{1}'' 之一。
+        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: 通配符的匹配很全面, 但无法找到元素 ''{0}'' 的声明。
+        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: 发现了以元素 ''{0}'' 开头的无效内容。此处不应含有子元素。
+        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' 在当前序列中最多可以出现 ''{2}'' 次。已超过此限制。此处预期为 ''{1}'' 之一。
+        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' 在当前序列中最多可以出现 ''{1}'' 次。已超过此限制。此处预期没有子元素。
+        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: 发现了以元素 ''{0}'' 开头的无效内容。''{1}'' 预期在当前序列中最少出现 ''{2}'' 次。另外一个实例必须满足此约束条件。
+        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: 发现了以元素 ''{0}'' 开头的无效内容。''{1}'' 预期在当前序列中最少出现 ''{2}'' 次。另外 ''{3}'' 个实例必须满足此约束条件。
+        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: 元素 ''{0}'' 的内容不完整。''{1}'' 预期最少出现 ''{2}'' 次。另外一个实例必须满足此约束条件。
+        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: 元素 ''{0}'' 的内容不完整。''{1}'' 预期最少出现 ''{2}'' 次。另外 ''{3}'' 个实例必须满足此约束条件。
+        cvc-complex-type.3.1 = cvc-complex-type.3.1: 在元素 ''{0}'' 中, 属性 ''{1}'' 的值 ''{2}'' 与相应的属性用法不匹配。属性 ''{1}'' 具有固定值 ''{3}''。
+        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: 元素 ''{0}'' 没有属性 ''{1}'' 的属性通配符。
+        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: 元素 ''{0}'' 中不允许出现属性 ''{1}''。
+        cvc-complex-type.4 = cvc-complex-type.4: 元素 ''{0}'' 中必须包含属性 ''{1}''。
+        cvc-complex-type.4_ns = cvc-complex-type.4：元素 ''{0}'' 中必须包含属于名称空间 ''{2}'' 的属性 ''{1}''。
+        cvc-complex-type.5.1 = cvc-complex-type.5.1: 在元素 ''{0}'' 中, 属性 ''{1}'' 是一个通用 ID。但已存在通用 ID ''{2}''。只能有一个通用 ID。
+        cvc-complex-type.5.2 = cvc-complex-type.5.2: 在元素 ''{0}'' 中, 属性 ''{1}'' 是一个通用 ID。但已有一个属性 ''{2}'' 是从 '{'attribute uses'}' 中的 ID 派生的。
+        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' 不是 ''{1}'' 的有效值。
+        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' 不是列表类型 ''{1}'' 的有效值。
+        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' 不是联合类型 ''{1}'' 的有效值。
+        cvc-elt.1.a = cvc-elt.1.a: 找不到元素 ''{0}'' 的声明。
+        cvc-elt.1.b = cvc-elt.1.b: 元素的名称与元素声明的名称不匹配。实际为 ''{0}''。预期为 ''{1}''。
+        cvc-elt.2 = cvc-elt.2: ''{0}'' 的元素声明中 '{'abstract'}' 的值必须为“假”。
+        cvc-elt.3.1 = cvc-elt.3.1: 元素 ''{0}'' 中不能包含属性 ''{1}'', 因为 ''{0}'' 的 '{'nillable'}' 属性为“假”。
+        cvc-elt.3.2.1 = cvc-elt.3.2.1: 元素 ''{0}'' 必须不含字符或元素信息 [子级], 因为已指定 ''{1}''。
+        cvc-elt.3.2.2 = cvc-elt.3.2.2: 元素 ''{0}'' 不能包含固定的 '{'value constraint'}', 因为已指定 ''{1}''。
+        cvc-elt.4.1 = cvc-elt.4.1: 元素 ''{0}'' 的属性 ''{1}'' 的值 ''{2}'' 不是有效的限定名。
+        cvc-elt.4.2 = cvc-elt.4.2: 无法将 ''{1}'' 解析为元素 ''{0}'' 的类型定义。
+        cvc-elt.4.3 = cvc-elt.4.3: 类型 ''{1}'' 不是从元素 ''{0}'' 的类型定义 ''{2}'' 有效派生的。
+        cvc-elt.5.1.1 = cvc-elt.5.1.1: 元素 ''{0}'' 的 '{'value constraint'}' ''{2}'' 不是类型 ''{1}'' 的有效默认值。
+        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: 元素 ''{0}'' 必须不含元素信息项 [子级]。
+        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: 元素 ''{0}'' 的值 ''{1}'' 与固定的 '{'value constraint'}' 值 ''{2}'' 不匹配。
+        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: 元素 ''{0}'' 的值 ''{1}'' 与 '{'value constraint'}' 值 ''{2}'' 不匹配。
+        cvc-enumeration-valid = cvc-enumeration-valid: 对于枚举 ''{1}'', 值 ''{0}'' 不具有面有效性。它必须是来自枚举的值。
+        cvc-fractionDigits-valid = cvc-fractionDigits-valid: 值 ''{0}'' 具有 {1} 位小数, 但小数位数已限制为 {2}。
+        cvc-id.1 = cvc-id.1: IDREF ''{0}'' 没有 ID/IDREF 绑定。
+        cvc-id.2 = cvc-id.2: ID 值 ''{0}'' 出现了多次。
+        cvc-id.3 = cvc-id.3: 身份约束条件 ''{0}'' 的字段与元素 ''{1}'' 匹配, 但此元素没有简单类型。
+        cvc-length-valid = cvc-length-valid: 对于类型为 ''{3}'' 的 length ''{2}'', length = ''{1}'' 的值 ''{0}'' 不具有面有效性。
+        cvc-maxExclusive-valid = cvc-maxExclusive-valid: 对于类型为 ''{2}'' 的 maxExclusive ''{1}'', 值 ''{0}'' 不具有面有效性。
+        cvc-maxInclusive-valid = cvc-maxInclusive-valid: 对于类型为 ''{2}'' 的 maxInclusive ''{1}'', 值 ''{0}'' 不具有面有效性。
+        cvc-maxLength-valid = cvc-maxLength-valid: 对于类型为 ''{3}'' 的 maxLength ''{2}'', length = ''{1}'' 的值 ''{0}'' 不具有面有效性。
+        cvc-minExclusive-valid = cvc-minExclusive-valid: 对于类型为 ''{2}'' 的 minExclusive ''{1}'', 值 ''{0}'' 不具有面有效性。
+        cvc-minInclusive-valid = cvc-minInclusive-valid: 对于类型为 ''{2}'' 的 minInclusive ''{1}'', 值 ''{0}'' 不具有面有效性。
+        cvc-minLength-valid = cvc-minLength-valid: 对于类型为 ''{3}'' 的 minLength ''{2}'', length = ''{1}'' 的值 ''{0}'' 不具有面有效性。
+        cvc-pattern-valid = cvc-pattern-valid: 对于类型为 ''{2}'' 的模式 ''{1}'', 值 ''{0}'' 不具有面有效性。
+        cvc-totalDigits-valid = cvc-totalDigits-valid: 值 ''{0}'' 总共有 {1} 位, 但总位数已限制为 {2}。
+        cvc-type.1 = cvc-type.1: 找不到类型定义 ''{0}''。
+        cvc-type.2 = cvc-type.2: 无法为元素 {0} 提取类型定义。
+        cvc-type.3.1.1 = cvc-type.3.1.1: 元素 ''{0}'' 是简单类型, 因此必须不含属性 (除了那些名称空间名与 ''http://www.w3.org/2001/XMLSchema-instance'' 相同且 [本地名称] 为 ''type'', ''nil'', ''schemaLocation'' 或 ''noNamespaceSchemaLocation'' 的元素)。但是发现了属性 ''{1}''。
+        cvc-type.3.1.2 = cvc-type.3.1.2: 元素 ''{0}'' 是简单类型, 因此它必须不含元素信息项 [子级]。
+        cvc-type.3.1.3 = cvc-type.3.1.3: 元素 ''{0}'' 的值 ''{1}'' 无效。
 
 #schema valid (3.X.3)
 
-        schema_reference.access = schema_reference: \u7531\u4E8E accessExternalSchema \u5C5E\u6027\u8BBE\u7F6E\u7684\u9650\u5236\u800C\u4E0D\u5141\u8BB8 ''{1}'' \u8BBF\u95EE, \u56E0\u6B64\u65E0\u6CD5\u8BFB\u53D6\u65B9\u6848\u6587\u6863 ''{0}''\u3002
-        schema_reference.4 = schema_reference.4: \u65E0\u6CD5\u8BFB\u53D6\u65B9\u6848\u6587\u6863 ''{0}'', \u539F\u56E0\u4E3A 1) \u65E0\u6CD5\u627E\u5230\u6587\u6863; 2) \u65E0\u6CD5\u8BFB\u53D6\u6587\u6863; 3) \u6587\u6863\u7684\u6839\u5143\u7D20\u4E0D\u662F <xsd:schema>\u3002
-        src-annotation = src-annotation: <annotation> \u5143\u7D20\u53EA\u80FD\u5305\u542B <appinfo> \u548C <documentation> \u5143\u7D20, \u4F46\u53D1\u73B0\u4E86 ''{0}''\u3002
-        src-attribute.1 = src-attribute.1: \u5C5E\u6027\u58F0\u660E ''{0}'' \u4E2D\u4E0D\u80FD\u540C\u65F6\u5B58\u5728\u7279\u6027 ''default'' \u548C ''fixed''\u3002\u5E94\u53EA\u4F7F\u7528\u5176\u4E2D\u4E00\u4E2A\u3002
-        src-attribute.2 = src-attribute.2: \u5C5E\u6027 ''{0}'' \u4E2D\u5B58\u5728\u7279\u6027 ''default'', \u56E0\u6B64 ''use'' \u7684\u503C\u5FC5\u987B\u4E3A ''optional''\u3002
-        src-attribute.3.1 = src-attribute.3.1: \u672C\u5730\u5C5E\u6027\u58F0\u660E\u4E2D\u5FC5\u987B\u5B58\u5728 'ref' \u6216 'name' \u4E4B\u4E00\u3002
-        src-attribute.3.2 = src-attribute.3.2: \u5C5E\u6027\u5F15\u7528 ''{0}'' \u4E2D\u7684\u5185\u5BB9\u5FC5\u987B\u5339\u914D (\u6279\u6CE8?)\u3002
-        src-attribute.4 = src-attribute.4: \u5C5E\u6027 ''{0}'' \u540C\u65F6\u5177\u6709 ''type'' \u5C5E\u6027\u548C\u533F\u540D ''simpleType'' \u5B50\u7EA7\u3002\u4E00\u4E2A\u5C5E\u6027\u53EA\u80FD\u5177\u6709\u8FD9\u4E24\u8005\u4E4B\u4E00\u3002
-        src-attribute_group.2 = src-attribute_group.2: \u65E0\u6CD5\u8868\u8FBE\u5C5E\u6027\u7EC4 ''{0}'' \u7684\u901A\u914D\u7B26\u4EA4\u96C6\u3002
-        src-attribute_group.3 = src-attribute_group.3: \u5728\u5C5E\u6027\u7EC4 ''{0}'' \u4E2D\u68C0\u6D4B\u5230\u5FAA\u73AF\u5B9A\u4E49\u3002\u9012\u5F52\u8DDF\u968F\u5C5E\u6027\u7EC4\u5F15\u7528\u6700\u7EC8\u5C06\u5F15\u5BFC\u56DE\u81EA\u8EAB\u3002
-        src-ct.1 = src-ct.1: \u7C7B\u578B ''{0}'' \u7684\u590D\u6742\u7C7B\u578B\u5B9A\u4E49\u7684\u8868\u8FBE\u5F62\u5F0F\u9519\u8BEF\u3002\u4F7F\u7528 <complexContent> \u65F6, \u57FA\u7C7B\u578B\u5FC5\u987B\u4E3A complexType\u3002''{1}'' \u662F simpleType\u3002
-        src-ct.2.1 = src-ct.2.1: \u7C7B\u578B ''{0}'' \u7684\u590D\u6742\u7C7B\u578B\u5B9A\u4E49\u7684\u8868\u8FBE\u5F62\u5F0F\u9519\u8BEF\u3002\u4F7F\u7528 <simpleContent> \u65F6, \u57FA\u7C7B\u578B\u5FC5\u987B\u4E3A complexType, \u5176\u5185\u5BB9\u7C7B\u578B\u4E3A\u201C\u7B80\u5355\u201D, \u6216\u8005\u4E3A\u5177\u6709\u201C\u6DF7\u5408\u201D\u5185\u5BB9\u548C\u53EF\u7A7A\u7C92\u5B50\u7684\u590D\u6742\u7C7B\u578B (\u4EC5\u5F53\u6307\u5B9A\u4E86\u9650\u5236\u65F6), \u6216\u8005\u4E3A\u7B80\u5355\u7C7B\u578B (\u4EC5\u5F53\u6307\u5B9A\u4E86\u6269\u5C55\u65F6)\u3002''{1}'' \u4E0D\u6EE1\u8DB3\u6240\u6709\u8FD9\u4E9B\u6761\u4EF6\u3002
-        src-ct.2.2 = src-ct.2.2: \u7C7B\u578B ''{0}'' \u7684\u590D\u6742\u7C7B\u578B\u5B9A\u4E49\u7684\u8868\u8FBE\u5F62\u5F0F\u9519\u8BEF\u3002\u5982\u679C\u5177\u6709 simpleContent \u7684 complexType \u9650\u5236\u5177\u6709\u201C\u6DF7\u5408\u201D\u5185\u5BB9\u548C\u53EF\u7A7A\u7C92\u5B50\u7684 complexType, \u90A3\u4E48 <restriction> \u7684\u5B50\u7EA7\u4E2D\u5FC5\u987B\u5B58\u5728 <simpleType>\u3002
-        src-ct.4 = src-ct.4: \u7C7B\u578B ''{0}'' \u7684\u590D\u6742\u7C7B\u578B\u5B9A\u4E49\u7684\u8868\u8FBE\u5F62\u5F0F\u9519\u8BEF\u3002\u65E0\u6CD5\u8868\u8FBE\u901A\u914D\u7B26\u7684\u4EA4\u96C6\u3002
-        src-ct.5 = src-ct.5: \u7C7B\u578B ''{0}'' \u7684\u590D\u6742\u7C7B\u578B\u5B9A\u4E49\u7684\u8868\u8FBE\u5F62\u5F0F\u9519\u8BEF\u3002\u65E0\u6CD5\u8868\u8FBE\u901A\u914D\u7B26\u7684\u5E76\u96C6\u3002
-        src-element.1 = src-element.1: \u5143\u7D20\u58F0\u660E ''{0}'' \u4E2D\u4E0D\u80FD\u540C\u65F6\u5B58\u5728\u5C5E\u6027 ''default'' \u548C ''fixed''\u3002\u5E94\u53EA\u4F7F\u7528\u5176\u4E2D\u4E00\u4E2A\u3002
-        src-element.2.1 = src-element.2.1: \u672C\u5730\u5143\u7D20\u58F0\u660E\u4E2D\u5FC5\u987B\u5B58\u5728 'ref' \u6216 'name'\u3002
-        src-element.2.2 = src-element.2.2: \u7531\u4E8E ''{0}'' \u5305\u542B ''ref'' \u5C5E\u6027, \u5176\u5185\u5BB9\u5FC5\u987B\u5339\u914D (\u6279\u6CE8?)\u3002\u4F46\u662F, \u53D1\u73B0\u4E86 ''{1}''\u3002
-        src-element.3 = src-element.3: \u5143\u7D20 ''{0}'' \u540C\u65F6\u5177\u6709 ''type'' \u5C5E\u6027\u548C ''anonymous type'' \u5B50\u7EA7\u3002\u5143\u7D20\u4E2D\u53EA\u5141\u8BB8\u5177\u6709\u5176\u4E2D\u4E00\u9879\u3002
-        src-import.1.1 = src-import.1.1: <import> \u5143\u7D20\u4FE1\u606F\u9879\u7684\u540D\u79F0\u7A7A\u95F4\u5C5E\u6027 ''{0}'' \u4E0D\u80FD\u4E0E\u65B9\u6848\u4E2D\u5176\u62E5\u6709\u7684 targetNamespace \u76F8\u540C\u3002
-        src-import.1.2 = src-import.1.2: \u5982\u679C <import> \u5143\u7D20\u4FE1\u606F\u9879\u4E2D\u4E0D\u5B58\u5728\u540D\u79F0\u7A7A\u95F4\u5C5E\u6027, \u5219\u5C01\u95ED\u65B9\u6848\u4E2D\u5FC5\u987B\u5177\u6709 targetNamespace\u3002
-        src-import.2 = src-import.2: \u6587\u6863 ''{0}'' \u7684\u6839\u5143\u7D20\u5FC5\u987B\u5177\u6709\u540D\u79F0\u7A7A\u95F4\u540D ''http://www.w3.org/2001/XMLSchema'' \u548C\u672C\u5730\u540D\u79F0 ''schema''\u3002
-        src-import.3.1 = src-import.3.1: <import> \u5143\u7D20\u4FE1\u606F\u9879\u7684\u540D\u79F0\u7A7A\u95F4\u5C5E\u6027 ''{0}'' \u5FC5\u987B\u4E0E\u5BFC\u5165\u6587\u6863\u7684 targetNamespace \u5C5E\u6027 ''{1}'' \u76F8\u540C\u3002
-        src-import.3.2 = src-import.3.2: \u53D1\u73B0\u4E86\u6CA1\u6709\u540D\u79F0\u7A7A\u95F4\u5C5E\u6027\u7684 <import> \u5143\u7D20\u4FE1\u606F\u9879, \u56E0\u6B64\u5BFC\u5165\u6587\u6863\u5FC5\u987B\u4E0D\u542B targetNamespace \u5C5E\u6027\u3002\u4F46\u662F, \u5728\u5BFC\u5165\u6587\u6863\u4E2D\u53D1\u73B0\u4E86 targetNamespace ''{1}''\u3002
-        src-include.1 = src-include.1: \u6587\u6863 ''{0}'' \u7684\u6839\u5143\u7D20\u5FC5\u987B\u5177\u6709\u540D\u79F0\u7A7A\u95F4\u540D ''http://www.w3.org/2001/XMLSchema'' \u548C\u672C\u5730\u540D\u79F0 ''schema''\u3002
-        src-include.2.1 = src-include.2.1: \u5F15\u7528\u7684\u65B9\u6848 (\u5F53\u524D\u4E3A ''{1}'') \u7684 targetNamespace \u5FC5\u987B\u4E0E\u5305\u542B\u7684\u65B9\u6848 (\u5F53\u524D\u4E3A ''{0}'') \u7684 targetNamespace \u76F8\u540C\u3002
-        src-redefine.2 = src-redefine.2: \u6587\u6863 ''{0}'' \u7684\u6839\u5143\u7D20\u5FC5\u987B\u5177\u6709\u540D\u79F0\u7A7A\u95F4\u540D ''http://www.w3.org/2001/XMLSchema'' \u548C\u672C\u5730\u540D\u79F0 ''schema''\u3002
-        src-redefine.3.1 = src-redefine.3.1: \u5F15\u7528\u7684\u65B9\u6848 (\u5F53\u524D\u4E3A ''{1}'') \u7684 targetNamespace \u5FC5\u987B\u4E0E\u91CD\u65B0\u5B9A\u4E49\u7684\u65B9\u6848 (\u5F53\u524D\u4E3A ''{0}'') \u7684 targetNamespace \u76F8\u540C\u3002
-        src-redefine.5.a.a = src-redefine.5.a.a: \u627E\u4E0D\u5230 <simpleType> \u7684\u975E\u6279\u6CE8\u5B50\u7EA7\u3002<redefine> \u5143\u7D20\u7684 <simpleType> \u5B50\u7EA7\u5FC5\u987B\u5177\u6709 <restriction> \u5B50\u9879, \u5E76\u5E26\u6709\u5F15\u7528\u5176\u81EA\u8EAB\u7684 'base' \u5C5E\u6027\u3002
-        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' \u4E0D\u662F\u6709\u6548\u7684\u5B50\u5143\u7D20\u3002<redefine> \u5143\u7D20\u7684 <simpleType> \u5B50\u7EA7\u5FC5\u987B\u5177\u6709 <restriction> \u5B50\u9879, \u5E76\u5E26\u6709\u5F15\u7528\u5176\u81EA\u8EAB\u7684 ''base'' \u5C5E\u6027\u3002
-        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' \u4E0D\u542B\u5F15\u7528\u91CD\u65B0\u5B9A\u4E49\u7684\u5143\u7D20 ''{1}'' \u7684 ''base'' \u5C5E\u6027\u3002<redefine> \u5143\u7D20\u7684 <simpleType> \u5B50\u7EA7\u5FC5\u987B\u5177\u6709 <restriction> \u5B50\u9879, \u5E76\u5E26\u6709\u5F15\u7528\u5176\u81EA\u8EAB\u7684 ''base'' \u5C5E\u6027\u3002
-        src-redefine.5.b.a = src-redefine.5.b.a: \u627E\u4E0D\u5230 <complexType> \u7684\u975E\u6279\u6CE8\u5B50\u7EA7\u3002<redefine> \u5143\u7D20\u7684 <complexType> \u5B50\u7EA7\u5FC5\u987B\u5177\u6709 <extension> \u6216 <restriction> \u5B50\u9879, \u5E76\u5E26\u6709\u5F15\u7528\u5176\u81EA\u8EAB\u7684 'base' \u5C5E\u6027\u3002
-        src-redefine.5.b.b = src-redefine.5.b.b: \u627E\u4E0D\u5230 <complexType> \u7684\u975E\u6279\u6CE8\u5B50\u5B50\u7EA7\u3002<redefine> \u5143\u7D20\u7684 <complexType> \u5B50\u7EA7\u5FC5\u987B\u5177\u6709 <extension> \u6216 <restriction> \u5B50\u9879, \u5E76\u5E26\u6709\u5F15\u7528\u5176\u81EA\u8EAB\u7684 'base' \u5C5E\u6027\u3002
-        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}'' \u4E0D\u662F\u6709\u6548\u7684\u5B50\u5B50\u7EA7\u5143\u7D20\u3002<redefine> \u5143\u7D20\u7684 <complexType> \u5B50\u7EA7\u5FC5\u987B\u5177\u6709 <extension> \u6216 <restriction> \u5B50\u9879, \u5E76\u5E26\u6709\u5F15\u7528\u5176\u81EA\u8EAB\u7684 ''base'' \u5C5E\u6027\u3002
-        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}'' \u4E0D\u542B\u5F15\u7528\u91CD\u65B0\u5B9A\u4E49\u7684\u5143\u7D20 ''{1}'' \u7684 ''base'' \u5C5E\u6027\u3002<redefine> \u5143\u7D20\u7684 <complexType> \u5B50\u7EA7\u5FC5\u987B\u5177\u6709 <extension> \u6216 <restriction> \u5B50\u9879, \u5E76\u5E26\u6709\u5F15\u7528\u5176\u81EA\u8EAB\u7684 ''base'' \u5C5E\u6027\u3002
-        src-redefine.6.1.1 = src-redefine.6.1.1: \u5982\u679C <redefine> \u5143\u7D20\u7684\u7EC4\u5B50\u7EA7\u5305\u542B\u5F15\u7528\u5176\u81EA\u8EAB\u7684\u7EC4, \u5219\u5B83\u5FC5\u987B\u6B63\u597D\u5305\u542B\u4E00\u4E2A\u7EC4; \u6B64\u7EC4\u5177\u6709 ''{0}''\u3002
-        src-redefine.6.1.2 = src-redefine.6.1.2: \u7EC4 ''{0}'' (\u5305\u542B\u5BF9\u8981\u91CD\u65B0\u5B9A\u4E49\u7684\u7EC4\u7684\u5F15\u7528) \u5FC5\u987B\u6EE1\u8DB3 ''minOccurs'' = ''maxOccurs'' = 1\u3002
-        src-redefine.6.2.1 = src-redefine.6.2.1: \u91CD\u65B0\u5B9A\u4E49\u7684\u65B9\u6848\u4E2D\u65E0\u540D\u79F0\u4E0E ''{0}'' \u5339\u914D\u7684\u7EC4\u3002
-        src-redefine.6.2.2 = src-redefine.6.2.2: \u7EC4 ''{0}'' \u672A\u6B63\u786E\u9650\u5236\u5176\u91CD\u65B0\u5B9A\u4E49\u7684\u7EC4; \u8FDD\u53CD\u4E86\u7EA6\u675F\u6761\u4EF6: ''{1}''\u3002
-        src-redefine.7.1 = src-redefine.7.1: \u5982\u679C <redefine> \u5143\u7D20\u7684 attributeGroup \u5B50\u7EA7\u5305\u542B\u5F15\u7528\u5176\u81EA\u8EAB\u7684 attributeGroup, \u5219\u5B83\u5FC5\u987B\u6B63\u597D\u5305\u542B\u4E00\u4E2A\u7EC4; \u6B64\u7EC4\u5177\u6709 {0}\u3002
-        src-redefine.7.2.1 = src-redefine.7.2.1: \u91CD\u65B0\u5B9A\u4E49\u7684\u65B9\u6848\u4E2D\u6CA1\u6709\u540D\u79F0\u4E0E ''{0}'' \u5339\u914D\u7684 attributeGroup\u3002
-        src-redefine.7.2.2 = src-redefine.7.2.2: AttributeGroup ''{0}'' \u672A\u6B63\u786E\u9650\u5236\u5176\u91CD\u65B0\u5B9A\u4E49\u7684 attributeGroup; \u8FDD\u53CD\u4E86\u7EA6\u675F\u6761\u4EF6: ''{1}''\u3002
-        src-resolve = src-resolve: \u65E0\u6CD5\u5C06\u540D\u79F0 ''{0}'' \u89E3\u6790\u4E3A ''{1}'' \u7EC4\u4EF6\u3002
-        src-resolve.4.1 = src-resolve.4.1: \u89E3\u6790\u7EC4\u4EF6 ''{2}'' \u65F6\u51FA\u9519\u3002\u5728\u8BE5\u7EC4\u4EF6\u4E2D\u68C0\u6D4B\u5230 ''{2}'' \u6CA1\u6709\u540D\u79F0\u7A7A\u95F4, \u4F46\u65E0\u6CD5\u4ECE\u65B9\u6848\u6587\u6863 ''{0}'' \u5F15\u7528\u6CA1\u6709\u76EE\u6807\u540D\u79F0\u7A7A\u95F4\u7684\u7EC4\u4EF6\u3002\u5982\u679C ''{2}'' \u9700\u8981\u5177\u6709\u540D\u79F0\u7A7A\u95F4, \u5219\u5F88\u53EF\u80FD\u9700\u8981\u63D0\u4F9B\u524D\u7F00\u3002\u5982\u679C ''{2}'' \u4E0D\u9700\u8981\u5177\u6709\u540D\u79F0\u7A7A\u95F4, \u5219\u5E94\u5C06\u6CA1\u6709 "namespace" \u5C5E\u6027\u7684 ''import'' \u6DFB\u52A0\u5230 ''{0}''\u3002
-        src-resolve.4.2 = src-resolve.4.2: \u89E3\u6790\u7EC4\u4EF6 ''{2}'' \u65F6\u51FA\u9519\u3002\u5728\u8BE5\u7EC4\u4EF6\u4E2D\u68C0\u6D4B\u5230 ''{2}'' \u4F4D\u4E8E\u540D\u79F0\u7A7A\u95F4 ''{1}'' \u4E2D, \u4F46\u65E0\u6CD5\u4ECE\u65B9\u6848\u6587\u6863 ''{0}'' \u5F15\u7528\u6B64\u540D\u79F0\u7A7A\u95F4\u7684\u7EC4\u4EF6\u3002\u5982\u679C\u8FD9\u662F\u4E0D\u6B63\u786E\u7684\u540D\u79F0\u7A7A\u95F4, \u5219\u5F88\u53EF\u80FD\u9700\u8981\u66F4\u6539 ''{2}'' \u7684\u524D\u7F00\u3002\u5982\u679C\u8FD9\u662F\u6B63\u786E\u7684\u540D\u79F0\u7A7A\u95F4, \u5219\u5E94\u5C06\u9002\u5F53\u7684 ''import'' \u6807\u8BB0\u6DFB\u52A0\u5230 ''{0}''\u3002
-        src-simple-type.2.a = src-simple-type.2.a: \u53D1\u73B0 <restriction> \u5143\u7D20\u7684 [\u5B50\u7EA7] \u4E2D\u540C\u65F6\u5177\u6709\u57FA [\u5C5E\u6027] \u548C <simpleType> \u5143\u7D20\u3002\u53EA\u5141\u8BB8\u5177\u6709\u4E00\u4E2A\u3002
-        src-simple-type.2.b = src-simple-type.2.b: \u53D1\u73B0 <restriction> \u5143\u7D20\u7684 [\u5B50\u7EA7] \u4E2D\u65E2\u6CA1\u6709\u57FA [\u5C5E\u6027], \u4E5F\u6CA1\u6709 <simpleType> \u5143\u7D20\u3002\u5FC5\u987B\u5177\u6709\u5176\u4E2D\u4E00\u4E2A\u3002
-        src-simple-type.3.a = src-simple-type.3.a: \u53D1\u73B0 <list> \u5143\u7D20\u7684 [\u5B50\u7EA7] \u4E2D\u540C\u65F6\u5177\u6709 itemType [\u5C5E\u6027] \u548C <simpleType> \u5143\u7D20\u3002\u53EA\u5141\u8BB8\u5177\u6709\u4E00\u4E2A\u3002
-        src-simple-type.3.b = src-simple-type.3.b: \u53D1\u73B0 <list> \u5143\u7D20\u7684 [\u5B50\u7EA7] \u4E2D\u65E2\u6CA1\u6709 itemType [\u5C5E\u6027], \u4E5F\u6CA1\u6709 <simpleType> \u5143\u7D20\u3002\u5FC5\u987B\u5177\u6709\u5176\u4E2D\u4E00\u4E2A\u3002
-        src-single-facet-value = src-single-facet-value: \u591A\u6B21\u5B9A\u4E49\u4E86\u9762 ''{0}''\u3002
-        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: <union> \u5143\u7D20\u7684 [\u5B50\u7EA7] \u4E2D\u5FC5\u987B\u5177\u6709\u975E\u7A7A memberTypes [\u5C5E\u6027] \u6216\u81F3\u5C11\u4E00\u4E2A <simpleType> \u5143\u7D20\u3002
+        schema_reference.access = schema_reference: 由于 accessExternalSchema 属性设置的限制而不允许 ''{1}'' 访问, 因此无法读取方案文档 ''{0}''。
+        schema_reference.4 = schema_reference.4: 无法读取方案文档 ''{0}'', 原因为 1) 无法找到文档; 2) 无法读取文档; 3) 文档的根元素不是 <xsd:schema>。
+        src-annotation = src-annotation: <annotation> 元素只能包含 <appinfo> 和 <documentation> 元素, 但发现了 ''{0}''。
+        src-attribute.1 = src-attribute.1: 属性声明 ''{0}'' 中不能同时存在特性 ''default'' 和 ''fixed''。应只使用其中一个。
+        src-attribute.2 = src-attribute.2: 属性 ''{0}'' 中存在特性 ''default'', 因此 ''use'' 的值必须为 ''optional''。
+        src-attribute.3.1 = src-attribute.3.1: 本地属性声明中必须存在 'ref' 或 'name' 之一。
+        src-attribute.3.2 = src-attribute.3.2: 属性引用 ''{0}'' 中的内容必须匹配 (批注?)。
+        src-attribute.4 = src-attribute.4: 属性 ''{0}'' 同时具有 ''type'' 属性和匿名 ''simpleType'' 子级。一个属性只能具有这两者之一。
+        src-attribute_group.2 = src-attribute_group.2: 无法表达属性组 ''{0}'' 的通配符交集。
+        src-attribute_group.3 = src-attribute_group.3: 在属性组 ''{0}'' 中检测到循环定义。递归跟随属性组引用最终将引导回自身。
+        src-ct.1 = src-ct.1: 类型 ''{0}'' 的复杂类型定义的表达形式错误。使用 <complexContent> 时, 基类型必须为 complexType。''{1}'' 是 simpleType。
+        src-ct.2.1 = src-ct.2.1: 类型 ''{0}'' 的复杂类型定义的表达形式错误。使用 <simpleContent> 时, 基类型必须为 complexType, 其内容类型为“简单”, 或者为具有“混合”内容和可空粒子的复杂类型 (仅当指定了限制时), 或者为简单类型 (仅当指定了扩展时)。''{1}'' 不满足所有这些条件。
+        src-ct.2.2 = src-ct.2.2: 类型 ''{0}'' 的复杂类型定义的表达形式错误。如果具有 simpleContent 的 complexType 限制具有“混合”内容和可空粒子的 complexType, 那么 <restriction> 的子级中必须存在 <simpleType>。
+        src-ct.4 = src-ct.4: 类型 ''{0}'' 的复杂类型定义的表达形式错误。无法表达通配符的交集。
+        src-ct.5 = src-ct.5: 类型 ''{0}'' 的复杂类型定义的表达形式错误。无法表达通配符的并集。
+        src-element.1 = src-element.1: 元素声明 ''{0}'' 中不能同时存在属性 ''default'' 和 ''fixed''。应只使用其中一个。
+        src-element.2.1 = src-element.2.1: 本地元素声明中必须存在 'ref' 或 'name'。
+        src-element.2.2 = src-element.2.2: 由于 ''{0}'' 包含 ''ref'' 属性, 其内容必须匹配 (批注?)。但是, 发现了 ''{1}''。
+        src-element.3 = src-element.3: 元素 ''{0}'' 同时具有 ''type'' 属性和 ''anonymous type'' 子级。元素中只允许具有其中一项。
+        src-import.1.1 = src-import.1.1: <import> 元素信息项的名称空间属性 ''{0}'' 不能与方案中其拥有的 targetNamespace 相同。
+        src-import.1.2 = src-import.1.2: 如果 <import> 元素信息项中不存在名称空间属性, 则封闭方案中必须具有 targetNamespace。
+        src-import.2 = src-import.2: 文档 ''{0}'' 的根元素必须具有名称空间名 ''http://www.w3.org/2001/XMLSchema'' 和本地名称 ''schema''。
+        src-import.3.1 = src-import.3.1: <import> 元素信息项的名称空间属性 ''{0}'' 必须与导入文档的 targetNamespace 属性 ''{1}'' 相同。
+        src-import.3.2 = src-import.3.2: 发现了没有名称空间属性的 <import> 元素信息项, 因此导入文档必须不含 targetNamespace 属性。但是, 在导入文档中发现了 targetNamespace ''{1}''。
+        src-include.1 = src-include.1: 文档 ''{0}'' 的根元素必须具有名称空间名 ''http://www.w3.org/2001/XMLSchema'' 和本地名称 ''schema''。
+        src-include.2.1 = src-include.2.1: 引用的方案 (当前为 ''{1}'') 的 targetNamespace 必须与包含的方案 (当前为 ''{0}'') 的 targetNamespace 相同。
+        src-redefine.2 = src-redefine.2: 文档 ''{0}'' 的根元素必须具有名称空间名 ''http://www.w3.org/2001/XMLSchema'' 和本地名称 ''schema''。
+        src-redefine.3.1 = src-redefine.3.1: 引用的方案 (当前为 ''{1}'') 的 targetNamespace 必须与重新定义的方案 (当前为 ''{0}'') 的 targetNamespace 相同。
+        src-redefine.5.a.a = src-redefine.5.a.a: 找不到 <simpleType> 的非批注子级。<redefine> 元素的 <simpleType> 子级必须具有 <restriction> 子项, 并带有引用其自身的 'base' 属性。
+        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' 不是有效的子元素。<redefine> 元素的 <simpleType> 子级必须具有 <restriction> 子项, 并带有引用其自身的 ''base'' 属性。
+        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' 不含引用重新定义的元素 ''{1}'' 的 ''base'' 属性。<redefine> 元素的 <simpleType> 子级必须具有 <restriction> 子项, 并带有引用其自身的 ''base'' 属性。
+        src-redefine.5.b.a = src-redefine.5.b.a: 找不到 <complexType> 的非批注子级。<redefine> 元素的 <complexType> 子级必须具有 <extension> 或 <restriction> 子项, 并带有引用其自身的 'base' 属性。
+        src-redefine.5.b.b = src-redefine.5.b.b: 找不到 <complexType> 的非批注子子级。<redefine> 元素的 <complexType> 子级必须具有 <extension> 或 <restriction> 子项, 并带有引用其自身的 'base' 属性。
+        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}'' 不是有效的子子级元素。<redefine> 元素的 <complexType> 子级必须具有 <extension> 或 <restriction> 子项, 并带有引用其自身的 ''base'' 属性。
+        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}'' 不含引用重新定义的元素 ''{1}'' 的 ''base'' 属性。<redefine> 元素的 <complexType> 子级必须具有 <extension> 或 <restriction> 子项, 并带有引用其自身的 ''base'' 属性。
+        src-redefine.6.1.1 = src-redefine.6.1.1: 如果 <redefine> 元素的组子级包含引用其自身的组, 则它必须正好包含一个组; 此组具有 ''{0}''。
+        src-redefine.6.1.2 = src-redefine.6.1.2: 组 ''{0}'' (包含对要重新定义的组的引用) 必须满足 ''minOccurs'' = ''maxOccurs'' = 1。
+        src-redefine.6.2.1 = src-redefine.6.2.1: 重新定义的方案中无名称与 ''{0}'' 匹配的组。
+        src-redefine.6.2.2 = src-redefine.6.2.2: 组 ''{0}'' 未正确限制其重新定义的组; 违反了约束条件: ''{1}''。
+        src-redefine.7.1 = src-redefine.7.1: 如果 <redefine> 元素的 attributeGroup 子级包含引用其自身的 attributeGroup, 则它必须正好包含一个组; 此组具有 {0}。
+        src-redefine.7.2.1 = src-redefine.7.2.1: 重新定义的方案中没有名称与 ''{0}'' 匹配的 attributeGroup。
+        src-redefine.7.2.2 = src-redefine.7.2.2: AttributeGroup ''{0}'' 未正确限制其重新定义的 attributeGroup; 违反了约束条件: ''{1}''。
+        src-resolve = src-resolve: 无法将名称 ''{0}'' 解析为 ''{1}'' 组件。
+        src-resolve.4.1 = src-resolve.4.1: 解析组件 ''{2}'' 时出错。在该组件中检测到 ''{2}'' 没有名称空间, 但无法从方案文档 ''{0}'' 引用没有目标名称空间的组件。如果 ''{2}'' 需要具有名称空间, 则很可能需要提供前缀。如果 ''{2}'' 不需要具有名称空间, 则应将没有 "namespace" 属性的 ''import'' 添加到 ''{0}''。
+        src-resolve.4.2 = src-resolve.4.2: 解析组件 ''{2}'' 时出错。在该组件中检测到 ''{2}'' 位于名称空间 ''{1}'' 中, 但无法从方案文档 ''{0}'' 引用此名称空间的组件。如果这是不正确的名称空间, 则很可能需要更改 ''{2}'' 的前缀。如果这是正确的名称空间, 则应将适当的 ''import'' 标记添加到 ''{0}''。
+        src-simple-type.2.a = src-simple-type.2.a: 发现 <restriction> 元素的 [子级] 中同时具有基 [属性] 和 <simpleType> 元素。只允许具有一个。
+        src-simple-type.2.b = src-simple-type.2.b: 发现 <restriction> 元素的 [子级] 中既没有基 [属性], 也没有 <simpleType> 元素。必须具有其中一个。
+        src-simple-type.3.a = src-simple-type.3.a: 发现 <list> 元素的 [子级] 中同时具有 itemType [属性] 和 <simpleType> 元素。只允许具有一个。
+        src-simple-type.3.b = src-simple-type.3.b: 发现 <list> 元素的 [子级] 中既没有 itemType [属性], 也没有 <simpleType> 元素。必须具有其中一个。
+        src-single-facet-value = src-single-facet-value: 多次定义了面 ''{0}''。
+        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: <union> 元素的 [子级] 中必须具有非空 memberTypes [属性] 或至少一个 <simpleType> 元素。
 
 #constraint valid (3.X.6)
 
-        ag-props-correct.2 = ag-props-correct.2: \u5C5E\u6027\u7EC4 ''{0}'' \u9519\u8BEF\u3002\u6307\u5B9A\u4E86\u5177\u6709\u76F8\u540C\u540D\u79F0\u548C\u76EE\u6807\u540D\u79F0\u7A7A\u95F4\u7684\u91CD\u590D\u5C5E\u6027\u7528\u6CD5\u3002\u91CD\u590D\u5C5E\u6027\u7528\u6CD5\u7684\u540D\u79F0\u4E3A ''{1}''\u3002
-        ag-props-correct.3 = ag-props-correct.3: \u5C5E\u6027\u7EC4 ''{0}'' \u9519\u8BEF\u3002\u4E24\u4E2A\u5C5E\u6027\u58F0\u660E ''{1}'' \u548C ''{2}'' \u5177\u6709\u7684\u7C7B\u578B\u662F\u4ECE ID \u6D3E\u751F\u7684\u3002
-        a-props-correct.2 = a-props-correct.2: \u5C5E\u6027 ''{0}'' \u4E2D\u7684\u503C\u7EA6\u675F\u6761\u4EF6\u7684\u503C ''{1}'' \u65E0\u6548\u3002
-        a-props-correct.3 = a-props-correct.3: \u5C5E\u6027 ''{0}'' \u4E0D\u80FD\u4F7F\u7528 ''fixed'' \u6216 ''default'', \u56E0\u4E3A\u5176 '{'type definition'}' \u4E3A ID, \u6216\u8005\u662F\u4ECE ID \u6D3E\u751F\u7684\u3002
-        au-props-correct.2 = au-props-correct.2: \u5728 ''{0}'' \u7684\u5C5E\u6027\u58F0\u660E\u4E2D, \u6307\u5B9A\u4E86\u56FA\u5B9A\u503C ''{1}''\u3002\u56E0\u6B64\u5982\u679C\u5F15\u7528 ''{0}'' \u7684\u5C5E\u6027\u7528\u6CD5\u540C\u65F6\u5177\u6709 '{'value constraint'}', \u5219\u5B83\u5FC5\u987B\u662F\u56FA\u5B9A\u7684, \u5E76\u4E14\u5176\u503C\u5FC5\u987B\u4E3A ''{1}''\u3002
-        cos-all-limited.1.2 = cos-all-limited.1.2: '{'min occurs'}' = '{'max occurs'}' = 1 \u7684\u7C92\u5B50\u4E2D\u5FC5\u987B\u5305\u542B 'all' \u6A21\u578B\u7EC4, \u8BE5\u7C92\u5B50\u5FC5\u987B\u662F\u7EC4\u6210\u590D\u6742\u7C7B\u578B\u5B9A\u4E49\u7684 '{'content type'}' \u5BF9\u7684\u4E00\u90E8\u5206\u3002
-        cos-all-limited.2 = cos-all-limited.2: \u5728 ''all'' \u6A21\u578B\u7EC4\u4E2D\u5143\u7D20\u7684 '{'max occurs'}' \u5FC5\u987B\u4E3A 0 \u6216 1\u3002\u5143\u7D20 ''{1}'' \u7684\u503C ''{0}'' \u65E0\u6548\u3002
-        cos-applicable-facets = cos-applicable-facets: \u7C7B\u578B {1} \u4E0D\u5141\u8BB8\u9762 ''{0}''\u3002
-        cos-ct-extends.1.1 = cos-ct-extends.1.1: \u7C7B\u578B ''{0}'' \u662F\u4ECE\u7C7B\u578B ''{1}'' \u7684\u6269\u5C55\u6D3E\u751F\u7684\u3002\u4F46\u662F, ''{1}'' \u7684 ''final'' \u5C5E\u6027\u7981\u6B62\u7531\u6269\u5C55\u6D3E\u751F\u3002
-        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: \u6D3E\u751F\u7C7B\u578B\u53CA\u5176\u57FA\u7C7B\u578B\u7684\u5185\u5BB9\u7C7B\u578B\u90FD\u5FC5\u987B\u4E3A\u201C\u6DF7\u5408\u201D\u6216\u201C\u4EC5\u5143\u7D20\u201D\u3002\u7C7B\u578B ''{0}'' \u4E3A\u201C\u4EC5\u5143\u7D20\u201D, \u4F46\u5176\u57FA\u7C7B\u578B\u4E0D\u662F\u3002
-        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: \u6D3E\u751F\u7C7B\u578B\u53CA\u5176\u57FA\u7C7B\u578B\u7684\u5185\u5BB9\u7C7B\u578B\u90FD\u5FC5\u987B\u4E3A\u201C\u6DF7\u5408\u201D\u6216\u201C\u4EC5\u5143\u7D20\u201D\u3002\u7C7B\u578B ''{0}'' \u4E3A\u201C\u6DF7\u5408\u201D, \u4F46\u5176\u57FA\u7C7B\u578B\u4E0D\u662F\u3002
-        cos-element-consistent = cos-element-consistent: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6A21\u578B\u7EC4\u4E2D\u5B58\u5728\u540D\u79F0\u4E3A ''{1}'' \u4E14\u5177\u6709\u4E0D\u540C\u7C7B\u578B\u7684\u591A\u4E2A\u5143\u7D20\u3002
-        cos-list-of-atomic = cos-list-of-atomic: \u5728\u5217\u8868\u7C7B\u578B ''{0}'' \u7684\u5B9A\u4E49\u4E2D, \u7C7B\u578B ''{1}'' \u662F\u65E0\u6548\u7684\u5217\u8868\u5143\u7D20\u7C7B\u578B, \u56E0\u4E3A\u5B83\u4E0D\u662F\u539F\u5B50 (''{1}'' \u65E2\u4E0D\u662F\u5217\u8868\u7C7B\u578B, \u4E5F\u4E0D\u662F\u5305\u542B\u5217\u8868\u7684\u8054\u5408\u7C7B\u578B)\u3002
-        cos-nonambig = cos-nonambig: {0} \u548C {1} (\u6216\u6765\u81EA\u5176\u66FF\u4EE3\u7EC4\u7684\u5143\u7D20) \u8FDD\u53CD\u4E86 "\u552F\u4E00\u7C92\u5B50\u5C5E\u6027"\u3002\u6839\u636E\u6B64\u65B9\u6848\u8FDB\u884C\u9A8C\u8BC1\u671F\u95F4, \u8FD9\u4E24\u4E2A\u7C92\u5B50\u4F1A\u9020\u6210\u6B67\u4E49\u3002
-        cos-particle-restrict.a = cos-particle-restrict.a: \u6D3E\u751F\u7684\u7C92\u5B50\u4E3A\u7A7A, \u800C\u57FA\u7C92\u5B50\u4E0D\u53EF\u4E3A\u7A7A\u3002
-        cos-particle-restrict.b = cos-particle-restrict.b: \u57FA\u7C92\u5B50\u4E3A\u7A7A, \u4F46\u6D3E\u751F\u7C92\u5B50\u4E0D\u4E3A\u7A7A\u3002
-        cos-particle-restrict.2 = cos-particle-restrict.2: \u7981\u6B62\u7C92\u5B50\u9650\u5236: ''{0}''\u3002
-        cos-st-restricts.1.1 = cos-st-restricts.1.1: \u7C7B\u578B ''{1}'' \u4E3A\u539F\u5B50, \u56E0\u6B64\u5176 '{'base type definition'}' ''{0}'' \u5FC5\u987B\u4E3A\u539F\u5B50\u7B80\u5355\u7C7B\u578B\u5B9A\u4E49\u6216\u5185\u7F6E\u57FA\u5143\u6570\u636E\u7C7B\u578B\u3002
-        cos-st-restricts.2.1 = cos-st-restricts.2.1: \u5728\u5217\u8868\u7C7B\u578B ''{0}'' \u7684\u5B9A\u4E49\u4E2D, \u7C7B\u578B ''{1}'' \u662F\u65E0\u6548\u7684\u9879\u7C7B\u578B, \u56E0\u4E3A\u5B83\u65E2\u4E0D\u662F\u5217\u8868\u7C7B\u578B, \u4E5F\u4E0D\u662F\u5305\u542B\u5217\u8868\u7684\u8054\u5408\u7C7B\u578B\u3002
-        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: '{'item type definition'}' \u7684 '{'final'}' \u7EC4\u4EF6 ''{0}'' \u5305\u542B ''list''\u3002\u8FD9\u8868\u793A ''{0}'' \u4E0D\u80FD\u7528\u4F5C\u5217\u8868\u7C7B\u578B ''{1}'' \u7684\u9879\u7C7B\u578B\u3002
-        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: '{'member type definitions'}' ''{0}'' \u7684 '{'final'}' \u7EC4\u4EF6\u5305\u542B ''union''\u3002\u8FD9\u8868\u793A ''{0}'' \u4E0D\u80FD\u7528\u4F5C\u8054\u5408\u7C7B\u578B ''{1}'' \u7684\u6210\u5458\u7C7B\u578B\u3002
-        cos-valid-default.2.1 = cos-valid-default.2.1: \u5143\u7D20 ''{0}'' \u5177\u6709\u503C\u7EA6\u675F\u6761\u4EF6, \u5E76\u4E14\u5FC5\u987B\u5177\u6709\u201C\u6DF7\u5408\u201D\u6216\u201C\u7B80\u5355\u201D\u5185\u5BB9\u6A21\u578B\u3002
-        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: \u7531\u4E8E\u5143\u7D20 ''{0}'' \u5177\u6709 '{'value constraint'}', \u5E76\u4E14\u5176\u7C7B\u578B\u5B9A\u4E49\u5177\u6709\u6DF7\u5408\u7684 '{'content type'}', \u5219 '{'content type'}' \u7684\u7C92\u5B50\u5FC5\u987B\u53EF\u4E3A\u7A7A\u3002
-        c-props-correct.2 = c-props-correct.2: \u952E\u5F15\u7528 ''{0}'' \u548C\u952E ''{1}'' \u4E2D\u5B57\u6BB5\u7684\u57FA\u6570\u5FC5\u987B\u76F8\u540C\u3002
-        ct-props-correct.3 = ct-props-correct.3: \u5728\u590D\u6742\u7C7B\u578B ''{0}'' \u4E2D\u68C0\u6D4B\u5230\u5FAA\u73AF\u5B9A\u4E49\u3002\u8FD9\u8868\u793A ''{0}'' \u5305\u542B\u5728\u5176\u81EA\u8EAB\u7684\u7C7B\u578B\u5206\u5C42\u7ED3\u6784\u4E2D, \u8FD9\u662F\u9519\u8BEF\u7684\u3002
-        ct-props-correct.4 = ct-props-correct.4: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6307\u5B9A\u4E86\u5177\u6709\u76F8\u540C\u540D\u79F0\u548C\u76EE\u6807\u540D\u79F0\u7A7A\u95F4\u7684\u91CD\u590D\u5C5E\u6027\u7528\u6CD5\u3002\u91CD\u590D\u5C5E\u6027\u7528\u6CD5\u7684\u540D\u79F0\u4E3A ''{1}''\u3002
-        ct-props-correct.5 = ct-props-correct.5: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u4E24\u4E2A\u5C5E\u6027\u58F0\u660E ''{1}'' \u548C ''{2}'' \u5177\u6709\u4ECE ID \u6D3E\u751F\u7684\u7C7B\u578B\u3002
-        derivation-ok-restriction.1 = derivation-ok-restriction.1: \u7C7B\u578B ''{0}'' \u7531\u9650\u5236\u4ECE\u7C7B\u578B ''{1}'' \u6D3E\u751F\u3002\u4F46\u662F, ''{1}'' \u5177\u6709\u7981\u6B62\u7531\u9650\u5236\u6D3E\u751F\u7684 '{'final'}' \u5C5E\u6027\u3002
-        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u4E2D\u7684\u5C5E\u6027\u7528\u6CD5 ''{1}'' \u5177\u6709 ''{2}'' \u7684 ''use'' \u503C, \u8FD9\u4E0E\u57FA\u7C7B\u578B\u4E2D\u7684\u5339\u914D\u5C5E\u6027\u7528\u6CD5\u7684 ''required'' \u503C\u4E0D\u4E00\u81F4\u3002
-        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u4E2D\u7684\u5C5E\u6027\u7528\u6CD5 ''{1}'' \u5177\u6709\u7C7B\u578B ''{2}'', \u5B83\u4E0D\u662F\u4ECE\u57FA\u7C7B\u578B\u4E2D\u7684\u5339\u914D\u5C5E\u6027\u7528\u6CD5\u7684\u7C7B\u578B ''{3}'' \u6709\u6548\u6D3E\u751F\u7684\u3002
-        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u4E2D\u7684\u5C5E\u6027\u7528\u6CD5 ''{1}'' \u5177\u6709\u4E0D\u56FA\u5B9A\u7684\u6709\u6548\u503C\u7EA6\u675F\u6761\u4EF6, \u800C\u57FA\u7C7B\u578B\u4E2D\u7684\u5339\u914D\u5C5E\u6027\u7528\u6CD5\u7684\u6709\u6548\u503C\u7EA6\u675F\u6761\u4EF6\u662F\u56FA\u5B9A\u7684\u3002
-        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u4E2D\u7684\u5C5E\u6027\u7528\u6CD5 ''{1}'' \u5177\u6709\u503C\u4E3A ''{2}'' \u7684\u56FA\u5B9A\u6709\u6548\u503C\u7EA6\u675F\u6761\u4EF6, \u8FD9\u4E0E\u57FA\u7C7B\u578B\u4E2D\u7684\u5339\u914D\u5C5E\u6027\u7528\u6CD5\u7684\u56FA\u5B9A\u6709\u6548\u503C\u7EA6\u675F\u6761\u4EF6\u7684\u503C ''{3}'' \u4E0D\u4E00\u81F4\u3002
-        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u4E2D\u7684\u5C5E\u6027\u7528\u6CD5 ''{1}'' \u5728\u57FA\u7C7B\u578B\u4E2D\u6CA1\u6709\u5339\u914D\u7684\u5C5E\u6027\u7528\u6CD5, \u5E76\u4E14\u57FA\u7C7B\u578B\u6CA1\u6709\u901A\u914D\u7B26\u5C5E\u6027\u3002
-        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u4E2D\u7684\u5C5E\u6027\u7528\u6CD5 ''{1}'' \u5728\u57FA\u7C7B\u578B\u4E2D\u6CA1\u6709\u5339\u914D\u7684\u5C5E\u6027\u7528\u6CD5, \u5E76\u4E14\u57FA\u7C7B\u578B\u4E2D\u7684\u901A\u914D\u7B26\u4E0D\u5141\u8BB8\u6B64\u5C5E\u6027\u7528\u6CD5\u7684\u540D\u79F0\u7A7A\u95F4 ''{2}''\u3002
-        derivation-ok-restriction.3 = derivation-ok-restriction.3: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u57FA\u7C7B\u578B\u4E2D\u7684\u5C5E\u6027\u7528\u6CD5 ''{1}'' \u7684 REQUIRED \u4E3A\u201C\u771F\u201D, \u4F46\u5728\u6D3E\u751F\u7C7B\u578B\u4E2D\u6CA1\u6709\u5339\u914D\u7684\u5C5E\u6027\u7528\u6CD5\u3002
-        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6D3E\u751F\u7C7B\u578B\u5177\u6709\u4E00\u4E2A\u5C5E\u6027\u901A\u914D\u7B26, \u4F46\u57FA\u7C7B\u578B\u4E0D\u5177\u6709\u5C5E\u6027\u901A\u914D\u7B26\u3002
-        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6D3E\u751F\u7C7B\u578B\u4E2D\u7684\u901A\u914D\u7B26\u4E0D\u662F\u57FA\u7C7B\u578B\u4E2D\u901A\u914D\u7B26\u7684\u6709\u6548\u901A\u914D\u7B26\u5B50\u96C6\u3002
-        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6D3E\u751F\u7C7B\u578B ({1}) \u4E2D\u901A\u914D\u7B26\u7684\u6D41\u7A0B\u5185\u5BB9\u5F31\u4E8E\u57FA\u7C7B\u578B ({2}) \u4E2D\u901A\u914D\u7B26\u7684\u6D41\u7A0B\u5185\u5BB9\u3002
-        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u7684\u7B80\u5355\u5185\u5BB9\u7C7B\u578B ''{1}'' \u4E0D\u5728\u57FA\u7C7B\u578B\u7684\u7B80\u5355\u5185\u5BB9\u7C7B\u578B ''{2}'' \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
-        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u7684\u5185\u5BB9\u7C7B\u578B\u4E3A\u7A7A, \u4F46\u57FA\u7C7B\u578B\u7684\u5185\u5BB9\u7C7B\u578B ''{1}'' \u4E0D\u4E3A\u7A7A\u6216\u4E0D\u80FD\u4E3A\u7A7A\u3002
-        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u7684\u5185\u5BB9\u7C7B\u578B\u4E3A\u201C\u6DF7\u5408\u201D, \u4F46\u57FA\u7C7B\u578B\u7684\u5185\u5BB9\u7C7B\u578B ''{1}'' \u4E0D\u4E3A\u201C\u6DF7\u5408\u201D\u3002
-        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u7684\u7C92\u5B50\u4E0D\u5728\u57FA\u7C7B\u578B\u7684\u7C92\u5B50\u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
-        enumeration-required-notation = enumeration-required-notation: {2} ''{1}'' \u4F7F\u7528\u7684 NOTATION \u7C7B\u578B ''{0}'' \u5FC5\u987B\u5177\u6709\u679A\u4E3E\u9762\u503C, \u7528\u4E8E\u6307\u5B9A\u6B64\u7C7B\u578B\u4F7F\u7528\u7684\u6CE8\u91CA\u5143\u7D20\u3002
-        enumeration-valid-restriction = enumeration-valid-restriction: \u679A\u4E3E\u503C ''{0}'' \u4E0D\u5728\u57FA\u7C7B\u578B {1} \u7684\u503C\u7A7A\u95F4\u4E2D\u3002
-        e-props-correct.2 = e-props-correct.2: \u5143\u7D20 ''{0}'' \u4E2D\u7684\u503C\u7EA6\u675F\u6761\u4EF6\u7684\u503C ''{1}'' \u65E0\u6548\u3002
-        e-props-correct.4 = e-props-correct.4: \u5143\u7D20 ''{0}'' \u7684 '{'type definition'}' \u4E0D\u662F\u4ECE substitutionHead ''{1}'' \u7684 '{'type definition'}' \u6709\u6548\u6D3E\u751F\u7684, \u6216\u8005 ''{1}'' \u7684 '{'substitution group exclusions'}' \u5C5E\u6027\u4E0D\u5141\u8BB8\u8FDB\u884C\u6B64\u6D3E\u751F\u3002
-        e-props-correct.5 = e-props-correct.5: \u5143\u7D20 ''{0}'' \u4E2D\u4E0D\u80FD\u5305\u542B '{'value constraint'}', \u56E0\u4E3A\u5143\u7D20\u7684 '{'type definition'}' \u6216 '{'type definition'}' \u7684 '{'content type'}' \u4E3A ID, \u6216\u8005\u662F\u4ECE ID \u6D3E\u751F\u7684\u3002
-        e-props-correct.6 = e-props-correct.6: \u5728\u5143\u7D20 ''{0}'' \u4E2D\u68C0\u6D4B\u5230\u5FAA\u73AF\u66FF\u4EE3\u7EC4\u3002
-        fractionDigits-valid-restriction = fractionDigits-valid-restriction: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''fractionDigits'' \u7684\u503C ''{0}'' \u65E0\u6548, \u56E0\u4E3A\u8BE5\u503C\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E ''fractionDigits'' \u7684\u503C, \u4F46\u5728\u539F\u7EA7\u7C7B\u578B\u4E4B\u4E00\u4E2D\u5DF2\u5C06\u5176\u8BBE\u7F6E\u4E3A ''{1}''\u3002
-        fractionDigits-totalDigits = fractionDigits-totalDigits: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''fractionDigits'' \u7684\u503C ''{0}'' \u65E0\u6548, \u56E0\u4E3A\u8BE5\u503C\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E ''totalDigits'' \u7684\u503C ''{1}''\u3002
-        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: \u5BF9\u4E8E\u7C7B\u578B {0}, \u957F\u5EA6 ''{1}'' \u7684\u503C\u5C0F\u4E8E minLength \u7684\u503C ''{2}'' \u662F\u9519\u8BEF\u7684\u3002
-        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: \u5BF9\u4E8E\u7C7B\u578B {0}, \u5982\u679C\u5F53\u524D\u9650\u5236\u5177\u6709 minLength \u9762\u5E76\u4E14\u5F53\u524D\u9650\u5236\u6216\u57FA\u7C7B\u578B\u5177\u6709 length \u9762, \u5219\u57FA\u7C7B\u578B\u6CA1\u6709 minLength \u9762\u662F\u9519\u8BEF\u7684\u3002
-        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: \u5BF9\u4E8E\u7C7B\u578B {0}, \u5F53\u524D minLength ''{1}'' \u4E0D\u7B49\u4E8E\u57FA\u7C7B\u578B minLength ''{2}'' \u662F\u9519\u8BEF\u7684\u3002
-        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: \u5BF9\u4E8E\u7C7B\u578B {0}, \u957F\u5EA6 ''{1}'' \u7684\u503C\u5927\u4E8E maxLength ''{2}'' \u7684\u503C\u662F\u9519\u8BEF\u7684\u3002
-        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: \u5BF9\u4E8E\u7C7B\u578B {0}, \u5982\u679C\u5F53\u524D\u9650\u5236\u5177\u6709 maxLength \u9762\u5E76\u4E14\u5F53\u524D\u9650\u5236\u6216\u57FA\u7C7B\u578B\u5177\u6709 length \u9762, \u5219\u57FA\u7C7B\u578B\u6CA1\u6709 maxLength \u9762\u662F\u9519\u8BEF\u7684\u3002
-        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: \u5BF9\u4E8E\u7C7B\u578B {0}, \u5F53\u524D maxLength ''{1}'' \u4E0D\u7B49\u4E8E\u57FA\u7C7B\u578B maxLength ''{2}'' \u662F\u9519\u8BEF\u7684\u3002
-        length-valid-restriction = length-valid-restriction: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002\u957F\u5EA6\u7684\u503C ''{0}'' \u5FC5\u987B\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684\u957F\u5EA6\u503C\u3002
-        maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002maxExclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 maxExclusive\u3002
-        maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002maxExclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 maxInclusive\u3002
-        maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002maxExclusive \u503C ''{0}'' \u5FC5\u987B\u5927\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 minInclusive\u3002
-        maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002maxExclusive \u503C ''{0}'' \u5FC5\u987B\u5927\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 minExclusive\u3002
-        maxInclusive-maxExclusive = maxInclusive-maxExclusive: \u4E3A\u540C\u4E00\u4E2A\u6570\u636E\u7C7B\u578B\u540C\u65F6\u6307\u5B9A maxInclusive \u548C maxExclusive \u662F\u9519\u8BEF\u7684\u3002\u5728 {2} \u4E2D, maxInclusive = ''{0}'' \u5E76\u4E14 maxExclusive = ''{1}''\u3002
-        maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002maxInclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 maxInclusive\u3002
-        maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002maxInclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 maxExclusive\u3002
-        maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002maxInclusive \u503C ''{0}'' \u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 minInclusive\u3002
-        maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002maxInclusive \u503C ''{0}'' \u5FC5\u987B\u5927\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 minExclusive\u3002
-        maxLength-valid-restriction = maxLength-valid-restriction: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, maxLength \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 maxLength\u3002
-        mg-props-correct.2 = mg-props-correct.2: \u5728\u7EC4 ''{0}'' \u4E2D\u68C0\u6D4B\u5230\u5FAA\u73AF\u5B9A\u4E49\u3002\u9012\u5F52\u8DDF\u968F\u7C92\u5B50\u7684 '{'term'}' \u4EE5\u4E0B\u503C\u4F1A\u5F15\u5BFC\u5230\u5176 '{'term'}' \u662F\u7EC4\u81EA\u8EAB\u7684\u7C92\u5B50\u3002
-        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, minExclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E maxExclusive \u503C ''{1}''\u3002
-        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, minExclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E maxInclusive \u503C ''{1}''\u3002
-        minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002minExclusive \u503C ''{0}'' \u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 minExclusive\u3002
-        minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002minExclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 maxInclusive\u3002
-        minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002minExclusive \u503C ''{0}'' \u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 minInclusive\u3002
-        minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002minExclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 maxExclusive\u3002
-        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, minInclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E maxInclusive \u503C ''{1}''\u3002
-        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, minInclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E maxExclusive \u503C ''{1}''\u3002
-        minInclusive-minExclusive = minInclusive-minExclusive: \u4E3A\u540C\u4E00\u4E2A\u6570\u636E\u7C7B\u578B\u540C\u65F6\u6307\u5B9A minInclusive \u548C minExclusive \u662F\u9519\u8BEF\u7684\u3002\u5728 {2} \u4E2D, minInclusive = ''{0}'' \u5E76\u4E14 minExclusive = ''{1}''\u3002
-        minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002minInclusive \u503C ''{0}'' \u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 minInclusive\u3002
-        minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002minInclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 maxInclusive\u3002
-        minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002minInclusive \u503C ''{0}'' \u5FC5\u987B\u5927\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 minExclusive\u3002
-        minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002minInclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 maxExclusive\u3002
-        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, minLength \u7684\u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E maxLength \u7684\u503C ''{1}''\u3002
-        minLength-valid-restriction = minLength-valid-restriction: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, minLength ''{0}'' \u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B\u7684 minLength ''{1}''\u3002
-        no-xmlns = no-xmlns: \u5C5E\u6027\u58F0\u660E\u7684 {name} \u4E0D\u80FD\u4E0E 'xmlns' \u5339\u914D\u3002
-        no-xsi = no-xsi: \u5C5E\u6027\u58F0\u660E\u7684 '{'target namespace'}' \u4E0D\u80FD\u4E0E ''{0}'' \u5339\u914D\u3002
-        p-props-correct.2.1 = p-props-correct.2.1: \u5728 ''{0}'' \u7684\u58F0\u660E\u4E2D, ''minOccurs'' \u7684\u503C\u4E3A ''{1}'', \u4F46\u8BE5\u503C\u4E0D\u80FD\u5927\u4E8E ''maxOccurs'' \u7684\u503C ''{2}''\u3002
-        rcase-MapAndSum.1 = rcase-MapAndSum.1: \u7C92\u5B50\u4E4B\u95F4\u6CA1\u6709\u5B8C\u6574\u7684\u529F\u80FD\u6620\u5C04\u3002
-        rcase-MapAndSum.2 = rcase-MapAndSum.2: \u7EC4\u7684\u53D1\u751F\u8303\u56F4 ({0},{1}) \u4E0D\u5728\u57FA\u7EC4\u7684\u53D1\u751F\u8303\u56F4 ({2},{3}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
-        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: \u5143\u7D20\u7684\u540D\u79F0\u548C\u76EE\u6807\u540D\u79F0\u7A7A\u95F4\u4E0D\u76F8\u540C: \u540D\u79F0\u7A7A\u95F4 ''{1}'' \u4E2D\u7684\u5143\u7D20\u4E3A ''{0}'', \u540D\u79F0\u7A7A\u95F4 ''{3}'' \u4E2D\u7684\u5143\u7D20\u4E3A ''{2}''\u3002
-        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: \u5176 '{'term'}' \u4E3A\u5143\u7D20\u58F0\u660E ''{0}'' \u7684\u7C92\u5B50\u9519\u8BEF\u3002\u5143\u7D20\u58F0\u660E\u7684 '{'nillable'}' \u4E3A\u201C\u771F\u201D, \u4F46\u57FA\u7C7B\u578B\u4E2D\u5BF9\u5E94\u7684\u7C92\u5B50\u5177\u6709 '{'nillable'}' \u4E3A\u201C\u5047\u201D\u7684\u5143\u7D20\u58F0\u660E\u3002
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3\uFF1A\u5176 '{'term'}' \u4E3A\u5143\u7D20\u58F0\u660E ''{0}'' \u7684\u7C92\u5B50\u9519\u8BEF\u3002\u8BE5\u7C92\u5B50\u7684\u53D1\u751F\u8303\u56F4 ({1},{2}) \u4E0D\u5728\u57FA\u7C7B\u578B\u4E2D\u5BF9\u5E94\u7C92\u5B50\u7684\u8303\u56F4 ({3},{4}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
-        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: \u5143\u7D20 ''{0}'' \u4E0D\u662F\u56FA\u5B9A\u7684, \u4F46\u57FA\u7C7B\u578B\u4E2D\u7684\u5BF9\u5E94\u5143\u7D20\u662F\u56FA\u5B9A\u7684, \u4E14\u503C\u4E3A ''{1}''\u3002
-        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: \u5143\u7D20 ''{0}'' \u662F\u56FA\u5B9A\u7684, \u4E14\u503C\u4E3A ''{1}'', \u4F46\u57FA\u7C7B\u578B\u4E2D\u7684\u5BF9\u5E94\u5143\u7D20\u662F\u56FA\u5B9A\u7684, \u4E14\u503C\u4E3A ''{2}''\u3002
-        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: \u5143\u7D20 ''{0}'' \u7684\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u4E0D\u662F\u57FA\u7C7B\u578B\u4E2D\u90A3\u4E9B\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u7684\u5B50\u96C6\u3002
-        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: \u5143\u7D20 ''{0}'' \u7684\u4E0D\u63A5\u53D7\u66FF\u4EE3\u4E0D\u662F\u57FA\u5143\u7D20\u4E2D\u4E0D\u63A5\u53D7\u66FF\u4EE3\u7684\u8D85\u96C6\u3002
-        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: \u5143\u7D20 ''{0}'' \u7684\u7C7B\u578B ''{1}'' \u4E0D\u662F\u4ECE\u57FA\u5143\u7D20\u7684\u7C7B\u578B ''{2}'' \u6D3E\u751F\u7684\u3002
-        rcase-NSCompat.1 = rcase-NSCompat.1: \u5143\u7D20 ''{0}'' \u5177\u6709\u540D\u79F0\u7A7A\u95F4 ''{1}'', \u5728\u57FA\u5143\u7D20\u4E2D, \u901A\u914D\u7B26\u4E0D\u5141\u8BB8\u5177\u6709\u6B64\u540D\u79F0\u7A7A\u95F4\u3002
-        rcase-NSCompat.2 = rcase-NSCompat.2\uFF1A\u5176 '{'term'}' \u4E3A\u5143\u7D20\u58F0\u660E ''{0}'' \u7684\u7C92\u5B50\u9519\u8BEF\u3002\u8BE5\u7C92\u5B50\u7684\u53D1\u751F\u8303\u56F4 ({1},{2}) \u4E0D\u5728\u57FA\u7C7B\u578B\u4E2D\u5BF9\u5E94\u7C92\u5B50\u7684\u8303\u56F4 ({3},{4}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
-        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: \u7C92\u5B50\u4E4B\u95F4\u6CA1\u6709\u5B8C\u6574\u7684\u529F\u80FD\u6620\u5C04\u3002
-        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: \u7EC4\u7684\u53D1\u751F\u8303\u56F4 ({0},{1}) \u4E0D\u5728\u57FA\u672C\u901A\u914D\u7B26\u8303\u56F4 ({2},{3}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
-        rcase-NSSubset.1 = rcase-NSSubset.1: \u901A\u914D\u7B26\u4E0D\u662F\u57FA\u672C\u901A\u914D\u7B26\u4E2D\u5BF9\u5E94\u901A\u914D\u7B26\u7684\u5B50\u96C6\u3002
-        rcase-NSSubset.2 = rcase-NSSubset.2: \u901A\u914D\u7B26\u7684\u53D1\u751F\u8303\u56F4 ({0},{1}) \u4E0D\u5728\u57FA\u672C\u901A\u914D\u7B26\u4E2D\u53D1\u751F\u8303\u56F4 ({2},{3}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
-        rcase-NSSubset.3 = rcase-NSSubset.3: \u901A\u914D\u7B26\u7684\u6D41\u7A0B\u5185\u5BB9 ''{0}'' \u5F31\u4E8E\u57FA\u672C\u901A\u914D\u7B26\u4E2D\u7684\u6D41\u7A0B\u5185\u5BB9 ''{1}''\u3002
-        rcase-Recurse.1 = rcase-Recurse.1: \u7EC4\u7684\u53D1\u751F\u8303\u56F4 ({0},{1}) \u4E0D\u5728\u57FA\u7EC4\u7684\u53D1\u751F\u8303\u56F4 ({2},{3}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
-        rcase-Recurse.2 = rcase-Recurse.2: \u7C92\u5B50\u4E4B\u95F4\u6CA1\u6709\u5B8C\u6574\u7684\u529F\u80FD\u6620\u5C04\u3002
-        rcase-RecurseLax.1 = rcase-RecurseLax.1: \u7EC4\u7684\u53D1\u751F\u8303\u56F4 ({0},{1}) \u4E0D\u5728\u57FA\u7EC4\u7684\u53D1\u751F\u8303\u56F4 ({2},{3}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
-        rcase-RecurseLax.2 = rcase-RecurseLax.2: \u7C92\u5B50\u4E4B\u95F4\u6CA1\u6709\u5B8C\u6574\u7684\u529F\u80FD\u6620\u5C04\u3002
-        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: \u7EC4\u7684\u53D1\u751F\u8303\u56F4 ({0},{1}) \u4E0D\u5728\u57FA\u7EC4\u7684\u53D1\u751F\u8303\u56F4 ({2},{3}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
-        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: \u7C92\u5B50\u4E4B\u95F4\u6CA1\u6709\u5B8C\u6574\u7684\u529F\u80FD\u6620\u5C04\u3002
+        ag-props-correct.2 = ag-props-correct.2: 属性组 ''{0}'' 错误。指定了具有相同名称和目标名称空间的重复属性用法。重复属性用法的名称为 ''{1}''。
+        ag-props-correct.3 = ag-props-correct.3: 属性组 ''{0}'' 错误。两个属性声明 ''{1}'' 和 ''{2}'' 具有的类型是从 ID 派生的。
+        a-props-correct.2 = a-props-correct.2: 属性 ''{0}'' 中的值约束条件的值 ''{1}'' 无效。
+        a-props-correct.3 = a-props-correct.3: 属性 ''{0}'' 不能使用 ''fixed'' 或 ''default'', 因为其 '{'type definition'}' 为 ID, 或者是从 ID 派生的。
+        au-props-correct.2 = au-props-correct.2: 在 ''{0}'' 的属性声明中, 指定了固定值 ''{1}''。因此如果引用 ''{0}'' 的属性用法同时具有 '{'value constraint'}', 则它必须是固定的, 并且其值必须为 ''{1}''。
+        cos-all-limited.1.2 = cos-all-limited.1.2: '{'min occurs'}' = '{'max occurs'}' = 1 的粒子中必须包含 'all' 模型组, 该粒子必须是组成复杂类型定义的 '{'content type'}' 对的一部分。
+        cos-all-limited.2 = cos-all-limited.2: 在 ''all'' 模型组中元素的 '{'max occurs'}' 必须为 0 或 1。元素 ''{1}'' 的值 ''{0}'' 无效。
+        cos-applicable-facets = cos-applicable-facets: 类型 {1} 不允许面 ''{0}''。
+        cos-ct-extends.1.1 = cos-ct-extends.1.1: 类型 ''{0}'' 是从类型 ''{1}'' 的扩展派生的。但是, ''{1}'' 的 ''final'' 属性禁止由扩展派生。
+        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: 派生类型及其基类型的内容类型都必须为“混合”或“仅元素”。类型 ''{0}'' 为“仅元素”, 但其基类型不是。
+        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: 派生类型及其基类型的内容类型都必须为“混合”或“仅元素”。类型 ''{0}'' 为“混合”, 但其基类型不是。
+        cos-element-consistent = cos-element-consistent: 类型 ''{0}'' 错误。模型组中存在名称为 ''{1}'' 且具有不同类型的多个元素。
+        cos-list-of-atomic = cos-list-of-atomic: 在列表类型 ''{0}'' 的定义中, 类型 ''{1}'' 是无效的列表元素类型, 因为它不是原子 (''{1}'' 既不是列表类型, 也不是包含列表的联合类型)。
+        cos-nonambig = cos-nonambig: {0} 和 {1} (或来自其替代组的元素) 违反了 "唯一粒子属性"。根据此方案进行验证期间, 这两个粒子会造成歧义。
+        cos-particle-restrict.a = cos-particle-restrict.a: 派生的粒子为空, 而基粒子不可为空。
+        cos-particle-restrict.b = cos-particle-restrict.b: 基粒子为空, 但派生粒子不为空。
+        cos-particle-restrict.2 = cos-particle-restrict.2: 禁止粒子限制: ''{0}''。
+        cos-st-restricts.1.1 = cos-st-restricts.1.1: 类型 ''{1}'' 为原子, 因此其 '{'base type definition'}' ''{0}'' 必须为原子简单类型定义或内置基元数据类型。
+        cos-st-restricts.2.1 = cos-st-restricts.2.1: 在列表类型 ''{0}'' 的定义中, 类型 ''{1}'' 是无效的项类型, 因为它既不是列表类型, 也不是包含列表的联合类型。
+        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: '{'item type definition'}' 的 '{'final'}' 组件 ''{0}'' 包含 ''list''。这表示 ''{0}'' 不能用作列表类型 ''{1}'' 的项类型。
+        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: '{'member type definitions'}' ''{0}'' 的 '{'final'}' 组件包含 ''union''。这表示 ''{0}'' 不能用作联合类型 ''{1}'' 的成员类型。
+        cos-valid-default.2.1 = cos-valid-default.2.1: 元素 ''{0}'' 具有值约束条件, 并且必须具有“混合”或“简单”内容模型。
+        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: 由于元素 ''{0}'' 具有 '{'value constraint'}', 并且其类型定义具有混合的 '{'content type'}', 则 '{'content type'}' 的粒子必须可为空。
+        c-props-correct.2 = c-props-correct.2: 键引用 ''{0}'' 和键 ''{1}'' 中字段的基数必须相同。
+        ct-props-correct.3 = ct-props-correct.3: 在复杂类型 ''{0}'' 中检测到循环定义。这表示 ''{0}'' 包含在其自身的类型分层结构中, 这是错误的。
+        ct-props-correct.4 = ct-props-correct.4: 类型 ''{0}'' 错误。指定了具有相同名称和目标名称空间的重复属性用法。重复属性用法的名称为 ''{1}''。
+        ct-props-correct.5 = ct-props-correct.5: 类型 ''{0}'' 错误。两个属性声明 ''{1}'' 和 ''{2}'' 具有从 ID 派生的类型。
+        derivation-ok-restriction.1 = derivation-ok-restriction.1: 类型 ''{0}'' 由限制从类型 ''{1}'' 派生。但是, ''{1}'' 具有禁止由限制派生的 '{'final'}' 属性。
+        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: 类型 ''{0}'' 错误。此类型中的属性用法 ''{1}'' 具有 ''{2}'' 的 ''use'' 值, 这与基类型中的匹配属性用法的 ''required'' 值不一致。
+        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: 类型 ''{0}'' 错误。此类型中的属性用法 ''{1}'' 具有类型 ''{2}'', 它不是从基类型中的匹配属性用法的类型 ''{3}'' 有效派生的。
+        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: 类型 ''{0}'' 错误。此类型中的属性用法 ''{1}'' 具有不固定的有效值约束条件, 而基类型中的匹配属性用法的有效值约束条件是固定的。
+        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: 类型 ''{0}'' 错误。此类型中的属性用法 ''{1}'' 具有值为 ''{2}'' 的固定有效值约束条件, 这与基类型中的匹配属性用法的固定有效值约束条件的值 ''{3}'' 不一致。
+        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: 类型 ''{0}'' 错误。此类型中的属性用法 ''{1}'' 在基类型中没有匹配的属性用法, 并且基类型没有通配符属性。
+        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: 类型 ''{0}'' 错误。此类型中的属性用法 ''{1}'' 在基类型中没有匹配的属性用法, 并且基类型中的通配符不允许此属性用法的名称空间 ''{2}''。
+        derivation-ok-restriction.3 = derivation-ok-restriction.3: 类型 ''{0}'' 错误。基类型中的属性用法 ''{1}'' 的 REQUIRED 为“真”, 但在派生类型中没有匹配的属性用法。
+        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: 类型 ''{0}'' 错误。派生类型具有一个属性通配符, 但基类型不具有属性通配符。
+        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: 类型 ''{0}'' 错误。派生类型中的通配符不是基类型中通配符的有效通配符子集。
+        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: 类型 ''{0}'' 错误。派生类型 ({1}) 中通配符的流程内容弱于基类型 ({2}) 中通配符的流程内容。
+        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: 类型 ''{0}'' 错误。此类型的简单内容类型 ''{1}'' 不在基类型的简单内容类型 ''{2}'' 的有效限制之内。
+        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: 类型 ''{0}'' 错误。此类型的内容类型为空, 但基类型的内容类型 ''{1}'' 不为空或不能为空。
+        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: 类型 ''{0}'' 错误。此类型的内容类型为“混合”, 但基类型的内容类型 ''{1}'' 不为“混合”。
+        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: 类型 ''{0}'' 错误。此类型的粒子不在基类型的粒子的有效限制之内。
+        enumeration-required-notation = enumeration-required-notation: {2} ''{1}'' 使用的 NOTATION 类型 ''{0}'' 必须具有枚举面值, 用于指定此类型使用的注释元素。
+        enumeration-valid-restriction = enumeration-valid-restriction: 枚举值 ''{0}'' 不在基类型 {1} 的值空间中。
+        e-props-correct.2 = e-props-correct.2: 元素 ''{0}'' 中的值约束条件的值 ''{1}'' 无效。
+        e-props-correct.4 = e-props-correct.4: 元素 ''{0}'' 的 '{'type definition'}' 不是从 substitutionHead ''{1}'' 的 '{'type definition'}' 有效派生的, 或者 ''{1}'' 的 '{'substitution group exclusions'}' 属性不允许进行此派生。
+        e-props-correct.5 = e-props-correct.5: 元素 ''{0}'' 中不能包含 '{'value constraint'}', 因为元素的 '{'type definition'}' 或 '{'type definition'}' 的 '{'content type'}' 为 ID, 或者是从 ID 派生的。
+        e-props-correct.6 = e-props-correct.6: 在元素 ''{0}'' 中检测到循环替代组。
+        fractionDigits-valid-restriction = fractionDigits-valid-restriction: 在 {2} 的定义中, 面 ''fractionDigits'' 的值 ''{0}'' 无效, 因为该值必须小于等于 ''fractionDigits'' 的值, 但在原级类型之一中已将其设置为 ''{1}''。
+        fractionDigits-totalDigits = fractionDigits-totalDigits: 在 {2} 的定义中, 面 ''fractionDigits'' 的值 ''{0}'' 无效, 因为该值必须小于等于 ''totalDigits'' 的值 ''{1}''。
+        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: 对于类型 {0}, 长度 ''{1}'' 的值小于 minLength 的值 ''{2}'' 是错误的。
+        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: 对于类型 {0}, 如果当前限制具有 minLength 面并且当前限制或基类型具有 length 面, 则基类型没有 minLength 面是错误的。
+        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: 对于类型 {0}, 当前 minLength ''{1}'' 不等于基类型 minLength ''{2}'' 是错误的。
+        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: 对于类型 {0}, 长度 ''{1}'' 的值大于 maxLength ''{2}'' 的值是错误的。
+        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: 对于类型 {0}, 如果当前限制具有 maxLength 面并且当前限制或基类型具有 length 面, 则基类型没有 maxLength 面是错误的。
+        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: 对于类型 {0}, 当前 maxLength ''{1}'' 不等于基类型 maxLength ''{2}'' 是错误的。
+        length-valid-restriction = length-valid-restriction: 类型 ''{2}'' 错误。长度的值 ''{0}'' 必须等于基类型 ''{1}'' 的长度值。
+        maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: 类型 ''{2}'' 错误。maxExclusive 值 ''{0}'' 必须小于等于基类型 ''{1}'' 的 maxExclusive。
+        maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: 类型 ''{2}'' 错误。maxExclusive 值 ''{0}'' 必须小于等于基类型 ''{1}'' 的 maxInclusive。
+        maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: 类型 ''{2}'' 错误。maxExclusive 值 ''{0}'' 必须大于基类型 ''{1}'' 的 minInclusive。
+        maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4: 类型 ''{2}'' 错误。maxExclusive 值 ''{0}'' 必须大于基类型 ''{1}'' 的 minExclusive。
+        maxInclusive-maxExclusive = maxInclusive-maxExclusive: 为同一个数据类型同时指定 maxInclusive 和 maxExclusive 是错误的。在 {2} 中, maxInclusive = ''{0}'' 并且 maxExclusive = ''{1}''。
+        maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: 类型 ''{2}'' 错误。maxInclusive 值 ''{0}'' 必须小于等于基类型 ''{1}'' 的 maxInclusive。
+        maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: 类型 ''{2}'' 错误。maxInclusive 值 ''{0}'' 必须小于基类型 ''{1}'' 的 maxExclusive。
+        maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: 类型 ''{2}'' 错误。maxInclusive 值 ''{0}'' 必须大于等于基类型 ''{1}'' 的 minInclusive。
+        maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: 类型 ''{2}'' 错误。maxInclusive 值 ''{0}'' 必须大于基类型 ''{1}'' 的 minExclusive。
+        maxLength-valid-restriction = maxLength-valid-restriction: 在 {2} 的定义中, maxLength 值 ''{0}'' 必须小于等于基类型 ''{1}'' 的 maxLength。
+        mg-props-correct.2 = mg-props-correct.2: 在组 ''{0}'' 中检测到循环定义。递归跟随粒子的 '{'term'}' 以下值会引导到其 '{'term'}' 是组自身的粒子。
+        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: 在 {2} 的定义中, minExclusive 值 ''{0}'' 必须小于等于 maxExclusive 值 ''{1}''。
+        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: 在 {2} 的定义中, minExclusive 值 ''{0}'' 必须小于 maxInclusive 值 ''{1}''。
+        minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: 类型 ''{2}'' 错误。minExclusive 值 ''{0}'' 必须大于等于基类型 ''{1}'' 的 minExclusive。
+        minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2: 类型 ''{2}'' 错误。minExclusive 值 ''{0}'' 必须小于等于基类型 ''{1}'' 的 maxInclusive。
+        minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3: 类型 ''{2}'' 错误。minExclusive 值 ''{0}'' 必须大于等于基类型 ''{1}'' 的 minInclusive。
+        minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: 类型 ''{2}'' 错误。minExclusive 值 ''{0}'' 必须小于基类型 ''{1}'' 的 maxExclusive。
+        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: 在 {2} 的定义中, minInclusive 值 ''{0}'' 必须小于等于 maxInclusive 值 ''{1}''。
+        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: 在 {2} 的定义中, minInclusive 值 ''{0}'' 必须小于 maxExclusive 值 ''{1}''。
+        minInclusive-minExclusive = minInclusive-minExclusive: 为同一个数据类型同时指定 minInclusive 和 minExclusive 是错误的。在 {2} 中, minInclusive = ''{0}'' 并且 minExclusive = ''{1}''。
+        minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: 类型 ''{2}'' 错误。minInclusive 值 ''{0}'' 必须大于等于基类型 ''{1}'' 的 minInclusive。
+        minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: 类型 ''{2}'' 错误。minInclusive 值 ''{0}'' 必须小于等于基类型 ''{1}'' 的 maxInclusive。
+        minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: 类型 ''{2}'' 错误。minInclusive 值 ''{0}'' 必须大于基类型 ''{1}'' 的 minExclusive。
+        minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: 类型 ''{2}'' 错误。minInclusive 值 ''{0}'' 必须小于基类型 ''{1}'' 的 maxExclusive。
+        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: 在 {2} 的定义中, minLength 的值 ''{0}'' 必须小于 maxLength 的值 ''{1}''。
+        minLength-valid-restriction = minLength-valid-restriction: 在 {2} 的定义中, minLength ''{0}'' 必须大于等于基类型的 minLength ''{1}''。
+        no-xmlns = no-xmlns: 属性声明的 {name} 不能与 'xmlns' 匹配。
+        no-xsi = no-xsi: 属性声明的 '{'target namespace'}' 不能与 ''{0}'' 匹配。
+        p-props-correct.2.1 = p-props-correct.2.1: 在 ''{0}'' 的声明中, ''minOccurs'' 的值为 ''{1}'', 但该值不能大于 ''maxOccurs'' 的值 ''{2}''。
+        rcase-MapAndSum.1 = rcase-MapAndSum.1: 粒子之间没有完整的功能映射。
+        rcase-MapAndSum.2 = rcase-MapAndSum.2: 组的发生范围 ({0},{1}) 不在基组的发生范围 ({2},{3}) 的有效限制之内。
+        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: 元素的名称和目标名称空间不相同: 名称空间 ''{1}'' 中的元素为 ''{0}'', 名称空间 ''{3}'' 中的元素为 ''{2}''。
+        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: 其 '{'term'}' 为元素声明 ''{0}'' 的粒子错误。元素声明的 '{'nillable'}' 为“真”, 但基类型中对应的粒子具有 '{'nillable'}' 为“假”的元素声明。
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3：其 '{'term'}' 为元素声明 ''{0}'' 的粒子错误。该粒子的发生范围 ({1},{2}) 不在基类型中对应粒子的范围 ({3},{4}) 的有效限制之内。
+        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: 元素 ''{0}'' 不是固定的, 但基类型中的对应元素是固定的, 且值为 ''{1}''。
+        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: 元素 ''{0}'' 是固定的, 且值为 ''{1}'', 但基类型中的对应元素是固定的, 且值为 ''{2}''。
+        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: 元素 ''{0}'' 的身份约束条件不是基类型中那些身份约束条件的子集。
+        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: 元素 ''{0}'' 的不接受替代不是基元素中不接受替代的超集。
+        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: 元素 ''{0}'' 的类型 ''{1}'' 不是从基元素的类型 ''{2}'' 派生的。
+        rcase-NSCompat.1 = rcase-NSCompat.1: 元素 ''{0}'' 具有名称空间 ''{1}'', 在基元素中, 通配符不允许具有此名称空间。
+        rcase-NSCompat.2 = rcase-NSCompat.2：其 '{'term'}' 为元素声明 ''{0}'' 的粒子错误。该粒子的发生范围 ({1},{2}) 不在基类型中对应粒子的范围 ({3},{4}) 的有效限制之内。
+        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: 粒子之间没有完整的功能映射。
+        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: 组的发生范围 ({0},{1}) 不在基本通配符范围 ({2},{3}) 的有效限制之内。
+        rcase-NSSubset.1 = rcase-NSSubset.1: 通配符不是基本通配符中对应通配符的子集。
+        rcase-NSSubset.2 = rcase-NSSubset.2: 通配符的发生范围 ({0},{1}) 不在基本通配符中发生范围 ({2},{3}) 的有效限制之内。
+        rcase-NSSubset.3 = rcase-NSSubset.3: 通配符的流程内容 ''{0}'' 弱于基本通配符中的流程内容 ''{1}''。
+        rcase-Recurse.1 = rcase-Recurse.1: 组的发生范围 ({0},{1}) 不在基组的发生范围 ({2},{3}) 的有效限制之内。
+        rcase-Recurse.2 = rcase-Recurse.2: 粒子之间没有完整的功能映射。
+        rcase-RecurseLax.1 = rcase-RecurseLax.1: 组的发生范围 ({0},{1}) 不在基组的发生范围 ({2},{3}) 的有效限制之内。
+        rcase-RecurseLax.2 = rcase-RecurseLax.2: 粒子之间没有完整的功能映射。
+        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: 组的发生范围 ({0},{1}) 不在基组的发生范围 ({2},{3}) 的有效限制之内。
+        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: 粒子之间没有完整的功能映射。
 #        We're using sch-props-correct.2 instead of the old src-redefine.1
 #        src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
-        sch-props-correct.2 = sch-props-correct.2: \u65B9\u6848\u4E0D\u80FD\u5305\u542B\u5177\u6709\u76F8\u540C\u540D\u79F0\u7684\u4E24\u4E2A\u5168\u5C40\u7EC4\u4EF6; \u800C\u6B64\u65B9\u6848\u4E2D\u5305\u542B\u4E24\u4E2A ''{0}''\u3002
-        st-props-correct.2 = st-props-correct.2: \u5728\u7B80\u5355\u7C7B\u578B ''{0}'' \u4E2D\u68C0\u6D4B\u5230\u5FAA\u73AF\u5B9A\u4E49\u3002\u8FD9\u8868\u793A ''{0}'' \u5305\u542B\u5728\u5176\u81EA\u8EAB\u7684\u7C7B\u578B\u5206\u5C42\u7ED3\u6784\u4E2D, \u8FD9\u662F\u9519\u8BEF\u7684\u3002
-        st-props-correct.3 = st-props-correct.3: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002'{'base type definition'}' \u7684 '{'final'}' \u7684\u503C ''{1}'' \u7981\u6B62\u7531\u9650\u5236\u6D3E\u751F\u3002
-        totalDigits-valid-restriction = totalDigits-valid-restriction: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''totalDigits'' \u7684\u503C ''{0}'' \u65E0\u6548, \u56E0\u4E3A\u8BE5\u503C\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E ''totalDigits'' \u7684\u503C, \u800C\u5728\u539F\u7EA7\u7C7B\u578B\u4E4B\u4E00\u4E2D\u5DF2\u5C06\u5176\u8BBE\u7F6E\u4E3A ''{1}''\u3002
-        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: \u5728 {0} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''whitespace'' \u7684\u503C ''{1}'' \u65E0\u6548, \u56E0\u4E3A ''whitespace'' \u7684\u503C\u5DF2\u5728\u539F\u7EA7\u7C7B\u578B\u4E4B\u4E00\u4E2D\u8BBE\u7F6E\u4E3A ''collapse''\u3002
-        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: \u5728 {0} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''whitespace'' \u7684\u503C ''preserve'' \u65E0\u6548, \u56E0\u4E3A ''whitespace'' \u7684\u503C\u5DF2\u5728\u539F\u7EA7\u7C7B\u578B\u4E4B\u4E00\u4E2D\u8BBE\u7F6E\u4E3A ''replace''\u3002
+        sch-props-correct.2 = sch-props-correct.2: 方案不能包含具有相同名称的两个全局组件; 而此方案中包含两个 ''{0}''。
+        st-props-correct.2 = st-props-correct.2: 在简单类型 ''{0}'' 中检测到循环定义。这表示 ''{0}'' 包含在其自身的类型分层结构中, 这是错误的。
+        st-props-correct.3 = st-props-correct.3: 类型 ''{0}'' 错误。'{'base type definition'}' 的 '{'final'}' 的值 ''{1}'' 禁止由限制派生。
+        totalDigits-valid-restriction = totalDigits-valid-restriction: 在 {2} 的定义中, 面 ''totalDigits'' 的值 ''{0}'' 无效, 因为该值必须小于等于 ''totalDigits'' 的值, 而在原级类型之一中已将其设置为 ''{1}''。
+        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: 在 {0} 的定义中, 面 ''whitespace'' 的值 ''{1}'' 无效, 因为 ''whitespace'' 的值已在原级类型之一中设置为 ''collapse''。
+        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: 在 {0} 的定义中, 面 ''whitespace'' 的值 ''preserve'' 无效, 因为 ''whitespace'' 的值已在原级类型之一中设置为 ''replace''。
 
 #schema for Schemas
 
-        s4s-att-invalid-value = s4s-att-invalid-value: \u5143\u7D20 ''{0}'' \u4E2D ''{1}'' \u7684\u5C5E\u6027\u503C\u65E0\u6548\u3002\u8BB0\u5F55\u7684\u539F\u56E0: {2}
-        s4s-att-must-appear = s4s-att-must-appear: \u5143\u7D20 ''{0}'' \u4E2D\u5FC5\u987B\u5305\u542B\u5C5E\u6027 ''{1}''\u3002
-        s4s-att-not-allowed = s4s-att-not-allowed: \u5143\u7D20 ''{0}'' \u4E2D\u4E0D\u80FD\u5305\u542B\u5C5E\u6027 ''{1}''\u3002
-        s4s-elt-invalid = s4s-elt-invalid: \u5143\u7D20 ''{0}'' \u4E0D\u662F\u65B9\u6848\u6587\u6863\u4E2D\u7684\u6709\u6548\u5143\u7D20\u3002
-        s4s-elt-must-match.1 = s4s-elt-must-match.1: ''{0}'' \u7684\u5185\u5BB9\u5FC5\u987B\u4E0E {1} \u5339\u914D\u3002\u53D1\u73B0\u95EE\u9898, \u5F00\u59CB\u4E8E: {2}\u3002
-        s4s-elt-must-match.2 = s4s-elt-must-match.2: ''{0}'' \u7684\u5185\u5BB9\u5FC5\u987B\u4E0E {1} \u5339\u914D\u3002\u627E\u4E0D\u5230\u8DB3\u591F\u7684\u5143\u7D20\u3002
+        s4s-att-invalid-value = s4s-att-invalid-value: 元素 ''{0}'' 中 ''{1}'' 的属性值无效。记录的原因: {2}
+        s4s-att-must-appear = s4s-att-must-appear: 元素 ''{0}'' 中必须包含属性 ''{1}''。
+        s4s-att-not-allowed = s4s-att-not-allowed: 元素 ''{0}'' 中不能包含属性 ''{1}''。
+        s4s-elt-invalid = s4s-elt-invalid: 元素 ''{0}'' 不是方案文档中的有效元素。
+        s4s-elt-must-match.1 = s4s-elt-must-match.1: ''{0}'' 的内容必须与 {1} 匹配。发现问题, 开始于: {2}。
+        s4s-elt-must-match.2 = s4s-elt-must-match.2: ''{0}'' 的内容必须与 {1} 匹配。找不到足够的元素。
         # the "invalid-content" messages provide less information than the "must-match" counterparts above. They're used for complex types when providing a "match" would be an information dump
-        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: ''{0}'' \u7684\u5185\u5BB9\u65E0\u6548\u3002\u5143\u7D20 ''{1}'' \u65E0\u6548, \u6240\u653E\u4F4D\u7F6E\u9519\u8BEF\u6216\u51FA\u73B0\u6B21\u6570\u8FC7\u591A\u3002
-        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: ''{0}'' \u7684\u5185\u5BB9\u65E0\u6548\u3002\u5143\u7D20 ''{1}'' \u4E0D\u80FD\u4E3A\u7A7A\u3002
-        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: \u7C7B\u578B\u4E3A ''{0}'' \u7684\u5143\u7D20\u4E0D\u80FD\u5728\u58F0\u660E\u7684\u540E\u9762\u4F5C\u4E3A <schema> \u5143\u7D20\u7684\u5B50\u7EA7\u51FA\u73B0\u3002
-        s4s-elt-schema-ns = s4s-elt-schema-ns: \u5143\u7D20 ''{0}'' \u7684\u540D\u79F0\u7A7A\u95F4\u5FC5\u987B\u6765\u81EA\u65B9\u6848\u540D\u79F0\u7A7A\u95F4 ''http://www.w3.org/2001/XMLSchema''\u3002
-        s4s-elt-character = s4s-elt-character: \u65B9\u6848\u5143\u7D20\u4E2D\u4E0D\u5141\u8BB8\u51FA\u73B0\u9664 ''xs:appinfo'' \u548C ''xs:documentation'' \u4E4B\u5916\u7684\u975E\u7A7A\u683C\u5B57\u7B26\u3002\u53D1\u73B0\u4E86 ''{0}''\u3002
+        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: ''{0}'' 的内容无效。元素 ''{1}'' 无效, 所放位置错误或出现次数过多。
+        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: ''{0}'' 的内容无效。元素 ''{1}'' 不能为空。
+        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: 类型为 ''{0}'' 的元素不能在声明的后面作为 <schema> 元素的子级出现。
+        s4s-elt-schema-ns = s4s-elt-schema-ns: 元素 ''{0}'' 的名称空间必须来自方案名称空间 ''http://www.w3.org/2001/XMLSchema''。
+        s4s-elt-character = s4s-elt-character: 方案元素中不允许出现除 ''xs:appinfo'' 和 ''xs:documentation'' 之外的非空格字符。发现了 ''{0}''。
 
 # codes not defined by the spec
 
-        c-fields-xpaths = c-fields-xpaths: \u5B57\u6BB5\u503C ''{0}'' \u65E0\u6548\u3002
-        c-general-xpath = c-general-xpath: \u8868\u8FBE\u5F0F ''{0}'' \u4E0E XML \u65B9\u6848\u6240\u652F\u6301\u7684 XPath \u5B50\u96C6\u4E0D\u5339\u914D\u3002
-        c-general-xpath-ns = c-general-xpath-ns: XPath \u8868\u8FBE\u5F0F ''{0}'' \u4E2D\u7684\u540D\u79F0\u7A7A\u95F4\u524D\u7F00\u672A\u7ED1\u5B9A\u5230\u540D\u79F0\u7A7A\u95F4\u3002
-        c-selector-xpath = c-selector-xpath: \u9009\u62E9\u5668\u503C ''{0}'' \u65E0\u6548; \u9009\u62E9\u5668 xpath \u4E0D\u80FD\u5305\u542B\u5C5E\u6027\u3002
-        EmptyTargetNamespace = EmptyTargetNamespace: \u5728\u65B9\u6848\u6587\u6863 ''{0}'' \u4E2D, ''targetNamespace'' \u5C5E\u6027\u7684\u503C\u4E0D\u80FD\u4E3A\u7A7A\u5B57\u7B26\u4E32\u3002
-        FacetValueFromBase = FacetValueFromBase: \u5728\u7C7B\u578B ''{0}'' \u7684\u58F0\u660E\u4E2D, \u9762 ''{2}'' \u7684\u503C ''{1}'' \u5FC5\u987B\u6765\u81EA\u57FA\u7C7B\u578B\u7684\u503C\u7A7A\u95F4 ''{3}''\u3002
-        FixedFacetValue = FixedFacetValue: \u5728 {3} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''{0}'' \u7684\u503C ''{1}'' \u65E0\u6548, \u56E0\u4E3A ''{0}'' \u7684\u503C\u5DF2\u5728\u539F\u7EA7\u7C7B\u578B\u4E4B\u4E00\u4E2D\u8BBE\u7F6E\u4E3A ''{2}'', \u5E76\u4E14 '{'fixed'}' = true\u3002
-        InvalidRegex = InvalidRegex\uFF1A\u6A21\u5F0F\u503C ''{0}'' \u4E0D\u662F\u6709\u6548\u7684\u6B63\u5219\u8868\u8FBE\u5F0F\u3002\u62A5\u544A\u7684\u9519\u8BEF\u4E3A\uFF1A''{1}''\u3002
-        MaxOccurLimit = \u89E3\u6790\u5668\u7684\u5F53\u524D\u914D\u7F6E\u4E0D\u5141\u8BB8\u5C06\u590D\u6742\u7C7B\u578B\u7684\u5185\u5BB9\u6A21\u578B\u6269\u5C55\u5230\u5305\u542B {0} \u4E2A\u4EE5\u4E0A\u8282\u70B9\u3002
-        PublicSystemOnNotation = PublicSystemOnNotation: \u5143\u7D20 ''notation'' \u4E2D\u5FC5\u987B\u81F3\u5C11\u51FA\u73B0 ''public'' \u548C ''system'' \u4E2D\u7684\u4E00\u4E2A\u3002
-        SchemaLocation = SchemaLocation: schemaLocation \u503C ''{0}'' \u5FC5\u987B\u5177\u6709\u5076\u6570\u4E2A URI\u3002
-        TargetNamespace.1 = TargetNamespace.1: \u5E94\u4E3A\u540D\u79F0\u7A7A\u95F4 ''{0}'', \u4F46\u65B9\u6848\u6587\u6863\u7684\u76EE\u6807\u540D\u79F0\u7A7A\u95F4\u4E3A ''{1}''\u3002
-        TargetNamespace.2 = TargetNamespace.2: \u4E0D\u9700\u8981\u540D\u79F0\u7A7A\u95F4, \u4F46\u6B64\u65B9\u6848\u6587\u6863\u7684\u76EE\u6807\u540D\u79F0\u7A7A\u95F4\u4E3A ''{1}''\u3002
-        UndeclaredEntity = UndeclaredEntity: \u672A\u58F0\u660E\u5B9E\u4F53 ''{0}''\u3002
-        UndeclaredPrefix = UndeclaredPrefix: \u65E0\u6CD5\u5C06 ''{0}'' \u89E3\u6790\u4E3A\u9650\u5B9A\u540D: \u672A\u58F0\u660E\u524D\u7F00 ''{1}''\u3002
-        FacetsContradict = FacetsContradict\uFF1A\u5BF9\u4E8E simpleType \u5B9A\u4E49 ''{2}''\uFF0C\u679A\u4E3E\u503C ''{0}'' \u4E0E ''{1}'' \u9762\u7684\u503C\u51B2\u7A81\u3002
+        c-fields-xpaths = c-fields-xpaths: 字段值 ''{0}'' 无效。
+        c-general-xpath = c-general-xpath: 表达式 ''{0}'' 与 XML 方案所支持的 XPath 子集不匹配。
+        c-general-xpath-ns = c-general-xpath-ns: XPath 表达式 ''{0}'' 中的名称空间前缀未绑定到名称空间。
+        c-selector-xpath = c-selector-xpath: 选择器值 ''{0}'' 无效; 选择器 xpath 不能包含属性。
+        EmptyTargetNamespace = EmptyTargetNamespace: 在方案文档 ''{0}'' 中, ''targetNamespace'' 属性的值不能为空字符串。
+        FacetValueFromBase = FacetValueFromBase: 在类型 ''{0}'' 的声明中, 面 ''{2}'' 的值 ''{1}'' 必须来自基类型的值空间 ''{3}''。
+        FixedFacetValue = FixedFacetValue: 在 {3} 的定义中, 面 ''{0}'' 的值 ''{1}'' 无效, 因为 ''{0}'' 的值已在原级类型之一中设置为 ''{2}'', 并且 '{'fixed'}' = true。
+        InvalidRegex = InvalidRegex：模式值 ''{0}'' 不是有效的正则表达式。报告的错误为：''{1}''。
+        MaxOccurLimit = 解析器的当前配置不允许将复杂类型的内容模型扩展到包含 {0} 个以上节点。
+        PublicSystemOnNotation = PublicSystemOnNotation: 元素 ''notation'' 中必须至少出现 ''public'' 和 ''system'' 中的一个。
+        SchemaLocation = SchemaLocation: schemaLocation 值 ''{0}'' 必须具有偶数个 URI。
+        TargetNamespace.1 = TargetNamespace.1: 应为名称空间 ''{0}'', 但方案文档的目标名称空间为 ''{1}''。
+        TargetNamespace.2 = TargetNamespace.2: 不需要名称空间, 但此方案文档的目标名称空间为 ''{1}''。
+        UndeclaredEntity = UndeclaredEntity: 未声明实体 ''{0}''。
+        UndeclaredPrefix = UndeclaredPrefix: 无法将 ''{0}'' 解析为限定名: 未声明前缀 ''{1}''。
+        FacetsContradict = FacetsContradict：对于 simpleType 定义 ''{2}''，枚举值 ''{0}'' 与 ''{1}'' 面的值冲突。
 
 # JAXP 1.2 schema source property errors
 
-        jaxp12-schema-source-type.1 = ''http://java.sun.com/xml/jaxp/properties/schemaSource'' \u5C5E\u6027\u4E0D\u80FD\u5177\u6709 ''{0}'' \u7C7B\u578B\u7684\u503C\u3002\u53EF\u652F\u6301\u7684\u503C\u7C7B\u578B\u5305\u62EC String, File, InputStream, InputSource \u6216\u8FD9\u4E9B\u7C7B\u578B\u7684\u6570\u7EC4\u3002
-        jaxp12-schema-source-type.2 = ''http://java.sun.com/xml/jaxp/properties/schemaSource'' \u5C5E\u6027\u4E0D\u80FD\u5177\u6709 ''{0}'' \u7C7B\u578B\u7684\u6570\u7EC4\u503C\u3002\u53EF\u652F\u6301\u7684\u6570\u7EC4\u7C7B\u578B\u5305\u62EC Object, String, File, InputStream \u548C InputSource\u3002
-        jaxp12-schema-source-ns = \u4F7F\u7528\u5BF9\u8C61\u6570\u7EC4\u4F5C\u4E3A 'http://java.sun.com/xml/jaxp/properties/schemaSource' \u5C5E\u6027\u7684\u503C\u65F6, \u6709\u4E24\u4E2A\u65B9\u6848\u5171\u4EAB\u76F8\u540C\u7684\u76EE\u6807\u540D\u79F0\u7A7A\u95F4\u662F\u975E\u6CD5\u7684\u3002
+        jaxp12-schema-source-type.1 = ''http://java.sun.com/xml/jaxp/properties/schemaSource'' 属性不能具有 ''{0}'' 类型的值。可支持的值类型包括 String, File, InputStream, InputSource 或这些类型的数组。
+        jaxp12-schema-source-type.2 = ''http://java.sun.com/xml/jaxp/properties/schemaSource'' 属性不能具有 ''{0}'' 类型的数组值。可支持的数组类型包括 Object, String, File, InputStream 和 InputSource。
+        jaxp12-schema-source-ns = 使用对象数组作为 'http://java.sun.com/xml/jaxp/properties/schemaSource' 属性的值时, 有两个方案共享相同的目标名称空间是非法的。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties
index 7c6e47ad064..8064ab7f32f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties
@@ -26,303 +26,303 @@
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
-        BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
-        FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
+        BadMessageKey = 找不到對應訊息索引鍵的錯誤訊息。
+        FormatFailed = 格式化下列訊息時發生內部錯誤:\n
 
 # For internal use
 
-        Internal-Error = \u5167\u90E8\u932F\u8AA4: {0}\u3002
-        dt-whitespace = \u806F\u96C6 simpleType ''{0}'' \u6C92\u6709\u53EF\u7528\u7684\u7A7A\u683C Facet \u503C
-        GrammarConflict = \u5F9E\u4F7F\u7528\u8005\u6587\u6CD5\u96C6\u5340\u4E2D\u50B3\u56DE\u7684\u4E00\u500B\u6587\u6CD5\u8207\u5176\u4ED6\u6587\u6CD5\u885D\u7A81\u3002
+        Internal-Error = 內部錯誤: {0}。
+        dt-whitespace = 聯集 simpleType ''{0}'' 沒有可用的空格 Facet 值
+        GrammarConflict = 從使用者文法集區中傳回的一個文法與其他文法衝突。
 
 # Identity constraints
 
-        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: \u5143\u7D20 "{0}" \u6C92\u6709\u91D1\u9470 "{1}" \u7684\u503C\u3002
-        DuplicateField = \u7BC4\u570D\u4E2D\u7684\u6B04\u4F4D "{0}" \u91CD\u8907\u914D\u5C0D\u3002
-        DuplicateKey = cvc-identity-constraint.4.2.2: \u66FF\u5143\u7D20 "{1}" \u7684\u8B58\u5225\u9650\u5236\u689D\u4EF6 "{2}" \u5BA3\u544A\u4E86\u91CD\u8907\u7684\u91D1\u9470\u503C [{0}]\u3002
-        DuplicateUnique = cvc-identity-constraint.4.1: \u66FF\u5143\u7D20 "{1}" \u7684\u8B58\u5225\u9650\u5236\u689D\u4EF6 "{2}" \u5BA3\u544A\u4E86\u91CD\u8907\u7684\u552F\u4E00\u503C [{0}]\u3002
-        FieldMultipleMatch = cvc-identity-constraint.3: \u8B58\u5225\u9650\u5236\u689D\u4EF6 "{1}" \u7684\u6B04\u4F4D "{0}" \u7B26\u5408\u5176\u9078\u53D6\u5668\u7BC4\u570D\u5167\u7684\u591A\u500B\u503C; \u6B04\u4F4D\u5FC5\u9808\u7B26\u5408\u552F\u4E00\u503C\u3002
-        FixedDiffersFromActual = \u6B64\u5143\u7D20\u7684\u5167\u5BB9\u4E0D\u7B49\u65BC\u7DB1\u8981\u5143\u7D20\u5BA3\u544A\u4E2D "fixed" \u5C6C\u6027\u7684\u503C\u3002
-        KeyMatchesNillable = cvc-identity-constraint.4.2.3: \u5143\u7D20 "{0}" \u7684\u91D1\u9470 "{1}" \u7B26\u5408 nillable \u8A2D\u70BA true \u7684\u5143\u7D20\u3002
-        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: \u672A\u66FF\u91DD\u5C0D\u5143\u7D20 "{0}" \u6307\u5B9A\u7684 <key name="{1}"> \u8B58\u5225\u9650\u5236\u689D\u4EF6\u6307\u5B9A\u8DB3\u5920\u7684\u503C\u3002
-        KeyNotFound = cvc-identity-constraint.4.3: \u627E\u4E0D\u5230\u5143\u7D20 ''{2}'' \u8B58\u5225\u9650\u5236\u689D\u4EF6\u4E4B\u503C\u70BA ''{1}'' \u7684\u91D1\u9470 ''{0}''\u3002
-        KeyRefOutOfScope = \u8B58\u5225\u9650\u5236\u689D\u4EF6\u932F\u8AA4: \u8B58\u5225\u9650\u5236\u689D\u4EF6 "{0}" \u5177\u6709\u4E00\u500B keyref\uFF0C\u5B83\u53C3\u7167\u4E86\u7BC4\u570D\u4E4B\u5916\u7684\u91D1\u9470\u6216\u552F\u4E00\u503C\u3002
-        KeyRefReferNotFound = \u91D1\u9470\u53C3\u7167\u5BA3\u544A "{0}" \u53C3\u7167\u4E86\u540D\u7A31\u70BA "{1}" \u7684\u4E0D\u660E\u91D1\u9470\u3002
-        UnknownField = \u5167\u90E8\u8B58\u5225\u9650\u5236\u689D\u4EF6\u932F\u8AA4; \u66FF\u5143\u7D20 "{1}" \u6307\u5B9A\u4E86\u8B58\u5225\u9650\u5236\u689D\u4EF6 "{2}" \u7684\u4E0D\u660E\u6B04\u4F4D "{0}"\u3002
+        AbsentKeyValue = cvc-identity-constraint.4.2.1.a: 元素 "{0}" 沒有金鑰 "{1}" 的值。
+        DuplicateField = 範圍中的欄位 "{0}" 重複配對。
+        DuplicateKey = cvc-identity-constraint.4.2.2: 替元素 "{1}" 的識別限制條件 "{2}" 宣告了重複的金鑰值 [{0}]。
+        DuplicateUnique = cvc-identity-constraint.4.1: 替元素 "{1}" 的識別限制條件 "{2}" 宣告了重複的唯一值 [{0}]。
+        FieldMultipleMatch = cvc-identity-constraint.3: 識別限制條件 "{1}" 的欄位 "{0}" 符合其選取器範圍內的多個值; 欄位必須符合唯一值。
+        FixedDiffersFromActual = 此元素的內容不等於綱要元素宣告中 "fixed" 屬性的值。
+        KeyMatchesNillable = cvc-identity-constraint.4.2.3: 元素 "{0}" 的金鑰 "{1}" 符合 nillable 設為 true 的元素。
+        KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: 未替針對元素 "{0}" 指定的 <key name="{1}"> 識別限制條件指定足夠的值。
+        KeyNotFound = cvc-identity-constraint.4.3: 找不到元素 ''{2}'' 識別限制條件之值為 ''{1}'' 的金鑰 ''{0}''。
+        KeyRefOutOfScope = 識別限制條件錯誤: 識別限制條件 "{0}" 具有一個 keyref，它參照了範圍之外的金鑰或唯一值。
+        KeyRefReferNotFound = 金鑰參照宣告 "{0}" 參照了名稱為 "{1}" 的不明金鑰。
+        UnknownField = 內部識別限制條件錯誤; 替元素 "{1}" 指定了識別限制條件 "{2}" 的不明欄位 "{0}"。
 
 # Ideally, we should only use the following error keys, not the ones under
 # "Identity constraints". And we should cover all of the following errors.
 
 #validation (3.X.4)
 
-        cvc-attribute.3 = cvc-attribute.3: \u5143\u7D20 ''{0}'' \u4E0A\u5C6C\u6027 ''{1}'' \u7684\u503C ''{2}'' \u5C0D\u65BC\u5176\u985E\u578B ''{3}'' \u7121\u6548\u3002
-        cvc-attribute.4 = cvc-attribute.4: \u5143\u7D20 ''{0}'' \u4E0A\u5C6C\u6027 ''{1}'' \u7684\u503C ''{2}'' \u5C0D\u65BC\u5176\u56FA\u5B9A '{'value constraint'}' \u7121\u6548\u3002\u5C6C\u6027\u5FC5\u9808\u5177\u6709 ''{3}'' \u7684\u503C\u3002
-        cvc-complex-type.2.1 = cvc-complex-type.2.1: \u5143\u7D20 ''{0}'' \u4E0D\u80FD\u6709\u5B57\u5143\u6216\u5143\u7D20\u8CC7\u8A0A\u9805\u76EE [children]\uFF0C\u56E0\u70BA\u985E\u578B\u7684\u5167\u5BB9\u985E\u578B\u70BA\u7A7A\u767D\u3002
-        cvc-complex-type.2.2 = cvc-complex-type.2.2: \u5143\u7D20 ''{0}'' \u4E0D\u80FD\u6709\u5143\u7D20 [children]\uFF0C\u4E14\u503C\u5FC5\u9808\u6709\u6548\u3002
-        cvc-complex-type.2.3 = cvc-complex-type.2.3: \u5143\u7D20 ''{0}'' \u4E0D\u80FD\u6709\u5B57\u5143 [children]\uFF0C\u56E0\u70BA\u985E\u578B\u7684\u5167\u5BB9\u985E\u578B\u70BA element-only\u3002
-        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: \u5F9E\u5143\u7D20 ''{0}'' \u958B\u59CB\u627E\u5230\u7121\u6548\u7684\u5167\u5BB9\u3002\u9810\u671F\u4E00\u500B ''{1}''\u3002
-        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: \u5143\u7D20 ''{0}'' \u7684\u5167\u5BB9\u4E0D\u5B8C\u6574\u3002\u9810\u671F\u4E00\u500B ''{1}''\u3002
-        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: \u56B4\u683C\u6BD4\u5C0D\u842C\u7528\u5B57\u5143\uFF0C\u4F46\u662F\u627E\u4E0D\u5230\u5143\u7D20 ''{0}'' \u7684\u5BA3\u544A\u3002
-        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: \u5F9E\u5143\u7D20 ''{0}'' \u958B\u59CB\u627E\u5230\u7121\u6548\u7684\u5167\u5BB9\u3002\u6B64\u8655\u672A\u9810\u671F\u5B50\u9805\u5143\u7D20\u3002
-        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: \u5F9E\u5143\u7D20 ''{0}'' \u958B\u59CB\u627E\u5230\u7121\u6548\u7684\u5167\u5BB9\u3002\u6B64\u8655\u672A\u9810\u671F\u5B50\u9805\u5143\u7D20 ''{1}''\u3002
-        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' \u5728\u76EE\u524D\u7684\u5E8F\u5217\u4E2D\u6700\u591A\u53EF\u4EE5\u51FA\u73FE ''{2}'' \u6B21\u3002\u5DF2\u8D85\u904E\u6B64\u9650\u5236\u3002\u6B64\u8655\u9810\u671F\u8981\u6709 ''{1}'' \u5176\u4E2D\u4E4B\u4E00\u3002
-        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' \u5728\u76EE\u524D\u7684\u5E8F\u5217\u4E2D\u6700\u591A\u53EF\u4EE5\u51FA\u73FE ''{1}'' \u6B21\u3002\u5DF2\u8D85\u904E\u6B64\u9650\u5236\u3002\u6B64\u8655\u4E0D\u61C9\u6709\u5B50\u9805\u5143\u7D20\u3002
-        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: \u767C\u73FE\u4EE5\u5143\u7D20 ''{0}'' \u70BA\u958B\u982D\u7684\u7121\u6548\u5167\u5BB9\u3002''{1}'' \u5728\u76EE\u524D\u7684\u5E8F\u5217\u4E2D\u61C9\u8A72\u6700\u5C11\u8981\u51FA\u73FE ''{2}'' \u6B21\u3002\u9084\u9700\u8981\u518D\u51FA\u73FE\u4E00\u6B21\u624D\u80FD\u6EFF\u8DB3\u6B64\u9650\u5236\u689D\u4EF6\u3002
-        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: \u767C\u73FE\u4EE5\u5143\u7D20 ''{0}'' \u70BA\u958B\u982D\u7684\u7121\u6548\u5167\u5BB9\u3002''{1}'' \u5728\u76EE\u524D\u7684\u5E8F\u5217\u4E2D\u61C9\u8A72\u6700\u5C11\u8981\u51FA\u73FE ''{2}'' \u6B21\u3002\u9084\u9700\u8981\u518D\u51FA\u73FE ''{3}'' \u6B21\u624D\u80FD\u6EFF\u8DB3\u6B64\u9650\u5236\u689D\u4EF6\u3002
-        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: \u5143\u7D20 ''{0}'' \u7684\u5167\u5BB9\u4E0D\u5B8C\u6574\u3002''{1}'' \u61C9\u8A72\u6700\u5C11\u8981\u51FA\u73FE ''{2}'' \u6B21\u3002\u9084\u9700\u8981\u518D\u51FA\u73FE\u4E00\u6B21\u624D\u80FD\u6EFF\u8DB3\u6B64\u9650\u5236\u689D\u4EF6\u3002
-        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: \u5143\u7D20 ''{0}'' \u7684\u5167\u5BB9\u4E0D\u5B8C\u6574\u3002''{1}'' \u61C9\u8A72\u6700\u5C11\u8981\u51FA\u73FE ''{2}'' \u6B21\u3002\u9084\u9700\u8981\u518D\u51FA\u73FE ''{3}'' \u6B21\u624D\u80FD\u6EFF\u8DB3\u6B64\u9650\u5236\u689D\u4EF6\u3002
-        cvc-complex-type.3.1 = cvc-complex-type.3.1: \u5143\u7D20 ''{0}'' \u5C6C\u6027 ''{1}'' \u7684\u503C ''{2}'' \u5C0D\u65BC\u5C6C\u6027\u4F7F\u7528\u7121\u6548\u3002\u5C6C\u6027 ''{1}'' \u5177\u6709 ''{3}'' \u7684\u56FA\u5B9A\u503C\u3002
-        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: \u5143\u7D20 ''{0}'' \u6C92\u6709\u5C6C\u6027 ''{1}'' \u7684\u5C6C\u6027\u842C\u7528\u5B57\u5143\u3002
-        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: \u4E0D\u5141\u8A31\u5C6C\u6027 ''{1}'' \u51FA\u73FE\u5728\u5143\u7D20 ''{0}'' \u4E2D\u3002
-        cvc-complex-type.4 = cvc-complex-type.4: \u5C6C\u6027 ''{1}'' \u5FC5\u9808\u51FA\u73FE\u5728\u5143\u7D20 ''{0}'' \u4E2D\u3002
-        cvc-complex-type.5.1 = cvc-complex-type.5.1: \u5728\u5143\u7D20 ''{0}'' \u4E2D\uFF0C\u5C6C\u6027 ''{1}'' \u70BA Wild ID\u3002\u4F46\u662F\u5DF2\u7D93\u6709\u4E00\u500B Wild ID ''{2}''\u3002\u53EA\u80FD\u6709\u4E00\u500B Wild ID\u3002
-        cvc-complex-type.5.2 = cvc-complex-type.5.2: \u5728\u5143\u7D20 ''{0}'' \u4E2D\uFF0C\u5C6C\u6027 ''{1}'' \u70BA Wild ID\u3002\u4F46\u662F\u5DF2\u7D93\u6709\u4E00\u500B\u5F9E '{'attribute uses'}' \u4E2D\u7684 ID \u884D\u751F\u800C\u4F86\u7684\u5C6C\u6027 ''{2}''\u3002
-        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' \u4E0D\u662F ''{1}'' \u7684\u6709\u6548\u503C\u3002
-        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' \u4E0D\u662F\u6E05\u55AE\u985E\u578B ''{1}'' \u7684\u6709\u6548\u503C\u3002
-        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' \u4E0D\u662F\u806F\u96C6\u985E\u578B ''{1}'' \u7684\u6709\u6548\u503C\u3002
-        cvc-elt.1.a = cvc-elt.1.a: \u627E\u4E0D\u5230\u5143\u7D20 ''{0}'' \u7684\u5BA3\u544A\u3002
-        cvc-elt.1.b = cvc-elt.1.b: \u5143\u7D20\u7684\u540D\u7A31\u4E0D\u7B26\u5408\u5143\u7D20\u5BA3\u544A\u7684\u540D\u7A31\u3002\u767C\u73FE\u7684\u662F ''{0}''\u3002\u9810\u671F\u61C9\u70BA ''{1}''\u3002
-        cvc-elt.2 = cvc-elt.2: ''{0}'' \u5143\u7D20\u5BA3\u544A\u4E2D '{'abstract'}' \u7684\u503C\u5FC5\u9808\u70BA\u507D\u3002
-        cvc-elt.3.1 = cvc-elt.3.1: \u5C6C\u6027 ''{1}'' \u4E0D\u53EF\u51FA\u73FE\u5728\u5143\u7D20 ''{0}'' \u4E2D\uFF0C\u56E0\u70BA ''{0}'' \u7684 '{'nillable'}' \u5C6C\u6027\u70BA\u507D\u3002
-        cvc-elt.3.2.1 = cvc-elt.3.2.1: \u5143\u7D20 ''{0}'' \u4E0D\u53EF\u6709\u5B57\u5143\u6216\u5143\u7D20\u8CC7\u8A0A [children]\uFF0C\u56E0\u70BA\u6307\u5B9A\u4E86 ''{1}''\u3002
-        cvc-elt.3.2.2 = cvc-elt.3.2.2: \u5143\u7D20 ''{0}'' \u4E0D\u53EF\u6709\u56FA\u5B9A\u7684 '{'value constraint'}'\uFF0C\u56E0\u70BA\u6307\u5B9A\u4E86 ''{1}''\u3002
-        cvc-elt.4.1 = cvc-elt.4.1: \u5143\u7D20 ''{0}'' \u5C6C\u6027 ''{1}'' \u7684\u503C ''{2}'' \u4E0D\u662F\u6709\u6548\u7684 QName\u3002
-        cvc-elt.4.2 = cvc-elt.4.2: \u7121\u6CD5\u5C07 ''{1}'' \u89E3\u6790\u70BA\u5143\u7D20 ''{0}'' \u7684\u985E\u578B\u5B9A\u7FA9\u3002
-        cvc-elt.4.3 = cvc-elt.4.3: \u985E\u578B ''{1}'' \u4E0D\u662F\u6709\u6548\u884D\u751F\u81EA\u5143\u7D20 ''{0}'' \u7684\u985E\u578B\u5B9A\u7FA9 ''{2}''\u3002
-        cvc-elt.5.1.1 = cvc-elt.5.1.1: \u5143\u7D20 ''{0}'' \u7684 '{'value constraint'}' ''{2}'' \u4E0D\u662F\u985E\u578B ''{1}'' \u7684\u6709\u6548\u9810\u8A2D\u503C\u3002
-        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: \u5143\u7D20 ''{0}'' \u4E0D\u53EF\u6709\u5143\u7D20\u8CC7\u8A0A\u9805\u76EE [children]\u3002
-        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u4E0D\u7B26\u5408\u56FA\u5B9A '{'value constraint'}' \u503C ''{2}''\u3002
-        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u4E0D\u7B26\u5408 '{'value constraint'}' \u503C ''{2}''\u3002
-        cvc-enumeration-valid = cvc-enumeration-valid: \u503C ''{0}'' \u5C0D\u65BC\u5217\u8209 ''{1}'' \u800C\u8A00\u4E26\u975E facet-valid\u3002\u5B83\u5FC5\u9808\u662F\u4F86\u81EA\u5217\u8209\u7684\u503C\u3002
-        cvc-fractionDigits-valid = cvc-fractionDigits-valid: \u503C ''{0}'' \u5177\u6709 {1} \u5206\u6578\u4F4D\u6578\uFF0C\u4F46\u662F\u5206\u6578\u4F4D\u6578\u7684\u6578\u76EE\u9650\u5236\u70BA {2}\u3002
-        cvc-id.1 = cvc-id.1: IDREF ''{0}'' \u6C92\u6709 ID/IDREF \u9023\u7D50\u3002
-        cvc-id.2 = cvc-id.2: \u6709\u591A\u500B ID \u503C ''{0}''\u3002
-        cvc-id.3 = cvc-id.3: \u8B58\u5225\u9650\u5236\u689D\u4EF6 ''{0}'' \u7684\u6B04\u4F4D\u7B26\u5408\u5143\u7D20 ''{1}''\uFF0C\u4F46\u662F\u6B64\u5143\u7D20\u6C92\u6709\u7C21\u55AE\u985E\u578B\u3002
-        cvc-length-valid = cvc-length-valid: \u9577\u5EA6 = ''{1}'' \u7684\u503C ''{0}'' \u5C0D\u65BC\u985E\u578B ''{3}'' \u9577\u5EA6 ''{2}'' \u800C\u8A00\u4E26\u975E facet-valid\u3002
-        cvc-maxExclusive-valid = cvc-maxExclusive-valid: \u503C ''{0}'' \u5C0D\u65BC\u985E\u578B ''{2}'' maxExclusive ''{1}'' \u800C\u8A00\u4E26\u975E facet-valid\u3002
-        cvc-maxInclusive-valid = cvc-maxInclusive-valid: \u503C ''{0}'' \u5C0D\u65BC\u985E\u578B ''{2}'' maxInclusive ''{1}'' \u800C\u8A00\u4E26\u975E facet-valid\u3002
-        cvc-maxLength-valid = cvc-maxLength-valid: \u9577\u5EA6 = ''{1}'' \u7684\u503C ''{0}'' \u5C0D\u65BC\u985E\u578B ''{3}'' maxLength ''{2}'' \u800C\u8A00\u4E26\u975E facet-valid\u3002
-        cvc-minExclusive-valid = cvc-minExclusive-valid: \u503C ''{0}'' \u5C0D\u65BC\u985E\u578B ''{2}'' minExclusive ''{1}'' \u800C\u8A00\u4E26\u975E facet-valid\u3002
-        cvc-minInclusive-valid = cvc-minInclusive-valid: \u503C ''{0}'' \u5C0D\u65BC\u985E\u578B ''{2}'' minInclusive ''{1}'' \u800C\u8A00\u4E26\u975E facet-valid\u3002
-        cvc-minLength-valid = cvc-minLength-valid: \u9577\u5EA6 = ''{1}'' \u7684\u503C ''{0}'' \u5C0D\u65BC\u985E\u578B ''{3}'' minLength ''{2}'' \u800C\u8A00\u4E26\u975E facet-valid\u3002
-        cvc-pattern-valid = cvc-pattern-valid: \u503C ''{0}'' \u5C0D\u65BC\u985E\u578B ''{2}'' \u6A23\u5F0F ''{1}'' \u800C\u8A00\u4E26\u975E facet-valid\u3002
-        cvc-totalDigits-valid = cvc-totalDigits-valid: \u503C ''{0}'' \u5177\u6709 {1} \u7E3D\u4F4D\u6578\uFF0C\u4F46\u662F\u7E3D\u4F4D\u6578\u7684\u6578\u76EE\u9650\u5236\u70BA {2}\u3002
-        cvc-type.1 = cvc-type.1: \u627E\u4E0D\u5230\u985E\u578B\u5B9A\u7FA9 ''{0}''\u3002
-        cvc-type.2 = cvc-type.2: \u5143\u7D20 {0} \u7684\u985E\u578B\u5B9A\u7FA9\u4E0D\u53EF\u70BA\u62BD\u8C61\u3002
-        cvc-type.3.1.1 = cvc-type.3.1.1: \u5143\u7D20 ''{0}'' \u70BA\u7C21\u55AE\u985E\u578B\uFF0C\u56E0\u6B64\u4E0D\u80FD\u6709\u5C6C\u6027\uFF0C\u4F46\u4E0D\u5305\u62EC\u547D\u540D\u7A7A\u9593\u540D\u7A31\u7B49\u65BC ''http://www.w3.org/2001/XMLSchema-instance'' \u8207 [local name] \u70BA ''type''\u3001''nil''\u3001''schemaLocation'' \u6216 ''noNamespaceSchemaLocation'' \u5176\u4E2D\u4E4B\u4E00\u8005\u3002\u4E0D\u904E\uFF0C\u627E\u5230\u5C6C\u6027 ''{1}''\u3002
-        cvc-type.3.1.2 = cvc-type.3.1.2: \u5143\u7D20 ''{0}'' \u70BA\u7C21\u55AE\u985E\u578B\uFF0C\u56E0\u6B64\u4E0D\u53EF\u6709\u5143\u7D20\u8CC7\u8A0A\u9805\u76EE [children]\u3002
-        cvc-type.3.1.3 = cvc-type.3.1.3: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u7121\u6548\u3002
+        cvc-attribute.3 = cvc-attribute.3: 元素 ''{0}'' 上屬性 ''{1}'' 的值 ''{2}'' 對於其類型 ''{3}'' 無效。
+        cvc-attribute.4 = cvc-attribute.4: 元素 ''{0}'' 上屬性 ''{1}'' 的值 ''{2}'' 對於其固定 '{'value constraint'}' 無效。屬性必須具有 ''{3}'' 的值。
+        cvc-complex-type.2.1 = cvc-complex-type.2.1: 元素 ''{0}'' 不能有字元或元素資訊項目 [children]，因為類型的內容類型為空白。
+        cvc-complex-type.2.2 = cvc-complex-type.2.2: 元素 ''{0}'' 不能有元素 [children]，且值必須有效。
+        cvc-complex-type.2.3 = cvc-complex-type.2.3: 元素 ''{0}'' 不能有字元 [children]，因為類型的內容類型為 element-only。
+        cvc-complex-type.2.4.a = cvc-complex-type.2.4.a: 從元素 ''{0}'' 開始找到無效的內容。預期一個 ''{1}''。
+        cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: 元素 ''{0}'' 的內容不完整。預期一個 ''{1}''。
+        cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: 嚴格比對萬用字元，但是找不到元素 ''{0}'' 的宣告。
+        cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: 從元素 ''{0}'' 開始找到無效的內容。此處未預期子項元素。
+        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: 從元素 ''{0}'' 開始找到無效的內容。此處未預期子項元素 ''{1}''。
+        cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' 在目前的序列中最多可以出現 ''{2}'' 次。已超過此限制。此處預期要有 ''{1}'' 其中之一。
+        cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' 在目前的序列中最多可以出現 ''{1}'' 次。已超過此限制。此處不應有子項元素。
+        cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: 發現以元素 ''{0}'' 為開頭的無效內容。''{1}'' 在目前的序列中應該最少要出現 ''{2}'' 次。還需要再出現一次才能滿足此限制條件。
+        cvc-complex-type.2.4.h = cvc-complex-type.2.4.h: 發現以元素 ''{0}'' 為開頭的無效內容。''{1}'' 在目前的序列中應該最少要出現 ''{2}'' 次。還需要再出現 ''{3}'' 次才能滿足此限制條件。
+        cvc-complex-type.2.4.i = cvc-complex-type.2.4.i: 元素 ''{0}'' 的內容不完整。''{1}'' 應該最少要出現 ''{2}'' 次。還需要再出現一次才能滿足此限制條件。
+        cvc-complex-type.2.4.j = cvc-complex-type.2.4.j: 元素 ''{0}'' 的內容不完整。''{1}'' 應該最少要出現 ''{2}'' 次。還需要再出現 ''{3}'' 次才能滿足此限制條件。
+        cvc-complex-type.3.1 = cvc-complex-type.3.1: 元素 ''{0}'' 屬性 ''{1}'' 的值 ''{2}'' 對於屬性使用無效。屬性 ''{1}'' 具有 ''{3}'' 的固定值。
+        cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: 元素 ''{0}'' 沒有屬性 ''{1}'' 的屬性萬用字元。
+        cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: 不允許屬性 ''{1}'' 出現在元素 ''{0}'' 中。
+        cvc-complex-type.4 = cvc-complex-type.4: 屬性 ''{1}'' 必須出現在元素 ''{0}'' 中。
+        cvc-complex-type.5.1 = cvc-complex-type.5.1: 在元素 ''{0}'' 中，屬性 ''{1}'' 為 Wild ID。但是已經有一個 Wild ID ''{2}''。只能有一個 Wild ID。
+        cvc-complex-type.5.2 = cvc-complex-type.5.2: 在元素 ''{0}'' 中，屬性 ''{1}'' 為 Wild ID。但是已經有一個從 '{'attribute uses'}' 中的 ID 衍生而來的屬性 ''{2}''。
+        cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' 不是 ''{1}'' 的有效值。
+        cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' 不是清單類型 ''{1}'' 的有效值。
+        cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' 不是聯集類型 ''{1}'' 的有效值。
+        cvc-elt.1.a = cvc-elt.1.a: 找不到元素 ''{0}'' 的宣告。
+        cvc-elt.1.b = cvc-elt.1.b: 元素的名稱不符合元素宣告的名稱。發現的是 ''{0}''。預期應為 ''{1}''。
+        cvc-elt.2 = cvc-elt.2: ''{0}'' 元素宣告中 '{'abstract'}' 的值必須為偽。
+        cvc-elt.3.1 = cvc-elt.3.1: 屬性 ''{1}'' 不可出現在元素 ''{0}'' 中，因為 ''{0}'' 的 '{'nillable'}' 屬性為偽。
+        cvc-elt.3.2.1 = cvc-elt.3.2.1: 元素 ''{0}'' 不可有字元或元素資訊 [children]，因為指定了 ''{1}''。
+        cvc-elt.3.2.2 = cvc-elt.3.2.2: 元素 ''{0}'' 不可有固定的 '{'value constraint'}'，因為指定了 ''{1}''。
+        cvc-elt.4.1 = cvc-elt.4.1: 元素 ''{0}'' 屬性 ''{1}'' 的值 ''{2}'' 不是有效的 QName。
+        cvc-elt.4.2 = cvc-elt.4.2: 無法將 ''{1}'' 解析為元素 ''{0}'' 的類型定義。
+        cvc-elt.4.3 = cvc-elt.4.3: 類型 ''{1}'' 不是有效衍生自元素 ''{0}'' 的類型定義 ''{2}''。
+        cvc-elt.5.1.1 = cvc-elt.5.1.1: 元素 ''{0}'' 的 '{'value constraint'}' ''{2}'' 不是類型 ''{1}'' 的有效預設值。
+        cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: 元素 ''{0}'' 不可有元素資訊項目 [children]。
+        cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: 元素 ''{0}'' 的值 ''{1}'' 不符合固定 '{'value constraint'}' 值 ''{2}''。
+        cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: 元素 ''{0}'' 的值 ''{1}'' 不符合 '{'value constraint'}' 值 ''{2}''。
+        cvc-enumeration-valid = cvc-enumeration-valid: 值 ''{0}'' 對於列舉 ''{1}'' 而言並非 facet-valid。它必須是來自列舉的值。
+        cvc-fractionDigits-valid = cvc-fractionDigits-valid: 值 ''{0}'' 具有 {1} 分數位數，但是分數位數的數目限制為 {2}。
+        cvc-id.1 = cvc-id.1: IDREF ''{0}'' 沒有 ID/IDREF 連結。
+        cvc-id.2 = cvc-id.2: 有多個 ID 值 ''{0}''。
+        cvc-id.3 = cvc-id.3: 識別限制條件 ''{0}'' 的欄位符合元素 ''{1}''，但是此元素沒有簡單類型。
+        cvc-length-valid = cvc-length-valid: 長度 = ''{1}'' 的值 ''{0}'' 對於類型 ''{3}'' 長度 ''{2}'' 而言並非 facet-valid。
+        cvc-maxExclusive-valid = cvc-maxExclusive-valid: 值 ''{0}'' 對於類型 ''{2}'' maxExclusive ''{1}'' 而言並非 facet-valid。
+        cvc-maxInclusive-valid = cvc-maxInclusive-valid: 值 ''{0}'' 對於類型 ''{2}'' maxInclusive ''{1}'' 而言並非 facet-valid。
+        cvc-maxLength-valid = cvc-maxLength-valid: 長度 = ''{1}'' 的值 ''{0}'' 對於類型 ''{3}'' maxLength ''{2}'' 而言並非 facet-valid。
+        cvc-minExclusive-valid = cvc-minExclusive-valid: 值 ''{0}'' 對於類型 ''{2}'' minExclusive ''{1}'' 而言並非 facet-valid。
+        cvc-minInclusive-valid = cvc-minInclusive-valid: 值 ''{0}'' 對於類型 ''{2}'' minInclusive ''{1}'' 而言並非 facet-valid。
+        cvc-minLength-valid = cvc-minLength-valid: 長度 = ''{1}'' 的值 ''{0}'' 對於類型 ''{3}'' minLength ''{2}'' 而言並非 facet-valid。
+        cvc-pattern-valid = cvc-pattern-valid: 值 ''{0}'' 對於類型 ''{2}'' 樣式 ''{1}'' 而言並非 facet-valid。
+        cvc-totalDigits-valid = cvc-totalDigits-valid: 值 ''{0}'' 具有 {1} 總位數，但是總位數的數目限制為 {2}。
+        cvc-type.1 = cvc-type.1: 找不到類型定義 ''{0}''。
+        cvc-type.2 = cvc-type.2: 元素 {0} 的類型定義不可為抽象。
+        cvc-type.3.1.1 = cvc-type.3.1.1: 元素 ''{0}'' 為簡單類型，因此不能有屬性，但不包括命名空間名稱等於 ''http://www.w3.org/2001/XMLSchema-instance'' 與 [local name] 為 ''type''、''nil''、''schemaLocation'' 或 ''noNamespaceSchemaLocation'' 其中之一者。不過，找到屬性 ''{1}''。
+        cvc-type.3.1.2 = cvc-type.3.1.2: 元素 ''{0}'' 為簡單類型，因此不可有元素資訊項目 [children]。
+        cvc-type.3.1.3 = cvc-type.3.1.3: 元素 ''{0}'' 的值 ''{1}'' 無效。
 
 #schema valid (3.X.3)
 
-        schema_reference.access = schema_reference: \u7121\u6CD5\u8B80\u53D6\u7DB1\u8981\u6587\u4EF6 ''{0}''\uFF0C\u56E0\u70BA accessExternalSchema \u5C6C\u6027\u8A2D\u5B9A\u7684\u9650\u5236\uFF0C\u6240\u4EE5\u4E0D\u5141\u8A31 ''{1}'' \u5B58\u53D6\u3002
-        schema_reference.4 = schema_reference.4: \u7121\u6CD5\u8B80\u53D6\u7DB1\u8981\u6587\u4EF6 ''{0}''\uFF0C\u56E0\u70BA 1) \u627E\u4E0D\u5230\u6587\u4EF6; 2) \u7121\u6CD5\u8B80\u53D6\u6587\u4EF6; 3) \u6587\u4EF6\u7684\u6839\u5143\u7D20\u4E0D\u662F <xsd:schema>\u3002
-        src-annotation = src-annotation: <annotation> \u5143\u7D20\u50C5\u80FD\u5305\u542B <appinfo> \u8207 <documentation> \u5143\u7D20\uFF0C\u4F46\u627E\u5230 ''{0}''\u3002
-        src-attribute.1 = src-attribute.1: \u5C6C\u6027 ''default'' \u8207 ''fixed'' \u4E0D\u53EF\u540C\u6642\u51FA\u73FE\u5728\u5C6C\u6027\u5BA3\u544A ''{0}'' \u4E2D\u3002\u8ACB\u53EA\u4F7F\u7528\u5176\u4E2D\u4E00\u500B\u3002
-        src-attribute.2 = src-attribute.2: : \u5C6C\u6027 ''default'' \u51FA\u73FE\u5728\u5C6C\u6027 ''{0}'' \u4E2D\uFF0C\u56E0\u6B64 ''use'' \u7684\u503C\u5FC5\u9808\u662F ''optional''\u3002
-        src-attribute.3.1 = src-attribute.3.1: 'ref' \u6216 'name' \u5176\u4E2D\u4E4B\u4E00\u5FC5\u9808\u51FA\u73FE\u5728\u5340\u57DF\u5C6C\u6027\u5BA3\u544A\u4E2D\u3002
-        src-attribute.3.2 = src-attribute.3.2: \u5167\u5BB9\u5FC5\u9808\u7B26\u5408 (annotation?) \u5C6C\u6027\u53C3\u7167 ''{0}''\u3002
-        src-attribute.4 = src-attribute.4: \u5C6C\u6027 ''{0}'' \u540C\u6642\u5177\u6709 ''type'' \u5C6C\u6027\u8207\u533F\u540D ''simpleType'' \u5B50\u9805\u3002\u5C6C\u6027\u50C5\u5141\u8A31\u5176\u4E2D\u4E4B\u4E00\u3002
-        src-attribute_group.2 = src-attribute_group.2: \u842C\u7528\u5B57\u5143\u7684\u4EA4\u96C6\u5C0D\u65BC\u5C6C\u6027\u7FA4\u7D44 ''{0}'' \u7121\u6CD5\u8868\u793A\u3002
-        src-attribute_group.3 = src-attribute_group.3: \u5C6C\u6027\u7FA4\u7D44 ''{0}'' \u5075\u6E2C\u5230\u5FAA\u74B0\u5B9A\u7FA9\u3002\u905E\u8FF4\u4F7F\u7528\u5C6C\u6027\u7FA4\u7D44\u53C3\u7167\u5C07\u6703\u56DE\u5230\u672C\u8EAB\u3002
-        src-ct.1 = src-ct.1: \u985E\u578B ''{0}'' \u7684\u8907\u96DC\u985E\u578B\u5B9A\u7FA9\u8868\u793A\u932F\u8AA4\u3002\u7576\u4F7F\u7528 <complexContent> \u6642\uFF0C\u57FA\u790E\u985E\u578B\u5FC5\u9808\u70BA complexType\u3002''{1}'' \u70BA simpleType\u3002
-        src-ct.2.1 = src-ct.2.1: \u985E\u578B ''{0}'' \u7684\u8907\u96DC\u985E\u578B\u5B9A\u7FA9\u8868\u793A\u932F\u8AA4\u3002\u4F7F\u7528 <simpleContent> \u6642\uFF0C\u57FA\u790E\u985E\u578B\u5FC5\u9808\u70BA complexType\uFF0C\u4F46\u5176\u5167\u5BB9\u985E\u578B\u70BA\u7C21\u55AE; \u6216\u8005\u6307\u5B9A\u9650\u5236\u6642\uFF0C\u5176\u5167\u5BB9\u70BA\u6DF7\u5408\u5167\u5BB9\u8207\u53EF\u7A7A\u767D\u7269\u4EF6\u7684\u8907\u96DC\u985E\u578B; \u6216\u8005\u6307\u5B9A\u64F4\u5145\u5957\u4EF6\u6642\uFF0C\u5176\u5167\u5BB9\u70BA\u7C21\u55AE\u985E\u578B\u3002''{1}'' \u4E0D\u7B26\u5408\u9019\u4E9B\u689D\u4EF6\u3002
-        src-ct.2.2 = src-ct.2.2: \u985E\u578B ''{0}'' \u7684\u8907\u96DC\u985E\u578B\u5B9A\u7FA9\u8868\u793A\u932F\u8AA4\u3002\u7576\u5177\u6709 simpleContent \u7684 complexType \u9650\u5236\u5177\u6709\u6DF7\u5408\u5167\u5BB9\u7684 complexType \u8207\u53EF\u7A7A\u767D\u7269\u4EF6\u6642\uFF0C\u5728 <restriction> \u7684\u5B50\u9805\u7576\u4E2D\u5FC5\u9808\u6709\u4E00\u500B <simpleType>\u3002
-        src-ct.4 = src-ct.4: \u985E\u578B ''{0}'' \u7684\u8907\u96DC\u985E\u578B\u5B9A\u7FA9\u8868\u793A\u932F\u8AA4\u3002\u842C\u7528\u5B57\u5143\u7684\u4EA4\u96C6\u7121\u6CD5\u8868\u793A\u3002
-        src-ct.5 = src-ct.5: \u985E\u578B ''{0}'' \u7684\u8907\u96DC\u985E\u578B\u5B9A\u7FA9\u8868\u793A\u932F\u8AA4\u3002\u842C\u7528\u5B57\u5143\u7684\u806F\u96C6\u7121\u6CD5\u8868\u793A\u3002
-        src-element.1 = src-element.1: \u5C6C\u6027 ''default'' \u8207 ''fixed'' \u4E0D\u53EF\u540C\u6642\u51FA\u73FE\u5728\u5143\u7D20\u5BA3\u544A ''{0}'' \u4E2D\u3002\u8ACB\u53EA\u4F7F\u7528\u5176\u4E2D\u4E00\u500B\u3002
-        src-element.2.1 = src-element.2.1: : 'ref' \u6216 'name' \u5176\u4E2D\u4E4B\u4E00\u5FC5\u9808\u51FA\u73FE\u5728\u5340\u57DF\u5143\u7D20\u5BA3\u544A\u4E2D\u3002
-        src-element.2.2 = src-element.2.2: \u7531\u65BC ''{0}'' \u5305\u542B ''ref'' \u5C6C\u6027\uFF0C\u5176\u5167\u5BB9\u5FC5\u9808\u7B26\u5408 (annotation?)\u3002\u4E0D\u904E\uFF0C\u627E\u5230 ''{1}''\u3002
-        src-element.3 = src-element.3: \u5143\u7D20 ''{0}'' \u540C\u6642\u5177\u6709 ''type'' \u5C6C\u6027\u8207 ''anonymous type'' \u5B50\u9805\u3002\u5143\u7D20\u50C5\u5141\u8A31\u5176\u4E2D\u4E4B\u4E00\u3002
-        src-import.1.1 = src-import.1.1: <import> \u5143\u7D20\u8CC7\u8A0A\u9805\u76EE\u7684\u547D\u540D\u7A7A\u9593\u5C6C\u6027 ''{0}'' \u4E0D\u53EF\u8207\u5B83\u6240\u5B58\u5728\u7DB1\u8981\u7684 targetNamespace \u76F8\u540C\u3002
-        src-import.1.2 = src-import.1.2: \u82E5\u547D\u540D\u7A7A\u9593\u5C6C\u6027\u672A\u51FA\u73FE\u5728 <import> \u5143\u7D20\u8CC7\u8A0A\u9805\u76EE\u4E0A\uFF0C\u5247\u5305\u542B\u7684\u7DB1\u8981\u5FC5\u9808\u6709 targetNamespace\u3002
-        src-import.2 = src-import.2: \u6587\u4EF6 ''{0}'' \u7684\u6839\u5143\u7D20\u5FC5\u9808\u5177\u6709\u547D\u540D\u7A7A\u9593\u540D\u7A31 ''http://www.w3.org/2001/XMLSchema'' \u8207\u5340\u57DF\u540D\u7A31 ''schema''\u3002
-        src-import.3.1 = src-import.3.1: <import> \u5143\u7D20\u8CC7\u8A0A\u9805\u76EE\u7684\u547D\u540D\u7A7A\u9593\u5C6C\u6027 ''{0}'' \u5FC5\u9808\u7B49\u65BC\u532F\u5165\u6587\u4EF6\u7684 targetNamespace \u5C6C\u6027 ''{1}''\u3002
-        src-import.3.2 = src-import.3.2: \u627E\u5230\u6C92\u6709\u547D\u540D\u7A7A\u9593\u5C6C\u6027\u7684 <import> \u5143\u7D20\u8CC7\u8A0A\u9805\u76EE\uFF0C\u56E0\u6B64\uFF0C\u532F\u5165\u7684\u6587\u4EF6\u4E0D\u80FD\u5177\u6709 targetNamespace \u5C6C\u6027\u3002\u4E0D\u904E\uFF0C\u5728\u532F\u5165\u7684\u6587\u4EF6\u4E2D\u627E\u5230 targetNamespace ''{1}''\u3002
-        src-include.1 = src-include.1: \u6587\u4EF6 ''{0}'' \u7684\u6839\u5143\u7D20\u5FC5\u9808\u5177\u6709\u547D\u540D\u7A7A\u9593\u540D\u7A31 ''http://www.w3.org/2001/XMLSchema'' \u8207\u5340\u57DF\u540D\u7A31 ''schema''\u3002
-        src-include.2.1 = src-include.2.1: \u53C3\u7167\u7DB1\u8981\u7684 targetNamespace (\u76EE\u524D\u70BA ''{1}'') \u5FC5\u9808\u7B49\u65BC\u5305\u542B\u7DB1\u8981\u7684 targetNamespace (\u76EE\u524D\u70BA ''{0}'')\u3002
-        src-redefine.2 = src-redefine.2: \u6587\u4EF6 ''{0}'' \u7684\u6839\u5143\u7D20\u5FC5\u9808\u5177\u6709\u547D\u540D\u7A7A\u9593\u540D\u7A31 ''http://www.w3.org/2001/XMLSchema'' \u8207\u5340\u57DF\u540D\u7A31 ''schema''\u3002
-        src-redefine.3.1 = src-redefine.3.1: \u53C3\u7167\u7DB1\u8981\u7684 targetNamespace (\u76EE\u524D\u70BA ''{1}'') \u5FC5\u9808\u7B49\u65BC\u91CD\u65B0\u5B9A\u7FA9\u7DB1\u8981\u7684 targetNamespace (\u76EE\u524D\u70BA ''{0}'')\u3002
-        src-redefine.5.a.a = src-redefine.5.a.a: \u627E\u4E0D\u5230 <simpleType> \u975E\u8A3B\u89E3\u5B50\u9805\u3002<redefine> \u5143\u7D20\u7684 <simpleType> \u5B50\u9805\u5FC5\u9808\u5177\u6709 <restriction> \u5B50\u7CFB\u8207\u53C3\u7167\u672C\u8EAB\u7684 'base' \u5C6C\u6027\u3002
-        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' \u4E0D\u662F\u6709\u6548\u5B50\u9805\u5143\u7D20\u3002<redefine> \u5143\u7D20\u7684 <simpleType> \u5B50\u9805\u5FC5\u9808\u5177\u6709 <restriction> \u5B50\u7CFB\u8207\u53C3\u7167\u672C\u8EAB\u7684 ''base'' \u5C6C\u6027\u3002
-        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' \u6C92\u6709\u53C3\u7167\u91CD\u65B0\u5B9A\u7FA9\u5143\u7D20 (''{1}'') \u7684 ''base'' \u5C6C\u6027\u3002<redefine> \u5143\u7D20\u7684 <simpleType> \u5B50\u9805\u5FC5\u9808\u5177\u6709 <restriction> \u5B50\u7CFB\u8207\u53C3\u7167\u672C\u8EAB\u7684 ''base'' \u5C6C\u6027\u3002
-        src-redefine.5.b.a = src-redefine.5.b.a: \u627E\u4E0D\u5230 <complexType> \u7684\u975E\u8A3B\u89E3\u5B50\u9805\u3002<redefine> \u5143\u7D20\u7684 <complexType> \u5B50\u9805\u5FC5\u9808\u5177\u6709 <extension> \u6216 <restriction> \u5B50\u7CFB\u8207\u53C3\u7167\u672C\u8EAB\u7684 'base' \u5C6C\u6027\u3002
-        src-redefine.5.b.b = src-redefine.5.b.b: \u627E\u4E0D\u5230 <complexType> \u7684\u975E\u8A3B\u89E3\u5B6B\u7CFB\u3002<redefine> \u5143\u7D20\u7684 <complexType> \u5B50\u9805\u5FC5\u9808\u5177\u6709 <extension> \u6216 <restriction> \u5B50\u7CFB\u8207\u53C3\u7167\u672C\u8EAB\u7684 'base' \u5C6C\u6027\u3002
-        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}'' \u4E0D\u662F\u6709\u6548\u5B6B\u7CFB\u5143\u7D20\u3002<redefine> \u5143\u7D20\u7684 <complexType> \u5B50\u9805\u5FC5\u9808\u5177\u6709 <extension> \u6216 <restriction> \u5B50\u7CFB\u8207\u53C3\u7167\u672C\u8EAB\u7684 ''base'' \u5C6C\u6027\u3002
-        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}'' \u6C92\u6709\u53C3\u7167\u91CD\u65B0\u5B9A\u7FA9\u5143\u7D20 (''{1}'') \u7684 ''base'' \u5C6C\u6027\u3002<redefine> \u5143\u7D20\u7684 <complexType> \u5B50\u9805\u5FC5\u9808\u5177\u6709 <extension> \u6216 <restriction> \u5B50\u7CFB\u8207\u53C3\u7167\u672C\u8EAB\u7684 ''base'' \u5C6C\u6027\u3002
-        src-redefine.6.1.1 = src-redefine.6.1.1: \u82E5 <redefine> \u5143\u7D20\u7684\u7FA4\u7D44\u5B50\u9805\u5305\u542B\u53C3\u7167\u672C\u8EAB\u7684\u7FA4\u7D44\uFF0C\u5B83\u5FC5\u9808\u525B\u597D\u53EA\u6709 1 \u500B; \u6B64\u9805\u6709 ''{0}'' \u500B\u3002
-        src-redefine.6.1.2 = src-redefine.6.1.2: \u5305\u542B\u91CD\u65B0\u5B9A\u7FA9\u7FA4\u7D44\u53C3\u7167\u7684\u7FA4\u7D44 ''{0}'' \u5FC5\u9808\u5177\u6709 ''minOccurs'' = ''maxOccurs'' = 1\u3002
-        src-redefine.6.2.1 = src-redefine.6.2.1: \u91CD\u65B0\u5B9A\u7FA9\u7DB1\u8981\u4E2D\u6C92\u6709\u7FA4\u7D44\u5177\u6709\u7B26\u5408 ''{0}'' \u7684\u540D\u7A31\u3002
-        src-redefine.6.2.2 = src-redefine.6.2.2: \u7FA4\u7D44 ''{0}'' \u672A\u9069\u7576\u9650\u5236\u5B83\u91CD\u65B0\u5B9A\u7FA9\u7684\u7FA4\u7D44; \u9055\u53CD\u9650\u5236\u689D\u4EF6:  ''{1}''\u3002
-        src-redefine.7.1 = src-redefine.7.1: \u82E5 <redefine> \u5143\u7D20\u7684 attributeGroup \u5B50\u9805\u5305\u542B\u53C3\u7167\u672C\u8EAB\u7684 attributeGroup\uFF0C\u5B83\u5FC5\u9808\u525B\u597D\u53EA\u6709 1 \u500B; \u6B64\u9805\u6709 ''{0}'' \u500B\u3002
-        src-redefine.7.2.1 = src-redefine.7.2.1: \u91CD\u65B0\u5B9A\u7FA9\u7DB1\u8981\u4E2D\u6C92\u6709 attributeGroup \u5177\u6709\u7B26\u5408 ''{0}'' \u7684\u540D\u7A31\u3002
-        src-redefine.7.2.2 = src-redefine.7.2.2: AttributeGroup ''{0}'' \u672A\u9069\u7576\u9650\u5236\u5B83\u91CD\u65B0\u5B9A\u7FA9\u7684 AttributeGroup; \u9055\u53CD\u9650\u5236\u689D\u4EF6:  ''{1}''\u3002
-        src-resolve = src-resolve: \u7121\u6CD5\u5C07\u540D\u7A31 ''{0}'' \u89E3\u6790\u70BA ''{1}'' \u5143\u4EF6\u3002
-        src-resolve.4.1 = src-resolve.4.1: \u89E3\u6790\u5143\u4EF6 ''{2}'' \u6642\u767C\u751F\u932F\u8AA4\u3002\u5075\u6E2C\u5230 ''{2}'' \u6C92\u6709\u547D\u540D\u7A7A\u9593\uFF0C\u4F46\u662F\uFF0C\u5F9E\u7DB1\u8981\u6587\u4EF6 ''{0}'' \u7121\u6CD5\u53C3\u7167\u6C92\u6709\u76EE\u6A19\u547D\u540D\u7A7A\u9593\u7684\u5143\u4EF6\u3002\u82E5\u8981\u8B93 ''{2}'' \u5177\u6709\u547D\u540D\u7A7A\u9593\uFF0C\u53EF\u8003\u616E\u63D0\u4F9B\u524D\u7F6E\u78BC\u3002\u82E5\u4E0D\u8981\u8B93 ''{2}'' \u5177\u6709\u547D\u540D\u7A7A\u9593\uFF0C\u5247\u61C9\u5C07\u6C92\u6709 "namespace" \u5C6C\u6027\u7684 ''import'' \u65B0\u589E\u81F3 ''{0}''\u3002
-        src-resolve.4.2 = src-resolve.4.2: \u89E3\u6790\u5143\u4EF6 ''{2}'' \u6642\u767C\u751F\u932F\u8AA4\u3002\u5075\u6E2C\u5230 ''{2}'' \u4F4D\u65BC\u547D\u540D\u7A7A\u9593 ''{1}'' \u4E2D\uFF0C\u4F46\u662F\uFF0C\u5F9E\u7DB1\u8981\u6587\u4EF6 ''{0}'' \u7121\u6CD5\u53C3\u7167\u6B64\u547D\u540D\u7A7A\u9593\u7684\u5143\u4EF6\u3002\u82E5\u6B64\u70BA\u4E0D\u6B63\u78BA\u7684\u547D\u540D\u7A7A\u9593\uFF0C\u53EF\u8003\u616E\u8B8A\u66F4 ''{2}'' \u7684\u524D\u7F6E\u78BC\u3002\u82E5\u6B64\u70BA\u6B63\u78BA\u7684\u547D\u540D\u7A7A\u9593\uFF0C\u5247\u61C9\u5C07\u9069\u7576\u7684 ''import'' \u6A19\u8A18\u65B0\u589E\u81F3 ''{0}''\u3002
-        src-simple-type.2.a = src-simple-type.2.a: \u627E\u5230 <restriction> \u5143\u7D20\uFF0C\u5728\u5176 [children] \u4E2D\u540C\u6642\u6709\u57FA\u790E [attribute] \u8207 <simpleType> \u5143\u7D20\u3002\u50C5\u5141\u8A31\u5176\u4E2D\u4E00\u9805\u3002
-        src-simple-type.2.b = src-simple-type.2.b: \u627E\u5230 <restriction> \u5143\u7D20\uFF0C\u5728\u5176 [children] \u4E2D\u6C92\u6709\u57FA\u790E [attribute]\uFF0C\u4E5F\u6C92\u6709 <simpleType> \u5143\u7D20\u3002\u9700\u8981\u5176\u4E2D\u4E00\u9805\u3002
-        src-simple-type.3.a = src-simple-type.3.a: \u627E\u5230 <list> \u5143\u7D20\uFF0C\u5728\u5176 [children] \u4E2D\u540C\u6642\u6709 itemType [attribute] \u8207 <simpleType> \u5143\u7D20\u3002\u50C5\u5141\u8A31\u5176\u4E2D\u4E00\u9805\u3002
-        src-simple-type.3.b = src-simple-type.3.b: \u627E\u5230 <list> \u5143\u7D20\uFF0C\u5728\u5176 [children] \u4E2D\u6C92\u6709 itemType [attribute]\uFF0C\u4E5F\u6C92\u6709 <simpleType> \u5143\u7D20\u3002\u9700\u8981\u5176\u4E2D\u4E00\u9805\u3002
-        src-single-facet-value = src-single-facet-value: \u5B9A\u7FA9 facet ''{0}'' \u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u3002
-        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: <union> \u5143\u7D20\u5728\u5176 [children] \u4E2D\uFF0C\u5FC5\u9808\u5177\u6709\u975E\u7A7A\u767D memberTypes [attribute] \u6216\u81F3\u5C11\u4E00\u500B <simpleType> \u5143\u7D20\u3002
+        schema_reference.access = schema_reference: 無法讀取綱要文件 ''{0}''，因為 accessExternalSchema 屬性設定的限制，所以不允許 ''{1}'' 存取。
+        schema_reference.4 = schema_reference.4: 無法讀取綱要文件 ''{0}''，因為 1) 找不到文件; 2) 無法讀取文件; 3) 文件的根元素不是 <xsd:schema>。
+        src-annotation = src-annotation: <annotation> 元素僅能包含 <appinfo> 與 <documentation> 元素，但找到 ''{0}''。
+        src-attribute.1 = src-attribute.1: 屬性 ''default'' 與 ''fixed'' 不可同時出現在屬性宣告 ''{0}'' 中。請只使用其中一個。
+        src-attribute.2 = src-attribute.2: : 屬性 ''default'' 出現在屬性 ''{0}'' 中，因此 ''use'' 的值必須是 ''optional''。
+        src-attribute.3.1 = src-attribute.3.1: 'ref' 或 'name' 其中之一必須出現在區域屬性宣告中。
+        src-attribute.3.2 = src-attribute.3.2: 內容必須符合 (annotation?) 屬性參照 ''{0}''。
+        src-attribute.4 = src-attribute.4: 屬性 ''{0}'' 同時具有 ''type'' 屬性與匿名 ''simpleType'' 子項。屬性僅允許其中之一。
+        src-attribute_group.2 = src-attribute_group.2: 萬用字元的交集對於屬性群組 ''{0}'' 無法表示。
+        src-attribute_group.3 = src-attribute_group.3: 屬性群組 ''{0}'' 偵測到循環定義。遞迴使用屬性群組參照將會回到本身。
+        src-ct.1 = src-ct.1: 類型 ''{0}'' 的複雜類型定義表示錯誤。當使用 <complexContent> 時，基礎類型必須為 complexType。''{1}'' 為 simpleType。
+        src-ct.2.1 = src-ct.2.1: 類型 ''{0}'' 的複雜類型定義表示錯誤。使用 <simpleContent> 時，基礎類型必須為 complexType，但其內容類型為簡單; 或者指定限制時，其內容為混合內容與可空白物件的複雜類型; 或者指定擴充套件時，其內容為簡單類型。''{1}'' 不符合這些條件。
+        src-ct.2.2 = src-ct.2.2: 類型 ''{0}'' 的複雜類型定義表示錯誤。當具有 simpleContent 的 complexType 限制具有混合內容的 complexType 與可空白物件時，在 <restriction> 的子項當中必須有一個 <simpleType>。
+        src-ct.4 = src-ct.4: 類型 ''{0}'' 的複雜類型定義表示錯誤。萬用字元的交集無法表示。
+        src-ct.5 = src-ct.5: 類型 ''{0}'' 的複雜類型定義表示錯誤。萬用字元的聯集無法表示。
+        src-element.1 = src-element.1: 屬性 ''default'' 與 ''fixed'' 不可同時出現在元素宣告 ''{0}'' 中。請只使用其中一個。
+        src-element.2.1 = src-element.2.1: : 'ref' 或 'name' 其中之一必須出現在區域元素宣告中。
+        src-element.2.2 = src-element.2.2: 由於 ''{0}'' 包含 ''ref'' 屬性，其內容必須符合 (annotation?)。不過，找到 ''{1}''。
+        src-element.3 = src-element.3: 元素 ''{0}'' 同時具有 ''type'' 屬性與 ''anonymous type'' 子項。元素僅允許其中之一。
+        src-import.1.1 = src-import.1.1: <import> 元素資訊項目的命名空間屬性 ''{0}'' 不可與它所存在綱要的 targetNamespace 相同。
+        src-import.1.2 = src-import.1.2: 若命名空間屬性未出現在 <import> 元素資訊項目上，則包含的綱要必須有 targetNamespace。
+        src-import.2 = src-import.2: 文件 ''{0}'' 的根元素必須具有命名空間名稱 ''http://www.w3.org/2001/XMLSchema'' 與區域名稱 ''schema''。
+        src-import.3.1 = src-import.3.1: <import> 元素資訊項目的命名空間屬性 ''{0}'' 必須等於匯入文件的 targetNamespace 屬性 ''{1}''。
+        src-import.3.2 = src-import.3.2: 找到沒有命名空間屬性的 <import> 元素資訊項目，因此，匯入的文件不能具有 targetNamespace 屬性。不過，在匯入的文件中找到 targetNamespace ''{1}''。
+        src-include.1 = src-include.1: 文件 ''{0}'' 的根元素必須具有命名空間名稱 ''http://www.w3.org/2001/XMLSchema'' 與區域名稱 ''schema''。
+        src-include.2.1 = src-include.2.1: 參照綱要的 targetNamespace (目前為 ''{1}'') 必須等於包含綱要的 targetNamespace (目前為 ''{0}'')。
+        src-redefine.2 = src-redefine.2: 文件 ''{0}'' 的根元素必須具有命名空間名稱 ''http://www.w3.org/2001/XMLSchema'' 與區域名稱 ''schema''。
+        src-redefine.3.1 = src-redefine.3.1: 參照綱要的 targetNamespace (目前為 ''{1}'') 必須等於重新定義綱要的 targetNamespace (目前為 ''{0}'')。
+        src-redefine.5.a.a = src-redefine.5.a.a: 找不到 <simpleType> 非註解子項。<redefine> 元素的 <simpleType> 子項必須具有 <restriction> 子系與參照本身的 'base' 屬性。
+        src-redefine.5.a.b = src-redefine.5.a.b: ''{0}'' 不是有效子項元素。<redefine> 元素的 <simpleType> 子項必須具有 <restriction> 子系與參照本身的 ''base'' 屬性。
+        src-redefine.5.a.c = src-redefine.5.a.c: ''{0}'' 沒有參照重新定義元素 (''{1}'') 的 ''base'' 屬性。<redefine> 元素的 <simpleType> 子項必須具有 <restriction> 子系與參照本身的 ''base'' 屬性。
+        src-redefine.5.b.a = src-redefine.5.b.a: 找不到 <complexType> 的非註解子項。<redefine> 元素的 <complexType> 子項必須具有 <extension> 或 <restriction> 子系與參照本身的 'base' 屬性。
+        src-redefine.5.b.b = src-redefine.5.b.b: 找不到 <complexType> 的非註解孫系。<redefine> 元素的 <complexType> 子項必須具有 <extension> 或 <restriction> 子系與參照本身的 'base' 屬性。
+        src-redefine.5.b.c = src-redefine.5.b.c: ''{0}'' 不是有效孫系元素。<redefine> 元素的 <complexType> 子項必須具有 <extension> 或 <restriction> 子系與參照本身的 ''base'' 屬性。
+        src-redefine.5.b.d = src-redefine.5.b.d: ''{0}'' 沒有參照重新定義元素 (''{1}'') 的 ''base'' 屬性。<redefine> 元素的 <complexType> 子項必須具有 <extension> 或 <restriction> 子系與參照本身的 ''base'' 屬性。
+        src-redefine.6.1.1 = src-redefine.6.1.1: 若 <redefine> 元素的群組子項包含參照本身的群組，它必須剛好只有 1 個; 此項有 ''{0}'' 個。
+        src-redefine.6.1.2 = src-redefine.6.1.2: 包含重新定義群組參照的群組 ''{0}'' 必須具有 ''minOccurs'' = ''maxOccurs'' = 1。
+        src-redefine.6.2.1 = src-redefine.6.2.1: 重新定義綱要中沒有群組具有符合 ''{0}'' 的名稱。
+        src-redefine.6.2.2 = src-redefine.6.2.2: 群組 ''{0}'' 未適當限制它重新定義的群組; 違反限制條件:  ''{1}''。
+        src-redefine.7.1 = src-redefine.7.1: 若 <redefine> 元素的 attributeGroup 子項包含參照本身的 attributeGroup，它必須剛好只有 1 個; 此項有 ''{0}'' 個。
+        src-redefine.7.2.1 = src-redefine.7.2.1: 重新定義綱要中沒有 attributeGroup 具有符合 ''{0}'' 的名稱。
+        src-redefine.7.2.2 = src-redefine.7.2.2: AttributeGroup ''{0}'' 未適當限制它重新定義的 AttributeGroup; 違反限制條件:  ''{1}''。
+        src-resolve = src-resolve: 無法將名稱 ''{0}'' 解析為 ''{1}'' 元件。
+        src-resolve.4.1 = src-resolve.4.1: 解析元件 ''{2}'' 時發生錯誤。偵測到 ''{2}'' 沒有命名空間，但是，從綱要文件 ''{0}'' 無法參照沒有目標命名空間的元件。若要讓 ''{2}'' 具有命名空間，可考慮提供前置碼。若不要讓 ''{2}'' 具有命名空間，則應將沒有 "namespace" 屬性的 ''import'' 新增至 ''{0}''。
+        src-resolve.4.2 = src-resolve.4.2: 解析元件 ''{2}'' 時發生錯誤。偵測到 ''{2}'' 位於命名空間 ''{1}'' 中，但是，從綱要文件 ''{0}'' 無法參照此命名空間的元件。若此為不正確的命名空間，可考慮變更 ''{2}'' 的前置碼。若此為正確的命名空間，則應將適當的 ''import'' 標記新增至 ''{0}''。
+        src-simple-type.2.a = src-simple-type.2.a: 找到 <restriction> 元素，在其 [children] 中同時有基礎 [attribute] 與 <simpleType> 元素。僅允許其中一項。
+        src-simple-type.2.b = src-simple-type.2.b: 找到 <restriction> 元素，在其 [children] 中沒有基礎 [attribute]，也沒有 <simpleType> 元素。需要其中一項。
+        src-simple-type.3.a = src-simple-type.3.a: 找到 <list> 元素，在其 [children] 中同時有 itemType [attribute] 與 <simpleType> 元素。僅允許其中一項。
+        src-simple-type.3.b = src-simple-type.3.b: 找到 <list> 元素，在其 [children] 中沒有 itemType [attribute]，也沒有 <simpleType> 元素。需要其中一項。
+        src-single-facet-value = src-single-facet-value: 定義 facet ''{0}'' 超過一次以上。
+        src-union-memberTypes-or-simpleTypes = src-union-memberTypes-or-simpleTypes: <union> 元素在其 [children] 中，必須具有非空白 memberTypes [attribute] 或至少一個 <simpleType> 元素。
 
 #constraint valid (3.X.6)
 
-        ag-props-correct.2 = ag-props-correct.2: \u5C6C\u6027\u7FA4\u7D44 ''{0}'' \u7684\u932F\u8AA4\u3002\u91CD\u8907\u5C6C\u6027\u4F7F\u7528\u76F8\u540C\u540D\u7A31\u4E14\u6307\u5B9A\u4E86\u76EE\u6A19\u547D\u540D\u7A7A\u9593\u3002\u91CD\u8907\u5C6C\u6027\u4F7F\u7528\u7684\u540D\u7A31\u70BA ''{1}''\u3002
-        ag-props-correct.3 = ag-props-correct.3: \u5C6C\u6027\u7FA4\u7D44 ''{0}'' \u7684\u932F\u8AA4\u3002\u5169\u500B\u5C6C\u6027\u5BA3\u544A ''{1}'' \u8207 ''{2}'' \u5177\u6709\u884D\u751F\u81EA ID \u7684\u985E\u578B\u3002
-        a-props-correct.2 = a-props-correct.2: \u5C6C\u6027 ''{0}'' \u4E2D\u7684\u503C\u9650\u5236\u689D\u4EF6\u503C ''{1}'' \u7121\u6548\u3002
-        a-props-correct.3 = a-props-correct.3: \u5C6C\u6027 ''{0}'' \u7121\u6CD5\u4F7F\u7528 ''fixed'' \u6216 ''default''\uFF0C\u56E0\u70BA\u5C6C\u6027\u7684 '{'type definition'}' \u70BA ID\uFF0C\u6216\u884D\u751F\u81EA ID\u3002
-        au-props-correct.2 = au-props-correct.2: \u5728 ''{0}'' \u7684\u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u4E86 ''{1}'' \u7684\u56FA\u5B9A\u503C\u3002\u56E0\u6B64\uFF0C\u82E5\u53C3\u7167 ''{0}'' \u7684\u5C6C\u6027\u4F7F\u7528\u4E5F\u5177\u6709 '{'value constraint'}'\uFF0C\u5B83\u5FC5\u9808\u662F\u56FA\u5B9A\u503C\u4E14\u503C\u5FC5\u9808\u70BA ''{1}''\u3002
-        cos-all-limited.1.2 = cos-all-limited.1.2: 'all' \u6A21\u578B\u7FA4\u7D44\u5FC5\u9808\u51FA\u73FE\u5728 '{'min occurs'}' = '{'max occurs'}' = 1 \u7684\u7269\u4EF6\u4E2D\uFF0C\u4E14\u8A72\u7269\u4EF6\u5FC5\u9808\u662F\u4E00\u5C0D\u7D44\u6210\u8907\u96DC\u985E\u578B\u5B9A\u7FA9\u4E4B '{'content type'}' \u7269\u4EF6\u4E2D\u7684\u4E00\u90E8\u5206\u3002
-        cos-all-limited.2 = cos-all-limited.2: ''all'' \u6A21\u578B\u7FA4\u7D44\u4E2D\u5143\u7D20\u7684 '{'max occurs'}' \u5FC5\u9808\u662F 0 \u6216 1\u3002\u5143\u7D20 ''{1}'' \u7684\u503C ''{0}'' \u7121\u6548\u3002
-        cos-applicable-facets = cos-applicable-facets: \u985E\u578B {1} \u4E0D\u5141\u8A31 Facet ''{0}''\u3002
-        cos-ct-extends.1.1 = cos-ct-extends.1.1: \u985E\u578B ''{0}'' \u662F\u7531\u64F4\u5145\u5957\u4EF6\u5F9E\u985E\u578B ''{1}'' \u884D\u751F\u3002\u4E0D\u904E\uFF0C''{1}'' \u7684 ''final'' \u5C6C\u6027\u7981\u6B62\u7531\u64F4\u5145\u5957\u4EF6\u884D\u751F\u3002
-        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: \u884D\u751F\u985E\u578B\u8207\u5176\u57FA\u790E\u7684\u5167\u5BB9\u985E\u578B\u7686\u5FC5\u9808\u662F\u6DF7\u5408\u985E\u578B\u6216\u5169\u8005\u7686\u662F element-only\u3002\u985E\u578B ''{0}'' \u662F element-only\uFF0C\u4F46\u5176\u57FA\u790E\u985E\u578B\u5247\u5426\u3002
-        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: \u884D\u751F\u985E\u578B\u8207\u5176\u57FA\u790E\u7684\u5167\u5BB9\u985E\u578B\u7686\u5FC5\u9808\u662F\u6DF7\u5408\u985E\u578B\u6216\u5169\u8005\u7686\u662F element-only\u3002\u985E\u578B ''{0}'' \u70BA\u6DF7\u5408\u985E\u578B\uFF0C\u4F46\u5176\u57FA\u790E\u985E\u578B\u5247\u5426\u3002
-        cos-element-consistent = cos-element-consistent: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u5728\u6A21\u578B\u7FA4\u7D44\u4E2D\u51FA\u73FE\u540D\u7A31 ''{1}''\u3001\u4E0D\u540C\u985E\u578B\u7684\u591A\u500B\u5143\u7D20\u3002
-        cos-list-of-atomic = cos-list-of-atomic: \u6E05\u55AE\u985E\u578B ''{0}'' \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u985E\u578B ''{1}'' \u662F\u7121\u6548\u7684\u6E05\u55AE\u5143\u7D20\u985E\u578B\uFF0C\u56E0\u70BA\u5B83\u4E0D\u662F\u55AE\u5143\u985E\u578B (''{1}'' \u70BA\u6E05\u55AE\u985E\u578B\uFF0C\u6216\u5305\u542B\u6E05\u55AE\u7684\u806F\u96C6\u985E\u578B)\u3002
-        cos-nonambig = cos-nonambig: {0} \u8207 {1} (\u6216\u4F86\u81EA\u5176\u66FF\u4EE3\u7FA4\u7D44\u7684\u5143\u7D20) \u9055\u53CD\u300C\u552F\u4E00\u7269\u4EF6\u5C6C\u6027\u300D\u3002\u4F9D\u6B64\u7DB1\u8981\u9A57\u8B49\u671F\u9593\uFF0C\u70BA\u9019\u5169\u500B\u7269\u4EF6\u5EFA\u7ACB\u4E86\u4E0D\u78BA\u5B9A\u6027\u3002
-        cos-particle-restrict.a = cos-particle-restrict.a: \u884D\u751F\u7269\u4EF6\u70BA\u7A7A\u767D\uFF0C\u5247\u57FA\u790E\u7269\u4EF6\u4E0D\u53EF\u70BA\u7A7A\u767D\u3002
-        cos-particle-restrict.b = cos-particle-restrict.b: \u57FA\u790E\u7269\u4EF6\u70BA\u7A7A\u767D\uFF0C\u4F46\u662F\u884D\u751F\u7269\u4EF6\u5247\u5426\u3002
-        cos-particle-restrict.2 = cos-particle-restrict.2: \u7981\u6B62\u7684\u7269\u4EF6\u9650\u5236: ''{0}''\u3002
-        cos-st-restricts.1.1 = cos-st-restricts.1.1: \u985E\u578B ''{1}'' \u70BA\u55AE\u5143\u985E\u578B\uFF0C\u56E0\u6B64\u5176 '{'base type definition'}' (''{0}'') \u5FC5\u9808\u662F\u55AE\u5143\u7C21\u55AE\u985E\u578B\u5B9A\u7FA9\u6216\u5167\u5EFA\u7684\u539F\u59CB\u8CC7\u6599\u985E\u578B\u3002
-        cos-st-restricts.2.1 = cos-st-restricts.2.1: \u6E05\u55AE\u985E\u578B ''{0}'' \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u985E\u578B ''{1}'' \u662F\u7121\u6548\u7684\u9805\u76EE\u985E\u578B\uFF0C\u56E0\u70BA\u5B83\u662F\u6E05\u55AE\u985E\u578B\uFF0C\u6216\u5305\u542B\u6E05\u55AE\u7684\u806F\u96C6\u985E\u578B\u3002
-        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: '{'item type definition'}' \u7684 '{'final'}' \u5143\u4EF6 ''{0}'' \u5305\u542B ''list''\u3002\u9019\u4EE3\u8868 ''{0}'' \u7121\u6CD5\u4F5C\u70BA\u6E05\u55AE\u985E\u578B ''{1}'' \u7684\u9805\u76EE\u985E\u578B\u3002
-        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: '{'member type definitions'}' \u7684 '{'final'}' \u5143\u4EF6 ''{0}'' \u5305\u542B ''union''\u3002\u9019\u4EE3\u8868 ''{0}'' \u7121\u6CD5\u4F5C\u70BA\u806F\u96C6\u985E\u578B ''{1}'' \u7684\u6210\u54E1\u985E\u578B\u3002
-        cos-valid-default.2.1 = cos-valid-default.2.1: \u5143\u7D20 ''{0}'' \u5177\u6709\u503C\u9650\u5236\u689D\u4EF6\uFF0C\u4E14\u5FC5\u9808\u5177\u6709\u6DF7\u5408\u6216\u7C21\u55AE\u5167\u5BB9\u6A21\u578B\u3002
-        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: \u7531\u65BC\u5143\u7D20 ''{0}'' \u5177\u6709 '{'value constraint'}' \u4E14\u5176\u985E\u578B\u5B9A\u7FA9\u5177\u6709\u6DF7\u5408\u7684 '{'content type'}'\uFF0C\u56E0\u6B64 '{'content type'}' \u7684\u7269\u4EF6\u5FC5\u9808\u662F\u53EF\u7A7A\u767D\u3002
-        c-props-correct.2 = c-props-correct.2: keyref ''{0}'' \u8207 key ''{1}'' \u7684 Fields \u57FA\u6578\u5F7C\u6B64\u5FC5\u9808\u76F8\u7B26\u3002
-        ct-props-correct.3 = ct-props-correct.3: \u5075\u6E2C\u5230\u8907\u96DC\u985E\u578B ''{0}'' \u7684\u5FAA\u74B0\u5B9A\u7FA9\u3002\u9019\u4EE3\u8868 ''{0}'' \u5305\u542B\u5728\u81EA\u8EAB\u985E\u578B\u968E\u5C64\u4E2D\uFF0C\u9019\u662F\u4E00\u9805\u932F\u8AA4\u3002
-        ct-props-correct.4 = ct-props-correct.4: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u91CD\u8907\u5C6C\u6027\u4F7F\u7528\u76F8\u540C\u540D\u7A31\u4E14\u6307\u5B9A\u4E86\u76EE\u6A19\u547D\u540D\u7A7A\u9593\u3002\u91CD\u8907\u5C6C\u6027\u4F7F\u7528\u7684\u540D\u7A31\u70BA ''{1}''\u3002
-        ct-props-correct.5 = ct-props-correct.5: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u5169\u500B\u5C6C\u6027\u5BA3\u544A ''{1}'' \u8207 ''{2}'' \u5177\u6709\u884D\u751F\u81EA ID \u7684\u985E\u578B\u3002
-        derivation-ok-restriction.1 = derivation-ok-restriction.1: \u985E\u578B ''{0}'' \u7531\u9650\u5236\u5F9E\u985E\u578B ''{1}'' \u884D\u751F\u3002\u4E0D\u904E\uFF0C''{1}'' \u5177\u6709 '{'final'}' \u5C6C\u6027\uFF0C\u7981\u6B62\u7531\u9650\u5236\u884D\u751F\u3002
-        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u6B64\u985E\u578B\u4E2D\u4F7F\u7528 ''{1}'' \u7684\u5C6C\u6027\u5177\u6709 ''use'' \u503C\u7684 ''{2}''\uFF0C\u9019\u8207\u57FA\u790E\u985E\u578B\u4E2D\u4F7F\u7528\u7B26\u5408\u5C6C\u6027\u7684 ''required'' \u503C\u4E0D\u4E00\u81F4\u3002
-        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u6B64\u985E\u578B\u4E2D\u4F7F\u7528 ''{1}'' \u7684\u5C6C\u6027\u5177\u6709\u985E\u578B ''{2}''\uFF0C\u9019\u4E0D\u662F\u6709\u6548\u884D\u751F\u81EA ''{3}''\uFF0C\u4EA6\u5373\u57FA\u790E\u985E\u578B\u4E2D\u4F7F\u7528\u7B26\u5408\u5C6C\u6027\u7684\u985E\u578B\u3002
-        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u6B64\u985E\u578B\u4E2D\u4F7F\u7528 ''{1}'' \u7684\u5C6C\u6027\u5177\u6709\u672A\u56FA\u5B9A\u7684\u6709\u6548\u503C\u9650\u5236\u689D\u4EF6\uFF0C\u800C\u57FA\u790E\u985E\u578B\u4E2D\u4F7F\u7528\u7684\u7B26\u5408\u5C6C\u6027\u6709\u6548\u503C\u9650\u5236\u689D\u4EF6\u70BA\u56FA\u5B9A\u5F0F\u3002
-        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u6B64\u985E\u578B\u4E2D\u4F7F\u7528 ''{1}'' \u7684\u5C6C\u6027\u5177\u6709 ''{2}'' \u56FA\u5B9A\u503C\u7684\u6709\u6548\u503C\u9650\u5236\u689D\u4EF6\uFF0C\u9019\u8207\u57FA\u790E\u985E\u578B\u4E2D\u4F7F\u7528\u7B26\u5408\u5C6C\u6027\u7684\u56FA\u5B9A\u6709\u6548\u503C\u9650\u5236\u689D\u4EF6 ''{3}'' \u7684\u503C\u4E0D\u4E00\u81F4\u3002
-        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u6B64\u985E\u578B\u4E2D\u4F7F\u7528 ''{1}'' \u7684\u5C6C\u6027\u5728\u57FA\u790E\u985E\u578B\u4E2D\u6C92\u6709\u4F7F\u7528\u7B26\u5408\u7684\u5C6C\u6027\uFF0C\u4E14\u57FA\u790E\u985E\u578B\u6C92\u6709\u842C\u7528\u5B57\u5143\u5C6C\u6027\u3002
-        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u6B64\u985E\u578B\u4E2D\u4F7F\u7528 ''{1}'' \u7684\u5C6C\u6027\u5728\u57FA\u790E\u985E\u578B\u4E2D\u6C92\u6709\u4F7F\u7528\u7B26\u5408\u7684\u5C6C\u6027\uFF0C\u4E14\u57FA\u790E\u985E\u578B\u4E2D\u7684\u842C\u7528\u5B57\u5143\u4E0D\u5141\u8A31\u4F7F\u7528\u6B64\u5C6C\u6027\u7684\u547D\u540D\u7A7A\u9593 ''{2}''\u3002
-        derivation-ok-restriction.3 = derivation-ok-restriction.3: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u57FA\u790E\u985E\u578B\u4E2D\u4F7F\u7528 ''{1}'' \u7684\u5C6C\u6027 REQUIRED \u70BA\u771F\uFF0C\u4F46\u662F\u884D\u751F\u985E\u578B\u4E2D\u6C92\u6709\u4F7F\u7528\u7B26\u5408\u7684\u5C6C\u6027\u3002
-        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u884D\u751F\u5177\u6709\u5C6C\u6027\u842C\u7528\u5B57\u5143\uFF0C\u4F46\u662F\u57FA\u790E\u5247\u5426\u3002
-        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u884D\u751F\u4E2D\u7684\u842C\u7528\u5B57\u5143\u4E0D\u662F\u57FA\u790E\u4E2D\u6709\u6548\u7684\u842C\u7528\u5B57\u5143\u5B50\u96C6\u3002
-        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u884D\u751F ({1}) \u4E2D\u842C\u7528\u5B57\u5143\u7684\u8655\u7406\u4F5C\u696D\u5167\u5BB9\u6BD4\u57FA\u790E ({2}) \u4E2D\u7684\u8655\u7406\u4F5C\u696D\u5167\u5BB9\u5F31\u3002
-        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u6B64\u985E\u578B\u7684\u7C21\u55AE\u5167\u5BB9\u985E\u578B ''{1}'' \u4E0D\u662F\u57FA\u790E\u7684\u7C21\u55AE\u5167\u5BB9\u985E\u578B (''{2}'') \u7684\u6709\u6548\u9650\u5236\u3002
-        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u6B64\u985E\u578B\u7684\u5167\u5BB9\u985E\u578B\u70BA\u7A7A\u767D\uFF0C\u4F46\u662F\u57FA\u790E\u7684\u5167\u5BB9\u985E\u578B ''{1}'' \u4E0D\u662F\u7A7A\u767D\u6216\u4E0D\u53EF\u70BA\u7A7A\u767D\u3002
-        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u6B64\u985E\u578B\u7684\u5167\u5BB9\u985E\u578B\u70BA\u6DF7\u5408\u985E\u578B\uFF0C\u4F46\u662F\u57FA\u790E\u7684\u5167\u5BB9\u985E\u578B ''{1}'' \u5247\u5426\u3002
-        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u985E\u578B\u7684\u7269\u4EF6\u4E0D\u662F\u57FA\u790E\u7269\u4EF6\u7684\u6709\u6548\u9650\u5236\u3002
-        enumeration-required-notation = enumeration-required-notation: \u7531 {2} ''{1}'' \u4F7F\u7528\u7684 NOTATION \u985E\u578B ''{0}''\uFF0C\u5FC5\u9808\u5177\u6709\u5217\u8209 facet \u503C\uFF0C\u4EE5\u6307\u5B9A\u6B64\u985E\u578B\u4F7F\u7528\u7684\u8868\u793A\u6CD5\u5143\u7D20\u3002
-        enumeration-valid-restriction = enumeration-valid-restriction: \u5217\u8209\u503C ''{0}'' \u4E0D\u5728\u57FA\u790E\u985E\u578B {1} \u7684\u503C\u7A7A\u9593\u4E2D\u3002
-        e-props-correct.2 = e-props-correct.2: \u5143\u7D20 ''{0}'' \u4E2D\u7684\u503C\u9650\u5236\u689D\u4EF6\u503C ''{1}'' \u7121\u6548\u3002
-        e-props-correct.4 = e-props-correct.4: \u5143\u7D20 ''{0}'' \u7684 '{'type definition'}' \u4E0D\u662F\u6709\u6548\u884D\u751F\u81EA substitutionHead ''{1}'' \u7684 '{'type definition'}'\uFF0C\u6216\u662F ''{1}'' \u7684 '{'substitution group exclusions'}' \u5C6C\u6027\u4E0D\u5141\u8A31\u6B64\u884D\u751F\u3002
-        e-props-correct.5 = e-props-correct.5: '{'value constraint'}' \u4E0D\u53EF\u51FA\u73FE\u5728\u5143\u7D20 ''{0}'' \u4E0A\uFF0C\u56E0\u70BA\u5143\u7D20\u7684 '{'type definition'}' \u6216 '{'type definition'}' \u7684 '{'content type'}' \u70BA ID\uFF0C\u6216\u884D\u751F\u81EA ID\u3002
-        e-props-correct.6 = e-props-correct.6: \u5075\u6E2C\u5230 ''{0}'' \u7684\u5FAA\u74B0\u66FF\u4EE3\u7FA4\u7D44\u3002
-        fractionDigits-valid-restriction = fractionDigits-valid-restriction: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0Cfacet ''fractionDigits'' \u7684\u503C ''{0}'' \u7121\u6548\uFF0C\u56E0\u70BA\u5B83\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC ''fractionDigits'' \u7684\u503C\uFF0C\u6B64\u503C\u4EE5\u5176\u4E2D\u4E00\u500B\u7956\u7CFB\u985E\u578B\u8A2D\u70BA ''{1}''\u3002
-        fractionDigits-totalDigits = fractionDigits-totalDigits: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0Cfacet ''fractionDigits'' \u7684\u503C ''{0}'' \u7121\u6548\uFF0C\u56E0\u70BA\u503C\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC ''totalDigits'' \u7684\u503C\uFF0C\u4EA6\u5373 ''{1}''\u3002
-        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: \u91DD\u5C0D\u985E\u578B {0}\uFF0Clength ''{1}'' \u7684\u503C\u5C0F\u65BC minLength ''{2}'' \u7684\u503C\u662F\u4E00\u9805\u932F\u8AA4\u3002
-        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: \u91DD\u5C0D\u985E\u578B {0}\uFF0C\u82E5\u76EE\u524D\u9650\u5236\u5177\u6709 minLength facet \u4E14\u76EE\u524D\u7684\u9650\u5236\u6216\u57FA\u790E\u5177\u6709 length facet\uFF0C\u5247\u57FA\u790E\u6C92\u6709 minLength facet \u662F\u4E00\u9805\u932F\u8AA4\u3002
-        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: \u91DD\u5C0D\u985E\u578B {0}\uFF0C\u76EE\u524D\u7684 minLength ''{1}'' \u4E0D\u7B49\u65BC\u57FA\u790E minLength ''{2}'' \u662F\u4E00\u9805\u932F\u8AA4\u3002
-        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: \u91DD\u5C0D\u985E\u578B {0}\uFF0Clength ''{1}'' \u7684\u503C\u5927\u65BC maxLength ''{2}'' \u7684\u503C\u662F\u4E00\u9805\u932F\u8AA4\u3002
-        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: \u91DD\u5C0D\u985E\u578B {0}\uFF0C\u82E5\u76EE\u524D\u7684\u9650\u5236\u5177\u6709 maxLength facet\uFF0C\u4E14\u76EE\u524D\u7684\u9650\u5236\u6216\u57FA\u790E\u5177\u6709 length facet\uFF0C\u5247\u57FA\u790E\u6C92\u6709 maxLength facet \u662F\u4E00\u9805\u932F\u8AA4\u3002
-        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: \u91DD\u5C0D\u985E\u578B {0}\uFF0C\u76EE\u524D\u7684 maxLength ''{1}'' \u4E0D\u7B49\u65BC\u57FA\u790E maxLength ''{2}'' \u662F\u4E00\u9805\u932F\u8AA4\u3002
-        length-valid-restriction = length-valid-restriction: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 length \u503C\u5FC5\u9808\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 length \u503C\u3002
-        maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 maxExclusive \u503C\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 maxExclusive\u3002
-        maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 maxExclusive \u503C\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 maxInclusive\u3002
-        maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 maxExclusive \u503C\u5FC5\u9808\u5927\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minInclusive\u3002
-        maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 maxExclusive \u503C\u5FC5\u9808\u5927\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minExclusive\u3002
-        maxInclusive-maxExclusive = maxInclusive-maxExclusive: \u70BA\u76F8\u540C\u8CC7\u6599\u985E\u578B\u540C\u6642\u6307\u5B9A maxInclusive \u8207 maxExclusive \u662F\u4E00\u9805\u932F\u8AA4\u3002\u5728 {2} \u4E2D\uFF0CmaxInclusive \u7B49\u65BC ''{0}'' \u4E14 maxExclusive \u7B49\u65BC ''{1}''\u3002
-        maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 maxInclusive \u503C\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 maxInclusive\u3002
-        maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 maxInclusive \u503C\u5FC5\u9808\u5C0F\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 maxExclusive\u3002
-        maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 maxInclusive \u503C\u5FC5\u9808\u5927\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minInclusive\u3002
-        maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 maxInclusive \u503C\u5FC5\u9808\u5927\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minExclusive\u3002
-        maxLength-valid-restriction = maxLength-valid-restriction: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u7B49\u65BC ''{0}'' \u7684 maxLength \u503C\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 maxLength \u503C\u3002
-        mg-props-correct.2 = mg-props-correct.2: \u5075\u6E2C\u5230\u7FA4\u7D44 ''{0}'' \u7684\u5FAA\u74B0\u5B9A\u7FA9\u3002\u905E\u8FF4\u4F7F\u7528\u7269\u4EF6\u7684 '{'term'}' \u503C\u5C07\u5C0E\u81F3\u5176 '{'term'}' \u70BA\u7FA4\u7D44\u672C\u8EAB\u7684\u7269\u4EF6\u3002
-        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u7B49\u65BC ''{0}'' \u7684 minExclusive \u503C\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC maxExclusive \u503C (\u7B49\u65BC ''{1}'')\u3002
-        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u7B49\u65BC ''{0}'' \u7684 minExclusive \u503C\u5FC5\u9808\u5C0F\u65BC maxInclusive \u503C (\u7B49\u65BC ''{1}'')\u3002
-        minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 minExclusive \u503C\u5FC5\u9808\u5927\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minExclusive\u3002
-        minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 minExclusive \u503C\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 maxInclusive\u3002
-        minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 minExclusive \u503C\u5FC5\u9808\u5927\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minInclusive\u3002
-        minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 minExclusive \u503C\u5FC5\u9808\u5C0F\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 maxExclusive\u3002
-        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u7B49\u65BC ''{0}'' \u7684 minInclusive \u503C\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC maxInclusive \u503C (\u7B49\u65BC ''{1}'')\u3002
-        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u7B49\u65BC ''{0}'' \u7684 minInclusive \u503C\u5FC5\u9808\u5C0F\u65BC maxExclusive \u503C (\u7B49\u65BC ''{1}'')\u3002
-        minInclusive-minExclusive = minInclusive-minExclusive: \u70BA\u76F8\u540C\u8CC7\u6599\u985E\u578B\u540C\u6642\u6307\u5B9A minInclusive \u8207 minExclusive \u662F\u4E00\u9805\u932F\u8AA4\u3002\u5728 {2} minInclusive \u7B49\u65BC ''{0}'' \u4E14 minExclusive \u7B49\u65BC ''{1}''\u3002
-        minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 minInclusive \u503C\u5FC5\u9808\u5927\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minInclusive\u3002
-        minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 minInclusive \u503C\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 maxInclusive\u3002
-        minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 minInclusive \u503C\u5FC5\u9808\u5927\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minExclusive\u3002
-        minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 minInclusive \u503C\u5FC5\u9808\u5C0F\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 maxExclusive\u3002
-        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u7B49\u65BC ''{0}'' \u7684 minLength \u503C\u5FC5\u9808\u5C0F\u65BC maxLength \u503C (\u7B49\u65BC ''{1}'')\u3002
-        minLength-valid-restriction = minLength-valid-restriction: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u7B49\u65BC ''{0}'' \u7684 minLength \u5FC5\u9808\u5927\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minLength\u3002
-        no-xmlns = no-xmlns: \u5C6C\u6027\u5BA3\u544A\u7684 {name} \u4E0D\u80FD\u8207 'xmlns' \u76F8\u540C\u3002
-        no-xsi = no-xsi: \u5C6C\u6027\u5BA3\u544A\u7684 '{'target namespace'}' \u4E0D\u80FD\u8207 ''{0}'' \u76F8\u540C\u3002
-        p-props-correct.2.1 = p-props-correct.2.1: \u5728 ''{0}'' \u7684\u5BA3\u544A\u4E2D\uFF0C''minOccurs'' \u7684\u503C\u70BA ''{1}''\uFF0C\u4F46\u662F\u5B83\u4E0D\u53EF\u5927\u65BC ''maxOccurs'' \u7684\u503C ''{2}''\u3002
-        rcase-MapAndSum.1 = rcase-MapAndSum.1: \u7269\u4EF6\u4E4B\u9593\u6C92\u6709\u5B8C\u6574\u7684\u529F\u80FD\u5C0D\u61C9\u3002
-        rcase-MapAndSum.2 = rcase-MapAndSum.2: \u7FA4\u7D44\u7684\u767C\u751F\u7BC4\u570D ({0}\uFF0C{1}) \u4E0D\u662F\u57FA\u790E\u7FA4\u7D44\u767C\u751F\u7BC4\u570D ({2}\uFF0C{3}) \u7684\u6709\u6548\u9650\u5236\u3002
-        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: \u5143\u7D20\u5177\u6709\u4E0D\u76F8\u540C\u7684\u540D\u7A31\u8207\u76EE\u6A19\u547D\u540D\u7A7A\u9593: \u547D\u540D\u7A7A\u9593 ''{1}'' \u4E2D\u7684\u5143\u7D20 ''{0}'' \u8207\u547D\u540D\u7A7A\u9593 ''{3}'' \u4E2D\u7684\u5143\u7D20 ''{2}''\u3002
-        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: \u7269\u4EF6\u7684 '{'term'}' \u70BA\u5143\u7D20\u5BA3\u544A ''{0}'' \u7684\u932F\u8AA4\u3002\u5143\u7D20\u5BA3\u544A\u7684 '{'nillable'}' \u70BA\u771F\uFF0C\u4F46\u662F\u57FA\u790E\u985E\u578B\u4E2D\u7684\u5C0D\u61C9\u7269\u4EF6\u5177\u6709 '{'nillable'}' \u70BA\u507D\u7684\u5143\u7D20\u5BA3\u544A\u3002
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: \u7269\u4EF6\u7684 '{'term'}' \u70BA\u5143\u7D20\u5BA3\u544A ''{0}'' \u7684\u932F\u8AA4\u3002\u5B83\u7684\u767C\u751F\u7BC4\u570D ({1}\uFF0C{2}) \u4E0D\u662F\u57FA\u790E\u985E\u578B\u4E2D\u5C0D\u61C9\u7269\u4EF6\u7BC4\u570D ({3}\uFF0C{4}) \u7684\u6709\u6548\u9650\u5236\u3002
-        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: \u5143\u7D20 ''{0}'' \u975E\u56FA\u5B9A\u5F0F\uFF0C\u4F46\u662F\u57FA\u790E\u985E\u578B\u4E2D\u5C0D\u61C9\u7684\u5143\u7D20\u5177\u6709\u56FA\u5B9A\u503C ''{1}''\u3002
-        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: \u5143\u7D20 ''{0}'' \u5177\u6709\u56FA\u5B9A\u503C ''{1}''\uFF0C\u4F46\u662F\u57FA\u790E\u985E\u578B\u4E2D\u5C0D\u61C9\u7684\u5143\u7D20\u5177\u6709\u56FA\u5B9A\u503C ''{2}''\u3002
-        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: \u5143\u7D20 ''{0}'' \u7684\u8B58\u5225\u9650\u5236\u689D\u4EF6\u4E0D\u662F\u57FA\u790E\u4E2D\u7684\u5B50\u96C6\u3002
-        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: \u5143\u7D20 ''{0}'' \u4E0D\u5141\u8A31\u7684\u66FF\u4EE3\u4E0D\u662F\u57FA\u790E\u4E2D\u7684\u8D85\u96C6\u3002
-        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: \u5143\u7D20 ''{0}'' \u7684\u985E\u578B ''{1}'' \u4E0D\u662F\u884D\u751F\u81EA\u57FA\u790E\u5143\u7D20 ''{2}'' \u7684\u985E\u578B\u3002
-        rcase-NSCompat.1 = rcase-NSCompat.1: \u5143\u7D20 ''{0}'' \u5177\u6709\u57FA\u790E\u4E2D\u842C\u7528\u5B57\u5143\u4E0D\u5141\u8A31\u7684\u547D\u540D\u7A7A\u9593 ''{1}''\u3002
-        rcase-NSCompat.2 = rcase-NSCompat.2: \u7269\u4EF6\u7684 '{'term'}' \u70BA\u5143\u7D20\u5BA3\u544A ''{0}'' \u7684\u932F\u8AA4\u3002\u5B83\u7684\u767C\u751F\u7BC4\u570D ({1}\uFF0C{2}) \u4E0D\u662F\u57FA\u790E\u985E\u578B\u4E2D\u5C0D\u61C9\u7269\u4EF6\u7BC4\u570D ({3}\uFF0C{4}) \u7684\u6709\u6548\u9650\u5236\u3002
-        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: \u7269\u4EF6\u4E4B\u9593\u6C92\u6709\u5B8C\u6574\u7684\u529F\u80FD\u5C0D\u61C9\u3002
-        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: \u7FA4\u7D44\u7684\u767C\u751F\u7BC4\u570D ({0}\uFF0C{1}) \u4E0D\u662F\u57FA\u790E\u842C\u7528\u5B57\u5143\u7BC4\u570D ({2}\uFF0C{3}) \u7684\u6709\u6548\u9650\u5236\u3002
-        rcase-NSSubset.1 = rcase-NSSubset.1: \u842C\u7528\u5B57\u5143\u4E0D\u662F\u57FA\u790E\u4E2D\u5C0D\u61C9\u842C\u7528\u5B57\u5143\u7684\u5B50\u96C6\u3002
-        rcase-NSSubset.2 = rcase-NSSubset.2: \u842C\u7528\u5B57\u5143\u7684\u767C\u751F\u7BC4\u570D ({0}\uFF0C{1}) \u4E0D\u662F\u57FA\u790E\u842C\u7528\u5B57\u5143\u7BC4\u570D ({2}\uFF0C{3}) \u7684\u6709\u6548\u9650\u5236\u3002
-        rcase-NSSubset.3 = rcase-NSSubset.3: \u842C\u7528\u5B57\u5143\u7684\u8655\u7406\u4F5C\u696D\u5167\u5BB9 ''{0}'' \u6BD4\u57FA\u790E ''{1}'' \u4E2D\u7684\u8655\u7406\u4F5C\u696D\u5167\u5BB9\u5F31\u3002
-        rcase-Recurse.1 = rcase-Recurse.1: \u7FA4\u7D44\u7684\u767C\u751F\u7BC4\u570D ({0}\uFF0C{1}) \u4E0D\u662F\u57FA\u790E\u7FA4\u7D44\u767C\u751F\u7BC4\u570D ({2}\uFF0C{3}) \u7684\u6709\u6548\u9650\u5236\u3002
-        rcase-Recurse.2 = rcase-Recurse.2: \u7269\u4EF6\u4E4B\u9593\u6C92\u6709\u5B8C\u6574\u7684\u529F\u80FD\u5C0D\u61C9\u3002
-        rcase-RecurseLax.1 = rcase-RecurseLax.1: \u7FA4\u7D44\u7684\u767C\u751F\u7BC4\u570D ({0}\uFF0C{1}) \u4E0D\u662F\u57FA\u790E\u7FA4\u7D44\u767C\u751F\u7BC4\u570D ({2}\uFF0C{3}) \u7684\u6709\u6548\u9650\u5236\u3002
-        rcase-RecurseLax.2 = rcase-RecurseLax.2: \u7269\u4EF6\u4E4B\u9593\u6C92\u6709\u5B8C\u6574\u7684\u529F\u80FD\u5C0D\u61C9\u3002
-        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: \u7FA4\u7D44\u7684\u767C\u751F\u7BC4\u570D ({0}\uFF0C{1}) \u4E0D\u662F\u57FA\u790E\u7FA4\u7D44\u767C\u751F\u7BC4\u570D ({2}\uFF0C{3}) \u7684\u6709\u6548\u9650\u5236\u3002
-        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: \u7269\u4EF6\u4E4B\u9593\u6C92\u6709\u5B8C\u6574\u7684\u529F\u80FD\u5C0D\u61C9\u3002
+        ag-props-correct.2 = ag-props-correct.2: 屬性群組 ''{0}'' 的錯誤。重複屬性使用相同名稱且指定了目標命名空間。重複屬性使用的名稱為 ''{1}''。
+        ag-props-correct.3 = ag-props-correct.3: 屬性群組 ''{0}'' 的錯誤。兩個屬性宣告 ''{1}'' 與 ''{2}'' 具有衍生自 ID 的類型。
+        a-props-correct.2 = a-props-correct.2: 屬性 ''{0}'' 中的值限制條件值 ''{1}'' 無效。
+        a-props-correct.3 = a-props-correct.3: 屬性 ''{0}'' 無法使用 ''fixed'' 或 ''default''，因為屬性的 '{'type definition'}' 為 ID，或衍生自 ID。
+        au-props-correct.2 = au-props-correct.2: 在 ''{0}'' 的屬性宣告中，指定了 ''{1}'' 的固定值。因此，若參照 ''{0}'' 的屬性使用也具有 '{'value constraint'}'，它必須是固定值且值必須為 ''{1}''。
+        cos-all-limited.1.2 = cos-all-limited.1.2: 'all' 模型群組必須出現在 '{'min occurs'}' = '{'max occurs'}' = 1 的物件中，且該物件必須是一對組成複雜類型定義之 '{'content type'}' 物件中的一部分。
+        cos-all-limited.2 = cos-all-limited.2: ''all'' 模型群組中元素的 '{'max occurs'}' 必須是 0 或 1。元素 ''{1}'' 的值 ''{0}'' 無效。
+        cos-applicable-facets = cos-applicable-facets: 類型 {1} 不允許 Facet ''{0}''。
+        cos-ct-extends.1.1 = cos-ct-extends.1.1: 類型 ''{0}'' 是由擴充套件從類型 ''{1}'' 衍生。不過，''{1}'' 的 ''final'' 屬性禁止由擴充套件衍生。
+        cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: 衍生類型與其基礎的內容類型皆必須是混合類型或兩者皆是 element-only。類型 ''{0}'' 是 element-only，但其基礎類型則否。
+        cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: 衍生類型與其基礎的內容類型皆必須是混合類型或兩者皆是 element-only。類型 ''{0}'' 為混合類型，但其基礎類型則否。
+        cos-element-consistent = cos-element-consistent: 類型 ''{0}'' 的錯誤。在模型群組中出現名稱 ''{1}''、不同類型的多個元素。
+        cos-list-of-atomic = cos-list-of-atomic: 清單類型 ''{0}'' 的定義中，類型 ''{1}'' 是無效的清單元素類型，因為它不是單元類型 (''{1}'' 為清單類型，或包含清單的聯集類型)。
+        cos-nonambig = cos-nonambig: {0} 與 {1} (或來自其替代群組的元素) 違反「唯一物件屬性」。依此綱要驗證期間，為這兩個物件建立了不確定性。
+        cos-particle-restrict.a = cos-particle-restrict.a: 衍生物件為空白，則基礎物件不可為空白。
+        cos-particle-restrict.b = cos-particle-restrict.b: 基礎物件為空白，但是衍生物件則否。
+        cos-particle-restrict.2 = cos-particle-restrict.2: 禁止的物件限制: ''{0}''。
+        cos-st-restricts.1.1 = cos-st-restricts.1.1: 類型 ''{1}'' 為單元類型，因此其 '{'base type definition'}' (''{0}'') 必須是單元簡單類型定義或內建的原始資料類型。
+        cos-st-restricts.2.1 = cos-st-restricts.2.1: 清單類型 ''{0}'' 的定義中，類型 ''{1}'' 是無效的項目類型，因為它是清單類型，或包含清單的聯集類型。
+        cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: '{'item type definition'}' 的 '{'final'}' 元件 ''{0}'' 包含 ''list''。這代表 ''{0}'' 無法作為清單類型 ''{1}'' 的項目類型。
+        cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: '{'member type definitions'}' 的 '{'final'}' 元件 ''{0}'' 包含 ''union''。這代表 ''{0}'' 無法作為聯集類型 ''{1}'' 的成員類型。
+        cos-valid-default.2.1 = cos-valid-default.2.1: 元素 ''{0}'' 具有值限制條件，且必須具有混合或簡單內容模型。
+        cos-valid-default.2.2.2 = cos-valid-default.2.2.2: 由於元素 ''{0}'' 具有 '{'value constraint'}' 且其類型定義具有混合的 '{'content type'}'，因此 '{'content type'}' 的物件必須是可空白。
+        c-props-correct.2 = c-props-correct.2: keyref ''{0}'' 與 key ''{1}'' 的 Fields 基數彼此必須相符。
+        ct-props-correct.3 = ct-props-correct.3: 偵測到複雜類型 ''{0}'' 的循環定義。這代表 ''{0}'' 包含在自身類型階層中，這是一項錯誤。
+        ct-props-correct.4 = ct-props-correct.4: 類型 ''{0}'' 的錯誤。重複屬性使用相同名稱且指定了目標命名空間。重複屬性使用的名稱為 ''{1}''。
+        ct-props-correct.5 = ct-props-correct.5: 類型 ''{0}'' 的錯誤。兩個屬性宣告 ''{1}'' 與 ''{2}'' 具有衍生自 ID 的類型。
+        derivation-ok-restriction.1 = derivation-ok-restriction.1: 類型 ''{0}'' 由限制從類型 ''{1}'' 衍生。不過，''{1}'' 具有 '{'final'}' 屬性，禁止由限制衍生。
+        derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: 類型 ''{0}'' 的錯誤。此類型中使用 ''{1}'' 的屬性具有 ''use'' 值的 ''{2}''，這與基礎類型中使用符合屬性的 ''required'' 值不一致。
+        derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: 類型 ''{0}'' 的錯誤。此類型中使用 ''{1}'' 的屬性具有類型 ''{2}''，這不是有效衍生自 ''{3}''，亦即基礎類型中使用符合屬性的類型。
+        derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: 類型 ''{0}'' 的錯誤。此類型中使用 ''{1}'' 的屬性具有未固定的有效值限制條件，而基礎類型中使用的符合屬性有效值限制條件為固定式。
+        derivation-ok-restriction.2.1.3.b = derivation-ok-restriction.2.1.3.b: 類型 ''{0}'' 的錯誤。此類型中使用 ''{1}'' 的屬性具有 ''{2}'' 固定值的有效值限制條件，這與基礎類型中使用符合屬性的固定有效值限制條件 ''{3}'' 的值不一致。
+        derivation-ok-restriction.2.2.a = derivation-ok-restriction.2.2.a: 類型 ''{0}'' 的錯誤。此類型中使用 ''{1}'' 的屬性在基礎類型中沒有使用符合的屬性，且基礎類型沒有萬用字元屬性。
+        derivation-ok-restriction.2.2.b = derivation-ok-restriction.2.2.b: 類型 ''{0}'' 的錯誤。此類型中使用 ''{1}'' 的屬性在基礎類型中沒有使用符合的屬性，且基礎類型中的萬用字元不允許使用此屬性的命名空間 ''{2}''。
+        derivation-ok-restriction.3 = derivation-ok-restriction.3: 類型 ''{0}'' 的錯誤。基礎類型中使用 ''{1}'' 的屬性 REQUIRED 為真，但是衍生類型中沒有使用符合的屬性。
+        derivation-ok-restriction.4.1 = derivation-ok-restriction.4.1: 類型 ''{0}'' 的錯誤。衍生具有屬性萬用字元，但是基礎則否。
+        derivation-ok-restriction.4.2 = derivation-ok-restriction.4.2: 類型 ''{0}'' 的錯誤。衍生中的萬用字元不是基礎中有效的萬用字元子集。
+        derivation-ok-restriction.4.3 = derivation-ok-restriction.4.3: 類型 ''{0}'' 的錯誤。衍生 ({1}) 中萬用字元的處理作業內容比基礎 ({2}) 中的處理作業內容弱。
+        derivation-ok-restriction.5.2.2.1 = derivation-ok-restriction.5.2.2.1: 類型 ''{0}'' 的錯誤。此類型的簡單內容類型 ''{1}'' 不是基礎的簡單內容類型 (''{2}'') 的有效限制。
+        derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: 類型 ''{0}'' 的錯誤。此類型的內容類型為空白，但是基礎的內容類型 ''{1}'' 不是空白或不可為空白。
+        derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: 類型 ''{0}'' 的錯誤。此類型的內容類型為混合類型，但是基礎的內容類型 ''{1}'' 則否。
+        derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: 類型 ''{0}'' 的錯誤。類型的物件不是基礎物件的有效限制。
+        enumeration-required-notation = enumeration-required-notation: 由 {2} ''{1}'' 使用的 NOTATION 類型 ''{0}''，必須具有列舉 facet 值，以指定此類型使用的表示法元素。
+        enumeration-valid-restriction = enumeration-valid-restriction: 列舉值 ''{0}'' 不在基礎類型 {1} 的值空間中。
+        e-props-correct.2 = e-props-correct.2: 元素 ''{0}'' 中的值限制條件值 ''{1}'' 無效。
+        e-props-correct.4 = e-props-correct.4: 元素 ''{0}'' 的 '{'type definition'}' 不是有效衍生自 substitutionHead ''{1}'' 的 '{'type definition'}'，或是 ''{1}'' 的 '{'substitution group exclusions'}' 屬性不允許此衍生。
+        e-props-correct.5 = e-props-correct.5: '{'value constraint'}' 不可出現在元素 ''{0}'' 上，因為元素的 '{'type definition'}' 或 '{'type definition'}' 的 '{'content type'}' 為 ID，或衍生自 ID。
+        e-props-correct.6 = e-props-correct.6: 偵測到 ''{0}'' 的循環替代群組。
+        fractionDigits-valid-restriction = fractionDigits-valid-restriction: 在 {2} 的定義中，facet ''fractionDigits'' 的值 ''{0}'' 無效，因為它必須小於或等於 ''fractionDigits'' 的值，此值以其中一個祖系類型設為 ''{1}''。
+        fractionDigits-totalDigits = fractionDigits-totalDigits: 在 {2} 的定義中，facet ''fractionDigits'' 的值 ''{0}'' 無效，因為值必須小於或等於 ''totalDigits'' 的值，亦即 ''{1}''。
+        length-minLength-maxLength.1.1 = length-minLength-maxLength.1.1: 針對類型 {0}，length ''{1}'' 的值小於 minLength ''{2}'' 的值是一項錯誤。
+        length-minLength-maxLength.1.2.a = length-minLength-maxLength.1.2.a: 針對類型 {0}，若目前限制具有 minLength facet 且目前的限制或基礎具有 length facet，則基礎沒有 minLength facet 是一項錯誤。
+        length-minLength-maxLength.1.2.b = length-minLength-maxLength.1.2.b: 針對類型 {0}，目前的 minLength ''{1}'' 不等於基礎 minLength ''{2}'' 是一項錯誤。
+        length-minLength-maxLength.2.1 = length-minLength-maxLength.2.1: 針對類型 {0}，length ''{1}'' 的值大於 maxLength ''{2}'' 的值是一項錯誤。
+        length-minLength-maxLength.2.2.a = length-minLength-maxLength.2.2.a: 針對類型 {0}，若目前的限制具有 maxLength facet，且目前的限制或基礎具有 length facet，則基礎沒有 maxLength facet 是一項錯誤。
+        length-minLength-maxLength.2.2.b = length-minLength-maxLength.2.2.b: 針對類型 {0}，目前的 maxLength ''{1}'' 不等於基礎 maxLength ''{2}'' 是一項錯誤。
+        length-valid-restriction = length-valid-restriction: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 length 值必須等於基礎類型 ''{1}'' 的 length 值。
+        maxExclusive-valid-restriction.1 = maxExclusive-valid-restriction.1: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 maxExclusive 值必須小於或等於基礎類型 ''{1}'' 的 maxExclusive。
+        maxExclusive-valid-restriction.2 = maxExclusive-valid-restriction.2: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 maxExclusive 值必須小於或等於基礎類型 ''{1}'' 的 maxInclusive。
+        maxExclusive-valid-restriction.3 = maxExclusive-valid-restriction.3: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 maxExclusive 值必須大於基礎類型 ''{1}'' 的 minInclusive。
+        maxExclusive-valid-restriction.4 = maxExclusive-valid-restriction.4: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 maxExclusive 值必須大於基礎類型 ''{1}'' 的 minExclusive。
+        maxInclusive-maxExclusive = maxInclusive-maxExclusive: 為相同資料類型同時指定 maxInclusive 與 maxExclusive 是一項錯誤。在 {2} 中，maxInclusive 等於 ''{0}'' 且 maxExclusive 等於 ''{1}''。
+        maxInclusive-valid-restriction.1 = maxInclusive-valid-restriction.1: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 maxInclusive 值必須小於或等於基礎類型 ''{1}'' 的 maxInclusive。
+        maxInclusive-valid-restriction.2 = maxInclusive-valid-restriction.2: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 maxInclusive 值必須小於基礎類型 ''{1}'' 的 maxExclusive。
+        maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 maxInclusive 值必須大於或等於基礎類型 ''{1}'' 的 minInclusive。
+        maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 maxInclusive 值必須大於基礎類型 ''{1}'' 的 minExclusive。
+        maxLength-valid-restriction = maxLength-valid-restriction: 在 {2} 的定義中，等於 ''{0}'' 的 maxLength 值必須小於或等於基礎類型 ''{1}'' 的 maxLength 值。
+        mg-props-correct.2 = mg-props-correct.2: 偵測到群組 ''{0}'' 的循環定義。遞迴使用物件的 '{'term'}' 值將導至其 '{'term'}' 為群組本身的物件。
+        minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: 在 {2} 的定義中，等於 ''{0}'' 的 minExclusive 值必須小於或等於 maxExclusive 值 (等於 ''{1}'')。
+        minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: 在 {2} 的定義中，等於 ''{0}'' 的 minExclusive 值必須小於 maxInclusive 值 (等於 ''{1}'')。
+        minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 minExclusive 值必須大於或等於基礎類型 ''{1}'' 的 minExclusive。
+        minExclusive-valid-restriction.2 = minExclusive-valid-restriction.2: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 minExclusive 值必須小於或等於基礎類型 ''{1}'' 的 maxInclusive。
+        minExclusive-valid-restriction.3 = minExclusive-valid-restriction.3: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 minExclusive 值必須大於或等於基礎類型 ''{1}'' 的 minInclusive。
+        minExclusive-valid-restriction.4 = minExclusive-valid-restriction.4: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 minExclusive 值必須小於基礎類型 ''{1}'' 的 maxExclusive。
+        minInclusive-less-than-equal-to-maxInclusive = minInclusive-less-than-equal-to-maxInclusive: 在 {2} 的定義中，等於 ''{0}'' 的 minInclusive 值必須小於或等於 maxInclusive 值 (等於 ''{1}'')。
+        minInclusive-less-than-maxExclusive = minInclusive-less-than-maxExclusive: 在 {2} 的定義中，等於 ''{0}'' 的 minInclusive 值必須小於 maxExclusive 值 (等於 ''{1}'')。
+        minInclusive-minExclusive = minInclusive-minExclusive: 為相同資料類型同時指定 minInclusive 與 minExclusive 是一項錯誤。在 {2} minInclusive 等於 ''{0}'' 且 minExclusive 等於 ''{1}''。
+        minInclusive-valid-restriction.1 = minInclusive-valid-restriction.1: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 minInclusive 值必須大於或等於基礎類型 ''{1}'' 的 minInclusive。
+        minInclusive-valid-restriction.2 = minInclusive-valid-restriction.2: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 minInclusive 值必須小於或等於基礎類型 ''{1}'' 的 maxInclusive。
+        minInclusive-valid-restriction.3 = minInclusive-valid-restriction.3: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 minInclusive 值必須大於基礎類型 ''{1}'' 的 minExclusive。
+        minInclusive-valid-restriction.4 = minInclusive-valid-restriction.4: 類型 ''{2}'' 的錯誤。等於 ''{0}'' 的 minInclusive 值必須小於基礎類型 ''{1}'' 的 maxExclusive。
+        minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: 在 {2} 的定義中，等於 ''{0}'' 的 minLength 值必須小於 maxLength 值 (等於 ''{1}'')。
+        minLength-valid-restriction = minLength-valid-restriction: 在 {2} 的定義中，等於 ''{0}'' 的 minLength 必須大於或等於基礎類型 ''{1}'' 的 minLength。
+        no-xmlns = no-xmlns: 屬性宣告的 {name} 不能與 'xmlns' 相同。
+        no-xsi = no-xsi: 屬性宣告的 '{'target namespace'}' 不能與 ''{0}'' 相同。
+        p-props-correct.2.1 = p-props-correct.2.1: 在 ''{0}'' 的宣告中，''minOccurs'' 的值為 ''{1}''，但是它不可大於 ''maxOccurs'' 的值 ''{2}''。
+        rcase-MapAndSum.1 = rcase-MapAndSum.1: 物件之間沒有完整的功能對應。
+        rcase-MapAndSum.2 = rcase-MapAndSum.2: 群組的發生範圍 ({0}，{1}) 不是基礎群組發生範圍 ({2}，{3}) 的有效限制。
+        rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: 元素具有不相同的名稱與目標命名空間: 命名空間 ''{1}'' 中的元素 ''{0}'' 與命名空間 ''{3}'' 中的元素 ''{2}''。
+        rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: 物件的 '{'term'}' 為元素宣告 ''{0}'' 的錯誤。元素宣告的 '{'nillable'}' 為真，但是基礎類型中的對應物件具有 '{'nillable'}' 為偽的元素宣告。
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: 物件的 '{'term'}' 為元素宣告 ''{0}'' 的錯誤。它的發生範圍 ({1}，{2}) 不是基礎類型中對應物件範圍 ({3}，{4}) 的有效限制。
+        rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: 元素 ''{0}'' 非固定式，但是基礎類型中對應的元素具有固定值 ''{1}''。
+        rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: 元素 ''{0}'' 具有固定值 ''{1}''，但是基礎類型中對應的元素具有固定值 ''{2}''。
+        rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: 元素 ''{0}'' 的識別限制條件不是基礎中的子集。
+        rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: 元素 ''{0}'' 不允許的替代不是基礎中的超集。
+        rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: 元素 ''{0}'' 的類型 ''{1}'' 不是衍生自基礎元素 ''{2}'' 的類型。
+        rcase-NSCompat.1 = rcase-NSCompat.1: 元素 ''{0}'' 具有基礎中萬用字元不允許的命名空間 ''{1}''。
+        rcase-NSCompat.2 = rcase-NSCompat.2: 物件的 '{'term'}' 為元素宣告 ''{0}'' 的錯誤。它的發生範圍 ({1}，{2}) 不是基礎類型中對應物件範圍 ({3}，{4}) 的有效限制。
+        rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: 物件之間沒有完整的功能對應。
+        rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: 群組的發生範圍 ({0}，{1}) 不是基礎萬用字元範圍 ({2}，{3}) 的有效限制。
+        rcase-NSSubset.1 = rcase-NSSubset.1: 萬用字元不是基礎中對應萬用字元的子集。
+        rcase-NSSubset.2 = rcase-NSSubset.2: 萬用字元的發生範圍 ({0}，{1}) 不是基礎萬用字元範圍 ({2}，{3}) 的有效限制。
+        rcase-NSSubset.3 = rcase-NSSubset.3: 萬用字元的處理作業內容 ''{0}'' 比基礎 ''{1}'' 中的處理作業內容弱。
+        rcase-Recurse.1 = rcase-Recurse.1: 群組的發生範圍 ({0}，{1}) 不是基礎群組發生範圍 ({2}，{3}) 的有效限制。
+        rcase-Recurse.2 = rcase-Recurse.2: 物件之間沒有完整的功能對應。
+        rcase-RecurseLax.1 = rcase-RecurseLax.1: 群組的發生範圍 ({0}，{1}) 不是基礎群組發生範圍 ({2}，{3}) 的有效限制。
+        rcase-RecurseLax.2 = rcase-RecurseLax.2: 物件之間沒有完整的功能對應。
+        rcase-RecurseUnordered.1 = rcase-RecurseUnordered.1: 群組的發生範圍 ({0}，{1}) 不是基礎群組發生範圍 ({2}，{3}) 的有效限制。
+        rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: 物件之間沒有完整的功能對應。
 #        We're using sch-props-correct.2 instead of the old src-redefine.1
 #        src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
-        sch-props-correct.2 = sch-props-correct.2: \u7DB1\u8981\u7121\u6CD5\u5305\u542B\u76F8\u540C\u540D\u7A31\u7684\u5169\u500B\u5168\u57DF\u5143\u4EF6; \u6B64\u7DB1\u8981\u5305\u542B\u5169\u500B ''{0}''\u3002
-        st-props-correct.2 = st-props-correct.2: \u5075\u6E2C\u5230\u7C21\u55AE\u985E\u578B ''{0}'' \u7684\u5FAA\u74B0\u5B9A\u7FA9\u3002\u9019\u4EE3\u8868 ''{0}'' \u5305\u542B\u5728\u81EA\u8EAB\u985E\u578B\u968E\u5C64\u4E2D\uFF0C\u9019\u662F\u4E00\u9805\u932F\u8AA4\u3002
-        st-props-correct.3 = st-props-correct.3: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002'{'base type definition'}' \u7684 '{'final'}' \u503C ''{1}'' \u9650\u5236\u7981\u6B62\u884D\u751F\u3002
-        totalDigits-valid-restriction = totalDigits-valid-restriction: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0Cfacet ''totalDigits'' \u7684\u503C ''{0}'' \u7121\u6548\uFF0C\u56E0\u70BA\u5B83\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC ''totalDigits'' \u7684\u503C\uFF0C\u6B64\u503C\u4EE5\u5176\u4E2D\u4E00\u500B\u7956\u7CFB\u985E\u578B\u8A2D\u70BA ''{1}''\u3002
-        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: \u5728 {0} \u7684\u5B9A\u7FA9\u4E2D\uFF0Cfacet ''whitespace'' \u7684\u503C ''{1}'' \u7121\u6548\uFF0C\u56E0\u70BA ''whitespace'' \u7684\u503C\u4EE5\u5176\u4E2D\u4E00\u500B\u7956\u7CFB\u985E\u578B\u8A2D\u70BA ''collapse''\u3002
-        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: \u5728 {0} \u7684\u5B9A\u7FA9\u4E2D\uFF0Cfacet ''whitespace'' \u7684\u503C ''preserve'' \u7121\u6548\uFF0C\u56E0\u70BA ''whitespace'' \u7684\u503C\u5728\u5176\u4E2D\u4E00\u500B\u7956\u7CFB\u985E\u578B\u4E2D\u8A2D\u70BA ''replace''\u3002
+        sch-props-correct.2 = sch-props-correct.2: 綱要無法包含相同名稱的兩個全域元件; 此綱要包含兩個 ''{0}''。
+        st-props-correct.2 = st-props-correct.2: 偵測到簡單類型 ''{0}'' 的循環定義。這代表 ''{0}'' 包含在自身類型階層中，這是一項錯誤。
+        st-props-correct.3 = st-props-correct.3: 類型 ''{0}'' 的錯誤。'{'base type definition'}' 的 '{'final'}' 值 ''{1}'' 限制禁止衍生。
+        totalDigits-valid-restriction = totalDigits-valid-restriction: 在 {2} 的定義中，facet ''totalDigits'' 的值 ''{0}'' 無效，因為它必須小於或等於 ''totalDigits'' 的值，此值以其中一個祖系類型設為 ''{1}''。
+        whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: 在 {0} 的定義中，facet ''whitespace'' 的值 ''{1}'' 無效，因為 ''whitespace'' 的值以其中一個祖系類型設為 ''collapse''。
+        whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: 在 {0} 的定義中，facet ''whitespace'' 的值 ''preserve'' 無效，因為 ''whitespace'' 的值在其中一個祖系類型中設為 ''replace''。
 
 #schema for Schemas
 
-        s4s-att-invalid-value = s4s-att-invalid-value: \u5143\u7D20 ''{0}'' \u4E2D ''{1}'' \u7684\u5C6C\u6027\u503C\u7121\u6548\u3002\u8A18\u9304\u7684\u539F\u56E0: {2}
-        s4s-att-must-appear = s4s-att-must-appear: \u5C6C\u6027 ''{1}'' \u5FC5\u9808\u51FA\u73FE\u5728\u5143\u7D20 ''{0}'' \u4E2D\u3002
-        s4s-att-not-allowed = s4s-att-not-allowed: \u5C6C\u6027 ''{1}'' \u4E0D\u53EF\u51FA\u73FE\u5728\u5143\u7D20 ''{0}'' \u4E2D\u3002
-        s4s-elt-invalid = s4s-elt-invalid: \u5143\u7D20 ''{0}'' \u4E0D\u662F\u7DB1\u8981\u6587\u4EF6\u4E2D\u7684\u6709\u6548\u5143\u7D20\u3002
-        s4s-elt-must-match.1 = s4s-elt-must-match.1: ''{0}'' \u7684\u5167\u5BB9\u5FC5\u9808\u7B26\u5408 {1}\u3002\u5F9E {2} \u958B\u59CB\u51FA\u73FE\u554F\u984C\u3002
-        s4s-elt-must-match.2 = s4s-elt-must-match.2: ''{0}'' \u7684\u5167\u5BB9\u5FC5\u9808\u7B26\u5408 {1}\u3002\u627E\u4E0D\u5230\u8DB3\u5920\u7684\u5143\u7D20\u3002
+        s4s-att-invalid-value = s4s-att-invalid-value: 元素 ''{0}'' 中 ''{1}'' 的屬性值無效。記錄的原因: {2}
+        s4s-att-must-appear = s4s-att-must-appear: 屬性 ''{1}'' 必須出現在元素 ''{0}'' 中。
+        s4s-att-not-allowed = s4s-att-not-allowed: 屬性 ''{1}'' 不可出現在元素 ''{0}'' 中。
+        s4s-elt-invalid = s4s-elt-invalid: 元素 ''{0}'' 不是綱要文件中的有效元素。
+        s4s-elt-must-match.1 = s4s-elt-must-match.1: ''{0}'' 的內容必須符合 {1}。從 {2} 開始出現問題。
+        s4s-elt-must-match.2 = s4s-elt-must-match.2: ''{0}'' 的內容必須符合 {1}。找不到足夠的元素。
         # the "invalid-content" messages provide less information than the "must-match" counterparts above. They're used for complex types when providing a "match" would be an information dump
-        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: ''{0}'' \u7684\u5167\u5BB9\u7121\u6548\u3002\u5143\u7D20 ''{1}'' \u7121\u6548\u3001\u4F4D\u7F6E\u932F\u8AA4\u6216\u592A\u5E38\u51FA\u73FE\u3002
-        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: ''{0}'' \u7684\u5167\u5BB9\u7121\u6548\u3002\u5143\u7D20 ''{1}'' \u4E0D\u53EF\u7A7A\u767D\u3002
-        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: \u985E\u578B ''{0}'' \u7684\u5143\u7D20\u4E0D\u53EF\u51FA\u73FE\u5728\u5BA3\u544A\u4E4B\u5F8C\uFF0C\u4F5C\u70BA <schema> \u5143\u7D20\u7684\u5B50\u9805\u3002
-        s4s-elt-schema-ns = s4s-elt-schema-ns: \u5143\u7D20 ''{0}'' \u7684\u547D\u540D\u7A7A\u9593\u5FC5\u9808\u4F86\u81EA\u7DB1\u8981\u547D\u540D\u7A7A\u9593 ''http://www.w3.org/2001/XMLSchema''\u3002
-        s4s-elt-character = s4s-elt-character: \u7DB1\u8981\u5143\u7D20\u4E2D\u4E0D\u5141\u8A31\u975E\u7A7A\u767D\u5B57\u5143\uFF0C\u4F46\u662F ''xs:appinfo'' \u8207 ''xs:documentation'' \u9664\u5916\u3002\u767C\u73FE ''{0}''\u3002
+        s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: ''{0}'' 的內容無效。元素 ''{1}'' 無效、位置錯誤或太常出現。
+        s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: ''{0}'' 的內容無效。元素 ''{1}'' 不可空白。
+        s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: 類型 ''{0}'' 的元素不可出現在宣告之後，作為 <schema> 元素的子項。
+        s4s-elt-schema-ns = s4s-elt-schema-ns: 元素 ''{0}'' 的命名空間必須來自綱要命名空間 ''http://www.w3.org/2001/XMLSchema''。
+        s4s-elt-character = s4s-elt-character: 綱要元素中不允許非空白字元，但是 ''xs:appinfo'' 與 ''xs:documentation'' 除外。發現 ''{0}''。
 
 # codes not defined by the spec
 
-        c-fields-xpaths = c-fields-xpaths: \u7B49\u65BC ''{0}'' \u7684\u6B04\u4F4D\u503C\u7121\u6548\u3002
-        c-general-xpath = c-general-xpath: \u8868\u793A\u5F0F ''{0}'' \u5C0D\u65BC XML \u7DB1\u8981\u652F\u63F4\u7684 XPath \u5B50\u96C6\u800C\u8A00\u7121\u6548\u3002
-        c-general-xpath-ns = c-general-xpath-ns: XPath \u8868\u793A\u5F0F ''{0}'' \u4E2D\u7684\u547D\u540D\u7A7A\u9593\u524D\u7F6E\u78BC\u672A\u9023\u7D50\u547D\u540D\u7A7A\u9593\u3002
-        c-selector-xpath = c-selector-xpath: \u7B49\u65BC ''{0}'' \u7684\u9078\u53D6\u5668\u503C\u7121\u6548; \u9078\u53D6\u5668 xpaths \u4E0D\u80FD\u5305\u542B\u5C6C\u6027\u3002
-        EmptyTargetNamespace = EmptyTargetNamespace: \u5728\u7DB1\u8981\u6587\u4EF6 ''{0}'' \u4E2D\uFF0C''targetNamespace'' \u5C6C\u6027\u7684\u503C\u4E0D\u53EF\u70BA\u7A7A\u767D\u5B57\u4E32\u3002
-        FacetValueFromBase = FacetValueFromBase: \u5728\u985E\u578B ''{0}'' \u7684\u5BA3\u544A\u4E2D\uFF0Cfacet ''{2}'' \u7684\u503C ''{1}'' \u5FC5\u9808\u4F86\u81EA\u57FA\u790E\u985E\u578B\u7684\u503C\u7A7A\u9593 ''{3}''\u3002
-        FixedFacetValue = FixedFacetValue: \u5728 {3} \u7684\u5B9A\u7FA9\u4E2D\uFF0Cfacet ''{0}'' \u7684\u503C ''{1}'' \u7121\u6548\uFF0C\u56E0\u70BA ''{0}'' \u7684\u503C\u4EE5\u5176\u4E2D\u4E00\u500B\u7956\u7CFB\u985E\u578B\u8A2D\u70BA ''{2}''\uFF0C\u4E14 '{'fixed'}' = true\u3002
-        InvalidRegex = InvalidRegex: \u6A23\u5F0F\u503C ''{0}'' \u4E0D\u662F\u6709\u6548\u7684\u6B63\u898F\u8868\u793A\u5F0F\u3002\u5831\u544A\u7684\u932F\u8AA4: \u4F4D\u65BC\u8CC7\u6599\u6B04 ''{2}'' \u7684 ''{1}''\u3002
-        MaxOccurLimit = \u5256\u6790\u5668\u76EE\u524D\u7684\u7D44\u614B\u4E0D\u5141\u8A31 maxOccurs \u5C6C\u6027\u503C\u8A2D\u70BA\u5927\u65BC\u503C {0}\u3002
-        PublicSystemOnNotation = PublicSystemOnNotation: ''public'' \u8207 ''system'' \u81F3\u5C11\u5176\u4E2D\u4E4B\u4E00\u5FC5\u9808\u51FA\u73FE\u5728\u5143\u7D20 ''notation'' \u4E2D\u3002
-        SchemaLocation = \u7B49\u65BC ''{0}'' \u7684 SchemaLocation: schemaLocation \u503C\u5FC5\u9808\u5177\u6709\u5076\u6578\u500B URI\u3002
-        TargetNamespace.1 = TargetNamespace.1: \u9810\u671F\u547D\u540D\u7A7A\u9593 ''{0}''\uFF0C\u4F46\u662F\u7DB1\u8981\u6587\u4EF6\u7684\u76EE\u6A19\u547D\u540D\u7A7A\u9593\u70BA ''{1}''\u3002
-        TargetNamespace.2 = TargetNamespace.2: \u672A\u9810\u671F\u547D\u540D\u7A7A\u9593\uFF0C\u4F46\u662F\u7DB1\u8981\u6587\u4EF6\u5177\u6709\u76EE\u6A19\u547D\u540D\u7A7A\u9593 ''{1}''\u3002
-        UndeclaredEntity = UndeclaredEntity: \u672A\u5BA3\u544A\u5BE6\u9AD4 ''{0}''\u3002
-        UndeclaredPrefix = UndeclaredPrefix: \u7121\u6CD5\u89E3\u6790 ''{0}'' \u70BA QName: \u672A\u5BA3\u544A\u524D\u7F6E\u78BC ''{1}''\u3002
+        c-fields-xpaths = c-fields-xpaths: 等於 ''{0}'' 的欄位值無效。
+        c-general-xpath = c-general-xpath: 表示式 ''{0}'' 對於 XML 綱要支援的 XPath 子集而言無效。
+        c-general-xpath-ns = c-general-xpath-ns: XPath 表示式 ''{0}'' 中的命名空間前置碼未連結命名空間。
+        c-selector-xpath = c-selector-xpath: 等於 ''{0}'' 的選取器值無效; 選取器 xpaths 不能包含屬性。
+        EmptyTargetNamespace = EmptyTargetNamespace: 在綱要文件 ''{0}'' 中，''targetNamespace'' 屬性的值不可為空白字串。
+        FacetValueFromBase = FacetValueFromBase: 在類型 ''{0}'' 的宣告中，facet ''{2}'' 的值 ''{1}'' 必須來自基礎類型的值空間 ''{3}''。
+        FixedFacetValue = FixedFacetValue: 在 {3} 的定義中，facet ''{0}'' 的值 ''{1}'' 無效，因為 ''{0}'' 的值以其中一個祖系類型設為 ''{2}''，且 '{'fixed'}' = true。
+        InvalidRegex = InvalidRegex: 樣式值 ''{0}'' 不是有效的正規表示式。報告的錯誤: 位於資料欄 ''{2}'' 的 ''{1}''。
+        MaxOccurLimit = 剖析器目前的組態不允許 maxOccurs 屬性值設為大於值 {0}。
+        PublicSystemOnNotation = PublicSystemOnNotation: ''public'' 與 ''system'' 至少其中之一必須出現在元素 ''notation'' 中。
+        SchemaLocation = 等於 ''{0}'' 的 SchemaLocation: schemaLocation 值必須具有偶數個 URI。
+        TargetNamespace.1 = TargetNamespace.1: 預期命名空間 ''{0}''，但是綱要文件的目標命名空間為 ''{1}''。
+        TargetNamespace.2 = TargetNamespace.2: 未預期命名空間，但是綱要文件具有目標命名空間 ''{1}''。
+        UndeclaredEntity = UndeclaredEntity: 未宣告實體 ''{0}''。
+        UndeclaredPrefix = UndeclaredPrefix: 無法解析 ''{0}'' 為 QName: 未宣告前置碼 ''{1}''。
 
 
 # JAXP 1.2 schema source property errors
 
-        jaxp12-schema-source-type.1 = ''http://java.sun.com/xml/jaxp/properties/schemaSource'' \u5C6C\u6027\u7684\u503C\u4E0D\u80FD\u662F ''{0}'' \u985E\u578B\u3002\u652F\u63F4\u7684\u503C\u985E\u578B\u70BA String\u3001File\u3001InputStream\u3001InputSource \u6216\u9019\u4E9B\u985E\u578B\u7684\u9663\u5217\u3002
-        jaxp12-schema-source-type.2 = ''http://java.sun.com/xml/jaxp/properties/schemaSource'' \u5C6C\u6027\u7684\u9663\u5217\u503C\u4E0D\u80FD\u662F ''{0}'' \u985E\u578B\u3002\u652F\u63F4\u7684\u9663\u5217\u985E\u578B\u70BA Object\u3001String\u3001File\u3001InputStream \u4EE5\u53CA InputSource\u3002
-        jaxp12-schema-source-ns = \u5982\u679C\u4F7F\u7528 Object \u9663\u5217\u4F5C\u70BA 'http://java.sun.com/xml/jaxp/properties/schemaSource' \u5C6C\u6027\u7684\u503C\uFF0C\u5C31\u4E0D\u80FD\u6709\u5169\u500B\u5171\u7528\u76F8\u540C\u76EE\u6A19\u547D\u540D\u7A7A\u9593\u7684\u7DB1\u8981\u3002
+        jaxp12-schema-source-type.1 = ''http://java.sun.com/xml/jaxp/properties/schemaSource'' 屬性的值不能是 ''{0}'' 類型。支援的值類型為 String、File、InputStream、InputSource 或這些類型的陣列。
+        jaxp12-schema-source-type.2 = ''http://java.sun.com/xml/jaxp/properties/schemaSource'' 屬性的陣列值不能是 ''{0}'' 類型。支援的陣列類型為 Object、String、File、InputStream 以及 InputSource。
+        jaxp12-schema-source-ns = 如果使用 Object 陣列作為 'http://java.sun.com/xml/jaxp/properties/schemaSource' 屬性的值，就不能有兩個共用相同目標命名空間的綱要。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
index f5c77831b88..d4b14bb460b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
@@ -22,19 +22,19 @@
 # As usual with properties files, the messages are arranged in
 # key/value tuples.
 
-    BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
+    BadMessageKey = Die zum Meldungsschlüssel gehörige Fehlermeldung kann nicht gefunden werden.
     FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n
 
     ArgumentIsNull = Argument "{0}" ist null.
-    NoWriterSupplied = Kein Writer f\u00FCr Serializer angegeben.
-    MethodNotSupported = Methode "{0}" wird von dieser Factory nicht unterst\u00FCtzt.
-    ResetInMiddle = Serializer kann nicht w\u00E4hrend der Serialisierung zur\u00FCckgesetzt werden.
+    NoWriterSupplied = Kein Writer für Serializer angegeben.
+    MethodNotSupported = Methode "{0}" wird von dieser Factory nicht unterstützt.
+    ResetInMiddle = Serializer kann nicht während der Serialisierung zurückgesetzt werden.
     Internal = Interner Fehler: Elementstatus ist null.
     NoName = Es ist kein rawName vorhanden, und localName ist null.
     ElementQName = Elementname "{0}" ist kein QName.
-    ElementPrefix = Element "{0}" geh\u00F6rt zu keinem Namespace: Pr\u00E4fix ist m\u00F6glicherweise nicht deklariert oder an einen Namespace gebunden.
+    ElementPrefix = Element "{0}" gehört zu keinem Namespace: Präfix ist möglicherweise nicht deklariert oder an einen Namespace gebunden.
     AttributeQName = Attributname "{0}" ist kein QName.
-    AttributePrefix = Attribut "{0}" geh\u00F6rt zu keinem Namespace: Pr\u00E4fix ist m\u00F6glicherweise nicht deklariert oder an einen Namespace gebunden.
+    AttributePrefix = Attribut "{0}" gehört zu keinem Namespace: Präfix ist möglicherweise nicht deklariert oder an einen Namespace gebunden.
     InvalidNSDecl = Namespace-Deklarationssyntax ist falsch: {0}.
     EndingCDATA = Zeichenfolge""]]>" darf nur im Content enthalten sein, wenn sie das Ende eines CDATA-Abschnitts markiert.
     SplittingCDATA = Teilen eines CDATA-Abschnitts mit dem CDATA-Abschnittsabschlusszeichen "]]>".
@@ -44,5 +44,5 @@
 
     # DOM Level 3 load and save messages
     no-output-specified = no-output-specified: Ausgabeziel, in das Daten geschrieben werden sollten, war null.
-    unsupported-encoding = unsupported-encoding: Nicht unterst\u00FCtzte Codierung gefunden.
+    unsupported-encoding = unsupported-encoding: Nicht unterstützte Codierung gefunden.
     unable-to-serialize-node = unable-to-serialize-node: Knoten konnte nicht serialisiert werden.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties
index 0952bf3c2de..e7590e79f30 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties
@@ -34,23 +34,23 @@
     FormatFailed = Se ha producido un error interno al formatear el siguiente mensaje:\n
 
     ArgumentIsNull = El argumento ''{0}'' es nulo.
-    NoWriterSupplied = No se ha suministrado ning\u00FAn escritor para el serializador.
-    MethodNotSupported = El m\u00E9todo ''{0}'' no est\u00E1 soportado por esta f\u00E1brica.
-    ResetInMiddle = No puede reiniciarse el serializador en medio de la serializaci\u00F3n.
+    NoWriterSupplied = No se ha suministrado ningún escritor para el serializador.
+    MethodNotSupported = El método ''{0}'' no está soportado por esta fábrica.
+    ResetInMiddle = No puede reiniciarse el serializador en medio de la serialización.
     Internal = Error interno: el estado del elemento es cero.
-    NoName = No hay ning\u00FAn rawName y localName es nulo.
+    NoName = No hay ningún rawName y localName es nulo.
     ElementQName = El nombre del elemento ''{0}'' no es un QName.
-    ElementPrefix = El elemento ''{0}'' no pertenece a ning\u00FAn espacio de nombres: el prefijo puede ser no declarado o estar enlazado a alg\u00FAn espacio de nombres.
+    ElementPrefix = El elemento ''{0}'' no pertenece a ningún espacio de nombres: el prefijo puede ser no declarado o estar enlazado a algún espacio de nombres.
     AttributeQName = El nombre del atributo ''{0}'' no es un QName.
-    AttributePrefix = El atributo ''{0}'' no pertenece a ning\u00FAn espacio de nombres: el prefijo puede ser no declarado o estar enlazado a alg\u00FAn espacio de nombres.
-    InvalidNSDecl = La sintaxis de la declaraci\u00F3n de espacio de nombres no es correcta: {0}.
-    EndingCDATA = La secuencia de caracteres "]]>" no debe aparecer en el contenido a menos que se utilice para marcar el final de una secci\u00F3n CDATA.
-    SplittingCDATA = Divisi\u00F3n de una secci\u00F3n CDATA que contiene el marcador de terminaci\u00F3n de secci\u00F3n CDATA "]]>".
+    AttributePrefix = El atributo ''{0}'' no pertenece a ningún espacio de nombres: el prefijo puede ser no declarado o estar enlazado a algún espacio de nombres.
+    InvalidNSDecl = La sintaxis de la declaración de espacio de nombres no es correcta: {0}.
+    EndingCDATA = La secuencia de caracteres "]]>" no debe aparecer en el contenido a menos que se utilice para marcar el final de una sección CDATA.
+    SplittingCDATA = División de una sección CDATA que contiene el marcador de terminación de sección CDATA "]]>".
     ResourceNotFound = No se ha encontrado el recurso ''{0}''.
     ResourceNotLoaded = No se ha podido cargar el recurso ''{0}''. {1}
-    SerializationStopped =  La serializaci\u00F3n se ha parado a petici\u00F3n del usuario.
+    SerializationStopped =  La serialización se ha parado a petición del usuario.
 
     # DOM Level 3 load and save messages
-    no-output-specified = no-output-specified: El destino de salida en el que se deb\u00EDan escribir los datos era nulo.
-    unsupported-encoding = unsupported-encoding: Se ha encontrado una codificaci\u00F3n no soportada.
+    no-output-specified = no-output-specified: El destino de salida en el que se debían escribir los datos era nulo.
+    unsupported-encoding = unsupported-encoding: Se ha encontrado una codificación no soportada.
     unable-to-serialize-node = unable-to-serialize-node: El nodo no se ha podido serializar.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties
index 4115d8b09bb..d3727970675 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties
@@ -30,27 +30,27 @@
 # As usual with properties files, the messages are arranged in
 # key/value tuples.
 
-    BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
+    BadMessageKey = Le message d'erreur correspondant à la clé de message est introuvable.
     FormatFailed = Une erreur interne est survenue lors de la mise en forme du message suivant :\n
 
     ArgumentIsNull = L''argument ''{0}'' est NULL.
-    NoWriterSupplied = Aucun processus d'\u00E9criture n'est fourni pour le serializer.
-    MethodNotSupported = La m\u00E9thode ''{0}'' n''est pas prise en charge par cette fabrique.
-    ResetInMiddle = Impossible de r\u00E9initialiser le serializer au cours de la s\u00E9rialisation.
-    Internal = Erreur interne : l'\u00E9tat de l'\u00E9l\u00E9ment est z\u00E9ro.
-    NoName = Il n'existe aucun \u00E9l\u00E9ment rawName et l'\u00E9l\u00E9ment localName est NULL.
-    ElementQName = Le nom d''\u00E9l\u00E9ment ''{0}'' n''est pas un QName.
-    ElementPrefix = L''\u00E9l\u00E9ment ''{0}'' n''appartient \u00E0 aucun espace de noms : le pr\u00E9fixe est peut-\u00EAtre non d\u00E9clar\u00E9 ou li\u00E9 \u00E0 un espace de noms.
+    NoWriterSupplied = Aucun processus d'écriture n'est fourni pour le serializer.
+    MethodNotSupported = La méthode ''{0}'' n''est pas prise en charge par cette fabrique.
+    ResetInMiddle = Impossible de réinitialiser le serializer au cours de la sérialisation.
+    Internal = Erreur interne : l'état de l'élément est zéro.
+    NoName = Il n'existe aucun élément rawName et l'élément localName est NULL.
+    ElementQName = Le nom d''élément ''{0}'' n''est pas un QName.
+    ElementPrefix = L''élément ''{0}'' n''appartient à aucun espace de noms : le préfixe est peut-être non déclaré ou lié à un espace de noms.
     AttributeQName = Le nom d''attribut ''{0}'' n''est pas un QName.
-    AttributePrefix = L''attribut ''{0}'' n''appartient \u00E0 aucun espace de noms : le pr\u00E9fixe est peut-\u00EAtre non d\u00E9clar\u00E9 ou li\u00E9 \u00E0 un espace de noms.
-    InvalidNSDecl = La syntaxe de la d\u00E9claration d''espace de noms est incorrecte : {0}.
-    EndingCDATA = La s\u00E9quence de caract\u00E8res "]]>" ne peut figurer dans le contenu que pour marquer la fin de la section CDATA.
+    AttributePrefix = L''attribut ''{0}'' n''appartient à aucun espace de noms : le préfixe est peut-être non déclaré ou lié à un espace de noms.
+    InvalidNSDecl = La syntaxe de la déclaration d''espace de noms est incorrecte : {0}.
+    EndingCDATA = La séquence de caractères "]]>" ne peut figurer dans le contenu que pour marquer la fin de la section CDATA.
     SplittingCDATA = Fractionnement d'une section CDATA contenant le marqueur de fin de section CDATA "]]>".
     ResourceNotFound = La ressource ''{0}'' est introuvable.
-    ResourceNotLoaded = La ressource ''{0}'' n''a pas pu \u00EAtre charg\u00E9e. {1}
-    SerializationStopped =  La s\u00E9rialisation a \u00E9t\u00E9 arr\u00EAt\u00E9e \u00E0 la demande de l'utilisateur.
+    ResourceNotLoaded = La ressource ''{0}'' n''a pas pu être chargée. {1}
+    SerializationStopped =  La sérialisation a été arrêtée à la demande de l'utilisateur.
 
     # DOM Level 3 load and save messages
-    no-output-specified = pas de sortie indiqu\u00E9e : la destination de sortie dans laquelle \u00E9crire les donn\u00E9es est NULL.
-    unsupported-encoding = encodage non pris en charge : un encodage non pris en charge a \u00E9t\u00E9 d\u00E9tect\u00E9.
-    unable-to-serialize-node = impossible de s\u00E9rialiser le noeud : le noeud n'a pas pu \u00EAtre s\u00E9rialis\u00E9.
+    no-output-specified = pas de sortie indiquée : la destination de sortie dans laquelle écrire les données est NULL.
+    unsupported-encoding = encodage non pris en charge : un encodage non pris en charge a été détecté.
+    unable-to-serialize-node = impossible de sérialiser le noeud : le noeud n'a pas pu être sérialisé.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties
index 6db331f828c..0f22ef0c3dc 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties
@@ -31,26 +31,26 @@
 # key/value tuples.
 
     BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
-    FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n
+    FormatFailed = Si è verificato un errore interno durante la formattazione del seguente messaggio:\n
 
-    ArgumentIsNull = L''argomento ''{0}'' \u00E8 nullo.
+    ArgumentIsNull = L''argomento ''{0}'' è nullo.
     NoWriterSupplied = Nessun processo di scrittura fornito per il serializzatore.
-    MethodNotSupported = Il metodo ''{0}'' non \u00E8 supportato da questo factory.
+    MethodNotSupported = Il metodo ''{0}'' non è supportato da questo factory.
     ResetInMiddle = Impossibile reimpostare il serializzatore durante una serializzazione.
-    Internal = Errore interno: lo stato dell'elemento \u00E8 zero.
-    NoName = Non esiste alcun rawName e localName \u00E8 nullo.
-    ElementQName = Il nome elemento ''{0}'' non \u00E8 un QName.
+    Internal = Errore interno: lo stato dell'elemento è zero.
+    NoName = Non esiste alcun rawName e localName è nullo.
+    ElementQName = Il nome elemento ''{0}'' non è un QName.
     ElementPrefix = L''elemento ''{0}'' non appartiene ad alcuno spazio di nomi: il prefisso deve essere non dichiarato o associato a uno spazio di nomi.
-    AttributeQName = Il nome attributo ''{0}'' non \u00E8 un QName.
+    AttributeQName = Il nome attributo ''{0}'' non è un QName.
     AttributePrefix = L''attributo ''{0}'' non appartiene ad alcuno spazio di nomi: il prefisso deve essere non dichiarato o associato a uno spazio di nomi.
-    InvalidNSDecl = La sintassi della dichiarazione dello spazio di nomi \u00E8 errata: {0}.
+    InvalidNSDecl = La sintassi della dichiarazione dello spazio di nomi è errata: {0}.
     EndingCDATA = La sequenza di caratteri "]]>" non deve essere presente nel contenuto a meno che non sia utilizzata per contrassegnare la fine di una sezione CDATA.
-    SplittingCDATA = Verr\u00E0 suddivisa una sezione CDATA che contiene l'indicatore di fine della sezione CDATA "]]>".
+    SplittingCDATA = Verrà suddivisa una sezione CDATA che contiene l'indicatore di fine della sezione CDATA "]]>".
     ResourceNotFound = Impossibile trovare la risorsa ''{0}''.
     ResourceNotLoaded = Impossibile caricare la risorsa ''{0}''. {1}
     SerializationStopped =  Serializzazione arrestata su richiesta dell'utente.
 
     # DOM Level 3 load and save messages
-    no-output-specified = no-output-specified: la destinazione di output per i dati da scrivere \u00E8 nulla.
-    unsupported-encoding = unsupported-encoding: \u00E8 stata rilevata una codifica non supportata.
+    no-output-specified = no-output-specified: la destinazione di output per i dati da scrivere è nulla.
+    unsupported-encoding = unsupported-encoding: è stata rilevata una codifica non supportata.
     unable-to-serialize-node = unable-to-serialize-node: impossibile serializzare il nodo.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
index 3497fa7ea9f..576a5f6d7ce 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
@@ -22,27 +22,27 @@
 # As usual with properties files, the messages are arranged in
 # key/value tuples.
 
-    BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-    FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n
+    BadMessageKey = メッセージ・キーに対応するエラー・メッセージが見つかりません。
+    FormatFailed = 次のメッセージの書式設定中に内部エラーが発生しました:\n
 
-    ArgumentIsNull = \u5F15\u6570''{0}''\u306Fnull\u3067\u3059\u3002
-    NoWriterSupplied = \u30B7\u30EA\u30A2\u30E9\u30A4\u30B6\u306B\u30E9\u30A4\u30BF\u30FC\u304C\u63D0\u4F9B\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-    MethodNotSupported = \u3053\u306E\u30D5\u30A1\u30AF\u30C8\u30EA\u3067\u306F\u3001\u30E1\u30BD\u30C3\u30C9''{0}''\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-    ResetInMiddle = \u30B7\u30EA\u30A2\u30E9\u30A4\u30B6\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u306E\u9014\u4E2D\u3067\u306F\u30EA\u30BB\u30C3\u30C8\u3067\u304D\u307E\u305B\u3093\u3002
-    Internal = \u5185\u90E8\u30A8\u30E9\u30FC: \u8981\u7D20\u306E\u72B6\u614B\u304C\u30BC\u30ED\u3067\u3059\u3002
-    NoName = rawName\u304C\u5B58\u5728\u305B\u305A\u3001localName\u304Cnull\u3067\u3059\u3002
-    ElementQName = \u8981\u7D20\u540D''{0}''\u306FQName\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-    ElementPrefix = \u8981\u7D20''{0}''\u304C\u3069\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u3082\u5C5E\u3057\u3066\u3044\u307E\u305B\u3093\u3002\u63A5\u982D\u8F9E\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u306A\u3093\u3089\u304B\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-    AttributeQName = \u5C5E\u6027\u540D''{0}''\u306FQName\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-    AttributePrefix = \u5C5E\u6027''{0}''\u304C\u3069\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u3082\u5C5E\u3057\u3066\u3044\u307E\u305B\u3093\u3002\u63A5\u982D\u8F9E\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u306A\u3093\u3089\u304B\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-    InvalidNSDecl = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u5BA3\u8A00\u306E\u69CB\u6587\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093: {0}\u3002
-    EndingCDATA = \u6587\u5B57\u30B7\u30FC\u30B1\u30F3\u30B9"]]>"\u306F\u3001CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u7D42\u308F\u308A\u3092\u793A\u3059\u76EE\u7684\u4EE5\u5916\u3067\u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
-    SplittingCDATA = CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u7D42\u4E86\u30DE\u30FC\u30AB\u30FC"]]>"\u304C\u542B\u307E\u308C\u3066\u3044\u308BCDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u3092\u5206\u5272\u3057\u3066\u3044\u307E\u3059\u3002
-    ResourceNotFound = \u30EA\u30BD\u30FC\u30B9''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-    ResourceNotLoaded = \u30EA\u30BD\u30FC\u30B9''{0}''\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002 {1}
-    SerializationStopped =  \u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u304C\u30E6\u30FC\u30B6\u30FC\u30FB\u30EA\u30AF\u30A8\u30B9\u30C8\u3067\u505C\u6B62\u3055\u308C\u307E\u3057\u305F\u3002
+    ArgumentIsNull = 引数''{0}''はnullです。
+    NoWriterSupplied = シリアライザにライターが提供されていません。
+    MethodNotSupported = このファクトリでは、メソッド''{0}''はサポートされていません。
+    ResetInMiddle = シリアライザは、シリアライズの途中ではリセットできません。
+    Internal = 内部エラー: 要素の状態がゼロです。
+    NoName = rawNameが存在せず、localNameがnullです。
+    ElementQName = 要素名''{0}''はQNameではありません。
+    ElementPrefix = 要素''{0}''がどのネームスペースにも属していません。接頭辞が宣言されていないか、なんらかのネームスペースにバインドされている可能性があります。
+    AttributeQName = 属性名''{0}''はQNameではありません。
+    AttributePrefix = 属性''{0}''がどのネームスペースにも属していません。接頭辞が宣言されていないか、なんらかのネームスペースにバインドされている可能性があります。
+    InvalidNSDecl = ネームスペース宣言の構文が正しくありません: {0}。
+    EndingCDATA = 文字シーケンス"]]>"は、CDATAセクションの終わりを示す目的以外でコンテンツに使用しないでください。
+    SplittingCDATA = CDATAセクション終了マーカー"]]>"が含まれているCDATAセクションを分割しています。
+    ResourceNotFound = リソース''{0}''が見つかりませんでした。
+    ResourceNotLoaded = リソース''{0}''をロードできませんでした。 {1}
+    SerializationStopped =  シリアライズがユーザー・リクエストで停止されました。
 
     # DOM Level 3 load and save messages
-    no-output-specified = no-output-specified: \u66F8\u304D\u8FBC\u307E\u308C\u308B\u30C7\u30FC\u30BF\u306E\u51FA\u529B\u5148\u304Cnull\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-    unsupported-encoding = unsupported-encoding: \u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-    unable-to-serialize-node = unable-to-serialize-node: \u30CE\u30FC\u30C9\u3092\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+    no-output-specified = no-output-specified: 書き込まれるデータの出力先がnullになっています。
+    unsupported-encoding = unsupported-encoding: サポートされていないエンコーディングが見つかりました。
+    unable-to-serialize-node = unable-to-serialize-node: ノードをシリアライズできませんでした。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties
index d5abba966c7..a8b342e510b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties
@@ -30,27 +30,27 @@
 # As usual with properties files, the messages are arranged in
 # key/value tuples.
 
-    BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-    FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n
+    BadMessageKey = 메시지 키에 해당하는 오류 메시지를 찾을 수 없습니다.
+    FormatFailed = 다음 메시지의 형식을 지정하는 중 내부 오류가 발생했습니다.\n
 
-    ArgumentIsNull = ''{0}'' \uC778\uC218\uAC00 \uB110\uC785\uB2C8\uB2E4.
-    NoWriterSupplied = Serializer\uC5D0 \uB300\uD574 \uC81C\uACF5\uB41C \uAE30\uB85D \uC7A5\uCE58\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
-    MethodNotSupported = \uC774 \uD329\uD1A0\uB9AC\uB294 ''{0}'' \uBA54\uC18C\uB4DC\uB97C \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-    ResetInMiddle = \uC9C1\uB82C\uD654 \uB3C4\uC911\uC5D0\uB294 Serializer\uB97C \uC7AC\uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-    Internal = \uB0B4\uBD80 \uC624\uB958: \uC694\uC18C \uC0C1\uD0DC\uAC00 0\uC785\uB2C8\uB2E4.
-    NoName = rawName\uC774 \uC5C6\uC73C\uBA70 localName\uC774 \uB110\uC785\uB2C8\uB2E4.
-    ElementQName = \uC694\uC18C \uC774\uB984 ''{0}''\uC740(\uB294) QName\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-    ElementPrefix = ''{0}'' \uC694\uC18C\uAC00 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uC18D\uD558\uC9C0 \uC54A\uC74C: \uC811\uB450\uC5B4\uC758 \uC120\uC5B8\uC744 \uD574\uC81C\uD558\uAC70\uB098 \uC811\uB450\uC5B4\uB97C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
-    AttributeQName = \uC18D\uC131 \uC774\uB984 ''{0}''\uC740(\uB294) QName\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-    AttributePrefix = ''{0}'' \uC18D\uC131\uC774 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uC18D\uD558\uC9C0 \uC54A\uC74C: \uC811\uB450\uC5B4\uC758 \uC120\uC5B8\uC744 \uD574\uC81C\uD558\uAC70\uB098 \uC811\uB450\uC5B4\uB97C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
-    InvalidNSDecl = \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC120\uC5B8 \uAD6C\uBB38\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC74C: {0}.
-    EndingCDATA = \uBB38\uC790 \uC2DC\uD000\uC2A4 "]]>"\uB294 CDATA \uC139\uC158 \uB05D\uC744 \uD45C\uC2DC\uD558\uB294 \uB370 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uB294 \uACBD\uC6B0 \uCF58\uD150\uCE20\uC5D0 \uB098\uD0C0\uB098\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-    SplittingCDATA = CDATA \uC139\uC158 \uC885\uB8CC \uD45C\uC2DC\uC790 "]]>"\uB97C \uD3EC\uD568\uD558\uB294 CDATA \uC139\uC158\uC744 \uBD84\uD560\uD558\uB294 \uC911\uC785\uB2C8\uB2E4.
-    ResourceNotFound = ''{0}'' \uB9AC\uC18C\uC2A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-    ResourceNotLoaded = ''{0}'' \uB9AC\uC18C\uC2A4\uB97C \uB85C\uB4DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. {1}
-    SerializationStopped =  \uC0AC\uC6A9\uC790 \uC694\uCCAD\uC5D0 \uB530\uB77C \uC9C1\uB82C\uD654\uAC00 \uC815\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+    ArgumentIsNull = ''{0}'' 인수가 널입니다.
+    NoWriterSupplied = Serializer에 대해 제공된 기록 장치가 없습니다.
+    MethodNotSupported = 이 팩토리는 ''{0}'' 메소드를 지원하지 않습니다.
+    ResetInMiddle = 직렬화 도중에는 Serializer를 재설정할 수 없습니다.
+    Internal = 내부 오류: 요소 상태가 0입니다.
+    NoName = rawName이 없으며 localName이 널입니다.
+    ElementQName = 요소 이름 ''{0}''은(는) QName이 아닙니다.
+    ElementPrefix = ''{0}'' 요소가 네임스페이스에 속하지 않음: 접두어의 선언을 해제하거나 접두어를 네임스페이스에 바인드할 수 있습니다.
+    AttributeQName = 속성 이름 ''{0}''은(는) QName이 아닙니다.
+    AttributePrefix = ''{0}'' 속성이 네임스페이스에 속하지 않음: 접두어의 선언을 해제하거나 접두어를 네임스페이스에 바인드할 수 있습니다.
+    InvalidNSDecl = 네임스페이스 선언 구문이 올바르지 않음: {0}.
+    EndingCDATA = 문자 시퀀스 "]]>"는 CDATA 섹션 끝을 표시하는 데 사용되지 않는 경우 콘텐츠에 나타나지 않아야 합니다.
+    SplittingCDATA = CDATA 섹션 종료 표시자 "]]>"를 포함하는 CDATA 섹션을 분할하는 중입니다.
+    ResourceNotFound = ''{0}'' 리소스를 찾을 수 없습니다.
+    ResourceNotLoaded = ''{0}'' 리소스를 로드할 수 없습니다. {1}
+    SerializationStopped =  사용자 요청에 따라 직렬화가 정지되었습니다.
 
     # DOM Level 3 load and save messages
-    no-output-specified = no-output-specified: \uB370\uC774\uD130\uB97C \uC4F8 \uCD9C\uB825 \uB300\uC0C1\uC774 \uB110\uC785\uB2C8\uB2E4.
-    unsupported-encoding = unsupported-encoding: \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uB294 \uC778\uCF54\uB529\uC774 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-    unable-to-serialize-node = unable-to-serialize-node: \uB178\uB4DC\uB97C \uC9C1\uB82C\uD654\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+    no-output-specified = no-output-specified: 데이터를 쓸 출력 대상이 널입니다.
+    unsupported-encoding = unsupported-encoding: 지원되지 않는 인코딩이 발견되었습니다.
+    unable-to-serialize-node = unable-to-serialize-node: 노드를 직렬화할 수 없습니다.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties
index e451e6d2e17..9049c758dec 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties
@@ -30,27 +30,27 @@
 # As usual with properties files, the messages are arranged in
 # key/value tuples.
 
-    BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
+    BadMessageKey = Não foi possível encontrar a mensagem de erro correspondente à chave da mensagem.
     FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n
 
-    ArgumentIsNull = O argumento ''{0}'' \u00E9 nulo.
+    ArgumentIsNull = O argumento ''{0}'' é nulo.
     NoWriterSupplied = Nenhum gravador fornecido para o serializador.
-    MethodNotSupported = O m\u00E9todo ''{0}'' n\u00E3o \u00E9 suportado por este factory.
-    ResetInMiddle = O serializador n\u00E3o pode ser redefinido no meio da serializa\u00E7\u00E3o.
-    Internal = Erro interno: o estado do elemento \u00E9 zero.
-    NoName = N\u00E3o h\u00E1 rawName e localName \u00E9 nulo.
-    ElementQName = O nome do elemento ''{0}'' n\u00E3o \u00E9 um QName.
-    ElementPrefix = O elemento ''{0}'' n\u00E3o pertence a nenhum namespace: o prefixo n\u00E3o pode ser n\u00E3o declarado ou vinculado a algum namespace.
-    AttributeQName = O nome do atributo ''{0}'' n\u00E3o \u00E9 QName.
-    AttributePrefix = O atributo ''{0}'' n\u00E3o pertence a nenhum namespace: o prefixo n\u00E3o pode ser n\u00E3o declarado ou vinculado a algum namespace.
-    InvalidNSDecl = Sintaxe de declara\u00E7\u00E3o de namespace incorreta: {0}.
-    EndingCDATA = A sequ\u00EAncia de caracteres "]]>" n\u00E3o deve aparecer no conte\u00FAdo, a menos que seja usada para marcar o fim de uma se\u00E7\u00E3o CDATA.
-    SplittingCDATA = Dividir uma se\u00E7\u00E3o CDATA que cont\u00E9m o marcador "]]>" de termina\u00E7\u00E3o de se\u00E7\u00E3o CDATA.
-    ResourceNotFound = N\u00E3o foi poss\u00EDvel encontrar o recurso ''{0}''.
-    ResourceNotLoaded = N\u00E3o foi poss\u00EDvel carregar o recurso ''{0}''. {1}
-    SerializationStopped =  Serializa\u00E7\u00E3o interrompida na solicita\u00E7\u00E3o do usu\u00E1rio.
+    MethodNotSupported = O método ''{0}'' não é suportado por este factory.
+    ResetInMiddle = O serializador não pode ser redefinido no meio da serialização.
+    Internal = Erro interno: o estado do elemento é zero.
+    NoName = Não há rawName e localName é nulo.
+    ElementQName = O nome do elemento ''{0}'' não é um QName.
+    ElementPrefix = O elemento ''{0}'' não pertence a nenhum namespace: o prefixo não pode ser não declarado ou vinculado a algum namespace.
+    AttributeQName = O nome do atributo ''{0}'' não é QName.
+    AttributePrefix = O atributo ''{0}'' não pertence a nenhum namespace: o prefixo não pode ser não declarado ou vinculado a algum namespace.
+    InvalidNSDecl = Sintaxe de declaração de namespace incorreta: {0}.
+    EndingCDATA = A sequência de caracteres "]]>" não deve aparecer no conteúdo, a menos que seja usada para marcar o fim de uma seção CDATA.
+    SplittingCDATA = Dividir uma seção CDATA que contém o marcador "]]>" de terminação de seção CDATA.
+    ResourceNotFound = Não foi possível encontrar o recurso ''{0}''.
+    ResourceNotLoaded = Não foi possível carregar o recurso ''{0}''. {1}
+    SerializationStopped =  Serialização interrompida na solicitação do usuário.
 
     # DOM Level 3 load and save messages
-    no-output-specified = nenhuma sa\u00EDda especificada: O destino da sa\u00EDda dos dados a serem gravados era nulo.
-    unsupported-encoding = codifica\u00E7\u00E3o n\u00E3o suportada: Uma codifica\u00E7\u00E3o n\u00E3o suportada foi encontrada.
-    unable-to-serialize-node = n\u00E3o \u00E9 poss\u00EDvel serializar o n\u00F3: N\u00E3o foi poss\u00EDvel serializar o n\u00F3.
+    no-output-specified = nenhuma saída especificada: O destino da saída dos dados a serem gravados era nulo.
+    unsupported-encoding = codificação não suportada: Uma codificação não suportada foi encontrada.
+    unable-to-serialize-node = não é possível serializar o nó: Não foi possível serializar o nó.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties
index adde6950412..688d45f5c7f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties
@@ -31,26 +31,26 @@
 # key/value tuples.
 
     BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
-    FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
+    FormatFailed = Ett internt fel inträffade vid formatering av följande meddelande:\n
 
-    ArgumentIsNull = Argumentet ''{0}'' \u00E4r null.
-    NoWriterSupplied = Det finns ingen skrivare f\u00F6r serializer.
-    MethodNotSupported = Metoden ''{0}'' st\u00F6ds inte i denna fabriksinst\u00E4llning.
-    ResetInMiddle = Serializer kan inte \u00E5terst\u00E4llas under p\u00E5g\u00E5ende serialisering.
-    Internal = Internt fel: elementtillst\u00E5nd \u00E4r noll.
-    NoName = Det finns inget rawName och localName \u00E4r null.
-    ElementQName = Elementnamnet ''{0}'' \u00E4r inte n\u00E5got QName.
-    ElementPrefix = Elementet ''{0}'' tillh\u00F6r inte n\u00E5gon namnrymd: prefixet kanske inte har deklarerats eller \u00E4r bundet till annan namnrymd.
-    AttributeQName = Attributnamnet ''{0}'' \u00E4r inte n\u00E5got QName.
-    AttributePrefix = Attributet ''{0}'' tillh\u00F6r inte n\u00E5gon namnrymd: prefixet kanske inte har deklarerats eller \u00E4r bundet till annan namnrymd.
+    ArgumentIsNull = Argumentet ''{0}'' är null.
+    NoWriterSupplied = Det finns ingen skrivare för serializer.
+    MethodNotSupported = Metoden ''{0}'' stöds inte i denna fabriksinställning.
+    ResetInMiddle = Serializer kan inte återställas under pågående serialisering.
+    Internal = Internt fel: elementtillstånd är noll.
+    NoName = Det finns inget rawName och localName är null.
+    ElementQName = Elementnamnet ''{0}'' är inte något QName.
+    ElementPrefix = Elementet ''{0}'' tillhör inte någon namnrymd: prefixet kanske inte har deklarerats eller är bundet till annan namnrymd.
+    AttributeQName = Attributnamnet ''{0}'' är inte något QName.
+    AttributePrefix = Attributet ''{0}'' tillhör inte någon namnrymd: prefixet kanske inte har deklarerats eller är bundet till annan namnrymd.
     InvalidNSDecl = Felaktig syntax i deklaration av namnrymd: {0}.
-    EndingCDATA = Teckensekvensen "]]>" f\u00E5r inte f\u00F6rekomma i inneh\u00E5llet, s\u00E5vida det inte anv\u00E4nds f\u00F6r att markera slut av CDATA-sektion.
-    SplittingCDATA = Delar en CDATA-sektion som inneh\u00E5ller CDATA-sektionens avslutningsmark\u00F6r "]]>".
+    EndingCDATA = Teckensekvensen "]]>" får inte förekomma i innehållet, såvida det inte används för att markera slut av CDATA-sektion.
+    SplittingCDATA = Delar en CDATA-sektion som innehåller CDATA-sektionens avslutningsmarkör "]]>".
     ResourceNotFound = Resursen ''{0}'' hittades inte.
     ResourceNotLoaded = Resursen ''{0}'' kunde inte laddas. {1}
-    SerializationStopped =  Serialiseringen stoppades vid anv\u00E4ndarbeg\u00E4ran.
+    SerializationStopped =  Serialiseringen stoppades vid användarbegäran.
 
     # DOM Level 3 load and save messages
-    no-output-specified = no-output-specified: Utdatadestinationen som data ska skrivas till \u00E4r null.
-    unsupported-encoding = unsupported-encoding: En kodning som inte st\u00F6ds p\u00E5tr\u00E4ffades.
+    no-output-specified = no-output-specified: Utdatadestinationen som data ska skrivas till är null.
+    unsupported-encoding = unsupported-encoding: En kodning som inte stöds påträffades.
     unable-to-serialize-node = unable-to-serialize-node: Noden kunde inte serialiseras.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
index 48e0a443438..540160b95b3 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
@@ -22,27 +22,27 @@
 # As usual with properties files, the messages are arranged in
 # key/value tuples.
 
-    BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
-    FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n
+    BadMessageKey = 找不到与消息关键字对应的错误消息。
+    FormatFailed = 设置以下消息的格式时出现内部错误:\n
 
-    ArgumentIsNull = \u53C2\u6570 ''{0}'' \u4E3A\u7A7A\u503C\u3002
-    NoWriterSupplied = \u6CA1\u6709\u4E3A\u4E32\u884C\u5668\u63D0\u4F9B\u5199\u8FDB\u7A0B\u3002
-    MethodNotSupported = \u6B64\u5DE5\u5382\u4E0D\u652F\u6301\u65B9\u6CD5 ''{0}''\u3002
-    ResetInMiddle = \u4E0D\u80FD\u5728\u5E8F\u5217\u5316\u7684\u8FC7\u7A0B\u4E2D\u91CD\u7F6E\u4E32\u884C\u5668\u3002
-    Internal = \u5185\u90E8\u9519\u8BEF: \u5143\u7D20\u72B6\u6001\u4E3A\u96F6\u3002
-    NoName = \u6CA1\u6709 rawName \u548C localName \u4E3A\u7A7A\u503C\u3002
-    ElementQName = \u5143\u7D20\u540D\u79F0 ''{0}'' \u4E0D\u662F\u9650\u5B9A\u540D\u3002
-    ElementPrefix = \u5143\u7D20 ''{0}'' \u4E0D\u5C5E\u4E8E\u4EFB\u4F55\u540D\u79F0\u7A7A\u95F4: \u53EF\u80FD\u672A\u58F0\u660E\u524D\u7F00, \u6216\u8005\u5DF2\u7ECF\u5C06\u524D\u7F00\u7ED1\u5B9A\u5230\u67D0\u4E2A\u540D\u79F0\u7A7A\u95F4\u3002
-    AttributeQName = \u5C5E\u6027\u540D ''{0}'' \u4E0D\u662F\u9650\u5B9A\u540D\u3002
-    AttributePrefix = \u5C5E\u6027 ''{0}'' \u4E0D\u5C5E\u4E8E\u4EFB\u4F55\u540D\u79F0\u7A7A\u95F4: \u53EF\u80FD\u672A\u58F0\u660E\u524D\u7F00, \u6216\u8005\u5DF2\u7ECF\u5C06\u524D\u7F00\u7ED1\u5B9A\u5230\u67D0\u4E2A\u540D\u79F0\u7A7A\u95F4\u3002
-    InvalidNSDecl = \u540D\u79F0\u7A7A\u95F4\u58F0\u660E\u8BED\u6CD5\u4E0D\u6B63\u786E: {0}\u3002
-    EndingCDATA = \u9664\u975E\u4F7F\u7528\u5B57\u7B26\u5E8F\u5217 "]]>" \u6765\u6807\u8BB0 CDATA \u8282\u7684\u7ED3\u5C3E, \u5426\u5219\u8BE5\u5B57\u7B26\u5E8F\u5217\u4E0D\u80FD\u51FA\u73B0\u5728\u5185\u5BB9\u4E2D\u3002
-    SplittingCDATA = \u62C6\u5206\u5305\u542B CDATA \u6BB5\u7EC8\u6B62\u6807\u8BB0 "]]>" \u7684 CDATA \u6BB5\u3002
-    ResourceNotFound = \u627E\u4E0D\u5230\u8D44\u6E90 ''{0}''\u3002
-    ResourceNotLoaded = \u65E0\u6CD5\u52A0\u8F7D\u8D44\u6E90 ''{0}''\u3002{1}
-    SerializationStopped =  \u6839\u636E\u7528\u6237\u8BF7\u6C42\u505C\u6B62\u4E86\u5E8F\u5217\u5316\u3002
+    ArgumentIsNull = 参数 ''{0}'' 为空值。
+    NoWriterSupplied = 没有为串行器提供写进程。
+    MethodNotSupported = 此工厂不支持方法 ''{0}''。
+    ResetInMiddle = 不能在序列化的过程中重置串行器。
+    Internal = 内部错误: 元素状态为零。
+    NoName = 没有 rawName 和 localName 为空值。
+    ElementQName = 元素名称 ''{0}'' 不是限定名。
+    ElementPrefix = 元素 ''{0}'' 不属于任何名称空间: 可能未声明前缀, 或者已经将前缀绑定到某个名称空间。
+    AttributeQName = 属性名 ''{0}'' 不是限定名。
+    AttributePrefix = 属性 ''{0}'' 不属于任何名称空间: 可能未声明前缀, 或者已经将前缀绑定到某个名称空间。
+    InvalidNSDecl = 名称空间声明语法不正确: {0}。
+    EndingCDATA = 除非使用字符序列 "]]>" 来标记 CDATA 节的结尾, 否则该字符序列不能出现在内容中。
+    SplittingCDATA = 拆分包含 CDATA 段终止标记 "]]>" 的 CDATA 段。
+    ResourceNotFound = 找不到资源 ''{0}''。
+    ResourceNotLoaded = 无法加载资源 ''{0}''。{1}
+    SerializationStopped =  根据用户请求停止了序列化。
 
     # DOM Level 3 load and save messages
-    no-output-specified = no-output-specified: \u8981\u5C06\u6570\u636E\u5199\u5165\u7684\u8F93\u51FA\u76EE\u6807\u4E3A\u7A7A\u503C\u3002
-    unsupported-encoding = unsupported-encoding: \u9047\u5230\u4E0D\u652F\u6301\u7684\u7F16\u7801\u3002
-    unable-to-serialize-node = unable-to-serialize-node: \u65E0\u6CD5\u5E8F\u5217\u5316\u8282\u70B9\u3002
+    no-output-specified = no-output-specified: 要将数据写入的输出目标为空值。
+    unsupported-encoding = unsupported-encoding: 遇到不支持的编码。
+    unable-to-serialize-node = unable-to-serialize-node: 无法序列化节点。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties
index 2478c9e2552..0ecd76828f6 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties
@@ -30,27 +30,27 @@
 # As usual with properties files, the messages are arranged in
 # key/value tuples.
 
-    BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
-    FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
+    BadMessageKey = 找不到對應訊息索引鍵的錯誤訊息。
+    FormatFailed = 格式化下列訊息時發生內部錯誤:\n
 
-    ArgumentIsNull = \u5F15\u6578 ''{0}'' \u70BA\u7A7A\u503C\u3002
-    NoWriterSupplied = \u672A\u63D0\u4F9B\u5BEB\u5165\u5668\u7D66\u5E8F\u5217\u5316\u7A0B\u5F0F\u3002
-    MethodNotSupported = \u6B64\u8655\u7406\u7AD9\u4E0D\u652F\u63F4\u65B9\u6CD5 ''{0}''\u3002
-    ResetInMiddle = \u5728\u5E8F\u5217\u5316\u671F\u9593\u53EF\u80FD\u7121\u6CD5\u91CD\u8A2D\u5E8F\u5217\u5316\u7A0B\u5F0F\u3002
-    Internal = \u5167\u90E8\u932F\u8AA4: \u5143\u7D20\u72C0\u614B\u70BA\u96F6\u3002
-    NoName = \u6C92\u6709 rawName \u4E14 localName \u70BA\u7A7A\u503C\u3002
-    ElementQName = \u5143\u7D20\u540D\u7A31 ''{0}'' \u4E0D\u662F QName\u3002
-    ElementPrefix = \u5143\u7D20 ''{0}'' \u4E0D\u5C6C\u65BC\u4EFB\u4F55\u547D\u540D\u7A7A\u9593: \u53EF\u80FD\u672A\u5BA3\u544A\u524D\u7F6E\u78BC\u6216\u524D\u7F6E\u78BC\u9023\u7D50\u5176\u4ED6\u547D\u540D\u7A7A\u9593\u3002
-    AttributeQName = \u5C6C\u6027\u540D\u7A31 ''{0}'' \u4E0D\u662F QName\u3002
-    AttributePrefix = \u5C6C\u6027 ''{0}'' \u4E0D\u5C6C\u65BC\u4EFB\u4F55\u547D\u540D\u7A7A\u9593: \u53EF\u80FD\u672A\u5BA3\u544A\u524D\u7F6E\u78BC\u6216\u524D\u7F6E\u78BC\u9023\u7D50\u5176\u4ED6\u547D\u540D\u7A7A\u9593\u3002
-    InvalidNSDecl = \u547D\u540D\u7A7A\u9593\u5BA3\u544A\u8A9E\u6CD5\u4E0D\u6B63\u78BA: {0}\u3002
-    EndingCDATA = \u5B57\u5143\u9806\u5E8F "]]>" \u4E0D\u53EF\u51FA\u73FE\u5728\u5167\u5BB9\u4E2D\uFF0C\u9664\u975E\u7528\u65BC\u6A19\u793A CDATA \u6BB5\u843D\u7684\u7D50\u5C3E\u3002
-    SplittingCDATA = \u5206\u5272\u5305\u542B CDATA \u6BB5\u843D\u7D42\u6B62\u6A19\u8A18 "]]>" \u7684 CDATA \u6BB5\u843D\u3002
-    ResourceNotFound = \u627E\u4E0D\u5230\u8CC7\u6E90 ''{0}''\u3002
-    ResourceNotLoaded = \u7121\u6CD5\u8F09\u5165\u8CC7\u6E90 ''{0}''\u3002{1}
-    SerializationStopped =  \u4F9D\u7167\u4F7F\u7528\u8005\u8981\u6C42\u505C\u6B62\u5E8F\u5217\u5316\u3002
+    ArgumentIsNull = 引數 ''{0}'' 為空值。
+    NoWriterSupplied = 未提供寫入器給序列化程式。
+    MethodNotSupported = 此處理站不支援方法 ''{0}''。
+    ResetInMiddle = 在序列化期間可能無法重設序列化程式。
+    Internal = 內部錯誤: 元素狀態為零。
+    NoName = 沒有 rawName 且 localName 為空值。
+    ElementQName = 元素名稱 ''{0}'' 不是 QName。
+    ElementPrefix = 元素 ''{0}'' 不屬於任何命名空間: 可能未宣告前置碼或前置碼連結其他命名空間。
+    AttributeQName = 屬性名稱 ''{0}'' 不是 QName。
+    AttributePrefix = 屬性 ''{0}'' 不屬於任何命名空間: 可能未宣告前置碼或前置碼連結其他命名空間。
+    InvalidNSDecl = 命名空間宣告語法不正確: {0}。
+    EndingCDATA = 字元順序 "]]>" 不可出現在內容中，除非用於標示 CDATA 段落的結尾。
+    SplittingCDATA = 分割包含 CDATA 段落終止標記 "]]>" 的 CDATA 段落。
+    ResourceNotFound = 找不到資源 ''{0}''。
+    ResourceNotLoaded = 無法載入資源 ''{0}''。{1}
+    SerializationStopped =  依照使用者要求停止序列化。
 
     # DOM Level 3 load and save messages
-    no-output-specified = no-output-specified: \u8981\u5BEB\u5165\u8CC7\u6599\u7684\u8F38\u51FA\u76EE\u7684\u5730\u70BA\u7A7A\u503C\u3002
-    unsupported-encoding = unsupported-encoding: \u51FA\u73FE\u4E0D\u652F\u63F4\u7684\u7DE8\u78BC\u3002
-    unable-to-serialize-node = unable-to-serialize-node: \u7BC0\u9EDE\u7121\u6CD5\u5E8F\u5217\u5316\u3002
+    no-output-specified = no-output-specified: 要寫入資料的輸出目的地為空值。
+    unsupported-encoding = unsupported-encoding: 出現不支援的編碼。
+    unable-to-serialize-node = unable-to-serialize-node: 節點無法序列化。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
index 4a98a4e3707..ca3bf6fac5a 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
@@ -20,23 +20,23 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
+BadMessageKey = Die zum Meldungsschlüssel gehörige Fehlermeldung kann nicht gefunden werden.
 FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n  
 
 # XPointer Framework Error Messages
 XPointerProcessingError = XPointerProcessingError: Beim Verarbeiten des XPointer-Ausdrucks ist ein Fehler aufgetreten.
-InvalidXPointerToken = InvalidXPointerToken: XPointer-Ausdruck enth\u00E4lt das ung\u00FCltige Token "{0}"
-InvalidXPointerExpression = InvalidXPointerExpression: XPointer-Ausdruck "{0}" ist ung\u00FCltig.
-MultipleShortHandPointers = MultipleShortHandPointers: XPointer-Ausdruck "{0}" ist ung\u00FCltig. Mehrere ShortHand-Zeiger vorhanden.
-SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer-Ausdruck "{0}" ist ung\u00FCltig. Auf SchemeData folgte kein ")"-Zeichen. 
-SchemeUnsupported = SchemeUnsupported: XPointer-Schema "{0}" wird nicht unterst\u00FCtzt.
-InvalidShortHandPointer = InvalidShortHandPointer: NCName von ShortHand-Zeiger "{0}" ist ung\u00FCltig.
-UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: XPointer-Ausdruck "{0}" ist ung\u00FCltig. Die Anzahl der \u00F6ffnenden Klammern "{1}" entspricht nicht der Anzahl der schlie\u00DFenden Klammern "{2}".
-InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer-Ausdruck "{0}" enthalt ung\u00FCltige SchemeData.
+InvalidXPointerToken = InvalidXPointerToken: XPointer-Ausdruck enthält das ungültige Token "{0}"
+InvalidXPointerExpression = InvalidXPointerExpression: XPointer-Ausdruck "{0}" ist ungültig.
+MultipleShortHandPointers = MultipleShortHandPointers: XPointer-Ausdruck "{0}" ist ungültig. Mehrere ShortHand-Zeiger vorhanden.
+SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer-Ausdruck "{0}" ist ungültig. Auf SchemeData folgte kein ")"-Zeichen. 
+SchemeUnsupported = SchemeUnsupported: XPointer-Schema "{0}" wird nicht unterstützt.
+InvalidShortHandPointer = InvalidShortHandPointer: NCName von ShortHand-Zeiger "{0}" ist ungültig.
+UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: XPointer-Ausdruck "{0}" ist ungültig. Die Anzahl der öffnenden Klammern "{1}" entspricht nicht der Anzahl der schließenden Klammern "{2}".
+InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer-Ausdruck "{0}" enthalt ungültige SchemeData.
 
 # XPointer Element Scheme Error Messages
-InvalidElementSchemeToken = InvalidElementSchemeToken: element()-Schema-XPointer-Ausdruck enth\u00E4lt das ung\u00FCltige Token "{0}"
-InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: Elementschema-XPointer-Ausdruck "{0}" ist ung\u00FCltig.
+InvalidElementSchemeToken = InvalidElementSchemeToken: element()-Schema-XPointer-Ausdruck enthält das ungültige Token "{0}"
+InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: Elementschema-XPointer-Ausdruck "{0}" ist ungültig.
 XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: Beim Verarbeiten des XPointer-element()-Schemaausdrucks ist ein Fehler aufgetreten.
-InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element()-Schema enth\u00E4lt einen ShortHand-Zeiger "{0}" mit einem ung\u00FCltigen NCName.
-InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: element()-Schema enth\u00E4lt ein untergeordnetes Sequenzzeichen "{0}". 
+InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element()-Schema enthält einen ShortHand-Zeiger "{0}" mit einem ungültigen NCName.
+InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: element()-Schema enthält ein untergeordnetes Sequenzzeichen "{0}". 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties
index 3495022fe75..d90c9a7d5b7 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties
@@ -32,19 +32,19 @@ BadMessageKey = No se ha encontrado el mensaje de error que corresponde a la cla
 FormatFailed = Se ha producido un error interno al formatear el siguiente mensaje:\n  
 
 # XPointer Framework Error Messages
-XPointerProcessingError = XPointerProcessingError: Se ha producido un error al procesar la expresi\u00F3n XPointer.
-InvalidXPointerToken = InvalidXPointerToken: La expresi\u00F3n XPointer contiene el token no v\u00E1lido ''{0}''
-InvalidXPointerExpression = InvalidXPointerExpression: La expresi\u00F3n XPointer ''{0}'' no es v\u00E1lida.
-MultipleShortHandPointers = MultipleShortHandPointers:  La expresi\u00F3n XPointer ''{0}'' no es v\u00E1lida. Tiene m\u00E1s de un puntero abreviado. 
-SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: La expresi\u00F3n XPointer ''{0}'' no es v\u00E1lida. SchemeData no viene seguido de un car\u00E1cter '')''. 
-SchemeUnsupported = SchemeUnsupported: El esquema XPointer ''{0}'' no est\u00E1 soportado.
-InvalidShortHandPointer = InvalidShortHandPointer: El valor de NCName del puntero abreviado ''{0}'' no es v\u00E1lido.
-UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: La expresi\u00F3n XPointer ''{0}'' no es v\u00E1lida. El n\u00FAmero de par\u00E9ntesis de apertura ''{1}'' no es igual al n\u00FAmero de par\u00E9ntesis de cierre ''{2}''.
-InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: La expresi\u00F3n XPointer ''{0}'' contiene un valor de SchemeData no v\u00E1lido.
+XPointerProcessingError = XPointerProcessingError: Se ha producido un error al procesar la expresión XPointer.
+InvalidXPointerToken = InvalidXPointerToken: La expresión XPointer contiene el token no válido ''{0}''
+InvalidXPointerExpression = InvalidXPointerExpression: La expresión XPointer ''{0}'' no es válida.
+MultipleShortHandPointers = MultipleShortHandPointers:  La expresión XPointer ''{0}'' no es válida. Tiene más de un puntero abreviado. 
+SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: La expresión XPointer ''{0}'' no es válida. SchemeData no viene seguido de un carácter '')''. 
+SchemeUnsupported = SchemeUnsupported: El esquema XPointer ''{0}'' no está soportado.
+InvalidShortHandPointer = InvalidShortHandPointer: El valor de NCName del puntero abreviado ''{0}'' no es válido.
+UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: La expresión XPointer ''{0}'' no es válida. El número de paréntesis de apertura ''{1}'' no es igual al número de paréntesis de cierre ''{2}''.
+InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: La expresión XPointer ''{0}'' contiene un valor de SchemeData no válido.
 
 # XPointer Element Scheme Error Messages
-InvalidElementSchemeToken = InvalidElementSchemeToken: La expresi\u00F3n XPointer del esquema de element() contiene el token no v\u00E1lido ''{0}''
-InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: La expresi\u00F3n XPointer del esquema de elemento ''{0}'' no es v\u00E1lida.
-XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: Se ha producido un error al procesar la expresi\u00F3n de esquema XPointer element().
-InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: El esquema element() contiene un puntero abreviado ''{0}'' con un valor de NCName no v\u00E1lido.
-InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: El esquema element() contiene un car\u00E1cter de secuencia secundaria no v\u00E1lido ''{0}''. 
+InvalidElementSchemeToken = InvalidElementSchemeToken: La expresión XPointer del esquema de element() contiene el token no válido ''{0}''
+InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: La expresión XPointer del esquema de elemento ''{0}'' no es válida.
+XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: Se ha producido un error al procesar la expresión de esquema XPointer element().
+InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: El esquema element() contiene un puntero abreviado ''{0}'' con un valor de NCName no válido.
+InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: El esquema element() contiene un carácter de secuencia secundaria no válido ''{0}''. 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties
index a9fe2c41407..65c0d2040d2 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties
@@ -28,7 +28,7 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
+BadMessageKey = Le message d'erreur correspondant à la clé de message est introuvable.
 FormatFailed = Une erreur interne est survenue lors de la mise en forme du message suivant :\n  
 
 # XPointer Framework Error Messages
@@ -36,15 +36,15 @@ XPointerProcessingError = XPointerProcessingError : une erreur est survenue lors
 InvalidXPointerToken = InvalidXPointerToken : l''expression XPointer contient le jeton non valide ''{0}''
 InvalidXPointerExpression = InvalidXPointerExpression : l''expression XPointer ''{0}'' n''est pas valide.
 MultipleShortHandPointers = MultipleShortHandPointers : l''expression XPointer ''{0}'' n''est pas valide. Elle contient plusieurs pointeurs ShortHand. 
-SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis : l''expression XPointer ''{0}'' n''est pas valide. L''\u00E9l\u00E9ment SchemeData n''est pas suivi d''un caract\u00E8re '')''. 
+SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis : l''expression XPointer ''{0}'' n''est pas valide. L''élément SchemeData n''est pas suivi d''un caractère '')''. 
 SchemeUnsupported = SchemeUnsupported : le processus XPointer ''{0}'' n''est pas pris en charge.
 InvalidShortHandPointer = InvalidShortHandPointer : le NCName du pointeur ShortHand ''{0}'' n''est pas valide.
-UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression : l''expression XPointer ''{0}'' n''est pas valide. Le nombre de parenth\u00E8ses ouvrantes ''{1}'' est diff\u00E9rent du nombre de parenth\u00E8ses fermantes ''{2}''.
-InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer : l''expression XPointer ''{0}'' contient un \u00E9l\u00E9ment SchemeData non valide.
+UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression : l''expression XPointer ''{0}'' n''est pas valide. Le nombre de parenthèses ouvrantes ''{1}'' est différent du nombre de parenthèses fermantes ''{2}''.
+InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer : l''expression XPointer ''{0}'' contient un élément SchemeData non valide.
 
 # XPointer Element Scheme Error Messages
 InvalidElementSchemeToken = InvalidElementSchemeToken : l''expression XPointer du processus element() contient le jeton non valide ''{0}''
-InvalidElementSchemeXPointer = InvalidElementSchemeXPointer : l''expression XPointer de processus d''\u00E9l\u00E9ment ''{0}'' n''est pas valide.
+InvalidElementSchemeXPointer = InvalidElementSchemeXPointer : l''expression XPointer de processus d''élément ''{0}'' n''est pas valide.
 XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError : une erreur est survenue lors du traitement de l'expression de processus element() XPointer.
 InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData : le processus element() contient un pointeur ShortHand ''{0}'' avec un NCName non valide.
-InvalidChildSequenceCharacter = InvalidChildSequenceCharacter : le processus element() contient un caract\u00E8re de s\u00E9quence enfant non valide ''{0}''. 
+InvalidChildSequenceCharacter = InvalidChildSequenceCharacter : le processus element() contient un caractère de séquence enfant non valide ''{0}''. 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties
index 549797ba81e..d5822b7e7dc 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties
@@ -29,22 +29,22 @@
 
 # Messages for message reporting
 BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
-FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n  
+FormatFailed = Si è verificato un errore interno durante la formattazione del seguente messaggio:\n  
 
 # XPointer Framework Error Messages
-XPointerProcessingError = XPointerProcessingError: si \u00E8 verificato un errore durante l'elaborazione dell'espressione XPointer.
+XPointerProcessingError = XPointerProcessingError: si è verificato un errore durante l'elaborazione dell'espressione XPointer.
 InvalidXPointerToken = InvalidXPointerToken: l''espressione XPointer contiene il token non valido ''{0}''.
-InvalidXPointerExpression = InvalidXPointerExpression: l''espressione XPointer ''{0}'' non \u00E8 valida.
-MultipleShortHandPointers = MultipleShortHandPointers: l''espressione XPointer ''{0}'' non \u00E8 valida. Contiene pi\u00F9 puntatori ShortHand. 
-SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: l''espressione XPointer ''{0}'' non \u00E8 valida. SchemeData non \u00E8 seguito da un carattere '')''. 
-SchemeUnsupported = SchemeUnsupported: lo schema XPointer ''{0}'' non \u00E8 supportato.
+InvalidXPointerExpression = InvalidXPointerExpression: l''espressione XPointer ''{0}'' non è valida.
+MultipleShortHandPointers = MultipleShortHandPointers: l''espressione XPointer ''{0}'' non è valida. Contiene più puntatori ShortHand. 
+SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: l''espressione XPointer ''{0}'' non è valida. SchemeData non è seguito da un carattere '')''. 
+SchemeUnsupported = SchemeUnsupported: lo schema XPointer ''{0}'' non è supportato.
 InvalidShortHandPointer = InvalidShortHandPointer: NCName del puntatore ShortHand ''{0}'' non valido.
-UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: l''espressione XPointer ''{0}'' non \u00E8 valida. Il numero di parentesi aperte ''{1}'' non corrisponde al numero di parentesi chiuse ''{2}''.
+UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: l''espressione XPointer ''{0}'' non è valida. Il numero di parentesi aperte ''{1}'' non corrisponde al numero di parentesi chiuse ''{2}''.
 InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: l''espressione XPointer ''{0}'' contiene SchemeData non validi.
 
 # XPointer Element Scheme Error Messages
 InvalidElementSchemeToken = InvalidElementSchemeToken: l''espressione XPointer dello schema element() contiene il token non valido ''{0}''.
-InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: l''espressione XPointer ''{0}'' dello schema di elemento non \u00E8 valida.
-XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: si \u00E8 verificato un errore durante l'elaborazione dell'espressione di schema element() XPointer.
+InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: l''espressione XPointer ''{0}'' dello schema di elemento non è valida.
+XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: si è verificato un errore durante l'elaborazione dell'espressione di schema element() XPointer.
 InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: lo schema element() contiene un puntatore ShortHand ''{0}'' con NCName non valido.
 InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: lo schema element() contiene un carattere di sequenza secondaria ''{0}'' non valido. 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
index b38985677ac..0038baa4d6c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
@@ -20,23 +20,23 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n  
+BadMessageKey = メッセージ・キーに対応するエラー・メッセージが見つかりません。
+FormatFailed = 次のメッセージの書式設定中に内部エラーが発生しました:\n  
 
 # XPointer Framework Error Messages
-XPointerProcessingError = XPointerProcessingError: XPointer\u5F0F\u306E\u51E6\u7406\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-InvalidXPointerToken = InvalidXPointerToken: XPointer\u5F0F\u306B\u7121\u52B9\u306A\u30C8\u30FC\u30AF\u30F3''{0}''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-InvalidXPointerExpression = InvalidXPointerExpression: XPointer\u5F0F''{0}''\u304C\u7121\u52B9\u3067\u3059\u3002
-MultipleShortHandPointers = MultipleShortHandPointers: XPointer\u5F0F''{0}''\u304C\u7121\u52B9\u3067\u3059\u3002\u8907\u6570\u306EShortHand\u30DD\u30A4\u30F3\u30BF\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002 
-SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer\u5F0F''{0}''\u304C\u7121\u52B9\u3067\u3059\u3002SchemeData\u306E\u5F8C\u306B'')''\u6587\u5B57\u304C\u3042\u308A\u307E\u305B\u3093\u3002 
-SchemeUnsupported = SchemeUnsupported: XPointer\u30B9\u30AD\u30FC\u30E0''{0}''\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-InvalidShortHandPointer = InvalidShortHandPointer: ShortHand\u30DD\u30A4\u30F3\u30BF''{0}''\u306ENCName\u304C\u7121\u52B9\u3067\u3059\u3002
-UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: XPointer\u5F0F''{0}''\u304C\u7121\u52B9\u3067\u3059\u3002\u5DE6\u4E38\u30AB\u30C3\u30B3''{1}''\u306E\u6570\u304C\u53F3\u4E38\u30AB\u30C3\u30B3''{2}''\u306E\u6570\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002
-InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer\u5F0F''{0}''\u306B\u7121\u52B9\u306ASchemeData\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
+XPointerProcessingError = XPointerProcessingError: XPointer式の処理中にエラーが発生しました。
+InvalidXPointerToken = InvalidXPointerToken: XPointer式に無効なトークン''{0}''が含まれています
+InvalidXPointerExpression = InvalidXPointerExpression: XPointer式''{0}''が無効です。
+MultipleShortHandPointers = MultipleShortHandPointers: XPointer式''{0}''が無効です。複数のShortHandポインタが含まれています。 
+SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer式''{0}''が無効です。SchemeDataの後に'')''文字がありません。 
+SchemeUnsupported = SchemeUnsupported: XPointerスキーム''{0}''はサポートされていません。
+InvalidShortHandPointer = InvalidShortHandPointer: ShortHandポインタ''{0}''のNCNameが無効です。
+UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: XPointer式''{0}''が無効です。左丸カッコ''{1}''の数が右丸カッコ''{2}''の数と一致しません。
+InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer式''{0}''に無効なSchemeDataが含まれています。
 
 # XPointer Element Scheme Error Messages
-InvalidElementSchemeToken = InvalidElementSchemeToken: element() Scheme XPointer\u5F0F\u306B\u7121\u52B9\u306A\u30C8\u30FC\u30AF\u30F3''{0}''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: Element Scheme XPointer\u5F0F''{0}''\u304C\u7121\u52B9\u3067\u3059\u3002
-XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: XPointer element() Scheme\u5F0F\u306E\u51E6\u7406\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element() Scheme\u306B\u7121\u52B9\u306ANCName\u3092\u6301\u3064ShortHand\u30DD\u30A4\u30F3\u30BF''{0}''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: element() Scheme\u306B\u7121\u52B9\u306A\u5B50\u30B7\u30FC\u30B1\u30F3\u30B9\u6587\u5B57''{0}''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002 
+InvalidElementSchemeToken = InvalidElementSchemeToken: element() Scheme XPointer式に無効なトークン''{0}''が含まれています。
+InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: Element Scheme XPointer式''{0}''が無効です。
+XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: XPointer element() Scheme式の処理中にエラーが発生しました。
+InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element() Schemeに無効なNCNameを持つShortHandポインタ''{0}''が含まれています。
+InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: element() Schemeに無効な子シーケンス文字''{0}''が含まれています。 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties
index c86ecf6264c..2e920adf165 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties
@@ -28,23 +28,23 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n  
+BadMessageKey = 메시지 키에 해당하는 오류 메시지를 찾을 수 없습니다.
+FormatFailed = 다음 메시지의 형식을 지정하는 중 내부 오류가 발생했습니다.\n  
 
 # XPointer Framework Error Messages
-XPointerProcessingError = XPointerProcessingError: XPointer \uD45C\uD604\uC2DD\uC744 \uCC98\uB9AC\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
-InvalidXPointerToken = InvalidXPointerToken: XPointer \uD45C\uD604\uC2DD\uC5D0 \uBD80\uC801\uD569\uD55C \uD1A0\uD070 ''{0}''\uC774(\uAC00) \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-InvalidXPointerExpression = InvalidXPointerExpression: XPointer \uD45C\uD604\uC2DD ''{0}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-MultipleShortHandPointers = MultipleShortHandPointers: XPointer \uD45C\uD604\uC2DD ''{0}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. ShortHand Pointer\uAC00 \uB450 \uAC1C \uC774\uC0C1 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. 
-SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer \uD45C\uD604\uC2DD ''{0}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. SchemeData \uB4A4\uC5D0 '')'' \uBB38\uC790\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. 
-SchemeUnsupported = SchemeUnsupported: XPointer \uCCB4\uACC4 ''{0}''\uC740(\uB294) \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-InvalidShortHandPointer = InvalidShortHandPointer: ShortHand Pointer ''{0}''\uC758 NCName\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: XPointer \uD45C\uD604\uC2DD ''{0}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC5EC\uB294 \uAD04\uD638\uC758 \uAC1C\uC218 ''{1}''\uACFC(\uC640) \uB2EB\uB294 \uAD04\uD638\uC758 \uAC1C\uC218 ''{2}''\uC774(\uAC00) \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer \uD45C\uD604\uC2DD ''{0}''\uC5D0 \uBD80\uC801\uD569\uD55C SchemeData\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
+XPointerProcessingError = XPointerProcessingError: XPointer 표현식을 처리하는 중 오류가 발생했습니다.
+InvalidXPointerToken = InvalidXPointerToken: XPointer 표현식에 부적합한 토큰 ''{0}''이(가) 포함되어 있습니다.
+InvalidXPointerExpression = InvalidXPointerExpression: XPointer 표현식 ''{0}''이(가) 부적합합니다.
+MultipleShortHandPointers = MultipleShortHandPointers: XPointer 표현식 ''{0}''이(가) 부적합합니다. ShortHand Pointer가 두 개 이상 포함되어 있습니다. 
+SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer 표현식 ''{0}''이(가) 부적합합니다. SchemeData 뒤에 '')'' 문자가 없습니다. 
+SchemeUnsupported = SchemeUnsupported: XPointer 체계 ''{0}''은(는) 지원되지 않습니다.
+InvalidShortHandPointer = InvalidShortHandPointer: ShortHand Pointer ''{0}''의 NCName이 부적합합니다.
+UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: XPointer 표현식 ''{0}''이(가) 부적합합니다. 여는 괄호의 개수 ''{1}''과(와) 닫는 괄호의 개수 ''{2}''이(가) 일치하지 않습니다.
+InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer 표현식 ''{0}''에 부적합한 SchemeData가 포함되어 있습니다.
 
 # XPointer Element Scheme Error Messages
-InvalidElementSchemeToken = InvalidElementSchemeToken: element() \uCCB4\uACC4 XPointer \uD45C\uD604\uC2DD\uC5D0 \uBD80\uC801\uD569\uD55C \uD1A0\uD070 ''{0}''\uC774(\uAC00) \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: \uC694\uC18C \uCCB4\uACC4 XPointer \uD45C\uD604\uC2DD ''{0}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: XPointer element() \uCCB4\uACC4 \uD45C\uD604\uC2DD\uC744 \uCC98\uB9AC\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
-InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element() \uCCB4\uACC4\uC5D0 NCName\uC774 \uBD80\uC801\uD569\uD55C ShortHand Pointer ''{0}''\uC774(\uAC00) \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: element() \uCCB4\uACC4\uC5D0 \uBD80\uC801\uD569\uD55C \uD558\uC704 \uC2DC\uD000\uC2A4 \uBB38\uC790 ''{0}''\uC774(\uAC00) \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. 
+InvalidElementSchemeToken = InvalidElementSchemeToken: element() 체계 XPointer 표현식에 부적합한 토큰 ''{0}''이(가) 포함되어 있습니다.
+InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: 요소 체계 XPointer 표현식 ''{0}''이(가) 부적합합니다.
+XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: XPointer element() 체계 표현식을 처리하는 중 오류가 발생했습니다.
+InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element() 체계에 NCName이 부적합한 ShortHand Pointer ''{0}''이(가) 포함되어 있습니다.
+InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: element() 체계에 부적합한 하위 시퀀스 문자 ''{0}''이(가) 포함되어 있습니다. 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties
index 34584b802ca..2d5522e7989 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties
@@ -28,23 +28,23 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
+BadMessageKey = Não foi possível encontrar a mensagem de erro correspondente à chave da mensagem.
 FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n  
 
 # XPointer Framework Error Messages
-XPointerProcessingError = XPointerProcessingError: Ocorreu um erro ao processar a express\u00E3o XPointer.
-InvalidXPointerToken = InvalidXPointerToken: A express\u00E3o XPointer cont\u00E9m o token inv\u00E1lido ''{0}''
-InvalidXPointerExpression = InvalidXPointerExpression: A express\u00E3o XPointer ''{0}'' \u00E9 inv\u00E1lida.
-MultipleShortHandPointers = MultipleShortHandPointers: A express\u00E3o XPointer ''{0}'' \u00E9 inv\u00E1lida. Tem mais de um Ponteiro ShortHand. 
-SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: A express\u00E3o XPointer ''{0}'' \u00E9 inv\u00E1lida. O SchemeData n\u00E3o foi seguida por um caractere '')". 
-SchemeUnsupported = SchemeUnsupported: O esquema XPointer ''{0}'' n\u00E3o \u00E9 suportado.
-InvalidShortHandPointer = InvalidShortHandPointer: O NCName do Ponteiro do ShortHand ''{0}'' \u00E9 inv\u00E1lido.
-UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: A express\u00E3o XPointer ''{0}'' \u00E9 inv\u00E1lida. O n\u00FAmero de par\u00EAnteses de abertura ''{1}'' n\u00E3o \u00E9 igual ao n\u00FAmero de par\u00EAnteses de fechamento ''{2}''.
-InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: A express\u00E3o XPointer ''{0}'' cont\u00E9m SchemeData inv\u00E1lido.
+XPointerProcessingError = XPointerProcessingError: Ocorreu um erro ao processar a expressão XPointer.
+InvalidXPointerToken = InvalidXPointerToken: A expressão XPointer contém o token inválido ''{0}''
+InvalidXPointerExpression = InvalidXPointerExpression: A expressão XPointer ''{0}'' é inválida.
+MultipleShortHandPointers = MultipleShortHandPointers: A expressão XPointer ''{0}'' é inválida. Tem mais de um Ponteiro ShortHand. 
+SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: A expressão XPointer ''{0}'' é inválida. O SchemeData não foi seguida por um caractere '')". 
+SchemeUnsupported = SchemeUnsupported: O esquema XPointer ''{0}'' não é suportado.
+InvalidShortHandPointer = InvalidShortHandPointer: O NCName do Ponteiro do ShortHand ''{0}'' é inválido.
+UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: A expressão XPointer ''{0}'' é inválida. O número de parênteses de abertura ''{1}'' não é igual ao número de parênteses de fechamento ''{2}''.
+InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: A expressão XPointer ''{0}'' contém SchemeData inválido.
 
 # XPointer Element Scheme Error Messages
-InvalidElementSchemeToken = InvalidElementSchemeToken: A express\u00E3o XPointer do esquema element() cont\u00E9m o token inv\u00E1lido ''{0}''
-InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: A express\u00E3o XPointer do Esquema do Elemento ''{0}'' \u00E9 inv\u00E1lida.
-XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: Ocorreu um erro ao processoar a express\u00E3o do Esquema do element() do XPointer.
-InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: O Esquema do element() cont\u00E9m um Ponteiro de ShortHand ''{0}'' com um NCName inv\u00E1lido.
-InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: O Esquema de element() cont\u00E9m um caractere de sequ\u00EAncia filho inv\u00E1lido ''{0}''. 
+InvalidElementSchemeToken = InvalidElementSchemeToken: A expressão XPointer do esquema element() contém o token inválido ''{0}''
+InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: A expressão XPointer do Esquema do Elemento ''{0}'' é inválida.
+XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: Ocorreu um erro ao processoar a expressão do Esquema do element() do XPointer.
+InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: O Esquema do element() contém um Ponteiro de ShortHand ''{0}'' com um NCName inválido.
+InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: O Esquema de element() contém um caractere de sequência filho inválido ''{0}''. 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties
index 0e822f523f2..2247d081105 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties
@@ -29,22 +29,22 @@
 
 # Messages for message reporting
 BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
-FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n  
+FormatFailed = Ett internt fel inträffade vid formatering av följande meddelande:\n  
 
 # XPointer Framework Error Messages
-XPointerProcessingError = XPointerProcessingError: Ett fel intr\u00E4ffade vid bearbetning av XPointer-uttrycket.
-InvalidXPointerToken = InvalidXPointerToken: XPointer-uttrycket inneh\u00E5ller ogiltigt tecken, ''{0}''
-InvalidXPointerExpression = InvalidXPointerExpression: XPointer-uttrycket ''{0}'' \u00E4r ogiltigt.
-MultipleShortHandPointers = MultipleShortHandPointers: XPointer-uttrycket ''{0}'' \u00E4r ogiltigt. Det inneh\u00E5ller fler \u00E4n en ShortHand Pointer. 
-SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer-uttrycket ''{0}'' \u00E4r ogiltigt. SchemeData efterf\u00F6ljdes inte av ett '')''-tecken. 
-SchemeUnsupported = SchemeUnsupported: XPointer-schemat ''{0}'' st\u00F6ds inte.
-InvalidShortHandPointer = InvalidShortHandPointer: NCName i ShortHand-pekaren ''{0}'' \u00E4r ogiltigt.
-UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: XPointer-uttrycket ''{0}'' \u00E4r ogiltigt. Antalet v\u00E4nsterparenteser ''{1}'' \u00E4r inte samma som antalet h\u00F6gerparenteser ''{2}''.
-InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer-uttrycket ''{0}'' inneh\u00E5ller ogiltig SchemeData.
+XPointerProcessingError = XPointerProcessingError: Ett fel inträffade vid bearbetning av XPointer-uttrycket.
+InvalidXPointerToken = InvalidXPointerToken: XPointer-uttrycket innehåller ogiltigt tecken, ''{0}''
+InvalidXPointerExpression = InvalidXPointerExpression: XPointer-uttrycket ''{0}'' är ogiltigt.
+MultipleShortHandPointers = MultipleShortHandPointers: XPointer-uttrycket ''{0}'' är ogiltigt. Det innehåller fler än en ShortHand Pointer. 
+SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer-uttrycket ''{0}'' är ogiltigt. SchemeData efterföljdes inte av ett '')''-tecken. 
+SchemeUnsupported = SchemeUnsupported: XPointer-schemat ''{0}'' stöds inte.
+InvalidShortHandPointer = InvalidShortHandPointer: NCName i ShortHand-pekaren ''{0}'' är ogiltigt.
+UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: XPointer-uttrycket ''{0}'' är ogiltigt. Antalet vänsterparenteser ''{1}'' är inte samma som antalet högerparenteser ''{2}''.
+InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer-uttrycket ''{0}'' innehåller ogiltig SchemeData.
 
 # XPointer Element Scheme Error Messages
-InvalidElementSchemeToken = InvalidElementSchemeToken: XPointer-uttrycket i element()-schemat inneh\u00E5ller ogiltigt tecken ''{0}''
-InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: XPointer-uttrycket ''{0}'' i elementschemat \u00E4r ogiltigt.
-XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: Ett fel intr\u00E4ffade vid bearbetning av schemauttrycket i XPointer element().
-InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element()-schemat inneh\u00E5ller ShortHand-pekaren ''{0}'' med ogiltigt NCName.
-InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: element()-schemat inneh\u00E5ller ett ogiltigt tecken ''{0}'' i underordnad sekvens. 
+InvalidElementSchemeToken = InvalidElementSchemeToken: XPointer-uttrycket i element()-schemat innehåller ogiltigt tecken ''{0}''
+InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: XPointer-uttrycket ''{0}'' i elementschemat är ogiltigt.
+XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: Ett fel inträffade vid bearbetning av schemauttrycket i XPointer element().
+InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element()-schemat innehåller ShortHand-pekaren ''{0}'' med ogiltigt NCName.
+InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: element()-schemat innehåller ett ogiltigt tecken ''{0}'' i underordnad sekvens. 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
index cb1886a09ce..140c91a4673 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
@@ -20,23 +20,23 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
-FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n  
+BadMessageKey = 找不到与消息关键字对应的错误消息。
+FormatFailed = 设置以下消息的格式时出现内部错误:\n  
 
 # XPointer Framework Error Messages
-XPointerProcessingError = XPointerProcessingError: \u5904\u7406 XPointer \u8868\u8FBE\u5F0F\u65F6\u51FA\u9519\u3002
-InvalidXPointerToken = InvalidXPointerToken: XPointer \u8868\u8FBE\u5F0F\u5305\u542B\u65E0\u6548\u7684\u6807\u8BB0 ''{0}''
-InvalidXPointerExpression = InvalidXPointerExpression: XPointer \u8868\u8FBE\u5F0F ''{0}'' \u65E0\u6548\u3002
-MultipleShortHandPointers = MultipleShortHandPointers: XPointer \u8868\u8FBE\u5F0F ''{0}'' \u65E0\u6548\u3002\u5B83\u5177\u6709\u591A\u4E2A ShortHand \u6307\u9488\u3002
-SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer \u8868\u8FBE\u5F0F ''{0}'' \u65E0\u6548\u3002SchemeData \u7684\u540E\u9762\u672A\u8DDF\u968F '')'' \u5B57\u7B26\u3002
-SchemeUnsupported = SchemeUnsupported: \u4E0D\u652F\u6301 XPointer \u65B9\u6848 ''{0}''\u3002
-InvalidShortHandPointer = InvalidShortHandPointer: ShortHand \u6307\u9488 ''{0}'' \u7684 NCName \u65E0\u6548\u3002
-UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: XPointer \u8868\u8FBE\u5F0F ''{0}'' \u65E0\u6548\u3002\u5DE6\u62EC\u53F7\u7684\u6570\u91CF ''{1}'' \u4E0E\u53F3\u62EC\u53F7\u7684\u6570\u91CF ''{2}'' \u4E0D\u76F8\u7B49\u3002
-InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer \u8868\u8FBE\u5F0F ''{0}'' \u5305\u542B\u65E0\u6548\u7684 SchemeData\u3002
+XPointerProcessingError = XPointerProcessingError: 处理 XPointer 表达式时出错。
+InvalidXPointerToken = InvalidXPointerToken: XPointer 表达式包含无效的标记 ''{0}''
+InvalidXPointerExpression = InvalidXPointerExpression: XPointer 表达式 ''{0}'' 无效。
+MultipleShortHandPointers = MultipleShortHandPointers: XPointer 表达式 ''{0}'' 无效。它具有多个 ShortHand 指针。
+SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer 表达式 ''{0}'' 无效。SchemeData 的后面未跟随 '')'' 字符。
+SchemeUnsupported = SchemeUnsupported: 不支持 XPointer 方案 ''{0}''。
+InvalidShortHandPointer = InvalidShortHandPointer: ShortHand 指针 ''{0}'' 的 NCName 无效。
+UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: XPointer 表达式 ''{0}'' 无效。左括号的数量 ''{1}'' 与右括号的数量 ''{2}'' 不相等。
+InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer 表达式 ''{0}'' 包含无效的 SchemeData。
 
 # XPointer Element Scheme Error Messages
-InvalidElementSchemeToken = InvalidElementSchemeToken: element() \u65B9\u6848\u7684 XPointer \u8868\u8FBE\u5F0F\u5305\u542B\u65E0\u6548\u7684\u6807\u8BB0 ''{0}''
-InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: \u5143\u7D20\u65B9\u6848\u7684 XPointer \u8868\u8FBE\u5F0F ''{0}'' \u65E0\u6548\u3002
-XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: \u5904\u7406 XPointer element() \u65B9\u6848\u8868\u8FBE\u5F0F\u65F6\u51FA\u9519\u3002
-InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element() \u65B9\u6848\u5305\u542B NCName \u65E0\u6548\u7684 ShortHand \u6307\u9488 ''{0}''\u3002
-InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: element() \u65B9\u6848\u5305\u542B\u65E0\u6548\u7684\u5B50\u5E8F\u5217\u5B57\u7B26 ''{0}''\u3002
+InvalidElementSchemeToken = InvalidElementSchemeToken: element() 方案的 XPointer 表达式包含无效的标记 ''{0}''
+InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: 元素方案的 XPointer 表达式 ''{0}'' 无效。
+XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: 处理 XPointer element() 方案表达式时出错。
+InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element() 方案包含 NCName 无效的 ShortHand 指针 ''{0}''。
+InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: element() 方案包含无效的子序列字符 ''{0}''。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties
index 5b30e236a2e..3d3798b7609 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties
@@ -28,23 +28,23 @@
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
 # Messages for message reporting
-BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
-FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
+BadMessageKey = 找不到對應訊息索引鍵的錯誤訊息。
+FormatFailed = 格式化下列訊息時發生內部錯誤:\n
 
 # XPointer Framework Error Messages
-XPointerProcessingError = XPointerProcessingError: \u8655\u7406 XPointer \u8868\u793A\u5F0F\u6642\u767C\u751F\u932F\u8AA4\u3002
-InvalidXPointerToken = InvalidXPointerToken: XPointer \u8868\u793A\u5F0F\u5305\u542B\u7121\u6548\u8A18\u865F ''{0}''
-InvalidXPointerExpression = InvalidXPointerExpression: XPointer \u8868\u793A\u5F0F ''{0}'' \u7121\u6548\u3002
-MultipleShortHandPointers = MultipleShortHandPointers: XPointer \u8868\u793A\u5F0F ''{0}'' \u7121\u6548\u3002\u5B83\u5177\u6709\u8D85\u904E\u4E00\u500B\u4EE5\u4E0A\u7684 ShortHand \u6307\u6A19\u3002
-SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer \u8868\u793A\u5F0F ''{0}'' \u7121\u6548\u3002\u7DCA\u63A5\u5728 SchemeData \u4E4B\u5F8C\u4E0D\u662F '')'' \u5B57\u5143\u3002
-SchemeUnsupported = SchemeUnsupported: \u4E0D\u652F\u63F4 XPointer \u914D\u7F6E ''{0}''\u3002
-InvalidShortHandPointer = InvalidShortHandPointer: ShortHand \u6307\u6A19 ''{0}'' \u7684 NCName \u7121\u6548\u3002
-UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: XPointer \u8868\u793A\u5F0F ''{0}'' \u7121\u6548\u3002\u5DE6\u62EC\u865F\u7684\u6578\u76EE ''{1}'' \u4E0D\u7B49\u65BC\u53F3\u62EC\u865F\u7684\u6578\u76EE ''{2}''\u3002
-InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer \u8868\u793A\u5F0F ''{0}'' \u5305\u542B\u7121\u6548\u7684 SchemeData\u3002
+XPointerProcessingError = XPointerProcessingError: 處理 XPointer 表示式時發生錯誤。
+InvalidXPointerToken = InvalidXPointerToken: XPointer 表示式包含無效記號 ''{0}''
+InvalidXPointerExpression = InvalidXPointerExpression: XPointer 表示式 ''{0}'' 無效。
+MultipleShortHandPointers = MultipleShortHandPointers: XPointer 表示式 ''{0}'' 無效。它具有超過一個以上的 ShortHand 指標。
+SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer 表示式 ''{0}'' 無效。緊接在 SchemeData 之後不是 '')'' 字元。
+SchemeUnsupported = SchemeUnsupported: 不支援 XPointer 配置 ''{0}''。
+InvalidShortHandPointer = InvalidShortHandPointer: ShortHand 指標 ''{0}'' 的 NCName 無效。
+UnbalancedParenthesisInXPointerExpression = UnbalancedParenthesisInXPointerExpression: XPointer 表示式 ''{0}'' 無效。左括號的數目 ''{1}'' 不等於右括號的數目 ''{2}''。
+InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer 表示式 ''{0}'' 包含無效的 SchemeData。
 
 # XPointer Element Scheme Error Messages
-InvalidElementSchemeToken = InvalidElementSchemeToken: element() \u914D\u7F6E XPointer \u8868\u793A\u5F0F\u5305\u542B\u7121\u6548\u8A18\u865F ''{0}''
-InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: \u5143\u7D20\u914D\u7F6E XPointer \u8868\u793A\u5F0F ''{0}'' \u7121\u6548\u3002
-XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: \u8655\u7406 XPointer element() \u914D\u7F6E\u8868\u793A\u5F0F\u6642\u767C\u751F\u932F\u8AA4\u3002
-InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element() \u914D\u7F6E\u5305\u542B\u5177\u6709\u7121\u6548 NCName \u7684 ShortHand \u6307\u6A19 ''{0}''\u3002
-InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: element() \u914D\u7F6E\u5305\u542B\u7121\u6548\u5B50\u9805\u9806\u5E8F\u5B57\u5143 ''{0}''\u3002
+InvalidElementSchemeToken = InvalidElementSchemeToken: element() 配置 XPointer 表示式包含無效記號 ''{0}''
+InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: 元素配置 XPointer 表示式 ''{0}'' 無效。
+XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: 處理 XPointer element() 配置表示式時發生錯誤。
+InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element() 配置包含具有無效 NCName 的 ShortHand 指標 ''{0}''。
+InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: element() 配置包含無效子項順序字元 ''{0}''。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
index 816e86b09a8..27a3681097b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
@@ -1,5 +1,5 @@
 parser.parse.1=Falsches Zeichen.
-parser.parse.2=Ung\u00FCltige Referenznummer.
+parser.parse.2=Ungültige Referenznummer.
 parser.next.1=Nach \\ ist ein Zeichen erforderlich.
 parser.next.2='?' wird nicht erwartet.  '(?:' oder '(?=' oder '(?!' oder '(?<' oder '(?#' oder '(?>'?
 parser.next.3='(?<=' oder '(?<!' wird erwartet.
@@ -9,7 +9,7 @@ parser.factor.2=Unerwartetes Ende des Musters in einer Modifier-Gruppe.
 parser.factor.3=':' wird erwartet.
 parser.factor.4=Unerwartetes Ende des Musters in einer Bedingungsgruppe.
 parser.factor.5=Eine Back-Referenz, ein Anker, ein Lookahead oder ein Lookbehind wird in einem Bedingungsmuster erwartet
-parser.factor.6=Es gibt mehr als drei Auswahlm\u00F6glichkeiten in einer Bedingungsgruppe.
+parser.factor.6=Es gibt mehr als drei Auswahlmöglichkeiten in einer Bedingungsgruppe.
 parser.atom.1=Ein Zeichen in U+0040-U+005f muss auf \\c folgen.
 parser.atom.2=Ein '{' ist vor einer Zeichenkategorie erforderlich.
 parser.atom.3=Ein Eigenschaftsname nicht wird durch '}' abgeschlossen.
@@ -17,23 +17,23 @@ parser.atom.4=Unerwartetes Metazeichen.
 parser.atom.5=Unbekannte Eigenschaft.
 parser.cc.1=Eine POSIX-Zeichenklasse muss durch ':]' abgeschlossen werden.
 parser.cc.2=Unerwartetes Ende des Musters in einer Zeichenklasse.
-parser.cc.3=Unbekannter Name f\u00FCr eine POSIX-Zeichenklasse.
-parser.cc.4='-' ist hier ung\u00FCltig.
+parser.cc.3=Unbekannter Name für eine POSIX-Zeichenklasse.
+parser.cc.4='-' ist hier ungültig.
 parser.cc.5=']' wird erwartet.
-parser.cc.6='[' ist in einer Zeichenklasse ung\u00FCltig. Schreiben Sie '\\['.
-parser.cc.7=']' ist in einer Zeichenklasse ung\u00FCltig. Schreiben Sie '\\]'.
-parser.cc.8='-' ist ein ung\u00FCltiger Zeichenbereich. Schreiben Sie '\\-'.
+parser.cc.6='[' ist in einer Zeichenklasse ungültig. Schreiben Sie '\\['.
+parser.cc.7=']' ist in einer Zeichenklasse ungültig. Schreiben Sie '\\]'.
+parser.cc.8='-' ist ein ungültiger Zeichenbereich. Schreiben Sie '\\-'.
 parser.ope.1='[' wird erwartet.
 parser.ope.2=')' oder '-[' oder '+[' oder '&[' wird erwartet.
 parser.ope.3=Der Endcodepunkt des Bereichs ist kleiner als der Startcodepunkt.
-parser.descape.1=Ung\u00FCltige Unicode-Hex-Notation.
-parser.descape.2=\u00DCberlauf in einer Hex-Notation.
+parser.descape.1=Ungültige Unicode-Hex-Notation.
+parser.descape.2=Überlauf in einer Hex-Notation.
 parser.descape.3='\\x{' muss durch '}' abgeschlossen werden.
-parser.descape.4=Ung\u00FCltiger Unicode-Codepunkt.
+parser.descape.4=Ungültiger Unicode-Codepunkt.
 parser.descape.5=Ein Anker darf nicht hier sein.
-parser.process.1=Dieser Ausdruck wird in der aktuellen Optionseinstellung nicht unterst\u00FCtzt.
-parser.quantifier.1=Ung\u00FCltiger Quantifizierer. Eine Ziffer wird erwartet.
-parser.quantifier.2=Ung\u00FCltiger Quantifizierer. Ung\u00FCltige Menge, oder ein '}' fehlt.
-parser.quantifier.3=Ung\u00FCltiger Quantifizierer. Eine Stelle oder '}' wird erwartet.
-parser.quantifier.4=Ung\u00FCltiger Quantifizierer. Mindestmenge muss <= Maximalmenge sein.
-parser.quantifier.5=Ung\u00FCltiger Quantifizierer. Ein Mengenwert\u00FCberlauf.
+parser.process.1=Dieser Ausdruck wird in der aktuellen Optionseinstellung nicht unterstützt.
+parser.quantifier.1=Ungültiger Quantifizierer. Eine Ziffer wird erwartet.
+parser.quantifier.2=Ungültiger Quantifizierer. Ungültige Menge, oder ein '}' fehlt.
+parser.quantifier.3=Ungültiger Quantifizierer. Eine Stelle oder '}' wird erwartet.
+parser.quantifier.4=Ungültiger Quantifizierer. Mindestmenge muss <= Maximalmenge sein.
+parser.quantifier.5=Ungültiger Quantifizierer. Ein Mengenwertüberlauf.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties
index 46850e84415..0ee3c7d94a4 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties
@@ -23,42 +23,42 @@
 # questions.
 #
 
-parser.parse.1=Car\u00E1cter incorrecto.
-parser.parse.2=N\u00FAmero de referencia no v\u00E1lido.
-parser.next.1=Es necesario un car\u00E1cter despu\u00E9s de \\.
+parser.parse.1=Carácter incorrecto.
+parser.parse.2=Número de referencia no válido.
+parser.next.1=Es necesario un carácter después de \\.
 parser.next.2=No se esperaba '?'. '(?:', '(?=', '(?!', '(?<', '(?#' o '(?>'?
 parser.next.3=Se esperaba '(?<=' o '(?<!'.
-parser.next.4=Un comentario no est\u00E1 terminado.
+parser.next.4=Un comentario no está terminado.
 parser.factor.1=Se esperaba ')'.
-parser.factor.2=Fin inesperado del patr\u00F3n en un grupo de modificadores.
+parser.factor.2=Fin inesperado del patrón en un grupo de modificadores.
 parser.factor.3=Se esperaba ':'.
-parser.factor.4=Fin inesperado del patr\u00F3n en un grupo condicional.
-parser.factor.5=Se esperaba una referencia hacia atr\u00E1s, anclaje, lookahead o lookbehind en un patr\u00F3n condicional.
-parser.factor.6=Hay m\u00E1s de tres opciones en un grupo condicional.
-parser.atom.1=Un car\u00E1cter en U+0040-U+005f debe seguir a \\c.
-parser.atom.2=Se necesita '{' antes de una categor\u00EDa de car\u00E1cter.
-parser.atom.3=Un nombre de propiedad no est\u00E1 cerrado por '}'.
-parser.atom.4=Metacar\u00E1cter inesperado.
+parser.factor.4=Fin inesperado del patrón en un grupo condicional.
+parser.factor.5=Se esperaba una referencia hacia atrás, anclaje, lookahead o lookbehind en un patrón condicional.
+parser.factor.6=Hay más de tres opciones en un grupo condicional.
+parser.atom.1=Un carácter en U+0040-U+005f debe seguir a \\c.
+parser.atom.2=Se necesita '{' antes de una categoría de carácter.
+parser.atom.3=Un nombre de propiedad no está cerrado por '}'.
+parser.atom.4=Metacarácter inesperado.
 parser.atom.5=Propiedad desconocida.
-parser.cc.1=Una clase de car\u00E1cter POSIX debe estar cerrada por ':]'.
-parser.cc.2=Fin inesperado del patr\u00F3n en una clase de car\u00E1cter.
-parser.cc.3=Nombre desconocido para una clase de car\u00E1cter POSIX.
-parser.cc.4='-' no es v\u00E1lido aqu\u00ED.
+parser.cc.1=Una clase de carácter POSIX debe estar cerrada por ':]'.
+parser.cc.2=Fin inesperado del patrón en una clase de carácter.
+parser.cc.3=Nombre desconocido para una clase de carácter POSIX.
+parser.cc.4='-' no es válido aquí.
 parser.cc.5=Se esperaba ']'.
-parser.cc.6='[' no es v\u00E1lido en una clase de car\u00E1cter. Escriba '\\['.
-parser.cc.7=']' no es v\u00E1lido en una clase de car\u00E1cter. Escriba '\\]'.
-parser.cc.8='-' no es un rango de caracteres v\u00E1lido. Escriba '\\-'.
+parser.cc.6='[' no es válido en una clase de carácter. Escriba '\\['.
+parser.cc.7=']' no es válido en una clase de carácter. Escriba '\\]'.
+parser.cc.8='-' no es un rango de caracteres válido. Escriba '\\-'.
 parser.ope.1=Se esperaba '['.
 parser.ope.2=Se esperaba ')', '-[', '+[' o '&['.
-parser.ope.3=El punto de c\u00F3digo de fin de rango es menor que el punto de c\u00F3digo de inicio.
-parser.descape.1=Notaci\u00F3n hexadecimal Unicode no v\u00E1lida.
-parser.descape.2=Desbordamiento en una notaci\u00F3n hexadecimal.
+parser.ope.3=El punto de código de fin de rango es menor que el punto de código de inicio.
+parser.descape.1=Notación hexadecimal Unicode no válida.
+parser.descape.2=Desbordamiento en una notación hexadecimal.
 parser.descape.3='\\x{' debe estar cerrado por '}'.
-parser.descape.4=Punto de c\u00F3digo Unicode no v\u00E1lido.
-parser.descape.5=No debe haber un anclaje aqu\u00ED.
-parser.process.1=Esta expresi\u00F3n no est\u00E1 soportada en la configuraci\u00F3n de la opci\u00F3n actual.
-parser.quantifier.1=Cuantificador no v\u00E1lido. Se esperaba un d\u00EDgito.
-parser.quantifier.2=Cuantificador no v\u00E1lido. La cantidad no es v\u00E1lida o falta '}'.
-parser.quantifier.3=Cuantificador no v\u00E1lido. Se esperaba un d\u00EDgito o '}'.
-parser.quantifier.4=Cuantificador no v\u00E1lido. Una cantidad m\u00EDnima debe ser <= una cantidad m\u00E1xima.
-parser.quantifier.5=Cuantificador no v\u00E1lido. Desbordamiento de un valor de cantidad.
+parser.descape.4=Punto de código Unicode no válido.
+parser.descape.5=No debe haber un anclaje aquí.
+parser.process.1=Esta expresión no está soportada en la configuración de la opción actual.
+parser.quantifier.1=Cuantificador no válido. Se esperaba un dígito.
+parser.quantifier.2=Cuantificador no válido. La cantidad no es válida o falta '}'.
+parser.quantifier.3=Cuantificador no válido. Se esperaba un dígito o '}'.
+parser.quantifier.4=Cuantificador no válido. Una cantidad mínima debe ser <= una cantidad máxima.
+parser.quantifier.5=Cuantificador no válido. Desbordamiento de un valor de cantidad.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties
index e7a86dfd747..878bb6bbca8 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties
@@ -23,42 +23,42 @@
 # questions.
 #
 
-parser.parse.1=Caract\u00E8re incorrect.
-parser.parse.2=Num\u00E9ro de r\u00E9f\u00E9rence non valide.
-parser.next.1=Un caract\u00E8re est obligatoire apr\u00E8s \\.
+parser.parse.1=Caractère incorrect.
+parser.parse.2=Numéro de référence non valide.
+parser.next.1=Un caractère est obligatoire après \\.
 parser.next.2='?' n'est pas attendu. '(?:' ou '(?=' ou '(?!' ou '(?<' ou '(?#' ou '(?>'?
 parser.next.3='(?<=' ou '(?<!' est attendu.
-parser.next.4=Un commentaire n'est pas termin\u00E9.
+parser.next.4=Un commentaire n'est pas terminé.
 parser.factor.1=')' est attendu.
-parser.factor.2=Fin de mod\u00E8le inattendue dans un groupe de modificateur.
+parser.factor.2=Fin de modèle inattendue dans un groupe de modificateur.
 parser.factor.3=':' est attendu.
-parser.factor.4=Fin de mod\u00E8le inattendue dans un groupe conditionnel
-parser.factor.5=Une r\u00E9f\u00E9rence auxiliaire (back reference), un ancrage, une recherche vers l'avant ou une recherche vers l'arri\u00E8re est attendu dans un mod\u00E8le conditionnel.
+parser.factor.4=Fin de modèle inattendue dans un groupe conditionnel
+parser.factor.5=Une référence auxiliaire (back reference), un ancrage, une recherche vers l'avant ou une recherche vers l'arrière est attendu dans un modèle conditionnel.
 parser.factor.6=Il existe plus de trois choix dans un groupe conditionnel.
-parser.atom.1=Un caract\u00E8re compris entre U+0040-U+005f doit suivre \\c.
-parser.atom.2=Une accolade ('{') est obligatoire avant une cat\u00E9gorie de caract\u00E8res.
-parser.atom.3=Un nom de propri\u00E9t\u00E9 n'est pas ferm\u00E9 par une accolade ('}').
-parser.atom.4=M\u00E9tacaract\u00E8re inattendu
-parser.atom.5=Propri\u00E9t\u00E9 inconnue.
-parser.cc.1=Une classe de caract\u00E8res POSIX doit \u00EAtre ferm\u00E9e par ':]'.
-parser.cc.2=Fin de mod\u00E8le inattendue dans une classe de caract\u00E8res.
-parser.cc.3=Nom inconnu pour une classe de caract\u00E8res POSIX.
+parser.atom.1=Un caractère compris entre U+0040-U+005f doit suivre \\c.
+parser.atom.2=Une accolade ('{') est obligatoire avant une catégorie de caractères.
+parser.atom.3=Un nom de propriété n'est pas fermé par une accolade ('}').
+parser.atom.4=Métacaractère inattendu
+parser.atom.5=Propriété inconnue.
+parser.cc.1=Une classe de caractères POSIX doit être fermée par ':]'.
+parser.cc.2=Fin de modèle inattendue dans une classe de caractères.
+parser.cc.3=Nom inconnu pour une classe de caractères POSIX.
 parser.cc.4='-' n'est pas valide ici.
 parser.cc.5=']' est attendu.
-parser.cc.6='[' n'est pas valide dans une classe de caract\u00E8res. Ecrivez '\\['.
-parser.cc.7=']' n'est pas valide dans une classe de caract\u00E8res. Ecrivez '\\]'.
-parser.cc.8='-' est une plage de caract\u00E8res non valide. Ecrivez '\\-'.
+parser.cc.6='[' n'est pas valide dans une classe de caractères. Ecrivez '\\['.
+parser.cc.7=']' n'est pas valide dans une classe de caractères. Ecrivez '\\]'.
+parser.cc.8='-' est une plage de caractères non valide. Ecrivez '\\-'.
 parser.ope.1='[' est attendu.
 parser.ope.2=')' ou '-[' ou '+[' ou '&[' est attendu.
-parser.ope.3=Le point code de fin de la plage est inf\u00E9rieur au point code de d\u00E9but.
-parser.descape.1=Notation hexad\u00E9cimale Unicode non valide.
-parser.descape.2=D\u00E9bordement de capacit\u00E9 d'une notation hexad\u00E9cimale.
-parser.descape.3='\\x{' doit \u00EAtre ferm\u00E9 par '}'.
+parser.ope.3=Le point code de fin de la plage est inférieur au point code de début.
+parser.descape.1=Notation hexadécimale Unicode non valide.
+parser.descape.2=Débordement de capacité d'une notation hexadécimale.
+parser.descape.3='\\x{' doit être fermé par '}'.
 parser.descape.4=Point code Unicode non valide.
 parser.descape.5=Aucun point d'ancrage ne doit se trouver ici.
-parser.process.1=Cette expression n'est pas prise en charge dans le param\u00E8tre d'option en cours.
+parser.process.1=Cette expression n'est pas prise en charge dans le paramètre d'option en cours.
 parser.quantifier.1=Quantificateur non valide. Un chiffre est attendu.
-parser.quantifier.2=Quantificateur non valide. Quantit\u00E9 non valide ou accolade ('}') manquante.
+parser.quantifier.2=Quantificateur non valide. Quantité non valide ou accolade ('}') manquante.
 parser.quantifier.3=Quantificateur non valide. Un chiffre ou une accolade ('}') est attendu.
-parser.quantifier.4=Quantificateur non valide. Une quantit\u00E9 minimale doit \u00EAtre <= une quantit\u00E9 maximale.
-parser.quantifier.5=Quantificateur non valide. D\u00E9bordement de la valeur de quantit\u00E9.
+parser.quantifier.4=Quantificateur non valide. Une quantité minimale doit être <= une quantité maximale.
+parser.quantifier.5=Quantificateur non valide. Débordement de la valeur de quantité.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties
index 9d2ad0bd183..9533e93231b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties
@@ -25,40 +25,40 @@
 
 parser.parse.1=Carattere errato.
 parser.parse.2=Numero di riferimento non valido.
-parser.next.1=\u00C8 necessario un carattere dopo \\.
+parser.next.1=È necessario un carattere dopo \\.
 parser.next.2='?' non previsto. '(?:' o '(?=' o '(?!' o '(?<' o '(?#' o '(?>'?
 parser.next.3='(?<=' o '(?<!' previsto.
-parser.next.4=Un commento non \u00E8 terminato.
-parser.factor.1=\u00E8 previsto ')'.
+parser.next.4=Un commento non è terminato.
+parser.factor.1=è previsto ')'.
 parser.factor.2=Fine del pattern imprevista in un gruppo modificatore.
-parser.factor.3=\u00E8 previsto ':'.
+parser.factor.3=è previsto ':'.
 parser.factor.4=Fine del pattern imprevista in un gruppo condizionale.
-parser.factor.5=In un pattern condizionale \u00E8 previsto un riferimento all'indietro, un ancoraggio, un lookahead o un lookbehind.
-parser.factor.6=In un gruppo condizionale sono disponibili pi\u00F9 di tre scelte.
+parser.factor.5=In un pattern condizionale è previsto un riferimento all'indietro, un ancoraggio, un lookahead o un lookbehind.
+parser.factor.6=In un gruppo condizionale sono disponibili più di tre scelte.
 parser.atom.1=Un carattere in U+0040-U+005f deve seguire \\c.
-parser.atom.2=Un '{' \u00E8 necessario prima di una categoria di carattere.
-parser.atom.3=Un nome di propriet\u00E0 non \u00E8 chiuso da '}'.
+parser.atom.2=Un '{' è necessario prima di una categoria di carattere.
+parser.atom.3=Un nome di proprietà non è chiuso da '}'.
 parser.atom.4=Metacarattere imprevisto.
-parser.atom.5=Propriet\u00E0 sconosciuta.
+parser.atom.5=Proprietà sconosciuta.
 parser.cc.1=Una classe caratteri POSIX deve essere chiusa da ':]'.
 parser.cc.2=Fine imprevista del pattern in una classe caratteri.
 parser.cc.3=Nome sconosciuto per una classe caratteri POSIX.
-parser.cc.4='-' non \u00E8 valido qui.
-parser.cc.5=\u00E8 previsto ']'.
-parser.cc.6='[' non \u00E8 valido in una classe caratteri. Scrivere '\\['.
-parser.cc.7=']' non \u00E8 valido in una classe caratteri. Scrivere '\\]'.
-parser.cc.8='-' \u00E8 un intervallo di caratteri non valido. Scrivere '\\-'.
-parser.ope.1=\u00E8 previsto '['.
-parser.ope.2=\u00E8 previsto ')' o '-[' o '+[' o '&['.
-parser.ope.3=Il punto di codice finale dell'intervallo \u00E8 minore del punto di codice iniziale.
+parser.cc.4='-' non è valido qui.
+parser.cc.5=è previsto ']'.
+parser.cc.6='[' non è valido in una classe caratteri. Scrivere '\\['.
+parser.cc.7=']' non è valido in una classe caratteri. Scrivere '\\]'.
+parser.cc.8='-' è un intervallo di caratteri non valido. Scrivere '\\-'.
+parser.ope.1=è previsto '['.
+parser.ope.2=è previsto ')' o '-[' o '+[' o '&['.
+parser.ope.3=Il punto di codice finale dell'intervallo è minore del punto di codice iniziale.
 parser.descape.1=Notazione esadecimale Unicode non valida.
 parser.descape.2=Overflow in una notazione esadecimale.
 parser.descape.3='\\x{' deve essere chiuso da '}'.
 parser.descape.4=Punto di codice Unicode non valido.
 parser.descape.5=Un ancoraggio non deve essere posizionato qui.
-parser.process.1=Questa espressione non \u00E8 supportata nell'impostazione dell'opzione corrente.
-parser.quantifier.1=Quantificatore non valido. \u00C8 prevista una cifra.
-parser.quantifier.2=Quantificatore non valido. Quantit\u00E0 non valida o '}' mancante.
-parser.quantifier.3=Quantificatore non valido. \u00C8 prevista una cifra o '}'.
-parser.quantifier.4=Quantificatore non valido.Una quantit\u00E0 minima deve essere <= di una quantit\u00E0 massima.
-parser.quantifier.5=Quantificatore non valido. Overflow del valore di quantit\u00E0.
+parser.process.1=Questa espressione non è supportata nell'impostazione dell'opzione corrente.
+parser.quantifier.1=Quantificatore non valido. È prevista una cifra.
+parser.quantifier.2=Quantificatore non valido. Quantità non valida o '}' mancante.
+parser.quantifier.3=Quantificatore non valido. È prevista una cifra o '}'.
+parser.quantifier.4=Quantificatore non valido.Una quantità minima deve essere <= di una quantità massima.
+parser.quantifier.5=Quantificatore non valido. Overflow del valore di quantità.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
index 09ffd559f50..626924c34ba 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
@@ -1,39 +1,39 @@
-parser.parse.1=\u6587\u5B57\u304C\u9055\u3063\u3066\u3044\u307E\u3059\u3002
-parser.parse.2=\u7121\u52B9\u306A\u53C2\u7167\u756A\u53F7\u3067\u3059\u3002
-parser.next.1=\\\u306E\u5F8C\u306B\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-parser.next.2='?'\u306F\u60F3\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002'(?:'\u3001'(?='\u3001'(?!'\u3001'(?<'\u3001'(?#'\u307E\u305F\u306F'(?>'\u3067\u3059\u304B\u3002
-parser.next.3='(?<='\u307E\u305F\u306F'(?<!'\u304C\u5FC5\u8981\u3067\u3059\u3002
-parser.next.4=\u30B3\u30E1\u30F3\u30C8\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093\u3002
-parser.factor.1=')'\u304C\u5FC5\u8981\u3067\u3059\u3002
-parser.factor.2=\u4FEE\u98FE\u5B50\u30B0\u30EB\u30FC\u30D7\u306E\u30D1\u30BF\u30FC\u30F3\u304C\u4E88\u671F\u305B\u305A\u7D42\u4E86\u3057\u307E\u3057\u305F\u3002
-parser.factor.3=':'\u304C\u5FC5\u8981\u3067\u3059\u3002
-parser.factor.4=\u6761\u4EF6\u30B0\u30EB\u30FC\u30D7\u306E\u30D1\u30BF\u30FC\u30F3\u304C\u4E88\u671F\u305B\u305A\u7D42\u4E86\u3057\u307E\u3057\u305F\u3002
-parser.factor.5=\u6761\u4EF6\u30D1\u30BF\u30FC\u30F3\u306B\u5F8C\u65B9\u53C2\u7167\u3001\u30A2\u30F3\u30AB\u30FC\u3001\u5148\u8AAD\u307F\u307E\u305F\u306F\u5F8C\u8AAD\u307F\u304C\u5FC5\u8981\u3067\u3059\u3002
-parser.factor.6=\u6761\u4EF6\u30B0\u30EB\u30FC\u30D7\u306B3\u500B\u8D85\u306E\u9078\u629E\u80A2\u304C\u3042\u308A\u307E\u3059\u3002
-parser.atom.1=\\c\u306E\u5F8C\u306BU+0040\u304B\u3089U+005f\u307E\u3067\u306E\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-parser.atom.2=\u6587\u5B57\u30AB\u30C6\u30B4\u30EA\u306E\u524D\u306B'{'\u304C\u5FC5\u8981\u3067\u3059\u3002
-parser.atom.3=\u30D7\u30ED\u30D1\u30C6\u30A3\u540D\u304C'}'\u3067\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-parser.atom.4=\u4E88\u671F\u3057\u306A\u3044\u30E1\u30BF\u6587\u5B57\u3067\u3059\u3002
-parser.atom.5=\u4E0D\u660E\u306A\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u3059\u3002
-parser.cc.1=POSIX\u6587\u5B57\u30AF\u30E9\u30B9\u306F':]'\u3067\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-parser.cc.2=\u6587\u5B57\u30AF\u30E9\u30B9\u306E\u30D1\u30BF\u30FC\u30F3\u304C\u4E88\u671F\u305B\u305A\u7D42\u4E86\u3057\u307E\u3057\u305F\u3002
-parser.cc.3=POSIX\u6587\u5B57\u30AF\u30E9\u30B9\u306B\u5BFE\u3059\u308B\u540D\u524D\u304C\u4E0D\u660E\u3067\u3059\u3002
-parser.cc.4='-'\u306F\u3053\u3053\u3067\u306F\u7121\u52B9\u3067\u3059\u3002
-parser.cc.5=']'\u304C\u5FC5\u8981\u3067\u3059\u3002
-parser.cc.6='['\u306F\u6587\u5B57\u30AF\u30E9\u30B9\u3067\u7121\u52B9\u3067\u3059\u3002'\\['\u3092\u8A18\u8FF0\u3057\u307E\u3059\u3002
-parser.cc.7=']'\u306F\u6587\u5B57\u30AF\u30E9\u30B9\u3067\u7121\u52B9\u3067\u3059\u3002'\\]'\u3092\u8A18\u8FF0\u3057\u307E\u3059\u3002
-parser.cc.8='-'\u306F\u7121\u52B9\u306A\u6587\u5B57\u7BC4\u56F2\u3067\u3059\u3002'\\-'\u3092\u8A18\u8FF0\u3057\u307E\u3059\u3002
-parser.ope.1='['\u304C\u5FC5\u8981\u3067\u3059\u3002
-parser.ope.2=')'\u3001'-['\u3001'+['\u307E\u305F\u306F'&['\u304C\u5FC5\u8981\u3067\u3059\u3002
-parser.ope.3=\u7BC4\u56F2\u306E\u7D42\u4E86\u30B3\u30FC\u30C9\u30FB\u30DD\u30A4\u30F3\u30C8\u304C\u958B\u59CB\u30B3\u30FC\u30C9\u30FB\u30DD\u30A4\u30F3\u30C8\u3088\u308A\u5C0F\u3055\u3044\u3067\u3059\u3002
-parser.descape.1=\u7121\u52B9\u306AUnicode16\u9032\u6CD5\u3067\u3059\u3002
-parser.descape.2=16\u9032\u6CD5\u3067\u30AA\u30FC\u30D0\u30FC\u30D5\u30ED\u30FC\u3057\u3066\u3044\u307E\u3059\u3002
-parser.descape.3='\\x{'\u306F'}'\u3067\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-parser.descape.4=\u7121\u52B9\u306AUnicode\u30B3\u30FC\u30C9\u30FB\u30DD\u30A4\u30F3\u30C8\u3067\u3059\u3002
-parser.descape.5=\u30A2\u30F3\u30AB\u30FC\u306F\u3053\u3053\u3067\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-parser.process.1=\u3053\u306E\u5F0F\u306F\u3001\u73FE\u5728\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u8A2D\u5B9A\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-parser.quantifier.1=\u7121\u52B9\u306A\u6570\u91CF\u8A5E\u3067\u3059\u3002\u6570\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-parser.quantifier.2=\u7121\u52B9\u306A\u6570\u91CF\u8A5E\u3067\u3059\u3002'}'\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-parser.quantifier.3=\u7121\u52B9\u306A\u6570\u91CF\u8A5E\u3067\u3059\u3002\u6570\u5B57\u307E\u305F\u306F'}'\u304C\u5FC5\u8981\u3067\u3059\u3002
-parser.quantifier.4=\u7121\u52B9\u306A\u6570\u91CF\u8A5E\u3067\u3059\u3002\u6700\u5C0F\u6570\u91CF\u306F\u6700\u5927\u6570\u91CF\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-parser.quantifier.5=\u7121\u52B9\u306A\u6570\u91CF\u8A5E\u3067\u3059\u3002\u6570\u91CF\u5024\u304C\u30AA\u30FC\u30D0\u30FC\u30D5\u30ED\u30FC\u3057\u3066\u3044\u307E\u3059\u3002
+parser.parse.1=文字が違っています。
+parser.parse.2=無効な参照番号です。
+parser.next.1=\\の後に文字が必要です。
+parser.next.2='?'は想定されていません。'(?:'、'(?='、'(?!'、'(?<'、'(?#'または'(?>'ですか。
+parser.next.3='(?<='または'(?<!'が必要です。
+parser.next.4=コメントが終了していません。
+parser.factor.1=')'が必要です。
+parser.factor.2=修飾子グループのパターンが予期せず終了しました。
+parser.factor.3=':'が必要です。
+parser.factor.4=条件グループのパターンが予期せず終了しました。
+parser.factor.5=条件パターンに後方参照、アンカー、先読みまたは後読みが必要です。
+parser.factor.6=条件グループに3個超の選択肢があります。
+parser.atom.1=\\cの後にU+0040からU+005fまでの文字が必要です。
+parser.atom.2=文字カテゴリの前に'{'が必要です。
+parser.atom.3=プロパティ名が'}'で閉じられていません。
+parser.atom.4=予期しないメタ文字です。
+parser.atom.5=不明なプロパティです。
+parser.cc.1=POSIX文字クラスは':]'で閉じる必要があります。
+parser.cc.2=文字クラスのパターンが予期せず終了しました。
+parser.cc.3=POSIX文字クラスに対する名前が不明です。
+parser.cc.4='-'はここでは無効です。
+parser.cc.5=']'が必要です。
+parser.cc.6='['は文字クラスで無効です。'\\['を記述します。
+parser.cc.7=']'は文字クラスで無効です。'\\]'を記述します。
+parser.cc.8='-'は無効な文字範囲です。'\\-'を記述します。
+parser.ope.1='['が必要です。
+parser.ope.2=')'、'-['、'+['または'&['が必要です。
+parser.ope.3=範囲の終了コード・ポイントが開始コード・ポイントより小さいです。
+parser.descape.1=無効なUnicode16進法です。
+parser.descape.2=16進法でオーバーフローしています。
+parser.descape.3='\\x{'は'}'で閉じる必要があります。
+parser.descape.4=無効なUnicodeコード・ポイントです。
+parser.descape.5=アンカーはここで使用できません。
+parser.process.1=この式は、現在のオプション設定でサポートされていません。
+parser.quantifier.1=無効な数量詞です。数字が必要です。
+parser.quantifier.2=無効な数量詞です。'}'がありません。
+parser.quantifier.3=無効な数量詞です。数字または'}'が必要です。
+parser.quantifier.4=無効な数量詞です。最小数量は最大数量以下である必要があります。
+parser.quantifier.5=無効な数量詞です。数量値がオーバーフローしています。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties
index 39a1a34db7a..399467b31a6 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties
@@ -23,42 +23,42 @@
 # questions.
 #
 
-parser.parse.1=\uC798\uBABB\uB41C \uBB38\uC790\uC785\uB2C8\uB2E4.
-parser.parse.2=\uBD80\uC801\uD569\uD55C \uCC38\uC870 \uBC88\uD638\uC785\uB2C8\uB2E4.
-parser.next.1=\\ \uB4A4\uC5D0 \uBB38\uC790\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-parser.next.2='?'\uB294 \uD544\uC694\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. '(?:' \uB610\uB294 '(?=' \uB610\uB294 '(?!' \uB610\uB294 '(?<' \uB610\uB294 '(?#' \uB610\uB294 '(?>'?
-parser.next.3='(?<=' \uB610\uB294 '(?<!'\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-parser.next.4=\uC124\uBA85\uC774 \uC885\uB8CC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-parser.factor.1=')'\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-parser.factor.2=\uC218\uC815\uC790 \uADF8\uB8F9\uC5D0 \uC608\uC0C1\uCE58 \uC54A\uC740 \uD328\uD134 \uB05D\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-parser.factor.3=':'\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-parser.factor.4=\uC870\uAC74 \uADF8\uB8F9\uC5D0 \uC608\uC0C1\uCE58 \uC54A\uC740 \uD328\uD134 \uB05D\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-parser.factor.5=\uC870\uAC74 \uD328\uD134\uC5D0 \uC5ED\uCC38\uC870 \uB610\uB294 \uC575\uCEE4 \uB610\uB294 lookahead \uB610\uB294 lookbehind\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-parser.factor.6=\uC870\uAC74 \uADF8\uB8F9\uC5D0 4\uAC1C \uC774\uC0C1\uC758 \uC120\uD0DD \uD56D\uBAA9\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-parser.atom.1=U+0040-U+005f\uC758 \uBB38\uC790\uAC00 \\c \uB4A4\uC5D0 \uC640\uC57C \uD569\uB2C8\uB2E4.
-parser.atom.2=\uBB38\uC790 \uBC94\uC8FC \uC55E\uC5D0 '{'\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-parser.atom.3=\uC18D\uC131 \uC774\uB984\uC774 '}'\uB85C \uB2EB\uD788\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-parser.atom.4=\uC608\uC0C1\uCE58 \uC54A\uC740 \uBA54\uD0C0 \uBB38\uC790\uC785\uB2C8\uB2E4.
-parser.atom.5=\uC54C \uC218 \uC5C6\uB294 \uC18D\uC131\uC785\uB2C8\uB2E4.
-parser.cc.1=POSIX \uBB38\uC790 \uD074\uB798\uC2A4\uB97C ':]'\uB85C \uB2EB\uC544\uC57C \uD569\uB2C8\uB2E4.
-parser.cc.2=\uBB38\uC790 \uD074\uB798\uC2A4\uC5D0 \uC608\uC0C1\uCE58 \uC54A\uC740 \uD328\uD134 \uB05D\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-parser.cc.3=POSIX \uBB38\uC790 \uD074\uB798\uC2A4\uC5D0 \uB300\uD574 \uC54C \uC218 \uC5C6\uB294 \uC774\uB984\uC785\uB2C8\uB2E4.
-parser.cc.4='-'\uB294 \uC5EC\uAE30\uC11C \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-parser.cc.5=']'\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-parser.cc.6=\uBB38\uC790 \uD074\uB798\uC2A4\uC5D0\uC11C '['\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. '\\['\uB97C \uC4F0\uC2ED\uC2DC\uC624.
-parser.cc.7=\uBB38\uC790 \uD074\uB798\uC2A4\uC5D0\uC11C ']'\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. '\\]'\uB97C \uC4F0\uC2ED\uC2DC\uC624.
-parser.cc.8='-'\uC740 \uBD80\uC801\uD569\uD55C \uBB38\uC790 \uBC94\uC704\uC785\uB2C8\uB2E4. '\\-'\uC744 \uC4F0\uC2ED\uC2DC\uC624.
-parser.ope.1='['\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-parser.ope.2=')' \uB610\uB294 '-[' \uB610\uB294 '+[' \uB610\uB294 '&['\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-parser.ope.3=\uBC94\uC704 \uB05D \uCF54\uB4DC \uD3EC\uC778\uD2B8\uAC00 \uC2DC\uC791 \uCF54\uB4DC \uD3EC\uC778\uD2B8\uBCF4\uB2E4 \uC791\uC2B5\uB2C8\uB2E4.
-parser.descape.1=\uBD80\uC801\uD569\uD55C \uC720\uB2C8\uCF54\uB4DC 16\uC9C4\uC218 \uD45C\uAE30\uBC95\uC785\uB2C8\uB2E4.
-parser.descape.2=16\uC9C4\uC218 \uD45C\uAE30\uBC95\uC758 \uC624\uBC84\uD50C\uB85C\uC6B0\uC785\uB2C8\uB2E4.
-parser.descape.3='\\x{'\uB294 '}'\uB85C \uB2EB\uC544\uC57C \uD569\uB2C8\uB2E4.
-parser.descape.4=\uBD80\uC801\uD569\uD55C \uC720\uB2C8\uCF54\uB4DC \uCF54\uB4DC \uD3EC\uC778\uD2B8\uC785\uB2C8\uB2E4.
-parser.descape.5=\uC575\uCEE4\uAC00 \uC5EC\uAE30\uC5D0 \uC788\uC73C\uBA74 \uC548\uB429\uB2C8\uB2E4.
-parser.process.1=\uC774 \uD45C\uD604\uC2DD\uC740 \uD604\uC7AC \uC635\uC158 \uC124\uC815\uC5D0\uC11C \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-parser.quantifier.1=\uC218\uB7C9\uC0AC\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC22B\uC790\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-parser.quantifier.2=\uC218\uB7C9\uC0AC\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC218\uB7C9\uC774 \uBD80\uC801\uD569\uD558\uAC70\uB098 '}'\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-parser.quantifier.3=\uC218\uB7C9\uC0AC\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC22B\uC790\uB098 '}'\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-parser.quantifier.4=\uC218\uB7C9\uC0AC\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uCD5C\uC18C \uC218\uB7C9\uC740 \uCD5C\uB300 \uC218\uB7C9 \uC774\uD558\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-parser.quantifier.5=\uC218\uB7C9\uC0AC\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC218\uB7C9 \uAC12 \uC624\uBC84\uD50C\uB85C\uC6B0\uC785\uB2C8\uB2E4.
+parser.parse.1=잘못된 문자입니다.
+parser.parse.2=부적합한 참조 번호입니다.
+parser.next.1=\\ 뒤에 문자가 필요합니다.
+parser.next.2='?'는 필요하지 않습니다. '(?:' 또는 '(?=' 또는 '(?!' 또는 '(?<' 또는 '(?#' 또는 '(?>'?
+parser.next.3='(?<=' 또는 '(?<!'가 필요합니다.
+parser.next.4=설명이 종료되지 않았습니다.
+parser.factor.1=')'가 필요합니다.
+parser.factor.2=수정자 그룹에 예상치 않은 패턴 끝이 있습니다.
+parser.factor.3=':'이 필요합니다.
+parser.factor.4=조건 그룹에 예상치 않은 패턴 끝이 있습니다.
+parser.factor.5=조건 패턴에 역참조 또는 앵커 또는 lookahead 또는 lookbehind가 필요합니다.
+parser.factor.6=조건 그룹에 4개 이상의 선택 항목이 있습니다.
+parser.atom.1=U+0040-U+005f의 문자가 \\c 뒤에 와야 합니다.
+parser.atom.2=문자 범주 앞에 '{'가 필요합니다.
+parser.atom.3=속성 이름이 '}'로 닫히지 않았습니다.
+parser.atom.4=예상치 않은 메타 문자입니다.
+parser.atom.5=알 수 없는 속성입니다.
+parser.cc.1=POSIX 문자 클래스를 ':]'로 닫아야 합니다.
+parser.cc.2=문자 클래스에 예상치 않은 패턴 끝이 있습니다.
+parser.cc.3=POSIX 문자 클래스에 대해 알 수 없는 이름입니다.
+parser.cc.4='-'는 여기서 부적합합니다.
+parser.cc.5=']'가 필요합니다.
+parser.cc.6=문자 클래스에서 '['가 부적합합니다. '\\['를 쓰십시오.
+parser.cc.7=문자 클래스에서 ']'가 부적합합니다. '\\]'를 쓰십시오.
+parser.cc.8='-'은 부적합한 문자 범위입니다. '\\-'을 쓰십시오.
+parser.ope.1='['가 필요합니다.
+parser.ope.2=')' 또는 '-[' 또는 '+[' 또는 '&['가 필요합니다.
+parser.ope.3=범위 끝 코드 포인트가 시작 코드 포인트보다 작습니다.
+parser.descape.1=부적합한 유니코드 16진수 표기법입니다.
+parser.descape.2=16진수 표기법의 오버플로우입니다.
+parser.descape.3='\\x{'는 '}'로 닫아야 합니다.
+parser.descape.4=부적합한 유니코드 코드 포인트입니다.
+parser.descape.5=앵커가 여기에 있으면 안됩니다.
+parser.process.1=이 표현식은 현재 옵션 설정에서 지원되지 않습니다.
+parser.quantifier.1=수량사가 부적합합니다. 숫자가 필요합니다.
+parser.quantifier.2=수량사가 부적합합니다. 수량이 부적합하거나 '}'가 누락되었습니다.
+parser.quantifier.3=수량사가 부적합합니다. 숫자나 '}'가 필요합니다.
+parser.quantifier.4=수량사가 부적합합니다. 최소 수량은 최대 수량 이하여야 합니다.
+parser.quantifier.5=수량사가 부적합합니다. 수량 값 오버플로우입니다.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties
index 21f6922ddfe..fa0f991e5df 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties
@@ -24,41 +24,41 @@
 #
 
 parser.parse.1=Caractere incorreto.
-parser.parse.2=N\u00FAmero de refer\u00EAncia inv\u00E1lido.
-parser.next.1=\u00C9 obrigat\u00F3rio um caractere ap\u00F3s \\.
-parser.next.2='?' n\u00E3o \u00E9 esperado.  '(?:' ou '(?=' ou '(?!' ou '(?<' ou '(?#' ou '(?>'?
-parser.next.3='(?<=' ou '(?<!' \u00E9 esperado.
-parser.next.4=Um coment\u00E1rio n\u00E3o foi finalizado.
-parser.factor.1=')' \u00E9 esperado.
-parser.factor.2=Fim inesperado do padr\u00E3o em um grupo de modificadores.
-parser.factor.3=':' \u00E9 esperado.
-parser.factor.4=Fim inesperado do padr\u00E3o em um grupo condicional.
-parser.factor.5=Em um padr\u00E3o condicional, esperava-se uma refer\u00EAncia retroativa, \u00E2ncora, lookahead ou lookbehind.
-parser.factor.6=H\u00E1 mais de tr\u00EAs op\u00E7\u00F5es em um grupo condicional.
-parser.atom.1=Um caractere em U+0040-U+005f vir ap\u00F3s \\c.
-parser.atom.2=Um '{' \u00E9 obrigat\u00F3rio antes de uma categoria de caractere.
-parser.atom.3=Um nome de propriedade n\u00E3o foi fechado por '}'.
+parser.parse.2=Número de referência inválido.
+parser.next.1=É obrigatório um caractere após \\.
+parser.next.2='?' não é esperado.  '(?:' ou '(?=' ou '(?!' ou '(?<' ou '(?#' ou '(?>'?
+parser.next.3='(?<=' ou '(?<!' é esperado.
+parser.next.4=Um comentário não foi finalizado.
+parser.factor.1=')' é esperado.
+parser.factor.2=Fim inesperado do padrão em um grupo de modificadores.
+parser.factor.3=':' é esperado.
+parser.factor.4=Fim inesperado do padrão em um grupo condicional.
+parser.factor.5=Em um padrão condicional, esperava-se uma referência retroativa, âncora, lookahead ou lookbehind.
+parser.factor.6=Há mais de três opções em um grupo condicional.
+parser.atom.1=Um caractere em U+0040-U+005f vir após \\c.
+parser.atom.2=Um '{' é obrigatório antes de uma categoria de caractere.
+parser.atom.3=Um nome de propriedade não foi fechado por '}'.
 parser.atom.4=Metacaractere inesperado.
 parser.atom.5=Propriedade desconhecida.
 parser.cc.1=Uma classe de caractere POSIX deve ser fechada por ':]'.
-parser.cc.2=Fim inesperado do padr\u00E3o em uma classe de caractere.
+parser.cc.2=Fim inesperado do padrão em uma classe de caractere.
 parser.cc.3=Nome desconhecido para uma classe de caractere POSIX.
-parser.cc.4='-' \u00E9 inv\u00E1lido aqui.
-parser.cc.5=']' \u00E9 esperado.
-parser.cc.6='[' \u00E9 inv\u00E1lido em uma classe de caractere. Use '\\['.
-parser.cc.7=']' \u00E9 inv\u00E1lido em uma classe de caractere. Use '\\]'.
-parser.cc.8='-' \u00E9 uma faixa de caracteres inv\u00E1lida. Use '\\-'.
-parser.ope.1='[' \u00E9 esperado.
-parser.ope.2=')' ou '-[' ou '+[' ou '&[' \u00E9 esperado.
-parser.ope.3=O c\u00F3digo de fim da faixa \u00E9 inferior ao de in\u00EDcio.
-parser.descape.1=Nota\u00E7\u00E3o hexadecimal Unicode inv\u00E1lida.
-parser.descape.2=Overflow em uma nota\u00E7\u00E3o hexadecimal.
+parser.cc.4='-' é inválido aqui.
+parser.cc.5=']' é esperado.
+parser.cc.6='[' é inválido em uma classe de caractere. Use '\\['.
+parser.cc.7=']' é inválido em uma classe de caractere. Use '\\]'.
+parser.cc.8='-' é uma faixa de caracteres inválida. Use '\\-'.
+parser.ope.1='[' é esperado.
+parser.ope.2=')' ou '-[' ou '+[' ou '&[' é esperado.
+parser.ope.3=O código de fim da faixa é inferior ao de início.
+parser.descape.1=Notação hexadecimal Unicode inválida.
+parser.descape.2=Overflow em uma notação hexadecimal.
 parser.descape.3='\\x{' deve ser fechado por '}'.
-parser.descape.4=C\u00F3digo Unicode inv\u00E1lido.
-parser.descape.5=Uma \u00E2ncora n\u00E3o deve estar aqui.
-parser.process.1=Esta express\u00E3o n\u00E3o \u00E9 suportada na defini\u00E7\u00E3o da op\u00E7\u00E3o atual.
-parser.quantifier.1=Quantificador inv\u00E1lido. \u00C9 esperado um d\u00EDgito.
-parser.quantifier.2=Quantificador inv\u00E1lido. A quantidade \u00E9 inv\u00E1lida ou est\u00E1 faltando um '}'.
-parser.quantifier.3=Quantificador inv\u00E1lido. \u00C9 esperado um d\u00EDgito ou '}'.
-parser.quantifier.4=Quantificador inv\u00E1lido. Uma quantidade m\u00EDnima deve ser <= uma quantidade m\u00E1xima.
-parser.quantifier.5=Quantificador inv\u00E1lido. Um overflow do valor de quantidade.
+parser.descape.4=Código Unicode inválido.
+parser.descape.5=Uma âncora não deve estar aqui.
+parser.process.1=Esta expressão não é suportada na definição da opção atual.
+parser.quantifier.1=Quantificador inválido. É esperado um dígito.
+parser.quantifier.2=Quantificador inválido. A quantidade é inválida ou está faltando um '}'.
+parser.quantifier.3=Quantificador inválido. É esperado um dígito ou '}'.
+parser.quantifier.4=Quantificador inválido. Uma quantidade mínima deve ser <= uma quantidade máxima.
+parser.quantifier.5=Quantificador inválido. Um overflow do valor de quantidade.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties
index 71deb9b6bc5..03e546ab851 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties
@@ -25,40 +25,40 @@
 
 parser.parse.1=Fel tecken.
 parser.parse.2=Ogiltigt referensnummer.
-parser.next.1=Ett tecken kr\u00E4vs efter \\.
-parser.next.2='?' f\u00F6rv\u00E4ntas inte.  '(?:' eller '(?=' eller '(?!' eller '(?<' eller '(?#' eller '(?>'?
-parser.next.3='(?<=' eller '(?<!' f\u00F6rv\u00E4ntas.
+parser.next.1=Ett tecken krävs efter \\.
+parser.next.2='?' förväntas inte.  '(?:' eller '(?=' eller '(?!' eller '(?<' eller '(?#' eller '(?>'?
+parser.next.3='(?<=' eller '(?<!' förväntas.
 parser.next.4=En kommentar har inte avslutats.
-parser.factor.1=')' f\u00F6rv\u00E4ntas.
-parser.factor.2=Ov\u00E4ntat avslut p\u00E5 m\u00F6nstret i en modifierargrupp.
-parser.factor.3=':' f\u00F6rv\u00E4ntas.
-parser.factor.4=Ov\u00E4ntat avslut p\u00E5 m\u00F6nstret i en villkorsgrupp.
-parser.factor.5=Bak\u00E5treferens eller ankare eller lookahead eller lookbehind f\u00F6rv\u00E4ntas i ett villkorsm\u00F6nster.
-parser.factor.6=Det finns mer \u00E4n tre val i en villkorsgrupp.
-parser.atom.1=Ett tecken i U+0040-U+005f m\u00E5ste komma efter \\c.
-parser.atom.2=Ett '{' kr\u00E4vs f\u00F6re en teckenkategori.
-parser.atom.3=Ett egenskapsnamn har inte st\u00E4ngts med '}'.
-parser.atom.4=Ov\u00E4ntat metatecken.
-parser.atom.5=Ok\u00E4nd egenskap.
-parser.cc.1=En POSIX-teckenklass m\u00E5ste st\u00E4ngas av ':]'.
-parser.cc.2=Ov\u00E4ntat avslut p\u00E5 m\u00F6nstret i en teckenklass.
-parser.cc.3=Ok\u00E4nt namn p\u00E5 en POSIX-teckenklass.
-parser.cc.4='-' \u00E4r ogiltigt h\u00E4r.
-parser.cc.5=']' f\u00F6rv\u00E4ntas.
-parser.cc.6='[' \u00E4r ogiltigt i en teckenklass. Skriv '\\['.
-parser.cc.7=']' \u00E4r ogiltigt i en teckenklass. Skriv '\\]'.
-parser.cc.8='-' \u00E4r ett ogiltigt teckenintervall. Skriv '\\-'.
-parser.ope.1='[' f\u00F6rv\u00E4ntas.
-parser.ope.2=')' eller '-[' eller '+[' eller '&[' f\u00F6rv\u00E4ntas.
-parser.ope.3=Slutkodspunkten f\u00F6r intervallet \u00E4r mindre \u00E4n startkodspunkten.
+parser.factor.1=')' förväntas.
+parser.factor.2=Oväntat avslut på mönstret i en modifierargrupp.
+parser.factor.3=':' förväntas.
+parser.factor.4=Oväntat avslut på mönstret i en villkorsgrupp.
+parser.factor.5=Bakåtreferens eller ankare eller lookahead eller lookbehind förväntas i ett villkorsmönster.
+parser.factor.6=Det finns mer än tre val i en villkorsgrupp.
+parser.atom.1=Ett tecken i U+0040-U+005f måste komma efter \\c.
+parser.atom.2=Ett '{' krävs före en teckenkategori.
+parser.atom.3=Ett egenskapsnamn har inte stängts med '}'.
+parser.atom.4=Oväntat metatecken.
+parser.atom.5=Okänd egenskap.
+parser.cc.1=En POSIX-teckenklass måste stängas av ':]'.
+parser.cc.2=Oväntat avslut på mönstret i en teckenklass.
+parser.cc.3=Okänt namn på en POSIX-teckenklass.
+parser.cc.4='-' är ogiltigt här.
+parser.cc.5=']' förväntas.
+parser.cc.6='[' är ogiltigt i en teckenklass. Skriv '\\['.
+parser.cc.7=']' är ogiltigt i en teckenklass. Skriv '\\]'.
+parser.cc.8='-' är ett ogiltigt teckenintervall. Skriv '\\-'.
+parser.ope.1='[' förväntas.
+parser.ope.2=')' eller '-[' eller '+[' eller '&[' förväntas.
+parser.ope.3=Slutkodspunkten för intervallet är mindre än startkodspunkten.
 parser.descape.1=Ogiltig Unicode hex-notation.
 parser.descape.2=Spill i en hex-notation.
-parser.descape.3='\\x{' m\u00E5ste st\u00E4ngas av '}'.
+parser.descape.3='\\x{' måste stängas av '}'.
 parser.descape.4=Ogiltig Unicode-kodpunkt.
-parser.descape.5=Ett ankare f\u00E5r inte vara h\u00E4r.
-parser.process.1=Det h\u00E4r uttrycket st\u00F6ds inte i aktuell alternativinst\u00E4llning.
-parser.quantifier.1=Ogiltig kvantifierare. En siffra f\u00F6rv\u00E4ntas.
+parser.descape.5=Ett ankare får inte vara här.
+parser.process.1=Det här uttrycket stöds inte i aktuell alternativinställning.
+parser.quantifier.1=Ogiltig kvantifierare. En siffra förväntas.
 parser.quantifier.2=Ogiltig kvantifierare. Ogiltig kvantitet eller '}' saknas.
-parser.quantifier.3=Ogiltig kvantifierare. En siffra eller '}' f\u00F6rv\u00E4ntas.
-parser.quantifier.4=Ogiltig kvantifierare. En minkvantitet m\u00E5ste vara <= en maxkvantitet.
-parser.quantifier.5=Ogiltig kvantifierare. Ett kvantitetsv\u00E4rdesspill.
+parser.quantifier.3=Ogiltig kvantifierare. En siffra eller '}' förväntas.
+parser.quantifier.4=Ogiltig kvantifierare. En minkvantitet måste vara <= en maxkvantitet.
+parser.quantifier.5=Ogiltig kvantifierare. Ett kvantitetsvärdesspill.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
index ab2e56846a9..b5c55c6939b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
@@ -1,39 +1,39 @@
-parser.parse.1=\u5B57\u7B26\u9519\u8BEF\u3002
-parser.parse.2=\u5F15\u7528\u53F7\u65E0\u6548\u3002
-parser.next.1=\\ \u540E\u9762\u5FC5\u987B\u6709\u5B57\u7B26\u3002
-parser.next.2=\u4E0D\u5E94\u51FA\u73B0 '?'\u3002'(?:' \u6216 '(?=' \u6216 '(?!' \u6216 '(?<' \u6216 '(?#' \u6216 '(?>'?
-parser.next.3=\u5E94\u4E3A '(?<=' \u6216 '(?<!'\u3002
-parser.next.4=\u6CE8\u91CA\u672A\u7EC8\u6B62\u3002
-parser.factor.1=\u5E94\u4E3A ')'\u3002
-parser.factor.2=\u4FEE\u9970\u7B26\u7EC4\u4E2D\u610F\u5916\u7684\u6A21\u5F0F\u7ED3\u5C3E\u3002
-parser.factor.3=\u5E94\u4E3A ':'\u3002
-parser.factor.4=\u6761\u4EF6\u7EC4\u4E2D\u610F\u5916\u7684\u6A21\u5F0F\u7ED3\u5C3E\u3002
-parser.factor.5=\u5728\u6761\u4EF6\u6A21\u5F0F\u4E2D\u5E94\u4E3A\u5411\u540E\u5F15\u7528\u6216\u951A\u5B9A\u70B9\u6216\u5411\u524D\u67E5\u627E\u6216\u5411\u540E\u67E5\u627E\u3002
-parser.factor.6=\u6761\u4EF6\u7EC4\u4E2D\u7684\u9009\u9879\u591A\u4E8E\u4E09\u4E2A\u3002
-parser.atom.1=\\c \u540E\u9762\u5FC5\u987B\u8DDF\u6709 U+0040-U+005f \u4E2D\u7684\u5B57\u7B26\u3002
-parser.atom.2=\u5B57\u7B26\u7C7B\u522B\u524D\u5FC5\u987B\u6709 '{'\u3002
-parser.atom.3=\u5C5E\u6027\u540D\u672A\u4EE5 '}' \u7ED3\u675F\u3002
-parser.atom.4=\u610F\u5916\u7684\u5143\u5B57\u7B26\u3002
-parser.atom.5=\u672A\u77E5\u5C5E\u6027\u3002
-parser.cc.1=POSIX \u5B57\u7B26\u7C7B\u5FC5\u987B\u4EE5 ':]' \u7ED3\u675F\u3002
-parser.cc.2=\u5B57\u7B26\u7C7B\u4E2D\u610F\u5916\u7684\u6A21\u5F0F\u7ED3\u5C3E\u3002
-parser.cc.3=POSIX \u5B57\u7B26\u7C7B\u7684\u540D\u79F0\u672A\u77E5\u3002
-parser.cc.4=\u6B64\u5904 '-' \u662F\u65E0\u6548\u7684\u3002
-parser.cc.5=\u5E94\u4E3A ']'\u3002
-parser.cc.6='[' \u5728\u5B57\u7B26\u7C7B\u4E2D\u662F\u65E0\u6548\u7684\u3002\u5199\u5165 '\\['\u3002
-parser.cc.7=']' \u5728\u5B57\u7B26\u7C7B\u4E2D\u662F\u65E0\u6548\u7684\u3002\u5199\u5165 '\\]'\u3002
-parser.cc.8='-' \u662F\u65E0\u6548\u7684\u5B57\u7B26\u8303\u56F4\u3002\u5199\u5165 '\\-'\u3002
-parser.ope.1=\u5E94\u4E3A '['\u3002
-parser.ope.2=\u5E94\u4E3A ')' \u6216 '-[' \u6216 '+[' \u6216 '&['\u3002
-parser.ope.3=\u8303\u56F4\u7ED3\u675F\u4EE3\u7801\u70B9\u5C0F\u4E8E\u5F00\u59CB\u4EE3\u7801\u70B9\u3002
-parser.descape.1=Unicode \u5341\u516D\u8FDB\u5236\u8BB0\u53F7\u65E0\u6548\u3002
-parser.descape.2=\u5341\u516D\u8FDB\u5236\u8BB0\u53F7\u6EA2\u51FA\u3002
-parser.descape.3='\\x{' \u5FC5\u987B\u4EE5 '}' \u7ED3\u675F\u3002
-parser.descape.4=Unicode \u4EE3\u7801\u70B9\u65E0\u6548\u3002
-parser.descape.5=\u6B64\u5904\u4E0D\u80FD\u6709\u951A\u5B9A\u70B9\u3002
-parser.process.1=\u5F53\u524D\u7684\u9009\u9879\u8BBE\u7F6E\u4E0D\u652F\u6301\u6B64\u8868\u8FBE\u5F0F\u3002
-parser.quantifier.1=\u9650\u5B9A\u7B26\u65E0\u6548\u3002\u5E94\u4E3A\u6570\u5B57\u3002
-parser.quantifier.2=\u9650\u5B9A\u7B26\u65E0\u6548\u3002\u7F3A\u5C11\u6709\u6548\u7684\u6570\u91CF\u6216 '}'\u3002
-parser.quantifier.3=\u9650\u5B9A\u7B26\u65E0\u6548\u3002\u5E94\u4E3A\u6570\u5B57\u6216 '}'\u3002
-parser.quantifier.4=\u9650\u5B9A\u7B26\u65E0\u6548\u3002\u6700\u5C0F\u6570\u91CF\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E\u6700\u5927\u6570\u91CF\u3002
-parser.quantifier.5=\u9650\u5B9A\u7B26\u65E0\u6548\u3002\u6570\u91CF\u503C\u6EA2\u51FA\u3002
+parser.parse.1=字符错误。
+parser.parse.2=引用号无效。
+parser.next.1=\\ 后面必须有字符。
+parser.next.2=不应出现 '?'。'(?:' 或 '(?=' 或 '(?!' 或 '(?<' 或 '(?#' 或 '(?>'?
+parser.next.3=应为 '(?<=' 或 '(?<!'。
+parser.next.4=注释未终止。
+parser.factor.1=应为 ')'。
+parser.factor.2=修饰符组中意外的模式结尾。
+parser.factor.3=应为 ':'。
+parser.factor.4=条件组中意外的模式结尾。
+parser.factor.5=在条件模式中应为向后引用或锚定点或向前查找或向后查找。
+parser.factor.6=条件组中的选项多于三个。
+parser.atom.1=\\c 后面必须跟有 U+0040-U+005f 中的字符。
+parser.atom.2=字符类别前必须有 '{'。
+parser.atom.3=属性名未以 '}' 结束。
+parser.atom.4=意外的元字符。
+parser.atom.5=未知属性。
+parser.cc.1=POSIX 字符类必须以 ':]' 结束。
+parser.cc.2=字符类中意外的模式结尾。
+parser.cc.3=POSIX 字符类的名称未知。
+parser.cc.4=此处 '-' 是无效的。
+parser.cc.5=应为 ']'。
+parser.cc.6='[' 在字符类中是无效的。写入 '\\['。
+parser.cc.7=']' 在字符类中是无效的。写入 '\\]'。
+parser.cc.8='-' 是无效的字符范围。写入 '\\-'。
+parser.ope.1=应为 '['。
+parser.ope.2=应为 ')' 或 '-[' 或 '+[' 或 '&['。
+parser.ope.3=范围结束代码点小于开始代码点。
+parser.descape.1=Unicode 十六进制记号无效。
+parser.descape.2=十六进制记号溢出。
+parser.descape.3='\\x{' 必须以 '}' 结束。
+parser.descape.4=Unicode 代码点无效。
+parser.descape.5=此处不能有锚定点。
+parser.process.1=当前的选项设置不支持此表达式。
+parser.quantifier.1=限定符无效。应为数字。
+parser.quantifier.2=限定符无效。缺少有效的数量或 '}'。
+parser.quantifier.3=限定符无效。应为数字或 '}'。
+parser.quantifier.4=限定符无效。最小数量必须小于等于最大数量。
+parser.quantifier.5=限定符无效。数量值溢出。
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties
index dff398b7502..d70511d1fbc 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties
@@ -23,42 +23,42 @@
 # questions.
 #
 
-parser.parse.1=\u4E0D\u6B63\u78BA\u7684\u5B57\u5143.
-parser.parse.2=\u7121\u6548\u7684\u53C3\u7167\u865F\u78BC.
-parser.next.1=\\ \u4E4B\u5F8C\u5FC5\u9808\u8981\u6709\u4E00\u500B\u5B57\u5143.
-parser.next.2=\u4E0D\u61C9\u70BA '?'.  '(?:' \u6216 '(?=' \u6216 '(?!' \u6216 '(?<' \u6216 '(?#' \u6216 '(?>'?
-parser.next.3=\u9810\u671F\u61C9\u70BA '(?<=' \u6216 '(?<!'.
-parser.next.4=\u8A3B\u89E3\u672A\u7D42\u6B62.
-parser.factor.1=\u9810\u671F\u61C9\u6709 ')'.
-parser.factor.2=\u4FEE\u98FE\u689D\u4EF6\u7FA4\u7D44\u4E2D\u6709\u672A\u9810\u671F\u7684\u6A23\u5F0F\u7D50\u5C3E.
-parser.factor.3=\u9810\u671F\u61C9\u6709 ':'.
-parser.factor.4=\u689D\u4EF6\u6027\u7FA4\u7D44\u4E2D\u6709\u672A\u9810\u671F\u7684\u6A23\u5F0F\u7D50\u5C3E.
-parser.factor.5=\u689D\u4EF6\u6027\u6A23\u5F0F\u4E2D\u61C9\u8A72\u6709\u5F80\u56DE\u53C3\u7167\u3001\u5B9A\u9328\u9EDE\u3001\u5411\u524D\u67E5\u627E\u6216\u5411\u5F8C\u67E5\u627E.
-parser.factor.6=\u689D\u4EF6\u6027\u7FA4\u7D44\u4E2D\u6709\u4E09\u500B\u4EE5\u4E0A\u7684\u9078\u9805.
-parser.atom.1=U+0040-U+005f \u5B57\u5143\u5FC5\u9808\u63A5\u8457 \\c.
-parser.atom.2=\u5B57\u5143\u985E\u5225\u524D\u9762\u5FC5\u9808\u8981\u6709\u4E00\u500B '{'.
-parser.atom.3=\u7279\u6027\u540D\u7A31\u672A\u4EE5 '}' \u7D50\u675F.
-parser.atom.4=\u672A\u9810\u671F\u7684\u63CF\u8FF0\u5B57\u5143.
-parser.atom.5=\u4E0D\u660E\u7684\u7279\u6027.
-parser.cc.1=POSIX \u5B57\u5143\u985E\u5225\u5FC5\u9808\u4EE5 ':]' \u4F5C\u70BA\u7D50\u675F.
-parser.cc.2=\u5B57\u5143\u985E\u5225\u4E2D\u6709\u672A\u9810\u671F\u7684\u6A23\u5F0F\u7D50\u5C3E.
-parser.cc.3=\u4E0D\u660E\u7684 POSIX \u5B57\u5143\u985E\u5225\u540D\u7A31.
-parser.cc.4='-' \u5728\u6B64\u8655\u7121\u6548.
-parser.cc.5=\u9810\u671F\u61C9\u6709 ']'.
-parser.cc.6='[' \u5728\u5B57\u5143\u985E\u5225\u4E2D\u7121\u6548.  \u5BEB\u5165 '\\['.
-parser.cc.7=']' \u5728\u5B57\u5143\u985E\u5225\u4E2D\u7121\u6548.  \u5BEB\u5165 '\\]'.
-parser.cc.8='-' \u70BA\u7121\u6548\u7684\u5B57\u5143\u7BC4\u570D. \u5BEB\u5165 '\\-'.
-parser.ope.1=\u9810\u671F\u61C9\u6709 '['.
-parser.ope.2=\u9810\u671F\u61C9\u6709 ')'\u3001'-['\u3001'+[' \u6216 '&['.
-parser.ope.3=\u7BC4\u570D\u7D50\u675F\u5B57\u78BC\u6307\u6A19\u5C0F\u65BC\u958B\u59CB\u5B57\u78BC\u6307\u6A19.
-parser.descape.1=\u7121\u6548\u7684 Unicode \u5341\u516D\u9032\u4F4D\u8868\u793A\u6CD5.
-parser.descape.2=\u5341\u516D\u9032\u4F4D\u8868\u793A\u6CD5\u6EA2\u4F4D.
-parser.descape.3='\\x{' \u5FC5\u9808\u4EE5 '}' \u4F5C\u70BA\u7D50\u675F.
-parser.descape.4=\u7121\u6548\u7684 Unicode \u5B57\u78BC\u6307\u6A19.
-parser.descape.5=\u6B64\u8655\u4E0D\u53EF\u6709\u5B9A\u9328\u9EDE.
-parser.process.1=\u76EE\u524D\u7684\u9078\u9805\u8A2D\u5B9A\u4E0D\u652F\u63F4\u6B64\u8868\u793A\u5F0F
-parser.quantifier.1=\u7121\u6548\u7684\u6578\u91CF\u8A5E. \u9810\u671F\u61C9\u70BA\u6578\u5B57.
-parser.quantifier.2=\u7121\u6548\u7684\u6578\u91CF\u8A5E. \u7121\u6548\u7684\u6578\u91CF\u6216\u907A\u6F0F '}'.
-parser.quantifier.3=\u7121\u6548\u7684\u6578\u91CF\u8A5E. \u9810\u671F\u61C9\u70BA\u6578\u5B57\u6216 '}'.
-parser.quantifier.4=\u7121\u6548\u7684\u6578\u91CF\u8A5E. \u6700\u5C0F\u6578\u91CF\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC\u6700\u5927\u6578\u91CF.
-parser.quantifier.5=\u7121\u6548\u7684\u6578\u91CF\u8A5E. \u6578\u91CF\u503C\u6EA2\u4F4D.
+parser.parse.1=不正確的字元.
+parser.parse.2=無效的參照號碼.
+parser.next.1=\\ 之後必須要有一個字元.
+parser.next.2=不應為 '?'.  '(?:' 或 '(?=' 或 '(?!' 或 '(?<' 或 '(?#' 或 '(?>'?
+parser.next.3=預期應為 '(?<=' 或 '(?<!'.
+parser.next.4=註解未終止.
+parser.factor.1=預期應有 ')'.
+parser.factor.2=修飾條件群組中有未預期的樣式結尾.
+parser.factor.3=預期應有 ':'.
+parser.factor.4=條件性群組中有未預期的樣式結尾.
+parser.factor.5=條件性樣式中應該有往回參照、定錨點、向前查找或向後查找.
+parser.factor.6=條件性群組中有三個以上的選項.
+parser.atom.1=U+0040-U+005f 字元必須接著 \\c.
+parser.atom.2=字元類別前面必須要有一個 '{'.
+parser.atom.3=特性名稱未以 '}' 結束.
+parser.atom.4=未預期的描述字元.
+parser.atom.5=不明的特性.
+parser.cc.1=POSIX 字元類別必須以 ':]' 作為結束.
+parser.cc.2=字元類別中有未預期的樣式結尾.
+parser.cc.3=不明的 POSIX 字元類別名稱.
+parser.cc.4='-' 在此處無效.
+parser.cc.5=預期應有 ']'.
+parser.cc.6='[' 在字元類別中無效.  寫入 '\\['.
+parser.cc.7=']' 在字元類別中無效.  寫入 '\\]'.
+parser.cc.8='-' 為無效的字元範圍. 寫入 '\\-'.
+parser.ope.1=預期應有 '['.
+parser.ope.2=預期應有 ')'、'-['、'+[' 或 '&['.
+parser.ope.3=範圍結束字碼指標小於開始字碼指標.
+parser.descape.1=無效的 Unicode 十六進位表示法.
+parser.descape.2=十六進位表示法溢位.
+parser.descape.3='\\x{' 必須以 '}' 作為結束.
+parser.descape.4=無效的 Unicode 字碼指標.
+parser.descape.5=此處不可有定錨點.
+parser.process.1=目前的選項設定不支援此表示式
+parser.quantifier.1=無效的數量詞. 預期應為數字.
+parser.quantifier.2=無效的數量詞. 無效的數量或遺漏 '}'.
+parser.quantifier.3=無效的數量詞. 預期應為數字或 '}'.
+parser.quantifier.4=無效的數量詞. 最小數量必須小於或等於最大數量.
+parser.quantifier.5=無效的數量詞. 數量值溢位.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties
index e380f7761e1..6fa0a78fd32 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties
@@ -19,11 +19,11 @@
 # <JAVA name encoding>, <PREFERRED name MIME>
 # Peter Smolik
 Cp1250 WINDOWS-1250 0x00FF
-# Patch attributed to havardw@underdusken.no (H�vard Wigtil)
+# Patch attributed to havardw@underdusken.no (H�vard Wigtil)
 Cp1251 WINDOWS-1251 0x00FF
 Cp1252 WINDOWS-1252 0x00FF
 ISO8859_1 ISO-8859-1 0x00FF
-# Patch attributed to havardw@underdusken.no (H�vard Wigtil)
+# Patch attributed to havardw@underdusken.no (H�vard Wigtil)
 ISO8859-1 ISO-8859-1 0x00FF
 ISO8859_2 ISO-8859-2 0x00FF
 # I'm going to apply "ISO8859-X" variant to all these, to be safe.
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_de.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_de.properties
index 92ca35d63b4..405ba93dabd 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_de.properties
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_de.properties
@@ -22,22 +22,22 @@
 # questions.
 
 # General errors
-BadMessageKey = JAXP09000001: Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
+BadMessageKey = JAXP09000001: Die zum Meldungsschlüssel gehörige Fehlermeldung kann nicht gefunden werden.
 FormatFailed = JAXP09000002: Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n
 OtherError = JAXP09000003: Unerwarteter Fehler.
 
 # Implementation restriction
-CircularReference = JAXP09010001: Zirkelbezug ist nicht zul\u00E4ssig: "{0}".
+CircularReference = JAXP09010001: Zirkelbezug ist nicht zulässig: "{0}".
 
 # Input or configuration errors
 # Technical term, do not translate: catalog
 InvalidCatalog = JAXP09020001: Das Dokumentelement eines Katalogs muss ein Katalog sein.
-InvalidEntryType = JAXP09020002: Der Eintragstyp "{0}" ist nicht g\u00FCltig.
+InvalidEntryType = JAXP09020002: Der Eintragstyp "{0}" ist nicht gültig.
 UriNotAbsolute = JAXP09020003: Die angegebene URI "{0}" ist nicht absolut.
-UriNotValidUrl = JAXP09020004: Die angegebene URI "{0}" ist keine g\u00FCltige URL.
-InvalidArgument = JAXP09020005: Das angegebene Argument "{0}" (unter Beachtung der Gro\u00DF-/Kleinschreibung) f\u00FCr "{1}" ist nicht g\u00FCltig.
+UriNotValidUrl = JAXP09020004: Die angegebene URI "{0}" ist keine gültige URL.
+InvalidArgument = JAXP09020005: Das angegebene Argument "{0}" (unter Beachtung der Groß-/Kleinschreibung) für "{1}" ist nicht gültig.
 NullArgument = JAXP09020006: Das Argument "{0}" darf nicht null sein.
-InvalidPath = JAXP09020007: Der Pfad "{0}" ist ung\u00FCltig.
+InvalidPath = JAXP09020007: Der Pfad "{0}" ist ungültig.
 
 
 # Parsing errors
@@ -49,9 +49,9 @@ NoCatalogFound = JAXP09030003: Kein Katalog angegeben.
 
 
 # Resolving errors
-NoMatchFound = JAXP09040001: Keine \u00DCbereinstimmung f\u00FCr publicId "{0}" und systemId "{1}" gefunden.
+NoMatchFound = JAXP09040001: Keine Übereinstimmung für publicId "{0}" und systemId "{1}" gefunden.
 # Technical term, do not translate: href, base
-NoMatchURIFound = JAXP09040002: Keine \u00DCbereinstimmung f\u00FCr href "{0}" und base "{1}" gefunden.
+NoMatchURIFound = JAXP09040002: Keine Übereinstimmung für href "{0}" und base "{1}" gefunden.
 # Technical term, do not translate: href, base
 FailedCreatingURI = JAXP09040003: URI kann nicht mit href "{0}" und base "{1}" erstellt werden.
 
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_es.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_es.properties
index a7410822e31..e7a1b256b79 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_es.properties
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_es.properties
@@ -27,25 +27,25 @@ FormatFailed = JAXP09000002: Se ha producido un error interno al formatear el si
 OtherError = JAXP09000003: Error inesperado.
 
 # Implementation restriction
-CircularReference = JAXP09010001: No est\u00E1 permitida la referencia circular: ''{0}''.
+CircularReference = JAXP09010001: No está permitida la referencia circular: ''{0}''.
 
 # Input or configuration errors
 # Technical term, do not translate: catalog
-InvalidCatalog = JAXP09020001: El elemento de documento de un cat\u00E1logo debe ser "catalog".
-InvalidEntryType = JAXP09020002: El tipo de entrada ''{0}'' no es v\u00E1lido.
+InvalidCatalog = JAXP09020001: El elemento de documento de un catálogo debe ser "catalog".
+InvalidEntryType = JAXP09020002: El tipo de entrada ''{0}'' no es válido.
 UriNotAbsolute = JAXP09020003: El URI especificado ''{0}'' no es absoluto.
-UriNotValidUrl = JAXP09020004: El URI especificado ''{0}'' no es una URL v\u00E1lida.
-InvalidArgument = JAXP09020005: El argumento especificado ''{0}'' (sensible a may\u00FAsculas y min\u00FAsculas) para ''{1}'' no es v\u00E1lido.
+UriNotValidUrl = JAXP09020004: El URI especificado ''{0}'' no es una URL válida.
+InvalidArgument = JAXP09020005: El argumento especificado ''{0}'' (sensible a mayúsculas y minúsculas) para ''{1}'' no es válido.
 NullArgument = JAXP09020006: El argumento ''{0}'' no puede ser nulo.
-InvalidPath = JAXP09020007: La ruta ''{0}'' no es v\u00E1lida.
+InvalidPath = JAXP09020007: La ruta ''{0}'' no es válida.
 
 
 # Parsing errors
 ParserConf = JAXP09030001: Error inesperado al configurar el analizador SAX.
 # Technical term, do not translate: catalog
-ParsingFailed = JAXP09030002: Fallo al analizar el archivo de cat\u00E1logo.
+ParsingFailed = JAXP09030002: Fallo al analizar el archivo de catálogo.
 # Technical term, do not translate: catalog
-NoCatalogFound = JAXP09030003: No se ha especificado ning\u00FAn cat\u00E1logo.
+NoCatalogFound = JAXP09030003: No se ha especificado ningún catálogo.
 
 
 # Resolving errors
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_fr.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_fr.properties
index c7c8c441ca7..41fd7bde97a 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_fr.properties
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_fr.properties
@@ -22,21 +22,21 @@
 # questions.
 
 # General errors
-BadMessageKey = JAXP09000001 : Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
+BadMessageKey = JAXP09000001 : Le message d'erreur correspondant à la clé de message est introuvable.
 FormatFailed = JAXP09000002 : Une erreur interne est survenue lors du formatage du message suivant :\n
 OtherError = JAXP09000003 : Erreur inattendue.
 
 # Implementation restriction
-CircularReference = JAXP09010001 : La r\u00E9f\u00E9rence circulaire n''est pas autoris\u00E9e : ''{0}''.
+CircularReference = JAXP09010001 : La référence circulaire n''est pas autorisée : ''{0}''.
 
 # Input or configuration errors
 # Technical term, do not translate: catalog
-InvalidCatalog = JAXP09020001 : L'\u00E9l\u00E9ment de document d'un catalogue doit \u00EAtre CATALOG.
-InvalidEntryType = JAXP09020002 : Le type d''entr\u00E9e ''{0}'' n''est pas valide.
-UriNotAbsolute = JAXP09020003 : L''URI indiqu\u00E9 ''{0}'' n''est pas absolu.
-UriNotValidUrl = JAXP09020004 : L''URI indiqu\u00E9 ''{0}'' n''est pas une URL valide.
-InvalidArgument = JAXP09020005 : L''argument indiqu\u00E9 ''{0}'' (respect maj./min.) pour ''{1}'' n''est pas valide.
-NullArgument = JAXP09020006 : L''argument ''{0}'' ne peut pas \u00EAtre NULL.
+InvalidCatalog = JAXP09020001 : L'élément de document d'un catalogue doit être CATALOG.
+InvalidEntryType = JAXP09020002 : Le type d''entrée ''{0}'' n''est pas valide.
+UriNotAbsolute = JAXP09020003 : L''URI indiqué ''{0}'' n''est pas absolu.
+UriNotValidUrl = JAXP09020004 : L''URI indiqué ''{0}'' n''est pas une URL valide.
+InvalidArgument = JAXP09020005 : L''argument indiqué ''{0}'' (respect maj./min.) pour ''{1}'' n''est pas valide.
+NullArgument = JAXP09020006 : L''argument ''{0}'' ne peut pas être NULL.
 InvalidPath = JAXP09020007 : Le chemin ''{0}'' n''est pas valide.
 
 
@@ -45,13 +45,13 @@ ParserConf = JAXP09030001 : Erreur inattendue lors de la configuration d'un anal
 # Technical term, do not translate: catalog
 ParsingFailed = JAXP09030002 : Echec de l'analyse du fichier CATALOG.
 # Technical term, do not translate: catalog
-NoCatalogFound = JAXP09030003 : Aucun CATALOG n'est indiqu\u00E9.
+NoCatalogFound = JAXP09030003 : Aucun CATALOG n'est indiqué.
 
 
 # Resolving errors
-NoMatchFound = JAXP09040001 : Aucune correspondance trouv\u00E9e pour publicId ''{0}'' et systemId ''{1}''.
+NoMatchFound = JAXP09040001 : Aucune correspondance trouvée pour publicId ''{0}'' et systemId ''{1}''.
 # Technical term, do not translate: href, base
-NoMatchURIFound = JAXP09040002 : Aucune correspondance trouv\u00E9e pour l''\u00E9l\u00E9ment href ''{0}'' et la base ''{1}''.
+NoMatchURIFound = JAXP09040002 : Aucune correspondance trouvée pour l''élément href ''{0}'' et la base ''{1}''.
 # Technical term, do not translate: href, base
-FailedCreatingURI = JAXP09040003 : Impossible de construire l''URI \u00E0 l''aide de l''\u00E9l\u00E9ment href ''{0}'' et de la base ''{1}''.
+FailedCreatingURI = JAXP09040003 : Impossible de construire l''URI à l''aide de l''élément href ''{0}'' et de la base ''{1}''.
 
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_it.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_it.properties
index 5e1622f2b89..73caa4e2fef 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_it.properties
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_it.properties
@@ -23,21 +23,21 @@
 
 # General errors
 BadMessageKey = JAXP09000001: impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
-FormatFailed = JAXP09000002: si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n
+FormatFailed = JAXP09000002: si è verificato un errore interno durante la formattazione del seguente messaggio:\n
 OtherError = JAXP09000003: errore imprevisto.
 
 # Implementation restriction
-CircularReference = JAXP09010001: il riferimento circolare non \u00E8 consentito: ''{0}''.
+CircularReference = JAXP09010001: il riferimento circolare non è consentito: ''{0}''.
 
 # Input or configuration errors
 # Technical term, do not translate: catalog
 InvalidCatalog = JAXP09020001: l'elemento documento di un catalogo deve essere "catalog".
-InvalidEntryType = JAXP09020002: il tipo di voce ''{0}'' non \u00E8 valido.
-UriNotAbsolute = JAXP09020003: l''URI specificato ''{0}'' non \u00E8 assoluto.
-UriNotValidUrl = JAXP09020004: l''URI specificato ''{0}'' non \u00E8 valido.
-InvalidArgument = JAXP09020005: l''argomento specificato ''{0}'' (con distinzione tra maiuscole e minuscole) per ''{1}'' non \u00E8 valido.
-NullArgument = JAXP09020006: l''argomento ''{0}'' non pu\u00F2 essere nullo.
-InvalidPath = JAXP09020007: il percorso ''{0}'' non \u00E8 valido.
+InvalidEntryType = JAXP09020002: il tipo di voce ''{0}'' non è valido.
+UriNotAbsolute = JAXP09020003: l''URI specificato ''{0}'' non è assoluto.
+UriNotValidUrl = JAXP09020004: l''URI specificato ''{0}'' non è valido.
+InvalidArgument = JAXP09020005: l''argomento specificato ''{0}'' (con distinzione tra maiuscole e minuscole) per ''{1}'' non è valido.
+NullArgument = JAXP09020006: l''argomento ''{0}'' non può essere nullo.
+InvalidPath = JAXP09020007: il percorso ''{0}'' non è valido.
 
 
 # Parsing errors
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ja.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ja.properties
index 83c65e4e4a4..b8c267f8223 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ja.properties
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ja.properties
@@ -22,36 +22,36 @@
 # questions.
 
 # General errors
-BadMessageKey = JAXP09000001: \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-FormatFailed = JAXP09000002: \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n
-OtherError = JAXP09000003: \u4E88\u671F\u3057\u306A\u3044\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+BadMessageKey = JAXP09000001: メッセージ・キーに対応するエラー・メッセージが見つかりません。
+FormatFailed = JAXP09000002: 次のメッセージのフォーマット中に内部エラーが発生しました:\n
+OtherError = JAXP09000003: 予期しないエラーが発生しました。
 
 # Implementation restriction
-CircularReference = JAXP09010001: \u5FAA\u74B0\u53C2\u7167\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093: ''{0}''\u3002
+CircularReference = JAXP09010001: 循環参照は許可されません: ''{0}''。
 
 # Input or configuration errors
 # Technical term, do not translate: catalog
-InvalidCatalog = JAXP09020001: \u30AB\u30BF\u30ED\u30B0\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u8981\u7D20\u306Fcatalog\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-InvalidEntryType = JAXP09020002: \u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7''{0}''\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-UriNotAbsolute = JAXP09020003: \u6307\u5B9A\u3055\u308C\u305FURI ''{0}''\u304C\u7D76\u5BFEURI\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-UriNotValidUrl = JAXP09020004: \u6307\u5B9A\u3057\u305FURI ''{0}''\u306F\u6709\u52B9\u306AURL\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-InvalidArgument = JAXP09020005: ''{1}''\u306B\u6307\u5B9A\u3055\u308C\u305F\u5F15\u6570''{0}'' (\u5927/\u5C0F\u6587\u5B57\u3092\u533A\u5225)\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-NullArgument = JAXP09020006: \u5F15\u6570''{0}''\u306Fnull\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-InvalidPath = JAXP09020007: \u30D1\u30B9''{0}''\u306F\u7121\u52B9\u3067\u3059\u3002
+InvalidCatalog = JAXP09020001: カタログのドキュメント要素はcatalogにする必要があります。
+InvalidEntryType = JAXP09020002: エントリ・タイプ''{0}''は有効ではありません。
+UriNotAbsolute = JAXP09020003: 指定されたURI ''{0}''が絶対URIではありません。
+UriNotValidUrl = JAXP09020004: 指定したURI ''{0}''は有効なURLではありません。
+InvalidArgument = JAXP09020005: ''{1}''に指定された引数''{0}'' (大/小文字を区別)は有効ではありません。
+NullArgument = JAXP09020006: 引数''{0}''はnullにできません。
+InvalidPath = JAXP09020007: パス''{0}''は無効です。
 
 
 # Parsing errors
-ParserConf = JAXP09030001: SAX\u30D1\u30FC\u30B5\u30FC\u306E\u69CB\u6210\u4E2D\u306B\u4E88\u671F\u3057\u306A\u3044\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+ParserConf = JAXP09030001: SAXパーサーの構成中に予期しないエラーが発生しました。
 # Technical term, do not translate: catalog
-ParsingFailed = JAXP09030002: \u30AB\u30BF\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB\u306E\u89E3\u6790\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
+ParsingFailed = JAXP09030002: カタログファイルの解析に失敗しました。
 # Technical term, do not translate: catalog
-NoCatalogFound = JAXP09030003: \u30AB\u30BF\u30ED\u30B0\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+NoCatalogFound = JAXP09030003: カタログが指定されていません。
 
 
 # Resolving errors
-NoMatchFound = JAXP09040001: publicId ''{0}''\u304A\u3088\u3073systemId ''{1}''\u306B\u4E00\u81F4\u3059\u308B\u3082\u306E\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
+NoMatchFound = JAXP09040001: publicId ''{0}''およびsystemId ''{1}''に一致するものが見つかりません。
 # Technical term, do not translate: href, base
-NoMatchURIFound = JAXP09040002: href ''{0}''\u304A\u3088\u3073base ''{1}''\u306B\u4E00\u81F4\u3059\u308B\u3082\u306E\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
+NoMatchURIFound = JAXP09040002: href ''{0}''およびbase ''{1}''に一致するものが見つかりません。
 # Technical term, do not translate: href, base
-FailedCreatingURI = JAXP09040003: href ''{0}''\u304A\u3088\u3073base ''{1}''\u3092\u4F7F\u7528\u3057\u3066URI\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093\u3002
+FailedCreatingURI = JAXP09040003: href ''{0}''およびbase ''{1}''を使用してURIを生成できません。
 
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ko.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ko.properties
index d8f6d8f0245..9b6c354f104 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ko.properties
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_ko.properties
@@ -22,36 +22,36 @@
 # questions.
 
 # General errors
-BadMessageKey = JAXP09000001: \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FormatFailed = JAXP09000002: \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n
-OtherError = JAXP09000003: \uC608\uC0C1\uCE58 \uC54A\uC740 \uC624\uB958\uC785\uB2C8\uB2E4.
+BadMessageKey = JAXP09000001: 메시지 키에 해당하는 오류 메시지를 찾을 수 없습니다.
+FormatFailed = JAXP09000002: 다음 메시지의 형식을 지정하는 중 내부 오류가 발생했습니다.\n
+OtherError = JAXP09000003: 예상치 않은 오류입니다.
 
 # Implementation restriction
-CircularReference = JAXP09010001: \uC21C\uD658 \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC74C: ''{0}''.
+CircularReference = JAXP09010001: 순환 참조가 허용되지 않음: ''{0}''.
 
 # Input or configuration errors
 # Technical term, do not translate: catalog
-InvalidCatalog = JAXP09020001: Catalog\uC758 \uBB38\uC11C \uC694\uC18C\uB294 catalog\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-InvalidEntryType = JAXP09020002: \uD56D\uBAA9 \uC720\uD615 ''{0}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-UriNotAbsolute = JAXP09020003: \uC9C0\uC815\uB41C URI ''{0}''\uC774(\uAC00) \uC808\uB300 \uACBD\uB85C\uAC00 \uC544\uB2D9\uB2C8\uB2E4.
-UriNotValidUrl = JAXP09020004: \uC9C0\uC815\uB41C URI ''{0}''\uC774(\uAC00) \uBD80\uC801\uD569\uD55C URL\uC785\uB2C8\uB2E4.
-InvalidArgument = JAXP09020005: ''{1}''\uC5D0 \uB300\uD574 \uC9C0\uC815\uB41C \uC778\uC218 ''{0}''(\uB300\uC18C\uBB38\uC790 \uAD6C\uBD84)\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-NullArgument = JAXP09020006: ''{0}'' \uC778\uC218\uB294 \uB110\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-InvalidPath = JAXP09020007: ''{0}'' \uACBD\uB85C\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+InvalidCatalog = JAXP09020001: Catalog의 문서 요소는 catalog여야 합니다.
+InvalidEntryType = JAXP09020002: 항목 유형 ''{0}''이(가) 부적합합니다.
+UriNotAbsolute = JAXP09020003: 지정된 URI ''{0}''이(가) 절대 경로가 아닙니다.
+UriNotValidUrl = JAXP09020004: 지정된 URI ''{0}''이(가) 부적합한 URL입니다.
+InvalidArgument = JAXP09020005: ''{1}''에 대해 지정된 인수 ''{0}''(대소문자 구분)이(가) 부적합합니다.
+NullArgument = JAXP09020006: ''{0}'' 인수는 널일 수 없습니다.
+InvalidPath = JAXP09020007: ''{0}'' 경로가 부적합합니다.
 
 
 # Parsing errors
-ParserConf = JAXP09030001: SAX \uAD6C\uBB38\uBD84\uC11D\uAE30\uB97C \uAD6C\uC131\uD558\uB294 \uC911 \uC608\uC0C1\uCE58 \uC54A\uC740 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+ParserConf = JAXP09030001: SAX 구문분석기를 구성하는 중 예상치 않은 오류가 발생했습니다.
 # Technical term, do not translate: catalog
-ParsingFailed = JAXP09030002: Catalog \uD30C\uC77C\uC758 \uAD6C\uBB38\uBD84\uC11D\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
+ParsingFailed = JAXP09030002: Catalog 파일의 구문분석을 실패했습니다.
 # Technical term, do not translate: catalog
-NoCatalogFound = JAXP09030003: \uC9C0\uC815\uB41C catalog\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
+NoCatalogFound = JAXP09030003: 지정된 catalog가 없습니다.
 
 
 # Resolving errors
-NoMatchFound = JAXP09040001: publicId ''{0}'', systemId ''{1}''\uC5D0 \uB300\uD55C \uC77C\uCE58 \uD56D\uBAA9\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+NoMatchFound = JAXP09040001: publicId ''{0}'', systemId ''{1}''에 대한 일치 항목을 찾을 수 없습니다.
 # Technical term, do not translate: href, base
-NoMatchURIFound = JAXP09040002: href ''{0}'', base ''{1}''\uC5D0 \uB300\uD55C \uC77C\uCE58 \uD56D\uBAA9\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+NoMatchURIFound = JAXP09040002: href ''{0}'', base ''{1}''에 대한 일치 항목을 찾을 수 없습니다.
 # Technical term, do not translate: href, base
-FailedCreatingURI = JAXP09040003: href ''{0}'', base ''{1}''\uC744(\uB97C) \uC0AC\uC6A9\uD558\uC5EC URI\uB97C \uAD6C\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+FailedCreatingURI = JAXP09040003: href ''{0}'', base ''{1}''을(를) 사용하여 URI를 구성할 수 없습니다.
 
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_pt_BR.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_pt_BR.properties
index c40290b8533..11d63f0b2c1 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_pt_BR.properties
@@ -22,36 +22,36 @@
 # questions.
 
 # General errors
-BadMessageKey = JAXP09000001: N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
+BadMessageKey = JAXP09000001: Não foi possível encontrar a mensagem de erro correspondente à chave da mensagem.
 FormatFailed = JAXP09000002: Ocorreu um erro interno ao formatar a mensagem a seguir:\n
 OtherError = JAXP09000003: Erro inesperado.
 
 # Implementation restriction
-CircularReference = JAXP09010001: A refer\u00EAncia circular n\u00E3o \u00E9 permitida: ''{0}''.
+CircularReference = JAXP09010001: A referência circular não é permitida: ''{0}''.
 
 # Input or configuration errors
 # Technical term, do not translate: catalog
-InvalidCatalog = JAXP09020001: O elemento de documento de um cat\u00E1logo deve ser "catalog".
-InvalidEntryType = JAXP09020002: O tipo de entrada "{0}" n\u00E3o \u00E9 v\u00E1lido.
-UriNotAbsolute = JAXP09020003: O URI especificado ''{0}'' n\u00E3o \u00E9 absoluto.
-UriNotValidUrl = JAXP09020004: O URI especificado ''{0}'' n\u00E3o \u00E9 um URL v\u00E1lido.
-InvalidArgument = JAXP09020005: O argumento especificado ''{0}'' (distingue mai\u00FAsculas de min\u00FAsculas) para ''{1}'' n\u00E3o \u00E9 v\u00E1lido.
-NullArgument = JAXP09020006: O argumento ''{0}'' n\u00E3o pode ser nulo.
-InvalidPath = JAXP09020007: O caminho ''{0}'' \u00E9 inv\u00E1lido.
+InvalidCatalog = JAXP09020001: O elemento de documento de um catálogo deve ser "catalog".
+InvalidEntryType = JAXP09020002: O tipo de entrada "{0}" não é válido.
+UriNotAbsolute = JAXP09020003: O URI especificado ''{0}'' não é absoluto.
+UriNotValidUrl = JAXP09020004: O URI especificado ''{0}'' não é um URL válido.
+InvalidArgument = JAXP09020005: O argumento especificado ''{0}'' (distingue maiúsculas de minúsculas) para ''{1}'' não é válido.
+NullArgument = JAXP09020006: O argumento ''{0}'' não pode ser nulo.
+InvalidPath = JAXP09020007: O caminho ''{0}'' é inválido.
 
 
 # Parsing errors
 ParserConf = JAXP09030001: Erro inesperado ao configurar um parser SAX.
 # Technical term, do not translate: catalog
-ParsingFailed = JAXP09030002: Falha ao fazer parsing do arquivo de cat\u00E1logo.
+ParsingFailed = JAXP09030002: Falha ao fazer parsing do arquivo de catálogo.
 # Technical term, do not translate: catalog
-NoCatalogFound = JAXP09030003: Nenhum cat\u00E1logo foi especificado.
+NoCatalogFound = JAXP09030003: Nenhum catálogo foi especificado.
 
 
 # Resolving errors
-NoMatchFound = JAXP09040001: Nenhuma correspond\u00EAncia foi encontrada para publicId ''{0}'' e systemId ''{1}''.
+NoMatchFound = JAXP09040001: Nenhuma correspondência foi encontrada para publicId ''{0}'' e systemId ''{1}''.
 # Technical term, do not translate: href, base
-NoMatchURIFound = JAXP09040002: Nenhuma correspond\u00EAncia foi encontrada para href ''{0}'' e base ''{1}''.
+NoMatchURIFound = JAXP09040002: Nenhuma correspondência foi encontrada para href ''{0}'' e base ''{1}''.
 # Technical term, do not translate: href, base
-FailedCreatingURI = JAXP09040003: N\u00E3o \u00E9 poss\u00EDvel construir o URI usando href ''{0}'' e base ''{1}''.
+FailedCreatingURI = JAXP09040003: Não é possível construir o URI usando href ''{0}'' e base ''{1}''.
 
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_sv.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_sv.properties
index 611aeeb9beb..37f04866994 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_sv.properties
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_sv.properties
@@ -23,25 +23,25 @@
 
 # General errors
 BadMessageKey = JAXP09000001: Det felmeddelande som motsvarar meddelandenyckeln kan inte hittas.
-FormatFailed = JAXP09000002: Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
-OtherError = JAXP09000003: Ov\u00E4ntat fel.
+FormatFailed = JAXP09000002: Ett internt fel inträffade vid formatering av följande meddelande:\n
+OtherError = JAXP09000003: Oväntat fel.
 
 # Implementation restriction
-CircularReference = JAXP09010001: Cirkelreferens \u00E4r inte till\u00E5ten: ''{0}''.
+CircularReference = JAXP09010001: Cirkelreferens är inte tillåten: ''{0}''.
 
 # Input or configuration errors
 # Technical term, do not translate: catalog
-InvalidCatalog = JAXP09020001: Dokumentelementet f\u00F6r en katalog m\u00E5ste vara "catalog".
-InvalidEntryType = JAXP09020002: Posttypen ''{0}'' \u00E4r inte giltig.
-UriNotAbsolute = JAXP09020003: Den angivna URI:n, ''{0}'', \u00E4r inte absolut.
-UriNotValidUrl = JAXP09020004: Den angivna URI:n, ''{0}'', \u00E4r inte en giltig URL.
-InvalidArgument = JAXP09020005: Det angivna argumentet, ''{0}'' (skiftl\u00E4gesk\u00E4nsligt), f\u00F6r ''{1}'' \u00E4r inte giltigt.
+InvalidCatalog = JAXP09020001: Dokumentelementet för en katalog måste vara "catalog".
+InvalidEntryType = JAXP09020002: Posttypen ''{0}'' är inte giltig.
+UriNotAbsolute = JAXP09020003: Den angivna URI:n, ''{0}'', är inte absolut.
+UriNotValidUrl = JAXP09020004: Den angivna URI:n, ''{0}'', är inte en giltig URL.
+InvalidArgument = JAXP09020005: Det angivna argumentet, ''{0}'' (skiftlägeskänsligt), för ''{1}'' är inte giltigt.
 NullArgument = JAXP09020006: Argumentet ''{0}'' kan inte vara null.
-InvalidPath = JAXP09020007: S\u00F6kv\u00E4gen ''{0}'' \u00E4r ogiltig.
+InvalidPath = JAXP09020007: Sökvägen ''{0}'' är ogiltig.
 
 
 # Parsing errors
-ParserConf = JAXP09030001: Ov\u00E4ntat fel vid konfiguration av en SAX-parser.
+ParserConf = JAXP09030001: Oväntat fel vid konfiguration av en SAX-parser.
 # Technical term, do not translate: catalog
 ParsingFailed = JAXP09030002: Kunde inte tolka filen katalog.
 # Technical term, do not translate: catalog
@@ -49,9 +49,9 @@ NoCatalogFound = JAXP09030003: Ingen katalog har angetts.
 
 
 # Resolving errors
-NoMatchFound = JAXP09040001: Ingen matchning hittades f\u00F6r publicId = ''{0}'' och systemId = ''{1}''.
+NoMatchFound = JAXP09040001: Ingen matchning hittades för publicId = ''{0}'' och systemId = ''{1}''.
 # Technical term, do not translate: href, base
-NoMatchURIFound = JAXP09040002: Ingen matchning hittades f\u00F6r href = ''{0}'' och bas = ''{1}''.
+NoMatchURIFound = JAXP09040002: Ingen matchning hittades för href = ''{0}'' och bas = ''{1}''.
 # Technical term, do not translate: href, base
 FailedCreatingURI = JAXP09040003: Kan inte skapa URI med href = ''{0}'' och bas = ''{1}''.
 
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_CN.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_CN.properties
index 9993ba0c150..6963764df83 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_CN.properties
@@ -22,36 +22,36 @@
 # questions.
 
 # General errors
-BadMessageKey = JAXP09000001: \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
-FormatFailed = JAXP09000002: \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n
-OtherError = JAXP09000003: \u610F\u5916\u9519\u8BEF\u3002
+BadMessageKey = JAXP09000001: 找不到与消息关键字对应的错误消息。
+FormatFailed = JAXP09000002: 设置以下消息的格式时出现内部错误:\n
+OtherError = JAXP09000003: 意外错误。
 
 # Implementation restriction
-CircularReference = JAXP09010001: \u4E0D\u5141\u8BB8\u5FAA\u73AF\u5F15\u7528: ''{0}''\u3002
+CircularReference = JAXP09010001: 不允许循环引用: ''{0}''。
 
 # Input or configuration errors
 # Technical term, do not translate: catalog
-InvalidCatalog = JAXP09020001: \u76EE\u5F55\u7684\u6587\u6863\u5143\u7D20\u5FC5\u987B\u662F "catalog"\u3002
-InvalidEntryType = JAXP09020002: \u6761\u76EE\u7C7B\u578B ''{0}'' \u65E0\u6548\u3002
-UriNotAbsolute = JAXP09020003: \u6307\u5B9A\u7684 URI ''{0}'' \u4E0D\u662F\u7EDD\u5BF9\u7684\u3002
-UriNotValidUrl = JAXP09020004: \u6307\u5B9A\u7684 URI ''{0}'' \u4E0D\u662F\u6709\u6548\u7684 URL\u3002
-InvalidArgument = JAXP09020005: \u4E3A ''{1}'' \u6307\u5B9A\u7684\u53C2\u6570 ''{0}'' (\u533A\u5206\u5927\u5C0F\u5199) \u65E0\u6548\u3002
-NullArgument = JAXP09020006: \u53C2\u6570 ''{0}'' \u4E0D\u80FD\u4E3A\u7A7A\u503C\u3002
-InvalidPath = JAXP09020007: \u8DEF\u5F84 ''{0}'' \u65E0\u6548\u3002
+InvalidCatalog = JAXP09020001: 目录的文档元素必须是 "catalog"。
+InvalidEntryType = JAXP09020002: 条目类型 ''{0}'' 无效。
+UriNotAbsolute = JAXP09020003: 指定的 URI ''{0}'' 不是绝对的。
+UriNotValidUrl = JAXP09020004: 指定的 URI ''{0}'' 不是有效的 URL。
+InvalidArgument = JAXP09020005: 为 ''{1}'' 指定的参数 ''{0}'' (区分大小写) 无效。
+NullArgument = JAXP09020006: 参数 ''{0}'' 不能为空值。
+InvalidPath = JAXP09020007: 路径 ''{0}'' 无效。
 
 
 # Parsing errors
-ParserConf = JAXP09030001: \u914D\u7F6E SAX \u89E3\u6790\u5668\u65F6\u51FA\u73B0\u610F\u5916\u9519\u8BEF\u3002
+ParserConf = JAXP09030001: 配置 SAX 解析器时出现意外错误。
 # Technical term, do not translate: catalog
-ParsingFailed = JAXP09030002: \u65E0\u6CD5\u5BF9\u76EE\u5F55\u6587\u4EF6\u8FDB\u884C\u89E3\u6790\u3002
+ParsingFailed = JAXP09030002: 无法对目录文件进行解析。
 # Technical term, do not translate: catalog
-NoCatalogFound = JAXP09030003: \u672A\u6307\u5B9A\u76EE\u5F55\u3002
+NoCatalogFound = JAXP09030003: 未指定目录。
 
 
 # Resolving errors
-NoMatchFound = JAXP09040001: \u5BF9\u4E8E publicId ''{0}'' \u548C systemId ''{1}'', \u672A\u627E\u5230\u5339\u914D\u9879\u3002
+NoMatchFound = JAXP09040001: 对于 publicId ''{0}'' 和 systemId ''{1}'', 未找到匹配项。
 # Technical term, do not translate: href, base
-NoMatchURIFound = JAXP09040002: \u5BF9\u4E8E href ''{0}'' \u548C base ''{1}'', \u672A\u627E\u5230\u5339\u914D\u9879\u3002
+NoMatchURIFound = JAXP09040002: 对于 href ''{0}'' 和 base ''{1}'', 未找到匹配项。
 # Technical term, do not translate: href, base
-FailedCreatingURI = JAXP09040003: \u65E0\u6CD5\u4F7F\u7528 href ''{0}'' \u548C base ''{1}'' \u6784\u9020 URI\u3002
+FailedCreatingURI = JAXP09040003: 无法使用 href ''{0}'' 和 base ''{1}'' 构造 URI。
 
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_TW.properties b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_TW.properties
index bc2bff09a73..5a0c399bac0 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_TW.properties
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogMessages_zh_TW.properties
@@ -22,36 +22,36 @@
 # questions.
 
 # General errors
-BadMessageKey = JAXP09000001: \u627E\u4E0D\u5230\u76F8\u5C0D\u61C9\u65BC\u6B64\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
-FormatFailed = JAXP09000002: \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
-OtherError = JAXP09000003: \u672A\u9810\u671F\u7684\u932F\u8AA4\u3002
+BadMessageKey = JAXP09000001: 找不到相對應於此訊息索引鍵的錯誤訊息。
+FormatFailed = JAXP09000002: 格式化下列訊息時發生內部錯誤:\n
+OtherError = JAXP09000003: 未預期的錯誤。
 
 # Implementation restriction
-CircularReference = JAXP09010001: \u4E0D\u5141\u8A31\u5FAA\u74B0\u53C3\u7167: ''{0}''\u3002
+CircularReference = JAXP09010001: 不允許循環參照: ''{0}''。
 
 # Input or configuration errors
 # Technical term, do not translate: catalog
-InvalidCatalog = JAXP09020001: catalog \u7684\u6587\u4EF6\u5143\u7D20\u5FC5\u9808\u662F catalog\u3002
-InvalidEntryType = JAXP09020002: \u9805\u76EE\u985E\u578B ''{0}'' \u7121\u6548\u3002
-UriNotAbsolute = JAXP09020003: \u6307\u5B9A\u7684 URI ''{0}'' \u4E0D\u662F\u7D55\u5C0D\u8DEF\u5F91\u3002
-UriNotValidUrl = JAXP09020004: \u6307\u5B9A\u7684 URI ''{0}'' \u4E0D\u662F\u6709\u6548\u7684 URL\u3002
-InvalidArgument = JAXP09020005: \u70BA ''{1}'' \u6307\u5B9A\u7684\u5F15\u6578 ''{0}'' (\u6709\u5927\u5C0F\u5BEB\u4E4B\u5206) \u7121\u6548\u3002
-NullArgument = JAXP09020006: \u5F15\u6578''{0}'' \u4E0D\u53EF\u70BA\u7A7A\u503C\u3002
-InvalidPath = JAXP09020007: \u8DEF\u5F91 ''{0}'' \u7121\u6548\u3002
+InvalidCatalog = JAXP09020001: catalog 的文件元素必須是 catalog。
+InvalidEntryType = JAXP09020002: 項目類型 ''{0}'' 無效。
+UriNotAbsolute = JAXP09020003: 指定的 URI ''{0}'' 不是絕對路徑。
+UriNotValidUrl = JAXP09020004: 指定的 URI ''{0}'' 不是有效的 URL。
+InvalidArgument = JAXP09020005: 為 ''{1}'' 指定的引數 ''{0}'' (有大小寫之分) 無效。
+NullArgument = JAXP09020006: 引數''{0}'' 不可為空值。
+InvalidPath = JAXP09020007: 路徑 ''{0}'' 無效。
 
 
 # Parsing errors
-ParserConf = JAXP09030001: \u8A2D\u5B9A SAX \u5256\u6790\u5668\u6642\u767C\u751F\u672A\u9810\u671F\u7684\u932F\u8AA4\u3002
+ParserConf = JAXP09030001: 設定 SAX 剖析器時發生未預期的錯誤。
 # Technical term, do not translate: catalog
-ParsingFailed = JAXP09030002: \u7121\u6CD5\u5256\u6790 catalog \u6A94\u6848\u3002
+ParsingFailed = JAXP09030002: 無法剖析 catalog 檔案。
 # Technical term, do not translate: catalog
-NoCatalogFound = JAXP09030003: \u672A\u6307\u5B9A Catalog\u3002
+NoCatalogFound = JAXP09030003: 未指定 Catalog。
 
 
 # Resolving errors
-NoMatchFound = JAXP09040001: \u627E\u4E0D\u5230\u7B26\u5408 publicId ''{0}'' \u548C systemId ''{1}'' \u7684\u9805\u76EE\u3002
+NoMatchFound = JAXP09040001: 找不到符合 publicId ''{0}'' 和 systemId ''{1}'' 的項目。
 # Technical term, do not translate: href, base
-NoMatchURIFound = JAXP09040002: \u627E\u4E0D\u5230\u7B26\u5408 href ''{0}'' \u548C\u57FA\u790E ''{1}'' \u7684\u9805\u76EE\u3002
+NoMatchURIFound = JAXP09040002: 找不到符合 href ''{0}'' 和基礎 ''{1}'' 的項目。
 # Technical term, do not translate: href, base
-FailedCreatingURI = JAXP09040003: \u7121\u6CD5\u4F7F\u7528 href ''{0}'' \u548C\u57FA\u790E ''{1}'' \u5EFA\u69CB URI\u3002
+FailedCreatingURI = JAXP09040003: 無法使用 href ''{0}'' 和基礎 ''{1}'' 建構 URI。
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
index ada178e669a..e0e14c6caf7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
@@ -90,7 +90,7 @@
 # 0: symbol
 compiler.err.abstract.cant.be.instantiated={0} ist abstrakt, kann nicht instanziiert werden
 
-compiler.err.abstract.meth.cant.have.body=Abstrakte Methoden k\u00F6nnen keinen Body enthalten
+compiler.err.abstract.meth.cant.have.body=Abstrakte Methoden können keinen Body enthalten
 
 # 0: kind name, 1: symbol
 compiler.err.already.annotated={0} {1} wurde bereits mit Annotation versehen
@@ -113,15 +113,15 @@ compiler.err.already.defined.this.unit={0} ist in dieser Kompilierungseinheit be
 compiler.err.annotation.missing.element.value=In Annotation fehlt ein Elementwert
 
 # 0: type, 1: list of name
-compiler.err.annotation.missing.default.value=In Annotation @{0} fehlt ein Standardwert f\u00FCr das Element "{1}"
+compiler.err.annotation.missing.default.value=In Annotation @{0} fehlt ein Standardwert für das Element "{1}"
 
 # 0: type, 1: list of name
-compiler.err.annotation.missing.default.value.1=In Annotation @{0} fehlen Standardwerte f\u00FCr Elemente {1}
+compiler.err.annotation.missing.default.value.1=In Annotation @{0} fehlen Standardwerte für Elemente {1}
 
 # 0: type
-compiler.err.annotation.not.valid.for.type=Annotation ist f\u00FCr Element des Typs {0} nicht g\u00FCltig
+compiler.err.annotation.not.valid.for.type=Annotation ist für Element des Typs {0} nicht gültig
 
-compiler.err.annotation.type.not.applicable=Annotationsschnittstelle ist f\u00FCr diese Art Deklaration nicht anwendbar
+compiler.err.annotation.type.not.applicable=Annotationsschnittstelle ist für diese Art Deklaration nicht anwendbar
 
 # 0: type
 compiler.err.annotation.type.not.applicable.to.type=Annotation @{0} ist in diesem Typkontext nicht anwendbar
@@ -130,29 +130,29 @@ compiler.err.annotation.value.must.be.annotation=Annotationswert muss eine Annot
 
 compiler.err.annotation.value.must.be.class.literal=Annotationswert muss ein Klassenliteral sein
 
-compiler.err.annotation.value.must.be.name.value=Annotationswerte m\u00FCssen das Format "Name=Wert" aufweisen
+compiler.err.annotation.value.must.be.name.value=Annotationswerte müssen das Format "Name=Wert" aufweisen
 
-compiler.err.annotation.value.not.allowable.type=Annotationswert hat keinen zul\u00E4ssigen Typ
+compiler.err.annotation.value.not.allowable.type=Annotationswert hat keinen zulässigen Typ
 
-compiler.err.expression.not.allowable.as.annotation.value=Ausdruck ist als Annotationswert nicht zul\u00E4ssig
+compiler.err.expression.not.allowable.as.annotation.value=Ausdruck ist als Annotationswert nicht zulässig
 
 # 0: type, 1: name
 compiler.err.annotation.unrecognized.attribute.name=Annotation @{0} weist das unbekannte Attribut "{1}" auf
 
-compiler.err.anon.class.impl.intf.no.args=Anonyme Klasse implementiert Schnittstelle. Argumente sind nicht m\u00F6glich
+compiler.err.anon.class.impl.intf.no.args=Anonyme Klasse implementiert Schnittstelle. Argumente sind nicht möglich
 
-compiler.err.anon.class.impl.intf.no.typeargs=Anonyme Klasse implementiert Schnittstelle. Typargumente sind nicht m\u00F6glich
+compiler.err.anon.class.impl.intf.no.typeargs=Anonyme Klasse implementiert Schnittstelle. Typargumente sind nicht möglich
 
-compiler.err.anon.class.impl.intf.no.qual.for.new=Anonyme Klasse implementiert Schnittstelle. Qualifier f\u00FCr "Neu" ist nicht m\u00F6glich
+compiler.err.anon.class.impl.intf.no.qual.for.new=Anonyme Klasse implementiert Schnittstelle. Qualifier für "Neu" ist nicht möglich
 
-compiler.err.cant.inherit.from.anon=Erben aus anonymer Klasse nicht m\u00F6glich
+compiler.err.cant.inherit.from.anon=Erben aus anonymer Klasse nicht möglich
 
 # 0: symbol, 1: symbol, 2: symbol
-compiler.err.array.and.varargs={0} und {1} k\u00F6nnen nicht beide in {2} deklariert werden
+compiler.err.array.and.varargs={0} und {1} können nicht beide in {2} deklariert werden
 
 compiler.err.array.dimension.missing=Arraydimension fehlt
 
-compiler.err.illegal.array.creation.both.dimension.and.initialization=Arrayerstellung mit Dimensionsausdruck und Initialisierung ist unzul\u00E4ssig
+compiler.err.illegal.array.creation.both.dimension.and.initialization=Arrayerstellung mit Dimensionsausdruck und Initialisierung ist unzulässig
 
 # 0: type
 compiler.err.array.req.but.found=Array erforderlich, aber {0} gefunden
@@ -160,31 +160,31 @@ compiler.err.array.req.but.found=Array erforderlich, aber {0} gefunden
 compiler.err.attribute.value.must.be.constant=Elementwert muss ein Konstantenausdruck sein
 
 # 0: string (statement type)
-compiler.err.bad.initializer=Ung\u00FCltiger Initializer f\u00FCr {0}
+compiler.err.bad.initializer=Ungültiger Initializer für {0}
 
-compiler.err.break.outside.switch.loop=Unterbrechung au\u00DFerhalb Switch oder Schleife
+compiler.err.break.outside.switch.loop=Unterbrechung außerhalb Switch oder Schleife
 
 compiler.err.break.outside.switch.expression=Versuch, Vorgang aus einem Switch-Ausdruck zu unterbrechen
 
 compiler.err.continue.outside.switch.expression=Versuch, Vorgang aus einem Switch-Ausdruck fortzusetzen
 
-compiler.err.return.outside.switch.expression=Versuch, aus einem Switch-Ausdruck zur\u00FCckzukehren
+compiler.err.return.outside.switch.expression=Versuch, aus einem Switch-Ausdruck zurückzukehren
 
-compiler.err.rule.completes.normally=Switch-Regel wird ohne Angabe eines Wertes abgeschlossen\n(Switch-Regeln in Switch-Ausdr\u00FCcken m\u00FCssen einen Wert oder Throw angeben)
+compiler.err.rule.completes.normally=Switch-Regel wird ohne Angabe eines Wertes abgeschlossen\n(Switch-Regeln in Switch-Ausdrücken müssen einen Wert oder Throw angeben)
 
-compiler.err.switch.expression.completes.normally=Switch-Ausdruck wird ohne Angabe eines Wertes abgeschlossen\n(Switch-Ausdr\u00FCcke m\u00FCssen einen Wert angeben oder einen Throw f\u00FCr alle m\u00F6glichen Eingabewerte ausgeben)
+compiler.err.switch.expression.completes.normally=Switch-Ausdruck wird ohne Angabe eines Wertes abgeschlossen\n(Switch-Ausdrücke müssen einen Wert angeben oder einen Throw für alle möglichen Eingabewerte ausgeben)
 
-compiler.err.no.switch.expression ="yield" au\u00DFerhalb von Switch-Ausdruck
+compiler.err.no.switch.expression ="yield" außerhalb von Switch-Ausdruck
 
-compiler.err.no.switch.expression.qualify="yield" au\u00DFerhalb von Switch-Ausdruck\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empf\u00E4nger oder Typnamen)
+compiler.err.no.switch.expression.qualify="yield" außerhalb von Switch-Ausdruck\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empfänger oder Typnamen)
 
-compiler.err.invalid.yield=Ung\u00FCltige Verwendung der eingeschr\u00E4nkten ID "yield"\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empf\u00E4nger oder Typnamen)
+compiler.err.invalid.yield=Ungültige Verwendung der eingeschränkten ID "yield"\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empfänger oder Typnamen)
 
-compiler.warn.invalid.yield="yield" kann in einem zuk\u00FCnftigen Release zu einer eingeschr\u00E4nkten ID werden\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empf\u00E4nger oder Typnamen)
+compiler.warn.invalid.yield="yield" kann in einem zukünftigen Release zu einer eingeschränkten ID werden\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empfänger oder Typnamen)
 
-compiler.err.switch.expression.empty=Switch-Ausdruck enth\u00E4lt keine CASE-Klauseln
+compiler.err.switch.expression.empty=Switch-Ausdruck enthält keine CASE-Klauseln
 
-compiler.err.switch.expression.no.result.expressions=Switch-Ausdruck enth\u00E4lt keine Ergebnisausdr\u00FCcke
+compiler.err.switch.expression.no.result.expressions=Switch-Ausdruck enthält keine Ergebnisausdrücke
 
 # 0: name
 compiler.err.call.must.be.first.stmt.in.ctor=Aufruf von {0} muss die erste Anweisung im Konstruktor sein
@@ -196,7 +196,7 @@ compiler.err.cant.apply.symbol.noargs={0} {1} in {2} {3} kann nicht auf die ange
 compiler.err.cant.apply.symbol={0} {1} in {4} {5} kann nicht auf die angegebenen Typen angewendet werden.\nErforderlich: {2}\nErmittelt:    {3}\nGrund: {6}
 
 # 0: symbol kind, 1: name, 2: list of type
-compiler.err.cant.apply.symbols={0} f\u00FCr {1}({2}) nicht geeignet
+compiler.err.cant.apply.symbols={0} für {1}({2}) nicht geeignet
 
 # 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
 compiler.misc.cant.apply.symbol={0} {1} in {4} {5} kann nicht auf die angegebenen Typen angewendet werden\nErforderlich: {2}\nErmittelt:    {3}\nGrund: {6}
@@ -205,13 +205,13 @@ compiler.misc.cant.apply.symbol={0} {1} in {4} {5} kann nicht auf die angegebene
 compiler.misc.cant.apply.array.ctor=Array kann nicht aus angegebenen Typen erstellt werden\nErforderlich: {0}\nErmittelt: {1}\nGrund: {2}
 
 # 0: symbol kind, 1: name, 2: list of type
-compiler.misc.cant.apply.symbols={0} f\u00FCr {1}({2}) nicht geeignet
+compiler.misc.cant.apply.symbols={0} für {1}({2}) nicht geeignet
 
 # 0: kind name, 1: symbol
 compiler.misc.no.abstracts=Keine abstrakte Methode in {0} {1} gefunden
 
 # 0: kind name, 1: symbol
-compiler.misc.incompatible.abstracts=Mehrere nicht \u00FCberschreibende abstrakte Methoden in {0} {1} gefunden
+compiler.misc.incompatible.abstracts=Mehrere nicht überschreibende abstrakte Methoden in {0} {1} gefunden
 
 compiler.err.bad.functional.intf.anno=Unerwartete @FunctionalInterface-Annotation
 
@@ -219,7 +219,7 @@ compiler.err.bad.functional.intf.anno=Unerwartete @FunctionalInterface-Annotatio
 compiler.err.bad.functional.intf.anno.1=Unerwartete @FunctionalInterface-Annotation\n{0}
 
 # 0: message segment
-compiler.err.anonymous.diamond.method.does.not.override.superclass=Methode \u00FCberschreibt oder implementiert keine Methode aus einem Supertyp\n{0}
+compiler.err.anonymous.diamond.method.does.not.override.superclass=Methode überschreibt oder implementiert keine Methode aus einem Supertyp\n{0}
 
 # 0: symbol
 compiler.misc.not.a.functional.intf={0} ist keine Funktionsschnittstelle
@@ -228,7 +228,7 @@ compiler.misc.not.a.functional.intf={0} ist keine Funktionsschnittstelle
 compiler.misc.not.a.functional.intf.1={0} ist keine Funktionsschnittstelle\n{1}
 
 # 0: type, 1: kind name, 2: symbol
-compiler.misc.invalid.generic.lambda.target=Ung\u00FCltiger Funktionsdeskriptor f\u00FCr Lambda-Ausdruck\nMethode {0} in {1} {2} ist generisch
+compiler.misc.invalid.generic.lambda.target=Ungültiger Funktionsdeskriptor für Lambda-Ausdruck\nMethode {0} in {1} {2} ist generisch
 
 # 0: kind name, 1: symbol
 compiler.misc.incompatible.descs.in.functional.intf=Inkompatible Funktionsdeskriptoren in {0} {1} gefunden
@@ -237,32 +237,32 @@ compiler.misc.incompatible.descs.in.functional.intf=Inkompatible Funktionsdeskri
 compiler.misc.descriptor=Deskriptor: {2} {0}({1})
 
 # 0: name, 1: list of type, 2: type, 3: list of type
-compiler.misc.descriptor.throws=Deskriptor: {2} {0}({1}) l\u00F6st {3} aus
+compiler.misc.descriptor.throws=Deskriptor: {2} {0}({1}) löst {3} aus
 
 # 0: type
-compiler.misc.no.suitable.functional.intf.inst=Funktionsschnittstellendeskriptor f\u00FCr {0} kann nicht abgeleitet werden
+compiler.misc.no.suitable.functional.intf.inst=Funktionsschnittstellendeskriptor für {0} kann nicht abgeleitet werden
 
 # 0: message segment
-compiler.misc.bad.intersection.target.for.functional.expr=Ung\u00FCltiges Schnittmengentypziel f\u00FCr Lambda oder Methodenreferenz\n{0}
+compiler.misc.bad.intersection.target.for.functional.expr=Ungültiges Schnittmengentypziel für Lambda oder Methodenreferenz\n{0}
 
 # 0: symbol or type
 compiler.misc.not.an.intf.component=Komponententyp {0} ist keine Schnittstelle
 
 # 0: kind name, 1: message segment
-compiler.err.invalid.mref=Ung\u00FCltige {0}-Referenz\n{1}
+compiler.err.invalid.mref=Ungültige {0}-Referenz\n{1}
 
 # 0: kind name, 1: message segment
-compiler.misc.invalid.mref=Ung\u00FCltige {0}-Referenz\n{1}
+compiler.misc.invalid.mref=Ungültige {0}-Referenz\n{1}
 
-compiler.misc.static.mref.with.targs=Parametrisierter Qualifier f\u00FCr statische Methodenreferenz
+compiler.misc.static.mref.with.targs=Parametrisierter Qualifier für statische Methodenreferenz
 
 # 0: set of flag or string, 1: symbol
 compiler.err.cant.assign.val.to.var=Der {0}-Variablen {1} kann kein Wert zugewiesen werden
 
-compiler.err.cant.assign.val.to.this=Zuweisen zu "this" nicht m\u00F6glich
+compiler.err.cant.assign.val.to.this=Zuweisen zu "this" nicht möglich
 
 # 0: symbol, 1: message segment
-compiler.err.cant.ref.non.effectively.final.var=Von {1} referenzierte lokale Variablen m\u00FCssen final oder effektiv final sein
+compiler.err.cant.ref.non.effectively.final.var=Von {1} referenzierte lokale Variablen müssen final oder effektiv final sein
 
 compiler.err.try.with.resources.expr.needs.var=Die try-with-resources-Ressource muss eine Variablendeklaration oder ein Ausdruck mit einer Referenz zu einer finalen oder effektiv finalen Variable sein
 
@@ -279,17 +279,17 @@ compiler.misc.guard=Guard
 # 0: type
 compiler.err.cant.deref={0} kann nicht dereferenziert werden
 
-compiler.err.cant.extend.intf.annotation="extends" f\u00FCr @interfaces nicht zul\u00E4ssig
+compiler.err.cant.extend.intf.annotation="extends" für @interfaces nicht zulässig
 
-compiler.err.annotation.decl.not.allowed.here=Annotationsschnittstellendeklaration hier nicht zul\u00E4ssig
+compiler.err.annotation.decl.not.allowed.here=Annotationsschnittstellendeklaration hier nicht zulässig
 
 # 0: symbol
-compiler.err.cant.inherit.from.final=Erben aus finalem {0}-Element nicht m\u00F6glich
+compiler.err.cant.inherit.from.final=Erben aus finalem {0}-Element nicht möglich
 
 # 0: symbol or string
 compiler.err.cant.ref.before.ctor.called={0} kann nicht referenziert werden, bevor der Supertypkonstruktor aufgerufen wurde
 
-compiler.err.cant.select.static.class.from.param.type=Statische Klasse kann nicht aus einem parametrisierten Typ ausgew\u00E4hlt werden
+compiler.err.cant.select.static.class.from.param.type=Statische Klasse kann nicht aus einem parametrisierten Typ ausgewählt werden
 
 # 0: symbol, 1: string, 2: string
 compiler.err.cant.inherit.diff.arg={0} kann nicht mit verschiedenen Argumenten geerbt werden: <{1}> und <{2}>
@@ -299,13 +299,13 @@ compiler.err.catch.without.try="catch" ohne "try"
 # 0: kind name, 1: symbol
 compiler.err.clash.with.pkg.of.same.name={0} {1} steht in Konflikt mit Package desselben Namens
 
-compiler.err.class.not.allowed=Klassen-, Schnittstellen- oder Enum-Deklaration hier nicht zul\u00E4ssig
+compiler.err.class.not.allowed=Klassen-, Schnittstellen- oder Enum-Deklaration hier nicht zulässig
 
 compiler.err.const.expr.req=Konstantenausdruck erforderlich
 
 compiler.err.pattern.or.enum.req=Muster oder Enum-Konstante erforderlich
 
-compiler.err.cont.outside.loop=Fortsetzung au\u00DFerhalb Schleife
+compiler.err.cont.outside.loop=Fortsetzung außerhalb Schleife
 
 # 0: symbol or type
 compiler.err.cyclic.inheritance=Zyklische Vererbung mit {0}
@@ -314,7 +314,7 @@ compiler.err.cyclic.inheritance=Zyklische Vererbung mit {0}
 compiler.err.cyclic.annotation.element=Typ von Element {0} ist zyklisch
 
 # 0: symbol
-compiler.err.call.to.super.not.allowed.in.enum.ctor=Aufruf von Super in Enum-Konstruktor nicht zul\u00E4ssig
+compiler.err.call.to.super.not.allowed.in.enum.ctor=Aufruf von Super in Enum-Konstruktor nicht zulässig
 
 # 0: type
 compiler.err.no.superclass={0} weist keine Superklasse auf.
@@ -322,13 +322,13 @@ compiler.err.no.superclass={0} weist keine Superklasse auf.
 # 0: symbol, 1: type, 2: symbol, 3: type, 4: type
 compiler.err.concrete.inheritance.conflict=Methoden {0} von {1} und {2} von {3} werden mit derselben Signatur geerbt
 
-compiler.err.default.allowed.in.intf.annotation.member=Standardwert nur in einer Annotationsschnittstellendeklaration zul\u00E4ssig
+compiler.err.default.allowed.in.intf.annotation.member=Standardwert nur in einer Annotationsschnittstellendeklaration zulässig
 
 # 0: symbol
 compiler.err.doesnt.exist=Package {0} ist nicht vorhanden
 
 # 0: type
-compiler.err.duplicate.annotation.invalid.repeated=Annotation {0} ist keine g\u00FCltige wiederholbare Annotation
+compiler.err.duplicate.annotation.invalid.repeated=Annotation {0} ist keine gültige wiederholbare Annotation
 
 # 0: name, 1: type
 compiler.err.duplicate.annotation.member.value=Doppeltes Element "{0}" in Annotation @{1}.
@@ -337,40 +337,40 @@ compiler.err.duplicate.annotation.member.value=Doppeltes Element "{0}" in Annota
 compiler.err.duplicate.annotation.missing.container={0} ist keine wiederholbare Annotationsschnittstelle
 
 # 0: symbol
-compiler.err.invalid.repeatable.annotation=Doppelte Annotation: {0} ist mit einer ung\u00FCltigen @Repeatable-Annotation versehen
+compiler.err.invalid.repeatable.annotation=Doppelte Annotation: {0} ist mit einer ungültigen @Repeatable-Annotation versehen
 
 # 0: symbol or type
-compiler.err.invalid.repeatable.annotation.no.value={0} ist keine g\u00FCltige @Repeatable-Annotation. Keine Wertelementmethode deklariert
+compiler.err.invalid.repeatable.annotation.no.value={0} ist keine gültige @Repeatable-Annotation. Keine Wertelementmethode deklariert
 
 # 0: type, 1: number
-compiler.err.invalid.repeatable.annotation.multiple.values={0} ist keine g\u00FCltige @Repeatable-Annotation. {1} Elementmethoden namens "value" deklariert
+compiler.err.invalid.repeatable.annotation.multiple.values={0} ist keine gültige @Repeatable-Annotation. {1} Elementmethoden namens "value" deklariert
 
 # 0: type
-compiler.err.invalid.repeatable.annotation.invalid.value={0} ist keine g\u00FCltige @Repeatable-Annotation. Ung\u00FCltiges Wertelement
+compiler.err.invalid.repeatable.annotation.invalid.value={0} ist keine gültige @Repeatable-Annotation. Ungültiges Wertelement
 
 # 0: symbol or type, 1: type, 2: type
-compiler.err.invalid.repeatable.annotation.value.return=\u00DCbergeordnete Annotationsschnittstelle ({0}) muss ein Element namens "value" mit dem Typ {2} deklarieren
+compiler.err.invalid.repeatable.annotation.value.return=Übergeordnete Annotationsschnittstelle ({0}) muss ein Element namens "value" mit dem Typ {2} deklarieren
 
 # 0: symbol or type, 1: symbol
-compiler.err.invalid.repeatable.annotation.elem.nondefault=\u00DCbergeordnete Annotationsschnittstelle ({0}) enth\u00E4lt keinen Standardwert f\u00FCr Element {1}
+compiler.err.invalid.repeatable.annotation.elem.nondefault=Übergeordnete Annotationsschnittstelle ({0}) enthält keinen Standardwert für Element {1}
 
 # 0: symbol, 1: string, 2: symbol, 3: string
-compiler.err.invalid.repeatable.annotation.retention=Aufbewahrung der \u00FCbergeordneten Annotationsschnittstelle ({0}) ist k\u00FCrzer als die Aufbewahrung der wiederholbaren Annotationsschnittstelle ({2})
+compiler.err.invalid.repeatable.annotation.retention=Aufbewahrung der übergeordneten Annotationsschnittstelle ({0}) ist kürzer als die Aufbewahrung der wiederholbaren Annotationsschnittstelle ({2})
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.documented=Wiederholbare Annotationsschnittstelle ({1}) ist @Documented, die \u00FCbergeordnete Annotationsschnittstelle ({0}) aber nicht
+compiler.err.invalid.repeatable.annotation.not.documented=Wiederholbare Annotationsschnittstelle ({1}) ist @Documented, die übergeordnete Annotationsschnittstelle ({0}) aber nicht
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.inherited=Wiederholbare Annotationsschnittstelle ({1}) ist @Inherited, die \u00FCbergeordnete Annotationsschnittstelle ({0}) aber nicht
+compiler.err.invalid.repeatable.annotation.not.inherited=Wiederholbare Annotationsschnittstelle ({1}) ist @Inherited, die übergeordnete Annotationsschnittstelle ({0}) aber nicht
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.incompatible.target=\u00DCbergeordnete Annotationsschnittstelle ({0}) gilt f\u00FCr mehr Ziele als die wiederholbare Annotationsschnittstelle ({1})
+compiler.err.invalid.repeatable.annotation.incompatible.target=Übergeordnete Annotationsschnittstelle ({0}) gilt für mehr Ziele als die wiederholbare Annotationsschnittstelle ({1})
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation.repeated.and.container.present=Container {0} darf nicht gleichzeitig mit dem darin enthaltenen Element vorhanden sein
 
 # 0: type, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.applicable=Container {0} ist nicht anwendbar f\u00FCr Element {1}
+compiler.err.invalid.repeatable.annotation.not.applicable=Container {0} ist nicht anwendbar für Element {1}
 
 # 0: type
 compiler.err.invalid.repeatable.annotation.not.applicable.in.context=Container {0} ist in diesem Typkontext nicht anwendbar
@@ -379,14 +379,14 @@ compiler.err.invalid.repeatable.annotation.not.applicable.in.context=Container {
 compiler.err.duplicate.class=Doppelte Klasse: {0}
 
 # 0: string
-compiler.err.bad.file.name=Ung\u00FCltiger Dateiname: {0}
+compiler.err.bad.file.name=Ungültiger Dateiname: {0}
 
 compiler.err.unnamed.class.should.not.have.package.declaration=Unbenannte Klasse darf keine Packagedeklaration aufweisen
 
 compiler.err.unnamed.class.does.not.have.main.method=Unbenannte Klasse weist keine Hauptmethode im Format "void main()" oder "void main(String[] args)" auf
 
 # 0: name, 1: name
-compiler.err.same.binary.name=Klassen {0} und {1} haben denselben bin\u00E4ren Namen
+compiler.err.same.binary.name=Klassen {0} und {1} haben denselben binären Namen
 
 compiler.err.duplicate.case.label=Doppeltes CASE-Label
 
@@ -398,23 +398,23 @@ compiler.err.duplicate.unconditional.pattern=Doppeltes nicht bedingtes Muster
 
 compiler.err.unconditional.pattern.and.default=Switch umfasst sowohl ein nicht bedingtes Muster als auch ein Standardlabel
 
-compiler.err.guard.not.allowed=Guards sind nur f\u00FCr CASE-Anweisungen mit einem Muster zul\u00E4ssig
+compiler.err.guard.not.allowed=Guards sind nur für CASE-Anweisungen mit einem Muster zulässig
 
 compiler.err.guard.has.constant.expression.false=Dieses CASE-Label hat einen Guard, der ein konstanter Ausdruck mit dem Wert ''false'' ist
 
 # 0: symbol
-compiler.err.cannot.assign.not.declared.guard=Zuweisen zu {0} nicht m\u00F6glich, da das Element nicht im Guard deklariert wurde
+compiler.err.cannot.assign.not.declared.guard=Zuweisen zu {0} nicht möglich, da das Element nicht im Guard deklariert wurde
 
 # 0: type, 1: type
 compiler.err.constant.label.not.compatible=Konstantes Label des Typs {0} ist nicht mit Switch-Selektortyp {1} kompatibel
 
-compiler.err.flows.through.to.pattern=Ung\u00FCltiger Fallthrough zu einem Muster
+compiler.err.flows.through.to.pattern=Ungültiger Fallthrough zu einem Muster
 
-compiler.err.flows.through.from.pattern=Ung\u00FCltiger Fallthrough von einem Muster
+compiler.err.flows.through.from.pattern=Ungültiger Fallthrough von einem Muster
 
-compiler.err.invalid.case.label.combination=ung\u00FCltige Case-Label-Kombination
+compiler.err.invalid.case.label.combination=ungültige Case-Label-Kombination
 
-compiler.err.default.label.not.allowed=Standardlabel hier nicht zul\u00E4ssig
+compiler.err.default.label.not.allowed=Standardlabel hier nicht zulässig
 
 compiler.err.pattern.type.cannot.infer=Mustertyp kann nicht abgeleitet werden
 
@@ -423,23 +423,23 @@ compiler.err.else.without.if="else" ohne "if"
 compiler.err.empty.char.lit=Leeres Zeichenliteral
 
 # 0: symbol
-compiler.err.encl.class.required=Eine einschlie\u00DFende Instanz mit {0} ist erforderlich
+compiler.err.encl.class.required=Eine einschließende Instanz mit {0} ist erforderlich
 
 compiler.err.enum.annotation.must.be.enum.constant=Ein Enum-Annotationswert muss eine Enum-Konstante sein
 
-compiler.err.enum.cant.be.instantiated=Enum-Klassen d\u00FCrfen nicht instanziiert werden
+compiler.err.enum.cant.be.instantiated=Enum-Klassen dürfen nicht instanziiert werden
 
 compiler.err.enum.label.must.be.unqualified.enum=Das CASE-Label eines Enum-Switches muss der unqualifizierte Name einer Enumerationskonstante sein
 
 compiler.err.enum.label.must.be.enum.constant=Das CASE-Label einer Enum-Switch-Konstanten muss eine Enumerationskonstante sein
 
-compiler.err.enum.no.subclassing=Klassen k\u00F6nnen java.lang.Enum nicht direkt erweitern
+compiler.err.enum.no.subclassing=Klassen können java.lang.Enum nicht direkt erweitern
 
 compiler.err.enum.types.not.extensible=Enum-Klassen sind nicht erweiterbar
 
-compiler.err.enum.no.finalize=Enums k\u00F6nnen keine Finalisierungsmethoden aufweisen
+compiler.err.enum.no.finalize=Enums können keine Finalisierungsmethoden aufweisen
 
-compiler.err.enum.cant.be.generic=Enums k\u00F6nnen nicht generisch sein
+compiler.err.enum.cant.be.generic=Enums können nicht generisch sein
 
 # 0: file name, 1: string
 compiler.err.error.reading.file=Fehler beim Lesen von {0}. {1}
@@ -448,7 +448,7 @@ compiler.err.error.reading.file=Fehler beim Lesen von {0}. {1}
 compiler.err.except.already.caught=Ausnahme {0} wurde bereits abgefangen
 
 # 0: type
-compiler.err.except.never.thrown.in.try=Ausnahme {0} wird nie im Body der entsprechenden try-Anweisung ausgel\u00F6st
+compiler.err.except.never.thrown.in.try=Ausnahme {0} wird nie im Body der entsprechenden try-Anweisung ausgelöst
 
 # 0: symbol
 compiler.err.final.parameter.may.not.be.assigned=final-Parameter {0} darf nicht zugewiesen werden
@@ -460,14 +460,14 @@ compiler.err.try.resource.may.not.be.assigned=auto-closeable-Ressource {0} darf
 compiler.err.multicatch.parameter.may.not.be.assigned=multi-catch-Parameter {0} darf nicht zugewiesen werden
 
 # 0: type, 1: type
-compiler.err.multicatch.types.must.be.disjoint=Alternativen in einer multi-catch-Anweisung d\u00FCrfen nicht durch Unterklassen verkn\u00FCpft sein\nAlternative {0} ist eine Unterklasse der Alternative {1}
+compiler.err.multicatch.types.must.be.disjoint=Alternativen in einer multi-catch-Anweisung dürfen nicht durch Unterklassen verknüpft sein\nAlternative {0} ist eine Unterklasse der Alternative {1}
 
 compiler.err.finally.without.try="finally" ohne "try"
 
 # 0: type, 1: message segment
 compiler.err.foreach.not.applicable.to.type=for-each nicht auf Ausdruckstyp anwendbar\nErforderlich: {1}\nErmittelt:    {0}
 
-compiler.err.fp.number.too.large=Gleitkommazahl zu gro\u00DF
+compiler.err.fp.number.too.large=Gleitkommazahl zu groß
 
 compiler.err.fp.number.too.small=Gleitkommazahl zu klein
 
@@ -476,32 +476,32 @@ compiler.err.generic.array.creation=Erstellung von generischem Array
 compiler.err.generic.throwable=Eine generische Klasse darf java.lang.Throwable nicht erweitern
 
 # 0: symbol
-compiler.err.icls.cant.have.static.decl=Unzul\u00E4ssige static-Deklaration in innerer Klasse {0}\nModifikator "static" ist nur in Konstantenvariablendeklarationen zul\u00E4ssig
+compiler.err.icls.cant.have.static.decl=Unzulässige static-Deklaration in innerer Klasse {0}\nModifikator "static" ist nur in Konstantenvariablendeklarationen zulässig
 
 # 0: string
-compiler.err.illegal.char=Unzul\u00E4ssiges Zeichen: "{0}"
+compiler.err.illegal.char=Unzulässiges Zeichen: "{0}"
 
 # 0: string, 1: string
-compiler.err.illegal.char.for.encoding=Nicht zuordenbares Zeichen (0x{0}) f\u00FCr Codierung {1}
+compiler.err.illegal.char.for.encoding=Nicht zuordenbares Zeichen (0x{0}) für Codierung {1}
 
 # 0: set of flag, 1: set of flag
-compiler.err.illegal.combination.of.modifiers=Unzul\u00E4ssige Kombination aus Modifikatoren: {0} und {1}
+compiler.err.illegal.combination.of.modifiers=Unzulässige Kombination aus Modifikatoren: {0} und {1}
 
-compiler.err.illegal.enum.static.ref=Unzul\u00E4ssige Referenz zu statischem Feld aus Initializer
+compiler.err.illegal.enum.static.ref=Unzulässige Referenz zu statischem Feld aus Initializer
 
-compiler.err.illegal.esc.char=Unzul\u00E4ssiges Escapezeichen
+compiler.err.illegal.esc.char=Unzulässiges Escapezeichen
 
-compiler.err.illegal.forward.ref=Unzul\u00E4ssige Vorw\u00E4rtsreferenz
+compiler.err.illegal.forward.ref=Unzulässige Vorwärtsreferenz
 
 # 0: symbol, 1: object
-compiler.err.not.in.profile={0} ist in Profil "{1}" nicht verf\u00FCgbar
+compiler.err.not.in.profile={0} ist in Profil "{1}" nicht verfügbar
 
 # 0: symbol
 compiler.warn.forward.ref=Referenz zu Variable "{0}", bevor sie initialisiert wurde
 
-compiler.warn.possible.this.escape=M\u00F6gliches "this"-Escape vor vollst\u00E4ndiger Initialisierung der Unterklasse
+compiler.warn.possible.this.escape=Mögliches "this"-Escape vor vollständiger Initialisierung der Unterklasse
 
-compiler.warn.possible.this.escape.location=Vorheriges m\u00F6gliches "This"-Escape erfolgt hier per Aufruf
+compiler.warn.possible.this.escape.location=Vorheriges mögliches "This"-Escape erfolgt hier per Aufruf
 
 compiler.err.illegal.self.ref=Selbstreferenz in Initializer
 
@@ -509,101 +509,101 @@ compiler.err.illegal.self.ref=Selbstreferenz in Initializer
 compiler.warn.self.ref=Selbstreferenz in Initializer von Variable "{0}"
 
 # 0: type
-compiler.err.illegal.initializer.for.type=Unzul\u00E4ssiger Initializer f\u00FCr {0}
+compiler.err.illegal.initializer.for.type=Unzulässiger Initializer für {0}
 
-compiler.err.illegal.line.end.in.char.lit=Unzul\u00E4ssiges Zeilenende in Zeichenliteral
+compiler.err.illegal.line.end.in.char.lit=Unzulässiges Zeilenende in Zeichenliteral
 
-compiler.err.illegal.text.block.open=Unzul\u00E4ssige Sequenz f\u00FCr \u00D6ffnungstrennzeichen von Textblock. Zeilenabschlusszeichen fehlt
+compiler.err.illegal.text.block.open=Unzulässige Sequenz für Öffnungstrennzeichen von Textblock. Zeilenabschlusszeichen fehlt
 
 compiler.warn.inconsistent.white.space.indentation=Inkonsistenter Leerzeicheneinzug
 
 compiler.warn.trailing.white.space.will.be.removed=Nachgestelltes Leerzeichen wird entfernt
 
-compiler.err.illegal.nonascii.digit=Unzul\u00E4ssige Nicht-ASCII-Ziffer
+compiler.err.illegal.nonascii.digit=Unzulässige Nicht-ASCII-Ziffer
 
-compiler.err.illegal.underscore=Unzul\u00E4ssiger Unterstrich
+compiler.err.illegal.underscore=Unzulässiger Unterstrich
 
-compiler.err.illegal.dot="." unzul\u00E4ssig
+compiler.err.illegal.dot="." unzulässig
 
 # 0: symbol
-compiler.err.illegal.qual.not.icls=Unzul\u00E4ssiger Qualifier. {0} ist keine innere Klasse
+compiler.err.illegal.qual.not.icls=Unzulässiger Qualifier. {0} ist keine innere Klasse
 
-compiler.err.illegal.start.of.expr=Unzul\u00E4ssiger Ausdrucksbeginn
+compiler.err.illegal.start.of.expr=Unzulässiger Ausdrucksbeginn
 
-compiler.err.illegal.start.of.stmt=Unzul\u00E4ssiger Anweisungsbeginn
+compiler.err.illegal.start.of.stmt=Unzulässiger Anweisungsbeginn
 
-compiler.err.illegal.start.of.type=Unzul\u00E4ssiger Typbeginn
+compiler.err.illegal.start.of.type=Unzulässiger Typbeginn
 
-compiler.err.illegal.parenthesized.expression=Unzul\u00E4ssiger Ausdruck in Klammern
+compiler.err.illegal.parenthesized.expression=Unzulässiger Ausdruck in Klammern
 
-compiler.err.illegal.unicode.esc=Unzul\u00E4ssiges Unicode-Escapezeichen
+compiler.err.illegal.unicode.esc=Unzulässiges Unicode-Escapezeichen
 
 # 0: symbol
-compiler.err.import.requires.canonical=Import erfordert kanonischen Namen f\u00FCr {0}
+compiler.err.import.requires.canonical=Import erfordert kanonischen Namen für {0}
 
 compiler.err.improperly.formed.type.param.missing=Falsch formatierter Typ. Einige Parameter fehlen
 
-compiler.err.improperly.formed.type.inner.raw.param=Falsch formatierter Typ. Typargumente f\u00FCr Raw-Typ angegeben
+compiler.err.improperly.formed.type.inner.raw.param=Falsch formatierter Typ. Typargumente für Raw-Typ angegeben
 
 # 0: type, 1: type
 compiler.err.incomparable.types=Nicht vergleichbare Typen: {0} und {1}
 
 # 0: string
-compiler.err.int.number.too.large=Ganzzahl zu gro\u00DF
+compiler.err.int.number.too.large=Ganzzahl zu groß
 
-compiler.err.intf.annotation.members.cant.have.params=Elemente in Annotationsschnittstellendeklarationen k\u00F6nnen keine formalen Parameter deklarieren
+compiler.err.intf.annotation.members.cant.have.params=Elemente in Annotationsschnittstellendeklarationen können keine formalen Parameter deklarieren
 
 # 0: symbol
 compiler.err.intf.annotation.cant.have.type.params=Annotationsschnittstelle {0} darf nicht generisch sein
 
-compiler.err.intf.annotation.members.cant.have.type.params=Elemente in Annotationsschnittstellendeklarationen k\u00F6nnen keine generischen Methoden sein
+compiler.err.intf.annotation.members.cant.have.type.params=Elemente in Annotationsschnittstellendeklarationen können keine generischen Methoden sein
 
 # 0: symbol, 1: type
 compiler.err.intf.annotation.member.clash=Annotationsschnittstelle {1} deklariert ein Element mit demselben Namen wie Methode {0}
 
 compiler.err.intf.expected.here=Hier wird eine Schnittstelle erwartet
 
-compiler.err.intf.meth.cant.have.body=Abstrakte Schnittstellenmethoden k\u00F6nnen keinen Body enthalten
+compiler.err.intf.meth.cant.have.body=Abstrakte Schnittstellenmethoden können keinen Body enthalten
 
-compiler.err.invalid.annotation.member.type=Ung\u00FCltiger Typ f\u00FCr Annotationsschnittstellenelement
+compiler.err.invalid.annotation.member.type=Ungültiger Typ für Annotationsschnittstellenelement
 
-compiler.err.invalid.binary.number=Bin\u00E4rzahlen m\u00FCssen mindestens eine Bin\u00E4rziffer enthalten
+compiler.err.invalid.binary.number=Binärzahlen müssen mindestens eine Binärziffer enthalten
 
-compiler.err.invalid.hex.number=Hexadezimalzahlen m\u00FCssen mindestens eine Hexadezimalziffer enthalten
+compiler.err.invalid.hex.number=Hexadezimalzahlen müssen mindestens eine Hexadezimalziffer enthalten
 
-compiler.err.invalid.meth.decl.ret.type.req=Ung\u00FCltige Methodendeklaration. R\u00FCckgabetyp erforderlich
+compiler.err.invalid.meth.decl.ret.type.req=Ungültige Methodendeklaration. Rückgabetyp erforderlich
 
-compiler.err.varargs.and.old.array.syntax=Legacy-Arraynotation f\u00FCr Parameter mit variabler Argumentanzahl nicht zul\u00E4ssig
+compiler.err.varargs.and.old.array.syntax=Legacy-Arraynotation für Parameter mit variabler Argumentanzahl nicht zulässig
 
-compiler.err.varargs.and.receiver =varargs-Notation f\u00FCr receiver-Parameter nicht zul\u00E4ssig
+compiler.err.varargs.and.receiver =varargs-Notation für receiver-Parameter nicht zulässig
 
 compiler.err.varargs.must.be.last =varargs-Parameter muss der letzte Parameter sein
 
-compiler.err.array.and.receiver =Legacy-Arraynotation f\u00FCr receiver-Parameter nicht zul\u00E4ssig
+compiler.err.array.and.receiver =Legacy-Arraynotation für receiver-Parameter nicht zulässig
 
 compiler.err.wrong.receiver =Falscher receiver-Parametername
 
-compiler.err.variable.not.allowed=Variablendeklaration hier nicht zul\u00E4ssig
+compiler.err.variable.not.allowed=Variablendeklaration hier nicht zulässig
 
 # 0: name
 compiler.err.label.already.in.use=Label {0} wird bereits verwendet
 
-compiler.err.local.enum=Enum-Klassen d\u00FCrfen nicht lokal sein
+compiler.err.local.enum=Enum-Klassen dürfen nicht lokal sein
 
 compiler.err.cannot.create.array.with.type.arguments=Array kann nicht mit Typargumenten erstellt werden
 
 compiler.err.cannot.create.array.with.diamond=Array kann nicht mit "<>" erstellt werden
 
-compiler.err.invalid.module.directive=Moduldirektiven-Schl\u00FCsselwort oder "}" erwartet
+compiler.err.invalid.module.directive=Moduldirektiven-Schlüsselwort oder "}" erwartet
 
 #
 # limits.  We don't give the limits in the diagnostic because we expect
 # them to change, yet we want to use the same diagnostic.  These are all
 # detected during code generation.
 #
-compiler.err.limit.code=Code zu gro\u00DF
+compiler.err.limit.code=Code zu groß
 
-compiler.err.limit.code.too.large.for.try.stmt=Code f\u00FCr try-Anweisung zu gro\u00DF
+compiler.err.limit.code.too.large.for.try.stmt=Code für try-Anweisung zu groß
 
 compiler.err.limit.dimensions=Arraytyp hat zu viele Dimensionen
 
@@ -620,86 +620,86 @@ compiler.err.limit.stack=Code erfordert zu viel Stack
 compiler.err.limit.string=Konstantenzeichenfolge zu lang
 
 # 0: string
-compiler.err.limit.string.overflow=UTF8-Darstellung f\u00FCr Zeichenfolge "{0}..." ist zu lang f\u00FCr den Konstantenpool
+compiler.err.limit.string.overflow=UTF8-Darstellung für Zeichenfolge "{0}..." ist zu lang für den Konstantenpool
 
 compiler.err.malformed.fp.lit=Nicht wohlgeformtes Gleitkommaliteral
 
-compiler.err.method.does.not.override.superclass=Methode \u00FCberschreibt oder implementiert keine Methode aus einem Supertyp
+compiler.err.method.does.not.override.superclass=Methode überschreibt oder implementiert keine Methode aus einem Supertyp
 
-compiler.err.static.methods.cannot.be.annotated.with.override=Statische Methoden k\u00F6nnen nicht mit @Override-Annotation versehen werden
+compiler.err.static.methods.cannot.be.annotated.with.override=Statische Methoden können nicht mit @Override-Annotation versehen werden
 
 compiler.err.missing.meth.body.or.decl.abstract=Methodenbody fehlt oder als abstrakt deklarieren
 
-compiler.err.missing.ret.stmt=R\u00FCckgabeanweisung fehlt
+compiler.err.missing.ret.stmt=Rückgabeanweisung fehlt
 
 # 0: type
-compiler.misc.missing.ret.val=R\u00FCckgabewert fehlt
+compiler.misc.missing.ret.val=Rückgabewert fehlt
 
-compiler.misc.unexpected.ret.val=Unerwarteter R\u00FCckgabewert
+compiler.misc.unexpected.ret.val=Unerwarteter Rückgabewert
 
 # 0: set of flag
-compiler.err.mod.not.allowed.here=Modifikator {0} hier nicht zul\u00E4ssig
+compiler.err.mod.not.allowed.here=Modifikator {0} hier nicht zulässig
 
 # 0: name
-compiler.err.modifier.not.allowed.here=Modifikator {0} hier nicht zul\u00E4ssig
+compiler.err.modifier.not.allowed.here=Modifikator {0} hier nicht zulässig
 
-compiler.err.intf.not.allowed.here=Schnittstelle hier nicht zul\u00E4ssig
+compiler.err.intf.not.allowed.here=Schnittstelle hier nicht zulässig
 
 # 0: symbol, 1: symbol
 compiler.err.name.clash.same.erasure=Namenskonflikt: {0} und {1} haben dieselbe Erasure
 
 # 0: name, 1: list of type, 2: symbol, 3: name, 4: list of type, 5: symbol
-compiler.err.name.clash.same.erasure.no.override=Namenskonflikt: {0}({1}) in {2} und {3}({4}) in {5} haben dieselbe Erasure, aber keine setzt die andere au\u00DFer Kraft
+compiler.err.name.clash.same.erasure.no.override=Namenskonflikt: {0}({1}) in {2} und {3}({4}) in {5} haben dieselbe Erasure, aber keine setzt die andere außer Kraft
 
 # 0: string, 1: name, 2: name, 3: list of type, 4: symbol, 5: name, 6: list of type, 7: symbol
-compiler.err.name.clash.same.erasure.no.override.1=Namenskonflikt: {0} {1} hat zwei Methoden mit derselben Erasure, aber keine setzt die andere au\u00DFer Kraft\nErste Methode: {2}({3}) in {4}\nZweite Methode: {5}({6}) in {7}
+compiler.err.name.clash.same.erasure.no.override.1=Namenskonflikt: {0} {1} hat zwei Methoden mit derselben Erasure, aber keine setzt die andere außer Kraft\nErste Methode: {2}({3}) in {4}\nZweite Methode: {5}({6}) in {7}
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
 compiler.err.name.clash.same.erasure.no.hide=Namenskonflikt: {0} in {1} und {2} in {3} haben dieselbe Erasure, aber keine blendet die andere aus
 
-compiler.err.name.reserved.for.internal.use={0} ist f\u00FCr den internen Gebrauch reserviert
+compiler.err.name.reserved.for.internal.use={0} ist für den internen Gebrauch reserviert
 
-compiler.err.native.meth.cant.have.body=Native Methoden k\u00F6nnen keinen Body enthalten
+compiler.err.native.meth.cant.have.body=Native Methoden können keinen Body enthalten
 
 
 # 0: message segment
-compiler.misc.incompatible.type.in.conditional=Ung\u00FCltiger Typ in Bedingungsausdruck\n{0}
+compiler.misc.incompatible.type.in.conditional=Ungültiger Typ in Bedingungsausdruck\n{0}
 
-compiler.misc.conditional.target.cant.be.void=target-type f\u00FCr Bedingungsausdruck darf nicht "void" sein
+compiler.misc.conditional.target.cant.be.void=target-type für Bedingungsausdruck darf nicht "void" sein
 
-compiler.misc.switch.expression.target.cant.be.void=target-type f\u00FCr Switch-Ausdruck darf nicht "void" sein
+compiler.misc.switch.expression.target.cant.be.void=target-type für Switch-Ausdruck darf nicht "void" sein
 
 # 0: message segment
-compiler.misc.incompatible.type.in.switch.expression=Ung\u00FCltiger Typ in Switch-Ausdruck\n{0}
+compiler.misc.incompatible.type.in.switch.expression=Ungültiger Typ in Switch-Ausdruck\n{0}
 
 # 0: message segment
-compiler.misc.incompatible.ret.type.in.lambda=Ung\u00FCltiger R\u00FCckgabetyp in Lambda-Ausdruck\n{0}
+compiler.misc.incompatible.ret.type.in.lambda=Ungültiger Rückgabetyp in Lambda-Ausdruck\n{0}
 
 compiler.misc.stat.expr.expected=Lambda-Body ist nicht mit einer void-Funktionsschnittstelle kompatibel\n(verwenden Sie stattdessen einen Block-Lambda-Body oder einen Anweisungsausdruck)
 
 # 0: message segment
-compiler.misc.incompatible.ret.type.in.mref=Ung\u00FCltiger R\u00FCckgabetyp in Methodenreferenz\n{0}
+compiler.misc.incompatible.ret.type.in.mref=Ungültiger Rückgabetyp in Methodenreferenz\n{0}
 
 compiler.err.lambda.body.neither.value.nor.void.compatible=Lambda-Body ist weder mit Wert noch mit "void "kompatibel
 
 # 0: list of type
-compiler.err.incompatible.thrown.types.in.mref=Inkompatible ausgel\u00F6ste Typen {0} in Funktionsausdruck
+compiler.err.incompatible.thrown.types.in.mref=Inkompatible ausgelöste Typen {0} in Funktionsausdruck
 
 compiler.misc.incompatible.arg.types.in.lambda=Inkompatible Parametertypen in Lambda-Ausdruck
 
 compiler.misc.incompatible.arg.types.in.mref=Inkompatible Parametertypen in Methodenreferenz
 
-compiler.err.new.not.allowed.in.annotation="new" in einer Annotation nicht zul\u00E4ssig
+compiler.err.new.not.allowed.in.annotation="new" in einer Annotation nicht zulässig
 
 # 0: name, 1: type
 compiler.err.no.annotation.member=Kein Annotationsmitglied {0} in {1}
 
 # 0: symbol
-compiler.err.no.encl.instance.of.type.in.scope=Keine einschlie\u00DFende Instanz vom Typ {0} im Geltungsbereich
+compiler.err.no.encl.instance.of.type.in.scope=Keine einschließende Instanz vom Typ {0} im Geltungsbereich
 
 compiler.err.no.intf.expected.here=Hier wird keine Schnittstelle erwartet
 
-compiler.err.no.match.entry={0} hat keine \u00DCbereinstimmung im Eintrag in {1}. {2} erforderlich
+compiler.err.no.match.entry={0} hat keine Übereinstimmung im Eintrag in {1}. {2} erforderlich
 
 # 0: type
 compiler.err.not.annotation.type={0} ist keine Annotationsschnittstelle
@@ -754,28 +754,28 @@ compiler.misc.not.def.access.not.exported.to.module=Package {0} wird in Modul {1
 compiler.misc.not.def.access.not.exported.to.module.from.unnamed=Package {0} wird in Modul {1} deklariert, aber nicht in das unbenannte Modul exportiert
 
 # 0: symbol, 1: symbol
-compiler.err.not.def.access.class.intf.cant.access={1}.{0} ist in einer nicht zug\u00E4nglichen Klasse oder Schnittstelle definiert
+compiler.err.not.def.access.class.intf.cant.access={1}.{0} ist in einer nicht zugänglichen Klasse oder Schnittstelle definiert
 
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.class.intf.cant.access={1}.{0} ist in einer nicht zug\u00E4nglichen Klasse oder Schnittstelle definiert
+compiler.misc.not.def.access.class.intf.cant.access={1}.{0} ist in einer nicht zugänglichen Klasse oder Schnittstelle definiert
 
 # 0: symbol, 1: symbol, 2: symbol, 3: message segment
-compiler.err.not.def.access.class.intf.cant.access.reason={1}.{0} in Package {2} ist nicht zug\u00E4nglich\n({3})
+compiler.err.not.def.access.class.intf.cant.access.reason={1}.{0} in Package {2} ist nicht zugänglich\n({3})
 
 # 0: symbol, 1: symbol, 2: symbol, 3: message segment
-compiler.misc.not.def.access.class.intf.cant.access.reason={1}.{0} in Package {2} ist nicht zug\u00E4nglich\n({3})
+compiler.misc.not.def.access.class.intf.cant.access.reason={1}.{0} in Package {2} ist nicht zugänglich\n({3})
 
 # 0: symbol, 1: list of type, 2: type
-compiler.misc.cant.access.inner.cls.constr=Zugriff auf Konstruktor {0}({1}) nicht m\u00F6glich\nEinschlie\u00DFende Instanz vom Typ {2} ist nicht im Geltungsbereich
+compiler.misc.cant.access.inner.cls.constr=Zugriff auf Konstruktor {0}({1}) nicht möglich\nEinschließende Instanz vom Typ {2} ist nicht im Geltungsbereich
 
 # 0: symbol, 1: symbol
-compiler.err.not.def.public.cant.access={0} ist nicht \u00F6ffentlich in {1}. Zugriff von externem Package nicht m\u00F6glich
+compiler.err.not.def.public.cant.access={0} ist nicht öffentlich in {1}. Zugriff von externem Package nicht möglich
 
 # 0: symbol, 1: symbol
-compiler.err.not.def.public={0} ist nicht \u00F6ffentlich in {1}
+compiler.err.not.def.public={0} ist nicht öffentlich in {1}
 
 # 0: symbol, 1: symbol
-compiler.misc.not.def.public.cant.access={0} ist nicht \u00F6ffentlich in {1}. Zugriff von externem Package nicht m\u00F6glich
+compiler.misc.not.def.public.cant.access={0} ist nicht öffentlich in {1}. Zugriff von externem Package nicht möglich
 
 # 0: name
 compiler.err.not.loop.label=Kein Schleifenlabel: {0}
@@ -783,17 +783,17 @@ compiler.err.not.loop.label=Kein Schleifenlabel: {0}
 compiler.err.not.stmt=Keine Anweisung
 
 # 0: symbol
-compiler.err.not.encl.class=Keine einschlie\u00DFende Klasse: {0}
+compiler.err.not.encl.class=Keine einschließende Klasse: {0}
 
 # 0: name, 1: type
-compiler.err.operator.cant.be.applied=Ung\u00FCltiger Operandentyp {1} f\u00FCr un\u00E4ren Operator "{0}"
+compiler.err.operator.cant.be.applied=Ungültiger Operandentyp {1} für unären Operator "{0}"
 
 # 0: name, 1: type, 2: type
-compiler.err.operator.cant.be.applied.1=Ung\u00FCltige Operandentypen f\u00FCr un\u00E4ren Operator "{0}"\nErster Typ: {1}\nZweiter Typ: {2}
+compiler.err.operator.cant.be.applied.1=Ungültige Operandentypen für unären Operator "{0}"\nErster Typ: {1}\nZweiter Typ: {2}
 
-compiler.err.pkg.annotations.sb.in.package-info.java=Packageannotationen m\u00FCssen in der Datei package-info.java vorhanden sein
+compiler.err.pkg.annotations.sb.in.package-info.java=Packageannotationen müssen in der Datei package-info.java vorhanden sein
 
-compiler.err.no.pkg.in.module-info.java=Packagedeklarationen in Datei module-info.java nicht zul\u00E4ssig
+compiler.err.no.pkg.in.module-info.java=Packagedeklarationen in Datei module-info.java nicht zulässig
 
 # 0: symbol
 compiler.err.pkg.clashes.with.class.of.same.name=Es besteht ein Konflikt zwischen dem Package {0} und einer gleichnamigen Klasse
@@ -809,7 +809,7 @@ compiler.err.proc.cant.access=Kein Zugriff auf {0}\n{1}\nDetails finden Sie im f
 compiler.err.proc.cant.access.1=Kein Zugriff auf {0}\n{1}
 
 # 0: string
-compiler.err.proc.cant.find.class=Klassendatei f\u00FCr "{0}" konnte nicht gefunden werden.
+compiler.err.proc.cant.find.class=Klassendatei für "{0}" konnte nicht gefunden werden.
 
 # 0: string
 compiler.err.proc.cant.load.class=Prozessorklassendatei konnte nicht geladen werden. Grund: "{0}".
@@ -821,15 +821,15 @@ compiler.err.proc.messager={0}
 # 0: string
 compiler.misc.exception.message={0}
 
-compiler.misc.user.selected.completion.failure=Von Benutzer ausgew\u00E4hlter Abschlussfehler nach Klassenname
+compiler.misc.user.selected.completion.failure=Von Benutzer ausgewählter Abschlussfehler nach Klassenname
 
 # 0: collection of string
 compiler.err.proc.no.explicit.annotation.processing.requested=Klassennamen "{0}" werden nur akzeptiert, wenn die Annotationsverarbeitung explizit angefordert wird
 
-compiler.err.proc.no.service=ServiceLoader konnte nicht verwendet werden und ist f\u00FCr Annotationsverarbeitung erforderlich.
+compiler.err.proc.no.service=ServiceLoader konnte nicht verwendet werden und ist für Annotationsverarbeitung erforderlich.
 
 # 0: string, 1: string
-compiler.err.proc.processor.bad.option.name=Ung\u00FCltiger Optionsname "{0}" von Prozessor "{1}" angegeben
+compiler.err.proc.processor.bad.option.name=Ungültiger Optionsname "{0}" von Prozessor "{1}" angegeben
 
 # 0: string
 compiler.err.proc.processor.cant.instantiate=Instanz von Prozessor "{0}" konnte nicht instanziiert werden
@@ -843,9 +843,9 @@ compiler.err.proc.processor.wrong.type=Annotationsprozessor "{0}" implementiert
 compiler.err.proc.service.problem=Fehler beim Erstellen eines Service-Loaders zum Laden von Prozessoren.
 
 # 0: string
-compiler.err.proc.bad.config.file=Ung\u00FCltige Servicekonfigurationsdatei, oder Ausnahme beim Erstellen des Prozessorobjekts ausgel\u00F6st: {0}
+compiler.err.proc.bad.config.file=Ungültige Servicekonfigurationsdatei, oder Ausnahme beim Erstellen des Prozessorobjekts ausgelöst: {0}
 
-compiler.err.proc.cant.create.loader=Class Loader konnte nicht f\u00FCr Annotationsprozessoren erstellt werden: {0}
+compiler.err.proc.cant.create.loader=Class Loader konnte nicht für Annotationsprozessoren erstellt werden: {0}
 
 # 0: symbol
 compiler.err.qualified.new.of.static.class="new" von statischer Klasse qualifiziert
@@ -853,10 +853,10 @@ compiler.err.qualified.new.of.static.class="new" von statischer Klasse qualifizi
 compiler.err.recursive.ctor.invocation=Rekursiver Konstruktoraufruf
 
 # 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
-compiler.err.ref.ambiguous=Referenz zu {0} ist mehrdeutig\nSowohl {1} {2} in {3} als auch {4} {5} in {6} stimmen \u00FCberein
+compiler.err.ref.ambiguous=Referenz zu {0} ist mehrdeutig\nSowohl {1} {2} in {3} als auch {4} {5} in {6} stimmen überein
 
 # 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
-compiler.misc.ref.ambiguous=Referenz zu {0} ist mehrdeutig\nSowohl {1} {2} in {3} als auch {4} {5} in {6} stimmen \u00FCberein
+compiler.misc.ref.ambiguous=Referenz zu {0} ist mehrdeutig\nSowohl {1} {2} in {3} als auch {4} {5} in {6} stimmen überein
 
 compiler.err.repeated.annotation.target=Wiederholtes Annotationsziel
 
@@ -870,17 +870,17 @@ compiler.err.report.access={0} hat {1}-Zugriff in {2}
 # 0: symbol, 1: set of modifier, 2: symbol
 compiler.misc.report.access={0} hat {1}-Zugriff in {2}
 
-compiler.err.ret.outside.meth=R\u00FCckgabe au\u00DFerhalb von Methode
+compiler.err.ret.outside.meth=Rückgabe außerhalb von Methode
 
-compiler.err.signature.doesnt.match.supertype=Signatur stimmt nicht mit {0} \u00FCberein. Inkompatibler Supertyp
+compiler.err.signature.doesnt.match.supertype=Signatur stimmt nicht mit {0} überein. Inkompatibler Supertyp
 
-compiler.err.signature.doesnt.match.intf=Signatur stimmt nicht mit {0} \u00FCberein. Inkompatible Schnittstellen
+compiler.err.signature.doesnt.match.intf=Signatur stimmt nicht mit {0} überein. Inkompatible Schnittstellen
 
 # 0: symbol, 1: symbol, 2: symbol
-compiler.err.does.not.override.abstract={0} ist nicht abstrakt und setzt die abstrakte Methode {1} in {2} nicht au\u00DFer Kraft
+compiler.err.does.not.override.abstract={0} ist nicht abstrakt und setzt die abstrakte Methode {1} in {2} nicht außer Kraft
 
 # 0: file object
-compiler.err.source.cant.overwrite.input.file=Fehler beim Schreiben von Quelle. Eingabedatei {0} kann nicht \u00FCberschrieben werden
+compiler.err.source.cant.overwrite.input.file=Fehler beim Schreiben von Quelle. Eingabedatei {0} kann nicht überschrieben werden
 
 # 0: symbol
 compiler.err.stack.sim.error=Interner Fehler: Stacksimulationsfehler in {0}
@@ -898,18 +898,18 @@ compiler.err.cannot.generate.class=Fehler beim Generieren der Klasse {0}\n({1})
 compiler.misc.synthetic.name.conflict=Das Symbol {0} steht mit einem vom Compiler synthetisierten Symbol in {1} in Konflikt
 
 # 0: symbol, 1: type
-compiler.misc.illegal.signature=Unzul\u00E4ssiges Signaturattribut f\u00FCr Typ {1}
+compiler.misc.illegal.signature=Unzulässiges Signaturattribut für Typ {1}
 
-compiler.err.throws.not.allowed.in.intf.annotation=Throws-Klausel in @interface-Mitgliedern nicht zul\u00E4ssig
+compiler.err.throws.not.allowed.in.intf.annotation=Throws-Klausel in @interface-Mitgliedern nicht zulässig
 
 compiler.err.try.without.catch.finally.or.resource.decls="try" ohne "catch", "finally" oder Ressourcendeklarationen
 
 # 0: symbol
 compiler.err.type.doesnt.take.params=Typ {0} akzeptiert keine Parameter
 
-compiler.err.type.var.cant.be.deref=Auswahl aus Typvariable nicht m\u00F6glich
+compiler.err.type.var.cant.be.deref=Auswahl aus Typvariable nicht möglich
 
-compiler.err.type.var.may.not.be.followed.by.other.bounds=Auf eine Typvariable d\u00FCrfen keine anderen Begrenzungen folgen
+compiler.err.type.var.may.not.be.followed.by.other.bounds=Auf eine Typvariable dürfen keine anderen Begrenzungen folgen
 
 compiler.err.type.var.more.than.once=Typvariable {0} tritt mehrmals im Ergebnistyp von {1} auf. Sie muss instanziiert werden
 
@@ -919,28 +919,28 @@ compiler.err.type.var.more.than.once.in.result=Typvariable {0} tritt mehrmals im
 compiler.err.types.incompatible=Die Typen {0} und {1} sind inkompatibel.\n{2}
 
 # 0: name, 1: list of type
-compiler.misc.incompatible.diff.ret=Beide definieren {0}({1}), aber mit nicht verwandten R\u00FCckgabetypen
+compiler.misc.incompatible.diff.ret=Beide definieren {0}({1}), aber mit nicht verwandten Rückgabetypen
 
 # 0: type, 1: name, 2: list of type
-compiler.err.incompatible.diff.ret.same.type=Typ {0} definiert {1}({2}) mehr als einmal mit nicht verwandten R\u00FCckgabetypen
+compiler.err.incompatible.diff.ret.same.type=Typ {0} definiert {1}({2}) mehr als einmal mit nicht verwandten Rückgabetypen
 
 # 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
-compiler.misc.incompatible.unrelated.defaults={0} {1} erbt nicht verwandte Standardwerte f\u00FCr {2}({3}) von Typen {4} und {5}
+compiler.misc.incompatible.unrelated.defaults={0} {1} erbt nicht verwandte Standardwerte für {2}({3}) von Typen {4} und {5}
 
 # 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
-compiler.misc.incompatible.abstract.default={0} {1} erbt abstrakte und Standardmethode f\u00FCr {2}({3}) von Typen {4} und {5}
+compiler.misc.incompatible.abstract.default={0} {1} erbt abstrakte und Standardmethode für {2}({3}) von Typen {4} und {5}
 
 # 0: name, 1: kind name, 2: symbol
-compiler.err.default.overrides.object.member=Standardmethode {0} in {1} {2} setzt ein Mitglied von java.lang.Object au\u00DFer Kraft
+compiler.err.default.overrides.object.member=Standardmethode {0} in {1} {2} setzt ein Mitglied von java.lang.Object außer Kraft
 
 # 0: type
-compiler.err.illegal.static.intf.meth.call=Unzul\u00E4ssiger statischer Schnittstellenmethodenaufruf\nDer Empf\u00E4ngerausdruck muss durch den Typ-Qualifier "{0}" ersetzt werden
+compiler.err.illegal.static.intf.meth.call=Unzulässiger statischer Schnittstellenmethodenaufruf\nDer Empfängerausdruck muss durch den Typ-Qualifier "{0}" ersetzt werden
 
 # 0: symbol or type, 1: message segment
-compiler.err.illegal.default.super.call=Ung\u00FCltiger Typ-Qualifier {0} in Standardsuperaufruf\n{1}
+compiler.err.illegal.default.super.call=Ungültiger Typ-Qualifier {0} in Standardsuperaufruf\n{1}
 
 # 0: symbol, 1: type
-compiler.misc.overridden.default=Methode {0} wird in {1} au\u00DFer Kraft gesetzt
+compiler.misc.overridden.default=Methode {0} wird in {1} außer Kraft gesetzt
 
 # 0: symbol, 1: type or symbol
 compiler.misc.redundant.supertype=Redundante Schnittstelle {0} wird durch {1} erweitert
@@ -966,7 +966,7 @@ compiler.err.processor.type.cannot.be.a.raw.type=Prozessortyp kann kein Raw-Typ
 compiler.err.not.a.processor.type=Kein Prozessortyp: {0}
 
 # 0: string
-compiler.err.unsupported.encoding=Nicht unterst\u00FCtzte Codierung: {0}
+compiler.err.unsupported.encoding=Nicht unterstützte Codierung: {0}
 
 compiler.err.io.exception=Fehler beim Lesen der Quelldatei: {0}
 
@@ -974,36 +974,36 @@ compiler.err.io.exception=Fehler beim Lesen der Quelldatei: {0}
 compiler.err.undef.label=Nicht definiertes Label: {0}
 
 # 0: name
-compiler.err.illegal.ref.to.restricted.type=Unzul\u00E4ssige Referenz zu eingeschr\u00E4nktem Typ "{0}"
+compiler.err.illegal.ref.to.restricted.type=Unzulässige Referenz zu eingeschränktem Typ "{0}"
 
 # 0: name
-compiler.warn.illegal.ref.to.restricted.type=Unzul\u00E4ssige Referenz zu eingeschr\u00E4nktem Typ "{0}"
+compiler.warn.illegal.ref.to.restricted.type=Unzulässige Referenz zu eingeschränktem Typ "{0}"
 
 # 0: name, 1: source
-compiler.err.restricted.type.not.allowed="{0}" ist hier nicht zul\u00E4ssig\nAb Release {1} ist "{0}" ein eingeschr\u00E4nkter Typname, der nicht f\u00FCr Typdeklarationen verwendet werden kann
+compiler.err.restricted.type.not.allowed="{0}" ist hier nicht zulässig\nAb Release {1} ist "{0}" ein eingeschränkter Typname, der nicht für Typdeklarationen verwendet werden kann
 
 # 0: name, 1: source
-compiler.warn.restricted.type.not.allowed=Ab Release {1} ist "{0}" ein eingeschr\u00E4nkter Typname, der nicht f\u00FCr Typdeklarationen oder als Elementtyp eines Arrays verwendet werden kann
+compiler.warn.restricted.type.not.allowed=Ab Release {1} ist "{0}" ein eingeschränkter Typname, der nicht für Typdeklarationen oder als Elementtyp eines Arrays verwendet werden kann
 
 # 0: name, 1: source
-compiler.warn.restricted.type.not.allowed.preview="{0}" kann in einem zuk\u00FCnftigen Release ein eingeschr\u00E4nkter Typname werden, der nicht f\u00FCr Typdeklarationen oder als Elementtyp eines Arrays verwendet werden kann
+compiler.warn.restricted.type.not.allowed.preview="{0}" kann in einem zukünftigen Release ein eingeschränkter Typname werden, der nicht für Typdeklarationen oder als Elementtyp eines Arrays verwendet werden kann
 
 # 0: name (variable), 1: message segment
-compiler.err.cant.infer.local.var.type=Typ f\u00FCr lokale Variable {0} kann nicht abgeleitet werden\n({1})
+compiler.err.cant.infer.local.var.type=Typ für lokale Variable {0} kann nicht abgeleitet werden\n({1})
 
 # 0: name
-compiler.err.restricted.type.not.allowed.here="{0}" ist hier nicht zul\u00E4ssig
+compiler.err.restricted.type.not.allowed.here="{0}" ist hier nicht zulässig
 
 # 0: name
-compiler.err.restricted.type.not.allowed.array="{0}" ist nicht als Elementtyp eines Arrays zul\u00E4ssig
+compiler.err.restricted.type.not.allowed.array="{0}" ist nicht als Elementtyp eines Arrays zulässig
 
 # 0: name
-compiler.err.restricted.type.not.allowed.compound="{0}" ist nicht in einer zusammengesetzten Deklaration zul\u00E4ssig
+compiler.err.restricted.type.not.allowed.compound="{0}" ist nicht in einer zusammengesetzten Deklaration zulässig
 
 # 0: fragment
-compiler.err.invalid.lambda.parameter.declaration=Ung\u00FCltige Lambda-Parameterdeklaration\n({0})
+compiler.err.invalid.lambda.parameter.declaration=Ungültige Lambda-Parameterdeklaration\n({0})
 
-compiler.misc.implicit.and.explicit.not.allowed=Implizit typisierte Parameter k\u00F6nnen nicht mit explizit typisierten Parametern gemischt werden
+compiler.misc.implicit.and.explicit.not.allowed=Implizit typisierte Parameter können nicht mit explizit typisierten Parametern gemischt werden
 
 compiler.misc.var.and.explicit.not.allowed="var" kann nicht mit explizit typisierten Parametern gemischt werden
 
@@ -1013,7 +1013,7 @@ compiler.misc.local.cant.infer.null=Variablen-Initializer ist "null"
 
 compiler.misc.local.cant.infer.void=Variablen-Initializer ist "void"
 
-compiler.misc.local.missing.init="var" kann nicht f\u00FCr Variable ohne Initializer verwendet werden
+compiler.misc.local.missing.init="var" kann nicht für Variable ohne Initializer verwendet werden
 
 compiler.misc.local.lambda.missing.target=Lambda-Ausdruck erfordert einen expliziten Zieltyp
 
@@ -1021,55 +1021,55 @@ compiler.misc.local.mref.missing.target=Methodenreferenz erfordert einen explizi
 
 compiler.misc.local.array.missing.target=Array-Initializer erfordert einen expliziten Zieltyp
 
-compiler.misc.local.self.ref="var" kann nicht f\u00FCr selbstreferenzierende Variable verwendet werden
+compiler.misc.local.self.ref="var" kann nicht für selbstreferenzierende Variable verwendet werden
 
 # 0: message segment, 1: unused
-compiler.err.cant.apply.diamond=Typargumente f\u00FCr {0} k\u00F6nnen nicht abgeleitet werden
+compiler.err.cant.apply.diamond=Typargumente für {0} können nicht abgeleitet werden
 
 # 0: message segment or type, 1: message segment
-compiler.err.cant.apply.diamond.1=Typargumente f\u00FCr {0} k\u00F6nnen nicht abgeleitet werden\nGrund: {1}
+compiler.err.cant.apply.diamond.1=Typargumente für {0} können nicht abgeleitet werden\nGrund: {1}
 
 # 0: message segment or type, 1: message segment
-compiler.misc.cant.apply.diamond.1=Typargumente f\u00FCr {0} k\u00F6nnen nicht abgeleitet werden\nGrund: {1}
+compiler.misc.cant.apply.diamond.1=Typargumente für {0} können nicht abgeleitet werden\nGrund: {1}
 
 compiler.err.unreachable.stmt=Nicht erreichbare Anweisung
 
-compiler.err.not.exhaustive=Der Switch-Ausdruck deckt nicht alle m\u00F6glichen Eingabewerte ab
+compiler.err.not.exhaustive=Der Switch-Ausdruck deckt nicht alle möglichen Eingabewerte ab
 
-compiler.err.not.exhaustive.statement=Die Switch-Anweisung deckt nicht alle m\u00F6glichen Eingabewerte ab
+compiler.err.not.exhaustive.statement=Die Switch-Anweisung deckt nicht alle möglichen Eingabewerte ab
 
-compiler.err.initializer.must.be.able.to.complete.normally=Initializer muss normal abgeschlossen werden k\u00F6nnen
+compiler.err.initializer.must.be.able.to.complete.normally=Initializer muss normal abgeschlossen werden können
 
-compiler.err.initializer.not.allowed=Initializer in Schnittstellen nicht zul\u00E4ssig
+compiler.err.initializer.not.allowed=Initializer in Schnittstellen nicht zulässig
 
 # 0: type
-compiler.err.unreported.exception.need.to.catch.or.throw=Nicht gemeldete Ausnahme {0}. Muss abgefangen oder deklariert werden, um ausgel\u00F6st zu werden
+compiler.err.unreported.exception.need.to.catch.or.throw=Nicht gemeldete Ausnahme {0}. Muss abgefangen oder deklariert werden, um ausgelöst zu werden
 
 # 0: type
 compiler.err.unreported.exception.default.constructor=Nicht gemeldete Ausnahme {0} in Standardkonstruktor
 
 # 0: type, 1: name
-compiler.err.unreported.exception.implicit.close=Nicht gemeldete Ausnahme {0}. Muss abgefangen oder deklariert werden, um ausgel\u00F6st zu werden\nAusnahme bei implizitem Aufruf von close() f\u00FCr Ressourcenvariable "{1}" ausgel\u00F6st
+compiler.err.unreported.exception.implicit.close=Nicht gemeldete Ausnahme {0}. Muss abgefangen oder deklariert werden, um ausgelöst zu werden\nAusnahme bei implizitem Aufruf von close() für Ressourcenvariable "{1}" ausgelöst
 
-compiler.err.void.not.allowed.here="void"-Typ hier nicht zul\u00E4ssig
+compiler.err.void.not.allowed.here="void"-Typ hier nicht zulässig
 
 # 0: string
 compiler.err.wrong.number.type.args=Falsche Anzahl Typargumente. {0} erforderlich
 
 # 0: symbol
-compiler.err.var.might.already.be.assigned=Variable {0} wurde m\u00F6glicherweise bereits zugewiesen
+compiler.err.var.might.already.be.assigned=Variable {0} wurde möglicherweise bereits zugewiesen
 
 # 0: symbol
-compiler.err.var.might.not.have.been.initialized=Variable {0} wurde m\u00F6glicherweise nicht initialisiert
+compiler.err.var.might.not.have.been.initialized=Variable {0} wurde möglicherweise nicht initialisiert
 
 # 0: symbol
 compiler.err.var.not.initialized.in.default.constructor=Variable {0} nicht im Standardkonstruktor initialisiert
 
 # 0: symbol
-compiler.err.var.might.be.assigned.in.loop=Variable {0} wurde m\u00F6glicherweise in Schleife zugewiesen
+compiler.err.var.might.be.assigned.in.loop=Variable {0} wurde möglicherweise in Schleife zugewiesen
 
 # 0: symbol, 1: message segment
-compiler.err.varargs.invalid.trustme.anno=Ung\u00FCltige {0}-Annotation. {1}
+compiler.err.varargs.invalid.trustme.anno=Ungültige {0}-Annotation. {1}
 
 # 0: type
 compiler.misc.varargs.trustme.on.reifiable.varargs=Varargs-Elementtyp {0} ist reifizierbar.
@@ -1100,14 +1100,14 @@ compiler.err.class.cant.write=Fehler beim Schreiben von {0}: {1}
 # In the following string, {0} is the name of the class in the Java source.
 # It really should be used two times..
 # 0: kind name, 1: name
-compiler.err.class.public.should.be.in.file={0} {1} ist \u00F6ffentlich und muss in einer Datei namens {1}.java deklariert werden
+compiler.err.class.public.should.be.in.file={0} {1} ist öffentlich und muss in einer Datei namens {1}.java deklariert werden
 
 ## All errors which do not refer to a particular line in the source code are
 ## preceded by this string.
 compiler.err.error=Fehler:\u0020
 
 # The following error messages do not refer to a line in the source code.
-compiler.err.cant.read.file=Lesen nicht m\u00F6glich: {0}
+compiler.err.cant.read.file=Lesen nicht möglich: {0}
 
 # 0: string
 compiler.err.plugin.not.found=Plug-in nicht gefunden: {0}
@@ -1126,21 +1126,21 @@ compiler.err.locn.cant.read.directory=Verzeichnis {0} kann nicht gelesen werden
 compiler.err.locn.cant.read.file=Datei {0} kann nicht gelesen werden
 
 # 0: path
-compiler.err.locn.cant.get.module.name.for.jar=Modulname f\u00FCr {0} kann nicht bestimmt werden
+compiler.err.locn.cant.get.module.name.for.jar=Modulname für {0} kann nicht bestimmt werden
 
 # 0: path
-compiler.err.multi-module.outdir.cannot.be.exploded.module=Im Modus f\u00FCr mehrere Module kann das Ausgabeverzeichnis kein entpacktes Modul sein: {0}
+compiler.err.multi-module.outdir.cannot.be.exploded.module=Im Modus für mehrere Module kann das Ausgabeverzeichnis kein entpacktes Modul sein: {0}
 
 # 0: path
 compiler.warn.outdir.is.in.exploded.module=Das Ausgabeverzeichnis befindet sich in einem entpackten Modul: {0}
 
 # 0: file object
-compiler.err.locn.module-info.not.allowed.on.patch.path=module-info.class nicht in Patchpfad zul\u00E4ssig: {0}
+compiler.err.locn.module-info.not.allowed.on.patch.path=module-info.class nicht in Patchpfad zulässig: {0}
 
 # 0: string
-compiler.err.locn.invalid.arg.for.xpatch=Ung\u00FCltiges Argument f\u00FCr --patch-module-Option: {0}
+compiler.err.locn.invalid.arg.for.xpatch=Ungültiges Argument für --patch-module-Option: {0}
 
-compiler.err.file.sb.on.source.or.patch.path.for.module=Datei muss sich im Quellpfad oder im Patchpfad f\u00FCr das Modul befinden
+compiler.err.file.sb.on.source.or.patch.path.for.module=Datei muss sich im Quellpfad oder im Patchpfad für das Modul befinden
 
 compiler.err.no.java.lang=Package java.lang kann in Plattformklassen nicht gefunden werden
 
@@ -1155,9 +1155,9 @@ compiler.misc.fatal.err.cant.locate.meth=Schwerwiegender Fehler: Methode {0} kan
 compiler.misc.fatal.err.cant.locate.field=Schwerwiegender Fehler: Feld {0} kann nicht gefunden werden
 
 # 0: type
-compiler.misc.fatal.err.cant.locate.ctor=Schwerwiegender Fehler: Konstruktor f\u00FCr {0} kann nicht gefunden werden
+compiler.misc.fatal.err.cant.locate.ctor=Schwerwiegender Fehler: Konstruktor für {0} kann nicht gefunden werden
 
-compiler.misc.fatal.err.cant.close=Schwerwiegender Fehler: Compiler-Ressourcen k\u00F6nnen nicht geschlossen werden
+compiler.misc.fatal.err.cant.close=Schwerwiegender Fehler: Compiler-Ressourcen können nicht geschlossen werden
 
 #####
 
@@ -1165,18 +1165,18 @@ compiler.misc.fatal.err.cant.close=Schwerwiegender Fehler: Compiler-Ressourcen k
 ## miscellaneous strings
 ##
 
-compiler.misc.diamond.anonymous.methods.implicitly.override=(aufgrund von <> muss jede nicht private Methode, die in dieser anonymen Klasse deklariert ist, eine Methode aus einem Supertyp au\u00DFer Kraft setzen oder implementieren)
+compiler.misc.diamond.anonymous.methods.implicitly.override=(aufgrund von <> muss jede nicht private Methode, die in dieser anonymen Klasse deklariert ist, eine Methode aus einem Supertyp außer Kraft setzen oder implementieren)
 
-compiler.misc.source.unavailable=(Quelle nicht verf\u00FCgbar)
+compiler.misc.source.unavailable=(Quelle nicht verfügbar)
 
 # 0: string, 1: string, 2: boolean
-compiler.misc.x.print.processor.info=Prozessor {0} entspricht {1} und gibt {2} zur\u00FCck.
+compiler.misc.x.print.processor.info=Prozessor {0} entspricht {1} und gibt {2} zurück.
 
 # 0: number, 1: string, 2: set of symbol, 3: boolean
 compiler.misc.x.print.rounds=Runde {0}:\n\tEingabedateien: {1}\n\tAnnotationen: {2}\n\tLetzte Runde: {3}
 
 # 0: file name
-compiler.warn.file.from.future=\u00C4nderungsdatum liegt in der Zukunft f\u00FCr Datei {0}
+compiler.warn.file.from.future=Änderungsdatum liegt in der Zukunft für Datei {0}
 
 # 0: path
 compiler.warn.output.file.clash=Ausgabedatei mehrmals geschrieben: {0}
@@ -1186,22 +1186,22 @@ compiler.warn.output.file.clash=Ausgabedatei mehrmals geschrieben: {0}
 ## The following string will appear before all messages keyed as:
 ## "compiler.note".
 
-compiler.note.compressed.diags=Einige Meldungen wurden vereinfacht. Wiederholen Sie die Kompilierung mit -Xdiags:verbose, um die vollst\u00E4ndige Ausgabe abzurufen
+compiler.note.compressed.diags=Einige Meldungen wurden vereinfacht. Wiederholen Sie die Kompilierung mit -Xdiags:verbose, um die vollständige Ausgabe abzurufen
 
 # 0: boolean, 1: symbol
-compiler.note.lambda.stat=Lambda-Ausdruck wird \u00FCbersetzt\nAlternative Metafactory = {0}\nSynthetische Methode = {1}
+compiler.note.lambda.stat=Lambda-Ausdruck wird übersetzt\nAlternative Metafactory = {0}\nSynthetische Methode = {1}
 
 # 0: boolean, 1: unused
-compiler.note.mref.stat=Methodenreferenz wird \u00FCbersetzt\nAlternative Metafactory = {0}\n
+compiler.note.mref.stat=Methodenreferenz wird übersetzt\nAlternative Metafactory = {0}\n
 # 0: boolean, 1: symbol
-compiler.note.mref.stat.1=Methodenreferenz wird \u00FCbersetzt\nAlternative Metafactory = {0}\nBridgemethode = {1}
+compiler.note.mref.stat.1=Methodenreferenz wird übersetzt\nAlternative Metafactory = {0}\nBridgemethode = {1}
 
 compiler.note.note=Hinweis:\u0020
 
 # 0: file name
-compiler.note.deprecated.filename={0} verwendet oder \u00FCberschreibt eine veraltete API.
+compiler.note.deprecated.filename={0} verwendet oder überschreibt eine veraltete API.
 
-compiler.note.deprecated.plural=Einige Eingabedateien verwenden oder \u00FCberschreiben eine veraltete API.
+compiler.note.deprecated.plural=Einige Eingabedateien verwenden oder überschreiben eine veraltete API.
 
 # The following string may appear after one of the above deprecation
 # messages.
@@ -1210,12 +1210,12 @@ compiler.note.deprecated.recompile=Wiederholen Sie die Kompilierung mit -Xlint:d
 # 0: file name
 compiler.note.deprecated.filename.additional={0} hat weitere Verwendungen oder Overrides einer veralteten API.
 
-compiler.note.deprecated.plural.additional=Einige Eingabedateien verwenden oder \u00FCberschreiben zus\u00E4tzlich eine veraltete API.
+compiler.note.deprecated.plural.additional=Einige Eingabedateien verwenden oder überschreiben zusätzlich eine veraltete API.
 
 # 0: file name
-compiler.note.removal.filename={0} verwendet oder \u00FCberschreibt eine veraltete API, die zum Entfernen markiert ist.
+compiler.note.removal.filename={0} verwendet oder überschreibt eine veraltete API, die zum Entfernen markiert ist.
 
-compiler.note.removal.plural=Einige Eingabedateien verwenden oder \u00FCberschreiben eine veraltete API, die zum Entfernen markiert ist.
+compiler.note.removal.plural=Einige Eingabedateien verwenden oder überschreiben eine veraltete API, die zum Entfernen markiert ist.
 
 # The following string may appear after one of the above removal messages.
 compiler.note.removal.recompile=Wiederholen Sie die Kompilierung mit -Xlint:removal, um Details zu erhalten.
@@ -1223,20 +1223,20 @@ compiler.note.removal.recompile=Wiederholen Sie die Kompilierung mit -Xlint:remo
 # 0: file name
 compiler.note.removal.filename.additional={0} hat weitere Verwendungen oder Overrides einer veralteten API, die zum Entfernen markiert ist.
 
-compiler.note.removal.plural.additional=Einige Eingabedateien verwenden oder \u00FCberschreiben zus\u00E4tzlich eine veraltete API, die zum Entfernen markiert ist.
+compiler.note.removal.plural.additional=Einige Eingabedateien verwenden oder überschreiben zusätzlich eine veraltete API, die zum Entfernen markiert ist.
 
 # 0: file name
-compiler.note.unchecked.filename={0} verwendet nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge.
+compiler.note.unchecked.filename={0} verwendet nicht geprüfte oder unsichere Vorgänge.
 
-compiler.note.unchecked.plural=Einige Eingabedateien verwenden nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge.
+compiler.note.unchecked.plural=Einige Eingabedateien verwenden nicht geprüfte oder unsichere Vorgänge.
 
 # The following string may appear after one of the above unchecked messages.
 compiler.note.unchecked.recompile=Wiederholen Sie die Kompilierung mit -Xlint:unchecked, um Details zu erhalten.
 
 # 0: file name
-compiler.note.unchecked.filename.additional={0} weist weitere nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge auf.
+compiler.note.unchecked.filename.additional={0} weist weitere nicht geprüfte oder unsichere Vorgänge auf.
 
-compiler.note.unchecked.plural.additional=Einige Eingabedateien verwenden zus\u00E4tzlich nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge.
+compiler.note.unchecked.plural.additional=Einige Eingabedateien verwenden zusätzlich nicht geprüfte oder unsichere Vorgänge.
 
 # 0: file name, 1: source
 compiler.note.preview.filename={0} verwendet Vorschaufeatures von Java SE {1}.
@@ -1252,7 +1252,7 @@ compiler.note.preview.recompile=Wiederholen Sie die Kompilierung mit -Xlint:prev
 compiler.note.preview.filename.additional={0} hat weitere Verwendungen von Vorschaufeatures von Java SE {1}.
 
 # 0: source
-compiler.note.preview.plural.additional=Einige Eingabedateien verwenden zus\u00E4tzlich Vorschaufeatures von Java SE {0}.
+compiler.note.preview.plural.additional=Einige Eingabedateien verwenden zusätzlich Vorschaufeatures von Java SE {0}.
 
 # Notes related to annotation processing
 
@@ -1263,7 +1263,7 @@ compiler.note.proc.messager={0}
 # 0: string, 1: string, 2: string
 compiler.note.multiple.elements=Mehrere Elemente namens "{1}" in Modulen "{2}" wurden von javax.lang.model.util.Elements.{0} gefunden.
 
-compiler.note.implicit.annotation.processing=Die Annotationsverarbeitung ist aktiviert, da mindestens ein Prozessor im\nClasspath gefunden wurde. In einem zuk\u00FCnftigen Release von javac kann die Annotationsverarbeitung deaktiviert werden,\nes sei denn, mindestens ein Prozessor ist namentlich angegeben (-processor), oder ein Suchpfad\nist angegeben (--processor-path, --processor-module-path), oder die Annotationsverarbeitung\nwurde explizit aktiviert (-proc:only, -proc:full).\nVerwenden Sie "-Xlint:-options", um diese Meldung zu unterdr\u00FCcken.\nVerwenden Sie "-proc:none", um die Annotationsverarbeitung zu deaktivieren.
+compiler.note.implicit.annotation.processing=Die Annotationsverarbeitung ist aktiviert, da mindestens ein Prozessor im\nClasspath gefunden wurde. In einem zukünftigen Release von javac kann die Annotationsverarbeitung deaktiviert werden,\nes sei denn, mindestens ein Prozessor ist namentlich angegeben (-processor), oder ein Suchpfad\nist angegeben (--processor-path, --processor-module-path), oder die Annotationsverarbeitung\nwurde explizit aktiviert (-proc:only, -proc:full).\nVerwenden Sie "-Xlint:-options", um diese Meldung zu unterdrücken.\nVerwenden Sie "-proc:none", um die Annotationsverarbeitung zu deaktivieren.
 
 #####
 
@@ -1274,10 +1274,10 @@ compiler.misc.count.error={0} Fehler
 compiler.misc.count.error.plural={0} Fehler
 
 # 0: number, 1: number
-compiler.misc.count.error.recompile=Nur die ersten {0} Fehler von insgesamt {1} werden angezeigt. Mit -Xmaxerrs k\u00F6nnen Sie mehr Fehler anzeigen
+compiler.misc.count.error.recompile=Nur die ersten {0} Fehler von insgesamt {1} werden angezeigt. Mit -Xmaxerrs können Sie mehr Fehler anzeigen
 
 # 0: number, 1: number
-compiler.misc.count.warn.recompile=Nur die ersten {0} Warnungen von insgesamt {1} werden angezeigt. Mit -Xmaxwarns k\u00F6nnen Sie mehr Warnungen anzeigen
+compiler.misc.count.warn.recompile=Nur die ersten {0} Warnungen von insgesamt {1} werden angezeigt. Mit -Xmaxwarns können Sie mehr Warnungen anzeigen
 
 # 0: number
 compiler.misc.count.warn={0} Warnung
@@ -1285,12 +1285,12 @@ compiler.misc.count.warn={0} Warnung
 # 0: number
 compiler.misc.count.warn.plural={0} Warnungen
 
-compiler.misc.version.not.available=(Versionsinformationen nicht verf\u00FCgbar)
+compiler.misc.version.not.available=(Versionsinformationen nicht verfügbar)
 
 ## extra output when using -verbose (JavaCompiler)
 
 # 0: symbol
-compiler.misc.verbose.checking.attribution=[{0} wird gepr\u00FCft]
+compiler.misc.verbose.checking.attribution=[{0} wird geprüft]
 
 # 0: string
 compiler.misc.verbose.parsing.done=[Parsen abgeschlossen: {0} ms]
@@ -1309,10 +1309,10 @@ compiler.misc.verbose.wrote.file=[{0} geschrieben]
 compiler.misc.verbose.loading=[{0} wird geladen]
 
 # 0: string
-compiler.misc.verbose.sourcepath=[Suchpfad f\u00FCr Quelldateien: {0}]
+compiler.misc.verbose.sourcepath=[Suchpfad für Quelldateien: {0}]
 
 # 0: string
-compiler.misc.verbose.classpath=[Suchpfad f\u00FCr Klassendateien: {0}]
+compiler.misc.verbose.classpath=[Suchpfad für Klassendateien: {0}]
 
 ## extra output when using -prompt (util/Log)
 compiler.misc.resume.abort=F)ortsetzen, A)bbruch>
@@ -1335,15 +1335,15 @@ compiler.warn.lintOption=[{0}]\u0020
 compiler.warn.constant.SVUID=serialVersionUID muss Konstante in Klasse {0} sein
 
 # 0: path
-compiler.warn.dir.path.element.not.found=Ung\u00FCltiges Pfadelement "{0}": Verzeichnis nicht vorhanden
+compiler.warn.dir.path.element.not.found=Ungültiges Pfadelement "{0}": Verzeichnis nicht vorhanden
 
 # 0: file name
-compiler.warn.dir.path.element.not.directory=Ung\u00FCltiges Pfadelement "{0}": kein Verzeichnis
+compiler.warn.dir.path.element.not.directory=Ungültiges Pfadelement "{0}": kein Verzeichnis
 
 # 0: symbol, 1: symbol, 2: symbol
-compiler.warn.missing-explicit-ctor=Klasse {0} in exportiertem Package {1} deklariert keine expliziten Konstruktoren und stellt daher einen Standardkonstruktor f\u00FCr Clients des Moduls {2} bereit
+compiler.warn.missing-explicit-ctor=Klasse {0} in exportiertem Package {1} deklariert keine expliziten Konstruktoren und stellt daher einen Standardkonstruktor für Clients des Moduls {2} bereit
 
-compiler.warn.strictfp=Ab Release 17 werden alle Gleitkommaausdr\u00FCcke streng ausgewertet. Daher ist "strictfp" nicht erforderlich
+compiler.warn.strictfp=Ab Release 17 werden alle Gleitkommaausdrücke streng ausgewertet. Daher ist "strictfp" nicht erforderlich
 
 compiler.warn.finally.cannot.complete=Finally-Klausel kann nicht normal abgeschlossen werden
 
@@ -1360,13 +1360,13 @@ compiler.warn.has.been.deprecated={0} in {1} ist veraltet
 compiler.warn.has.been.deprecated.for.removal={0} in {1} ist veraltet und wurde zum Entfernen markiert
 
 # 0: symbol
-compiler.warn.is.preview={0} ist eine Vorschau-API, die in einem zuk\u00FCnftigen Release entfernt werden kann.
+compiler.warn.is.preview={0} ist eine Vorschau-API, die in einem zukünftigen Release entfernt werden kann.
 
 # 0: symbol
-compiler.err.is.preview={0} ist eine Vorschau-API, die standardm\u00E4\u00DFig deaktiviert ist.\n(Verwenden Sie --enable-preview, um Vorschau-APIs zu aktivieren)
+compiler.err.is.preview={0} ist eine Vorschau-API, die standardmäßig deaktiviert ist.\n(Verwenden Sie --enable-preview, um Vorschau-APIs zu aktivieren)
 
 # 0: symbol
-compiler.warn.is.preview.reflective={0} ist eine reflektive Vorschau-API, die in einem zuk\u00FCnftigen Release entfernt werden kann.
+compiler.warn.is.preview.reflective={0} ist eine reflektive Vorschau-API, die in einem zukünftigen Release entfernt werden kann.
 
 # 0: symbol
 compiler.warn.has.been.deprecated.module=Modul {0} ist veraltet
@@ -1375,26 +1375,26 @@ compiler.warn.has.been.deprecated.module=Modul {0} ist veraltet
 compiler.warn.has.been.deprecated.for.removal.module=Modul {0} ist veraltet und wurde zum Entfernen markiert
 
 # 0: symbol
-compiler.warn.sun.proprietary={0} ist eine interne propriet\u00E4re API, die in einem zuk\u00FCnftigen Release entfernt werden kann
+compiler.warn.sun.proprietary={0} ist eine interne proprietäre API, die in einem zukünftigen Release entfernt werden kann
 
-compiler.warn.illegal.char.for.encoding=Nicht zuordenbares Zeichen f\u00FCr Codierung {0}
+compiler.warn.illegal.char.for.encoding=Nicht zuordenbares Zeichen für Codierung {0}
 
 # 0: symbol
 compiler.warn.improper.SVUID=serialVersionUID muss als "static final" in Klasse {0} deklariert sein
 
 compiler.warn.improper.SPF=serialPersistentFields muss als "private static final" deklariert sein, um in Kraft zu treten
 
-compiler.warn.SPF.null.init=serialPersistentFields tritt bei Initialisierung als Null nicht in Kraft.\nF\u00FChren Sie die Initialisierung zu einem leeren Array aus, um keine Felder anzugeben
+compiler.warn.SPF.null.init=serialPersistentFields tritt bei Initialisierung als Null nicht in Kraft.\nFühren Sie die Initialisierung zu einem leeren Array aus, um keine Felder anzugeben
 
 
 # 0: type, 1: type
-compiler.warn.inexact.non-varargs.call=Nicht-varargs-Aufruf von varargs-Methode mit ungenauem Argumenttyp f\u00FCr den letzten Parameter.\nF\u00FChren Sie f\u00FCr einen varargs-Aufruf eine Umwandlung mit Cast in {0} aus\nF\u00FChren Sie f\u00FCr einen Nicht-varargs-Aufruf eine Umwandlung mit Cast in {1} aus, um diese Warnung zu unterdr\u00FCcken
+compiler.warn.inexact.non-varargs.call=Nicht-varargs-Aufruf von varargs-Methode mit ungenauem Argumenttyp für den letzten Parameter.\nFühren Sie für einen varargs-Aufruf eine Umwandlung mit Cast in {0} aus\nFühren Sie für einen Nicht-varargs-Aufruf eine Umwandlung mit Cast in {1} aus, um diese Warnung zu unterdrücken
 
 # 0: list of type
-compiler.warn.unreachable.catch=Nicht erreichbare Catch-Klausel\nAusgel\u00F6ster Typ {0} wurde bereits abgefangen
+compiler.warn.unreachable.catch=Nicht erreichbare Catch-Klausel\nAusgelöster Typ {0} wurde bereits abgefangen
 
 # 0: list of type
-compiler.warn.unreachable.catch.1=Nicht erreichbare Catch-Klausel\nAusgel\u00F6ste Typen {0} wurden bereits abgefangen
+compiler.warn.unreachable.catch.1=Nicht erreichbare Catch-Klausel\nAusgelöste Typen {0} wurden bereits abgefangen
 
 # 0: symbol
 compiler.warn.long.SVUID=serialVersionUID muss den Typ "long" in Klasse {0} aufweisen
@@ -1402,10 +1402,10 @@ compiler.warn.long.SVUID=serialVersionUID muss den Typ "long" in Klasse {0} aufw
 compiler.warn.OSF.array.SPF=serialPersistentFields muss den Typ "java.io.ObjectStreamField[]" aufweisen, um in Kraft zu treten
 
 # 0: symbol
-compiler.warn.missing.SVUID=Serialisierbare Klasse {0} enth\u00E4lt keine Definition von serialVersionUID
+compiler.warn.missing.SVUID=Serialisierbare Klasse {0} enthält keine Definition von serialVersionUID
 
 # 0: name
-compiler.warn.serializable.missing.access.no.arg.ctor=Zugriff auf einen no-arg-Konstruktor in der ersten nicht serialisierbaren Superklasse {0} nicht m\u00F6glich
+compiler.warn.serializable.missing.access.no.arg.ctor=Zugriff auf einen no-arg-Konstruktor in der ersten nicht serialisierbaren Superklasse {0} nicht möglich
 
 # 0: name
 compiler.warn.serial.method.not.private=Serialisierungsbezogene Methode {0} nicht als privat deklariert
@@ -1426,10 +1426,10 @@ compiler.warn.serial.method.one.arg=Serialisierungsbezogene Methode {0} muss gen
 compiler.warn.serial.method.parameter.type=Der einzige Parameter der serialisierungsbezogenen Methode {0} muss den Typ {1} haben, um in Kraft zu treten. Er darf nicht den Typ {2} aufweisen
 
 # 0: name, 1: type, 2: type
-compiler.warn.serial.method.unexpected.return.type=Serialisierungsbezogene Methode {0} wurde mit dem R\u00FCckgabetyp {1} und nicht dem erwarteten Typ {2} deklariert.\nMit dieser Deklaration ist die Methode ung\u00FCltig f\u00FCr die Serialisierung
+compiler.warn.serial.method.unexpected.return.type=Serialisierungsbezogene Methode {0} wurde mit dem Rückgabetyp {1} und nicht dem erwarteten Typ {2} deklariert.\nMit dieser Deklaration ist die Methode ungültig für die Serialisierung
 
 # 0: name, 1: type
-compiler.warn.serial.method.unexpected.exception=Serialisierungsbezogene Methode {0} wurde zum Ausl\u00F6sen eines unerwarteten Typs {1} deklariert
+compiler.warn.serial.method.unexpected.exception=Serialisierungsbezogene Methode {0} wurde zum Auslösen eines unerwarteten Typs {1} deklariert
 
 compiler.warn.ineffectual.serial.field.interface=serialPersistentFields ist in einer Schnittstelle nicht effektiv
 
@@ -1455,7 +1455,7 @@ compiler.warn.ineffectual.serial.method.externalizable=Serialisierungsbezogene M
 
 compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields ist in einer externalisierbaren Klasse nicht effektiv
 
-compiler.warn.externalizable.missing.public.no.arg.ctor=Eine externalisierbare Klasse erfordert einen \u00F6ffentlichen no-arg-Konstruktor
+compiler.warn.externalizable.missing.public.no.arg.ctor=Eine externalisierbare Klasse erfordert einen öffentlichen no-arg-Konstruktor
 
 compiler.warn.non.serializable.instance.field=Nicht transientes Instanzfeld einer serialisierbaren Klasse mit einem nicht serialisierbaren Typ deklariert
 
@@ -1464,39 +1464,39 @@ compiler.warn.non.serializable.instance.field.array=Nicht transientes Instanzfel
 
 compiler.warn.non.private.method.weaker.access=Serialisierungsbezogene Methode, die in einer Schnittstelle als nicht privat deklariert ist, verhindert,\ndass Klassen, die die Schnittstelle implementieren, die Methode als privat deklarieren
 
-compiler.warn.default.ineffective=Serialisierungsbezogene Standardmethode aus einer Schnittstelle wird nicht von der Serialisierung f\u00FCr eine implementierende Klasse ausgef\u00FChrt
+compiler.warn.default.ineffective=Serialisierungsbezogene Standardmethode aus einer Schnittstelle wird nicht von der Serialisierung für eine implementierende Klasse ausgeführt
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.warn.potentially.ambiguous.overload={0} in {1} ist m\u00F6glicherweise mehrdeutig mit {2} in {3}
+compiler.warn.potentially.ambiguous.overload={0} in {1} ist möglicherweise mehrdeutig mit {2} in {3}
 
 # 0: message segment
-compiler.warn.override.varargs.missing={0}. Au\u00DFer Kraft gesetzte Methode umfasst kein "..."
+compiler.warn.override.varargs.missing={0}. Außer Kraft gesetzte Methode umfasst kein "..."
 
 # 0: message segment
-compiler.warn.override.varargs.extra={0}. In au\u00DFer Kraft setzender Methode fehlt "..."
+compiler.warn.override.varargs.extra={0}. In außer Kraft setzender Methode fehlt "..."
 
 # 0: message segment
-compiler.warn.override.bridge={0}. Au\u00DFer Kraft setzende Methode ist eine Bridgemethode
+compiler.warn.override.bridge={0}. Außer Kraft setzende Methode ist eine Bridgemethode
 
 # 0: symbol
-compiler.warn.pkg-info.already.seen=Die Datei package-info.java wurde bereits f\u00FCr Package {0} gefunden
+compiler.warn.pkg-info.already.seen=Die Datei package-info.java wurde bereits für Package {0} gefunden
 
 # 0: path
-compiler.warn.path.element.not.found=Ung\u00FCltiges Pfadelement "{0}": Datei oder Verzeichnis nicht vorhanden
+compiler.warn.path.element.not.found=Ungültiges Pfadelement "{0}": Datei oder Verzeichnis nicht vorhanden
 
-compiler.warn.possible.fall-through.into.case=M\u00F6glicher Fallthrough in Case
+compiler.warn.possible.fall-through.into.case=Möglicher Fallthrough in Case
 
 # 0: type
 compiler.warn.redundant.cast=Redundantes Casting in {0}
 
 # 0: number
-compiler.warn.position.overflow=Positionscodierungs\u00FCberlauf bei Zeile {0}
+compiler.warn.position.overflow=Positionscodierungsüberlauf bei Zeile {0}
 
 # 0: file name, 1: number, 2: number
-compiler.warn.big.major.version={0}: Hauptversion {1} ist neuer als {2}, die h\u00F6chste Hauptversion, die von diesem Compiler unterst\u00FCtzt wird.\nEs wird empfohlen, dass Sie den Compiler upgraden.
+compiler.warn.big.major.version={0}: Hauptversion {1} ist neuer als {2}, die höchste Hauptversion, die von diesem Compiler unterstützt wird.\nEs wird empfohlen, dass Sie den Compiler upgraden.
 
 # 0: file name, 1: fragment
-compiler.warn.invalid.utf8.in.classfile={0}: Klassendatei enth\u00E4lt ung\u00FCltige UTF-8-Codierung: {1}
+compiler.warn.invalid.utf8.in.classfile={0}: Klassendatei enthält ungültige UTF-8-Codierung: {1}
 
 # 0: kind name, 1: symbol
 compiler.warn.static.not.qualified.by.type=Statische {0} muss mit Typname {1} anstelle eines Ausdrucks qualifiziert werden
@@ -1511,111 +1511,111 @@ compiler.warn.source.no.bootclasspath=Bootstrap Classpath nicht zusammen mit -so
 compiler.warn.source.no.system.modules.path=Systemmodulpfad nicht zusammen mit -source {0} festgelegt
 
 # 0: string
-compiler.warn.option.obsolete.source=Quellwert {0} ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt
+compiler.warn.option.obsolete.source=Quellwert {0} ist veraltet und wird in einem zukünftigen Release entfernt
 
 # 0: target
-compiler.warn.option.obsolete.target=Zielwert {0} ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt
+compiler.warn.option.obsolete.target=Zielwert {0} ist veraltet und wird in einem zukünftigen Release entfernt
 
 # 0: string, 1: string
-compiler.err.option.removed.source=Quelloption {0} wird nicht mehr unterst\u00FCtzt. Verwenden Sie {1} oder h\u00F6her.
+compiler.err.option.removed.source=Quelloption {0} wird nicht mehr unterstützt. Verwenden Sie {1} oder höher.
 
 # 0: target, 1: target
-compiler.err.option.removed.target=Zieloption {0} wird nicht mehr unterst\u00FCtzt. Verwenden Sie {1} oder h\u00F6her.
+compiler.err.option.removed.target=Zieloption {0} wird nicht mehr unterstützt. Verwenden Sie {1} oder höher.
 
-compiler.warn.option.obsolete.suppression=Verwenden Sie -Xlint:-options, um Warnungen zu veralteten Optionen zu unterdr\u00FCcken.
+compiler.warn.option.obsolete.suppression=Verwenden Sie -Xlint:-options, um Warnungen zu veralteten Optionen zu unterdrücken.
 
 # 0: name, 1: number, 2: number, 3: number, 4: number
-compiler.warn.future.attr={0}-Attribut, das in Klassendateien der Version {1}.{2} eingef\u00FChrt wurde, wird in Klassendateien der Version {3}.{4} ignoriert
+compiler.warn.future.attr={0}-Attribut, das in Klassendateien der Version {1}.{2} eingeführt wurde, wird in Klassendateien der Version {3}.{4} ignoriert
 
-compiler.warn.requires.automatic=Erfordert Direktive f\u00FCr ein automatisches Modul
+compiler.warn.requires.automatic=Erfordert Direktive für ein automatisches Modul
 
-compiler.warn.requires.transitive.automatic=Erfordert transitive-Direktive f\u00FCr ein automatisches Modul
+compiler.warn.requires.transitive.automatic=Erfordert transitive-Direktive für ein automatisches Modul
 
 # Warnings related to annotation processing
 # 0: string
 compiler.warn.proc.package.does.not.exist=Package {0} ist nicht vorhanden
 
 # 0: string
-compiler.warn.proc.file.reopening=Versuch, mehrmals eine Datei f\u00FCr "{0}" zu erstellen
+compiler.warn.proc.file.reopening=Versuch, mehrmals eine Datei für "{0}" zu erstellen
 
 # 0: string
-compiler.warn.proc.type.already.exists=Es ist bereits eine Datei f\u00FCr Typ "{0}" im Quellpfad oder Classpath vorhanden
+compiler.warn.proc.type.already.exists=Es ist bereits eine Datei für Typ "{0}" im Quellpfad oder Classpath vorhanden
 
 # 0: string
-compiler.warn.proc.type.recreate=Versuch, mehrmals eine Datei f\u00FCr Typ "{0}" zu erstellen
+compiler.warn.proc.type.recreate=Versuch, mehrmals eine Datei für Typ "{0}" zu erstellen
 
 # 0: string
-compiler.warn.proc.illegal.file.name=Datei kann nicht f\u00FCr unzul\u00E4ssigen Namen "{0}" erstellt werden.
+compiler.warn.proc.illegal.file.name=Datei kann nicht für unzulässigen Namen "{0}" erstellt werden.
 
 # 0: string, 1: string
-compiler.warn.proc.suspicious.class.name=Datei f\u00FCr einen Typ, dessen Name mit {1} endet, wird erstellt: "{0}"
+compiler.warn.proc.suspicious.class.name=Datei für einen Typ, dessen Name mit {1} endet, wird erstellt: "{0}"
 
 # 0: string
-compiler.warn.proc.file.create.last.round=Datei f\u00FCr Typ "{0}", die in der letzten Runde erstellt wurde, wird keiner Annotationsverarbeitung unterzogen.
+compiler.warn.proc.file.create.last.round=Datei für Typ "{0}", die in der letzten Runde erstellt wurde, wird keiner Annotationsverarbeitung unterzogen.
 
 # 0: string, 1: string
-compiler.warn.proc.malformed.supported.string=Nicht wohlgeformte Zeichenfolge "{0}" f\u00FCr eine unterst\u00FCtzte Annotationsschnittstelle von Prozessor "{1}" zur\u00FCckgegeben
+compiler.warn.proc.malformed.supported.string=Nicht wohlgeformte Zeichenfolge "{0}" für eine unterstützte Annotationsschnittstelle von Prozessor "{1}" zurückgegeben
 
 # 0: set of string
 compiler.warn.proc.annotations.without.processors=Diese Annotationen wurden von keinem Prozessor beansprucht: {0}
 
 # 0: source version, 1: string, 2: string
-compiler.warn.proc.processor.incompatible.source.version=Unterst\u00FCtzte Quellversion "{0}" von Annotationsprozessor "{1}" kleiner als -source "{2}"
+compiler.warn.proc.processor.incompatible.source.version=Unterstützte Quellversion "{0}" von Annotationsprozessor "{1}" kleiner als -source "{2}"
 
 # 0: string, 1: string
-compiler.warn.proc.duplicate.option.name=Doppelte unterst\u00FCtzte Option "{0}" von Annotationsprozessor "{1}" zur\u00FCckgegeben
+compiler.warn.proc.duplicate.option.name=Doppelte unterstützte Option "{0}" von Annotationsprozessor "{1}" zurückgegeben
 
 # 0: string, 1: string
-compiler.warn.proc.duplicate.supported.annotation=Doppelte unterst\u00FCtzte Annotationsschnittstelle "{0}" von Annotationsprozessor "{1}" zur\u00FCckgegeben
+compiler.warn.proc.duplicate.supported.annotation=Doppelte unterstützte Annotationsschnittstelle "{0}" von Annotationsprozessor "{1}" zurückgegeben
 
 # 0: string
-compiler.warn.proc.redundant.types.with.wildcard=Annotationsprozessor "{0}" unterst\u00FCtzt redundant sowohl "*" als auch andere Annotationsschnittstellen
+compiler.warn.proc.redundant.types.with.wildcard=Annotationsprozessor "{0}" unterstützt redundant sowohl "*" als auch andere Annotationsschnittstellen
 
 compiler.warn.proc.proc-only.requested.no.procs=Annotationsverarbeitung ohne Kompilierung angefordert, aber keine Prozessoren gefunden.
 
-compiler.warn.proc.use.implicit=Implizit kompilierte Dateien wurden keiner Annotationsverarbeitung unterzogen.\nVerwenden Sie -implicit, um eine Policy f\u00FCr die implizite Kompilierung anzugeben.
+compiler.warn.proc.use.implicit=Implizit kompilierte Dateien wurden keiner Annotationsverarbeitung unterzogen.\nVerwenden Sie -implicit, um eine Policy für die implizite Kompilierung anzugeben.
 
-compiler.warn.proc.use.proc.or.implicit=Implizit kompilierte Dateien wurden keiner Annotationsverarbeitung unterzogen.\nVerwenden Sie -proc:none, um die Annotationsverarbeitung zu deaktivieren, oder -implicit, um eine Policy f\u00FCr die implizite Kompilierung anzugeben.
+compiler.warn.proc.use.proc.or.implicit=Implizit kompilierte Dateien wurden keiner Annotationsverarbeitung unterzogen.\nVerwenden Sie -proc:none, um die Annotationsverarbeitung zu deaktivieren, oder -implicit, um eine Policy für die implizite Kompilierung anzugeben.
 
 # Print a client-generated warning; assumed to be localized, no translation required
 # 0: string
 compiler.warn.proc.messager={0}
 
 # 0: set of string
-compiler.warn.proc.unclosed.type.files=Nicht geschlossene Dateien f\u00FCr die Typen "{0}". Diese Typen werden keiner Annotationsverarbeitung unterzogen
+compiler.warn.proc.unclosed.type.files=Nicht geschlossene Dateien für die Typen "{0}". Diese Typen werden keiner Annotationsverarbeitung unterzogen
 
 # 0: string
 compiler.warn.proc.unmatched.processor.options=Die folgenden Optionen wurden von keinem Prozessor erkannt: "{0}"
 
-compiler.warn.try.explicit.close.call=Expliziter Aufruf von close() f\u00FCr eine automatisch schlie\u00DFbare Ressource
+compiler.warn.try.explicit.close.call=Expliziter Aufruf von close() für eine automatisch schließbare Ressource
 
 # 0: symbol
-compiler.warn.try.resource.not.referenced=Automatisch schlie\u00DFbare Ressource {0} wird nie im Body der entsprechenden try-Anweisung referenziert
+compiler.warn.try.resource.not.referenced=Automatisch schließbare Ressource {0} wird nie im Body der entsprechenden try-Anweisung referenziert
 
 # 0: type
-compiler.warn.try.resource.throws.interrupted.exc=Automatisch schlie\u00DFbare Ressource {0} umfasst die Mitgliedsmethode close(), die InterruptedException ausl\u00F6sen k\u00F6nnte
+compiler.warn.try.resource.throws.interrupted.exc=Automatisch schließbare Ressource {0} umfasst die Mitgliedsmethode close(), die InterruptedException auslösen könnte
 
-compiler.warn.unchecked.assign=Nicht gepr\u00FCfte Zuweisung: {0} zu {1}
+compiler.warn.unchecked.assign=Nicht geprüfte Zuweisung: {0} zu {1}
 
 # 0: symbol, 1: type
-compiler.warn.unchecked.assign.to.var=Nicht gepr\u00FCfte Zuweisung zu Variable {0} als Mitglied des Raw-Typs {1}
+compiler.warn.unchecked.assign.to.var=Nicht geprüfte Zuweisung zu Variable {0} als Mitglied des Raw-Typs {1}
 
 # 0: symbol, 1: type
-compiler.warn.unchecked.call.mbr.of.raw.type=Nicht gepr\u00FCfter Aufruf von {0} als Mitglied des Raw-Typs {1}
+compiler.warn.unchecked.call.mbr.of.raw.type=Nicht geprüfter Aufruf von {0} als Mitglied des Raw-Typs {1}
 
-compiler.warn.unchecked.cast.to.type=Nicht gepr\u00FCftes Casting zu Typ {0}
+compiler.warn.unchecked.cast.to.type=Nicht geprüftes Casting zu Typ {0}
 
 # 0: kind name, 1: name, 2: object, 3: object, 4: kind name, 5: symbol
-compiler.warn.unchecked.meth.invocation.applied=Nicht gepr\u00FCfter Methodenaufruf: {0} {1} in {4} {5} wird auf die angegebenen Typen angewendet\nErforderlich: {2}\nErmittelt:    {3}
+compiler.warn.unchecked.meth.invocation.applied=Nicht geprüfter Methodenaufruf: {0} {1} in {4} {5} wird auf die angegebenen Typen angewendet\nErforderlich: {2}\nErmittelt:    {3}
 
 # 0: type
-compiler.warn.unchecked.generic.array.creation=Nicht gepr\u00FCfte Erstellung eines generischen Arrays f\u00FCr varargs-Parameter des Typs {0}
+compiler.warn.unchecked.generic.array.creation=Nicht geprüfte Erstellung eines generischen Arrays für varargs-Parameter des Typs {0}
 
 # 0: type
-compiler.warn.unchecked.varargs.non.reifiable.type=M\u00F6glich Heap-Besch\u00E4digung aus parametrisiertem vararg-Typ {0}
+compiler.warn.unchecked.varargs.non.reifiable.type=Möglich Heap-Beschädigung aus parametrisiertem vararg-Typ {0}
 
 # 0: symbol
-compiler.warn.varargs.unsafe.use.varargs.param=Varargs-Methode k\u00F6nnte Heap-Besch\u00E4digung aus nicht reifizierbarem varargs-Parameter {0} verursachen
+compiler.warn.varargs.unsafe.use.varargs.param=Varargs-Methode könnte Heap-Beschädigung aus nicht reifizierbarem varargs-Parameter {0} verursachen
 
 compiler.warn.missing.deprecated.annotation=Veraltetes Element ist nicht mit @Deprecated-Annotation versehen
 
@@ -1623,22 +1623,22 @@ compiler.warn.missing.deprecated.annotation=Veraltetes Element ist nicht mit @De
 compiler.warn.deprecated.annotation.has.no.effect=@Deprecated-Annotation hat keine Auswirkung auf diese {0}-Deklaration
 
 # 0: string
-compiler.warn.invalid.path=Ung\u00FCltiger Dateiname: {0}
+compiler.warn.invalid.path=Ungültiger Dateiname: {0}
 
-compiler.warn.doclint.not.available=Kein Serviceprovider f\u00FCr doclint verf\u00FCgbar
+compiler.warn.doclint.not.available=Kein Serviceprovider für doclint verfügbar
 
 # 0: string
-compiler.err.invalid.path=Ung\u00FCltiger Dateiname: {0}
+compiler.err.invalid.path=Ungültiger Dateiname: {0}
 
 
 # 0: path
 compiler.warn.invalid.archive.file=Unerwartete Datei in Pfad: {0}
 
 # 0: path
-compiler.warn.unexpected.archive.file=Unerwartete Erweiterung f\u00FCr Archivdatei: {0}
+compiler.warn.unexpected.archive.file=Unerwartete Erweiterung für Archivdatei: {0}
 
 # 0: path
-compiler.err.no.zipfs.for.archive=Kein Dateisystemprovider zur Verarbeitung dieser Datei verf\u00FCgbar: {0}
+compiler.err.no.zipfs.for.archive=Kein Dateisystemprovider zur Verarbeitung dieser Datei verfügbar: {0}
 
 compiler.warn.div.zero=Division durch Null
 
@@ -1657,11 +1657,11 @@ compiler.warn.unknown.enum.constant=Unbekannte Enum-Konstante {1}.{2}
 compiler.warn.unknown.enum.constant.reason=Unbekannte Enum-Konstante {1}.{2}\nGrund: {3}
 
 # 0: type, 1: type
-compiler.warn.raw.class.use=Raw-Typ gefunden: {0}\nTypargumente f\u00FCr generische Klasse {1} fehlen
+compiler.warn.raw.class.use=Raw-Typ gefunden: {0}\nTypargumente für generische Klasse {1} fehlen
 
 compiler.warn.diamond.redundant.args=Redundante Typargumente in neuem Ausdruck (verwenden Sie stattdessen den Rautenoperator).
 
-compiler.warn.local.redundant.type=Redundanter Typ f\u00FCr lokale Variable (ersetzen Sie den expliziten Typ durch "var").
+compiler.warn.local.redundant.type=Redundanter Typ für lokale Variable (ersetzen Sie den expliziten Typ durch "var").
 
 compiler.warn.potential.lambda.found=Die Erstellung dieser anonymen inneren Klasse kann in einen Lambda-Ausdruck umgewandelt werden.
 
@@ -1671,10 +1671,10 @@ compiler.warn.method.redundant.typeargs=Redundante Typargumente in Methodenaufru
 compiler.warn.varargs.redundant.trustme.anno=Redundante {0}-Annotation. {1}
 
 # 0: symbol
-compiler.warn.access.to.member.from.serializable.element=Zugriff auf Mitglied {0} aus serialisierbarem Element kann \u00F6ffentlich f\u00FCr nicht vertrauensw\u00FCrdigen Code zug\u00E4nglich sein
+compiler.warn.access.to.member.from.serializable.element=Zugriff auf Mitglied {0} aus serialisierbarem Element kann öffentlich für nicht vertrauenswürdigen Code zugänglich sein
 
 # 0: symbol
-compiler.warn.access.to.member.from.serializable.lambda=Zugriff auf Mitglied {0} aus serialisierbarem Lambda kann \u00F6ffentlich f\u00FCr nicht vertrauensw\u00FCrdigen Code zug\u00E4nglich sein
+compiler.warn.access.to.member.from.serializable.lambda=Zugriff auf Mitglied {0} aus serialisierbarem Lambda kann öffentlich für nicht vertrauenswürdigen Code zugänglich sein
 
 #####
 
@@ -1694,7 +1694,7 @@ compiler.misc.token.float=<Float>
 
 compiler.misc.token.double=<Double>
 
-compiler.misc.token.bad-symbol=<ung\u00FCltiges Symbol>
+compiler.misc.token.bad-symbol=<ungültiges Symbol>
 
 compiler.misc.token.end-of-input=<Ende der Eingabe>
 
@@ -1728,9 +1728,9 @@ compiler.err.enum.constant.expected=Hier wird eine Enum-Konstante erwartet
 
 compiler.err.enum.constant.not.expected=Hier wird keine Enum-Konstante erwartet
 
-compiler.err.extraneous.semicolon=\u00DCberfl\u00FCssiges Semikolon
+compiler.err.extraneous.semicolon=Überflüssiges Semikolon
 
-compiler.warn.extraneous.semicolon=\u00DCberfl\u00FCssiges Semikolon
+compiler.warn.extraneous.semicolon=Überflüssiges Semikolon
 
 ## The following are related in form, but do not easily fit the above paradigm.
 compiler.err.expected.module.or.open="module" oder "open" erwartet
@@ -1761,65 +1761,65 @@ compiler.misc.unnamed.module=Unbenanntes Modul
 compiler.err.cant.access=Kein Zugriff auf {0}\n{1}
 
 # 0: name
-compiler.misc.bad.class.file=Klassendatei ist ung\u00FCltig f\u00FCr Klasse {0}
+compiler.misc.bad.class.file=Klassendatei ist ungültig für Klasse {0}
 
 # 0: file name, 1: string (expected constant pool entry type), 2: number (constant pool index)
-compiler.misc.bad.const.pool.entry=Ung\u00FCltiger Konstantenpooleintrag in {0}\n{1} bei Index {2} erwartet
+compiler.misc.bad.const.pool.entry=Ungültiger Konstantenpooleintrag in {0}\n{1} bei Index {2} erwartet
 
 # 0: file name, 1: number (constant pool index), 2: number (constant pool size)
-compiler.misc.bad.const.pool.index=Ung\u00FCltiger Konstantenpoolindex in {0}\nIndex {1} liegt nicht innerhalb der Poolgr\u00F6\u00DFe {2}.
+compiler.misc.bad.const.pool.index=Ungültiger Konstantenpoolindex in {0}\nIndex {1} liegt nicht innerhalb der Poolgröße {2}.
 
 # 0: file name, 1: message segment
-compiler.misc.bad.class.file.header=Ung\u00FCltige Klassendatei: {0}\n{1}\nEntfernen Sie die Datei, oder stellen Sie sicher, dass sie im richtigen Unterverzeichnis des Classpath vorhanden ist.
+compiler.misc.bad.class.file.header=Ungültige Klassendatei: {0}\n{1}\nEntfernen Sie die Datei, oder stellen Sie sicher, dass sie im richtigen Unterverzeichnis des Classpath vorhanden ist.
 
 # 0: file name, 1: message segment
-compiler.misc.bad.source.file.header=Ung\u00FCltige Quelldatei: {0}\n{1}\nEntfernen Sie die Datei, oder stellen Sie sicher, dass sie im richtigen Unterverzeichnis des Quellpfades vorhanden ist.
+compiler.misc.bad.source.file.header=Ungültige Quelldatei: {0}\n{1}\nEntfernen Sie die Datei, oder stellen Sie sicher, dass sie im richtigen Unterverzeichnis des Quellpfades vorhanden ist.
 
 ## The following are all possible strings for the second argument ({1}) of the
 ## above strings.
-compiler.misc.bad.class.signature=Ung\u00FCltige Klassensignatur: {0}
+compiler.misc.bad.class.signature=Ungültige Klassensignatur: {0}
 
 #0: symbol, 1: symbol
-compiler.misc.bad.enclosing.class=Ung\u00FCltige einschlie\u00DFende Klasse f\u00FCr {0}: {1}
+compiler.misc.bad.enclosing.class=Ungültige einschließende Klasse für {0}: {1}
 
 # 0: symbol
-compiler.misc.bad.enclosing.method=Ung\u00FCltiges einschlie\u00DFendes Methodenattribut f\u00FCr Klasse {0}
+compiler.misc.bad.enclosing.method=Ungültiges einschließendes Methodenattribut für Klasse {0}
 
-compiler.misc.bad.runtime.invisible.param.annotations=Ung\u00FCltiges RuntimeInvisibleParameterAnnotations-Attribut: {0}
+compiler.misc.bad.runtime.invisible.param.annotations=Ungültiges RuntimeInvisibleParameterAnnotations-Attribut: {0}
 
-compiler.misc.bad.const.pool.tag=Ung\u00FCltiges Konstantenpooltag: {0}
+compiler.misc.bad.const.pool.tag=Ungültiges Konstantenpooltag: {0}
 
-compiler.misc.bad.const.pool.tag.at=Ung\u00FCltiges Konstantenpooltag {0} bei {1}
+compiler.misc.bad.const.pool.tag.at=Ungültiges Konstantenpooltag {0} bei {1}
 
 # 0: number
-compiler.misc.bad.utf8.byte.sequence.at=Ung\u00FCltige UTF-8-Bytesequenz bei {0}
+compiler.misc.bad.utf8.byte.sequence.at=Ungültige UTF-8-Bytesequenz bei {0}
 
 compiler.misc.unexpected.const.pool.tag.at=Unerwartetes Konstantenpooltag {0} bei {1}
 
 # 0: number
 compiler.misc.bad.class.truncated.at.offset=Klassendatei abgeschnitten bei Offset {0}
 
-compiler.misc.bad.signature=Ung\u00FCltige Signatur: {0}
+compiler.misc.bad.signature=Ungültige Signatur: {0}
 
-compiler.misc.bad.type.annotation.value=Ung\u00FCltiger Typ f\u00FCr Annotationszielwert: {0}
+compiler.misc.bad.type.annotation.value=Ungültiger Typ für Annotationszielwert: {0}
 
-compiler.misc.bad.module-info.name=Ung\u00FCltiger Klassenname
+compiler.misc.bad.module-info.name=Ungültiger Klassenname
 
-compiler.misc.class.file.wrong.class=Klassendatei enth\u00E4lt falsche Klasse: {0}
+compiler.misc.class.file.wrong.class=Klassendatei enthält falsche Klasse: {0}
 
-compiler.misc.module.info.invalid.super.class=module-info mit ung\u00FCltiger Superklasse
+compiler.misc.module.info.invalid.super.class=module-info mit ungültiger Superklasse
 
 # 0: name
-compiler.misc.class.file.not.found=Klassendatei f\u00FCr {0} nicht gefunden
+compiler.misc.class.file.not.found=Klassendatei für {0} nicht gefunden
 
 # 0: string (constant value), 1: symbol (constant field), 2: type (field type)
-compiler.misc.bad.constant.range=Konstantenwert "{0}" f\u00FCr {1} liegt au\u00DFerhalb des erwarteten Bereichs f\u00FCr {2}
+compiler.misc.bad.constant.range=Konstantenwert "{0}" für {1} liegt außerhalb des erwarteten Bereichs für {2}
 
 # 0: string (constant value), 1: symbol (constant field), 2: string (expected class)
-compiler.misc.bad.constant.value=Ung\u00FCltiger Konstantenwert "{0}" f\u00FCr {1}. {2} erwartet
+compiler.misc.bad.constant.value=Ungültiger Konstantenwert "{0}" für {1}. {2} erwartet
 
 # 0: type (field type)
-compiler.misc.bad.constant.value.type=Variable des Typs "{0}" darf keinen Konstantenwert aufweisen, aber es wurde einer f\u00FCr sie angegeben
+compiler.misc.bad.constant.value.type=Variable des Typs "{0}" darf keinen Konstantenwert aufweisen, aber es wurde einer für sie angegeben
 
 # 0: string (classfile major version), 1: string (classfile minor version)
 compiler.misc.invalid.default.interface=Standardmethode in Klassendatei der Version {0}.{1} gefunden
@@ -1833,34 +1833,34 @@ compiler.misc.anachronistic.module.info=Moduldeklaration in Klassendatei der Ver
 compiler.misc.module.info.definition.expected=module-info-Definition erwartet
 
 # 0: name
-compiler.misc.file.doesnt.contain.class=Datei enth\u00E4lt nicht Klasse {0}
+compiler.misc.file.doesnt.contain.class=Datei enthält nicht Klasse {0}
 
 # 0: symbol
-compiler.misc.file.does.not.contain.package=Datei enth\u00E4lt nicht Package {0}
+compiler.misc.file.does.not.contain.package=Datei enthält nicht Package {0}
 
-compiler.misc.file.does.not.contain.module=Datei enth\u00E4lt keine Moduldeklaration
+compiler.misc.file.does.not.contain.module=Datei enthält keine Moduldeklaration
 
-compiler.misc.illegal.start.of.class.file=Unzul\u00E4ssiger Klassendateibeginn
+compiler.misc.illegal.start.of.class.file=Unzulässiger Klassendateibeginn
 
 # 0: name
-compiler.misc.method.descriptor.invalid=Methodendeskriptor ung\u00FCltig f\u00FCr {0}
+compiler.misc.method.descriptor.invalid=Methodendeskriptor ungültig für {0}
 
-compiler.misc.unable.to.access.file=Zugriff auf Datei nicht m\u00F6glich: {0}
+compiler.misc.unable.to.access.file=Zugriff auf Datei nicht möglich: {0}
 
-compiler.misc.unicode.str.not.supported=Unicode-Zeichenfolge wird in Klassendatei nicht unterst\u00FCtzt
+compiler.misc.unicode.str.not.supported=Unicode-Zeichenfolge wird in Klassendatei nicht unterstützt
 
 compiler.misc.undecl.type.var=Nicht deklarierte Typvariable: {0}
 
-compiler.misc.malformed.vararg.method=Klassendatei enth\u00E4lt nicht wohlgeformte Methode mit variabler Argumentanzahl: {0}
+compiler.misc.malformed.vararg.method=Klassendatei enthält nicht wohlgeformte Methode mit variabler Argumentanzahl: {0}
 
 compiler.misc.wrong.version=Klassendatei hat die falsche Version {0}.{1}. Sie muss {2}.{3} lauten
 
-compiler.misc.illegal.flag.combo=Klassendatei enth\u00E4lt unzul\u00E4ssige Kennzeichenkombination {0} f\u00FCr {1} {2}
+compiler.misc.illegal.flag.combo=Klassendatei enthält unzulässige Kennzeichenkombination {0} für {1} {2}
 
 #####
 
 # 0: type, 1: type or symbol
-compiler.err.not.within.bounds=Typargument {0} liegt nicht innerhalb des g\u00FCltigen Bereichs von Typvariable {1}
+compiler.err.not.within.bounds=Typargument {0} liegt nicht innerhalb des gültigen Bereichs von Typvariable {1}
 
 ## The following are all possible strings for the second argument ({1}) of the
 ## above string.
@@ -1885,18 +1885,18 @@ compiler.misc.inconvertible.types={0} kann nicht in {1} konvertiert werden
 compiler.misc.not.applicable.types=Muster des Typs {1} ist bei {0} nicht anwendbar
 
 # 0: type, 1: type
-compiler.misc.possible.loss.of.precision=M\u00F6glicher Verlust bei Konvertierung von {0} in {1}
+compiler.misc.possible.loss.of.precision=Möglicher Verlust bei Konvertierung von {0} in {1}
 
 # 0: type, 1: type
-compiler.warn.possible.loss.of.precision=M\u00F6glicher Verlust eines impliziten Cast von {0} bis {1} in zusammengesetzter Zuweisung
+compiler.warn.possible.loss.of.precision=Möglicher Verlust eines impliziten Cast von {0} bis {1} in zusammengesetzter Zuweisung
 
-compiler.misc.unchecked.assign=Nicht gepr\u00FCfte Konvertierung
+compiler.misc.unchecked.assign=Nicht geprüfte Konvertierung
 
 # compiler.misc.storecheck=\
 #     assignment might cause later store checks to fail
 # compiler.misc.unchecked=\
 #     assigned array cannot dynamically check its stores
-compiler.misc.unchecked.cast.to.type=Nicht gepr\u00FCftes Casting
+compiler.misc.unchecked.cast.to.type=Nicht geprüftes Casting
 
 # compiler.err.star.expected=\
 #     ''*'' expected
@@ -1932,10 +1932,10 @@ compiler.misc.type.parameter=Typparameter {0}
 ## diagnostics whose key ends in ".1"
 
 # 0: type, 1: list of type
-compiler.misc.no.unique.maximal.instance.exists=Keine eindeutige maximale Instanz f\u00FCr Typvariable {0} mit oberen Grenzwerten {1} vorhanden
+compiler.misc.no.unique.maximal.instance.exists=Keine eindeutige maximale Instanz für Typvariable {0} mit oberen Grenzwerten {1} vorhanden
 
 # 0: type, 1: list of type
-compiler.misc.no.unique.minimal.instance.exists=Keine eindeutige minimale Instanz f\u00FCr Typvariable {0} mit unteren Grenzwerten {1} vorhanden
+compiler.misc.no.unique.minimal.instance.exists=Keine eindeutige minimale Instanz für Typvariable {0} mit unteren Grenzwerten {1} vorhanden
 
 # 0: type, 1: list of type
 compiler.misc.incompatible.upper.bounds=Inferenzvariable {0} hat inkompatible obere Grenzwerte {1}
@@ -1959,13 +1959,13 @@ compiler.misc.upper.bounds=Obere Grenzen: {0}
 compiler.misc.infer.no.conforming.instance.exists=Keine Instanzen von Typvariablen {0} vorhanden, sodass {1} {2} entspricht
 
 # 0: list of type, 1: message segment
-compiler.misc.infer.no.conforming.assignment.exists=Typvariable(n) {0} nicht ableitbar\n(nicht \u00FCbereinstimmende Argumente; {1})
+compiler.misc.infer.no.conforming.assignment.exists=Typvariable(n) {0} nicht ableitbar\n(nicht übereinstimmende Argumente; {1})
 
 # 0: list of type
-compiler.misc.infer.arg.length.mismatch=Typvariable(n) {0} nicht ableitbar\n(Liste der tats\u00E4chlichen Argumente hat eine andere L\u00E4nge als die der formalen Argumente)
+compiler.misc.infer.arg.length.mismatch=Typvariable(n) {0} nicht ableitbar\n(Liste der tatsächlichen Argumente hat eine andere Länge als die der formalen Argumente)
 
 # 0: list of type, 1: message segment
-compiler.misc.infer.varargs.argument.mismatch=Typvariable(n) {0} nicht ableitbar\n(nicht \u00FCbereinstimmende varargs, {1})
+compiler.misc.infer.varargs.argument.mismatch=Typvariable(n) {0} nicht ableitbar\n(nicht übereinstimmende varargs, {1})
 
 # 0: type, 1: list of type
 compiler.misc.inferred.do.not.conform.to.upper.bounds=Abgeleiteter Typ entspricht nicht den oberen Grenzwerten\nAbgeleitet: {0}\nObere Grenzwerte: {1}
@@ -1983,34 +1983,34 @@ compiler.misc.diamond={0}<>
 compiler.misc.diamond.non.generic="<>" kann nicht mit der nicht generischen Klasse {0} verwendet werden
 
 # 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.arg=Typargument {0}, das f\u00FCr {1} abgeleitet wurde, ist in diesem Kontext nicht zul\u00E4ssig\nDas abgeleitete Argument kann nicht im Signaturattribut ausgedr\u00FCckt werden
+compiler.misc.diamond.invalid.arg=Typargument {0}, das für {1} abgeleitet wurde, ist in diesem Kontext nicht zulässig\nDas abgeleitete Argument kann nicht im Signaturattribut ausgedrückt werden
 
 # 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.args=Typargumente {0}, die f\u00FCr {1} abgeleitet wurden, sind in diesem Kontext nicht zul\u00E4ssig\nAbgeleitete Argumente k\u00F6nnen nicht im Signaturattribut ausgedr\u00FCckt werden
+compiler.misc.diamond.invalid.args=Typargumente {0}, die für {1} abgeleitet wurden, sind in diesem Kontext nicht zulässig\nAbgeleitete Argumente können nicht im Signaturattribut ausgedrückt werden
 
 # 0: type
-compiler.misc.diamond.and.explicit.params="<>" kann nicht mit expliziten Typparametern f\u00FCr Konstruktor verwendet werden
+compiler.misc.diamond.and.explicit.params="<>" kann nicht mit expliziten Typparametern für Konstruktor verwendet werden
 
-compiler.misc.mref.infer.and.explicit.params=Raw-Konstruktorreferenz kann nicht mit expliziten Typparametern f\u00FCr Konstruktor verwendet werden
+compiler.misc.mref.infer.and.explicit.params=Raw-Konstruktorreferenz kann nicht mit expliziten Typparametern für Konstruktor verwendet werden
 
 # 0: type, 1: list of type
 compiler.misc.explicit.param.do.not.conform.to.bounds=Explizites Typargument {0} entspricht nicht den deklarierten Grenzwerten {1}
 
-compiler.misc.arg.length.mismatch=Liste der tats\u00E4chlichen Argumente hat eine andere L\u00E4nge als die der formalen Argumente
+compiler.misc.arg.length.mismatch=Liste der tatsächlichen Argumente hat eine andere Länge als die der formalen Argumente
 
 # 0: string
 compiler.misc.wrong.number.type.args=Falsche Anzahl Typargumente. {0} erforderlich
 
 # 0: message segment
-compiler.misc.no.conforming.assignment.exists=Keine \u00FCbereinstimmenden Argumente, {0}
+compiler.misc.no.conforming.assignment.exists=Keine übereinstimmenden Argumente, {0}
 
 # 0: message segment
-compiler.misc.varargs.argument.mismatch=Keine \u00FCbereinstimmenden varargs; {0}
+compiler.misc.varargs.argument.mismatch=Keine übereinstimmenden varargs; {0}
 
 #####
 
 # 0: symbol or type, 1: file name
-compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file=Auf Auxiliary-Klasse {0} in {1} darf nicht von au\u00DFerhalb der eigenen Quelldatei zugegriffen werden
+compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file=Auf Auxiliary-Klasse {0} in {1} darf nicht von außerhalb der eigenen Quelldatei zugegriffen werden
 
 ## The first argument ({0}) is a "kindname".
 # 0: kind name, 1: symbol, 2: symbol
@@ -2128,13 +2128,13 @@ compiler.misc.kindname.record=Datensatz
 compiler.misc.no.args=keine Argumente
 
 # 0: message segment
-compiler.err.override.static={0}\nAu\u00DFer Kraft setzende Methode ist statisch
+compiler.err.override.static={0}\nAußer Kraft setzende Methode ist statisch
 
 # 0: message segment, 1: set of flag
-compiler.err.override.meth={0}\nAu\u00DFer Kraft gesetzte Methode ist {1}
+compiler.err.override.meth={0}\nAußer Kraft gesetzte Methode ist {1}
 
 # 0: message segment, 1: type
-compiler.err.override.meth.doesnt.throw={0}\nAu\u00DFer Kraft gesetzte Methode l\u00F6st nicht {1} aus
+compiler.err.override.meth.doesnt.throw={0}\nAußer Kraft gesetzte Methode löst nicht {1} aus
 
 # In the following string {1} is a space separated list of Java Keywords, as
 # they would have been declared in the source code
@@ -2142,21 +2142,21 @@ compiler.err.override.meth.doesnt.throw={0}\nAu\u00DFer Kraft gesetzte Methode l
 compiler.err.override.weaker.access={0}\nVersuch, niedrigere Zugriffsberechtigungen zuzuweisen. War {1}
 
 # 0: message segment, 1: type, 2: type
-compiler.err.override.incompatible.ret={0}\nR\u00FCckgabetyp {1} ist nicht mit {2} kompatibel
+compiler.err.override.incompatible.ret={0}\nRückgabetyp {1} ist nicht mit {2} kompatibel
 
 # 0: message segment, 1: type, 2: type
-compiler.warn.override.unchecked.ret={0}\nR\u00FCckgabetyp erfordert eine nicht gepr\u00FCfte Konvertierung von {1} in {2}
+compiler.warn.override.unchecked.ret={0}\nRückgabetyp erfordert eine nicht geprüfte Konvertierung von {1} in {2}
 
 # 0: message segment, 1: type
-compiler.warn.override.unchecked.thrown={0}\nAu\u00DFer Kraft gesetzte Methode l\u00F6st nicht {1} aus
+compiler.warn.override.unchecked.thrown={0}\nAußer Kraft gesetzte Methode löst nicht {1} aus
 
 # 0: symbol
-compiler.warn.override.equals.but.not.hashcode=Klasse {0} setzt Gleichwertige au\u00DFer Kraft. hashCode-Methode wird aber weder von der Klasse noch einer Superklasse au\u00DFer Kraft gesetzt
+compiler.warn.override.equals.but.not.hashcode=Klasse {0} setzt Gleichwertige außer Kraft. hashCode-Methode wird aber weder von der Klasse noch einer Superklasse außer Kraft gesetzt
 
 ## The following are all possible strings for the first argument ({0}) of the
 ## above strings.
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.cant.override={0} in {1} kann nicht {2} in {3} au\u00DFer Kraft setzen
+compiler.misc.cant.override={0} in {1} kann nicht {2} in {3} außer Kraft setzen
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
 compiler.misc.cant.hide={0} in {1} kann nicht {2} in {3} ausblenden
@@ -2168,22 +2168,22 @@ compiler.misc.cant.implement={0} in {1} kann nicht {2} in {3} implementieren
 compiler.misc.clashes.with={0} in {1} steht mit {2} in {3} in Konflikt
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.unchecked.override={0} in {1} setzt {2} in {3} au\u00DFer Kraft
+compiler.misc.unchecked.override={0} in {1} setzt {2} in {3} außer Kraft
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
 compiler.misc.unchecked.implement={0} in {1} implementiert {2} in {3}
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.unchecked.clash.with={0} in {1} setzt {2} in {3} au\u00DFer Kraft
+compiler.misc.unchecked.clash.with={0} in {1} setzt {2} in {3} außer Kraft
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.varargs.override={0} in {1} setzt {2} in {3} au\u00DFer Kraft
+compiler.misc.varargs.override={0} in {1} setzt {2} in {3} außer Kraft
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
 compiler.misc.varargs.implement={0} in {1} implementiert {2} in {3}
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.varargs.clash.with={0} in {1} setzt {2} in {3} au\u00DFer Kraft
+compiler.misc.varargs.clash.with={0} in {1} setzt {2} in {3} außer Kraft
 
 # 0: kind name, 1: symbol, 2: symbol, 3: message segment
 compiler.misc.inapplicable.method={0} {1}.{2} ist nicht anwendbar\n({3})
@@ -2195,34 +2195,34 @@ compiler.misc.inapplicable.method={0} {1}.{2} ist nicht anwendbar\n({3})
 ########################################
 
 # 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.err.feature.not.supported.in.source={0} wird in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
+compiler.err.feature.not.supported.in.source={0} wird in -source {1} nicht unterstützt\n(Verwenden Sie -source {2} oder höher, um {0} zu aktivieren)
 
 # 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.err.feature.not.supported.in.source.plural={0} werden in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
+compiler.err.feature.not.supported.in.source.plural={0} werden in -source {1} nicht unterstützt\n(Verwenden Sie -source {2} oder höher, um {0} zu aktivieren)
 
 # 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.misc.feature.not.supported.in.source={0} wird in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
+compiler.misc.feature.not.supported.in.source={0} wird in -source {1} nicht unterstützt\n(Verwenden Sie -source {2} oder höher, um {0} zu aktivieren)
 
 # 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.misc.feature.not.supported.in.source.plural={0} werden in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
+compiler.misc.feature.not.supported.in.source.plural={0} werden in -source {1} nicht unterstützt\n(Verwenden Sie -source {2} oder höher, um {0} zu aktivieren)
 
 # 0: message segment (feature)
-compiler.err.preview.feature.disabled={0} ist ein Vorschaufeature, das standardm\u00E4\u00DFig deaktiviert ist.\n(Verwenden Sie --enable-preview, um {0} zu aktivieren)
+compiler.err.preview.feature.disabled={0} ist ein Vorschaufeature, das standardmäßig deaktiviert ist.\n(Verwenden Sie --enable-preview, um {0} zu aktivieren)
 
 # 0: message segment (feature)
-compiler.err.preview.feature.disabled.plural={0} sind ein Vorschaufeature, das standardm\u00E4\u00DFig deaktiviert ist.\n(Verwenden Sie --enable-preview, um {0} zu aktivieren)
+compiler.err.preview.feature.disabled.plural={0} sind ein Vorschaufeature, das standardmäßig deaktiviert ist.\n(Verwenden Sie --enable-preview, um {0} zu aktivieren)
 
 # 0: file object (classfile), 1: string (expected version)
-compiler.err.preview.feature.disabled.classfile=Klassendatei f\u00FCr {0} verwendet Vorschaufeatures von Java SE {1}.\n(Verwenden Sie --enable-preview, um das Laden von Klassendateien mit Vorschaufeatures zu erm\u00F6glichen)
+compiler.err.preview.feature.disabled.classfile=Klassendatei für {0} verwendet Vorschaufeatures von Java SE {1}.\n(Verwenden Sie --enable-preview, um das Laden von Klassendateien mit Vorschaufeatures zu ermöglichen)
 
 # 0: message segment (feature)
-compiler.warn.preview.feature.use={0} ist ein Vorschaufeature, das in einem zuk\u00FCnftigen Release entfernt werden kann.
+compiler.warn.preview.feature.use={0} ist ein Vorschaufeature, das in einem zukünftigen Release entfernt werden kann.
 
 # 0: message segment (feature)
-compiler.warn.preview.feature.use.plural={0} sind ein Vorschaufeature, das in einem zuk\u00FCnftigen Release entfernt werden kann.
+compiler.warn.preview.feature.use.plural={0} sind ein Vorschaufeature, das in einem zukünftigen Release entfernt werden kann.
 
 # 0: file object (classfile), 1: string (expected version)
-compiler.warn.preview.feature.use.classfile=Klassendatei f\u00FCr {0} verwendet Vorschaufeatures von Java SE {1}.
+compiler.warn.preview.feature.use.classfile=Klassendatei für {0} verwendet Vorschaufeatures von Java SE {1}.
 
 compiler.misc.feature.modules=Module
 
@@ -2232,13 +2232,13 @@ compiler.misc.feature.var.in.try.with.resources=Variablen in try-with-resources
 
 compiler.misc.feature.private.intf.methods=Private Schnittstellenmethoden
 
-compiler.misc.feature.text.blocks=Textbl\u00F6cke
+compiler.misc.feature.text.blocks=Textblöcke
 
 compiler.misc.feature.multiple.case.labels=Mehrere CASE-Labels
 
 compiler.misc.feature.switch.rules=Switch-Regeln
 
-compiler.misc.feature.switch.expressions=Switch-Ausdr\u00FCcke
+compiler.misc.feature.switch.expressions=Switch-Ausdrücke
 
 compiler.misc.feature.var.syntax.in.implicit.lambda=var-Syntax in impliziten Lambdas
 
@@ -2250,9 +2250,9 @@ compiler.misc.feature.deconstruction.patterns=Dekonstruktionsmuster
 
 compiler.misc.feature.unnamed.variables=Unbenannte Variablen
 
-compiler.misc.feature.records=Datens\u00E4tze
+compiler.misc.feature.records=Datensätze
 
-compiler.misc.feature.sealed.classes=Verschl\u00FCsselte Klassen
+compiler.misc.feature.sealed.classes=Verschlüsselte Klassen
 
 compiler.misc.feature.case.null=Null in Switch Cases
 
@@ -2264,22 +2264,22 @@ compiler.misc.feature.unconditional.patterns.in.instanceof=Nicht bedingte Muster
 
 compiler.misc.feature.unnamed.classes=Unbenannte Klassen
 
-compiler.warn.underscore.as.identifier=Ab Release 9 ist "_" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
+compiler.warn.underscore.as.identifier=Ab Release 9 ist "_" ein Schlüsselwort und kann nicht als ID verwendet werden
 
-compiler.err.underscore.as.identifier=Ab Release 9 ist "_" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
+compiler.err.underscore.as.identifier=Ab Release 9 ist "_" ein Schlüsselwort und kann nicht als ID verwendet werden
 
-compiler.err.use.of.underscore.not.allowed=Ab Release 21 ist nur das Unterstrichschl\u00FCsselwort "_" zul\u00E4ssig, um\nunbenannte Muster, lokale Variablen, Ausnahmeparameter oder Lambda-Parameter zu deklarieren
+compiler.err.use.of.underscore.not.allowed=Ab Release 21 ist nur das Unterstrichschlüsselwort "_" zulässig, um\nunbenannte Muster, lokale Variablen, Ausnahmeparameter oder Lambda-Parameter zu deklarieren
 
-compiler.err.use.of.underscore.not.allowed.with.brackets=Auf das Unterstrichschl\u00FCsselwort "_" d\u00FCrfen keine Klammern folgen
+compiler.err.use.of.underscore.not.allowed.with.brackets=Auf das Unterstrichschlüsselwort "_" dürfen keine Klammern folgen
 
-compiler.err.enum.as.identifier=Ab Release 5 ist "enum" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
+compiler.err.enum.as.identifier=Ab Release 5 ist "enum" ein Schlüsselwort und kann nicht als ID verwendet werden
 
-compiler.err.assert.as.identifier=Ab Release 1.4 ist "assert" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
+compiler.err.assert.as.identifier=Ab Release 1.4 ist "assert" ein Schlüsselwort und kann nicht als ID verwendet werden
 
 # TODO 308: make a better error message
-compiler.err.this.as.identifier=Ab Release 8 ist "this" nur als Parametername f\u00FCr den Empf\u00E4ngertyp zul\u00E4ssig.\nDas muss der erste Parameter sein und darf kein Lambda-Parameter sein
+compiler.err.this.as.identifier=Ab Release 8 ist "this" nur als Parametername für den Empfängertyp zulässig.\nDas muss der erste Parameter sein und darf kein Lambda-Parameter sein
 
-compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=receiver-Parameter nicht f\u00FCr Konstruktor der obersten Klasse anwendbar
+compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=receiver-Parameter nicht für Konstruktor der obersten Klasse anwendbar
 
 # TODO 308: make a better error message
 # 0: annotation
@@ -2290,18 +2290,18 @@ compiler.err.cant.type.annotate.scoping.1=Scoping-Konstrukt kann nicht mit type-
 compiler.err.cant.type.annotate.scoping=Scoping-Konstrukt kann nicht mit type-use-Annotationen versehen werden: {0}
 
 # 0: type, 1: type
-compiler.err.incorrect.receiver.name=Der Empf\u00E4ngername stimmt nicht mit dem einschlie\u00DFenden Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
+compiler.err.incorrect.receiver.name=Der Empfängername stimmt nicht mit dem einschließenden Klassentyp überein\nErforderlich: {0}\nErmittelt:    {1}
 
 # 0: type, 1: type
-compiler.err.incorrect.receiver.type=Der Empf\u00E4ngertyp stimmt nicht mit dem einschlie\u00DFenden Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
+compiler.err.incorrect.receiver.type=Der Empfängertyp stimmt nicht mit dem einschließenden Klassentyp überein\nErforderlich: {0}\nErmittelt:    {1}
 
 # 0: type, 1: type
-compiler.err.incorrect.constructor.receiver.type=Der Empf\u00E4ngertyp stimmt nicht mit dem einschlie\u00DFenden \u00E4u\u00DFeren Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
+compiler.err.incorrect.constructor.receiver.type=Der Empfängertyp stimmt nicht mit dem einschließenden äußeren Klassentyp überein\nErforderlich: {0}\nErmittelt:    {1}
 
 # 0: type, 1: type
-compiler.err.incorrect.constructor.receiver.name=Der Empf\u00E4ngername stimmt nicht mit dem einschlie\u00DFenden \u00E4u\u00DFeren Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
+compiler.err.incorrect.constructor.receiver.name=Der Empfängername stimmt nicht mit dem einschließenden äußeren Klassentyp überein\nErforderlich: {0}\nErmittelt:    {1}
 
-compiler.err.no.annotations.on.dot.class=Keine Annotationen im Typ eines Klassenliterals zul\u00E4ssig
+compiler.err.no.annotations.on.dot.class=Keine Annotationen im Typ eines Klassenliterals zulässig
 
 ########################################
 # Diagnostics for verbose resolution
@@ -2321,13 +2321,13 @@ compiler.misc.not.applicable.method.found=#{0} nicht anwendbare Methode gefunden
 compiler.misc.partial.inst.sig=Teilweise instanziiert in: {0}
 
 # 0: name, 1: symbol, 2: number, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
-compiler.note.verbose.resolve.multi=Methode {0} wird in Typ {1} als Kandidat {2} aufgel\u00F6st\nPhase: {3}\nMit Istwerten: {4}\nMit type-args: {5}\nKandidaten:
+compiler.note.verbose.resolve.multi=Methode {0} wird in Typ {1} als Kandidat {2} aufgelöst\nPhase: {3}\nMit Istwerten: {4}\nMit type-args: {5}\nKandidaten:
 
 # 0: name, 1: symbol, 2: unused, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
-compiler.note.verbose.resolve.multi.1=Fehlerhafte Aufl\u00F6sung f\u00FCr Methode {0} in Typ {1}\nPhase: {3}\nMit Istwerten: {4}\nMit type-args: {5}\nKandidaten:
+compiler.note.verbose.resolve.multi.1=Fehlerhafte Auflösung für Methode {0} in Typ {1}\nPhase: {3}\nMit Istwerten: {4}\nMit type-args: {5}\nKandidaten:
 
 # 0: symbol, 1: type, 2: type
-compiler.note.deferred.method.inst=Instanziierung von Methode {0} verz\u00F6gert\nInstanziierte Signatur: {1}\ntarget-type: {2}
+compiler.note.deferred.method.inst=Instanziierung von Methode {0} verzögert\nInstanziierte Signatur: {1}\ntarget-type: {2}
 
 ########################################
 # Diagnostics for lambda deduplication
@@ -2343,7 +2343,7 @@ compiler.note.verbose.l2m.deduplicate=Lambda-Implementierungsmethode {0} wird de
 ########################################
 
 # 0: fragment, 1: string, 2: number
-compiler.note.method.ref.search.results.multi={0} Suchergebnisse f\u00FCr {1}, mit spezifischsten {2}\nAnwendbare Kandidaten:
+compiler.note.method.ref.search.results.multi={0} Suchergebnisse für {1}, mit spezifischsten {2}\nAnwendbare Kandidaten:
 
 # 0: number, 1: fragment, 2: symbol
 compiler.misc.applicable.method.found.2=#{0} anwendbare Methode gefunden: {1} {2}
@@ -2429,13 +2429,13 @@ compiler.misc.where.description.intersection.1=Dabei sind {0} Schnittmengentypen
 ###
 # errors related to doc comments
 
-compiler.err.dc.bad.entity=Ung\u00FCltige HTML-Entity
+compiler.err.dc.bad.entity=Ungültige HTML-Entity
 
 compiler.err.dc.bad.inline.tag=Falsche Verwendung von Inlinetag
 
 compiler.err.dc.identifier.expected=ID erwartet
 
-compiler.err.dc.invalid.html=ung\u00FCltige HTML
+compiler.err.dc.invalid.html=ungültige HTML
 
 compiler.err.dc.malformed.html=Nicht wohlgeformte HTML
 
@@ -2465,7 +2465,7 @@ compiler.err.dc.unterminated.signature=Nicht abgeschlossene Signatur
 
 compiler.err.dc.unterminated.string=Nicht abgeschlossene Zeichenfolge
 
-compiler.err.dc.ref.annotations.not.allowed=Annotationen nicht zul\u00E4ssig
+compiler.err.dc.ref.annotations.not.allowed=Annotationen nicht zulässig
 
 ###
 # errors related to modules
@@ -2502,10 +2502,10 @@ compiler.err.conflicting.exports.to.module=Doppelte oder unvereinbare Exporte in
 # 0: symbol
 compiler.err.conflicting.opens.to.module=Doppelte oder unvereinbare "opens" in Modul: {0}
 
-compiler.err.no.opens.unless.strong="opens" nur in starken Modulen zul\u00E4ssig
+compiler.err.no.opens.unless.strong="opens" nur in starken Modulen zulässig
 
 # 0: symbol
-compiler.err.repeated.provides.for.service=Mehrere "provides" f\u00FCr Service {0}
+compiler.err.repeated.provides.for.service=Mehrere "provides" für Service {0}
 
 # 0: symbol, 1: symbol
 compiler.err.duplicate.provides=Doppelte "provides": Service {0}, Implementierung {1}
@@ -2516,9 +2516,9 @@ compiler.err.duplicate.uses=Doppelte Verwendungen: {0}
 # 0: symbol
 compiler.err.service.implementation.is.abstract=Die Serviceimplementierung ist eine abstrakte Klasse: {0}
 
-compiler.err.service.implementation.must.be.subtype.of.service.interface=Der Serviceimplementierungstyp muss ein Subtyp des Serviceschnittstellentyps sein oder eine \u00F6ffentliche statische no-args-Methode namens "provider" aufweisen, die die Serviceimplementierung zur\u00FCckgibt
+compiler.err.service.implementation.must.be.subtype.of.service.interface=Der Serviceimplementierungstyp muss ein Subtyp des Serviceschnittstellentyps sein oder eine öffentliche statische no-args-Methode namens "provider" aufweisen, die die Serviceimplementierung zurückgibt
 
-compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface=Der R\u00FCckgabetyp der "provider"-Methode muss ein Subtyp des Serviceschnittstellentyps sein
+compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface=Der Rückgabetyp der "provider"-Methode muss ein Subtyp des Serviceschnittstellentyps sein
 
 # 0: symbol
 compiler.err.service.implementation.is.inner=Die Serviceimplementierung ist eine innere Klasse: {0}
@@ -2530,7 +2530,7 @@ compiler.err.service.definition.is.enum=Die Servicedefinition ist eine Enumerati
 compiler.err.service.implementation.doesnt.have.a.no.args.constructor=Die Serviceimplementierung hat keinen Standardkonstruktor: {0}
 
 # 0: symbol
-compiler.err.service.implementation.no.args.constructor.not.public=Der "no arguments"-Konstruktor der Serviceimplementierung ist nicht \u00F6ffentlich: {0}
+compiler.err.service.implementation.no.args.constructor.not.public=Der "no arguments"-Konstruktor der Serviceimplementierung ist nicht öffentlich: {0}
 
 # 0: symbol
 compiler.err.package.empty.or.not.found=Package ist leer oder nicht vorhanden: {0}
@@ -2540,29 +2540,29 @@ compiler.warn.package.empty.or.not.found=Package ist leer oder nicht vorhanden:
 
 compiler.err.no.output.dir=Kein Klassenausgabeverzeichnis angegeben
 
-compiler.err.unnamed.pkg.not.allowed.named.modules=Unbenanntes Package ist in benannten Modulen nicht zul\u00E4ssig
+compiler.err.unnamed.pkg.not.allowed.named.modules=Unbenanntes Package ist in benannten Modulen nicht zulässig
 
 # 0: name, 1: name
-compiler.err.module.name.mismatch=Modulname {0} stimmt nicht mit dem erwarteten Namen {1} \u00FCberein
+compiler.err.module.name.mismatch=Modulname {0} stimmt nicht mit dem erwarteten Namen {1} überein
 
 # 0: name, 1: name
-compiler.misc.module.name.mismatch=Modulname {0} stimmt nicht mit dem erwarteten Namen {1} \u00FCberein
+compiler.misc.module.name.mismatch=Modulname {0} stimmt nicht mit dem erwarteten Namen {1} überein
 
 # 0: name
-compiler.err.module.non.zero.opens=Bei ge\u00F6ffnetem Modul {0} ist opens_count ungleich Null
+compiler.err.module.non.zero.opens=Bei geöffnetem Modul {0} ist opens_count ungleich Null
 
 # 0: name
-compiler.misc.module.non.zero.opens=Bei ge\u00F6ffnetem Modul {0} ist opens_count ungleich Null
+compiler.misc.module.non.zero.opens=Bei geöffnetem Modul {0} ist opens_count ungleich Null
 
-compiler.err.module.decl.sb.in.module-info.java=Moduldeklarationen m\u00FCssen in einer Datei namens module-info.java vorhanden sein
+compiler.err.module.decl.sb.in.module-info.java=Moduldeklarationen müssen in einer Datei namens module-info.java vorhanden sein
 
 # 0: set of string
 compiler.err.too.many.patched.modules=Zu viele gepatchte Module ({0}). Verwenden Sie --module-source-path
 
 # 0: name, 1: name
-compiler.err.file.patched.and.msp=Datei sowohl von --patch-module als auch von --module-source-path zug\u00E4nglich, geh\u00F6rt aber in jedem Pfad zu einem anderen Modul: {0}, {1}
+compiler.err.file.patched.and.msp=Datei sowohl von --patch-module als auch von --module-source-path zugänglich, gehört aber in jedem Pfad zu einem anderen Modul: {0}, {1}
 
-compiler.err.processorpath.no.processormodulepath=Unzul\u00E4ssige Kombination aus -processorpath und --processor-module-path
+compiler.err.processorpath.no.processormodulepath=Unzulässige Kombination aus -processorpath und --processor-module-path
 
 # 0: symbol
 compiler.err.package.in.other.module=Package ist in einem anderen Modul vorhanden: {0}
@@ -2584,16 +2584,16 @@ compiler.err.modulesourcepath.must.be.specified.with.dash.m.option=Modulquellpfa
 compiler.err.service.implementation.not.in.right.module=Serviceimplementierung muss in demselben Modul wie die provides-Direktive definiert werden
 
 # 0: symbol
-compiler.err.cyclic.requires=Zyklische Abh\u00E4ngigkeit mit {0}
+compiler.err.cyclic.requires=Zyklische Abhängigkeit mit {0}
 
 # 0: fragment, 1: name
 compiler.err.duplicate.module.on.path=Doppeltes Modul in {0}\nModul in {1}
 
 # 0: option name, 1: string
-compiler.warn.bad.name.for.option=Ung\u00FCltiger Name im Wert f\u00FCr {0}-Option: "{1}"
+compiler.warn.bad.name.for.option=Ungültiger Name im Wert für {0}-Option: "{1}"
 
 # 0: option name, 1: string
-compiler.err.bad.name.for.option=Ung\u00FCltiger Name im Wert f\u00FCr {0}-Option: "{1}"
+compiler.err.bad.name.for.option=Ungültiger Name im Wert für {0}-Option: "{1}"
 
 # 0: option name, 1: symbol
 compiler.warn.module.for.option.not.found=Modulname in {0}-Option nicht gefunden: {1}
@@ -2601,10 +2601,10 @@ compiler.warn.module.for.option.not.found=Modulname in {0}-Option nicht gefunden
 compiler.err.addmods.all.module.path.invalid=--add-modules ALL-MODULE-PATH kann nur beim Kompilieren des unbenannten Moduls oder beim Kompilieren im Kontext eines automatischen Moduls verwendet werden
 
 # 0: symbol
-compiler.err.add.exports.with.release=Export eines Packages aus Systemmodul {0} ist mit --release nicht zul\u00E4ssig
+compiler.err.add.exports.with.release=Export eines Packages aus Systemmodul {0} ist mit --release nicht zulässig
 
 # 0: symbol
-compiler.err.add.reads.with.release=Hinzuf\u00FCgen von Lese-Edges f\u00FCr Systemmodul {0} ist mit --release nicht zul\u00E4ssig
+compiler.err.add.reads.with.release=Hinzufügen von Lese-Edges für Systemmodul {0} ist mit --release nicht zulässig
 
 compiler.warn.addopens.ignored=--add-opens hat zur Kompilierungszeit keine Auswirkungen
 
@@ -2616,32 +2616,32 @@ compiler.misc.locn.system_modules=Systemmodule
 
 compiler.misc.locn.module_path=Anwendungsmodulpfad
 
-compiler.misc.cant.resolve.modules=Module k\u00F6nnen nicht aufgel\u00F6st werden
+compiler.misc.cant.resolve.modules=Module können nicht aufgelöst werden
 
-compiler.misc.bad.requires.flag=Ung\u00FCltiges requires-Kennzeichen: {0}
+compiler.misc.bad.requires.flag=Ungültiges requires-Kennzeichen: {0}
 
 # 0: string
-compiler.err.invalid.module.specifier=Modulbezeichner nicht zul\u00E4ssig: {0}
+compiler.err.invalid.module.specifier=Modulbezeichner nicht zulässig: {0}
 
 # 0: symbol
 compiler.warn.service.provided.but.not.exported.or.used=Serviceschnittstelle angegeben, aber nicht exportiert oder verwendet
 
 # 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible={0} {1} in Modul {2} ist nicht zug\u00E4nglich f\u00FCr Clients, die dieses Modul ben\u00F6tigen
+compiler.warn.leaks.not.accessible={0} {1} in Modul {2} ist nicht zugänglich für Clients, die dieses Modul benötigen
 # 0: kind name, 1: symbol, 2: symbol
 compiler.warn.leaks.not.accessible.unexported={0} {1} in Modul {2} wird nicht exportiert
 # 0: kind name, 1: symbol, 2: symbol
 compiler.warn.leaks.not.accessible.not.required.transitive={0} {1} in Modul {2} wird nicht indirekt mit "requires transitive" exportiert
 # 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible.unexported.qualified={0} {1} in Modul {2} ist m\u00F6glichweise nicht f\u00FCr alle Clients, die dieses Modul ben\u00F6tigen, sichtbar
+compiler.warn.leaks.not.accessible.unexported.qualified={0} {1} in Modul {2} ist möglichweise nicht für alle Clients, die dieses Modul benötigen, sichtbar
 
 ###
 # errors related to options
 
 # 0: string, 1: string
-compiler.err.illegal.argument.for.option=Unzul\u00E4ssiges Argument f\u00FCr {0}: {1}
+compiler.err.illegal.argument.for.option=Unzulässiges Argument für {0}: {1}
 
-compiler.err.match.binding.exists=Unzul\u00E4ssiger Versuch, ein vorhandenes \u00DCbereinstimmungs-Binding neu zu definieren
+compiler.err.match.binding.exists=Unzulässiger Versuch, ein vorhandenes Übereinstimmungs-Binding neu zu definieren
 
 compiler.err.switch.case.unexpected.statement=Unerwartete Anweisung in Case. Ausdruck, Block oder throw-Anweisung erwartet
 
@@ -2652,10 +2652,10 @@ compiler.err.switch.mixing.case.types=Unterschiedliche Case-Typen im Switch verw
 
 # permits clause
 # 0: fragment
-compiler.err.invalid.permits.clause=Ung\u00FCltige PERMITS-Klausel\n({0})
+compiler.err.invalid.permits.clause=Ungültige PERMITS-Klausel\n({0})
 
 # 0: string
-compiler.misc.class.is.not.sealed={0} muss verschl\u00FCsselt sein
+compiler.misc.class.is.not.sealed={0} muss verschlüsselt sein
 
 # 0: type
 compiler.misc.is.a.type.variable=Darf keine Typvariablen enthalten: {0}
@@ -2664,38 +2664,38 @@ compiler.misc.is.a.type.variable=Darf keine Typvariablen enthalten: {0}
 compiler.misc.is.duplicated=Darf keine Duplikate enthalten: {0}
 
 # 0: type
-compiler.misc.doesnt.extend.sealed=Unterklasse {0} muss verschl\u00FCsselte Klasse erweitern
+compiler.misc.doesnt.extend.sealed=Unterklasse {0} muss verschlüsselte Klasse erweitern
 
-compiler.misc.must.not.be.same.class=Unzul\u00E4ssige Selbstreferenz in PERMITS-Klausel
+compiler.misc.must.not.be.same.class=Unzulässige Selbstreferenz in PERMITS-Klausel
 
 # 0: type
-compiler.misc.must.not.be.supertype=Unzul\u00E4ssige Referenz zu Supertyp {0}
+compiler.misc.must.not.be.supertype=Unzulässige Referenz zu Supertyp {0}
 
 # other sealed types related errors
 
-compiler.err.sealed.class.must.have.subclasses=Verschl\u00FCsselte Klasse muss Unterklassen aufweisen
+compiler.err.sealed.class.must.have.subclasses=Verschlüsselte Klasse muss Unterklassen aufweisen
 
 # errors in subclasses of sealed classes
 # 0: symbol
-compiler.err.cant.inherit.from.sealed=Klasse darf nicht verschl\u00FCsselte Klasse erweitern: {0} (da diese nicht in der "permits"-Klausel enthalten ist)
+compiler.err.cant.inherit.from.sealed=Klasse darf nicht verschlüsselte Klasse erweitern: {0} (da diese nicht in der "permits"-Klausel enthalten ist)
 
 # 0: symbol
-compiler.err.class.in.unnamed.module.cant.extend.sealed.in.diff.package=Klasse {0} in unbenanntem Modul darf keine verschl\u00FCsselte Klasse in einem anderen Package erweitern
+compiler.err.class.in.unnamed.module.cant.extend.sealed.in.diff.package=Klasse {0} in unbenanntem Modul darf keine verschlüsselte Klasse in einem anderen Package erweitern
 
 # 0: symbol, 1: symbol
-compiler.err.class.in.module.cant.extend.sealed.in.diff.module=Klasse {0} in Modul {1} darf keine verschl\u00FCsselte Klasse in einem anderen Modul erweitern
+compiler.err.class.in.module.cant.extend.sealed.in.diff.module=Klasse {0} in Modul {1} darf keine verschlüsselte Klasse in einem anderen Modul erweitern
 
 # 0: symbol
-compiler.err.non.sealed.with.no.sealed.supertype=Modifikator "non-sealed" ist hier nicht zul\u00E4ssig\n(Klasse {0} hat keine verschl\u00FCsselten Supertypen)
+compiler.err.non.sealed.with.no.sealed.supertype=Modifikator "non-sealed" ist hier nicht zulässig\n(Klasse {0} hat keine verschlüsselten Supertypen)
 
 compiler.err.non.sealed.sealed.or.final.expected=Modifikator "sealed", "non-sealed" oder "final" erwartet
 
 compiler.err.non.sealed.or.sealed.expected=Modifikator "sealed" oder "non-sealed" erwartet
 
-compiler.err.sealed.or.non.sealed.local.classes.not.allowed=Lokale Klassen mit "sealed" oder "non-sealed" nicht zul\u00E4ssig
+compiler.err.sealed.or.non.sealed.local.classes.not.allowed=Lokale Klassen mit "sealed" oder "non-sealed" nicht zulässig
 
 # 0: fragment
-compiler.err.local.classes.cant.extend.sealed=Klassen vom Typ "{0}" d\u00FCrfen keine verschl\u00FCsselten Klassen erweitern
+compiler.err.local.classes.cant.extend.sealed=Klassen vom Typ "{0}" dürfen keine verschlüsselten Klassen erweitern
 compiler.misc.anonymous=Anonym
 
 compiler.misc.local=Lokal
@@ -2704,23 +2704,23 @@ compiler.misc.local=Lokal
 # errors related to records
 
 # record components
-compiler.err.record.cant.declare.field.modifiers=Datensatzkomponenten k\u00F6nnen keine Modifikatoren aufweisen
+compiler.err.record.cant.declare.field.modifiers=Datensatzkomponenten können keine Modifikatoren aufweisen
 
 # 0: symbol
-compiler.err.illegal.record.component.name=Unzul\u00E4ssiger Datensatzkomponentenname {0}
+compiler.err.illegal.record.component.name=Unzulässiger Datensatzkomponentenname {0}
 
-compiler.err.record.component.and.old.array.syntax=Legacy-Arraynotation f\u00FCr Datensatzkomponenten nicht zul\u00E4ssig
+compiler.err.record.component.and.old.array.syntax=Legacy-Arraynotation für Datensatzkomponenten nicht zulässig
 
 # accessor methods
 # 0: symbol, 1: fragment
-compiler.err.invalid.accessor.method.in.record=Ung\u00FCltige Accessor-Methode in Datensatz {0}\n({1})
+compiler.err.invalid.accessor.method.in.record=Ungültige Accessor-Methode in Datensatz {0}\n({1})
 
-compiler.misc.method.must.be.public=Accessor-Methode muss \u00F6ffentlich sein
+compiler.misc.method.must.be.public=Accessor-Methode muss öffentlich sein
 
 # 0: symbol, 1: symbol
-compiler.misc.accessor.return.type.doesnt.match=R\u00FCckgabetyp von Accessor-Methode {0} muss mit dem Typ der Datensatzkomponente {1} \u00FCbereinstimmen
+compiler.misc.accessor.return.type.doesnt.match=Rückgabetyp von Accessor-Methode {0} muss mit dem Typ der Datensatzkomponente {1} übereinstimmen
 
-compiler.misc.accessor.method.cant.throw.exception=Throws-Klausel f\u00FCr Accessor-Methode nicht zul\u00E4ssig
+compiler.misc.accessor.method.cant.throw.exception=Throws-Klausel für Accessor-Methode nicht zulässig
 
 compiler.misc.accessor.method.must.not.be.generic=Accessor-Methode darf nicht generisch sein
 
@@ -2728,41 +2728,41 @@ compiler.misc.accessor.method.must.not.be.static=Accessor-Methode darf nicht sta
 
 # canonical constructors
 # 0: fragment, 1: name, 2: fragment
-compiler.err.invalid.canonical.constructor.in.record=Ung\u00FCltiger Konstruktor vom Typ {0} in Datensatz {1}\n({2})
+compiler.err.invalid.canonical.constructor.in.record=Ungültiger Konstruktor vom Typ {0} in Datensatz {1}\n({2})
 
 compiler.misc.canonical=Kanonisch
 
 compiler.misc.compact=Kompakt
 
 # 0: fragment
-compiler.misc.throws.clause.not.allowed.for.canonical.constructor=Throws-Klausel f\u00FCr Konstruktor des Typs {0} nicht zul\u00E4ssig
+compiler.misc.throws.clause.not.allowed.for.canonical.constructor=Throws-Klausel für Konstruktor des Typs {0} nicht zulässig
 
-compiler.misc.canonical.with.name.mismatch=Ung\u00FCltige Parameternamen in kanonischem Konstruktor
+compiler.misc.canonical.with.name.mismatch=Ungültige Parameternamen in kanonischem Konstruktor
 
 compiler.misc.canonical.cant.have.return.statement=Kompakter Konstruktor darf keine return-Anweisungen verwenden
 
 compiler.misc.canonical.must.not.declare.type.variables=Kanonischer Konstruktor darf keine Typvariablen deklarieren
 
-compiler.misc.type.must.be.identical.to.corresponding.record.component.type=Typ und Argumentanzahl m\u00FCssen mit den Werten der entsprechenden Datensatzkomponente \u00FCbereinstimmen
+compiler.misc.type.must.be.identical.to.corresponding.record.component.type=Typ und Argumentanzahl müssen mit den Werten der entsprechenden Datensatzkomponente übereinstimmen
 compiler.misc.canonical.must.not.contain.explicit.constructor.invocation=Kanonischer Konstruktor darf keinen expliziten Konstruktoraufruf enthalten
 
 # 0: set of flag or string
-compiler.misc.canonical.must.not.have.stronger.access=Versuch, h\u00F6here Zugriffsberechtigungen zuzuweisen. War {0}
+compiler.misc.canonical.must.not.have.stronger.access=Versuch, höhere Zugriffsberechtigungen zuzuweisen. War {0}
 
 # other
-compiler.err.record.cannot.declare.instance.fields=Felddeklaration muss statisch sein\n(ersetzen Sie unter Umst\u00E4nden das Feld durch eine Datensatzkomponente)
+compiler.err.record.cannot.declare.instance.fields=Felddeklaration muss statisch sein\n(ersetzen Sie unter Umständen das Feld durch eine Datensatzkomponente)
 
 # 0: symbol
-compiler.err.invalid.supertype.record=Klassen k\u00F6nnen {0} nicht direkt erweitern
+compiler.err.invalid.supertype.record=Klassen können {0} nicht direkt erweitern
 
 # 0: symbol
 compiler.err.first.statement.must.be.call.to.another.constructor=Konstruktor ist nicht kanonisch. Daher muss die erste Anweisung einen anderen Konstruktor der Klasse {0} aufrufen
 
-compiler.err.instance.initializer.not.allowed.in.records=Instanz-Initializer in Datens\u00E4tzen nicht zul\u00E4ssig
+compiler.err.instance.initializer.not.allowed.in.records=Instanz-Initializer in Datensätzen nicht zulässig
 
-compiler.err.static.declaration.not.allowed.in.inner.classes=Statische Deklarationen in inneren Klassen nicht zul\u00E4ssig
+compiler.err.static.declaration.not.allowed.in.inner.classes=Statische Deklarationen in inneren Klassen nicht zulässig
 
-compiler.err.record.patterns.annotations.not.allowed=Annotationen in Datensatzmustern nicht zul\u00E4ssig
+compiler.err.record.patterns.annotations.not.allowed=Annotationen in Datensatzmustern nicht zulässig
 
 ############################################
 # messages previously at javac.properties
@@ -2770,21 +2770,21 @@ compiler.err.record.patterns.annotations.not.allowed=Annotationen in Datensatzmu
 compiler.err.empty.A.argument=-A erfordert ein Argument. Verwenden Sie "-Akey" oder "-Akey=value"
 
 # 0: string
-compiler.err.invalid.A.key=Schl\u00FCssel in Annotationsprozessoroption "{0}" ist keine durch Punkt getrennte ID-Sequenz
+compiler.err.invalid.A.key=Schlüssel in Annotationsprozessoroption "{0}" ist keine durch Punkt getrennte ID-Sequenz
 
 # 0: string
-compiler.err.invalid.flag=Ung\u00FCltiges Kennzeichen: {0}
+compiler.err.invalid.flag=Ungültiges Kennzeichen: {0}
 
-compiler.err.profile.bootclasspath.conflict=Optionen "profile" und "bootclasspath" k\u00F6nnen nicht zusammen verwendet werden
+compiler.err.profile.bootclasspath.conflict=Optionen "profile" und "bootclasspath" können nicht zusammen verwendet werden
 
 # 0: string
-compiler.err.invalid.profile=Ung\u00FCltiges Profil: {0}
+compiler.err.invalid.profile=Ungültiges Profil: {0}
 
 # 0: string
-compiler.err.invalid.target=Ung\u00FCltiges Zielrelease: {0}
+compiler.err.invalid.target=Ungültiges Zielrelease: {0}
 
 # 0: option name, 1: target
-compiler.err.option.not.allowed.with.target=Option {0} mit Ziel {1} nicht zul\u00E4ssig
+compiler.err.option.not.allowed.with.target=Option {0} mit Ziel {1} nicht zulässig
 
 # 0: string
 compiler.err.option.too.many=Option {0} kann nur einmal angegeben werden
@@ -2797,12 +2797,12 @@ compiler.err.no.source.files.classes=Keine Quelldateien oder Klassennamen
 compiler.err.req.arg={0} erfordert ein Argument
 
 # 0: string
-compiler.err.invalid.source=Ung\u00FCltiges Quellrelease: {0}
+compiler.err.invalid.source=Ungültiges Quellrelease: {0}
 
 # 0: string, 1: string
 compiler.err.error.writing.file=Fehler beim Schreiben von {0}. {1}
 
-compiler.err.sourcepath.modulesourcepath.conflict=--source-path und --module-source-path k\u00F6nnen nicht beide angegeben werden
+compiler.err.sourcepath.modulesourcepath.conflict=--source-path und --module-source-path können nicht beide angegeben werden
 
 # 0: string, 1: target
 compiler.warn.source.target.conflict=Quellrelease {0} erfordert Zielrelease {1}
@@ -2811,7 +2811,7 @@ compiler.warn.source.target.conflict=Quellrelease {0} erfordert Zielrelease {1}
 compiler.warn.target.default.source.conflict=Zielrelease {0} steht mit Standardquellrelease {1} in Konflikt
 
 # 0: profile, 1: target
-compiler.warn.profile.target.conflict=Profil {0} ist f\u00FCr Zielrelease {1} nicht g\u00FCltig
+compiler.warn.profile.target.conflict=Profil {0} ist für Zielrelease {1} nicht gültig
 
 # 0: string
 compiler.err.file.not.directory=Kein Verzeichnis: {0}
@@ -2819,54 +2819,54 @@ compiler.err.file.not.directory=Kein Verzeichnis: {0}
 # 0: object
 compiler.err.file.not.file=Keine Datei: {0}
 
-compiler.err.two.class.loaders.1=javac ist auf mehrere Class Loader aufgeteilt: Pr\u00FCfen Sie die Konfiguration
+compiler.err.two.class.loaders.1=javac ist auf mehrere Class Loader aufgeteilt: Prüfen Sie die Konfiguration
 
 # 0: url, 1: url
-compiler.err.two.class.loaders.2=javac ist auf mehrere Class Loader aufgeteilt:\nEine Klasse stammt aus Datei {0},\nw\u00E4hrend javac aus {1} stammt
+compiler.err.two.class.loaders.2=javac ist auf mehrere Class Loader aufgeteilt:\nEine Klasse stammt aus Datei {0},\nwährend javac aus {1} stammt
 
 # 0: string, 1: string
-compiler.err.bad.value.for.option=Ung\u00FCltiger Wert f\u00FCr {0}-Option: "{1}"
+compiler.err.bad.value.for.option=Ungültiger Wert für {0}-Option: "{1}"
 
 # 0: string
-compiler.err.no.value.for.option=Kein Wert f\u00FCr {0}-Option
+compiler.err.no.value.for.option=Kein Wert für {0}-Option
 
 # 0: string
-compiler.err.repeated.value.for.patch.module=--patch-module mehrmals f\u00FCr Modul {0} angegeben
+compiler.err.repeated.value.for.patch.module=--patch-module mehrmals für Modul {0} angegeben
 
 # 0: string
-compiler.err.repeated.value.for.module.source.path=--module-source-path mehrmals f\u00FCr Modul {0} angegeben
+compiler.err.repeated.value.for.module.source.path=--module-source-path mehrmals für Modul {0} angegeben
 
 compiler.err.multiple.values.for.module.source.path=--module-source-path mehrmals mit Musterargument angegeben
 
 # 0: string
-compiler.err.unmatched.quote=Alleinstehendes Anf\u00FChrungszeichen in Umgebungsvariable {0}
+compiler.err.unmatched.quote=Alleinstehendes Anführungszeichen in Umgebungsvariable {0}
 
 # 0: option name
 compiler.err.release.bootclasspath.conflict=Option {0} kann nicht zusammen mit --release verwendet werden
 
 # 0: string
-compiler.err.unsupported.release.version=Releaseversion {0} nicht unterst\u00FCtzt
+compiler.err.unsupported.release.version=Releaseversion {0} nicht unterstützt
 
 # 0: string
 compiler.err.file.not.found=Datei nicht gefunden: {0}
 
 # 0: string, 1: source
-compiler.err.preview.not.latest=Ung\u00FCltiges Quellrelease {0} mit --enable-preview\n(Vorschausprachfeatures werden nur f\u00FCr Release {1} unterst\u00FCtzt)
+compiler.err.preview.not.latest=Ungültiges Quellrelease {0} mit --enable-preview\n(Vorschausprachfeatures werden nur für Release {1} unterstützt)
 
 compiler.err.preview.without.source.or.release=--enable-preview muss mit -source oder --release verwendet werden
 
 # 0: symbol
-compiler.err.deconstruction.pattern.only.records=Dekonstruktionsmuster k\u00F6nnen nur auf Datens\u00E4tze angewendet werden. {0} ist kein Datensatz
+compiler.err.deconstruction.pattern.only.records=Dekonstruktionsmuster können nur auf Datensätze angewendet werden. {0} ist kein Datensatz
 
-compiler.err.deconstruction.pattern.var.not.allowed=Dekonstruktionsmuster k\u00F6nnen nur auf Datens\u00E4tze angewendet werden, "var" ist nicht zul\u00E4ssig
+compiler.err.deconstruction.pattern.var.not.allowed=Dekonstruktionsmuster können nur auf Datensätze angewendet werden, "var" ist nicht zulässig
 
 # 0: list of type, 1: list of type
 compiler.err.incorrect.number.of.nested.patterns=Falsche Anzahl verschachtelter Muster\nErforderlich: {0}\nGefunden: {1}
 
 # 0: kind name, 1: symbol
-compiler.warn.declared.using.preview={0} {1} ist mit einem Vorschaufeature deklariert, das in einem zuk\u00FCnftigen Release entfernt werden kann.
+compiler.warn.declared.using.preview={0} {1} ist mit einem Vorschaufeature deklariert, das in einem zukünftigen Release entfernt werden kann.
 
-compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=Versuch der Synchronisierung f\u00FCr eine Instanz einer wertbasierten Klasse
+compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=Versuch der Synchronisierung für eine Instanz einer wertbasierten Klasse
 
 # 0: type
-compiler.err.enclosing.class.type.non.denotable=Einschlie\u00DFender Klassentyp: {0}\nist nicht deklarierbar. F\u00FChren Sie das Casting in einen deklarierbaren Typ aus
+compiler.err.enclosing.class.type.non.denotable=Einschließender Klassentyp: {0}\nist nicht deklarierbar. Führen Sie das Casting in einen deklarierbaren Typ aus
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
index d23cafe82c9..f3b15c3527a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
@@ -88,731 +88,731 @@
 ##
 
 # 0: symbol
-compiler.err.abstract.cant.be.instantiated={0}\u306Fabstract\u3067\u3059\u3002\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.abstract.cant.be.instantiated={0}はabstractです。インスタンスを生成することはできません
 
-compiler.err.abstract.meth.cant.have.body=abstract\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.abstract.meth.cant.have.body=abstractメソッドが本体を持つことはできません
 
 # 0: kind name, 1: symbol
-compiler.err.already.annotated={0} {1}\u306F\u6CE8\u91C8\u304C\u4ED8\u3044\u3066\u3044\u307E\u3059
+compiler.err.already.annotated={0} {1}は注釈が付いています
 
 # 0: kind name, 1: symbol, 2: kind name, 3: symbol
-compiler.err.already.defined={0} {1}\u306F\u3059\u3067\u306B{2} {3}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.already.defined={0} {1}はすでに{2} {3}で定義されています
 
 # 0: kind name, 1: symbol, 2: kind name, 3: kind name, 4: symbol
-compiler.err.already.defined.in.clinit={0} {1}\u306F\u3059\u3067\u306B{3} {4}\u306E{2}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.already.defined.in.clinit={0} {1}はすでに{3} {4}の{2}で定義されています
 
 # 0: symbol
-compiler.err.already.defined.single.import=\u540C\u3058\u5358\u7D14\u540D\u306E\u578B\u304C{0}\u306E\u5358\u4E00\u578B\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u3088\u3063\u3066\u3059\u3067\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.already.defined.single.import=同じ単純名の型が{0}の単一型インポートによってすでに定義されています
 
 # 0: symbol
-compiler.err.already.defined.static.single.import=\u540C\u3058\u5358\u7D14\u540D\u306E\u578B\u304C{0}\u306Estatic\u5358\u4E00\u578B\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u3088\u3063\u3066\u3059\u3067\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.already.defined.static.single.import=同じ単純名の型が{0}のstatic単一型インポートによってすでに定義されています
 
 # 0: symbol
-compiler.err.already.defined.this.unit={0}\u306F\u30B3\u30F3\u30D1\u30A4\u30EB\u5358\u4F4D\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.already.defined.this.unit={0}はコンパイル単位で定義されています
 
-compiler.err.annotation.missing.element.value=\u6CE8\u91C8\u306B\u8981\u7D20\u5024\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.annotation.missing.element.value=注釈に要素値がありません
 
 # 0: type, 1: list of name
-compiler.err.annotation.missing.default.value=\u6CE8\u91C8@{0}\u306B\u306F\u8981\u7D20''{1}''\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.annotation.missing.default.value=注釈@{0}には要素''{1}''のデフォルト値がありません
 
 # 0: type, 1: list of name
-compiler.err.annotation.missing.default.value.1=\u6CE8\u91C8@{0}\u306B\u306F\u8981\u7D20{1}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.annotation.missing.default.value.1=注釈@{0}には要素{1}のデフォルト値がありません
 
 # 0: type
-compiler.err.annotation.not.valid.for.type=\u6CE8\u91C8\u306F\u578B{0}\u306E\u8981\u7D20\u306B\u5BFE\u3057\u3066\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.annotation.not.valid.for.type=注釈は型{0}の要素に対して有効ではありません
 
-compiler.err.annotation.type.not.applicable=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u3053\u306E\u7A2E\u985E\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.annotation.type.not.applicable=注釈インタフェースはこの種類の宣言に使用できません
 
 # 0: type
-compiler.err.annotation.type.not.applicable.to.type=\u6CE8\u91C8@{0}\u306F\u3053\u306E\u578B\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.annotation.type.not.applicable.to.type=注釈@{0}はこの型のコンテキストに使用できません
 
-compiler.err.annotation.value.must.be.annotation=\u6CE8\u91C8\u306E\u5024\u306F\u6CE8\u91C8\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.annotation.value.must.be.annotation=注釈の値は注釈である必要があります
 
-compiler.err.annotation.value.must.be.class.literal=\u6CE8\u91C8\u306E\u5024\u306F\u30AF\u30E9\u30B9\u30FB\u30EA\u30C6\u30E9\u30EB\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.annotation.value.must.be.class.literal=注釈の値はクラス・リテラルである必要があります
 
-compiler.err.annotation.value.must.be.name.value=\u6CE8\u91C8\u306E\u5024\u306F''name=value''\u3068\u3044\u3046\u5F62\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.annotation.value.must.be.name.value=注釈の値は''name=value''という形式である必要があります
 
-compiler.err.annotation.value.not.allowable.type=\u4F7F\u7528\u3067\u304D\u306A\u3044\u578B\u306E\u6CE8\u91C8\u306E\u5024\u3067\u3059
+compiler.err.annotation.value.not.allowable.type=使用できない型の注釈の値です
 
-compiler.err.expression.not.allowable.as.annotation.value=\u5F0F\u304C\u6CE8\u91C8\u306E\u5024\u3068\u3057\u3066\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.expression.not.allowable.as.annotation.value=式が注釈の値として許可されません
 
 # 0: type, 1: name
-compiler.err.annotation.unrecognized.attribute.name=\u6CE8\u91C8@{0}\u306B''{1}''\u3068\u3044\u3046\u540D\u524D\u306E\u4E0D\u660E\u306A\u5C5E\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.err.annotation.unrecognized.attribute.name=注釈@{0}に''{1}''という名前の不明な属性があります
 
-compiler.err.anon.class.impl.intf.no.args=\u540D\u524D\u306E\u306A\u3044\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002\u5F15\u6570\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.anon.class.impl.intf.no.args=名前のないクラスがインタフェースを実装しています。引数を持つことはできません
 
-compiler.err.anon.class.impl.intf.no.typeargs=\u540D\u524D\u306E\u306A\u3044\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002\u578B\u5F15\u6570\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.anon.class.impl.intf.no.typeargs=名前のないクラスがインタフェースを実装しています。型引数を持つことはできません
 
-compiler.err.anon.class.impl.intf.no.qual.for.new=\u540D\u524D\u306E\u306A\u3044\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002new\u306B\u4FEE\u98FE\u5B50\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
+compiler.err.anon.class.impl.intf.no.qual.for.new=名前のないクラスがインタフェースを実装しています。newに修飾子を持つことはできません。
 
-compiler.err.cant.inherit.from.anon=\u533F\u540D\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3067\u304D\u307E\u305B\u3093
+compiler.err.cant.inherit.from.anon=匿名クラスから継承できません
 
 # 0: symbol, 1: symbol, 2: symbol
-compiler.err.array.and.varargs={2}\u3067{0}\u3068{1}\u306E\u4E21\u65B9\u3092\u5BA3\u8A00\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.array.and.varargs={2}で{0}と{1}の両方を宣言することはできません
 
-compiler.err.array.dimension.missing=\u914D\u5217\u306E\u5927\u304D\u3055\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.array.dimension.missing=配列の大きさが指定されていません
 
-compiler.err.illegal.array.creation.both.dimension.and.initialization=\u6B21\u5143\u5F0F\u3068\u521D\u671F\u5316\u306E\u4E21\u65B9\u3092\u4F7F\u7528\u3057\u305F\u914D\u5217\u306E\u4F5C\u6210\u306F\u7121\u52B9\u3067\u3059
+compiler.err.illegal.array.creation.both.dimension.and.initialization=次元式と初期化の両方を使用した配列の作成は無効です
 
 # 0: type
-compiler.err.array.req.but.found=\u914D\u5217\u304C\u8981\u6C42\u3055\u308C\u307E\u3057\u305F\u304C\u3001{0}\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
+compiler.err.array.req.but.found=配列が要求されましたが、{0}が見つかりました
 
-compiler.err.attribute.value.must.be.constant=\u8981\u7D20\u5024\u306F\u5B9A\u6570\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.attribute.value.must.be.constant=要素値は定数式である必要があります
 
 # 0: string (statement type)
-compiler.err.bad.initializer={0}\u306E\u4E0D\u6B63\u306A\u521D\u671F\u5316\u5B50
+compiler.err.bad.initializer={0}の不正な初期化子
 
-compiler.err.break.outside.switch.loop=break\u304Cswitch\u6587\u307E\u305F\u306F\u30EB\u30FC\u30D7\u306E\u5916\u306B\u3042\u308A\u307E\u3059
+compiler.err.break.outside.switch.loop=breakがswitch文またはループの外にあります
 
-compiler.err.break.outside.switch.expression=switch\u5F0F\u306E\u5916\u5074\u3067break\u3092\u5B9F\u884C\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059
+compiler.err.break.outside.switch.expression=switch式の外側でbreakを実行しようとしています
 
-compiler.err.continue.outside.switch.expression=switch\u5F0F\u306E\u5916\u5074\u3067continue\u3092\u5B9F\u884C\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059
+compiler.err.continue.outside.switch.expression=switch式の外側でcontinueを実行しようとしています
 
-compiler.err.return.outside.switch.expression=switch\u5F0F\u306E\u5916\u5074\u3067return\u3092\u5B9F\u884C\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059
+compiler.err.return.outside.switch.expression=switch式の外側でreturnを実行しようとしています
 
-compiler.err.rule.completes.normally=switch\u30EB\u30FC\u30EB\u304C\u5024\u3092\u63D0\u4F9B\u305B\u305A\u306B\u5B8C\u4E86\u3057\u307E\u3057\u305F\n(switch\u5F0F\u306Eswitch\u30EB\u30FC\u30EB\u306F\u5024\u307E\u305F\u306F\u30B9\u30ED\u30FC\u3092\u63D0\u4F9B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059)
+compiler.err.rule.completes.normally=switchルールが値を提供せずに完了しました\n(switch式のswitchルールは値またはスローを提供する必要があります)
 
-compiler.err.switch.expression.completes.normally=switch\u5F0F\u304C\u5024\u3092\u63D0\u4F9B\u305B\u305A\u306B\u5B8C\u4E86\u3057\u307E\u3057\u305F\n(switch\u5F0F\u306F\u3059\u3079\u3066\u306E\u53EF\u80FD\u306A\u5165\u529B\u5024\u306B\u3064\u3044\u3066\u5024\u307E\u305F\u306F\u30B9\u30ED\u30FC\u3092\u63D0\u4F9B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059)
+compiler.err.switch.expression.completes.normally=switch式が値を提供せずに完了しました\n(switch式はすべての可能な入力値について値またはスローを提供する必要があります)
 
-compiler.err.no.switch.expression =switch\u5F0F\u306E\u5916\u5074\u306Eyield
+compiler.err.no.switch.expression =switch式の外側のyield
 
-compiler.err.no.switch.expression.qualify=switch\u5F0F\u306E\u5916\u5074\u306Eyield\n(yield\u3068\u3044\u3046\u30E1\u30BD\u30C3\u30C9\u3092\u547C\u3073\u51FA\u3059\u306B\u306F\u3001yield\u3092\u53D7\u53D6\u308A\u5074\u307E\u305F\u306F\u30BF\u30A4\u30D7\u540D\u3067\u4FEE\u98FE\u3057\u307E\u3059)
+compiler.err.no.switch.expression.qualify=switch式の外側のyield\n(yieldというメソッドを呼び出すには、yieldを受取り側またはタイプ名で修飾します)
 
-compiler.err.invalid.yield=\u5236\u9650\u3055\u308C\u305F\u8B58\u5225\u5B50''yield''\u306E\u4F7F\u7528\u306F\u7121\u52B9\u3067\u3059\n(yield\u3068\u3044\u3046\u30E1\u30BD\u30C3\u30C9\u3092\u547C\u3073\u51FA\u3059\u306B\u306F\u3001yield\u3092\u53D7\u53D6\u308A\u5074\u307E\u305F\u306F\u30BF\u30A4\u30D7\u540D\u3067\u4FEE\u98FE\u3057\u307E\u3059)
+compiler.err.invalid.yield=制限された識別子''yield''の使用は無効です\n(yieldというメソッドを呼び出すには、yieldを受取り側またはタイプ名で修飾します)
 
-compiler.warn.invalid.yield=''yield''\u306F\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u5236\u9650\u3055\u308C\u305F\u8B58\u5225\u5B50\u306B\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\n(yield\u3068\u3044\u3046\u30E1\u30BD\u30C3\u30C9\u3092\u547C\u3073\u51FA\u3059\u306B\u306F\u3001yield\u3092\u53D7\u53D6\u308A\u5074\u307E\u305F\u306F\u30BF\u30A4\u30D7\u540D\u3067\u4FEE\u98FE\u3057\u307E\u3059)
+compiler.warn.invalid.yield=''yield''は将来のリリースで制限された識別子になる可能性があります\n(yieldというメソッドを呼び出すには、yieldを受取り側またはタイプ名で修飾します)
 
-compiler.err.switch.expression.empty=switch\u5F0F\u306Bcase\u53E5\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.switch.expression.empty=switch式にcase句がありません
 
-compiler.err.switch.expression.no.result.expressions=switch\u5F0F\u306B\u7D50\u679C\u5F0F\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.switch.expression.no.result.expressions=switch式に結果式がありません
 
 # 0: name
-compiler.err.call.must.be.first.stmt.in.ctor={0}\u306E\u547C\u51FA\u3057\u306F\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u5148\u982D\u6587\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.call.must.be.first.stmt.in.ctor={0}の呼出しはコンストラクタの先頭文である必要があります
 
 # 0: symbol kind, 1: name, 2: symbol kind, 3: type, 4: message segment
-compiler.err.cant.apply.symbol.noargs={2} {3}\u306E{0} {1}\u306F\u6307\u5B9A\u3055\u308C\u305F\u578B\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {4}
+compiler.err.cant.apply.symbol.noargs={2} {3}の{0} {1}は指定された型に適用できません。\n理由: {4}
 
 # 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
-compiler.err.cant.apply.symbol={4} {5}\u306E{0} {1}\u306F\u6307\u5B9A\u3055\u308C\u305F\u578B\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024:    {3}\n\u7406\u7531: {6}
+compiler.err.cant.apply.symbol={4} {5}の{0} {1}は指定された型に適用できません。\n期待値: {2}\n検出値:    {3}\n理由: {6}
 
 # 0: symbol kind, 1: name, 2: list of type
-compiler.err.cant.apply.symbols={1}\u306B\u9069\u5207\u306A{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093({2})
+compiler.err.cant.apply.symbols={1}に適切な{0}が見つかりません({2})
 
 # 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
-compiler.misc.cant.apply.symbol={4} {5}\u306E{0} {1}\u306F\u6307\u5B9A\u3055\u308C\u305F\u578B\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024:    {3}\n\u7406\u7531: {6}
+compiler.misc.cant.apply.symbol={4} {5}の{0} {1}は指定された型に適用できません\n期待値: {2}\n検出値:    {3}\n理由: {6}
 
 # 0: list of type or message segment, 1: list of type or message segment, 2: message segment
-compiler.misc.cant.apply.array.ctor=\u6307\u5B9A\u3055\u308C\u305F\u578B\u304B\u3089\u914D\u5217\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\n\u671F\u5F85\u5024: {0}\n\u691C\u51FA\u5024:    {1}\n\u7406\u7531:   {2}
+compiler.misc.cant.apply.array.ctor=指定された型から配列を作成できません\n期待値: {0}\n検出値:    {1}\n理由:   {2}
 
 # 0: symbol kind, 1: name, 2: list of type
-compiler.misc.cant.apply.symbols={1}\u306B\u9069\u5207\u306A{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093({2})
+compiler.misc.cant.apply.symbols={1}に適切な{0}が見つかりません({2})
 
 # 0: kind name, 1: symbol
-compiler.misc.no.abstracts={0} {1}\u3067\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+compiler.misc.no.abstracts={0} {1}で抽象メソッドが見つかりません
 
 # 0: kind name, 1: symbol
-compiler.misc.incompatible.abstracts={0} {1}\u3067\u8907\u6570\u306E\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u306A\u3044\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
+compiler.misc.incompatible.abstracts={0} {1}で複数のオーバーライドしない抽象メソッドが見つかりました
 
-compiler.err.bad.functional.intf.anno=\u4E88\u671F\u3057\u306A\u3044@FunctionalInterface\u6CE8\u91C8
+compiler.err.bad.functional.intf.anno=予期しない@FunctionalInterface注釈
 
 # 0: message segment
-compiler.err.bad.functional.intf.anno.1=\u4E88\u671F\u3057\u306A\u3044@FunctionalInterface\u6CE8\u91C8\n{0}
+compiler.err.bad.functional.intf.anno.1=予期しない@FunctionalInterface注釈\n{0}
 
 # 0: message segment
-compiler.err.anonymous.diamond.method.does.not.override.superclass=\u30E1\u30BD\u30C3\u30C9\u306F\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u5B9F\u88C5\u3057\u307E\u305B\u3093\n{0}
+compiler.err.anonymous.diamond.method.does.not.override.superclass=メソッドはスーパータイプのメソッドをオーバーライドまたは実装しません\n{0}
 
 # 0: symbol
-compiler.misc.not.a.functional.intf={0}\u306F\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.misc.not.a.functional.intf={0}は機能インタフェースではありません
 
 # 0: symbol, 1: message segment
-compiler.misc.not.a.functional.intf.1={0}\u306F\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\n{1}
+compiler.misc.not.a.functional.intf.1={0}は機能インタフェースではありません\n{1}
 
 # 0: type, 1: kind name, 2: symbol
-compiler.misc.invalid.generic.lambda.target=\u30E9\u30E0\u30C0\u5F0F\u306E\u6A5F\u80FD\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u304C\u7121\u52B9\u3067\u3059\n{1} {2}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u306F\u6C4E\u7528\u3067\u3059
+compiler.misc.invalid.generic.lambda.target=ラムダ式の機能ディスクリプタが無効です\n{1} {2}のメソッド{0}は汎用です
 
 # 0: kind name, 1: symbol
-compiler.misc.incompatible.descs.in.functional.intf={0} {1}\u3067\u4E0D\u9069\u5408\u306A\u6A5F\u80FD\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
+compiler.misc.incompatible.descs.in.functional.intf={0} {1}で不適合な機能ディスクリプタが見つかりました
 
 # 0: name, 1: list of type, 2: type, 3: list of type
-compiler.misc.descriptor=\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF: {2} {0}({1})
+compiler.misc.descriptor=ディスクリプタ: {2} {0}({1})
 
 # 0: name, 1: list of type, 2: type, 3: list of type
-compiler.misc.descriptor.throws=\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF: {2} {0}({1})\u3067{3}\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3059
+compiler.misc.descriptor.throws=ディスクリプタ: {2} {0}({1})で{3}がスローされます
 
 # 0: type
-compiler.misc.no.suitable.functional.intf.inst={0}\u306E\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093
+compiler.misc.no.suitable.functional.intf.inst={0}の機能インタフェース・ディスクリプタを推論できません
 
 # 0: message segment
-compiler.misc.bad.intersection.target.for.functional.expr=\u30E9\u30E0\u30C0\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u4EA4\u5DEE\u30BF\u30A4\u30D7\u30FB\u30BF\u30FC\u30B2\u30C3\u30C8\u304C\u4E0D\u6B63\u3067\u3059\n{0}
+compiler.misc.bad.intersection.target.for.functional.expr=ラムダまたはメソッド参照の交差タイプ・ターゲットが不正です\n{0}
 
 # 0: symbol or type
-compiler.misc.not.an.intf.component=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7{0}\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.misc.not.an.intf.component=コンポーネント・タイプ{0}はインタフェースではありません
 
 # 0: kind name, 1: message segment
-compiler.err.invalid.mref={0}\u53C2\u7167\u304C\u7121\u52B9\u3067\u3059\n{1}
+compiler.err.invalid.mref={0}参照が無効です\n{1}
 
 # 0: kind name, 1: message segment
-compiler.misc.invalid.mref={0}\u53C2\u7167\u304C\u7121\u52B9\u3067\u3059\n{1}
+compiler.misc.invalid.mref={0}参照が無効です\n{1}
 
-compiler.misc.static.mref.with.targs=static\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u5316\u3055\u308C\u305F\u4FEE\u98FE\u5B50
+compiler.misc.static.mref.with.targs=staticメソッド参照のパラメータ化された修飾子
 
 # 0: set of flag or string, 1: symbol
-compiler.err.cant.assign.val.to.var={0}\u5909\u6570{1}\u306B\u5024\u3092\u5272\u308A\u5F53\u3066\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.cant.assign.val.to.var={0}変数{1}に値を割り当てることはできません
 
-compiler.err.cant.assign.val.to.this=''\u3053\u308C''\u306B\u5272\u308A\u5F53\u3066\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.cant.assign.val.to.this=''これ''に割り当てることはできません
 
 # 0: symbol, 1: message segment
-compiler.err.cant.ref.non.effectively.final.var={1}\u304B\u3089\u53C2\u7167\u3055\u308C\u308B\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u306F\u3001final\u307E\u305F\u306F\u4E8B\u5B9F\u4E0A\u306Efinal\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.cant.ref.non.effectively.final.var={1}から参照されるローカル変数は、finalまたは事実上のfinalである必要があります
 
-compiler.err.try.with.resources.expr.needs.var=try-with-resources\u30EA\u30BD\u30FC\u30B9\u306F\u3001final\u5909\u6570\u307E\u305F\u306F\u4E8B\u5B9F\u4E0A\u306Efinal\u5909\u6570\u3078\u306E\u53C2\u7167\u3092\u793A\u3059\u5909\u6570\u5BA3\u8A00\u307E\u305F\u306F\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.try.with.resources.expr.needs.var=try-with-resourcesリソースは、final変数または事実上のfinal変数への参照を示す変数宣言または式である必要があります
 
 # 0: symbol
-compiler.err.try.with.resources.expr.effectively.final.var=try-with-resources\u30EA\u30BD\u30FC\u30B9\u3068\u3057\u3066\u4F7F\u7528\u3055\u308C\u308B\u5909\u6570{0}\u304C\u3001final\u3067\u3082\u4E8B\u5B9F\u4E0A\u306Efinal\u3067\u3082\u3042\u308A\u307E\u305B\u3093
+compiler.err.try.with.resources.expr.effectively.final.var=try-with-resourcesリソースとして使用される変数{0}が、finalでも事実上のfinalでもありません
 
 
-compiler.misc.lambda=\u30E9\u30E0\u30C0\u5F0F
+compiler.misc.lambda=ラムダ式
 
-compiler.misc.inner.cls=\u5185\u90E8\u30AF\u30E9\u30B9
+compiler.misc.inner.cls=内部クラス
 
-compiler.misc.guard=\u30AC\u30FC\u30C9
+compiler.misc.guard=ガード
 
 # 0: type
-compiler.err.cant.deref={0}\u306F\u9593\u63A5\u53C2\u7167\u3067\u304D\u307E\u305B\u3093
+compiler.err.cant.deref={0}は間接参照できません
 
-compiler.err.cant.extend.intf.annotation=@interfaces\u3067\u306F''extends''\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.cant.extend.intf.annotation=@interfacesでは''extends''は許可されません
 
-compiler.err.annotation.decl.not.allowed.here=\u3053\u3053\u3067\u306F\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.annotation.decl.not.allowed.here=ここでは注釈インタフェースの宣言は許可されません
 
 # 0: symbol
-compiler.err.cant.inherit.from.final=final {0}\u304B\u3089\u306F\u7D99\u627F\u3067\u304D\u307E\u305B\u3093
+compiler.err.cant.inherit.from.final=final {0}からは継承できません
 
 # 0: symbol or string
-compiler.err.cant.ref.before.ctor.called=\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u547C\u51FA\u3057\u524D\u306F{0}\u3092\u53C2\u7167\u3067\u304D\u307E\u305B\u3093
+compiler.err.cant.ref.before.ctor.called=スーパータイプのコンストラクタの呼出し前は{0}を参照できません
 
-compiler.err.cant.select.static.class.from.param.type=\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3055\u308C\u305F\u578B\u304B\u3089static\u30AF\u30E9\u30B9\u3092\u9078\u629E\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.cant.select.static.class.from.param.type=パラメータにされた型からstaticクラスを選択することはできません
 
 # 0: symbol, 1: string, 2: string
-compiler.err.cant.inherit.diff.arg={0}\u3092\u7570\u306A\u308B\u5F15\u6570<{1}>\u3068<{2}>\u3067\u7D99\u627F\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.cant.inherit.diff.arg={0}を異なる引数<{1}>と<{2}>で継承することはできません
 
-compiler.err.catch.without.try=''catch''\u3078\u306E''try''\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.catch.without.try=''catch''への''try''がありません
 
 # 0: kind name, 1: symbol
-compiler.err.clash.with.pkg.of.same.name={0} {1}\u306F\u540C\u540D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u7AF6\u5408\u3057\u307E\u3059
+compiler.err.clash.with.pkg.of.same.name={0} {1}は同名のパッケージと競合します
 
-compiler.err.class.not.allowed=\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u307E\u305F\u306F\u5217\u6319\u578B\u306E\u5BA3\u8A00\u3092\u3053\u3053\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.class.not.allowed=クラス、インタフェースまたは列挙型の宣言をここで使用することはできません
 
-compiler.err.const.expr.req=\u5B9A\u6570\u5F0F\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.const.expr.req=定数式が必要です
 
-compiler.err.pattern.or.enum.req=\u30D1\u30BF\u30FC\u30F3\u307E\u305F\u306F\u5217\u6319\u578B\u306E\u5B9A\u6570\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.pattern.or.enum.req=パターンまたは列挙型の定数が必要です
 
-compiler.err.cont.outside.loop=continue\u304C\u30EB\u30FC\u30D7\u306E\u5916\u306B\u3042\u308A\u307E\u3059
+compiler.err.cont.outside.loop=continueがループの外にあります
 
 # 0: symbol or type
-compiler.err.cyclic.inheritance={0}\u3092\u542B\u3080\u7D99\u627F\u304C\u30EB\u30FC\u30D7\u3057\u3066\u3044\u307E\u3059
+compiler.err.cyclic.inheritance={0}を含む継承がループしています
 
 # 0: symbol
-compiler.err.cyclic.annotation.element=\u8981\u7D20{0}\u306E\u578B\u304C\u30EB\u30FC\u30D7\u3057\u3066\u3044\u307E\u3059
+compiler.err.cyclic.annotation.element=要素{0}の型がループしています
 
 # 0: symbol
-compiler.err.call.to.super.not.allowed.in.enum.ctor=\u5217\u6319\u578B\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3067\u306F\u3001\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9\u306E\u547C\u51FA\u3057\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.call.to.super.not.allowed.in.enum.ctor=列挙型コンストラクタでは、スーパークラスの呼出しはできません
 
 # 0: type
-compiler.err.no.superclass={0}\u306B\u306F\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+compiler.err.no.superclass={0}にはスーパークラスがありません。
 
 # 0: symbol, 1: type, 2: symbol, 3: type, 4: type
-compiler.err.concrete.inheritance.conflict={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3068{3}\u306E{2}\u306F\u540C\u3058\u30B7\u30B0\u30CB\u30C1\u30E3\u304B\u3089\u7D99\u627F\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.concrete.inheritance.conflict={1}のメソッド{0}と{3}の{2}は同じシグニチャから継承されています
 
-compiler.err.default.allowed.in.intf.annotation.member=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
+compiler.err.default.allowed.in.intf.annotation.member=デフォルト値は注釈インタフェースの宣言でのみ使用できます
 
 # 0: symbol
-compiler.err.doesnt.exist=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
+compiler.err.doesnt.exist=パッケージ{0}は存在しません
 
 # 0: type
-compiler.err.duplicate.annotation.invalid.repeated=\u6CE8\u91C8{0}\u306F\u6709\u52B9\u306A\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.duplicate.annotation.invalid.repeated=注釈{0}は有効な繰返し可能な注釈ではありません
 
 # 0: name, 1: type
-compiler.err.duplicate.annotation.member.value=\u6CE8\u91C8@{1}\u306B\u91CD\u8907\u3057\u305F\u8981\u7D20''{0}''\u304C\u3042\u308A\u307E\u3059\u3002
+compiler.err.duplicate.annotation.member.value=注釈@{1}に重複した要素''{0}''があります。
 
 # 0: type
-compiler.err.duplicate.annotation.missing.container={0}\u306F\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.duplicate.annotation.missing.container={0}は繰返し可能な注釈インタフェースではありません
 
 # 0: symbol
-compiler.err.invalid.repeatable.annotation=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {0}\u306F\u7121\u52B9\u306A@Repeatable\u6CE8\u91C8\u3067\u6CE8\u91C8\u4ED8\u3051\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation=注釈が重複しています: {0}は無効な@Repeatable注釈で注釈付けされています
 
 # 0: symbol or type
-compiler.err.invalid.repeatable.annotation.no.value={0}\u306F\u6709\u52B9\u306A@Repeatable\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u5024\u8981\u7D20\u30E1\u30BD\u30C3\u30C9\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.invalid.repeatable.annotation.no.value={0}は有効な@Repeatableではありません。値要素メソッドが宣言されていません
 
 # 0: type, 1: number
-compiler.err.invalid.repeatable.annotation.multiple.values={0}\u306F\u6709\u52B9\u306A@Repeatable\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002{1}\u8981\u7D20\u30E1\u30BD\u30C3\u30C9''value''\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.multiple.values={0}は有効な@Repeatableではありません。{1}要素メソッド''value''が宣言されています
 
 # 0: type
-compiler.err.invalid.repeatable.annotation.invalid.value={0}\u306F\u6709\u52B9\u306A@Repeatable\u3067\u306F\u3042\u308A\u307E\u305B\u3093: \u5024\u8981\u7D20\u304C\u7121\u52B9\u3067\u3059
+compiler.err.invalid.repeatable.annotation.invalid.value={0}は有効な@Repeatableではありません: 値要素が無効です
 
 # 0: symbol or type, 1: type, 2: type
-compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u578B{2}\u306E\u8981\u7D20''value''\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.invalid.repeatable.annotation.value.return=包含する注釈インタフェース({0})は型{2}の要素''value''を宣言する必要があります
 
 # 0: symbol or type, 1: symbol
-compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u306B\u306F\u8981\u7D20{1}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.invalid.repeatable.annotation.elem.nondefault=包含する注釈インタフェース{0}には要素{1}のデフォルト値が指定されていません
 
 # 0: symbol, 1: string, 2: symbol, 3: string
-compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306E\u4FDD\u6709\u304C\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({2})\u306E\u4FDD\u6709\u3088\u308A\u77ED\u304F\u306A\u3063\u3066\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.retention=包含する注釈インタフェース({0})の保有が、繰返し可能な注釈インタフェース({2})の保有より短くなっています
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.documented=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({1})\u306F@Documented\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u9055\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.not.documented=繰返し可能な注釈インタフェース({1})は@Documentedですが、包含する注釈インタフェース({0})は違います
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.inherited=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({1})\u306F@Inherited\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u9055\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.not.inherited=繰返し可能な注釈インタフェース({1})は@Inheritedですが、包含する注釈インタフェース({0})は違います
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({1})\u3088\u308A\u591A\u304F\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059
+compiler.err.invalid.repeatable.annotation.incompatible.target=包含する注釈インタフェース({0})は、繰返し可能な注釈インタフェース({1})より多くのターゲットに適用されます
 
 # 0: symbol
-compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\u30B3\u30F3\u30C6\u30CA{0}\u306F\u542B\u307E\u308C\u3066\u3044\u308B\u8981\u7D20\u3068\u540C\u6642\u306B\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093
+compiler.err.invalid.repeatable.annotation.repeated.and.container.present=コンテナ{0}は含まれている要素と同時に指定できません
 
 # 0: type, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.applicable=\u30B3\u30F3\u30C6\u30CA{0}\u306F\u8981\u7D20{1}\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.invalid.repeatable.annotation.not.applicable=コンテナ{0}は要素{1}に使用できません
 
 # 0: type
-compiler.err.invalid.repeatable.annotation.not.applicable.in.context=\u30B3\u30F3\u30C6\u30CA{0}\u306F\u3053\u306E\u578B\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.invalid.repeatable.annotation.not.applicable.in.context=コンテナ{0}はこの型のコンテキストに使用できません
 
 # 0: name
-compiler.err.duplicate.class=\u30AF\u30E9\u30B9{0}\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
+compiler.err.duplicate.class=クラス{0}が重複しています
 
 # 0: string
-compiler.err.bad.file.name=\u4E0D\u6B63\u306A\u30D5\u30A1\u30A4\u30EB\u540D: {0}
+compiler.err.bad.file.name=不正なファイル名: {0}
 
-compiler.err.unnamed.class.should.not.have.package.declaration=\u7121\u540D\u30AF\u30E9\u30B9\u306B\u30D1\u30C3\u30B1\u30FC\u30B8\u5BA3\u8A00\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.unnamed.class.should.not.have.package.declaration=無名クラスにパッケージ宣言を含めることはできません
 
-compiler.err.unnamed.class.does.not.have.main.method=\u7121\u540D\u30AF\u30E9\u30B9\u306Bvoid main()\u307E\u305F\u306Fvoid main(String[] args)\u3068\u3044\u3046\u5F62\u5F0F\u306Emain\u30E1\u30BD\u30C3\u30C9\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.unnamed.class.does.not.have.main.method=無名クラスにvoid main()またはvoid main(String[] args)という形式のmainメソッドがありません
 
 # 0: name, 1: name
-compiler.err.same.binary.name=\u30AF\u30E9\u30B9: {0}\u3068{1}\u306E\u30D0\u30A4\u30CA\u30EA\u540D\u304C\u540C\u3058\u3067\u3059
+compiler.err.same.binary.name=クラス: {0}と{1}のバイナリ名が同じです
 
-compiler.err.duplicate.case.label=case\u30E9\u30D9\u30EB\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
+compiler.err.duplicate.case.label=caseラベルが重複しています
 
-compiler.err.pattern.dominated=\u5148\u884C\u3059\u308Bcase\u30E9\u30D9\u30EB\u304C\u3001\u3053\u306Ecase\u30E9\u30D9\u30EB\u3088\u308A\u3082\u512A\u4F4D\u3067\u3059
+compiler.err.pattern.dominated=先行するcaseラベルが、このcaseラベルよりも優位です
 
-compiler.err.duplicate.default.label=default\u30E9\u30D9\u30EB\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
+compiler.err.duplicate.default.label=defaultラベルが重複しています
 
-compiler.err.duplicate.unconditional.pattern=\u7121\u6761\u4EF6\u30D1\u30BF\u30FC\u30F3\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
+compiler.err.duplicate.unconditional.pattern=無条件パターンが重複しています
 
-compiler.err.unconditional.pattern.and.default=switch\u306B\u7121\u6761\u4EF6\u30D1\u30BF\u30FC\u30F3\u3068default\u30E9\u30D9\u30EB\u306E\u4E21\u65B9\u304C\u3042\u308A\u307E\u3059
+compiler.err.unconditional.pattern.and.default=switchに無条件パターンとdefaultラベルの両方があります
 
-compiler.err.guard.not.allowed=\u30AC\u30FC\u30C9\u306F\u30D1\u30BF\u30FC\u30F3\u306E\u3042\u308Bcase\u3067\u306E\u307F\u8A31\u53EF\u3055\u308C\u307E\u3059
+compiler.err.guard.not.allowed=ガードはパターンのあるcaseでのみ許可されます
 
-compiler.err.guard.has.constant.expression.false=\u3053\u306Ecase\u30E9\u30D9\u30EB\u306B\u306F\u3001\u5024\u304C''false''\u306E\u5B9A\u6570\u5F0F\u3067\u3042\u308B\u30AC\u30FC\u30C9\u304C\u3042\u308A\u307E\u3059
+compiler.err.guard.has.constant.expression.false=このcaseラベルには、値が''false''の定数式であるガードがあります
 
 # 0: symbol
-compiler.err.cannot.assign.not.declared.guard=\u30AC\u30FC\u30C9\u5185\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001{0}\u306B\u5272\u308A\u5F53\u3066\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.cannot.assign.not.declared.guard=ガード内で宣言されていないため、{0}に割り当てることはできません
 
 # 0: type, 1: type
-compiler.err.constant.label.not.compatible=\u30BF\u30A4\u30D7{0}\u306E\u5B9A\u6570\u30E9\u30D9\u30EB\u304Cswitch\u30BB\u30EC\u30AF\u30BF\u30FB\u30BF\u30A4\u30D7{1}\u3068\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.constant.label.not.compatible=タイプ{0}の定数ラベルがswitchセレクタ・タイプ{1}と互換性がありません
 
-compiler.err.flows.through.to.pattern=\u30D1\u30BF\u30FC\u30F3\u306B\u5BFE\u3057\u3066\u4E0D\u6B63\u306Afall-through
+compiler.err.flows.through.to.pattern=パターンに対して不正なfall-through
 
-compiler.err.flows.through.from.pattern=\u30D1\u30BF\u30FC\u30F3\u304B\u3089\u306E\u4E0D\u6B63\u306Afall-through
+compiler.err.flows.through.from.pattern=パターンからの不正なfall-through
 
-compiler.err.invalid.case.label.combination=case\u30E9\u30D9\u30EB\u306E\u7D44\u5408\u305B\u304C\u7121\u52B9\u3067\u3059
+compiler.err.invalid.case.label.combination=caseラベルの組合せが無効です
 
-compiler.err.default.label.not.allowed=\u3053\u3053\u3067\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30E9\u30D9\u30EB\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.default.label.not.allowed=ここではデフォルトのラベルは使用できません
 
-compiler.err.pattern.type.cannot.infer=\u30D1\u30BF\u30FC\u30F3\u30FB\u30BF\u30A4\u30D7\u3092\u63A8\u6E2C\u3067\u304D\u307E\u305B\u3093
+compiler.err.pattern.type.cannot.infer=パターン・タイプを推測できません
 
-compiler.err.else.without.if=''else''\u3078\u306E''if''\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.else.without.if=''else''への''if''がありません
 
-compiler.err.empty.char.lit=\u7A7A\u306E\u6587\u5B57\u30EA\u30C6\u30E9\u30EB\u3067\u3059
+compiler.err.empty.char.lit=空の文字リテラルです
 
 # 0: symbol
-compiler.err.encl.class.required={0}\u3092\u542B\u3080\u56F2\u3046\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.encl.class.required={0}を含む囲うインスタンスが必要です
 
-compiler.err.enum.annotation.must.be.enum.constant=\u5217\u6319\u578B\u6CE8\u91C8\u5024\u306F\u3001\u5217\u6319\u578B\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.enum.annotation.must.be.enum.constant=列挙型注釈値は、列挙型定数である必要があります
 
-compiler.err.enum.cant.be.instantiated=\u5217\u6319\u30AF\u30E9\u30B9\u306F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093
+compiler.err.enum.cant.be.instantiated=列挙クラスはインスタンス化できません
 
-compiler.err.enum.label.must.be.unqualified.enum=\u5217\u6319\u578B\u306Eswitch case\u30E9\u30D9\u30EB\u306F\u5217\u6319\u578B\u5B9A\u6570\u306E\u975E\u4FEE\u98FE\u540D\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.enum.label.must.be.unqualified.enum=列挙型のswitch caseラベルは列挙型定数の非修飾名である必要があります
 
-compiler.err.enum.label.must.be.enum.constant=\u5217\u6319\u578B\u306Eswitch constant case\u30E9\u30D9\u30EB\u306F\u5217\u6319\u578B\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.enum.label.must.be.enum.constant=列挙型のswitch constant caseラベルは列挙型定数である必要があります
 
-compiler.err.enum.no.subclassing=\u30AF\u30E9\u30B9\u306F\u76F4\u63A5java.lang.Enum\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093
+compiler.err.enum.no.subclassing=クラスは直接java.lang.Enumを拡張できません
 
-compiler.err.enum.types.not.extensible=\u5217\u6319\u30AF\u30E9\u30B9\u306F\u62E1\u5F35\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.enum.types.not.extensible=列挙クラスは拡張可能ではありません
 
-compiler.err.enum.no.finalize=\u5217\u6319\u578B\u306Ffinalize\u30E1\u30BD\u30C3\u30C9\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.enum.no.finalize=列挙型はfinalizeメソッドを持つことはできません
 
-compiler.err.enum.cant.be.generic=\u5217\u6319\u578B\u306F\u6C4E\u7528\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.enum.cant.be.generic=列挙型は汎用にできません
 
 # 0: file name, 1: string
-compiler.err.error.reading.file={0}\u306E\u8AAD\u8FBC\u307F\u30A8\u30E9\u30FC\u3067\u3059\u3002{1}
+compiler.err.error.reading.file={0}の読込みエラーです。{1}
 
 # 0: type
-compiler.err.except.already.caught=\u4F8B\u5916{0}\u306F\u3059\u3067\u306B\u6355\u6349\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.except.already.caught=例外{0}はすでに捕捉されています
 
 # 0: type
-compiler.err.except.never.thrown.in.try=\u4F8B\u5916{0}\u306F\u5BFE\u5FDC\u3059\u308Btry\u6587\u306E\u672C\u4F53\u3067\u306F\u30B9\u30ED\u30FC\u3055\u308C\u307E\u305B\u3093
+compiler.err.except.never.thrown.in.try=例外{0}は対応するtry文の本体ではスローされません
 
 # 0: symbol
-compiler.err.final.parameter.may.not.be.assigned=final\u30D1\u30E9\u30E1\u30FC\u30BF{0}\u306B\u5024\u3092\u4EE3\u5165\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.final.parameter.may.not.be.assigned=finalパラメータ{0}に値を代入することはできません
 
 # 0: symbol
-compiler.err.try.resource.may.not.be.assigned=\u81EA\u52D5\u30AF\u30ED\u30FC\u30BA\u53EF\u80FD\u306A\u30EA\u30BD\u30FC\u30B9{0}\u306B\u5024\u3092\u4EE3\u5165\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.try.resource.may.not.be.assigned=自動クローズ可能なリソース{0}に値を代入することはできません
 
 # 0: symbol
-compiler.err.multicatch.parameter.may.not.be.assigned=\u8907\u6570catch\u30D1\u30E9\u30E1\u30FC\u30BF{0}\u306B\u5024\u3092\u4EE3\u5165\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.multicatch.parameter.may.not.be.assigned=複数catchパラメータ{0}に値を代入することはできません
 
 # 0: type, 1: type
-compiler.err.multicatch.types.must.be.disjoint=\u8907\u6570catch\u6587\u306E\u4EE3\u66FF\u3092\u30B5\u30D6\u30AF\u30E9\u30B9\u5316\u306B\u3088\u3063\u3066\u95A2\u9023\u4ED8\u3051\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\n\u4EE3\u66FF{0}\u306F\u4EE3\u66FF{1}\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3067\u3059
+compiler.err.multicatch.types.must.be.disjoint=複数catch文の代替をサブクラス化によって関連付けることはできません\n代替{0}は代替{1}のサブクラスです
 
-compiler.err.finally.without.try=''finally''\u3078\u306E''try''\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.finally.without.try=''finally''への''try''がありません
 
 # 0: type, 1: message segment
-compiler.err.foreach.not.applicable.to.type=for-each\u306F\u5F0F\u306E\u30BF\u30A4\u30D7\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\n\u671F\u5F85\u5024: {1}\n\u691C\u51FA\u5024: {0}
+compiler.err.foreach.not.applicable.to.type=for-eachは式のタイプに使用できません\n期待値: {1}\n検出値: {0}
 
-compiler.err.fp.number.too.large=\u6D6E\u52D5\u5C0F\u6570\u70B9\u6570\u304C\u5927\u304D\u3059\u304E\u307E\u3059
+compiler.err.fp.number.too.large=浮動小数点数が大きすぎます
 
-compiler.err.fp.number.too.small=\u6D6E\u52D5\u5C0F\u6570\u70B9\u6570\u304C\u5C0F\u3055\u3059\u304E\u307E\u3059
+compiler.err.fp.number.too.small=浮動小数点数が小さすぎます
 
-compiler.err.generic.array.creation=\u6C4E\u7528\u914D\u5217\u3092\u4F5C\u6210\u3057\u307E\u3059
+compiler.err.generic.array.creation=汎用配列を作成します
 
-compiler.err.generic.throwable=\u6C4E\u7528\u30AF\u30E9\u30B9\u306Fjava.lang.Throwable\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093
+compiler.err.generic.throwable=汎用クラスはjava.lang.Throwableを拡張できません
 
 # 0: symbol
-compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u30AF\u30E9\u30B9{0}\u306E\u9759\u7684\u5BA3\u8A00\u304C\u4E0D\u6B63\u3067\u3059\n\u4FEE\u98FE\u5B50''static''\u306F\u5B9A\u6570\u304A\u3088\u3073\u5909\u6570\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
+compiler.err.icls.cant.have.static.decl=内部クラス{0}の静的宣言が不正です\n修飾子''static''は定数および変数の宣言でのみ使用できます
 
 # 0: string
-compiler.err.illegal.char=''{0}''\u306F\u4E0D\u6B63\u306A\u6587\u5B57\u3067\u3059
+compiler.err.illegal.char=''{0}''は不正な文字です
 
 # 0: string, 1: string
-compiler.err.illegal.char.for.encoding=\u3053\u306E\u6587\u5B57(0x{0})\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0{1}\u306B\u30DE\u30C3\u30D7\u3067\u304D\u307E\u305B\u3093
+compiler.err.illegal.char.for.encoding=この文字(0x{0})は、エンコーディング{1}にマップできません
 
 # 0: set of flag, 1: set of flag
-compiler.err.illegal.combination.of.modifiers=\u4FEE\u98FE\u5B50{0}\u3068{1}\u306E\u7D44\u5408\u305B\u306F\u4E0D\u6B63\u3067\u3059
+compiler.err.illegal.combination.of.modifiers=修飾子{0}と{1}の組合せは不正です
 
-compiler.err.illegal.enum.static.ref=\u521D\u671F\u5316\u5B50\u304B\u3089static\u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u53C2\u7167\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.illegal.enum.static.ref=初期化子からstaticフィールドへの参照が不正です
 
-compiler.err.illegal.esc.char=\u30A8\u30B9\u30B1\u30FC\u30D7\u6587\u5B57\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.illegal.esc.char=エスケープ文字が不正です
 
-compiler.err.illegal.forward.ref=\u524D\u65B9\u53C2\u7167\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.illegal.forward.ref=前方参照が不正です
 
 # 0: symbol, 1: object
-compiler.err.not.in.profile={0}\u306F\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB''{1}''\u3067\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.not.in.profile={0}はプロファイル''{1}''で使用できません
 
 # 0: symbol
-compiler.warn.forward.ref=\u521D\u671F\u5316\u3055\u308C\u308B\u524D\u306E\u5909\u6570''{0}''\u3092\u53C2\u7167\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F
+compiler.warn.forward.ref=初期化される前の変数''{0}''を参照しようとしました
 
-compiler.warn.possible.this.escape=\u30B5\u30D6\u30AF\u30E9\u30B9\u304C\u521D\u671F\u5316\u3055\u308C\u308B\u524D\u306E''this''\u30A8\u30B9\u30B1\u30FC\u30D7\u306E\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.warn.possible.this.escape=サブクラスが初期化される前の''this''エスケープの可能性があります
 
-compiler.warn.possible.this.escape.location=\u4E8B\u524D\u306E''this''\u30A8\u30B9\u30B1\u30FC\u30D7\u306F\u3053\u306E\u547C\u3073\u51FA\u3057\u3067\u51FA\u73FE\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.warn.possible.this.escape.location=事前の''this''エスケープはこの呼び出しで出現する可能性があります
 
-compiler.err.illegal.self.ref=\u521D\u671F\u5316\u5B50\u5185\u306E\u81EA\u5DF1\u53C2\u7167
+compiler.err.illegal.self.ref=初期化子内の自己参照
 
 # 0: symbol
-compiler.warn.self.ref=\u521D\u671F\u5316\u5B50\u5185\u306E\u5909\u6570''{0}''\u306E\u81EA\u5DF1\u53C2\u7167
+compiler.warn.self.ref=初期化子内の変数''{0}''の自己参照
 
 # 0: type
-compiler.err.illegal.initializer.for.type={0}\u306E\u521D\u671F\u5316\u5B50\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.illegal.initializer.for.type={0}の初期化子が不正です
 
-compiler.err.illegal.line.end.in.char.lit=\u6587\u5B57\u30EA\u30C6\u30E9\u30EB\u306E\u884C\u672B\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.illegal.line.end.in.char.lit=文字リテラルの行末が不正です
 
-compiler.err.illegal.text.block.open=\u30C6\u30AD\u30B9\u30C8\u30FB\u30D6\u30ED\u30C3\u30AF\u306E\u958B\u59CB\u533A\u5207\u308A\u6587\u5B57\u306E\u30B7\u30FC\u30B1\u30F3\u30B9\u304C\u7121\u52B9\u3067\u3059\u3002\u884C\u306E\u7D42\u4E86\u6587\u5B57\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.illegal.text.block.open=テキスト・ブロックの開始区切り文字のシーケンスが無効です。行の終了文字がありません
 
-compiler.warn.inconsistent.white.space.indentation=\u7A7A\u767D\u306E\u30A4\u30F3\u30C7\u30F3\u30C8\u306B\u4E00\u8CAB\u6027\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.warn.inconsistent.white.space.indentation=空白のインデントに一貫性がありません
 
-compiler.warn.trailing.white.space.will.be.removed=\u672B\u5C3E\u306E\u7A7A\u767D\u306F\u9664\u53BB\u3055\u308C\u307E\u3059
+compiler.warn.trailing.white.space.will.be.removed=末尾の空白は除去されます
 
-compiler.err.illegal.nonascii.digit=\u4E0D\u6B63\u306A\u975EASCII\u6570\u5B57\u3067\u3059
+compiler.err.illegal.nonascii.digit=不正な非ASCII数字です
 
-compiler.err.illegal.underscore=\u4E0D\u6B63\u306A\u30A2\u30F3\u30C0\u30FC\u30B9\u30B3\u30A2\u3067\u3059
+compiler.err.illegal.underscore=不正なアンダースコアです
 
-compiler.err.illegal.dot=\u4E0D\u6B63\u306A''.''\u3067\u3059
+compiler.err.illegal.dot=不正な''.''です
 
 # 0: symbol
-compiler.err.illegal.qual.not.icls=\u4FEE\u98FE\u5B50\u304C\u4E0D\u6B63\u3067\u3059\u3002{0}\u306F\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.illegal.qual.not.icls=修飾子が不正です。{0}は内部クラスではありません
 
-compiler.err.illegal.start.of.expr=\u5F0F\u306E\u958B\u59CB\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.illegal.start.of.expr=式の開始が不正です
 
-compiler.err.illegal.start.of.stmt=\u6587\u306E\u958B\u59CB\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.illegal.start.of.stmt=文の開始が不正です
 
-compiler.err.illegal.start.of.type=\u578B\u306E\u958B\u59CB\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.illegal.start.of.type=型の開始が不正です
 
-compiler.err.illegal.parenthesized.expression=\u30AB\u30C3\u30B3\u5185\u306E\u5F0F\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.illegal.parenthesized.expression=カッコ内の式が不正です
 
-compiler.err.illegal.unicode.esc=Unicode\u30A8\u30B9\u30B1\u30FC\u30D7\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.illegal.unicode.esc=Unicodeエスケープが不正です
 
 # 0: symbol
-compiler.err.import.requires.canonical=\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u306F{0}\u306E\u6A19\u6E96\u540D\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.import.requires.canonical=インポートには{0}の標準名が必要です
 
-compiler.err.improperly.formed.type.param.missing=\u578B\u306E\u5F62\u5F0F\u304C\u4E0D\u9069\u5207\u3067\u3059\u3002\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059
+compiler.err.improperly.formed.type.param.missing=型の形式が不適切です。パラメータが不足しています
 
-compiler.err.improperly.formed.type.inner.raw.param=\u578B\u306E\u5F62\u5F0F\u304C\u4E0D\u9069\u5207\u3067\u3059\u3002raw\u578B\u306B\u6307\u5B9A\u3055\u308C\u305F\u578B\u5F15\u6570\u3067\u3059
+compiler.err.improperly.formed.type.inner.raw.param=型の形式が不適切です。raw型に指定された型引数です
 
 # 0: type, 1: type
-compiler.err.incomparable.types=\u578B{0}\u3068{1}\u306F\u6BD4\u8F03\u3067\u304D\u307E\u305B\u3093
+compiler.err.incomparable.types=型{0}と{1}は比較できません
 
 # 0: string
-compiler.err.int.number.too.large=\u6574\u6570\u304C\u5927\u304D\u3059\u304E\u307E\u3059\u3002
+compiler.err.int.number.too.large=整数が大きすぎます。
 
-compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u304C\u4EEE\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.annotation.members.cant.have.params=注釈インタフェース宣言内の要素が仮パラメータを宣言できません
 
 # 0: symbol
-compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u306F\u6C4E\u7528\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.annotation.cant.have.type.params=注釈インタフェース{0}は汎用にできません
 
-compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u306F\u6C4E\u7528\u30E1\u30BD\u30C3\u30C9\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.annotation.members.cant.have.type.params=注釈インタフェース宣言内の要素は汎用メソッドにできません
 
 # 0: symbol, 1: type
-compiler.err.intf.annotation.member.clash=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{1}\u3067\u30E1\u30BD\u30C3\u30C9{0}\u3068\u540C\u3058\u540D\u524D\u306E\u8981\u7D20\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.intf.annotation.member.clash=注釈インタフェース{1}でメソッド{0}と同じ名前の要素が宣言されています
 
-compiler.err.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.intf.expected.here=ここにインタフェースが必要です
 
-compiler.err.intf.meth.cant.have.body=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.meth.cant.have.body=インタフェース抽象メソッドが本体を持つことはできません
 
-compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20\u306E\u578B\u304C\u7121\u52B9\u3067\u3059
+compiler.err.invalid.annotation.member.type=注釈インタフェース要素の型が無効です
 
-compiler.err.invalid.binary.number=2\u9032\u6570\u5B57\u306F\u5C11\u306A\u304F\u3068\u30821\u6841\u306E2\u9032\u6570\u3092\u542B\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.invalid.binary.number=2進数字は少なくとも1桁の2進数を含む必要があります
 
-compiler.err.invalid.hex.number=16\u9032\u6570\u5B57\u306F\u5C11\u306A\u304F\u3068\u30821\u6841\u306E16\u9032\u6570\u3092\u542B\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.invalid.hex.number=16進数字は少なくとも1桁の16進数を含む必要があります
 
-compiler.err.invalid.meth.decl.ret.type.req=\u7121\u52B9\u306A\u30E1\u30BD\u30C3\u30C9\u5BA3\u8A00\u3067\u3059\u3002\u623B\u308A\u5024\u306E\u578B\u304C\u5FC5\u8981\u3067\u3059\u3002
+compiler.err.invalid.meth.decl.ret.type.req=無効なメソッド宣言です。戻り値の型が必要です。
 
-compiler.err.varargs.and.old.array.syntax=\u65E7\u5F0F\u306E\u914D\u5217\u8868\u8A18\u6CD5\u306F\u53EF\u5909\u5F15\u6570\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.varargs.and.old.array.syntax=旧式の配列表記法は可変引数パラメータでは使用できません
 
-compiler.err.varargs.and.receiver =varargs\u8868\u8A18\u306F\u53D7\u53D6\u308A\u5074\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.varargs.and.receiver =varargs表記は受取り側パラメータで使用できません
 
-compiler.err.varargs.must.be.last =\u53EF\u5909\u5F15\u6570\u30D1\u30E9\u30E1\u30FC\u30BF\u306F\u6700\u5F8C\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.varargs.must.be.last =可変引数パラメータは最後のパラメータにする必要があります
 
-compiler.err.array.and.receiver =\u65E7\u5F0F\u306E\u914D\u5217\u8868\u8A18\u6CD5\u306F\u53D7\u53D6\u308A\u5074\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.array.and.receiver =旧式の配列表記法は受取り側パラメータでは使用できません
 
-compiler.err.wrong.receiver =\u53D7\u53D6\u308A\u5074\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u540D\u524D\u304C\u9593\u9055\u3063\u3066\u3044\u307E\u3059
+compiler.err.wrong.receiver =受取り側パラメータの名前が間違っています
 
-compiler.err.variable.not.allowed=\u5909\u6570\u306E\u5BA3\u8A00\u3092\u3053\u3053\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.variable.not.allowed=変数の宣言をここで使用することはできません
 
 # 0: name
-compiler.err.label.already.in.use=\u30E9\u30D9\u30EB{0}\u306F\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.label.already.in.use=ラベル{0}はすでに使用されています
 
-compiler.err.local.enum=\u5217\u6319\u30AF\u30E9\u30B9\u306F\u30ED\u30FC\u30AB\u30EB\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.local.enum=列挙クラスはローカルにできません
 
-compiler.err.cannot.create.array.with.type.arguments=\u578B\u5F15\u6570\u3092\u6301\u3064\u914D\u5217\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
+compiler.err.cannot.create.array.with.type.arguments=型引数を持つ配列を作成できません
 
-compiler.err.cannot.create.array.with.diamond=''<>''\u3092\u6301\u3064\u914D\u5217\u306F\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
+compiler.err.cannot.create.array.with.diamond=''<>''を持つ配列は作成できません
 
-compiler.err.invalid.module.directive=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30AD\u30FC\u30EF\u30FC\u30C9\u307E\u305F\u306F''}''\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.invalid.module.directive=モジュール・ディレクティブ・キーワードまたは''}''が必要です
 
 #
 # limits.  We don't give the limits in the diagnostic because we expect
 # them to change, yet we want to use the same diagnostic.  These are all
 # detected during code generation.
 #
-compiler.err.limit.code=\u30B3\u30FC\u30C9\u304C\u5927\u304D\u3059\u304E\u307E\u3059
+compiler.err.limit.code=コードが大きすぎます
 
-compiler.err.limit.code.too.large.for.try.stmt=try\u6587\u306E\u30B3\u30FC\u30C9\u304C\u5927\u304D\u3059\u304E\u307E\u3059
+compiler.err.limit.code.too.large.for.try.stmt=try文のコードが大きすぎます
 
-compiler.err.limit.dimensions=\u914D\u5217\u578B\u306E\u6B21\u5143\u304C\u591A\u3059\u304E\u307E\u3059
+compiler.err.limit.dimensions=配列型の次元が多すぎます
 
-compiler.err.limit.locals=\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u304C\u591A\u3059\u304E\u307E\u3059
+compiler.err.limit.locals=ローカル変数が多すぎます
 
-compiler.err.limit.parameters=\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u591A\u3059\u304E\u307E\u3059
+compiler.err.limit.parameters=パラメータが多すぎます
 
-compiler.err.limit.pool=\u5B9A\u6570\u304C\u591A\u3059\u304E\u307E\u3059
+compiler.err.limit.pool=定数が多すぎます
 
-compiler.err.limit.pool.in.class=\u30AF\u30E9\u30B9{0}\u5185\u306E\u5B9A\u6570\u304C\u591A\u3059\u304E\u307E\u3059
+compiler.err.limit.pool.in.class=クラス{0}内の定数が多すぎます
 
-compiler.err.limit.stack=\u30B3\u30FC\u30C9\u304C\u8981\u6C42\u3059\u308B\u30B9\u30BF\u30C3\u30AF\u304C\u591A\u3059\u304E\u307E\u3059
+compiler.err.limit.stack=コードが要求するスタックが多すぎます
 
-compiler.err.limit.string=\u5B9A\u6570\u6587\u5B57\u5217\u304C\u9577\u3059\u304E\u307E\u3059
+compiler.err.limit.string=定数文字列が長すぎます
 
 # 0: string
-compiler.err.limit.string.overflow=\u6587\u5B57\u5217"{0}..."\u306EUTF8\u8868\u73FE\u304C\u3001\u5B9A\u6570\u30D7\u30FC\u30EB\u306B\u5BFE\u3057\u3066\u9577\u3059\u304E\u307E\u3059
+compiler.err.limit.string.overflow=文字列"{0}..."のUTF8表現が、定数プールに対して長すぎます
 
-compiler.err.malformed.fp.lit=\u6D6E\u52D5\u5C0F\u6570\u70B9\u30EA\u30C6\u30E9\u30EB\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.malformed.fp.lit=浮動小数点リテラルが不正です
 
-compiler.err.method.does.not.override.superclass=\u30E1\u30BD\u30C3\u30C9\u306F\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u5B9F\u88C5\u3057\u307E\u305B\u3093
+compiler.err.method.does.not.override.superclass=メソッドはスーパータイプのメソッドをオーバーライドまたは実装しません
 
-compiler.err.static.methods.cannot.be.annotated.with.override=static\u30E1\u30BD\u30C3\u30C9\u306F@Override\u3067\u6CE8\u91C8\u4ED8\u3051\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.static.methods.cannot.be.annotated.with.override=staticメソッドは@Overrideで注釈付けすることはできません
 
-compiler.err.missing.meth.body.or.decl.abstract=\u30E1\u30BD\u30C3\u30C9\u672C\u4F53\u304C\u306A\u3044\u304B\u3001abstract\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.missing.meth.body.or.decl.abstract=メソッド本体がないか、abstractとして宣言されています
 
-compiler.err.missing.ret.stmt=return\u6587\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.missing.ret.stmt=return文が指定されていません
 
 # 0: type
-compiler.misc.missing.ret.val=\u623B\u308A\u5024\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.misc.missing.ret.val=戻り値がありません
 
-compiler.misc.unexpected.ret.val=\u4E88\u671F\u3057\u306A\u3044\u623B\u308A\u5024
+compiler.misc.unexpected.ret.val=予期しない戻り値
 
 # 0: set of flag
-compiler.err.mod.not.allowed.here=\u4FEE\u98FE\u5B50{0}\u3092\u3053\u3053\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.mod.not.allowed.here=修飾子{0}をここで使用することはできません
 
 # 0: name
-compiler.err.modifier.not.allowed.here=\u4FEE\u98FE\u5B50{0}\u3092\u3053\u3053\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.modifier.not.allowed.here=修飾子{0}をここで使用することはできません
 
-compiler.err.intf.not.allowed.here=\u3053\u3053\u3067\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.intf.not.allowed.here=ここではインタフェースは許可されません
 
 # 0: symbol, 1: symbol
-compiler.err.name.clash.same.erasure=\u540D\u524D\u304C\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059\u3002{0}\u3068{1}\u306F\u524A\u9664\u5F8C\u306E\u540D\u524D\u304C\u540C\u3058\u3067\u3059
+compiler.err.name.clash.same.erasure=名前が競合しています。{0}と{1}は削除後の名前が同じです
 
 # 0: name, 1: list of type, 2: symbol, 3: name, 4: list of type, 5: symbol
-compiler.err.name.clash.same.erasure.no.override=\u540D\u524D\u304C\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059\u3002{2}\u306E{0}({1})\u3068{5}\u306E{3}({4})\u306F\u307E\u3060\u4ED6\u65B9\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u305B\u3093\u304C\u3001\u524A\u9664\u5F8C\u306E\u540D\u524D\u304C\u540C\u3058\u3067\u3059
+compiler.err.name.clash.same.erasure.no.override=名前が競合しています。{2}の{0}({1})と{5}の{3}({4})はまだ他方をオーバーライドしていませんが、削除後の名前が同じです
 
 # 0: string, 1: name, 2: name, 3: list of type, 4: symbol, 5: name, 6: list of type, 7: symbol
-compiler.err.name.clash.same.erasure.no.override.1=\u540D\u524D\u304C\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059\u3002{0} {1}\u306F\u307E\u3060\u4ED6\u65B9\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u305B\u3093\u304C\u3001\u524A\u9664\u5F8C\u306E\u540D\u524D\u304C\u540C\u30582\u3064\u306E\u30E1\u30BD\u30C3\u30C9\u304C\u3042\u308A\u307E\u3059\n\u6700\u521D\u306E\u30E1\u30BD\u30C3\u30C9:  {4}\u306E{2}({3})\n2\u756A\u76EE\u306E\u30E1\u30BD\u30C3\u30C9: {7}\u306E{5}({6})
+compiler.err.name.clash.same.erasure.no.override.1=名前が競合しています。{0} {1}はまだ他方をオーバーライドしていませんが、削除後の名前が同じ2つのメソッドがあります\n最初のメソッド:  {4}の{2}({3})\n2番目のメソッド: {7}の{5}({6})
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.err.name.clash.same.erasure.no.hide=\u540D\u524D\u304C\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059\u3002{1}\u306E{0}\u3068{3}\u306E{2}\u306F\u307E\u3060\u4ED6\u65B9\u3092\u975E\u8868\u793A\u306B\u3057\u3066\u3044\u307E\u305B\u3093\u304C\u3001\u524A\u9664\u5F8C\u306E\u540D\u524D\u304C\u540C\u3058\u3067\u3059
+compiler.err.name.clash.same.erasure.no.hide=名前が競合しています。{1}の{0}と{3}の{2}はまだ他方を非表示にしていませんが、削除後の名前が同じです
 
-compiler.err.name.reserved.for.internal.use={0}\u306F\u5185\u90E8\u3067\u306E\u4F7F\u7528\u306E\u305F\u3081\u4E88\u7D04\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.name.reserved.for.internal.use={0}は内部での使用のため予約されています
 
-compiler.err.native.meth.cant.have.body=native\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.native.meth.cant.have.body=nativeメソッドが本体を持つことはできません
 
 
 # 0: message segment
-compiler.misc.incompatible.type.in.conditional=\u6761\u4EF6\u5F0F\u306E\u578B\u304C\u4E0D\u6B63\u3067\u3059\n{0}
+compiler.misc.incompatible.type.in.conditional=条件式の型が不正です\n{0}
 
-compiler.misc.conditional.target.cant.be.void=\u6761\u4EF6\u5F0F\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u578B\u306Fvoid\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.misc.conditional.target.cant.be.void=条件式のターゲット型はvoidにできません
 
-compiler.misc.switch.expression.target.cant.be.void=switch\u5F0F\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u578B\u306Fvoid\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.misc.switch.expression.target.cant.be.void=switch式のターゲット型はvoidにできません
 
 # 0: message segment
-compiler.misc.incompatible.type.in.switch.expression=switch\u5F0F\u306E\u578B\u304C\u4E0D\u6B63\u3067\u3059\n{0}
+compiler.misc.incompatible.type.in.switch.expression=switch式の型が不正です\n{0}
 
 # 0: message segment
-compiler.misc.incompatible.ret.type.in.lambda=\u30E9\u30E0\u30C0\u5F0F\u306E\u623B\u308A\u578B\u304C\u4E0D\u6B63\u3067\u3059\n{0}
+compiler.misc.incompatible.ret.type.in.lambda=ラムダ式の戻り型が不正です\n{0}
 
-compiler.misc.stat.expr.expected=\u30E9\u30E0\u30C0\u30FB\u30DC\u30C7\u30A3\u304Cvoid\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3068\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093\n(\u30D6\u30ED\u30C3\u30AF\u306E\u30E9\u30E0\u30C0\u30FB\u30DC\u30C7\u30A3\u306E\u4F7F\u7528\u3092\u691C\u8A0E\u3059\u308B\u304B\u3001\u304B\u308F\u308A\u306B\u6587\u306E\u5F0F\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
+compiler.misc.stat.expr.expected=ラムダ・ボディがvoid機能インタフェースと互換性がありません\n(ブロックのラムダ・ボディの使用を検討するか、かわりに文の式を使用してください)
 
 # 0: message segment
-compiler.misc.incompatible.ret.type.in.mref=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u623B\u308A\u578B\u304C\u4E0D\u6B63\u3067\u3059\n{0}
+compiler.misc.incompatible.ret.type.in.mref=メソッド参照の戻り型が不正です\n{0}
 
-compiler.err.lambda.body.neither.value.nor.void.compatible=\u30E9\u30E0\u30C0\u30FB\u30DC\u30C7\u30A3\u306F\u5024\u4E92\u63DB\u3067\u3082void\u4E92\u63DB\u3067\u3082\u3042\u308A\u307E\u305B\u3093
+compiler.err.lambda.body.neither.value.nor.void.compatible=ラムダ・ボディは値互換でもvoid互換でもありません
 
 # 0: list of type
-compiler.err.incompatible.thrown.types.in.mref=\u6A5F\u80FD\u5F0F\u3067\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u4E0D\u9069\u5408\u3067\u3059
+compiler.err.incompatible.thrown.types.in.mref=機能式でスローされたタイプ{0}は不適合です
 
-compiler.misc.incompatible.arg.types.in.lambda=\u30E9\u30E0\u30C0\u5F0F\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u578B\u306F\u4E0D\u9069\u5408\u3067\u3059
+compiler.misc.incompatible.arg.types.in.lambda=ラムダ式のパラメータ型は不適合です
 
-compiler.misc.incompatible.arg.types.in.mref=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u578B\u306F\u4E0D\u9069\u5408\u3067\u3059
+compiler.misc.incompatible.arg.types.in.mref=メソッド参照のパラメータ型は不適合です
 
-compiler.err.new.not.allowed.in.annotation=''new''\u306F\u6CE8\u91C8\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.new.not.allowed.in.annotation=''new''は注釈に使用できません
 
 # 0: name, 1: type
-compiler.err.no.annotation.member={1}\u306E\u6CE8\u91C8\u30E1\u30F3\u30D0\u30FC{0}\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.no.annotation.member={1}の注釈メンバー{0}がありません
 
 # 0: symbol
-compiler.err.no.encl.instance.of.type.in.scope=\u578B{0}\u306E\u5185\u90E8\u30AF\u30E9\u30B9\u3092\u56F2\u3080\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u30B9\u30B3\u30FC\u30D7\u5185\u306B\u3042\u308A\u307E\u305B\u3093
+compiler.err.no.encl.instance.of.type.in.scope=型{0}の内部クラスを囲むインスタンスがスコープ内にありません
 
-compiler.err.no.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
+compiler.err.no.intf.expected.here=ここにインタフェースは必要ありません
 
-compiler.err.no.match.entry={0}\u306F{1}\u306E\u30A8\u30F3\u30C8\u30EA\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002{2}\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.no.match.entry={0}は{1}のエントリに適合しません。{2}が必要です
 
 # 0: type
-compiler.err.not.annotation.type={0}\u306F\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.not.annotation.type={0}は注釈インタフェースではありません
 
 # 0: symbol, 1: symbol, 2: message segment
-compiler.err.not.def.access.package.cant.access={0} \u306F\u8868\u793A\u4E0D\u53EF\u3067\u3059\n({2})
+compiler.err.not.def.access.package.cant.access={0} は表示不可です\n({2})
 
 # 0: symbol, 1: symbol, 2: message segment
-compiler.misc.not.def.access.package.cant.access={0} \u306F\u8868\u793A\u4E0D\u53EF\u3067\u3059\n({2})
+compiler.misc.not.def.access.package.cant.access={0} は表示不可です\n({2})
 
 # 0: symbol, 1: message segment
-compiler.err.package.not.visible=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u8868\u793A\u4E0D\u53EF\u3067\u3059\n({1})
+compiler.err.package.not.visible=パッケージ{0}は表示不可です\n({1})
 
 # 0: symbol, 1: message segment
-compiler.misc.package.not.visible=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u8868\u793A\u4E0D\u53EF\u3067\u3059\n({1})
+compiler.misc.package.not.visible=パッケージ{0}は表示不可です\n({1})
 
 # {0} - current module
 # {1} - package in which the invisible class is declared
 # {2} - module in which {1} is declared
 # 0: symbol, 1: symbol, 2: symbol
-compiler.misc.not.def.access.does.not.read=\u30D1\u30C3\u30B1\u30FC\u30B8{1}\u306F\u30E2\u30B8\u30E5\u30FC\u30EB{2}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306B\u8AAD\u307F\u8FBC\u307E\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.misc.not.def.access.does.not.read=パッケージ{1}はモジュール{2}で宣言されていますが、モジュール{0}に読み込まれていません
 
 # {0} - package in which the invisible class is declared
 # {1} - module in which {0} is declared
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.does.not.read.from.unnamed=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u30E2\u30B8\u30E5\u30FC\u30EB{1}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B0\u30E9\u30D5\u306B\u3042\u308A\u307E\u305B\u3093
+compiler.misc.not.def.access.does.not.read.from.unnamed=パッケージ{0}はモジュール{1}で宣言されていますが、モジュール・グラフにありません
 
 # {0} - package in which the invisible class is declared
 # {1} - current module
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.does.not.read.unnamed=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u30E2\u30B8\u30E5\u30FC\u30EB{1}\u306B\u8AAD\u307F\u8FBC\u307E\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.misc.not.def.access.does.not.read.unnamed=パッケージ{0}は名前のないモジュールで宣言されていますが、モジュール{1}に読み込まれていません
 
 # {0} - package in which the invisible class is declared
 # {1} - module in which {0} is declared
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.not.exported=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u30E2\u30B8\u30E5\u30FC\u30EB{1}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.misc.not.def.access.not.exported=パッケージ{0}はモジュール{1}で宣言されていますが、エクスポートされていません
 
 # {0} - package in which the invisible class is declared
 # {1} - module in which {0} is declared
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.not.exported.from.unnamed=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u30E2\u30B8\u30E5\u30FC\u30EB{1}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.misc.not.def.access.not.exported.from.unnamed=パッケージ{0}はモジュール{1}で宣言されていますが、エクスポートされていません
 
 # {0} - package in which the invisible class is declared
 # {1} - module in which {0} is declared
 # {2} - current module
 # 0: symbol, 1: symbol, 2: symbol
-compiler.misc.not.def.access.not.exported.to.module=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u30E2\u30B8\u30E5\u30FC\u30EB{1}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u30E2\u30B8\u30E5\u30FC\u30EB{2}\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.misc.not.def.access.not.exported.to.module=パッケージ{0}はモジュール{1}で宣言されていますが、モジュール{2}にエクスポートされていません
 
 # {0} - package in which the invisible class is declared
 # {1} - module in which {0} is declared
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.not.exported.to.module.from.unnamed=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u30E2\u30B8\u30E5\u30FC\u30EB{1}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.misc.not.def.access.not.exported.to.module.from.unnamed=パッケージ{0}はモジュール{1}で宣言されていますが、名前のないモジュールにエクスポートされていません
 
 # 0: symbol, 1: symbol
-compiler.err.not.def.access.class.intf.cant.access={1}.{0}\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u3044\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.not.def.access.class.intf.cant.access={1}.{0}はアクセスできないクラスまたはインタフェースに定義されています
 
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.class.intf.cant.access={1}.{0}\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u3044\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.misc.not.def.access.class.intf.cant.access={1}.{0}はアクセスできないクラスまたはインタフェースに定義されています
 
 # 0: symbol, 1: symbol, 2: symbol, 3: message segment
-compiler.err.not.def.access.class.intf.cant.access.reason=\u30D1\u30C3\u30B1\u30FC\u30B8{2}\u306E{1}.{0}\u306B\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n({3})
+compiler.err.not.def.access.class.intf.cant.access.reason=パッケージ{2}の{1}.{0}にはアクセスできません\n({3})
 
 # 0: symbol, 1: symbol, 2: symbol, 3: message segment
-compiler.misc.not.def.access.class.intf.cant.access.reason=\u30D1\u30C3\u30B1\u30FC\u30B8{2}\u306E{1}.{0}\u306B\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n({3})
+compiler.misc.not.def.access.class.intf.cant.access.reason=パッケージ{2}の{1}.{0}にはアクセスできません\n({3})
 
 # 0: symbol, 1: list of type, 2: type
-compiler.misc.cant.access.inner.cls.constr=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF{0}({1})\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n\u5185\u90E8\u30AF\u30E9\u30B9\u3092\u56F2\u3080\u578B{2}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u30B9\u30B3\u30FC\u30D7\u5185\u306B\u3042\u308A\u307E\u305B\u3093
+compiler.misc.cant.access.inner.cls.constr=コンストラクタ{0}({1})にアクセスできません\n内部クラスを囲む型{2}のインスタンスがスコープ内にありません
 
 # 0: symbol, 1: symbol
-compiler.err.not.def.public.cant.access={1}\u306E{0}\u306Fpublic\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u5916\u304B\u3089\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
+compiler.err.not.def.public.cant.access={1}の{0}はpublicではありません。パッケージ外からはアクセスできません
 
 # 0: symbol, 1: symbol
-compiler.err.not.def.public={1}\u306E{0}\u306Fpublic\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.not.def.public={1}の{0}はpublicではありません
 
 # 0: symbol, 1: symbol
-compiler.misc.not.def.public.cant.access={1}\u306E{0}\u306Fpublic\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u5916\u304B\u3089\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
+compiler.misc.not.def.public.cant.access={1}の{0}はpublicではありません。パッケージ外からはアクセスできません
 
 # 0: name
-compiler.err.not.loop.label={0}\u306F\u30EB\u30FC\u30D7\u30FB\u30E9\u30D9\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.not.loop.label={0}はループ・ラベルではありません
 
-compiler.err.not.stmt=\u6587\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.not.stmt=文ではありません
 
 # 0: symbol
-compiler.err.not.encl.class={0}\u306F\u5185\u90E8\u30AF\u30E9\u30B9\u3092\u56F2\u307F\u307E\u305B\u3093
+compiler.err.not.encl.class={0}は内部クラスを囲みません
 
 # 0: name, 1: type
-compiler.err.operator.cant.be.applied=\u5358\u9805\u6F14\u7B97\u5B50''{0}''\u306E\u30AA\u30DA\u30E9\u30F3\u30C9\u578B{1}\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.operator.cant.be.applied=単項演算子''{0}''のオペランド型{1}が不正です
 
 # 0: name, 1: type, 2: type
-compiler.err.operator.cant.be.applied.1=\u4E8C\u9805\u6F14\u7B97\u5B50''{0}''\u306E\u30AA\u30DA\u30E9\u30F3\u30C9\u578B\u304C\u4E0D\u6B63\u3067\u3059\n\u6700\u521D\u306E\u578B: {1}\n2\u756A\u76EE\u306E\u578B: {2}
+compiler.err.operator.cant.be.applied.1=二項演算子''{0}''のオペランド型が不正です\n最初の型: {1}\n2番目の型: {2}
 
-compiler.err.pkg.annotations.sb.in.package-info.java=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6CE8\u91C8\u306F\u30D5\u30A1\u30A4\u30EBpackage-info.java\u5185\u306B\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.pkg.annotations.sb.in.package-info.java=パッケージの注釈はファイルpackage-info.java内にある必要があります
 
-compiler.err.no.pkg.in.module-info.java=\u30D1\u30C3\u30B1\u30FC\u30B8\u5BA3\u8A00\u306F\u30D5\u30A1\u30A4\u30EBmodule-info.java\u5185\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.no.pkg.in.module-info.java=パッケージ宣言はファイルmodule-info.java内では許可されません
 
 # 0: symbol
-compiler.err.pkg.clashes.with.class.of.same.name=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u540C\u540D\u306E\u30AF\u30E9\u30B9\u3068\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059
+compiler.err.pkg.clashes.with.class.of.same.name=パッケージ{0}は同名のクラスと競合しています
 
-compiler.err.warnings.and.werror=\u8B66\u544A\u304C\u898B\u3064\u304B\u308A-Werror\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F
+compiler.err.warnings.and.werror=警告が見つかり-Werrorが指定されました
 
 # Errors related to annotation processing
 
 # 0: symbol, 1: message segment, 2: string (stack-trace)
-compiler.err.proc.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n{2}
+compiler.err.proc.cant.access={0}にアクセスできません\n{1}\n詳細は次のスタックトレースで調査してください。\n{2}
 
 # 0: symbol, 1: message segment
-compiler.err.proc.cant.access.1={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}
+compiler.err.proc.cant.access.1={0}にアクセスできません\n{1}
 
 # 0: string
-compiler.err.proc.cant.find.class=''{0}''\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+compiler.err.proc.cant.find.class=''{0}''のクラス・ファイルが見つかりませんでした。
 
 # 0: string
-compiler.err.proc.cant.load.class=''{0}''\u304C\u539F\u56E0\u3067\u3001\u30D7\u30ED\u30BB\u30C3\u30B5\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+compiler.err.proc.cant.load.class=''{0}''が原因で、プロセッサ・クラス・ファイルをロードできませんでした。
 
 # Print a client-generated error message; assumed to be localized, no translation required
 # 0: string
@@ -821,343 +821,343 @@ compiler.err.proc.messager={0}
 # 0: string
 compiler.misc.exception.message={0}
 
-compiler.misc.user.selected.completion.failure=\u30AF\u30E9\u30B9\u540D\u306B\u3088\u308B\u30E6\u30FC\u30B6\u30FC\u9078\u629E\u306E\u5B8C\u4E86\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+compiler.misc.user.selected.completion.failure=クラス名によるユーザー選択の完了に失敗しました
 
 # 0: collection of string
-compiler.err.proc.no.explicit.annotation.processing.requested=\u30AF\u30E9\u30B9\u540D''{0}''\u304C\u53D7\u3051\u5165\u308C\u3089\u308C\u308B\u306E\u306F\u3001\u6CE8\u91C8\u51E6\u7406\u304C\u660E\u793A\u7684\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3055\u308C\u305F\u5834\u5408\u306E\u307F\u3067\u3059
+compiler.err.proc.no.explicit.annotation.processing.requested=クラス名''{0}''が受け入れられるのは、注釈処理が明示的にリクエストされた場合のみです
 
-compiler.err.proc.no.service=\u30B5\u30FC\u30D3\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u304C\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u304C\u3001\u6CE8\u91C8\u51E6\u7406\u306B\u5FC5\u8981\u3067\u3059\u3002
+compiler.err.proc.no.service=サービス・ローダーが使用できませんでしたが、注釈処理に必要です。
 
 # 0: string, 1: string
-compiler.err.proc.processor.bad.option.name=\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u6307\u5B9A\u3055\u308C\u305F\u30AA\u30D7\u30B7\u30E7\u30F3\u540D''{0}''\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.proc.processor.bad.option.name=プロセッサ''{1}''によって指定されたオプション名''{0}''が不正です
 
 # 0: string
-compiler.err.proc.processor.cant.instantiate=\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+compiler.err.proc.processor.cant.instantiate=プロセッサ''{0}''のインスタンスをインスタンス化できませんでした
 
 # 0: string
-compiler.err.proc.processor.not.found=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+compiler.err.proc.processor.not.found=注釈プロセッサ''{0}''が見つかりません
 
 # 0: string
-compiler.err.proc.processor.wrong.type=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u304Cjavax.annotation.processing.Processor\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u305B\u3093
+compiler.err.proc.processor.wrong.type=注釈プロセッサ''{0}''がjavax.annotation.processing.Processorを実装していません
 
-compiler.err.proc.service.problem=\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u30ED\u30FC\u30C9\u3059\u308B\u305F\u3081\u306E\u30B5\u30FC\u30D3\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u3092\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+compiler.err.proc.service.problem=プロセッサをロードするためのサービス・ローダーを作成中にエラーが発生しました。
 
 # 0: string
-compiler.err.proc.bad.config.file=\u30B5\u30FC\u30D3\u30B9\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C\u4E0D\u6B63\u3067\u3042\u308B\u304B\u3001\u30D7\u30ED\u30BB\u30C3\u30B5\u30FB\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u69CB\u7BC9\u4E2D\u306B\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F: {0}
+compiler.err.proc.bad.config.file=サービス構成ファイルが不正であるか、プロセッサ・オブジェクトの構築中に例外がスローされました: {0}
 
-compiler.err.proc.cant.create.loader=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306E\u30AF\u30E9\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
+compiler.err.proc.cant.create.loader=注釈プロセッサのクラス・ローダーを作成できませんでした: {0}
 
 # 0: symbol
-compiler.err.qualified.new.of.static.class=static\u30AF\u30E9\u30B9\u306Enew\u304C\u4FEE\u98FE\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.qualified.new.of.static.class=staticクラスのnewが修飾されています
 
-compiler.err.recursive.ctor.invocation=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u547C\u51FA\u3057\u304C\u518D\u5E30\u7684\u3067\u3059
+compiler.err.recursive.ctor.invocation=コンストラクタの呼出しが再帰的です
 
 # 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
-compiler.err.ref.ambiguous={0}\u306E\u53C2\u7167\u306F\u3042\u3044\u307E\u3044\u3067\u3059\n{3}\u306E{1} {2}\u3068{6}\u306E{4} {5}\u306E\u4E21\u65B9\u304C\u4E00\u81F4\u3057\u307E\u3059
+compiler.err.ref.ambiguous={0}の参照はあいまいです\n{3}の{1} {2}と{6}の{4} {5}の両方が一致します
 
 # 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
-compiler.misc.ref.ambiguous={0}\u306E\u53C2\u7167\u306F\u3042\u3044\u307E\u3044\u3067\u3059\n{3}\u306E{1} {2}\u3068{6}\u306E{4} {5}\u306E\u4E21\u65B9\u304C\u4E00\u81F4\u3057\u307E\u3059
+compiler.misc.ref.ambiguous={0}の参照はあいまいです\n{3}の{1} {2}と{6}の{4} {5}の両方が一致します
 
-compiler.err.repeated.annotation.target=\u6CE8\u91C8\u30BF\u30FC\u30B2\u30C3\u30C8\u304C\u7E70\u308A\u8FD4\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.repeated.annotation.target=注釈ターゲットが繰り返されています
 
-compiler.err.repeated.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u7E70\u308A\u8FD4\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.repeated.interface=インタフェースが繰り返されています
 
-compiler.err.repeated.modifier=\u4FEE\u98FE\u5B50\u304C\u7E70\u308A\u8FD4\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.repeated.modifier=修飾子が繰り返されています
 
 # 0: symbol, 1: set of modifier, 2: symbol
-compiler.err.report.access={0}\u306F{2}\u3067{1}\u30A2\u30AF\u30BB\u30B9\u3055\u308C\u307E\u3059
+compiler.err.report.access={0}は{2}で{1}アクセスされます
 
 # 0: symbol, 1: set of modifier, 2: symbol
-compiler.misc.report.access={0}\u306F{2}\u3067{1}\u30A2\u30AF\u30BB\u30B9\u3055\u308C\u307E\u3059
+compiler.misc.report.access={0}は{2}で{1}アクセスされます
 
-compiler.err.ret.outside.meth=\u30E1\u30BD\u30C3\u30C9\u306E\u5916\u306Ereturn\u6587\u3067\u3059
+compiler.err.ret.outside.meth=メソッドの外のreturn文です
 
-compiler.err.signature.doesnt.match.supertype=\u30B7\u30B0\u30CB\u30C1\u30E3\u304C{0}\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002\u4E92\u63DB\u6027\u306E\u306A\u3044\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u3067\u3059
+compiler.err.signature.doesnt.match.supertype=シグニチャが{0}に適合しません。互換性のないスーパータイプです
 
-compiler.err.signature.doesnt.match.intf=\u30B7\u30B0\u30CB\u30C1\u30E3\u304C{0}\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002\u4E92\u63DB\u6027\u306E\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u3059
+compiler.err.signature.doesnt.match.intf=シグニチャが{0}に適合しません。互換性のないインタフェースです
 
 # 0: symbol, 1: symbol, 2: symbol
-compiler.err.does.not.override.abstract={0}\u306Fabstract\u3067\u306A\u304F\u3001{2}\u5185\u306Eabstract\u30E1\u30BD\u30C3\u30C9{1}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u305B\u3093
+compiler.err.does.not.override.abstract={0}はabstractでなく、{2}内のabstractメソッド{1}をオーバーライドしません
 
 # 0: file object
-compiler.err.source.cant.overwrite.input.file=\u30BD\u30FC\u30B9\u306E\u66F8\u8FBC\u307F\u30A8\u30E9\u30FC\u3067\u3059\u3002\u5165\u529B\u30D5\u30A1\u30A4\u30EB{0}\u3092\u4E0A\u66F8\u304D\u3067\u304D\u307E\u305B\u3093
+compiler.err.source.cant.overwrite.input.file=ソースの書込みエラーです。入力ファイル{0}を上書きできません
 
 # 0: symbol
-compiler.err.stack.sim.error=\u5185\u90E8\u30A8\u30E9\u30FC: {0}\u3067\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u30FB\u30A8\u30E9\u30FC
+compiler.err.stack.sim.error=内部エラー: {0}でのスタック・シミュレーション・エラー
 
-compiler.err.static.imp.only.classes.and.interfaces=static import\u306F\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u306E\u307F\u3068\u306A\u308A\u307E\u3059
+compiler.err.static.imp.only.classes.and.interfaces=static importはクラスとインタフェースからのみとなります
 
-compiler.err.string.const.req=\u5B9A\u6570\u306E\u6587\u5B57\u5217\u5F0F\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.string.const.req=定数の文字列式が必要です
 
-compiler.err.pattern.expected=\u30BF\u30A4\u30D7\u306E\u30D1\u30BF\u30FC\u30F3\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.pattern.expected=タイプのパターンが必要です
 
 # 0: symbol, 1: fragment
-compiler.err.cannot.generate.class=\u30AF\u30E9\u30B9{0}\u306E\u751F\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\n({1})
+compiler.err.cannot.generate.class=クラス{0}の生成中にエラーが発生しました\n({1})
 
 # 0: symbol, 1: symbol
-compiler.misc.synthetic.name.conflict=\u30B7\u30F3\u30DC\u30EB{0}\u304C\u3001{1}\u3067\u30B3\u30F3\u30D1\u30A4\u30E9\u304C\u5408\u6210\u3057\u305F\u30B7\u30F3\u30DC\u30EB\u3068\u7AF6\u5408\u3057\u307E\u3059
+compiler.misc.synthetic.name.conflict=シンボル{0}が、{1}でコンパイラが合成したシンボルと競合します
 
 # 0: symbol, 1: type
-compiler.misc.illegal.signature=\u578B{1}\u306E\u7F72\u540D\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059
+compiler.misc.illegal.signature=型{1}の署名属性が不正です
 
-compiler.err.throws.not.allowed.in.intf.annotation=throws\u7BC0\u3092@interface\u30E1\u30F3\u30D0\u30FC\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.throws.not.allowed.in.intf.annotation=throws節を@interfaceメンバーで使用することはできません
 
-compiler.err.try.without.catch.finally.or.resource.decls=''try''\u3078\u306E''catch''\u3001''finally''\u307E\u305F\u306F\u30EA\u30BD\u30FC\u30B9\u5BA3\u8A00\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.try.without.catch.finally.or.resource.decls=''try''への''catch''、''finally''またはリソース宣言がありません
 
 # 0: symbol
-compiler.err.type.doesnt.take.params=\u578B{0}\u306F\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u3068\u308A\u307E\u305B\u3093
+compiler.err.type.doesnt.take.params=型{0}はパラメータをとりません
 
-compiler.err.type.var.cant.be.deref=\u578B\u5909\u6570\u304B\u3089\u9078\u629E\u3067\u304D\u307E\u305B\u3093
+compiler.err.type.var.cant.be.deref=型変数から選択できません
 
-compiler.err.type.var.may.not.be.followed.by.other.bounds=\u3053\u306E\u578B\u5909\u6570\u306E\u5F8C\u308D\u306B\u4ED6\u306E\u5883\u754C\u3092\u914D\u7F6E\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.type.var.may.not.be.followed.by.other.bounds=この型変数の後ろに他の境界を配置することはできません
 
-compiler.err.type.var.more.than.once=\u578B\u5909\u6570{0}\u306F{1}\u306E\u623B\u308A\u5024\u306E\u578B\u30672\u56DE\u4EE5\u4E0A\u51FA\u73FE\u3057\u307E\u3059\u3002\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u751F\u6210\u3055\u308C\u306A\u3044\u307E\u307E\u306B\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.type.var.more.than.once=型変数{0}は{1}の戻り値の型で2回以上出現します。インスタンス生成されないままにはできません
 
-compiler.err.type.var.more.than.once.in.result=\u578B\u5909\u6570{0}\u306F{1}\u306E\u578B\u30672\u56DE\u4EE5\u4E0A\u51FA\u73FE\u3057\u307E\u3059\u3002\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u751F\u6210\u3055\u308C\u306A\u3044\u307E\u307E\u306B\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.type.var.more.than.once.in.result=型変数{0}は{1}の型で2回以上出現します。インスタンス生成されないままにはできません
 
 # 0: type, 1: type, 2: fragment
-compiler.err.types.incompatible=\u30BF\u30A4\u30D7{0}\u3068{1}\u306F\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093\u3002\n{2}
+compiler.err.types.incompatible=タイプ{0}と{1}は互換性がありません。\n{2}
 
 # 0: name, 1: list of type
-compiler.misc.incompatible.diff.ret=\u4E21\u65B9\u3068\u3082{0}({1})\u3092\u5B9A\u7FA9\u3057\u3066\u3044\u307E\u3059\u304C\u3001\u623B\u308A\u5024\u306E\u578B\u304C\u7121\u95A2\u4FC2\u3067\u3059
+compiler.misc.incompatible.diff.ret=両方とも{0}({1})を定義していますが、戻り値の型が無関係です
 
 # 0: type, 1: name, 2: list of type
-compiler.err.incompatible.diff.ret.same.type=\u30BF\u30A4\u30D7{0}\u3067\u306F\u3001\u7121\u95A2\u4FC2\u306A\u623B\u308A\u578B\u3067{1}({2})\u304C\u8907\u6570\u56DE\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.incompatible.diff.ret.same.type=タイプ{0}では、無関係な戻り型で{1}({2})が複数回定義されています
 
 # 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
-compiler.misc.incompatible.unrelated.defaults={0} {1}\u306F\u578B{4}\u3068{5}\u304B\u3089{2}({3})\u306E\u95A2\u9023\u3057\u306A\u3044\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u7D99\u627F\u3057\u307E\u3059
+compiler.misc.incompatible.unrelated.defaults={0} {1}は型{4}と{5}から{2}({3})の関連しないデフォルトを継承します
 
 # 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
-compiler.misc.incompatible.abstract.default={0} {1}\u306F\u578B{4}\u3068{5}\u304B\u3089{2}({3})\u306E\u62BD\u8C61\u3068\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u7D99\u627F\u3057\u307E\u3059
+compiler.misc.incompatible.abstract.default={0} {1}は型{4}と{5}から{2}({3})の抽象とデフォルトを継承します
 
 # 0: name, 1: kind name, 2: symbol
-compiler.err.default.overrides.object.member={1} {2}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9{0}\u306Fjava.lang.Object\u306E\u30E1\u30F3\u30D0\u30FC\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059
+compiler.err.default.overrides.object.member={1} {2}のデフォルト・メソッド{0}はjava.lang.Objectのメンバーをオーバーライドします
 
 # 0: type
-compiler.err.illegal.static.intf.meth.call=static\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u30FB\u30B3\u30FC\u30EB\u304C\u4E0D\u6B63\u3067\u3059\n\u53D7\u4FE1\u5F0F\u306F\u578B\u4FEE\u98FE\u5B50''{0}''\u3067\u7F6E\u63DB\u3055\u308C\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.illegal.static.intf.meth.call=staticインタフェース・メソッド・コールが不正です\n受信式は型修飾子''{0}''で置換される必要があります
 
 # 0: symbol or type, 1: message segment
-compiler.err.illegal.default.super.call=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B9\u30FC\u30D1\u30FC\u30FB\u30B3\u30FC\u30EB\u306E\u578B\u4FEE\u98FE\u5B50{0}\u304C\u4E0D\u6B63\u3067\u3059\n{1}
+compiler.err.illegal.default.super.call=デフォルトのスーパー・コールの型修飾子{0}が不正です\n{1}
 
 # 0: symbol, 1: type
-compiler.misc.overridden.default={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u307E\u3059
+compiler.misc.overridden.default={1}のメソッド{0}はオーバーライドされます
 
 # 0: symbol, 1: type or symbol
-compiler.misc.redundant.supertype=\u5197\u9577\u306A\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u306F{1}\u306B\u3088\u3063\u3066\u62E1\u5F35\u3055\u308C\u307E\u3057\u305F
+compiler.misc.redundant.supertype=冗長なインタフェース{0}は{1}によって拡張されました
 
-compiler.err.unclosed.char.lit=\u6587\u5B57\u30EA\u30C6\u30E9\u30EB\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.unclosed.char.lit=文字リテラルが閉じられていません
 
-compiler.err.unclosed.comment=\u30B3\u30E1\u30F3\u30C8\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.unclosed.comment=コメントが閉じられていません
 
-compiler.err.unclosed.str.lit=\u6587\u5B57\u5217\u30EA\u30C6\u30E9\u30EB\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.unclosed.str.lit=文字列リテラルが閉じられていません
 
-compiler.err.unclosed.text.block=\u9589\u3058\u3089\u308C\u3066\u3044\u306A\u3044\u30C6\u30AD\u30B9\u30C8\u30FB\u30D6\u30ED\u30C3\u30AF
+compiler.err.unclosed.text.block=閉じられていないテキスト・ブロック
 
-compiler.err.string.template.is.not.well.formed=\u6587\u5B57\u5217\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u304C\u6574\u5F62\u5F0F\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.string.template.is.not.well.formed=文字列テンプレートが整形式ではありません
 
-compiler.err.text.block.template.is.not.well.formed=\u30C6\u30AD\u30B9\u30C8\u30FB\u30D6\u30ED\u30C3\u30AF\u30FB\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u304C\u6574\u5F62\u5F0F\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.text.block.template.is.not.well.formed=テキスト・ブロック・テンプレートが整形式ではありません
 
-compiler.err.processor.missing.from.string.template.expression=\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u6587\u5B57\u5217\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u5F0F\u306B\u3042\u308A\u307E\u305B\u3093
+compiler.err.processor.missing.from.string.template.expression=プロセッサが文字列テンプレート式にありません
 
 # 0: symbol
-compiler.err.processor.type.cannot.be.a.raw.type=\u30D7\u30ED\u30BB\u30C3\u30B5\u30FB\u30BF\u30A4\u30D7\u306Fraw\u578B\u306B\u3067\u304D\u307E\u305B\u3093: {0}
+compiler.err.processor.type.cannot.be.a.raw.type=プロセッサ・タイプはraw型にできません: {0}
 
 # 0: symbol
-compiler.err.not.a.processor.type=\u30D7\u30ED\u30BB\u30C3\u30B5\u30FB\u30BF\u30A4\u30D7\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0}
+compiler.err.not.a.processor.type=プロセッサ・タイプではありません: {0}
 
 # 0: string
-compiler.err.unsupported.encoding=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u3059: {0}
+compiler.err.unsupported.encoding=サポートされていないエンコーディングです: {0}
 
-compiler.err.io.exception=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A8\u30E9\u30FC\u3067\u3059: {0}
+compiler.err.io.exception=ソース・ファイルの読取りエラーです: {0}
 
 # 0: name
-compiler.err.undef.label=\u30E9\u30D9\u30EB{0}\u306F\u672A\u5B9A\u7FA9\u3067\u3059
+compiler.err.undef.label=ラベル{0}は未定義です
 
 # 0: name
-compiler.err.illegal.ref.to.restricted.type=\u5236\u9650\u3055\u308C\u305F\u578B''{0}''\u3078\u306E\u7121\u52B9\u306A\u53C2\u7167\u3067\u3059
+compiler.err.illegal.ref.to.restricted.type=制限された型''{0}''への無効な参照です
 
 # 0: name
-compiler.warn.illegal.ref.to.restricted.type=\u5236\u9650\u3055\u308C\u305F\u578B''{0}''\u3078\u306E\u7121\u52B9\u306A\u53C2\u7167\u3067\u3059
+compiler.warn.illegal.ref.to.restricted.type=制限された型''{0}''への無効な参照です
 
 # 0: name, 1: source
-compiler.err.restricted.type.not.allowed=\u3053\u3053\u3067\u306F''{0}''\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\n\u30EA\u30EA\u30FC\u30B9{1}\u304B\u3089''{0}''\u306F\u5236\u9650\u3055\u308C\u305F\u578B\u540D\u3067\u3042\u308A\u3001\u578B\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.restricted.type.not.allowed=ここでは''{0}''は許可されません\nリリース{1}から''{0}''は制限された型名であり、型の宣言に使用できません
 
 # 0: name, 1: source
-compiler.warn.restricted.type.not.allowed=\u30EA\u30EA\u30FC\u30B9{1}\u304B\u3089\u3001''{0}''\u306F\u5236\u9650\u3055\u308C\u305F\u578B\u540D\u3067\u3042\u308A\u3001\u578B\u306E\u5BA3\u8A00\u3067\u306E\u4F7F\u7528\u3001\u307E\u305F\u306F\u914D\u5217\u306E\u8981\u7D20\u30BF\u30A4\u30D7\u3068\u3057\u3066\u306E\u4F7F\u7528\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.warn.restricted.type.not.allowed=リリース{1}から、''{0}''は制限された型名であり、型の宣言での使用、または配列の要素タイプとしての使用はできません
 
 # 0: name, 1: source
-compiler.warn.restricted.type.not.allowed.preview=''{0}''\u306F\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u5236\u9650\u3055\u308C\u305F\u578B\u540D\u306B\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u3001\u578B\u306E\u5BA3\u8A00\u3067\u306E\u4F7F\u7528\u3001\u307E\u305F\u306F\u914D\u5217\u306E\u8981\u7D20\u30BF\u30A4\u30D7\u3068\u3057\u3066\u306E\u4F7F\u7528\u306F\u3067\u304D\u306A\u304F\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.warn.restricted.type.not.allowed.preview=''{0}''は将来のリリースで制限された型名になる可能性があり、型の宣言での使用、または配列の要素タイプとしての使用はできなくなる可能性があります
 
 # 0: name (variable), 1: message segment
-compiler.err.cant.infer.local.var.type=\u30ED\u30FC\u30AB\u30EB\u5909\u6570{0}\u306E\u578B\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n({1})
+compiler.err.cant.infer.local.var.type=ローカル変数{0}の型を推論できません\n({1})
 
 # 0: name
-compiler.err.restricted.type.not.allowed.here=''{0}''\u306F\u3053\u3053\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.restricted.type.not.allowed.here=''{0}''はここでは許可されません
 
 # 0: name
-compiler.err.restricted.type.not.allowed.array=''{0}''\u306F\u914D\u5217\u306E\u8981\u7D20\u30BF\u30A4\u30D7\u3068\u3057\u3066\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.restricted.type.not.allowed.array=''{0}''は配列の要素タイプとして許可されません
 
 # 0: name
-compiler.err.restricted.type.not.allowed.compound=''{0}''\u306F\u8907\u5408\u5BA3\u8A00\u3067\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.restricted.type.not.allowed.compound=''{0}''は複合宣言で許可されません
 
 # 0: fragment
-compiler.err.invalid.lambda.parameter.declaration=\u7121\u52B9\u306A\u30E9\u30E0\u30C0\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF\u5BA3\u8A00\n({0})
+compiler.err.invalid.lambda.parameter.declaration=無効なラムダ・パラメータ宣言\n({0})
 
-compiler.misc.implicit.and.explicit.not.allowed=\u6697\u9ED9\u7684\u306B\u578B\u6307\u5B9A\u3055\u308C\u305F\u30D1\u30E9\u30E1\u30FC\u30BF\u3068\u660E\u793A\u7684\u306B\u578B\u6307\u5B9A\u3055\u308C\u305F\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u7D44\u307F\u5408\u305B\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.misc.implicit.and.explicit.not.allowed=暗黙的に型指定されたパラメータと明示的に型指定されたパラメータを組み合せることはできません
 
-compiler.misc.var.and.explicit.not.allowed=''var''\u3068\u660E\u793A\u7684\u306B\u578B\u6307\u5B9A\u3055\u308C\u305F\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u7D44\u307F\u5408\u305B\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.misc.var.and.explicit.not.allowed=''var''と明示的に型指定されたパラメータを組み合せることはできません
 
-compiler.misc.var.and.implicit.not.allowed=''var''\u3068\u6697\u9ED9\u7684\u306B\u578B\u6307\u5B9A\u3055\u308C\u305F\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u7D44\u307F\u5408\u305B\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.misc.var.and.implicit.not.allowed=''var''と暗黙的に型指定されたパラメータを組み合せることはできません
 
-compiler.misc.local.cant.infer.null=\u5909\u6570\u521D\u671F\u5316\u5B50\u306F''null''\u3067\u3059
+compiler.misc.local.cant.infer.null=変数初期化子は''null''です
 
-compiler.misc.local.cant.infer.void=\u5909\u6570\u521D\u671F\u5316\u5B50\u306F''void''\u3067\u3059
+compiler.misc.local.cant.infer.void=変数初期化子は''void''です
 
-compiler.misc.local.missing.init=\u521D\u671F\u5316\u5B50\u306A\u3057\u3067\u5909\u6570\u306B''var''\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.misc.local.missing.init=初期化子なしで変数に''var''を使用することはできません
 
-compiler.misc.local.lambda.missing.target=\u30E9\u30E0\u30C0\u5F0F\u306B\u306F\u660E\u793A\u7684\u306A\u30BF\u30FC\u30B2\u30C3\u30C8\u578B\u304C\u5FC5\u8981\u3067\u3059
+compiler.misc.local.lambda.missing.target=ラムダ式には明示的なターゲット型が必要です
 
-compiler.misc.local.mref.missing.target=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306B\u306F\u660E\u793A\u7684\u306A\u30BF\u30FC\u30B2\u30C3\u30C8\u578B\u304C\u5FC5\u8981\u3067\u3059
+compiler.misc.local.mref.missing.target=メソッド参照には明示的なターゲット型が必要です
 
-compiler.misc.local.array.missing.target=\u914D\u5217\u521D\u671F\u5316\u5B50\u306B\u306F\u660E\u793A\u7684\u306A\u30BF\u30FC\u30B2\u30C3\u30C8\u578B\u304C\u5FC5\u8981\u3067\u3059
+compiler.misc.local.array.missing.target=配列初期化子には明示的なターゲット型が必要です
 
-compiler.misc.local.self.ref=\u81EA\u5DF1\u53C2\u7167\u5909\u6570\u306B''var''\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.misc.local.self.ref=自己参照変数に''var''を使用することはできません
 
 # 0: message segment, 1: unused
-compiler.err.cant.apply.diamond={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093
+compiler.err.cant.apply.diamond={0}の型引数を推定できません
 
 # 0: message segment or type, 1: message segment
-compiler.err.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n\u7406\u7531: {1}
+compiler.err.cant.apply.diamond.1={0}の型引数を推論できません\n理由: {1}
 
 # 0: message segment or type, 1: message segment
-compiler.misc.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n\u7406\u7531: {1}
+compiler.misc.cant.apply.diamond.1={0}の型引数を推論できません\n理由: {1}
 
-compiler.err.unreachable.stmt=\u3053\u306E\u6587\u306B\u5236\u5FA1\u304C\u79FB\u308B\u3053\u3068\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.unreachable.stmt=この文に制御が移ることはありません
 
-compiler.err.not.exhaustive=switch\u5F0F\u304C\u3059\u3079\u3066\u306E\u53EF\u80FD\u306A\u5165\u529B\u5024\u3092\u30AB\u30D0\u30FC\u3057\u3066\u3044\u307E\u305B\u3093
+compiler.err.not.exhaustive=switch式がすべての可能な入力値をカバーしていません
 
-compiler.err.not.exhaustive.statement=switch\u6587\u304C\u3059\u3079\u3066\u306E\u53EF\u80FD\u306A\u5165\u529B\u5024\u3092\u30AB\u30D0\u30FC\u3057\u3066\u3044\u307E\u305B\u3093
+compiler.err.not.exhaustive.statement=switch文がすべての可能な入力値をカバーしていません
 
-compiler.err.initializer.must.be.able.to.complete.normally=\u521D\u671F\u5316\u5B50\u306F\u6B63\u5E38\u306B\u5B8C\u4E86\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.initializer.must.be.able.to.complete.normally=初期化子は正常に完了できる必要があります
 
-compiler.err.initializer.not.allowed=\u30A4\u30CB\u30B7\u30E3\u30E9\u30A4\u30B6\u306Finterfaces\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.initializer.not.allowed=イニシャライザはinterfacesでは許可されません
 
 # 0: type
-compiler.err.unreported.exception.need.to.catch.or.throw=\u4F8B\u5916{0}\u306F\u5831\u544A\u3055\u308C\u307E\u305B\u3093\u3002\u30B9\u30ED\u30FC\u3059\u308B\u306B\u306F\u3001\u6355\u6349\u307E\u305F\u306F\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.unreported.exception.need.to.catch.or.throw=例外{0}は報告されません。スローするには、捕捉または宣言する必要があります
 
 # 0: type
-compiler.err.unreported.exception.default.constructor=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u5185\u306B\u5831\u544A\u3055\u308C\u306A\u3044\u4F8B\u5916{0}\u304C\u5B58\u5728\u3057\u307E\u3059
+compiler.err.unreported.exception.default.constructor=デフォルトのコンストラクタ内に報告されない例外{0}が存在します
 
 # 0: type, 1: name
-compiler.err.unreported.exception.implicit.close=\u5831\u544A\u3055\u308C\u306A\u3044\u4F8B\u5916{0}\u306F\u3001\u30B9\u30ED\u30FC\u3059\u308B\u306B\u306F\u6355\u6349\u307E\u305F\u306F\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\n\u30EA\u30BD\u30FC\u30B9\u5909\u6570''{1}''\u3067\u306Eclose()\u306E\u6697\u9ED9\u7684\u306A\u30B3\u30FC\u30EB\u304B\u3089\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F
+compiler.err.unreported.exception.implicit.close=報告されない例外{0}は、スローするには捕捉または宣言する必要があります\nリソース変数''{1}''でのclose()の暗黙的なコールから例外がスローされました
 
-compiler.err.void.not.allowed.here=\u3053\u3053\u3067''void''\u578B\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.void.not.allowed.here=ここで''void''型を使用することはできません
 
 # 0: string
-compiler.err.wrong.number.type.args=\u578B\u5F15\u6570\u306E\u6570\u304C\u4E0D\u6B63\u3067\u3059\u3002{0}\u500B\u5FC5\u8981\u3067\u3059
+compiler.err.wrong.number.type.args=型引数の数が不正です。{0}個必要です
 
 # 0: symbol
-compiler.err.var.might.already.be.assigned=\u5909\u6570{0}\u306F\u3059\u3067\u306B\u4EE3\u5165\u3055\u308C\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.err.var.might.already.be.assigned=変数{0}はすでに代入されている可能性があります
 
 # 0: symbol
-compiler.err.var.might.not.have.been.initialized=\u5909\u6570{0}\u306F\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.err.var.might.not.have.been.initialized=変数{0}は初期化されていない可能性があります
 
 # 0: symbol
-compiler.err.var.not.initialized.in.default.constructor=\u5909\u6570{0}\u306F\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3067\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.var.not.initialized.in.default.constructor=変数{0}は、デフォルト・コンストラクタで初期化されていません
 
 # 0: symbol
-compiler.err.var.might.be.assigned.in.loop=\u5909\u6570{0}\u306F\u30EB\u30FC\u30D7\u5185\u3067\u4EE3\u5165\u3055\u308C\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.err.var.might.be.assigned.in.loop=変数{0}はループ内で代入されている可能性があります
 
 # 0: symbol, 1: message segment
-compiler.err.varargs.invalid.trustme.anno={0}\u6CE8\u91C8\u304C\u7121\u52B9\u3067\u3059\u3002{1}
+compiler.err.varargs.invalid.trustme.anno={0}注釈が無効です。{1}
 
 # 0: type
-compiler.misc.varargs.trustme.on.reifiable.varargs=\u53EF\u5909\u5F15\u6570\u8981\u7D20\u578B{0}\u306Freifiable\u578B\u3067\u3059\u3002
+compiler.misc.varargs.trustme.on.reifiable.varargs=可変引数要素型{0}はreifiable型です。
 
 # 0: type, 1: type
-compiler.err.instanceof.reifiable.not.safe={0}\u3092{1}\u306B\u5B89\u5168\u306B\u30AD\u30E3\u30B9\u30C8\u3067\u304D\u307E\u305B\u3093
+compiler.err.instanceof.reifiable.not.safe={0}を{1}に安全にキャストできません
 
 # 0: symbol
-compiler.misc.varargs.trustme.on.non.varargs.meth=\u30E1\u30BD\u30C3\u30C9{0}\u306F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+compiler.misc.varargs.trustme.on.non.varargs.meth=メソッド{0}は可変引数メソッドではありません。
 
 # 0: symbol
-compiler.misc.varargs.trustme.on.non.varargs.accessor=\u30A2\u30AF\u30BB\u30B5{0}\u306F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+compiler.misc.varargs.trustme.on.non.varargs.accessor=アクセサ{0}は可変引数メソッドではありません。
 
 # 0: symbol
-compiler.misc.varargs.trustme.on.virtual.varargs=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9{0}\u306Ffinal\u3067\u3082private\u3067\u3082\u3042\u308A\u307E\u305B\u3093\u3002
+compiler.misc.varargs.trustme.on.virtual.varargs=インスタンス・メソッド{0}はfinalでもprivateでもありません。
 
 # 0: symbol
-compiler.misc.varargs.trustme.on.virtual.varargs.final.only=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9{0}\u306Ffinal\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+compiler.misc.varargs.trustme.on.virtual.varargs.final.only=インスタンス・メソッド{0}はfinalではありません。
 
 # 0: type, 1: symbol kind, 2: symbol
-compiler.misc.inaccessible.varargs.type=\u4EEE\u53EF\u5909\u5F15\u6570\u8981\u7D20\u578B{0}\u306F{1} {2}\u304B\u3089\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
+compiler.misc.inaccessible.varargs.type=仮可変引数要素型{0}は{1} {2}からアクセスできません
 
 # In the following string, {1} will always be the detail message from
 # java.io.IOException.
 # 0: symbol, 1: string
-compiler.err.class.cant.write={0}\u306E\u66F8\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
+compiler.err.class.cant.write={0}の書込み中にエラーが発生しました: {1}
 
 # In the following string, {0} is the name of the class in the Java source.
 # It really should be used two times..
 # 0: kind name, 1: name
-compiler.err.class.public.should.be.in.file={0} {1}\u306Fpublic\u3067\u3042\u308A\u3001\u30D5\u30A1\u30A4\u30EB{1}.java\u3067\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.class.public.should.be.in.file={0} {1}はpublicであり、ファイル{1}.javaで宣言する必要があります
 
 ## All errors which do not refer to a particular line in the source code are
 ## preceded by this string.
-compiler.err.error=\u30A8\u30E9\u30FC:\u0020
+compiler.err.error=エラー:\u0020
 
 # The following error messages do not refer to a line in the source code.
-compiler.err.cant.read.file={0}\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093
+compiler.err.cant.read.file={0}を読み込めません
 
 # 0: string
-compiler.err.plugin.not.found=\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
+compiler.err.plugin.not.found=プラグインが見つかりません: {0}
 
 # 0: path
-compiler.warn.locn.unknown.file.on.module.path=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u4E0D\u660E\u3067\u3059: {0}
+compiler.warn.locn.unknown.file.on.module.path=モジュール・パスのファイルが不明です: {0}
 
 
 # 0: path
-compiler.err.locn.bad.module-info={0}\u306Emodule-info.class\u3092\u8AAD\u53D6\u308A\u4E2D\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+compiler.err.locn.bad.module-info={0}のmodule-info.classを読取り中に問題が発生しました
 
 # 0: path
-compiler.err.locn.cant.read.directory=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093
+compiler.err.locn.cant.read.directory=ディレクトリ{0}を読み取れません
 
 # 0: path
-compiler.err.locn.cant.read.file=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093
+compiler.err.locn.cant.read.file=ファイル{0}を読み取れません
 
 # 0: path
-compiler.err.locn.cant.get.module.name.for.jar={0}\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u3092\u5224\u5225\u3067\u304D\u307E\u305B\u3093
+compiler.err.locn.cant.get.module.name.for.jar={0}のモジュール名を判別できません
 
 # 0: path
-compiler.err.multi-module.outdir.cannot.be.exploded.module=\u8907\u6570\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30E2\u30FC\u30C9\u3067\u3001\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u5C55\u958B\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093: {0}
+compiler.err.multi-module.outdir.cannot.be.exploded.module=複数モジュール・モードで、出力ディレクトリは展開したモジュールにすることはできません: {0}
 
 # 0: path
-compiler.warn.outdir.is.in.exploded.module=\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u5C55\u958B\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u3067\u3059: {0}
+compiler.warn.outdir.is.in.exploded.module=出力ディレクトリは展開したモジュール内です: {0}
 
 # 0: file object
-compiler.err.locn.module-info.not.allowed.on.patch.path=module-info.class\u306F\u30D1\u30C3\u30C1\u30FB\u30D1\u30B9\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093: {0}
+compiler.err.locn.module-info.not.allowed.on.patch.path=module-info.classはパッチ・パスでは許可されません: {0}
 
 # 0: string
-compiler.err.locn.invalid.arg.for.xpatch=--patch-module\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: {0}
+compiler.err.locn.invalid.arg.for.xpatch=--patch-moduleオプションの引数が無効です: {0}
 
-compiler.err.file.sb.on.source.or.patch.path.for.module=\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3001\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30C1\u30FB\u30D1\u30B9\u306B\u5B58\u5728\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.file.sb.on.source.or.patch.path.for.module=ファイルは、ソース・パス、またはモジュールのパッチ・パスに存在している必要があります
 
-compiler.err.no.java.lang=\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u30FB\u30AF\u30E9\u30B9\u3067\u30D1\u30C3\u30B1\u30FC\u30B8java.lang\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
+compiler.err.no.java.lang=プラットフォーム・クラスでパッケージjava.langを検出できません
 
 #####
 
 # Fatal Errors
 
 # 0: name
-compiler.misc.fatal.err.cant.locate.meth=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u30E1\u30BD\u30C3\u30C9{0}\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
+compiler.misc.fatal.err.cant.locate.meth=致命的エラー: メソッド{0}を検出できません
 
 # 0: name
-compiler.misc.fatal.err.cant.locate.field=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u30D5\u30A3\u30FC\u30EB\u30C9{0}\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
+compiler.misc.fatal.err.cant.locate.field=致命的エラー: フィールド{0}を検出できません
 
 # 0: type
-compiler.misc.fatal.err.cant.locate.ctor=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: {0}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
+compiler.misc.fatal.err.cant.locate.ctor=致命的エラー: {0}のコンストラクタを検出できません
 
-compiler.misc.fatal.err.cant.close=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u30B3\u30F3\u30D1\u30A4\u30E9\u30FB\u30EA\u30BD\u30FC\u30B9\u3092\u9589\u3058\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
+compiler.misc.fatal.err.cant.close=致命的エラー: コンパイラ・リソースを閉じることができません
 
 #####
 
@@ -1165,94 +1165,94 @@ compiler.misc.fatal.err.cant.close=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u30B3\
 ## miscellaneous strings
 ##
 
-compiler.misc.diamond.anonymous.methods.implicitly.override=(<>\u306E\u305F\u3081\u3001\u3053\u306E\u533F\u540D\u30AF\u30E9\u30B9\u306B\u5BA3\u8A00\u3055\u308C\u305F\u3059\u3079\u3066\u306E\u975Eprivate\u30E1\u30BD\u30C3\u30C9\u306F\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u5B9F\u88C5\u3057\u307E\u305B\u3093)
+compiler.misc.diamond.anonymous.methods.implicitly.override=(<>のため、この匿名クラスに宣言されたすべての非privateメソッドはスーパータイプのメソッドをオーバーライドまたは実装しません)
 
-compiler.misc.source.unavailable=(\u30BD\u30FC\u30B9\u304C\u5229\u7528\u4E0D\u53EF)
+compiler.misc.source.unavailable=(ソースが利用不可)
 
 # 0: string, 1: string, 2: boolean
-compiler.misc.x.print.processor.info=\u30D7\u30ED\u30BB\u30C3\u30B5{0}\u306F{1}\u306B\u4E00\u81F4\u3057\u3001{2}\u3092\u8FD4\u3057\u307E\u3059\u3002
+compiler.misc.x.print.processor.info=プロセッサ{0}は{1}に一致し、{2}を返します。
 
 # 0: number, 1: string, 2: set of symbol, 3: boolean
-compiler.misc.x.print.rounds=\u5F80\u5FA9{0}:\n\t\u5165\u529B\u30D5\u30A1\u30A4\u30EB: {1}\n\t\u6CE8\u91C8: {2}\n\t\u6700\u5F8C\u306E\u5F80\u5FA9: {3}
+compiler.misc.x.print.rounds=往復{0}:\n\t入力ファイル: {1}\n\t注釈: {2}\n\t最後の往復: {3}
 
 # 0: file name
-compiler.warn.file.from.future=\u30D5\u30A1\u30A4\u30EB{0}\u306E\u5909\u66F4\u65E5\u304C\u5C06\u6765\u306E\u65E5\u4ED8\u3067\u3059
+compiler.warn.file.from.future=ファイル{0}の変更日が将来の日付です
 
 # 0: path
-compiler.warn.output.file.clash=\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u66F8\u8FBC\u307F\u304C\u8907\u6570\u56DE\u3042\u308A\u307E\u3057\u305F: {0}
+compiler.warn.output.file.clash=出力ファイルへの書込みが複数回ありました: {0}
 
 #####
 
 ## The following string will appear before all messages keyed as:
 ## "compiler.note".
 
-compiler.note.compressed.diags=\u4E00\u90E8\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306F\u7C21\u7565\u5316\u3055\u308C\u3066\u3044\u307E\u3059\u3002-Xdiags:verbose\u3067\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u3066\u5B8C\u5168\u306A\u51FA\u529B\u3092\u53D6\u5F97\u3057\u3066\u304F\u3060\u3055\u3044
+compiler.note.compressed.diags=一部のメッセージは簡略化されています。-Xdiags:verboseで再コンパイルして完全な出力を取得してください
 
 # 0: boolean, 1: symbol
-compiler.note.lambda.stat=\u30E9\u30E0\u30C0\u5F0F\u3092\u5909\u63DB\u3057\u3066\u3044\u307E\u3059\n\u4EE3\u66FFmetafactory = {0}\n\u5408\u6210\u30E1\u30BD\u30C3\u30C9 = {1}
+compiler.note.lambda.stat=ラムダ式を変換しています\n代替metafactory = {0}\n合成メソッド = {1}
 
 # 0: boolean, 1: unused
-compiler.note.mref.stat=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u3092\u5909\u63DB\u3057\u3066\u3044\u307E\u3059\n\u4EE3\u66FFmetafactory = {0}\n
+compiler.note.mref.stat=メソッド参照を変換しています\n代替metafactory = {0}\n
 # 0: boolean, 1: symbol
-compiler.note.mref.stat.1=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u3092\u5909\u63DB\u3057\u3066\u3044\u307E\u3059\n\u4EE3\u66FFmetafactory = {0}\n\u30D6\u30EA\u30C3\u30B8\u30FB\u30E1\u30BD\u30C3\u30C9 = {1}
+compiler.note.mref.stat.1=メソッド参照を変換しています\n代替metafactory = {0}\nブリッジ・メソッド = {1}
 
-compiler.note.note=\u30CE\u30FC\u30C8:\u0020
+compiler.note.note=ノート:\u0020
 
 # 0: file name
-compiler.note.deprecated.filename={0}\u306F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002
+compiler.note.deprecated.filename={0}は推奨されないAPIを使用またはオーバーライドしています。
 
-compiler.note.deprecated.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002
+compiler.note.deprecated.plural=一部の入力ファイルは推奨されないAPIを使用またはオーバーライドしています。
 
 # The following string may appear after one of the above deprecation
 # messages.
-compiler.note.deprecated.recompile=\u8A73\u7D30\u306F\u3001-Xlint:deprecation\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+compiler.note.deprecated.recompile=詳細は、-Xlint:deprecationオプションを指定して再コンパイルしてください。
 
 # 0: file name
-compiler.note.deprecated.filename.additional={0}\u306B\u63A8\u5968\u3055\u308C\u306A\u3044API\u306E\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u304C\u3042\u308A\u307E\u3059\u3002
+compiler.note.deprecated.filename.additional={0}に推奨されないAPIの追加使用またはオーバーライドがあります。
 
-compiler.note.deprecated.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002
+compiler.note.deprecated.plural.additional=一部の入力ファイルは推奨されないAPIを追加使用またはオーバーライドしています。
 
 # 0: file name
-compiler.note.removal.filename={0}\u306F\u3001\u524A\u9664\u7528\u306B\u30DE\u30FC\u30AF\u3055\u308C\u305F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002
+compiler.note.removal.filename={0}は、削除用にマークされた推奨されないAPIを使用またはオーバーライドしています。
 
-compiler.note.removal.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u524A\u9664\u7528\u306B\u30DE\u30FC\u30AF\u3055\u308C\u305F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002
+compiler.note.removal.plural=一部の入力ファイルは、削除用にマークされた推奨されないAPIを使用またはオーバーライドしています。
 
 # The following string may appear after one of the above removal messages.
-compiler.note.removal.recompile=\u8A73\u7D30\u306F\u3001-Xlint:removal\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+compiler.note.removal.recompile=詳細は、-Xlint:removalオプションを指定して再コンパイルしてください。
 
 # 0: file name
-compiler.note.removal.filename.additional={0}\u306B\u3001\u524A\u9664\u7528\u306B\u30DE\u30FC\u30AF\u3055\u308C\u305F\u63A8\u5968\u3055\u308C\u306A\u3044API\u306E\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u304C\u3042\u308A\u307E\u3059\u3002
+compiler.note.removal.filename.additional={0}に、削除用にマークされた推奨されないAPIの追加使用またはオーバーライドがあります。
 
-compiler.note.removal.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u524A\u9664\u7528\u306B\u30DE\u30FC\u30AF\u3055\u308C\u305F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002
+compiler.note.removal.plural.additional=一部の入力ファイルは、削除用にマークされた推奨されないAPIを追加使用またはオーバーライドしています。
 
 # 0: file name
-compiler.note.unchecked.filename={0}\u306E\u64CD\u4F5C\u306F\u3001\u672A\u30C1\u30A7\u30C3\u30AF\u307E\u305F\u306F\u5B89\u5168\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+compiler.note.unchecked.filename={0}の操作は、未チェックまたは安全ではありません。
 
-compiler.note.unchecked.plural=\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u64CD\u4F5C\u306E\u3046\u3061\u3001\u672A\u30C1\u30A7\u30C3\u30AF\u307E\u305F\u306F\u5B89\u5168\u3067\u306F\u306A\u3044\u3082\u306E\u304C\u3042\u308A\u307E\u3059\u3002
+compiler.note.unchecked.plural=入力ファイルの操作のうち、未チェックまたは安全ではないものがあります。
 
 # The following string may appear after one of the above unchecked messages.
-compiler.note.unchecked.recompile=\u8A73\u7D30\u306F\u3001-Xlint:unchecked\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+compiler.note.unchecked.recompile=詳細は、-Xlint:uncheckedオプションを指定して再コンパイルしてください。
 
 # 0: file name
-compiler.note.unchecked.filename.additional={0}\u306B\u672A\u30C1\u30A7\u30C3\u30AF\u307E\u305F\u306F\u5B89\u5168\u3067\u306F\u306A\u3044\u64CD\u4F5C\u304C\u3055\u3089\u306B\u3042\u308A\u307E\u3059\u3002
+compiler.note.unchecked.filename.additional={0}に未チェックまたは安全ではない操作がさらにあります。
 
-compiler.note.unchecked.plural.additional=\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u64CD\u4F5C\u306E\u3046\u3061\u3001\u672A\u30C1\u30A7\u30C3\u30AF\u307E\u305F\u306F\u5B89\u5168\u3067\u306F\u306A\u3044\u3082\u306E\u304C\u3055\u3089\u306B\u3042\u308A\u307E\u3059\u3002
+compiler.note.unchecked.plural.additional=入力ファイルの操作のうち、未チェックまたは安全ではないものがさらにあります。
 
 # 0: file name, 1: source
-compiler.note.preview.filename={0}\u306FJava SE {1}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+compiler.note.preview.filename={0}はJava SE {1}のプレビュー機能を使用します。
 
 # 0: source
-compiler.note.preview.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306FJava SE {0}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+compiler.note.preview.plural=一部の入力ファイルはJava SE {0}のプレビュー機能を使用します。
 
 # The following string may appear after one of the above deprecation
 # messages.
-compiler.note.preview.recompile=\u8A73\u7D30\u306F\u3001-Xlint:preview\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+compiler.note.preview.recompile=詳細は、-Xlint:previewオプションを指定して再コンパイルしてください。
 
 # 0: file name, 1: source
-compiler.note.preview.filename.additional={0}\u306BJava SE {1}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306E\u8FFD\u52A0\u4F7F\u7528\u304C\u3042\u308A\u307E\u3059\u3002
+compiler.note.preview.filename.additional={0}にJava SE {1}のプレビュー機能の追加使用があります。
 
 # 0: source
-compiler.note.preview.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306FJava SE {0}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u8FFD\u52A0\u4F7F\u7528\u3057\u307E\u3059\u3002
+compiler.note.preview.plural.additional=一部の入力ファイルはJava SE {0}のプレビュー機能を追加使用します。
 
 # Notes related to annotation processing
 
@@ -1261,61 +1261,61 @@ compiler.note.preview.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30
 compiler.note.proc.messager={0}
 
 # 0: string, 1: string, 2: string
-compiler.note.multiple.elements=\u30E2\u30B8\u30E5\u30FC\u30EB''{2}''\u306B''{1}\u3068\u3044\u3046\u540D\u524D\u306E\u8907\u6570\u306E\u8981\u7D20\u304Cjavax.lang.model.util.Elements.{0}\u306B\u3088\u3063\u3066\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
+compiler.note.multiple.elements=モジュール''{2}''に''{1}という名前の複数の要素がjavax.lang.model.util.Elements.{0}によって見つかりました。
 
-compiler.note.implicit.annotation.processing=\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B1\u3064\u4EE5\u4E0A\u306E\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u898B\u3064\u304B\u3063\u305F\u305F\u3081\u3001\u6CE8\u91C8\u51E6\u7406\u304C\u6709\u52B9\u5316\u3055\u308C\u3066\n\u3044\u307E\u3059\u3002\u5C11\u306A\u304F\u3068\u30821\u3064\u306E\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u540D\u524D(-processor)\u3067\u6307\u5B9A\u3055\u308C\u308B\u304B\u3001\u691C\u7D22\u30D1\u30B9\n(--processor-path\u3001--processor-module-path)\u304C\u6307\u5B9A\u3055\u308C\u308B\u304B\u3001\u6CE8\u91C8\u51E6\u7406\u304C\u660E\u793A\u7684\u306B\n\u6709\u52B9\u5316(-proc:only\u3001-proc:full)\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3092\u9664\u304D\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u306Ejavac\u3067\u306F\n\u6CE8\u91C8\u51E6\u7406\u304C\u7121\u52B9\u5316\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n-Xlint:\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u975E\u8868\u793A\u306B\u3067\u304D\u307E\u3059\u3002\n-proc:none\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u6CE8\u91C8\u51E6\u7406\u3092\u7121\u52B9\u5316\u3067\u304D\u307E\u3059\u3002
+compiler.note.implicit.annotation.processing=クラス・パスに1つ以上のプロセッサが見つかったため、注釈処理が有効化されて\nいます。少なくとも1つのプロセッサが名前(-processor)で指定されるか、検索パス\n(--processor-path、--processor-module-path)が指定されるか、注釈処理が明示的に\n有効化(-proc:only、-proc:full)されている場合を除き、将来のリリースのjavacでは\n注釈処理が無効化される可能性があります。\n-Xlint:オプションを使用すると、このメッセージを非表示にできます。\n-proc:noneを使用すると、注釈処理を無効化できます。
 
 #####
 
 # 0: number
-compiler.misc.count.error=\u30A8\u30E9\u30FC{0}\u500B
+compiler.misc.count.error=エラー{0}個
 
 # 0: number
-compiler.misc.count.error.plural=\u30A8\u30E9\u30FC{0}\u500B
+compiler.misc.count.error.plural=エラー{0}個
 
 # 0: number, 1: number
-compiler.misc.count.error.recompile=\u5408\u8A08{1}\u500B\u306E\u3046\u3061\u3001\u6700\u521D\u306E{0}\u500B\u306E\u30A8\u30E9\u30FC\u306E\u307F\u8868\u793A\u3057\u3066\u3044\u307E\u3059\u3002\u3055\u3089\u306B\u8868\u793A\u3059\u308B\u5834\u5408\u306F\u3001-Xmaxerrs\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
+compiler.misc.count.error.recompile=合計{1}個のうち、最初の{0}個のエラーのみ表示しています。さらに表示する場合は、-Xmaxerrsを使用してください
 
 # 0: number, 1: number
-compiler.misc.count.warn.recompile=\u5408\u8A08{1}\u500B\u306E\u3046\u3061\u3001\u6700\u521D\u306E{0}\u500B\u306E\u8B66\u544A\u306E\u307F\u8868\u793A\u3057\u3066\u3044\u307E\u3059\u3002\u3055\u3089\u306B\u8868\u793A\u3059\u308B\u5834\u5408\u306F\u3001-Xmaxwarns\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
+compiler.misc.count.warn.recompile=合計{1}個のうち、最初の{0}個の警告のみ表示しています。さらに表示する場合は、-Xmaxwarnsを使用してください
 
 # 0: number
-compiler.misc.count.warn=\u8B66\u544A{0}\u500B
+compiler.misc.count.warn=警告{0}個
 
 # 0: number
-compiler.misc.count.warn.plural=\u8B66\u544A{0}\u500B
+compiler.misc.count.warn.plural=警告{0}個
 
-compiler.misc.version.not.available=(\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u304C\u3042\u308A\u307E\u305B\u3093)
+compiler.misc.version.not.available=(バージョン情報がありません)
 
 ## extra output when using -verbose (JavaCompiler)
 
 # 0: symbol
-compiler.misc.verbose.checking.attribution=[{0}\u3092\u78BA\u8A8D\u4E2D]
+compiler.misc.verbose.checking.attribution=[{0}を確認中]
 
 # 0: string
-compiler.misc.verbose.parsing.done=[{0}\u30DF\u30EA\u79D2\u3067\u69CB\u6587\u89E3\u6790\u5B8C\u4E86]
+compiler.misc.verbose.parsing.done=[{0}ミリ秒で構文解析完了]
 
 # 0: file name
-compiler.misc.verbose.parsing.started=[{0}\u3092\u69CB\u6587\u89E3\u6790\u958B\u59CB]
+compiler.misc.verbose.parsing.started=[{0}を構文解析開始]
 
 # 0: string
-compiler.misc.verbose.total=[\u5408\u8A08{0}\u30DF\u30EA\u79D2]
+compiler.misc.verbose.total=[合計{0}ミリ秒]
 
 # 0: file name
-compiler.misc.verbose.wrote.file=[{0}\u3092\u66F8\u8FBC\u307F\u5B8C\u4E86]
+compiler.misc.verbose.wrote.file=[{0}を書込み完了]
 
 ## extra output when using -verbose (code/ClassReader)
 # 0: string
-compiler.misc.verbose.loading=[{0}\u3092\u8AAD\u8FBC\u307F\u4E2D]
+compiler.misc.verbose.loading=[{0}を読込み中]
 
 # 0: string
-compiler.misc.verbose.sourcepath=[\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u30D1\u30B9: {0}]
+compiler.misc.verbose.sourcepath=[ソース・ファイルの検索パス: {0}]
 
 # 0: string
-compiler.misc.verbose.classpath=[\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u30D1\u30B9: {0}]
+compiler.misc.verbose.classpath=[クラス・ファイルの検索パス: {0}]
 
 ## extra output when using -prompt (util/Log)
-compiler.misc.resume.abort=R)\u518D\u958B,A)\u4E2D\u6B62>
+compiler.misc.resume.abort=R)再開,A)中止>
 
 #####
 
@@ -1324,7 +1324,7 @@ compiler.misc.resume.abort=R)\u518D\u958B,A)\u4E2D\u6B62>
 ##
 
 ## All warning messages are preceded by the following string.
-compiler.warn.warning=\u8B66\u544A:\u0020
+compiler.warn.warning=警告:\u0020
 
 ## Warning messages may also include the following prefix to identify a
 ## lint option
@@ -1332,349 +1332,349 @@ compiler.warn.warning=\u8B66\u544A:\u0020
 compiler.warn.lintOption=[{0}]\u0020
 
 # 0: symbol
-compiler.warn.constant.SVUID=serialVersionUID\u306F\u30AF\u30E9\u30B9{0}\u306E\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.warn.constant.SVUID=serialVersionUIDはクラス{0}の定数である必要があります
 
 # 0: path
-compiler.warn.dir.path.element.not.found=\u4E0D\u6B63\u306A\u30D1\u30B9\u8981\u7D20"{0}": \u305D\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
+compiler.warn.dir.path.element.not.found=不正なパス要素"{0}": そのディレクトリは存在しません
 
 # 0: file name
-compiler.warn.dir.path.element.not.directory=\u4E0D\u6B63\u306A\u30D1\u30B9\u8981\u7D20"{0}": \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
+compiler.warn.dir.path.element.not.directory=不正なパス要素"{0}": ディレクトリは存在しません
 
 # 0: symbol, 1: symbol, 2: symbol
-compiler.warn.missing-explicit-ctor=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8{1}\u306E\u30AF\u30E9\u30B9{0}\u306F\u660E\u793A\u7684\u306A\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u5BA3\u8A00\u3057\u306A\u3044\u305F\u3081\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u30E2\u30B8\u30E5\u30FC\u30EB{2}\u306E\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306B\u516C\u958B\u3057\u307E\u3059
+compiler.warn.missing-explicit-ctor=エクスポートされたパッケージ{1}のクラス{0}は明示的なコンストラクタを宣言しないため、デフォルト・コンストラクタをモジュール{2}のクライアントに公開します
 
-compiler.warn.strictfp=\u30EA\u30EA\u30FC\u30B917\u4EE5\u964D\u3001\u3059\u3079\u3066\u306E\u6D6E\u52D5\u5C0F\u6570\u70B9\u5F0F\u306F\u53B3\u5BC6\u306B\u8A55\u4FA1\u3055\u308C\u3001''strictfp''\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
+compiler.warn.strictfp=リリース17以降、すべての浮動小数点式は厳密に評価され、''strictfp''は必要ありません
 
-compiler.warn.finally.cannot.complete=finally\u7BC0\u304C\u6B63\u5E38\u306B\u5B8C\u4E86\u3067\u304D\u307E\u305B\u3093
+compiler.warn.finally.cannot.complete=finally節が正常に完了できません
 
 # 0: name
-compiler.warn.poor.choice.for.module.name=\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8{0}\u306E\u672B\u5C3E\u306F\u6570\u5B57\u306B\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044
+compiler.warn.poor.choice.for.module.name=モジュール名コンポーネント{0}の末尾は数字にしないでください
 
 # 0: string
-compiler.warn.incubating.modules=\u5B9F\u9A13\u7684\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059: {0}
+compiler.warn.incubating.modules=実験的なモジュールを使用しています: {0}
 
 # 0: symbol, 1: symbol
-compiler.warn.has.been.deprecated={1}\u306E{0}\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093
+compiler.warn.has.been.deprecated={1}の{0}は推奨されません
 
 # 0: symbol, 1: symbol
-compiler.warn.has.been.deprecated.for.removal={1}\u306E{0}\u306F\u63A8\u5968\u3055\u308C\u3066\u304A\u3089\u305A\u3001\u524A\u9664\u7528\u306B\u30DE\u30FC\u30AF\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.warn.has.been.deprecated.for.removal={1}の{0}は推奨されておらず、削除用にマークされています
 
 # 0: symbol
-compiler.warn.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+compiler.warn.is.preview={0}はプレビューAPIであり、今後のリリースで削除される可能性があります。
 
 # 0: symbol
-compiler.err.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3042\u308A\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n(\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F--enable-preview\u3092\u4F7F\u7528\u3057\u307E\u3059)
+compiler.err.is.preview={0}はプレビューAPIであり、デフォルトで無効になっています。\n(プレビューAPIを有効にするには--enable-previewを使用します)
 
 # 0: symbol
-compiler.warn.is.preview.reflective={0}\u306F\u30EA\u30D5\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+compiler.warn.is.preview.reflective={0}はリフレクティブ・プレビューAPIであり、今後のリリースで削除される可能性があります。
 
 # 0: symbol
-compiler.warn.has.been.deprecated.module=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093
+compiler.warn.has.been.deprecated.module=モジュール{0}は推奨されません
 
 # 0: symbol
-compiler.warn.has.been.deprecated.for.removal.module=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306F\u63A8\u5968\u3055\u308C\u3066\u304A\u3089\u305A\u3001\u524A\u9664\u7528\u306B\u30DE\u30FC\u30AF\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.warn.has.been.deprecated.for.removal.module=モジュール{0}は推奨されておらず、削除用にマークされています
 
 # 0: symbol
-compiler.warn.sun.proprietary={0}\u306F\u5185\u90E8\u6240\u6709\u306EAPI\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.warn.sun.proprietary={0}は内部所有のAPIであり、今後のリリースで削除される可能性があります
 
-compiler.warn.illegal.char.for.encoding=\u3053\u306E\u6587\u5B57\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0{0}\u306B\u30DE\u30C3\u30D7\u3067\u304D\u307E\u305B\u3093
+compiler.warn.illegal.char.for.encoding=この文字は、エンコーディング{0}にマップできません
 
 # 0: symbol
-compiler.warn.improper.SVUID=serialVersionUID\u306F\u3001\u30AF\u30E9\u30B9{0}\u306Bstatic final\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.warn.improper.SVUID=serialVersionUIDは、クラス{0}にstatic finalを宣言する必要があります
 
-compiler.warn.improper.SPF=serialPersistentFields\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001private static final\u3068\u3057\u3066\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.warn.improper.SPF=serialPersistentFieldsを有効にするには、private static finalとして宣言する必要があります
 
-compiler.warn.SPF.null.init=null\u306B\u521D\u671F\u5316\u3059\u308B\u3068serialPersistentFields\u306F\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002\n\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u306A\u3044\u3053\u3068\u3092\u793A\u3059\u306B\u306F\u3001\u7A7A\u306E\u914D\u5217\u306B\u521D\u671F\u5316\u3057\u307E\u3059
+compiler.warn.SPF.null.init=nullに初期化するとserialPersistentFieldsは無効になります。\nフィールドがないことを示すには、空の配列に初期化します
 
 
 # 0: type, 1: type
-compiler.warn.inexact.non-varargs.call=\u6700\u7D42\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u4E0D\u6B63\u78BA\u306A\u5F15\u6570\u578B\u3092\u6301\u3063\u305F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306E\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u3002\n\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{0}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u307E\u3059\u3002\n\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{1}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059
+compiler.warn.inexact.non-varargs.call=最終パラメータの不正確な引数型を持った可変引数メソッドの非可変引数呼出し。\n可変引数呼出しに関しては{0}にキャストします。\n非可変引数呼出しに関しては{1}にキャストしてこの警告を出さないようにします
 
 # 0: list of type
-compiler.warn.unreachable.catch=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\n\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u3059\u3067\u306B\u6355\u6349\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.warn.unreachable.catch=catch句に移すことができません\nスローされたタイプ{0}はすでに捕捉されています
 
 # 0: list of type
-compiler.warn.unreachable.catch.1=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\n\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u3059\u3067\u306B\u6355\u6349\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.warn.unreachable.catch.1=catch句に移すことができません\nスローされたタイプ{0}はすでに捕捉されています
 
 # 0: symbol
-compiler.warn.long.SVUID=serialVersionUID\u306F\u3001\u30AF\u30E9\u30B9{0}\u306Elong\u578B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.warn.long.SVUID=serialVersionUIDは、クラス{0}のlong型である必要があります
 
-compiler.warn.OSF.array.SPF=serialPersistentFields\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30BF\u30A4\u30D7\u3092java.io.ObjectStreamField[]\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.warn.OSF.array.SPF=serialPersistentFieldsを有効にするには、タイプをjava.io.ObjectStreamField[]にする必要があります
 
 # 0: symbol
-compiler.warn.missing.SVUID=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9{0}\u306B\u306F\u3001serialVersionUID\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.warn.missing.SVUID=直列化可能なクラス{0}には、serialVersionUIDが定義されていません
 
 # 0: name
-compiler.warn.serializable.missing.access.no.arg.ctor=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u4E0D\u53EF\u306E\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9{0}\u3067\u5F15\u6570\u306A\u3057\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
+compiler.warn.serializable.missing.access.no.arg.ctor=シリアライズ不可のスーパークラス{0}で引数なしのコンストラクタにアクセスできません
 
 # 0: name
-compiler.warn.serial.method.not.private=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306Fprivate\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.warn.serial.method.not.private=シリアライズ関連メソッド{0}はprivateとして宣言されていません
 
 # 0: name
-compiler.warn.serial.concrete.instance.method=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001concrete\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002abstract\u3067\u3082static\u3067\u3082\u3042\u308A\u307E\u305B\u3093
+compiler.warn.serial.concrete.instance.method=シリアライズ関連メソッド{0}を有効にするには、concreteインスタンス・メソッドである必要があります。abstractでもstaticでもありません
 
 # 0: name
-compiler.warn.serial.method.static=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u304Cstatic\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u304B\u308F\u308A\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.warn.serial.method.static=シリアライズ関連メソッド{0}がstaticとして宣言されています。有効にするには、かわりにインスタンス・メソッドにする必要があります
 
 # 0: name
-compiler.warn.serial.method.no.args=\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6307\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044
+compiler.warn.serial.method.no.args=有効にするには、シリアライズ関連メソッド{0}にパラメータを指定しないでください
 
 # 0: name, 1: number
-compiler.warn.serial.method.one.arg=\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306B\u3001{1}\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F\u306A\u304F\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30921\u3064\u306E\u307F\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.warn.serial.method.one.arg=有効にするには、シリアライズ関連メソッド{0}に、{1}のパラメータではなく、パラメータを1つのみ指定する必要があります
 
 # 0: name, 1: type, 2: type
-compiler.warn.serial.method.parameter.type=\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306E1\u3064\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3001\u578B{2}\u3067\u306F\u306A\u304F\u3001\u578B{1}\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.warn.serial.method.parameter.type=有効にするには、シリアライズ関連メソッド{0}の1つのパラメータに、型{2}ではなく、型{1}を指定する必要があります
 
 # 0: name, 1: type, 2: type
-compiler.warn.serial.method.unexpected.return.type=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u3001\u5FC5\u8981\u306A\u578B{2}\u3067\u306F\u306A\u304F\u3001{1}\u306E\u623B\u308A\u578B\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u3088\u3046\u306B\u3001\u30E1\u30BD\u30C3\u30C9\u306F\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u304C\u7121\u52B9\u306B\u306A\u308A\u307E\u3059
+compiler.warn.serial.method.unexpected.return.type=シリアライズ関連メソッド{0}は、必要な型{2}ではなく、{1}の戻り型で宣言されています。\n宣言されているように、メソッドはシリアライズが無効になります
 
 # 0: name, 1: type
-compiler.warn.serial.method.unexpected.exception=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u4E88\u671F\u3057\u306A\u3044\u578B{1}\u3092\u30B9\u30ED\u30FC\u3059\u308B\u3088\u3046\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.warn.serial.method.unexpected.exception=シリアライズ関連メソッド{0}は予期しない型{1}をスローするように宣言されています
 
-compiler.warn.ineffectual.serial.field.interface=serialPersistentFields\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.warn.ineffectual.serial.field.interface=serialPersistentFieldsはインタフェースで有効ではありません
 
 # 0: string
-compiler.warn.ineffectual.serial.field.enum=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30D5\u30A3\u30FC\u30EB\u30C9{0}\u306F\u5217\u6319\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.warn.ineffectual.serial.field.enum=シリアライズ関連フィールド{0}は列挙クラスで有効ではありません
 
 # 0: string
-compiler.warn.ineffectual.serial.method.enum=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u5217\u6319\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.warn.ineffectual.serial.method.enum=シリアライズ関連メソッド{0}は列挙クラスで有効ではありません
 
 # 0: string
-compiler.warn.ineffectual.extern.method.enum=\u5916\u90E8\u5316\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u5217\u6319\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.warn.ineffectual.extern.method.enum=外部化関連メソッド{0}は列挙クラスで有効ではありません
 
-compiler.warn.ineffectual.serial.field.record=serialPersistentFields\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.warn.ineffectual.serial.field.record=serialPersistentFieldsはレコード・クラスで有効ではありません
 
 # 0: string
-compiler.warn.ineffectual.serial.method.record=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.warn.ineffectual.serial.method.record=シリアライズ関連メソッド{0}はレコード・ラスで有効ではありません
 
 # 0: string
-compiler.warn.ineffectual.externalizable.method.record=\u5916\u90E8\u5316\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.warn.ineffectual.externalizable.method.record=外部化関連メソッド{0}はレコード・クラスで有効ではありません
 
 # 0: name
-compiler.warn.ineffectual.serial.method.externalizable=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.warn.ineffectual.serial.method.externalizable=シリアライズ関連メソッド{0}は外部化可能なクラスで有効ではありません
 
-compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFieldsは外部化可能なクラスで有効ではありません
 
-compiler.warn.externalizable.missing.public.no.arg.ctor=\u5916\u90E8\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306B\u306F\u5F15\u6570\u306A\u3057\u3067\u30D1\u30D6\u30EA\u30C3\u30AF\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u5FC5\u8981\u3067\u3059
+compiler.warn.externalizable.missing.public.no.arg.ctor=外部化可能なクラスには引数なしでパブリックのコンストラクタが必要です
 
-compiler.warn.non.serializable.instance.field=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306E\u5E38\u99D0\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u76F4\u5217\u4E0D\u53EF\u30BF\u30A4\u30D7\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.warn.non.serializable.instance.field=直列化可能なクラスの常駐インスタンス・フィールドは直列不可タイプで宣言されています
 
 # 0: type
-compiler.warn.non.serializable.instance.field.array=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306E\u5E38\u99D0\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u3001\u76F4\u5217\u4E0D\u53EF\u306E\u30D9\u30FC\u30B9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7{0}\u3092\u6301\u3064\u914D\u5217\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.warn.non.serializable.instance.field.array=直列化可能なクラスの常駐インスタンス・フィールドは、直列不可のベース・コンポーネント・タイプ{0}を持つ配列で宣言されています
 
-compiler.warn.non.private.method.weaker.access=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067private\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u305F\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9\u306B\u3088\u3063\u3066\u3001\n\u305D\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3059\u308B\u30AF\u30E9\u30B9\u304C\u30E1\u30BD\u30C3\u30C9\u3092private\u3068\u3057\u3066\u5BA3\u8A00\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059
+compiler.warn.non.private.method.weaker.access=インタフェースでprivateとして宣言されたシリアライズ関連メソッドによって、\nそのインタフェースを実装するクラスがメソッドをprivateとして宣言できなくなります
 
-compiler.warn.default.ineffective=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u3001\u30AF\u30E9\u30B9\u3092\u5B9F\u88C5\u3059\u308B\u305F\u3081\u306E\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u3067\u5B9F\u884C\u3055\u308C\u307E\u305B\u3093
+compiler.warn.default.ineffective=インタフェースのシリアライズ関連のデフォルト・メソッドは、クラスを実装するためのシリアライズで実行されません
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.warn.potentially.ambiguous.overload={1}\u5185\u306E{0}\u306F{3}\u5185\u306E{2}\u3068\u77DB\u76FE\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.warn.potentially.ambiguous.overload={1}内の{0}は{3}内の{2}と矛盾する可能性があります
 
 # 0: message segment
-compiler.warn.override.varargs.missing={0}\u3002\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u306B\u306F''...''\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.warn.override.varargs.missing={0}。オーバーライドされたメソッドには''...''がありません
 
 # 0: message segment
-compiler.warn.override.varargs.extra={0}\u3002\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u308B\u30E1\u30BD\u30C3\u30C9\u306B\u306F''...''\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.warn.override.varargs.extra={0}。オーバーライドしているメソッドには''...''がありません
 
 # 0: message segment
-compiler.warn.override.bridge={0}\u3002\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u306F\u30D6\u30EA\u30C3\u30B8\u30FB\u30E1\u30BD\u30C3\u30C9\u3067\u3059
+compiler.warn.override.bridge={0}。オーバーライドされたメソッドはブリッジ・メソッドです
 
 # 0: symbol
-compiler.warn.pkg-info.already.seen=package-info.java\u30D5\u30A1\u30A4\u30EB\u304C\u3059\u3067\u306B\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u7528\u306B\u8868\u793A\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.warn.pkg-info.already.seen=package-info.javaファイルがすでにパッケージ{0}用に表示されています
 
 # 0: path
-compiler.warn.path.element.not.found=\u4E0D\u6B63\u306A\u30D1\u30B9\u8981\u7D20"{0}": \u305D\u306E\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.warn.path.element.not.found=不正なパス要素"{0}": そのファイルまたはディレクトリはありません
 
-compiler.warn.possible.fall-through.into.case=case\u306Bfall-through\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.warn.possible.fall-through.into.case=caseにfall-throughする可能性があります
 
 # 0: type
-compiler.warn.redundant.cast={0}\u3078\u306E\u5197\u9577\u306A\u30AD\u30E3\u30B9\u30C8\u3067\u3059
+compiler.warn.redundant.cast={0}への冗長なキャストです
 
 # 0: number
-compiler.warn.position.overflow=\u4F4D\u7F6E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u304C\u884C{0}\u3067\u30AA\u30FC\u30D0\u30FC\u30D5\u30ED\u30FC\u3057\u307E\u3059
+compiler.warn.position.overflow=位置エンコーディングが行{0}でオーバーフローします
 
 # 0: file name, 1: number, 2: number
-compiler.warn.big.major.version={0}: \u30E1\u30B8\u30E3\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3{1}\u306F\u3001\u3053\u306E\u30B3\u30F3\u30D1\u30A4\u30E9\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u6700\u65B0\u306E\u30E1\u30B8\u30E3\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3{2}\u3088\u308A\u65B0\u3057\u3044\u3067\u3059\u3002\n\u30B3\u30F3\u30D1\u30A4\u30E9\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u3092\u304A\u85A6\u3081\u3057\u307E\u3059\u3002
+compiler.warn.big.major.version={0}: メジャー・バージョン{1}は、このコンパイラでサポートされている最新のメジャー・バージョン{2}より新しいです。\nコンパイラのアップグレードをお薦めします。
 
 # 0: file name, 1: fragment
-compiler.warn.invalid.utf8.in.classfile={0}: \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u7121\u52B9\u306AUTF-8\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059: {1}
+compiler.warn.invalid.utf8.in.classfile={0}: クラス・ファイルに無効なUTF-8が含まれています: {1}
 
 # 0: kind name, 1: symbol
-compiler.warn.static.not.qualified.by.type=static {0}\u306F\u5F0F\u3067\u306F\u306A\u304F\u578B\u540D{1}\u3067\u4FEE\u98FE\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.warn.static.not.qualified.by.type=static {0}は式ではなく型名{1}で修飾する必要があります
 
 # 0: kind name
-compiler.warn.static.not.qualified.by.type2=static {0}\u3092\u533F\u540D\u30AF\u30E9\u30B9\u306E\u30E1\u30F3\u30D0\u30FC\u3068\u3057\u3066\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044
+compiler.warn.static.not.qualified.by.type2=static {0}を匿名クラスのメンバーとして使用しないでください
 
 # 0: string
-compiler.warn.source.no.bootclasspath=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9\u304C-source {0}\u3068\u4E00\u7DD2\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.warn.source.no.bootclasspath=ブートストラップ・クラスパスが-source {0}と一緒に設定されていません
 
 # 0: string
-compiler.warn.source.no.system.modules.path=\u30B7\u30B9\u30C6\u30E0\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u304C-source {0}\u3068\u4E00\u7DD2\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.warn.source.no.system.modules.path=システム・モジュール・パスが-source {0}と一緒に設定されていません
 
 # 0: string
-compiler.warn.option.obsolete.source=\u30BD\u30FC\u30B9\u5024{0}\u306F\u5EC3\u6B62\u3055\u308C\u3066\u3044\u3066\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3059
+compiler.warn.option.obsolete.source=ソース値{0}は廃止されていて、今後のリリースで削除される予定です
 
 # 0: target
-compiler.warn.option.obsolete.target=\u30BF\u30FC\u30B2\u30C3\u30C8\u5024{0}\u306F\u5EC3\u6B62\u3055\u308C\u3066\u3044\u3066\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3059
+compiler.warn.option.obsolete.target=ターゲット値{0}は廃止されていて、今後のリリースで削除される予定です
 
 # 0: string, 1: string
-compiler.err.option.removed.source=\u30BD\u30FC\u30B9\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306F\u73FE\u5728\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002{1}\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+compiler.err.option.removed.source=ソース・オプション{0}は現在サポートされていません。{1}以降を使用してください。
 
 # 0: target, 1: target
-compiler.err.option.removed.target=\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306F\u73FE\u5728\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002{1}\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+compiler.err.option.removed.target=ターゲット・オプション{0}は現在サポートされていません。{1}以降を使用してください。
 
-compiler.warn.option.obsolete.suppression=\u5EC3\u6B62\u3055\u308C\u305F\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u3064\u3044\u3066\u306E\u8B66\u544A\u3092\u8868\u793A\u3057\u306A\u3044\u3088\u3046\u306B\u3059\u308B\u306B\u306F\u3001-Xlint:\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+compiler.warn.option.obsolete.suppression=廃止されたオプションについての警告を表示しないようにするには、-Xlint:オプションを使用します。
 
 # 0: name, 1: number, 2: number, 3: number, 4: number
-compiler.warn.future.attr=\u30D0\u30FC\u30B8\u30E7\u30F3{1}.{2}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u5C0E\u5165\u3055\u308C\u305F{0}\u5C5E\u6027\u306F\u3001\u30D0\u30FC\u30B8\u30E7\u30F3{3}.{4}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u7121\u8996\u3055\u308C\u307E\u3059
+compiler.warn.future.attr=バージョン{1}.{2}のクラス・ファイルで導入された{0}属性は、バージョン{3}.{4}のクラス・ファイルでは無視されます
 
-compiler.warn.requires.automatic=\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u30C7\u30A3\u30EC\u30AF\u30C6\u30A3\u30D6\u304C\u5FC5\u8981\u3067\u3059
+compiler.warn.requires.automatic=自動モジュールにはディレクティブが必要です
 
-compiler.warn.requires.transitive.automatic=\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u63A8\u79FB\u7684\u30C7\u30A3\u30EC\u30AF\u30C6\u30A3\u30D6\u304C\u5FC5\u8981\u3067\u3059
+compiler.warn.requires.transitive.automatic=自動モジュールには推移的ディレクティブが必要です
 
 # Warnings related to annotation processing
 # 0: string
-compiler.warn.proc.package.does.not.exist=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
+compiler.warn.proc.package.does.not.exist=パッケージ{0}は存在しません
 
 # 0: string
-compiler.warn.proc.file.reopening=''{0}''\u7528\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u8907\u6570\u56DE\u4F5C\u6210\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059
+compiler.warn.proc.file.reopening=''{0}''用のファイルを複数回作成しようとしています
 
 # 0: string
-compiler.warn.proc.type.already.exists=\u30BF\u30A4\u30D7''{0}''\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u307E\u305F\u306F\u30AF\u30E9\u30B9\u30D1\u30B9\u306B\u5B58\u5728\u3057\u307E\u3059
+compiler.warn.proc.type.already.exists=タイプ''{0}''のファイルはすでにソース・パスまたはクラスパスに存在します
 
 # 0: string
-compiler.warn.proc.type.recreate=\u30BF\u30A4\u30D7''{0}''\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u8907\u6570\u56DE\u4F5C\u6210\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059
+compiler.warn.proc.type.recreate=タイプ''{0}''のファイルを複数回作成しようとしています
 
 # 0: string
-compiler.warn.proc.illegal.file.name=\u7121\u52B9\u306A\u540D\u524D''{0}''\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
+compiler.warn.proc.illegal.file.name=無効な名前''{0}''のファイルは作成できません。
 
 # 0: string, 1: string
-compiler.warn.proc.suspicious.class.name=\u540D\u524D\u304C{1}\u3067\u7D42\u308F\u308B\u578B\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059: ''{0}''
+compiler.warn.proc.suspicious.class.name=名前が{1}で終わる型のファイルを作成しています: ''{0}''
 
 # 0: string
-compiler.warn.proc.file.create.last.round=\u6700\u5F8C\u306B\u4F5C\u6210\u3055\u308C\u305F\u30BF\u30A4\u30D7''{0}''\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u6CE8\u91C8\u51E6\u7406\u306B\u6E21\u3055\u308C\u307E\u305B\u3093\u3002
+compiler.warn.proc.file.create.last.round=最後に作成されたタイプ''{0}''のファイルは注釈処理に渡されません。
 
 # 0: string, 1: string
-compiler.warn.proc.malformed.supported.string=\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u304C\u8FD4\u3057\u305F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u6587\u5B57\u5217''{0}''\u304C\u4E0D\u6B63\u3067\u3059
+compiler.warn.proc.malformed.supported.string=プロセッサ''{1}''が返したサポートされる注釈インタフェースの文字列''{0}''が不正です
 
 # 0: set of string
-compiler.warn.proc.annotations.without.processors=\u3053\u308C\u3089\u306E\u6CE8\u91C8\u3092\u8981\u6C42\u3059\u308B\u30D7\u30ED\u30BB\u30C3\u30B5\u306F\u3042\u308A\u307E\u305B\u3093\u3067\u3057\u305F: {0}
+compiler.warn.proc.annotations.without.processors=これらの注釈を要求するプロセッサはありませんでした: {0}
 
 # 0: source version, 1: string, 2: string
-compiler.warn.proc.processor.incompatible.source.version=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u304B\u3089-source ''{2}''\u3088\u308A\u5C0F\u3055\u3044\u30BD\u30FC\u30B9\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3''{0}''\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.warn.proc.processor.incompatible.source.version=注釈プロセッサ''{1}''から-source ''{2}''より小さいソース・バージョン''{0}''がサポートされています
 
 # 0: string, 1: string
-compiler.warn.proc.duplicate.option.name=\u91CD\u8907\u3059\u308B\u30B5\u30DD\u30FC\u30C8\u5BFE\u8C61\u30AA\u30D7\u30B7\u30E7\u30F3''{0}''\u304C\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u8FD4\u3055\u308C\u307E\u3057\u305F
+compiler.warn.proc.duplicate.option.name=重複するサポート対象オプション''{0}''が注釈プロセッサ''{1}''によって返されました
 
 # 0: string, 1: string
-compiler.warn.proc.duplicate.supported.annotation=\u91CD\u8907\u3059\u308B\u30B5\u30DD\u30FC\u30C8\u5BFE\u8C61\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9''{0}''\u304C\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u8FD4\u3055\u308C\u307E\u3057\u305F
+compiler.warn.proc.duplicate.supported.annotation=重複するサポート対象注釈インタフェース''{0}''が注釈プロセッサ''{1}''によって返されました
 
 # 0: string
-compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u306F''*''\u3068\u4ED6\u306E\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u91CD\u8907\u3057\u3066\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059
+compiler.warn.proc.redundant.types.with.wildcard=注釈プロセッサ''{0}''は''*''と他の注釈インタフェースを重複してサポートします
 
-compiler.warn.proc.proc-only.requested.no.procs=\u30B3\u30F3\u30D1\u30A4\u30EB\u306A\u3057\u306E\u6CE8\u91C8\u51E6\u7406\u304C\u30EA\u30AF\u30A8\u30B9\u30C8\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+compiler.warn.proc.proc-only.requested.no.procs=コンパイルなしの注釈処理がリクエストされましたが、プロセッサが見つかりませんでした。
 
-compiler.warn.proc.use.implicit=\u6697\u9ED9\u7684\u306B\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u306F\u6CE8\u91C8\u51E6\u7406\u306B\u6E21\u3055\u308C\u307E\u305B\u3093\u3002\n-implicit\u3092\u4F7F\u7528\u3057\u6697\u9ED9\u7684\u30B3\u30F3\u30D1\u30A4\u30EB\u306E\u30DD\u30EA\u30B7\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+compiler.warn.proc.use.implicit=暗黙的にコンパイルされたファイルは注釈処理に渡されません。\n-implicitを使用し暗黙的コンパイルのポリシーを指定してください。
 
-compiler.warn.proc.use.proc.or.implicit=\u6697\u9ED9\u7684\u306B\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u306F\u6CE8\u91C8\u51E6\u7406\u306B\u6E21\u3055\u308C\u307E\u305B\u3093\u3002\n-proc:none\u3092\u4F7F\u7528\u3057\u6CE8\u91C8\u51E6\u7406\u3092\u7121\u52B9\u306B\u3059\u308B\u304B -implicit\u3092\u4F7F\u7528\u3057\u6697\u9ED9\u7684\u30B3\u30F3\u30D1\u30A4\u30EB\u306E\u30DD\u30EA\u30B7\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+compiler.warn.proc.use.proc.or.implicit=暗黙的にコンパイルされたファイルは注釈処理に渡されません。\n-proc:noneを使用し注釈処理を無効にするか -implicitを使用し暗黙的コンパイルのポリシーを指定してください。
 
 # Print a client-generated warning; assumed to be localized, no translation required
 # 0: string
 compiler.warn.proc.messager={0}
 
 # 0: set of string
-compiler.warn.proc.unclosed.type.files=\u30BF\u30A4\u30D7''{0}''\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u3053\u308C\u3089\u306E\u30BF\u30A4\u30D7\u306F\u6CE8\u91C8\u51E6\u7406\u3055\u308C\u307E\u305B\u3093
+compiler.warn.proc.unclosed.type.files=タイプ''{0}''のファイルが閉じられていません。これらのタイプは注釈処理されません
 
 # 0: string
-compiler.warn.proc.unmatched.processor.options=\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3069\u306E\u30D7\u30ED\u30BB\u30C3\u30B5\u3067\u3082\u8A8D\u8B58\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F: ''{0}''
+compiler.warn.proc.unmatched.processor.options=次のオプションはどのプロセッサでも認識されませんでした: ''{0}''
 
-compiler.warn.try.explicit.close.call=\u81EA\u52D5\u30AF\u30ED\u30FC\u30BA\u53EF\u80FD\u306A\u30EA\u30BD\u30FC\u30B9\u306B\u304A\u3051\u308Bclose()\u306E\u660E\u793A\u7684\u547C\u51FA\u3057
+compiler.warn.try.explicit.close.call=自動クローズ可能なリソースにおけるclose()の明示的呼出し
 
 # 0: symbol
-compiler.warn.try.resource.not.referenced=\u81EA\u52D5\u30AF\u30ED\u30FC\u30BA\u53EF\u80FD\u306A\u30EA\u30BD\u30FC\u30B9{0}\u306F\u5BFE\u5FDC\u3059\u308Btry\u6587\u306E\u672C\u4F53\u3067\u306F\u53C2\u7167\u3055\u308C\u307E\u305B\u3093
+compiler.warn.try.resource.not.referenced=自動クローズ可能なリソース{0}は対応するtry文の本体では参照されません
 
 # 0: type
-compiler.warn.try.resource.throws.interrupted.exc=\u81EA\u52D5\u30AF\u30ED\u30FC\u30BA\u53EF\u80FD\u306A\u30EA\u30BD\u30FC\u30B9{0}\u306B\u3001InterruptedException\u3092\u30B9\u30ED\u30FC\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u30E1\u30F3\u30D0\u30FC\u30FB\u30E1\u30BD\u30C3\u30C9close()\u304C\u3042\u308A\u307E\u3059
+compiler.warn.try.resource.throws.interrupted.exc=自動クローズ可能なリソース{0}に、InterruptedExceptionをスローする可能性があるメンバー・メソッドclose()があります
 
-compiler.warn.unchecked.assign={0}\u304B\u3089{1}\u3078\u306E\u7121\u691C\u67FB\u4EE3\u5165\u3067\u3059
+compiler.warn.unchecked.assign={0}から{1}への無検査代入です
 
 # 0: symbol, 1: type
-compiler.warn.unchecked.assign.to.var=raw\u578B{1}\u306E\u30E1\u30F3\u30D0\u30FC\u3068\u3057\u3066\u5909\u6570{0}\u3078\u306E\u7121\u691C\u67FB\u4EE3\u5165\u3067\u3059
+compiler.warn.unchecked.assign.to.var=raw型{1}のメンバーとして変数{0}への無検査代入です
 
 # 0: symbol, 1: type
-compiler.warn.unchecked.call.mbr.of.raw.type=raw\u578B{1}\u306E\u30E1\u30F3\u30D0\u30FC\u3068\u3057\u3066\u306E{0}\u3078\u306E\u7121\u691C\u67FB\u547C\u51FA\u3057\u3067\u3059
+compiler.warn.unchecked.call.mbr.of.raw.type=raw型{1}のメンバーとしての{0}への無検査呼出しです
 
-compiler.warn.unchecked.cast.to.type=\u578B{0}\u3078\u306E\u7121\u691C\u67FB\u30AD\u30E3\u30B9\u30C8\u3067\u3059
+compiler.warn.unchecked.cast.to.type=型{0}への無検査キャストです
 
 # 0: kind name, 1: name, 2: object, 3: object, 4: kind name, 5: symbol
-compiler.warn.unchecked.meth.invocation.applied=\u7121\u691C\u67FB\u30E1\u30BD\u30C3\u30C9\u547C\u51FA\u3057: {4} {5}\u306E{0} {1}\u306F\u6307\u5B9A\u3055\u308C\u305F\u578B\u306B\u9069\u7528\u3055\u308C\u307E\u3059\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024:    {3}
+compiler.warn.unchecked.meth.invocation.applied=無検査メソッド呼出し: {4} {5}の{0} {1}は指定された型に適用されます\n期待値: {2}\n検出値:    {3}
 
 # 0: type
-compiler.warn.unchecked.generic.array.creation=\u578B{0}\u306E\u53EF\u5909\u5F15\u6570\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u5BFE\u3059\u308B\u7DCF\u79F0\u578B\u914D\u5217\u306E\u7121\u691C\u67FB\u4F5C\u6210\u3067\u3059
+compiler.warn.unchecked.generic.array.creation=型{0}の可変引数パラメータに対する総称型配列の無検査作成です
 
 # 0: type
-compiler.warn.unchecked.varargs.non.reifiable.type=\u30D1\u30E9\u30E1\u30FC\u30BF\u5316\u3055\u308C\u305F\u53EF\u5909\u5F15\u6570\u578B{0}\u304B\u3089\u306E\u30D2\u30FC\u30D7\u6C5A\u67D3\u306E\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.warn.unchecked.varargs.non.reifiable.type=パラメータ化された可変引数型{0}からのヒープ汚染の可能性があります
 
 # 0: symbol
-compiler.warn.varargs.unsafe.use.varargs.param=\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306F\u3001\u578B\u60C5\u5831\u4FDD\u6301\u53EF\u80FD\u3067\u306A\u3044\u53EF\u5909\u5F15\u6570\u30D1\u30E9\u30E1\u30FC\u30BF{0}\u304B\u3089\u306E\u30D2\u30FC\u30D7\u6C5A\u67D3\u306E\u539F\u56E0\u3068\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.warn.varargs.unsafe.use.varargs.param=可変引数メソッドは、型情報保持可能でない可変引数パラメータ{0}からのヒープ汚染の原因となる可能性があります
 
-compiler.warn.missing.deprecated.annotation=\u63A8\u5968\u3055\u308C\u306A\u3044\u9805\u76EE\u306F@Deprecated\u3067\u6CE8\u91C8\u304C\u4ED8\u3051\u3089\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.warn.missing.deprecated.annotation=推奨されない項目は@Deprecatedで注釈が付けられていません
 
 # 0: kind name
-compiler.warn.deprecated.annotation.has.no.effect=@Deprecated\u6CE8\u91C8\u306F\u3001\u3053\u306E{0}\u5BA3\u8A00\u306B\u306F\u5F71\u97FF\u3057\u307E\u305B\u3093
+compiler.warn.deprecated.annotation.has.no.effect=@Deprecated注釈は、この{0}宣言には影響しません
 
 # 0: string
-compiler.warn.invalid.path=\u30D5\u30A1\u30A4\u30EB\u540D\u304C\u7121\u52B9\u3067\u3059: {0}
+compiler.warn.invalid.path=ファイル名が無効です: {0}
 
-compiler.warn.doclint.not.available=\u4F7F\u7528\u53EF\u80FD\u306Adoclint\u306E\u30B5\u30FC\u30D3\u30B9\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.warn.doclint.not.available=使用可能なdoclintのサービス・プロバイダはありません
 
 # 0: string
-compiler.err.invalid.path=\u30D5\u30A1\u30A4\u30EB\u540D\u304C\u7121\u52B9\u3067\u3059: {0}
+compiler.err.invalid.path=ファイル名が無効です: {0}
 
 
 # 0: path
-compiler.warn.invalid.archive.file=\u30D1\u30B9\u4E0A\u306E\u4E88\u671F\u3057\u306A\u3044\u30D5\u30A1\u30A4\u30EB: {0}
+compiler.warn.invalid.archive.file=パス上の予期しないファイル: {0}
 
 # 0: path
-compiler.warn.unexpected.archive.file=\u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u4E88\u671F\u3057\u306A\u3044\u62E1\u5F35\u5B50: {0}
+compiler.warn.unexpected.archive.file=アーカイブ・ファイルの予期しない拡張子: {0}
 
 # 0: path
-compiler.err.no.zipfs.for.archive=\u3053\u306E\u30D5\u30A1\u30A4\u30EB\u306E\u51E6\u7406\u306B\u4F7F\u7528\u3067\u304D\u308B\u30D5\u30A1\u30A4\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u304C\u3042\u308A\u307E\u305B\u3093: {0}
+compiler.err.no.zipfs.for.archive=このファイルの処理に使用できるファイル・システム・プロバイダがありません: {0}
 
-compiler.warn.div.zero=\u30BC\u30ED\u3067\u9664\u7B97
+compiler.warn.div.zero=ゼロで除算
 
-compiler.warn.empty.if=if\u4EE5\u964D\u304C\u7A7A\u306E\u6587\u3067\u3059
+compiler.warn.empty.if=if以降が空の文です
 
 # 0: type, 1: name
-compiler.warn.annotation.method.not.found=\u30BF\u30A4\u30D7''{0}''\u5185\u306B\u6CE8\u91C8\u30E1\u30BD\u30C3\u30C9''{1}()''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+compiler.warn.annotation.method.not.found=タイプ''{0}''内に注釈メソッド''{1}()''が見つかりません
 
 # 0: type, 1: name, 2: message segment
-compiler.warn.annotation.method.not.found.reason=\u30BF\u30A4\u30D7''{0}''\u5185\u306B\u6CE8\u91C8\u30E1\u30BD\u30C3\u30C9''{1}()''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {2}
+compiler.warn.annotation.method.not.found.reason=タイプ''{0}''内に注釈メソッド''{1}()''が見つかりません: {2}
 
 # 0: file object, 1: symbol, 2: name
-compiler.warn.unknown.enum.constant=\u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2}
+compiler.warn.unknown.enum.constant=不明な列挙型定数です{1}.{2}
 
 # 0: file object, 1: symbol, 2: name, 3: message segment
-compiler.warn.unknown.enum.constant.reason=\u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2}\n\u7406\u7531: {3}
+compiler.warn.unknown.enum.constant.reason=不明な列挙型定数です{1}.{2}\n理由: {3}
 
 # 0: type, 1: type
-compiler.warn.raw.class.use=raw\u578B\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {0}\n\u6C4E\u7528\u30AF\u30E9\u30B9{1}\u306E\u578B\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.warn.raw.class.use=raw型が見つかりました: {0}\n汎用クラス{1}の型引数がありません
 
-compiler.warn.diamond.redundant.args=\u65B0\u3057\u3044\u5F0F\u306E\u578B\u5F15\u6570\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059(\u304B\u308F\u308A\u306B\u30C0\u30A4\u30E4\u30E2\u30F3\u30C9\u6F14\u7B97\u5B50\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002
+compiler.warn.diamond.redundant.args=新しい式の型引数が重複しています(かわりにダイヤモンド演算子を使用します)。
 
-compiler.warn.local.redundant.type=\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u306E\u578B\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059(\u660E\u793A\u7684\u306A\u578B\u3092''var''\u306B\u7F6E\u304D\u63DB\u3048\u307E\u3059)\u3002
+compiler.warn.local.redundant.type=ローカル変数の型が重複しています(明示的な型を''var''に置き換えます)。
 
-compiler.warn.potential.lambda.found=\u3053\u306E\u533F\u540D\u5185\u90E8\u30AF\u30E9\u30B9\u3092\u30E9\u30E0\u30C0\u5F0F\u306B\u5909\u63DB\u3067\u304D\u307E\u3059\u3002
+compiler.warn.potential.lambda.found=この匿名内部クラスをラムダ式に変換できます。
 
-compiler.warn.method.redundant.typeargs=\u30E1\u30BD\u30C3\u30C9\u547C\u51FA\u3057\u306E\u578B\u5F15\u6570\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002
+compiler.warn.method.redundant.typeargs=メソッド呼出しの型引数が重複しています。
 
 # 0: symbol, 1: message segment
-compiler.warn.varargs.redundant.trustme.anno={0}\u6CE8\u91C8\u304C\u5197\u9577\u3067\u3059\u3002{1}
+compiler.warn.varargs.redundant.trustme.anno={0}注釈が冗長です。{1}
 
 # 0: symbol
-compiler.warn.access.to.member.from.serializable.element=\u76F4\u5217\u5316\u53EF\u80FD\u8981\u7D20\u304B\u3089\u30E1\u30F3\u30D0\u30FC{0}\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u306F\u3001\u4FE1\u983C\u3067\u304D\u306A\u3044\u30B3\u30FC\u30C9\u304B\u3089\u30D1\u30D6\u30EA\u30C3\u30AF\u306B\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u3067\u3042\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.warn.access.to.member.from.serializable.element=直列化可能要素からメンバー{0}へのアクセスは、信頼できないコードからパブリックにアクセス可能である可能性があります
 
 # 0: symbol
-compiler.warn.access.to.member.from.serializable.lambda=\u76F4\u5217\u5316\u53EF\u80FD\u30E9\u30E0\u30C0\u304B\u3089\u30E1\u30F3\u30D0\u30FC{0}\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u306F\u3001\u4FE1\u983C\u3067\u304D\u306A\u3044\u30B3\u30FC\u30C9\u304B\u3089\u30D1\u30D6\u30EA\u30C3\u30AF\u306B\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u3067\u3042\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.warn.access.to.member.from.serializable.lambda=直列化可能ラムダからメンバー{0}へのアクセスは、信頼できないコードからパブリックにアクセス可能である可能性があります
 
 #####
 
@@ -1708,159 +1708,159 @@ compiler.misc.token.end-of-input=<end of input>
 ##
 ## This is the only place these tokens will be used.
 # 0: token
-compiler.err.expected={0}\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.expected={0}がありません
 
 # 0: string
-compiler.err.expected.str={0}\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.expected.str={0}がありません
 
 # 0: token, 1: token
-compiler.err.expected2={0}\u307E\u305F\u306F{1}\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.expected2={0}または{1}がありません
 
 # 0: token, 1: token, 2: token
-compiler.err.expected3={0}\u3001{1}\u307E\u305F\u306F{2}\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.expected3={0}、{1}または{2}がありません
 
 # 0: token, 1: token, 2: token, 3: string
-compiler.err.expected4={0}, {1}, {2}\u307E\u305F\u306F{3}\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.expected4={0}, {1}, {2}または{3}がありません
 
-compiler.err.premature.eof=\u69CB\u6587\u89E3\u6790\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u306B\u79FB\u308A\u307E\u3057\u305F
+compiler.err.premature.eof=構文解析中にファイルの終わりに移りました
 
-compiler.err.enum.constant.expected=\u3053\u3053\u306B\u5217\u6319\u578B\u5B9A\u6570\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.enum.constant.expected=ここに列挙型定数が必要です
 
-compiler.err.enum.constant.not.expected=\u3053\u3053\u306B\u5217\u6319\u578B\u5B9A\u6570\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
+compiler.err.enum.constant.not.expected=ここに列挙型定数は必要ありません
 
-compiler.err.extraneous.semicolon=\u4F59\u5206\u306A\u30BB\u30DF\u30B3\u30ED\u30F3
+compiler.err.extraneous.semicolon=余分なセミコロン
 
-compiler.warn.extraneous.semicolon=\u4F59\u5206\u306A\u30BB\u30DF\u30B3\u30ED\u30F3
+compiler.warn.extraneous.semicolon=余分なセミコロン
 
 ## The following are related in form, but do not easily fit the above paradigm.
-compiler.err.expected.module.or.open=''\u30E2\u30B8\u30E5\u30FC\u30EB''\u307E\u305F\u306F''\u30AA\u30FC\u30D7\u30F3''\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.expected.module.or.open=''モジュール''または''オープン''が必要です
 
-compiler.err.dot.class.expected=''.class''\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.dot.class.expected=''.class''がありません
 
 ## The argument to this string will always be either 'case' or 'default'.
 # 0: token
-compiler.err.orphaned={0}\u306B\u306F\u89AA\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.orphaned={0}には親がありません
 
 # 0: name
 compiler.misc.anonymous.class=<anonymous {0}>
 
 # 0: name, 1: type
-compiler.misc.type.captureof={1}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3#{0}
+compiler.misc.type.captureof={1}のキャプチャ#{0}
 
-compiler.misc.type.captureof.1=\u30AD\u30E3\u30D7\u30C1\u30E3#{0}
+compiler.misc.type.captureof.1=キャプチャ#{0}
 
 compiler.misc.type.none=<none>
 
-compiler.misc.unnamed.package=\u540D\u524D\u306E\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8
+compiler.misc.unnamed.package=名前のないパッケージ
 
-compiler.misc.unnamed.module=\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB
+compiler.misc.unnamed.module=名前のないモジュール
 
 #####
 
 # 0: symbol, 1: message segment
-compiler.err.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}
+compiler.err.cant.access={0}にアクセスできません\n{1}
 
 # 0: name
-compiler.misc.bad.class.file=\u30AF\u30E9\u30B9{0}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u7121\u52B9\u3067\u3059
+compiler.misc.bad.class.file=クラス{0}のクラス・ファイルが無効です
 
 # 0: file name, 1: string (expected constant pool entry type), 2: number (constant pool index)
-compiler.misc.bad.const.pool.entry={0}\u306E\u5B9A\u6570\u30D7\u30FC\u30EB\u30FB\u30A8\u30F3\u30C8\u30EA\u304C\u4E0D\u6B63\u3067\u3059\n\u7D22\u5F15{2}\u3067\u306F{1}\u304C\u5FC5\u8981\u3067\u3059
+compiler.misc.bad.const.pool.entry={0}の定数プール・エントリが不正です\n索引{2}では{1}が必要です
 
 # 0: file name, 1: number (constant pool index), 2: number (constant pool size)
-compiler.misc.bad.const.pool.index={0}\u306E\u5B9A\u6570\u30D7\u30FC\u30EB\u7D22\u5F15\u304C\u4E0D\u6B63\u3067\u3059\n\u7D22\u5F15{1}\u304C{2}\u306E\u30D7\u30FC\u30EB\u30FB\u30B5\u30A4\u30BA\u5185\u306B\u3042\u308A\u307E\u305B\u3093\u3002
+compiler.misc.bad.const.pool.index={0}の定数プール索引が不正です\n索引{1}が{2}のプール・サイズ内にありません。
 
 # 0: file name, 1: message segment
-compiler.misc.bad.class.file.header=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u306F\u4E0D\u6B63\u3067\u3059\n{1}\n\u524A\u9664\u3059\u308B\u304B\u3001\u30AF\u30E9\u30B9\u30D1\u30B9\u306E\u6B63\u3057\u3044\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u3042\u308B\u304B\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+compiler.misc.bad.class.file.header=クラス・ファイル{0}は不正です\n{1}\n削除するか、クラスパスの正しいサブディレクトリにあるかを確認してください。
 
 # 0: file name, 1: message segment
-compiler.misc.bad.source.file.header=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u306F\u4E0D\u6B63\u3067\u3059\n{1}\n\u524A\u9664\u3059\u308B\u304B\u3001\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306E\u6B63\u3057\u3044\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u3042\u308B\u304B\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+compiler.misc.bad.source.file.header=ソース・ファイル{0}は不正です\n{1}\n削除するか、ソース・パスの正しいサブディレクトリにあるかを確認してください。
 
 ## The following are all possible strings for the second argument ({1}) of the
 ## above strings.
-compiler.misc.bad.class.signature=\u30AF\u30E9\u30B9{0}\u306E\u30B7\u30B0\u30CB\u30C1\u30E3\u304C\u4E0D\u6B63\u3067\u3059
+compiler.misc.bad.class.signature=クラス{0}のシグニチャが不正です
 
 #0: symbol, 1: symbol
-compiler.misc.bad.enclosing.class={0}\u306E\u5185\u90E8\u30AF\u30E9\u30B9\u304C\u4E0D\u6B63\u3067\u3059: {1}
+compiler.misc.bad.enclosing.class={0}の内部クラスが不正です: {1}
 
 # 0: symbol
-compiler.misc.bad.enclosing.method=\u30AF\u30E9\u30B9{0}\u306E\u56F2\u3093\u3067\u3044\u308B\u30E1\u30BD\u30C3\u30C9\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059
+compiler.misc.bad.enclosing.method=クラス{0}の囲んでいるメソッド属性が不正です
 
-compiler.misc.bad.runtime.invisible.param.annotations=RuntimeInvisibleParameterAnnotations\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059: {0}
+compiler.misc.bad.runtime.invisible.param.annotations=RuntimeInvisibleParameterAnnotations属性が不正です: {0}
 
-compiler.misc.bad.const.pool.tag=\u5B9A\u6570\u30D7\u30FC\u30EB\u30FB\u30BF\u30B0{0}\u304C\u4E0D\u6B63\u3067\u3059
+compiler.misc.bad.const.pool.tag=定数プール・タグ{0}が不正です
 
-compiler.misc.bad.const.pool.tag.at=\u5B9A\u6570\u30D7\u30FC\u30EB\u30FB\u30BF\u30B0{1}\u3067\u306E{0}\u304C\u4E0D\u6B63\u3067\u3059
+compiler.misc.bad.const.pool.tag.at=定数プール・タグ{1}での{0}が不正です
 
 # 0: number
-compiler.misc.bad.utf8.byte.sequence.at={0}\u3067\u306EUTF-8\u30D0\u30A4\u30C8\u30FB\u30B7\u30FC\u30B1\u30F3\u30B9\u304C\u4E0D\u6B63\u3067\u3059
+compiler.misc.bad.utf8.byte.sequence.at={0}でのUTF-8バイト・シーケンスが不正です
 
-compiler.misc.unexpected.const.pool.tag.at=\u4E88\u671F\u3057\u306A\u3044\u5B9A\u6570\u30D7\u30FC\u30EB\u30FB\u30BF\u30B0: {0}\u304C{1}\u306B\u3042\u308A\u307E\u3059
+compiler.misc.unexpected.const.pool.tag.at=予期しない定数プール・タグ: {0}が{1}にあります
 
 # 0: number
-compiler.misc.bad.class.truncated.at.offset=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u30AA\u30D5\u30BB\u30C3\u30C8{0}\u3067\u5207\u308A\u6368\u3066\u3089\u308C\u307E\u3057\u305F
+compiler.misc.bad.class.truncated.at.offset=クラス・ファイルがオフセット{0}で切り捨てられました
 
-compiler.misc.bad.signature=\u30B7\u30B0\u30CB\u30C1\u30E3{0}\u304C\u4E0D\u6B63\u3067\u3059
+compiler.misc.bad.signature=シグニチャ{0}が不正です
 
-compiler.misc.bad.type.annotation.value=\u6CE8\u91C8\u30BF\u30FC\u30B2\u30C3\u30C8\u578B\u306E\u5024\u306E\u578B\u304C\u4E0D\u6B63\u3067\u3059: {0}
+compiler.misc.bad.type.annotation.value=注釈ターゲット型の値の型が不正です: {0}
 
-compiler.misc.bad.module-info.name=\u30AF\u30E9\u30B9\u540D\u304C\u4E0D\u6B63\u3067\u3059
+compiler.misc.bad.module-info.name=クラス名が不正です
 
-compiler.misc.class.file.wrong.class=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u306B\u4E0D\u6B63\u306A\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u3059
+compiler.misc.class.file.wrong.class=クラス・ファイル{0}に不正なクラスがあります
 
-compiler.misc.module.info.invalid.super.class=\u7121\u52B9\u306A\u30B9\u30FC\u30D1\u30FC\u30FB\u30AF\u30E9\u30B9\u3092\u542B\u3080module-info
+compiler.misc.module.info.invalid.super.class=無効なスーパー・クラスを含むmodule-info
 
 # 0: name
-compiler.misc.class.file.not.found={0}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+compiler.misc.class.file.not.found={0}のクラス・ファイルが見つかりません
 
 # 0: string (constant value), 1: symbol (constant field), 2: type (field type)
-compiler.misc.bad.constant.range={1}\u306E\u5B9A\u6570\u5024''{0}''\u306F{2}\u306E\u60F3\u5B9A\u7BC4\u56F2\u5916\u3067\u3059
+compiler.misc.bad.constant.range={1}の定数値''{0}''は{2}の想定範囲外です
 
 # 0: string (constant value), 1: symbol (constant field), 2: string (expected class)
-compiler.misc.bad.constant.value={1}\u306E\u5B9A\u6570\u5024''{0}''\u306F\u4E0D\u6B63\u3067\u3059\u3002{2}\u304C\u5FC5\u8981\u3067\u3059
+compiler.misc.bad.constant.value={1}の定数値''{0}''は不正です。{2}が必要です
 
 # 0: type (field type)
-compiler.misc.bad.constant.value.type=\u30BF\u30A4\u30D7''{0}''\u306E\u5909\u6570\u306B\u5B9A\u6570\u5024\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u304C\u3001\u5B9A\u6570\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.misc.bad.constant.value.type=タイプ''{0}''の変数に定数値は指定できませんが、定数値が指定されています
 
 # 0: string (classfile major version), 1: string (classfile minor version)
-compiler.misc.invalid.default.interface=\u30D0\u30FC\u30B8\u30E7\u30F3{0}.{1}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
+compiler.misc.invalid.default.interface=バージョン{0}.{1}のクラス・ファイルにデフォルト・メソッドが見つかりました
 
 # 0: string (classfile major version), 1: string (classfile minor version)
-compiler.misc.invalid.static.interface=\u30D0\u30FC\u30B8\u30E7\u30F3{0}.{1}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306Bstatic\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
+compiler.misc.invalid.static.interface=バージョン{0}.{1}のクラス・ファイルにstaticメソッドが見つかりました
 
 # 0: string (classfile major version), 1: string (classfile minor version)
-compiler.misc.anachronistic.module.info=\u30D0\u30FC\u30B8\u30E7\u30F3{0}.{1}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
+compiler.misc.anachronistic.module.info=バージョン{0}.{1}のクラス・ファイルにモジュール宣言が見つかりました
 
-compiler.misc.module.info.definition.expected=module-info\u5B9A\u7FA9\u304C\u5FC5\u8981\u3067\u3059
+compiler.misc.module.info.definition.expected=module-info定義が必要です
 
 # 0: name
-compiler.misc.file.doesnt.contain.class=\u30D5\u30A1\u30A4\u30EB\u306B\u30AF\u30E9\u30B9{0}\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.misc.file.doesnt.contain.class=ファイルにクラス{0}が含まれていません
 
 # 0: symbol
-compiler.misc.file.does.not.contain.package=\u30D5\u30A1\u30A4\u30EB\u306B\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.misc.file.does.not.contain.package=ファイルにパッケージ{0}が含まれていません
 
-compiler.misc.file.does.not.contain.module=\u30D5\u30A1\u30A4\u30EB\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.misc.file.does.not.contain.module=ファイルにモジュール宣言が含まれていません
 
-compiler.misc.illegal.start.of.class.file=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u958B\u59CB\u304C\u4E0D\u6B63\u3067\u3059
+compiler.misc.illegal.start.of.class.file=クラス・ファイルの開始が不正です
 
 # 0: name
-compiler.misc.method.descriptor.invalid=\u30E1\u30BD\u30C3\u30C9\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u304C{0}\u306B\u5BFE\u3057\u3066\u7121\u52B9\u3067\u3059
+compiler.misc.method.descriptor.invalid=メソッド・ディスクリプタが{0}に対して無効です
 
-compiler.misc.unable.to.access.file=\u30D5\u30A1\u30A4\u30EB{0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
+compiler.misc.unable.to.access.file=ファイル{0}にアクセスできません
 
-compiler.misc.unicode.str.not.supported=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u5185\u306EUnicode\u6587\u5B57\u5217\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.misc.unicode.str.not.supported=クラス・ファイル内のUnicode文字列はサポートされていません
 
-compiler.misc.undecl.type.var=\u578B\u5909\u6570{0}\u306F\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.misc.undecl.type.var=型変数{0}は宣言されていません
 
-compiler.misc.malformed.vararg.method=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u4E0D\u6B63\u306A\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059: {0}
+compiler.misc.malformed.vararg.method=クラス・ファイルに不正な可変引数メソッドが含まれています: {0}
 
-compiler.misc.wrong.version=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30D0\u30FC\u30B8\u30E7\u30F3{0}.{1}\u306F\u4E0D\u6B63\u3067\u3059\u3002{2}.{3}\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.misc.wrong.version=クラス・ファイルのバージョン{0}.{1}は不正です。{2}.{3}である必要があります
 
-compiler.misc.illegal.flag.combo=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B{1} {2}\u306E\u4E0D\u6B63\u306A\u30D5\u30E9\u30B0\u306E\u7D44\u5408\u305B{0}\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
+compiler.misc.illegal.flag.combo=クラス・ファイルに{1} {2}の不正なフラグの組合せ{0}が含まれています
 
 #####
 
 # 0: type, 1: type or symbol
-compiler.err.not.within.bounds=\u578B\u5F15\u6570{0}\u306F\u578B\u5909\u6570{1}\u306E\u5883\u754C\u5185\u306B\u3042\u308A\u307E\u305B\u3093
+compiler.err.not.within.bounds=型引数{0}は型変数{1}の境界内にありません
 
 ## The following are all possible strings for the second argument ({1}) of the
 ## above string.
@@ -1870,33 +1870,33 @@ compiler.err.not.within.bounds=\u578B\u5F15\u6570{0}\u306F\u578B\u5909\u6570{1}\
 #####
 
 # 0: message segment
-compiler.err.prob.found.req=\u4E0D\u9069\u5408\u306A\u578B: {0}
+compiler.err.prob.found.req=不適合な型: {0}
 
 # 0: message segment
-compiler.misc.prob.found.req=\u4E0D\u9069\u5408\u306A\u578B: {0}
+compiler.misc.prob.found.req=不適合な型: {0}
 
 # 0: message segment, 1: type, 2: type
-compiler.warn.prob.found.req={0}\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024:    {1}
+compiler.warn.prob.found.req={0}\n期待値: {2}\n検出値:    {1}
 
 # 0: type, 1: type
-compiler.misc.inconvertible.types={0}\u3092{1}\u306B\u5909\u63DB\u3067\u304D\u307E\u305B\u3093:
+compiler.misc.inconvertible.types={0}を{1}に変換できません:
 
 # 0: type, 1: type
-compiler.misc.not.applicable.types=\u578B{1}\u306E\u30D1\u30BF\u30FC\u30F3\u306F{0}\u3067\u306F\u9069\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.misc.not.applicable.types=型{1}のパターンは{0}では適用できません
 
 # 0: type, 1: type
-compiler.misc.possible.loss.of.precision=\u7CBE\u5EA6\u304C\u5931\u308F\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B{0}\u304B\u3089{1}\u3078\u306E\u5909\u63DB
+compiler.misc.possible.loss.of.precision=精度が失われる可能性がある{0}から{1}への変換
 
 # 0: type, 1: type
-compiler.warn.possible.loss.of.precision=\u8907\u5408\u4EE3\u5165\u306B\u304A\u3051\u308B{0}\u304B\u3089{1}\u3078\u306E\u6697\u9ED9\u7684\u30AD\u30E3\u30B9\u30C8\u306F\u3001\u7CBE\u5EA6\u304C\u5931\u308F\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.warn.possible.loss.of.precision=複合代入における{0}から{1}への暗黙的キャストは、精度が失われる可能性があります
 
-compiler.misc.unchecked.assign=\u7121\u691C\u67FB\u5909\u63DB
+compiler.misc.unchecked.assign=無検査変換
 
 # compiler.misc.storecheck=\
 #     assignment might cause later store checks to fail
 # compiler.misc.unchecked=\
 #     assigned array cannot dynamically check its stores
-compiler.misc.unchecked.cast.to.type=\u7121\u691C\u67FB\u30AD\u30E3\u30B9\u30C8
+compiler.misc.unchecked.cast.to.type=無検査キャスト
 
 # compiler.err.star.expected=\
 #     ''*'' expected
@@ -1904,27 +1904,27 @@ compiler.misc.unchecked.cast.to.type=\u7121\u691C\u67FB\u30AD\u30E3\u30B9\u30C8
 #     \[\*\] cannot have a type
 
 # 0: message segment
-compiler.misc.try.not.applicable.to.type=try-with-resource\u306F\u5909\u6570\u578B\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\n({0})
+compiler.misc.try.not.applicable.to.type=try-with-resourceは変数型に使用できません\n({0})
 
 #####
 
 # 0: object, 1: message segment
-compiler.err.type.found.req=\u4E88\u671F\u3057\u306A\u3044\u578B\n\u671F\u5F85\u5024: {1}\n\u691C\u51FA\u5024:    {0}
+compiler.err.type.found.req=予期しない型\n期待値: {1}\n検出値:    {0}
 
 ## The following are all possible strings for the first argument ({0}) of the
 ## above string.
-compiler.misc.type.req.class=\u30AF\u30E9\u30B9
+compiler.misc.type.req.class=クラス
 
-compiler.misc.type.req.class.array=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u914D\u5217
+compiler.misc.type.req.class.array=クラスまたは配列
 
-compiler.misc.type.req.array.or.iterable=\u914D\u5217\u307E\u305F\u306Fjava.lang.Iterable
+compiler.misc.type.req.array.or.iterable=配列またはjava.lang.Iterable
 
-compiler.misc.type.req.ref=\u53C2\u7167
+compiler.misc.type.req.ref=参照
 
-compiler.misc.type.req.exact=\u5883\u754C\u306E\u306A\u3044\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+compiler.misc.type.req.exact=境界のないクラスまたはインタフェース
 
 # 0: type
-compiler.misc.type.parameter=\u578B\u30D1\u30E9\u30E1\u30FC\u30BF{0}
+compiler.misc.type.parameter=型パラメータ{0}
 
 #####
 
@@ -1932,146 +1932,146 @@ compiler.misc.type.parameter=\u578B\u30D1\u30E9\u30E1\u30FC\u30BF{0}
 ## diagnostics whose key ends in ".1"
 
 # 0: type, 1: list of type
-compiler.misc.no.unique.maximal.instance.exists=\u578B\u5909\u6570{0}(\u4E0A\u9650{1})\u306E\u56FA\u6709\u306E\u6700\u5927\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u307E\u305B\u3093
+compiler.misc.no.unique.maximal.instance.exists=型変数{0}(上限{1})の固有の最大インスタンスが存在しません
 
 # 0: type, 1: list of type
-compiler.misc.no.unique.minimal.instance.exists=\u578B\u5909\u6570{0}(\u4E0B\u9650{1})\u306E\u56FA\u6709\u306E\u6700\u5C0F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u307E\u305B\u3093
+compiler.misc.no.unique.minimal.instance.exists=型変数{0}(下限{1})の固有の最小インスタンスが存在しません
 
 # 0: type, 1: list of type
-compiler.misc.incompatible.upper.bounds=\u63A8\u6E2C\u306E\u5909\u6570{0}\u306B\u306F\u3001\u9069\u5408\u3057\u306A\u3044\u4E0A\u9650{1}\u304C\u3042\u308A\u307E\u3059
+compiler.misc.incompatible.upper.bounds=推測の変数{0}には、適合しない上限{1}があります
 
 # 0: type, 1: list of type
-compiler.misc.incompatible.eq.bounds=\u63A8\u8AD6\u5909\u6570{0}\u306B\u306F\u3001\u4E0D\u9069\u5408\u306A\u7B49\u4FA1\u5236\u7D04{1}\u304C\u3042\u308A\u307E\u3059
+compiler.misc.incompatible.eq.bounds=推論変数{0}には、不適合な等価制約{1}があります
 
 # 0: type, 1: fragment, 2: fragment
-compiler.misc.incompatible.bounds=\u63A8\u8AD6\u5909\u6570{0}\u306B\u306F\u3001\u4E0D\u9069\u5408\u306A\u5883\u754C\u304C\u3042\u308A\u307E\u3059\n{1}\n{2}
+compiler.misc.incompatible.bounds=推論変数{0}には、不適合な境界があります\n{1}\n{2}
 
 # 0: list of type
-compiler.misc.lower.bounds=\u4E0B\u9650: {0}
+compiler.misc.lower.bounds=下限: {0}
 
 # 0: list of type
-compiler.misc.eq.bounds=\u7B49\u4FA1\u5236\u7D04: {0}
+compiler.misc.eq.bounds=等価制約: {0}
 
 # 0: list of type
-compiler.misc.upper.bounds=\u4E0A\u9650: {0}
+compiler.misc.upper.bounds=上限: {0}
 
 # 0: list of type, 1: type, 2: type
-compiler.misc.infer.no.conforming.instance.exists=\u578B\u5909\u6570{0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u306A\u3044\u306E\u3067\u3001{1}\u306F{2}\u306B\u9069\u5408\u3057\u307E\u305B\u3093
+compiler.misc.infer.no.conforming.instance.exists=型変数{0}のインスタンスが存在しないので、{1}は{2}に適合しません
 
 # 0: list of type, 1: message segment
-compiler.misc.infer.no.conforming.assignment.exists=\u578B\u5909\u6570{0}\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n(\u5F15\u6570\u306E\u4E0D\u4E00\u81F4: {1})
+compiler.misc.infer.no.conforming.assignment.exists=型変数{0}を推論できません\n(引数の不一致: {1})
 
 # 0: list of type
-compiler.misc.infer.arg.length.mismatch=\u578B\u5909\u6570{0}\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n(\u5B9F\u5F15\u6570\u30EA\u30B9\u30C8\u3068\u4EEE\u5F15\u6570\u30EA\u30B9\u30C8\u306E\u9577\u3055\u304C\u7570\u306A\u308A\u307E\u3059)
+compiler.misc.infer.arg.length.mismatch=型変数{0}を推論できません\n(実引数リストと仮引数リストの長さが異なります)
 
 # 0: list of type, 1: message segment
-compiler.misc.infer.varargs.argument.mismatch=\u578B\u5909\u6570{0}\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n(\u53EF\u5909\u5F15\u6570\u306E\u4E0D\u4E00\u81F4: {1})
+compiler.misc.infer.varargs.argument.mismatch=型変数{0}を推論できません\n(可変引数の不一致: {1})
 
 # 0: type, 1: list of type
-compiler.misc.inferred.do.not.conform.to.upper.bounds=\u63A8\u8AD6\u578B\u304C\u4E0A\u9650\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u8AD6: {0}\n\u4E0A\u9650: {1}
+compiler.misc.inferred.do.not.conform.to.upper.bounds=推論型が上限に適合しません\n推論: {0}\n上限: {1}
 
 # 0: type, 1: list of type
-compiler.misc.inferred.do.not.conform.to.lower.bounds=\u63A8\u8AD6\u578B\u304C\u4E0B\u9650\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u8AD6: {0}\n\u4E0B\u9650: {1}
+compiler.misc.inferred.do.not.conform.to.lower.bounds=推論型が下限に適合しません\n推論: {0}\n下限: {1}
 
 # 0: type, 1: list of type
-compiler.misc.inferred.do.not.conform.to.eq.bounds=\u63A8\u8AD6\u578B\u304C\u7B49\u4FA1\u5236\u7D04\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u8AD6: {0}\n\u7B49\u4FA1\u5236\u7D04: {1}
+compiler.misc.inferred.do.not.conform.to.eq.bounds=推論型が等価制約に適合しません\n推論: {0}\n等価制約: {1}
 
 # 0: symbol
 compiler.misc.diamond={0}<>
 
 # 0: type
-compiler.misc.diamond.non.generic=\u975E\u6C4E\u7528\u30AF\u30E9\u30B9{0}\u3067''<>''\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.misc.diamond.non.generic=非汎用クラス{0}で''<>''を使用することはできません
 
 # 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.arg={1}\u306B\u3064\u3044\u3066\u63A8\u5B9A\u3055\u308C\u305F\u578B\u5F15\u6570{0}\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\n\u63A8\u8AD6\u5F15\u6570\u306F\u7F72\u540D\u5C5E\u6027\u306B\u8868\u73FE\u3067\u304D\u307E\u305B\u3093
+compiler.misc.diamond.invalid.arg={1}について推定された型引数{0}はこのコンテキストでは許可されません\n推論引数は署名属性に表現できません
 
 # 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.args={1}\u306B\u3064\u3044\u3066\u63A8\u5B9A\u3055\u308C\u305F\u578B\u5F15\u6570{0}\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\n\u63A8\u8AD6\u5F15\u6570\u306F\u7F72\u540D\u5C5E\u6027\u306B\u8868\u73FE\u3067\u304D\u307E\u305B\u3093
+compiler.misc.diamond.invalid.args={1}について推定された型引数{0}はこのコンテキストでは許可されません\n推論引数は署名属性に表現できません
 
 # 0: type
-compiler.misc.diamond.and.explicit.params=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u660E\u793A\u7684\u306A\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.misc.diamond.and.explicit.params=コンストラクタの明示的な型パラメータでは''<>''を使用できません
 
-compiler.misc.mref.infer.and.explicit.params=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u660E\u793A\u7684\u306A\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306Fraw\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u53C2\u7167\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.misc.mref.infer.and.explicit.params=コンストラクタの明示的な型パラメータではrawコンストラクタ参照を使用できません
 
 # 0: type, 1: list of type
-compiler.misc.explicit.param.do.not.conform.to.bounds=\u660E\u793A\u7684\u306A\u578B\u5F15\u6570{0}\u306F\u3001\u5BA3\u8A00\u3055\u308C\u305F\u5883\u754C{1}\u306B\u9069\u5408\u3057\u307E\u305B\u3093
+compiler.misc.explicit.param.do.not.conform.to.bounds=明示的な型引数{0}は、宣言された境界{1}に適合しません
 
-compiler.misc.arg.length.mismatch=\u5B9F\u5F15\u6570\u30EA\u30B9\u30C8\u3068\u4EEE\u5F15\u6570\u30EA\u30B9\u30C8\u306E\u9577\u3055\u304C\u7570\u306A\u308A\u307E\u3059
+compiler.misc.arg.length.mismatch=実引数リストと仮引数リストの長さが異なります
 
 # 0: string
-compiler.misc.wrong.number.type.args=\u578B\u5F15\u6570\u306E\u6570\u304C\u4E0D\u6B63\u3067\u3059\u3002{0}\u500B\u5FC5\u8981\u3067\u3059
+compiler.misc.wrong.number.type.args=型引数の数が不正です。{0}個必要です
 
 # 0: message segment
-compiler.misc.no.conforming.assignment.exists=\u5F15\u6570\u306E\u4E0D\u4E00\u81F4: {0}
+compiler.misc.no.conforming.assignment.exists=引数の不一致: {0}
 
 # 0: message segment
-compiler.misc.varargs.argument.mismatch=\u53EF\u5909\u5F15\u6570\u306E\u4E0D\u4E00\u81F4: {0}
+compiler.misc.varargs.argument.mismatch=可変引数の不一致: {0}
 
 #####
 
 # 0: symbol or type, 1: file name
-compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file={1}\u306E\u88DC\u52A9\u30AF\u30E9\u30B9{0}\u306B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u5916\u304B\u3089\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
+compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file={1}の補助クラス{0}にソース・ファイル外からアクセスできません
 
 ## The first argument ({0}) is a "kindname".
 # 0: kind name, 1: symbol, 2: symbol
-compiler.err.abstract.cant.be.accessed.directly=\u62BD\u8C61{0}\u3067\u3042\u308B{1}({2}\u5185)\u306B\u76F4\u63A5\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.abstract.cant.be.accessed.directly=抽象{0}である{1}({2}内)に直接アクセスすることはできません
 
 ## The first argument ({0}) is a "kindname".
 # 0: symbol kind, 1: symbol
-compiler.err.non-static.cant.be.ref=static\u3067\u306A\u3044{0} {1}\u3092static\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u304B\u3089\u53C2\u7167\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.non-static.cant.be.ref=staticでない{0} {1}をstaticコンテキストから参照することはできません
 
 # 0: symbol kind, 1: symbol
-compiler.misc.bad.static.method.in.unbound.lookup=\u975E\u30D0\u30A4\u30F3\u30C9\u691C\u7D22\u3067\u4E88\u671F\u3057\u306A\u3044\u9759\u7684\u306A{0} {1}\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
+compiler.misc.bad.static.method.in.unbound.lookup=非バインド検索で予期しない静的な{0} {1}が見つかりました
 
 # 0: symbol kind, 1: symbol
-compiler.misc.bad.instance.method.in.unbound.lookup=\u975E\u30D0\u30A4\u30F3\u30C9\u691C\u7D22\u3067\u4E88\u671F\u3057\u306A\u3044\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9{0} {1}\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
+compiler.misc.bad.instance.method.in.unbound.lookup=非バインド検索で予期しないインスタンス{0} {1}が見つかりました
 
 # 0: symbol kind, 1: symbol
-compiler.misc.bad.static.method.in.bound.lookup=\u30D0\u30A4\u30F3\u30C9\u691C\u7D22\u3067\u4E88\u671F\u3057\u306A\u3044\u9759\u7684\u306A{0} {1}\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
+compiler.misc.bad.static.method.in.bound.lookup=バインド検索で予期しない静的な{0} {1}が見つかりました
 
 ## Both arguments ({0}, {1}) are "kindname"s.  {0} is a comma-separated list
 ## of kindnames (the list should be identical to that provided in source.
 # 0: set of kind name, 1: set of kind name
-compiler.err.unexpected.type=\u4E88\u671F\u3057\u306A\u3044\u578B\n\u671F\u5F85\u5024: {0}\n\u691C\u51FA\u5024:    {1}
+compiler.err.unexpected.type=予期しない型\n期待値: {0}\n検出値:    {1}
 
-compiler.err.unexpected.lambda=\u3053\u3053\u3067\u306F\u30E9\u30E0\u30C0\u5F0F\u306F\u4E88\u671F\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.unexpected.lambda=ここではラムダ式は予期されていません
 
-compiler.err.unexpected.mref=\u3053\u3053\u3067\u306F\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306F\u4E88\u671F\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.unexpected.mref=ここではメソッド参照は予期されていません
 
 ## The first argument {0} is a "kindname" (e.g. 'constructor', 'field', etc.)
 ## The second argument {1} is the non-resolved symbol
 ## The third argument {2} is a list of type parameters (non-empty if {1} is a method)
 ## The fourth argument {3} is a list of argument types (non-empty if {1} is a method)
 # 0: kind name, 1: name, 2: unused, 3: unused
-compiler.err.cant.resolve=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB: {0} {1}
+compiler.err.cant.resolve=シンボルを見つけられません\nシンボル: {0} {1}
 
 # 0: kind name, 1: name, 2: unused, 3: list of type
-compiler.err.cant.resolve.args=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB: {0} {1}({3})
+compiler.err.cant.resolve.args=シンボルを見つけられません\nシンボル: {0} {1}({3})
 
 # 0: kind name, 1: name, 2: unused, 3: list of type
-compiler.misc.cant.resolve.args=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB: {0} {1}({3})
+compiler.misc.cant.resolve.args=シンボルを見つけられません\nシンボル: {0} {1}({3})
 
 # 0: kind name, 1: name, 2: list of type, 3: list of type
-compiler.err.cant.resolve.args.params=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB: {0} <{2}>{1}({3})
+compiler.err.cant.resolve.args.params=シンボルを見つけられません\nシンボル: {0} <{2}>{1}({3})
 
 ## arguments from {0} to {3} have the same meaning as above
 ## The fifth argument {4} is a location subdiagnostic (see below)
 # 0: kind name, 1: name, 2: unused, 3: unused, 4: message segment
-compiler.err.cant.resolve.location=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB:   {0} {1}\n\u5834\u6240: {4}
+compiler.err.cant.resolve.location=シンボルを見つけられません\nシンボル:   {0} {1}\n場所: {4}
 
 # 0: kind name, 1: name, 2: unused, 3: list of type, 4: message segment
-compiler.err.cant.resolve.location.args=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB:   {0} {1}({3})\n\u5834\u6240: {4}
+compiler.err.cant.resolve.location.args=シンボルを見つけられません\nシンボル:   {0} {1}({3})\n場所: {4}
 
 # 0: kind name, 1: name, 2: list of type, 3: list, 4: message segment
-compiler.err.cant.resolve.location.args.params=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB:   {0} <{2}>{1}({3})\n\u5834\u6240: {4}
+compiler.err.cant.resolve.location.args.params=シンボルを見つけられません\nシンボル:   {0} <{2}>{1}({3})\n場所: {4}
 
 ### Following are replicated/used for method reference diagnostics
 
 # 0: kind name, 1: name, 2: unused, 3: list of type, 4: message segment
-compiler.misc.cant.resolve.location.args=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB:   {0} {1}({3})\n\u5834\u6240: {4}
+compiler.misc.cant.resolve.location.args=シンボルを見つけられません\nシンボル:   {0} {1}({3})\n場所: {4}
 
 # 0: kind name, 1: name, 2: list of type, 3: list, 4: message segment
-compiler.misc.cant.resolve.location.args.params=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB:   {0} <{2}>{1}({3})\n\u5834\u6240: {4}
+compiler.misc.cant.resolve.location.args.params=シンボルを見つけられません\nシンボル:   {0} <{2}>{1}({3})\n場所: {4}
 
 ##a location subdiagnostic is composed as follows:
 ## The first argument {0} is the location "kindname" (e.g. 'constructor', 'field', etc.)
@@ -2082,7 +2082,7 @@ compiler.misc.cant.resolve.location.args.params=\u30B7\u30F3\u30DC\u30EB\u3092\u
 compiler.misc.location={0} {1}
 
 # 0: kind name, 1: symbol, 2: type
-compiler.misc.location.1=\u30BF\u30A4\u30D7{2}\u306E{0} {1}
+compiler.misc.location.1=タイプ{2}の{0} {1}
 
 ## The following are all possible string for "kindname".
 ## They should be called whatever the JLS calls them after it been translated
@@ -2091,102 +2091,102 @@ compiler.misc.location.1=\u30BF\u30A4\u30D7{2}\u306E{0} {1}
 #     static member
 compiler.misc.kindname.annotation=@interface
 
-compiler.misc.kindname.constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
+compiler.misc.kindname.constructor=コンストラクタ
 
-compiler.misc.kindname.enum=\u5217\u6319
+compiler.misc.kindname.enum=列挙
 
-compiler.misc.kindname.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+compiler.misc.kindname.interface=インタフェース
 
 compiler.misc.kindname.static=static
 
-compiler.misc.kindname.type.variable=\u578B\u5909\u6570
+compiler.misc.kindname.type.variable=型変数
 
-compiler.misc.kindname.type.variable.bound=\u578B\u5909\u6570\u306E\u5883\u754C
+compiler.misc.kindname.type.variable.bound=型変数の境界
 
-compiler.misc.kindname.variable=\u5909\u6570
+compiler.misc.kindname.variable=変数
 
-compiler.misc.kindname.value=\u5024
+compiler.misc.kindname.value=値
 
-compiler.misc.kindname.method=\u30E1\u30BD\u30C3\u30C9
+compiler.misc.kindname.method=メソッド
 
-compiler.misc.kindname.class=\u30AF\u30E9\u30B9
+compiler.misc.kindname.class=クラス
 
-compiler.misc.kindname.package=\u30D1\u30C3\u30B1\u30FC\u30B8
+compiler.misc.kindname.package=パッケージ
 
-compiler.misc.kindname.module=\u30E2\u30B8\u30E5\u30FC\u30EB
+compiler.misc.kindname.module=モジュール
 
-compiler.misc.kindname.static.init=static\u521D\u671F\u5316\u5B50
+compiler.misc.kindname.static.init=static初期化子
 
-compiler.misc.kindname.instance.init=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u521D\u671F\u5316\u5B50
+compiler.misc.kindname.instance.init=インスタンス初期化子
 
-compiler.misc.kindname.record.component=\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
+compiler.misc.kindname.record.component=レコード・コンポーネント
 
-compiler.misc.kindname.record=\u30EC\u30B3\u30FC\u30C9
+compiler.misc.kindname.record=レコード
 
 #####
 
-compiler.misc.no.args=\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.misc.no.args=引数がありません
 
 # 0: message segment
-compiler.err.override.static={0}\n\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u30E1\u30BD\u30C3\u30C9\u304Cstatic\u3067\u3059
+compiler.err.override.static={0}\nオーバーライドするメソッドがstaticです
 
 # 0: message segment, 1: set of flag
-compiler.err.override.meth={0}\n\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u306F{1}\u3067\u3059
+compiler.err.override.meth={0}\nオーバーライドされたメソッドは{1}です
 
 # 0: message segment, 1: type
-compiler.err.override.meth.doesnt.throw={0}\n\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u306F{1}\u3092\u30B9\u30ED\u30FC\u3057\u307E\u305B\u3093
+compiler.err.override.meth.doesnt.throw={0}\nオーバーライドされたメソッドは{1}をスローしません
 
 # In the following string {1} is a space separated list of Java Keywords, as
 # they would have been declared in the source code
 # 0: message segment, 1: set of flag or string
-compiler.err.override.weaker.access={0}\n({1})\u3088\u308A\u5F31\u3044\u30A2\u30AF\u30BB\u30B9\u6A29\u9650\u3092\u5272\u308A\u5F53\u3066\u3088\u3046\u3068\u3057\u307E\u3057\u305F
+compiler.err.override.weaker.access={0}\n({1})より弱いアクセス権限を割り当てようとしました
 
 # 0: message segment, 1: type, 2: type
-compiler.err.override.incompatible.ret={0}\n\u623B\u308A\u5024\u306E\u578B{1}\u306F{2}\u3068\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.override.incompatible.ret={0}\n戻り値の型{1}は{2}と互換性がありません
 
 # 0: message segment, 1: type, 2: type
-compiler.warn.override.unchecked.ret={0}\n\u623B\u308A\u5024\u306E\u578B\u306F{1}\u304B\u3089{2}\u3078\u306E\u7121\u691C\u67FB\u5909\u63DB\u304C\u5FC5\u8981\u3067\u3059
+compiler.warn.override.unchecked.ret={0}\n戻り値の型は{1}から{2}への無検査変換が必要です
 
 # 0: message segment, 1: type
-compiler.warn.override.unchecked.thrown={0}\n\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u306F{1}\u3092\u30B9\u30ED\u30FC\u3057\u307E\u305B\u3093
+compiler.warn.override.unchecked.thrown={0}\nオーバーライドされたメソッドは{1}をスローしません
 
 # 0: symbol
-compiler.warn.override.equals.but.not.hashcode=\u30AF\u30E9\u30B9{0}\u306Fequals\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u304C\u3001\u3053\u306E\u30AF\u30E9\u30B9\u3082\u3001\u307E\u305F\u3001\u3044\u304B\u306A\u308B\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9\u3082\u3001hashCode\u30E1\u30BD\u30C3\u30C9\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u305B\u3093
+compiler.warn.override.equals.but.not.hashcode=クラス{0}はequalsをオーバーライドしますが、このクラスも、また、いかなるスーパークラスも、hashCodeメソッドをオーバーライドしません
 
 ## The following are all possible strings for the first argument ({0}) of the
 ## above strings.
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.cant.override={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3067\u304D\u307E\u305B\u3093
+compiler.misc.cant.override={1}の{0}は{3}の{2}をオーバーライドできません
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.cant.hide={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u96A0\u3059\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.misc.cant.hide={1}の{0}は{3}の{2}を隠すことはできません
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.cant.implement={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u5B9F\u88C5\u3067\u304D\u307E\u305B\u3093
+compiler.misc.cant.implement={1}の{0}は{3}の{2}を実装できません
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.clashes.with={1}\u306E{0}\u306F{3}\u306E{2}\u3068\u7AF6\u5408\u3057\u307E\u3059
+compiler.misc.clashes.with={1}の{0}は{3}の{2}と競合します
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.unchecked.override={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059
+compiler.misc.unchecked.override={1}の{0}は{3}の{2}をオーバーライドします
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.unchecked.implement={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u5B9F\u88C5\u3057\u307E\u3059
+compiler.misc.unchecked.implement={1}の{0}は{3}の{2}を実装します
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.unchecked.clash.with={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059
+compiler.misc.unchecked.clash.with={1}の{0}は{3}の{2}をオーバーライドします
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.varargs.override={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059
+compiler.misc.varargs.override={1}の{0}は{3}の{2}をオーバーライドします
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.varargs.implement={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u5B9F\u88C5\u3057\u307E\u3059
+compiler.misc.varargs.implement={1}の{0}は{3}の{2}を実装します
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.varargs.clash.with={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059
+compiler.misc.varargs.clash.with={1}の{0}は{3}の{2}をオーバーライドします
 
 # 0: kind name, 1: symbol, 2: symbol, 3: message segment
-compiler.misc.inapplicable.method={0} {1}.{2}\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\n({3})
+compiler.misc.inapplicable.method={0} {1}.{2}は使用できません\n({3})
 
 ########################################
 # Diagnostics for language feature changes.
@@ -2195,113 +2195,113 @@ compiler.misc.inapplicable.method={0} {1}.{2}\u306F\u4F7F\u7528\u3067\u304D\u307
 ########################################
 
 # 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.err.feature.not.supported.in.source={0}\u306F-source {1}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n({0}\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F-source {2}\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
+compiler.err.feature.not.supported.in.source={0}は-source {1}でサポートされていません\n({0}を有効にするには-source {2}以上を使用してください)
 
 # 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.err.feature.not.supported.in.source.plural={0}\u306F-source {1}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n({0}\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F-source {2}\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
+compiler.err.feature.not.supported.in.source.plural={0}は-source {1}でサポートされていません\n({0}を有効にするには-source {2}以上を使用してください)
 
 # 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.misc.feature.not.supported.in.source={0}\u306F-source {1}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n({0}\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F-source {2}\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
+compiler.misc.feature.not.supported.in.source={0}は-source {1}でサポートされていません\n({0}を有効にするには-source {2}以上を使用してください)
 
 # 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.misc.feature.not.supported.in.source.plural={0}\u306F-source {1}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n({0}\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F-source {2}\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
+compiler.misc.feature.not.supported.in.source.plural={0}は-source {1}でサポートされていません\n({0}を有効にするには-source {2}以上を使用してください)
 
 # 0: message segment (feature)
-compiler.err.preview.feature.disabled={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3067\u3042\u308A\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n({0}\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F--enable-preview\u3092\u4F7F\u7528\u3057\u307E\u3059)
+compiler.err.preview.feature.disabled={0}はプレビュー機能であり、デフォルトで無効になっています。\n({0}を有効にするには--enable-previewを使用します)
 
 # 0: message segment (feature)
-compiler.err.preview.feature.disabled.plural={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3067\u3042\u308A\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n({0}\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F--enable-preview\u3092\u4F7F\u7528\u3057\u307E\u3059)
+compiler.err.preview.feature.disabled.plural={0}はプレビュー機能であり、デフォルトで無効になっています。\n({0}を有効にするには--enable-previewを使用します)
 
 # 0: file object (classfile), 1: string (expected version)
-compiler.err.preview.feature.disabled.classfile={0}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306FJava SE {1}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\n(\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u542B\u3080\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u308B\u3088\u3046\u306B\u3059\u308B\u306B\u306F\u3001--enable-preview\u3092\u4F7F\u7528\u3057\u307E\u3059)
+compiler.err.preview.feature.disabled.classfile={0}のクラス・ファイルはJava SE {1}のプレビュー機能を使用します。\n(プレビュー機能を含むクラス・ファイルをロードできるようにするには、--enable-previewを使用します)
 
 # 0: message segment (feature)
-compiler.warn.preview.feature.use={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+compiler.warn.preview.feature.use={0}はプレビュー機能であり、今後のリリースで削除される可能性があります。
 
 # 0: message segment (feature)
-compiler.warn.preview.feature.use.plural={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+compiler.warn.preview.feature.use.plural={0}はプレビュー機能であり、今後のリリースで削除される可能性があります。
 
 # 0: file object (classfile), 1: string (expected version)
-compiler.warn.preview.feature.use.classfile={0}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306FJava SE {1}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+compiler.warn.preview.feature.use.classfile={0}のクラス・ファイルはJava SE {1}のプレビュー機能を使用します。
 
-compiler.misc.feature.modules=\u30E2\u30B8\u30E5\u30FC\u30EB
+compiler.misc.feature.modules=モジュール
 
-compiler.misc.feature.diamond.and.anon.class=\u533F\u540D\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u306E''<>''
+compiler.misc.feature.diamond.and.anon.class=匿名内部クラスでの''<>''
 
-compiler.misc.feature.var.in.try.with.resources=try-with-resources\u5185\u306E\u5909\u6570
+compiler.misc.feature.var.in.try.with.resources=try-with-resources内の変数
 
-compiler.misc.feature.private.intf.methods=private\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9
+compiler.misc.feature.private.intf.methods=privateインタフェース・メソッド
 
-compiler.misc.feature.text.blocks=\u30C6\u30AD\u30B9\u30C8\u30FB\u30D6\u30ED\u30C3\u30AF
+compiler.misc.feature.text.blocks=テキスト・ブロック
 
-compiler.misc.feature.multiple.case.labels=\u8907\u6570\u306Ecase\u30E9\u30D9\u30EB
+compiler.misc.feature.multiple.case.labels=複数のcaseラベル
 
-compiler.misc.feature.switch.rules=switch\u30EB\u30FC\u30EB
+compiler.misc.feature.switch.rules=switchルール
 
-compiler.misc.feature.switch.expressions=switch\u5F0F
+compiler.misc.feature.switch.expressions=switch式
 
-compiler.misc.feature.var.syntax.in.implicit.lambda=\u6697\u9ED9\u30E9\u30E0\u30C0\u306Evar\u69CB\u6587
+compiler.misc.feature.var.syntax.in.implicit.lambda=暗黙ラムダのvar構文
 
-compiler.misc.feature.pattern.matching.instanceof=instanceof\u3067\u306E\u30D1\u30BF\u30FC\u30F3\u306E\u4E00\u81F4
+compiler.misc.feature.pattern.matching.instanceof=instanceofでのパターンの一致
 
-compiler.misc.feature.reifiable.types.instanceof=instanceof\u3067\u306Ereifiable\u578B
+compiler.misc.feature.reifiable.types.instanceof=instanceofでのreifiable型
 
-compiler.misc.feature.deconstruction.patterns=\u30C7\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30B7\u30E7\u30F3\u30FB\u30D1\u30BF\u30FC\u30F3
+compiler.misc.feature.deconstruction.patterns=デコンストラクション・パターン
 
-compiler.misc.feature.unnamed.variables=\u7121\u540D\u5909\u6570
+compiler.misc.feature.unnamed.variables=無名変数
 
-compiler.misc.feature.records=\u30EC\u30B3\u30FC\u30C9
+compiler.misc.feature.records=レコード
 
-compiler.misc.feature.sealed.classes=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9
+compiler.misc.feature.sealed.classes=シール・クラス
 
-compiler.misc.feature.case.null=switch case\u306Enull
+compiler.misc.feature.case.null=switch caseのnull
 
-compiler.misc.feature.pattern.switch=switch\u6587\u306E\u30D1\u30BF\u30FC\u30F3
+compiler.misc.feature.pattern.switch=switch文のパターン
 
-compiler.misc.feature.string.templates=\u6587\u5B57\u5217\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
+compiler.misc.feature.string.templates=文字列テンプレート
 
-compiler.misc.feature.unconditional.patterns.in.instanceof=instanceof\u3067\u306E\u7121\u6761\u4EF6\u30D1\u30BF\u30FC\u30F3
+compiler.misc.feature.unconditional.patterns.in.instanceof=instanceofでの無条件パターン
 
-compiler.misc.feature.unnamed.classes=\u7121\u540D\u30AF\u30E9\u30B9
+compiler.misc.feature.unnamed.classes=無名クラス
 
-compiler.warn.underscore.as.identifier=\u30EA\u30EA\u30FC\u30B99\u304B\u3089''_''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.warn.underscore.as.identifier=リリース9から''_''はキーワードなので識別子として使用することはできません
 
-compiler.err.underscore.as.identifier=\u30EA\u30EA\u30FC\u30B99\u304B\u3089''_''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.underscore.as.identifier=リリース9から''_''はキーワードなので識別子として使用することはできません
 
-compiler.err.use.of.underscore.not.allowed=\u30EA\u30EA\u30FC\u30B921\u304B\u3089\u3001\u30A2\u30F3\u30C0\u30FC\u30B9\u30B3\u30A2\u30FB\u30AD\u30FC\u30EF\u30FC\u30C9''_''\u306F\u3001\n\u7121\u540D\u30D1\u30BF\u30FC\u30F3\u3001\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u3001\u4F8B\u5916\u30D1\u30E9\u30E1\u30FC\u30BF\u307E\u305F\u306F\u30E9\u30E0\u30C0\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u5BA3\u8A00\u3059\u308B\u5834\u5408\u306B\u306E\u307F\u8A31\u53EF\u3055\u308C\u307E\u3059
+compiler.err.use.of.underscore.not.allowed=リリース21から、アンダースコア・キーワード''_''は、\n無名パターン、ローカル変数、例外パラメータまたはラムダ・パラメータを宣言する場合にのみ許可されます
 
-compiler.err.use.of.underscore.not.allowed.with.brackets=\u30A2\u30F3\u30C0\u30FC\u30B9\u30B3\u30A2\u30FB\u30AD\u30FC\u30EF\u30FC\u30C9''_''\u306B\u5927\u30AB\u30C3\u30B3\u3092\u7D9A\u3051\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.use.of.underscore.not.allowed.with.brackets=アンダースコア・キーワード''_''に大カッコを続けることはできません
 
-compiler.err.enum.as.identifier=\u30EA\u30EA\u30FC\u30B95\u304B\u3089''enum'\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.enum.as.identifier=リリース5から''enum'はキーワードなので識別子として使用することはできません
 
-compiler.err.assert.as.identifier=\u30EA\u30EA\u30FC\u30B91.4\u304B\u3089''assert''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.assert.as.identifier=リリース1.4から''assert''はキーワードなので識別子として使用することはできません
 
 # TODO 308: make a better error message
-compiler.err.this.as.identifier=\u30EA\u30EA\u30FC\u30B98\u304B\u3089''this''\u306F\u53D7\u4FE1\u30BF\u30A4\u30D7\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u540D\u3068\u3057\u3066\u306E\u307F\u8A31\u53EF\u3055\u308C\u307E\u3059\n\u3053\u308C\u306F\u6700\u521D\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30E9\u30E0\u30C0\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.this.as.identifier=リリース8から''this''は受信タイプのパラメータ名としてのみ許可されます\nこれは最初のパラメータにする必要があり、ラムダ・パラメータにはできません
 
-compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=\u53D7\u53D6\u308A\u5074\u30D1\u30E9\u30E1\u30FC\u30BF\u306F\u6700\u4E0A\u4F4D\u30EC\u30D9\u30EB\u30FB\u30AF\u30E9\u30B9\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=受取り側パラメータは最上位レベル・クラスのコンストラクタに適用できません
 
 # TODO 308: make a better error message
 # 0: annotation
-compiler.err.cant.type.annotate.scoping.1=\u30B9\u30B3\u30FC\u30D7\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30C8\u3092\u578B\u4F7F\u7528\u6CE8\u91C8\u3067\u6CE8\u91C8\u4ED8\u3051\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093: {0}
+compiler.err.cant.type.annotate.scoping.1=スコープ・コンストラクトを型使用注釈で注釈付けすることはできません: {0}
 
 # TODO 308: make a better error message
 # 0: list of annotation
-compiler.err.cant.type.annotate.scoping=\u30B9\u30B3\u30FC\u30D7\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30C8\u3092\u578B\u4F7F\u7528\u6CE8\u91C8\u3067\u6CE8\u91C8\u4ED8\u3051\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093: {0}
+compiler.err.cant.type.annotate.scoping=スコープ・コンストラクトを型使用注釈で注釈付けすることはできません: {0}
 
 # 0: type, 1: type
-compiler.err.incorrect.receiver.name=\u53D7\u53D6\u308A\u5074\u306E\u540D\u524D\u304C\u3001\u5305\u542B\u3059\u308B\u30AF\u30E9\u30B9\u30FB\u30BF\u30A4\u30D7\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093\n\u5FC5\u9808: {0}\n\u691C\u51FA:    {1}
+compiler.err.incorrect.receiver.name=受取り側の名前が、包含するクラス・タイプと一致しません\n必須: {0}\n検出:    {1}
 
 # 0: type, 1: type
-compiler.err.incorrect.receiver.type=\u53D7\u53D6\u308A\u5074\u306E\u30BF\u30A4\u30D7\u304C\u3001\u5305\u542B\u3059\u308B\u30AF\u30E9\u30B9\u30FB\u30BF\u30A4\u30D7\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093\n\u5FC5\u9808: {0}\n\u691C\u51FA:    {1}
+compiler.err.incorrect.receiver.type=受取り側のタイプが、包含するクラス・タイプと一致しません\n必須: {0}\n検出:    {1}
 
 # 0: type, 1: type
-compiler.err.incorrect.constructor.receiver.type=\u53D7\u53D6\u308A\u5074\u306E\u30BF\u30A4\u30D7\u304C\u3001\u5305\u542B\u3059\u308B\u5916\u90E8\u30AF\u30E9\u30B9\u30FB\u30BF\u30A4\u30D7\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093\n\u5FC5\u9808: {0}\n\u691C\u51FA:    {1}
+compiler.err.incorrect.constructor.receiver.type=受取り側のタイプが、包含する外部クラス・タイプと一致しません\n必須: {0}\n検出:    {1}
 
 # 0: type, 1: type
-compiler.err.incorrect.constructor.receiver.name=\u53D7\u53D6\u308A\u5074\u306E\u540D\u524D\u304C\u3001\u5305\u542B\u3059\u308B\u5916\u90E8\u30AF\u30E9\u30B9\u30FB\u30BF\u30A4\u30D7\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093\n\u5FC5\u9808: {0}\n\u691C\u51FA:    {1}
+compiler.err.incorrect.constructor.receiver.name=受取り側の名前が、包含する外部クラス・タイプと一致しません\n必須: {0}\n検出:    {1}
 
-compiler.err.no.annotations.on.dot.class=\u6CE8\u91C8\u306F\u30AF\u30E9\u30B9\u30FB\u30EA\u30C6\u30E9\u30EB\u306E\u30BF\u30A4\u30D7\u3067\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.no.annotations.on.dot.class=注釈はクラス・リテラルのタイプで許可されません
 
 ########################################
 # Diagnostics for verbose resolution
@@ -2309,25 +2309,25 @@ compiler.err.no.annotations.on.dot.class=\u6CE8\u91C8\u306F\u30AF\u30E9\u30B9\u3
 ########################################
 
 # 0: number, 1: symbol, 2: unused
-compiler.misc.applicable.method.found=#{0}\u500B\u306E\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1}
+compiler.misc.applicable.method.found=#{0}個の使用可能メソッドが見つかりました: {1}
 
 # 0: number, 1: symbol, 2: message segment
-compiler.misc.applicable.method.found.1=#{0}\u500B\u306E\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1}\n({2})
+compiler.misc.applicable.method.found.1=#{0}個の使用可能メソッドが見つかりました: {1}\n({2})
 
 # 0: number, 1: symbol, 2: message segment
-compiler.misc.not.applicable.method.found=#{0}\u500B\u306E\u4F7F\u7528\u3067\u304D\u306A\u3044\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1}\n({2})
+compiler.misc.not.applicable.method.found=#{0}個の使用できないメソッドが見つかりました: {1}\n({2})
 
 # 0: type
-compiler.misc.partial.inst.sig=\u90E8\u5206\u7684\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3055\u308C\u307E\u3057\u305F: {0}
+compiler.misc.partial.inst.sig=部分的にインスタンス化されました: {0}
 
 # 0: name, 1: symbol, 2: number, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
-compiler.note.verbose.resolve.multi=\u578B{1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3092\u5019\u88DC{2}\u306B\u89E3\u6C7A\u3057\u3066\u3044\u307E\u3059\n\u30D5\u30A7\u30FC\u30BA: {3}\n\u5B9F\u969B\u306E\u578B: {4}\n\u578B\u5F15\u6570: {5}\n\u5019\u88DC:
+compiler.note.verbose.resolve.multi=型{1}のメソッド{0}を候補{2}に解決しています\nフェーズ: {3}\n実際の型: {4}\n型引数: {5}\n候補:
 
 # 0: name, 1: symbol, 2: unused, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
-compiler.note.verbose.resolve.multi.1=\u578B{1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u306E\u89E3\u6C7A\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059\n\u30D5\u30A7\u30FC\u30BA: {3}\n\u5B9F\u969B\u306E\u578B: {4}\n\u578B\u5F15\u6570: {5}\n\u5019\u88DC:
+compiler.note.verbose.resolve.multi.1=型{1}のメソッド{0}の解決にエラーがあります\nフェーズ: {3}\n実際の型: {4}\n型引数: {5}\n候補:
 
 # 0: symbol, 1: type, 2: type
-compiler.note.deferred.method.inst=\u30E1\u30BD\u30C3\u30C9{0}\u306E\u9045\u5EF6\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\n\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3055\u308C\u305F\u30B7\u30B0\u30CD\u30C1\u30E3: {1}\n\u30BF\u30FC\u30B2\u30C3\u30C8\u578B: {2}
+compiler.note.deferred.method.inst=メソッド{0}の遅延インスタンス化\nインスタンス化されたシグネチャ: {1}\nターゲット型: {2}
 
 ########################################
 # Diagnostics for lambda deduplication
@@ -2335,7 +2335,7 @@ compiler.note.deferred.method.inst=\u30E1\u30BD\u30C3\u30C9{0}\u306E\u9045\u5EF6
 ########################################
 
 # 0: symbol
-compiler.note.verbose.l2m.deduplicate=\u91CD\u8907\u9664\u5916\u30E9\u30E0\u30C0\u5B9F\u88C5\u30E1\u30BD\u30C3\u30C9{0}
+compiler.note.verbose.l2m.deduplicate=重複除外ラムダ実装メソッド{0}
 
 ########################################
 # Diagnostics for method reference search
@@ -2343,21 +2343,21 @@ compiler.note.verbose.l2m.deduplicate=\u91CD\u8907\u9664\u5916\u30E9\u30E0\u30C0
 ########################################
 
 # 0: fragment, 1: string, 2: number
-compiler.note.method.ref.search.results.multi={1}\u306E{0}\u306E\u691C\u7D22\u7D50\u679C(\u6700\u3082\u53B3\u5BC6\u306A\u3082\u306E{2}\u500B)\n\u4F7F\u7528\u53EF\u80FD\u306A\u5019\u88DC:
+compiler.note.method.ref.search.results.multi={1}の{0}の検索結果(最も厳密なもの{2}個)\n使用可能な候補:
 
 # 0: number, 1: fragment, 2: symbol
-compiler.misc.applicable.method.found.2=\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C#{0}\u500B\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1} {2}
+compiler.misc.applicable.method.found.2=使用可能メソッドが#{0}個見つかりました: {1} {2}
 
 # 0: number, 1: fragment, 2: symbol, 3: message segment
-compiler.misc.applicable.method.found.3=\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C#{0}\u500B\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1} {2}\n({3})
+compiler.misc.applicable.method.found.3=使用可能メソッドが#{0}個見つかりました: {1} {2}\n({3})
 
 compiler.misc.static=static
 
-compiler.misc.non.static=static\u3067\u306A\u3044
+compiler.misc.non.static=staticでない
 
-compiler.misc.bound=\u30D0\u30A4\u30F3\u30C9
+compiler.misc.bound=バインド
 
-compiler.misc.unbound=\u30D0\u30A4\u30F3\u30C9\u306A\u3057
+compiler.misc.unbound=バインドなし
 
 ########################################
 # Diagnostics for where clause implementation
@@ -2381,27 +2381,27 @@ compiler.misc.intersection.type=INT#{0}
 # where clause for captured type: contains upper ('extends {1}') and lower
 # ('super {2}') bound along with the wildcard that generated this captured type ({3})
 # 0: type, 1: type, 2: type, 3: type
-compiler.misc.where.captured={3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089\u306E{0} extends {1} super: {2}
+compiler.misc.where.captured={3}のキャプチャからの{0} extends {1} super: {2}
 
 # compact where clause for captured type: contains upper ('extends {1}') along
 # with the wildcard that generated this captured type ({3})
 # 0: type, 1: type, 2: unused, 3: type
-compiler.misc.where.captured.1={3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089\u306E{0} extends {1}
+compiler.misc.where.captured.1={3}のキャプチャからの{0} extends {1}
 
 # where clause for type variable: contains upper bound(s) ('extends {1}') along with
 # the kindname ({2}) and location ({3}) in which the typevar has been declared
 # 0: type, 1: list of type, 2: symbol kind, 3: symbol
-compiler.misc.where.typevar={2} {3}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B{0} extends {1}
+compiler.misc.where.typevar={2} {3}で宣言されている{0} extends {1}
 
 # compact where clause for type variable: contains the kindname ({2}) and location ({3})
 # in which the typevar has been declared
 # 0: type, 1: list of type, 2: symbol kind, 3: symbol
-compiler.misc.where.typevar.1={2} {3}\u3067\u5BA3\u8A00\u3055\u308C\u305F{0}
+compiler.misc.where.typevar.1={2} {3}で宣言された{0}
 
 # where clause for fresh type variable: contains upper bound(s) ('extends {1}').
 # Since a fresh type-variable is synthetic - there's no location/kindname here.
 # 0: type, 1: list of type
-compiler.misc.where.fresh.typevar={0}\u306F{1}\u3092\u62E1\u5F35\u3057\u307E\u3059
+compiler.misc.where.fresh.typevar={0}は{1}を拡張します
 
 # where clause for type variable: contains all the upper bound(s) ('extends {1}')
 # of this intersection type
@@ -2409,464 +2409,464 @@ compiler.misc.where.fresh.typevar={0}\u306F{1}\u3092\u62E1\u5F35\u3057\u307E\u30
 compiler.misc.where.intersection={0} extends {1}
 
 ### Where clause headers ###
-compiler.misc.where.description.captured={0}\u304C\u65B0\u3057\u3044\u578B\u5909\u6570\u306E\u5834\u5408:
+compiler.misc.where.description.captured={0}が新しい型変数の場合:
 
 # 0: set of type
-compiler.misc.where.description.typevar={0}\u304C\u578B\u5909\u6570\u306E\u5834\u5408:
+compiler.misc.where.description.typevar={0}が型変数の場合:
 
 # 0: set of type
-compiler.misc.where.description.intersection={0}\u304Cintersection\u578B\u306E\u5834\u5408:
+compiler.misc.where.description.intersection={0}がintersection型の場合:
 
 # 0: set of type
-compiler.misc.where.description.captured.1={0}\u304C\u65B0\u3057\u3044\u578B\u5909\u6570\u306E\u5834\u5408:
+compiler.misc.where.description.captured.1={0}が新しい型変数の場合:
 
 # 0: set of type
-compiler.misc.where.description.typevar.1={0}\u304C\u578B\u5909\u6570\u306E\u5834\u5408:
+compiler.misc.where.description.typevar.1={0}が型変数の場合:
 
 # 0: set of type
-compiler.misc.where.description.intersection.1={0}\u304Cintersection\u578B\u306E\u5834\u5408:
+compiler.misc.where.description.intersection.1={0}がintersection型の場合:
 
 ###
 # errors related to doc comments
 
-compiler.err.dc.bad.entity=HTML\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.dc.bad.entity=HTMLエンティティが不正です
 
-compiler.err.dc.bad.inline.tag=\u30A4\u30F3\u30E9\u30A4\u30F3\u30FB\u30BF\u30B0\u306E\u4F7F\u7528\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
+compiler.err.dc.bad.inline.tag=インライン・タグの使用が正しくありません
 
-compiler.err.dc.identifier.expected=\u8B58\u5225\u5B50\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.dc.identifier.expected=識別子が必要です
 
-compiler.err.dc.invalid.html=HTML\u304C\u7121\u52B9\u3067\u3059
+compiler.err.dc.invalid.html=HTMLが無効です
 
-compiler.err.dc.malformed.html=HTML\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.dc.malformed.html=HTMLが不正です
 
-compiler.err.dc.missing.semicolon=\u30BB\u30DF\u30B3\u30ED\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.dc.missing.semicolon=セミコロンがありません
 
-compiler.err.dc.no.content=\u30B3\u30F3\u30C6\u30F3\u30C4\u306A\u3057
+compiler.err.dc.no.content=コンテンツなし
 
-compiler.err.dc.no.tag.name=''@''\u306E\u5F8C\u306B\u30BF\u30B0\u540D\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.dc.no.tag.name=''@''の後にタグ名がありません
 
-compiler.err.dc.no.url=URL\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.dc.no.url=URLがありません
 
-compiler.err.dc.no.title=\u30BF\u30A4\u30C8\u30EB\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.dc.no.title=タイトルがありません
 
-compiler.err.dc.gt.expected=''>''\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.dc.gt.expected=''>''が必要です
 
-compiler.err.dc.ref.bad.parens=\u30AB\u30C3\u30B3\u306E\u5F8C\u306E\u4E88\u671F\u3057\u306A\u3044\u30C6\u30AD\u30B9\u30C8\u3067\u3059
+compiler.err.dc.ref.bad.parens=カッコの後の予期しないテキストです
 
-compiler.err.dc.ref.syntax.error=\u53C2\u7167\u306B\u69CB\u6587\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059
+compiler.err.dc.ref.syntax.error=参照に構文エラーがあります
 
-compiler.err.dc.ref.unexpected.input=\u4E88\u671F\u3057\u306A\u3044\u30C6\u30AD\u30B9\u30C8\u3067\u3059
+compiler.err.dc.ref.unexpected.input=予期しないテキストです
 
-compiler.err.dc.unexpected.content=\u4E88\u671F\u3057\u306A\u3044\u30B3\u30F3\u30C6\u30F3\u30C4\u3067\u3059
+compiler.err.dc.unexpected.content=予期しないコンテンツです
 
-compiler.err.dc.unterminated.inline.tag=\u30A4\u30F3\u30E9\u30A4\u30F3\u30FB\u30BF\u30B0\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
+compiler.err.dc.unterminated.inline.tag=インライン・タグが終了していません
 
-compiler.err.dc.unterminated.signature=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
+compiler.err.dc.unterminated.signature=シグネチャが終了していません
 
-compiler.err.dc.unterminated.string=\u6587\u5B57\u5217\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
+compiler.err.dc.unterminated.string=文字列が終了していません
 
-compiler.err.dc.ref.annotations.not.allowed=\u6CE8\u91C8\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.dc.ref.annotations.not.allowed=注釈は許可されません
 
 ###
 # errors related to modules
 
-compiler.err.expected.module=''\u30E2\u30B8\u30E5\u30FC\u30EB''\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.expected.module=''モジュール''が必要です
 
 # 0: symbol
-compiler.err.module.not.found=\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
+compiler.err.module.not.found=モジュールが見つかりません: {0}
 
 # 0: symbol
-compiler.warn.module.not.found=\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
+compiler.warn.module.not.found=モジュールが見つかりません: {0}
 
-compiler.err.too.many.modules=\u691C\u51FA\u3055\u308C\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u304C\u591A\u3059\u304E\u307E\u3059
+compiler.err.too.many.modules=検出されたモジュール宣言が多すぎます
 
-compiler.err.module.not.found.on.module.source.path=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+compiler.err.module.not.found.on.module.source.path=モジュール・ソース・パスにモジュールが見つかりません
 
-compiler.err.not.in.module.on.module.source.path=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u3042\u308A\u307E\u305B\u3093
+compiler.err.not.in.module.on.module.source.path=モジュール・ソース・パスのモジュールにありません
 
 # 0: symbol
-compiler.err.duplicate.module=\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {0}
+compiler.err.duplicate.module=モジュールが重複しています: {0}
 
 # 0: symbol
-compiler.err.duplicate.requires=\u5FC5\u9808\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {0}
+compiler.err.duplicate.requires=必須が重複しています: {0}
 
 # 0: symbol
-compiler.err.conflicting.exports=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u304C\u91CD\u8907\u307E\u305F\u306F\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059: {0}
+compiler.err.conflicting.exports=エクスポートが重複または競合しています: {0}
 
 # 0: symbol
-compiler.err.conflicting.opens=\u30AA\u30FC\u30D7\u30F3\u304C\u91CD\u8907\u307E\u305F\u306F\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059: {0}
+compiler.err.conflicting.opens=オープンが重複または競合しています: {0}
 
 # 0: symbol
-compiler.err.conflicting.exports.to.module=\u30E2\u30B8\u30E5\u30FC\u30EB\u3078\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u304C\u91CD\u8907\u307E\u305F\u306F\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059: {0}
+compiler.err.conflicting.exports.to.module=モジュールへのエクスポートが重複または競合しています: {0}
 
 # 0: symbol
-compiler.err.conflicting.opens.to.module=\u30E2\u30B8\u30E5\u30FC\u30EB\u3078\u306E\u30AA\u30FC\u30D7\u30F3\u304C\u91CD\u8907\u307E\u305F\u306F\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059: {0}
+compiler.err.conflicting.opens.to.module=モジュールへのオープンが重複または競合しています: {0}
 
-compiler.err.no.opens.unless.strong=''opens''\u306F\u5F37\u56FA\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306E\u307F\u8A31\u53EF\u3055\u308C\u307E\u3059
+compiler.err.no.opens.unless.strong=''opens''は強固なモジュールでのみ許可されます
 
 # 0: symbol
-compiler.err.repeated.provides.for.service=\u30B5\u30FC\u30D3\u30B9{0}\u306B\u8907\u6570\u306E''provides''\u304C\u3042\u308A\u307E\u3059
+compiler.err.repeated.provides.for.service=サービス{0}に複数の''provides''があります
 
 # 0: symbol, 1: symbol
-compiler.err.duplicate.provides=\u6307\u5B9A\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: \u30B5\u30FC\u30D3\u30B9{0}\u3001\u5B9F\u88C5{1}
+compiler.err.duplicate.provides=指定が重複しています: サービス{0}、実装{1}
 
 # 0: symbol
-compiler.err.duplicate.uses=\u4F7F\u7528\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {0}
+compiler.err.duplicate.uses=使用が重複しています: {0}
 
 # 0: symbol
-compiler.err.service.implementation.is.abstract=\u30B5\u30FC\u30D3\u30B9\u5B9F\u88C5\u304C\u62BD\u8C61\u30AF\u30E9\u30B9\u3067\u3059: {0}
+compiler.err.service.implementation.is.abstract=サービス実装が抽象クラスです: {0}
 
-compiler.err.service.implementation.must.be.subtype.of.service.interface=\u30B5\u30FC\u30D3\u30B9\u5B9F\u88C5\u30BF\u30A4\u30D7\u306F\u3001\u30B5\u30FC\u30D3\u30B9\u30FB\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u3042\u308B\u304B\u3001\u30B5\u30FC\u30D3\u30B9\u5B9F\u88C5\u3092\u623B\u3057\u3001\u5F15\u6570\u3092\u6301\u305F\u306A\u3044\u3001"provider"\u3068\u3044\u3046\u540D\u524D\u306Epublic static\u30E1\u30BD\u30C3\u30C9\u3092\u6301\u3064\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.service.implementation.must.be.subtype.of.service.interface=サービス実装タイプは、サービス・インタフェース・タイプのサブタイプであるか、サービス実装を戻し、引数を持たない、"provider"という名前のpublic staticメソッドを持つ必要があります
 
-compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface="provider"\u30E1\u30BD\u30C3\u30C9\u306E\u623B\u308A\u30BF\u30A4\u30D7\u306F\u3001\u30B5\u30FC\u30D3\u30B9\u30FB\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface="provider"メソッドの戻りタイプは、サービス・インタフェース・タイプのサブタイプである必要があります
 
 # 0: symbol
-compiler.err.service.implementation.is.inner=\u30B5\u30FC\u30D3\u30B9\u5B9F\u88C5\u304C\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u3059: {0}
+compiler.err.service.implementation.is.inner=サービス実装が内部クラスです: {0}
 
 # 0: symbol
-compiler.err.service.definition.is.enum=\u30B5\u30FC\u30D3\u30B9\u5B9A\u7FA9\u304C\u5217\u6319\u578B\u3067\u3059: {0}
+compiler.err.service.definition.is.enum=サービス定義が列挙型です: {0}
 
 # 0: symbol
-compiler.err.service.implementation.doesnt.have.a.no.args.constructor=\u30B5\u30FC\u30D3\u30B9\u5B9F\u88C5\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u3042\u308A\u307E\u305B\u3093: {0}
+compiler.err.service.implementation.doesnt.have.a.no.args.constructor=サービス実装のデフォルト・コンストラクタがありません: {0}
 
 # 0: symbol
-compiler.err.service.implementation.no.args.constructor.not.public=\u30B5\u30FC\u30D3\u30B9\u5B9F\u88C5\u306E\u5F15\u6570\u306A\u3057\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u30D1\u30D6\u30EA\u30C3\u30AF\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0}
+compiler.err.service.implementation.no.args.constructor.not.public=サービス実装の引数なしのコンストラクタがパブリックではありません: {0}
 
 # 0: symbol
-compiler.err.package.empty.or.not.found=\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u7A7A\u3067\u3042\u308B\u304B\u3001\u307E\u305F\u306F\u5B58\u5728\u3057\u307E\u305B\u3093 {0}
+compiler.err.package.empty.or.not.found=パッケージは空であるか、または存在しません {0}
 
 # 0: symbol
-compiler.warn.package.empty.or.not.found=\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u7A7A\u3067\u3042\u308B\u304B\u3001\u307E\u305F\u306F\u5B58\u5728\u3057\u307E\u305B\u3093 {0}
+compiler.warn.package.empty.or.not.found=パッケージは空であるか、または存在しません {0}
 
-compiler.err.no.output.dir=\u30AF\u30E9\u30B9\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.no.output.dir=クラス出力ディレクトリが指定されていません
 
-compiler.err.unnamed.pkg.not.allowed.named.modules=\u540D\u524D\u306E\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u540D\u524D\u4ED8\u304D\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.unnamed.pkg.not.allowed.named.modules=名前のないパッケージは名前付きモジュールでは許可されません
 
 # 0: name, 1: name
-compiler.err.module.name.mismatch=\u30E2\u30B8\u30E5\u30FC\u30EB\u540D{0}\u306F\u5FC5\u8981\u306A\u540D\u524D{1}\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093
+compiler.err.module.name.mismatch=モジュール名{0}は必要な名前{1}と一致しません
 
 # 0: name, 1: name
-compiler.misc.module.name.mismatch=\u30E2\u30B8\u30E5\u30FC\u30EB\u540D{0}\u306F\u5FC5\u8981\u306A\u540D\u524D{1}\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093
+compiler.misc.module.name.mismatch=モジュール名{0}は必要な名前{1}と一致しません
 
 # 0: name
-compiler.err.module.non.zero.opens=\u30AA\u30FC\u30D7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306F\u30BC\u30ED\u3067\u306A\u3044opens_count\u3092\u6301\u3061\u307E\u3059
+compiler.err.module.non.zero.opens=オープン・モジュール{0}はゼロでないopens_countを持ちます
 
 # 0: name
-compiler.misc.module.non.zero.opens=\u30AA\u30FC\u30D7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306F\u30BC\u30ED\u3067\u306A\u3044opens_count\u3092\u6301\u3061\u307E\u3059
+compiler.misc.module.non.zero.opens=オープン・モジュール{0}はゼロでないopens_countを持ちます
 
-compiler.err.module.decl.sb.in.module-info.java=\u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306Fmodule-info.java\u3068\u3044\u3046\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306B\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.module.decl.sb.in.module-info.java=モジュール宣言はmodule-info.javaという名前のファイルにある必要があります
 
 # 0: set of string
-compiler.err.too.many.patched.modules=\u30D1\u30C3\u30C1\u9069\u7528\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u591A\u3059\u304E\u307E\u3059({0})\u3002--module-source-path\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
+compiler.err.too.many.patched.modules=パッチ適用モジュールが多すぎます({0})。--module-source-pathを使用してください
 
 # 0: name, 1: name
-compiler.err.file.patched.and.msp=\u30D5\u30A1\u30A4\u30EB\u306F\u3001--patch-module\u3068--module-source-path\u306E\u4E21\u65B9\u304B\u3089\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u3067\u3059\u304C\u3001\u5404\u30D1\u30B9\u4E0A\u306E\u7570\u306A\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u5C5E\u3057\u3066\u3044\u307E\u3059: {0}, {1}
+compiler.err.file.patched.and.msp=ファイルは、--patch-moduleと--module-source-pathの両方からアクセス可能ですが、各パス上の異なるモジュールに属しています: {0}, {1}
 
-compiler.err.processorpath.no.processormodulepath=-processorpath\u3068--processor-module-path\u306E\u7D44\u5408\u305B\u304C\u4E0D\u6B63\u3067\u3059
+compiler.err.processorpath.no.processormodulepath=-processorpathと--processor-module-pathの組合せが不正です
 
 # 0: symbol
-compiler.err.package.in.other.module=\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u5225\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u5B58\u5728\u3057\u307E\u3059: {0}
+compiler.err.package.in.other.module=パッケージが別のモジュールに存在します: {0}
 
 # 0: symbol, 1: name, 2: symbol, 3: symbol
-compiler.err.package.clash.from.requires=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306F{2}\u3068{3}\u306E\u4E21\u65B9\u304B\u3089\u30D1\u30C3\u30B1\u30FC\u30B8{1}\u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059
+compiler.err.package.clash.from.requires=モジュール{0}は{2}と{3}の両方からパッケージ{1}を読み取ります
 
 # 0: name, 1: symbol, 2: symbol
-compiler.err.package.clash.from.requires.in.unnamed=\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\uFF0D\u30EB\u306F{1}\u3068{2}\u306E\u4E21\u65B9\u304B\u3089\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059
+compiler.err.package.clash.from.requires.in.unnamed=名前のないモジュ－ルは{1}と{2}の両方からパッケージ{0}を読み取ります
 
 # 0: string
-compiler.err.module.not.found.in.module.source.path=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306B\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+compiler.err.module.not.found.in.module.source.path=モジュール・ソース・パスにモジュール{0}が見つかりません
 
-compiler.err.output.dir.must.be.specified.with.dash.m.option=-m\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B\u5834\u5408\u3001\u30AF\u30E9\u30B9\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.output.dir.must.be.specified.with.dash.m.option=-mオプションを使用する場合、クラス出力ディレクトリを指定する必要があります
 
-compiler.err.modulesourcepath.must.be.specified.with.dash.m.option=-m\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B\u5834\u5408\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.modulesourcepath.must.be.specified.with.dash.m.option=-mオプションを使用する場合、モジュール・ソース・パスを指定する必要があります
 
 # 0: symbol
-compiler.err.service.implementation.not.in.right.module=\u30B5\u30FC\u30D3\u30B9\u5B9F\u88C5\u3092provides\u30C7\u30A3\u30EC\u30AF\u30C6\u30A3\u30D6\u3068\u3057\u3066\u540C\u3058\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u5B9A\u7FA9\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.service.implementation.not.in.right.module=サービス実装をprovidesディレクティブとして同じモジュールに定義する必要があります
 
 # 0: symbol
-compiler.err.cyclic.requires={0}\u3092\u542B\u3080\u4F9D\u5B58\u6027\u304C\u30EB\u30FC\u30D7\u3057\u3066\u3044\u307E\u3059
+compiler.err.cyclic.requires={0}を含む依存性がループしています
 
 # 0: fragment, 1: name
-compiler.err.duplicate.module.on.path={0}\u3067\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\n{1}\u306E\u30E2\u30B8\u30E5\u30FC\u30EB
+compiler.err.duplicate.module.on.path={0}でモジュールが重複しています\n{1}のモジュール
 
 # 0: option name, 1: string
-compiler.warn.bad.name.for.option={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5024\u306B\u542B\u307E\u308C\u308B\u540D\u524D\u304C\u4E0D\u6B63\u3067\u3059: ''{1}''
+compiler.warn.bad.name.for.option={0}オプションの値に含まれる名前が不正です: ''{1}''
 
 # 0: option name, 1: string
-compiler.err.bad.name.for.option={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5024\u306B\u542B\u307E\u308C\u308B\u540D\u524D\u304C\u4E0D\u6B63\u3067\u3059: ''{1}''
+compiler.err.bad.name.for.option={0}オプションの値に含まれる名前が不正です: ''{1}''
 
 # 0: option name, 1: symbol
-compiler.warn.module.for.option.not.found={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u5185\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {1}
+compiler.warn.module.for.option.not.found={0}オプション内にモジュール名が見つかりません: {1}
 
-compiler.err.addmods.all.module.path.invalid=--add-modules ALL-MODULE-PATH\u306F\u3001\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u307E\u305F\u306F\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
+compiler.err.addmods.all.module.path.invalid=--add-modules ALL-MODULE-PATHは、名前のないモジュールのコンパイル時または自動モジュールのコンテキストでのコンパイル時のみ使用できます
 
 # 0: symbol
-compiler.err.add.exports.with.release=\u30B7\u30B9\u30C6\u30E0\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u304B\u3089\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u306F--release\u3092\u6307\u5B9A\u3057\u3066\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093
+compiler.err.add.exports.with.release=システム・モジュール{0}からのパッケージのエクスポートは--releaseを指定して実行できません
 
 # 0: symbol
-compiler.err.add.reads.with.release=\u30B7\u30B9\u30C6\u30E0\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306E\u8AAD\u53D6\u308A\u30A8\u30C3\u30B8\u306E\u8FFD\u52A0\u306F--release\u3092\u6307\u5B9A\u3057\u3066\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093
+compiler.err.add.reads.with.release=システム・モジュール{0}の読取りエッジの追加は--releaseを指定して実行できません
 
-compiler.warn.addopens.ignored=--add-opens\u306F\u3001\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u306B\u306F\u7121\u52B9\u3067\u3059
+compiler.warn.addopens.ignored=--add-opensは、コンパイル時には無効です
 
-compiler.misc.locn.module_source_path=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9
+compiler.misc.locn.module_source_path=モジュール・ソース・パス
 
-compiler.misc.locn.upgrade_module_path=\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9
+compiler.misc.locn.upgrade_module_path=アップグレード・モジュール・パス
 
-compiler.misc.locn.system_modules=\u30B7\u30B9\u30C6\u30E0\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB
+compiler.misc.locn.system_modules=システム・モジュール
 
-compiler.misc.locn.module_path=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9
+compiler.misc.locn.module_path=アプリケーション・モジュール・パス
 
-compiler.misc.cant.resolve.modules=\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u89E3\u6C7A\u3067\u304D\u307E\u305B\u3093
+compiler.misc.cant.resolve.modules=モジュールを解決できません
 
-compiler.misc.bad.requires.flag=\u4E0D\u6B63\u306A\u5FC5\u9808\u30D5\u30E9\u30B0: {0}
+compiler.misc.bad.requires.flag=不正な必須フラグ: {0}
 
 # 0: string
-compiler.err.invalid.module.specifier=\u30E2\u30B8\u30E5\u30FC\u30EB\u6307\u5B9A\u5B50\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093: {0}
+compiler.err.invalid.module.specifier=モジュール指定子は許可されません: {0}
 
 # 0: symbol
-compiler.warn.service.provided.but.not.exported.or.used=\u30B5\u30FC\u30D3\u30B9\u30FB\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u307E\u305F\u306F\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.warn.service.provided.but.not.exported.or.used=サービス・インタフェースが指定されましたが、エクスポートまたは使用されていません
 
 # 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible=\u30E2\u30B8\u30E5\u30FC\u30EB{2}\u306E{0} {1}\u306F\u3001\u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u5FC5\u8981\u3068\u3059\u308B\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u304B\u3089\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
+compiler.warn.leaks.not.accessible=モジュール{2}の{0} {1}は、このモジュールを必要とするクライアントからアクセスできません
 # 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible.unexported=\u30E2\u30B8\u30E5\u30FC\u30EB{2}\u306E{0} {1}\u306F\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093
+compiler.warn.leaks.not.accessible.unexported=モジュール{2}の{0} {1}はエクスポートされません
 # 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible.not.required.transitive=\u30E2\u30B8\u30E5\u30FC\u30EB{2}\u306E{0} {1}\u306F\u3001''requires transitive''\u3092\u4F7F\u7528\u3057\u3066\u9593\u63A5\u7684\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093
+compiler.warn.leaks.not.accessible.not.required.transitive=モジュール{2}の{0} {1}は、''requires transitive''を使用して間接的にエクスポートされません
 # 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible.unexported.qualified=\u30E2\u30B8\u30E5\u30FC\u30EB{2}\u306E{0} {1}\u306F\u3001\u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u5FC5\u8981\u3068\u3059\u308B\u3059\u3079\u3066\u306E\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306B\u8868\u793A\u3055\u308C\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compiler.warn.leaks.not.accessible.unexported.qualified=モジュール{2}の{0} {1}は、このモジュールを必要とするすべてのクライアントに表示されない可能性があります
 
 ###
 # errors related to options
 
 # 0: string, 1: string
-compiler.err.illegal.argument.for.option={0}\u306E\u5F15\u6570\u304C\u4E0D\u6B63\u3067\u3059: {1}
+compiler.err.illegal.argument.for.option={0}の引数が不正です: {1}
 
-compiler.err.match.binding.exists=\u65E2\u5B58\u306E\u4E00\u81F4\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u3092\u518D\u5B9A\u7FA9\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.match.binding.exists=既存の一致バインディングを再定義することはできません
 
-compiler.err.switch.case.unexpected.statement=case\u306E\u4E88\u671F\u3057\u306A\u3044\u6587\u3067\u3059\u3002\u4E88\u671F\u3055\u308C\u308B\u306E\u306F\u3001\u5F0F\u3001\u30D6\u30ED\u30C3\u30AF\u307E\u305F\u306Fthrow\u6587\u3067\u3059
+compiler.err.switch.case.unexpected.statement=caseの予期しない文です。予期されるのは、式、ブロックまたはthrow文です
 
-compiler.err.switch.mixing.case.types=switch\u3067case\u306E\u7570\u306A\u308B\u7A2E\u985E\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.switch.mixing.case.types=switchでcaseの異なる種類が使用されています
 
 ###
 # errors related to sealed classes
 
 # permits clause
 # 0: fragment
-compiler.err.invalid.permits.clause=\u7121\u52B9\u306Apermits\u53E5\n({0})
+compiler.err.invalid.permits.clause=無効なpermits句\n({0})
 
 # 0: string
-compiler.misc.class.is.not.sealed={0}\u306F\u30B7\u30FC\u30EB\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.misc.class.is.not.sealed={0}はシールする必要があります
 
 # 0: type
-compiler.misc.is.a.type.variable=\u578B\u5909\u6570\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093: {0}
+compiler.misc.is.a.type.variable=型変数を含めることはできません: {0}
 
 # 0: type
-compiler.misc.is.duplicated=\u91CD\u8907\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093: {0}
+compiler.misc.is.duplicated=重複を含めることはできません: {0}
 
 # 0: type
-compiler.misc.doesnt.extend.sealed=\u30B5\u30D6\u30AF\u30E9\u30B9{0}\u306F\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9\u3092\u62E1\u5F35\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.misc.doesnt.extend.sealed=サブクラス{0}はシール・クラスを拡張する必要があります
 
-compiler.misc.must.not.be.same.class=permits\u53E5\u306E\u81EA\u5DF1\u53C2\u7167\u304C\u4E0D\u6B63\u3067\u3059
+compiler.misc.must.not.be.same.class=permits句の自己参照が不正です
 
 # 0: type
-compiler.misc.must.not.be.supertype=\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7{0}\u3078\u306E\u53C2\u7167\u304C\u4E0D\u6B63\u3067\u3059
+compiler.misc.must.not.be.supertype=スーパータイプ{0}への参照が不正です
 
 # other sealed types related errors
 
-compiler.err.sealed.class.must.have.subclasses=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9\u306B\u306F\u30B5\u30D6\u30AF\u30E9\u30B9\u3092\u542B\u3081\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.sealed.class.must.have.subclasses=シール・クラスにはサブクラスを含める必要があります
 
 # errors in subclasses of sealed classes
 # 0: symbol
-compiler.err.cant.inherit.from.sealed=\u30AF\u30E9\u30B9\u306F\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9{0}\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093(''permits''\u53E5\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3067\u3059)
+compiler.err.cant.inherit.from.sealed=クラスはシール・クラス{0}を拡張できません(''permits''句に指定されていないためです)
 
 # 0: symbol
-compiler.err.class.in.unnamed.module.cant.extend.sealed.in.diff.package=\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30AF\u30E9\u30B9{0}\u306F\u5225\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093
+compiler.err.class.in.unnamed.module.cant.extend.sealed.in.diff.package=名前のないモジュールのクラス{0}は別のパッケージのシール・クラスを拡張できません
 
 # 0: symbol, 1: symbol
-compiler.err.class.in.module.cant.extend.sealed.in.diff.module=\u30E2\u30B8\u30E5\u30FC\u30EB{1}\u306E\u30AF\u30E9\u30B9{0}\u306F\u5225\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093
+compiler.err.class.in.module.cant.extend.sealed.in.diff.module=モジュール{1}のクラス{0}は別のモジュールのシール・クラスを拡張できません
 
 # 0: symbol
-compiler.err.non.sealed.with.no.sealed.supertype=non-sealed\u4FEE\u98FE\u5B50\u306F\u3053\u3053\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\n(\u30AF\u30E9\u30B9{0}\u306B\u30B7\u30FC\u30EB\u30FB\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093)
+compiler.err.non.sealed.with.no.sealed.supertype=non-sealed修飾子はここでは許可されません\n(クラス{0}にシール・スーパータイプが含まれていません)
 
-compiler.err.non.sealed.sealed.or.final.expected=sealed\u3001non-sealed\u307E\u305F\u306Ffinal\u4FEE\u98FE\u5B50\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.non.sealed.sealed.or.final.expected=sealed、non-sealedまたはfinal修飾子が必要です
 
-compiler.err.non.sealed.or.sealed.expected=sealed\u307E\u305F\u306Fnon-sealed\u4FEE\u98FE\u5B50\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.non.sealed.or.sealed.expected=sealedまたはnon-sealed修飾子が必要です
 
-compiler.err.sealed.or.non.sealed.local.classes.not.allowed=sealed\u307E\u305F\u306Fnon-sealed\u306E\u30ED\u30FC\u30AB\u30EB\u30FB\u30AF\u30E9\u30B9\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.sealed.or.non.sealed.local.classes.not.allowed=sealedまたはnon-sealedのローカル・クラスは許可されません
 
 # 0: fragment
-compiler.err.local.classes.cant.extend.sealed={0}\u30AF\u30E9\u30B9\u306F\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093
-compiler.misc.anonymous=\u533F\u540D
+compiler.err.local.classes.cant.extend.sealed={0}クラスはシール・クラスを拡張できません
+compiler.misc.anonymous=匿名
 
-compiler.misc.local=\u30ED\u30FC\u30AB\u30EB
+compiler.misc.local=ローカル
 
 ###
 # errors related to records
 
 # record components
-compiler.err.record.cant.declare.field.modifiers=\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u4FEE\u98FE\u5B50\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.err.record.cant.declare.field.modifiers=レコード・コンポーネントに修飾子を使用することはできません
 
 # 0: symbol
-compiler.err.illegal.record.component.name=\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u540D{0}\u304C\u7121\u52B9\u3067\u3059
+compiler.err.illegal.record.component.name=レコード・コンポーネント名{0}が無効です
 
-compiler.err.record.component.and.old.array.syntax=\u65E7\u5F0F\u306E\u914D\u5217\u8868\u8A18\u6CD5\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.record.component.and.old.array.syntax=旧式の配列表記法はレコード・コンポーネントでは使用できません
 
 # accessor methods
 # 0: symbol, 1: fragment
-compiler.err.invalid.accessor.method.in.record=\u30EC\u30B3\u30FC\u30C9{0}\u306B\u7121\u52B9\u306A\u30A2\u30AF\u30BB\u30B5\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u3042\u308A\u307E\u3059\n({1})
+compiler.err.invalid.accessor.method.in.record=レコード{0}に無効なアクセサ・メソッドがあります\n({1})
 
-compiler.misc.method.must.be.public=\u30A2\u30AF\u30BB\u30B5\u30FB\u30E1\u30BD\u30C3\u30C9\u306Fpublic\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.misc.method.must.be.public=アクセサ・メソッドはpublicである必要があります
 
 # 0: symbol, 1: symbol
-compiler.misc.accessor.return.type.doesnt.match=\u30A2\u30AF\u30BB\u30B5\u30FB\u30E1\u30BD\u30C3\u30C9{0}\u306E\u623B\u308A\u578B\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8{1}\u306E\u30BF\u30A4\u30D7\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.misc.accessor.return.type.doesnt.match=アクセサ・メソッド{0}の戻り型はレコード・コンポーネント{1}のタイプと一致する必要があります
 
-compiler.misc.accessor.method.cant.throw.exception=throws\u53E5\u3092\u30A2\u30AF\u30BB\u30B5\u30FB\u30E1\u30BD\u30C3\u30C9\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.misc.accessor.method.cant.throw.exception=throws句をアクセサ・メソッドで使用することはできません
 
-compiler.misc.accessor.method.must.not.be.generic=\u30A2\u30AF\u30BB\u30B5\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u6C4E\u7528\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.misc.accessor.method.must.not.be.generic=アクセサ・メソッドは汎用にできません
 
-compiler.misc.accessor.method.must.not.be.static=\u30A2\u30AF\u30BB\u30B5\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u9759\u7684\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.misc.accessor.method.must.not.be.static=アクセサ・メソッドは静的にできません
 
 # canonical constructors
 # 0: fragment, 1: name, 2: fragment
-compiler.err.invalid.canonical.constructor.in.record=\u30EC\u30B3\u30FC\u30C9{1}\u306B\u7121\u52B9\u306A{0}\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u3042\u308A\u307E\u3059\n({2})
+compiler.err.invalid.canonical.constructor.in.record=レコード{1}に無効な{0}コンストラクタがあります\n({2})
 
-compiler.misc.canonical=\u6A19\u6E96
+compiler.misc.canonical=標準
 
-compiler.misc.compact=\u30B3\u30F3\u30D1\u30AF\u30C8
+compiler.misc.compact=コンパクト
 
 # 0: fragment
-compiler.misc.throws.clause.not.allowed.for.canonical.constructor=throws\u53E5\u306F{0}\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.misc.throws.clause.not.allowed.for.canonical.constructor=throws句は{0}コンストラクタでは許可されません
 
-compiler.misc.canonical.with.name.mismatch=\u6A19\u6E96\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u540D\u304C\u7121\u52B9\u3067\u3059
+compiler.misc.canonical.with.name.mismatch=標準コンストラクタのパラメータ名が無効です
 
-compiler.misc.canonical.cant.have.return.statement=\u30B3\u30F3\u30D1\u30AF\u30C8\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306BRETURN\u6587\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.misc.canonical.cant.have.return.statement=コンパクト・コンストラクタにRETURN文を含めることはできません
 
-compiler.misc.canonical.must.not.declare.type.variables=\u6A19\u6E96\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306F\u578B\u5909\u6570\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093
+compiler.misc.canonical.must.not.declare.type.variables=標準コンストラクタは型変数を宣言できません
 
-compiler.misc.type.must.be.identical.to.corresponding.record.component.type=\u578B\u3068\u5F15\u6570\u306E\u6570\u306F\u5BFE\u5FDC\u3059\u308B\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u3082\u306E\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-compiler.misc.canonical.must.not.contain.explicit.constructor.invocation=\u6A19\u6E96\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306B\u660E\u793A\u7684\u306A\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u547C\u51FA\u3057\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.misc.type.must.be.identical.to.corresponding.record.component.type=型と引数の数は対応するレコード・コンポーネントのものと一致する必要があります
+compiler.misc.canonical.must.not.contain.explicit.constructor.invocation=標準コンストラクタに明示的なコンストラクタ呼出しを含めることはできません
 
 # 0: set of flag or string
-compiler.misc.canonical.must.not.have.stronger.access=({0})\u3088\u308A\u5F37\u3044\u30A2\u30AF\u30BB\u30B9\u6A29\u9650\u3092\u5272\u308A\u5F53\u3066\u3088\u3046\u3068\u3057\u307E\u3057\u305F
+compiler.misc.canonical.must.not.have.stronger.access=({0})より強いアクセス権限を割り当てようとしました
 
 # other
-compiler.err.record.cannot.declare.instance.fields=\u30D5\u30A3\u30FC\u30EB\u30C9\u5BA3\u8A00\u306F\u9759\u7684\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\n(\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u7F6E\u63DB\u3059\u308B\u3053\u3068\u3092\u691C\u8A0E)
+compiler.err.record.cannot.declare.instance.fields=フィールド宣言は静的である必要があります\n(フィールドをレコード・コンポーネントに置換することを検討)
 
 # 0: symbol
-compiler.err.invalid.supertype.record=\u30AF\u30E9\u30B9\u306F\u76F4\u63A5{0}\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093
+compiler.err.invalid.supertype.record=クラスは直接{0}を拡張できません
 
 # 0: symbol
-compiler.err.first.statement.must.be.call.to.another.constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u6A19\u6E96\u3067\u306A\u3044\u305F\u3081\u3001\u5148\u982D\u6587\u304C\u30AF\u30E9\u30B9{0}\u306E\u4ED6\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u547C\u3073\u51FA\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.first.statement.must.be.call.to.another.constructor=コンストラクタが標準でないため、先頭文がクラス{0}の他のコンストラクタを呼び出す必要があります
 
-compiler.err.instance.initializer.not.allowed.in.records=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30A4\u30CB\u30B7\u30E3\u30E9\u30A4\u30B6\u306F\u30EC\u30B3\u30FC\u30C9\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.instance.initializer.not.allowed.in.records=インスタンス・イニシャライザはレコードでは使用できません
 
-compiler.err.static.declaration.not.allowed.in.inner.classes=\u9759\u7684\u5BA3\u8A00\u306F\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.static.declaration.not.allowed.in.inner.classes=静的宣言は内部クラスでは許可されません
 
-compiler.err.record.patterns.annotations.not.allowed=\u6CE8\u91C8\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30D1\u30BF\u30FC\u30F3\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.record.patterns.annotations.not.allowed=注釈はレコード・パターンでは許可されません
 
 ############################################
 # messages previously at javac.properties
 
-compiler.err.empty.A.argument=-A\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002''-Akey''\u307E\u305F\u306F''-Akey=value''\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
+compiler.err.empty.A.argument=-Aには引数が必要です。''-Akey''または''-Akey=value''を使用してください
 
 # 0: string
-compiler.err.invalid.A.key=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3''{0}''\u306E\u30AD\u30FC\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u4E00\u9023\u306E\u8B58\u5225\u5B50\u304C\u3001\u30C9\u30C3\u30C8\u3067\u533A\u5207\u3089\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.invalid.A.key=注釈プロセッサ・オプション''{0}''のキーに指定されている一連の識別子が、ドットで区切られていません
 
 # 0: string
-compiler.err.invalid.flag={0}\u306F\u7121\u52B9\u306A\u30D5\u30E9\u30B0\u3067\u3059
+compiler.err.invalid.flag={0}は無効なフラグです
 
-compiler.err.profile.bootclasspath.conflict=profile\u3068bootclasspath\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u540C\u6642\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.profile.bootclasspath.conflict=profileとbootclasspathオプションは同時に使用できません
 
 # 0: string
-compiler.err.invalid.profile=\u7121\u52B9\u306A\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB: {0}
+compiler.err.invalid.profile=無効なプロファイル: {0}
 
 # 0: string
-compiler.err.invalid.target={0}\u306F\u7121\u52B9\u306A\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u3059
+compiler.err.invalid.target={0}は無効なターゲット・リリースです
 
 # 0: option name, 1: target
-compiler.err.option.not.allowed.with.target=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306F\u30BF\u30FC\u30B2\u30C3\u30C8{1}\u3068\u3068\u3082\u306B\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093
+compiler.err.option.not.allowed.with.target=オプション{0}はターゲット{1}とともに指定できません
 
 # 0: string
-compiler.err.option.too.many=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u3092\u6307\u5B9A\u3067\u304D\u308B\u306E\u306F1\u56DE\u306E\u307F\u3067\u3059
+compiler.err.option.too.many=オプション{0}を指定できるのは1回のみです
 
-compiler.err.no.source.files=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.no.source.files=ソース・ファイルがありません
 
-compiler.err.no.source.files.classes=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30AF\u30E9\u30B9\u540D\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.no.source.files.classes=ソース・ファイルまたはクラス名がありません
 
 # 0: string
-compiler.err.req.arg={0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059
+compiler.err.req.arg={0}には引数が必要です
 
 # 0: string
-compiler.err.invalid.source={0}\u306F\u7121\u52B9\u306A\u30BD\u30FC\u30B9\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u3059
+compiler.err.invalid.source={0}は無効なソース・リリースです
 
 # 0: string, 1: string
-compiler.err.error.writing.file={0}\u306E\u66F8\u8FBC\u307F\u30A8\u30E9\u30FC\u3067\u3059\u3002{1}
+compiler.err.error.writing.file={0}の書込みエラーです。{1}
 
-compiler.err.sourcepath.modulesourcepath.conflict=--source-path\u3068--module-source-path\u306E\u4E21\u65B9\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093
+compiler.err.sourcepath.modulesourcepath.conflict=--source-pathと--module-source-pathの両方を指定できません
 
 # 0: string, 1: target
-compiler.warn.source.target.conflict=\u30BD\u30FC\u30B9\u30FB\u30EA\u30EA\u30FC\u30B9{0}\u306B\u306F\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30EA\u30EA\u30FC\u30B9{1}\u304C\u5FC5\u8981\u3067\u3059
+compiler.warn.source.target.conflict=ソース・リリース{0}にはターゲット・リリース{1}が必要です
 
 # 0: string, 1: target
-compiler.warn.target.default.source.conflict=\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30EA\u30EA\u30FC\u30B9{0}\u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30BD\u30FC\u30B9\u30FB\u30EA\u30EA\u30FC\u30B9{1}\u3068\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059
+compiler.warn.target.default.source.conflict=ターゲット・リリース{0}がデフォルトのソース・リリース{1}と競合しています
 
 # 0: profile, 1: target
-compiler.warn.profile.target.conflict=\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB{0}\u306F\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30EA\u30EA\u30FC\u30B9{1}\u306B\u5BFE\u3057\u3066\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.warn.profile.target.conflict=プロファイル{0}はターゲット・リリース{1}に対して有効ではありません
 
 # 0: string
-compiler.err.file.not.directory=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0}
+compiler.err.file.not.directory=ディレクトリではありません: {0}
 
 # 0: object
-compiler.err.file.not.file=\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0}
+compiler.err.file.not.file=ファイルではありません: {0}
 
-compiler.err.two.class.loaders.1=javac\u304C\u8907\u6570\u306E\u30AF\u30E9\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u9593\u3067\u5206\u5272\u3055\u308C\u3066\u3044\u307E\u3059: \u69CB\u6210\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044
+compiler.err.two.class.loaders.1=javacが複数のクラス・ローダー間で分割されています: 構成を確認してください
 
 # 0: url, 1: url
-compiler.err.two.class.loaders.2=javac\u304C\u8907\u6570\u306E\u30AF\u30E9\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u9593\u3067\u5206\u5272\u3055\u308C\u3066\u3044\u307E\u3059:\n\u30AF\u30E9\u30B9\u306E\u53D6\u5F97\u5143\u30D5\u30A1\u30A4\u30EB: {0}\njavac\u306E\u53D6\u5F97\u5143: {1}
+compiler.err.two.class.loaders.2=javacが複数のクラス・ローダー間で分割されています:\nクラスの取得元ファイル: {0}\njavacの取得元: {1}
 
 # 0: string, 1: string
-compiler.err.bad.value.for.option={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: ''{1}''
+compiler.err.bad.value.for.option={0}オプションの値が不正です: ''{1}''
 
 # 0: string
-compiler.err.no.value.for.option={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5024\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.no.value.for.option={0}オプションの値がありません
 
 # 0: string
-compiler.err.repeated.value.for.patch.module=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306B\u5BFE\u3057\u3066--patch-module\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.repeated.value.for.patch.module=モジュール{0}に対して--patch-moduleが複数回指定されています
 
 # 0: string
-compiler.err.repeated.value.for.module.source.path=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306B\u5BFE\u3057\u3066--module-source-path\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.repeated.value.for.module.source.path=モジュール{0}に対して--module-source-pathが複数回指定されています
 
-compiler.err.multiple.values.for.module.source.path=\u30D1\u30BF\u30FC\u30F3\u5F15\u6570\u3067--module-source-path\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.multiple.values.for.module.source.path=パターン引数で--module-source-pathが複数回指定されています
 
 # 0: string
-compiler.err.unmatched.quote=\u74B0\u5883\u5909\u6570{0}\u306E\u5F15\u7528\u7B26\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093
+compiler.err.unmatched.quote=環境変数{0}の引用符が一致しません
 
 # 0: option name
-compiler.err.release.bootclasspath.conflict=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306F--release\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.release.bootclasspath.conflict=オプション{0}は--releaseと一緒に使用できません
 
 # 0: string
-compiler.err.unsupported.release.version=\u30EA\u30EA\u30FC\u30B9\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3{0}\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.unsupported.release.version=リリース・バージョン{0}はサポートされていません
 
 # 0: string
-compiler.err.file.not.found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
+compiler.err.file.not.found=ファイルが見つかりません: {0}
 
 # 0: string, 1: source
-compiler.err.preview.not.latest=--enable-preview\u304C\u6307\u5B9A\u3055\u308C\u305F\u30BD\u30FC\u30B9\u30FB\u30EA\u30EA\u30FC\u30B9{0}\u306F\u7121\u52B9\u3067\u3059\n(\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u306F\u30EA\u30EA\u30FC\u30B9{1}\u3067\u306E\u307F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059)
+compiler.err.preview.not.latest=--enable-previewが指定されたソース・リリース{0}は無効です\n(プレビュー言語機能はリリース{1}でのみサポートされています)
 
-compiler.err.preview.without.source.or.release=--enable-preview\u306F-source\u307E\u305F\u306F--release\u3068\u3068\u3082\u306B\u4F7F\u7528\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.preview.without.source.or.release=--enable-previewは-sourceまたは--releaseとともに使用する必要があります
 
 # 0: symbol
-compiler.err.deconstruction.pattern.only.records=\u30C7\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30B7\u30E7\u30F3\u30FB\u30D1\u30BF\u30FC\u30F3\u306F\u30EC\u30B3\u30FC\u30C9\u306B\u306E\u307F\u9069\u7528\u3067\u304D\u307E\u3059\u3002{0}\u306F\u30EC\u30B3\u30FC\u30C9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.deconstruction.pattern.only.records=デコンストラクション・パターンはレコードにのみ適用できます。{0}はレコードではありません
 
-compiler.err.deconstruction.pattern.var.not.allowed=\u30C7\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30B7\u30E7\u30F3\u30FB\u30D1\u30BF\u30FC\u30F3\u306F\u30EC\u30B3\u30FC\u30C9\u306B\u306E\u307F\u9069\u7528\u3067\u304D\u307E\u3059\u3002var\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.deconstruction.pattern.var.not.allowed=デコンストラクション・パターンはレコードにのみ適用できます。varは許可されません
 
 # 0: list of type, 1: list of type
-compiler.err.incorrect.number.of.nested.patterns=\u30CD\u30B9\u30C8\u30FB\u30D1\u30BF\u30FC\u30F3\u306E\u6570\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093\n\u671F\u5F85\u5024: {0}\n\u691C\u51FA\u5024: {1}
+compiler.err.incorrect.number.of.nested.patterns=ネスト・パターンの数が正しくありません\n期待値: {0}\n検出値: {1}
 
 # 0: kind name, 1: symbol
-compiler.warn.declared.using.preview={0} {1}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u304A\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+compiler.warn.declared.using.preview={0} {1}はプレビュー機能を使用して宣言されており、今後のリリースで削除される可能性があります。
 
-compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\u5024\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3067\u540C\u671F\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F
+compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=値ベース・クラスのインスタンスで同期しようとしました
 
 # 0: type
-compiler.err.enclosing.class.type.non.denotable=\u5305\u542B\u3059\u308B\u30AF\u30E9\u30B9\u578B: {0}\n\u306F\u975E\u578B\u6307\u5B9A\u3067\u3059\u3002\u578B\u6307\u5B9A\u578B\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u3066\u307F\u3066\u304F\u3060\u3055\u3044
+compiler.err.enclosing.class.type.non.denotable=包含するクラス型: {0}\nは非型指定です。型指定型にキャストしてみてください
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
index 2418e4d13e2..4d1174572e4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
@@ -88,731 +88,731 @@
 ##
 
 # 0: symbol
-compiler.err.abstract.cant.be.instantiated={0}\u662F\u62BD\u8C61\u7684; \u65E0\u6CD5\u5B9E\u4F8B\u5316
+compiler.err.abstract.cant.be.instantiated={0}是抽象的; 无法实例化
 
-compiler.err.abstract.meth.cant.have.body=\u62BD\u8C61\u65B9\u6CD5\u4E0D\u80FD\u6709\u4E3B\u4F53
+compiler.err.abstract.meth.cant.have.body=抽象方法不能有主体
 
 # 0: kind name, 1: symbol
-compiler.err.already.annotated={0} {1}\u5DF2\u8FDB\u884C\u6CE8\u91CA
+compiler.err.already.annotated={0} {1}已进行注释
 
 # 0: kind name, 1: symbol, 2: kind name, 3: symbol
-compiler.err.already.defined=\u5DF2\u5728{2} {3}\u4E2D\u5B9A\u4E49\u4E86{0} {1}
+compiler.err.already.defined=已在{2} {3}中定义了{0} {1}
 
 # 0: kind name, 1: symbol, 2: kind name, 3: kind name, 4: symbol
-compiler.err.already.defined.in.clinit=\u5DF2\u5728{3} {4}\u7684{2}\u4E2D\u5B9A\u4E49\u4E86{0} {1}
+compiler.err.already.defined.in.clinit=已在{3} {4}的{2}中定义了{0} {1}
 
 # 0: symbol
-compiler.err.already.defined.single.import={0}\u7684 single-type-import \u5DF2\u5B9A\u4E49\u5177\u6709\u76F8\u540C\u7B80\u540D\u7684\u7C7B\u578B
+compiler.err.already.defined.single.import={0}的 single-type-import 已定义具有相同简名的类型
 
 # 0: symbol
-compiler.err.already.defined.static.single.import={0}\u7684\u9759\u6001 single-type-import \u5DF2\u5B9A\u4E49\u5177\u6709\u76F8\u540C\u7B80\u540D\u7684\u7C7B\u578B
+compiler.err.already.defined.static.single.import={0}的静态 single-type-import 已定义具有相同简名的类型
 
 # 0: symbol
-compiler.err.already.defined.this.unit=\u5DF2\u5728\u8BE5\u7F16\u8BD1\u5355\u5143\u4E2D\u5B9A\u4E49{0}
+compiler.err.already.defined.this.unit=已在该编译单元中定义{0}
 
-compiler.err.annotation.missing.element.value=\u6279\u6CE8\u7F3A\u5C11\u5143\u7D20\u503C
+compiler.err.annotation.missing.element.value=批注缺少元素值
 
 # 0: type, 1: list of name
-compiler.err.annotation.missing.default.value=\u5BF9\u4E8E\u5143\u7D20 ''{1}'', \u6279\u6CE8 @{0} \u7F3A\u5C11\u9ED8\u8BA4\u503C
+compiler.err.annotation.missing.default.value=对于元素 ''{1}'', 批注 @{0} 缺少默认值
 
 # 0: type, 1: list of name
-compiler.err.annotation.missing.default.value.1=\u5BF9\u4E8E\u5143\u7D20{1}, \u6279\u6CE8 @{0} \u7F3A\u5C11\u9ED8\u8BA4\u503C
+compiler.err.annotation.missing.default.value.1=对于元素{1}, 批注 @{0} 缺少默认值
 
 # 0: type
-compiler.err.annotation.not.valid.for.type=\u6279\u6CE8\u5BF9\u4E8E\u7C7B\u578B{0}\u7684\u5143\u7D20\u65E0\u6548
+compiler.err.annotation.not.valid.for.type=批注对于类型{0}的元素无效
 
-compiler.err.annotation.type.not.applicable=\u6279\u6CE8\u63A5\u53E3\u4E0D\u9002\u7528\u4E8E\u6B64\u7C7B\u578B\u7684\u58F0\u660E
+compiler.err.annotation.type.not.applicable=批注接口不适用于此类型的声明
 
 # 0: type
-compiler.err.annotation.type.not.applicable.to.type=\u6279\u6CE8 @{0} \u5728\u6B64\u7C7B\u578B\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u9002\u7528
+compiler.err.annotation.type.not.applicable.to.type=批注 @{0} 在此类型上下文中不适用
 
-compiler.err.annotation.value.must.be.annotation=\u6279\u6CE8\u503C\u5FC5\u987B\u4E3A\u6279\u6CE8
+compiler.err.annotation.value.must.be.annotation=批注值必须为批注
 
-compiler.err.annotation.value.must.be.class.literal=\u6279\u6CE8\u503C\u5FC5\u987B\u4E3A\u7C7B\u6587\u5B57
+compiler.err.annotation.value.must.be.class.literal=批注值必须为类文字
 
-compiler.err.annotation.value.must.be.name.value=\u6279\u6CE8\u503C\u5FC5\u987B\u91C7\u7528 ''name=value'' \u683C\u5F0F
+compiler.err.annotation.value.must.be.name.value=批注值必须采用 ''name=value'' 格式
 
-compiler.err.annotation.value.not.allowable.type=\u6279\u6CE8\u503C\u4E0D\u662F\u5141\u8BB8\u7684\u7C7B\u578B
+compiler.err.annotation.value.not.allowable.type=批注值不是允许的类型
 
-compiler.err.expression.not.allowable.as.annotation.value=\u8868\u8FBE\u5F0F\u4E0D\u5141\u8BB8\u7528\u4F5C\u6279\u6CE8\u503C
+compiler.err.expression.not.allowable.as.annotation.value=表达式不允许用作批注值
 
 # 0: type, 1: name
-compiler.err.annotation.unrecognized.attribute.name=\u6279\u6CE8 @{0} \u5177\u6709\u540D\u4E3A ''{1}'' \u7684\u672A\u77E5\u5C5E\u6027
+compiler.err.annotation.unrecognized.attribute.name=批注 @{0} 具有名为 ''{1}'' 的未知属性
 
-compiler.err.anon.class.impl.intf.no.args=\u533F\u540D\u7C7B\u5B9E\u73B0\u63A5\u53E3; \u4E0D\u80FD\u6709\u53C2\u6570
+compiler.err.anon.class.impl.intf.no.args=匿名类实现接口; 不能有参数
 
-compiler.err.anon.class.impl.intf.no.typeargs=\u533F\u540D\u7C7B\u5B9E\u73B0\u63A5\u53E3; \u4E0D\u80FD\u5177\u6709\u7C7B\u578B\u53C2\u6570
+compiler.err.anon.class.impl.intf.no.typeargs=匿名类实现接口; 不能具有类型参数
 
-compiler.err.anon.class.impl.intf.no.qual.for.new=\u533F\u540D\u7C7B\u5B9E\u73B0\u63A5\u53E3; \u4E0D\u80FD\u6709\u9650\u5B9A\u7B26 - \u5BF9\u4E8E\u65B0
+compiler.err.anon.class.impl.intf.no.qual.for.new=匿名类实现接口; 不能有限定符 - 对于新
 
-compiler.err.cant.inherit.from.anon=\u65E0\u6CD5\u4ECE\u533F\u540D\u7C7B\u7EE7\u627F
+compiler.err.cant.inherit.from.anon=无法从匿名类继承
 
 # 0: symbol, 1: symbol, 2: symbol
-compiler.err.array.and.varargs=\u65E0\u6CD5\u5728{2}\u4E2D\u540C\u65F6\u58F0\u660E{0}\u548C{1}
+compiler.err.array.and.varargs=无法在{2}中同时声明{0}和{1}
 
-compiler.err.array.dimension.missing=\u7F3A\u5C11\u6570\u7EC4\u7EF4
+compiler.err.array.dimension.missing=缺少数组维
 
-compiler.err.illegal.array.creation.both.dimension.and.initialization=\u540C\u65F6\u4F7F\u7528\u7EF4\u8868\u8FBE\u5F0F\u548C\u521D\u59CB\u5316\u521B\u5EFA\u6570\u7EC4\u662F\u975E\u6CD5\u7684
+compiler.err.illegal.array.creation.both.dimension.and.initialization=同时使用维表达式和初始化创建数组是非法的
 
 # 0: type
-compiler.err.array.req.but.found=\u9700\u8981\u6570\u7EC4, \u4F46\u627E\u5230{0}
+compiler.err.array.req.but.found=需要数组, 但找到{0}
 
-compiler.err.attribute.value.must.be.constant=\u5143\u7D20\u503C\u5FC5\u987B\u4E3A\u5E38\u91CF\u8868\u8FBE\u5F0F
+compiler.err.attribute.value.must.be.constant=元素值必须为常量表达式
 
 # 0: string (statement type)
-compiler.err.bad.initializer={0}\u7684\u521D\u59CB\u5316\u7A0B\u5E8F\u9519\u8BEF
+compiler.err.bad.initializer={0}的初始化程序错误
 
-compiler.err.break.outside.switch.loop=\u5728 switch \u6216 loop \u5916\u90E8\u4E2D\u65AD
+compiler.err.break.outside.switch.loop=在 switch 或 loop 外部中断
 
-compiler.err.break.outside.switch.expression=\u5C1D\u8BD5\u4ECE switch \u8868\u8FBE\u5F0F\u4E2D\u65AD
+compiler.err.break.outside.switch.expression=尝试从 switch 表达式中断
 
-compiler.err.continue.outside.switch.expression=\u5C1D\u8BD5\u4ECE switch \u8868\u8FBE\u5F0F\u7EE7\u7EED
+compiler.err.continue.outside.switch.expression=尝试从 switch 表达式继续
 
-compiler.err.return.outside.switch.expression=\u5C1D\u8BD5\u4ECE switch \u8868\u8FBE\u5F0F\u8FD4\u56DE
+compiler.err.return.outside.switch.expression=尝试从 switch 表达式返回
 
-compiler.err.rule.completes.normally=switch \u89C4\u5219\u5B8C\u7ED3\u4F46\u6CA1\u6709\u63D0\u4F9B\u503C\n\uFF08switch \u8868\u8FBE\u5F0F\u4E2D\u7684 switch \u89C4\u5219\u5FC5\u987B\u63D0\u4F9B\u503C\u6216\u629B\u51FA\uFF09
+compiler.err.rule.completes.normally=switch 规则完结但没有提供值\n（switch 表达式中的 switch 规则必须提供值或抛出）
 
-compiler.err.switch.expression.completes.normally=switch \u8868\u8FBE\u5F0F\u5B8C\u7ED3\u4F46\u6CA1\u6709\u63D0\u4F9B\u503C\n\uFF08switch \u8868\u8FBE\u5F0F\u5FC5\u987B\u4E3A\u6240\u6709\u53EF\u80FD\u7684\u8F93\u5165\u503C\u63D0\u4F9B\u503C\u6216\u629B\u51FA\uFF09
+compiler.err.switch.expression.completes.normally=switch 表达式完结但没有提供值\n（switch 表达式必须为所有可能的输入值提供值或抛出）
 
-compiler.err.no.switch.expression =yield \u5728 switch \u8868\u8FBE\u5F0F\u5916\u90E8
+compiler.err.no.switch.expression =yield 在 switch 表达式外部
 
-compiler.err.no.switch.expression.qualify=yield \u5728 switch \u8868\u8FBE\u5F0F\u5916\u90E8\n\uFF08\u8981\u8C03\u7528\u79F0\u4E3A yield \u7684\u65B9\u6CD5\uFF0C\u8BF7\u901A\u8FC7\u63A5\u6536\u65B9\u6216\u7C7B\u578B\u540D\u79F0\u9650\u5B9A yield\uFF09
+compiler.err.no.switch.expression.qualify=yield 在 switch 表达式外部\n（要调用称为 yield 的方法，请通过接收方或类型名称限定 yield）
 
-compiler.err.invalid.yield=\u53D7\u9650\u6807\u8BC6\u7B26 ''yield'' \u7684\u7528\u6CD5\u65E0\u6548\n\uFF08\u8981\u8C03\u7528\u79F0\u4E3A yield \u7684\u65B9\u6CD5\uFF0C\u8BF7\u901A\u8FC7\u63A5\u6536\u65B9\u6216\u7C7B\u578B\u540D\u79F0\u9650\u5B9A yield\uFF09
+compiler.err.invalid.yield=受限标识符 ''yield'' 的用法无效\n（要调用称为 yield 的方法，请通过接收方或类型名称限定 yield）
 
-compiler.warn.invalid.yield=''yield'' \u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u53EF\u80FD\u4F1A\u6210\u4E3A\u53D7\u9650\u6807\u8BC6\u7B26\n\uFF08\u8981\u8C03\u7528\u79F0\u4E3A yield \u7684\u65B9\u6CD5\uFF0C\u8BF7\u901A\u8FC7\u63A5\u6536\u65B9\u6216\u7C7B\u578B\u540D\u79F0\u9650\u5B9A yield\uFF09
+compiler.warn.invalid.yield=''yield'' 在未来发行版中可能会成为受限标识符\n（要调用称为 yield 的方法，请通过接收方或类型名称限定 yield）
 
-compiler.err.switch.expression.empty=switch \u8868\u8FBE\u5F0F\u4E2D\u6CA1\u6709\u4EFB\u4F55 case \u5B50\u53E5
+compiler.err.switch.expression.empty=switch 表达式中没有任何 case 子句
 
-compiler.err.switch.expression.no.result.expressions=switch \u8868\u8FBE\u5F0F\u6CA1\u6709\u4EFB\u4F55\u7ED3\u679C\u8868\u8FBE\u5F0F
+compiler.err.switch.expression.no.result.expressions=switch 表达式没有任何结果表达式
 
 # 0: name
-compiler.err.call.must.be.first.stmt.in.ctor=\u5BF9{0}\u7684\u8C03\u7528\u5FC5\u987B\u662F\u6784\u9020\u5668\u4E2D\u7684\u7B2C\u4E00\u4E2A\u8BED\u53E5
+compiler.err.call.must.be.first.stmt.in.ctor=对{0}的调用必须是构造器中的第一个语句
 
 # 0: symbol kind, 1: name, 2: symbol kind, 3: type, 4: message segment
-compiler.err.cant.apply.symbol.noargs=\u65E0\u6CD5\u5C06 {2} {3} \u4E2D\u7684 {0} {1} \u5E94\u7528\u4E8E\u7ED9\u5B9A\u7C7B\u578B\uFF1B\n\u539F\u56E0\uFF1A{4}
+compiler.err.cant.apply.symbol.noargs=无法将 {2} {3} 中的 {0} {1} 应用于给定类型；\n原因：{4}
 
 # 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
-compiler.err.cant.apply.symbol=\u65E0\u6CD5\u5C06{4} {5}\u4E2D\u7684{0} {1}\u5E94\u7528\u5230\u7ED9\u5B9A\u7C7B\u578B;\n\u9700\u8981: {2}\n\u627E\u5230:    {3}\n\u539F\u56E0: {6}
+compiler.err.cant.apply.symbol=无法将{4} {5}中的{0} {1}应用到给定类型;\n需要: {2}\n找到:    {3}\n原因: {6}
 
 # 0: symbol kind, 1: name, 2: list of type
-compiler.err.cant.apply.symbols=\u5BF9\u4E8E{1}({2}), \u627E\u4E0D\u5230\u5408\u9002\u7684{0}
+compiler.err.cant.apply.symbols=对于{1}({2}), 找不到合适的{0}
 
 # 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
-compiler.misc.cant.apply.symbol=\u65E0\u6CD5\u5C06 {4} {5}\u4E2D\u7684 {0} {1}\u5E94\u7528\u5230\u7ED9\u5B9A\u7C7B\u578B\n\u9700\u8981: {2}\n\u627E\u5230:    {3}\n\u539F\u56E0: {6}
+compiler.misc.cant.apply.symbol=无法将 {4} {5}中的 {0} {1}应用到给定类型\n需要: {2}\n找到:    {3}\n原因: {6}
 
 # 0: list of type or message segment, 1: list of type or message segment, 2: message segment
-compiler.misc.cant.apply.array.ctor=\u65E0\u6CD5\u57FA\u4E8E\u7ED9\u5B9A\u7C7B\u578B\u521B\u5EFA\u6570\u7EC4\n\u9700\u8981\uFF1A{0}\n\u627E\u5230\uFF1A{1}\n\u539F\u56E0\uFF1A{2}
+compiler.misc.cant.apply.array.ctor=无法基于给定类型创建数组\n需要：{0}\n找到：{1}\n原因：{2}
 
 # 0: symbol kind, 1: name, 2: list of type
-compiler.misc.cant.apply.symbols=\u5BF9\u4E8E{1}({2}), \u627E\u4E0D\u5230\u5408\u9002\u7684{0}
+compiler.misc.cant.apply.symbols=对于{1}({2}), 找不到合适的{0}
 
 # 0: kind name, 1: symbol
-compiler.misc.no.abstracts=\u5728 {0} {1} \u4E2D\u627E\u4E0D\u5230\u62BD\u8C61\u65B9\u6CD5
+compiler.misc.no.abstracts=在 {0} {1} 中找不到抽象方法
 
 # 0: kind name, 1: symbol
-compiler.misc.incompatible.abstracts=\u5728 {0} {1} \u4E2D\u627E\u5230\u591A\u4E2A\u975E\u8986\u76D6\u62BD\u8C61\u65B9\u6CD5
+compiler.misc.incompatible.abstracts=在 {0} {1} 中找到多个非覆盖抽象方法
 
-compiler.err.bad.functional.intf.anno=\u610F\u5916\u7684 @FunctionalInterface \u6279\u6CE8
+compiler.err.bad.functional.intf.anno=意外的 @FunctionalInterface 批注
 
 # 0: message segment
-compiler.err.bad.functional.intf.anno.1=\u610F\u5916\u7684 @FunctionalInterface \u6279\u6CE8\n{0}
+compiler.err.bad.functional.intf.anno.1=意外的 @FunctionalInterface 批注\n{0}
 
 # 0: message segment
-compiler.err.anonymous.diamond.method.does.not.override.superclass=\u65B9\u6CD5\u4E0D\u4F1A\u8986\u76D6\u6216\u5B9E\u73B0\u8D85\u7C7B\u578B\u4E2D\u7684\u65B9\u6CD5\n{0}
+compiler.err.anonymous.diamond.method.does.not.override.superclass=方法不会覆盖或实现超类型中的方法\n{0}
 
 # 0: symbol
-compiler.misc.not.a.functional.intf={0} \u4E0D\u662F\u51FD\u6570\u63A5\u53E3
+compiler.misc.not.a.functional.intf={0} 不是函数接口
 
 # 0: symbol, 1: message segment
-compiler.misc.not.a.functional.intf.1={0} \u4E0D\u662F\u51FD\u6570\u63A5\u53E3\n{1}
+compiler.misc.not.a.functional.intf.1={0} 不是函数接口\n{1}
 
 # 0: type, 1: kind name, 2: symbol
-compiler.misc.invalid.generic.lambda.target=lambda \u8868\u8FBE\u5F0F\u7684\u51FD\u6570\u63CF\u8FF0\u7B26\u65E0\u6548\n{1} {2} \u4E2D\u7684\u65B9\u6CD5 {0} \u4E3A\u6CDB\u578B\u65B9\u6CD5
+compiler.misc.invalid.generic.lambda.target=lambda 表达式的函数描述符无效\n{1} {2} 中的方法 {0} 为泛型方法
 
 # 0: kind name, 1: symbol
-compiler.misc.incompatible.descs.in.functional.intf=\u5728 {0} {1} \u4E2D\u627E\u5230\u4E0D\u517C\u5BB9\u7684\u51FD\u6570\u63CF\u8FF0\u7B26
+compiler.misc.incompatible.descs.in.functional.intf=在 {0} {1} 中找到不兼容的函数描述符
 
 # 0: name, 1: list of type, 2: type, 3: list of type
-compiler.misc.descriptor=\u63CF\u8FF0\u7B26: {2} {0}({1})
+compiler.misc.descriptor=描述符: {2} {0}({1})
 
 # 0: name, 1: list of type, 2: type, 3: list of type
-compiler.misc.descriptor.throws=\u63CF\u8FF0\u7B26: {2} {0}({1}) \u629B\u51FA{3}
+compiler.misc.descriptor.throws=描述符: {2} {0}({1}) 抛出{3}
 
 # 0: type
-compiler.misc.no.suitable.functional.intf.inst=\u65E0\u6CD5\u63A8\u65AD{0}\u7684\u51FD\u6570\u63A5\u53E3\u63CF\u8FF0\u7B26
+compiler.misc.no.suitable.functional.intf.inst=无法推断{0}的函数接口描述符
 
 # 0: message segment
-compiler.misc.bad.intersection.target.for.functional.expr=lambda \u6216\u65B9\u6CD5\u5F15\u7528\u7684\u4EA4\u53C9\u7C7B\u578B\u76EE\u6807\u9519\u8BEF\n{0}
+compiler.misc.bad.intersection.target.for.functional.expr=lambda 或方法引用的交叉类型目标错误\n{0}
 
 # 0: symbol or type
-compiler.misc.not.an.intf.component=\u7EC4\u4EF6\u7C7B\u578B{0}\u4E0D\u662F\u63A5\u53E3
+compiler.misc.not.an.intf.component=组件类型{0}不是接口
 
 # 0: kind name, 1: message segment
-compiler.err.invalid.mref={0}\u5F15\u7528\u65E0\u6548\n{1}
+compiler.err.invalid.mref={0}引用无效\n{1}
 
 # 0: kind name, 1: message segment
-compiler.misc.invalid.mref={0}\u5F15\u7528\u65E0\u6548\n{1}
+compiler.misc.invalid.mref={0}引用无效\n{1}
 
-compiler.misc.static.mref.with.targs=\u6709\u5173\u9759\u6001\u65B9\u6CD5\u5F15\u7528\u7684\u53C2\u6570\u5316\u9650\u5B9A\u7B26
+compiler.misc.static.mref.with.targs=有关静态方法引用的参数化限定符
 
 # 0: set of flag or string, 1: symbol
-compiler.err.cant.assign.val.to.var=\u65E0\u6CD5\u4E3A {0} \u53D8\u91CF {1} \u5206\u914D\u503C
+compiler.err.cant.assign.val.to.var=无法为 {0} 变量 {1} 分配值
 
-compiler.err.cant.assign.val.to.this=\u65E0\u6CD5\u5206\u914D\u7ED9 ''this''
+compiler.err.cant.assign.val.to.this=无法分配给 ''this''
 
 # 0: symbol, 1: message segment
-compiler.err.cant.ref.non.effectively.final.var=\u4ECE{1}\u5F15\u7528\u7684\u672C\u5730\u53D8\u91CF\u5FC5\u987B\u662F\u6700\u7EC8\u53D8\u91CF\u6216\u5B9E\u9645\u4E0A\u7684\u6700\u7EC8\u53D8\u91CF
+compiler.err.cant.ref.non.effectively.final.var=从{1}引用的本地变量必须是最终变量或实际上的最终变量
 
-compiler.err.try.with.resources.expr.needs.var=try-with-resources \u8D44\u6E90\u5FC5\u987B\u662F\u53D8\u91CF\u58F0\u660E, \u6216\u8005\u662F\u6307\u793A\u5BF9\u6700\u7EC8\u53D8\u91CF\u6216\u5B9E\u9645\u4E0A\u7684\u6700\u7EC8\u53D8\u91CF\u7684\u5F15\u7528\u7684\u8868\u8FBE\u5F0F
+compiler.err.try.with.resources.expr.needs.var=try-with-resources 资源必须是变量声明, 或者是指示对最终变量或实际上的最终变量的引用的表达式
 
 # 0: symbol
-compiler.err.try.with.resources.expr.effectively.final.var=\u7528\u4F5C try-with-resources \u8D44\u6E90\u7684\u53D8\u91CF {0} \u65E2\u4E0D\u662F\u6700\u7EC8\u53D8\u91CF, \u4E5F\u4E0D\u662F\u5B9E\u9645\u4E0A\u7684\u6700\u7EC8\u53D8\u91CF
+compiler.err.try.with.resources.expr.effectively.final.var=用作 try-with-resources 资源的变量 {0} 既不是最终变量, 也不是实际上的最终变量
 
 
-compiler.misc.lambda=lambda \u8868\u8FBE\u5F0F
+compiler.misc.lambda=lambda 表达式
 
-compiler.misc.inner.cls=\u5185\u90E8\u7C7B
+compiler.misc.inner.cls=内部类
 
-compiler.misc.guard=\u536B\u58EB
+compiler.misc.guard=卫士
 
 # 0: type
-compiler.err.cant.deref=\u65E0\u6CD5\u53D6\u6D88\u5F15\u7528{0}
+compiler.err.cant.deref=无法取消引用{0}
 
-compiler.err.cant.extend.intf.annotation=\u5BF9\u4E8E @interfaces, \u4E0D\u5141\u8BB8 ''extends''
+compiler.err.cant.extend.intf.annotation=对于 @interfaces, 不允许 ''extends''
 
-compiler.err.annotation.decl.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u6279\u6CE8\u63A5\u53E3\u58F0\u660E
+compiler.err.annotation.decl.not.allowed.here=此处不允许批注接口声明
 
 # 0: symbol
-compiler.err.cant.inherit.from.final=\u65E0\u6CD5\u4ECE\u6700\u7EC8{0}\u8FDB\u884C\u7EE7\u627F
+compiler.err.cant.inherit.from.final=无法从最终{0}进行继承
 
 # 0: symbol or string
-compiler.err.cant.ref.before.ctor.called=\u65E0\u6CD5\u5728\u8C03\u7528\u8D85\u7C7B\u578B\u6784\u9020\u5668\u4E4B\u524D\u5F15\u7528{0}
+compiler.err.cant.ref.before.ctor.called=无法在调用超类型构造器之前引用{0}
 
-compiler.err.cant.select.static.class.from.param.type=\u65E0\u6CD5\u4ECE\u53C2\u6570\u5316\u7684\u7C7B\u578B\u4E2D\u9009\u62E9\u9759\u6001\u7C7B
+compiler.err.cant.select.static.class.from.param.type=无法从参数化的类型中选择静态类
 
 # 0: symbol, 1: string, 2: string
-compiler.err.cant.inherit.diff.arg=\u65E0\u6CD5\u4F7F\u7528\u4EE5\u4E0B\u4E0D\u540C\u7684\u53C2\u6570\u7EE7\u627F{0}: <{1}> \u548C <{2}>
+compiler.err.cant.inherit.diff.arg=无法使用以下不同的参数继承{0}: <{1}> 和 <{2}>
 
-compiler.err.catch.without.try=\u6709 ''catch'', \u4F46\u662F\u6CA1\u6709 ''try''
+compiler.err.catch.without.try=有 ''catch'', 但是没有 ''try''
 
 # 0: kind name, 1: symbol
-compiler.err.clash.with.pkg.of.same.name={0} {1}\u4E0E\u5E26\u6709\u76F8\u540C\u540D\u79F0\u7684\u7A0B\u5E8F\u5305\u51B2\u7A81
+compiler.err.clash.with.pkg.of.same.name={0} {1}与带有相同名称的程序包冲突
 
-compiler.err.class.not.allowed=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B, \u63A5\u53E3\u6216\u679A\u4E3E\u58F0\u660E
+compiler.err.class.not.allowed=此处不允许使用类, 接口或枚举声明
 
-compiler.err.const.expr.req=\u9700\u8981\u5E38\u91CF\u8868\u8FBE\u5F0F
+compiler.err.const.expr.req=需要常量表达式
 
-compiler.err.pattern.or.enum.req=\u9700\u8981\u6A21\u5F0F\u6216\u679A\u4E3E\u5E38\u91CF
+compiler.err.pattern.or.enum.req=需要模式或枚举常量
 
-compiler.err.cont.outside.loop=continue \u5728 loop \u5916\u90E8
+compiler.err.cont.outside.loop=continue 在 loop 外部
 
 # 0: symbol or type
-compiler.err.cyclic.inheritance=\u6D89\u53CA{0}\u7684\u5FAA\u73AF\u7EE7\u627F
+compiler.err.cyclic.inheritance=涉及{0}的循环继承
 
 # 0: symbol
-compiler.err.cyclic.annotation.element=\u5143\u7D20 {0} \u7684\u7C7B\u578B\u4E3A\u5FAA\u73AF
+compiler.err.cyclic.annotation.element=元素 {0} 的类型为循环
 
 # 0: symbol
-compiler.err.call.to.super.not.allowed.in.enum.ctor=\u5728\u679A\u4E3E\u6784\u9020\u5668\u4E2D\u4E0D\u5141\u8BB8\u8C03\u7528\u8D85\u7C7B
+compiler.err.call.to.super.not.allowed.in.enum.ctor=在枚举构造器中不允许调用超类
 
 # 0: type
-compiler.err.no.superclass={0}\u4E0D\u5177\u6709\u8D85\u7C7B\u3002
+compiler.err.no.superclass={0}不具有超类。
 
 # 0: symbol, 1: type, 2: symbol, 3: type, 4: type
-compiler.err.concrete.inheritance.conflict={1}\u4E2D\u7684\u65B9\u6CD5{0}\u548C{3}\u4E2D\u7684\u65B9\u6CD5{2}\u662F\u4F7F\u7528\u76F8\u540C\u7684\u7B7E\u540D\u7EE7\u627F\u7684
+compiler.err.concrete.inheritance.conflict={1}中的方法{0}和{3}中的方法{2}是使用相同的签名继承的
 
-compiler.err.default.allowed.in.intf.annotation.member=\u6279\u6CE8\u63A5\u53E3\u58F0\u660E\u4E2D\u4EC5\u5141\u8BB8\u9ED8\u8BA4\u503C
+compiler.err.default.allowed.in.intf.annotation.member=批注接口声明中仅允许默认值
 
 # 0: symbol
-compiler.err.doesnt.exist=\u7A0B\u5E8F\u5305{0}\u4E0D\u5B58\u5728
+compiler.err.doesnt.exist=程序包{0}不存在
 
 # 0: type
-compiler.err.duplicate.annotation.invalid.repeated=\u6279\u6CE8{0}\u4E0D\u662F\u6709\u6548\u7684\u53EF\u91CD\u590D\u6279\u6CE8
+compiler.err.duplicate.annotation.invalid.repeated=批注{0}不是有效的可重复批注
 
 # 0: name, 1: type
-compiler.err.duplicate.annotation.member.value=\u6279\u6CE8@{1}\u4E2D\u7684\u5143\u7D20 ''{0}'' \u91CD\u590D\u3002
+compiler.err.duplicate.annotation.member.value=批注@{1}中的元素 ''{0}'' 重复。
 
 # 0: type
-compiler.err.duplicate.annotation.missing.container={0} \u4E0D\u662F\u53EF\u91CD\u590D\u7684\u6279\u6CE8\u63A5\u53E3
+compiler.err.duplicate.annotation.missing.container={0} 不是可重复的批注接口
 
 # 0: symbol
-compiler.err.invalid.repeatable.annotation=\u6279\u6CE8\u91CD\u590D: \u4F7F\u7528\u65E0\u6548\u7684 @Repeatable \u6279\u6CE8\u5BF9{0}\u8FDB\u884C\u4E86\u6279\u6CE8
+compiler.err.invalid.repeatable.annotation=批注重复: 使用无效的 @Repeatable 批注对{0}进行了批注
 
 # 0: symbol or type
-compiler.err.invalid.repeatable.annotation.no.value={0}\u4E0D\u662F\u6709\u6548\u7684 @Repeatable, \u672A\u58F0\u660E\u4EFB\u4F55\u503C\u5143\u7D20\u65B9\u6CD5
+compiler.err.invalid.repeatable.annotation.no.value={0}不是有效的 @Repeatable, 未声明任何值元素方法
 
 # 0: type, 1: number
-compiler.err.invalid.repeatable.annotation.multiple.values={0}\u4E0D\u662F\u6709\u6548\u7684 @Repeatable, \u5DF2\u58F0\u660E {1} \u4E2A\u540D\u4E3A ''value'' \u7684\u5143\u7D20\u65B9\u6CD5
+compiler.err.invalid.repeatable.annotation.multiple.values={0}不是有效的 @Repeatable, 已声明 {1} 个名为 ''value'' 的元素方法
 
 # 0: type
-compiler.err.invalid.repeatable.annotation.invalid.value={0}\u4E0D\u662F\u6709\u6548\u7684 @Repeatable: \u503C\u5143\u7D20\u65E0\u6548
+compiler.err.invalid.repeatable.annotation.invalid.value={0}不是有效的 @Repeatable: 值元素无效
 
 # 0: symbol or type, 1: type, 2: type
-compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u6279\u6CE8\u63A5\u53E3 ({0}) \u5FC5\u987B\u58F0\u660E\u7C7B\u578B {2} \u7684\u540D\u4E3A ''value'' \u7684\u5143\u7D20
+compiler.err.invalid.repeatable.annotation.value.return=包含批注接口 ({0}) 必须声明类型 {2} 的名为 ''value'' 的元素
 
 # 0: symbol or type, 1: symbol
-compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u6279\u6CE8\u63A5\u53E3 ({0}) \u6CA1\u6709\u5143\u7D20 {1} \u7684\u9ED8\u8BA4\u503C
+compiler.err.invalid.repeatable.annotation.elem.nondefault=包含批注接口 ({0}) 没有元素 {1} 的默认值
 
 # 0: symbol, 1: string, 2: symbol, 3: string
-compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u6279\u6CE8\u63A5\u53E3 ({0}) \u7684\u4FDD\u7559\u671F\u77ED\u4E8E\u53EF\u91CD\u590D\u6279\u6CE8\u63A5\u53E3 ({2}) \u7684\u4FDD\u7559\u671F
+compiler.err.invalid.repeatable.annotation.retention=包含批注接口 ({0}) 的保留期短于可重复批注接口 ({2}) 的保留期
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.documented=\u53EF\u91CD\u590D\u6279\u6CE8\u63A5\u53E3 ({1}) \u662F @Documented\uFF0C\u800C\u5305\u542B\u6279\u6CE8\u63A5\u53E3 ({0}) \u5219\u4E0D\u662F
+compiler.err.invalid.repeatable.annotation.not.documented=可重复批注接口 ({1}) 是 @Documented，而包含批注接口 ({0}) 则不是
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.inherited=\u53EF\u91CD\u590D\u6279\u6CE8\u63A5\u53E3 ({1}) \u662F @Inherited\uFF0C\u800C\u5305\u542B\u6279\u6CE8\u63A5\u53E3 ({0}) \u5219\u4E0D\u662F
+compiler.err.invalid.repeatable.annotation.not.inherited=可重复批注接口 ({1}) 是 @Inherited，而包含批注接口 ({0}) 则不是
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u6279\u6CE8\u63A5\u53E3 ({0}) \u9002\u7528\u7684\u76EE\u6807\u591A\u4E8E\u53EF\u91CD\u590D\u6279\u6CE8\u63A5\u53E3 ({1})
+compiler.err.invalid.repeatable.annotation.incompatible.target=包含批注接口 ({0}) 适用的目标多于可重复批注接口 ({1})
 
 # 0: symbol
-compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\u5BB9\u5668 {0} \u4E0D\u5F97\u4E0E\u5176\u5305\u542B\u7684\u5143\u7D20\u540C\u65F6\u5B58\u5728
+compiler.err.invalid.repeatable.annotation.repeated.and.container.present=容器 {0} 不得与其包含的元素同时存在
 
 # 0: type, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.applicable=\u5BB9\u5668{0}\u4E0D\u9002\u7528\u4E8E\u5143\u7D20 {1}
+compiler.err.invalid.repeatable.annotation.not.applicable=容器{0}不适用于元素 {1}
 
 # 0: type
-compiler.err.invalid.repeatable.annotation.not.applicable.in.context=\u5BB9\u5668{0}\u5728\u6B64\u7C7B\u578B\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u9002\u7528
+compiler.err.invalid.repeatable.annotation.not.applicable.in.context=容器{0}在此类型上下文中不适用
 
 # 0: name
-compiler.err.duplicate.class=\u7C7B\u91CD\u590D: {0}
+compiler.err.duplicate.class=类重复: {0}
 
 # 0: string
-compiler.err.bad.file.name=\u6587\u4EF6\u540D\u9519\u8BEF\uFF1A{0}
+compiler.err.bad.file.name=文件名错误：{0}
 
-compiler.err.unnamed.class.should.not.have.package.declaration=\u672A\u547D\u540D\u7C7B\u4E0D\u5E94\u6709\u7A0B\u5E8F\u5305\u58F0\u660E
+compiler.err.unnamed.class.should.not.have.package.declaration=未命名类不应有程序包声明
 
-compiler.err.unnamed.class.does.not.have.main.method=\u672A\u547D\u540D\u7C7B\u6CA1\u6709 void main() \u6216 void main(String[] args) \u5F62\u5F0F\u7684 main \u65B9\u6CD5
+compiler.err.unnamed.class.does.not.have.main.method=未命名类没有 void main() 或 void main(String[] args) 形式的 main 方法
 
 # 0: name, 1: name
-compiler.err.same.binary.name=\u7C7B\uFF1A{0} \u548C {1} \u5177\u6709\u76F8\u540C\u7684\u4E8C\u8FDB\u5236\u540D\u79F0
+compiler.err.same.binary.name=类：{0} 和 {1} 具有相同的二进制名称
 
-compiler.err.duplicate.case.label=case \u6807\u7B7E\u91CD\u590D
+compiler.err.duplicate.case.label=case 标签重复
 
-compiler.err.pattern.dominated=\u6B64 case \u6807\u7B7E\u7531\u524D\u4E00\u4E2A case \u6807\u7B7E\u652F\u914D
+compiler.err.pattern.dominated=此 case 标签由前一个 case 标签支配
 
-compiler.err.duplicate.default.label=default \u6807\u7B7E\u91CD\u590D
+compiler.err.duplicate.default.label=default 标签重复
 
-compiler.err.duplicate.unconditional.pattern=\u65E0\u6761\u4EF6\u6A21\u5F0F\u91CD\u590D
+compiler.err.duplicate.unconditional.pattern=无条件模式重复
 
-compiler.err.unconditional.pattern.and.default=switch \u6709\u4E00\u4E2A\u65E0\u6761\u4EF6\u6A21\u5F0F\u548C\u4E00\u4E2A default \u6807\u7B7E
+compiler.err.unconditional.pattern.and.default=switch 有一个无条件模式和一个 default 标签
 
-compiler.err.guard.not.allowed=\u53EA\u6709\u5305\u542B\u6A21\u5F0F\u7684 case \u5141\u8BB8\u4F7F\u7528\u536B\u58EB
+compiler.err.guard.not.allowed=只有包含模式的 case 允许使用卫士
 
-compiler.err.guard.has.constant.expression.false=\u6B64 case \u6807\u7B7E\u6709\u4E00\u4E2A\u536B\u58EB\uFF0C\u5B83\u662F\u503C\u4E3A ''false'' \u7684\u5E38\u91CF\u8868\u8FBE\u5F0F
+compiler.err.guard.has.constant.expression.false=此 case 标签有一个卫士，它是值为 ''false'' 的常量表达式
 
 # 0: symbol
-compiler.err.cannot.assign.not.declared.guard=\u65E0\u6CD5\u5206\u914D\u7ED9 {0}\uFF0C\u56E0\u4E3A\u672A\u5728\u536B\u58EB\u5185\u58F0\u660E\u5B83
+compiler.err.cannot.assign.not.declared.guard=无法分配给 {0}，因为未在卫士内声明它
 
 # 0: type, 1: type
-compiler.err.constant.label.not.compatible={0} \u7C7B\u578B\u7684\u5E38\u91CF\u6807\u7B7E\u4E0E switch \u9009\u62E9\u5668\u7C7B\u578B {1} \u4E0D\u517C\u5BB9
+compiler.err.constant.label.not.compatible={0} 类型的常量标签与 switch 选择器类型 {1} 不兼容
 
-compiler.err.flows.through.to.pattern=\u8D2F\u7A7F (fall-through) \u5230\u6A21\u5F0F\u975E\u6CD5
+compiler.err.flows.through.to.pattern=贯穿 (fall-through) 到模式非法
 
-compiler.err.flows.through.from.pattern=\u4ECE\u6A21\u5F0F\u8D2F\u7A7F (fall-through) \u975E\u6CD5
+compiler.err.flows.through.from.pattern=从模式贯穿 (fall-through) 非法
 
-compiler.err.invalid.case.label.combination=case \u6807\u7B7E\u7EC4\u5408\u65E0\u6548
+compiler.err.invalid.case.label.combination=case 标签组合无效
 
-compiler.err.default.label.not.allowed=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u9ED8\u8BA4\u6807\u7B7E
+compiler.err.default.label.not.allowed=此处不允许使用默认标签
 
-compiler.err.pattern.type.cannot.infer=\u65E0\u6CD5\u63A8\u65AD\u6A21\u5F0F\u7C7B\u578B
+compiler.err.pattern.type.cannot.infer=无法推断模式类型
 
-compiler.err.else.without.if=\u6709 ''if'', \u4F46\u662F\u6CA1\u6709 ''else''
+compiler.err.else.without.if=有 ''if'', 但是没有 ''else''
 
-compiler.err.empty.char.lit=\u7A7A\u5B57\u7B26\u6587\u5B57
+compiler.err.empty.char.lit=空字符文字
 
 # 0: symbol
-compiler.err.encl.class.required=\u9700\u8981\u5305\u542B{0}\u7684\u5C01\u95ED\u5B9E\u4F8B
+compiler.err.encl.class.required=需要包含{0}的封闭实例
 
-compiler.err.enum.annotation.must.be.enum.constant=\u679A\u4E3E\u6279\u6CE8\u503C\u5FC5\u987B\u662F\u679A\u4E3E\u5E38\u91CF
+compiler.err.enum.annotation.must.be.enum.constant=枚举批注值必须是枚举常量
 
-compiler.err.enum.cant.be.instantiated=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u679A\u4E3E\u7C7B
+compiler.err.enum.cant.be.instantiated=无法实例化枚举类
 
-compiler.err.enum.label.must.be.unqualified.enum=\u679A\u4E3E switch case \u6807\u7B7E\u5FC5\u987B\u4E3A\u679A\u4E3E\u5E38\u91CF\u7684\u975E\u9650\u5B9A\u540D\u79F0
+compiler.err.enum.label.must.be.unqualified.enum=枚举 switch case 标签必须为枚举常量的非限定名称
 
-compiler.err.enum.label.must.be.enum.constant=\u679A\u4E3E switch \u5E38\u91CF case \u7684\u6807\u7B7E\u5FC5\u987B\u4E3A\u679A\u4E3E\u5E38\u91CF
+compiler.err.enum.label.must.be.enum.constant=枚举 switch 常量 case 的标签必须为枚举常量
 
-compiler.err.enum.no.subclassing=\u7C7B\u65E0\u6CD5\u76F4\u63A5\u6269\u5C55 java.lang.Enum
+compiler.err.enum.no.subclassing=类无法直接扩展 java.lang.Enum
 
-compiler.err.enum.types.not.extensible=\u679A\u4E3E\u7C7B\u4E0D\u53EF\u6269\u5C55
+compiler.err.enum.types.not.extensible=枚举类不可扩展
 
-compiler.err.enum.no.finalize=\u679A\u4E3E\u4E0D\u80FD\u6709 finalize \u65B9\u6CD5
+compiler.err.enum.no.finalize=枚举不能有 finalize 方法
 
-compiler.err.enum.cant.be.generic=\u679A\u4E3E\u4E0D\u80FD\u4E3A\u6CDB\u578B
+compiler.err.enum.cant.be.generic=枚举不能为泛型
 
 # 0: file name, 1: string
-compiler.err.error.reading.file=\u8BFB\u53D6{0}\u65F6\u51FA\u9519; {1}
+compiler.err.error.reading.file=读取{0}时出错; {1}
 
 # 0: type
-compiler.err.except.already.caught=\u5DF2\u6355\u83B7\u5230\u5F02\u5E38\u9519\u8BEF{0}
+compiler.err.except.already.caught=已捕获到异常错误{0}
 
 # 0: type
-compiler.err.except.never.thrown.in.try=\u5728\u76F8\u5E94\u7684 try \u8BED\u53E5\u4E3B\u4F53\u4E2D\u4E0D\u80FD\u629B\u51FA\u5F02\u5E38\u9519\u8BEF{0}
+compiler.err.except.never.thrown.in.try=在相应的 try 语句主体中不能抛出异常错误{0}
 
 # 0: symbol
-compiler.err.final.parameter.may.not.be.assigned=\u4E0D\u80FD\u5206\u914D\u6700\u7EC8\u53C2\u6570{0}
+compiler.err.final.parameter.may.not.be.assigned=不能分配最终参数{0}
 
 # 0: symbol
-compiler.err.try.resource.may.not.be.assigned=\u53EF\u80FD\u672A\u5206\u914D\u53EF\u81EA\u52A8\u5173\u95ED\u7684\u8D44\u6E90{0}
+compiler.err.try.resource.may.not.be.assigned=可能未分配可自动关闭的资源{0}
 
 # 0: symbol
-compiler.err.multicatch.parameter.may.not.be.assigned=\u53EF\u80FD\u672A\u5206\u914D multi-catch \u53C2\u6570{0}
+compiler.err.multicatch.parameter.may.not.be.assigned=可能未分配 multi-catch 参数{0}
 
 # 0: type, 1: type
-compiler.err.multicatch.types.must.be.disjoint=multi-catch \u8BED\u53E5\u4E2D\u7684\u66FF\u4EE3\u65E0\u6CD5\u901A\u8FC7\u5B50\u7C7B\u5316\u5173\u8054\n\u66FF\u4EE3{0}\u662F\u66FF\u4EE3{1}\u7684\u5B50\u7C7B
+compiler.err.multicatch.types.must.be.disjoint=multi-catch 语句中的替代无法通过子类化关联\n替代{0}是替代{1}的子类
 
-compiler.err.finally.without.try=\u6709 ''finally'', \u4F46\u662F\u6CA1\u6709 ''try''
+compiler.err.finally.without.try=有 ''finally'', 但是没有 ''try''
 
 # 0: type, 1: message segment
-compiler.err.foreach.not.applicable.to.type=for-each \u4E0D\u9002\u7528\u4E8E\u8868\u8FBE\u5F0F\u7C7B\u578B\n\u8981\u6C42: {1}\n\u627E\u5230:    {0}
+compiler.err.foreach.not.applicable.to.type=for-each 不适用于表达式类型\n要求: {1}\n找到:    {0}
 
-compiler.err.fp.number.too.large=\u6D6E\u70B9\u6570\u592A\u5927
+compiler.err.fp.number.too.large=浮点数太大
 
-compiler.err.fp.number.too.small=\u6D6E\u70B9\u6570\u592A\u5C0F
+compiler.err.fp.number.too.small=浮点数太小
 
-compiler.err.generic.array.creation=\u521B\u5EFA\u6CDB\u578B\u6570\u7EC4
+compiler.err.generic.array.creation=创建泛型数组
 
-compiler.err.generic.throwable=\u6CDB\u578B\u7C7B\u4E0D\u80FD\u6269\u5C55 java.lang.Throwable
+compiler.err.generic.throwable=泛型类不能扩展 java.lang.Throwable
 
 # 0: symbol
-compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u7C7B{0}\u4E2D\u7684\u9759\u6001\u58F0\u660E\u975E\u6CD5\n\u4FEE\u9970\u7B26 ''static'' \u4EC5\u5141\u8BB8\u5728\u5E38\u91CF\u53D8\u91CF\u58F0\u660E\u4E2D\u4F7F\u7528
+compiler.err.icls.cant.have.static.decl=内部类{0}中的静态声明非法\n修饰符 ''static'' 仅允许在常量变量声明中使用
 
 # 0: string
-compiler.err.illegal.char=\u975E\u6CD5\u5B57\u7B26: ''{0}''
+compiler.err.illegal.char=非法字符: ''{0}''
 
 # 0: string, 1: string
-compiler.err.illegal.char.for.encoding=\u7F16\u7801 {1} \u7684\u4E0D\u53EF\u6620\u5C04\u5B57\u7B26 (0x{0})
+compiler.err.illegal.char.for.encoding=编码 {1} 的不可映射字符 (0x{0})
 
 # 0: set of flag, 1: set of flag
-compiler.err.illegal.combination.of.modifiers=\u975E\u6CD5\u7684\u4FEE\u9970\u7B26\u7EC4\u5408: {0}\u548C{1}
+compiler.err.illegal.combination.of.modifiers=非法的修饰符组合: {0}和{1}
 
-compiler.err.illegal.enum.static.ref=\u521D\u59CB\u5316\u7A0B\u5E8F\u4E2D\u5BF9\u9759\u6001\u5B57\u6BB5\u7684\u5F15\u7528\u4E0D\u5408\u6CD5
+compiler.err.illegal.enum.static.ref=初始化程序中对静态字段的引用不合法
 
-compiler.err.illegal.esc.char=\u975E\u6CD5\u9003\u9038 \u7B26
+compiler.err.illegal.esc.char=非法逃逸 符
 
-compiler.err.illegal.forward.ref=\u975E\u6CD5\u524D\u5411\u5F15\u7528
+compiler.err.illegal.forward.ref=非法前向引用
 
 # 0: symbol, 1: object
-compiler.err.not.in.profile={0}\u5728\u914D\u7F6E\u6587\u4EF6 ''{1}'' \u4E2D\u4E0D\u53EF\u7528
+compiler.err.not.in.profile={0}在配置文件 ''{1}'' 中不可用
 
 # 0: symbol
-compiler.warn.forward.ref=\u5148\u5F15\u7528\u53D8\u91CF ''{0}'', \u7136\u540E\u518D\u5BF9\u5176\u521D\u59CB\u5316
+compiler.warn.forward.ref=先引用变量 ''{0}'', 然后再对其初始化
 
-compiler.warn.possible.this.escape=\u53EF\u80FD\u5728\u5B8C\u5168\u521D\u59CB\u5316\u5B50\u7C7B\u4E4B\u524D\u9003\u9038\u4E86 ''this''
+compiler.warn.possible.this.escape=可能在完全初始化子类之前逃逸了 ''this''
 
-compiler.warn.possible.this.escape.location=\u6B64\u5904\u4EE5\u524D\u53EF\u80FD\u901A\u8FC7\u8C03\u7528\u9003\u9038 \u4E86 ''this''
+compiler.warn.possible.this.escape.location=此处以前可能通过调用逃逸 了 ''this''
 
-compiler.err.illegal.self.ref=\u521D\u59CB\u5316\u7A0B\u5E8F\u4E2D\u5B58\u5728\u81EA\u5F15\u7528
+compiler.err.illegal.self.ref=初始化程序中存在自引用
 
 # 0: symbol
-compiler.warn.self.ref=\u53D8\u91CF ''{0}'' \u7684\u521D\u59CB\u5316\u7A0B\u5E8F\u4E2D\u5B58\u5728\u81EA\u5F15\u7528
+compiler.warn.self.ref=变量 ''{0}'' 的初始化程序中存在自引用
 
 # 0: type
-compiler.err.illegal.initializer.for.type={0}\u7684\u521D\u59CB\u5316\u7A0B\u5E8F\u4E0D\u5408\u6CD5
+compiler.err.illegal.initializer.for.type={0}的初始化程序不合法
 
-compiler.err.illegal.line.end.in.char.lit=\u5B57\u7B26\u6587\u5B57\u7684\u884C\u7ED3\u5C3E\u4E0D\u5408\u6CD5
+compiler.err.illegal.line.end.in.char.lit=字符文字的行结尾不合法
 
-compiler.err.illegal.text.block.open=\u6587\u672C\u5757\u8D77\u59CB\u5206\u9694\u7B26\u5E8F\u5217\u975E\u6CD5\uFF0C\u7F3A\u5C11\u884C\u7EC8\u6B62\u7B26
+compiler.err.illegal.text.block.open=文本块起始分隔符序列非法，缺少行终止符
 
-compiler.warn.inconsistent.white.space.indentation=\u7A7A\u683C\u7F29\u8FDB\u4E0D\u4E00\u81F4
+compiler.warn.inconsistent.white.space.indentation=空格缩进不一致
 
-compiler.warn.trailing.white.space.will.be.removed=\u5C06\u5220\u9664\u5C3E\u968F\u7A7A\u683C
+compiler.warn.trailing.white.space.will.be.removed=将删除尾随空格
 
-compiler.err.illegal.nonascii.digit=\u975E\u6CD5\u7684\u975E ASCII \u6570\u5B57
+compiler.err.illegal.nonascii.digit=非法的非 ASCII 数字
 
-compiler.err.illegal.underscore=\u975E\u6CD5\u4E0B\u5212\u7EBF
+compiler.err.illegal.underscore=非法下划线
 
-compiler.err.illegal.dot=\u975E\u6CD5 ''.''
+compiler.err.illegal.dot=非法 ''.''
 
 # 0: symbol
-compiler.err.illegal.qual.not.icls=\u975E\u6CD5\u9650\u5B9A\u7B26; {0}\u4E0D\u662F\u5185\u90E8\u7C7B
+compiler.err.illegal.qual.not.icls=非法限定符; {0}不是内部类
 
-compiler.err.illegal.start.of.expr=\u975E\u6CD5\u7684\u8868\u8FBE\u5F0F\u5F00\u59CB
+compiler.err.illegal.start.of.expr=非法的表达式开始
 
-compiler.err.illegal.start.of.stmt=\u975E\u6CD5\u7684\u8BED\u53E5\u5F00\u59CB
+compiler.err.illegal.start.of.stmt=非法的语句开始
 
-compiler.err.illegal.start.of.type=\u975E\u6CD5\u7684\u7C7B\u578B\u5F00\u59CB
+compiler.err.illegal.start.of.type=非法的类型开始
 
-compiler.err.illegal.parenthesized.expression=\u975E\u6CD5\u7684\u542B\u62EC\u53F7\u8868\u8FBE\u5F0F
+compiler.err.illegal.parenthesized.expression=非法的含括号表达式
 
-compiler.err.illegal.unicode.esc=\u975E\u6CD5\u7684 Unicode \u9003\u9038
+compiler.err.illegal.unicode.esc=非法的 Unicode 逃逸
 
 # 0: symbol
-compiler.err.import.requires.canonical=\u5BFC\u5165\u9700\u8981{0}\u7684\u89C4\u8303\u540D\u79F0
+compiler.err.import.requires.canonical=导入需要{0}的规范名称
 
-compiler.err.improperly.formed.type.param.missing=\u7C7B\u578B\u7684\u683C\u5F0F\u4E0D\u6B63\u786E, \u7F3A\u5C11\u67D0\u4E9B\u53C2\u6570
+compiler.err.improperly.formed.type.param.missing=类型的格式不正确, 缺少某些参数
 
-compiler.err.improperly.formed.type.inner.raw.param=\u7C7B\u578B\u7684\u683C\u5F0F\u4E0D\u6B63\u786E, \u7ED9\u51FA\u4E86\u539F\u59CB\u7C7B\u578B\u7684\u7C7B\u578B\u53C2\u6570
+compiler.err.improperly.formed.type.inner.raw.param=类型的格式不正确, 给出了原始类型的类型参数
 
 # 0: type, 1: type
-compiler.err.incomparable.types=\u4E0D\u53EF\u6BD4\u8F83\u7684\u7C7B\u578B: {0}\u548C{1}
+compiler.err.incomparable.types=不可比较的类型: {0}和{1}
 
 # 0: string
-compiler.err.int.number.too.large=\u6574\u6570\u592A\u5927
+compiler.err.int.number.too.large=整数太大
 
-compiler.err.intf.annotation.members.cant.have.params=\u6279\u6CE8\u63A5\u53E3\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u65E0\u6CD5\u58F0\u660E\u5F62\u53C2
+compiler.err.intf.annotation.members.cant.have.params=批注接口声明中的元素无法声明形参
 
 # 0: symbol
-compiler.err.intf.annotation.cant.have.type.params=\u6279\u6CE8\u63A5\u53E3 {0} \u4E0D\u80FD\u4E3A\u6CDB\u578B
+compiler.err.intf.annotation.cant.have.type.params=批注接口 {0} 不能为泛型
 
-compiler.err.intf.annotation.members.cant.have.type.params=\u6279\u6CE8\u63A5\u53E3\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u4E0D\u80FD\u4E3A\u6CDB\u578B\u65B9\u6CD5
+compiler.err.intf.annotation.members.cant.have.type.params=批注接口声明中的元素不能为泛型方法
 
 # 0: symbol, 1: type
-compiler.err.intf.annotation.member.clash=\u6279\u6CE8\u63A5\u53E3 {1} \u58F0\u660E\u7684\u5143\u7D20\u4E0E\u65B9\u6CD5 {0} \u540C\u540D
+compiler.err.intf.annotation.member.clash=批注接口 {1} 声明的元素与方法 {0} 同名
 
-compiler.err.intf.expected.here=\u6B64\u5904\u9700\u8981\u63A5\u53E3
+compiler.err.intf.expected.here=此处需要接口
 
-compiler.err.intf.meth.cant.have.body=\u63A5\u53E3\u62BD\u8C61\u65B9\u6CD5\u4E0D\u80FD\u5E26\u6709\u4E3B\u4F53
+compiler.err.intf.meth.cant.have.body=接口抽象方法不能带有主体
 
-compiler.err.invalid.annotation.member.type=\u6279\u6CE8\u63A5\u53E3\u5143\u7D20\u7684\u7C7B\u578B\u65E0\u6548
+compiler.err.invalid.annotation.member.type=批注接口元素的类型无效
 
-compiler.err.invalid.binary.number=\u4E8C\u8FDB\u5236\u6570\u5B57\u4E2D\u5FC5\u987B\u5305\u542B\u81F3\u5C11\u4E00\u4E2A\u4E8C\u8FDB\u5236\u6570
+compiler.err.invalid.binary.number=二进制数字中必须包含至少一个二进制数
 
-compiler.err.invalid.hex.number=\u5341\u516D\u8FDB\u5236\u6570\u5B57\u5FC5\u987B\u5305\u542B\u81F3\u5C11\u4E00\u4F4D\u5341\u516D\u8FDB\u5236\u6570
+compiler.err.invalid.hex.number=十六进制数字必须包含至少一位十六进制数
 
-compiler.err.invalid.meth.decl.ret.type.req=\u65B9\u6CD5\u58F0\u660E\u65E0\u6548; \u9700\u8981\u8FD4\u56DE\u7C7B\u578B
+compiler.err.invalid.meth.decl.ret.type.req=方法声明无效; 需要返回类型
 
-compiler.err.varargs.and.old.array.syntax=variable-arity \u53C2\u6570\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4F20\u7EDF\u6570\u7EC4\u8BB0\u53F7
+compiler.err.varargs.and.old.array.syntax=variable-arity 参数中不允许使用传统数组记号
 
-compiler.err.varargs.and.receiver =\u63A5\u6536\u65B9\u53C2\u6570\u4E0D\u5141\u8BB8\u4F7F\u7528 varargs \u8BB0\u53F7
+compiler.err.varargs.and.receiver =接收方参数不允许使用 varargs 记号
 
-compiler.err.varargs.must.be.last =varargs \u53C2\u6570\u5FC5\u987B\u662F\u6700\u540E\u4E00\u4E2A\u53C2\u6570
+compiler.err.varargs.must.be.last =varargs 参数必须是最后一个参数
 
-compiler.err.array.and.receiver =\u63A5\u6536\u65B9\u53C2\u6570\u4E0D\u5141\u8BB8\u4F7F\u7528\u4F20\u7EDF\u6570\u7EC4\u8BB0\u53F7
+compiler.err.array.and.receiver =接收方参数不允许使用传统数组记号
 
-compiler.err.wrong.receiver =\u9519\u8BEF\u7684\u63A5\u6536\u65B9\u53C2\u6570\u540D
+compiler.err.wrong.receiver =错误的接收方参数名
 
-compiler.err.variable.not.allowed=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u53D8\u91CF\u58F0\u660E
+compiler.err.variable.not.allowed=此处不允许使用变量声明
 
 # 0: name
-compiler.err.label.already.in.use=\u6807\u7B7E{0}\u5DF2\u4F7F\u7528
+compiler.err.label.already.in.use=标签{0}已使用
 
-compiler.err.local.enum=\u679A\u4E3E\u7C7B\u4E0D\u80FD\u4E3A\u672C\u5730\u7C7B
+compiler.err.local.enum=枚举类不能为本地类
 
-compiler.err.cannot.create.array.with.type.arguments=\u65E0\u6CD5\u521B\u5EFA\u5177\u6709\u7C7B\u578B\u53D8\u91CF\u7684\u6570\u7EC4
+compiler.err.cannot.create.array.with.type.arguments=无法创建具有类型变量的数组
 
-compiler.err.cannot.create.array.with.diamond=\u65E0\u6CD5\u521B\u5EFA\u5177\u6709 ''<>'' \u7684\u6570\u7EC4
+compiler.err.cannot.create.array.with.diamond=无法创建具有 ''<>'' 的数组
 
-compiler.err.invalid.module.directive=\u9884\u671F\u4E3A\u6A21\u5757\u6307\u4EE4\u5173\u952E\u5B57\u6216 ''}''
+compiler.err.invalid.module.directive=预期为模块指令关键字或 ''}''
 
 #
 # limits.  We don't give the limits in the diagnostic because we expect
 # them to change, yet we want to use the same diagnostic.  These are all
 # detected during code generation.
 #
-compiler.err.limit.code=\u4EE3\u7801\u8FC7\u957F
+compiler.err.limit.code=代码过长
 
-compiler.err.limit.code.too.large.for.try.stmt=try \u8BED\u53E5\u7684\u4EE3\u7801\u8FC7\u957F
+compiler.err.limit.code.too.large.for.try.stmt=try 语句的代码过长
 
-compiler.err.limit.dimensions=\u6570\u7EC4\u7C7B\u578B\u7EF4\u8FC7\u591A
+compiler.err.limit.dimensions=数组类型维过多
 
-compiler.err.limit.locals=\u672C\u5730\u53D8\u91CF\u8FC7\u591A
+compiler.err.limit.locals=本地变量过多
 
-compiler.err.limit.parameters=\u53C2\u6570\u8FC7\u591A
+compiler.err.limit.parameters=参数过多
 
-compiler.err.limit.pool=\u5E38\u91CF\u8FC7\u591A
+compiler.err.limit.pool=常量过多
 
-compiler.err.limit.pool.in.class=\u7C7B{0}\u4E2D\u7684\u5E38\u91CF\u8FC7\u591A
+compiler.err.limit.pool.in.class=类{0}中的常量过多
 
-compiler.err.limit.stack=\u4EE3\u7801\u9700\u8981\u8FC7\u591A\u5806\u6808
+compiler.err.limit.stack=代码需要过多堆栈
 
-compiler.err.limit.string=\u5E38\u91CF\u5B57\u7B26\u4E32\u8FC7\u957F
+compiler.err.limit.string=常量字符串过长
 
 # 0: string
-compiler.err.limit.string.overflow=\u5BF9\u4E8E\u5E38\u91CF\u6C60\u6765\u8BF4, \u5B57\u7B26\u4E32 "{0}..." \u7684 UTF8 \u8868\u793A\u8FC7\u957F
+compiler.err.limit.string.overflow=对于常量池来说, 字符串 "{0}..." 的 UTF8 表示过长
 
-compiler.err.malformed.fp.lit=\u6D6E\u70B9\u6587\u5B57\u7684\u683C\u5F0F\u9519\u8BEF
+compiler.err.malformed.fp.lit=浮点文字的格式错误
 
-compiler.err.method.does.not.override.superclass=\u65B9\u6CD5\u4E0D\u4F1A\u8986\u76D6\u6216\u5B9E\u73B0\u8D85\u7C7B\u578B\u7684\u65B9\u6CD5
+compiler.err.method.does.not.override.superclass=方法不会覆盖或实现超类型的方法
 
-compiler.err.static.methods.cannot.be.annotated.with.override=\u4E0D\u80FD\u4F7F\u7528 @Override \u6CE8\u91CA\u9759\u6001\u65B9\u6CD5
+compiler.err.static.methods.cannot.be.annotated.with.override=不能使用 @Override 注释静态方法
 
-compiler.err.missing.meth.body.or.decl.abstract=\u7F3A\u5C11\u65B9\u6CD5\u4E3B\u4F53, \u6216\u58F0\u660E\u62BD\u8C61
+compiler.err.missing.meth.body.or.decl.abstract=缺少方法主体, 或声明抽象
 
-compiler.err.missing.ret.stmt=\u7F3A\u5C11\u8FD4\u56DE\u8BED\u53E5
+compiler.err.missing.ret.stmt=缺少返回语句
 
 # 0: type
-compiler.misc.missing.ret.val=\u7F3A\u5C11\u8FD4\u56DE\u503C
+compiler.misc.missing.ret.val=缺少返回值
 
-compiler.misc.unexpected.ret.val=\u610F\u5916\u7684\u8FD4\u56DE\u503C
+compiler.misc.unexpected.ret.val=意外的返回值
 
 # 0: set of flag
-compiler.err.mod.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u4FEE\u9970\u7B26{0}
+compiler.err.mod.not.allowed.here=此处不允许使用修饰符{0}
 
 # 0: name
-compiler.err.modifier.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u4FEE\u9970\u7B26{0}
+compiler.err.modifier.not.allowed.here=此处不允许使用修饰符{0}
 
-compiler.err.intf.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u63A5\u53E3
+compiler.err.intf.not.allowed.here=此处不允许使用接口
 
 # 0: symbol, 1: symbol
-compiler.err.name.clash.same.erasure=\u540D\u79F0\u51B2\u7A81: {0}\u548C{1}\u5177\u6709\u76F8\u540C\u7591\u7B26
+compiler.err.name.clash.same.erasure=名称冲突: {0}和{1}具有相同疑符
 
 # 0: name, 1: list of type, 2: symbol, 3: name, 4: list of type, 5: symbol
-compiler.err.name.clash.same.erasure.no.override=\u540D\u79F0\u51B2\u7A81: {2} \u4E2D\u7684 {0}({1}) \u548C {5} \u4E2D\u7684 {3}({4}) \u5177\u6709\u76F8\u540C\u7591\u7B26, \u4F46\u4E24\u8005\u5747\u4E0D\u8986\u76D6\u5BF9\u65B9
+compiler.err.name.clash.same.erasure.no.override=名称冲突: {2} 中的 {0}({1}) 和 {5} 中的 {3}({4}) 具有相同疑符, 但两者均不覆盖对方
 
 # 0: string, 1: name, 2: name, 3: list of type, 4: symbol, 5: name, 6: list of type, 7: symbol
-compiler.err.name.clash.same.erasure.no.override.1=\u540D\u79F0\u51B2\u7A81: {0} {1} \u7684\u4E24\u79CD\u65B9\u6CD5\u5177\u6709\u76F8\u540C\u7684\u7591\u7B26, \u4F46\u4E24\u8005\u5747\u4E0D\u8986\u76D6\u5BF9\u65B9\n\u7B2C\u4E00\u79CD\u65B9\u6CD5: {4} \u4E2D\u7684 {2}({3})\n\u7B2C\u4E8C\u79CD\u65B9\u6CD5: {7} \u4E2D\u7684 {5}({6})
+compiler.err.name.clash.same.erasure.no.override.1=名称冲突: {0} {1} 的两种方法具有相同的疑符, 但两者均不覆盖对方\n第一种方法: {4} 中的 {2}({3})\n第二种方法: {7} 中的 {5}({6})
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.err.name.clash.same.erasure.no.hide=\u540D\u79F0\u51B2\u7A81: {1} \u4E2D\u7684 {0} \u548C {3} \u4E2D\u7684 {2} \u5177\u6709\u76F8\u540C\u7591\u7B26, \u4F46\u4E24\u8005\u5747\u4E0D\u9690\u85CF\u5BF9\u65B9
+compiler.err.name.clash.same.erasure.no.hide=名称冲突: {1} 中的 {0} 和 {3} 中的 {2} 具有相同疑符, 但两者均不隐藏对方
 
-compiler.err.name.reserved.for.internal.use={0}\u4E3A\u5185\u90E8\u4F7F\u7528\u4FDD\u7559
+compiler.err.name.reserved.for.internal.use={0}为内部使用保留
 
-compiler.err.native.meth.cant.have.body=\u672C\u673A\u65B9\u6CD5\u4E0D\u80FD\u5E26\u6709\u4E3B\u4F53
+compiler.err.native.meth.cant.have.body=本机方法不能带有主体
 
 
 # 0: message segment
-compiler.misc.incompatible.type.in.conditional=\u6761\u4EF6\u8868\u8FBE\u5F0F\u4E2D\u7684\u7C7B\u578B\u9519\u8BEF\n{0}
+compiler.misc.incompatible.type.in.conditional=条件表达式中的类型错误\n{0}
 
-compiler.misc.conditional.target.cant.be.void=\u6761\u4EF6\u8868\u8FBE\u5F0F\u7684\u76EE\u6807\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
+compiler.misc.conditional.target.cant.be.void=条件表达式的目标类型不能为空
 
-compiler.misc.switch.expression.target.cant.be.void=switch \u8868\u8FBE\u5F0F\u7684\u76EE\u6807\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
+compiler.misc.switch.expression.target.cant.be.void=switch 表达式的目标类型不能为空
 
 # 0: message segment
-compiler.misc.incompatible.type.in.switch.expression=switch \u8868\u8FBE\u5F0F\u4E2D\u7684\u7C7B\u578B\u9519\u8BEF\n{0}
+compiler.misc.incompatible.type.in.switch.expression=switch 表达式中的类型错误\n{0}
 
 # 0: message segment
-compiler.misc.incompatible.ret.type.in.lambda=lambda \u8868\u8FBE\u5F0F\u4E2D\u7684\u8FD4\u56DE\u7C7B\u578B\u9519\u8BEF\n{0}
+compiler.misc.incompatible.ret.type.in.lambda=lambda 表达式中的返回类型错误\n{0}
 
-compiler.misc.stat.expr.expected=lambda \u4E3B\u4F53\u4E0E void \u51FD\u6570\u63A5\u53E3\u4E0D\u517C\u5BB9\n(\u8BF7\u8003\u8651\u4F7F\u7528\u5757 lambda \u4E3B\u4F53, \u6216\u8005\u6539\u4E3A\u4F7F\u7528\u8BED\u53E5\u8868\u8FBE\u5F0F)
+compiler.misc.stat.expr.expected=lambda 主体与 void 函数接口不兼容\n(请考虑使用块 lambda 主体, 或者改为使用语句表达式)
 
 # 0: message segment
-compiler.misc.incompatible.ret.type.in.mref=\u65B9\u6CD5\u5F15\u7528\u4E2D\u7684\u8FD4\u56DE\u7C7B\u578B\u9519\u8BEF\n{0}
+compiler.misc.incompatible.ret.type.in.mref=方法引用中的返回类型错误\n{0}
 
-compiler.err.lambda.body.neither.value.nor.void.compatible=lambda \u4E3B\u4F53\u4E0D\u662F\u503C, \u4E5F\u4E0D\u4E0E void \u517C\u5BB9
+compiler.err.lambda.body.neither.value.nor.void.compatible=lambda 主体不是值, 也不与 void 兼容
 
 # 0: list of type
-compiler.err.incompatible.thrown.types.in.mref=\u51FD\u6570\u8868\u8FBE\u5F0F\u4E2D\u629B\u51FA\u7684\u7C7B\u578B {0} \u4E0D\u517C\u5BB9
+compiler.err.incompatible.thrown.types.in.mref=函数表达式中抛出的类型 {0} 不兼容
 
-compiler.misc.incompatible.arg.types.in.lambda=lambda \u8868\u8FBE\u5F0F\u4E2D\u7684\u53C2\u6570\u7C7B\u578B\u4E0D\u517C\u5BB9
+compiler.misc.incompatible.arg.types.in.lambda=lambda 表达式中的参数类型不兼容
 
-compiler.misc.incompatible.arg.types.in.mref=\u65B9\u6CD5\u5F15\u7528\u4E2D\u7684\u53C2\u6570\u7C7B\u578B\u4E0D\u517C\u5BB9
+compiler.misc.incompatible.arg.types.in.mref=方法引用中的参数类型不兼容
 
-compiler.err.new.not.allowed.in.annotation=\u6279\u6CE8\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528 ''new''
+compiler.err.new.not.allowed.in.annotation=批注中不允许使用 ''new''
 
 # 0: name, 1: type
-compiler.err.no.annotation.member={1}\u4E2D\u6CA1\u6709\u6279\u6CE8\u6210\u5458{0}
+compiler.err.no.annotation.member={1}中没有批注成员{0}
 
 # 0: symbol
-compiler.err.no.encl.instance.of.type.in.scope=\u4F5C\u7528\u57DF\u4E2D\u6CA1\u6709\u7C7B\u578B\u4E3A{0}\u7684\u5C01\u95ED\u5B9E\u4F8B
+compiler.err.no.encl.instance.of.type.in.scope=作用域中没有类型为{0}的封闭实例
 
-compiler.err.no.intf.expected.here=\u6B64\u5904\u4E0D\u9700\u8981\u63A5\u53E3
+compiler.err.no.intf.expected.here=此处不需要接口
 
-compiler.err.no.match.entry={0}\u5728{1}\u7684\u6761\u76EE\u4E2D\u6CA1\u6709\u5339\u914D\u9879; \u9700\u8981{2}
+compiler.err.no.match.entry={0}在{1}的条目中没有匹配项; 需要{2}
 
 # 0: type
-compiler.err.not.annotation.type={0} \u4E0D\u662F\u6279\u6CE8\u63A5\u53E3
+compiler.err.not.annotation.type={0} 不是批注接口
 
 # 0: symbol, 1: symbol, 2: message segment
-compiler.err.not.def.access.package.cant.access={0} \u4E0D\u53EF\u89C1\n({2})
+compiler.err.not.def.access.package.cant.access={0} 不可见\n({2})
 
 # 0: symbol, 1: symbol, 2: message segment
-compiler.misc.not.def.access.package.cant.access={0} \u4E0D\u53EF\u89C1\n({2})
+compiler.misc.not.def.access.package.cant.access={0} 不可见\n({2})
 
 # 0: symbol, 1: message segment
-compiler.err.package.not.visible=\u7A0B\u5E8F\u5305 {0} \u4E0D\u53EF\u89C1\n({1})
+compiler.err.package.not.visible=程序包 {0} 不可见\n({1})
 
 # 0: symbol, 1: message segment
-compiler.misc.package.not.visible=\u7A0B\u5E8F\u5305 {0} \u4E0D\u53EF\u89C1\n({1})
+compiler.misc.package.not.visible=程序包 {0} 不可见\n({1})
 
 # {0} - current module
 # {1} - package in which the invisible class is declared
 # {2} - module in which {1} is declared
 # 0: symbol, 1: symbol, 2: symbol
-compiler.misc.not.def.access.does.not.read=\u7A0B\u5E8F\u5305 {1} \u5DF2\u5728\u6A21\u5757 {2} \u4E2D\u58F0\u660E, \u4F46\u6A21\u5757 {0} \u672A\u8BFB\u53D6\u5B83
+compiler.misc.not.def.access.does.not.read=程序包 {1} 已在模块 {2} 中声明, 但模块 {0} 未读取它
 
 # {0} - package in which the invisible class is declared
 # {1} - module in which {0} is declared
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.does.not.read.from.unnamed=\u7A0B\u5E8F\u5305 {0} \u5DF2\u5728\u6A21\u5757 {1} \u4E2D\u58F0\u660E, \u4F46\u8BE5\u6A21\u5757\u4E0D\u5728\u6A21\u5757\u56FE\u4E2D
+compiler.misc.not.def.access.does.not.read.from.unnamed=程序包 {0} 已在模块 {1} 中声明, 但该模块不在模块图中
 
 # {0} - package in which the invisible class is declared
 # {1} - current module
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.does.not.read.unnamed=\u7A0B\u5E8F\u5305 {0} \u5DF2\u5728\u672A\u547D\u540D\u6A21\u5757\u4E2D\u58F0\u660E\uFF0C\u4F46\u6A21\u5757 {1} \u672A\u8BFB\u53D6\u5B83
+compiler.misc.not.def.access.does.not.read.unnamed=程序包 {0} 已在未命名模块中声明，但模块 {1} 未读取它
 
 # {0} - package in which the invisible class is declared
 # {1} - module in which {0} is declared
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.not.exported=\u7A0B\u5E8F\u5305 {0} \u5DF2\u5728\u6A21\u5757 {1} \u4E2D\u58F0\u660E, \u4F46\u8BE5\u6A21\u5757\u672A\u5BFC\u51FA\u5B83
+compiler.misc.not.def.access.not.exported=程序包 {0} 已在模块 {1} 中声明, 但该模块未导出它
 
 # {0} - package in which the invisible class is declared
 # {1} - module in which {0} is declared
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.not.exported.from.unnamed=\u7A0B\u5E8F\u5305 {0} \u5DF2\u5728\u6A21\u5757 {1} \u4E2D\u58F0\u660E, \u4F46\u8BE5\u6A21\u5757\u672A\u5BFC\u51FA\u5B83
+compiler.misc.not.def.access.not.exported.from.unnamed=程序包 {0} 已在模块 {1} 中声明, 但该模块未导出它
 
 # {0} - package in which the invisible class is declared
 # {1} - module in which {0} is declared
 # {2} - current module
 # 0: symbol, 1: symbol, 2: symbol
-compiler.misc.not.def.access.not.exported.to.module=\u7A0B\u5E8F\u5305 {0} \u5DF2\u5728\u6A21\u5757 {1} \u4E2D\u58F0\u660E, \u4F46\u8BE5\u6A21\u5757\u672A\u5C06\u5B83\u5BFC\u51FA\u5230\u6A21\u5757 {2}
+compiler.misc.not.def.access.not.exported.to.module=程序包 {0} 已在模块 {1} 中声明, 但该模块未将它导出到模块 {2}
 
 # {0} - package in which the invisible class is declared
 # {1} - module in which {0} is declared
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.not.exported.to.module.from.unnamed=\u7A0B\u5E8F\u5305 {0} \u5DF2\u5728\u6A21\u5757 {1} \u4E2D\u58F0\u660E, \u4F46\u8BE5\u6A21\u5757\u672A\u5C06\u5B83\u5BFC\u51FA\u5230\u672A\u547D\u540D\u6A21\u5757
+compiler.misc.not.def.access.not.exported.to.module.from.unnamed=程序包 {0} 已在模块 {1} 中声明, 但该模块未将它导出到未命名模块
 
 # 0: symbol, 1: symbol
-compiler.err.not.def.access.class.intf.cant.access={1}.{0} \u662F\u5728\u4E0D\u53EF\u8BBF\u95EE\u7684\u7C7B\u6216\u63A5\u53E3\u4E2D\u5B9A\u4E49\u7684
+compiler.err.not.def.access.class.intf.cant.access={1}.{0} 是在不可访问的类或接口中定义的
 
 # 0: symbol, 1: symbol
-compiler.misc.not.def.access.class.intf.cant.access={1}.{0} \u662F\u5728\u4E0D\u53EF\u8BBF\u95EE\u7684\u7C7B\u6216\u63A5\u53E3\u4E2D\u5B9A\u4E49\u7684
+compiler.misc.not.def.access.class.intf.cant.access={1}.{0} 是在不可访问的类或接口中定义的
 
 # 0: symbol, 1: symbol, 2: symbol, 3: message segment
-compiler.err.not.def.access.class.intf.cant.access.reason=\u7A0B\u5E8F\u5305 {2} \u4E2D\u7684 {1}.{0} \u4E0D\u53EF\u8BBF\u95EE\n({3})
+compiler.err.not.def.access.class.intf.cant.access.reason=程序包 {2} 中的 {1}.{0} 不可访问\n({3})
 
 # 0: symbol, 1: symbol, 2: symbol, 3: message segment
-compiler.misc.not.def.access.class.intf.cant.access.reason=\u7A0B\u5E8F\u5305 {2} \u4E2D\u7684 {1}.{0} \u4E0D\u53EF\u8BBF\u95EE\n({3})
+compiler.misc.not.def.access.class.intf.cant.access.reason=程序包 {2} 中的 {1}.{0} 不可访问\n({3})
 
 # 0: symbol, 1: list of type, 2: type
-compiler.misc.cant.access.inner.cls.constr=\u65E0\u6CD5\u8BBF\u95EE\u6784\u9020\u5668 {0}({1})\n\u4F5C\u7528\u57DF\u4E2D\u6CA1\u6709\u7C7B\u578B\u4E3A{2}\u7684\u5C01\u95ED\u5B9E\u4F8B
+compiler.misc.cant.access.inner.cls.constr=无法访问构造器 {0}({1})\n作用域中没有类型为{2}的封闭实例
 
 # 0: symbol, 1: symbol
-compiler.err.not.def.public.cant.access={0}\u5728{1}\u4E2D\u4E0D\u662F\u516C\u5171\u7684; \u65E0\u6CD5\u4ECE\u5916\u90E8\u7A0B\u5E8F\u5305\u4E2D\u5BF9\u5176\u8FDB\u884C\u8BBF\u95EE
+compiler.err.not.def.public.cant.access={0}在{1}中不是公共的; 无法从外部程序包中对其进行访问
 
 # 0: symbol, 1: symbol
-compiler.err.not.def.public={0} \u5728 {1} \u4E2D\u4E0D\u662F\u516C\u5171\u7684
+compiler.err.not.def.public={0} 在 {1} 中不是公共的
 
 # 0: symbol, 1: symbol
-compiler.misc.not.def.public.cant.access={0}\u5728{1}\u4E2D\u4E0D\u662F\u516C\u5171\u7684; \u65E0\u6CD5\u4ECE\u5916\u90E8\u7A0B\u5E8F\u5305\u4E2D\u5BF9\u5176\u8FDB\u884C\u8BBF\u95EE
+compiler.misc.not.def.public.cant.access={0}在{1}中不是公共的; 无法从外部程序包中对其进行访问
 
 # 0: name
-compiler.err.not.loop.label=\u4E0D\u662F loop \u6807\u7B7E: {0}
+compiler.err.not.loop.label=不是 loop 标签: {0}
 
-compiler.err.not.stmt=\u4E0D\u662F\u8BED\u53E5
+compiler.err.not.stmt=不是语句
 
 # 0: symbol
-compiler.err.not.encl.class=\u4E0D\u662F\u5C01\u95ED\u7C7B: {0}
+compiler.err.not.encl.class=不是封闭类: {0}
 
 # 0: name, 1: type
-compiler.err.operator.cant.be.applied=\u4E00\u5143\u8FD0\u7B97\u7B26 ''{0}'' \u7684\u64CD\u4F5C\u6570\u7C7B\u578B{1}\u9519\u8BEF
+compiler.err.operator.cant.be.applied=一元运算符 ''{0}'' 的操作数类型{1}错误
 
 # 0: name, 1: type, 2: type
-compiler.err.operator.cant.be.applied.1=\u4E8C\u5143\u8FD0\u7B97\u7B26 ''{0}'' \u7684\u64CD\u4F5C\u6570\u7C7B\u578B\u9519\u8BEF\n\u7B2C\u4E00\u4E2A\u7C7B\u578B:  {1}\n\u7B2C\u4E8C\u4E2A\u7C7B\u578B: {2}
+compiler.err.operator.cant.be.applied.1=二元运算符 ''{0}'' 的操作数类型错误\n第一个类型:  {1}\n第二个类型: {2}
 
-compiler.err.pkg.annotations.sb.in.package-info.java=\u7A0B\u5E8F\u5305\u6279\u6CE8\u5E94\u5728\u6587\u4EF6 package-info.java \u4E2D
+compiler.err.pkg.annotations.sb.in.package-info.java=程序包批注应在文件 package-info.java 中
 
-compiler.err.no.pkg.in.module-info.java=\u6587\u4EF6 module-info.java \u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u7A0B\u5E8F\u5305\u58F0\u660E
+compiler.err.no.pkg.in.module-info.java=文件 module-info.java 中不允许使用程序包声明
 
 # 0: symbol
-compiler.err.pkg.clashes.with.class.of.same.name=\u7A0B\u5E8F\u5305{0}\u4E0E\u5E26\u6709\u76F8\u540C\u540D\u79F0\u7684\u7C7B\u51B2\u7A81
+compiler.err.pkg.clashes.with.class.of.same.name=程序包{0}与带有相同名称的类冲突
 
-compiler.err.warnings.and.werror=\u53D1\u73B0\u8B66\u544A, \u4F46\u6307\u5B9A\u4E86 -Werror
+compiler.err.warnings.and.werror=发现警告, 但指定了 -Werror
 
 # Errors related to annotation processing
 
 # 0: symbol, 1: message segment, 2: string (stack-trace)
-compiler.err.proc.cant.access=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1}\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4EE5\u4E0B\u5806\u6808\u8DDF\u8E2A\u3002\n{2}
+compiler.err.proc.cant.access=无法访问{0}\n{1}\n有关详细信息, 请参阅以下堆栈跟踪。\n{2}
 
 # 0: symbol, 1: message segment
-compiler.err.proc.cant.access.1=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1}
+compiler.err.proc.cant.access.1=无法访问{0}\n{1}
 
 # 0: string
-compiler.err.proc.cant.find.class=\u627E\u4E0D\u5230 ''{0}'' \u7684\u7C7B\u6587\u4EF6\u3002
+compiler.err.proc.cant.find.class=找不到 ''{0}'' 的类文件。
 
 # 0: string
-compiler.err.proc.cant.load.class=\u7531\u4E8E ''{0}''\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5904\u7406\u5668\u7C7B\u6587\u4EF6\u3002
+compiler.err.proc.cant.load.class=由于 ''{0}''，无法加载处理器类文件。
 
 # Print a client-generated error message; assumed to be localized, no translation required
 # 0: string
@@ -821,343 +821,343 @@ compiler.err.proc.messager={0}
 # 0: string
 compiler.misc.exception.message={0}
 
-compiler.misc.user.selected.completion.failure=\u6309\u7C7B\u540D\u5217\u51FA\u7684\u7528\u6237\u9009\u62E9\u8F93\u5165\u63D0\u793A\u5931\u8D25
+compiler.misc.user.selected.completion.failure=按类名列出的用户选择输入提示失败
 
 # 0: collection of string
-compiler.err.proc.no.explicit.annotation.processing.requested=\u4EC5\u5F53\u663E\u5F0F\u8BF7\u6C42\u6279\u6CE8\u5904\u7406\u65F6\u624D\u63A5\u53D7\u7C7B\u540D\u79F0 ''{0}''
+compiler.err.proc.no.explicit.annotation.processing.requested=仅当显式请求批注处理时才接受类名称 ''{0}''
 
-compiler.err.proc.no.service=ServiceLoader \u4E0D\u53EF\u7528, \u4F46\u5B83\u662F\u6279\u6CE8\u5904\u7406\u6240\u5FC5\u9700\u7684\u3002
+compiler.err.proc.no.service=ServiceLoader 不可用, 但它是批注处理所必需的。
 
 # 0: string, 1: string
-compiler.err.proc.processor.bad.option.name=\u5904\u7406\u7A0B\u5E8F ''{1}'' \u63D0\u4F9B\u7684\u9009\u9879\u540D\u79F0 ''{0}'' \u9519\u8BEF
+compiler.err.proc.processor.bad.option.name=处理程序 ''{1}'' 提供的选项名称 ''{0}'' 错误
 
 # 0: string
-compiler.err.proc.processor.cant.instantiate=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u5904\u7406\u7A0B\u5E8F ''{0}'' \u7684\u5B9E\u4F8B
+compiler.err.proc.processor.cant.instantiate=无法实例化处理程序 ''{0}'' 的实例
 
 # 0: string
-compiler.err.proc.processor.not.found=\u627E\u4E0D\u5230\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F ''{0}''
+compiler.err.proc.processor.not.found=找不到批注处理程序 ''{0}''
 
 # 0: string
-compiler.err.proc.processor.wrong.type=\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F ''{0}'' \u672A\u5B9E\u73B0 javax.annotation.processing.Processor
+compiler.err.proc.processor.wrong.type=批注处理程序 ''{0}'' 未实现 javax.annotation.processing.Processor
 
-compiler.err.proc.service.problem=\u521B\u5EFA\u670D\u52A1\u52A0\u8F7D\u5668\u4EE5\u52A0\u8F7D\u5904\u7406\u7A0B\u5E8F\u65F6\u51FA\u9519\u3002
+compiler.err.proc.service.problem=创建服务加载器以加载处理程序时出错。
 
 # 0: string
-compiler.err.proc.bad.config.file=\u670D\u52A1\u914D\u7F6E\u6587\u4EF6\u4E0D\u6B63\u786E, \u6216\u6784\u9020\u5904\u7406\u7A0B\u5E8F\u5BF9\u8C61{0}\u65F6\u629B\u51FA\u5F02\u5E38\u9519\u8BEF
+compiler.err.proc.bad.config.file=服务配置文件不正确, 或构造处理程序对象{0}时抛出异常错误
 
-compiler.err.proc.cant.create.loader=\u65E0\u6CD5\u4E3A\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F{0}\u521B\u5EFA\u7C7B\u52A0\u8F7D\u5668
+compiler.err.proc.cant.create.loader=无法为批注处理程序{0}创建类加载器
 
 # 0: symbol
-compiler.err.qualified.new.of.static.class=\u9650\u5B9A\u7684\u65B0\u9759\u6001\u7C7B
+compiler.err.qualified.new.of.static.class=限定的新静态类
 
-compiler.err.recursive.ctor.invocation=\u9012\u5F52\u6784\u9020\u5668\u8C03\u7528
+compiler.err.recursive.ctor.invocation=递归构造器调用
 
 # 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
-compiler.err.ref.ambiguous=\u5BF9{0}\u7684\u5F15\u7528\u4E0D\u660E\u786E\n{3} \u4E2D\u7684{1} {2} \u548C {6} \u4E2D\u7684{4} {5} \u90FD\u5339\u914D
+compiler.err.ref.ambiguous=对{0}的引用不明确\n{3} 中的{1} {2} 和 {6} 中的{4} {5} 都匹配
 
 # 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
-compiler.misc.ref.ambiguous=\u5BF9{0}\u7684\u5F15\u7528\u4E0D\u660E\u786E\n{3} \u4E2D\u7684{1} {2} \u548C {6} \u4E2D\u7684{4} {5} \u90FD\u5339\u914D
+compiler.misc.ref.ambiguous=对{0}的引用不明确\n{3} 中的{1} {2} 和 {6} 中的{4} {5} 都匹配
 
-compiler.err.repeated.annotation.target=\u6279\u6CE8\u76EE\u6807\u91CD\u590D
+compiler.err.repeated.annotation.target=批注目标重复
 
-compiler.err.repeated.interface=\u63A5\u53E3\u91CD\u590D
+compiler.err.repeated.interface=接口重复
 
-compiler.err.repeated.modifier=\u4FEE\u9970\u7B26\u91CD\u590D
+compiler.err.repeated.modifier=修饰符重复
 
 # 0: symbol, 1: set of modifier, 2: symbol
-compiler.err.report.access={0} \u5728 {2} \u4E2D\u662F {1} \u8BBF\u95EE\u63A7\u5236
+compiler.err.report.access={0} 在 {2} 中是 {1} 访问控制
 
 # 0: symbol, 1: set of modifier, 2: symbol
-compiler.misc.report.access={0} \u5728 {2} \u4E2D\u662F {1} \u8BBF\u95EE\u63A7\u5236
+compiler.misc.report.access={0} 在 {2} 中是 {1} 访问控制
 
-compiler.err.ret.outside.meth=\u8FD4\u56DE\u5916\u90E8\u65B9\u6CD5
+compiler.err.ret.outside.meth=返回外部方法
 
-compiler.err.signature.doesnt.match.supertype=\u7B7E\u540D\u4E0E{0}\u4E0D\u5339\u914D; \u4E0D\u517C\u5BB9\u7684\u8D85\u7C7B\u578B
+compiler.err.signature.doesnt.match.supertype=签名与{0}不匹配; 不兼容的超类型
 
-compiler.err.signature.doesnt.match.intf=\u7B7E\u540D\u4E0E{0}\u4E0D\u5339\u914D; \u4E0D\u517C\u5BB9\u7684\u63A5\u53E3
+compiler.err.signature.doesnt.match.intf=签名与{0}不匹配; 不兼容的接口
 
 # 0: symbol, 1: symbol, 2: symbol
-compiler.err.does.not.override.abstract={0}\u4E0D\u662F\u62BD\u8C61\u7684, \u5E76\u4E14\u672A\u8986\u76D6{2}\u4E2D\u7684\u62BD\u8C61\u65B9\u6CD5{1}
+compiler.err.does.not.override.abstract={0}不是抽象的, 并且未覆盖{2}中的抽象方法{1}
 
 # 0: file object
-compiler.err.source.cant.overwrite.input.file=\u5199\u5165\u6E90\u65F6\u51FA\u9519; \u65E0\u6CD5\u8986\u76D6\u8F93\u5165\u6587\u4EF6{0}
+compiler.err.source.cant.overwrite.input.file=写入源时出错; 无法覆盖输入文件{0}
 
 # 0: symbol
-compiler.err.stack.sim.error=\u5185\u90E8\u9519\u8BEF: {0}\u4E2D\u7684\u5806\u6808 sim \u9519\u8BEF
+compiler.err.stack.sim.error=内部错误: {0}中的堆栈 sim 错误
 
-compiler.err.static.imp.only.classes.and.interfaces=\u4EC5\u4ECE\u7C7B\u548C\u63A5\u53E3\u9759\u6001\u5BFC\u5165
+compiler.err.static.imp.only.classes.and.interfaces=仅从类和接口静态导入
 
-compiler.err.string.const.req=\u9700\u8981\u5E38\u91CF\u5B57\u7B26\u4E32\u8868\u8FBE\u5F0F
+compiler.err.string.const.req=需要常量字符串表达式
 
-compiler.err.pattern.expected=\u9700\u8981\u7C7B\u578B\u6A21\u5F0F
+compiler.err.pattern.expected=需要类型模式
 
 # 0: symbol, 1: fragment
-compiler.err.cannot.generate.class=\u751F\u6210\u7C7B {0} \u65F6\u51FA\u9519\n({1})
+compiler.err.cannot.generate.class=生成类 {0} 时出错\n({1})
 
 # 0: symbol, 1: symbol
-compiler.misc.synthetic.name.conflict=\u7B26\u53F7{0}\u4E0E{1}\u4E2D\u7684 compiler-synthesized \u7B26\u53F7\u51B2\u7A81
+compiler.misc.synthetic.name.conflict=符号{0}与{1}中的 compiler-synthesized 符号冲突
 
 # 0: symbol, 1: type
-compiler.misc.illegal.signature=\u7C7B\u578B {1} \u7684\u7B7E\u540D\u5C5E\u6027\u975E\u6CD5
+compiler.misc.illegal.signature=类型 {1} 的签名属性非法
 
-compiler.err.throws.not.allowed.in.intf.annotation=@interface \u6210\u5458\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528 throws \u5B50\u53E5
+compiler.err.throws.not.allowed.in.intf.annotation=@interface 成员中不允许使用 throws 子句
 
-compiler.err.try.without.catch.finally.or.resource.decls=''try'' \u4E0D\u5E26\u6709 ''catch'', ''finally'' \u6216\u8D44\u6E90\u58F0\u660E
+compiler.err.try.without.catch.finally.or.resource.decls=''try'' 不带有 ''catch'', ''finally'' 或资源声明
 
 # 0: symbol
-compiler.err.type.doesnt.take.params=\u7C7B\u578B{0}\u4E0D\u5E26\u6709\u53C2\u6570
+compiler.err.type.doesnt.take.params=类型{0}不带有参数
 
-compiler.err.type.var.cant.be.deref=\u65E0\u6CD5\u4ECE\u7C7B\u578B\u53D8\u91CF\u4E2D\u8FDB\u884C\u9009\u62E9
+compiler.err.type.var.cant.be.deref=无法从类型变量中进行选择
 
-compiler.err.type.var.may.not.be.followed.by.other.bounds=\u7C7B\u578B\u53D8\u91CF\u540E\u9762\u4E0D\u80FD\u5E26\u6709\u5176\u4ED6\u9650\u5236\u8303\u56F4
+compiler.err.type.var.may.not.be.followed.by.other.bounds=类型变量后面不能带有其他限制范围
 
-compiler.err.type.var.more.than.once=\u7C7B\u578B\u53D8\u91CF{0}\u5728{1}\u7684\u7ED3\u679C\u7C7B\u578B\u4E2D\u591A\u6B21\u51FA\u73B0; \u5FC5\u987B\u5BF9\u5176\u8FDB\u884C\u5B9E\u4F8B\u5316
+compiler.err.type.var.more.than.once=类型变量{0}在{1}的结果类型中多次出现; 必须对其进行实例化
 
-compiler.err.type.var.more.than.once.in.result=\u7C7B\u578B\u53D8\u91CF{0}\u5728{1}\u7684\u7C7B\u578B\u4E2D\u591A\u6B21\u51FA\u73B0; \u5FC5\u987B\u5BF9\u5176\u8FDB\u884C\u5B9E\u4F8B\u5316
+compiler.err.type.var.more.than.once.in.result=类型变量{0}在{1}的类型中多次出现; 必须对其进行实例化
 
 # 0: type, 1: type, 2: fragment
-compiler.err.types.incompatible=\u7C7B\u578B {0} \u548C {1} \u4E0D\u517C\u5BB9\uFF1B\n{2}
+compiler.err.types.incompatible=类型 {0} 和 {1} 不兼容；\n{2}
 
 # 0: name, 1: list of type
-compiler.misc.incompatible.diff.ret=\u4E24\u8005\u90FD\u5B9A\u4E49\u4E86 {0}({1})\uFF0C\u4F46\u8FD4\u56DE\u7C7B\u578B\u4E0D\u76F8\u5173
+compiler.misc.incompatible.diff.ret=两者都定义了 {0}({1})，但返回类型不相关
 
 # 0: type, 1: name, 2: list of type
-compiler.err.incompatible.diff.ret.same.type=\u7C7B\u578B {0} \u591A\u6B21\u5B9A\u4E49\u4E86 {1}({2})\uFF0C\u4F46\u8FD4\u56DE\u7C7B\u578B\u4E0D\u76F8\u5173
+compiler.err.incompatible.diff.ret.same.type=类型 {0} 多次定义了 {1}({2})，但返回类型不相关
 
 # 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
-compiler.misc.incompatible.unrelated.defaults={0} {1}\u4ECE\u7C7B\u578B {4} \u548C {5} \u4E2D\u7EE7\u627F\u4E86{2}({3}) \u7684\u4E0D\u76F8\u5173\u9ED8\u8BA4\u503C
+compiler.misc.incompatible.unrelated.defaults={0} {1}从类型 {4} 和 {5} 中继承了{2}({3}) 的不相关默认值
 
 # 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
-compiler.misc.incompatible.abstract.default={0} {1}\u4ECE\u7C7B\u578B {4} \u548C {5} \u4E2D\u7EE7\u627F\u4E86{2}({3}) \u7684\u62BD\u8C61\u548C\u9ED8\u8BA4\u503C
+compiler.misc.incompatible.abstract.default={0} {1}从类型 {4} 和 {5} 中继承了{2}({3}) 的抽象和默认值
 
 # 0: name, 1: kind name, 2: symbol
-compiler.err.default.overrides.object.member={1} {2} \u4E2D\u7684\u9ED8\u8BA4\u65B9\u6CD5{0}\u8986\u76D6\u4E86 java.lang.Object \u7684\u6210\u5458
+compiler.err.default.overrides.object.member={1} {2} 中的默认方法{0}覆盖了 java.lang.Object 的成员
 
 # 0: type
-compiler.err.illegal.static.intf.meth.call=\u9759\u6001\u63A5\u53E3\u65B9\u6CD5\u8C03\u7528\u975E\u6CD5\n\u5E94\u5C06\u63A5\u6536\u65B9\u8868\u8FBE\u5F0F\u66FF\u6362\u4E3A\u7C7B\u578B\u9650\u5B9A\u7B26 ''{0}''
+compiler.err.illegal.static.intf.meth.call=静态接口方法调用非法\n应将接收方表达式替换为类型限定符 ''{0}''
 
 # 0: symbol or type, 1: message segment
-compiler.err.illegal.default.super.call=\u9ED8\u8BA4\u8D85\u7EA7\u8C03\u7528\u4E2D\u7684\u7C7B\u578B\u9650\u5B9A\u7B26{0}\u9519\u8BEF\n{1}
+compiler.err.illegal.default.super.call=默认超级调用中的类型限定符{0}错误\n{1}
 
 # 0: symbol, 1: type
-compiler.misc.overridden.default=\u8986\u76D6\u4E86{1}\u4E2D\u7684\u65B9\u6CD5 {0}
+compiler.misc.overridden.default=覆盖了{1}中的方法 {0}
 
 # 0: symbol, 1: type or symbol
-compiler.misc.redundant.supertype=\u5197\u4F59\u63A5\u53E3 {0} \u5DF2\u7531 {1} \u6269\u5C55
+compiler.misc.redundant.supertype=冗余接口 {0} 已由 {1} 扩展
 
-compiler.err.unclosed.char.lit=\u672A\u7ED3\u675F\u7684\u5B57\u7B26\u6587\u5B57
+compiler.err.unclosed.char.lit=未结束的字符文字
 
-compiler.err.unclosed.comment=\u672A\u7ED3\u675F\u7684\u6CE8\u91CA
+compiler.err.unclosed.comment=未结束的注释
 
-compiler.err.unclosed.str.lit=\u672A\u7ED3\u675F\u7684\u5B57\u7B26\u4E32\u6587\u5B57
+compiler.err.unclosed.str.lit=未结束的字符串文字
 
-compiler.err.unclosed.text.block=\u6587\u672C\u5757\u672A\u95ED\u5408
+compiler.err.unclosed.text.block=文本块未闭合
 
-compiler.err.string.template.is.not.well.formed=\u5B57\u7B26\u4E32\u6A21\u677F\u683C\u5F0F\u4E0D\u6B63\u786E
+compiler.err.string.template.is.not.well.formed=字符串模板格式不正确
 
-compiler.err.text.block.template.is.not.well.formed=\u6587\u672C\u5757\u6A21\u677F\u683C\u5F0F\u4E0D\u6B63\u786E
+compiler.err.text.block.template.is.not.well.formed=文本块模板格式不正确
 
-compiler.err.processor.missing.from.string.template.expression=\u5B57\u7B26\u4E32\u6A21\u677F\u8868\u8FBE\u5F0F\u7F3A\u5C11\u5904\u7406\u7A0B\u5E8F
+compiler.err.processor.missing.from.string.template.expression=字符串模板表达式缺少处理程序
 
 # 0: symbol
-compiler.err.processor.type.cannot.be.a.raw.type=\u5904\u7406\u7A0B\u5E8F\u7C7B\u578B\u4E0D\u80FD\u4E3A\u539F\u59CB\u7C7B\u578B\uFF1A{0}
+compiler.err.processor.type.cannot.be.a.raw.type=处理程序类型不能为原始类型：{0}
 
 # 0: symbol
-compiler.err.not.a.processor.type=\u4E0D\u662F\u5904\u7406\u7A0B\u5E8F\u7C7B\u578B\uFF1A{0}
+compiler.err.not.a.processor.type=不是处理程序类型：{0}
 
 # 0: string
-compiler.err.unsupported.encoding=\u4E0D\u652F\u6301\u7684\u7F16\u7801: {0}
+compiler.err.unsupported.encoding=不支持的编码: {0}
 
-compiler.err.io.exception=\u8BFB\u53D6\u6E90\u6587\u4EF6\u65F6\u51FA\u9519: {0}
+compiler.err.io.exception=读取源文件时出错: {0}
 
 # 0: name
-compiler.err.undef.label=\u672A\u5B9A\u4E49\u7684\u6807\u7B7E: {0}
+compiler.err.undef.label=未定义的标签: {0}
 
 # 0: name
-compiler.err.illegal.ref.to.restricted.type=\u5BF9\u53D7\u9650\u5236\u7C7B\u578B ''{0}'' \u7684\u5F15\u7528\u975E\u6CD5
+compiler.err.illegal.ref.to.restricted.type=对受限制类型 ''{0}'' 的引用非法
 
 # 0: name
-compiler.warn.illegal.ref.to.restricted.type=\u5BF9\u53D7\u9650\u5236\u7C7B\u578B ''{0}'' \u7684\u5F15\u7528\u975E\u6CD5
+compiler.warn.illegal.ref.to.restricted.type=对受限制类型 ''{0}'' 的引用非法
 
 # 0: name, 1: source
-compiler.err.restricted.type.not.allowed=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528 ''{0}''\n\u4ECE\u53D1\u884C\u7248 {1} \u5F00\u59CB\uFF0C''{0}'' \u662F\u53D7\u9650\u7C7B\u578B\u540D\u79F0\uFF0C\u4E0D\u80FD\u7528\u4E8E\u7C7B\u578B\u58F0\u660E
+compiler.err.restricted.type.not.allowed=此处不允许使用 ''{0}''\n从发行版 {1} 开始，''{0}'' 是受限类型名称，不能用于类型声明
 
 # 0: name, 1: source
-compiler.warn.restricted.type.not.allowed=\u4ECE\u53D1\u884C\u7248 {1} \u5F00\u59CB\uFF0C''{0}'' \u662F\u53D7\u9650\u7C7B\u578B\u540D\u79F0\uFF0C\u4E0D\u80FD\u7528\u4E8E\u7C7B\u578B\u58F0\u660E\uFF0C\u4E5F\u4E0D\u80FD\u7528\u4F5C\u6570\u7EC4\u7684\u5143\u7D20\u7C7B\u578B
+compiler.warn.restricted.type.not.allowed=从发行版 {1} 开始，''{0}'' 是受限类型名称，不能用于类型声明，也不能用作数组的元素类型
 
 # 0: name, 1: source
-compiler.warn.restricted.type.not.allowed.preview=''{0}'' \u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u53EF\u80FD\u4F1A\u6210\u4E3A\u53D7\u9650\u7C7B\u578B\u540D\u79F0\uFF0C\u53EF\u80FD\u65E0\u6CD5\u7528\u4E8E\u7C7B\u578B\u58F0\u660E\uFF0C\u4E5F\u4E0D\u80FD\u7528\u4F5C\u6570\u7EC4\u7684\u5143\u7D20\u7C7B\u578B
+compiler.warn.restricted.type.not.allowed.preview=''{0}'' 在未来发行版中可能会成为受限类型名称，可能无法用于类型声明，也不能用作数组的元素类型
 
 # 0: name (variable), 1: message segment
-compiler.err.cant.infer.local.var.type=\u65E0\u6CD5\u63A8\u65AD\u672C\u5730\u53D8\u91CF {0} \u7684\u7C7B\u578B\n({1})
+compiler.err.cant.infer.local.var.type=无法推断本地变量 {0} 的类型\n({1})
 
 # 0: name
-compiler.err.restricted.type.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528 ''{0}''
+compiler.err.restricted.type.not.allowed.here=此处不允许使用 ''{0}''
 
 # 0: name
-compiler.err.restricted.type.not.allowed.array=''{0}'' \u4E0D\u5141\u8BB8\u7528\u4F5C\u6570\u7EC4\u7684\u5143\u7D20\u7C7B\u578B
+compiler.err.restricted.type.not.allowed.array=''{0}'' 不允许用作数组的元素类型
 
 # 0: name
-compiler.err.restricted.type.not.allowed.compound=''{0}'' \u4E0D\u5141\u8BB8\u5728\u590D\u5408\u58F0\u660E\u4E2D\u4F7F\u7528
+compiler.err.restricted.type.not.allowed.compound=''{0}'' 不允许在复合声明中使用
 
 # 0: fragment
-compiler.err.invalid.lambda.parameter.declaration=\u65E0\u6548\u7684 lambda \u53C2\u6570\u58F0\u660E\n({0})
+compiler.err.invalid.lambda.parameter.declaration=无效的 lambda 参数声明\n({0})
 
-compiler.misc.implicit.and.explicit.not.allowed=\u4E0D\u80FD\u5C06\u9690\u5F0F\u7C7B\u578B\u548C\u663E\u5F0F\u7C7B\u578B\u7684\u53C2\u6570\u6DF7\u5408\u4F7F\u7528
+compiler.misc.implicit.and.explicit.not.allowed=不能将隐式类型和显式类型的参数混合使用
 
-compiler.misc.var.and.explicit.not.allowed=\u4E0D\u80FD\u5C06 ''var'' \u548C\u663E\u5F0F\u7C7B\u578B\u7684\u53C2\u6570\u6DF7\u5408\u4F7F\u7528
+compiler.misc.var.and.explicit.not.allowed=不能将 ''var'' 和显式类型的参数混合使用
 
-compiler.misc.var.and.implicit.not.allowed=\u4E0D\u80FD\u5C06 ''var'' \u548C\u9690\u5F0F\u7C7B\u578B\u7684\u53C2\u6570\u6DF7\u5408\u4F7F\u7528
+compiler.misc.var.and.implicit.not.allowed=不能将 ''var'' 和隐式类型的参数混合使用
 
-compiler.misc.local.cant.infer.null=\u53D8\u91CF\u521D\u59CB\u5316\u7A0B\u5E8F\u4E3A ''null''
+compiler.misc.local.cant.infer.null=变量初始化程序为 ''null''
 
-compiler.misc.local.cant.infer.void=\u53D8\u91CF\u521D\u59CB\u5316\u7A0B\u5E8F\u4E3A ''void''
+compiler.misc.local.cant.infer.void=变量初始化程序为 ''void''
 
-compiler.misc.local.missing.init=\u65E0\u6CD5\u5728\u4E0D\u5E26\u521D\u59CB\u5316\u7A0B\u5E8F\u7684\u53D8\u91CF\u4E0A\u4F7F\u7528 ''var''
+compiler.misc.local.missing.init=无法在不带初始化程序的变量上使用 ''var''
 
-compiler.misc.local.lambda.missing.target=lambda \u8868\u8FBE\u5F0F\u9700\u8981\u663E\u5F0F\u76EE\u6807\u7C7B\u578B
+compiler.misc.local.lambda.missing.target=lambda 表达式需要显式目标类型
 
-compiler.misc.local.mref.missing.target=\u65B9\u6CD5\u5F15\u7528\u9700\u8981\u663E\u5F0F\u76EE\u6807\u7C7B\u578B
+compiler.misc.local.mref.missing.target=方法引用需要显式目标类型
 
-compiler.misc.local.array.missing.target=\u6570\u7EC4\u521D\u59CB\u5316\u7A0B\u5E8F\u9700\u8981\u663E\u5F0F\u76EE\u6807\u7C7B\u578B
+compiler.misc.local.array.missing.target=数组初始化程序需要显式目标类型
 
-compiler.misc.local.self.ref=\u65E0\u6CD5\u5728\u81EA\u5F15\u7528\u53D8\u91CF\u4E0A\u4F7F\u7528 ''var''
+compiler.misc.local.self.ref=无法在自引用变量上使用 ''var''
 
 # 0: message segment, 1: unused
-compiler.err.cant.apply.diamond=\u65E0\u6CD5\u63A8\u65AD{0}\u7684\u7C7B\u578B\u53C2\u6570
+compiler.err.cant.apply.diamond=无法推断{0}的类型参数
 
 # 0: message segment or type, 1: message segment
-compiler.err.cant.apply.diamond.1=\u65E0\u6CD5\u63A8\u65AD{0}\u7684\u7C7B\u578B\u53C2\u6570\n\u539F\u56E0: {1}
+compiler.err.cant.apply.diamond.1=无法推断{0}的类型参数\n原因: {1}
 
 # 0: message segment or type, 1: message segment
-compiler.misc.cant.apply.diamond.1=\u65E0\u6CD5\u63A8\u65AD{0}\u7684\u7C7B\u578B\u53C2\u6570\n\u539F\u56E0: {1}
+compiler.misc.cant.apply.diamond.1=无法推断{0}的类型参数\n原因: {1}
 
-compiler.err.unreachable.stmt=\u65E0\u6CD5\u8BBF\u95EE\u7684\u8BED\u53E5
+compiler.err.unreachable.stmt=无法访问的语句
 
-compiler.err.not.exhaustive=switch \u8868\u8FBE\u5F0F\u4E0D\u5305\u542B\u6240\u6709\u53EF\u80FD\u7684\u8F93\u5165\u503C
+compiler.err.not.exhaustive=switch 表达式不包含所有可能的输入值
 
-compiler.err.not.exhaustive.statement=\u5E76\u975E\u6240\u6709\u53EF\u80FD\u7684\u8F93\u5165\u503C\u90FD\u5305\u542B\u5728 switch \u8BED\u53E5\u4E2D
+compiler.err.not.exhaustive.statement=并非所有可能的输入值都包含在 switch 语句中
 
-compiler.err.initializer.must.be.able.to.complete.normally=\u521D\u59CB\u5316\u7A0B\u5E8F\u5FC5\u987B\u80FD\u591F\u6B63\u5E38\u5B8C\u6210
+compiler.err.initializer.must.be.able.to.complete.normally=初始化程序必须能够正常完成
 
-compiler.err.initializer.not.allowed=\u63A5\u53E3\u4E2D\u4E0D\u5141\u8BB8\u6709\u521D\u59CB\u5316\u7A0B\u5E8F
+compiler.err.initializer.not.allowed=接口中不允许有初始化程序
 
 # 0: type
-compiler.err.unreported.exception.need.to.catch.or.throw=\u672A\u62A5\u544A\u7684\u5F02\u5E38\u9519\u8BEF{0}; \u5FC5\u987B\u5BF9\u5176\u8FDB\u884C\u6355\u83B7\u6216\u58F0\u660E\u4EE5\u4FBF\u629B\u51FA
+compiler.err.unreported.exception.need.to.catch.or.throw=未报告的异常错误{0}; 必须对其进行捕获或声明以便抛出
 
 # 0: type
-compiler.err.unreported.exception.default.constructor=\u9ED8\u8BA4\u6784\u9020\u5668\u4E2D\u672A\u62A5\u544A\u7684\u5F02\u5E38\u9519\u8BEF{0}
+compiler.err.unreported.exception.default.constructor=默认构造器中未报告的异常错误{0}
 
 # 0: type, 1: name
-compiler.err.unreported.exception.implicit.close=\u672A\u62A5\u544A\u7684\u5F02\u5E38\u9519\u8BEF{0}; \u5FC5\u987B\u5BF9\u5176\u8FDB\u884C\u6355\u83B7\u6216\u58F0\u660E\u4EE5\u4FBF\u629B\u51FA\n\u5BF9\u8D44\u6E90\u53D8\u91CF ''{1}'' \u9690\u5F0F\u8C03\u7528 close() \u65F6\u629B\u51FA\u4E86\u5F02\u5E38\u9519\u8BEF
+compiler.err.unreported.exception.implicit.close=未报告的异常错误{0}; 必须对其进行捕获或声明以便抛出\n对资源变量 ''{1}'' 隐式调用 close() 时抛出了异常错误
 
-compiler.err.void.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528 ''\u7A7A'' \u7C7B\u578B
+compiler.err.void.not.allowed.here=此处不允许使用 ''空'' 类型
 
 # 0: string
-compiler.err.wrong.number.type.args=\u7C7B\u578B\u53D8\u91CF\u6570\u76EE\u9519\u8BEF; \u9700\u8981{0}
+compiler.err.wrong.number.type.args=类型变量数目错误; 需要{0}
 
 # 0: symbol
-compiler.err.var.might.already.be.assigned=\u53EF\u80FD\u5DF2\u5206\u914D\u53D8\u91CF{0}
+compiler.err.var.might.already.be.assigned=可能已分配变量{0}
 
 # 0: symbol
-compiler.err.var.might.not.have.been.initialized=\u53EF\u80FD\u5C1A\u672A\u521D\u59CB\u5316\u53D8\u91CF{0}
+compiler.err.var.might.not.have.been.initialized=可能尚未初始化变量{0}
 
 # 0: symbol
-compiler.err.var.not.initialized.in.default.constructor=\u53D8\u91CF {0} \u672A\u5728\u9ED8\u8BA4\u6784\u9020\u5668\u4E2D\u521D\u59CB\u5316
+compiler.err.var.not.initialized.in.default.constructor=变量 {0} 未在默认构造器中初始化
 
 # 0: symbol
-compiler.err.var.might.be.assigned.in.loop=\u53EF\u80FD\u5728 loop \u4E2D\u5206\u914D\u4E86\u53D8\u91CF{0}
+compiler.err.var.might.be.assigned.in.loop=可能在 loop 中分配了变量{0}
 
 # 0: symbol, 1: message segment
-compiler.err.varargs.invalid.trustme.anno={0} \u6279\u6CE8\u65E0\u6548\u3002{1}
+compiler.err.varargs.invalid.trustme.anno={0} 批注无效。{1}
 
 # 0: type
-compiler.misc.varargs.trustme.on.reifiable.varargs=Varargs \u5143\u7D20\u7C7B\u578B{0}\u53EF\u5177\u4F53\u5316\u3002
+compiler.misc.varargs.trustme.on.reifiable.varargs=Varargs 元素类型{0}可具体化。
 
 # 0: type, 1: type
-compiler.err.instanceof.reifiable.not.safe={0} \u65E0\u6CD5\u5B89\u5168\u5730\u8F6C\u6362\u4E3A {1}
+compiler.err.instanceof.reifiable.not.safe={0} 无法安全地转换为 {1}
 
 # 0: symbol
-compiler.misc.varargs.trustme.on.non.varargs.meth=\u65B9\u6CD5 {0} \u4E0D\u662F varargs \u65B9\u6CD5\u3002
+compiler.misc.varargs.trustme.on.non.varargs.meth=方法 {0} 不是 varargs 方法。
 
 # 0: symbol
-compiler.misc.varargs.trustme.on.non.varargs.accessor=\u5B58\u53D6\u65B9\u6CD5 {0} \u4E0D\u662F varargs \u65B9\u6CD5\u3002
+compiler.misc.varargs.trustme.on.non.varargs.accessor=存取方法 {0} 不是 varargs 方法。
 
 # 0: symbol
-compiler.misc.varargs.trustme.on.virtual.varargs=\u5B9E\u4F8B\u65B9\u6CD5 {0} \u65E2\u4E0D\u662F\u6700\u7EC8\u7684, \u4E5F\u4E0D\u662F\u79C1\u6709\u7684\u3002
+compiler.misc.varargs.trustme.on.virtual.varargs=实例方法 {0} 既不是最终的, 也不是私有的。
 
 # 0: symbol
-compiler.misc.varargs.trustme.on.virtual.varargs.final.only=\u5B9E\u4F8B\u65B9\u6CD5 {0} \u4E0D\u662F\u6700\u7EC8\u7684\u3002
+compiler.misc.varargs.trustme.on.virtual.varargs.final.only=实例方法 {0} 不是最终的。
 
 # 0: type, 1: symbol kind, 2: symbol
-compiler.misc.inaccessible.varargs.type=\u5F62\u5F0F varargs \u5143\u7D20\u7C7B\u578B{0}\u65E0\u6CD5\u4ECE {1} {2} \u8FDB\u884C\u8BBF\u95EE
+compiler.misc.inaccessible.varargs.type=形式 varargs 元素类型{0}无法从 {1} {2} 进行访问
 
 # In the following string, {1} will always be the detail message from
 # java.io.IOException.
 # 0: symbol, 1: string
-compiler.err.class.cant.write=\u5199\u5165{0}\u65F6\u51FA\u9519: {1}
+compiler.err.class.cant.write=写入{0}时出错: {1}
 
 # In the following string, {0} is the name of the class in the Java source.
 # It really should be used two times..
 # 0: kind name, 1: name
-compiler.err.class.public.should.be.in.file={0} {1} \u662F\u516C\u5171\u7684, \u5E94\u5728\u540D\u4E3A {1}.java \u7684\u6587\u4EF6\u4E2D\u58F0\u660E
+compiler.err.class.public.should.be.in.file={0} {1} 是公共的, 应在名为 {1}.java 的文件中声明
 
 ## All errors which do not refer to a particular line in the source code are
 ## preceded by this string.
-compiler.err.error=\u9519\u8BEF:\u0020
+compiler.err.error=错误:\u0020
 
 # The following error messages do not refer to a line in the source code.
-compiler.err.cant.read.file=\u65E0\u6CD5\u8BFB\u53D6: {0}
+compiler.err.cant.read.file=无法读取: {0}
 
 # 0: string
-compiler.err.plugin.not.found=\u627E\u4E0D\u5230\u63D2\u4EF6: {0}
+compiler.err.plugin.not.found=找不到插件: {0}
 
 # 0: path
-compiler.warn.locn.unknown.file.on.module.path=\u6A21\u5757\u8DEF\u5F84\u4E2D\u7684\u672A\u77E5\u6587\u4EF6: {0}
+compiler.warn.locn.unknown.file.on.module.path=模块路径中的未知文件: {0}
 
 
 # 0: path
-compiler.err.locn.bad.module-info=\u8BFB\u53D6 {0} \u4E2D\u7684 module-info.class \u65F6\u51FA\u73B0\u95EE\u9898
+compiler.err.locn.bad.module-info=读取 {0} 中的 module-info.class 时出现问题
 
 # 0: path
-compiler.err.locn.cant.read.directory=\u65E0\u6CD5\u8BFB\u53D6\u76EE\u5F55 {0}
+compiler.err.locn.cant.read.directory=无法读取目录 {0}
 
 # 0: path
-compiler.err.locn.cant.read.file=\u65E0\u6CD5\u8BFB\u53D6\u6587\u4EF6 {0}
+compiler.err.locn.cant.read.file=无法读取文件 {0}
 
 # 0: path
-compiler.err.locn.cant.get.module.name.for.jar=\u65E0\u6CD5\u786E\u5B9A {0} \u7684\u6A21\u5757\u540D\u79F0
+compiler.err.locn.cant.get.module.name.for.jar=无法确定 {0} 的模块名称
 
 # 0: path
-compiler.err.multi-module.outdir.cannot.be.exploded.module=\u5728\u591A\u6A21\u5757\u6A21\u5F0F\u4E0B, \u8F93\u51FA\u76EE\u5F55\u4E0D\u80FD\u662F\u5C55\u5F00\u7684\u6A21\u5757: {0}
+compiler.err.multi-module.outdir.cannot.be.exploded.module=在多模块模式下, 输出目录不能是展开的模块: {0}
 
 # 0: path
-compiler.warn.outdir.is.in.exploded.module=\u8F93\u51FA\u76EE\u5F55\u4F4D\u4E8E\u5C55\u5F00\u7684\u6A21\u5757\u4E2D: {0}
+compiler.warn.outdir.is.in.exploded.module=输出目录位于展开的模块中: {0}
 
 # 0: file object
-compiler.err.locn.module-info.not.allowed.on.patch.path=\u5728\u8865\u4E01\u7A0B\u5E8F\u8DEF\u5F84\u4E2D\u4E0D\u5141\u8BB8 module-info.class: {0}
+compiler.err.locn.module-info.not.allowed.on.patch.path=在补丁程序路径中不允许 module-info.class: {0}
 
 # 0: string
-compiler.err.locn.invalid.arg.for.xpatch=--patch-module \u9009\u9879\u7684\u53C2\u6570\u65E0\u6548: {0}
+compiler.err.locn.invalid.arg.for.xpatch=--patch-module 选项的参数无效: {0}
 
-compiler.err.file.sb.on.source.or.patch.path.for.module=\u6587\u4EF6\u5E94\u5728\u6E90\u8DEF\u5F84\u6216\u6A21\u5757\u7684\u8865\u4E01\u7A0B\u5E8F\u8DEF\u5F84\u4E2D
+compiler.err.file.sb.on.source.or.patch.path.for.module=文件应在源路径或模块的补丁程序路径中
 
-compiler.err.no.java.lang=\u5728\u5E73\u53F0\u7C7B\u4E2D\u627E\u4E0D\u5230\u7A0B\u5E8F\u5305 java.lang
+compiler.err.no.java.lang=在平台类中找不到程序包 java.lang
 
 #####
 
 # Fatal Errors
 
 # 0: name
-compiler.misc.fatal.err.cant.locate.meth=\u81F4\u547D\u9519\u8BEF: \u627E\u4E0D\u5230\u65B9\u6CD5{0}
+compiler.misc.fatal.err.cant.locate.meth=致命错误: 找不到方法{0}
 
 # 0: name
-compiler.misc.fatal.err.cant.locate.field=\u81F4\u547D\u9519\u8BEF: \u627E\u4E0D\u5230\u5B57\u6BB5{0}
+compiler.misc.fatal.err.cant.locate.field=致命错误: 找不到字段{0}
 
 # 0: type
-compiler.misc.fatal.err.cant.locate.ctor=\u81F4\u547D\u9519\u8BEF: \u627E\u4E0D\u5230{0}\u7684\u6784\u9020\u5668
+compiler.misc.fatal.err.cant.locate.ctor=致命错误: 找不到{0}的构造器
 
-compiler.misc.fatal.err.cant.close=\u81F4\u547D\u9519\u8BEF: \u65E0\u6CD5\u5173\u95ED\u7F16\u8BD1\u5668\u8D44\u6E90
+compiler.misc.fatal.err.cant.close=致命错误: 无法关闭编译器资源
 
 #####
 
@@ -1165,94 +1165,94 @@ compiler.misc.fatal.err.cant.close=\u81F4\u547D\u9519\u8BEF: \u65E0\u6CD5\u5173\
 ## miscellaneous strings
 ##
 
-compiler.misc.diamond.anonymous.methods.implicitly.override=(\u7531\u4E8E <>, \u533F\u540D\u7C7B\u4E2D\u58F0\u660E\u7684\u6BCF\u4E2A\u975E\u79C1\u6709\u65B9\u6CD5\u5FC5\u987B\u8986\u76D6\u6216\u5B9E\u73B0\u8D85\u7C7B\u578B\u4E2D\u7684\u65B9\u6CD5)
+compiler.misc.diamond.anonymous.methods.implicitly.override=(由于 <>, 匿名类中声明的每个非私有方法必须覆盖或实现超类型中的方法)
 
-compiler.misc.source.unavailable=(\u6E90\u4E0D\u53EF\u7528)
+compiler.misc.source.unavailable=(源不可用)
 
 # 0: string, 1: string, 2: boolean
-compiler.misc.x.print.processor.info=\u5904\u7406\u7A0B\u5E8F{0}\u4E0E{1}\u5339\u914D\u5E76\u8FD4\u56DE{2}\u3002
+compiler.misc.x.print.processor.info=处理程序{0}与{1}匹配并返回{2}。
 
 # 0: number, 1: string, 2: set of symbol, 3: boolean
-compiler.misc.x.print.rounds=\u5FAA\u73AF {0}:\n\t\u8F93\u5165\u6587\u4EF6: {1}\n\t\u6279\u6CE8: {2}\n\t\u6700\u540E\u4E00\u4E2A\u5FAA\u73AF: {3}
+compiler.misc.x.print.rounds=循环 {0}:\n\t输入文件: {1}\n\t批注: {2}\n\t最后一个循环: {3}
 
 # 0: file name
-compiler.warn.file.from.future=\u6587\u4EF6 {0} \u7684\u4FEE\u6539\u65E5\u671F\u662F\u672A\u6765\u7684\u65E5\u671F
+compiler.warn.file.from.future=文件 {0} 的修改日期是未来的日期
 
 # 0: path
-compiler.warn.output.file.clash=\u591A\u6B21\u5199\u5165\u8F93\u51FA\u6587\u4EF6\uFF1A{0}
+compiler.warn.output.file.clash=多次写入输出文件：{0}
 
 #####
 
 ## The following string will appear before all messages keyed as:
 ## "compiler.note".
 
-compiler.note.compressed.diags=\u67D0\u4E9B\u6D88\u606F\u5DF2\u7ECF\u8FC7\u7B80\u5316; \u8BF7\u4F7F\u7528 -Xdiags:verbose \u91CD\u65B0\u7F16\u8BD1\u4EE5\u83B7\u5F97\u5B8C\u6574\u8F93\u51FA
+compiler.note.compressed.diags=某些消息已经过简化; 请使用 -Xdiags:verbose 重新编译以获得完整输出
 
 # 0: boolean, 1: symbol
-compiler.note.lambda.stat=\u8F6C\u6362 lambda \u8868\u8FBE\u5F0F\n\u66FF\u4EE3 metafactory = {0}\n\u5408\u6210\u65B9\u6CD5 = {1}
+compiler.note.lambda.stat=转换 lambda 表达式\n替代 metafactory = {0}\n合成方法 = {1}
 
 # 0: boolean, 1: unused
-compiler.note.mref.stat=\u8F6C\u6362\u65B9\u6CD5\u5F15\u7528\n\u66FF\u4EE3 metafactory = {0}\n
+compiler.note.mref.stat=转换方法引用\n替代 metafactory = {0}\n
 # 0: boolean, 1: symbol
-compiler.note.mref.stat.1=\u8F6C\u6362\u65B9\u6CD5\u5F15\u7528\n\u66FF\u4EE3 metafactory = {0}\nbridge \u65B9\u6CD5 = {1}
+compiler.note.mref.stat.1=转换方法引用\n替代 metafactory = {0}\nbridge 方法 = {1}
 
-compiler.note.note=\u6CE8:\u0020
+compiler.note.note=注:\u0020
 
 # 0: file name
-compiler.note.deprecated.filename={0}\u4F7F\u7528\u6216\u8986\u76D6\u4E86\u5DF2\u8FC7\u65F6\u7684 API\u3002
+compiler.note.deprecated.filename={0}使用或覆盖了已过时的 API。
 
-compiler.note.deprecated.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528\u6216\u8986\u76D6\u4E86\u5DF2\u8FC7\u65F6\u7684 API\u3002
+compiler.note.deprecated.plural=某些输入文件使用或覆盖了已过时的 API。
 
 # The following string may appear after one of the above deprecation
 # messages.
-compiler.note.deprecated.recompile=\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u4F7F\u7528 -Xlint:deprecation \u91CD\u65B0\u7F16\u8BD1\u3002
+compiler.note.deprecated.recompile=有关详细信息, 请使用 -Xlint:deprecation 重新编译。
 
 # 0: file name
-compiler.note.deprecated.filename.additional={0}\u8FD8\u4F7F\u7528\u6216\u8986\u76D6\u4E86\u5DF2\u8FC7\u65F6\u7684 API\u3002
+compiler.note.deprecated.filename.additional={0}还使用或覆盖了已过时的 API。
 
-compiler.note.deprecated.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8FD8\u4F7F\u7528\u6216\u8986\u76D6\u4E86\u5DF2\u8FC7\u65F6\u7684 API\u3002
+compiler.note.deprecated.plural.additional=某些输入文件还使用或覆盖了已过时的 API。
 
 # 0: file name
-compiler.note.removal.filename={0} \u4F7F\u7528\u6216\u8986\u76D6\u4E86\u6807\u8BB0\u4E3A\u5F85\u5220\u9664\u7684\u5DF2\u8FC7\u65F6 API\u3002
+compiler.note.removal.filename={0} 使用或覆盖了标记为待删除的已过时 API。
 
-compiler.note.removal.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528\u6216\u8986\u76D6\u4E86\u6807\u8BB0\u4E3A\u5F85\u5220\u9664\u7684\u5DF2\u8FC7\u65F6 API\u3002
+compiler.note.removal.plural=某些输入文件使用或覆盖了标记为待删除的已过时 API。
 
 # The following string may appear after one of the above removal messages.
-compiler.note.removal.recompile=\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u4F7F\u7528 -Xlint:removal \u91CD\u65B0\u7F16\u8BD1\u3002
+compiler.note.removal.recompile=有关详细信息, 请使用 -Xlint:removal 重新编译。
 
 # 0: file name
-compiler.note.removal.filename.additional={0} \u989D\u5916\u4F7F\u7528\u6216\u8986\u76D6\u4E86\u6807\u8BB0\u4E3A\u5F85\u5220\u9664\u7684\u5DF2\u8FC7\u65F6 API\u3002
+compiler.note.removal.filename.additional={0} 额外使用或覆盖了标记为待删除的已过时 API。
 
-compiler.note.removal.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u989D\u5916\u4F7F\u7528\u6216\u8986\u76D6\u4E86\u6807\u8BB0\u4E3A\u5F85\u5220\u9664\u7684\u5DF2\u8FC7\u65F6 API\u3002
+compiler.note.removal.plural.additional=某些输入文件额外使用或覆盖了标记为待删除的已过时 API。
 
 # 0: file name
-compiler.note.unchecked.filename={0}\u4F7F\u7528\u4E86\u672A\u7ECF\u68C0\u67E5\u6216\u4E0D\u5B89\u5168\u7684\u64CD\u4F5C\u3002
+compiler.note.unchecked.filename={0}使用了未经检查或不安全的操作。
 
-compiler.note.unchecked.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528\u4E86\u672A\u7ECF\u68C0\u67E5\u6216\u4E0D\u5B89\u5168\u7684\u64CD\u4F5C\u3002
+compiler.note.unchecked.plural=某些输入文件使用了未经检查或不安全的操作。
 
 # The following string may appear after one of the above unchecked messages.
-compiler.note.unchecked.recompile=\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u4F7F\u7528 -Xlint:unchecked \u91CD\u65B0\u7F16\u8BD1\u3002
+compiler.note.unchecked.recompile=有关详细信息, 请使用 -Xlint:unchecked 重新编译。
 
 # 0: file name
-compiler.note.unchecked.filename.additional={0}\u8FD8\u6709\u672A\u7ECF\u68C0\u67E5\u6216\u4E0D\u5B89\u5168\u7684\u64CD\u4F5C\u3002
+compiler.note.unchecked.filename.additional={0}还有未经检查或不安全的操作。
 
-compiler.note.unchecked.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8FD8\u4F7F\u7528\u4E86\u672A\u7ECF\u68C0\u67E5\u6216\u4E0D\u5B89\u5168\u7684\u64CD\u4F5C\u3002
+compiler.note.unchecked.plural.additional=某些输入文件还使用了未经检查或不安全的操作。
 
 # 0: file name, 1: source
-compiler.note.preview.filename={0} \u4F7F\u7528 Java SE {1} \u7684\u9884\u89C8\u529F\u80FD\u3002
+compiler.note.preview.filename={0} 使用 Java SE {1} 的预览功能。
 
 # 0: source
-compiler.note.preview.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528 Java SE {0} \u7684\u9884\u89C8\u529F\u80FD\u3002
+compiler.note.preview.plural=某些输入文件使用 Java SE {0} 的预览功能。
 
 # The following string may appear after one of the above deprecation
 # messages.
-compiler.note.preview.recompile=\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u4F7F\u7528 -Xlint:preview \u91CD\u65B0\u7F16\u8BD1\u3002
+compiler.note.preview.recompile=有关详细信息，请使用 -Xlint:preview 重新编译。
 
 # 0: file name, 1: source
-compiler.note.preview.filename.additional={0} \u8FD8\u4F7F\u7528 Java SE {1} \u7684\u9884\u89C8\u529F\u80FD\u3002
+compiler.note.preview.filename.additional={0} 还使用 Java SE {1} 的预览功能。
 
 # 0: source
-compiler.note.preview.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8FD8\u4F7F\u7528 Java SE {0} \u7684\u9884\u89C8\u529F\u80FD\u3002
+compiler.note.preview.plural.additional=某些输入文件还使用 Java SE {0} 的预览功能。
 
 # Notes related to annotation processing
 
@@ -1261,61 +1261,61 @@ compiler.note.preview.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8F
 compiler.note.proc.messager={0}
 
 # 0: string, 1: string, 2: string
-compiler.note.multiple.elements=\u901A\u8FC7 javax.lang.model.util.Elements.{0} \u5728\u6A21\u5757 ''{2}'' \u4E2D\u627E\u5230\u4E86\u591A\u4E2A\u540D\u4E3A ''{1}'' \u7684\u5143\u7D20\u3002
+compiler.note.multiple.elements=通过 javax.lang.model.util.Elements.{0} 在模块 ''{2}'' 中找到了多个名为 ''{1}'' 的元素。
 
-compiler.note.implicit.annotation.processing=\u7531\u4E8E\u5728\u7C7B\u8DEF\u5F84\u4E2D\u53D1\u73B0\u4E86\u4E00\u4E2A\u6216\u591A\u4E2A\u5904\u7406\u7A0B\u5E8F\uFF0C\u56E0\u6B64\u542F\u7528\u4E86\n\u6279\u6CE8\u5904\u7406\u3002\u672A\u6765\u53D1\u884C\u7248\u7684 javac \u53EF\u80FD\u4F1A\u7981\u7528\u6279\u6CE8\u5904\u7406\uFF0C\n\u9664\u975E\u81F3\u5C11\u6309\u540D\u79F0\u6307\u5B9A\u4E86\u4E00\u4E2A\u5904\u7406\u7A0B\u5E8F (-processor)\uFF0C\n\u6216\u6307\u5B9A\u4E86\u641C\u7D22\u8DEF\u5F84 (--processor-path, --processor-module-path)\uFF0C\n\u6216\u663E\u5F0F\u542F\u7528\u4E86\u6279\u6CE8\u5904\u7406 (-proc:only, -proc:full)\u3002\n\u53EF\u4F7F\u7528 -Xlint:-options \u9690\u85CF\u6B64\u6D88\u606F\u3002\n\u53EF\u4F7F\u7528 -proc:none \u7981\u7528\u6279\u6CE8\u5904\u7406\u3002
+compiler.note.implicit.annotation.processing=由于在类路径中发现了一个或多个处理程序，因此启用了\n批注处理。未来发行版的 javac 可能会禁用批注处理，\n除非至少按名称指定了一个处理程序 (-processor)，\n或指定了搜索路径 (--processor-path, --processor-module-path)，\n或显式启用了批注处理 (-proc:only, -proc:full)。\n可使用 -Xlint:-options 隐藏此消息。\n可使用 -proc:none 禁用批注处理。
 
 #####
 
 # 0: number
-compiler.misc.count.error={0} \u4E2A\u9519\u8BEF
+compiler.misc.count.error={0} 个错误
 
 # 0: number
-compiler.misc.count.error.plural={0} \u4E2A\u9519\u8BEF
+compiler.misc.count.error.plural={0} 个错误
 
 # 0: number, 1: number
-compiler.misc.count.error.recompile=\u4EC5\u663E\u793A\u524D {0} \u4E2A\u9519\u8BEF\uFF08\u5171 {1} \u4E2A\uFF09\uFF1B\u82E5\u8981\u67E5\u770B\u66F4\u591A\u9519\u8BEF\uFF0C\u8BF7\u4F7F\u7528 -Xmaxerrs
+compiler.misc.count.error.recompile=仅显示前 {0} 个错误（共 {1} 个）；若要查看更多错误，请使用 -Xmaxerrs
 
 # 0: number, 1: number
-compiler.misc.count.warn.recompile=\u4EC5\u663E\u793A\u524D {0} \u4E2A\u8B66\u544A\uFF08\u5171 {1} \u4E2A\uFF09\uFF1B\u82E5\u8981\u67E5\u770B\u66F4\u591A\u9519\u8BEF\uFF0C\u8BF7\u4F7F\u7528 -Xmaxwarns
+compiler.misc.count.warn.recompile=仅显示前 {0} 个警告（共 {1} 个）；若要查看更多错误，请使用 -Xmaxwarns
 
 # 0: number
-compiler.misc.count.warn={0} \u4E2A\u8B66\u544A
+compiler.misc.count.warn={0} 个警告
 
 # 0: number
-compiler.misc.count.warn.plural={0} \u4E2A\u8B66\u544A
+compiler.misc.count.warn.plural={0} 个警告
 
-compiler.misc.version.not.available=(\u7248\u672C\u4FE1\u606F\u4E0D\u53EF\u7528)
+compiler.misc.version.not.available=(版本信息不可用)
 
 ## extra output when using -verbose (JavaCompiler)
 
 # 0: symbol
-compiler.misc.verbose.checking.attribution=[\u6B63\u5728\u68C0\u67E5{0}]
+compiler.misc.verbose.checking.attribution=[正在检查{0}]
 
 # 0: string
-compiler.misc.verbose.parsing.done=[\u8BED\u6CD5\u5206\u6790\u5DF2\u5B8C\u6210, \u7528\u65F6 {0} \u6BEB\u79D2]
+compiler.misc.verbose.parsing.done=[语法分析已完成, 用时 {0} 毫秒]
 
 # 0: file name
-compiler.misc.verbose.parsing.started=[\u8BED\u6CD5\u5206\u6790\u5F00\u59CB\u65F6\u95F4 {0}]
+compiler.misc.verbose.parsing.started=[语法分析开始时间 {0}]
 
 # 0: string
-compiler.misc.verbose.total=[\u5171 {0} \u6BEB\u79D2]
+compiler.misc.verbose.total=[共 {0} 毫秒]
 
 # 0: file name
-compiler.misc.verbose.wrote.file=[\u5DF2\u5199\u5165{0}]
+compiler.misc.verbose.wrote.file=[已写入{0}]
 
 ## extra output when using -verbose (code/ClassReader)
 # 0: string
-compiler.misc.verbose.loading=[\u6B63\u5728\u52A0\u8F7D{0}]
+compiler.misc.verbose.loading=[正在加载{0}]
 
 # 0: string
-compiler.misc.verbose.sourcepath=[\u6E90\u6587\u4EF6\u7684\u641C\u7D22\u8DEF\u5F84: {0}]
+compiler.misc.verbose.sourcepath=[源文件的搜索路径: {0}]
 
 # 0: string
-compiler.misc.verbose.classpath=[\u7C7B\u6587\u4EF6\u7684\u641C\u7D22\u8DEF\u5F84: {0}]
+compiler.misc.verbose.classpath=[类文件的搜索路径: {0}]
 
 ## extra output when using -prompt (util/Log)
-compiler.misc.resume.abort=\u7EE7\u7EED(R), \u653E\u5F03(A)>
+compiler.misc.resume.abort=继续(R), 放弃(A)>
 
 #####
 
@@ -1324,7 +1324,7 @@ compiler.misc.resume.abort=\u7EE7\u7EED(R), \u653E\u5F03(A)>
 ##
 
 ## All warning messages are preceded by the following string.
-compiler.warn.warning=\u8B66\u544A:\u0020
+compiler.warn.warning=警告:\u0020
 
 ## Warning messages may also include the following prefix to identify a
 ## lint option
@@ -1332,371 +1332,371 @@ compiler.warn.warning=\u8B66\u544A:\u0020
 compiler.warn.lintOption=[{0}]\u0020
 
 # 0: symbol
-compiler.warn.constant.SVUID=serialVersionUID \u5728\u7C7B{0}\u4E2D\u5FC5\u987B\u662F\u5E38\u91CF
+compiler.warn.constant.SVUID=serialVersionUID 在类{0}中必须是常量
 
 # 0: path
-compiler.warn.dir.path.element.not.found=\u9519\u8BEF\u7684\u8DEF\u5F84\u5143\u7D20 "{0}": \u6CA1\u6709\u8FD9\u79CD\u76EE\u5F55
+compiler.warn.dir.path.element.not.found=错误的路径元素 "{0}": 没有这种目录
 
 # 0: file name
-compiler.warn.dir.path.element.not.directory=\u9519\u8BEF\u7684\u8DEF\u5F84\u5143\u7D20 "{0}": \u4E0D\u662F\u76EE\u5F55
+compiler.warn.dir.path.element.not.directory=错误的路径元素 "{0}": 不是目录
 
 # 0: symbol, 1: symbol, 2: symbol
-compiler.warn.missing-explicit-ctor=\u5BFC\u51FA\u7684\u7A0B\u5E8F\u5305 {1} \u4E2D\u7684\u7C7B {0} \u672A\u58F0\u660E\u663E\u5F0F\u6784\u9020\u5668\uFF0C\u56E0\u6B64\u5C06\u5411\u6A21\u5757 {2} \u7684\u5BA2\u6237\u673A\u516C\u5F00\u9ED8\u8BA4\u6784\u9020\u5668
+compiler.warn.missing-explicit-ctor=导出的程序包 {1} 中的类 {0} 未声明显式构造器，因此将向模块 {2} 的客户机公开默认构造器
 
-compiler.warn.strictfp=\u4ECE\u53D1\u884C\u7248 17 \u5F00\u59CB\uFF0C\u6240\u6709\u6D6E\u70B9\u8868\u8FBE\u5F0F\u90FD\u7ECF\u8FC7\u4E25\u683C\u8BA1\u7B97\uFF0C\u4E0D\u9700\u8981 ''strictfp''
+compiler.warn.strictfp=从发行版 17 开始，所有浮点表达式都经过严格计算，不需要 ''strictfp''
 
-compiler.warn.finally.cannot.complete=finally \u5B50\u53E5\u65E0\u6CD5\u6B63\u5E38\u5B8C\u6210
+compiler.warn.finally.cannot.complete=finally 子句无法正常完成
 
 # 0: name
-compiler.warn.poor.choice.for.module.name=\u6A21\u5757\u540D\u79F0\u7EC4\u6210\u90E8\u5206 {0} \u5E94\u907F\u514D\u4EE5\u6570\u5B57\u7ED3\u5C3E
+compiler.warn.poor.choice.for.module.name=模块名称组成部分 {0} 应避免以数字结尾
 
 # 0: string
-compiler.warn.incubating.modules=\u4F7F\u7528 incubating \u6A21\u5757: {0}
+compiler.warn.incubating.modules=使用 incubating 模块: {0}
 
 # 0: symbol, 1: symbol
-compiler.warn.has.been.deprecated={1}\u4E2D\u7684{0}\u5DF2\u8FC7\u65F6
+compiler.warn.has.been.deprecated={1}中的{0}已过时
 
 # 0: symbol, 1: symbol
-compiler.warn.has.been.deprecated.for.removal={1} \u4E2D\u7684 {0} \u5DF2\u8FC7\u65F6, \u4E14\u6807\u8BB0\u4E3A\u5F85\u5220\u9664
+compiler.warn.has.been.deprecated.for.removal={1} 中的 {0} 已过时, 且标记为待删除
 
 # 0: symbol
-compiler.warn.is.preview={0} \u662F\u9884\u89C8 API\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
+compiler.warn.is.preview={0} 是预览 API，可能会在未来发行版中删除。
 
 # 0: symbol
-compiler.err.is.preview={0} \u662F\u9884\u89C8 API\uFF0C\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u5904\u4E8E\u7981\u7528\u72B6\u6001\u3002\n\uFF08\u8BF7\u4F7F\u7528 --enable-preview \u4EE5\u542F\u7528\u9884\u89C8 API\uFF09
+compiler.err.is.preview={0} 是预览 API，默认情况下处于禁用状态。\n（请使用 --enable-preview 以启用预览 API）
 
 # 0: symbol
-compiler.warn.is.preview.reflective={0} \u662F\u53CD\u5C04\u9884\u89C8 API\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
+compiler.warn.is.preview.reflective={0} 是反射预览 API，可能会在未来发行版中删除。
 
 # 0: symbol
-compiler.warn.has.been.deprecated.module=\u6A21\u5757 {0} \u5DF2\u8FC7\u65F6
+compiler.warn.has.been.deprecated.module=模块 {0} 已过时
 
 # 0: symbol
-compiler.warn.has.been.deprecated.for.removal.module=\u6A21\u5757 {0} \u5DF2\u8FC7\u65F6, \u4E14\u6807\u8BB0\u4E3A\u5F85\u5220\u9664
+compiler.warn.has.been.deprecated.for.removal.module=模块 {0} 已过时, 且标记为待删除
 
 # 0: symbol
-compiler.warn.sun.proprietary={0}\u662F\u5185\u90E8\u4E13\u7528 API, \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664
+compiler.warn.sun.proprietary={0}是内部专用 API, 可能会在未来发行版中删除
 
-compiler.warn.illegal.char.for.encoding=\u7F16\u7801{0}\u7684\u4E0D\u53EF\u6620\u5C04\u5B57\u7B26
+compiler.warn.illegal.char.for.encoding=编码{0}的不可映射字符
 
 # 0: symbol
-compiler.warn.improper.SVUID=\u5FC5\u987B\u5728\u7C7B{0}\u4E2D\u5C06 serialVersionUID \u58F0\u660E\u4E3A static final
+compiler.warn.improper.SVUID=必须在类{0}中将 serialVersionUID 声明为 static final
 
-compiler.warn.improper.SPF=serialPersistentFields \u5FC5\u987B\u58F0\u660E\u4E3A private static final \u624D\u80FD\u751F\u6548
+compiler.warn.improper.SPF=serialPersistentFields 必须声明为 private static final 才能生效
 
-compiler.warn.SPF.null.init=serialPersistentFields \u5982\u679C\u521D\u59CB\u5316\u4E3A\u7A7A\u503C\uFF0C\u5219\u65E0\u6548\u3002\n\u8BF7\u521D\u59CB\u5316\u4E3A\u7A7A\u6570\u7EC4\u4EE5\u6307\u793A\u6CA1\u6709\u5B57\u6BB5
+compiler.warn.SPF.null.init=serialPersistentFields 如果初始化为空值，则无效。\n请初始化为空数组以指示没有字段
 
 
 # 0: type, 1: type
-compiler.warn.inexact.non-varargs.call=\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u4F7F\u7528\u4E86\u4E0D\u51C6\u786E\u7684\u53D8\u91CF\u7C7B\u578B\u7684 varargs \u65B9\u6CD5\u7684\u975E varargs \u8C03\u7528; \n\u5BF9\u4E8E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {0}\n\u5BF9\u4E8E\u975E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {1}, \u8FD9\u6837\u4E5F\u53EF\u4EE5\u6291\u5236\u6B64\u8B66\u544A
+compiler.warn.inexact.non-varargs.call=最后一个参数使用了不准确的变量类型的 varargs 方法的非 varargs 调用; \n对于 varargs 调用, 应使用 {0}\n对于非 varargs 调用, 应使用 {1}, 这样也可以抑制此警告
 
 # 0: list of type
-compiler.warn.unreachable.catch=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u5DF2\u6355\u83B7\u5230\u629B\u51FA\u7684\u7C7B\u578B{0}
+compiler.warn.unreachable.catch=catch 子句无法访问\n已捕获到抛出的类型{0}
 
 # 0: list of type
-compiler.warn.unreachable.catch.1=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u5DF2\u6355\u83B7\u5230\u629B\u51FA\u7684\u7C7B\u578B{0}
+compiler.warn.unreachable.catch.1=catch 子句无法访问\n已捕获到抛出的类型{0}
 
 # 0: symbol
-compiler.warn.long.SVUID=serialVersionUID \u5728\u7C7B{0}\u4E2D\u5FC5\u987B\u662F long \u7C7B\u578B
+compiler.warn.long.SVUID=serialVersionUID 在类{0}中必须是 long 类型
 
-compiler.warn.OSF.array.SPF=serialPersistentFields \u7684\u7C7B\u578B\u5FC5\u987B\u4E3A java.io.ObjectStreamField[] \u624D\u80FD\u751F\u6548
+compiler.warn.OSF.array.SPF=serialPersistentFields 的类型必须为 java.io.ObjectStreamField[] 才能生效
 
 # 0: symbol
-compiler.warn.missing.SVUID=\u53EF\u5E8F\u5217\u5316\u7C7B{0}\u6CA1\u6709 serialVersionUID \u7684\u5B9A\u4E49
+compiler.warn.missing.SVUID=可序列化类{0}没有 serialVersionUID 的定义
 
 # 0: name
-compiler.warn.serializable.missing.access.no.arg.ctor=\u65E0\u6CD5\u8BBF\u95EE\u7B2C\u4E00\u4E2A\u4E0D\u53EF\u5E8F\u5217\u5316\u8D85\u7C7B {0} \u4E2D\u7684\u65E0\u53C2\u6570\u6784\u9020\u5668
+compiler.warn.serializable.missing.access.no.arg.ctor=无法访问第一个不可序列化超类 {0} 中的无参数构造器
 
 # 0: name
-compiler.warn.serial.method.not.private=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u672A\u58F0\u660E\u4E3A private
+compiler.warn.serial.method.not.private=与序列化相关的方法 {0} 未声明为 private
 
 # 0: name
-compiler.warn.serial.concrete.instance.method=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5FC5\u987B\u662F\u5177\u4F53\u7684\u5B9E\u4F8B\u65B9\u6CD5\u624D\u80FD\u751F\u6548\uFF0C\u65E2\u4E0D\u80FD\u662F\u62BD\u8C61\u65B9\u6CD5\u4E5F\u4E0D\u80FD\u662F\u9759\u6001\u65B9\u6CD5
+compiler.warn.serial.concrete.instance.method=与序列化相关的方法 {0} 必须是具体的实例方法才能生效，既不能是抽象方法也不能是静态方法
 
 # 0: name
-compiler.warn.serial.method.static=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u58F0\u660E\u4E3A static\uFF1B\u5FC5\u987B\u6539\u4E3A\u5B9E\u4F8B\u65B9\u6CD5\u624D\u80FD\u6709\u6548
+compiler.warn.serial.method.static=与序列化相关的方法 {0} 声明为 static；必须改为实例方法才能有效
 
 # 0: name
-compiler.warn.serial.method.no.args=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5FC5\u987B\u6CA1\u6709\u53C2\u6570\u624D\u80FD\u751F\u6548
+compiler.warn.serial.method.no.args=与序列化相关的方法 {0} 必须没有参数才能生效
 
 # 0: name, 1: number
-compiler.warn.serial.method.one.arg=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5FC5\u987B\u53EA\u6709\u4E00\u4E2A\u53C2\u6570\uFF08\u800C\u975E {1} \u4E2A\u53C2\u6570\uFF09\u624D\u80FD\u751F\u6548
+compiler.warn.serial.method.one.arg=与序列化相关的方法 {0} 必须只有一个参数（而非 {1} 个参数）才能生效
 
 # 0: name, 1: type, 2: type
-compiler.warn.serial.method.parameter.type=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u7684\u552F\u4E00\u53C2\u6570\u7684\u7C7B\u578B\u5FC5\u987B\u4E3A {1}\uFF08\u800C\u975E {2}\uFF09\u624D\u80FD\u751F\u6548
+compiler.warn.serial.method.parameter.type=与序列化相关的方法 {0} 的唯一参数的类型必须为 {1}（而非 {2}）才能生效
 
 # 0: name, 1: type, 2: type
-compiler.warn.serial.method.unexpected.return.type=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u662F\u7528\u8FD4\u56DE\u7C7B\u578B {1}\uFF08\u800C\u4E0D\u662F\u9884\u671F\u7C7B\u578B {2}\uFF09\u58F0\u660E\u7684\u3002\n\u5982\u58F0\u660E\u7684\u90A3\u6837\uFF0C\u8BE5\u65B9\u6CD5\u5BF9\u5E8F\u5217\u5316\u65E0\u6548
+compiler.warn.serial.method.unexpected.return.type=与序列化相关的方法 {0} 是用返回类型 {1}（而不是预期类型 {2}）声明的。\n如声明的那样，该方法对序列化无效
 
 # 0: name, 1: type
-compiler.warn.serial.method.unexpected.exception=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u58F0\u660E\u4E3A\u629B\u51FA\u610F\u5916\u7C7B\u578B {1}
+compiler.warn.serial.method.unexpected.exception=与序列化相关的方法 {0} 声明为抛出意外类型 {1}
 
-compiler.warn.ineffectual.serial.field.interface=serialPersistentFields \u5728\u63A5\u53E3\u4E2D\u65E0\u6548
+compiler.warn.ineffectual.serial.field.interface=serialPersistentFields 在接口中无效
 
 # 0: string
-compiler.warn.ineffectual.serial.field.enum=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u5B57\u6BB5 {0} \u5728\u679A\u4E3E\u7C7B\u4E2D\u65E0\u6548
+compiler.warn.ineffectual.serial.field.enum=与序列化相关的字段 {0} 在枚举类中无效
 
 # 0: string
-compiler.warn.ineffectual.serial.method.enum=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u679A\u4E3E\u7C7B\u4E2D\u65E0\u6548
+compiler.warn.ineffectual.serial.method.enum=与序列化相关的方法 {0} 在枚举类中无效
 
 # 0: string
-compiler.warn.ineffectual.extern.method.enum=\u4E0E\u5916\u90E8\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u679A\u4E3E\u7C7B\u4E2D\u65E0\u6548
+compiler.warn.ineffectual.extern.method.enum=与外部化相关的方法 {0} 在枚举类中无效
 
-compiler.warn.ineffectual.serial.field.record=serialPersistentFields \u5728\u8BB0\u5F55\u7C7B\u4E2D\u65E0\u6548
+compiler.warn.ineffectual.serial.field.record=serialPersistentFields 在记录类中无效
 
 # 0: string
-compiler.warn.ineffectual.serial.method.record=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u8BB0\u5F55\u7C7B\u4E2D\u65E0\u6548
+compiler.warn.ineffectual.serial.method.record=与序列化相关的方法 {0} 在记录类中无效
 
 # 0: string
-compiler.warn.ineffectual.externalizable.method.record=\u4E0E\u5916\u90E8\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u8BB0\u5F55\u7C7B\u4E2D\u65E0\u6548
+compiler.warn.ineffectual.externalizable.method.record=与外部化相关的方法 {0} 在记录类中无效
 
 # 0: name
-compiler.warn.ineffectual.serial.method.externalizable=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u4E2D\u65E0\u6548
+compiler.warn.ineffectual.serial.method.externalizable=与序列化相关的方法 {0} 在可外部化的类中无效
 
-compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields \u5728\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u4E2D\u65E0\u6548
+compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields 在可外部化的类中无效
 
-compiler.warn.externalizable.missing.public.no.arg.ctor=\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u9700\u8981\u4E00\u4E2A\u516C\u5171\u7684\u65E0\u53C2\u6570\u6784\u9020\u5668
+compiler.warn.externalizable.missing.public.no.arg.ctor=可外部化的类需要一个公共的无参数构造器
 
-compiler.warn.non.serializable.instance.field=\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u975E\u77AC\u65F6\u5B9E\u4F8B\u5B57\u6BB5\u662F\u7528\u4E0D\u53EF\u5E8F\u5217\u5316\u7684\u7C7B\u578B\u58F0\u660E\u7684
+compiler.warn.non.serializable.instance.field=可序列化类的非瞬时实例字段是用不可序列化的类型声明的
 
 # 0: type
-compiler.warn.non.serializable.instance.field.array=\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u975E\u77AC\u65F6\u5B9E\u4F8B\u5B57\u6BB5\u662F\u7528\u5177\u6709\u4E0D\u53EF\u5E8F\u5217\u5316\u57FA\u672C\u7EC4\u4EF6\u7C7B\u578B {0} \u7684\u6570\u7EC4\u58F0\u660E\u7684
+compiler.warn.non.serializable.instance.field.array=可序列化类的非瞬时实例字段是用具有不可序列化基本组件类型 {0} 的数组声明的
 
-compiler.warn.non.private.method.weaker.access=\u5728\u63A5\u53E3\u4E2D\u58F0\u660E\u4E3A non-private \u7684\u5E8F\u5217\u5316\u76F8\u5173\u65B9\u6CD5\u5C06\u963B\u6B62\n\u5B9E\u73B0\u63A5\u53E3\u7684\u7C7B\u5C06\u65B9\u6CD5\u58F0\u660E\u4E3A private
+compiler.warn.non.private.method.weaker.access=在接口中声明为 non-private 的序列化相关方法将阻止\n实现接口的类将方法声明为 private
 
-compiler.warn.default.ineffective=\u5B9E\u73B0\u7C7B\u7684\u5E8F\u5217\u5316\u4E0D\u4F1A\u8FD0\u884C\u63A5\u53E3\u4E2D\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u9ED8\u8BA4\u65B9\u6CD5
+compiler.warn.default.ineffective=实现类的序列化不会运行接口中与序列化相关的默认方法
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.warn.potentially.ambiguous.overload={1} \u4E2D\u7684 {0} \u53EF\u80FD\u4E0E {3} \u4E2D\u7684 {2} \u6DF7\u6DC6
+compiler.warn.potentially.ambiguous.overload={1} 中的 {0} 可能与 {3} 中的 {2} 混淆
 
 # 0: message segment
-compiler.warn.override.varargs.missing={0}; \u88AB\u8986\u76D6\u7684\u65B9\u6CD5\u6CA1\u6709 ''...''
+compiler.warn.override.varargs.missing={0}; 被覆盖的方法没有 ''...''
 
 # 0: message segment
-compiler.warn.override.varargs.extra={0}; \u8986\u76D6\u7684\u65B9\u6CD5\u7F3A\u5C11 ''...''
+compiler.warn.override.varargs.extra={0}; 覆盖的方法缺少 ''...''
 
 # 0: message segment
-compiler.warn.override.bridge={0}; \u88AB\u8986\u76D6\u7684\u65B9\u6CD5\u4E3A bridge \u65B9\u6CD5
+compiler.warn.override.bridge={0}; 被覆盖的方法为 bridge 方法
 
 # 0: symbol
-compiler.warn.pkg-info.already.seen=\u5DF2\u627E\u5230\u7A0B\u5E8F\u5305{0}\u7684 package-info.java \u6587\u4EF6
+compiler.warn.pkg-info.already.seen=已找到程序包{0}的 package-info.java 文件
 
 # 0: path
-compiler.warn.path.element.not.found=\u9519\u8BEF\u7684\u8DEF\u5F84\u5143\u7D20 "{0}": \u6CA1\u6709\u8FD9\u79CD\u6587\u4EF6\u6216\u76EE\u5F55
+compiler.warn.path.element.not.found=错误的路径元素 "{0}": 没有这种文件或目录
 
-compiler.warn.possible.fall-through.into.case=\u53EF\u80FD\u65E0\u6CD5\u5B9E\u73B0 case
+compiler.warn.possible.fall-through.into.case=可能无法实现 case
 
 # 0: type
-compiler.warn.redundant.cast=\u51FA\u73B0\u5197\u4F59\u7684\u5230{0}\u7684\u8F6C\u6362
+compiler.warn.redundant.cast=出现冗余的到{0}的转换
 
 # 0: number
-compiler.warn.position.overflow=\u884C {0} \u5904\u7684\u4F4D\u7F6E\u7F16\u7801\u6EA2\u51FA
+compiler.warn.position.overflow=行 {0} 处的位置编码溢出
 
 # 0: file name, 1: number, 2: number
-compiler.warn.big.major.version={0}: \u4E3B\u7248\u672C {1} \u6BD4 {2} \u65B0, \u6B64\u7F16\u8BD1\u5668\u652F\u6301\u6700\u65B0\u7684\u4E3B\u7248\u672C\u3002\n\u5EFA\u8BAE\u5347\u7EA7\u6B64\u7F16\u8BD1\u5668\u3002
+compiler.warn.big.major.version={0}: 主版本 {1} 比 {2} 新, 此编译器支持最新的主版本。\n建议升级此编译器。
 
 # 0: file name, 1: fragment
-compiler.warn.invalid.utf8.in.classfile={0}\uFF1A\u7C7B\u6587\u4EF6\u5305\u542B\u65E0\u6548 UTF-8\uFF1A{1}
+compiler.warn.invalid.utf8.in.classfile={0}：类文件包含无效 UTF-8：{1}
 
 # 0: kind name, 1: symbol
-compiler.warn.static.not.qualified.by.type=static {0}\u5E94\u7531\u7C7B\u578B\u540D\u79F0{1}\u800C\u4E0D\u662F\u8868\u8FBE\u5F0F\u9650\u5B9A
+compiler.warn.static.not.qualified.by.type=static {0}应由类型名称{1}而不是表达式限定
 
 # 0: kind name
-compiler.warn.static.not.qualified.by.type2=static {0} \u4E0D\u5E94\u7528\u4F5C\u533F\u540D\u7C7B\u7684\u6210\u5458
+compiler.warn.static.not.qualified.by.type2=static {0} 不应用作匿名类的成员
 
 # 0: string
-compiler.warn.source.no.bootclasspath=\u672A\u4E0E -source {0} \u4E00\u8D77\u8BBE\u7F6E\u5F15\u5BFC\u7C7B\u8DEF\u5F84
+compiler.warn.source.no.bootclasspath=未与 -source {0} 一起设置引导类路径
 
 # 0: string
-compiler.warn.source.no.system.modules.path=\u672A\u4E0E -source {0} \u4E00\u8D77\u8BBE\u7F6E\u7CFB\u7EDF\u6A21\u5757\u8DEF\u5F84
+compiler.warn.source.no.system.modules.path=未与 -source {0} 一起设置系统模块路径
 
 # 0: string
-compiler.warn.option.obsolete.source=\u6E90\u503C {0} \u5DF2\u8FC7\u65F6\uFF0C\u5C06\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664
+compiler.warn.option.obsolete.source=源值 {0} 已过时，将在未来发行版中删除
 
 # 0: target
-compiler.warn.option.obsolete.target=\u76EE\u6807\u503C {0} \u5DF2\u8FC7\u65F6\uFF0C\u5C06\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664
+compiler.warn.option.obsolete.target=目标值 {0} 已过时，将在未来发行版中删除
 
 # 0: string, 1: string
-compiler.err.option.removed.source=\u4E0D\u518D\u652F\u6301\u6E90\u9009\u9879 {0}\u3002\u8BF7\u4F7F\u7528 {1} \u6216\u66F4\u9AD8\u7248\u672C\u3002
+compiler.err.option.removed.source=不再支持源选项 {0}。请使用 {1} 或更高版本。
 
 # 0: target, 1: target
-compiler.err.option.removed.target=\u4E0D\u518D\u652F\u6301\u76EE\u6807\u9009\u9879 {0}\u3002\u8BF7\u4F7F\u7528 {1} \u6216\u66F4\u9AD8\u7248\u672C\u3002
+compiler.err.option.removed.target=不再支持目标选项 {0}。请使用 {1} 或更高版本。
 
-compiler.warn.option.obsolete.suppression=\u8981\u9690\u85CF\u6709\u5173\u5DF2\u8FC7\u65F6\u9009\u9879\u7684\u8B66\u544A, \u8BF7\u4F7F\u7528 -Xlint:-options\u3002
+compiler.warn.option.obsolete.suppression=要隐藏有关已过时选项的警告, 请使用 -Xlint:-options。
 
 # 0: name, 1: number, 2: number, 3: number, 4: number
-compiler.warn.future.attr={1}.{2} \u7248\u7C7B\u6587\u4EF6\u4E2D\u5F15\u5165\u7684 {0} \u5C5E\u6027\u5728 {3}.{4} \u7248\u7C7B\u6587\u4EF6\u4E2D\u88AB\u5FFD\u7565
+compiler.warn.future.attr={1}.{2} 版类文件中引入的 {0} 属性在 {3}.{4} 版类文件中被忽略
 
-compiler.warn.requires.automatic=\u9700\u8981\u81EA\u52A8\u6A21\u5757\u7684\u6307\u4EE4
+compiler.warn.requires.automatic=需要自动模块的指令
 
-compiler.warn.requires.transitive.automatic=\u9700\u8981\u81EA\u52A8\u6A21\u5757\u7684\u8FC7\u6E21\u6307\u4EE4
+compiler.warn.requires.transitive.automatic=需要自动模块的过渡指令
 
 # Warnings related to annotation processing
 # 0: string
-compiler.warn.proc.package.does.not.exist=\u7A0B\u5E8F\u5305{0}\u4E0D\u5B58\u5728
+compiler.warn.proc.package.does.not.exist=程序包{0}不存在
 
 # 0: string
-compiler.warn.proc.file.reopening=\u5C1D\u8BD5\u591A\u6B21\u4E3A ''{0}'' \u521B\u5EFA\u6587\u4EF6
+compiler.warn.proc.file.reopening=尝试多次为 ''{0}'' 创建文件
 
 # 0: string
-compiler.warn.proc.type.already.exists=\u7C7B\u578B ''{0}'' \u7684\u6587\u4EF6\u5DF2\u7ECF\u5B58\u5728\u4E8E\u6E90\u8DEF\u5F84\u6216\u7C7B\u8DEF\u5F84\u4E2D
+compiler.warn.proc.type.already.exists=类型 ''{0}'' 的文件已经存在于源路径或类路径中
 
 # 0: string
-compiler.warn.proc.type.recreate=\u5C1D\u8BD5\u591A\u6B21\u521B\u5EFA\u7C7B\u578B ''{0}'' \u7684\u6587\u4EF6
+compiler.warn.proc.type.recreate=尝试多次创建类型 ''{0}'' 的文件
 
 # 0: string
-compiler.warn.proc.illegal.file.name=\u65E0\u6CD5\u521B\u5EFA\u5E26\u6709\u975E\u6CD5\u540D\u79F0 ''{0}'' \u7684\u6587\u4EF6\u3002
+compiler.warn.proc.illegal.file.name=无法创建带有非法名称 ''{0}'' 的文件。
 
 # 0: string, 1: string
-compiler.warn.proc.suspicious.class.name=\u6B63\u5728\u4E3A\u540D\u79F0\u4EE5{1}\u7ED3\u5C3E\u7684\u7C7B\u578B\u521B\u5EFA\u6587\u4EF6: ''{0}''
+compiler.warn.proc.suspicious.class.name=正在为名称以{1}结尾的类型创建文件: ''{0}''
 
 # 0: string
-compiler.warn.proc.file.create.last.round=\u5C06\u4E0D\u5BF9\u5728\u6700\u540E\u4E00\u4E2A\u5FAA\u73AF\u4E2D\u521B\u5EFA\u7684\u7C7B\u578B\u4E3A ''{0}'' \u7684\u6587\u4EF6\u8FDB\u884C\u6279\u6CE8\u5904\u7406\u3002
+compiler.warn.proc.file.create.last.round=将不对在最后一个循环中创建的类型为 ''{0}'' 的文件进行批注处理。
 
 # 0: string, 1: string
-compiler.warn.proc.malformed.supported.string=\u5904\u7406\u7A0B\u5E8F ''{1}'' \u4E3A\u652F\u6301\u7684\u6279\u6CE8\u63A5\u53E3\u8FD4\u56DE\u683C\u5F0F\u9519\u8BEF\u7684\u5B57\u7B26\u4E32 ''{0}''
+compiler.warn.proc.malformed.supported.string=处理程序 ''{1}'' 为支持的批注接口返回格式错误的字符串 ''{0}''
 
 # 0: set of string
-compiler.warn.proc.annotations.without.processors=\u6CA1\u6709\u5904\u7406\u7A0B\u5E8F\u8981\u4F7F\u7528\u4EE5\u4E0B\u4EFB\u4F55\u6279\u6CE8: {0}
+compiler.warn.proc.annotations.without.processors=没有处理程序要使用以下任何批注: {0}
 
 # 0: source version, 1: string, 2: string
-compiler.warn.proc.processor.incompatible.source.version=\u6765\u81EA\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F ''{1}'' \u7684\u53D7\u652F\u6301 source \u7248\u672C ''{0}'' \u4F4E\u4E8E -source ''{2}''
+compiler.warn.proc.processor.incompatible.source.version=来自批注处理程序 ''{1}'' 的受支持 source 版本 ''{0}'' 低于 -source ''{2}''
 
 # 0: string, 1: string
-compiler.warn.proc.duplicate.option.name=\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F ''{1}'' \u8FD4\u56DE\u91CD\u590D\u7684\u652F\u6301\u7684\u9009\u9879 ''{0}''
+compiler.warn.proc.duplicate.option.name=批注处理程序 ''{1}'' 返回重复的支持的选项 ''{0}''
 
 # 0: string, 1: string
-compiler.warn.proc.duplicate.supported.annotation=\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F ''{1}'' \u8FD4\u56DE\u91CD\u590D\u7684\u53D7\u652F\u6301\u6279\u6CE8\u63A5\u53E3 ''{0}''
+compiler.warn.proc.duplicate.supported.annotation=批注处理程序 ''{1}'' 返回重复的受支持批注接口 ''{0}''
 
 # 0: string
-compiler.warn.proc.redundant.types.with.wildcard=\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F ''{0}'' \u91CD\u590D\u652F\u6301 ''*'' \u548C\u5176\u4ED6\u6279\u6CE8\u63A5\u53E3
+compiler.warn.proc.redundant.types.with.wildcard=批注处理程序 ''{0}'' 重复支持 ''*'' 和其他批注接口
 
-compiler.warn.proc.proc-only.requested.no.procs=\u5728\u672A\u8BF7\u6C42\u7F16\u8BD1\u7684\u60C5\u51B5\u4E0B\u8FDB\u884C\u6279\u6CE8\u5904\u7406, \u4F46\u627E\u4E0D\u5230\u5904\u7406\u7A0B\u5E8F\u3002
+compiler.warn.proc.proc-only.requested.no.procs=在未请求编译的情况下进行批注处理, 但找不到处理程序。
 
-compiler.warn.proc.use.implicit=\u6279\u6CE8\u5904\u7406\u4E0D\u9002\u7528\u4E8E\u9690\u5F0F\u7F16\u8BD1\u7684\u6587\u4EF6\u3002\n\u4F7F\u7528 -implicit \u6307\u5B9A\u7528\u4E8E\u9690\u5F0F\u7F16\u8BD1\u7684\u7B56\u7565\u3002
+compiler.warn.proc.use.implicit=批注处理不适用于隐式编译的文件。\n使用 -implicit 指定用于隐式编译的策略。
 
-compiler.warn.proc.use.proc.or.implicit=\u6279\u6CE8\u5904\u7406\u4E0D\u9002\u7528\u4E8E\u9690\u5F0F\u7F16\u8BD1\u7684\u6587\u4EF6\u3002\n\u4F7F\u7528 -proc:none \u7981\u7528\u6279\u6CE8\u5904\u7406\u6216\u4F7F\u7528 -implicit \u6307\u5B9A\u7528\u4E8E\u9690\u5F0F\u7F16\u8BD1\u7684\u7B56\u7565\u3002
+compiler.warn.proc.use.proc.or.implicit=批注处理不适用于隐式编译的文件。\n使用 -proc:none 禁用批注处理或使用 -implicit 指定用于隐式编译的策略。
 
 # Print a client-generated warning; assumed to be localized, no translation required
 # 0: string
 compiler.warn.proc.messager={0}
 
 # 0: set of string
-compiler.warn.proc.unclosed.type.files=\u7C7B\u578B ''{0}'' \u7684\u6587\u4EF6\u672A\u5173\u95ED; \u5C06\u4E0D\u9488\u5BF9\u8FD9\u4E9B\u7C7B\u578B\u8FDB\u884C\u6279\u6CE8\u5904\u7406
+compiler.warn.proc.unclosed.type.files=类型 ''{0}'' 的文件未关闭; 将不针对这些类型进行批注处理
 
 # 0: string
-compiler.warn.proc.unmatched.processor.options=\u4EE5\u4E0B\u9009\u9879\u672A\u88AB\u4EFB\u4F55\u5904\u7406\u7A0B\u5E8F\u8BC6\u522B: ''{0}''
+compiler.warn.proc.unmatched.processor.options=以下选项未被任何处理程序识别: ''{0}''
 
-compiler.warn.try.explicit.close.call=\u5728\u53EF\u81EA\u52A8\u7ED3\u675F\u7684\u8D44\u6E90\u4E0A\u663E\u5F0F\u8C03\u7528 close()
+compiler.warn.try.explicit.close.call=在可自动结束的资源上显式调用 close()
 
 # 0: symbol
-compiler.warn.try.resource.not.referenced=\u4E0D\u80FD\u5728\u76F8\u5E94\u7684 try \u8BED\u53E5\u7684\u6B63\u6587\u4E2D\u5F15\u7528\u53EF\u81EA\u52A8\u7ED3\u675F\u7684\u8D44\u6E90{0}
+compiler.warn.try.resource.not.referenced=不能在相应的 try 语句的正文中引用可自动结束的资源{0}
 
 # 0: type
-compiler.warn.try.resource.throws.interrupted.exc=\u53EF\u81EA\u52A8\u5173\u95ED\u7684\u8D44\u6E90{0}\u5305\u542B\u7684\u6210\u5458\u65B9\u6CD5 close() \u53EF\u80FD\u629B\u51FA InterruptedException
+compiler.warn.try.resource.throws.interrupted.exc=可自动关闭的资源{0}包含的成员方法 close() 可能抛出 InterruptedException
 
-compiler.warn.unchecked.assign=\u672A\u7ECF\u68C0\u67E5\u7684\u5206\u914D: \u5C06{0}\u5206\u914D\u7ED9{1}
+compiler.warn.unchecked.assign=未经检查的分配: 将{0}分配给{1}
 
 # 0: symbol, 1: type
-compiler.warn.unchecked.assign.to.var=\u5BF9\u4F5C\u4E3A\u539F\u59CB\u7C7B\u578B{1}\u7684\u6210\u5458\u7684\u53D8\u91CF{0}\u7684\u5206\u914D\u672A\u7ECF\u8FC7\u68C0\u67E5
+compiler.warn.unchecked.assign.to.var=对作为原始类型{1}的成员的变量{0}的分配未经过检查
 
 # 0: symbol, 1: type
-compiler.warn.unchecked.call.mbr.of.raw.type=\u5BF9\u4F5C\u4E3A\u539F\u59CB\u7C7B\u578B{1}\u7684\u6210\u5458\u7684{0}\u7684\u8C03\u7528\u672A\u7ECF\u8FC7\u68C0\u67E5
+compiler.warn.unchecked.call.mbr.of.raw.type=对作为原始类型{1}的成员的{0}的调用未经过检查
 
-compiler.warn.unchecked.cast.to.type=\u5411\u7C7B\u578B{0}\u7684\u8F6C\u6362\u672A\u7ECF\u8FC7\u68C0\u67E5
+compiler.warn.unchecked.cast.to.type=向类型{0}的转换未经过检查
 
 # 0: kind name, 1: name, 2: object, 3: object, 4: kind name, 5: symbol
-compiler.warn.unchecked.meth.invocation.applied=\u65B9\u6CD5\u8C03\u7528\u672A\u7ECF\u8FC7\u68C0\u67E5: \u5C06{4} {5}\u4E2D\u7684{0} {1}\u5E94\u7528\u5230\u7ED9\u5B9A\u7684\u7C7B\u578B\n\u9700\u8981: {2}\n\u627E\u5230:    {3}
+compiler.warn.unchecked.meth.invocation.applied=方法调用未经过检查: 将{4} {5}中的{0} {1}应用到给定的类型\n需要: {2}\n找到:    {3}
 
 # 0: type
-compiler.warn.unchecked.generic.array.creation=\u5BF9\u4E8E\u7C7B\u578B\u4E3A{0}\u7684 varargs \u53C2\u6570, \u6CDB\u578B\u6570\u7EC4\u521B\u5EFA\u672A\u7ECF\u8FC7\u68C0\u67E5
+compiler.warn.unchecked.generic.array.creation=对于类型为{0}的 varargs 参数, 泛型数组创建未经过检查
 
 # 0: type
-compiler.warn.unchecked.varargs.non.reifiable.type=\u53C2\u6570\u5316 vararg \u7C7B\u578B{0}\u7684\u5806\u53EF\u80FD\u5DF2\u53D7\u6C61\u67D3
+compiler.warn.unchecked.varargs.non.reifiable.type=参数化 vararg 类型{0}的堆可能已受污染
 
 # 0: symbol
-compiler.warn.varargs.unsafe.use.varargs.param=Varargs \u65B9\u6CD5\u53EF\u80FD\u5BFC\u81F4\u6765\u81EA\u4E0D\u53EF\u5177\u4F53\u5316 varargs \u53C2\u6570 {0} \u7684\u5806\u6C61\u67D3
+compiler.warn.varargs.unsafe.use.varargs.param=Varargs 方法可能导致来自不可具体化 varargs 参数 {0} 的堆污染
 
-compiler.warn.missing.deprecated.annotation=\u672A\u4F7F\u7528 @Deprecated \u5BF9\u5DF2\u8FC7\u65F6\u7684\u9879\u76EE\u8FDB\u884C\u6CE8\u91CA
+compiler.warn.missing.deprecated.annotation=未使用 @Deprecated 对已过时的项目进行注释
 
 # 0: kind name
-compiler.warn.deprecated.annotation.has.no.effect=@Deprecated \u6279\u6CE8\u5BF9\u6B64 {0} \u58F0\u660E\u6CA1\u6709\u4EFB\u4F55\u6548\u679C
+compiler.warn.deprecated.annotation.has.no.effect=@Deprecated 批注对此 {0} 声明没有任何效果
 
 # 0: string
-compiler.warn.invalid.path=\u65E0\u6548\u6587\u4EF6\u540D: {0}
+compiler.warn.invalid.path=无效文件名: {0}
 
-compiler.warn.doclint.not.available=\u6CA1\u6709 doclint \u670D\u52A1\u63D0\u4F9B\u65B9\u53EF\u7528
+compiler.warn.doclint.not.available=没有 doclint 服务提供方可用
 
 # 0: string
-compiler.err.invalid.path=\u65E0\u6548\u6587\u4EF6\u540D: {0}
+compiler.err.invalid.path=无效文件名: {0}
 
 
 # 0: path
-compiler.warn.invalid.archive.file=\u4EE5\u4E0B\u8DEF\u5F84\u4E2D\u5B58\u5728\u610F\u5916\u7684\u6587\u4EF6: {0}
+compiler.warn.invalid.archive.file=以下路径中存在意外的文件: {0}
 
 # 0: path
-compiler.warn.unexpected.archive.file=\u4EE5\u4E0B\u6863\u6848\u6587\u4EF6\u5B58\u5728\u610F\u5916\u7684\u6269\u5C55\u540D: {0}
+compiler.warn.unexpected.archive.file=以下档案文件存在意外的扩展名: {0}
 
 # 0: path
-compiler.err.no.zipfs.for.archive=\u6CA1\u6709\u4EFB\u4F55\u6587\u4EF6\u7CFB\u7EDF\u63D0\u4F9B\u65B9\u53EF\u5904\u7406\u6B64\u6587\u4EF6: {0}
+compiler.err.no.zipfs.for.archive=没有任何文件系统提供方可处理此文件: {0}
 
-compiler.warn.div.zero=\u9664\u6570\u4E3A\u96F6
+compiler.warn.div.zero=除数为零
 
-compiler.warn.empty.if=if \u4E4B\u540E\u6CA1\u6709\u8BED\u53E5
+compiler.warn.empty.if=if 之后没有语句
 
 # 0: type, 1: name
-compiler.warn.annotation.method.not.found=\u65E0\u6CD5\u627E\u5230\u7C7B\u578B ''{0}'' \u7684\u6279\u6CE8\u65B9\u6CD5 ''{1}()''
+compiler.warn.annotation.method.not.found=无法找到类型 ''{0}'' 的批注方法 ''{1}()''
 
 # 0: type, 1: name, 2: message segment
-compiler.warn.annotation.method.not.found.reason=\u65E0\u6CD5\u627E\u5230\u7C7B\u578B ''{0}'' \u7684\u6279\u6CE8\u65B9\u6CD5 ''{1}()'': {2}
+compiler.warn.annotation.method.not.found.reason=无法找到类型 ''{0}'' 的批注方法 ''{1}()'': {2}
 
 # 0: file object, 1: symbol, 2: name
-compiler.warn.unknown.enum.constant=\u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2}
+compiler.warn.unknown.enum.constant=未知的枚举常量 {1}.{2}
 
 # 0: file object, 1: symbol, 2: name, 3: message segment
-compiler.warn.unknown.enum.constant.reason=\u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2}\n\u539F\u56E0: {3}
+compiler.warn.unknown.enum.constant.reason=未知的枚举常量 {1}.{2}\n原因: {3}
 
 # 0: type, 1: type
-compiler.warn.raw.class.use=\u627E\u5230\u539F\u59CB\u7C7B\u578B: {0}\n\u7F3A\u5C11\u6CDB\u578B\u7C7B{1}\u7684\u7C7B\u578B\u53C2\u6570
+compiler.warn.raw.class.use=找到原始类型: {0}\n缺少泛型类{1}的类型参数
 
-compiler.warn.diamond.redundant.args=\u65B0\u8868\u8FBE\u5F0F\u4E2D\u5B58\u5728\u5197\u4F59\u7C7B\u578B\u53C2\u6570 (\u6539\u7528 diamond \u8FD0\u7B97\u7B26)\u3002
+compiler.warn.diamond.redundant.args=新表达式中存在冗余类型参数 (改用 diamond 运算符)。
 
-compiler.warn.local.redundant.type=\u672C\u5730\u53D8\u91CF\u7684\u5197\u4F59\u7C7B\u578B (\u4F7F\u7528 ''var'' \u66FF\u6362\u663E\u5F0F\u7C7B\u578B)\u3002
+compiler.warn.local.redundant.type=本地变量的冗余类型 (使用 ''var'' 替换显式类型)。
 
-compiler.warn.potential.lambda.found=\u53EF\u5C06\u6B64\u533F\u540D\u5185\u90E8\u7C7B\u521B\u5EFA\u8F6C\u6362\u4E3A lambda \u8868\u8FBE\u5F0F\u3002
+compiler.warn.potential.lambda.found=可将此匿名内部类创建转换为 lambda 表达式。
 
-compiler.warn.method.redundant.typeargs=\u65B9\u6CD5\u8C03\u7528\u4E2D\u5B58\u5728\u5197\u4F59\u7C7B\u578B\u53C2\u6570\u3002
+compiler.warn.method.redundant.typeargs=方法调用中存在冗余类型参数。
 
 # 0: symbol, 1: message segment
-compiler.warn.varargs.redundant.trustme.anno=\u5197\u4F59\u7684 {0} \u6279\u6CE8\u3002{1}
+compiler.warn.varargs.redundant.trustme.anno=冗余的 {0} 批注。{1}
 
 # 0: symbol
-compiler.warn.access.to.member.from.serializable.element=\u53EF\u4E32\u884C\u5316\u5143\u7D20\u5BF9\u6210\u5458 {0} \u7684\u8BBF\u95EE\u53EF\u4EE5\u7531\u4E0D\u53D7\u4FE1\u4EFB\u7684\u4EE3\u7801\u516C\u5F00\u6267\u884C
+compiler.warn.access.to.member.from.serializable.element=可串行化元素对成员 {0} 的访问可以由不受信任的代码公开执行
 
 # 0: symbol
-compiler.warn.access.to.member.from.serializable.lambda=\u53EF\u4E32\u884C\u5316 lambda \u5BF9\u6210\u5458 {0} \u7684\u8BBF\u95EE\u53EF\u4EE5\u7531\u4E0D\u53D7\u4FE1\u4EFB\u7684\u4EE3\u7801\u516C\u5F00\u6267\u884C
+compiler.warn.access.to.member.from.serializable.lambda=可串行化 lambda 对成员 {0} 的访问可以由不受信任的代码公开执行
 
 #####
 
 ## The following are tokens which are non-terminals in the language. They should
 ## be named as JLS3 calls them when translated to the appropriate language.
-compiler.misc.token.identifier=<\u6807\u8BC6\u7B26>
+compiler.misc.token.identifier=<标识符>
 
-compiler.misc.token.character=<\u5B57\u7B26>
+compiler.misc.token.character=<字符>
 
-compiler.misc.token.string=<\u5B57\u7B26\u4E32>
+compiler.misc.token.string=<字符串>
 
-compiler.misc.token.integer=<\u6574\u578B>
+compiler.misc.token.integer=<整型>
 
-compiler.misc.token.long-integer=<\u957F\u6574\u578B>
+compiler.misc.token.long-integer=<长整型>
 
-compiler.misc.token.float=<\u6D6E\u70B9\u578B>
+compiler.misc.token.float=<浮点型>
 
-compiler.misc.token.double=<\u53CC\u7CBE\u5EA6\u578B>
+compiler.misc.token.double=<双精度型>
 
-compiler.misc.token.bad-symbol=<\u9519\u8BEF\u7B26\u53F7>
+compiler.misc.token.bad-symbol=<错误符号>
 
-compiler.misc.token.end-of-input=<\u8F93\u5165\u7ED3\u675F>
+compiler.misc.token.end-of-input=<输入结束>
 
 ## The argument to the following string will always be one of the following:
 ## 1. one of the above non-terminals
@@ -1708,159 +1708,159 @@ compiler.misc.token.end-of-input=<\u8F93\u5165\u7ED3\u675F>
 ##
 ## This is the only place these tokens will be used.
 # 0: token
-compiler.err.expected=\u9700\u8981{0}
+compiler.err.expected=需要{0}
 
 # 0: string
-compiler.err.expected.str=\u9700\u8981 {0}
+compiler.err.expected.str=需要 {0}
 
 # 0: token, 1: token
-compiler.err.expected2=\u9700\u8981{0}\u6216{1}
+compiler.err.expected2=需要{0}或{1}
 
 # 0: token, 1: token, 2: token
-compiler.err.expected3=\u9700\u8981{0}, {1}\u6216{2}
+compiler.err.expected3=需要{0}, {1}或{2}
 
 # 0: token, 1: token, 2: token, 3: string
-compiler.err.expected4=\u9700\u8981 {0}\u3001{1}\u3001{2} \u6216 {3}
+compiler.err.expected4=需要 {0}、{1}、{2} 或 {3}
 
-compiler.err.premature.eof=\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u5DF2\u5230\u8FBE\u6587\u4EF6\u7ED3\u5C3E
+compiler.err.premature.eof=进行语法分析时已到达文件结尾
 
-compiler.err.enum.constant.expected=\u6B64\u5904\u9700\u8981\u679A\u4E3E\u5E38\u91CF
+compiler.err.enum.constant.expected=此处需要枚举常量
 
-compiler.err.enum.constant.not.expected=\u6B64\u5904\u4E0D\u9700\u8981\u679A\u4E3E\u5E38\u91CF
+compiler.err.enum.constant.not.expected=此处不需要枚举常量
 
-compiler.err.extraneous.semicolon=\u591A\u4F59\u5206\u53F7
+compiler.err.extraneous.semicolon=多余分号
 
-compiler.warn.extraneous.semicolon=\u591A\u4F59\u5206\u53F7
+compiler.warn.extraneous.semicolon=多余分号
 
 ## The following are related in form, but do not easily fit the above paradigm.
-compiler.err.expected.module.or.open=\u9700\u8981 ''module'' \u6216 ''open''
+compiler.err.expected.module.or.open=需要 ''module'' 或 ''open''
 
-compiler.err.dot.class.expected=\u9700\u8981 ''.class''
+compiler.err.dot.class.expected=需要 ''.class''
 
 ## The argument to this string will always be either 'case' or 'default'.
 # 0: token
-compiler.err.orphaned=\u5B64\u7ACB\u7684{0}
+compiler.err.orphaned=孤立的{0}
 
 # 0: name
-compiler.misc.anonymous.class=<\u533F\u540D{0}>
+compiler.misc.anonymous.class=<匿名{0}>
 
 # 0: name, 1: type
-compiler.misc.type.captureof=capture#{0}, \u5171 {1}
+compiler.misc.type.captureof=capture#{0}, 共 {1}
 
 compiler.misc.type.captureof.1=capture#{0}
 
-compiler.misc.type.none=<\u65E0>
+compiler.misc.type.none=<无>
 
-compiler.misc.unnamed.package=\u672A\u547D\u540D\u7A0B\u5E8F\u5305
+compiler.misc.unnamed.package=未命名程序包
 
-compiler.misc.unnamed.module=\u672A\u547D\u540D\u6A21\u5757
+compiler.misc.unnamed.module=未命名模块
 
 #####
 
 # 0: symbol, 1: message segment
-compiler.err.cant.access=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1}
+compiler.err.cant.access=无法访问{0}\n{1}
 
 # 0: name
-compiler.misc.bad.class.file=\u7C7B\u6587\u4EF6\u5BF9\u4E8E\u7C7B {0} \u65E0\u6548
+compiler.misc.bad.class.file=类文件对于类 {0} 无效
 
 # 0: file name, 1: string (expected constant pool entry type), 2: number (constant pool index)
-compiler.misc.bad.const.pool.entry={0} \u4E2D\u9519\u8BEF\u7684\u5E38\u91CF\u6C60\u6761\u76EE\n\u9884\u671F\u4E3A\u7D22\u5F15 {2} \u5904\u7684 {1}
+compiler.misc.bad.const.pool.entry={0} 中错误的常量池条目\n预期为索引 {2} 处的 {1}
 
 # 0: file name, 1: number (constant pool index), 2: number (constant pool size)
-compiler.misc.bad.const.pool.index={0} \u4E2D\u7684\u5E38\u91CF\u6C60\u7D22\u5F15\u9519\u8BEF\n\u7D22\u5F15 {1} \u4E0D\u5728\u6C60\u5927\u5C0F {2} \u5185\u3002
+compiler.misc.bad.const.pool.index={0} 中的常量池索引错误\n索引 {1} 不在池大小 {2} 内。
 
 # 0: file name, 1: message segment
-compiler.misc.bad.class.file.header=\u9519\u8BEF\u7684\u7C7B\u6587\u4EF6: {0}\n{1}\n\u8BF7\u5220\u9664\u8BE5\u6587\u4EF6\u6216\u786E\u4FDD\u8BE5\u6587\u4EF6\u4F4D\u4E8E\u6B63\u786E\u7684\u7C7B\u8DEF\u5F84\u5B50\u76EE\u5F55\u4E2D\u3002
+compiler.misc.bad.class.file.header=错误的类文件: {0}\n{1}\n请删除该文件或确保该文件位于正确的类路径子目录中。
 
 # 0: file name, 1: message segment
-compiler.misc.bad.source.file.header=\u9519\u8BEF\u7684\u6E90\u6587\u4EF6: {0}\n{1}\n\u8BF7\u5220\u9664\u8BE5\u6587\u4EF6\u6216\u786E\u4FDD\u8BE5\u6587\u4EF6\u4F4D\u4E8E\u6B63\u786E\u7684\u6E90\u8DEF\u5F84\u5B50\u76EE\u5F55\u4E2D\u3002
+compiler.misc.bad.source.file.header=错误的源文件: {0}\n{1}\n请删除该文件或确保该文件位于正确的源路径子目录中。
 
 ## The following are all possible strings for the second argument ({1}) of the
 ## above strings.
-compiler.misc.bad.class.signature=\u9519\u8BEF\u7684\u7C7B\u7B7E\u540D: {0}
+compiler.misc.bad.class.signature=错误的类签名: {0}
 
 #0: symbol, 1: symbol
-compiler.misc.bad.enclosing.class={0}\u7684\u5C01\u95ED\u7C7B\u9519\u8BEF: {1}
+compiler.misc.bad.enclosing.class={0}的封闭类错误: {1}
 
 # 0: symbol
-compiler.misc.bad.enclosing.method=\u7C7B {0} \u7684\u5C01\u95ED\u65B9\u6CD5\u5C5E\u6027\u9519\u8BEF
+compiler.misc.bad.enclosing.method=类 {0} 的封闭方法属性错误
 
-compiler.misc.bad.runtime.invisible.param.annotations=\u9519\u8BEF\u7684 RuntimeInvisibleParameterAnnotations \u5C5E\u6027: {0}
+compiler.misc.bad.runtime.invisible.param.annotations=错误的 RuntimeInvisibleParameterAnnotations 属性: {0}
 
-compiler.misc.bad.const.pool.tag=\u9519\u8BEF\u7684\u5E38\u91CF\u6C60\u6807\u8BB0: {0}
+compiler.misc.bad.const.pool.tag=错误的常量池标记: {0}
 
-compiler.misc.bad.const.pool.tag.at=\u9519\u8BEF\u7684\u5E38\u91CF\u6C60\u6807\u8BB0: {0}, \u4F4D\u4E8E{1}
+compiler.misc.bad.const.pool.tag.at=错误的常量池标记: {0}, 位于{1}
 
 # 0: number
-compiler.misc.bad.utf8.byte.sequence.at=\u4F4D\u4E8E {0} \u7684 UTF-8 \u5B57\u8282\u5E8F\u5217\u9519\u8BEF
+compiler.misc.bad.utf8.byte.sequence.at=位于 {0} 的 UTF-8 字节序列错误
 
-compiler.misc.unexpected.const.pool.tag.at=\u610F\u5916\u7684\u5E38\u91CF\u6C60\u6807\u8BB0\uFF1A{0}\uFF0C\u4F4D\u4E8E {1}
+compiler.misc.unexpected.const.pool.tag.at=意外的常量池标记：{0}，位于 {1}
 
 # 0: number
-compiler.misc.bad.class.truncated.at.offset=\u7C7B\u6587\u4EF6\u5728\u504F\u79FB {0} \u5904\u622A\u65AD
+compiler.misc.bad.class.truncated.at.offset=类文件在偏移 {0} 处截断
 
-compiler.misc.bad.signature=\u9519\u8BEF\u7684\u7B7E\u540D: {0}
+compiler.misc.bad.signature=错误的签名: {0}
 
-compiler.misc.bad.type.annotation.value=\u9519\u8BEF\u7684\u7C7B\u578B\u6279\u6CE8\u76EE\u6807\u7C7B\u578B\u503C: {0}
+compiler.misc.bad.type.annotation.value=错误的类型批注目标类型值: {0}
 
-compiler.misc.bad.module-info.name=\u9519\u8BEF\u7684\u7C7B\u540D
+compiler.misc.bad.module-info.name=错误的类名
 
-compiler.misc.class.file.wrong.class=\u7C7B\u6587\u4EF6\u5305\u542B\u9519\u8BEF\u7684\u7C7B: {0}
+compiler.misc.class.file.wrong.class=类文件包含错误的类: {0}
 
-compiler.misc.module.info.invalid.super.class=\u5E26\u6709\u65E0\u6548\u8D85\u7C7B\u7684 module-info
+compiler.misc.module.info.invalid.super.class=带有无效超类的 module-info
 
 # 0: name
-compiler.misc.class.file.not.found=\u627E\u4E0D\u5230{0}\u7684\u7C7B\u6587\u4EF6
+compiler.misc.class.file.not.found=找不到{0}的类文件
 
 # 0: string (constant value), 1: symbol (constant field), 2: type (field type)
-compiler.misc.bad.constant.range={1} \u7684\u5E38\u91CF\u503C ''{0}'' \u8D85\u51FA\u4E86 {2} \u7684\u9884\u671F\u8303\u56F4
+compiler.misc.bad.constant.range={1} 的常量值 ''{0}'' 超出了 {2} 的预期范围
 
 # 0: string (constant value), 1: symbol (constant field), 2: string (expected class)
-compiler.misc.bad.constant.value={1} \u7684\u5E38\u91CF\u503C ''{0}'' \u9519\u8BEF, \u9884\u671F\u4E3A {2}
+compiler.misc.bad.constant.value={1} 的常量值 ''{0}'' 错误, 预期为 {2}
 
 # 0: type (field type)
-compiler.misc.bad.constant.value.type=''{0}'' \u7C7B\u578B\u7684\u53D8\u91CF\u4E0D\u80FD\u5177\u6709\u5E38\u91CF\u503C\uFF0C\u4F46\u662F\u4E3A\u5176\u6307\u5B9A\u4E86\u4E00\u4E2A\u5E38\u91CF\u503C
+compiler.misc.bad.constant.value.type=''{0}'' 类型的变量不能具有常量值，但是为其指定了一个常量值
 
 # 0: string (classfile major version), 1: string (classfile minor version)
-compiler.misc.invalid.default.interface=\u5728 {0}.{1} \u7248\u7C7B\u6587\u4EF6\u4E2D\u627E\u5230\u9ED8\u8BA4\u65B9\u6CD5
+compiler.misc.invalid.default.interface=在 {0}.{1} 版类文件中找到默认方法
 
 # 0: string (classfile major version), 1: string (classfile minor version)
-compiler.misc.invalid.static.interface=\u5728 {0}.{1} \u7248\u7C7B\u6587\u4EF6\u4E2D\u627E\u5230\u9759\u6001\u65B9\u6CD5
+compiler.misc.invalid.static.interface=在 {0}.{1} 版类文件中找到静态方法
 
 # 0: string (classfile major version), 1: string (classfile minor version)
-compiler.misc.anachronistic.module.info=\u5728 {0}.{1} \u7248\u7C7B\u6587\u4EF6\u4E2D\u627E\u5230\u6A21\u5757\u58F0\u660E
+compiler.misc.anachronistic.module.info=在 {0}.{1} 版类文件中找到模块声明
 
-compiler.misc.module.info.definition.expected=\u9700\u8981 module-info \u5B9A\u4E49
+compiler.misc.module.info.definition.expected=需要 module-info 定义
 
 # 0: name
-compiler.misc.file.doesnt.contain.class=\u6587\u4EF6\u4E0D\u5305\u542B\u7C7B{0}
+compiler.misc.file.doesnt.contain.class=文件不包含类{0}
 
 # 0: symbol
-compiler.misc.file.does.not.contain.package=\u6587\u4EF6\u4E0D\u5305\u542B\u7A0B\u5E8F\u5305{0}
+compiler.misc.file.does.not.contain.package=文件不包含程序包{0}
 
-compiler.misc.file.does.not.contain.module=\u6587\u4EF6\u4E0D\u5305\u542B\u6A21\u5757\u58F0\u660E
+compiler.misc.file.does.not.contain.module=文件不包含模块声明
 
-compiler.misc.illegal.start.of.class.file=\u975E\u6CD5\u7684\u7C7B\u6587\u4EF6\u5F00\u59CB
+compiler.misc.illegal.start.of.class.file=非法的类文件开始
 
 # 0: name
-compiler.misc.method.descriptor.invalid=\u65B9\u6CD5\u63CF\u8FF0\u7B26\u5BF9 {0} \u65E0\u6548
+compiler.misc.method.descriptor.invalid=方法描述符对 {0} 无效
 
-compiler.misc.unable.to.access.file=\u65E0\u6CD5\u8BBF\u95EE\u6587\u4EF6: {0}
+compiler.misc.unable.to.access.file=无法访问文件: {0}
 
-compiler.misc.unicode.str.not.supported=\u4E0D\u652F\u6301\u7C7B\u6587\u4EF6\u4E2D\u7684 Unicode \u5B57\u7B26\u4E32
+compiler.misc.unicode.str.not.supported=不支持类文件中的 Unicode 字符串
 
-compiler.misc.undecl.type.var=\u672A\u58F0\u660E\u7684\u7C7B\u578B\u53D8\u91CF: {0}
+compiler.misc.undecl.type.var=未声明的类型变量: {0}
 
-compiler.misc.malformed.vararg.method=\u7C7B\u6587\u4EF6\u5305\u542B\u683C\u5F0F\u9519\u8BEF\u7684\u53D8\u91CF\u5143\u6570\u65B9\u6CD5: {0}
+compiler.misc.malformed.vararg.method=类文件包含格式错误的变量元数方法: {0}
 
-compiler.misc.wrong.version=\u7C7B\u6587\u4EF6\u5177\u6709\u9519\u8BEF\u7684\u7248\u672C {0}.{1}, \u5E94\u4E3A {2}.{3}
+compiler.misc.wrong.version=类文件具有错误的版本 {0}.{1}, 应为 {2}.{3}
 
-compiler.misc.illegal.flag.combo=\u7C7B\u6587\u4EF6\u5305\u542B {1} {2} \u7684\u975E\u6CD5\u6807\u8BB0\u7EC4\u5408 {0}
+compiler.misc.illegal.flag.combo=类文件包含 {1} {2} 的非法标记组合 {0}
 
 #####
 
 # 0: type, 1: type or symbol
-compiler.err.not.within.bounds=\u7C7B\u578B\u53C2\u6570{0}\u4E0D\u5728\u7C7B\u578B\u53D8\u91CF{1}\u7684\u8303\u56F4\u5185
+compiler.err.not.within.bounds=类型参数{0}不在类型变量{1}的范围内
 
 ## The following are all possible strings for the second argument ({1}) of the
 ## above string.
@@ -1870,33 +1870,33 @@ compiler.err.not.within.bounds=\u7C7B\u578B\u53C2\u6570{0}\u4E0D\u5728\u7C7B\u57
 #####
 
 # 0: message segment
-compiler.err.prob.found.req=\u4E0D\u517C\u5BB9\u7684\u7C7B\u578B: {0}
+compiler.err.prob.found.req=不兼容的类型: {0}
 
 # 0: message segment
-compiler.misc.prob.found.req=\u4E0D\u517C\u5BB9\u7684\u7C7B\u578B: {0}
+compiler.misc.prob.found.req=不兼容的类型: {0}
 
 # 0: message segment, 1: type, 2: type
-compiler.warn.prob.found.req={0}\n\u9700\u8981: {2}\n\u627E\u5230:    {1}
+compiler.warn.prob.found.req={0}\n需要: {2}\n找到:    {1}
 
 # 0: type, 1: type
-compiler.misc.inconvertible.types={0}\u65E0\u6CD5\u8F6C\u6362\u4E3A{1}
+compiler.misc.inconvertible.types={0}无法转换为{1}
 
 # 0: type, 1: type
-compiler.misc.not.applicable.types=\u7C7B\u578B\u4E3A {1} \u7684\u6A21\u5F0F\u4E0D\u9002\u7528\u4E8E {0}
+compiler.misc.not.applicable.types=类型为 {1} 的模式不适用于 {0}
 
 # 0: type, 1: type
-compiler.misc.possible.loss.of.precision=\u4ECE{0}\u8F6C\u6362\u5230{1}\u53EF\u80FD\u4F1A\u6709\u635F\u5931
+compiler.misc.possible.loss.of.precision=从{0}转换到{1}可能会有损失
 
 # 0: type, 1: type
-compiler.warn.possible.loss.of.precision=\u5728\u590D\u5408\u8D4B\u503C\u4E2D\u4ECE {0} \u9690\u5F0F\u8F6C\u6362\u4E3A {1} \u53EF\u80FD\u4F1A\u6709\u635F\u5931
+compiler.warn.possible.loss.of.precision=在复合赋值中从 {0} 隐式转换为 {1} 可能会有损失
 
-compiler.misc.unchecked.assign=\u672A\u7ECF\u68C0\u67E5\u7684\u8F6C\u6362
+compiler.misc.unchecked.assign=未经检查的转换
 
 # compiler.misc.storecheck=\
 #     assignment might cause later store checks to fail
 # compiler.misc.unchecked=\
 #     assigned array cannot dynamically check its stores
-compiler.misc.unchecked.cast.to.type=\u672A\u7ECF\u68C0\u67E5\u7684\u8F6C\u6362
+compiler.misc.unchecked.cast.to.type=未经检查的转换
 
 # compiler.err.star.expected=\
 #     ''*'' expected
@@ -1904,27 +1904,27 @@ compiler.misc.unchecked.cast.to.type=\u672A\u7ECF\u68C0\u67E5\u7684\u8F6C\u6362
 #     \[\*\] cannot have a type
 
 # 0: message segment
-compiler.misc.try.not.applicable.to.type=try-with-resources \u4E0D\u9002\u7528\u4E8E\u53D8\u91CF\u7C7B\u578B\n({0})
+compiler.misc.try.not.applicable.to.type=try-with-resources 不适用于变量类型\n({0})
 
 #####
 
 # 0: object, 1: message segment
-compiler.err.type.found.req=\u610F\u5916\u7684\u7C7B\u578B\n\u9700\u8981: {1}\n\u627E\u5230:    {0}
+compiler.err.type.found.req=意外的类型\n需要: {1}\n找到:    {0}
 
 ## The following are all possible strings for the first argument ({0}) of the
 ## above string.
-compiler.misc.type.req.class=\u7C7B
+compiler.misc.type.req.class=类
 
-compiler.misc.type.req.class.array=\u7C7B\u6216\u6570\u7EC4
+compiler.misc.type.req.class.array=类或数组
 
-compiler.misc.type.req.array.or.iterable=\u6570\u7EC4\u6216 java.lang.Iterable
+compiler.misc.type.req.array.or.iterable=数组或 java.lang.Iterable
 
-compiler.misc.type.req.ref=\u5F15\u7528
+compiler.misc.type.req.ref=引用
 
-compiler.misc.type.req.exact=\u4E0D\u5E26\u9650\u5236\u8303\u56F4\u7684\u7C7B\u6216\u63A5\u53E3
+compiler.misc.type.req.exact=不带限制范围的类或接口
 
 # 0: type
-compiler.misc.type.parameter=\u7C7B\u578B\u53C2\u6570{0}
+compiler.misc.type.parameter=类型参数{0}
 
 #####
 
@@ -1932,146 +1932,146 @@ compiler.misc.type.parameter=\u7C7B\u578B\u53C2\u6570{0}
 ## diagnostics whose key ends in ".1"
 
 # 0: type, 1: list of type
-compiler.misc.no.unique.maximal.instance.exists=\u5BF9\u4E8E\u4E0A\u9650\u4E3A{1}\u7684\u7C7B\u578B\u53D8\u91CF{0}, \u4E0D\u5B58\u5728\u552F\u4E00\u6700\u5927\u5B9E\u4F8B
+compiler.misc.no.unique.maximal.instance.exists=对于上限为{1}的类型变量{0}, 不存在唯一最大实例
 
 # 0: type, 1: list of type
-compiler.misc.no.unique.minimal.instance.exists=\u5BF9\u4E8E\u4E0B\u9650\u4E3A{1}\u7684\u7C7B\u578B\u53D8\u91CF{0}, \u4E0D\u5B58\u5728\u552F\u4E00\u6700\u5C0F\u5B9E\u4F8B
+compiler.misc.no.unique.minimal.instance.exists=对于下限为{1}的类型变量{0}, 不存在唯一最小实例
 
 # 0: type, 1: list of type
-compiler.misc.incompatible.upper.bounds=\u63A8\u8BBA\u53D8\u91CF {0} \u5177\u6709\u4E0D\u517C\u5BB9\u7684\u4E0A\u9650 {1}
+compiler.misc.incompatible.upper.bounds=推论变量 {0} 具有不兼容的上限 {1}
 
 # 0: type, 1: list of type
-compiler.misc.incompatible.eq.bounds=\u63A8\u8BBA\u53D8\u91CF{0}\u5177\u6709\u4E0D\u517C\u5BB9\u7684\u7B49\u5F0F\u7EA6\u675F\u6761\u4EF6{1}
+compiler.misc.incompatible.eq.bounds=推论变量{0}具有不兼容的等式约束条件{1}
 
 # 0: type, 1: fragment, 2: fragment
-compiler.misc.incompatible.bounds=\u63A8\u8BBA\u53D8\u91CF {0} \u5177\u6709\u4E0D\u517C\u5BB9\u7684\u4E0A\u9650\n{1}\n{2}
+compiler.misc.incompatible.bounds=推论变量 {0} 具有不兼容的上限\n{1}\n{2}
 
 # 0: list of type
-compiler.misc.lower.bounds=\u4E0B\u9650\uFF1A{0}
+compiler.misc.lower.bounds=下限：{0}
 
 # 0: list of type
-compiler.misc.eq.bounds=\u7B49\u5F0F\u7EA6\u675F\u6761\u4EF6\uFF1A{0}
+compiler.misc.eq.bounds=等式约束条件：{0}
 
 # 0: list of type
-compiler.misc.upper.bounds=\u4E0A\u9650\uFF1A{0}
+compiler.misc.upper.bounds=上限：{0}
 
 # 0: list of type, 1: type, 2: type
-compiler.misc.infer.no.conforming.instance.exists=\u4E0D\u5B58\u5728\u7C7B\u578B\u53D8\u91CF{0}\u7684\u5B9E\u4F8B, \u4EE5\u4F7F{1}\u4E0E{2}\u4E00\u81F4
+compiler.misc.infer.no.conforming.instance.exists=不存在类型变量{0}的实例, 以使{1}与{2}一致
 
 # 0: list of type, 1: message segment
-compiler.misc.infer.no.conforming.assignment.exists=\u65E0\u6CD5\u63A8\u65AD\u7C7B\u578B\u53D8\u91CF {0}\n(\u53C2\u6570\u4E0D\u5339\u914D; {1})
+compiler.misc.infer.no.conforming.assignment.exists=无法推断类型变量 {0}\n(参数不匹配; {1})
 
 # 0: list of type
-compiler.misc.infer.arg.length.mismatch=\u65E0\u6CD5\u63A8\u65AD\u7C7B\u578B\u53D8\u91CF {0}\n(\u5B9E\u9645\u53C2\u6570\u5217\u8868\u548C\u5F62\u5F0F\u53C2\u6570\u5217\u8868\u957F\u5EA6\u4E0D\u540C)
+compiler.misc.infer.arg.length.mismatch=无法推断类型变量 {0}\n(实际参数列表和形式参数列表长度不同)
 
 # 0: list of type, 1: message segment
-compiler.misc.infer.varargs.argument.mismatch=\u65E0\u6CD5\u63A8\u65AD\u7C7B\u578B\u53D8\u91CF {0}\n(varargs \u4E0D\u5339\u914D; {1})
+compiler.misc.infer.varargs.argument.mismatch=无法推断类型变量 {0}\n(varargs 不匹配; {1})
 
 # 0: type, 1: list of type
-compiler.misc.inferred.do.not.conform.to.upper.bounds=\u63A8\u65AD\u7C7B\u578B\u4E0D\u7B26\u5408\u4E0A\u9650\n\u63A8\u65AD: {0}\n\u4E0A\u9650: {1}
+compiler.misc.inferred.do.not.conform.to.upper.bounds=推断类型不符合上限\n推断: {0}\n上限: {1}
 
 # 0: type, 1: list of type
-compiler.misc.inferred.do.not.conform.to.lower.bounds=\u63A8\u65AD\u7C7B\u578B\u4E0D\u7B26\u5408\u4E0B\u9650\n\u63A8\u65AD: {0}\n\u4E0B\u9650: {1}
+compiler.misc.inferred.do.not.conform.to.lower.bounds=推断类型不符合下限\n推断: {0}\n下限: {1}
 
 # 0: type, 1: list of type
-compiler.misc.inferred.do.not.conform.to.eq.bounds=\u63A8\u65AD\u7C7B\u578B\u4E0D\u7B26\u5408\u7B49\u5F0F\u7EA6\u675F\u6761\u4EF6\n\u63A8\u65AD: {0}\n\u7B49\u5F0F\u7EA6\u675F\u6761\u4EF6: {1}
+compiler.misc.inferred.do.not.conform.to.eq.bounds=推断类型不符合等式约束条件\n推断: {0}\n等式约束条件: {1}
 
 # 0: symbol
 compiler.misc.diamond={0}<>
 
 # 0: type
-compiler.misc.diamond.non.generic=\u65E0\u6CD5\u5C06 ''<>'' \u4E0E\u975E\u6CDB\u578B\u7C7B{0}\u4E00\u8D77\u4F7F\u7528
+compiler.misc.diamond.non.generic=无法将 ''<>'' 与非泛型类{0}一起使用
 
 # 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.arg=\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E3A{1}\u63A8\u65AD\u7684\u7C7B\u578B\u53C2\u6570{0}\n\u63A8\u65AD\u53C2\u6570\u5728\u7B7E\u540D\u5C5E\u6027\u4E2D\u65E0\u6CD5\u8868\u8FBE
+compiler.misc.diamond.invalid.arg=此上下文中不允许使用为{1}推断的类型参数{0}\n推断参数在签名属性中无法表达
 
 # 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.args=\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E3A{1}\u63A8\u65AD\u7684\u7C7B\u578B\u53C2\u6570{0}\n\u63A8\u65AD\u53C2\u6570\u5728\u7B7E\u540D\u5C5E\u6027\u4E2D\u65E0\u6CD5\u8868\u8FBE
+compiler.misc.diamond.invalid.args=此上下文中不允许使用为{1}推断的类型参数{0}\n推断参数在签名属性中无法表达
 
 # 0: type
-compiler.misc.diamond.and.explicit.params=\u4E0D\u80FD\u5C06 ''<>'' \u4E0E\u6784\u9020\u5668\u7684\u663E\u5F0F\u7C7B\u578B\u53C2\u6570\u4E00\u8D77\u4F7F\u7528
+compiler.misc.diamond.and.explicit.params=不能将 ''<>'' 与构造器的显式类型参数一起使用
 
-compiler.misc.mref.infer.and.explicit.params=\u4E0D\u80FD\u5C06\u539F\u59CB\u6784\u9020\u5668\u5F15\u7528\u4E0E\u6784\u9020\u5668\u7684\u663E\u5F0F\u7C7B\u578B\u53C2\u6570\u4E00\u8D77\u4F7F\u7528
+compiler.misc.mref.infer.and.explicit.params=不能将原始构造器引用与构造器的显式类型参数一起使用
 
 # 0: type, 1: list of type
-compiler.misc.explicit.param.do.not.conform.to.bounds=\u663E\u5F0F\u7C7B\u578B\u53C2\u6570{0}\u4E0D\u7B26\u5408\u58F0\u660E\u7684\u8303\u56F4{1}
+compiler.misc.explicit.param.do.not.conform.to.bounds=显式类型参数{0}不符合声明的范围{1}
 
-compiler.misc.arg.length.mismatch=\u5B9E\u9645\u53C2\u6570\u5217\u8868\u548C\u5F62\u5F0F\u53C2\u6570\u5217\u8868\u957F\u5EA6\u4E0D\u540C
+compiler.misc.arg.length.mismatch=实际参数列表和形式参数列表长度不同
 
 # 0: string
-compiler.misc.wrong.number.type.args=\u7C7B\u578B\u53D8\u91CF\u6570\u76EE\u9519\u8BEF; \u9700\u8981{0}
+compiler.misc.wrong.number.type.args=类型变量数目错误; 需要{0}
 
 # 0: message segment
-compiler.misc.no.conforming.assignment.exists=\u53C2\u6570\u4E0D\u5339\u914D; {0}
+compiler.misc.no.conforming.assignment.exists=参数不匹配; {0}
 
 # 0: message segment
-compiler.misc.varargs.argument.mismatch=varargs \u4E0D\u5339\u914D; {0}
+compiler.misc.varargs.argument.mismatch=varargs 不匹配; {0}
 
 #####
 
 # 0: symbol or type, 1: file name
-compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file={1} \u4E2D\u7684\u8F85\u52A9\u7C7B{0}\u4E0D\u5E94\u4ECE\u5176\u81EA\u8EAB\u7684\u6E90\u6587\u4EF6\u4EE5\u5916\u8BBF\u95EE
+compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file={1} 中的辅助类{0}不应从其自身的源文件以外访问
 
 ## The first argument ({0}) is a "kindname".
 # 0: kind name, 1: symbol, 2: symbol
-compiler.err.abstract.cant.be.accessed.directly=\u65E0\u6CD5\u76F4\u63A5\u8BBF\u95EE{2}\u4E2D\u7684\u62BD\u8C61{0} {1}
+compiler.err.abstract.cant.be.accessed.directly=无法直接访问{2}中的抽象{0} {1}
 
 ## The first argument ({0}) is a "kindname".
 # 0: symbol kind, 1: symbol
-compiler.err.non-static.cant.be.ref=\u65E0\u6CD5\u4ECE\u9759\u6001\u4E0A\u4E0B\u6587\u4E2D\u5F15\u7528\u975E\u9759\u6001 {0} {1}
+compiler.err.non-static.cant.be.ref=无法从静态上下文中引用非静态 {0} {1}
 
 # 0: symbol kind, 1: symbol
-compiler.misc.bad.static.method.in.unbound.lookup=\u5728\u672A\u7ED1\u5B9A\u67E5\u627E\u4E2D\u627E\u5230\u610F\u5916\u7684\u9759\u6001 {0} {1}
+compiler.misc.bad.static.method.in.unbound.lookup=在未绑定查找中找到意外的静态 {0} {1}
 
 # 0: symbol kind, 1: symbol
-compiler.misc.bad.instance.method.in.unbound.lookup=\u5728\u672A\u7ED1\u5B9A\u67E5\u627E\u4E2D\u627E\u5230\u610F\u5916\u7684\u5B9E\u4F8B {0} {1}
+compiler.misc.bad.instance.method.in.unbound.lookup=在未绑定查找中找到意外的实例 {0} {1}
 
 # 0: symbol kind, 1: symbol
-compiler.misc.bad.static.method.in.bound.lookup=\u5728\u7ED1\u5B9A\u67E5\u627E\u4E2D\u627E\u5230\u610F\u5916\u7684\u9759\u6001 {0} {1}
+compiler.misc.bad.static.method.in.bound.lookup=在绑定查找中找到意外的静态 {0} {1}
 
 ## Both arguments ({0}, {1}) are "kindname"s.  {0} is a comma-separated list
 ## of kindnames (the list should be identical to that provided in source.
 # 0: set of kind name, 1: set of kind name
-compiler.err.unexpected.type=\u610F\u5916\u7684\u7C7B\u578B\n\u9700\u8981: {0}\n\u627E\u5230:    {1}
+compiler.err.unexpected.type=意外的类型\n需要: {0}\n找到:    {1}
 
-compiler.err.unexpected.lambda=\u6B64\u5904\u4E0D\u5E94\u4E3A lambda \u8868\u8FBE\u5F0F
+compiler.err.unexpected.lambda=此处不应为 lambda 表达式
 
-compiler.err.unexpected.mref=\u6B64\u5904\u4E0D\u5E94\u4E3A\u65B9\u6CD5\u5F15\u7528
+compiler.err.unexpected.mref=此处不应为方法引用
 
 ## The first argument {0} is a "kindname" (e.g. 'constructor', 'field', etc.)
 ## The second argument {1} is the non-resolved symbol
 ## The third argument {2} is a list of type parameters (non-empty if {1} is a method)
 ## The fourth argument {3} is a list of argument types (non-empty if {1} is a method)
 # 0: kind name, 1: name, 2: unused, 3: unused
-compiler.err.cant.resolve=\u627E\u4E0D\u5230\u7B26\u53F7\n\u7B26\u53F7: {0} {1}
+compiler.err.cant.resolve=找不到符号\n符号: {0} {1}
 
 # 0: kind name, 1: name, 2: unused, 3: list of type
-compiler.err.cant.resolve.args=\u627E\u4E0D\u5230\u7B26\u53F7\n\u7B26\u53F7: {0} {1}({3})
+compiler.err.cant.resolve.args=找不到符号\n符号: {0} {1}({3})
 
 # 0: kind name, 1: name, 2: unused, 3: list of type
-compiler.misc.cant.resolve.args=\u627E\u4E0D\u5230\u7B26\u53F7\n\u7B26\u53F7: {0} {1}({3})
+compiler.misc.cant.resolve.args=找不到符号\n符号: {0} {1}({3})
 
 # 0: kind name, 1: name, 2: list of type, 3: list of type
-compiler.err.cant.resolve.args.params=\u627E\u4E0D\u5230\u7B26\u53F7\n\u7B26\u53F7: {0} <{2}>{1}({3})
+compiler.err.cant.resolve.args.params=找不到符号\n符号: {0} <{2}>{1}({3})
 
 ## arguments from {0} to {3} have the same meaning as above
 ## The fifth argument {4} is a location subdiagnostic (see below)
 # 0: kind name, 1: name, 2: unused, 3: unused, 4: message segment
-compiler.err.cant.resolve.location=\u627E\u4E0D\u5230\u7B26\u53F7\n\u7B26\u53F7:   {0} {1}\n\u4F4D\u7F6E: {4}
+compiler.err.cant.resolve.location=找不到符号\n符号:   {0} {1}\n位置: {4}
 
 # 0: kind name, 1: name, 2: unused, 3: list of type, 4: message segment
-compiler.err.cant.resolve.location.args=\u627E\u4E0D\u5230\u7B26\u53F7\n\u7B26\u53F7:   {0} {1}({3})\n\u4F4D\u7F6E: {4}
+compiler.err.cant.resolve.location.args=找不到符号\n符号:   {0} {1}({3})\n位置: {4}
 
 # 0: kind name, 1: name, 2: list of type, 3: list, 4: message segment
-compiler.err.cant.resolve.location.args.params=\u627E\u4E0D\u5230\u7B26\u53F7\n\u7B26\u53F7:   {0} <{2}>{1}({3})\n\u4F4D\u7F6E: {4}
+compiler.err.cant.resolve.location.args.params=找不到符号\n符号:   {0} <{2}>{1}({3})\n位置: {4}
 
 ### Following are replicated/used for method reference diagnostics
 
 # 0: kind name, 1: name, 2: unused, 3: list of type, 4: message segment
-compiler.misc.cant.resolve.location.args=\u627E\u4E0D\u5230\u7B26\u53F7\n\u7B26\u53F7:   {0} {1}({3})\n\u4F4D\u7F6E: {4}
+compiler.misc.cant.resolve.location.args=找不到符号\n符号:   {0} {1}({3})\n位置: {4}
 
 # 0: kind name, 1: name, 2: list of type, 3: list, 4: message segment
-compiler.misc.cant.resolve.location.args.params=\u627E\u4E0D\u5230\u7B26\u53F7\n\u7B26\u53F7:   {0} <{2}>{1}({3})\n\u4F4D\u7F6E: {4}
+compiler.misc.cant.resolve.location.args.params=找不到符号\n符号:   {0} <{2}>{1}({3})\n位置: {4}
 
 ##a location subdiagnostic is composed as follows:
 ## The first argument {0} is the location "kindname" (e.g. 'constructor', 'field', etc.)
@@ -2082,7 +2082,7 @@ compiler.misc.cant.resolve.location.args.params=\u627E\u4E0D\u5230\u7B26\u53F7\n
 compiler.misc.location={0} {1}
 
 # 0: kind name, 1: symbol, 2: type
-compiler.misc.location.1=\u7C7B\u578B\u4E3A{2}\u7684{0} {1}
+compiler.misc.location.1=类型为{2}的{0} {1}
 
 ## The following are all possible string for "kindname".
 ## They should be called whatever the JLS calls them after it been translated
@@ -2091,102 +2091,102 @@ compiler.misc.location.1=\u7C7B\u578B\u4E3A{2}\u7684{0} {1}
 #     static member
 compiler.misc.kindname.annotation=@interface
 
-compiler.misc.kindname.constructor=\u6784\u9020\u5668
+compiler.misc.kindname.constructor=构造器
 
-compiler.misc.kindname.enum=\u679A\u4E3E
+compiler.misc.kindname.enum=枚举
 
-compiler.misc.kindname.interface=\u63A5\u53E3
+compiler.misc.kindname.interface=接口
 
-compiler.misc.kindname.static=\u9759\u6001
+compiler.misc.kindname.static=静态
 
-compiler.misc.kindname.type.variable=\u7C7B\u578B\u53D8\u91CF
+compiler.misc.kindname.type.variable=类型变量
 
-compiler.misc.kindname.type.variable.bound=\u7C7B\u578B\u53D8\u91CF\u7684\u9650\u5236\u8303\u56F4
+compiler.misc.kindname.type.variable.bound=类型变量的限制范围
 
-compiler.misc.kindname.variable=\u53D8\u91CF
+compiler.misc.kindname.variable=变量
 
-compiler.misc.kindname.value=\u503C
+compiler.misc.kindname.value=值
 
-compiler.misc.kindname.method=\u65B9\u6CD5
+compiler.misc.kindname.method=方法
 
-compiler.misc.kindname.class=\u7C7B
+compiler.misc.kindname.class=类
 
-compiler.misc.kindname.package=\u7A0B\u5E8F\u5305
+compiler.misc.kindname.package=程序包
 
-compiler.misc.kindname.module=\u6A21\u5757
+compiler.misc.kindname.module=模块
 
-compiler.misc.kindname.static.init=\u9759\u6001\u521D\u59CB\u5316\u7A0B\u5E8F
+compiler.misc.kindname.static.init=静态初始化程序
 
-compiler.misc.kindname.instance.init=\u5B9E\u4F8B\u521D\u59CB\u5316\u7A0B\u5E8F
+compiler.misc.kindname.instance.init=实例初始化程序
 
-compiler.misc.kindname.record.component=\u8BB0\u5F55\u7EC4\u4EF6
+compiler.misc.kindname.record.component=记录组件
 
-compiler.misc.kindname.record=\u8BB0\u5F55
+compiler.misc.kindname.record=记录
 
 #####
 
-compiler.misc.no.args=\u6CA1\u6709\u53C2\u6570
+compiler.misc.no.args=没有参数
 
 # 0: message segment
-compiler.err.override.static={0}\n\u8986\u76D6\u7684\u65B9\u6CD5\u4E3A static
+compiler.err.override.static={0}\n覆盖的方法为 static
 
 # 0: message segment, 1: set of flag
-compiler.err.override.meth={0}\n\u88AB\u8986\u76D6\u7684\u65B9\u6CD5\u4E3A{1}
+compiler.err.override.meth={0}\n被覆盖的方法为{1}
 
 # 0: message segment, 1: type
-compiler.err.override.meth.doesnt.throw={0}\n\u88AB\u8986\u76D6\u7684\u65B9\u6CD5\u672A\u629B\u51FA{1}
+compiler.err.override.meth.doesnt.throw={0}\n被覆盖的方法未抛出{1}
 
 # In the following string {1} is a space separated list of Java Keywords, as
 # they would have been declared in the source code
 # 0: message segment, 1: set of flag or string
-compiler.err.override.weaker.access={0}\n\u6B63\u5728\u5C1D\u8BD5\u5206\u914D\u66F4\u4F4E\u7684\u8BBF\u95EE\u6743\u9650; \u4EE5\u524D\u4E3A{1}
+compiler.err.override.weaker.access={0}\n正在尝试分配更低的访问权限; 以前为{1}
 
 # 0: message segment, 1: type, 2: type
-compiler.err.override.incompatible.ret={0}\n\u8FD4\u56DE\u7C7B\u578B{1}\u4E0E{2}\u4E0D\u517C\u5BB9
+compiler.err.override.incompatible.ret={0}\n返回类型{1}与{2}不兼容
 
 # 0: message segment, 1: type, 2: type
-compiler.warn.override.unchecked.ret={0}\n\u8FD4\u56DE\u7C7B\u578B\u9700\u8981\u4ECE{1}\u5230{2}\u7684\u672A\u7ECF\u68C0\u67E5\u7684\u8F6C\u6362
+compiler.warn.override.unchecked.ret={0}\n返回类型需要从{1}到{2}的未经检查的转换
 
 # 0: message segment, 1: type
-compiler.warn.override.unchecked.thrown={0}\n\u88AB\u8986\u76D6\u7684\u65B9\u6CD5\u672A\u629B\u51FA{1}
+compiler.warn.override.unchecked.thrown={0}\n被覆盖的方法未抛出{1}
 
 # 0: symbol
-compiler.warn.override.equals.but.not.hashcode=\u7C7B{0}\u8986\u76D6\u4E86 equals, \u4F46\u8BE5\u7C7B\u6216\u4EFB\u4F55\u8D85\u7C7B\u90FD\u672A\u8986\u76D6 hashCode \u65B9\u6CD5
+compiler.warn.override.equals.but.not.hashcode=类{0}覆盖了 equals, 但该类或任何超类都未覆盖 hashCode 方法
 
 ## The following are all possible strings for the first argument ({0}) of the
 ## above strings.
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.cant.override={1}\u4E2D\u7684{0}\u65E0\u6CD5\u8986\u76D6{3}\u4E2D\u7684{2}
+compiler.misc.cant.override={1}中的{0}无法覆盖{3}中的{2}
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.cant.hide={1} \u4E2D\u7684 {0} \u65E0\u6CD5\u9690\u85CF {3} \u4E2D\u7684 {2}
+compiler.misc.cant.hide={1} 中的 {0} 无法隐藏 {3} 中的 {2}
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.cant.implement={1}\u4E2D\u7684{0}\u65E0\u6CD5\u5B9E\u73B0{3}\u4E2D\u7684{2}
+compiler.misc.cant.implement={1}中的{0}无法实现{3}中的{2}
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.clashes.with={1}\u4E2D\u7684{0}\u4E0E{3}\u4E2D\u7684{2}\u51B2\u7A81
+compiler.misc.clashes.with={1}中的{0}与{3}中的{2}冲突
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.unchecked.override={1}\u4E2D\u7684{0}\u8986\u76D6\u4E86{3}\u4E2D\u7684{2}
+compiler.misc.unchecked.override={1}中的{0}覆盖了{3}中的{2}
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.unchecked.implement={1}\u4E2D\u7684{0}\u5B9E\u73B0\u4E86{3}\u4E2D\u7684{2}
+compiler.misc.unchecked.implement={1}中的{0}实现了{3}中的{2}
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.unchecked.clash.with={1}\u4E2D\u7684{0}\u8986\u76D6\u4E86{3}\u4E2D\u7684{2}
+compiler.misc.unchecked.clash.with={1}中的{0}覆盖了{3}中的{2}
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.varargs.override={1}\u4E2D\u7684{0}\u8986\u76D6\u4E86{3}\u4E2D\u7684{2}
+compiler.misc.varargs.override={1}中的{0}覆盖了{3}中的{2}
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.varargs.implement={1}\u4E2D\u7684{0}\u5B9E\u73B0\u4E86{3}\u4E2D\u7684{2}
+compiler.misc.varargs.implement={1}中的{0}实现了{3}中的{2}
 
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.varargs.clash.with={1}\u4E2D\u7684{0}\u8986\u76D6\u4E86{3}\u4E2D\u7684{2}
+compiler.misc.varargs.clash.with={1}中的{0}覆盖了{3}中的{2}
 
 # 0: kind name, 1: symbol, 2: symbol, 3: message segment
-compiler.misc.inapplicable.method={0} {1}.{2}\u4E0D\u9002\u7528\n({3})
+compiler.misc.inapplicable.method={0} {1}.{2}不适用\n({3})
 
 ########################################
 # Diagnostics for language feature changes.
@@ -2195,113 +2195,113 @@ compiler.misc.inapplicable.method={0} {1}.{2}\u4E0D\u9002\u7528\n({3})
 ########################################
 
 # 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.err.feature.not.supported.in.source=-source {1} \u4E2D\u4E0D\u652F\u6301 {0}\n(\u8BF7\u4F7F\u7528 -source {2} \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528 {0})
+compiler.err.feature.not.supported.in.source=-source {1} 中不支持 {0}\n(请使用 -source {2} 或更高版本以启用 {0})
 
 # 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.err.feature.not.supported.in.source.plural=-source {1} \u4E2D\u4E0D\u652F\u6301 {0}\n(\u8BF7\u4F7F\u7528 -source {2} \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528 {0})
+compiler.err.feature.not.supported.in.source.plural=-source {1} 中不支持 {0}\n(请使用 -source {2} 或更高版本以启用 {0})
 
 # 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.misc.feature.not.supported.in.source=-source {1} \u4E2D\u4E0D\u652F\u6301 {0}\n(\u8BF7\u4F7F\u7528 -source {2} \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528 {0})
+compiler.misc.feature.not.supported.in.source=-source {1} 中不支持 {0}\n(请使用 -source {2} 或更高版本以启用 {0})
 
 # 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.misc.feature.not.supported.in.source.plural=-source {1} \u4E2D\u4E0D\u652F\u6301 {0}\n(\u8BF7\u4F7F\u7528 -source {2} \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528 {0})
+compiler.misc.feature.not.supported.in.source.plural=-source {1} 中不支持 {0}\n(请使用 -source {2} 或更高版本以启用 {0})
 
 # 0: message segment (feature)
-compiler.err.preview.feature.disabled={0} \u662F\u9884\u89C8\u529F\u80FD\uFF0C\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u7981\u7528\u3002\n\uFF08\u8BF7\u4F7F\u7528 --enable-preview \u4EE5\u542F\u7528 {0}\uFF09
+compiler.err.preview.feature.disabled={0} 是预览功能，默认情况下禁用。\n（请使用 --enable-preview 以启用 {0}）
 
 # 0: message segment (feature)
-compiler.err.preview.feature.disabled.plural={0} \u662F\u9884\u89C8\u529F\u80FD\uFF0C\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u7981\u7528\u3002\n\uFF08\u8BF7\u4F7F\u7528 --enable-preview \u4EE5\u542F\u7528 {0}\uFF09
+compiler.err.preview.feature.disabled.plural={0} 是预览功能，默认情况下禁用。\n（请使用 --enable-preview 以启用 {0}）
 
 # 0: file object (classfile), 1: string (expected version)
-compiler.err.preview.feature.disabled.classfile={0} \u7684\u7C7B\u6587\u4EF6\u4F7F\u7528 Java SE {1} \u7684\u9884\u89C8\u529F\u80FD\u3002\n\uFF08\u8BF7\u4F7F\u7528 --enable-preview \u4EE5\u5141\u8BB8\u52A0\u8F7D\u5305\u542B\u9884\u89C8\u529F\u80FD\u7684\u7C7B\u6587\u4EF6\uFF09
+compiler.err.preview.feature.disabled.classfile={0} 的类文件使用 Java SE {1} 的预览功能。\n（请使用 --enable-preview 以允许加载包含预览功能的类文件）
 
 # 0: message segment (feature)
-compiler.warn.preview.feature.use={0} \u662F\u9884\u89C8\u529F\u80FD\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
+compiler.warn.preview.feature.use={0} 是预览功能，可能会在未来发行版中删除。
 
 # 0: message segment (feature)
-compiler.warn.preview.feature.use.plural={0} \u662F\u9884\u89C8\u529F\u80FD\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
+compiler.warn.preview.feature.use.plural={0} 是预览功能，可能会在未来发行版中删除。
 
 # 0: file object (classfile), 1: string (expected version)
-compiler.warn.preview.feature.use.classfile={0} \u7684\u7C7B\u6587\u4EF6\u4F7F\u7528 Java SE {1} \u7684\u9884\u89C8\u529F\u80FD\u3002
+compiler.warn.preview.feature.use.classfile={0} 的类文件使用 Java SE {1} 的预览功能。
 
-compiler.misc.feature.modules=\u6A21\u5757
+compiler.misc.feature.modules=模块
 
-compiler.misc.feature.diamond.and.anon.class=''<>'' \u5177\u6709\u533F\u540D\u7684\u5185\u90E8\u7C7B
+compiler.misc.feature.diamond.and.anon.class=''<>'' 具有匿名的内部类
 
-compiler.misc.feature.var.in.try.with.resources=try-with-resources \u4E2D\u7684\u53D8\u91CF
+compiler.misc.feature.var.in.try.with.resources=try-with-resources 中的变量
 
-compiler.misc.feature.private.intf.methods=\u79C1\u6709\u63A5\u53E3\u65B9\u6CD5
+compiler.misc.feature.private.intf.methods=私有接口方法
 
-compiler.misc.feature.text.blocks=\u6587\u672C\u5757
+compiler.misc.feature.text.blocks=文本块
 
-compiler.misc.feature.multiple.case.labels=\u591A\u4E2A case \u6807\u7B7E
+compiler.misc.feature.multiple.case.labels=多个 case 标签
 
-compiler.misc.feature.switch.rules=switch \u89C4\u5219
+compiler.misc.feature.switch.rules=switch 规则
 
-compiler.misc.feature.switch.expressions=switch \u8868\u8FBE\u5F0F
+compiler.misc.feature.switch.expressions=switch 表达式
 
-compiler.misc.feature.var.syntax.in.implicit.lambda=\u9690\u5F0F lambda \u4E2D\u7684 var \u8BED\u6CD5
+compiler.misc.feature.var.syntax.in.implicit.lambda=隐式 lambda 中的 var 语法
 
-compiler.misc.feature.pattern.matching.instanceof=instanceof \u4E2D\u7684\u6A21\u5F0F\u5339\u914D
+compiler.misc.feature.pattern.matching.instanceof=instanceof 中的模式匹配
 
-compiler.misc.feature.reifiable.types.instanceof=instanceof \u4E2D\u7684\u53EF\u5177\u4F53\u5316\u7C7B\u578B
+compiler.misc.feature.reifiable.types.instanceof=instanceof 中的可具体化类型
 
-compiler.misc.feature.deconstruction.patterns=\u89E3\u6784\u6A21\u5F0F
+compiler.misc.feature.deconstruction.patterns=解构模式
 
-compiler.misc.feature.unnamed.variables=\u672A\u547D\u540D\u53D8\u91CF
+compiler.misc.feature.unnamed.variables=未命名变量
 
-compiler.misc.feature.records=\u8BB0\u5F55
+compiler.misc.feature.records=记录
 
-compiler.misc.feature.sealed.classes=\u5BC6\u5C01\u7C7B
+compiler.misc.feature.sealed.classes=密封类
 
-compiler.misc.feature.case.null=switch case \u4E2D\u7684\u7A7A\u503C
+compiler.misc.feature.case.null=switch case 中的空值
 
-compiler.misc.feature.pattern.switch=switch \u8BED\u53E5\u4E2D\u7684\u6A21\u5F0F
+compiler.misc.feature.pattern.switch=switch 语句中的模式
 
-compiler.misc.feature.string.templates=\u5B57\u7B26\u4E32\u6A21\u677F
+compiler.misc.feature.string.templates=字符串模板
 
-compiler.misc.feature.unconditional.patterns.in.instanceof=instanceof \u4E2D\u7684\u65E0\u6761\u4EF6\u6A21\u5F0F
+compiler.misc.feature.unconditional.patterns.in.instanceof=instanceof 中的无条件模式
 
-compiler.misc.feature.unnamed.classes=\u672A\u547D\u540D\u7C7B
+compiler.misc.feature.unnamed.classes=未命名类
 
-compiler.warn.underscore.as.identifier=\u4ECE\u53D1\u884C\u7248 9 \u5F00\u59CB, ''_'' \u4E3A\u5173\u952E\u5B57, \u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26
+compiler.warn.underscore.as.identifier=从发行版 9 开始, ''_'' 为关键字, 不能用作标识符
 
-compiler.err.underscore.as.identifier=\u4ECE\u53D1\u884C\u7248 9 \u5F00\u59CB, ''_'' \u4E3A\u5173\u952E\u5B57, \u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26
+compiler.err.underscore.as.identifier=从发行版 9 开始, ''_'' 为关键字, 不能用作标识符
 
-compiler.err.use.of.underscore.not.allowed=\u4ECE\u53D1\u884C\u7248 21 \u5F00\u59CB\uFF0C\u4E0B\u5212\u7EBF\u5173\u952E\u5B57 ''_'' \u53EA\u5141\u8BB8\u7528\u4E8E\u58F0\u660E\n\u672A\u547D\u540D\u6A21\u5F0F\u3001\u672C\u5730\u53D8\u91CF\u3001\u5F02\u5E38\u9519\u8BEF\u53C2\u6570\u6216 lambda \u53C2\u6570
+compiler.err.use.of.underscore.not.allowed=从发行版 21 开始，下划线关键字 ''_'' 只允许用于声明\n未命名模式、本地变量、异常错误参数或 lambda 参数
 
-compiler.err.use.of.underscore.not.allowed.with.brackets=\u4E0B\u5212\u7EBF\u5173\u952E\u5B57 ''_'' \u4E0D\u5141\u8BB8\u540E\u8DDF\u65B9\u62EC\u53F7
+compiler.err.use.of.underscore.not.allowed.with.brackets=下划线关键字 ''_'' 不允许后跟方括号
 
-compiler.err.enum.as.identifier=\u4ECE\u53D1\u884C\u7248 5 \u5F00\u59CB, ''enum'' \u4E3A\u5173\u952E\u5B57, \u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26
+compiler.err.enum.as.identifier=从发行版 5 开始, ''enum'' 为关键字, 不能用作标识符
 
-compiler.err.assert.as.identifier=\u4ECE\u53D1\u884C\u7248 1.4 \u5F00\u59CB, ''assert'' \u4E3A\u5173\u952E\u5B57, \u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26
+compiler.err.assert.as.identifier=从发行版 1.4 开始, ''assert'' 为关键字, 不能用作标识符
 
 # TODO 308: make a better error message
-compiler.err.this.as.identifier=\u4ECE\u53D1\u884C\u7248 8 \u5F00\u59CB\uFF0C''this'' \u53EA\u80FD\u4F5C\u4E3A\u63A5\u6536\u65B9\u7C7B\u578B\u7684\u53C2\u6570\u540D\uFF0C\n\u8BE5\u53C2\u6570\u5FC5\u987B\u4E3A\u7B2C\u4E00\u4E2A\u53C2\u6570\uFF0C\u5E76\u4E14\u4E0D\u80FD\u662F lambda \u53C2\u6570
+compiler.err.this.as.identifier=从发行版 8 开始，''this'' 只能作为接收方类型的参数名，\n该参数必须为第一个参数，并且不能是 lambda 参数
 
-compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=\u63A5\u6536\u65B9\u53C2\u6570\u4E0D\u9002\u7528\u4E8E\u9876\u5C42\u7C7B\u7684\u6784\u9020\u5668
+compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=接收方参数不适用于顶层类的构造器
 
 # TODO 308: make a better error message
 # 0: annotation
-compiler.err.cant.type.annotate.scoping.1=\u65E0\u6CD5\u4F7F\u7528 type-use \u6279\u6CE8 {0} \u6765\u6279\u6CE8\u786E\u5B9A\u4F5C\u7528\u57DF\u7ED3\u6784
+compiler.err.cant.type.annotate.scoping.1=无法使用 type-use 批注 {0} 来批注确定作用域结构
 
 # TODO 308: make a better error message
 # 0: list of annotation
-compiler.err.cant.type.annotate.scoping=\u65E0\u6CD5\u4F7F\u7528 type-use \u6279\u6CE8 {0} \u6765\u6279\u6CE8\u786E\u5B9A\u4F5C\u7528\u57DF\u7ED3\u6784
+compiler.err.cant.type.annotate.scoping=无法使用 type-use 批注 {0} 来批注确定作用域结构
 
 # 0: type, 1: type
-compiler.err.incorrect.receiver.name=\u63A5\u6536\u65B9\u540D\u79F0\u4E0E\u5C01\u95ED\u7C7B\u7C7B\u578B\u4E0D\u5339\u914D\n\u9700\u8981: {0}\n\u627E\u5230:    {1}
+compiler.err.incorrect.receiver.name=接收方名称与封闭类类型不匹配\n需要: {0}\n找到:    {1}
 
 # 0: type, 1: type
-compiler.err.incorrect.receiver.type=\u63A5\u6536\u65B9\u7C7B\u578B\u4E0E\u5C01\u95ED\u7C7B\u7C7B\u578B\u4E0D\u5339\u914D\n\u9700\u8981: {0}\n\u627E\u5230:    {1}
+compiler.err.incorrect.receiver.type=接收方类型与封闭类类型不匹配\n需要: {0}\n找到:    {1}
 
 # 0: type, 1: type
-compiler.err.incorrect.constructor.receiver.type=\u63A5\u6536\u65B9\u7C7B\u578B\u4E0E\u5916\u90E8\u5C01\u95ED\u7C7B\u7C7B\u578B\u4E0D\u5339\u914D\n\u9700\u8981: {0}\n\u627E\u5230:    {1}
+compiler.err.incorrect.constructor.receiver.type=接收方类型与外部封闭类类型不匹配\n需要: {0}\n找到:    {1}
 
 # 0: type, 1: type
-compiler.err.incorrect.constructor.receiver.name=\u63A5\u6536\u65B9\u540D\u79F0\u4E0E\u5916\u90E8\u5C01\u95ED\u7C7B\u7C7B\u578B\u4E0D\u5339\u914D\n\u9700\u8981: {0}\n\u627E\u5230:    {1}
+compiler.err.incorrect.constructor.receiver.name=接收方名称与外部封闭类类型不匹配\n需要: {0}\n找到:    {1}
 
-compiler.err.no.annotations.on.dot.class=\u7C7B\u6587\u5B57\u7C7B\u578B\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4EFB\u4F55\u6279\u6CE8
+compiler.err.no.annotations.on.dot.class=类文字类型中不允许使用任何批注
 
 ########################################
 # Diagnostics for verbose resolution
@@ -2309,25 +2309,25 @@ compiler.err.no.annotations.on.dot.class=\u7C7B\u6587\u5B57\u7C7B\u578B\u4E2D\u4
 ########################################
 
 # 0: number, 1: symbol, 2: unused
-compiler.misc.applicable.method.found=\u627E\u5230\u7B2C {0} \u4E2A\u9002\u7528\u65B9\u6CD5: {1}
+compiler.misc.applicable.method.found=找到第 {0} 个适用方法: {1}
 
 # 0: number, 1: symbol, 2: message segment
-compiler.misc.applicable.method.found.1=\u627E\u5230\u7B2C {0} \u4E2A\u9002\u7528\u65B9\u6CD5: {1}\n({2})
+compiler.misc.applicable.method.found.1=找到第 {0} 个适用方法: {1}\n({2})
 
 # 0: number, 1: symbol, 2: message segment
-compiler.misc.not.applicable.method.found=\u627E\u5230\u7B2C {0} \u4E2A\u4E0D\u9002\u7528\u7684\u65B9\u6CD5: {1}\n({2})
+compiler.misc.not.applicable.method.found=找到第 {0} 个不适用的方法: {1}\n({2})
 
 # 0: type
-compiler.misc.partial.inst.sig=\u90E8\u5206\u5B9E\u4F8B\u5316\u4E3A: {0}
+compiler.misc.partial.inst.sig=部分实例化为: {0}
 
 # 0: name, 1: symbol, 2: number, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
-compiler.note.verbose.resolve.multi=\u5C06\u7C7B\u578B {1} \u7684\u65B9\u6CD5 {0} \u89E3\u6790\u4E3A\u5019\u9009\u9879 {2}\n\u9636\u6BB5: {3}\n\u5177\u6709\u5B9E\u9645\u503C: {4}\n\u5177\u6709\u7C7B\u578B\u53C2\u6570: {5}\n\u5019\u9009\u9879:
+compiler.note.verbose.resolve.multi=将类型 {1} 的方法 {0} 解析为候选项 {2}\n阶段: {3}\n具有实际值: {4}\n具有类型参数: {5}\n候选项:
 
 # 0: name, 1: symbol, 2: unused, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
-compiler.note.verbose.resolve.multi.1=\u7C7B\u578B {1} \u7684\u65B9\u6CD5 {0} \u89E3\u6790\u9519\u8BEF\n\u9636\u6BB5: {3}\n\u5177\u6709\u5B9E\u9645\u503C: {4}\n\u5177\u6709\u7C7B\u578B\u53C2\u6570: {5}\n\u5019\u9009\u9879:
+compiler.note.verbose.resolve.multi.1=类型 {1} 的方法 {0} 解析错误\n阶段: {3}\n具有实际值: {4}\n具有类型参数: {5}\n候选项:
 
 # 0: symbol, 1: type, 2: type
-compiler.note.deferred.method.inst=\u65B9\u6CD5 {0} \u7684\u5EF6\u8FDF\u5B9E\u4F8B\u5316\n\u5B9E\u4F8B\u5316\u7B7E\u540D: {1}\n\u76EE\u6807\u7C7B\u578B: {2}
+compiler.note.deferred.method.inst=方法 {0} 的延迟实例化\n实例化签名: {1}\n目标类型: {2}
 
 ########################################
 # Diagnostics for lambda deduplication
@@ -2335,7 +2335,7 @@ compiler.note.deferred.method.inst=\u65B9\u6CD5 {0} \u7684\u5EF6\u8FDF\u5B9E\u4F
 ########################################
 
 # 0: symbol
-compiler.note.verbose.l2m.deduplicate=\u6B63\u5728\u5BF9 lambda \u51FD\u6570\u5B9E\u73B0\u65B9\u6CD5 {0} \u8FDB\u884C\u91CD\u590D\u6570\u636E\u5220\u9664
+compiler.note.verbose.l2m.deduplicate=正在对 lambda 函数实现方法 {0} 进行重复数据删除
 
 ########################################
 # Diagnostics for method reference search
@@ -2343,28 +2343,28 @@ compiler.note.verbose.l2m.deduplicate=\u6B63\u5728\u5BF9 lambda \u51FD\u6570\u5B
 ########################################
 
 # 0: fragment, 1: string, 2: number
-compiler.note.method.ref.search.results.multi={1} \u7684 {0} \u641C\u7D22\u7ED3\u679C\uFF0C\u6709 {2} \u4E2A\n\u6700\u660E\u786E\u7684\u9002\u7528\u5019\u9009\u9879\uFF1A
+compiler.note.method.ref.search.results.multi={1} 的 {0} 搜索结果，有 {2} 个\n最明确的适用候选项：
 
 # 0: number, 1: fragment, 2: symbol
-compiler.misc.applicable.method.found.2=\u627E\u5230\u7684\u7B2C {0} \u4E2A\u9002\u7528\u65B9\u6CD5\uFF1A{1} {2}
+compiler.misc.applicable.method.found.2=找到的第 {0} 个适用方法：{1} {2}
 
 # 0: number, 1: fragment, 2: symbol, 3: message segment
-compiler.misc.applicable.method.found.3=\u627E\u5230\u7684\u7B2C {0} \u4E2A\u9002\u7528\u65B9\u6CD5\uFF1A{1} {2}\n({3})
+compiler.misc.applicable.method.found.3=找到的第 {0} 个适用方法：{1} {2}\n({3})
 
-compiler.misc.static=\u9759\u6001
+compiler.misc.static=静态
 
-compiler.misc.non.static=\u975E\u9759\u6001
+compiler.misc.non.static=非静态
 
-compiler.misc.bound=\u7ED1\u5B9A
+compiler.misc.bound=绑定
 
-compiler.misc.unbound=\u672A\u7ED1\u5B9A
+compiler.misc.unbound=未绑定
 
 ########################################
 # Diagnostics for where clause implementation
 # used by the RichDiagnosticFormatter.
 ########################################
 
-compiler.misc.type.null=<\u7A7A\u503C>
+compiler.misc.type.null=<空值>
 
 # X#n (where n is an int id) is disambiguated tvar name
 # 0: name, 1: number
@@ -2381,492 +2381,492 @@ compiler.misc.intersection.type=INT#{0}
 # where clause for captured type: contains upper ('extends {1}') and lower
 # ('super {2}') bound along with the wildcard that generated this captured type ({3})
 # 0: type, 1: type, 2: type, 3: type
-compiler.misc.where.captured={0}\u4ECE{3}\u7684\u6355\u83B7\u6269\u5C55{1} \u8D85 {2}
+compiler.misc.where.captured={0}从{3}的捕获扩展{1} 超 {2}
 
 # compact where clause for captured type: contains upper ('extends {1}') along
 # with the wildcard that generated this captured type ({3})
 # 0: type, 1: type, 2: unused, 3: type
-compiler.misc.where.captured.1={0}\u4ECE{3}\u7684\u6355\u83B7\u6269\u5C55{1}
+compiler.misc.where.captured.1={0}从{3}的捕获扩展{1}
 
 # where clause for type variable: contains upper bound(s) ('extends {1}') along with
 # the kindname ({2}) and location ({3}) in which the typevar has been declared
 # 0: type, 1: list of type, 2: symbol kind, 3: symbol
-compiler.misc.where.typevar={0}\u6269\u5C55\u5DF2\u5728{2} {3}\u4E2D\u58F0\u660E\u7684{1}
+compiler.misc.where.typevar={0}扩展已在{2} {3}中声明的{1}
 
 # compact where clause for type variable: contains the kindname ({2}) and location ({3})
 # in which the typevar has been declared
 # 0: type, 1: list of type, 2: symbol kind, 3: symbol
-compiler.misc.where.typevar.1={0}\u5DF2\u5728{2} {3}\u4E2D\u58F0\u660E
+compiler.misc.where.typevar.1={0}已在{2} {3}中声明
 
 # where clause for fresh type variable: contains upper bound(s) ('extends {1}').
 # Since a fresh type-variable is synthetic - there's no location/kindname here.
 # 0: type, 1: list of type
-compiler.misc.where.fresh.typevar={0}\u6269\u5C55{1}
+compiler.misc.where.fresh.typevar={0}扩展{1}
 
 # where clause for type variable: contains all the upper bound(s) ('extends {1}')
 # of this intersection type
 # 0: type, 1: list of type
-compiler.misc.where.intersection={0}\u6269\u5C55{1}
+compiler.misc.where.intersection={0}扩展{1}
 
 ### Where clause headers ###
-compiler.misc.where.description.captured=\u5176\u4E2D, {0}\u662F\u65B0\u7C7B\u578B\u53D8\u91CF:
+compiler.misc.where.description.captured=其中, {0}是新类型变量:
 
 # 0: set of type
-compiler.misc.where.description.typevar=\u5176\u4E2D, {0}\u662F\u7C7B\u578B\u53D8\u91CF:
+compiler.misc.where.description.typevar=其中, {0}是类型变量:
 
 # 0: set of type
-compiler.misc.where.description.intersection=\u5176\u4E2D, {0}\u662F\u4EA4\u53C9\u7C7B\u578B:
+compiler.misc.where.description.intersection=其中, {0}是交叉类型:
 
 # 0: set of type
-compiler.misc.where.description.captured.1=\u5176\u4E2D, {0}\u662F\u65B0\u7C7B\u578B\u53D8\u91CF:
+compiler.misc.where.description.captured.1=其中, {0}是新类型变量:
 
 # 0: set of type
-compiler.misc.where.description.typevar.1=\u5176\u4E2D, {0}\u662F\u7C7B\u578B\u53D8\u91CF:
+compiler.misc.where.description.typevar.1=其中, {0}是类型变量:
 
 # 0: set of type
-compiler.misc.where.description.intersection.1=\u5176\u4E2D, {0}\u662F\u4EA4\u53C9\u7C7B\u578B:
+compiler.misc.where.description.intersection.1=其中, {0}是交叉类型:
 
 ###
 # errors related to doc comments
 
-compiler.err.dc.bad.entity=HTML \u5B9E\u4F53\u9519\u8BEF
+compiler.err.dc.bad.entity=HTML 实体错误
 
-compiler.err.dc.bad.inline.tag=\u5185\u5D4C\u6807\u8BB0\u7684\u7528\u6CD5\u4E0D\u6B63\u786E
+compiler.err.dc.bad.inline.tag=内嵌标记的用法不正确
 
-compiler.err.dc.identifier.expected=\u9700\u8981\u6807\u8BC6\u7B26
+compiler.err.dc.identifier.expected=需要标识符
 
-compiler.err.dc.invalid.html=HTML \u65E0\u6548
+compiler.err.dc.invalid.html=HTML 无效
 
-compiler.err.dc.malformed.html=\u683C\u5F0F\u9519\u8BEF\u7684 HTML
+compiler.err.dc.malformed.html=格式错误的 HTML
 
-compiler.err.dc.missing.semicolon=\u7F3A\u5C11\u5206\u53F7
+compiler.err.dc.missing.semicolon=缺少分号
 
-compiler.err.dc.no.content=\u65E0\u5185\u5BB9
+compiler.err.dc.no.content=无内容
 
-compiler.err.dc.no.tag.name=''@'' \u540E\u9762\u6CA1\u6709\u6807\u8BB0\u540D\u79F0
+compiler.err.dc.no.tag.name=''@'' 后面没有标记名称
 
-compiler.err.dc.no.url=\u65E0 URL
+compiler.err.dc.no.url=无 URL
 
-compiler.err.dc.no.title=\u65E0\u6807\u9898
+compiler.err.dc.no.title=无标题
 
-compiler.err.dc.gt.expected=\u9700\u8981 ''>''
+compiler.err.dc.gt.expected=需要 ''>''
 
-compiler.err.dc.ref.bad.parens=\u62EC\u53F7\u4E4B\u540E\u51FA\u73B0\u610F\u5916\u7684\u6587\u672C
+compiler.err.dc.ref.bad.parens=括号之后出现意外的文本
 
-compiler.err.dc.ref.syntax.error=\u5F15\u7528\u4E2D\u51FA\u73B0\u8BED\u6CD5\u9519\u8BEF
+compiler.err.dc.ref.syntax.error=引用中出现语法错误
 
-compiler.err.dc.ref.unexpected.input=\u610F\u5916\u7684\u6587\u672C
+compiler.err.dc.ref.unexpected.input=意外的文本
 
-compiler.err.dc.unexpected.content=\u610F\u5916\u7684\u5185\u5BB9
+compiler.err.dc.unexpected.content=意外的内容
 
-compiler.err.dc.unterminated.inline.tag=\u672A\u7EC8\u6B62\u7684\u5185\u5D4C\u6807\u8BB0
+compiler.err.dc.unterminated.inline.tag=未终止的内嵌标记
 
-compiler.err.dc.unterminated.signature=\u672A\u7EC8\u6B62\u7684\u7B7E\u540D
+compiler.err.dc.unterminated.signature=未终止的签名
 
-compiler.err.dc.unterminated.string=\u672A\u7EC8\u6B62\u7684\u5B57\u7B26\u4E32
+compiler.err.dc.unterminated.string=未终止的字符串
 
-compiler.err.dc.ref.annotations.not.allowed=\u4E0D\u5141\u8BB8\u4F7F\u7528\u6279\u6CE8
+compiler.err.dc.ref.annotations.not.allowed=不允许使用批注
 
 ###
 # errors related to modules
 
-compiler.err.expected.module=\u9884\u671F ''module''
+compiler.err.expected.module=预期 ''module''
 
 # 0: symbol
-compiler.err.module.not.found=\u627E\u4E0D\u5230\u6A21\u5757: {0}
+compiler.err.module.not.found=找不到模块: {0}
 
 # 0: symbol
-compiler.warn.module.not.found=\u627E\u4E0D\u5230\u6A21\u5757: {0}
+compiler.warn.module.not.found=找不到模块: {0}
 
-compiler.err.too.many.modules=\u627E\u5230\u592A\u591A\u7684\u6A21\u5757\u58F0\u660E
+compiler.err.too.many.modules=找到太多的模块声明
 
-compiler.err.module.not.found.on.module.source.path=\u5728\u6A21\u5757\u6E90\u8DEF\u5F84\u4E2D\u627E\u4E0D\u5230\u6A21\u5757
+compiler.err.module.not.found.on.module.source.path=在模块源路径中找不到模块
 
-compiler.err.not.in.module.on.module.source.path=\u4E0D\u5728\u6A21\u5757\u6E90\u8DEF\u5F84\u4E0A\u7684\u6A21\u5757\u4E2D
+compiler.err.not.in.module.on.module.source.path=不在模块源路径上的模块中
 
 # 0: symbol
-compiler.err.duplicate.module=\u91CD\u590D\u7684\u6A21\u5757: {0}
+compiler.err.duplicate.module=重复的模块: {0}
 
 # 0: symbol
-compiler.err.duplicate.requires=\u91CD\u590D\u7684 requires \u6307\u4EE4: {0}
+compiler.err.duplicate.requires=重复的 requires 指令: {0}
 
 # 0: symbol
-compiler.err.conflicting.exports=\u91CD\u590D\u6216\u51B2\u7A81\u7684\u5BFC\u51FA\u64CD\u4F5C: {0}
+compiler.err.conflicting.exports=重复或冲突的导出操作: {0}
 
 # 0: symbol
-compiler.err.conflicting.opens=\u91CD\u590D\u6216\u51B2\u7A81\u7684\u6253\u5F00\u64CD\u4F5C: {0}
+compiler.err.conflicting.opens=重复或冲突的打开操作: {0}
 
 # 0: symbol
-compiler.err.conflicting.exports.to.module=\u91CD\u590D\u6216\u51B2\u7A81\u7684\u5BFC\u51FA\u5230\u6A21\u5757\u64CD\u4F5C: {0}
+compiler.err.conflicting.exports.to.module=重复或冲突的导出到模块操作: {0}
 
 # 0: symbol
-compiler.err.conflicting.opens.to.module=\u91CD\u590D\u6216\u51B2\u7A81\u7684\u6253\u5F00\u5230\u6A21\u5757\u64CD\u4F5C: {0}
+compiler.err.conflicting.opens.to.module=重复或冲突的打开到模块操作: {0}
 
-compiler.err.no.opens.unless.strong=\u53EA\u5141\u8BB8\u5728\u5F3A\u6A21\u5757\u4E2D\u4F7F\u7528 ''opens''
+compiler.err.no.opens.unless.strong=只允许在强模块中使用 ''opens''
 
 # 0: symbol
-compiler.err.repeated.provides.for.service=\u670D\u52A1 {0} \u6709\u591A\u4E2A ''provides''
+compiler.err.repeated.provides.for.service=服务 {0} 有多个 ''provides''
 
 # 0: symbol, 1: symbol
-compiler.err.duplicate.provides=\u91CD\u590D\u7684 provides \u6307\u4EE4: \u670D\u52A1 {0}, \u5B9E\u73B0 {1}
+compiler.err.duplicate.provides=重复的 provides 指令: 服务 {0}, 实现 {1}
 
 # 0: symbol
-compiler.err.duplicate.uses=\u91CD\u590D\u7684 uses \u6307\u4EE4: {0}
+compiler.err.duplicate.uses=重复的 uses 指令: {0}
 
 # 0: symbol
-compiler.err.service.implementation.is.abstract=\u670D\u52A1\u5B9E\u73B0\u662F\u62BD\u8C61\u7C7B: {0}
+compiler.err.service.implementation.is.abstract=服务实现是抽象类: {0}
 
-compiler.err.service.implementation.must.be.subtype.of.service.interface=\u670D\u52A1\u5B9E\u73B0\u7C7B\u578B\u5FC5\u987B\u662F\u670D\u52A1\u63A5\u53E3\u7C7B\u578B\u7684\u5B50\u7C7B\u578B, \u6216\u8005\u5177\u6709\u540D\u4E3A "provider" \u7684, \u8FD4\u56DE\u670D\u52A1\u5B9E\u73B0\u7684\u516C\u5171\u9759\u6001\u65E0\u53C2\u6570\u65B9\u6CD5
+compiler.err.service.implementation.must.be.subtype.of.service.interface=服务实现类型必须是服务接口类型的子类型, 或者具有名为 "provider" 的, 返回服务实现的公共静态无参数方法
 
-compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface="provider" \u65B9\u6CD5\u8FD4\u56DE\u7C7B\u578B\u5FC5\u987B\u662F\u670D\u52A1\u63A5\u53E3\u7C7B\u578B\u7684\u5B50\u7C7B\u578B
+compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface="provider" 方法返回类型必须是服务接口类型的子类型
 
 # 0: symbol
-compiler.err.service.implementation.is.inner=\u670D\u52A1\u5B9E\u73B0\u662F\u5185\u90E8\u7C7B: {0}
+compiler.err.service.implementation.is.inner=服务实现是内部类: {0}
 
 # 0: symbol
-compiler.err.service.definition.is.enum=\u670D\u52A1\u5B9A\u4E49\u662F\u679A\u4E3E: {0}
+compiler.err.service.definition.is.enum=服务定义是枚举: {0}
 
 # 0: symbol
-compiler.err.service.implementation.doesnt.have.a.no.args.constructor=\u670D\u52A1\u5B9E\u73B0\u6CA1\u6709\u9ED8\u8BA4\u7684\u6784\u9020\u5668: {0}
+compiler.err.service.implementation.doesnt.have.a.no.args.constructor=服务实现没有默认的构造器: {0}
 
 # 0: symbol
-compiler.err.service.implementation.no.args.constructor.not.public=\u670D\u52A1\u5B9E\u73B0\u7684\u65E0\u53C2\u6570\u6784\u9020\u5668\u4E0D\u662F\u516C\u5171\u6784\u9020\u5668: {0}
+compiler.err.service.implementation.no.args.constructor.not.public=服务实现的无参数构造器不是公共构造器: {0}
 
 # 0: symbol
-compiler.err.package.empty.or.not.found=\u7A0B\u5E8F\u5305\u4E3A\u7A7A\u6216\u4E0D\u5B58\u5728: {0}
+compiler.err.package.empty.or.not.found=程序包为空或不存在: {0}
 
 # 0: symbol
-compiler.warn.package.empty.or.not.found=\u7A0B\u5E8F\u5305\u4E3A\u7A7A\u6216\u4E0D\u5B58\u5728: {0}
+compiler.warn.package.empty.or.not.found=程序包为空或不存在: {0}
 
-compiler.err.no.output.dir=\u672A\u6307\u5B9A\u7C7B\u8F93\u51FA\u76EE\u5F55
+compiler.err.no.output.dir=未指定类输出目录
 
-compiler.err.unnamed.pkg.not.allowed.named.modules=\u547D\u540D\u6A21\u5757\u4E2D\u4E0D\u5141\u8BB8\u672A\u547D\u540D\u7A0B\u5E8F\u5305
+compiler.err.unnamed.pkg.not.allowed.named.modules=命名模块中不允许未命名程序包
 
 # 0: name, 1: name
-compiler.err.module.name.mismatch=\u6A21\u5757\u540D\u79F0 {0} \u4E0E\u9884\u671F\u540D\u79F0 {1} \u4E0D\u5339\u914D
+compiler.err.module.name.mismatch=模块名称 {0} 与预期名称 {1} 不匹配
 
 # 0: name, 1: name
-compiler.misc.module.name.mismatch=\u6A21\u5757\u540D\u79F0 {0} \u4E0E\u9884\u671F\u540D\u79F0 {1} \u4E0D\u5339\u914D
+compiler.misc.module.name.mismatch=模块名称 {0} 与预期名称 {1} 不匹配
 
 # 0: name
-compiler.err.module.non.zero.opens=\u6253\u5F00\u7684\u6A21\u5757 {0} \u5177\u6709\u975E\u96F6 opens_count
+compiler.err.module.non.zero.opens=打开的模块 {0} 具有非零 opens_count
 
 # 0: name
-compiler.misc.module.non.zero.opens=\u6253\u5F00\u7684\u6A21\u5757 {0} \u5177\u6709\u975E\u96F6 opens_count
+compiler.misc.module.non.zero.opens=打开的模块 {0} 具有非零 opens_count
 
-compiler.err.module.decl.sb.in.module-info.java=\u6A21\u5757\u58F0\u660E\u5E94\u8BE5\u5728\u540D\u4E3A module-info.java \u7684\u6587\u4EF6\u4E2D
+compiler.err.module.decl.sb.in.module-info.java=模块声明应该在名为 module-info.java 的文件中
 
 # 0: set of string
-compiler.err.too.many.patched.modules=\u592A\u591A\u6253\u8865\u4E01\u7684\u6A21\u5757 ({0}), \u8BF7\u4F7F\u7528 --module-source-path
+compiler.err.too.many.patched.modules=太多打补丁的模块 ({0}), 请使用 --module-source-path
 
 # 0: name, 1: name
-compiler.err.file.patched.and.msp=\u53EF\u4ECE --patch-module \u548C --module-source-path \u8BBF\u95EE\u6587\u4EF6, \u4F46\u8BE5\u6587\u4EF6\u5728\u6BCF\u4E2A\u8DEF\u5F84\u4E2D\u5C5E\u4E8E\u4E0D\u540C\u7684\u6A21\u5757: {0}, {1}
+compiler.err.file.patched.and.msp=可从 --patch-module 和 --module-source-path 访问文件, 但该文件在每个路径中属于不同的模块: {0}, {1}
 
-compiler.err.processorpath.no.processormodulepath=-processorpath \u4E0E --processor-module-path \u7684\u7EC4\u5408\u975E\u6CD5
+compiler.err.processorpath.no.processormodulepath=-processorpath 与 --processor-module-path 的组合非法
 
 # 0: symbol
-compiler.err.package.in.other.module=\u7A0B\u5E8F\u5305\u5DF2\u5B58\u5728\u4E8E\u53E6\u4E00\u4E2A\u6A21\u5757\u4E2D: {0}
+compiler.err.package.in.other.module=程序包已存在于另一个模块中: {0}
 
 # 0: symbol, 1: name, 2: symbol, 3: symbol
-compiler.err.package.clash.from.requires=\u6A21\u5757 {0} \u540C\u65F6\u4ECE {2} \u548C {3} \u8BFB\u53D6\u7A0B\u5E8F\u5305 {1}
+compiler.err.package.clash.from.requires=模块 {0} 同时从 {2} 和 {3} 读取程序包 {1}
 
 # 0: name, 1: symbol, 2: symbol
-compiler.err.package.clash.from.requires.in.unnamed=\u672A\u547D\u540D\u7684\u6A21\u5757\u540C\u65F6\u4ECE {1} \u548C {2} \u8BFB\u53D6\u7A0B\u5E8F\u5305 {0}
+compiler.err.package.clash.from.requires.in.unnamed=未命名的模块同时从 {1} 和 {2} 读取程序包 {0}
 
 # 0: string
-compiler.err.module.not.found.in.module.source.path=\u5728\u6A21\u5757\u6E90\u8DEF\u5F84\u4E2D\u627E\u4E0D\u5230\u6A21\u5757 {0}
+compiler.err.module.not.found.in.module.source.path=在模块源路径中找不到模块 {0}
 
-compiler.err.output.dir.must.be.specified.with.dash.m.option=\u5982\u679C\u4F7F\u7528 -m \u9009\u9879, \u5219\u5FC5\u987B\u6307\u5B9A\u7C7B\u8F93\u51FA\u76EE\u5F55
+compiler.err.output.dir.must.be.specified.with.dash.m.option=如果使用 -m 选项, 则必须指定类输出目录
 
-compiler.err.modulesourcepath.must.be.specified.with.dash.m.option=\u5982\u679C\u4F7F\u7528 -m \u9009\u9879, \u5219\u5FC5\u987B\u6307\u5B9A\u6A21\u5757\u6E90\u8DEF\u5F84
+compiler.err.modulesourcepath.must.be.specified.with.dash.m.option=如果使用 -m 选项, 则必须指定模块源路径
 
 # 0: symbol
-compiler.err.service.implementation.not.in.right.module=\u5FC5\u987B\u5728\u4E0E provides \u6307\u4EE4\u76F8\u540C\u7684\u6A21\u5757\u4E2D\u5B9A\u4E49\u670D\u52A1\u5B9E\u73B0
+compiler.err.service.implementation.not.in.right.module=必须在与 provides 指令相同的模块中定义服务实现
 
 # 0: symbol
-compiler.err.cyclic.requires=\u6D89\u53CA {0} \u7684\u5FAA\u73AF\u88AB\u4F9D\u8D56\u5BF9\u8C61
+compiler.err.cyclic.requires=涉及 {0} 的循环被依赖对象
 
 # 0: fragment, 1: name
-compiler.err.duplicate.module.on.path={1} \u4E2D\u7684 {0} \u4E0A\u5B58\u5728\n\u91CD\u590D\u7684\u6A21\u5757
+compiler.err.duplicate.module.on.path={1} 中的 {0} 上存在\n重复的模块
 
 # 0: option name, 1: string
-compiler.warn.bad.name.for.option={0} \u9009\u9879\u7684\u503C\u4E2D\u6709\u9519\u8BEF\u7684\u540D\u79F0: ''{1}''
+compiler.warn.bad.name.for.option={0} 选项的值中有错误的名称: ''{1}''
 
 # 0: option name, 1: string
-compiler.err.bad.name.for.option={0} \u9009\u9879\u7684\u503C\u4E2D\u6709\u9519\u8BEF\u7684\u540D\u79F0: ''{1}''
+compiler.err.bad.name.for.option={0} 选项的值中有错误的名称: ''{1}''
 
 # 0: option name, 1: symbol
-compiler.warn.module.for.option.not.found=\u627E\u4E0D\u5230 {0} \u9009\u9879\u4E2D\u7684\u6A21\u5757\u540D\u79F0: {1}
+compiler.warn.module.for.option.not.found=找不到 {0} 选项中的模块名称: {1}
 
-compiler.err.addmods.all.module.path.invalid=--add-modules ALL-MODULE-PATH \u53EA\u80FD\u5728\u7F16\u8BD1\u672A\u547D\u540D\u6A21\u5757\u6216\u5728\u81EA\u52A8\u6A21\u5757\u7684\u4E0A\u4E0B\u6587\u4E2D\u7F16\u8BD1\u65F6\u4F7F\u7528
+compiler.err.addmods.all.module.path.invalid=--add-modules ALL-MODULE-PATH 只能在编译未命名模块或在自动模块的上下文中编译时使用
 
 # 0: symbol
-compiler.err.add.exports.with.release=\u4E0D\u5141\u8BB8\u5728\u4F7F\u7528 --release \u65F6\u4ECE\u7CFB\u7EDF\u6A21\u5757 {0} \u5BFC\u51FA\u7A0B\u5E8F\u5305:
+compiler.err.add.exports.with.release=不允许在使用 --release 时从系统模块 {0} 导出程序包:
 
 # 0: symbol
-compiler.err.add.reads.with.release=\u4E0D\u5141\u8BB8\u5728\u4F7F\u7528 --release \u65F6\u4E3A\u7CFB\u7EDF\u6A21\u5757 {0} \u6DFB\u52A0\u8BFB\u53D6\u7EF4\u8FB9:
+compiler.err.add.reads.with.release=不允许在使用 --release 时为系统模块 {0} 添加读取维边:
 
-compiler.warn.addopens.ignored=--add-opens \u5728\u7F16\u8BD1\u65F6\u6CA1\u6709\u4EFB\u4F55\u6548\u679C
+compiler.warn.addopens.ignored=--add-opens 在编译时没有任何效果
 
-compiler.misc.locn.module_source_path=\u6A21\u5757\u6E90\u8DEF\u5F84
+compiler.misc.locn.module_source_path=模块源路径
 
-compiler.misc.locn.upgrade_module_path=\u5347\u7EA7\u6A21\u5757\u8DEF\u5F84
+compiler.misc.locn.upgrade_module_path=升级模块路径
 
-compiler.misc.locn.system_modules=\u7CFB\u7EDF\u6A21\u5757
+compiler.misc.locn.system_modules=系统模块
 
-compiler.misc.locn.module_path=\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u8DEF\u5F84
+compiler.misc.locn.module_path=应用程序模块路径
 
-compiler.misc.cant.resolve.modules=\u65E0\u6CD5\u89E3\u6790\u6A21\u5757
+compiler.misc.cant.resolve.modules=无法解析模块
 
-compiler.misc.bad.requires.flag=\u9519\u8BEF\u7684\u8BF7\u6C42\u6807\u8BB0\uFF1A{0}
+compiler.misc.bad.requires.flag=错误的请求标记：{0}
 
 # 0: string
-compiler.err.invalid.module.specifier=\u4E0D\u5141\u8BB8\u6A21\u5757\u8BF4\u660E\u7B26: {0}
+compiler.err.invalid.module.specifier=不允许模块说明符: {0}
 
 # 0: symbol
-compiler.warn.service.provided.but.not.exported.or.used=\u5DF2\u63D0\u4F9B\u670D\u52A1\u63A5\u53E3, \u4F46\u672A\u5BFC\u51FA\u6216\u4F7F\u7528\u670D\u52A1\u63A5\u53E3
+compiler.warn.service.provided.but.not.exported.or.used=已提供服务接口, 但未导出或使用服务接口
 
 # 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible=\u6A21\u5757 {2} \u4E2D\u7684 {0} {1} \u5BF9\u9700\u8981\u8BE5\u6A21\u5757\u7684\u5BA2\u6237\u673A\u4E0D\u53EF\u8BBF\u95EE
+compiler.warn.leaks.not.accessible=模块 {2} 中的 {0} {1} 对需要该模块的客户机不可访问
 # 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible.unexported=\u672A\u5BFC\u51FA\u6A21\u5757 {2} \u4E2D\u7684 {0} {1}
+compiler.warn.leaks.not.accessible.unexported=未导出模块 {2} 中的 {0} {1}
 # 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible.not.required.transitive=\u672A\u4F7F\u7528 ''requires transitive'' \u95F4\u63A5\u5BFC\u51FA\u6A21\u5757 {2} \u4E2D\u7684 {0} {1}
+compiler.warn.leaks.not.accessible.not.required.transitive=未使用 ''requires transitive'' 间接导出模块 {2} 中的 {0} {1}
 # 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible.unexported.qualified=\u6A21\u5757 {2} \u4E2D\u7684 {0} {1} \u53EF\u80FD\u5BF9\u9700\u8981\u8BE5\u6A21\u5757\u7684\u6240\u6709\u5BA2\u6237\u673A\u90FD\u4E0D\u53EF\u89C1
+compiler.warn.leaks.not.accessible.unexported.qualified=模块 {2} 中的 {0} {1} 可能对需要该模块的所有客户机都不可见
 
 ###
 # errors related to options
 
 # 0: string, 1: string
-compiler.err.illegal.argument.for.option={0} \u7684\u53C2\u6570\u975E\u6CD5: {1}
+compiler.err.illegal.argument.for.option={0} 的参数非法: {1}
 
-compiler.err.match.binding.exists=\u5C1D\u8BD5\u91CD\u65B0\u5B9A\u4E49\u73B0\u6709\u7684\u5339\u914D\u7ED1\u5B9A\uFF0C\u8FD9\u662F\u975E\u6CD5\u7684
+compiler.err.match.binding.exists=尝试重新定义现有的匹配绑定，这是非法的
 
-compiler.err.switch.case.unexpected.statement=case \u4E2D\u5B58\u5728\u610F\u5916\u8BED\u53E5\uFF0C\u5E94\u4E3A\u8868\u8FBE\u5F0F\u3001\u5757\u6216\u629B\u51FA\u8BED\u53E5
+compiler.err.switch.case.unexpected.statement=case 中存在意外语句，应为表达式、块或抛出语句
 
-compiler.err.switch.mixing.case.types=\u5728 switch \u4E2D\u4F7F\u7528\u4E86\u4E0D\u540C case \u7C7B\u578B
+compiler.err.switch.mixing.case.types=在 switch 中使用了不同 case 类型
 
 ###
 # errors related to sealed classes
 
 # permits clause
 # 0: fragment
-compiler.err.invalid.permits.clause=\u65E0\u6548\u7684 permits \u5B50\u53E5\n({0})
+compiler.err.invalid.permits.clause=无效的 permits 子句\n({0})
 
 # 0: string
-compiler.misc.class.is.not.sealed=\u5FC5\u987B\u5BC6\u5C01 {0}
+compiler.misc.class.is.not.sealed=必须密封 {0}
 
 # 0: type
-compiler.misc.is.a.type.variable=\u4E0D\u5F97\u5305\u542B\u7C7B\u578B\u53D8\u91CF\uFF1A{0}
+compiler.misc.is.a.type.variable=不得包含类型变量：{0}
 
 # 0: type
-compiler.misc.is.duplicated=\u4E0D\u5F97\u5305\u542B\u91CD\u590D\u9879\uFF1A{0}
+compiler.misc.is.duplicated=不得包含重复项：{0}
 
 # 0: type
-compiler.misc.doesnt.extend.sealed=\u5B50\u7C7B {0} \u5FC5\u987B\u6269\u5C55\u5BC6\u5C01\u7C7B
+compiler.misc.doesnt.extend.sealed=子类 {0} 必须扩展密封类
 
-compiler.misc.must.not.be.same.class=permits \u5B50\u53E5\u4E2D\u5B58\u5728\u975E\u6CD5\u81EA\u5F15\u7528
+compiler.misc.must.not.be.same.class=permits 子句中存在非法自引用
 
 # 0: type
-compiler.misc.must.not.be.supertype=\u5BF9\u8D85\u7C7B\u578B {0} \u7684\u5F15\u7528\u975E\u6CD5
+compiler.misc.must.not.be.supertype=对超类型 {0} 的引用非法
 
 # other sealed types related errors
 
-compiler.err.sealed.class.must.have.subclasses=\u5BC6\u5C01\u7C7B\u5FC5\u987B\u5177\u6709\u5B50\u7C7B
+compiler.err.sealed.class.must.have.subclasses=密封类必须具有子类
 
 # errors in subclasses of sealed classes
 # 0: symbol
-compiler.err.cant.inherit.from.sealed=\u7C7B\u4E0D\u5F97\u6269\u5C55\u5BC6\u5C01\u7C7B\uFF1A{0}\uFF08\u56E0\u4E3A\u5B83\u672A\u5217\u5728\u5176 ''permits'' \u5B50\u53E5\u4E2D\uFF09
+compiler.err.cant.inherit.from.sealed=类不得扩展密封类：{0}（因为它未列在其 ''permits'' 子句中）
 
 # 0: symbol
-compiler.err.class.in.unnamed.module.cant.extend.sealed.in.diff.package=\u672A\u547D\u540D\u6A21\u5757\u4E2D\u7684\u7C7B {0} \u65E0\u6CD5\u6269\u5C55\u5176\u4ED6\u7A0B\u5E8F\u5305\u4E2D\u7684\u5BC6\u5C01\u7C7B
+compiler.err.class.in.unnamed.module.cant.extend.sealed.in.diff.package=未命名模块中的类 {0} 无法扩展其他程序包中的密封类
 
 # 0: symbol, 1: symbol
-compiler.err.class.in.module.cant.extend.sealed.in.diff.module=\u6A21\u5757 {1} \u4E2D\u7684\u7C7B {0} \u65E0\u6CD5\u6269\u5C55\u5176\u4ED6\u6A21\u5757\u4E2D\u7684\u5BC6\u5C01\u7C7B
+compiler.err.class.in.module.cant.extend.sealed.in.diff.module=模块 {1} 中的类 {0} 无法扩展其他模块中的密封类
 
 # 0: symbol
-compiler.err.non.sealed.with.no.sealed.supertype=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u975E\u5BC6\u5C01\u4FEE\u9970\u7B26\n\uFF08\u7C7B {0} \u4E0D\u5177\u6709\u4EFB\u4F55\u5BC6\u5C01\u7684\u8D85\u7C7B\u578B\uFF09
+compiler.err.non.sealed.with.no.sealed.supertype=此处不允许使用非密封修饰符\n（类 {0} 不具有任何密封的超类型）
 
-compiler.err.non.sealed.sealed.or.final.expected=\u9700\u8981\u5BC6\u5C01\u3001\u975E\u5BC6\u5C01\u6216\u6700\u7EC8\u4FEE\u9970\u7B26
+compiler.err.non.sealed.sealed.or.final.expected=需要密封、非密封或最终修饰符
 
-compiler.err.non.sealed.or.sealed.expected=\u9700\u8981\u5BC6\u5C01\u6216\u975E\u5BC6\u5C01\u4FEE\u9970\u7B26
+compiler.err.non.sealed.or.sealed.expected=需要密封或非密封修饰符
 
-compiler.err.sealed.or.non.sealed.local.classes.not.allowed=\u4E0D\u5141\u8BB8\u4F7F\u7528\u5BC6\u5C01\u6216\u975E\u5BC6\u5C01\u672C\u5730\u7C7B
+compiler.err.sealed.or.non.sealed.local.classes.not.allowed=不允许使用密封或非密封本地类
 
 # 0: fragment
-compiler.err.local.classes.cant.extend.sealed={0} \u7C7B\u4E0D\u5F97\u6269\u5C55\u5BC6\u5C01\u7C7B
-compiler.misc.anonymous=\u533F\u540D
+compiler.err.local.classes.cant.extend.sealed={0} 类不得扩展密封类
+compiler.misc.anonymous=匿名
 
-compiler.misc.local=\u672C\u5730
+compiler.misc.local=本地
 
 ###
 # errors related to records
 
 # record components
-compiler.err.record.cant.declare.field.modifiers=\u8BB0\u5F55\u7EC4\u4EF6\u4E0D\u80FD\u5177\u6709\u9650\u5B9A\u7B26
+compiler.err.record.cant.declare.field.modifiers=记录组件不能具有限定符
 
 # 0: symbol
-compiler.err.illegal.record.component.name=\u8BB0\u5F55\u7EC4\u4EF6\u540D\u79F0 {0} \u975E\u6CD5
+compiler.err.illegal.record.component.name=记录组件名称 {0} 非法
 
-compiler.err.record.component.and.old.array.syntax=\u8BB0\u5F55\u7EC4\u4EF6\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4F20\u7EDF\u6570\u7EC4\u8BB0\u53F7
+compiler.err.record.component.and.old.array.syntax=记录组件中不允许使用传统数组记号
 
 # accessor methods
 # 0: symbol, 1: fragment
-compiler.err.invalid.accessor.method.in.record=\u8BB0\u5F55 {0} \u4E2D\u7684\u5B58\u53D6\u65B9\u6CD5\u65E0\u6548\n({1})
+compiler.err.invalid.accessor.method.in.record=记录 {0} 中的存取方法无效\n({1})
 
-compiler.misc.method.must.be.public=\u5B58\u53D6\u65B9\u6CD5\u5FC5\u987B\u662F\u516C\u5171\u7684
+compiler.misc.method.must.be.public=存取方法必须是公共的
 
 # 0: symbol, 1: symbol
-compiler.misc.accessor.return.type.doesnt.match=\u5B58\u53D6\u65B9\u6CD5 {0} \u7684\u8FD4\u56DE\u7C7B\u578B\u5FC5\u987B\u4E0E\u8BB0\u5F55\u7EC4\u4EF6 {1} \u7684\u7C7B\u578B\u76F8\u5339\u914D
+compiler.misc.accessor.return.type.doesnt.match=存取方法 {0} 的返回类型必须与记录组件 {1} 的类型相匹配
 
-compiler.misc.accessor.method.cant.throw.exception=\u5BF9\u4E8E\u5B58\u53D6\u65B9\u6CD5\u4E0D\u5141\u8BB8\u4F7F\u7528 throws \u5B50\u53E5
+compiler.misc.accessor.method.cant.throw.exception=对于存取方法不允许使用 throws 子句
 
-compiler.misc.accessor.method.must.not.be.generic=\u5B58\u53D6\u65B9\u6CD5\u4E0D\u80FD\u4E3A\u6CDB\u578B\u65B9\u6CD5
+compiler.misc.accessor.method.must.not.be.generic=存取方法不能为泛型方法
 
-compiler.misc.accessor.method.must.not.be.static=\u5B58\u53D6\u65B9\u6CD5\u4E0D\u80FD\u4E3A\u9759\u6001\u65B9\u6CD5
+compiler.misc.accessor.method.must.not.be.static=存取方法不能为静态方法
 
 # canonical constructors
 # 0: fragment, 1: name, 2: fragment
-compiler.err.invalid.canonical.constructor.in.record=\u8BB0\u5F55 {1} \u4E2D\u7684 {0} \u6784\u9020\u5668\u65E0\u6548\n({2})
+compiler.err.invalid.canonical.constructor.in.record=记录 {1} 中的 {0} 构造器无效\n({2})
 
-compiler.misc.canonical=\u89C4\u8303
+compiler.misc.canonical=规范
 
-compiler.misc.compact=\u7CBE\u7B80
+compiler.misc.compact=精简
 
 # 0: fragment
-compiler.misc.throws.clause.not.allowed.for.canonical.constructor=\u5BF9\u4E8E {0} \u6784\u9020\u5668\uFF0C\u4E0D\u5141\u8BB8\u4F7F\u7528 throws \u5B50\u53E5
+compiler.misc.throws.clause.not.allowed.for.canonical.constructor=对于 {0} 构造器，不允许使用 throws 子句
 
-compiler.misc.canonical.with.name.mismatch=\u89C4\u8303\u6784\u9020\u5668\u4E2D\u7684\u53C2\u6570\u540D\u79F0\u65E0\u6548
+compiler.misc.canonical.with.name.mismatch=规范构造器中的参数名称无效
 
-compiler.misc.canonical.cant.have.return.statement=\u7CBE\u7B80\u6784\u9020\u5668\u4E0D\u5F97\u5305\u542B\u8FD4\u56DE\u8BED\u53E5
+compiler.misc.canonical.cant.have.return.statement=精简构造器不得包含返回语句
 
-compiler.misc.canonical.must.not.declare.type.variables=\u89C4\u8303\u6784\u9020\u5668\u4E0D\u5F97\u58F0\u660E\u7C7B\u578B\u53D8\u91CF
+compiler.misc.canonical.must.not.declare.type.variables=规范构造器不得声明类型变量
 
-compiler.misc.type.must.be.identical.to.corresponding.record.component.type=\u7C7B\u578B\u548C\u5143\u6570\u5FC5\u987B\u4E0E\u76F8\u5E94\u8BB0\u5F55\u7EC4\u4EF6\u7684\u7C7B\u578B\u548C\u5143\u6570\u76F8\u5339\u914D
-compiler.misc.canonical.must.not.contain.explicit.constructor.invocation=\u89C4\u8303\u6784\u9020\u5668\u4E0D\u5F97\u5305\u542B\u663E\u5F0F\u6784\u9020\u5668\u8C03\u7528
+compiler.misc.type.must.be.identical.to.corresponding.record.component.type=类型和元数必须与相应记录组件的类型和元数相匹配
+compiler.misc.canonical.must.not.contain.explicit.constructor.invocation=规范构造器不得包含显式构造器调用
 
 # 0: set of flag or string
-compiler.misc.canonical.must.not.have.stronger.access=\u6B63\u5728\u5C1D\u8BD5\u5206\u914D\u66F4\u5F3A\u7684\u8BBF\u95EE\u6743\u9650\uFF1B\u4EE5\u524D\u4E3A {0}
+compiler.misc.canonical.must.not.have.stronger.access=正在尝试分配更强的访问权限；以前为 {0}
 
 # other
-compiler.err.record.cannot.declare.instance.fields=\u5B57\u6BB5\u58F0\u660E\u5FC5\u987B\u4E3A\u9759\u6001\n\uFF08\u8003\u8651\u5C06\u5B57\u6BB5\u66FF\u6362\u4E3A\u8BB0\u5F55\u7EC4\u4EF6\uFF09
+compiler.err.record.cannot.declare.instance.fields=字段声明必须为静态\n（考虑将字段替换为记录组件）
 
 # 0: symbol
-compiler.err.invalid.supertype.record=\u7C7B\u65E0\u6CD5\u76F4\u63A5\u6269\u5C55 {0}
+compiler.err.invalid.supertype.record=类无法直接扩展 {0}
 
 # 0: symbol
-compiler.err.first.statement.must.be.call.to.another.constructor=\u6784\u9020\u5668\u4E0D\u662F\u89C4\u8303\u7684\uFF0C\u56E0\u6B64\u5B83\u7684\u7B2C\u4E00\u4E2A\u8BED\u53E5\u5FC5\u987B\u8C03\u7528\u7C7B {0} \u7684\u53E6\u4E00\u4E2A\u6784\u9020\u5668
+compiler.err.first.statement.must.be.call.to.another.constructor=构造器不是规范的，因此它的第一个语句必须调用类 {0} 的另一个构造器
 
-compiler.err.instance.initializer.not.allowed.in.records=\u8BB0\u5F55\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u5B9E\u4F8B\u521D\u59CB\u5316\u7A0B\u5E8F
+compiler.err.instance.initializer.not.allowed.in.records=记录中不允许使用实例初始化程序
 
-compiler.err.static.declaration.not.allowed.in.inner.classes=\u5185\u90E8\u7C7B\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u9759\u6001\u58F0\u660E
+compiler.err.static.declaration.not.allowed.in.inner.classes=内部类中不允许使用静态声明
 
-compiler.err.record.patterns.annotations.not.allowed=\u8BB0\u5F55\u6A21\u5F0F\u4E0D\u5141\u8BB8\u4F7F\u7528\u6279\u6CE8
+compiler.err.record.patterns.annotations.not.allowed=记录模式不允许使用批注
 
 ############################################
 # messages previously at javac.properties
 
-compiler.err.empty.A.argument=-A \u9700\u8981\u4E00\u4E2A\u53C2\u6570; \u4F7F\u7528 ''-Akey'' \u6216 ''-Akey=value''
+compiler.err.empty.A.argument=-A 需要一个参数; 使用 ''-Akey'' 或 ''-Akey=value''
 
 # 0: string
-compiler.err.invalid.A.key=\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F\u9009\u9879 ''{0}'' \u4E2D\u7684\u5173\u952E\u5B57\u4E0D\u662F\u4EE5\u70B9\u5206\u9694\u7684\u6807\u8BC6\u7B26\u5E8F\u5217
+compiler.err.invalid.A.key=批注处理程序选项 ''{0}'' 中的关键字不是以点分隔的标识符序列
 
 # 0: string
-compiler.err.invalid.flag=\u65E0\u6548\u7684\u6807\u8BB0: {0}
+compiler.err.invalid.flag=无效的标记: {0}
 
-compiler.err.profile.bootclasspath.conflict=\u914D\u7F6E\u6587\u4EF6\u548C\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u9009\u9879\u4E0D\u80FD\u540C\u65F6\u4F7F\u7528
+compiler.err.profile.bootclasspath.conflict=配置文件和引导类路径选项不能同时使用
 
 # 0: string
-compiler.err.invalid.profile=\u65E0\u6548\u7684\u914D\u7F6E\u6587\u4EF6\uFF1A{0}
+compiler.err.invalid.profile=无效的配置文件：{0}
 
 # 0: string
-compiler.err.invalid.target=\u65E0\u6548\u7684\u76EE\u6807\u53D1\u884C\u7248\uFF1A{0}
+compiler.err.invalid.target=无效的目标发行版：{0}
 
 # 0: option name, 1: target
-compiler.err.option.not.allowed.with.target=\u76EE\u6807 {1} \u4E0D\u5141\u8BB8\u9009\u9879 {0}
+compiler.err.option.not.allowed.with.target=目标 {1} 不允许选项 {0}
 
 # 0: string
-compiler.err.option.too.many=\u9009\u9879 {0} \u53EA\u80FD\u6307\u5B9A\u4E00\u6B21
+compiler.err.option.too.many=选项 {0} 只能指定一次
 
-compiler.err.no.source.files=\u65E0\u6E90\u6587\u4EF6
+compiler.err.no.source.files=无源文件
 
-compiler.err.no.source.files.classes=\u65E0\u6E90\u6587\u4EF6\u6216\u7C7B\u540D
+compiler.err.no.source.files.classes=无源文件或类名
 
 # 0: string
-compiler.err.req.arg={0} \u9700\u8981\u53C2\u6570
+compiler.err.req.arg={0} 需要参数
 
 # 0: string
-compiler.err.invalid.source=\u65E0\u6548\u7684\u6E90\u53D1\u884C\u7248\uFF1A{0}
+compiler.err.invalid.source=无效的源发行版：{0}
 
 # 0: string, 1: string
-compiler.err.error.writing.file=\u5199\u5165 {0} \u65F6\u51FA\u9519\uFF1B{1}
+compiler.err.error.writing.file=写入 {0} 时出错；{1}
 
-compiler.err.sourcepath.modulesourcepath.conflict=\u65E0\u6CD5\u540C\u65F6\u6307\u5B9A --source-path \u4E0E --module-source-path
+compiler.err.sourcepath.modulesourcepath.conflict=无法同时指定 --source-path 与 --module-source-path
 
 # 0: string, 1: target
-compiler.warn.source.target.conflict=\u6E90\u53D1\u884C\u7248 {0} \u9700\u8981\u76EE\u6807\u53D1\u884C\u7248 {1}
+compiler.warn.source.target.conflict=源发行版 {0} 需要目标发行版 {1}
 
 # 0: string, 1: target
-compiler.warn.target.default.source.conflict=\u76EE\u6807\u53D1\u884C\u7248 {0} \u4E0E\u9ED8\u8BA4\u7684\u6E90\u53D1\u884C\u7248 {1} \u51B2\u7A81
+compiler.warn.target.default.source.conflict=目标发行版 {0} 与默认的源发行版 {1} 冲突
 
 # 0: profile, 1: target
-compiler.warn.profile.target.conflict=\u914D\u7F6E\u6587\u4EF6{0}\u5BF9\u4E8E\u76EE\u6807\u53D1\u884C\u7248 {1} \u65E0\u6548
+compiler.warn.profile.target.conflict=配置文件{0}对于目标发行版 {1} 无效
 
 # 0: string
-compiler.err.file.not.directory=\u4E0D\u662F\u76EE\u5F55\uFF1A{0}
+compiler.err.file.not.directory=不是目录：{0}
 
 # 0: object
-compiler.err.file.not.file=\u4E0D\u662F\u6587\u4EF6\uFF1A{0}
+compiler.err.file.not.file=不是文件：{0}
 
-compiler.err.two.class.loaders.1=javac \u5728\u591A\u4E2A\u7C7B\u52A0\u8F7D\u5668\u4E4B\u95F4\u62C6\u5206: \u8BF7\u68C0\u67E5\u914D\u7F6E
+compiler.err.two.class.loaders.1=javac 在多个类加载器之间拆分: 请检查配置
 
 # 0: url, 1: url
-compiler.err.two.class.loaders.2=javac \u5728\u591A\u4E2A\u7C7B\u52A0\u8F7D\u5668\u4E4B\u95F4\u62C6\u5206:\n\u4E00\u4E2A\u7C7B\u6765\u81EA\u6587\u4EF6: {0}\n\u800C javac \u6765\u81EA {1}
+compiler.err.two.class.loaders.2=javac 在多个类加载器之间拆分:\n一个类来自文件: {0}\n而 javac 来自 {1}
 
 # 0: string, 1: string
-compiler.err.bad.value.for.option={0} \u9009\u9879\u7684\u503C\u9519\u8BEF: ''{1}''
+compiler.err.bad.value.for.option={0} 选项的值错误: ''{1}''
 
 # 0: string
-compiler.err.no.value.for.option={0} \u9009\u9879\u6CA1\u6709\u503C
+compiler.err.no.value.for.option={0} 选项没有值
 
 # 0: string
-compiler.err.repeated.value.for.patch.module=\u4E3A\u6A21\u5757 {0} \u591A\u6B21\u6307\u5B9A\u4E86 --patch-module
+compiler.err.repeated.value.for.patch.module=为模块 {0} 多次指定了 --patch-module
 
 # 0: string
-compiler.err.repeated.value.for.module.source.path=\u4E3A\u6A21\u5757 {0} \u591A\u6B21\u6307\u5B9A\u4E86 --module-source-path
+compiler.err.repeated.value.for.module.source.path=为模块 {0} 多次指定了 --module-source-path
 
-compiler.err.multiple.values.for.module.source.path=\u4F7F\u7528\u6A21\u5F0F\u53C2\u6570\u591A\u6B21\u6307\u5B9A\u4E86 --module-source-path
+compiler.err.multiple.values.for.module.source.path=使用模式参数多次指定了 --module-source-path
 
 # 0: string
-compiler.err.unmatched.quote=\u73AF\u5883\u53D8\u91CF {0} \u4E2D\u7684\u5F15\u53F7\u4E0D\u6210\u5BF9
+compiler.err.unmatched.quote=环境变量 {0} 中的引号不成对
 
 # 0: option name
-compiler.err.release.bootclasspath.conflict=\u9009\u9879 {0} \u4E0D\u80FD\u4E0E --release \u4E00\u8D77\u4F7F\u7528
+compiler.err.release.bootclasspath.conflict=选项 {0} 不能与 --release 一起使用
 
 # 0: string
-compiler.err.unsupported.release.version=\u4E0D\u652F\u6301\u53D1\u884C\u7248\u672C {0}
+compiler.err.unsupported.release.version=不支持发行版本 {0}
 
 # 0: string
-compiler.err.file.not.found=\u627E\u4E0D\u5230\u6587\u4EF6: {0}
+compiler.err.file.not.found=找不到文件: {0}
 
 # 0: string, 1: source
-compiler.err.preview.not.latest=\u6E90\u53D1\u884C\u7248 {0} \u4E0E --enable-preview \u4E00\u8D77\u4F7F\u7528\u65F6\u65E0\u6548\n\uFF08\u4EC5\u53D1\u884C\u7248 {1} \u652F\u6301\u9884\u89C8\u8BED\u8A00\u529F\u80FD\uFF09
+compiler.err.preview.not.latest=源发行版 {0} 与 --enable-preview 一起使用时无效\n（仅发行版 {1} 支持预览语言功能）
 
-compiler.err.preview.without.source.or.release=--enable-preview \u5FC5\u987B\u4E0E -source \u6216 --release \u4E00\u8D77\u4F7F\u7528
+compiler.err.preview.without.source.or.release=--enable-preview 必须与 -source 或 --release 一起使用
 
 # 0: symbol
-compiler.err.deconstruction.pattern.only.records=\u89E3\u6784\u6A21\u5F0F\u53EA\u80FD\u5E94\u7528\u4E8E\u8BB0\u5F55\uFF0C{0} \u4E0D\u662F\u8BB0\u5F55
+compiler.err.deconstruction.pattern.only.records=解构模式只能应用于记录，{0} 不是记录
 
-compiler.err.deconstruction.pattern.var.not.allowed=\u89E3\u6784\u6A21\u5F0F\u53EA\u80FD\u5E94\u7528\u4E8E\u8BB0\u5F55\uFF0C\u4E0D\u5141\u8BB8\u4F7F\u7528 var
+compiler.err.deconstruction.pattern.var.not.allowed=解构模式只能应用于记录，不允许使用 var
 
 # 0: list of type, 1: list of type
-compiler.err.incorrect.number.of.nested.patterns=\u5D4C\u5957\u6A21\u5F0F\u6570\u4E0D\u6B63\u786E\n\u9700\u8981\uFF1A{0}\n\u5DF2\u627E\u5230\uFF1A{1}
+compiler.err.incorrect.number.of.nested.patterns=嵌套模式数不正确\n需要：{0}\n已找到：{1}
 
 # 0: kind name, 1: symbol
-compiler.warn.declared.using.preview={0} {1} \u662F\u4F7F\u7528\u9884\u89C8\u529F\u80FD\u58F0\u660E\u7684\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
+compiler.warn.declared.using.preview={0} {1} 是使用预览功能声明的，可能会在未来发行版中删除。
 
-compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\u5C1D\u8BD5\u5728\u57FA\u4E8E\u503C\u7684\u7C7B\u7684\u5B9E\u4F8B\u4E0A\u540C\u6B65
+compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=尝试在基于值的类的实例上同步
 
 # 0: type
-compiler.err.enclosing.class.type.non.denotable=\u5C01\u95ED\u7C7B\u7C7B\u578B\uFF1A{0}\n\u662F\u4E0D\u53EF\u6307\u793A\u7684\u7C7B\u578B\uFF0C\u5C1D\u8BD5\u8F6C\u6362\u4E3A\u53EF\u6307\u793A\u7684\u7C7B\u578B
+compiler.err.enclosing.class.type.non.denotable=封闭类类型：{0}\n是不可指示的类型，尝试转换为可指示的类型
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
index 8067e764fb7..28713811eee 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
@@ -33,35 +33,35 @@ javac.opt.g=Generiert alle Debugginginformationen
 javac.opt.g.none=Generiert keine Debugginginformationen
 javac.opt.g.lines.vars.source=Generiert nur einige Debugginginformationen
 javac.opt.nowarn=Generiert keine Warnungen
-javac.opt.verbose=Gibt Nachrichten zu den Compilervorg\u00E4ngen aus
+javac.opt.verbose=Gibt Nachrichten zu den Compilervorgängen aus
 javac.opt.deprecation=Gibt Quellspeicherorte aus, wo veraltete APIs verwendet werden
 javac.opt.classpath=Gibt an, wo sich die Benutzerklassendateien und Annotationsprozessoren befinden
 javac.opt.modulepath=Gibt an, wo sich die Anwendungsmodule befinden
 javac.opt.sourcepath=Gibt an, wo sich die Eingabequelldateien befinden
-javac.opt.m=Kompiliert nur die angegebenen Module und pr\u00FCft die Zeitstempel
-javac.opt.modulesourcepath=Gib an, wo sich die Eingabequelldateien f\u00FCr mehrere Module befinden
-javac.opt.bootclasspath=Setzt den Speicherort der Bootstrap-Klassendateien au\u00DFer Kraft
-javac.opt.system=Setzt den Speicherort der Systemmodule au\u00DFer Kraft
-javac.opt.upgrademodulepath=Setzt den Speicherort der upgradef\u00E4higen Module au\u00DFer Kraft
-javac.opt.endorseddirs=Setzt den Speicherort der unterst\u00FCtzten Standardpfade au\u00DFer Kraft
-javac.opt.extdirs=Setzt den Speicherort der installierten Erweiterungen au\u00DFer Kraft
+javac.opt.m=Kompiliert nur die angegebenen Module und prüft die Zeitstempel
+javac.opt.modulesourcepath=Gib an, wo sich die Eingabequelldateien für mehrere Module befinden
+javac.opt.bootclasspath=Setzt den Speicherort der Bootstrap-Klassendateien außer Kraft
+javac.opt.system=Setzt den Speicherort der Systemmodule außer Kraft
+javac.opt.upgrademodulepath=Setzt den Speicherort der upgradefähigen Module außer Kraft
+javac.opt.endorseddirs=Setzt den Speicherort der unterstützten Standardpfade außer Kraft
+javac.opt.extdirs=Setzt den Speicherort der installierten Erweiterungen außer Kraft
 javac.opt.processorpath=Gibt an, wo sich die Annotationsprozessoren befinden
 javac.opt.processormodulepath=Gibt einen Modulpfad an, wo sich die Annotationsprozessoren befinden
-javac.opt.processor=Namen der auszuf\u00FChrenden Annotationsprozessoren;\nStandard-Discovery-Prozess wird umgangen
+javac.opt.processor=Namen der auszuführenden Annotationsprozessoren;\nStandard-Discovery-Prozess wird umgangen
 javac.opt.parameters=Generiert Metadaten zur Reflexion auf Methodenparameter
-javac.opt.proc.none.only=Steuert, wo die Verarbeitung von Annotationen und/oder die Kompilierung ausgef\u00FChrt wird
+javac.opt.proc.none.only=Steuert, wo die Verarbeitung von Annotationen und/oder die Kompilierung ausgeführt wird
 javac.opt.d=Gibt an, wo generierte Klassendateien abgelegt werden
 javac.opt.sourceDest=Gibt an, wo generierte Quelldateien abgelegt werden
 javac.opt.headerDest=Gibt an, wo generierte native Headerdateien abgelegt werden
-javac.opt.J=\u00DCbergibt <Flag> direkt an das Laufzeitsystem
+javac.opt.J=Übergibt <Flag> direkt an das Laufzeitsystem
 javac.opt.encoding=Gibt die von den Quelldateien verwendete Zeichencodierung an
-javac.opt.profile=Vergewissern Sie sich, dass die verwendete API im angegebenen Profil verf\u00FCgbar ist.\nDiese Option ist veraltet und wird in einem zuk\u00FCnftigen Release m\u00F6glicherweise entfernt.
-javac.opt.target=Generiert Klassendateien, die sich f\u00FCr das angegebene Java SE-Release eignen.\nUnterst\u00FCtzte Releases: \n    {0}
-javac.opt.release=Kompiliert f\u00FCr das angegebene Java SE-Release.\nUnterst\u00FCtzte Releases: \n    {0}
-javac.opt.source=Liefert Quellkompatibilit\u00E4t mit dem angegebenen Release von Java SE.\nUnterst\u00FCtzte Releases: \n    {0}
+javac.opt.profile=Vergewissern Sie sich, dass die verwendete API im angegebenen Profil verfügbar ist.\nDiese Option ist veraltet und wird in einem zukünftigen Release möglicherweise entfernt.
+javac.opt.target=Generiert Klassendateien, die sich für das angegebene Java SE-Release eignen.\nUnterstützte Releases: \n    {0}
+javac.opt.release=Kompiliert für das angegebene Java SE-Release.\nUnterstützte Releases: \n    {0}
+javac.opt.source=Liefert Quellkompatibilität mit dem angegebenen Release von Java SE.\nUnterstützte Releases: \n    {0}
 javac.opt.Werror=Kompilierung beenden, wenn Warnungen auftreten
-javac.opt.A=Optionen zur \u00DCbergabe an die Annotationsprozessoren
-javac.opt.implicit=Gibt an, ob Klassendateien f\u00FCr implizit referenzierte Dateien generiert werden
+javac.opt.A=Optionen zur Übergabe an die Annotationsprozessoren
+javac.opt.implicit=Gibt an, ob Klassendateien für implizit referenzierte Dateien generiert werden
 javac.opt.pkginfo=Gibt an, wie package-info-Dateien behandelt werden sollen
 javac.opt.multi-release=Gibt an, welches Release in Multi-Release-JAR-Dateien verwendet werden soll
 javac.opt.arg.class=<Klasse>
@@ -78,7 +78,7 @@ javac.opt.arg.encoding=<Codierung>
 javac.opt.arg.profile=<Profil>
 javac.opt.arg.release=<Release>
 javac.opt.arg.number=<Nummer>
-javac.opt.plugin=Der Name und optional die Argumente f\u00FCr die Ausf\u00FChrung eines Plug-ins
+javac.opt.plugin=Der Name und optional die Argumente für die Ausführung eines Plug-ins
 javac.opt.arg.plugin="name args"
 javac.opt.arg.multi-release=<Release>
 javac.opt.arg.default.module.for.created.files=<Modulname>
@@ -88,7 +88,7 @@ javac.opt.arg.default.module.for.created.files=<Modulname>
 javac.opt.maxerrs=Legt die maximale Anzahl der zu auszugebenden Fehler fest
 javac.opt.maxwarns=Legt die maximale Anzahl der auszugebenden Warnungen fest
 javac.opt.nogj=Akzeptiert keine Generics in der Sprache
-javac.opt.moreinfo=Gibt erweiterte Informationen f\u00FCr Typvariablen aus
+javac.opt.moreinfo=Gibt erweiterte Informationen für Typvariablen aus
 javac.opt.printsearch=Gibt Informationen dazu aus, wo Klassendateien gesucht werden
 javac.opt.prompt=Stoppt nach jedem Fehler
 javac.opt.s=Gibt Java-Quellen statt Klassendateien aus
@@ -96,20 +96,20 @@ javac.opt.version=Versionsinformationen
 javac.opt.arg.pathname=<Pfadname>
 javac.opt.arg.file=<Dateiname>
 javac.opt.Xbootclasspath.p=Dem Bootstrap Classpath voranstellen
-javac.opt.Xbootclasspath.a=An Bootstrap Classpath anh\u00E4ngen
+javac.opt.Xbootclasspath.a=An Bootstrap Classpath anhängen
 javac.opt.Xlint=Aktiviert die empfohlenen Warnungen
 javac.opt.Xlint.all=Alle Warnungen aktivieren
 javac.opt.Xlint.none=Alle Warnungen deaktivieren
 #L10N: do not localize: -Xlint
-javac.opt.arg.Xlint=<Schl\u00FCssel>(,<Schl\u00FCssel>)*
-javac.opt.Xlint.custom=Warnungen, die aktiviert oder deaktiviert werden sollen, durch Komma getrennt.\nStellen Sie einem Schl\u00FCssel "-" voran, um die angegebene Warnung zu deaktivieren.\nVerwenden Sie --help-lint, um die unterst\u00FCtzten Schl\u00FCssel zu sehen.
+javac.opt.arg.Xlint=<Schlüssel>(,<Schlüssel>)*
+javac.opt.Xlint.custom=Warnungen, die aktiviert oder deaktiviert werden sollen, durch Komma getrennt.\nStellen Sie einem Schlüssel "-" voran, um die angegebene Warnung zu deaktivieren.\nVerwenden Sie --help-lint, um die unterstützten Schlüssel zu sehen.
 javac.opt.Xlint.desc.auxiliaryclass=Warnt vor Auxiliary-Klassen, die in einer Quelldatei verborgen sind und aus anderen Dateien heraus verwendet werden.
 
-javac.opt.Xlint.desc.cast=Warnt vor unn\u00F6tigen Umwandlungen mit Cast.
+javac.opt.Xlint.desc.cast=Warnt vor unnötigen Umwandlungen mit Cast.
 
 javac.opt.Xlint.desc.classfile=Warnt vor Problemen im Zusammenhang mit Klassendateiinhalten.
 
-javac.opt.Xlint.desc.missing-explicit-ctor=Warnt vor fehlenden expliziten Konstruktoren in \u00F6ffentlichen und gesch\u00FCtzten Klassen in exportierten Packages.
+javac.opt.Xlint.desc.missing-explicit-ctor=Warnt vor fehlenden expliziten Konstruktoren in öffentlichen und geschützten Klassen in exportierten Packages.
 
 javac.opt.Xlint.desc.deprecation=Warnt vor der Verwendung veralteter Elemente.
 
@@ -121,25 +121,25 @@ javac.opt.Xlint.desc.empty=Warnt vor leerer Anweisung nach "if".
 
 javac.opt.Xlint.desc.exports=Warnt vor Problemen in Bezug auf Modulexporte.
 
-javac.opt.Xlint.desc.fallthrough=Warnt vor Weitergabe von einem Case einer Switch-Anweisung zum n\u00E4chsten.
+javac.opt.Xlint.desc.fallthrough=Warnt vor Weitergabe von einem Case einer Switch-Anweisung zum nächsten.
 
 javac.opt.Xlint.desc.finally=Warnt vor Finally-Klauseln, die nicht normal beendet werden.
 
-javac.opt.Xlint.desc.lossy-conversions=Warnung \u00FCber m\u00F6glichen Verlust von Konvertierungen in zusammengesetzten Zuweisungen.
+javac.opt.Xlint.desc.lossy-conversions=Warnung über möglichen Verlust von Konvertierungen in zusammengesetzten Zuweisungen.
 
 javac.opt.Xlint.desc.module=Warnt vor Problemen im Zusammenhang mit dem Modulsystem.
 
-javac.opt.Xlint.desc.opens=Warnt vor Problemen in Bezug auf Modul\u00F6ffnungen.
+javac.opt.Xlint.desc.opens=Warnt vor Problemen in Bezug auf Modulöffnungen.
 
 javac.opt.Xlint.desc.options=Warnt vor Problemen im Zusammenhang mit der Verwendung von Befehlszeilenoptionen.
 
-javac.opt.Xlint.desc.output-file-clash=Warnt, wenn eine Ausgabedatei bei der Kompilierung \u00FCberschrieben wird. Dazu kann es beispielsweise\n                         bei Dateisystemen ohne Beachtung der Gro\u00DF-/Kleinschreibung kommen. Deckt Klassendateien, native Headerdateien und Quelldateien ab.
+javac.opt.Xlint.desc.output-file-clash=Warnt, wenn eine Ausgabedatei bei der Kompilierung überschrieben wird. Dazu kann es beispielsweise\n                         bei Dateisystemen ohne Beachtung der Groß-/Kleinschreibung kommen. Deckt Klassendateien, native Headerdateien und Quelldateien ab.
 
-javac.opt.Xlint.desc.overloads=Warnt vor Problemen in Bezug auf Methoden\u00FCberladung.
+javac.opt.Xlint.desc.overloads=Warnt vor Problemen in Bezug auf Methodenüberladung.
 
-javac.opt.Xlint.desc.overrides=Warnt vor Problemen in Bezug auf Methodenau\u00DFerkraftsetzung.
+javac.opt.Xlint.desc.overrides=Warnt vor Problemen in Bezug auf Methodenaußerkraftsetzung.
 
-javac.opt.Xlint.desc.path=Warnt vor ung\u00FCltigen Pfadelementen in der Befehlszeile.
+javac.opt.Xlint.desc.path=Warnt vor ungültigen Pfadelementen in der Befehlszeile.
 
 javac.opt.Xlint.desc.processing=Warnt vor Problemen in Bezug auf die Annotationsverarbeitung.
 
@@ -151,81 +151,81 @@ javac.opt.Xlint.desc.requires-automatic=Warnt vor der Verwendung automatischer M
 
 javac.opt.Xlint.desc.requires-transitive-automatic=Warnt vor automatischen Modulen in "requires transitive".
 
-javac.opt.Xlint.desc.serial=Warnt vor serialisierbaren Klassen, die kein serialVersionUID-Feld haben. \n                         Warnt auch vor anderen verd\u00E4chtigen Deklarationen in serialisierbaren und externalisierbaren Klassen und Schnittstellen.
+javac.opt.Xlint.desc.serial=Warnt vor serialisierbaren Klassen, die kein serialVersionUID-Feld haben. \n                         Warnt auch vor anderen verdächtigen Deklarationen in serialisierbaren und externalisierbaren Klassen und Schnittstellen.
 
 javac.opt.Xlint.desc.static=Warnt vor Zugriff auf ein statisches Mitglied mit einer Instanz.
 
-javac.opt.Xlint.desc.strictfp=Warnt vor unn\u00F6tiger Verwendung des strictfp-Modifizierers.
+javac.opt.Xlint.desc.strictfp=Warnt vor unnötiger Verwendung des strictfp-Modifizierers.
 
-javac.opt.Xlint.desc.text-blocks=Warnt vor inkonsistenten Leerzeichen in Textblockeinr\u00FCckung.
+javac.opt.Xlint.desc.text-blocks=Warnt vor inkonsistenten Leerzeichen in Textblockeinrückung.
 
-javac.opt.Xlint.desc.this-escape=Warnt, wenn ein Konstruktor eine Methode aufruft, die in einer externen Unterklasse au\u00DFer Kraft gesetzt werden k\u00F6nnte.\n                         Diese Methoden werden ausgef\u00FChrt, bevor die Initialisierung des Unterklassenkonstruktors abgeschlossen wird.
+javac.opt.Xlint.desc.this-escape=Warnt, wenn ein Konstruktor eine Methode aufruft, die in einer externen Unterklasse außer Kraft gesetzt werden könnte.\n                         Diese Methoden werden ausgeführt, bevor die Initialisierung des Unterklassenkonstruktors abgeschlossen wird.
 
-javac.opt.Xlint.desc.try=Warnt vor Problemen im Zusammenhang mit try-Bl\u00F6cken (d.h. try-with-resources).
+javac.opt.Xlint.desc.try=Warnt vor Problemen im Zusammenhang mit try-Blöcken (d.h. try-with-resources).
 
-javac.opt.Xlint.desc.unchecked=Warnt vor deaktivierten Vorg\u00E4ngen.
+javac.opt.Xlint.desc.unchecked=Warnt vor deaktivierten Vorgängen.
 
-javac.opt.Xlint.desc.varargs=Warnt vor m\u00F6glicherweise nicht sicheren vararg-Methoden.
+javac.opt.Xlint.desc.varargs=Warnt vor möglicherweise nicht sicheren vararg-Methoden.
 
 javac.opt.Xlint.desc.preview=Warnt vor Verwendung von Vorschausprachfeatures.
 
 javac.opt.Xlint.desc.synchronization=Warnt vor Synchronisierungsversuchen mit Instanzen wertbasierter Klassen.
 
-javac.opt.Xdoclint=Empfohlene Pr\u00FCfungen f\u00FCr Probleme in javadoc-Kommentaren aktivieren
+javac.opt.Xdoclint=Empfohlene Prüfungen für Probleme in javadoc-Kommentaren aktivieren
 # L10N: do not localize: all none
 javac.opt.Xdoclint.subopts = (all|none|[-]<Gruppe>)[/<Zugriff>]
 
 # L10N: do not localize: accessibility html missing reference syntax
 # L10N: do not localize: public protected package private
-javac.opt.Xdoclint.custom=Aktiviert oder deaktiviert bestimmte Pr\u00FCfungen auf Probleme in javadoc-Kommentaren,\nwobei <Gruppe> f\u00FCr "accessibility", "html", "missing", "reference" oder "syntax"\nund <Zugriff> f\u00FCr "public", "protected", "package" oder "private" steht.
+javac.opt.Xdoclint.custom=Aktiviert oder deaktiviert bestimmte Prüfungen auf Probleme in javadoc-Kommentaren,\nwobei <Gruppe> für "accessibility", "html", "missing", "reference" oder "syntax"\nund <Zugriff> für "public", "protected", "package" oder "private" steht.
 
 javac.opt.Xdoclint.package.args = [-]<Packages>(,[-]<Package>)*
 
-javac.opt.Xdoclint.package.desc=Aktiviert oder deaktiviert Pr\u00FCfungen in bestimmten Packages. Jedes <Package> ist entweder der\nqualifizierte Name eines Packages oder ein Packagenamenspr\u00E4fix, gefolgt von ".*",\ndas sich auf alle Subpackages des angegebenen Packages bezieht. Jedem <Package>\nkann "-" vorangestellt werden, um Pr\u00FCfungen f\u00FCr die angegebenen Packages zu deaktivieren.
+javac.opt.Xdoclint.package.desc=Aktiviert oder deaktiviert Prüfungen in bestimmten Packages. Jedes <Package> ist entweder der\nqualifizierte Name eines Packages oder ein Packagenamenspräfix, gefolgt von ".*",\ndas sich auf alle Subpackages des angegebenen Packages bezieht. Jedem <Package>\nkann "-" vorangestellt werden, um Prüfungen für die angegebenen Packages zu deaktivieren.
 
 javac.opt.Xstdout=Leitet die Standardausgabe um
-javac.opt.X=Gibt Hilfe zu zus\u00E4tzlichen Optionen aus
+javac.opt.X=Gibt Hilfe zu zusätzlichen Optionen aus
 javac.opt.help=Gibt diese Hilfemeldung aus
-javac.opt.help.lint=Gibt die unterst\u00FCtzten Schl\u00FCssel f\u00FCr -Xlint aus
-javac.opt.help.lint.header=Die unterst\u00FCtzten Schl\u00FCssel f\u00FCr -Xlint sind:
+javac.opt.help.lint=Gibt die unterstützten Schlüssel für -Xlint aus
+javac.opt.help.lint.header=Die unterstützten Schlüssel für -Xlint sind:
 javac.opt.print=Gibt eine Textdarstellung der angegebenen Typen aus
-javac.opt.printRounds=Gibt Informationen zu Durchl\u00E4ufen der Annotationsverarbeitung aus
+javac.opt.printRounds=Gibt Informationen zu Durchläufen der Annotationsverarbeitung aus
 javac.opt.printProcessorInfo=Gibt Informationen dazu aus, welche Annotationen ein Prozessor\nverarbeiten soll
 javac.opt.userpathsfirst=Durchsucht classpath und sourcepath vor anstatt nach bootclasspath nach Klassen
-javac.opt.prefer=Gibt an, welche Datei gelesen werden soll, wenn sowohl eine Quell- als auch eine Klassendatei f\u00FCr eine implizit kompilierte Klasse gefunden werden
+javac.opt.prefer=Gibt an, welche Datei gelesen werden soll, wenn sowohl eine Quell- als auch eine Klassendatei für eine implizit kompilierte Klasse gefunden werden
 javac.opt.preview=Aktiviert Vorschausprachfeatures.\nWird in Verbindung mit -source oder --release verwendet.
 javac.opt.AT=Liest Optionen und Dateinamen aus Datei
-javac.opt.diags=W\u00E4hlt einen Diagnosemodus aus
+javac.opt.diags=Wählt einen Diagnosemodus aus
 javac.opt.addExports=Gibt an, dass ein Package als aus seinem definierenden Modul in\nweitere Module oder, wenn <Anderes Modul> ALL-UNNAMED lautet, in alle unbenannten Module\nexportiert betrachtet werden soll.
 javac.opt.arg.addExports=<Modul>/<Package>=<Anderes Modul>(,<Anderes Modul>)*
 javac.opt.addReads=Gibt weitere Module an, die als von einem angegebenen Modul angefordert\nbetrachtet werden sollen. <Anderes Modul> kann ALL-UNNAMED lauten,\num das unbenannte Modul anzufordern.
 javac.opt.arg.addReads=<Modul>=<Anderes Modul>(,<Anderes Modul>)*
-javac.opt.patch=Setzt ein Modul au\u00DFer Kraft oder erweitert es mit Klassen und Ressourcen\nin JAR-Dateien oder Verzeichnissen
+javac.opt.patch=Setzt ein Modul außer Kraft oder erweitert es mit Klassen und Ressourcen\nin JAR-Dateien oder Verzeichnissen
 javac.opt.arg.patch=<Modul>=<Datei>(:<Datei>)*
-javac.opt.addmods=Root-Module, die zus\u00E4tzlich zu den anf\u00E4nglichen Modulen\naufgel\u00F6st werden sollen, oder alle Module im Modulpfad, wenn <Modul> ALL-MODULE-PATH lautet.
+javac.opt.addmods=Root-Module, die zusätzlich zu den anfänglichen Modulen\naufgelöst werden sollen, oder alle Module im Modulpfad, wenn <Modul> ALL-MODULE-PATH lautet.
 javac.opt.arg.addmods=<Modul>(,<Modul>)*
 javac.opt.limitmods=Begrenzt die Gesamtzahl der beobachtbaren Module
 javac.opt.arg.limitmods=<Modul>(,<Modul>)*
 javac.opt.module.version=Gibt die Version der Module an, die kompiliert werden
 javac.opt.arg.module.version=<Version>
 javac.opt.inherit_runtime_environment=Vererbt Modulsystemkonfigurationsoptionen aus der Laufzeitumgebung.
-javac.opt.default.module.for.created.files=Fallback-Zielmodul f\u00FCr Dateien, die von Annotationsprozessoren erstellt werden,\nfalls keines angegeben ist oder abgeleitet werden kann.
+javac.opt.default.module.for.created.files=Fallback-Zielmodul für Dateien, die von Annotationsprozessoren erstellt werden,\nfalls keines angegeben ist oder abgeleitet werden kann.
 
 ## messages
 
-javac.msg.usage.header=Verwendung: {0} <Optionen> <Quelldateien>,\nwobei folgende Optionen m\u00F6glich sind:
+javac.msg.usage.header=Verwendung: {0} <Optionen> <Quelldateien>,\nwobei folgende Optionen möglich sind:
 
-javac.msg.usage=Verwendung: {0} <Optionen> <Quelldateien>\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+javac.msg.usage=Verwendung: {0} <Optionen> <Quelldateien>\nMit --help können Sie eine Liste der möglichen Optionen aufrufen
 
-javac.msg.usage.nonstandard.footer=Diese zus\u00E4tzlichen Optionen k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.
+javac.msg.usage.nonstandard.footer=Diese zusätzlichen Optionen können jederzeit ohne vorherige Ankündigung geändert werden.
 
-javac.msg.bug=Im Compiler ({0}) ist eine Ausnahme aufgetreten. Erstellen Sie auf der Java-Seite zum Melden von Bugs (https://bugreport.java.com) einen Bugbericht, nachdem Sie die Bugdatenbank (https://bugs.java.com) auf Duplikate gepr\u00FCft haben. Geben Sie in Ihrem Bericht Ihr Programm, die folgende Diagnose und die Parameter an, die Sie dem Java-Compiler \u00FCbergeben haben. Vielen Dank.
+javac.msg.bug=Im Compiler ({0}) ist eine Ausnahme aufgetreten. Erstellen Sie auf der Java-Seite zum Melden von Bugs (https://bugreport.java.com) einen Bugbericht, nachdem Sie die Bugdatenbank (https://bugs.java.com) auf Duplikate geprüft haben. Geben Sie in Ihrem Bericht Ihr Programm, die folgende Diagnose und die Parameter an, die Sie dem Java-Compiler übergeben haben. Vielen Dank.
 
 javac.msg.io=\n\nEin Eingabe-/Ausgabefehler ist aufgetreten.\nDetails finden Sie im folgenden Stacktrace.\n
 
-javac.msg.proc.annotation.uncaught.exception=\n\nEin Annotationsprozessor hat eine nicht abgefangene Ausnahme ausgel\u00F6st.\nDetails finden Sie im folgenden Stacktrace.\n
+javac.msg.proc.annotation.uncaught.exception=\n\nEin Annotationsprozessor hat eine nicht abgefangene Ausnahme ausgelöst.\nDetails finden Sie im folgenden Stacktrace.\n
 
-javac.msg.plugin.uncaught.exception=\n\nEin Plug-in hat eine nicht abgefangene Ausnahme ausgel\u00F6st.\nDetails finden Sie im folgenden Stacktrace.\n
+javac.msg.plugin.uncaught.exception=\n\nEin Plug-in hat eine nicht abgefangene Ausnahme ausgelöst.\nDetails finden Sie im folgenden Stacktrace.\n
 
 javac.msg.resource=\n\nDas System hat keine Ressourcen mehr.\nDetails finden Sie im folgenden Stacktrace.\n
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
index d1db28af6d7..43577bb6e1f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
@@ -25,45 +25,45 @@
 
 ## tool
 
-javac.description=Java\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5B9A\u7FA9\u3092\u8AAD\u307F\u53D6\u308A\u3001\u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u304A\u3088\u3073\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u307E\u3059
+javac.description=Javaクラスおよびインタフェースの定義を読み取り、バイトコードおよびクラス・ファイルにコンパイルします
 
 ## standard options
 
-javac.opt.g=\u3059\u3079\u3066\u306E\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u751F\u6210\u3059\u308B
-javac.opt.g.none=\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u751F\u6210\u3057\u306A\u3044
-javac.opt.g.lines.vars.source=\u3044\u304F\u3064\u304B\u306E\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u306E\u307F\u3092\u751F\u6210\u3059\u308B
-javac.opt.nowarn=\u8B66\u544A\u3092\u767A\u751F\u3055\u305B\u306A\u3044
-javac.opt.verbose=\u30B3\u30F3\u30D1\u30A4\u30E9\u306E\u52D5\u4F5C\u306B\u3064\u3044\u3066\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
-javac.opt.deprecation=\u63A8\u5968\u3055\u308C\u306A\u3044API\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u30BD\u30FC\u30B9\u306E\u4F4D\u7F6E\u3092\u51FA\u529B\u3059\u308B
-javac.opt.classpath=\u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
-javac.opt.modulepath=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
-javac.opt.sourcepath=\u5165\u529B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
-javac.opt.m=\u6307\u5B9A\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u307F\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u3001\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3092\u78BA\u8A8D\u3059\u308B
-javac.opt.modulesourcepath=\u8907\u6570\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u5165\u529B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
-javac.opt.bootclasspath=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-javac.opt.system=\u30B7\u30B9\u30C6\u30E0\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-javac.opt.upgrademodulepath=\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F\u62E1\u5F35\u6A5F\u80FD\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-javac.opt.processorpath=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
-javac.opt.processormodulepath=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B
-javac.opt.processor=\u5B9F\u884C\u3059\u308B\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306E\u540D\u524D\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u691C\u51FA\u51E6\u7406\u3092\u30D0\u30A4\u30D1\u30B9
-javac.opt.parameters=\u30E1\u30BD\u30C3\u30C9\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u30EA\u30D5\u30EC\u30AF\u30B7\u30E7\u30F3\u7528\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u3092\u751F\u6210\u3057\u307E\u3059
-javac.opt.proc.none.only=\u6CE8\u91C8\u51E6\u7406\u3084\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\u3002
-javac.opt.d=\u751F\u6210\u3055\u308C\u305F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u683C\u7D0D\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
-javac.opt.sourceDest=\u751F\u6210\u3055\u308C\u305F\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u683C\u7D0D\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
-javac.opt.headerDest=\u751F\u6210\u3055\u308C\u305F\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u683C\u7D0D\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
-javac.opt.J=<flag>\u3092\u5B9F\u884C\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3059
-javac.opt.encoding=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u4F7F\u7528\u3059\u308B\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u6307\u5B9A\u3059\u308B
-javac.opt.profile=\u4F7F\u7528\u3055\u308C\u3066\u3044\u308BAPI\u304C\u3001\u6307\u5B9A\u3057\u305F\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u3067\u4F7F\u7528\u53EF\u80FD\u304B\u3069\u3046\u304B\u3092\u78BA\u8A8D\u3057\u307E\u3059\u3002\n\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-javac.opt.target=\u6307\u5B9A\u3055\u308C\u305FJava SE\u30EA\u30EA\u30FC\u30B9\u306B\u9069\u3057\u305F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3057\u307E\u3059\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30EA\u30EA\u30FC\u30B9: \n    {0}
-javac.opt.release=\u6307\u5B9A\u3055\u308C\u305FJava SE\u30EA\u30EA\u30FC\u30B9\u306B\u5BFE\u3057\u3066\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u307E\u3059\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30EA\u30EA\u30FC\u30B9: \n    {0}
-javac.opt.source=\u6307\u5B9A\u3055\u308C\u305FJava SE\u30EA\u30EA\u30FC\u30B9\u3068\u30BD\u30FC\u30B9\u306E\u4E92\u63DB\u6027\u3092\u4FDD\u6301\u3057\u307E\u3059\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30EA\u30EA\u30FC\u30B9: \n    {0}
-javac.opt.Werror=\u8B66\u544A\u304C\u767A\u751F\u3057\u305F\u5834\u5408\u306B\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7D42\u4E86\u3059\u308B
-javac.opt.A=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306B\u6E21\u3055\u308C\u308B\u30AA\u30D7\u30B7\u30E7\u30F3
-javac.opt.implicit=\u6697\u9ED9\u7684\u306B\u53C2\u7167\u3055\u308C\u308B\u30D5\u30A1\u30A4\u30EB\u306B\u3064\u3044\u3066\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u6307\u5B9A\u3059\u308B
-javac.opt.pkginfo=package-info\u30D5\u30A1\u30A4\u30EB\u306E\u51E6\u7406\u3092\u6307\u5B9A\u3059\u308B
-javac.opt.multi-release=\u30DE\u30EB\u30C1\u30EA\u30EA\u30FC\u30B9jar\u306E\u4F7F\u7528\u3059\u308B\u30EA\u30EA\u30FC\u30B9\u3092\u6307\u5B9A\u3059\u308B
+javac.opt.g=すべてのデバッグ情報を生成する
+javac.opt.g.none=デバッグ情報を生成しない
+javac.opt.g.lines.vars.source=いくつかのデバッグ情報のみを生成する
+javac.opt.nowarn=警告を発生させない
+javac.opt.verbose=コンパイラの動作についてメッセージを出力する
+javac.opt.deprecation=推奨されないAPIが使用されているソースの位置を出力する
+javac.opt.classpath=ユーザー・クラス・ファイルおよび注釈プロセッサを検索する位置を指定する
+javac.opt.modulepath=アプリケーション・モジュールを検索する位置を指定する
+javac.opt.sourcepath=入力ソース・ファイルを検索する位置を指定する
+javac.opt.m=指定したモジュールのみコンパイルし、タイムスタンプを確認する
+javac.opt.modulesourcepath=複数モジュールの入力ソース・ファイルを検索する位置を指定する
+javac.opt.bootclasspath=ブートストラップ・クラス・パスの位置をオーバーライドする
+javac.opt.system=システム・モジュールの位置をオーバーライドする
+javac.opt.upgrademodulepath=アップグレード可能なモジュールの位置をオーバーライドする
+javac.opt.endorseddirs=推奨規格パスの位置をオーバーライドする
+javac.opt.extdirs=インストール済み拡張機能の位置をオーバーライドする
+javac.opt.processorpath=注釈プロセッサを検索する位置を指定する
+javac.opt.processormodulepath=注釈プロセッサを検索するモジュール・パスを指定する
+javac.opt.processor=実行する注釈プロセッサの名前。デフォルトの検出処理をバイパス
+javac.opt.parameters=メソッド・パラメータにリフレクション用のメタデータを生成します
+javac.opt.proc.none.only=注釈処理やコンパイルを実行するかどうかを制御します。
+javac.opt.d=生成されたクラス・ファイルを格納する位置を指定する
+javac.opt.sourceDest=生成されたソース・ファイルを格納する場所を指定する
+javac.opt.headerDest=生成されたネイティブ・ヘッダー・ファイルを格納する場所を指定する
+javac.opt.J=<flag>を実行システムに直接渡す
+javac.opt.encoding=ソース・ファイルが使用する文字エンコーディングを指定する
+javac.opt.profile=使用されているAPIが、指定したプロファイルで使用可能かどうかを確認します。\nこのオプションは非推奨であり、今後のリリースで削除される可能性があります。
+javac.opt.target=指定されたJava SEリリースに適したクラス・ファイルを生成します。サポートされているリリース: \n    {0}
+javac.opt.release=指定されたJava SEリリースに対してコンパイルします。サポートされているリリース: \n    {0}
+javac.opt.source=指定されたJava SEリリースとソースの互換性を保持します。サポートされているリリース: \n    {0}
+javac.opt.Werror=警告が発生した場合にコンパイルを終了する
+javac.opt.A=注釈プロセッサに渡されるオプション
+javac.opt.implicit=暗黙的に参照されるファイルについてクラス・ファイルを生成するかどうかを指定する
+javac.opt.pkginfo=package-infoファイルの処理を指定する
+javac.opt.multi-release=マルチリリースjarの使用するリリースを指定する
 javac.opt.arg.class=<class>
 javac.opt.arg.class.list=<class1>[,<class2>,<class3>...]
 javac.opt.arg.flag=<flag>
@@ -78,160 +78,160 @@ javac.opt.arg.encoding=<encoding>
 javac.opt.arg.profile=<profile>
 javac.opt.arg.release=<release>
 javac.opt.arg.number=<number>
-javac.opt.plugin=\u5B9F\u884C\u3055\u308C\u308B\u30D7\u30E9\u30B0\u30A4\u30F3\u306E\u540D\u524D\u3068\u30AA\u30D7\u30B7\u30E7\u30F3\u5F15\u6570
+javac.opt.plugin=実行されるプラグインの名前とオプション引数
 javac.opt.arg.plugin="name args"
 javac.opt.arg.multi-release=<release>
 javac.opt.arg.default.module.for.created.files=<module-name>
 
 ## extended options
 
-javac.opt.maxerrs=\u51FA\u529B\u3059\u308B\u30A8\u30E9\u30FC\u306E\u6700\u5927\u6570\u3092\u8A2D\u5B9A\u3059\u308B
-javac.opt.maxwarns=\u51FA\u529B\u3059\u308B\u8B66\u544A\u306E\u6700\u5927\u6570\u3092\u8A2D\u5B9A\u3059\u308B
-javac.opt.nogj=\u8A00\u8A9E\u306E\u6C4E\u7528\u6027\u3092\u53D7\u3051\u4ED8\u3051\u306A\u3044
-javac.opt.moreinfo=\u578B\u5909\u6570\u306E\u62E1\u5F35\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B
-javac.opt.printsearch=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u4F4D\u7F6E\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B
-javac.opt.prompt=\u5404\u30A8\u30E9\u30FC\u3067\u505C\u6B62\u3059\u308B
-javac.opt.s=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u304B\u308F\u308A\u306Bjava\u30BD\u30FC\u30B9\u3092\u767A\u884C\u3059\u308B
-javac.opt.version=\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
+javac.opt.maxerrs=出力するエラーの最大数を設定する
+javac.opt.maxwarns=出力する警告の最大数を設定する
+javac.opt.nogj=言語の汎用性を受け付けない
+javac.opt.moreinfo=型変数の拡張情報を出力する
+javac.opt.printsearch=クラス・ファイルの検索位置情報を出力する
+javac.opt.prompt=各エラーで停止する
+javac.opt.s=クラス・ファイルのかわりにjavaソースを発行する
+javac.opt.version=バージョン情報
 javac.opt.arg.pathname=<pathname>
 javac.opt.arg.file=<filename>
-javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u5148\u982D\u306B\u4ED8\u52A0\u3059\u308B
-javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B
-javac.opt.Xlint=\u63A8\u5968\u306E\u8B66\u544A\u3092\u6709\u52B9\u306B\u3059\u308B
-javac.opt.Xlint.all=\u3059\u3079\u3066\u306E\u8B66\u544A\u3092\u6709\u52B9\u306B\u3057\u307E\u3059
-javac.opt.Xlint.none=\u3059\u3079\u3066\u306E\u8B66\u544A\u3092\u7121\u52B9\u306B\u3057\u307E\u3059
+javac.opt.Xbootclasspath.p=ブートストラップ・クラス・パスの先頭に付加する
+javac.opt.Xbootclasspath.a=ブートストラップ・クラス・パスに追加する
+javac.opt.Xlint=推奨の警告を有効にする
+javac.opt.Xlint.all=すべての警告を有効にします
+javac.opt.Xlint.none=すべての警告を無効にします
 #L10N: do not localize: -Xlint
 javac.opt.arg.Xlint=<key>(,<key>)*
-javac.opt.Xlint.custom=\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3059\u308B\u8B66\u544A(\u30AB\u30F3\u30DE\u533A\u5207\u308A)\u3002\n\u6307\u5B9A\u3057\u305F\u8B66\u544A\u3092\u7121\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30AD\u30FC\u306E\u524D\u306B'-'\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u3092\u8868\u793A\u3059\u308B\u306B\u306F--help-lint\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
-javac.opt.Xlint.desc.auxiliaryclass=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u975E\u8868\u793A\u306B\u306A\u3063\u3066\u3044\u308B\u304C\u4ED6\u306E\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u88DC\u52A9\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.custom=有効または無効にする警告(カンマ区切り)。\n指定した警告を無効にするには、キーの前に'-'を指定します。\nサポートされているキーを表示するには--help-lintを使用します。
+javac.opt.Xlint.desc.auxiliaryclass=ソース・ファイルで非表示になっているが他のファイルから使用されている補助クラスについて警告します。
 
-javac.opt.Xlint.desc.cast=\u4E0D\u8981\u306A\u30AD\u30E3\u30B9\u30C8\u306E\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.cast=不要なキャストの使用について警告します。
 
-javac.opt.Xlint.desc.classfile=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u5185\u5BB9\u306B\u95A2\u9023\u3057\u305F\u554F\u984C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.classfile=クラス・ファイルの内容に関連した問題について警告します。
 
-javac.opt.Xlint.desc.missing-explicit-ctor=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306Epublic\u304A\u3088\u3073protected\u306E\u30AF\u30E9\u30B9\u306B\u660E\u793A\u7684\u306A\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u306A\u3044\u3053\u3068\u3092\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.missing-explicit-ctor=エクスポートされたパッケージのpublicおよびprotectedのクラスに明示的なコンストラクタがないことを警告します。
 
-javac.opt.Xlint.desc.deprecation=\u975E\u63A8\u5968\u9805\u76EE\u306E\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.deprecation=非推奨項目の使用について警告します。
 
-javac.opt.Xlint.desc.dep-ann=JavaDoc\u3067\u975E\u63A8\u5968\u3068\u3057\u3066\u30DE\u30FC\u30AF\u3055\u308C\u3066\u3044\u308B\u304C@\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u3092\u4F7F\u7528\u3057\u3066\u3044\u306A\u3044\u9805\u76EE\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.dep-ann=JavaDocで非推奨としてマークされているが@非推奨の注釈を使用していない項目について警告します。
 
-javac.opt.Xlint.desc.divzero=\u5B9A\u6574\u65700\u3067\u9664\u7B97\u3055\u308C\u308B\u3053\u3068\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.divzero=定整数0で除算されることについて警告します。
 
-javac.opt.Xlint.desc.empty=if\u4EE5\u964D\u304C\u7A7A\u306E\u6587\u3067\u3042\u308B\u3053\u3068\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.empty=if以降が空の文であることについて警告します。
 
-javac.opt.Xlint.desc.exports=\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u306B\u95A2\u3059\u308B\u554F\u984C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.exports=モジュールのエクスポートに関する問題について警告します。
 
-javac.opt.Xlint.desc.fallthrough=switch\u6587\u306E1\u3064\u306Ecase\u304B\u3089\u6B21\u3078\u306E\u30D5\u30A9\u30FC\u30EB\u30FB\u30B9\u30EB\u30FC\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.fallthrough=switch文の1つのcaseから次へのフォール・スルーについて警告します。
 
-javac.opt.Xlint.desc.finally=\u6B63\u5E38\u306B\u5B8C\u4E86\u3057\u306A\u3044finally\u7BC0\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.finally=正常に完了しないfinally節について警告します。
 
-javac.opt.Xlint.desc.lossy-conversions=\u8907\u5408\u4EE3\u5165\u306B\u304A\u3051\u308B\u7CBE\u5EA6\u304C\u5931\u308F\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u5909\u63DB\u306B\u3064\u3044\u3066\u306E\u8B66\u544A\u3002
+javac.opt.Xlint.desc.lossy-conversions=複合代入における精度が失われる可能性がある変換についての警告。
 
-javac.opt.Xlint.desc.module=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u95A2\u9023\u306E\u554F\u984C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.module=モジュール・システム関連の問題について警告します。
 
-javac.opt.Xlint.desc.opens=\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30AA\u30FC\u30D7\u30F3\u306B\u95A2\u3059\u308B\u554F\u984C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.opens=モジュールのオープンに関する問題について警告します。
 
-javac.opt.Xlint.desc.options=\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528\u306B\u95A2\u3059\u308B\u554F\u984C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.options=コマンド行オプションの使用に関する問題について警告します。
 
-javac.opt.Xlint.desc.output-file-clash=\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u30B3\u30F3\u30D1\u30A4\u30EB\u4E2D\u306B\u4E0A\u66F8\u304D\u3055\u308C\u305F\u5834\u5408\u306B\u8B66\u544A\u3057\u307E\u3059\u3002\u3053\u308C\u306F\u5927/\u5C0F\u6587\u5B57\u304C\u533A\u5225\u3055\u308C\u306A\u3044\n                         \u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u306A\u3069\u3067\u767A\u751F\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3001\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u30AB\u30D0\u30FC\u3055\u308C\u307E\u3059\u3002
+javac.opt.Xlint.desc.output-file-clash=出力ファイルがコンパイル中に上書きされた場合に警告します。これは大/小文字が区別されない\n                         ファイルシステムなどで発生する可能性があります。クラス・ファイル、ネイティブ・ヘッダー・ファイルおよびソース・ファイルがカバーされます。
 
-javac.opt.Xlint.desc.overloads=\u30E1\u30BD\u30C3\u30C9\u306E\u30AA\u30FC\u30D0\u30FC\u30ED\u30FC\u30C9\u306B\u95A2\u3059\u308B\u554F\u984C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.overloads=メソッドのオーバーロードに関する問題について警告します。
 
-javac.opt.Xlint.desc.overrides=\u30E1\u30BD\u30C3\u30C9\u306E\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u306B\u95A2\u3059\u308B\u554F\u984C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.overrides=メソッドのオーバーライドに関する問題について警告します。
 
-javac.opt.Xlint.desc.path=\u30B3\u30DE\u30F3\u30C9\u884C\u306E\u7121\u52B9\u306A\u30D1\u30B9\u8981\u7D20\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.path=コマンド行の無効なパス要素について警告します。
 
-javac.opt.Xlint.desc.processing=\u6CE8\u91C8\u51E6\u7406\u306B\u95A2\u3059\u308B\u554F\u984C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.processing=注釈処理に関する問題について警告します。
 
-javac.opt.Xlint.desc.rawtypes=raw\u578B\u306E\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.rawtypes=raw型の使用について警告します。
 
-javac.opt.Xlint.desc.removal=\u524A\u9664\u7528\u306B\u30DE\u30FC\u30AF\u3055\u308C\u305FAPI\u306E\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.removal=削除用にマークされたAPIの使用について警告します。
 
-javac.opt.Xlint.desc.requires-automatic=requires\u53E5\u5185\u306E\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.requires-automatic=requires句内の自動モジュールの使用について警告します。
 
-javac.opt.Xlint.desc.requires-transitive-automatic=requires transitive\u5185\u306E\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.requires-transitive-automatic=requires transitive内の自動モジュールについて警告します。
 
-javac.opt.Xlint.desc.serial=serialVersionUID\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u306A\u3044\u76F4\u5217\u5316\u53EF\u80FD\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002 \n                         \u76F4\u5217\u5316\u53EF\u80FD\u304A\u3088\u3073\u5916\u90E8\u5316\u53EF\u80FD\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306E\u4ED6\u306E\u8981\u6CE8\u610F\u5BA3\u8A00\u306B\u3064\u3044\u3066\u3082\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.serial=serialVersionUIDフィールドのない直列化可能クラスについて警告します。 \n                         直列化可能および外部化可能クラスとインタフェースでの他の要注意宣言についても警告します。
 
-javac.opt.Xlint.desc.static=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F7F\u7528\u3057\u305Fstatic\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.static=インスタンスを使用したstaticメンバーへのアクセスについて警告します。
 
-javac.opt.Xlint.desc.strictfp=strictfp\u4FEE\u98FE\u5B50\u306E\u4E0D\u8981\u306A\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.strictfp=strictfp修飾子の不要な使用について警告します。
 
-javac.opt.Xlint.desc.text-blocks=\u30C6\u30AD\u30B9\u30C8\u30FB\u30D6\u30ED\u30C3\u30AF\u30FB\u30A4\u30F3\u30C7\u30F3\u30C8\u5185\u306E\u4E00\u8CAB\u6027\u306E\u306A\u3044\u7A7A\u767D\u6587\u5B57\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.text-blocks=テキスト・ブロック・インデント内の一貫性のない空白文字について警告します。
 
-javac.opt.Xlint.desc.this-escape=\u5916\u90E8\u30B5\u30D6\u30AF\u30E9\u30B9\u3067\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u308B\u53EF\u80FD\u6027\u306E\u3042\u308B\u30E1\u30BD\u30C3\u30C9\u3092\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u547C\u3073\u51FA\u3057\u305F\u5834\u5408\u306B\u8B66\u544A\u3057\u307E\u3059\u3002\n                         \u3053\u306E\u3088\u3046\u306A\u30E1\u30BD\u30C3\u30C9\u306F\u3001\u30B5\u30D6\u30AF\u30E9\u30B9\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u305D\u306E\u521D\u671F\u5316\u3092\u5B8C\u4E86\u3059\u308B\u524D\u306B\u5B9F\u884C\u3055\u308C\u307E\u3059\u3002
+javac.opt.Xlint.desc.this-escape=外部サブクラスでオーバーライドされる可能性のあるメソッドをコンストラクタが呼び出した場合に警告します。\n                         このようなメソッドは、サブクラス・コンストラクタがその初期化を完了する前に実行されます。
 
-javac.opt.Xlint.desc.try=try\u30D6\u30ED\u30C3\u30AF(try-with-resources\u306A\u3069)\u306E\u4F7F\u7528\u306B\u95A2\u3059\u308B\u554F\u984C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.try=tryブロック(try-with-resourcesなど)の使用に関する問題について警告します。
 
-javac.opt.Xlint.desc.unchecked=\u7121\u691C\u67FB\u64CD\u4F5C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.unchecked=無検査操作について警告します。
 
-javac.opt.Xlint.desc.varargs=\u5B89\u5168\u3067\u306F\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308B\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059
+javac.opt.Xlint.desc.varargs=安全ではない可能性がある可変引数メソッドについて警告します
 
-javac.opt.Xlint.desc.preview=\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u306E\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059
+javac.opt.Xlint.desc.preview=プレビュー言語機能の使用について警告します
 
-javac.opt.Xlint.desc.synchronization=\u5024\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3067\u306E\u540C\u671F\u306E\u8A66\u884C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.synchronization=値ベース・クラスのインスタンスでの同期の試行について警告します。
 
-javac.opt.Xdoclint=javadoc\u30B3\u30E1\u30F3\u30C8\u306E\u554F\u984C\u306B\u95A2\u3059\u308B\u63A8\u5968\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059
+javac.opt.Xdoclint=javadocコメントの問題に関する推奨チェックを有効にします
 # L10N: do not localize: all none
 javac.opt.Xdoclint.subopts = (all|none|[-]<group>)[/<access>]
 
 # L10N: do not localize: accessibility html missing reference syntax
 # L10N: do not localize: public protected package private
-javac.opt.Xdoclint.custom=javadoc\u30B3\u30E1\u30F3\u30C8\u306E\u554F\u984C\u306B\u95A2\u3059\u308B\u7279\u5B9A\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\n        \u3053\u3053\u3067\u3001<group>\u306Faccessibility\u3001html\u3001missing\u3001reference\u307E\u305F\u306Fsyntax\u306E\u3044\u305A\u308C\u304B\u3067\u3001\n        <access>\u306Fpublic\u3001protected\u3001package\u307E\u305F\u306Fprivate\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002
+javac.opt.Xdoclint.custom=javadocコメントの問題に関する特定のチェックを有効または無効にします。\n        ここで、<group>はaccessibility、html、missing、referenceまたはsyntaxのいずれかで、\n        <access>はpublic、protected、packageまたはprivateのいずれかです。
 
 javac.opt.Xdoclint.package.args = [-]<packages>(,[-]<package>)*
 
-javac.opt.Xdoclint.package.desc=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\u5404<package>\u306F\u3001\n\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4FEE\u98FE\u3055\u308C\u305F\u540D\u524D\u3001\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306E\u63A5\u982D\u8F9E\u306E\u5F8C\u306B'.*'\u3092\n\u6307\u5B9A(\u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u3059\u3079\u3066\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u62E1\u5F35)\u3057\u305F\u3082\u306E\u3067\u3059\u3002\u5404<package>\n\u306E\u524D\u306B'-'\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u6307\u5B9A\u3057\u305F1\u3064\u4EE5\u4E0A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u95A2\u3059\u308B\u30C1\u30A7\u30C3\u30AF\u3092\u7121\u52B9\u306B\u3067\u304D\u307E\u3059\u3002
-
-javac.opt.Xstdout=\u6A19\u6E96\u51FA\u529B\u3092\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u3059\u308B
-javac.opt.X=\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3057\u307E\u3059
-javac.opt.help=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059
-javac.opt.help.lint=-Xlint\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u3092\u51FA\u529B\u3057\u307E\u3059
-javac.opt.help.lint.header=-Xlint\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:
-javac.opt.print=\u6307\u5B9A\u3057\u305F\u578B\u306E\u30C6\u30AD\u30B9\u30C8\u8868\u793A\u3092\u51FA\u529B\u3059\u308B
-javac.opt.printRounds=\u6CE8\u91C8\u51E6\u7406\u306E\u5F80\u5FA9\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
-javac.opt.printProcessorInfo=\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u51E6\u7406\u3092\u4F9D\u983C\u3055\u308C\u308B\u6CE8\u91C8\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
-javac.opt.userpathsfirst=\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9\u306E\u5F8C\u3067\u306F\u306A\u304F\u3001\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9\u306E\u524D\u306B\u30AF\u30E9\u30B9\u306E\u30AF\u30E9\u30B9\u30D1\u30B9\u304A\u3088\u3073\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3092\u691C\u7D22\u3059\u308B
-javac.opt.prefer=\u6697\u9ED9\u7684\u306B\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u308B\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u3001\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3068\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u4E21\u65B9\u304C\u898B\u3064\u304B\u3063\u305F\u969B\u3069\u3061\u3089\u3092\u8AAD\u307F\u8FBC\u3080\u304B\u6307\u5B9A\u3059\u308B
-javac.opt.preview=\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\u3002-source\u307E\u305F\u306F--release\u3068\u3068\u3082\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
-javac.opt.AT=\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u8AAD\u53D6\u308A\u30AA\u30D7\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D5\u30A1\u30A4\u30EB\u540D
-javac.opt.diags=\u8A3A\u65AD\u30E2\u30FC\u30C9\u306E\u9078\u629E
-javac.opt.addExports=<other-module>\u304CALL-UNNAMED\u3067\u3042\u308B\u5834\u5408\u3001\u305D\u306E\u5B9A\u7FA9\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u3089\u3001\u8FFD\u52A0\u30E2\u30B8\u30E5\u30FC\u30EB\u307E\u305F\u306F\n        \u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u6E08\u3068\u307F\u306A\u3055\u308C\u308B\u3088\u3046\u306B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002
+javac.opt.Xdoclint.package.desc=特定のパッケージのチェックを有効または無効にします。各<package>は、\nパッケージの修飾された名前、またはパッケージ名の接頭辞の後に'.*'を\n指定(指定したパッケージのすべてのサブパッケージに拡張)したものです。各<package>\nの前に'-'を指定すると、指定した1つ以上のパッケージに関するチェックを無効にできます。
+
+javac.opt.Xstdout=標準出力をリダイレクトする
+javac.opt.X=追加オプションのヘルプを出力します
+javac.opt.help=このヘルプ・メッセージを出力します
+javac.opt.help.lint=-Xlintにサポートされているキーを出力します
+javac.opt.help.lint.header=-Xlintにサポートされているキーは次のとおりです:
+javac.opt.print=指定した型のテキスト表示を出力する
+javac.opt.printRounds=注釈処理の往復についての情報を印刷する
+javac.opt.printProcessorInfo=プロセッサが処理を依頼される注釈についての情報を印刷する
+javac.opt.userpathsfirst=ブート・クラスパスの後ではなく、ブート・クラスパスの前にクラスのクラスパスおよびソース・パスを検索する
+javac.opt.prefer=暗黙的にコンパイルされるクラスについて、ソース・ファイルとクラス・ファイルの両方が見つかった際どちらを読み込むか指定する
+javac.opt.preview=プレビュー言語機能を有効にします。-sourceまたは--releaseとともに使用されます。
+javac.opt.AT=ファイルからの読取りオプションおよびファイル名
+javac.opt.diags=診断モードの選択
+javac.opt.addExports=<other-module>がALL-UNNAMEDである場合、その定義モジュールから、追加モジュールまたは\n        すべての名前のないモジュールにエクスポート済とみなされるようにパッケージを指定します。
 javac.opt.arg.addExports=<module>/<package>=<other-module>(,<other-module>)*
-javac.opt.addReads=\u6307\u5B9A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u5FC5\u9808\u3068\u307F\u306A\u3055\u308C\u308B\u3088\u3046\u306B\u8FFD\u52A0\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u5FC5\u8981\u3068\u3059\u308B\u5834\u5408\u3001<other-module>\u306F\nALL-UNNAMED\u306B\u3057\u307E\u3059\u3002
+javac.opt.addReads=指定のモジュールで必須とみなされるように追加モジュールを指定します。\n名前のないモジュールを必要とする場合、<other-module>は\nALL-UNNAMEDにします。
 javac.opt.arg.addReads=<module>=<other-module>(,<other-module>)*
-javac.opt.patch=JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n        \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059
+javac.opt.patch=JARファイルまたはディレクトリのクラスおよびリソースでモジュールを\n        オーバーライドまたは拡張します
 javac.opt.arg.patch=<module>=<file>(:<file>)*
-javac.opt.addmods=\u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F<module>\u304C\n        ALL-MODULE-PATH\u3067\u3042\u308B\u5834\u5408\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3002
+javac.opt.addmods=初期モジュールに加えて解決するルート・モジュール、または<module>が\n        ALL-MODULE-PATHである場合はモジュール・パスのすべてのモジュール。
 javac.opt.arg.addmods=<module>(,<module>)*
-javac.opt.limitmods=\u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059
+javac.opt.limitmods=参照可能なモジュールの領域を制限します
 javac.opt.arg.limitmods=<module>(,<module>)*
-javac.opt.module.version=\u30B3\u30F3\u30D1\u30A4\u30EB\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059
-javac.opt.arg.module.version=<\u30D0\u30FC\u30B8\u30E7\u30F3>
-javac.opt.inherit_runtime_environment=\u5B9F\u884C\u6642\u74B0\u5883\u304B\u3089\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u69CB\u6210\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u7D99\u627F\u3057\u307E\u3059\u3002
-javac.opt.default.module.for.created.files=\u4F55\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u63A8\u5B9A\u578B\u306E\u5834\u5408\u3001\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306B\u3088\u3063\u3066\u4F5C\u6210\u3055\u308C\u308B\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u3057\u307E\u3059\u3002
+javac.opt.module.version=コンパイルするモジュールのバージョンを指定します
+javac.opt.arg.module.version=<バージョン>
+javac.opt.inherit_runtime_environment=実行時環境からモジュール・システム構成オプションを継承します。
+javac.opt.default.module.for.created.files=何も指定されていないか、推定型の場合、注釈プロセッサによって作成されるファイルのターゲット・モジュールをフォールバックします。
 
 ## messages
 
-javac.msg.usage.header=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <source files>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059\u3002
+javac.msg.usage.header=使用方法: {0} <options> <source files>\n使用可能なオプションには次のものがあります。
 
-javac.msg.usage=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <source files>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001--help\u3092\u4F7F\u7528\u3057\u307E\u3059
+javac.msg.usage=使用方法: {0} <options> <source files>\n使用可能なオプションのリストについては、--helpを使用します
 
-javac.msg.usage.nonstandard.footer=\u3053\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
+javac.msg.usage.nonstandard.footer=この追加オプションは予告なしに変更されることがあります。
 
-javac.msg.bug=\u30B3\u30F3\u30D1\u30A4\u30E9\u3067\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002\u30D0\u30B0\u30FB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9(https://bugs.java.com)\u3067\u91CD\u8907\u304C\u306A\u3044\u304B\u3092\u3054\u78BA\u8A8D\u306E\u3046\u3048\u3001Java\u306E\u30D0\u30B0\u30FB\u30EC\u30DD\u30FC\u30C8\u30FB\u30DA\u30FC\u30B8(https://bugreport.java.com)\u304B\u3089\u3001Java\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u5BFE\u3059\u308B\u30D0\u30B0\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u8A72\u5F53\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3001\u6B21\u306E\u8A3A\u65AD\u5185\u5BB9\u3001\u304A\u3088\u3073Java\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u6E21\u3055\u308C\u305F\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u3054\u5165\u529B\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
+javac.msg.bug=コンパイラで例外が発生しました({0})。バグ・データベース(https://bugs.java.com)で重複がないかをご確認のうえ、Javaのバグ・レポート・ページ(https://bugreport.java.com)から、Javaコンパイラに対するバグの登録をお願いいたします。レポートには、該当のプログラム、次の診断内容、およびJavaコンパイラに渡されたパラメータをご入力ください。ご協力ありがとうございます。
 
-javac.msg.io=\n\n\u5165\u51FA\u529B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n
+javac.msg.io=\n\n入出力エラーが発生しました。\n詳細は次のスタックトレースで調査してください。\n
 
-javac.msg.proc.annotation.uncaught.exception=\n\n\u6CE8\u91C8\u51E6\u7406\u3067\u6355\u6349\u3055\u308C\u306A\u3044\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n
+javac.msg.proc.annotation.uncaught.exception=\n\n注釈処理で捕捉されない例外がスローされました。\n詳細は次のスタックトレースで調査してください。\n
 
-javac.msg.plugin.uncaught.exception=\n\n\u30D7\u30E9\u30B0\u30A4\u30F3\u3067\u6355\u6349\u3055\u308C\u306A\u3044\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n
+javac.msg.plugin.uncaught.exception=\n\nプラグインで捕捉されない例外がスローされました。\n詳細は次のスタック・トレースで調査してください。\n
 
-javac.msg.resource=\n\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30EA\u30BD\u30FC\u30B9\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n
+javac.msg.resource=\n\nシステム・リソースが不足しています。\n詳細は次のスタックトレースで調査してください。\n
 
 javac.version={0} {1}
-javac.fullVersion={0}\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"{1}"
+javac.fullVersion={0}フル・バージョン"{1}"
 
-javac.msg.parameters.output=javac\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6B21\u306E\u5834\u6240\u306B\u51FA\u529B\u3057\u3066\u3044\u307E\u3059: {0}
+javac.msg.parameters.output=javacパラメータを次の場所に出力しています: {0}
 
-javac.msg.parameters.output.error=javac\u30D1\u30E9\u30E1\u30FC\u30BF\u3092{0}\u306B\u51FA\u529B\u3057\u3088\u3046\u3068\u3057\u305F\u3068\u304D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u7D9A\u304D\u307E\u3059:
+javac.msg.parameters.output.error=javacパラメータを{0}に出力しようとしたときにエラーが発生しました。パラメータが続きます:
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
index 26629732286..8af8426bbc0 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
@@ -25,52 +25,52 @@
 
 ## tool
 
-javac.description=\u8BFB\u53D6 Java \u7C7B\u548C\u63A5\u53E3\u5B9A\u4E49\uFF0C\u5E76\u5C06\u5176\u7F16\u8BD1\u4E3A\u5B57\u8282\u7801\u548C\u7C7B\u6587\u4EF6
+javac.description=读取 Java 类和接口定义，并将其编译为字节码和类文件
 
 ## standard options
 
-javac.opt.g=\u751F\u6210\u6240\u6709\u8C03\u8BD5\u4FE1\u606F
-javac.opt.g.none=\u4E0D\u751F\u6210\u4EFB\u4F55\u8C03\u8BD5\u4FE1\u606F
-javac.opt.g.lines.vars.source=\u53EA\u751F\u6210\u67D0\u4E9B\u8C03\u8BD5\u4FE1\u606F
-javac.opt.nowarn=\u4E0D\u751F\u6210\u4EFB\u4F55\u8B66\u544A
-javac.opt.verbose=\u8F93\u51FA\u6709\u5173\u7F16\u8BD1\u5668\u6B63\u5728\u6267\u884C\u7684\u64CD\u4F5C\u7684\u6D88\u606F
-javac.opt.deprecation=\u8F93\u51FA\u4F7F\u7528\u5DF2\u8FC7\u65F6\u7684 API \u7684\u6E90\u4F4D\u7F6E
-javac.opt.classpath=\u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u548C\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F\u7684\u4F4D\u7F6E
-javac.opt.modulepath=\u6307\u5B9A\u67E5\u627E\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u4F4D\u7F6E
-javac.opt.sourcepath=\u6307\u5B9A\u67E5\u627E\u8F93\u5165\u6E90\u6587\u4EF6\u7684\u4F4D\u7F6E
-javac.opt.m=\u53EA\u7F16\u8BD1\u6307\u5B9A\u7684\u6A21\u5757\uFF0C\u8BF7\u68C0\u67E5\u65F6\u95F4\u6233
-javac.opt.modulesourcepath=\u6307\u5B9A\u67E5\u627E\u591A\u4E2A\u6A21\u5757\u7684\u8F93\u5165\u6E90\u6587\u4EF6\u7684\u4F4D\u7F6E
-javac.opt.bootclasspath=\u8986\u76D6\u5F15\u5BFC\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
-javac.opt.system=\u8986\u76D6\u7CFB\u7EDF\u6A21\u5757\u4F4D\u7F6E
-javac.opt.upgrademodulepath=\u8986\u76D6\u53EF\u5347\u7EA7\u6A21\u5757\u4F4D\u7F6E
-javac.opt.endorseddirs=\u8986\u76D6\u7B7E\u540D\u7684\u6807\u51C6\u8DEF\u5F84\u7684\u4F4D\u7F6E
-javac.opt.extdirs=\u8986\u76D6\u6240\u5B89\u88C5\u6269\u5C55\u7684\u4F4D\u7F6E
-javac.opt.processorpath=\u6307\u5B9A\u67E5\u627E\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F\u7684\u4F4D\u7F6E
-javac.opt.processormodulepath=\u6307\u5B9A\u67E5\u627E\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F\u7684\u6A21\u5757\u8DEF\u5F84
-javac.opt.processor=\u8981\u8FD0\u884C\u7684\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F\u7684\u540D\u79F0;\n\u7ED5\u8FC7\u9ED8\u8BA4\u7684\u641C\u7D22\u8FDB\u7A0B
-javac.opt.parameters=\u751F\u6210\u5143\u6570\u636E\u4EE5\u7528\u4E8E\u65B9\u6CD5\u53C2\u6570\u7684\u53CD\u5C04
-javac.opt.proc.none.only=\u63A7\u5236\u662F\u5426\u6267\u884C\u6279\u6CE8\u5904\u7406\u548C/\u6216\u7F16\u8BD1\u3002
-javac.opt.d=\u6307\u5B9A\u653E\u7F6E\u751F\u6210\u7684\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
-javac.opt.sourceDest=\u6307\u5B9A\u653E\u7F6E\u751F\u6210\u7684\u6E90\u6587\u4EF6\u7684\u4F4D\u7F6E
-javac.opt.headerDest=\u6307\u5B9A\u653E\u7F6E\u751F\u6210\u7684\u5934\u6587\u4EF6\u7684\u4F4D\u7F6E
-javac.opt.J=\u76F4\u63A5\u5C06 <\u6807\u8BB0> \u4F20\u9012\u7ED9\u8FD0\u884C\u65F6\u7CFB\u7EDF
-javac.opt.encoding=\u6307\u5B9A\u6E90\u6587\u4EF6\u4F7F\u7528\u7684\u5B57\u7B26\u7F16\u7801
-javac.opt.profile=\u68C0\u67E5\u4F7F\u7528\u7684 API \u5728\u6307\u5B9A\u7684\u914D\u7F6E\u6587\u4EF6\u4E2D\u662F\u5426\u53EF\u7528\u3002\n\u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
-javac.opt.target=\u751F\u6210\u9002\u5408\u6307\u5B9A\u7684 Java SE \u53D1\u884C\u7248\u7684\u7C7B\u6587\u4EF6\u3002\u652F\u6301\u7684\u53D1\u884C\u7248\uFF1A{0}
-javac.opt.release=\u4E3A\u6307\u5B9A\u7684 Java SE \u53D1\u884C\u7248\u7F16\u8BD1\u3002\u652F\u6301\u7684\u53D1\u884C\u7248\uFF1A{0}
-javac.opt.source=\u63D0\u4F9B\u4E0E\u6307\u5B9A\u7684 Java SE \u53D1\u884C\u7248\u7684\u6E90\u517C\u5BB9\u6027\u3002\u652F\u6301\u7684\u53D1\u884C\u7248\uFF1A{0}
-javac.opt.Werror=\u51FA\u73B0\u8B66\u544A\u65F6\u7EC8\u6B62\u7F16\u8BD1
-javac.opt.A=\u4F20\u9012\u7ED9\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F\u7684\u9009\u9879
-javac.opt.implicit=\u6307\u5B9A\u662F\u5426\u4E3A\u9690\u5F0F\u5F15\u7528\u6587\u4EF6\u751F\u6210\u7C7B\u6587\u4EF6
-javac.opt.pkginfo=\u6307\u5B9A package-info \u6587\u4EF6\u7684\u5904\u7406
-javac.opt.multi-release=\u6307\u5B9A\u5728\u591A\u53D1\u884C\u7248 jar \u4E2D\u4F7F\u7528\u54EA\u4E2A\u53D1\u884C\u7248
+javac.opt.g=生成所有调试信息
+javac.opt.g.none=不生成任何调试信息
+javac.opt.g.lines.vars.source=只生成某些调试信息
+javac.opt.nowarn=不生成任何警告
+javac.opt.verbose=输出有关编译器正在执行的操作的消息
+javac.opt.deprecation=输出使用已过时的 API 的源位置
+javac.opt.classpath=指定查找用户类文件和批注处理程序的位置
+javac.opt.modulepath=指定查找应用程序模块的位置
+javac.opt.sourcepath=指定查找输入源文件的位置
+javac.opt.m=只编译指定的模块，请检查时间戳
+javac.opt.modulesourcepath=指定查找多个模块的输入源文件的位置
+javac.opt.bootclasspath=覆盖引导类文件的位置
+javac.opt.system=覆盖系统模块位置
+javac.opt.upgrademodulepath=覆盖可升级模块位置
+javac.opt.endorseddirs=覆盖签名的标准路径的位置
+javac.opt.extdirs=覆盖所安装扩展的位置
+javac.opt.processorpath=指定查找批注处理程序的位置
+javac.opt.processormodulepath=指定查找批注处理程序的模块路径
+javac.opt.processor=要运行的批注处理程序的名称;\n绕过默认的搜索进程
+javac.opt.parameters=生成元数据以用于方法参数的反射
+javac.opt.proc.none.only=控制是否执行批注处理和/或编译。
+javac.opt.d=指定放置生成的类文件的位置
+javac.opt.sourceDest=指定放置生成的源文件的位置
+javac.opt.headerDest=指定放置生成的头文件的位置
+javac.opt.J=直接将 <标记> 传递给运行时系统
+javac.opt.encoding=指定源文件使用的字符编码
+javac.opt.profile=检查使用的 API 在指定的配置文件中是否可用。\n此选项已过时，可能会在未来发行版中删除。
+javac.opt.target=生成适合指定的 Java SE 发行版的类文件。支持的发行版：{0}
+javac.opt.release=为指定的 Java SE 发行版编译。支持的发行版：{0}
+javac.opt.source=提供与指定的 Java SE 发行版的源兼容性。支持的发行版：{0}
+javac.opt.Werror=出现警告时终止编译
+javac.opt.A=传递给批注处理程序的选项
+javac.opt.implicit=指定是否为隐式引用文件生成类文件
+javac.opt.pkginfo=指定 package-info 文件的处理
+javac.opt.multi-release=指定在多发行版 jar 中使用哪个发行版
 javac.opt.arg.class=<class>
 javac.opt.arg.class.list=<class1>[,<class2>,<class3>...]
 javac.opt.arg.flag=<flag>
 javac.opt.arg.key.equals.value=key[=value]
 javac.opt.arg.path=<path>
 javac.opt.arg.mspath=<module-source-path>
-javac.opt.arg.m=<\u6A21\u5757>(,<\u6A21\u5757>)*
+javac.opt.arg.m=<模块>(,<模块>)*
 javac.opt.arg.jdk=<jdk>|none
 javac.opt.arg.dirs=<dirs>
 javac.opt.arg.directory=<directory>
@@ -78,160 +78,160 @@ javac.opt.arg.encoding=<encoding>
 javac.opt.arg.profile=<profile>
 javac.opt.arg.release=<release>
 javac.opt.arg.number=<number>
-javac.opt.plugin=\u8981\u8FD0\u884C\u7684\u63D2\u4EF6\u7684\u540D\u79F0\u548C\u53EF\u9009\u53C2\u6570
-javac.opt.arg.plugin="\u540D\u79F0\u53C2\u6570"
+javac.opt.plugin=要运行的插件的名称和可选参数
+javac.opt.arg.plugin="名称参数"
 javac.opt.arg.multi-release=<release>
 javac.opt.arg.default.module.for.created.files=<module-name>
 
 ## extended options
 
-javac.opt.maxerrs=\u8BBE\u7F6E\u8981\u8F93\u51FA\u7684\u9519\u8BEF\u7684\u6700\u5927\u6570\u76EE
-javac.opt.maxwarns=\u8BBE\u7F6E\u8981\u8F93\u51FA\u7684\u8B66\u544A\u7684\u6700\u5927\u6570\u76EE
-javac.opt.nogj=\u8BED\u8A00\u4E2D\u4E0D\u63A5\u53D7\u6CDB\u578B
-javac.opt.moreinfo=\u8F93\u51FA\u7C7B\u578B\u53D8\u91CF\u7684\u6269\u5C55\u4FE1\u606F
-javac.opt.printsearch=\u8F93\u51FA\u6709\u5173\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\u7684\u4FE1\u606F
-javac.opt.prompt=\u5728\u6BCF\u6B21\u51FA\u9519\u540E\u505C\u6B62
-javac.opt.s=\u53D1\u51FA java \u6E90\u800C\u4E0D\u662F\u7C7B\u6587\u4EF6
-javac.opt.version=\u7248\u672C\u4FE1\u606F
+javac.opt.maxerrs=设置要输出的错误的最大数目
+javac.opt.maxwarns=设置要输出的警告的最大数目
+javac.opt.nogj=语言中不接受泛型
+javac.opt.moreinfo=输出类型变量的扩展信息
+javac.opt.printsearch=输出有关搜索类文件的位置的信息
+javac.opt.prompt=在每次出错后停止
+javac.opt.s=发出 java 源而不是类文件
+javac.opt.version=版本信息
 javac.opt.arg.pathname=<pathname>
 javac.opt.arg.file=<filename>
-javac.opt.Xbootclasspath.p=\u7F6E\u4E8E\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E4B\u524D
-javac.opt.Xbootclasspath.a=\u7F6E\u4E8E\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E4B\u540E
-javac.opt.Xlint=\u542F\u7528\u5EFA\u8BAE\u7684\u8B66\u544A
-javac.opt.Xlint.all=\u542F\u7528\u6240\u6709\u8B66\u544A
-javac.opt.Xlint.none=\u7981\u7528\u6240\u6709\u8B66\u544A
+javac.opt.Xbootclasspath.p=置于引导类路径之前
+javac.opt.Xbootclasspath.a=置于引导类路径之后
+javac.opt.Xlint=启用建议的警告
+javac.opt.Xlint.all=启用所有警告
+javac.opt.Xlint.none=禁用所有警告
 #L10N: do not localize: -Xlint
-javac.opt.arg.Xlint=<\u5BC6\u94A5>(,<\u5BC6\u94A5>)*
-javac.opt.Xlint.custom=\u8981\u542F\u7528\u6216\u7981\u7528\u7684\u8B66\u544A\uFF0C\u4F7F\u7528\u9017\u53F7\u5206\u9694\u3002\n\u5728\u5173\u952E\u5B57\u524D\u9762\u52A0\u4E0A '-' \u53EF\u7981\u7528\u6307\u5B9A\u7684\u8B66\u544A\u3002\n\u4F7F\u7528 --help-lint \u53EF\u67E5\u770B\u53D7\u652F\u6301\u7684\u5173\u952E\u5B57\u3002
-javac.opt.Xlint.desc.auxiliaryclass=\u6709\u5173\u8F85\u52A9\u7C7B\u5728\u6E90\u6587\u4EF6\u4E2D\u9690\u85CF, \u4F46\u5728\u5176\u4ED6\u6587\u4EF6\u4E2D\u4F7F\u7528\u7684\u8B66\u544A\u3002
+javac.opt.arg.Xlint=<密钥>(,<密钥>)*
+javac.opt.Xlint.custom=要启用或禁用的警告，使用逗号分隔。\n在关键字前面加上 '-' 可禁用指定的警告。\n使用 --help-lint 可查看受支持的关键字。
+javac.opt.Xlint.desc.auxiliaryclass=有关辅助类在源文件中隐藏, 但在其他文件中使用的警告。
 
-javac.opt.Xlint.desc.cast=\u6709\u5173\u4F7F\u7528\u4E86\u4E0D\u5FC5\u8981\u8F6C\u6362\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.cast=有关使用了不必要转换的警告。
 
-javac.opt.Xlint.desc.classfile=\u6709\u5173\u4E0E\u7C7B\u6587\u4EF6\u5185\u5BB9\u76F8\u5173\u7684\u95EE\u9898\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.classfile=有关与类文件内容相关的问题的警告。
 
-javac.opt.Xlint.desc.missing-explicit-ctor=\u6709\u5173\u5BFC\u51FA\u7684\u7A0B\u5E8F\u5305\u4E2D\u7684\u516C\u5171\u548C\u53D7\u4FDD\u62A4\u7C7B\u4E2D\u7F3A\u5C11\u663E\u5F0F\u6784\u9020\u5668\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.missing-explicit-ctor=有关导出的程序包中的公共和受保护类中缺少显式构造器的警告。
 
-javac.opt.Xlint.desc.deprecation=\u6709\u5173\u4F7F\u7528\u4E86\u5DF2\u8FC7\u65F6\u9879\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.deprecation=有关使用了已过时项的警告。
 
-javac.opt.Xlint.desc.dep-ann=\u6709\u5173\u9879\u5728 JavaDoc \u4E2D\u6807\u8BB0\u4E3A\u5DF2\u8FC7\u65F6\u4F46\u672A\u4F7F\u7528 @Deprecated \u6279\u6CE8\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.dep-ann=有关项在 JavaDoc 中标记为已过时但未使用 @Deprecated 批注的警告。
 
-javac.opt.Xlint.desc.divzero=\u6709\u5173\u9664\u4EE5\u5E38\u91CF\u6574\u6570 0 \u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.divzero=有关除以常量整数 0 的警告。
 
-javac.opt.Xlint.desc.empty=\u6709\u5173 if \u4E4B\u540E\u6CA1\u6709\u8BED\u53E5\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.empty=有关 if 之后没有语句的警告。
 
-javac.opt.Xlint.desc.exports=\u6709\u5173\u4E0E\u6A21\u5757\u5BFC\u51FA\u76F8\u5173\u7684\u95EE\u9898\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.exports=有关与模块导出相关的问题的警告。
 
-javac.opt.Xlint.desc.fallthrough=\u6709\u5173\u4ECE switch \u8BED\u53E5\u7684\u4E00\u4E2A case \u5411\u4E0B\u987A\u5E8F\u6267\u884C\u5230\u4E0B\u4E00\u4E2A case \u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.fallthrough=有关从 switch 语句的一个 case 向下顺序执行到下一个 case 的警告。
 
-javac.opt.Xlint.desc.finally=\u6709\u5173 finally \u5B50\u53E5\u672A\u6B63\u5E38\u7EC8\u6B62\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.finally=有关 finally 子句未正常终止的警告。
 
-javac.opt.Xlint.desc.lossy-conversions=\u6709\u5173\u590D\u5408\u8D4B\u503C\u4E2D\u7684\u8F6C\u6362\u53EF\u80FD\u4F1A\u6709\u635F\u5931\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.lossy-conversions=有关复合赋值中的转换可能会有损失的警告。
 
-javac.opt.Xlint.desc.module=\u6709\u5173\u6A21\u5757\u7CFB\u7EDF\u76F8\u5173\u95EE\u9898\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.module=有关模块系统相关问题的警告。
 
-javac.opt.Xlint.desc.opens=\u6709\u5173\u4E0E\u6A21\u5757\u6253\u5F00\u76F8\u5173\u7684\u95EE\u9898\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.opens=有关与模块打开相关的问题的警告。
 
-javac.opt.Xlint.desc.options=\u6709\u5173\u4E0E\u4F7F\u7528\u547D\u4EE4\u884C\u9009\u9879\u76F8\u5173\u7684\u95EE\u9898\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.options=有关与使用命令行选项相关的问题的警告。
 
-javac.opt.Xlint.desc.output-file-clash=\u5728\u7F16\u8BD1\u671F\u95F4\u8986\u76D6\u8F93\u51FA\u6587\u4EF6\u65F6\u53D1\u51FA\u8B66\u544A\u3002\u5728\u67D0\u4E9B\u60C5\u51B5\u4E0B\uFF08\u4F8B\u5982\u5728\u4E0D\u533A\u5206\u5927\u5C0F\u5199\u7684\u6587\u4EF6\u7CFB\u7EDF\u4E2D\uFF09\n                         \u53EF\u80FD\u4F1A\u53D1\u751F\u8FD9\u79CD\u60C5\u51B5\u3002\u6D89\u53CA\u7C7B\u6587\u4EF6\u3001\u5934\u6587\u4EF6\u548C\u6E90\u6587\u4EF6\u3002
+javac.opt.Xlint.desc.output-file-clash=在编译期间覆盖输出文件时发出警告。在某些情况下（例如在不区分大小写的文件系统中）\n                         可能会发生这种情况。涉及类文件、头文件和源文件。
 
-javac.opt.Xlint.desc.overloads=\u6709\u5173\u4E0E\u65B9\u6CD5\u91CD\u8F7D\u76F8\u5173\u7684\u95EE\u9898\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.overloads=有关与方法重载相关的问题的警告。
 
-javac.opt.Xlint.desc.overrides=\u6709\u5173\u4E0E\u65B9\u6CD5\u8986\u76D6\u76F8\u5173\u7684\u95EE\u9898\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.overrides=有关与方法覆盖相关的问题的警告。
 
-javac.opt.Xlint.desc.path=\u6709\u5173\u547D\u4EE4\u884C\u4E0A\u7684\u8DEF\u5F84\u5143\u7D20\u65E0\u6548\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.path=有关命令行上的路径元素无效的警告。
 
-javac.opt.Xlint.desc.processing=\u6709\u5173\u4E0E\u6279\u6CE8\u5904\u7406\u76F8\u5173\u7684\u95EE\u9898\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.processing=有关与批注处理相关的问题的警告。
 
-javac.opt.Xlint.desc.rawtypes=\u6709\u5173\u4F7F\u7528\u4E86\u539F\u59CB\u7C7B\u578B\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.rawtypes=有关使用了原始类型的警告。
 
-javac.opt.Xlint.desc.removal=\u6709\u5173\u4F7F\u7528\u4E86\u6807\u8BB0\u4E3A\u5F85\u5220\u9664\u7684 API \u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.removal=有关使用了标记为待删除的 API 的警告。
 
-javac.opt.Xlint.desc.requires-automatic=\u6709\u5173\u5728 requires \u5B50\u53E5\u4E2D\u4F7F\u7528\u81EA\u52A8\u6A21\u5757\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.requires-automatic=有关在 requires 子句中使用自动模块的警告。
 
-javac.opt.Xlint.desc.requires-transitive-automatic=\u6709\u5173 requires \u8FC7\u6E21\u4E2D\u7684\u81EA\u52A8\u6A21\u5757\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.requires-transitive-automatic=有关 requires 过渡中的自动模块的警告。
 
-javac.opt.Xlint.desc.serial=\u6709\u5173\u6CA1\u6709 serialVersionUID \u5B57\u6BB5\u7684\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u8B66\u544A\u3002\n                         \u4EE5\u53CA\u6709\u5173\u53EF\u5E8F\u5217\u5316\u548C\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u548C\u63A5\u53E3\u4E2D\u5176\u4ED6\u53EF\u7591\u58F0\u660E\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.serial=有关没有 serialVersionUID 字段的可序列化类的警告。\n                         以及有关可序列化和可外部化的类和接口中其他可疑声明的警告。
 
-javac.opt.Xlint.desc.static=\u6709\u5173\u4F7F\u7528\u5B9E\u4F8B\u6765\u8BBF\u95EE\u9759\u6001\u6210\u5458\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.static=有关使用实例来访问静态成员的警告。
 
-javac.opt.Xlint.desc.strictfp=\u6709\u5173\u4E0D\u5FC5\u8981\u5730\u4F7F\u7528\u4E86 strictfp \u4FEE\u9970\u7B26\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.strictfp=有关不必要地使用了 strictfp 修饰符的警告。
 
-javac.opt.Xlint.desc.text-blocks=\u6709\u5173\u6587\u672C\u5757\u7F29\u8FDB\u4E2D\u7684\u7A7A\u683C\u5B57\u7B26\u4E0D\u4E00\u81F4\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.text-blocks=有关文本块缩进中的空格字符不一致的警告。
 
-javac.opt.Xlint.desc.this-escape=\u6784\u9020\u5668\u8C03\u7528\u7684\u65B9\u6CD5\u53EF\u80FD\u5728\u5916\u90E8\u5B50\u7C7B\u4E2D\u88AB\u8986\u76D6\u65F6\u53D1\u51FA\u8B66\u544A\u3002\n                         \u6B64\u7C7B\u65B9\u6CD5\u5C06\u5728\u5B50\u7C7B\u6784\u9020\u5668\u5B8C\u6210\u5176\u521D\u59CB\u5316\u4E4B\u524D\u6267\u884C\u3002
+javac.opt.Xlint.desc.this-escape=构造器调用的方法可能在外部子类中被覆盖时发出警告。\n                         此类方法将在子类构造器完成其初始化之前执行。
 
-javac.opt.Xlint.desc.try=\u6709\u5173\u4E0E\u4F7F\u7528 try \u5757 (\u4F8B\u5982 try-with-resources) \u76F8\u5173\u7684\u95EE\u9898\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.try=有关与使用 try 块 (例如 try-with-resources) 相关的问题的警告。
 
-javac.opt.Xlint.desc.unchecked=\u6709\u5173\u672A\u68C0\u67E5\u64CD\u4F5C\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.unchecked=有关未检查操作的警告。
 
-javac.opt.Xlint.desc.varargs=\u6709\u5173\u6F5C\u5728\u4E0D\u5B89\u5168\u7684 vararg \u65B9\u6CD5\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.varargs=有关潜在不安全的 vararg 方法的警告。
 
-javac.opt.Xlint.desc.preview=\u6709\u5173\u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.preview=有关使用预览语言功能的警告。
 
-javac.opt.Xlint.desc.synchronization=\u6709\u5173\u5C1D\u8BD5\u5728\u57FA\u4E8E\u503C\u7684\u7C7B\u7684\u5B9E\u4F8B\u4E0A\u540C\u6B65\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.synchronization=有关尝试在基于值的类的实例上同步的警告。
 
-javac.opt.Xdoclint=\u4E3A javadoc \u6CE8\u91CA\u4E2D\u7684\u95EE\u9898\u542F\u7528\u5EFA\u8BAE\u7684\u68C0\u67E5
+javac.opt.Xdoclint=为 javadoc 注释中的问题启用建议的检查
 # L10N: do not localize: all none
 javac.opt.Xdoclint.subopts = (all|none|[-]<group>)[/<access>]
 
 # L10N: do not localize: accessibility html missing reference syntax
 # L10N: do not localize: public protected package private
-javac.opt.Xdoclint.custom=\u4E3A javadoc \u6CE8\u91CA\u4E2D\u7684\u95EE\u9898\u542F\u7528\u6216\u7981\u7528\u7279\u5B9A\u68C0\u67E5,\n        \u5176\u4E2D <group> \u4E3A accessibility, html, missing, reference \u6216 syntax \u4E4B\u4E00\u3002\n        <access> \u4E3A public, protected, package \u6216 private \u4E4B\u4E00\u3002
-
-javac.opt.Xdoclint.package.args = [-]<\u7A0B\u5E8F\u5305>(,[-]<\u7A0B\u5E8F\u5305>)*
-
-javac.opt.Xdoclint.package.desc=\u5728\u7279\u5B9A\u7684\u7A0B\u5E8F\u5305\u4E2D\u542F\u7528\u6216\u7981\u7528\u68C0\u67E5\u3002\u6BCF\u4E2A <\u7A0B\u5E8F\u5305> \u662F\n\u7A0B\u5E8F\u5305\u7684\u9650\u5B9A\u540D\u79F0\uFF0C\u6216\u7A0B\u5E8F\u5305\u540D\u79F0\u524D\u7F00\u540E\u8DDF '.*'\n\uFF08\u8FD9\u5C06\u6269\u5C55\u5230\u7ED9\u5B9A\u7A0B\u5E8F\u5305\u7684\u6240\u6709\u5B50\u7A0B\u5E8F\u5305\uFF09\u3002\u5728\u6BCF\u4E2A <\u7A0B\u5E8F\u5305>\n\u524D\u9762\u52A0\u4E0A '-' \u53EF\u4EE5\u4E3A\u6307\u5B9A\u7A0B\u5E8F\u5305\u7981\u7528\u68C0\u67E5\u3002
-
-javac.opt.Xstdout=\u91CD\u5B9A\u5411\u6807\u51C6\u8F93\u51FA
-javac.opt.X=\u8F93\u51FA\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9
-javac.opt.help=\u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F
-javac.opt.help.lint=\u8F93\u51FA -Xlint \u652F\u6301\u7684\u5173\u952E\u5B57
-javac.opt.help.lint.header=-Xlint \u652F\u6301\u7684\u5173\u952E\u5B57\u5305\u62EC\uFF1A
-javac.opt.print=\u8F93\u51FA\u6307\u5B9A\u7C7B\u578B\u7684\u6587\u672C\u8868\u793A
-javac.opt.printRounds=\u8F93\u51FA\u6709\u5173\u6279\u6CE8\u5904\u7406\u5FAA\u73AF\u7684\u4FE1\u606F
-javac.opt.printProcessorInfo=\u8F93\u51FA\u6709\u5173\u8BF7\u6C42\u5904\u7406\u7A0B\u5E8F\u5904\u7406\u54EA\u4E9B\u6279\u6CE8\u7684\u4FE1\u606F
-javac.opt.userpathsfirst=\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E4B\u524D\u800C\u4E0D\u662F\u4E4B\u540E\u641C\u7D22\u7C7B\u7684\u7C7B\u8DEF\u5F84\u548C\u6E90\u8DEF\u5F84
-javac.opt.prefer=\u6307\u5B9A\u8BFB\u53D6\u6587\u4EF6, \u5F53\u540C\u65F6\u627E\u5230\u9690\u5F0F\u7F16\u8BD1\u7C7B\u7684\u6E90\u6587\u4EF6\u548C\u7C7B\u6587\u4EF6\u65F6
-javac.opt.preview=\u542F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002\u8981\u4E0E -source \u6216 --release \u4E00\u8D77\u4F7F\u7528\u3002
-javac.opt.AT=\u4ECE\u6587\u4EF6\u8BFB\u53D6\u9009\u9879\u548C\u6587\u4EF6\u540D
-javac.opt.diags=\u9009\u62E9\u8BCA\u65AD\u6A21\u5F0F
-javac.opt.addExports=\u6307\u5B9A\u88AB\u89C6\u4E3A\u5DF2\u4ECE\u5176\u5B9A\u4E49\u6A21\u5757\u5BFC\u51FA\u5230\u5176\u4ED6\u6A21\u5757\u6216\u8005\u5BFC\u51FA\u5230\u6240\u6709\n        \u672A\u547D\u540D\u6A21\u5757 (\u5982\u679C <other-module> \u4E3A ALL-UNNAMED) \u7684\u7A0B\u5E8F\u5305\u3002
-javac.opt.arg.addExports=<\u6A21\u5757>/<\u7A0B\u5E8F\u5305>=<\u5176\u4ED6\u6A21\u5757>(,<\u5176\u4ED6\u6A21\u5757>)*
-javac.opt.addReads=\u6307\u5B9A\u88AB\u89C6\u4E3A\u7ED9\u5B9A\u6A21\u5757\u6240\u5FC5\u9700\u7684\u5176\u4ED6\u6A21\u5757\u3002\n<\u5176\u4ED6\u6A21\u5757> \u53EF\u4EE5\u4E3A ALL-UNNAMED \n\u4EE5\u4FBF\u8981\u6C42\u63D0\u4F9B\u672A\u547D\u540D\u6A21\u5757\u3002
-javac.opt.arg.addReads=<\u6A21\u5757>=<\u5176\u4ED6\u6A21\u5757>(,<\u5176\u4ED6\u6A21\u5757>)*
-javac.opt.patch=\u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\u8986\u76D6\n        \u6216\u589E\u5F3A\u6A21\u5757
-javac.opt.arg.patch=<\u6A21\u5757>=<\u6587\u4EF6>(:<\u6587\u4EF6>)*
-javac.opt.addmods=\u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757; \u5982\u679C <module>\n        \u4E3A ALL-MODULE-PATH,\n\u5219\u4E3A\u6A21\u5757\u8DEF\u5F84\u4E2D\u7684\u6240\u6709\u6A21\u5757\u3002
-javac.opt.arg.addmods=<\u6A21\u5757>(,<\u6A21\u5757>)*
-javac.opt.limitmods=\u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF
-javac.opt.arg.limitmods=<\u6A21\u5757>(,<\u6A21\u5757>)*
-javac.opt.module.version=\u6307\u5B9A\u6B63\u5728\u7F16\u8BD1\u7684\u6A21\u5757\u7248\u672C
-javac.opt.arg.module.version=<\u7248\u672C>
-javac.opt.inherit_runtime_environment=\u4ECE\u8FD0\u884C\u65F6\u73AF\u5883\u7EE7\u627F\u6A21\u5757\u7CFB\u7EDF\u914D\u7F6E\u9009\u9879\u3002
-javac.opt.default.module.for.created.files=\u7531\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F\u521B\u5EFA\u7684\u6587\u4EF6\u7684\u5907\u7528\u76EE\u6807\u6A21\u5757 (\u5982\u679C\u672A\u6307\u5B9A\u6216\u63A8\u65AD\u4EFB\u4F55\u6A21\u5757)\u3002
+javac.opt.Xdoclint.custom=为 javadoc 注释中的问题启用或禁用特定检查,\n        其中 <group> 为 accessibility, html, missing, reference 或 syntax 之一。\n        <access> 为 public, protected, package 或 private 之一。
+
+javac.opt.Xdoclint.package.args = [-]<程序包>(,[-]<程序包>)*
+
+javac.opt.Xdoclint.package.desc=在特定的程序包中启用或禁用检查。每个 <程序包> 是\n程序包的限定名称，或程序包名称前缀后跟 '.*'\n（这将扩展到给定程序包的所有子程序包）。在每个 <程序包>\n前面加上 '-' 可以为指定程序包禁用检查。
+
+javac.opt.Xstdout=重定向标准输出
+javac.opt.X=输出额外选项的帮助
+javac.opt.help=输出此帮助消息
+javac.opt.help.lint=输出 -Xlint 支持的关键字
+javac.opt.help.lint.header=-Xlint 支持的关键字包括：
+javac.opt.print=输出指定类型的文本表示
+javac.opt.printRounds=输出有关批注处理循环的信息
+javac.opt.printProcessorInfo=输出有关请求处理程序处理哪些批注的信息
+javac.opt.userpathsfirst=在引导类路径之前而不是之后搜索类的类路径和源路径
+javac.opt.prefer=指定读取文件, 当同时找到隐式编译类的源文件和类文件时
+javac.opt.preview=启用预览语言功能。要与 -source 或 --release 一起使用。
+javac.opt.AT=从文件读取选项和文件名
+javac.opt.diags=选择诊断模式
+javac.opt.addExports=指定被视为已从其定义模块导出到其他模块或者导出到所有\n        未命名模块 (如果 <other-module> 为 ALL-UNNAMED) 的程序包。
+javac.opt.arg.addExports=<模块>/<程序包>=<其他模块>(,<其他模块>)*
+javac.opt.addReads=指定被视为给定模块所必需的其他模块。\n<其他模块> 可以为 ALL-UNNAMED \n以便要求提供未命名模块。
+javac.opt.arg.addReads=<模块>=<其他模块>(,<其他模块>)*
+javac.opt.patch=使用 JAR 文件或目录中的类和资源覆盖\n        或增强模块
+javac.opt.arg.patch=<模块>=<文件>(:<文件>)*
+javac.opt.addmods=除了初始模块之外要解析的根模块; 如果 <module>\n        为 ALL-MODULE-PATH,\n则为模块路径中的所有模块。
+javac.opt.arg.addmods=<模块>(,<模块>)*
+javac.opt.limitmods=限制可观察模块的领域
+javac.opt.arg.limitmods=<模块>(,<模块>)*
+javac.opt.module.version=指定正在编译的模块版本
+javac.opt.arg.module.version=<版本>
+javac.opt.inherit_runtime_environment=从运行时环境继承模块系统配置选项。
+javac.opt.default.module.for.created.files=由批注处理程序创建的文件的备用目标模块 (如果未指定或推断任何模块)。
 
 ## messages
 
-javac.msg.usage.header=\u7528\u6CD5: {0} <options> <source files>\n\u5176\u4E2D, \u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC:
+javac.msg.usage.header=用法: {0} <options> <source files>\n其中, 可能的选项包括:
 
-javac.msg.usage=\u7528\u6CD5: {0} <\u9009\u9879> <\u6E90\u6587\u4EF6>\n\u4F7F\u7528 --help \u53EF\u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
+javac.msg.usage=用法: {0} <选项> <源文件>\n使用 --help 可列出可能的选项
 
-javac.msg.usage.nonstandard.footer=\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002
+javac.msg.usage.nonstandard.footer=这些额外选项如有更改, 恕不另行通知。
 
-javac.msg.bug=\u7F16\u8BD1\u5668 ({0}) \u4E2D\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF\u3002\u5982\u679C\u5728 Bug Database (https://bugs.java.com) \u4E2D\u6CA1\u6709\u627E\u5230\u6709\u5173\u8BE5\u9519\u8BEF\u7684 Java \u7F16\u8BD1\u5668 Bug\uFF0C\u8BF7\u901A\u8FC7 Java Bug \u62A5\u544A\u9875 (https://bugreport.java.com) \u63D0\u4EA4 Java \u7F16\u8BD1\u5668 Bug\u3002\u8BF7\u5728\u62A5\u544A\u4E2D\u9644\u4E0A\u60A8\u7684\u7A0B\u5E8F\u3001\u4EE5\u4E0B\u8BCA\u65AD\u4FE1\u606F\u4EE5\u53CA\u4F20\u9012\u5230 Java \u7F16\u8BD1\u5668\u7684\u53C2\u6570\u3002\u8C22\u8C22\u3002
+javac.msg.bug=编译器 ({0}) 中出现异常错误。如果在 Bug Database (https://bugs.java.com) 中没有找到有关该错误的 Java 编译器 Bug，请通过 Java Bug 报告页 (https://bugreport.java.com) 提交 Java 编译器 Bug。请在报告中附上您的程序、以下诊断信息以及传递到 Java 编译器的参数。谢谢。
 
-javac.msg.io=\n\n\u53D1\u751F\u8F93\u5165/\u8F93\u51FA\u9519\u8BEF\u3002\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4EE5\u4E0B\u5806\u6808\u8DDF\u8E2A\u3002\n
+javac.msg.io=\n\n发生输入/输出错误。\n有关详细信息, 请参阅以下堆栈跟踪。\n
 
-javac.msg.proc.annotation.uncaught.exception=\n\n\u6279\u6CE8\u5904\u7406\u7A0B\u5E8F\u629B\u51FA\u672A\u6355\u83B7\u7684\u5F02\u5E38\u9519\u8BEF\u3002\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4EE5\u4E0B\u5806\u6808\u8DDF\u8E2A\u3002\n
+javac.msg.proc.annotation.uncaught.exception=\n\n批注处理程序抛出未捕获的异常错误。\n有关详细信息, 请参阅以下堆栈跟踪。\n
 
-javac.msg.plugin.uncaught.exception=\n\n\u63D2\u4EF6\u629B\u51FA\u672A\u6355\u83B7\u7684\u5F02\u5E38\u9519\u8BEF\u3002\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4EE5\u4E0B\u5806\u6808\u8DDF\u8E2A\u3002\n
+javac.msg.plugin.uncaught.exception=\n\n插件抛出未捕获的异常错误。\n有关详细信息, 请参阅以下堆栈跟踪。\n
 
-javac.msg.resource=\n\n\u7CFB\u7EDF\u8D44\u6E90\u4E0D\u8DB3\u3002\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4EE5\u4E0B\u5806\u6808\u8DDF\u8E2A\u3002\n
+javac.msg.resource=\n\n系统资源不足。\n有关详细信息, 请参阅以下堆栈跟踪。\n
 
 javac.version={0} {1}
-javac.fullVersion={0}\u5B8C\u6574\u7248\u672C "{1}"
+javac.fullVersion={0}完整版本 "{1}"
 
-javac.msg.parameters.output=\u6B63\u5728\u5C06 javac \u53C2\u6570\u6253\u5370\u5230\uFF1A{0}
+javac.msg.parameters.output=正在将 javac 参数打印到：{0}
 
-javac.msg.parameters.output.error=\u5C1D\u8BD5\u5C06 javac \u53C2\u6570\u6253\u5370\u5230 {0} \u65F6\u51FA\u9519\uFF0C\u53C2\u6570\u5C06\u91C7\u7528\uFF1A
+javac.msg.parameters.output.error=尝试将 javac 参数打印到 {0} 时出错，参数将采用：
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
index acee21b93de..a41cc744b3d 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
@@ -80,12 +80,12 @@
 ## All errors are preceded by this string.
 launcher.error=Fehler:\u0020
 
-launcher.err.no.args=kein Pfad f\u00FCr Quelldatei
+launcher.err.no.args=kein Pfad für Quelldatei
 
 launcher.err.security.manager=Quellcode-Launcher kann nicht mit aktiviertem Sicherheitsmanager verwendet werden
 
 # 0: string
-launcher.err.invalid.filename=ung\u00FCltiger Pfad f\u00FCr Quelldatei: {0}
+launcher.err.invalid.filename=ungültiger Pfad für Quelldatei: {0}
 
 # 0: path
 launcher.err.file.not.found=Quelldatei nicht gefunden: {0}
@@ -96,7 +96,7 @@ launcher.err.no.class=keine Klasse deklariert in Quelldatei
 
 launcher.err.main.not.public.static=Methode "main" ist nicht als "public static" deklariert
 
-launcher.err.main.not.void=Methode "main" ist nicht mit R\u00FCckgabetyp "void" deklariert
+launcher.err.main.not.void=Methode "main" ist nicht mit Rückgabetyp "void" deklariert
 
 # 0: string
 launcher.err.cant.find.class=Klasse nicht gefunden: {0}
@@ -117,9 +117,9 @@ launcher.err.cant.access.constructor=Kein Zugriff auf No-Argument-Konstruktor in
 launcher.err.cant.read.file=Fehler beim Lesen von Quelldatei {0}: {1}
 
 # 0: string
-launcher.err.no.value.for.option=kein Wert angegeben f\u00FCr Option: {0}
+launcher.err.no.value.for.option=kein Wert angegeben für Option: {0}
 
 # 0: string
-launcher.err.invalid.value.for.source=ung\u00FCltiger Wert f\u00FCr Option --source: {0}
+launcher.err.invalid.value.for.source=ungültiger Wert für Option --source: {0}
 
 launcher.err.enable.preview.requires.source=--enable-preview muss mit --source verwendet werden
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_ja.properties
index fac2f45661d..f156f18b078 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_ja.properties
@@ -78,48 +78,48 @@
 # for manipulating this file. For more details, see MessageInfo.java.
 
 ## All errors are preceded by this string.
-launcher.error=\u30A8\u30E9\u30FC:\u0020
+launcher.error=エラー:\u0020
 
-launcher.err.no.args=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u304C\u3042\u308A\u307E\u305B\u3093
+launcher.err.no.args=ソース・ファイルのパスがありません
 
-launcher.err.security.manager=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u304C\u6709\u52B9\u306A\u72B6\u614B\u3067\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+launcher.err.security.manager=セキュリティ・マネージャが有効な状態でソースコード・ランチャを使用することはできません
 
 # 0: string
-launcher.err.invalid.filename=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u7121\u52B9\u306A\u30D1\u30B9: {0}
+launcher.err.invalid.filename=ソース・ファイルの無効なパス: {0}
 
 # 0: path
-launcher.err.file.not.found=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
+launcher.err.file.not.found=ソース・ファイルが見つかりません: {0}
 
-launcher.err.compilation.failed=\u30B3\u30F3\u30D1\u30A4\u30EB\u304C\u5931\u6557\u3057\u307E\u3057\u305F
+launcher.err.compilation.failed=コンパイルが失敗しました
 
-launcher.err.no.class=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u5BA3\u8A00\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u305B\u3093
+launcher.err.no.class=ソース・ファイルで宣言されたクラスがありません
 
-launcher.err.main.not.public.static=''main'\u30E1\u30BD\u30C3\u30C9\u304C''public static''\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+launcher.err.main.not.public.static=''main'メソッドが''public static''として宣言されていません
 
-launcher.err.main.not.void=''main'\u30E1\u30BD\u30C3\u30C9\u304C\u623B\u308A\u578B''void''\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+launcher.err.main.not.void=''main'メソッドが戻り型''void''で宣言されていません
 
 # 0: string
-launcher.err.cant.find.class=\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
+launcher.err.cant.find.class=クラスが見つかりません: {0}
 
 # 0: string
-launcher.err.cant.find.main.method=\u30AF\u30E9\u30B9\u306Bmain(String[])\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
+launcher.err.cant.find.main.method=クラスにmain(String[])メソッドが見つかりません: {0}
 
 # 0: string
-launcher.err.cant.access.main.method=\u30AF\u30E9\u30B9\u306E\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {0}
+launcher.err.cant.access.main.method=クラスのメイン・メソッドにアクセスできません: {0}
 
 # 0: string
-launcher.err.cant.find.constructor=\u30AF\u30E9\u30B9\u306B\u5F15\u6570\u306A\u3057\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
+launcher.err.cant.find.constructor=クラスに引数なしのコンストラクタが見つかりません: {0}
 
 # 0: string
-launcher.err.cant.access.constructor=\u30AF\u30E9\u30B9\u306E\u5F15\u6570\u306A\u3057\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {0}
+launcher.err.cant.access.constructor=クラスの引数なしのコンストラクタにアクセスできません: {0}
 
 # 0: path, 1: object
-launcher.err.cant.read.file=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u306E\u8AAD\u53D6\u308A\u30A8\u30E9\u30FC: {1}
+launcher.err.cant.read.file=ソース・ファイル{0}の読取りエラー: {1}
 
 # 0: string
-launcher.err.no.value.for.option=\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
+launcher.err.no.value.for.option=オプションに値が指定されていません: {0}
 
 # 0: string
-launcher.err.invalid.value.for.source=--source\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5024\u304C\u7121\u52B9\u3067\u3059: {0}
+launcher.err.invalid.value.for.source=--sourceオプションの値が無効です: {0}
 
-launcher.err.enable.preview.requires.source=--enable-preview\u306F--source\u3068\u3068\u3082\u306B\u4F7F\u7528\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+launcher.err.enable.preview.requires.source=--enable-previewは--sourceとともに使用する必要があります
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_zh_CN.properties
index 3dce0fcdb08..7d154f8d556 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_zh_CN.properties
@@ -78,48 +78,48 @@
 # for manipulating this file. For more details, see MessageInfo.java.
 
 ## All errors are preceded by this string.
-launcher.error=\u9519\u8BEF:\u0020
+launcher.error=错误:\u0020
 
-launcher.err.no.args=\u65E0\u6E90\u6587\u4EF6\u7684\u8DEF\u5F84
+launcher.err.no.args=无源文件的路径
 
-launcher.err.security.manager=\u65E0\u6CD5\u5728\u542F\u7528\u5B89\u5168\u7BA1\u7406\u5668\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u6E90\u4EE3\u7801\u542F\u52A8\u7A0B\u5E8F
+launcher.err.security.manager=无法在启用安全管理器的情况下使用源代码启动程序
 
 # 0: string
-launcher.err.invalid.filename=\u6E90\u6587\u4EF6\u7684\u8DEF\u5F84\u65E0\u6548\uFF1A{0}
+launcher.err.invalid.filename=源文件的路径无效：{0}
 
 # 0: path
-launcher.err.file.not.found=\u627E\u4E0D\u5230\u6E90\u6587\u4EF6\uFF1A{0}
+launcher.err.file.not.found=找不到源文件：{0}
 
-launcher.err.compilation.failed=\u7F16\u8BD1\u5931\u8D25
+launcher.err.compilation.failed=编译失败
 
-launcher.err.no.class=\u5728\u6E90\u6587\u4EF6\u4E2D\u672A\u58F0\u660E\u7C7B
+launcher.err.no.class=在源文件中未声明类
 
-launcher.err.main.not.public.static=''main'' \u65B9\u6CD5\u672A\u58F0\u660E ''public static''
+launcher.err.main.not.public.static=''main'' 方法未声明 ''public static''
 
-launcher.err.main.not.void=\u672A\u4F7F\u7528\u8FD4\u56DE\u7C7B\u578B ''void'' \u58F0\u660E ''main'' \u65B9\u6CD5
+launcher.err.main.not.void=未使用返回类型 ''void'' 声明 ''main'' 方法
 
 # 0: string
-launcher.err.cant.find.class=\u627E\u4E0D\u5230\u7C7B\uFF1A{0}
+launcher.err.cant.find.class=找不到类：{0}
 
 # 0: string
-launcher.err.cant.find.main.method=\u5728\u7C7B {0} \u4E2D\u627E\u4E0D\u5230 main(String[]) \u65B9\u6CD5
+launcher.err.cant.find.main.method=在类 {0} 中找不到 main(String[]) 方法
 
 # 0: string
-launcher.err.cant.access.main.method=\u65E0\u6CD5\u8BBF\u95EE\u7C7B {0} \u4E2D\u7684 main \u65B9\u6CD5
+launcher.err.cant.access.main.method=无法访问类 {0} 中的 main 方法
 
 # 0: string
-launcher.err.cant.find.constructor=\u5728\u7C7B {0} \u4E2D\u627E\u4E0D\u5230\u65E0\u53C2\u6570\u6784\u9020\u5668
+launcher.err.cant.find.constructor=在类 {0} 中找不到无参数构造器
 
 # 0: string
-launcher.err.cant.access.constructor=\u65E0\u6CD5\u8BBF\u95EE\u7C7B {0} \u4E2D\u7684\u65E0\u53C2\u6570\u6784\u9020\u5668
+launcher.err.cant.access.constructor=无法访问类 {0} 中的无参数构造器
 
 # 0: path, 1: object
-launcher.err.cant.read.file=\u8BFB\u53D6\u6E90\u6587\u4EF6 {0} \u65F6\u51FA\u9519\uFF1A{1}
+launcher.err.cant.read.file=读取源文件 {0} 时出错：{1}
 
 # 0: string
-launcher.err.no.value.for.option=\u6CA1\u6709\u4E3A\u9009\u9879 {0} \u6307\u5B9A\u503C
+launcher.err.no.value.for.option=没有为选项 {0} 指定值
 
 # 0: string
-launcher.err.invalid.value.for.source=--source \u9009\u9879\u7684\u503C\u65E0\u6548\uFF1A{0}\n
+launcher.err.invalid.value.for.source=--source 选项的值无效：{0}\n
 
-launcher.err.enable.preview.requires.source=--enable-preview \u5FC5\u987B\u4E0E --source \u4E00\u8D77\u4F7F\u7528
+launcher.err.enable.preview.requires.source=--enable-preview 必须与 --source 一起使用
diff --git a/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties
index fac9b7e1e2e..11c8b51dc53 100644
--- a/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties
+++ b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties
@@ -27,5 +27,5 @@ NotSerializable=Klasse {0} ist nicht serialisierbar.
 ClassNotFound=Klasse {0} nicht gefunden.
 error.parsing.classpath=Fehler beim Parsen von Classpath {0}.
 error.missing.classpath=Fehlendes Argument bei Option -classpath
-invalid.flag=Ung\u00FCltiges Flag {0}.
+invalid.flag=Ungültiges Flag {0}.
 usage=Verwendung: serialver [-classpath classpath] [classname...]
diff --git a/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_ja.properties b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_ja.properties
index 6899736c4ee..a92c8324681 100644
--- a/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_ja.properties
+++ b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_ja.properties
@@ -23,9 +23,9 @@
 # questions.
 #
 
-NotSerializable=\u30AF\u30E9\u30B9{0}\u306F\u76F4\u5217\u5316\u3067\u304D\u307E\u305B\u3093\u3002
-ClassNotFound=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-error.parsing.classpath=\u30AF\u30E9\u30B9\u30D1\u30B9{0}\u306E\u89E3\u6790\u30A8\u30E9\u30FC\u3067\u3059\u3002
-error.missing.classpath=-classpath\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-invalid.flag=\u7121\u52B9\u306A\u30D5\u30E9\u30B0{0}\u3002
-usage=\u4F7F\u7528\u65B9\u6CD5: serialver [-classpath classpath] [classname...]
+NotSerializable=クラス{0}は直列化できません。
+ClassNotFound=クラス{0}が見つかりません。
+error.parsing.classpath=クラスパス{0}の解析エラーです。
+error.missing.classpath=-classpathオプションの引数が見つかりません
+invalid.flag=無効なフラグ{0}。
+usage=使用方法: serialver [-classpath classpath] [classname...]
diff --git a/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties
index 804118ea733..994efca2408 100644
--- a/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties
@@ -23,9 +23,9 @@
 # questions.
 #
 
-NotSerializable=\u7C7B{0}\u65E0\u6CD5\u5E8F\u5217\u5316\u3002
-ClassNotFound=\u627E\u4E0D\u5230\u7C7B{0}\u3002
-error.parsing.classpath=\u5BF9\u7C7B\u8DEF\u5F84 {0} \u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u51FA\u9519\u3002
-error.missing.classpath=\u7F3A\u5C11 -classpath \u9009\u9879\u7684\u53C2\u6570
-invalid.flag=\u65E0\u6548\u6807\u8BB0{0}\u3002
-usage=\u7528\u6CD5: serialver [-classpath classpath] [classname...]
+NotSerializable=类{0}无法序列化。
+ClassNotFound=找不到类{0}。
+error.parsing.classpath=对类路径 {0} 进行语法分析时出错。
+error.missing.classpath=缺少 -classpath 选项的参数
+invalid.flag=无效标记{0}。
+usage=用法: serialver [-classpath classpath] [classname...]
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties
index e72f5370369..d366b3a6d6c 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties
@@ -29,14 +29,14 @@ usage.jwebserver=Verwendung: jwebserver [-b bind address] [-p port] [-d director
 
 version={0} {1}
 
-options=Optionen:\n-b, --bind-address    - Adresse, an die das Binding erfolgt. Standard: {0} (Loopback).\n                        Verwenden Sie f\u00FCr alle Schnittstellen "-b 0.0.0.0" oder "-b ::".\n-d, --directory       - Zu bedienendes Verzeichnis. Standard: Aktuelles Verzeichnis.\n-o, --output          - Ausgabeformat. none|info|verbose. Standard: info.\n-p, --port            - Port, auf dem gehorcht wird. Standard: 8000.\n-h, -?, --help        - Gibt diese Hilfemeldung aus und beendet.\n-version, --version   - Gibt Versionsinformationen aus und beendet.\nDr\u00FCcken Sie zum Stoppen des Servers Strg+C.
+options=Optionen:\n-b, --bind-address    - Adresse, an die das Binding erfolgt. Standard: {0} (Loopback).\n                        Verwenden Sie für alle Schnittstellen "-b 0.0.0.0" oder "-b ::".\n-d, --directory       - Zu bedienendes Verzeichnis. Standard: Aktuelles Verzeichnis.\n-o, --output          - Ausgabeformat. none|info|verbose. Standard: info.\n-p, --port            - Port, auf dem gehorcht wird. Standard: 8000.\n-h, -?, --help        - Gibt diese Hilfemeldung aus und beendet.\n-version, --version   - Gibt Versionsinformationen aus und beendet.\nDrücken Sie zum Stoppen des Servers Strg+C.
 
-opt.bindaddress=-b, --bind-address    - Adresse, an die das Binding erfolgt. Standard: {0} (Loopback).\n                        Verwenden Sie f\u00FCr alle Schnittstellen "-b 0.0.0.0" oder "-b ::".
+opt.bindaddress=-b, --bind-address    - Adresse, an die das Binding erfolgt. Standard: {0} (Loopback).\n                        Verwenden Sie für alle Schnittstellen "-b 0.0.0.0" oder "-b ::".
 opt.directory=-d, --directory       - Zu bedienendes Verzeichnis. Standard: Aktuelles Verzeichnis.
 opt.output=-o, --output          - Ausgabeformat. none|info|verbose. Standard: info.
 opt.port=-p, --port            - Port, auf dem gehorcht wird. Standard: 8000.
 
-loopback.info=Binding an Loopback als Standard. Verwenden Sie f\u00FCr alle Schnittstellen "-b 0.0.0.0" oder "-b ::".
+loopback.info=Binding an Loopback als Standard. Verwenden Sie für alle Schnittstellen "-b 0.0.0.0" oder "-b ::".
 
 msg.start.anylocal=Bedient {0} und Unterverzeichnisse auf 0.0.0.0 (alle Schnittstellen) Port {2}\nURL http://{1}:{2}/
 
@@ -45,10 +45,10 @@ msg.start.other=Bedient {0} und Unterverzeichnisse auf {1} Port {2}\nURL http://
 error.prefix=Fehler:
 
 err.unknown.option=unbekannte Option: {0}
-err.missing.arg=kein Wert angegeben f\u00FCr {0}
-err.invalid.arg=ung\u00FCltiger Wert angegeben f\u00FCr {0}: {1}
+err.missing.arg=kein Wert angegeben für {0}
+err.invalid.arg=ungültiger Wert angegeben für {0}: {1}
 err.server.config.failed=Serverkonfiguration nicht erfolgreich: {0}
 err.server.handle.failed=Handling des Serveraustauschs nicht erfolgreich: {0}
 
-html.dir.list=Verzeichnisliste f\u00FCr
+html.dir.list=Verzeichnisliste für
 html.not.found=Datei wurde nicht gefunden
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties
index 974707493a5..c00f65f42c9 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties
@@ -23,32 +23,32 @@
 # questions.
 #
 
-usage.java=\u4F7F\u7528\u65B9\u6CD5: java -m jdk.httpserver [-b bind address] [-p port] [-d directory]\n                              [-o none|info|verbose] [-h to show options]\n                              [-version to show version information]
+usage.java=使用方法: java -m jdk.httpserver [-b bind address] [-p port] [-d directory]\n                              [-o none|info|verbose] [-h to show options]\n                              [-version to show version information]
 
-usage.jwebserver=\u4F7F\u7528\u65B9\u6CD5: jwebserver [-b bind address] [-p port] [-d directory]\n                  [-o none|info|verbose] [-h to show options]\n                  [-version to show version information]
+usage.jwebserver=使用方法: jwebserver [-b bind address] [-p port] [-d directory]\n                  [-o none|info|verbose] [-h to show options]\n                  [-version to show version information]
 
 version={0} {1}
 
-options=\u30AA\u30D7\u30B7\u30E7\u30F3:\n-b, --bind-address    - \u30D0\u30A4\u30F3\u30C9\u5148\u30A2\u30C9\u30EC\u30B9\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: {0} (\u30EB\u30FC\u30D7\u30D0\u30C3\u30AF)\u3002\n                        \u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067"-b 0.0.0.0"\u307E\u305F\u306F"-b ::"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\n-d, --directory       - \u4F7F\u7528\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: \u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\n-o, --output          - \u51FA\u529B\u5F62\u5F0F\u3002none|info|verbose\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: info\u3002\n-p, --port            - \u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30DD\u30FC\u30C8\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: 8000\u3002\n-h, -?, --help        - \u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\u3002\n-version, --version   - \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\u3002\n\u30B5\u30FC\u30D0\u30FC\u3092\u505C\u6B62\u3059\u308B\u306B\u306F\u3001[Ctrl]+[C]\u3092\u62BC\u3057\u307E\u3059\u3002
+options=オプション:\n-b, --bind-address    - バインド先アドレス。デフォルト: {0} (ループバック)。\n                        すべてのインタフェースで"-b 0.0.0.0"または"-b ::"を使用します。\n-d, --directory       - 使用するディレクトリ。デフォルト: 現在のディレクトリ。\n-o, --output          - 出力形式。none|info|verbose。デフォルト: info。\n-p, --port            - リスニングするポート。デフォルト: 8000。\n-h, -?, --help        - ヘルプ・メッセージを出力して終了します。\n-version, --version   - バージョン情報を出力して終了します。\nサーバーを停止するには、[Ctrl]+[C]を押します。
 
-opt.bindaddress=-b, --bind-address    - \u30D0\u30A4\u30F3\u30C9\u5148\u30A2\u30C9\u30EC\u30B9\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: {0} (\u30EB\u30FC\u30D7\u30D0\u30C3\u30AF).\n                        \u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067"-b 0.0.0.0"\u307E\u305F\u306F"-b ::"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
-opt.directory=-d, --directory       - \u4F7F\u7528\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: \u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002
-opt.output=-o, --output          - \u51FA\u529B\u5F62\u5F0F\u3002none|info|verbose. \u30C7\u30D5\u30A9\u30EB\u30C8: info\u3002
-opt.port=-p, --port            - \u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30DD\u30FC\u30C8\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: 8000\u3002
+opt.bindaddress=-b, --bind-address    - バインド先アドレス。デフォルト: {0} (ループバック).\n                        すべてのインタフェースで"-b 0.0.0.0"または"-b ::"を使用します。
+opt.directory=-d, --directory       - 使用するディレクトリ。デフォルト: 現在のディレクトリ。
+opt.output=-o, --output          - 出力形式。none|info|verbose. デフォルト: info。
+opt.port=-p, --port            - リスニングするポート。デフォルト: 8000。
 
-loopback.info=\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u30EB\u30FC\u30D7\u30D0\u30C3\u30AF\u306B\u30D0\u30A4\u30F3\u30C9\u3057\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067"-b 0.0.0.0"\u307E\u305F\u306F"-b ::"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+loopback.info=デフォルトでループバックにバインドします。すべてのインタフェースで"-b 0.0.0.0"または"-b ::"を使用します。
 
-msg.start.anylocal={0}\u304A\u3088\u3073\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30920.0.0.0 (\u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9)\u30DD\u30FC\u30C8{2}\u3067\u4F7F\u7528\u3057\u307E\u3059\nURL http://{1}:{2}/
+msg.start.anylocal={0}およびサブディレクトリを0.0.0.0 (すべてのインタフェース)ポート{2}で使用します\nURL http://{1}:{2}/
 
-msg.start.other={0}\u304A\u3088\u3073\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092{1}\u30DD\u30FC\u30C8{2}\u3067\u4F7F\u7528\u3057\u307E\u3059\nURL http://{1}:{2}/
+msg.start.other={0}およびサブディレクトリを{1}ポート{2}で使用します\nURL http://{1}:{2}/
 
-error.prefix=\u30A8\u30E9\u30FC:
+error.prefix=エラー:
 
-err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
-err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-err.invalid.arg={0}\u306B\u7121\u52B9\u306A\u5024\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F: {1}
-err.server.config.failed=\u30B5\u30FC\u30D0\u30FC\u306E\u69CB\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
-err.server.handle.failed=\u30B5\u30FC\u30D0\u30FC\u4EA4\u63DB\u51E6\u7406\u304C\u5931\u6557\u3057\u307E\u3057\u305F: {0}
+err.unknown.option=不明なオプション: {0}
+err.missing.arg={0}に値が指定されていません
+err.invalid.arg={0}に無効な値が指定されました: {1}
+err.server.config.failed=サーバーの構成に失敗しました: {0}
+err.server.handle.failed=サーバー交換処理が失敗しました: {0}
 
-html.dir.list=\u6B21\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30EA\u30B9\u30C8
-html.not.found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
+html.dir.list=次のディレクトリ・リスト
+html.not.found=ファイルが見つかりませんでした
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties
index 1d35a7ecd1b..30b778f7c53 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties
@@ -23,32 +23,32 @@
 # questions.
 #
 
-usage.java=\u7528\u6CD5\uFF1Ajava -m jdk.httpserver [-b \u7ED1\u5B9A\u5730\u5740] [-p \u7AEF\u53E3] [-d \u76EE\u5F55]\n                              [-o none|info|verbose] [-h \u663E\u793A\u9009\u9879]\n                              [-version \u663E\u793A\u7248\u672C\u4FE1\u606F]
+usage.java=用法：java -m jdk.httpserver [-b 绑定地址] [-p 端口] [-d 目录]\n                              [-o none|info|verbose] [-h 显示选项]\n                              [-version 显示版本信息]
 
-usage.jwebserver=\u7528\u6CD5\uFF1Ajwebserver [-b \u7ED1\u5B9A\u5730\u5740] [-p \u7AEF\u53E3] [-d \u76EE\u5F55]\n                              [-o none|info|verbose] [-h \u663E\u793A\u9009\u9879]\n                              [-version \u663E\u793A\u7248\u672C\u4FE1\u606F]
+usage.jwebserver=用法：jwebserver [-b 绑定地址] [-p 端口] [-d 目录]\n                              [-o none|info|verbose] [-h 显示选项]\n                              [-version 显示版本信息]
 
 version={0} {1}
 
-options=\u9009\u9879\uFF1A\n-b, --bind-address    - \u8981\u7ED1\u5B9A\u5230\u7684\u5730\u5740\u3002\u9ED8\u8BA4\u503C\uFF1A{0}\uFF08\u73AF\u56DE\uFF09\u3002\n                        \u5982\u679C\u8981\u8868\u793A\u6240\u6709\u63A5\u53E3\uFF0C\u8BF7\u4F7F\u7528 "-b 0.0.0.0" \u6216 "-b ::"\u3002\n-d, --directory       - \u8981\u4E3A\u5176\u63D0\u4F9B\u670D\u52A1\u7684\u76EE\u5F55\u3002\u9ED8\u8BA4\u503C\uFF1A\u5F53\u524D\u76EE\u5F55\u3002\n-o, --output          - \u8F93\u51FA\u683C\u5F0F\u3002none|info|verbose\u3002\u9ED8\u8BA4\u503C\uFF1Ainfo\u3002\n-p, --port            - \u8981\u76D1\u542C\u7684\u7AEF\u53E3\u3002\u9ED8\u8BA4\u503C\uFF1A8000\u3002\n-h, -?, --help        - \u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F\u5E76\u9000\u51FA\u3002\n-version, --version   - \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u9000\u51FA\u3002\n\u8981\u505C\u6B62\u670D\u52A1\u5668\uFF0C\u8BF7\u6309 Ctrl + C\u3002
+options=选项：\n-b, --bind-address    - 要绑定到的地址。默认值：{0}（环回）。\n                        如果要表示所有接口，请使用 "-b 0.0.0.0" 或 "-b ::"。\n-d, --directory       - 要为其提供服务的目录。默认值：当前目录。\n-o, --output          - 输出格式。none|info|verbose。默认值：info。\n-p, --port            - 要监听的端口。默认值：8000。\n-h, -?, --help        - 输出此帮助消息并退出。\n-version, --version   - 输出版本信息并退出。\n要停止服务器，请按 Ctrl + C。
 
-opt.bindaddress=-b, --bind-address    - \u8981\u7ED1\u5B9A\u5230\u7684\u5730\u5740\u3002\u9ED8\u8BA4\u503C\uFF1A{0}\uFF08\u73AF\u56DE\uFF09\u3002\n                        \u5982\u679C\u8981\u8868\u793A\u6240\u6709\u63A5\u53E3\uFF0C\u8BF7\u4F7F\u7528 "-b 0.0.0.0" \u6216 "-b ::"\u3002
-opt.directory=-d, --directory       - \u8981\u4E3A\u5176\u63D0\u4F9B\u670D\u52A1\u7684\u76EE\u5F55\u3002\u9ED8\u8BA4\u503C\uFF1A\u5F53\u524D\u76EE\u5F55\u3002
-opt.output=-o, --output          - \u8F93\u51FA\u683C\u5F0F\u3002none|info|verbose\u3002\u9ED8\u8BA4\u503C\uFF1Ainfo\u3002
-opt.port=-p, --port            - \u8981\u76D1\u542C\u7684\u7AEF\u53E3\u3002\u9ED8\u8BA4\u503C\uFF1A8000\u3002
+opt.bindaddress=-b, --bind-address    - 要绑定到的地址。默认值：{0}（环回）。\n                        如果要表示所有接口，请使用 "-b 0.0.0.0" 或 "-b ::"。
+opt.directory=-d, --directory       - 要为其提供服务的目录。默认值：当前目录。
+opt.output=-o, --output          - 输出格式。none|info|verbose。默认值：info。
+opt.port=-p, --port            - 要监听的端口。默认值：8000。
 
-loopback.info=\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u7ED1\u5B9A\u5230\u73AF\u56DE\u3002\u5982\u679C\u8981\u8868\u793A\u6240\u6709\u63A5\u53E3\uFF0C\u8BF7\u4F7F\u7528 "-b 0.0.0.0" \u6216 "-b ::"\u3002
+loopback.info=默认情况下绑定到环回。如果要表示所有接口，请使用 "-b 0.0.0.0" 或 "-b ::"。
 
-msg.start.anylocal=\u4E3A 0.0.0.0\uFF08\u6240\u6709\u63A5\u53E3\uFF09\u7AEF\u53E3 {2} \u4E0A\u7684 {0} \u53CA\u5B50\u76EE\u5F55\u63D0\u4F9B\u670D\u52A1\nURL http://{1}:{2}/
+msg.start.anylocal=为 0.0.0.0（所有接口）端口 {2} 上的 {0} 及子目录提供服务\nURL http://{1}:{2}/
 
-msg.start.other=\u4E3A {1} \u7AEF\u53E3 {2} \u4E0A\u7684 {0} \u53CA\u5B50\u76EE\u5F55\u63D0\u4F9B\u670D\u52A1\nURL http://{1}:{2}/
+msg.start.other=为 {1} 端口 {2} 上的 {0} 及子目录提供服务\nURL http://{1}:{2}/
 
-error.prefix=\u9519\u8BEF:
+error.prefix=错误:
 
-err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
-err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
-err.invalid.arg=\u4E3A {0} \u63D0\u4F9B\u7684\u503C\u65E0\u6548\uFF1A{1}
-err.server.config.failed=\u670D\u52A1\u5668\u914D\u7F6E\u5931\u8D25\uFF1A{0}
-err.server.handle.failed=\u670D\u52A1\u5668\u4EA4\u6362\u5904\u7406\u5931\u8D25\uFF1A{0}
+err.unknown.option=未知选项: {0}
+err.missing.arg=没有为{0}指定值
+err.invalid.arg=为 {0} 提供的值无效：{1}
+err.server.config.failed=服务器配置失败：{0}
+err.server.handle.failed=服务器交换处理失败：{0}
 
-html.dir.list=\u4EE5\u4E0B\u9879\u7684\u76EE\u5F55\u5217\u8868
-html.not.found=\u627E\u4E0D\u5230\u6587\u4EF6
+html.dir.list=以下项的目录列表
+html.not.found=找不到文件
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ExceptionMessages.properties b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ExceptionMessages.properties
index c12fc25bb33..627096b18a2 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ExceptionMessages.properties
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/ExceptionMessages.properties
@@ -41,4 +41,4 @@ jdk.internal.joptsimple.util.PathConverter.file.not.existing.message = File [{0}
 jdk.internal.joptsimple.util.PathConverter.file.overwritable.message = File [{0}] is not overwritable
 jdk.internal.joptsimple.util.PathConverter.file.readable.message = File [{0}] is not readable
 jdk.internal.joptsimple.util.PathConverter.file.writable.message = File [{0}] is not writable
-jdk.internal.joptsimple.util.InetAddressConverter.message = Cannot convert value [{0}] into an InetAddress
\ No newline at end of file
+jdk.internal.joptsimple.util.InetAddressConverter.message = Cannot convert value [{0}] into an InetAddress
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
index 25a9e54179e..85f8bb9fe29 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
@@ -25,111 +25,111 @@
 
 ## tool
 
-jar.description=Archiv f\u00FCr Klassen und Ressourcen erstellen und individuelle Klassen oder Ressourcen aus einem Archiv \u00E4ndern oder wiederherstellen
+jar.description=Archiv für Klassen und Ressourcen erstellen und individuelle Klassen oder Ressourcen aus einem Archiv ändern oder wiederherstellen
 
-error.multiple.main.operations=Es ist nicht m\u00F6glich, mehrere "-cuxtid"-Optionen anzugeben
-error.cant.open=\u00D6ffnen nicht m\u00F6glich: {0}
-error.illegal.option=Unzul\u00E4ssige Option: {0}
+error.multiple.main.operations=Es ist nicht möglich, mehrere "-cuxtid"-Optionen anzugeben
+error.cant.open=Öffnen nicht möglich: {0}
+error.illegal.option=Unzulässige Option: {0}
 error.unrecognized.option=Unbekannte Option: {0}
-error.missing.arg=F\u00FCr die Option {0} ist ein Argument erforderlich
+error.missing.arg=Für die Option {0} ist ein Argument erforderlich
 error.bad.file.arg=Fehler beim Parsen der Dateiargumente
 error.bad.option=Eine der Optionen -{ctxuid} oder --validate muss angegeben werden.
 error.bad.cflag=Kennzeichen "c" erfordert Angabe von Manifest oder Eingabedateien.
 error.bad.uflag=Kennzeichen "u" erfordert Angabe von Manifest, Kennzeichen "e" oder Eingabedateien.
-error.bad.eflag=Kennzeichen "e" und Manifest mit dem Attribut "Main-Class" k\u00F6nnen nicht zusammen angegeben\nwerden.
-error.bad.dflag=F\u00FCr die Option "-d, --describe-module" m\u00FCssen keine Eingabedateien angegeben werden
+error.bad.eflag=Kennzeichen "e" und Manifest mit dem Attribut "Main-Class" können nicht zusammen angegeben\nwerden.
+error.bad.dflag=Für die Option "-d, --describe-module" müssen keine Eingabedateien angegeben werden
 error.bad.reason=Schlechter Grund: {0}, Grund muss entweder "deprecated", "deprecated-for-removal" oder "incubating" sein
 error.nosuch.fileordir={0}: Datei oder Verzeichnis nicht vorhanden
 error.write.file=Fehler beim Schreiben in vorhandener JAR-Datei
 error.create.dir={0}: Verzeichnis konnte nicht erstellt werden
-error.incorrect.length=Falsche L\u00E4nge bei der Verarbeitung: {0}
-error.create.tempfile=Es konnte keine tempor\u00E4re Datei erstellt werden
-error.hash.dep=Abh\u00E4ngigkeiten bei Hashing-Modul {0}. Modul {1} kann nicht im Modulpfad gefunden werden
+error.incorrect.length=Falsche Länge bei der Verarbeitung: {0}
+error.create.tempfile=Es konnte keine temporäre Datei erstellt werden
+error.hash.dep=Abhängigkeiten bei Hashing-Modul {0}. Modul {1} kann nicht im Modulpfad gefunden werden
 error.module.options.without.info=--module-version oder --hash-modules ohne module-info.class
-error.no.operative.descriptor=Kein operativer Deskriptor f\u00FCr Release: {0}
+error.no.operative.descriptor=Kein operativer Deskriptor für Release: {0}
 error.no.root.descriptor=Kein Root-Moduldeskriptor. Geben Sie --release an
-error.unable.derive.automodule=Moduldeskriptor kann nicht abgeleitet werden f\u00FCr: {0}
+error.unable.derive.automodule=Moduldeskriptor kann nicht abgeleitet werden für: {0}
 error.unexpected.module-info=Unerwarteter Moduldeskriptor {0}
 error.module.descriptor.not.found=Moduldeskriptor nicht gefunden
-error.invalid.versioned.module.attribute=Ung\u00FCltiges Moduldeskriptorattribut {0}
+error.invalid.versioned.module.attribute=Ungültiges Moduldeskriptorattribut {0}
 error.missing.provider=Serviceprovider nicht gefunden: {0}
-error.release.value.notnumber=Release {0} nicht g\u00FCltig
-error.release.value.toosmall=Release {0} nicht g\u00FCltig, muss >= 9 sein
-error.release.unexpected.versioned.entry=Unerwarteter versionierte Eintrag {0} f\u00FCr Release {1}
-error.date.notvalid=Datum {0} ist keine g\u00FCltige erweiterte Datums-/Uhrzeitangabe mit Zeitunterschied und optionaler Zeitzone nach ISO-8601
-error.date.out.of.range=Datum {0} liegt nicht im g\u00FCltigen Bereich 1980-01-01T00:00:02Z bis 2099-12-31T23:59:59Z
+error.release.value.notnumber=Release {0} nicht gültig
+error.release.value.toosmall=Release {0} nicht gültig, muss >= 9 sein
+error.release.unexpected.versioned.entry=Unerwarteter versionierte Eintrag {0} für Release {1}
+error.date.notvalid=Datum {0} ist keine gültige erweiterte Datums-/Uhrzeitangabe mit Zeitunterschied und optionaler Zeitzone nach ISO-8601
+error.date.out.of.range=Datum {0} liegt nicht im gültigen Bereich 1980-01-01T00:00:02Z bis 2099-12-31T23:59:59Z
 error.validator.jarfile.exception={0} kann nicht validiert werden: {1}
-error.validator.jarfile.invalid=ung\u00FCltige Multi-Release-JAR-Datei {0} gel\u00F6scht
+error.validator.jarfile.invalid=ungültige Multi-Release-JAR-Datei {0} gelöscht
 error.validator.bad.entry.name=Eintragsname hat das falsche Format, {0}
 error.validator.version.notnumber=Eintragsname {0} hat keine Versionsnummer
 error.validator.entryname.tooshort=Eintragsname {0} zu kurz, kein Verzeichnis
 error.validator.isolated.nested.class=Eintrag {0} ist eine isolierte verschachtelte Klasse
-error.validator.new.public.class=Eintrag {0} enth\u00E4lt eine neue \u00F6ffentliche Klasse, die in Basiseintr\u00E4gen nicht gefunden wird
-error.validator.incompatible.class.version=Eintrag {0} weist eine Klassenversion auf, die mit einer fr\u00FCheren Version inkompatibel ist
-error.validator.different.api=Eintrag {0} enth\u00E4lt eine Klasse mit einer anderen API als in der fr\u00FCheren Version
-error.validator.names.mismatch=Eintrag {0} enth\u00E4lt eine Klasse mit dem internen Namen {1}, Namen stimmen nicht \u00FCberein
-error.validator.info.name.notequal=module-info.class in einem versionierten Verzeichnis enth\u00E4lt falschen Namen
-error.validator.info.requires.transitive=module-info.class in einem versionierten Verzeichnis enth\u00E4lt zus\u00E4tzlichen "requires transitive"
-error.validator.info.requires.added=module-info.class in einem versionierten Verzeichnis enth\u00E4lt zus\u00E4tzlichen "requires"
-error.validator.info.requires.dropped=module-info.class in einem versionierten Verzeichnis enth\u00E4lt fehlenden "requires"
-error.validator.info.exports.notequal=module-info.class in einem versionierten Verzeichnis enth\u00E4lt unterschiedliche "exports"
-error.validator.info.opens.notequal=module-info.class in einem versionierten Verzeichnis enth\u00E4lt unterschiedliche "opens"
-error.validator.info.provides.notequal=module-info.class in einem versionierten Verzeichnis enth\u00E4lt unterschiedliche "provides"
-error.validator.info.version.notequal={0}: module-info.class in einem versionierten Verzeichnis enth\u00E4lt unterschiedlichen "version"-Wert
-error.validator.info.manclass.notequal={0}: module-info.class in einem versionierten Verzeichnis enth\u00E4lt unterschiedlichen "main-class"-Wert
-warn.validator.identical.entry=Warnung: Eintrag {0} enth\u00E4lt eine Klasse, die mit\neinem bereits in der JAR-Datei enthaltenen Eintrag identisch ist
+error.validator.new.public.class=Eintrag {0} enthält eine neue öffentliche Klasse, die in Basiseinträgen nicht gefunden wird
+error.validator.incompatible.class.version=Eintrag {0} weist eine Klassenversion auf, die mit einer früheren Version inkompatibel ist
+error.validator.different.api=Eintrag {0} enthält eine Klasse mit einer anderen API als in der früheren Version
+error.validator.names.mismatch=Eintrag {0} enthält eine Klasse mit dem internen Namen {1}, Namen stimmen nicht überein
+error.validator.info.name.notequal=module-info.class in einem versionierten Verzeichnis enthält falschen Namen
+error.validator.info.requires.transitive=module-info.class in einem versionierten Verzeichnis enthält zusätzlichen "requires transitive"
+error.validator.info.requires.added=module-info.class in einem versionierten Verzeichnis enthält zusätzlichen "requires"
+error.validator.info.requires.dropped=module-info.class in einem versionierten Verzeichnis enthält fehlenden "requires"
+error.validator.info.exports.notequal=module-info.class in einem versionierten Verzeichnis enthält unterschiedliche "exports"
+error.validator.info.opens.notequal=module-info.class in einem versionierten Verzeichnis enthält unterschiedliche "opens"
+error.validator.info.provides.notequal=module-info.class in einem versionierten Verzeichnis enthält unterschiedliche "provides"
+error.validator.info.version.notequal={0}: module-info.class in einem versionierten Verzeichnis enthält unterschiedlichen "version"-Wert
+error.validator.info.manclass.notequal={0}: module-info.class in einem versionierten Verzeichnis enthält unterschiedlichen "main-class"-Wert
+warn.validator.identical.entry=Warnung: Eintrag {0} enthält eine Klasse, die mit\neinem bereits in der JAR-Datei enthaltenen Eintrag identisch ist
 warn.validator.resources.with.same.name=Warnung: Eintrag {0}, mehrere Ressourcen mit demselben Namen
-warn.validator.concealed.public.class=Warnung: Eintrag {0} ist eine \u00F6ffentliche Klasse\nin einem verdeckten Package. Wenn Sie diese JAR-Datei in den Classpath einf\u00FCgen, kommt es\nzu nicht kompatiblen \u00F6ffentlichen Schnittstellen
+warn.validator.concealed.public.class=Warnung: Eintrag {0} ist eine öffentliche Klasse\nin einem verdeckten Package. Wenn Sie diese JAR-Datei in den Classpath einfügen, kommt es\nzu nicht kompatiblen öffentlichen Schnittstellen
 warn.release.unexpected.versioned.entry=Unerwarteter versionierter Eintrag {0}
 warn.index.is.ignored=Der JAR-Index (META-INF/INDEX.LIST) wird seit JDK 18 zur Laufzeit ignoriert
-warn.flag.is.deprecated=Warnung: Die Option {0} ist veraltet und wird m\u00F6glicherweise ignoriert oder in einem zuk\u00FCnftigen Release entfernt\n
-out.added.manifest=Manifest wurde hinzugef\u00FCgt
-out.added.module-info=module-info hinzugef\u00FCgt: {0}
+warn.flag.is.deprecated=Warnung: Die Option {0} ist veraltet und wird möglicherweise ignoriert oder in einem zukünftigen Release entfernt\n
+out.added.manifest=Manifest wurde hinzugefügt
+out.added.module-info=module-info hinzugefügt: {0}
 out.automodule=Kein Moduldeskriptor gefunden. Automatisches Modul wurde abgeleitet.
 out.update.manifest=Manifest wurde aktualisiert
 out.update.module-info=module-info aktualisiert: {0}
 out.ignore.entry=Eintrag {0} wird ignoriert
-out.adding={0} wird hinzugef\u00FCgt
+out.adding={0} wird hinzugefügt
 out.deflated=({0} % verkleinert)
 out.stored=(0 % gespeichert)
 out.create=\  erstellt: {0}
 out.extracted=extrahiert: {0}
-out.inflated=\ vergr\u00F6\u00DFert: {0}
+out.inflated=\ vergrößert: {0}
 out.size=(ein = {0}) (aus = {1})
 
-usage.compat=Kompatibilit\u00E4tsschnittstelle\nVerwendung: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...\nOptionen:\n    -c  erstellt ein neues Archiv (einschlie\u00DFlich fehlender \u00FCbergeordneter Verzeichnisse)\n    -t  listet das Inhaltsverzeichnis f\u00FCr das Archiv auf\n    -x  extrahiert die benannten (oder alle) Dateien aus dem Archiv\n    -u  aktualisiert ein vorhandenes Archiv\n    -v  generiert Verbose-Ausgabe zur Standardausgabe\n    -f  gibt den Archivdateinamen an\n    -m  schlie\u00DFt Manifestinformationen aus der angegebenen Manifestdatei ein\n    -e  gibt den Anwendungseinstiegspunkt f\u00FCr Standalone-Anwendungen an,\n        die in einer ausf\u00FChrbaren JAR-Datei geb\u00FCndelt sind\n    -0  speichert nur, keine ZIP-Komprimierung\n    -P  beh\u00E4lt die vorangestellten Komponenten "/" (absoluter Pfad) und ".." (\u00FCbergeordnetes Verzeichnis) aus Dateinamen bei\n    -M  generiert keine Manifestdatei f\u00FCr die Eintr\u00E4ge\n    -i  generiert Indexinformationen f\u00FCr die angegebenen JAR-Dateien\n    -C  wechselt zum angegebenen Verzeichnis und schlie\u00DFt die folgende Datei ein\nDateien, die Verzeichnisse sind, werden rekursiv verarbeitet.\nDie Namen der Manifestdatei, der Archivdatei und des Einstiegspunkts werden\nin der gleichen Reihenfolge wie die Flags "m", "f" und "e" angegeben.\n\nBeispiel 1: Zwei Klassendateien in einem Archiv namens classes.jar archivieren: \n       jar cvf classes.jar Foo.class Bar.class \nBeispiel 2: Die vorhandene Manifestdatei "mymanifest" verwenden und alle\n           Dateien im Verzeichnis "foo/" in "classes.jar" archivieren: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
+usage.compat=Kompatibilitätsschnittstelle\nVerwendung: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...\nOptionen:\n    -c  erstellt ein neues Archiv (einschließlich fehlender übergeordneter Verzeichnisse)\n    -t  listet das Inhaltsverzeichnis für das Archiv auf\n    -x  extrahiert die benannten (oder alle) Dateien aus dem Archiv\n    -u  aktualisiert ein vorhandenes Archiv\n    -v  generiert Verbose-Ausgabe zur Standardausgabe\n    -f  gibt den Archivdateinamen an\n    -m  schließt Manifestinformationen aus der angegebenen Manifestdatei ein\n    -e  gibt den Anwendungseinstiegspunkt für Standalone-Anwendungen an,\n        die in einer ausführbaren JAR-Datei gebündelt sind\n    -0  speichert nur, keine ZIP-Komprimierung\n    -P  behält die vorangestellten Komponenten "/" (absoluter Pfad) und ".." (übergeordnetes Verzeichnis) aus Dateinamen bei\n    -M  generiert keine Manifestdatei für die Einträge\n    -i  generiert Indexinformationen für die angegebenen JAR-Dateien\n    -C  wechselt zum angegebenen Verzeichnis und schließt die folgende Datei ein\nDateien, die Verzeichnisse sind, werden rekursiv verarbeitet.\nDie Namen der Manifestdatei, der Archivdatei und des Einstiegspunkts werden\nin der gleichen Reihenfolge wie die Flags "m", "f" und "e" angegeben.\n\nBeispiel 1: Zwei Klassendateien in einem Archiv namens classes.jar archivieren: \n       jar cvf classes.jar Foo.class Bar.class \nBeispiel 2: Die vorhandene Manifestdatei "mymanifest" verwenden und alle\n           Dateien im Verzeichnis "foo/" in "classes.jar" archivieren: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
 
 main.usage.summary=Verwendung: jar [OPTION...] [ [--release VERSION] [-C dir] Dateien] ...
 main.usage.summary.try=Verwenden Sie "jar --help", um weitere Informationen anzuzeigen.
 
-main.help.preopt=Verwendung: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar erstellt ein Archiv f\u00FCr Klassen und Ressourcen und kann individuelle\nKlassen oder Ressourcen aus einem Archiv bearbeiten oder wiederherstellen.\n\n Beispiele:\n # Ein Archiv namens classes.jar mit zwei Klassendateien erstellen:\n jar --create --file classes.jar Foo.class Bar.class\n # Ein Archiv mit einem vorhandenen Manifest mit allen Dateien in foo/ erstellen:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # Ein modulares JAR-Archiv erstellen, dessen Moduldeskriptor sich in\n # classes/module-info.class befindet:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # Ein vorhandenes nicht modulares JAR-Archiv in ein modulares JAR-Archiv aktualisieren:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # Multi-Release-JAR-Datei erstellen, wobei einige Dateien im Verzeichnis META-INF/versions/9 gespeichert werden:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\nUm den "jar"-Befehl zu k\u00FCrzen oder zu vereinfachen, k\u00F6nnen Sie Argumente in einer separaten\nTextdatei angeben und diese mit dem @-Zeichen als Pr\u00E4fix an den "jar"-Befehl \u00FCbergeben.\n\n Beispiele:\n # Zus\u00E4tzliche Optionen und Liste der Klassendateien aus der Datei classes.list lesen\n jar --create --file my.jar @classes.list\n
+main.help.preopt=Verwendung: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar erstellt ein Archiv für Klassen und Ressourcen und kann individuelle\nKlassen oder Ressourcen aus einem Archiv bearbeiten oder wiederherstellen.\n\n Beispiele:\n # Ein Archiv namens classes.jar mit zwei Klassendateien erstellen:\n jar --create --file classes.jar Foo.class Bar.class\n # Ein Archiv mit einem vorhandenen Manifest mit allen Dateien in foo/ erstellen:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # Ein modulares JAR-Archiv erstellen, dessen Moduldeskriptor sich in\n # classes/module-info.class befindet:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # Ein vorhandenes nicht modulares JAR-Archiv in ein modulares JAR-Archiv aktualisieren:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # Multi-Release-JAR-Datei erstellen, wobei einige Dateien im Verzeichnis META-INF/versions/9 gespeichert werden:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\nUm den "jar"-Befehl zu kürzen oder zu vereinfachen, können Sie Argumente in einer separaten\nTextdatei angeben und diese mit dem @-Zeichen als Präfix an den "jar"-Befehl übergeben.\n\n Beispiele:\n # Zusätzliche Optionen und Liste der Klassendateien aus der Datei classes.list lesen\n jar --create --file my.jar @classes.list\n
 main.help.opt.main=\ Hauptvorgangsmodus:\n
-main.help.opt.main.create=\  -c, --create               Erstellt das Archiv. Wenn der mit\n                             -f oder --file angegebene Archivdateiname einen Pfad enth\u00E4lt, werden auch fehlende\n                             \u00FCbergeordnete Verzeichnisse erstellt
-main.help.opt.main.generate-index=\  -i, --generate-index=FILE  Generiert Indexinformationen f\u00FCr die angegebenen\n                             JAR-Archive. Diese Option ist veraltet und wird m\u00F6glicherweise in \n                             einem zuk\u00FCnftigen Release entfernt.
-main.help.opt.main.list=\  -t, --list                 Das Inhaltsverzeichnis f\u00FCr das Archiv auflisten
+main.help.opt.main.create=\  -c, --create               Erstellt das Archiv. Wenn der mit\n                             -f oder --file angegebene Archivdateiname einen Pfad enthält, werden auch fehlende\n                             übergeordnete Verzeichnisse erstellt
+main.help.opt.main.generate-index=\  -i, --generate-index=FILE  Generiert Indexinformationen für die angegebenen\n                             JAR-Archive. Diese Option ist veraltet und wird möglicherweise in \n                             einem zukünftigen Release entfernt.
+main.help.opt.main.list=\  -t, --list                 Das Inhaltsverzeichnis für das Archiv auflisten
 main.help.opt.main.update=\  -u, --update               Ein vorhandenes JAR-Archiv aktualisieren
 main.help.opt.main.extract=\  -x, --extract              Benannte (oder alle) Dateien aus dem Archiv extrahieren
 main.help.opt.main.describe-module=\  -d, --describe-module      Gibt den Moduldeskriptor oder automatischen Modulnamen aus
-main.help.opt.main.validate=\      --validate             Validiert den Inhalt des JAR-Archivs. Diese Option\n                             validiert, dass die von einem Multi-Release-JAR-Archiv\n                             exportierte API \u00FCber die verschiedenen Releaseversionen\n                             hinweg konsistent ist.
-main.help.opt.any=\ In jedem Modus g\u00FCltige Vorgangsmodifikatoren:\n\n  -C DIR                     Zum angegebenen Verzeichnis wechseln und die folgende\n                             Datei aufnehmen
+main.help.opt.main.validate=\      --validate             Validiert den Inhalt des JAR-Archivs. Diese Option\n                             validiert, dass die von einem Multi-Release-JAR-Archiv\n                             exportierte API über die verschiedenen Releaseversionen\n                             hinweg konsistent ist.
+main.help.opt.any=\ In jedem Modus gültige Vorgangsmodifikatoren:\n\n  -C DIR                     Zum angegebenen Verzeichnis wechseln und die folgende\n                             Datei aufnehmen
 main.help.opt.any.file=\  -f, --file=FILE            Der Name der Archivdatei. Wenn Sie dies auslassen, wird entweder stdin oder\n                             stdout verwendet, je nach Vorgang\n      --release VERSION      Speichert alle der folgenden Dateien in einem versionierten Verzeichnis\n                             der JAR-Datei (d.h. META-INF/versions/VERSION/)
 main.help.opt.any.verbose=\  -v, --verbose              Verbose-Ausgabe bei Standardausgabe generieren
-main.help.opt.create=\ Vorgangsmodifikatoren, die nur im Erstellungsmodus g\u00FCltig sind:\n
-main.help.opt.create.normalize=\  -n, --normalize            Normalisiert Informationen im neuen JAR-Archiv\n                             nach der Erstellung. Diese Option ist veraltet, und ihre\n                             Entfernung in einem k\u00FCnftigen JDK-Release ist geplant
-main.help.opt.create.update=\ Vorgangsmodifikatoren, die nur im Erstellungs- und Aktualisierungsmodus g\u00FCltig sind:\n
-main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME Der Anwendungseinstiegspunkt f\u00FCr Standalone-\n                             Anwendungen, die in einem modularen oder ausf\u00FChrbaren\n                             JAR-Archiv geb\u00FCndelt sind
+main.help.opt.create=\ Vorgangsmodifikatoren, die nur im Erstellungsmodus gültig sind:\n
+main.help.opt.create.normalize=\  -n, --normalize            Normalisiert Informationen im neuen JAR-Archiv\n                             nach der Erstellung. Diese Option ist veraltet, und ihre\n                             Entfernung in einem künftigen JDK-Release ist geplant
+main.help.opt.create.update=\ Vorgangsmodifikatoren, die nur im Erstellungs- und Aktualisierungsmodus gültig sind:\n
+main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME Der Anwendungseinstiegspunkt für Standalone-\n                             Anwendungen, die in einem modularen oder ausführbaren\n                             JAR-Archiv gebündelt sind
 main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Die Manifestinformationen aus der angegebenen\n                             Manifestdatei aufnehmen
-main.help.opt.create.update.no-manifest=\  -M, --no-manifest          Keine Manifestdatei f\u00FCr die Eintr\u00E4ge erstellen
+main.help.opt.create.update.no-manifest=\  -M, --no-manifest          Keine Manifestdatei für die Einträge erstellen
 main.help.opt.create.update.module-version=\      --module-version=VERSION    Die Modulversion beim Erstellen eines modularen\n                             JAR-Archivs oder Aktualisieren eines nicht modularen JAR-Archivs
-main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN Berechnet und zeichnet die Hashes von Modulen auf, \n                             die mit einem bestimmten Muster \u00FCbereinstimmen, und direkt oder\n                             indirekt von einem modularen JAR-Archiv abh\u00E4ngen, das erstellt\n                             wird, oder einem nicht-modularen JAR-Archiv, das aktualisiert wird
-main.help.opt.create.update.module-path=\  -p, --module-path         Speicherort von Modulabh\u00E4ngigkeit zur Generierung\n                             von Hash
+main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN Berechnet und zeichnet die Hashes von Modulen auf, \n                             die mit einem bestimmten Muster übereinstimmen, und direkt oder\n                             indirekt von einem modularen JAR-Archiv abhängen, das erstellt\n                             wird, oder einem nicht-modularen JAR-Archiv, das aktualisiert wird
+main.help.opt.create.update.module-path=\  -p, --module-path         Speicherort von Modulabhängigkeit zur Generierung\n                             von Hash
 main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  Wird aus der Standard-Root-Gruppe von Modulen ausgeschlossen
-main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Hinweis f\u00FCr ein Tool, eine Warnung auszugeben,\n                             wenn das Modul aufgel\u00F6st wird, entweder "deprecated", "deprecated-for-removal"\n                             oder "incubating"
-main.help.opt.create.update.index=\ Vorgangsmodifikatoren, die nur im Erstellungs-, Aktualisierungs- und Indexgenerierungsmodus g\u00FCltig sind:\n
+main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Hinweis für ein Tool, eine Warnung auszugeben,\n                             wenn das Modul aufgelöst wird, entweder "deprecated", "deprecated-for-removal"\n                             oder "incubating"
+main.help.opt.create.update.index=\ Vorgangsmodifikatoren, die nur im Erstellungs-, Aktualisierungs- und Indexgenerierungsmodus gültig sind:\n
 main.help.opt.create.update.index.no-compress=\  -0, --no-compress          Nur speichern, keine ZIP-Komprimierung verwenden
-main.help.opt.create.update.index.date=\      --date=TIMESTAMP        Zeitstempel im erweiterten Datums-/Uhrzeitformat mit Zeitunterschied\n                             und optionaler Zeitzone nach ISO-8601, zur Verwendung f\u00FCr die Zeitstempel von\n                             Eintr\u00E4gen, z.B. "2022-02-12T12:30:00-05:00"
+main.help.opt.create.update.index.date=\      --date=TIMESTAMP        Zeitstempel im erweiterten Datums-/Uhrzeitformat mit Zeitunterschied\n                             und optionaler Zeitzone nach ISO-8601, zur Verwendung für die Zeitstempel von\n                             Einträgen, z.B. "2022-02-12T12:30:00-05:00"
 main.help.opt.other=\ Weitere Optionen:\n
-main.help.opt.other.help=\  -?, -h, --help[:compat]    Gibt diese Meldung oder optional die Kompatibilit\u00E4t, Hilfe an
-main.help.opt.other.help-extra=\      --help-extra           Hilfe zu zus\u00E4tzlichen Optionen
+main.help.opt.other.help=\  -?, -h, --help[:compat]    Gibt diese Meldung oder optional die Kompatibilität, Hilfe an
+main.help.opt.other.help-extra=\      --help-extra           Hilfe zu zusätzlichen Optionen
 main.help.opt.other.version=\      --version              Programmversion ausgeben
-main.help.postopt=\ Ein Archiv ist ein modulares JAR-Archiv, wenn der Moduldeskriptor "module-info.class"\n in der Root der angegebenen Verzeichnisse oder in der Root des JAR-Archivs selbst\n vorhanden ist. Die folgenden Vorg\u00E4nge sind nur g\u00FCltig, wenn Sie ein modulares JAR-Archiv\n erstellen oder ein vorhandenes nicht modulares JAR-Archiv aktualisieren: "--module-version",\n "--hash-modules" und "--modulepath".\n\n Obligatorische oder optionale Argumente zu langen Optionen sind auch f\u00FCr die jeweils\n zugeh\u00F6rigen kurzen Optionen obligatorisch oder optional.
+main.help.postopt=\ Ein Archiv ist ein modulares JAR-Archiv, wenn der Moduldeskriptor "module-info.class"\n in der Root der angegebenen Verzeichnisse oder in der Root des JAR-Archivs selbst\n vorhanden ist. Die folgenden Vorgänge sind nur gültig, wenn Sie ein modulares JAR-Archiv\n erstellen oder ein vorhandenes nicht modulares JAR-Archiv aktualisieren: "--module-version",\n "--hash-modules" und "--modulepath".\n\n Obligatorische oder optionale Argumente zu langen Optionen sind auch für die jeweils\n zugehörigen kurzen Optionen obligatorisch oder optional.
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties
index 8aebed821bc..481259dfb1c 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties
@@ -23,61 +23,61 @@
 # questions.
 #
 
-error.multiple.main.operations=No se puede especificar m\u00E1s de una opci\u00F3n '-cuxtid'
+error.multiple.main.operations=No se puede especificar más de una opción '-cuxtid'
 error.cant.open=no se puede abrir: {0}
-error.illegal.option=Opci\u00F3n no permitida: {0}
-error.unrecognized.option=opci\u00F3n no reconocida: {0}
-error.missing.arg=la opci\u00F3n {0} necesita un argumento
+error.illegal.option=Opción no permitida: {0}
+error.unrecognized.option=opción no reconocida: {0}
+error.missing.arg=la opción {0} necesita un argumento
 error.bad.file.arg=Error al analizar los argumentos de archivo
 error.bad.option=Se debe especificar una de las opciones -{ctxuid}.
-error.bad.cflag=El indicador 'c' necesita la especificaci\u00F3n de archivos de manifiesto o de entrada.
-error.bad.uflag=El indicador 'u' necesita la especificaci\u00F3n de archivos de manifiesto, de entrada o indicador 'e'.
+error.bad.cflag=El indicador 'c' necesita la especificación de archivos de manifiesto o de entrada.
+error.bad.uflag=El indicador 'u' necesita la especificación de archivos de manifiesto, de entrada o indicador 'e'.
 error.bad.eflag=El indicador 'e' y el manifiesto con el atributo 'Main-Class' no pueden especificarse \na la vez.
-error.bad.dflag=La opci\u00F3n '-d, --describe-module'  no requiere especificar archivos de entrada
-error.bad.reason=Motivo err\u00F3neo: {0}, debe ser en desuso, en desuso para eliminaci\u00F3n o incubando
+error.bad.dflag=La opción '-d, --describe-module'  no requiere especificar archivos de entrada
+error.bad.reason=Motivo erróneo: {0}, debe ser en desuso, en desuso para eliminación o incubando
 error.nosuch.fileordir={0} : no existe tal archivo o directorio
 error.write.file=Error al escribir un archivo jar existente
 error.create.dir={0} : no se ha podido crear el directorio
 error.incorrect.length=longitud incorrecta al procesar: {0}
 error.create.tempfile=No se ha podido crear el archivo temporal
-error.hash.dep=Aplicando hash a las dependencias del m\u00F3dulo {0}, no se ha encontrado el m\u00F3dulo {1} en la ruta del m\u00F3dulo
+error.hash.dep=Aplicando hash a las dependencias del módulo {0}, no se ha encontrado el módulo {1} en la ruta del módulo
 error.module.options.without.info=Uno de --module-version o -hash-modules sin module-info.class
-error.no.operative.descriptor=No hay ning\u00FAn descriptor operativo para la versi\u00F3n: {0}
-error.no.root.descriptor=No hay ning\u00FAn descriptor de m\u00F3dulo de ra\u00EDz, especifique --release
-error.unable.derive.automodule=No se ha podido derivar el descriptor de m\u00F3dulo para: {0}
-error.unexpected.module-info=Descriptor de m\u00F3dulo inesperado {0}
-error.module.descriptor.not.found=No se ha encontrado el descriptor de m\u00F3dulo
-error.invalid.versioned.module.attribute=Atributo de descriptor de m\u00F3dulo no v\u00E1lido {0}
+error.no.operative.descriptor=No hay ningún descriptor operativo para la versión: {0}
+error.no.root.descriptor=No hay ningún descriptor de módulo de raíz, especifique --release
+error.unable.derive.automodule=No se ha podido derivar el descriptor de módulo para: {0}
+error.unexpected.module-info=Descriptor de módulo inesperado {0}
+error.module.descriptor.not.found=No se ha encontrado el descriptor de módulo
+error.invalid.versioned.module.attribute=Atributo de descriptor de módulo no válido {0}
 error.missing.provider=No se ha encontrado el proveedor de servicios: {0}
-error.release.value.notnumber=versi\u00F3n {0} no v\u00E1lida
-error.release.value.toosmall=versi\u00F3n {0} no v\u00E1lida, debe ser >= 9
-error.release.unexpected.versioned.entry=Entrada versionada inesperada {0} para la versi\u00F3n {1}
+error.release.value.notnumber=versión {0} no válida
+error.release.value.toosmall=versión {0} no válida, debe ser >= 9
+error.release.unexpected.versioned.entry=Entrada versionada inesperada {0} para la versión {1}
 error.validator.jarfile.exception=no puede validar {0}: {1}
-error.validator.jarfile.invalid=se ha suprimido el archivo jar de varias versiones {0} no v\u00E1lido
+error.validator.jarfile.invalid=se ha suprimido el archivo jar de varias versiones {0} no válido
 error.validator.bad.entry.name=nombre de entrada con formato incorrecto, {0}
-error.validator.version.notnumber=el nombre de entrada {0} no tiene un n\u00FAmero de versi\u00F3n
+error.validator.version.notnumber=el nombre de entrada {0} no tiene un número de versión
 error.validator.entryname.tooshort=el nombre de entrada {0} es demasiado corto, no es un directorio
 error.validator.isolated.nested.class=la entrada {0} es una clase anidada aislada
-error.validator.new.public.class=la entrada {0} contiene una nueva clase p\u00FAblica que no est\u00E1 en las entradas de base
-error.validator.incompatible.class.version=la entrada {0} tiene una versi\u00F3n de clase no compatible con una versi\u00F3n anterior
-error.validator.different.api=la entrada {0} contiene una clase con una api diferente de la versi\u00F3n anterior
+error.validator.new.public.class=la entrada {0} contiene una nueva clase pública que no está en las entradas de base
+error.validator.incompatible.class.version=la entrada {0} tiene una versión de clase no compatible con una versión anterior
+error.validator.different.api=la entrada {0} contiene una clase con una api diferente de la versión anterior
 error.validator.names.mismatch=la entrada {0} contiene una clase con un nombre interno {1}, los nombres no coinciden
-error.validator.info.name.notequal=module-info.class en un directorio con versi\u00F3n contiene un nombre incorrecto
+error.validator.info.name.notequal=module-info.class en un directorio con versión contiene un nombre incorrecto
 error.validator.info.requires.transitive=module-info.class en un directorio con versiones contiene "requires transitive" adicionales
-error.validator.info.requires.added=module-info.class en un directorio con versi\u00F3n contiene "requires" adicionales
+error.validator.info.requires.added=module-info.class en un directorio con versión contiene "requires" adicionales
 error.validator.info.requires.dropped=module-info.class en un directorio con versiones contiene "requires" que faltan
 error.validator.info.exports.notequal=module-info.class en un directorio con versiones contiene "exports" diferentes
 error.validator.info.opens.notequal=module-info.class en un directorio con versiones contiene "opens" diferentes
 error.validator.info.provides.notequal=module-info.class en un directorio con versiones contiene "provides" diferentes
 error.validator.info.version.notequal={0}: module-info.class en un directorio con versiones contiene una "version" diferente
 error.validator.info.manclass.notequal={0}: module-info.class  en un directorio con versiones contiene una "main-class" diferente
-warn.validator.identical.entry=Advertencia: la entrada {0} contiene una clase id\u00E9ntica a una entrada que ya est\u00E1 en el archivo jar
+warn.validator.identical.entry=Advertencia: la entrada {0} contiene una clase idéntica a una entrada que ya está en el archivo jar
 warn.validator.resources.with.same.name=Advertencia: la entrada {0} tiene varios recursos con el mismo nombre
-warn.validator.concealed.public.class=Advertencia: la entrada {0} es una clase p\u00FAblica\nen un paquete oculto. Colocar este archivo jar en la ruta de clase tendr\u00E1 como resultado\ninterfaces p\u00FAblicas no compatibles
+warn.validator.concealed.public.class=Advertencia: la entrada {0} es una clase pública\nen un paquete oculto. Colocar este archivo jar en la ruta de clase tendrá como resultado\ninterfaces públicas no compatibles
 warn.release.unexpected.versioned.entry=entrada versionada inesperada {0}
 out.added.manifest=manifiesto agregado
 out.added.module-info=module-info agregado: {0}
-out.automodule=No se ha encontrado ning\u00FAn descriptor de m\u00F3dulo. M\u00F3dulo autom\u00E1tico derivado.
+out.automodule=No se ha encontrado ningún descriptor de módulo. Módulo automático derivado.
 out.update.manifest=manifiesto actualizado
 out.update.module-info=module-info actualizado: {0}
 out.ignore.entry=ignorando entrada {0}
@@ -85,41 +85,41 @@ out.adding=agregando: {0}
 out.deflated=(desinflado {0}%)
 out.stored=(almacenado 0%)
 out.create=\  creado: {0}
-out.extracted=extra\u00EDdo: {0}
+out.extracted=extraído: {0}
 out.inflated=\ inflado: {0}
 out.size=(entrada = {0}) (salida = {1})
 
-usage.compat=Interfaz de compatibilidad:\nSintaxis: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...Opciones: \n    -c  crear nuevo archivo\n    -t  mostrar la tabla de contenido del archivo\n    -x   extraer el archivo mencionado (o todos) del archivo\n    -u  actualizar archivo existente\n    -v  generar salida detallada de los datos de salida est\u00E1ndar\n    -f  especificar nombre del archivo de almacenamiento\n    -m  incluir informaci\u00F3n de manifiesto del archivo de manifiesto especificado n    -n  realizar la normalizaci\u00F3n Pack200 despu\u00E9s de crear un archivo nuevo\n    -e  especificar punto de entrada de la aplicaci\u00F3n para la aplicaci\u00F3n aut\u00F3noma \n        que se incluye dentro de un archivo jar ejecutable\n    -0  solo almacenar; no utilizar compresi\u00F3n ZIP\n    -P  conservar componentes iniciales '/' (ruta absoluta) y ".." (directorio principal) en los nombres de archivo\n    -M  no crear un archivo de manifiesto para las entradas\n    -i  generar informaci\u00F3n de \u00EDndice para los archivos jar especificados\n    -C  cambiar al directorio especificado e incluir el archivo siguiente\nSi alg\u00FAn archivo es un directorio, se procesar\u00E1 de forma recurrente. \nEl nombre del archivo de manifiesto, el nombre del archivo de almacenamiento y el nombre del punto de entrada se\n especifican en el mismo orden que los indicadores 'm', 'f' y 'e'. \n\nEjemplo 1: para archivar archivos de dos clases en un archivo llamado classes.jar: \n       jar cvf classes.jar Foo.class Bar.class \nEjemplo 2: utilice un archivo de manifiesto existente 'mymanifest' y archive todos los\n           archivos del directorio foo/ en 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/ .\n
+usage.compat=Interfaz de compatibilidad:\nSintaxis: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...Opciones: \n    -c  crear nuevo archivo\n    -t  mostrar la tabla de contenido del archivo\n    -x   extraer el archivo mencionado (o todos) del archivo\n    -u  actualizar archivo existente\n    -v  generar salida detallada de los datos de salida estándar\n    -f  especificar nombre del archivo de almacenamiento\n    -m  incluir información de manifiesto del archivo de manifiesto especificado n    -n  realizar la normalización Pack200 después de crear un archivo nuevo\n    -e  especificar punto de entrada de la aplicación para la aplicación autónoma \n        que se incluye dentro de un archivo jar ejecutable\n    -0  solo almacenar; no utilizar compresión ZIP\n    -P  conservar componentes iniciales '/' (ruta absoluta) y ".." (directorio principal) en los nombres de archivo\n    -M  no crear un archivo de manifiesto para las entradas\n    -i  generar información de índice para los archivos jar especificados\n    -C  cambiar al directorio especificado e incluir el archivo siguiente\nSi algún archivo es un directorio, se procesará de forma recurrente. \nEl nombre del archivo de manifiesto, el nombre del archivo de almacenamiento y el nombre del punto de entrada se\n especifican en el mismo orden que los indicadores 'm', 'f' y 'e'. \n\nEjemplo 1: para archivar archivos de dos clases en un archivo llamado classes.jar: \n       jar cvf classes.jar Foo.class Bar.class \nEjemplo 2: utilice un archivo de manifiesto existente 'mymanifest' y archive todos los\n           archivos del directorio foo/ en 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/ .\n
 
 main.usage.summary=Sintaxis: jar [OPTION...] [ [--release VERSION] [-C dir] archivos] ...
-main.usage.summary.try=Intente `jar --help' para obtener m\u00E1s informaci\u00F3n.
+main.usage.summary.try=Intente `jar --help' para obtener más información.
 
-main.help.preopt=Sintaxis: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar crea un archivo para las clases y recursos, y puede manipular o\nrestaurar clases individuales o recursos de un archivo.\n\n Ejemplos:\n # Crear un archivo denominado classes.jar con dos archivos de clase:\n jar --create --file classes.jar Foo.class Bar.class\n # Crear un archivo con un manifiesto existente, con todos los archivos en foo/:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # Crear un archivo jar modular, donde el descriptor de m\u00F3dulo est\u00E1 en\n # classes/module-info.class:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # Actualizar un jar no modular existente en un jar modular:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # Crear un archivo jar de varias versiones y colocar algunos archivos en el directorio META-INF/versions/9:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\nPara acortar o simplificar el comando jar, puede especificar argumentos en un archivo\nde texto separado y transmitirlos al comando jar con el s\u00EDmbolo de arroba (@) como prefijo.\n\n Ejemplos:\n # Leer opciones adicionales y mostrar los archivos de clases del archivo classes.list\n jar --create --file my.jar @classes.list\n
-main.help.opt.main=\ Modo de operaci\u00F3n principal:\n
+main.help.preopt=Sintaxis: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar crea un archivo para las clases y recursos, y puede manipular o\nrestaurar clases individuales o recursos de un archivo.\n\n Ejemplos:\n # Crear un archivo denominado classes.jar con dos archivos de clase:\n jar --create --file classes.jar Foo.class Bar.class\n # Crear un archivo con un manifiesto existente, con todos los archivos en foo/:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # Crear un archivo jar modular, donde el descriptor de módulo está en\n # classes/module-info.class:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # Actualizar un jar no modular existente en un jar modular:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # Crear un archivo jar de varias versiones y colocar algunos archivos en el directorio META-INF/versions/9:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\nPara acortar o simplificar el comando jar, puede especificar argumentos en un archivo\nde texto separado y transmitirlos al comando jar con el símbolo de arroba (@) como prefijo.\n\n Ejemplos:\n # Leer opciones adicionales y mostrar los archivos de clases del archivo classes.list\n jar --create --file my.jar @classes.list\n
+main.help.opt.main=\ Modo de operación principal:\n
 main.help.opt.main.create=\  -c, --create               Crear el archivo
-main.help.opt.main.generate-index=\  -i, --generate-index=FILE  Generar informaci\u00F3n de \u00EDndice para los archivos jar\n                             especificados
+main.help.opt.main.generate-index=\  -i, --generate-index=FILE  Generar información de índice para los archivos jar\n                             especificados
 main.help.opt.main.list=\  -t, --list                 Mostrar la tabla de contenido del archivo
 main.help.opt.main.update=\  -u, --update               Actualizar un archivo jar existente
 main.help.opt.main.extract=\  -x, --extract              Extraer determinados (o todos) los archivos del archivo
-main.help.opt.main.describe-module=\  -d, --describe-module      Imprimir el descriptor de m\u00F3dulo, o un nombre de m\u00F3dulo autom\u00E1tico
-main.help.opt.any=\ Modificadores de operaci\u00F3n v\u00E1lidos en cualquier modo:\n\n  -C DIR                     Cambiar al directorio especificado e incluir el\n                             siguiente archivo
-main.help.opt.any.file=\  -f, --file=FILE            El nombre del archivo. Si se omite, se usa stdin o\n                             stdout en funci\u00F3n de la operaci\u00F3n\n      --release VERSION      Se colocan todos los archivos siguientes en un directorio con versi\u00F3n\n                             del archivo jar (es decir, META-INF/versions/VERSION/)
-main.help.opt.any.verbose=\  -v, --verbose              Generar salida verbose en salida est\u00E1ndar
-main.help.opt.create=\ Modificadores de operaci\u00F3n v\u00E1lidos solo en el modo de creaci\u00F3n:\n
-main.help.opt.create.normalize=\  -n, --normalize            Normalizar informaci\u00F3n en el nuevo archivo jar\n                             despu\u00E9s de la creaci\u00F3n
-main.help.opt.create.update=\ Modificadores de operaci\u00F3n v\u00E1lidos solo en el modo de creaci\u00F3n y de actualizaci\u00F3n:\n
-main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME Punto de entrada de la aplicaci\u00F3n para aplicaciones\n                             aut\u00F3nomas agrupadas en un archivo jar modular o\n                             ejecutable
-main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Incluir la informaci\u00F3n de manifiesto del archivo\n                             de manifiesto proporcionado
-main.help.opt.create.update.no-manifest=\  -M, --no-manifest          No crear ning\u00FAn archivo de manifiesto para las entradas
-main.help.opt.create.update.module-version=\      --module-version=VERSION    Versi\u00F3n del m\u00F3dulo, si se va a crear un archivo jar modular\n                             o actualizar un archivo jar no modular
-main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN Calcular y registrar los hash de m\u00F3dulos\n                             que coinciden con el patr\u00F3n proporcionado y que dependen\n                             directa o indirectamente de la creaci\u00F3n de un archivo jar modular\n                             o de la actualizaci\u00F3n de un archivo jar no modular
-main.help.opt.create.update.module-path=\  -p, --module-path          Ubicaci\u00F3n de la dependencia de m\u00F3dulo para generar\n                             el hash
-main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  Excluir del conjunto de m\u00F3dulos ra\u00EDz por defecto
-main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Indicaci\u00F3n para que una herramienta emita una advertencia si el m\u00F3dulo\n                             se ha resuelto. En desuso, en desuso para eliminaci\u00F3n\n                             o incubando
-main.help.opt.create.update.index=\ Modificadores de operaci\u00F3n v\u00E1lidos solo en el modo de creaci\u00F3n, actualizaci\u00F3n y generaci\u00F3n de \u00EDndice:\n
-main.help.opt.create.update.index.no-compress=\  -0, --no-compress          Solo almacenar; no usar compresi\u00F3n ZIP
+main.help.opt.main.describe-module=\  -d, --describe-module      Imprimir el descriptor de módulo, o un nombre de módulo automático
+main.help.opt.any=\ Modificadores de operación válidos en cualquier modo:\n\n  -C DIR                     Cambiar al directorio especificado e incluir el\n                             siguiente archivo
+main.help.opt.any.file=\  -f, --file=FILE            El nombre del archivo. Si se omite, se usa stdin o\n                             stdout en función de la operación\n      --release VERSION      Se colocan todos los archivos siguientes en un directorio con versión\n                             del archivo jar (es decir, META-INF/versions/VERSION/)
+main.help.opt.any.verbose=\  -v, --verbose              Generar salida verbose en salida estándar
+main.help.opt.create=\ Modificadores de operación válidos solo en el modo de creación:\n
+main.help.opt.create.normalize=\  -n, --normalize            Normalizar información en el nuevo archivo jar\n                             después de la creación
+main.help.opt.create.update=\ Modificadores de operación válidos solo en el modo de creación y de actualización:\n
+main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME Punto de entrada de la aplicación para aplicaciones\n                             autónomas agrupadas en un archivo jar modular o\n                             ejecutable
+main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Incluir la información de manifiesto del archivo\n                             de manifiesto proporcionado
+main.help.opt.create.update.no-manifest=\  -M, --no-manifest          No crear ningún archivo de manifiesto para las entradas
+main.help.opt.create.update.module-version=\      --module-version=VERSION    Versión del módulo, si se va a crear un archivo jar modular\n                             o actualizar un archivo jar no modular
+main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN Calcular y registrar los hash de módulos\n                             que coinciden con el patrón proporcionado y que dependen\n                             directa o indirectamente de la creación de un archivo jar modular\n                             o de la actualización de un archivo jar no modular
+main.help.opt.create.update.module-path=\  -p, --module-path          Ubicación de la dependencia de módulo para generar\n                             el hash
+main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  Excluir del conjunto de módulos raíz por defecto
+main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Indicación para que una herramienta emita una advertencia si el módulo\n                             se ha resuelto. En desuso, en desuso para eliminación\n                             o incubando
+main.help.opt.create.update.index=\ Modificadores de operación válidos solo en el modo de creación, actualización y generación de índice:\n
+main.help.opt.create.update.index.no-compress=\  -0, --no-compress          Solo almacenar; no usar compresión ZIP
 main.help.opt.other=\ Otras opciones:\n
 main.help.opt.other.help=\  -h, --help[:compat]        Utilice este valor, u opcionalmente la compatibilidad, ayuda
 main.help.opt.other.help-extra=\      --help-extra           Prestar ayuda en las opciones adicionales
-main.help.opt.other.version=\      --version              Imprimir versi\u00F3n del programa
-main.help.postopt=\ Un archivo es un jar modular si el descriptor de m\u00F3dulo, 'module-info.class', est\u00E1\n en la ra\u00EDz de los directorios proporcionados o en la ra\u00EDz del archivo jar.\n Las siguientes operaciones solo son v\u00E1lidas si se va a crear un archivo jar modular\n o se va a actualizar un jar existente no modular: '--module-version',\n '--hash-modules' y '--module-path'.\n\n Los argumentos obligatorios u opcionales en las opciones largas tambi\u00E9n son obligatorios u opcionales\n en cualquiera de las opciones cortas.
+main.help.opt.other.version=\      --version              Imprimir versión del programa
+main.help.postopt=\ Un archivo es un jar modular si el descriptor de módulo, 'module-info.class', está\n en la raíz de los directorios proporcionados o en la raíz del archivo jar.\n Las siguientes operaciones solo son válidas si se va a crear un archivo jar modular\n o se va a actualizar un jar existente no modular: '--module-version',\n '--hash-modules' y '--module-path'.\n\n Los argumentos obligatorios u opcionales en las opciones largas también son obligatorios u opcionales\n en cualquiera de las opciones cortas.
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties
index 8f836867bef..4a1a8ce4c1b 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties
@@ -29,97 +29,97 @@ error.illegal.option=Option non admise : {0}
 error.unrecognized.option=option non reconnue : {0}
 error.missing.arg=l''option {0} exige un argument
 error.bad.file.arg=Erreur lors de l'analyse des arguments de fichier
-error.bad.option=Une des options -{ctxuid} doit \u00EAtre sp\u00E9cifi\u00E9e.
-error.bad.cflag=L'indicateur c requiert la sp\u00E9cification d'un fichier manifeste ou d'un fichier d'entr\u00E9e.
-error.bad.uflag=L'indicateur u requiert la sp\u00E9cification d'un fichier manifeste, d'un fichier d'entr\u00E9e ou d'un indicateur e.
-error.bad.eflag=L'indicateur e et le fichier manifeste portant l'attribut Main-Class ne peuvent pas \u00EAtre sp\u00E9cifi\u00E9s \nensemble.
-error.bad.dflag=L'option '-d, --describe-module' ne requiert la sp\u00E9cification d'aucun fichier d'entr\u00E9e
-error.bad.reason=raison incorrecte : {0}, la valeur doit \u00EAtre deprecated, deprecated-for-removal ou incubating
-error.nosuch.fileordir={0} : fichier ou r\u00E9pertoire introuvable
-error.write.file=Erreur lors de l'\u00E9criture d'un fichier JAR existant
-error.create.dir={0} : impossible de cr\u00E9er le r\u00E9pertoire
+error.bad.option=Une des options -{ctxuid} doit être spécifiée.
+error.bad.cflag=L'indicateur c requiert la spécification d'un fichier manifeste ou d'un fichier d'entrée.
+error.bad.uflag=L'indicateur u requiert la spécification d'un fichier manifeste, d'un fichier d'entrée ou d'un indicateur e.
+error.bad.eflag=L'indicateur e et le fichier manifeste portant l'attribut Main-Class ne peuvent pas être spécifiés \nensemble.
+error.bad.dflag=L'option '-d, --describe-module' ne requiert la spécification d'aucun fichier d'entrée
+error.bad.reason=raison incorrecte : {0}, la valeur doit être deprecated, deprecated-for-removal ou incubating
+error.nosuch.fileordir={0} : fichier ou répertoire introuvable
+error.write.file=Erreur lors de l'écriture d'un fichier JAR existant
+error.create.dir={0} : impossible de créer le répertoire
 error.incorrect.length=longueur incorrecte lors du traitement de : {0}
-error.create.tempfile=Impossible de cr\u00E9er un fichier temporaire
-error.hash.dep=Hachage des d\u00E9pendances du module {0}, module {1} introuvable sur le chemin de modules
+error.create.tempfile=Impossible de créer un fichier temporaire
+error.hash.dep=Hachage des dépendances du module {0}, module {1} introuvable sur le chemin de modules
 error.module.options.without.info=Une des options --module-version ou --hash-modules sans module-info.class
-error.no.operative.descriptor=Aucun descripteur op\u00E9rationnel pour la version : {0}
+error.no.operative.descriptor=Aucun descripteur opérationnel pour la version : {0}
 error.no.root.descriptor=Aucun descripteur de module racine, indiquer --release
-error.unable.derive.automodule=Impossible de d\u00E9river le descripteur de module pour : {0}
+error.unable.derive.automodule=Impossible de dériver le descripteur de module pour : {0}
 error.unexpected.module-info=Descripteur de module {0} inattendu
 error.module.descriptor.not.found=Descripteur de module introuvable
 error.invalid.versioned.module.attribute=Attribut de descripteur de module non valide {0}
 error.missing.provider=Fournisseur de services introuvable : {0}
 error.release.value.notnumber=version {0} non valide
-error.release.value.toosmall=version {0} non valide : elle doit \u00EAtre sup\u00E9rieure ou \u00E9gale \u00E0 9
-error.release.unexpected.versioned.entry=entr\u00E9e avec num\u00E9ro de version {0} inattendue pour la version {1}
+error.release.value.toosmall=version {0} non valide : elle doit être supérieure ou égale à 9
+error.release.unexpected.versioned.entry=entrée avec numéro de version {0} inattendue pour la version {1}
 error.validator.jarfile.exception=Impossible de valider {0} : {1}
-error.validator.jarfile.invalid=fichier JAR multiversion non valide {0} supprim\u00E9
-error.validator.bad.entry.name=nom d''entr\u00E9e au format incorrect, {0}
-error.validator.version.notnumber=le nom d''entr\u00E9e : {0} n''a pas de num\u00E9ro de version
-error.validator.entryname.tooshort=le nom d''entr\u00E9e : {0} est trop court et n''est pas un r\u00E9pertoire
-error.validator.isolated.nested.class=l''entr\u00E9e : {0} est une classe isol\u00E9e imbriqu\u00E9e
-error.validator.new.public.class=l''entr\u00E9e : {0} contient une nouvelle classe publique introuvable dans les entr\u00E9es de base
-error.validator.incompatible.class.version=l''entr\u00E9e : {0} a une version de classe non compatible avec une version ant\u00E9rieure
-error.validator.different.api=l''entr\u00E9e : {0} contient une classe avec une API diff\u00E9rente de la version ant\u00E9rieure
-error.validator.names.mismatch=l''entr\u00E9e : {0} contient une classe avec le nom interne {1}, les noms ne concordent pas
-error.validator.info.name.notequal=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient un nom incorrect
-error.validator.info.requires.transitive=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient un mot-cl\u00E9 "requires transitive" suppl\u00E9mentaire
-error.validator.info.requires.added=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "requires" suppl\u00E9mentaires
-error.validator.info.requires.dropped=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "requires" manquants
-error.validator.info.exports.notequal=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "exports" diff\u00E9rents
-error.validator.info.opens.notequal=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "opens" diff\u00E9rents
-error.validator.info.provides.notequal=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "provides" diff\u00E9rents
-error.validator.info.version.notequal={0} : module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "version" diff\u00E9rents
-error.validator.info.manclass.notequal={0} : module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "main-class" diff\u00E9rents
-warn.validator.identical.entry=Avertissement : l''entr\u00E9e {0} contient une classe\nidentique \u00E0 une entr\u00E9e qui se trouve d\u00E9j\u00E0 dans le fichier JAR
-warn.validator.resources.with.same.name=Avertissement : entr\u00E9e {0}, plusieurs ressources du m\u00EAme nom
-warn.validator.concealed.public.class=Avertissement : l''entr\u00E9e {0} est une classe publique\ndans un package dissimul\u00E9, le placement de ce fichier JAR sur le\nchemin de classe g\u00E9n\u00E9rera des interfaces publiques incompatibles
-warn.release.unexpected.versioned.entry=entr\u00E9e avec num\u00E9ro de version {0} inattendue
-out.added.manifest=manifeste ajout\u00E9
-out.added.module-info=module-info ajout\u00E9 : {0}
-out.automodule=Descripteur de module introuvable. Module automatique d\u00E9riv\u00E9.
-out.update.manifest=manifeste mis \u00E0 jour
-out.update.module-info=module-info mis \u00E0 jour : {0}
-out.ignore.entry=entr\u00E9e {0} ignor\u00E9e
+error.validator.jarfile.invalid=fichier JAR multiversion non valide {0} supprimé
+error.validator.bad.entry.name=nom d''entrée au format incorrect, {0}
+error.validator.version.notnumber=le nom d''entrée : {0} n''a pas de numéro de version
+error.validator.entryname.tooshort=le nom d''entrée : {0} est trop court et n''est pas un répertoire
+error.validator.isolated.nested.class=l''entrée : {0} est une classe isolée imbriquée
+error.validator.new.public.class=l''entrée : {0} contient une nouvelle classe publique introuvable dans les entrées de base
+error.validator.incompatible.class.version=l''entrée : {0} a une version de classe non compatible avec une version antérieure
+error.validator.different.api=l''entrée : {0} contient une classe avec une API différente de la version antérieure
+error.validator.names.mismatch=l''entrée : {0} contient une classe avec le nom interne {1}, les noms ne concordent pas
+error.validator.info.name.notequal=module-info.class dans un répertoire avec numéro de version contient un nom incorrect
+error.validator.info.requires.transitive=module-info.class dans un répertoire avec numéro de version contient un mot-clé "requires transitive" supplémentaire
+error.validator.info.requires.added=module-info.class dans un répertoire avec numéro de version contient des mots-clés "requires" supplémentaires
+error.validator.info.requires.dropped=module-info.class dans un répertoire avec numéro de version contient des mots-clés "requires" manquants
+error.validator.info.exports.notequal=module-info.class dans un répertoire avec numéro de version contient des mots-clés "exports" différents
+error.validator.info.opens.notequal=module-info.class dans un répertoire avec numéro de version contient des mots-clés "opens" différents
+error.validator.info.provides.notequal=module-info.class dans un répertoire avec numéro de version contient des mots-clés "provides" différents
+error.validator.info.version.notequal={0} : module-info.class dans un répertoire avec numéro de version contient des mots-clés "version" différents
+error.validator.info.manclass.notequal={0} : module-info.class dans un répertoire avec numéro de version contient des mots-clés "main-class" différents
+warn.validator.identical.entry=Avertissement : l''entrée {0} contient une classe\nidentique à une entrée qui se trouve déjà dans le fichier JAR
+warn.validator.resources.with.same.name=Avertissement : entrée {0}, plusieurs ressources du même nom
+warn.validator.concealed.public.class=Avertissement : l''entrée {0} est une classe publique\ndans un package dissimulé, le placement de ce fichier JAR sur le\nchemin de classe générera des interfaces publiques incompatibles
+warn.release.unexpected.versioned.entry=entrée avec numéro de version {0} inattendue
+out.added.manifest=manifeste ajouté
+out.added.module-info=module-info ajouté : {0}
+out.automodule=Descripteur de module introuvable. Module automatique dérivé.
+out.update.manifest=manifeste mis à jour
+out.update.module-info=module-info mis à jour : {0}
+out.ignore.entry=entrée {0} ignorée
 out.adding=ajout : {0}
 out.deflated=(compression : {0} %)
 out.stored=(stockage : 0 %)
-out.create=\  cr\u00E9\u00E9 : {0}
+out.create=\  créé : {0}
 out.extracted=extrait : {0}
-out.inflated=\ d\u00E9compress\u00E9 : {0}
-out.size=(entr\u00E9e = {0}) (sortie = {1})
+out.inflated=\ décompressé : {0}
+out.size=(entrée = {0}) (sortie = {1})
 
-usage.compat=Interface de compatibilit\u00E9 :\nSyntaxe : jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\nOptions :\n    -c  cr\u00E9e une archive\n    -t  affiche la table des mati\u00E8res de l'archive\n    -x  extrait des fichiers nomm\u00E9s (ou tous les fichiers) de l'archive\n    -u  met \u00E0 jour l'archive existante\n    -v  g\u00E9n\u00E8re une sortie en mode verbose d'une sortie standard\n    -f  sp\u00E9cifie le nom de fichier d'archive\n    -m  inclut les informations de manifeste \u00E0 partir du fichier manifeste sp\u00E9cifi\u00E9\n    -n  effectue une normalisation Pack200 apr\u00E8s la cr\u00E9ation d'une archive\n    -e  sp\u00E9cifie le point d'entr\u00E9e d'une application en mode autonome \n        int\u00E9gr\u00E9e \u00E0 un fichier JAR ex\u00E9cutable\n    -0  stockage uniquement, pas de compression ZIP\n    -P  pr\u00E9serve les signes de d\u00E9but '/' (chemin absolu) et ".." (r\u00E9pertoire parent) dans les noms de fichier\n    -M  ne cr\u00E9e pas de fichier manifeste pour les entr\u00E9es\n    -i  g\u00E9n\u00E8re les informations d'index des fichiers JAR sp\u00E9cifi\u00E9s\n    -C  passe au r\u00E9pertoire sp\u00E9cifi\u00E9 et inclut le fichier suivant\nSi l'un des fichiers est un r\u00E9pertoire, celui-ci est trait\u00E9 r\u00E9cursivement.\nLes noms du fichier manifeste, du fichier d'archive et du point d'entr\u00E9e sont\nsp\u00E9cifi\u00E9s dans le m\u00EAme ordre que celui des indicateurs m, f et e.\n\nExemple 1 : pour archiver deux fichiers de classe dans une archive intitul\u00E9e classes.jar : \n       jar cvf classes.jar Foo.class Bar.class \nExemple 2 : pour utiliser un fichier manifeste existant 'mymanifest', puis archiver tous les\n           fichiers du r\u00E9pertoire foo/ dans 'classes.jar' : \n       jar cvfm classes.jar mymanifest -C foo/ .\n
+usage.compat=Interface de compatibilité :\nSyntaxe : jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\nOptions :\n    -c  crée une archive\n    -t  affiche la table des matières de l'archive\n    -x  extrait des fichiers nommés (ou tous les fichiers) de l'archive\n    -u  met à jour l'archive existante\n    -v  génère une sortie en mode verbose d'une sortie standard\n    -f  spécifie le nom de fichier d'archive\n    -m  inclut les informations de manifeste à partir du fichier manifeste spécifié\n    -n  effectue une normalisation Pack200 après la création d'une archive\n    -e  spécifie le point d'entrée d'une application en mode autonome \n        intégrée à un fichier JAR exécutable\n    -0  stockage uniquement, pas de compression ZIP\n    -P  préserve les signes de début '/' (chemin absolu) et ".." (répertoire parent) dans les noms de fichier\n    -M  ne crée pas de fichier manifeste pour les entrées\n    -i  génère les informations d'index des fichiers JAR spécifiés\n    -C  passe au répertoire spécifié et inclut le fichier suivant\nSi l'un des fichiers est un répertoire, celui-ci est traité récursivement.\nLes noms du fichier manifeste, du fichier d'archive et du point d'entrée sont\nspécifiés dans le même ordre que celui des indicateurs m, f et e.\n\nExemple 1 : pour archiver deux fichiers de classe dans une archive intitulée classes.jar : \n       jar cvf classes.jar Foo.class Bar.class \nExemple 2 : pour utiliser un fichier manifeste existant 'mymanifest', puis archiver tous les\n           fichiers du répertoire foo/ dans 'classes.jar' : \n       jar cvfm classes.jar mymanifest -C foo/ .\n
 
 main.usage.summary=Syntaxe : jar [OPTION...] [ [--release VERSION] [-C dir] files] ...
 main.usage.summary.try=Pour plus d'informations, essayez 'jar --help'.
 
-main.help.preopt=Syntaxe : jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar cr\u00E9e une archive pour les classes et les ressources, et peut manipuler ou\nrestaurer les classes ou ressources individuelles \u00E0 partir d'une archive.\n\n Exemples :\n # Cr\u00E9ation d'une archive nomm\u00E9e classes.jar compos\u00E9e de deux fichiers de classe :\n jar --create --file classes.jar Foo.class Bar.class\n # Cr\u00E9ation d'une archive \u00E0 l'aide d'un manifeste existant, avec tous les fichiers dans foo/ :\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # Cr\u00E9ation d'une archive JAR modulaire, o\u00F9 le descripteur de module est situ\u00E9 dans\n # classes/module-info.class :\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # Mise \u00E0 jour d'un fichier JAR non modulaire existant vers un fichier JAR modulaire :\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # Cr\u00E9e un fichier JAR multiversion en pla\u00E7ant certains fichiers dans le r\u00E9pertoire META-INF/versions/9 :\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\nPour raccourcir ou simplifier la commande JAR, vous pouvez sp\u00E9cifier des arguments dans un\nfichier texte distinct et le transmettre \u00E0 la commande JAR avec le signe arobase (@) en tant que pr\u00E9fixe.\n\n Exemples :\n # Options de lecture suppl\u00E9mentaires et liste des fichiers de classe \u00E0 partir du fichier classes.list\n jar --create --file my.jar @classes.list\n
+main.help.preopt=Syntaxe : jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar crée une archive pour les classes et les ressources, et peut manipuler ou\nrestaurer les classes ou ressources individuelles à partir d'une archive.\n\n Exemples :\n # Création d'une archive nommée classes.jar composée de deux fichiers de classe :\n jar --create --file classes.jar Foo.class Bar.class\n # Création d'une archive à l'aide d'un manifeste existant, avec tous les fichiers dans foo/ :\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # Création d'une archive JAR modulaire, où le descripteur de module est situé dans\n # classes/module-info.class :\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # Mise à jour d'un fichier JAR non modulaire existant vers un fichier JAR modulaire :\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # Crée un fichier JAR multiversion en plaçant certains fichiers dans le répertoire META-INF/versions/9 :\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\nPour raccourcir ou simplifier la commande JAR, vous pouvez spécifier des arguments dans un\nfichier texte distinct et le transmettre à la commande JAR avec le signe arobase (@) en tant que préfixe.\n\n Exemples :\n # Options de lecture supplémentaires et liste des fichiers de classe à partir du fichier classes.list\n jar --create --file my.jar @classes.list\n
 main.help.opt.main=\ Mode d'exploitation principal :\n
-main.help.opt.main.create=\  -c, --create               Cr\u00E9e l'archive
-main.help.opt.main.generate-index=\  -i, --generate-index=FILE  G\u00E9n\u00E8re des informations d'index pour les archives JAR\n                             indiqu\u00E9es
-main.help.opt.main.list=\  -t, --list                 Affiche la table des mati\u00E8res de l'archive
-main.help.opt.main.update=\  -u, --update               Met \u00E0 jour une archive JAR existante
-main.help.opt.main.extract=\  -x, --extract              Extrait des fichiers nomm\u00E9s (ou tous les fichiers) de l'archive
+main.help.opt.main.create=\  -c, --create               Crée l'archive
+main.help.opt.main.generate-index=\  -i, --generate-index=FILE  Génère des informations d'index pour les archives JAR\n                             indiquées
+main.help.opt.main.list=\  -t, --list                 Affiche la table des matières de l'archive
+main.help.opt.main.update=\  -u, --update               Met à jour une archive JAR existante
+main.help.opt.main.extract=\  -x, --extract              Extrait des fichiers nommés (ou tous les fichiers) de l'archive
 main.help.opt.main.describe-module=\  -d, --describe-module      afficher le descripteur de module ou le nom de module automatique
-main.help.opt.any=\ Modificateurs d'op\u00E9ration valides pour tous les modes :\n\n  -C DIR                     Passe au r\u00E9pertoire sp\u00E9cifi\u00E9 et inclut le\n                             fichier suivant
-main.help.opt.any.file=\  -f, --file=FILE            Nom du fichier d'archive. Lorsqu'il est omis, stdin ou\n                             stdout est utilis\u00E9 en fonction de l'op\u00E9ration\n      --release VERSION      Place tous les fichiers suivants dans un r\u00E9pertoire avec num\u00E9ro de version\n                             du fichier JAR (\u00E0 savoir META-INF/versions/VERSION/)
-main.help.opt.any.verbose=\  -v, --verbose              G\u00E9n\u00E8re une sortie en mode verbose d'une sortie standard
-main.help.opt.create=\ Modificateurs d'op\u00E9ration valides uniquement en mode create :\n
-main.help.opt.create.normalize=\  -n, --normalize            Normaliser des informations dans la nouvelle archive JAR\n                             apr\u00E8s la cr\u00E9ation
-main.help.opt.create.update=\ Modificateurs d'op\u00E9ration valides uniquement en modes create et update :\n
-main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME Point d'entr\u00E9e d'une application en mode autonome\n                             int\u00E9gr\u00E9e \u00E0 une archive JAR modulaire\n                             ou ex\u00E9cutable
-main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Inclut les informations de manifeste du fichier\n                             manifeste donn\u00E9
-main.help.opt.create.update.no-manifest=\  -M, --no-manifest          Ne cr\u00E9e pas de fichier manifeste pour les entr\u00E9es
-main.help.opt.create.update.module-version=\      --module-version=VERSION    Version de module lors de la cr\u00E9ation d'un fichier JAR\n                             modulaire ou de la mise \u00E0 jour d'un fichier JAR non modulaire
-main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN Calcule et enregistre les hachages des modules \n                             mis en correspondance d'apr\u00E8s le mod\u00E8le donn\u00E9 et d\u00E9pendant\n                             directement ou indirectement d'un fichier JAR modulaire\n                             en cours de cr\u00E9ation ou d'un fichier JAR non modulaire en cours de mise \u00E0 jour
-main.help.opt.create.update.module-path=\  -p, --module-path          Emplacement de la d\u00E9pendance de module pour la g\u00E9n\u00E9ration\n                             du hachage
-main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  Exclure de l'ensemble racine de modules par d\u00E9faut
-main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Indication en fonction de laquelle un outil \u00E9met un avertissement si le module\n                             est r\u00E9solu. La valeur doit \u00EAtre deprecated, deprecated-for-removal,\n                             ou incubating
-main.help.opt.create.update.index=\ Modificateurs d'op\u00E9ration valides uniquement en modes create, update et generate-index :\n
+main.help.opt.any=\ Modificateurs d'opération valides pour tous les modes :\n\n  -C DIR                     Passe au répertoire spécifié et inclut le\n                             fichier suivant
+main.help.opt.any.file=\  -f, --file=FILE            Nom du fichier d'archive. Lorsqu'il est omis, stdin ou\n                             stdout est utilisé en fonction de l'opération\n      --release VERSION      Place tous les fichiers suivants dans un répertoire avec numéro de version\n                             du fichier JAR (à savoir META-INF/versions/VERSION/)
+main.help.opt.any.verbose=\  -v, --verbose              Génère une sortie en mode verbose d'une sortie standard
+main.help.opt.create=\ Modificateurs d'opération valides uniquement en mode create :\n
+main.help.opt.create.normalize=\  -n, --normalize            Normaliser des informations dans la nouvelle archive JAR\n                             après la création
+main.help.opt.create.update=\ Modificateurs d'opération valides uniquement en modes create et update :\n
+main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME Point d'entrée d'une application en mode autonome\n                             intégrée à une archive JAR modulaire\n                             ou exécutable
+main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Inclut les informations de manifeste du fichier\n                             manifeste donné
+main.help.opt.create.update.no-manifest=\  -M, --no-manifest          Ne crée pas de fichier manifeste pour les entrées
+main.help.opt.create.update.module-version=\      --module-version=VERSION    Version de module lors de la création d'un fichier JAR\n                             modulaire ou de la mise à jour d'un fichier JAR non modulaire
+main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN Calcule et enregistre les hachages des modules \n                             mis en correspondance d'après le modèle donné et dépendant\n                             directement ou indirectement d'un fichier JAR modulaire\n                             en cours de création ou d'un fichier JAR non modulaire en cours de mise à jour
+main.help.opt.create.update.module-path=\  -p, --module-path          Emplacement de la dépendance de module pour la génération\n                             du hachage
+main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  Exclure de l'ensemble racine de modules par défaut
+main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Indication en fonction de laquelle un outil émet un avertissement si le module\n                             est résolu. La valeur doit être deprecated, deprecated-for-removal,\n                             ou incubating
+main.help.opt.create.update.index=\ Modificateurs d'opération valides uniquement en modes create, update et generate-index :\n
 main.help.opt.create.update.index.no-compress=\  -0, --no-compress          Stocke uniquement ; n'utilise pas de compression ZIP
 main.help.opt.other=\ Autres options :\n
-main.help.opt.other.help=\  -h, --help[:compat]        Affiche l'aide ou \u00E9ventuellement la compatibilit\u00E9
-main.help.opt.other.help-extra=\      --help-extra           Affiche l'aide sur les options suppl\u00E9mentaires
+main.help.opt.other.help=\  -h, --help[:compat]        Affiche l'aide ou éventuellement la compatibilité
+main.help.opt.other.help-extra=\      --help-extra           Affiche l'aide sur les options supplémentaires
 main.help.opt.other.version=\      --version              Imprime la version de programme
-main.help.postopt=\ Une archive est un fichier JAR modulaire si un descripteur de module, 'module-info.class', se\n trouve dans la racine des r\u00E9pertoires donn\u00E9s ou dans la racine de l'archive JAR\n elle-m\u00EAme. Les op\u00E9rations suivantes sont valides uniquement lors de la cr\u00E9ation d'un fichier JAR modulaire\n ou de la mise \u00E0 jour d'un fichier JAR non modulaire existant : '--module-version',\n '--hash-modules' et '--module-path'.\n\n Les arguments obligatoires ou facultatifs pour les options longues sont \u00E9galement obligatoires ou facultatifs\n pour toute option courte correspondante.
+main.help.postopt=\ Une archive est un fichier JAR modulaire si un descripteur de module, 'module-info.class', se\n trouve dans la racine des répertoires donnés ou dans la racine de l'archive JAR\n elle-même. Les opérations suivantes sont valides uniquement lors de la création d'un fichier JAR modulaire\n ou de la mise à jour d'un fichier JAR non modulaire existant : '--module-version',\n '--hash-modules' et '--module-path'.\n\n Les arguments obligatoires ou facultatifs pour les options longues sont également obligatoires ou facultatifs\n pour toute option courte correspondante.
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties
index 7ee4e073f01..ff36367cfe9 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties
@@ -23,17 +23,17 @@
 # questions.
 #
 
-error.multiple.main.operations=Impossibile specificare pi\u00F9 di un'opzione '-cuxtid'
+error.multiple.main.operations=Impossibile specificare più di un'opzione '-cuxtid'
 error.cant.open=impossibile aprire: {0}
 error.illegal.option=Opzione non valida: {0}
 error.unrecognized.option=opzione non riconosciuta: {0}
 error.missing.arg=l''opzione {0} richiede un argomento
 error.bad.file.arg=Errore durante l'analisi degli argomenti del file
-error.bad.option=\u00C8 necessario specificare una delle opzioni -{ctxuid}.
-error.bad.cflag=Per il flag 'c' \u00E8 necessario specificare file manifest o di input.
-error.bad.uflag=Per il flag 'u' \u00E8 necessario specificare il flag 'e' oppure file manifest o di input.
+error.bad.option=È necessario specificare una delle opzioni -{ctxuid}.
+error.bad.cflag=Per il flag 'c' è necessario specificare file manifest o di input.
+error.bad.uflag=Per il flag 'u' è necessario specificare il flag 'e' oppure file manifest o di input.
 error.bad.eflag=Il flag 'e' e il manifest con l'attributo 'Main-Class' non possono essere specificati\ninsieme.
-error.bad.dflag=Per l'opzione '-d, --describe-module' non \u00E8 necessario specificare alcun file di input
+error.bad.dflag=Per l'opzione '-d, --describe-module' non è necessario specificare alcun file di input
 error.bad.reason=Motivo non valido: {0}. Deve essere deprecated, deprecated-for-removal o incubating
 error.nosuch.fileordir={0} : file o directory inesistente
 error.write.file=Errore durante la scrittura del file jar esistente
@@ -50,14 +50,14 @@ error.module.descriptor.not.found=Descrittore di modulo non trovato
 error.invalid.versioned.module.attribute=Attributo descrittore del modulo {0} non valido.
 error.missing.provider=Provider di servizi non trovato: {0}
 error.release.value.notnumber=release {0} non valida
-error.release.value.toosmall=la release {0} non \u00E8 valida: deve essere >= 9
+error.release.value.toosmall=la release {0} non è valida: deve essere >= 9
 error.release.unexpected.versioned.entry=voce con controllo delle versioni non prevista {0} per la release {1}
 error.validator.jarfile.exception=impossibile convalidare {0}: {1}
-error.validator.jarfile.invalid=file jar {0} con pi\u00F9 release non valido eliminato
+error.validator.jarfile.invalid=file jar {0} con più release non valido eliminato
 error.validator.bad.entry.name=nome di voce {0} con formato non valido
 error.validator.version.notnumber=il nome di voce {0} non dispone di un numero di versione
-error.validator.entryname.tooshort=nome di voce {0} troppo breve. Non \u00E8 una directory
-error.validator.isolated.nested.class=la voce {0} \u00E8 una classe nidificata isolata
+error.validator.entryname.tooshort=nome di voce {0} troppo breve. Non è una directory
+error.validator.isolated.nested.class=la voce {0} è una classe nidificata isolata
 error.validator.new.public.class=la voce {0} contiene una nuova classe pubblica non trovata nelle voci di base
 error.validator.incompatible.class.version=la voce {0} ha una versione incompatibile con una versione precedente
 error.validator.different.api=la voce {0} contiene una classe con un''API diversa dalla versione precedente
@@ -71,16 +71,16 @@ error.validator.info.opens.notequal=module-info.class in una directory con contr
 error.validator.info.provides.notequal=module-info.class in una directory con controllo delle versioni contiene valori "provides" differenti
 error.validator.info.version.notequal={0}: module-info.class in una directory con controllo delle versioni contiene valori "version" differenti
 error.validator.info.manclass.notequal={0}: module-info.class in una directory con controllo delle versioni contiene valori "main-class" differenti
-warn.validator.identical.entry=Avvertenza: la voce {0} contiene una classe\nidentica a una voce gi\u00E0 presente nel file jar
-warn.validator.resources.with.same.name=Avvertenza: voce {0}. Pi\u00F9 risorse con lo stesso nome
-warn.validator.concealed.public.class=Avvertenza: la voce {0} \u00E8 una classe pubblica\nin un package nascosto. Il posizionamento di questo file jar nel classpath\ngenerer\u00E0 interfacce pubbliche incompatibili
+warn.validator.identical.entry=Avvertenza: la voce {0} contiene una classe\nidentica a una voce già presente nel file jar
+warn.validator.resources.with.same.name=Avvertenza: voce {0}. Più risorse con lo stesso nome
+warn.validator.concealed.public.class=Avvertenza: la voce {0} è una classe pubblica\nin un package nascosto. Il posizionamento di questo file jar nel classpath\ngenererà interfacce pubbliche incompatibili
 warn.release.unexpected.versioned.entry=voce con controllo delle versioni non prevista {0}
 out.added.manifest=aggiunto manifest
 out.added.module-info=aggiunto module-info: {0}
 out.automodule=Nessun descrittore di modulo trovato. Derivato modulo automatico.
 out.update.manifest=aggiornato manifest
 out.update.module-info=aggiornato module-info: {0}
-out.ignore.entry=la voce {0} sar\u00E0 ignorata
+out.ignore.entry=la voce {0} sarà ignorata
 out.adding=aggiunta in corso di: {0}
 out.deflated=(compresso {0}%)
 out.stored=(memorizzato 0%)
@@ -89,25 +89,25 @@ out.extracted=estratto: {0}
 out.inflated=\ decompresso: {0}
 out.size=(in = {0}) (out = {1})
 
-usage.compat=Interfaccia di compatibilit\u00E0:\nUso: jar {ctxui}[vfmn0PMe] [file-jar] [file-manifest] [punto di ingresso] [-C dir] file] ...\nOpzioni:\n    -c  crea un nuovo archivio\n    -t  visualizza l'indice dell'archivio\n    -x  estrae i file con nome (o tutti i file) dall'archivio\n    -u  aggiorna l'archivio esistente\n    -v  genera output commentato dall'output standard\n    -f  specifica il nome file dell'archivio\n    -m  include informazioni manifest dal file manifest specificato\n    -n  esegue la normalizzazione Pack200 dopo la creazione di un nuovo archivio\n    -e  specifica il punto di ingresso per l'applicazione stand-alone \n        inclusa nel file jar eseguibile\n    -0  solo memorizzazione; senza compressione ZIP\n    -P  conserva i componenti iniziali '/' (percorso assoluto) e \\"..\\" (directory padre) dai nomi file\n    -M  consente di non creare un file manifest per le voci\n    -i  genera informazioni sull'indice per i file jar specificati\n    -C  imposta la directory specificata e include il file seguente\nSe un file \u00E8 una directory, verr\u00E0 elaborato in modo ricorsivo.\nIl nome del file manifest, del file di archivio e del punto di ingresso devono\nessere specificati nello stesso ordine dei flag 'm', 'f' ed 'e'.\n\nEsempio 1: archiviazione di due file di classe in un archivio con il nome classes.jar: \n       jar cvf classes.jar Foo.class Bar.class \nEsempio 2: utilizzo del file manifest esistente 'mymanifest' e archiviazione di tutti i\n           file della directory foo/ in 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/ .\n
+usage.compat=Interfaccia di compatibilità:\nUso: jar {ctxui}[vfmn0PMe] [file-jar] [file-manifest] [punto di ingresso] [-C dir] file] ...\nOpzioni:\n    -c  crea un nuovo archivio\n    -t  visualizza l'indice dell'archivio\n    -x  estrae i file con nome (o tutti i file) dall'archivio\n    -u  aggiorna l'archivio esistente\n    -v  genera output commentato dall'output standard\n    -f  specifica il nome file dell'archivio\n    -m  include informazioni manifest dal file manifest specificato\n    -n  esegue la normalizzazione Pack200 dopo la creazione di un nuovo archivio\n    -e  specifica il punto di ingresso per l'applicazione stand-alone \n        inclusa nel file jar eseguibile\n    -0  solo memorizzazione; senza compressione ZIP\n    -P  conserva i componenti iniziali '/' (percorso assoluto) e \\"..\\" (directory padre) dai nomi file\n    -M  consente di non creare un file manifest per le voci\n    -i  genera informazioni sull'indice per i file jar specificati\n    -C  imposta la directory specificata e include il file seguente\nSe un file è una directory, verrà elaborato in modo ricorsivo.\nIl nome del file manifest, del file di archivio e del punto di ingresso devono\nessere specificati nello stesso ordine dei flag 'm', 'f' ed 'e'.\n\nEsempio 1: archiviazione di due file di classe in un archivio con il nome classes.jar: \n       jar cvf classes.jar Foo.class Bar.class \nEsempio 2: utilizzo del file manifest esistente 'mymanifest' e archiviazione di tutti i\n           file della directory foo/ in 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/ .\n
 
 main.usage.summary=Uso: jar [OPTION...] [ [--release VERSION] [-C dir] file] ...
 main.usage.summary.try=Utilizzare 'jar --help' per ulteriori informazioni.
 
-main.help.preopt=Uso: jar [OPTION...] [ [--release VERSION] [-C dir] file] ...\nIl file jar crea un archivio per le classi e le risorse e pu\u00F2 manipolare o\nripristinare le singole classi o risorse da un archivio.\n\n Esempi:\n # Crea un archivio denominato classes.jar con due file di classe:\n jar --create --file classes.jar Foo.class Bar.class\n # Crea un archivio mediante un file manifest esistente, con tutti i file in foo/:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # Crea un archivio jar modulare, in cui il descrittore di modulo si trova in\n # classes/module-info.class:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # Aggiorna un file jar non modulare esistente in un file jar modulare:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # Crea un file jar per pi\u00F9 release, posizionando alcuni file nella directory META-INF/versions/9:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\nPer abbreviare o semplificare il comando jar, \u00E8 possibile specificare gli argomenti in un file\ndi testo distinto e passarlo al comando jar con il segno @ come prefisso.\n\n Esempi:\n # Legge le opzioni aggiuntive e la lista di file di classe dal file classes.list\n jar --create --file my.jar @classes.list\n
-main.help.opt.main=\ Modalit\u00E0 di funzionamento principale:\n
+main.help.preopt=Uso: jar [OPTION...] [ [--release VERSION] [-C dir] file] ...\nIl file jar crea un archivio per le classi e le risorse e può manipolare o\nripristinare le singole classi o risorse da un archivio.\n\n Esempi:\n # Crea un archivio denominato classes.jar con due file di classe:\n jar --create --file classes.jar Foo.class Bar.class\n # Crea un archivio mediante un file manifest esistente, con tutti i file in foo/:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # Crea un archivio jar modulare, in cui il descrittore di modulo si trova in\n # classes/module-info.class:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # Aggiorna un file jar non modulare esistente in un file jar modulare:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # Crea un file jar per più release, posizionando alcuni file nella directory META-INF/versions/9:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\nPer abbreviare o semplificare il comando jar, è possibile specificare gli argomenti in un file\ndi testo distinto e passarlo al comando jar con il segno @ come prefisso.\n\n Esempi:\n # Legge le opzioni aggiuntive e la lista di file di classe dal file classes.list\n jar --create --file my.jar @classes.list\n
+main.help.opt.main=\ Modalità di funzionamento principale:\n
 main.help.opt.main.create=\  -c, --create               Crea l'archivio
 main.help.opt.main.generate-index=\  -i, --generate-index=FILE  Genera le informazioni sull'indice per gli archivi\n                             jar specificati
 main.help.opt.main.list=\  -t, --list                 Visualizza l'indice dell'archivio
 main.help.opt.main.update=\  -u, --update               Aggiorna un archivio jar esistente
 main.help.opt.main.extract=\  -x, --extract              Estrae i file con nome (o tutti i file) dall'archivio
 main.help.opt.main.describe-module=\  -d, --describe-module      Visualizza il descrittore di modulo o il nome modulo automatico
-main.help.opt.any=\ Modificatori di funzionamento validi in qualsiasi modalit\u00E0:\n\n  -C DIR                     Passa alla directory specificata e include il\n                              file seguente
+main.help.opt.any=\ Modificatori di funzionamento validi in qualsiasi modalità:\n\n  -C DIR                     Passa alla directory specificata e include il\n                              file seguente
 main.help.opt.any.file=\  -f, --file=FILE            Il nome file dell'archivio. Se omesso, viene usato stdin o\n                             stdout in base all'operazione\n      --release VERSION      Posiziona tutti i file successivi in una directory con controllo delle versioni\n                             del file jar (ad esempio, META-INF/versions/VERSION/)
 main.help.opt.any.verbose=\  -v, --verbose              Genera l'output descrittivo nell'output standard
-main.help.opt.create=\ Modificatori di funzionamento validi solo nella modalit\u00E0 di creazione:\n
+main.help.opt.create=\ Modificatori di funzionamento validi solo nella modalità di creazione:\n
 main.help.opt.create.normalize=\  -n, --normalize            Normalizza le informazioni nel nuovo archivio jar\n                             dopo la creazione
-main.help.opt.create.update=\ Modificatori di funzionamento validi solo nella modalit\u00E0 di creazione e aggiornamento:\n
+main.help.opt.create.update=\ Modificatori di funzionamento validi solo nella modalità di creazione e aggiornamento:\n
 main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME Punto di ingresso per le applicazioni\n                             stand-alone incluse nell'archivio jar modulare o\n                             eseguibile
 main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Include le informazioni sul file manifest dal file\n                             manifest specificato
 main.help.opt.create.update.no-manifest=\  -M, --no-manifest          Non crea un file manifest per le voci
@@ -115,11 +115,11 @@ main.help.opt.create.update.module-version=\      --module-version=VERSION    Ve
 main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN Calcola e registra gli hash dei moduli \n                             corrispondenti in base al pattern specificato e dipendenti\n                             in modo diretto o indiretto dalla creazione di un file jar modulare\n                             o dall'aggiornamento di un file jar non modulare
 main.help.opt.create.update.module-path=\  -p, --module-path          Posizione della dipendenza del modulo per la generazione\n                             dell'hash
 main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  Esclude dal set radice predefinito dei moduli
-main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Suggerimento per uno strumento per l'emissione di un'avvertenza se il modulo\n                             viene risolto. Pu\u00F2 essere deprecated, deprecated-for-removal\n                             o incubating
-main.help.opt.create.update.index=\ Modificatori di funzionamento validi solo nella modalit\u00E0 di creazione, aggiornamento e di generazione dell'indice:\n
+main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Suggerimento per uno strumento per l'emissione di un'avvertenza se il modulo\n                             viene risolto. Può essere deprecated, deprecated-for-removal\n                             o incubating
+main.help.opt.create.update.index=\ Modificatori di funzionamento validi solo nella modalità di creazione, aggiornamento e di generazione dell'indice:\n
 main.help.opt.create.update.index.no-compress=\  -0, --no-compress          Solo per la memorizzazione. Non utilizza alcuna compressione ZIP
 main.help.opt.other=\ Altre opzioni:\n
-main.help.opt.other.help=\  -h, --help[:compat]        Fornisce questa Guida o facoltativamente la Guida sulla compatibilit\u00E0
+main.help.opt.other.help=\  -h, --help[:compat]        Fornisce questa Guida o facoltativamente la Guida sulla compatibilità
 main.help.opt.other.help-extra=\      --help-extra           Fornisce la Guida per le opzioni non standard
 main.help.opt.other.version=\      --version              Stampa la versione del programma
-main.help.postopt=\ Un archivio \u00E8 un file jar modulare se un descrittore di modulo, 'module-info.class', si trova\n nella directory radice delle directory specificate o nella radice dell'archivio jar\n stesso. Le operazioni seguenti sono valide solo durante la creazione di un file jar modulare\n o l'aggiornamento di un file jar non modulare esistente: '--module-version',\n '--hash-modules' e '--module-path'.\n\n Gli argomenti obbligatori o facoltativi per le opzioni lunghe sono obbligatori\n  o facoltativi anche per le opzioni brevi corrispondenti.
+main.help.postopt=\ Un archivio è un file jar modulare se un descrittore di modulo, 'module-info.class', si trova\n nella directory radice delle directory specificate o nella radice dell'archivio jar\n stesso. Le operazioni seguenti sono valide solo durante la creazione di un file jar modulare\n o l'aggiornamento di un file jar non modulare esistente: '--module-version',\n '--hash-modules' e '--module-path'.\n\n Gli argomenti obbligatori o facoltativi per le opzioni lunghe sono obbligatori\n  o facoltativi anche per le opzioni brevi corrispondenti.
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
index c90e6142408..0444689acd3 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
@@ -25,111 +25,111 @@
 
 ## tool
 
-jar.description=\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u306E\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u4F5C\u6210\u3057\u3001\u500B\u3005\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30EA\u30BD\u30FC\u30B9\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u64CD\u4F5C\u307E\u305F\u306F\u5FA9\u5143\u3057\u307E\u3059
+jar.description=クラスおよびリソースのアーカイブを作成し、個々のクラスまたはリソースをアーカイブから操作または復元します
 
-error.multiple.main.operations=\u8907\u6570\u306E'cuxtid'\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093
-error.cant.open={0}\u3092\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
-error.illegal.option=\u4E0D\u6B63\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
-error.unrecognized.option=\u8A8D\u8B58\u3055\u308C\u306A\u3044\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
-error.missing.arg=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002
-error.bad.file.arg=\u30D5\u30A1\u30A4\u30EB\u5F15\u6570\u306E\u89E3\u6790\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-error.bad.option=\u30AA\u30D7\u30B7\u30E7\u30F3-{ctxuid}\u307E\u305F\u306F--validate\u306E\u3044\u305A\u308C\u304B\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-error.bad.cflag=\u30D5\u30E9\u30B0'c'\u3067\u306F\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u307E\u305F\u306F\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u6307\u5B9A\u304C\u5FC5\u8981\u3067\u3059\u3002
-error.bad.uflag=\u30D5\u30E9\u30B0'u'\u3067\u306F\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u304B'e'\u30D5\u30E9\u30B0\u3001\u307E\u305F\u306F\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u6307\u5B9A\u304C\u5FC5\u8981\u3067\u3059\u3002
-error.bad.eflag='e'\u30D5\u30E9\u30B0\u3068'Main-Class'\u5C5E\u6027\u3092\u6301\u3064\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u306F\u540C\u6642\u306B\n\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-error.bad.dflag='-d, --describe-module'\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u6307\u5B9A\u306F\u4E0D\u8981\u3067\u3059
-error.bad.reason=\u4E0D\u6B63\u306A\u7406\u7531: {0}\u3001\u975E\u63A8\u5968\u3001\u524A\u9664\u4E88\u5B9A\u306E\u975E\u63A8\u5968\u307E\u305F\u306F\u5B9F\u9A13\u7684\u306E\u3044\u305A\u308C\u304B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-error.nosuch.fileordir={0}\u3068\u3044\u3046\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u3042\u308A\u307E\u305B\u3093
-error.write.file=\u65E2\u5B58jar\u30D5\u30A1\u30A4\u30EB\u306E\u66F8\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-error.create.dir=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-error.incorrect.length={0}\u306E\u51E6\u7406\u4E2D\u306B\u4E0D\u6B63\u306A\u9577\u3055\u304C\u3042\u308A\u307E\u3057\u305F
-error.create.tempfile=\u4E00\u6642\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-error.hash.dep=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u4F9D\u5B58\u6027\u306E\u30CF\u30C3\u30B7\u30E5\u3067\u30E2\u30B8\u30E5\u30FC\u30EB{1}\u304C\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306B\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-error.module.options.without.info=--module-version\u307E\u305F\u306F--hash-modules\u306E\u3044\u305A\u308C\u304B\u3067module-info.class\u304C\u3042\u308A\u307E\u305B\u3093
-error.no.operative.descriptor=\u30EA\u30EA\u30FC\u30B9\u306E\u64CD\u4F5C\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u306F\u3042\u308A\u307E\u305B\u3093: {0}
-error.no.root.descriptor=\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u304C\u3042\u308A\u307E\u305B\u3093\u3002--release\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
-error.unable.derive.automodule=\u6B21\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u3092\u5C0E\u51FA\u3067\u304D\u307E\u305B\u3093: {0}
-error.unexpected.module-info=\u4E88\u671F\u3057\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF{0}
-error.module.descriptor.not.found=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-error.invalid.versioned.module.attribute=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u5C5E\u6027{0}\u304C\u7121\u52B9\u3067\u3059
-error.missing.provider=\u30B5\u30FC\u30D3\u30B9\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-error.release.value.notnumber=\u30EA\u30EA\u30FC\u30B9{0}\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-error.release.value.toosmall=\u30EA\u30EA\u30FC\u30B9{0}\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u30029\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-error.release.unexpected.versioned.entry=\u30EA\u30EA\u30FC\u30B9{1}\u3067\u4E88\u671F\u3057\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u6E08\u30A8\u30F3\u30C8\u30EA{0}
-error.date.notvalid=\u65E5\u4ED8{0}\u304C\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u3092\u6307\u5B9A\u3057\u305F\u3001\u6709\u52B9\u306AISO-8601\u306E\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\u306E\u65E5\u6642\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-error.date.out.of.range=\u65E5\u4ED8{0}\u304C\u6709\u52B9\u306A\u7BC4\u56F21980-01-01T00:00:02Z to 2099-12-31T23:59:59Z\u306B\u3042\u308A\u307E\u305B\u3093
-error.validator.jarfile.exception={0}\u3092\u691C\u8A3C\u3067\u304D\u307E\u305B\u3093: {1}
-error.validator.jarfile.invalid=\u7121\u52B9\u306A\u30DE\u30EB\u30C1\u30EA\u30EA\u30FC\u30B9jar\u30D5\u30A1\u30A4\u30EB{0}\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F
-error.validator.bad.entry.name=\u30A8\u30F3\u30C8\u30EA\u540D\u304C\u4E0D\u6B63\u3067\u3059: {0}
-error.validator.version.notnumber=\u30A8\u30F3\u30C8\u30EA\u540D: {0}\u306B\u30D0\u30FC\u30B8\u30E7\u30F3\u756A\u53F7\u304C\u3042\u308A\u307E\u305B\u3093
-error.validator.entryname.tooshort=\u30A8\u30F3\u30C8\u30EA\u540D: {0}\u304C\u77ED\u3059\u304E\u307E\u3059\u3002\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-error.validator.isolated.nested.class=\u30A8\u30F3\u30C8\u30EA: {0}\u306F\u3001\u5206\u96E2\u578B\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u3067\u3059
-error.validator.new.public.class=\u30A8\u30F3\u30C8\u30EA: {0}\u306B\u306F\u3001\u30D9\u30FC\u30B9\u30FB\u30A8\u30F3\u30C8\u30EA\u306B\u5B58\u5728\u3057\u306A\u3044\u65B0\u3057\u3044public\u30AF\u30E9\u30B9\u304C\u542B\u307E\u308C\u307E\u3059
-error.validator.incompatible.class.version=\u30A8\u30F3\u30C8\u30EA: {0}\u306B\u306F\u3001\u4EE5\u524D\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3068\u4E92\u63DB\u6027\u306E\u306A\u3044\u30AF\u30E9\u30B9\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059
-error.validator.different.api=\u30A8\u30F3\u30C8\u30EA: {0}\u306B\u306F\u3001\u4EE5\u524D\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3068\u306F\u7570\u306A\u308BAPI\u3092\u6301\u3064\u30AF\u30E9\u30B9\u304C\u542B\u307E\u308C\u307E\u3059
-error.validator.names.mismatch=\u30A8\u30F3\u30C8\u30EA: {0}\u306B\u306F\u3001\u5185\u90E8\u540D{1}\u3092\u6301\u3064\u30AF\u30E9\u30B9\u304C\u542B\u307E\u308C\u307E\u3059\u304C\u3001\u540D\u524D\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093
-error.validator.info.name.notequal=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u6B63\u3057\u304F\u306A\u3044\u540D\u524D\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.validator.info.requires.transitive=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u8FFD\u52A0\u306E"requires transitive"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.validator.info.requires.added=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u8FFD\u52A0\u306E"requires"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.validator.info.requires.dropped=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u6B20\u843D\u3057\u3066\u3044\u308B"requires"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.validator.info.exports.notequal=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u7570\u306A\u308B"exports"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.validator.info.opens.notequal=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u7570\u306A\u308B"opens"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.validator.info.provides.notequal=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u7570\u306A\u308B"provides"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.validator.info.version.notequal={0}: \u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u7570\u306A\u308B"version"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.validator.info.manclass.notequal={0}: \u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u7570\u306A\u308B"main-class"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-warn.validator.identical.entry=\u8B66\u544A : \u30A8\u30F3\u30C8\u30EA{0}\u306B\u306F\u3001jar\u306B\u3059\u3067\u306B\u5B58\u5728\u3059\u308B\n\u30A8\u30F3\u30C8\u30EA\u3068\u540C\u3058\u30AF\u30E9\u30B9\u304C\u542B\u307E\u308C\u307E\u3059
-warn.validator.resources.with.same.name=\u8B66\u544A : \u30A8\u30F3\u30C8\u30EA{0}\u3001\u540C\u3058\u540D\u524D\u3092\u6301\u3064\u8907\u6570\u306E\u30EA\u30BD\u30FC\u30B9
-warn.validator.concealed.public.class=\u8B66\u544A : \u30A8\u30F3\u30C8\u30EA{0}\u306F\u3001\u96A0\u3057\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u306Epublic\u30AF\u30E9\u30B9\u3067\u3059\u3002\n\u30AF\u30E9\u30B9\u30D1\u30B9\u306B\u3053\u306Ejar\u3092\u914D\u7F6E\u3059\u308B\u3068\u3001\u4E92\u63DB\u6027\u306E\u306A\u3044\npublic\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u751F\u6210\u3055\u308C\u307E\u3059
-warn.release.unexpected.versioned.entry=\u4E88\u671F\u3057\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u6E08\u30A8\u30F3\u30C8\u30EA{0}
-warn.index.is.ignored=JDK 18\u4EE5\u964D\u3001JAR\u7D22\u5F15(META-INF/INDEX.LIST)\u306F\u5B9F\u884C\u6642\u306B\u7121\u8996\u3055\u308C\u307E\u3059
-warn.flag.is.deprecated=\u8B66\u544A: {0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u7121\u8996\u307E\u305F\u306F\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\n
-out.added.manifest=\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u304C\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F
-out.added.module-info=module-info\u304C\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F: {0}
-out.automodule=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u5C0E\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
-out.update.manifest=\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u304C\u66F4\u65B0\u3055\u308C\u307E\u3057\u305F
-out.update.module-info=module-info\u304C\u66F4\u65B0\u3055\u308C\u307E\u3057\u305F: {0}
-out.ignore.entry=\u30A8\u30F3\u30C8\u30EA{0}\u3092\u7121\u8996\u3057\u307E\u3059
-out.adding={0}\u3092\u8FFD\u52A0\u4E2D\u3067\u3059
-out.deflated=({0}%\u53CE\u7E2E\u3055\u308C\u307E\u3057\u305F)
-out.stored=(0%\u683C\u7D0D\u3055\u308C\u307E\u3057\u305F)
-out.create=\  {0}\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F
-out.extracted={0}\u304C\u62BD\u51FA\u3055\u308C\u307E\u3057\u305F
-out.inflated=\ {0}\u304C\u5C55\u958B\u3055\u308C\u307E\u3057\u305F
-out.size=(\u5165={0})(\u51FA={1})
+error.multiple.main.operations=複数の'cuxtid'オプションを指定できません
+error.cant.open={0}を開くことができません
+error.illegal.option=不正なオプション: {0}
+error.unrecognized.option=認識されないオプション: {0}
+error.missing.arg=オプション{0}には引数が必要です。
+error.bad.file.arg=ファイル引数の解析中にエラーが発生しました
+error.bad.option=オプション-{ctxuid}または--validateのいずれかを指定する必要があります。
+error.bad.cflag=フラグ'c'ではマニフェストまたは入力ファイルの指定が必要です。
+error.bad.uflag=フラグ'u'ではマニフェストか'e'フラグ、または入力ファイルの指定が必要です。
+error.bad.eflag='e'フラグと'Main-Class'属性を持つマニフェストは同時に\n指定できません。
+error.bad.dflag='-d, --describe-module'オプションでは入力ファイルの指定は不要です
+error.bad.reason=不正な理由: {0}、非推奨、削除予定の非推奨または実験的のいずれかである必要があります
+error.nosuch.fileordir={0}というファイルまたはディレクトリはありません
+error.write.file=既存jarファイルの書込み中にエラーが発生しました
+error.create.dir=ディレクトリ{0}を作成できませんでした
+error.incorrect.length={0}の処理中に不正な長さがありました
+error.create.tempfile=一時ファイルを作成できませんでした
+error.hash.dep=モジュール{0}依存性のハッシュでモジュール{1}がモジュール・パスに見つかりません
+error.module.options.without.info=--module-versionまたは--hash-modulesのいずれかでmodule-info.classがありません
+error.no.operative.descriptor=リリースの操作ディスクリプタはありません: {0}
+error.no.root.descriptor=ルート・モジュールのディスクリプタがありません。--releaseを指定してください
+error.unable.derive.automodule=次のモジュール・ディスクリプタを導出できません: {0}
+error.unexpected.module-info=予期しないモジュール・ディスクリプタ{0}
+error.module.descriptor.not.found=モジュール・ディスクリプタが見つかりません
+error.invalid.versioned.module.attribute=モジュール・ディスクリプタ属性{0}が無効です
+error.missing.provider=サービス・プロバイダが見つかりません: {0}
+error.release.value.notnumber=リリース{0}は有効ではありません
+error.release.value.toosmall=リリース{0}は有効ではありません。9以上である必要があります
+error.release.unexpected.versioned.entry=リリース{1}で予期しないバージョニング済エントリ{0}
+error.date.notvalid=日付{0}が、オプションのタイムゾーンを指定した、有効なISO-8601の拡張オフセットの日時ではありません
+error.date.out.of.range=日付{0}が有効な範囲1980-01-01T00:00:02Z to 2099-12-31T23:59:59Zにありません
+error.validator.jarfile.exception={0}を検証できません: {1}
+error.validator.jarfile.invalid=無効なマルチリリースjarファイル{0}が削除されました
+error.validator.bad.entry.name=エントリ名が不正です: {0}
+error.validator.version.notnumber=エントリ名: {0}にバージョン番号がありません
+error.validator.entryname.tooshort=エントリ名: {0}が短すぎます。ディレクトリではありません
+error.validator.isolated.nested.class=エントリ: {0}は、分離型のネストされたクラスです
+error.validator.new.public.class=エントリ: {0}には、ベース・エントリに存在しない新しいpublicクラスが含まれます
+error.validator.incompatible.class.version=エントリ: {0}には、以前のバージョンと互換性のないクラス・バージョンが含まれます
+error.validator.different.api=エントリ: {0}には、以前のバージョンとは異なるAPIを持つクラスが含まれます
+error.validator.names.mismatch=エントリ: {0}には、内部名{1}を持つクラスが含まれますが、名前が一致しません
+error.validator.info.name.notequal=バージョニングされたディレクトリのmodule-info.classに正しくない名前が含まれています
+error.validator.info.requires.transitive=バージョニング・ディレクトリのmodule-info.classに追加の"requires transitive"が含まれています
+error.validator.info.requires.added=バージョニングされたディレクトリのmodule-info.classに追加の"requires"が含まれています
+error.validator.info.requires.dropped=バージョニングされたディレクトリのmodule-info.classに欠落している"requires"が含まれています
+error.validator.info.exports.notequal=バージョニングされたディレクトリのmodule-info.classに異なる"exports"が含まれています
+error.validator.info.opens.notequal=バージョニング・ディレクトリのmodule-info.classに異なる"opens"が含まれています
+error.validator.info.provides.notequal=バージョニングされたディレクトリのmodule-info.classに異なる"provides"が含まれています
+error.validator.info.version.notequal={0}: バージョニングされたディレクトリのmodule-info.classに異なる"version"が含まれています
+error.validator.info.manclass.notequal={0}: バージョニングされたディレクトリのmodule-info.classに異なる"main-class"が含まれています
+warn.validator.identical.entry=警告 : エントリ{0}には、jarにすでに存在する\nエントリと同じクラスが含まれます
+warn.validator.resources.with.same.name=警告 : エントリ{0}、同じ名前を持つ複数のリソース
+warn.validator.concealed.public.class=警告 : エントリ{0}は、隠しパッケージ内のpublicクラスです。\nクラスパスにこのjarを配置すると、互換性のない\npublicインタフェースが生成されます
+warn.release.unexpected.versioned.entry=予期しないバージョニング済エントリ{0}
+warn.index.is.ignored=JDK 18以降、JAR索引(META-INF/INDEX.LIST)は実行時に無視されます
+warn.flag.is.deprecated=警告: {0}オプションは非推奨であり、今後のリリースで無視または削除される可能性があります\n
+out.added.manifest=マニフェストが追加されました
+out.added.module-info=module-infoが追加されました: {0}
+out.automodule=モジュール・ディスクリプタが見つかりません。自動モジュールが導出されました。
+out.update.manifest=マニフェストが更新されました
+out.update.module-info=module-infoが更新されました: {0}
+out.ignore.entry=エントリ{0}を無視します
+out.adding={0}を追加中です
+out.deflated=({0}%収縮されました)
+out.stored=(0%格納されました)
+out.create=\  {0}が作成されました
+out.extracted={0}が抽出されました
+out.inflated=\ {0}が展開されました
+out.size=(入={0})(出={1})
 
-usage.compat=\u4E92\u63DB\u6027\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:\n\u4F7F\u7528\u65B9\u6CD5: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...\n\u30AA\u30D7\u30B7\u30E7\u30F3:\n    -c  \u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B(\u6B20\u843D\u3057\u3066\u3044\u308B\u89AA\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u542B\u3080)\n    -t  \u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5185\u5BB9\u3092\u4E00\u89A7\u8868\u793A\u3059\u308B\n    -x  \u6307\u5B9A\u306E(\u307E\u305F\u306F\u3059\u3079\u3066\u306E)\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u62BD\u51FA\u3059\u308B\n    -u  \u65E2\u5B58\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u66F4\u65B0\u3059\u308B\n    -v  \u6A19\u6E96\u51FA\u529B\u306B\u8A73\u7D30\u306A\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n    -f  \u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3059\u308B\n    -m  \u6307\u5B9A\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u60C5\u5831\u3092\u53D6\u308A\u8FBC\u3080\n    -e  \u5B9F\u884C\u53EF\u80FDjar\u30D5\u30A1\u30A4\u30EB\u306B\u30D0\u30F3\u30C9\u30EB\u3055\u308C\u305F\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E \n        \u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u3092\u6307\u5B9A\u3059\u308B\n    -0  \u683C\u7D0D\u306E\u307F\u3002ZIP\u5727\u7E2E\u3092\u4F7F\u7528\u3057\u306A\u3044\n    -P  \u30D5\u30A1\u30A4\u30EB\u540D\u306E\u5148\u982D\u306E'/' (\u7D76\u5BFE\u30D1\u30B9)\u304A\u3088\u3073".." (\u89AA\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA)\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u4FDD\u6301\u3059\u308B\n    -M  \u30A8\u30F3\u30C8\u30EA\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u306A\u3044\n    -i  \u6307\u5B9A\u306Ejar\u30D5\u30A1\u30A4\u30EB\u306E\u7D22\u5F15\u60C5\u5831\u3092\u751F\u6210\u3059\u308B\n    -C  \u6307\u5B9A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5909\u66F4\u3057\u3001\u6B21\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u308A\u8FBC\u3080\n\u30D5\u30A1\u30A4\u30EB\u304C\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u5834\u5408\u306F\u518D\u5E30\u7684\u306B\u51E6\u7406\u3055\u308C\u307E\u3059\u3002\n\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3001\u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u304A\u3088\u3073\u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u540D\u306F\u3001\n\u30D5\u30E9\u30B0'm'\u3001'f'\u3001'e'\u306E\u6307\u5B9A\u3068\u540C\u3058\u9806\u756A\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\n\u4F8B1: 2\u3064\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6classes.jar\u306B\u4FDD\u5B58\u3059\u308B: \n       jar cvf classes.jar Foo.class Bar.class \n\u4F8B2: \u65E2\u5B58\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB'mymanifest'\u3092\u4F7F\u7528\u3057\u3001foo/\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\n           \u5168\u30D5\u30A1\u30A4\u30EB\u3092'classes.jar'\u306B\u30A2\u30FC\u30AB\u30A4\u30D6\u3059\u308B: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
+usage.compat=互換性インタフェース:\n使用方法: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...\nオプション:\n    -c  アーカイブを新規作成する(欠落している親ディレクトリを含む)\n    -t  アーカイブの内容を一覧表示する\n    -x  指定の(またはすべての)ファイルをアーカイブから抽出する\n    -u  既存アーカイブを更新する\n    -v  標準出力に詳細な出力を生成する\n    -f  アーカイブ・ファイル名を指定する\n    -m  指定のマニフェスト・ファイルからマニフェスト情報を取り込む\n    -e  実行可能jarファイルにバンドルされたスタンドアロン・アプリケーションの \n        エントリ・ポイントを指定する\n    -0  格納のみ。ZIP圧縮を使用しない\n    -P  ファイル名の先頭の'/' (絶対パス)および".." (親ディレクトリ)コンポーネントを保持する\n    -M  エントリのマニフェスト・ファイルを作成しない\n    -i  指定のjarファイルの索引情報を生成する\n    -C  指定のディレクトリに変更し、次のファイルを取り込む\nファイルがディレクトリの場合は再帰的に処理されます。\nマニフェスト・ファイル名、アーカイブ・ファイル名およびエントリ・ポイント名は、\nフラグ'm'、'f'、'e'の指定と同じ順番で指定する必要があります。\n\n例1: 2つのクラス・ファイルをアーカイブclasses.jarに保存する: \n       jar cvf classes.jar Foo.class Bar.class \n例2: 既存のマニフェスト・ファイル'mymanifest'を使用し、foo/ディレクトリの\n           全ファイルを'classes.jar'にアーカイブする: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
 
-main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...
-main.usage.summary.try=\u8A73\u7D30\u306F\u3001`jar --help'\u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+main.usage.summary=使用方法: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...
+main.usage.summary.try=詳細は、`jar --help'を実行してください。
 
-main.help.preopt=\u4F7F\u7528\u65B9\u6CD5: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar\u306F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u306E\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u4F5C\u6210\u3057\u3001\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u500B\u3005\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\n\u30EA\u30BD\u30FC\u30B9\u3092\u64CD\u4F5C\u307E\u305F\u306F\u5FA9\u5143\u3067\u304D\u307E\u3059\u3002\n\n \u4F8B:\n # 2\u3064\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3080classes.jar\u3068\u3044\u3046\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u4F5C\u6210\u3059\u308B:\n jar --create --file classes.jar Foo.class Bar.class\n # foo/\u306E\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3080\u3001\u65E2\u5B58\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u305F\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u4F5C\u6210\u3059\u308B:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # \u30E2\u30B8\u30E5\u30E9jar\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u4F5C\u6210\u3059\u308B\u3002\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u306Fclasses/module-info.class\u306B\n # \u3042\u308B:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # \u65E2\u5B58\u306E\u975E\u30E2\u30B8\u30E5\u30E9jar\u3092\u30E2\u30B8\u30E5\u30E9jar\u306B\u66F4\u65B0\u3059\u308B:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # \u8907\u6570\u30EA\u30EA\u30FC\u30B9jar\u3092\u4F5C\u6210\u3057\u3001\u4E00\u90E8\u306E\u30D5\u30A1\u30A4\u30EB\u3092META-INF/versions/9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u914D\u7F6E\u3059\u308B:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\njar\u30B3\u30DE\u30F3\u30C9\u3092\u77ED\u7E2E\u307E\u305F\u306F\u7C21\u7565\u5316\u3059\u308B\u306B\u306F\u3001\u500B\u5225\u306E\u30C6\u30AD\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u5F15\u6570\u3092\u6307\u5B9A\u3057\u3001\n\u8A18\u53F7(@)\u3092\u63A5\u982D\u8F9E\u3068\u3057\u3066\u4F7F\u7528\u3057\u3066jar\u30B3\u30DE\u30F3\u30C9\u306B\u6E21\u3057\u307E\u3059\u3002\n\n \u4F8B:\n # \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30EA\u30B9\u30C8\u3092\u30D5\u30A1\u30A4\u30EBclasses.list\u304B\u3089\u8AAD\u8FBC\u307F\u307E\u3059\n jar --create --file my.jar @classes.list\n
-main.help.opt.main=\ \u30E1\u30A4\u30F3\u64CD\u4F5C\u30E2\u30FC\u30C9:\n
-main.help.opt.main.create=\  -c\u3001--create               \u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002-f\u307E\u305F\u306F--file\u3067\u6307\u5B9A\u3055\u308C\u305F\n                             \u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u306B\u30D1\u30B9\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\n                             \u6B20\u843D\u3057\u3066\u3044\u308B\u89AA\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3082\u4F5C\u6210\u3055\u308C\u307E\u3059
-main.help.opt.main.generate-index=\  -i, --generate-index=FILE  \u6307\u5B9A\u3057\u305Fjar\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u7D22\u5F15\u60C5\u5831\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n                             \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\n                             \u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-main.help.opt.main.list=\  -t\u3001--list                 \u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5185\u5BB9\u3092\u4E00\u89A7\u8868\u793A\u3057\u307E\u3059
-main.help.opt.main.update=\  -u\u3001--update               \u65E2\u5B58\u306Ejar\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u66F4\u65B0\u3057\u307E\u3059
-main.help.opt.main.extract=\  -x\u3001--extract              \u6307\u5B9A\u306E(\u307E\u305F\u306F\u3059\u3079\u3066\u306E)\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u62BD\u51FA\u3057\u307E\u3059
-main.help.opt.main.describe-module=\  -d, --describe-module      \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u307E\u305F\u306F\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u3092\u51FA\u529B\u3057\u307E\u3059
-main.help.opt.main.validate=\      --validate            jar\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5185\u5BB9\u3092\u691C\u8A3C\u3057\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\n                             \u8907\u6570\u30EA\u30EA\u30FC\u30B9\u306Ejar\u30A2\u30FC\u30AB\u30A4\u30D6\u3067\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305FAPI\u304C\n                             \u3059\u3079\u3066\u306E\u7570\u306A\u308B\u30EA\u30EA\u30FC\u30B9\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u4E00\u8CAB\u3057\u3066\u3044\u308B\u3053\u3068\u3092\n                             \u691C\u8A3C\u3057\u307E\u3059\u3002
-main.help.opt.any=\ \u3069\u306E\u30E2\u30FC\u30C9\u3067\u3082\u6709\u52B9\u306A\u64CD\u4F5C\u4FEE\u98FE\u5B50:\n\n  -C DIR                     \u6307\u5B9A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5909\u66F4\u3057\u3001\u6B21\u306E\u30D5\u30A1\u30A4\u30EB\u3092\n                             \u53D6\u308A\u8FBC\u307F\u307E\u3059
-main.help.opt.any.file=\  -f\u3001--file=FILE            \u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3002\u7701\u7565\u3057\u305F\u5834\u5408\u3001stdin\u307E\u305F\u306F\n                             stdout\u306E\u3044\u305A\u308C\u304B\u304C\u64CD\u4F5C\u306B\u57FA\u3065\u3044\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n      --release VERSION      \u6B21\u306E\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u3092jar\u306E\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                             (\u3064\u307E\u308A\u3001META-INF/versions/VERSION/)\u306B\u914D\u7F6E\u3057\u307E\u3059
-main.help.opt.any.verbose=\  -v\u3001--verbose              \u6A19\u6E96\u51FA\u529B\u306B\u8A73\u7D30\u306A\u51FA\u529B\u3092\u751F\u6210\u3057\u307E\u3059
-main.help.opt.create=\ \u4F5C\u6210\u30E2\u30FC\u30C9\u3067\u306E\u307F\u6709\u52B9\u306A\u64CD\u4F5C\u4FEE\u98FE\u5B50:\n
-main.help.opt.create.normalize=\  -n, --normalize            \u65B0\u3057\u3044jar\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u4F5C\u6210\u5F8C\u3001\u542B\u307E\u308C\u308B\u60C5\u5831\u3092\n                             \u6B63\u898F\u5316\u3057\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\n                             \u4ECA\u5F8C\u306EJDK\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3059
-main.help.opt.create.update=\ \u4F5C\u6210\u307E\u305F\u306F\u66F4\u65B0\u30E2\u30FC\u30C9\u3067\u306E\u307F\u6709\u52B9\u306A\u64CD\u4F5C\u4FEE\u98FE\u5B50:\n
-main.help.opt.create.update.main-class=\  -e\u3001--main-class=CLASSNAME \u30E2\u30B8\u30E5\u30E9\u307E\u305F\u306F\u5B9F\u884C\u53EF\u80FD\u306Ajar\u30A2\u30FC\u30AB\u30A4\u30D6\u306B\n                             \u30D0\u30F3\u30C9\u30EB\u3055\u308C\u305F\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\n                             \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8
-main.help.opt.create.update.manifest=\  -m\u3001--manifest=FILE        \u6307\u5B9A\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u60C5\u5831\u3092\n                             \u53D6\u308A\u8FBC\u307F\u307E\u3059
-main.help.opt.create.update.no-manifest=\  -M\u3001--no-manifest          \u30A8\u30F3\u30C8\u30EA\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u307E\u305B\u3093
-main.help.opt.create.update.module-version=\      --module-version=VERSION    \u30E2\u30B8\u30E5\u30E9jar\u306E\u4F5C\u6210\u6642\u307E\u305F\u306F\u975E\u30E2\u30B8\u30E5\u30E9jar\u306E\u66F4\u65B0\u6642\u306E\n                             \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3
-main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN \u30E2\u30B8\u30E5\u30E9jar\u306E\u4F5C\u6210\u6642\u307E\u305F\u306F\u975E\u30E2\u30B8\u30E5\u30E9jar\u306E\u66F4\u65B0\u6642\u306B\n                             \u6307\u5B9A\u306E\u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3057\u3001\u76F4\u63A5\u307E\u305F\u306F\u9593\u63A5\u7684\u306B\n                             \u4F9D\u5B58\u3057\u3066\u3044\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30CF\u30C3\u30B7\u30E5\u3092\n                             \u8A08\u7B97\u304A\u3088\u3073\u8A18\u9332\u3057\u307E\u3059
-main.help.opt.create.update.module-path=\  -p\u3001--module-path          \u30CF\u30C3\u30B7\u30E5\u3092\u751F\u6210\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u4F9D\u5B58\u6027\n                             \u306E\u5834\u6240
-main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  \u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30EB\u30FC\u30C8\u8A2D\u5B9A\u304B\u3089\u9664\u5916\u3057\u307E\u3059
-main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     \u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u89E3\u6C7A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u8B66\u544A\u3092\u767A\u884C\u3059\u308B\n                             \u30C4\u30FC\u30EB\u306E\u30D2\u30F3\u30C8\u3002\u975E\u63A8\u5968\u3001\u524A\u9664\u4E88\u5B9A\u306E\u975E\u63A8\u5968\u307E\u305F\u306F\n                             \u5B9F\u9A13\u7684\u306E\u3044\u305A\u308C\u304B
-main.help.opt.create.update.index=\ \u4F5C\u6210\u3001\u66F4\u65B0\u304A\u3088\u3073\u7D22\u5F15\u751F\u6210\u30E2\u30FC\u30C9\u3067\u306E\u307F\u6709\u52B9\u306A\u64CD\u4F5C\u4FEE\u98FE\u5B50:\n
-main.help.opt.create.update.index.no-compress=\  -0, --no-compress          \u683C\u7D0D\u306E\u307F\u3002ZIP\u5727\u7E2E\u3092\u4F7F\u7528\u3057\u307E\u305B\u3093
-main.help.opt.create.update.index.date=\      --date=TIMESTAMP       \u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u5F62\u5F0F\u3092\u6307\u5B9A\u3057\u305FISO-8601\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\n                            \u306E\u65E5\u6642\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3002\u30A8\u30F3\u30C8\u30EA\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u4F7F\u7528\u4F8B\u306F\u3001\n                             "2022-02-12T12:30:00-05:00"\u3067\u3059
-main.help.opt.other=\ \u305D\u306E\u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n
-main.help.opt.other.help=\  -?\u3001-h\u3001--help[:compat]        \u3053\u308C(\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u4E92\u63DB\u6027)\u3092help\u306B\u6307\u5B9A\u3057\u307E\u3059
-main.help.opt.other.help-extra=\      --help-extra           \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u63D0\u4F9B\u3057\u307E\u3059
-main.help.opt.other.version=\      --version              \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u307E\u3059
-main.help.postopt=\ \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF'module-info.class'\u304C\u6307\u5B9A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30EB\u30FC\u30C8\u307E\u305F\u306F\n jar\u30A2\u30FC\u30AB\u30A4\u30D6\u81EA\u4F53\u306E\u30EB\u30FC\u30C8\u306B\u3042\u308B\u5834\u5408\u3001\u30A2\u30FC\u30AB\u30A4\u30D6\u306F\u30E2\u30B8\u30E5\u30E9jar\u3067\u3059\u3002\n \u6B21\u306E\u64CD\u4F5C\u306F\u3001\u30E2\u30B8\u30E5\u30E9jar\u306E\u4F5C\u6210\u6642\u307E\u305F\u306F\u65E2\u5B58\u306E\u975E\u30E2\u30B8\u30E5\u30E9jar\u306E\u66F4\u65B0\u6642\u306B\n \u306E\u307F\u6709\u52B9\u3067\u3059:  '--module-version'\u3001\n '--hash-modules'\u304A\u3088\u3073'--module-path'\u3002\n\n \u30ED\u30F3\u30B0\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3078\u306E\u5FC5\u9808\u307E\u305F\u306F\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u30B7\u30E7\u30FC\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\n \u306B\u5BFE\u3057\u3066\u3082\u5FC5\u9808\u307E\u305F\u306F\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306A\u308A\u307E\u3059\u3002
+main.help.preopt=使用方法: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njarはクラスおよびリソースのアーカイブを作成し、アーカイブから個々のクラスまたは\nリソースを操作または復元できます。\n\n 例:\n # 2つのクラス・ファイルを含むclasses.jarというアーカイブを作成する:\n jar --create --file classes.jar Foo.class Bar.class\n # foo/のすべてのファイルを含む、既存のマニフェストを使用したアーカイブを作成する:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # モジュラjarアーカイブを作成する。モジュール・ディスクリプタはclasses/module-info.classに\n # ある:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # 既存の非モジュラjarをモジュラjarに更新する:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # 複数リリースjarを作成し、一部のファイルをMETA-INF/versions/9ディレクトリに配置する:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\njarコマンドを短縮または簡略化するには、個別のテキスト・ファイルで引数を指定し、\n記号(@)を接頭辞として使用してjarコマンドに渡します。\n\n 例:\n # 追加オプションおよびクラス・ファイルのリストをファイルclasses.listから読込みます\n jar --create --file my.jar @classes.list\n
+main.help.opt.main=\ メイン操作モード:\n
+main.help.opt.main.create=\  -c、--create               アーカイブを作成します。-fまたは--fileで指定された\n                             アーカイブ・ファイル名にパスが含まれている場合は、\n                             欠落している親ディレクトリも作成されます
+main.help.opt.main.generate-index=\  -i, --generate-index=FILE  指定したjarアーカイブの索引情報を生成します。\n                             このオプションは非推奨であり、今後のリリースで\n                             削除される可能性があります。
+main.help.opt.main.list=\  -t、--list                 アーカイブの内容を一覧表示します
+main.help.opt.main.update=\  -u、--update               既存のjarアーカイブを更新します
+main.help.opt.main.extract=\  -x、--extract              指定の(またはすべての)ファイルをアーカイブから抽出します
+main.help.opt.main.describe-module=\  -d, --describe-module      モジュール・ディスクリプタまたは自動モジュール名を出力します
+main.help.opt.main.validate=\      --validate            jarアーカイブの内容を検証します。このオプションは\n                             複数リリースのjarアーカイブでエクスポートされたAPIが\n                             すべての異なるリリース・バージョンで一貫していることを\n                             検証します。
+main.help.opt.any=\ どのモードでも有効な操作修飾子:\n\n  -C DIR                     指定のディレクトリに変更し、次のファイルを\n                             取り込みます
+main.help.opt.any.file=\  -f、--file=FILE            アーカイブ・ファイル名。省略した場合、stdinまたは\n                             stdoutのいずれかが操作に基づいて使用されます\n      --release VERSION      次のすべてのファイルをjarのバージョニングされたディレクトリ\n                             (つまり、META-INF/versions/VERSION/)に配置します
+main.help.opt.any.verbose=\  -v、--verbose              標準出力に詳細な出力を生成します
+main.help.opt.create=\ 作成モードでのみ有効な操作修飾子:\n
+main.help.opt.create.normalize=\  -n, --normalize            新しいjarアーカイブの作成後、含まれる情報を\n                             正規化します。このオプションは非推奨であり、\n                             今後のJDKリリースで削除される予定です
+main.help.opt.create.update=\ 作成または更新モードでのみ有効な操作修飾子:\n
+main.help.opt.create.update.main-class=\  -e、--main-class=CLASSNAME モジュラまたは実行可能なjarアーカイブに\n                             バンドルされたスタンドアロン・アプリケーションの\n                             アプリケーション・エントリ・ポイント
+main.help.opt.create.update.manifest=\  -m、--manifest=FILE        指定のマニフェスト・ファイルからマニフェスト情報を\n                             取り込みます
+main.help.opt.create.update.no-manifest=\  -M、--no-manifest          エントリのマニフェスト・ファイルを作成しません
+main.help.opt.create.update.module-version=\      --module-version=VERSION    モジュラjarの作成時または非モジュラjarの更新時の\n                             モジュール・バージョン
+main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN モジュラjarの作成時または非モジュラjarの更新時に\n                             指定のパターンに一致し、直接または間接的に\n                             依存しているモジュールのハッシュを\n                             計算および記録します
+main.help.opt.create.update.module-path=\  -p、--module-path          ハッシュを生成するモジュール依存性\n                             の場所
+main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  モジュールのデフォルトのルート設定から除外します
+main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     モジュールが解決されている場合は、警告を発行する\n                             ツールのヒント。非推奨、削除予定の非推奨または\n                             実験的のいずれか
+main.help.opt.create.update.index=\ 作成、更新および索引生成モードでのみ有効な操作修飾子:\n
+main.help.opt.create.update.index.no-compress=\  -0, --no-compress          格納のみ。ZIP圧縮を使用しません
+main.help.opt.create.update.index.date=\      --date=TIMESTAMP       オプションのタイムゾーン形式を指定したISO-8601拡張オフセット\n                            の日時のタイムスタンプ。エントリのタイムスタンプの使用例は、\n                             "2022-02-12T12:30:00-05:00"です
+main.help.opt.other=\ その他のオプション:\n
+main.help.opt.other.help=\  -?、-h、--help[:compat]        これ(オプションで互換性)をhelpに指定します
+main.help.opt.other.help-extra=\      --help-extra           追加オプションのヘルプを提供します
+main.help.opt.other.version=\      --version              プログラム・バージョンを出力します
+main.help.postopt=\ モジュール・ディスクリプタ'module-info.class'が指定のディレクトリのルートまたは\n jarアーカイブ自体のルートにある場合、アーカイブはモジュラjarです。\n 次の操作は、モジュラjarの作成時または既存の非モジュラjarの更新時に\n のみ有効です:  '--module-version'、\n '--hash-modules'および'--module-path'。\n\n ロング・オプションへの必須またはオプションの引数は、対応するショート・オプション\n に対しても必須またはオプションになります。
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties
index e3857ec10d4..e16815575ec 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties
@@ -23,103 +23,103 @@
 # questions.
 #
 
-error.multiple.main.operations='-cuxtid' \uC635\uC158\uC744 \uC5EC\uB7EC \uAC1C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-error.cant.open=\uC5F4 \uC218 \uC5C6\uC74C: {0}
-error.illegal.option=\uC798\uBABB\uB41C \uC635\uC158: {0}
-error.unrecognized.option=\uC778\uC2DD\uD560 \uC218 \uC5C6\uB294 \uC635\uC158: {0}
-error.missing.arg={0} \uC635\uC158\uC5D0 \uC778\uC218\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-error.bad.file.arg=\uD30C\uC77C \uC778\uC218 \uAD6C\uBB38\uC744 \uBD84\uC11D\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
-error.bad.option=-{ctxuid} \uC635\uC158 \uC911 \uD558\uB098\uB97C \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.
-error.bad.cflag='c' \uD50C\uB798\uADF8\uB97C \uC0AC\uC6A9\uD558\uB824\uBA74 Manifest \uB610\uB294 \uC785\uB825 \uD30C\uC77C\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4!
-error.bad.uflag='u' \uD50C\uB798\uADF8\uB97C \uC0AC\uC6A9\uD558\uB824\uBA74 Manifest, 'e' \uD50C\uB798\uADF8 \uB610\uB294 \uC785\uB825 \uD30C\uC77C\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4!
-error.bad.eflag='e' \uD50C\uB798\uADF8 \uBC0F Manifest\uB97C 'Main-Class' \uC18D\uC131\uACFC \uD568\uAED8 \uC9C0\uC815\uD560 \uC218\n\uC5C6\uC2B5\uB2C8\uB2E4!
-error.bad.dflag='-d, --describe-module' \uC635\uC158\uC5D0\uB294 \uC785\uB825 \uD30C\uC77C\uC744 \uC9C0\uC815\uD560 \uD544\uC694\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
-error.bad.reason=\uC798\uBABB\uB41C \uC6D0\uC778: {0}\uC740(\uB294) deprecated, deprecated-for-removal \uB610\uB294 incubating \uC911 \uD558\uB098\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-error.nosuch.fileordir={0}: \uD574\uB2F9 \uD30C\uC77C \uB610\uB294 \uB514\uB809\uD1A0\uB9AC\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
-error.write.file=\uAE30\uC874 jar \uD30C\uC77C\uC5D0 \uC4F0\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
-error.create.dir={0}: \uB514\uB809\uD1A0\uB9AC\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-error.incorrect.length=\uCC98\uB9AC \uC911 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC740 \uAE38\uC774\uAC00 \uBC1C\uACAC\uB428: {0}
-error.create.tempfile=\uC784\uC2DC \uD30C\uC77C\uC744 \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-error.hash.dep=\uBAA8\uB4C8 {0} \uC885\uC18D\uC131\uC744 \uD574\uC2DC\uD558\uB294 \uC911 \uBAA8\uB4C8 \uACBD\uB85C\uC5D0\uC11C {1} \uBAA8\uB4C8\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-error.module.options.without.info=module-info.class \uC5C6\uC774 --module-version \uB610\uB294 --hash-modules \uC911 \uD558\uB098
-error.no.operative.descriptor=\uB9B4\uB9AC\uC2A4\uC5D0 \uB300\uD55C \uC791\uB3D9 \uAE30\uC220\uC790 \uC5C6\uC74C: {0}
-error.no.root.descriptor=\uB8E8\uD2B8 \uBAA8\uB4C8 \uAE30\uC220\uC790\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. --release\uB97C \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624.
-error.unable.derive.automodule=\uBAA8\uB4C8 \uAE30\uC220\uC790\uB97C \uD30C\uC0DD\uD560 \uC218 \uC5C6\uC74C: {0}
-error.unexpected.module-info=\uC608\uC0C1\uCE58 \uC54A\uC740 \uBAA8\uB4C8 \uAE30\uC220\uC790 {0}
-error.module.descriptor.not.found=\uBAA8\uB4C8 \uAE30\uC220\uC790\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC74C
-error.invalid.versioned.module.attribute=\uBD80\uC801\uD569\uD55C \uBAA8\uB4C8 \uAE30\uC220\uC790 \uC18D\uC131 {0}
-error.missing.provider=\uC11C\uBE44\uC2A4 \uC81C\uACF5\uC790\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC74C: {0}
-error.release.value.notnumber=\uB9B4\uB9AC\uC2A4 {0}\uC774(\uAC00) \uBD80\uC801\uD569\uD568
-error.release.value.toosmall=\uB9B4\uB9AC\uC2A4 {0}\uC774(\uAC00) \uBD80\uC801\uD569\uD568. 9 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-error.release.unexpected.versioned.entry={1} \uB9B4\uB9AC\uC2A4\uC5D0 \uB300\uD574 \uC608\uC0C1\uCE58 \uC54A\uC740 \uBC84\uC804\uC774 \uC9C0\uC815\uB41C \uD56D\uBAA9 {0}
-error.validator.jarfile.exception={0}\uC744(\uB97C) \uAC80\uC99D\uD560 \uC218 \uC5C6\uC74C: {1}
-error.validator.jarfile.invalid=\uBD80\uC801\uD569\uD55C \uB2E4\uC911 \uB9B4\uB9AC\uC2A4 jar \uD30C\uC77C {0}\uC774(\uAC00) \uC0AD\uC81C\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-error.validator.bad.entry.name=\uD56D\uBAA9 \uC774\uB984 \uD615\uC2DD\uC774 \uC798\uBABB\uB428, {0}
-error.validator.version.notnumber=\uD56D\uBAA9 \uC774\uB984 {0}\uC5D0 \uBC84\uC804 \uBC88\uD638\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
-error.validator.entryname.tooshort=\uD56D\uBAA9 \uC774\uB984 {0}\uC774(\uAC00) \uB108\uBB34 \uC9E7\uACE0 \uB514\uB809\uD1A0\uB9AC\uAC00 \uC544\uB2D9\uB2C8\uB2E4.
-error.validator.isolated.nested.class={0} \uD56D\uBAA9\uC740 \uBD84\uB9AC\uB41C \uC911\uCCA9 \uD074\uB798\uC2A4\uC785\uB2C8\uB2E4.
-error.validator.new.public.class={0} \uD56D\uBAA9\uC5D0 \uAE30\uBCF8 \uD56D\uBAA9\uC5D0\uC11C \uCC3E\uC744 \uC218 \uC5C6\uB294 \uC0C8\uB85C\uC6B4 \uACF5\uC6A9 \uD074\uB798\uC2A4\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-error.validator.incompatible.class.version={0} \uD56D\uBAA9\uC5D0 \uC774\uC804 \uBC84\uC804\uACFC \uD638\uD658\uB418\uC9C0 \uC54A\uB294 \uD074\uB798\uC2A4 \uBC84\uC804\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-error.validator.different.api={0} \uD56D\uBAA9\uC5D0 \uC774\uC804 \uBC84\uC804\uACFC \uB2E4\uB978 api\uB97C \uAC00\uC9C4 \uD074\uB798\uC2A4\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-error.validator.names.mismatch={0} \uD56D\uBAA9\uC5D0 \uB0B4\uBD80 \uC774\uB984 {1}\uC744(\uB97C) \uAC00\uC9C4 \uD074\uB798\uC2A4\uAC00 \uC788\uC9C0\uB9CC \uC774\uB984\uC774 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-error.validator.info.name.notequal=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uC798\uBABB\uB41C \uC774\uB984\uC774 \uD3EC\uD568\uB428
-error.validator.info.requires.transitive=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uCD94\uAC00 "requires transitive" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
-error.validator.info.requires.added=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uCD94\uAC00 "requires" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
-error.validator.info.requires.dropped=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uB204\uB77D\uB41C "requires" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
-error.validator.info.exports.notequal=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uB2E4\uB978 "exports" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
-error.validator.info.opens.notequal=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uB2E4\uB978 "opens" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
-error.validator.info.provides.notequal=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uB2E4\uB978 "provides" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
-error.validator.info.version.notequal={0}: \uBC84\uC804\uC774 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uB2E4\uB978 "version" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
-error.validator.info.manclass.notequal={0}: \uBC84\uC804\uC774 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uB2E4\uB978 "main-class" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
-warn.validator.identical.entry=\uACBD\uACE0: {0} \uD56D\uBAA9\uC5D0 \uC774\uBBF8 jar\uC5D0 \uC788\uB294 \uD56D\uBAA9\uACFC\n\uB3D9\uC77C\uD55C \uD074\uB798\uC2A4\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-warn.validator.resources.with.same.name=\uACBD\uACE0: {0} \uD56D\uBAA9\uC5D0 \uB3D9\uC77C\uD55C \uC774\uB984\uC758 \uC5EC\uB7EC \uB9AC\uC18C\uC2A4\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-warn.validator.concealed.public.class=\uACBD\uACE0: {0} \uD56D\uBAA9\uC740 \uC228\uACA8\uC9C4 \uD328\uD0A4\uC9C0\uC5D0 \uC788\uB294\n\uACF5\uC6A9 \uD074\uB798\uC2A4\uC785\uB2C8\uB2E4. \uC774 jar\uC744 \uD074\uB798\uC2A4 \uACBD\uB85C\uC5D0 \uBC30\uCE58\uD558\uBA74\n\uACF5\uC6A9 \uC778\uD130\uD398\uC774\uC2A4\uAC00 \uD638\uD658\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-warn.release.unexpected.versioned.entry=\uC608\uC0C1\uCE58 \uC54A\uC740 \uBC84\uC804\uC774 \uC9C0\uC815\uB41C \uD56D\uBAA9 {0}\uC785\uB2C8\uB2E4.
-out.added.manifest=Manifest\uB97C \uCD94\uAC00\uD568
-out.added.module-info=\uCD94\uAC00\uB41C \uBAA8\uB4C8 \uC815\uBCF4: {0}
-out.automodule=\uBAA8\uB4C8 \uAE30\uC220\uC790\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC790\uB3D9 \uBAA8\uB4C8\uC744 \uD30C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
-out.update.manifest=Manifest\uB97C \uC5C5\uB370\uC774\uD2B8\uD568
-out.update.module-info=\uC5C5\uB370\uC774\uD2B8\uB41C \uBAA8\uB4C8 \uC815\uBCF4: {0}
-out.ignore.entry={0} \uD56D\uBAA9\uC744 \uBB34\uC2DC\uD558\uB294 \uC911
-out.adding=\uCD94\uAC00\uD558\uB294 \uC911: {0}
-out.deflated=({0}%\uB97C \uAC10\uC18C\uD568)
-out.stored=(0%\uB97C \uC800\uC7A5\uD568)
-out.create=\  \uC0DD\uC131\uB428: {0}
-out.extracted=\uCD94\uCD9C\uB428: {0}
-out.inflated=\ \uC99D\uAC00\uB428: {0}
-out.size=(\uC785\uB825 = {0}) (\uCD9C\uB825 = {1})
+error.multiple.main.operations='-cuxtid' 옵션을 여러 개 지정할 수 없습니다.
+error.cant.open=열 수 없음: {0}
+error.illegal.option=잘못된 옵션: {0}
+error.unrecognized.option=인식할 수 없는 옵션: {0}
+error.missing.arg={0} 옵션에 인수가 필요합니다.
+error.bad.file.arg=파일 인수 구문을 분석하는 중 오류가 발생했습니다.
+error.bad.option=-{ctxuid} 옵션 중 하나를 지정해야 합니다.
+error.bad.cflag='c' 플래그를 사용하려면 Manifest 또는 입력 파일을 지정해야 합니다!
+error.bad.uflag='u' 플래그를 사용하려면 Manifest, 'e' 플래그 또는 입력 파일을 지정해야 합니다!
+error.bad.eflag='e' 플래그 및 Manifest를 'Main-Class' 속성과 함께 지정할 수\n없습니다!
+error.bad.dflag='-d, --describe-module' 옵션에는 입력 파일을 지정할 필요가 없습니다.
+error.bad.reason=잘못된 원인: {0}은(는) deprecated, deprecated-for-removal 또는 incubating 중 하나여야 합니다.
+error.nosuch.fileordir={0}: 해당 파일 또는 디렉토리가 없습니다.
+error.write.file=기존 jar 파일에 쓰는 중 오류가 발생했습니다.
+error.create.dir={0}: 디렉토리를 생성할 수 없습니다.
+error.incorrect.length=처리 중 올바르지 않은 길이가 발견됨: {0}
+error.create.tempfile=임시 파일을 생성할 수 없습니다.
+error.hash.dep=모듈 {0} 종속성을 해시하는 중 모듈 경로에서 {1} 모듈을 찾을 수 없습니다.
+error.module.options.without.info=module-info.class 없이 --module-version 또는 --hash-modules 중 하나
+error.no.operative.descriptor=릴리스에 대한 작동 기술자 없음: {0}
+error.no.root.descriptor=루트 모듈 기술자가 없습니다. --release를 지정하십시오.
+error.unable.derive.automodule=모듈 기술자를 파생할 수 없음: {0}
+error.unexpected.module-info=예상치 않은 모듈 기술자 {0}
+error.module.descriptor.not.found=모듈 기술자를 찾을 수 없음
+error.invalid.versioned.module.attribute=부적합한 모듈 기술자 속성 {0}
+error.missing.provider=서비스 제공자를 찾을 수 없음: {0}
+error.release.value.notnumber=릴리스 {0}이(가) 부적합함
+error.release.value.toosmall=릴리스 {0}이(가) 부적합함. 9 이상이어야 합니다.
+error.release.unexpected.versioned.entry={1} 릴리스에 대해 예상치 않은 버전이 지정된 항목 {0}
+error.validator.jarfile.exception={0}을(를) 검증할 수 없음: {1}
+error.validator.jarfile.invalid=부적합한 다중 릴리스 jar 파일 {0}이(가) 삭제되었습니다.
+error.validator.bad.entry.name=항목 이름 형식이 잘못됨, {0}
+error.validator.version.notnumber=항목 이름 {0}에 버전 번호가 없습니다.
+error.validator.entryname.tooshort=항목 이름 {0}이(가) 너무 짧고 디렉토리가 아닙니다.
+error.validator.isolated.nested.class={0} 항목은 분리된 중첩 클래스입니다.
+error.validator.new.public.class={0} 항목에 기본 항목에서 찾을 수 없는 새로운 공용 클래스가 있습니다.
+error.validator.incompatible.class.version={0} 항목에 이전 버전과 호환되지 않는 클래스 버전이 있습니다.
+error.validator.different.api={0} 항목에 이전 버전과 다른 api를 가진 클래스가 있습니다.
+error.validator.names.mismatch={0} 항목에 내부 이름 {1}을(를) 가진 클래스가 있지만 이름이 일치하지 않습니다.
+error.validator.info.name.notequal=버전 지정된 디렉토리의 module-info.class에 잘못된 이름이 포함됨
+error.validator.info.requires.transitive=버전 지정된 디렉토리의 module-info.class에 추가 "requires transitive" 항목이 포함됨
+error.validator.info.requires.added=버전 지정된 디렉토리의 module-info.class에 추가 "requires" 항목이 포함됨
+error.validator.info.requires.dropped=버전 지정된 디렉토리의 module-info.class에 누락된 "requires" 항목이 포함됨
+error.validator.info.exports.notequal=버전 지정된 디렉토리의 module-info.class에 다른 "exports" 항목이 포함됨
+error.validator.info.opens.notequal=버전 지정된 디렉토리의 module-info.class에 다른 "opens" 항목이 포함됨
+error.validator.info.provides.notequal=버전 지정된 디렉토리의 module-info.class에 다른 "provides" 항목이 포함됨
+error.validator.info.version.notequal={0}: 버전이 지정된 디렉토리의 module-info.class에 다른 "version" 항목이 포함됨
+error.validator.info.manclass.notequal={0}: 버전이 지정된 디렉토리의 module-info.class에 다른 "main-class" 항목이 포함됨
+warn.validator.identical.entry=경고: {0} 항목에 이미 jar에 있는 항목과\n동일한 클래스가 있습니다.
+warn.validator.resources.with.same.name=경고: {0} 항목에 동일한 이름의 여러 리소스가 있습니다.
+warn.validator.concealed.public.class=경고: {0} 항목은 숨겨진 패키지에 있는\n공용 클래스입니다. 이 jar을 클래스 경로에 배치하면\n공용 인터페이스가 호환되지 않습니다.
+warn.release.unexpected.versioned.entry=예상치 않은 버전이 지정된 항목 {0}입니다.
+out.added.manifest=Manifest를 추가함
+out.added.module-info=추가된 모듈 정보: {0}
+out.automodule=모듈 기술자를 찾을 수 없습니다. 자동 모듈을 파생했습니다.
+out.update.manifest=Manifest를 업데이트함
+out.update.module-info=업데이트된 모듈 정보: {0}
+out.ignore.entry={0} 항목을 무시하는 중
+out.adding=추가하는 중: {0}
+out.deflated=({0}%를 감소함)
+out.stored=(0%를 저장함)
+out.create=\  생성됨: {0}
+out.extracted=추출됨: {0}
+out.inflated=\ 증가됨: {0}
+out.size=(입력 = {0}) (출력 = {1})
 
-usage.compat=\uD638\uD658\uC131 \uC778\uD130\uD398\uC774\uC2A4:\n\uC0AC\uC6A9\uBC95: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\uC635\uC158:\n    -c  \uC0C8 \uC544\uCE74\uC774\uBE0C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n    -t  \uC544\uCE74\uC774\uBE0C\uC5D0 \uB300\uD55C \uBAA9\uCC28\uB97C \uB098\uC5F4\uD569\uB2C8\uB2E4.\n    -x  \uBA85\uBA85\uB41C(\uB610\uB294 \uBAA8\uB4E0) \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uC5D0\uC11C \uCD94\uCD9C\uD569\uB2C8\uB2E4.\n    -u  \uAE30\uC874 \uC544\uCE74\uC774\uBE0C\uB97C \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.\n    -v  \uD45C\uC900 \uCD9C\uB825\uC5D0 \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n    -f  \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n    -m  \uC9C0\uC815\uB41C Manifest \uD30C\uC77C\uC758 Manifest \uC815\uBCF4\uB97C \uD3EC\uD568\uD569\uB2C8\uB2E4.\n    -n  \uC0C8 \uC544\uCE74\uC774\uBE0C\uB97C \uC0DD\uC131\uD55C \uD6C4 Pack200 \uC815\uADDC\uD654\uB97C \uC218\uD589\uD569\uB2C8\uB2E4.\n    -e  jar \uC2E4\uD589 \uD30C\uC77C\uC5D0 \uBC88\uB4E4\uB85C \uC81C\uACF5\uB41C \uB3C5\uB9BD\uD615 \uC560\uD50C\uB9AC\uCF00\uC774\uC158\uC758 \n        \uC560\uD50C\uB9AC\uCF00\uC774\uC158 \uC2DC\uC791 \uC9C0\uC810\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n    -0  \uC800\uC7A5 \uC804\uC6A9\uC774\uBA70 ZIP \uC555\uCD95\uC744 \uC0AC\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n    -P  \uD30C\uC77C \uC774\uB984\uC5D0\uC11C \uC120\uD589 '/'(\uC808\uB300 \uACBD\uB85C) \uBC0F ".."(\uC0C1\uC704 \uB514\uB809\uD1A0\uB9AC) \uAD6C\uC131\uC694\uC18C\uB97C \uC720\uC9C0\uD569\uB2C8\uB2E4.\n    -M  \uD56D\uBAA9\uC5D0 \uB300\uD574 Manifest \uD30C\uC77C\uC744 \uC0DD\uC131\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n    -i  \uC9C0\uC815\uB41C jar \uD30C\uC77C\uC5D0 \uB300\uD55C \uC778\uB371\uC2A4 \uC815\uBCF4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n    -C  \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uB85C \uBCC0\uACBD\uD558\uACE0 \uB2E4\uC74C \uD30C\uC77C\uC744 \uD3EC\uD568\uD569\uB2C8\uB2E4.\n\uD2B9\uC815 \uD30C\uC77C\uC774 \uB514\uB809\uD1A0\uB9AC\uC77C \uACBD\uC6B0 \uC21C\uD658\uC801\uC73C\uB85C \uCC98\uB9AC\uB429\uB2C8\uB2E4.\nManifest \uD30C\uC77C \uC774\uB984, \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984 \uBC0F \uC2DC\uC791 \uC9C0\uC810 \uC774\uB984\uC740\n'm', 'f' \uBC0F 'e' \uD50C\uB798\uADF8\uC640 \uB3D9\uC77C\uD55C \uC21C\uC11C\uB85C \uC9C0\uC815\uB429\uB2C8\uB2E4.\n\n\uC608 1: classes.jar\uB77C\uB294 \uC544\uCE74\uC774\uBE0C\uC5D0 \uB450 \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n       jar cvf classes.jar Foo.class Bar.class \n\uC608 2: \uAE30\uC874 Manifest \uD30C\uC77C 'mymanifest'\uB97C \uC0AC\uC6A9\uD558\uC5EC\n           foo/ \uB514\uB809\uD1A0\uB9AC\uC758 \uBAA8\uB4E0 \uD30C\uC77C\uC744 'classes.jar'\uB85C \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
+usage.compat=호환성 인터페이스:\n사용법: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n옵션:\n    -c  새 아카이브를 생성합니다.\n    -t  아카이브에 대한 목차를 나열합니다.\n    -x  명명된(또는 모든) 파일을 아카이브에서 추출합니다.\n    -u  기존 아카이브를 업데이트합니다.\n    -v  표준 출력에 상세 정보 출력을 생성합니다.\n    -f  아카이브 파일 이름을 지정합니다.\n    -m  지정된 Manifest 파일의 Manifest 정보를 포함합니다.\n    -n  새 아카이브를 생성한 후 Pack200 정규화를 수행합니다.\n    -e  jar 실행 파일에 번들로 제공된 독립형 애플리케이션의 \n        애플리케이션 시작 지점을 지정합니다.\n    -0  저장 전용이며 ZIP 압축을 사용하지 않습니다.\n    -P  파일 이름에서 선행 '/'(절대 경로) 및 ".."(상위 디렉토리) 구성요소를 유지합니다.\n    -M  항목에 대해 Manifest 파일을 생성하지 않습니다.\n    -i  지정된 jar 파일에 대한 인덱스 정보를 생성합니다.\n    -C  지정된 디렉토리로 변경하고 다음 파일을 포함합니다.\n특정 파일이 디렉토리일 경우 순환적으로 처리됩니다.\nManifest 파일 이름, 아카이브 파일 이름 및 시작 지점 이름은\n'm', 'f' 및 'e' 플래그와 동일한 순서로 지정됩니다.\n\n예 1: classes.jar라는 아카이브에 두 클래스 파일을 아카이브하는 방법: \n       jar cvf classes.jar Foo.class Bar.class \n예 2: 기존 Manifest 파일 'mymanifest'를 사용하여\n           foo/ 디렉토리의 모든 파일을 'classes.jar'로 아카이브하는 방법: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
 
-main.usage.summary=\uC0AC\uC6A9\uBC95: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...
-main.usage.summary.try=\uC790\uC138\uD55C \uB0B4\uC6A9\uC744 \uBCF4\uB824\uBA74 'jar --help'\uB97C \uC2E4\uD589\uD558\uC2ED\uC2DC\uC624.
+main.usage.summary=사용법: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...
+main.usage.summary.try=자세한 내용을 보려면 'jar --help'를 실행하십시오.
 
-main.help.preopt=\uC0AC\uC6A9\uBC95: jar [OPTION...] [ [--release VERSION] [-C dir] \uD30C\uC77C] ...\njar\uB294 \uD074\uB798\uC2A4 \uBC0F \uB9AC\uC18C\uC2A4\uC5D0 \uB300\uD55C \uC544\uCE74\uC774\uBE0C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4. \uC544\uCE74\uC774\uBE0C\uC5D0\uC11C\n\uAC1C\uBCC4 \uD074\uB798\uC2A4\uB098 \uB9AC\uC18C\uC2A4\uB97C \uC870\uC791\uD558\uAC70\uB098 \uBCF5\uC6D0\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n\n \uC608\uC81C:\n # \uB450 \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uC0AC\uC6A9\uD558\uC5EC classes.jar\uB77C\uB294 \uC544\uCE74\uC774\uBE0C \uC0DD\uC131:\n jar --create --file classes.jar Foo.class Bar.class\n # \uAE30\uC874 Manifest\uB97C \uC0AC\uC6A9\uD558\uC5EC \uBAA8\uB4E0 \uD30C\uC77C\uC774 foo/\uC5D0 \uD3EC\uD568\uB41C \uC544\uCE74\uC774\uBE0C \uC0DD\uC131:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # \uBAA8\uB4C8 \uAE30\uC220\uC790\uAC00 classes/module-info.class\uC5D0 \uC704\uCE58\uD55C\n # \uBAA8\uB4C8\uD615 jar \uC544\uCE74\uC774\uBE0C \uC0DD\uC131:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # \uAE30\uC874 \uBE44\uBAA8\uB4C8 jar\uB97C \uBAA8\uB4C8\uD615 jar\uB85C \uC5C5\uB370\uC774\uD2B8:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # \uC77C\uBD80 \uD30C\uC77C\uC774 META-INF/versions/9 \uB514\uB809\uD1A0\uB9AC\uC5D0 \uC704\uCE58\uD55C \uB2E4\uC911 \uB9B4\uB9AC\uC2A4 jar \uC0DD\uC131:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\njar \uBA85\uB839\uC744 \uC9E7\uAC8C \uB9CC\uB4E4\uAC70\uB098 \uB2E8\uC21C\uD654\uD558\uB824\uBA74 \uBCC4\uB3C4\uC758 \uD14D\uC2A4\uD2B8 \uD30C\uC77C\uC5D0 \uC778\uC218\uB97C \uC9C0\uC815\uD558\uACE0\nat \uAE30\uD638(@)\uB97C \uC811\uB450\uC5B4\uB85C \uC0AC\uC6A9\uD558\uC5EC jar \uBA85\uB839\uC5D0 \uC804\uB2EC\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n\n \uC608\uC81C:\n # classes.list \uD30C\uC77C\uC5D0\uC11C \uCD94\uAC00 \uC635\uC158 \uBC0F \uD074\uB798\uC2A4 \uD30C\uC77C \uBAA9\uB85D \uC77D\uAE30\n jar --create --file my.jar @classes.list\n
-main.help.opt.main=\ \uAE30\uBCF8 \uC791\uC5C5 \uBAA8\uB4DC:\n
-main.help.opt.main.create=\  -c, --create               \uC544\uCE74\uC774\uBE0C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.
-main.help.opt.main.generate-index=\  -i, --generate-index=FILE  \uC9C0\uC815\uB41C jar \uC544\uCE74\uC774\uBE0C\uC5D0 \uB300\uD55C \uC778\uB371\uC2A4 \uC815\uBCF4\uB97C\n                             \uC0DD\uC131\uD569\uB2C8\uB2E4.
-main.help.opt.main.list=\  -t, --list                 \uC544\uCE74\uC774\uBE0C\uC5D0 \uB300\uD55C \uBAA9\uCC28\uB97C \uB098\uC5F4\uD569\uB2C8\uB2E4.
-main.help.opt.main.update=\  -u, --update               \uAE30\uC874 jar \uC544\uCE74\uC774\uBE0C\uB97C \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.
-main.help.opt.main.extract=\  -x, --extract              \uBA85\uBA85\uB41C(\uB610\uB294 \uBAA8\uB4E0) \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uC5D0\uC11C \uCD94\uCD9C\uD569\uB2C8\uB2E4.
-main.help.opt.main.describe-module=\  -d, --describe-module      \uBAA8\uB4C8 \uAE30\uC220\uC790 \uB610\uB294 \uC790\uB3D9 \uBAA8\uB4C8 \uC774\uB984\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.
-main.help.opt.any=\ \uBAA8\uB4E0 \uBAA8\uB4DC\uC5D0\uC11C \uC801\uD569\uD55C \uC791\uC5C5 \uC218\uC815\uC790:\n\n  -C DIR                     \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uB85C \uBCC0\uACBD\uD558\uACE0 \uB2E4\uC74C \uD30C\uC77C\uC744\n                             \uD3EC\uD568\uD569\uB2C8\uB2E4.
-main.help.opt.any.file=\  -f, --file=FILE            \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984\uC785\uB2C8\uB2E4. \uC0DD\uB7B5\uD560 \uACBD\uC6B0 \uC791\uC5C5\uC5D0 \uB530\uB77C \n                             stdin \uB610\uB294 stdout\uC774 \uC0AC\uC6A9\uB429\uB2C8\uB2E4.\n      --release VERSION      \uB2E4\uC74C \uBAA8\uB4E0 \uD30C\uC77C\uC744 \uBC84\uC804 \uC9C0\uC815\uB41C jar \uB514\uB809\uD1A0\uB9AC\n                             (\uC608: META-INF/versions/VERSION/)\uC5D0 \uBC30\uCE58\uD569\uB2C8\uB2E4.
-main.help.opt.any.verbose=\  -v, --verbose              \uD45C\uC900 \uCD9C\uB825\uC5D0 \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.
-main.help.opt.create=\ \uC0DD\uC131 \uBAA8\uB4DC\uC5D0\uC11C\uB9CC \uC801\uD569\uD55C \uC791\uC5C5 \uC218\uC815\uC790:\n
-main.help.opt.create.normalize=\  -n, --normalize            \uC0DD\uC131 \uD6C4 \uC0C8 jar \uC544\uCE74\uC774\uBE0C\uC5D0\uC11C \uC815\uBCF4\uB97C\n                             \uC815\uADDC\uD654\uD569\uB2C8\uB2E4.
-main.help.opt.create.update=\ \uC0DD\uC131 \uBC0F \uC5C5\uB370\uC774\uD2B8 \uBAA8\uB4DC\uC5D0\uC11C\uB9CC \uC801\uD569\uD55C \uC791\uC5C5 \uC218\uC815\uC790:\n
-main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME \uBAA8\uB4C8\uD615 \uB610\uB294 \uC2E4\uD589\uD615 jar \uC544\uCE74\uC774\uBE0C\uC5D0 \uBC88\uB4E4\uB85C\n                             \uC81C\uACF5\uB41C \uB3C5\uB9BD\uD615 \uC560\uD50C\uB9AC\uCF00\uC774\uC158\uC758 \uC560\uD50C\uB9AC\uCF00\uC774\uC158\n                             \uC2DC\uC791 \uC9C0\uC810\uC785\uB2C8\uB2E4.
-main.help.opt.create.update.manifest=\  -m, --manifest=FILE        \uC9C0\uC815\uB41C Manifest \uD30C\uC77C\uC758 Manifest \uC815\uBCF4\uB97C\n                             \uD3EC\uD568\uD569\uB2C8\uB2E4.
-main.help.opt.create.update.no-manifest=\  -M, --no-manifest          \uD56D\uBAA9\uC5D0 \uB300\uD574 Manifest \uD30C\uC77C\uC744 \uC0DD\uC131\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-main.help.opt.create.update.module-version=\      --module-version=VERSION    \uBAA8\uB4C8\uD615 jar\uB97C \uC0DD\uC131\uD558\uAC70\uB098 \uBE44\uBAA8\uB4C8 jar\uB97C\n                             \uC5C5\uB370\uC774\uD2B8\uD560 \uB54C \uBAA8\uB4C8 \uBC84\uC804\uC785\uB2C8\uB2E4.
-main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN \uC0DD\uC131 \uC911\uC778 \uBAA8\uB4C8\uD615 jar \uB610\uB294 \uC5C5\uB370\uC774\uD2B8 \uC911\uC778 \uBE44\uBAA8\uB4C8 jar\uC5D0 \n                             \uC9C1\uC811 \uB610\uB294 \uAC04\uC811\uC801\uC73C\uB85C \uC758\uC874\uD558\uACE0 \uC8FC\uC5B4\uC9C4 \uD328\uD134\uACFC \uC77C\uCE58\uD558\uB294\n                             \uBAA8\uB4C8\uC758 \uD574\uC2DC\uB97C \uCEF4\uD4E8\uD2B8\uD558\uACE0\n                             \uAE30\uB85D\uD569\uB2C8\uB2E4.
-main.help.opt.create.update.module-path=\  -p, --module-path          \uD574\uC2DC\uB97C \uC0DD\uC131\uD558\uAE30 \uC704\uD55C \uBAA8\uB4C8 \uC885\uC18D\uC131\uC758\n                             \uC704\uCE58\uC785\uB2C8\uB2E4.
-main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  \uBAA8\uB4C8\uC758 \uAE30\uBCF8 \uB8E8\uD2B8 \uC9D1\uD569\uC5D0\uC11C \uC81C\uC678\uD569\uB2C8\uB2E4.
-main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     \uBAA8\uB4C8\uC774 \uD574\uACB0\uB41C \uACBD\uC6B0 \uACBD\uACE0\uB97C \uC2E4\uD589\uD560 \uD234\uC5D0 \uB300\uD55C\n                             \uD78C\uD2B8\uB85C, deprecated, deprecated-for-removal,\n                             \uB610\uB294 incubating \uC911 \uD558\uB098\uC785\uB2C8\uB2E4.
-main.help.opt.create.update.index=\ \uC0DD\uC131, \uC5C5\uB370\uC774\uD2B8 \uBC0F generate-index \uBAA8\uB4DC\uC5D0\uC11C\uB9CC \uC801\uD569\uD55C \uC791\uC5C5 \uC218\uC815\uC790:\n
-main.help.opt.create.update.index.no-compress=\  -0, --no-compress          \uC800\uC7A5 \uC804\uC6A9\uC774\uBA70 ZIP \uC555\uCD95\uC744 \uC0AC\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-main.help.opt.other=\ \uAE30\uD0C0 \uC635\uC158:\n
-main.help.opt.other.help=\  -h, --help[:compat]        \uC774 \uB3C4\uC6C0\uB9D0(\uB610\uB294 \uC120\uD0DD\uC801\uC73C\uB85C \uD638\uD658\uC131)\uC744 \uC81C\uACF5\uD569\uB2C8\uB2E4.
-main.help.opt.other.help-extra=\      --help-extra           \uCD94\uAC00 \uC635\uC158\uC5D0 \uB300\uD55C \uB3C4\uC6C0\uB9D0\uC744 \uC81C\uACF5\uD569\uB2C8\uB2E4.
-main.help.opt.other.version=\      --version              \uD504\uB85C\uADF8\uB7A8 \uBC84\uC804\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.
-main.help.postopt=\ \uC544\uCE74\uC774\uBE0C\uB294 \uBAA8\uB4C8 \uAE30\uC220\uC790 'module-info.class'\uAC00 \uC8FC\uC5B4\uC9C4 \uB514\uB809\uD1A0\uB9AC\uC758\n \uB8E8\uD2B8 \uB610\uB294 jar \uC544\uCE74\uC774\uBE0C \uC790\uCCB4\uC758 \uB8E8\uD2B8\uC5D0 \uC704\uCE58\uD55C \uACBD\uC6B0 \uBAA8\uB4C8\uD615 jar\uC785\uB2C8\uB2E4.\n \uB2E4\uC74C \uC791\uC5C5\uC740 \uBAA8\uB4C8\uD615 jar\uB97C \uC0DD\uC131\uD558\uAC70\uB098 \uAE30\uC874 \uBE44\uBAA8\uB4C8 jar\uB97C\n \uC5C5\uB370\uC774\uD2B8\uD560 \uB54C\uB9CC \uC801\uD569\uD569\uB2C8\uB2E4. '--module-version',\n '--hash-modules' \uBC0F '--module-path'.\n\n long \uC635\uC158\uC758 \uD544\uC218 \uB610\uB294 \uC120\uD0DD\uC801 \uC778\uC218\uB294 \uD574\uB2F9\uD558\uB294 short \uC635\uC158\uC5D0 \uB300\uD574\uC11C\uB3C4\n \uD544\uC218 \uB610\uB294 \uC120\uD0DD\uC801\uC785\uB2C8\uB2E4.
+main.help.preopt=사용법: jar [OPTION...] [ [--release VERSION] [-C dir] 파일] ...\njar는 클래스 및 리소스에 대한 아카이브를 생성합니다. 아카이브에서\n개별 클래스나 리소스를 조작하거나 복원할 수 있습니다.\n\n 예제:\n # 두 클래스 파일을 사용하여 classes.jar라는 아카이브 생성:\n jar --create --file classes.jar Foo.class Bar.class\n # 기존 Manifest를 사용하여 모든 파일이 foo/에 포함된 아카이브 생성:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # 모듈 기술자가 classes/module-info.class에 위치한\n # 모듈형 jar 아카이브 생성:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # 기존 비모듈 jar를 모듈형 jar로 업데이트:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # 일부 파일이 META-INF/versions/9 디렉토리에 위치한 다중 릴리스 jar 생성:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\njar 명령을 짧게 만들거나 단순화하려면 별도의 텍스트 파일에 인수를 지정하고\nat 기호(@)를 접두어로 사용하여 jar 명령에 전달할 수 있습니다.\n\n 예제:\n # classes.list 파일에서 추가 옵션 및 클래스 파일 목록 읽기\n jar --create --file my.jar @classes.list\n
+main.help.opt.main=\ 기본 작업 모드:\n
+main.help.opt.main.create=\  -c, --create               아카이브를 생성합니다.
+main.help.opt.main.generate-index=\  -i, --generate-index=FILE  지정된 jar 아카이브에 대한 인덱스 정보를\n                             생성합니다.
+main.help.opt.main.list=\  -t, --list                 아카이브에 대한 목차를 나열합니다.
+main.help.opt.main.update=\  -u, --update               기존 jar 아카이브를 업데이트합니다.
+main.help.opt.main.extract=\  -x, --extract              명명된(또는 모든) 파일을 아카이브에서 추출합니다.
+main.help.opt.main.describe-module=\  -d, --describe-module      모듈 기술자 또는 자동 모듈 이름을 인쇄합니다.
+main.help.opt.any=\ 모든 모드에서 적합한 작업 수정자:\n\n  -C DIR                     지정된 디렉토리로 변경하고 다음 파일을\n                             포함합니다.
+main.help.opt.any.file=\  -f, --file=FILE            아카이브 파일 이름입니다. 생략할 경우 작업에 따라 \n                             stdin 또는 stdout이 사용됩니다.\n      --release VERSION      다음 모든 파일을 버전 지정된 jar 디렉토리\n                             (예: META-INF/versions/VERSION/)에 배치합니다.
+main.help.opt.any.verbose=\  -v, --verbose              표준 출력에 상세 정보 출력을 생성합니다.
+main.help.opt.create=\ 생성 모드에서만 적합한 작업 수정자:\n
+main.help.opt.create.normalize=\  -n, --normalize            생성 후 새 jar 아카이브에서 정보를\n                             정규화합니다.
+main.help.opt.create.update=\ 생성 및 업데이트 모드에서만 적합한 작업 수정자:\n
+main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME 모듈형 또는 실행형 jar 아카이브에 번들로\n                             제공된 독립형 애플리케이션의 애플리케이션\n                             시작 지점입니다.
+main.help.opt.create.update.manifest=\  -m, --manifest=FILE        지정된 Manifest 파일의 Manifest 정보를\n                             포함합니다.
+main.help.opt.create.update.no-manifest=\  -M, --no-manifest          항목에 대해 Manifest 파일을 생성하지 않습니다.
+main.help.opt.create.update.module-version=\      --module-version=VERSION    모듈형 jar를 생성하거나 비모듈 jar를\n                             업데이트할 때 모듈 버전입니다.
+main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN 생성 중인 모듈형 jar 또는 업데이트 중인 비모듈 jar에 \n                             직접 또는 간접적으로 의존하고 주어진 패턴과 일치하는\n                             모듈의 해시를 컴퓨트하고\n                             기록합니다.
+main.help.opt.create.update.module-path=\  -p, --module-path          해시를 생성하기 위한 모듈 종속성의\n                             위치입니다.
+main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  모듈의 기본 루트 집합에서 제외합니다.
+main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     모듈이 해결된 경우 경고를 실행할 툴에 대한\n                             힌트로, deprecated, deprecated-for-removal,\n                             또는 incubating 중 하나입니다.
+main.help.opt.create.update.index=\ 생성, 업데이트 및 generate-index 모드에서만 적합한 작업 수정자:\n
+main.help.opt.create.update.index.no-compress=\  -0, --no-compress          저장 전용이며 ZIP 압축을 사용하지 않습니다.
+main.help.opt.other=\ 기타 옵션:\n
+main.help.opt.other.help=\  -h, --help[:compat]        이 도움말(또는 선택적으로 호환성)을 제공합니다.
+main.help.opt.other.help-extra=\      --help-extra           추가 옵션에 대한 도움말을 제공합니다.
+main.help.opt.other.version=\      --version              프로그램 버전을 인쇄합니다.
+main.help.postopt=\ 아카이브는 모듈 기술자 'module-info.class'가 주어진 디렉토리의\n 루트 또는 jar 아카이브 자체의 루트에 위치한 경우 모듈형 jar입니다.\n 다음 작업은 모듈형 jar를 생성하거나 기존 비모듈 jar를\n 업데이트할 때만 적합합니다. '--module-version',\n '--hash-modules' 및 '--module-path'.\n\n long 옵션의 필수 또는 선택적 인수는 해당하는 short 옵션에 대해서도\n 필수 또는 선택적입니다.
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
index 9a09bfab6ff..ec2b82ae603 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
@@ -23,61 +23,61 @@
 # questions.
 #
 
-error.multiple.main.operations=Voc\u00EA n\u00E3o pode especificar mais de um op\u00E7\u00E3o '-cuxtid'
-error.cant.open=n\u00E3o \u00E9 poss\u00EDvel abrir: {0}
-error.illegal.option=Op\u00E7\u00E3o inv\u00E1lida: {0}
-error.unrecognized.option=op\u00E7\u00E3o n\u00E3o reconhecida : {0}
-error.missing.arg=a op\u00E7\u00E3o {0}  exige um argumento
+error.multiple.main.operations=Você não pode especificar mais de um opção '-cuxtid'
+error.cant.open=não é possível abrir: {0}
+error.illegal.option=Opção inválida: {0}
+error.unrecognized.option=opção não reconhecida : {0}
+error.missing.arg=a opção {0}  exige um argumento
 error.bad.file.arg=Erro ao fazer parsing dos argumentos de arquivo
-error.bad.option=Uma das op\u00E7\u00F5es -{ctxuid} deve ser especificada.
+error.bad.option=Uma das opções -{ctxuid} deve ser especificada.
 error.bad.cflag=flag 'c' requer que os arquivos de manifesto ou entrada sejam especificados!
 error.bad.uflag=o flag 'u' requer que arquivos de manifesto, o flag 'e' ou arquivos de entrada sejam especificados!
-error.bad.eflag=o flag 'e' e manifesto com o atributo 'Main-Class' n\u00E3o podem ser especificados \njuntos!
-error.bad.dflag=A op\u00E7\u00E3o '-d, --describe-module' n\u00E3o exige a especifica\u00E7\u00E3o de arquivos de entrada
+error.bad.eflag=o flag 'e' e manifesto com o atributo 'Main-Class' não podem ser especificados \njuntos!
+error.bad.dflag=A opção '-d, --describe-module' não exige a especificação de arquivos de entrada
 error.bad.reason=motivo incorreto: {0}, deve ser deprecated, deprecated-for-removal ou incubating
-error.nosuch.fileordir={0} : n\u00E3o h\u00E1 tal arquivo ou diret\u00F3rio
+error.nosuch.fileordir={0} : não há tal arquivo ou diretório
 error.write.file=Erro ao gravar o arquivo jar existente
-error.create.dir={0} : n\u00E3o foi poss\u00EDvel criar o diret\u00F3rio
+error.create.dir={0} : não foi possível criar o diretório
 error.incorrect.length=largura incorreta durante o processamento: {0}
-error.create.tempfile=N\u00E3o foi poss\u00EDvel criar um arquivo tempor\u00E1rio
-error.hash.dep=M\u00F3dulo de hashing com {0} depend\u00EAncias. N\u00E3o \u00E9 poss\u00EDvel localizar o m\u00F3dulo {1} no caminho do m\u00F3dulo
-error.module.options.without.info=Um dentre --module-version ou --hash-modules est\u00E1 sem module-info.class
-error.no.operative.descriptor=Nenhum descritor de opera\u00E7\u00E3o para a release: {0}
-error.no.root.descriptor=Nenhum descritor do m\u00F3dulo-raiz, especifique --release
-error.unable.derive.automodule=N\u00E3o \u00E9 poss\u00EDvel obter o descritor do m\u00F3dulo para: {0}
-error.unexpected.module-info=Descritor de m\u00F3dulo inesperado {0}
-error.module.descriptor.not.found=Descritor de m\u00F3dulo n\u00E3o encontrado
-error.invalid.versioned.module.attribute=Atributo {0} de descritor de m\u00F3dulo inv\u00E1lido
-error.missing.provider=Prestador de servi\u00E7os  n\u00E3o encontrado: {0}
-error.release.value.notnumber=release {0} n\u00E3o v\u00E1lida
-error.release.value.toosmall=release {0} n\u00E3o v\u00E1lida; deve ser >= 9
-error.release.unexpected.versioned.entry=entrada {0} com controle de vers\u00E3o inesperada para a release {1}
-error.validator.jarfile.exception=n\u00E3o \u00E9 poss\u00EDvel validar {0}: {1}
-error.validator.jarfile.invalid=arquivo jar {0} multi-release inv\u00E1lido exclu\u00EDdo
+error.create.tempfile=Não foi possível criar um arquivo temporário
+error.hash.dep=Módulo de hashing com {0} dependências. Não é possível localizar o módulo {1} no caminho do módulo
+error.module.options.without.info=Um dentre --module-version ou --hash-modules está sem module-info.class
+error.no.operative.descriptor=Nenhum descritor de operação para a release: {0}
+error.no.root.descriptor=Nenhum descritor do módulo-raiz, especifique --release
+error.unable.derive.automodule=Não é possível obter o descritor do módulo para: {0}
+error.unexpected.module-info=Descritor de módulo inesperado {0}
+error.module.descriptor.not.found=Descritor de módulo não encontrado
+error.invalid.versioned.module.attribute=Atributo {0} de descritor de módulo inválido
+error.missing.provider=Prestador de serviços  não encontrado: {0}
+error.release.value.notnumber=release {0} não válida
+error.release.value.toosmall=release {0} não válida; deve ser >= 9
+error.release.unexpected.versioned.entry=entrada {0} com controle de versão inesperada para a release {1}
+error.validator.jarfile.exception=não é possível validar {0}: {1}
+error.validator.jarfile.invalid=arquivo jar {0} multi-release inválido excluído
 error.validator.bad.entry.name=nome de entrada incorreto, {0}
-error.validator.version.notnumber=o nome de entrada {0} n\u00E3o tem um n\u00FAmero de vers\u00E3o
-error.validator.entryname.tooshort=nome de entrada {0} muito pequeno, n\u00E3o \u00E9 um diret\u00F3rio
-error.validator.isolated.nested.class=a entrada {0} \u00E9 uma classe aninhada isolada
-error.validator.new.public.class=a entrada {0} cont\u00E9m uma nova classe p\u00FAblica n\u00E3o encontrada nas entradas de base
-error.validator.incompatible.class.version=a entrada {0} tem uma vers\u00E3o de classe incompat\u00EDvel com uma vers\u00E3o anterior
-error.validator.different.api=a entrada {0} cont\u00E9m uma classe com api diferente da vers\u00E3o anterior
-error.validator.names.mismatch=a entrada {0} cont\u00E9m uma classe com o nome interno {1}; os nomes n\u00E3o correspondem
-error.validator.info.name.notequal=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m nome incorreto
-error.validator.info.requires.transitive=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "requires transitive" adicional
-error.validator.info.requires.added=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "requires" adicional
-error.validator.info.requires.dropped=module-info.class em um diret\u00F3rio com controle de vers\u00E3o falta "requires"
-error.validator.info.exports.notequal=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "exports" diferente
-error.validator.info.opens.notequal=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "opens" diferente
-error.validator.info.provides.notequal=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "provides" diferente
-error.validator.info.version.notequal={0}: module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "version" diferente
-error.validator.info.manclass.notequal={0}: module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "main-class" diferente
-warn.validator.identical.entry=Advert\u00EAncia: a entrada {0} cont\u00E9m uma classe\nid\u00EAntica a uma que j\u00E1 est\u00E1 no jar
-warn.validator.resources.with.same.name=Advert\u00EAncia: entrada {0}; diversos recursos com o mesmo nome
-warn.validator.concealed.public.class=Advert\u00EAncia: a entrada {0} \u00E9 uma classe p\u00FAblica\nem um pacote oculto; colocar esse jar no caminho de classe resultar\u00E1\nem interfaces p\u00FAblicas incompat\u00EDveis
-warn.release.unexpected.versioned.entry=entrada {0} com controle de vers\u00E3o inesperada
+error.validator.version.notnumber=o nome de entrada {0} não tem um número de versão
+error.validator.entryname.tooshort=nome de entrada {0} muito pequeno, não é um diretório
+error.validator.isolated.nested.class=a entrada {0} é uma classe aninhada isolada
+error.validator.new.public.class=a entrada {0} contém uma nova classe pública não encontrada nas entradas de base
+error.validator.incompatible.class.version=a entrada {0} tem uma versão de classe incompatível com uma versão anterior
+error.validator.different.api=a entrada {0} contém uma classe com api diferente da versão anterior
+error.validator.names.mismatch=a entrada {0} contém uma classe com o nome interno {1}; os nomes não correspondem
+error.validator.info.name.notequal=module-info.class em um diretório com controle de versão contém nome incorreto
+error.validator.info.requires.transitive=module-info.class em um diretório com controle de versão contém "requires transitive" adicional
+error.validator.info.requires.added=module-info.class em um diretório com controle de versão contém "requires" adicional
+error.validator.info.requires.dropped=module-info.class em um diretório com controle de versão falta "requires"
+error.validator.info.exports.notequal=module-info.class em um diretório com controle de versão contém "exports" diferente
+error.validator.info.opens.notequal=module-info.class em um diretório com controle de versão contém "opens" diferente
+error.validator.info.provides.notequal=module-info.class em um diretório com controle de versão contém "provides" diferente
+error.validator.info.version.notequal={0}: module-info.class em um diretório com controle de versão contém "version" diferente
+error.validator.info.manclass.notequal={0}: module-info.class em um diretório com controle de versão contém "main-class" diferente
+warn.validator.identical.entry=Advertência: a entrada {0} contém uma classe\nidêntica a uma que já está no jar
+warn.validator.resources.with.same.name=Advertência: entrada {0}; diversos recursos com o mesmo nome
+warn.validator.concealed.public.class=Advertência: a entrada {0} é uma classe pública\nem um pacote oculto; colocar esse jar no caminho de classe resultará\nem interfaces públicas incompatíveis
+warn.release.unexpected.versioned.entry=entrada {0} com controle de versão inesperada
 out.added.manifest=manifesto adicionado
 out.added.module-info=module-info: {0} adicionado
-out.automodule=Nenhum descritor de m\u00F3dulo encontrado. M\u00F3dulo autom\u00E1tico derivado.
+out.automodule=Nenhum descritor de módulo encontrado. Módulo automático derivado.
 out.update.manifest=manifesto atualizado
 out.update.module-info=module-info: {0} atualizado
 out.ignore.entry=ignorando entrada {0}
@@ -85,41 +85,41 @@ out.adding=adicionando: {0}
 out.deflated=(compactado {0}%)
 out.stored=(armazenado 0%)
 out.create=\  criado: {0}
-out.extracted=extra\u00EDdo: {0}
+out.extracted=extraído: {0}
 out.inflated=\ inflado: {0}
-out.size=(entrada = {0}) (sa\u00EDda= {1})
+out.size=(entrada = {0}) (saída= {1})
 
-usage.compat=Interface de Compatibilidade:\nUso: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] arquivos] ...\nOp\u00E7\u00F5es:\n    -c  cria novo arquivo compactado\n    -t  lista o sum\u00E1rio do arquivo compactado\n    -x  extrai arquivos com o nome (ou todos) do arquivo compactado\n    -u  atualiza o arquivo compactado existente\n    -v  gera sa\u00EDda detalhada na sa\u00EDda padr\u00E3o\n    -f  especifica o nome do arquivo compactado\n    -m  inclui as informa\u00E7\u00F5es do manifesto do arquivo de manifesto especificado\n    -n   executa a normaliza\u00E7\u00E3o Pack200 ap\u00F3s a cria\u00E7\u00E3o de um novo arquivo compactado\n    -e  especifica o ponto de entrada da aplicativo para aplicativo stand-alone \n        empacotada em um arquivo jar execut\u00E1vel\n    -0  armazena somente; n\u00E3o usa compacta\u00E7\u00E3o ZIP\n    -P  preserva os componentes '/' inicial (caminho absoluto) e ".." (diret\u00F3rio pai) nos nomes dos arquivos\n    -M  n\u00E3o cria um arquivo de manifesto para as entradas\n    -i  gera informa\u00E7\u00F5es de \u00EDndice para os arquivos jar especificados\n    -C  passa para o diret\u00F3rio especificado e inclui o arquivo a seguir\nSe um arquivo tamb\u00E9m for um diret\u00F3rio, ele ser\u00E1 processado repetidamente.\nO nome do arquivo de manifesto, o nome do arquivo compactado e o nome do ponto de entrada s\u00E3o\nespecificados na mesma ordem dos flags 'm', 'f' e 'e'.\n\nExemplo 1: para arquivar dois arquivos de classe em um arquivo compactado denominado classes.jar: \n       jar cvf classes.jar Foo.class Bar.class \nExemplo 2: use um arquivo de manifesto existente 'mymanifest' e arquive todos os\n           arquivos no diret\u00F3rio foo/ em 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/ .\n
+usage.compat=Interface de Compatibilidade:\nUso: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] arquivos] ...\nOpções:\n    -c  cria novo arquivo compactado\n    -t  lista o sumário do arquivo compactado\n    -x  extrai arquivos com o nome (ou todos) do arquivo compactado\n    -u  atualiza o arquivo compactado existente\n    -v  gera saída detalhada na saída padrão\n    -f  especifica o nome do arquivo compactado\n    -m  inclui as informações do manifesto do arquivo de manifesto especificado\n    -n   executa a normalização Pack200 após a criação de um novo arquivo compactado\n    -e  especifica o ponto de entrada da aplicativo para aplicativo stand-alone \n        empacotada em um arquivo jar executável\n    -0  armazena somente; não usa compactação ZIP\n    -P  preserva os componentes '/' inicial (caminho absoluto) e ".." (diretório pai) nos nomes dos arquivos\n    -M  não cria um arquivo de manifesto para as entradas\n    -i  gera informações de índice para os arquivos jar especificados\n    -C  passa para o diretório especificado e inclui o arquivo a seguir\nSe um arquivo também for um diretório, ele será processado repetidamente.\nO nome do arquivo de manifesto, o nome do arquivo compactado e o nome do ponto de entrada são\nespecificados na mesma ordem dos flags 'm', 'f' e 'e'.\n\nExemplo 1: para arquivar dois arquivos de classe em um arquivo compactado denominado classes.jar: \n       jar cvf classes.jar Foo.class Bar.class \nExemplo 2: use um arquivo de manifesto existente 'mymanifest' e arquive todos os\n           arquivos no diretório foo/ em 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/ .\n
 
 main.usage.summary=Uso: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...
-main.usage.summary.try=Tente `jar --ajuda' para obter mais informa\u00E7\u00F5es.
+main.usage.summary.try=Tente `jar --ajuda' para obter mais informações.
 
-main.help.preopt=Uso: arquivos [OPTION...] [ [--release VERSION] [-C dir] jar]...\njar cria um arquivo compactado para classes e recursos, e pode manipular ou\nrestaurar classes ou recursos individuais de um arquivo compactado.\n\n Exemplos:\n # Cria um arquivo compactado chamado classes.jar com dois arquivos de classe:\n jar --create --file classes.jar Foo.class Bar.class\n # Cria um arquivo compactado usando um manifesto existente, com todos os arquivos em foo/:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # Cria um arquivo compactado jar modular, em que o descritor do m\u00F3dulo se localiza em\n # classes/module-info.class:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # Atualiza um arquivo jar n\u00E3o modular existente para um jar modular:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # Cria um arquivo jar de v\u00E1rias releases, colocando alguns arquivos no diret\u00F3rio META-INF/versions/9:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\nPara reduzir ou simplificar o comando jar, voc\u00EA pode especificar argumentos em um arquivo de texto separado\ne especific\u00E1-lo no comando jar com o sinal de arroba (@) como um prefixo.\n\n Exemplos:\n # L\u00EA op\u00E7\u00F5es adicionais e lista os arquivos de classe do arquivo classes.list\n jar --create --file my.jar @classes.list\n
-main.help.opt.main=\ Modo de opera\u00E7\u00E3o principal:\n
+main.help.preopt=Uso: arquivos [OPTION...] [ [--release VERSION] [-C dir] jar]...\njar cria um arquivo compactado para classes e recursos, e pode manipular ou\nrestaurar classes ou recursos individuais de um arquivo compactado.\n\n Exemplos:\n # Cria um arquivo compactado chamado classes.jar com dois arquivos de classe:\n jar --create --file classes.jar Foo.class Bar.class\n # Cria um arquivo compactado usando um manifesto existente, com todos os arquivos em foo/:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # Cria um arquivo compactado jar modular, em que o descritor do módulo se localiza em\n # classes/module-info.class:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # Atualiza um arquivo jar não modular existente para um jar modular:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # Cria um arquivo jar de várias releases, colocando alguns arquivos no diretório META-INF/versions/9:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\nPara reduzir ou simplificar o comando jar, você pode especificar argumentos em um arquivo de texto separado\ne especificá-lo no comando jar com o sinal de arroba (@) como um prefixo.\n\n Exemplos:\n # Lê opções adicionais e lista os arquivos de classe do arquivo classes.list\n jar --create --file my.jar @classes.list\n
+main.help.opt.main=\ Modo de operação principal:\n
 main.help.opt.main.create=\  -c, --create               Cria o arquivo compactado
-main.help.opt.main.generate-index=\  -i, --generate-index=FILE  Gera informa\u00E7\u00F5es de \u00EDndice para os arquivos compactados jar \n                             especificados
-main.help.opt.main.list=\  -t, --list                 Lista o conte\u00FAdo do arquivo compactado
+main.help.opt.main.generate-index=\  -i, --generate-index=FILE  Gera informações de índice para os arquivos compactados jar \n                             especificados
+main.help.opt.main.list=\  -t, --list                 Lista o conteúdo do arquivo compactado
 main.help.opt.main.update=\  -u, --update               Atualiza um arquivo compactado jar existente
 main.help.opt.main.extract=\  -x, --extract              Extrai arquivos nomeados (ou todos) do arquivo compactado
-main.help.opt.main.describe-module=\  -d, --describe-module      Imprime o descritor do m\u00F3dulo ou nome do m\u00F3dulo autom\u00E1tico
-main.help.opt.any=\ Modificadores de opera\u00E7\u00E3o v\u00E1lidos em qualquer modo:\n\n  -C DIR                     Altera para o diret\u00F3rio especificado e inclui o\n                             seguinte arquivo:
-main.help.opt.any.file=\  -f, --file=FILE            O nome do arquivo compactado. Quando omitido, stdin ou\n                             stdout ser\u00E1 usado com base na opera\u00E7\u00E3o\n      --release VERSION      Coloca todos os arquivos a seguir em um diret\u00F3rio com controle de vers\u00E3o\n                             do arquivo jar (i.e. META-INF/versions/VERSION/)
-main.help.opt.any.verbose=\  -v, --verbose              Gera sa\u00EDda detalhada na sa\u00EDda padr\u00E3o
-main.help.opt.create=\ Modificadores de opera\u00E7\u00E3o v\u00E1lidos somente no modo de cria\u00E7\u00E3o:\n
-main.help.opt.create.normalize=\  -n, --normalize            Normaliza as informa\u00E7\u00F5es no novo arquivo compactado jar\n                             ap\u00F3s a cria\u00E7\u00E3o
-main.help.opt.create.update=\ Modificadores de opera\u00E7\u00E3o v\u00E1lidos somente no modo de cria\u00E7\u00E3o e atualiza\u00E7\u00E3o:\n
-main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME O ponto de entrada do aplicativo para aplicativos\n                             stand-alone empacotados em um arquivo compactado jar modular\n                             ou execut\u00E1vel
-main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Inclui as informa\u00E7\u00F5es de manifesto provenientes do arquivo de\n                             manifesto em quest\u00E3o
-main.help.opt.create.update.no-manifest=\  -M, --no-manifest          N\u00E3o cria um arquivo de manifesto para as entradas
-main.help.opt.create.update.module-version=\      --module-version=VERSION    A vers\u00E3o do m\u00F3dulo, ao criar um arquivo jar\n                             modular, ou atualizar um arquivo jar n\u00E3o modular
-main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN Calcula e registra os hashes dos m\u00F3dulos\n                             correlacionado pelo padr\u00E3o fornecido e do qual depende\n                             direta ou indiretamente em um arquivo jar modular que est\u00E1 sendo\n                             criado ou em um arquivo jar n\u00E3o modular que est\u00E1 sendo atualizado
-main.help.opt.create.update.module-path=\  -p, --module-path          Local de depend\u00EAncia de m\u00F3dulo para gerar\n                             o hash
-main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  Excluir do conjunto de m\u00F3dulos raiz padr\u00E3o
-main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Dica para que uma ferramenta emita uma advert\u00EAncia se o m\u00F3dulo\n                             for resolvido. Um destes: deprecated, deprecated-for-removal,\n                             ou incubating
-main.help.opt.create.update.index=\ Modificadores de opera\u00E7\u00E3o v\u00E1lidos somente no modo de cria\u00E7\u00E3o, atualiza\u00E7\u00E3o e gera\u00E7\u00E3o de \u00EDndice:\n
-main.help.opt.create.update.index.no-compress=\  -0, --no-compress          Somente armazenamento; n\u00E3o use compacta\u00E7\u00E3o ZIP
-main.help.opt.other=\ Outras op\u00E7\u00F5es:\n
+main.help.opt.main.describe-module=\  -d, --describe-module      Imprime o descritor do módulo ou nome do módulo automático
+main.help.opt.any=\ Modificadores de operação válidos em qualquer modo:\n\n  -C DIR                     Altera para o diretório especificado e inclui o\n                             seguinte arquivo:
+main.help.opt.any.file=\  -f, --file=FILE            O nome do arquivo compactado. Quando omitido, stdin ou\n                             stdout será usado com base na operação\n      --release VERSION      Coloca todos os arquivos a seguir em um diretório com controle de versão\n                             do arquivo jar (i.e. META-INF/versions/VERSION/)
+main.help.opt.any.verbose=\  -v, --verbose              Gera saída detalhada na saída padrão
+main.help.opt.create=\ Modificadores de operação válidos somente no modo de criação:\n
+main.help.opt.create.normalize=\  -n, --normalize            Normaliza as informações no novo arquivo compactado jar\n                             após a criação
+main.help.opt.create.update=\ Modificadores de operação válidos somente no modo de criação e atualização:\n
+main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME O ponto de entrada do aplicativo para aplicativos\n                             stand-alone empacotados em um arquivo compactado jar modular\n                             ou executável
+main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Inclui as informações de manifesto provenientes do arquivo de\n                             manifesto em questão
+main.help.opt.create.update.no-manifest=\  -M, --no-manifest          Não cria um arquivo de manifesto para as entradas
+main.help.opt.create.update.module-version=\      --module-version=VERSION    A versão do módulo, ao criar um arquivo jar\n                             modular, ou atualizar um arquivo jar não modular
+main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN Calcula e registra os hashes dos módulos\n                             correlacionado pelo padrão fornecido e do qual depende\n                             direta ou indiretamente em um arquivo jar modular que está sendo\n                             criado ou em um arquivo jar não modular que está sendo atualizado
+main.help.opt.create.update.module-path=\  -p, --module-path          Local de dependência de módulo para gerar\n                             o hash
+main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  Excluir do conjunto de módulos raiz padrão
+main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Dica para que uma ferramenta emita uma advertência se o módulo\n                             for resolvido. Um destes: deprecated, deprecated-for-removal,\n                             ou incubating
+main.help.opt.create.update.index=\ Modificadores de operação válidos somente no modo de criação, atualização e geração de índice:\n
+main.help.opt.create.update.index.no-compress=\  -0, --no-compress          Somente armazenamento; não use compactação ZIP
+main.help.opt.other=\ Outras opções:\n
 main.help.opt.other.help=\  -h, --help[:compat]        Fornece esta ajuda ou, opcionalmente, a ajuda de compatibilidade
-main.help.opt.other.help-extra=\      --help-extra           Fornecer ajuda sobre op\u00E7\u00F5es extras
-main.help.opt.other.version=\      --version              Imprime a vers\u00E3o do programa
-main.help.postopt=\ Arquivo compactado ser\u00E1 um arquivo jar modular se um descritor de m\u00F3dulo, 'module-info.class', estiver\n localizado na raiz dos diret\u00F3rios em quest\u00E3o ou na raiz do pr\u00F3prio arquivo compactado\n jar. As seguintes opera\u00E7\u00F5es s\u00F3 s\u00E3o v\u00E1lidas ao criar um jar modular\n ou atualizar um jar n\u00E3o modular existente: '--module-version',\n '--hash-modules' e '--module-path'.\n\n Argumentos obrigat\u00F3rios ou opcionais para op\u00E7\u00F5es longas tamb\u00E9m s\u00E3o obrigat\u00F3rios ou opcionais\n para quaisquer op\u00E7\u00F5es curtas correspondentes.
+main.help.opt.other.help-extra=\      --help-extra           Fornecer ajuda sobre opções extras
+main.help.opt.other.version=\      --version              Imprime a versão do programa
+main.help.postopt=\ Arquivo compactado será um arquivo jar modular se um descritor de módulo, 'module-info.class', estiver\n localizado na raiz dos diretórios em questão ou na raiz do próprio arquivo compactado\n jar. As seguintes operações só são válidas ao criar um jar modular\n ou atualizar um jar não modular existente: '--module-version',\n '--hash-modules' e '--module-path'.\n\n Argumentos obrigatórios ou opcionais para opções longas também são obrigatórios ou opcionais\n para quaisquer opções curtas correspondentes.
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties
index a3936ad7f36..dda86c486a3 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties
@@ -24,64 +24,64 @@
 #
 
 error.multiple.main.operations=Du kan inte ange flera alternativ av typen '-cuxtid'
-error.cant.open=kan inte \u00F6ppna: {0}
-error.illegal.option=Otill\u00E5tet alternativ: {0}
-error.unrecognized.option=ok\u00E4nt alternativ: {0}
-error.missing.arg=alternativet {0} kr\u00E4ver ett argument
+error.cant.open=kan inte öppna: {0}
+error.illegal.option=Otillåtet alternativ: {0}
+error.unrecognized.option=okänt alternativ: {0}
+error.missing.arg=alternativet {0} kräver ett argument
 error.bad.file.arg=Fel vid tolkning av filargument
-error.bad.option=Ett av alternativen -{ctxuid} m\u00E5ste anges.
-error.bad.cflag=f\u00F6r c-flaggan m\u00E5ste manifest- eller indatafiler anges.
-error.bad.uflag=f\u00F6r u-flaggan m\u00E5ste manifest-, e-flagg- eller indatafiler anges.
+error.bad.option=Ett av alternativen -{ctxuid} måste anges.
+error.bad.cflag=för c-flaggan måste manifest- eller indatafiler anges.
+error.bad.uflag=för u-flaggan måste manifest-, e-flagg- eller indatafiler anges.
 error.bad.eflag=e-flaggan och manifest med attributet Main-Class kan inte anges \ntillsammans.
-error.bad.dflag=alternativet '-d, --describe-module' kr\u00E4ver att ingen indatafil anges
-error.bad.reason=ogiltig orsak: {0} m\u00E5ste vara deprecated, deprecated-for-removal eller incubating
-error.nosuch.fileordir={0} : det finns ingen s\u00E5dan fil eller katalog
-error.write.file=Ett fel intr\u00E4ffade vid skrivning till befintlig jar-fil.
-error.create.dir={0} : kunde inte skapa n\u00E5gon katalog
-error.incorrect.length=ogiltig l\u00E4ngd vid bearbetning: {0}
-error.create.tempfile=Kunde inte skapa en tillf\u00E4llig fil
-error.hash.dep={0}-beroenden f\u00F6r hashningsmodulen, kan inte hitta modulen {1} p\u00E5 moduls\u00F6kv\u00E4gen
+error.bad.dflag=alternativet '-d, --describe-module' kräver att ingen indatafil anges
+error.bad.reason=ogiltig orsak: {0} måste vara deprecated, deprecated-for-removal eller incubating
+error.nosuch.fileordir={0} : det finns ingen sådan fil eller katalog
+error.write.file=Ett fel inträffade vid skrivning till befintlig jar-fil.
+error.create.dir={0} : kunde inte skapa någon katalog
+error.incorrect.length=ogiltig längd vid bearbetning: {0}
+error.create.tempfile=Kunde inte skapa en tillfällig fil
+error.hash.dep={0}-beroenden för hashningsmodulen, kan inte hitta modulen {1} på modulsökvägen
 error.module.options.without.info=--module-version eller --hash-modules utan module-info.class
-error.no.operative.descriptor=Ingen operativ deskriptor f\u00F6r utg\u00E5van: {0}
+error.no.operative.descriptor=Ingen operativ deskriptor för utgåvan: {0}
 error.no.root.descriptor=Ingen rotmoduldeskriptor, ange --release
-error.unable.derive.automodule=Kan inte h\u00E4rleda moduldeskriptor f\u00F6r: {0}
-error.unexpected.module-info=Ov\u00E4ntad moduldeskriptor, {0}
+error.unable.derive.automodule=Kan inte härleda moduldeskriptor för: {0}
+error.unexpected.module-info=Oväntad moduldeskriptor, {0}
 error.module.descriptor.not.found=Moduldeskriptorn hittades inte
-error.invalid.versioned.module.attribute=Ogiltigt attribut f\u00F6r moduldeskriptor, {0}
-error.missing.provider=Tj\u00E4nsteleverant\u00F6ren hittades inte: {0}
-error.release.value.notnumber=utg\u00E5va {0} \u00E4r inte giltig
-error.release.value.toosmall=utg\u00E5va {0} \u00E4r inte giltig, m\u00E5ste vara >= 9
-error.release.unexpected.versioned.entry=ov\u00E4ntad versionshanterad post, {0}, f\u00F6r utg\u00E5van {1}
+error.invalid.versioned.module.attribute=Ogiltigt attribut för moduldeskriptor, {0}
+error.missing.provider=Tjänsteleverantören hittades inte: {0}
+error.release.value.notnumber=utgåva {0} är inte giltig
+error.release.value.toosmall=utgåva {0} är inte giltig, måste vara >= 9
+error.release.unexpected.versioned.entry=oväntad versionshanterad post, {0}, för utgåvan {1}
 error.validator.jarfile.exception=kan inte validera {0}: {1}
-error.validator.jarfile.invalid=ogiltig jar-fil f\u00F6r flera utg\u00E5vor, {0}, har tagits bort
-error.validator.bad.entry.name=postnamnet {0} \u00E4r felaktigt utformat
+error.validator.jarfile.invalid=ogiltig jar-fil för flera utgåvor, {0}, har tagits bort
+error.validator.bad.entry.name=postnamnet {0} är felaktigt utformat
 error.validator.version.notnumber=postnamnet {0} har inget versionsnummer
-error.validator.entryname.tooshort=postnamnet {0} \u00E4r f\u00F6r kort, inte en katalog
-error.validator.isolated.nested.class=posten {0} \u00E4r en isolerad kapslad klass
-error.validator.new.public.class=posten {0} inneh\u00E5ller en ny allm\u00E4n klass som inte kan hittas i basposterna
-error.validator.incompatible.class.version=posten {0} har en klassversion som \u00E4r inkompatibel med en tidigare version
-error.validator.different.api=posten {0} inneh\u00E5ller en klass med ett annat api fr\u00E5n en tidigare version
-error.validator.names.mismatch=posten {0} inneh\u00E5ller en klass med det interna namnet {1}, namnen matchar inte
-error.validator.info.name.notequal=module-info.class i en versionshanterad katalog inneh\u00E5ller ett felaktigt namn
-error.validator.info.requires.transitive=module-info.class i en versionshanterad katalog inneh\u00E5ller fler "requires transitive"
-error.validator.info.requires.added=module-info.class i en versionshanterad katalog inneh\u00E5ller fler "requires"
-error.validator.info.requires.dropped=module-info.class i en versionshanterad katalog inneh\u00E5ller saknade "requires"
-error.validator.info.exports.notequal=module-info.class i en versionshanterad katalog inneh\u00E5ller olika "exports"
-error.validator.info.opens.notequal=module-info.class i en versionshanterad katalog inneh\u00E5ller olika "opens"
-error.validator.info.provides.notequal=module-info.class i en versionshanterad katalog inneh\u00E5ller olika "provides"
-error.validator.info.version.notequal={0}: module-info.class i en versionshanterad katalog inneh\u00E5ller olika "version"
-error.validator.info.manclass.notequal={0}: module-info.class i en versionshanterad katalog inneh\u00E5ller olika "main-class"
-warn.validator.identical.entry=Varning: posten {0} inneh\u00E5ller en klass som\n\u00E4r identisk med en post som redan finns i jar-filen
+error.validator.entryname.tooshort=postnamnet {0} är för kort, inte en katalog
+error.validator.isolated.nested.class=posten {0} är en isolerad kapslad klass
+error.validator.new.public.class=posten {0} innehåller en ny allmän klass som inte kan hittas i basposterna
+error.validator.incompatible.class.version=posten {0} har en klassversion som är inkompatibel med en tidigare version
+error.validator.different.api=posten {0} innehåller en klass med ett annat api från en tidigare version
+error.validator.names.mismatch=posten {0} innehåller en klass med det interna namnet {1}, namnen matchar inte
+error.validator.info.name.notequal=module-info.class i en versionshanterad katalog innehåller ett felaktigt namn
+error.validator.info.requires.transitive=module-info.class i en versionshanterad katalog innehåller fler "requires transitive"
+error.validator.info.requires.added=module-info.class i en versionshanterad katalog innehåller fler "requires"
+error.validator.info.requires.dropped=module-info.class i en versionshanterad katalog innehåller saknade "requires"
+error.validator.info.exports.notequal=module-info.class i en versionshanterad katalog innehåller olika "exports"
+error.validator.info.opens.notequal=module-info.class i en versionshanterad katalog innehåller olika "opens"
+error.validator.info.provides.notequal=module-info.class i en versionshanterad katalog innehåller olika "provides"
+error.validator.info.version.notequal={0}: module-info.class i en versionshanterad katalog innehåller olika "version"
+error.validator.info.manclass.notequal={0}: module-info.class i en versionshanterad katalog innehåller olika "main-class"
+warn.validator.identical.entry=Varning: posten {0} innehåller en klass som\när identisk med en post som redan finns i jar-filen
 warn.validator.resources.with.same.name=Varning: posten {0}, flera resurser med samma namn
-warn.validator.concealed.public.class=Varning: posten {0} \u00E4r en allm\u00E4n klass\ni ett dolt paket. Om du placerar den h\u00E4r jar-filen p\u00E5 klass\u00F6kv\u00E4gen leder\ndet till inkompatibla allm\u00E4nna gr\u00E4nssnitt
-warn.release.unexpected.versioned.entry=ov\u00E4ntad versionshanterad post, {0}
+warn.validator.concealed.public.class=Varning: posten {0} är en allmän klass\ni ett dolt paket. Om du placerar den här jar-filen på klassökvägen leder\ndet till inkompatibla allmänna gränssnitt
+warn.release.unexpected.versioned.entry=oväntad versionshanterad post, {0}
 out.added.manifest=tillagt manifestfil
 out.added.module-info=lade till module-info: {0}
-out.automodule=Ingen moduldeskriptor hittades. H\u00E4rledd automatisk modul.
+out.automodule=Ingen moduldeskriptor hittades. Härledd automatisk modul.
 out.update.manifest=uppdaterat manifest
 out.update.module-info=uppdaterade module-info: {0}
 out.ignore.entry=ignorerar posten {0}
-out.adding=l\u00E4gger till: {0}
+out.adding=lägger till: {0}
 out.deflated=({0}% packat)
 out.stored=(0% lagrat)
 out.create=\  skapad: {0}
@@ -89,37 +89,37 @@ out.extracted=extraherat: {0}
 out.inflated=\ uppackat: {0}
 out.size=(in = {0}) (ut = {1})
 
-usage.compat=Kompatibilitetsgr\u00E4nssnitt:\nSyntax: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\nAlternativ:\n    -c  skapa nytt arkiv\n    -t  lista inneh\u00E5llsf\u00F6rteckning f\u00F6r arkiv\n    -x  extrahera namngivna (eller alla) filer fr\u00E5n arkivet\n    -u  uppdatera befintligt arkiv\n    -v  generera utf\u00F6rliga utdata till standardutdata\n    -f  ange namnet p\u00E5 arkivfilen\n    -m  inkludera manifestinformation fr\u00E5n den angivna manifestfilen\n    -n  utf\u00F6r Pack200-normalisering n\u00E4r ett nytt arkiv har skapats\n    -e  ange applikationsing\u00E5ngspunkt f\u00F6r frist\u00E5ende applikation \n        som medf\u00F6ljer i en jar-programfil\n    -0  lagra endast, anv\u00E4nd inte ZIP-komprimering\n    -P  beh\u00E5ll komponenter f\u00F6r inledande '/' (absolut s\u00F6kv\u00E4g) och ".." (\u00F6verordnad  katalog) fr\u00E5n filnamn\n    -M  skapa inte en manifestfil f\u00F6r posterna\n    -i  generera indexinformation f\u00F6r de angivna jar-filerna\n    -C  \u00E4ndra till den angivna katalogen och inkludera f\u00F6ljande fil\nOm en fil \u00E4r en katalog bearbetas den rekursivt.\nNamnen p\u00E5 manifestfilen, arkivfilen och ing\u00E5ngspunkten anges med samma\nordning som flaggorna 'm', 'f' och 'e'.\n\nExempel 1: arkivera tv\u00E5 klassfiler i ett arkiv med namnet classes.jar: \n       jar cvf classes.jar Foo.class Bar.class \nExempel 2: anv\u00E4nd den befintliga manifestfilen 'mymanifest' och arkivera alla\n           filer i katalogen 'foo/' till 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/ .\n
+usage.compat=Kompatibilitetsgränssnitt:\nSyntax: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\nAlternativ:\n    -c  skapa nytt arkiv\n    -t  lista innehållsförteckning för arkiv\n    -x  extrahera namngivna (eller alla) filer från arkivet\n    -u  uppdatera befintligt arkiv\n    -v  generera utförliga utdata till standardutdata\n    -f  ange namnet på arkivfilen\n    -m  inkludera manifestinformation från den angivna manifestfilen\n    -n  utför Pack200-normalisering när ett nytt arkiv har skapats\n    -e  ange applikationsingångspunkt för fristående applikation \n        som medföljer i en jar-programfil\n    -0  lagra endast, använd inte ZIP-komprimering\n    -P  behåll komponenter för inledande '/' (absolut sökväg) och ".." (överordnad  katalog) från filnamn\n    -M  skapa inte en manifestfil för posterna\n    -i  generera indexinformation för de angivna jar-filerna\n    -C  ändra till den angivna katalogen och inkludera följande fil\nOm en fil är en katalog bearbetas den rekursivt.\nNamnen på manifestfilen, arkivfilen och ingångspunkten anges med samma\nordning som flaggorna 'm', 'f' och 'e'.\n\nExempel 1: arkivera två klassfiler i ett arkiv med namnet classes.jar: \n       jar cvf classes.jar Foo.class Bar.class \nExempel 2: använd den befintliga manifestfilen 'mymanifest' och arkivera alla\n           filer i katalogen 'foo/' till 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/ .\n
 
 main.usage.summary=Syntax: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...
-main.usage.summary.try=F\u00F6rs\u00F6k med 'jar --help' f\u00F6r mer information.
+main.usage.summary.try=Försök med 'jar --help' för mer information.
 
-main.help.preopt=Syntax: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar skapar ett arkiv f\u00F6r klasser och resurser, och kan \u00E4ndra och \u00E5terst\u00E4lla\nenskilda klasser och resurser fr\u00E5n ett arkiv.\n\n Exempel:\n # Skapa ett arkiv med namnet classes.jar med tv\u00E5 klassfiler:\n jar --create --file classes.jar Foo.class Bar.class\n # Skapa ett arkiv med ett befintligt manifest med alla filerna i 'foo/':\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # Skapa ett modul\u00E4rt jar-arkiv, d\u00E4r moduldeskriptorn finns i\n # classes/module-info.class:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # Uppdatera ett befintligt icke-modul\u00E4rt jar-arkiv till ett modul\u00E4rt jar-arkiv:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # Skapa ett jar-arkiv f\u00F6r flera utg\u00E5vor och placera vissa av filerna i katalogen 'META-INF/versions/9':\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\nOm du vill f\u00F6rkorta eller f\u00F6renkla kommandot jar kan du ange argument i en separat\ntextfil och \u00F6verf\u00F6ra den med tecknet '@' som prefix.\n\n Exempel:\n # L\u00E4s ytterligare alternativ och en lista \u00F6ver klassfiler fr\u00E5n filen 'classes.list'\n jar --create --file my.jar @classes.list\n
-main.help.opt.main=\ Huvudfunktionsl\u00E4ge:\n
+main.help.preopt=Syntax: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar skapar ett arkiv för klasser och resurser, och kan ändra och återställa\nenskilda klasser och resurser från ett arkiv.\n\n Exempel:\n # Skapa ett arkiv med namnet classes.jar med två klassfiler:\n jar --create --file classes.jar Foo.class Bar.class\n # Skapa ett arkiv med ett befintligt manifest med alla filerna i 'foo/':\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # Skapa ett modulärt jar-arkiv, där moduldeskriptorn finns i\n # classes/module-info.class:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # Uppdatera ett befintligt icke-modulärt jar-arkiv till ett modulärt jar-arkiv:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # Skapa ett jar-arkiv för flera utgåvor och placera vissa av filerna i katalogen 'META-INF/versions/9':\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\nOm du vill förkorta eller förenkla kommandot jar kan du ange argument i en separat\ntextfil och överföra den med tecknet '@' som prefix.\n\n Exempel:\n # Läs ytterligare alternativ och en lista över klassfiler från filen 'classes.list'\n jar --create --file my.jar @classes.list\n
+main.help.opt.main=\ Huvudfunktionsläge:\n
 main.help.opt.main.create=\  -c, --create               Skapa arkivet
-main.help.opt.main.generate-index=\  -i, --generate-index=FILE  Generera indexinformation f\u00F6r de angivna jar-\n                             arkiven
-main.help.opt.main.list=\  -t, --list                 Listar inneh\u00E5llsf\u00F6rteckningen f\u00F6r arkivet
+main.help.opt.main.generate-index=\  -i, --generate-index=FILE  Generera indexinformation för de angivna jar-\n                             arkiven
+main.help.opt.main.list=\  -t, --list                 Listar innehållsförteckningen för arkivet
 main.help.opt.main.update=\  -u, --update               Uppdatera ett befintligt jar-arkiv
-main.help.opt.main.extract=\  -x, --extract              Extrahera namngivna (eller alla) filer fr\u00E5n arkivet
+main.help.opt.main.extract=\  -x, --extract              Extrahera namngivna (eller alla) filer från arkivet
 main.help.opt.main.describe-module=\  -d, --describe-module      Skriv ut moduldeskriptorn eller det automatiska modulnamnet
-main.help.opt.any=\ \u00C5tg\u00E4rdsmodifierare som \u00E4r giltiga i alla l\u00E4gen:\n\n  -C DIR                     \u00C4ndra till den angivna katalogen och inkludera\n                             f\u00F6ljande fil
-main.help.opt.any.file=\  -f, --file=FILE            Namnet p\u00E5 arkivfilen. N\u00E4r det utel\u00E4mnas anv\u00E4nds stdin eller\n                             stdout beroende p\u00E5 \u00E5tg\u00E4rden\n      --release VERSION      Placerar alla f\u00F6ljande filer i en versionshanterad katalog\n                             i jar-filen (t.ex. META-INF/versions/VERSION/)
-main.help.opt.any.verbose=\  -v, --verbose              Generera utf\u00F6rliga utdata till standardutdata
-main.help.opt.create=\ \u00C5tg\u00E4rdsmodifierare som endast \u00E4r giltiga i l\u00E4get create:\n
-main.help.opt.create.normalize=\  -n, --normalize            Normalisera informationen i det nya jar-arkivet\n                             n\u00E4r det har skapats
-main.help.opt.create.update=\ \u00C5tg\u00E4rdsmodifierare som endast \u00E4r giltiga i l\u00E4gena create och update:\n
-main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME Applikationsing\u00E5ngspunkten f\u00F6r frist\u00E5ende\n                             applikationer paketerad i ett modul\u00E4rt, eller k\u00F6rbart,\n                             jar-arkiv
-main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Inkludera manifestinformationen fr\u00E5n den angivna\n                             manifestfilen
-main.help.opt.create.update.no-manifest=\  -M, --no-manifest          Skapa inte en manifestfil f\u00F6r posterna
-main.help.opt.create.update.module-version=\      --module-version=VERSION    Modulversionen vid skapande av ett modul\u00E4rt\n                             jar-arkiv eller vid uppdatering av ett icke-modul\u00E4rt jar-arkiv
-main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN Ber\u00E4kna och registrera hashningarna f\u00F6r moduler som\n                             matchar det angivna m\u00F6nstret och som \u00E4r direkt eller\n                             indirekt beroende av att ett modul\u00E4rt jar-arkiv skapas\n                             eller att ett icke-modul\u00E4rt jar-arkiv uppdateras
-main.help.opt.create.update.module-path=\  -p, --module-path          Plats f\u00F6r modulberoende f\u00F6r att generera\n                             hashningen
-main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  Exkludera fr\u00E5n standardrotupps\u00E4ttningen med moduler
-main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Tips f\u00F6r ett verktyg f\u00F6r att utf\u00E4rda en varning om modulen\n                             har l\u00F6sts. deprecated, deprecated-for-removal,\n                             eller incubating
-main.help.opt.create.update.index=\ \u00C5tg\u00E4rdsmodifierare som endast \u00E4r giltiga i l\u00E4gena create, update och generate-index:\n
-main.help.opt.create.update.index.no-compress=\  -0, --no-compress          Endast lagring, anv\u00E4nd ingen ZIP-komprimering
-main.help.opt.other=\ \u00D6vriga alternativ:\n
-main.help.opt.other.help=\  -h, --help[:compat]        Visa den h\u00E4r hj\u00E4lpen eller kompatibilitetshj\u00E4lpen (valfritt)
-main.help.opt.other.help-extra=\      --help-extra           Visa hj\u00E4lp f\u00F6r extra alternativ
+main.help.opt.any=\ Åtgärdsmodifierare som är giltiga i alla lägen:\n\n  -C DIR                     Ändra till den angivna katalogen och inkludera\n                             följande fil
+main.help.opt.any.file=\  -f, --file=FILE            Namnet på arkivfilen. När det utelämnas används stdin eller\n                             stdout beroende på åtgärden\n      --release VERSION      Placerar alla följande filer i en versionshanterad katalog\n                             i jar-filen (t.ex. META-INF/versions/VERSION/)
+main.help.opt.any.verbose=\  -v, --verbose              Generera utförliga utdata till standardutdata
+main.help.opt.create=\ Åtgärdsmodifierare som endast är giltiga i läget create:\n
+main.help.opt.create.normalize=\  -n, --normalize            Normalisera informationen i det nya jar-arkivet\n                             när det har skapats
+main.help.opt.create.update=\ Åtgärdsmodifierare som endast är giltiga i lägena create och update:\n
+main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME Applikationsingångspunkten för fristående\n                             applikationer paketerad i ett modulärt, eller körbart,\n                             jar-arkiv
+main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Inkludera manifestinformationen från den angivna\n                             manifestfilen
+main.help.opt.create.update.no-manifest=\  -M, --no-manifest          Skapa inte en manifestfil för posterna
+main.help.opt.create.update.module-version=\      --module-version=VERSION    Modulversionen vid skapande av ett modulärt\n                             jar-arkiv eller vid uppdatering av ett icke-modulärt jar-arkiv
+main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN Beräkna och registrera hashningarna för moduler som\n                             matchar det angivna mönstret och som är direkt eller\n                             indirekt beroende av att ett modulärt jar-arkiv skapas\n                             eller att ett icke-modulärt jar-arkiv uppdateras
+main.help.opt.create.update.module-path=\  -p, --module-path          Plats för modulberoende för att generera\n                             hashningen
+main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  Exkludera från standardrotuppsättningen med moduler
+main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Tips för ett verktyg för att utfärda en varning om modulen\n                             har lösts. deprecated, deprecated-for-removal,\n                             eller incubating
+main.help.opt.create.update.index=\ Åtgärdsmodifierare som endast är giltiga i lägena create, update och generate-index:\n
+main.help.opt.create.update.index.no-compress=\  -0, --no-compress          Endast lagring, använd ingen ZIP-komprimering
+main.help.opt.other=\ Övriga alternativ:\n
+main.help.opt.other.help=\  -h, --help[:compat]        Visa den här hjälpen eller kompatibilitetshjälpen (valfritt)
+main.help.opt.other.help-extra=\      --help-extra           Visa hjälp för extra alternativ
 main.help.opt.other.version=\      --version              Skriv ut programversion
-main.help.postopt=\ Ett arkiv \u00E4r ett modul\u00E4rt jar-arkiv om en moduldeskriptor, 'module-info.class',\n finns i roten av de angivna katalogerna eller det angivna jar-arkivet.\n F\u00F6ljande \u00E5tg\u00E4rder \u00E4r endast giltiga vid skapande av ett modul\u00E4rt jar-arkiv och\n vid uppdatering av ett befintligt icke-modul\u00E4rt jar-arkiv: '--module-version',\n '--hash-modules' och '--module-path'.\n\n Obligatoriska och valfria alternativ f\u00F6r l\u00E5nga alternativ \u00E4r \u00E4ven obligatoriska\n respektive valfria f\u00F6r alla motsvarande korta alternativ.
+main.help.postopt=\ Ett arkiv är ett modulärt jar-arkiv om en moduldeskriptor, 'module-info.class',\n finns i roten av de angivna katalogerna eller det angivna jar-arkivet.\n Följande åtgärder är endast giltiga vid skapande av ett modulärt jar-arkiv och\n vid uppdatering av ett befintligt icke-modulärt jar-arkiv: '--module-version',\n '--hash-modules' och '--module-path'.\n\n Obligatoriska och valfria alternativ för långa alternativ är även obligatoriska\n respektive valfria för alla motsvarande korta alternativ.
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
index 56d1bbf8454..06167a5b895 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
@@ -25,111 +25,111 @@
 
 ## tool
 
-jar.description=\u521B\u5EFA\u7C7B\u548C\u8D44\u6E90\u7684\u6863\u6848\uFF0C\u5E76\u5904\u7406\u6863\u6848\u4E2D\u7684\u5355\u4E2A\u7C7B\u6216\u8D44\u6E90\u6216\u8005\u4ECE\u6863\u6848\u4E2D\u8FD8\u539F\u5355\u4E2A\u7C7B\u6216\u8D44\u6E90
+jar.description=创建类和资源的档案，并处理档案中的单个类或资源或者从档案中还原单个类或资源
 
-error.multiple.main.operations=\u4E0D\u80FD\u6307\u5B9A\u591A\u4E2A '-cuxtid' \u9009\u9879
-error.cant.open=\u65E0\u6CD5\u6253\u5F00: {0}
-error.illegal.option=\u975E\u6CD5\u9009\u9879: {0}
-error.unrecognized.option=\u65E0\u6CD5\u8BC6\u522B\u7684\u9009\u9879: {0}
-error.missing.arg=\u9009\u9879{0}\u9700\u8981\u53C2\u6570
-error.bad.file.arg=\u89E3\u6790\u6587\u4EF6\u53C2\u6570\u65F6\u51FA\u9519
-error.bad.option=\u5FC5\u987B\u6307\u5B9A -{ctxuid} \u6216 --validate \u9009\u9879\u4E4B\u4E00\u3002
-error.bad.cflag='c' \u6807\u8BB0\u8981\u6C42\u6307\u5B9A\u6E05\u5355\u6216\u8F93\u5165\u6587\u4EF6!
-error.bad.uflag='u' \u6807\u8BB0\u8981\u6C42\u6307\u5B9A\u6E05\u5355, 'e' \u6807\u8BB0\u6216\u8F93\u5165\u6587\u4EF6!
-error.bad.eflag=\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A 'e' \u6807\u8BB0\u548C\u5177\u6709 'Main-Class' \u5C5E\u6027\u7684\n\u6E05\u5355!
-error.bad.dflag='-d, --describe-module' \u9009\u9879\u4E0D\u9700\u8981\u6307\u5B9A\u4EFB\u4F55\u8F93\u5165\u6587\u4EF6
-error.bad.reason=\u9519\u8BEF\u7684\u539F\u56E0: {0}, \u5FC5\u987B\u4E3A deprecated, deprecated-for-removal \u6216 incubating \u4E4B\u4E00
-error.nosuch.fileordir={0}: \u6CA1\u6709\u8FD9\u4E2A\u6587\u4EF6\u6216\u76EE\u5F55
-error.write.file=\u5199\u5165\u73B0\u6709\u7684 jar \u6587\u4EF6\u65F6\u51FA\u9519
-error.create.dir={0}: \u65E0\u6CD5\u521B\u5EFA\u76EE\u5F55
-error.incorrect.length=\u5904\u7406\u65F6\u9047\u5230\u4E0D\u6B63\u786E\u7684\u957F\u5EA6: {0}
-error.create.tempfile=\u65E0\u6CD5\u521B\u5EFA\u4E34\u65F6\u6587\u4EF6
-error.hash.dep=\u6B63\u5728\u5BF9\u6A21\u5757 {0} \u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u6267\u884C\u6563\u5217\u5904\u7406, \u5728\u6A21\u5757\u8DEF\u5F84\u4E2D\u627E\u4E0D\u5230\u6A21\u5757 {1}
-error.module.options.without.info=--module-version \u6216 --hash-modules \u4E4B\u4E00\u6CA1\u6709 module-info.class
-error.no.operative.descriptor=\u6CA1\u6709\u53D1\u884C\u7248\u7684\u6709\u6548\u63CF\u8FF0\u7B26: {0}
-error.no.root.descriptor=\u6CA1\u6709\u6839\u6A21\u5757\u63CF\u8FF0\u7B26, \u8BF7\u6307\u5B9A --release
-error.unable.derive.automodule=\u65E0\u6CD5\u6D3E\u751F {0} \u7684\u6A21\u5757\u63CF\u8FF0\u7B26
-error.unexpected.module-info=\u610F\u5916\u7684\u6A21\u5757\u63CF\u8FF0\u7B26 {0}
-error.module.descriptor.not.found=\u627E\u4E0D\u5230\u6A21\u5757\u63CF\u8FF0\u7B26
-error.invalid.versioned.module.attribute=\u65E0\u6548\u7684\u6A21\u5757\u63CF\u8FF0\u7B26\u5C5E\u6027 {0}
-error.missing.provider=\u672A\u627E\u5230\u670D\u52A1\u63D0\u4F9B\u65B9: {0}
-error.release.value.notnumber=\u53D1\u884C\u7248 {0} \u65E0\u6548
-error.release.value.toosmall=\u53D1\u884C\u7248 {0} \u65E0\u6548, \u5FC5\u987B >= 9
-error.release.unexpected.versioned.entry=\u53D1\u884C\u7248 {1} \u5B58\u5728\u610F\u5916\u7684\u7248\u672C\u5316\u6761\u76EE {0}
-error.date.notvalid=\u65E5\u671F {0} \u4E0D\u662F\u5177\u6709\u53EF\u9009\u65F6\u533A\u7684\u6709\u6548 ISO-8601 \u6269\u5C55\u504F\u79FB\u65E5\u671F\u65F6\u95F4
-error.date.out.of.range=\u65E5\u671F {0} \u4E0D\u5728 1980-01-01T00:00:02Z \u5230 2099-12-31T23:59:59Z \u8FD9\u4E00\u6709\u6548\u8303\u56F4\u5185
-error.validator.jarfile.exception=\u65E0\u6CD5\u9A8C\u8BC1 {0}: {1}
-error.validator.jarfile.invalid=\u5220\u9664\u7684\u591A\u53D1\u884C\u7248 jar \u6587\u4EF6 {0} \u65E0\u6548
-error.validator.bad.entry.name=\u6761\u76EE\u540D\u79F0\u683C\u5F0F\u9519\u8BEF, {0}
-error.validator.version.notnumber=\u6761\u76EE\u540D\u79F0 {0} \u6CA1\u6709\u7248\u672C\u53F7
-error.validator.entryname.tooshort=\u6761\u76EE\u540D\u79F0 {0} \u592A\u77ED, \u4E0D\u662F\u76EE\u5F55
-error.validator.isolated.nested.class=\u6761\u76EE {0} \u662F\u5355\u72EC\u7684\u5D4C\u5957\u7C7B
-error.validator.new.public.class=\u6761\u76EE {0} \u5305\u542B\u672A\u5728\u57FA\u7840\u6761\u76EE\u4E2D\u627E\u5230\u7684\u65B0\u516C\u5171\u7C7B
-error.validator.incompatible.class.version=\u6761\u76EE {0} \u5305\u542B\u4E0E\u8F83\u65E9\u7248\u672C\u4E0D\u517C\u5BB9\u7684\u7C7B\u7248\u672C
-error.validator.different.api=\u6761\u76EE {0} \u5305\u542B\u7684\u7C7B\u5177\u6709\u4E0E\u65E9\u671F\u7248\u672C\u4E0D\u540C\u7684 api
-error.validator.names.mismatch=\u6761\u76EE {0} \u5305\u542B\u5185\u90E8\u540D\u79F0\u4E3A {1} \u7684\u7C7B, \u540D\u79F0\u4E0D\u5339\u914D
-error.validator.info.name.notequal=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u6B63\u786E\u7684\u540D\u79F0
-error.validator.info.requires.transitive=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u989D\u5916\u7684 "requires transitive"
-error.validator.info.requires.added=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u989D\u5916\u7684 "requires"
-error.validator.info.requires.dropped=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u7F3A\u5C11\u7684 "requires"
-error.validator.info.exports.notequal=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "exports"
-error.validator.info.opens.notequal=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "opens"
-error.validator.info.provides.notequal=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "provides"
-error.validator.info.version.notequal={0}: \u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "version"
-error.validator.info.manclass.notequal={0}: \u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "main-class"
-warn.validator.identical.entry=\u8B66\u544A: \u6761\u76EE {0} \u5305\u542B\u4E0E jar \u4E2D\u7684\n\u73B0\u6709\u6761\u76EE\u76F8\u540C\u7684\u7C7B
-warn.validator.resources.with.same.name=\u8B66\u544A: \u6761\u76EE {0}, \u591A\u4E2A\u8D44\u6E90\u5177\u6709\u76F8\u540C\u540D\u79F0
-warn.validator.concealed.public.class=\u8B66\u544A: \u6761\u76EE {0} \u662F\u5DF2\u9690\u85CF\u7A0B\u5E8F\u5305\u4E2D\u7684\n\u516C\u5171\u7C7B, \u5C06\u6B64 jar \u653E\u7F6E\u5728\u7C7B\u8DEF\u5F84\u4E2D\n\u5C06\u5BFC\u81F4\u516C\u5171\u63A5\u53E3\u4E0D\u517C\u5BB9
-warn.release.unexpected.versioned.entry=\u610F\u5916\u7684\u7248\u672C\u5316\u6761\u76EE {0}
-warn.index.is.ignored=\u81EA JDK 18 \u8D77\uFF0C\u5728\u8FD0\u884C\u65F6\u5FFD\u7565 JAR \u7D22\u5F15 (META-INF/INDEX.LIST)
-warn.flag.is.deprecated=\u8B66\u544A\uFF1A{0} \u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5FFD\u7565\u6216\u5220\u9664\u3002\n
-out.added.manifest=\u5DF2\u6DFB\u52A0\u6E05\u5355
-out.added.module-info=\u5DF2\u6DFB\u52A0 module-info: {0}
-out.automodule=\u627E\u4E0D\u5230\u6A21\u5757\u63CF\u8FF0\u7B26\u3002\u5DF2\u6D3E\u751F\u81EA\u52A8\u6A21\u5757\u3002
-out.update.manifest=\u5DF2\u66F4\u65B0\u6E05\u5355
-out.update.module-info=\u5DF2\u66F4\u65B0 module-info: {0}
-out.ignore.entry=\u6B63\u5728\u5FFD\u7565\u6761\u76EE{0}
-out.adding=\u6B63\u5728\u6DFB\u52A0: {0}
-out.deflated=(\u538B\u7F29\u4E86 {0}%)
-out.stored=(\u5B58\u50A8\u4E86 0%)
-out.create=\  \u5DF2\u521B\u5EFA: {0}
-out.extracted=\u5DF2\u63D0\u53D6: {0}
-out.inflated=\  \u5DF2\u89E3\u538B: {0}
-out.size=(\u8F93\u5165 = {0}) (\u8F93\u51FA = {1})
+error.multiple.main.operations=不能指定多个 '-cuxtid' 选项
+error.cant.open=无法打开: {0}
+error.illegal.option=非法选项: {0}
+error.unrecognized.option=无法识别的选项: {0}
+error.missing.arg=选项{0}需要参数
+error.bad.file.arg=解析文件参数时出错
+error.bad.option=必须指定 -{ctxuid} 或 --validate 选项之一。
+error.bad.cflag='c' 标记要求指定清单或输入文件!
+error.bad.uflag='u' 标记要求指定清单, 'e' 标记或输入文件!
+error.bad.eflag=不能同时指定 'e' 标记和具有 'Main-Class' 属性的\n清单!
+error.bad.dflag='-d, --describe-module' 选项不需要指定任何输入文件
+error.bad.reason=错误的原因: {0}, 必须为 deprecated, deprecated-for-removal 或 incubating 之一
+error.nosuch.fileordir={0}: 没有这个文件或目录
+error.write.file=写入现有的 jar 文件时出错
+error.create.dir={0}: 无法创建目录
+error.incorrect.length=处理时遇到不正确的长度: {0}
+error.create.tempfile=无法创建临时文件
+error.hash.dep=正在对模块 {0} 的被依赖对象执行散列处理, 在模块路径中找不到模块 {1}
+error.module.options.without.info=--module-version 或 --hash-modules 之一没有 module-info.class
+error.no.operative.descriptor=没有发行版的有效描述符: {0}
+error.no.root.descriptor=没有根模块描述符, 请指定 --release
+error.unable.derive.automodule=无法派生 {0} 的模块描述符
+error.unexpected.module-info=意外的模块描述符 {0}
+error.module.descriptor.not.found=找不到模块描述符
+error.invalid.versioned.module.attribute=无效的模块描述符属性 {0}
+error.missing.provider=未找到服务提供方: {0}
+error.release.value.notnumber=发行版 {0} 无效
+error.release.value.toosmall=发行版 {0} 无效, 必须 >= 9
+error.release.unexpected.versioned.entry=发行版 {1} 存在意外的版本化条目 {0}
+error.date.notvalid=日期 {0} 不是具有可选时区的有效 ISO-8601 扩展偏移日期时间
+error.date.out.of.range=日期 {0} 不在 1980-01-01T00:00:02Z 到 2099-12-31T23:59:59Z 这一有效范围内
+error.validator.jarfile.exception=无法验证 {0}: {1}
+error.validator.jarfile.invalid=删除的多发行版 jar 文件 {0} 无效
+error.validator.bad.entry.name=条目名称格式错误, {0}
+error.validator.version.notnumber=条目名称 {0} 没有版本号
+error.validator.entryname.tooshort=条目名称 {0} 太短, 不是目录
+error.validator.isolated.nested.class=条目 {0} 是单独的嵌套类
+error.validator.new.public.class=条目 {0} 包含未在基础条目中找到的新公共类
+error.validator.incompatible.class.version=条目 {0} 包含与较早版本不兼容的类版本
+error.validator.different.api=条目 {0} 包含的类具有与早期版本不同的 api
+error.validator.names.mismatch=条目 {0} 包含内部名称为 {1} 的类, 名称不匹配
+error.validator.info.name.notequal=版本化目录中的 module-info.class 包含不正确的名称
+error.validator.info.requires.transitive=版本化目录中的 module-info.class 包含额外的 "requires transitive"
+error.validator.info.requires.added=版本化目录中的 module-info.class 包含额外的 "requires"
+error.validator.info.requires.dropped=版本化目录中的 module-info.class 包含缺少的 "requires"
+error.validator.info.exports.notequal=版本化目录中的 module-info.class 包含不同的 "exports"
+error.validator.info.opens.notequal=版本化目录中的 module-info.class 包含不同的 "opens"
+error.validator.info.provides.notequal=版本化目录中的 module-info.class 包含不同的 "provides"
+error.validator.info.version.notequal={0}: 版本化目录中的 module-info.class 包含不同的 "version"
+error.validator.info.manclass.notequal={0}: 版本化目录中的 module-info.class 包含不同的 "main-class"
+warn.validator.identical.entry=警告: 条目 {0} 包含与 jar 中的\n现有条目相同的类
+warn.validator.resources.with.same.name=警告: 条目 {0}, 多个资源具有相同名称
+warn.validator.concealed.public.class=警告: 条目 {0} 是已隐藏程序包中的\n公共类, 将此 jar 放置在类路径中\n将导致公共接口不兼容
+warn.release.unexpected.versioned.entry=意外的版本化条目 {0}
+warn.index.is.ignored=自 JDK 18 起，在运行时忽略 JAR 索引 (META-INF/INDEX.LIST)
+warn.flag.is.deprecated=警告：{0} 选项已过时，可能会在未来发行版中忽略或删除。\n
+out.added.manifest=已添加清单
+out.added.module-info=已添加 module-info: {0}
+out.automodule=找不到模块描述符。已派生自动模块。
+out.update.manifest=已更新清单
+out.update.module-info=已更新 module-info: {0}
+out.ignore.entry=正在忽略条目{0}
+out.adding=正在添加: {0}
+out.deflated=(压缩了 {0}%)
+out.stored=(存储了 0%)
+out.create=\  已创建: {0}
+out.extracted=已提取: {0}
+out.inflated=\  已解压: {0}
+out.size=(输入 = {0}) (输出 = {1})
 
-usage.compat=\u517C\u5BB9\u6027\u63A5\u53E3\uFF1A\n\u7528\u6CD5\uFF1Ajar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...\n\u9009\u9879\uFF1A\n    -c  \u521B\u5EFA\u65B0\u6863\u6848\uFF08\u5305\u62EC\u7F3A\u5C11\u7684\u7236\u76EE\u5F55\uFF09\n    -t  \u5217\u51FA\u6863\u6848\u76EE\u5F55\n    -x  \u4ECE\u6863\u6848\u4E2D\u63D0\u53D6\u6307\u5B9A\u7684\uFF08\u6216\u6240\u6709\uFF09\u6587\u4EF6\n    -u  \u66F4\u65B0\u73B0\u6709\u6863\u6848\n    -v  \u5728\u6807\u51C6\u8F93\u51FA\u4E2D\u751F\u6210\u8BE6\u7EC6\u8F93\u51FA\n    -f  \u6307\u5B9A\u6863\u6848\u6587\u4EF6\u540D\n    -m  \u5305\u542B\u6307\u5B9A\u6E05\u5355\u6587\u4EF6\u4E2D\u7684\u6E05\u5355\u4FE1\u606F\n    -e  \u4E3A\u6346\u7ED1\u5230\u53EF\u6267\u884C jar \u6587\u4EF6\u7684\u72EC\u7ACB\u5E94\u7528\u7A0B\u5E8F\n        \u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u5165\u53E3\u70B9\n    -0  \u4EC5\u5B58\u50A8\uFF1B\u4E0D\u4F7F\u7528\u4EFB\u4F55 ZIP \u538B\u7F29\n    -P  \u4FDD\u7559\u6587\u4EF6\u540D\u4E2D\u7684\u524D\u5BFC '/'\uFF08\u7EDD\u5BF9\u8DEF\u5F84\uFF09\u548C ".."\uFF08\u7236\u76EE\u5F55\uFF09\u7EC4\u6210\u90E8\u5206\n    -M  \u4E0D\u521B\u5EFA\u6761\u76EE\u7684\u6E05\u5355\u6587\u4EF6\n    -i  \u4E3A\u6307\u5B9A\u7684 jar \u6587\u4EF6\u751F\u6210\u7D22\u5F15\u4FE1\u606F\n    -C  \u66F4\u6539\u4E3A\u6307\u5B9A\u7684\u76EE\u5F55\u5E76\u5305\u542B\u4EE5\u4E0B\u6587\u4EF6\n\u5982\u679C\u4EFB\u4F55\u6587\u4EF6\u4E3A\u76EE\u5F55\uFF0C\u5219\u5BF9\u5176\u8FDB\u884C\u9012\u5F52\u5904\u7406\u3002\n\u6E05\u5355\u6587\u4EF6\u540D\u3001\u6863\u6848\u6587\u4EF6\u540D\u548C\u5165\u53E3\u70B9\u540D\u79F0\u7684\u6307\u5B9A\u987A\u5E8F\n\u4E0E 'm', 'f' \u548C 'e' \u6807\u8BB0\u7684\u6307\u5B9A\u987A\u5E8F\u76F8\u540C\u3002\n\n\u793A\u4F8B 1\uFF1A\u5C06\u4E24\u4E2A\u7C7B\u6587\u4EF6\u5F52\u6863\u5230\u4E00\u4E2A\u540D\u4E3A classes.jar \u7684\u6863\u6848\u4E2D\uFF1A\n       jar cvf classes.jar Foo.class Bar.class \n\u793A\u4F8B 2\uFF1A\u4F7F\u7528\u73B0\u6709\u7684\u6E05\u5355\u6587\u4EF6 'mymanifest' \u5E76\n           \u5C06 foo/ \u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u5F52\u6863\u5230 'classes.jar' \u4E2D\uFF1A\n       jar cvfm classes.jar mymanifest -C foo/\u3002\n
+usage.compat=兼容性接口：\n用法：jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...\n选项：\n    -c  创建新档案（包括缺少的父目录）\n    -t  列出档案目录\n    -x  从档案中提取指定的（或所有）文件\n    -u  更新现有档案\n    -v  在标准输出中生成详细输出\n    -f  指定档案文件名\n    -m  包含指定清单文件中的清单信息\n    -e  为捆绑到可执行 jar 文件的独立应用程序\n        指定应用程序入口点\n    -0  仅存储；不使用任何 ZIP 压缩\n    -P  保留文件名中的前导 '/'（绝对路径）和 ".."（父目录）组成部分\n    -M  不创建条目的清单文件\n    -i  为指定的 jar 文件生成索引信息\n    -C  更改为指定的目录并包含以下文件\n如果任何文件为目录，则对其进行递归处理。\n清单文件名、档案文件名和入口点名称的指定顺序\n与 'm', 'f' 和 'e' 标记的指定顺序相同。\n\n示例 1：将两个类文件归档到一个名为 classes.jar 的档案中：\n       jar cvf classes.jar Foo.class Bar.class \n示例 2：使用现有的清单文件 'mymanifest' 并\n           将 foo/ 目录中的所有文件归档到 'classes.jar' 中：\n       jar cvfm classes.jar mymanifest -C foo/。\n
 
-main.usage.summary=\u7528\u6CD5: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...
-main.usage.summary.try=\u5C1D\u8BD5\u4F7F\u7528 `jar --help' \u83B7\u53D6\u8BE6\u7EC6\u4FE1\u606F\u3002
+main.usage.summary=用法: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...
+main.usage.summary.try=尝试使用 `jar --help' 获取详细信息。
 
-main.help.preopt=\u7528\u6CD5: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar \u521B\u5EFA\u7C7B\u548C\u8D44\u6E90\u7684\u6863\u6848, \u5E76\u4E14\u53EF\u4EE5\u5904\u7406\u6863\u6848\u4E2D\u7684\n\u5355\u4E2A\u7C7B\u6216\u8D44\u6E90\u6216\u8005\u4ECE\u6863\u6848\u4E2D\u8FD8\u539F\u5355\u4E2A\u7C7B\u6216\u8D44\u6E90\u3002\n\n \u793A\u4F8B:\n # \u521B\u5EFA\u5305\u542B\u4E24\u4E2A\u7C7B\u6587\u4EF6\u7684\u540D\u4E3A classes.jar \u7684\u6863\u6848:\n jar --create --file classes.jar Foo.class Bar.class\n # \u4F7F\u7528\u73B0\u6709\u7684\u6E05\u5355\u521B\u5EFA\u6863\u6848, \u5176\u4E2D\u5305\u542B foo/ \u4E2D\u7684\u6240\u6709\u6587\u4EF6:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # \u521B\u5EFA\u6A21\u5757\u5316 jar \u6863\u6848, \u5176\u4E2D\u6A21\u5757\u63CF\u8FF0\u7B26\u4F4D\u4E8E\n # classes/module-info.class:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # \u5C06\u73B0\u6709\u7684\u975E\u6A21\u5757\u5316 jar \u66F4\u65B0\u4E3A\u6A21\u5757\u5316 jar:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # \u521B\u5EFA\u5305\u542B\u591A\u4E2A\u53D1\u884C\u7248\u7684 jar, \u5E76\u5C06\u4E00\u4E9B\u6587\u4EF6\u653E\u5728 META-INF/versions/9 \u76EE\u5F55\u4E2D:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\n\u8981\u7F29\u77ED\u6216\u7B80\u5316 jar \u547D\u4EE4, \u53EF\u4EE5\u5728\u5355\u72EC\u7684\u6587\u672C\u6587\u4EF6\u4E2D\u6307\u5B9A\u53C2\u6570,\n\u5E76\u4F7F\u7528 @ \u7B26\u53F7\u4F5C\u4E3A\u524D\u7F00\u5C06\u6B64\u6587\u4EF6\u4F20\u9012\u7ED9 jar \u547D\u4EE4\u3002\n\n \u793A\u4F8B:\n # \u4ECE\u6587\u4EF6 classes.list \u8BFB\u53D6\u9644\u52A0\u9009\u9879\u548C\u7C7B\u6587\u4EF6\u5217\u8868\n jar --create --file my.jar @classes.list\n
-main.help.opt.main=\ \u4E3B\u64CD\u4F5C\u6A21\u5F0F:\n
-main.help.opt.main.create=\  -c, --create               \u521B\u5EFA\u6863\u6848\u3002\u901A\u8FC7 -f \u6216 --file \u6307\u5B9A\u7684\u6863\u6848\u6587\u4EF6\u540D\n                             \u5305\u542B\u8DEF\u5F84\u65F6\uFF0C\u8FD8\u5C06\u521B\u5EFA\n                             \u7F3A\u5C11\u7684\u7236\u76EE\u5F55
-main.help.opt.main.generate-index=\  -i, --generate-index=FILE  \u751F\u6210\u6307\u5B9A jar \u6863\u6848\u7684\u7D22\u5F15\u4FE1\u606F\u3002\n                             \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\n                             \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
-main.help.opt.main.list=\  -t, --list                 \u5217\u51FA\u6863\u6848\u7684\u76EE\u5F55
-main.help.opt.main.update=\  -u, --update               \u66F4\u65B0\u73B0\u6709 jar \u6863\u6848
-main.help.opt.main.extract=\  -x, --extract              \u4ECE\u6863\u6848\u4E2D\u63D0\u53D6\u6307\u5B9A\u7684 (\u6216\u5168\u90E8) \u6587\u4EF6
-main.help.opt.main.describe-module=\  -d, --describe-module      \u8F93\u51FA\u6A21\u5757\u63CF\u8FF0\u7B26\u6216\u81EA\u52A8\u6A21\u5757\u540D\u79F0
-main.help.opt.main.validate=\      --validate             \u9A8C\u8BC1 jar \u6863\u6848\u7684\u5185\u5BB9\u3002\u6B64\u9009\u9879\n                             \u5C06\u9A8C\u8BC1\u7531\u591A\u53D1\u884C\u7248 jar \u6863\u6848\u5BFC\u51FA\n                             \u7684 API \u5728\u6240\u6709\u4E0D\u540C\u7684\u53D1\u884C\u7248\u672C\u4E2D\n                             \u662F\u5426\u4E00\u81F4\u3002
-main.help.opt.any=\ \u5728\u4EFB\u610F\u6A21\u5F0F\u4E0B\u6709\u6548\u7684\u64CD\u4F5C\u4FEE\u9970\u7B26:\n\n  -C DIR                     \u66F4\u6539\u4E3A\u6307\u5B9A\u7684\u76EE\u5F55\u5E76\u5305\u542B\n                             \u4EE5\u4E0B\u6587\u4EF6
-main.help.opt.any.file=\  -f, --file=FILE            \u6863\u6848\u6587\u4EF6\u540D\u3002\u7701\u7565\u65F6, \u57FA\u4E8E\u64CD\u4F5C\n                             \u4F7F\u7528 stdin \u6216 stdout\n      --release VERSION      \u5C06\u4E0B\u9762\u7684\u6240\u6709\u6587\u4EF6\u90FD\u653E\u5728\n                             jar \u7684\u7248\u672C\u5316\u76EE\u5F55\u4E2D (\u5373 META-INF/versions/VERSION/)
-main.help.opt.any.verbose=\  -v, --verbose              \u5728\u6807\u51C6\u8F93\u51FA\u4E2D\u751F\u6210\u8BE6\u7EC6\u8F93\u51FA
-main.help.opt.create=\ \u4EC5\u5728\u521B\u5EFA\u6A21\u5F0F\u4E0B\u6709\u6548\u7684\u64CD\u4F5C\u4FEE\u9970\u7B26:\n
-main.help.opt.create.normalize=\  -n, --normalize            \u521B\u5EFA\u540E\u5728\u65B0\u7684 jar \u6863\u6848\u4E2D\n                             \u89C4\u8303\u5316\u4FE1\u606F\u3002\u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\n                             \u8BA1\u5212\u5728\u672A\u6765\u7684 JDK \u53D1\u884C\u7248\u4E2D\u5220\u9664
-main.help.opt.create.update=\ \u5728\u521B\u5EFA\u548C\u66F4\u65B0\u6A21\u5F0F\u4E0B\u6709\u6548\u7684\u64CD\u4F5C\u4FEE\u9970\u7B26:\n
-main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME \u6346\u7ED1\u5230\u6A21\u5757\u5316\u6216\u53EF\u6267\u884C \n                             jar \u6863\u6848\u7684\u72EC\u7ACB\u5E94\u7528\u7A0B\u5E8F\n                             \u7684\u5E94\u7528\u7A0B\u5E8F\u5165\u53E3\u70B9
-main.help.opt.create.update.manifest=\  -m, --manifest=FILE        \u5305\u542B\u6307\u5B9A\u6E05\u5355\u6587\u4EF6\u4E2D\u7684\n                             \u6E05\u5355\u4FE1\u606F
-main.help.opt.create.update.no-manifest=\  -M, --no-manifest          \u4E0D\u4E3A\u6761\u76EE\u521B\u5EFA\u6E05\u5355\u6587\u4EF6
-main.help.opt.create.update.module-version=\      --module-version=VERSION    \u521B\u5EFA\u6A21\u5757\u5316 jar \u6216\u66F4\u65B0\n                             \u975E\u6A21\u5757\u5316 jar \u65F6\u7684\u6A21\u5757\u7248\u672C
-main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN \u8BA1\u7B97\u548C\u8BB0\u5F55\u6A21\u5757\u7684\u6563\u5217, \n                             \u8FD9\u4E9B\u6A21\u5757\u6309\u6307\u5B9A\u6A21\u5F0F\u5339\u914D\u5E76\u76F4\u63A5\u6216\n                             \u95F4\u63A5\u4F9D\u8D56\u4E8E\u6240\u521B\u5EFA\u7684\u6A21\u5757\u5316 jar \u6216\n                             \u6240\u66F4\u65B0\u7684\u975E\u6A21\u5757\u5316 jar
-main.help.opt.create.update.module-path=\  -p, --module-path          \u6A21\u5757\u88AB\u4F9D\u8D56\u5BF9\u8C61\u7684\u4F4D\u7F6E, \u7528\u4E8E\u751F\u6210\n                             \u6563\u5217
-main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  \u4ECE\u9ED8\u8BA4\u6839\u6A21\u5757\u96C6\u4E2D\u6392\u9664
-main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     \u63D0\u793A\u5DE5\u5177\u5728\u89E3\u6790\u6A21\u5757\u540E\u53D1\u51FA\u8B66\u544A\u3002\n                             \u53EF\u4EE5\u4E3A deprecated, deprecated-for-removal\n                             \u6216 incubating \u4E4B\u4E00
-main.help.opt.create.update.index=\ \u53EA\u5728\u521B\u5EFA, \u66F4\u65B0\u548C\u751F\u6210\u7D22\u5F15\u6A21\u5F0F\u4E0B\u6709\u6548\u7684\u64CD\u4F5C\u4FEE\u9970\u7B26:\n
-main.help.opt.create.update.index.no-compress=\  -0, --no-compress          \u4EC5\u5B58\u50A8; \u4E0D\u4F7F\u7528 ZIP \u538B\u7F29
-main.help.opt.create.update.index.date=\      --date=TIMESTAMP       \u5177\u6709\u53EF\u9009\u65F6\u533A\u7684 ISO-8601 \u6269\u5C55\u504F\u79FB\n                             \u65E5\u671F\u65F6\u95F4\u683C\u5F0F\u7684\u65F6\u95F4\u6233\uFF08\u7528\u4E8E\u6761\u76EE\u7684\u65F6\u95F4\u6233\uFF09\uFF0C\n                             \u4F8B\u5982\uFF0C"2022-02-12T12:30:00-05:00"
-main.help.opt.other=\ \u5176\u4ED6\u9009\u9879:\n
-main.help.opt.other.help=\  -?, -h, --help[:compat]    \u63D0\u4F9B\u6B64\u5E2E\u52A9\uFF0C\u4E5F\u53EF\u4EE5\u9009\u62E9\u6027\u5730\u63D0\u4F9B\u517C\u5BB9\u6027\u5E2E\u52A9
-main.help.opt.other.help-extra=\      --help-extra           \u63D0\u4F9B\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9
-main.help.opt.other.version=\      --version              \u8F93\u51FA\u7A0B\u5E8F\u7248\u672C
-main.help.postopt=\ \u5982\u679C\u6A21\u5757\u63CF\u8FF0\u7B26 'module-info.class' \u4F4D\u4E8E\u6307\u5B9A\u76EE\u5F55\u7684\n \u6839\u76EE\u5F55\u4E2D, \u6216\u8005\u4F4D\u4E8E jar \u6863\u6848\u672C\u8EAB\u7684\u6839\u76EE\u5F55\u4E2D, \u5219\n \u8BE5\u6863\u6848\u662F\u4E00\u4E2A\u6A21\u5757\u5316 jar\u3002\u4EE5\u4E0B\u64CD\u4F5C\u53EA\u5728\u521B\u5EFA\u6A21\u5757\u5316 jar,\n \u6216\u66F4\u65B0\u73B0\u6709\u7684\u975E\u6A21\u5757\u5316 jar \u65F6\u6709\u6548: '--module-version',\n '--hash-modules' \u548C '--module-path'\u3002\n\n \u5982\u679C\u4E3A\u957F\u9009\u9879\u63D0\u4F9B\u4E86\u5FC5\u9700\u53C2\u6570\u6216\u53EF\u9009\u53C2\u6570, \u5219\u5B83\u4EEC\u5BF9\u4E8E\n \u4EFB\u4F55\u5BF9\u5E94\u7684\u77ED\u9009\u9879\u4E5F\u662F\u5FC5\u9700\u6216\u53EF\u9009\u7684\u3002
+main.help.preopt=用法: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar 创建类和资源的档案, 并且可以处理档案中的\n单个类或资源或者从档案中还原单个类或资源。\n\n 示例:\n # 创建包含两个类文件的名为 classes.jar 的档案:\n jar --create --file classes.jar Foo.class Bar.class\n # 使用现有的清单创建档案, 其中包含 foo/ 中的所有文件:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # 创建模块化 jar 档案, 其中模块描述符位于\n # classes/module-info.class:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # 将现有的非模块化 jar 更新为模块化 jar:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # 创建包含多个发行版的 jar, 并将一些文件放在 META-INF/versions/9 目录中:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\n要缩短或简化 jar 命令, 可以在单独的文本文件中指定参数,\n并使用 @ 符号作为前缀将此文件传递给 jar 命令。\n\n 示例:\n # 从文件 classes.list 读取附加选项和类文件列表\n jar --create --file my.jar @classes.list\n
+main.help.opt.main=\ 主操作模式:\n
+main.help.opt.main.create=\  -c, --create               创建档案。通过 -f 或 --file 指定的档案文件名\n                             包含路径时，还将创建\n                             缺少的父目录
+main.help.opt.main.generate-index=\  -i, --generate-index=FILE  生成指定 jar 档案的索引信息。\n                             此选项已过时，\n                             可能会在未来发行版中删除。
+main.help.opt.main.list=\  -t, --list                 列出档案的目录
+main.help.opt.main.update=\  -u, --update               更新现有 jar 档案
+main.help.opt.main.extract=\  -x, --extract              从档案中提取指定的 (或全部) 文件
+main.help.opt.main.describe-module=\  -d, --describe-module      输出模块描述符或自动模块名称
+main.help.opt.main.validate=\      --validate             验证 jar 档案的内容。此选项\n                             将验证由多发行版 jar 档案导出\n                             的 API 在所有不同的发行版本中\n                             是否一致。
+main.help.opt.any=\ 在任意模式下有效的操作修饰符:\n\n  -C DIR                     更改为指定的目录并包含\n                             以下文件
+main.help.opt.any.file=\  -f, --file=FILE            档案文件名。省略时, 基于操作\n                             使用 stdin 或 stdout\n      --release VERSION      将下面的所有文件都放在\n                             jar 的版本化目录中 (即 META-INF/versions/VERSION/)
+main.help.opt.any.verbose=\  -v, --verbose              在标准输出中生成详细输出
+main.help.opt.create=\ 仅在创建模式下有效的操作修饰符:\n
+main.help.opt.create.normalize=\  -n, --normalize            创建后在新的 jar 档案中\n                             规范化信息。此选项已过时，\n                             计划在未来的 JDK 发行版中删除
+main.help.opt.create.update=\ 在创建和更新模式下有效的操作修饰符:\n
+main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME 捆绑到模块化或可执行 \n                             jar 档案的独立应用程序\n                             的应用程序入口点
+main.help.opt.create.update.manifest=\  -m, --manifest=FILE        包含指定清单文件中的\n                             清单信息
+main.help.opt.create.update.no-manifest=\  -M, --no-manifest          不为条目创建清单文件
+main.help.opt.create.update.module-version=\      --module-version=VERSION    创建模块化 jar 或更新\n                             非模块化 jar 时的模块版本
+main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN 计算和记录模块的散列, \n                             这些模块按指定模式匹配并直接或\n                             间接依赖于所创建的模块化 jar 或\n                             所更新的非模块化 jar
+main.help.opt.create.update.module-path=\  -p, --module-path          模块被依赖对象的位置, 用于生成\n                             散列
+main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  从默认根模块集中排除
+main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     提示工具在解析模块后发出警告。\n                             可以为 deprecated, deprecated-for-removal\n                             或 incubating 之一
+main.help.opt.create.update.index=\ 只在创建, 更新和生成索引模式下有效的操作修饰符:\n
+main.help.opt.create.update.index.no-compress=\  -0, --no-compress          仅存储; 不使用 ZIP 压缩
+main.help.opt.create.update.index.date=\      --date=TIMESTAMP       具有可选时区的 ISO-8601 扩展偏移\n                             日期时间格式的时间戳（用于条目的时间戳），\n                             例如，"2022-02-12T12:30:00-05:00"
+main.help.opt.other=\ 其他选项:\n
+main.help.opt.other.help=\  -?, -h, --help[:compat]    提供此帮助，也可以选择性地提供兼容性帮助
+main.help.opt.other.help-extra=\      --help-extra           提供额外选项的帮助
+main.help.opt.other.version=\      --version              输出程序版本
+main.help.postopt=\ 如果模块描述符 'module-info.class' 位于指定目录的\n 根目录中, 或者位于 jar 档案本身的根目录中, 则\n 该档案是一个模块化 jar。以下操作只在创建模块化 jar,\n 或更新现有的非模块化 jar 时有效: '--module-version',\n '--hash-modules' 和 '--module-path'。\n\n 如果为长选项提供了必需参数或可选参数, 则它们对于\n 任何对应的短选项也是必需或可选的。
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
index cf399c8c28a..d1251510bda 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
@@ -23,103 +23,103 @@
 # questions.
 #
 
-error.multiple.main.operations=\u60A8\u4E0D\u80FD\u6307\u5B9A\u591A\u500B '-cuxtid' \u9078\u9805
-error.cant.open=\u7121\u6CD5\u958B\u555F: {0}
-error.illegal.option=\u7121\u6548\u7684\u9078\u9805: {0}
-error.unrecognized.option=\u7121\u6CD5\u8FA8\u8B58\u7684\u9078\u9805 : {0}
-error.missing.arg=\u9078\u9805 {0} \u9700\u8981\u4E00\u500B\u5F15\u6578
-error.bad.file.arg=\u5256\u6790\u6A94\u6848\u5F15\u6578\u6642\u767C\u751F\u932F\u8AA4
-error.bad.option=\u5FC5\u9808\u6307\u5B9A -{ctxuid} \u7684\u5176\u4E2D\u4E00\u500B\u9078\u9805\u3002
-error.bad.cflag='c' \u65D7\u6A19\u8981\u6C42\u6307\u5B9A\u8CC7\u8A0A\u6E05\u55AE\u6216\u8F38\u5165\u6A94\u6848\uFF01
-error.bad.uflag='u' \u65D7\u6A19\u8981\u6C42\u6307\u5B9A\u8CC7\u8A0A\u6E05\u55AE\u3001'e' \u65D7\u6A19\u6216\u8F38\u5165\u6A94\u6848\uFF01
-error.bad.eflag=\u7121\u6CD5\u540C\u6642\u6307\u5B9A 'e' \u65D7\u6A19\u548C\u5177\u6709 'Main-Class' \u5C6C\u6027\u7684\n\u8CC7\u8A0A\u6E05\u55AE\uFF01
-error.bad.dflag='-d, --describe-module' \u9078\u9805\u4E0D\u9700\u8981\u6307\u5B9A\u8F38\u5165\u6A94
-error.bad.reason=\u932F\u8AA4\u539F\u56E0: {0}\uFF0C\u5FC5\u9808\u662F deprecated\u3001deprecated-for-removal \u6216 incubating \u5176\u4E2D\u4E4B\u4E00
-error.nosuch.fileordir={0} : \u6C92\u6709\u9019\u985E\u6A94\u6848\u6216\u76EE\u9304
-error.write.file=\u5BEB\u5165\u73FE\u6709\u7684 jar \u6A94\u6848\u6642\u767C\u751F\u932F\u8AA4
-error.create.dir={0} : \u7121\u6CD5\u5EFA\u7ACB\u76EE\u9304
-error.incorrect.length=\u8655\u7406 {0} \u6642\u9577\u5EA6\u4E0D\u6B63\u78BA
-error.create.tempfile=\u7121\u6CD5\u5EFA\u7ACB\u66AB\u5B58\u6A94\u6848
-error.hash.dep=\u96DC\u6E4A\u6A21\u7D44 {0} \u76F8\u4F9D\u6027\uFF0C\u5728\u6A21\u7D44\u8DEF\u5F91\u4E0A\u627E\u4E0D\u5230\u6A21\u7D44 {1}
-error.module.options.without.info=--module-version \u6216 --hash-modules \u5176\u4E2D\u4E00\u500B\u6C92\u6709 module-info.class
-error.no.operative.descriptor=\u6C92\u6709\u4EE5\u4E0B\u7248\u672C\u7684\u64CD\u4F5C\u63CF\u8FF0\u5340: {0}
-error.no.root.descriptor=\u6C92\u6709\u6839\u6A21\u7D44\u63CF\u8FF0\u5340\uFF0C\u8ACB\u6307\u5B9A --release
-error.unable.derive.automodule=\u7121\u6CD5\u884D\u751F {0} \u7684\u6A21\u7D44\u63CF\u8FF0\u5340
-error.unexpected.module-info=\u672A\u9810\u671F\u7684\u6A21\u7D44\u63CF\u8FF0\u5340 {0}
-error.module.descriptor.not.found=\u627E\u4E0D\u5230\u6A21\u7D44\u63CF\u8FF0\u5340
-error.invalid.versioned.module.attribute=\u6A21\u7D44\u63CF\u8FF0\u5340\u5C6C\u6027 {0} \u7121\u6548
-error.missing.provider=\u627E\u4E0D\u5230\u670D\u52D9\u63D0\u4F9B\u8005: {0}
-error.release.value.notnumber=\u7248\u672C {0} \u7121\u6548
-error.release.value.toosmall=\u7248\u672C {0} \u7121\u6548\uFF0C\u5FC5\u9808\u5927\u65BC\u7B49\u65BC 9
-error.release.unexpected.versioned.entry=\u7248\u672C {1} \u6709\u672A\u9810\u671F\u7684\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u9805\u76EE {0}
-error.validator.jarfile.exception=\u7121\u6CD5\u9A57\u8B49 {0}: {1}
-error.validator.jarfile.invalid=\u5DF2\u522A\u9664\u7121\u6548\u7684\u591A\u91CD\u7248\u672C jar \u6A94\u6848 {0}
-error.validator.bad.entry.name=\u9805\u76EE\u540D\u7A31 {0} \u7684\u683C\u5F0F\u932F\u8AA4
-error.validator.version.notnumber=\u9805\u76EE\u540D\u7A31 {0} \u6C92\u6709\u7248\u672C\u7DE8\u865F
-error.validator.entryname.tooshort=\u9805\u76EE\u540D\u7A31 {0} \u592A\u77ED\uFF0C\u7121\u6CD5\u4F5C\u70BA\u76EE\u9304
-error.validator.isolated.nested.class=\u9805\u76EE {0} \u662F\u5DF2\u9694\u96E2\u7684\u5DE2\u72C0\u7D50\u69CB\u985E\u5225
-error.validator.new.public.class=\u9805\u76EE {0} \u542B\u6709\u5728\u57FA\u6E96\u9805\u76EE\u4E2D\u627E\u4E0D\u5230\u7684\u65B0\u516C\u7528\u985E\u5225
-error.validator.incompatible.class.version=\u9805\u76EE {0} \u7684\u985E\u5225\u7248\u672C\u8207\u8F03\u820A\u7248\u672C\u4E0D\u76F8\u5BB9
-error.validator.different.api=\u9805\u76EE {0} \u7684\u67D0\u500B\u985E\u5225\u542B\u6709\u8207\u8F03\u820A\u7248\u672C\u4E0D\u540C\u7684 API
-error.validator.names.mismatch=\u9805\u76EE {0} \u542B\u6709\u5167\u90E8\u540D\u7A31\u70BA {1} \u7684\u985E\u5225\uFF0C\u540D\u7A31\u4E0D\u76F8\u7B26
-error.validator.info.name.notequal=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u6B63\u78BA\u7684\u540D\u7A31
-error.validator.info.requires.transitive=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u984D\u5916\u7684 "requires transitive"
-error.validator.info.requires.added=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u984D\u5916\u7684 "requires"
-error.validator.info.requires.dropped=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u907A\u6F0F\u7684 "requires"
-error.validator.info.exports.notequal=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "exports"
-error.validator.info.opens.notequal=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "opens"
-error.validator.info.provides.notequal=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "provides"
-error.validator.info.version.notequal={0}: \u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "version"
-error.validator.info.manclass.notequal={0}: \u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "main-class"
-warn.validator.identical.entry=\u8B66\u544A: \u9805\u76EE {0} \u7684\u67D0\u500B\u985E\u5225\n\u8207 jar \u4E2D\u7684\u73FE\u6709\u9805\u76EE\u76F8\u540C
-warn.validator.resources.with.same.name=\u8B66\u544A: \u9805\u76EE {0} \u4E2D\u7684\u591A\u500B\u8CC7\u6E90\u540D\u7A31\u76F8\u540C
-warn.validator.concealed.public.class=\u8B66\u544A: \u9805\u76EE {0} \u662F\u96B1\u85CF\u5957\u88DD\u7A0B\u5F0F\u4E2D\u7684\n\u516C\u7528\u985E\u5225\uFF0C\u82E5\u5C07\u6B64 jar \u653E\u5728\u985E\u5225\u8DEF\u5F91\u4E0A\n\u6703\u9020\u6210\u516C\u7528\u4ECB\u9762\u4E0D\u76F8\u5BB9
-warn.release.unexpected.versioned.entry=\u672A\u9810\u671F\u7684\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u9805\u76EE {0}
-out.added.manifest=\u5DF2\u65B0\u589E\u8CC7\u8A0A\u6E05\u55AE
-out.added.module-info=\u5DF2\u65B0\u589E module-info: {0}
-out.automodule=\u627E\u4E0D\u5230\u6A21\u7D44\u63CF\u8FF0\u5340\u3002\u5DF2\u81EA\u52D5\u884D\u751F\u6A21\u7D44\u3002
-out.update.manifest=\u5DF2\u66F4\u65B0\u8CC7\u8A0A\u6E05\u55AE
-out.update.module-info=\u5DF2\u66F4\u65B0 module-info: {0}
-out.ignore.entry=\u5FFD\u7565\u9805\u76EE {0}
-out.adding=\u65B0\u589E: {0}
-out.deflated=(\u58D3\u7E2E {0}%)
-out.stored=(\u5132\u5B58 0%)
-out.create=\  \u5EFA\u7ACB: {0}
-out.extracted=\u64F7\u53D6: {0}
-out.inflated=\ \u64F4\u5C55: {0}
-out.size=\ (\u8B80={0})(\u5BEB={1})
+error.multiple.main.operations=您不能指定多個 '-cuxtid' 選項
+error.cant.open=無法開啟: {0}
+error.illegal.option=無效的選項: {0}
+error.unrecognized.option=無法辨識的選項 : {0}
+error.missing.arg=選項 {0} 需要一個引數
+error.bad.file.arg=剖析檔案引數時發生錯誤
+error.bad.option=必須指定 -{ctxuid} 的其中一個選項。
+error.bad.cflag='c' 旗標要求指定資訊清單或輸入檔案！
+error.bad.uflag='u' 旗標要求指定資訊清單、'e' 旗標或輸入檔案！
+error.bad.eflag=無法同時指定 'e' 旗標和具有 'Main-Class' 屬性的\n資訊清單！
+error.bad.dflag='-d, --describe-module' 選項不需要指定輸入檔
+error.bad.reason=錯誤原因: {0}，必須是 deprecated、deprecated-for-removal 或 incubating 其中之一
+error.nosuch.fileordir={0} : 沒有這類檔案或目錄
+error.write.file=寫入現有的 jar 檔案時發生錯誤
+error.create.dir={0} : 無法建立目錄
+error.incorrect.length=處理 {0} 時長度不正確
+error.create.tempfile=無法建立暫存檔案
+error.hash.dep=雜湊模組 {0} 相依性，在模組路徑上找不到模組 {1}
+error.module.options.without.info=--module-version 或 --hash-modules 其中一個沒有 module-info.class
+error.no.operative.descriptor=沒有以下版本的操作描述區: {0}
+error.no.root.descriptor=沒有根模組描述區，請指定 --release
+error.unable.derive.automodule=無法衍生 {0} 的模組描述區
+error.unexpected.module-info=未預期的模組描述區 {0}
+error.module.descriptor.not.found=找不到模組描述區
+error.invalid.versioned.module.attribute=模組描述區屬性 {0} 無效
+error.missing.provider=找不到服務提供者: {0}
+error.release.value.notnumber=版本 {0} 無效
+error.release.value.toosmall=版本 {0} 無效，必須大於等於 9
+error.release.unexpected.versioned.entry=版本 {1} 有未預期的啟動多版本功能項目 {0}
+error.validator.jarfile.exception=無法驗證 {0}: {1}
+error.validator.jarfile.invalid=已刪除無效的多重版本 jar 檔案 {0}
+error.validator.bad.entry.name=項目名稱 {0} 的格式錯誤
+error.validator.version.notnumber=項目名稱 {0} 沒有版本編號
+error.validator.entryname.tooshort=項目名稱 {0} 太短，無法作為目錄
+error.validator.isolated.nested.class=項目 {0} 是已隔離的巢狀結構類別
+error.validator.new.public.class=項目 {0} 含有在基準項目中找不到的新公用類別
+error.validator.incompatible.class.version=項目 {0} 的類別版本與較舊版本不相容
+error.validator.different.api=項目 {0} 的某個類別含有與較舊版本不同的 API
+error.validator.names.mismatch=項目 {0} 含有內部名稱為 {1} 的類別，名稱不相符
+error.validator.info.name.notequal=已啟動多版本功能目錄中的 module-info.class 包含不正確的名稱
+error.validator.info.requires.transitive=已啟動多版本功能目錄中的 module-info.class 包含額外的 "requires transitive"
+error.validator.info.requires.added=已啟動多版本功能目錄中的 module-info.class 包含額外的 "requires"
+error.validator.info.requires.dropped=已啟動多版本功能目錄中的 module-info.class 包含遺漏的 "requires"
+error.validator.info.exports.notequal=已啟動多版本功能目錄中的 module-info.class 包含不同的 "exports"
+error.validator.info.opens.notequal=已啟動多版本功能目錄中的 module-info.class 包含不同的 "opens"
+error.validator.info.provides.notequal=已啟動多版本功能目錄中的 module-info.class 包含不同的 "provides"
+error.validator.info.version.notequal={0}: 已啟動多版本功能目錄中的 module-info.class 包含不同的 "version"
+error.validator.info.manclass.notequal={0}: 已啟動多版本功能目錄中的 module-info.class 包含不同的 "main-class"
+warn.validator.identical.entry=警告: 項目 {0} 的某個類別\n與 jar 中的現有項目相同
+warn.validator.resources.with.same.name=警告: 項目 {0} 中的多個資源名稱相同
+warn.validator.concealed.public.class=警告: 項目 {0} 是隱藏套裝程式中的\n公用類別，若將此 jar 放在類別路徑上\n會造成公用介面不相容
+warn.release.unexpected.versioned.entry=未預期的啟動多版本功能項目 {0}
+out.added.manifest=已新增資訊清單
+out.added.module-info=已新增 module-info: {0}
+out.automodule=找不到模組描述區。已自動衍生模組。
+out.update.manifest=已更新資訊清單
+out.update.module-info=已更新 module-info: {0}
+out.ignore.entry=忽略項目 {0}
+out.adding=新增: {0}
+out.deflated=(壓縮 {0}%)
+out.stored=(儲存 0%)
+out.create=\  建立: {0}
+out.extracted=擷取: {0}
+out.inflated=\ 擴展: {0}
+out.size=\ (讀={0})(寫={1})
 
-usage.compat=\u76F8\u5BB9\u6027\u4ECB\u9762:\n\u7528\u6CD5: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...\n\u9078\u9805:\n    -c  \u5EFA\u7ACB\u65B0\u5B58\u6A94\n    -t  \u5217\u51FA\u5B58\u6A94\u7684\u76EE\u9304\n    -x  \u5F9E\u5B58\u6A94\u4E2D\u64F7\u53D6\u6307\u5B9A (\u6216\u5168\u90E8) \u7684\u6A94\u6848\n    -u  \u66F4\u65B0\u73FE\u6709\u5B58\u6A94\n    -v  \u5728\u6A19\u6E96\u8F38\u51FA\u4E2D\u7522\u751F\u8A73\u7D30\u8F38\u51FA\n    -f  \u6307\u5B9A\u5B58\u6A94\u6A94\u6848\u540D\u7A31\n    -m  \u5305\u542B\u6307\u5B9A\u4E4B\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848\u4E2D\u7684\u8CC7\u8A0A\u6E05\u55AE\u8CC7\u8A0A\n    -n  \u5728\u5EFA\u7ACB\u65B0\u5B58\u6A94\u4E4B\u5F8C\u57F7\u884C Pack200 \u6B63\u898F\u5316\n    -e  \u70BA\u96A8\u9644\u65BC\u53EF\u57F7\u884C jar \u6A94\u6848\u4E2D\u7684\u7368\u7ACB\u61C9\u7528\u7A0B\u5F0F \n        \u6307\u5B9A\u61C9\u7528\u7A0B\u5F0F\u9032\u5165\u9EDE\n    -0  \u50C5\u5132\u5B58; \u4E0D\u4F7F\u7528 ZIP \u58D3\u7E2E\u65B9\u5F0F\n    -P  \u4FDD\u7559\u6A94\u6848\u540D\u7A31\u524D\u9762\u7684 '/' (\u7D55\u5C0D\u8DEF\u5F91) \u548C ".." (\u4E0A\u5C64\u76EE\u9304) \u5143\u4EF6\n    -M  \u4E0D\u70BA\u9805\u76EE\u5EFA\u7ACB\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848\n    -i  \u70BA\u6307\u5B9A\u7684 jar \u6A94\u6848\u7522\u751F\u7D22\u5F15\u8CC7\u8A0A\n    -C  \u8B8A\u66F4\u81F3\u6307\u5B9A\u7684\u76EE\u9304\u4E26\u5305\u542B\u5F8C\u9762\u6240\u5217\u7684\u6A94\u6848\n\u5982\u679C\u6709\u4EFB\u4F55\u6A94\u6848\u662F\u76EE\u9304\uFF0C\u5247\u6703\u5C0D\u5176\u9032\u884C\u905E\u8FF4\u8655\u7406\u3002\n\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848\u540D\u7A31\u3001\u5B58\u6A94\u6A94\u6848\u540D\u7A31\u4EE5\u53CA\u9032\u5165\u9EDE\u540D\u7A31\n\u7684\u6307\u5B9A\u9806\u5E8F\u8207\u6307\u5B9A 'm'\u3001'f' \u4EE5\u53CA 'e' \u65D7\u6A19\u7684\u9806\u5E8F\u76F8\u540C\u3002\n\n\u7BC4\u4F8B 1: \u5C07\u5169\u500B\u985E\u5225\u6A94\u6848\u5B58\u6A94\u81F3\u540D\u70BA classes.jar \u7684\u5B58\u6A94\u4E2D: \n       jar cvf classes.jar Foo.class Bar.class \n\u7BC4\u4F8B 2: \u4F7F\u7528\u73FE\u6709\u7684\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848 'mymanifest' \u4E26\u5C07\n           foo/ \u76EE\u9304\u4E2D\u7684\u6240\u6709\u6A94\u6848\u5B58\u6A94\u81F3 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/\u3002\n
+usage.compat=相容性介面:\n用法: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...\n選項:\n    -c  建立新存檔\n    -t  列出存檔的目錄\n    -x  從存檔中擷取指定 (或全部) 的檔案\n    -u  更新現有存檔\n    -v  在標準輸出中產生詳細輸出\n    -f  指定存檔檔案名稱\n    -m  包含指定之資訊清單檔案中的資訊清單資訊\n    -n  在建立新存檔之後執行 Pack200 正規化\n    -e  為隨附於可執行 jar 檔案中的獨立應用程式 \n        指定應用程式進入點\n    -0  僅儲存; 不使用 ZIP 壓縮方式\n    -P  保留檔案名稱前面的 '/' (絕對路徑) 和 ".." (上層目錄) 元件\n    -M  不為項目建立資訊清單檔案\n    -i  為指定的 jar 檔案產生索引資訊\n    -C  變更至指定的目錄並包含後面所列的檔案\n如果有任何檔案是目錄，則會對其進行遞迴處理。\n資訊清單檔案名稱、存檔檔案名稱以及進入點名稱\n的指定順序與指定 'm'、'f' 以及 'e' 旗標的順序相同。\n\n範例 1: 將兩個類別檔案存檔至名為 classes.jar 的存檔中: \n       jar cvf classes.jar Foo.class Bar.class \n範例 2: 使用現有的資訊清單檔案 'mymanifest' 並將\n           foo/ 目錄中的所有檔案存檔至 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/。\n
 
-main.usage.summary=\u7528\u6CD5: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...
-main.usage.summary.try=\u8ACB\u4F7F\u7528 'jar --help' \u4EE5\u53D6\u5F97\u66F4\u591A\u7684\u8CC7\u8A0A\u3002
+main.usage.summary=用法: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...
+main.usage.summary.try=請使用 'jar --help' 以取得更多的資訊。
 
-main.help.preopt=\u7528\u6CD5: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar \u6703\u5EFA\u7ACB\u4E00\u500B\u985E\u5225\u548C\u8CC7\u6E90\u7684\u5B58\u6A94\uFF0C\u800C\u4E14\u53EF\u64CD\u63A7\u6216\n\u5F9E\u5B58\u6A94\u56DE\u5FA9\u500B\u5225\u985E\u5225\u6216\u8CC7\u6E90\u3002\n\n \u7BC4\u4F8B:\n # \u5EFA\u7ACB\u4E00\u500B\u540D\u70BA classes.jar \u7684\u5B58\u6A94\uFF0C\u5176\u4E2D\u542B\u6709\u5169\u500B\u985E\u5225\u6A94\u6848:\n jar --create --file classes.jar Foo.class Bar.class\n # \u4F7F\u7528\u73FE\u6709\u7684\u8CC7\u8A0A\u6E05\u55AE\u52A0\u4E0A foo/ \u4E2D\u7684\u6240\u6709\u6A94\u6848\u5EFA\u7ACB\u4E00\u500B\u5B58\u6A94:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # \u5EFA\u7ACB\u4E00\u500B\u6A21\u7D44\u5316 jar \u5B58\u6A94\uFF0C\u5176\u4E2D\u7684\u6A21\u7D44\u63CF\u8FF0\u5340\u4F4D\u65BC\n # classes/module-info.class:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # \u5C07\u73FE\u6709\u7684\u975E\u6A21\u7D44\u5316 jar \u66F4\u65B0\u6210\u6A21\u7D44\u5316 jar:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # \u5EFA\u7ACB\u591A\u91CD\u7248\u672C\u7684 jar\uFF0C\u5C07\u90E8\u5206\u6A94\u6848\u653E\u7F6E\u5728 META-INF/versions/9 \u76EE\u9304\u4E2D:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\n\u82E5\u8981\u7E2E\u77ED\u6216\u7C21\u5316 jar \u547D\u4EE4\uFF0C\u53EF\u4EE5\u5728\u500B\u5225\u6587\u5B57\u6A94\u4E2D\u6307\u5B9A\u5F15\u6578\uFF0C\n\u7136\u5F8C\u4F7F\u7528 at \u7B26\u865F (@) \u4F5C\u70BA\u524D\u7F6E\u78BC\uFF0C\u5C07\u5176\u50B3\u9001\u81F3 jar \u547D\u4EE4\u3002\n\n \u7BC4\u4F8B:\n # \u5F9E classes.list \u6A94\u6848\u8B80\u53D6\u984D\u5916\u7684\u9078\u9805\u548C\u985E\u5225\u6A94\u6848\u6E05\u55AE\n jar --create --file my.jar @classes.list\n
-main.help.opt.main=\ \u4E3B\u8981\u4F5C\u696D\u6A21\u5F0F:\n
-main.help.opt.main.create=\  -c, --create               \u5EFA\u7ACB\u5B58\u6A94
-main.help.opt.main.generate-index=\  -i, --generate-index=FILE  \u70BA\u6307\u5B9A\u7684 jar \u5B58\u6A94\u7522\u751F\u7D22\u5F15\n                             \u8CC7\u8A0A
-main.help.opt.main.list=\  -t, --list                 \u5217\u51FA\u5B58\u6A94\u7684\u76EE\u9304
-main.help.opt.main.update=\  -u, --update               \u66F4\u65B0\u73FE\u6709\u7684 jar \u5B58\u6A94
-main.help.opt.main.extract=\  -x, --extract              \u5F9E\u5B58\u6A94\u4E2D\u64F7\u53D6\u6307\u5B9A (\u6216\u6240\u6709) \u6A94\u6848
-main.help.opt.main.describe-module=\  -d, --describe-module      \u5217\u5370\u6A21\u7D44\u63CF\u8FF0\u5340\u6216\u81EA\u52D5\u7522\u751F\u7684\u6A21\u7D44\u540D\u7A31
-main.help.opt.any=\ \u53EF\u5728\u4EFB\u4F55\u6A21\u5F0F\u4E0B\u4F7F\u7528\u7684\u4F5C\u696D\u4FEE\u98FE\u689D\u4EF6:\n\n  -C DIR                     \u8B8A\u66F4\u70BA\u6307\u5B9A\u76EE\u9304\u4E26\u5305\u542B\n                             \u4E0B\u5217\u6A94\u6848
-main.help.opt.any.file=\  -f, --file=FILE            \u5B58\u6A94\u6A94\u6848\u540D\u7A31\u3002\u5982\u679C\u7701\u7565\uFF0C\u6703\u6839\u64DA\u4F5C\u696D\u4F7F\u7528\n                             stdin \u6216 stdout\n      --release VERSION      \u5C07\u6240\u6709\u4E0B\u5217\u6A94\u6848\u653E\u7F6E\u5728 jar \u7684\u555F\u52D5\u591A\u7248\u672C\n                             \u529F\u80FD\u76EE\u9304\u4E2D (\u4F8B\u5982 META-INF/versions/VERSION/)
-main.help.opt.any.verbose=\  -v, --verbose              \u5728\u6A19\u6E96\u8F38\u51FA\u4E2D\u7522\u751F\u8A73\u7D30\u8F38\u51FA
-main.help.opt.create=\ \u53EA\u80FD\u5728\u5EFA\u7ACB\u6A21\u5F0F\u4F7F\u7528\u7684\u4F5C\u696D\u4FEE\u98FE\u689D\u4EF6:\n
-main.help.opt.create.normalize=\  -n, --normalize            \u5EFA\u7ACB\u65B0\u7684 jar \u5B58\u6A94\u4E4B\u5F8C\uFF0C\u5C07\u5176\u4E2D\u7684\u8CC7\u8A0A\n                             \u6A19\u6E96\u5316
-main.help.opt.create.update=\ \u53EA\u80FD\u5728\u5EFA\u7ACB\u548C\u66F4\u65B0\u6A21\u5F0F\u4E0B\u4F7F\u7528\u7684\u4F5C\u696D\u4FEE\u98FE\u689D\u4EF6:\n
-main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME \u96A8\u9644\u65BC\u6A21\u7D44\u5316\u6216\u53EF\u57F7\u884C\n                             jar \u5B58\u6A94\u4E2D\u7368\u7ACB\u61C9\u7528\u7A0B\u5F0F\u7684\n                             \u61C9\u7528\u7A0B\u5F0F\u9032\u5165\u9EDE
-main.help.opt.create.update.manifest=\  -m, --manifest=FILE        \u5305\u542B\u6307\u5B9A\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848\u4E2D\u7684\u8CC7\u8A0A\u6E05\u55AE\n                             \u8CC7\u8A0A
-main.help.opt.create.update.no-manifest=\  -M, --no-manifest          \u4E0D\u70BA\u9805\u76EE\u5EFA\u7ACB\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848
-main.help.opt.create.update.module-version=\      --module-version=VERSION    \u5EFA\u7ACB\u6A21\u7D44\u5316 jar \u6216\u66F4\u65B0\u975E\u6A21\u7D44\u5316 jar \u6642\n                             \u4F7F\u7528\u7684\u6A21\u7D44\u7248\u672C
-main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN \u904B\u7B97\u53CA\u8A18\u9304\u8207\u6307\u5B9A\u6A23\u5F0F\n                             \u76F8\u7B26\u7684\u6A21\u7D44\u96DC\u6E4A\uFF0C\u9019\u76F4\u63A5\u6216\u9593\u63A5\u5730\n                             \u76F8\u4F9D\u65BC\u6B63\u5728\u5EFA\u7ACB\u7684\u6A21\u7D44\u5316 jar \u6216\u6B63\u5728\n                             \u66F4\u65B0\u7684\u975E\u6A21\u7D44\u5316 jar
-main.help.opt.create.update.module-path=\  -p, --module-path          \u6A21\u7D44\u76F8\u4F9D\u6027\u7684\u4F4D\u7F6E\uFF0C\u7528\u65BC\u7522\u751F\n                             \u96DC\u6E4A
-main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  \u4E0D\u5305\u62EC\u9810\u8A2D\u7684\u6A21\u7D44\u8A2D\u5B9A\u6839\u76EE\u9304
-main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     \u82E5\u6A21\u7D44\u5DF2\u89E3\u6790\uFF0C\u5247\u63D0\u793A\u5DE5\u5177\u4EE5\u767C\u51FA\u8B66\u544A\u3002\n                             deprecated\u3001deprecated-for-removal \u6216 incubating \n                             \u5176\u4E2D\u4E4B\u4E00
-main.help.opt.create.update.index=\ \u53EA\u80FD\u5728\u5EFA\u7ACB\u3001\u66F4\u65B0\u53CA\u7522\u751F\u7D22\u5F15\u6A21\u5F0F\u4E0B\u4F7F\u7528\u7684\u4F5C\u696D\u4FEE\u98FE\u689D\u4EF6:\n
-main.help.opt.create.update.index.no-compress=\  -0, --no-compress          \u50C5\u5132\u5B58; \u4E0D\u4F7F\u7528 ZIP \u58D3\u7E2E\u65B9\u5F0F
-main.help.opt.other=\ \u5176\u4ED6\u9078\u9805:\n
-main.help.opt.other.help=\  -h, --help[:compat]        \u63D0\u4F9B\u6B64\u8AAA\u660E\u6216\u9078\u64C7\u6027\u986F\u793A\u76F8\u5BB9\u6027\u8AAA\u660E
-main.help.opt.other.help-extra=\      --help-extra           \u63D0\u4F9B\u984D\u5916\u9078\u9805\u7684\u8AAA\u660E
-main.help.opt.other.version=\      --version              \u5217\u5370\u7A0B\u5F0F\u7248\u672C
-main.help.postopt=\ \u5982\u679C\u6A21\u7D44\u63CF\u8FF0\u5340 ('module-info.class') \u4F4D\u65BC\u6307\u5B9A\u76EE\u9304\u7684\u6839\n \u6216 jar \u5B58\u6A94\u672C\u8EAB\u7684\u6839\uFF0C\u5247\u5B58\u6A94\u6703\u662F\n \u6A21\u7D44\u5316\u7684 jar\u3002\u4E0B\u5217\u4F5C\u696D\u53EA\u80FD\u5728\u5EFA\u7ACB\u6A21\u7D44\u5316 jar \u6216\u66F4\u65B0\n \u73FE\u6709\u975E\u6A21\u7D44\u5316 jar \u6642\u9032\u884C: '--module-version'\u3001\n '--hash-modules' \u548C '--module-path'\u3002\n\n \u9577\u9078\u9805\u7684\u5F37\u5236\u6027\u6216\u9078\u64C7\u6027\u5F15\u6578\u4E5F\u6703\u662F\u4EFB\u4F55\u5C0D\u61C9\u77ED\u9078\u9805\u7684\n \u5F37\u5236\u6027\u6216\u9078\u64C7\u6027\u5F15\u6578\u3002
+main.help.preopt=用法: jar [OPTION...] [ [--release VERSION] [-C dir] files] ...\njar 會建立一個類別和資源的存檔，而且可操控或\n從存檔回復個別類別或資源。\n\n 範例:\n # 建立一個名為 classes.jar 的存檔，其中含有兩個類別檔案:\n jar --create --file classes.jar Foo.class Bar.class\n # 使用現有的資訊清單加上 foo/ 中的所有檔案建立一個存檔:\n jar --create --file classes.jar --manifest mymanifest -C foo/ .\n # 建立一個模組化 jar 存檔，其中的模組描述區位於\n # classes/module-info.class:\n jar --create --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ classes resources\n # 將現有的非模組化 jar 更新成模組化 jar:\n jar --update --file foo.jar --main-class com.foo.Main --module-version 1.0\n     -C foo/ module-info.class\n # 建立多重版本的 jar，將部分檔案放置在 META-INF/versions/9 目錄中:\n jar --create --file mr.jar -C foo classes --release 9 -C foo9 classes\n\n若要縮短或簡化 jar 命令，可以在個別文字檔中指定引數，\n然後使用 at 符號 (@) 作為前置碼，將其傳送至 jar 命令。\n\n 範例:\n # 從 classes.list 檔案讀取額外的選項和類別檔案清單\n jar --create --file my.jar @classes.list\n
+main.help.opt.main=\ 主要作業模式:\n
+main.help.opt.main.create=\  -c, --create               建立存檔
+main.help.opt.main.generate-index=\  -i, --generate-index=FILE  為指定的 jar 存檔產生索引\n                             資訊
+main.help.opt.main.list=\  -t, --list                 列出存檔的目錄
+main.help.opt.main.update=\  -u, --update               更新現有的 jar 存檔
+main.help.opt.main.extract=\  -x, --extract              從存檔中擷取指定 (或所有) 檔案
+main.help.opt.main.describe-module=\  -d, --describe-module      列印模組描述區或自動產生的模組名稱
+main.help.opt.any=\ 可在任何模式下使用的作業修飾條件:\n\n  -C DIR                     變更為指定目錄並包含\n                             下列檔案
+main.help.opt.any.file=\  -f, --file=FILE            存檔檔案名稱。如果省略，會根據作業使用\n                             stdin 或 stdout\n      --release VERSION      將所有下列檔案放置在 jar 的啟動多版本\n                             功能目錄中 (例如 META-INF/versions/VERSION/)
+main.help.opt.any.verbose=\  -v, --verbose              在標準輸出中產生詳細輸出
+main.help.opt.create=\ 只能在建立模式使用的作業修飾條件:\n
+main.help.opt.create.normalize=\  -n, --normalize            建立新的 jar 存檔之後，將其中的資訊\n                             標準化
+main.help.opt.create.update=\ 只能在建立和更新模式下使用的作業修飾條件:\n
+main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME 隨附於模組化或可執行\n                             jar 存檔中獨立應用程式的\n                             應用程式進入點
+main.help.opt.create.update.manifest=\  -m, --manifest=FILE        包含指定資訊清單檔案中的資訊清單\n                             資訊
+main.help.opt.create.update.no-manifest=\  -M, --no-manifest          不為項目建立資訊清單檔案
+main.help.opt.create.update.module-version=\      --module-version=VERSION    建立模組化 jar 或更新非模組化 jar 時\n                             使用的模組版本
+main.help.opt.create.update.hash-modules=\      --hash-modules=PATTERN 運算及記錄與指定樣式\n                             相符的模組雜湊，這直接或間接地\n                             相依於正在建立的模組化 jar 或正在\n                             更新的非模組化 jar
+main.help.opt.create.update.module-path=\  -p, --module-path          模組相依性的位置，用於產生\n                             雜湊
+main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by-default  不包括預設的模組設定根目錄
+main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     若模組已解析，則提示工具以發出警告。\n                             deprecated、deprecated-for-removal 或 incubating \n                             其中之一
+main.help.opt.create.update.index=\ 只能在建立、更新及產生索引模式下使用的作業修飾條件:\n
+main.help.opt.create.update.index.no-compress=\  -0, --no-compress          僅儲存; 不使用 ZIP 壓縮方式
+main.help.opt.other=\ 其他選項:\n
+main.help.opt.other.help=\  -h, --help[:compat]        提供此說明或選擇性顯示相容性說明
+main.help.opt.other.help-extra=\      --help-extra           提供額外選項的說明
+main.help.opt.other.version=\      --version              列印程式版本
+main.help.postopt=\ 如果模組描述區 ('module-info.class') 位於指定目錄的根\n 或 jar 存檔本身的根，則存檔會是\n 模組化的 jar。下列作業只能在建立模組化 jar 或更新\n 現有非模組化 jar 時進行: '--module-version'、\n '--hash-modules' 和 '--module-path'。\n\n 長選項的強制性或選擇性引數也會是任何對應短選項的\n 強制性或選擇性引數。
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
index 8ede9122b58..83db8ca164e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
@@ -25,13 +25,13 @@
 
 doclet.build_version=Standard-Doclet-Version {0}
 doclet.Contents=Inhalt
-doclet.Overview=\u00DCberblick
-doclet.Window_Overview_Summary=\u00DCberblick
+doclet.Overview=Überblick
+doclet.Window_Overview_Summary=Überblick
 doclet.Element=Element
 doclet.Package=Package
 doclet.Unnamed_Package=Unbenanntes Package
 doclet.Module=Modul
-doclet.Open_Module=Modul \u00F6ffnen
+doclet.Open_Module=Modul öffnen
 doclet.All_Packages=Alle Packages
 doclet.All_Modules=Alle Module
 doclet.None=Kein Wert
@@ -52,7 +52,7 @@ doclet.Href_Enum_Title=Enum in {0}
 doclet.Href_Enum_Class_Title=Enum-Klasse in {0}
 doclet.Href_Type_Param_Title=Typparameter in {0}
 doclet.Href_Class_Or_Interface_Title=Klasse oder Schnittstelle in {0}
-doclet.Summary=\u00DCbersicht:
+doclet.Summary=Übersicht:
 doclet.Detail=Details:
 doclet.Module_Sub_Nav=Modul:
 doclet.Help_Sub_Nav=Hilfe:
@@ -78,20 +78,20 @@ doclet.Index=Index
 doclet.Window_Single_Index=Index
 doclet.Window_Split_Index={0}-Index
 doclet.Help=Hilfe
-doclet.Skip_navigation_links=Navigations-Links \u00FCberspringen
+doclet.Skip_navigation_links=Navigations-Links überspringen
 doclet.Toggle_navigation_links=Navigationslinks umschalten
 doclet.Navigation=Navigation
 doclet.navDeprecated=Veraltet
 doclet.Window_Deprecated_List=Veraltete Liste
 doclet.Window_New_List=Neue API-Liste
 doclet.Window_Preview_List=Vorschauliste
-doclet.Overrides=Setzt au\u00DFer Kraft:
+doclet.Overrides=Setzt außer Kraft:
 doclet.in_class=in Klasse
 doclet.Element_in=Element in {0}
 doclet.Enum_constant_in=Enum-Konstante in {0}
 doclet.Static_variable_in=Statische Variable in {0}
 doclet.Variable_in=Variable in {0}
-doclet.Constructor_for=Konstruktor f\u00FCr {0}
+doclet.Constructor_for=Konstruktor für {0}
 doclet.Record_component_in=Komponente von {0} erfassen
 doclet.Static_method_in=Statische Methode in {0}
 doclet.Search_tag_in=Tag suchen in {0}
@@ -104,15 +104,15 @@ doclet.URL_error=Fehler beim Abrufen der URL: {0}
 doclet.Resource_error=Fehler beim Lesen der Ressource: {0}
 doclet.link.no_reference=Keine Referenz angegeben
 doclet.link.see.no_label=fehlendes Referenzlabel
-doclet.link.see.reference_invalid=Ung\u00FCltige Referenz
+doclet.link.see.reference_invalid=Ungültige Referenz
 doclet.link.see.reference_not_found=Referenz nicht gefunden: {0}
-doclet.link.see.reference_not_accessible=Referenz nicht zug\u00E4nglich: {0}
+doclet.link.see.reference_not_accessible=Referenz nicht zugänglich: {0}
 doclet.see.nested_link=Tag {0}: Verschachtelter Link
 doclet.throws.reference_not_found=Ausnahmetyp nach Name nicht gefunden
 doclet.throws.reference_bad_type=Kein Ausnahmetyp: {0}
-doclet.tag.invalid_usage=Ung\u00FCltige Verwendung des Tags {0}
-doclet.tag.invalid_input=Ung\u00FCltige Eingabe: "{0}"
-doclet.tag.invalid=ung\u00FCltiges @{0}
+doclet.tag.invalid_usage=Ungültige Verwendung des Tags {0}
+doclet.tag.invalid_input=Ungültige Eingabe: "{0}"
+doclet.tag.invalid=ungültiges @{0}
 doclet.Deprecated_API=Veraltete API
 doclet.Deprecated_API_Checkbox_Label=Veraltete API anzeigen in:
 doclet.Deprecated_API_Checkbox_Other_Releases=Sonstige
@@ -120,18 +120,18 @@ doclet.Deprecated_Elements=Veraltete {0}
 doclet.Deprecated_Elements_Release_Column_Header=Veraltet in
 doclet.Deprecated_In_Release=Veraltet in {0}
 doclet.New_API=Neue API
-doclet.New_API_Checkbox_Label=Hinzugef\u00FCgte API anzeigen in:
+doclet.New_API_Checkbox_Label=Hinzugefügte API anzeigen in:
 doclet.New_Elements=Neue {0}
-doclet.New_Elements_Release_Column_Header=Hinzugef\u00FCgt in
+doclet.New_Elements_Release_Column_Header=Hinzugefügt in
 doclet.New_Label=Neu
 doclet.Preview_API=Vorschau-API
-doclet.Preview_API_Checkbox_Label=Vorschau-API anzeigen f\u00FCr:
+doclet.Preview_API_Checkbox_Label=Vorschau-API anzeigen für:
 doclet.Preview_JEP_URL=https://openjdk.org/jeps/{0}
 doclet.Preview_Label=Vorschau
 doclet.Preview_Mark=PREVIEW
-doclet.Terminally_Deprecated=Endg\u00FCltig veraltet
-doclet.Terminally_Deprecated_Elements=Endg\u00FCltig veraltete Elemente
-doclet.Terminally_Deprecated_In_Release=Endg\u00FCltig veraltet in {0}
+doclet.Terminally_Deprecated=Endgültig veraltet
+doclet.Terminally_Deprecated_Elements=Endgültig veraltete Elemente
+doclet.Terminally_Deprecated_In_Release=Endgültig veraltet in {0}
 doclet.Annotation_Types=Annotationstypen
 doclet.Annotation_Interfaces=Annotationsschnittstellen
 doclet.Annotation_Type_Members=Annotationstypelemente
@@ -149,19 +149,19 @@ doclet.Subclasses=Bekannte direkte Unterklassen:
 doclet.Subinterfaces=Alle bekannten Unterschnittstellen:
 doclet.Implementing_Classes=Alle bekannten Implementierungsklassen:
 doclet.Functional_Interface=Funktionsschnittstelle:
-doclet.Functional_Interface_Message=Dies ist eine funktionale Schnittstelle, die somit als Zuweisungsziel f\u00FCr einen Lambdaausdruck oder eine Methodenreferenz verwendet werden kann.
+doclet.Functional_Interface_Message=Dies ist eine funktionale Schnittstelle, die somit als Zuweisungsziel für einen Lambdaausdruck oder eine Methodenreferenz verwendet werden kann.
 doclet.also=auch
 doclet.Package_Hierarchies=Packagehierarchien:
-doclet.Hierarchy_For_Package=Hierarchie f\u00FCr Package {0}
-doclet.Hierarchy_For_All_Packages=Hierarchie f\u00FCr alle Packages
-doclet.Hierarchy_For_Unnamed_Package=Hierarchie f\u00FCr unbenanntes Package
+doclet.Hierarchy_For_Package=Hierarchie für Package {0}
+doclet.Hierarchy_For_All_Packages=Hierarchie für alle Packages
+doclet.Hierarchy_For_Unnamed_Package=Hierarchie für unbenanntes Package
 doclet.No_Script_Message=JavaScript ist im Browser deaktiviert.
 doclet.Description_From_Interface=Beschreibung aus Schnittstelle kopiert:
 doclet.Description_From_Class=Beschreibung aus Klasse kopiert:
 doclet.No_Non_Deprecated_Classes_To_Document=Keine zu dokumentierenden nicht veralteten Klassen gefunden.
 doclet.Interfaces=Schnittstellen
-doclet.Enclosing_Class=Umschlie\u00DFende Klasse:
-doclet.Enclosing_Interface=Umschlie\u00DFende Schnittstelle:
+doclet.Enclosing_Class=Umschließende Klasse:
+doclet.Enclosing_Interface=Umschließende Schnittstelle:
 doclet.Inheritance_Tree=Vererbungsbaum
 doclet.ReferencedIn=Referenziert in
 doclet.Section=Abschnitt
@@ -172,7 +172,7 @@ doclet.External_Specifications.no-host=Lokal
 doclet.Specification=Spezifikation
 doclet.System_Property=Systemeigenschaft
 doclet.systemProperties=Systemeigenschaften
-doclet.systemPropertiesSummary=Systemeigenschaften - \u00DCbersicht
+doclet.systemPropertiesSummary=Systemeigenschaften - Übersicht
 doclet.Window_Source_title=Quellcode
 doclet.Window_Help_title=API-Hilfe
 # 0: number of references (> 1)
@@ -181,94 +181,94 @@ doclet.Window_Search_title=Suchen
 doclet.search.main_heading=Suchen
 
 # label for link/button element to show the information below
-doclet.search.show_more=Zus\u00E4tzliche Ressourcen
+doclet.search.show_more=Zusätzliche Ressourcen
 doclet.search.help_page_link=Hilfeseite
 # 0: a link to the help page with text above
-doclet.search.help_page_info= Die {0} enth\u00E4lt eine Einf\u00FChrung in den Umfang und die Syntax der JavaDoc-Suche.
-doclet.search.keyboard_info= Sie k\u00F6nnen die <STRG>- oder <CMD>-Taste zusammen mit den Pfeiltasten nach links und rechts verwenden, um zwischen Ergebnisregisterkarten auf dieser Seite zu wechseln.
-doclet.search.browser_info= Mit der URL-Vorlage unten k\u00F6nnen Sie diese Seite als Suchmaschine in Browsern konfigurieren, die dieses Feature unterst\u00FCtzen. Das Feature wurde erfolgreich mit Google Chrome und Mozilla Firefox getestet. Beachten Sie, dass andere Browser dieses Feature m\u00F6glicherweise nicht unterst\u00FCtzen oder ein anderes URL-Format erfordern.
+doclet.search.help_page_info= Die {0} enthält eine Einführung in den Umfang und die Syntax der JavaDoc-Suche.
+doclet.search.keyboard_info= Sie können die <STRG>- oder <CMD>-Taste zusammen mit den Pfeiltasten nach links und rechts verwenden, um zwischen Ergebnisregisterkarten auf dieser Seite zu wechseln.
+doclet.search.browser_info= Mit der URL-Vorlage unten können Sie diese Seite als Suchmaschine in Browsern konfigurieren, die dieses Feature unterstützen. Das Feature wurde erfolgreich mit Google Chrome und Mozilla Firefox getestet. Beachten Sie, dass andere Browser dieses Feature möglicherweise nicht unterstützen oder ein anderes URL-Format erfordern.
 doclet.search.redirect=Zum ersten Ergebnis umleiten
 
 # 0: a date
-doclet.Option_date_out_of_range=Wert f\u00FCr "--date" au\u00DFerhalb des g\u00FCltigen Bereichs: {0}
+doclet.Option_date_out_of_range=Wert für "--date" außerhalb des gültigen Bereichs: {0}
 
 # 0: a date
-doclet.Option_date_not_valid=Wert f\u00FCr "--date" nicht g\u00FCltig: {0}
+doclet.Option_date_not_valid=Wert für "--date" nicht gültig: {0}
 
 doclet.help.main_heading=Hilfe zu JavaDoc
 doclet.help.navigation.head=Navigation
 # 0: link to the Overview page
-doclet.help.navigation.intro=Ausgehend von der Seite {0} k\u00F6nnen Sie die Dokumentation mithilfe der Links durchsuchen, die sich auf jeder Seite und in der Navigationsleiste oben auf jeder Seite befinden.
+doclet.help.navigation.intro=Ausgehend von der Seite {0} können Sie die Dokumentation mithilfe der Links durchsuchen, die sich auf jeder Seite und in der Navigationsleiste oben auf jeder Seite befinden.
 # 0: link to the Index;  1: short list of links
-doclet.help.navigation.index=Mit {0} und dem Suchfeld k\u00F6nnen Sie zu spezifischen Deklarationen und \u00DCbersichtsseiten navigieren, wie {1}
+doclet.help.navigation.index=Mit {0} und dem Suchfeld können Sie zu spezifischen Deklarationen und Übersichtsseiten navigieren, wie {1}
 doclet.help.page_kinds.head=Seitenarten
 doclet.help.page_kinds.intro=Die folgenden Abschnitte beschreiben die verschiedenen Seitenarten in dieser Collection.
 # 0: link to the Overview page
-doclet.help.overview.modules.body=Die Seite {0} ist die Titelseite dieses API-Dokuments und enth\u00E4lt eine Liste aller Module mit einer \u00DCbersicht f\u00FCr jedes Modul. Diese Seite kann auch eine Gesamtbeschreibung des Modulsets enthalten.
+doclet.help.overview.modules.body=Die Seite {0} ist die Titelseite dieses API-Dokuments und enthält eine Liste aller Module mit einer Übersicht für jedes Modul. Diese Seite kann auch eine Gesamtbeschreibung des Modulsets enthalten.
 # 0: link to the Overview page
-doclet.help.overview.packages.body=Die Seite {0} ist die Titelseite dieses API-Dokuments und enth\u00E4lt eine Liste aller Packages mit einer \u00DCbersicht f\u00FCr jedes Packages. Diese Seite kann auch eine Gesamtbeschreibung des Packagesets enthalten.
-doclet.help.package.intro=F\u00FCr jedes Package ist eine Seite vorhanden, die eine Liste der Klassen und Schnittstellen mit jeweils einer \u00DCbersicht daf\u00FCr enth\u00E4lt. Diese Seiten k\u00F6nnen die folgenden Kategorien enthalten:
-doclet.help.module.intro=F\u00FCr jedes Modul ist eine Seite vorhanden, die eine Liste der Packages, Abh\u00E4ngigkeiten von anderen Modulen und Services mit jeweils einer \u00DCbersicht daf\u00FCr enth\u00E4lt. Diese Seiten k\u00F6nnen die folgenden Kategorien enthalten:
+doclet.help.overview.packages.body=Die Seite {0} ist die Titelseite dieses API-Dokuments und enthält eine Liste aller Packages mit einer Übersicht für jedes Packages. Diese Seite kann auch eine Gesamtbeschreibung des Packagesets enthalten.
+doclet.help.package.intro=Für jedes Package ist eine Seite vorhanden, die eine Liste der Klassen und Schnittstellen mit jeweils einer Übersicht dafür enthält. Diese Seiten können die folgenden Kategorien enthalten:
+doclet.help.module.intro=Für jedes Modul ist eine Seite vorhanden, die eine Liste der Packages, Abhängigkeiten von anderen Modulen und Services mit jeweils einer Übersicht dafür enthält. Diese Seiten können die folgenden Kategorien enthalten:
 doclet.help.class_interface.head=Klasse oder Schnittstelle
-doclet.help.class_interface.intro=F\u00FCr jede Klasse, Schnittstelle, verschachtelte Klasse und verschachtelte Schnittstelle ist eine separate Seite vorhanden. Jede dieser Seiten enth\u00E4lt drei Abschnitte, die aus einer Deklaration und Beschreibung, Mitglieder\u00FCbersichtstabellen und detaillierten Mitgliederbeschreibungen bestehen. Die Eintr\u00E4ge in diesen Abschnitten werden weggelassen, wenn sie leer oder nicht anwendbar sind.
+doclet.help.class_interface.intro=Für jede Klasse, Schnittstelle, verschachtelte Klasse und verschachtelte Schnittstelle ist eine separate Seite vorhanden. Jede dieser Seiten enthält drei Abschnitte, die aus einer Deklaration und Beschreibung, Mitgliederübersichtstabellen und detaillierten Mitgliederbeschreibungen bestehen. Die Einträge in diesen Abschnitten werden weggelassen, wenn sie leer oder nicht anwendbar sind.
 doclet.help.class_interface.inheritance_diagram=Klassenvererbungsdiagramm
 doclet.help.class_interface.subclasses=Direkte Unterklassen
 doclet.help.class_interface.subinterfaces=Alle bekannten Unterschnittstellen
 doclet.help.class_interface.implementations=Alle bekannten Implementierungsklassen
 doclet.help.class_interface.declaration=Klassen- oder Schnittstellendeklaration
 doclet.help.class_interface.description=Klassen- oder Schnittstellenbeschreibung
-doclet.help.class_interface.member_order=Die \u00DCbersichtseintr\u00E4ge sind alphabetisch geordnet, w\u00E4hrend die detaillierten Beschreibungen in der Reihenfolge aufgef\u00FChrt werden, in der sie im Quellcode auftreten. So werden die vom Programmierer festgelegten logischen Gruppierungen beibehalten.
+doclet.help.class_interface.member_order=Die Übersichtseinträge sind alphabetisch geordnet, während die detaillierten Beschreibungen in der Reihenfolge aufgeführt werden, in der sie im Quellcode auftreten. So werden die vom Programmierer festgelegten logischen Gruppierungen beibehalten.
 doclet.help.class_interface.note=Hinweis:
 doclet.help.class_interface.anno=Annotationsschnittstellen haben erforderliche und optionale Elemente, aber nicht Methoden.
 doclet.help.class_interface.enum=Nur Enum-Klassen haben Enum-Konstanten.
 doclet.help.class_interface.record=Die Komponenten einer Datensatzklasse werden als Teil der Deklaration der Datensatzklasse angezeigt.
 doclet.help.class_interface.property=Eigenschaften sind ein Feature von JavaFX.
 doclet.help.other_files.head=Weitere Dateien
-doclet.help.other_files.body=Packages und Module k\u00F6nnen Seiten mit weiteren Informationen zu den Deklarationen in der N\u00E4he enthalten.
+doclet.help.other_files.body=Packages und Module können Seiten mit weiteren Informationen zu den Deklarationen in der Nähe enthalten.
 doclet.help.use.head=Verwendung
-doclet.help.use.body=F\u00FCr jedes dokumentierte Package sowie jede Klasse und jede Schnittstelle ist eine eigene Verwendungsseite vorhanden. Auf dieser Seite wird beschrieben, welche Packages, Klassen, Methoden, Konstruktoren und Felder einen Teil der angegebenen Klasse oder des angegebenen Packages verwenden. Bei der Klasse oder Schnittstelle A enth\u00E4lt die Verwendungsseite die Unterklassen von A, als A deklarierte Felder, Methoden, die A zur\u00FCckgeben, sowie Methoden und Konstruktoren mit Parametern des Typs A. Sie k\u00F6nnen diese Seite aufrufen, indem Sie zun\u00E4chst das Package, die Klasse oder die Schnittstelle aufrufen und anschlie\u00DFend in der Navigationsleiste auf den Link "Verwendung" klicken.
+doclet.help.use.body=Für jedes dokumentierte Package sowie jede Klasse und jede Schnittstelle ist eine eigene Verwendungsseite vorhanden. Auf dieser Seite wird beschrieben, welche Packages, Klassen, Methoden, Konstruktoren und Felder einen Teil der angegebenen Klasse oder des angegebenen Packages verwenden. Bei der Klasse oder Schnittstelle A enthält die Verwendungsseite die Unterklassen von A, als A deklarierte Felder, Methoden, die A zurückgeben, sowie Methoden und Konstruktoren mit Parametern des Typs A. Sie können diese Seite aufrufen, indem Sie zunächst das Package, die Klasse oder die Schnittstelle aufrufen und anschließend in der Navigationsleiste auf den Link "Verwendung" klicken.
 doclet.help.tree.head=Baum (Klassenhierarchie)
 # 0: link to main Class Hierarchy page;  1: java.lang.Object
-doclet.help.tree.intro=Es gibt eine Seite {0} f\u00FCr alle Packages, und f\u00FCr jedes Package gibt es eine Hierarchie. Jede Hierarchieseite enth\u00E4lt eine Klassen- und eine Schnittstellenliste. Die Klassen sind nach Vererbungsstruktur organisiert, beginnend mit {1}. Die Schnittstellen erben nicht von {1}.
-doclet.help.tree.overview=Wenn Sie auf der \u00DCbersichtsseite auf "Baum" klicken, wird die Hierarchie f\u00FCr alle Packages angezeigt.
-doclet.help.tree.package=Wenn Sie eine bestimmte Package-, Klassen- oder Schnittstellenseite anzeigen und auf "Baum" klicken, wird die Hierarchie nur f\u00FCr dieses Package angezeigt.
+doclet.help.tree.intro=Es gibt eine Seite {0} für alle Packages, und für jedes Package gibt es eine Hierarchie. Jede Hierarchieseite enthält eine Klassen- und eine Schnittstellenliste. Die Klassen sind nach Vererbungsstruktur organisiert, beginnend mit {1}. Die Schnittstellen erben nicht von {1}.
+doclet.help.tree.overview=Wenn Sie auf der Übersichtsseite auf "Baum" klicken, wird die Hierarchie für alle Packages angezeigt.
+doclet.help.tree.package=Wenn Sie eine bestimmte Package-, Klassen- oder Schnittstellenseite anzeigen und auf "Baum" klicken, wird die Hierarchie nur für dieses Package angezeigt.
 # 0: link to the Deprecated summary page
-doclet.help.deprecated.body=Auf der Seite {0} werden alle APIs aufgef\u00FChrt, die veraltet sind. Die Verwendung einer veralteten API ist nicht empfehlenswert, im Allgemeinen aufgrund von M\u00E4ngeln. In der Regel wird eine Ersatz-API angegeben. Veraltete APIs werden in k\u00FCnftigen Implementierungen m\u00F6glicherweise entfernt.
+doclet.help.deprecated.body=Auf der Seite {0} werden alle APIs aufgeführt, die veraltet sind. Die Verwendung einer veralteten API ist nicht empfehlenswert, im Allgemeinen aufgrund von Mängeln. In der Regel wird eine Ersatz-API angegeben. Veraltete APIs werden in künftigen Implementierungen möglicherweise entfernt.
 # 0: link to the Preview summary page
-doclet.help.preview.body=Die Seite {0} listet alle Vorschau-APIs auf. Vorschau-APIs k\u00F6nnen in k\u00FCnftigen Implementierungen entfernt werden.
-doclet.help.new.body=Die Seite {0} listet APIs auf, die in neueren Releases hinzugef\u00FCgt wurden.
+doclet.help.preview.body=Die Seite {0} listet alle Vorschau-APIs auf. Vorschau-APIs können in künftigen Implementierungen entfernt werden.
+doclet.help.new.body=Die Seite {0} listet APIs auf, die in neueren Releases hinzugefügt wurden.
 doclet.help.index.head=Index
 # 0: link to Index page;  1: list of links to pages
-doclet.help.index.body=Die {0} enth\u00E4lt einen alphabetischen Index aller Klassen, Schnittstellen, Konstruktoren, Methoden und Felder in der Dokumentation sowie \u00DCbersichtsseiten wie {1}.
+doclet.help.index.body=Die {0} enthält einen alphabetischen Index aller Klassen, Schnittstellen, Konstruktoren, Methoden und Felder in der Dokumentation sowie Übersichtsseiten wie {1}.
 doclet.help.all_classes.head=Alle Klassen und Schnittstellen
 # 0: link to All Classes page
-doclet.help.all_classes.body=Die Seite {0} enth\u00E4lt einen alphabetischen Index aller Klassen und Schnittstellen in der Dokumentation, einschlie\u00DFlich Annotationsschnittstellen, Enum-Klassen und Datensatzklassen.
+doclet.help.all_classes.body=Die Seite {0} enthält einen alphabetischen Index aller Klassen und Schnittstellen in der Dokumentation, einschließlich Annotationsschnittstellen, Enum-Klassen und Datensatzklassen.
 doclet.help.all_packages.head=Alle Packages
 # 0: link to All Packages page
-doclet.help.all_packages.body=Die Seite {0} enth\u00E4lt einen alphabetischen Index aller Packages, die in der Dokumentation enthalten sind.
-doclet.help.serial_form.body=Jede serialisierbare oder externalisierbare Klasse verf\u00FCgt \u00FCber eine Beschreibung der zugeh\u00F6rigen Serialisierungsfelder und -methoden. Diese Informationen sind eher f\u00FCr Implementierer als f\u00FCr Benutzer der API von Interesse. Die Navigationsleiste enth\u00E4lt zwar keinen Link, Sie k\u00F6nnen diese Informationen jedoch abrufen, indem Sie zu einer beliebigen serialisierten Klasse navigieren und im Abschnitt "Siehe auch" der Klassenbeschreibung auf "Serialisierte Form" klicken.
+doclet.help.all_packages.body=Die Seite {0} enthält einen alphabetischen Index aller Packages, die in der Dokumentation enthalten sind.
+doclet.help.serial_form.body=Jede serialisierbare oder externalisierbare Klasse verfügt über eine Beschreibung der zugehörigen Serialisierungsfelder und -methoden. Diese Informationen sind eher für Implementierer als für Benutzer der API von Interesse. Die Navigationsleiste enthält zwar keinen Link, Sie können diese Informationen jedoch abrufen, indem Sie zu einer beliebigen serialisierten Klasse navigieren und im Abschnitt "Siehe auch" der Klassenbeschreibung auf "Serialisierte Form" klicken.
 # 0: link to Constant Values page
-doclet.help.constants.body=Auf der Seite {0} sind die statischen endg\u00FCltigen Felder und deren Werte aufgef\u00FChrt.
+doclet.help.constants.body=Auf der Seite {0} sind die statischen endgültigen Felder und deren Werte aufgeführt.
 # 0: link to System Properties page
 doclet.help.systemProperties.body=Die Seite {0} listet Referenzen auf Systemeigenschaften auf.
 # 0: link to External Specifications page
 doclet.help.externalSpecifications.body=Die Seite {0} listet Referenzen auf externe Spezifikationen auf.
-doclet.help.footnote=Diese Hilfedatei gilt f\u00FCr die vom Standard-Doclet generierte API-Dokumentation.
-doclet.help.enum.intro=F\u00FCr jede Enum-Klasse ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
-doclet.help.enum.class.intro=F\u00FCr jede Enum-Klasse ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
-doclet.help.annotation_type.intro=F\u00FCr jeden Annotationstyp ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
-doclet.help.annotation_interface.intro=F\u00FCr jede Annotationsschnittstelle ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
+doclet.help.footnote=Diese Hilfedatei gilt für die vom Standard-Doclet generierte API-Dokumentation.
+doclet.help.enum.intro=Für jede Enum-Klasse ist eine separate Seite mit den folgenden Abschnitten verfügbar:
+doclet.help.enum.class.intro=Für jede Enum-Klasse ist eine separate Seite mit den folgenden Abschnitten verfügbar:
+doclet.help.annotation_type.intro=Für jeden Annotationstyp ist eine separate Seite mit den folgenden Abschnitten verfügbar:
+doclet.help.annotation_interface.intro=Für jede Annotationsschnittstelle ist eine separate Seite mit den folgenden Abschnitten verfügbar:
 doclet.help.annotation_type.declaration=Deklaration des Annotationstyps
 doclet.help.annotation_interface.declaration=Deklaration der Annotationsschnittstelle
 doclet.help.annotation_type.description=Beschreibung des Annotationstyps
 doclet.help.annotation_interface.description=Beschreibung der Annotationsschnittstelle
 doclet.help.search.head=Suchen
 # Introduction to Javadoc search features, followed by a list of examples
-doclet.help.search.intro=Sie k\u00F6nnen nach Definitionen von Modulen, Packages, Typen, Feldern, Methoden, Systemeigenschaften und anderen Begriffen suchen, die in der API definiert sind. Dazu k\u00F6nnen Sie den Namen ganz oder teilweise oder optional auch Abk\u00FCrzungen mit Binnenmajuskeln ("camelCase") eingeben. Sie k\u00F6nnen auch mehrere durch Leerzeichen getrennte Suchbegriffe angeben. Beispiele:
+doclet.help.search.intro=Sie können nach Definitionen von Modulen, Packages, Typen, Feldern, Methoden, Systemeigenschaften und anderen Begriffen suchen, die in der API definiert sind. Dazu können Sie den Namen ganz oder teilweise oder optional auch Abkürzungen mit Binnenmajuskeln ("camelCase") eingeben. Sie können auch mehrere durch Leerzeichen getrennte Suchbegriffe angeben. Beispiele:
 # Used to list search examples, {0} is a search term and {1} the matching result
-doclet.help.search.example={0} stimmt mit {1} \u00FCberein
+doclet.help.search.example={0} stimmt mit {1} überein
 # {0} contains a link to the current Javadoc Search Specification
-doclet.help.search.refer=Eine vollst\u00E4ndige Beschreibung der Suchfeatures finden Sie in der {0}.
+doclet.help.search.refer=Eine vollständige Beschreibung der Suchfeatures finden Sie in der {0}.
 # The URL for the Javadoc Search Specification. {0} will be replaced by the JDK version number
 doclet.help.search.spec.url=https://docs.oracle.com/en/java/javase/{0}/docs/specs/javadoc/javadoc-search-spec.html
 # The title for the Javadoc Search Specification
@@ -285,25 +285,25 @@ doclet.ClassUse_FieldTypeParameter=Felder in {1} mit Typparametern vom Typ {0}
 doclet.ClassUse_FieldAnnotations=Felder in {1} mit Annotationen vom Typ {0}
 doclet.ClassUse_MethodAnnotations=Methoden in {1} mit Annotationen vom Typ {0}
 doclet.ClassUse_MethodParameterAnnotations=Methodenparameter in {1} mit Annotationen vom Typ {0}
-doclet.ClassUse_MethodReturnTypeParameter=Methoden in {1}, die Typen mit Argumenten vom Typ {0} zur\u00FCckgeben
+doclet.ClassUse_MethodReturnTypeParameter=Methoden in {1}, die Typen mit Argumenten vom Typ {0} zurückgeben
 doclet.ClassUse_Subclass=Unterklassen von {0} in {1}
 doclet.ClassUse_Subinterface=Unterschnittstellen von {0} in {1}
 doclet.ClassUse_ImplementingClass=Klassen in {1}, die {0} implementieren
 doclet.ClassUse_Field=Felder in {1}, die deklariert sind als {0}
-doclet.ClassUse_MethodReturn=Methoden in {1}, die {0} zur\u00FCckgeben
+doclet.ClassUse_MethodReturn=Methoden in {1}, die {0} zurückgeben
 doclet.ClassUse_MethodArgs=Methoden in {1} mit Parametern vom Typ {0}
 doclet.ClassUse_MethodArgsTypeParameters=Methodenparameter in {1} mit Typargumenten vom Typ {0}
-doclet.ClassUse_MethodThrows=Methoden in {1}, die {0} ausl\u00F6sen
+doclet.ClassUse_MethodThrows=Methoden in {1}, die {0} auslösen
 doclet.ClassUse_ConstructorAnnotations=Konstruktoren in {1} mit Annotationen vom Typ {0}
 doclet.ClassUse_ConstructorParameterAnnotations=Konstruktorparameter in {1} mit Annotationen vom Typ {0}
 doclet.ClassUse_ConstructorArgs=Konstruktoren in {1} mit Parametern vom Typ {0}
 doclet.ClassUse_ConstructorArgsTypeParameters=Konstruktorparameter in {1} mit Typargumenten vom Typ {0}
-doclet.ClassUse_ConstructorThrows=Konstruktoren in {1}, die {0} ausl\u00F6sen
+doclet.ClassUse_ConstructorThrows=Konstruktoren in {1}, die {0} auslösen
 doclet.ClassUse_No.usage.of.0=Keine Verwendung von {0}
 doclet.Window_ClassUse_Header=Verwendungsweise von {0} {1}
 doclet.ClassUse_Title=Verwendungen von {0}
 doclet.navClassUse=Verwendung
-doclet.Error_in_grouplist=Ung\u00FCltige Option -group: {0} {1}
+doclet.Error_in_grouplist=Ungültige Option -group: {0} {1}
 doclet.Groupname_already_used=In der Option -group wird der Gruppenname bereits verwendet: {0}
 doclet.Same_element_name_used=Elementname oder Muster zweimal verwendet: {0}
 doclet.PreviewLeadingNote={0} basiert auf Vorschaufeatures der Java-Plattform:
@@ -311,23 +311,23 @@ doclet.Declared_Using_Preview={0} wird mit {1} deklariert, einem Vorschaufeature
 doclet.PreviewAPI={0} bezieht sich auf mindestens eine Vorschau-API: {1}.
 doclet.ReflectivePreviewAPI={0} bezieht sich auf mindestens eine reflektive Vorschau-API: {1}.
 doclet.UsesDeclaredUsingPreview={0} bezieht sich auf mindestens einen Typ, der mit einem Vorschaufeature der Programmiersprache Java deklariert wird: {1}.
-doclet.PreviewTrailingNote1=Programme k\u00F6nnen {0} nur verwenden, wenn Vorschaufeatures aktiviert sind.
-doclet.PreviewTrailingNote2=Vorschaufeatures k\u00F6nnen in k\u00FCnftigen Releases entfernt oder zu permanenten Features der Java-Plattform hochgestuft werden.
-doclet.Declared_Using_Preview.SEALED=Verschl\u00FCsselte Klassen
-doclet.Declared_Using_Preview.SEALED_PERMITS=Verschl\u00FCsselte Klassen
+doclet.PreviewTrailingNote1=Programme können {0} nur verwenden, wenn Vorschaufeatures aktiviert sind.
+doclet.PreviewTrailingNote2=Vorschaufeatures können in künftigen Releases entfernt oder zu permanenten Features der Java-Plattform hochgestuft werden.
+doclet.Declared_Using_Preview.SEALED=Verschlüsselte Klassen
+doclet.Declared_Using_Preview.SEALED_PERMITS=Verschlüsselte Klassen
 doclet.PreviewPlatformLeadingNote={0} ist eine Vorschau-API der Java-Plattform.
 doclet.ReflectivePreviewPlatformLeadingNote={0} ist eine reflektive Vorschau-API der Java-Plattform.
 
 # 0: an exception
 doclet.Error_copying_legal_notices=Fehler beim Kopieren der rechtlichen Hinweise: {0}
 # 0: the path; 1: the detail message for the exception
-doclet.Error_invalid_path_for_legal_notices=Ung\u00FCltiger Pfad "{0}" f\u00FCr rechtliche Hinweise: {1}
+doclet.Error_invalid_path_for_legal_notices=Ungültiger Pfad "{0}" für rechtliche Hinweise: {1}
 
 # 0: URL; 1: an integer
-doclet.extSpec.spec.has.multiple.titles={1} verschiedene Titel in @spec-Tags f\u00FCr die externe Spezifikation bei {0}
+doclet.extSpec.spec.has.multiple.titles={1} verschiedene Titel in @spec-Tags für die externe Spezifikation bei {0}
 
 # 0: name; 1: an integer
-doclet.extSpec.title.for.multiple.specs=Der Titel "{0}" wird f\u00FCr {1} verschiedene externe Spezifikationen in @spec-Tags verwendet
+doclet.extSpec.title.for.multiple.specs=Der Titel "{0}" wird für {1} verschiedene externe Spezifikationen in @spec-Tags verwendet
 
 # 0: name; 1: url
 doclet.extSpec.title.url=Titel: "{0}", URL: {1}
@@ -337,47 +337,47 @@ doclet.extSpec.url.title=URL: {0}, Titel: "{1}"
 
 # option specifiers
 doclet.usage.add-script.parameters=<Datei>
-doclet.usage.add-script.description=F\u00FCgt der generierten Dokumentation eine Skriptdatei hinzu
+doclet.usage.add-script.description=Fügt der generierten Dokumentation eine Skriptdatei hinzu
 doclet.usage.add-stylesheet.parameters=<Datei>
-doclet.usage.add-stylesheet.description=F\u00FCgt der generierten Dokumentation eine Stylesheet-Datei hinzu
+doclet.usage.add-stylesheet.description=Fügt der generierten Dokumentation eine Stylesheet-Datei hinzu
 doclet.usage.d.parameters=<Verzeichnis>
-doclet.usage.d.description=Zielverzeichnis f\u00FCr Ausgabedateien
+doclet.usage.d.description=Zielverzeichnis für Ausgabedateien
 
-doclet.usage.use.description=Verwendungsseiten f\u00FCr Klassen und Packages erstellen
+doclet.usage.use.description=Verwendungsseiten für Klassen und Packages erstellen
 
-doclet.usage.version.description=@version-Abs\u00E4tze aufnehmen
+doclet.usage.version.description=@version-Absätze aufnehmen
 
-doclet.usage.author.description=@author-Abs\u00E4tze aufnehmen
+doclet.usage.author.description=@author-Absätze aufnehmen
 
 doclet.usage.docfilessubdirs.description=doc-file-Unterverzeichnisse rekursiv kopieren
 
 doclet.usage.splitindex.description=Index in eine Datei pro Buchstabe aufteilen
 
 doclet.usage.overview.parameters=<Datei>
-doclet.usage.overview.description=\u00DCberblickdokumentation aus HTML-Datei lesen
+doclet.usage.overview.description=Überblickdokumentation aus HTML-Datei lesen
 
 doclet.usage.windowtitle.parameters=<Text>
-doclet.usage.windowtitle.description=Browserfenstertitel f\u00FCr die Dokumentation
+doclet.usage.windowtitle.description=Browserfenstertitel für die Dokumentation
 
 doclet.usage.date.parameters=<date-and-time>
-doclet.usage.date.description=Gibt den Wert f\u00FCr den Zeitstempel der generierten Seiten im ISO 8601-Format an
+doclet.usage.date.description=Gibt den Wert für den Zeitstempel der generierten Seiten im ISO 8601-Format an
 
 doclet.usage.doctitle.parameters=<HTML-Code>
-doclet.usage.doctitle.description=Titel f\u00FCr die \u00DCberblickseite aufnehmen
+doclet.usage.doctitle.description=Titel für die Überblickseite aufnehmen
 
 doclet.usage.header.parameters=<HTML-Code>
-doclet.usage.header.description=Headertext f\u00FCr jede Seite aufnehmen
+doclet.usage.header.description=Headertext für jede Seite aufnehmen
 
-doclet.usage.html5.description=Generiert eine HTML 5-Ausgabe. Diese Option wird nicht mehr ben\u00F6tigt.
+doclet.usage.html5.description=Generiert eine HTML 5-Ausgabe. Diese Option wird nicht mehr benötigt.
 
 doclet.usage.footer.parameters=<HTML-Code>
-doclet.usage.footer.description=Footertext f\u00FCr jede Seite aufnehmen
+doclet.usage.footer.description=Footertext für jede Seite aufnehmen
 
 doclet.usage.top.parameters=<HTML-Code>
-doclet.usage.top.description=Oberen Text f\u00FCr jede Seite aufnehmen
+doclet.usage.top.description=Oberen Text für jede Seite aufnehmen
 
 doclet.usage.bottom.parameters=<HTML-Code>
-doclet.usage.bottom.description=Unteren Text f\u00FCr jede Seite aufnehmen
+doclet.usage.bottom.description=Unteren Text für jede Seite aufnehmen
 
 doclet.usage.link.parameters=< URL>
 doclet.usage.link.description=Links zur javadoc-Ausgabe unter <url> erstellen
@@ -387,26 +387,26 @@ doclet.usage.linkoffline.description=Link zu Dokumenten unter <url> mit Packagel
 
 # L10N: do not localize the option parameters: warn info
 doclet.usage.link-modularity-mismatch.parameters=(warn|info)
-doclet.usage.link-modularity-mismatch.description=Meldet externe Dokumentation mit der falschen Modularit\u00E4t mit einer\nWarn- oder Informationsmeldung. Das Standardverhalten ist\nWarnen.
+doclet.usage.link-modularity-mismatch.description=Meldet externe Dokumentation mit der falschen Modularität mit einer\nWarn- oder Informationsmeldung. Das Standardverhalten ist\nWarnen.
 
 doclet.usage.link-platform-properties.parameters=< URL>
 doclet.usage.link-platform-properties.description=Link zu Plattformdokumentations-URLs, die in der Eigenschaftendatei auf <URL> deklariert sind
 
 doclet.usage.excludedocfilessubdir.parameters=<name>,<name>,...
-doclet.usage.excludedocfilessubdir.description=doc-files-Unterverzeichnisse mit angegebenem Namen ausschlie\u00DFen.\n":" kann \u00FCberall im Argument als Trennzeichen verwendet werden.
+doclet.usage.excludedocfilessubdir.description=doc-files-Unterverzeichnisse mit angegebenem Namen ausschließen.\n":" kann überall im Argument als Trennzeichen verwendet werden.
 
 doclet.usage.group.parameters=<name> <g1>,<g2>...
-doclet.usage.group.description=Angegebene Elemente auf \u00DCberblickseite gruppieren.\n":" kann \u00FCberall im Argument als Trennzeichen verwendet werden.
+doclet.usage.group.description=Angegebene Elemente auf Überblickseite gruppieren.\n":" kann überall im Argument als Trennzeichen verwendet werden.
 
 doclet.usage.legal-notices.parameters='default' | 'none' | <Verzeichnis>
 doclet.usage.legal-notices.description=Steuert die rechtlichen Hinweise in der generierten Ausgabe
 
-doclet.usage.nocomment.description=Beschreibung und Tags unterdr\u00FCcken und nur Deklarationen generieren
+doclet.usage.nocomment.description=Beschreibung und Tags unterdrücken und nur Deklarationen generieren
 
 doclet.usage.nodeprecated.description=@deprecated-Informationen nicht aufnehmen
 
 doclet.usage.noqualifier.parameters=<name1>,<name2>,...
-doclet.usage.noqualifier.description=Liste der Qualifier aus der Ausgabe ausschlie\u00DFen.\n":" kann \u00FCberall im Argument als Trennzeichen verwendet werden.
+doclet.usage.noqualifier.description=Liste der Qualifier aus der Ausgabe ausschließen.\n":" kann überall im Argument als Trennzeichen verwendet werden.
 
 doclet.usage.nosince.description=@since-Informationen nicht aufnehmen
 
@@ -414,7 +414,7 @@ doclet.usage.notimestamp.description=Ausgeblendeten Zeitstempel nicht aufnehmen
 
 doclet.usage.nodeprecatedlist.description=Veraltet-Liste nicht generieren
 
-doclet.usage.no-module-directories.description=Gruppiert Dateien f\u00FCr die Moduldokumentation nicht in \nmodulspezifischen Verzeichnisse
+doclet.usage.no-module-directories.description=Gruppiert Dateien für die Moduldokumentation nicht in \nmodulspezifischen Verzeichnisse
 
 doclet.usage.no-platform-links.description=Generiert keine Links zur Plattformdokumentation
 
@@ -426,7 +426,7 @@ doclet.usage.nohelp.description=Hilfelink nicht generieren
 
 doclet.usage.nonavbar.description=Navigationsleiste nicht generieren
 
-doclet.usage.nooverview.description=\u00DCberblickseiten nicht generieren
+doclet.usage.nooverview.description=Überblickseiten nicht generieren
 
 doclet.usage.serialwarn.description=Warnung wegen @serial-Tag generieren
 
@@ -434,7 +434,7 @@ doclet.usage.since.parameters=<Release>(,<Release>)*
 doclet.usage.since.description=Dokumentiert die neue und die veraltete API in den angegebenen Releases
 
 doclet.usage.since-label.parameters=<Text>
-doclet.usage.since-label.description=Liefert Text f\u00FCr die \u00DCberschrift der Seite "Neue API"
+doclet.usage.since-label.description=Liefert Text für die Überschrift der Seite "Neue API"
 
 doclet.usage.tag.parameters=<Name>:<Positionen>:<Header>
 doclet.usage.tag.description=Benutzerdefinierte Tags mit einem Argument angeben
@@ -445,28 +445,28 @@ doclet.usage.tagletpath.description=Pfad zu Taglets
 
 doclet.usage.snippet-path.parameters=<Pfad>
 
-doclet.usage.snippet-path.description=Der Pfad f\u00FCr externe Snippets
+doclet.usage.snippet-path.description=Der Pfad für externe Snippets
 
 doclet.usage.charset.parameters=<Zeichensatz>
-doclet.usage.charset.description=Zeichensatz f\u00FCr plattform\u00FCbergreifende Anzeige der generierten Dokumentation
+doclet.usage.charset.description=Zeichensatz für plattformübergreifende Anzeige der generierten Dokumentation
 
-doclet.usage.javafx.description=Aktiviert die JavaFX-Funktionalit\u00E4t
+doclet.usage.javafx.description=Aktiviert die JavaFX-Funktionalität
 
 doclet.usage.helpfile.parameters=<Datei>
 doclet.usage.helpfile.description=Datei aufnehmen, zu der der Hilfelink verlinkt
 
 doclet.usage.linksource.description=Quelle in HTML generieren
 
-doclet.usage.sourcetab.parameters=<Tabulatorl\u00E4nge>
+doclet.usage.sourcetab.parameters=<Tabulatorlänge>
 doclet.usage.sourcetab.description=Anzahl der Leerzeichen angeben, die jedes Register in der Quelle beansprucht
 
 doclet.usage.keywords.description=HTML-Metatags mit Informationen zu Package, Klasse und Member aufnehmen
 
 doclet.usage.main-stylesheet.parameters=<Datei>
-doclet.usage.main-stylesheet.description=Datei zum \u00C4ndern des Stils der generierten Dokumentation
+doclet.usage.main-stylesheet.description=Datei zum Ändern des Stils der generierten Dokumentation
 
 doclet.usage.docencoding.parameters=<Name>
-doclet.usage.docencoding.description=Zeichensatzcodierung f\u00FCr die Ausgabe angeben
+doclet.usage.docencoding.description=Zeichensatzcodierung für die Ausgabe angeben
 
 doclet.usage.frames.description=Aktiviert die Verwendung von Frames in der generierten Ausgabe
 
@@ -474,29 +474,29 @@ doclet.usage.no-frames.description=Deaktiviert die Verwendung von Frames in der
 
 doclet.usage.override-methods.parameters=(detail|summary)
 
-doclet.usage.override-methods.description=Au\u00DFer Kraft gesetzte Methoden im Abschnitt "detail" oder "summary" dokumentieren.\nDer Standardwert ist "detail".
+doclet.usage.override-methods.description=Außer Kraft gesetzte Methoden im Abschnitt "detail" oder "summary" dokumentieren.\nDer Standardwert ist "detail".
 
 doclet.usage.allow-script-in-comments.description=JavaScript in Optionen und Kommentaren zulassen
 
 doclet.usage.xdocrootparent.parameters=< URL>
 doclet.usage.xdocrootparent.description=Ersetzt alle Vorkommen von @docRoot gefolgt von /.. in doc-Kommentaren durch\n<url>
 
-doclet.usage.xdoclint.description=Empfohlene Pr\u00FCfungen f\u00FCr Probleme in javadoc-Kommentaren aktivieren
+doclet.usage.xdoclint.description=Empfohlene Prüfungen für Probleme in javadoc-Kommentaren aktivieren
 
 doclet.usage.xdoclint-extended.parameters=(all|none|[-]<Gruppe>)
 # L10N: do not localize these words: all none accessibility html missing reference syntax
-doclet.usage.xdoclint-extended.description=Bestimmte Pr\u00FCfungen f\u00FCr Probleme in javadoc-Kommentaren aktivieren\noder deaktivieren, wobei <group> einen der folgenden Werte hat:\naccessibility, html, missing, reference oder syntax.
+doclet.usage.xdoclint-extended.description=Bestimmte Prüfungen für Probleme in javadoc-Kommentaren aktivieren\noder deaktivieren, wobei <group> einen der folgenden Werte hat:\naccessibility, html, missing, reference oder syntax.
 
 doclet.usage.xdoclint-package.parameters=([-]<Packages>)
-doclet.usage.xdoclint-package.description=Pr\u00FCfungen in bestimmten Packages aktivieren oder deaktivieren.\n<packages> ist eine durch Komma getrennte Liste von Packagebezeichnern.\nEin Packagebezeichner ist entweder ein vollst\u00E4ndiger Name oder ein Namenspr\u00E4fix\neines Packages, gefolgt von .*, und bezieht sich auf alle Unterpackages\ndes angegebenen Packages. Stellen Sie dem Packagebezeichner - voran,\num Pr\u00FCfungen f\u00FCr die angegebenen Packages zu deaktivieren.
+doclet.usage.xdoclint-package.description=Prüfungen in bestimmten Packages aktivieren oder deaktivieren.\n<packages> ist eine durch Komma getrennte Liste von Packagebezeichnern.\nEin Packagebezeichner ist entweder ein vollständiger Name oder ein Namenspräfix\neines Packages, gefolgt von .*, und bezieht sich auf alle Unterpackages\ndes angegebenen Packages. Stellen Sie dem Packagebezeichner - voran,\num Prüfungen für die angegebenen Packages zu deaktivieren.
 
 doclet.usage.spec-base-url=<URL>
-doclet.usage.spec-base-url.description=Basis-URL f\u00FCr relative URLs in @spec-Tags angeben
+doclet.usage.spec-base-url.description=Basis-URL für relative URLs in @spec-Tags angeben
 
-doclet.Invalid_URL=ung\u00FCltige URL: {0}
+doclet.Invalid_URL=ungültige URL: {0}
 
 # L10N: do not localize the option name --no-frames
-doclet.NoFrames_specified=Die Option --no-frames wird nicht mehr ben\u00F6tigt und wird m\u00F6glicherweise\nin einem zuk\u00FCnftigen Release entfernt.
+doclet.NoFrames_specified=Die Option --no-frames wird nicht mehr benötigt und wird möglicherweise\nin einem zukünftigen Release entfernt.
 
 # L10N: do not localize the option name -footer
-doclet.footer_specified=Die Option -footer wird nicht mehr unterst\u00FCtzt und wird ignoriert.\nSie wird m\u00F6glicherweise in einem zuk\u00FCnftigen Release entfernt.
+doclet.footer_specified=Die Option -footer wird nicht mehr unterstützt und wird ignoriert.\nSie wird möglicherweise in einem zukünftigen Release entfernt.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
index 41cdd1c4d18..9856fd77729 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
@@ -23,480 +23,480 @@
 # questions.
 #
 
-doclet.build_version=\u6A19\u6E96Doclet\u30D0\u30FC\u30B8\u30E7\u30F3{0}
-doclet.Contents=\u30B3\u30F3\u30C6\u30F3\u30C4
-doclet.Overview=\u6982\u8981
-doclet.Window_Overview_Summary=\u6982\u8981
-doclet.Element=\u8981\u7D20
-doclet.Package=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Unnamed_Package=\u540D\u524D\u306E\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Module=\u30E2\u30B8\u30E5\u30FC\u30EB
-doclet.Open_Module=\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u958B\u304F
-doclet.All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.All_Modules=\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB
-doclet.None=\u306A\u3057
-doclet.Tree=\u968E\u5C64\u30C4\u30EA\u30FC
-doclet.Class_Hierarchy=\u30AF\u30E9\u30B9\u968E\u5C64
-doclet.Window_Class_Hierarchy=\u30AF\u30E9\u30B9\u968E\u5C64
-doclet.Interface_Hierarchy=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64
-doclet.Enum_Hierarchy=\u5217\u6319\u578B\u968E\u5C64
-doclet.Enum_Class_Hierarchy=\u5217\u6319\u30AF\u30E9\u30B9\u968E\u5C64
-doclet.Record_Class_Hierarchy=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u968E\u5C64
-doclet.Annotation_Type_Hierarchy=\u6CE8\u91C8\u578B\u968E\u5C64
-doclet.Annotation_Interface_Hierarchy=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64
-doclet.Href_Class_Title={0}\u5185\u306E\u30AF\u30E9\u30B9
-doclet.Href_Interface_Title={0}\u5185\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Href_Annotation_Title={0}\u5185\u306E\u6CE8\u91C8
-doclet.Href_Annotation_Interface_Title={0}\u5185\u306E\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B
-doclet.Href_Enum_Class_Title={0}\u306E\u5217\u6319\u30AF\u30E9\u30B9
-doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF
-doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Summary=\u6982\u8981:
-doclet.Detail=\u8A73\u7D30:
-doclet.Module_Sub_Nav=\u30E2\u30B8\u30E5\u30FC\u30EB:
-doclet.Help_Sub_Nav=\u30D8\u30EB\u30D7:
-doclet.Package_Sub_Nav=\u30D1\u30C3\u30B1\u30FC\u30B8:
-doclet.navClassesAndInterfaces=\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.navDescription=\u8AAC\u660E
-doclet.navModules=\u30E2\u30B8\u30E5\u30FC\u30EB
-doclet.navPackages=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.navServices=\u30B5\u30FC\u30D3\u30B9
-doclet.navNested=\u30CD\u30B9\u30C8
-doclet.navAnnotationTypeOptionalMember=\u30AA\u30D7\u30B7\u30E7\u30F3
-doclet.navAnnotationTypeRequiredMember=\u5FC5\u9808
-doclet.navAnnotationTypeMember=\u8981\u7D20
-doclet.navField=\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.navProperty=\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.navEnum=\u5217\u6319\u5B9A\u6570
-doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.navMethod=\u30E1\u30BD\u30C3\u30C9
-doclet.navNavigation=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
-doclet.navPages=\u30DA\u30FC\u30B8
-doclet.not.exhaustive=(\u7DB2\u7F85\u7684\u3067\u306A\u3044)
-doclet.Index=\u7D22\u5F15
-doclet.Window_Single_Index=\u7D22\u5F15
-doclet.Window_Split_Index={0}\u306E\u7D22\u5F15
-doclet.Help=\u30D8\u30EB\u30D7
-doclet.Skip_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u3092\u30B9\u30AD\u30C3\u30D7
-doclet.Toggle_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u306E\u5207\u66FF\u3048
-doclet.Navigation=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
-doclet.navDeprecated=\u975E\u63A8\u5968
-doclet.Window_Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
-doclet.Window_New_List=\u65B0\u898FAPI\u30EA\u30B9\u30C8
-doclet.Window_Preview_List=\u30EA\u30B9\u30C8\u306E\u30D7\u30EC\u30D3\u30E5\u30FC
-doclet.Overrides=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9:
-doclet.in_class=\u30AF\u30E9\u30B9\u5185
-doclet.Element_in={0}\u306E\u8981\u7D20
-doclet.Enum_constant_in={0}\u306E\u5217\u6319\u578B\u5B9A\u6570
-doclet.Static_variable_in={0}\u306Estatic\u5909\u6570
-doclet.Variable_in={0}\u306E\u5909\u6570
-doclet.Constructor_for={0}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.Record_component_in={0}\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
-doclet.Static_method_in={0}\u306Estatic\u30E1\u30BD\u30C3\u30C9
-doclet.Search_tag_in={0}\u306E\u691C\u7D22\u30BF\u30B0
-doclet.Method_in={0}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.module=\u30E2\u30B8\u30E5\u30FC\u30EB
-doclet.package=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.MalformedURL=\u4E0D\u6B63\u306AURL: {0}
-doclet.File_error=\u30D5\u30A1\u30A4\u30EB\u8AAD\u8FBC\u307F\u30A8\u30E9\u30FC: {0}
-doclet.URL_error=URL\u53D6\u51FA\u3057\u30A8\u30E9\u30FC: {0}
-doclet.Resource_error=\u30EA\u30BD\u30FC\u30B9\u8AAD\u53D6\u308A\u30A8\u30E9\u30FC: {0}
-doclet.link.no_reference=\u53C2\u7167\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-doclet.link.see.no_label=\u53C2\u7167\u30E9\u30D9\u30EB\u304C\u3042\u308A\u307E\u305B\u3093
-doclet.link.see.reference_invalid=\u7121\u52B9\u306A\u53C2\u7167\u3067\u3059
-doclet.link.see.reference_not_found=\u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-doclet.link.see.reference_not_accessible=\u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {0}
-doclet.see.nested_link=\u30BF\u30B0{0}: \u30EA\u30F3\u30AF\u304C\u30CD\u30B9\u30C8\u3055\u308C\u3066\u3044\u307E\u3059
-doclet.throws.reference_not_found=\u540D\u524D\u3067\u4F8B\u5916\u30BF\u30A4\u30D7\u3092\u898B\u3064\u3051\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
-doclet.throws.reference_bad_type=\u6B21\u306E\u4F8B\u5916\u30BF\u30A4\u30D7\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0}
-doclet.tag.invalid_usage=\u30BF\u30B0{0}\u306E\u4F7F\u7528\u65B9\u6CD5\u304C\u7121\u52B9\u3067\u3059
-doclet.tag.invalid_input=\u5165\u529B\u304C\u7121\u52B9\u3067\u3059: ''{0}''
-doclet.tag.invalid=@{0}\u304C\u7121\u52B9\u3067\u3059
-doclet.Deprecated_API=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044API
-doclet.Deprecated_API_Checkbox_Label=\u6B21\u3067\u975E\u63A8\u5968\u306EAPI\u3092\u8868\u793A:
-doclet.Deprecated_API_Checkbox_Other_Releases=\u305D\u306E\u4ED6
-doclet.Deprecated_Elements=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044{0}
-doclet.Deprecated_Elements_Release_Column_Header=\u6B21\u3067\u975E\u63A8\u5968
-doclet.Deprecated_In_Release={0}\u3067\u975E\u63A8\u5968
-doclet.New_API=\u65B0\u898FAPI
-doclet.New_API_Checkbox_Label=\u6B21\u3067\u8FFD\u52A0\u3055\u308C\u305FAPI\u3092\u8868\u793A:
-doclet.New_Elements=\u65B0\u898F{0}
-doclet.New_Elements_Release_Column_Header=\u6B21\u3067\u8FFD\u52A0
-doclet.New_Label=\u65B0\u898F
-doclet.Preview_API=\u30D7\u30EC\u30D3\u30E5\u30FCAPI
-doclet.Preview_API_Checkbox_Label=\u6B21\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u8868\u793A:
+doclet.build_version=標準Docletバージョン{0}
+doclet.Contents=コンテンツ
+doclet.Overview=概要
+doclet.Window_Overview_Summary=概要
+doclet.Element=要素
+doclet.Package=パッケージ
+doclet.Unnamed_Package=名前のないパッケージ
+doclet.Module=モジュール
+doclet.Open_Module=モジュールを開く
+doclet.All_Packages=すべてのパッケージ
+doclet.All_Modules=すべてのモジュール
+doclet.None=なし
+doclet.Tree=階層ツリー
+doclet.Class_Hierarchy=クラス階層
+doclet.Window_Class_Hierarchy=クラス階層
+doclet.Interface_Hierarchy=インタフェース階層
+doclet.Enum_Hierarchy=列挙型階層
+doclet.Enum_Class_Hierarchy=列挙クラス階層
+doclet.Record_Class_Hierarchy=レコード・クラス階層
+doclet.Annotation_Type_Hierarchy=注釈型階層
+doclet.Annotation_Interface_Hierarchy=注釈インタフェース階層
+doclet.Href_Class_Title={0}内のクラス
+doclet.Href_Interface_Title={0}内のインタフェース
+doclet.Href_Annotation_Title={0}内の注釈
+doclet.Href_Annotation_Interface_Title={0}内の注釈インタフェース
+doclet.Href_Enum_Title={0}内の列挙型
+doclet.Href_Enum_Class_Title={0}の列挙クラス
+doclet.Href_Type_Param_Title={0}内の型パラメータ
+doclet.Href_Class_Or_Interface_Title={0}内のクラスまたはインタフェース
+doclet.Summary=概要:
+doclet.Detail=詳細:
+doclet.Module_Sub_Nav=モジュール:
+doclet.Help_Sub_Nav=ヘルプ:
+doclet.Package_Sub_Nav=パッケージ:
+doclet.navClassesAndInterfaces=クラスとインタフェース
+doclet.navDescription=説明
+doclet.navModules=モジュール
+doclet.navPackages=パッケージ
+doclet.navServices=サービス
+doclet.navNested=ネスト
+doclet.navAnnotationTypeOptionalMember=オプション
+doclet.navAnnotationTypeRequiredMember=必須
+doclet.navAnnotationTypeMember=要素
+doclet.navField=フィールド
+doclet.navProperty=プロパティ
+doclet.navEnum=列挙定数
+doclet.navConstructor=コンストラクタ
+doclet.navMethod=メソッド
+doclet.navNavigation=ナビゲーション
+doclet.navPages=ページ
+doclet.not.exhaustive=(網羅的でない)
+doclet.Index=索引
+doclet.Window_Single_Index=索引
+doclet.Window_Split_Index={0}の索引
+doclet.Help=ヘルプ
+doclet.Skip_navigation_links=ナビゲーション・リンクをスキップ
+doclet.Toggle_navigation_links=ナビゲーション・リンクの切替え
+doclet.Navigation=ナビゲーション
+doclet.navDeprecated=非推奨
+doclet.Window_Deprecated_List=非推奨APIのリスト
+doclet.Window_New_List=新規APIリスト
+doclet.Window_Preview_List=リストのプレビュー
+doclet.Overrides=オーバーライド:
+doclet.in_class=クラス内
+doclet.Element_in={0}の要素
+doclet.Enum_constant_in={0}の列挙型定数
+doclet.Static_variable_in={0}のstatic変数
+doclet.Variable_in={0}の変数
+doclet.Constructor_for={0}のコンストラクタ
+doclet.Record_component_in={0}のレコード・コンポーネント
+doclet.Static_method_in={0}のstaticメソッド
+doclet.Search_tag_in={0}の検索タグ
+doclet.Method_in={0}のメソッド
+doclet.module=モジュール
+doclet.package=パッケージ
+doclet.MalformedURL=不正なURL: {0}
+doclet.File_error=ファイル読込みエラー: {0}
+doclet.URL_error=URL取出しエラー: {0}
+doclet.Resource_error=リソース読取りエラー: {0}
+doclet.link.no_reference=参照が指定されていません
+doclet.link.see.no_label=参照ラベルがありません
+doclet.link.see.reference_invalid=無効な参照です
+doclet.link.see.reference_not_found=参照が見つかりません: {0}
+doclet.link.see.reference_not_accessible=参照にアクセスできません: {0}
+doclet.see.nested_link=タグ{0}: リンクがネストされています
+doclet.throws.reference_not_found=名前で例外タイプを見つけることができません
+doclet.throws.reference_bad_type=次の例外タイプではありません: {0}
+doclet.tag.invalid_usage=タグ{0}の使用方法が無効です
+doclet.tag.invalid_input=入力が無効です: ''{0}''
+doclet.tag.invalid=@{0}が無効です
+doclet.Deprecated_API=推奨されていないAPI
+doclet.Deprecated_API_Checkbox_Label=次で非推奨のAPIを表示:
+doclet.Deprecated_API_Checkbox_Other_Releases=その他
+doclet.Deprecated_Elements=推奨されていない{0}
+doclet.Deprecated_Elements_Release_Column_Header=次で非推奨
+doclet.Deprecated_In_Release={0}で非推奨
+doclet.New_API=新規API
+doclet.New_API_Checkbox_Label=次で追加されたAPIを表示:
+doclet.New_Elements=新規{0}
+doclet.New_Elements_Release_Column_Header=次で追加
+doclet.New_Label=新規
+doclet.Preview_API=プレビューAPI
+doclet.Preview_API_Checkbox_Label=次のプレビューAPIを表示:
 doclet.Preview_JEP_URL=https://openjdk.org/jeps/{0}
-doclet.Preview_Label=\u30D7\u30EC\u30D3\u30E5\u30FC
+doclet.Preview_Label=プレビュー
 doclet.Preview_Mark=PREVIEW
-doclet.Terminally_Deprecated=\u6700\u7D42\u7684\u306B\u975E\u63A8\u5968
-doclet.Terminally_Deprecated_Elements=\u6700\u7D42\u7684\u306B\u975E\u63A8\u5968\u306B\u306A\u3063\u305F\u8981\u7D20
-doclet.Terminally_Deprecated_In_Release={0}\u3067\u6700\u7D42\u7684\u306B\u975E\u63A8\u5968
-doclet.Annotation_Types=\u6CE8\u91C8\u578B
-doclet.Annotation_Interfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Annotation_Type_Members=\u6CE8\u91C8\u578B\u8981\u7D20
-doclet.Annotation_Interface_Members=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20
-doclet.annotation_types=\u6CE8\u91C8\u578B
-doclet.annotation_interfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.annotation_type_members=\u6CE8\u91C8\u578B\u8981\u7D20
-doclet.annotation_interface_members=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20
-doclet.Generated_Docs_Untitled=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8(\u30BF\u30A4\u30C8\u30EB\u306A\u3057)
-doclet.Other_Packages=\u305D\u306E\u4ED6\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Description=\u8AAC\u660E
-doclet.Specified_By=\u5B9A\u7FA9:
-doclet.in_interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5185
-doclet.Subclasses=\u76F4\u7CFB\u306E\u65E2\u77E5\u306E\u30B5\u30D6\u30AF\u30E9\u30B9:
-doclet.Subinterfaces=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8:
-doclet.Implementing_Classes=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8:
-doclet.Functional_Interface=\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Functional_Interface_Message=\u3053\u308C\u306F\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306A\u306E\u3067\u3001\u30E9\u30E0\u30C0\u5F0F\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u5272\u5F53\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3068\u3057\u3066\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-doclet.also=\u540C\u69D8\u306B
-doclet.Package_Hierarchies=\u30D1\u30C3\u30B1\u30FC\u30B8\u968E\u5C64:
-doclet.Hierarchy_For_Package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u968E\u5C64
-doclet.Hierarchy_For_All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64
-doclet.Hierarchy_For_Unnamed_Package=\u540D\u524D\u306E\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64
-doclet.No_Script_Message=\u30D6\u30E9\u30A6\u30B6\u306EJavaScript\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-doclet.Description_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
-doclet.Description_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
-doclet.No_Non_Deprecated_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B\u975E\u63A8\u5968\u4EE5\u5916\u306E\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Enclosing_Class=\u542B\u307E\u308C\u3066\u3044\u308B\u30AF\u30E9\u30B9:
-doclet.Enclosing_Interface=\u542B\u307E\u308C\u3066\u3044\u308B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
-doclet.Inheritance_Tree=\u7D99\u627F\u30C4\u30EA\u30FC
-doclet.ReferencedIn=\u53C2\u7167
-doclet.Section=\u30BB\u30AF\u30B7\u30E7\u30F3
-doclet.External_Specification=\u5916\u90E8\u4ED5\u69D8
-doclet.External_Specifications=\u5916\u90E8\u4ED5\u69D8
-doclet.External_Specifications.All_Specifications=\u3059\u3079\u3066\u306E\u4ED5\u69D8
-doclet.External_Specifications.no-host=\u30ED\u30FC\u30AB\u30EB
-doclet.Specification=\u4ED5\u69D8
-doclet.System_Property=\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.systemProperties=\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.systemPropertiesSummary=\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30B5\u30DE\u30EA\u30FC
-doclet.Window_Source_title=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9
-doclet.Window_Help_title=API\u30D8\u30EB\u30D7
+doclet.Terminally_Deprecated=最終的に非推奨
+doclet.Terminally_Deprecated_Elements=最終的に非推奨になった要素
+doclet.Terminally_Deprecated_In_Release={0}で最終的に非推奨
+doclet.Annotation_Types=注釈型
+doclet.Annotation_Interfaces=注釈インタフェース
+doclet.Annotation_Type_Members=注釈型要素
+doclet.Annotation_Interface_Members=注釈インタフェース要素
+doclet.annotation_types=注釈型
+doclet.annotation_interfaces=注釈インタフェース
+doclet.annotation_type_members=注釈型要素
+doclet.annotation_interface_members=注釈インタフェース要素
+doclet.Generated_Docs_Untitled=生成されたドキュメント(タイトルなし)
+doclet.Other_Packages=その他のパッケージ
+doclet.Description=説明
+doclet.Specified_By=定義:
+doclet.in_interface=インタフェース内
+doclet.Subclasses=直系の既知のサブクラス:
+doclet.Subinterfaces=既知のサブインタフェースのリスト:
+doclet.Implementing_Classes=既知の実装クラスのリスト:
+doclet.Functional_Interface=機能インタフェース
+doclet.Functional_Interface_Message=これは機能インタフェースなので、ラムダ式またはメソッド参照の割当てターゲットとして使用できます。
+doclet.also=同様に
+doclet.Package_Hierarchies=パッケージ階層:
+doclet.Hierarchy_For_Package=パッケージ{0}の階層
+doclet.Hierarchy_For_All_Packages=すべてのパッケージの階層
+doclet.Hierarchy_For_Unnamed_Package=名前のないパッケージの階層
+doclet.No_Script_Message=ブラウザのJavaScriptが無効になっています。
+doclet.Description_From_Interface=インタフェースからコピーされた説明:
+doclet.Description_From_Class=クラスからコピーされた説明:
+doclet.No_Non_Deprecated_Classes_To_Document=ドキュメント化する非推奨以外のクラスが見つかりません。
+doclet.Interfaces=インタフェース
+doclet.Enclosing_Class=含まれているクラス:
+doclet.Enclosing_Interface=含まれているインタフェース:
+doclet.Inheritance_Tree=継承ツリー
+doclet.ReferencedIn=参照
+doclet.Section=セクション
+doclet.External_Specification=外部仕様
+doclet.External_Specifications=外部仕様
+doclet.External_Specifications.All_Specifications=すべての仕様
+doclet.External_Specifications.no-host=ローカル
+doclet.Specification=仕様
+doclet.System_Property=システム・プロパティ
+doclet.systemProperties=システム・プロパティ
+doclet.systemPropertiesSummary=システム・プロパティ・サマリー
+doclet.Window_Source_title=ソース・コード
+doclet.Window_Help_title=APIヘルプ
 # 0: number of references (> 1)
-doclet.references={0}\u306E\u53C2\u7167
-doclet.Window_Search_title=\u691C\u7D22
-doclet.search.main_heading=\u691C\u7D22
+doclet.references={0}の参照
+doclet.Window_Search_title=検索
+doclet.search.main_heading=検索
 
 # label for link/button element to show the information below
-doclet.search.show_more=\u305D\u306E\u4ED6\u306E\u30EA\u30BD\u30FC\u30B9
-doclet.search.help_page_link=\u30D8\u30EB\u30D7\u30FB\u30DA\u30FC\u30B8
+doclet.search.show_more=その他のリソース
+doclet.search.help_page_link=ヘルプ・ページ
 # 0: a link to the help page with text above
-doclet.search.help_page_info= {0}\u3067\u306F\u3001JavaDoc\u691C\u7D22\u306E\u7BC4\u56F2\u304A\u3088\u3073\u69CB\u6587\u306E\u6982\u8981\u306B\u3064\u3044\u3066\u8AAC\u660E\u3057\u307E\u3059\u3002
-doclet.search.keyboard_info= <ctrl>\u307E\u305F\u306F<cmd>\u30AD\u30FC\u3092\u5DE6\u53F3\u306E\u77E2\u5370\u30AD\u30FC\u3068\u7D44\u307F\u5408\u305B\u3066\u4F7F\u7528\u3059\u308B\u3068\u3001\u3053\u306E\u30DA\u30FC\u30B8\u306E\u7D50\u679C\u30BF\u30D6\u3092\u5207\u308A\u66FF\u3048\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
-doclet.search.browser_info= \u6B21\u306EURL\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306F\u3001\u3053\u306E\u6A5F\u80FD\u3092\u30B5\u30DD\u30FC\u30C8\u3059\u308B\u30D6\u30E9\u30A6\u30B6\u3067\u3053\u306E\u30DA\u30FC\u30B8\u3092\u691C\u7D22\u30A8\u30F3\u30B8\u30F3\u3068\u3057\u3066\u69CB\u6210\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002Google Chrome\u304A\u3088\u3073Mozilla Firefox\u3067\u52D5\u4F5C\u3059\u308B\u3053\u3068\u304C\u30C6\u30B9\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u4ED6\u306E\u30D6\u30E9\u30A6\u30B6\u3067\u306F\u3001\u3053\u306E\u6A5F\u80FD\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u5225\u306EURL\u5F62\u5F0F\u304C\u5FC5\u8981\u306B\u306A\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.search.redirect=\u6700\u521D\u306E\u7D50\u679C\u306B\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8
+doclet.search.help_page_info= {0}では、JavaDoc検索の範囲および構文の概要について説明します。
+doclet.search.keyboard_info= <ctrl>または<cmd>キーを左右の矢印キーと組み合せて使用すると、このページの結果タブを切り替えることができます。
+doclet.search.browser_info= 次のURLテンプレートは、この機能をサポートするブラウザでこのページを検索エンジンとして構成するために使用できます。Google ChromeおよびMozilla Firefoxで動作することがテストされています。他のブラウザでは、この機能がサポートされていないか、別のURL形式が必要になる場合があります。
+doclet.search.redirect=最初の結果にリダイレクト
 
 # 0: a date
-doclet.Option_date_out_of_range=''--date''\u306E\u5024\u304C\u7BC4\u56F2\u5916\u3067\u3059: {0}
+doclet.Option_date_out_of_range=''--date''の値が範囲外です: {0}
 
 # 0: a date
-doclet.Option_date_not_valid=''--date''\u306E\u5024\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0}
+doclet.Option_date_not_valid=''--date''の値が有効ではありません: {0}
 
-doclet.help.main_heading=JavaDoc\u30D8\u30EB\u30D7
-doclet.help.navigation.head=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
+doclet.help.main_heading=JavaDocヘルプ
+doclet.help.navigation.head=ナビゲーション
 # 0: link to the Overview page
-doclet.help.navigation.intro={0}\u30DA\u30FC\u30B8\u304B\u3089\u3001\u5404\u30DA\u30FC\u30B8\u304A\u3088\u3073\u5404\u30DA\u30FC\u30B8\u306E\u4E0A\u90E8\u306B\u3042\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u3067\u30EA\u30F3\u30AF\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3067\u304D\u307E\u3059\u3002
+doclet.help.navigation.intro={0}ページから、各ページおよび各ページの上部にあるナビゲーション・バーでリンクを使用しているドキュメントを参照できます。
 # 0: link to the Index;  1: short list of links
-doclet.help.navigation.index={0}\u304A\u3088\u3073\u691C\u7D22\u30DC\u30C3\u30AF\u30B9\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u6B21\u3092\u542B\u3081\u3001\u7279\u5B9A\u306E\u5BA3\u8A00\u304A\u3088\u3073\u6982\u8981\u30DA\u30FC\u30B8\u306B\u30CA\u30D3\u30B2\u30FC\u30C8\u3067\u304D\u307E\u3059: {1}
-doclet.help.page_kinds.head=\u30DA\u30FC\u30B8\u306E\u7A2E\u985E
-doclet.help.page_kinds.intro=\u6B21\u306E\u5404\u30BB\u30AF\u30B7\u30E7\u30F3\u3067\u306F\u3001\u3053\u306E\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u69D8\u3005\u306A\u7A2E\u985E\u306E\u30DA\u30FC\u30B8\u306B\u3064\u3044\u3066\u8AAC\u660E\u3057\u307E\u3059\u3002
+doclet.help.navigation.index={0}および検索ボックスを使用すると、次を含め、特定の宣言および概要ページにナビゲートできます: {1}
+doclet.help.page_kinds.head=ページの種類
+doclet.help.page_kinds.intro=次の各セクションでは、このコレクションの様々な種類のページについて説明します。
 # 0: link to the Overview page
-doclet.help.overview.modules.body={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30E2\u30B8\u30E5\uFF0D\u30EB\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+doclet.help.overview.modules.body={0}ページはAPIドキュメントのフロント・ページで、各モジュールの概要を含む全モジュ－ルのリストが表示されます。一連のモジュールの概要説明も表示されます。
 # 0: link to the Overview page
-doclet.help.overview.packages.body={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.help.package.intro=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F\u6B21\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059:
-doclet.help.module.intro=\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u3001\u305D\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u4ED6\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u5BFE\u3059\u308B\u4F9D\u5B58\u6027\u3001\u304A\u3088\u3073\u30B5\u30FC\u30D3\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F\u6B21\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059:
-doclet.help.class_interface.head=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.help.class_interface.intro=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u5BA3\u8A00\u304A\u3088\u3073\u8AAC\u660E\u3068\u3001\u30E1\u30F3\u30D0\u30FC\u306E\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304B\u3089\u69CB\u6210\u3055\u308C\u308B3\u3064\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u5404\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u30A8\u30F3\u30C8\u30EA\u304C\u7A7A\u304B\u9069\u7528\u3067\u304D\u306A\u3044\u5834\u5408\u306F\u7701\u7565\u3055\u308C\u307E\u3059\u3002
-doclet.help.class_interface.inheritance_diagram=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A
-doclet.help.class_interface.subclasses=\u76F4\u7CFB\u306E\u30B5\u30D6\u30AF\u30E9\u30B9
-doclet.help.class_interface.subinterfaces=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8
-doclet.help.class_interface.implementations=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8
-doclet.help.class_interface.declaration=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00
-doclet.help.class_interface.description=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
-doclet.help.class_interface.member_order=\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u304C\u3001\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
-doclet.help.class_interface.note=\u30CE\u30FC\u30C8:
-doclet.help.class_interface.anno=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u3001\u5FC5\u9808\u307E\u305F\u306F\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u8981\u7D20\u304C\u542B\u307E\u308C\u3066\u304A\u308A\u3001\u30E1\u30BD\u30C3\u30C9\u306F\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-doclet.help.class_interface.enum=\u5217\u6319\u30AF\u30E9\u30B9\u306E\u307F\u306B\u5217\u6319\u5B9A\u6570\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.help.class_interface.record=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u5BA3\u8A00\u306E\u4E00\u90E8\u3068\u3057\u3066\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.help.class_interface.property=\u30D7\u30ED\u30D1\u30C6\u30A3\u306FJavaFX\u306E\u6A5F\u80FD\u3067\u3059\u3002
-doclet.help.other_files.head=\u305D\u306E\u4ED6\u306E\u30D5\u30A1\u30A4\u30EB
-doclet.help.other_files.body=\u30D1\u30C3\u30B1\u30FC\u30B8\u304A\u3088\u3073\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u3001\u5468\u8FBA\u306E\u5BA3\u8A00\u306B\u95A2\u9023\u3059\u308B\u8FFD\u52A0\u60C5\u5831\u304C\u8A18\u8F09\u3055\u308C\u3066\u3044\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.help.use.head=\u4F7F\u7528
-doclet.help.use.body=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-doclet.help.tree.head=\u968E\u5C64\u30C4\u30EA\u30FC(\u30AF\u30E9\u30B9\u968E\u5C64)
+doclet.help.overview.packages.body={0}ページはAPIドキュメントのフロント・ページで、各パッケージの概要を含む全パッケージのリストが表示されます。一連のパッケージの概要説明も表示されます。
+doclet.help.package.intro=各パッケージには、そのパッケージのクラスおよびインタフェースのリストと、それぞれの概要を含むページがあります。これらのページは次のカテゴリで構成されます:
+doclet.help.module.intro=各モジュールには、そのモジュールのパッケージ、他のモジュールに対する依存性、およびサービスのリストと、それぞれの概要を含むページがあります。これらのページは次のカテゴリで構成されます:
+doclet.help.class_interface.head=クラスまたはインタフェース
+doclet.help.class_interface.intro=各クラス、インタフェース、ネストされたクラスおよびネストされたインタフェースには個別のページがあります。各ページには次のように、宣言および説明と、メンバーの概要表およびメンバーの詳細説明から構成される3つのセクションが含まれます。これらの各セクションのエントリが空か適用できない場合は省略されます。
+doclet.help.class_interface.inheritance_diagram=クラス階層表示
+doclet.help.class_interface.subclasses=直系のサブクラス
+doclet.help.class_interface.subinterfaces=既知のサブインタフェースのリスト
+doclet.help.class_interface.implementations=既知の実装クラスのリスト
+doclet.help.class_interface.declaration=クラスまたはインタフェースの宣言
+doclet.help.class_interface.description=クラスまたはインタフェースの説明
+doclet.help.class_interface.member_order=詳細な説明はソース・コードに現れる順に並べられますが、概要エントリはアルファベット順に並べられます。これによって、プログラマが設定した論理的なグループ分けが保持されます。
+doclet.help.class_interface.note=ノート:
+doclet.help.class_interface.anno=注釈インタフェースには、必須またはオプションの要素が含まれており、メソッドは含まれていません。
+doclet.help.class_interface.enum=列挙クラスのみに列挙定数があります。
+doclet.help.class_interface.record=レコード・クラスのコンポーネントがレコード・クラスの宣言の一部として表示されます。
+doclet.help.class_interface.property=プロパティはJavaFXの機能です。
+doclet.help.other_files.head=その他のファイル
+doclet.help.other_files.body=パッケージおよびモジュールには、周辺の宣言に関連する追加情報が記載されているページが含まれている場合があります。
+doclet.help.use.head=使用
+doclet.help.use.body=各ドキュメント化されたパッケージ、クラスおよびインタフェースにはそれぞれ「使用」ページがあります。このページには、どのようなパッケージ、クラス、メソッド、コンストラクタおよびフィールドが、特定のクラスまたはパッケージの一部を使用しているかが記述されています。たとえば、クラスAまたはインタフェースAの場合、その「使用」ページには、Aのサブクラス、Aとして宣言されるフィールド、Aを返すメソッドと、型Aのパラメータを持つメソッドおよびコンストラクタが含まれます。このページにアクセスするには、まずそのパッケージ、クラスまたはインタフェースに移動し、ナビゲーション・バーの「使用」リンクをクリックしてください。
+doclet.help.tree.head=階層ツリー(クラス階層)
 # 0: link to main Class Hierarchy page;  1: java.lang.Object
-doclet.help.tree.intro=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F{0}\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u3055\u3089\u306B\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u968E\u5C64\u30DA\u30FC\u30B8\u306F\u3001\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3092\u542B\u307F\u307E\u3059\u3002\u30AF\u30E9\u30B9\u306F{1}\u3092\u958B\u59CB\u70B9\u3068\u3059\u308B\u7D99\u627F\u69CB\u9020\u3067\u7DE8\u6210\u3055\u308C\u307E\u3059\u3002\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u3001{1}\u304B\u3089\u306F\u7D99\u627F\u3057\u307E\u305B\u3093\u3002
-doclet.help.tree.overview=\u6982\u8981\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.help.tree.package=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u8A72\u5F53\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u307F\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+doclet.help.tree.intro=すべてのパッケージには{0}ページがあり、さらに各パッケージの階層があります。各階層ページは、クラスのリストとインタフェースのリストを含みます。クラスは{1}を開始点とする継承構造で編成されます。インタフェースは、{1}からは継承しません。
+doclet.help.tree.overview=概要ページを表示しているときに「階層ツリー」をクリックすると、全パッケージの階層が表示されます。
+doclet.help.tree.package=特定のパッケージ、クラスまたはインタフェースのページを表示しているときに「階層ツリー」をクリックすると、該当するパッケージのみの階層が表示されます。
 # 0: link to the Deprecated summary page
-doclet.help.deprecated.body={0}\u30DA\u30FC\u30B8\u306F\u3001\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u3059\u3079\u3066\u306EAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u975E\u63A8\u5968API\u3068\u306F\u3001\u6A5F\u80FD\u304C\u4E0D\u5341\u5206\u3067\u3042\u308B\u3068\u3044\u3063\u305F\u7406\u7531\u304B\u3089\u4F7F\u7528\u3092\u304A\u85A6\u3081\u3067\u304D\u306A\u304F\u306A\u3063\u305FAPI\u306E\u3053\u3068\u3067\u3001\u901A\u5E38\u306F\u305D\u308C\u306B\u4EE3\u308F\u308BAPI\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002\u975E\u63A8\u5968API\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.help.deprecated.body={0}ページは、推奨されていないすべてのAPIのリストを表示します。非推奨APIとは、機能が不十分であるといった理由から使用をお薦めできなくなったAPIのことで、通常はそれに代わるAPIが提供されます。非推奨APIは今後の実装で削除される可能性があります。
 # 0: link to the Preview summary page
-doclet.help.preview.body={0}\u30DA\u30FC\u30B8\u306F\u3001\u3059\u3079\u3066\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.help.new.body={0}\u30DA\u30FC\u30B8\u306F\u3001\u6700\u8FD1\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u8FFD\u52A0\u3055\u308C\u305FAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002
-doclet.help.index.head=\u7D22\u5F15
+doclet.help.preview.body={0}ページは、すべてのプレビューAPIのリストを表示します。プレビューAPIは今後の実装で削除される可能性があります。
+doclet.help.new.body={0}ページは、最近のリリースで追加されたAPIのリストを表示します。
+doclet.help.index.head=索引
 # 0: link to Index page;  1: list of links to pages
-doclet.help.index.body={0}\u306B\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3001\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u7D22\u5F15\u3068\u3001{1}\u306A\u3069\u306E\u6982\u8981\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-doclet.help.all_classes.head=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+doclet.help.index.body={0}には、ドキュメント内のすべてのクラス、インタフェース、コンストラクタ、メソッドおよびフィールドのアルファベット順の索引と、{1}などの概要ページが含まれます。
+doclet.help.all_classes.head=すべてのクラスおよびインタフェース
 # 0: link to All Classes page
-doclet.help.all_classes.body={0}\u306B\u306F\u3001\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u5217\u6319\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306A\u3069\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u542B\u307E\u308C\u308B\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u7D22\u5F15\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-doclet.help.all_packages.head=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
+doclet.help.all_classes.body={0}には、注釈インタフェース、列挙クラスおよびレコード・クラスなど、ドキュメントに含まれるすべてのクラスおよびインタフェースのアルファベット順の索引が含まれます。
+doclet.help.all_packages.head=すべてのパッケージ
 # 0: link to All Packages page
-doclet.help.all_packages.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u542B\u307E\u308C\u308B\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u7D22\u5F15\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-doclet.help.serial_form.body=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u306E\u3067\u306F\u306A\u304F\u3001\u5B9F\u88C5\u3059\u308B\u30E6\u30FC\u30B6\u30FC\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002
+doclet.help.all_packages.body={0}ページには、ドキュメントに含まれるすべてのパッケージのアルファベット順の索引が含まれます。
+doclet.help.serial_form.body=直列化可能または外部化可能な各クラスは、直列化フィールドとメソッドの説明を含みます。この情報は、APIを使用するのではなく、実装するユーザーに役立ちます。ナビゲーション・バーにリンクがない場合、直列化されたクラスに移動して、クラス記述の「関連項目」セクションにある「直列化された形式」をクリックすることにより、この情報を表示できます。
 # 0: link to Constant Values page
-doclet.help.constants.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.help.constants.body={0}ページには、static finalフィールドとその値のリストがあります。
 # 0: link to System Properties page
-doclet.help.systemProperties.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3078\u306E\u53C2\u7167\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.help.systemProperties.body={0}ページには、システム・プロパティへの参照のリストがあります。
 # 0: link to External Specifications page
-doclet.help.externalSpecifications.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001\u5916\u90E8\u4ED5\u69D8\u3078\u306E\u53C2\u7167\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.help.footnote=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u306B\u3088\u3063\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002
-doclet.help.enum.intro=\u5404\u5217\u6319\u30AF\u30E9\u30B9\u306B\u306F\u3001\u305D\u308C\u305E\u308C\u306B\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059:
-doclet.help.enum.class.intro=\u5404\u5217\u6319\u30AF\u30E9\u30B9\u306B\u306F\u3001\u305D\u308C\u305E\u308C\u306B\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059:
-doclet.help.annotation_type.intro=\u5404\u6CE8\u91C8\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
-doclet.help.annotation_interface.intro=\u5404\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u3001\u305D\u308C\u305E\u308C\u306B\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059:
-doclet.help.annotation_type.declaration=\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00
-doclet.help.annotation_interface.declaration=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00
-doclet.help.annotation_type.description=\u6CE8\u91C8\u578B\u306E\u8AAC\u660E
-doclet.help.annotation_interface.description=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
-doclet.help.search.head=\u691C\u7D22
+doclet.help.externalSpecifications.body={0}ページには、外部仕様への参照のリストがあります。
+doclet.help.footnote=このヘルプ・ファイルは、標準docletによって生成されたAPIドキュメントに適用されます。
+doclet.help.enum.intro=各列挙クラスには、それぞれに個別のページがあり、次のセクションが含まれます:
+doclet.help.enum.class.intro=各列挙クラスには、それぞれに個別のページがあり、次のセクションが含まれます:
+doclet.help.annotation_type.intro=各注釈型には、それ自身の個別のページと次のセクションがあります:
+doclet.help.annotation_interface.intro=各注釈インタフェースには、それぞれに個別のページがあり、次のセクションが含まれます:
+doclet.help.annotation_type.declaration=注釈型の宣言
+doclet.help.annotation_interface.declaration=注釈インタフェースの宣言
+doclet.help.annotation_type.description=注釈型の説明
+doclet.help.annotation_interface.description=注釈インタフェースの説明
+doclet.help.search.head=検索
 # Introduction to Javadoc search features, followed by a list of examples
-doclet.help.search.intro=\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30BF\u30A4\u30D7\u3001\u30D5\u30A3\u30FC\u30EB\u30C9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5B9A\u7FA9\u304A\u3088\u3073API\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u305D\u306E\u4ED6\u306E\u8A9E\u3092\u691C\u7D22\u3067\u304D\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30A2\u30A4\u30C6\u30E0\u306F\u3001\u540D\u524D\u306E\u4E00\u90E8\u307E\u305F\u306F\u5168\u4F53\u3092\u4F7F\u7528\u3057\u3066(\u5FC5\u8981\u306B\u5FDC\u3058\u3066camelCase\u306E\u7701\u7565\u5F62\u3092\u4F7F\u7528\u3057\u3066)\u3001\u307E\u305F\u306F\u8907\u6570\u306E\u691C\u7D22\u8A9E\u3092\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3063\u3066\u691C\u7D22\u3067\u304D\u307E\u3059\u3002\u4F8B\u3092\u3044\u304F\u3064\u304B\u793A\u3057\u307E\u3059:
+doclet.help.search.intro=モジュール、パッケージ、タイプ、フィールド、メソッド、システム・プロパティの定義およびAPIで定義されているその他の語を検索できます。これらのアイテムは、名前の一部または全体を使用して(必要に応じてcamelCaseの省略形を使用して)、または複数の検索語をスペースで区切って検索できます。例をいくつか示します:
 # Used to list search examples, {0} is a search term and {1} the matching result
-doclet.help.search.example={0}\u306F{1}\u306B\u4E00\u81F4\u3057\u307E\u3059
+doclet.help.search.example={0}は{1}に一致します
 # {0} contains a link to the current Javadoc Search Specification
-doclet.help.search.refer=\u691C\u7D22\u6A5F\u80FD\u306E\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u3001{0}\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+doclet.help.search.refer=検索機能の詳細な説明は、{0}を参照してください。
 # The URL for the Javadoc Search Specification. {0} will be replaced by the JDK version number
 doclet.help.search.spec.url=https://docs.oracle.com/en/java/javase/{0}/docs/specs/javadoc/javadoc-search-spec.html
 # The title for the Javadoc Search Specification
-doclet.help.search.spec.title=Javadoc\u691C\u7D22\u4ED5\u69D8
-
-doclet.ClassUse_Packages.that.use.0={0}\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.ClassUse_Uses.of.0.in.1={1}\u3067\u306E{0}\u306E\u4F7F\u7528
-doclet.ClassUse_Classes.in.0.used.by.1={1}\u306B\u3088\u308A\u4F7F\u7528\u3055\u308C\u308B{0}\u306E\u30AF\u30E9\u30B9
-doclet.ClassUse_PackageAnnotation={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.ClassUse_Annotation={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_TypeParameter={0}\u578B\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30AF\u30E9\u30B9
-doclet.ClassUse_MethodTypeParameter={0}\u578B\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_FieldTypeParameter={0}\u578B\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.ClassUse_FieldAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.ClassUse_MethodAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_MethodParameterAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF
-doclet.ClassUse_MethodReturnTypeParameter={0}\u578B\u306E\u5F15\u6570\u3092\u6301\u3064\u578B\u3092\u8FD4\u3059{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_Subclass={1}\u3067\u306E{0}\u306E\u30B5\u30D6\u30AF\u30E9\u30B9
-doclet.ClassUse_Subinterface={1}\u3067\u306E{0}\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.ClassUse_ImplementingClass={0}\u3092\u5B9F\u88C5\u3057\u3066\u3044\u308B{1}\u306E\u30AF\u30E9\u30B9
-doclet.ClassUse_Field={0}\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B{1}\u306E\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.ClassUse_MethodReturn={0}\u3092\u8FD4\u3059{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_MethodArgs={0}\u578B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_MethodArgsTypeParameters={0}\u578B\u306E\u578B\u5F15\u6570\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF
-doclet.ClassUse_MethodThrows={0}\u3092\u30B9\u30ED\u30FC\u3059\u308B{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_ConstructorAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.ClassUse_ConstructorParameterAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF
-doclet.ClassUse_ConstructorArgs={0}\u578B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.ClassUse_ConstructorArgsTypeParameters={0}\u578B\u306E\u578B\u5F15\u6570\u3092\u6301\u3064{1}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF
-doclet.ClassUse_ConstructorThrows={0}\u3092\u30B9\u30ED\u30FC\u3059\u308B{1}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.ClassUse_No.usage.of.0={0}\u306F\u3069\u3053\u304B\u3089\u3082\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-doclet.Window_ClassUse_Header={0} {1}\u306E\u4F7F\u7528
-doclet.ClassUse_Title={0}\u306E\u4F7F\u7528
-doclet.navClassUse=\u4F7F\u7528
-doclet.Error_in_grouplist=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u7121\u52B9\u3067\u3059: {0} {1}
-doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3001\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-doclet.Same_element_name_used=\u8981\u7D20\u540D\u307E\u305F\u306F\u30D1\u30BF\u30FC\u30F3\u304C2\u56DE\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-doclet.PreviewLeadingNote={0}\u306FJava\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3057\u307E\u3059\u3002
-doclet.Declared_Using_Preview={0}\u306F{1}\u3001Java\u8A00\u8A9E\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD({2})\u3092\u4F7F\u7528\u3057\u3066\u5BA3\u8A00\u3055\u308C\u307E\u3059\u3002
-doclet.PreviewAPI={0}\u306F1\u3064\u4EE5\u4E0A\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059:  {1}\u3002
-doclet.ReflectivePreviewAPI={0}\u306F1\u3064\u4EE5\u4E0A\u306E\u30EA\u30D5\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059:  {1}\u3002
-doclet.UsesDeclaredUsingPreview={0}\u306F\u3001Java\u8A00\u8A9E\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30011\u3064\u4EE5\u4E0A\u306E\u30BF\u30A4\u30D7\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: {1}\u3002
-doclet.PreviewTrailingNote1=\u30D7\u30ED\u30B0\u30E9\u30E0\u306F\u3001\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u306B\u306E\u307F{0}\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-doclet.PreviewTrailingNote2=\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306F\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u304B\u3001Java\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u6C38\u7D9A\u7684\u306A\u6A5F\u80FD\u306B\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.Declared_Using_Preview.SEALED=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9
-doclet.Declared_Using_Preview.SEALED_PERMITS=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9
-doclet.PreviewPlatformLeadingNote={0}\u306FJava\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3059\u3002
-doclet.ReflectivePreviewPlatformLeadingNote={0}\u306FJava\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30EA\u30D5\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3059\u3002
+doclet.help.search.spec.title=Javadoc検索仕様
+
+doclet.ClassUse_Packages.that.use.0={0}を使用しているパッケージ
+doclet.ClassUse_Uses.of.0.in.1={1}での{0}の使用
+doclet.ClassUse_Classes.in.0.used.by.1={1}により使用される{0}のクラス
+doclet.ClassUse_PackageAnnotation={0}型の注釈を持つパッケージ
+doclet.ClassUse_Annotation={0}型の注釈を持つ{1}のメソッド
+doclet.ClassUse_TypeParameter={0}型の型パラメータを持つ{1}のクラス
+doclet.ClassUse_MethodTypeParameter={0}型の型パラメータを持つ{1}のメソッド
+doclet.ClassUse_FieldTypeParameter={0}型の型パラメータを持つ{1}のフィールド
+doclet.ClassUse_FieldAnnotations={0}型の注釈を持つ{1}のフィールド
+doclet.ClassUse_MethodAnnotations={0}型の注釈を持つ{1}のメソッド
+doclet.ClassUse_MethodParameterAnnotations={0}型の注釈を持つ{1}のメソッド・パラメータ
+doclet.ClassUse_MethodReturnTypeParameter={0}型の引数を持つ型を返す{1}のメソッド
+doclet.ClassUse_Subclass={1}での{0}のサブクラス
+doclet.ClassUse_Subinterface={1}での{0}のサブインタフェース
+doclet.ClassUse_ImplementingClass={0}を実装している{1}のクラス
+doclet.ClassUse_Field={0}として宣言されている{1}のフィールド
+doclet.ClassUse_MethodReturn={0}を返す{1}のメソッド
+doclet.ClassUse_MethodArgs={0}型のパラメータを持つ{1}のメソッド
+doclet.ClassUse_MethodArgsTypeParameters={0}型の型引数を持つ{1}のメソッド・パラメータ
+doclet.ClassUse_MethodThrows={0}をスローする{1}のメソッド
+doclet.ClassUse_ConstructorAnnotations={0}型の注釈を持つ{1}のコンストラクタ
+doclet.ClassUse_ConstructorParameterAnnotations={0}型の注釈を持つ{1}のコンストラクタ・パラメータ
+doclet.ClassUse_ConstructorArgs={0}型のパラメータを持つ{1}のコンストラクタ
+doclet.ClassUse_ConstructorArgsTypeParameters={0}型の型引数を持つ{1}のコンストラクタ・パラメータ
+doclet.ClassUse_ConstructorThrows={0}をスローする{1}のコンストラクタ
+doclet.ClassUse_No.usage.of.0={0}はどこからも使用されていません
+doclet.Window_ClassUse_Header={0} {1}の使用
+doclet.ClassUse_Title={0}の使用
+doclet.navClassUse=使用
+doclet.Error_in_grouplist=-groupオプションが無効です: {0} {1}
+doclet.Groupname_already_used=-groupオプションで、グループ名がすでに使用されています: {0}
+doclet.Same_element_name_used=要素名またはパターンが2回使用されています: {0}
+doclet.PreviewLeadingNote={0}はJavaプラットフォームのプレビュー機能に依存します。
+doclet.Declared_Using_Preview={0}は{1}、Java言語のプレビュー機能({2})を使用して宣言されます。
+doclet.PreviewAPI={0}は1つ以上のプレビューAPIを参照しています:  {1}。
+doclet.ReflectivePreviewAPI={0}は1つ以上のリフレクティブ・プレビューAPIを参照しています:  {1}。
+doclet.UsesDeclaredUsingPreview={0}は、Java言語のプレビュー機能を使用して宣言されている、1つ以上のタイプを参照しています: {1}。
+doclet.PreviewTrailingNote1=プログラムは、プレビュー機能が有効になっている場合にのみ{0}を使用できます。
+doclet.PreviewTrailingNote2=プレビュー機能は将来のリリースで削除されるか、Javaプラットフォームの永続的な機能にアップグレードされる可能性があります。
+doclet.Declared_Using_Preview.SEALED=シール・クラス
+doclet.Declared_Using_Preview.SEALED_PERMITS=シール・クラス
+doclet.PreviewPlatformLeadingNote={0}はJavaプラットフォームのプレビューAPIです。
+doclet.ReflectivePreviewPlatformLeadingNote={0}はJavaプラットフォームのリフレクティブ・プレビューAPIです。
 
 # 0: an exception
-doclet.Error_copying_legal_notices=\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u30B3\u30D4\u30FC\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}
+doclet.Error_copying_legal_notices=法律上の注意点のコピー中にエラーが発生しました: {0}
 # 0: the path; 1: the detail message for the exception
-doclet.Error_invalid_path_for_legal_notices=\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u30D1\u30B9''{0}''\u304C\u7121\u52B9\u3067\u3059: {1}
+doclet.Error_invalid_path_for_legal_notices=法律上の注意点のパス''{0}''が無効です: {1}
 
 # 0: URL; 1: an integer
-doclet.extSpec.spec.has.multiple.titles=\u5916\u90E8\u4ED5\u69D8({0})\u306E@spec\u30BF\u30B0\u306B\u3001{1}\u306E\u7570\u306A\u308B\u30BF\u30A4\u30C8\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
+doclet.extSpec.spec.has.multiple.titles=外部仕様({0})の@specタグに、{1}の異なるタイトルが指定されています
 
 # 0: name; 1: an integer
-doclet.extSpec.title.for.multiple.specs=@spec\u30BF\u30B0\u3067\u3001{1}\u306E\u7570\u306A\u308B\u5916\u90E8\u4ED5\u69D8\u306B\u30BF\u30A4\u30C8\u30EB"{0}"\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
+doclet.extSpec.title.for.multiple.specs=@specタグで、{1}の異なる外部仕様にタイトル"{0}"が使用されています
 
 # 0: name; 1: url
-doclet.extSpec.title.url=\u30BF\u30A4\u30C8\u30EB: "{0}"\u3001URL: {1}
+doclet.extSpec.title.url=タイトル: "{0}"、URL: {1}
 
 # 0: url; 1: name
-doclet.extSpec.url.title=URL: {0}\u3001\u30BF\u30A4\u30C8\u30EB: "{1}"
+doclet.extSpec.url.title=URL: {0}、タイトル: "{1}"
 
 # option specifiers
 doclet.usage.add-script.parameters=<file>
-doclet.usage.add-script.description=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u30B9\u30AF\u30EA\u30D7\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\u3057\u307E\u3059
+doclet.usage.add-script.description=生成されたドキュメントにスクリプト・ファイルを追加します
 doclet.usage.add-stylesheet.parameters=<file>
-doclet.usage.add-stylesheet.description=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\u3057\u307E\u3059
+doclet.usage.add-stylesheet.description=生成されたドキュメントにスタイルシート・ファイルを追加します
 doclet.usage.d.parameters=<directory>
-doclet.usage.d.description=\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
+doclet.usage.d.description=出力ファイルの転送先ディレクトリ
 
-doclet.usage.use.description=\u30AF\u30E9\u30B9\u3068\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F7F\u7528\u30DA\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u307E\u3059
+doclet.usage.use.description=クラスとパッケージの使用ページを作成します
 
-doclet.usage.version.description=@version\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u307E\u3059
+doclet.usage.version.description=@versionパラグラフを含めます
 
-doclet.usage.author.description=@author\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u307E\u3059
+doclet.usage.author.description=@authorパラグラフを含めます
 
-doclet.usage.docfilessubdirs.description=doc-file\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u518D\u5E30\u7684\u306B\u30B3\u30D4\u30FC\u3057\u307E\u3059
+doclet.usage.docfilessubdirs.description=doc-fileサブディレクトリを再帰的にコピーします
 
-doclet.usage.splitindex.description=1\u5B57\u3054\u3068\u306B1\u30D5\u30A1\u30A4\u30EB\u306B\u7D22\u5F15\u3092\u5206\u5272\u3057\u307E\u3059
+doclet.usage.splitindex.description=1字ごとに1ファイルに索引を分割します
 
 doclet.usage.overview.parameters=<file>
-doclet.usage.overview.description=HTML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u6982\u8981\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u8AAD\u307F\u8FBC\u307F\u307E\u3059
+doclet.usage.overview.description=HTMLファイルから概要ドキュメントを読み込みます
 
 doclet.usage.windowtitle.parameters=<text>
-doclet.usage.windowtitle.description=\ \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u7528\u306E\u30D6\u30E9\u30A6\u30B6\u30FB\u30A6\u30A3\u30F3\u30C9\u30A6\u30FB\u30BF\u30A4\u30C8\u30EB
+doclet.usage.windowtitle.description=\ ドキュメント用のブラウザ・ウィンドウ・タイトル
 
 doclet.usage.date.parameters=<date-and-time>
-doclet.usage.date.description=\u751F\u6210\u3055\u308C\u305F\u30DA\u30FC\u30B8\u3078\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u4ED8\u4E0E\u306B\u4F7F\u7528\u3059\u308B\u5024\u3092\nISO 8601\u5F62\u5F0F\u3067\u6307\u5B9A\u3057\u307E\u3059
+doclet.usage.date.description=生成されたページへのタイムスタンプ付与に使用する値を\nISO 8601形式で指定します
 
 doclet.usage.doctitle.parameters=<html-code>
-doclet.usage.doctitle.description=\u6982\u8981\u30DA\u30FC\u30B8\u306B\u30BF\u30A4\u30C8\u30EB\u3092\u542B\u3081\u307E\u3059
+doclet.usage.doctitle.description=概要ページにタイトルを含めます
 
 doclet.usage.header.parameters=<html-code>
-doclet.usage.header.description=\u5404\u30DA\u30FC\u30B8\u306B\u30D8\u30C3\u30C0\u30FC\u30FB\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u307E\u3059
+doclet.usage.header.description=各ページにヘッダー・テキストを含めます
 
-doclet.usage.html5.description=HTML 5\u51FA\u529B\u3092\u751F\u6210\u3057\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u5FC5\u9808\u3067\u306F\u306A\u304F\u306A\u308A\u307E\u3057\u305F\u3002
+doclet.usage.html5.description=HTML 5出力を生成します。このオプションは必須ではなくなりました。
 
 doclet.usage.footer.parameters=<html-code>
-doclet.usage.footer.description=\u5404\u30DA\u30FC\u30B8\u306B\u30D5\u30C3\u30BF\u30FC\u30FB\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u307E\u3059
+doclet.usage.footer.description=各ページにフッター・テキストを含めます
 
 doclet.usage.top.parameters=<html-code>
-doclet.usage.top.description=\u5404\u30DA\u30FC\u30B8\u306B\u4E0A\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u307E\u3059
+doclet.usage.top.description=各ページに上部テキストを含めます
 
 doclet.usage.bottom.parameters=<html-code>
-doclet.usage.bottom.description=\u5404\u30DA\u30FC\u30B8\u306B\u4E0B\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u307E\u3059
+doclet.usage.bottom.description=各ページに下部テキストを含めます
 
 doclet.usage.link.parameters=<url>
-doclet.usage.link.description=<url>\u306Bjavadoc\u51FA\u529B\u3078\u306E\u30EA\u30F3\u30AF\u3092\u4F5C\u6210\u3057\u307E\u3059
+doclet.usage.link.description=<url>にjavadoc出力へのリンクを作成します
 
 doclet.usage.linkoffline.parameters=<url1> <url2>
-doclet.usage.linkoffline.description=<url2>\u306B\u3042\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u3066<url1>\u306Edocs\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059
+doclet.usage.linkoffline.description=<url2>にあるパッケージ・リストを使用して<url1>のdocsにリンクします
 
 # L10N: do not localize the option parameters: warn info
 doclet.usage.link-modularity-mismatch.parameters=(warn|info)
-doclet.usage.link-modularity-mismatch.description=\u8B66\u544A\u30E1\u30C3\u30BB\u30FC\u30B8\u307E\u305F\u306F\u60C5\u5831\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u542B\u3080\u4E0D\u6B63\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u6027\u306E\n\u5916\u90E8\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u5831\u544A\u3067\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u52D5\u4F5C\u306F\n\u8B66\u544A\u306E\u5831\u544A\u3067\u3059\u3002
+doclet.usage.link-modularity-mismatch.description=警告メッセージまたは情報メッセージを含む不正なモジュール性の\n外部ドキュメントの報告です。デフォルトの動作は\n警告の報告です。
 
 doclet.usage.link-platform-properties.parameters=<url>
-doclet.usage.link-platform-properties.description=<url>\u306B\u3042\u308B\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306EURL\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059
+doclet.usage.link-platform-properties.description=<url>にあるプロパティ・ファイルで宣言されているプラットフォーム・ドキュメントのURLにリンクします
 
 doclet.usage.excludedocfilessubdir.parameters=<name>,<name>,...
-doclet.usage.excludedocfilessubdir.description=\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u306Edoc-files\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u3059\u3079\u3066\u9664\u5916\u3057\u307E\u3059\u3002\n':'\u3082\u3001\u30BB\u30D1\u30EC\u30FC\u30BF\u3068\u3057\u3066\u5F15\u6570\u306E\u4EFB\u610F\u306E\u5834\u6240\u306B\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+doclet.usage.excludedocfilessubdir.description=指定された名前のdoc-filesサブディレクトリをすべて除外します。\n':'も、セパレータとして引数の任意の場所に使用できます。
 
 doclet.usage.group.parameters=<name> <g1>,<g2>...
-doclet.usage.group.description=\u6307\u5B9A\u3059\u308B\u8981\u7D20\u3092\u6982\u8981\u30DA\u30FC\u30B8\u306B\u304A\u3044\u3066\u30B0\u30EB\u30FC\u30D7\u5316\u3057\u307E\u3059\u3002\n':'\u3082\u3001\u30BB\u30D1\u30EC\u30FC\u30BF\u3068\u3057\u3066\u5F15\u6570\u306E\u4EFB\u610F\u306E\u5834\u6240\u306B\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+doclet.usage.group.description=指定する要素を概要ページにおいてグループ化します。\n':'も、セパレータとして引数の任意の場所に使用できます。
 
 doclet.usage.legal-notices.parameters='default' | 'none' | <directory>
-doclet.usage.legal-notices.description=\u751F\u6210\u3055\u308C\u305F\u51FA\u529B\u306E\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u3092\u5236\u5FA1\u3057\u307E\u3059
+doclet.usage.legal-notices.description=生成された出力の法律上の注意点を制御します
 
-doclet.usage.nocomment.description=\u8A18\u8FF0\u304A\u3088\u3073\u30BF\u30B0\u3092\u6291\u5236\u3057\u3066\u5BA3\u8A00\u306E\u307F\u3092\u751F\u6210\u3057\u307E\u3059
+doclet.usage.nocomment.description=記述およびタグを抑制して宣言のみを生成します
 
-doclet.usage.nodeprecated.description=@deprecated\u60C5\u5831\u3092\u9664\u5916\u3057\u307E\u3059
+doclet.usage.nodeprecated.description=@deprecated情報を除外します
 
 doclet.usage.noqualifier.parameters=<name1>,<name2>,...
-doclet.usage.noqualifier.description=\u51FA\u529B\u304B\u3089\u4FEE\u98FE\u5B50\u306E\u30EA\u30B9\u30C8\u3092\u9664\u5916\u3057\u307E\u3059\u3002\n':'\u3082\u3001\u30BB\u30D1\u30EC\u30FC\u30BF\u3068\u3057\u3066\u5F15\u6570\u306E\u4EFB\u610F\u306E\u5834\u6240\u306B\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+doclet.usage.noqualifier.description=出力から修飾子のリストを除外します。\n':'も、セパレータとして引数の任意の場所に使用できます。
 
-doclet.usage.nosince.description=@since\u60C5\u5831\u3092\u9664\u5916\u3057\u307E\u3059
+doclet.usage.nosince.description=@since情報を除外します
 
-doclet.usage.notimestamp.description=\u975E\u8868\u793A\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3092\u9664\u5916\u3057\u307E\u3059
+doclet.usage.notimestamp.description=非表示のタイムスタンプを除外します
 
-doclet.usage.nodeprecatedlist.description=\u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8\u3092\u751F\u6210\u3057\u307E\u305B\u3093
+doclet.usage.nodeprecatedlist.description=非推奨のリストを生成しません
 
-doclet.usage.no-module-directories.description=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u30E2\u30B8\u30E5\u30FC\u30EB\u56FA\u6709\n\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u30B0\u30EB\u30FC\u30D7\u5316\u3057\u307E\u305B\u3093
+doclet.usage.no-module-directories.description=モジュール・ドキュメントのファイルをモジュール固有\nディレクトリにグループ化しません
 
-doclet.usage.no-platform-links.description=\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3078\u306E\u30EA\u30F3\u30AF\u3092\u751F\u6210\u3057\u307E\u305B\u3093
+doclet.usage.no-platform-links.description=プラットフォーム・ドキュメントへのリンクを生成しません
 
-doclet.usage.notree.description=\u30AF\u30E9\u30B9\u968E\u5C64\u3092\u751F\u6210\u3057\u307E\u305B\u3093
+doclet.usage.notree.description=クラス階層を生成しません
 
-doclet.usage.noindex.description=\u7D22\u5F15\u3092\u751F\u6210\u3057\u307E\u305B\u3093
+doclet.usage.noindex.description=索引を生成しません
 
-doclet.usage.nohelp.description=\u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u3092\u751F\u6210\u3057\u307E\u305B\u3093
+doclet.usage.nohelp.description=ヘルプ・リンクを生成しません
 
-doclet.usage.nonavbar.description=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u3092\u751F\u6210\u3057\u307E\u305B\u3093
+doclet.usage.nonavbar.description=ナビゲーション・バーを生成しません
 
-doclet.usage.nooverview.description=\u6982\u8981\u30DA\u30FC\u30B8\u3092\u751F\u6210\u3057\u307E\u305B\u3093
+doclet.usage.nooverview.description=概要ページを生成しません
 
-doclet.usage.serialwarn.description=@serial\u30BF\u30B0\u306B\u95A2\u3059\u308B\u8B66\u544A\u3092\u751F\u6210\u3057\u307E\u305B\u3093
+doclet.usage.serialwarn.description=@serialタグに関する警告を生成しません
 
 doclet.usage.since.parameters=<release>(,<release>)*
-doclet.usage.since.description=\u6307\u5B9A\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u306E\u65B0\u898F\u304A\u3088\u3073\u975E\u63A8\u5968\u306EAPI\u3092\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u307E\u3059
+doclet.usage.since.description=指定されたリリースの新規および非推奨のAPIをドキュメント化します
 
 doclet.usage.since-label.parameters=<text>
-doclet.usage.since-label.description=\u300C\u65B0\u898FAPI\u300D\u30DA\u30FC\u30B8\u306E\u898B\u51FA\u3057\u3067\u4F7F\u7528\u3059\u308B\u30C6\u30AD\u30B9\u30C8\u3092\u6307\u5B9A\u3057\u307E\u3059
+doclet.usage.since-label.description=「新規API」ページの見出しで使用するテキストを指定します
 
 doclet.usage.tag.parameters=<name>:<locations>:<header>
-doclet.usage.tag.description=\u5358\u4E00\u306E\u5F15\u6570\u3092\u6301\u3064\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u3092\u6307\u5B9A\u3057\u307E\u3059
+doclet.usage.tag.description=単一の引数を持つカスタム・タグを指定します
 
-doclet.usage.taglet.description=\u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u5B8C\u5168\u4FEE\u98FE\u540D\u3092\u767B\u9332\u3057\u307E\u3059
+doclet.usage.taglet.description=タグレットの完全修飾名を登録します
 
-doclet.usage.tagletpath.description=\u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u30D1\u30B9
+doclet.usage.tagletpath.description=タグレットのパス
 
 doclet.usage.snippet-path.parameters=<path>
 
-doclet.usage.snippet-path.description=\u5916\u90E8\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D1\u30B9
+doclet.usage.snippet-path.description=外部スニペットのパス
 
 doclet.usage.charset.parameters=<charset>
-doclet.usage.charset.description=\u751F\u6210\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30AF\u30ED\u30B9\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306E\u6587\u5B57\u30BB\u30C3\u30C8
+doclet.usage.charset.description=生成されるドキュメントのクロスプラットフォームでの文字セット
 
-doclet.usage.javafx.description=JavaFX\u6A5F\u80FD\u3092\u6709\u52B9\u306B\u3057\u307E\u3059
+doclet.usage.javafx.description=JavaFX機能を有効にします
 
 doclet.usage.helpfile.parameters=<file>
-doclet.usage.helpfile.description=\u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u306E\u30EA\u30F3\u30AF\u5148\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3081\u307E\u3059
+doclet.usage.helpfile.description=ヘルプ・リンクのリンク先ファイルを含めます
 
-doclet.usage.linksource.description=HTML\u5F62\u5F0F\u3067\u30BD\u30FC\u30B9\u3092\u751F\u6210\u3057\u307E\u3059
+doclet.usage.linksource.description=HTML形式でソースを生成します
 
 doclet.usage.sourcetab.parameters=<tab length>
-doclet.usage.sourcetab.description=\u30BD\u30FC\u30B9\u5185\u306E\u30BF\u30D6\u306E\u7A7A\u767D\u6587\u5B57\u306E\u6570\u3092\u6307\u5B9A\u3057\u307E\u3059
+doclet.usage.sourcetab.description=ソース内のタブの空白文字の数を指定します
 
-doclet.usage.keywords.description=HTML\u306Emeta\u30BF\u30B0\u306B\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u60C5\u5831\u3092\u542B\u3081\u307E\u3059
+doclet.usage.keywords.description=HTMLのmetaタグに、パッケージ、クラスおよびメンバーの情報を含めます
 
 doclet.usage.main-stylesheet.parameters=<file>
-doclet.usage.main-stylesheet.description=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30B9\u30BF\u30A4\u30EB\u5909\u66F4\u7528\u30D5\u30A1\u30A4\u30EB
+doclet.usage.main-stylesheet.description=生成されたドキュメントのスタイル変更用ファイル
 
 doclet.usage.docencoding.parameters=<name>
-doclet.usage.docencoding.description=\u51FA\u529B\u306E\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u6307\u5B9A\u3057\u307E\u3059
+doclet.usage.docencoding.description=出力の文字エンコーディングを指定します
 
-doclet.usage.frames.description=\u751F\u6210\u3055\u308C\u305F\u51FA\u529B\u3067\u30D5\u30EC\u30FC\u30E0\u306E\u4F7F\u7528\u3092\u6709\u52B9\u306B\u3057\u307E\u3059
+doclet.usage.frames.description=生成された出力でフレームの使用を有効にします
 
-doclet.usage.no-frames.description=\u751F\u6210\u3055\u308C\u305F\u51FA\u529B\u3067\u30D5\u30EC\u30FC\u30E0\u306E\u4F7F\u7528\u3092\u7121\u52B9\u306B\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)
+doclet.usage.no-frames.description=生成された出力でフレームの使用を無効にします(デフォルト)
 
-doclet.usage.override-methods.parameters=(\u8A73\u7D30|\u8981\u7D04)
+doclet.usage.override-methods.parameters=(詳細|要約)
 
-doclet.usage.override-methods.description=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u3092\u8A73\u7D30\u307E\u305F\u306F\u8981\u7D04\u30BB\u30AF\u30B7\u30E7\u30F3\u3067\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u307E\u3059\u3002\n\u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u8A73\u7D30\u3067\u3059\u3002
+doclet.usage.override-methods.description=オーバーライドされたメソッドを詳細または要約セクションでドキュメント化します。\nデフォルトは詳細です。
 
-doclet.usage.allow-script-in-comments.description=\u30AA\u30D7\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30B3\u30E1\u30F3\u30C8\u3067JavaScript\u3092\u8A31\u53EF\u3057\u307E\u3059
+doclet.usage.allow-script-in-comments.description=オプションおよびコメントでJavaScriptを許可します
 
 doclet.usage.xdocrootparent.parameters=<url>
-doclet.usage.xdocrootparent.description=doc\u30B3\u30E1\u30F3\u30C8\u5185\u306E/..\u304C\u5F8C\u306B\u7D9A\u304F@docRoot\u306E\u3059\u3079\u3066\u3092<url>\u3067\u7F6E\u63DB\u3057\u307E\u3059
+doclet.usage.xdocrootparent.description=docコメント内の/..が後に続く@docRootのすべてを<url>で置換します
 
-doclet.usage.xdoclint.description=javadoc\u30B3\u30E1\u30F3\u30C8\u306E\u554F\u984C\u306B\u95A2\u3059\u308B\u63A8\u5968\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059
+doclet.usage.xdoclint.description=javadocコメントの問題に関する推奨チェックを有効にします
 
 doclet.usage.xdoclint-extended.parameters=(all|none|[-]<group>)
 # L10N: do not localize these words: all none accessibility html missing reference syntax
-doclet.usage.xdoclint-extended.description=javadoc\u30B3\u30E1\u30F3\u30C8\u306E\u554F\u984C\u306B\u95A2\u3059\u308B\u7279\u5B9A\u306E\u30C1\u30A7\u30C3\u30AF\u3092\n                                  \u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\n                                  \u3053\u3053\u3067\u3001<group>\u306Faccessibility\u3001html\u3001\nmissing\u3001reference\u307E\u305F\u306Fsyntax\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002
+doclet.usage.xdoclint-extended.description=javadocコメントの問題に関する特定のチェックを\n                                  有効または無効にします。\n                                  ここで、<group>はaccessibility、html、\nmissing、referenceまたはsyntaxのいずれかです。
 
 doclet.usage.xdoclint-package.parameters=([-]<packages>)
-doclet.usage.xdoclint-package.description=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002<packages>\u306F\n\u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306E\u30EA\u30B9\u30C8\u3067\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\n\u6307\u5B9A\u5B50\u306F\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4FEE\u98FE\u3055\u308C\u305F\u540D\u524D\u3001\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\n\u306E\u63A5\u982D\u8F9E\u306E\u5F8C\u306B.*\u3092\u6307\u5B9A(\u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u3059\u3079\u3066\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\n\u306B\u62E1\u5F35)\u3057\u305F\u3082\u306E\u3067\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306E\u524D\u306B-\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\n\u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u95A2\u3059\u308B\u30C1\u30A7\u30C3\u30AF\u3092\u7121\u52B9\u306B\u3067\u304D\u307E\u3059\u3002
+doclet.usage.xdoclint-package.description=特定のパッケージのチェックを有効または無効にします。<packages>は\nカンマで区切られたパッケージ指定子のリストです。パッケージ\n指定子は、パッケージの修飾された名前、またはパッケージ名\nの接頭辞の後に.*を指定(指定したパッケージのすべてのサブパッケージ\nに拡張)したものです。パッケージ指定子の前に-を指定すると、\n指定したパッケージに関するチェックを無効にできます。
 
 doclet.usage.spec-base-url=<URL>
-doclet.usage.spec-base-url.description=@spec\u30BF\u30B0\u306B\u3001\u76F8\u5BFEURL\u306E\u30D9\u30FC\u30B9URL\u3092\u6307\u5B9A\u3057\u307E\u3059
+doclet.usage.spec-base-url.description=@specタグに、相対URLのベースURLを指定します
 
-doclet.Invalid_URL=\u7121\u52B9\u306AURL: {0}
+doclet.Invalid_URL=無効なURL: {0}
 
 # L10N: do not localize the option name --no-frames
-doclet.NoFrames_specified=--no-frames\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u5FC5\u9808\u3067\u306F\u306A\u304F\u306A\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\n\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.NoFrames_specified=--no-framesオプションは必須ではなくなり、将来のリリースで\n削除される可能性があります。
 
 # L10N: do not localize the option name -footer
-doclet.footer_specified=-footer\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u304F\u306A\u3063\u305F\u305F\u3081\u3001\u7121\u8996\u3055\u308C\u307E\u3059\u3002\n\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.footer_specified=-footerオプションはサポートされなくなったため、無視されます。\n将来のリリースで削除される可能性があります。
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
index 19d8f9eaf8b..ccc6807a368 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
@@ -23,480 +23,480 @@
 # questions.
 #
 
-doclet.build_version=\u6807\u51C6 Doclet \u7248\u672C {0}
-doclet.Contents=\u76EE\u5F55
-doclet.Overview=\u6982\u89C8
-doclet.Window_Overview_Summary=\u6982\u89C8
-doclet.Element=\u5143\u7D20
-doclet.Package=\u7A0B\u5E8F\u5305
-doclet.Unnamed_Package=\u672A\u547D\u540D\u7A0B\u5E8F\u5305
-doclet.Module=\u6A21\u5757
-doclet.Open_Module=\u6253\u5F00\u6A21\u5757
-doclet.All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305
-doclet.All_Modules=\u5168\u90E8\u6A21\u5757
-doclet.None=\u65E0
-doclet.Tree=\u6811
-doclet.Class_Hierarchy=\u7C7B\u5206\u5C42\u7ED3\u6784
-doclet.Window_Class_Hierarchy=\u7C7B\u5206\u5C42\u7ED3\u6784
-doclet.Interface_Hierarchy=\u63A5\u53E3\u5206\u5C42\u7ED3\u6784
-doclet.Enum_Hierarchy=\u679A\u4E3E\u5206\u5C42\u7ED3\u6784
-doclet.Enum_Class_Hierarchy=\u679A\u4E3E\u7C7B\u5206\u5C42\u7ED3\u6784
-doclet.Record_Class_Hierarchy=\u8BB0\u5F55\u7C7B\u5206\u5C42\u7ED3\u6784
-doclet.Annotation_Type_Hierarchy=\u6279\u6CE8\u7C7B\u578B\u5206\u5C42\u7ED3\u6784
-doclet.Annotation_Interface_Hierarchy=\u6279\u6CE8\u63A5\u53E3\u5206\u5C42\u7ED3\u6784
-doclet.Href_Class_Title={0}\u4E2D\u7684\u7C7B
-doclet.Href_Interface_Title={0}\u4E2D\u7684\u63A5\u53E3
-doclet.Href_Annotation_Title={0}\u4E2D\u7684\u6279\u6CE8
-doclet.Href_Annotation_Interface_Title={0} \u4E2D\u7684\u6279\u6CE8\u63A5\u53E3
-doclet.Href_Enum_Title={0}\u4E2D\u7684\u679A\u4E3E
-doclet.Href_Enum_Class_Title={0} \u4E2D\u7684\u679A\u4E3E\u7C7B
-doclet.Href_Type_Param_Title={0}\u4E2D\u7684\u7C7B\u578B\u53C2\u6570
-doclet.Href_Class_Or_Interface_Title={0}\u4E2D\u7684\u7C7B\u6216\u63A5\u53E3
-doclet.Summary=\u6982\u8981:
-doclet.Detail=\u8BE6\u7EC6\u8D44\u6599:
-doclet.Module_Sub_Nav=\u6A21\u5757:
-doclet.Help_Sub_Nav=\u5E2E\u52A9\uFF1A
-doclet.Package_Sub_Nav=\u7A0B\u5E8F\u5305\uFF1A
-doclet.navClassesAndInterfaces=\u7C7B\u548C\u63A5\u53E3
-doclet.navDescription=\u8BF4\u660E
-doclet.navModules=\u6A21\u5757
-doclet.navPackages=\u7A0B\u5E8F\u5305
-doclet.navServices=\u670D\u52A1
-doclet.navNested=\u5D4C\u5957
-doclet.navAnnotationTypeOptionalMember=\u53EF\u9009
-doclet.navAnnotationTypeRequiredMember=\u5FC5\u9700
-doclet.navAnnotationTypeMember=\u5143\u7D20
-doclet.navField=\u5B57\u6BB5
-doclet.navProperty=\u5C5E\u6027
-doclet.navEnum=\u679A\u4E3E\u5E38\u91CF
-doclet.navConstructor=\u6784\u9020\u5668
-doclet.navMethod=\u65B9\u6CD5
-doclet.navNavigation=\u5BFC\u822A
-doclet.navPages=\u9875
-doclet.not.exhaustive=\uFF08\u975E\u8BE6\u5C3D\uFF09
-doclet.Index=\u7D22\u5F15
-doclet.Window_Single_Index=\u7D22\u5F15
-doclet.Window_Split_Index={0} - \u7D22\u5F15
-doclet.Help=\u5E2E\u52A9
-doclet.Skip_navigation_links=\u8DF3\u8FC7\u5BFC\u822A\u94FE\u63A5
-doclet.Toggle_navigation_links=\u5207\u6362\u5BFC\u822A\u94FE\u63A5
-doclet.Navigation=\u5BFC\u822A
-doclet.navDeprecated=\u5DF2\u8FC7\u65F6
-doclet.Window_Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868
-doclet.Window_New_List=\u65B0 API \u5217\u8868
-doclet.Window_Preview_List=\u9884\u89C8\u5217\u8868
-doclet.Overrides=\u8986\u76D6:
-doclet.in_class=\u5728\u7C7B\u4E2D
-doclet.Element_in={0} \u4E2D\u7684\u5143\u7D20
-doclet.Enum_constant_in={0} \u4E2D\u7684\u679A\u4E3E\u5E38\u91CF
-doclet.Static_variable_in={0}\u4E2D\u7684\u9759\u6001\u53D8\u91CF
-doclet.Variable_in={0}\u4E2D\u7684\u53D8\u91CF
-doclet.Constructor_for={0}\u7684\u6784\u9020\u5668
-doclet.Record_component_in={0} \u7684\u8BB0\u5F55\u7EC4\u4EF6
-doclet.Static_method_in={0}\u4E2D\u7684\u9759\u6001\u65B9\u6CD5
-doclet.Search_tag_in={0}\u4E2D\u7684\u641C\u7D22\u6807\u8BB0
-doclet.Method_in={0}\u4E2D\u7684\u65B9\u6CD5
-doclet.module=\u6A21\u5757
-doclet.package=\u7A0B\u5E8F\u5305
-doclet.MalformedURL=\u683C\u5F0F\u9519\u8BEF\u7684 URL: {0}
-doclet.File_error=\u8BFB\u53D6\u6587\u4EF6\u65F6\u51FA\u9519: {0}
-doclet.URL_error=\u83B7\u53D6 URL \u65F6\u51FA\u9519: {0}
-doclet.Resource_error=\u8BFB\u53D6\u8D44\u6E90\u65F6\u51FA\u9519\uFF1A{0}
-doclet.link.no_reference=\u672A\u63D0\u4F9B\u5F15\u7528
-doclet.link.see.no_label=\u7F3A\u5C11\u5F15\u7528\u6807\u7B7E
-doclet.link.see.reference_invalid=\u5F15\u7528\u65E0\u6548
-doclet.link.see.reference_not_found=\u672A\u627E\u5230\u5F15\u7528: {0}
-doclet.link.see.reference_not_accessible=\u65E0\u6CD5\u8BBF\u95EE\u5F15\u7528\uFF1A{0}
-doclet.see.nested_link=\u6807\u8BB0 {0}\uFF1A\u5D4C\u5957\u94FE\u63A5
-doclet.throws.reference_not_found=\u65E0\u6CD5\u6309\u540D\u79F0\u67E5\u627E\u5F02\u5E38\u9519\u8BEF\u7C7B\u578B
-doclet.throws.reference_bad_type=\u4E0D\u662F\u5F02\u5E38\u9519\u8BEF\u7C7B\u578B\uFF1A{0}
-doclet.tag.invalid_usage=\u6807\u8BB0 {0} \u7684\u7528\u6CD5\u65E0\u6548
-doclet.tag.invalid_input=\u65E0\u6548\u8F93\u5165\uFF1A''{0}''
-doclet.tag.invalid=@{0} \u65E0\u6548
-doclet.Deprecated_API=\u5DF2\u8FC7\u65F6\u7684 API
-doclet.Deprecated_API_Checkbox_Label=\u663E\u793A\u5728\u4EE5\u4E0B\u53D1\u884C\u7248\u4E2D\u5DF2\u8FC7\u65F6\u7684 API\uFF1A
-doclet.Deprecated_API_Checkbox_Other_Releases=\u5176\u4ED6
-doclet.Deprecated_Elements=\u5DF2\u8FC7\u65F6\u7684 {0}
-doclet.Deprecated_Elements_Release_Column_Header=\u5728\u4EE5\u4E0B\u53D1\u884C\u7248\u4E2D\u5DF2\u8FC7\u65F6
-doclet.Deprecated_In_Release=\u5728 {0} \u4E2D\u5DF2\u8FC7\u65F6
-doclet.New_API=\u65B0\u5EFA API
-doclet.New_API_Checkbox_Label=\u663E\u793A\u5728\u4EE5\u4E0B\u53D1\u884C\u7248\u4E2D\u6DFB\u52A0\u7684 API\uFF1A
-doclet.New_Elements=\u65B0\u5EFA {0}
-doclet.New_Elements_Release_Column_Header=\u5728\u4EE5\u4E0B\u53D1\u884C\u7248\u4E2D\u5DF2\u6DFB\u52A0
-doclet.New_Label=\u65B0\u5EFA
-doclet.Preview_API=\u9884\u89C8 API
-doclet.Preview_API_Checkbox_Label=\u663E\u793A\u9884\u89C8 API\uFF1A
+doclet.build_version=标准 Doclet 版本 {0}
+doclet.Contents=目录
+doclet.Overview=概览
+doclet.Window_Overview_Summary=概览
+doclet.Element=元素
+doclet.Package=程序包
+doclet.Unnamed_Package=未命名程序包
+doclet.Module=模块
+doclet.Open_Module=打开模块
+doclet.All_Packages=所有程序包
+doclet.All_Modules=全部模块
+doclet.None=无
+doclet.Tree=树
+doclet.Class_Hierarchy=类分层结构
+doclet.Window_Class_Hierarchy=类分层结构
+doclet.Interface_Hierarchy=接口分层结构
+doclet.Enum_Hierarchy=枚举分层结构
+doclet.Enum_Class_Hierarchy=枚举类分层结构
+doclet.Record_Class_Hierarchy=记录类分层结构
+doclet.Annotation_Type_Hierarchy=批注类型分层结构
+doclet.Annotation_Interface_Hierarchy=批注接口分层结构
+doclet.Href_Class_Title={0}中的类
+doclet.Href_Interface_Title={0}中的接口
+doclet.Href_Annotation_Title={0}中的批注
+doclet.Href_Annotation_Interface_Title={0} 中的批注接口
+doclet.Href_Enum_Title={0}中的枚举
+doclet.Href_Enum_Class_Title={0} 中的枚举类
+doclet.Href_Type_Param_Title={0}中的类型参数
+doclet.Href_Class_Or_Interface_Title={0}中的类或接口
+doclet.Summary=概要:
+doclet.Detail=详细资料:
+doclet.Module_Sub_Nav=模块:
+doclet.Help_Sub_Nav=帮助：
+doclet.Package_Sub_Nav=程序包：
+doclet.navClassesAndInterfaces=类和接口
+doclet.navDescription=说明
+doclet.navModules=模块
+doclet.navPackages=程序包
+doclet.navServices=服务
+doclet.navNested=嵌套
+doclet.navAnnotationTypeOptionalMember=可选
+doclet.navAnnotationTypeRequiredMember=必需
+doclet.navAnnotationTypeMember=元素
+doclet.navField=字段
+doclet.navProperty=属性
+doclet.navEnum=枚举常量
+doclet.navConstructor=构造器
+doclet.navMethod=方法
+doclet.navNavigation=导航
+doclet.navPages=页
+doclet.not.exhaustive=（非详尽）
+doclet.Index=索引
+doclet.Window_Single_Index=索引
+doclet.Window_Split_Index={0} - 索引
+doclet.Help=帮助
+doclet.Skip_navigation_links=跳过导航链接
+doclet.Toggle_navigation_links=切换导航链接
+doclet.Navigation=导航
+doclet.navDeprecated=已过时
+doclet.Window_Deprecated_List=已过时的列表
+doclet.Window_New_List=新 API 列表
+doclet.Window_Preview_List=预览列表
+doclet.Overrides=覆盖:
+doclet.in_class=在类中
+doclet.Element_in={0} 中的元素
+doclet.Enum_constant_in={0} 中的枚举常量
+doclet.Static_variable_in={0}中的静态变量
+doclet.Variable_in={0}中的变量
+doclet.Constructor_for={0}的构造器
+doclet.Record_component_in={0} 的记录组件
+doclet.Static_method_in={0}中的静态方法
+doclet.Search_tag_in={0}中的搜索标记
+doclet.Method_in={0}中的方法
+doclet.module=模块
+doclet.package=程序包
+doclet.MalformedURL=格式错误的 URL: {0}
+doclet.File_error=读取文件时出错: {0}
+doclet.URL_error=获取 URL 时出错: {0}
+doclet.Resource_error=读取资源时出错：{0}
+doclet.link.no_reference=未提供引用
+doclet.link.see.no_label=缺少引用标签
+doclet.link.see.reference_invalid=引用无效
+doclet.link.see.reference_not_found=未找到引用: {0}
+doclet.link.see.reference_not_accessible=无法访问引用：{0}
+doclet.see.nested_link=标记 {0}：嵌套链接
+doclet.throws.reference_not_found=无法按名称查找异常错误类型
+doclet.throws.reference_bad_type=不是异常错误类型：{0}
+doclet.tag.invalid_usage=标记 {0} 的用法无效
+doclet.tag.invalid_input=无效输入：''{0}''
+doclet.tag.invalid=@{0} 无效
+doclet.Deprecated_API=已过时的 API
+doclet.Deprecated_API_Checkbox_Label=显示在以下发行版中已过时的 API：
+doclet.Deprecated_API_Checkbox_Other_Releases=其他
+doclet.Deprecated_Elements=已过时的 {0}
+doclet.Deprecated_Elements_Release_Column_Header=在以下发行版中已过时
+doclet.Deprecated_In_Release=在 {0} 中已过时
+doclet.New_API=新建 API
+doclet.New_API_Checkbox_Label=显示在以下发行版中添加的 API：
+doclet.New_Elements=新建 {0}
+doclet.New_Elements_Release_Column_Header=在以下发行版中已添加
+doclet.New_Label=新建
+doclet.Preview_API=预览 API
+doclet.Preview_API_Checkbox_Label=显示预览 API：
 doclet.Preview_JEP_URL=https://openjdk.org/jeps/{0}
-doclet.Preview_Label=\u9884\u89C8
+doclet.Preview_Label=预览
 doclet.Preview_Mark=PREVIEW
-doclet.Terminally_Deprecated=\u6700\u7EC8\u5DF2\u8FC7\u65F6
-doclet.Terminally_Deprecated_Elements=\u6700\u7EC8\u5DF2\u8FC7\u65F6\u7684\u5143\u7D20
-doclet.Terminally_Deprecated_In_Release=\u6700\u7EC8\u5728 {0} \u4E2D\u5DF2\u8FC7\u65F6
-doclet.Annotation_Types=\u6279\u6CE8\u7C7B\u578B
-doclet.Annotation_Interfaces=\u6279\u6CE8\u63A5\u53E3
-doclet.Annotation_Type_Members=\u6279\u6CE8\u7C7B\u578B\u5143\u7D20
-doclet.Annotation_Interface_Members=\u6279\u6CE8\u63A5\u53E3\u5143\u7D20
-doclet.annotation_types=\u6279\u6CE8\u7C7B\u578B
-doclet.annotation_interfaces=\u6279\u6CE8\u63A5\u53E3
-doclet.annotation_type_members=\u6279\u6CE8\u7C7B\u578B\u5143\u7D20
-doclet.annotation_interface_members=\u6279\u6CE8\u63A5\u53E3\u5143\u7D20
-doclet.Generated_Docs_Untitled=\u751F\u6210\u7684\u6587\u6863 (\u65E0\u6807\u9898)
-doclet.Other_Packages=\u5176\u4ED6\u7A0B\u5E8F\u5305
-doclet.Description=\u8BF4\u660E
-doclet.Specified_By=\u6307\u5B9A\u8005:
-doclet.in_interface=\u5728\u63A5\u53E3\u4E2D
-doclet.Subclasses=\u76F4\u63A5\u5DF2\u77E5\u5B50\u7C7B:
-doclet.Subinterfaces=\u6240\u6709\u5DF2\u77E5\u5B50\u63A5\u53E3:
-doclet.Implementing_Classes=\u6240\u6709\u5DF2\u77E5\u5B9E\u73B0\u7C7B:
-doclet.Functional_Interface=\u51FD\u6570\u63A5\u53E3:
-doclet.Functional_Interface_Message=\u8FD9\u662F\u4E00\u4E2A\u51FD\u6570\u63A5\u53E3, \u56E0\u6B64\u53EF\u7528\u4F5C lambda \u8868\u8FBE\u5F0F\u6216\u65B9\u6CD5\u5F15\u7528\u7684\u8D4B\u503C\u76EE\u6807\u3002
-doclet.also=\u5E76
-doclet.Package_Hierarchies=\u7A0B\u5E8F\u5305\u5206\u5C42\u7ED3\u6784:
-doclet.Hierarchy_For_Package=\u7A0B\u5E8F\u5305{0}\u7684\u5206\u5C42\u7ED3\u6784
-doclet.Hierarchy_For_All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784
-doclet.Hierarchy_For_Unnamed_Package=\u672A\u547D\u540D\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784
-doclet.No_Script_Message=\u60A8\u7684\u6D4F\u89C8\u5668\u5DF2\u7981\u7528 JavaScript\u3002
-doclet.Description_From_Interface=\u4ECE\u63A5\u53E3\u590D\u5236\u7684\u8BF4\u660E:
-doclet.Description_From_Class=\u4ECE\u7C7B\u590D\u5236\u7684\u8BF4\u660E:
-doclet.No_Non_Deprecated_Classes_To_Document=\u627E\u4E0D\u5230\u53EF\u4EE5\u6587\u6863\u5316\u7684\u672A\u8FC7\u65F6\u7684\u7C7B\u3002
-doclet.Interfaces=\u63A5\u53E3
-doclet.Enclosing_Class=\u5C01\u95ED\u7C7B:
-doclet.Enclosing_Interface=\u5C01\u95ED\u63A5\u53E3:
-doclet.Inheritance_Tree=\u7EE7\u627F\u6811
-doclet.ReferencedIn=\u53C2\u8003\u4F4D\u7F6E
-doclet.Section=\u8282
-doclet.External_Specification=\u5916\u90E8\u89C4\u8303
-doclet.External_Specifications=\u5916\u90E8\u89C4\u8303
-doclet.External_Specifications.All_Specifications=\u6240\u6709\u89C4\u8303
-doclet.External_Specifications.no-host=\u672C\u5730
-doclet.Specification=\u89C4\u8303
-doclet.System_Property=\u7CFB\u7EDF\u5C5E\u6027
-doclet.systemProperties=\u7CFB\u7EDF\u5C5E\u6027
-doclet.systemPropertiesSummary=\u7CFB\u7EDF\u5C5E\u6027\u6982\u8981
-doclet.Window_Source_title=\u6E90\u4EE3\u7801
-doclet.Window_Help_title=API \u5E2E\u52A9
+doclet.Terminally_Deprecated=最终已过时
+doclet.Terminally_Deprecated_Elements=最终已过时的元素
+doclet.Terminally_Deprecated_In_Release=最终在 {0} 中已过时
+doclet.Annotation_Types=批注类型
+doclet.Annotation_Interfaces=批注接口
+doclet.Annotation_Type_Members=批注类型元素
+doclet.Annotation_Interface_Members=批注接口元素
+doclet.annotation_types=批注类型
+doclet.annotation_interfaces=批注接口
+doclet.annotation_type_members=批注类型元素
+doclet.annotation_interface_members=批注接口元素
+doclet.Generated_Docs_Untitled=生成的文档 (无标题)
+doclet.Other_Packages=其他程序包
+doclet.Description=说明
+doclet.Specified_By=指定者:
+doclet.in_interface=在接口中
+doclet.Subclasses=直接已知子类:
+doclet.Subinterfaces=所有已知子接口:
+doclet.Implementing_Classes=所有已知实现类:
+doclet.Functional_Interface=函数接口:
+doclet.Functional_Interface_Message=这是一个函数接口, 因此可用作 lambda 表达式或方法引用的赋值目标。
+doclet.also=并
+doclet.Package_Hierarchies=程序包分层结构:
+doclet.Hierarchy_For_Package=程序包{0}的分层结构
+doclet.Hierarchy_For_All_Packages=所有程序包的分层结构
+doclet.Hierarchy_For_Unnamed_Package=未命名程序包的分层结构
+doclet.No_Script_Message=您的浏览器已禁用 JavaScript。
+doclet.Description_From_Interface=从接口复制的说明:
+doclet.Description_From_Class=从类复制的说明:
+doclet.No_Non_Deprecated_Classes_To_Document=找不到可以文档化的未过时的类。
+doclet.Interfaces=接口
+doclet.Enclosing_Class=封闭类:
+doclet.Enclosing_Interface=封闭接口:
+doclet.Inheritance_Tree=继承树
+doclet.ReferencedIn=参考位置
+doclet.Section=节
+doclet.External_Specification=外部规范
+doclet.External_Specifications=外部规范
+doclet.External_Specifications.All_Specifications=所有规范
+doclet.External_Specifications.no-host=本地
+doclet.Specification=规范
+doclet.System_Property=系统属性
+doclet.systemProperties=系统属性
+doclet.systemPropertiesSummary=系统属性概要
+doclet.Window_Source_title=源代码
+doclet.Window_Help_title=API 帮助
 # 0: number of references (> 1)
-doclet.references={0} \u4E2A\u5F15\u7528
-doclet.Window_Search_title=\u641C\u7D22
-doclet.search.main_heading=\u641C\u7D22
+doclet.references={0} 个引用
+doclet.Window_Search_title=搜索
+doclet.search.main_heading=搜索
 
 # label for link/button element to show the information below
-doclet.search.show_more=\u5176\u4ED6\u8D44\u6E90
-doclet.search.help_page_link=\u5E2E\u52A9\u9875
+doclet.search.show_more=其他资源
+doclet.search.help_page_link=帮助页
 # 0: a link to the help page with text above
-doclet.search.help_page_info= {0} \u4ECB\u7ECD\u4E86 JavaDoc \u641C\u7D22\u7684\u8303\u56F4\u548C\u8BED\u6CD5\u3002
-doclet.search.keyboard_info= \u60A8\u53EF\u4EE5\u4F7F\u7528 <ctrl> \u6216 <cmd> \u952E\u4E0E\u5DE6\u7BAD\u5934\u548C\u53F3\u7BAD\u5934\u952E\u7EC4\u5408\u5728\u6B64\u9875\u9762\u4E2D\u7684\u7ED3\u679C\u9009\u9879\u5361\u4E4B\u95F4\u5207\u6362\u3002
-doclet.search.browser_info= \u4E0B\u9762\u7684 URL \u6A21\u677F\u53EF\u7528\u4E8E\u5728\u652F\u6301\u6B64\u529F\u80FD\u7684\u6D4F\u89C8\u5668\u4E2D\u5C06\u6B64\u9875\u9762\u914D\u7F6E\u4E3A\u641C\u7D22\u5F15\u64CE\u3002\u5DF2\u7ECF\u5BF9\u5176\u8FDB\u884C\u4E86\u6D4B\u8BD5\u4EE5\u5728 Google Chrome \u548C Mozilla Firefox \u4E2D\u4F7F\u7528\u3002\u8BF7\u6CE8\u610F\uFF0C\u5176\u4ED6\u6D4F\u89C8\u5668\u53EF\u80FD\u4E0D\u652F\u6301\u6B64\u529F\u80FD\u6216\u9700\u8981\u4E0D\u540C\u7684 URL \u683C\u5F0F\u3002
-doclet.search.redirect=\u91CD\u5B9A\u5411\u5230\u7B2C\u4E00\u4E2A\u7ED3\u679C
+doclet.search.help_page_info= {0} 介绍了 JavaDoc 搜索的范围和语法。
+doclet.search.keyboard_info= 您可以使用 <ctrl> 或 <cmd> 键与左箭头和右箭头键组合在此页面中的结果选项卡之间切换。
+doclet.search.browser_info= 下面的 URL 模板可用于在支持此功能的浏览器中将此页面配置为搜索引擎。已经对其进行了测试以在 Google Chrome 和 Mozilla Firefox 中使用。请注意，其他浏览器可能不支持此功能或需要不同的 URL 格式。
+doclet.search.redirect=重定向到第一个结果
 
 # 0: a date
-doclet.Option_date_out_of_range=''--date'' \u7684\u503C\u8D85\u51FA\u8303\u56F4\uFF1A{0}
+doclet.Option_date_out_of_range=''--date'' 的值超出范围：{0}
 
 # 0: a date
-doclet.Option_date_not_valid=''--date'' \u7684\u503C\u65E0\u6548\uFF1A{0}
+doclet.Option_date_not_valid=''--date'' 的值无效：{0}
 
-doclet.help.main_heading=JavaDoc \u5E2E\u52A9
-doclet.help.navigation.head=\u5BFC\u822A
+doclet.help.main_heading=JavaDoc 帮助
+doclet.help.navigation.head=导航
 # 0: link to the Overview page
-doclet.help.navigation.intro=\u4ECE {0} \u9875\u5F00\u59CB\uFF0C\u60A8\u53EF\u4EE5\u4F7F\u7528\u6BCF\u9875\u4E2D\u7684\u94FE\u63A5\u4EE5\u53CA\u6BCF\u9875\u9876\u90E8\u5BFC\u822A\u680F\u4E2D\u7684\u94FE\u63A5\u6765\u6D4F\u89C8\u6587\u6863\u3002
+doclet.help.navigation.intro=从 {0} 页开始，您可以使用每页中的链接以及每页顶部导航栏中的链接来浏览文档。
 # 0: link to the Index;  1: short list of links
-doclet.help.navigation.index=\u4F7F\u7528 {0} \u548C\u641C\u7D22\u6846\u53EF\u4EE5\u5BFC\u822A\u5230\u7279\u5B9A\u58F0\u660E\u548C\u6982\u8981\u9875\uFF0C\u5305\u62EC\uFF1A{1}
-doclet.help.page_kinds.head=\u9875\u9762\u7C7B\u578B
-doclet.help.page_kinds.intro=\u4EE5\u4E0B\u5404\u90E8\u5206\u4ECB\u7ECD\u4E86\u6B64\u96C6\u5408\u4E2D\u4E0D\u540C\u7C7B\u578B\u7684\u9875\u9762\u3002
+doclet.help.navigation.index=使用 {0} 和搜索框可以导航到特定声明和概要页，包括：{1}
+doclet.help.page_kinds.head=页面类型
+doclet.help.page_kinds.intro=以下各部分介绍了此集合中不同类型的页面。
 # 0: link to the Overview page
-doclet.help.overview.modules.body={0} \u9875\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875\uFF0C\u63D0\u4F9B\u4E86\u6240\u6709\u6A21\u5757\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u6A21\u5757\u7684\u603B\u4F53\u8BF4\u660E\u3002
+doclet.help.overview.modules.body={0} 页是此 API 文档的首页，提供了所有模块的列表及其概要。此页也可能包含这些模块的总体说明。
 # 0: link to the Overview page
-doclet.help.overview.packages.body={0} \u9875\u9762\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875, \u63D0\u4F9B\u4E86\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u7A0B\u5E8F\u5305\u7684\u603B\u4F53\u8BF4\u660E\u3002
-doclet.help.package.intro=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u4EE5\u4E0B\u7C7B\u522B\uFF1A
-doclet.help.module.intro=\u6BCF\u4E2A\u6A21\u5757\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7A0B\u5E8F\u5305\u3001\u4E0E\u5176\u4ED6\u6A21\u5757\u7684\u4F9D\u8D56\u5173\u7CFB\u548C\u670D\u52A1\u7684\u5217\u8868\u4EE5\u53CA\u5404\u4E2A\u6A21\u5757\u7684\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u4EE5\u4E0B\u7C7B\u522B\uFF1A
-doclet.help.class_interface.head=\u7C7B\u6216\u63A5\u53E3
-doclet.help.class_interface.intro=\u6BCF\u4E2A\u7C7B\u3001\u63A5\u53E3\u3001\u5D4C\u5957\u7C7B\u548C\u5D4C\u5957\u63A5\u53E3\u90FD\u6709\u81EA\u5DF1\u72EC\u7ACB\u7684\u9875\u9762\u3002\u5982\u679C\u8FD9\u4E9B\u90E8\u5206\u4E2D\u6BCF\u4E2A\u90E8\u5206\u7684\u6761\u76EE\u4E3A\u7A7A\u6216\u4E0D\u9002\u7528\uFF0C\u5219\u7701\u7565\u8FD9\u4E9B\u6761\u76EE\u3002
-doclet.help.class_interface.inheritance_diagram=\u7C7B\u7EE7\u627F\u56FE
-doclet.help.class_interface.subclasses=\u76F4\u63A5\u5B50\u7C7B
-doclet.help.class_interface.subinterfaces=\u6240\u6709\u5DF2\u77E5\u5B50\u63A5\u53E3
-doclet.help.class_interface.implementations=\u6240\u6709\u5DF2\u77E5\u5B9E\u73B0\u7C7B
-doclet.help.class_interface.declaration=\u7C7B\u6216\u63A5\u53E3\u58F0\u660E
-doclet.help.class_interface.description=\u7C7B\u6216\u63A5\u53E3\u8BF4\u660E
-doclet.help.class_interface.member_order=\u6982\u8981\u6761\u76EE\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\uFF0C\u800C\u8BE6\u7EC6\u8BF4\u660E\u5219\u6309\u5176\u5728\u6E90\u4EE3\u7801\u4E2D\u51FA\u73B0\u7684\u987A\u5E8F\u6392\u5217\u3002\u8FD9\u6709\u52A9\u4E8E\u4FDD\u6301\u7A0B\u5E8F\u5458\u6240\u5EFA\u7ACB\u7684\u903B\u8F91\u5206\u7EC4\u3002
-doclet.help.class_interface.note=\u6CE8:
-doclet.help.class_interface.anno=\u6279\u6CE8\u63A5\u53E3\u6709\u5FC5\u9700\u7684\u5143\u7D20\u548C\u53EF\u9009\u7684\u5143\u7D20\uFF0C\u4F46\u6CA1\u6709\u65B9\u6CD5\u3002
-doclet.help.class_interface.enum=\u53EA\u6709\u679A\u4E3E\u7C7B\u6709\u679A\u4E3E\u5E38\u91CF\u3002
-doclet.help.class_interface.record=\u8BB0\u5F55\u7C7B\u7684\u7EC4\u4EF6\u663E\u793A\u4E3A\u8BB0\u5F55\u7C7B\u58F0\u660E\u7684\u4E00\u90E8\u5206\u3002
-doclet.help.class_interface.property=\u5C5E\u6027\u662F JavaFX \u7684\u4E00\u4E2A\u7279\u6027\u3002
-doclet.help.other_files.head=\u5176\u4ED6\u6587\u4EF6
-doclet.help.other_files.body=\u7A0B\u5E8F\u5305\u548C\u6A21\u5757\u6240\u5305\u542B\u7684\u9875\u9762\u4E2D\u53EF\u80FD\u5E26\u6709\u4E0E\u9644\u8FD1\u58F0\u660E\u76F8\u5173\u7684\u9644\u52A0\u4FE1\u606F\u3002
-doclet.help.use.head=\u4F7F\u7528
-doclet.help.use.body=\u6BCF\u4E2A\u5DF2\u6587\u6863\u5316\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u548C\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u201C\u4F7F\u7528\u201D\u9875\u9762\u3002\u6B64\u9875\u9762\u4ECB\u7ECD\u4E86\u4F7F\u7528\u7ED9\u5B9A\u7C7B\u6216\u7A0B\u5E8F\u5305\u7684\u4EFB\u4F55\u90E8\u5206\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u3001\u65B9\u6CD5\u3001\u6784\u9020\u5668\u548C\u5B57\u6BB5\u3002\u5BF9\u4E8E\u7ED9\u5B9A\u7684\u7C7B\u6216\u63A5\u53E3 A\uFF0C\u5176\u201C\u4F7F\u7528\u201D\u9875\u9762\u5305\u542B A \u7684\u5B50\u7C7B\u3001\u58F0\u660E\u4E3A A \u7684\u5B57\u6BB5\u3001\u8FD4\u56DE A \u7684\u65B9\u6CD5\uFF0C\u4EE5\u53CA\u5E26\u6709\u7C7B\u578B\u4E3A A \u7684\u53C2\u6570\u7684\u65B9\u6CD5\u548C\u6784\u9020\u5668\u3002\u8BBF\u95EE\u6B64\u9875\u9762\u7684\u65B9\u6CD5\u662F\uFF1A\u9996\u5148\u8F6C\u81F3\u7A0B\u5E8F\u5305\u3001\u7C7B\u6216\u63A5\u53E3\uFF0C\u7136\u540E\u5355\u51FB\u5BFC\u822A\u680F\u4E2D\u7684\u201C\u4F7F\u7528\u201D\u94FE\u63A5\u3002
-doclet.help.tree.head=\u6811 (\u7C7B\u5206\u5C42\u7ED3\u6784)
+doclet.help.overview.packages.body={0} 页面是此 API 文档的首页, 提供了所有程序包的列表及其概要。此页面也可能包含这些程序包的总体说明。
+doclet.help.package.intro=每个程序包都有一页，其中包含它的类和接口的列表及其概要。这些页可以包含以下类别：
+doclet.help.module.intro=每个模块都有一页，其中包含它的程序包、与其他模块的依赖关系和服务的列表以及各个模块的概要。这些页可以包含以下类别：
+doclet.help.class_interface.head=类或接口
+doclet.help.class_interface.intro=每个类、接口、嵌套类和嵌套接口都有自己独立的页面。如果这些部分中每个部分的条目为空或不适用，则省略这些条目。
+doclet.help.class_interface.inheritance_diagram=类继承图
+doclet.help.class_interface.subclasses=直接子类
+doclet.help.class_interface.subinterfaces=所有已知子接口
+doclet.help.class_interface.implementations=所有已知实现类
+doclet.help.class_interface.declaration=类或接口声明
+doclet.help.class_interface.description=类或接口说明
+doclet.help.class_interface.member_order=概要条目按字母顺序排列，而详细说明则按其在源代码中出现的顺序排列。这有助于保持程序员所建立的逻辑分组。
+doclet.help.class_interface.note=注:
+doclet.help.class_interface.anno=批注接口有必需的元素和可选的元素，但没有方法。
+doclet.help.class_interface.enum=只有枚举类有枚举常量。
+doclet.help.class_interface.record=记录类的组件显示为记录类声明的一部分。
+doclet.help.class_interface.property=属性是 JavaFX 的一个特性。
+doclet.help.other_files.head=其他文件
+doclet.help.other_files.body=程序包和模块所包含的页面中可能带有与附近声明相关的附加信息。
+doclet.help.use.head=使用
+doclet.help.use.body=每个已文档化的程序包、类和接口都有各自的“使用”页面。此页面介绍了使用给定类或程序包的任何部分的程序包、类、方法、构造器和字段。对于给定的类或接口 A，其“使用”页面包含 A 的子类、声明为 A 的字段、返回 A 的方法，以及带有类型为 A 的参数的方法和构造器。访问此页面的方法是：首先转至程序包、类或接口，然后单击导航栏中的“使用”链接。
+doclet.help.tree.head=树 (类分层结构)
 # 0: link to main Class Hierarchy page;  1: java.lang.Object
-doclet.help.tree.intro=\u5BF9\u4E8E\u6240\u6709\u7A0B\u5E8F\u5305\uFF0C\u90FD\u6709\u4E00\u4E2A {0} \u9875\uFF0C\u4EE5\u53CA\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002\u6BCF\u4E2A\u5206\u5C42\u7ED3\u6784\u9875\u90FD\u5305\u542B\u7C7B\u7684\u5217\u8868\u548C\u63A5\u53E3\u7684\u5217\u8868\u3002\u4ECE {1} \u5F00\u59CB\uFF0C\u6309\u7EE7\u627F\u7ED3\u6784\u5BF9\u7C7B\u8FDB\u884C\u6392\u5217\u3002\u63A5\u53E3\u4E0D\u4ECE {1} \u7EE7\u627F\u3002
-doclet.help.tree.overview=\u67E5\u770B\u201C\u6982\u89C8\u201D\u9875\u9762\u65F6\uFF0C\u5355\u51FB\u201C\u6811\u201D\u5C06\u663E\u793A\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
-doclet.help.tree.package=\u67E5\u770B\u7279\u5B9A\u7A0B\u5E8F\u5305\u3001\u7C7B\u6216\u63A5\u53E3\u9875\u65F6\uFF0C\u5355\u51FB\u201C\u6811\u201D\u5C06\u4EC5\u663E\u793A\u8BE5\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
+doclet.help.tree.intro=对于所有程序包，都有一个 {0} 页，以及每个程序包的分层结构。每个分层结构页都包含类的列表和接口的列表。从 {1} 开始，按继承结构对类进行排列。接口不从 {1} 继承。
+doclet.help.tree.overview=查看“概览”页面时，单击“树”将显示所有程序包的分层结构。
+doclet.help.tree.package=查看特定程序包、类或接口页时，单击“树”将仅显示该程序包的分层结构。
 # 0: link to the Deprecated summary page
-doclet.help.deprecated.body={0} \u9875\u9762\u5217\u51FA\u4E86\u6240\u6709\u5DF2\u8FC7\u65F6\u7684 API\u3002\u901A\u5E38\uFF0C\u7531\u4E8E\u5DF2\u8FC7\u65F6\u7684 API \u5B58\u5728\u7F3A\u70B9\u5E76\u4E14\u5DF2\u63D0\u4F9B\u66FF\u4EE3 API\uFF0C\u4E0D\u5EFA\u8BAE\u4F7F\u7528\u5DF2\u8FC7\u65F6\u7684 API\u3002\u5728\u5C06\u6765\u7684\u5B9E\u65BD\u4E2D\uFF0C\u53EF\u80FD\u4F1A\u5220\u9664\u5DF2\u8FC7\u65F6\u7684 API\u3002
+doclet.help.deprecated.body={0} 页面列出了所有已过时的 API。通常，由于已过时的 API 存在缺点并且已提供替代 API，不建议使用已过时的 API。在将来的实施中，可能会删除已过时的 API。
 # 0: link to the Preview summary page
-doclet.help.preview.body={0} \u9875\u9762\u5217\u51FA\u4E86\u6240\u6709\u9884\u89C8 API\u3002\u5728\u5C06\u6765\u7684\u5B9E\u65BD\u4E2D\uFF0C\u53EF\u80FD\u4F1A\u5220\u9664\u9884\u89C8 API\u3002
-doclet.help.new.body={0} \u9875\u9762\u5217\u51FA\u4E86\u6700\u8FD1\u7684\u53D1\u884C\u7248\u4E2D\u5DF2\u6DFB\u52A0\u7684 API\u3002
-doclet.help.index.head=\u7D22\u5F15
+doclet.help.preview.body={0} 页面列出了所有预览 API。在将来的实施中，可能会删除预览 API。
+doclet.help.new.body={0} 页面列出了最近的发行版中已添加的 API。
+doclet.help.index.head=索引
 # 0: link to Index page;  1: list of links to pages
-doclet.help.index.body={0} \u5305\u542B\u6587\u6863\u4E2D\u6240\u6709\u7C7B\u3001\u63A5\u53E3\u3001\u6784\u9020\u5668\u3001\u65B9\u6CD5\u548C\u5B57\u6BB5\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\uFF0C\u4EE5\u53CA\u6982\u8981\u9875\uFF08\u4F8B\u5982 {1}\uFF09\u3002
-doclet.help.all_classes.head=\u6240\u6709\u7C7B\u548C\u63A5\u53E3
+doclet.help.index.body={0} 包含文档中所有类、接口、构造器、方法和字段的按字母顺序排列的索引，以及概要页（例如 {1}）。
+doclet.help.all_classes.head=所有类和接口
 # 0: link to All Classes page
-doclet.help.all_classes.body={0} \u5305\u542B\u6587\u6863\u4E2D\u6240\u6709\u7C7B\u548C\u63A5\u53E3\uFF08\u5305\u62EC\u6279\u6CE8\u63A5\u53E3\u3001\u679A\u4E3E\u7C7B\u548C\u8BB0\u5F55\u7C7B\uFF09\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\u3002
-doclet.help.all_packages.head=\u6240\u6709\u7A0B\u5E8F\u5305
+doclet.help.all_classes.body={0} 包含文档中所有类和接口（包括批注接口、枚举类和记录类）的按字母顺序排列的索引。
+doclet.help.all_packages.head=所有程序包
 # 0: link to All Packages page
-doclet.help.all_packages.body={0} \u5305\u542B\u6587\u6863\u4E2D\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\u3002
-doclet.help.serial_form.body=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u5B9E\u65BD\uFF08\u800C\u975E\u4F7F\u7528\uFF09API \u7684\u4EBA\u5458\u6709\u7528\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5\uFF0C\u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F\uFF1A\u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B\uFF0C\u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684\u201C\u53E6\u8BF7\u53C2\u9605\u201D\u90E8\u5206\u4E2D\u7684\u201C\u5E8F\u5217\u5316\u5F62\u5F0F\u201D\u3002
+doclet.help.all_packages.body={0} 包含文档中所有程序包的按字母顺序排列的索引。
+doclet.help.serial_form.body=每个可序列化或可外部化的类都有其序列化字段和方法的说明。此信息对实施（而非使用）API 的人员有用。尽管导航栏中没有链接，但您可以通过下列方式获取此信息：转至任何序列化类，然后单击类说明的“另请参阅”部分中的“序列化形式”。
 # 0: link to Constant Values page
-doclet.help.constants.body={0}\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002
+doclet.help.constants.body={0}页面列出了静态最终字段及其值。
 # 0: link to System Properties page
-doclet.help.systemProperties.body={0} \u9875\u9762\u5217\u51FA\u4E86\u5BF9\u7CFB\u7EDF\u5C5E\u6027\u7684\u5F15\u7528\u3002
+doclet.help.systemProperties.body={0} 页面列出了对系统属性的引用。
 # 0: link to External Specifications page
-doclet.help.externalSpecifications.body={0} \u9875\u9762\u5217\u51FA\u4E86\u5BF9\u5916\u90E8\u89C4\u8303\u7684\u5F15\u7528\u3002
-doclet.help.footnote=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u7531\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002
-doclet.help.enum.intro=\u6BCF\u4E2A\u679A\u4E3E\u7C7B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\uFF0C\u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206\uFF1A
-doclet.help.enum.class.intro=\u6BCF\u4E2A\u679A\u4E3E\u7C7B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\uFF0C\u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206\uFF1A
-doclet.help.annotation_type.intro=\u6BCF\u4E2A\u6279\u6CE8\u7C7B\u578B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
-doclet.help.annotation_interface.intro=\u6BCF\u4E2A\u6279\u6CE8\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\uFF0C\u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206\uFF1A
-doclet.help.annotation_type.declaration=\u6279\u6CE8\u7C7B\u578B\u58F0\u660E
-doclet.help.annotation_interface.declaration=\u6279\u6CE8\u63A5\u53E3\u58F0\u660E
-doclet.help.annotation_type.description=\u6279\u6CE8\u7C7B\u578B\u8BF4\u660E
-doclet.help.annotation_interface.description=\u6279\u6CE8\u63A5\u53E3\u8BF4\u660E
-doclet.help.search.head=\u641C\u7D22
+doclet.help.externalSpecifications.body={0} 页面列出了对外部规范的引用。
+doclet.help.footnote=此帮助文件适用于由标准 doclet 生成的 API 文档。
+doclet.help.enum.intro=每个枚举类都有各自的页面，其中包含以下部分：
+doclet.help.enum.class.intro=每个枚举类都有各自的页面，其中包含以下部分：
+doclet.help.annotation_type.intro=每个批注类型都有各自的页面, 其中包含以下部分:
+doclet.help.annotation_interface.intro=每个批注接口都有各自的页面，其中包含以下部分：
+doclet.help.annotation_type.declaration=批注类型声明
+doclet.help.annotation_interface.declaration=批注接口声明
+doclet.help.annotation_type.description=批注类型说明
+doclet.help.annotation_interface.description=批注接口说明
+doclet.help.search.head=搜索
 # Introduction to Javadoc search features, followed by a list of examples
-doclet.help.search.intro=\u53EF\u4EE5\u641C\u7D22\u6A21\u5757\u3001\u7A0B\u5E8F\u5305\u3001\u7C7B\u578B\u3001\u5B57\u6BB5\u3001\u65B9\u6CD5\u3001\u7CFB\u7EDF\u5C5E\u6027\u4EE5\u53CA API \u4E2D\u5B9A\u4E49\u7684\u5176\u4ED6\u672F\u8BED\u7684\u5B9A\u4E49\u3002\u53EF\u4EE5\u4F7F\u7528\u90E8\u5206\u6216\u5B8C\u6574\u540D\u79F0\u641C\u7D22\u8FD9\u4E9B\u9879\uFF0C\uFF08\u53EF\u9009\uFF09\u4E5F\u53EF\u4EE5\u4F7F\u7528\u201C\u9A7C\u5CF0\u5927\u5C0F\u5199\u5F0F\u201D\u7F29\u5199\uFF0C\u6216\u4F7F\u7528\u7A7A\u683C\u5206\u9694\u7684\u591A\u4E2A\u641C\u7D22\u8BCD\u8FDB\u884C\u641C\u7D22\u3002\u4E00\u4E9B\u793A\u4F8B\uFF1A
+doclet.help.search.intro=可以搜索模块、程序包、类型、字段、方法、系统属性以及 API 中定义的其他术语的定义。可以使用部分或完整名称搜索这些项，（可选）也可以使用“驼峰大小写式”缩写，或使用空格分隔的多个搜索词进行搜索。一些示例：
 # Used to list search examples, {0} is a search term and {1} the matching result
-doclet.help.search.example={0} \u5339\u914D {1}
+doclet.help.search.example={0} 匹配 {1}
 # {0} contains a link to the current Javadoc Search Specification
-doclet.help.search.refer=\u6709\u5173\u641C\u7D22\u529F\u80FD\u7684\u5B8C\u6574\u8BF4\u660E\uFF0C\u8BF7\u53C2\u9605 {0}\u3002
+doclet.help.search.refer=有关搜索功能的完整说明，请参阅 {0}。
 # The URL for the Javadoc Search Specification. {0} will be replaced by the JDK version number
 doclet.help.search.spec.url=https://docs.oracle.com/en/java/javase/{0}/docs/specs/javadoc/javadoc-search-spec.html
 # The title for the Javadoc Search Specification
-doclet.help.search.spec.title=Javadoc \u641C\u7D22\u89C4\u8303
-
-doclet.ClassUse_Packages.that.use.0=\u4F7F\u7528{0}\u7684\u7A0B\u5E8F\u5305
-doclet.ClassUse_Uses.of.0.in.1={1}\u4E2D{0}\u7684\u4F7F\u7528
-doclet.ClassUse_Classes.in.0.used.by.1={1}\u4F7F\u7528\u7684{0}\u4E2D\u7684\u7C7B
-doclet.ClassUse_PackageAnnotation=\u6279\u6CE8\u7C7B\u578B\u4E3A{0}\u7684\u7A0B\u5E8F\u5305
-doclet.ClassUse_Annotation=\u6279\u6CE8\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u7C7B
-doclet.ClassUse_TypeParameter=\u7C7B\u578B\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u7C7B
-doclet.ClassUse_MethodTypeParameter=\u7C7B\u578B\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5
-doclet.ClassUse_FieldTypeParameter=\u7C7B\u578B\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u5B57\u6BB5
-doclet.ClassUse_FieldAnnotations=\u6279\u6CE8\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u5B57\u6BB5
-doclet.ClassUse_MethodAnnotations=\u6279\u6CE8\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5
-doclet.ClassUse_MethodParameterAnnotations=\u6279\u6CE8\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5\u53C2\u6570
-doclet.ClassUse_MethodReturnTypeParameter=\u8FD4\u56DE\u53D8\u91CF\u7C7B\u578B\u4E3A{0}\u7684\u7C7B\u578B\u7684{1}\u4E2D\u7684\u65B9\u6CD5
-doclet.ClassUse_Subclass={1}\u4E2D{0}\u7684\u5B50\u7C7B
-doclet.ClassUse_Subinterface={1}\u4E2D{0}\u7684\u5B50\u63A5\u53E3
-doclet.ClassUse_ImplementingClass=\u5B9E\u73B0{0}\u7684{1}\u4E2D\u7684\u7C7B
-doclet.ClassUse_Field=\u58F0\u660E\u4E3A{0}\u7684{1}\u4E2D\u7684\u5B57\u6BB5
-doclet.ClassUse_MethodReturn=\u8FD4\u56DE{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5
-doclet.ClassUse_MethodArgs=\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5
-doclet.ClassUse_MethodArgsTypeParameters=\u7C7B\u578B\u53D8\u91CF\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5\u53C2\u6570
-doclet.ClassUse_MethodThrows=\u629B\u51FA{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5
-doclet.ClassUse_ConstructorAnnotations=\u6279\u6CE8\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u6784\u9020\u5668
-doclet.ClassUse_ConstructorParameterAnnotations=\u6279\u6CE8\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u6784\u9020\u5668\u53C2\u6570
-doclet.ClassUse_ConstructorArgs=\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u6784\u9020\u5668
-doclet.ClassUse_ConstructorArgsTypeParameters=\u7C7B\u578B\u53D8\u91CF\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u6784\u9020\u5668\u53C2\u6570
-doclet.ClassUse_ConstructorThrows=\u629B\u51FA{0}\u7684{1}\u4E2D\u7684\u6784\u9020\u5668
-doclet.ClassUse_No.usage.of.0=\u6CA1\u6709{0}\u7684\u7528\u6CD5
-doclet.Window_ClassUse_Header={0} {1}\u7684\u4F7F\u7528
-doclet.ClassUse_Title={0}\u7684\u4F7F\u7528
-doclet.navClassUse=\u4F7F\u7528
-doclet.Error_in_grouplist=\u9519\u8BEF\u7684 -group \u9009\u9879: {0} {1}
-doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, \u7EC4\u540D\u5DF2\u4F7F\u7528: {0}
-doclet.Same_element_name_used=\u5143\u7D20\u540D\u79F0\u6216\u6A21\u5F0F\u4F7F\u7528\u4E86\u4E24\u6B21: {0}
-doclet.PreviewLeadingNote={0} \u4F9D\u8D56\u4E8E Java \u5E73\u53F0\u7684\u9884\u89C8\u529F\u80FD\uFF1A
-doclet.Declared_Using_Preview={0} \u662F\u4F7F\u7528 {1}\uFF08Java \u8BED\u8A00 ({2}) \u7684\u9884\u89C8\u529F\u80FD\uFF09\u58F0\u660E\u7684\u3002
-doclet.PreviewAPI={0} \u5F15\u7528\u4E00\u4E2A\u6216\u591A\u4E2A\u9884\u89C8 API\uFF1A{1}\u3002
-doclet.ReflectivePreviewAPI={0} \u5F15\u7528\u4E00\u4E2A\u6216\u591A\u4E2A\u53CD\u5C04\u9884\u89C8 API\uFF1A{1}\u3002
-doclet.UsesDeclaredUsingPreview={0} \u5F15\u7528\u4E00\u4E2A\u6216\u591A\u4E2A\u7C7B\u578B\uFF0C\u8FD9\u4E9B\u7C7B\u578B\u662F\u4F7F\u7528 Java \u8BED\u8A00 {1} \u7684\u9884\u89C8\u529F\u80FD\u58F0\u660E\u7684\u3002
-doclet.PreviewTrailingNote1=\u53EA\u6709\u5728\u542F\u7528\u4E86\u9884\u89C8\u529F\u80FD\u65F6\uFF0C\u7A0B\u5E8F\u624D\u80FD\u4F7F\u7528 {0}\u3002
-doclet.PreviewTrailingNote2=\u9884\u89C8\u529F\u80FD\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\uFF0C\u4E5F\u53EF\u80FD\u4F1A\u5347\u7EA7\u4E3A Java \u5E73\u53F0\u7684\u6C38\u4E45\u529F\u80FD\u3002
-doclet.Declared_Using_Preview.SEALED=\u5BC6\u5C01\u7C7B
-doclet.Declared_Using_Preview.SEALED_PERMITS=\u5BC6\u5C01\u7C7B
-doclet.PreviewPlatformLeadingNote={0} \u662F Java \u5E73\u53F0\u7684\u9884\u89C8 API\u3002
-doclet.ReflectivePreviewPlatformLeadingNote={0} \u662F Java \u5E73\u53F0\u7684\u53CD\u5C04\u9884\u89C8 API\u3002
+doclet.help.search.spec.title=Javadoc 搜索规范
+
+doclet.ClassUse_Packages.that.use.0=使用{0}的程序包
+doclet.ClassUse_Uses.of.0.in.1={1}中{0}的使用
+doclet.ClassUse_Classes.in.0.used.by.1={1}使用的{0}中的类
+doclet.ClassUse_PackageAnnotation=批注类型为{0}的程序包
+doclet.ClassUse_Annotation=批注类型为{0}的{1}中的类
+doclet.ClassUse_TypeParameter=类型参数类型为{0}的{1}中的类
+doclet.ClassUse_MethodTypeParameter=类型参数类型为{0}的{1}中的方法
+doclet.ClassUse_FieldTypeParameter=类型参数类型为{0}的{1}中的字段
+doclet.ClassUse_FieldAnnotations=批注类型为{0}的{1}中的字段
+doclet.ClassUse_MethodAnnotations=批注类型为{0}的{1}中的方法
+doclet.ClassUse_MethodParameterAnnotations=批注类型为{0}的{1}中的方法参数
+doclet.ClassUse_MethodReturnTypeParameter=返回变量类型为{0}的类型的{1}中的方法
+doclet.ClassUse_Subclass={1}中{0}的子类
+doclet.ClassUse_Subinterface={1}中{0}的子接口
+doclet.ClassUse_ImplementingClass=实现{0}的{1}中的类
+doclet.ClassUse_Field=声明为{0}的{1}中的字段
+doclet.ClassUse_MethodReturn=返回{0}的{1}中的方法
+doclet.ClassUse_MethodArgs=参数类型为{0}的{1}中的方法
+doclet.ClassUse_MethodArgsTypeParameters=类型变量类型为{0}的{1}中的方法参数
+doclet.ClassUse_MethodThrows=抛出{0}的{1}中的方法
+doclet.ClassUse_ConstructorAnnotations=批注类型为{0}的{1}中的构造器
+doclet.ClassUse_ConstructorParameterAnnotations=批注类型为{0}的{1}中的构造器参数
+doclet.ClassUse_ConstructorArgs=参数类型为{0}的{1}中的构造器
+doclet.ClassUse_ConstructorArgsTypeParameters=类型变量类型为{0}的{1}中的构造器参数
+doclet.ClassUse_ConstructorThrows=抛出{0}的{1}中的构造器
+doclet.ClassUse_No.usage.of.0=没有{0}的用法
+doclet.Window_ClassUse_Header={0} {1}的使用
+doclet.ClassUse_Title={0}的使用
+doclet.navClassUse=使用
+doclet.Error_in_grouplist=错误的 -group 选项: {0} {1}
+doclet.Groupname_already_used=在 -group 选项中, 组名已使用: {0}
+doclet.Same_element_name_used=元素名称或模式使用了两次: {0}
+doclet.PreviewLeadingNote={0} 依赖于 Java 平台的预览功能：
+doclet.Declared_Using_Preview={0} 是使用 {1}（Java 语言 ({2}) 的预览功能）声明的。
+doclet.PreviewAPI={0} 引用一个或多个预览 API：{1}。
+doclet.ReflectivePreviewAPI={0} 引用一个或多个反射预览 API：{1}。
+doclet.UsesDeclaredUsingPreview={0} 引用一个或多个类型，这些类型是使用 Java 语言 {1} 的预览功能声明的。
+doclet.PreviewTrailingNote1=只有在启用了预览功能时，程序才能使用 {0}。
+doclet.PreviewTrailingNote2=预览功能可能会在未来发行版中删除，也可能会升级为 Java 平台的永久功能。
+doclet.Declared_Using_Preview.SEALED=密封类
+doclet.Declared_Using_Preview.SEALED_PERMITS=密封类
+doclet.PreviewPlatformLeadingNote={0} 是 Java 平台的预览 API。
+doclet.ReflectivePreviewPlatformLeadingNote={0} 是 Java 平台的反射预览 API。
 
 # 0: an exception
-doclet.Error_copying_legal_notices=\u590D\u5236\u6CD5\u5F8B\u58F0\u660E\u65F6\u51FA\u9519\uFF1A{0}
+doclet.Error_copying_legal_notices=复制法律声明时出错：{0}
 # 0: the path; 1: the detail message for the exception
-doclet.Error_invalid_path_for_legal_notices=\u6CD5\u5F8B\u58F0\u660E\u7684\u8DEF\u5F84 ''{0}'' \u65E0\u6548\uFF1A{1}
+doclet.Error_invalid_path_for_legal_notices=法律声明的路径 ''{0}'' 无效：{1}
 
 # 0: URL; 1: an integer
-doclet.extSpec.spec.has.multiple.titles=\u5728 @spec \u6807\u8BB0\u4E2D\u4E3A\u5904\u4E8E {0} \u7684\u5916\u90E8\u89C4\u8303\u63D0\u4F9B\u4E86 {1} \u4E2A\u4E0D\u540C\u7684\u6807\u9898
+doclet.extSpec.spec.has.multiple.titles=在 @spec 标记中为处于 {0} 的外部规范提供了 {1} 个不同的标题
 
 # 0: name; 1: an integer
-doclet.extSpec.title.for.multiple.specs=\u5728 @spec \u6807\u8BB0\u4E2D\u6807\u9898 "{0}" \u7528\u4E8E {1} \u4E2A\u4E0D\u540C\u7684\u5916\u90E8\u89C4\u8303
+doclet.extSpec.title.for.multiple.specs=在 @spec 标记中标题 "{0}" 用于 {1} 个不同的外部规范
 
 # 0: name; 1: url
-doclet.extSpec.title.url=\u6807\u9898\uFF1A"{0}"\uFF0Curl\uFF1A{1}
+doclet.extSpec.title.url=标题："{0}"，url：{1}
 
 # 0: url; 1: name
-doclet.extSpec.url.title=url\uFF1A{0}\uFF0C\u6807\u9898\uFF1A"{1}"
+doclet.extSpec.url.title=url：{0}，标题："{1}"
 
 # option specifiers
 doclet.usage.add-script.parameters=<file>
-doclet.usage.add-script.description=\u5411\u751F\u6210\u7684\u6587\u6863\u6DFB\u52A0\u811A\u672C\u6587\u4EF6
+doclet.usage.add-script.description=向生成的文档添加脚本文件
 doclet.usage.add-stylesheet.parameters=<file>
-doclet.usage.add-stylesheet.description=\u5411\u751F\u6210\u7684\u6587\u6863\u6DFB\u52A0\u6837\u5F0F\u8868\u6587\u4EF6
+doclet.usage.add-stylesheet.description=向生成的文档添加样式表文件
 doclet.usage.d.parameters=<directory>
-doclet.usage.d.description=\u8F93\u51FA\u6587\u4EF6\u7684\u76EE\u6807\u76EE\u5F55
+doclet.usage.d.description=输出文件的目标目录
 
-doclet.usage.use.description=\u521B\u5EFA\u7C7B\u548C\u7A0B\u5E8F\u5305\u7528\u6CD5\u9875\u9762
+doclet.usage.use.description=创建类和程序包用法页面
 
-doclet.usage.version.description=\u5305\u542B @version \u6BB5
+doclet.usage.version.description=包含 @version 段
 
-doclet.usage.author.description=\u5305\u542B @author \u6BB5
+doclet.usage.author.description=包含 @author 段
 
-doclet.usage.docfilessubdirs.description=\u9012\u5F52\u590D\u5236\u6587\u6863\u6587\u4EF6\u5B50\u76EE\u5F55
+doclet.usage.docfilessubdirs.description=递归复制文档文件子目录
 
-doclet.usage.splitindex.description=\u5C06\u7D22\u5F15\u5206\u4E3A\u6BCF\u4E2A\u5B57\u6BCD\u5BF9\u5E94\u4E00\u4E2A\u6587\u4EF6
+doclet.usage.splitindex.description=将索引分为每个字母对应一个文件
 
 doclet.usage.overview.parameters=<file>
-doclet.usage.overview.description=\u4ECE HTML \u6587\u4EF6\u8BFB\u53D6\u6982\u89C8\u6587\u6863
+doclet.usage.overview.description=从 HTML 文件读取概览文档
 
 doclet.usage.windowtitle.parameters=<text>
-doclet.usage.windowtitle.description=\u6587\u6863\u7684\u6D4F\u89C8\u5668\u7A97\u53E3\u6807\u9898
+doclet.usage.windowtitle.description=文档的浏览器窗口标题
 
 doclet.usage.date.parameters=<date-and-time>
-doclet.usage.date.description=\u4F7F\u7528 ISO 8601 \u683C\u5F0F\u6307\u5B9A\u7528\u4E8E\u5BF9\u751F\u6210\u7684\u9875\u6807\u8BB0\u65F6\u95F4\u6233\u7684\u503C
+doclet.usage.date.description=使用 ISO 8601 格式指定用于对生成的页标记时间戳的值
 
 doclet.usage.doctitle.parameters=<html-code>
-doclet.usage.doctitle.description=\u5305\u542B\u6982\u89C8\u9875\u9762\u7684\u6807\u9898
+doclet.usage.doctitle.description=包含概览页面的标题
 
 doclet.usage.header.parameters=<html-code>
-doclet.usage.header.description=\u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9875\u7709\u6587\u672C
+doclet.usage.header.description=包含每个页面的页眉文本
 
-doclet.usage.html5.description=\u751F\u6210 HTML 5 \u8F93\u51FA\u3002\u6B64\u9009\u9879\u4E0D\u518D\u662F\u5FC5\u9700\u7684\u3002
+doclet.usage.html5.description=生成 HTML 5 输出。此选项不再是必需的。
 
 doclet.usage.footer.parameters=<html-code>
-doclet.usage.footer.description=\u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9875\u811A\u6587\u672C
+doclet.usage.footer.description=包含每个页面的页脚文本
 
 doclet.usage.top.parameters=<html-code>
-doclet.usage.top.description=\u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9876\u90E8\u6587\u672C
+doclet.usage.top.description=包含每个页面的顶部文本
 
 doclet.usage.bottom.parameters=<html-code>
-doclet.usage.bottom.description=\u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u5E95\u90E8\u6587\u672C
+doclet.usage.bottom.description=包含每个页面的底部文本
 
 doclet.usage.link.parameters=<url>
-doclet.usage.link.description=\u521B\u5EFA\u6307\u5411 <url> \u4E2D\u7684 javadoc \u8F93\u51FA\u7684\u94FE\u63A5
+doclet.usage.link.description=创建指向 <url> 中的 javadoc 输出的链接
 
 doclet.usage.linkoffline.parameters=<url1> <url2>
-doclet.usage.linkoffline.description=\u4F7F\u7528 <url2> \u4E2D\u7684\u7A0B\u5E8F\u5305\u5217\u8868\u94FE\u63A5\u5230 <url1> \u4E2D\u7684\u6587\u6863
+doclet.usage.linkoffline.description=使用 <url2> 中的程序包列表链接到 <url1> 中的文档
 
 # L10N: do not localize the option parameters: warn info
 doclet.usage.link-modularity-mismatch.parameters=(warn|info)
-doclet.usage.link-modularity-mismatch.description=\u7528\u8B66\u544A\u6216\u4FE1\u606F\u6027\u6D88\u606F\u62A5\u544A\u5177\u6709\n\u6A21\u5757\u5316\u9519\u8BEF\u7684\u5916\u90E8\u6587\u6863\u3002\u9ED8\u8BA4\n\u884C\u4E3A\u662F\u62A5\u544A\u8B66\u544A\u3002
+doclet.usage.link-modularity-mismatch.description=用警告或信息性消息报告具有\n模块化错误的外部文档。默认\n行为是报告警告。
 
 doclet.usage.link-platform-properties.parameters=<url>
-doclet.usage.link-platform-properties.description=\u94FE\u63A5\u5230\u4F4D\u4E8E <url> \u7684\u5C5E\u6027\u6587\u4EF6\u4E2D\u58F0\u660E\u7684\u5E73\u53F0\u6587\u6863 URL
+doclet.usage.link-platform-properties.description=链接到位于 <url> 的属性文件中声明的平台文档 URL
 
 doclet.usage.excludedocfilessubdir.parameters=<name>,<name>,...
-doclet.usage.excludedocfilessubdir.description=\u6392\u9664\u5305\u542B\u7ED9\u5B9A\u540D\u79F0\u7684\u6240\u6709 doc-files \u5B50\u76EE\u5F55\u3002\n\u8FD8\u53EF\u4EE5\u5C06 ':' \u4F5C\u4E3A\u5206\u9694\u7B26\u7528\u4E8E\u53C2\u6570\u4E2D\u7684\u4EFB\u4F55\u4F4D\u7F6E\u3002
+doclet.usage.excludedocfilessubdir.description=排除包含给定名称的所有 doc-files 子目录。\n还可以将 ':' 作为分隔符用于参数中的任何位置。
 
 doclet.usage.group.parameters=<name> <g1>,<g2>...
-doclet.usage.group.description=\u5728\u6982\u89C8\u9875\u9762\u4E0A\u5C06\u6307\u5B9A\u5143\u7D20\u5F52\u5230\u4E00\u7EC4\u3002\n\u8FD8\u53EF\u4EE5\u5C06 ':' \u4F5C\u4E3A\u5206\u9694\u7B26\u7528\u4E8E\u53C2\u6570\u4E2D\u7684\u4EFB\u4F55\u4F4D\u7F6E\u3002
+doclet.usage.group.description=在概览页面上将指定元素归到一组。\n还可以将 ':' 作为分隔符用于参数中的任何位置。
 
 doclet.usage.legal-notices.parameters='default' | 'none' | <directory>
-doclet.usage.legal-notices.description=\u63A7\u5236\u6240\u751F\u6210\u8F93\u51FA\u4E2D\u7684\u6CD5\u5F8B\u58F0\u660E
+doclet.usage.legal-notices.description=控制所生成输出中的法律声明
 
-doclet.usage.nocomment.description=\u4E0D\u751F\u6210\u8BF4\u660E\u548C\u6807\u8BB0, \u53EA\u751F\u6210\u58F0\u660E
+doclet.usage.nocomment.description=不生成说明和标记, 只生成声明
 
-doclet.usage.nodeprecated.description=\u4E0D\u5305\u542B @deprecated \u4FE1\u606F
+doclet.usage.nodeprecated.description=不包含 @deprecated 信息
 
 doclet.usage.noqualifier.parameters=<name1>,<name2>,...
-doclet.usage.noqualifier.description=\u5728\u8F93\u51FA\u4E2D\u6392\u9664\u4E00\u7CFB\u5217\u9650\u5B9A\u7B26\u3002\n\u8FD8\u53EF\u4EE5\u5C06 ':' \u4F5C\u4E3A\u5206\u9694\u7B26\u7528\u4E8E\u53C2\u6570\u4E2D\u7684\u4EFB\u4F55\u4F4D\u7F6E\u3002
+doclet.usage.noqualifier.description=在输出中排除一系列限定符。\n还可以将 ':' 作为分隔符用于参数中的任何位置。
 
-doclet.usage.nosince.description=\u4E0D\u5305\u62EC @since \u4FE1\u606F
+doclet.usage.nosince.description=不包括 @since 信息
 
-doclet.usage.notimestamp.description=\u4E0D\u5305\u62EC\u9690\u85CF\u7684\u65F6\u95F4\u6233
+doclet.usage.notimestamp.description=不包括隐藏的时间戳
 
-doclet.usage.nodeprecatedlist.description=\u4E0D\u751F\u6210\u5DF2\u8FC7\u65F6\u7684\u5217\u8868
+doclet.usage.nodeprecatedlist.description=不生成已过时的列表
 
-doclet.usage.no-module-directories.description=\u4E0D\u5C06\u6A21\u5757\u6587\u6863\u7684\u6587\u4EF6\u5206\u7EC4\u5230\n\u6A21\u5757\u7279\u5B9A\u7684\u76EE\u5F55\u4E2D
+doclet.usage.no-module-directories.description=不将模块文档的文件分组到\n模块特定的目录中
 
-doclet.usage.no-platform-links.description=\u4E0D\u751F\u6210\u6307\u5411\u5E73\u53F0\u6587\u6863\u7684\u94FE\u63A5
+doclet.usage.no-platform-links.description=不生成指向平台文档的链接
 
-doclet.usage.notree.description=\u4E0D\u751F\u6210\u7C7B\u5206\u5C42\u7ED3\u6784
+doclet.usage.notree.description=不生成类分层结构
 
-doclet.usage.noindex.description=\u4E0D\u751F\u6210\u7D22\u5F15
+doclet.usage.noindex.description=不生成索引
 
-doclet.usage.nohelp.description=\u4E0D\u751F\u6210\u5E2E\u52A9\u94FE\u63A5
+doclet.usage.nohelp.description=不生成帮助链接
 
-doclet.usage.nonavbar.description=\u4E0D\u751F\u6210\u5BFC\u822A\u680F
+doclet.usage.nonavbar.description=不生成导航栏
 
-doclet.usage.nooverview.description=\u4E0D\u751F\u6210\u6982\u89C8\u9875\u9762
+doclet.usage.nooverview.description=不生成概览页面
 
-doclet.usage.serialwarn.description=\u751F\u6210\u6709\u5173 @serial \u6807\u8BB0\u7684\u8B66\u544A
+doclet.usage.serialwarn.description=生成有关 @serial 标记的警告
 
 doclet.usage.since.parameters=<release>(,<release>)*
-doclet.usage.since.description=\u8BB0\u5F55\u6240\u6307\u5B9A\u53D1\u884C\u7248\u4E2D\u65B0\u589E\u548C\u5DF2\u8FC7\u65F6\u7684 API
+doclet.usage.since.description=记录所指定发行版中新增和已过时的 API
 
 doclet.usage.since-label.parameters=<text>
-doclet.usage.since-label.description=\u63D0\u4F9B\u8981\u5728\u201C\u65B0\u589E API\u201D\u9875\u7684\u6807\u9898\u4E2D\u4F7F\u7528\u7684\u6587\u672C
+doclet.usage.since-label.description=提供要在“新增 API”页的标题中使用的文本
 
 doclet.usage.tag.parameters=<name>:<locations>:<header>
-doclet.usage.tag.description=\u6307\u5B9A\u5355\u4E2A\u53C2\u6570\u5B9A\u5236\u6807\u8BB0
+doclet.usage.tag.description=指定单个参数定制标记
 
-doclet.usage.taglet.description=\u8981\u6CE8\u518C\u7684 Taglet \u7684\u5168\u9650\u5B9A\u540D\u79F0
+doclet.usage.taglet.description=要注册的 Taglet 的全限定名称
 
-doclet.usage.tagletpath.description=Taglet \u7684\u8DEF\u5F84
+doclet.usage.tagletpath.description=Taglet 的路径
 
 doclet.usage.snippet-path.parameters=<path>
 
-doclet.usage.snippet-path.description=\u5916\u90E8\u7247\u6BB5\u7684\u8DEF\u5F84
+doclet.usage.snippet-path.description=外部片段的路径
 
 doclet.usage.charset.parameters=<charset>
-doclet.usage.charset.description=\u7528\u4E8E\u8DE8\u5E73\u53F0\u67E5\u770B\u751F\u6210\u7684\u6587\u6863\u7684\u5B57\u7B26\u96C6
+doclet.usage.charset.description=用于跨平台查看生成的文档的字符集
 
-doclet.usage.javafx.description=\u542F\u7528 JavaFX \u529F\u80FD
+doclet.usage.javafx.description=启用 JavaFX 功能
 
 doclet.usage.helpfile.parameters=<file>
-doclet.usage.helpfile.description=\u5305\u542B\u5E2E\u52A9\u94FE\u63A5\u6240\u94FE\u63A5\u5230\u7684\u6587\u4EF6
+doclet.usage.helpfile.description=包含帮助链接所链接到的文件
 
-doclet.usage.linksource.description=\u4EE5 HTML \u683C\u5F0F\u751F\u6210\u6E90\u6587\u4EF6
+doclet.usage.linksource.description=以 HTML 格式生成源文件
 
 doclet.usage.sourcetab.parameters=<tab length>
-doclet.usage.sourcetab.description=\u6307\u5B9A\u6E90\u4E2D\u6BCF\u4E2A\u5236\u8868\u7B26\u5360\u636E\u7684\u7A7A\u683C\u6570
+doclet.usage.sourcetab.description=指定源中每个制表符占据的空格数
 
-doclet.usage.keywords.description=\u968F\u7A0B\u5E8F\u5305, \u7C7B\u548C\u6210\u5458\u4FE1\u606F\u4E00\u8D77\u9644\u5E26 HTML \u5143\u6807\u8BB0
+doclet.usage.keywords.description=随程序包, 类和成员信息一起附带 HTML 元标记
 
 doclet.usage.main-stylesheet.parameters=<file>
-doclet.usage.main-stylesheet.description=\u7528\u4E8E\u66F4\u6539\u751F\u6210\u6587\u6863\u7684\u6837\u5F0F\u7684\u6587\u4EF6
+doclet.usage.main-stylesheet.description=用于更改生成文档的样式的文件
 
 doclet.usage.docencoding.parameters=<name>
-doclet.usage.docencoding.description=\u6307\u5B9A\u8F93\u51FA\u7684\u5B57\u7B26\u7F16\u7801
+doclet.usage.docencoding.description=指定输出的字符编码
 
-doclet.usage.frames.description=\u5141\u8BB8\u5728\u751F\u6210\u7684\u8F93\u51FA\u4E2D\u4F7F\u7528\u5E27
+doclet.usage.frames.description=允许在生成的输出中使用帧
 
-doclet.usage.no-frames.description=\u7981\u6B62\u5728\u751F\u6210\u7684\u8F93\u51FA\u4E2D\u4F7F\u7528\u5E27\uFF08\u9ED8\u8BA4\u503C\uFF09
+doclet.usage.no-frames.description=禁止在生成的输出中使用帧（默认值）
 
 doclet.usage.override-methods.parameters=(detail|summary)
 
-doclet.usage.override-methods.description=\u5728\u8BE6\u7EC6\u4FE1\u606F\u90E8\u5206\u6216\u6982\u8981\u90E8\u5206\u4E2D\u8BB0\u5F55\u88AB\u8986\u76D6\u7684\u65B9\u6CD5\u3002\n\u9ED8\u8BA4\u503C\u4E3A 'detail'\u3002
+doclet.usage.override-methods.description=在详细信息部分或概要部分中记录被覆盖的方法。\n默认值为 'detail'。
 
-doclet.usage.allow-script-in-comments.description=\u5141\u8BB8\u5728\u9009\u9879\u548C\u6CE8\u91CA\u4E2D\u4F7F\u7528 JavaScript
+doclet.usage.allow-script-in-comments.description=允许在选项和注释中使用 JavaScript
 
 doclet.usage.xdocrootparent.parameters=<url>
-doclet.usage.xdocrootparent.description=\u5C06\u6587\u6863\u6CE8\u91CA\u4E2D\u51FA\u73B0\u7684\u6240\u6709\u540E\u8DDF /.. \u7684 @docRoot \u66FF\u6362\u4E3A\n<url>
+doclet.usage.xdocrootparent.description=将文档注释中出现的所有后跟 /.. 的 @docRoot 替换为\n<url>
 
-doclet.usage.xdoclint.description=\u4E3A javadoc \u6CE8\u91CA\u4E2D\u7684\u95EE\u9898\u542F\u7528\u5EFA\u8BAE\u7684\u68C0\u67E5
+doclet.usage.xdoclint.description=为 javadoc 注释中的问题启用建议的检查
 
 doclet.usage.xdoclint-extended.parameters=(all|none|[-]<group>)
 # L10N: do not localize these words: all none accessibility html missing reference syntax
-doclet.usage.xdoclint-extended.description=\u9488\u5BF9 javadoc\n\u6CE8\u91CA\u4E2D\u7684\u95EE\u9898\n                                  \u542F\u7528\u6216\u7981\u7528\u7279\u5B9A\u68C0\u67E5,\n                                  \u5176\u4E2D <\u7EC4> \u4E3A accessibility, html,\nmissing, reference \u6216 syntax \u4E4B\u4E00\u3002
+doclet.usage.xdoclint-extended.description=针对 javadoc\n注释中的问题\n                                  启用或禁用特定检查,\n                                  其中 <组> 为 accessibility, html,\nmissing, reference 或 syntax 之一。
 
 doclet.usage.xdoclint-package.parameters=([-]<packages>)
-doclet.usage.xdoclint-package.description=\u5728\u7279\u5B9A\u7684\u7A0B\u5E8F\u5305\u4E2D\u542F\u7528\u6216\u7981\u7528\u68C0\u67E5\u3002<\u7A0B\u5E8F\u5305>\n\u662F\u9017\u53F7\u5206\u9694\u7684\u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u5217\u8868\u3002\u7A0B\u5E8F\u5305\n\u8BF4\u660E\u7B26\u662F\u7A0B\u5E8F\u5305\u7684\u9650\u5B9A\u540D\u79F0\u6216\u7A0B\u5E8F\u5305\u540D\u79F0\n\u524D\u7F00\u540E\u8DDF .*, \u5B83\u6269\u5C55\u5230\u7ED9\u5B9A\u7A0B\u5E8F\u5305\u7684\u6240\u6709\n\u5B50\u7A0B\u5E8F\u5305\u3002\u5728\u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u524D\u9762\u52A0\u4E0A - \u53EF\u4EE5\n\u4E3A\u6307\u5B9A\u7A0B\u5E8F\u5305\u7981\u7528\u68C0\u67E5\u3002
+doclet.usage.xdoclint-package.description=在特定的程序包中启用或禁用检查。<程序包>\n是逗号分隔的程序包说明符列表。程序包\n说明符是程序包的限定名称或程序包名称\n前缀后跟 .*, 它扩展到给定程序包的所有\n子程序包。在程序包说明符前面加上 - 可以\n为指定程序包禁用检查。
 
 doclet.usage.spec-base-url=<URL>
-doclet.usage.spec-base-url.description=\u5728 @spec \u6807\u8BB0\u4E2D\u6307\u5B9A\u76F8\u5BF9 URL \u7684\u57FA\u7840 URL
+doclet.usage.spec-base-url.description=在 @spec 标记中指定相对 URL 的基础 URL
 
-doclet.Invalid_URL=URL \u65E0\u6548\uFF1A{0}
+doclet.Invalid_URL=URL 无效：{0}
 
 # L10N: do not localize the option name --no-frames
-doclet.NoFrames_specified=--no-frames \u9009\u9879\u4E0D\u518D\u662F\u5FC5\u9700\u7684\uFF0C\u53EF\u80FD\n\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u6B64\u9009\u9879\u3002
+doclet.NoFrames_specified=--no-frames 选项不再是必需的，可能\n会在未来发行版中删除此选项。
 
 # L10N: do not localize the option name -footer
-doclet.footer_specified=-footer \u9009\u9879\u4E0D\u518D\u53D7\u652F\u6301\u5E76\u5C06\u88AB\u5FFD\u7565\u3002\n\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u6B64\u9009\u9879\u3002
+doclet.footer_specified=-footer 选项不再受支持并将被忽略。\n可能会在未来发行版中删除此选项。
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
index f35e9edbac4..a6ccd29a36e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
@@ -24,45 +24,45 @@
 #
 
 doclet.Generating_0={0} wird generiert...
-doclet.MissingSerialTag=in Klasse {0} fehlt das Tag @serial f\u00FCr standardm\u00E4\u00DFig serialisierbares Feld: {1}.
+doclet.MissingSerialTag=in Klasse {0} fehlt das Tag @serial für standardmäßig serialisierbares Feld: {1}.
 doclet.MissingSerialDataTag=in Klasse {0} fehlt das Tag @serialData in Methode {1}.
 doclet.Serializable_no_customization=Keine readObject- oder writeObject-Methode deklariert.
 doclet.Serialized_Form=Serialisierte Form
 doclet.Serialized_Form_methods=Serialisierungsmethoden
 doclet.Serialized_Form_fields=Serialisierte Felder
-doclet.Serialized_Form_class=Serialisierungs\u00FCberblick
+doclet.Serialized_Form_class=Serialisierungsüberblick
 doclet.Option_conflict=Option {0} steht in Konflikt mit {1}
 doclet.Option_reuse=Option wiederverwendet: {0}
-doclet.Option_invalid=Ung\u00FCltiges Argument {0} f\u00FCr Option {1}
-doclet.Option_doclint_no_qualifiers=Zugriffs-Qualifier f\u00FCr Argumente f\u00FCr -Xdoclint nicht zul\u00E4ssig
-doclet.Option_doclint_invalid_arg=Ung\u00FCltiges Argument f\u00FCr Option -Xdoclint
-doclet.Option_doclint_package_invalid_arg=Ung\u00FCltiges Argument f\u00FCr Option -Xdoclint/package
+doclet.Option_invalid=Ungültiges Argument {0} für Option {1}
+doclet.Option_doclint_no_qualifiers=Zugriffs-Qualifier für Argumente für -Xdoclint nicht zulässig
+doclet.Option_doclint_invalid_arg=Ungültiges Argument für Option -Xdoclint
+doclet.Option_doclint_package_invalid_arg=Ungültiges Argument für Option -Xdoclint/package
 doclet.error.initializing.dest.dir=Fehler beim Initialisieren des Zielverzeichnisses: {0}
 doclet.exception.read.file=Fehler beim Lesen der Datei: {0}\n\t({1})
 doclet.exception.write.file=Fehler beim Schreiben der Datei: {0}\n\t({1})
 doclet.exception.read.resource=Fehler beim Lesen der Systemressource: {0}\n\t({1})
 doclet.internal.exception=Eine interne Ausnahme ist aufgetreten.\n\t({0})
-doclet.internal.report.bug=Melden Sie auf der Java-Seite zum Melden von Bugs (https://bugreport.java.com) einen Bug\nf\u00FCr das javadoc-Tool, nachdem Sie in der Bugdatenbank (https://bugs.java.com) nach Duplikaten\ngesucht haben. Nehmen Sie Fehlermeldungen und die folgende Diagnose in den Bericht auf. Vielen Dank.
+doclet.internal.report.bug=Melden Sie auf der Java-Seite zum Melden von Bugs (https://bugreport.java.com) einen Bug\nfür das javadoc-Tool, nachdem Sie in der Bugdatenbank (https://bugs.java.com) nach Duplikaten\ngesucht haben. Nehmen Sie Fehlermeldungen und die folgende Diagnose in den Bericht auf. Vielen Dank.
 doclet.File_not_found=Datei nicht gefunden: {0}
 doclet.snippet_file_not_found=Datei nicht gefunden in Quellpfad oder Snippet-Pfad: {0}
 doclet.Copy_Overwrite_warning=Datei {0} wurde nicht in {1} kopiert, da bereits eine Datei mit demselben Namen vorhanden ist...
-doclet.Copy_Ignored_warning=Die Datei {0} wurde nicht kopiert: ung\u00FCltiger Name
+doclet.Copy_Ignored_warning=Die Datei {0} wurde nicht kopiert: ungültiger Name
 doclet.Copy_to_clipboard=Kopieren
 doclet.Copied_to_clipboard=Kopiert.
 doclet.Copy_url_to_clipboard=URL kopieren
 doclet.Copy_snippet_to_clipboard=Snippet kopieren
 doclet.Copying_File_0_To_Dir_1=Datei {0} wird in Verzeichnis {1} kopiert...
 doclet.Copying_File_0_To_File_1=Datei {0} wird in Datei {1} kopiert...
-doclet.No_Public_Classes_To_Document=Keine \u00F6ffentlichen oder gesch\u00FCtzten Klassen zur Dokumentation gefunden.
+doclet.No_Public_Classes_To_Document=Keine öffentlichen oder geschützten Klassen zur Dokumentation gefunden.
 doclet.destination_directory_not_directory_0=Ziel ist kein Verzeichnis: {0}
-doclet.destination_directory_not_writable_0=Zielverzeichnis ist schreibgesch\u00FCtzt: {0}
-doclet.Encoding_not_supported=Codierung nicht unterst\u00FCtzt: {0}
-doclet.Building_Tree=Baum f\u00FCr alle Packages und Klassen wird erstellt...
-doclet.Building_Index=Index f\u00FCr alle Packages und Klassen wird erstellt...
-doclet.Building_Index_For_All_Classes=Index f\u00FCr alle Klassen wird erstellt...
-doclet.sourcetab_warning=Das Argument f\u00FCr -sourcetab muss eine Ganzzahl sein, die gr\u00F6\u00DFer als 0 ist.
+doclet.destination_directory_not_writable_0=Zielverzeichnis ist schreibgeschützt: {0}
+doclet.Encoding_not_supported=Codierung nicht unterstützt: {0}
+doclet.Building_Tree=Baum für alle Packages und Klassen wird erstellt...
+doclet.Building_Index=Index für alle Packages und Klassen wird erstellt...
+doclet.Building_Index_For_All_Classes=Index für alle Klassen wird erstellt...
+doclet.sourcetab_warning=Das Argument für -sourcetab muss eine Ganzzahl sein, die größer als 0 ist.
 doclet.JavaScript_in_comment=JavaScript in Dokumentationskommentar gefunden.\nVerwenden Sie --allow-script-in-comments, um die Verwendung von JavaScript zuzulassen.
-doclet.JavaScript_in_option=Option {0} enth\u00E4lt JavaScript.\nVerwenden Sie --allow-script-in-comments, um die Verwendung von JavaScript zuzulassen.
+doclet.JavaScript_in_option=Option {0} enthält JavaScript.\nVerwenden Sie --allow-script-in-comments, um die Verwendung von JavaScript zuzulassen.
 doclet.Link_icon=Linksymbol
 doclet.Link_to_section=Link zu diesem Abschnitt
 doclet.Packages=Packages
@@ -73,10 +73,10 @@ doclet.Other_Packages=Andere Packages
 doclet.Other_Modules=Andere Module
 doclet.Notice_taglet_registered=Taglet {0} wurde registriert...
 doclet.Notice_taglet_unseen=Hinweis: Nicht gefundene benutzerdefinierte Tags: {0}
-doclet.Notice_taglet_overridden=Hinweis: Benutzerdefinierte Tags, die Standardtags au\u00DFer Kraft setzen: {0}
-doclet.Notice_taglet_conflict_warn=Hinweis: Benutzerdefinierte Tags, die zuk\u00FCnftige Standardtags au\u00DFer Kraft setzen k\u00F6nnten: {0}. Um potenzielle Overrides zu vermeiden, verwenden Sie in den Namen benutzerdefinierter Tags mindestens einen Punkt (.).
-doclet.Error_taglet_not_registered=Fehler - Ausnahme {0} wurde beim Versuch ausgel\u00F6st, Taglet {1} zu registrieren...
-doclet.Error_invalid_custom_tag_argument=Fehler - {0} ist ein ung\u00FCltiges Argument f\u00FCr die Option -tag...
+doclet.Notice_taglet_overridden=Hinweis: Benutzerdefinierte Tags, die Standardtags außer Kraft setzen: {0}
+doclet.Notice_taglet_conflict_warn=Hinweis: Benutzerdefinierte Tags, die zukünftige Standardtags außer Kraft setzen könnten: {0}. Um potenzielle Overrides zu vermeiden, verwenden Sie in den Namen benutzerdefinierter Tags mindestens einen Punkt (.).
+doclet.Error_taglet_not_registered=Fehler - Ausnahme {0} wurde beim Versuch ausgelöst, Taglet {1} zu registrieren...
+doclet.Error_invalid_custom_tag_argument=Fehler - {0} ist ein ungültiges Argument für die Option -tag...
 doclet.taglet_could_not_set_location = Taglet-Pfad konnte nicht festgelegt werden: {0}
 doclet.not_standard_file_manager = Taglet-Pfad kann nicht festgelegt werden, der Dateimanager ist kein StandardJavaFileManager
 doclet.Author=Autor:
@@ -85,7 +85,7 @@ doclet.PropertyDescription=Eigenschaftsbeschreibung:
 doclet.PropertyGetterWithName=Ruft den Wert der {0}-Eigenschaft ab.
 doclet.PropertyGetterReturn=Wert der Eigenschaft {0}
 doclet.PropertySetterWithName=Legt den Wert der {0}-Eigenschaft fest.
-doclet.PropertySetterParam=Wert f\u00FCr die Eigenschaft {0}
+doclet.PropertySetterParam=Wert für die Eigenschaft {0}
 doclet.PropertyMethodReturn=die Eigenschaft {0}
 doclet.Default=Standard:
 doclet.Parameters=Parameter:
@@ -97,48 +97,48 @@ doclet.TypeParameters_warn=@param-Argument "{0}" ist nicht der Name eines Typpar
 doclet.TypeParameters_dup_warn=Typparameter "{0}" ist mehrmals dokumentiert.
 doclet.RecordComponents_warn=@param-Argument "{0}" ist nicht der Name einer Datensatzkomponente.
 doclet.RecordComponents_dup_warn=Datensatzkomponente "{0}" ist mehrmals dokumentiert.
-doclet.Returns=Gibt zur\u00FCck:
-doclet.Returns_0=Gibt {0} zur\u00FCck.
-doclet.Return_tag_on_void_method=@return-Tag kann nicht in Methode mit ung\u00FCltigem R\u00FCckgabetyp verwendet werden.
+doclet.Returns=Gibt zurück:
+doclet.Returns_0=Gibt {0} zurück.
+doclet.Return_tag_on_void_method=@return-Tag kann nicht in Methode mit ungültigem Rückgabetyp verwendet werden.
 doclet.See_Also=Siehe auch:
 doclet.SerialData=Serielle Daten:
 doclet.Services=Services
 doclet.Since=Seit:
-doclet.Throws=L\u00F6st aus:
+doclet.Throws=Löst aus:
 doclet.Version=Version:
 doclet.Factory=Factory:
 doclet.UnknownTag={0} ist ein unbekanntes Tag.
-doclet.UnknownTagLowercase={0} ist ein unbekanntes Tag - bis auf die Gro\u00DF-/Kleinschreibung identisch mit einem bekannten Tag.
-doclet.inheritDocBadSupertype=Die au\u00DFer Kraft gesetzte Methode kann nicht gefunden werden
+doclet.UnknownTagLowercase={0} ist ein unbekanntes Tag - bis auf die Groß-/Kleinschreibung identisch mit einem bekannten Tag.
+doclet.inheritDocBadSupertype=Die außer Kraft gesetzte Methode kann nicht gefunden werden
 doclet.inheritDocWithinInappropriateTag=@inheritDoc kann in diesem Tag nicht verwendet werden
-doclet.inheritDocNoDoc=\u00FCberschriebene Methoden dokumentieren Ausnahmetyp {0} nicht
-doclet.throwsInheritDocUnsupported=@inheritDoc wird f\u00FCr Parameter vom Typ Ausnahme, die nicht von einer Methode deklariert werden, nicht unterst\u00FCtzt. Dokumentieren Sie solche Ausnahmetypen direkt.
-doclet.noInheritedDoc=@inheritDoc wurde verwendet, aber mit {0} wird keine Methode au\u00DFer Kraft gesetzt oder implementiert.
+doclet.inheritDocNoDoc=überschriebene Methoden dokumentieren Ausnahmetyp {0} nicht
+doclet.throwsInheritDocUnsupported=@inheritDoc wird für Parameter vom Typ Ausnahme, die nicht von einer Methode deklariert werden, nicht unterstützt. Dokumentieren Sie solche Ausnahmetypen direkt.
+doclet.noInheritedDoc=@inheritDoc wurde verwendet, aber mit {0} wird keine Methode außer Kraft gesetzt oder implementiert.
 doclet.tag_misuse=Tag {0} kann nicht in {1}-Dokumentation verwendet werden. Es kann nur in folgenden Dokumentationstypen verwendet werden: {2}.
-doclet.Package_Summary=Package\u00FCbersicht
+doclet.Package_Summary=Packageübersicht
 doclet.Requires_Summary=Erfordernisse
 doclet.Indirect_Requires_Summary=Indirekte Erfordernisse
-doclet.Indirect_Exports_Summary=Indirekte Exportvorg\u00E4nge
-doclet.Indirect_Opens_Summary=Indirekte \u00D6ffnungsvorg\u00E4nge
+doclet.Indirect_Exports_Summary=Indirekte Exportvorgänge
+doclet.Indirect_Opens_Summary=Indirekte Öffnungsvorgänge
 doclet.Exported_Packages_Summary=Exporte
-doclet.Opened_Packages_Summary=\u00D6ffnungsvorg\u00E4nge
+doclet.Opened_Packages_Summary=Öffnungsvorgänge
 doclet.Concealed_Packages_Summary=Ausgeblendet
 doclet.From=Von
 doclet.Uses_Summary=Verwendungen
 doclet.Provides_Summary=Bereitstellungen
-doclet.Nested_Class_Summary=Verschachtelte Klassen - \u00DCbersicht
-doclet.Annotation_Type_Optional_Member_Summary=Optionale Elemente - \u00DCbersicht
-doclet.Annotation_Type_Required_Member_Summary=Erforderliche Elemente - \u00DCbersicht
-doclet.Field_Summary=Feld\u00FCbersicht
-doclet.Property_Summary=Eigenschafts\u00FCbersicht
-doclet.Enum_Constant_Summary=Enum-Konstanten - \u00DCbersicht
-doclet.Constructor_Summary=Konstruktor\u00FCbersicht
-doclet.Method_Summary=Methoden\u00FCbersicht
+doclet.Nested_Class_Summary=Verschachtelte Klassen - Übersicht
+doclet.Annotation_Type_Optional_Member_Summary=Optionale Elemente - Übersicht
+doclet.Annotation_Type_Required_Member_Summary=Erforderliche Elemente - Übersicht
+doclet.Field_Summary=Feldübersicht
+doclet.Property_Summary=Eigenschaftsübersicht
+doclet.Enum_Constant_Summary=Enum-Konstanten - Übersicht
+doclet.Constructor_Summary=Konstruktorübersicht
+doclet.Method_Summary=Methodenübersicht
 doclet.Interfaces=Schnittstellen
 doclet.Enums=Enums
 doclet.EnumClasses=Enum-Klassen
 doclet.RecordClasses=Datensatzklassen
-doclet.Related_Packages=Zugeh\u00F6rige Packages
+doclet.Related_Packages=Zugehörige Packages
 doclet.AnnotationTypes=Annotationstypen
 doclet.AnnotationInterfaces=Annotationsschnittstellen
 doclet.ExceptionClasses=Ausnahmeklassen
@@ -167,7 +167,7 @@ doclet.recordclass=Datensatzklasse
 doclet.ExceptionClass=Ausnahmeklasse
 doclet.exceptionclass=Ausnahmeklasse
 doclet.ExportedTo=In Module exportiert
-doclet.OpenedTo=In Modulen ge\u00F6ffnet
+doclet.OpenedTo=In Modulen geöffnet
 doclet.Package_private=(Package privat)
 doclet.Nested_Classes_Interfaces_Inherited_From_Class=Von Klasse geerbte verschachtelte Klassen/Schnittstellen
 doclet.Nested_Classes_Interfaces_Inherited_From_Interface=Von Schnittstelle geerbte verschachtelte Klassen/Schnittstellen
@@ -193,12 +193,12 @@ doclet.Property_Detail=Eigenschaftsdetails
 doclet.Method_Detail=Methodendetails
 doclet.Constructor_Detail=Konstruktordetails
 doclet.Deprecated=Veraltet.
-doclet.DeprecatedForRemoval=Veraltet, zur Entfernung: Dieses API-Element wird in einer zuk\u00FCnftigen Version entfernt.
+doclet.DeprecatedForRemoval=Veraltet, zur Entfernung: Dieses API-Element wird in einer zukünftigen Version entfernt.
 doclet.Groupname_already_used=In der Option -group wird der Gruppenname bereits verwendet: {0}
 doclet.value_tag_invalid_reference={0} (referenziert von @value-Tag) ist eine unbekannte Referenz.
 doclet.value_tag_invalid_constant=@value-Tag (das {0} referenziert) kann nur in Konstanten verwendet werden.
 doclet.value_tag_invalid_use=@value-Tag kann hier nicht verwendet werden.
-doclet.value_tag_invalid_format=Ung\u00FCltiges Format: {0}
+doclet.value_tag_invalid_format=Ungültiges Format: {0}
 doclet.dest_dir_create=Zielverzeichnis wird erstellt: "{0}"
 doclet.in={0} in {1}
 doclet.Fields=Felder
@@ -223,7 +223,7 @@ doclet.Modifier_and_Type=Modifizierer und Typ
 doclet.Implementation=Implementierung(en):
 doclet.search=SEARCH
 doclet.search_placeholder=Suchen
-doclet.search_reset=Zur\u00FCcksetzen
+doclet.search_reset=Zurücksetzen
 doclet.Field=Feld
 doclet.Property=Eigenschaft
 doclet.Constructor=Konstruktor
@@ -238,25 +238,25 @@ doclet.ConstantField=Konstantenfeld
 doclet.Value=Wert
 doclet.linkMismatch_PackagedLinkedtoModule=Der Code, der dokumentiert wird, verwendet Packages im unbenannten Modul, aber die in {0} definierten Packages befinden sich in benannten Modulen.
 doclet.linkMismatch_ModuleLinkedtoPackage=Der Code, der dokumentiert wird, verwendet Module, aber die in {0} definierten Packages befinden sich im unbenannten Modul.
-doclet.urlRedirected=URL {0} wurde umgeleitet an {1} - Aktualisieren Sie die Befehlszeilenoptionen, um diese Warnung zu unterdr\u00FCcken.
-doclet.duplicate.comment.for.property=Doppelter Kommentar f\u00FCr Eigenschaft.\nEntfernen Sie den Kommentar auf dem Eigenschaftsfeld oder in dieser Methode, um diese Warnung zu unterdr\u00FCcken.
+doclet.urlRedirected=URL {0} wurde umgeleitet an {1} - Aktualisieren Sie die Befehlszeilenoptionen, um diese Warnung zu unterdrücken.
+doclet.duplicate.comment.for.property=Doppelter Kommentar für Eigenschaft.\nEntfernen Sie den Kommentar auf dem Eigenschaftsfeld oder in dieser Methode, um diese Warnung zu unterdrücken.
 
 #Documentation for Enums
-doclet.enum_values_doc.fullbody=Gibt ein Array mit den Konstanten dieses Enum-Typs in\nder Reihenfolge ihrer Deklaration zur\u00FCck.
-doclet.enum_class_values_doc.fullbody=Gibt ein Array mit den Konstanten dieser Enum-Klasse in\nder Reihenfolge ihrer Deklaration zur\u00FCck.
+doclet.enum_values_doc.fullbody=Gibt ein Array mit den Konstanten dieses Enum-Typs in\nder Reihenfolge ihrer Deklaration zurück.
+doclet.enum_class_values_doc.fullbody=Gibt ein Array mit den Konstanten dieser Enum-Klasse in\nder Reihenfolge ihrer Deklaration zurück.
 
 doclet.enum_values_doc.return=ein Array mit den Konstanten dieses Enumerationstyps in der Reihenfolge ihrer Deklaration
 doclet.enum_class_values_doc.return=ein Array mit den Konstanten dieser Enum-Klasse in der Reihenfolge ihrer Deklaration
 
-doclet.enum_valueof_doc.fullbody=Gibt die Enumerationskonstante dieses Typs mit dem angegebenen Namen zur\u00FCck.\nDie Zeichenfolge muss <i>exakt</i> mit einer ID \u00FCbereinstimmen,\nmit der eine Enumerationskonstante in diesem Typ deklariert wird.\n(Zus\u00E4tzliche Leerzeichen sind nicht zul\u00E4ssig.)
-doclet.enum_class_valueof_doc.fullbody=Gibt die Enum-Konstante dieser Klasse mit dem angegebenen Namen zur\u00FCck.\nDie Zeichenfolge muss <i>exakt</i> mit einer ID \u00FCbereinstimmen,\nmit der eine Enum-Konstante in dieser Klasse deklariert wird.\n(Zus\u00E4tzliche Leerzeichen sind nicht zul\u00E4ssig.)
+doclet.enum_valueof_doc.fullbody=Gibt die Enumerationskonstante dieses Typs mit dem angegebenen Namen zurück.\nDie Zeichenfolge muss <i>exakt</i> mit einer ID übereinstimmen,\nmit der eine Enumerationskonstante in diesem Typ deklariert wird.\n(Zusätzliche Leerzeichen sind nicht zulässig.)
+doclet.enum_class_valueof_doc.fullbody=Gibt die Enum-Konstante dieser Klasse mit dem angegebenen Namen zurück.\nDie Zeichenfolge muss <i>exakt</i> mit einer ID übereinstimmen,\nmit der eine Enum-Konstante in dieser Klasse deklariert wird.\n(Zusätzliche Leerzeichen sind nicht zulässig.)
 
-doclet.enum_valueof_doc.param_name=Name der zur\u00FCckzugebenden Enumerationskonstante.
+doclet.enum_valueof_doc.param_name=Name der zurückzugebenden Enumerationskonstante.
 
 doclet.enum_valueof_doc.return=Enumerationskonstante mit dem angegebenen Namen
 
-doclet.enum_valueof_doc.throws_ila=wenn dieser Enumerationstyp keine Konstante mit dem angegebenen Namen enth\u00E4lt
-doclet.enum_class_valueof_doc.throws_ila=wenn diese Enum-Klasse keine Konstante mit dem angegebenen Namen enth\u00E4lt
+doclet.enum_valueof_doc.throws_ila=wenn dieser Enumerationstyp keine Konstante mit dem angegebenen Namen enthält
+doclet.enum_class_valueof_doc.throws_ila=wenn diese Enum-Klasse keine Konstante mit dem angegebenen Namen enthält
 
 doclet.enum_valueof_doc.throws_npe=wenn das Argument nicht angegeben wird
 
@@ -264,9 +264,9 @@ doclet.enum_valueof_doc.throws_npe=wenn das Argument nicht angegeben wird
 #Documentation for records
 doclet.record_constructor_doc.fullbody=Erstellt eine Instanz einer Datensatzklasse {0}.
 
-doclet.record_constructor_doc.param_name=Wert f\u00FCr die Datensatzkomponente {0}
+doclet.record_constructor_doc.param_name=Wert für die Datensatzkomponente {0}
 
-doclet.record_equals_doc.fullbody.head=Gibt an, ob ein anderes Objekt diesem gleich ("equal to") ist. Die Objekte sind gleich, wenn das andere Objekt der gleichen Klasse angeh\u00F6rt und alle Datensatzkomponenten gleich sind.
+doclet.record_equals_doc.fullbody.head=Gibt an, ob ein anderes Objekt diesem gleich ("equal to") ist. Die Objekte sind gleich, wenn das andere Objekt der gleichen Klasse angehört und alle Datensatzkomponenten gleich sind.
 
 doclet.record_equals_doc.fullbody.tail.both=Referenzkomponenten werden verglichen mit {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}; primitive Komponenten werden verglichen mit "==".
 
@@ -278,19 +278,19 @@ doclet.record_equals_doc.param_name=das Objekt, mit dem verglichen wird
 
 doclet.record_equals_doc.return=<code>true</code>, wenn dieses Objekt gleich dem Argument {0} ist, andernfalls <code>false</code>.
 
-doclet.record_hashCode_doc.fullbody=Gibt einen Hashcodewert f\u00FCr diese Objekt zur\u00FCck. Der Wert wird vom Hashcode jeder der Datensatzkomponenten abgeleitet.
+doclet.record_hashCode_doc.fullbody=Gibt einen Hashcodewert für diese Objekt zurück. Der Wert wird vom Hashcode jeder der Datensatzkomponenten abgeleitet.
 
-doclet.record_hashCode_doc.return=ein Hashcodewert f\u00FCr dieses Objekt
+doclet.record_hashCode_doc.return=ein Hashcodewert für dieses Objekt
 
-doclet.record_toString_doc.fullbody=Gibt eine Zeichenfolgendarstellung dieser Datensatzklasse zur\u00FCck. Die Darstellung enth\u00E4lt den Namen der Klasse, gefolgt vom Namen und Wert jeder der Datensatzkomponenten.
+doclet.record_toString_doc.fullbody=Gibt eine Zeichenfolgendarstellung dieser Datensatzklasse zurück. Die Darstellung enthält den Namen der Klasse, gefolgt vom Namen und Wert jeder der Datensatzkomponenten.
 
 doclet.record_toString_doc.return=eine Zeichenfolgendarstellung dieses Objekts
 
-doclet.record_accessor_doc.fullbody=Gibt den Wert f\u00FCr die Datensatzkomponente {0} zur\u00FCck.
+doclet.record_accessor_doc.fullbody=Gibt den Wert für die Datensatzkomponente {0} zurück.
 
 doclet.record_accessor_doc.return=Wert der Datensatzkomponente {0}
 
-doclet.record_field_doc.fullbody=Das Feld f\u00FCr die Datensatzkomponente {0}.
+doclet.record_field_doc.fullbody=Das Feld für die Datensatzkomponente {0}.
 
 doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/
 doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/
@@ -301,7 +301,7 @@ doclet.search.no_results=Keine Ergebnisse gefunden
 doclet.search.one_result=Ein Ergebnis gefunden
 doclet.search.many_results={0} Ergebnisse gefunden
 doclet.search.loading=Suchindex wird geladen...
-doclet.search.searching=Suche wird ausgef\u00FChrt...
+doclet.search.searching=Suche wird ausgeführt...
 doclet.search.redirecting=Zum ersten Ergebnis wird umgeleitet...
 doclet.search.modules=Module
 doclet.search.packages=Packages
@@ -316,13 +316,13 @@ doclet.snippet.contents.ambiguity.external=@snippet gibt mehrere externe Inhalte
 
 doclet.snippet.region.not_found=Region nicht gefunden: "{0}"
 
-doclet.tag.attribute.value.illegal=ung\u00FCltiger Wert f\u00FCr Attribut "{0}": "{1}"
+doclet.tag.attribute.value.illegal=ungültiger Wert für Attribut "{0}": "{1}"
 
-doclet.tag.attribute.value.missing=fehlender Wert f\u00FCr Attribut "{0}"
+doclet.tag.attribute.value.missing=fehlender Wert für Attribut "{0}"
 
 doclet.tag.attribute.repeated=wiederholtes Attribut: "{0}"
 
-doclet.snippet.contents.mismatch=Inhalt stimmt nicht \u00FCberein:\n{0}
+doclet.snippet.contents.mismatch=Inhalt stimmt nicht überein:\n{0}
 
 doclet.snippet.markup=snippet-Markup: {0}
 
@@ -330,9 +330,9 @@ doclet.snippet.markup.spurious=falsches Markup
 doclet.snippet.markup.attribute.absent=Attribut "{0}" fehlt
 doclet.snippet.markup.attribute.simultaneous.use=Attribute "{0}" und "{1}" gleichzeitig verwendet
 doclet.snippet.markup.attribute.unexpected=unerwartetes Attribut
-doclet.snippet.markup.attribute.value.invalid=Ung\u00FCltiger Attributwert
+doclet.snippet.markup.attribute.value.invalid=Ungültiger Attributwert
 doclet.snippet.markup.attribute.value.unterminated=nicht beendeter Attributwert
-doclet.snippet.markup.regex.invalid=ung\u00FCltiger regul\u00E4rer Ausdruck
+doclet.snippet.markup.regex.invalid=ungültiger regulärer Ausdruck
 doclet.snippet.markup.region.duplicated=doppelte Region
 doclet.snippet.markup.region.none=keine Region zum Beenden
 doclet.snippet.markup.region.unpaired=nicht gepaarte Region
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
index 6c02da92514..90ef0936298 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
@@ -23,323 +23,323 @@
 # questions.
 #
 
-doclet.Generating_0={0}\u306E\u751F\u6210\u4E2D...
-doclet.MissingSerialTag=\u30AF\u30E9\u30B9{0}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u76F4\u5217\u5316\u53EF\u80FD\u30D5\u30A3\u30FC\u30EB\u30C9{1}\u306E\u305F\u3081\u306E@serial\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-doclet.MissingSerialDataTag=\u30AF\u30E9\u30B9{0}\u306E\u30E1\u30BD\u30C3\u30C9{1}\u306B@serialData\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-doclet.Serializable_no_customization=readObject\u307E\u305F\u306FwriteObject\u30E1\u30BD\u30C3\u30C9\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-doclet.Serialized_Form=\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F
-doclet.Serialized_Form_methods=\u76F4\u5217\u5316\u30E1\u30BD\u30C3\u30C9
-doclet.Serialized_Form_fields=\u76F4\u5217\u5316\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Serialized_Form_class=\u76F4\u5217\u5316\u306E\u6982\u8981
-doclet.Option_conflict=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u304C{1}\u3068\u77DB\u76FE\u3057\u307E\u3059
-doclet.Option_reuse=\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u518D\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-doclet.Option_invalid={1}\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570{0}\u304C\u7121\u52B9\u3067\u3059
-doclet.Option_doclint_no_qualifiers=\u30A2\u30AF\u30BB\u30B9\u4FEE\u98FE\u5B50\u306F-Xdoclint\u306E\u5F15\u6570\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-doclet.Option_doclint_invalid_arg=-Xdoclint\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059
-doclet.Option_doclint_package_invalid_arg=-Xdoclint/package\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059
-doclet.error.initializing.dest.dir=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u521D\u671F\u5316\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}
-doclet.exception.read.file=\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\t({1})
-doclet.exception.write.file=\u30D5\u30A1\u30A4\u30EB\u306E\u66F8\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\t({1})
-doclet.exception.read.resource=\u30B7\u30B9\u30C6\u30E0\u30FB\u30EA\u30BD\u30FC\u30B9\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\t({1})
-doclet.internal.exception=\u5185\u90E8\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\t({0})
-doclet.internal.report.bug=\u30D0\u30B0\u30FB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9(https://bugs.java.com)\u3067\u91CD\u8907\u304C\u306A\u3044\u304B\u3092\u3054\u78BA\u8A8D\u306E\u3046\u3048\u3001Java\u306E\u30D0\u30B0\u30FB\u30EC\u30DD\u30FC\u30C8\u30FB\u30DA\u30FC\u30B8\n(https://bugreport.java.com)\u3067javadoc\u30C4\u30FC\u30EB\u306B\u5BFE\u3059\u308B\u30D0\u30B0\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\n\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3068\u6B21\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u3054\u5165\u529B\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
-doclet.File_not_found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-doclet.snippet_file_not_found=\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u307E\u305F\u306F\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D1\u30B9\u306B\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-doclet.Copy_Overwrite_warning=\u30D5\u30A1\u30A4\u30EB{0}\u306F\u540C\u3058\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308B\u306E\u3067{1}\u306B\u30B3\u30D4\u30FC\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F...
-doclet.Copy_Ignored_warning=\u30D5\u30A1\u30A4\u30EB{0}\u306F\u30B3\u30D4\u30FC\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F: \u540D\u524D\u304C\u7121\u52B9\u3067\u3059
-doclet.Copy_to_clipboard=\u30B3\u30D4\u30FC
-doclet.Copied_to_clipboard=\u30B3\u30D4\u30FC\u6E08
-doclet.Copy_url_to_clipboard=URL\u306E\u30B3\u30D4\u30FC
-doclet.Copy_snippet_to_clipboard=\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30B3\u30D4\u30FC
-doclet.Copying_File_0_To_Dir_1=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{1}\u306B\u30B3\u30D4\u30FC\u4E2D...
-doclet.Copying_File_0_To_File_1=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30D5\u30A1\u30A4\u30EB{1}\u306B\u30B3\u30D4\u30FC\u4E2D...
-doclet.No_Public_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308Bpublic\u307E\u305F\u306Fprotected\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-doclet.destination_directory_not_directory_0=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0}
-doclet.destination_directory_not_writable_0=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u66F8\u8FBC\u307F\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0}
-doclet.Encoding_not_supported=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0{0}\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-doclet.Building_Tree=\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u30AF\u30E9\u30B9\u306E\u968E\u5C64\u30C4\u30EA\u30FC\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
-doclet.Building_Index=\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
-doclet.Building_Index_For_All_Classes=\u5168\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
-doclet.sourcetab_warning=-sourcetab\u306E\u5F15\u6570\u306F0\u3088\u308A\u5927\u304D\u3044\u6574\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.JavaScript_in_comment=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u306BJavaScript\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\n--allow-script-in-comments\u3092\u4F7F\u7528\u3057\u3066\u3001JavaScript\u306E\u4F7F\u7528\u3092\u8A31\u53EF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-doclet.JavaScript_in_option=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306BJavaScript\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\n--allow-script-in-comments\u3092\u4F7F\u7528\u3057\u3066\u3001JavaScript\u306E\u4F7F\u7528\u3092\u8A31\u53EF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-doclet.Link_icon=\u30EA\u30F3\u30AF\u30FB\u30A2\u30A4\u30B3\u30F3
-doclet.Link_to_section=\u3053\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u30EA\u30F3\u30AF
-doclet.Packages=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Modules=\u30E2\u30B8\u30E5\u30FC\u30EB
-doclet.All_Modules=\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB
-doclet.Other_Packages=\u305D\u306E\u4ED6\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Other_Modules=\u305D\u306E\u4ED6\u306E\u30E2\u30B8\u30E5\u30FC\u30EB
-doclet.Notice_taglet_registered=\u767B\u9332\u3055\u308C\u305F\u30BF\u30B0\u30EC\u30C3\u30C8{0} ...
-doclet.Notice_taglet_unseen=\u30CE\u30FC\u30C8: \u975E\u8868\u793A\u306E\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0: {0}
-doclet.Notice_taglet_overridden=\u30CE\u30FC\u30C8: \u6A19\u6E96\u30BF\u30B0\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0: {0}
-doclet.Notice_taglet_conflict_warn=\u30CE\u30FC\u30C8: \u6A19\u6E96\u30BF\u30B0\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u53EF\u80FD\u6027\u306E\u3042\u308B\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0: {0}\u3002\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3092\u907F\u3051\u308B\u305F\u3081\u306B\u3001\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u540D\u306E\u4E2D\u306B\u5C11\u306A\u304F\u3068\u30821\u3064\u306E\u30D4\u30EA\u30AA\u30C9(.)\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-doclet.Error_taglet_not_registered=\u30A8\u30E9\u30FC - \u30BF\u30B0\u30EC\u30C3\u30C8{1}\u3092\u767B\u9332\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u3001\u4F8B\u5916{0}\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F...
-doclet.Error_invalid_custom_tag_argument=\u30A8\u30E9\u30FC - {0}\u306F-tag\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5BFE\u3057\u3066\u7121\u52B9\u306A\u5F15\u6570\u3067\u3059...
-doclet.taglet_could_not_set_location = \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D1\u30B9: {0}\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-doclet.not_standard_file_manager = \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D1\u30B9\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u304CStandardJavaFileManager\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-doclet.Author=\u4F5C\u6210\u8005:
-doclet.DefaultValue=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024:
-doclet.PropertyDescription=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8AAC\u660E:
-doclet.PropertyGetterWithName={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
-doclet.PropertyGetterReturn={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024
-doclet.PropertySetterWithName={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002
-doclet.PropertySetterParam={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024
-doclet.PropertyMethodReturn={0}\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.Default=\u30C7\u30D5\u30A9\u30EB\u30C8:
-doclet.Parameters=\u30D1\u30E9\u30E1\u30FC\u30BF:
-doclet.TypeParameters=\u578B\u30D1\u30E9\u30E1\u30FC\u30BF:
-doclet.RecordComponents=\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8:
-doclet.Parameters_warn=@param argument "{0}"\u306F\u30D1\u30E9\u30E1\u30FC\u30BF\u540D\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-doclet.Parameters_dup_warn=\u30D1\u30E9\u30E1\u30FC\u30BF"{0}"\u304C2\u56DE\u4EE5\u4E0A\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-doclet.TypeParameters_warn=@param argument "{0}"\u306F\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u540D\u524D\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-doclet.TypeParameters_dup_warn=\u578B\u30D1\u30E9\u30E1\u30FC\u30BF"{0}"\u304C2\u56DE\u4EE5\u4E0A\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-doclet.RecordComponents_warn=@param argument "{0}"\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u540D\u524D\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-doclet.RecordComponents_dup_warn=\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8"{0}"\u304C2\u56DE\u4EE5\u4E0A\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-doclet.Returns=\u623B\u308A\u5024:
-doclet.Returns_0={0}\u3092\u8FD4\u3057\u307E\u3059\u3002
-doclet.Return_tag_on_void_method=\u623B\u308A\u5024\u306E\u578B\u304Cvoid\u306E\u30E1\u30BD\u30C3\u30C9\u3067\u306F@return\u30BF\u30B0\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-doclet.See_Also=\u95A2\u9023\u9805\u76EE:
-doclet.SerialData=\u30B7\u30EA\u30A2\u30EB\u30FB\u30C7\u30FC\u30BF:
-doclet.Services=\u30B5\u30FC\u30D3\u30B9
-doclet.Since=\u5C0E\u5165\u3055\u308C\u305F\u30D0\u30FC\u30B8\u30E7\u30F3:
-doclet.Throws=\u4F8B\u5916:
-doclet.Version=\u30D0\u30FC\u30B8\u30E7\u30F3:
-doclet.Factory=\u30D5\u30A1\u30AF\u30C8\u30EA:
-doclet.UnknownTag={0}\u306F\u4E0D\u660E\u306A\u30BF\u30B0\u3067\u3059\u3002
-doclet.UnknownTagLowercase={0}\u306F\u4E0D\u660E\u306A\u30BF\u30B0\u3067\u3059\u3002\u5927\u6587\u5B57\u3068\u5C0F\u6587\u5B57\u306E\u533A\u5225\u3092\u9664\u3044\u3066\u306F\u65E2\u77E5\u306E\u30BF\u30B0\u3068\u540C\u3058\u3067\u3059\u3002
-doclet.inheritDocBadSupertype=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-doclet.inheritDocWithinInappropriateTag=@inheritDoc\u306F\u3001\u3053\u306E\u30BF\u30B0\u5185\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-doclet.inheritDocNoDoc=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u3067\u306F\u3001\u4F8B\u5916\u30BF\u30A4\u30D7{0}\u306F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u307E\u305B\u3093
-doclet.throwsInheritDocUnsupported=@inheritDoc\u306F\u3001\u30E1\u30BD\u30C3\u30C9\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u306A\u3044exception-type\u30BF\u30A4\u30D7\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u305D\u306E\u3088\u3046\u306A\u4F8B\u5916\u30BF\u30A4\u30D7\u306F\u76F4\u63A5\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u3066\u304F\u3060\u3055\u3044
-doclet.noInheritedDoc=@inheritDoc\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u306F\u3069\u306E\u30E1\u30BD\u30C3\u30C9\u3082\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u5B9F\u88C5\u3057\u3066\u3044\u307E\u305B\u3093\u3002
-doclet.tag_misuse={0}\u30BF\u30B0\u306F{1}\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u6B21\u306E\u30BF\u30A4\u30D7\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u307F\u3067\u3059: {2}\u3002
-doclet.Package_Summary=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981
-doclet.Requires_Summary=\u5FC5\u8981
-doclet.Indirect_Requires_Summary=\u9593\u63A5\u7684\u306B\u5FC5\u8981
-doclet.Indirect_Exports_Summary=\u9593\u63A5\u7684\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
-doclet.Indirect_Opens_Summary=\u9593\u63A5\u7684\u30AA\u30FC\u30D7\u30F3
-doclet.Exported_Packages_Summary=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
-doclet.Opened_Packages_Summary=\u30AA\u30FC\u30D7\u30F3
-doclet.Concealed_Packages_Summary=\u975E\u8868\u793A
-doclet.From=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u5143
-doclet.Uses_Summary=\u4F7F\u7528
-doclet.Provides_Summary=\u63D0\u4F9B
-doclet.Nested_Class_Summary=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306E\u6982\u8981
-doclet.Annotation_Type_Optional_Member_Summary=\u4EFB\u610F\u8981\u7D20\u306E\u6982\u8981
-doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9808\u8981\u7D20\u306E\u6982\u8981
-doclet.Field_Summary=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u6982\u8981
-doclet.Property_Summary=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u6982\u8981
-doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u6982\u8981
-doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u6982\u8981
-doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981
-doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Enums=\u5217\u6319
-doclet.EnumClasses=\u5217\u6319\u30AF\u30E9\u30B9
-doclet.RecordClasses=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9
-doclet.Related_Packages=\u95A2\u9023\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.AnnotationTypes=\u6CE8\u91C8\u578B
-doclet.AnnotationInterfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.ExceptionClasses=\u4F8B\u5916\u30AF\u30E9\u30B9
-doclet.Classes=\u30AF\u30E9\u30B9
-doclet.All_Classes_And_Interfaces=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.All_Superinterfaces=\u3059\u3079\u3066\u306E\u30B9\u30FC\u30D1\u30FC\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
-doclet.All_Implemented_Interfaces=\u3059\u3079\u3066\u306E\u5B9F\u88C5\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
-doclet.Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Class=\u30AF\u30E9\u30B9
-doclet.AnnotationType=\u6CE8\u91C8\u578B
-doclet.AnnotationInterface=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.annotationtype=\u6CE8\u91C8\u578B
-doclet.annotationinterface=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.annotationtypes=\u6CE8\u91C8\u578B
-doclet.annotationinterfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Enum=\u5217\u6319
-doclet.EnumClass=\u5217\u6319\u30AF\u30E9\u30B9
-doclet.enum=\u5217\u6319
-doclet.enumclass=\u5217\u6319\u30AF\u30E9\u30B9
-doclet.enums=\u5217\u6319
-doclet.enumclasses=\u5217\u6319\u30AF\u30E9\u30B9
-doclet.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.class=\u30AF\u30E9\u30B9
-doclet.RecordClass=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9
-doclet.recordclass=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9
-doclet.ExceptionClass=\u4F8B\u5916\u30AF\u30E9\u30B9
-doclet.exceptionclass=\u4F8B\u5916\u30AF\u30E9\u30B9
-doclet.ExportedTo=\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
-doclet.OpenedTo=\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u30AA\u30FC\u30D7\u30F3
+doclet.Generating_0={0}の生成中...
+doclet.MissingSerialTag=クラス{0}のデフォルトの直列化可能フィールド{1}のための@serialタグがありません。
+doclet.MissingSerialDataTag=クラス{0}のメソッド{1}に@serialDataタグがありません。
+doclet.Serializable_no_customization=readObjectまたはwriteObjectメソッドが宣言されていません。
+doclet.Serialized_Form=直列化された形式
+doclet.Serialized_Form_methods=直列化メソッド
+doclet.Serialized_Form_fields=直列化されたフィールド
+doclet.Serialized_Form_class=直列化の概要
+doclet.Option_conflict=オプション{0}が{1}と矛盾します
+doclet.Option_reuse=オプションが再使用されています: {0}
+doclet.Option_invalid={1}オプションの引数{0}が無効です
+doclet.Option_doclint_no_qualifiers=アクセス修飾子は-Xdoclintの引数に使用できません
+doclet.Option_doclint_invalid_arg=-Xdoclintオプションの引数が無効です
+doclet.Option_doclint_package_invalid_arg=-Xdoclint/packageオプションの引数が無効です
+doclet.error.initializing.dest.dir=転送先ディレクトリの初期化中にエラーが発生しました: {0}
+doclet.exception.read.file=ファイルの読取り中にエラーが発生しました: {0}\n\t({1})
+doclet.exception.write.file=ファイルの書込み中にエラーが発生しました: {0}\n\t({1})
+doclet.exception.read.resource=システム・リソースの読取り中にエラーが発生しました: {0}\n\t({1})
+doclet.internal.exception=内部例外が発生しました。\n\t({0})
+doclet.internal.report.bug=バグ・データベース(https://bugs.java.com)で重複がないかをご確認のうえ、Javaのバグ・レポート・ページ\n(https://bugreport.java.com)でjavadocツールに対するバグの登録をお願いいたします。\nレポートには、エラー・メッセージと次の診断内容をご入力ください。ご協力ありがとうございます。
+doclet.File_not_found=ファイルが見つかりません: {0}
+doclet.snippet_file_not_found=ソース・パスまたはスニペットのパスにファイルが見つかりません: {0}
+doclet.Copy_Overwrite_warning=ファイル{0}は同じ名前のファイルがあるので{1}にコピーされませんでした...
+doclet.Copy_Ignored_warning=ファイル{0}はコピーされませんでした: 名前が無効です
+doclet.Copy_to_clipboard=コピー
+doclet.Copied_to_clipboard=コピー済
+doclet.Copy_url_to_clipboard=URLのコピー
+doclet.Copy_snippet_to_clipboard=スニペットのコピー
+doclet.Copying_File_0_To_Dir_1=ファイル{0}をディレクトリ{1}にコピー中...
+doclet.Copying_File_0_To_File_1=ファイル{0}をファイル{1}にコピー中...
+doclet.No_Public_Classes_To_Document=ドキュメント化するpublicまたはprotectedクラスが見つかりません。
+doclet.destination_directory_not_directory_0=転送先ディレクトリはディレクトリではありません: {0}
+doclet.destination_directory_not_writable_0=転送先ディレクトリは書込み可能ではありません: {0}
+doclet.Encoding_not_supported=エンコーディング{0}はサポートされていません
+doclet.Building_Tree=全パッケージとクラスの階層ツリーを作成しています...
+doclet.Building_Index=全パッケージとクラスのインデックスを作成しています...
+doclet.Building_Index_For_All_Classes=全クラスのインデックスを作成しています...
+doclet.sourcetab_warning=-sourcetabの引数は0より大きい整数である必要があります。
+doclet.JavaScript_in_comment=ドキュメント・コメントにJavaScriptが見つかりました。\n--allow-script-in-commentsを使用して、JavaScriptの使用を許可してください。
+doclet.JavaScript_in_option=オプション{0}にJavaScriptが含まれています。\n--allow-script-in-commentsを使用して、JavaScriptの使用を許可してください。
+doclet.Link_icon=リンク・アイコン
+doclet.Link_to_section=このセクションにリンク
+doclet.Packages=パッケージ
+doclet.All_Packages=すべてのパッケージ
+doclet.Modules=モジュール
+doclet.All_Modules=すべてのモジュール
+doclet.Other_Packages=その他のパッケージ
+doclet.Other_Modules=その他のモジュール
+doclet.Notice_taglet_registered=登録されたタグレット{0} ...
+doclet.Notice_taglet_unseen=ノート: 非表示のカスタム・タグ: {0}
+doclet.Notice_taglet_overridden=ノート: 標準タグをオーバーライドするカスタム・タグ: {0}
+doclet.Notice_taglet_conflict_warn=ノート: 標準タグをオーバーライドする可能性のあるカスタム・タグ: {0}。オーバーライドを避けるために、カスタム・タグ名の中に少なくとも1つのピリオド(.)を使用してください。
+doclet.Error_taglet_not_registered=エラー - タグレット{1}を登録しようとしているときに、例外{0}がスローされました...
+doclet.Error_invalid_custom_tag_argument=エラー - {0}は-tagオプションに対して無効な引数です...
+doclet.taglet_could_not_set_location = ターゲット・パス: {0}を設定できませんでした
+doclet.not_standard_file_manager = ターゲット・パスを設定できません。ファイル・マネージャがStandardJavaFileManagerではありません
+doclet.Author=作成者:
+doclet.DefaultValue=デフォルト値:
+doclet.PropertyDescription=プロパティの説明:
+doclet.PropertyGetterWithName={0}プロパティの値を取得します。
+doclet.PropertyGetterReturn={0}プロパティの値
+doclet.PropertySetterWithName={0}プロパティの値を設定します。
+doclet.PropertySetterParam={0}プロパティの値
+doclet.PropertyMethodReturn={0}プロパティ
+doclet.Default=デフォルト:
+doclet.Parameters=パラメータ:
+doclet.TypeParameters=型パラメータ:
+doclet.RecordComponents=レコード・コンポーネント:
+doclet.Parameters_warn=@param argument "{0}"はパラメータ名ではありません。
+doclet.Parameters_dup_warn=パラメータ"{0}"が2回以上ドキュメント化されています。
+doclet.TypeParameters_warn=@param argument "{0}"は型パラメータの名前ではありません。
+doclet.TypeParameters_dup_warn=型パラメータ"{0}"が2回以上ドキュメント化されています。
+doclet.RecordComponents_warn=@param argument "{0}"はレコード・コンポーネントの名前ではありません。
+doclet.RecordComponents_dup_warn=レコード・コンポーネント"{0}"が2回以上ドキュメント化されています。
+doclet.Returns=戻り値:
+doclet.Returns_0={0}を返します。
+doclet.Return_tag_on_void_method=戻り値の型がvoidのメソッドでは@returnタグを使用できません。
+doclet.See_Also=関連項目:
+doclet.SerialData=シリアル・データ:
+doclet.Services=サービス
+doclet.Since=導入されたバージョン:
+doclet.Throws=例外:
+doclet.Version=バージョン:
+doclet.Factory=ファクトリ:
+doclet.UnknownTag={0}は不明なタグです。
+doclet.UnknownTagLowercase={0}は不明なタグです。大文字と小文字の区別を除いては既知のタグと同じです。
+doclet.inheritDocBadSupertype=オーバーライドされたメソッドが見つかりません
+doclet.inheritDocWithinInappropriateTag=@inheritDocは、このタグ内では使用できません
+doclet.inheritDocNoDoc=オーバーライドされたメソッドでは、例外タイプ{0}はドキュメント化されません
+doclet.throwsInheritDocUnsupported=@inheritDocは、メソッドで宣言されていないexception-typeタイプ・パラメータではサポートされていません。そのような例外タイプは直接ドキュメント化してください
+doclet.noInheritedDoc=@inheritDocが使用されていますが、{0}はどのメソッドもオーバーライドまたは実装していません。
+doclet.tag_misuse={0}タグは{1}ドキュメント内では使用できません。使用できるのは次のタイプのドキュメント内のみです: {2}。
+doclet.Package_Summary=パッケージの概要
+doclet.Requires_Summary=必要
+doclet.Indirect_Requires_Summary=間接的に必要
+doclet.Indirect_Exports_Summary=間接的エクスポート
+doclet.Indirect_Opens_Summary=間接的オープン
+doclet.Exported_Packages_Summary=エクスポート
+doclet.Opened_Packages_Summary=オープン
+doclet.Concealed_Packages_Summary=非表示
+doclet.From=ダウンロード元
+doclet.Uses_Summary=使用
+doclet.Provides_Summary=提供
+doclet.Nested_Class_Summary=ネストされたクラスの概要
+doclet.Annotation_Type_Optional_Member_Summary=任意要素の概要
+doclet.Annotation_Type_Required_Member_Summary=必須要素の概要
+doclet.Field_Summary=フィールドの概要
+doclet.Property_Summary=プロパティの概要
+doclet.Enum_Constant_Summary=列挙型定数の概要
+doclet.Constructor_Summary=コンストラクタの概要
+doclet.Method_Summary=メソッドの概要
+doclet.Interfaces=インタフェース
+doclet.Enums=列挙
+doclet.EnumClasses=列挙クラス
+doclet.RecordClasses=レコード・クラス
+doclet.Related_Packages=関連パッケージ
+doclet.AnnotationTypes=注釈型
+doclet.AnnotationInterfaces=注釈インタフェース
+doclet.ExceptionClasses=例外クラス
+doclet.Classes=クラス
+doclet.All_Classes_And_Interfaces=すべてのクラスおよびインタフェース
+doclet.All_Superinterfaces=すべてのスーパーインタフェース:
+doclet.All_Implemented_Interfaces=すべての実装されたインタフェース:
+doclet.Interface=インタフェース
+doclet.Class=クラス
+doclet.AnnotationType=注釈型
+doclet.AnnotationInterface=注釈インタフェース
+doclet.annotationtype=注釈型
+doclet.annotationinterface=注釈インタフェース
+doclet.annotationtypes=注釈型
+doclet.annotationinterfaces=注釈インタフェース
+doclet.Enum=列挙
+doclet.EnumClass=列挙クラス
+doclet.enum=列挙
+doclet.enumclass=列挙クラス
+doclet.enums=列挙
+doclet.enumclasses=列挙クラス
+doclet.interface=インタフェース
+doclet.class=クラス
+doclet.RecordClass=レコード・クラス
+doclet.recordclass=レコード・クラス
+doclet.ExceptionClass=例外クラス
+doclet.exceptionclass=例外クラス
+doclet.ExportedTo=モジュールにエクスポート
+doclet.OpenedTo=モジュールにオープン
 doclet.Package_private=(package private)
-doclet.Nested_Classes_Interfaces_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9/\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Nested_Classes_Interfaces_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9/\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Nested_Classes_Interfaces_Declared_In_Class=\u30AF\u30E9\u30B9\u3067\u5BA3\u8A00\u3055\u308C\u305F\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9/\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Nested_Classes_Interfaces_Declared_In_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u5BA3\u8A00\u3055\u308C\u305F\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9/\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Methods_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9
-doclet.Methods_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9
-doclet.Methods_Declared_In_Class=\u30AF\u30E9\u30B9\u3067\u5BA3\u8A00\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9
-doclet.Methods_Declared_In_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u5BA3\u8A00\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9
-doclet.Fields_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Fields_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Fields_Declared_In_Class=\u30AF\u30E9\u30B9\u3067\u5BA3\u8A00\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Fields_Declared_In_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u5BA3\u8A00\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Properties_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.Properties_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.Properties_Declared_In_Class=\u30AF\u30E9\u30B9\u3067\u5BA3\u8A00\u3055\u308C\u305F\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.Properties_Declared_In_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u5BA3\u8A00\u3055\u308C\u305F\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.Annotation_Type_Member_Detail=\u8981\u7D20\u306E\u8A73\u7D30
-doclet.Enum_Constant_Detail=\u5217\u6319\u578B\u5B9A\u6570\u306E\u8A73\u7D30
-doclet.Constants_Summary=\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024
-doclet.Field_Detail=\u30D5\u30A3\u30FC\u30EB\u30C9\u8A73\u7D30
-doclet.Property_Detail=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8A73\u7D30
-doclet.Method_Detail=\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30
-doclet.Constructor_Detail=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u8A73\u7D30
-doclet.Deprecated=\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-doclet.DeprecatedForRemoval=\u975E\u63A8\u5968\u3001\u524A\u9664\u4E88\u5B9A: \u3053\u306EAPI\u8981\u7D20\u306F\u5C06\u6765\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u524A\u9664\u4E88\u5B9A\u3067\u3059\u3002
-doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u304A\u3044\u3066\u3001\u3059\u3067\u306B\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-doclet.value_tag_invalid_reference={0}(@value\u30BF\u30B0\u306B\u3088\u308A\u53C2\u7167\u3055\u308C\u3066\u3044\u308B)\u306F\u4E0D\u660E\u306A\u53C2\u7167\u3067\u3059\u3002
-doclet.value_tag_invalid_constant=@value\u30BF\u30B0({0}\u3092\u53C2\u7167\u3057\u3066\u3044\u308B)\u306F\u5B9A\u6570\u5185\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-doclet.value_tag_invalid_use=@value\u30BF\u30B0\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-doclet.value_tag_invalid_format=\u6B21\u306E\u5F62\u5F0F\u304C\u7121\u52B9\u3067\u3059: {0}
-doclet.dest_dir_create=\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u4F5C\u6210\u4E2D: "{0}"
-doclet.in={1}\u306E{0}
-doclet.Fields=\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Preview=\u30D7\u30EC\u30D3\u30E5\u30FC\u3002
-doclet.Properties=\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.Constructors=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.Methods=\u30E1\u30BD\u30C3\u30C9
-doclet.All_Methods=\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.Static_Methods=static\u30E1\u30BD\u30C3\u30C9
-doclet.Instance_Methods=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9
-doclet.Abstract_Methods=abstract\u30E1\u30BD\u30C3\u30C9
-doclet.Concrete_Methods=concrete\u30E1\u30BD\u30C3\u30C9
-doclet.Default_Methods=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9
-doclet.Deprecated_Methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9
-doclet.Annotation_Type_Optional_Members=\u4EFB\u610F\u8981\u7D20
-doclet.Annotation_Type_Required_Members=\u5FC5\u9808\u8981\u7D20
-doclet.Enum_Constants=\u5217\u6319\u5B9A\u6570
-doclet.Nested_Classes=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9
-doclet.Modifier=\u4FEE\u98FE\u5B50
-doclet.Type=\u30BF\u30A4\u30D7
-doclet.Modifier_and_Type=\u4FEE\u98FE\u5B50\u3068\u30BF\u30A4\u30D7
-doclet.Implementation=\u5B9F\u88C5:
+doclet.Nested_Classes_Interfaces_Inherited_From_Class=クラスから継承されたネストされたクラス/インタフェース
+doclet.Nested_Classes_Interfaces_Inherited_From_Interface=インタフェースから継承されたネストされたクラス/インタフェース
+doclet.Nested_Classes_Interfaces_Declared_In_Class=クラスで宣言されたネストされたクラス/インタフェース
+doclet.Nested_Classes_Interfaces_Declared_In_Interface=インタフェースで宣言されたネストされたクラス/インタフェース
+doclet.Methods_Inherited_From_Class=クラスから継承されたメソッド
+doclet.Methods_Inherited_From_Interface=インタフェースから継承されたメソッド
+doclet.Methods_Declared_In_Class=クラスで宣言されたメソッド
+doclet.Methods_Declared_In_Interface=インタフェースで宣言されたメソッド
+doclet.Fields_Inherited_From_Class=クラスから継承されたフィールド
+doclet.Fields_Inherited_From_Interface=インタフェースから継承されたフィールド
+doclet.Fields_Declared_In_Class=クラスで宣言されたフィールド
+doclet.Fields_Declared_In_Interface=インタフェースで宣言されたフィールド
+doclet.Properties_Inherited_From_Class=クラスから継承されたプロパティ
+doclet.Properties_Inherited_From_Interface=インタフェースから継承されたプロパティ
+doclet.Properties_Declared_In_Class=クラスで宣言されたプロパティ
+doclet.Properties_Declared_In_Interface=インタフェースで宣言されたプロパティ
+doclet.Annotation_Type_Member_Detail=要素の詳細
+doclet.Enum_Constant_Detail=列挙型定数の詳細
+doclet.Constants_Summary=定数フィールド値
+doclet.Field_Detail=フィールド詳細
+doclet.Property_Detail=プロパティの詳細
+doclet.Method_Detail=メソッドの詳細
+doclet.Constructor_Detail=コンストラクタの詳細
+doclet.Deprecated=推奨されていません。
+doclet.DeprecatedForRemoval=非推奨、削除予定: このAPI要素は将来のバージョンで削除予定です。
+doclet.Groupname_already_used=-groupオプションにおいて、すでにグループ名が使用されています: {0}
+doclet.value_tag_invalid_reference={0}(@valueタグにより参照されている)は不明な参照です。
+doclet.value_tag_invalid_constant=@valueタグ({0}を参照している)は定数内でのみ使用できます。
+doclet.value_tag_invalid_use=@valueタグはここでは使用できません。
+doclet.value_tag_invalid_format=次の形式が無効です: {0}
+doclet.dest_dir_create=宛先ディレクトリの作成中: "{0}"
+doclet.in={1}の{0}
+doclet.Fields=フィールド
+doclet.Preview=プレビュー。
+doclet.Properties=プロパティ
+doclet.Constructors=コンストラクタ
+doclet.Methods=メソッド
+doclet.All_Methods=すべてのメソッド
+doclet.Static_Methods=staticメソッド
+doclet.Instance_Methods=インスタンス・メソッド
+doclet.Abstract_Methods=abstractメソッド
+doclet.Concrete_Methods=concreteメソッド
+doclet.Default_Methods=デフォルト・メソッド
+doclet.Deprecated_Methods=推奨されていないメソッド
+doclet.Annotation_Type_Optional_Members=任意要素
+doclet.Annotation_Type_Required_Members=必須要素
+doclet.Enum_Constants=列挙定数
+doclet.Nested_Classes=ネストされたクラス
+doclet.Modifier=修飾子
+doclet.Type=タイプ
+doclet.Modifier_and_Type=修飾子とタイプ
+doclet.Implementation=実装:
 doclet.search=SEARCH
-doclet.search_placeholder=\u691C\u7D22
-doclet.search_reset=\u30EA\u30BB\u30C3\u30C8
-doclet.Field=\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Property=\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.Constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.Method=\u30E1\u30BD\u30C3\u30C9
-doclet.Annotation_Type_Optional_Member=\u4EFB\u610F\u8981\u7D20
-doclet.Annotation_Type_Required_Member=\u5FC5\u9808\u8981\u7D20
-doclet.Annotation_Type_Member=\u6CE8\u91C8\u578B\u8981\u7D20
-doclet.Annotation_Interface_Member=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20
-doclet.Enum_Constant=\u5217\u6319\u578B\u5B9A\u6570
-doclet.Description=\u8AAC\u660E
-doclet.ConstantField=\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Value=\u5024
-doclet.linkMismatch_PackagedLinkedtoModule=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308B\u30B3\u30FC\u30C9\u3067\u306F\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u540D\u524D\u306E\u3042\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3082\u306E\u3067\u3059\u3002
-doclet.linkMismatch_ModuleLinkedtoPackage=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308B\u30B3\u30FC\u30C9\u3067\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3082\u306E\u3067\u3059\u3002
-doclet.urlRedirected=URL {0}\u306F{1}\u306B\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u3055\u308C\u307E\u3057\u305F -- \u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u66F4\u65B0\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u8868\u793A\u3057\u306A\u3044\u3088\u3046\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-doclet.duplicate.comment.for.property=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u30B3\u30E1\u30F3\u30C8\u304C\u91CD\u8907\u3057\u3066\n\u3044\u307E\u3059\u3002\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u307E\u305F\u306F\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30E1\u30F3\u30C8\u3092\u524A\u9664\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+doclet.search_placeholder=検索
+doclet.search_reset=リセット
+doclet.Field=フィールド
+doclet.Property=プロパティ
+doclet.Constructor=コンストラクタ
+doclet.Method=メソッド
+doclet.Annotation_Type_Optional_Member=任意要素
+doclet.Annotation_Type_Required_Member=必須要素
+doclet.Annotation_Type_Member=注釈型要素
+doclet.Annotation_Interface_Member=注釈インタフェース要素
+doclet.Enum_Constant=列挙型定数
+doclet.Description=説明
+doclet.ConstantField=定数フィールド
+doclet.Value=値
+doclet.linkMismatch_PackagedLinkedtoModule=ドキュメント化しようとしているコードでは名前のないモジュールのパッケージが使用されていますが、{0}で定義されているパッケージは名前のあるモジュールのものです。
+doclet.linkMismatch_ModuleLinkedtoPackage=ドキュメント化しようとしているコードではモジュールが使用されていますが、{0}で定義されているパッケージは名前のないモジュールのものです。
+doclet.urlRedirected=URL {0}は{1}にリダイレクトされました -- コマンドライン・オプションを更新してこの警告を表示しないようにしてください。
+doclet.duplicate.comment.for.property=プロパティのコメントが重複して\nいます。プロパティ・フィールドまたはこのメソッドのコメントを削除してこの警告を出さないようにしてください。
 
 #Documentation for Enums
-doclet.enum_values_doc.fullbody=\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u8FD4\u3057\u307E\u3059\u3002
-doclet.enum_class_values_doc.fullbody=\u3053\u306E\u5217\u6319\u30AF\u30E9\u30B9\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u8FD4\u3057\u307E\u3059\u3002
+doclet.enum_values_doc.fullbody=この列挙型の定数を含む配列を宣言されている順序で\n返します。
+doclet.enum_class_values_doc.fullbody=この列挙クラスの定数を含む配列を宣言されている順序で\n返します。
 
-doclet.enum_values_doc.return=\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u3001\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u306E\u914D\u5217
-doclet.enum_class_values_doc.return=\u3053\u306E\u5217\u6319\u30AF\u30E9\u30B9\u306E\u5B9A\u6570\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u542B\u3080\u914D\u5217
+doclet.enum_values_doc.return=この列挙型の定数を含む、宣言されている順序での配列
+doclet.enum_class_values_doc.return=この列挙クラスの定数を宣言されている順序で含む配列
 
-doclet.enum_valueof_doc.fullbody=\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\n\u3067\u304D\u307E\u305B\u3093\u3002)
-doclet.enum_class_valueof_doc.fullbody=\u3053\u306E\u30AF\u30E9\u30B9\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u6307\u5B9A\u3057\u305F\u540D\u524D\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u30AF\u30E9\u30B9\u306E\u5217\u6319\u578B\u5B9A\u6570\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3055\u308C\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u306F\u4F7F\u7528\n\u3067\u304D\u307E\u305B\u3093\u3002)
+doclet.enum_valueof_doc.fullbody=指定した名前を持つこの型の列挙型定数を返します。\n文字列は、この型の列挙型定数を宣言するのに使用した識別子と<i>正確に</i>\n一致している必要があります。(余分な空白文字を含めることは\nできません。)
+doclet.enum_class_valueof_doc.fullbody=このクラスの列挙型定数を指定した名前で返します。\n文字列は、このクラスの列挙型定数の宣言に使用された識別子と<i>正確に</i>\n一致する必要があります。(余分な空白文字は使用\nできません。)
 
-doclet.enum_valueof_doc.param_name=\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\u3002
+doclet.enum_valueof_doc.param_name=返される列挙型定数の名前。
 
-doclet.enum_valueof_doc.return=\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5217\u6319\u578B\u5B9A\u6570
+doclet.enum_valueof_doc.return=指定した名前の列挙型定数
 
-doclet.enum_valueof_doc.throws_ila=\u3053\u306E\u5217\u6319\u578B\u306B\u3001\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5B9A\u6570\u304C\u306A\u3044\u5834\u5408
-doclet.enum_class_valueof_doc.throws_ila=\u3053\u306E\u5217\u6319\u30AF\u30E9\u30B9\u306B\u3001\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5B9A\u6570\u304C\u306A\u3044\u5834\u5408
+doclet.enum_valueof_doc.throws_ila=この列挙型に、指定した名前の定数がない場合
+doclet.enum_class_valueof_doc.throws_ila=この列挙クラスに、指定した名前の定数がない場合
 
-doclet.enum_valueof_doc.throws_npe=\u5F15\u6570\u304Cnull\u306E\u5834\u5408
+doclet.enum_valueof_doc.throws_npe=引数がnullの場合
 
 
 #Documentation for records
-doclet.record_constructor_doc.fullbody={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
+doclet.record_constructor_doc.fullbody={0}レコード・クラスのインスタンスを作成します。
 
-doclet.record_constructor_doc.param_name={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u5024
+doclet.record_constructor_doc.param_name={0}レコード・コンポーネントの値
 
-doclet.record_equals_doc.fullbody.head=\u4ED6\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304C\u3053\u308C\u3068"\u7B49\u3057\u3044"\u304B\u3069\u3046\u304B\u3092\u793A\u3057\u307E\u3059\u3002\u4ED6\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304C\u540C\u3058\u30AF\u30E9\u30B9\u3067\u3042\u308A\u3001\u3059\u3079\u3066\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u7B49\u3057\u3044\u5834\u5408\u3001\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u7B49\u3057\u304F\u306A\u308A\u307E\u3059\u3002
+doclet.record_equals_doc.fullbody.head=他のオブジェクトがこれと"等しい"かどうかを示します。他のオブジェクトが同じクラスであり、すべてのレコード・コンポーネントが等しい場合、オブジェクトは等しくなります。
 
-doclet.record_equals_doc.fullbody.tail.both=\u53C2\u7167\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}\u3068\u6BD4\u8F03\u3055\u308C\u3001\u30D7\u30EA\u30DF\u30C6\u30A3\u30D6\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F'=='\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
+doclet.record_equals_doc.fullbody.tail.both=参照コンポーネントは{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}と比較され、プリミティブ・コンポーネントは'=='と比較されます。
 
-doclet.record_equals_doc.fullbody.tail.primitive=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F'=='\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
+doclet.record_equals_doc.fullbody.tail.primitive=このレコード・クラスのすべてのコンポーネントは'=='と比較されます。
 
-doclet.record_equals_doc.fullbody.tail.reference=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
+doclet.record_equals_doc.fullbody.tail.reference=このレコード・クラスのすべてのコンポーネントは{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}と比較されます。
 
-doclet.record_equals_doc.param_name=\u6BD4\u8F03\u3059\u308B\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
+doclet.record_equals_doc.param_name=比較するオブジェクト
 
-doclet.record_equals_doc.return=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304C{0}\u5F15\u6570\u3068\u540C\u3058\u3067\u3042\u308B\u5834\u5408\u306F<code>true</code>\u3001\u305D\u308C\u4EE5\u5916\u306E\u5834\u5408\u306F<code>false</code>\u3002
+doclet.record_equals_doc.return=このオブジェクトが{0}引数と同じである場合は<code>true</code>、それ以外の場合は<code>false</code>。
 
-doclet.record_hashCode_doc.fullbody=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30CF\u30C3\u30B7\u30E5\u30FB\u30B3\u30FC\u30C9\u5024\u3092\u8FD4\u3057\u307E\u3059\u3002\u5024\u306F\u3001\u5404\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30CF\u30C3\u30B7\u30E5\u30FB\u30B3\u30FC\u30C9\u304B\u3089\u5C0E\u51FA\u3055\u308C\u307E\u3059\u3002
+doclet.record_hashCode_doc.fullbody=このオブジェクトのハッシュ・コード値を返します。値は、各レコード・コンポーネントのハッシュ・コードから導出されます。
 
-doclet.record_hashCode_doc.return=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30CF\u30C3\u30B7\u30E5\u30FB\u30B3\u30FC\u30C9\u5024
+doclet.record_hashCode_doc.return=このオブジェクトのハッシュ・コード値
 
-doclet.record_toString_doc.fullbody=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u6587\u5B57\u5217\u8868\u73FE\u3092\u8FD4\u3057\u307E\u3059\u3002\u3053\u306E\u8868\u73FE\u3067\u306F\u3001\u30AF\u30E9\u30B9\u540D\u306E\u5F8C\u306B\u3001\u5404\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u540D\u524D\u3068\u5024\u304C\u7D9A\u3044\u3066\u3044\u307E\u3059\u3002
+doclet.record_toString_doc.fullbody=このレコード・クラスの文字列表現を返します。この表現では、クラス名の後に、各レコード・コンポーネントの名前と値が続いています。
 
-doclet.record_toString_doc.return=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u6587\u5B57\u5217\u8868\u73FE
+doclet.record_toString_doc.return=このオブジェクトの文字列表現
 
-doclet.record_accessor_doc.fullbody={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u5024\u304C\u8FD4\u3055\u308C\u307E\u3059\u3002
+doclet.record_accessor_doc.fullbody={0}レコード・コンポーネントの値が返されます。
 
-doclet.record_accessor_doc.return={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u5024
+doclet.record_accessor_doc.return={0}レコード・コンポーネントの値
 
-doclet.record_field_doc.fullbody={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u3067\u3059\u3002
+doclet.record_field_doc.fullbody={0}レコード・コンポーネントのフィールドです。
 
 doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/
 doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/
 doclet.platform.docs.ea=https://download.java.net/java/early_access/jdk{0}/docs/api/
 
-doclet.search.enter_search_term=\u691C\u7D22\u8A9E\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-doclet.search.no_results=\u7D50\u679C\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
-doclet.search.one_result=1\u4EF6\u306E\u7D50\u679C\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
-doclet.search.many_results={0}\u306E\u7D50\u679C\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
-doclet.search.loading=\u691C\u7D22\u7D22\u5F15\u3092\u30ED\u30FC\u30C9\u4E2D...
-doclet.search.searching=\u691C\u7D22\u4E2D...
-doclet.search.redirecting=\u6700\u521D\u306E\u7D50\u679C\u306B\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u4E2D...
-doclet.search.modules=\u30E2\u30B8\u30E5\u30FC\u30EB
-doclet.search.packages=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.search.classes_and_interfaces=\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.search.types=\u30BF\u30A4\u30D7
-doclet.search.members=\u30E1\u30F3\u30D0\u30FC
-doclet.search.search_tags=\u30BF\u30B0\u306E\u691C\u7D22
+doclet.search.enter_search_term=検索語を入力してください
+doclet.search.no_results=結果が見つかりませんでした
+doclet.search.one_result=1件の結果が見つかりました
+doclet.search.many_results={0}の結果が見つかりました
+doclet.search.loading=検索索引をロード中...
+doclet.search.searching=検索中...
+doclet.search.redirecting=最初の結果にリダイレクト中...
+doclet.search.modules=モジュール
+doclet.search.packages=パッケージ
+doclet.search.classes_and_interfaces=クラスとインタフェース
+doclet.search.types=タイプ
+doclet.search.members=メンバー
+doclet.search.search_tags=タグの検索
 
-doclet.snippet.contents.none=@snippet\u306B\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+doclet.snippet.contents.none=@snippetにコンテンツが指定されていません
 
-doclet.snippet.contents.ambiguity.external=@snippet\u306B\u3001\u4E0D\u660E\u306A\u8907\u6570\u306E\u5916\u90E8\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
+doclet.snippet.contents.ambiguity.external=@snippetに、不明な複数の外部コンテンツが指定されています
 
-doclet.snippet.region.not_found=\u30EA\u30FC\u30B8\u30E7\u30F3\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "{0}"
+doclet.snippet.region.not_found=リージョンが見つかりません: "{0}"
 
-doclet.tag.attribute.value.illegal=\u5C5E\u6027"{0}"\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: "{1}"
+doclet.tag.attribute.value.illegal=属性"{0}"の値が不正です: "{1}"
 
-doclet.tag.attribute.value.missing=\u5C5E\u6027"{0}"\u306B\u5024\u304C\u3042\u308A\u307E\u305B\u3093
+doclet.tag.attribute.value.missing=属性"{0}"に値がありません
 
-doclet.tag.attribute.repeated=\u5C5E\u6027\u304C\u7E70\u308A\u8FD4\u3055\u308C\u3066\u3044\u307E\u3059: "{0}"
+doclet.tag.attribute.repeated=属性が繰り返されています: "{0}"
 
-doclet.snippet.contents.mismatch=\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093:\n{0}
+doclet.snippet.contents.mismatch=コンテンツが一致しません:\n{0}
 
-doclet.snippet.markup=\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7: {0}
+doclet.snippet.markup=スニペットのマークアップ: {0}
 
-doclet.snippet.markup.spurious=\u7591\u4F3C\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7
-doclet.snippet.markup.attribute.absent=\u5C5E\u6027"{0}"\u304C\u3042\u308A\u307E\u305B\u3093
-doclet.snippet.markup.attribute.simultaneous.use=\u5C5E\u6027"{0}"\u3068"{1}"\u304C\u540C\u6642\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
-doclet.snippet.markup.attribute.unexpected=\u4E88\u671F\u3057\u306A\u3044\u5C5E\u6027
-doclet.snippet.markup.attribute.value.invalid=\u7121\u52B9\u306A\u5C5E\u6027\u5024
-doclet.snippet.markup.attribute.value.unterminated=\u5C5E\u6027\u5024\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
-doclet.snippet.markup.regex.invalid=\u6B63\u898F\u8868\u73FE\u304C\u7121\u52B9\u3067\u3059
-doclet.snippet.markup.region.duplicated=\u30EA\u30FC\u30B8\u30E7\u30F3\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
-doclet.snippet.markup.region.none=\u7D42\u4E86\u3059\u308B\u30EA\u30FC\u30B8\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
-doclet.snippet.markup.region.unpaired=\u30DA\u30A2\u306B\u306A\u3063\u3066\u3044\u306A\u3044\u30EA\u30FC\u30B8\u30E7\u30F3
-doclet.snippet.markup.tag.non.existent.lines=\u5B58\u5728\u3057\u306A\u3044\u884C\u3092\u30BF\u30B0\u304C\u53C2\u7167\u3057\u3066\u3044\u307E\u3059
+doclet.snippet.markup.spurious=疑似マークアップ
+doclet.snippet.markup.attribute.absent=属性"{0}"がありません
+doclet.snippet.markup.attribute.simultaneous.use=属性"{0}"と"{1}"が同時に使用されています
+doclet.snippet.markup.attribute.unexpected=予期しない属性
+doclet.snippet.markup.attribute.value.invalid=無効な属性値
+doclet.snippet.markup.attribute.value.unterminated=属性値が終了していません
+doclet.snippet.markup.regex.invalid=正規表現が無効です
+doclet.snippet.markup.region.duplicated=リージョンが重複しています
+doclet.snippet.markup.region.none=終了するリージョンがありません
+doclet.snippet.markup.region.unpaired=ペアになっていないリージョン
+doclet.snippet.markup.tag.non.existent.lines=存在しない行をタグが参照しています
 
 # 0: path
-doclet.cannot_use_snippet_path=\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3067''--snippet-path''\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093: {0}
+doclet.cannot_use_snippet_path=指定されたファイル・マネージャで''--snippet-path''オプションを使用することはできません: {0}
 
 # 0: path; 1: exception
-doclet.error_setting_snippet_path=\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D1\u30B9{0}\u306E\u8A2D\u5B9A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
+doclet.error_setting_snippet_path=スニペットのパス{0}の設定中にエラーが発生しました: {1}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
index 6e7f0b8a9b2..f4ee607773a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
@@ -23,323 +23,323 @@
 # questions.
 #
 
-doclet.Generating_0=\u6B63\u5728\u751F\u6210{0}...
-doclet.MissingSerialTag=\u5728\u7C7B{0}\u4E2D, \u9ED8\u8BA4\u7684\u53EF\u5E8F\u5217\u5316\u5B57\u6BB5{1}\u7F3A\u5C11 @serial \u6807\u8BB0\u3002
-doclet.MissingSerialDataTag=\u5728\u7C7B{0}\u4E2D, \u65B9\u6CD5{1}\u4E2D\u7F3A\u5C11 @serialData \u6807\u8BB0\u3002
-doclet.Serializable_no_customization=\u672A\u58F0\u660E readObject \u6216 writeObject \u65B9\u6CD5\u3002
-doclet.Serialized_Form=\u5E8F\u5217\u5316\u8868\u683C
-doclet.Serialized_Form_methods=\u5E8F\u5217\u5316\u65B9\u6CD5
-doclet.Serialized_Form_fields=\u5E8F\u5217\u5316\u5B57\u6BB5
-doclet.Serialized_Form_class=\u5E8F\u5217\u5316\u6982\u89C8
-doclet.Option_conflict=\u9009\u9879{0}\u4E0E{1}\u51B2\u7A81
-doclet.Option_reuse=\u91CD\u590D\u4F7F\u7528\u7684\u9009\u9879: {0}
-doclet.Option_invalid={1} \u9009\u9879\u7684 {0} \u53C2\u6570\u65E0\u6548
-doclet.Option_doclint_no_qualifiers=-Xdoclint \u53C2\u6570\u4E0D\u5141\u8BB8\u4F7F\u7528\u8BBF\u95EE\u9650\u5B9A\u7B26
-doclet.Option_doclint_invalid_arg=-Xdoclint \u9009\u9879\u7684\u53C2\u6570\u65E0\u6548
-doclet.Option_doclint_package_invalid_arg=-Xdoclint/package \u9009\u9879\u7684\u53C2\u6570\u65E0\u6548
-doclet.error.initializing.dest.dir=\u521D\u59CB\u5316\u76EE\u6807\u76EE\u5F55\u65F6\u51FA\u9519: {0}
-doclet.exception.read.file=\u8BFB\u53D6\u6587\u4EF6\u65F6\u51FA\u9519: {0}\n\t({1})
-doclet.exception.write.file=\u5199\u5165\u6587\u4EF6\u65F6\u51FA\u9519: {0}\n\t({1})
-doclet.exception.read.resource=\u8BFB\u53D6\u7CFB\u7EDF\u8D44\u6E90\u65F6\u51FA\u9519: {0}\n\t({1})
-doclet.internal.exception=\u51FA\u73B0\u5185\u90E8\u5F02\u5E38\u9519\u8BEF\u3002\n\t({0})
-doclet.internal.report.bug=\u5982\u679C\u5728 Bug Database (https://bugs.java.com) \u4E2D\u6CA1\u6709\u627E\u5230\u6709\u5173\u8BE5\u9519\u8BEF\u7684 javadoc \u5DE5\u5177 Bug\uFF0C\n\u8BF7\u901A\u8FC7 Java Bug \u62A5\u544A\u9875 (https://bugreport.java.com) \u63D0\u4EA4 javadoc \u5DE5\u5177 Bug\u3002\n\u8BF7\u5728\u62A5\u544A\u4E2D\u9644\u4E0A\u9519\u8BEF\u6D88\u606F\u548C\u4EE5\u4E0B\u8BCA\u65AD\u4FE1\u606F\u3002\u8C22\u8C22\u3002
-doclet.File_not_found=\u627E\u4E0D\u5230\u6587\u4EF6: {0}
-doclet.snippet_file_not_found=\u5728\u6E90\u8DEF\u5F84\u6216\u7247\u6BB5\u8DEF\u5F84\u4E2D\u627E\u4E0D\u5230\u6587\u4EF6\uFF1A{0}
-doclet.Copy_Overwrite_warning=\u672A\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230 {1}, \u56E0\u4E3A\u73B0\u6709\u6587\u4EF6\u5177\u6709\u76F8\u540C\u540D\u79F0...
-doclet.Copy_Ignored_warning=\u672A\u590D\u5236\u6587\u4EF6 {0}\uFF1A\u540D\u79F0\u65E0\u6548
-doclet.Copy_to_clipboard=\u590D\u5236
-doclet.Copied_to_clipboard=\u5DF2\u590D\u5236\uFF01
-doclet.Copy_url_to_clipboard=\u590D\u5236 URL
-doclet.Copy_snippet_to_clipboard=\u590D\u5236\u7247\u6BB5
-doclet.Copying_File_0_To_Dir_1=\u6B63\u5728\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230\u76EE\u5F55 {1}...
-doclet.Copying_File_0_To_File_1=\u6B63\u5728\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230\u6587\u4EF6{1}...
-doclet.No_Public_Classes_To_Document=\u627E\u4E0D\u5230\u53EF\u4EE5\u6587\u6863\u5316\u7684\u516C\u5171\u6216\u53D7\u4FDD\u62A4\u7684\u7C7B\u3002
-doclet.destination_directory_not_directory_0=\u76EE\u6807\u76EE\u5F55\u4E0D\u662F\u76EE\u5F55: {0}
-doclet.destination_directory_not_writable_0=\u76EE\u6807\u76EE\u5F55\u4E0D\u53EF\u5199: {0}
-doclet.Encoding_not_supported=\u4E0D\u652F\u6301\u7F16\u7801: {0}
-doclet.Building_Tree=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u7C7B\u7684\u6811...
-doclet.Building_Index=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u7C7B\u7684\u7D22\u5F15...
-doclet.Building_Index_For_All_Classes=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7C7B\u7684\u7D22\u5F15...
-doclet.sourcetab_warning=-sourcetab \u7684\u53C2\u6570\u5FC5\u987B\u662F\u5927\u4E8E 0 \u7684\u6574\u6570\u3002
-doclet.JavaScript_in_comment=\u6587\u6863\u6CE8\u91CA\u4E2D\u53D1\u73B0 JavaScript\u3002\n\u4F7F\u7528 --allow-script-in-comments \u53EF\u5141\u8BB8\u4F7F\u7528 JavaScript\u3002
-doclet.JavaScript_in_option=\u9009\u9879 {0} \u5305\u542B JavaScript\u3002\n\u4F7F\u7528 --allow-script-in-comments \u53EF\u5141\u8BB8\u4F7F\u7528 JavaScript\u3002
-doclet.Link_icon=\u94FE\u63A5\u56FE\u6807
-doclet.Link_to_section=\u94FE\u63A5\u5230\u6B64\u8282
-doclet.Packages=\u7A0B\u5E8F\u5305
-doclet.All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305
-doclet.Modules=\u6A21\u5757
-doclet.All_Modules=\u5168\u90E8\u6A21\u5757
-doclet.Other_Packages=\u5176\u4ED6\u7A0B\u5E8F\u5305
-doclet.Other_Modules=\u5176\u4ED6\u6A21\u5757
-doclet.Notice_taglet_registered=\u6CE8\u518C\u7684 Taglet {0}...
-doclet.Notice_taglet_unseen=\u6CE8: \u627E\u4E0D\u5230\u7684\u5B9A\u5236\u6807\u8BB0: {0}
-doclet.Notice_taglet_overridden=\u6CE8: \u8986\u76D6\u6807\u51C6\u6807\u8BB0\u7684\u5B9A\u5236\u6807\u8BB0: {0}
-doclet.Notice_taglet_conflict_warn=\u6CE8: \u53EF\u80FD\u8986\u76D6\u5C06\u6765\u7684\u6807\u51C6\u6807\u8BB0\u7684\u5B9A\u5236\u6807\u8BB0: {0}\u3002\u4E3A\u4E86\u907F\u514D\u51FA\u73B0\u53EF\u80FD\u7684\u8986\u76D6, \u8BF7\u5728\u5B9A\u5236\u6807\u8BB0\u540D\u79F0\u4E2D\u81F3\u5C11\u4F7F\u7528\u4E00\u4E2A\u53E5\u70B9\u5B57\u7B26 (.)\u3002
-doclet.Error_taglet_not_registered=\u9519\u8BEF - \u5C1D\u8BD5\u6CE8\u518C Taglet {1}\u65F6\u629B\u51FA\u5F02\u5E38\u9519\u8BEF{0}...
-doclet.Error_invalid_custom_tag_argument=\u9519\u8BEF - \u5BF9\u4E8E -tag \u9009\u9879, {0}\u662F\u65E0\u6548\u53C2\u6570...
-doclet.taglet_could_not_set_location = \u65E0\u6CD5\u8BBE\u7F6E taglet \u8DEF\u5F84\uFF1A{0}
-doclet.not_standard_file_manager = \u65E0\u6CD5\u8BBE\u7F6E taglet \u8DEF\u5F84\uFF1B\u6587\u4EF6\u7BA1\u7406\u5668\u4E0D\u662F StandardJavaFileManager
-doclet.Author=\u4F5C\u8005:
-doclet.DefaultValue=\u9ED8\u8BA4\u503C:
-doclet.PropertyDescription=\u5C5E\u6027\u8BF4\u660E:
-doclet.PropertyGetterWithName=\u83B7\u53D6{0}\u5C5E\u6027\u7684\u503C\u3002
-doclet.PropertyGetterReturn={0} \u5C5E\u6027\u7684\u503C
-doclet.PropertySetterWithName=\u8BBE\u7F6E{0}\u5C5E\u6027\u7684\u503C\u3002
-doclet.PropertySetterParam={0} \u5C5E\u6027\u7684\u503C
-doclet.PropertyMethodReturn={0} \u5C5E\u6027
-doclet.Default=\u9ED8\u8BA4\u503C:
-doclet.Parameters=\u53C2\u6570:
-doclet.TypeParameters=\u7C7B\u578B\u53C2\u6570:
-doclet.RecordComponents=\u8BB0\u5F55\u7EC4\u4EF6\uFF1A
-doclet.Parameters_warn=@param argument "{0}" \u4E0D\u662F\u53C2\u6570\u540D\u79F0\u3002
-doclet.Parameters_dup_warn=\u591A\u6B21\u5BF9\u53C2\u6570 "{0}" \u8FDB\u884C\u6587\u6863\u5316\u3002
-doclet.TypeParameters_warn=@param argument "{0}" \u4E0D\u662F\u7C7B\u578B\u53C2\u6570\u540D\u79F0\u3002
-doclet.TypeParameters_dup_warn=\u591A\u6B21\u5BF9\u7C7B\u578B\u53C2\u6570 "{0}" \u8FDB\u884C\u6587\u6863\u5316\u3002
-doclet.RecordComponents_warn=@param argument "{0}" \u4E0D\u662F\u8BB0\u5F55\u7EC4\u4EF6\u540D\u79F0\u3002
-doclet.RecordComponents_dup_warn=\u591A\u6B21\u5BF9\u8BB0\u5F55\u7EC4\u4EF6 "{0}" \u8FDB\u884C\u6587\u6863\u5316\u3002
-doclet.Returns=\u8FD4\u56DE:
-doclet.Returns_0=\u8FD4\u56DE {0}\u3002
-doclet.Return_tag_on_void_method=\u4E0D\u80FD\u5728\u8FD4\u56DE\u7C7B\u578B\u4E3A\u7A7A\u7684\u65B9\u6CD5\u4E2D\u4F7F\u7528 @return \u6807\u8BB0\u3002
-doclet.See_Also=\u53E6\u8BF7\u53C2\u9605:
-doclet.SerialData=\u5E8F\u5217\u6570\u636E:
-doclet.Services=\u670D\u52A1
-doclet.Since=\u4ECE\u4EE5\u4E0B\u7248\u672C\u5F00\u59CB:
-doclet.Throws=\u629B\u51FA:
-doclet.Version=\u7248\u672C:
-doclet.Factory=\u5DE5\u5382:
-doclet.UnknownTag={0}\u662F\u672A\u77E5\u6807\u8BB0\u3002
-doclet.UnknownTagLowercase={0}\u662F\u672A\u77E5\u6807\u8BB0 - \u9664\u4E86\u5927\u5C0F\u5199\u4E4B\u5916\u5176\u4ED6\u65B9\u9762\u4E0E\u5DF2\u77E5\u6807\u8BB0\u76F8\u540C\u3002
-doclet.inheritDocBadSupertype=\u627E\u4E0D\u5230\u88AB\u8986\u76D6\u7684\u65B9\u6CD5
-doclet.inheritDocWithinInappropriateTag=\u4E0D\u80FD\u5728\u6B64\u6807\u8BB0\u4E2D\u4F7F\u7528 @inheritDoc
-doclet.inheritDocNoDoc=\u88AB\u8986\u76D6\u7684\u65B9\u6CD5\u4E0D\u8BB0\u5F55\u5F02\u5E38\u9519\u8BEF\u7C7B\u578B {0}
-doclet.throwsInheritDocUnsupported=\u4E0D\u662F\u7531\u65B9\u6CD5\u58F0\u660E\u7684\u5F02\u5E38\u9519\u8BEF\u7C7B\u7C7B\u578B\u53C2\u6570\u4E0D\u652F\u6301 @inheritDoc\uFF1B\u76F4\u63A5\u8BB0\u5F55\u6B64\u7C7B\u5F02\u5E38\u9519\u8BEF\u7C7B\u578B
-doclet.noInheritedDoc=\u4F7F\u7528\u4E86 @inheritDoc, \u4F46{0}\u672A\u8986\u76D6\u6216\u5B9E\u73B0\u4EFB\u4F55\u65B9\u6CD5\u3002
-doclet.tag_misuse=\u4E0D\u80FD\u5728{1}\u6587\u6863\u4E2D\u4F7F\u7528\u6807\u8BB0{0}\u3002\u53EA\u80FD\u5728\u4EE5\u4E0B\u7C7B\u578B\u7684\u6587\u6863\u4E2D\u4F7F\u7528\u8BE5\u6807\u8BB0: {2}\u3002
-doclet.Package_Summary=\u7A0B\u5E8F\u5305\u6982\u8981
-doclet.Requires_Summary=\u5FC5\u9700\u9879
-doclet.Indirect_Requires_Summary=\u95F4\u63A5\u5FC5\u9700\u9879
-doclet.Indirect_Exports_Summary=\u95F4\u63A5\u5BFC\u51FA\u9879
-doclet.Indirect_Opens_Summary=\u95F4\u63A5\u6253\u5F00\u9879
-doclet.Exported_Packages_Summary=\u5BFC\u51FA\u9879
-doclet.Opened_Packages_Summary=\u6253\u5F00\u9879
-doclet.Concealed_Packages_Summary=\u5DF2\u9690\u85CF
-doclet.From=\u4ECE
-doclet.Uses_Summary=\u4F7F\u7528
-doclet.Provides_Summary=\u63D0\u4F9B
-doclet.Nested_Class_Summary=\u5D4C\u5957\u7C7B\u6982\u8981
-doclet.Annotation_Type_Optional_Member_Summary=\u53EF\u9009\u5143\u7D20\u6982\u8981
-doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9700\u5143\u7D20\u6982\u8981
-doclet.Field_Summary=\u5B57\u6BB5\u6982\u8981
-doclet.Property_Summary=\u5C5E\u6027\u6982\u8981
-doclet.Enum_Constant_Summary=\u679A\u4E3E\u5E38\u91CF\u6982\u8981
-doclet.Constructor_Summary=\u6784\u9020\u5668\u6982\u8981
-doclet.Method_Summary=\u65B9\u6CD5\u6982\u8981
-doclet.Interfaces=\u63A5\u53E3
-doclet.Enums=\u679A\u4E3E
-doclet.EnumClasses=\u679A\u4E3E\u7C7B
-doclet.RecordClasses=\u8BB0\u5F55\u7C7B
-doclet.Related_Packages=\u76F8\u5173\u7A0B\u5E8F\u5305
-doclet.AnnotationTypes=\u6279\u6CE8\u7C7B\u578B
-doclet.AnnotationInterfaces=\u6279\u6CE8\u63A5\u53E3
-doclet.ExceptionClasses=\u5F02\u5E38\u9519\u8BEF\u7C7B
-doclet.Classes=\u7C7B
-doclet.All_Classes_And_Interfaces=\u6240\u6709\u7C7B\u548C\u63A5\u53E3
-doclet.All_Superinterfaces=\u6240\u6709\u8D85\u7EA7\u63A5\u53E3:
-doclet.All_Implemented_Interfaces=\u6240\u6709\u5DF2\u5B9E\u73B0\u7684\u63A5\u53E3:
-doclet.Interface=\u63A5\u53E3
-doclet.Class=\u7C7B
-doclet.AnnotationType=\u6279\u6CE8\u7C7B\u578B
-doclet.AnnotationInterface=\u6279\u6CE8\u63A5\u53E3
-doclet.annotationtype=\u6279\u6CE8\u7C7B\u578B
-doclet.annotationinterface=\u6279\u6CE8\u63A5\u53E3
-doclet.annotationtypes=\u6279\u6CE8\u7C7B\u578B
-doclet.annotationinterfaces=\u6279\u6CE8\u63A5\u53E3
-doclet.Enum=\u679A\u4E3E
-doclet.EnumClass=\u679A\u4E3E\u7C7B
-doclet.enum=\u679A\u4E3E
-doclet.enumclass=\u679A\u4E3E\u7C7B
-doclet.enums=\u679A\u4E3E
-doclet.enumclasses=\u679A\u4E3E\u7C7B
-doclet.interface=\u63A5\u53E3
-doclet.class=\u7C7B
-doclet.RecordClass=\u8BB0\u5F55\u7C7B
-doclet.recordclass=\u8BB0\u5F55\u7C7B
-doclet.ExceptionClass=\u5F02\u5E38\u9519\u8BEF\u7C7B
-doclet.exceptionclass=\u5F02\u5E38\u9519\u8BEF\u7C7B
-doclet.ExportedTo=\u5DF2\u5BFC\u51FA\u5230\u6A21\u5757
-doclet.OpenedTo=\u5DF2\u6253\u5F00\u5230\u6A21\u5757
-doclet.Package_private=(\u4E13\u7528\u7A0B\u5E8F\u5305)
-doclet.Nested_Classes_Interfaces_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u5D4C\u5957\u7C7B/\u63A5\u53E3
-doclet.Nested_Classes_Interfaces_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u5D4C\u5957\u7C7B/\u63A5\u53E3
-doclet.Nested_Classes_Interfaces_Declared_In_Class=\u5728\u7C7B\u4E2D\u58F0\u660E\u7684\u5D4C\u5957\u7C7B/\u63A5\u53E3
-doclet.Nested_Classes_Interfaces_Declared_In_Interface=\u5728\u63A5\u53E3\u4E2D\u58F0\u660E\u7684\u5D4C\u5957\u7C7B/\u63A5\u53E3
-doclet.Methods_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u65B9\u6CD5
-doclet.Methods_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u65B9\u6CD5
-doclet.Methods_Declared_In_Class=\u5728\u7C7B\u4E2D\u58F0\u660E\u7684\u65B9\u6CD5
-doclet.Methods_Declared_In_Interface=\u5728\u63A5\u53E3\u4E2D\u58F0\u660E\u7684\u65B9\u6CD5
-doclet.Fields_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u5B57\u6BB5
-doclet.Fields_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u5B57\u6BB5
-doclet.Fields_Declared_In_Class=\u5728\u7C7B\u4E2D\u58F0\u660E\u7684\u5B57\u6BB5
-doclet.Fields_Declared_In_Interface=\u5728\u63A5\u53E3\u4E2D\u58F0\u660E\u7684\u5B57\u6BB5
-doclet.Properties_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u5C5E\u6027
-doclet.Properties_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u5C5E\u6027
-doclet.Properties_Declared_In_Class=\u5728\u7C7B\u4E2D\u58F0\u660E\u7684\u5C5E\u6027
-doclet.Properties_Declared_In_Interface=\u5728\u63A5\u53E3\u4E2D\u58F0\u660E\u7684\u5C5E\u6027
-doclet.Annotation_Type_Member_Detail=\u5143\u7D20\u8BE6\u7EC6\u8D44\u6599
-doclet.Enum_Constant_Detail=\u679A\u4E3E\u5E38\u91CF\u8BE6\u7EC6\u8D44\u6599
-doclet.Constants_Summary=\u5E38\u91CF\u5B57\u6BB5\u503C
-doclet.Field_Detail=\u5B57\u6BB5\u8BE6\u7EC6\u8D44\u6599
-doclet.Property_Detail=\u5C5E\u6027\u8BE6\u7EC6\u8D44\u6599
-doclet.Method_Detail=\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599
-doclet.Constructor_Detail=\u6784\u9020\u5668\u8BE6\u7EC6\u8D44\u6599
-doclet.Deprecated=\u5DF2\u8FC7\u65F6\u3002
-doclet.DeprecatedForRemoval=\u5DF2\u8FC7\u65F6, \u5F85\u5220\u9664: \u6B64 API \u5143\u7D20\u5C06\u4ECE\u4EE5\u540E\u7684\u7248\u672C\u4E2D\u5220\u9664\u3002
-doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, groupname \u5DF2\u4F7F\u7528: {0}
-doclet.value_tag_invalid_reference={0} (\u7531 @value \u6807\u8BB0\u5F15\u7528) \u4E3A\u672A\u77E5\u5F15\u7528\u3002
-doclet.value_tag_invalid_constant=@value \u6807\u8BB0 (\u5F15\u7528{0}) \u53EA\u80FD\u5728\u5E38\u91CF\u4E2D\u4F7F\u7528\u3002
-doclet.value_tag_invalid_use=\u6B64\u5904\u4E0D\u80FD\u4F7F\u7528 @value \u6807\u8BB0\u3002
-doclet.value_tag_invalid_format=\u683C\u5F0F\u65E0\u6548\uFF1A{0}
-doclet.dest_dir_create=\u6B63\u5728\u521B\u5EFA\u76EE\u6807\u76EE\u5F55: "{0}"
-doclet.in={1}\u4E2D\u7684{0}
-doclet.Fields=\u5B57\u6BB5
-doclet.Preview=\u9884\u89C8\u3002
-doclet.Properties=\u5C5E\u6027
-doclet.Constructors=\u6784\u9020\u5668
-doclet.Methods=\u65B9\u6CD5
-doclet.All_Methods=\u6240\u6709\u65B9\u6CD5
-doclet.Static_Methods=\u9759\u6001\u65B9\u6CD5
-doclet.Instance_Methods=\u5B9E\u4F8B\u65B9\u6CD5
-doclet.Abstract_Methods=\u62BD\u8C61\u65B9\u6CD5
-doclet.Concrete_Methods=\u5177\u4F53\u65B9\u6CD5
-doclet.Default_Methods=\u9ED8\u8BA4\u65B9\u6CD5
-doclet.Deprecated_Methods=\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5
-doclet.Annotation_Type_Optional_Members=\u53EF\u9009\u5143\u7D20
-doclet.Annotation_Type_Required_Members=\u6240\u9700\u5143\u7D20
-doclet.Enum_Constants=\u679A\u4E3E\u5E38\u91CF
-doclet.Nested_Classes=\u5D4C\u5957\u7C7B
-doclet.Modifier=\u9650\u5B9A\u7B26
-doclet.Type=\u7C7B\u578B
-doclet.Modifier_and_Type=\u4FEE\u9970\u7B26\u548C\u7C7B\u578B
-doclet.Implementation=\u5B9E\u73B0:
+doclet.Generating_0=正在生成{0}...
+doclet.MissingSerialTag=在类{0}中, 默认的可序列化字段{1}缺少 @serial 标记。
+doclet.MissingSerialDataTag=在类{0}中, 方法{1}中缺少 @serialData 标记。
+doclet.Serializable_no_customization=未声明 readObject 或 writeObject 方法。
+doclet.Serialized_Form=序列化表格
+doclet.Serialized_Form_methods=序列化方法
+doclet.Serialized_Form_fields=序列化字段
+doclet.Serialized_Form_class=序列化概览
+doclet.Option_conflict=选项{0}与{1}冲突
+doclet.Option_reuse=重复使用的选项: {0}
+doclet.Option_invalid={1} 选项的 {0} 参数无效
+doclet.Option_doclint_no_qualifiers=-Xdoclint 参数不允许使用访问限定符
+doclet.Option_doclint_invalid_arg=-Xdoclint 选项的参数无效
+doclet.Option_doclint_package_invalid_arg=-Xdoclint/package 选项的参数无效
+doclet.error.initializing.dest.dir=初始化目标目录时出错: {0}
+doclet.exception.read.file=读取文件时出错: {0}\n\t({1})
+doclet.exception.write.file=写入文件时出错: {0}\n\t({1})
+doclet.exception.read.resource=读取系统资源时出错: {0}\n\t({1})
+doclet.internal.exception=出现内部异常错误。\n\t({0})
+doclet.internal.report.bug=如果在 Bug Database (https://bugs.java.com) 中没有找到有关该错误的 javadoc 工具 Bug，\n请通过 Java Bug 报告页 (https://bugreport.java.com) 提交 javadoc 工具 Bug。\n请在报告中附上错误消息和以下诊断信息。谢谢。
+doclet.File_not_found=找不到文件: {0}
+doclet.snippet_file_not_found=在源路径或片段路径中找不到文件：{0}
+doclet.Copy_Overwrite_warning=未将文件{0}复制到 {1}, 因为现有文件具有相同名称...
+doclet.Copy_Ignored_warning=未复制文件 {0}：名称无效
+doclet.Copy_to_clipboard=复制
+doclet.Copied_to_clipboard=已复制！
+doclet.Copy_url_to_clipboard=复制 URL
+doclet.Copy_snippet_to_clipboard=复制片段
+doclet.Copying_File_0_To_Dir_1=正在将文件{0}复制到目录 {1}...
+doclet.Copying_File_0_To_File_1=正在将文件{0}复制到文件{1}...
+doclet.No_Public_Classes_To_Document=找不到可以文档化的公共或受保护的类。
+doclet.destination_directory_not_directory_0=目标目录不是目录: {0}
+doclet.destination_directory_not_writable_0=目标目录不可写: {0}
+doclet.Encoding_not_supported=不支持编码: {0}
+doclet.Building_Tree=正在构建所有程序包和类的树...
+doclet.Building_Index=正在构建所有程序包和类的索引...
+doclet.Building_Index_For_All_Classes=正在构建所有类的索引...
+doclet.sourcetab_warning=-sourcetab 的参数必须是大于 0 的整数。
+doclet.JavaScript_in_comment=文档注释中发现 JavaScript。\n使用 --allow-script-in-comments 可允许使用 JavaScript。
+doclet.JavaScript_in_option=选项 {0} 包含 JavaScript。\n使用 --allow-script-in-comments 可允许使用 JavaScript。
+doclet.Link_icon=链接图标
+doclet.Link_to_section=链接到此节
+doclet.Packages=程序包
+doclet.All_Packages=所有程序包
+doclet.Modules=模块
+doclet.All_Modules=全部模块
+doclet.Other_Packages=其他程序包
+doclet.Other_Modules=其他模块
+doclet.Notice_taglet_registered=注册的 Taglet {0}...
+doclet.Notice_taglet_unseen=注: 找不到的定制标记: {0}
+doclet.Notice_taglet_overridden=注: 覆盖标准标记的定制标记: {0}
+doclet.Notice_taglet_conflict_warn=注: 可能覆盖将来的标准标记的定制标记: {0}。为了避免出现可能的覆盖, 请在定制标记名称中至少使用一个句点字符 (.)。
+doclet.Error_taglet_not_registered=错误 - 尝试注册 Taglet {1}时抛出异常错误{0}...
+doclet.Error_invalid_custom_tag_argument=错误 - 对于 -tag 选项, {0}是无效参数...
+doclet.taglet_could_not_set_location = 无法设置 taglet 路径：{0}
+doclet.not_standard_file_manager = 无法设置 taglet 路径；文件管理器不是 StandardJavaFileManager
+doclet.Author=作者:
+doclet.DefaultValue=默认值:
+doclet.PropertyDescription=属性说明:
+doclet.PropertyGetterWithName=获取{0}属性的值。
+doclet.PropertyGetterReturn={0} 属性的值
+doclet.PropertySetterWithName=设置{0}属性的值。
+doclet.PropertySetterParam={0} 属性的值
+doclet.PropertyMethodReturn={0} 属性
+doclet.Default=默认值:
+doclet.Parameters=参数:
+doclet.TypeParameters=类型参数:
+doclet.RecordComponents=记录组件：
+doclet.Parameters_warn=@param argument "{0}" 不是参数名称。
+doclet.Parameters_dup_warn=多次对参数 "{0}" 进行文档化。
+doclet.TypeParameters_warn=@param argument "{0}" 不是类型参数名称。
+doclet.TypeParameters_dup_warn=多次对类型参数 "{0}" 进行文档化。
+doclet.RecordComponents_warn=@param argument "{0}" 不是记录组件名称。
+doclet.RecordComponents_dup_warn=多次对记录组件 "{0}" 进行文档化。
+doclet.Returns=返回:
+doclet.Returns_0=返回 {0}。
+doclet.Return_tag_on_void_method=不能在返回类型为空的方法中使用 @return 标记。
+doclet.See_Also=另请参阅:
+doclet.SerialData=序列数据:
+doclet.Services=服务
+doclet.Since=从以下版本开始:
+doclet.Throws=抛出:
+doclet.Version=版本:
+doclet.Factory=工厂:
+doclet.UnknownTag={0}是未知标记。
+doclet.UnknownTagLowercase={0}是未知标记 - 除了大小写之外其他方面与已知标记相同。
+doclet.inheritDocBadSupertype=找不到被覆盖的方法
+doclet.inheritDocWithinInappropriateTag=不能在此标记中使用 @inheritDoc
+doclet.inheritDocNoDoc=被覆盖的方法不记录异常错误类型 {0}
+doclet.throwsInheritDocUnsupported=不是由方法声明的异常错误类类型参数不支持 @inheritDoc；直接记录此类异常错误类型
+doclet.noInheritedDoc=使用了 @inheritDoc, 但{0}未覆盖或实现任何方法。
+doclet.tag_misuse=不能在{1}文档中使用标记{0}。只能在以下类型的文档中使用该标记: {2}。
+doclet.Package_Summary=程序包概要
+doclet.Requires_Summary=必需项
+doclet.Indirect_Requires_Summary=间接必需项
+doclet.Indirect_Exports_Summary=间接导出项
+doclet.Indirect_Opens_Summary=间接打开项
+doclet.Exported_Packages_Summary=导出项
+doclet.Opened_Packages_Summary=打开项
+doclet.Concealed_Packages_Summary=已隐藏
+doclet.From=从
+doclet.Uses_Summary=使用
+doclet.Provides_Summary=提供
+doclet.Nested_Class_Summary=嵌套类概要
+doclet.Annotation_Type_Optional_Member_Summary=可选元素概要
+doclet.Annotation_Type_Required_Member_Summary=必需元素概要
+doclet.Field_Summary=字段概要
+doclet.Property_Summary=属性概要
+doclet.Enum_Constant_Summary=枚举常量概要
+doclet.Constructor_Summary=构造器概要
+doclet.Method_Summary=方法概要
+doclet.Interfaces=接口
+doclet.Enums=枚举
+doclet.EnumClasses=枚举类
+doclet.RecordClasses=记录类
+doclet.Related_Packages=相关程序包
+doclet.AnnotationTypes=批注类型
+doclet.AnnotationInterfaces=批注接口
+doclet.ExceptionClasses=异常错误类
+doclet.Classes=类
+doclet.All_Classes_And_Interfaces=所有类和接口
+doclet.All_Superinterfaces=所有超级接口:
+doclet.All_Implemented_Interfaces=所有已实现的接口:
+doclet.Interface=接口
+doclet.Class=类
+doclet.AnnotationType=批注类型
+doclet.AnnotationInterface=批注接口
+doclet.annotationtype=批注类型
+doclet.annotationinterface=批注接口
+doclet.annotationtypes=批注类型
+doclet.annotationinterfaces=批注接口
+doclet.Enum=枚举
+doclet.EnumClass=枚举类
+doclet.enum=枚举
+doclet.enumclass=枚举类
+doclet.enums=枚举
+doclet.enumclasses=枚举类
+doclet.interface=接口
+doclet.class=类
+doclet.RecordClass=记录类
+doclet.recordclass=记录类
+doclet.ExceptionClass=异常错误类
+doclet.exceptionclass=异常错误类
+doclet.ExportedTo=已导出到模块
+doclet.OpenedTo=已打开到模块
+doclet.Package_private=(专用程序包)
+doclet.Nested_Classes_Interfaces_Inherited_From_Class=从类继承的嵌套类/接口
+doclet.Nested_Classes_Interfaces_Inherited_From_Interface=从接口继承的嵌套类/接口
+doclet.Nested_Classes_Interfaces_Declared_In_Class=在类中声明的嵌套类/接口
+doclet.Nested_Classes_Interfaces_Declared_In_Interface=在接口中声明的嵌套类/接口
+doclet.Methods_Inherited_From_Class=从类继承的方法
+doclet.Methods_Inherited_From_Interface=从接口继承的方法
+doclet.Methods_Declared_In_Class=在类中声明的方法
+doclet.Methods_Declared_In_Interface=在接口中声明的方法
+doclet.Fields_Inherited_From_Class=从类继承的字段
+doclet.Fields_Inherited_From_Interface=从接口继承的字段
+doclet.Fields_Declared_In_Class=在类中声明的字段
+doclet.Fields_Declared_In_Interface=在接口中声明的字段
+doclet.Properties_Inherited_From_Class=从类继承的属性
+doclet.Properties_Inherited_From_Interface=从接口继承的属性
+doclet.Properties_Declared_In_Class=在类中声明的属性
+doclet.Properties_Declared_In_Interface=在接口中声明的属性
+doclet.Annotation_Type_Member_Detail=元素详细资料
+doclet.Enum_Constant_Detail=枚举常量详细资料
+doclet.Constants_Summary=常量字段值
+doclet.Field_Detail=字段详细资料
+doclet.Property_Detail=属性详细资料
+doclet.Method_Detail=方法详细资料
+doclet.Constructor_Detail=构造器详细资料
+doclet.Deprecated=已过时。
+doclet.DeprecatedForRemoval=已过时, 待删除: 此 API 元素将从以后的版本中删除。
+doclet.Groupname_already_used=在 -group 选项中, groupname 已使用: {0}
+doclet.value_tag_invalid_reference={0} (由 @value 标记引用) 为未知引用。
+doclet.value_tag_invalid_constant=@value 标记 (引用{0}) 只能在常量中使用。
+doclet.value_tag_invalid_use=此处不能使用 @value 标记。
+doclet.value_tag_invalid_format=格式无效：{0}
+doclet.dest_dir_create=正在创建目标目录: "{0}"
+doclet.in={1}中的{0}
+doclet.Fields=字段
+doclet.Preview=预览。
+doclet.Properties=属性
+doclet.Constructors=构造器
+doclet.Methods=方法
+doclet.All_Methods=所有方法
+doclet.Static_Methods=静态方法
+doclet.Instance_Methods=实例方法
+doclet.Abstract_Methods=抽象方法
+doclet.Concrete_Methods=具体方法
+doclet.Default_Methods=默认方法
+doclet.Deprecated_Methods=已过时的方法
+doclet.Annotation_Type_Optional_Members=可选元素
+doclet.Annotation_Type_Required_Members=所需元素
+doclet.Enum_Constants=枚举常量
+doclet.Nested_Classes=嵌套类
+doclet.Modifier=限定符
+doclet.Type=类型
+doclet.Modifier_and_Type=修饰符和类型
+doclet.Implementation=实现:
 doclet.search=SEARCH
-doclet.search_placeholder=\u641C\u7D22
-doclet.search_reset=\u91CD\u7F6E
-doclet.Field=\u5B57\u6BB5
-doclet.Property=\u5C5E\u6027
-doclet.Constructor=\u6784\u9020\u5668
-doclet.Method=\u65B9\u6CD5
-doclet.Annotation_Type_Optional_Member=\u53EF\u9009\u5143\u7D20
-doclet.Annotation_Type_Required_Member=\u5FC5\u9700\u7684\u5143\u7D20
-doclet.Annotation_Type_Member=\u6279\u6CE8\u7C7B\u578B\u5143\u7D20
-doclet.Annotation_Interface_Member=\u6279\u6CE8\u63A5\u53E3\u5143\u7D20
-doclet.Enum_Constant=\u679A\u4E3E\u5E38\u91CF
-doclet.Description=\u8BF4\u660E
-doclet.ConstantField=\u5E38\u91CF\u5B57\u6BB5
-doclet.Value=\u503C
-doclet.linkMismatch_PackagedLinkedtoModule=\u8FDB\u884C\u6587\u6863\u5316\u7684\u4EE3\u7801\u4F7F\u7528\u4E86\u672A\u547D\u540D\u6A21\u5757\u4E2D\u7684\u7A0B\u5E8F\u5305\uFF0C\u4F46\u5728 {0} \u4E2D\u5B9A\u4E49\u7684\u7A0B\u5E8F\u5305\u5728\u547D\u540D\u6A21\u5757\u4E2D\u3002
-doclet.linkMismatch_ModuleLinkedtoPackage=\u8FDB\u884C\u6587\u6863\u5316\u7684\u4EE3\u7801\u4F7F\u7528\u4E86\u6A21\u5757\uFF0C\u4F46\u5728 {0} \u4E2D\u5B9A\u4E49\u7684\u7A0B\u5E8F\u5305\u5728\u672A\u547D\u540D\u6A21\u5757\u4E2D\u3002
-doclet.urlRedirected=URL {0} \u5DF2\u91CD\u5B9A\u5411\u5230 {1} \u2014 \u66F4\u65B0\u547D\u4EE4\u884C\u9009\u9879\u4EE5\u9690\u85CF\u6B64\u8B66\u544A\u3002
-doclet.duplicate.comment.for.property=\u5C5E\u6027\u6CE8\u91CA\u91CD\u590D\u3002\n\u5220\u9664\u5C5E\u6027\u5B57\u6BB5\u6216\u6B64\u65B9\u6CD5\u7684\u6CE8\u91CA\u4EE5\u9690\u85CF\u6B64\u8B66\u544A\u3002
+doclet.search_placeholder=搜索
+doclet.search_reset=重置
+doclet.Field=字段
+doclet.Property=属性
+doclet.Constructor=构造器
+doclet.Method=方法
+doclet.Annotation_Type_Optional_Member=可选元素
+doclet.Annotation_Type_Required_Member=必需的元素
+doclet.Annotation_Type_Member=批注类型元素
+doclet.Annotation_Interface_Member=批注接口元素
+doclet.Enum_Constant=枚举常量
+doclet.Description=说明
+doclet.ConstantField=常量字段
+doclet.Value=值
+doclet.linkMismatch_PackagedLinkedtoModule=进行文档化的代码使用了未命名模块中的程序包，但在 {0} 中定义的程序包在命名模块中。
+doclet.linkMismatch_ModuleLinkedtoPackage=进行文档化的代码使用了模块，但在 {0} 中定义的程序包在未命名模块中。
+doclet.urlRedirected=URL {0} 已重定向到 {1} — 更新命令行选项以隐藏此警告。
+doclet.duplicate.comment.for.property=属性注释重复。\n删除属性字段或此方法的注释以隐藏此警告。
 
 #Documentation for Enums
-doclet.enum_values_doc.fullbody=\u8FD4\u56DE\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\n\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
-doclet.enum_class_values_doc.fullbody=\u8FD4\u56DE\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\n\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
+doclet.enum_values_doc.fullbody=返回包含该枚举类型的常量的数组，\n顺序与声明这些常量的顺序相同
+doclet.enum_class_values_doc.fullbody=返回包含该枚举类的常量的数组，\n顺序与声明这些常量的顺序相同
 
-doclet.enum_values_doc.return=\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
-doclet.enum_class_values_doc.return=\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
+doclet.enum_values_doc.return=包含该枚举类型的常量的数组，顺序与声明这些常量的顺序相同
+doclet.enum_class_values_doc.return=包含该枚举类的常量的数组，顺序与声明这些常量的顺序相同
 
-doclet.enum_valueof_doc.fullbody=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)
-doclet.enum_class_valueof_doc.fullbody=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002\uFF08\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002\uFF09
+doclet.enum_valueof_doc.fullbody=返回带有指定名称的该类型的枚举常量。\n字符串必须与用于声明该类型的枚举常量的\n标识符<i>完全</i>匹配。(不允许有多余\n的空格字符。)
+doclet.enum_class_valueof_doc.fullbody=返回带有指定名称的该类的枚举常量。\n字符串必须与用于声明该类的枚举常量的\n标识符<i>完全</i>匹配。（不允许有多余\n的空格字符。）
 
-doclet.enum_valueof_doc.param_name=\u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002
+doclet.enum_valueof_doc.param_name=要返回的枚举常量的名称。
 
-doclet.enum_valueof_doc.return=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF
+doclet.enum_valueof_doc.return=返回带有指定名称的枚举常量
 
-doclet.enum_valueof_doc.throws_ila=\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF
-doclet.enum_class_valueof_doc.throws_ila=\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF
+doclet.enum_valueof_doc.throws_ila=如果该枚举类型没有带有指定名称的常量
+doclet.enum_class_valueof_doc.throws_ila=如果该枚举类没有带有指定名称的常量
 
-doclet.enum_valueof_doc.throws_npe=\u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C
+doclet.enum_valueof_doc.throws_npe=如果参数为空值
 
 
 #Documentation for records
-doclet.record_constructor_doc.fullbody=\u521B\u5EFA {0} \u8BB0\u5F55\u7C7B\u7684\u5B9E\u4F8B\u3002
+doclet.record_constructor_doc.fullbody=创建 {0} 记录类的实例。
 
-doclet.record_constructor_doc.param_name={0} \u8BB0\u5F55\u7EC4\u4EF6\u7684\u503C
+doclet.record_constructor_doc.param_name={0} 记录组件的值
 
-doclet.record_equals_doc.fullbody.head=\u6307\u793A\u67D0\u4E2A\u5176\u4ED6\u5BF9\u8C61\u662F\u5426\u201C\u7B49\u4E8E\u201D\u6B64\u5BF9\u8C61\u3002\u5982\u679C\u4E24\u4E2A\u5BF9\u8C61\u5C5E\u4E8E\u540C\u4E00\u4E2A\u7C7B\uFF0C\u800C\u4E14\u6240\u6709\u8BB0\u5F55\u7EC4\u4EF6\u90FD\u76F8\u7B49\uFF0C\u5219\u8FD9\u4E24\u4E2A\u5BF9\u8C61\u76F8\u7B49\u3002
+doclet.record_equals_doc.fullbody.head=指示某个其他对象是否“等于”此对象。如果两个对象属于同一个类，而且所有记录组件都相等，则这两个对象相等。
 
-doclet.record_equals_doc.fullbody.tail.both=\u4F7F\u7528 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} \u5BF9\u53C2\u8003\u7EC4\u4EF6\u8FDB\u884C\u6BD4\u8F83\uFF1B\u4F7F\u7528 '==' \u5BF9\u57FA\u5143\u7EC4\u4EF6\u8FDB\u884C\u6BD4\u8F83
+doclet.record_equals_doc.fullbody.tail.both=使用 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} 对参考组件进行比较；使用 '==' 对基元组件进行比较
 
-doclet.record_equals_doc.fullbody.tail.primitive=\u6B64\u8BB0\u5F55\u7C7B\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 '==' \u8FDB\u884C\u6BD4\u8F83\u3002
+doclet.record_equals_doc.fullbody.tail.primitive=此记录类中的所有组件都使用 '==' 进行比较。
 
-doclet.record_equals_doc.fullbody.tail.reference=\u6B64\u8BB0\u5F55\u7C7B\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} \u8FDB\u884C\u6BD4\u8F83\u3002
+doclet.record_equals_doc.fullbody.tail.reference=此记录类中的所有组件都使用 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} 进行比较。
 
-doclet.record_equals_doc.param_name=\u8981\u4E0E\u4E4B\u8FDB\u884C\u6BD4\u8F83\u7684\u5BF9\u8C61
+doclet.record_equals_doc.param_name=要与之进行比较的对象
 
-doclet.record_equals_doc.return=\u5982\u679C\u6B64\u5BF9\u8C61\u4E0E {0} \u53C2\u6570\u76F8\u540C\uFF0C\u5219\u4E3A <code>true</code>\uFF1B\u5426\u5219\u4E3A <code>false</code>\u3002
+doclet.record_equals_doc.return=如果此对象与 {0} 参数相同，则为 <code>true</code>；否则为 <code>false</code>。
 
-doclet.record_hashCode_doc.fullbody=\u8FD4\u56DE\u6B64\u5BF9\u8C61\u7684\u54C8\u5E0C\u4EE3\u7801\u503C\u3002\u6B64\u503C\u6D3E\u751F\u81EA\u6BCF\u4E2A\u8BB0\u5F55\u7EC4\u4EF6\u7684\u54C8\u5E0C\u4EE3\u7801\u3002
+doclet.record_hashCode_doc.fullbody=返回此对象的哈希代码值。此值派生自每个记录组件的哈希代码。
 
-doclet.record_hashCode_doc.return=\u6B64\u5BF9\u8C61\u7684\u54C8\u5E0C\u4EE3\u7801\u503C
+doclet.record_hashCode_doc.return=此对象的哈希代码值
 
-doclet.record_toString_doc.fullbody=\u8FD4\u56DE\u6B64\u8BB0\u5F55\u7C7B\u7684\u5B57\u7B26\u4E32\u8868\u793A\u5F62\u5F0F\u3002\u6B64\u8868\u793A\u5F62\u5F0F\u5305\u542B\u7C7B\u7684\u540D\u79F0\uFF0C\u540E\u8DDF\u6BCF\u4E2A\u8BB0\u5F55\u7EC4\u4EF6\u7684\u540D\u79F0\u548C\u503C\u3002
+doclet.record_toString_doc.fullbody=返回此记录类的字符串表示形式。此表示形式包含类的名称，后跟每个记录组件的名称和值。
 
-doclet.record_toString_doc.return=\u6B64\u5BF9\u8C61\u7684\u5B57\u7B26\u4E32\u8868\u793A\u5F62\u5F0F
+doclet.record_toString_doc.return=此对象的字符串表示形式
 
-doclet.record_accessor_doc.fullbody=\u8FD4\u56DE {0} \u8BB0\u5F55\u7EC4\u4EF6\u7684\u503C\u3002
+doclet.record_accessor_doc.fullbody=返回 {0} 记录组件的值。
 
-doclet.record_accessor_doc.return={0} \u8BB0\u5F55\u7EC4\u4EF6\u7684\u503C
+doclet.record_accessor_doc.return={0} 记录组件的值
 
-doclet.record_field_doc.fullbody={0} \u8BB0\u5F55\u7EC4\u4EF6\u7684\u5B57\u6BB5\u3002
+doclet.record_field_doc.fullbody={0} 记录组件的字段。
 
 doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/
 doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/
 doclet.platform.docs.ea=https://download.java.net/java/early_access/jdk{0}/docs/api/
 
-doclet.search.enter_search_term=\u8F93\u5165\u641C\u7D22\u8BCD
-doclet.search.no_results=\u672A\u627E\u5230\u7ED3\u679C
-doclet.search.one_result=\u627E\u5230\u4E00\u4E2A\u7ED3\u679C
-doclet.search.many_results=\u627E\u5230 {0} \u4E2A\u7ED3\u679C
-doclet.search.loading=\u6B63\u5728\u52A0\u8F7D\u641C\u7D22\u7D22\u5F15...
-doclet.search.searching=\u6B63\u5728\u641C\u7D22...
-doclet.search.redirecting=\u6B63\u5728\u91CD\u5B9A\u5411\u5230\u7B2C\u4E00\u4E2A\u7ED3\u679C...
-doclet.search.modules=\u6A21\u5757
-doclet.search.packages=\u7A0B\u5E8F\u5305
-doclet.search.classes_and_interfaces=\u7C7B\u548C\u63A5\u53E3
-doclet.search.types=\u7C7B\u578B
-doclet.search.members=\u6210\u5458
-doclet.search.search_tags=\u641C\u7D22\u6807\u8BB0
+doclet.search.enter_search_term=输入搜索词
+doclet.search.no_results=未找到结果
+doclet.search.one_result=找到一个结果
+doclet.search.many_results=找到 {0} 个结果
+doclet.search.loading=正在加载搜索索引...
+doclet.search.searching=正在搜索...
+doclet.search.redirecting=正在重定向到第一个结果...
+doclet.search.modules=模块
+doclet.search.packages=程序包
+doclet.search.classes_and_interfaces=类和接口
+doclet.search.types=类型
+doclet.search.members=成员
+doclet.search.search_tags=搜索标记
 
-doclet.snippet.contents.none=@snippet \u672A\u6307\u5B9A\u5185\u5BB9
+doclet.snippet.contents.none=@snippet 未指定内容
 
-doclet.snippet.contents.ambiguity.external=@snippet \u6307\u5B9A\u4E86\u591A\u4E2A\u5916\u90E8\u5185\u5BB9\uFF0C\u8FD9\u4F1A\u5F15\u8D77\u6DF7\u6DC6
+doclet.snippet.contents.ambiguity.external=@snippet 指定了多个外部内容，这会引起混淆
 
-doclet.snippet.region.not_found=\u627E\u4E0D\u5230\u533A\u57DF\uFF1A"{0}"
+doclet.snippet.region.not_found=找不到区域："{0}"
 
-doclet.tag.attribute.value.illegal=\u5C5E\u6027 "{0}" \u7684\u503C\u975E\u6CD5\uFF1A"{1}"
+doclet.tag.attribute.value.illegal=属性 "{0}" 的值非法："{1}"
 
-doclet.tag.attribute.value.missing=\u5C5E\u6027 "{0}" \u7F3A\u5C11\u503C
+doclet.tag.attribute.value.missing=属性 "{0}" 缺少值
 
-doclet.tag.attribute.repeated=\u91CD\u590D\u5C5E\u6027\uFF1A"{0}"
+doclet.tag.attribute.repeated=重复属性："{0}"
 
-doclet.snippet.contents.mismatch=\u5185\u5BB9\u4E0D\u5339\u914D\uFF1A\n{0}
+doclet.snippet.contents.mismatch=内容不匹配：\n{0}
 
-doclet.snippet.markup=\u7247\u6BB5\u6807\u8BB0\uFF1A{0}
+doclet.snippet.markup=片段标记：{0}
 
-doclet.snippet.markup.spurious=\u865A\u5047\u6807\u8BB0
-doclet.snippet.markup.attribute.absent=\u7F3A\u5C11\u5C5E\u6027 "{0}"
-doclet.snippet.markup.attribute.simultaneous.use=\u540C\u65F6\u4F7F\u7528\u4E86\u5C5E\u6027 "{0}" \u548C "{1}"
-doclet.snippet.markup.attribute.unexpected=\u610F\u5916\u7684\u5C5E\u6027
-doclet.snippet.markup.attribute.value.invalid=\u5C5E\u6027\u503C\u65E0\u6548
-doclet.snippet.markup.attribute.value.unterminated=\u672A\u7EC8\u6B62\u7684\u5C5E\u6027\u503C
-doclet.snippet.markup.regex.invalid=\u6B63\u5219\u8868\u8FBE\u5F0F\u65E0\u6548
-doclet.snippet.markup.region.duplicated=\u91CD\u590D\u7684\u533A\u57DF
-doclet.snippet.markup.region.none=\u6CA1\u6709\u7ED3\u675F\u533A\u57DF
-doclet.snippet.markup.region.unpaired=\u533A\u57DF\u4E0D\u914D\u5BF9
-doclet.snippet.markup.tag.non.existent.lines=\u6807\u8BB0\u5F15\u7528\u4E0D\u5B58\u5728\u7684\u884C
+doclet.snippet.markup.spurious=虚假标记
+doclet.snippet.markup.attribute.absent=缺少属性 "{0}"
+doclet.snippet.markup.attribute.simultaneous.use=同时使用了属性 "{0}" 和 "{1}"
+doclet.snippet.markup.attribute.unexpected=意外的属性
+doclet.snippet.markup.attribute.value.invalid=属性值无效
+doclet.snippet.markup.attribute.value.unterminated=未终止的属性值
+doclet.snippet.markup.regex.invalid=正则表达式无效
+doclet.snippet.markup.region.duplicated=重复的区域
+doclet.snippet.markup.region.none=没有结束区域
+doclet.snippet.markup.region.unpaired=区域不配对
+doclet.snippet.markup.tag.non.existent.lines=标记引用不存在的行
 
 # 0: path
-doclet.cannot_use_snippet_path=\u4E0D\u80FD\u5C06 ''--snippet-path'' \u9009\u9879\u4E0E\u7ED9\u5B9A\u7684\u6587\u4EF6\u7BA1\u7406\u5668 {0} \u4E00\u8D77\u4F7F\u7528
+doclet.cannot_use_snippet_path=不能将 ''--snippet-path'' 选项与给定的文件管理器 {0} 一起使用
 
 # 0: path; 1: exception
-doclet.error_setting_snippet_path=\u8BBE\u7F6E\u7247\u6BB5\u8DEF\u5F84 {0} \u65F6\u51FA\u9519\uFF1A{1}
+doclet.error_setting_snippet_path=设置片段路径 {0} 时出错：{1}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties
index 9f6d3bda894..f5def4487d8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties
@@ -24,74 +24,74 @@
 #
 
 dc.anchor.already.defined = Anker bereits definiert: "{0}"
-dc.anchor.value.missing = kein Wert f\u00FCr Anker angegeben
+dc.anchor.value.missing = kein Wert für Anker angegeben
 dc.attr.lacks.value = Attribut hat keinen Wert
 dc.attr.not.number = Attributwert ist keine Zahl
-dc.attr.not.supported.html5 = Attribut wird in HTML5 nicht unterst\u00FCtzt: {0}
+dc.attr.not.supported.html5 = Attribut wird in HTML5 nicht unterstützt: {0}
 dc.attr.obsolete = Attribut veraltet: {0}
 dc.attr.repeated = wiederholtes Attribut: {0}
-dc.attr.img.border.not.valid = Attribut "border" f\u00FCr img akzeptiert nur "0": {0}
-dc.attr.img.border.not.number = ung\u00FCltiger Wert f\u00FCr Attribut "border": {0}
-dc.attr.table.border.not.valid = Attribut "border" f\u00FCr Tabelle akzeptiert nur "" oder "1": {0}
-dc.attr.table.border.not.number = ung\u00FCltiger Wert f\u00FCr Attribut "border": {0}
+dc.attr.img.border.not.valid = Attribut "border" für img akzeptiert nur "0": {0}
+dc.attr.img.border.not.number = ungültiger Wert für Attribut "border": {0}
+dc.attr.table.border.not.valid = Attribut "border" für Tabelle akzeptiert nur "" oder "1": {0}
+dc.attr.table.border.not.number = ungültiger Wert für Attribut "border": {0}
 dc.attr.unknown = unbekanntes Attribut: {0}
-dc.bad.option = ung\u00FCltige Option: {0}
-dc.bad.value.for.option = ung\u00FCltiger Wert f\u00FCr Option: {0} {1}
+dc.bad.option = ungültige Option: {0}
+dc.bad.value.for.option = ungültiger Wert für Option: {0} {1}
 dc.default.constructor = Verwendung von Standardkonstruktor, der keinen Kommentar bereitstellt
-dc.empty = keine Beschreibung f\u00FCr @{0}
+dc.empty = keine Beschreibung für @{0}
 dc.empty.comment = leerer Kommentar
 dc.empty.main.description = Keine Hauptbeschreibung
-dc.entity.invalid = ung\u00FCltige Entity &{0};
-dc.exception.not.thrown = Ausnahme nicht ausgel\u00F6st: {0}
+dc.entity.invalid = ungültige Entity &{0};
+dc.exception.not.thrown = Ausnahme nicht ausgelöst: {0}
 dc.exists.param = @param "{0}" wurde bereits angegeben
 dc.exists.return = @return wurde bereits angegeben
-dc.invalid.anchor = ung\u00FCltiger Name f\u00FCr Anker: "{0}"
-dc.invalid.param = ung\u00FCltige Verwendung von @param
-dc.invalid.provides = ung\u00FCltige Verwendung von @provides
-dc.invalid.return = ung\u00FCltige Verwendung von @return
-dc.invalid.summary = ung\u00FCltige Verwendung von @summary
-dc.invalid.throws = ung\u00FCltige Verwendung von @throws
-dc.invalid.uses = ung\u00FCltige Verwendung von @uses
-dc.invalid.uri = ung\u00FCltige URI: "{0}"
+dc.invalid.anchor = ungültiger Name für Anker: "{0}"
+dc.invalid.param = ungültige Verwendung von @param
+dc.invalid.provides = ungültige Verwendung von @provides
+dc.invalid.return = ungültige Verwendung von @return
+dc.invalid.summary = ungültige Verwendung von @summary
+dc.invalid.throws = ungültige Verwendung von @throws
+dc.invalid.uses = ungültige Verwendung von @uses
+dc.invalid.uri = ungültige URI: "{0}"
 dc.missing.comment = kein Kommentar
-dc.missing.param = kein @param f\u00FCr {0}
+dc.missing.param = kein @param für {0}
 dc.missing.return = kein @return
-dc.missing.throws = kein @throws f\u00FCr {0}
-dc.no.alt.attr.for.image = kein Attribut "alt" f\u00FCr Bild
-dc.no.summary.or.caption.for.table=keine Beschriftung f\u00FCr Tabelle
+dc.missing.throws = kein @throws für {0}
+dc.no.alt.attr.for.image = kein Attribut "alt" für Bild
+dc.no.summary.or.caption.for.table=keine Beschriftung für Tabelle
 dc.param.name.not.found = @param-Name nicht gefunden
 dc.ref.not.found = Referenz nicht gefunden
-dc.ref.in.missing.module = Modul f\u00FCr Referenz nicht gefunden: {0}
+dc.ref.in.missing.module = Modul für Referenz nicht gefunden: {0}
 dc.return.not.first = '{@return} nicht am Anfang der Beschreibung
 dc.service.not.found = service-type nicht gefunden
 dc.tag.code.within.code = '{@code} in <code>
 dc.tag.empty = leeres <{0}>-Tag
 dc.tag.a.within.a = {0}-Tag, das zu <a> erweitert wird, in <a>
-dc.tag.end.not.permitted = ung\u00FCltiges Endtag: </{0}>
+dc.tag.end.not.permitted = ungültiges Endtag: </{0}>
 dc.tag.end.unexpected = unerwartetes Endtag: </{0}>
-dc.tag.heading.sequence.1 = \u00DCberschrift in der falschen Reihenfolge verwendet: <{0}>, im Vergleich zur impliziten vorhergehenden \u00DCberschrift: <H{1}>
-dc.tag.heading.sequence.2 = \u00DCberschrift in der falschen Reihenfolge verwendet: <{0}>, im Vergleich zur vorhergehenden \u00DCberschrift: <{1}>
-dc.tag.heading.sequence.3 = unerwartete \u00DCberschrift verwendet: <{0}>, im Vergleich zur impliziten vorhergehenden \u00DCberschrift: <H{1}>
-dc.tag.nested.not.allowed=verschachteltes Tag nicht zul\u00E4ssig: <{0}>
+dc.tag.heading.sequence.1 = Überschrift in der falschen Reihenfolge verwendet: <{0}>, im Vergleich zur impliziten vorhergehenden Überschrift: <H{1}>
+dc.tag.heading.sequence.2 = Überschrift in der falschen Reihenfolge verwendet: <{0}>, im Vergleich zur vorhergehenden Überschrift: <{1}>
+dc.tag.heading.sequence.3 = unerwartete Überschrift verwendet: <{0}>, im Vergleich zur impliziten vorhergehenden Überschrift: <H{1}>
+dc.tag.nested.not.allowed=verschachteltes Tag nicht zulässig: <{0}>
 dc.tag.nested.tag=verschachteltes Tag: {0}
-dc.tag.not.allowed.here = Tag hier nicht zul\u00E4ssig: <{0}>
-dc.tag.not.allowed = Element nicht zul\u00E4ssig in Dokumentationskommentaren: <{0}>
-dc.tag.not.allowed.inline.element = Blockelement nicht zul\u00E4ssig in Inlineelement <{1}>: {0}
-dc.tag.not.allowed.element.default.style = Blockelement <{0}> nicht zul\u00E4ssig in Element <{1}> mit Standardstil
-dc.tag.not.allowed.tag.default.style = Blockelement <{0}> nicht zul\u00E4ssig in @{1} mit Standardstil
+dc.tag.not.allowed.here = Tag hier nicht zulässig: <{0}>
+dc.tag.not.allowed = Element nicht zulässig in Dokumentationskommentaren: <{0}>
+dc.tag.not.allowed.inline.element = Blockelement nicht zulässig in Inlineelement <{1}>: {0}
+dc.tag.not.allowed.element.default.style = Blockelement <{0}> nicht zulässig in Element <{1}> mit Standardstil
+dc.tag.not.allowed.tag.default.style = Blockelement <{0}> nicht zulässig in @{1} mit Standardstil
 dc.tag.not.closed= Element nicht geschlossen: {0}
 dc.tag.p.in.pre= unerwartete Verwendung von <p> in <pre>-Element
-dc.tag.requires.heading = \u00DCberschrift nicht gefunden f\u00FCr </{0}>
-dc.tag.self.closing = selbstschlie\u00DFendes Element nicht zul\u00E4ssig
+dc.tag.requires.heading = Überschrift nicht gefunden für </{0}>
+dc.tag.self.closing = selbstschließendes Element nicht zulässig
 dc.tag.start.unmatched = Endtag fehlt: </{0}>
 dc.tag.unknown = unbekanntes Tag: {0}
-dc.tag.not.supported.html5 = Tag nicht unterst\u00FCtzt in HTML5: {0}
-dc.text.not.allowed = Text nicht zul\u00E4ssig in <{0}>-Element
+dc.tag.not.supported.html5 = Tag nicht unterstützt in HTML5: {0}
+dc.text.not.allowed = Text nicht zulässig in <{0}>-Element
 dc.unexpected.comment=Dokumentationskommentar hier nicht erwartet
-dc.value.bad.format=Ung\u00FCltiges Format: {0}
-dc.value.not.allowed.here='{@value} hier nicht zul\u00E4ssig
+dc.value.bad.format=Ungültiges Format: {0}
+dc.value.not.allowed.here='{@value} hier nicht zulässig
 dc.value.not.a.constant=Wert bezieht sich nicht auf eine Konstante
 
 dc.main.ioerror=I/O-Fehler: {0}
 dc.main.no.files.given=Keine Dateien angegeben
-dc.main.usage=Verwendung:\n    doclint [Optionen] source-files...\n\nOptionen:\n  -Xmsgs  \n    Gleich wie -Xmsgs:all\n  -Xmsgs:values\n    Gibt Kategorien von zu pr\u00FCfenden Problemen an, wobei "values"\n    eine kommagetrennte Liste ist, die Folgendes enthalten kann:\n      reference      zeigt Stellen, wo Kommentare falsche Referenzen\n                     auf Java-Quellcodeelemente enthalten\n      syntax         zeigt grundlegende Syntaxfehler in Kommentaren\n      html           zeigt Probleme bei HTML-Tags und Attributen\n      accessibility  zeigt Probleme bei der Barrierefreiheit\n      missing        zeigt Probleme aufgrund fehlender Dokumentation\n      all            alles Obengenannte\n    Stellen Sie Werten zur Negierung "-" voran\n    Kategorien k\u00F6nnen durch eine der folgenden Angaben qualifiziert werden:\n      /public /protected /package /private\n    Bei positiven Kategorien (die nicht mit "-" beginnen)\n    gilt der Qualifier f\u00FCr diese und h\u00F6here Zugriffsebenen.\n    Bei negativen Kategorien (die mit "-" beginnen)\n    gilt der Qualifier f\u00FCr diese und niedrigere Zugriffsebenen.\n    Wenn ein Qualifier fehlt, gilt die Kategorie f\u00FCr\n    alle Zugriffsebenen.\n    Beispiel: -Xmsgs:all,-syntax/private\n    So werden alle Meldungen au\u00DFer Syntaxfehlermeldungen\n    in den Dokumentkommentaren privater Methoden aktiviert.\n    Werden keine -Xmsgs-Optionen angegeben, ist der Standard\n    \u00E4quivalent zu -Xmsgs:all/protected, d.h.\n    alle Meldungen werden nur f\u00FCr gesch\u00FCtzte und \u00F6ffentliche\n    Deklarationen ausgegeben.\n  -XcheckPackage:<Packages>\n    Aktiviert oder deaktiviert Pr\u00FCfungen in bestimmten Packages.\n    <Packages> ist eine kommagetrennte Liste von Packagebezeichnern.\n    Der Packagebezeichner ist entweder ein qualifizierter Name eines Packages\n    oder ein Packagenamenspr\u00E4fix, gefolgt von ".*", das auf alle\n    Subpackages des angegebenen Packages erweitert wird. Stellen Sie dem Packagebezeichner\n     "-" voran, um Pr\u00FCfungen f\u00FCr die angegebenen Packages zu deaktivieren.\n  -stats\n    Meldet Statistiken zu den gemeldeten Problemen.\n  -h -help --help -usage -?\n    Zeigt diese Meldung an.\n\nDie folgenden Javac-Optionen werden ebenfalls unterst\u00FCtzt:\n  -bootclasspath, -classpath, -cp, -sourcepath, -Xmaxerrs, -Xmaxwarns\n\nUm doclint f\u00FCr einen Teil eines Projekts auszuf\u00FChren, stellen Sie die kompilierten Klassen f\u00FCr das\nProjekt in den Classpath (oder Boot Classpath), und geben Sie dann in der Befehlszeile\ndie zu pr\u00FCfenden Quelldateien an.
+dc.main.usage=Verwendung:\n    doclint [Optionen] source-files...\n\nOptionen:\n  -Xmsgs  \n    Gleich wie -Xmsgs:all\n  -Xmsgs:values\n    Gibt Kategorien von zu prüfenden Problemen an, wobei "values"\n    eine kommagetrennte Liste ist, die Folgendes enthalten kann:\n      reference      zeigt Stellen, wo Kommentare falsche Referenzen\n                     auf Java-Quellcodeelemente enthalten\n      syntax         zeigt grundlegende Syntaxfehler in Kommentaren\n      html           zeigt Probleme bei HTML-Tags und Attributen\n      accessibility  zeigt Probleme bei der Barrierefreiheit\n      missing        zeigt Probleme aufgrund fehlender Dokumentation\n      all            alles Obengenannte\n    Stellen Sie Werten zur Negierung "-" voran\n    Kategorien können durch eine der folgenden Angaben qualifiziert werden:\n      /public /protected /package /private\n    Bei positiven Kategorien (die nicht mit "-" beginnen)\n    gilt der Qualifier für diese und höhere Zugriffsebenen.\n    Bei negativen Kategorien (die mit "-" beginnen)\n    gilt der Qualifier für diese und niedrigere Zugriffsebenen.\n    Wenn ein Qualifier fehlt, gilt die Kategorie für\n    alle Zugriffsebenen.\n    Beispiel: -Xmsgs:all,-syntax/private\n    So werden alle Meldungen außer Syntaxfehlermeldungen\n    in den Dokumentkommentaren privater Methoden aktiviert.\n    Werden keine -Xmsgs-Optionen angegeben, ist der Standard\n    äquivalent zu -Xmsgs:all/protected, d.h.\n    alle Meldungen werden nur für geschützte und öffentliche\n    Deklarationen ausgegeben.\n  -XcheckPackage:<Packages>\n    Aktiviert oder deaktiviert Prüfungen in bestimmten Packages.\n    <Packages> ist eine kommagetrennte Liste von Packagebezeichnern.\n    Der Packagebezeichner ist entweder ein qualifizierter Name eines Packages\n    oder ein Packagenamenspräfix, gefolgt von ".*", das auf alle\n    Subpackages des angegebenen Packages erweitert wird. Stellen Sie dem Packagebezeichner\n     "-" voran, um Prüfungen für die angegebenen Packages zu deaktivieren.\n  -stats\n    Meldet Statistiken zu den gemeldeten Problemen.\n  -h -help --help -usage -?\n    Zeigt diese Meldung an.\n\nDie folgenden Javac-Optionen werden ebenfalls unterstützt:\n  -bootclasspath, -classpath, -cp, -sourcepath, -Xmaxerrs, -Xmaxwarns\n\nUm doclint für einen Teil eines Projekts auszuführen, stellen Sie die kompilierten Klassen für das\nProjekt in den Classpath (oder Boot Classpath), und geben Sie dann in der Befehlszeile\ndie zu prüfenden Quelldateien an.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
index 0820cb54777..3cefffb73c5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
@@ -23,76 +23,76 @@
 # questions.
 #
 
-dc.anchor.already.defined = \u30A2\u30F3\u30AB\u30FC\u304C\u3059\u3067\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059: "{0}"
-dc.anchor.value.missing = \u30A2\u30F3\u30AB\u30FC\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-dc.attr.lacks.value = \u5C5E\u6027\u306B\u5024\u304C\u3042\u308A\u307E\u305B\u3093
-dc.attr.not.number = \u5C5E\u6027\u5024\u304C\u6570\u5B57\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-dc.attr.not.supported.html5 = \u5C5E\u6027\u306FHTML5\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
-dc.attr.obsolete = \u5C5E\u6027\u306F\u5EC3\u6B62\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-dc.attr.repeated = \u7E70\u308A\u8FD4\u3055\u308C\u305F\u5C5E\u6027: {0}
-dc.attr.img.border.not.valid = img\u306E\u5C5E\u6027"border"\u306F"0"\u306E\u307F\u3092\u53D7\u3051\u5165\u308C\u307E\u3059: {0}
-dc.attr.img.border.not.number = \u5C5E\u6027"border"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059: {0}
-dc.attr.table.border.not.valid = \u8868\u306E\u5C5E\u6027"border"\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u3092\u53D7\u3051\u5165\u308C\u307E\u3059: {0}
-dc.attr.table.border.not.number = \u5C5E\u6027"border"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059: {0}
-dc.attr.unknown = \u4E0D\u660E\u306A\u5C5E\u6027: {0}
-dc.bad.option = \u7121\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
-dc.bad.value.for.option = \u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: {0} {1}
-dc.default.constructor = \u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u4F7F\u7528\u3067\u3001\u30B3\u30E1\u30F3\u30C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-dc.empty = @{0}\u306E\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
-dc.empty.comment = \u30B3\u30E1\u30F3\u30C8\u304C\u7A7A\u3067\u3059
-dc.empty.main.description = \u4E3B\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
-dc.entity.invalid = \u7121\u52B9\u306A\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3&{0};
-dc.exception.not.thrown = \u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
-dc.exists.param = @param "{0}"\u306F\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
-dc.exists.return = @return\u306F\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
-dc.invalid.anchor = \u30A2\u30F3\u30AB\u30FC\u306E\u540D\u524D\u304C\u7121\u52B9\u3067\u3059: "{0}"
-dc.invalid.param = \u7121\u52B9\u306A@param\u306E\u4F7F\u7528
-dc.invalid.provides = \u7121\u52B9\u306A@provides\u306E\u4F7F\u7528
-dc.invalid.return = \u7121\u52B9\u306A@return\u306E\u4F7F\u7528
-dc.invalid.summary = \u7121\u52B9\u306A@summary\u306E\u4F7F\u7528
-dc.invalid.throws = \u7121\u52B9\u306A@throws\u306E\u4F7F\u7528
-dc.invalid.uses = \u7121\u52B9\u306A@uses\u306E\u4F7F\u7528
-dc.invalid.uri = \u7121\u52B9\u306AURI: "{0}"
-dc.missing.comment = \u30B3\u30E1\u30F3\u30C8\u306A\u3057
-dc.missing.param = {0}\u306E@param\u304C\u3042\u308A\u307E\u305B\u3093
-dc.missing.return = @return\u304C\u3042\u308A\u307E\u305B\u3093
-dc.missing.throws = {0}\u306E@throws\u304C\u3042\u308A\u307E\u305B\u3093
-dc.no.alt.attr.for.image = \u30A4\u30E1\u30FC\u30B8\u306E"alt"\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093
-dc.no.summary.or.caption.for.table=\u8868\u306E\u30AD\u30E3\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
-dc.param.name.not.found = @param name\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-dc.ref.not.found = \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-dc.ref.in.missing.module = \u53C2\u7167\u7528\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-dc.return.not.first = '{@return}\u304C\u8AAC\u660E\u306E\u5148\u982D\u306B\u3042\u308A\u307E\u305B\u3093
-dc.service.not.found = \u30B5\u30FC\u30D3\u30B9\u30FB\u30BF\u30A4\u30D7\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-dc.tag.code.within.code = <code>\u5185\u306E'{@code}
-dc.tag.empty = \u7A7A\u306E<{0}>\u30BF\u30B0
-dc.tag.a.within.a = <a>\u306B\u5C55\u958B\u3055\u308C\u308B<a>\u5185\u306E{0}\u30BF\u30B0
-dc.tag.end.not.permitted = \u7121\u52B9\u306A\u7D42\u4E86\u30BF\u30B0: </{0}>
-dc.tag.end.unexpected = \u4E88\u671F\u3057\u306A\u3044\u7D42\u4E86\u30BF\u30B0: </{0}>
-dc.tag.heading.sequence.1 = \u6697\u9ED9\u7684\u306A\u5148\u884C\u898B\u51FA\u3057: <H{1}>\u3068\u306E\u6BD4\u8F03\u3067\u3001\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u898B\u51FA\u3057: <{0}>\u306E\u9806\u5E8F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
-dc.tag.heading.sequence.2 = \u524D\u306E\u898B\u51FA\u3057: <{1}>\u3068\u306E\u6BD4\u8F03\u3067\u3001\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u898B\u51FA\u3057: <{0}>\u306E\u9806\u5E8F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
-dc.tag.heading.sequence.3 = \u6697\u9ED9\u7684\u306A\u5148\u884C\u898B\u51FA\u3057: <H{1}>\u3068\u306E\u6BD4\u8F03\u3067\u3001\u4E88\u671F\u3057\u306A\u3044\u898B\u51FA\u3057: <{0}>\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
-dc.tag.nested.not.allowed=\u30CD\u30B9\u30C8\u3057\u305F\u30BF\u30B0\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093: <{0}>
-dc.tag.nested.tag=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30BF\u30B0: {0}
-dc.tag.not.allowed.here = \u3053\u3053\u3067\u306F\u30BF\u30B0\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093: <{0}>
-dc.tag.not.allowed = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u3067\u4F7F\u7528\u3067\u304D\u306A\u3044\u8981\u7D20\u3067\u3059: <{0}>
-dc.tag.not.allowed.inline.element = \u30A4\u30F3\u30E9\u30A4\u30F3\u8981\u7D20<{1}>\u5185\u3067\u4F7F\u7528\u3067\u304D\u306A\u3044\u30D6\u30ED\u30C3\u30AF\u8981\u7D20\u3067\u3059: {0}
-dc.tag.not.allowed.element.default.style = \u30D6\u30ED\u30C3\u30AF\u8981\u7D20<{0}>\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30B9\u30BF\u30A4\u30EB\u306E\u8981\u7D20<{1}>\u5185\u3067\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-dc.tag.not.allowed.tag.default.style = \u30D6\u30ED\u30C3\u30AF\u8981\u7D20<{0}>\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30B9\u30BF\u30A4\u30EB\u306E@{1}\u5185\u3067\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-dc.tag.not.closed= \u8981\u7D20\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093: {0}
-dc.tag.p.in.pre= <pre>\u8981\u7D20\u5185\u3067\u4E88\u671F\u3057\u306A\u3044<p>\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
-dc.tag.requires.heading = </{0}>\u306E\u898B\u51FA\u3057\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-dc.tag.self.closing = \u81EA\u5DF1\u7D42\u4E86\u8981\u7D20\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-dc.tag.start.unmatched = \u7D42\u4E86\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093: </{0}>
-dc.tag.unknown = \u4E0D\u660E\u306A\u30BF\u30B0: {0}
-dc.tag.not.supported.html5 = \u30BF\u30B0\u306FHTML5\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
-dc.text.not.allowed = <{0}>\u8981\u7D20\u3067\u306F\u30C6\u30AD\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-dc.unexpected.comment=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u306F\u3053\u3053\u3067\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
-dc.value.bad.format=\u6B21\u306E\u5F62\u5F0F\u304C\u7121\u52B9\u3067\u3059: {0}
-dc.value.not.allowed.here='{@value}\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-dc.value.not.a.constant=\u5024\u304C\u5B9A\u6570\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u305B\u3093
+dc.anchor.already.defined = アンカーがすでに定義されています: "{0}"
+dc.anchor.value.missing = アンカーに値が指定されていません
+dc.attr.lacks.value = 属性に値がありません
+dc.attr.not.number = 属性値が数字ではありません
+dc.attr.not.supported.html5 = 属性はHTML5ではサポートされていません: {0}
+dc.attr.obsolete = 属性は廃止されています: {0}
+dc.attr.repeated = 繰り返された属性: {0}
+dc.attr.img.border.not.valid = imgの属性"border"は"0"のみを受け入れます: {0}
+dc.attr.img.border.not.number = 属性"border"の値が無効です: {0}
+dc.attr.table.border.not.valid = 表の属性"border"は""または"1"のみを受け入れます: {0}
+dc.attr.table.border.not.number = 属性"border"の値が無効です: {0}
+dc.attr.unknown = 不明な属性: {0}
+dc.bad.option = 無効なオプション: {0}
+dc.bad.value.for.option = オプションの値が不正です: {0} {1}
+dc.default.constructor = デフォルトのコンストラクタの使用で、コメントが指定されていません
+dc.empty = @{0}の説明がありません
+dc.empty.comment = コメントが空です
+dc.empty.main.description = 主説明がありません
+dc.entity.invalid = 無効なエンティティ&{0};
+dc.exception.not.thrown = 例外がスローされていません: {0}
+dc.exists.param = @param "{0}"はすでに指定されています
+dc.exists.return = @returnはすでに指定されています
+dc.invalid.anchor = アンカーの名前が無効です: "{0}"
+dc.invalid.param = 無効な@paramの使用
+dc.invalid.provides = 無効な@providesの使用
+dc.invalid.return = 無効な@returnの使用
+dc.invalid.summary = 無効な@summaryの使用
+dc.invalid.throws = 無効な@throwsの使用
+dc.invalid.uses = 無効な@usesの使用
+dc.invalid.uri = 無効なURI: "{0}"
+dc.missing.comment = コメントなし
+dc.missing.param = {0}の@paramがありません
+dc.missing.return = @returnがありません
+dc.missing.throws = {0}の@throwsがありません
+dc.no.alt.attr.for.image = イメージの"alt"属性がありません
+dc.no.summary.or.caption.for.table=表のキャプションがありません
+dc.param.name.not.found = @param nameが見つかりません
+dc.ref.not.found = 参照が見つかりません
+dc.ref.in.missing.module = 参照用のモジュールが見つかりません: {0}
+dc.return.not.first = '{@return}が説明の先頭にありません
+dc.service.not.found = サービス・タイプが見つかりません
+dc.tag.code.within.code = <code>内の'{@code}
+dc.tag.empty = 空の<{0}>タグ
+dc.tag.a.within.a = <a>に展開される<a>内の{0}タグ
+dc.tag.end.not.permitted = 無効な終了タグ: </{0}>
+dc.tag.end.unexpected = 予期しない終了タグ: </{0}>
+dc.tag.heading.sequence.1 = 暗黙的な先行見出し: <H{1}>との比較で、使用されている見出し: <{0}>の順序が正しくありません
+dc.tag.heading.sequence.2 = 前の見出し: <{1}>との比較で、使用されている見出し: <{0}>の順序が正しくありません
+dc.tag.heading.sequence.3 = 暗黙的な先行見出し: <H{1}>との比較で、予期しない見出し: <{0}>が使用されています
+dc.tag.nested.not.allowed=ネストしたタグは使用できません: <{0}>
+dc.tag.nested.tag=ネストされたタグ: {0}
+dc.tag.not.allowed.here = ここではタグを使用できません: <{0}>
+dc.tag.not.allowed = ドキュメント・コメントで使用できない要素です: <{0}>
+dc.tag.not.allowed.inline.element = インライン要素<{1}>内で使用できないブロック要素です: {0}
+dc.tag.not.allowed.element.default.style = ブロック要素<{0}>はデフォルト・スタイルの要素<{1}>内で使用できません
+dc.tag.not.allowed.tag.default.style = ブロック要素<{0}>はデフォルト・スタイルの@{1}内で使用できません
+dc.tag.not.closed= 要素が閉じられていません: {0}
+dc.tag.p.in.pre= <pre>要素内で予期しない<p>が使用されています
+dc.tag.requires.heading = </{0}>の見出しが見つかりません
+dc.tag.self.closing = 自己終了要素は使用できません
+dc.tag.start.unmatched = 終了タグがありません: </{0}>
+dc.tag.unknown = 不明なタグ: {0}
+dc.tag.not.supported.html5 = タグはHTML5でサポートされていません: {0}
+dc.text.not.allowed = <{0}>要素ではテキストを使用できません
+dc.unexpected.comment=ドキュメント・コメントはここでは必要ありません
+dc.value.bad.format=次の形式が無効です: {0}
+dc.value.not.allowed.here='{@value}はここでは使用できません
+dc.value.not.a.constant=値が定数を参照していません
 
-dc.main.ioerror=IO\u30A8\u30E9\u30FC: {0}
-dc.main.no.files.given=\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-dc.main.usage=\u4F7F\u7528\u65B9\u6CD5:\n    doclint [options] source-files...\n\n\u30AA\u30D7\u30B7\u30E7\u30F3:\n  -Xmsgs  \n    -Xmsgs:all\u3068\u540C\u3058\n  -Xmsgs:values\n    \u30C1\u30A7\u30C3\u30AF\u3059\u308B\u554F\u984C\u306E\u30AB\u30C6\u30B4\u30EA\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u3053\u3053\u3067\u306E''values''\u306F\u3001\n    \u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u305F\u6B21\u306E\u5024\u306E\u30EA\u30B9\u30C8\u3067\u3059:\n      reference      Java\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u8981\u7D20\u3078\u306E\u4E0D\u6B63\u306A\u53C2\u7167\u3092\u542B\u3080\u30B3\u30E1\u30F3\u30C8\u306E\n                     \u5834\u6240\u3092\u8868\u793A\u3057\u307E\u3059\n      syntax         \u30B3\u30E1\u30F3\u30C8\u5185\u306E\u57FA\u672C\u69CB\u6587\u30A8\u30E9\u30FC\u3092\u8868\u793A\u3057\u307E\u3059\n      html           HTML\u30BF\u30D6\u304A\u3088\u3073\u5C5E\u6027\u306E\u554F\u984C\u3092\u8868\u793A\u3057\u307E\u3059\n      accessibility  \u30A2\u30AF\u30BB\u30B7\u30D3\u30EA\u30C6\u30A3\u306E\u554F\u984C\u3092\u8868\u793A\u3057\u307E\u3059\n      missing        \u6B20\u843D\u3057\u3066\u3044\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u554F\u984C\u3092\u8868\u793A\u3057\u307E\u3059\n      all            \u524D\u8FF0\u306E\u3059\u3079\u3066\n    \u3053\u308C\u3092\u5426\u5B9A\u3059\u308B\u306B\u306F\u3001\u5024\u306E\u524D\u306B''-''\u3092\u6307\u5B9A\u3057\u307E\u3059\n    \u30AB\u30C6\u30B4\u30EA\u306F\u3001\u6B21\u306E\u3044\u305A\u308C\u304B\u3067\u4FEE\u98FE\u3067\u304D\u307E\u3059:\n      /public /protected /package /private\n    \u6B63\u306E\u30AB\u30C6\u30B4\u30EA(''-''\u3067\u59CB\u307E\u3089\u306A\u3044)\u306E\u5834\u5408\n    \u4FEE\u98FE\u5B50\u306F\u3001\u305D\u306E\u30A2\u30AF\u30BB\u30B9\u30FB\u30EC\u30D9\u30EB\u4EE5\u4E0A\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002\n    \u8CA0\u306E\u30AB\u30C6\u30B4\u30EA(''-''\u3067\u59CB\u307E\u308B)\u306E\u5834\u5408\n    \u4FEE\u98FE\u5B50\u306F\u3001\u305D\u306E\u30A2\u30AF\u30BB\u30B9\u30FB\u30EC\u30D9\u30EB\u4EE5\u4E0B\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002\n    \u4FEE\u98FE\u5B50\u304C\u306A\u3044\u5834\u5408\u3001\u30AB\u30C6\u30B4\u30EA\u306F\u3059\u3079\u3066\u306E\u30A2\u30AF\u30BB\u30B9\u30FB\u30EC\u30D9\u30EB\u306B\n    \u9069\u7528\u3055\u308C\u307E\u3059\u3002\n    \u4F8B: -Xmsgs:all,-syntax/private\n    \u3053\u306E\u5834\u5408\u3001private\u30E1\u30BD\u30C3\u30C9\u306Edoc\u30B3\u30E1\u30F3\u30C8\u5185\u306E\u69CB\u6587\u30A8\u30E9\u30FC\u3092\u9664\u304D\u3001\n    \u3059\u3079\u3066\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u6709\u52B9\u5316\u3055\u308C\u307E\u3059\u3002\n    -Xmsgs\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u3001\n    -Xmsgs:all/protected\u3068\u540C\u7B49\u306B\u306A\u308A\u3001\u3053\u308C\u306F\n    \u3059\u3079\u3066\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u3001protected\u304A\u3088\u3073public\u306E\u5BA3\u8A00\u306E\u307F\u306B\u5831\u544A\u3055\u308C\u308B\u3053\u3068\u3092\n    \u610F\u5473\u3057\u307E\u3059\u3002\n  -XcheckPackage:<packages>\n    \u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\n    <packages>\u306F\u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306E\u30EA\u30B9\u30C8\u3067\u3059\u3002\n    \u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306F\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4FEE\u98FE\u3055\u308C\u305F\u540D\u524D\u3001\u307E\u305F\u306F\n    \u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306E\u63A5\u982D\u8F9E\u306E\u5F8C\u306B''.*''\u3092\u6307\u5B9A(\u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\n    \
-\u3059\u3079\u3066\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u62E1\u5F35)\u3057\u305F\u3082\u306E\u3067\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306E\u524D\u306B\n    ''-''\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u95A2\u3059\u308B\u30C1\u30A7\u30C3\u30AF\u3092\u7121\u52B9\u306B\u3067\u304D\u307E\u3059\u3002\n  -stats\n    \u5831\u544A\u3055\u308C\u305F\u554F\u984C\u306B\u5BFE\u3057\u3066\u7D71\u8A08\u3092\u5831\u544A\u3057\u307E\u3059\u3002\n  -h -help --help -usage -?\n    \u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\n\n\u6B21\u306Ejavac\u30AA\u30D7\u30B7\u30E7\u30F3\u3082\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\n  -bootclasspath\u3001-classpath\u3001-cp\u3001-sourcepath\u3001-Xmaxerrs\u3001-Xmaxwarns\n\n\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4E00\u90E8\u306B\u5BFE\u3057\u3066doclint\u3092\u5B9F\u884C\u3059\u308B\u306B\u306F\u3001\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u305F\u30AF\u30E9\u30B9\u3092\n\u30AF\u30E9\u30B9\u30D1\u30B9(\u307E\u305F\u306F\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9)\u306B\u6307\u5B9A\u3057\u3001\u30B3\u30DE\u30F3\u30C9\u884C\u3067\n\u30C1\u30A7\u30C3\u30AF\u3059\u308B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002
+dc.main.ioerror=IOエラー: {0}
+dc.main.no.files.given=ファイルが指定されていません
+dc.main.usage=使用方法:\n    doclint [options] source-files...\n\nオプション:\n  -Xmsgs  \n    -Xmsgs:allと同じ\n  -Xmsgs:values\n    チェックする問題のカテゴリを指定します。ここでの''values''は、\n    カンマで区切られた次の値のリストです:\n      reference      Javaソース・コード要素への不正な参照を含むコメントの\n                     場所を表示します\n      syntax         コメント内の基本構文エラーを表示します\n      html           HTMLタブおよび属性の問題を表示します\n      accessibility  アクセシビリティの問題を表示します\n      missing        欠落しているドキュメントの問題を表示します\n      all            前述のすべて\n    これを否定するには、値の前に''-''を指定します\n    カテゴリは、次のいずれかで修飾できます:\n      /public /protected /package /private\n    正のカテゴリ(''-''で始まらない)の場合\n    修飾子は、そのアクセス・レベル以上に適用されます。\n    負のカテゴリ(''-''で始まる)の場合\n    修飾子は、そのアクセス・レベル以下に適用されます。\n    修飾子がない場合、カテゴリはすべてのアクセス・レベルに\n    適用されます。\n    例: -Xmsgs:all,-syntax/private\n    この場合、privateメソッドのdocコメント内の構文エラーを除き、\n    すべてのメッセージが有効化されます。\n    -Xmsgsオプションが指定されていない場合、デフォルトは、\n    -Xmsgs:all/protectedと同等になり、これは\n    すべてのメッセージが、protectedおよびpublicの宣言のみに報告されることを\n    意味します。\n  -XcheckPackage:<packages>\n    特定のパッケージのチェックを有効または無効にします。\n    <packages>はカンマで区切られたパッケージ指定子のリストです。\n    パッケージ指定子は、パッケージの修飾された名前、または\n    パッケージ名の接頭辞の後に''.*''を指定(指定したパッケージの\n    \
+すべてのサブパッケージに拡張)したものです。パッケージ指定子の前に\n    ''-''を指定すると、指定したパッケージに関するチェックを無効にできます。\n  -stats\n    報告された問題に対して統計を報告します。\n  -h -help --help -usage -?\n    このメッセージが表示されます。\n\n次のjavacオプションもサポートされています\n  -bootclasspath、-classpath、-cp、-sourcepath、-Xmaxerrs、-Xmaxwarns\n\nプロジェクトの一部に対してdoclintを実行するには、プロジェクトのコンパイルされたクラスを\nクラスパス(またはブート・クラスパス)に指定し、コマンド行で\nチェックするソース・ファイルを指定します。
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
index 62a0ed56e0f..9ef0155d9c0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
@@ -23,75 +23,75 @@
 # questions.
 #
 
-dc.anchor.already.defined = \u951A\u5B9A\u70B9\u5DF2\u5B9A\u4E49: "{0}"
-dc.anchor.value.missing = \u6CA1\u6709\u4E3A\u951A\u5B9A\u70B9\u6307\u5B9A\u503C
-dc.attr.lacks.value = \u5C5E\u6027\u7F3A\u5C11\u503C
-dc.attr.not.number = \u5C5E\u6027\u503C\u4E0D\u662F\u6570\u5B57
-dc.attr.not.supported.html5 = \u5C5E\u6027\u5728 HTML5 \u4E2D\u4E0D\u53D7\u652F\u6301: {0}
-dc.attr.obsolete = \u5C5E\u6027\u5DF2\u8FC7\u65F6: {0}
-dc.attr.repeated = \u5C5E\u6027\u91CD\u590D: {0}
-dc.attr.img.border.not.valid = \u56FE\u50CF\u7684\u5C5E\u6027 "border" \u53EA\u63A5\u53D7 "0"\uFF1A{0}
-dc.attr.img.border.not.number = \u5C5E\u6027 "border" \u7684\u503C\u65E0\u6548\uFF1A"{0}"
-dc.attr.table.border.not.valid = \u8868\u7684\u5C5E\u6027 "border" \u53EA\u63A5\u53D7 "" \u6216 "1"\uFF1A{0}
-dc.attr.table.border.not.number = \u5C5E\u6027 "border" \u7684\u503C\u65E0\u6548\uFF1A"{0}"
-dc.attr.unknown = \u672A\u77E5\u5C5E\u6027: {0}
-dc.bad.option = \u9009\u9879\u9519\u8BEF: {0}
-dc.bad.value.for.option = \u9009\u9879\u7684\u503C\u9519\u8BEF: {0} {1}
-dc.default.constructor = \u4F7F\u7528\u4E0D\u63D0\u4F9B\u6CE8\u91CA\u7684\u9ED8\u8BA4\u6784\u9020\u5668
-dc.empty = @{0} \u6CA1\u6709\u8BF4\u660E
-dc.empty.comment = \u7A7A\u6CE8\u91CA
-dc.empty.main.description = \u65E0\u4E3B\u8BF4\u660E
-dc.entity.invalid = \u5B9E\u4F53 &{0}; \u65E0\u6548
-dc.exception.not.thrown = \u672A\u629B\u51FA\u5F02\u5E38\u9519\u8BEF: {0}
-dc.exists.param = \u5DF2\u6307\u5B9A @param "{0}"
-dc.exists.return = \u5DF2\u6307\u5B9A @return
-dc.invalid.anchor = \u951A\u5B9A\u70B9\u7684\u540D\u79F0\u65E0\u6548: "{0}"
-dc.invalid.param = @param \u7684\u7528\u6CD5\u65E0\u6548
-dc.invalid.provides = @provides \u7684\u7528\u6CD5\u65E0\u6548
-dc.invalid.return = @return \u7684\u7528\u6CD5\u65E0\u6548
-dc.invalid.summary = @summary \u7684\u7528\u6CD5\u65E0\u6548
-dc.invalid.throws = @throws \u7684\u7528\u6CD5\u65E0\u6548
-dc.invalid.uses = @uses \u7684\u7528\u6CD5\u65E0\u6548
-dc.invalid.uri = URI \u65E0\u6548: "{0}"
-dc.missing.comment = \u6CA1\u6709\u6CE8\u91CA
-dc.missing.param = {0}\u6CA1\u6709 @param
-dc.missing.return = \u6CA1\u6709 @return
-dc.missing.throws = {0}\u6CA1\u6709 @throws
-dc.no.alt.attr.for.image = \u56FE\u50CF\u6CA1\u6709 "alt" \u5C5E\u6027
-dc.no.summary.or.caption.for.table=\u8868\u6CA1\u6709\u6807\u9898
-dc.param.name.not.found = @param name \u672A\u627E\u5230
-dc.ref.not.found = \u627E\u4E0D\u5230\u5F15\u7528
-dc.ref.in.missing.module = \u627E\u4E0D\u5230\u5F15\u7528\u7684\u6A21\u5757\uFF1A{0}
-dc.return.not.first = '{@return} \u4E0D\u5728\u8BF4\u660E\u7684\u5F00\u5934
-dc.service.not.found = \u627E\u4E0D\u5230\u670D\u52A1\u7C7B\u578B
-dc.tag.code.within.code = '{@code} \u5728 <code> \u4E2D
-dc.tag.empty = <{0}> \u6807\u8BB0\u4E3A\u7A7A
-dc.tag.a.within.a = {0} \u6807\u8BB0\uFF0C\u5176\u6269\u5C55\u5230 <a>\uFF0C\u4F4D\u4E8E <a> \u5185
-dc.tag.end.not.permitted = \u65E0\u6548\u7684\u7ED3\u675F\u6807\u8BB0: </{0}>
-dc.tag.end.unexpected = \u610F\u5916\u7684\u7ED3\u675F\u6807\u8BB0: </{0}>
-dc.tag.heading.sequence.1 = \u4F7F\u7528\u7684\u6807\u9898\u8D85\u51FA\u5E8F\u5217\uFF1A<{0}>\uFF08\u4E0E\u9690\u5F0F\u524D\u5BFC\u6807\u9898\u76F8\u6BD4\uFF1A<H{1}>\uFF09
-dc.tag.heading.sequence.2 = \u4F7F\u7528\u7684\u6807\u9898\u8D85\u51FA\u5E8F\u5217\uFF1A<{0}>\uFF08\u4E0E\u524D\u4E00\u4E2A\u6807\u9898\u76F8\u6BD4\uFF1A<{1}>\uFF09
-dc.tag.heading.sequence.3 = \u4F7F\u7528\u4E86\u610F\u5916\u7684\u6807\u9898\uFF1A<{0}>\uFF08\u4E0E\u9690\u5F0F\u524D\u5BFC\u6807\u9898\u76F8\u6BD4\uFF1A<H{1}>\uFF09
-dc.tag.nested.not.allowed=\u4E0D\u5141\u8BB8\u4F7F\u7528\u5D4C\u5957\u6807\u8BB0: <{0}>
-dc.tag.nested.tag=\u5D4C\u5957\u6807\u8BB0\uFF1A{0}
-dc.tag.not.allowed.here = \u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u6807\u8BB0: <{0}>
-dc.tag.not.allowed = \u6587\u6863\u6CE8\u91CA\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u5143\u7D20: <{0}>
-dc.tag.not.allowed.inline.element = \u5185\u5D4C\u5143\u7D20 <{1}> \u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u5757\u5143\u7D20: {0}
-dc.tag.not.allowed.element.default.style = \u91C7\u7528\u9ED8\u8BA4\u6837\u5F0F\u7684\u5143\u7D20 <{1}> \u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u5757\u5143\u7D20 <{0}>
-dc.tag.not.allowed.tag.default.style = \u91C7\u7528\u9ED8\u8BA4\u6837\u5F0F\u7684 @{1} \u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u5757\u5143\u7D20 <{0}>
-dc.tag.not.closed= \u5143\u7D20\u672A\u5173\u95ED: {0}
-dc.tag.p.in.pre= <pre> \u5143\u7D20\u5185\u90E8\u610F\u5916\u5730\u4F7F\u7528\u4E86 <p>
-dc.tag.requires.heading = \u672A\u627E\u5230 </{0}> \u7684\u6807\u9898
-dc.tag.self.closing = \u4E0D\u5141\u8BB8\u4F7F\u7528\u81EA\u5173\u95ED\u5143\u7D20
-dc.tag.start.unmatched = \u7F3A\u5C11\u7ED3\u675F\u6807\u8BB0: </{0}>
-dc.tag.unknown = \u672A\u77E5\u6807\u8BB0: {0}
-dc.tag.not.supported.html5 = \u6807\u8BB0\u5728 HTML5 \u4E2D\u4E0D\u53D7\u652F\u6301\uFF1A{0}
-dc.text.not.allowed = <{0}> \u5143\u7D20\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u6587\u672C
-dc.unexpected.comment=\u6B64\u5904\u672A\u9884\u671F\u6587\u6863\u6CE8\u91CA
-dc.value.bad.format=\u683C\u5F0F\u65E0\u6548\uFF1A{0}
-dc.value.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528 '{@value}
-dc.value.not.a.constant=\u503C\u4E0D\u5F15\u7528\u5E38\u91CF
+dc.anchor.already.defined = 锚定点已定义: "{0}"
+dc.anchor.value.missing = 没有为锚定点指定值
+dc.attr.lacks.value = 属性缺少值
+dc.attr.not.number = 属性值不是数字
+dc.attr.not.supported.html5 = 属性在 HTML5 中不受支持: {0}
+dc.attr.obsolete = 属性已过时: {0}
+dc.attr.repeated = 属性重复: {0}
+dc.attr.img.border.not.valid = 图像的属性 "border" 只接受 "0"：{0}
+dc.attr.img.border.not.number = 属性 "border" 的值无效："{0}"
+dc.attr.table.border.not.valid = 表的属性 "border" 只接受 "" 或 "1"：{0}
+dc.attr.table.border.not.number = 属性 "border" 的值无效："{0}"
+dc.attr.unknown = 未知属性: {0}
+dc.bad.option = 选项错误: {0}
+dc.bad.value.for.option = 选项的值错误: {0} {1}
+dc.default.constructor = 使用不提供注释的默认构造器
+dc.empty = @{0} 没有说明
+dc.empty.comment = 空注释
+dc.empty.main.description = 无主说明
+dc.entity.invalid = 实体 &{0}; 无效
+dc.exception.not.thrown = 未抛出异常错误: {0}
+dc.exists.param = 已指定 @param "{0}"
+dc.exists.return = 已指定 @return
+dc.invalid.anchor = 锚定点的名称无效: "{0}"
+dc.invalid.param = @param 的用法无效
+dc.invalid.provides = @provides 的用法无效
+dc.invalid.return = @return 的用法无效
+dc.invalid.summary = @summary 的用法无效
+dc.invalid.throws = @throws 的用法无效
+dc.invalid.uses = @uses 的用法无效
+dc.invalid.uri = URI 无效: "{0}"
+dc.missing.comment = 没有注释
+dc.missing.param = {0}没有 @param
+dc.missing.return = 没有 @return
+dc.missing.throws = {0}没有 @throws
+dc.no.alt.attr.for.image = 图像没有 "alt" 属性
+dc.no.summary.or.caption.for.table=表没有标题
+dc.param.name.not.found = @param name 未找到
+dc.ref.not.found = 找不到引用
+dc.ref.in.missing.module = 找不到引用的模块：{0}
+dc.return.not.first = '{@return} 不在说明的开头
+dc.service.not.found = 找不到服务类型
+dc.tag.code.within.code = '{@code} 在 <code> 中
+dc.tag.empty = <{0}> 标记为空
+dc.tag.a.within.a = {0} 标记，其扩展到 <a>，位于 <a> 内
+dc.tag.end.not.permitted = 无效的结束标记: </{0}>
+dc.tag.end.unexpected = 意外的结束标记: </{0}>
+dc.tag.heading.sequence.1 = 使用的标题超出序列：<{0}>（与隐式前导标题相比：<H{1}>）
+dc.tag.heading.sequence.2 = 使用的标题超出序列：<{0}>（与前一个标题相比：<{1}>）
+dc.tag.heading.sequence.3 = 使用了意外的标题：<{0}>（与隐式前导标题相比：<H{1}>）
+dc.tag.nested.not.allowed=不允许使用嵌套标记: <{0}>
+dc.tag.nested.tag=嵌套标记：{0}
+dc.tag.not.allowed.here = 此处不允许使用标记: <{0}>
+dc.tag.not.allowed = 文档注释中不允许使用元素: <{0}>
+dc.tag.not.allowed.inline.element = 内嵌元素 <{1}> 中不允许使用块元素: {0}
+dc.tag.not.allowed.element.default.style = 采用默认样式的元素 <{1}> 中不允许使用块元素 <{0}>
+dc.tag.not.allowed.tag.default.style = 采用默认样式的 @{1} 中不允许使用块元素 <{0}>
+dc.tag.not.closed= 元素未关闭: {0}
+dc.tag.p.in.pre= <pre> 元素内部意外地使用了 <p>
+dc.tag.requires.heading = 未找到 </{0}> 的标题
+dc.tag.self.closing = 不允许使用自关闭元素
+dc.tag.start.unmatched = 缺少结束标记: </{0}>
+dc.tag.unknown = 未知标记: {0}
+dc.tag.not.supported.html5 = 标记在 HTML5 中不受支持：{0}
+dc.text.not.allowed = <{0}> 元素中不允许使用文本
+dc.unexpected.comment=此处未预期文档注释
+dc.value.bad.format=格式无效：{0}
+dc.value.not.allowed.here=此处不允许使用 '{@value}
+dc.value.not.a.constant=值不引用常量
 
-dc.main.ioerror=IO \u9519\u8BEF: {0}
-dc.main.no.files.given=\u672A\u6307\u5B9A\u6587\u4EF6
-dc.main.usage=\u7528\u6CD5:\n    doclint [options] source-files...\n\n\u9009\u9879:\n  -Xmsgs  \n    \u4E0E -Xmsgs:all \u76F8\u540C\n  -Xmsgs:values\n    \u6307\u5B9A\u8981\u68C0\u67E5\u7684\u95EE\u9898\u7684\u7C7B\u522B, \u5176\u4E2D ''values''\n    \u662F\u4EFB\u610F\u4EE5\u4E0B\u5185\u5BB9\u7684\u4EE5\u9017\u53F7\u5206\u9694\u7684\u5217\u8868:\n      reference      \u663E\u793A\u5305\u542B\u5BF9 Java \u6E90\u4EE3\u7801\u5143\u7D20\n                     \u9519\u8BEF\u5F15\u7528\u7684\u6CE8\u91CA\u7684\u4F4D\u7F6E\n      syntax         \u663E\u793A\u6CE8\u91CA\u4E2D\u7684\u57FA\u672C\u8BED\u6CD5\u9519\u8BEF\n      html           \u663E\u793A HTML \u6807\u8BB0\u548C\u5C5E\u6027\u95EE\u9898\n      accessibility  \u663E\u793A\u53EF\u8BBF\u95EE\u6027\u7684\u95EE\u9898\n      missing        \u663E\u793A\u7F3A\u5C11\u6587\u6863\u7684\u95EE\u9898\n      all            \u6240\u6709\u4EE5\u4E0A\u5185\u5BB9\n    \u5728\u503C\u4E4B\u524D\u4F7F\u7528 ''-'' \u53EF\u4F7F\u7528\u5176\u53CD\u503C\n    \u53EF\u4EE5\u4F7F\u7528\u4EE5\u4E0B\u4E00\u9879\u6765\u9650\u5B9A\u7C7B\u522B:\n      /public /protected /package /private\n    \u5BF9\u4E8E\u6B63\u7C7B\u522B (\u4E0D\u4EE5 ''-'' \u5F00\u5934)\n    \u9650\u5B9A\u7B26\u9002\u7528\u4E8E\u8BE5\u8BBF\u95EE\u7EA7\u522B\u53CA\u66F4\u9AD8\u7EA7\u522B\u3002\n    \u5BF9\u4E8E\u8D1F\u7C7B\u522B (\u4EE5 ''-'' \u5F00\u5934)\n    \u9650\u5B9A\u7B26\u9002\u7528\u4E8E\u8BE5\u8BBF\u95EE\u7EA7\u522B\u53CA\u66F4\u4F4E\u7EA7\u522B\u3002\n    \u5982\u679C\u6CA1\u6709\u9650\u5B9A\u7B26, \u5219\u8BE5\u7C7B\u522B\u9002\u7528\u4E8E\n    \u6240\u6709\u8BBF\u95EE\u7EA7\u522B\u3002\n    \u4F8B\u5982, -Xmsgs:all,-syntax/private\n    \u8FD9\u5C06\u5728\u4E13\u7528\u65B9\u6CD5\u7684\u6587\u6863\u6CE8\u91CA\u4E2D\n    \u542F\u7528\u9664\u8BED\u6CD5\u9519\u8BEF\u4E4B\u5916\u7684\u6240\u6709\u6D88\u606F\u3002\n    \u5982\u679C\u672A\u63D0\u4F9B -Xmsgs \u9009\u9879, \u5219\u9ED8\u8BA4\u503C\n    \u7B49\u540C\u4E8E -Xmsgs:all/protected, \u8868\u793A\n    \u4EC5\u62A5\u544A\u53D7\u4FDD\u62A4\u548C\u516C\u5171\u58F0\u660E\u4E2D\u7684\n    \u6240\u6709\u6D88\u606F\u3002\n  -XcheckPackage:<packages>\n    \u5728\u7279\u5B9A\u7684\u7A0B\u5E8F\u5305\u4E2D\u542F\u7528\u6216\u7981\u7528\u68C0\u67E5\u3002\n    <packages> \u662F\u9017\u53F7\u5206\u9694\u7684\u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u5217\u8868\u3002\n    \u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u662F\u7A0B\u5E8F\u5305\u7684\u9650\u5B9A\u540D\u79F0\n    \u6216\u7A0B\u5E8F\u5305\u540D\u79F0\u524D\u7F00\u540E\u8DDF ''.*'', \u5B83\u6269\u5C55\u5230\n    \u7ED9\u5B9A\u7A0B\u5E8F\u5305\u7684\u6240\u6709\u5B50\u7A0B\u5E8F\u5305\u3002\u5728\u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u524D\u9762\n    \u52A0\u4E0A ''-'' \u53EF\u4EE5\u4E3A\u6307\u5B9A\u7A0B\u5E8F\u5305\u7981\u7528\u68C0\u67E5\u3002\n  -stats\n    \u62A5\u544A\u6240\u62A5\u544A\u95EE\u9898\u7684\u7EDF\u8BA1\u4FE1\u606F\u3002\n  -h -help --help -usage -?\n    \u663E\u793A\u6B64\u6D88\u606F\u3002\n\n\u8FD8\u652F\u6301\u4EE5\u4E0B javac \u9009\u9879\n  -bootclasspath, -classpath, -cp, -sourcepath, -Xmaxerrs, -Xmaxwarns\n\n\u8981\u5728\u9879\u76EE\u7684\u4E00\u90E8\u5206\u4E0A\u8FD0\u884C doclint, \u8BF7\u5C06\u9879\u76EE\u4E2D\u5DF2\u7F16\u8BD1\u7684\u7C7B\n\u653E\u5728\u7C7B\u8DEF\u5F84 (\u6216\u5F15\u5BFC\u7C7B\u8DEF\u5F84) \u4E0A, \u7136\u540E\u5728\u547D\u4EE4\u884C\u4E0A\u6307\u5B9A\n\u8981\u68C0\u67E5\u7684\u6E90\u6587\u4EF6\u3002
+dc.main.ioerror=IO 错误: {0}
+dc.main.no.files.given=未指定文件
+dc.main.usage=用法:\n    doclint [options] source-files...\n\n选项:\n  -Xmsgs  \n    与 -Xmsgs:all 相同\n  -Xmsgs:values\n    指定要检查的问题的类别, 其中 ''values''\n    是任意以下内容的以逗号分隔的列表:\n      reference      显示包含对 Java 源代码元素\n                     错误引用的注释的位置\n      syntax         显示注释中的基本语法错误\n      html           显示 HTML 标记和属性问题\n      accessibility  显示可访问性的问题\n      missing        显示缺少文档的问题\n      all            所有以上内容\n    在值之前使用 ''-'' 可使用其反值\n    可以使用以下一项来限定类别:\n      /public /protected /package /private\n    对于正类别 (不以 ''-'' 开头)\n    限定符适用于该访问级别及更高级别。\n    对于负类别 (以 ''-'' 开头)\n    限定符适用于该访问级别及更低级别。\n    如果没有限定符, 则该类别适用于\n    所有访问级别。\n    例如, -Xmsgs:all,-syntax/private\n    这将在专用方法的文档注释中\n    启用除语法错误之外的所有消息。\n    如果未提供 -Xmsgs 选项, 则默认值\n    等同于 -Xmsgs:all/protected, 表示\n    仅报告受保护和公共声明中的\n    所有消息。\n  -XcheckPackage:<packages>\n    在特定的程序包中启用或禁用检查。\n    <packages> 是逗号分隔的程序包说明符列表。\n    程序包说明符是程序包的限定名称\n    或程序包名称前缀后跟 ''.*'', 它扩展到\n    给定程序包的所有子程序包。在程序包说明符前面\n    加上 ''-'' 可以为指定程序包禁用检查。\n  -stats\n    报告所报告问题的统计信息。\n  -h -help --help -usage -?\n    显示此消息。\n\n还支持以下 javac 选项\n  -bootclasspath, -classpath, -cp, -sourcepath, -Xmaxerrs, -Xmaxwarns\n\n要在项目的一部分上运行 doclint, 请将项目中已编译的类\n放在类路径 (或引导类路径) 上, 然后在命令行上指定\n要检查的源文件。
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
index 4719e035105..5604ec0d81b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
@@ -35,28 +35,28 @@ main.usage=Verwendung:\n    javadoc [options] [packagenames] [sourcefiles] [@fil
 main.opt.at.arg=<Datei>
 main.opt.at.desc=Liest Optionen und Dateinamen aus Datei
 
-main.opt.public.desc=Zeigt nur \u00F6ffentliche Typen und Mitglieder. Zeigt bei benannten Modulen\nnur exportierte Packages und die API des Moduls.
+main.opt.public.desc=Zeigt nur öffentliche Typen und Mitglieder. Zeigt bei benannten Modulen\nnur exportierte Packages und die API des Moduls.
 
-main.opt.protected.desc=Zeigt gesch\u00FCtzte/\u00F6ffentliche Typen und Mitglieder (Standard). Zeigt\nbei benannten Modulen exportierte Packages und die API des Moduls.
+main.opt.protected.desc=Zeigt geschützte/öffentliche Typen und Mitglieder (Standard). Zeigt\nbei benannten Modulen exportierte Packages und die API des Moduls.
 
-main.opt.package.desc=Zeigt Package-/gesch\u00FCtzte/\u00F6ffentliche Typen und Mitglieder. Zeigt\nbei benannten Modulen alle Packages und alle Moduldetails.
+main.opt.package.desc=Zeigt Package-/geschützte/öffentliche Typen und Mitglieder. Zeigt\nbei benannten Modulen alle Packages und alle Moduldetails.
 
 main.opt.private.desc=Zeigt alle Typen und Mitglieder. Zeigt bei benannten Modulen\nalle Packages und alle Moduldetails.
 
 main.opt.show.members.arg=<Wert>
-main.opt.show.members.desc=Gibt an, welche Mitglieder (Felder, Methoden usw.) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt \u00F6ffentliche und gesch\u00FCtzte Mitglieder, "public" zeigt nur\n\u00F6ffentliche Mitglieder, "package" zeigt \u00F6ffentliche, gesch\u00FCtzte und\nPackagemitglieder, und "private" zeigt alle Mitglieder.
+main.opt.show.members.desc=Gibt an, welche Mitglieder (Felder, Methoden usw.) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt öffentliche und geschützte Mitglieder, "public" zeigt nur\nöffentliche Mitglieder, "package" zeigt öffentliche, geschützte und\nPackagemitglieder, und "private" zeigt alle Mitglieder.
 
 main.opt.show.types.arg=<Wert>
-main.opt.show.types.desc=Gibt an, welche Typen (Klassen, Schnittstellen usw.) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt \u00F6ffentliche und gesch\u00FCtzte Typen, "public" zeigt nur\n\u00F6ffentliche Typen, "package" zeigt \u00F6ffentliche, gesch\u00FCtzte und\nPackagetypen, und "private" zeigt alle Typen.
+main.opt.show.types.desc=Gibt an, welche Typen (Klassen, Schnittstellen usw.) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt öffentliche und geschützte Typen, "public" zeigt nur\nöffentliche Typen, "package" zeigt öffentliche, geschützte und\nPackagetypen, und "private" zeigt alle Typen.
 
 main.opt.show.packages.arg=<Wert>
-main.opt.show.packages.desc=Gibt das Modul an, dessen Packages dokumentiert werden. M\u00F6gliche\nWerte sind "exported" oder "all" (exportierte oder alle Packages).
+main.opt.show.packages.desc=Gibt das Modul an, dessen Packages dokumentiert werden. Mögliche\nWerte sind "exported" oder "all" (exportierte oder alle Packages).
 
 main.opt.show.module.contents.arg=<Wert>
-main.opt.show.module.contents.desc=Gibt die Dokumentationsgranularit\u00E4t von Moduldeklarationen\nan. M\u00F6gliche Werte sind "api" oder "all".
+main.opt.show.module.contents.desc=Gibt die Dokumentationsgranularität von Moduldeklarationen\nan. Mögliche Werte sind "api" oder "all".
 
 main.opt.expand.requires.arg=<Wert>
-main.opt.expand.requires.desc=Anweisungen im Tool zum Erweitern des zu dokumentierenden\nModulsets. Standardm\u00E4\u00DFig werden nur die Module dokumentiert,\ndie in der Befehlszeile ausdr\u00FCcklich angegeben werden. Der Wert\n"transitive" schlie\u00DFt zus\u00E4tzlich alle "requires transitive"-Abh\u00E4ngigkeiten\nder Module ein. Der Wert "all" schlie\u00DFt\nalle Abh\u00E4ngigkeiten der Module ein.
+main.opt.expand.requires.desc=Anweisungen im Tool zum Erweitern des zu dokumentierenden\nModulsets. Standardmäßig werden nur die Module dokumentiert,\ndie in der Befehlszeile ausdrücklich angegeben werden. Der Wert\n"transitive" schließt zusätzlich alle "requires transitive"-Abhängigkeiten\nder Module ein. Der Wert "all" schließt\nalle Abhängigkeiten der Module ein.
 
 main.opt.help.desc=Zeigt die Befehlszeilenoptionen an und beendet
 
@@ -64,22 +64,22 @@ main.opt.module.arg=<Modul>(,<Modul>)*
 main.opt.module.desc=Dokumentiert die angegebenen Module
 
 main.opt.doclet.arg=<Klasse>
-main.opt.doclet.desc=Generiert die Ausgabe \u00FCber ein alternatives Doclet
+main.opt.doclet.desc=Generiert die Ausgabe über ein alternatives Doclet
 
 main.opt.docletpath.arg=<Pfad>
 main.opt.docletpath.desc=Gibt an, wo sich Doclet-Klassendateien befinden
 
 main.opt.module.source.path.arg=<Pfad>
-main.opt.module.source.path.desc=Gib an, wo sich die Eingabequelldateien f\u00FCr mehrere Module befinden
+main.opt.module.source.path.desc=Gib an, wo sich die Eingabequelldateien für mehrere Module befinden
 
 main.opt.upgrade.module.path.arg=<Pfad>
-main.opt.upgrade.module.path.desc=Setzt den Speicherort der upgradef\u00E4higen Module au\u00DFer Kraft
+main.opt.upgrade.module.path.desc=Setzt den Speicherort der upgradefähigen Module außer Kraft
 
 main.opt.module.path.arg=<Pfad>
 main.opt.module.path.desc=Gibt an, wo sich die Anwendungsmodule befinden
 
 main.opt.add.modules.arg=<Modul>(,<Modul>)*
-main.opt.add.modules.desc=Root-Module, die zus\u00E4tzlich zu den anf\u00E4nglichen Modulen\naufgel\u00F6st werden sollen, oder alle Module im Modulpfad,\nwenn <Modul> ALL-MODULE-PATH lautet.
+main.opt.add.modules.desc=Root-Module, die zusätzlich zu den anfänglichen Modulen\naufgelöst werden sollen, oder alle Module im Modulpfad,\nwenn <Modul> ALL-MODULE-PATH lautet.
 
 main.opt.limit.modules.arg=<Modul>(,<Modul>)*
 main.opt.limit.modules.desc=Begrenzt die Gesamtzahl der beobachtbaren Module
@@ -91,7 +91,7 @@ main.opt.class.path.arg=<Pfad>
 main.opt.class.path.desc=Gibt an, wo sich die Benutzerklassendateien befinden
 
 main.opt.exclude.arg=<Packageliste>
-main.opt.exclude.desc=Liste der auszuschlie\u00DFenden Packages
+main.opt.exclude.desc=Liste der auszuschließenden Packages
 
 main.opt.subpackages.arg=<Subpackageliste>
 main.opt.subpackages.desc=Gibt die Subpackages an, die rekursiv geladen werden sollen
@@ -99,23 +99,23 @@ main.opt.subpackages.desc=Gibt die Subpackages an, die rekursiv geladen werden s
 main.opt.breakiterator.desc=Berechnet den ersten Satz mit BreakIterator
 
 main.opt.bootclasspath.arg=<Pfad>
-main.opt.bootclasspath.desc=Setzt den Speicherort der f\u00FCr nicht modulare Releases\nverwendeten Plattformklassendateien au\u00DFer Kraft
+main.opt.bootclasspath.desc=Setzt den Speicherort der für nicht modulare Releases\nverwendeten Plattformklassendateien außer Kraft
 
 main.opt.system.arg=<JDK>
-main.opt.system.desc=Setzt den Speicherort der f\u00FCr modulare Releases verwendeten Systemmodule au\u00DFer Kraft
+main.opt.system.desc=Setzt den Speicherort der für modulare Releases verwendeten Systemmodule außer Kraft
 
 main.opt.release.arg=<Release>
-main.opt.release.desc=Liefert Quellkompatibilit\u00E4t mit dem angegebenen Release
+main.opt.release.desc=Liefert Quellkompatibilität mit dem angegebenen Release
 
 main.opt.source.arg=<Release>
-main.opt.source.desc=Liefert Quellkompatibilit\u00E4t mit dem angegebenen Release
+main.opt.source.desc=Liefert Quellkompatibilität mit dem angegebenen Release
 
 main.opt.enable.preview.desc=Aktiviert Vorschausprachfeatures. Wird in Verbindung\nmit -source oder --release verwendet.
 
 main.opt.extdirs.arg=<Verzeichnisliste>
-main.opt.extdirs.desc=Setzt den Speicherort der installierten Erweiterungen au\u00DFer Kraft
+main.opt.extdirs.desc=Setzt den Speicherort der installierten Erweiterungen außer Kraft
 
-main.opt.verbose.desc=Gibt Meldungen \u00FCber die Javadoc-Vorg\u00E4nge aus
+main.opt.verbose.desc=Gibt Meldungen über die Javadoc-Vorgänge aus
 
 main.opt.locale.arg=<Name>
 main.opt.locale.desc=Zu verwendendes Gebietsschema, z.B. en_US oder en_US_WIN
@@ -128,9 +128,9 @@ main.opt.quiet.desc=Zeigt keine Statusmeldungen an
 main.opt.version.desc=Gibt Versionsinformationen aus
 
 main.opt.J.arg=<Flag>
-main.opt.J.desc=\u00DCbergibt <Flag> direkt an das Laufzeitsystem
+main.opt.J.desc=Übergibt <Flag> direkt an das Laufzeitsystem
 
-main.opt.help.extra.desc=Gibt eine Zusammenfassung nicht standardm\u00E4\u00DFiger Optionen aus und beendet
+main.opt.help.extra.desc=Gibt eine Zusammenfassung nicht standardmäßiger Optionen aus und beendet
 
 main.opt.Werror.desc=Meldet einen Fehler beim Auftreten von Warnungen
 
@@ -151,52 +151,52 @@ main.opt.add.reads.arg=<Modul>=<Anderes Modul>(,<Anderes Modul>)*
 main.opt.add.reads.desc=Gibt weitere Module an, die als von einem angegebenen Modul angefordert\nbetrachtet werden sollen. <Anderes Modul> kann ALL-UNNAMED lauten,\num das unbenannte Modul anzufordern.
 
 main.opt.patch.module.arg=<Modul>=<Datei>(:<Datei>)*
-main.opt.patch.module.desc=Setzt ein Modul au\u00DFer Kraft oder erweitert es mit Klassen\nund Ressourcen in JAR-Dateien oder Verzeichnissen
+main.opt.patch.module.desc=Setzt ein Modul außer Kraft oder erweitert es mit Klassen\nund Ressourcen in JAR-Dateien oder Verzeichnissen
 
-main.Xusage.foot=\nDies sind keine Standardoptionen, und sie k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.
+main.Xusage.foot=\nDies sind keine Standardoptionen, und sie können ohne Vorankündigung geändert werden.
 
 main.doclet.usage.header=\nBereitgestellt vom Doclet {0}:
 
-main.requires_argument=F\u00FCr die Option {0} ist ein Argument erforderlich.
+main.requires_argument=Für die Option {0} ist ein Argument erforderlich.
 main.unnecessary_arg_provided=Option {0} erfordert kein Argument
-main.only_one_argument_with_equals=Syntax mit "=" kann nicht f\u00FCr Optionen verwendet werden, die mehrere Argumente erfordern
-main.invalid_flag=Ung\u00FCltiges Kennzeichen: {0}
+main.only_one_argument_with_equals=Syntax mit "=" kann nicht für Optionen verwendet werden, die mehrere Argumente erfordern
+main.invalid_flag=Ungültiges Kennzeichen: {0}
 main.No_modules_packages_or_classes_specified=Keine Module, Packages oder Klassen angegeben.
 main.module_not_found=Modul {0} nicht gefunden
-main.module_source_not_found=Quelldateien f\u00FCr Modul {0} nicht gefunden
-main.cannot_use_sourcepath_for_modules=Quellpfad kann nicht f\u00FCr mehrere Module {0} verwendet werden
+main.module_source_not_found=Quelldateien für Modul {0} nicht gefunden
+main.cannot_use_sourcepath_for_modules=Quellpfad kann nicht für mehrere Module {0} verwendet werden
 main.module_not_found_on_sourcepath=Modul {0} in Quellpfad nicht gefunden
-main.sourcepath_does_not_contain_module=Quellpfad enth\u00E4lt nicht Modul {0}
+main.sourcepath_does_not_contain_module=Quellpfad enthält nicht Modul {0}
 main.cant.read={0} kann nicht gelesen werden
-main.Loading_source_files_for_package=Quelldateien werden geladen f\u00FCr Package {0}...
+main.Loading_source_files_for_package=Quelldateien werden geladen für Package {0}...
 main.Loading_source_file=Quelldatei {0} wird geladen...
 main.Building_tree=Javadoc-Informationen werden erstellt...
-main.no_source_files_for_package=Keine Quelldateien f\u00FCr Package {0}
+main.no_source_files_for_package=Keine Quelldateien für Package {0}
 main.package_not_found=Package {0} nicht gefunden
 main.fatal.error=schwerwiegender Fehler aufgetreten: {0}
-main.out.of.memory=java.lang.OutOfMemoryError: Erweitern Sie den Speicher.\nBeispiel: F\u00FCgen Sie bei JDK Classic- oder HotSpot-VMs die Option -J-Xmx\nhinzu, zum Beispiel -J-Xmx32m.
+main.out.of.memory=java.lang.OutOfMemoryError: Erweitern Sie den Speicher.\nBeispiel: Fügen Sie bei JDK Classic- oder HotSpot-VMs die Option -J-Xmx\nhinzu, zum Beispiel -J-Xmx32m.
 main.done_in=[fertig in {0} ms]
 main.more_than_one_doclet_specified_0_and_1=Mehr als ein Doclet angegeben: ({0} und {1}).
-main.doclet_could_not_get_location=Speicherort f\u00FCr {0} konnte nicht abgerufen werden
-main.doclet_could_not_set_location=Speicherort f\u00FCr {0} konnte nicht festgelegt werden
+main.doclet_could_not_get_location=Speicherort für {0} konnte nicht abgerufen werden
+main.doclet_could_not_set_location=Speicherort für {0} konnte nicht festgelegt werden
 main.doclet_no_classloader_found=Class Loader zum Laden von {0} konnte nicht abgerufen werden
 main.could_not_instantiate_class=Klasse {0} konnte nicht instanziiert werden
 main.doclet_class_not_found=Doclet-Klasse {0} nicht gefunden
 main.malformed_locale_name=Nicht wohlgeformter Gebietsschemaname: {0}
 main.file_not_found=Datei nicht gefunden: "{0}"
-main.illegal_class_name=Ung\u00FCltiger Klassenname: "{0}"
-main.illegal_package_name=Ung\u00FCltiger Packagename: "{0}"
-main.illegal_option_value=Ung\u00FCltiger Optionswert: "{0}"
+main.illegal_class_name=Ungültiger Klassenname: "{0}"
+main.illegal_package_name=Ungültiger Packagename: "{0}"
+main.illegal_option_value=Ungültiger Optionswert: "{0}"
 main.file.manager.list=FileManager-Fehler beim Auflisten von Dateien: "{0}"
 main.assertion.error=Assertion-Fehler: "{0}"
 main.warnings.Werror=Warnungen gefunden und -Werror angegeben
 main.unknown.error=ein unbekannter Fehler ist aufgetreten
 main.internal.error=ein interner Fehler ist aufgetreten
 main.unexpected.exception=eine unerwartete Ausnahme wurde abgefangen: {0}
-main.unknown.option.for.filemanager=Option wird von Dateimanager nicht unterst\u00FCtzt: {0}
-main.bad.arg.for.filemanager.option=ung\u00FCltiger Wert f\u00FCr Dateimanageroption {0}: "{1}"
-doclet.internal.report.bug=Melden Sie auf der Java-Seite zum Melden von Bugs (https://bugreport.java.com) einen Bug\nf\u00FCr das javadoc-Tool, nachdem Sie in der Bugdatenbank (https://bugs.java.com) nach Duplikaten\ngesucht haben. Nehmen Sie Fehlermeldungen und die folgende Diagnose in den Bericht auf. Vielen Dank.
-main.not_a_doclet=Klasse {0} ist kein g\u00FCltiges Doclet.\nHinweis: Ab JDK 13 wird die API com.sun.javadoc nicht mehr unterst\u00FCtzt.
+main.unknown.option.for.filemanager=Option wird von Dateimanager nicht unterstützt: {0}
+main.bad.arg.for.filemanager.option=ungültiger Wert für Dateimanageroption {0}: "{1}"
+doclet.internal.report.bug=Melden Sie auf der Java-Seite zum Melden von Bugs (https://bugreport.java.com) einen Bug\nfür das javadoc-Tool, nachdem Sie in der Bugdatenbank (https://bugs.java.com) nach Duplikaten\ngesucht haben. Nehmen Sie Fehlermeldungen und die folgende Diagnose in den Bericht auf. Vielen Dank.
+main.not_a_doclet=Klasse {0} ist kein gültiges Doclet.\nHinweis: Ab JDK 13 wird die API com.sun.javadoc nicht mehr unterstützt.
 
 javadoc.class_not_found=Klasse {0} nicht gefunden.
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
index 2f2ecf87349..a6599cc3e7e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
@@ -23,185 +23,185 @@
 # questions.
 #
 
-javadoc.description=Java\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u3001API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306EHTML\u30DA\u30FC\u30B8\u3092\u751F\u6210\u3057\u307E\u3059
+javadoc.description=Javaソース・ファイルから、APIドキュメントのHTMLページを生成します
 
-main.errors=\u30A8\u30E9\u30FC{0}\u500B
-main.error=\u30A8\u30E9\u30FC{0}\u500B
-main.warnings=\u8B66\u544A{0}\u500B
-main.warning=\u8B66\u544A{0}\u500B
+main.errors=エラー{0}個
+main.error=エラー{0}個
+main.warnings=警告{0}個
+main.warning=警告{0}個
 
-main.usage=\u4F7F\u7528\u65B9\u6CD5:\n    javadoc [options] [packagenames] [sourcefiles] [@files]\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:
+main.usage=使用方法:\n    javadoc [options] [packagenames] [sourcefiles] [@files]\nオプションは次のとおりです:
 
 main.opt.at.arg=<file>
-main.opt.at.desc=\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u8AAD\u53D6\u308A\u30AA\u30D7\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D5\u30A1\u30A4\u30EB\u540D
+main.opt.at.desc=ファイルからの読取りオプションおよびファイル名
 
-main.opt.public.desc=public\u30BF\u30A4\u30D7\u3068\u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u540D\u524D\u306E\u3042\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u5834\u5408\u3001\n\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u30E2\u30B8\u30E5\u30FC\u30EB\u306EAPI\u3092\u8868\u793A\u3057\u307E\u3059\u3002
+main.opt.public.desc=publicタイプとメンバーのみを表示します。名前のあるモジュールの場合、\nエクスポートされたパッケージとモジュールのAPIを表示します。
 
-main.opt.protected.desc=protected/public\u30BF\u30A4\u30D7\u3068\u30E1\u30F3\u30D0\u30FC(\u30C7\u30D5\u30A9\u30EB\u30C8)\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u540D\u524D\u306E\u3042\u308B\n\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u5834\u5408\u3001\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u30E2\u30B8\u30E5\u30FC\u30EB\u306EAPI\u3092\u8868\u793A\u3057\u307E\u3059\u3002
+main.opt.protected.desc=protected/publicタイプとメンバー(デフォルト)を表示します。名前のある\nモジュールの場合、エクスポートされたパッケージとモジュールのAPIを表示します。
 
-main.opt.package.desc=package/protected/public\u30BF\u30A4\u30D7\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u540D\u524D\u306E\u3042\u308B\n\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u5834\u5408\u3001\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u8A73\u7D30\u3092\u8868\u793A\u3057\u307E\u3059\u3002
+main.opt.package.desc=package/protected/publicタイプとメンバーを表示します。名前のある\nモジュールの場合、すべてのパッケージとすべてのモジュール詳細を表示します。
 
-main.opt.private.desc=\u3059\u3079\u3066\u306E\u30BF\u30A4\u30D7\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u540D\u524D\u306E\u3042\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u5834\u5408\u3001\n\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u8A73\u7D30\u3092\u8868\u793A\u3057\u307E\u3059\u3002
+main.opt.private.desc=すべてのタイプとメンバーを表示します。名前のあるモジュールの場合、\nすべてのパッケージとすべてのモジュール詳細を表示します。
 
 main.opt.show.members.arg=<value>
-main.opt.show.members.desc=\u5024\u304C"public"\u3001"protected"\u3001"package"\u307E\u305F\u306F"private"\u306E\u3044\u305A\u308C\u304B\u306E\n\u3069\u306E\u30E1\u30F3\u30D0\u30FC(\u30D5\u30A3\u30FC\u30EB\u30C9\u3084\u30E1\u30BD\u30C3\u30C9\u306A\u3069)\u3092\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B\u304B\u3092\u6307\u5B9A\u3059\u308B\u3002\n\u30C7\u30D5\u30A9\u30EB\u30C8\u306F"protected"\u3067\u3001public\u304A\u3088\u3073protected\u30E1\u30F3\u30D0\u30FC\u304C\u8868\u793A\u3055\u308C\u3001\n"public"\u3067\u306Fpublic\u30E1\u30F3\u30D0\u30FC\u306E\u307F\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002"package"\u3067\u306F\npublic\u3001protected\u304A\u3088\u3073package\u30E1\u30F3\u30D0\u30FC\u304C\u8868\u793A\u3055\u308C\u3001"private"\n\u3067\u306F\u3059\u3079\u3066\u306E\u30E1\u30F3\u30D0\u30FC\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+main.opt.show.members.desc=値が"public"、"protected"、"package"または"private"のいずれかの\nどのメンバー(フィールドやメソッドなど)をドキュメント化するかを指定する。\nデフォルトは"protected"で、publicおよびprotectedメンバーが表示され、\n"public"ではpublicメンバーのみが表示されます。"package"では\npublic、protectedおよびpackageメンバーが表示され、"private"\nではすべてのメンバーが表示されます。
 
 main.opt.show.types.arg=<value>
-main.opt.show.types.desc=\u5024\u304C"public"\u3001"protected"\u3001"package"\u307E\u305F\u306F"private"\u306E\u3044\u305A\u308C\u304B\u306E\n\u3069\u306E\u578B(\u30AF\u30E9\u30B9\u3084\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306A\u3069)\u3092\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B\u304B\u3092\u6307\u5B9A\u3059\u308B\u3002\n\u30C7\u30D5\u30A9\u30EB\u30C8\u306F"protected"\u3067\u3001public\u304A\u3088\u3073protected\u578B\u304C\u8868\u793A\u3055\u308C\u3001\n"public"\u3067\u306Fpublic\u578B\u306E\u307F\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002"package"\u3067\u306F\npublic\u3001protected\u304A\u3088\u3073package\u578B\u304C\u8868\u793A\u3055\u308C\u3001"private"\n\u3067\u306F\u3059\u3079\u3066\u306E\u578B\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+main.opt.show.types.desc=値が"public"、"protected"、"package"または"private"のいずれかの\nどの型(クラスやインタフェースなど)をドキュメント化するかを指定する。\nデフォルトは"protected"で、publicおよびprotected型が表示され、\n"public"ではpublic型のみが表示されます。"package"では\npublic、protectedおよびpackage型が表示され、"private"\nではすべての型が表示されます。
 
 main.opt.show.packages.arg=<value>
-main.opt.show.packages.desc=\u3069\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B\u304B\u3092\u6307\u5B9A\u3059\u308B\u3002\u4F7F\u7528\u53EF\u80FD\u306A\n\u5024\u306F\u3001"exported"\u307E\u305F\u306F"all"\u30D1\u30C3\u30B1\u30FC\u30B8\u3067\u3059\u3002
+main.opt.show.packages.desc=どのモジュールのパッケージをドキュメント化するかを指定する。使用可能な\n値は、"exported"または"all"パッケージです。
 
 main.opt.show.module.contents.arg=<value>
-main.opt.show.module.contents.desc=\u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u306E\u7C92\u5EA6\u3092\u6307\u5B9A\u3059\u308B\u3002\n\u4F7F\u7528\u53EF\u80FD\u306A\u5024\u306F\u3001"api"\u307E\u305F\u306F"all"\u3067\u3059\u3002
+main.opt.show.module.contents.desc=モジュール宣言のドキュメント化の粒度を指定する。\n使用可能な値は、"api"または"all"です。
 
 main.opt.expand.requires.arg=<value>
-main.opt.expand.requires.desc=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30BB\u30C3\u30C8\u3092\u62E1\u5F35\u3059\u308B\u305F\u3081\u306E\n\u30C4\u30FC\u30EB\u3092\u6307\u5B9A\u3059\u308B\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u660E\u793A\u7684\u306B\n\u6307\u5B9A\u3055\u308C\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u307F\u304C\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u307E\u3059\u3002"transitive"\u306E\u5024\u306F\u3001\n\u305D\u308C\u3089\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3059\u3079\u3066\u306E"requires transitive"\u4F9D\u5B58\u6027\u3092\u8FFD\u52A0\u3067\n\u542B\u3081\u307E\u3059\u3002"all"\u306E\u5024\u306F\u3001\u305D\u308C\u3089\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3059\u3079\u3066\u306E\u4F9D\u5B58\u6027\u3092\n\u542B\u3081\u307E\u3059\u3002
+main.opt.expand.requires.desc=ドキュメント化するモジュールのセットを拡張するための\nツールを指定する。デフォルトでは、コマンドラインで明示的に\n指定されたモジュールのみがドキュメント化されます。"transitive"の値は、\nそれらのモジュールのすべての"requires transitive"依存性を追加で\n含めます。"all"の値は、それらのモジュールのすべての依存性を\n含めます。
 
-main.opt.help.desc=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8868\u793A\u3057\u3066\u7D42\u4E86\u3059\u308B
+main.opt.help.desc=コマンドライン・オプションを表示して終了する
 
 main.opt.module.arg=<module>(,<module>)*
-main.opt.module.desc=\u6307\u5B9A\u3055\u308C\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B
+main.opt.module.desc=指定されたモジュールをドキュメント化する
 
 main.opt.doclet.arg=<class>
-main.opt.doclet.desc=\u4EE3\u66FFdoclet\u3092\u4ECB\u3057\u3066\u51FA\u529B\u3092\u751F\u6210\u3059\u308B
+main.opt.doclet.desc=代替docletを介して出力を生成する
 
 main.opt.docletpath.arg=<path>
-main.opt.docletpath.desc=doclet\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
+main.opt.docletpath.desc=docletクラス・ファイルのある場所を指定する
 
 main.opt.module.source.path.arg=<path>
-main.opt.module.source.path.desc=\u8907\u6570\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u5165\u529B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
+main.opt.module.source.path.desc=複数モジュールの入力ソース・ファイルを検索する位置を指定する
 
 main.opt.upgrade.module.path.arg=<path>
-main.opt.upgrade.module.path.desc=\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
+main.opt.upgrade.module.path.desc=アップグレード可能なモジュールの位置をオーバーライドする
 
 main.opt.module.path.arg=<path>
-main.opt.module.path.desc=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
+main.opt.module.path.desc=アプリケーション・モジュールを検索する位置を指定する
 
 main.opt.add.modules.arg=<module>(,<module>)*
-main.opt.add.modules.desc=\u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F\n<module>\u304CALL-MODULE-PATH\u3067\u3042\u308B\u5834\u5408\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\n\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3002
+main.opt.add.modules.desc=初期モジュールに加えて解決するルート・モジュール、または\n<module>がALL-MODULE-PATHである場合はモジュール・パスの\nすべてのモジュール。
 
 main.opt.limit.modules.arg=<module>(,<module>)*
-main.opt.limit.modules.desc=\u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059
+main.opt.limit.modules.desc=参照可能なモジュールの領域を制限します
 
 main.opt.source.path.arg=<path>
-main.opt.source.path.desc=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
+main.opt.source.path.desc=ソース・ファイルのある場所を指定する
 
 main.opt.class.path.arg=<path>
-main.opt.class.path.desc=\u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
+main.opt.class.path.desc=ユーザー・クラス・ファイルのある場所を指定する
 
 main.opt.exclude.arg=<pkglist>
-main.opt.exclude.desc=\u9664\u5916\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u6307\u5B9A\u3059\u308B
+main.opt.exclude.desc=除外するパッケージ・リストを指定する
 
 main.opt.subpackages.arg=<subpkglist>
-main.opt.subpackages.desc=\u518D\u5E30\u7684\u306B\u30ED\u30FC\u30C9\u3059\u308B\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6307\u5B9A\u3059\u308B
+main.opt.subpackages.desc=再帰的にロードするサブパッケージを指定する
 
-main.opt.breakiterator.desc=BreakIterator\u3067\u6700\u521D\u306E\u6587\u3092\u8A08\u7B97\u3059\u308B
+main.opt.breakiterator.desc=BreakIteratorで最初の文を計算する
 
 main.opt.bootclasspath.arg=<path>
-main.opt.bootclasspath.desc=\u975E\u30E2\u30B8\u30E5\u30E9\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u4F7F\u7528\u3055\u308C\u308B\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\n\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
+main.opt.bootclasspath.desc=非モジュラ・リリースで使用されるプラットフォーム・クラス・ファイル\nの場所をオーバーライドする
 
 main.opt.system.arg=<jdk>
-main.opt.system.desc=\u30E2\u30B8\u30E5\u30E9\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u4F7F\u7528\u3055\u308C\u308B\u30B7\u30B9\u30C6\u30E0\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
+main.opt.system.desc=モジュラ・リリースで使用されるシステム・モジュールの場所をオーバーライドする
 
 main.opt.release.arg=<release>
-main.opt.release.desc=\u6307\u5B9A\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u3068\u30BD\u30FC\u30B9\u306E\u4E92\u63DB\u6027\u3092\u4FDD\u3064
+main.opt.release.desc=指定されたリリースとソースの互換性を保つ
 
 main.opt.source.arg=<release>
-main.opt.source.desc=\u6307\u5B9A\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u3068\u30BD\u30FC\u30B9\u306E\u4E92\u63DB\u6027\u3092\u4FDD\u3064
+main.opt.source.desc=指定されたリリースとソースの互換性を保つ
 
-main.opt.enable.preview.desc=\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u6709\u52B9\u306B\u3059\u308B\u3002-source\u307E\u305F\u306F--release\u3068\u3068\u3082\u306B\n\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
+main.opt.enable.preview.desc=プレビュー言語機能を有効にする。-sourceまたは--releaseとともに\n使用されます。
 
 main.opt.extdirs.arg=<dirlist>
-main.opt.extdirs.desc=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F\u62E1\u5F35\u6A5F\u80FD\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
+main.opt.extdirs.desc=インストール済み拡張機能の位置をオーバーライドする
 
-main.opt.verbose.desc=Javadoc\u306E\u52D5\u4F5C\u306B\u3064\u3044\u3066\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
+main.opt.verbose.desc=Javadocの動作についてメッセージを出力する
 
 main.opt.locale.arg=<name>
-main.opt.locale.desc=en_US\u3084en_US_WIN\u306A\u3069\u306E\u4F7F\u7528\u3059\u308B\u30ED\u30B1\u30FC\u30EB
+main.opt.locale.desc=en_USやen_US_WINなどの使用するロケール
 
 main.opt.encoding.arg=<name>
-main.opt.encoding.desc=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D
+main.opt.encoding.desc=ソース・ファイルのエンコーディング名
 
-main.opt.quiet.desc=\u72B6\u614B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u306A\u3044
+main.opt.quiet.desc=状態メッセージを表示しない
 
-main.opt.version.desc=\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B
+main.opt.version.desc=バージョン情報を出力する
 
 main.opt.J.arg=<flag>
-main.opt.J.desc=<flag>\u3092\u5B9F\u884C\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3059
+main.opt.J.desc=<flag>を実行システムに直接渡す
 
-main.opt.help.extra.desc=\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u6982\u8981\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3059\u308B
+main.opt.help.extra.desc=非標準オプションの概要を出力し終了する
 
-main.opt.Werror.desc=\u8B66\u544A\u304C\u767A\u751F\u3057\u305F\u5834\u5408\u30A8\u30E9\u30FC\u3092\u30EC\u30DD\u30FC\u30C8\u3059\u308B
+main.opt.Werror.desc=警告が発生した場合エラーをレポートする
 
-main.usage.foot=\nGNU\u30B9\u30BF\u30A4\u30EB\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u540D\u524D\u3068\u305D\u306E\u5024\u3092\u533A\u5207\u308B\u305F\u3081\u306B\u7A7A\u767D\u3067\u306F\u306A\u304F'='\u3092\n\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n
+main.usage.foot=\nGNUスタイル・オプションでは、オプションの名前とその値を区切るために空白ではなく'='を\n使用できます。\n
 
 main.Xusage=
 
 main.opt.Xmaxerrs.arg=<number>
-main.opt.Xmaxerrs.desc=\u51FA\u529B\u3059\u308B\u30A8\u30E9\u30FC\u306E\u6700\u5927\u6570\u3092\u8A2D\u5B9A\u3059\u308B
+main.opt.Xmaxerrs.desc=出力するエラーの最大数を設定する
 
 main.opt.Xmaxwarns.arg=<number>
-main.opt.Xmaxwarns.desc=\u51FA\u529B\u3059\u308B\u8B66\u544A\u306E\u6700\u5927\u6570\u3092\u8A2D\u5B9A\u3059\u308B
+main.opt.Xmaxwarns.desc=出力する警告の最大数を設定する
 
 main.opt.add.exports.arg=<module>/<package>=<other-module>(,<other-module>)*
-main.opt.add.exports.desc=\u305D\u306E\u5B9A\u7FA9\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u3089\u3001\u8FFD\u52A0\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F<other-module>\u304C\nALL-UNNAMED\u3067\u3042\u308B\u5834\u5408\u306F\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u6E08\u3068\u307F\u306A\u3055\u308C\u308B\u3088\u3046\u306B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6307\u5B9A\u3057\u307E\u3059
+main.opt.add.exports.desc=その定義モジュールから、追加のモジュール、または<other-module>が\nALL-UNNAMEDである場合はすべての名前のないモジュールに\nエクスポート済とみなされるようにパッケージを指定します
 
 main.opt.add.reads.arg=<module>=<other-module>(,<other-module>)*
-main.opt.add.reads.desc=\u6307\u5B9A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u5FC5\u9808\u3068\u307F\u306A\u3055\u308C\u308B\u3088\u3046\u306B\u8FFD\u52A0\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u5FC5\u8981\u3068\u3059\u308B\u5834\u5408\u3001<other-module>\u306FALL-UNNAMED\n\u306B\u3057\u307E\u3059\u3002
+main.opt.add.reads.desc=指定のモジュールで必須とみなされるように追加モジュールを指定します。\n名前のないモジュールを必要とする場合、<other-module>はALL-UNNAMED\nにします。
 
 main.opt.patch.module.arg=<module>=<file>(:<file>)*
-main.opt.patch.module.desc=JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n        \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059
-
-main.Xusage.foot=\n\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
-
-main.doclet.usage.header=\n{0} doclet\u306B\u3088\u308A\u63D0\u4F9B\u3055\u308C\u308B\u3082\u306E:
-
-main.requires_argument=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002
-main.unnecessary_arg_provided=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306F\u5F15\u6570\u3092\u5FC5\u8981\u3068\u3057\u307E\u305B\u3093
-main.only_one_argument_with_equals=\u8907\u6570\u306E\u5F15\u6570\u3092\u5FC5\u8981\u3068\u3059\u308B\u30AA\u30D7\u30B7\u30E7\u30F3\u306B''=''\u69CB\u6587\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-main.invalid_flag={0}\u306F\u7121\u52B9\u306A\u30D5\u30E9\u30B0\u3067\u3059
-main.No_modules_packages_or_classes_specified=\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-main.module_not_found=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-main.module_source_not_found=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306E\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-main.cannot_use_sourcepath_for_modules=\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306F\u8907\u6570\u306E\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-main.module_not_found_on_sourcepath=\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306B\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-main.sourcepath_does_not_contain_module=\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306B\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
-main.cant.read={0}\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093
-main.Loading_source_files_for_package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u8FBC\u3093\u3067\u3044\u307E\u3059...
-main.Loading_source_file=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u3092\u8AAD\u307F\u8FBC\u3093\u3067\u3044\u307E\u3059...
-main.Building_tree=Javadoc\u60C5\u5831\u3092\u69CB\u7BC9\u3057\u3066\u3044\u307E\u3059...
-main.no_source_files_for_package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093
-main.package_not_found=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
-main.fatal.error=\u81F4\u547D\u7684\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}
-main.out.of.memory=java.lang.OutOfMemoryError: \u30E1\u30E2\u30EA\u30FC\u3092\u5897\u3084\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u305F\u3068\u3048\u3070\u3001JDK\u306Eclassic\u3082\u3057\u304F\u306Fhotspot VM\u3067\u306F\u3001-J-Xmx32m\u306E\u3088\u3046\u306B\n-J-Xmx\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
-main.done_in=[{0}\u30DF\u30EA\u79D2\u3067\u5B8C\u4E86]
-main.more_than_one_doclet_specified_0_and_1=\u8907\u6570\u306Edoclet({0}\u3068{1})\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-main.doclet_could_not_get_location={0}\u306E\u5834\u6240\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-main.doclet_could_not_set_location={0}\u306E\u5834\u6240\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-main.doclet_no_classloader_found={0}\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30AF\u30E9\u30B9\u30ED\u30FC\u30C0\u30FC\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-main.could_not_instantiate_class=\u30AF\u30E9\u30B9{0}\u3092\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-main.doclet_class_not_found=doclet\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-main.malformed_locale_name=\u30ED\u30B1\u30FC\u30EB\u540D{0}\u306E\u66F8\u5F0F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
-main.file_not_found=\u30D5\u30A1\u30A4\u30EB"{0}"\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-main.illegal_class_name=\u30AF\u30E9\u30B9\u540D\u304C\u4E0D\u6B63\u3067\u3059: "{0}"
-main.illegal_package_name=\u30D1\u30C3\u30B1\u30FC\u30B8\u540D"{0}"\u306F\u4E0D\u6B63\u3067\u3059
-main.illegal_option_value=\u4E0D\u6B63\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u5024: "{0}"
-main.file.manager.list=\u30D5\u30A1\u30A4\u30EB\u306E\u30EA\u30B9\u30C8\u4E2D\u306EFileManager\u30A8\u30E9\u30FC: "{0}"
-main.assertion.error=\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u304C\u5931\u6557\u3057\u307E\u3057\u305F: "{0}"
-main.warnings.Werror=\u8B66\u544A\u304C\u898B\u3064\u304B\u308A-Werror\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F
-main.unknown.error=\u4E0D\u660E\u306A\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-main.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-main.unexpected.exception=\u4E88\u671F\u3057\u306A\u3044\u4F8B\u5916\u304C\u6355\u6349\u3055\u308C\u307E\u3057\u305F: {0}
-main.unknown.option.for.filemanager=\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
-main.bad.arg.for.filemanager.option=\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u306E\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: "{1}"
-doclet.internal.report.bug=\u30D0\u30B0\u30FB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9(https://bugs.java.com)\u3067\u91CD\u8907\u304C\u306A\u3044\u304B\u3092\u3054\u78BA\u8A8D\u306E\u3046\u3048\u3001Java\u306E\u30D0\u30B0\u30FB\u30EC\u30DD\u30FC\u30C8\u30FB\u30DA\u30FC\u30B8\n(https://bugreport.java.com)\u3067javadoc\u30C4\u30FC\u30EB\u306B\u5BFE\u3059\u308B\u30D0\u30B0\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\n\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3068\u6B21\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u3054\u5165\u529B\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
-main.not_a_doclet=\u30AF\u30E9\u30B9{0}\u306F\u6709\u52B9\u306A\u30C9\u30C3\u30AF\u30EC\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n\u30CE\u30FC\u30C8: JDK 13\u304B\u3089\u3001com.sun.javadoc API\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u304F\u306A\u308A\u307E\u3057\u305F\u3002
-
-javadoc.class_not_found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
+main.opt.patch.module.desc=JARファイルまたはディレクトリのクラスおよびリソースでモジュールを\n        オーバーライドまたは拡張します
+
+main.Xusage.foot=\nこれらは非標準オプションであり予告なしに変更されることがあります。
+
+main.doclet.usage.header=\n{0} docletにより提供されるもの:
+
+main.requires_argument=オプション{0}には引数が必要です。
+main.unnecessary_arg_provided=オプション{0}は引数を必要としません
+main.only_one_argument_with_equals=複数の引数を必要とするオプションに''=''構文を使用することはできません
+main.invalid_flag={0}は無効なフラグです
+main.No_modules_packages_or_classes_specified=モジュール、パッケージまたはクラスが指定されていません。
+main.module_not_found=モジュール{0}が見つかりません
+main.module_source_not_found=モジュール{0}のソース・ファイルが見つかりません
+main.cannot_use_sourcepath_for_modules=ソース・パスは複数のモジュール{0}に使用できません
+main.module_not_found_on_sourcepath=ソース・パスにモジュール{0}が見つかりません
+main.sourcepath_does_not_contain_module=ソース・パスにモジュール{0}が含まれていません
+main.cant.read={0}を読み込めません
+main.Loading_source_files_for_package=パッケージ{0}のソース・ファイルを読み込んでいます...
+main.Loading_source_file=ソース・ファイル{0}を読み込んでいます...
+main.Building_tree=Javadoc情報を構築しています...
+main.no_source_files_for_package=パッケージ{0}のソース・ファイルがありません
+main.package_not_found=パッケージ{0}が見つかりませんでした
+main.fatal.error=致命的エラーが発生しました: {0}
+main.out.of.memory=java.lang.OutOfMemoryError: メモリーを増やしてください。\nたとえば、JDKのclassicもしくはhotspot VMでは、-J-Xmx32mのように\n-J-Xmxオプションを使用します。
+main.done_in=[{0}ミリ秒で完了]
+main.more_than_one_doclet_specified_0_and_1=複数のdoclet({0}と{1})が指定されています。
+main.doclet_could_not_get_location={0}の場所を取得できませんでした
+main.doclet_could_not_set_location={0}の場所を設定できませんでした
+main.doclet_no_classloader_found={0}をロードするクラスローダーを取得できませんでした
+main.could_not_instantiate_class=クラス{0}をインスタンス化できませんでした
+main.doclet_class_not_found=docletクラス{0}が見つかりません
+main.malformed_locale_name=ロケール名{0}の書式が正しくありません
+main.file_not_found=ファイル"{0}"が見つかりません
+main.illegal_class_name=クラス名が不正です: "{0}"
+main.illegal_package_name=パッケージ名"{0}"は不正です
+main.illegal_option_value=不正なオプション値: "{0}"
+main.file.manager.list=ファイルのリスト中のFileManagerエラー: "{0}"
+main.assertion.error=アサーションが失敗しました: "{0}"
+main.warnings.Werror=警告が見つかり-Werrorが指定されました
+main.unknown.error=不明なエラーが発生しました
+main.internal.error=内部エラーが発生しました
+main.unexpected.exception=予期しない例外が捕捉されました: {0}
+main.unknown.option.for.filemanager=オプションはファイル・マネージャでサポートされていません: {0}
+main.bad.arg.for.filemanager.option=ファイル・マネージャのオプション{0}の値が不正です: "{1}"
+doclet.internal.report.bug=バグ・データベース(https://bugs.java.com)で重複がないかをご確認のうえ、Javaのバグ・レポート・ページ\n(https://bugreport.java.com)でjavadocツールに対するバグの登録をお願いいたします。\nレポートには、エラー・メッセージと次の診断内容をご入力ください。ご協力ありがとうございます。
+main.not_a_doclet=クラス{0}は有効なドックレットではありません。\nノート: JDK 13から、com.sun.javadoc APIはサポートされなくなりました。
+
+javadoc.class_not_found=クラス{0}が見つかりません。
 
 javadoc.version={0} {1}
-javadoc.fullversion={0}\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"{1}"
+javadoc.fullversion={0}フル・バージョン"{1}"
 
 javadoc.err.message={0}
 javadoc.warn.message={0}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
index b7da5f6e513..ab38afe183b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
@@ -23,185 +23,185 @@
 # questions.
 #
 
-javadoc.description=\u4ECE Java \u6E90\u6587\u4EF6\u751F\u6210 API \u6587\u6863\u7684 HTML \u9875\u9762
+javadoc.description=从 Java 源文件生成 API 文档的 HTML 页面
 
-main.errors={0} \u4E2A\u9519\u8BEF
-main.error={0} \u4E2A\u9519\u8BEF
-main.warnings={0} \u4E2A\u8B66\u544A
-main.warning={0} \u4E2A\u8B66\u544A
+main.errors={0} 个错误
+main.error={0} 个错误
+main.warnings={0} 个警告
+main.warning={0} 个警告
 
-main.usage=\u7528\u6CD5:\n    javadoc [options] [packagenames] [sourcefiles] [@files]\n\u5176\u4E2D, \u9009\u9879\u5305\u62EC:
+main.usage=用法:\n    javadoc [options] [packagenames] [sourcefiles] [@files]\n其中, 选项包括:
 
 main.opt.at.arg=<file>
-main.opt.at.desc=\u4ECE\u6587\u4EF6\u8BFB\u53D6\u9009\u9879\u548C\u6587\u4EF6\u540D
+main.opt.at.desc=从文件读取选项和文件名
 
-main.opt.public.desc=\u53EA\u663E\u793A\u516C\u5171\u7C7B\u578B\u548C\u6210\u5458\u3002\u5BF9\u4E8E\u547D\u540D\u6A21\u5757,\n\u663E\u793A\u5BFC\u51FA\u7684\u7A0B\u5E8F\u5305\u548C\u6A21\u5757\u7684 API\u3002
+main.opt.public.desc=只显示公共类型和成员。对于命名模块,\n显示导出的程序包和模块的 API。
 
-main.opt.protected.desc=\u663E\u793A\u53D7\u4FDD\u62A4/\u516C\u5171\u7C7B\u578B\u548C\u6210\u5458 (\u9ED8\u8BA4\u8BBE\u7F6E)\u3002\u5BF9\u4E8E\n\u547D\u540D\u6A21\u5757, \u663E\u793A\u5BFC\u51FA\u7684\u7A0B\u5E8F\u5305\u548C\u6A21\u5757\u7684 API\u3002
+main.opt.protected.desc=显示受保护/公共类型和成员 (默认设置)。对于\n命名模块, 显示导出的程序包和模块的 API。
 
-main.opt.package.desc=\u663E\u793A\u7A0B\u5E8F\u5305/\u53D7\u4FDD\u62A4/\u516C\u5171\u7C7B\u578B\u548C\u6210\u5458\u3002\u5BF9\u4E8E \n\u547D\u540D\u6A21\u5757, \u663E\u793A\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u6240\u6709\u6A21\u5757\u8BE6\u7EC6\u4FE1\u606F\u3002
+main.opt.package.desc=显示程序包/受保护/公共类型和成员。对于 \n命名模块, 显示所有程序包和所有模块详细信息。
 
-main.opt.private.desc=\u663E\u793A\u6240\u6709\u7C7B\u578B\u548C\u6210\u5458\u3002\u5BF9\u4E8E\u547D\u540D\u6A21\u5757,\n\u663E\u793A\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u6240\u6709\u6A21\u5757\u8BE6\u7EC6\u4FE1\u606F\u3002
+main.opt.private.desc=显示所有类型和成员。对于命名模块,\n显示所有程序包和所有模块详细信息。
 
-main.opt.show.members.arg=<\u503C>
-main.opt.show.members.desc=\u6307\u5B9A\u5C06\u6587\u6863\u5316\u7684\u6210\u5458 (\u5B57\u6BB5, \u65B9\u6CD5\u7B49), \u5176\u503C\u53EF\u4EE5\n\u4E3A "public", "protected", "package" \u6216 \n"private" \u4E4B\u4E00\u3002\u9ED8\u8BA4\u503C\u4E3A "protected", \u8BE5\u503C\u5C06\n\u663E\u793A\u516C\u5171\u548C\u53D7\u4FDD\u62A4\u6210\u5458, "public" \u5C06\u4EC5\u663E\u793A\n\u516C\u5171\u6210\u5458, "package" \u5C06\u663E\u793A\u516C\u5171, \u53D7\u4FDD\u62A4\u548C\n\u7A0B\u5E8F\u5305\u6210\u5458, "private" \u5C06\u663E\u793A\u6240\u6709\u6210\u5458\u3002
+main.opt.show.members.arg=<值>
+main.opt.show.members.desc=指定将文档化的成员 (字段, 方法等), 其值可以\n为 "public", "protected", "package" 或 \n"private" 之一。默认值为 "protected", 该值将\n显示公共和受保护成员, "public" 将仅显示\n公共成员, "package" 将显示公共, 受保护和\n程序包成员, "private" 将显示所有成员。
 
-main.opt.show.types.arg=<\u503C>
-main.opt.show.types.desc=\u6307\u5B9A\u5C06\u6587\u6863\u5316\u7684\u7C7B\u578B (\u7C7B, \u63A5\u53E3\u7B49), \u5176\u503C\u53EF\u4EE5\n\u4E3A "public", "protected", "package" \u6216 \n"private" \u4E4B\u4E00\u3002\u9ED8\u8BA4\u503C\u4E3A "protected", \u8BE5\u503C\u5C06\n\u663E\u793A\u516C\u5171\u548C\u53D7\u4FDD\u62A4\u7C7B\u578B, "public" \u5C06\u4EC5\u663E\u793A\n\u516C\u5171\u7C7B\u578B, "package" \u5C06\u663E\u793A\u516C\u5171, \u53D7\u4FDD\u62A4\u548C\n\u7A0B\u5E8F\u5305\u7C7B\u578B, "private" \u5C06\u663E\u793A\u6240\u6709\u7C7B\u578B\u3002
+main.opt.show.types.arg=<值>
+main.opt.show.types.desc=指定将文档化的类型 (类, 接口等), 其值可以\n为 "public", "protected", "package" 或 \n"private" 之一。默认值为 "protected", 该值将\n显示公共和受保护类型, "public" 将仅显示\n公共类型, "package" 将显示公共, 受保护和\n程序包类型, "private" 将显示所有类型。
 
-main.opt.show.packages.arg=<\u503C>
-main.opt.show.packages.desc=\u6307\u5B9A\u5C06\u6587\u6863\u5316\u7684\u6A21\u5757\u7684\u7A0B\u5E8F\u5305\u3002\n\u53EF\u80FD\u7684\u503C\u4E3A "exported" \u6216 "all" \u7A0B\u5E8F\u5305\u3002
+main.opt.show.packages.arg=<值>
+main.opt.show.packages.desc=指定将文档化的模块的程序包。\n可能的值为 "exported" 或 "all" 程序包。
 
-main.opt.show.module.contents.arg=<\u503C>
-main.opt.show.module.contents.desc=\u6307\u5B9A\u6A21\u5757\u58F0\u660E\u7684\u6587\u6863\u7C92\u5EA6\u3002\n\u53EF\u80FD\u7684\u503C\u4E3A "api" \u6216 "all"\u3002
+main.opt.show.module.contents.arg=<值>
+main.opt.show.module.contents.desc=指定模块声明的文档粒度。\n可能的值为 "api" 或 "all"。
 
-main.opt.expand.requires.arg=<\u503C>
-main.opt.expand.requires.desc=\u6307\u793A\u5DE5\u5177\u5C55\u5F00\u8981\u6587\u6863\u5316\u7684\u6A21\u5757\u96C6\u3002\n\u9ED8\u8BA4\u60C5\u51B5\u4E0B, \u5C06\u4EC5\u6587\u6863\u5316\u547D\u4EE4\u884C\u4E2D\u660E\u786E\n\u6307\u5B9A\u7684\u6A21\u5757\u3002\u503C "transitive" \u5C06\u989D\u5916\u5305\u542B\n\u8FD9\u4E9B\u6A21\u5757\u7684\u6240\u6709 "requires transitive"\n\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\u503C "all" \u5C06\u5305\u542B\u8FD9\u4E9B\u6A21\u5757\n\u7684\u6240\u6709\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
+main.opt.expand.requires.arg=<值>
+main.opt.expand.requires.desc=指示工具展开要文档化的模块集。\n默认情况下, 将仅文档化命令行中明确\n指定的模块。值 "transitive" 将额外包含\n这些模块的所有 "requires transitive"\n被依赖对象。值 "all" 将包含这些模块\n的所有被依赖对象。
 
-main.opt.help.desc=\u663E\u793A\u547D\u4EE4\u884C\u9009\u9879\u5E76\u9000\u51FA
+main.opt.help.desc=显示命令行选项并退出
 
-main.opt.module.arg=<\u6A21\u5757>(,<\u6A21\u5757>)*
-main.opt.module.desc=\u6587\u6863\u5316\u6307\u5B9A\u6A21\u5757
+main.opt.module.arg=<模块>(,<模块>)*
+main.opt.module.desc=文档化指定模块
 
-main.opt.doclet.arg=<\u7C7B>
-main.opt.doclet.desc=\u901A\u8FC7\u66FF\u4EE3 doclet \u751F\u6210\u8F93\u51FA
+main.opt.doclet.arg=<类>
+main.opt.doclet.desc=通过替代 doclet 生成输出
 
-main.opt.docletpath.arg=<\u8DEF\u5F84>
-main.opt.docletpath.desc=\u6307\u5B9A\u67E5\u627E doclet \u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
+main.opt.docletpath.arg=<路径>
+main.opt.docletpath.desc=指定查找 doclet 类文件的位置
 
-main.opt.module.source.path.arg=<\u8DEF\u5F84>
-main.opt.module.source.path.desc=\u6307\u5B9A\u67E5\u627E\u591A\u4E2A\u6A21\u5757\u7684\u8F93\u5165\u6E90\u6587\u4EF6\u7684\u4F4D\u7F6E
+main.opt.module.source.path.arg=<路径>
+main.opt.module.source.path.desc=指定查找多个模块的输入源文件的位置
 
-main.opt.upgrade.module.path.arg=<\u8DEF\u5F84>
-main.opt.upgrade.module.path.desc=\u8986\u76D6\u53EF\u5347\u7EA7\u6A21\u5757\u4F4D\u7F6E
+main.opt.upgrade.module.path.arg=<路径>
+main.opt.upgrade.module.path.desc=覆盖可升级模块位置
 
-main.opt.module.path.arg=<\u8DEF\u5F84>
-main.opt.module.path.desc=\u6307\u5B9A\u67E5\u627E\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u4F4D\u7F6E
+main.opt.module.path.arg=<路径>
+main.opt.module.path.desc=指定查找应用程序模块的位置
 
-main.opt.add.modules.arg=<\u6A21\u5757>(,<\u6A21\u5757>)*
-main.opt.add.modules.desc=\u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757; \n\u5982\u679C <\u6A21\u5757> \u4E3A ALL-MODULE-PATH, \n\u5219\u4E3A\u6A21\u5757\u8DEF\u5F84\u4E2D\u7684\u6240\u6709\u6A21\u5757\u3002
+main.opt.add.modules.arg=<模块>(,<模块>)*
+main.opt.add.modules.desc=除了初始模块之外要解析的根模块; \n如果 <模块> 为 ALL-MODULE-PATH, \n则为模块路径中的所有模块。
 
-main.opt.limit.modules.arg=<\u6A21\u5757>(,<\u6A21\u5757>)*
-main.opt.limit.modules.desc=\u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF
+main.opt.limit.modules.arg=<模块>(,<模块>)*
+main.opt.limit.modules.desc=限制可观察模块的领域
 
-main.opt.source.path.arg=<\u8DEF\u5F84>
-main.opt.source.path.desc=\u6307\u5B9A\u67E5\u627E\u6E90\u6587\u4EF6\u7684\u4F4D\u7F6E
+main.opt.source.path.arg=<路径>
+main.opt.source.path.desc=指定查找源文件的位置
 
-main.opt.class.path.arg=<\u8DEF\u5F84>
-main.opt.class.path.desc=\u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
+main.opt.class.path.arg=<路径>
+main.opt.class.path.desc=指定查找用户类文件的位置
 
-main.opt.exclude.arg=<\u7A0B\u5E8F\u5305\u5217\u8868>
-main.opt.exclude.desc=\u6307\u5B9A\u8981\u6392\u9664\u7684\u7A0B\u5E8F\u5305\u5217\u8868
+main.opt.exclude.arg=<程序包列表>
+main.opt.exclude.desc=指定要排除的程序包列表
 
-main.opt.subpackages.arg=<\u5B50\u7A0B\u5E8F\u5305\u5217\u8868>
-main.opt.subpackages.desc=\u6307\u5B9A\u8981\u9012\u5F52\u52A0\u8F7D\u7684\u5B50\u7A0B\u5E8F\u5305
+main.opt.subpackages.arg=<子程序包列表>
+main.opt.subpackages.desc=指定要递归加载的子程序包
 
-main.opt.breakiterator.desc=\u8BA1\u7B97\u5E26\u6709 BreakIterator \u7684\u7B2C\u4E00\u4E2A\u8BED\u53E5
+main.opt.breakiterator.desc=计算带有 BreakIterator 的第一个语句
 
-main.opt.bootclasspath.arg=<\u8DEF\u5F84>
-main.opt.bootclasspath.desc=\u8986\u76D6\u7528\u4E8E\u975E\u6A21\u5757\u5316\u53D1\u884C\u7248\u7684\n\u5E73\u53F0\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
+main.opt.bootclasspath.arg=<路径>
+main.opt.bootclasspath.desc=覆盖用于非模块化发行版的\n平台类文件的位置
 
 main.opt.system.arg=<jdk>
-main.opt.system.desc=\u8986\u76D6\u7528\u4E8E\u6A21\u5757\u5316\u53D1\u884C\u7248\u7684\u7CFB\u7EDF\u6A21\u5757\u7684\u4F4D\u7F6E
+main.opt.system.desc=覆盖用于模块化发行版的系统模块的位置
 
-main.opt.release.arg=<\u53D1\u884C\u7248>
-main.opt.release.desc=\u63D0\u4F9B\u4E0E\u6307\u5B9A\u53D1\u884C\u7248\u7684\u6E90\u517C\u5BB9\u6027
+main.opt.release.arg=<发行版>
+main.opt.release.desc=提供与指定发行版的源兼容性
 
-main.opt.source.arg=<\u53D1\u884C\u7248>
-main.opt.source.desc=\u63D0\u4F9B\u4E0E\u6307\u5B9A\u53D1\u884C\u7248\u7684\u6E90\u517C\u5BB9\u6027
+main.opt.source.arg=<发行版>
+main.opt.source.desc=提供与指定发行版的源兼容性
 
-main.opt.enable.preview.desc=\u542F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002\u4E0E -source \u6216 --release \n\u4E00\u8D77\u4F7F\u7528\u3002
+main.opt.enable.preview.desc=启用预览语言功能。与 -source 或 --release \n一起使用。
 
-main.opt.extdirs.arg=<\u76EE\u5F55\u5217\u8868>
-main.opt.extdirs.desc=\u8986\u76D6\u6240\u5B89\u88C5\u6269\u5C55\u7684\u4F4D\u7F6E
+main.opt.extdirs.arg=<目录列表>
+main.opt.extdirs.desc=覆盖所安装扩展的位置
 
-main.opt.verbose.desc=\u8F93\u51FA\u6709\u5173 Javadoc \u6B63\u5728\u6267\u884C\u7684\u64CD\u4F5C\u7684\u6D88\u606F
+main.opt.verbose.desc=输出有关 Javadoc 正在执行的操作的消息
 
-main.opt.locale.arg=<\u540D\u79F0>
-main.opt.locale.desc=\u8981\u4F7F\u7528\u7684\u533A\u57DF\u8BBE\u7F6E, \u4F8B\u5982, en_US \u6216 en_US_WIN
+main.opt.locale.arg=<名称>
+main.opt.locale.desc=要使用的区域设置, 例如, en_US 或 en_US_WIN
 
-main.opt.encoding.arg=<\u540D\u79F0>
-main.opt.encoding.desc=\u6E90\u6587\u4EF6\u7F16\u7801\u540D\u79F0
+main.opt.encoding.arg=<名称>
+main.opt.encoding.desc=源文件编码名称
 
-main.opt.quiet.desc=\u4E0D\u663E\u793A\u72B6\u6001\u6D88\u606F
+main.opt.quiet.desc=不显示状态消息
 
-main.opt.version.desc=\u8F93\u51FA\u7248\u672C\u4FE1\u606F
+main.opt.version.desc=输出版本信息
 
-main.opt.J.arg=<\u6807\u8BB0>
-main.opt.J.desc=\u76F4\u63A5\u5C06 <\u6807\u8BB0> \u4F20\u9012\u7ED9\u8FD0\u884C\u65F6\u7CFB\u7EDF
+main.opt.J.arg=<标记>
+main.opt.J.desc=直接将 <标记> 传递给运行时系统
 
-main.opt.help.extra.desc=\u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u63D0\u8981\u5E76\u9000\u51FA
+main.opt.help.extra.desc=输出非标准选项的提要并退出
 
-main.opt.Werror.desc=\u5982\u679C\u51FA\u73B0\u4EFB\u4F55\u8B66\u544A\uFF0C\u5C06\u62A5\u544A\u9519\u8BEF
+main.opt.Werror.desc=如果出现任何警告，将报告错误
 
-main.usage.foot=\nGNU \u6837\u5F0F\u7684\u9009\u9879\u53EF\u4F7F\u7528 '=' (\u800C\u975E\u7A7A\u767D) \u6765\u5206\u9694\u9009\u9879\u540D\u79F0\n\u53CA\u5176\u503C\u3002\n
+main.usage.foot=\nGNU 样式的选项可使用 '=' (而非空白) 来分隔选项名称\n及其值。\n
 
 main.Xusage=
 
-main.opt.Xmaxerrs.arg=<\u6570\u5B57>
-main.opt.Xmaxerrs.desc=\u8BBE\u7F6E\u8981\u8F93\u51FA\u7684\u9519\u8BEF\u7684\u6700\u5927\u6570\u76EE
-
-main.opt.Xmaxwarns.arg=<\u6570\u5B57>
-main.opt.Xmaxwarns.desc=\u8BBE\u7F6E\u8981\u8F93\u51FA\u7684\u8B66\u544A\u7684\u6700\u5927\u6570\u76EE
-
-main.opt.add.exports.arg=<\u6A21\u5757>/<\u7A0B\u5E8F\u5305>=<\u5176\u4ED6\u6A21\u5757>(,<\u5176\u4ED6\u6A21\u5757>)*
-main.opt.add.exports.desc=\u6307\u5B9A\u88AB\u89C6\u4E3A\u5DF2\u4ECE\u5176\u5B9A\u4E49\u6A21\u5757\u5BFC\u51FA\u5230\u5176\u4ED6\u6A21\u5757\n\u6216\u8005\u5BFC\u51FA\u5230\u6240\u6709\u672A\u547D\u540D\u6A21\u5757 (\u5982\u679C <\u5176\u4ED6\u6A21\u5757> \n\u4E3A ALL-UNNAMED) \u7684\u7A0B\u5E8F\u5305
-
-main.opt.add.reads.arg=<\u6A21\u5757>=<\u5176\u4ED6\u6A21\u5757>(,<\u5176\u4ED6\u6A21\u5757>)*
-main.opt.add.reads.desc=\u6307\u5B9A\u88AB\u89C6\u4E3A\u7ED9\u5B9A\u6A21\u5757\u9700\u8981\u7684\u5176\u4ED6\u6A21\u5757\u3002\n<\u5176\u4ED6\u6A21\u5757> \u53EF\u4EE5\u4E3A ALL-UNNAMED \n\u4EE5\u4FBF\u8981\u6C42\u672A\u547D\u540D\u6A21\u5757\u3002
-
-main.opt.patch.module.arg=<\u6A21\u5757>=<\u6587\u4EF6>(:<\u6587\u4EF6>)*
-main.opt.patch.module.desc=\u4F7F\u7528\nJAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\u8986\u76D6\n        \u6216\u589E\u5F3A\u6A21\u5757
-
-main.Xusage.foot=\n\u8FD9\u4E9B\u9009\u9879\u90FD\u662F\u975E\u6807\u51C6\u9009\u9879, \u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002
-
-main.doclet.usage.header=\n\u7531 {0} doclet \u63D0\u4F9B:
-
-main.requires_argument=\u9009\u9879{0}\u9700\u8981\u53C2\u6570\u3002
-main.unnecessary_arg_provided=\u9009\u9879 {0} \u4E0D\u9700\u8981\u53C2\u6570
-main.only_one_argument_with_equals=\u4E0D\u80FD\u5C06 ''='' \u8BED\u6CD5\u7528\u4E8E\u9700\u8981\u591A\u4E2A\u53C2\u6570\u7684\u9009\u9879
-main.invalid_flag=\u65E0\u6548\u7684\u6807\u8BB0: {0}
-main.No_modules_packages_or_classes_specified=\u672A\u6307\u5B9A\u6A21\u5757, \u7A0B\u5E8F\u5305\u6216\u7C7B\u3002
-main.module_not_found=\u672A\u627E\u5230\u6A21\u5757 {0}
-main.module_source_not_found=\u627E\u4E0D\u5230\u6A21\u5757 {0} \u7684\u6E90\u6587\u4EF6
-main.cannot_use_sourcepath_for_modules=\u65E0\u6CD5\u5C06\u6E90\u8DEF\u5F84\u7528\u4E8E\u591A\u4E2A\u6A21\u5757 {0}
-main.module_not_found_on_sourcepath=\u5728\u6E90\u8DEF\u5F84\u4E2D\u627E\u4E0D\u5230\u6A21\u5757 {0}
-main.sourcepath_does_not_contain_module=\u6E90\u8DEF\u5F84\u4E0D\u5305\u542B\u6A21\u5757 {0}
-main.cant.read=\u65E0\u6CD5\u8BFB\u53D6{0}
-main.Loading_source_files_for_package=\u6B63\u5728\u52A0\u8F7D\u7A0B\u5E8F\u5305{0}\u7684\u6E90\u6587\u4EF6...
-main.Loading_source_file=\u6B63\u5728\u52A0\u8F7D\u6E90\u6587\u4EF6{0}...
-main.Building_tree=\u6B63\u5728\u6784\u9020 Javadoc \u4FE1\u606F...
-main.no_source_files_for_package=\u6CA1\u6709\u7A0B\u5E8F\u5305{0}\u7684\u6E90\u6587\u4EF6
-main.package_not_found=\u627E\u4E0D\u5230\u5305{0}
-main.fatal.error=\u9047\u5230\u81F4\u547D\u9519\u8BEF: {0}
-main.out.of.memory=java.lang.OutOfMemoryError: \u8BF7\u589E\u5927\u5185\u5B58\u3002\n\u4F8B\u5982, \u5BF9\u4E8E JDK \u7ECF\u5178\u6216 HotSpot VM, \u8BF7\u589E\u5927\u9009\u9879 -J-Xmx,\n\u4F8B\u5982 -J-Xmx32m\u3002
-main.done_in=[\u5728 {0} \u6BEB\u79D2\u5185\u5B8C\u6210]
-main.more_than_one_doclet_specified_0_and_1=\u6307\u5B9A\u4E86\u591A\u4E2A doclet ({0}\u548C{1})\u3002
-main.doclet_could_not_get_location=\u65E0\u6CD5\u83B7\u53D6 {0} \u7684\u4F4D\u7F6E
-main.doclet_could_not_set_location=\u65E0\u6CD5\u8BBE\u7F6E {0} \u7684\u4F4D\u7F6E
-main.doclet_no_classloader_found=\u65E0\u6CD5\u83B7\u53D6\u7C7B\u52A0\u8F7D\u5668\u6765\u52A0\u8F7D {0}
-main.could_not_instantiate_class=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u7C7B {0}
-main.doclet_class_not_found=\u627E\u4E0D\u5230 doclet \u7C7B{0}
-main.malformed_locale_name=\u683C\u5F0F\u9519\u8BEF\u7684\u8BED\u8A00\u73AF\u5883\u540D\u79F0: {0}
-main.file_not_found=\u627E\u4E0D\u5230\u6587\u4EF6: "{0}"
-main.illegal_class_name=\u975E\u6CD5\u7C7B\u540D: "{0}"
-main.illegal_package_name=\u975E\u6CD5\u7684\u7A0B\u5E8F\u5305\u540D\u79F0: "{0}"
-main.illegal_option_value=\u975E\u6CD5\u9009\u9879\u503C: "{0}"
-main.file.manager.list=\u5217\u51FA\u6587\u4EF6\u65F6 FileManager \u51FA\u9519: "{0}"
-main.assertion.error=\u65AD\u8A00\u5931\u8D25\uFF1A"{0}"
-main.warnings.Werror=\u53D1\u73B0\u8B66\u544A, \u4F46\u6307\u5B9A\u4E86 -Werror
-main.unknown.error=\u51FA\u73B0\u672A\u77E5\u9519\u8BEF
-main.internal.error=\u51FA\u73B0\u5185\u90E8\u9519\u8BEF
-main.unexpected.exception=\u6355\u83B7\u5230\u610F\u5916\u7684\u5F02\u5E38\u9519\u8BEF: {0}
-main.unknown.option.for.filemanager=\u9009\u9879\u4E0D\u53D7\u6587\u4EF6\u7BA1\u7406\u5668\u652F\u6301\uFF1A{0}
-main.bad.arg.for.filemanager.option=\u6587\u4EF6\u7BA1\u7406\u5668\u9009\u9879 {0} \u7684\u503C\u9519\u8BEF\uFF1A"{1}"
-doclet.internal.report.bug=\u5982\u679C\u5728 Bug Database (https://bugs.java.com) \u4E2D\u6CA1\u6709\u627E\u5230\u6709\u5173\u8BE5\u9519\u8BEF\u7684 javadoc \u5DE5\u5177 Bug\uFF0C\n\u8BF7\u901A\u8FC7 Java Bug \u62A5\u544A\u9875 (https://bugreport.java.com) \u63D0\u4EA4 javadoc \u5DE5\u5177 Bug\u3002\n\u8BF7\u5728\u62A5\u544A\u4E2D\u9644\u4E0A\u9519\u8BEF\u6D88\u606F\u548C\u4EE5\u4E0B\u8BCA\u65AD\u4FE1\u606F\u3002\u8C22\u8C22\u3002
-main.not_a_doclet=\u7C7B {0} \u4E0D\u662F\u6709\u6548 doclet\u3002\n\u6CE8\u610F\uFF1A\u4ECE JDK 13 \u5F00\u59CB\uFF0C\u4E0D\u518D\u652F\u6301 com.sun.javadoc API\u3002
-
-javadoc.class_not_found=\u627E\u4E0D\u5230\u7C7B{0}\u3002
+main.opt.Xmaxerrs.arg=<数字>
+main.opt.Xmaxerrs.desc=设置要输出的错误的最大数目
+
+main.opt.Xmaxwarns.arg=<数字>
+main.opt.Xmaxwarns.desc=设置要输出的警告的最大数目
+
+main.opt.add.exports.arg=<模块>/<程序包>=<其他模块>(,<其他模块>)*
+main.opt.add.exports.desc=指定被视为已从其定义模块导出到其他模块\n或者导出到所有未命名模块 (如果 <其他模块> \n为 ALL-UNNAMED) 的程序包
+
+main.opt.add.reads.arg=<模块>=<其他模块>(,<其他模块>)*
+main.opt.add.reads.desc=指定被视为给定模块需要的其他模块。\n<其他模块> 可以为 ALL-UNNAMED \n以便要求未命名模块。
+
+main.opt.patch.module.arg=<模块>=<文件>(:<文件>)*
+main.opt.patch.module.desc=使用\nJAR 文件或目录中的类和资源覆盖\n        或增强模块
+
+main.Xusage.foot=\n这些选项都是非标准选项, 如有更改, 恕不另行通知。
+
+main.doclet.usage.header=\n由 {0} doclet 提供:
+
+main.requires_argument=选项{0}需要参数。
+main.unnecessary_arg_provided=选项 {0} 不需要参数
+main.only_one_argument_with_equals=不能将 ''='' 语法用于需要多个参数的选项
+main.invalid_flag=无效的标记: {0}
+main.No_modules_packages_or_classes_specified=未指定模块, 程序包或类。
+main.module_not_found=未找到模块 {0}
+main.module_source_not_found=找不到模块 {0} 的源文件
+main.cannot_use_sourcepath_for_modules=无法将源路径用于多个模块 {0}
+main.module_not_found_on_sourcepath=在源路径中找不到模块 {0}
+main.sourcepath_does_not_contain_module=源路径不包含模块 {0}
+main.cant.read=无法读取{0}
+main.Loading_source_files_for_package=正在加载程序包{0}的源文件...
+main.Loading_source_file=正在加载源文件{0}...
+main.Building_tree=正在构造 Javadoc 信息...
+main.no_source_files_for_package=没有程序包{0}的源文件
+main.package_not_found=找不到包{0}
+main.fatal.error=遇到致命错误: {0}
+main.out.of.memory=java.lang.OutOfMemoryError: 请增大内存。\n例如, 对于 JDK 经典或 HotSpot VM, 请增大选项 -J-Xmx,\n例如 -J-Xmx32m。
+main.done_in=[在 {0} 毫秒内完成]
+main.more_than_one_doclet_specified_0_and_1=指定了多个 doclet ({0}和{1})。
+main.doclet_could_not_get_location=无法获取 {0} 的位置
+main.doclet_could_not_set_location=无法设置 {0} 的位置
+main.doclet_no_classloader_found=无法获取类加载器来加载 {0}
+main.could_not_instantiate_class=无法实例化类 {0}
+main.doclet_class_not_found=找不到 doclet 类{0}
+main.malformed_locale_name=格式错误的语言环境名称: {0}
+main.file_not_found=找不到文件: "{0}"
+main.illegal_class_name=非法类名: "{0}"
+main.illegal_package_name=非法的程序包名称: "{0}"
+main.illegal_option_value=非法选项值: "{0}"
+main.file.manager.list=列出文件时 FileManager 出错: "{0}"
+main.assertion.error=断言失败："{0}"
+main.warnings.Werror=发现警告, 但指定了 -Werror
+main.unknown.error=出现未知错误
+main.internal.error=出现内部错误
+main.unexpected.exception=捕获到意外的异常错误: {0}
+main.unknown.option.for.filemanager=选项不受文件管理器支持：{0}
+main.bad.arg.for.filemanager.option=文件管理器选项 {0} 的值错误："{1}"
+doclet.internal.report.bug=如果在 Bug Database (https://bugs.java.com) 中没有找到有关该错误的 javadoc 工具 Bug，\n请通过 Java Bug 报告页 (https://bugreport.java.com) 提交 javadoc 工具 Bug。\n请在报告中附上错误消息和以下诊断信息。谢谢。
+main.not_a_doclet=类 {0} 不是有效 doclet。\n注意：从 JDK 13 开始，不再支持 com.sun.javadoc API。
+
+javadoc.class_not_found=找不到类{0}。
 
 javadoc.version={0} {1}
-javadoc.fullversion={0}\u5B8C\u6574\u7248\u672C "{1}"
+javadoc.fullversion={0}完整版本 "{1}"
 
 javadoc.err.message={0}
 javadoc.warn.message={0}
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
index 0df306e2cff..b0efddf5ed3 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
@@ -56,14 +56,14 @@ BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=Umschalten, um mehr oder weniger
 CPU_USAGE=CPU-Auslastung
 CPU_USAGE_FORMAT=CPU-Auslastung: {0} %
 CANCEL=Abbrechen
-CASCADE=&\u00DCberlappend
+CASCADE=&Überlappend
 CHART_COLON=&Diagramm:
 CLASS_PATH=Classpath
 CLASS_NAME=ClassName
 CLASS_TAB_INFO_LABEL_FORMAT=<html>Geladen: {0}    Entfernt: {1}    Gesamt: {2}</html>
-CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=Diagramm f\u00FCr geladene Klassen.
+CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=Diagramm für geladene Klassen.
 CLASSES=Klassen
-CLOSE=Schlie\u00DFen
+CLOSE=Schließen
 COLUMN_NAME=Name
 COLUMN_PID=PID
 COMMITTED_MEMORY=Festgeschriebener Speicher
@@ -83,7 +83,7 @@ CONNECTION_NAME=Verbindungsname
 CONNECTION_NAME__DISCONNECTED_={0} (getrennt)
 CONSTRUCTOR=Konstruktor
 CURRENT_CLASSES_LOADED=Aktuell geladene Klassen
-CURRENT_HEAP_SIZE=Aktuelle Heap-Gr\u00F6\u00DFe
+CURRENT_HEAP_SIZE=Aktuelle Heap-Größe
 CURRENT_VALUE=Aktueller Wert: {0}
 CREATE=Erstellen
 DAEMON_THREADS=Daemon-Threads
@@ -95,7 +95,7 @@ DESCRIPTOR=Deskriptor
 DETAILS=Details
 DETECT_DEADLOCK=&Deadlock ermitteln
 DETECT_DEADLOCK_TOOLTIP=Sich gegenseitig blockierende Threads erkennen
-DIMENSION_IS_NOT_SUPPORTED_COLON=Dimension wird nicht unterst\u00FCtzt:
+DIMENSION_IS_NOT_SUPPORTED_COLON=Dimension wird nicht unterstützt:
 DISCARD_CHART=Diagramm verwerfen
 DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer} Tag |1.0<{0,number,integer} Tage }{1,choice,0<{1,number,integer} Stunden |1#{1,number,integer} Stunde |1<{1,number,integer} Stunden }{2,choice,0<{2,number,integer} Minuten|1#{2,number,integer} Minute|1.0<{2,number,integer} Minuten}
 DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer} Stunde |1<{0,number,integer} Stunden }{1,choice,0<{1,number,integer} Minuten|1#{1,number,integer} Minute|1.0<{1,number,integer} Minuten}
@@ -109,7 +109,7 @@ EVENT=Ereignis
 EXIT=B&eenden
 FAIL_TO_LOAD_PLUGIN=Warnung: Fehler beim Laden von Plug-in: {0}
 FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=Abbrechen
-FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>Datei ist bereits vorhanden:<br>{0}<br>M\u00F6chten Sie sie ersetzen?
+FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>Datei ist bereits vorhanden:<br>{0}<br>Möchten Sie sie ersetzen?
 FILE_CHOOSER_FILE_EXISTS_OK_OPTION=Ersetzen
 FILE_CHOOSER_FILE_EXISTS_TITLE=Datei vorhanden
 FILE_CHOOSER_SAVED_FILE=<html>Gespeichert in Datei:<br>{0}<br>({1} Byte)
@@ -120,7 +120,7 @@ FREE_SWAP_SPACE=Freier Swap-Bereich
 GARBAGE_COLLECTOR=Garbage Collector
 GC_INFO=Name = "{0}", Collections = {1,choice,-1#Unavailable|0#{1,number,integer}}, Insgesamt aufgewendete Zeit = {2}
 GC_TIME=GC-Zeit
-GC_TIME_DETAILS={0} f\u00FCr {1} ({2} Collections)
+GC_TIME_DETAILS={0} für {1} ({2} Collections)
 HEAP_MEMORY_USAGE=Heap-Nutzung
 HEAP=Heap
 HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=Dialogfeld mit Informationen zu den Versionen von JConsole und JDK
@@ -139,8 +139,8 @@ IMPACT=Auswirkung
 INFO=Information
 INFO_CAPITALIZED=INFO
 INSECURE=Unsichere Verbindung
-INVALID_PLUGIN_PATH=Warnung: Ung\u00FCltiger Plug-in-Pfad: {0}
-INVALID_URL=Ung\u00FCltige URL: {0}
+INVALID_PLUGIN_PATH=Warnung: Ungültiger Plug-in-Pfad: {0}
+INVALID_URL=Ungültige URL: {0}
 IS=Ist
 JAVA_MONITORING___MANAGEMENT_CONSOLE=Java-Monitoring- und Managementkonsole
 JCONSOLE_COLON_=JConsole: {0}
@@ -152,15 +152,15 @@ LIVE_THREADS=Livethreads
 LOADED=Geladen
 LOCAL_PROCESS_COLON=&Lokaler Prozess:
 MASTHEAD_FONT=Dialog-PLAIN-25
-MANAGEMENT_NOT_ENABLED=<b>Hinweis</b>: Der Management Agent ist f\u00FCr diesen Prozess nicht aktiviert.
-MANAGEMENT_WILL_BE_ENABLED=<b>Hinweis</b>: Der Management Agent wird f\u00FCr diesen Prozess aktiviert.
+MANAGEMENT_NOT_ENABLED=<b>Hinweis</b>: Der Management Agent ist für diesen Prozess nicht aktiviert.
+MANAGEMENT_WILL_BE_ENABLED=<b>Hinweis</b>: Der Management Agent wird für diesen Prozess aktiviert.
 MBEAN_ATTRIBUTE_INFO=MBeanAttributeInfo
 MBEAN_INFO=MBeanInfo
 MBEAN_NOTIFICATION_INFO=MBeanNotificationInfo
 MBEAN_OPERATION_INFO=MBeanOperationInfo
 MBEANS=MBeans
-MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=L\u00F6s&chen
-MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=Benachrichtigungen l\u00F6schen
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=Lös&chen
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=Benachrichtigungen löschen
 MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=Composite-Datennavigation {0}/{1}
 MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=Composite-Datennavigation
 MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=Ak&tualisieren
@@ -169,20 +169,20 @@ MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=&Abonnieren
 MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=Listening auf Benachrichtigungen starten
 MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=Tabellendatennavigation {0}/{1}
 MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=Tabellendatennavigation
-MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=Abonnement &k\u00FCndigen
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=Abonnement &kündigen
 MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=Listening auf Benachrichtigungen stoppen
 MANAGE_HOTSPOT_MBEANS_IN_COLON_=Hotspot-MBeans verwalten in:
 MAX=Max.
-MAXIMUM_HEAP_SIZE=Maximale Heap-Gr\u00F6\u00DFe
+MAXIMUM_HEAP_SIZE=Maximale Heap-Größe
 MEMORY=Arbeitsspeicher
 MEMORY_POOL_LABEL=Memory-Pool "{0}"
-MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm f\u00FCr Heap.
+MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm für Heap.
 MEMORY_TAB_INFO_LABEL_FORMAT=<html>Belegt: {0}    Festgeschrieben: {1}    Max: {2}</html>
-MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm f\u00FCr Nicht-Heap.
-MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD=was \u00FCber dem Schwellenwert {0} liegt.\n
+MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm für Nicht-Heap.
+MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD=was über dem Schwellenwert {0} liegt.\n
 MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=Memory-Poolbelegungsdiagramm.
 MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD=was unter dem Schwellenwert {0} liegt.\n
-MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm f\u00FCr {0}.
+MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm für {0}.
 MESSAGE=Meldung
 METHOD_SUCCESSFULLY_INVOKED=Methode erfolgreich aufgerufen
 MINIMIZE_ALL=Alle &minimieren
@@ -191,7 +191,7 @@ NAME=Name
 NAME_AND_BUILD={0} (Build {1})
 NAME_STATE=Name: {0}\nStatus: {1}\n
 NAME_STATE_LOCK_NAME=Name: {0}\nStatus: {1} auf {2}\n
-NAME_STATE_LOCK_NAME_LOCK_OWNER=Name: {0}\nStatus: {1} auf {2}, Eigent\u00FCmer: {3}\n
+NAME_STATE_LOCK_NAME_LOCK_OWNER=Name: {0}\nStatus: {1} auf {2}, Eigentümer: {3}\n
 NEW_CONNECTION_ELLIPSIS=&Neue Verbindung...
 NO_DEADLOCK_DETECTED=Kein Deadlock ermittelt
 NON_HEAP_MEMORY_USAGE=Nicht-Heap-Speicherauslastung
@@ -207,15 +207,15 @@ OBJECT_NAME=ObjectName
 OPERATING_SYSTEM=Betriebssystem
 OPERATION=Vorgang
 OPERATION_INVOCATION=Vorgangsaufruf
-OPERATION_RETURN_VALUE=R\u00FCckgabewert von Vorgang
-OPERATIONS=Vorg\u00E4nge
-OVERVIEW=\u00DCberblick
-OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME=Diagramm f\u00FCr {0}.
+OPERATION_RETURN_VALUE=Rückgabewert von Vorgang
+OPERATIONS=Vorgänge
+OVERVIEW=Überblick
+OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME=Diagramm für {0}.
 PARAMETER=Parameter
 PASSWORD_ACCESSIBLE_NAME=Kennwort
 PASSWORD_COLON_=&Kennwort:
 PEAK=Spitze
-PERFORM_GC=&GC ausf\u00FChren
+PERFORM_GC=&GC ausführen
 PERFORM_GC_TOOLTIP=Garbage Collection anfordern
 PLOTTER_ACCESSIBLE_NAME=Diagramm
 PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE={0}={1}\n
@@ -225,9 +225,9 @@ PLOTTER_TIME_RANGE_MENU=&Zeitraum
 PLUGIN_EXCEPTION_DIALOG_BUTTON_EXIT=Beenden
 PLUGIN_EXCEPTION_DIALOG_BUTTON_IGNORE=Ignorieren
 PLUGIN_EXCEPTION_DIALOG_BUTTON_OK=OK
-PLUGIN_EXCEPTION_DIALOG_MESSAGE=Eine unerwartete Ausnahme ist aufgetreten in %s:\n\n%s\n\nBeginnen Sie mit -debug, um Details aufzurufen. Durch Ignorieren werden zuk\u00FCnftige Ausnahmen unterdr\u00FCckt.
+PLUGIN_EXCEPTION_DIALOG_MESSAGE=Eine unerwartete Ausnahme ist aufgetreten in %s:\n\n%s\n\nBeginnen Sie mit -debug, um Details aufzurufen. Durch Ignorieren werden zukünftige Ausnahmen unterdrückt.
 PLUGIN_EXCEPTION_DIALOG_TITLE=Plug-in-Ausnahme
-PROBLEM_ADDING_LISTENER=Problem beim Hinzuf\u00FCgen von Listener
+PROBLEM_ADDING_LISTENER=Problem beim Hinzufügen von Listener
 PROBLEM_DISPLAYING_MBEAN=Problem beim Anzeigen von MBean
 PROBLEM_INVOKING=Problem beim Aufrufen
 PROBLEM_REMOVING_LISTENER=Problem beim Entfernen von Listener
@@ -249,13 +249,13 @@ STACK_TRACE=\nStacktrace: \n
 SUMMARY_TAB_HEADER_DATE_TIME_FORMAT=FULL,FULL
 SUMMARY_TAB_PENDING_FINALIZATION_LABEL=Beenden ausstehend
 SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0} Objekte
-SUMMARY_TAB_TAB_NAME=VM-\u00DCbersicht
+SUMMARY_TAB_TAB_NAME=VM-Übersicht
 SUMMARY_TAB_VM_VERSION={0} Version {1}
 THREADS=Threads
 THREAD_TAB_INFO_LABEL_FORMAT=<html>Live: {0}    Spitze: {1}    Gesamt: {2}</html>
 THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=Threadinformationen
-THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=Diagramm f\u00FCr Threadanzahl.
-THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[Kein Thread ausgew\u00E4hlt]
+THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=Diagramm für Threadanzahl.
+THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[Kein Thread ausgewählt]
 THRESHOLD=Schwellenwert
 TILE=&Nebeneinander
 TIME_RANGE_COLON=&Zeitraum:
@@ -269,7 +269,7 @@ TOTAL_PHYSICAL_MEMORY=Physischer Gesamtspeicher
 TOTAL_THREADS_STARTED=Insgesamt gestartete Threads
 TOTAL_SWAP_SPACE=Gesamter Swap-Bereich
 TYPE=Typ
-UNAVAILABLE=Nicht verf\u00FCgbar
+UNAVAILABLE=Nicht verfügbar
 UNKNOWN_CAPITALIZED=UNKNOWN
 UNKNOWN_HOST=Unbekannter Host: {0}
 UNREGISTER=Registrierung aufheben
@@ -282,26 +282,26 @@ USERNAME_ACCESSIBLE_NAME=Benutzername
 USER_DATA=UserData
 VIRTUAL_MACHINE=Virtuelle Maschine
 VM_ARGUMENTS=VM-Argumente
-VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Innerer Frame f\u00FCr die \u00DCberwachung einer Java Virtual Machine
+VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Innerer Frame für die Überwachung einer Java Virtual Machine
 VALUE=Wert
 VENDOR=Hersteller
 VERBOSE_OUTPUT=Verbose-Ausgabe
-VERBOSE_OUTPUT_TOOLTIP=Verbose-Ausgabe f\u00FCr Klassenladesystem aktivieren
+VERBOSE_OUTPUT_TOOLTIP=Verbose-Ausgabe für Klassenladesystem aktivieren
 VIEW=Ansicht
 WINDOW=&Fenster
 WINDOWS=Windows
-WRITABLE=Nicht schreibgesch\u00FCtzt
+WRITABLE=Nicht schreibgeschützt
 CONNECTION_FAILED1=Die Verbindung konnte nicht hergestellt werden: Wiederholen?
-CONNECTION_FAILED2=Die Verbindung {0} war nicht erfolgreich.<br>M\u00F6chten Sie den Vorgang wiederholen?
+CONNECTION_FAILED2=Die Verbindung {0} war nicht erfolgreich.<br>Möchten Sie den Vorgang wiederholen?
 CONNECTION_FAILED_SSL1=Sichere Verbindung war nicht erfolgreich. Unsichere Verbindung versuchen?
-CONNECTION_FAILED_SSL2=Die Verbindung {0} konnte \u00FCber SSL nicht hergestellt werden.<br>M\u00F6chten Sie die Verbindung ohne SSL versuchen?<br>(Benutzername und Kennwort werden im Klartext \u00FCbermittelt.)
+CONNECTION_FAILED_SSL2=Die Verbindung {0} konnte über SSL nicht hergestellt werden.<br>Möchten Sie die Verbindung ohne SSL versuchen?<br>(Benutzername und Kennwort werden im Klartext übermittelt.)
 CONNECTION_LOST1=Verbindung unterbrochen: Erneut verbinden?
 CONNECTING_TO1=Verbindung mit {0}
-CONNECTING_TO2=Sie werden gegenw\u00E4rtig mit {0} verbunden.<br>Dies wird einige Sekunden dauern.
+CONNECTING_TO2=Sie werden gegenwärtig mit {0} verbunden.<br>Dies wird einige Sekunden dauern.
 DEADLOCK_TAB=Deadlock
 DEADLOCK_TAB_N=Deadlock {0}
 EXPAND=einblenden
 KBYTES={0} KB
 PLOT=Darstellung
 VISUALIZE=Visualisieren
-ZZ_USAGE_TEXT=Verwendung: {0} [ -interval=n ] [ -notile ] [ -pluginpath <Pfad> ] [ -version ] [ connection ... ]\n\n  -interval   Legt ein Aktualisierungsintervall von n Sekunden fest (der Standardwert ist 4 Sekunden)\n  -notile     Ordnet die Fenster anfangs nicht nebeneinander an (bei zwei oder mehr Verbindungen)\n  -pluginpath Gibt den Pfad an, in dem jconsole die Plug-ins sucht\n  -version    Gibt die Programmversion aus\n\n  connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n  pid         Prozess-ID eines Zielprozesses\n  host        Name oder IP-Adresse eines Remotehosts\n  port        Portnummer f\u00FCr die Remoteverbindung\n\n  -J          Gibt die Eingabeargumente f\u00FCr die Java Virtual Machine an,\n              auf der jconsole ausgef\u00FChrt wird
+ZZ_USAGE_TEXT=Verwendung: {0} [ -interval=n ] [ -notile ] [ -pluginpath <Pfad> ] [ -version ] [ connection ... ]\n\n  -interval   Legt ein Aktualisierungsintervall von n Sekunden fest (der Standardwert ist 4 Sekunden)\n  -notile     Ordnet die Fenster anfangs nicht nebeneinander an (bei zwei oder mehr Verbindungen)\n  -pluginpath Gibt den Pfad an, in dem jconsole die Plug-ins sucht\n  -version    Gibt die Programmversion aus\n\n  connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n  pid         Prozess-ID eines Zielprozesses\n  host        Name oder IP-Adresse eines Remotehosts\n  port        Portnummer für die Remoteverbindung\n\n  -J          Gibt die Eingabeargumente für die Java Virtual Machine an,\n              auf der jconsole ausgeführt wird
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_ja.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_ja.properties
index d36b8dc9483..172f8bfac0a 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_ja.properties
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_ja.properties
@@ -23,285 +23,285 @@
 # questions.
 #
 
-ONE_DAY=\ 1\u65E5
-ONE_HOUR=\ 1\u6642\u9593
-ONE_MIN=\ 1\u5206
-ONE_MONTH=\ 1\u304B\u6708
-ONE_YEAR=\ 1\u5E74
-TWO_HOURS=\ 2\u6642\u9593
-THREE_HOURS=\ 3\u6642\u9593
-THREE_MONTHS=\ 3\u304B\u6708
-FIVE_MIN=\ 5\u5206
-SIX_HOURS=\ 6\u6642\u9593
-SIX_MONTHS=\ 6\u304B\u6708
-SEVEN_DAYS=\ 7\u65E5
-TEN_MIN=10\u5206
-TWELVE_HOURS=12\u6642\u9593
-THIRTY_MIN=30\u5206
+ONE_DAY=\ 1日
+ONE_HOUR=\ 1時間
+ONE_MIN=\ 1分
+ONE_MONTH=\ 1か月
+ONE_YEAR=\ 1年
+TWO_HOURS=\ 2時間
+THREE_HOURS=\ 3時間
+THREE_MONTHS=\ 3か月
+FIVE_MIN=\ 5分
+SIX_HOURS=\ 6時間
+SIX_MONTHS=\ 6か月
+SEVEN_DAYS=\ 7日
+TEN_MIN=10分
+TWELVE_HOURS=12時間
+THIRTY_MIN=30分
 LESS_THAN=<
 A_LOT_LESS_THAN=<<
 GREATER_THAN=>
 ACTION_CAPITALIZED=ACTION
 ACTION_INFO_CAPITALIZED=ACTION_INFO
-ALL=\u3059\u3079\u3066
-ARCHITECTURE=\u30A2\u30FC\u30AD\u30C6\u30AF\u30C1\u30E3
-ATTRIBUTE=\u5C5E\u6027
-ATTRIBUTE_VALUE=\u5C5E\u6027\u5024
-ATTRIBUTE_VALUES=\u5C5E\u6027\u5024
-ATTRIBUTES=\u5C5E\u6027
-BLANK=\u30D6\u30E9\u30F3\u30AF
-BLOCKED_COUNT_WAITED_COUNT=\u30D6\u30ED\u30C3\u30AF\u6E08\u5408\u8A08: {0}  \u5F85\u6A5F\u6E08\u5408\u8A08: {1}\n
-BOOT_CLASS_PATH=\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9
-BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=\u8868\u793A\u3059\u308B\u60C5\u5831\u91CF\u3092\u5897\u6E1B\u3059\u308B\u30C8\u30B0\u30EB
-CPU_USAGE=CPU\u4F7F\u7528\u7387
-CPU_USAGE_FORMAT=CPU\u4F7F\u7528\u7387: {0}%
-CANCEL=\u53D6\u6D88
-CASCADE=\u91CD\u306D\u3066\u8868\u793A(&C)
-CHART_COLON=\u30C1\u30E3\u30FC\u30C8(&C):
-CLASS_PATH=\u30AF\u30E9\u30B9\u30D1\u30B9
+ALL=すべて
+ARCHITECTURE=アーキテクチャ
+ATTRIBUTE=属性
+ATTRIBUTE_VALUE=属性値
+ATTRIBUTE_VALUES=属性値
+ATTRIBUTES=属性
+BLANK=ブランク
+BLOCKED_COUNT_WAITED_COUNT=ブロック済合計: {0}  待機済合計: {1}\n
+BOOT_CLASS_PATH=ブート・クラスパス
+BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=表示する情報量を増減するトグル
+CPU_USAGE=CPU使用率
+CPU_USAGE_FORMAT=CPU使用率: {0}%
+CANCEL=取消
+CASCADE=重ねて表示(&C)
+CHART_COLON=チャート(&C):
+CLASS_PATH=クラスパス
 CLASS_NAME=ClassName
-CLASS_TAB_INFO_LABEL_FORMAT=<html>\u30ED\u30FC\u30C9\u6E08: {0}    \u672A\u30ED\u30FC\u30C9: {1}    \u5408\u8A08: {2}</html>
-CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=\u30ED\u30FC\u30C9\u6E08\u30AF\u30E9\u30B9\u306E\u30C1\u30E3\u30FC\u30C8\u3002
-CLASSES=\u30AF\u30E9\u30B9
-CLOSE=\u9589\u3058\u308B
-COLUMN_NAME=\u540D\u524D
+CLASS_TAB_INFO_LABEL_FORMAT=<html>ロード済: {0}    未ロード: {1}    合計: {2}</html>
+CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=ロード済クラスのチャート。
+CLASSES=クラス
+CLOSE=閉じる
+COLUMN_NAME=名前
 COLUMN_PID=PID
-COMMITTED_MEMORY=\u30B3\u30DF\u30C3\u30C8\u6E08\u30E1\u30E2\u30EA\u30FC
-COMMITTED_VIRTUAL_MEMORY=\u30B3\u30DF\u30C3\u30C8\u6E08\u4EEE\u60F3\u30E1\u30E2\u30EA\u30FC
-COMMITTED=\u30B3\u30DF\u30C3\u30C8\u6E08
-CONNECT=\u63A5\u7D9A(&C)
-CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=Java\u4EEE\u60F3\u30DE\u30B7\u30F3\u306B\u63A5\u7D9A
-CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=\u30ED\u30FC\u30AB\u30EB\u307E\u305F\u306F\u30EA\u30E2\u30FC\u30C8\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\u65B0\u898F\u63A5\u7D9A\u3092\u884C\u3046\u30C0\u30A4\u30A2\u30ED\u30B0
-CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30DE\u30B9\u30C8\u30D8\u30C3\u30C9\u56F3\u5F62
-CONNECT_DIALOG_MASTHEAD_TITLE=\u65B0\u898F\u63A5\u7D9A
-CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=\u30B9\u30C6\u30FC\u30BF\u30B9\u30FB\u30D0\u30FC
-CONNECT_DIALOG_TITLE=JConsole: \u65B0\u898F\u63A5\u7D9A
-CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=\u63A5\u7D9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u5207\u65AD\u3057\u307E\u3059\u3002
-CONNECTION_FAILED=\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-CONNECTION=\u63A5\u7D9A(&C)
-CONNECTION_NAME=\u63A5\u7D9A\u540D
-CONNECTION_NAME__DISCONNECTED_={0} (\u5207\u65AD\u6E08)
-CONSTRUCTOR=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-CURRENT_CLASSES_LOADED=\u30ED\u30FC\u30C9\u6E08\u306E\u73FE\u5728\u306E\u30AF\u30E9\u30B9
-CURRENT_HEAP_SIZE=\u73FE\u5728\u306E\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA
-CURRENT_VALUE=\u73FE\u5728\u5024: {0}
-CREATE=\u4F5C\u6210
-DAEMON_THREADS=\u30C7\u30FC\u30E2\u30F3\u30FB\u30B9\u30EC\u30C3\u30C9
-DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=\u5207\u65AD\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u63A5\u7D9A\u3057\u307E\u3059\u3002
-DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=\u5C55\u958B\u307E\u305F\u306F\u7E2E\u5C0F\u3059\u308B\u306B\u306F\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044
-DOUBLE_CLICK_TO_VISUALIZE=\u8996\u899A\u5316\u3059\u308B\u306B\u306F\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044
-DESCRIPTION=\u8AAC\u660E
-DESCRIPTOR=\u8A18\u8FF0\u5B50
-DETAILS=\u8A73\u7D30
-DETECT_DEADLOCK=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u306E\u691C\u51FA(&D)
-DETECT_DEADLOCK_TOOLTIP=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u6E08\u30B9\u30EC\u30C3\u30C9\u306E\u691C\u51FA
-DIMENSION_IS_NOT_SUPPORTED_COLON=\u6B21\u5143\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093:
-DISCARD_CHART=\u30C1\u30E3\u30FC\u30C8\u306E\u7834\u68C4
-DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer}\u65E5|1.0<{0,number,integer}\u65E5}{1,choice,0<{1,number,integer}\u6642\u9593|1#{1,number,integer}\u6642\u9593|1<{1,number,integer}\u6642\u9593}{2,choice,0<{2,number,integer}\u5206|1#{2,number,integer}\u5206|1.0<{2,number,integer}\u5206}
-DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer}\u6642\u9593|1<{0,number,integer}\u6642\u9593}{1,choice,0<{1,number,integer}\u5206|1#{1,number,integer}\u5206|1.0<{1,number,integer}\u5206}
-DURATION_MINUTES={0,choice,1#{0,number,integer}\u5206|1.0<{0,number,integer}\u5206}
-DURATION_SECONDS={0}\u79D2
-EMPTY_ARRAY=\u7A7A\u306E\u914D\u5217
-ERROR=\u30A8\u30E9\u30FC
-ERROR_COLON_MBEANS_ALREADY_EXIST=\u30A8\u30E9\u30FC: MBeans\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059
-ERROR_COLON_MBEANS_DO_NOT_EXIST=\u30A8\u30E9\u30FC: MBeans\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-EVENT=\u30A4\u30D9\u30F3\u30C8
-EXIT=\u7D42\u4E86(&X)
-FAIL_TO_LOAD_PLUGIN=\u8B66\u544A: \u30D7\u30E9\u30B0\u30A4\u30F3\u306E\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
-FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=\u53D6\u6D88
-FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059:<br>{0}<br>\u7F6E\u63DB\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B\u3002
-FILE_CHOOSER_FILE_EXISTS_OK_OPTION=\u7F6E\u63DB
-FILE_CHOOSER_FILE_EXISTS_TITLE=\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u3059
-FILE_CHOOSER_SAVED_FILE=<html>\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3057\u305F:<br>{0}<br>({1}\u30D0\u30A4\u30C8)
-FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F:<br>{0}<br>{1}
-FILE_CHOOSER_SAVE_FAILED_TITLE=\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-FREE_PHYSICAL_MEMORY=\u7A7A\u304D\u7269\u7406\u30E1\u30E2\u30EA\u30FC
-FREE_SWAP_SPACE=\u7A7A\u304D\u30B9\u30EF\u30C3\u30D7\u30FB\u30B9\u30DA\u30FC\u30B9
-GARBAGE_COLLECTOR=\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30BF
-GC_INFO=\u540D\u524D= ''{0}''\u3001\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3= {1,choice,-1#\u3042\u308A\u307E\u305B\u3093|0#{1,number,integer}\u500B}\u3001\u5408\u8A08\u6D88\u8CBB\u6642\u9593= {2}
-GC_TIME=GC\u6642\u9593
-GC_TIME_DETAILS={1}\u3067{0} ({2}\u500B\u306E\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3)
-HEAP_MEMORY_USAGE=\u30D2\u30FC\u30D7\u30FB\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387
-HEAP=\u30D2\u30FC\u30D7
-HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=JConsole\u3068JDK\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u542B\u3080\u30C0\u30A4\u30A2\u30ED\u30B0
-HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsole\u30D0\u30FC\u30B8\u30E7\u30F3:<br>{0}
-HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM\u30D0\u30FC\u30B8\u30E7\u30F3:<br>{0}
-HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30DE\u30B9\u30C8\u30D8\u30C3\u30C9\u56F3\u5F62
-HELP_ABOUT_DIALOG_MASTHEAD_TITLE=JConsole\u306B\u3064\u3044\u3066
-HELP_ABOUT_DIALOG_TITLE=JConsole: \u8A73\u7D30
+COMMITTED_MEMORY=コミット済メモリー
+COMMITTED_VIRTUAL_MEMORY=コミット済仮想メモリー
+COMMITTED=コミット済
+CONNECT=接続(&C)
+CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=Java仮想マシンに接続
+CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=ローカルまたはリモートのJava仮想マシンへの新規接続を行うダイアログ
+CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=マストヘッド図形
+CONNECT_DIALOG_MASTHEAD_TITLE=新規接続
+CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=ステータス・バー
+CONNECT_DIALOG_TITLE=JConsole: 新規接続
+CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=接続されています。クリックすると切断します。
+CONNECTION_FAILED=接続に失敗しました
+CONNECTION=接続(&C)
+CONNECTION_NAME=接続名
+CONNECTION_NAME__DISCONNECTED_={0} (切断済)
+CONSTRUCTOR=コンストラクタ
+CURRENT_CLASSES_LOADED=ロード済の現在のクラス
+CURRENT_HEAP_SIZE=現在のヒープ・サイズ
+CURRENT_VALUE=現在値: {0}
+CREATE=作成
+DAEMON_THREADS=デーモン・スレッド
+DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=切断されています。クリックすると接続します。
+DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=展開または縮小するにはダブルクリックしてください
+DOUBLE_CLICK_TO_VISUALIZE=視覚化するにはダブルクリックしてください
+DESCRIPTION=説明
+DESCRIPTOR=記述子
+DETAILS=詳細
+DETECT_DEADLOCK=デッドロックの検出(&D)
+DETECT_DEADLOCK_TOOLTIP=デッドロック済スレッドの検出
+DIMENSION_IS_NOT_SUPPORTED_COLON=次元はサポートされていません:
+DISCARD_CHART=チャートの破棄
+DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer}日|1.0<{0,number,integer}日}{1,choice,0<{1,number,integer}時間|1#{1,number,integer}時間|1<{1,number,integer}時間}{2,choice,0<{2,number,integer}分|1#{2,number,integer}分|1.0<{2,number,integer}分}
+DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer}時間|1<{0,number,integer}時間}{1,choice,0<{1,number,integer}分|1#{1,number,integer}分|1.0<{1,number,integer}分}
+DURATION_MINUTES={0,choice,1#{0,number,integer}分|1.0<{0,number,integer}分}
+DURATION_SECONDS={0}秒
+EMPTY_ARRAY=空の配列
+ERROR=エラー
+ERROR_COLON_MBEANS_ALREADY_EXIST=エラー: MBeansはすでに存在します
+ERROR_COLON_MBEANS_DO_NOT_EXIST=エラー: MBeansは存在しません
+EVENT=イベント
+EXIT=終了(&X)
+FAIL_TO_LOAD_PLUGIN=警告: プラグインのロードに失敗しました: {0}
+FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=取消
+FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>ファイルはすでに存在しています:<br>{0}<br>置換してもよろしいですか。
+FILE_CHOOSER_FILE_EXISTS_OK_OPTION=置換
+FILE_CHOOSER_FILE_EXISTS_TITLE=ファイルが存在しています
+FILE_CHOOSER_SAVED_FILE=<html>ファイルに保存しました:<br>{0}<br>({1}バイト)
+FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>ファイルへの保存に失敗しました:<br>{0}<br>{1}
+FILE_CHOOSER_SAVE_FAILED_TITLE=保存に失敗しました
+FREE_PHYSICAL_MEMORY=空き物理メモリー
+FREE_SWAP_SPACE=空きスワップ・スペース
+GARBAGE_COLLECTOR=ガベージ・コレクタ
+GC_INFO=名前= ''{0}''、コレクション= {1,choice,-1#ありません|0#{1,number,integer}個}、合計消費時間= {2}
+GC_TIME=GC時間
+GC_TIME_DETAILS={1}で{0} ({2}個のコレクション)
+HEAP_MEMORY_USAGE=ヒープ・メモリー使用率
+HEAP=ヒープ
+HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=JConsoleとJDKのバージョンについての情報を含むダイアログ
+HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsoleバージョン:<br>{0}
+HELP_ABOUT_DIALOG_JAVA_VERSION=Java VMバージョン:<br>{0}
+HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=マストヘッド図形
+HELP_ABOUT_DIALOG_MASTHEAD_TITLE=JConsoleについて
+HELP_ABOUT_DIALOG_TITLE=JConsole: 詳細
 HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://www.oracle.com/pls/topic/lookup?ctx=javase{0}&&id=using_jconsole
-HELP_MENU_ABOUT_TITLE=JConsole\u306B\u3064\u3044\u3066(&A)
-HELP_MENU_USER_GUIDE_TITLE=\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U)
-HELP_MENU_TITLE=\u30D8\u30EB\u30D7(&H)
+HELP_MENU_ABOUT_TITLE=JConsoleについて(&A)
+HELP_MENU_USER_GUIDE_TITLE=オンライン・ユーザー・ガイド(&U)
+HELP_MENU_TITLE=ヘルプ(&H)
 HOTSPOT_MBEANS_ELLIPSIS=Hotspot MBeans(&H)...
-HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=Hotspot MBeans\u306E\u7BA1\u7406\u7528\u30C0\u30A4\u30A2\u30ED\u30B0
-IMPACT=\u5F71\u97FF
-INFO=\u60C5\u5831
+HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=Hotspot MBeansの管理用ダイアログ
+IMPACT=影響
+INFO=情報
 INFO_CAPITALIZED=INFO
-INSECURE=\u4FDD\u8B77\u3055\u308C\u3066\u3044\u306A\u3044\u63A5\u7D9A
-INVALID_PLUGIN_PATH=\u8B66\u544A: \u7121\u52B9\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30D1\u30B9: {0}
-INVALID_URL=\u7121\u52B9\u306AURL: {0}
-IS=\u6B21\u306B\u4E00\u81F4\u3059\u308B
+INSECURE=保護されていない接続
+INVALID_PLUGIN_PATH=警告: 無効なプラグイン・パス: {0}
+INVALID_URL=無効なURL: {0}
+IS=次に一致する
 JAVA_MONITORING___MANAGEMENT_CONSOLE=Java Monitoring && Management Console
 JCONSOLE_COLON_=JConsole: {0}
-JCONSOLE_VERSION=JConsole\u30D0\u30FC\u30B8\u30E7\u30F3"{0}"
+JCONSOLE_VERSION=JConsoleバージョン"{0}"
 JCONSOLE_ACCESSIBLE_DESCRIPTION=Java Monitoring && Management Console
-JIT_COMPILER=JIT\u30B3\u30F3\u30D1\u30A4\u30E9
-LIBRARY_PATH=\u30E9\u30A4\u30D6\u30E9\u30EA\u30FB\u30D1\u30B9
-LIVE_THREADS=\u5B9F\u884C\u4E2D\u306E\u30B9\u30EC\u30C3\u30C9
-LOADED=\u30ED\u30FC\u30C9\u6E08
-LOCAL_PROCESS_COLON=\u30ED\u30FC\u30AB\u30EB\u30FB\u30D7\u30ED\u30BB\u30B9(&L):
+JIT_COMPILER=JITコンパイラ
+LIBRARY_PATH=ライブラリ・パス
+LIVE_THREADS=実行中のスレッド
+LOADED=ロード済
+LOCAL_PROCESS_COLON=ローカル・プロセス(&L):
 MASTHEAD_FONT=Dialog-PLAIN-25
-MANAGEMENT_NOT_ENABLED=<b>\u30CE\u30FC\u30C8</b>: \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306F\u3053\u306E\u30D7\u30ED\u30BB\u30B9\u3067\u306F\u6709\u52B9\u5316\u3055\u308C\u307E\u305B\u3093\u3002
-MANAGEMENT_WILL_BE_ENABLED=<b>\u30CE\u30FC\u30C8</b>: \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306F\u3053\u306E\u30D7\u30ED\u30BB\u30B9\u3067\u6709\u52B9\u5316\u3055\u308C\u307E\u3059\u3002
+MANAGEMENT_NOT_ENABLED=<b>ノート</b>: 管理エージェントはこのプロセスでは有効化されません。
+MANAGEMENT_WILL_BE_ENABLED=<b>ノート</b>: 管理エージェントはこのプロセスで有効化されます。
 MBEAN_ATTRIBUTE_INFO=MBeanAttributeInfo
 MBEAN_INFO=MBeanInfo
 MBEAN_NOTIFICATION_INFO=MBeanNotificationInfo
 MBEAN_OPERATION_INFO=MBeanOperationInfo
 MBEANS=MBeans
-MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=\u30AF\u30EA\u30A2(&C)
-MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=\u901A\u77E5\u306E\u30AF\u30EA\u30A2
-MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=\u30B3\u30F3\u30DD\u30B8\u30C3\u30C8\u30FB\u30C7\u30FC\u30BF\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3{0}/{1}
-MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=\u30B3\u30F3\u30DD\u30B8\u30C3\u30C8\u30FB\u30C7\u30FC\u30BF\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
-MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5(&R)
-MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=\u5C5E\u6027\u306E\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
-MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=\u30B5\u30D6\u30B9\u30AF\u30E9\u30A4\u30D6(&S)
-MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u901A\u77E5\u30EA\u30B9\u30CB\u30F3\u30B0\u306E\u958B\u59CB
-MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=\u30BF\u30D6\u30FB\u30C7\u30FC\u30BF\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3{0}/{1}
-MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=\u30BF\u30D6\u30FB\u30C7\u30FC\u30BF\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
-MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=\u30B5\u30D6\u30B9\u30AF\u30E9\u30A4\u30D6\u89E3\u9664(&U)
-MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u901A\u77E5\u30EA\u30B9\u30CB\u30F3\u30B0\u306E\u505C\u6B62
-MANAGE_HOTSPOT_MBEANS_IN_COLON_=Hotspot MBeans\u306E\u7BA1\u7406:
-MAX=\u6700\u5927
-MAXIMUM_HEAP_SIZE=\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA
-MEMORY=\u30E1\u30E2\u30EA\u30FC
-MEMORY_POOL_LABEL=\u30E1\u30E2\u30EA\u30FC\u30FB\u30D7\u30FC\u30EB"{0}"
-MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=\u30D2\u30FC\u30D7\u7528\u306E\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002
-MEMORY_TAB_INFO_LABEL_FORMAT=<html>\u4F7F\u7528\u6E08: {0}    \u30B3\u30DF\u30C3\u30C8\u6E08: {1}    \u6700\u5927: {2}</html>
-MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=\u975E\u30D2\u30FC\u30D7\u7528\u306E\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002
-MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD={0}\u306E\u3057\u304D\u3044\u5024\u3088\u308A\u4E0A\u3067\u3059\u3002\n
-MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=\u30E1\u30E2\u30EA\u30FC\u30FB\u30D7\u30FC\u30EB\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002
-MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD={0}\u306E\u3057\u304D\u3044\u5024\u3088\u308A\u4E0B\u3067\u3059\u3002\n
-MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME={0}\u306E\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002
-MESSAGE=\u30E1\u30C3\u30BB\u30FC\u30B8
-METHOD_SUCCESSFULLY_INVOKED=\u30E1\u30BD\u30C3\u30C9\u304C\u6B63\u5E38\u306B\u8D77\u52D5\u3055\u308C\u307E\u3057\u305F
-MINIMIZE_ALL=\u3059\u3079\u3066\u6700\u5C0F\u5316(&M)
-MONITOR_LOCKED=\   - \u30ED\u30C3\u30AF\u6E08{0}\n
-NAME=\u540D\u524D
-NAME_AND_BUILD={0} (\u30D3\u30EB\u30C9{1})
-NAME_STATE=\u540D\u524D: {0}\n\u72B6\u614B: {1}\n
-NAME_STATE_LOCK_NAME=\u540D\u524D: {0}\n\u72B6\u614B: {2}\u306E{1}\n
-NAME_STATE_LOCK_NAME_LOCK_OWNER=\u540D\u524D: {0}\n\u72B6\u614B: {2}\u306E{1}\u3001\u6240\u6709\u8005: {3}\n
-NEW_CONNECTION_ELLIPSIS=\u65B0\u898F\u63A5\u7D9A(&N)...
-NO_DEADLOCK_DETECTED=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u304C\u691C\u51FA\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F
-NON_HEAP_MEMORY_USAGE=\u975E\u30D2\u30FC\u30D7\u30FB\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387
-NON_HEAP=\u975E\u30D2\u30FC\u30D7
-NOTIFICATION=\u901A\u77E5
-NOTIFICATION_BUFFER=\u901A\u77E5\u30D0\u30C3\u30D5\u30A1
-NOTIFICATIONS=\u901A\u77E5
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=クリア(&C)
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=通知のクリア
+MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=コンポジット・データ・ナビゲーション{0}/{1}
+MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=コンポジット・データ・ナビゲーション
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=リフレッシュ(&R)
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=属性のリフレッシュ
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=サブスクライブ(&S)
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=通知リスニングの開始
+MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=タブ・データ・ナビゲーション{0}/{1}
+MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=タブ・データ・ナビゲーション
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=サブスクライブ解除(&U)
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=通知リスニングの停止
+MANAGE_HOTSPOT_MBEANS_IN_COLON_=Hotspot MBeansの管理:
+MAX=最大
+MAXIMUM_HEAP_SIZE=最大ヒープ・サイズ
+MEMORY=メモリー
+MEMORY_POOL_LABEL=メモリー・プール"{0}"
+MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=ヒープ用のメモリー使用率チャート。
+MEMORY_TAB_INFO_LABEL_FORMAT=<html>使用済: {0}    コミット済: {1}    最大: {2}</html>
+MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=非ヒープ用のメモリー使用率チャート。
+MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD={0}のしきい値より上です。\n
+MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=メモリー・プール使用率チャート。
+MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD={0}のしきい値より下です。\n
+MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME={0}のメモリー使用率チャート。
+MESSAGE=メッセージ
+METHOD_SUCCESSFULLY_INVOKED=メソッドが正常に起動されました
+MINIMIZE_ALL=すべて最小化(&M)
+MONITOR_LOCKED=\   - ロック済{0}\n
+NAME=名前
+NAME_AND_BUILD={0} (ビルド{1})
+NAME_STATE=名前: {0}\n状態: {1}\n
+NAME_STATE_LOCK_NAME=名前: {0}\n状態: {2}の{1}\n
+NAME_STATE_LOCK_NAME_LOCK_OWNER=名前: {0}\n状態: {2}の{1}、所有者: {3}\n
+NEW_CONNECTION_ELLIPSIS=新規接続(&N)...
+NO_DEADLOCK_DETECTED=デッドロックが検出されませんでした
+NON_HEAP_MEMORY_USAGE=非ヒープ・メモリー使用率
+NON_HEAP=非ヒープ
+NOTIFICATION=通知
+NOTIFICATION_BUFFER=通知バッファ
+NOTIFICATIONS=通知
 NOTIF_TYPES=NotifTypes
-NUMBER_OF_THREADS=\u30B9\u30EC\u30C3\u30C9\u6570
-NUMBER_OF_LOADED_CLASSES=\u30ED\u30FC\u30C9\u6E08\u30AF\u30E9\u30B9\u6570
-NUMBER_OF_PROCESSORS=\u30D7\u30ED\u30BB\u30C3\u30B5\u6570
+NUMBER_OF_THREADS=スレッド数
+NUMBER_OF_LOADED_CLASSES=ロード済クラス数
+NUMBER_OF_PROCESSORS=プロセッサ数
 OBJECT_NAME=ObjectName
-OPERATING_SYSTEM=\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0
-OPERATION=\u64CD\u4F5C
-OPERATION_INVOCATION=\u64CD\u4F5C\u306E\u547C\u51FA\u3057
-OPERATION_RETURN_VALUE=\u64CD\u4F5C\u306E\u623B\u308A\u5024
-OPERATIONS=\u64CD\u4F5C
-OVERVIEW=\u6982\u8981
-OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME={0}\u306E\u30C1\u30E3\u30FC\u30C8\u3002
-PARAMETER=\u30D1\u30E9\u30E1\u30FC\u30BF
-PASSWORD_ACCESSIBLE_NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
-PASSWORD_COLON_=\u30D1\u30B9\u30EF\u30FC\u30C9(&P):
-PEAK=\u30D4\u30FC\u30AF
-PERFORM_GC=GC\u306E\u5B9F\u884C(&G)
-PERFORM_GC_TOOLTIP=\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u30EA\u30AF\u30A8\u30B9\u30C8
-PLOTTER_ACCESSIBLE_NAME=\u30C1\u30E3\u30FC\u30C8
+OPERATING_SYSTEM=オペレーティング・システム
+OPERATION=操作
+OPERATION_INVOCATION=操作の呼出し
+OPERATION_RETURN_VALUE=操作の戻り値
+OPERATIONS=操作
+OVERVIEW=概要
+OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME={0}のチャート。
+PARAMETER=パラメータ
+PASSWORD_ACCESSIBLE_NAME=パスワード
+PASSWORD_COLON_=パスワード(&P):
+PEAK=ピーク
+PERFORM_GC=GCの実行(&G)
+PERFORM_GC_TOOLTIP=ガベージ・コレクションのリクエスト
+PLOTTER_ACCESSIBLE_NAME=チャート
 PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE={0}={1}\n
-PLOTTER_ACCESSIBLE_NAME_NO_DATA=\u30C7\u30FC\u30BF\u304C\u30D7\u30ED\u30C3\u30C8\u3055\u308C\u307E\u305B\u3093\u3002
-PLOTTER_SAVE_AS_MENU_ITEM=\u540D\u524D\u3092\u4ED8\u3051\u3066\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58(&A)...
-PLOTTER_TIME_RANGE_MENU=\u6642\u9593\u7BC4\u56F2(&T)
-PLUGIN_EXCEPTION_DIALOG_BUTTON_EXIT=\u7D42\u4E86
-PLUGIN_EXCEPTION_DIALOG_BUTTON_IGNORE=\u7121\u8996
+PLOTTER_ACCESSIBLE_NAME_NO_DATA=データがプロットされません。
+PLOTTER_SAVE_AS_MENU_ITEM=名前を付けてデータを保存(&A)...
+PLOTTER_TIME_RANGE_MENU=時間範囲(&T)
+PLUGIN_EXCEPTION_DIALOG_BUTTON_EXIT=終了
+PLUGIN_EXCEPTION_DIALOG_BUTTON_IGNORE=無視
 PLUGIN_EXCEPTION_DIALOG_BUTTON_OK=OK
-PLUGIN_EXCEPTION_DIALOG_MESSAGE=%s\u3067\u4E88\u671F\u3057\u306A\u3044\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n\n%s\n\n\u8A73\u7D30\u306F\u3001\u5148\u982D\u306B-debug\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u7121\u8996\u3059\u308B\u3068\u3001\u4F8B\u5916\u306F\u3053\u308C\u4EE5\u4E0A\u8868\u793A\u3055\u308C\u306A\u304F\u306A\u308A\u307E\u3059\u3002
-PLUGIN_EXCEPTION_DIALOG_TITLE=\u30D7\u30E9\u30B0\u30A4\u30F3\u4F8B\u5916
-PROBLEM_ADDING_LISTENER=\u30EA\u30B9\u30CA\u30FC\u8FFD\u52A0\u4E2D\u306E\u554F\u984C
-PROBLEM_DISPLAYING_MBEAN=MBean\u8868\u793A\u4E2D\u306E\u554F\u984C
-PROBLEM_INVOKING=\u547C\u51FA\u3057\u4E2D\u306E\u554F\u984C
-PROBLEM_REMOVING_LISTENER=\u30EA\u30B9\u30CA\u30FC\u524A\u9664\u4E2D\u306E\u554F\u984C
-PROBLEM_SETTING_ATTRIBUTE=\u5C5E\u6027\u8A2D\u5B9A\u4E2D\u306E\u554F\u984C
-PROCESS_CPU_TIME=\u30D7\u30ED\u30BB\u30B9CPU\u6642\u9593
-READABLE=\u8AAD\u53D6\u308A\u53EF\u80FD
-RECONNECT=\u518D\u63A5\u7D9A
-REMOTE_PROCESS_COLON=\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9(&R):
-REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9
-RESTORE_ALL=\u3059\u3079\u3066\u5FA9\u5143(&R)
+PLUGIN_EXCEPTION_DIALOG_MESSAGE=%sで予期しない例外が発生しました:\n\n%s\n\n詳細は、先頭に-debugを指定してください。無視すると、例外はこれ以上表示されなくなります。
+PLUGIN_EXCEPTION_DIALOG_TITLE=プラグイン例外
+PROBLEM_ADDING_LISTENER=リスナー追加中の問題
+PROBLEM_DISPLAYING_MBEAN=MBean表示中の問題
+PROBLEM_INVOKING=呼出し中の問題
+PROBLEM_REMOVING_LISTENER=リスナー削除中の問題
+PROBLEM_SETTING_ATTRIBUTE=属性設定中の問題
+PROCESS_CPU_TIME=プロセスCPU時間
+READABLE=読取り可能
+RECONNECT=再接続
+REMOTE_PROCESS_COLON=リモート・プロセス(&R):
+REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=リモート・プロセス
+RESTORE_ALL=すべて復元(&R)
 RETURN_TYPE=ReturnType
 SEQ_NUM=SeqNum
-SIZE_BYTES={0,number,integer}\u30D0\u30A4\u30C8
+SIZE_BYTES={0,number,integer}バイト
 SIZE_GB={0} Gb
 SIZE_KB={0} Kb
 SIZE_MB={0} Mb
-SOURCE=\u30BD\u30FC\u30B9
-STACK_TRACE=\n\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9: \n
+SOURCE=ソース
+STACK_TRACE=\nスタック・トレース: \n
 SUMMARY_TAB_HEADER_DATE_TIME_FORMAT=FULL,FULL
-SUMMARY_TAB_PENDING_FINALIZATION_LABEL=\u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u306E\u30DA\u30F3\u30C7\u30A3\u30F3\u30B0
-SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0}\u500B\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
-SUMMARY_TAB_TAB_NAME=VM\u30B5\u30DE\u30EA\u30FC
-SUMMARY_TAB_VM_VERSION={0}\u30D0\u30FC\u30B8\u30E7\u30F3{1}
-THREADS=\u30B9\u30EC\u30C3\u30C9
-THREAD_TAB_INFO_LABEL_FORMAT=<html>\u5B9F\u884C\u4E2D: {0}    \u30D4\u30FC\u30AF: {1}    \u5408\u8A08: {2}</html>
-THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u60C5\u5831
-THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u6570\u306E\u30C1\u30E3\u30FC\u30C8\u3002
-THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[\u30B9\u30EC\u30C3\u30C9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093]
-THRESHOLD=\u3057\u304D\u3044\u5024
-TILE=\u4E26\u3079\u3066\u8868\u793A(&T)
-TIME_RANGE_COLON=\u6642\u9593\u7BC4\u56F2(&T):
-TIME=\u6642\u9593
+SUMMARY_TAB_PENDING_FINALIZATION_LABEL=ファイナライズのペンディング
+SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0}個のオブジェクト
+SUMMARY_TAB_TAB_NAME=VMサマリー
+SUMMARY_TAB_VM_VERSION={0}バージョン{1}
+THREADS=スレッド
+THREAD_TAB_INFO_LABEL_FORMAT=<html>実行中: {0}    ピーク: {1}    合計: {2}</html>
+THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=スレッド情報
+THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=スレッド数のチャート。
+THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[スレッドが選択されていません]
+THRESHOLD=しきい値
+TILE=並べて表示(&T)
+TIME_RANGE_COLON=時間範囲(&T):
+TIME=時間
 TIME_STAMP=TimeStamp
-TOTAL_LOADED=\u30ED\u30FC\u30C9\u6E08\u5408\u8A08
-TOTAL_CLASSES_LOADED=\u30ED\u30FC\u30C9\u6E08\u30AF\u30E9\u30B9\u5408\u8A08
-TOTAL_CLASSES_UNLOADED=\u30A2\u30F3\u30ED\u30FC\u30C9\u6E08\u30AF\u30E9\u30B9\u5408\u8A08
-TOTAL_COMPILE_TIME=\u5408\u8A08\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u9593
-TOTAL_PHYSICAL_MEMORY=\u5408\u8A08\u7269\u7406\u30E1\u30E2\u30EA\u30FC
-TOTAL_THREADS_STARTED=\u958B\u59CB\u6E08\u5408\u8A08\u30B9\u30EC\u30C3\u30C9
-TOTAL_SWAP_SPACE=\u5408\u8A08\u30B9\u30EF\u30C3\u30D7\u30FB\u30B9\u30DA\u30FC\u30B9
-TYPE=\u30BF\u30A4\u30D7
-UNAVAILABLE=\u5229\u7528\u4E0D\u53EF
+TOTAL_LOADED=ロード済合計
+TOTAL_CLASSES_LOADED=ロード済クラス合計
+TOTAL_CLASSES_UNLOADED=アンロード済クラス合計
+TOTAL_COMPILE_TIME=合計コンパイル時間
+TOTAL_PHYSICAL_MEMORY=合計物理メモリー
+TOTAL_THREADS_STARTED=開始済合計スレッド
+TOTAL_SWAP_SPACE=合計スワップ・スペース
+TYPE=タイプ
+UNAVAILABLE=利用不可
 UNKNOWN_CAPITALIZED=UNKNOWN
-UNKNOWN_HOST=\u4E0D\u660E\u306A\u30DB\u30B9\u30C8: {0}
-UNREGISTER=\u767B\u9332\u89E3\u9664
-UPTIME=\u7A3C\u50CD\u6642\u9593
-USAGE_THRESHOLD=\u4F7F\u7528\u3057\u304D\u3044\u5024
-REMOTE_TF_USAGE=<b>\u4F7F\u7528\u65B9\u6CD5</b>: &&lt;hostname&&gt;:&&lt;port&&gt; OR service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
-USED=\u4F7F\u7528\u6E08
-USERNAME_COLON_=\u30E6\u30FC\u30B6\u30FC\u540D(&U):
-USERNAME_ACCESSIBLE_NAME=\u30E6\u30FC\u30B6\u30FC\u540D
+UNKNOWN_HOST=不明なホスト: {0}
+UNREGISTER=登録解除
+UPTIME=稼働時間
+USAGE_THRESHOLD=使用しきい値
+REMOTE_TF_USAGE=<b>使用方法</b>: &&lt;hostname&&gt;:&&lt;port&&gt; OR service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
+USED=使用済
+USERNAME_COLON_=ユーザー名(&U):
+USERNAME_ACCESSIBLE_NAME=ユーザー名
 USER_DATA=UserData
-VIRTUAL_MACHINE=\u4EEE\u60F3\u30DE\u30B7\u30F3
-VM_ARGUMENTS=VM\u5F15\u6570
-VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Java\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u30E2\u30CB\u30BF\u30FC\u7528\u306E\u5185\u90E8\u30D5\u30EC\u30FC\u30E0
-VALUE=\u5024
-VENDOR=\u30D9\u30F3\u30C0\u30FC
-VERBOSE_OUTPUT=\u8A73\u7D30\u51FA\u529B
-VERBOSE_OUTPUT_TOOLTIP=\u30AF\u30E9\u30B9\u8AAD\u8FBC\u307F\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B
-VIEW=\u8868\u793A
-WINDOW=\u30A6\u30A3\u30F3\u30C9\u30A6(&W)
-WINDOWS=\u30A6\u30A3\u30F3\u30C9\u30A6
-WRITABLE=\u66F8\u8FBC\u307F\u53EF\u80FD
-CONNECTION_FAILED1=\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F: \u518D\u8A66\u884C\u3057\u307E\u3059\u304B\u3002
-CONNECTION_FAILED2={0}\u3078\u306E\u63A5\u7D9A\u304C\u6210\u529F\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002<br>\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u307E\u3059\u304B\u3002
-CONNECTION_FAILED_SSL1=\u30BB\u30AD\u30E5\u30A2\u306A\u63A5\u7D9A\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u975E\u30BB\u30AD\u30E5\u30A2\u3067\u518D\u8A66\u884C\u3057\u307E\u3059\u304B\u3002
-CONNECTION_FAILED_SSL2=SSL\u3092\u4F7F\u7528\u3057\u3066{0}\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002<br>SSL\u306A\u3057\u3067\u63A5\u7D9A\u3057\u307E\u3059\u304B\u3002<br>(\u30E6\u30FC\u30B6\u30FC\u540D\u304A\u3088\u3073\u30D1\u30B9\u30EF\u30FC\u30C9\u306F\u30D7\u30EC\u30FC\u30F3\u30FB\u30C6\u30AD\u30B9\u30C8\u3067\u9001\u4FE1\u3055\u308C\u307E\u3059\u3002)
-CONNECTION_LOST1=\u63A5\u7D9A\u304C\u5931\u308F\u308C\u307E\u3057\u305F: \u518D\u63A5\u7D9A\u3057\u307E\u3059\u304B\u3002
-CONNECTING_TO1={0}\u306B\u63A5\u7D9A\u4E2D
-CONNECTING_TO2={0}\u306B\u73FE\u5728\u63A5\u7D9A\u4E2D\u3067\u3059\u3002<br>\u3053\u308C\u306B\u306F\u6570\u5206\u304B\u304B\u308A\u307E\u3059\u3002
-DEADLOCK_TAB=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF
-DEADLOCK_TAB_N=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF{0}
-EXPAND=\u5C55\u958B
+VIRTUAL_MACHINE=仮想マシン
+VM_ARGUMENTS=VM引数
+VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Java仮想マシンのモニター用の内部フレーム
+VALUE=値
+VENDOR=ベンダー
+VERBOSE_OUTPUT=詳細出力
+VERBOSE_OUTPUT_TOOLTIP=クラス読込みシステムで詳細出力を有効にする
+VIEW=表示
+WINDOW=ウィンドウ(&W)
+WINDOWS=ウィンドウ
+WRITABLE=書込み可能
+CONNECTION_FAILED1=接続に失敗しました: 再試行しますか。
+CONNECTION_FAILED2={0}への接続が成功しませんでした。<br>もう一度試しますか。
+CONNECTION_FAILED_SSL1=セキュアな接続が失敗しました。非セキュアで再試行しますか。
+CONNECTION_FAILED_SSL2=SSLを使用して{0}に接続できません。<br>SSLなしで接続しますか。<br>(ユーザー名およびパスワードはプレーン・テキストで送信されます。)
+CONNECTION_LOST1=接続が失われました: 再接続しますか。
+CONNECTING_TO1={0}に接続中
+CONNECTING_TO2={0}に現在接続中です。<br>これには数分かかります。
+DEADLOCK_TAB=デッドロック
+DEADLOCK_TAB_N=デッドロック{0}
+EXPAND=展開
 KBYTES={0} KB
-PLOT=\u30D7\u30ED\u30C3\u30C8
-VISUALIZE=\u8996\u899A\u5316
-ZZ_USAGE_TEXT=\u4F7F\u7528\u65B9\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n  -interval   \u66F4\u65B0\u9593\u9694\u3092n\u79D2\u306B\u8A2D\u5B9A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8\u306F4\u79D2)\n  -notile     \u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u6700\u521D\u306B\u4E26\u3079\u3066\u8868\u793A\u3057\u306A\u3044(2\u3064\u4EE5\u4E0A\u306E\u63A5\u7D9A\u306B\u3064\u3044\u3066)\n  -pluginpath JConsole\u304C\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u53C2\u7167\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B\n  -version    \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5370\u5237\u3059\u308B\n\n  connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n  pid         \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9\u306E\u30D7\u30ED\u30BB\u30B9ID\n  host        \u30EA\u30E2\u30FC\u30C8\u30FB\u30DB\u30B9\u30C8\u540D\u307E\u305F\u306FIP\u30A2\u30C9\u30EC\u30B9\n  port        \u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A\u7528\u306E\u30DD\u30FC\u30C8\u756A\u53F7\n\n  -J          JConsole\u304C\u5B9F\u884C\u4E2D\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\n              \u5165\u529B\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B
+PLOT=プロット
+VISUALIZE=視覚化
+ZZ_USAGE_TEXT=使用方法: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n  -interval   更新間隔をn秒に設定する(デフォルトは4秒)\n  -notile     ウィンドウを最初に並べて表示しない(2つ以上の接続について)\n  -pluginpath JConsoleがプラグインを参照するために使用するパスを指定する\n  -version    プログラム・バージョンを印刷する\n\n  connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n  pid         ターゲット・プロセスのプロセスID\n  host        リモート・ホスト名またはIPアドレス\n  port        リモート接続用のポート番号\n\n  -J          JConsoleが実行中のJava仮想マシンへの\n              入力引数を指定する
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
index 529a5787c23..ff40c779de8 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
@@ -23,285 +23,285 @@
 # questions.
 #
 
-ONE_DAY=\ 1 \u5929
-ONE_HOUR=\ 1 \u5C0F\u65F6
-ONE_MIN=\ 1 \u5206\u949F
-ONE_MONTH=\ 1 \u4E2A\u6708
-ONE_YEAR=\ 1 \u5E74
-TWO_HOURS=\ 2 \u5C0F\u65F6
-THREE_HOURS=\ 3 \u5C0F\u65F6
-THREE_MONTHS=\ 3 \u4E2A\u6708
-FIVE_MIN=\ 5 \u5206\u949F
-SIX_HOURS=\ 6 \u5C0F\u65F6
-SIX_MONTHS=\ 6 \u4E2A\u6708
-SEVEN_DAYS=\ 7 \u5929
-TEN_MIN=10 \u5206\u949F
-TWELVE_HOURS=12 \u5C0F\u65F6
-THIRTY_MIN=30 \u5206\u949F
+ONE_DAY=\ 1 天
+ONE_HOUR=\ 1 小时
+ONE_MIN=\ 1 分钟
+ONE_MONTH=\ 1 个月
+ONE_YEAR=\ 1 年
+TWO_HOURS=\ 2 小时
+THREE_HOURS=\ 3 小时
+THREE_MONTHS=\ 3 个月
+FIVE_MIN=\ 5 分钟
+SIX_HOURS=\ 6 小时
+SIX_MONTHS=\ 6 个月
+SEVEN_DAYS=\ 7 天
+TEN_MIN=10 分钟
+TWELVE_HOURS=12 小时
+THIRTY_MIN=30 分钟
 LESS_THAN=<
 A_LOT_LESS_THAN=<<
 GREATER_THAN=>
 ACTION_CAPITALIZED=ACTION
 ACTION_INFO_CAPITALIZED=ACTION_INFO
-ALL=\u5168\u90E8
-ARCHITECTURE=\u4F53\u7CFB\u7ED3\u6784
-ATTRIBUTE=\u5C5E\u6027
-ATTRIBUTE_VALUE=\u5C5E\u6027\u503C
-ATTRIBUTE_VALUES=\u5C5E\u6027\u503C
-ATTRIBUTES=\u5C5E\u6027
-BLANK=\u7A7A\u767D
-BLOCKED_COUNT_WAITED_COUNT=\u603B\u963B\u6B62\u6570: {0}, \u603B\u7B49\u5F85\u6570: {1}\n
-BOOT_CLASS_PATH=\u5F15\u5BFC\u7C7B\u8DEF\u5F84
-BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=\u5207\u6362\u4EE5\u663E\u793A\u66F4\u591A\u6216\u66F4\u5C11\u4FE1\u606F
-CPU_USAGE=CPU \u5360\u7528\u7387
-CPU_USAGE_FORMAT=CPU \u5360\u7528\u7387: {0}%
-CANCEL=\u53D6\u6D88
-CASCADE=\u5C42\u53E0(&C)
-CHART_COLON=\u56FE\u8868(&C):
-CLASS_PATH=\u7C7B\u8DEF\u5F84
+ALL=全部
+ARCHITECTURE=体系结构
+ATTRIBUTE=属性
+ATTRIBUTE_VALUE=属性值
+ATTRIBUTE_VALUES=属性值
+ATTRIBUTES=属性
+BLANK=空白
+BLOCKED_COUNT_WAITED_COUNT=总阻止数: {0}, 总等待数: {1}\n
+BOOT_CLASS_PATH=引导类路径
+BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=切换以显示更多或更少信息
+CPU_USAGE=CPU 占用率
+CPU_USAGE_FORMAT=CPU 占用率: {0}%
+CANCEL=取消
+CASCADE=层叠(&C)
+CHART_COLON=图表(&C):
+CLASS_PATH=类路径
 CLASS_NAME=ClassName
-CLASS_TAB_INFO_LABEL_FORMAT=<html>\u5DF2\u52A0\u8F7D: {0}    \u5DF2\u5378\u8F7D: {1}    \u603B\u8BA1: {2}</html>
-CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=\u5DF2\u52A0\u8F7D\u7C7B\u7684\u56FE\u8868\u3002
-CLASSES=\u7C7B
-CLOSE=\u5173\u95ED
-COLUMN_NAME=\u540D\u79F0
+CLASS_TAB_INFO_LABEL_FORMAT=<html>已加载: {0}    已卸载: {1}    总计: {2}</html>
+CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=已加载类的图表。
+CLASSES=类
+CLOSE=关闭
+COLUMN_NAME=名称
 COLUMN_PID=PID
-COMMITTED_MEMORY=\u63D0\u4EA4\u7684\u5185\u5B58
-COMMITTED_VIRTUAL_MEMORY=\u63D0\u4EA4\u7684\u865A\u62DF\u5185\u5B58
-COMMITTED=\u5DF2\u63D0\u4EA4
-CONNECT=\u8FDE\u63A5(&C)
-CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=\u8FDE\u63A5\u5230 Java \u865A\u62DF\u673A
-CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=\u7528\u4E8E\u4E0E\u672C\u5730\u6216\u8FDC\u7A0B Java \u865A\u62DF\u673A\u5EFA\u7ACB\u65B0\u8FDE\u63A5\u7684\u5BF9\u8BDD\u6846
-CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u62A5\u5934\u56FE
-CONNECT_DIALOG_MASTHEAD_TITLE=\u65B0\u5EFA\u8FDE\u63A5
-CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=\u72B6\u6001\u680F
-CONNECT_DIALOG_TITLE=JConsole: \u65B0\u5EFA\u8FDE\u63A5
-CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=\u5DF2\u8FDE\u63A5\u3002\u5355\u51FB\u53EF\u65AD\u5F00\u8FDE\u63A5\u3002
-CONNECTION_FAILED=\u8FDE\u63A5\u5931\u8D25
-CONNECTION=\u8FDE\u63A5(&C)
-CONNECTION_NAME=\u8FDE\u63A5\u540D\u79F0
-CONNECTION_NAME__DISCONNECTED_={0} (\u5DF2\u65AD\u5F00\u8FDE\u63A5)
-CONSTRUCTOR=\u6784\u9020\u5668
-CURRENT_CLASSES_LOADED=\u5DF2\u52A0\u88C5\u5F53\u524D\u7C7B
-CURRENT_HEAP_SIZE=\u5F53\u524D\u5806\u5927\u5C0F
-CURRENT_VALUE=\u5F53\u524D\u503C: {0}
-CREATE=\u521B\u5EFA
-DAEMON_THREADS=\u5B88\u62A4\u7A0B\u5E8F\u7EBF\u7A0B
-DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=\u5DF2\u65AD\u5F00\u8FDE\u63A5\u3002\u5355\u51FB\u53EF\u8FDE\u63A5\u3002
-DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=\u53CC\u51FB\u4EE5\u5C55\u5F00/\u9690\u85CF
-DOUBLE_CLICK_TO_VISUALIZE=\u53CC\u51FB\u4EE5\u4F7F\u5176\u53EF\u89C1
-DESCRIPTION=\u8BF4\u660E
-DESCRIPTOR=\u63CF\u8FF0\u7B26
-DETAILS=\u8BE6\u7EC6\u4FE1\u606F
-DETECT_DEADLOCK=\u68C0\u6D4B\u6B7B\u9501(&D)
-DETECT_DEADLOCK_TOOLTIP=\u68C0\u6D4B\u5904\u4E8E\u6B7B\u9501\u72B6\u6001\u7684\u7EBF\u7A0B
-DIMENSION_IS_NOT_SUPPORTED_COLON=\u4E0D\u652F\u6301\u7EF4:
-DISCARD_CHART=\u653E\u5F03\u56FE\u8868
-DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer} \u5929 |1.0<{0,number,integer} \u5929 }{1,choice,0<{1,number,integer} \u5C0F\u65F6 |1#{1,number,integer} \u5C0F\u65F6 |1<{1,number,integer} \u5C0F\u65F6 }{2,choice,0<{2,number,integer} \u5206\u949F|1#{2,number,integer} \u5206\u949F|1.0<{2,number,integer} \u5206\u949F}
-DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer} \u5C0F\u65F6 |1<{0,number,integer} \u5C0F\u65F6 }{1,choice,0<{1,number,integer} \u5206\u949F|1#{1,number,integer} \u5206\u949F|1.0<{1,number,integer} \u5206\u949F}
-DURATION_MINUTES={0,choice,1#{0,number,integer} \u5206\u949F|1.0<{0,number,integer} \u5206\u949F}
-DURATION_SECONDS={0} \u79D2
-EMPTY_ARRAY=\u7A7A\u6570\u7EC4
-ERROR=\u9519\u8BEF
-ERROR_COLON_MBEANS_ALREADY_EXIST=\u9519\u8BEF: MBean \u5DF2\u5B58\u5728
-ERROR_COLON_MBEANS_DO_NOT_EXIST=\u9519\u8BEF: MBean \u4E0D\u5B58\u5728
-EVENT=\u4E8B\u4EF6
-EXIT=\u9000\u51FA(&X)
-FAIL_TO_LOAD_PLUGIN=\u8B66\u544A: \u65E0\u6CD5\u52A0\u8F7D\u63D2\u4EF6: {0}
-FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=\u53D6\u6D88
-FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>\u6587\u4EF6\u5DF2\u5B58\u5728:<br>{0}<br>\u662F\u5426\u8981\u66FF\u6362?
-FILE_CHOOSER_FILE_EXISTS_OK_OPTION=\u66FF\u6362
-FILE_CHOOSER_FILE_EXISTS_TITLE=\u6587\u4EF6\u5DF2\u5B58\u5728
-FILE_CHOOSER_SAVED_FILE=<html>\u5DF2\u4FDD\u5B58\u5230\u6587\u4EF6:<br>{0}<br>({1} \u5B57\u8282)
-FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>\u672A\u80FD\u4FDD\u5B58\u5230\u6587\u4EF6:<br>{0}<br>{1}
-FILE_CHOOSER_SAVE_FAILED_TITLE=\u4FDD\u5B58\u5931\u8D25
-FREE_PHYSICAL_MEMORY=\u7A7A\u95F2\u7269\u7406\u5185\u5B58
-FREE_SWAP_SPACE=\u7A7A\u95F2\u4EA4\u6362\u7A7A\u95F4
-GARBAGE_COLLECTOR=\u5783\u573E\u6536\u96C6\u5668
-GC_INFO=\u540D\u79F0 = ''{0}'', \u6536\u96C6 = {1,choice,-1#Unavailable|0#{1,number,integer}}, \u603B\u82B1\u8D39\u65F6\u95F4 = {2}
-GC_TIME=GC \u65F6\u95F4
-GC_TIME_DETAILS={1}\u4E0A\u7684{0} ({2}\u6536\u96C6)
-HEAP_MEMORY_USAGE=\u5806\u5185\u5B58\u4F7F\u7528\u91CF
-HEAP=\u5806
-HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=\u5305\u542B\u6709\u5173 JConsole \u548C JDK \u7248\u672C\u4FE1\u606F\u7684\u5BF9\u8BDD\u6846
-HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsole \u7248\u672C:<br>{0}
-HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM \u7248\u672C:<br>{0}
-HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u62A5\u5934\u56FE
-HELP_ABOUT_DIALOG_MASTHEAD_TITLE=\u5173\u4E8E JConsole
-HELP_ABOUT_DIALOG_TITLE=JConsole: \u5173\u4E8E
+COMMITTED_MEMORY=提交的内存
+COMMITTED_VIRTUAL_MEMORY=提交的虚拟内存
+COMMITTED=已提交
+CONNECT=连接(&C)
+CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=连接到 Java 虚拟机
+CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=用于与本地或远程 Java 虚拟机建立新连接的对话框
+CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=报头图
+CONNECT_DIALOG_MASTHEAD_TITLE=新建连接
+CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=状态栏
+CONNECT_DIALOG_TITLE=JConsole: 新建连接
+CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=已连接。单击可断开连接。
+CONNECTION_FAILED=连接失败
+CONNECTION=连接(&C)
+CONNECTION_NAME=连接名称
+CONNECTION_NAME__DISCONNECTED_={0} (已断开连接)
+CONSTRUCTOR=构造器
+CURRENT_CLASSES_LOADED=已加装当前类
+CURRENT_HEAP_SIZE=当前堆大小
+CURRENT_VALUE=当前值: {0}
+CREATE=创建
+DAEMON_THREADS=守护程序线程
+DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=已断开连接。单击可连接。
+DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=双击以展开/隐藏
+DOUBLE_CLICK_TO_VISUALIZE=双击以使其可见
+DESCRIPTION=说明
+DESCRIPTOR=描述符
+DETAILS=详细信息
+DETECT_DEADLOCK=检测死锁(&D)
+DETECT_DEADLOCK_TOOLTIP=检测处于死锁状态的线程
+DIMENSION_IS_NOT_SUPPORTED_COLON=不支持维:
+DISCARD_CHART=放弃图表
+DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer} 天 |1.0<{0,number,integer} 天 }{1,choice,0<{1,number,integer} 小时 |1#{1,number,integer} 小时 |1<{1,number,integer} 小时 }{2,choice,0<{2,number,integer} 分钟|1#{2,number,integer} 分钟|1.0<{2,number,integer} 分钟}
+DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer} 小时 |1<{0,number,integer} 小时 }{1,choice,0<{1,number,integer} 分钟|1#{1,number,integer} 分钟|1.0<{1,number,integer} 分钟}
+DURATION_MINUTES={0,choice,1#{0,number,integer} 分钟|1.0<{0,number,integer} 分钟}
+DURATION_SECONDS={0} 秒
+EMPTY_ARRAY=空数组
+ERROR=错误
+ERROR_COLON_MBEANS_ALREADY_EXIST=错误: MBean 已存在
+ERROR_COLON_MBEANS_DO_NOT_EXIST=错误: MBean 不存在
+EVENT=事件
+EXIT=退出(&X)
+FAIL_TO_LOAD_PLUGIN=警告: 无法加载插件: {0}
+FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=取消
+FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>文件已存在:<br>{0}<br>是否要替换?
+FILE_CHOOSER_FILE_EXISTS_OK_OPTION=替换
+FILE_CHOOSER_FILE_EXISTS_TITLE=文件已存在
+FILE_CHOOSER_SAVED_FILE=<html>已保存到文件:<br>{0}<br>({1} 字节)
+FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>未能保存到文件:<br>{0}<br>{1}
+FILE_CHOOSER_SAVE_FAILED_TITLE=保存失败
+FREE_PHYSICAL_MEMORY=空闲物理内存
+FREE_SWAP_SPACE=空闲交换空间
+GARBAGE_COLLECTOR=垃圾收集器
+GC_INFO=名称 = ''{0}'', 收集 = {1,choice,-1#Unavailable|0#{1,number,integer}}, 总花费时间 = {2}
+GC_TIME=GC 时间
+GC_TIME_DETAILS={1}上的{0} ({2}收集)
+HEAP_MEMORY_USAGE=堆内存使用量
+HEAP=堆
+HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=包含有关 JConsole 和 JDK 版本信息的对话框
+HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsole 版本:<br>{0}
+HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM 版本:<br>{0}
+HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=报头图
+HELP_ABOUT_DIALOG_MASTHEAD_TITLE=关于 JConsole
+HELP_ABOUT_DIALOG_TITLE=JConsole: 关于
 HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://www.oracle.com/pls/topic/lookup?ctx=javase{0}&&id=using_jconsole
-HELP_MENU_ABOUT_TITLE=\u5173\u4E8E JConsole(&A)
-HELP_MENU_USER_GUIDE_TITLE=\u8054\u673A\u7528\u6237\u6307\u5357(&U)
-HELP_MENU_TITLE=\u5E2E\u52A9(&H)
+HELP_MENU_ABOUT_TITLE=关于 JConsole(&A)
+HELP_MENU_USER_GUIDE_TITLE=联机用户指南(&U)
+HELP_MENU_TITLE=帮助(&H)
 HOTSPOT_MBEANS_ELLIPSIS=HotSpot MBean(&H)...
-HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=\u7528\u4E8E\u7BA1\u7406 HotSpot MBean \u7684\u5BF9\u8BDD\u6846
-IMPACT=\u5F71\u54CD
-INFO=\u4FE1\u606F
-INFO_CAPITALIZED=\u4FE1\u606F
-INSECURE=\u4E0D\u5B89\u5168\u7684\u8FDE\u63A5
-INVALID_PLUGIN_PATH=\u8B66\u544A: \u63D2\u4EF6\u8DEF\u5F84\u65E0\u6548: {0}
-INVALID_URL=URL \u65E0\u6548: {0}
-IS=\u662F
-JAVA_MONITORING___MANAGEMENT_CONSOLE=Java \u76D1\u89C6\u548C\u7BA1\u7406\u63A7\u5236\u53F0
+HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=用于管理 HotSpot MBean 的对话框
+IMPACT=影响
+INFO=信息
+INFO_CAPITALIZED=信息
+INSECURE=不安全的连接
+INVALID_PLUGIN_PATH=警告: 插件路径无效: {0}
+INVALID_URL=URL 无效: {0}
+IS=是
+JAVA_MONITORING___MANAGEMENT_CONSOLE=Java 监视和管理控制台
 JCONSOLE_COLON_=JConsole: {0}
-JCONSOLE_VERSION=JConsole \u7248\u672C "{0}"
-JCONSOLE_ACCESSIBLE_DESCRIPTION=Java \u76D1\u89C6\u548C\u7BA1\u7406\u63A7\u5236\u53F0
-JIT_COMPILER=JIT \u7F16\u8BD1\u5668
-LIBRARY_PATH=\u5E93\u8DEF\u5F84
-LIVE_THREADS=\u6D3B\u52A8\u7EBF\u7A0B
-LOADED=\u5DF2\u52A0\u8F7D
-LOCAL_PROCESS_COLON=\u672C\u5730\u8FDB\u7A0B(&L):
+JCONSOLE_VERSION=JConsole 版本 "{0}"
+JCONSOLE_ACCESSIBLE_DESCRIPTION=Java 监视和管理控制台
+JIT_COMPILER=JIT 编译器
+LIBRARY_PATH=库路径
+LIVE_THREADS=活动线程
+LOADED=已加载
+LOCAL_PROCESS_COLON=本地进程(&L):
 MASTHEAD_FONT=Dialog-PLAIN-25
-MANAGEMENT_NOT_ENABLED=<b>\u6CE8</b>: \u672A\u5BF9\u6B64\u8FDB\u7A0B\u542F\u7528\u7BA1\u7406\u4EE3\u7406\u3002
-MANAGEMENT_WILL_BE_ENABLED=<b>\u6CE8</b>: \u5C06\u5BF9\u6B64\u8FDB\u7A0B\u542F\u7528\u7BA1\u7406\u4EE3\u7406\u3002
+MANAGEMENT_NOT_ENABLED=<b>注</b>: 未对此进程启用管理代理。
+MANAGEMENT_WILL_BE_ENABLED=<b>注</b>: 将对此进程启用管理代理。
 MBEAN_ATTRIBUTE_INFO=MBeanAttributeInfo
 MBEAN_INFO=MBeanInfo
 MBEAN_NOTIFICATION_INFO=MBeanNotificationInfo
 MBEAN_OPERATION_INFO=MBeanOperationInfo
 MBEANS=MBean
-MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=\u6E05\u9664(&C)
-MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=\u6E05\u9664\u901A\u77E5
-MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=\u7EC4\u5408\u6570\u636E\u5BFC\u822A{0}/{1}
-MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=\u7EC4\u5408\u6570\u636E\u5BFC\u822A
-MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=\u5237\u65B0(&R)
-MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=\u5237\u65B0\u5C5E\u6027
-MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=\u8BA2\u9605(&S)
-MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u5F00\u59CB\u76D1\u542C\u901A\u77E5
-MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=\u8868\u683C\u5F0F\u6570\u636E\u5BFC\u822A{0}/{1}
-MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=\u8868\u683C\u5F0F\u6570\u636E\u5BFC\u822A
-MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=\u53D6\u6D88\u8BA2\u9605(&U)
-MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u505C\u6B62\u76D1\u542C\u901A\u77E5
-MANAGE_HOTSPOT_MBEANS_IN_COLON_=\u7BA1\u7406\u4EE5\u4E0B\u4F4D\u7F6E\u7684 HotSpot MBean:
-MAX=\u6700\u5927\u503C
-MAXIMUM_HEAP_SIZE=\u6700\u5927\u5806\u5927\u5C0F
-MEMORY=\u5185\u5B58
-MEMORY_POOL_LABEL=\u5185\u5B58\u6C60 "{0}"
-MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=\u5806\u7684\u5185\u5B58\u4F7F\u7528\u91CF\u56FE\u8868\u3002
-MEMORY_TAB_INFO_LABEL_FORMAT=<html>\u5DF2\u7528: {0}    \u5DF2\u63D0\u4EA4: {1}    \u6700\u5927: {2}</html>
-MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=\u975E\u5806\u7684\u5185\u5B58\u4F7F\u7528\u91CF\u56FE\u8868\u3002
-MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD=\u5927\u4E8E{0}\u7684\u9608\u503C\u3002\n
-MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=\u5185\u5B58\u6C60\u4F7F\u7528\u91CF\u56FE\u8868\u3002
-MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD=\u4F4E\u4E8E{0}\u7684\u9608\u503C\u3002\n
-MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME={0}\u7684\u5185\u5B58\u4F7F\u7528\u91CF\u56FE\u8868\u3002
-MESSAGE=\u6D88\u606F
-METHOD_SUCCESSFULLY_INVOKED=\u5DF2\u6210\u529F\u8C03\u7528\u65B9\u6CD5
-MINIMIZE_ALL=\u5168\u90E8\u6700\u5C0F\u5316(&M)
-MONITOR_LOCKED=\   - \u5DF2\u9501\u5B9A {0}\n
-NAME=\u540D\u79F0
-NAME_AND_BUILD={0} (\u5DE5\u4F5C\u7248\u672C {1})
-NAME_STATE=\u540D\u79F0: {0}\n\u72B6\u6001: {1}\n
-NAME_STATE_LOCK_NAME=\u540D\u79F0: {0}\n\u72B6\u6001: {2}\u4E0A\u7684{1}\n
-NAME_STATE_LOCK_NAME_LOCK_OWNER=\u540D\u79F0: {0}\n\u72B6\u6001: {2}\u4E0A\u7684{1}, \u62E5\u6709\u8005: {3}\n
-NEW_CONNECTION_ELLIPSIS=\u65B0\u5EFA\u8FDE\u63A5(&N)...
-NO_DEADLOCK_DETECTED=\u672A\u68C0\u6D4B\u5230\u6B7B\u9501
-NON_HEAP_MEMORY_USAGE=\u975E\u5806\u5185\u5B58\u4F7F\u7528\u91CF
-NON_HEAP=\u975E\u5806
-NOTIFICATION=\u901A\u77E5
-NOTIFICATION_BUFFER=\u901A\u77E5\u7F13\u51B2\u533A
-NOTIFICATIONS=\u901A\u77E5
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=清除(&C)
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=清除通知
+MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=组合数据导航{0}/{1}
+MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=组合数据导航
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=刷新(&R)
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=刷新属性
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=订阅(&S)
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=开始监听通知
+MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=表格式数据导航{0}/{1}
+MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=表格式数据导航
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=取消订阅(&U)
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=停止监听通知
+MANAGE_HOTSPOT_MBEANS_IN_COLON_=管理以下位置的 HotSpot MBean:
+MAX=最大值
+MAXIMUM_HEAP_SIZE=最大堆大小
+MEMORY=内存
+MEMORY_POOL_LABEL=内存池 "{0}"
+MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=堆的内存使用量图表。
+MEMORY_TAB_INFO_LABEL_FORMAT=<html>已用: {0}    已提交: {1}    最大: {2}</html>
+MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=非堆的内存使用量图表。
+MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD=大于{0}的阈值。\n
+MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=内存池使用量图表。
+MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD=低于{0}的阈值。\n
+MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME={0}的内存使用量图表。
+MESSAGE=消息
+METHOD_SUCCESSFULLY_INVOKED=已成功调用方法
+MINIMIZE_ALL=全部最小化(&M)
+MONITOR_LOCKED=\   - 已锁定 {0}\n
+NAME=名称
+NAME_AND_BUILD={0} (工作版本 {1})
+NAME_STATE=名称: {0}\n状态: {1}\n
+NAME_STATE_LOCK_NAME=名称: {0}\n状态: {2}上的{1}\n
+NAME_STATE_LOCK_NAME_LOCK_OWNER=名称: {0}\n状态: {2}上的{1}, 拥有者: {3}\n
+NEW_CONNECTION_ELLIPSIS=新建连接(&N)...
+NO_DEADLOCK_DETECTED=未检测到死锁
+NON_HEAP_MEMORY_USAGE=非堆内存使用量
+NON_HEAP=非堆
+NOTIFICATION=通知
+NOTIFICATION_BUFFER=通知缓冲区
+NOTIFICATIONS=通知
 NOTIF_TYPES=NotifTypes
-NUMBER_OF_THREADS=\u7EBF\u7A0B\u6570
-NUMBER_OF_LOADED_CLASSES=\u5DF2\u52A0\u8F7D\u7C7B\u6570
-NUMBER_OF_PROCESSORS=\u5904\u7406\u7A0B\u5E8F\u6570
+NUMBER_OF_THREADS=线程数
+NUMBER_OF_LOADED_CLASSES=已加载类数
+NUMBER_OF_PROCESSORS=处理程序数
 OBJECT_NAME=ObjectName
-OPERATING_SYSTEM=\u64CD\u4F5C\u7CFB\u7EDF
-OPERATION=\u64CD\u4F5C
-OPERATION_INVOCATION=\u64CD\u4F5C\u8C03\u7528
-OPERATION_RETURN_VALUE=\u64CD\u4F5C\u8FD4\u56DE\u503C
-OPERATIONS=\u64CD\u4F5C
-OVERVIEW=\u6982\u89C8
-OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME={0}\u7684\u56FE\u8868\u3002
-PARAMETER=\u53C2\u6570
-PASSWORD_ACCESSIBLE_NAME=\u53E3\u4EE4
-PASSWORD_COLON_=\u53E3\u4EE4(&P):
-PEAK=\u5CF0\u503C
-PERFORM_GC=\u6267\u884C GC(&G)
-PERFORM_GC_TOOLTIP=\u8BF7\u6C42\u5783\u573E\u6536\u96C6
-PLOTTER_ACCESSIBLE_NAME=\u56FE\u8868
+OPERATING_SYSTEM=操作系统
+OPERATION=操作
+OPERATION_INVOCATION=操作调用
+OPERATION_RETURN_VALUE=操作返回值
+OPERATIONS=操作
+OVERVIEW=概览
+OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME={0}的图表。
+PARAMETER=参数
+PASSWORD_ACCESSIBLE_NAME=口令
+PASSWORD_COLON_=口令(&P):
+PEAK=峰值
+PERFORM_GC=执行 GC(&G)
+PERFORM_GC_TOOLTIP=请求垃圾收集
+PLOTTER_ACCESSIBLE_NAME=图表
 PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE={0}={1}\n
-PLOTTER_ACCESSIBLE_NAME_NO_DATA=\u672A\u7ED8\u5236\u6570\u636E\u3002
-PLOTTER_SAVE_AS_MENU_ITEM=\u5C06\u6570\u636E\u53E6\u5B58\u4E3A(&A)...
-PLOTTER_TIME_RANGE_MENU=\u65F6\u95F4\u8303\u56F4(&T)
-PLUGIN_EXCEPTION_DIALOG_BUTTON_EXIT=\u9000\u51FA
-PLUGIN_EXCEPTION_DIALOG_BUTTON_IGNORE=\u5FFD\u7565
-PLUGIN_EXCEPTION_DIALOG_BUTTON_OK=\u786E\u5B9A
-PLUGIN_EXCEPTION_DIALOG_MESSAGE=%s \u4E2D\u51FA\u73B0\u610F\u5916\u7684\u5F02\u5E38\u9519\u8BEF:\n\n%s\n\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u8FD0\u884C\u4EE5 -debug \u5F00\u5934\u7684\u547D\u4EE4\u83B7\u53D6\u3002\u5982\u679C\u5FFD\u7565, \u5219\u5C06\u9690\u85CF\u540E\u9762\u7684\u5F02\u5E38\u9519\u8BEF\u3002
-PLUGIN_EXCEPTION_DIALOG_TITLE=\u63D2\u4EF6\u5F02\u5E38\u9519\u8BEF
-PROBLEM_ADDING_LISTENER=\u6DFB\u52A0\u76D1\u542C\u7A0B\u5E8F\u65F6\u51FA\u73B0\u95EE\u9898
-PROBLEM_DISPLAYING_MBEAN=\u663E\u793A MBean \u65F6\u51FA\u73B0\u95EE\u9898
-PROBLEM_INVOKING=\u8C03\u7528\u65F6\u51FA\u73B0\u95EE\u9898
-PROBLEM_REMOVING_LISTENER=\u5220\u9664\u76D1\u542C\u7A0B\u5E8F\u65F6\u51FA\u73B0\u95EE\u9898
-PROBLEM_SETTING_ATTRIBUTE=\u8BBE\u7F6E\u5C5E\u6027\u65F6\u51FA\u73B0\u95EE\u9898
-PROCESS_CPU_TIME=\u8FDB\u7A0B CPU \u65F6\u95F4
-READABLE=\u53EF\u8BFB
-RECONNECT=\u91CD\u65B0\u8FDE\u63A5
-REMOTE_PROCESS_COLON=\u8FDC\u7A0B\u8FDB\u7A0B(&R):
-REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=\u8FDC\u7A0B\u8FDB\u7A0B
-RESTORE_ALL=\u5168\u90E8\u8FD8\u539F(&R)
+PLOTTER_ACCESSIBLE_NAME_NO_DATA=未绘制数据。
+PLOTTER_SAVE_AS_MENU_ITEM=将数据另存为(&A)...
+PLOTTER_TIME_RANGE_MENU=时间范围(&T)
+PLUGIN_EXCEPTION_DIALOG_BUTTON_EXIT=退出
+PLUGIN_EXCEPTION_DIALOG_BUTTON_IGNORE=忽略
+PLUGIN_EXCEPTION_DIALOG_BUTTON_OK=确定
+PLUGIN_EXCEPTION_DIALOG_MESSAGE=%s 中出现意外的异常错误:\n\n%s\n\n有关详细信息, 请运行以 -debug 开头的命令获取。如果忽略, 则将隐藏后面的异常错误。
+PLUGIN_EXCEPTION_DIALOG_TITLE=插件异常错误
+PROBLEM_ADDING_LISTENER=添加监听程序时出现问题
+PROBLEM_DISPLAYING_MBEAN=显示 MBean 时出现问题
+PROBLEM_INVOKING=调用时出现问题
+PROBLEM_REMOVING_LISTENER=删除监听程序时出现问题
+PROBLEM_SETTING_ATTRIBUTE=设置属性时出现问题
+PROCESS_CPU_TIME=进程 CPU 时间
+READABLE=可读
+RECONNECT=重新连接
+REMOTE_PROCESS_COLON=远程进程(&R):
+REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=远程进程
+RESTORE_ALL=全部还原(&R)
 RETURN_TYPE=ReturnType
 SEQ_NUM=SeqNum
-SIZE_BYTES={0,number,integer} \u5B57\u8282
+SIZE_BYTES={0,number,integer} 字节
 SIZE_GB={0} Gb
 SIZE_KB={0} Kb
 SIZE_MB={0} Mb
-SOURCE=\u6E90
-STACK_TRACE=\n\u5806\u6808\u8DDF\u8E2A: \n
+SOURCE=源
+STACK_TRACE=\n堆栈跟踪: \n
 SUMMARY_TAB_HEADER_DATE_TIME_FORMAT=FULL,FULL
-SUMMARY_TAB_PENDING_FINALIZATION_LABEL=\u6682\u6302\u6700\u7EC8\u5904\u7406
-SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0}\u5BF9\u8C61
-SUMMARY_TAB_TAB_NAME=VM \u6982\u8981
-SUMMARY_TAB_VM_VERSION={0}\u7248\u672C {1}
-THREADS=\u7EBF\u7A0B
-THREAD_TAB_INFO_LABEL_FORMAT=<html>\u6D3B\u52A8: {0}    \u5CF0\u503C: {1}    \u603B\u8BA1: {2}</html>
-THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u7EBF\u7A0B\u4FE1\u606F
-THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u8868\u793A\u7EBF\u7A0B\u6570\u7684\u56FE\u8868\u3002
-THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[\u672A\u9009\u62E9\u7EBF\u7A0B]
-THRESHOLD=\u9608\u503C
-TILE=\u5E73\u94FA(&T)
-TIME_RANGE_COLON=\u65F6\u95F4\u8303\u56F4(&T):
-TIME=\u65F6\u95F4
+SUMMARY_TAB_PENDING_FINALIZATION_LABEL=暂挂最终处理
+SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0}对象
+SUMMARY_TAB_TAB_NAME=VM 概要
+SUMMARY_TAB_VM_VERSION={0}版本 {1}
+THREADS=线程
+THREAD_TAB_INFO_LABEL_FORMAT=<html>活动: {0}    峰值: {1}    总计: {2}</html>
+THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=线程信息
+THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=表示线程数的图表。
+THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[未选择线程]
+THRESHOLD=阈值
+TILE=平铺(&T)
+TIME_RANGE_COLON=时间范围(&T):
+TIME=时间
 TIME_STAMP=TimeStamp
-TOTAL_LOADED=\u52A0\u8F7D\u603B\u6570
-TOTAL_CLASSES_LOADED=\u5DF2\u52A0\u8F7D\u7C7B\u603B\u6570
-TOTAL_CLASSES_UNLOADED=\u5DF2\u5378\u8F7D\u7C7B\u603B\u6570
-TOTAL_COMPILE_TIME=\u603B\u7F16\u8BD1\u65F6\u95F4
-TOTAL_PHYSICAL_MEMORY=\u603B\u7269\u7406\u5185\u5B58
-TOTAL_THREADS_STARTED=\u542F\u52A8\u7684\u7EBF\u7A0B\u603B\u6570
-TOTAL_SWAP_SPACE=\u603B\u4EA4\u6362\u7A7A\u95F4
-TYPE=\u7C7B\u578B
-UNAVAILABLE=\u4E0D\u53EF\u7528
+TOTAL_LOADED=加载总数
+TOTAL_CLASSES_LOADED=已加载类总数
+TOTAL_CLASSES_UNLOADED=已卸载类总数
+TOTAL_COMPILE_TIME=总编译时间
+TOTAL_PHYSICAL_MEMORY=总物理内存
+TOTAL_THREADS_STARTED=启动的线程总数
+TOTAL_SWAP_SPACE=总交换空间
+TYPE=类型
+UNAVAILABLE=不可用
 UNKNOWN_CAPITALIZED=UNKNOWN
-UNKNOWN_HOST=\u672A\u77E5\u4E3B\u673A: {0}
-UNREGISTER=\u6CE8\u9500
-UPTIME=\u8FD0\u884C\u65F6\u95F4
-USAGE_THRESHOLD=\u7528\u6CD5\u9608\u503C
-REMOTE_TF_USAGE=<b>\u7528\u6CD5</b>: &&lt;hostname&&gt;:&&lt;port&&gt; \u6216 service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
-USED=\u5DF2\u7528
-USERNAME_COLON_=\u7528\u6237\u540D(&U):
-USERNAME_ACCESSIBLE_NAME=\u7528\u6237\u540D
+UNKNOWN_HOST=未知主机: {0}
+UNREGISTER=注销
+UPTIME=运行时间
+USAGE_THRESHOLD=用法阈值
+REMOTE_TF_USAGE=<b>用法</b>: &&lt;hostname&&gt;:&&lt;port&&gt; 或 service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
+USED=已用
+USERNAME_COLON_=用户名(&U):
+USERNAME_ACCESSIBLE_NAME=用户名
 USER_DATA=UserData
-VIRTUAL_MACHINE=\u865A\u62DF\u673A
-VM_ARGUMENTS=VM \u53C2\u6570
-VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=\u7528\u4E8E\u76D1\u89C6 Java \u865A\u62DF\u673A\u7684\u5185\u90E8\u6846\u67B6
-VALUE=\u503C
-VENDOR=\u4F9B\u5E94\u5546
-VERBOSE_OUTPUT=\u8BE6\u7EC6\u8F93\u51FA
-VERBOSE_OUTPUT_TOOLTIP=\u4E3A\u7C7B\u52A0\u8F7D\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA
-VIEW=\u89C6\u56FE
-WINDOW=\u7A97\u53E3(&W)
-WINDOWS=\u7A97\u53E3
-WRITABLE=\u53EF\u5199\u5165
-CONNECTION_FAILED1=\u8FDE\u63A5\u5931\u8D25: \u662F\u5426\u91CD\u8BD5?
-CONNECTION_FAILED2=\u672A\u6210\u529F\u8FDE\u63A5\u5230{0}\u3002<br>\u662F\u5426\u8981\u91CD\u8BD5?
-CONNECTION_FAILED_SSL1=\u5B89\u5168\u8FDE\u63A5\u5931\u8D25\u3002\u662F\u5426\u4EE5\u4E0D\u5B89\u5168\u7684\u65B9\u5F0F\u91CD\u8BD5?
-CONNECTION_FAILED_SSL2=\u65E0\u6CD5\u4F7F\u7528 SSL \u8FDE\u63A5\u5230{0}\u3002<br>\u662F\u5426\u5728\u4E0D\u4F7F\u7528 SSL \u7684\u60C5\u51B5\u4E0B\u8FDB\u884C\u5C1D\u8BD5?<br>(\u7528\u6237\u540D\u548C\u53E3\u4EE4\u5C06\u4EE5\u7EAF\u6587\u672C\u683C\u5F0F\u53D1\u9001\u3002)
-CONNECTION_LOST1=\u8FDE\u63A5\u4E22\u5931: \u662F\u5426\u91CD\u65B0\u8FDE\u63A5?
-CONNECTING_TO1=\u6B63\u5728\u8FDE\u63A5\u5230{0}
-CONNECTING_TO2=\u60A8\u5F53\u524D\u6B63\u5728\u8FDE\u63A5\u5230{0}\u3002<br>\u8FD9\u5C06\u9700\u8981\u51E0\u5206\u949F\u7684\u65F6\u95F4\u3002
-DEADLOCK_TAB=\u6B7B\u9501
-DEADLOCK_TAB_N=\u6B7B\u9501{0}
-EXPAND=\u5C55\u5F00
+VIRTUAL_MACHINE=虚拟机
+VM_ARGUMENTS=VM 参数
+VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=用于监视 Java 虚拟机的内部框架
+VALUE=值
+VENDOR=供应商
+VERBOSE_OUTPUT=详细输出
+VERBOSE_OUTPUT_TOOLTIP=为类加载系统启用详细输出
+VIEW=视图
+WINDOW=窗口(&W)
+WINDOWS=窗口
+WRITABLE=可写入
+CONNECTION_FAILED1=连接失败: 是否重试?
+CONNECTION_FAILED2=未成功连接到{0}。<br>是否要重试?
+CONNECTION_FAILED_SSL1=安全连接失败。是否以不安全的方式重试?
+CONNECTION_FAILED_SSL2=无法使用 SSL 连接到{0}。<br>是否在不使用 SSL 的情况下进行尝试?<br>(用户名和口令将以纯文本格式发送。)
+CONNECTION_LOST1=连接丢失: 是否重新连接?
+CONNECTING_TO1=正在连接到{0}
+CONNECTING_TO2=您当前正在连接到{0}。<br>这将需要几分钟的时间。
+DEADLOCK_TAB=死锁
+DEADLOCK_TAB_N=死锁{0}
+EXPAND=展开
 KBYTES={0} KB
-PLOT=\u7ED8\u56FE
-VISUALIZE=\u53EF\u89C6\u5316
-ZZ_USAGE_TEXT=\u7528\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n  -interval   \u5C06\u66F4\u65B0\u95F4\u9694\u8BBE\u7F6E\u4E3A n \u79D2 (\u9ED8\u8BA4\u503C\u4E3A 4 \u79D2)\n  -notile     \u521D\u59CB\u4E0D\u5E73\u94FA\u7A97\u53E3 (\u5BF9\u4E8E\u4E24\u4E2A\u6216\u591A\u4E2A\u8FDE\u63A5)\n  -pluginpath \u6307\u5B9A jconsole \u7528\u4E8E\u67E5\u627E\u63D2\u4EF6\u7684\u8DEF\u5F84\n  -version    \u8F93\u51FA\u7A0B\u5E8F\u7248\u672C\n\n  connection = pid || host:port || JMX URL (service:jmx:<\u534F\u8BAE>://...)\n  pid         \u76EE\u6807\u8FDB\u7A0B\u7684\u8FDB\u7A0B ID\n  host        \u8FDC\u7A0B\u4E3B\u673A\u540D\u6216 IP \u5730\u5740\n  port        \u8FDC\u7A0B\u8FDE\u63A5\u7684\u7AEF\u53E3\u53F7\n\n  -J          \u6307\u5B9A\u8FD0\u884C jconsole \u7684 Java \u865A\u62DF\u673A\n              \u7684\u8F93\u5165\u53C2\u6570
+PLOT=绘图
+VISUALIZE=可视化
+ZZ_USAGE_TEXT=用法: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n  -interval   将更新间隔设置为 n 秒 (默认值为 4 秒)\n  -notile     初始不平铺窗口 (对于两个或多个连接)\n  -pluginpath 指定 jconsole 用于查找插件的路径\n  -version    输出程序版本\n\n  connection = pid || host:port || JMX URL (service:jmx:<协议>://...)\n  pid         目标进程的进程 ID\n  host        远程主机名或 IP 地址\n  port        远程连接的端口号\n\n  -J          指定运行 jconsole 的 Java 虚拟机\n              的输入参数
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
index 40888e36528..44265e8a6a5 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
@@ -27,52 +27,52 @@ javap.description=Mindestens eine Klassendatei disassemblieren
 
 err.prefix=Fehler:
 
-err.bad.constant.pool=Fehler beim Lesen von Konstantenpool f\u00FCr {0}: {1}
+err.bad.constant.pool=Fehler beim Lesen von Konstantenpool für {0}: {1}
 err.class.not.found=Klasse nicht gefunden: {0}
 err.crash=Ein schwerwiegender interner Fehler ist aufgetreten: {0}\nMelden Sie einen Bug mit den folgenden Informationen:\n{1}
 err.end.of.file=unerwartetes Dateiende beim Lesen von {0}
 err.file.not.found=Datei nicht gefunden: {0}
-err.incompatible.options=ung\u00FCltige Optionenkombination: {0}
+err.incompatible.options=ungültige Optionenkombination: {0}
 err.internal.error=interner Fehler: {0} {1} {2}
-err.invalid.arg.for.option=ung\u00FCltiges Argument f\u00FCr Option: {0}
+err.invalid.arg.for.option=ungültiges Argument für Option: {0}
 err.ioerror=I/O-Fehler beim Lesen von {0}: {1}
-err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.missing.arg=kein Wert angegeben für {0}
 err.no.classes.specified=keine Klassen angegeben
-err.not.standard.file.manager=Klassendateien k\u00F6nnen nur angegeben werden, wenn ein Standarddateimanager verwendet wird
-err.invalid.use.of.option=ung\u00FCltige Verwendung von Option: {0}
+err.not.standard.file.manager=Klassendateien können nur angegeben werden, wenn ein Standarddateimanager verwendet wird
+err.invalid.use.of.option=ungültige Verwendung von Option: {0}
 err.unknown.option=unbekannte Option: {0}
 err.no.SourceFile.attribute=kein SourceFile-Attribut
 err.source.file.not.found=Quelldatei nicht gefunden
-err.bad.innerclasses.attribute=ung\u00FCltiges InnerClasses-Attribut f\u00FCr {0}
-err.nomem=Nicht gen\u00FCgend Speicher. Verwenden Sie die Option -J-Xmx zum Erweitern des Speichers.
+err.bad.innerclasses.attribute=ungültiges InnerClasses-Attribut für {0}
+err.nomem=Nicht genügend Speicher. Verwenden Sie die Option -J-Xmx zum Erweitern des Speichers.
 err.cant.find.module=Modul {0} nicht gefunden
 err.cant.find.module.ex=Problem beim Auffinden von Modul {0}: {1}
-err.only.for.launcher=Diese Option kann nur verwendet werden, wenn javap \u00FCber den Befehlszeilen-Launcher aufgerufen wird.
+err.only.for.launcher=Diese Option kann nur verwendet werden, wenn javap über den Befehlszeilen-Launcher aufgerufen wird.
 err.fatal.err=Schwerwiegender Fehler: {0}
 
-main.usage.summary=Verwendung: {0} <Optionen> <Klassen>\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+main.usage.summary=Verwendung: {0} <Optionen> <Klassen>\nMit --help können Sie eine Liste der möglichen Optionen aufrufen
 
 warn.prefix=Warnung:
-warn.unexpected.class=Datei {0} enth\u00E4lt nicht die Klasse {1}
+warn.unexpected.class=Datei {0} enthält nicht die Klasse {1}
 
 note.prefix=Hinweis:
 
-main.usage=Verwendung: {0} <Optionen> <Klassen>\nwobei folgende Optionen m\u00F6glich sind:
+main.usage=Verwendung: {0} <Optionen> <Klassen>\nwobei folgende Optionen möglich sind:
 
 
 main.opt.help=\  --help -help -h -?               Gibt diese Hilfemeldung aus
 
 main.opt.version=\  -version                         Versionsinformationen
 
-main.opt.v=\  -v  -verbose                     Gibt zus\u00E4tzliche Informationen aus
+main.opt.v=\  -v  -verbose                     Gibt zusätzliche Informationen aus
 
 main.opt.l=\  -l                               Gibt die Zeilennummer und lokale Variablentabellen aus
 
-main.opt.public=\  -public                          Zeigt nur \u00F6ffentliche Klassen und Mitglieder
+main.opt.public=\  -public                          Zeigt nur öffentliche Klassen und Mitglieder
 
-main.opt.protected=\  -protected                       Zeigt gesch\u00FCtzte/\u00F6ffentliche Klassen und Mitglieder
+main.opt.protected=\  -protected                       Zeigt geschützte/öffentliche Klassen und Mitglieder
 
-main.opt.package=\  -package                         Zeigt Package/gesch\u00FCtzte/\u00F6ffentliche Klassen\n                                   und Mitglieder (Standard)
+main.opt.package=\  -package                         Zeigt Package/geschützte/öffentliche Klassen\n                                   und Mitglieder (Standard)
 
 main.opt.p=\  -p  -private                     Zeigt alle Klassen und Mitglieder
 
@@ -86,9 +86,9 @@ main.opt.classpath=\  -classpath <Pfad>                Gibt an, wo sich Benutzer
 
 main.opt.cp=\  -cp <Pfad>                       Gibt an, wo sich Benutzerklassendateien befinden
 
-main.opt.bootclasspath=\  -bootclasspath <Pfad>            Setzt den Speicherort von Bootstrap-Klassendateien au\u00DFer Kraft
+main.opt.bootclasspath=\  -bootclasspath <Pfad>            Setzt den Speicherort von Bootstrap-Klassendateien außer Kraft
 
-main.opt.upgrade_module_path=\  --upgrade-module-path <Pfad>     Gibt an, wo sich die upgradef\u00E4higen Module befinden
+main.opt.upgrade_module_path=\  --upgrade-module-path <Pfad>     Gibt an, wo sich die upgradefähigen Module befinden
 
 main.opt.system=\  --system <JDK>                   Gibt an, wo sich die Systemmodule befinden
 
@@ -96,12 +96,12 @@ main.opt.module_path=\  --module-path <Pfad>             Gibt an, wo sich die An
 
 main.opt.multi_release=\  --multi-release <version>        Gibt die Version an, die in Multi-Release-JAR-Dateien verwendet werden soll
 
-main.opt.constants=\  -constants                       Zeigt die endg\u00FCltigen Konstanten
+main.opt.constants=\  -constants                       Zeigt die endgültigen Konstanten
 
-main.opt.sysinfo=\  -sysinfo                         Zeigt die Systeminformationen (Pfad, Gr\u00F6\u00DFe, Datum, SHA-256-Hash)\n                                   der Klasse, die verarbeitet wird
+main.opt.sysinfo=\  -sysinfo                         Zeigt die Systeminformationen (Pfad, Größe, Datum, SHA-256-Hash)\n                                   der Klasse, die verarbeitet wird
 
-main.opt.module=\  --module <Modul>  -m <Modul>   Gibt das Modul an, das die zu disassemblierenden Klassen enth\u00E4lt
+main.opt.module=\  --module <Modul>  -m <Modul>   Gibt das Modul an, das die zu disassemblierenden Klassen enthält
 
 main.opt.J=\  -J<vm-option>                    Gibt eine VM-Option an
 
-main.usage.foot=\nF\u00FCr Optionen im GNU-Stil kann "=" statt Leerzeichen verwendet werden, um den Namen einer Option\nvon ihrem Wert zu trennen.\n\nJede zu zeigende Klasse kann durch einen Dateinamen, eine URL oder durch ihren vollst\u00E4ndig\nqualifizierten Klassennamen angegeben werden. Beispiele:\n   path/to/MyClass.class\n   jar:file:///path/to/MyJar.jar!/mypkg/MyClass.class\n   java.lang.Object\n
+main.usage.foot=\nFür Optionen im GNU-Stil kann "=" statt Leerzeichen verwendet werden, um den Namen einer Option\nvon ihrem Wert zu trennen.\n\nJede zu zeigende Klasse kann durch einen Dateinamen, eine URL oder durch ihren vollständig\nqualifizierten Klassennamen angegeben werden. Beispiele:\n   path/to/MyClass.class\n   jar:file:///path/to/MyJar.jar!/mypkg/MyClass.class\n   java.lang.Object\n
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
index 3e3a46ba4e5..01e587336c5 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
@@ -23,85 +23,85 @@
 # questions.
 #
 
-javap.description=1\u3064\u4EE5\u4E0A\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u9006\u30A2\u30BB\u30F3\u30D6\u30EB\u3057\u307E\u3059
+javap.description=1つ以上のクラス・ファイルを逆アセンブルします
 
-err.prefix=\u30A8\u30E9\u30FC:
+err.prefix=エラー:
 
-err.bad.constant.pool={0}\u306E\u5B9A\u6570\u30D7\u30FC\u30EB\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
-err.class.not.found=\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-err.crash=\u91CD\u5927\u306A\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\u6B21\u306E\u60C5\u5831\u3092\u542B\u3080bug\u30EC\u30DD\u30FC\u30C8\u3092\u30D5\u30A1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044:\n{1}
-err.end.of.file={0}\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u4E88\u671F\u3057\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F
-err.file.not.found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-err.incompatible.options=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u7D44\u5408\u305B\u304C\u4E0D\u6B63\u3067\u3059: {0}
-err.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC: {0} {1} {2}
-err.invalid.arg.for.option=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: {0}
-err.ioerror={0}\u306E\u8AAD\u53D6\u308A\u4E2D\u306BIO\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
-err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-err.no.classes.specified=\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-err.not.standard.file.manager=\u6A19\u6E96\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u5834\u5408\u306F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u307F\u6307\u5B9A\u3067\u304D\u307E\u3059
-err.invalid.use.of.option=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528\u304C\u7121\u52B9\u3067\u3059: {0}
-err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
-err.no.SourceFile.attribute=SourceFile\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093
-err.source.file.not.found=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-err.bad.innerclasses.attribute={0}\u306EInnerClasses\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059
-err.nomem=\u30E1\u30E2\u30EA\u30FC\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002\u30E1\u30E2\u30EA\u30FC\u3092\u5897\u3084\u3059\u306B\u306F\u3001-J-Xmx\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
-err.cant.find.module=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-err.cant.find.module.ex=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306E\u691C\u7D22\u4E2D\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
-err.only.for.launcher=\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u304B\u3089javap\u3092\u8D77\u52D5\u3057\u305F\u5834\u5408\u306B\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-err.fatal.err=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: {0}
+err.bad.constant.pool={0}の定数プールの読取り中にエラーが発生しました: {1}
+err.class.not.found=クラスが見つかりません: {0}
+err.crash=重大な内部エラーが発生しました: {0}\n次の情報を含むbugレポートをファイルしてください:\n{1}
+err.end.of.file={0}の読取り中に予期しないファイルの終わりが検出されました
+err.file.not.found=ファイルが見つかりません: {0}
+err.incompatible.options=オプションの組合せが不正です: {0}
+err.internal.error=内部エラー: {0} {1} {2}
+err.invalid.arg.for.option=オプションの引数が無効です: {0}
+err.ioerror={0}の読取り中にIOエラーが発生しました: {1}
+err.missing.arg={0}に値が指定されていません
+err.no.classes.specified=クラスが指定されていません
+err.not.standard.file.manager=標準ファイル・マネージャを使用している場合はクラス・ファイルのみ指定できます
+err.invalid.use.of.option=オプションの使用が無効です: {0}
+err.unknown.option=不明なオプション: {0}
+err.no.SourceFile.attribute=SourceFile属性がありません
+err.source.file.not.found=ソース・ファイルが見つかりません
+err.bad.innerclasses.attribute={0}のInnerClasses属性が不正です
+err.nomem=メモリーが不足しています。メモリーを増やすには、-J-Xmxオプションを使用します。
+err.cant.find.module=モジュール{0}が見つかりません
+err.cant.find.module.ex=モジュール{0}の検索中に問題が発生しました: {1}
+err.only.for.launcher=このオプションは、コマンドライン・ランチャからjavapを起動した場合にのみ使用できます。
+err.fatal.err=致命的エラー: {0}
 
-main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001--help\u3092\u4F7F\u7528\u3057\u307E\u3059
+main.usage.summary=使用方法: {0} <options> <classes>\n使用可能なオプションのリストについては、--helpを使用します
 
-warn.prefix=\u8B66\u544A:
-warn.unexpected.class=\u30D5\u30A1\u30A4\u30EB{0}\u306B\u30AF\u30E9\u30B9{1}\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
+warn.prefix=警告:
+warn.unexpected.class=ファイル{0}にクラス{1}が含まれていません
 
-note.prefix=\u30CE\u30FC\u30C8:
+note.prefix=ノート:
 
-main.usage=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:
+main.usage=使用方法: {0} <options> <classes>\n使用可能なオプションには次のものがあります:
 
 
-main.opt.help=\  --help -help -h -?               \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
+main.opt.help=\  --help -help -h -?               このヘルプ・メッセージを出力する
 
-main.opt.version=\  -version                         \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
+main.opt.version=\  -version                         バージョン情報
 
-main.opt.v=\  -v  -verbose                     \u8FFD\u52A0\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B
+main.opt.v=\  -v  -verbose                     追加情報を出力する
 
-main.opt.l=\  -l                               \u884C\u756A\u53F7\u3068\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u8868\u3092\u51FA\u529B\u3059\u308B
+main.opt.l=\  -l                               行番号とローカル変数表を出力する
 
-main.opt.public=\  -public                          public\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u8868\u793A\u3059\u308B
+main.opt.public=\  -public                          publicクラスおよびメンバーのみを表示する
 
-main.opt.protected=\  -protected                       protected/public\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u8868\u793A\u3059\u308B
+main.opt.protected=\  -protected                       protected/publicクラスおよびメンバーのみを表示する
 
-main.opt.package=\  -package                         package/protected/public\u30AF\u30E9\u30B9\u304A\u3088\u3073\n                                   \u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u8868\u793A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)
+main.opt.package=\  -package                         package/protected/publicクラスおよび\n                                   メンバーのみを表示する(デフォルト)
 
-main.opt.p=\  -p  -private                     \u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u8868\u793A\u3059\u308B
+main.opt.p=\  -p  -private                     すべてのクラスとメンバーを表示する
 
-main.opt.c=\  -c                               \u30B3\u30FC\u30C9\u3092\u9006\u30A2\u30BB\u30F3\u30D6\u30EB\u3059\u308B
+main.opt.c=\  -c                               コードを逆アセンブルする
 
-main.opt.s=\  -s                               \u5185\u90E8\u30BF\u30A4\u30D7\u7F72\u540D\u3092\u51FA\u529B\u3059\u308B
+main.opt.s=\  -s                               内部タイプ署名を出力する
 
-main.opt.class_path=\  --class-path <path>              \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
+main.opt.class_path=\  --class-path <path>              ユーザー・クラス・ファイルのある場所を指定する
 
-main.opt.classpath=\  -classpath <path>                \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
+main.opt.classpath=\  -classpath <path>                ユーザー・クラス・ファイルを検索する場所を指定する
 
-main.opt.cp=\  -cp <path>                       \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
+main.opt.cp=\  -cp <path>                       ユーザー・クラス・ファイルを検索する場所を指定する
 
-main.opt.bootclasspath=\  -bootclasspath <path>            \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
+main.opt.bootclasspath=\  -bootclasspath <path>            ブートストラップ・クラス・ファイルの場所をオーバーライドする
 
-main.opt.upgrade_module_path=\  --upgrade-module-path <path>     \u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
+main.opt.upgrade_module_path=\  --upgrade-module-path <path>     アップグレード可能なモジュールを検索する場所を指定する
 
-main.opt.system=\  --system <jdk>                   \u30B7\u30B9\u30C6\u30E0\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
+main.opt.system=\  --system <jdk>                   システム・モジュールを検索する場所を指定する
 
-main.opt.module_path=\  --module-path <path>             \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
+main.opt.module_path=\  --module-path <path>             アプリケーション・モジュールを検索する場所を指定する
 
-main.opt.multi_release=\  --multi-release <version>        \u30DE\u30EB\u30C1\u30EA\u30EA\u30FC\u30B9JAR\u30D5\u30A1\u30A4\u30EB\u3067\u4F7F\u7528\u3059\u308B\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059
+main.opt.multi_release=\  --multi-release <version>        マルチリリースJARファイルで使用するバージョンを指定します
 
-main.opt.constants=\  -constants                       final\u5B9A\u6570\u3092\u8868\u793A\u3059\u308B
+main.opt.constants=\  -constants                       final定数を表示する
 
-main.opt.sysinfo=\  -sysinfo                         \u51E6\u7406\u3057\u3066\u3044\u308B\u30AF\u30E9\u30B9\u306E\u30B7\u30B9\u30C6\u30E0\u60C5\u5831(\u30D1\u30B9\u3001\u30B5\u30A4\u30BA\u3001\u65E5\u4ED8\u3001SHA-256\u30CF\u30C3\u30B7\u30E5)\n                                   \u3092\u8868\u793A\u3057\u307E\u3059
+main.opt.sysinfo=\  -sysinfo                         処理しているクラスのシステム情報(パス、サイズ、日付、SHA-256ハッシュ)\n                                   を表示します
 
-main.opt.module=\  --module <module>  -m <module>   \u9006\u30A2\u30BB\u30F3\u30D6\u30EB\u3055\u308C\u308B\u30AF\u30E9\u30B9\u3092\u542B\u3080\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3059\u308B
+main.opt.module=\  --module <module>  -m <module>   逆アセンブルされるクラスを含むモジュールを指定する
 
-main.opt.J=\  -J<vm-option>                    VM\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B
+main.opt.J=\  -J<vm-option>                    VMオプションを指定する
 
-main.usage.foot=\nGNU\u30B9\u30BF\u30A4\u30EB\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u540D\u524D\u3068\u305D\u306E\u5024\u3092\u533A\u5207\u308B\u305F\u3081\u306B\u7A7A\u767D\u3067\u306F\u306A\u304F'='\u3092\n\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\n\u8868\u793A\u3055\u308C\u308B\u5404\u30AF\u30E9\u30B9\u306F\u3001\u30D5\u30A1\u30A4\u30EB\u540D\u3001URL\u307E\u305F\u306F\u305D\u306E\u5B8C\u5168\u4FEE\u98FE\u30AF\u30E9\u30B9\u540D\n\u3067\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\u4F8B:\n   path/to/MyClass.class\n   jar:file:///path/to/MyJar.jar!/mypkg/MyClass.class\n   java.lang.Object\n
+main.usage.foot=\nGNUスタイル・オプションでは、オプションの名前とその値を区切るために空白ではなく'='を\n使用できます。\n\n表示される各クラスは、ファイル名、URLまたはその完全修飾クラス名\nで指定できます。例:\n   path/to/MyClass.class\n   jar:file:///path/to/MyJar.jar!/mypkg/MyClass.class\n   java.lang.Object\n
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
index a778ac21948..57e3e6ac2eb 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
@@ -23,85 +23,85 @@
 # questions.
 #
 
-javap.description=\u53CD\u6C47\u7F16\u4E00\u4E2A\u6216\u591A\u4E2A\u7C7B\u6587\u4EF6
+javap.description=反汇编一个或多个类文件
 
-err.prefix=\u9519\u8BEF:
+err.prefix=错误:
 
-err.bad.constant.pool=\u8BFB\u53D6{0}\u7684\u5E38\u91CF\u6C60\u65F6\u51FA\u9519: {1}
-err.class.not.found=\u627E\u4E0D\u5230\u7C7B: {0}
-err.crash=\u51FA\u73B0\u4E25\u91CD\u7684\u5185\u90E8\u9519\u8BEF: {0}\n\u8BF7\u63D0\u4EA4 Bug \u62A5\u544A, \u5E76\u5305\u62EC\u4EE5\u4E0B\u4FE1\u606F:\n{1}
-err.end.of.file=\u8BFB\u53D6{0}\u65F6\u51FA\u73B0\u610F\u5916\u7684\u6587\u4EF6\u7ED3\u5C3E
-err.file.not.found=\u627E\u4E0D\u5230\u6587\u4EF6: {0}
-err.incompatible.options=\u9009\u9879\u7EC4\u5408\u9519\u8BEF: {0}
-err.internal.error=\u5185\u90E8\u9519\u8BEF: {0} {1} {2}
-err.invalid.arg.for.option=\u9009\u9879\u7684\u53C2\u6570\u65E0\u6548: {0}
-err.ioerror=\u8BFB\u53D6{0}\u65F6\u51FA\u73B0 IO \u9519\u8BEF: {1}
-err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
-err.no.classes.specified=\u672A\u6307\u5B9A\u7C7B
-err.not.standard.file.manager=\u4F7F\u7528\u6807\u51C6\u6587\u4EF6\u7BA1\u7406\u5668\u65F6\u53EA\u80FD\u6307\u5B9A\u7C7B\u6587\u4EF6
-err.invalid.use.of.option=\u9009\u9879\u7684\u4F7F\u7528\u65E0\u6548: {0}
-err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
-err.no.SourceFile.attribute=\u6CA1\u6709 SourceFile \u5C5E\u6027
-err.source.file.not.found=\u627E\u4E0D\u5230\u6E90\u6587\u4EF6
-err.bad.innerclasses.attribute={0}\u7684 InnerClasses \u5C5E\u6027\u9519\u8BEF
-err.nomem=\u5185\u5B58\u4E0D\u8DB3\u3002\u8981\u589E\u5927\u5185\u5B58, \u8BF7\u4F7F\u7528 -J-Xmx \u9009\u9879\u3002
-err.cant.find.module=\u627E\u4E0D\u5230\u6A21\u5757 {0}
-err.cant.find.module.ex=\u67E5\u627E\u6A21\u5757 {0} \u65F6\u51FA\u73B0\u95EE\u9898: {1}
-err.only.for.launcher=\u4EC5\u5F53\u4ECE\u547D\u4EE4\u884C\u542F\u52A8\u7A0B\u5E8F\u8C03\u7528 javap \u65F6\uFF0C\u624D\u80FD\u4F7F\u7528\u6B64\u9009\u9879\u3002
-err.fatal.err=\u81F4\u547D\u9519\u8BEF: {0}
+err.bad.constant.pool=读取{0}的常量池时出错: {1}
+err.class.not.found=找不到类: {0}
+err.crash=出现严重的内部错误: {0}\n请提交 Bug 报告, 并包括以下信息:\n{1}
+err.end.of.file=读取{0}时出现意外的文件结尾
+err.file.not.found=找不到文件: {0}
+err.incompatible.options=选项组合错误: {0}
+err.internal.error=内部错误: {0} {1} {2}
+err.invalid.arg.for.option=选项的参数无效: {0}
+err.ioerror=读取{0}时出现 IO 错误: {1}
+err.missing.arg=没有为{0}指定值
+err.no.classes.specified=未指定类
+err.not.standard.file.manager=使用标准文件管理器时只能指定类文件
+err.invalid.use.of.option=选项的使用无效: {0}
+err.unknown.option=未知选项: {0}
+err.no.SourceFile.attribute=没有 SourceFile 属性
+err.source.file.not.found=找不到源文件
+err.bad.innerclasses.attribute={0}的 InnerClasses 属性错误
+err.nomem=内存不足。要增大内存, 请使用 -J-Xmx 选项。
+err.cant.find.module=找不到模块 {0}
+err.cant.find.module.ex=查找模块 {0} 时出现问题: {1}
+err.only.for.launcher=仅当从命令行启动程序调用 javap 时，才能使用此选项。
+err.fatal.err=致命错误: {0}
 
-main.usage.summary=\u7528\u6CD5\uFF1A{0} <\u9009\u9879> <\u7C7B>\n\u4F7F\u7528 --help \u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
+main.usage.summary=用法：{0} <选项> <类>\n使用 --help 列出可能的选项
 
-warn.prefix=\u8B66\u544A:
-warn.unexpected.class=\u6587\u4EF6 {0} \u4E0D\u5305\u542B\u7C7B {1}
+warn.prefix=警告:
+warn.unexpected.class=文件 {0} 不包含类 {1}
 
-note.prefix=\u6CE8:
+note.prefix=注:
 
-main.usage=\u7528\u6CD5: {0} <options> <classes>\n\u5176\u4E2D, \u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC:
+main.usage=用法: {0} <options> <classes>\n其中, 可能的选项包括:
 
 
-main.opt.help=\  --help -help -h -?               \u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F
+main.opt.help=\  --help -help -h -?               输出此帮助消息
 
-main.opt.version=\  -version                         \u7248\u672C\u4FE1\u606F
+main.opt.version=\  -version                         版本信息
 
-main.opt.v=\  -v  -verbose                     \u8F93\u51FA\u9644\u52A0\u4FE1\u606F
+main.opt.v=\  -v  -verbose                     输出附加信息
 
-main.opt.l=\  -l                               \u8F93\u51FA\u884C\u53F7\u548C\u672C\u5730\u53D8\u91CF\u8868
+main.opt.l=\  -l                               输出行号和本地变量表
 
-main.opt.public=\  -public                          \u4EC5\u663E\u793A\u516C\u5171\u7C7B\u548C\u6210\u5458
+main.opt.public=\  -public                          仅显示公共类和成员
 
-main.opt.protected=\  -protected                       \u663E\u793A\u53D7\u4FDD\u62A4\u7684/\u516C\u5171\u7C7B\u548C\u6210\u5458
+main.opt.protected=\  -protected                       显示受保护的/公共类和成员
 
-main.opt.package=\  -package                         \u663E\u793A\u7A0B\u5E8F\u5305/\u53D7\u4FDD\u62A4\u7684/\u516C\u5171\u7C7B\n                                   \u548C\u6210\u5458 (\u9ED8\u8BA4)
+main.opt.package=\  -package                         显示程序包/受保护的/公共类\n                                   和成员 (默认)
 
-main.opt.p=\  -p  -private                     \u663E\u793A\u6240\u6709\u7C7B\u548C\u6210\u5458
+main.opt.p=\  -p  -private                     显示所有类和成员
 
-main.opt.c=\  -c                               \u5BF9\u4EE3\u7801\u8FDB\u884C\u53CD\u6C47\u7F16
+main.opt.c=\  -c                               对代码进行反汇编
 
-main.opt.s=\  -s                               \u8F93\u51FA\u5185\u90E8\u7C7B\u578B\u7B7E\u540D
+main.opt.s=\  -s                               输出内部类型签名
 
-main.opt.class_path=\  --class-path <\u8DEF\u5F84>              \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
+main.opt.class_path=\  --class-path <路径>              指定查找用户类文件的位置
 
-main.opt.classpath=\  -classpath <\u8DEF\u5F84>                \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
+main.opt.classpath=\  -classpath <路径>                指定查找用户类文件的位置
 
-main.opt.cp=\  -cp <\u8DEF\u5F84>                       \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
+main.opt.cp=\  -cp <路径>                       指定查找用户类文件的位置
 
-main.opt.bootclasspath=\  -bootclasspath <\u8DEF\u5F84>            \u8986\u76D6\u5F15\u5BFC\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
+main.opt.bootclasspath=\  -bootclasspath <路径>            覆盖引导类文件的位置
 
-main.opt.upgrade_module_path=\  --upgrade-module-path <\u8DEF\u5F84>     \u6307\u5B9A\u67E5\u627E\u53EF\u5347\u7EA7\u6A21\u5757\u7684\u4F4D\u7F6E
+main.opt.upgrade_module_path=\  --upgrade-module-path <路径>     指定查找可升级模块的位置
 
-main.opt.system=\  --system <jdk>                   \u6307\u5B9A\u67E5\u627E\u7CFB\u7EDF\u6A21\u5757\u7684\u4F4D\u7F6E
+main.opt.system=\  --system <jdk>                   指定查找系统模块的位置
 
-main.opt.module_path=\  --module-path <\u8DEF\u5F84>             \u6307\u5B9A\u67E5\u627E\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u4F4D\u7F6E
+main.opt.module_path=\  --module-path <路径>             指定查找应用程序模块的位置
 
-main.opt.multi_release=\  --multi-release <version>        \u6307\u5B9A\u8981\u5728\u591A\u53D1\u884C\u7248 JAR \u6587\u4EF6\u4E2D\u4F7F\u7528\u7684\u7248\u672C
+main.opt.multi_release=\  --multi-release <version>        指定要在多发行版 JAR 文件中使用的版本
 
-main.opt.constants=\  -constants                       \u663E\u793A\u6700\u7EC8\u5E38\u91CF
+main.opt.constants=\  -constants                       显示最终常量
 
-main.opt.sysinfo=\  -sysinfo                         \u663E\u793A\u6B63\u5728\u5904\u7406\u7684\u7C7B\u7684\n                                   \u7CFB\u7EDF\u4FE1\u606F\uFF08\u8DEF\u5F84\u3001\u5927\u5C0F\u3001\u65E5\u671F\u3001SHA-256 \u6563\u5217\uFF09
+main.opt.sysinfo=\  -sysinfo                         显示正在处理的类的\n                                   系统信息（路径、大小、日期、SHA-256 散列）
 
-main.opt.module=\  --module <module>  -m <module>   \u6307\u5B9A\u5305\u542B\u8981\u53CD\u6C47\u7F16\u7684\u7C7B\u7684\u6A21\u5757
+main.opt.module=\  --module <module>  -m <module>   指定包含要反汇编的类的模块
 
-main.opt.J=\  -J<vm-option>                    \u6307\u5B9A VM \u9009\u9879
+main.opt.J=\  -J<vm-option>                    指定 VM 选项
 
-main.usage.foot=\nGNU \u6837\u5F0F\u7684\u9009\u9879\u53EF\u4F7F\u7528 '=' (\u800C\u975E\u7A7A\u767D) \u6765\u5206\u9694\u9009\u9879\u540D\u79F0\n\u53CA\u5176\u503C\u3002\n\n\u6BCF\u4E2A\u7C7B\u53EF\u7531\u5176\u6587\u4EF6\u540D, URL \u6216\u5176\n\u5168\u9650\u5B9A\u7C7B\u540D\u6307\u5B9A\u3002\u793A\u4F8B:\n   path/to/MyClass.class\n   jar:file:///path/to/MyJar.jar!/mypkg/MyClass.class\n   java.lang.Object\n
+main.usage.foot=\nGNU 样式的选项可使用 '=' (而非空白) 来分隔选项名称\n及其值。\n\n每个类可由其文件名, URL 或其\n全限定类名指定。示例:\n   path/to/MyClass.class\n   jar:file:///path/to/MyJar.jar!/mypkg/MyClass.class\n   java.lang.Object\n
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties
index 4f3f2c614bd..15bda5863a5 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties
@@ -25,9 +25,9 @@
 
 main.usage=Verwendung: jdeprscan [Optionen] '{dir|jar|class}' ...\n\nOptionen:\n        --class-path PATH\n        --for-removal\n        --full-version\n  -? -h --help\n  -l    --list\n        --release {0}\n  -v    --verbose\n        --version
 
-main.help=Scannt jedes Argument auf die Verwendung veralteter APIs. Ein Argument\nkann ein Verzeichnis, das die Root einer Packagehierarchie angibt,\neine JAR-Datei, eine Klassendatei oder ein Klassenname sein. Der Klassenname\nmuss durch einen vollst\u00E4ndig qualifizierten Klassennamen mit $ als Trennzeichen\nf\u00FCr verschachtelte Klassen angegeben werden. Beispiel:\n\n    java.lang.Thread$State\n\nDie Option --class-path liefert einen Suchpfad f\u00FCr die Aufl\u00F6sung\nvon abh\u00E4ngigen Klassen.\n\nDie Option --for-removal begrenzt das Scannen oder Auflisten auf APIs, die veraltet sind\nund entfernt werden sollen. Kann nicht mit den Releasewerten 6, 7, oder 8 verwendet werden.\n\nDie Option --full-version gibt die vollst\u00E4ndige Versionszeichenfolge des Tools aus.\n\nDie Option --help (-? -h) gibt eine vollst\u00E4ndige Hilfemeldung aus.\n\nDie Option --list (-l) gibt die Gruppe der veralteten APIs aus. Es wird nicht gescannt,\ndaher d\u00FCrfen keine Verzeichnis-, JAR- oder Klassenargumente angegeben werden.\n\nDie Option --release gibt das Java SE-Release an, das die Gruppe\nder veralteten APIS zum Scannen liefert.\n\nDie Option --verbose (-v) aktiviert die Ausgabe zus\u00E4tzlicher Meldungen w\u00E4hrend der Verarbeitung.\n\nDie Option --version gibt die verk\u00FCrzte Versionszeichenfolge des Tools aus.
+main.help=Scannt jedes Argument auf die Verwendung veralteter APIs. Ein Argument\nkann ein Verzeichnis, das die Root einer Packagehierarchie angibt,\neine JAR-Datei, eine Klassendatei oder ein Klassenname sein. Der Klassenname\nmuss durch einen vollständig qualifizierten Klassennamen mit $ als Trennzeichen\nfür verschachtelte Klassen angegeben werden. Beispiel:\n\n    java.lang.Thread$State\n\nDie Option --class-path liefert einen Suchpfad für die Auflösung\nvon abhängigen Klassen.\n\nDie Option --for-removal begrenzt das Scannen oder Auflisten auf APIs, die veraltet sind\nund entfernt werden sollen. Kann nicht mit den Releasewerten 6, 7, oder 8 verwendet werden.\n\nDie Option --full-version gibt die vollständige Versionszeichenfolge des Tools aus.\n\nDie Option --help (-? -h) gibt eine vollständige Hilfemeldung aus.\n\nDie Option --list (-l) gibt die Gruppe der veralteten APIs aus. Es wird nicht gescannt,\ndaher dürfen keine Verzeichnis-, JAR- oder Klassenargumente angegeben werden.\n\nDie Option --release gibt das Java SE-Release an, das die Gruppe\nder veralteten APIS zum Scannen liefert.\n\nDie Option --verbose (-v) aktiviert die Ausgabe zusätzlicher Meldungen während der Verarbeitung.\n\nDie Option --version gibt die verkürzte Versionszeichenfolge des Tools aus.
 
-main.xhelp=Nicht unterst\u00FCtzte Optionen:\n\n  --Xload-class CLASS\n      L\u00E4dt Veraltungsinformationen aus der benannten Klasse.\n  --Xload-csv CSVFILE\n      L\u00E4dt Veraltungsinformationen aus der benannten CSV-Datei.\n  --Xload-dir DIR\n      L\u00E4dt Veraltungsinformationen aus der Klassenhierarchie\n      im benannten Verzeichnis.\n  --Xload-jar JARFILE\n      L\u00E4dt Veraltungsinformationen aus der benannten JAR-Datei.\n  --Xload-jdk9 JAVA_HOME\n      L\u00E4dt Veraltungsinformationen aus dem JDK in\n      JAVA_HOME, das ein modulares JDK sein muss.\n  --Xload-old-jdk JAVA_HOME\n      L\u00E4dt Veraltungsinformationen aus dem JDK in\n      JAVA_HOME, das kein modulares JDK sein darf. Stattdessen\n      muss das benannte JDK ein "klassisches" JDK mit einer rt.jar-Datei sein.\n  --Xload-self\n      L\u00E4dt Veraltungsinformationen durch Traversieren des jrt:-\n      Dateisystems des ausgef\u00FChrten JDK-Images.\n  --Xcompiler-arg ARG\n      F\u00FCgt ARG der Liste der Compilerargumente hinzu.\n  --Xcsv-comment COMMENT\n      F\u00FCgt COMMENT als Kommentarzeile der CSV-Ausgabedatei hinzu.\n      Nur effektiv, wenn auch -Xprint-csv angegeben wird.\n  --Xhelp\n      Gibt diese Meldung aus.\n  --Xprint-csv\n      Gibt eine CSV-Datei aus, welche die geladenen Veraltungsinformationen enth\u00E4lt,\n      statt Klassen oder JAR-Dateien zu scannen.
+main.xhelp=Nicht unterstützte Optionen:\n\n  --Xload-class CLASS\n      Lädt Veraltungsinformationen aus der benannten Klasse.\n  --Xload-csv CSVFILE\n      Lädt Veraltungsinformationen aus der benannten CSV-Datei.\n  --Xload-dir DIR\n      Lädt Veraltungsinformationen aus der Klassenhierarchie\n      im benannten Verzeichnis.\n  --Xload-jar JARFILE\n      Lädt Veraltungsinformationen aus der benannten JAR-Datei.\n  --Xload-jdk9 JAVA_HOME\n      Lädt Veraltungsinformationen aus dem JDK in\n      JAVA_HOME, das ein modulares JDK sein muss.\n  --Xload-old-jdk JAVA_HOME\n      Lädt Veraltungsinformationen aus dem JDK in\n      JAVA_HOME, das kein modulares JDK sein darf. Stattdessen\n      muss das benannte JDK ein "klassisches" JDK mit einer rt.jar-Datei sein.\n  --Xload-self\n      Lädt Veraltungsinformationen durch Traversieren des jrt:-\n      Dateisystems des ausgeführten JDK-Images.\n  --Xcompiler-arg ARG\n      Fügt ARG der Liste der Compilerargumente hinzu.\n  --Xcsv-comment COMMENT\n      Fügt COMMENT als Kommentarzeile der CSV-Ausgabedatei hinzu.\n      Nur effektiv, wenn auch -Xprint-csv angegeben wird.\n  --Xhelp\n      Gibt diese Meldung aus.\n  --Xprint-csv\n      Gibt eine CSV-Datei aus, welche die geladenen Veraltungsinformationen enthält,\n      statt Klassen oder JAR-Dateien zu scannen.
 
 scan.process.class=Klasse {0} wird verarbeitet...
 
@@ -41,7 +41,7 @@ scan.err.noclass=Fehler: Klasse {0} nicht gefunden
 scan.err.nofile=Fehler: Datei {0} nicht gefunden
 
 # 0: class name, 1: method name, 2: parameter and return types
-scan.err.nomethod=Fehler: Methodref {0}.{1}:{2} kann nicht aufgel\u00F6st werden
+scan.err.nomethod=Fehler: Methodref {0}.{1}:{2} kann nicht aufgelöst werden
 
 scan.head.jar=JAR-Datei {0}:
 scan.head.dir=Verzeichnis {0}:
@@ -76,7 +76,7 @@ scan.out.hasfield={0} {1} hat den Feldnamen {2} des veralteten Typs {3} {4}
 scan.out.methodparmtype={0} {1} hat eine Methode namens {2} mit dem veralteten Parametertyp {3} {4}
 
 # 2: method name, 3: return type, 4: removal tag
-scan.out.methodrettype={0} {1} hat eine Methode namens {2} mit dem veralteten R\u00FCckgabetyp {3} {4}
+scan.out.methodrettype={0} {1} hat eine Methode namens {2} mit dem veralteten Rückgabetyp {3} {4}
 
 # 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
-scan.out.methodoverride={0} {1} setzt die veraltete Methode {2}::{3}{4} {5} au\u00DFer Kraft
+scan.out.methodoverride={0} {1} setzt die veraltete Methode {2}::{3}{4} {5} außer Kraft
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_ja.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_ja.properties
index ee6589b12b0..9bc87f37472 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_ja.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_ja.properties
@@ -23,28 +23,28 @@
 # questions.
 #
 
-main.usage=\u4F7F\u7528\u65B9\u6CD5: jdeprscan [options] '{dir|jar|class}' ...\n\n\u30AA\u30D7\u30B7\u30E7\u30F3:\n        --class-path PATH\n        --for-removal\n        --full-version\n  -? -h --help\n  -l    --list\n        --release {0}\n  -v    --verbose\n        --version
+main.usage=使用方法: jdeprscan [options] '{dir|jar|class}' ...\n\nオプション:\n        --class-path PATH\n        --for-removal\n        --full-version\n  -? -h --help\n  -l    --list\n        --release {0}\n  -v    --verbose\n        --version
 
-main.help=\u975E\u63A8\u5968API\u306E\u4F7F\u7528\u306B\u3064\u3044\u3066\u5404\u5F15\u6570\u3092\u30B9\u30AD\u30E3\u30F3\u3057\u307E\u3059\u3002\u5F15\u6570\u306B\u306F\u3001\n\u30D1\u30C3\u30B1\u30FC\u30B8\u968E\u5C64\u306E\u30EB\u30FC\u30C8\u3092\u6307\u5B9A\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30D5\u30A1\u30A4\u30EB\u3001\n\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30AF\u30E9\u30B9\u540D\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\u30AF\u30E9\u30B9\u540D\u306F\u3001\n\u5B8C\u5168\u4FEE\u98FE\u30AF\u30E9\u30B9\u540D\u3092\u4F7F\u7528\u3057\u3066\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30CD\u30B9\u30C8\u3055\u308C\u305F\n\u30AF\u30E9\u30B9\u306F$\u3067\u533A\u5207\u308A\u307E\u3059\u3002\u4F8B:\n\n    java.lang.Thread$State\n\n--class-path\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u4F9D\u5B58\u3059\u308B\u30AF\u30E9\u30B9\u306E\u89E3\u6C7A\u306E\u305F\u3081\u306E\n\u691C\u7D22\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\n--for-removal\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u30B9\u30AD\u30E3\u30F3\u3068\u30EA\u30B9\u30C8\u5316\u3092\u524A\u9664\u4E88\u5B9A\u3067\u975E\u63A8\u5968\u306EAPI\u306B\n\u9650\u5B9A\u3057\u307E\u3059\u3002\u30EA\u30EA\u30FC\u30B9\u5024\u304C6\u30017\u307E\u305F\u306F8\u306E\u5834\u5408\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n\n--full-version\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30C4\u30FC\u30EB\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217\u306E\u5168\u4F53\u3092\u51FA\u529B\u3057\u307E\u3059\u3002\n\n--help (-? -h)\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u5168\u4F53\u3092\u51FA\u529B\u3057\u307E\u3059\u3002\n\n--list (-l)\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968API\u30BB\u30C3\u30C8\u3092\u51FA\u529B\u3057\u307E\u3059\u3002\u30B9\u30AD\u30E3\u30F3\u306F\u884C\u308F\u308C\u306A\u3044\u305F\u3081\u3001\n\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u307E\u305F\u306F\u30AF\u30E9\u30B9\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n\n--release\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u30B9\u30AD\u30E3\u30F3\u3059\u308B\u975E\u63A8\u5968API\u306E\u30BB\u30C3\u30C8\u3092\u63D0\u4F9B\u3059\u308BJava SE\n\u30EA\u30EA\u30FC\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\n--verbose (-v)\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u51E6\u7406\u4E2D\u306B\u8FFD\u52A0\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3067\u304D\u307E\u3059\u3002\n\n--version\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u7C21\u7565\u5316\u3055\u308C\u305F\u30C4\u30FC\u30EB\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217\u3092\u51FA\u529B\u3057\u307E\u3059\u3002
+main.help=非推奨APIの使用について各引数をスキャンします。引数には、\nパッケージ階層のルートを指定するディレクトリ、JARファイル、\nクラス・ファイルまたはクラス名を使用できます。クラス名は、\n完全修飾クラス名を使用して指定する必要があります。ネストされた\nクラスは$で区切ります。例:\n\n    java.lang.Thread$State\n\n--class-pathオプションは、依存するクラスの解決のための\n検索パスを指定します。\n\n--for-removalオプションは、スキャンとリスト化を削除予定で非推奨のAPIに\n限定します。リリース値が6、7または8の場合は使用できません。\n\n--full-versionオプションはツールのバージョン文字列の全体を出力します。\n\n--help (-? -h)オプションは、ヘルプ・メッセージ全体を出力します。\n\n--list (-l)オプションは非推奨APIセットを出力します。スキャンは行われないため、\nディレクトリ、JARまたはクラス引数を指定する必要はありません。\n\n--releaseオプションは、スキャンする非推奨APIのセットを提供するJava SE\nリリースを指定します。\n\n--verbose (-v)オプションを使用すると、処理中に追加のメッセージを出力できます。\n\n--versionオプションは、簡略化されたツールのバージョン文字列を出力します。
 
-main.xhelp=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30AA\u30D7\u30B7\u30E7\u30F3:\n\n  --Xload-class CLASS\n      \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u304B\u3089\u975E\u63A8\u5968\u60C5\u5831\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\n  --Xload-csv CSVFILE\n      \u6307\u5B9A\u3057\u305FCSV\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u975E\u63A8\u5968\u60C5\u5831\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\n  --Xload-dir DIR\n      \u6307\u5B9A\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u3042\u308B\u30AF\u30E9\u30B9\u968E\u5C64\u304B\u3089\u975E\u63A8\u5968\u60C5\u5831\u3092\n      \u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\n  --Xload-jar JARFILE\n      \u6307\u5B9A\u3057\u305FJAR\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u975E\u63A8\u5968\u60C5\u5831\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\n  --Xload-jdk9 JAVA_HOME\n      JAVA_HOME\u306B\u3042\u308BJDK\u304B\u3089\u975E\u63A8\u5968\u60C5\u5831\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\n      \u30E2\u30B8\u30E5\u30E9JDK\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n  --Xload-old-jdk JAVA_HOME\n      JAVA_HOME\u306B\u3042\u308BJDK\u304B\u3089\u975E\u63A8\u5968\u60C5\u5831\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\n      \u30E2\u30B8\u30E5\u30E9JDK\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u6307\u5B9A\u3057\u305FJDK\u306F\n      rt.jar\u30D5\u30A1\u30A4\u30EB\u3092\u6301\u3064"\u30AF\u30E9\u30B7\u30C3\u30AF"\u306AJDK\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n  --Xload-self\n      \u5B9F\u884C\u4E2DJDK\u30A4\u30E1\u30FC\u30B8\u306Ejrt:\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u3092\u8D70\u67FB\u3059\u308B\u3053\u3068\u306B\u3088\u308A\n      \u975E\u63A8\u5968\u60C5\u5831\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\n  --Xcompiler-arg ARG\n      \u30B3\u30F3\u30D1\u30A4\u30E9\u5F15\u6570\u306E\u30EA\u30B9\u30C8\u306BARG\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n  --Xcsv-comment COMMENT\n      \u30B3\u30E1\u30F3\u30C8\u884C\u3068\u3057\u3066COMMENT\u3092\u51FA\u529BCSV\u30D5\u30A1\u30A4\u30EB\u306B\u8FFD\u52A0\u3057\u307E\u3059\u3002\n      -Xprint-csv\u3082\u6307\u5B9A\u3057\u305F\u5834\u5408\u306E\u307F\u6709\u52B9\u3067\u3059\u3002\n  --Xhelp\n      \u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059\u3002\n  --Xprint-csv\n      \u3042\u3089\u3086\u308B\u30AF\u30E9\u30B9\u307E\u305F\u306FJAR\u30D5\u30A1\u30A4\u30EB\u3092\u30B9\u30AD\u30E3\u30F3\u3059\u308B\u304B\u308F\u308A\u306B\n      \u30ED\u30FC\u30C9\u3057\u305F\u975E\u63A8\u5968\u60C5\u5831\u3092\u542B\u3080CSV\u30D5\u30A1\u30A4\u30EB\u3092\u51FA\u529B\u3057\u307E\u3059\u3002
+main.xhelp=サポートされていないオプション:\n\n  --Xload-class CLASS\n      指定したクラスから非推奨情報をロードします。\n  --Xload-csv CSVFILE\n      指定したCSVファイルから非推奨情報をロードします。\n  --Xload-dir DIR\n      指定したディレクトリにあるクラス階層から非推奨情報を\n      ロードします。\n  --Xload-jar JARFILE\n      指定したJARファイルから非推奨情報をロードします。\n  --Xload-jdk9 JAVA_HOME\n      JAVA_HOMEにあるJDKから非推奨情報をロードします。\n      モジュラJDKである必要があります。\n  --Xload-old-jdk JAVA_HOME\n      JAVA_HOMEにあるJDKから非推奨情報をロードします。\n      モジュラJDKである必要がありません。指定したJDKは\n      rt.jarファイルを持つ"クラシック"なJDKである必要があります。\n  --Xload-self\n      実行中JDKイメージのjrt:ファイルシステムを走査することにより\n      非推奨情報をロードします。\n  --Xcompiler-arg ARG\n      コンパイラ引数のリストにARGを追加します。\n  --Xcsv-comment COMMENT\n      コメント行としてCOMMENTを出力CSVファイルに追加します。\n      -Xprint-csvも指定した場合のみ有効です。\n  --Xhelp\n      このメッセージを出力します。\n  --Xprint-csv\n      あらゆるクラスまたはJARファイルをスキャンするかわりに\n      ロードした非推奨情報を含むCSVファイルを出力します。
 
-scan.process.class=\u51E6\u7406\u30AF\u30E9\u30B9 {0}...
+scan.process.class=処理クラス {0}...
 
 # The "removal tag": empty for normal deprecations,
 # nonempty for removal deprecations; do not translate.
 scan.dep.normal=
 scan.dep.removal=(forRemoval=true)
 
-scan.err.exception=\u30A8\u30E9\u30FC: \u4E88\u671F\u3057\u306A\u3044\u4F8B\u5916{0}
-scan.err.noclass=\u30A8\u30E9\u30FC: \u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-scan.err.nofile=\u30A8\u30E9\u30FC: \u30D5\u30A1\u30A4\u30EB{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+scan.err.exception=エラー: 予期しない例外{0}
+scan.err.noclass=エラー: クラス{0}が見つかりません
+scan.err.nofile=エラー: ファイル{0}が見つかりません
 
 # 0: class name, 1: method name, 2: parameter and return types
-scan.err.nomethod=\u30A8\u30E9\u30FC: Methodref {0}.{1}:{2}\u3092\u89E3\u6C7A\u3067\u304D\u307E\u305B\u3093
+scan.err.nomethod=エラー: Methodref {0}.{1}:{2}を解決できません
 
-scan.head.jar=JAR\u30D5\u30A1\u30A4\u30EB {0}:
-scan.head.dir=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA {0}:
+scan.head.jar=JARファイル {0}:
+scan.head.dir=ディレクトリ {0}:
 
 # In all of the messages below, 0 and 1 are as follows:
 #   0: type kind (class, interface, enum, or annotation type)
@@ -52,31 +52,31 @@ scan.head.dir=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA {0}:
 # The last element is generally a "removal tag"; see above.
 
 # 2: class name, 3: removal tag
-scan.out.extends={0} {1}\u304C\u975E\u63A8\u5968\u306E\u30AF\u30E9\u30B9{2}\u3092\u62E1\u5F35\u3057\u3066\u3044\u307E\u3059 {3}
+scan.out.extends={0} {1}が非推奨のクラス{2}を拡張しています {3}
 
 # 2: interface name, 3: removal tag
-scan.out.implements={0} {1}\u304C\u975E\u63A8\u5968\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{2}\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059 {3}
+scan.out.implements={0} {1}が非推奨のインタフェース{2}を実装しています {3}
 
 # 2: class name, 3: removal tag
-scan.out.usesclass={0} {1}\u304C\u975E\u63A8\u5968\u306E\u30AF\u30E9\u30B9{2}\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059 {3}
+scan.out.usesclass={0} {1}が非推奨のクラス{2}を使用しています {3}
 
 # 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
-scan.out.usesmethod={0} {1}\u304C\u975E\u63A8\u5968\u30E1\u30BD\u30C3\u30C9{2}::{3}{4}\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059 {5}
+scan.out.usesmethod={0} {1}が非推奨メソッド{2}::{3}{4}を使用しています {5}
 
 # 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
-scan.out.usesintfmethod={0} {1}\u304C\u975E\u63A8\u5968\u30E1\u30BD\u30C3\u30C9{2}::{3}{4}\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059 {5}
+scan.out.usesintfmethod={0} {1}が非推奨メソッド{2}::{3}{4}を使用しています {5}
 
 # 2: class name, 3: field name, 4: removal tag
-scan.out.usesfield={0} {1}\u304C\u975E\u63A8\u5968\u30D5\u30A3\u30FC\u30EB\u30C9{2}::{3}{4}\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059
+scan.out.usesfield={0} {1}が非推奨フィールド{2}::{3}{4}を使用しています
 
 # 2: field name, 3: type name, 4: removal tag
-scan.out.hasfield={0} {1}\u306B\u306F\u3001\u975E\u63A8\u5968\u306E\u30BF\u30A4\u30D7{3} {4}\u306E\u3001{2}\u3068\u3044\u3046\u540D\u524D\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3042\u308A\u307E\u3059
+scan.out.hasfield={0} {1}には、非推奨のタイプ{3} {4}の、{2}という名前のフィールドがあります
 
 # 2: method name, 3: parameter type, 4: removal tag
-scan.out.methodparmtype={0} {1}\u306B\u306F\u3001\u975E\u63A8\u5968\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7{3} {4}\u3092\u6301\u3064{2}\u3068\u3044\u3046\u540D\u524D\u306E\u30E1\u30BD\u30C3\u30C9\u304C\u3042\u308A\u307E\u3059
+scan.out.methodparmtype={0} {1}には、非推奨のパラメータ・タイプ{3} {4}を持つ{2}という名前のメソッドがあります
 
 # 2: method name, 3: return type, 4: removal tag
-scan.out.methodrettype={0} {1}\u306B\u306F\u3001\u975E\u63A8\u5968\u306E\u623B\u308A\u30BF\u30A4\u30D7{3} {4}\u3092\u6301\u3064{2}\u3068\u3044\u3046\u540D\u524D\u306E\u30E1\u30BD\u30C3\u30C9\u304C\u3042\u308A\u307E\u3059
+scan.out.methodrettype={0} {1}には、非推奨の戻りタイプ{3} {4}を持つ{2}という名前のメソッドがあります
 
 # 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
-scan.out.methodoverride={0} {1}\u304C\u975E\u63A8\u5968\u30E1\u30BD\u30C3\u30C9{2}::{3}{4}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059 {5}
+scan.out.methodoverride={0} {1}が非推奨メソッド{2}::{3}{4}をオーバーライドしています {5}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_zh_CN.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_zh_CN.properties
index daf7733fceb..069e00aad1a 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_zh_CN.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_zh_CN.properties
@@ -23,28 +23,28 @@
 # questions.
 #
 
-main.usage=\u7528\u6CD5\uFF1Ajdeprscan [options] '{dir|jar|class}' ...\n\n\u9009\u9879\uFF1A\n        --class-path PATH\n        --for-removal\n        --full-version\n  -? -h --help\n  -l    --list\n        --release {0}\n  -v    --verbose\n        --version
+main.usage=用法：jdeprscan [options] '{dir|jar|class}' ...\n\n选项：\n        --class-path PATH\n        --for-removal\n        --full-version\n  -? -h --help\n  -l    --list\n        --release {0}\n  -v    --verbose\n        --version
 
-main.help=\u626B\u63CF\u6BCF\u4E2A\u53C2\u6570\u4EE5\u4E86\u89E3\u662F\u5426\u4F7F\u7528\u4E86\u8FC7\u65F6\u7684 API\u3002\n\u53C2\u6570\u53EF\u4EE5\u662F\u6307\u5B9A\u7A0B\u5E8F\u5305\u5206\u5C42\u7ED3\u6784\u3001JAR \u6587\u4EF6\u3001\n\u7C7B\u6587\u4EF6\u6216\u7C7B\u540D\u7684\u6839\u7684\u76EE\u5F55\u3002\u7C7B\u540D\u5FC5\u987B\n\u4F7F\u7528\u5168\u9650\u5B9A\u7C7B\u540D\u6307\u5B9A\uFF0C\u5E76\u4F7F\u7528 $ \u5206\u9694\u7B26\n\u6307\u5B9A\u5D4C\u5957\u7C7B\uFF0C\u4F8B\u5982\uFF0C\n\n    java.lang.Thread$State\n\n--class-path \u9009\u9879\u63D0\u4F9B\u4E86\u7528\u4E8E\u89E3\u6790\u4ECE\u5C5E\u7C7B\u7684\n\u641C\u7D22\u8DEF\u5F84\u3002\n\n--for-removal \u9009\u9879\u9650\u5236\u626B\u63CF\u6216\u5217\u51FA\u5DF2\u8FC7\u65F6\u5E76\u5F85\u5220\u9664\n\u7684 API\u3002\u4E0D\u80FD\u4E0E\u53D1\u884C\u7248\u503C 6\u30017 \u6216 8 \u4E00\u8D77\u4F7F\u7528\u3002\n\n--full-version \u9009\u9879\u8F93\u51FA\u5DE5\u5177\u7684\u5B8C\u6574\u7248\u672C\u5B57\u7B26\u4E32\u3002\n\n--help (-? -h) \u9009\u9879\u8F93\u51FA\u5B8C\u6574\u7684\u5E2E\u52A9\u6D88\u606F\u3002\n\n--list (-l) \u9009\u9879\u8F93\u51FA\u4E00\u7EC4\u5DF2\u8FC7\u65F6\u7684 API\u3002\u4E0D\u6267\u884C\u626B\u63CF\uFF0C\n\u56E0\u6B64\u4E0D\u5E94\u63D0\u4F9B\u4EFB\u4F55\u76EE\u5F55\u3001jar \u6216\u7C7B\u53C2\u6570\u3002\n\n--release \u9009\u9879\u6307\u5B9A\u63D0\u4F9B\u8981\u626B\u63CF\u7684\u5DF2\u8FC7\u65F6 API \u96C6\n\u7684 Java SE \u53D1\u884C\u7248\u3002\n\n--verbose (-v) \u9009\u9879\u5728\u5904\u7406\u671F\u95F4\u542F\u7528\u9644\u52A0\u6D88\u606F\u8F93\u51FA\u3002\n\n--version \u9009\u9879\u8F93\u51FA\u5DE5\u5177\u7684\u7F29\u5199\u7248\u672C\u5B57\u7B26\u4E32\u3002
+main.help=扫描每个参数以了解是否使用了过时的 API。\n参数可以是指定程序包分层结构、JAR 文件、\n类文件或类名的根的目录。类名必须\n使用全限定类名指定，并使用 $ 分隔符\n指定嵌套类，例如，\n\n    java.lang.Thread$State\n\n--class-path 选项提供了用于解析从属类的\n搜索路径。\n\n--for-removal 选项限制扫描或列出已过时并待删除\n的 API。不能与发行版值 6、7 或 8 一起使用。\n\n--full-version 选项输出工具的完整版本字符串。\n\n--help (-? -h) 选项输出完整的帮助消息。\n\n--list (-l) 选项输出一组已过时的 API。不执行扫描，\n因此不应提供任何目录、jar 或类参数。\n\n--release 选项指定提供要扫描的已过时 API 集\n的 Java SE 发行版。\n\n--verbose (-v) 选项在处理期间启用附加消息输出。\n\n--version 选项输出工具的缩写版本字符串。
 
-main.xhelp=\u4E0D\u652F\u6301\u7684\u9009\u9879:\n\n  --Xload-class CLASS\n      \u4ECE\u5DF2\u547D\u540D\u7C7B\u52A0\u8F7D\u8FC7\u65F6\u4FE1\u606F\u3002\n  --Xload-csv CSVFILE\n      \u4ECE\u5DF2\u547D\u540D CSV \u6587\u4EF6\u52A0\u8F7D\u8FC7\u65F6\u4FE1\u606F\u3002\n  --Xload-dir DIR\n      \u4ECE\u5DF2\u547D\u540D\u76EE\u5F55\u4E2D\u7684\u7C7B\u5206\u5C42\u7ED3\u6784\u52A0\u8F7D\n      \u8FC7\u65F6\u4FE1\u606F\u3002\n  --Xload-jar JARFILE\n      \u4ECE\u5DF2\u547D\u540D JAR \u6587\u4EF6\u52A0\u8F7D\u8FC7\u65F6\u4FE1\u606F\u3002\n  --Xload-jdk9 JAVA_HOME\n      \u4ECE\u4F4D\u4E8E JAVA_HOME \u7684 JDK \u4E2D\u52A0\u8F7D\u8FC7\u65F6\u4FE1\u606F, \n      \u8BE5 JDK \u5FC5\u987B\u662F\u4E00\u4E2A\u6A21\u5757\u5316 JDK\u3002\n  --Xload-old-jdk JAVA_HOME\n      \u4ECE\u4F4D\u4E8E JAVA_HOME \u7684 JDK \u4E2D\u52A0\u8F7D\u8FC7\u65F6\u4FE1\u606F, \n      \u8BE5 JDK \u4E0D\u80FD\u662F\u4E00\u4E2A\u6A21\u5757\u5316 JDK\u3002\u76F8\u53CD, \n      \u5DF2\u547D\u540D JDK \u5FC5\u987B\u662F\u5E26\u6709 rt.jar \u6587\u4EF6\u7684 "\u7ECF\u5178" JDK\u3002\n  --Xload-self\n      \u901A\u8FC7\u904D\u5386\u6B63\u5728\u8FD0\u884C\u7684 JDK \u6620\u50CF\u7684 jrt: \u6587\u4EF6\u7CFB\u7EDF:\n      \u52A0\u8F7D\u8FC7\u65F6\u4FE1\u606F\u3002\n  --Xcompiler-arg ARG\n      \u5C06 ARG \u6DFB\u52A0\u5230\u7F16\u8BD1\u5668\u53C2\u6570\u5217\u8868\u4E2D\u3002\n  --Xcsv-comment COMMENT\n      \u5C06 COMMENT \u4F5C\u4E3A\u6CE8\u91CA\u884C\u6DFB\u52A0\u5230\u8F93\u51FA CSV \u6587\u4EF6\u3002\n      \u4EC5\u5F53\u540C\u65F6\u63D0\u4F9B\u4E86 -Xprint-csv \u624D\u6709\u6548\u3002\n  --Xhelp\n      \u8F93\u51FA\u6B64\u6D88\u606F\u3002\n  --Xprint-csv\n      \u8F93\u51FA\u5305\u542B\u5DF2\u52A0\u8F7D\u8FC7\u65F6\u4FE1\u606F\u7684 CSV \u6587\u4EF6\n      \u800C\u4E0D\u626B\u63CF\u4EFB\u4F55\u7C7B\u6216 JAR \u6587\u4EF6\u3002
+main.xhelp=不支持的选项:\n\n  --Xload-class CLASS\n      从已命名类加载过时信息。\n  --Xload-csv CSVFILE\n      从已命名 CSV 文件加载过时信息。\n  --Xload-dir DIR\n      从已命名目录中的类分层结构加载\n      过时信息。\n  --Xload-jar JARFILE\n      从已命名 JAR 文件加载过时信息。\n  --Xload-jdk9 JAVA_HOME\n      从位于 JAVA_HOME 的 JDK 中加载过时信息, \n      该 JDK 必须是一个模块化 JDK。\n  --Xload-old-jdk JAVA_HOME\n      从位于 JAVA_HOME 的 JDK 中加载过时信息, \n      该 JDK 不能是一个模块化 JDK。相反, \n      已命名 JDK 必须是带有 rt.jar 文件的 "经典" JDK。\n  --Xload-self\n      通过遍历正在运行的 JDK 映像的 jrt: 文件系统:\n      加载过时信息。\n  --Xcompiler-arg ARG\n      将 ARG 添加到编译器参数列表中。\n  --Xcsv-comment COMMENT\n      将 COMMENT 作为注释行添加到输出 CSV 文件。\n      仅当同时提供了 -Xprint-csv 才有效。\n  --Xhelp\n      输出此消息。\n  --Xprint-csv\n      输出包含已加载过时信息的 CSV 文件\n      而不扫描任何类或 JAR 文件。
 
-scan.process.class=\u6B63\u5728\u5904\u7406\u7C7B {0}...
+scan.process.class=正在处理类 {0}...
 
 # The "removal tag": empty for normal deprecations,
 # nonempty for removal deprecations; do not translate.
 scan.dep.normal=
 scan.dep.removal=(forRemoval=true)
 
-scan.err.exception=\u9519\u8BEF: \u51FA\u73B0\u610F\u5916\u7684\u5F02\u5E38\u9519\u8BEF {0}
-scan.err.noclass=\u9519\u8BEF: \u627E\u4E0D\u5230\u7C7B {0}
-scan.err.nofile=\u9519\u8BEF: \u627E\u4E0D\u5230\u6587\u4EF6 {0}
+scan.err.exception=错误: 出现意外的异常错误 {0}
+scan.err.noclass=错误: 找不到类 {0}
+scan.err.nofile=错误: 找不到文件 {0}
 
 # 0: class name, 1: method name, 2: parameter and return types
-scan.err.nomethod=\u9519\u8BEF: \u65E0\u6CD5\u89E3\u6790 Methodref {0}.{1}:{2}
+scan.err.nomethod=错误: 无法解析 Methodref {0}.{1}:{2}
 
-scan.head.jar=Jar \u6587\u4EF6 {0}:
-scan.head.dir=\u76EE\u5F55 {0}:
+scan.head.jar=Jar 文件 {0}:
+scan.head.dir=目录 {0}:
 
 # In all of the messages below, 0 and 1 are as follows:
 #   0: type kind (class, interface, enum, or annotation type)
@@ -52,31 +52,31 @@ scan.head.dir=\u76EE\u5F55 {0}:
 # The last element is generally a "removal tag"; see above.
 
 # 2: class name, 3: removal tag
-scan.out.extends={0} {1} \u6269\u5C55\u5DF2\u8FC7\u65F6\u7684\u7C7B {2} {3}
+scan.out.extends={0} {1} 扩展已过时的类 {2} {3}
 
 # 2: interface name, 3: removal tag
-scan.out.implements={0} {1} \u5B9E\u73B0\u5DF2\u8FC7\u65F6\u7684\u63A5\u53E3 {2} {3}
+scan.out.implements={0} {1} 实现已过时的接口 {2} {3}
 
 # 2: class name, 3: removal tag
-scan.out.usesclass={0} {1} \u4F7F\u7528\u5DF2\u8FC7\u65F6\u7684\u7C7B {2} {3}
+scan.out.usesclass={0} {1} 使用已过时的类 {2} {3}
 
 # 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
-scan.out.usesmethod={0} {1} \u4F7F\u7528\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5 {2}::{3}{4} {5}
+scan.out.usesmethod={0} {1} 使用已过时的方法 {2}::{3}{4} {5}
 
 # 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
-scan.out.usesintfmethod={0} {1} \u4F7F\u7528\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5 {2}::{3}{4} {5}
+scan.out.usesintfmethod={0} {1} 使用已过时的方法 {2}::{3}{4} {5}
 
 # 2: class name, 3: field name, 4: removal tag
-scan.out.usesfield={0} {1} \u4F7F\u7528\u5DF2\u8FC7\u65F6\u7684\u5B57\u6BB5 {2}::{3} {4}
+scan.out.usesfield={0} {1} 使用已过时的字段 {2}::{3} {4}
 
 # 2: field name, 3: type name, 4: removal tag
-scan.out.hasfield={0} {1} \u5177\u6709\u540D\u4E3A {2} \u7684\u5B57\u6BB5, \u5176\u7C7B\u578B\u4E3A\u5DF2\u8FC7\u65F6\u7684 {3} {4}
+scan.out.hasfield={0} {1} 具有名为 {2} 的字段, 其类型为已过时的 {3} {4}
 
 # 2: method name, 3: parameter type, 4: removal tag
-scan.out.methodparmtype={0} {1} \u5177\u6709\u540D\u4E3A {2} \u7684\u65B9\u6CD5, \u5176\u53C2\u6570\u7C7B\u578B\u4E3A\u5DF2\u8FC7\u65F6\u7684 {3} {4}
+scan.out.methodparmtype={0} {1} 具有名为 {2} 的方法, 其参数类型为已过时的 {3} {4}
 
 # 2: method name, 3: return type, 4: removal tag
-scan.out.methodrettype={0} {1} \u5177\u6709\u540D\u4E3A {2} \u7684\u65B9\u6CD5, \u5176\u8FD4\u56DE\u7C7B\u578B\u4E3A\u5DF2\u8FC7\u65F6\u7684 {3} {4}
+scan.out.methodrettype={0} {1} 具有名为 {2} 的方法, 其返回类型为已过时的 {3} {4}
 
 # 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
-scan.out.methodoverride={0} {1} \u8986\u76D6\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5 {2}::{3}{4} {5}
+scan.out.methodoverride={0} {1} 覆盖已过时的方法 {2}::{3}{4} {5}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties
index aae209d2756..b924a55391a 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties
@@ -23,11 +23,11 @@
 # questions.
 #
 
-jdeps.description=Abh\u00E4ngigkeits-Analyzer f\u00FCr Java-Klassen starten
+jdeps.description=Abhängigkeits-Analyzer für Java-Klassen starten
 
-main.usage.summary=Verwendung: {0} <Optionen> <Pfad ...>]\nmit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+main.usage.summary=Verwendung: {0} <Optionen> <Pfad ...>]\nmit --help können Sie eine Liste der möglichen Optionen aufrufen
 
-main.usage=Verwendung: {0} <Optionen> <Pfad ...>]\n<Pfad> kann ein Pfad zu einer Klassendatei, einem Verzeichnis oder einer JAR-Datei sein.\n\nM\u00F6gliche Optionen:
+main.usage=Verwendung: {0} <Optionen> <Pfad ...>]\n<Pfad> kann ein Pfad zu einer Klassendatei, einem Verzeichnis oder einer JAR-Datei sein.\n\nMögliche Optionen:
 
 error.prefix=Fehler:
 warn.prefix=Warnung:
@@ -36,22 +36,22 @@ main.opt.h=\  -h -? --help                  Gibt diese Hilfemeldung aus
 
 main.opt.version=\  -version --version            Versionsinformationen
 
-main.opt.v=\  -v       -verbose             Gibt alle Abh\u00E4ngigkeiten auf Klassenebene aus\n                                \u00C4quivalent zu -verbose:class -filter:none.\n  -verbose:package              Gibt standardm\u00E4\u00DFig Abh\u00E4ngigkeiten auf Packageebene, ausgenommen\n                                Abh\u00E4ngigkeiten innerhalb eines Packages, aus\n  -verbose:class                Gib standardm\u00E4\u00DFig Abh\u00E4ngigkeiten auf Klassenebene, ausgenommen\n                                Abh\u00E4ngigkeiten innerhalb einer Klasse, aus
+main.opt.v=\  -v       -verbose             Gibt alle Abhängigkeiten auf Klassenebene aus\n                                Äquivalent zu -verbose:class -filter:none.\n  -verbose:package              Gibt standardmäßig Abhängigkeiten auf Packageebene, ausgenommen\n                                Abhängigkeiten innerhalb eines Packages, aus\n  -verbose:class                Gib standardmäßig Abhängigkeiten auf Klassenebene, ausgenommen\n                                Abhängigkeiten innerhalb einer Klasse, aus
 
-main.opt.s=\  -s       -summary             Gibt nur die Abh\u00E4ngigkeits\u00FCbersicht aus.
+main.opt.s=\  -s       -summary             Gibt nur die Abhängigkeitsübersicht aus.
 
-main.opt.f=\  -f <Regex> -filter <Regex>    Filtert Abh\u00E4ngigkeiten nach dem angegebenen\n                                Muster. Bei Angabe mehrerer Muster wird das\n                                letzte Muster verwendet.\n  -filter:package               Filtert Abh\u00E4ngigkeiten innerhalb eines Packages.\n                                Dies ist die Standardoption.\n  -filter:archive               Filtert Abh\u00E4ngigkeiten innerhalb eines Archivs.\n  -filter:module                Filtert Abh\u00E4ngigkeiten innerhalb eines Moduls.\n  -filter:none                  Kein Filtern nach -filter:package oder -filter:archive\n                                Die mit der Option -filter angegebene Filterung\n                                wird jedoch angewendet.\n
-main.opt.p=\nOptionen zum Filtern von Abh\u00E4ngigkeiten:\n  -p <Pkg>\n  -package <Pkg>\n  --package <Pkg>               Findet Abh\u00E4ngigkeiten, die mit dem angegebenen\n                                Packagenamen \u00FCbereinstimmen (kann mehrfach angegeben werden).
+main.opt.f=\  -f <Regex> -filter <Regex>    Filtert Abhängigkeiten nach dem angegebenen\n                                Muster. Bei Angabe mehrerer Muster wird das\n                                letzte Muster verwendet.\n  -filter:package               Filtert Abhängigkeiten innerhalb eines Packages.\n                                Dies ist die Standardoption.\n  -filter:archive               Filtert Abhängigkeiten innerhalb eines Archivs.\n  -filter:module                Filtert Abhängigkeiten innerhalb eines Moduls.\n  -filter:none                  Kein Filtern nach -filter:package oder -filter:archive\n                                Die mit der Option -filter angegebene Filterung\n                                wird jedoch angewendet.\n
+main.opt.p=\nOptionen zum Filtern von Abhängigkeiten:\n  -p <Pkg>\n  -package <Pkg>\n  --package <Pkg>               Findet Abhängigkeiten, die mit dem angegebenen\n                                Packagenamen übereinstimmen (kann mehrfach angegeben werden).
 
-main.opt.e=\  -e <Regex>\n  -regex <Regex>\n  --regex <Regex>               Findet Abh\u00E4ngigkeiten, die dem angegebenen Muster entsprechen.
+main.opt.e=\  -e <Regex>\n  -regex <Regex>\n  --regex <Regex>               Findet Abhängigkeiten, die dem angegebenen Muster entsprechen.
 
-main.opt.require=\  --require <Modulname>       Findet Abh\u00E4ngigkeiten, die dem angegebenen Modulnamen\n                                entsprechen (kann mehrfach angegeben werden). --package,\n                                --regex, --require schlie\u00DFen sich gegenseitig aus.
+main.opt.require=\  --require <Modulname>       Findet Abhängigkeiten, die dem angegebenen Modulnamen\n                                entsprechen (kann mehrfach angegeben werden). --package,\n                                --regex, --require schließen sich gegenseitig aus.
 
-main.opt.missing-deps=\  --missing-deps                Findet fehlende Abh\u00E4ngigkeiten. Diese Option\n                                kann nicht mit den Optionen -p, -e und -s verwendet werden.
+main.opt.missing-deps=\  --missing-deps                Findet fehlende Abhängigkeiten. Diese Option\n                                kann nicht mit den Optionen -p, -e und -s verwendet werden.
 
-main.opt.ignore-missing-deps=\  --ignore-missing-deps         Ignoriert fehlende Abh\u00E4ngigkeiten.
+main.opt.ignore-missing-deps=\  --ignore-missing-deps         Ignoriert fehlende Abhängigkeiten.
 
-main.opt.include=\nOptionen zum Filtern der zu analysierenden Klassen:\n  -include <Regex>              Beschr\u00E4nkt die Analyse auf Klassen, die dem Muster entsprechen\n                                Diese Option filtert die Liste der zu analysierenden\n                                Klassen. Sie kann zusammen mit -p und -e verwendet\n                                werden, die das Muster auf die Abh\u00E4ngigkeiten anwenden
+main.opt.include=\nOptionen zum Filtern der zu analysierenden Klassen:\n  -include <Regex>              Beschränkt die Analyse auf Klassen, die dem Muster entsprechen\n                                Diese Option filtert die Liste der zu analysierenden\n                                Klassen. Sie kann zusammen mit -p und -e verwendet\n                                werden, die das Muster auf die Abhängigkeiten anwenden
 
 main.opt.cp=\  -cp <Pfad>\n  -classpath <Pfad>\n  --class-path <Pfad>           Gibt an, wo sich die Klassendateien befinden
 
@@ -61,71 +61,71 @@ main.opt.upgrade-module-path=\  --upgrade-module-path <Modulpfad>  Gibt den Upgr
 
 main.opt.system=\  --system <Java-Home>          Gibt einen alternativen Systemmodulpfad an
 
-main.opt.add-modules=\  --add-modules <Modulname>[,<Modulname>...]\n                                F\u00FCgt dem Root-Set Module zur Analyse hinzu
+main.opt.add-modules=\  --add-modules <Modulname>[,<Modulname>...]\n                                Fügt dem Root-Set Module zur Analyse hinzu
 
-main.opt.R=\  -R\n  --recursive                   Traversiert rekursiv alle Laufzeitabh\u00E4ngigkeiten.\n                                Die Option -R impliziert -filter:none. Falls eine Option -p,\n                                -e, -f angegeben ist, werden nur die \u00FCbereinstimmenden\n                                Abh\u00E4ngigkeiten analysiert.
+main.opt.R=\  -R\n  --recursive                   Traversiert rekursiv alle Laufzeitabhängigkeiten.\n                                Die Option -R impliziert -filter:none. Falls eine Option -p,\n                                -e, -f angegeben ist, werden nur die übereinstimmenden\n                                Abhängigkeiten analysiert.
 
-main.opt.no-recursive=\  --no-recursive                Kein rekursives Traversieren von Abh\u00E4ngigkeiten.
+main.opt.no-recursive=\  --no-recursive                Kein rekursives Traversieren von Abhängigkeiten.
 
-main.opt.I=\  -I\n  --inverse                     Analysiert die Abh\u00E4ngigkeiten gem\u00E4\u00DF den anderen angegebenen\n                                Optionen und findet alle Artefakte, die direkt und\n                                indirekt von den \u00FCbereinstimmenden Knoten abh\u00E4ngen.\n                                Dies entspricht der Umkehrung der\n                                Analyse der Kompilierungszeitansicht und gibt die\n                                Abh\u00E4ngigkeits\u00FCbersicht aus. Diese Option muss mit der Option\n                                --require, --package oder --regex verwendet werden.
+main.opt.I=\  -I\n  --inverse                     Analysiert die Abhängigkeiten gemäß den anderen angegebenen\n                                Optionen und findet alle Artefakte, die direkt und\n                                indirekt von den übereinstimmenden Knoten abhängen.\n                                Dies entspricht der Umkehrung der\n                                Analyse der Kompilierungszeitansicht und gibt die\n                                Abhängigkeitsübersicht aus. Diese Option muss mit der Option\n                                --require, --package oder --regex verwendet werden.
 
-main.opt.compile-time=\  --compile-time                Kompilierungszeitansicht transitiver Abh\u00E4ngigkeiten,\n                                d.h. Kompilierungszeitansicht der Option -R.\n                                Analysiert die Abh\u00E4ngigkeiten gem\u00E4\u00DF den anderen angegebenen Optionen\n                                Wird eine Abh\u00E4ngigkeit von einem Verzeichnis,\n                                einer JAR-Datei oder einem Modul gefunden, werden alle Klassen im \n                                entsprechenden beinhaltenden Archiv analysiert.
+main.opt.compile-time=\  --compile-time                Kompilierungszeitansicht transitiver Abhängigkeiten,\n                                d.h. Kompilierungszeitansicht der Option -R.\n                                Analysiert die Abhängigkeiten gemäß den anderen angegebenen Optionen\n                                Wird eine Abhängigkeit von einem Verzeichnis,\n                                einer JAR-Datei oder einem Modul gefunden, werden alle Klassen im \n                                entsprechenden beinhaltenden Archiv analysiert.
 
-main.opt.apionly=\  -apionly\n  --api-only                    Beschr\u00E4nkt die Analyse auf APIs, d.h. Abh\u00E4ngigkeiten\n                                von der Signatur \u00F6ffentlicher und gesch\u00FCtzter\n                                Mitglieder von \u00F6ffentlichen Klassen, einschlie\u00DFlich von\n                                Feldtyp, Methodenparametertypen, R\u00FCckgabetyp,\n                                aktivierten Ausnahmetypen usw.
+main.opt.apionly=\  -apionly\n  --api-only                    Beschränkt die Analyse auf APIs, d.h. Abhängigkeiten\n                                von der Signatur öffentlicher und geschützter\n                                Mitglieder von öffentlichen Klassen, einschließlich von\n                                Feldtyp, Methodenparametertypen, Rückgabetyp,\n                                aktivierten Ausnahmetypen usw.
 
-main.opt.m=\nOptionen f\u00FCr die Modulabh\u00E4ngigkeitsanalyse:\n  -m <Modulname>\n  --module <Modulname>        Gibt das Root-Modul f\u00FCr die Analyse an
+main.opt.m=\nOptionen für die Modulabhängigkeitsanalyse:\n  -m <Modulname>\n  --module <Modulname>        Gibt das Root-Modul für die Analyse an
 
-main.opt.generate-module-info=\  --generate-module-info <Verzeichnis>  Generiert module-info.java im angegebenen\n                                Verzeichnis. Die angegebenen JAR-Dateien werden\n                                analysiert. Diese Option kann nicht zusammen mit\n                                --dot-output oder --class-path verwendet werden. Verwenden Sie\n                                f\u00FCr offene Module die Option --generate-open-module.
+main.opt.generate-module-info=\  --generate-module-info <Verzeichnis>  Generiert module-info.java im angegebenen\n                                Verzeichnis. Die angegebenen JAR-Dateien werden\n                                analysiert. Diese Option kann nicht zusammen mit\n                                --dot-output oder --class-path verwendet werden. Verwenden Sie\n                                für offene Module die Option --generate-open-module.
 
-main.opt.generate-open-module=\  --generate-open-module <Verzeichnis>  Generiert module-info.java f\u00FCr die angegebenen\n                                JAR-Dateien im angegebenen Verzeichnis als\n                                offene Module. Diese Option kann nicht mit\n                                --dot-output oder --class-path verwendet werden.
+main.opt.generate-open-module=\  --generate-open-module <Verzeichnis>  Generiert module-info.java für die angegebenen\n                                JAR-Dateien im angegebenen Verzeichnis als\n                                offene Module. Diese Option kann nicht mit\n                                --dot-output oder --class-path verwendet werden.
 
-main.opt.check=\  --check <Modulname>[,<Modulname>...\n                                Analysiert die Abh\u00E4ngigkeit der angegebenen Module\n                                Gibt den Moduldeskriptor, die aus der Analyse resultierenden\n                                Modulabh\u00E4ngigkeiten und das Diagramm nach\n                                der \u00DCbergangsreduktion aus. Identifiziert auch\n                                nicht verwendete qualifizierte Exporte.
+main.opt.check=\  --check <Modulname>[,<Modulname>...\n                                Analysiert die Abhängigkeit der angegebenen Module\n                                Gibt den Moduldeskriptor, die aus der Analyse resultierenden\n                                Modulabhängigkeiten und das Diagramm nach\n                                der Übergangsreduktion aus. Identifiziert auch\n                                nicht verwendete qualifizierte Exporte.
 
-main.opt.dotoutput=\  -dotoutput <Verzeichnis>\n  --dot-output <Verzeichnis>            Zielverzeichnis f\u00FCr DOT-Dateiausgabe
+main.opt.dotoutput=\  -dotoutput <Verzeichnis>\n  --dot-output <Verzeichnis>            Zielverzeichnis für DOT-Dateiausgabe
 
-main.opt.jdkinternals=\  -jdkinternals\n  --jdk-internals               Findet Abh\u00E4ngigkeiten auf Klassenebene auf JDK-internen\n                                APIs. Analysiert standardm\u00E4\u00DFig alle Klassen\n                                in --class-path und Eingabedateien, es sei denn, die Option\n                                -include ist angegeben. Diese Option kann nicht mit\n                                den Optionen -p, -e und -s verwendet werden.\n                                WARNUNG: Auf JDK-interne APIs besteht kein Zugriff.
+main.opt.jdkinternals=\  -jdkinternals\n  --jdk-internals               Findet Abhängigkeiten auf Klassenebene auf JDK-internen\n                                APIs. Analysiert standardmäßig alle Klassen\n                                in --class-path und Eingabedateien, es sei denn, die Option\n                                -include ist angegeben. Diese Option kann nicht mit\n                                den Optionen -p, -e und -s verwendet werden.\n                                WARNUNG: Auf JDK-interne APIs besteht kein Zugriff.
 
-main.opt.list-deps=\  --list-deps                   Listet die Modulabh\u00E4ngigkeiten auf. Gibt auch\n                                interne API-Packages aus, falls referenziert.\n                                Diese Option analysiert transitiv die Librarys im\n                                Classpath und im Modulpfad, falls referenziert.\n                                Verwenden Sie die Option --no-recursive f\u00FCr eine\n                                nicht transitive Abh\u00E4ngigkeitsanalyse.
+main.opt.list-deps=\  --list-deps                   Listet die Modulabhängigkeiten auf. Gibt auch\n                                interne API-Packages aus, falls referenziert.\n                                Diese Option analysiert transitiv die Librarys im\n                                Classpath und im Modulpfad, falls referenziert.\n                                Verwenden Sie die Option --no-recursive für eine\n                                nicht transitive Abhängigkeitsanalyse.
 
-main.opt.list-reduced-deps=\  --list-reduced-deps           Gleich wie --list-deps, listet jedoch die Kanten f\u00FCr die\n                                implizierten Lesevorg\u00E4nge aus dem Moduldiagramm nicht auf.\n                                Wenn Modul M1 M2 liest und M2 \u00FCber M3\n                                transitiv sein muss, dann wird impliziert, dass M1 M3 liest,\n                                und dies wird im Diagramm nicht angezeigt.
+main.opt.list-reduced-deps=\  --list-reduced-deps           Gleich wie --list-deps, listet jedoch die Kanten für die\n                                implizierten Lesevorgänge aus dem Moduldiagramm nicht auf.\n                                Wenn Modul M1 M2 liest und M2 über M3\n                                transitiv sein muss, dann wird impliziert, dass M1 M3 liest,\n                                und dies wird im Diagramm nicht angezeigt.
 
-main.opt.print-module-deps=\  --print-module-deps           Gleich wie --list-reduced-deps, und es wird\n                                eine kommagetrennte Liste von Modulabh\u00E4ngigkeiten ausgegeben.\n                                Dies Ausgabe kann von der jlink-Option --add-modules\n                                verwendet werden, um ein benutzerdefiniertes Image zu erstellen,\n                                das diese Module und ihre transitiven Abh\u00E4ngigkeiten enth\u00E4lt.
+main.opt.print-module-deps=\  --print-module-deps           Gleich wie --list-reduced-deps, und es wird\n                                eine kommagetrennte Liste von Modulabhängigkeiten ausgegeben.\n                                Dies Ausgabe kann von der jlink-Option --add-modules\n                                verwendet werden, um ein benutzerdefiniertes Image zu erstellen,\n                                das diese Module und ihre transitiven Abhängigkeiten enthält.
 
-main.opt.depth=\  -depth=<Tiefe>                Gibt die Tiefe der transitiven\n                                Abh\u00E4ngigkeitsanalyse an
+main.opt.depth=\  -depth=<Tiefe>                Gibt die Tiefe der transitiven\n                                Abhängigkeitsanalyse an
 
-main.opt.q=\  -q       -quiet               Unterdr\u00FCckt Warnmeldungen
+main.opt.q=\  -q       -quiet               Unterdrückt Warnmeldungen
 
 main.opt.multi-release=\  --multi-release <Version>     Gibt bei Verarbeitung von Multi-Release-JAR-Dateien\n                                die Version an. <Version> muss eine\n                                Ganzzahl >= 9 oder ein Basiswert sein.
 
 err.command.set=Die Optionen {0} und {1} werden angegeben.
 err.unknown.option=unbekannte Option: {0}
-err.missing.arg=kein Wert angegeben f\u00FCr {0}
-err.invalid.arg.for.option=ung\u00FCltiges Argument f\u00FCr Option: {0}
+err.missing.arg=kein Wert angegeben für {0}
+err.invalid.arg.for.option=ungültiges Argument für Option: {0}
 err.option.after.class=Option muss angegeben werden vor den Klassen: {0}
 err.genmoduleinfo.not.jarfile={0} ist eine modulare JAR-Datei, die nicht mit der Option --generate-module-info angegeben werden kann
-err.genmoduleinfo.unnamed.package={0} enth\u00E4lt ein unbenanntes Package, das in einem Modul nicht zul\u00E4ssig ist
+err.genmoduleinfo.unnamed.package={0} enthält ein unbenanntes Package, das in einem Modul nicht zulässig ist
 err.exception.message={0}
-err.invalid.path=ung\u00FCltiger Pfad: {0}
+err.invalid.path=ungültiger Pfad: {0}
 err.invalid.options={0} kann nicht mit der Option {1} verwendet werden
 err.module.not.found=Modul nicht gefunden: {0}
 err.root.module.not.set=Root-Modulset leer
 err.option.already.specified=Option {0} wurde mehrmals angegeben.
-err.filter.not.specified=Die Optionen --package (-p), --regex (-e), --require m\u00FCssen angegeben werden
+err.filter.not.specified=Die Optionen --package (-p), --regex (-e), --require müssen angegeben werden
 err.invalid.filters=Nur eine der Optionen --package (-p), --regex (-e), --require darf angegeben werden
 err.multirelease.option.exists={0} ist keine Multi-Release-JAR-Datei, aber die Option --multi-release ist festgelegt
 err.multirelease.option.notfound={0} ist eine Multi-Release-JAR-Datei, aber die Option --multi-release ist nicht festgelegt
-err.multirelease.version.associated=Klasse {0} ist bereits mit Version {1} verkn\u00FCpft, und es wird versucht, Version {2} hinzuzuf\u00FCgen
-err.multirelease.jar.malformed=nicht wohlgeformte Multi-Release-JAR, {0}, ung\u00FCltiger Eintrag: {1}
-err.missing.dependences=Fehlende Abh\u00E4ngigkeiten: Klassen wurden im Modulpfad und Klassenpfad nicht gefunden.\nUm diesen Fehler zu unterdr\u00FCcken und fortzufahren, verwenden Sie --ignore-missing-deps.
+err.multirelease.version.associated=Klasse {0} ist bereits mit Version {1} verknüpft, und es wird versucht, Version {2} hinzuzufügen
+err.multirelease.jar.malformed=nicht wohlgeformte Multi-Release-JAR, {0}, ungültiger Eintrag: {1}
+err.missing.dependences=Fehlende Abhängigkeiten: Klassen wurden im Modulpfad und Klassenpfad nicht gefunden.\nUm diesen Fehler zu unterdrücken und fortzufahren, verwenden Sie --ignore-missing-deps.
 
-warn.deprecated.option=Option {0} ist veraltet und wird m\u00F6glicherweise in einem zuk\u00FCnftigen Release entfernt.
+warn.deprecated.option=Option {0} ist veraltet und wird möglicherweise in einem zukünftigen Release entfernt.
 warn.invalid.arg=Pfad ist nicht vorhanden: {0}
 warn.skipped.entry={0}
 warn.split.package=geteiltes Package: {0} {1}
-warn.replace.useJDKInternals=JDK-interne APIs werden nicht unterst\u00FCtzt und sind privat f\u00FCr JDK-Implementierungen.\nSie k\u00F6nnten ohne Ber\u00FCcksichtigung der Kompatibilit\u00E4t ge\u00E4ndert oder entfernt werden und die Anwendung besch\u00E4digen.\n\u00C4ndern Sie den Code, um Abh\u00E4ngigkeiten von JDK-internen APIs zu beseitigen.\nDie neuesten Informationen zu JDK-internen API-Ersetzungen finden Sie hier:\n{0}
+warn.replace.useJDKInternals=JDK-interne APIs werden nicht unterstützt und sind privat für JDK-Implementierungen.\nSie könnten ohne Berücksichtigung der Kompatibilität geändert oder entfernt werden und die Anwendung beschädigen.\nÄndern Sie den Code, um Abhängigkeiten von JDK-internen APIs zu beseitigen.\nDie neuesten Informationen zu JDK-internen API-Ersetzungen finden Sie hier:\n{0}
 
-inverse.transitive.dependencies.on=Inverse transitive Abh\u00E4ngigkeiten von {0}
-inverse.transitive.dependencies.matching=Inverse transitive Abh\u00E4ngigkeiten, die \u00FCbereinstimmen mit {0}
+inverse.transitive.dependencies.on=Inverse transitive Abhängigkeiten von {0}
+inverse.transitive.dependencies.matching=Inverse transitive Abhängigkeiten, die übereinstimmen mit {0}
 internal.api.column.header=JDK-interne API
 public.api.replacement.column.header=Vorgeschlagene Ersetzung
 artifact.not.found=nicht gefunden
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties
index e3380defd2c..6d3ea0da4fc 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties
@@ -23,110 +23,110 @@
 # questions.
 #
 
-jdeps.description=Java\u30AF\u30E9\u30B9\u4F9D\u5B58\u6027\u30A2\u30CA\u30E9\u30A4\u30B6\u3092\u8D77\u52D5\u3057\u307E\u3059
+jdeps.description=Javaクラス依存性アナライザを起動します
 
-main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <path ...>]\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001--help\u3092\u4F7F\u7528\u3057\u307E\u3059
+main.usage.summary=使用方法: {0} <options> <path ...>]\n使用可能なオプションのリストについては、--helpを使用します
 
-main.usage=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <path ...>]\n<path>\u306B\u306F\u3001.class\u30D5\u30A1\u30A4\u30EB\u3001\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u540D\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\n\n\u4F7F\u7528\u3067\u304D\u308B\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:
+main.usage=使用方法: {0} <options> <path ...>]\n<path>には、.classファイル、ディレクトリ、JARファイルのパス名を指定できます。\n\n使用できるオプションは次のとおりです:
 
-error.prefix=\u30A8\u30E9\u30FC:
-warn.prefix=\u8B66\u544A:
+error.prefix=エラー:
+warn.prefix=警告:
 
-main.opt.h=\  -h -? --help                  \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059
+main.opt.h=\  -h -? --help                  このヘルプ・メッセージを出力します
 
-main.opt.version=\  -version --version            \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
+main.opt.version=\  -version --version            バージョン情報
 
-main.opt.v=\  -v       -verbose             \u30AF\u30E9\u30B9\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u3059\u3079\u3066\u51FA\u529B\u3057\u307E\u3059\n                                -verbose:class -filter:none\u3068\u540C\u7B49\u3067\u3059\u3002\n  -verbose:package              \u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u51FA\u529B\u3057\u307E\u3059\n                                 (\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u540C\u3058\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u306E\u4F9D\u5B58\u6027\u3092\u9664\u304F)\n  -verbose:class                \u30AF\u30E9\u30B9\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u51FA\u529B\u3057\u307E\u3059\n                                (\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u540C\u3058\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u306E\u4F9D\u5B58\u6027\u3092\u9664\u304F)
+main.opt.v=\  -v       -verbose             クラス・レベルの依存性をすべて出力します\n                                -verbose:class -filter:noneと同等です。\n  -verbose:package              パッケージ・レベルの依存性を出力します\n                                 (デフォルトでは、同じパッケージ内の依存性を除く)\n  -verbose:class                クラス・レベルの依存性を出力します\n                                (デフォルトでは、同じパッケージ内の依存性を除く)
 
-main.opt.s=\  -s       -summary             \u4F9D\u5B58\u6027\u306E\u30B5\u30DE\u30EA\u30FC\u306E\u307F\u51FA\u529B\u3057\u307E\u3059
+main.opt.s=\  -s       -summary             依存性のサマリーのみ出力します
 
-main.opt.f=\  -f <regex>   -filter <regex>    \u6307\u5B9A\u306E\u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u3092\n                                     \u30D5\u30A3\u30EB\u30BF\u3057\u307E\u3059\u3002\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u305F\u5834\u5408\u3001\u6700\u5F8C\u306E\u3082\u306E\u304C\n                                    \u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n  -filter:package                    \u540C\u3058\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u306E\u4F9D\u5B58\u6027\u3092\u30D5\u30A3\u30EB\u30BF\u3057\u307E\u3059\u3002\n                                    \u3053\u308C\u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u3059\u3002\n  -filter:archive                    \u540C\u3058\u30A2\u30FC\u30AB\u30A4\u30D6\u5185\u306E\u4F9D\u5B58\u6027\u3092\u30D5\u30A3\u30EB\u30BF\u3057\u307E\u3059\n  -filter:module                       \u540C\u3058\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u4F9D\u5B58\u6027\u3092\u30D5\u30A3\u30EB\u30BF\u3057\u307E\u3059\n  -filter:none                       -filter:package\u304A\u3088\u3073-filter:archive\u306E\u30D5\u30A3\u30EB\u30BF\u30EA\u30F3\u30B0\u306F\n                                    \u884C\u308F\u308C\u307E\u305B\u3093\u3002-filter\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u6307\u5B9A\u3057\u305F\u30D5\u30A3\u30EB\u30BF\u30EA\u30F3\u30B0\u304C\n                                    \u5F15\u304D\u7D9A\u304D\u9069\u7528\u3055\u308C\u307E\u3059\u3002\n
-main.opt.p=\n\u4F9D\u5B58\u6027\u3092\u30D5\u30A3\u30EB\u30BF\u3059\u308B\u30AA\u30D7\u30B7\u30E7\u30F3:\n  -p <pkg>\n  -package <pkg>\n  --package <pkg>               \u6307\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306B\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\n                                (\u8907\u6570\u56DE\u6307\u5B9A\u53EF\u80FD)\u3002
+main.opt.f=\  -f <regex>   -filter <regex>    指定のパターンに一致する依存性を\n                                     フィルタします。複数回指定された場合、最後のものが\n                                    使用されます。\n  -filter:package                    同じパッケージ内の依存性をフィルタします。\n                                    これがデフォルトです。\n  -filter:archive                    同じアーカイブ内の依存性をフィルタします\n  -filter:module                       同じモジュール内の依存性をフィルタします\n  -filter:none                       -filter:packageおよび-filter:archiveのフィルタリングは\n                                    行われません。-filterオプションで指定したフィルタリングが\n                                    引き続き適用されます。\n
+main.opt.p=\n依存性をフィルタするオプション:\n  -p <pkg>\n  -package <pkg>\n  --package <pkg>               指定のパッケージ名に一致する依存性を検出します\n                                (複数回指定可能)。
 
-main.opt.e=\  -e <regex>\n  -regex <regex>\n  --regex <regex>               \u6307\u5B9A\u306E\u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\u3002
+main.opt.e=\  -e <regex>\n  -regex <regex>\n  --regex <regex>               指定のパターンに一致する依存性を検出します。
 
-main.opt.require=\  --require <module-name>       \u6307\u5B9A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u306B\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\n                                 (\u8907\u6570\u56DE\u6307\u5B9A\u53EF\u80FD)\u3002--package\u3001\n                                --regex\u3001--require\u306F\u76F8\u4E92\u306B\u6392\u4ED6\u7684\u3067\u3059\u3002
+main.opt.require=\  --require <module-name>       指定のモジュール名に一致する依存性を検出します\n                                 (複数回指定可能)。--package、\n                                --regex、--requireは相互に排他的です。
 
-main.opt.missing-deps=\  --missing-deps                \u6B20\u843D\u3057\u3066\u3044\u308B\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\u3002  \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\n                                -p\u3001-e\u304A\u3088\u3073-s\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
+main.opt.missing-deps=\  --missing-deps                欠落している依存性を検出します。  このオプションは\n                                -p、-eおよび-sオプションと一緒に使用できません。
 
-main.opt.ignore-missing-deps=\  --ignore-missing-deps         \u6B20\u843D\u3057\u3066\u3044\u308B\u4F9D\u5B58\u6027\u3092\u7121\u8996\u3057\u307E\u3059\u3002
+main.opt.ignore-missing-deps=\  --ignore-missing-deps         欠落している依存性を無視します。
 
-main.opt.include=\n\u5206\u6790\u5BFE\u8C61\u30AF\u30E9\u30B9\u3092\u30D5\u30A3\u30EB\u30BF\u3059\u308B\u30AA\u30D7\u30B7\u30E7\u30F3:\n  -include <regex>              \u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3059\u308B\u30AF\u30E9\u30B9\u306B\u5206\u6790\u3092\u5236\u9650\u3057\u307E\u3059\n                                     \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u5206\u6790\u5BFE\u8C61\u30AF\u30E9\u30B9\u306E\n                                     \u30EA\u30B9\u30C8\u304C\u30D5\u30A3\u30EB\u30BF\u3055\u308C\u307E\u3059\u3002\u30D1\u30BF\u30FC\u30F3\u3092\u4F9D\u5B58\u6027\u306B\n                                     \u9069\u7528\u3059\u308B-p\u304A\u3088\u3073-e\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u3059
+main.opt.include=\n分析対象クラスをフィルタするオプション:\n  -include <regex>              パターンに一致するクラスに分析を制限します\n                                     このオプションを指定すると、分析対象クラスの\n                                     リストがフィルタされます。パターンを依存性に\n                                     適用する-pおよび-eと一緒に使用できます
 
-main.opt.cp=\  -cp <path>\n  -classpath <path>\n  --class-path <path>           \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059
+main.opt.cp=\  -cp <path>\n  -classpath <path>\n  --class-path <path>           クラス・ファイルを検索する場所を指定します
 
-main.opt.module-path=\  --module-path <module path>   \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059
+main.opt.module-path=\  --module-path <module path>   モジュール・パスを指定します
 
-main.opt.upgrade-module-path=\  --upgrade-module-path <module path>  \u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059
+main.opt.upgrade-module-path=\  --upgrade-module-path <module path>  アップグレード・モジュール・パスを指定します
 
-main.opt.system=\  --system <java-home>          \u4EE3\u66FF\u30B7\u30B9\u30C6\u30E0\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059
+main.opt.system=\  --system <java-home>          代替システム・モジュール・パスを指定します
 
-main.opt.add-modules=\  --add-modules <module-name>[,<module-name>...]\n                                \u5206\u6790\u7528\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EB\u30FC\u30C8\u30FB\u30BB\u30C3\u30C8\u306B\u8FFD\u52A0\u3057\u307E\u3059
+main.opt.add-modules=\  --add-modules <module-name>[,<module-name>...]\n                                分析用にモジュールをルート・セットに追加します
 
-main.opt.R=\  -R\n  --recursive                   \u3059\u3079\u3066\u306E\u30E9\u30F3\u30BF\u30A4\u30E0\u4F9D\u5B58\u6027\u3092\u518D\u5E30\u7684\u306B\u30C8\u30E9\u30D0\u30FC\u30B9\u3057\u307E\u3059\u3002\n                                -R\u30AA\u30D7\u30B7\u30E7\u30F3\u306F-filter:none\u3092\u610F\u5473\u3057\u307E\u3059\u3002-p\u3001-e\u3001-f\n                                \u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u306E\u307F\n                                \u5206\u6790\u3055\u308C\u307E\u3059\u3002
+main.opt.R=\  -R\n  --recursive                   すべてのランタイム依存性を再帰的にトラバースします。\n                                -Rオプションは-filter:noneを意味します。-p、-e、-f\n                                オプションが指定されている場合、一致する依存性のみ\n                                分析されます。
 
-main.opt.no-recursive=\  --no-recursive                \u4F9D\u5B58\u6027\u3092\u518D\u5E30\u7684\u306B\u30C8\u30E9\u30D0\u30FC\u30B9\u3057\u307E\u305B\u3093\u3002
+main.opt.no-recursive=\  --no-recursive                依存性を再帰的にトラバースしません。
 
-main.opt.I=\  -I\n  --inverse                     \u4ED6\u306E\u6307\u5B9A\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3054\u3068\u306B\u4F9D\u5B58\u6027\u3092\u5206\u6790\u3057\u3001\n                                \u4E00\u81F4\u3059\u308B\u30CE\u30FC\u30C9\u306B\u76F4\u63A5\u304A\u3088\u3073\u9593\u63A5\u7684\u306B\u4F9D\u5B58\u3059\u308B\n                                \u3059\u3079\u3066\u306E\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u3092\u691C\u51FA\u3057\u307E\u3059\u3002\n                                \u3053\u308C\u306F\u3001\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u306E\u8868\u793A\u5206\u6790\n                                \u304A\u3088\u3073\u51FA\u529B\u4F9D\u5B58\u6027\u30B5\u30DE\u30EA\u30FC\u306E\u9006\u306B\u76F8\u5F53\u3057\u307E\u3059\u3002\n                                \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F--require\u3001--package\u307E\u305F\u306F--regex\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\n                                \u4E00\u7DD2\u306B\u4F7F\u7528\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+main.opt.I=\  -I\n  --inverse                     他の指定のオプションごとに依存性を分析し、\n                                一致するノードに直接および間接的に依存する\n                                すべてのアーティファクトを検出します。\n                                これは、コンパイル時の表示分析\n                                および出力依存性サマリーの逆に相当します。\n                                このオプションは--require、--packageまたは--regexオプションと\n                                一緒に使用する必要があります。
 
-main.opt.compile-time=\  --compile-time                \u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u306E\u8868\u793A\n                                \u4F8B: -R\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u306E\u8868\u793A\u3002\n                                \u4ED6\u306E\u6307\u5B9A\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3054\u3068\u306B\u4F9D\u5B58\u6027\u3092\u5206\u6790\u3057\u307E\u3059\n                                \u4F9D\u5B58\u6027\u304C\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u3089\n                                \u691C\u51FA\u3055\u308C\u305F\u5834\u5408\u3001\u305D\u306E\u5305\u542B\u3059\u308B\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\n                                \u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304C\u5206\u6790\u3055\u308C\u307E\u3059\u3002
+main.opt.compile-time=\  --compile-time                推移的な依存性のコンパイル時の表示\n                                例: -Rオプションのコンパイル時の表示。\n                                他の指定のオプションごとに依存性を分析します\n                                依存性がディレクトリ、JARファイルまたはモジュールから\n                                検出された場合、その包含するアーカイブの\n                                すべてのクラスが分析されます。
 
-main.opt.apionly=\  -apionly\n  --api-only                    \u5206\u6790\u3092API\u3001\u3064\u307E\u308A\u3001\u30D1\u30D6\u30EA\u30C3\u30AF\u30FB\u30AF\u30E9\u30B9\u306E\n                                \u30D1\u30D6\u30EA\u30C3\u30AF\u30FB\u30E1\u30F3\u30D0\u30FC\u304A\u3088\u3073\u4FDD\u8B77\u3055\u308C\u305F\u30E1\u30F3\u30D0\u30FC\u306E\n                                \u7F72\u540D\u306B\u304A\u3051\u308B\u4F9D\u5B58\u6027(\u30D5\u30A3\u30FC\u30EB\u30C9\u30FB\u30BF\u30A4\u30D7\u3001\u30E1\u30BD\u30C3\u30C9\u30FB\n                                \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\u3001\u623B\u3055\u308C\u305F\u30BF\u30A4\u30D7\u3001\u30C1\u30A7\u30C3\u30AF\u3055\u308C\u305F\n                                \u4F8B\u5916\u30BF\u30A4\u30D7\u306A\u3069)\u306B\u5236\u9650\u3057\u307E\u3059\u3002
+main.opt.apionly=\  -apionly\n  --api-only                    分析をAPI、つまり、パブリック・クラスの\n                                パブリック・メンバーおよび保護されたメンバーの\n                                署名における依存性(フィールド・タイプ、メソッド・\n                                パラメータ・タイプ、戻されたタイプ、チェックされた\n                                例外タイプなど)に制限します。
 
-main.opt.m=\n\u30E2\u30B8\u30E5\u30FC\u30EB\u4F9D\u5B58\u6027\u306E\u5206\u6790\u30AA\u30D7\u30B7\u30E7\u30F3:\n  -m <module-name>\n  --module <module-name>        \u5206\u6790\u7528\u306B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059
+main.opt.m=\nモジュール依存性の分析オプション:\n  -m <module-name>\n  --module <module-name>        分析用にルート・モジュールを指定します
 
-main.opt.generate-module-info=\  --generate-module-info <dir>  \u6307\u5B9A\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Bmodule-info.java\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n                                \u6307\u5B9A\u3057\u305FJAR\u30D5\u30A1\u30A4\u30EB\u3092\u5206\u6790\u3057\u307E\u3059\u3002\n                                \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F--dot-output\u307E\u305F\u306F--class-path\n                                \u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u30AA\u30FC\u30D7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\n                                --generate-open-module\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+main.opt.generate-module-info=\  --generate-module-info <dir>  指定したディレクトリにmodule-info.javaを生成します。\n                                指定したJARファイルを分析します。\n                                このオプションは--dot-outputまたは--class-path\n                                と一緒に使用できません。オープン・モジュールには\n                                --generate-open-moduleオプションを使用してください。
 
-main.opt.generate-open-module=\  --generate-open-module <dir>  \u6307\u5B9A\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u3001\u6307\u5B9A\u3057\u305F\n                                JAR\u30D5\u30A1\u30A4\u30EB\u306Emodule-info.java\u3092\u30AA\u30FC\u30D7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3068\u3057\u3066\n                                \u751F\u6210\u3057\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F--dot-output\n                                \u307E\u305F\u306F--class-path\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
+main.opt.generate-open-module=\  --generate-open-module <dir>  指定したディレクトリに、指定した\n                                JARファイルのmodule-info.javaをオープン・モジュールとして\n                                生成します。このオプションは--dot-output\n                                または--class-pathと一緒に使用できません。
 
-main.opt.check=\  --check <module-name>[,<module-name>...\n                                \u6307\u5B9A\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u5206\u6790\u3057\u307E\u3059\n                                \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u3001\u5206\u6790\u5F8C\u306E\u7D50\u679C\u30E2\u30B8\u30E5\u30FC\u30EB\u4F9D\u5B58\u6027\n                                \u304A\u3088\u3073\u9077\u79FB\u524A\u6E1B\u5F8C\u306E\u30B0\u30E9\u30D5\u3092\n                                \u51FA\u529B\u3057\u307E\u3059\u3002\n                                \u672A\u4F7F\u7528\u306E\u4FEE\u98FE\u3055\u308C\u305F\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3082\u8B58\u5225\u3057\u307E\u3059\u3002
+main.opt.check=\  --check <module-name>[,<module-name>...\n                                指定したモジュールの依存性を分析します\n                                モジュール・ディスクリプタ、分析後の結果モジュール依存性\n                                および遷移削減後のグラフを\n                                出力します。\n                                未使用の修飾されたエクスポートも識別します。
 
-main.opt.dotoutput=\  -dotoutput <dir>\n  --dot-output <dir>            DOT\u30D5\u30A1\u30A4\u30EB\u51FA\u529B\u306E\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
+main.opt.dotoutput=\  -dotoutput <dir>\n  --dot-output <dir>            DOTファイル出力の宛先ディレクトリ
 
-main.opt.jdkinternals=\  -jdkinternals\n  --jdk-internals               JDK\u5185\u90E8API\u306E\u30AF\u30E9\u30B9\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\u3002\n                                \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001-include\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u306A\u3044\u3068\u3001\n                                --class-path\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3068\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u5206\u6790\u3057\u307E\u3059\u3002\n                                \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F-p\u3001-e\u304A\u3088\u3073-s\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u4E00\u7DD2\u306B\n                                \u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n                                \u8B66\u544A: JDK\u5185\u90E8API\u306F\u3001\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059\u3002
+main.opt.jdkinternals=\  -jdkinternals\n  --jdk-internals               JDK内部APIのクラスレベルの依存性を検出します。\n                                デフォルトでは、-includeオプションを指定しないと、\n                                --class-pathのすべてのクラスと入力ファイルを分析します。\n                                このオプションは-p、-eおよび-sオプションと一緒に\n                                使用できません。\n                                警告: JDK内部APIは、アクセスできなくなります。
 
-main.opt.list-deps=\  --list-deps                   \u30E2\u30B8\u30E5\u30FC\u30EB\u4F9D\u5B58\u6027\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\u53C2\u7167\u3055\u308C\u3066\u3044\u308B\n                                \u5834\u5408\u3001\u4EFB\u610F\u306E\u5185\u90E8API\u30D1\u30C3\u30B1\u30FC\u30B8\u3082\u51FA\u529B\u3057\u307E\u3059\u3002\n                                \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u53C2\u7167\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30AF\u30E9\u30B9\u30D1\u30B9\u3068\n                                \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u63A8\u79FB\u7684\u306B\u5206\u6790\u3057\u307E\u3059\u3002\n                                \u975E\u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u306E\u5206\u6790\u306B\u306F\u3001--no-recursive\u30AA\u30D7\u30B7\u30E7\u30F3\n                                \u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+main.opt.list-deps=\  --list-deps                   モジュール依存性をリストします。参照されている\n                                場合、任意の内部APIパッケージも出力します。\n                                このオプションは、参照されている場合、クラスパスと\n                                モジュール・パスのライブラリを推移的に分析します。\n                                非推移的な依存性の分析には、--no-recursiveオプション\n                                を使用してください。
 
-main.opt.list-reduced-deps=\  --list-reduced-deps           --list-deps\u3068\u540C\u3058\u3067\u3059\u304C\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B0\u30E9\u30D5\n                                \u304B\u3089\u542B\u610F\u3055\u308C\u305F\u8AAD\u53D6\u308A\u30A8\u30C3\u30B8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u305B\u3093\u3002\n                                \u30E2\u30B8\u30E5\u30FC\u30EBM1\u304CM2\u3092\u8AAD\u307F\u53D6\u308A\u3001M2\u304CM3\u3067\u306E\u63A8\u79FB\u3092\n                                \u5FC5\u8981\u3068\u3059\u308B\u5834\u5408\u3001M3\u3092\u8AAD\u307F\u53D6\u308BM1\u306F\u542B\u610F\u3055\u308C\u3066\u304A\u308A\u3001\n                                \u30B0\u30E9\u30D5\u306B\u306F\u8868\u793A\u3055\u308C\u307E\u305B\u3093\u3002
+main.opt.list-reduced-deps=\  --list-reduced-deps           --list-depsと同じですが、モジュール・グラフ\n                                から含意された読取りエッジをリストしません。\n                                モジュールM1がM2を読み取り、M2がM3での推移を\n                                必要とする場合、M3を読み取るM1は含意されており、\n                                グラフには表示されません。
 
-main.opt.print-module-deps=\  --print-module-deps           \u30E2\u30B8\u30E5\u30FC\u30EB\u4F9D\u5B58\u6027\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u30EA\u30B9\u30C8\n                                \u3092\u51FA\u529B\u3059\u308B--list-reduced-deps\u3068\u540C\u3058\u3067\u3059\u3002\n                                \u3053\u306E\u51FA\u529B\u306F\u3001\u3053\u308C\u3089\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3068\u305D\u306E\u63A8\u79FB\u7684\u306A\n                                \u4F9D\u5B58\u6027\u3092\u542B\u3080\u30AB\u30B9\u30BF\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306B\n                                jlink --add-modules\u3067\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+main.opt.print-module-deps=\  --print-module-deps           モジュール依存性のカンマ区切りリスト\n                                を出力する--list-reduced-depsと同じです。\n                                この出力は、これらのモジュールとその推移的な\n                                依存性を含むカスタム・イメージを作成するために\n                                jlink --add-modulesで使用できます。
 
-main.opt.depth=\  -depth=<depth>                \u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u5206\u6790\u306E\u6DF1\u3055\u3092\n                                \u6307\u5B9A\u3057\u307E\u3059
+main.opt.depth=\  -depth=<depth>                推移的な依存性分析の深さを\n                                指定します
 
-main.opt.q=\  -q       -quiet               \u8B66\u544A\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059
+main.opt.q=\  -q       -quiet               警告メッセージを表示しないようにします
 
-main.opt.multi-release=\  --multi-release <version>     \u30DE\u30EB\u30C1\u30EA\u30EA\u30FC\u30B9jar\u30D5\u30A1\u30A4\u30EB\u3092\u51E6\u7406\u3059\u308B\u969B\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\n                                \u6307\u5B9A\u3057\u307E\u3059\u3002<version>\u306F\u30019\u307E\u305F\u306F\u30D9\u30FC\u30B9\u4EE5\u4E0A\u306E\n                                \u6574\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+main.opt.multi-release=\  --multi-release <version>     マルチリリースjarファイルを処理する際のバージョンを\n                                指定します。<version>は、9またはベース以上の\n                                整数である必要があります。
 
-err.command.set=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u3068{1}\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
-err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-err.invalid.arg.for.option=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: {0}
-err.option.after.class=\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30AF\u30E9\u30B9\u306E\u524D\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
-err.genmoduleinfo.not.jarfile={0}\u306F\u3001--generate-module-info\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u3068\u3082\u306B\u6307\u5B9A\u3067\u304D\u306A\u3044\u30E2\u30B8\u30E5\u30E9JAR\u30D5\u30A1\u30A4\u30EB\u3067\u3059
-err.genmoduleinfo.unnamed.package={0}\u306B\u306F\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u8A31\u53EF\u3055\u308C\u306A\u3044\u540D\u524D\u306E\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059
+err.command.set=オプション{0}と{1}が指定されています。
+err.unknown.option=不明なオプション: {0}
+err.missing.arg={0}に値が指定されていません
+err.invalid.arg.for.option=オプションの引数が無効です: {0}
+err.option.after.class=オプションはクラスの前に指定する必要があります: {0}
+err.genmoduleinfo.not.jarfile={0}は、--generate-module-infoオプションとともに指定できないモジュラJARファイルです
+err.genmoduleinfo.unnamed.package={0}には、モジュールで許可されない名前のないパッケージが含まれます
 err.exception.message={0}
-err.invalid.path=\u7121\u52B9\u306A\u30D1\u30B9: {0}
-err.invalid.options={0}\u306F{1}\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-err.module.not.found=\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-err.root.module.not.set=\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30BB\u30C3\u30C8\u304C\u7A7A\u3067\u3059
-err.option.already.specified={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-err.filter.not.specified=--package (-p)\u3001--regex (-e)\u3001--require\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-err.invalid.filters=--package (-p)\u3001--regex (-e)\u3001--require\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u3044\u305A\u308C\u304B1\u3064\u306E\u307F\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059
-err.multirelease.option.exists={0}\u306F\u30DE\u30EB\u30C1\u30EA\u30EA\u30FC\u30B9jar\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u304C--multi-release\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
-err.multirelease.option.notfound={0}\u306F\u30DE\u30EB\u30C1\u30EA\u30EA\u30FC\u30B9jar\u30D5\u30A1\u30A4\u30EB\u3067\u3059\u304C--multi-release\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-err.multirelease.version.associated=\u30AF\u30E9\u30B9{0}\u306F\u3059\u3067\u306B\u30D0\u30FC\u30B8\u30E7\u30F3{1}\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u307E\u3059\u3002\u30D0\u30FC\u30B8\u30E7\u30F3{2}\u306E\u8FFD\u52A0\u3092\u8A66\u307F\u307E\u3059
-err.multirelease.jar.malformed=\u4E0D\u6B63\u306A\u30DE\u30EB\u30C1\u30EA\u30EA\u30FC\u30B9jar\u3001{0}\u3001\u4E0D\u6B63\u306A\u30A8\u30F3\u30C8\u30EA: {1}
-err.missing.dependences=\u4F9D\u5B58\u6027\u306E\u6B20\u843D:\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u3068\u30AF\u30E9\u30B9\u30D1\u30B9\u304B\u3089\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\n\u3053\u306E\u30A8\u30E9\u30FC\u3092\u6291\u6B62\u3059\u308B\u306B\u306F\u3001--ignore-missing-deps\u3092\u4F7F\u7528\u3057\u3066\u7D9A\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-
-warn.deprecated.option={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-warn.invalid.arg=\u30D1\u30B9\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
+err.invalid.path=無効なパス: {0}
+err.invalid.options={0}は{1}オプションと一緒に使用できません
+err.module.not.found=モジュールが見つかりません: {0}
+err.root.module.not.set=ルート・モジュール・セットが空です
+err.option.already.specified={0}オプションが複数回指定されています。
+err.filter.not.specified=--package (-p)、--regex (-e)、--requireオプションを指定する必要があります
+err.invalid.filters=--package (-p)、--regex (-e)、--requireオプションのいずれか1つのみを指定できます
+err.multirelease.option.exists={0}はマルチリリースjarファイルではありませんが--multi-releaseオプションが設定されています
+err.multirelease.option.notfound={0}はマルチリリースjarファイルですが--multi-releaseオプションが設定されていません
+err.multirelease.version.associated=クラス{0}はすでにバージョン{1}に関連付けられています。バージョン{2}の追加を試みます
+err.multirelease.jar.malformed=不正なマルチリリースjar、{0}、不正なエントリ: {1}
+err.missing.dependences=依存性の欠落:モジュール・パスとクラスパスからクラスが見つかりません。\nこのエラーを抑止するには、--ignore-missing-depsを使用して続行してください。
+
+warn.deprecated.option={0}オプションは非推奨であり、今後のリリースで削除される可能性があります。
+warn.invalid.arg=パスが存在しません: {0}
 warn.skipped.entry={0}
-warn.split.package=\u5206\u5272\u30D1\u30C3\u30B1\u30FC\u30B8: {0} {1}
-warn.replace.useJDKInternals=JDK\u5185\u90E8API\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u304A\u3089\u305A\u3001JDK\u5B9F\u88C5\u5C02\u7528\u3067\u3059\u304C\u3001\u4E92\u63DB\u6027\u306A\u3057\u3067\n\u524A\u9664\u307E\u305F\u306F\u5909\u66F4\u3055\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4E2D\u65AD\u3055\u305B\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\nJDK\u5185\u90E8API\u306E\u4F9D\u5B58\u6027\u3092\u524A\u9664\u3059\u308B\u3088\u3046\u30B3\u30FC\u30C9\u3092\u5909\u66F4\u3057\u3066\u304F\u3060\u3055\u3044\u3002\nJDK\u5185\u90E8API\u306E\u7F6E\u63DB\u306B\u95A2\u3059\u308B\u6700\u65B0\u306E\u66F4\u65B0\u306B\u3064\u3044\u3066\u306F\u3001\u6B21\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044:\n{0}
-
-inverse.transitive.dependencies.on={0}\u4E0A\u3067\u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u3092\u9006\u8EE2\u3057\u307E\u3059
-inverse.transitive.dependencies.matching={0}\u306B\u4E00\u81F4\u3059\u308B\u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u3092\u9006\u8EE2\u3057\u307E\u3059
-internal.api.column.header=JDK\u5185\u90E8API
-public.api.replacement.column.header=\u4FEE\u6B63\u5019\u88DC
-artifact.not.found=\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+warn.split.package=分割パッケージ: {0} {1}
+warn.replace.useJDKInternals=JDK内部APIはサポートされておらず、JDK実装専用ですが、互換性なしで\n削除または変更される場合があり、アプリケーションを中断させる可能性があります。\nJDK内部APIの依存性を削除するようコードを変更してください。\nJDK内部APIの置換に関する最新の更新については、次を確認してください:\n{0}
+
+inverse.transitive.dependencies.on={0}上で推移的な依存性を逆転します
+inverse.transitive.dependencies.matching={0}に一致する推移的な依存性を逆転します
+internal.api.column.header=JDK内部API
+public.api.replacement.column.header=修正候補
+artifact.not.found=見つかりません
 jdeps.wiki.url=https://wiki.openjdk.org/display/JDK8/Java+Dependency+Analysis+Tool
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties
index 9c2c6f849f1..d1a0347b8cb 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties
@@ -23,110 +23,110 @@
 # questions.
 #
 
-jdeps.description=\u542F\u52A8 Java \u7C7B\u76F8\u5173\u6027\u5206\u6790\u7A0B\u5E8F
+jdeps.description=启动 Java 类相关性分析程序
 
-main.usage.summary=\u7528\u6CD5\uFF1A{0} <\u9009\u9879> <\u8DEF\u5F84...>]\n\u4F7F\u7528 --help \u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
+main.usage.summary=用法：{0} <选项> <路径...>]\n使用 --help 列出可能的选项
 
-main.usage=\u7528\u6CD5: {0} <\u9009\u9879> <\u8DEF\u5F84...>]\n\u5176\u4E2D <\u8DEF\u5F84> \u53EF\u4EE5\u662F .class \u6587\u4EF6, \u76EE\u5F55, JAR \u6587\u4EF6\u7684\u8DEF\u5F84\u540D\u3002\n\n\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC:
+main.usage=用法: {0} <选项> <路径...>]\n其中 <路径> 可以是 .class 文件, 目录, JAR 文件的路径名。\n\n可能的选项包括:
 
-error.prefix=\u9519\u8BEF:
-warn.prefix=\u8B66\u544A:
+error.prefix=错误:
+warn.prefix=警告:
 
-main.opt.h=\  -h -? --help                  \u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F
+main.opt.h=\  -h -? --help                  输出此帮助消息
 
-main.opt.version=\  -version --version            \u7248\u672C\u4FE1\u606F
+main.opt.version=\  -version --version            版本信息
 
-main.opt.v=\  -v       -verbose             \u8F93\u51FA\u6240\u6709\u7C7B\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                \u7B49\u540C\u4E8E -verbose:class -filter:none\u3002\n  -verbose:package              \u9ED8\u8BA4\u60C5\u51B5\u4E0B\u8F93\u51FA\u7A0B\u5E8F\u5305\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61, \n                                \u5176\u4E2D\u5305\u62EC\u540C\u4E00\u7A0B\u5E8F\u5305\u4E2D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n  -verbose:class                \u9ED8\u8BA4\u60C5\u51B5\u4E0B\u8F93\u51FA\u7C7B\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61, \n                                \u5176\u4E2D\u5305\u62EC\u540C\u4E00\u7A0B\u5E8F\u5305\u4E2D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61
+main.opt.v=\  -v       -verbose             输出所有类级别被依赖对象\n                                等同于 -verbose:class -filter:none。\n  -verbose:package              默认情况下输出程序包级别被依赖对象, \n                                其中包括同一程序包中的被依赖对象\n  -verbose:class                默认情况下输出类级别被依赖对象, \n                                其中包括同一程序包中的被依赖对象
 
-main.opt.s=\  -s       -summary             \u4EC5\u8F93\u51FA\u88AB\u4F9D\u8D56\u5BF9\u8C61\u6982\u8981\u3002
+main.opt.s=\  -s       -summary             仅输出被依赖对象概要。
 
-main.opt.f=\  -f <\u6B63\u5219\u8868\u8FBE\u5F0F>  -filter <\u6B63\u5219\u8868\u8FBE\u5F0F>    \u7B5B\u9009\u4E0E\u6307\u5B9A\u6A21\u5F0F\u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n                                    \u5982\u679C\u591A\u6B21\u6307\u5B9A, \u5219\u5C06\u4F7F\u7528\u6700\u540E\u4E00\u4E2A\n                                    \u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n  -filter:package                   \u7B5B\u9009\u4F4D\u4E8E\u540C\u4E00\u7A0B\u5E8F\u5305\u5185\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n                                    \u8FD9\u662F\u9ED8\u8BA4\u503C\u3002\n  -filter:archive                   \u7B5B\u9009\u4F4D\u4E8E\u540C\u4E00\u6863\u6848\u5185\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n  -filter:module                \u7B5B\u9009\u4F4D\u4E8E\u540C\u4E00\u6A21\u5757\u5185\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n  -filter:none                  \u4E0D\u4F7F\u7528 -filter:package \u548C -filter:archive \u7B5B\u9009\u3002\n                                    \u901A\u8FC7 -filter \u9009\u9879\u6307\u5B9A\u7684\u7B5B\u9009\n                                    \u4ECD\u65E7\u9002\u7528\u3002\n
-main.opt.p=\n\u7528\u4E8E\u7B5B\u9009\u88AB\u4F9D\u8D56\u5BF9\u8C61\u7684\u9009\u9879:\n  -p <\u7A0B\u5E8F\u5305>\n  -package <\u7A0B\u5E8F\u5305>\n  --package <\u7A0B\u5E8F\u5305>            \u67E5\u627E\u4E0E\u7ED9\u5B9A\u7A0B\u5E8F\u5305\u540D\u79F0\u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                (\u53EF\u591A\u6B21\u6307\u5B9A)\u3002
+main.opt.f=\  -f <正则表达式>  -filter <正则表达式>    筛选与指定模式匹配的被依赖对象。\n                                    如果多次指定, 则将使用最后一个\n                                    被依赖对象。\n  -filter:package                   筛选位于同一程序包内的被依赖对象。\n                                    这是默认值。\n  -filter:archive                   筛选位于同一档案内的被依赖对象。\n  -filter:module                筛选位于同一模块内的被依赖对象。\n  -filter:none                  不使用 -filter:package 和 -filter:archive 筛选。\n                                    通过 -filter 选项指定的筛选\n                                    仍旧适用。\n
+main.opt.p=\n用于筛选被依赖对象的选项:\n  -p <程序包>\n  -package <程序包>\n  --package <程序包>            查找与给定程序包名称匹配的被依赖对象\n                                (可多次指定)。
 
-main.opt.e=\  -e <\u6B63\u5219\u8868\u8FBE\u5F0F>\n  -regex <\u6B63\u5219\u8868\u8FBE\u5F0F>\n  --regex <\u6B63\u5219\u8868\u8FBE\u5F0F>               \u67E5\u627E\u4E0E\u6307\u5B9A\u6A21\u5F0F\u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
+main.opt.e=\  -e <正则表达式>\n  -regex <正则表达式>\n  --regex <正则表达式>               查找与指定模式匹配的被依赖对象。
 
-main.opt.require=\  --require <\u6A21\u5757\u540D\u79F0>          \u67E5\u627E\u4E0E\u7ED9\u5B9A\u6A21\u5757\u540D\u79F0\u5339\u914D\u7684\n                                \u88AB\u4F9D\u8D56\u5BF9\u8C61 (\u53EF\u591A\u6B21\u6307\u5B9A)\u3002--package,\n                                --regex, --requires \u662F\u4E92\u65A5\u7684\u3002
+main.opt.require=\  --require <模块名称>          查找与给定模块名称匹配的\n                                被依赖对象 (可多次指定)。--package,\n                                --regex, --requires 是互斥的。
 
-main.opt.missing-deps=\  --missing-deps                \u67E5\u627E\u7F3A\u5C11\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\u6B64\u9009\u9879\n                                \u4E0D\u80FD\u4E0E -p\u3001-e \u548C -s \u9009\u9879\u4E00\u8D77\u4F7F\u7528\u3002
+main.opt.missing-deps=\  --missing-deps                查找缺少的被依赖对象。此选项\n                                不能与 -p、-e 和 -s 选项一起使用。
 
-main.opt.ignore-missing-deps=\  --ignore-missing-deps         \u5FFD\u7565\u7F3A\u5C11\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
+main.opt.ignore-missing-deps=\  --ignore-missing-deps         忽略缺少的被依赖对象。
 
-main.opt.include=\n\u7528\u4E8E\u7B5B\u9009\u8981\u5206\u6790\u7684\u7C7B\u7684\u9009\u9879:\n  -include <\u6B63\u5219\u8868\u8FBE\u5F0F>             \u5C06\u5206\u6790\u9650\u5236\u4E3A\u4E0E\u6A21\u5F0F\u5339\u914D\u7684\u7C7B\n                                    \u6B64\u9009\u9879\u7B5B\u9009\u8981\u5206\u6790\u7684\u7C7B\u7684\u5217\u8868\u3002\n                                    \u5B83\u53EF\u4EE5\u4E0E\u5411\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5E94\u7528\u6A21\u5F0F\u7684\n                                -p \u548C -e \u7ED3\u5408\u4F7F\u7528
+main.opt.include=\n用于筛选要分析的类的选项:\n  -include <正则表达式>             将分析限制为与模式匹配的类\n                                    此选项筛选要分析的类的列表。\n                                    它可以与向被依赖对象应用模式的\n                                -p 和 -e 结合使用
 
-main.opt.cp=\  -cp <\u8DEF\u5F84>\n  -classpath <\u8DEF\u5F84>\n  --class-path <\u8DEF\u5F84>           \u6307\u5B9A\u67E5\u627E\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
+main.opt.cp=\  -cp <路径>\n  -classpath <路径>\n  --class-path <路径>           指定查找类文件的位置
 
-main.opt.module-path=\  --module-path <\u6A21\u5757\u8DEF\u5F84>      \u6307\u5B9A\u6A21\u5757\u8DEF\u5F84
+main.opt.module-path=\  --module-path <模块路径>      指定模块路径
 
-main.opt.upgrade-module-path=\  --upgrade-module-path <\u6A21\u5757\u8DEF\u5F84>  \u6307\u5B9A\u5347\u7EA7\u6A21\u5757\u8DEF\u5F84
+main.opt.upgrade-module-path=\  --upgrade-module-path <模块路径>  指定升级模块路径
 
-main.opt.system=\  --system <java \u4E3B\u76EE\u5F55>        \u6307\u5B9A\u66FF\u4EE3\u7CFB\u7EDF\u6A21\u5757\u8DEF\u5F84
+main.opt.system=\  --system <java 主目录>        指定替代系统模块路径
 
-main.opt.add-modules=\  --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n                                \u5C06\u6A21\u5757\u6DFB\u52A0\u5230\u6839\u96C6\u4EE5\u8FDB\u884C\u5206\u6790
+main.opt.add-modules=\  --add-modules <模块名称>[,<模块名称>...]\n                                将模块添加到根集以进行分析
 
-main.opt.R=\  -R\n  --recursive                   \u9012\u5F52\u904D\u5386\u6240\u6709\u8FD0\u884C\u65F6\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n                                -R \u9009\u9879\u8868\u793A -filter:none\u3002\u5982\u679C\u6307\u5B9A\u4E86 -p\u3001\n                                -e\u3001-f \u9009\u9879\uFF0C\u5219\u53EA\u5206\u6790\n                                \u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
+main.opt.R=\  -R\n  --recursive                   递归遍历所有运行时被依赖对象。\n                                -R 选项表示 -filter:none。如果指定了 -p、\n                                -e、-f 选项，则只分析\n                                匹配的被依赖对象。
 
-main.opt.no-recursive=\  --no-recursive                \u4E0D\u9012\u5F52\u904D\u5386\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
+main.opt.no-recursive=\  --no-recursive                不递归遍历被依赖对象。
 
-main.opt.I=\  -I\n  --inverse                     \u6839\u636E\u5176\u4ED6\u6307\u5B9A\u9009\u9879\u5206\u6790\u88AB\u4F9D\u8D56\u5BF9\u8C61,\n                                \u7136\u540E\u67E5\u627E\u76F4\u63A5\u548C\u95F4\u63A5\u4F9D\u8D56\u4E8E\u5339\u914D\n                                \u8282\u70B9\u7684\u6240\u6709 Artifact\u3002\n                                \u8FD9\u76F8\u5F53\u4E8E\u7F16\u8BD1\u65F6\u89C6\u56FE\u5206\u6790\u7684\n                                \u9006\u5411, \u8F93\u51FA\u88AB\u4F9D\u8D56\u5BF9\u8C61\u6982\u8981\u3002\n                                \u6B64\u9009\u9879\u5FC5\u987B\u4E0E --require, \n                                --package \u6216 --regex \u9009\u9879\u4E00\u8D77\u4F7F\u7528\u3002
+main.opt.I=\  -I\n  --inverse                     根据其他指定选项分析被依赖对象,\n                                然后查找直接和间接依赖于匹配\n                                节点的所有 Artifact。\n                                这相当于编译时视图分析的\n                                逆向, 输出被依赖对象概要。\n                                此选项必须与 --require, \n                                --package 或 --regex 选项一起使用。
 
-main.opt.compile-time=\  --compile-time                \u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u7684\u7F16\u8BD1\u65F6\u89C6\u56FE,\n                                \u4F8B\u5982 -R \u9009\u9879\u7684\u7F16\u8BD1\u65F6\u89C6\u56FE\u3002\n                                \u6839\u636E\u5176\u4ED6\u6307\u5B9A\u9009\u9879\u5206\u6790\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                \u5982\u679C\u4ECE\u76EE\u5F55, JAR \u6587\u4EF6\u6216\u6A21\u5757\u4E2D\n                                \u627E\u5230\u88AB\u4F9D\u8D56\u5BF9\u8C61, \u5219\u5C06\u5206\u6790\n                                \u8BE5\u6240\u5728\u6863\u6848\u4E2D\u7684\u6240\u6709\u7C7B\u3002
+main.opt.compile-time=\  --compile-time                过渡被依赖对象的编译时视图,\n                                例如 -R 选项的编译时视图。\n                                根据其他指定选项分析被依赖对象\n                                如果从目录, JAR 文件或模块中\n                                找到被依赖对象, 则将分析\n                                该所在档案中的所有类。
 
-main.opt.apionly=\  -apionly\n  --api-only                    \u901A\u8FC7\u516C\u5171\u7C7B (\u5305\u62EC\u5B57\u6BB5\u7C7B\u578B, \u65B9\u6CD5\n                                \u53C2\u6570\u7C7B\u578B, \u8FD4\u56DE\u7C7B\u578B, \u53D7\u63A7\u5F02\u5E38\u9519\u8BEF\n                                \u7C7B\u578B\u7B49) \u7684\u516C\u5171\u548C\u53D7\u4FDD\u62A4\u6210\u5458\u7684\u7B7E\u540D\n                                \u9650\u5236\u5BF9 API (\u5373\u88AB\u4F9D\u8D56\u5BF9\u8C61)\n                                \u8FDB\u884C\u5206\u6790\u3002
+main.opt.apionly=\  -apionly\n  --api-only                    通过公共类 (包括字段类型, 方法\n                                参数类型, 返回类型, 受控异常错误\n                                类型等) 的公共和受保护成员的签名\n                                限制对 API (即被依赖对象)\n                                进行分析。
 
-main.opt.m=\n\u6A21\u5757\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5206\u6790\u9009\u9879:\n  -m <\u6A21\u5757\u540D\u79F0>\n  --module <\u6A21\u5757\u540D\u79F0>        \u6307\u5B9A\u7528\u4E8E\u5206\u6790\u7684\u6839\u6A21\u5757
+main.opt.m=\n模块被依赖对象分析选项:\n  -m <模块名称>\n  --module <模块名称>        指定用于分析的根模块
 
-main.opt.generate-module-info=\  --generate-module-info <\u76EE\u5F55> \u5728\u6307\u5B9A\u76EE\u5F55\u4E0B\u751F\u6210 module-info.java\u3002\n                                \u5C06\u5206\u6790\u6307\u5B9A\u7684 JAR \u6587\u4EF6\u3002\n                                \u6B64\u9009\u9879\u4E0D\u80FD\u4E0E --dot-output \n                                \u6216 --class-path \u4E00\u8D77\u4F7F\u7528\u3002\u5BF9\u6253\u5F00\u7684\n                                \u6A21\u5757\u4F7F\u7528 --generate-open-module \u9009\u9879\u3002
+main.opt.generate-module-info=\  --generate-module-info <目录> 在指定目录下生成 module-info.java。\n                                将分析指定的 JAR 文件。\n                                此选项不能与 --dot-output \n                                或 --class-path 一起使用。对打开的\n                                模块使用 --generate-open-module 选项。
 
-main.opt.generate-open-module=\  --generate-open-module <dir>  \u4EE5\u6253\u5F00\u6A21\u5757\u7684\u65B9\u5F0F\u4E3A\u6307\u5B9A\u76EE\u5F55\u4E0B\u7684\n                                \u6307\u5B9A JAR \u6587\u4EF6\u751F\u6210 module-info.java\u3002\n                                \u6B64\u9009\u9879\u4E0D\u80FD\u4E0E --dot-output \u6216\n                                --class-path \u4E00\u8D77\u4F7F\u7528\u3002
+main.opt.generate-open-module=\  --generate-open-module <dir>  以打开模块的方式为指定目录下的\n                                指定 JAR 文件生成 module-info.java。\n                                此选项不能与 --dot-output 或\n                                --class-path 一起使用。
 
-main.opt.check=\  --check <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...\n                                \u5206\u6790\u6307\u5B9A\u6A21\u5757\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                \u5B83\u8F93\u51FA\u6A21\u5757\u63CF\u8FF0\u7B26, \u5206\u6790\u4E4B\u540E\n                                \u751F\u6210\u7684\u6A21\u5757\u88AB\u4F9D\u8D56\u5BF9\u8C61\u4EE5\u53CA\n                                \u8F6C\u6362\u51CF\u5C11\u4E4B\u540E\u7684\u56FE\u5F62\u3002\u5B83\u8FD8\n                                \u6307\u793A\u4EFB\u4F55\u672A\u4F7F\u7528\u7684\u5408\u683C\u5BFC\u51FA\u3002
+main.opt.check=\  --check <模块名称>[,<模块名称>...\n                                分析指定模块的被依赖对象\n                                它输出模块描述符, 分析之后\n                                生成的模块被依赖对象以及\n                                转换减少之后的图形。它还\n                                指示任何未使用的合格导出。
 
-main.opt.dotoutput=\  -dotoutput <\u76EE\u5F55>\n  --dot-output <\u76EE\u5F55>            DOT \u6587\u4EF6\u8F93\u51FA\u7684\u76EE\u6807\u76EE\u5F55
+main.opt.dotoutput=\  -dotoutput <目录>\n  --dot-output <目录>            DOT 文件输出的目标目录
 
-main.opt.jdkinternals=\  -jdkinternals\n  --jdk-internals               \u5728 JDK \u5185\u90E8 API \u4E0A\u67E5\u627E\u7C7B\u7EA7\u522B\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n                                \u9664\u975E\u6307\u5B9A\u4E86 -include \u9009\u9879, \u5426\u5219\u9ED8\u8BA4\u60C5\u51B5\u4E0B,\n                                \u5B83\u5206\u6790 --class-path \u4E0A\u7684\u6240\u6709\u7C7B\u548C\u8F93\u5165\u6587\u4EF6\u3002\n                                \u6B64\u9009\u9879\u4E0D\u80FD\u4E0E -p, -e \u548C -s \u9009\u9879\n                                \u4E00\u8D77\u4F7F\u7528\u3002\n                                \u8B66\u544A: \u65E0\u6CD5\u8BBF\u95EE JDK \u5185\u90E8 API\u3002
+main.opt.jdkinternals=\  -jdkinternals\n  --jdk-internals               在 JDK 内部 API 上查找类级别的被依赖对象。\n                                除非指定了 -include 选项, 否则默认情况下,\n                                它分析 --class-path 上的所有类和输入文件。\n                                此选项不能与 -p, -e 和 -s 选项\n                                一起使用。\n                                警告: 无法访问 JDK 内部 API。
 
-main.opt.list-deps=\  --list-deps                   \u5217\u51FA\u6A21\u5757\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\u5B83\u8FD8\u4F1A\n                                \u8F93\u51FA\u5185\u90E8 API \u7A0B\u5E8F\u5305\uFF08\u5982\u679C\u5F15\u7528\uFF09\u3002\n                                \u6B64\u9009\u9879\u4F20\u9012\u5206\u6790\u7C7B\u8DEF\u5F84\u548C\u6A21\u5757\u8DEF\u5F84\n                                \u4E0A\u7684\u5E93\uFF08\u5982\u679C\u5F15\u7528\uFF09\u3002\n                                \u5C06 --no-recursive \u9009\u9879\u7528\u4E8E\n                                \u88AB\u4F9D\u8D56\u5BF9\u8C61\u7684\u975E\u4F20\u9012\u5206\u6790\u3002
+main.opt.list-deps=\  --list-deps                   列出模块的被依赖对象。它还会\n                                输出内部 API 程序包（如果引用）。\n                                此选项传递分析类路径和模块路径\n                                上的库（如果引用）。\n                                将 --no-recursive 选项用于\n                                被依赖对象的非传递分析。
 
-main.opt.list-reduced-deps=\  --list-reduced-deps           \u4E0E --list-deps \u76F8\u540C, \u4E0D\u5217\u51FA\n                                \u6A21\u5757\u56FE\u4E2D\u7684\u9690\u5F0F\u8BFB\u53D6\u7EF4\u8FB9\u3002\n                                \u5982\u679C\u6A21\u5757 M1 \u8BFB\u53D6 M2, \u5E76\u4E14 M2 \u9700\u8981\n                                M3 \u4E0A\u7684\u8FC7\u6E21, \u5219 M1 \u9690\u5F0F\u8BFB\u53D6 M3\n                                \u5E76\u4E14\u4E0D\u5728\u56FE\u4E2D\u663E\u793A\u3002
+main.opt.list-reduced-deps=\  --list-reduced-deps           与 --list-deps 相同, 不列出\n                                模块图中的隐式读取维边。\n                                如果模块 M1 读取 M2, 并且 M2 需要\n                                M3 上的过渡, 则 M1 隐式读取 M3\n                                并且不在图中显示。
 
-main.opt.print-module-deps=\  --print-module-deps           \u4E0E --list-reduced-deps \u76F8\u540C, \u8F93\u51FA\n                                \u9017\u53F7\u5206\u9694\u7684\u6A21\u5757\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5217\u8868\u3002\n                                \u6B64\u8F93\u51FA\u53EF\u7531 jlink --add-modules\n                                \u7528\u4E8E\u521B\u5EFA\u5B9A\u5236\u6620\u50CF, \u5176\u4E2D\u5305\u542B\n                                \u8FD9\u4E9B\u6A21\u5757\u53CA\u5176\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
+main.opt.print-module-deps=\  --print-module-deps           与 --list-reduced-deps 相同, 输出\n                                逗号分隔的模块被依赖对象列表。\n                                此输出可由 jlink --add-modules\n                                用于创建定制映像, 其中包含\n                                这些模块及其过渡被依赖对象。
 
-main.opt.depth=\  -depth=<\u6DF1\u5EA6>                 \u6307\u5B9A\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5206\u6790\n                                \u7684\u6DF1\u5EA6
+main.opt.depth=\  -depth=<深度>                 指定过渡被依赖对象分析\n                                的深度
 
-main.opt.q=\  -q       -quiet               \u9690\u85CF\u8B66\u544A\u6D88\u606F
+main.opt.q=\  -q       -quiet               隐藏警告消息
 
-main.opt.multi-release=\  --multi-release <\u7248\u672C>        \u6307\u5B9A\u5904\u7406\u591A\u53D1\u884C\u7248 jar \u6587\u4EF6\u65F6\u7684\n                                \u7248\u672C\u3002<\u7248\u672C> \u5E94\u4E3A\u5927\u4E8E\u7B49\u4E8E 9 \n                                \u7684\u6574\u6570\u6216\u57FA\u6570\u3002
+main.opt.multi-release=\  --multi-release <版本>        指定处理多发行版 jar 文件时的\n                                版本。<版本> 应为大于等于 9 \n                                的整数或基数。
 
-err.command.set=\u6307\u5B9A\u4E86 {0} \u548C {1} \u9009\u9879\u3002
-err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
-err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
-err.invalid.arg.for.option=\u9009\u9879\u7684\u53C2\u6570\u65E0\u6548: {0}
-err.option.after.class=\u5FC5\u987B\u5728\u7C7B\u4E4B\u524D\u6307\u5B9A\u9009\u9879: {0}
-err.genmoduleinfo.not.jarfile={0} \u662F\u65E0\u6CD5\u4F7F\u7528 --generate-module-info \u9009\u9879\u6307\u5B9A\u7684\u6A21\u5757\u5316 JAR \u6587\u4EF6
-err.genmoduleinfo.unnamed.package={0} \u5305\u542B\u6A21\u5757\u4E2D\u4E0D\u5141\u8BB8\u7684\u672A\u547D\u540D\u7A0B\u5E8F\u5305
+err.command.set=指定了 {0} 和 {1} 选项。
+err.unknown.option=未知选项: {0}
+err.missing.arg=没有为{0}指定值
+err.invalid.arg.for.option=选项的参数无效: {0}
+err.option.after.class=必须在类之前指定选项: {0}
+err.genmoduleinfo.not.jarfile={0} 是无法使用 --generate-module-info 选项指定的模块化 JAR 文件
+err.genmoduleinfo.unnamed.package={0} 包含模块中不允许的未命名程序包
 err.exception.message={0}
-err.invalid.path=\u65E0\u6548\u8DEF\u5F84: {0}
-err.invalid.options={0} \u4E0D\u80FD\u4E0E {1} \u9009\u9879\u4E00\u8D77\u4F7F\u7528
-err.module.not.found=\u627E\u4E0D\u5230\u6A21\u5757: {0}
-err.root.module.not.set=\u6839\u6A21\u5757\u96C6\u4E3A\u7A7A
-err.option.already.specified=\u591A\u6B21\u6307\u5B9A\u4E86 {0} \u9009\u9879\u3002
-err.filter.not.specified=\u5FC5\u987B\u6307\u5B9A --package (-p), --regex (-e), --require \u9009\u9879
-err.invalid.filters=\u53EA\u80FD\u6307\u5B9A --package (-p)\u3001--regex (-e)\u3001--require \u9009\u9879\u4E2D\u7684\u4E00\u4E2A
-err.multirelease.option.exists={0} \u4E0D\u662F\u591A\u53D1\u884C\u7248 jar \u6587\u4EF6, \u4F46\u8BBE\u7F6E\u4E86 --multi-release \u9009\u9879
-err.multirelease.option.notfound={0} \u662F\u591A\u53D1\u884C\u7248 jar \u6587\u4EF6, \u4F46\u672A\u8BBE\u7F6E --multi-release \u9009\u9879
-err.multirelease.version.associated=\u7C7B {0} \u5DF2\u4E0E\u7248\u672C {1} \u5173\u8054, \u6B63\u5728\u5C1D\u8BD5\u6DFB\u52A0\u7248\u672C {2}
-err.multirelease.jar.malformed=\u683C\u5F0F\u9519\u8BEF\u7684\u591A\u53D1\u884C\u7248 jar, {0}, \u9519\u8BEF\u6761\u76EE: {1}
-err.missing.dependences=\u7F3A\u5C11\u88AB\u4F9D\u8D56\u5BF9\u8C61\uFF1A\u5728\u6A21\u5757\u8DEF\u5F84\u548C\u7C7B\u8DEF\u5F84\u4E2D\u672A\u627E\u5230\u7C7B\u3002\n\u8981\u9690\u85CF\u6B64\u9519\u8BEF\uFF0C\u8BF7\u4F7F\u7528 --ignore-missing-deps \u7EE7\u7EED\u3002
-
-warn.deprecated.option={0} \u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
-warn.invalid.arg=\u8DEF\u5F84\u4E0D\u5B58\u5728: {0}
+err.invalid.path=无效路径: {0}
+err.invalid.options={0} 不能与 {1} 选项一起使用
+err.module.not.found=找不到模块: {0}
+err.root.module.not.set=根模块集为空
+err.option.already.specified=多次指定了 {0} 选项。
+err.filter.not.specified=必须指定 --package (-p), --regex (-e), --require 选项
+err.invalid.filters=只能指定 --package (-p)、--regex (-e)、--require 选项中的一个
+err.multirelease.option.exists={0} 不是多发行版 jar 文件, 但设置了 --multi-release 选项
+err.multirelease.option.notfound={0} 是多发行版 jar 文件, 但未设置 --multi-release 选项
+err.multirelease.version.associated=类 {0} 已与版本 {1} 关联, 正在尝试添加版本 {2}
+err.multirelease.jar.malformed=格式错误的多发行版 jar, {0}, 错误条目: {1}
+err.missing.dependences=缺少被依赖对象：在模块路径和类路径中未找到类。\n要隐藏此错误，请使用 --ignore-missing-deps 继续。
+
+warn.deprecated.option={0} 选项已过时，可能会在未来发行版中删除。
+warn.invalid.arg=路径不存在: {0}
 warn.skipped.entry={0}
-warn.split.package=\u62C6\u5206\u7A0B\u5E8F\u5305: {0} {1}
-warn.replace.useJDKInternals=\u4E0D\u652F\u6301 JDK \u5185\u90E8 API, \u5B83\u4EEC\u4E13\u7528\u4E8E\u901A\u8FC7\u4E0D\u517C\u5BB9\u65B9\u5F0F\u6765\n\u5220\u9664\u6216\u66F4\u6539\u7684 JDK \u5B9E\u73B0, \u53EF\u80FD\u4F1A\u635F\u574F\u60A8\u7684\u5E94\u7528\u7A0B\u5E8F\u3002\n\u8BF7\u4FEE\u6539\u60A8\u7684\u4EE3\u7801, \u6D88\u9664\u4E0E\u4EFB\u4F55 JDK \u5185\u90E8 API \u7684\u76F8\u5173\u6027\u3002\n\u6709\u5173 JDK \u5185\u90E8 API \u66FF\u6362\u7684\u6700\u65B0\u66F4\u65B0, \u8BF7\u67E5\u770B:\n{0}
-
-inverse.transitive.dependencies.on={0} \u7684\u9006\u5411\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61
-inverse.transitive.dependencies.matching=\u4E0E {0} \u5339\u914D\u7684\u9006\u5411\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61
-internal.api.column.header=JDK \u5185\u90E8 API
-public.api.replacement.column.header=\u5EFA\u8BAE\u7684\u66FF\u6362
-artifact.not.found=\u627E\u4E0D\u5230
+warn.split.package=拆分程序包: {0} {1}
+warn.replace.useJDKInternals=不支持 JDK 内部 API, 它们专用于通过不兼容方式来\n删除或更改的 JDK 实现, 可能会损坏您的应用程序。\n请修改您的代码, 消除与任何 JDK 内部 API 的相关性。\n有关 JDK 内部 API 替换的最新更新, 请查看:\n{0}
+
+inverse.transitive.dependencies.on={0} 的逆向过渡被依赖对象
+inverse.transitive.dependencies.matching=与 {0} 匹配的逆向过渡被依赖对象
+internal.api.column.header=JDK 内部 API
+public.api.replacement.column.header=建议的替换
+artifact.not.found=找不到
 jdeps.wiki.url=https://wiki.openjdk.org/display/JDK8/Java+Dependency+Analysis+Tool
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
index 183b154dd53..360d0494de2 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
@@ -28,52 +28,52 @@ false = false
 version_format = Java Debug Interface (Referenzimplementierung) Version {0}.{1} \n{2}
 raw.command = Raw-Befehl zum Starten der Anwendungs-VM nach dem Debuggen
 raw.command.label = Befehl
-raw.address = Adresse, von der aus nach einer Verbindung gehorcht wird, wenn der Raw-Befehl ausgef\u00FChrt wurde
+raw.address = Adresse, von der aus nach einer Verbindung gehorcht wird, wenn der Raw-Befehl ausgeführt wurde
 raw.address.label = Adresse
 raw.quote = Zeichen, das verwendet wird, um leerzeichengetrennten Text zu einem einzigen Befehlszeilenargument zu kombinieren
-raw.quote.label = Anf\u00FChrungszeichen
-raw.description = Startet das Ziel mit einer vom Benutzer angegebenen Befehlszeile und wird daran angeh\u00E4ngt
+raw.quote.label = Anführungszeichen
+raw.description = Startet das Ziel mit einer vom Benutzer angegebenen Befehlszeile und wird daran angehängt
 sun.home = Home-Verzeichnis des SDK oder der Laufzeitumgebung, die zum Starten der Anwendung verwendet wird
 sun.home.label = Home
 sun.options = Gestartete VM-Optionen
 sun.options.label = Optionen
 sun.main = Hauptklasse und Argumente, oder, wenn -jar eine Option ist, die Haupt-JAR-Datei und Argumente
 sun.main.label = Haupt
-sun.init_suspend = Alle Threads werden vor der Ausf\u00FChrung von "main" unterbrochen
+sun.init_suspend = Alle Threads werden vor der Ausführung von "main" unterbrochen
 sun.init_suspend.label = Unterbrechen
 sun.quote = Zeichen, das verwendet wird, um leerzeichengetrennten Text zu einem einzigen Befehlszeilenargument zu kombinieren
-sun.quote.label = Anf\u00FChrungszeichen
+sun.quote.label = Anführungszeichen
 sun.vm_exec = Name des Java-VM-Launchers
 sun.vm_exec.label = Launcher
 sun.include_virtualthreads = Die Liste aller Threads umfasst sowohl virtuelle Threads als auch Plattformthreads.
-sun.include_virtualthreads.label = Virtuelle Threads einschlie\u00DFen
-sun.description = Startet das Ziel mit einer Sun Java VM-Befehlszeile und wird daran angeh\u00E4ngt
-generic_attaching.address = Adresse zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
+sun.include_virtualthreads.label = Virtuelle Threads einschließen
+sun.description = Startet das Ziel mit einer Sun Java VM-Befehlszeile und wird daran angehängt
+generic_attaching.address = Adresse zum Anhängen für VM-Verbindungen
 generic_attaching.address.label = Adresse
-generic_attaching.timeout = Timeout beim Warten auf das Anh\u00E4ngen
+generic_attaching.timeout = Timeout beim Warten auf das Anhängen
 generic_attaching.timeout.label = Timeout
-generic_listening.address = Adresse f\u00FCr das Horchen nach VM-Verbindungen
+generic_listening.address = Adresse für das Horchen nach VM-Verbindungen
 generic_listening.address.label = Adresse
 generic_listening.timeout = Timeout beim Warten auf Verbindung
 generic_listening.timeout.label = Timeout
-socket_transportservice.description = Verbindet Debugger und zu debuggendes Programm \u00FCber eine TCP-Verbindung
-memory_transportservice.description = Verbindet Debugger und zu debuggendes Programm \u00FCber eine Shared-Memory-Verbindung
-socket_attaching.host = Rechnername zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
+socket_transportservice.description = Verbindet Debugger und zu debuggendes Programm über eine TCP-Verbindung
+memory_transportservice.description = Verbindet Debugger und zu debuggendes Programm über eine Shared-Memory-Verbindung
+socket_attaching.host = Rechnername zum Anhängen für VM-Verbindungen
 socket_attaching.host.label = Host
-socket_attaching.port = Portnummer zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
+socket_attaching.port = Portnummer zum Anhängen für VM-Verbindungen
 socket_attaching.port.label = Port
-socket_attaching.description = Wird \u00FCber das Socket an andere VMs angeh\u00E4ngt
+socket_attaching.description = Wird über das Socket an andere VMs angehängt
 socket_listening.localaddr = Lokale Adresse, an die der Listener gebunden wird
 socket_listening.localaddr.label = Lokale Adresse
-socket_listening.port = Portnummer f\u00FCr das Horchen nach VM-Verbindungen
+socket_listening.port = Portnummer für das Horchen nach VM-Verbindungen
 socket_listening.port.label = Port
 socket_listening.description = Akzeptiert Socket-Verbindungen, die von anderen VMs initiiert werden
-memory_attaching.name = Name des gemeinsamen Speicherbereichs zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
+memory_attaching.name = Name des gemeinsamen Speicherbereichs zum Anhängen für VM-Verbindungen
 memory_attaching.name.label = Name
-memory_attaching.description = Wird \u00FCber gemeinsamen Speicher an andere VMs angeh\u00E4ngt
-memory_listening.name = Name des gemeinsamen Speicherbereichs f\u00FCr das Horchen nach VM-Verbindungen
+memory_attaching.description = Wird über gemeinsamen Speicher an andere VMs angehängt
+memory_listening.name = Name des gemeinsamen Speicherbereichs für das Horchen nach VM-Verbindungen
 memory_listening.name.label = Name
 memory_listening.description = Akzeptiert gemeinsame Speicherverbindungen, die von anderen VMs initiiert werden
-process_attaching.description = Wird \u00FCber die Prozess-ID (pid) an das zu debuggende Programm angeh\u00E4ngt
+process_attaching.description = Wird über die Prozess-ID (pid) an das zu debuggende Programm angehängt
 process_attaching.pid = pid
 process_attaching.pid.label = Prozess-ID (pid) des zu debuggenden Programms
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties
index b56c10d58db..97b03bf1cef 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties
@@ -25,55 +25,55 @@
 
 true = true
 false = false
-version_format = Java Debug Interface(\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9\u5B9F\u88C5)\u30D0\u30FC\u30B8\u30E7\u30F3{0}.{1}\n{2}
-raw.command = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3VM\u3092\u8D77\u52D5\u3055\u305B\u308Braw\u30B3\u30DE\u30F3\u30C9
-raw.command.label = \u30B3\u30DE\u30F3\u30C9
-raw.address = raw\u30B3\u30DE\u30F3\u30C9\u5B9F\u884C\u5F8C\u306B\u63A5\u7D9A\u3092\u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30A2\u30C9\u30EC\u30B9
-raw.address.label = \u30A2\u30C9\u30EC\u30B9
-raw.quote = \u5358\u4E00\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570\u5185\u306B\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u7D50\u3073\u4ED8\u3051\u308B\u305F\u3081\u306B\u4F7F\u7528\u3055\u308C\u308B\u6587\u5B57
-raw.quote.label = \u5F15\u7528\u7B26
-raw.description = \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3092\u4F7F\u7528\u3057\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8D77\u52D5\u3057\u3001\u63A5\u7D9A\u3057\u307E\u3059
-sun.home = SDK\u306E\u30DB\u30FC\u30E0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u307E\u305F\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u8D77\u52D5\u306B\u4F7F\u7528\u3055\u308C\u308B\u5B9F\u884C\u74B0\u5883
-sun.home.label = \u30DB\u30FC\u30E0
-sun.options = \u8D77\u52D5\u3059\u308BVM\u306E\u30AA\u30D7\u30B7\u30E7\u30F3
-sun.options.label = \u30AA\u30D7\u30B7\u30E7\u30F3
-sun.main = \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3068\u5F15\u6570\u3001\u307E\u305F\u306F-jar\u304C\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5834\u5408\u306B\u306F\u30E1\u30A4\u30F3jar\u30D5\u30A1\u30A4\u30EB\u3068\u5F15\u6570
-sun.main.label = \u30E1\u30A4\u30F3
-sun.init_suspend = \u30E1\u30A4\u30F3\u306E\u5B9F\u884C\u524D\u306B\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u304C\u4E2D\u65AD\u3055\u308C\u307E\u3059\u3002
-sun.init_suspend.label = \u4E2D\u65AD
-sun.quote = \u5358\u4E00\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570\u5185\u306B\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u7D50\u3073\u4ED8\u3051\u308B\u305F\u3081\u306B\u4F7F\u7528\u3055\u308C\u308B\u6587\u5B57
-sun.quote.label = \u5F15\u7528\u7B26
-sun.vm_exec = Java VM\u8D77\u52D5\u30C4\u30FC\u30EB\u540D
-sun.vm_exec.label = \u8D77\u52D5\u30C4\u30FC\u30EB
-sun.include_virtualthreads = \u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306E\u30EA\u30B9\u30C8\u306B\u306F\u3001\u4EEE\u60F3\u30B9\u30EC\u30C3\u30C9\u304A\u3088\u3073\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u30FB\u30B9\u30EC\u30C3\u30C9\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-sun.include_virtualthreads.label = \u4EEE\u60F3\u30B9\u30EC\u30C3\u30C9\u3092\u542B\u3081\u308B
-sun.description = Sun\u306EJava VM\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3092\u4F7F\u7528\u3057\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8D77\u52D5\u3057\u3001\u63A5\u7D9A\u3057\u307E\u3059
-generic_attaching.address = VM\u306B\u63A5\u7D9A\u3059\u308B\u30A2\u30C9\u30EC\u30B9
-generic_attaching.address.label = \u30A2\u30C9\u30EC\u30B9
-generic_attaching.timeout = \u63A5\u7D9A\u3092\u5F85\u3064\u9593\u306E\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8
-generic_attaching.timeout.label = \u30BF\u30A4\u30E0\u30A2\u30A6\u30C8
-generic_listening.address = VM\u3078\u306E\u63A5\u7D9A\u3092\u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30A2\u30C9\u30EC\u30B9
-generic_listening.address.label = \u30A2\u30C9\u30EC\u30B9
-generic_listening.timeout = \u63A5\u7D9A\u3092\u5F85\u3064\u9593\u306E\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8
-generic_listening.timeout.label = \u30BF\u30A4\u30E0\u30A2\u30A6\u30C8
-socket_transportservice.description = TCP\u63A5\u7D9A\u3067\u30C7\u30D0\u30C3\u30AC\u3068\u30C7\u30D0\u30C3\u30B0\u5BFE\u8C61\u3092\u63A5\u7D9A\u3057\u307E\u3059
-memory_transportservice.description = \u5171\u6709\u30E1\u30E2\u30EA\u30FC\u63A5\u7D9A\u3067\u30C7\u30D0\u30C3\u30AC\u3068\u30C7\u30D0\u30C3\u30B0\u5BFE\u8C61\u3092\u63A5\u7D9A\u3057\u307E\u3059
-socket_attaching.host = VM\u306B\u63A5\u7D9A\u3059\u308B\u30DE\u30B7\u30F3\u540D
-socket_attaching.host.label = \u30DB\u30B9\u30C8
-socket_attaching.port = VM\u306B\u63A5\u7D9A\u3059\u308B\u30DD\u30FC\u30C8\u756A\u53F7
-socket_attaching.port.label = \u30DD\u30FC\u30C8
-socket_attaching.description = \u30BD\u30B1\u30C3\u30C8\u3067\u305D\u306E\u4ED6\u306EVM\u306B\u63A5\u7D9A\u3057\u307E\u3059
-socket_listening.localaddr = \u30EA\u30B9\u30CA\u30FC\u306E\u30D0\u30A4\u30F3\u30C9\u5148\u30ED\u30FC\u30AB\u30EB\u30FB\u30A2\u30C9\u30EC\u30B9
-socket_listening.localaddr.label = \u30ED\u30FC\u30AB\u30EB\u30FB\u30A2\u30C9\u30EC\u30B9
-socket_listening.port = VM\u3078\u306E\u63A5\u7D9A\u3092\u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30DD\u30FC\u30C8\u756A\u53F7
-socket_listening.port.label = \u30DD\u30FC\u30C8
-socket_listening.description = \u305D\u306E\u4ED6\u306EVM\u306B\u3088\u308A\u958B\u59CB\u3055\u308C\u308B\u30BD\u30B1\u30C3\u30C8\u63A5\u7D9A\u3092\u53D7\u5165\u308C\u307E\u3059
-memory_attaching.name = VM\u3078\u306E\u63A5\u7D9A\u306B\u4F7F\u7528\u3055\u308C\u308B\u5171\u6709\u30E1\u30E2\u30EA\u30FC\u9818\u57DF\u540D
-memory_attaching.name.label = \u540D\u524D
-memory_attaching.description = \u5171\u6709\u30E1\u30E2\u30EA\u30FC\u3067\u305D\u306E\u4ED6\u306EVM\u306B\u63A5\u7D9A\u3057\u307E\u3059
-memory_listening.name = VM\u3078\u306E\u63A5\u7D9A\u3092\u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u305F\u3081\u306E\u5171\u6709\u30E1\u30E2\u30EA\u30FC\u9818\u57DF\u540D
-memory_listening.name.label = \u540D\u524D
-memory_listening.description = \u305D\u306E\u4ED6\u306EVM\u306B\u3088\u308A\u958B\u59CB\u3055\u308C\u308B\u5171\u6709\u30E1\u30E2\u30EA\u30FC\u63A5\u7D9A\u3092\u53D7\u3051\u5165\u308C\u307E\u3059
-process_attaching.description = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9\u306B\u30D7\u30ED\u30BB\u30B9ID(pid)\u3092\u4F7F\u7528\u3057\u3066\u63A5\u7D9A\u3057\u307E\u3059
+version_format = Java Debug Interface(リファレンス実装)バージョン{0}.{1}\n{2}
+raw.command = デバッグするアプリケーションVMを起動させるrawコマンド
+raw.command.label = コマンド
+raw.address = rawコマンド実行後に接続をリスニングするアドレス
+raw.address.label = アドレス
+raw.quote = 単一のコマンドライン引数内にスペースで区切られたテキストを結び付けるために使用される文字
+raw.quote.label = 引用符
+raw.description = ユーザーが指定したコマンドラインを使用してターゲットを起動し、接続します
+sun.home = SDKのホーム・ディレクトリまたは、アプリケーションの起動に使用される実行環境
+sun.home.label = ホーム
+sun.options = 起動するVMのオプション
+sun.options.label = オプション
+sun.main = メイン・クラスと引数、または-jarがオプションの場合にはメインjarファイルと引数
+sun.main.label = メイン
+sun.init_suspend = メインの実行前にすべてのスレッドが中断されます。
+sun.init_suspend.label = 中断
+sun.quote = 単一のコマンドライン引数内にスペースで区切られたテキストを結び付けるために使用される文字
+sun.quote.label = 引用符
+sun.vm_exec = Java VM起動ツール名
+sun.vm_exec.label = 起動ツール
+sun.include_virtualthreads = すべてのスレッドのリストには、仮想スレッドおよびプラットフォーム・スレッドが含まれます。
+sun.include_virtualthreads.label = 仮想スレッドを含める
+sun.description = SunのJava VMコマンドラインを使用してターゲットを起動し、接続します
+generic_attaching.address = VMに接続するアドレス
+generic_attaching.address.label = アドレス
+generic_attaching.timeout = 接続を待つ間のタイムアウト
+generic_attaching.timeout.label = タイムアウト
+generic_listening.address = VMへの接続をリスニングするアドレス
+generic_listening.address.label = アドレス
+generic_listening.timeout = 接続を待つ間のタイムアウト
+generic_listening.timeout.label = タイムアウト
+socket_transportservice.description = TCP接続でデバッガとデバッグ対象を接続します
+memory_transportservice.description = 共有メモリー接続でデバッガとデバッグ対象を接続します
+socket_attaching.host = VMに接続するマシン名
+socket_attaching.host.label = ホスト
+socket_attaching.port = VMに接続するポート番号
+socket_attaching.port.label = ポート
+socket_attaching.description = ソケットでその他のVMに接続します
+socket_listening.localaddr = リスナーのバインド先ローカル・アドレス
+socket_listening.localaddr.label = ローカル・アドレス
+socket_listening.port = VMへの接続をリスニングするポート番号
+socket_listening.port.label = ポート
+socket_listening.description = その他のVMにより開始されるソケット接続を受入れます
+memory_attaching.name = VMへの接続に使用される共有メモリー領域名
+memory_attaching.name.label = 名前
+memory_attaching.description = 共有メモリーでその他のVMに接続します
+memory_listening.name = VMへの接続をリスニングするための共有メモリー領域名
+memory_listening.name.label = 名前
+memory_listening.description = その他のVMにより開始される共有メモリー接続を受け入れます
+process_attaching.description = デバッグするプロセスにプロセスID(pid)を使用して接続します
 process_attaching.pid = pid
-process_attaching.pid.label = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9ID(pid)
+process_attaching.pid.label = デバッグするプロセスID(pid)
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties
index 5838d2ac229..be4810ae9f9 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties
@@ -25,55 +25,55 @@
 
 true = true
 false = false
-version_format = Java \u8C03\u8BD5\u63A5\u53E3 (\u53C2\u8003\u5B9E\u73B0) \u7248\u672C {0}.{1}\n{2}
-raw.command = \u7528\u4E8E\u542F\u52A8\u8C03\u8BD5\u5E94\u7528\u7A0B\u5E8F VM \u7684\u539F\u59CB\u547D\u4EE4
-raw.command.label = \u547D\u4EE4
-raw.address = \u8FD0\u884C\u539F\u59CB\u547D\u4EE4\u4E4B\u540E, \u76D1\u542C\u8FDE\u63A5\u65F6\u4F7F\u7528\u7684\u5730\u5740
-raw.address.label = \u5730\u5740
-raw.quote = \u7528\u4E8E\u5C06\u4EE5\u7A7A\u683C\u5206\u9694\u7684\u6587\u672C\u7EC4\u5408\u4E3A\u4E00\u4E2A\u547D\u4EE4\u884C\u53C2\u6570\u7684\u5B57\u7B26
-raw.quote.label = \u5F15\u53F7
-raw.description = \u4F7F\u7528\u7528\u6237\u6307\u5B9A\u7684\u547D\u4EE4\u884C\u542F\u52A8\u76EE\u6807\u5E76\u9644\u52A0\u5230\u8BE5\u76EE\u6807
-sun.home = \u7528\u4E8E\u542F\u52A8\u5E94\u7528\u7A0B\u5E8F\u7684 SDK \u6216\u8FD0\u884C\u65F6\u73AF\u5883\u7684\u4E3B\u76EE\u5F55
-sun.home.label = \u4E3B\u76EE\u5F55
-sun.options = \u5DF2\u542F\u52A8\u7684 VM \u9009\u9879
-sun.options.label = \u9009\u9879
-sun.main = \u4E3B\u7C7B\u548C\u53C2\u6570, \u6216\u8005\u5982\u679C -jar \u662F\u4E00\u4E2A\u9009\u9879, \u5219\u4E3A\u4E3B jar \u6587\u4EF6\u548C\u53C2\u6570
-sun.main.label = \u4E3B
-sun.init_suspend = \u5728\u6267\u884C\u4E3B\u7C7B\u4E4B\u524D, \u5C06\u6302\u8D77\u6240\u6709\u7EBF\u7A0B
-sun.init_suspend.label = \u6302\u8D77
-sun.quote = \u7528\u4E8E\u5C06\u4EE5\u7A7A\u683C\u5206\u9694\u7684\u6587\u672C\u7EC4\u5408\u4E3A\u4E00\u4E2A\u547D\u4EE4\u884C\u53C2\u6570\u7684\u5B57\u7B26
-sun.quote.label = \u5F15\u53F7
-sun.vm_exec = Java VM \u542F\u52A8\u7A0B\u5E8F\u7684\u540D\u79F0
-sun.vm_exec.label = \u542F\u52A8\u7A0B\u5E8F
-sun.include_virtualthreads = \u6240\u6709\u7EBF\u7A0B\u5217\u8868\u5305\u542B\u865A\u62DF\u7EBF\u7A0B\u548C\u5E73\u53F0\u7EBF\u7A0B\u3002
-sun.include_virtualthreads.label = \u5305\u62EC\u865A\u62DF\u7EBF\u7A0B
-sun.description = \u4F7F\u7528 Sun Java VM \u547D\u4EE4\u884C\u542F\u52A8\u76EE\u6807\u5E76\u9644\u52A0\u5230\u8BE5\u76EE\u6807
-generic_attaching.address = VM \u8FDE\u63A5\u6240\u9644\u52A0\u5230\u7684\u5730\u5740
-generic_attaching.address.label = \u5730\u5740
-generic_attaching.timeout = \u7B49\u5F85\u9644\u52A0\u64CD\u4F5C\u65F6\u7684\u8D85\u65F6
-generic_attaching.timeout.label = \u8D85\u65F6
-generic_listening.address = \u76D1\u542C VM \u8FDE\u63A5\u65F6\u4F7F\u7528\u7684\u5730\u5740
-generic_listening.address.label = \u5730\u5740
-generic_listening.timeout = \u7B49\u5F85\u8FDE\u63A5\u65F6\u7684\u8D85\u65F6
-generic_listening.timeout.label = \u8D85\u65F6
-socket_transportservice.description = \u4F7F\u7528 TCP \u8FDE\u63A5\u6765\u8FDE\u63A5\u8C03\u8BD5\u5668\u548C\u88AB\u8C03\u8BD5\u8FDB\u7A0B
-memory_transportservice.description = \u4F7F\u7528\u5171\u4EAB\u5185\u5B58\u8FDE\u63A5\u6765\u8FDE\u63A5\u8C03\u8BD5\u5668\u548C\u88AB\u8C03\u8BD5\u8FDB\u7A0B
-socket_attaching.host = VM \u8FDE\u63A5\u6240\u9644\u52A0\u5230\u7684\u8BA1\u7B97\u673A\u540D\u79F0
-socket_attaching.host.label = \u4E3B\u673A
-socket_attaching.port = VM \u8FDE\u63A5\u6240\u9644\u52A0\u5230\u7684\u7AEF\u53E3\u53F7
-socket_attaching.port.label = \u7AEF\u53E3
-socket_attaching.description = \u901A\u8FC7\u5957\u63A5\u5B57\u9644\u52A0\u5230\u5176\u4ED6 VM
-socket_listening.localaddr = \u76D1\u542C\u7A0B\u5E8F\u7ED1\u5B9A\u5230\u7684\u672C\u5730\u5730\u5740
-socket_listening.localaddr.label = \u672C\u5730\u5730\u5740
-socket_listening.port = \u76D1\u542C VM \u8FDE\u63A5\u65F6\u4F7F\u7528\u7684\u7AEF\u53E3\u53F7
-socket_listening.port.label = \u7AEF\u53E3
-socket_listening.description = \u63A5\u53D7\u7531\u5176\u4ED6 VM \u542F\u52A8\u7684\u5957\u63A5\u5B57\u8FDE\u63A5
-memory_attaching.name = VM \u8FDE\u63A5\u6240\u9644\u52A0\u5230\u7684\u5171\u4EAB\u5185\u5B58\u533A\u57DF\u7684\u540D\u79F0
-memory_attaching.name.label = \u540D\u79F0
-memory_attaching.description = \u901A\u8FC7\u5171\u4EAB\u5185\u5B58\u9644\u52A0\u5230\u5176\u4ED6 VM
-memory_listening.name = \u76D1\u542C VM \u8FDE\u63A5\u65F6\u6240\u5728\u7684\u5171\u4EAB\u5185\u5B58\u533A\u57DF\u7684\u540D\u79F0
-memory_listening.name.label = \u540D\u79F0
-memory_listening.description = \u63A5\u53D7\u7531\u5176\u4ED6 VM \u542F\u52A8\u7684\u5171\u4EAB\u5185\u5B58\u8FDE\u63A5
-process_attaching.description = \u901A\u8FC7\u8FDB\u7A0B ID (PID) \u9644\u52A0\u5230\u88AB\u8C03\u8BD5\u8FDB\u7A0B
+version_format = Java 调试接口 (参考实现) 版本 {0}.{1}\n{2}
+raw.command = 用于启动调试应用程序 VM 的原始命令
+raw.command.label = 命令
+raw.address = 运行原始命令之后, 监听连接时使用的地址
+raw.address.label = 地址
+raw.quote = 用于将以空格分隔的文本组合为一个命令行参数的字符
+raw.quote.label = 引号
+raw.description = 使用用户指定的命令行启动目标并附加到该目标
+sun.home = 用于启动应用程序的 SDK 或运行时环境的主目录
+sun.home.label = 主目录
+sun.options = 已启动的 VM 选项
+sun.options.label = 选项
+sun.main = 主类和参数, 或者如果 -jar 是一个选项, 则为主 jar 文件和参数
+sun.main.label = 主
+sun.init_suspend = 在执行主类之前, 将挂起所有线程
+sun.init_suspend.label = 挂起
+sun.quote = 用于将以空格分隔的文本组合为一个命令行参数的字符
+sun.quote.label = 引号
+sun.vm_exec = Java VM 启动程序的名称
+sun.vm_exec.label = 启动程序
+sun.include_virtualthreads = 所有线程列表包含虚拟线程和平台线程。
+sun.include_virtualthreads.label = 包括虚拟线程
+sun.description = 使用 Sun Java VM 命令行启动目标并附加到该目标
+generic_attaching.address = VM 连接所附加到的地址
+generic_attaching.address.label = 地址
+generic_attaching.timeout = 等待附加操作时的超时
+generic_attaching.timeout.label = 超时
+generic_listening.address = 监听 VM 连接时使用的地址
+generic_listening.address.label = 地址
+generic_listening.timeout = 等待连接时的超时
+generic_listening.timeout.label = 超时
+socket_transportservice.description = 使用 TCP 连接来连接调试器和被调试进程
+memory_transportservice.description = 使用共享内存连接来连接调试器和被调试进程
+socket_attaching.host = VM 连接所附加到的计算机名称
+socket_attaching.host.label = 主机
+socket_attaching.port = VM 连接所附加到的端口号
+socket_attaching.port.label = 端口
+socket_attaching.description = 通过套接字附加到其他 VM
+socket_listening.localaddr = 监听程序绑定到的本地地址
+socket_listening.localaddr.label = 本地地址
+socket_listening.port = 监听 VM 连接时使用的端口号
+socket_listening.port.label = 端口
+socket_listening.description = 接受由其他 VM 启动的套接字连接
+memory_attaching.name = VM 连接所附加到的共享内存区域的名称
+memory_attaching.name.label = 名称
+memory_attaching.description = 通过共享内存附加到其他 VM
+memory_listening.name = 监听 VM 连接时所在的共享内存区域的名称
+memory_listening.name.label = 名称
+memory_listening.description = 接受由其他 VM 启动的共享内存连接
+process_attaching.description = 通过进程 ID (PID) 附加到被调试进程
 process_attaching.pid = PID
-process_attaching.pid.label = \u88AB\u8C03\u8BD5\u8FDB\u7A0B\u7684\u8FDB\u7A0B ID (PID)
+process_attaching.pid.label = 被调试进程的进程 ID (PID)
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
index 10b01156bed..a48a494895e 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
@@ -23,29 +23,29 @@
 # questions.
 #
 
-jlink.description=Set aus Modulen und zugeh\u00F6rige Abh\u00E4ngigkeiten in einem benutzerdefinierten Laufzeitimage assemblieren und optimieren
+jlink.description=Set aus Modulen und zugehörige Abhängigkeiten in einem benutzerdefinierten Laufzeitimage assemblieren und optimieren
 
-main.usage.summary=Verwendung: {0} <Optionen> --module-path <Modulpfad> --add-modules <Modul>[,<Modul>...]\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+main.usage.summary=Verwendung: {0} <Optionen> --module-path <Modulpfad> --add-modules <Modul>[,<Modul>...]\nMit --help können Sie eine Liste der möglichen Optionen aufrufen
 
-main.usage=Verwendung: {0} <Optionen> --module-path <Modulpfad> --add-modules <Modul>[,<Modul>...]\nM\u00F6gliche Optionen:
+main.usage=Verwendung: {0} <Optionen> --module-path <Modulpfad> --add-modules <Modul>[,<Modul>...]\nMögliche Optionen:
 
 main.opt.help=\  -h, --help, -?                        Gibt diese Hilfemeldung aus
 
 main.opt.version=\      --version                         Versionsinformationen
 
-main.opt.module-path=\  -p, --module-path <Pfad>              Modulpfad.\n                                        Wird er nicht angegeben, wird das jmods-Verzeichnis des JDK\n                                        verwendet, falls vorhanden. Wird er angegeben,\n                                        aber enth\u00E4lt er nicht das Modul java.base,\n                                        wird das jmods-Verzeichnis des JDK hinzugef\u00FCgt,\n                                        falls vorhanden.
+main.opt.module-path=\  -p, --module-path <Pfad>              Modulpfad.\n                                        Wird er nicht angegeben, wird das jmods-Verzeichnis des JDK\n                                        verwendet, falls vorhanden. Wird er angegeben,\n                                        aber enthält er nicht das Modul java.base,\n                                        wird das jmods-Verzeichnis des JDK hinzugefügt,\n                                        falls vorhanden.
 
-main.opt.add-modules=\      --add-modules <Mod>[,<Mod>...]    Root-Module, die zus\u00E4tzlich zu den anf\u00E4nglichen\n                                        Modulen aufgel\u00F6st werden. <Mod> kann auch ALL-MODULE-PATH sein.
+main.opt.add-modules=\      --add-modules <Mod>[,<Mod>...]    Root-Module, die zusätzlich zu den anfänglichen\n                                        Modulen aufgelöst werden. <Mod> kann auch ALL-MODULE-PATH sein.
 
 main.opt.limit-modules=\      --limit-modules <Mod>[,<Mod>...]  Begrenzt den Bereich der beobachtbaren\n                                        Module
 
 main.opt.output=\      --output <Pfad>                   Ort des Ausgabepfads
 
-main.opt.launcher=\      --launcher <Name>=<Modul>[/<Hauptklasse>]\n                                        F\u00FCgt einen Launcher-Befehl mit dem angegebenen\n                                        Namen f\u00FCr das Modul und die Hauptklasse hinzu,\n                                        falls angegeben  
+main.opt.launcher=\      --launcher <Name>=<Modul>[/<Hauptklasse>]\n                                        Fügt einen Launcher-Befehl mit dem angegebenen\n                                        Namen für das Modul und die Hauptklasse hinzu,\n                                        falls angegeben  
 
-main.opt.bind-services=\      --bind-services                   Bindet Serviceprovidermodule und ihre\n                                        Abh\u00E4ngigkeiten ein
+main.opt.bind-services=\      --bind-services                   Bindet Serviceprovidermodule und ihre\n                                        Abhängigkeiten ein
 
-main.opt.suggest-providers=\      --suggest-providers [<Name>,...]  Schl\u00E4gt Provider vor, welche die angegebenen\n                                        Servicetypen aus dem Modulpfad implementieren
+main.opt.suggest-providers=\      --suggest-providers [<Name>,...]  Schlägt Provider vor, welche die angegebenen\n                                        Servicetypen aus dem Modulpfad implementieren
 
 main.command.files=\      @<Dateiname>                       Liest Optionen aus der Datei
 
@@ -53,13 +53,13 @@ main.opt.endian=\      --endian <little|big>             Bytereihenfolge des gen
 
 main.opt.save-opts=\      --save-opts <Dateiname>            Speichert jlink-Optionen in der angegebenen Datei
 
-main.opt.ignore-signing-information=\      --ignore-signing-information      Unterdr\u00FCckt einen schwerwiegenden Fehler, wenn signierte\n                                        modulare JAR-Dateien in das Image eingebunden werden.\n                                        Die signaturbezogenen Dateien der signierten\n                                        modularen JAR-Dateien werden nicht in das\n                                        Laufzeitimage kopiert.
+main.opt.ignore-signing-information=\      --ignore-signing-information      Unterdrückt einen schwerwiegenden Fehler, wenn signierte\n                                        modulare JAR-Dateien in das Image eingebunden werden.\n                                        Die signaturbezogenen Dateien der signierten\n                                        modularen JAR-Dateien werden nicht in das\n                                        Laufzeitimage kopiert.
 
 main.opt.verbose=\  -v, --verbose                         Aktiviert Verbose-Tracing
 
-main.msg.bug=Eine Ausnahme ist in jlink aufgetreten. Melden Sie in der Java-Bugdatenbank (https://bugreport.java.com/bugreport/) einen Bug, nachdem Sie die Bugdatenbank auf Duplikate gepr\u00FCft haben. Geben Sie in Ihrem Bericht Ihr Programm und die folgende Diagnose an. Vielen Dank.
+main.msg.bug=Eine Ausnahme ist in jlink aufgetreten. Melden Sie in der Java-Bugdatenbank (https://bugreport.java.com/bugreport/) einen Bug, nachdem Sie die Bugdatenbank auf Duplikate geprüft haben. Geben Sie in Ihrem Bericht Ihr Programm und die folgende Diagnose an. Vielen Dank.
 
-main.extended.help=Liste der verf\u00FCgbaren Plug-ins:
+main.extended.help=Liste der verfügbaren Plug-ins:
 
 main.extended.help.footer=Bei Optionen, die eine <Musterliste> erfordern, ist der Wert eine kommagetrennte\nListe von Elementen, die jeweils eines der folgenden Formate verwenden:\n  <Globales Muster>\n  glob:<Globales Muster>\n  regex:<Regex-Muster>\n  @<Dateiname>, wobei der Dateiname der Name einer Datei mit zu verwendenden Mustern ist,\n              ein Muster pro Zeile\n\n
 
@@ -67,42 +67,42 @@ error.prefix=Fehler:
 warn.prefix=Warnung:
 
 err.empty.module.path=leerer Modulpfad
-err.jlink.version.mismatch=jlink-Version {0}.{1} stimmt nicht mit Ziel-java.base-Version {2}.{3} \u00FCberein
+err.jlink.version.mismatch=jlink-Version {0}.{1} stimmt nicht mit Ziel-java.base-Version {2}.{3} überein
 err.automatic.module:automatisches Modul kann nicht mit jlink verwendet werden: {0} aus {1}
 err.unknown.byte.order:unbekannte Bytereihenfolge {0}
 err.launcher.main.class.empty:Launcher-Hauptklassenname darf nicht leer sein: {0}
 err.launcher.module.name.empty:Launcher-Modulname darf nicht leer sein: {0}
 err.launcher.value.format:Launcher-Wert muss folgendes Format haben: <Befehl>=<Modul>[/<Hauptklasse>]: {0}
 err.output.must.be.specified:--output muss angegeben werden
-err.modulepath.must.be.specified:--module-path ist nicht angegeben, und dieses Laufzeitimage enth\u00E4lt nicht das jmods-Verzeichnis.
+err.modulepath.must.be.specified:--module-path ist nicht angegeben, und dieses Laufzeitimage enthält nicht das jmods-Verzeichnis.
 err.mods.must.be.specified:keine Module zum {0} angegeben
 err.path.not.found=Pfad nicht gefunden: {0}
-err.path.not.valid=ung\u00FCltiger Pfad: {0}
+err.path.not.valid=ungültiger Pfad: {0}
 err.file.not.found=Datei nicht gefunden: {0}
-err.file.error=Zugriff nicht m\u00F6glich auf Datei: {0}
+err.file.error=Zugriff nicht möglich auf Datei: {0}
 err.dir.exists={0} ist bereits vorhanden
-err.badpattern=ung\u00FCltiges Muster {0}
+err.badpattern=ungültiges Muster {0}
 err.unknown.option=unbekannte Option: {0}
-err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.missing.arg=kein Wert angegeben für {0}
 err.internal.error=interner Fehler: {0} {1} {2}
 err.invalid.arg.for.option={0} akzeptiert nicht das Argument "{1}"
 err.option.after.class=Option muss angegeben werden vor den Klassen: {0}
-err.option.unsupported={0} nicht unterst\u00FCtzt: {1}
-err.orphan.arguments=ung\u00FCltiges Argument: {0}
+err.option.unsupported={0} nicht unterstützt: {1}
+err.orphan.arguments=ungültiges Argument: {0}
 err.config.defaults=Eigenschaft {0} fehlt in der Konfiguration
 err.config.defaults.value=falscher Wert in Standardeigenschaft: {0}
 err.bom.generation=Generierung der BOM-Datei nicht erfolgreich: {0}
 err.not.a.module.directory=Unter Verzeichnis {0} ist keine Datei module-info.class vorhanden
 err.cannot.read.module.info=Moduldeskriptor kann nicht gelesen werden aus {0}
-err.not.modular.format=ausgew\u00E4hltes Modul {0} ({1}) hat nicht das jmod- oder modulare JAR-Format
-err.signing=signierte modulare JAR-Datei {0} wird gegenw\u00E4rtig nicht unterst\u00FCtzt, verwenden Sie --ignore-signing-information, um den Fehler zu unterdr\u00FCcken
+err.not.modular.format=ausgewähltes Modul {0} ({1}) hat nicht das jmod- oder modulare JAR-Format
+err.signing=signierte modulare JAR-Datei {0} wird gegenwärtig nicht unterstützt, verwenden Sie --ignore-signing-information, um den Fehler zu unterdrücken
 err.cannot.determine.target.platform=Zielplattform kann nicht aus {0} bestimmt werden
 err.unknown.target.platform=Unbekannte Zielplattform {0}
 err.target.endianness.mismatch=Die angegebene Option --endian {0} entspricht nicht dem Endian-Typ der Zielplattform {1}
-warn.signing=WARNUNG: Signierte modulare JAR-Datei {0} wird gegenw\u00E4rtig nicht unterst\u00FCtzt
-warn.invalid.arg=ung\u00FCltiger Klassenname, oder Pfadname ist nicht vorhanden: {0}
+warn.signing=WARNUNG: Signierte modulare JAR-Datei {0} wird gegenwärtig nicht unterstützt
+warn.invalid.arg=ungültiger Klassenname, oder Pfadname ist nicht vorhanden: {0}
 warn.split.package=Package {0}, definiert in {1} {2}
-warn.provider.notfound=Kein Provider f\u00FCr Service angegeben f\u00FCr --suggest-providers: {0}
+warn.provider.notfound=Kein Provider für Service angegeben für --suggest-providers: {0}
 no.suggested.providers=Option --bind-services ist angegeben. Keine weiteren Provider vorgeschlagen.
 suggested.providers.header=Vorgeschlagene Provider
 providers.header=Provider
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties
index 0ba066f6e98..df378866f91 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties
@@ -23,86 +23,86 @@
 # questions.
 #
 
-jlink.description=\u4E00\u9023\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3068\u305D\u306E\u4F9D\u5B58\u6027\u3092\u30AB\u30B9\u30BF\u30E0\u30FB\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3068\u3057\u3066\u30A2\u30BB\u30F3\u30D6\u30EB\u3057\u3066\u6700\u9069\u5316\u3057\u307E\u3059
+jlink.description=一連のモジュールとその依存性をカスタム・ランタイム・イメージとしてアセンブルして最適化します
 
-main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0} <options> --module-path <modulepath> --add-modules <module>[,<module>...]\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001--help\u3092\u4F7F\u7528\u3057\u307E\u3059
+main.usage.summary=使用方法: {0} <options> --module-path <modulepath> --add-modules <module>[,<module>...]\n使用可能なオプションのリストについては、--helpを使用します
 
-main.usage=\u4F7F\u7528\u65B9\u6CD5: {0} <options> --module-path <modulepath> --add-modules <module>[,<module>...]\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:
+main.usage=使用方法: {0} <options> --module-path <modulepath> --add-modules <module>[,<module>...]\n使用可能なオプションには次のものがあります:
 
-main.opt.help=\  -h\u3001--help\u3001-?                        \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059
+main.opt.help=\  -h、--help、-?                        このヘルプ・メッセージを出力します
 
-main.opt.version=\      --version                         \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
+main.opt.version=\      --version                         バージョン情報
 
-main.opt.module-path=\  -p, --module-path <path>              \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u3002\n                                        \u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001JDK\u306Ejmods\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                                        \u304C\u4F7F\u7528\u3055\u308C\u307E\u3059(\u5B58\u5728\u3059\u308B\u5834\u5408)\u3002\u6307\u5B9A\u3055\u308C\u3066\n                                        \u3044\u308B\u304Cjava.base\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u542B\u307E\u306A\u3044\u5834\u5408\u306F\u3001\n                                        JDK\u306Ejmods\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u8FFD\u52A0\u3055\u308C\u307E\u3059\n                                        (\u5B58\u5728\u3059\u308B\u5834\u5408)\u3002
+main.opt.module-path=\  -p, --module-path <path>              モジュール・パス。\n                                        指定されていない場合、JDKのjmodsディレクトリ\n                                        が使用されます(存在する場合)。指定されて\n                                        いるがjava.baseモジュールを含まない場合は、\n                                        JDKのjmodsディレクトリが追加されます\n                                        (存在する場合)。
 
-main.opt.add-modules=\      --add-modules <mod>[,<mod>...]    \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                                        <mod>\u306FALL-MODULE-PATH\u306B\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002
+main.opt.add-modules=\      --add-modules <mod>[,<mod>...]    初期モジュールに加えて解決するルート・モジュール。\n                                        <mod>はALL-MODULE-PATHにすることもできます。
 
-main.opt.limit-modules=\      --limit-modules <mod>[,<mod>...]  \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059
+main.opt.limit-modules=\      --limit-modules <mod>[,<mod>...]  参照可能なモジュールの領域を制限します
 
-main.opt.output=\      --output <path>                   \u51FA\u529B\u30D1\u30B9\u306E\u5834\u6240
+main.opt.output=\      --output <path>                   出力パスの場所
 
-main.opt.launcher=\      --launcher <name>=<module>[/<mainclass>]\n                                        \u30E2\u30B8\u30E5\u30FC\u30EB\u304A\u3088\u3073\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9(\u6307\u5B9A\u3057\u305F\u5834\u5408)\u306B\n                                        \u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u306E\u8D77\u52D5\u30C4\u30FC\u30EB\u30FB\u30B3\u30DE\u30F3\u30C9\u3092\n                                        \u8FFD\u52A0\u3057\u307E\u3059  
+main.opt.launcher=\      --launcher <name>=<module>[/<mainclass>]\n                                        モジュールおよびメイン・クラス(指定した場合)に\n                                        指定された名前の起動ツール・コマンドを\n                                        追加します  
 
-main.opt.bind-services=\      --bind-services                   \u30B5\u30FC\u30D3\u30B9\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3068\u305D\u306E\u4F9D\u5B58\u6027\n                                        \u5185\u3067\u30EA\u30F3\u30AF\u3057\u307E\u3059
+main.opt.bind-services=\      --bind-services                   サービス・プロバイダ・モジュールとその依存性\n                                        内でリンクします
 
-main.opt.suggest-providers=\      --suggest-providers [<name>,...]  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u304B\u3089\u6307\u5B9A\u306E\u30B5\u30FC\u30D3\u30B9\u30FB\u30BF\u30A4\u30D7\u3092\n                                        \u5B9F\u88C5\u3059\u308B\u30D7\u30ED\u30D0\u30A4\u30C0\u3092\u63A8\u5968\u3057\u307E\u3059
+main.opt.suggest-providers=\      --suggest-providers [<name>,...]  モジュール・パスから指定のサービス・タイプを\n                                        実装するプロバイダを推奨します
 
-main.command.files=\      @<filename>                       \u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059
+main.command.files=\      @<filename>                       ファイルからオプションを読み取ります
 
-main.opt.endian=\      --endian <little|big>             \u751F\u6210\u3055\u308C\u305Fjimage\n                                        (default:native)\u306E\u30D0\u30A4\u30C8\u9806
+main.opt.endian=\      --endian <little|big>             生成されたjimage\n                                        (default:native)のバイト順
 
-main.opt.save-opts=\      --save-opts <filename>            \u6307\u5B9A\u306E\u30D5\u30A1\u30A4\u30EB\u306Bjlink\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4FDD\u5B58\u3057\u307E\u3059
+main.opt.save-opts=\      --save-opts <filename>            指定のファイルにjlinkオプションを保存します
 
-main.opt.ignore-signing-information=\      --ignore-signing-information      \u7F72\u540D\u6E08\u30E2\u30B8\u30E5\u30E9JAR\u304C\u30A4\u30E1\u30FC\u30B8\u306B\u30EA\u30F3\u30AF\n                                        \u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u81F4\u547D\u7684\u30A8\u30E9\u30FC\u3092\u6291\u6B62\n                                        \u3057\u307E\u3059\u3002\u7F72\u540D\u6E08\u30E2\u30B8\u30E5\u30E9JAR\u306E\u7F72\u540D\u95A2\u9023\n                                        \u30D5\u30A1\u30A4\u30EB\u306F\u3001\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u306B\u30B3\u30D4\u30FC\n                                        \u3055\u308C\u307E\u305B\u3093\u3002
+main.opt.ignore-signing-information=\      --ignore-signing-information      署名済モジュラJARがイメージにリンク\n                                        されている場合、致命的エラーを抑止\n                                        します。署名済モジュラJARの署名関連\n                                        ファイルは、ランタイム・イメージにコピー\n                                        されません。
 
-main.opt.verbose=\  -v\u3001--verbose                         \u8A73\u7D30\u306A\u30C8\u30EC\u30FC\u30B9\u3092\u6709\u52B9\u306B\u3057\u307E\u3059
+main.opt.verbose=\  -v、--verbose                         詳細なトレースを有効にします
 
-main.msg.bug=jlink\u3067\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3067\u91CD\u8907\u304C\u306A\u3044\u304B\u3092\u3054\u78BA\u8A8D\u306E\u3046\u3048\u3001Java\u306E\u30D0\u30B0\u30FB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9(https://bugreport.java.com/bugreport/)\u3067\u30D0\u30B0\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u8A72\u5F53\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3068\u6B21\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u3054\u5165\u529B\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
+main.msg.bug=jlinkで例外が発生しました。データベースで重複がないかをご確認のうえ、Javaのバグ・データベース(https://bugreport.java.com/bugreport/)でバグの登録をお願いいたします。レポートには、該当のプログラムと次の診断内容をご入力ください。ご協力ありがとうございます。
 
-main.extended.help=\u4F7F\u7528\u53EF\u80FD\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u306E\u30EA\u30B9\u30C8:
+main.extended.help=使用可能なプラグインのリスト:
 
-main.extended.help.footer=<pattern-list>\u3092\u5FC5\u8981\u3068\u3059\u308B\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5834\u5408\u3001\u5024\u306F\u3001\u6B21\u306E\u5F62\u5F0F\u306E\u3044\u305A\u308C\u304B\u3092\u4F7F\u7528\u3059\u308B\u3001\u8981\u7D20\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u30EA\u30B9\u30C8\u306B\u306A\u308A\u307E\u3059:\n  <glob-pattern>\n  glob:<glob-pattern>\n  regex:<regex-pattern>\n  @<filename> filename\u306F\u3001\u4F7F\u7528\u3059\u308B\u30D1\u30BF\u30FC\u30F3\u3092\u542B\u3080\u30D5\u30A1\u30A4\u30EB(1\u884C\u3054\u3068\u306B1\u30D1\u30BF\u30FC\u30F3)\u306E\u540D\u524D\u3067\u3059\n\n
+main.extended.help.footer=<pattern-list>を必要とするオプションの場合、値は、次の形式のいずれかを使用する、要素のカンマ区切りリストになります:\n  <glob-pattern>\n  glob:<glob-pattern>\n  regex:<regex-pattern>\n  @<filename> filenameは、使用するパターンを含むファイル(1行ごとに1パターン)の名前です\n\n
 
-error.prefix=\u30A8\u30E9\u30FC:
-warn.prefix=\u8B66\u544A:
+error.prefix=エラー:
+warn.prefix=警告:
 
-err.empty.module.path=\u7A7A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9
-err.jlink.version.mismatch=jlink\u30D0\u30FC\u30B8\u30E7\u30F3{0}.{1}\u304C\u30BF\u30FC\u30B2\u30C3\u30C8\u306Ejava.base\u30D0\u30FC\u30B8\u30E7\u30F3{2}.{3}\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093
-err.automatic.module:jlink\u3067\u306F\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093: {1}\u304B\u3089\u306E{0}
-err.unknown.byte.order:\u4E0D\u660E\u306A\u30D0\u30A4\u30C8\u9806{0}
-err.launcher.main.class.empty:\u8D77\u52D5\u30C4\u30FC\u30EB\u306E\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u540D\u306F\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093: {0}
-err.launcher.module.name.empty:\u8D77\u52D5\u30C4\u30FC\u30EB\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u306F\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093: {0}
-err.launcher.value.format:\u8D77\u52D5\u30C4\u30FC\u30EB\u306E\u5024\u306F<command>=<module>[/<main-class>]\u306E\u5F62\u5F0F\u306B\u3057\u3066\u304F\u3060\u3055\u3044: {0}
-err.output.must.be.specified:--output\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-err.modulepath.must.be.specified:--module-path\u304C\u6307\u5B9A\u3055\u308C\u3066\u304A\u3089\u305A\u3001\u3053\u306E\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u306Bjmods\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-err.mods.must.be.specified:{0}\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-err.path.not.found=\u30D1\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-err.path.not.valid=\u7121\u52B9\u306A\u30D1\u30B9: {0}
-err.file.not.found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-err.file.error=\u30D5\u30A1\u30A4\u30EB\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {0}
-err.dir.exists={0}\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059
-err.badpattern=\u4E0D\u6B63\u30D1\u30BF\u30FC\u30F3{0}
-err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
-err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-err.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC: {0} {1} {2}
-err.invalid.arg.for.option={0}\u306F"{1}"\u5F15\u6570\u3092\u53D7\u3051\u5165\u308C\u307E\u305B\u3093
-err.option.after.class=\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30AF\u30E9\u30B9\u306E\u524D\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
-err.option.unsupported={0}\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {1}
-err.orphan.arguments={0}\u306F\u7121\u52B9\u306A\u5F15\u6570\u3067\u3059
-err.config.defaults=\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u304C\u69CB\u6210\u306B\u3042\u308A\u307E\u305B\u3093
-err.config.defaults.value=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u304C\u9593\u9055\u3063\u3066\u3044\u307E\u3059: {0}
-err.bom.generation=bom\u30D5\u30A1\u30A4\u30EB\u306E\u751F\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
-err.not.a.module.directory=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306B\u306F\u3001module-info.class\u30D5\u30A1\u30A4\u30EB\u304C\u542B\u307E\u308C\u307E\u305B\u3093
-err.cannot.read.module.info={0}\u304B\u3089\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u3092\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093
-err.not.modular.format=\u9078\u629E\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB{0} ({1})\u304Cjmod\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30E9JAR\u5F62\u5F0F\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-err.signing=\u7F72\u540D\u6E08\u30E2\u30B8\u30E5\u30E9JAR {0}\u306F\u73FE\u5728\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u30A8\u30E9\u30FC\u3092\u6291\u6B62\u3059\u308B\u306B\u306F--ignore-signing-information\u3092\u4F7F\u7528\u3057\u307E\u3059
-err.cannot.determine.target.platform={0}\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3092\u7279\u5B9A\u3067\u304D\u307E\u305B\u3093
-err.unknown.target.platform=\u4E0D\u660E\u306A\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0{0}
-err.target.endianness.mismatch=\u6307\u5B9A\u3055\u308C\u305F--endian {0}\u306F\u3001\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0{1}\u306Eendianness\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093
-warn.signing=\u8B66\u544A: \u7F72\u540D\u6E08\u30E2\u30B8\u30E5\u30E9JAR {0}\u306F\u73FE\u5728\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-warn.invalid.arg=\u7121\u52B9\u306A\u30AF\u30E9\u30B9\u540D\u307E\u305F\u306F\u30D1\u30B9\u540D\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
-warn.split.package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F{1} {2}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
-warn.provider.notfound=--suggest-providers\u306B\u6307\u5B9A\u3055\u308C\u305F\u30B5\u30FC\u30D3\u30B9\u306B\u30D7\u30ED\u30D0\u30A4\u30C0\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-no.suggested.providers=--bind-services\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u8FFD\u52A0\u306E\u30D7\u30ED\u30D0\u30A4\u30C0\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093\u3002
-suggested.providers.header=\u63A8\u5968\u30D7\u30ED\u30D0\u30A4\u30C0
-providers.header=\u30D7\u30ED\u30D0\u30A4\u30C0
+err.empty.module.path=空のモジュール・パス
+err.jlink.version.mismatch=jlinkバージョン{0}.{1}がターゲットのjava.baseバージョン{2}.{3}と一致しません
+err.automatic.module:jlinkでは自動モジュールは使用できません: {1}からの{0}
+err.unknown.byte.order:不明なバイト順{0}
+err.launcher.main.class.empty:起動ツールのメイン・クラス名は空にできません: {0}
+err.launcher.module.name.empty:起動ツールのモジュール名は空にできません: {0}
+err.launcher.value.format:起動ツールの値は<command>=<module>[/<main-class>]の形式にしてください: {0}
+err.output.must.be.specified:--outputを指定する必要があります
+err.modulepath.must.be.specified:--module-pathが指定されておらず、このランタイム・イメージにjmodsディレクトリが含まれていません。
+err.mods.must.be.specified:{0}にモジュールが指定されていません
+err.path.not.found=パスが見つかりません: {0}
+err.path.not.valid=無効なパス: {0}
+err.file.not.found=ファイルが見つかりません: {0}
+err.file.error=ファイルにアクセスできません: {0}
+err.dir.exists={0}はすでに存在します
+err.badpattern=不正パターン{0}
+err.unknown.option=不明なオプション: {0}
+err.missing.arg={0}に値が指定されていません
+err.internal.error=内部エラー: {0} {1} {2}
+err.invalid.arg.for.option={0}は"{1}"引数を受け入れません
+err.option.after.class=オプションはクラスの前に指定する必要があります: {0}
+err.option.unsupported={0}はサポートされていません: {1}
+err.orphan.arguments={0}は無効な引数です
+err.config.defaults=プロパティ{0}が構成にありません
+err.config.defaults.value=デフォルト・プロパティの値が間違っています: {0}
+err.bom.generation=bomファイルの生成に失敗しました: {0}
+err.not.a.module.directory=ディレクトリ{0}には、module-info.classファイルが含まれません
+err.cannot.read.module.info={0}からモジュール・ディスクリプタを読み取れません
+err.not.modular.format=選択したモジュール{0} ({1})がjmodまたはモジュラJAR形式ではありません
+err.signing=署名済モジュラJAR {0}は現在サポートされていないため、エラーを抑止するには--ignore-signing-informationを使用します
+err.cannot.determine.target.platform={0}のターゲット・プラットフォームを特定できません
+err.unknown.target.platform=不明なターゲット・プラットフォーム{0}
+err.target.endianness.mismatch=指定された--endian {0}は、ターゲット・プラットフォーム{1}のendiannessと一致しません
+warn.signing=警告: 署名済モジュラJAR {0}は現在サポートされていません
+warn.invalid.arg=無効なクラス名またはパス名が存在しません: {0}
+warn.split.package=パッケージ{0}は{1} {2}で定義されています
+warn.provider.notfound=--suggest-providersに指定されたサービスにプロバイダが見つかりません: {0}
+no.suggested.providers=--bind-servicesオプションが指定されています。追加のプロバイダは推奨されません。
+suggested.providers.header=推奨プロバイダ
+providers.header=プロバイダ
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties
index 45648fcbf4a..fae2369fedc 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties
@@ -23,86 +23,86 @@
 # questions.
 #
 
-jlink.description=\u5C06\u4E00\u7EC4\u6A21\u5757\u53CA\u5176\u76F8\u5173\u9879\u6C47\u7F16\u548C\u4F18\u5316\u4E3A\u5B9A\u5236\u8FD0\u884C\u65F6\u6620\u50CF
+jlink.description=将一组模块及其相关项汇编和优化为定制运行时映像
 
-main.usage.summary=\u7528\u6CD5: {0} <\u9009\u9879> --module-path <\u6A21\u5757\u8DEF\u5F84> --add-modules <\u6A21\u5757>[,<\u6A21\u5757>...]\n\u4F7F\u7528 --help \u53EF\u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
+main.usage.summary=用法: {0} <选项> --module-path <模块路径> --add-modules <模块>[,<模块>...]\n使用 --help 可列出可能的选项
 
-main.usage=\u7528\u6CD5: {0} <\u9009\u9879> --module-path <\u6A21\u5757\u8DEF\u5F84> --add-modules <\u6A21\u5757>[,<\u6A21\u5757>...]\n\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC:
+main.usage=用法: {0} <选项> --module-path <模块路径> --add-modules <模块>[,<模块>...]\n可能的选项包括:
 
-main.opt.help=\  -h, --help, -?                        \u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F
+main.opt.help=\  -h, --help, -?                        输出此帮助消息
 
-main.opt.version=\      --version                           \u7248\u672C\u4FE1\u606F
+main.opt.version=\      --version                           版本信息
 
-main.opt.module-path=\  -p, --module-path <path>              \u6A21\u5757\u8DEF\u5F84\u3002\n                                        \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5C06\u4F7F\u7528 JDK \u7684 jmods \n                                        \u76EE\u5F55\uFF08\u5982\u679C\u5B58\u5728\u8BE5\u76EE\u5F55\uFF09\u3002\u5982\u679C\u6307\u5B9A\uFF0C\n                                        \u4F46\u5B83\u4E0D\u5305\u542B java.base \u6A21\u5757\uFF0C\n                                        \u5219\u5C06\u6DFB\u52A0 JDK \u7684 jmods \u76EE\u5F55\n                                        \uFF08\u5982\u679C\u5B58\u5728\u8BE5\u76EE\u5F55\uFF09\u3002
+main.opt.module-path=\  -p, --module-path <path>              模块路径。\n                                        如果未指定，将使用 JDK 的 jmods \n                                        目录（如果存在该目录）。如果指定，\n                                        但它不包含 java.base 模块，\n                                        则将添加 JDK 的 jmods 目录\n                                        （如果存在该目录）。
 
-main.opt.add-modules=\      --add-modules <mod>[,<mod>...]    \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\n                                        \u6839\u6A21\u5757\u3002<mod> \u8FD8\u53EF\u4EE5\u4E3A ALL-MODULE-PATH\u3002
+main.opt.add-modules=\      --add-modules <mod>[,<mod>...]    除了初始模块之外要解析的\n                                        根模块。<mod> 还可以为 ALL-MODULE-PATH。
 
-main.opt.limit-modules=\      --limit-modules <\u6A21\u5757>[,<\u6A21\u5757>...]  \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF
+main.opt.limit-modules=\      --limit-modules <模块>[,<模块>...]  限制可观察模块的领域
 
-main.opt.output=\      --output <\u8DEF\u5F84>                     \u8F93\u51FA\u8DEF\u5F84\u7684\u4F4D\u7F6E
+main.opt.output=\      --output <路径>                     输出路径的位置
 
-main.opt.launcher=\      --launcher <\u540D\u79F0>=<\u6A21\u5757>[/<\u4E3B\u7C7B>]\n                                        \u4E3A\u6A21\u5757\u548C\u4E3B\u7C7B\u6DFB\u52A0\u7ED9\u5B9A\n                                        \u540D\u79F0\u7684\u542F\u52A8\u7A0B\u5E8F\u547D\u4EE4\n                                        (\u5982\u679C\u6307\u5B9A)  
+main.opt.launcher=\      --launcher <名称>=<模块>[/<主类>]\n                                        为模块和主类添加给定\n                                        名称的启动程序命令\n                                        (如果指定)  
 
-main.opt.bind-services=\      --bind-services                   \u94FE\u63A5\u670D\u52A1\u63D0\u4F9B\u65B9\u6A21\u5757\u53CA\u5176\n                                        \u88AB\u4F9D\u8D56\u5BF9\u8C61
+main.opt.bind-services=\      --bind-services                   链接服务提供方模块及其\n                                        被依赖对象
 
-main.opt.suggest-providers=\      --suggest-providers [<\u540D\u79F0>,...]  \u5EFA\u8BAE\u53EF\u4ECE\u6A21\u5757\u8DEF\u5F84\u4E2D\u5B9E\u73B0\n                                        \u7ED9\u5B9A\u670D\u52A1\u7C7B\u578B\u7684\u63D0\u4F9B\u65B9
+main.opt.suggest-providers=\      --suggest-providers [<名称>,...]  建议可从模块路径中实现\n                                        给定服务类型的提供方
 
-main.command.files=\      @<\u6587\u4EF6\u540D>                           \u4ECE\u6587\u4EF6\u4E2D\u8BFB\u53D6\u9009\u9879
+main.command.files=\      @<文件名>                           从文件中读取选项
 
-main.opt.endian=\      --endian <little|big>               \u6240\u751F\u6210 jimage\n                                          \u7684\u5B57\u8282\u987A\u5E8F (\u9ED8\u8BA4\u503C: native)
+main.opt.endian=\      --endian <little|big>               所生成 jimage\n                                          的字节顺序 (默认值: native)
 
-main.opt.save-opts=\      --save-opts <\u6587\u4EF6\u540D>                \u5C06 jlink \u9009\u9879\u4FDD\u5B58\u5728\u6307\u5B9A\u6587\u4EF6\u4E2D
+main.opt.save-opts=\      --save-opts <文件名>                将 jlink 选项保存在指定文件中
 
-main.opt.ignore-signing-information=\      --ignore-signing-information        \u5728\u6620\u50CF\u4E2D\u94FE\u63A5\u5DF2\u7B7E\u540D\u6A21\u5757\u5316\n                                          JAR \u7684\u60C5\u51B5\u4E0B\u9690\u85CF\u81F4\u547D\u9519\u8BEF\u3002\n                                          \u5DF2\u7B7E\u540D\u6A21\u5757\u5316 JAR \u7684\u7B7E\u540D\n                                          \u76F8\u5173\u6587\u4EF6\u5C06\u4E0D\u4F1A\u590D\u5236\u5230\n                                          \u8FD0\u884C\u65F6\u6620\u50CF\u3002
+main.opt.ignore-signing-information=\      --ignore-signing-information        在映像中链接已签名模块化\n                                          JAR 的情况下隐藏致命错误。\n                                          已签名模块化 JAR 的签名\n                                          相关文件将不会复制到\n                                          运行时映像。
 
-main.opt.verbose=\  -v, --verbose                         \u542F\u7528\u8BE6\u7EC6\u8DDF\u8E2A
+main.opt.verbose=\  -v, --verbose                         启用详细跟踪
 
-main.msg.bug=jlink \u4E2D\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF\u3002\u5982\u679C\u5728 Java Bug Database (https://bugreport.java.com/bugreport/) \u4E2D\u6CA1\u6709\u627E\u5230\u6709\u5173\u8BE5\u9519\u8BEF\u7684 Bug\uFF0C\u8BF7\u5728\u8BE5\u6570\u636E\u5E93\u4E2D\u63D0\u4EA4 Bug\u3002\u8BF7\u5728\u62A5\u544A\u4E2D\u9644\u4E0A\u60A8\u7684\u7A0B\u5E8F\u548C\u4EE5\u4E0B\u8BCA\u65AD\u4FE1\u606F\u3002\u8C22\u8C22\u3002
+main.msg.bug=jlink 中出现异常错误。如果在 Java Bug Database (https://bugreport.java.com/bugreport/) 中没有找到有关该错误的 Bug，请在该数据库中提交 Bug。请在报告中附上您的程序和以下诊断信息。谢谢。
 
-main.extended.help=\u53EF\u7528\u63D2\u4EF6\u5217\u8868:
+main.extended.help=可用插件列表:
 
-main.extended.help.footer=\u5BF9\u4E8E\u9700\u8981 <\u6A21\u5F0F\u5217\u8868> \u7684\u9009\u9879, \u503C\u5C06\u4E3A\u9017\u53F7\u5206\u9694\u7684\u5143\u7D20\u5217\u8868, \u6BCF\u4E2A\u5143\u7D20\u4F7F\u7528\u4EE5\u4E0B\u683C\u5F0F\u4E4B\u4E00:\n  <glob \u6A21\u5F0F>\n  glob:<glob \u6A21\u5F0F>\n  regex:<\u6B63\u5219\u8868\u8FBE\u5F0F\u6A21\u5F0F>\n  @<\u6587\u4EF6\u540D>, \u5176\u4E2D\u201C\u6587\u4EF6\u540D\u201D\u662F\u5305\u542B\u8981\u4F7F\u7528\u7684\u6A21\u5F0F\u7684\u6587\u4EF6\u540D, \u6BCF\u884C\u4E00\u4E2A\u6A21\u5F0F\n\n
+main.extended.help.footer=对于需要 <模式列表> 的选项, 值将为逗号分隔的元素列表, 每个元素使用以下格式之一:\n  <glob 模式>\n  glob:<glob 模式>\n  regex:<正则表达式模式>\n  @<文件名>, 其中“文件名”是包含要使用的模式的文件名, 每行一个模式\n\n
 
-error.prefix=\u9519\u8BEF:
-warn.prefix=\u8B66\u544A:
+error.prefix=错误:
+warn.prefix=警告:
 
-err.empty.module.path=\u7A7A\u6A21\u5757\u8DEF\u5F84
-err.jlink.version.mismatch=jlink \u7248\u672C {0}.{1} \u4E0E\u76EE\u6807 java.base \u7248\u672C {2}.{3} \u4E0D\u5339\u914D
-err.automatic.module:\u81EA\u52A8\u6A21\u5757\u4E0D\u80FD\u7528\u4E8E\u6765\u81EA {1} \u7684 jlink: {0}
-err.unknown.byte.order:\u672A\u77E5\u7684\u5B57\u8282\u987A\u5E8F {0}
-err.launcher.main.class.empty:\u542F\u52A8\u7A0B\u5E8F\u4E3B\u7C7B\u540D\u4E0D\u80FD\u4E3A\u7A7A: {0}
-err.launcher.module.name.empty:\u542F\u52A8\u7A0B\u5E8F\u6A21\u5757\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A: {0}
-err.launcher.value.format:\u542F\u52A8\u7A0B\u5E8F\u503C\u5E94\u4F7F\u7528\u201C<\u547D\u4EE4>=<\u6A21\u5757>[/<\u4E3B\u7C7B>]\u201D\u683C\u5F0F: {0}
-err.output.must.be.specified:\u5FC5\u987B\u6307\u5B9A --output
-err.modulepath.must.be.specified:\u672A\u6307\u5B9A --module-path\uFF0C\u6B64\u8FD0\u884C\u65F6\u6620\u50CF\u4E0D\u5305\u542B jmods \u76EE\u5F55\u3002
-err.mods.must.be.specified:\u6CA1\u6709\u5C06\u4EFB\u4F55\u6A21\u5757\u6307\u5B9A\u5230{0}
-err.path.not.found=\u627E\u4E0D\u5230\u8DEF\u5F84: {0}
-err.path.not.valid=\u65E0\u6548\u8DEF\u5F84: {0}
-err.file.not.found=\u627E\u4E0D\u5230\u6587\u4EF6: {0}
-err.file.error=\u65E0\u6CD5\u8BBF\u95EE\u6587\u4EF6: {0}
-err.dir.exists={0} \u5DF2\u5B58\u5728
-err.badpattern=\u9519\u8BEF\u7684\u6A21\u5F0F {0}
-err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
-err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
-err.internal.error=\u5185\u90E8\u9519\u8BEF: {0} {1} {2}
-err.invalid.arg.for.option={0} \u4E0D\u63A5\u53D7 "{1}" \u53C2\u6570
-err.option.after.class=\u5FC5\u987B\u5728\u7C7B\u4E4B\u524D\u6307\u5B9A\u9009\u9879: {0}
-err.option.unsupported=\u4E0D\u652F\u6301{0}: {1}
-err.orphan.arguments=\u65E0\u6548\u7684\u53C2\u6570: {0}
-err.config.defaults=\u914D\u7F6E\u4E2D\u7F3A\u5C11\u5C5E\u6027 {0}
-err.config.defaults.value=\u9ED8\u8BA4\u5C5E\u6027\u4E2D\u7684\u503C\u9519\u8BEF: {0}
-err.bom.generation=\u672A\u80FD\u751F\u6210 bom \u6587\u4EF6: {0}
-err.not.a.module.directory=\u76EE\u5F55 {0} \u4E0B\u4E0D\u5305\u542B module-info.class \u6587\u4EF6
-err.cannot.read.module.info=\u65E0\u6CD5\u4ECE {0} \u8BFB\u53D6\u6A21\u5757\u63CF\u8FF0\u7B26
-err.not.modular.format=\u9009\u5B9A\u6A21\u5757 {0} ({1}) \u672A\u4F7F\u7528 jmod \u6216\u6A21\u5757\u5316 JAR \u683C\u5F0F
-err.signing=\u5F53\u524D\u4E0D\u652F\u6301\u5DF2\u7B7E\u540D\u6A21\u5757\u5316 JAR {0}, \u4F7F\u7528 --ignore-signing-information \u53EF\u9690\u85CF\u9519\u8BEF
-err.cannot.determine.target.platform=\u65E0\u6CD5\u6839\u636E {0} \u786E\u5B9A\u76EE\u6807\u5E73\u53F0
-err.unknown.target.platform=\u672A\u77E5\u76EE\u6807\u5E73\u53F0 {0}
-err.target.endianness.mismatch=\u6307\u5B9A\u7684 --endian {0} \u4E0E\u76EE\u6807\u5E73\u53F0 {1} \u7684\u5B57\u8282\u987A\u5E8F\u4E0D\u5339\u914D
-warn.signing=\u8B66\u544A: \u5F53\u524D\u4E0D\u652F\u6301\u5DF2\u7B7E\u540D\u6A21\u5757\u5316 JAR {0}
-warn.invalid.arg=\u7C7B\u540D\u65E0\u6548\u6216\u8DEF\u5F84\u540D\u4E0D\u5B58\u5728: {0}
-warn.split.package=\u5DF2\u5728{1} {2}\u4E2D\u5B9A\u4E49\u7A0B\u5E8F\u5305{0}
-warn.provider.notfound=\u627E\u4E0D\u5230\u4E3A --suggest-providers \u6307\u5B9A\u7684\u670D\u52A1\u63D0\u4F9B\u65B9: {0}
-no.suggested.providers=\u6307\u5B9A\u4E86 --bind-services \u9009\u9879\u3002\u672A\u5EFA\u8BAE\u5176\u4ED6\u63D0\u4F9B\u65B9\u3002
-suggested.providers.header=\u5EFA\u8BAE\u7684\u63D0\u4F9B\u65B9
-providers.header=\u63D0\u4F9B\u65B9
+err.empty.module.path=空模块路径
+err.jlink.version.mismatch=jlink 版本 {0}.{1} 与目标 java.base 版本 {2}.{3} 不匹配
+err.automatic.module:自动模块不能用于来自 {1} 的 jlink: {0}
+err.unknown.byte.order:未知的字节顺序 {0}
+err.launcher.main.class.empty:启动程序主类名不能为空: {0}
+err.launcher.module.name.empty:启动程序模块名称不能为空: {0}
+err.launcher.value.format:启动程序值应使用“<命令>=<模块>[/<主类>]”格式: {0}
+err.output.must.be.specified:必须指定 --output
+err.modulepath.must.be.specified:未指定 --module-path，此运行时映像不包含 jmods 目录。
+err.mods.must.be.specified:没有将任何模块指定到{0}
+err.path.not.found=找不到路径: {0}
+err.path.not.valid=无效路径: {0}
+err.file.not.found=找不到文件: {0}
+err.file.error=无法访问文件: {0}
+err.dir.exists={0} 已存在
+err.badpattern=错误的模式 {0}
+err.unknown.option=未知选项: {0}
+err.missing.arg=没有为{0}指定值
+err.internal.error=内部错误: {0} {1} {2}
+err.invalid.arg.for.option={0} 不接受 "{1}" 参数
+err.option.after.class=必须在类之前指定选项: {0}
+err.option.unsupported=不支持{0}: {1}
+err.orphan.arguments=无效的参数: {0}
+err.config.defaults=配置中缺少属性 {0}
+err.config.defaults.value=默认属性中的值错误: {0}
+err.bom.generation=未能生成 bom 文件: {0}
+err.not.a.module.directory=目录 {0} 下不包含 module-info.class 文件
+err.cannot.read.module.info=无法从 {0} 读取模块描述符
+err.not.modular.format=选定模块 {0} ({1}) 未使用 jmod 或模块化 JAR 格式
+err.signing=当前不支持已签名模块化 JAR {0}, 使用 --ignore-signing-information 可隐藏错误
+err.cannot.determine.target.platform=无法根据 {0} 确定目标平台
+err.unknown.target.platform=未知目标平台 {0}
+err.target.endianness.mismatch=指定的 --endian {0} 与目标平台 {1} 的字节顺序不匹配
+warn.signing=警告: 当前不支持已签名模块化 JAR {0}
+warn.invalid.arg=类名无效或路径名不存在: {0}
+warn.split.package=已在{1} {2}中定义程序包{0}
+warn.provider.notfound=找不到为 --suggest-providers 指定的服务提供方: {0}
+no.suggested.providers=指定了 --bind-services 选项。未建议其他提供方。
+suggested.providers.header=建议的提供方
+providers.header=提供方
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
index 5cee87fde85..4713eabed85 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
@@ -29,25 +29,25 @@ add-options.description=Stellt die angegebene <Optionen>-Zeichenfolge, die Leerz
 
 add-options.usage=\  --add-options <Optionen>   Stellt die angegebene <Optionen>-Zeichenfolge,\n                            die Leerzeichen enthalten kann, anderen Optionen voran, wenn\n                            die virtuelle Maschine im resultierenden Image aufgerufen wird.
 
-release-info.argument=<Datei>|add:<Schl\u00FCssel1>=<Wert1>:<Schl\u00FCssel2>=<Wert2>:...|del:<Schl\u00FCsselliste>
+release-info.argument=<Datei>|add:<Schlüssel1>=<Wert1>:<Schlüssel2>=<Wert2>:...|del:<Schlüsselliste>
 
-release-info.description=<Datei>-Option l\u00E4dt Releaseeigenschaften aus der angegebenen Datei.\nadd: f\u00FCgt der Datei "release" Eigenschaften hinzu.\nEine beliebige Anzahl von <Schl\u00FCssel>=<Wert>-Paaren kann \u00FCbergeben werden.\ndel: l\u00F6scht die Liste der Schl\u00FCssel in der Releasedatei.
+release-info.description=<Datei>-Option lädt Releaseeigenschaften aus der angegebenen Datei.\nadd: fügt der Datei "release" Eigenschaften hinzu.\nEine beliebige Anzahl von <Schlüssel>=<Wert>-Paaren kann übergeben werden.\ndel: löscht die Liste der Schlüssel in der Releasedatei.
 
-release-info.usage=\  --release-info <Datei>|add:<Schl\u00FCssel1>=<Wert1>:<Schl\u00FCssel2>=<Wert2>:...|del:<Schl\u00FCsselliste>\n                            Option <Datei> l\u00F6scht Releaseeigenschaften aus\n                            der angegebenen Datei.\n                            add: f\u00FCgt Eigenschaften der Datei "release" hinzu.\n                            Eine beliebige Anzahl <Schl\u00FCssel>=<Wert>-Paare kann \u00FCbergeben werden.\n                            del: l\u00F6scht die Liste der Schl\u00FCssel in der Releasedatei.
+release-info.usage=\  --release-info <Datei>|add:<Schlüssel1>=<Wert1>:<Schlüssel2>=<Wert2>:...|del:<Schlüsselliste>\n                            Option <Datei> löscht Releaseeigenschaften aus\n                            der angegebenen Datei.\n                            add: fügt Eigenschaften der Datei "release" hinzu.\n                            Eine beliebige Anzahl <Schlüssel>=<Wert>-Paare kann übergeben werden.\n                            del: löscht die Liste der Schlüssel in der Releasedatei.
 
 class-for-name.argument=
 
-class-for-name.description=Klassenoptimierung: Konvertiert Class.forName-Aufrufe in Konstantenladevorg\u00E4nge.
+class-for-name.description=Klassenoptimierung: Konvertiert Class.forName-Aufrufe in Konstantenladevorgänge.
 
-class-for-name.usage=\  --class-for-name          Klassenoptimierung: Konvertiert Class.forName-Aufrufe in Konstantenladevorg\u00E4nge.
+class-for-name.usage=\  --class-for-name          Klassenoptimierung: Konvertiert Class.forName-Aufrufe in Konstantenladevorgänge.
 
 compress.argument=<zip-[0-9]>[:filter=<Musterliste>]
 
-compress.description= Zu verwendende Komprimierung f\u00FCr Ressourcen.
+compress.description= Zu verwendende Komprimierung für Ressourcen.
 
-compress.usage=\  --compress <compress>     Zu verwendende Komprimierung f\u00FCr Ressourcen:\n                            Zul\u00E4ssige Werte:\n                            zip-[0-9], wobei "zip-0" f\u00FCr keine Komprimierung\n                            und "zip-9" f\u00FCr die beste Komprimierung steht.\n                            Standardwert ist "zip-6".
+compress.usage=\  --compress <compress>     Zu verwendende Komprimierung für Ressourcen:\n                            Zulässige Werte:\n                            zip-[0-9], wobei "zip-0" für keine Komprimierung\n                            und "zip-9" für die beste Komprimierung steht.\n                            Standardwert ist "zip-6".
 
-compress.warn.argumentdeprecated=Warnung: Das Argument {0} f\u00FCr --compress ist veraltet und wird m\u00F6glicherweise in einem zuk\u00FCnftigen Release entfernt
+compress.warn.argumentdeprecated=Warnung: Das Argument {0} für --compress ist veraltet und wird möglicherweise in einem zukünftigen Release entfernt
 
 
 dedup-legal-notices.argument=[error-if-not-same-content]
@@ -56,41 +56,41 @@ dedup-legal-notices.description=Dedupliziert alle rechtlichen Hinweise. Wenn err
 
 dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            Dedupliziert alle rechtlichen Hinweise.\n                            Wenn error-if-not-same-content angegeben wird,\n                            tritt ein Fehler auf, wenn zwei Dateien mit dem gleichen\n                            Dateinamen unterschiedlich sind.
 
-exclude-files.argument=<Musterliste> der auszuschlie\u00DFenden Dateien
+exclude-files.argument=<Musterliste> der auszuschließenden Dateien
 
-exclude-files.description=Gibt die auszuschlie\u00DFenden Dateien an. Beispiel: **.java,glob:/java.base/lib/client/**
+exclude-files.description=Gibt die auszuschließenden Dateien an. Beispiel: **.java,glob:/java.base/lib/client/**
 
-exclude-files.usage=\  --exclude-files <Musterliste>\n                            Gibt die auszuschlie\u00DFenden Dateien an.\n                            Beispiel: **.java,glob:/java.base/lib/client/**
+exclude-files.usage=\  --exclude-files <Musterliste>\n                            Gibt die auszuschließenden Dateien an.\n                            Beispiel: **.java,glob:/java.base/lib/client/**
 
-exclude-resources.argument=<Musterliste> f\u00FCr auszuschlie\u00DFende Ressourcen
+exclude-resources.argument=<Musterliste> für auszuschließende Ressourcen
 
-exclude-resources.description=Gibt die auszuschlie\u00DFenden Ressourcen an. Beispiel: **.jcov,glob:**/META-INF/**
+exclude-resources.description=Gibt die auszuschließenden Ressourcen an. Beispiel: **.jcov,glob:**/META-INF/**
 
-exclude-resources.usage=\  --exclude-resources <Musterliste>\n                            Gibt die auszuschlie\u00DFenden Ressourcen an.\n                            Beispiel: **.jcov,glob:**/META-INF/**
+exclude-resources.usage=\  --exclude-resources <Musterliste>\n                            Gibt die auszuschließenden Ressourcen an.\n                            Beispiel: **.jcov,glob:**/META-INF/**
 
 exclude-jmod-section.argument=<Abschnittname>\nwobei <Abschnittname> "man" oder "headers" lautet.
 
-exclude-jmod-section.description=Gibt einen auszuschlie\u00DFenden JMOD-Abschnitt an
+exclude-jmod-section.description=Gibt einen auszuschließenden JMOD-Abschnitt an
 
-exclude-jmod-section.usage=\  --exclude-jmod-section <Abschnittname>\n                            Gibt einen auszuschlie\u00DFenden JMOD-Abschnitt an.\n                            Dabei lautet <Abschnittname> "man" oder "headers".
+exclude-jmod-section.usage=\  --exclude-jmod-section <Abschnittname>\n                            Gibt einen auszuschließenden JMOD-Abschnitt an.\n                            Dabei lautet <Abschnittname> "man" oder "headers".
 
 
-generate-cds-archive.description=CDS-Plug-in: Generiert CDS-Archive, wenn das Laufzeitimage das CDS-Feature unterst\u00FCtzt.\n
-generate-cds-archive.usage=\  --generate-cds-archive    Generiert ein CDS-Archiv, wenn das Laufzeitimage das\n                            CDS-Feature unterst\u00FCtzt.
+generate-cds-archive.description=CDS-Plug-in: Generiert CDS-Archive, wenn das Laufzeitimage das CDS-Feature unterstützt.\n
+generate-cds-archive.usage=\  --generate-cds-archive    Generiert ein CDS-Archiv, wenn das Laufzeitimage das\n                            CDS-Feature unterstützt.
 
 generate-jli-classes.argument=@filename
 
-generate-jli-classes.description=Gibt eine Datei an, die java.lang.invoke-Klassen f\u00FCr die Vorabgenerierung auflistet. \nStandardm\u00E4\u00DFig kann dieses Plug-in eine integrierte Liste vorab zu generierender Klassen sein. \nWenn dieses Plug-in in einer anderen Laufzeitversion als das erstellte Image ausgef\u00FChrt wird, \nwird die Codegenerierung standardm\u00E4\u00DFig deaktiviert, damit die Richtigkeit gew\u00E4hrleistet \nist - kann durch Hinzuf\u00FCgen von ignore-version=true au\u00DFer Kraft gesetzt werden.
+generate-jli-classes.description=Gibt eine Datei an, die java.lang.invoke-Klassen für die Vorabgenerierung auflistet. \nStandardmäßig kann dieses Plug-in eine integrierte Liste vorab zu generierender Klassen sein. \nWenn dieses Plug-in in einer anderen Laufzeitversion als das erstellte Image ausgeführt wird, \nwird die Codegenerierung standardmäßig deaktiviert, damit die Richtigkeit gewährleistet \nist - kann durch Hinzufügen von ignore-version=true außer Kraft gesetzt werden.
 
-generate-jli-classes.usage=\  --generate-jli-classes @filename\n                           Gibt eine Datei an, welche die java.lang.invoke-Klassen f\u00FCr die\n                           Vorabgenerierung auflistet. Standardm\u00E4\u00DFig kann dieses\n                           Plug-in eine integrierte Liste vorab zu generierender Klassen sein.\n                           Wenn dieses Plug-in in einer anderen Laufzeitversion als das\n                           erstellte Image ausgef\u00FChrt wird, wird die Codegenerierung standardm\u00E4\u00DFig\n                          deaktiviert, damit die Richtigkeit gew\u00E4hrleistet ist - kann durch\n                           Hinzuf\u00FCgen von ignore-version=true au\u00DFer Kraft gesetzt werden.
+generate-jli-classes.usage=\  --generate-jli-classes @filename\n                           Gibt eine Datei an, welche die java.lang.invoke-Klassen für die\n                           Vorabgenerierung auflistet. Standardmäßig kann dieses\n                           Plug-in eine integrierte Liste vorab zu generierender Klassen sein.\n                           Wenn dieses Plug-in in einer anderen Laufzeitversion als das\n                           erstellte Image ausgeführt wird, wird die Codegenerierung standardmäßig\n                          deaktiviert, damit die Richtigkeit gewährleistet ist - kann durch\n                           Hinzufügen von ignore-version=true außer Kraft gesetzt werden.
 
-system-modules.argument=batch-size=<N> legt die Batchgr\u00F6\u00DFe der Moduldeskriptoren fest,\n                       um ein \u00DCberschreiten des Grenzwertes f\u00FCr die Methodenl\u00E4nge zu vermeiden.  Die\n                       Standardbatchgr\u00F6\u00DFe betr\u00E4gt 75.
+system-modules.argument=batch-size=<N> legt die Batchgröße der Moduldeskriptoren fest,\n                       um ein Überschreiten des Grenzwertes für die Methodenlänge zu vermeiden.  Die\n                       Standardbatchgröße beträgt 75.
 
-system-modules.usage=\  --system-modules [batch-size=<N>]\n                            Die Batchgr\u00F6\u00DFe gibt die maximale Anzahl an Modulen an,\n                            die als Workaround in einer Methode verarbeitet werden sollen, wenn der\n                            generierte Bytecode den Grenzwert f\u00FCr die Methodengr\u00F6\u00DFe \u00FCberschreitet. Die\n                            Standardbatchgr\u00F6\u00DFe betr\u00E4gt 75.
+system-modules.usage=\  --system-modules [batch-size=<N>]\n                            Die Batchgröße gibt die maximale Anzahl an Modulen an,\n                            die als Workaround in einer Methode verarbeitet werden sollen, wenn der\n                            generierte Bytecode den Grenzwert für die Methodengröße überschreitet. Die\n                            Standardbatchgröße beträgt 75.
 
 onoff.argument=<on|off>
 
-order-resources.argument=<Musterliste> der Pfade in der Reihenfolge ihrer Priorit\u00E4t. Wenn eine @file\nangegeben wird, muss jede Zeile genau \u00FCbereinstimmen, damit die Pfadsortierung m\u00F6glich ist
+order-resources.argument=<Musterliste> der Pfade in der Reihenfolge ihrer Priorität. Wenn eine @file\nangegeben wird, muss jede Zeile genau übereinstimmen, damit die Pfadsortierung möglich ist
 
 order-resources.description=Sortiert Ressourcen. Beispiel: **/module-info.class,@classlist,/java.base/java/lang/**
 
@@ -98,9 +98,9 @@ order-resources.usage=\  --order-resources <Musterliste>\n
 
 save-jlink-argfiles.argument=<filenames>
 
-save-jlink-argfiles.description=Angegebene Argumentdateien mit den Argumenten, die der Ausf\u00FChrung \nvon jlink voranzustellen sind, im Ausgabeimage speichern.\n<filenames> ist eine durch ":" (";" unter Windows) getrennte Liste mit Befehlszeilenargumentdateien.
+save-jlink-argfiles.description=Angegebene Argumentdateien mit den Argumenten, die der Ausführung \nvon jlink voranzustellen sind, im Ausgabeimage speichern.\n<filenames> ist eine durch ":" (";" unter Windows) getrennte Liste mit Befehlszeilenargumentdateien.
 
-save-jlink-argfiles.usage=\  --save-jlink-argfiles <filenames>\n                            Angegebene Argumentdateien\n                            mit den Argumenten, die der Ausf\u00FChrung von \n                            jlink voranzustellen sind, im Ausgabeimage speichern. <filenames> ist eine durch \n                            ":" (";" unter Windows) getrennte Liste mit Befehlszeilenargumentdateien.
+save-jlink-argfiles.usage=\  --save-jlink-argfiles <filenames>\n                            Angegebene Argumentdateien\n                            mit den Argumenten, die der Ausführung von \n                            jlink voranzustellen sind, im Ausgabeimage speichern. <filenames> ist eine durch \n                            ":" (";" unter Windows) getrennte Liste mit Befehlszeilenargumentdateien.
 
 strip-debug.description=Entfernt Debuginformationen aus dem Ausgabeimage
 
@@ -110,33 +110,33 @@ strip-java-debug-attributes.description=Entfernt Java-Debugattribute aus Klassen
 
 strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            Entfernt Java-Debugattribute aus\n                            Klassen im Ausgabeimage
 
-strip-native-commands.description=Schlie\u00DFt native Befehle (wie java/java.exe) aus dem Image aus
+strip-native-commands.description=Schließt native Befehle (wie java/java.exe) aus dem Image aus
 
-strip-native-commands.usage=\  --strip-native-commands   Schlie\u00DFt native Befehle (wie java/java.exe)\n                            aus dem Image aus.
+strip-native-commands.usage=\  --strip-native-commands   Schließt native Befehle (wie java/java.exe)\n                            aus dem Image aus.
 
 vendor-version.argument=<Herstellerversion>
 
-vendor-version.description=\u00DCberschreibt die Zeichenfolge f\u00FCr die Herstellerversion, die im Build enthalten ist, falls zutreffend.\nDer Wert der Systemeigenschaft "java.vendor.version" lautet dann <Herstellerversion>.
+vendor-version.description=Überschreibt die Zeichenfolge für die Herstellerversion, die im Build enthalten ist, falls zutreffend.\nDer Wert der Systemeigenschaft "java.vendor.version" lautet dann <Herstellerversion>.
 
-vendor-version.usage=\  --vendor-version <Herstellerversion>\n                            \u00DCberschreibt die Zeichenfolge f\u00FCr die Herstellerversion, die im\n                            Build enthalten ist, falls zutreffend. Der Wert der Systemeigenschaft\n                            "java.vendor.version" lautet dann <Herstellerversion>.
+vendor-version.usage=\  --vendor-version <Herstellerversion>\n                            Überschreibt die Zeichenfolge für die Herstellerversion, die im\n                            Build enthalten ist, falls zutreffend. Der Wert der Systemeigenschaft\n                            "java.vendor.version" lautet dann <Herstellerversion>.
 
 vendor-bug-url.argument=<Bug-URL Hersteller>
 
-vendor-bug-url.description=\u00DCberschreibt die Bug-URL des Herstellers, die im Build enthalten ist, falls zutreffend.\nDer Wert der Systemeigenschaft "java.vendor.url.bug" lautet dann <Hersteller-URL Bug>.
+vendor-bug-url.description=Überschreibt die Bug-URL des Herstellers, die im Build enthalten ist, falls zutreffend.\nDer Wert der Systemeigenschaft "java.vendor.url.bug" lautet dann <Hersteller-URL Bug>.
 
-vendor-bug-url.usage=\  --vendor-bug-url <Bug-URL Hersteller>\n                            \u00DCberschreibt die Bug-URL des Herstellers, die im Build enthalten ist.\n                            Der Wert der Systemeigenschaft\n                            "java.vendor.url.bug" lautet dann <Hersteller-URL Bug>.
+vendor-bug-url.usage=\  --vendor-bug-url <Bug-URL Hersteller>\n                            Überschreibt die Bug-URL des Herstellers, die im Build enthalten ist.\n                            Der Wert der Systemeigenschaft\n                            "java.vendor.url.bug" lautet dann <Hersteller-URL Bug>.
 
 vendor-vm-bug-url.argument=<Hersteller-VM-Bug-URL>
 
-vendor-vm-bug-url.description=\u00DCberschreibt die VM-Bug-URL, die im Build enthalten ist. Die in\nVM-Fehlerlogs angezeigte URL lautet dann <Hersteller-VM-Bug-URL>.
+vendor-vm-bug-url.description=Überschreibt die VM-Bug-URL, die im Build enthalten ist. Die in\nVM-Fehlerlogs angezeigte URL lautet dann <Hersteller-VM-Bug-URL>.
 
-vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            \u00DCberschreibt die VM-Bug-URL, die im Build \n                            enthalten ist. Die in VM-Fehlerlogs angezeigte \n                            URL lautet dann <Hersteller-VM-Bug-URL>.
+vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            Überschreibt die VM-Bug-URL, die im Build \n                            enthalten ist. Die in VM-Fehlerlogs angezeigte \n                            URL lautet dann <Hersteller-VM-Bug-URL>.
 
 vm.argument=<client|server|minimal|all>
 
-vm.description=W\u00E4hlt die HotSpot-VM im Ausgabeimage aus. Standardm\u00E4\u00DFig werden alle ausgew\u00E4hlt
+vm.description=Wählt die HotSpot-VM im Ausgabeimage aus. Standardmäßig werden alle ausgewählt
 
-vm.usage=\  --vm <client|server|minimal|all>\n                            W\u00E4hlt die HotSpot-VM im Ausgabeimage aus.\n                            Standardm\u00E4\u00DFig werden alle ausgew\u00E4hlt
+vm.usage=\  --vm <client|server|minimal|all>\n                            Wählt die HotSpot-VM im Ausgabeimage aus.\n                            Standardmäßig werden alle ausgewählt
 
 zip.argument=[kommagetrennte Liste von Ressourcenpfaden]
 
@@ -152,9 +152,9 @@ include-locales.usage=\  --include-locales <Sprachtag>[,<Sprachtag>]*\n
 
 include-locales.missingpackages=fehlende Gebietsschema-Datenpackages in jdk.localedata:\n\t
 
-include-locales.nomatchinglocales=Keine \u00FCbereinstimmenden Gebietsschemas gefunden f\u00FCr "%s". Pr\u00FCfen Sie das angegebene Muster.
+include-locales.nomatchinglocales=Keine übereinstimmenden Gebietsschemas gefunden für "%s". Prüfen Sie das angegebene Muster.
 
-include-locales.invalidtag=Ung\u00FCltiges Sprachtag: %s
+include-locales.invalidtag=Ungültiges Sprachtag: %s
 
 include-locales.localedatanotfound=Modul jdk.localedata wurde mit der Option --add-modules nicht angegeben
 
@@ -162,21 +162,21 @@ main.status.ok=Funktional.
 
 main.status.not.ok= Nicht funktional.
 
-plugin.plugins.header=Liste der verf\u00FCgbaren Plug-in-Optionen:
+plugin.plugins.header=Liste der verfügbaren Plug-in-Optionen:
 
-plugin.opt.list-plugins=\      --list-plugins                    Listet die verf\u00FCgbaren Plug-ins auf
+plugin.opt.list-plugins=\      --list-plugins                    Listet die verfügbaren Plug-ins auf
 
 plugin.opt.resources-last-sorter=\      --resources-last-sorter <Name>    Das letzte Plug-in, das Ressourcen\n                                        sortieren darf
 
 plugin.opt.disable-plugin=\      --disable-plugin <Plug-in-Name>     Deaktiviert das angegebene Plug-in
 
-plugin.opt.compress=\      --compress <compress>             Zu verwendende Komprimierung f\u00FCr Ressourcen:\n                                        Zul\u00E4ssige Werte:\n                                        zip-[0-9], wobei "zip-0" f\u00FCr keine Komprimierung\n                                        und "zip-9" f\u00FCr die beste Komprimierung steht.\n                                        Standardwert ist "zip-6".\n                                        Veraltete Werte, die in einem zuk\u00FCnftigen Release entfernt werden:\n                                        0: Keine Komprimierung. Entspricht "zip-0".\n                                        1: Gemeinsame Verwendung konstanter Zeichenfolgen\n                                        2: Entspricht "zip-6".
+plugin.opt.compress=\      --compress <compress>             Zu verwendende Komprimierung für Ressourcen:\n                                        Zulässige Werte:\n                                        zip-[0-9], wobei "zip-0" für keine Komprimierung\n                                        und "zip-9" für die beste Komprimierung steht.\n                                        Standardwert ist "zip-6".\n                                        Veraltete Werte, die in einem zukünftigen Release entfernt werden:\n                                        0: Keine Komprimierung. Entspricht "zip-0".\n                                        1: Gemeinsame Verwendung konstanter Zeichenfolgen\n                                        2: Entspricht "zip-6".
 
 plugin.opt.strip-debug=\  -G, --strip-debug                     Entfernt Debuginformationen
 
-plugin.opt.no-man-pages=\      --no-man-pages                    Schlie\u00DFt Manpages aus
+plugin.opt.no-man-pages=\      --no-man-pages                    Schließt Manpages aus
 
-plugin.opt.no-header-files=\      --no-header-files                 Schlie\u00DFt Headerdateien aus
+plugin.opt.no-header-files=\      --no-header-files                 Schließt Headerdateien aus
 
 main.plugin.name=Plug-in-Name
 
@@ -204,20 +204,20 @@ main.plugin.state=Funktionsstatus
 
 err.no.such.plugin=Plug-in nicht vorhanden: {0}
 
-err.provider.not.functional=Der Provider {0} ist nicht funktionsf\u00E4hig.
+err.provider.not.functional=Der Provider {0} ist nicht funktionsfähig.
 
 err.plugin.multiple.options=Mehrere Plug-ins aktiviert von Option {0}
 err.plugin.conflicts={0} ({1}) steht im Konflikt mit {2}. Verwenden Sie nur eine der Optionen, nicht beide.
-err.provider.additional.arg.error=Fehler bei der Angabe eines zus\u00E4tzlichen Arguments in der {0}-Option: {1}
+err.provider.additional.arg.error=Fehler bei der Angabe eines zusätzlichen Arguments in der {0}-Option: {1}
 
-err.no.plugins.path=Kein Argument f\u00FCr Plug-in-Pfad.
+err.no.plugins.path=Kein Argument für Plug-in-Pfad.
 
 err.dir.already.exits=Verzeichnis ist bereits vorhanden: {0}
 
-err.invalid.index=ung\u00FCltiger Index f\u00FCr Option {0}
+err.invalid.index=ungültiger Index für Option {0}
 
 err.plugin.option.not.set=Option {0} muss festgelegt werden
 
-warn.thirdparty.plugins=Das Aktivieren von Plug-ins anderer Hersteller kann dazu f\u00FChren, dass ein nicht verwendbares Image generiert wird.
+warn.thirdparty.plugins=Das Aktivieren von Plug-ins anderer Hersteller kann dazu führen, dass ein nicht verwendbares Image generiert wird.
 
 warn.thirdparty.plugins.enabled=Sie haben Plug-ins anderer Hersteller aktiviert.
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
index 796486d8af2..1cf3ba5b0c0 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
@@ -25,199 +25,199 @@
 
 add-options.argument=<options>
 
-add-options.description=\u6307\u5B9A\u3057\u305F<options>\u6587\u5B57\u5217\u3092\u5148\u982D\u306B\u4ED8\u52A0\u3057\u307E\u3059\u3002\u3053\u308C\u306B\u306F\u3001\n\u751F\u6210\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u4EEE\u60F3\u30DE\u30B7\u30F3\u3092\u8D77\u52D5\u3059\u308B\u969B\u306B\u3001\n\u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u524D\u306B\u7A7A\u767D\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
+add-options.description=指定した<options>文字列を先頭に付加します。これには、\n生成されたイメージで仮想マシンを起動する際に、\n他のオプションの前に空白が含まれている場合があります。
 
-add-options.usage=\  --add-options <options>   \u6307\u5B9A\u3057\u305F<options>\u6587\u5B57\u5217\u3092\u5148\u982D\u306B\u4ED8\u52A0\u3057\u307E\u3059\u3002\u3053\u308C\u306B\u306F\u3001\n                            \u751F\u6210\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u4EEE\u60F3\u30DE\u30B7\u30F3\u3092\u8D77\u52D5\u3059\u308B\u969B\u306B\u3001\n                            \u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u524D\u306B\u7A7A\u767D\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
+add-options.usage=\  --add-options <options>   指定した<options>文字列を先頭に付加します。これには、\n                            生成されたイメージで仮想マシンを起動する際に、\n                            他のオプションの前に空白が含まれている場合があります。
 
 release-info.argument=<file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>
 
-release-info.description=<file>\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30EA\u30EA\u30FC\u30B9\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\nadd:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n\u4EFB\u610F\u306E\u6570\u306E<key>=<value>\u306E\u30DA\u30A2\u3092\u6E21\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\ndel:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30AD\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002
+release-info.description=<file>オプションは指定されたファイルからリリース・プロパティをロードします。\nadd:はリリース・ファイルにプロパティを追加します。\n任意の数の<key>=<value>のペアを渡すことができます。\ndel:はリリース・ファイルのキーのリストを削除します。
 
-release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file>\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30EA\u30EA\u30FC\u30B9\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\n                            \u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\n                            add:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n                            \u4EFB\u610F\u306E\u6570\u306E<key>=<value>\u30DA\u30A2\u3092\u6E21\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n                            del:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30AD\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002
+release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file>オプションは指定されたファイルからリリース・プロパティを\n                            ロードします。\n                            add:はリリース・ファイルにプロパティを追加します。\n                            任意の数の<key>=<value>ペアを渡すことができます。\n                            del:はリリース・ファイルのキーのリストを削除します。
 
 class-for-name.argument=
 
-class-for-name.description=\u30AF\u30E9\u30B9\u306E\u6700\u9069\u5316: Class.forName\u547C\u51FA\u3057\u3092\u5B9A\u6570\u306E\u30ED\u30FC\u30C9\u306B\u5909\u63DB\u3057\u307E\u3059\u3002
+class-for-name.description=クラスの最適化: Class.forName呼出しを定数のロードに変換します。
 
-class-for-name.usage=\  --class-for-name          \u30AF\u30E9\u30B9\u306E\u6700\u9069\u5316: Class.forName\u547C\u51FA\u3057\u3092\u5B9A\u6570\u306E\u30ED\u30FC\u30C9\u306B\u5909\u63DB\u3057\u307E\u3059\u3002
+class-for-name.usage=\  --class-for-name          クラスの最適化: Class.forName呼出しを定数のロードに変換します。
 
 compress.argument=<zip-[0-9]>[:filter=<pattern-list>]
 
-compress.description= \u30EA\u30BD\u30FC\u30B9\u306E\u5727\u7E2E\u306B\u4F7F\u7528\u3059\u308B\u5727\u7E2E\u3002
+compress.description= リソースの圧縮に使用する圧縮。
 
-compress.usage=\  --compress <compress>     \u30EA\u30BD\u30FC\u30B9\u306E\u5727\u7E2E\u306B\u4F7F\u7528\u3059\u308B\u5727\u7E2E:\n                            \u4F7F\u7528\u53EF\u80FD\u306A\u5024\u306F\n                            zip-[0-9]\u3067\u3059\u3002zip-0\u3067\u306F\u5727\u7E2E\u306F\u884C\u308F\u308C\u305A\u3001\n                            zip-9\u3067\u306F\u6700\u9069\u306A\u5727\u7E2E\u304C\u884C\u308F\u308C\u307E\u3059\u3002\n                            \u30C7\u30D5\u30A9\u30EB\u30C8\u306Fzip-6\u3067\u3059\u3002
+compress.usage=\  --compress <compress>     リソースの圧縮に使用する圧縮:\n                            使用可能な値は\n                            zip-[0-9]です。zip-0では圧縮は行われず、\n                            zip-9では最適な圧縮が行われます。\n                            デフォルトはzip-6です。
 
-compress.warn.argumentdeprecated=\u8B66\u544A:  --compress\u306E{0}\u5F15\u6570\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
+compress.warn.argumentdeprecated=警告:  --compressの{0}引数は非推奨であり、今後のリリースで削除される可能性があります
 
 
 dedup-legal-notices.argument=[error-if-not-same-content]
 
-dedup-legal-notices.description=\u3059\u3079\u3066\u306E\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u91CD\u8907\u3092\u9664\u5916\u3057\u307E\u3059\u3002\nerror-if-not-same-content\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u540C\u3058\u30D5\u30A1\u30A4\u30EB\u540D\u306E2\u3064\u306E\u30D5\u30A1\u30A4\u30EB\u304C\n\u7570\u306A\u3063\u3066\u3044\u308B\u3068\u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
+dedup-legal-notices.description=すべての法律上の注意点の重複を除外します。\nerror-if-not-same-contentが指定されている場合、同じファイル名の2つのファイルが\n異なっているとエラーになります。
 
-dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            \u3059\u3079\u3066\u306E\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u91CD\u8907\u3092\u9664\u5916\u3057\u307E\u3059\u3002\n                            error-if-not-same-content\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\n                            \u540C\u3058\u30D5\u30A1\u30A4\u30EB\u540D\u306E2\u3064\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u7570\u306A\u3063\u3066\u3044\u308B\u3068\n                            \u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
+dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            すべての法律上の注意点の重複を除外します。\n                            error-if-not-same-contentが指定されている場合、\n                            同じファイル名の2つのファイルが異なっていると\n                            エラーになります。
 
-exclude-files.argument=\u9664\u5916\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u306E<pattern-list>
+exclude-files.argument=除外するファイルの<pattern-list>
 
-exclude-files.description=\u9664\u5916\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u4F8B: **.java,glob:/java.base/lib/client/**
+exclude-files.description=除外するファイルを指定します。例: **.java,glob:/java.base/lib/client/**
 
-exclude-files.usage=\  --exclude-files <pattern-list>\n                            \u9664\u5916\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                            \u4F8B: **.java,glob:/java.base/lib/client/**
+exclude-files.usage=\  --exclude-files <pattern-list>\n                            除外するファイルを指定します。\n                            例: **.java,glob:/java.base/lib/client/**
 
-exclude-resources.argument=\u9664\u5916\u3059\u308B<pattern-list>\u306E\u30EA\u30BD\u30FC\u30B9
+exclude-resources.argument=除外する<pattern-list>のリソース
 
-exclude-resources.description=\u9664\u5916\u3059\u308B\u30EA\u30BD\u30FC\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u4F8B: **.jcov,glob:**/META-INF/**
+exclude-resources.description=除外するリソースを指定します。例: **.jcov,glob:**/META-INF/**
 
-exclude-resources.usage=\  --exclude-resources <pattern-list>\n                            \u9664\u5916\u3059\u308B\u30EA\u30BD\u30FC\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                            \u4F8B: **.jcov,glob:**/META-INF/**
+exclude-resources.usage=\  --exclude-resources <pattern-list>\n                            除外するリソースを指定します。\n                            例: **.jcov,glob:**/META-INF/**
 
-exclude-jmod-section.argument=<section-name>\n\u3053\u3053\u3067\u3001<section-name>\u306F"man"\u307E\u305F\u306F"headers"\u3067\u3059\u3002
+exclude-jmod-section.argument=<section-name>\nここで、<section-name>は"man"または"headers"です。
 
-exclude-jmod-section.description=\u9664\u5916\u3059\u308BJMOD\u30BB\u30AF\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059
+exclude-jmod-section.description=除外するJMODセクションを指定します
 
-exclude-jmod-section.usage=\  --exclude-jmod-section <section-name>\n                            \u9664\u5916\u3059\u308BJMOD\u30BB\u30AF\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                            \u3053\u3053\u3067\u3001<section-name> \u306F"man"\u307E\u305F\u306F"headers"\u3067\u3059\u3002
+exclude-jmod-section.usage=\  --exclude-jmod-section <section-name>\n                            除外するJMODセクションを指定します。\n                            ここで、<section-name> は"man"または"headers"です。
 
 
-generate-cds-archive.description=CDS\u30D7\u30E9\u30B0\u30A4\u30F3: \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3067CDS\u6A5F\u80FD\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u308B\u5834\u5408\u3001cds\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n
-generate-cds-archive.usage=\  --generate-cds-archive    \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3067CDS\u6A5F\u80FD\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u308B\u5834\u5408\u3001\n                            cds\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u751F\u6210\u3057\u307E\u3059\u3002
+generate-cds-archive.description=CDSプラグイン: ランタイム・イメージでCDS機能をサポートしている場合、cdsアーカイブを生成します。\n
+generate-cds-archive.usage=\  --generate-cds-archive    ランタイム・イメージでCDS機能をサポートしている場合、\n                            cdsアーカイブを生成します。
 
 generate-jli-classes.argument=@filename
 
-generate-jli-classes.description=\u4E8B\u524D\u751F\u6210\u3059\u308Bjava.lang.invoke\u30AF\u30E9\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u3066\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002 \n\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u4E8B\u524D\u751F\u6210\u3059\u308B\u30AF\u30E9\u30B9\u306E\u7D44\u8FBC\u307F\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 \n\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u3001\u4F5C\u6210\u3055\u308C\u308B\u30A4\u30E1\u30FC\u30B8\u3068\u7570\u306A\u308B\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u5B9F\u884C\u3055\u308C\u308B\u5834\u5408\u3001\n\u30B3\u30FC\u30C9\u306E\u751F\u6210\u306F\u6B63\u78BA\u6027\u3092\u4FDD\u8A3C\u3059\u308B\u305F\u3081\u306B\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002\n\u3053\u308C\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306Fignore-version=true\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002
+generate-jli-classes.description=事前生成するjava.lang.invokeクラスをリストしてファイルを指定します。 \nデフォルトでは、このプラグインは事前生成するクラスの組込みリストを使用できます。 \nこのプラグインが、作成されるイメージと異なるランタイム・バージョンで実行される場合、\nコードの生成は正確性を保証するために、デフォルトで無効になります。\nこれをオーバーライドするにはignore-version=trueを追加します。
 
-generate-jli-classes.usage=\  --generate-jli-classes @filename\n                            \u4E8B\u524D\u751F\u6210\u3059\u308Bjava.lang.invoke\u30AF\u30E9\u30B9\u3092\n                            \u30EA\u30B9\u30C8\u3057\u3066\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\n                            \u4E8B\u524D\u751F\u6210\u3059\u308B\u30AF\u30E9\u30B9\u306E\u7D44\u8FBC\u307F\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n                            \u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u3001\u4F5C\u6210\u3055\u308C\u308B\u30A4\u30E1\u30FC\u30B8\u3068\u7570\u306A\u308B\n                            \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u5B9F\u884C\u3055\u308C\u308B\u5834\u5408\u3001\u30B3\u30FC\u30C9\u306E\u751F\u6210\u306F\u6B63\u78BA\u6027\u3092\u4FDD\u8A3C\u3059\u308B\u305F\u3081\u306B\u3001\n                            \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002\n                            \u3053\u308C\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306Fignore-version=true\n                            \u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002
+generate-jli-classes.usage=\  --generate-jli-classes @filename\n                            事前生成するjava.lang.invokeクラスを\n                            リストしてファイルを指定します。デフォルトでは、このプラグインは\n                            事前生成するクラスの組込みリストを使用できます。\n                            このプラグインが、作成されるイメージと異なる\n                            ランタイム・バージョンで実行される場合、コードの生成は正確性を保証するために、\n                            デフォルトで無効になります。\n                            これをオーバーライドするにはignore-version=true\n                            を追加します。
 
-system-modules.argument=batch-size=<N>\u3067\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u306E\u30D0\u30C3\u30C1\u30FB\u30B5\u30A4\u30BA\n                       \u3092\u8A2D\u5B9A\u3057\u3001\u30E1\u30BD\u30C3\u30C9\u306E\u9577\u3055\u5236\u9650\u3092\u8D85\u3048\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059\u3002\n                       \u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30D0\u30C3\u30C1\u30FB\u30B5\u30A4\u30BA\u306F75\u3067\u3059\u3002
+system-modules.argument=batch-size=<N>で、モジュール・ディスクリプタのバッチ・サイズ\n                       を設定し、メソッドの長さ制限を超えないようにします。\n                       デフォルトのバッチ・サイズは75です。
 
-system-modules.usage=\  --system-modules [batch-size=<N>]\n                            \u30D0\u30C3\u30C1\u30FB\u30B5\u30A4\u30BA\u3067\u306F\u30011\u3064\u306E\u30E1\u30BD\u30C3\u30C9\u3067\u51E6\u7406\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\n                            \u6700\u5927\u6570\u3092\u6307\u5B9A\u3057\u3001\u751F\u6210\u3055\u308C\u308B\u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u304C\u30E1\u30BD\u30C3\u30C9\u306E\u30B5\u30A4\u30BA\n                            \u5236\u9650\u3092\u8D85\u3048\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30D0\u30C3\u30C1\u30FB\n                            \u30B5\u30A4\u30BA\u306F75\u3067\u3059\u3002
+system-modules.usage=\  --system-modules [batch-size=<N>]\n                            バッチ・サイズでは、1つのメソッドで処理するモジュールの\n                            最大数を指定し、生成されるバイトコードがメソッドのサイズ\n                            制限を超えないようにします。デフォルトのバッチ・\n                            サイズは75です。
 
 onoff.argument=<on|off>
 
-order-resources.argument=\u512A\u5148\u5EA6\u9806\u306E\u30D1\u30B9\u306E<pattern-list>\u3002@file\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\n\u5404\u884C\u306F\u3001\u30D1\u30B9\u3092\u9806\u5E8F\u4ED8\u3051\u308B\u305F\u3081\u306B\u5B8C\u5168\u306B\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+order-resources.argument=優先度順のパスの<pattern-list>。@fileを指定すると、\n各行は、パスを順序付けるために完全に一致している必要があります
 
-order-resources.description=\u30EA\u30BD\u30FC\u30B9\u3092\u9806\u5E8F\u4ED8\u3051\u307E\u3059\u3002\u4F8B: **/module-info.class,@classlist,/java.base/java/lang/**
+order-resources.description=リソースを順序付けます。例: **/module-info.class,@classlist,/java.base/java/lang/**
 
-order-resources.usage=\  --order-resources <pattern-list>\n                            \u30EA\u30BD\u30FC\u30B9\u3092\u9806\u5E8F\u4ED8\u3051\u307E\u3059\u3002 \n                            \u4F8B: **/module-info.class,@classlist,\n                            /java.base/java/lang/**
+order-resources.usage=\  --order-resources <pattern-list>\n                            リソースを順序付けます。 \n                            例: **/module-info.class,@classlist,\n                            /java.base/java/lang/**
 
 save-jlink-argfiles.argument=<filenames>
 
-save-jlink-argfiles.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u3067jlink\u306E\u5B9F\u884C\u306E\u524D\u306B\u8FFD\u52A0\u3059\u308B\u5F15\u6570\u3092\u542B\u3080\n\u6307\u5B9A\u306E\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002\n<filenames>\u306F\u3001\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u3092':' (Windows\u3067\u306F';')\u3067\u533A\u5207\u3063\u305F\u30EA\u30B9\u30C8\u3067\u3059\u3002
+save-jlink-argfiles.description=出力イメージでjlinkの実行の前に追加する引数を含む\n指定の引数ファイルを保存します。\n<filenames>は、コマンドライン引数ファイルを':' (Windowsでは';')で区切ったリストです。
 
-save-jlink-argfiles.usage=\  --save-jlink-argfiles <filenames>\n                            \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u3067jlink\u306E\u5B9F\u884C\u306E\u524D\u306B\u8FFD\u52A0\n                            \u3059\u308B\u5F15\u6570\u3092\u542B\u3080\u6307\u5B9A\u306E\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u3092\n                            \u4FDD\u5B58\u3057\u307E\u3059\u3002<filenames>\u306F\u3001\n                            \u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u3092':' (Windows\u3067\u306F';')\u3067\u533A\u5207\u3063\u305F\u30EA\u30B9\u30C8\u3067\u3059\u3002
+save-jlink-argfiles.usage=\  --save-jlink-argfiles <filenames>\n                            出力イメージでjlinkの実行の前に追加\n                            する引数を含む指定の引数ファイルを\n                            保存します。<filenames>は、\n                            コマンドライン引数ファイルを':' (Windowsでは';')で区切ったリストです。
 
-strip-debug.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059
+strip-debug.description=出力イメージからデバッグ情報を削除します
 
-strip-debug.usage=\  --strip-debug             \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059
+strip-debug.usage=\  --strip-debug             出力イメージからデバッグ情報を削除します
 
-strip-java-debug-attributes.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304B\u3089Java\u30C7\u30D0\u30C3\u30B0\u5C5E\u6027\u3092\u524A\u9664\u3057\u307E\u3059
+strip-java-debug-attributes.description=出力イメージのクラスからJavaデバッグ属性を削除します
 
-strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304B\u3089Java\n                            \u30C7\u30D0\u30C3\u30B0\u5C5E\u6027\u3092\u524A\u9664\u3057\u307E\u3059
+strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            出力イメージのクラスからJava\n                            デバッグ属性を削除します
 
-strip-native-commands.description=\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30B3\u30DE\u30F3\u30C9(java/java.exe\u306A\u3069)\u3092\u9664\u5916\u3057\u307E\u3059
+strip-native-commands.description=イメージからネイティブ・コマンド(java/java.exeなど)を除外します
 
-strip-native-commands.usage=\  --strip-native-commands   \u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30B3\u30DE\u30F3\u30C9(java/java.exe\u306A\u3069)\n                            \u3092\u9664\u5916\u3057\u307E\u3059\u3002
+strip-native-commands.usage=\  --strip-native-commands   イメージからネイティブ・コマンド(java/java.exeなど)\n                            を除外します。
 
 vendor-version.argument=<vendor-version>
 
-vendor-version.description=\u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217(\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408)\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3"java.vendor.version"\u306E\u5024\u306F<vendor-version>\u306B\u306A\u308A\u307E\u3059\u3002
+vendor-version.description=ビルドに設定されたベンダー・バージョン文字列(設定されている場合)をオーバーライドします。\nシステム・プロパティ"java.vendor.version"の値は<vendor-version>になります。
 
-vendor-version.usage=\  --vendor-version <vendor-version>\n                            \u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217(\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408)\u3092\n                            \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\n                            "java.vendor.version"\u306E\u5024\u306F<vendor-version>\u306B\u306A\u308A\u307E\u3059\u3002
+vendor-version.usage=\  --vendor-version <vendor-version>\n                            ビルドに設定されたベンダー・バージョン文字列(設定されている場合)を\n                            オーバーライドします。システム・プロパティ\n                            "java.vendor.version"の値は<vendor-version>になります。
 
 vendor-bug-url.argument=<vendor-bug-url>
 
-vendor-bug-url.description=\u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30B0URL\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3"java.vendor.url.bug"\u306E\u5024\u306F<vendor-url-bug>\u306B\u306A\u308A\u307E\u3059\u3002
+vendor-bug-url.description=ビルドに設定されたベンダー・バグURLをオーバーライドします。\nシステム・プロパティ"java.vendor.url.bug"の値は<vendor-url-bug>になります。
 
-vendor-bug-url.usage=\  --vendor-bug-url <vendor-bug-url>\n                            \u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30B0URL\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\n                            \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\n                            "java.vendor.url.bug"\u306E\u5024\u306F<vendor-url-bug>\u306B\u306A\u308A\u307E\u3059\u3002
+vendor-bug-url.usage=\  --vendor-bug-url <vendor-bug-url>\n                            ビルドに設定されたベンダー・バグURLをオーバーライドします。\n                            システム・プロパティ\n                            "java.vendor.url.bug"の値は<vendor-url-bug>になります。
 
 vendor-vm-bug-url.argument=<vendor-vm-bug-url>
 
-vendor-vm-bug-url.description=\u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FCVM\u30D0\u30B0URL\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\nVM\u30A8\u30E9\u30FC\u30FB\u30ED\u30B0\u306B\u8868\u793A\u3055\u308C\u308BURL\u306F<vendor-vm-bug-url>\u306B\u306A\u308A\u307E\u3059\u3002
+vendor-vm-bug-url.description=ビルドに設定されたベンダーVMバグURLをオーバーライドします。\nVMエラー・ログに表示されるURLは<vendor-vm-bug-url>になります。
 
-vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            \u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FCVM\u30D0\u30B0URL\u3092\n                            \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002VM\u30A8\u30E9\u30FC\u30FB\u30ED\u30B0\u306B\n                           \u8868\u793A\u3055\u308C\u305FURL\u306F<vendor-vm-bug-url>\u306B\u306A\u308A\u307E\u3059\u3002
+vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            ビルドに設定されたベンダーVMバグURLを\n                            オーバーライドします。VMエラー・ログに\n                           表示されたURLは<vendor-vm-bug-url>になります。
 
 vm.argument=<client|server|minimal|all>
 
-vm.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u3067HotSpot VM\u3092\u9078\u629E\u3057\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306Fall\u3067\u3059
+vm.description=出力イメージでHotSpot VMを選択します。デフォルトはallです
 
-vm.usage=\  --vm <client|server|minimal|all>\n                            \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u3067HotSpot VM\u3092\u9078\u629E\u3057\u307E\u3059\u3002\n                            \u30C7\u30D5\u30A9\u30EB\u30C8\u306Fall\u3067\u3059
+vm.usage=\  --vm <client|server|minimal|all>\n                            出力イメージでHotSpot VMを選択します。\n                            デフォルトはallです
 
-zip.argument=[\u30EA\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8]
+zip.argument=[リソース・パスのカンマ区切りのリスト]
 
-zip.description=ZIP\u5727\u7E2E
+zip.description=ZIP圧縮
 
-zip.usage=\  --zip [\u30EA\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8]\n                            ZIP\u5727\u7E2E
+zip.usage=\  --zip [リソース・パスのカンマ区切りのリスト]\n                            ZIP圧縮
 
 include-locales.argument=<langtag>[,<langtag>]*
 
-include-locales.description=BCP 47\u8A00\u8A9E\u30BF\u30B0\u306F\u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u3066\u304A\u308A\u3001RFC 4647\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\n\u30ED\u30B1\u30FC\u30EB\u306E\u4E00\u81F4\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u4F8B: en,ja,*-IN
+include-locales.description=BCP 47言語タグはカンマで区切られており、RFC 4647で定義されている\nロケールの一致が許可されています。例: en,ja,*-IN
 
-include-locales.usage=\  --include-locales <langtag>[,<langtag>]*\n                            BCP 47\u8A00\u8A9E\u30BF\u30B0\u306F\u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u3066\u304A\u308A\u3001RFC 4647\u3067\n                            \u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\n                            \u30ED\u30B1\u30FC\u30EB\u306E\u4E00\u81F4\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n                            \u4F8B: en,ja,*-IN
+include-locales.usage=\  --include-locales <langtag>[,<langtag>]*\n                            BCP 47言語タグはカンマで区切られており、RFC 4647で\n                            定義されている\n                            ロケールの一致が許可されています。\n                            例: en,ja,*-IN
 
-include-locales.missingpackages=jdk.localedata\u306B\u30ED\u30B1\u30FC\u30EB\u30FB\u30C7\u30FC\u30BF\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u3042\u308A\u307E\u305B\u3093:\n\t
+include-locales.missingpackages=jdk.localedataにロケール・データ・パッケージがありません:\n\t
 
-include-locales.nomatchinglocales="%s"\u306B\u4E00\u81F4\u3059\u308B\u30ED\u30B1\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u6307\u5B9A\u3057\u305F\u30D1\u30BF\u30FC\u30F3\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+include-locales.nomatchinglocales="%s"に一致するロケールが見つかりません。指定したパターンを確認してください。
 
-include-locales.invalidtag=\u8A00\u8A9E\u30BF\u30B0\u304C\u7121\u52B9\u3067\u3059: %s
+include-locales.invalidtag=言語タグが無効です: %s
 
-include-locales.localedatanotfound=jdk.localedata\u30E2\u30B8\u30E5\u30FC\u30EB\u306F--add-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+include-locales.localedatanotfound=jdk.localedataモジュールは--add-modulesオプションで指定されていません
 
-main.status.ok=\u52D5\u4F5C\u3057\u3066\u3044\u307E\u3059\u3002
+main.status.ok=動作しています。
 
-main.status.not.ok= \u52D5\u4F5C\u3057\u3066\u3044\u307E\u305B\u3093\u3002
+main.status.not.ok= 動作していません。
 
-plugin.plugins.header=\u4F7F\u7528\u53EF\u80FD\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8:
+plugin.plugins.header=使用可能なプラグイン・オプションのリスト:
 
-plugin.opt.list-plugins=\      --list-plugins                    \u4F7F\u7528\u53EF\u80FD\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+plugin.opt.list-plugins=\      --list-plugins                    使用可能なプラグインをリストします
 
-plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    \u6700\u5F8C\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u30EA\u30BD\u30FC\u30B9\u306E\u30BD\u30FC\u30C8\u3092\n                                        \u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059
+plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    最後のプラグインがリソースのソートを\n                                        許可されています
 
-plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     \u6307\u5B9A\u3057\u305F\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059
+plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     指定したプラグインを無効にします
 
-plugin.opt.compress=\      --compress <compress>             \u30EA\u30BD\u30FC\u30B9\u306E\u5727\u7E2E\u306B\u4F7F\u7528\u3059\u308B\u5727\u7E2E:\n                                        \u4F7F\u7528\u53EF\u80FD\u306A\u5024\u306F\n                                        zip-[0-9]\u3067\u3059\u3002zip-0\u3067\u306F\u5727\u7E2E\u306F\u884C\u308F\u308C\u305A\u3001\n                                        zip-9\u3067\u306F\u6700\u9069\u306A\u5727\u7E2E\u304C\u884C\u308F\u308C\u307E\u3059\u3002\n                                        \u30C7\u30D5\u30A9\u30EB\u30C8\u306Fzip-6\u3067\u3059\u3002\n                                        \u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u975E\u63A8\u5968\u306E\u5024:\n                                        0:  \u5727\u7E2E\u306A\u3057\u3002zip-0\u3068\u540C\u7B49\u3002\n                                        1:  \u5B9A\u6570\u6587\u5B57\u5217\u306E\u5171\u6709\n                                        2:  zip-6\u3068\u540C\u7B49\u3002
+plugin.opt.compress=\      --compress <compress>             リソースの圧縮に使用する圧縮:\n                                        使用可能な値は\n                                        zip-[0-9]です。zip-0では圧縮は行われず、\n                                        zip-9では最適な圧縮が行われます。\n                                        デフォルトはzip-6です。\n                                        今後のリリースで削除される非推奨の値:\n                                        0:  圧縮なし。zip-0と同等。\n                                        1:  定数文字列の共有\n                                        2:  zip-6と同等。
 
-plugin.opt.strip-debug=\  -G, --strip-debug                     \u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059
+plugin.opt.strip-debug=\  -G, --strip-debug                     デバッグ情報を削除します
 
-plugin.opt.no-man-pages=\      --no-man-pages                    man\u30DA\u30FC\u30B8\u3092\u9664\u5916\u3057\u307E\u3059
+plugin.opt.no-man-pages=\      --no-man-pages                    manページを除外します
 
-plugin.opt.no-header-files=\      --no-header-files                 \u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u30FB\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u9664\u5916\u3057\u307E\u3059
+plugin.opt.no-header-files=\      --no-header-files                 インクルード・ヘッダー・ファイルを除外します
 
-main.plugin.name=\u30D7\u30E9\u30B0\u30A4\u30F3\u540D
+main.plugin.name=プラグイン名
 
-main.plugin.class=\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9
+main.plugin.class=プラグイン・クラス
 
-main.plugin.module=\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB
+main.plugin.module=プラグイン・モジュール
 
-main.plugin.category=\u30AB\u30C6\u30B4\u30EA
+main.plugin.category=カテゴリ
 
-main.plugin.description=\u8AAC\u660E
+main.plugin.description=説明
 
-main.plugin.post.processors=\u30A4\u30E1\u30FC\u30B8\u30FB\u30DD\u30B9\u30C8\u30FB\u30D7\u30ED\u30BB\u30C3\u30B5:
+main.plugin.post.processors=イメージ・ポスト・プロセッサ:
 
-main.plugin.argument=\u5F15\u6570
+main.plugin.argument=引数
 
-main.plugin.range.from=\u7BC4\u56F2: \u81EA
+main.plugin.range.from=範囲: 自
 
-main.plugin.range.to=\u81F3
+main.plugin.range.to=至
 
-main.plugin.option=\u30AA\u30D7\u30B7\u30E7\u30F3
+main.plugin.option=オプション
 
 main.plugin.no.value=<empty>
 
-main.plugin.state=\u6A5F\u80FD\u72B6\u614B
+main.plugin.state=機能状態
 
-err.no.such.plugin=\u3053\u306E\u3088\u3046\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u3042\u308A\u307E\u305B\u3093: {0}
+err.no.such.plugin=このようなプラグインはありません: {0}
 
-err.provider.not.functional=\u30D7\u30ED\u30D0\u30A4\u30C0{0}\u306F\u6A5F\u80FD\u3057\u3066\u3044\u307E\u305B\u3093\u3002
+err.provider.not.functional=プロバイダ{0}は機能していません。
 
-err.plugin.multiple.options=\u8907\u6570\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C{0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u3088\u3063\u3066\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059
-err.plugin.conflicts={0} ({1})\u304C{2}\u3068\u77DB\u76FE\u3057\u3066\u3044\u307E\u3059\u3002\u3044\u305A\u308C\u304B\u4E00\u65B9\u3092\u4F7F\u7528\u3057\u3001\u4E21\u65B9\u3092\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
-err.provider.additional.arg.error={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u8FFD\u52A0\u306E\u5F15\u6570\u6307\u5B9A\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059: {1}
+err.plugin.multiple.options=複数のプラグインが{0}オプションによって有効になっています
+err.plugin.conflicts={0} ({1})が{2}と矛盾しています。いずれか一方を使用し、両方を使用しないでください。
+err.provider.additional.arg.error={0}オプションの追加の引数指定にエラーがあります: {1}
 
-err.no.plugins.path=\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30D1\u30B9\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+err.no.plugins.path=プラグイン・パス引数がありません。
 
-err.dir.already.exits=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059: {0}
+err.dir.already.exits=ディレクトリがすでに存在しています: {0}
 
-err.invalid.index=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306E\u7D22\u5F15\u304C\u7121\u52B9\u3067\u3059
+err.invalid.index=オプション{0}の索引が無効です
 
-err.plugin.option.not.set=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+err.plugin.option.not.set=オプション{0}を設定する必要があります。
 
-warn.thirdparty.plugins=\u30B5\u30FC\u30C9\u30FB\u30D1\u30FC\u30C6\u30A3\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\u3068\u3001\u4F7F\u7528\u3067\u304D\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u304C\u751F\u6210\u3055\u308C\u307E\u3059\u3002
+warn.thirdparty.plugins=サード・パーティのプラグインを有効にすると、使用できないイメージが生成されます。
 
-warn.thirdparty.plugins.enabled=\u30B5\u30FC\u30C9\u30FB\u30D1\u30FC\u30C6\u30A3\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3057\u305F\u3002
+warn.thirdparty.plugins.enabled=サード・パーティのプラグインを有効にしました。
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
index eb8f026e66d..819238e7d04 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
@@ -25,199 +25,199 @@
 
 add-options.argument=<options>
 
-add-options.description=\u5728\u751F\u6210\u7684\u6620\u50CF\u4E2D\u8C03\u7528\u865A\u62DF\u673A\u65F6\uFF0C\u5728\u4EFB\u4F55\n\u5176\u4ED6\u9009\u9879\u4E4B\u524D\u6DFB\u52A0\u6307\u5B9A\u7684 <options> \u5B57\u7B26\u4E32\n\uFF08\u53EF\u80FD\u5305\u542B\u7A7A\u683C\uFF09\u3002
+add-options.description=在生成的映像中调用虚拟机时，在任何\n其他选项之前添加指定的 <options> 字符串\n（可能包含空格）。
 
-add-options.usage=\  --add-options <options>   \u5728\u751F\u6210\u7684\u6620\u50CF\u4E2D\u8C03\u7528\u865A\u62DF\u673A\u65F6\uFF0C\u5728\u4EFB\u4F55\u5176\u4ED6\n                            \u9009\u9879\u4E4B\u524D\u6DFB\u52A0\u6307\u5B9A\u7684 <options> \u5B57\u7B26\u4E32\n                            \uFF08\u53EF\u80FD\u5305\u542B\u7A7A\u683C\uFF09\u3002
+add-options.usage=\  --add-options <options>   在生成的映像中调用虚拟机时，在任何其他\n                            选项之前添加指定的 <options> 字符串\n                            （可能包含空格）。
 
 release-info.argument=<file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>
 
-release-info.description=<file> \u9009\u9879\uFF1A\u4ECE\u63D0\u4F9B\u7684\u6587\u4EF6\u52A0\u8F7D release \u5C5E\u6027\u3002\nadd\uFF1A\u5411 'release' \u6587\u4EF6\u4E2D\u6DFB\u52A0\u5C5E\u6027\u3002\n\u53EF\u4EE5\u4F20\u9012\u4EFB\u610F\u6570\u91CF\u7684 <key>=<value> \u5BF9\u3002\ndel\uFF1A\u5220\u9664 release \u6587\u4EF6\u4E2D\u7684\u5173\u952E\u5B57\u5217\u8868\u3002
+release-info.description=<file> 选项：从提供的文件加载 release 属性。\nadd：向 'release' 文件中添加属性。\n可以传递任意数量的 <key>=<value> 对。\ndel：删除 release 文件中的关键字列表。
 
-release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file> \u9009\u9879\uFF1A\u4ECE\u63D0\u4F9B\u7684\u6587\u4EF6\n                            \u52A0\u8F7D release \u5C5E\u6027\u3002\n                            add\uFF1A\u5411 'release' \u6587\u4EF6\u4E2D\u6DFB\u52A0\u5C5E\u6027\u3002\n                            \u53EF\u4EE5\u4F20\u9012\u4EFB\u610F\u6570\u91CF\u7684 <key>=<value> \u5BF9\u3002\n                            del\uFF1A\u5220\u9664 release \u6587\u4EF6\u4E2D\u7684\u5173\u952E\u5B57\u5217\u8868\u3002
+release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file> 选项：从提供的文件\n                            加载 release 属性。\n                            add：向 'release' 文件中添加属性。\n                            可以传递任意数量的 <key>=<value> 对。\n                            del：删除 release 文件中的关键字列表。
 
 class-for-name.argument=
 
-class-for-name.description=\u7C7B\u4F18\u5316\uFF1A\u5C06 Class.forName \u8C03\u7528\u8F6C\u6362\u4E3A\u5E38\u91CF\u8D1F\u8F7D\u3002
+class-for-name.description=类优化：将 Class.forName 调用转换为常量负载。
 
-class-for-name.usage=\  --class-for-name          \u7C7B\u4F18\u5316\uFF1A\u5C06 Class.forName \u8C03\u7528\u8F6C\u6362\u4E3A\u5E38\u91CF\u8D1F\u8F7D\u3002
+class-for-name.usage=\  --class-for-name          类优化：将 Class.forName 调用转换为常量负载。
 
 compress.argument=<zip-[0-9]>[:filter=<pattern-list>]
 
-compress.description= \u8981\u5728\u538B\u7F29\u8D44\u6E90\u65F6\u4F7F\u7528\u7684\u538B\u7F29\u3002
+compress.description= 要在压缩资源时使用的压缩。
 
-compress.usage=\  --compress <compress>     \u8981\u5728\u538B\u7F29\u8D44\u6E90\u65F6\u4F7F\u7528\u7684\u538B\u7F29\uFF1A\n                            \u63A5\u53D7\u7684\u503C\u4E3A\uFF1A\n                            zip-[0-9]\uFF0C\u5176\u4E2D zip-0 \u8868\u793A\u65E0\u538B\u7F29\uFF0C\n                            zip-9 \u8868\u793A\u6700\u4F73\u538B\u7F29\u3002\n                            \u9ED8\u8BA4\u503C\u4E3A zip-6\u3002
+compress.usage=\  --compress <compress>     要在压缩资源时使用的压缩：\n                            接受的值为：\n                            zip-[0-9]，其中 zip-0 表示无压缩，\n                            zip-9 表示最佳压缩。\n                            默认值为 zip-6。
 
-compress.warn.argumentdeprecated=\u8B66\u544A\uFF1A--compress \u7684 {0} \u53C2\u6570\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664
+compress.warn.argumentdeprecated=警告：--compress 的 {0} 参数已过时，可能会在未来发行版中删除
 
 
 dedup-legal-notices.argument=[error-if-not-same-content]
 
-dedup-legal-notices.description=\u5220\u9664\u6240\u6709\u6CD5\u5F8B\u58F0\u660E\u4E2D\u7684\u91CD\u590D\u6570\u636E\u3002\u5982\u679C\u6307\u5B9A\n\u4E86 error-if-not-same-content\uFF0C\u5219\u5728\u4E24\u4E2A\u540C\u540D\u7684\u6587\u4EF6\n\u4E0D\u540C\u65F6\u5C06\u51FA\u73B0\u9519\u8BEF\u3002
+dedup-legal-notices.description=删除所有法律声明中的重复数据。如果指定\n了 error-if-not-same-content，则在两个同名的文件\n不同时将出现错误。
 
-dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            \u5220\u9664\u6240\u6709\u6CD5\u5F8B\u58F0\u660E\u4E2D\u7684\u91CD\u590D\u6570\u636E\u3002\n                            \u5982\u679C\u6307\u5B9A\u4E86 error-if-not-same-content\uFF0C\n                            \u5219\u5728\u4E24\u4E2A\u540C\u540D\u7684\u6587\u4EF6\u4E0D\u540C\u65F6\n                            \u5C06\u51FA\u73B0\u9519\u8BEF\u3002
+dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            删除所有法律声明中的重复数据。\n                            如果指定了 error-if-not-same-content，\n                            则在两个同名的文件不同时\n                            将出现错误。
 
-exclude-files.argument=\u8981\u6392\u9664\u7684\u6587\u4EF6\u7684 <pattern-list>
+exclude-files.argument=要排除的文件的 <pattern-list>
 
-exclude-files.description=\u6307\u5B9A\u8981\u6392\u9664\u7684\u6587\u4EF6\u3002\u4F8B\u5982\uFF1A**.java,glob:/java.base/lib/client/**
+exclude-files.description=指定要排除的文件。例如：**.java,glob:/java.base/lib/client/**
 
-exclude-files.usage=\  --exclude-files <pattern-list>\n                            \u6307\u5B9A\u8981\u6392\u9664\u7684\u6587\u4EF6\u3002\n                            \u4F8B\u5982\uFF1A**.java,glob:/java.base/lib/client/**
+exclude-files.usage=\  --exclude-files <pattern-list>\n                            指定要排除的文件。\n                            例如：**.java,glob:/java.base/lib/client/**
 
-exclude-resources.argument=\u8981\u6392\u9664\u7684 <pattern-list> \u8D44\u6E90
+exclude-resources.argument=要排除的 <pattern-list> 资源
 
-exclude-resources.description=\u6307\u5B9A\u8981\u6392\u9664\u7684\u8D44\u6E90\u3002\u4F8B\u5982\uFF1A**.jcov,glob:**/META-INF/**
+exclude-resources.description=指定要排除的资源。例如：**.jcov,glob:**/META-INF/**
 
-exclude-resources.usage=\  --exclude-resources <pattern-list>\n                            \u6307\u5B9A\u8981\u6392\u9664\u7684\u8D44\u6E90\u3002\n                            \u4F8B\u5982\uFF1A**.jcov,glob:**/META-INF/**
+exclude-resources.usage=\  --exclude-resources <pattern-list>\n                            指定要排除的资源。\n                            例如：**.jcov,glob:**/META-INF/**
 
-exclude-jmod-section.argument=<section-name>\n\u5176\u4E2D\uFF0C<section-name> \u662F "man" \u6216 "headers"\u3002
+exclude-jmod-section.argument=<section-name>\n其中，<section-name> 是 "man" 或 "headers"。
 
-exclude-jmod-section.description=\u6307\u5B9A\u8981\u6392\u9664\u7684 JMOD \u8282
+exclude-jmod-section.description=指定要排除的 JMOD 节
 
-exclude-jmod-section.usage=\  --exclude-jmod-section <section-name>\n                            \u6307\u5B9A\u8981\u6392\u9664\u7684 JMOD \u8282\u3002\n                            \u5176\u4E2D\uFF0C<section-name> \u662F "man" \u6216 "headers"\u3002
+exclude-jmod-section.usage=\  --exclude-jmod-section <section-name>\n                            指定要排除的 JMOD 节。\n                            其中，<section-name> 是 "man" 或 "headers"。
 
 
-generate-cds-archive.description=CDS \u63D2\u4EF6\uFF1A\u5982\u679C\u8FD0\u884C\u65F6\u6620\u50CF\u652F\u6301 CDS \u529F\u80FD\uFF0C\u5219\u751F\u6210 CDS \u6863\u6848\u3002\n
-generate-cds-archive.usage=\  --generate-cds-archive    \u5982\u679C\u8FD0\u884C\u65F6\u6620\u50CF\u652F\u6301 CDS \u529F\u80FD\uFF0C\n                            \u5219\u751F\u6210 CDS \u6863\u6848\u3002
+generate-cds-archive.description=CDS 插件：如果运行时映像支持 CDS 功能，则生成 CDS 档案。\n
+generate-cds-archive.usage=\  --generate-cds-archive    如果运行时映像支持 CDS 功能，\n                            则生成 CDS 档案。
 
 generate-jli-classes.argument=@filename
 
-generate-jli-classes.description=\u6307\u5B9A\u4E00\u4E2A\u6587\u4EF6\uFF0C\u5176\u4E2D\u5217\u51FA\u4E86\u8981\u9884\u5148\u751F\u6210\u7684 java.lang.invoke \u7C7B\u3002\n\u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6B64\u63D2\u4EF6\u53EF\u4EE5\u4F7F\u7528\u8981\u9884\u5148\u751F\u6210\u7684\u5185\u7F6E\u7C7B\u5217\u8868\u3002\n\u5982\u679C\u6B64\u63D2\u4EF6\u4E0E\u6B63\u5728\u521B\u5EFA\u7684\u6620\u50CF\u5728\u4E0D\u540C\u7684\u8FD0\u884C\u65F6\u7248\u672C\u4E0A\u8FD0\u884C\uFF0C\n\u5219\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u5C06\u7981\u7528\u4EE3\u7801\u751F\u6210\u4EE5\u786E\u4FDD\n\u6B63\u786E\u6027 - \u6DFB\u52A0 iignore-version=true \u53EF\u8986\u76D6\u6B64\u9879\u3002
+generate-jli-classes.description=指定一个文件，其中列出了要预先生成的 java.lang.invoke 类。\n默认情况下，此插件可以使用要预先生成的内置类列表。\n如果此插件与正在创建的映像在不同的运行时版本上运行，\n则默认情况下将禁用代码生成以确保\n正确性 - 添加 iignore-version=true 可覆盖此项。
 
-generate-jli-classes.usage=\  --generate-jli-classes @filename\n                            \u6307\u5B9A\u4E00\u4E2A\u6587\u4EF6\uFF0C\u5176\u4E2D\u5217\u51FA\u4E86\u8981\n                            \u9884\u5148\u751F\u6210\u7684 java.lang.invoke \u7C7B\u3002\n                            \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6B64\u63D2\u4EF6\u53EF\u4EE5\u4F7F\u7528\n                            \u8981\u9884\u5148\u751F\u6210\u7684\u5185\u7F6E\u7C7B\u5217\u8868\u3002\u5982\u679C\u6B64\u63D2\u4EF6\u4E0E\n                            \u6B63\u5728\u521B\u5EFA\u7684\u6620\u50CF\u5728\u4E0D\u540C\u7684\u8FD0\u884C\u65F6\u7248\u672C\u4E0A\u8FD0\u884C\uFF0C\n                            \u5219\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u5C06\u7981\u7528\u4EE3\u7801\u751F\u6210\u4EE5\u786E\u4FDD\n                            \u6B63\u786E\u6027 - \u6DFB\u52A0 iignore-version=true\n                            \u53EF\u8986\u76D6\u6B64\u9009\u9879\u3002
+generate-jli-classes.usage=\  --generate-jli-classes @filename\n                            指定一个文件，其中列出了要\n                            预先生成的 java.lang.invoke 类。\n                            默认情况下，此插件可以使用\n                            要预先生成的内置类列表。如果此插件与\n                            正在创建的映像在不同的运行时版本上运行，\n                            则默认情况下将禁用代码生成以确保\n                            正确性 - 添加 iignore-version=true\n                            可覆盖此选项。
 
-system-modules.argument=batch-size=<N> \u8BBE\u7F6E\u6A21\u5757\u63CF\u8FF0\u7B26\u7684\u6279\u5927\u5C0F\n                       \u4EE5\u907F\u514D\u8D85\u8FC7\u65B9\u6CD5\u957F\u5EA6\u9650\u5236\u3002\n                       \u9ED8\u8BA4\u6279\u5927\u5C0F\u4E3A 75\u3002
+system-modules.argument=batch-size=<N> 设置模块描述符的批大小\n                       以避免超过方法长度限制。\n                       默认批大小为 75。
 
-system-modules.usage=\  --system-modules [batch-size=<N>]\n                            \u6279\u5927\u5C0F\u6307\u5B9A\u5728\u4E00\u4E2A\u65B9\u6CD5\u4E2D\u5904\u7406\u7684\n                            \u6700\u5927\u6A21\u5757\u6570\uFF0C\u4EE5\u89E3\u51B3\u751F\u6210\u7684\u5B57\u8282\u7801\n                            \u8D85\u8FC7\u65B9\u6CD5\u5927\u5C0F\u9650\u5236\u7684\u95EE\u9898\u3002\n                            \u9ED8\u8BA4\u6279\u5927\u5C0F\u4E3A 75\u3002
+system-modules.usage=\  --system-modules [batch-size=<N>]\n                            批大小指定在一个方法中处理的\n                            最大模块数，以解决生成的字节码\n                            超过方法大小限制的问题。\n                            默认批大小为 75。
 
 onoff.argument=<on|off>
 
-order-resources.argument=\u4F18\u5148\u7EA7\u987A\u5E8F\u4E2D\u8DEF\u5F84\u7684 <pattern-list>\u3002\u5982\u679C\n\u6307\u5B9A\u4E86 @file\uFF0C\u5219\u6BCF\u884C\u90FD\u5E94\u662F\u8981\u6392\u5E8F\u7684\u8DEF\u5F84\u7684\u5B8C\u5168\u5339\u914D\u9879
+order-resources.argument=优先级顺序中路径的 <pattern-list>。如果\n指定了 @file，则每行都应是要排序的路径的完全匹配项
 
-order-resources.description=\u5BF9\u8D44\u6E90\u8FDB\u884C\u6392\u5E8F\u3002\u4F8B\u5982\uFF1A**/module-info.class,@classlist,/java.base/java/lang/**
+order-resources.description=对资源进行排序。例如：**/module-info.class,@classlist,/java.base/java/lang/**
 
-order-resources.usage=\  --order-resources <pattern-list>\n                            \u5BF9\u8D44\u6E90\u8FDB\u884C\u6392\u5E8F\u3002\n                            \u4F8B\u5982\uFF1A**/module-info.class,@classlist,\n                            /java.base/java/lang/**
+order-resources.usage=\  --order-resources <pattern-list>\n                            对资源进行排序。\n                            例如：**/module-info.class,@classlist,\n                            /java.base/java/lang/**
 
 save-jlink-argfiles.argument=<filenames>
 
-save-jlink-argfiles.description=\u4FDD\u5B58\u6307\u5B9A\u53C2\u6570\u6587\u4EF6\uFF0C\u6587\u4EF6\u4E2D\u5305\u542B\u8981\u9644\u52A0\u5230\u8F93\u51FA\u6620\u50CF\u4E2D\u6267\u884C jlink \u4E4B\u524D\u7684\u53C2\u6570\u3002\n<filenames> \u662F\u547D\u4EE4\u884C\u53C2\u6570\u6587\u4EF6\u5217\u8868\uFF08\u6587\u4EF6\u4EE5 ':' \u5206\u9694\uFF0C\u5728 Windows \u4E0A\u4EE5 ';' \u5206\u9694\uFF09\u3002
+save-jlink-argfiles.description=保存指定参数文件，文件中包含要附加到输出映像中执行 jlink 之前的参数。\n<filenames> 是命令行参数文件列表（文件以 ':' 分隔，在 Windows 上以 ';' 分隔）。
 
-save-jlink-argfiles.usage=\  --save-jlink-argfiles <filenames>\n                            \u4FDD\u5B58\u6307\u5B9A\u53C2\u6570\u6587\u4EF6\uFF0C\u6587\u4EF6\u4E2D\u5305\u542B\u8981\u9644\u52A0\u5230\n                            \u8F93\u51FA\u6620\u50CF\u4E2D\u6267\u884C jlink \u4E4B\u524D\u7684\u53C2\u6570\u3002\n                            <filenames> \u662F\u547D\u4EE4\u884C\u53C2\u6570\u6587\u4EF6\u5217\u8868\n                            \uFF08\u6587\u4EF6\u4EE5 ':' \u5206\u9694\uFF0C\u5728 Windows \u4E0A\u4EE5 ';' \u5206\u9694\uFF09\u3002
+save-jlink-argfiles.usage=\  --save-jlink-argfiles <filenames>\n                            保存指定参数文件，文件中包含要附加到\n                            输出映像中执行 jlink 之前的参数。\n                            <filenames> 是命令行参数文件列表\n                            （文件以 ':' 分隔，在 Windows 上以 ';' 分隔）。
 
-strip-debug.description=\u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u53BB\u9664\u8C03\u8BD5\u4FE1\u606F
+strip-debug.description=从输出映像中去除调试信息
 
-strip-debug.usage=\  --strip-debug             \u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u53BB\u9664\u8C03\u8BD5\u4FE1\u606F
+strip-debug.usage=\  --strip-debug             从输出映像中去除调试信息
 
-strip-java-debug-attributes.description=\u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u7C7B\u4E2D\u53BB\u9664 Java \u8C03\u8BD5\u4FE1\u606F
+strip-java-debug-attributes.description=从输出映像中的类中去除 Java 调试信息
 
-strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            \u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u7C7B\u4E2D\n                            \u53BB\u9664 Java \u8C03\u8BD5\u5C5E\u6027
+strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            从输出映像中的类中\n                            去除 Java 调试属性
 
-strip-native-commands.description=\u4ECE\u6620\u50CF\u4E2D\u6392\u9664\u672C\u673A\u547D\u4EE4\uFF08\u5982 java/java.exe\uFF09
+strip-native-commands.description=从映像中排除本机命令（如 java/java.exe）
 
-strip-native-commands.usage=\  --strip-native-commands   \u4ECE\u6620\u50CF\u4E2D\u6392\u9664\u672C\u673A\u547D\u4EE4\n                            \uFF08\u5982 java/java.exe\uFF09\u3002
+strip-native-commands.usage=\  --strip-native-commands   从映像中排除本机命令\n                            （如 java/java.exe）。
 
 vendor-version.argument=<vendor-version>
 
-vendor-version.description=\u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546\u7248\u672C\u5B57\u7B26\u4E32\uFF08\u5982\u679C\u6709\uFF09\u3002\n\u7CFB\u7EDF\u5C5E\u6027 "java.vendor.version" \u7684\u503C\u5C06\u4E3A <vendor-version>\u3002
+vendor-version.description=覆盖植入到工作版本中的供应商版本字符串（如果有）。\n系统属性 "java.vendor.version" 的值将为 <vendor-version>。
 
-vendor-version.usage=\  --vendor-version <vendor-version>\n                            \u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546\u7248\u672C\u5B57\u7B26\u4E32\n                            \uFF08\u5982\u679C\u6709\uFF09\u3002\u7CFB\u7EDF\u5C5E\u6027 "java.vendor.version" \u7684\n                            \u503C\u5C06\u4E3A <vendor-version>\u3002
+vendor-version.usage=\  --vendor-version <vendor-version>\n                            覆盖植入到工作版本中的供应商版本字符串\n                            （如果有）。系统属性 "java.vendor.version" 的\n                            值将为 <vendor-version>。
 
 vendor-bug-url.argument=<vendor-bug-url>
 
-vendor-bug-url.description=\u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 Bug URL\u3002\u7CFB\u7EDF\n\u5C5E\u6027 "java.vendor.url.bug" \u7684\u503C\u5C06\u4E3A <vendor-url-bug>\u3002
+vendor-bug-url.description=覆盖植入到工作版本中的供应商 Bug URL。系统\n属性 "java.vendor.url.bug" 的值将为 <vendor-url-bug>。
 
-vendor-bug-url.usage=\  --vendor-bug-url <vendor-bug-url>\n                            \u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 Bug URL\u3002\n                            \u7CFB\u7EDF\u5C5E\u6027 "java.vendor.url.bug" \u7684\n                            \u503C\u5C06\u4E3A <vendor-url-bug>\u3002
+vendor-bug-url.usage=\  --vendor-bug-url <vendor-bug-url>\n                            覆盖植入到工作版本中的供应商 Bug URL。\n                            系统属性 "java.vendor.url.bug" 的\n                            值将为 <vendor-url-bug>。
 
 vendor-vm-bug-url.argument=<vendor-vm-bug-url>
 
-vendor-vm-bug-url.description=\u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 VM Bug URL\u3002VM \u9519\u8BEF\n\u65E5\u5FD7\u4E2D\u663E\u793A\u7684 URL \u5C06\u4E3A <vendor-vm-bug-url>\u3002
+vendor-vm-bug-url.description=覆盖植入到工作版本中的供应商 VM Bug URL。VM 错误\n日志中显示的 URL 将为 <vendor-vm-bug-url>。
 
-vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            \u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 VM Bug URL\u3002\n                            VM \u9519\u8BEF\u65E5\u5FD7\u4E2D\u663E\u793A\u7684 URL \u5C06\n                            \u4E3A <vendor-vm-bug-url>\u3002
+vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            覆盖植入到工作版本中的供应商 VM Bug URL。\n                            VM 错误日志中显示的 URL 将\n                            为 <vendor-vm-bug-url>。
 
 vm.argument=<client|server|minimal|all>
 
-vm.description=\u5728\u8F93\u51FA\u6620\u50CF\u4E2D\u9009\u62E9 HotSpot VM\u3002\u9ED8\u8BA4\u503C\u4E3A all
+vm.description=在输出映像中选择 HotSpot VM。默认值为 all
 
-vm.usage=\  --vm <client|server|minimal|all>\n                            \u5728\u8F93\u51FA\u6620\u50CF\u4E2D\u9009\u62E9 HotSpot VM\u3002\n                            \u9ED8\u8BA4\u503C\u4E3A all
+vm.usage=\  --vm <client|server|minimal|all>\n                            在输出映像中选择 HotSpot VM。\n                            默认值为 all
 
-zip.argument=[\u9017\u53F7\u5206\u9694\u7684\u8D44\u6E90\u8DEF\u5F84\u5217\u8868]
+zip.argument=[逗号分隔的资源路径列表]
 
-zip.description=ZIP \u538B\u7F29
+zip.description=ZIP 压缩
 
-zip.usage=\  --zip [\u9017\u53F7\u5206\u9694\u7684\u8D44\u6E90\u8DEF\u5F84\u5217\u8868]\n                            ZIP \u538B\u7F29
+zip.usage=\  --zip [逗号分隔的资源路径列表]\n                            ZIP 压缩
 
 include-locales.argument=<langtag>[,<langtag>]*
 
-include-locales.description=\u9017\u53F7\u5206\u9694\u7684 BCP 47 \u8BED\u8A00\u6807\u8BB0\uFF0C\u5141\u8BB8\u4F7F\u7528\u5728 RFC 4647 \u4E2D\u5B9A\u4E49\u7684\n\u533A\u57DF\u8BBE\u7F6E\u5339\u914D\u3002\u4F8B\u5982\uFF1Aen,ja,*-IN
+include-locales.description=逗号分隔的 BCP 47 语言标记，允许使用在 RFC 4647 中定义的\n区域设置匹配。例如：en,ja,*-IN
 
-include-locales.usage=\  --include-locales <langtag>[,<langtag>]*\n                            \u9017\u53F7\u5206\u9694\u7684 BCP 47 \u8BED\u8A00\u6807\u8BB0\uFF0C\n                            \u5141\u8BB8\u4F7F\u7528\n                            \u5728 RFC 4647 \u4E2D\u5B9A\u4E49\u7684\u533A\u57DF\u8BBE\u7F6E\u5339\u914D\u3002\n                            \u4F8B\u5982\uFF1Aen,ja,*-IN
+include-locales.usage=\  --include-locales <langtag>[,<langtag>]*\n                            逗号分隔的 BCP 47 语言标记，\n                            允许使用\n                            在 RFC 4647 中定义的区域设置匹配。\n                            例如：en,ja,*-IN
 
-include-locales.missingpackages=jdk.localedata \u4E2D\u7F3A\u5C11\u533A\u57DF\u8BBE\u7F6E\u6570\u636E\u7A0B\u5E8F\u5305\uFF1A\n\t
+include-locales.missingpackages=jdk.localedata 中缺少区域设置数据程序包：\n\t
 
-include-locales.nomatchinglocales=\u5BF9\u4E8E "%s"\uFF0C\u627E\u4E0D\u5230\u5339\u914D\u7684\u533A\u57DF\u8BBE\u7F6E\u3002\u8BF7\u68C0\u67E5\u6307\u5B9A\u7684\u6A21\u5F0F\u3002
+include-locales.nomatchinglocales=对于 "%s"，找不到匹配的区域设置。请检查指定的模式。
 
-include-locales.invalidtag=\u65E0\u6548\u7684\u8BED\u8A00\u6807\u8BB0\uFF1A%s
+include-locales.invalidtag=无效的语言标记：%s
 
-include-locales.localedatanotfound=\u672A\u4F7F\u7528 --add-modules \u9009\u9879\u6307\u5B9A jdk.localedata \u6A21\u5757
+include-locales.localedatanotfound=未使用 --add-modules 选项指定 jdk.localedata 模块
 
-main.status.ok=\u8D77\u4F5C\u7528\u3002
+main.status.ok=起作用。
 
-main.status.not.ok= \u4E0D\u8D77\u4F5C\u7528\u3002
+main.status.not.ok= 不起作用。
 
-plugin.plugins.header=\u53EF\u7528\u63D2\u4EF6\u9009\u9879\u7684\u5217\u8868\uFF1A
+plugin.plugins.header=可用插件选项的列表：
 
-plugin.opt.list-plugins=\      --list-plugins                    \u5217\u51FA\u53EF\u7528\u63D2\u4EF6
+plugin.opt.list-plugins=\      --list-plugins                    列出可用插件
 
-plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    \u5141\u8BB8\u5BF9\u8D44\u6E90\u8FDB\u884C\u6392\u5E8F\u7684\n                                        \u6700\u540E\u4E00\u4E2A\u63D2\u4EF6
+plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    允许对资源进行排序的\n                                        最后一个插件
 
-plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     \u7981\u7528\u6240\u63D0\u53CA\u7684\u63D2\u4EF6
+plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     禁用所提及的插件
 
-plugin.opt.compress=\      --compress <compress>             \u8981\u5728\u538B\u7F29\u8D44\u6E90\u65F6\u4F7F\u7528\u7684\u538B\u7F29\uFF1A\n                                        \u63A5\u53D7\u7684\u503C\u4E3A\uFF1A\n                                        zip-[0-9]\uFF0C\u5176\u4E2D zip-0 \u8868\u793A\u65E0\u538B\u7F29\uFF0C\n                                        zip-9 \u8868\u793A\u6700\u4F73\u538B\u7F29\u3002\n                                        \u9ED8\u8BA4\u503C\u4E3A zip-6\u3002\n                                        \u8981\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u7684\u5DF2\u8FC7\u65F6\u503C\uFF1A\n                                        0\uFF1A\u65E0\u538B\u7F29\u3002\u7B49\u540C\u4E8E zip-0\u3002\n                                        1\uFF1A\u5E38\u91CF\u5B57\u7B26\u4E32\u5171\u4EAB\n                                        2\uFF1A\u7B49\u540C\u4E8E zip-6\u3002
+plugin.opt.compress=\      --compress <compress>             要在压缩资源时使用的压缩：\n                                        接受的值为：\n                                        zip-[0-9]，其中 zip-0 表示无压缩，\n                                        zip-9 表示最佳压缩。\n                                        默认值为 zip-6。\n                                        要在未来发行版中删除的已过时值：\n                                        0：无压缩。等同于 zip-0。\n                                        1：常量字符串共享\n                                        2：等同于 zip-6。
 
-plugin.opt.strip-debug=\  -G, --strip-debug                     \u53BB\u9664\u8C03\u8BD5\u4FE1\u606F
+plugin.opt.strip-debug=\  -G, --strip-debug                     去除调试信息
 
-plugin.opt.no-man-pages=\      --no-man-pages                    \u6392\u9664\u624B\u518C\u9875
+plugin.opt.no-man-pages=\      --no-man-pages                    排除手册页
 
-plugin.opt.no-header-files=\      --no-header-files                 \u6392\u9664\u5305\u542B\u6807\u5934\u6587\u4EF6
+plugin.opt.no-header-files=\      --no-header-files                 排除包含标头文件
 
-main.plugin.name=\u63D2\u4EF6\u540D\u79F0
+main.plugin.name=插件名称
 
-main.plugin.class=\u63D2\u4EF6\u7C7B
+main.plugin.class=插件类
 
-main.plugin.module=\u63D2\u4EF6\u6A21\u5757
+main.plugin.module=插件模块
 
-main.plugin.category=\u7C7B\u522B
+main.plugin.category=类别
 
-main.plugin.description=\u8BF4\u660E
+main.plugin.description=说明
 
-main.plugin.post.processors=\u6620\u50CF\u540E\u5904\u7406\u7A0B\u5E8F\uFF1A
+main.plugin.post.processors=映像后处理程序：
 
-main.plugin.argument=\u53C2\u6570
+main.plugin.argument=参数
 
-main.plugin.range.from=\u8303\u56F4\u8D77\u70B9
+main.plugin.range.from=范围起点
 
-main.plugin.range.to=\u5230
+main.plugin.range.to=到
 
-main.plugin.option=\u9009\u9879
+main.plugin.option=选项
 
-main.plugin.no.value=<\u7A7A>
+main.plugin.no.value=<空>
 
-main.plugin.state=\u529F\u80FD\u72B6\u6001
+main.plugin.state=功能状态
 
-err.no.such.plugin=\u6CA1\u6709\u8FD9\u6837\u7684\u63D2\u4EF6\uFF1A{0}
+err.no.such.plugin=没有这样的插件：{0}
 
-err.provider.not.functional=\u63D0\u4F9B\u65B9 {0} \u4E0D\u8D77\u4F5C\u7528\u3002
+err.provider.not.functional=提供方 {0} 不起作用。
 
-err.plugin.multiple.options={0} \u9009\u9879\u542F\u7528\u4E86\u591A\u4E2A\u63D2\u4EF6
-err.plugin.conflicts={0} ({1}) \u4E0E {2} \u51B2\u7A81\u3002\u8BF7\u4F7F\u7528\u5176\u4E2D\u7684\u4EFB\u610F\u4E00\u4E2A\uFF0C\u4F46\u4E0D\u80FD\u540C\u65F6\u4F7F\u7528\u4E8C\u8005\u3002
-err.provider.additional.arg.error={0} \u9009\u9879\u4E2D\u7684\u5176\u4ED6\u53C2\u6570\u89C4\u8303\u6709\u8BEF\uFF1A{1}
+err.plugin.multiple.options={0} 选项启用了多个插件
+err.plugin.conflicts={0} ({1}) 与 {2} 冲突。请使用其中的任意一个，但不能同时使用二者。
+err.provider.additional.arg.error={0} 选项中的其他参数规范有误：{1}
 
-err.no.plugins.path=\u6CA1\u6709\u63D2\u4EF6\u8DEF\u5F84\u53C2\u6570\u3002
+err.no.plugins.path=没有插件路径参数。
 
-err.dir.already.exits=\u76EE\u5F55\u5DF2\u5B58\u5728\uFF1A{0}
+err.dir.already.exits=目录已存在：{0}
 
-err.invalid.index=\u9009\u9879 {0} \u7684\u7D22\u5F15\u65E0\u6548
+err.invalid.index=选项 {0} 的索引无效
 
-err.plugin.option.not.set=\u5FC5\u987B\u8BBE\u7F6E\u9009\u9879 {0}\u3002
+err.plugin.option.not.set=必须设置选项 {0}。
 
-warn.thirdparty.plugins=\u542F\u7528\u7B2C\u4E09\u65B9\u63D2\u4EF6\u53EF\u80FD\u4F1A\u5BFC\u81F4\u751F\u6210\u7684\u6620\u50CF\u65E0\u6CD5\u4F7F\u7528\u3002
+warn.thirdparty.plugins=启用第三方插件可能会导致生成的映像无法使用。
 
-warn.thirdparty.plugins.enabled=\u60A8\u5DF2\u542F\u7528\u7B2C\u4E09\u65B9\u63D2\u4EF6\u3002
+warn.thirdparty.plugins.enabled=您已启用第三方插件。
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
index 8e33c968966..84abaee4ce3 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
@@ -25,7 +25,7 @@
 
 jmod.description=JMOD-Dateien erstellen und den Inhalt vorhandener JMOD-Dateien auflisten
 
-main.usage.summary=Verwendung: {0} (create|extract|list|describe|hash) <OPTIONEN> <jmod-file>\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+main.usage.summary=Verwendung: {0} (create|extract|list|describe|hash) <OPTIONEN> <jmod-file>\nMit --help können Sie eine Liste der möglichen Optionen aufrufen
 
 main.usage=Verwendung: {0} (create|extract|list|describe|hash) <OPTIONEN> <jmod-Datei>\n
 error.prefix=Fehler:
@@ -34,20 +34,20 @@ warn.prefix=Warnung:
 main.opt.mode=Hauptvorgangsmodi:
 main.opt.mode.create=create    - Erstellt ein neues jmod-Archiv
 main.opt.mode.extract=extract   - Extrahiert alle Dateien aus dem Archiv
-main.opt.mode.list=list      - Gibt die Namen aller Eintr\u00E4ge aus
+main.opt.mode.list=list      - Gibt die Namen aller Einträge aus
 main.opt.mode.describe=describe  - Gibt die Moduldetails aus
 main.opt.mode.hash=hash      - Erfasst die Hashes gebundener Module.
 
 main.opt.help=Gibt diese Hilfemeldung aus
-main.opt.help-extra=Gibt Hilfe zu zus\u00E4tzlichen Optionen aus
+main.opt.help-extra=Gibt Hilfe zu zusätzlichen Optionen aus
 main.opt.version=Versionsinformationen
 main.opt.class-path=Anwendungs-JAR-Dateien|Verzeichnis mit den Klassen
 main.opt.libs=Speicherort der nativen Librarys
 main.opt.cmds=Speicherort der nativen Befehle
 main.opt.config=Speicherort der vom Benutzer editierbaren Konfigurationsdateien
-main.opt.extractDir=Zielverzeichnis f\u00FCr Extraktion
+main.opt.extractDir=Zielverzeichnis für Extraktion
 main.opt.dry-run=Testlauf des Hashmodus
-main.opt.exclude=Schlie\u00DFt Dateien aus, die der angegebenen kommagetrennten Musterliste entsprechen. Jedes Element verwendet eines der folgenden Formate: <Globales Muster>, glob:<Globales Muster> oder regex:<Regex-Muster>
+main.opt.exclude=Schließt Dateien aus, die der angegebenen kommagetrennten Musterliste entsprechen. Jedes Element verwendet eines der folgenden Formate: <Globales Muster>, glob:<Globales Muster> oder regex:<Regex-Muster>
 main.opt.header-files=Speicherort der Headerdateien
 main.opt.legal-notices=Speicherort der rechtlichen Hinweise
 main.opt.module-version= Modulversion
@@ -57,14 +57,14 @@ main.opt.man-pages=Speicherort der Manpages
 main.opt.target-platform=Zielplattform
 main.opt.target-platform.arg=target-platform
 main.opt.module-path=Modulpfad
-main.opt.hash-modules=Berechnet und erfasst Hashes zur Bindung eines in ein Package integrierten Moduls an Module, die dem angegebenen <Regex-Muster> entsprechen und direkt oder indirekt davon abh\u00E4ngen. Die Hashes werden in der erstellten JMOD-Datei oder in einer JMOD- oder modularen JAR-Datei in dem Modulpfad erfasst, der im jmod-Hashbefehl angegeben ist.
-main.opt.do-not-resolve-by-default=Aus dem Standard-Root-Set von Modulen ausschlie\u00DFen
-main.opt.warn-if-resolved=Hinweis f\u00FCr ein Tool, eine Warnung auszugeben, wenn das Modul aufgel\u00F6st wird, entweder "deprecated", "deprecated-for-removal" oder "incubating"
-main.opt.date=Datum und Uhrzeit f\u00FCr die Zeitstempel von Eintr\u00E4gen, angegeben im erweiterten Datums-/Uhrzeitformat mit Zeitunterschied und optionaler Zeitzone nach ISO-8601. Beispiel: "2022-02-12T12:30:00-05:00"
+main.opt.hash-modules=Berechnet und erfasst Hashes zur Bindung eines in ein Package integrierten Moduls an Module, die dem angegebenen <Regex-Muster> entsprechen und direkt oder indirekt davon abhängen. Die Hashes werden in der erstellten JMOD-Datei oder in einer JMOD- oder modularen JAR-Datei in dem Modulpfad erfasst, der im jmod-Hashbefehl angegeben ist.
+main.opt.do-not-resolve-by-default=Aus dem Standard-Root-Set von Modulen ausschließen
+main.opt.warn-if-resolved=Hinweis für ein Tool, eine Warnung auszugeben, wenn das Modul aufgelöst wird, entweder "deprecated", "deprecated-for-removal" oder "incubating"
+main.opt.date=Datum und Uhrzeit für die Zeitstempel von Einträgen, angegeben im erweiterten Datums-/Uhrzeitformat mit Zeitunterschied und optionaler Zeitzone nach ISO-8601. Beispiel: "2022-02-12T12:30:00-05:00"
 
 main.opt.cmdfile=Liest Optionen aus der angegebenen Datei
 
-main.opt.compress=Die bei der Erstellung des JMOD-Archivs zu verwendende Komprimierung. Zul\u00E4ssige Werte: zip-[0-9], wobei zip-0 f\u00FCr keine Komprimierung und zip-9 f\u00FCr die beste Komprimierung steht. Standardwert ist zip-6.
+main.opt.compress=Die bei der Erstellung des JMOD-Archivs zu verwendende Komprimierung. Zulässige Werte: zip-[0-9], wobei zip-0 für keine Komprimierung und zip-9 für die beste Komprimierung steht. Standardwert ist zip-6.
 
 module.hashes.recorded=Hashes werden im Modul {0} erfasst
 
@@ -73,32 +73,32 @@ err.invalid.mode=Als Modus muss create, extract, list, describe oder hash angege
 err.cannot.create.dir=Verzeichnis {0} kann nicht erstellt werden
 err.classpath.must.be.specified=--class-path muss angegeben werden
 err.jmod.must.be.specified=jmod-file muss angegeben werden
-err.invalid.version=ung\u00FCltige Modulversion {0}
+err.invalid.version=ungültige Modulversion {0}
 err.output.must.be.specified=--output muss angegeben werden
 err.mods.must.be.specified=--mods muss angegeben werden
 err.modulepath.must.be.specified=--module-path muss beim Hashing von Modulen angegeben werden
-err.invalid.main-class=ung\u00FCltiger main-class-Name: {0}
+err.invalid.main-class=ungültiger main-class-Name: {0}
 err.path.not.found=Pfad nicht gefunden: {0}
-err.path.not.valid=ung\u00FCltiger Pfad: {0}
+err.path.not.valid=ungültiger Pfad: {0}
 err.path.not.a.dir=Pfad muss ein Verzeichnis sein: {0}
-err.invalid.class.path.entry=ung\u00FCltiger Classpath-Eintrag: {0}
+err.invalid.class.path.entry=ungültiger Classpath-Eintrag: {0}
 err.file.already.exists=Datei ist bereits vorhanden: {0}
 err.jmod.not.found=keine jmod-Datei gefunden: {0}
-err.bad.pattern=ung\u00FCltiges Muster {0}
+err.bad.pattern=ungültiges Muster {0}
 err.bad.WarnIfResolvedReason=Schlechter Grund: {0}, Grund muss entweder "deprecated", "deprecated-for-removal" oder "incubating" sein
 err.unknown.option=unbekannte Option(en): {0}
-err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.missing.arg=kein Wert angegeben für {0}
 err.internal.error=interner Fehler: {0} {1} {2}
 err.invalid.dryrun.option=--dry-run kann nur mit dem Hashmodus verwendet werden
 err.module.descriptor.not.found=Moduldeskriptor nicht gefunden
-err.missing.export.or.open.packages=Packages, die exportiert werden oder in {0} ge\u00F6ffnet sind, sind nicht vorhanden: {1}
-err.module.resolution.fail=Aufl\u00F6sung nicht erfolgreich: {0}
-err.no.moduleToHash=Keine Hashes erfasst: Kein mit {0} \u00FCbereinstimmendes Modul zum Erfassen von Hashes gefunden
+err.missing.export.or.open.packages=Packages, die exportiert werden oder in {0} geöffnet sind, sind nicht vorhanden: {1}
+err.module.resolution.fail=Auflösung nicht erfolgreich: {0}
+err.no.moduleToHash=Keine Hashes erfasst: Kein mit {0} übereinstimmendes Modul zum Erfassen von Hashes gefunden
 err.invalid.date=--date {0} ist kein erweitertes Datums- und Uhrzeitformat mit Zeitunterschied und optionaler Zeitzone nach ISO-860: {1}
-err.date.out.of.range=--date {0} liegt nicht im g\u00FCltigen Bereich 1980-01-01T00:00:02Z bis 2099-12-31T23:59:59Z
-err.compress.incorrect=--compress-Wert ist ung\u00FCltig: {0}
-err.compress.wrong.mode=--compress ist nur im Erstellmodus zul\u00E4ssig
-warn.invalid.arg=Ung\u00FCltiger Klassenname, oder Pfadname ist nicht vorhanden: {0}
-warn.no.module.hashes=Keine Hashes erfasst: Kein Modul f\u00FCr Hashing angegeben, abh\u00E4ngig von {0}
+err.date.out.of.range=--date {0} liegt nicht im gültigen Bereich 1980-01-01T00:00:02Z bis 2099-12-31T23:59:59Z
+err.compress.incorrect=--compress-Wert ist ungültig: {0}
+err.compress.wrong.mode=--compress ist nur im Erstellmodus zulässig
+warn.invalid.arg=Ungültiger Klassenname, oder Pfadname ist nicht vorhanden: {0}
+warn.no.module.hashes=Keine Hashes erfasst: Kein Modul für Hashing angegeben, abhängig von {0}
 warn.ignore.entry=Eintrag {0} in Abschnitt {1} wird ignoriert
 warn.ignore.duplicate.entry=doppelter Eintrag {0} in Abschnitt {1} wird ignoriert
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties
index cd3515a7a2f..980c8eb2316 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties
@@ -23,82 +23,82 @@
 # questions.
 #
 
-jmod.description=JMOD\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u3001\u65E2\u5B58\u306EJMOD\u30D5\u30A1\u30A4\u30EB\u306E\u5185\u5BB9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+jmod.description=JMODファイルを作成し、既存のJMODファイルの内容をリストします
 
-main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0} (create|extract|list|describe|hash) <OPTIONS> <jmod-file>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001--help\u3092\u4F7F\u7528\u3057\u307E\u3059
+main.usage.summary=使用方法: {0} (create|extract|list|describe|hash) <OPTIONS> <jmod-file>\n使用可能なオプションのリストについては、--helpを使用します
 
-main.usage=\u4F7F\u7528\u65B9\u6CD5: {0} (create|extract|list|describe|hash) <OPTIONS> <jmod-file>\n
-error.prefix=\u30A8\u30E9\u30FC:
-warn.prefix=\u8B66\u544A:
+main.usage=使用方法: {0} (create|extract|list|describe|hash) <OPTIONS> <jmod-file>\n
+error.prefix=エラー:
+warn.prefix=警告:
 
-main.opt.mode=\u30E1\u30A4\u30F3\u64CD\u4F5C\u30E2\u30FC\u30C9:
-main.opt.mode.create=create    - \u65B0\u898F\u306Ejmod\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u4F5C\u6210\u3057\u307E\u3059
-main.opt.mode.extract=extract   - \u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u62BD\u51FA\u3057\u307E\u3059
-main.opt.mode.list=list      - \u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u540D\u524D\u3092\u51FA\u529B\u3057\u307E\u3059
-main.opt.mode.describe=describe  - \u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u8A73\u7D30\u3092\u51FA\u529B\u3057\u307E\u3059
-main.opt.mode.hash=hash      - \u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30CF\u30C3\u30B7\u30E5\u3092\u8A18\u9332\u3057\u307E\u3059\u3002
+main.opt.mode=メイン操作モード:
+main.opt.mode.create=create    - 新規のjmodアーカイブを作成します
+main.opt.mode.extract=extract   - アーカイブからすべてのファイルを抽出します
+main.opt.mode.list=list      - すべてのエントリの名前を出力します
+main.opt.mode.describe=describe  - モジュールの詳細を出力します
+main.opt.mode.hash=hash      - モジュールのハッシュを記録します。
 
-main.opt.help=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059
-main.opt.help-extra=\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3057\u307E\u3059
-main.opt.version=\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
-main.opt.class-path=\u30AF\u30E9\u30B9\u3092\u542B\u3080\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3jar\u30D5\u30A1\u30A4\u30EB|\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
-main.opt.libs=\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u306E\u5834\u6240
-main.opt.cmds=\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30B3\u30DE\u30F3\u30C9\u306E\u5834\u6240
-main.opt.config=\u30E6\u30FC\u30B6\u30FC\u304C\u7DE8\u96C6\u53EF\u80FD\u306A\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240
-main.opt.extractDir=\u62BD\u51FA\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
-main.opt.dry-run=\u30CF\u30C3\u30B7\u30E5\u30FB\u30E2\u30FC\u30C9\u306E\u8A66\u9A13\u7684\u306A\u5B9F\u884C
-main.opt.exclude=\u5404\u8981\u7D20\u304C\u6B21\u306E\u5F62\u5F0F\u306E\u3044\u305A\u308C\u304B\u3092\u4F7F\u7528\u3059\u308B\u3001\u6307\u5B9A\u3055\u308C\u305F\u30AB\u30F3\u30DE\u533A\u5207\u308A\u30D1\u30BF\u30FC\u30F3\u30FB\u30EA\u30B9\u30C8\u306B\u4E00\u81F4\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u9664\u5916\u3057\u307E\u3059: <glob-pattern>\u3001glob:<glob-pattern>\u307E\u305F\u306Fregex:<regex-pattern>
-main.opt.header-files=\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240
-main.opt.legal-notices=\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u5834\u6240
-main.opt.module-version= \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3
-main.opt.main-class=\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9
+main.opt.help=このヘルプ・メッセージを出力します
+main.opt.help-extra=追加オプションのヘルプを出力します
+main.opt.version=バージョン情報
+main.opt.class-path=クラスを含むアプリケーションjarファイル|ディレクトリ
+main.opt.libs=ネイティブ・ライブラリの場所
+main.opt.cmds=ネイティブ・コマンドの場所
+main.opt.config=ユーザーが編集可能な構成ファイルの場所
+main.opt.extractDir=抽出のターゲット・ディレクトリ
+main.opt.dry-run=ハッシュ・モードの試験的な実行
+main.opt.exclude=各要素が次の形式のいずれかを使用する、指定されたカンマ区切りパターン・リストに一致するファイルを除外します: <glob-pattern>、glob:<glob-pattern>またはregex:<regex-pattern>
+main.opt.header-files=ヘッダー・ファイルの場所
+main.opt.legal-notices=法律上の注意点の場所
+main.opt.module-version= モジュール・バージョン
+main.opt.main-class=メイン・クラス
 main.opt.main-class.arg=class-name
-main.opt.man-pages=man\u30DA\u30FC\u30B8\u306E\u5834\u6240
-main.opt.target-platform=\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0
+main.opt.man-pages=manページの場所
+main.opt.target-platform=ターゲット・プラットフォーム
 main.opt.target-platform.arg=target-platform
-main.opt.module-path=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9
-main.opt.hash-modules=\u6307\u5B9A\u306E<regex-pattern>\u306B\u4E00\u81F4\u3057\u3001\u76F4\u63A5\u307E\u305F\u306F\u9593\u63A5\u7684\u306B\u4F9D\u5B58\u3057\u3066\u3044\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7D50\u5408\u3059\u308B\u30CF\u30C3\u30B7\u30E5\u3092\u8A08\u7B97\u304A\u3088\u3073\u8A18\u9332\u3057\u307E\u3059\u3002\u30CF\u30C3\u30B7\u30E5\u306F\u3001\u4F5C\u6210\u3055\u308C\u3066\u3044\u308BJMOD\u30D5\u30A1\u30A4\u30EB\u3001jmod hash\u30B3\u30DE\u30F3\u30C9\u3067\u6307\u5B9A\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306EJMOD\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30E9JAR\u306B\u8A18\u9332\u3055\u308C\u307E\u3059\u3002
-main.opt.do-not-resolve-by-default=\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30EB\u30FC\u30C8\u8A2D\u5B9A\u304B\u3089\u9664\u5916\u3057\u307E\u3059
-main.opt.warn-if-resolved=\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u89E3\u6C7A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u8B66\u544A\u3092\u767A\u884C\u3059\u308B\u30C4\u30FC\u30EB\u306E\u30D2\u30F3\u30C8\u3002\u975E\u63A8\u5968\u3001\u524A\u9664\u4E88\u5B9A\u306E\u975E\u63A8\u5968\u307E\u305F\u306F\u5B9F\u9A13\u7684\u306E\u3044\u305A\u308C\u304B
-main.opt.date=\u30A8\u30F3\u30C8\u30EA\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u65E5\u6642\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u66F8\u5F0F("2022-02-12T12:30:00-05:00"\u306A\u3069)\u3067ISO-8601\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\u306E\u65E5\u6642\u3067\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
+main.opt.module-path=モジュール・パス
+main.opt.hash-modules=指定の<regex-pattern>に一致し、直接または間接的に依存しているモジュールでパッケージ・モジュールを結合するハッシュを計算および記録します。ハッシュは、作成されているJMODファイル、jmod hashコマンドで指定したモジュール・パスのJMODファイルまたはモジュラJARに記録されます。
+main.opt.do-not-resolve-by-default=モジュールのデフォルトのルート設定から除外します
+main.opt.warn-if-resolved=モジュールが解決されている場合は、警告を発行するツールのヒント。非推奨、削除予定の非推奨または実験的のいずれか
+main.opt.date=エントリのタイムスタンプの日時は、オプションのタイムゾーン書式("2022-02-12T12:30:00-05:00"など)でISO-8601拡張オフセットの日時で指定されています
 
-main.opt.cmdfile=\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059
+main.opt.cmdfile=指定したファイルからオプションを読み取ります
 
-main.opt.compress=JMOD\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u4F5C\u6210\u6642\u306B\u884C\u3046\u5727\u7E2E\u3002\u4F7F\u7528\u53EF\u80FD\u306A\u5024\u306Fzip-[0-9]\u3067\u3059\u3002zip-0\u3067\u306F\u5727\u7E2E\u306F\u884C\u308F\u308C\u305A\u3001zip-9\u3067\u306F\u6700\u9069\u306A\u5727\u7E2E\u304C\u884C\u308F\u308C\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306Fzip-6\u3067\u3059\u3002
+main.opt.compress=JMODアーカイブの作成時に行う圧縮。使用可能な値はzip-[0-9]です。zip-0では圧縮は行われず、zip-9では最適な圧縮が行われます。デフォルトはzip-6です。
 
-module.hashes.recorded=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306E\u30CF\u30C3\u30B7\u30E5\u304C\u8A18\u9332\u3055\u308C\u307E\u3059
+module.hashes.recorded=モジュール{0}のハッシュが記録されます
 
-err.missing.mode=create\u3001extract\u3001list\u3001describe\u307E\u305F\u306Fhash\u306E\u3044\u305A\u308C\u304B\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-err.invalid.mode=\u30E2\u30FC\u30C9\u306Fcreate\u3001extract\u3001list\u3001describe\u307E\u305F\u306Fhash\u306E\u3044\u305A\u308C\u304B\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
-err.cannot.create.dir=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
-err.classpath.must.be.specified=--class-path\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-err.jmod.must.be.specified=jmod-file\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-err.invalid.version=\u7121\u52B9\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3{0}
-err.output.must.be.specified=--output\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-err.mods.must.be.specified=--mods\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-err.modulepath.must.be.specified=\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30CF\u30C3\u30B7\u30E5\u6642\u306B\u306F--module-path\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-err.invalid.main-class=\u7121\u52B9\u306A\u30E1\u30A4\u30F3\u30AF\u30E9\u30B9\u540D: {0}
-err.path.not.found=\u30D1\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-err.path.not.valid=\u7121\u52B9\u306A\u30D1\u30B9: {0}
-err.path.not.a.dir=\u30D1\u30B9\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
-err.invalid.class.path.entry=\u7121\u52B9\u306A\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u30FB\u30A8\u30F3\u30C8\u30EA: {0}
-err.file.already.exists=\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059: {0}
-err.jmod.not.found=jmod\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-err.bad.pattern=\u4E0D\u6B63\u30D1\u30BF\u30FC\u30F3{0}
-err.bad.WarnIfResolvedReason=\u4E0D\u6B63\u306A\u7406\u7531: {0}\u3001\u975E\u63A8\u5968\u3001\u524A\u9664\u4E88\u5B9A\u306E\u975E\u63A8\u5968\u307E\u305F\u306F\u5B9F\u9A13\u7684\u306E\u3044\u305A\u308C\u304B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
-err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-err.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC: {0} {1} {2}
-err.invalid.dryrun.option=--dry-run\u306F\u30CF\u30C3\u30B7\u30E5\u30FB\u30E2\u30FC\u30C9\u3068\u4E00\u7DD2\u306B\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
-err.module.descriptor.not.found=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-err.missing.export.or.open.packages={0}\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u304B\u305D\u3053\u3067\u30AA\u30FC\u30D7\u30F3\u3055\u308C\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {1}
-err.module.resolution.fail=\u89E3\u6C7A\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
-err.no.moduleToHash=\u30CF\u30C3\u30B7\u30E5\u304C\u8A18\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}\u306B\u4E00\u81F4\u3057\u3001\u30CF\u30C3\u30B7\u30E5\u3092\u8A18\u9332\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-err.invalid.date=--date {0}\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u66F8\u5F0F: {1}\u3092\u6307\u5B9A\u3057\u305F\u3001\u6709\u52B9\u306AISO-8601\u306E\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\u306E\u65E5\u6642\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-err.date.out.of.range=--date {0}\u306F\u6709\u52B9\u306A\u7BC4\u56F21980-01-01T00:00:02Z\u304B\u30892099-12-31T23:59:59Z\u306B\u3042\u308A\u307E\u305B\u3093
-err.compress.incorrect=--\u5727\u7E2E\u5024\u304C\u7121\u52B9\u3067\u3059: {0}
-err.compress.wrong.mode=--\u5727\u7E2E\u3092\u884C\u3048\u308B\u306E\u306F\u4F5C\u6210\u30E2\u30FC\u30C9\u306E\u3068\u304D\u306E\u307F\u3067\u3059
-warn.invalid.arg=\u7121\u52B9\u306A\u30AF\u30E9\u30B9\u540D\u307E\u305F\u306F\u30D1\u30B9\u540D\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
-warn.no.module.hashes=\u30CF\u30C3\u30B7\u30E5\u304C\u8A18\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}\u306B\u4F9D\u5B58\u3059\u308B\u30CF\u30C3\u30B7\u30E5\u306B\u5BFE\u3057\u3066\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-warn.ignore.entry=\u30BB\u30AF\u30B7\u30E7\u30F3{1}\u306E\u30A8\u30F3\u30C8\u30EA{0}\u3092\u7121\u8996\u3057\u307E\u3059
-warn.ignore.duplicate.entry=\u30BB\u30AF\u30B7\u30E7\u30F3{1}\u306E\u91CD\u8907\u30A8\u30F3\u30C8\u30EA{0}\u3092\u7121\u8996\u3057\u307E\u3059
+err.missing.mode=create、extract、list、describeまたはhashのいずれかを指定する必要があります
+err.invalid.mode=モードはcreate、extract、list、describeまたはhashのいずれかにする必要があります: {0}
+err.cannot.create.dir=ディレクトリ{0}を作成できません
+err.classpath.must.be.specified=--class-pathを指定する必要があります
+err.jmod.must.be.specified=jmod-fileを指定する必要があります
+err.invalid.version=無効なモジュール・バージョン{0}
+err.output.must.be.specified=--outputを指定する必要があります
+err.mods.must.be.specified=--modsを指定する必要があります
+err.modulepath.must.be.specified=モジュールのハッシュ時には--module-pathを指定する必要があります
+err.invalid.main-class=無効なメインクラス名: {0}
+err.path.not.found=パスが見つかりません: {0}
+err.path.not.valid=無効なパス: {0}
+err.path.not.a.dir=パスはディレクトリである必要があります: {0}
+err.invalid.class.path.entry=無効なクラス・パス・エントリ: {0}
+err.file.already.exists=ファイルはすでに存在します: {0}
+err.jmod.not.found=jmodファイルが見つかりません: {0}
+err.bad.pattern=不正パターン{0}
+err.bad.WarnIfResolvedReason=不正な理由: {0}、非推奨、削除予定の非推奨または実験的のいずれかである必要があります
+err.unknown.option=不明なオプション: {0}
+err.missing.arg={0}に値が指定されていません
+err.internal.error=内部エラー: {0} {1} {2}
+err.invalid.dryrun.option=--dry-runはハッシュ・モードと一緒にのみ使用できます
+err.module.descriptor.not.found=モジュール・ディスクリプタが見つかりません
+err.missing.export.or.open.packages={0}にエクスポートされたかそこでオープンされているパッケージが存在しません: {1}
+err.module.resolution.fail=解決に失敗しました: {0}
+err.no.moduleToHash=ハッシュが記録されていません: {0}に一致し、ハッシュを記録するモジュールが見つかりません
+err.invalid.date=--date {0}は、オプションのタイムゾーン書式: {1}を指定した、有効なISO-8601の拡張オフセットの日時ではありません
+err.date.out.of.range=--date {0}は有効な範囲1980-01-01T00:00:02Zから2099-12-31T23:59:59Zにありません
+err.compress.incorrect=--圧縮値が無効です: {0}
+err.compress.wrong.mode=--圧縮を行えるのは作成モードのときのみです
+warn.invalid.arg=無効なクラス名またはパス名が存在しません: {0}
+warn.no.module.hashes=ハッシュが記録されていません: {0}に依存するハッシュに対してモジュールが指定されていません
+warn.ignore.entry=セクション{1}のエントリ{0}を無視します
+warn.ignore.duplicate.entry=セクション{1}の重複エントリ{0}を無視します
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties
index f17a3e97c43..409081fc45b 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties
@@ -23,82 +23,82 @@
 # questions.
 #
 
-jmod.description=\u521B\u5EFA JMOD \u6587\u4EF6\u5E76\u5217\u51FA\u73B0\u6709 JMOD \u6587\u4EF6\u7684\u5185\u5BB9
+jmod.description=创建 JMOD 文件并列出现有 JMOD 文件的内容
 
-main.usage.summary=\u7528\u6CD5: {0} (create|extract|list|describe|hash) <\u9009\u9879> <jmod \u6587\u4EF6>\n\u4F7F\u7528 --help \u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
+main.usage.summary=用法: {0} (create|extract|list|describe|hash) <选项> <jmod 文件>\n使用 --help 列出可能的选项
 
-main.usage=\u7528\u6CD5: {0} (create|extract|list|describe|hash) <\u9009\u9879> <jmod \u6587\u4EF6>\n
-error.prefix=\u9519\u8BEF:
-warn.prefix=\u8B66\u544A:
+main.usage=用法: {0} (create|extract|list|describe|hash) <选项> <jmod 文件>\n
+error.prefix=错误:
+warn.prefix=警告:
 
-main.opt.mode=\u4E3B\u64CD\u4F5C\u6A21\u5F0F:
-main.opt.mode.create=create    - \u521B\u5EFA\u65B0\u7684 jmod \u6863\u6848
-main.opt.mode.extract=extract   - \u4ECE\u6863\u6848\u4E2D\u63D0\u53D6\u6240\u6709\u6587\u4EF6
-main.opt.mode.list=list      - \u8F93\u51FA\u6240\u6709\u6761\u76EE\u7684\u540D\u79F0
-main.opt.mode.describe=describe  - \u8F93\u51FA\u6A21\u5757\u8BE6\u7EC6\u4FE1\u606F
-main.opt.mode.hash=hash      - \u8BB0\u5F55\u7ED1\u5B9A\u6A21\u5757\u7684\u6563\u5217\u3002
+main.opt.mode=主操作模式:
+main.opt.mode.create=create    - 创建新的 jmod 档案
+main.opt.mode.extract=extract   - 从档案中提取所有文件
+main.opt.mode.list=list      - 输出所有条目的名称
+main.opt.mode.describe=describe  - 输出模块详细信息
+main.opt.mode.hash=hash      - 记录绑定模块的散列。
 
-main.opt.help=\u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F
-main.opt.help-extra=\u8F93\u51FA\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9
-main.opt.version=\u7248\u672C\u4FE1\u606F
-main.opt.class-path=\u5305\u542B\u7C7B\u7684\u5E94\u7528\u7A0B\u5E8F jar \u6587\u4EF6|\u76EE\u5F55
-main.opt.libs=\u672C\u673A\u5E93\u7684\u4F4D\u7F6E
-main.opt.cmds=\u672C\u673A\u547D\u4EE4\u7684\u4F4D\u7F6E
-main.opt.config=\u7528\u6237\u53EF\u7F16\u8F91\u914D\u7F6E\u6587\u4EF6\u7684\u4F4D\u7F6E
-main.opt.extractDir=\u63D0\u53D6\u64CD\u4F5C\u7684\u76EE\u6807\u76EE\u5F55
-main.opt.dry-run=\u6563\u5217\u6A21\u5F0F\u7684\u6A21\u62DF\u8FD0\u884C
-main.opt.exclude=\u6392\u9664\u4E0E\u6240\u63D0\u4F9B\u9017\u53F7\u5206\u9694\u7684\u6A21\u5F0F\u5217\u8868\u5339\u914D\u7684\u6587\u4EF6, \u6BCF\u4E2A\u5143\u7D20\u4F7F\u7528\u4EE5\u4E0B\u683C\u5F0F\u4E4B\u4E00: <glob \u6A21\u5F0F>, glob:<glob \u6A21\u5F0F> \u6216 regex:<\u6B63\u5219\u8868\u8FBE\u5F0F\u6A21\u5F0F>
-main.opt.header-files=\u6807\u5934\u6587\u4EF6\u7684\u4F4D\u7F6E
-main.opt.legal-notices=\u6CD5\u5F8B\u58F0\u660E\u4F4D\u7F6E
-main.opt.module-version= \u6A21\u5757\u7248\u672C
-main.opt.main-class=\u4E3B\u7C7B
+main.opt.help=输出此帮助消息
+main.opt.help-extra=输出额外选项的帮助
+main.opt.version=版本信息
+main.opt.class-path=包含类的应用程序 jar 文件|目录
+main.opt.libs=本机库的位置
+main.opt.cmds=本机命令的位置
+main.opt.config=用户可编辑配置文件的位置
+main.opt.extractDir=提取操作的目标目录
+main.opt.dry-run=散列模式的模拟运行
+main.opt.exclude=排除与所提供逗号分隔的模式列表匹配的文件, 每个元素使用以下格式之一: <glob 模式>, glob:<glob 模式> 或 regex:<正则表达式模式>
+main.opt.header-files=标头文件的位置
+main.opt.legal-notices=法律声明位置
+main.opt.module-version= 模块版本
+main.opt.main-class=主类
 main.opt.main-class.arg=class-name
-main.opt.man-pages=\u5E2E\u52A9\u9875\u7684\u4F4D\u7F6E
-main.opt.target-platform=\u76EE\u6807\u5E73\u53F0
+main.opt.man-pages=帮助页的位置
+main.opt.target-platform=目标平台
 main.opt.target-platform.arg=target-platform
-main.opt.module-path=\u6A21\u5757\u8DEF\u5F84
-main.opt.hash-modules=\u8BA1\u7B97\u548C\u8BB0\u5F55\u6563\u5217, \u4EE5\u5C06\u6253\u5305\u6A21\u5757\u7ED1\u5B9A\u5230\u4E0E\u6307\u5B9A <\u6B63\u5219\u8868\u8FBE\u5F0F\u6A21\u5F0F> \u5339\u914D\u5E76\u76F4\u63A5\u6216\u95F4\u63A5\u4F9D\u8D56\u4E8E\u7684\u6A21\u5757\u3002\u6563\u5217\u8BB0\u5F55\u5728\u6240\u521B\u5EFA\u7684 JMOD \u6587\u4EF6\u4E2D, \u6216\u8005\u8BB0\u5F55\u5728 jmod hash \u547D\u4EE4\u6307\u5B9A\u7684\u6A21\u5757\u8DEF\u5F84\u7684 JMOD \u6587\u4EF6\u6216\u6A21\u5757\u5316 JAR \u4E2D\u3002
-main.opt.do-not-resolve-by-default=\u4ECE\u9ED8\u8BA4\u6839\u6A21\u5757\u96C6\u4E2D\u6392\u9664
-main.opt.warn-if-resolved=\u63D0\u793A\u5DE5\u5177\u5728\u89E3\u6790\u6A21\u5757\u540E\u53D1\u51FA\u8B66\u544A\u3002\u53EF\u4EE5\u4E3A deprecated, deprecated-for-removal \u6216 incubating \u4E4B\u4E00
-main.opt.date=\u6761\u76EE\u65F6\u95F4\u6233\u7684\u65E5\u671F\u548C\u65F6\u95F4\uFF0C\u4EE5\u5177\u6709\u53EF\u9009\u65F6\u533A\u7684 ISO-8601 \u6269\u5C55\u504F\u79FB\u65E5\u671F\u65F6\u95F4\u683C\u5F0F\u6307\u5B9A\uFF0C\u4F8B\u5982 "2022-02-12T12:30:00-05:00"
+main.opt.module-path=模块路径
+main.opt.hash-modules=计算和记录散列, 以将打包模块绑定到与指定 <正则表达式模式> 匹配并直接或间接依赖于的模块。散列记录在所创建的 JMOD 文件中, 或者记录在 jmod hash 命令指定的模块路径的 JMOD 文件或模块化 JAR 中。
+main.opt.do-not-resolve-by-default=从默认根模块集中排除
+main.opt.warn-if-resolved=提示工具在解析模块后发出警告。可以为 deprecated, deprecated-for-removal 或 incubating 之一
+main.opt.date=条目时间戳的日期和时间，以具有可选时区的 ISO-8601 扩展偏移日期时间格式指定，例如 "2022-02-12T12:30:00-05:00"
 
-main.opt.cmdfile=\u4ECE\u6307\u5B9A\u6587\u4EF6\u8BFB\u53D6\u9009\u9879
+main.opt.cmdfile=从指定文件读取选项
 
-main.opt.compress=\u521B\u5EFA JMOD \u6863\u6848\u65F6\u8981\u4F7F\u7528\u7684\u538B\u7F29\u3002\u63A5\u53D7\u7684\u503C\u4E3A zip-[0-9]\uFF0C\u5176\u4E2D zip-0 \u8868\u793A\u65E0\u538B\u7F29\uFF0Czip-9 \u8868\u793A\u6700\u4F73\u538B\u7F29\u3002\u9ED8\u8BA4\u503C\u4E3A zip-6\u3002
+main.opt.compress=创建 JMOD 档案时要使用的压缩。接受的值为 zip-[0-9]，其中 zip-0 表示无压缩，zip-9 表示最佳压缩。默认值为 zip-6。
 
-module.hashes.recorded=\u6563\u5217\u8BB0\u5F55\u5728\u6A21\u5757 {0} \u4E2D
+module.hashes.recorded=散列记录在模块 {0} 中
 
-err.missing.mode=\u5FC5\u987B\u6307\u5B9A\u521B\u5EFA, \u63D0\u53D6, \u5217\u51FA, \u63CF\u8FF0\u6216\u6563\u5217\u4E4B\u4E00
-err.invalid.mode=\u6A21\u5F0F\u5FC5\u987B\u4E3A\u521B\u5EFA, \u63D0\u53D6, \u5217\u51FA, \u63CF\u8FF0\u6216\u6563\u5217\u4E4B\u4E00: {0}
-err.cannot.create.dir=\u65E0\u6CD5\u521B\u5EFA\u76EE\u5F55 {0}
-err.classpath.must.be.specified=\u5FC5\u987B\u6307\u5B9A --class-path
-err.jmod.must.be.specified=\u5FC5\u987B\u6307\u5B9A jmod-file
-err.invalid.version=\u65E0\u6548\u7684\u6A21\u5757\u7248\u672C {0}
-err.output.must.be.specified=\u5FC5\u987B\u6307\u5B9A --output
-err.mods.must.be.specified=\u5FC5\u987B\u6307\u5B9A --mods
-err.modulepath.must.be.specified=\u5BF9\u6A21\u5757\u8FDB\u884C\u6563\u5217\u5904\u7406\u65F6\u5FC5\u987B\u6307\u5B9A --module-path
-err.invalid.main-class=\u65E0\u6548\u7684\u4E3B\u7C7B\u540D\u79F0: {0}
-err.path.not.found=\u627E\u4E0D\u5230\u8DEF\u5F84: {0}
-err.path.not.valid=\u65E0\u6548\u8DEF\u5F84: {0}
-err.path.not.a.dir=\u8DEF\u5F84\u5FC5\u987B\u4E3A\u76EE\u5F55: {0}
-err.invalid.class.path.entry=\u65E0\u6548\u7684\u7C7B\u8DEF\u5F84\u6761\u76EE: {0}
-err.file.already.exists=\u6587\u4EF6\u5DF2\u5B58\u5728: {0}
-err.jmod.not.found=\u627E\u4E0D\u5230 jmod \u6587\u4EF6: {0}
-err.bad.pattern=\u9519\u8BEF\u7684\u6A21\u5F0F {0}
-err.bad.WarnIfResolvedReason=\u9519\u8BEF\u7684\u539F\u56E0: {0}, \u5FC5\u987B\u4E3A deprecated, deprecated-for-removal \u6216 incubating \u4E4B\u4E00
-err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
-err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
-err.internal.error=\u5185\u90E8\u9519\u8BEF: {0} {1} {2}
-err.invalid.dryrun.option=--dry-run \u53EA\u80FD\u7528\u4E8E\u6563\u5217\u6A21\u5F0F
-err.module.descriptor.not.found=\u627E\u4E0D\u5230\u6A21\u5757\u63CF\u8FF0\u7B26
-err.missing.export.or.open.packages=\u5728 {0} \u4E2D\u5BFC\u51FA\u6216\u6253\u5F00\u7684\u7A0B\u5E8F\u5305\u4E0D\u5B58\u5728: {1}
-err.module.resolution.fail=\u89E3\u6790\u5931\u8D25: {0}
-err.no.moduleToHash=\u672A\u8BB0\u5F55\u6563\u5217\uFF1A\u627E\u4E0D\u5230\u4E0E {0} \u5339\u914D\u7684\u6A21\u5757\u6765\u8BB0\u5F55\u6563\u5217
-err.invalid.date=--date {0} \u4E0D\u662F\u5177\u6709\u53EF\u9009\u65F6\u533A\u7684\u6709\u6548 ISO-8601 \u6269\u5C55\u504F\u79FB\u65E5\u671F\u65F6\u95F4\u683C\u5F0F\uFF1A{1}
-err.date.out.of.range=--date {0} \u4E0D\u5728 1980-01-01T00:00:02Z \u5230 2099-12-31T23:59:59Z \u8FD9\u4E00\u6709\u6548\u8303\u56F4\u5185
-err.compress.incorrect=--\u538B\u7F29\u503C\u65E0\u6548\uFF1A{0}
-err.compress.wrong.mode=--\u4EC5\u5728\u4F7F\u7528\u521B\u5EFA\u6A21\u5F0F\u65F6\u63A5\u53D7\u538B\u7F29
-warn.invalid.arg=\u7C7B\u540D\u65E0\u6548\u6216\u8DEF\u5F84\u540D\u4E0D\u5B58\u5728: {0}
-warn.no.module.hashes=\u672A\u8BB0\u5F55\u4EFB\u4F55\u6563\u5217: \u6CA1\u6709\u4E3A\u4F9D\u8D56\u4E8E {0} \u7684\u6563\u5217\u5904\u7406\u6307\u5B9A\u6A21\u5757
-warn.ignore.entry=\u6B63\u5728\u5FFD\u7565\u8282 {1} \u4E2D\u7684\u6761\u76EE {0}
-warn.ignore.duplicate.entry=\u6B63\u5728\u5FFD\u7565\u8282 {1} \u4E2D\u7684\u91CD\u590D\u6761\u76EE {0}
+err.missing.mode=必须指定创建, 提取, 列出, 描述或散列之一
+err.invalid.mode=模式必须为创建, 提取, 列出, 描述或散列之一: {0}
+err.cannot.create.dir=无法创建目录 {0}
+err.classpath.must.be.specified=必须指定 --class-path
+err.jmod.must.be.specified=必须指定 jmod-file
+err.invalid.version=无效的模块版本 {0}
+err.output.must.be.specified=必须指定 --output
+err.mods.must.be.specified=必须指定 --mods
+err.modulepath.must.be.specified=对模块进行散列处理时必须指定 --module-path
+err.invalid.main-class=无效的主类名称: {0}
+err.path.not.found=找不到路径: {0}
+err.path.not.valid=无效路径: {0}
+err.path.not.a.dir=路径必须为目录: {0}
+err.invalid.class.path.entry=无效的类路径条目: {0}
+err.file.already.exists=文件已存在: {0}
+err.jmod.not.found=找不到 jmod 文件: {0}
+err.bad.pattern=错误的模式 {0}
+err.bad.WarnIfResolvedReason=错误的原因: {0}, 必须为 deprecated, deprecated-for-removal 或 incubating 之一
+err.unknown.option=未知选项: {0}
+err.missing.arg=没有为{0}指定值
+err.internal.error=内部错误: {0} {1} {2}
+err.invalid.dryrun.option=--dry-run 只能用于散列模式
+err.module.descriptor.not.found=找不到模块描述符
+err.missing.export.or.open.packages=在 {0} 中导出或打开的程序包不存在: {1}
+err.module.resolution.fail=解析失败: {0}
+err.no.moduleToHash=未记录散列：找不到与 {0} 匹配的模块来记录散列
+err.invalid.date=--date {0} 不是具有可选时区的有效 ISO-8601 扩展偏移日期时间格式：{1}
+err.date.out.of.range=--date {0} 不在 1980-01-01T00:00:02Z 到 2099-12-31T23:59:59Z 这一有效范围内
+err.compress.incorrect=--压缩值无效：{0}
+err.compress.wrong.mode=--仅在使用创建模式时接受压缩
+warn.invalid.arg=类名无效或路径名不存在: {0}
+warn.no.module.hashes=未记录任何散列: 没有为依赖于 {0} 的散列处理指定模块
+warn.ignore.entry=正在忽略节 {1} 中的条目 {0}
+warn.ignore.duplicate.entry=正在忽略节 {1} 中的重复条目 {0}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
index 7835edfb516..da983f76dd6 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
@@ -36,35 +36,35 @@ resource.deb-prerm-script=DEB-Prerm-Skript
 resource.deb-postinstall-script=DEB-Postinstall-Skript
 resource.deb-postrm-script=DEB-Postrm-Skript
 resource.copyright-file=Copyright-Datei
-resource.menu-shortcut-descriptor=Men\u00FCverkn\u00FCpfungsdeskriptor
-resource.menu-icon=Men\u00FCsymbol
+resource.menu-shortcut-descriptor=Menüverknüpfungsdeskriptor
+resource.menu-icon=Menüsymbol
 resource.rpm-spec-file=RPM-Spezifikationsdatei
 resource.systemd-unit-file=systemd-Einheitsdatei
 
 error.tool-not-found.advice=Installieren Sie die erforderlichen Packages
 error.tool-old-version.advice=Installieren Sie die erforderlichen Packages
 
-error.invalid-install-dir=Ung\u00FCltiges Installationsverzeichnis "{0}"
+error.invalid-install-dir=Ungültiges Installationsverzeichnis "{0}"
 
-error.invalid-value-for-package-name=Ung\u00FCltiger Wert "{0}" f\u00FCr den Bundle-Namen.
-error.invalid-value-for-package-name.advice=Setzen Sie die Option "linux-bundle-name" auf einen g\u00FCltigen Debian-Packagenamen. Die Packagenamen d\u00FCrfen nur Kleinbuchstaben (a-z), Ziffern (0-9), Pluszeichen (+), Minuszeichen (-) und Punkte (.) umfassen. Sie m\u00FCssen mindestens zwei Zeichen lang sein und mit einem alphanumerischen Zeichen beginnen.
+error.invalid-value-for-package-name=Ungültiger Wert "{0}" für den Bundle-Namen.
+error.invalid-value-for-package-name.advice=Setzen Sie die Option "linux-bundle-name" auf einen gültigen Debian-Packagenamen. Die Packagenamen dürfen nur Kleinbuchstaben (a-z), Ziffern (0-9), Pluszeichen (+), Minuszeichen (-) und Punkte (.) umfassen. Sie müssen mindestens zwei Zeichen lang sein und mit einem alphanumerischen Zeichen beginnen.
 
 message.icon-not-png=Das angegebene Symbol "{0}" ist keine PNG-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
-message.test-for-tool=Test f\u00FCr [{0}]. Ergebnis: {1}
-message.outputting-to-location=DEB f\u00FCr Installationsprogramm wird generiert in: {0}.
+message.test-for-tool=Test für [{0}]. Ergebnis: {1}
+message.outputting-to-location=DEB für Installationsprogramm wird generiert in: {0}.
 message.output-to-location=Package (.deb) gespeichert in: {0}.
-message.debs-like-licenses=Debian-Packages m\u00FCssen eine Lizenz angeben. Bei fehlender Lizenz geben einige Linux-Distributionen eine Meldung \u00FCber eine Beeintr\u00E4chtigung der Anwendungsqualit\u00E4t aus.
-message.outputting-bundle-location=RPM f\u00FCr Installationsprogramm wird generiert in: {0}.
+message.debs-like-licenses=Debian-Packages müssen eine Lizenz angeben. Bei fehlender Lizenz geben einige Linux-Distributionen eine Meldung über eine Beeinträchtigung der Anwendungsqualität aus.
+message.outputting-bundle-location=RPM für Installationsprogramm wird generiert in: {0}.
 message.output-bundle-location=Package (.rpm) gespeichert in: {0}.
-message.creating-association-with-null-extension=Verkn\u00FCpfung mit Nullerweiterung wird erstellt.
+message.creating-association-with-null-extension=Verknüpfung mit Nullerweiterung wird erstellt.
 
-message.ldd-not-available=ldd-Befehl nicht gefunden. Packageabh\u00E4ngigkeiten werden nicht generiert.
+message.ldd-not-available=ldd-Befehl nicht gefunden. Packageabhängigkeiten werden nicht generiert.
 message.deb-ldd-not-available.advice=Installieren Sie das DEB-Package "libc-bin", um ldd abzurufen.
 message.rpm-ldd-not-available.advice=Installieren Sie das RPM-Package "glibc-common", um ldd abzurufen.
 
 warning.foreign-app-image=Warnung: app-image-Verzeichnis wurde von jpackage nicht generiert.
-message.not-default-bundler-no-dependencies-lookup={0} ist nicht der Standardpackagetyp. Packageabh\u00E4ngigkeiten werden nicht generiert.
+message.not-default-bundler-no-dependencies-lookup={0} ist nicht der Standardpackagetyp. Packageabhängigkeiten werden nicht generiert.
 
-error.unexpected-package-property=Erwarteter Wert der Eigenschaft "{0}": [{1}]. Tats\u00E4chlicher Wert in Ausgabepackage: [{2}]. Anscheinend enthielt die benutzerdefinierte Datei "{3}" aus dem Ressourcenverzeichnis einen hartcodierten Wert der Eigenschaft "{0}"
+error.unexpected-package-property=Erwarteter Wert der Eigenschaft "{0}": [{1}]. Tatsächlicher Wert in Ausgabepackage: [{2}]. Anscheinend enthielt die benutzerdefinierte Datei "{3}" aus dem Ressourcenverzeichnis einen hartcodierten Wert der Eigenschaft "{0}"
 error.unexpected-package-property.advice=Verwenden Sie die Musterzeichenfolge [{0}] anstelle des hartcodierten Wertes [{1}] der {2}-Eigenschaft in der benutzerdefinierten Datei "{3}"
 error.unexpected-default-package-property.advice=Legen Sie den Wert der {0}-Eigenschaft in der benutzerdefinierten Datei "{1}" nicht explizit fest
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
index 4d135186a29..002fc0baf48 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
@@ -23,48 +23,48 @@
 # questions.
 #
 #
-app.bundler.name=Linux\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8
-deb.bundler.name=DEB\u30D0\u30F3\u30C9\u30EB
-rpm.bundler.name=RPM\u30D0\u30F3\u30C9\u30EB
+app.bundler.name=Linuxアプリケーション・イメージ
+deb.bundler.name=DEBバンドル
+rpm.bundler.name=RPMバンドル
 
-param.license-type.default=\u4E0D\u660E
-param.menu-group.default=\u4E0D\u660E
+param.license-type.default=不明
+param.menu-group.default=不明
 
-resource.deb-control-file=DEB\u5236\u5FA1\u30D5\u30A1\u30A4\u30EB
-resource.deb-preinstall-script=DEB\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u524D\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.deb-prerm-script=DEB prerm\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.deb-postinstall-script=DEB\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5F8C\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.deb-postrm-script=DEB postrm\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.copyright-file=\u30B3\u30D4\u30FC\u30E9\u30A4\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
-resource.menu-shortcut-descriptor=\u30E1\u30CB\u30E5\u30FC\u30FB\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF
-resource.menu-icon=\u30E1\u30CB\u30E5\u30FC\u30FB\u30A2\u30A4\u30B3\u30F3
-resource.rpm-spec-file=RPM\u4ED5\u69D8\u30D5\u30A1\u30A4\u30EB
-resource.systemd-unit-file=systemd\u30E6\u30CB\u30C3\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
+resource.deb-control-file=DEB制御ファイル
+resource.deb-preinstall-script=DEBインストール前スクリプト
+resource.deb-prerm-script=DEB prermスクリプト
+resource.deb-postinstall-script=DEBインストール後スクリプト
+resource.deb-postrm-script=DEB postrmスクリプト
+resource.copyright-file=コピーライト・ファイル
+resource.menu-shortcut-descriptor=メニュー・ショートカット・ディスクリプタ
+resource.menu-icon=メニュー・アイコン
+resource.rpm-spec-file=RPM仕様ファイル
+resource.systemd-unit-file=systemdユニット・ファイル
 
-error.tool-not-found.advice=\u5FC5\u8981\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066\u304F\u3060\u3055\u3044
-error.tool-old-version.advice=\u5FC5\u8981\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066\u304F\u3060\u3055\u3044
+error.tool-not-found.advice=必要なパッケージをインストールしてください
+error.tool-old-version.advice=必要なパッケージをインストールしてください
 
-error.invalid-install-dir=\u7121\u52B9\u306A\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"
+error.invalid-install-dir=無効なインストール・ディレクトリ"{0}"
 
-error.invalid-value-for-package-name=\u30D0\u30F3\u30C9\u30EB\u540D\u306E\u5024"{0}"\u304C\u7121\u52B9\u3067\u3059\u3002
-error.invalid-value-for-package-name.advice="linux-bundle-name"\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306ADebian\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306B\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306B\u306F\u3001\u5C0F\u6587\u5B57(a-z)\u3001\u6570\u5B57(0-9)\u3001\u30D7\u30E9\u30B9(+)\u3068\u30DE\u30A4\u30CA\u30B9(-)\u306E\u8A18\u53F7\u304A\u3088\u3073\u30D4\u30EA\u30AA\u30C9(.)\u306E\u307F\u3092\u542B\u3081\u308B\u3088\u3046\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u9577\u3055\u306F2\u6587\u5B57\u4EE5\u4E0A\u3068\u3057\u3001\u82F1\u6570\u5B57\u3067\u59CB\u3081\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+error.invalid-value-for-package-name=バンドル名の値"{0}"が無効です。
+error.invalid-value-for-package-name.advice="linux-bundle-name"オプションを有効なDebianパッケージ名に設定してください。パッケージ名には、小文字(a-z)、数字(0-9)、プラス(+)とマイナス(-)の記号およびピリオド(.)のみを含めるようにしてください。長さは2文字以上とし、英数字で始める必要があります。
 
-message.icon-not-png=\u6307\u5B9A\u3057\u305F\u30A2\u30A4\u30B3\u30F3"{0}"\u306FPNG\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u306A\u304F\u3001\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u304C\u305D\u306E\u4F4D\u7F6E\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
-message.test-for-tool=[{0}]\u306E\u30C6\u30B9\u30C8\u3002\u7D50\u679C: {1}
-message.outputting-to-location=\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u306EDEB\u3092\u6B21\u306B\u751F\u6210\u3057\u3066\u3044\u307E\u3059: {0}
-message.output-to-location=\u30D1\u30C3\u30B1\u30FC\u30B8(.deb)\u306F\u6B21\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F: {0}
-message.debs-like-licenses=Debian\u30D1\u30C3\u30B1\u30FC\u30B8\u3067\u306F\u30E9\u30A4\u30BB\u30F3\u30B9\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30E9\u30A4\u30BB\u30F3\u30B9\u304C\u306A\u3044\u5834\u5408\u3001\u4E00\u90E8\u306ELinux\u30C7\u30A3\u30B9\u30C8\u30EA\u30D3\u30E5\u30FC\u30B7\u30E7\u30F3\u3067\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u54C1\u8CEA\u306B\u554F\u984C\u304C\u767A\u751F\u3059\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
-message.outputting-bundle-location=\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u306ERPM\u3092\u6B21\u306B\u751F\u6210\u3057\u3066\u3044\u307E\u3059: {0}
-message.output-bundle-location=\u30D1\u30C3\u30B1\u30FC\u30B8(.rpm)\u306F\u6B21\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F: {0}
-message.creating-association-with-null-extension=null\u62E1\u5F35\u5B50\u3068\u306E\u95A2\u9023\u4ED8\u3051\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059\u3002
+message.icon-not-png=指定したアイコン"{0}"はPNGファイルではなく、使用されません。デフォルト・アイコンがその位置に使用されます。
+message.test-for-tool=[{0}]のテスト。結果: {1}
+message.outputting-to-location=インストーラのDEBを次に生成しています: {0}
+message.output-to-location=パッケージ(.deb)は次に保存されました: {0}
+message.debs-like-licenses=Debianパッケージではライセンスを指定する必要があります。ライセンスがない場合、一部のLinuxディストリビューションでアプリケーションの品質に問題が発生する場合があります。
+message.outputting-bundle-location=インストーラのRPMを次に生成しています: {0}
+message.output-bundle-location=パッケージ(.rpm)は次に保存されました: {0}
+message.creating-association-with-null-extension=null拡張子との関連付けを作成しています。
 
-message.ldd-not-available=ldd\u30B3\u30DE\u30F3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u4F9D\u5B58\u6027\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3002
-message.deb-ldd-not-available.advice="libc-bin" DEB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066ldd\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
-message.rpm-ldd-not-available.advice="glibc-common" RPM\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066ldd\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
+message.ldd-not-available=lddコマンドが見つかりませんでした。パッケージ依存性は生成されません。
+message.deb-ldd-not-available.advice="libc-bin" DEBパッケージをインストールしてlddを取得します。
+message.rpm-ldd-not-available.advice="glibc-common" RPMパッケージをインストールしてlddを取得します。
 
-warning.foreign-app-image=\u8B66\u544A: app-image\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Fjpackage\u3067\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3002
-message.not-default-bundler-no-dependencies-lookup={0}\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30BF\u30A4\u30D7\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F9D\u5B58\u6027\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3002
+warning.foreign-app-image=警告: app-imageディレクトリはjpackageで生成されません。
+message.not-default-bundler-no-dependencies-lookup={0}はデフォルトのパッケージ・タイプではありません。パッケージの依存性は生成されません。
 
-error.unexpected-package-property="{0}"\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u5FC5\u8981\u306A\u5024\u306F[{1}]\u3067\u3059\u3002\u51FA\u529B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u5B9F\u969B\u306E\u5024\u306F[{2}]\u3067\u3059\u3002\u30EA\u30BD\u30FC\u30B9\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AB\u30B9\u30BF\u30E0"{3}"\u30D5\u30A1\u30A4\u30EB\u306B\u306F\u3001"{0}"\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u30CF\u30FC\u30C9\u30B3\u30FC\u30C9\u3055\u308C\u305F\u5024\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u3088\u3046\u3067\u3059
-error.unexpected-package-property.advice=\u30AB\u30B9\u30BF\u30E0"{3}"\u30D5\u30A1\u30A4\u30EB\u3067{2}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u30CF\u30FC\u30C9\u30B3\u30FC\u30C9\u3055\u308C\u305F\u5024[{1}]\u3067\u306F\u306A\u304F\u3001[{0}]\u30D1\u30BF\u30FC\u30F3\u6587\u5B57\u5217\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-error.unexpected-default-package-property.advice=\u30AB\u30B9\u30BF\u30E0"{1}"\u30D5\u30A1\u30A4\u30EB\u3067{0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u660E\u793A\u7684\u306B\u8A2D\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044
+error.unexpected-package-property="{0}"プロパティに必要な値は[{1}]です。出力パッケージの実際の値は[{2}]です。リソース・ディレクトリのカスタム"{3}"ファイルには、"{0}"プロパティのハードコードされた値が含まれているようです
+error.unexpected-package-property.advice=カスタム"{3}"ファイルで{2}プロパティのハードコードされた値[{1}]ではなく、[{0}]パターン文字列を使用してください
+error.unexpected-default-package-property.advice=カスタム"{1}"ファイルで{0}プロパティの値を明示的に設定しないでください
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
index 5e5a6689731..034128f653a 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
@@ -23,48 +23,48 @@
 # questions.
 #
 #
-app.bundler.name=Linux \u5E94\u7528\u7A0B\u5E8F\u6620\u50CF
-deb.bundler.name=DEB \u5305
-rpm.bundler.name=RPM \u5305
+app.bundler.name=Linux 应用程序映像
+deb.bundler.name=DEB 包
+rpm.bundler.name=RPM 包
 
-param.license-type.default=\u672A\u77E5
-param.menu-group.default=\u672A\u77E5
+param.license-type.default=未知
+param.menu-group.default=未知
 
-resource.deb-control-file=DEB \u63A7\u5236\u6587\u4EF6
-resource.deb-preinstall-script=DEB \u5B89\u88C5\u524D\u811A\u672C
-resource.deb-prerm-script=DEB \u5220\u9664\u524D\u811A\u672C
-resource.deb-postinstall-script=DEB \u5B89\u88C5\u540E\u811A\u672C
-resource.deb-postrm-script=DEB \u5220\u9664\u540E\u811A\u672C
-resource.copyright-file=\u7248\u6743\u6587\u4EF6
-resource.menu-shortcut-descriptor=\u83DC\u5355\u5FEB\u6377\u65B9\u5F0F\u63CF\u8FF0\u7B26
-resource.menu-icon=\u83DC\u5355\u56FE\u6807
-resource.rpm-spec-file=RPM \u89C4\u8303\u6587\u4EF6
-resource.systemd-unit-file=systemd \u5355\u5143\u6587\u4EF6
+resource.deb-control-file=DEB 控制文件
+resource.deb-preinstall-script=DEB 安装前脚本
+resource.deb-prerm-script=DEB 删除前脚本
+resource.deb-postinstall-script=DEB 安装后脚本
+resource.deb-postrm-script=DEB 删除后脚本
+resource.copyright-file=版权文件
+resource.menu-shortcut-descriptor=菜单快捷方式描述符
+resource.menu-icon=菜单图标
+resource.rpm-spec-file=RPM 规范文件
+resource.systemd-unit-file=systemd 单元文件
 
-error.tool-not-found.advice=\u8BF7\u5B89\u88C5\u6240\u9700\u7684\u7A0B\u5E8F\u5305
-error.tool-old-version.advice=\u8BF7\u5B89\u88C5\u6240\u9700\u7684\u7A0B\u5E8F\u5305
+error.tool-not-found.advice=请安装所需的程序包
+error.tool-old-version.advice=请安装所需的程序包
 
-error.invalid-install-dir=\u5B89\u88C5\u76EE\u5F55 "{0}" \u65E0\u6548
+error.invalid-install-dir=安装目录 "{0}" 无效
 
-error.invalid-value-for-package-name=\u5305\u540D\u7684\u503C "{0}" \u65E0\u6548\u3002
-error.invalid-value-for-package-name.advice=\u5C06 "linux-bundle-name" \u9009\u9879\u8BBE\u7F6E\u4E3A\u6709\u6548\u7684 Debian \u7A0B\u5E8F\u5305\u540D\u79F0\u3002\u8BF7\u6CE8\u610F\uFF0C\u7A0B\u5E8F\u5305\u540D\u79F0\u53EA\u80FD\u5305\u542B\u5C0F\u5199\u5B57\u6BCD (a-z)\u3001\u6570\u5B57 (0-9)\u3001\u52A0\u53F7 (+) \u548C\u51CF\u53F7 (-) \u4EE5\u53CA\u53E5\u70B9 (.)\u3002\u540D\u79F0\u957F\u5EA6\u5FC5\u987B\u81F3\u5C11\u4E3A\u4E24\u4E2A\u5B57\u7B26\u5E76\u4E14\u5FC5\u987B\u4EE5\u5B57\u6BCD\u6570\u5B57\u5B57\u7B26\u5F00\u5934\u3002
+error.invalid-value-for-package-name=包名的值 "{0}" 无效。
+error.invalid-value-for-package-name.advice=将 "linux-bundle-name" 选项设置为有效的 Debian 程序包名称。请注意，程序包名称只能包含小写字母 (a-z)、数字 (0-9)、加号 (+) 和减号 (-) 以及句点 (.)。名称长度必须至少为两个字符并且必须以字母数字字符开头。
 
-message.icon-not-png=\u6307\u5B9A\u7684\u56FE\u6807 "{0}" \u4E0D\u662F PNG \u6587\u4EF6, \u4E0D\u4F1A\u4F7F\u7528\u3002\u5C06\u4F7F\u7528\u9ED8\u8BA4\u56FE\u6807\u4EE3\u66FF\u3002
-message.test-for-tool=[{0}] \u7684\u6D4B\u8BD5\u3002\u7ED3\u679C: {1}
-message.outputting-to-location=\u6B63\u5728\u4E3A\u5B89\u88C5\u7A0B\u5E8F\u751F\u6210 DEB, \u4F4D\u7F6E: {0}\u3002
-message.output-to-location=\u7A0B\u5E8F\u5305 (.deb) \u5DF2\u4FDD\u5B58\u5230: {0}\u3002
-message.debs-like-licenses=Debian \u7A0B\u5E8F\u5305\u5E94\u6307\u5B9A\u8BB8\u53EF\u8BC1\u3002\u7F3A\u5C11\u8BB8\u53EF\u8BC1\u5C06\u5BFC\u81F4\u67D0\u4E9B Linux \u5206\u53D1\u6295\u8BC9\u5E94\u7528\u7A0B\u5E8F\u8D28\u91CF\u3002
-message.outputting-bundle-location=\u6B63\u5728\u4E3A\u5B89\u88C5\u7A0B\u5E8F\u751F\u6210 RPM, \u4F4D\u7F6E: {0}\u3002
-message.output-bundle-location=\u7A0B\u5E8F\u5305 (.rpm) \u5DF2\u4FDD\u5B58\u5230: {0}\u3002
-message.creating-association-with-null-extension=\u6B63\u5728\u4F7F\u7528\u7A7A\u6269\u5C55\u540D\u521B\u5EFA\u5173\u8054\u3002
+message.icon-not-png=指定的图标 "{0}" 不是 PNG 文件, 不会使用。将使用默认图标代替。
+message.test-for-tool=[{0}] 的测试。结果: {1}
+message.outputting-to-location=正在为安装程序生成 DEB, 位置: {0}。
+message.output-to-location=程序包 (.deb) 已保存到: {0}。
+message.debs-like-licenses=Debian 程序包应指定许可证。缺少许可证将导致某些 Linux 分发投诉应用程序质量。
+message.outputting-bundle-location=正在为安装程序生成 RPM, 位置: {0}。
+message.output-bundle-location=程序包 (.rpm) 已保存到: {0}。
+message.creating-association-with-null-extension=正在使用空扩展名创建关联。
 
-message.ldd-not-available=\u672A\u627E\u5230 ldd \u547D\u4EE4\u3002\u5C06\u4E0D\u751F\u6210\u7A0B\u5E8F\u5305\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
-message.deb-ldd-not-available.advice=\u5B89\u88C5 "libc-bin" DEB \u7A0B\u5E8F\u5305\u4EE5\u83B7\u53D6 ldd\u3002
-message.rpm-ldd-not-available.advice=\u5B89\u88C5 "glibc-common" RPM \u7A0B\u5E8F\u5305\u4EE5\u83B7\u53D6 ldd\u3002
+message.ldd-not-available=未找到 ldd 命令。将不生成程序包被依赖对象。
+message.deb-ldd-not-available.advice=安装 "libc-bin" DEB 程序包以获取 ldd。
+message.rpm-ldd-not-available.advice=安装 "glibc-common" RPM 程序包以获取 ldd。
 
-warning.foreign-app-image=\u8B66\u544A\uFF1Ajpackage \u672A\u751F\u6210 app-image \u76EE\u5F55\u3002
-message.not-default-bundler-no-dependencies-lookup={0} \u4E0D\u662F\u9ED8\u8BA4\u7A0B\u5E8F\u5305\u7C7B\u578B\u3002\u5C06\u4E0D\u751F\u6210\u7A0B\u5E8F\u5305\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
+warning.foreign-app-image=警告：jpackage 未生成 app-image 目录。
+message.not-default-bundler-no-dependencies-lookup={0} 不是默认程序包类型。将不生成程序包被依赖对象。
 
-error.unexpected-package-property="{0}" \u5C5E\u6027\u7684\u9884\u671F\u503C\u4E3A [{1}]\u3002\u8F93\u51FA\u7A0B\u5E8F\u5305\u4E2D\u7684\u5B9E\u9645\u503C\u4E3A [{2}]\u3002\u4E0E\u5B9A\u5236\u7684 "{3}" \u6587\u4EF6\u76F8\u4F3C\uFF0C\u8BE5\u6587\u4EF6\u6240\u5728\u7684\u8D44\u6E90\u76EE\u5F55\u4E2D\u5305\u542B "{0}" \u5C5E\u6027\u7684\u786C\u7F16\u7801\u503C
-error.unexpected-package-property.advice=\u5728\u5B9A\u5236\u7684 "{3}" \u6587\u4EF6\u4E2D\u4F7F\u7528 [{0}] \u6A21\u5F0F\u5B57\u7B26\u4E32\uFF0C\u800C\u975E {2} \u5C5E\u6027\u7684\u786C\u7F16\u7801\u503C [{1}]
-error.unexpected-default-package-property.advice=\u8BF7\u52FF\u5728\u5B9A\u5236\u7684 "{1}" \u6587\u4EF6\u4E2D\u663E\u5F0F\u8BBE\u7F6E {0} \u5C5E\u6027\u7684\u503C
+error.unexpected-package-property="{0}" 属性的预期值为 [{1}]。输出程序包中的实际值为 [{2}]。与定制的 "{3}" 文件相似，该文件所在的资源目录中包含 "{0}" 属性的硬编码值
+error.unexpected-package-property.advice=在定制的 "{3}" 文件中使用 [{0}] 模式字符串，而非 {2} 属性的硬编码值 [{1}]
+error.unexpected-default-package-property.advice=请勿在定制的 "{1}" 文件中显式设置 {0} 属性的值
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
index 3e6220733d3..6dd037c9bce 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
@@ -25,24 +25,24 @@
 #
 
 app.bundler.name=Mac-Anwendungsimage
-store.bundler.name=Mac App Store-f\u00E4higer Bundler
+store.bundler.name=Mac App Store-fähiger Bundler
 dmg.bundler.name=Mac-DMG-Package
 pkg.bundler.name=Mac-PKG-Package
 
-error.invalid-cfbundle-version.advice=Legen Sie einen kompatiblen Wert f\u00FCr "app-version" fest. G\u00FCltige Versionsnummern sind ein bis drei durch Punkte getrennte Ganzzahlen.
+error.invalid-cfbundle-version.advice=Legen Sie einen kompatiblen Wert für "app-version" fest. Gültige Versionsnummern sind ein bis drei durch Punkte getrennte Ganzzahlen.
 error.explicit-sign-no-cert=Signatur wurde explizit angefordert, doch es wurde kein Signaturzertifikat gefunden
-error.explicit-sign-no-cert.advice=Geben Sie g\u00FCltige Werte f\u00FCr mac-signing-key-user-name und mac-signing-keychain an
-error.must-sign-app-store=Mac App Store-Apps m\u00FCssen signiert werden. Die Signierung wurde von der Bundler-Konfiguration deaktiviert
-error.must-sign-app-store.advice=Verwenden Sie die Option --mac-sign mit entsprechenden Werten f\u00FCr user-name und keychain
-error.no-app-signing-key=Kein Signaturschl\u00FCssel f\u00FCr Mac App Store-App
-error.no-app-signing-key.advice=Installieren Sie Ihre App-Signaturschl\u00FCssel mit XCode in Ihrem Mac-Schl\u00FCsselbund.
-error.no-pkg-signing-key=Kein Signaturschl\u00FCssel f\u00FCr Mac App Store-Installationsprogramm
-error.no-pkg-signing-key.advice=Installieren Sie Ihre App-Signaturschl\u00FCssel mit XCode in Ihrem Mac-Schl\u00FCsselbund.
+error.explicit-sign-no-cert.advice=Geben Sie gültige Werte für mac-signing-key-user-name und mac-signing-keychain an
+error.must-sign-app-store=Mac App Store-Apps müssen signiert werden. Die Signierung wurde von der Bundler-Konfiguration deaktiviert
+error.must-sign-app-store.advice=Verwenden Sie die Option --mac-sign mit entsprechenden Werten für user-name und keychain
+error.no-app-signing-key=Kein Signaturschlüssel für Mac App Store-App
+error.no-app-signing-key.advice=Installieren Sie Ihre App-Signaturschlüssel mit XCode in Ihrem Mac-Schlüsselbund.
+error.no-pkg-signing-key=Kein Signaturschlüssel für Mac App Store-Installationsprogramm
+error.no-pkg-signing-key.advice=Installieren Sie Ihre App-Signaturschlüssel mit XCode in Ihrem Mac-Schlüsselbund.
 error.certificate.expired=Fehler: Zertifikat abgelaufen {0}
-error.no.xcode.signing=F\u00FCr die Signatur ist Xcode mit Befehlszeilen-Entwicklertools erforderlich
+error.no.xcode.signing=Für die Signatur ist Xcode mit Befehlszeilen-Entwicklertools erforderlich
 error.no.xcode.signing.advice=Installieren Sie Xcode mit Befehlszeilen-Entwicklertools.
-error.cert.not.found=Kein Zertifikat gefunden, das [{0}] mit Schl\u00FCsselbund [{1}] entspricht
-error.multiple.certs.found=WARNUNG: Mehrere Zertifikate gefunden, die [{0}] mit Schl\u00FCsselbund [{1}] entsprechen. Es wird das erste Zertifikat verwendet
+error.cert.not.found=Kein Zertifikat gefunden, das [{0}] mit Schlüsselbund [{1}] entspricht
+error.multiple.certs.found=WARNUNG: Mehrere Zertifikate gefunden, die [{0}] mit Schlüsselbund [{1}] entsprechen. Es wird das erste Zertifikat verwendet
 error.app-image.mac-sign.required=Fehler: Die Option "--mac-sign" ist mit einem vordefinierten Anwendungsimage und Typ [app-image] erforderlich
 resource.bundle-config-file=Bundle-Konfigurationsdatei
 resource.app-info-plist=Info.plist der Anwendung
@@ -51,47 +51,47 @@ resource.entitlements=Mac-Berechtigungen
 resource.dmg-setup-script=DMG-Setupskript
 resource.license-setup=Lizenzsetup
 resource.dmg-background=DMG-Hintergrund
-resource.volume-icon=Symbol "Datentr\u00E4ger"
-resource.post-install-script=Auszuf\u00FChrendes Skript nach dem Auff\u00FCllen des Anwendungsimages
+resource.volume-icon=Symbol "Datenträger"
+resource.post-install-script=Auszuführendes Skript nach dem Auffüllen des Anwendungsimages
 resource.pkg-preinstall-script=PKG-Preinstall-Skript
 resource.pkg-postinstall-script=PKG-Postinstall-Skript
-resource.pkg-services-preinstall-script=PKG-Preinstall-Skript f\u00FCr Servicepackage
-resource.pkg-services-postinstall-script=PKG-Postinstall-Skript f\u00FCr Servicepackage
+resource.pkg-services-preinstall-script=PKG-Preinstall-Skript für Servicepackage
+resource.pkg-services-postinstall-script=PKG-Postinstall-Skript für Servicepackage
 resource.pkg-uninstall-script=PKG-Deinstallationsskript
 resource.pkg-background-image=PKG-Hintergrundbild
 resource.pkg-pdf=Projektdefinitionsdatei
 resource.launchd-plist-file=launchd-PLIST-Datei
 
 
-message.bundle-name-too-long-warning={0} ist auf "{1}" gesetzt. Dies ist l\u00E4nger als 16 Zeichen. K\u00FCrzen Sie den Wert, um die Mac-Nutzungserfahrung zu verbessern.
+message.bundle-name-too-long-warning={0} ist auf "{1}" gesetzt. Dies ist länger als 16 Zeichen. Kürzen Sie den Wert, um die Mac-Nutzungserfahrung zu verbessern.
 message.preparing-info-plist=Info.plist wird vorbereitet: {0}.
 message.icon-not-icns= Das angegebene Symbol "{0}" ist keine ICNS-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
 message.version-string-too-many-components="app-version" darf ein bis drei Zahlen aufweisen: 1, 1.2, 1.2.3.
 message.version-string-first-number-not-zero=Die erste Zahl in app-version darf nicht null oder negativ sein.
-message.creating-association-with-null-extension=Verkn\u00FCpfung mit Nullerweiterung wird erstellt.
-message.ignoring.symlink=Warnung: codesign \u00FCberspringt den Symlink {0}.
+message.creating-association-with-null-extension=Verknüpfung mit Nullerweiterung wird erstellt.
+message.ignoring.symlink=Warnung: codesign überspringt den Symlink {0}.
 message.already.signed=Datei ist bereits signiert: {0}.
-message.keychain.error=Fehler: Schl\u00FCsselbundliste kann nicht abgerufen werden.
-message.building-bundle=Mac App Store-Package f\u00FCr {0} wird erstellt.
+message.keychain.error=Fehler: Schlüsselbundliste kann nicht abgerufen werden.
+message.building-bundle=Mac App Store-Package für {0} wird erstellt.
 message.app-image-dir-does-not-exist=Angegebenes Anwendungsimageverzeichnis {0}: {1} ist nicht vorhanden.
-message.app-image-dir-does-not-exist.advice=Best\u00E4tigen Sie, dass der Wert f\u00FCr {0} vorhanden ist.
-message.app-image-requires-app-name=Beim Verwenden eines internen Anwendungsimages m\u00FCssen Sie den Anwendungsnamen angeben.
+message.app-image-dir-does-not-exist.advice=Bestätigen Sie, dass der Wert für {0} vorhanden ist.
+message.app-image-requires-app-name=Beim Verwenden eines internen Anwendungsimages müssen Sie den Anwendungsnamen angeben.
 message.app-image-requires-app-name.advice=Legen Sie den Anwendungsnamen mit dem CLI-Kennzeichen -name, dem fx:application/@name ANT-Attribut oder dem Bundler-Argument "appName" fest.
 message.app-image-requires-identifier=ID kann nicht aus Anwendungsimage extrahiert werden.
-message.app-image-requires-identifier.advice=Verwenden Sie "--verbose" f\u00FCr eine erweiterte Fehlermeldung, oder geben Sie sie mit "--mac-package-identifier" an.
-message.invalid-identifier=Ung\u00FCltige Mac-Bundle-ID [{0}].
+message.app-image-requires-identifier.advice=Verwenden Sie "--verbose" für eine erweiterte Fehlermeldung, oder geben Sie sie mit "--mac-package-identifier" an.
+message.invalid-identifier=Ungültige Mac-Bundle-ID [{0}].
 message.invalid-identifier.advice=Geben Sie die ID mit "--mac-package-identifier" an.
-message.building-dmg=DMG-Package f\u00FCr {0} wird erstellt.
-message.running-script=Shellskript wird auf Anwendungsimage [{0}] ausgef\u00FChrt.
+message.building-dmg=DMG-Package für {0} wird erstellt.
+message.running-script=Shellskript wird auf Anwendungsimage [{0}] ausgeführt.
 message.preparing-dmg-setup=DMG-Setup wird vorbereitet: {0}.
 message.creating-dmg-file=DMG-Datei wird erstellt: {0}.
 message.dmg-cannot-be-overwritten=DMG-Datei [{0}] ist vorhanden und kann nicht entfernt werden.
-message.output-to-location=Ergebnis von DMG-Installationsprogramm f\u00FCr {0}: {1}.
-message.building-pkg=PKG-Package f\u00FCr {0} wird erstellt.
+message.output-to-location=Ergebnis von DMG-Installationsprogramm für {0}: {1}.
+message.building-pkg=PKG-Package für {0} wird erstellt.
 message.preparing-scripts=Packageskripte werden vorbereitet.
 message.preparing-distribution-dist=distribution.dist wird vorbereitet: {0}.
-message.signing.pkg=Warnung: Zum Signieren von PKG m\u00FCssen Sie m\u00F6glicherweise mit dem Schl\u00FCsselbundverwaltungstool die Option "Immer vertrauen" f\u00FCr Ihr Zertifikat festlegen.
-message.setfile.dmg=Das Festlegen des benutzerdefinierten Symbols f\u00FCr die DMG-Datei wurde \u00FCbersprungen, weil das Utility "SetFile" nicht gefunden wurde. Durch Installieren von Xcode mit Befehlszeilentools sollte dieses Problem behoben werden.
-message.install-dir-ignored=Warnung: "--install-dir" wird von DMG nicht unterst\u00FCtzt. Stattdessen wird standardm\u00E4\u00DFig /Applications verwendet.
+message.signing.pkg=Warnung: Zum Signieren von PKG müssen Sie möglicherweise mit dem Schlüsselbundverwaltungstool die Option "Immer vertrauen" für Ihr Zertifikat festlegen.
+message.setfile.dmg=Das Festlegen des benutzerdefinierten Symbols für die DMG-Datei wurde übersprungen, weil das Utility "SetFile" nicht gefunden wurde. Durch Installieren von Xcode mit Befehlszeilentools sollte dieses Problem behoben werden.
+message.install-dir-ignored=Warnung: "--install-dir" wird von DMG nicht unterstützt. Stattdessen wird standardmäßig /Applications verwendet.
 warning.unsigned.app.image=Warnung: Nicht signiertes app-image wird zum Erstellen von signiertem {0} verwendet.
-warning.per.user.app.image.signed=Warnung: Konfiguration der installierten Anwendung pro Benutzer wird nicht unterst\u00FCtzt, da "{0}" im vordefinierten signierten Anwendungsimage fehlt.
+warning.per.user.app.image.signed=Warnung: Konfiguration der installierten Anwendung pro Benutzer wird nicht unterstützt, da "{0}" im vordefinierten signierten Anwendungsimage fehlt.
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
index e7728d45554..b75d1dc465f 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
@@ -24,74 +24,74 @@
 #
 #
 
-app.bundler.name=Mac\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8
-store.bundler.name=Mac App Store\u306E\u6E96\u5099\u5B8C\u4E86\u30D0\u30F3\u30C9\u30E9
-dmg.bundler.name=Mac DMG\u30D1\u30C3\u30B1\u30FC\u30B8
-pkg.bundler.name=Mac PKG\u30D1\u30C3\u30B1\u30FC\u30B8
+app.bundler.name=Macアプリケーション・イメージ
+store.bundler.name=Mac App Storeの準備完了バンドラ
+dmg.bundler.name=Mac DMGパッケージ
+pkg.bundler.name=Mac PKGパッケージ
 
-error.invalid-cfbundle-version.advice=\u4E92\u63DB\u6027\u306E\u3042\u308B'app-version'\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\u6709\u52B9\u306A\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u3001\u30C9\u30C3\u30C8\u3067\u533A\u5207\u3089\u308C\u305F1\u304B\u30893\u3064\u306E\u6574\u6570\u3067\u3059\u3002
-error.explicit-sign-no-cert=\u7F72\u540D\u304C\u660E\u793A\u7684\u306B\u8981\u6C42\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u7F72\u540D\u8A3C\u660E\u66F8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-error.explicit-sign-no-cert.advice=\u6709\u52B9\u306Amac-signing-key-user-name\u304A\u3088\u3073mac-signing-keychain\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
-error.must-sign-app-store=Mac App Store\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306F\u7F72\u540D\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u304C\u3001\u7F72\u540D\u306F\u30D0\u30F3\u30C9\u30E9\u69CB\u6210\u306B\u3088\u3063\u3066\u7121\u52B9\u5316\u3055\u308C\u3066\u3044\u307E\u3059
-error.must-sign-app-store.advice=--mac-sign\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u9069\u5207\u306Auser-name\u304A\u3088\u3073keychain\u4ED8\u304D\u3067\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-error.no-app-signing-key=Mac App Store\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u7F72\u540D\u30AD\u30FC\u304C\u3042\u308A\u307E\u305B\u3093
-error.no-app-signing-key.advice=XCode\u3092\u4F7F\u7528\u3057\u3066\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u7F72\u540D\u30AD\u30FC\u3092Mac\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u3002
-error.no-pkg-signing-key=Mac App Store\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u306E\u7F72\u540D\u30AD\u30FC\u304C\u3042\u308A\u307E\u305B\u3093
-error.no-pkg-signing-key.advice=XCode\u3092\u4F7F\u7528\u3057\u3066\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u7F72\u540D\u30AD\u30FC\u3092Mac\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u3002
-error.certificate.expired=\u30A8\u30E9\u30FC: \u8A3C\u660E\u66F8\u306F{0}\u306B\u671F\u9650\u304C\u5207\u308C\u307E\u3057\u305F
-error.no.xcode.signing=\u7F72\u540D\u306B\u306F\u3001Xcode\u3068\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30C7\u30D9\u30ED\u30C3\u30D1\u30FB\u30C4\u30FC\u30EB\u304C\u5FC5\u8981\u3067\u3059
-error.no.xcode.signing.advice=Xcode\u3068\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30C7\u30D9\u30ED\u30C3\u30D1\u30FB\u30C4\u30FC\u30EB\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-error.cert.not.found=\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3[{1}]\u3092\u4F7F\u7528\u3059\u308B[{0}]\u3068\u4E00\u81F4\u3059\u308B\u8A3C\u660E\u66F8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-error.multiple.certs.found=\u8B66\u544A: \u30AD\u30FC\u30C1\u30A7\u30FC\u30F3[{1}]\u3092\u4F7F\u7528\u3059\u308B[{0}]\u3068\u4E00\u81F4\u3059\u308B\u8907\u6570\u306E\u8A3C\u660E\u66F8\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u6700\u521D\u306E\u3082\u306E\u3092\u4F7F\u7528\u3057\u307E\u3059
-error.app-image.mac-sign.required=\u30A8\u30E9\u30FC: --mac-sign\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u4E8B\u524D\u5B9A\u7FA9\u6E08\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u304A\u3088\u3073\u30BF\u30A4\u30D7[app-image]\u3067\u5FC5\u8981\u3067\u3059
-resource.bundle-config-file=\u30D0\u30F3\u30C9\u30EB\u69CB\u6210\u30D5\u30A1\u30A4\u30EB
-resource.app-info-plist=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306EInfo.plist
-resource.runtime-info-plist=Java\u30E9\u30F3\u30BF\u30A4\u30E0\u306EInfo.plist
-resource.entitlements=Mac\u6A29\u9650
-resource.dmg-setup-script=DMG\u8A2D\u5B9A\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.license-setup=\u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u8A2D\u5B9A
-resource.dmg-background=dmg\u80CC\u666F
-resource.volume-icon=\u30DC\u30EA\u30E5\u30FC\u30E0\u30FB\u30A2\u30A4\u30B3\u30F3
-resource.post-install-script=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u79FB\u5165\u3057\u305F\u5F8C\u306B\u5B9F\u884C\u3059\u308B\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.pkg-preinstall-script=PKG\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u524D\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.pkg-postinstall-script=PKG\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5F8C\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.pkg-services-preinstall-script=\u30B5\u30FC\u30D3\u30B9\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306EPKG\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u524D\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.pkg-services-postinstall-script=\u30B5\u30FC\u30D3\u30B9\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306EPKG\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5F8C\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.pkg-uninstall-script=PKG\u30A2\u30F3\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u30FB\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.pkg-background-image=pkg\u80CC\u666F\u30A4\u30E1\u30FC\u30B8
-resource.pkg-pdf=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5B9A\u7FA9\u30D5\u30A1\u30A4\u30EB
-resource.launchd-plist-file=launchd plist\u30D5\u30A1\u30A4\u30EB
+error.invalid-cfbundle-version.advice=互換性のある'app-version'値を設定します。有効なバージョンは、ドットで区切られた1から3つの整数です。
+error.explicit-sign-no-cert=署名が明示的に要求されましたが、署名証明書が見つかりません
+error.explicit-sign-no-cert.advice=有効なmac-signing-key-user-nameおよびmac-signing-keychainを指定してください
+error.must-sign-app-store=Mac App Storeアプリケーションは署名されている必要がありますが、署名はバンドラ構成によって無効化されています
+error.must-sign-app-store.advice=--mac-signオプションを適切なuser-nameおよびkeychain付きで使用してください
+error.no-app-signing-key=Mac App Storeアプリケーションの署名キーがありません
+error.no-app-signing-key.advice=XCodeを使用してアプリケーションの署名キーをMacキーチェーンにインストールします。
+error.no-pkg-signing-key=Mac App Storeインストーラの署名キーがありません
+error.no-pkg-signing-key.advice=XCodeを使用してアプリケーションの署名キーをMacキーチェーンにインストールします。
+error.certificate.expired=エラー: 証明書は{0}に期限が切れました
+error.no.xcode.signing=署名には、Xcodeとコマンドライン・デベロッパ・ツールが必要です
+error.no.xcode.signing.advice=Xcodeとコマンドライン・デベロッパ・ツールをインストールしてください。
+error.cert.not.found=キーチェーン[{1}]を使用する[{0}]と一致する証明書が見つかりません
+error.multiple.certs.found=警告: キーチェーン[{1}]を使用する[{0}]と一致する複数の証明書が見つかりました。最初のものを使用します
+error.app-image.mac-sign.required=エラー: --mac-signオプションは、事前定義済アプリケーション・イメージおよびタイプ[app-image]で必要です
+resource.bundle-config-file=バンドル構成ファイル
+resource.app-info-plist=アプリケーションのInfo.plist
+resource.runtime-info-plist=JavaランタイムのInfo.plist
+resource.entitlements=Mac権限
+resource.dmg-setup-script=DMG設定スクリプト
+resource.license-setup=ライセンスの設定
+resource.dmg-background=dmg背景
+resource.volume-icon=ボリューム・アイコン
+resource.post-install-script=アプリケーション・イメージを移入した後に実行するスクリプト
+resource.pkg-preinstall-script=PKGインストール前スクリプト
+resource.pkg-postinstall-script=PKGインストール後スクリプト
+resource.pkg-services-preinstall-script=サービス・パッケージのPKGインストール前スクリプト
+resource.pkg-services-postinstall-script=サービス・パッケージのPKGインストール後スクリプト
+resource.pkg-uninstall-script=PKGアンインストーラ・スクリプト
+resource.pkg-background-image=pkg背景イメージ
+resource.pkg-pdf=プロジェクト定義ファイル
+resource.launchd-plist-file=launchd plistファイル
 
 
-message.bundle-name-too-long-warning={0}\u304C16\u6587\u5B57\u3092\u8D85\u3048\u308B''{1}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002Mac\u3067\u306E\u64CD\u4F5C\u6027\u3092\u3088\u308A\u826F\u304F\u3059\u308B\u305F\u3081\u306B\u77ED\u304F\u3059\u308B\u3053\u3068\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-message.preparing-info-plist=Info.plist\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}\u3002
-message.icon-not-icns= \u6307\u5B9A\u3057\u305F\u30A2\u30A4\u30B3\u30F3"{0}"\u306FICNS\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u306A\u304F\u3001\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u304C\u305D\u306E\u4F4D\u7F6E\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
-message.version-string-too-many-components='app-version'\u306B\u306F\u30011\u30011.2\u30011.2.3\u306A\u30691\u304B\u30893\u306E\u6570\u5B57\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-message.version-string-first-number-not-zero=pp-version\u306E\u6700\u521D\u306E\u6570\u5B57\u306F\u3001\u30BC\u30ED\u307E\u305F\u306F\u8CA0\u306E\u5024\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-message.creating-association-with-null-extension=null\u62E1\u5F35\u5B50\u3068\u306E\u95A2\u9023\u4ED8\u3051\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059\u3002
-message.ignoring.symlink=\u8B66\u544A: codesign\u304Csymlink {0}\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059
-message.already.signed=\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u3059: {0}\u3002
-message.keychain.error=\u30A8\u30E9\u30FC: \u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u30FB\u30EA\u30B9\u30C8\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3002
-message.building-bundle={0}\u306EMac App Store\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059\u3002
-message.app-image-dir-does-not-exist=\u6307\u5B9A\u3055\u308C\u305F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA {0}: {1}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
-message.app-image-dir-does-not-exist.advice={0}\u306E\u5024\u304C\u5B58\u5728\u3059\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044
-message.app-image-requires-app-name=\u5916\u90E8\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F7F\u7528\u3059\u308B\u5834\u5408\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-message.app-image-requires-app-name.advice=-name CLI\u30D5\u30E9\u30B0\u3001fx:application/@name ANT\u5C5E\u6027\u307E\u305F\u306F'appName'\u30D0\u30F3\u30C9\u30E9\u5F15\u6570\u3067\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002
-message.app-image-requires-identifier=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u8B58\u5225\u5B50\u3092\u62BD\u51FA\u3067\u304D\u307E\u305B\u3093\u3002
-message.app-image-requires-identifier.advice=\u62E1\u5F35\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u306B"--verbose"\u3092\u4F7F\u7528\u3059\u308B\u304B\u3001"--mac-package-identifier"\u3092\u4F7F\u7528\u3057\u3066\u6307\u5B9A\u3057\u307E\u3059\u3002
-message.invalid-identifier=mac\u30D0\u30F3\u30C9\u30EB\u8B58\u5225\u5B50[{0}]\u304C\u7121\u52B9\u3067\u3059\u3002
-message.invalid-identifier.advice="--mac-package-identifier"\u3067\u8B58\u5225\u5B50\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-message.building-dmg={0}\u306EDMG\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059
-message.running-script=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8[{0}]\u3067\u30B7\u30A7\u30EB\u30FB\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u5B9F\u884C\u3057\u3066\u3044\u307E\u3059\u3002
-message.preparing-dmg-setup=dmg\u306E\u8A2D\u5B9A\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}
-message.creating-dmg-file=DMG\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059: {0}
-message.dmg-cannot-be-overwritten=Dmg\u30D5\u30A1\u30A4\u30EB\u306F\u5B58\u5728\u3057[{0}]\u3001\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002
-message.output-to-location={0}\u306E\u7D50\u679C\u306EDMG\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9: {1}
-message.building-pkg={0}\u306EPKG\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059
-message.preparing-scripts=\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059
-message.preparing-distribution-dist=distribution.dist\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}
-message.signing.pkg=\u8B66\u544A: PKG\u3078\u306E\u7F72\u540D\u306E\u5834\u5408\u3001\u300C\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u30FB\u30A2\u30AF\u30BB\u30B9\u300D\u30C4\u30FC\u30EB\u3092\u4F7F\u7528\u3057\u3066\u8A3C\u660E\u66F8\u306B\u300C\u5E38\u306B\u4FE1\u983C\u3059\u308B\u300D\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-message.setfile.dmg='SetFile'\u30E6\u30FC\u30C6\u30A3\u30EA\u30C6\u30A3\u304C\u898B\u3064\u304B\u3089\u306A\u3044\u305F\u3081\u3001DMG\u30D5\u30A1\u30A4\u30EB\u3067\u306E\u30AB\u30B9\u30BF\u30E0\u30FB\u30A2\u30A4\u30B3\u30F3\u306E\u8A2D\u5B9A\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3057\u305F\u3002Xcode\u3068\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u30FB\u30C4\u30FC\u30EB\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u3068\u3001\u3053\u306E\u554F\u984C\u306F\u89E3\u6C7A\u3055\u308C\u307E\u3059\u3002
-message.install-dir-ignored=\u8B66\u544A: "--install-dir"\u306FDMG\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002/Applications\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002
-warning.unsigned.app.image=\u8B66\u544A: \u7F72\u540D\u3055\u308C\u3066\u3044\u306A\u3044app-image\u3092\u4F7F\u7528\u3057\u3066\u7F72\u540D\u3055\u308C\u305F{0}\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
-warning.per.user.app.image.signed=\u8B66\u544A: \u4E8B\u524D\u5B9A\u7FA9\u6E08\u306E\u7F72\u540D\u4ED8\u304D\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306B"{0}"\u304C\u306A\u3044\u305F\u3081\u3001\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E6\u30FC\u30B6\u30FC\u3054\u3068\u306E\u69CB\u6210\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3002
+message.bundle-name-too-long-warning={0}が16文字を超える''{1}''に設定されています。Macでの操作性をより良くするために短くすることを検討してください。
+message.preparing-info-plist=Info.plistを準備しています: {0}。
+message.icon-not-icns= 指定したアイコン"{0}"はICNSファイルではなく、使用されません。デフォルト・アイコンがその位置に使用されます。
+message.version-string-too-many-components='app-version'には、1、1.2、1.2.3など1から3の数字を使用できます。
+message.version-string-first-number-not-zero=pp-versionの最初の数字は、ゼロまたは負の値にできません。
+message.creating-association-with-null-extension=null拡張子との関連付けを作成しています。
+message.ignoring.symlink=警告: codesignがsymlink {0}をスキップしています
+message.already.signed=ファイルはすでに署名されています: {0}。
+message.keychain.error=エラー: キーチェーン・リストを取得できません。
+message.building-bundle={0}のMac App Storeパッケージを作成しています。
+message.app-image-dir-does-not-exist=指定されたアプリケーション・イメージ・ディレクトリ {0}: {1}は存在しません。
+message.app-image-dir-does-not-exist.advice={0}の値が存在することを確認してください
+message.app-image-requires-app-name=外部アプリケーション・イメージを使用する場合、アプリケーション名を指定する必要があります。
+message.app-image-requires-app-name.advice=-name CLIフラグ、fx:application/@name ANT属性または'appName'バンドラ引数でアプリケーション名を設定します。
+message.app-image-requires-identifier=アプリケーション・イメージから識別子を抽出できません。
+message.app-image-requires-identifier.advice=拡張エラー・メッセージに"--verbose"を使用するか、"--mac-package-identifier"を使用して指定します。
+message.invalid-identifier=macバンドル識別子[{0}]が無効です。
+message.invalid-identifier.advice="--mac-package-identifier"で識別子を指定してください。
+message.building-dmg={0}のDMGパッケージを作成しています
+message.running-script=アプリケーション・イメージ[{0}]でシェル・スクリプトを実行しています。
+message.preparing-dmg-setup=dmgの設定を準備しています: {0}
+message.creating-dmg-file=DMGファイルを作成しています: {0}
+message.dmg-cannot-be-overwritten=Dmgファイルは存在し[{0}]、削除できません。
+message.output-to-location={0}の結果のDMGインストーラ: {1}
+message.building-pkg={0}のPKGパッケージを作成しています
+message.preparing-scripts=パッケージ・スクリプトを準備しています
+message.preparing-distribution-dist=distribution.distを準備しています: {0}
+message.signing.pkg=警告: PKGへの署名の場合、「キーチェーン・アクセス」ツールを使用して証明書に「常に信頼する」を設定する必要があります。
+message.setfile.dmg='SetFile'ユーティリティが見つからないため、DMGファイルでのカスタム・アイコンの設定がスキップされました。Xcodeとコマンド・ライン・ツールをインストールすると、この問題は解決されます。
+message.install-dir-ignored=警告: "--install-dir"はDMGでサポートされていません。/Applicationsにデフォルト設定されます。
+warning.unsigned.app.image=警告: 署名されていないapp-imageを使用して署名された{0}を作成します。
+warning.per.user.app.image.signed=警告: 事前定義済の署名付きアプリケーション・イメージに"{0}"がないため、インストール済アプリケーションのユーザーごとの構成はサポートされません。
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
index e03c53f6f11..dc1f592852d 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
@@ -24,74 +24,74 @@
 #
 #
 
-app.bundler.name=Mac \u5E94\u7528\u7A0B\u5E8F\u6620\u50CF
-store.bundler.name=\u652F\u6301 Mac App Store \u7684\u6253\u5305\u7A0B\u5E8F
-dmg.bundler.name=Mac DMG \u7A0B\u5E8F\u5305
-pkg.bundler.name=Mac PKG \u7A0B\u5E8F\u5305
+app.bundler.name=Mac 应用程序映像
+store.bundler.name=支持 Mac App Store 的打包程序
+dmg.bundler.name=Mac DMG 程序包
+pkg.bundler.name=Mac PKG 程序包
 
-error.invalid-cfbundle-version.advice=\u8BBE\u7F6E\u517C\u5BB9\u7684 'app-version' \u503C\u3002\u6709\u6548\u7248\u672C\u5305\u542B\u4E00\u5230\u4E09\u4E2A\u7528\u70B9\u5206\u9694\u7684\u6574\u6570\u3002
-error.explicit-sign-no-cert=\u5DF2\u660E\u786E\u8BF7\u6C42\u7B7E\u540D\uFF0C\u4F46\u627E\u4E0D\u5230\u7B7E\u540D\u8BC1\u4E66
-error.explicit-sign-no-cert.advice=\u6307\u5B9A\u6709\u6548\u7684 mac-signing-key-user-name \u548C mac-signing-keychain
-error.must-sign-app-store=Mac App Store \u5E94\u7528\u7A0B\u5E8F\u5FC5\u987B\u7B7E\u540D, \u800C\u6253\u5305\u7A0B\u5E8F\u914D\u7F6E\u5DF2\u7981\u7528\u7B7E\u540D
-error.must-sign-app-store.advice=\u5C06 --mac-sign \u9009\u9879\u7528\u4E8E\u9002\u5F53\u7684\u7528\u6237\u540D\u548C\u5BC6\u94A5\u94FE
-error.no-app-signing-key=\u65E0 Mac App Store \u5E94\u7528\u7A0B\u5E8F\u7B7E\u540D\u5BC6\u94A5
-error.no-app-signing-key.advice=\u4F7F\u7528 XCode \u5C06\u5E94\u7528\u7A0B\u5E8F\u7B7E\u540D\u5BC6\u94A5\u5B89\u88C5\u5230 Mac \u5BC6\u94A5\u94FE\u4E2D\u3002
-error.no-pkg-signing-key=\u65E0 Mac App Store \u5B89\u88C5\u7A0B\u5E8F\u7B7E\u540D\u5BC6\u94A5
-error.no-pkg-signing-key.advice=\u4F7F\u7528 XCode \u5C06\u5E94\u7528\u7A0B\u5E8F\u7B7E\u540D\u5BC6\u94A5\u5B89\u88C5\u5230 Mac \u5BC6\u94A5\u94FE\u4E2D\u3002
-error.certificate.expired=\u9519\u8BEF: \u8BC1\u4E66\u5DF2\u5931\u6548 {0}
-error.no.xcode.signing=\u9700\u8981\u4F7F\u7528\u5E26\u547D\u4EE4\u884C\u5F00\u53D1\u4EBA\u5458\u5DE5\u5177\u7684 Xcode \u8FDB\u884C\u7B7E\u540D
-error.no.xcode.signing.advice=\u5B89\u88C5\u5E26\u547D\u4EE4\u884C\u5F00\u53D1\u4EBA\u5458\u5DE5\u5177\u7684 Xcode\u3002
-error.cert.not.found=\u4F7F\u7528\u5BC6\u94A5\u94FE [{1}] \u627E\u4E0D\u5230\u4E0E [{0}] \u5339\u914D\u7684\u8BC1\u4E66
-error.multiple.certs.found=\u8B66\u544A\uFF1A\u4F7F\u7528\u5BC6\u94A5\u94FE [{1}] \u627E\u5230\u591A\u4E2A\u4E0E [{0}] \u5339\u914D\u7684\u8BC1\u4E66\uFF0C\u5C06\u4F7F\u7528\u7B2C\u4E00\u4E2A\u8BC1\u4E66
-error.app-image.mac-sign.required=\u9519\u8BEF\uFF1A\u9884\u5B9A\u4E49\u7684\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u548C\u7C7B\u578B [app image] \u9700\u8981 --mac-sign \u9009\u9879
-resource.bundle-config-file=\u5305\u914D\u7F6E\u6587\u4EF6
-resource.app-info-plist=\u5E94\u7528\u7A0B\u5E8F Info.plist
-resource.runtime-info-plist=Java \u8FD0\u884C\u65F6 Info.plist
-resource.entitlements=Mac \u6743\u5229
-resource.dmg-setup-script=DMG \u8BBE\u7F6E\u811A\u672C
-resource.license-setup=\u8BB8\u53EF\u8BC1\u8BBE\u7F6E
-resource.dmg-background=DMG \u80CC\u666F
-resource.volume-icon=\u5377\u56FE\u6807
-resource.post-install-script=\u8981\u5728\u586B\u5145\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u4E4B\u540E\u8FD0\u884C\u7684\u811A\u672C
-resource.pkg-preinstall-script=PKG \u5B89\u88C5\u524D\u811A\u672C
-resource.pkg-postinstall-script=PKG \u5B89\u88C5\u540E\u811A\u672C
-resource.pkg-services-preinstall-script=\u670D\u52A1\u7A0B\u5E8F\u5305\u7684 PKG \u5B89\u88C5\u524D\u811A\u672C
-resource.pkg-services-postinstall-script=\u670D\u52A1\u7A0B\u5E8F\u5305\u7684 PKG \u5B89\u88C5\u540E\u811A\u672C
-resource.pkg-uninstall-script=PKG \u5378\u8F7D\u7A0B\u5E8F\u811A\u672C
-resource.pkg-background-image=pkg \u80CC\u666F\u56FE\u50CF
-resource.pkg-pdf=\u9879\u76EE\u5B9A\u4E49\u6587\u4EF6
-resource.launchd-plist-file=launchd plist \u6587\u4EF6
+error.invalid-cfbundle-version.advice=设置兼容的 'app-version' 值。有效版本包含一到三个用点分隔的整数。
+error.explicit-sign-no-cert=已明确请求签名，但找不到签名证书
+error.explicit-sign-no-cert.advice=指定有效的 mac-signing-key-user-name 和 mac-signing-keychain
+error.must-sign-app-store=Mac App Store 应用程序必须签名, 而打包程序配置已禁用签名
+error.must-sign-app-store.advice=将 --mac-sign 选项用于适当的用户名和密钥链
+error.no-app-signing-key=无 Mac App Store 应用程序签名密钥
+error.no-app-signing-key.advice=使用 XCode 将应用程序签名密钥安装到 Mac 密钥链中。
+error.no-pkg-signing-key=无 Mac App Store 安装程序签名密钥
+error.no-pkg-signing-key.advice=使用 XCode 将应用程序签名密钥安装到 Mac 密钥链中。
+error.certificate.expired=错误: 证书已失效 {0}
+error.no.xcode.signing=需要使用带命令行开发人员工具的 Xcode 进行签名
+error.no.xcode.signing.advice=安装带命令行开发人员工具的 Xcode。
+error.cert.not.found=使用密钥链 [{1}] 找不到与 [{0}] 匹配的证书
+error.multiple.certs.found=警告：使用密钥链 [{1}] 找到多个与 [{0}] 匹配的证书，将使用第一个证书
+error.app-image.mac-sign.required=错误：预定义的应用程序映像和类型 [app image] 需要 --mac-sign 选项
+resource.bundle-config-file=包配置文件
+resource.app-info-plist=应用程序 Info.plist
+resource.runtime-info-plist=Java 运行时 Info.plist
+resource.entitlements=Mac 权利
+resource.dmg-setup-script=DMG 设置脚本
+resource.license-setup=许可证设置
+resource.dmg-background=DMG 背景
+resource.volume-icon=卷图标
+resource.post-install-script=要在填充应用程序映像之后运行的脚本
+resource.pkg-preinstall-script=PKG 安装前脚本
+resource.pkg-postinstall-script=PKG 安装后脚本
+resource.pkg-services-preinstall-script=服务程序包的 PKG 安装前脚本
+resource.pkg-services-postinstall-script=服务程序包的 PKG 安装后脚本
+resource.pkg-uninstall-script=PKG 卸载程序脚本
+resource.pkg-background-image=pkg 背景图像
+resource.pkg-pdf=项目定义文件
+resource.launchd-plist-file=launchd plist 文件
 
 
-message.bundle-name-too-long-warning={0}\u5DF2\u8BBE\u7F6E\u4E3A ''{1}'', \u5176\u957F\u5EA6\u8D85\u8FC7\u4E86 16 \u4E2A\u5B57\u7B26\u3002\u4E3A\u4E86\u83B7\u5F97\u66F4\u597D\u7684 Mac \u4F53\u9A8C, \u8BF7\u8003\u8651\u5C06\u5176\u7F29\u77ED\u3002
-message.preparing-info-plist=\u6B63\u5728\u51C6\u5907 Info.plist: {0}\u3002
-message.icon-not-icns= \u6307\u5B9A\u7684\u56FE\u6807 "{0}" \u4E0D\u662F ICNS \u6587\u4EF6, \u4E0D\u4F1A\u4F7F\u7528\u3002\u5C06\u4F7F\u7528\u9ED8\u8BA4\u56FE\u6807\u4EE3\u66FF\u3002
-message.version-string-too-many-components='app-version' \u53EF\u4EE5\u5305\u542B 1 \u5230 3 \u4E2A\u6570\u5B57\uFF1A1\u30011.2\u30011.2.3\u3002
-message.version-string-first-number-not-zero=app-version \u4E2D\u7684\u7B2C\u4E00\u4E2A\u6570\u5B57\u4E0D\u80FD\u4E3A\u96F6\u6216\u8D1F\u6570\u3002
-message.creating-association-with-null-extension=\u6B63\u5728\u4F7F\u7528\u7A7A\u6269\u5C55\u540D\u521B\u5EFA\u5173\u8054\u3002
-message.ignoring.symlink=\u8B66\u544A: codesign \u6B63\u5728\u8DF3\u8FC7\u7B26\u53F7\u94FE\u63A5 {0}\u3002
-message.already.signed=\u6587\u4EF6\u5DF2\u7B7E\u540D\uFF1A{0}\u3002
-message.keychain.error=\u9519\u8BEF\uFF1A\u65E0\u6CD5\u83B7\u53D6\u5BC6\u94A5\u94FE\u5217\u8868\u3002
-message.building-bundle=\u6B63\u5728\u4E3A {0} \u6784\u5EFA Mac App Store \u7A0B\u5E8F\u5305\u3002
-message.app-image-dir-does-not-exist=\u6307\u5B9A\u7684\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u76EE\u5F55 {0}\uFF1A{1} \u4E0D\u5B58\u5728\u3002
-message.app-image-dir-does-not-exist.advice=\u786E\u8BA4 {0} \u7684\u503C\u662F\u5426\u5B58\u5728\u3002
-message.app-image-requires-app-name=\u4F7F\u7528\u5916\u90E8\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u65F6, \u5FC5\u987B\u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u3002
-message.app-image-requires-app-name.advice=\u901A\u8FC7 -name CLI \u6807\u8BB0, fx:application/@name ANT \u5C5E\u6027\u6216\u901A\u8FC7 'appName' \u6253\u5305\u7A0B\u5E8F\u53C2\u6570\u8BBE\u7F6E\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u3002
-message.app-image-requires-identifier=\u65E0\u6CD5\u4ECE\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u63D0\u53D6\u6807\u8BC6\u7B26\u3002
-message.app-image-requires-identifier.advice=\u8BF7\u4F7F\u7528 "--verbose" \u83B7\u53D6\u6269\u5C55\u9519\u8BEF\u6D88\u606F\uFF0C\u6216\u8005\u901A\u8FC7 "--mac-package-identifier" \u6307\u5B9A\u5B83\u3002
-message.invalid-identifier=\u65E0\u6548\u7684 Mac \u5305\u6807\u8BC6\u7B26 [{0}]\u3002
-message.invalid-identifier.advice=\u8BF7\u4F7F\u7528 "--mac-package-identifier" \u6307\u5B9A\u6807\u8BC6\u7B26\u3002
-message.building-dmg=\u6B63\u5728\u4E3A {0} \u6784\u5EFA DMG \u7A0B\u5E8F\u5305\u3002
-message.running-script=\u6B63\u5728\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF [{0}] \u4E0A\u8FD0\u884C shell \u811A\u672C\u3002
-message.preparing-dmg-setup=\u6B63\u5728\u51C6\u5907 dmg \u8BBE\u7F6E: {0}\u3002
-message.creating-dmg-file=\u6B63\u5728\u521B\u5EFA DMG \u6587\u4EF6: {0}\u3002
-message.dmg-cannot-be-overwritten=Dmg \u6587\u4EF6\u5DF2\u5B58\u5728 [{0}] \u4E14\u65E0\u6CD5\u5220\u9664\u3002
-message.output-to-location=\u4E3A {0} \u751F\u6210\u7684 DMG \u5B89\u88C5\u7A0B\u5E8F: {1}\u3002
-message.building-pkg=\u6B63\u5728\u4E3A {0} \u6784\u5EFA PKG \u7A0B\u5E8F\u5305\u3002
-message.preparing-scripts=\u6B63\u5728\u51C6\u5907\u7A0B\u5E8F\u5305\u811A\u672C\u3002
-message.preparing-distribution-dist=\u6B63\u5728\u51C6\u5907 distribution.dist: {0}\u3002
-message.signing.pkg=\u8B66\u544A\uFF1A\u8981\u5BF9 PKG \u8FDB\u884C\u7B7E\u540D\uFF0C\u53EF\u80FD\u9700\u8981\u4F7F\u7528\u201C\u5BC6\u94A5\u94FE\u8BBF\u95EE\u201D\u5DE5\u5177\u4E3A\u8BC1\u4E66\u8BBE\u7F6E\u201C\u59CB\u7EC8\u4FE1\u4EFB\u201D\u3002
-message.setfile.dmg=\u7531\u4E8E\u672A\u627E\u5230 'SetFile' \u5B9E\u7528\u7A0B\u5E8F\uFF0C\u8DF3\u8FC7\u4E86\u9488\u5BF9 DMG \u6587\u4EF6\u8BBE\u7F6E\u5B9A\u5236\u56FE\u6807\u7684\u64CD\u4F5C\u3002\u5B89\u88C5\u5E26\u547D\u4EE4\u884C\u5DE5\u5177\u7684 Xcode \u5E94\u80FD\u89E3\u51B3\u6B64\u95EE\u9898\u3002
-message.install-dir-ignored=\u8B66\u544A\uFF1A"--install-dir" \u4E0D\u53D7 DMG \u652F\u6301\uFF0C\u5C06\u9ED8\u8BA4\u4E3A /Applications\u3002
-warning.unsigned.app.image=\u8B66\u544A\uFF1A\u4F7F\u7528\u672A\u7B7E\u540D\u7684 app-image \u751F\u6210\u5DF2\u7B7E\u540D\u7684 {0}\u3002
-warning.per.user.app.image.signed=\u8B66\u544A\uFF1A\u7531\u4E8E\u9884\u5B9A\u4E49\u7684\u5DF2\u7B7E\u540D\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u4E2D\u7F3A\u5C11 "{0}"\uFF0C\u4E0D\u652F\u6301\u5BF9\u5DF2\u5B89\u88C5\u5E94\u7528\u7A0B\u5E8F\u7684\u6BCF\u7528\u6237\u914D\u7F6E\u63D0\u4F9B\u652F\u6301\u3002
+message.bundle-name-too-long-warning={0}已设置为 ''{1}'', 其长度超过了 16 个字符。为了获得更好的 Mac 体验, 请考虑将其缩短。
+message.preparing-info-plist=正在准备 Info.plist: {0}。
+message.icon-not-icns= 指定的图标 "{0}" 不是 ICNS 文件, 不会使用。将使用默认图标代替。
+message.version-string-too-many-components='app-version' 可以包含 1 到 3 个数字：1、1.2、1.2.3。
+message.version-string-first-number-not-zero=app-version 中的第一个数字不能为零或负数。
+message.creating-association-with-null-extension=正在使用空扩展名创建关联。
+message.ignoring.symlink=警告: codesign 正在跳过符号链接 {0}。
+message.already.signed=文件已签名：{0}。
+message.keychain.error=错误：无法获取密钥链列表。
+message.building-bundle=正在为 {0} 构建 Mac App Store 程序包。
+message.app-image-dir-does-not-exist=指定的应用程序映像目录 {0}：{1} 不存在。
+message.app-image-dir-does-not-exist.advice=确认 {0} 的值是否存在。
+message.app-image-requires-app-name=使用外部应用程序映像时, 必须指定应用程序名称。
+message.app-image-requires-app-name.advice=通过 -name CLI 标记, fx:application/@name ANT 属性或通过 'appName' 打包程序参数设置应用程序名称。
+message.app-image-requires-identifier=无法从应用程序映像提取标识符。
+message.app-image-requires-identifier.advice=请使用 "--verbose" 获取扩展错误消息，或者通过 "--mac-package-identifier" 指定它。
+message.invalid-identifier=无效的 Mac 包标识符 [{0}]。
+message.invalid-identifier.advice=请使用 "--mac-package-identifier" 指定标识符。
+message.building-dmg=正在为 {0} 构建 DMG 程序包。
+message.running-script=正在应用程序映像 [{0}] 上运行 shell 脚本。
+message.preparing-dmg-setup=正在准备 dmg 设置: {0}。
+message.creating-dmg-file=正在创建 DMG 文件: {0}。
+message.dmg-cannot-be-overwritten=Dmg 文件已存在 [{0}] 且无法删除。
+message.output-to-location=为 {0} 生成的 DMG 安装程序: {1}。
+message.building-pkg=正在为 {0} 构建 PKG 程序包。
+message.preparing-scripts=正在准备程序包脚本。
+message.preparing-distribution-dist=正在准备 distribution.dist: {0}。
+message.signing.pkg=警告：要对 PKG 进行签名，可能需要使用“密钥链访问”工具为证书设置“始终信任”。
+message.setfile.dmg=由于未找到 'SetFile' 实用程序，跳过了针对 DMG 文件设置定制图标的操作。安装带命令行工具的 Xcode 应能解决此问题。
+message.install-dir-ignored=警告："--install-dir" 不受 DMG 支持，将默认为 /Applications。
+warning.unsigned.app.image=警告：使用未签名的 app-image 生成已签名的 {0}。
+warning.per.user.app.image.signed=警告：由于预定义的已签名应用程序映像中缺少 "{0}"，不支持对已安装应用程序的每用户配置提供支持。
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
index 67740273785..3d5f5171d73 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
@@ -24,19 +24,19 @@
 #
 #
 
-MSG_Help=Verwendung: jpackage <Optionen>\n\nBeispielverwendungen:\n--------------\n    Generiert ein f\u00FCr das Hostsystem geeignetes Anwendungspackage:\n        F\u00FCr eine modulare Anwendung:\n            jpackage -n name -p modulePath -m moduleName/className\n        F\u00FCr eine nicht modulare Anwendung:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Aus einem vorab erstellten Anwendungsimage:\n            jpackage -n name --app-image appImageDir\n    Generiert ein Anwendungsimage:\n        F\u00FCr eine modulare Anwendung:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        F\u00FCr eine nicht modulare Anwendung:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Um eigene Optionen f\u00FCr jlink anzugeben, f\u00FChren Sie jlink separat aus:\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<zus\u00E4tzliche jlink-Optionen>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    Generiert ein Java Runtime-Package:\n        jpackage -n name --runtime-image <Laufzeitimage>\n{6}\nAllgemeine Optionen:\n  @<Dateiname > \n          Liest Optionen und/oder Modus aus einer Datei \n          Diese Option kann mehrmals verwendet werden.\n  --type -t <Typ> \n          Der zu erstellende Packagetyp\n          G\u00FCltige Werte: {1} \n          Bei fehlender Angabe dieser Option wird ein plattformabh\u00E4ngiger\n          Standardtyp erstellt.\n  --app-version <Version>\n          Version der Anwendung und/oder des Packages\n  --copyright <Copyright-Zeichenfolge>\n          Copyright f\u00FCr die Anwendung\n  --description <Zeichenfolge f\u00FCr Beschreibung>\n          Beschreibung der Anwendung\n  --help -h \n          Gibt den Verwendungstext mit einer Liste und Beschreibung jeder g\u00FCltigen\n          Option f\u00FCr die aktuelle Plattform an den Ausgabestream aus und beendet den Vorgang\n  --icon <Dateipfad>\n          Pfad des Symbols f\u00FCr das Anwendungspackage\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --name -n <Name>\n          Name der Anwendung und/oder des Packages\n  --dest -d <Zielpfad>\n          Pfad, in den die generierte Ausgabedatei abgelegt wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Standardm\u00E4\u00DFig wird das aktuelle Arbeitsverzeichnis verwendet.\n  --temp <Verzeichnispfad>\n          Pfad eines neuen oder leeren Verzeichnisses zum Erstellen tempor\u00E4rer Dateien\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Falls angegeben, wird das tempor\u00E4re Verzeichnis beim Abschlie\u00DFen der Aufgabe\n          nicht entfernt und muss manuell entfernt werden.\n          Bei fehlender Angabe wird ein tempor\u00E4res Verzeichnis erstellt und\n          beim Abschlie\u00DFen der Aufgabe entfernt.\n  --vendor <Zeichenfolge f\u00FCr Anbieter>\n          Anbieter der Anwendung\n  --verbose\n          Aktiviert Ausgabe im Verbose-Modus\n  --version\n          Gibt die Produktversion an den Outputstream aus und beendet den Vorgang.\n\nOptionen f\u00FCr das Erstellen des Laufzeitimages:\n  --add-modules <Modulname>[,<Modulname>...]\n          Eine per Komma (",") getrennte Liste hinzuzuf\u00FCgender Module\n          Diese Modulliste wird zusammen mit dem Hauptmodul (sofern angegeben)\n          als Argument --add-module an jlink \u00FCbergeben.\n          Bei fehlender Angabe wird entweder nur das Hauptmodul (sofern --module\n          angegeben ist) oder das Standardset an Modulen (sofern --main-jar \n          angegeben ist) verwendet.\n          Diese Option kann mehrmals verwendet werden.\n  --module-path -p <Modulpfad>...\n          \
-Eine per {0} getrennte Pfadliste\n          Jeder Pfad ist entweder ein Verzeichnis mit Modulen oder der Pfad zu einer\n          JAR-Datei eines Moduls.\n          (Jeder Pfad ist absolut oder relativ zum aktuellen Verzeichnis.)\n          Diese Option kann mehrmals verwendet werden.\n  --jlink-options <jlink-Optionen> \n          Eine per Leerzeichen getrennte Liste mit an jlink zu \u00FCbergebenden Optionen \n          Bei fehlender Angabe wird standardm\u00E4\u00DFig "--strip-native-commands \n          --strip-debug --no-man-pages --no-header-files" verwendet. \n          Diese Option kann mehrmals verwendet werden.\n  --runtime-image <Verzeichnispfad>\n          Pfad des vordefinierten Laufzeitimages, das in\n          das Anwendungsimage kopiert wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Wenn --runtime-image nicht angegeben wird, f\u00FChrt jpackage jlink aus, um\n          das Laufzeitimage mit folgenden Optionen zu erstellen:\n          --strip-debug, --no-header-files, --no-man-pages und\n          --strip-native-commands.\n\nOptionen f\u00FCr das Erstellen des Anwendungsimages:\n  --input -i <Verzeichnispfad>\n          Pfad des Eingabeverzeichnisses mit den in das Package zu integrierenden Dateien\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Alle Dateien im Eingabeverzeichnis werden in das Package f\u00FCr das\n          Anwendungsimage integriert.\n  --app-content <zus\u00E4tzlicher Inhalt>[,<zus\u00E4tzlicher Inhalt>...]\n          Eine per Komma getrennte Liste mit Pfaden zu Dateien und/oder Verzeichnissen,\n          die zur Anwendungs-Payload hinzugef\u00FCgt werden sollen.\n          Diese Option kann mehrmals verwendet werden.\n\nOptionen f\u00FCr das Erstellen des Anwendungs-Launchers:\n  --add-launcher <Launcher-Name>=<Dateipfad>\n          Name des Launchers sowie ein Pfad zu einer Eigenschaftendatei mit\n          einer Liste von Schl\u00FCssel/Wert-Paaren\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Die Schl\u00FCssel "module", "main-jar", "main-class", "description",\n          "arguments", "java-options", "app-version", "icon",\n          "launcher-as-service",\n          "win-console", "win-shortcut", "win-menu",\n          "linux-app-category" und "linux-shortcut" k\u00F6nnen verwendet werden.\n          Diese Optionen werden den urspr\u00FCnglichen Befehlszeilenoptionen hinzugef\u00FCgt\n          (oder \u00FCberschreiben diese), um einen zus\u00E4tzlichen, alternativen Launcher zu erstellen.\n          Der Hauptanwendungs-Launcher wird aus den Befehlszeilenoptionen\n          erstellt. Mit dieser Option k\u00F6nnen zus\u00E4tzliche alternative Launcher\n          erstellt werden. Au\u00DFerdem kann diese Option mehrmals verwendet werden,\n          um mehrere zus\u00E4tzliche Launcher zu erstellen. \n  --arguments <Hauptklassenargumente>\n          Befehlszeilenargumente, die an die Hauptklasse \u00FCbergeben werden, falls\n          keine Befehlszeilenargumente an den Launcher \u00FCbergeben werden\n          Diese Option kann mehrmals verwendet werden.\n  --java-options <Java-Optionen>\n          Optionen, die an Java Runtime \u00FCbergeben werden\n          Diese Option kann mehrmals verwendet werden.\n  --main-class <Klassenname>\n          Qualifizierter Name der auszuf\u00FChrenden Anwendungshauptklasse\n          Diese Option kann nur bei Angabe von --main-jar verwendet werden.\n  --main-jar <Haupt-JAR-Datei>\n          Die Haupt-JAR-Datei der Anwendung, die die Hauptklasse enth\u00E4lt\n          (angegeben als Pfad relativ zum Eingabepfad)\n          Es kann entweder die Option --module oder die Option --main-jar angegeben werden, nicht jedoch\n          beides.\n  --module -m <Modulname>[/<Hauptklasse>]\n          Das Hauptmodul (und optional die Hauptklasse) der Anwendung\n          Dieses Modul muss unter dem Modulpfad gespeichert sein.\n          Bei Angabe dieser Option wird \
-das Hauptmodul\n          im Java Runtime-Image verkn\u00FCpft. Es kann entweder die Option --module oder die Option --main-jar\n          angegeben werden, nicht jedoch beides.\n{2}\nOptionen f\u00FCr das Erstellen des Anwendungspackages:\n  --about-url <URL>\n          URL der Homepage der Anwendung\n  --app-image <Verzeichnispfad>\n          {5}          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --file-associations <Dateipfad>\n          Pfad zu einer Eigenschaftendatei mit einer Liste von Schl\u00FCssel/Wert-Paaren\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Mit den Schl\u00FCsseln "extension", "mime-type", "icon" und "description"\n          kann die Verkn\u00FCpfung beschrieben werden.\n          Diese Option kann mehrmals verwendet werden.\n  --install-dir <Verzeichnispfad>\n          {4}  --license-file <Dateipfad>\n          Pfad zur Lizenzdatei\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --resource-dir <Verzeichnispfad>\n          Pfad zum \u00DCberschreiben von jpackage-Ressourcen\n          Symbole, Vorlagendateien und weitere Ressourcen von jpackage k\u00F6nnen\n          durch Hinzuf\u00FCgen von Ersetzungsressourcen zu diesem Verzeichnis \u00FCberschrieben werden.\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --runtime-image <Verzeichnispfad>\n          Pfad des zu installierenden vordefinierten Laufzeitimages\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Option muss beim Erstellen eines Laufzeitpackages angegeben werden.\n  --launcher-as-service\n          Anforderung zum Erstellen eines Installationsprogramms, das den\n          Hauptanwendungs-Launcher als Hintergrundserviceanwendung registriert.\n\nPlattformabh\u00E4ngige Optionen f\u00FCr das Erstellen des Anwendungspackages:\n{3}
+MSG_Help=Verwendung: jpackage <Optionen>\n\nBeispielverwendungen:\n--------------\n    Generiert ein für das Hostsystem geeignetes Anwendungspackage:\n        Für eine modulare Anwendung:\n            jpackage -n name -p modulePath -m moduleName/className\n        Für eine nicht modulare Anwendung:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Aus einem vorab erstellten Anwendungsimage:\n            jpackage -n name --app-image appImageDir\n    Generiert ein Anwendungsimage:\n        Für eine modulare Anwendung:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        Für eine nicht modulare Anwendung:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Um eigene Optionen für jlink anzugeben, führen Sie jlink separat aus:\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<zusätzliche jlink-Optionen>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    Generiert ein Java Runtime-Package:\n        jpackage -n name --runtime-image <Laufzeitimage>\n{6}\nAllgemeine Optionen:\n  @<Dateiname > \n          Liest Optionen und/oder Modus aus einer Datei \n          Diese Option kann mehrmals verwendet werden.\n  --type -t <Typ> \n          Der zu erstellende Packagetyp\n          Gültige Werte: {1} \n          Bei fehlender Angabe dieser Option wird ein plattformabhängiger\n          Standardtyp erstellt.\n  --app-version <Version>\n          Version der Anwendung und/oder des Packages\n  --copyright <Copyright-Zeichenfolge>\n          Copyright für die Anwendung\n  --description <Zeichenfolge für Beschreibung>\n          Beschreibung der Anwendung\n  --help -h \n          Gibt den Verwendungstext mit einer Liste und Beschreibung jeder gültigen\n          Option für die aktuelle Plattform an den Ausgabestream aus und beendet den Vorgang\n  --icon <Dateipfad>\n          Pfad des Symbols für das Anwendungspackage\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --name -n <Name>\n          Name der Anwendung und/oder des Packages\n  --dest -d <Zielpfad>\n          Pfad, in den die generierte Ausgabedatei abgelegt wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Standardmäßig wird das aktuelle Arbeitsverzeichnis verwendet.\n  --temp <Verzeichnispfad>\n          Pfad eines neuen oder leeren Verzeichnisses zum Erstellen temporärer Dateien\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Falls angegeben, wird das temporäre Verzeichnis beim Abschließen der Aufgabe\n          nicht entfernt und muss manuell entfernt werden.\n          Bei fehlender Angabe wird ein temporäres Verzeichnis erstellt und\n          beim Abschließen der Aufgabe entfernt.\n  --vendor <Zeichenfolge für Anbieter>\n          Anbieter der Anwendung\n  --verbose\n          Aktiviert Ausgabe im Verbose-Modus\n  --version\n          Gibt die Produktversion an den Outputstream aus und beendet den Vorgang.\n\nOptionen für das Erstellen des Laufzeitimages:\n  --add-modules <Modulname>[,<Modulname>...]\n          Eine per Komma (",") getrennte Liste hinzuzufügender Module\n          Diese Modulliste wird zusammen mit dem Hauptmodul (sofern angegeben)\n          als Argument --add-module an jlink übergeben.\n          Bei fehlender Angabe wird entweder nur das Hauptmodul (sofern --module\n          angegeben ist) oder das Standardset an Modulen (sofern --main-jar \n          angegeben ist) verwendet.\n          Diese Option kann mehrmals verwendet werden.\n  --module-path -p <Modulpfad>...\n          \
+Eine per {0} getrennte Pfadliste\n          Jeder Pfad ist entweder ein Verzeichnis mit Modulen oder der Pfad zu einer\n          JAR-Datei eines Moduls.\n          (Jeder Pfad ist absolut oder relativ zum aktuellen Verzeichnis.)\n          Diese Option kann mehrmals verwendet werden.\n  --jlink-options <jlink-Optionen> \n          Eine per Leerzeichen getrennte Liste mit an jlink zu übergebenden Optionen \n          Bei fehlender Angabe wird standardmäßig "--strip-native-commands \n          --strip-debug --no-man-pages --no-header-files" verwendet. \n          Diese Option kann mehrmals verwendet werden.\n  --runtime-image <Verzeichnispfad>\n          Pfad des vordefinierten Laufzeitimages, das in\n          das Anwendungsimage kopiert wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Wenn --runtime-image nicht angegeben wird, führt jpackage jlink aus, um\n          das Laufzeitimage mit folgenden Optionen zu erstellen:\n          --strip-debug, --no-header-files, --no-man-pages und\n          --strip-native-commands.\n\nOptionen für das Erstellen des Anwendungsimages:\n  --input -i <Verzeichnispfad>\n          Pfad des Eingabeverzeichnisses mit den in das Package zu integrierenden Dateien\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Alle Dateien im Eingabeverzeichnis werden in das Package für das\n          Anwendungsimage integriert.\n  --app-content <zusätzlicher Inhalt>[,<zusätzlicher Inhalt>...]\n          Eine per Komma getrennte Liste mit Pfaden zu Dateien und/oder Verzeichnissen,\n          die zur Anwendungs-Payload hinzugefügt werden sollen.\n          Diese Option kann mehrmals verwendet werden.\n\nOptionen für das Erstellen des Anwendungs-Launchers:\n  --add-launcher <Launcher-Name>=<Dateipfad>\n          Name des Launchers sowie ein Pfad zu einer Eigenschaftendatei mit\n          einer Liste von Schlüssel/Wert-Paaren\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Die Schlüssel "module", "main-jar", "main-class", "description",\n          "arguments", "java-options", "app-version", "icon",\n          "launcher-as-service",\n          "win-console", "win-shortcut", "win-menu",\n          "linux-app-category" und "linux-shortcut" können verwendet werden.\n          Diese Optionen werden den ursprünglichen Befehlszeilenoptionen hinzugefügt\n          (oder überschreiben diese), um einen zusätzlichen, alternativen Launcher zu erstellen.\n          Der Hauptanwendungs-Launcher wird aus den Befehlszeilenoptionen\n          erstellt. Mit dieser Option können zusätzliche alternative Launcher\n          erstellt werden. Außerdem kann diese Option mehrmals verwendet werden,\n          um mehrere zusätzliche Launcher zu erstellen. \n  --arguments <Hauptklassenargumente>\n          Befehlszeilenargumente, die an die Hauptklasse übergeben werden, falls\n          keine Befehlszeilenargumente an den Launcher übergeben werden\n          Diese Option kann mehrmals verwendet werden.\n  --java-options <Java-Optionen>\n          Optionen, die an Java Runtime übergeben werden\n          Diese Option kann mehrmals verwendet werden.\n  --main-class <Klassenname>\n          Qualifizierter Name der auszuführenden Anwendungshauptklasse\n          Diese Option kann nur bei Angabe von --main-jar verwendet werden.\n  --main-jar <Haupt-JAR-Datei>\n          Die Haupt-JAR-Datei der Anwendung, die die Hauptklasse enthält\n          (angegeben als Pfad relativ zum Eingabepfad)\n          Es kann entweder die Option --module oder die Option --main-jar angegeben werden, nicht jedoch\n          beides.\n  --module -m <Modulname>[/<Hauptklasse>]\n          Das Hauptmodul (und optional die Hauptklasse) der Anwendung\n          Dieses Modul muss unter dem Modulpfad gespeichert sein.\n          Bei Angabe dieser Option wird \
+das Hauptmodul\n          im Java Runtime-Image verknüpft. Es kann entweder die Option --module oder die Option --main-jar\n          angegeben werden, nicht jedoch beides.\n{2}\nOptionen für das Erstellen des Anwendungspackages:\n  --about-url <URL>\n          URL der Homepage der Anwendung\n  --app-image <Verzeichnispfad>\n          {5}          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --file-associations <Dateipfad>\n          Pfad zu einer Eigenschaftendatei mit einer Liste von Schlüssel/Wert-Paaren\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Mit den Schlüsseln "extension", "mime-type", "icon" und "description"\n          kann die Verknüpfung beschrieben werden.\n          Diese Option kann mehrmals verwendet werden.\n  --install-dir <Verzeichnispfad>\n          {4}  --license-file <Dateipfad>\n          Pfad zur Lizenzdatei\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --resource-dir <Verzeichnispfad>\n          Pfad zum Überschreiben von jpackage-Ressourcen\n          Symbole, Vorlagendateien und weitere Ressourcen von jpackage können\n          durch Hinzufügen von Ersetzungsressourcen zu diesem Verzeichnis überschrieben werden.\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --runtime-image <Verzeichnispfad>\n          Pfad des zu installierenden vordefinierten Laufzeitimages\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Option muss beim Erstellen eines Laufzeitpackages angegeben werden.\n  --launcher-as-service\n          Anforderung zum Erstellen eines Installationsprogramms, das den\n          Hauptanwendungs-Launcher als Hintergrundserviceanwendung registriert.\n\nPlattformabhängige Optionen für das Erstellen des Anwendungspackages:\n{3}
 
-MSG_Help_win_launcher=\nPlattformabh\u00E4ngige Option f\u00FCr das Erstellen des Anwendungs-Launchers:\n  --win-console\n          Erstellt einen Konsolen-Launcher f\u00FCr die Anwendung. Sollte f\u00FCr\n          Anwendungen angegeben werden, die Konsoleninteraktionen erfordern\n
-MSG_Help_win_install=\  --win-dir-chooser\n          F\u00FCgt ein Dialogfeld hinzu, in dem der Benutzer das Verzeichnis ausw\u00E4hlen kann, in dem\n          das Produkt installiert wird.\n  --win-help-url <URL>\n          URL, unter der der Benutzer weitere Informationen oder technische Unterst\u00FCtzung erh\u00E4lt\n  --win-menu\n          Anforderung zum Hinzuf\u00FCgen einer Startmen\u00FCverkn\u00FCpfung f\u00FCr diese Anwendung\n  --win-menu-group <Men\u00FCgruppenname>\n          Startmen\u00FCgruppe, in der diese Anwendung abgelegt wird\n  --win-per-user-install\n          Anforderung zum Ausf\u00FChren einer Installation pro Benutzer\n  --win-shortcut\n          Anforderung zum Hinzuf\u00FCgen einer Desktopverkn\u00FCpfung f\u00FCr diese Anwendung\n  --win-shortcut-prompt\n          F\u00FCgt ein Dialogfeld hinzu, in dem der Benutzer ausw\u00E4hlen kann, ob Verkn\u00FCpfungen\n          vom Installationsprogramm erstellt werden sollen.\n  --win-update-url <URL>\n          URL verf\u00FCgbarer Anwendungsupdateinformationen\n  --win-upgrade-uuid <ID-Zeichenfolge>\n          UUID, die mit Upgrades f\u00FCr dieses Package verkn\u00FCpft ist\n
+MSG_Help_win_launcher=\nPlattformabhängige Option für das Erstellen des Anwendungs-Launchers:\n  --win-console\n          Erstellt einen Konsolen-Launcher für die Anwendung. Sollte für\n          Anwendungen angegeben werden, die Konsoleninteraktionen erfordern\n
+MSG_Help_win_install=\  --win-dir-chooser\n          Fügt ein Dialogfeld hinzu, in dem der Benutzer das Verzeichnis auswählen kann, in dem\n          das Produkt installiert wird.\n  --win-help-url <URL>\n          URL, unter der der Benutzer weitere Informationen oder technische Unterstützung erhält\n  --win-menu\n          Anforderung zum Hinzufügen einer Startmenüverknüpfung für diese Anwendung\n  --win-menu-group <Menügruppenname>\n          Startmenügruppe, in der diese Anwendung abgelegt wird\n  --win-per-user-install\n          Anforderung zum Ausführen einer Installation pro Benutzer\n  --win-shortcut\n          Anforderung zum Hinzufügen einer Desktopverknüpfung für diese Anwendung\n  --win-shortcut-prompt\n          Fügt ein Dialogfeld hinzu, in dem der Benutzer auswählen kann, ob Verknüpfungen\n          vom Installationsprogramm erstellt werden sollen.\n  --win-update-url <URL>\n          URL verfügbarer Anwendungsupdateinformationen\n  --win-upgrade-uuid <ID-Zeichenfolge>\n          UUID, die mit Upgrades für dieses Package verknüpft ist\n
 MSG_Help_win_install_dir=Relativer Unterpfad unter dem Standardinstallationsverzeichnis\n
-MSG_Help_mac_install=\  --mac-dmg-content <Pfad zu zus\u00E4tzlichem Inhalt>[,<Pfad zu zus\u00E4tzlichem Inhalt>...]\n          Nimmt den gesamten referenzierten Inhalt in die DMG-Datei auf.\n          Diese Option kann mehrmals verwendet werden. \n
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID-Zeichenfolge>\n          Eine ID, die die Anwendung f\u00FCr macOS eindeutig identifiziert\n          Standardwert ist der Hauptklassenname.\n          Es d\u00FCrfen nur alphanumerische Zeichen (A-Z, a-z, 0-9), Bindestriche (-)\n          und Punkte (.) verwendet werden.\n  --mac-package-name <Namenszeichenfolge>\n          Name der Anwendung, wie in der Men\u00FCleiste angezeigt\n          Dieser kann vom Anwendungsnamen abweichen.\n          Er darf maximal 15 Zeichen enthalten und muss f\u00FCr die Anzeige\n          in der Men\u00FCleiste und im Infofenster der Anwendung geeignet sein.\n          Standardwert: Anwendungsname.\n  --mac-package-signing-prefix <Pr\u00E4fixzeichenfolge>\n          Beim Signieren des Anwendungspackages wird dieser Wert\n          allen zu signierenden Komponenten ohne vorhandene\n          Package-ID als Pr\u00E4fix vorangestellt.\n  --mac-sign\n          Anforderung zum Signieren des Packages oder des vordefinierten\nAnwendungsimages\n  --mac-signing-keychain <Schl\u00FCsselbundname>\n          Name des Schl\u00FCsselbundes f\u00FCr die Suche nach der Signaturidentit\u00E4t\n          Bei fehlender Angabe werden die Standardschl\u00FCsselbunde verwendet.\n  --mac-signing-key-user-name <Teamname>\n          Team- oder Benutzernamensteil der Apple-Signaturidentit\u00E4ten.\n  --mac-app-store\n          Gibt an, dass die jpackage-Ausgabe f\u00FCr den\n          Mac App Store bestimmt ist.\n  --mac-entitlements <Dateipfad>\n          Pfad zu einer Datei mit Berechtigungen, die beim Signieren\n          von ausf\u00FChrbaren Dateien und Librarys im Bundle verwendet werden sollen.\n  --mac-app-category <Kategoriezeichenfolge>\n          Zeichenfolge f\u00FCr das Erstellen von LSApplicationCategoryType in\n          Anwendungs-plist. Standardwert: "utilities".\n
-MSG_Help_linux_install=\  --linux-package-name <Packagename>\n          Name f\u00FCr das Linux-Package, Standardwert: Anwendungsname\n  --linux-deb-maintainer <E-Mail-Adresse>\n          Maintainer f\u00FCr .deb-Package\n  --linux-menu-group <Men\u00FCgruppenname>\n          Men\u00FCgruppe, in der diese Anwendung abgelegt wird\n  --linux-package-deps\n          Erforderliche Packages oder Funktionen f\u00FCr die Anwendung\n  --linux-rpm-license-type <Typzeichenfolge>\n          Typ der Lizenz ("License: <Wert>" der RPM-SPEC-Datei)\n  --linux-app-release <Releasewert>\n          Releasewert der RPM-SPEC-Datei <Name> oder \n          Debian-Revisionswert der DEB-Kontrolldatei\n  --linux-app-category <Kategoriewert>\n          Gruppenwert der RPM-SPEC-Datei <Name> oder \n          Abschnittswert der DEB-Kontrolldatei\n  --linux-shortcut\n          Erstellt eine Verkn\u00FCpfung f\u00FCr die Anwendung.\n
+MSG_Help_mac_install=\  --mac-dmg-content <Pfad zu zusätzlichem Inhalt>[,<Pfad zu zusätzlichem Inhalt>...]\n          Nimmt den gesamten referenzierten Inhalt in die DMG-Datei auf.\n          Diese Option kann mehrmals verwendet werden. \n
+MSG_Help_mac_launcher=\  --mac-package-identifier <ID-Zeichenfolge>\n          Eine ID, die die Anwendung für macOS eindeutig identifiziert\n          Standardwert ist der Hauptklassenname.\n          Es dürfen nur alphanumerische Zeichen (A-Z, a-z, 0-9), Bindestriche (-)\n          und Punkte (.) verwendet werden.\n  --mac-package-name <Namenszeichenfolge>\n          Name der Anwendung, wie in der Menüleiste angezeigt\n          Dieser kann vom Anwendungsnamen abweichen.\n          Er darf maximal 15 Zeichen enthalten und muss für die Anzeige\n          in der Menüleiste und im Infofenster der Anwendung geeignet sein.\n          Standardwert: Anwendungsname.\n  --mac-package-signing-prefix <Präfixzeichenfolge>\n          Beim Signieren des Anwendungspackages wird dieser Wert\n          allen zu signierenden Komponenten ohne vorhandene\n          Package-ID als Präfix vorangestellt.\n  --mac-sign\n          Anforderung zum Signieren des Packages oder des vordefinierten\nAnwendungsimages\n  --mac-signing-keychain <Schlüsselbundname>\n          Name des Schlüsselbundes für die Suche nach der Signaturidentität\n          Bei fehlender Angabe werden die Standardschlüsselbunde verwendet.\n  --mac-signing-key-user-name <Teamname>\n          Team- oder Benutzernamensteil der Apple-Signaturidentitäten.\n  --mac-app-store\n          Gibt an, dass die jpackage-Ausgabe für den\n          Mac App Store bestimmt ist.\n  --mac-entitlements <Dateipfad>\n          Pfad zu einer Datei mit Berechtigungen, die beim Signieren\n          von ausführbaren Dateien und Librarys im Bundle verwendet werden sollen.\n  --mac-app-category <Kategoriezeichenfolge>\n          Zeichenfolge für das Erstellen von LSApplicationCategoryType in\n          Anwendungs-plist. Standardwert: "utilities".\n
+MSG_Help_linux_install=\  --linux-package-name <Packagename>\n          Name für das Linux-Package, Standardwert: Anwendungsname\n  --linux-deb-maintainer <E-Mail-Adresse>\n          Maintainer für .deb-Package\n  --linux-menu-group <Menügruppenname>\n          Menügruppe, in der diese Anwendung abgelegt wird\n  --linux-package-deps\n          Erforderliche Packages oder Funktionen für die Anwendung\n  --linux-rpm-license-type <Typzeichenfolge>\n          Typ der Lizenz ("License: <Wert>" der RPM-SPEC-Datei)\n  --linux-app-release <Releasewert>\n          Releasewert der RPM-SPEC-Datei <Name> oder \n          Debian-Revisionswert der DEB-Kontrolldatei\n  --linux-app-category <Kategoriewert>\n          Gruppenwert der RPM-SPEC-Datei <Name> oder \n          Abschnittswert der DEB-Kontrolldatei\n  --linux-shortcut\n          Erstellt eine Verknüpfung für die Anwendung.\n
 MSG_Help_mac_linux_install_dir=Absoluter Pfad des Installationsverzeichnisses der Anwendung\n
 MSG_Help_default_install_dir=Absoluter Pfad des Installationsverzeichnisses der Anwendung auf OS X\n          oder Linux. Relativer Unterpfad des Installationsverzeichnisses der\n          Anwendung wie "Programme" oder "AppData" unter Windows.\n
-MSG_Help_no_args=Verwendung: jpackage <Optionen>\nVerwenden Sie jpackage --help (oder -h), um eine Liste m\u00F6glicher Optionen aufzurufen
+MSG_Help_no_args=Verwendung: jpackage <Optionen>\nVerwenden Sie jpackage --help (oder -h), um eine Liste möglicher Optionen aufzurufen
 MSG_Help_default_app_image=Speicherort des vordefinierten Anwendungsimages, mit dem\n          ein installierbares Package erstellt wird\n
 MSG_Help_mac_app_image=Speicherort des vordefinierten Anwendungsimages, mit dem\n          ein installierbares Package erstellt oder das vordefinierte\n          Anwendungsimage signiert wird\n
-MSG_Help_mac_sign_sample_usage=\    Vordefiniertes Anwendungsimage signieren:\n        jpackage --type app-image --app-image <app-image> \\\n            --mac-sign [<additional signing options>...]\n        Hinweis: In diesem Modus sind nur die folgenden zus\u00E4tzlichen Optionen zul\u00E4ssig:\n              Das Set der zus\u00E4tzlichen Mac-Signaturoptionen und --verbose\n
+MSG_Help_mac_sign_sample_usage=\    Vordefiniertes Anwendungsimage signieren:\n        jpackage --type app-image --app-image <app-image> \\\n            --mac-sign [<additional signing options>...]\n        Hinweis: In diesem Modus sind nur die folgenden zusätzlichen Optionen zulässig:\n              Das Set der zusätzlichen Mac-Signaturoptionen und --verbose\n
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
index 76093360293..6e377ed6e38 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
@@ -24,21 +24,21 @@
 #
 #
 
-MSG_Help=\u4F7F\u7528\u65B9\u6CD5: jpackage <options>\n\n\u4F7F\u7528\u4F8B:\n--------------\n    \u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u306B\u9069\u3057\u305F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n        \u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage -n name -p modulePath -m moduleName/className\n        \u975E\u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        \u4E8B\u524D\u4F5C\u6210\u3055\u308C\u305F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u304B\u3089:\n            jpackage -n name --app-image appImageDir\n    \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u751F\u6210:\n        \u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        \u975E\u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        jlink\u306B\u72EC\u81EA\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u306B\u306F\u3001jlink\u3092\u5225\u500B\u306B\u5B9F\u884C\u3057\u307E\u3059\u3002\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    Java\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n        jpackage -n name --runtime-image <runtime-image>\n{6}\n\u4E00\u822C\u7684\u306A\u30AA\u30D7\u30B7\u30E7\u30F3:\n  @<filename> \n          \u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u8AAD\u53D6\u308A\u30AA\u30D7\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30E2\u30FC\u30C9 \n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --type -t <type> \n          \u4F5C\u6210\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30BF\u30A4\u30D7\n          \u6709\u52B9\u306A\u5024: {1} \n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u4F9D\u5B58\u306E\n          \u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30BF\u30A4\u30D7\u304C\u4F5C\u6210\u3055\u308C\u307E\u3059\n  --app-version <version>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\n  --copyright <copyright string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B3\u30D4\u30FC\u30E9\u30A4\u30C8\n  --description <description string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u8AAC\u660E\n  --help -h \n          \u4F7F\u7528\u65B9\u6CD5\u30C6\u30AD\u30B9\u30C8\u3068\u73FE\u5728\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u6709\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u3068\u8AAC\u660E\u3092\n          \u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u3001\u7D42\u4E86\u3057\u307E\u3059\n  --icon <file path>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30A4\u30B3\u30F3\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  \
---name -n <name>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u540D\u524D\n  --dest -d <destination path>\n          \u751F\u6210\u3055\u308C\u305F\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u914D\u7F6E\u3055\u308C\u308B\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u73FE\u5728\u306E\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n  --temp <directory path>\n          \u4E00\u6642\u30D5\u30A1\u30A4\u30EB\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3055\u308C\u308B\u65B0\u898F\u307E\u305F\u306F\u7A7A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u6307\u5B9A\u3057\u305F\u5834\u5408\u3001\u30BF\u30B9\u30AF\u5B8C\u4E86\u6642\u306B\u4E00\u6642\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u524A\u9664\u3055\u308C\u306A\u3044\u305F\u3081\n          \u624B\u52D5\u3067\u524A\u9664\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\n          \u6307\u5B9A\u3057\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u4E00\u6642\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u4F5C\u6210\u3055\u308C\n          \u30BF\u30B9\u30AF\u5B8C\u4E86\u6642\u306B\u524A\u9664\u3055\u308C\u307E\u3059\u3002\n  --vendor <vendor string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30D9\u30F3\u30C0\u30FC\n  --verbose\n          \u8A73\u7D30\u306A\u51FA\u529B\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n  --version\n          \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n\n\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --add-modules <module name>[,<module name>...]\n          \u8FFD\u52A0\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30AB\u30F3\u30DE(",")\u533A\u5207\u308A\u30EA\u30B9\u30C8\n          \u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30EA\u30B9\u30C8\u3068\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB(\u6307\u5B9A\u3057\u305F\u5834\u5408)\n          \u304C--add-module\u5F15\u6570\u3068\u3057\u3066jlink\u306B\u6E21\u3055\u308C\u307E\u3059\u3002\n          \u6307\u5B9A\u3057\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u307F(--module\u304C\n          \u6307\u5B9A\u3055\u308C\u305F\u5834\u5408)\u3001\u307E\u305F\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30BB\u30C3\u30C8(--main-jar\u304C \n          \u6307\u5B9A\u3055\u308C\u305F\u5834\u5408)\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --module-path -p <module path>...\n          \u30D1\u30B9\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\n          \u5404\u30D1\u30B9\u306F\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u307E\u305F\u306F\n          \u30E2\u30B8\u30E5\u30E9jar\u3078\u306E\u30D1\u30B9\u3067\u3059\u3002\n          (\u5404\u30D1\u30B9\u306F\u3001\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9\u3067\u3059\u3002)\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --jlink-options <jlink options> \n          jlink\u306B\u6E21\u3059\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30B9\u30DA\u30FC\u30B9\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8 \n          \u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u3001"--strip-native-commands \n          --strip-debug \
---no-man-pages --no-header-files"\u3002 \n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --runtime-image <directory path>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306B\u30B3\u30D4\u30FC\u3055\u308C\u308B\u3001\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u306E\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\n          \u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          --runtime-image\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001jpackage\u306Fjlink\u3092\u5B9F\u884C\u3057\u3001\n          \u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u307E\u3059:\n          --strip-debug\u3001--no-header-files\u3001--no-man-pages\u304A\u3088\u3073\n          --strip-native-commands\u3002\n\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --input -i <directory path>\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u5316\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3080\u5165\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u5165\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306B\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u5316\u3055\u308C\u307E\u3059\u3002\n  --app-content <additional content>[,<additional content>...]\n          \u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA(\u3042\u308B\u3044\u306F\u4E21\u65B9)\u306E\u30D1\u30B9\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30DA\u30A4\u30ED\u30FC\u30C9\u306B\u8FFD\u52A0\u3057\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --add-launcher <launcher name>=<file path>\n          \u30E9\u30F3\u30C1\u30E3\u306E\u540D\u524D\u3001\u304A\u3088\u3073\u30AD\u30FC\u3001\u5024\u306E\u30DA\u30A2\u306E\u30EA\u30B9\u30C8\n          \u3092\u542B\u3080\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30AD\u30FC"module"\u3001"main-jar"\u3001"main-class"\u3001"description"\u3001\n          "arguments"\u3001"java-options"\u3001"app-version"\u3001"icon"\u3001\n          "launcher-as-service"\u3001\n          "win-console"\u3001"win-shortcut"\u3001"win-menu"\u3001\n          "linux-app-category"\u304A\u3088\u3073"linux-shortcut"\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n          \u3053\u308C\u3089\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u5143\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u8FFD\u52A0\u3059\u308B\u304B\u3001\u3053\u308C\u3089\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\n          \u4F7F\u7528\u3057\u3066\u5143\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4E0A\u66F8\u304D\u3057\u3066\u3001\u8FFD\u52A0\u306E\u4EE3\u66FF\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\n          \
-\u30E1\u30A4\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u306F\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u304B\u3089\u4F5C\u6210\u3055\u308C\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u8FFD\u52A0\u306E\u4EE3\u66FF\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3067\u304D\u3001\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8907\u6570\u56DE\u4F7F\u7528\u3057\u3066\n          \u8907\u6570\u306E\u8FFD\u52A0\u306E\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3067\u304D\u307E\u3059\u3002 \n  --arguments <main class arguments>\n          \u30E9\u30F3\u30C1\u30E3\u306B\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u5F15\u6570\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306B\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306B\u6E21\u3059\n          \u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u5F15\u6570\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --java-options <java options>\n          Java\u30E9\u30F3\u30BF\u30A4\u30E0\u306B\u6E21\u3059\u30AA\u30D7\u30B7\u30E7\u30F3\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --main-class <class name>\n          \u5B9F\u884C\u3059\u308B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306E\u4FEE\u98FE\u540D\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u3001--main-jar\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3060\u3051\u3067\u3059\u3002\n  --main-jar <main jar file>\n          \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u542B\u3080\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3JAR\n          (\u5165\u529B\u30D1\u30B9\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9\u3068\u3057\u3066\u6307\u5B9A)\n          --module\u307E\u305F\u306F--main-jar\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u304C\u3001\u4E21\u65B9\u306F\n          \u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n  --module -m <module name>[/<main class>]\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB(\u304A\u3088\u3073\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9)\n          \u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306B\u7F6E\u304B\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\n          Java\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u3067\u30EA\u30F3\u30AF\u3055\u308C\u307E\u3059\u3002--module\u307E\u305F\u306F--main-jar\n          \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u304C\u3001\u4E21\u65B9\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n{2}\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --about-url <url>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30DB\u30FC\u30E0\u30DA\u30FC\u30B8\u306EURL\n  --app-image <directory path>\n          {5}          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --file-associations <file path>\n          \u30AD\u30FC\u3001\u5024\u306E\u30DA\u30A2\u306E\u30EA\u30B9\u30C8\u3092\u542B\u3080\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30D1\u30B9\n          \
-(\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30AD\u30FC"extension"\u3001"mime-type"\u3001"icon"\u3001"description"\n          \u3092\u4F7F\u7528\u3057\u3066\u95A2\u9023\u4ED8\u3051\u3092\u8A18\u8FF0\u3067\u304D\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --install-dir <directory path>\n          {4}  --license-file <file path>\n          \u30E9\u30A4\u30BB\u30F3\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --resource-dir <directory path>\n          \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9jpackage\u30EA\u30BD\u30FC\u30B9\u3078\u306E\u30D1\u30B9\n          \u30A2\u30A4\u30B3\u30F3\u3001\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073jpackage\u306E\u305D\u306E\u4ED6\u306E\u30EA\u30BD\u30FC\u30B9\u306F\u3001\n          \u3053\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u7F6E\u63DB\u30EA\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068\u3067\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3067\u304D\u307E\u3059\u3002\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --runtime-image <directory path>\n          \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u306E\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F5C\u6210\u6642\u306B\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002\n  --launcher-as-service\n          \u6B21\u3068\u3057\u3066\u767B\u9332\u3059\u308B\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u306E\u4F5C\u6210\u3092\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059: \n          \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30FB\u30B5\u30FC\u30D3\u30B9\u30FB\u30BF\u30A4\u30D7\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3068\u3057\u3066\u306E\u30E1\u30A4\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u3002\n\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u4F9D\u5B58\u30AA\u30D7\u30B7\u30E7\u30F3:\n{3}
+MSG_Help=使用方法: jpackage <options>\n\n使用例:\n--------------\n    ホスト・システムに適したアプリケーション・パッケージを生成します。\n        モジュラ・アプリケーションの場合:\n            jpackage -n name -p modulePath -m moduleName/className\n        非モジュラ・アプリケーションの場合:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        事前作成されたアプリケーション・イメージから:\n            jpackage -n name --app-image appImageDir\n    アプリケーション・イメージの生成:\n        モジュラ・アプリケーションの場合:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        非モジュラ・アプリケーションの場合:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        jlinkに独自のオプションを指定するには、jlinkを別個に実行します。\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    Javaランタイム・パッケージを生成します。\n        jpackage -n name --runtime-image <runtime-image>\n{6}\n一般的なオプション:\n  @<filename> \n          ファイルからの読取りオプションおよびモード \n          このオプションは複数回使用できます。\n  --type -t <type> \n          作成するパッケージのタイプ\n          有効な値: {1} \n          このオプションが指定されていない場合、プラットフォーム依存の\n          デフォルト・タイプが作成されます\n  --app-version <version>\n          アプリケーションおよびパッケージのバージョン\n  --copyright <copyright string>\n          アプリケーションのコピーライト\n  --description <description string>\n          アプリケーションの説明\n  --help -h \n          使用方法テキストと現在のプラットフォームの有効なオプションのリストと説明を\n          出力ストリームに出力して、終了します\n  --icon <file path>\n          アプリケーション・パッケージのアイコンのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n  \
+--name -n <name>\n          アプリケーションおよびパッケージの名前\n  --dest -d <destination path>\n          生成された出力ファイルが配置されるパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          デフォルトは現在の作業ディレクトリです。\n  --temp <directory path>\n          一時ファイルの作成に使用される新規または空のディレクトリのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          指定した場合、タスク完了時に一時ディレクトリは削除されないため\n          手動で削除する必要があります\n          指定しなかった場合、一時ディレクトリが作成され\n          タスク完了時に削除されます。\n  --vendor <vendor string>\n          アプリケーションのベンダー\n  --verbose\n          詳細な出力を有効にします\n  --version\n          製品バージョンを出力ストリームに出力して終了します\n\nランタイム・イメージを作成するためのオプション:\n  --add-modules <module name>[,<module name>...]\n          追加するモジュールのカンマ(",")区切りリスト\n          このモジュール・リストとメイン・モジュール(指定した場合)\n          が--add-module引数としてjlinkに渡されます。\n          指定しなかった場合、メイン・モジュールのみ(--moduleが\n          指定された場合)、またはデフォルトのモジュール・セット(--main-jarが \n          指定された場合)が使用されます。\n          このオプションは複数回使用できます。\n  --module-path -p <module path>...\n          パスの{0}区切りリスト\n          各パスは、モジュールのディレクトリまたは\n          モジュラjarへのパスです。\n          (各パスは、絶対パスまたは現在のディレクトリからの相対パスです。)\n          このオプションは複数回使用できます。\n  --jlink-options <jlink options> \n          jlinkに渡すオプションのスペース区切りのリスト \n          指定しない場合、"--strip-native-commands \n          --strip-debug \
+--no-man-pages --no-header-files"。 \n          このオプションは複数回使用できます。\n  --runtime-image <directory path>\n          アプリケーション・イメージにコピーされる、事前定義済みのランタイム・イメージ\n          のパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          --runtime-imageが指定されていない場合、jpackageはjlinkを実行し、\n          次のオプションを使用してランタイム・イメージを作成します:\n          --strip-debug、--no-header-files、--no-man-pagesおよび\n          --strip-native-commands。\n\nアプリケーション・イメージを作成するためのオプション:\n  --input -i <directory path>\n          パッケージ化するファイルを含む入力ディレクトリへのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          入力ディレクトリのすべてのファイルは、アプリケーション・イメージに\n          パッケージ化されます。\n  --app-content <additional content>[,<additional content>...]\n          ファイルまたはディレクトリ(あるいは両方)のパスのカンマ区切りのリスト\n          アプリケーション・ペイロードに追加します。\n          このオプションは複数回使用できます。\n\nアプリケーション・ランチャを作成するためのオプション:\n  --add-launcher <launcher name>=<file path>\n          ランチャの名前、およびキー、値のペアのリスト\n          を含むプロパティ・ファイルへのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          キー"module"、"main-jar"、"main-class"、"description"、\n          "arguments"、"java-options"、"app-version"、"icon"、\n          "launcher-as-service"、\n          "win-console"、"win-shortcut"、"win-menu"、\n          "linux-app-category"および"linux-shortcut"を使用できます。\n          これらのオプションを元のコマンドライン・オプションに追加するか、これらのオプションを\n          使用して元のコマンドライン・オプションを上書きして、追加の代替ランチャを作成します。\n          \
+メイン・アプリケーション・ランチャはコマンドライン・オプションから作成されます。\n          このオプションを使用して追加の代替ランチャを作成でき、\n          このオプションを複数回使用して\n          複数の追加のランチャを作成できます。 \n  --arguments <main class arguments>\n          ランチャにコマンド・ライン引数が指定されていない場合にメイン・クラスに渡す\n          コマンド・ライン引数\n          このオプションは複数回使用できます。\n  --java-options <java options>\n          Javaランタイムに渡すオプション\n          このオプションは複数回使用できます。\n  --main-class <class name>\n          実行するアプリケーション・メイン・クラスの修飾名\n          このオプションを使用できるのは、--main-jarが指定されている場合だけです。\n  --main-jar <main jar file>\n          メイン・クラスを含む、アプリケーションのメインJAR\n          (入力パスからの相対パスとして指定)\n          --moduleまたは--main-jarオプションを指定できますが、両方は\n          指定できません。\n  --module -m <module name>[/<main class>]\n          アプリケーションのメイン・モジュール(およびオプションでメイン・クラス)\n          このモジュールは、モジュール・パスに置かれている必要があります。\n          このオプションが指定されている場合、メイン・モジュールは\n          Javaランタイム・イメージ内でリンクされます。--moduleまたは--main-jar\n          オプションを指定できますが、両方は指定できません。\n{2}\nアプリケーション・パッケージを作成するためのオプション:\n  --about-url <url>\n          アプリケーションのホームページのURL\n  --app-image <directory path>\n          {5}          (絶対パスまたは現在のディレクトリからの相対パス)\n  --file-associations <file path>\n          キー、値のペアのリストを含むプロパティ・ファイルへのパス\n          \
+(絶対パスまたは現在のディレクトリからの相対パス)\n          キー"extension"、"mime-type"、"icon"、"description"\n          を使用して関連付けを記述できます。\n          このオプションは複数回使用できます。\n  --install-dir <directory path>\n          {4}  --license-file <file path>\n          ライセンス・ファイルへのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n  --resource-dir <directory path>\n          オーバーライドjpackageリソースへのパス\n          アイコン、テンプレート・ファイルおよびjpackageのその他のリソースは、\n          このディレクトリに置換リソースを追加することでオーバーライドできます。\n          (絶対パスまたは現在のディレクトリからの相対パス)\n  --runtime-image <directory path>\n          インストールする事前定義済みのランタイム・イメージのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          ランタイム・パッケージの作成時には、オプションが必要です。\n  --launcher-as-service\n          次として登録するインストーラの作成をリクエストします: \n          バックグラウンド・サービス・タイプ・アプリケーションとしてのメイン・アプリケーション・ランチャ。\n\nアプリケーション・パッケージを作成するためのプラットフォーム依存オプション:\n{3}
 
-MSG_Help_win_launcher=\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u4F9D\u5B58\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --win-console\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B3\u30F3\u30BD\u30FC\u30EB\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\u30B3\u30F3\u30BD\u30FC\u30EB\u30FB\n          \u30A4\u30F3\u30BF\u30E9\u30AF\u30B7\u30E7\u30F3\u304C\u5FC5\u8981\u306A\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\n
-MSG_Help_win_install=\  --win-dir-chooser\n          \u30E6\u30FC\u30B6\u30FC\u304C\u88FD\u54C1\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u9078\u629E\u3059\u308B\u305F\u3081\u306E\n          \u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n  --win-help-url <url>\n          \u30E6\u30FC\u30B6\u30FC\u304C\u8A73\u7D30\u60C5\u5831\u307E\u305F\u306F\u6280\u8853\u7684\u306A\u30B5\u30DD\u30FC\u30C8\u3092\u53D6\u5F97\u3067\u304D\u308BURL\n  --win-menu\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B9\u30BF\u30FC\u30C8\u30FB\u30E1\u30CB\u30E5\u30FC\u30FB\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u3088\u3046\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --win-menu-group <menu group name>\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u914D\u7F6E\u3059\u308B\u30B9\u30BF\u30FC\u30C8\u30FB\u30E1\u30CB\u30E5\u30FC\u30FB\u30B0\u30EB\u30FC\u30D7\n  --win-per-user-install\n          \u30E6\u30FC\u30B6\u30FC\u3054\u3068\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u5B9F\u884C\u3059\u308B\u3088\u3046\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --win-shortcut\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\u30FB\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u3088\u3046\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --win-shortcut-prompt\n          \u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u3067\u4F5C\u6210\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u30E6\u30FC\u30B6\u30FC\u304C\u9078\u629E\u3067\u304D\u308B\u3088\u3046\u306B\u3059\u308B\n          \u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n  --win-update-url <url>\n          \u4F7F\u7528\u53EF\u80FD\u306A\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u66F4\u65B0\u60C5\u5831\u306EURL\n  --win-upgrade-uuid <id string>\n          \u3053\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u305FUUID\n
-MSG_Help_win_install_dir=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5834\u6240\u306E\u4E0B\u306E\u76F8\u5BFE\u30B5\u30D6\u30D1\u30B9\n
-MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          dmg\u306B\u53C2\u7167\u3055\u308C\u305F\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u3059\u3079\u3066\u542B\u3081\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 \n
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          macOS\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4E00\u610F\u306B\u8B58\u5225\u3059\u308BID\n          \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n          \u82F1\u6570\u5B57(A-Z\u3001a-z\u30010-9)\u3001\u30CF\u30A4\u30D5\u30F3(-)\u304A\u3088\u3073\u30D4\u30EA\u30AA\u30C9(.)\u6587\u5B57\u306E\u307F\n          \u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --mac-package-name <name string>\n          \u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\u306B\u8868\u793A\u3055\u308C\u308B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u540D\u524D\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\n          \u3053\u306E\u540D\u524D\u306F16\u6587\u5B57\u672A\u6E80\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\u304A\u3088\u3073\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u60C5\u5831\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\n          \u8868\u793A\u3059\u308B\u306E\u306B\u9069\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u969B\u3001\n          \u65E2\u5B58\u306E\u30D1\u30C3\u30B1\u30FC\u30B8ID\u306E\u306A\u3044\u7F72\u540D\u304C\u5FC5\u8981\u306A\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u3001\n          \u3053\u306E\u5024\u304C\u63A5\u982D\u8F9E\u3068\u3057\u3066\u4ED8\u3051\u3089\u308C\u307E\u3059\u3002\n  --mac-sign\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u3088\u3046\n          \u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\u3002\n  --mac-signing-keychain <keychain name>\n          \u7F72\u540D\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u3092\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u306E\u540D\u524D\n          \u6307\u5B9A\u3057\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u6A19\u6E96\u306E\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n  --mac-signing-key-user-name <team name>\n          Apple\u7F72\u540D\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u30C1\u30FC\u30E0\u307E\u305F\u306F\u30E6\u30FC\u30B6\u30FC\u540D\u90E8\u5206\u3002\n  --mac-app-store\n          jpackage\u51FA\u529B\u304CMac App Store\u7528\u3067\u3042\u308B\u3053\u3068\n          \u3092\u793A\u3057\u307E\u3059\u3002\n  --mac-entitlements <file path>\n          \u30D0\u30F3\u30C9\u30EB\u306E\u5B9F\u884C\u53EF\u80FD\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u30E9\u30A4\u30D6\u30E9\u30EA\u306E\u7F72\u540D\u6642\u306B\n          \u4F7F\u7528\u3059\u308B\u6A29\u9650\u3092\u542B\u3080\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u3002\n  --mac-app-category <category string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306Eplist\u306ELSApplicationCategoryType\u3092\u751F\u6210\u3059\u308B\u969B\u306B\u4F7F\u7528\u3059\u308B\u6587\u5B57\u5217\u3002\n          \u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F"utilities"\u3067\u3059\u3002\n
-MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u540D\u524D\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\n  --linux-deb-maintainer <email address>\n          .deb\u30D1\u30C3\u30B1\u30FC\u30B8\u306EMaintainer\n  --linux-menu-group <menu-group-name>\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u914D\u7F6E\u3055\u308C\u3066\u3044\u308B\u30E1\u30CB\u30E5\u30FC\u30FB\u30B0\u30EB\u30FC\u30D7\n  --linux-package-deps\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u5FC5\u8981\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u6A5F\u80FD\n  --linux-rpm-license-type <type string>\n          \u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u30BF\u30A4\u30D7(RPM .spec\u306E"License: <value>")\n  --linux-app-release <release value>\n          RPM <name>.spec\u30D5\u30A1\u30A4\u30EB\u306E\u30EA\u30EA\u30FC\u30B9\u5024\u307E\u305F\u306F\n          DEB\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u30FB\u30D5\u30A1\u30A4\u30EB\u306EDebian\u30EA\u30D3\u30B8\u30E7\u30F3\u5024\u3002\n  --linux-app-category <category value>\n          RPM <name>.spec\u30D5\u30A1\u30A4\u30EB\u306E\u30B0\u30EB\u30FC\u30D7\u5024\u307E\u305F\u306F \n           DEB\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u5024\n  --linux-shortcut\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\n
-MSG_Help_mac_linux_install_dir=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u7D76\u5BFE\u30D1\u30B9\n
-MSG_Help_default_install_dir=OS X\u307E\u305F\u306FLinux\u4E0A\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u7D76\u5BFE\u30D1\u30B9\u3002\n          "\u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D5\u30A1\u30A4\u30EB"\u3084"AppData"\u306A\u3069\u3001Windows\u4E0A\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\n          \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5834\u6240\u306E\u76F8\u5BFE\u30B5\u30D6\u30D1\u30B9\u3002\n
-MSG_Help_no_args=\u4F7F\u7528\u65B9\u6CD5: jpackage <options>\n\u5229\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001jpackage --help (or -h)\u3092\u4F7F\u7528\u3057\u307E\u3059
-MSG_Help_default_app_image=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u53EF\u80FD\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3059\u308B\u3001\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u5834\u6240\n
-MSG_Help_mac_app_image=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u53EF\u80FD\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F5C\u6210\u307E\u305F\u306F\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\n          \u30A4\u30E1\u30FC\u30B8\u3078\u306E\u7F72\u540D\u306B\u4F7F\u7528\u3059\u308B\u3001\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\n          \u30A4\u30E1\u30FC\u30B8\u306E\u5834\u6240\n
-MSG_Help_mac_sign_sample_usage=\    \u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u3078\u306E\u7F72\u540D:\n        jpackage --type app-image --app-image <app-image> \\\n            --mac-sign [<additional signing options>...]\n        \u30CE\u30FC\u30C8: \u3053\u306E\u30E2\u30FC\u30C9\u3067\u8A31\u53EF\u3055\u308C\u308B\u552F\u4E00\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3:\n              \u8FFD\u52A0\u306Emac\u7F72\u540D\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BB\u30C3\u30C8\u304A\u3088\u3073--verbose\n
+MSG_Help_win_launcher=\nアプリケーション・ランチャを作成するためのプラットフォーム依存オプション:\n  --win-console\n          アプリケーションのコンソール・ランチャを作成します。コンソール・\n          インタラクションが必要なアプリケーションに指定する必要があります\n
+MSG_Help_win_install=\  --win-dir-chooser\n          ユーザーが製品をインストールするディレクトリを選択するための\n          ダイアログを追加します。\n  --win-help-url <url>\n          ユーザーが詳細情報または技術的なサポートを取得できるURL\n  --win-menu\n          このアプリケーションのスタート・メニュー・ショートカットを追加するようにリクエストします\n  --win-menu-group <menu group name>\n          このアプリケーションを配置するスタート・メニュー・グループ\n  --win-per-user-install\n          ユーザーごとにインストールを実行するようにリクエストします\n  --win-shortcut\n          このアプリケーションのデスクトップ・ショートカットを追加するようにリクエストします\n  --win-shortcut-prompt\n          ショートカットをインストーラで作成するかどうかをユーザーが選択できるようにする\n          ダイアログを追加します。\n  --win-update-url <url>\n          使用可能なアプリケーションの更新情報のURL\n  --win-upgrade-uuid <id string>\n          このパッケージのアップグレードに関連付けられたUUID\n
+MSG_Help_win_install_dir=デフォルトのインストール場所の下の相対サブパス\n
+MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          dmgに参照されたコンテンツをすべて含めます。\n          このオプションは複数回使用できます。 \n
+MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          macOSのアプリケーションを一意に識別するID\n          メイン・クラス名にデフォルト設定されています。\n          英数字(A-Z、a-z、0-9)、ハイフン(-)およびピリオド(.)文字のみ\n          使用できます。\n  --mac-package-name <name string>\n          メニュー・バーに表示されるアプリケーションの名前\n          アプリケーション名とは異なります。\n          この名前は16文字未満にする必要があり、メニュー・バーおよびアプリケーション情報ウィンドウに\n          表示するのに適している必要があります。\n          アプリケーション名にデフォルト設定されています。\n  --mac-package-signing-prefix <prefix string>\n          アプリケーション・パッケージに署名する際、\n          既存のパッケージIDのない署名が必要なすべてのコンポーネントに、\n          この値が接頭辞として付けられます。\n  --mac-sign\n          パッケージまたは事前定義済みアプリケーション・イメージに署名するよう\n          リクエストします。\n  --mac-signing-keychain <keychain name>\n          署名アイデンティティを検索するキーチェーンの名前\n          指定しなかった場合、標準のキーチェーンが使用されます。\n  --mac-signing-key-user-name <team name>\n          Apple署名アイデンティティのチームまたはユーザー名部分。\n  --mac-app-store\n          jpackage出力がMac App Store用であること\n          を示します。\n  --mac-entitlements <file path>\n          バンドルの実行可能ファイルおよびライブラリの署名時に\n          使用する権限を含むファイルのパス。\n  --mac-app-category <category string>\n          アプリケーションのplistのLSApplicationCategoryTypeを生成する際に使用する文字列。\n          デフォルト値は"utilities"です。\n
+MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linuxパッケージの名前。アプリケーション名にデフォルト設定されています\n  --linux-deb-maintainer <email address>\n          .debパッケージのMaintainer\n  --linux-menu-group <menu-group-name>\n          このアプリケーションが配置されているメニュー・グループ\n  --linux-package-deps\n          アプリケーションに必要なパッケージまたは機能\n  --linux-rpm-license-type <type string>\n          ライセンスのタイプ(RPM .specの"License: <value>")\n  --linux-app-release <release value>\n          RPM <name>.specファイルのリリース値または\n          DEBコントロール・ファイルのDebianリビジョン値。\n  --linux-app-category <category value>\n          RPM <name>.specファイルのグループ値または \n           DEBコントロール・ファイルのセクション値\n  --linux-shortcut\n          アプリケーションのショートカットを作成します。\n
+MSG_Help_mac_linux_install_dir=アプリケーションのインストール・ディレクトリの絶対パス\n
+MSG_Help_default_install_dir=OS XまたはLinux上のアプリケーションのインストール・ディレクトリの絶対パス。\n          "プログラム・ファイル"や"AppData"など、Windows上のアプリケーションの\n          インストール場所の相対サブパス。\n
+MSG_Help_no_args=使用方法: jpackage <options>\n利用可能なオプションのリストについては、jpackage --help (or -h)を使用します
+MSG_Help_default_app_image=インストール可能なパッケージの作成に使用する、事前定義済み\n          アプリケーション・イメージの場所\n
+MSG_Help_mac_app_image=インストール可能なパッケージの作成または事前定義済みアプリケーション・\n          イメージへの署名に使用する、事前定義済みアプリケーション・\n          イメージの場所\n
+MSG_Help_mac_sign_sample_usage=\    事前定義済みアプリケーション・イメージへの署名:\n        jpackage --type app-image --app-image <app-image> \\\n            --mac-sign [<additional signing options>...]\n        ノート: このモードで許可される唯一の追加オプション:\n              追加のmac署名オプションのセットおよび--verbose\n
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
index 7ef314ffd37..0b4889199a4 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
@@ -24,20 +24,20 @@
 #
 #
 
-MSG_Help=\u7528\u6CD5\uFF1Ajpackage <options>\n\n\u793A\u4F8B\u7528\u6CD5:\n--------------\n    \u751F\u6210\u9002\u5408\u4E3B\u673A\u7CFB\u7EDF\u7684\u5E94\u7528\u7A0B\u5E8F\u5305\uFF1A\n        \u5BF9\u4E8E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage -n name -p modulePath -m moduleName/className\n        \u5BF9\u4E8E\u975E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        \u4ECE\u9884\u6784\u5EFA\u7684\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\uFF1A\n            jpackage -n name --app-image appImageDir\n    \u751F\u6210\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\uFF1A\n        \u5BF9\u4E8E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        \u5BF9\u4E8E\u975E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        \u8981\u4E3A jlink \u63D0\u4F9B\u60A8\u81EA\u5DF1\u7684\u9009\u9879\uFF0C\u8BF7\u5355\u72EC\u8FD0\u884C jlink\uFF1A\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    \u751F\u6210 Java \u8FD0\u884C\u65F6\u7A0B\u5E8F\u5305\uFF1A\n        jpackage -n name --runtime-image <runtime-image>\n{6}\n\u4E00\u822C\u9009\u9879\uFF1A\n  @<filename> \n          \u4ECE\u6587\u4EF6\u8BFB\u53D6\u9009\u9879\u548C/\u6216\u6A21\u5F0F \n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --type -t <type> \n          \u8981\u521B\u5EFA\u7684\u7A0B\u5E8F\u5305\u7684\u7C7B\u578B\n          \u6709\u6548\u503C\u4E3A\uFF1A{1} \n          \u5982\u679C\u672A\u6307\u5B9A\u6B64\u9009\u9879\uFF0C\u5219\u5C06\u521B\u5EFA\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\n          \u9ED8\u8BA4\u7C7B\u578B\u3002\n  --app-version <version>\n          \u5E94\u7528\u7A0B\u5E8F\u548C/\u6216\u7A0B\u5E8F\u5305\u7684\u7248\u672C\n  --copyright <copyright string>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u7248\u6743\n  --description <description string>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u8BF4\u660E\n  --help -h \n          \u5C06\u7528\u6CD5\u6587\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\uFF0C\u7528\u6CD5\u6587\u672C\u4E2D\u5305\u542B\n          \u9002\u7528\u4E8E\u5F53\u524D\u5E73\u53F0\u7684\u6BCF\u4E2A\u6709\u6548\u9009\u9879\u7684\u5217\u8868\u548C\u8BF4\u660E\n  --icon <file path>\n          \u5E94\u7528\u7A0B\u5E8F\u5305\u56FE\u6807\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --name -n <name>\n          \u5E94\u7528\u7A0B\u5E8F\u548C/\u6216\u7A0B\u5E8F\u5305\u7684\u540D\u79F0\n  --dest -d <destination path>\n          \u7528\u6765\u653E\u7F6E\u6240\u751F\u6210\u7684\u8F93\u51FA\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u9ED8\u8BA4\u4E3A\u5F53\u524D\u7684\u5DE5\u4F5C\u76EE\u5F55\u3002\n  --temp <directory path>\n          \u7528\u6765\u521B\u5EFA\u4E34\u65F6\u6587\u4EF6\u7684\u65B0\u76EE\u5F55\u6216\u7A7A\u767D\u76EE\u5F55\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u5982\u679C\u6307\u5B9A\uFF0C\u5219\u5728\u4EFB\u52A1\u5B8C\u6210\u65F6\u5C06\u4E0D\u5220\u9664\u4E34\u65F6\u76EE\u5F55\uFF0C\n          \u5FC5\u987B\u624B\u52A8\u5220\u9664\u4E34\u65F6\u76EE\u5F55\u3002\n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u5C06\u521B\u5EFA\u4E00\u4E2A\u4E34\u65F6\u76EE\u5F55\uFF0C\n          \
-\u5E76\u5728\u4EFB\u52A1\u5B8C\u6210\u65F6\u5220\u9664\u8BE5\u4E34\u65F6\u76EE\u5F55\u3002\n  --vendor <vendor string>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u4F9B\u5E94\u5546\n  --verbose\n          \u542F\u7528\u8BE6\u7EC6\u7684\u8F93\u51FA\n  --version\n          \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\u3002\n\n\u7528\u6765\u521B\u5EFA\u8FD0\u884C\u65F6\u6620\u50CF\u7684\u9009\u9879\uFF1A\n  --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n          \u8981\u6DFB\u52A0\u7684\u6A21\u5757\u7684\u9017\u53F7 (",") \u5206\u9694\u5217\u8868\n          \u6B64\u6A21\u5757\u5217\u8868\u8FDE\u540C\u4E3B\u6A21\u5757\uFF08\u5982\u679C\u6307\u5B9A\uFF09\n          \u5C06\u4F5C\u4E3A --add-module \u53C2\u6570\u4F20\u9012\u5230 jlink\u3002\n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u4EC5\u4F7F\u7528\u4E3B\u6A21\u5757\uFF08\u5982\u679C\u6307\u5B9A\u4E86 --module\uFF09\uFF0C\n          \u6216\u8005\u4F7F\u7528\u9ED8\u8BA4\u7684\u6A21\u5757\u96C6\uFF08\u5982\u679C\u6307\u5B9A\u4E86  \n          --main-jar\uFF09\u3002\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --module-path -p <module path>...\n          \u8DEF\u5F84\u7684 {0} \u5206\u9694\u5217\u8868\n          \u6BCF\u4E2A\u8DEF\u5F84\u8981\u4E48\u662F\u6A21\u5757\u7684\u76EE\u5F55\uFF0C\u8981\u4E48\u662F\n          \u6A21\u5757\u5316 jar \u7684\u8DEF\u5F84\u3002\n          \uFF08\u6BCF\u4E2A\u8DEF\u5F84\u53EF\u4EE5\u662F\u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u4E5F\u53EF\u4EE5\u662F\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\u3002\uFF09\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --jlink-options <jlink \u9009\u9879> \n          \u8981\u4F20\u9012\u7ED9 jlink \u7684\u9009\u9879\u5217\u8868\uFF08\u7528\u7A7A\u683C\u5206\u9694\uFF09 \n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u9ED8\u8BA4\u4E3A "--strip-native-commands \n          --strip-debug --no-man-pages --no-header-files"\u3002 \n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --runtime-image <directory path>\n          \u5C06\u590D\u5236\u5230\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u9884\u5B9A\u4E49\n          \u8FD0\u884C\u65F6\u6620\u50CF\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u5982\u679C\u672A\u6307\u5B9A --runtime-image\uFF0Cjpackage \u5C06\u8FD0\u884C jlink \u4EE5\n          \u4F7F\u7528\u5982\u4E0B\u9009\u9879\u521B\u5EFA\u8FD0\u884C\u65F6\u6620\u50CF\uFF1A\n          --strip-debug\u3001--no-header-files\u3001--no-man-pages \u548C \n          --strip-native-commands\u3002\n\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u9009\u9879\uFF1A\n  --input -i <directory path>\n          \u5305\u542B\u8981\u6253\u5305\u7684\u6587\u4EF6\u7684\u8F93\u5165\u76EE\u5F55\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u8F93\u5165\u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u5C06\u6253\u5305\u5230\n          \u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u4E2D\u3002\n  --app-content <additional content>[,<additional content>...]\n          \u8981\u6DFB\u52A0\u5230\u5E94\u7528\u7A0B\u5E8F\u6709\u6548\u8D1F\u8F7D\u4E2D\u7684\u6587\u4EF6\u548C/\u6216\n          \u76EE\u5F55\u7684\u9017\u53F7\u5206\u9694\u8DEF\u5F84\u5217\u8868\u3002\n          \u6B64\u9009\u9879\u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u3002\n\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u7684\u9009\u9879\uFF1A\n  --add-launcher <launcher name>=<file path>\n          \u542F\u52A8\u7A0B\u5E8F\u7684\u540D\u79F0\u548C\u5305\u542B\u5173\u952E\u5B57-\u503C\u5BF9\u5217\u8868\u7684\n          \u5C5E\u6027\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \
-\u53EF\u4EE5\u4F7F\u7528\u5173\u952E\u5B57 "module"\u3001"main-jar"\u3001"main-class"\u3001"description"\u3001\n          "arguments"\u3001"java-options"\u3001"app-version"\u3001"icon"\u3001\n          "launcher-as-service"\u3001\n          "win-console"\u3001"win-shortcut"\u3001"win-menu"\u3001\n          "linux-app-category" \u548C "linux-shortcut"\u3002\n          \u8FD9\u4E9B\u9009\u9879\u5C06\u6DFB\u52A0\u5230\u539F\u59CB\u547D\u4EE4\u884C\u9009\u9879\u4E2D\u6216\u8005\u7528\u6765\u8986\u76D6\n          \u539F\u59CB\u547D\u4EE4\u884C\u9009\u9879\uFF0C\u4EE5\u6784\u5EFA\u989D\u5916\u7684\u66FF\u4EE3\u542F\u52A8\u7A0B\u5E8F\u3002\n          \u5C06\u4ECE\u547D\u4EE4\u884C\u9009\u9879\u6784\u5EFA\u4E3B\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u3002\n          \u53EF\u4EE5\u4F7F\u7528\u6B64\u9009\u9879\u6784\u5EFA\u989D\u5916\u7684\u66FF\u4EE3\u542F\u52A8\u7A0B\u5E8F\uFF0C\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u6765\u6784\u5EFA\n          \u591A\u4E2A\u989D\u5916\u7684\u542F\u52A8\u7A0B\u5E8F\u3002 \n  --arguments <main class arguments>\n          \u5728\u6CA1\u6709\u4E3A\u542F\u52A8\u7A0B\u5E8F\u63D0\u4F9B\u547D\u4EE4\u884C\u53C2\u6570\u65F6\uFF0C\n          \u8981\u4F20\u9012\u5230\u4E3B\u7C7B\u7684\u547D\u4EE4\u884C\u53C2\u6570\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --java-options <java options>\n          \u8981\u4F20\u9012\u5230 Java \u8FD0\u884C\u65F6\u7684\u9009\u9879\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --main-class <class name>\n          \u8981\u6267\u884C\u7684\u5E94\u7528\u7A0B\u5E8F\u4E3B\u7C7B\u7684\u9650\u5B9A\u540D\u79F0\n          \u53EA\u6709\u5728\u6307\u5B9A\u4E86 --main-jar \u65F6\u624D\u80FD\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --main-jar <main jar file>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B JAR\uFF1B\u5305\u542B\u4E3B\u7C7B\n          \uFF08\u6307\u5B9A\u4E3A\u76F8\u5BF9\u4E8E\u8F93\u5165\u8DEF\u5F84\u7684\u8DEF\u5F84\uFF09\n          \u53EF\u4EE5\u6307\u5B9A --module \u6216 --main-jar \u9009\u9879\uFF0C\u4F46\u662F\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A\n          \u4E24\u8005\u3002\n  --module -m <module name>[/<main class>]\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u6A21\u5757\uFF08\u4EE5\u53CA\u53EF\u9009\u7684\u4E3B\u7C7B\uFF09\n          \u6B64\u6A21\u5757\u5FC5\u987B\u4F4D\u4E8E\u6A21\u5757\u8DEF\u5F84\u4E2D\u3002\n          \u5982\u679C\u6307\u5B9A\u4E86\u6B64\u9009\u9879\uFF0C\u5219\u5C06\u5728 Java \u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\n          \u94FE\u63A5\u4E3B\u6A21\u5757\u3002\u53EF\u4EE5\u6307\u5B9A --module \u6216 --main-jar \u9009\u9879\uFF0C\n          \u4F46\u662F\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A\u8FD9\u4E24\u4E2A\u9009\u9879\u3002\n{2}\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305\u7684\u9009\u9879\uFF1A\n  --about-url <url>\n          \u5E94\u7528\u7A0B\u5E8F\u4E3B\u9875\u7684 URL\n  --app-image <directory path>\n          {5}          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --file-associations <file path>\n          \u5305\u542B\u5173\u952E\u5B57-\u503C\u5BF9\u5217\u8868\u7684\u5C5E\u6027\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u53EF\u4EE5\u4F7F\u7528\u5173\u952E\u5B57 "extension"\u3001"mime-type"\u3001"icon" \u548C "description" \n          \u6765\u63CF\u8FF0\u6B64\u5173\u8054\u3002\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --install-dir <directory path>\n          {4}  --license-file <file path>\n          \u8BB8\u53EF\u8BC1\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --resource-dir <directory path>\n          \u8986\u76D6 jpackage \u8D44\u6E90\u7684\u8DEF\u5F84\n          \
-\u53EF\u4EE5\u901A\u8FC7\u5411\u8BE5\u76EE\u5F55\u4E2D\u6DFB\u52A0\u66FF\u4EE3\u8D44\u6E90\u6765\u8986\u76D6 jpackage \u7684\n          \u56FE\u6807\u3001\u6A21\u677F\u6587\u4EF6\u548C\u5176\u4ED6\u8D44\u6E90\u3002\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --runtime-image <directory path>\n          \u8981\u5B89\u88C5\u7684\u9884\u5B9A\u4E49\u8FD0\u884C\u65F6\u6620\u50CF\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u5728\u521B\u5EFA\u8FD0\u884C\u65F6\u7A0B\u5E8F\u5305\u65F6\u9700\u8981\u4F7F\u7528\u9009\u9879\u3002\n  --launcher-as-service\n          \u8BF7\u6C42\u521B\u5EFA\u5B89\u88C5\u7A0B\u5E8F\uFF0C\u4EE5\u5C06\u4E3B\n          \u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u6CE8\u518C\u4E3A\u540E\u53F0\u670D\u52A1\u7C7B\u578B\u5E94\u7528\u7A0B\u5E8F\u3002\n\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305\u7684\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\u9009\u9879\uFF1A\n{3}
+MSG_Help=用法：jpackage <options>\n\n示例用法:\n--------------\n    生成适合主机系统的应用程序包：\n        对于模块化应用程序：\n            jpackage -n name -p modulePath -m moduleName/className\n        对于非模块化应用程序：\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        从预构建的应用程序映像：\n            jpackage -n name --app-image appImageDir\n    生成应用程序映像：\n        对于模块化应用程序：\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        对于非模块化应用程序：\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        要为 jlink 提供您自己的选项，请单独运行 jlink：\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    生成 Java 运行时程序包：\n        jpackage -n name --runtime-image <runtime-image>\n{6}\n一般选项：\n  @<filename> \n          从文件读取选项和/或模式 \n          可以多次使用此选项。\n  --type -t <type> \n          要创建的程序包的类型\n          有效值为：{1} \n          如果未指定此选项，则将创建与平台相关的\n          默认类型。\n  --app-version <version>\n          应用程序和/或程序包的版本\n  --copyright <copyright string>\n          应用程序的版权\n  --description <description string>\n          应用程序的说明\n  --help -h \n          将用法文本输出到输出流并退出，用法文本中包含\n          适用于当前平台的每个有效选项的列表和说明\n  --icon <file path>\n          应用程序包图标的路径\n          （绝对路径或相对于当前目录的路径）\n  --name -n <name>\n          应用程序和/或程序包的名称\n  --dest -d <destination path>\n          用来放置所生成的输出文件的路径\n          （绝对路径或相对于当前目录的路径）\n          默认为当前的工作目录。\n  --temp <directory path>\n          用来创建临时文件的新目录或空白目录的路径\n          （绝对路径或相对于当前目录的路径）\n          如果指定，则在任务完成时将不删除临时目录，\n          必须手动删除临时目录。\n          如果未指定，则将创建一个临时目录，\n          \
+并在任务完成时删除该临时目录。\n  --vendor <vendor string>\n          应用程序的供应商\n  --verbose\n          启用详细的输出\n  --version\n          将产品版本输出到输出流并退出。\n\n用来创建运行时映像的选项：\n  --add-modules <模块名称>[,<模块名称>...]\n          要添加的模块的逗号 (",") 分隔列表\n          此模块列表连同主模块（如果指定）\n          将作为 --add-module 参数传递到 jlink。\n          如果未指定，则仅使用主模块（如果指定了 --module），\n          或者使用默认的模块集（如果指定了  \n          --main-jar）。\n          可以多次使用此选项。\n  --module-path -p <module path>...\n          路径的 {0} 分隔列表\n          每个路径要么是模块的目录，要么是\n          模块化 jar 的路径。\n          （每个路径可以是绝对路径，也可以是相对于当前目录的路径。）\n          可以多次使用此选项。\n  --jlink-options <jlink 选项> \n          要传递给 jlink 的选项列表（用空格分隔） \n          如果未指定，则默认为 "--strip-native-commands \n          --strip-debug --no-man-pages --no-header-files"。 \n          可以多次使用此选项。\n  --runtime-image <directory path>\n          将复制到应用程序映像的预定义\n          运行时映像的路径\n          （绝对路径或相对于当前目录的路径）\n          如果未指定 --runtime-image，jpackage 将运行 jlink 以\n          使用如下选项创建运行时映像：\n          --strip-debug、--no-header-files、--no-man-pages 和 \n          --strip-native-commands。\n\n用来创建应用程序映像的选项：\n  --input -i <directory path>\n          包含要打包的文件的输入目录的路径\n          （绝对路径或相对于当前目录的路径）\n          输入目录中的所有文件将打包到\n          应用程序映像中。\n  --app-content <additional content>[,<additional content>...]\n          要添加到应用程序有效负载中的文件和/或\n          目录的逗号分隔路径列表。\n          此选项可以多次使用。\n\n用来创建应用程序启动程序的选项：\n  --add-launcher <launcher name>=<file path>\n          启动程序的名称和包含关键字-值对列表的\n          属性文件的路径\n          （绝对路径或相对于当前目录的路径）\n          \
+可以使用关键字 "module"、"main-jar"、"main-class"、"description"、\n          "arguments"、"java-options"、"app-version"、"icon"、\n          "launcher-as-service"、\n          "win-console"、"win-shortcut"、"win-menu"、\n          "linux-app-category" 和 "linux-shortcut"。\n          这些选项将添加到原始命令行选项中或者用来覆盖\n          原始命令行选项，以构建额外的替代启动程序。\n          将从命令行选项构建主应用程序启动程序。\n          可以使用此选项构建额外的替代启动程序，\n          可以多次使用此选项来构建\n          多个额外的启动程序。 \n  --arguments <main class arguments>\n          在没有为启动程序提供命令行参数时，\n          要传递到主类的命令行参数\n          可以多次使用此选项。\n  --java-options <java options>\n          要传递到 Java 运行时的选项\n          可以多次使用此选项。\n  --main-class <class name>\n          要执行的应用程序主类的限定名称\n          只有在指定了 --main-jar 时才能使用此选项。\n  --main-jar <main jar file>\n          应用程序的主 JAR；包含主类\n          （指定为相对于输入路径的路径）\n          可以指定 --module 或 --main-jar 选项，但是不能同时指定\n          两者。\n  --module -m <module name>[/<main class>]\n          应用程序的主模块（以及可选的主类）\n          此模块必须位于模块路径中。\n          如果指定了此选项，则将在 Java 运行时映像中\n          链接主模块。可以指定 --module 或 --main-jar 选项，\n          但是不能同时指定这两个选项。\n{2}\n用来创建应用程序包的选项：\n  --about-url <url>\n          应用程序主页的 URL\n  --app-image <directory path>\n          {5}          （绝对路径或相对于当前目录的路径）\n  --file-associations <file path>\n          包含关键字-值对列表的属性文件的路径\n          （绝对路径或相对于当前目录的路径）\n          可以使用关键字 "extension"、"mime-type"、"icon" 和 "description" \n          来描述此关联。\n          可以多次使用此选项。\n  --install-dir <directory path>\n          {4}  --license-file <file path>\n          许可证文件的路径\n          （绝对路径或相对于当前目录的路径）\n  --resource-dir <directory path>\n          覆盖 jpackage 资源的路径\n          \
+可以通过向该目录中添加替代资源来覆盖 jpackage 的\n          图标、模板文件和其他资源。\n          （绝对路径或相对于当前目录的路径）\n  --runtime-image <directory path>\n          要安装的预定义运行时映像的路径\n          （绝对路径或相对于当前目录的路径）\n          在创建运行时程序包时需要使用选项。\n  --launcher-as-service\n          请求创建安装程序，以将主\n          应用程序启动程序注册为后台服务类型应用程序。\n\n用来创建应用程序包的与平台相关的选项：\n{3}
 
-MSG_Help_win_launcher=\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u7684\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\u9009\u9879\uFF1A\n  --win-console\n          \u4E3A\u5E94\u7528\u7A0B\u5E8F\u521B\u5EFA\u63A7\u5236\u53F0\u542F\u52A8\u7A0B\u5E8F\uFF0C\u5E94\u5F53\u4E3A\n          \u9700\u8981\u63A7\u5236\u53F0\u4EA4\u4E92\u7684\u5E94\u7528\u7A0B\u5E8F\u6307\u5B9A\n
-MSG_Help_win_install=\  --win-dir-chooser\n          \u6DFB\u52A0\u4E00\u4E2A\u5BF9\u8BDD\u6846\u4EE5\u5141\u8BB8\u7528\u6237\u9009\u62E9\n          \u4EA7\u54C1\u7684\u5B89\u88C5\u76EE\u5F55\u3002\n  --win-help-url <url>\n          \u7528\u6237\u53EF\u4EE5\u4ECE\u4E2D\u83B7\u53D6\u66F4\u591A\u4FE1\u606F\u6216\u6280\u672F\u652F\u6301\u7684 URL\n  --win-menu\n          \u8BF7\u6C42\u4E3A\u6B64\u5E94\u7528\u7A0B\u5E8F\u6DFB\u52A0\u5F00\u59CB\u83DC\u5355\u5FEB\u6377\u65B9\u5F0F\n  --win-menu-group <menu group name>\n          \u6B64\u5E94\u7528\u7A0B\u5E8F\u6240\u5728\u7684\u5F00\u59CB\u83DC\u5355\u7EC4\n  --win-per-user-install\n          \u8BF7\u6C42\u57FA\u4E8E\u6BCF\u4E2A\u7528\u6237\u6267\u884C\u5B89\u88C5\n  --win-shortcut\n          \u8BF7\u6C42\u4E3A\u6B64\u5E94\u7528\u7A0B\u5E8F\u6DFB\u52A0\u684C\u9762\u5FEB\u6377\u65B9\u5F0F\n  --win-shortcut-prompt\n          \u6DFB\u52A0\u4E00\u4E2A\u5BF9\u8BDD\u6846\u4EE5\u5141\u8BB8\u7528\u6237\u9009\u62E9\u662F\u5426\u5C06\u7531\u5B89\u88C5\u7A0B\u5E8F\n          \u521B\u5EFA\u5FEB\u6377\u65B9\u5F0F\u3002\n  --win-update-url <url>\n          \u53EF\u7528\u5E94\u7528\u7A0B\u5E8F\u66F4\u65B0\u4FE1\u606F\u7684 URL\n  --win-upgrade-uuid <id string>\n          \u4E0E\u6B64\u7A0B\u5E8F\u5305\u7684\u5347\u7EA7\u76F8\u5173\u8054\u7684 UUID\n
-MSG_Help_win_install_dir=\u9ED8\u8BA4\u5B89\u88C5\u4F4D\u7F6E\u4E0B\u9762\u7684\u76F8\u5BF9\u5B50\u8DEF\u5F84\n
-MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          \u5305\u62EC DMG \u4E2D\u5F15\u7528\u7684\u6240\u6709\u5185\u5BB9\u3002\n          \u6B64\u9009\u9879\u53EF\u4EE5\u4F7F\u7528\u591A\u6B21\u3002\n
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          \u7528\u6765\u552F\u4E00\u5730\u6807\u8BC6 macOS \u5E94\u7528\u7A0B\u5E8F\u7684\u6807\u8BC6\u7B26\n          \u9ED8\u8BA4\u4E3A\u4E3B\u7C7B\u540D\u79F0\u3002\n          \u53EA\u80FD\u4F7F\u7528\u5B57\u6BCD\u6570\u5B57 (A-Z,a-z,0-9)\u3001\u8FDE\u5B57\u7B26 (-) \u548C\n          \u53E5\u70B9 (.) \u5B57\u7B26\u3002\n  --mac-package-name <name string>\n          \u51FA\u73B0\u5728\u83DC\u5355\u680F\u4E2D\u7684\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n          \u8FD9\u53EF\u4EE5\u4E0E\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u4E0D\u540C\u3002\n          \u6B64\u540D\u79F0\u7684\u957F\u5EA6\u5FC5\u987B\u5C0F\u4E8E 16 \u4E2A\u5B57\u7B26\uFF0C\u9002\u5408\n          \u663E\u793A\u5728\u83DC\u5355\u680F\u4E2D\u548C\u5E94\u7528\u7A0B\u5E8F\u201C\u4FE1\u606F\u201D\u7A97\u53E3\u4E2D\u3002\n          \u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u5728\u5BF9\u5E94\u7528\u7A0B\u5E8F\u5305\u7B7E\u540D\u65F6\uFF0C\u4F1A\u5728\u6240\u6709\u9700\u8981\u7B7E\u540D\n          \u4F46\u5F53\u524D\u6CA1\u6709\u7A0B\u5E8F\u5305\u6807\u8BC6\u7B26\u7684\u7EC4\u4EF6\u7684\n          \u524D\u9762\u52A0\u4E0A\u6B64\u503C\u3002\n  --mac-sign\n          \u8BF7\u6C42\u5BF9\u7A0B\u5E8F\u5305\u6216\u9884\u5B9A\u4E49\u7684\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\n          \u8FDB\u884C\u7B7E\u540D\u3002\n  --mac-signing-keychain <keychain name>\n          \u8981\u7528\u6765\u641C\u7D22\u7B7E\u540D\u8EAB\u4EFD\u7684\u5BC6\u94A5\u94FE\u7684\u540D\u79F0\n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u4F7F\u7528\u6807\u51C6\u7684\u5BC6\u94A5\u94FE\u3002\n  --mac-signing-key-user-name <team name>\n          Apple \u7B7E\u540D\u8EAB\u4EFD\u7684\u56E2\u961F\u6216\u7528\u6237\u540D\u79F0\u90E8\u5206\u3002\n  --mac-app-store\n          \u6307\u793A jpackage \u8F93\u51FA\u9762\u5411\n          Mac App Store\u3002\n  --mac-entitlements <file path>\n          \u5305\u542B\u4E00\u4E9B\u6743\u5229\u7684\u6587\u4EF6\u7684\u8DEF\u5F84\uFF0C\u5728\u5BF9\u6346\u7ED1\u5305\u4E2D\u7684\u53EF\u6267\u884C\u6587\u4EF6\n          \u548C\u5E93\u8FDB\u884C\u7B7E\u540D\u65F6\u4F1A\u4F7F\u7528\u8FD9\u4E9B\u6743\u5229\u3002\n  --mac-app-category <category string>\n          \u7528\u4E8E\u6784\u9020\u5E94\u7528\u7A0B\u5E8F plist \u4E2D LSApplicationCategoryType \u7684\n          \u5B57\u7B26\u4E32\u3002\u9ED8\u8BA4\u503C\u4E3A "utilities"\u3002\n
-MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux \u7A0B\u5E8F\u5305\u7684\u540D\u79F0\uFF0C\u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n  --linux-deb-maintainer <email address>\n          .deb \u7A0B\u5E8F\u5305\u7684\u7EF4\u62A4\u7A0B\u5E8F\n  --linux-menu-group <menu-group-name>\n          \u6B64\u5E94\u7528\u7A0B\u5E8F\u6240\u5728\u7684\u83DC\u5355\u7EC4\n  --linux-package-deps\n          \u5E94\u7528\u7A0B\u5E8F\u6240\u9700\u7684\u7A0B\u5E8F\u5305\u6216\u529F\u80FD\n  --linux-rpm-license-type <type string>\n          \u8BB8\u53EF\u8BC1\u7684\u7C7B\u578B\uFF08RPM .spec \u7684 "License: <value>"\uFF09\n  --linux-app-release <release value>\n          RPM <name>.spec \u6587\u4EF6\u7684\u53D1\u884C\u7248\u503C\u6216 \n          DEB \u63A7\u5236\u6587\u4EF6\u7684 Debian \u4FEE\u8BA2\u7248\u503C\n  --linux-app-category <category value>\n          RPM <name>.spec \u6587\u4EF6\u7684\u7EC4\u503C\u6216 \n          DEB \u63A7\u5236\u6587\u4EF6\u7684\u8282\u503C\n  --linux-shortcut\n          \u4E3A\u5E94\u7528\u7A0B\u5E8F\u521B\u5EFA\u5FEB\u6377\u65B9\u5F0F\u3002\n
-MSG_Help_mac_linux_install_dir=\u5E94\u7528\u7A0B\u5E8F\u5B89\u88C5\u76EE\u5F55\u7684\u7EDD\u5BF9\u8DEF\u5F84\n
-MSG_Help_default_install_dir=OS X \u6216 Linux \u4E0A\u5E94\u7528\u7A0B\u5E8F\u5B89\u88C5\u76EE\u5F55\u7684\u7EDD\u5BF9\u8DEF\u5F84\u3002\n          Windows \u4E0A\u5E94\u7528\u7A0B\u5E8F\u5B89\u88C5\u4F4D\u7F6E\u7684\u76F8\u5BF9\u5B50\u8DEF\u5F84\n          \uFF08\u5982 "Program Files" \u6216 "AppData"\uFF09\u3002\n
-MSG_Help_no_args=\u7528\u6CD5\uFF1Ajpackage <options>\n\u4F7F\u7528 jpackage --help\uFF08\u6216 -h\uFF09\u53EF\u83B7\u53D6\u53EF\u80FD\u9009\u9879\u7684\u5217\u8868
-MSG_Help_default_app_image=\u7528\u6765\u6784\u5EFA\u53EF\u5B89\u88C5\u7A0B\u5E8F\u5305\u7684\n          \u9884\u5B9A\u4E49\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u4F4D\u7F6E\n
-MSG_Help_mac_app_image=\u7528\u6765\u6784\u5EFA\u53EF\u5B89\u88C5\u7A0B\u5E8F\u5305\u7684\n          \u6216\u5BF9\u9884\u5B9A\u4E49\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u8FDB\u884C\u7B7E\u540D\u7684\n          \u9884\u5B9A\u4E49\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u4F4D\u7F6E\n
-MSG_Help_mac_sign_sample_usage=\    \u5BF9\u9884\u5B9A\u4E49\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u8FDB\u884C\u7B7E\u540D\uFF1A\n        jpackage --type app-image --app-image <app-image> \\\n            --mac-sign [<additional signing options>...]\n        \u6CE8\uFF1A\u6B64\u6A21\u5F0F\u4E0B\u5141\u8BB8\u7684\u5176\u4ED6\u9009\u9879\u53EA\u6709\uFF1A\n              \u4E00\u7EC4\u5176\u4ED6 mac \u7B7E\u540D\u9009\u9879\u548C --verbose\n
+MSG_Help_win_launcher=\n用来创建应用程序启动程序的与平台相关的选项：\n  --win-console\n          为应用程序创建控制台启动程序，应当为\n          需要控制台交互的应用程序指定\n
+MSG_Help_win_install=\  --win-dir-chooser\n          添加一个对话框以允许用户选择\n          产品的安装目录。\n  --win-help-url <url>\n          用户可以从中获取更多信息或技术支持的 URL\n  --win-menu\n          请求为此应用程序添加开始菜单快捷方式\n  --win-menu-group <menu group name>\n          此应用程序所在的开始菜单组\n  --win-per-user-install\n          请求基于每个用户执行安装\n  --win-shortcut\n          请求为此应用程序添加桌面快捷方式\n  --win-shortcut-prompt\n          添加一个对话框以允许用户选择是否将由安装程序\n          创建快捷方式。\n  --win-update-url <url>\n          可用应用程序更新信息的 URL\n  --win-upgrade-uuid <id string>\n          与此程序包的升级相关联的 UUID\n
+MSG_Help_win_install_dir=默认安装位置下面的相对子路径\n
+MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          包括 DMG 中引用的所有内容。\n          此选项可以使用多次。\n
+MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          用来唯一地标识 macOS 应用程序的标识符\n          默认为主类名称。\n          只能使用字母数字 (A-Z,a-z,0-9)、连字符 (-) 和\n          句点 (.) 字符。\n  --mac-package-name <name string>\n          出现在菜单栏中的应用程序名称\n          这可以与应用程序名称不同。\n          此名称的长度必须小于 16 个字符，适合\n          显示在菜单栏中和应用程序“信息”窗口中。\n          默认为应用程序名称。\n  --mac-package-signing-prefix <prefix string>\n          在对应用程序包签名时，会在所有需要签名\n          但当前没有程序包标识符的组件的\n          前面加上此值。\n  --mac-sign\n          请求对程序包或预定义的应用程序映像\n          进行签名。\n  --mac-signing-keychain <keychain name>\n          要用来搜索签名身份的密钥链的名称\n          如果未指定，则使用标准的密钥链。\n  --mac-signing-key-user-name <team name>\n          Apple 签名身份的团队或用户名称部分。\n  --mac-app-store\n          指示 jpackage 输出面向\n          Mac App Store。\n  --mac-entitlements <file path>\n          包含一些权利的文件的路径，在对捆绑包中的可执行文件\n          和库进行签名时会使用这些权利。\n  --mac-app-category <category string>\n          用于构造应用程序 plist 中 LSApplicationCategoryType 的\n          字符串。默认值为 "utilities"。\n
+MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux 程序包的名称，默认为应用程序名称\n  --linux-deb-maintainer <email address>\n          .deb 程序包的维护程序\n  --linux-menu-group <menu-group-name>\n          此应用程序所在的菜单组\n  --linux-package-deps\n          应用程序所需的程序包或功能\n  --linux-rpm-license-type <type string>\n          许可证的类型（RPM .spec 的 "License: <value>"）\n  --linux-app-release <release value>\n          RPM <name>.spec 文件的发行版值或 \n          DEB 控制文件的 Debian 修订版值\n  --linux-app-category <category value>\n          RPM <name>.spec 文件的组值或 \n          DEB 控制文件的节值\n  --linux-shortcut\n          为应用程序创建快捷方式。\n
+MSG_Help_mac_linux_install_dir=应用程序安装目录的绝对路径\n
+MSG_Help_default_install_dir=OS X 或 Linux 上应用程序安装目录的绝对路径。\n          Windows 上应用程序安装位置的相对子路径\n          （如 "Program Files" 或 "AppData"）。\n
+MSG_Help_no_args=用法：jpackage <options>\n使用 jpackage --help（或 -h）可获取可能选项的列表
+MSG_Help_default_app_image=用来构建可安装程序包的\n          预定义应用程序映像的位置\n
+MSG_Help_mac_app_image=用来构建可安装程序包的\n          或对预定义应用程序映像进行签名的\n          预定义应用程序映像的位置\n
+MSG_Help_mac_sign_sample_usage=\    对预定义应用程序映像进行签名：\n        jpackage --type app-image --app-image <app-image> \\\n            --mac-sign [<additional signing options>...]\n        注：此模式下允许的其他选项只有：\n              一组其他 mac 签名选项和 --verbose\n
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
index 95f718a6c0c..732c8a339f9 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
@@ -24,33 +24,33 @@
 #
 #
 
-jpackage.description=Eigenst\u00E4ndige Java-Anwendung verpacken
+jpackage.description=Eigenständige Java-Anwendung verpacken
 
 param.copyright.default=Copyright (C) {0,date,YYYY}
 param.description.default=Kein Wert
 param.vendor.default=Unbekannt
 
-message.using-default-resource=Standardpackageressource {0} {1} wird verwendet (durch Hinzuf\u00FCgen von {2} zu resource-dir ist eine Anpassung m\u00F6glich).
-message.no-default-resource=Keine Standardpackageressource {0} {1} (durch Hinzuf\u00FCgen von {2} zu resource-dir ist eine Anpassung m\u00F6glich).
+message.using-default-resource=Standardpackageressource {0} {1} wird verwendet (durch Hinzufügen von {2} zu resource-dir ist eine Anpassung möglich).
+message.no-default-resource=Keine Standardpackageressource {0} {1} (durch Hinzufügen von {2} zu resource-dir ist eine Anpassung möglich).
 message.using-custom-resource-from-file=Benutzerdefinierte Packageressource {0} wird verwendet (aus Datei {1} geladen).
 message.using-custom-resource=Benutzerdefinierte Packageressource {0} wird verwendet (aus {1} geladen).
 message.creating-app-bundle=Anwendungspackage {0} wird in {1} erstellt
 message.app-image-dir-does-not-exist=Angegebenes Anwendungsimageverzeichnis {0}: {1} ist nicht vorhanden
-message.app-image-dir-does-not-exist.advice=Best\u00E4tigen Sie, dass der Wert f\u00FCr {0} vorhanden ist
+message.app-image-dir-does-not-exist.advice=Bestätigen Sie, dass der Wert für {0} vorhanden ist
 message.runtime-image-dir-does-not-exist=Angegebenes Laufzeitimageverzeichnis {0}: {1} ist nicht vorhanden
-message.runtime-image-dir-does-not-exist.advice=Best\u00E4tigen Sie, dass der Wert f\u00FCr {0} vorhanden ist
+message.runtime-image-dir-does-not-exist.advice=Bestätigen Sie, dass der Wert für {0} vorhanden ist
 message.resource-dir-does-not-exist=Angegebenes Ressourcenverzeichnis {0}: {1} ist nicht vorhanden
-message.debug-working-directory=Arbeitsverzeichnis f\u00FCr Debug beibehalten: {0}
+message.debug-working-directory=Arbeitsverzeichnis für Debug beibehalten: {0}
 message.bundle-created={0}-Package wurde erfolgreich erstellt
 message.module-version=Version "{0}" aus Modul "{1}" wird als Anwendungsversion verwendet
 message.module-class=Klasse "{0}" aus Modul "{1}" wird als Anwendungshauptklasse verwendet
 
 error.version-string-empty="Version darf keine leere Zeichenfolge sein"
-error.version-string-zero-length-component="Version [{0}] enth\u00E4lt eine Komponente mit einer Nulll\u00E4nge"
-error.version-string-invalid-component="Version [{0}] enth\u00E4lt ung\u00FCltige Komponente [{1}]"
+error.version-string-zero-length-component="Version [{0}] enthält eine Komponente mit einer Nulllänge"
+error.version-string-invalid-component="Version [{0}] enthält ungültige Komponente [{1}]"
 
 error.cannot-create-output-dir=Zielverzeichnis {0} kann nicht erstellt werden
-error.cannot-write-to-output-dir=Zielverzeichnis {0} ist schreibgesch\u00FCtzt
+error.cannot-write-to-output-dir=Zielverzeichnis {0} ist schreibgeschützt
 error.root-exists=Fehler: Anwendungszielverzeichnis {0} ist bereits vorhanden
 error.no-main-class-with-main-jar=Es wurde keine Hauptklasse angegeben oder in der JAR-Datei {0} gefunden
 error.no-main-class-with-main-jar.advice=Geben Sie eine Hauptklasse an, oder stellen Sie sicher, dass die JAR-Datei {0} eine Hauptklasse im Manifest angibt
@@ -59,21 +59,21 @@ error.no-main-class.advice=Geben Sie eine Anwendungsklasse an, oder stellen Sie
 error.main-jar-does-not-exist=Die konfigurierte Haupt-JAR-Datei ist im Eingabeverzeichnis nicht vorhanden {0}
 error.main-jar-does-not-exist.advice=Die Haupt-JAR-Datei muss relativ zum Eingabeverzeichnis (nicht als absoluter Pfad) angegeben werden und muss in diesem Verzeichnis vorhanden sein
 error.no-module-in-path="{0}-Modul im Modulpfad nicht gefunden"
-error.not-path-parameter="Ung\u00FCltiger Wert f\u00FCr Parameter {0}: {1}"
-error.no-input-parameter="--input-Parameter f\u00FCr nicht modulare Anwendung fehlt"
-error.no-main-jar-parameter="--main-jar-Parameter f\u00FCr nicht modulare Anwendung fehlt"
+error.not-path-parameter="Ungültiger Wert für Parameter {0}: {1}"
+error.no-input-parameter="--input-Parameter für nicht modulare Anwendung fehlt"
+error.no-main-jar-parameter="--main-jar-Parameter für nicht modulare Anwendung fehlt"
 
-error.no-content-types-for-file-association=F\u00FCr Dateiverkn\u00FCpfungsnummer {0} wurden keine MIME-Typen angegeben
-error.no-content-types-for-file-association.advice=Geben Sie einen MIME-Typ f\u00FCr Dateiverkn\u00FCpfungsnummer {0} an
-error.too-many-content-types-for-file-association=F\u00FCr Dateiverkn\u00FCpfungsnummer {0} wurde mehr als ein MIME-Typ angegeben
-error.too-many-content-types-for-file-association.advice=Geben Sie nur einen MIME-Typ f\u00FCr Dateiverkn\u00FCpfungsnummer {0} an
+error.no-content-types-for-file-association=Für Dateiverknüpfungsnummer {0} wurden keine MIME-Typen angegeben
+error.no-content-types-for-file-association.advice=Geben Sie einen MIME-Typ für Dateiverknüpfungsnummer {0} an
+error.too-many-content-types-for-file-association=Für Dateiverknüpfungsnummer {0} wurde mehr als ein MIME-Typ angegeben
+error.too-many-content-types-for-file-association.advice=Geben Sie nur einen MIME-Typ für Dateiverknüpfungsnummer {0} an
 
 error.tool-not-found={0} kann nicht gefunden werden. Grund: {1}
 error.tool-not-found.advice=Installieren Sie {0}
 error.tool-old-version={0} {1} oder eine neuere Version kann nicht gefunden werden
 error.tool-old-version.advice=Installieren Sie {0} {1} oder eine neuere Version
 error.jlink.failed=jlink nicht erfolgreich mit: {0}
-error.blocked.option=jlink-Option [{0}] ist in --jlink-options nicht zul\u00E4ssig
+error.blocked.option=jlink-Option [{0}] ist in --jlink-options nicht zulässig
 error.no.name=Name nicht mit --name angegeben. Es kann auch kein Name aus app-image abgeleitet werden
 
 warning.no.jdk.modules.found=Warnung: Keine JDK-Module gefunden
@@ -82,35 +82,35 @@ error.foreign-app-image=Fehler : Fehlende .jpackage.xml-Datei in app-image-Verze
 error.invalid-app-image=Fehler: app-image-Verzeichnis "{0}" wurde von einer anderen jpackage-Version generiert, oder "{1}" ist nicht wohlgeformt
 
 MSG_BundlerFailed=Fehler: Bundler "{1}" ({0}) konnte kein Package generieren
-MSG_BundlerConfigException=Bundler {0} aufgrund eines Konfigurationsproblems \u00FCbersprungen: {1} \nEmpfehlung zur Behebung: {2}
-MSG_BundlerConfigExceptionNoAdvice=Bundler {0} aufgrund eines Konfigurationsproblems \u00FCbersprungen: {1}
+MSG_BundlerConfigException=Bundler {0} aufgrund eines Konfigurationsproblems übersprungen: {1} \nEmpfehlung zur Behebung: {2}
+MSG_BundlerConfigExceptionNoAdvice=Bundler {0} aufgrund eines Konfigurationsproblems übersprungen: {1}
 MSG_BundlerRuntimeException=Bundler {0} nicht erfolgreich. Grund: {1}
 MSG_BundlerFailed=Fehler: Bundler "{1}" ({0}) konnte kein Package generieren
 
 ERR_NoMainClass=Fehler: Hauptanwendungsklasse fehlt
-ERR_UnsupportedOption=Fehler: Option [{0}] ist auf dieser Plattform ung\u00FCltig
-ERR_InvalidTypeOption=Fehler: Option [{0}] ist nicht g\u00FCltig mit Typ [{1}]
-ERR_NoInstallerEntryPoint=Fehler: Option [{0}] ist nicht g\u00FCltig ohne Einstiegspunktoption --module oder --main-jar
-ERR_MutuallyExclusiveOptions="Fehler: Optionen [{0}] und [{1}] schlie\u00DFen sich gegenseitig aus
-ERR_InvalidOptionWithAppImageSigning=Fehler: Option [{0}] ist nicht g\u00FCltig beim Signieren eines Anwendungsimages
+ERR_UnsupportedOption=Fehler: Option [{0}] ist auf dieser Plattform ungültig
+ERR_InvalidTypeOption=Fehler: Option [{0}] ist nicht gültig mit Typ [{1}]
+ERR_NoInstallerEntryPoint=Fehler: Option [{0}] ist nicht gültig ohne Einstiegspunktoption --module oder --main-jar
+ERR_MutuallyExclusiveOptions="Fehler: Optionen [{0}] und [{1}] schließen sich gegenseitig aus
+ERR_InvalidOptionWithAppImageSigning=Fehler: Option [{0}] ist nicht gültig beim Signieren eines Anwendungsimages
 
 ERR_MissingArgument=Fehler: Fehlendes Argument: {0}
 ERR_MissingAppResources=Fehler: Keine Anwendungs-JAR-Dateien gefunden
 ERR_AppImageNotExist=Fehler: Anwendungsimageverzeichnis "{0}" ist nicht vorhanden
-ERR_NoAddLauncherName=Fehler: F\u00FCr Option --add-launcher m\u00FCssen ein Name und ein Dateipfad angegeben werden (--add-launcher <Name>=<Dateipfad>)
-ERR_NoUniqueName=Fehler: F\u00FCr --add-launcher <Name>=<Dateipfad> ist ein eindeutiger Name erforderlich
-ERR_NoJreInstallerName=Fehler: F\u00FCr JRE-Installationsprogramme ist ein Namensparameter erforderlich
-ERR_InvalidAppName=Fehler: Ung\u00FCltiger Anwendungsname: {0}
-ERR_InvalidSLName=Fehler: Ung\u00FCltiger Name f\u00FCr hinzuzuf\u00FCgenden Launcher: {0}
+ERR_NoAddLauncherName=Fehler: Für Option --add-launcher müssen ein Name und ein Dateipfad angegeben werden (--add-launcher <Name>=<Dateipfad>)
+ERR_NoUniqueName=Fehler: Für --add-launcher <Name>=<Dateipfad> ist ein eindeutiger Name erforderlich
+ERR_NoJreInstallerName=Fehler: Für JRE-Installationsprogramme ist ein Namensparameter erforderlich
+ERR_InvalidAppName=Fehler: Ungültiger Anwendungsname: {0}
+ERR_InvalidSLName=Fehler: Ungültiger Name für hinzuzufügenden Launcher: {0}
 ERR_IconFileNotExit=Fehler: Die angegebene Symboldatei [{0}] ist nicht vorhanden
 ERR_LicenseFileNotExit=Fehler: Die angegebene Lizenzdatei ist nicht vorhanden
-ERR_BuildRootInvalid=Fehler: Das tempor\u00E4re Verzeichnis ({0}) darf nicht vorhanden sein oder muss leer sein
-ERR_InvalidOption=Fehler: Ung\u00FCltige Option: [{0}]
-ERR_InvalidInstallerType=Fehler: Ung\u00FCltiger oder nicht unterst\u00FCtzter Typ: [{0}]
-ERR_BothMainJarAndModule=Fehler: Die Optionen --main-jar und --module d\u00FCrfen nicht beide vorhanden sein
-ERR_NoEntryPoint=Fehler: F\u00FCr das Erstellen des Anwendungsimages muss entweder die Option --main-jar oder die Option --module angegeben werden
+ERR_BuildRootInvalid=Fehler: Das temporäre Verzeichnis ({0}) darf nicht vorhanden sein oder muss leer sein
+ERR_InvalidOption=Fehler: Ungültige Option: [{0}]
+ERR_InvalidInstallerType=Fehler: Ungültiger oder nicht unterstützter Typ: [{0}]
+ERR_BothMainJarAndModule=Fehler: Die Optionen --main-jar und --module dürfen nicht beide vorhanden sein
+ERR_NoEntryPoint=Fehler: Für das Erstellen des Anwendungsimages muss entweder die Option --main-jar oder die Option --module angegeben werden
 ERR_InputNotDirectory=Fehler: Das angegebene Eingabeverzeichnis ist kein Verzeichnis: {0}
 ERR_CannotReadInputDir=Fehler: Keine Berechtigung zum Lesen aus Eingabeverzeichnis vorhanden: {0}
 ERR_CannotParseOptions=Fehler: Option @filename wird verarbeitet: {0}
-ERR_MissingJLinkOptMacAppStore=Fehler: Argument "--mac-app-store" erfordert eine {0}-Option f\u00FCr Argument "--jlink-options"
+ERR_MissingJLinkOptMacAppStore=Fehler: Argument "--mac-app-store" erfordert eine {0}-Option für Argument "--jlink-options"
 ERR_MacAppStoreRuntimeBinExists=Fehler: Laufzeitimage "{0}" darf nicht den Ordner "bin" enthalten. Verwenden Sie die jlink-Option "--strip-native-commands" beim Generieren des Laufzeitimages mit dem Argument "--mac-app-store".
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
index 8944fca00d3..8b4c457e61c 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
@@ -24,93 +24,93 @@
 #
 #
 
-jpackage.description=\u81EA\u5DF1\u5B8C\u7D50\u578BJava\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u30D1\u30C3\u30B1\u30FC\u30B8\u5316\u3057\u307E\u3059
+jpackage.description=自己完結型Javaアプリケーションをパッケージ化します
 
 param.copyright.default=Copyright (C) {0,date,YYYY}
-param.description.default=\u306A\u3057
-param.vendor.default=\u4E0D\u660E
+param.description.default=なし
+param.vendor.default=不明
 
-message.using-default-resource=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0} {1}\u306E\u4F7F\u7528({2}\u3092resource-dir\u306B\u8FFD\u52A0\u3057\u3066\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA)\u3002
-message.no-default-resource=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0} {1}\u306A\u3057({2}\u3092resource-dir\u306B\u8FFD\u52A0\u3057\u3066\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA)\u3002
-message.using-custom-resource-from-file=\u30AB\u30B9\u30BF\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0}\u306E\u4F7F\u7528(\u30D5\u30A1\u30A4\u30EB{1}\u304B\u3089\u30ED\u30FC\u30C9\u6E08)
-message.using-custom-resource=\u30AB\u30B9\u30BF\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30BD\u30FC\u30B9{0}\u306E\u4F7F\u7528({1}\u304B\u3089\u30ED\u30FC\u30C9\u6E08)
-message.creating-app-bundle=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059: {1}\u5185\u306E{0}
-message.app-image-dir-does-not-exist=\u6307\u5B9A\u3055\u308C\u305F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}: {1}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-message.app-image-dir-does-not-exist.advice={0}\u306E\u5024\u304C\u5B58\u5728\u3059\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044
-message.runtime-image-dir-does-not-exist=\u6307\u5B9A\u3055\u308C\u305F\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}: {1}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-message.runtime-image-dir-does-not-exist.advice={0}\u306E\u5024\u304C\u5B58\u5728\u3059\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044
-message.resource-dir-does-not-exist=\u6307\u5B9A\u3055\u308C\u305F\u30EA\u30BD\u30FC\u30B9\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}: {1}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-message.debug-working-directory=\u30C7\u30D0\u30C3\u30B0\u306E\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u4FDD\u6301\u3055\u308C\u307E\u3057\u305F: {0}
-message.bundle-created={0}\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F5C\u6210\u306B\u6210\u529F\u3057\u307E\u3057\u305F
-message.module-version=\u30E2\u30B8\u30E5\u30FC\u30EB"{1}"\u306E\u30D0\u30FC\u30B8\u30E7\u30F3"{0}"\u3092\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3068\u3057\u3066\u4F7F\u7528
-message.module-class=\u30E2\u30B8\u30E5\u30FC\u30EB"{1}"\u306E\u30AF\u30E9\u30B9"{0}"\u3092\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3068\u3057\u3066\u4F7F\u7528
+message.using-default-resource=デフォルトのパッケージ・リソース{0} {1}の使用({2}をresource-dirに追加してカスタマイズ)。
+message.no-default-resource=デフォルトのパッケージ・リソース{0} {1}なし({2}をresource-dirに追加してカスタマイズ)。
+message.using-custom-resource-from-file=カスタム・パッケージ・リソース{0}の使用(ファイル{1}からロード済)
+message.using-custom-resource=カスタム・パッケージ・リソース{0}の使用({1}からロード済)
+message.creating-app-bundle=アプリケーション・パッケージを作成しています: {1}内の{0}
+message.app-image-dir-does-not-exist=指定されたアプリケーション・イメージ・ディレクトリ{0}: {1}は存在しません
+message.app-image-dir-does-not-exist.advice={0}の値が存在することを確認してください
+message.runtime-image-dir-does-not-exist=指定されたランタイム・イメージ・ディレクトリ{0}: {1}は存在しません
+message.runtime-image-dir-does-not-exist.advice={0}の値が存在することを確認してください
+message.resource-dir-does-not-exist=指定されたリソース・ディレクトリ{0}: {1}は存在しません
+message.debug-working-directory=デバッグの作業ディレクトリが保持されました: {0}
+message.bundle-created={0}パッケージの作成に成功しました
+message.module-version=モジュール"{1}"のバージョン"{0}"をアプリケーション・バージョンとして使用
+message.module-class=モジュール"{1}"のクラス"{0}"をアプリケーション・メイン・クラスとして使用
 
-error.version-string-empty="\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u7A7A\u306E\u6587\u5B57\u5217\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093"
-error.version-string-zero-length-component="\u30D0\u30FC\u30B8\u30E7\u30F3[{0}]\u306B\u9577\u3055\u30BC\u30ED\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u542B\u307E\u308C\u307E\u3059"
-error.version-string-invalid-component="\u30D0\u30FC\u30B8\u30E7\u30F3[{0}]\u306B\u7121\u52B9\u306A\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8[{1}]\u304C\u542B\u307E\u308C\u307E\u3059"
+error.version-string-empty="バージョンを空の文字列にすることはできません"
+error.version-string-zero-length-component="バージョン[{0}]に長さゼロのコンポーネントが含まれます"
+error.version-string-invalid-component="バージョン[{0}]に無効なコンポーネント[{1}]が含まれます"
 
-error.cannot-create-output-dir=\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
-error.cannot-write-to-output-dir=\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u66F8\u8FBC\u307F\u4E0D\u53EF\u3067\u3059
-error.root-exists=\u30A8\u30E9\u30FC: \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059
-error.no-main-class-with-main-jar=\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u304B\u3063\u305F\u304B\u3001jar {0}\u306B\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
-error.no-main-class-with-main-jar.advice=\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u6307\u5B9A\u3059\u308B\u304B\u3001jar {0}\u304C\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u3067\u6307\u5B9A\u3057\u3066\u3044\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044
-error.no-main-class=\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u304B\u3063\u305F\u304B\u3001\u6307\u5B9A\u3055\u308C\u305F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30BD\u30FC\u30B9\u306B\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
-error.no-main-class.advice=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u6307\u5B9A\u3059\u308B\u304B\u3001\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u3067appResources\u306B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u542B\u3080jar\u304C\u3042\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044
-error.main-jar-does-not-exist=\u5165\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3001\u69CB\u6210\u3055\u308C\u305F\u30E1\u30A4\u30F3jar\u304C{0}\u306B\u5B58\u5728\u3057\u307E\u305B\u3093
-error.main-jar-does-not-exist.advice=\u5165\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5BFE\u3057\u3066\u76F8\u5BFE\u7684\u306B(\u7D76\u5BFE\u30D1\u30B9\u3067\u306F\u306A\u3044)\u30E1\u30A4\u30F3jar\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u305D\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u5185\u306B\u5B58\u5728\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-error.no-module-in-path="\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306B{0}\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F"
-error.not-path-parameter="{0}\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u7121\u52B9\u306A\u5024: {1}"
-error.no-input-parameter="\u975E\u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B--input\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u3042\u308A\u307E\u305B\u3093"
-error.no-main-jar-parameter="\u975E\u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B--main-jar\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u3042\u308A\u307E\u305B\u3093"
+error.cannot-create-output-dir=宛先ディレクトリ{0}を作成できません。
+error.cannot-write-to-output-dir=宛先ディレクトリ{0}は書込み不可です
+error.root-exists=エラー: アプリケーションの宛先ディレクトリ{0}はすでに存在します
+error.no-main-class-with-main-jar=メイン・クラスが指定されていなかったか、jar {0}に見つかりませんでした
+error.no-main-class-with-main-jar.advice=メイン・クラスを指定するか、jar {0}がマニフェストで指定していることを確認してください
+error.no-main-class=メイン・クラスが指定されていなかったか、指定されたアプリケーション・リソースに見つかりませんでした
+error.no-main-class.advice=アプリケーション・クラスを指定するか、マニフェストでappResourcesにアプリケーション・クラスを含むjarがあることを確認してください
+error.main-jar-does-not-exist=入力ディレクトリで、構成されたメインjarが{0}に存在しません
+error.main-jar-does-not-exist.advice=入力ディレクトリに対して相対的に(絶対パスではない)メインjarを指定する必要があり、そのディレクトリ内に存在する必要があります
+error.no-module-in-path="モジュール・パスに{0}モジュールが見つかりませんでした"
+error.not-path-parameter="{0}パラメータの無効な値: {1}"
+error.no-input-parameter="非モジュラ・アプリケーションに--inputパラメータがありません"
+error.no-main-jar-parameter="非モジュラ・アプリケーションに--main-jarパラメータがありません"
 
-error.no-content-types-for-file-association=\u30D5\u30A1\u30A4\u30EB\u30FB\u30A2\u30BD\u30B7\u30A8\u30FC\u30B7\u30E7\u30F3\u756A\u53F7{0}\u306BMIME\u30BF\u30A4\u30D7\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F
-error.no-content-types-for-file-association.advice=\u30D5\u30A1\u30A4\u30EB\u30FB\u30A2\u30BD\u30B7\u30A8\u30FC\u30B7\u30E7\u30F3\u756A\u53F7{0}\u306BMIME\u30BF\u30A4\u30D7\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
-error.too-many-content-types-for-file-association=\u30D5\u30A1\u30A4\u30EB\u30FB\u30A2\u30BD\u30B7\u30A8\u30FC\u30B7\u30E7\u30F3\u756A\u53F7{0}\u306B\u8907\u6570\u306EMIME\u30BF\u30A4\u30D7\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F
-error.too-many-content-types-for-file-association.advice=\u30D5\u30A1\u30A4\u30EB\u30FB\u30A2\u30BD\u30B7\u30A8\u30FC\u30B7\u30E7\u30F3\u756A\u53F7{0}\u306BMIME\u30BF\u30A4\u30D7\u30921\u3064\u306E\u307F\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
+error.no-content-types-for-file-association=ファイル・アソシエーション番号{0}にMIMEタイプが指定されませんでした
+error.no-content-types-for-file-association.advice=ファイル・アソシエーション番号{0}にMIMEタイプを指定してください
+error.too-many-content-types-for-file-association=ファイル・アソシエーション番号{0}に複数のMIMEタイプが指定されました
+error.too-many-content-types-for-file-association.advice=ファイル・アソシエーション番号{0}にMIMEタイプを1つのみ指定してください
 
-error.tool-not-found={0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u7406\u7531: {1}
-error.tool-not-found.advice={0}\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066\u304F\u3060\u3055\u3044
-error.tool-old-version={0} {1}\u4EE5\u964D\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-error.tool-old-version.advice={0} {1}\u4EE5\u964D\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066\u304F\u3060\u3055\u3044
-error.jlink.failed=jlink\u304C\u6B21\u3067\u5931\u6557\u3057\u307E\u3057\u305F: {0}
-error.blocked.option=jlink\u30AA\u30D7\u30B7\u30E7\u30F3[{0}]\u306F--jlink-options\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
-error.no.name=\u540D\u524D\u304C--name\u3067\u6307\u5B9A\u3055\u308C\u3066\u304A\u3089\u305A\u3001app-image\u304B\u3089\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093
+error.tool-not-found={0}が見つかりません。理由: {1}
+error.tool-not-found.advice={0}をインストールしてください
+error.tool-old-version={0} {1}以降が見つかりません
+error.tool-old-version.advice={0} {1}以降をインストールしてください
+error.jlink.failed=jlinkが次で失敗しました: {0}
+error.blocked.option=jlinkオプション[{0}]は--jlink-optionsでは許可されません
+error.no.name=名前が--nameで指定されておらず、app-imageから推論できません
 
-warning.no.jdk.modules.found=\u8B66\u544A: JDK\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+warning.no.jdk.modules.found=警告: JDKモジュールが見つかりません
 
-error.foreign-app-image=\u30A8\u30E9\u30FC: app-image\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u306B.jpackage.xml\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093
-error.invalid-app-image=\u30A8\u30E9\u30FC: app-image\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u306F\u3001\u5225\u306Ejpackage\u30D0\u30FC\u30B8\u30E7\u30F3\u307E\u305F\u306F\u4E0D\u6B63\u306A"{1}"\u3067\u751F\u6210\u3055\u308C\u307E\u3057\u305F
+error.foreign-app-image=エラー: app-imageディレクトリ"{0}"に.jpackage.xmlファイルがありません
+error.invalid-app-image=エラー: app-imageディレクトリ"{0}"は、別のjpackageバージョンまたは不正な"{1}"で生成されました
 
-MSG_BundlerFailed=\u30A8\u30E9\u30FC: \u30D0\u30F3\u30C9\u30E9"{1}" ({0})\u304C\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u751F\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-MSG_BundlerConfigException=\u69CB\u6210\u306E\u554F\u984C\u306E\u305F\u3081\u3001\u30D0\u30F3\u30C9\u30E9{0}\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3057\u305F: {1} \n\u6B21\u306E\u4FEE\u6B63\u3092\u884C\u3063\u3066\u304F\u3060\u3055\u3044: {2}
-MSG_BundlerConfigExceptionNoAdvice=\u69CB\u6210\u306E\u554F\u984C\u306E\u305F\u3081\u3001\u30D0\u30F3\u30C9\u30E9{0}\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3057\u305F: {1}
-MSG_BundlerRuntimeException={1}\u306E\u305F\u3081\u3001\u30D0\u30F3\u30C9\u30E9{0}\u304C\u5931\u6557\u3057\u307E\u3057\u305F
-MSG_BundlerFailed=\u30A8\u30E9\u30FC: \u30D0\u30F3\u30C9\u30E9"{1}" ({0})\u304C\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u751F\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+MSG_BundlerFailed=エラー: バンドラ"{1}" ({0})がパッケージの生成に失敗しました
+MSG_BundlerConfigException=構成の問題のため、バンドラ{0}がスキップされました: {1} \n次の修正を行ってください: {2}
+MSG_BundlerConfigExceptionNoAdvice=構成の問題のため、バンドラ{0}がスキップされました: {1}
+MSG_BundlerRuntimeException={1}のため、バンドラ{0}が失敗しました
+MSG_BundlerFailed=エラー: バンドラ"{1}" ({0})がパッケージの生成に失敗しました
 
-ERR_NoMainClass=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u305B\u3093
-ERR_UnsupportedOption=\u30A8\u30E9\u30FC: \u30AA\u30D7\u30B7\u30E7\u30F3[{0}]\u306F\u3001\u3053\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306F\u7121\u52B9\u3067\u3059
-ERR_InvalidTypeOption=\u30A8\u30E9\u30FC: \u30AA\u30D7\u30B7\u30E7\u30F3[{0}]\u306F\u3001\u30BF\u30A4\u30D7[{1}]\u3067\u306F\u7121\u52B9\u3067\u3059
-ERR_NoInstallerEntryPoint=\u30A8\u30E9\u30FC: \u30AA\u30D7\u30B7\u30E7\u30F3[{0}]\u306F\u3001--module\u307E\u305F\u306F--main-jar\u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u306A\u3057\u3067\u306F\u7121\u52B9\u3067\u3059
-ERR_MutuallyExclusiveOptions="\u30A8\u30E9\u30FC: \u76F8\u4E92\u6392\u4ED6\u7684\u306A\u30AA\u30D7\u30B7\u30E7\u30F3[{0}]\u3068[{1}]
-ERR_InvalidOptionWithAppImageSigning=\u30A8\u30E9\u30FC: \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u3078\u306E\u7F72\u540D\u6642\u306B\u30AA\u30D7\u30B7\u30E7\u30F3[{0}]\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+ERR_NoMainClass=エラー: メイン・アプリケーション・クラスがありません
+ERR_UnsupportedOption=エラー: オプション[{0}]は、このプラットフォームでは無効です
+ERR_InvalidTypeOption=エラー: オプション[{0}]は、タイプ[{1}]では無効です
+ERR_NoInstallerEntryPoint=エラー: オプション[{0}]は、--moduleまたは--main-jarエントリ・ポイント・オプションなしでは無効です
+ERR_MutuallyExclusiveOptions="エラー: 相互排他的なオプション[{0}]と[{1}]
+ERR_InvalidOptionWithAppImageSigning=エラー: アプリケーション・イメージへの署名時にオプション[{0}]が有効ではありません
 
-ERR_MissingArgument=\u30A8\u30E9\u30FC: \u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093: {0}
-ERR_MissingAppResources=\u30A8\u30E9\u30FC: \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3jar\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
-ERR_AppImageNotExist=\u30A8\u30E9\u30FC: \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-ERR_NoAddLauncherName=\u30A8\u30E9\u30FC: --add-launcher\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u540D\u524D\u304A\u3088\u3073\u30D5\u30A1\u30A4\u30EB\u30FB\u30D1\u30B9\u304C\u5FC5\u8981\u3067\u3059(--add-launcher <name>=<file path>)
-ERR_NoUniqueName=\u30A8\u30E9\u30FC: --add-launcher <name>=<file path>\u306B\u306F\u4E00\u610F\u306E\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059
-ERR_NoJreInstallerName=\u30A8\u30E9\u30FC: Jre\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u306B\u306F\u540D\u524D\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u5FC5\u8981\u3067\u3059
-ERR_InvalidAppName=\u30A8\u30E9\u30FC: \u7121\u52B9\u306A\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D: {0}
-ERR_InvalidSLName=\u30A8\u30E9\u30FC: \u7121\u52B9\u306A\u8FFD\u52A0\u30E9\u30F3\u30C1\u30E3\u540D: {0}
-ERR_IconFileNotExit=\u30A8\u30E9\u30FC: \u6307\u5B9A\u3055\u308C\u305F\u30A2\u30A4\u30B3\u30F3\u30FB\u30D5\u30A1\u30A4\u30EB[{0}]\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-ERR_LicenseFileNotExit=\u30A8\u30E9\u30FC: \u6307\u5B9A\u3055\u308C\u305F\u30E9\u30A4\u30BB\u30F3\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-ERR_BuildRootInvalid=\u30A8\u30E9\u30FC: \u4E00\u6642({0})\u306F\u5B58\u5728\u3057\u306A\u3044\u304B\u3001\u7A7A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-ERR_InvalidOption=\u30A8\u30E9\u30FC: \u7121\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: [{0}]
-ERR_InvalidInstallerType=\u30A8\u30E9\u30FC: \u7121\u52B9\u307E\u305F\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30BF\u30A4\u30D7: [{0}]
-ERR_BothMainJarAndModule=\u30A8\u30E9\u30FC: --main-jar\u30AA\u30D7\u30B7\u30E7\u30F3\u3068--module\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4E21\u65B9\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-ERR_NoEntryPoint=\u30A8\u30E9\u30FC: \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u4F5C\u6210\u306B\u306F--main-jar\u307E\u305F\u306F--module\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u5FC5\u8981\u3067\u3059
-ERR_InputNotDirectory=\u30A8\u30E9\u30FC: \u6307\u5B9A\u3055\u308C\u305F\u5165\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0}
-ERR_CannotReadInputDir=\u30A8\u30E9\u30FC: \u5165\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u8AAD\u307F\u53D6\u308B\u6A29\u9650\u304C\u3042\u308A\u307E\u305B\u3093: {0}
-ERR_CannotParseOptions=\u30A8\u30E9\u30FC: @filename\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u51E6\u7406: {0}
-ERR_MissingJLinkOptMacAppStore=\u30A8\u30E9\u30FC: --mac-app-store\u5F15\u6570\u3067\u306F\u3001--jlink-options\u5F15\u6570\u306B{0}\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u5FC5\u8981\u3067\u3059
-ERR_MacAppStoreRuntimeBinExists=\u30A8\u30E9\u30FC: \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8"{0}"\u306B"bin"\u30D5\u30A9\u30EB\u30C0\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002--mac-app-store\u5F15\u6570\u3067\u4F7F\u7528\u3055\u308C\u308B\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u751F\u6210\u3059\u308B\u969B\u306B\u3001--strip-native-commands jlink\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+ERR_MissingArgument=エラー: 引数がありません: {0}
+ERR_MissingAppResources=エラー: アプリケーションjarが見つかりませんでした
+ERR_AppImageNotExist=エラー: アプリケーション・イメージ・ディレクトリ"{0}"は存在しません
+ERR_NoAddLauncherName=エラー: --add-launcherオプションには名前およびファイル・パスが必要です(--add-launcher <name>=<file path>)
+ERR_NoUniqueName=エラー: --add-launcher <name>=<file path>には一意の名前が必要です
+ERR_NoJreInstallerName=エラー: Jreインストーラには名前パラメータが必要です
+ERR_InvalidAppName=エラー: 無効なアプリケーション名: {0}
+ERR_InvalidSLName=エラー: 無効な追加ランチャ名: {0}
+ERR_IconFileNotExit=エラー: 指定されたアイコン・ファイル[{0}]は存在しません
+ERR_LicenseFileNotExit=エラー: 指定されたライセンス・ファイルは存在しません
+ERR_BuildRootInvalid=エラー: 一時({0})は存在しないか、空のディレクトリである必要があります
+ERR_InvalidOption=エラー: 無効なオプション: [{0}]
+ERR_InvalidInstallerType=エラー: 無効またはサポートされていないタイプ: [{0}]
+ERR_BothMainJarAndModule=エラー: --main-jarオプションと--moduleオプションの両方を指定することはできません
+ERR_NoEntryPoint=エラー: アプリケーション・イメージの作成には--main-jarまたは--moduleオプションが必要です
+ERR_InputNotDirectory=エラー: 指定された入力ディレクトリはディレクトリではありません: {0}
+ERR_CannotReadInputDir=エラー: 入力ディレクトリから読み取る権限がありません: {0}
+ERR_CannotParseOptions=エラー: @filenameオプションの処理: {0}
+ERR_MissingJLinkOptMacAppStore=エラー: --mac-app-store引数では、--jlink-options引数に{0}オプションが必要です
+ERR_MacAppStoreRuntimeBinExists=エラー: ランタイム・イメージ"{0}"に"bin"フォルダを含めることはできません。--mac-app-store引数で使用されるランタイム・イメージを生成する際に、--strip-native-commands jlinkオプションを使用します。
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
index 46a96fa005b..4a37c781ba4 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
@@ -24,93 +24,93 @@
 #
 #
 
-jpackage.description=\u6253\u5305\u81EA\u5305\u542B Java \u5E94\u7528\u7A0B\u5E8F
+jpackage.description=打包自包含 Java 应用程序
 
-param.copyright.default=\u7248\u6743\u6240\u6709 (C) {0,date,YYYY}
-param.description.default=\u65E0
-param.vendor.default=\u672A\u77E5
+param.copyright.default=版权所有 (C) {0,date,YYYY}
+param.description.default=无
+param.vendor.default=未知
 
-message.using-default-resource=\u4F7F\u7528\u9ED8\u8BA4\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} {1}\uFF08\u5C06 {2} \u6DFB\u52A0\u5230 resource-dir \u4E2D\u4EE5\u8FDB\u884C\u5B9A\u5236\uFF09\u3002
-message.no-default-resource=\u65E0\u9ED8\u8BA4\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} {1}\uFF08\u5C06 {2} \u6DFB\u52A0\u5230 resource-dir \u4E2D\u4EE5\u8FDB\u884C\u5B9A\u5236\uFF09\u3002
-message.using-custom-resource-from-file=\u4F7F\u7528\u5B9A\u5236\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} (\u4ECE\u6587\u4EF6 {1} \u52A0\u8F7D)\u3002
-message.using-custom-resource=\u4F7F\u7528\u5B9A\u5236\u7A0B\u5E8F\u5305\u8D44\u6E90 {0} (\u4ECE {1} \u52A0\u8F7D)\u3002
-message.creating-app-bundle=\u6B63\u5728 {1} \u4E2D\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305 {0}
-message.app-image-dir-does-not-exist=\u6307\u5B9A\u7684\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u76EE\u5F55 {0}\uFF1A{1} \u4E0D\u5B58\u5728
-message.app-image-dir-does-not-exist.advice=\u786E\u8BA4 {0} \u7684\u503C\u662F\u5426\u5B58\u5728
-message.runtime-image-dir-does-not-exist=\u6307\u5B9A\u7684\u8FD0\u884C\u65F6\u6620\u50CF\u76EE\u5F55 {0}\uFF1A{1} \u4E0D\u5B58\u5728
-message.runtime-image-dir-does-not-exist.advice=\u786E\u8BA4 {0} \u7684\u503C\u662F\u5426\u5B58\u5728
-message.resource-dir-does-not-exist=\u6307\u5B9A\u7684\u8D44\u6E90\u76EE\u5F55 {0}\uFF1A{1} \u4E0D\u5B58\u5728
-message.debug-working-directory=\u7528\u4E8E\u8C03\u8BD5\u7684\u5DF2\u4FDD\u7559\u5DE5\u4F5C\u76EE\u5F55: {0}
-message.bundle-created=\u5DF2\u6210\u529F\u5730\u6784\u5EFA {0} \u7A0B\u5E8F\u5305
-message.module-version=\u6B63\u5728\u5C06\u6A21\u5757 "{1}" \u4E2D\u7684\u7248\u672C "{0}" \u7528\u4F5C\u5E94\u7528\u7A0B\u5E8F\u7248\u672C
-message.module-class=\u6B63\u5728\u5C06\u6A21\u5757 "{1}" \u4E2D\u7684\u7C7B "{0}" \u7528\u4F5C\u5E94\u7528\u7A0B\u5E8F\u4E3B\u7C7B
+message.using-default-resource=使用默认程序包资源 {0} {1}（将 {2} 添加到 resource-dir 中以进行定制）。
+message.no-default-resource=无默认程序包资源 {0} {1}（将 {2} 添加到 resource-dir 中以进行定制）。
+message.using-custom-resource-from-file=使用定制程序包资源 {0} (从文件 {1} 加载)。
+message.using-custom-resource=使用定制程序包资源 {0} (从 {1} 加载)。
+message.creating-app-bundle=正在 {1} 中创建应用程序包 {0}
+message.app-image-dir-does-not-exist=指定的应用程序映像目录 {0}：{1} 不存在
+message.app-image-dir-does-not-exist.advice=确认 {0} 的值是否存在
+message.runtime-image-dir-does-not-exist=指定的运行时映像目录 {0}：{1} 不存在
+message.runtime-image-dir-does-not-exist.advice=确认 {0} 的值是否存在
+message.resource-dir-does-not-exist=指定的资源目录 {0}：{1} 不存在
+message.debug-working-directory=用于调试的已保留工作目录: {0}
+message.bundle-created=已成功地构建 {0} 程序包
+message.module-version=正在将模块 "{1}" 中的版本 "{0}" 用作应用程序版本
+message.module-class=正在将模块 "{1}" 中的类 "{0}" 用作应用程序主类
 
-error.version-string-empty="\u7248\u672C\u4E0D\u80FD\u4E3A\u7A7A\u5B57\u7B26\u4E32"
-error.version-string-zero-length-component="\u7248\u672C [{0}] \u5305\u542B\u957F\u5EA6\u4E3A\u96F6\u7684\u7EC4\u4EF6"
-error.version-string-invalid-component="\u7248\u672C [{0}] \u5305\u542B\u65E0\u6548\u7EC4\u4EF6 [{1}]"
+error.version-string-empty="版本不能为空字符串"
+error.version-string-zero-length-component="版本 [{0}] 包含长度为零的组件"
+error.version-string-invalid-component="版本 [{0}] 包含无效组件 [{1}]"
 
-error.cannot-create-output-dir=\u65E0\u6CD5\u521B\u5EFA\u76EE\u6807\u76EE\u5F55 {0}
-error.cannot-write-to-output-dir=\u76EE\u6807\u76EE\u5F55 {0} \u4E0D\u53EF\u5199
-error.root-exists=\u9519\u8BEF\uFF1A\u5E94\u7528\u7A0B\u5E8F\u76EE\u6807\u76EE\u5F55 {0} \u5DF2\u5B58\u5728
-error.no-main-class-with-main-jar=\u672A\u6307\u5B9A\u4E3B\u7C7B\uFF0C\u5728 jar {0} \u4E2D\u4E5F\u672A\u627E\u5230\u4E3B\u7C7B
-error.no-main-class-with-main-jar.advice=\u8BF7\u6307\u5B9A\u4E3B\u7C7B\u6216\u786E\u4FDD jar {0} \u5728\u6E05\u5355\u4E2D\u6307\u5B9A\u4E00\u4E2A\u4E3B\u7C7B\u3002
-error.no-main-class=\u672A\u6307\u5B9A\u4E3B\u7C7B\uFF0C\u5728\u63D0\u4F9B\u7684\u5E94\u7528\u7A0B\u5E8F\u8D44\u6E90\u4E2D\u4E5F\u672A\u627E\u5230\u4E3B\u7C7B
-error.no-main-class.advice=\u8BF7\u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u7C7B\uFF0C\u6216\u8005\u786E\u4FDD appResources \u4E2D\u6709\u4E00\u4E2A jar \u5728\u6E05\u5355\u4E2D\u5305\u542B\u5E94\u7528\u7A0B\u5E8F\u7C7B\u3002
-error.main-jar-does-not-exist=\u914D\u7F6E\u7684\u4E3B jar \u5728\u8F93\u5165\u76EE\u5F55\u4E2D\u4E0D\u5B58\u5728 {0}
-error.main-jar-does-not-exist.advice=\u5FC5\u987B\u4F7F\u7528\u76F8\u5BF9\u4E8E\u8F93\u5165\u76EE\u5F55\u7684\u8DEF\u5F84\uFF08\u4E0D\u4F7F\u7528\u7EDD\u5BF9\u8DEF\u5F84\uFF09\u6307\u5B9A\u4E3B jar \uFF0C\u5E76\u4E14\u8BE5\u76EE\u5F55\u4E2D\u5B58\u5728\u4E3B jar
-error.no-module-in-path="\u65E0\u6CD5\u5728\u6A21\u5757\u8DEF\u5F84\u4E2D\u627E\u5230 {0} \u6A21\u5757"
-error.not-path-parameter="{0} \u53C2\u6570\u7684\u503C\u65E0\u6548\uFF1A{1}"
-error.no-input-parameter="\u975E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\u7F3A\u5C11 --input \u53C2\u6570"
-error.no-main-jar-parameter="\u975E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\u7F3A\u5C11 --main-jar \u53C2\u6570"
+error.cannot-create-output-dir=无法创建目标目录 {0}
+error.cannot-write-to-output-dir=目标目录 {0} 不可写
+error.root-exists=错误：应用程序目标目录 {0} 已存在
+error.no-main-class-with-main-jar=未指定主类，在 jar {0} 中也未找到主类
+error.no-main-class-with-main-jar.advice=请指定主类或确保 jar {0} 在清单中指定一个主类。
+error.no-main-class=未指定主类，在提供的应用程序资源中也未找到主类
+error.no-main-class.advice=请指定应用程序类，或者确保 appResources 中有一个 jar 在清单中包含应用程序类。
+error.main-jar-does-not-exist=配置的主 jar 在输入目录中不存在 {0}
+error.main-jar-does-not-exist.advice=必须使用相对于输入目录的路径（不使用绝对路径）指定主 jar ，并且该目录中存在主 jar
+error.no-module-in-path="无法在模块路径中找到 {0} 模块"
+error.not-path-parameter="{0} 参数的值无效：{1}"
+error.no-input-parameter="非模块化应用程序缺少 --input 参数"
+error.no-main-jar-parameter="非模块化应用程序缺少 --main-jar 参数"
 
-error.no-content-types-for-file-association=\u6CA1\u6709\u4E3A\u6587\u4EF6\u5173\u8054\u53F7{0}\u6307\u5B9A MIME \u7C7B\u578B
-error.no-content-types-for-file-association.advice=\u4E3A\u6587\u4EF6\u5173\u8054\u53F7 {0} \u6307\u5B9A MIME \u7C7B\u578B
-error.too-many-content-types-for-file-association=\u4E3A\u6587\u4EF6\u5173\u8054\u53F7{0}\u6307\u5B9A\u4E86\u591A\u4E2A MIME \u7C7B\u578B
-error.too-many-content-types-for-file-association.advice=\u4EC5\u4E3A\u6587\u4EF6\u5173\u8054\u53F7 {0} \u6307\u5B9A\u4E00\u4E2A MIME \u7C7B\u578B
+error.no-content-types-for-file-association=没有为文件关联号{0}指定 MIME 类型
+error.no-content-types-for-file-association.advice=为文件关联号 {0} 指定 MIME 类型
+error.too-many-content-types-for-file-association=为文件关联号{0}指定了多个 MIME 类型
+error.too-many-content-types-for-file-association.advice=仅为文件关联号 {0} 指定一个 MIME 类型
 
-error.tool-not-found=\u627E\u4E0D\u5230 {0}\u3002\u539F\u56E0\uFF1A{1}
-error.tool-not-found.advice=\u8BF7\u5B89\u88C5 {0}
-error.tool-old-version=\u627E\u4E0D\u5230 {0} {1}\u6216\u66F4\u65B0\u7248\u672C
-error.tool-old-version.advice=\u8BF7\u5B89\u88C5 {0} {1}\u6216\u66F4\u65B0\u7248\u672C
-error.jlink.failed=jlink \u5931\u8D25\uFF0C\u51FA\u73B0 {0}
-error.blocked.option=\u4E0D\u5141\u8BB8\u5728 --jlink-options \u4E2D\u4F7F\u7528 jlink \u9009\u9879 [{0}]
-error.no.name=\u672A\u4F7F\u7528 --name \u6307\u5B9A\u540D\u79F0\uFF0C\u65E0\u6CD5\u4ECE app-image \u63A8\u65AD\u540D\u79F0
+error.tool-not-found=找不到 {0}。原因：{1}
+error.tool-not-found.advice=请安装 {0}
+error.tool-old-version=找不到 {0} {1}或更新版本
+error.tool-old-version.advice=请安装 {0} {1}或更新版本
+error.jlink.failed=jlink 失败，出现 {0}
+error.blocked.option=不允许在 --jlink-options 中使用 jlink 选项 [{0}]
+error.no.name=未使用 --name 指定名称，无法从 app-image 推断名称
 
-warning.no.jdk.modules.found=\u8B66\u544A: \u672A\u627E\u5230 JDK \u6A21\u5757
+warning.no.jdk.modules.found=警告: 未找到 JDK 模块
 
-error.foreign-app-image=\u9519\u8BEF\uFF1Aapp-image \u76EE\u5F55 "{0}" \u4E2D\u7F3A\u5C11 .jpackage.xml \u6587\u4EF6
-error.invalid-app-image=\u9519\u8BEF\uFF1A\u53E6\u4E00\u4E2A jpackage \u7248\u672C\u6216\u683C\u5F0F\u9519\u8BEF\u7684 "{1}" \u751F\u6210\u4E86 app-image \u76EE\u5F55 "{0}"
+error.foreign-app-image=错误：app-image 目录 "{0}" 中缺少 .jpackage.xml 文件
+error.invalid-app-image=错误：另一个 jpackage 版本或格式错误的 "{1}" 生成了 app-image 目录 "{0}"
 
-MSG_BundlerFailed=\u9519\u8BEF\uFF1A\u6253\u5305\u7A0B\u5E8F "{1}" ({0}) \u65E0\u6CD5\u751F\u6210\u7A0B\u5E8F\u5305
-MSG_BundlerConfigException=\u7531\u4E8E\u914D\u7F6E\u95EE\u9898, \u8DF3\u8FC7\u4E86\u6253\u5305\u7A0B\u5E8F{0}: {1} \n\u4FEE\u590D\u5EFA\u8BAE: {2}
-MSG_BundlerConfigExceptionNoAdvice=\u7531\u4E8E\u914D\u7F6E\u95EE\u9898, \u8DF3\u8FC7\u4E86\u6253\u5305\u7A0B\u5E8F{0}: {1}
-MSG_BundlerRuntimeException=\u7531\u4E8E{1}, \u6253\u5305\u7A0B\u5E8F{0}\u5931\u8D25
-MSG_BundlerFailed=\u9519\u8BEF\uFF1A\u6253\u5305\u7A0B\u5E8F "{1}" ({0}) \u65E0\u6CD5\u751F\u6210\u7A0B\u5E8F\u5305
+MSG_BundlerFailed=错误：打包程序 "{1}" ({0}) 无法生成程序包
+MSG_BundlerConfigException=由于配置问题, 跳过了打包程序{0}: {1} \n修复建议: {2}
+MSG_BundlerConfigExceptionNoAdvice=由于配置问题, 跳过了打包程序{0}: {1}
+MSG_BundlerRuntimeException=由于{1}, 打包程序{0}失败
+MSG_BundlerFailed=错误：打包程序 "{1}" ({0}) 无法生成程序包
 
-ERR_NoMainClass=\u9519\u8BEF\uFF1A\u7F3A\u5C11\u4E3B\u5E94\u7528\u7A0B\u5E8F\u7C7B
-ERR_UnsupportedOption=\u9519\u8BEF\uFF1A\u9009\u9879 [{0}] \u5728\u6B64\u5E73\u53F0\u4E0A\u65E0\u6548
-ERR_InvalidTypeOption=\u9519\u8BEF\uFF1A\u9009\u9879 [{0}] \u5BF9\u4E8E\u7C7B\u578B [{1}] \u65E0\u6548
-ERR_NoInstallerEntryPoint=\u9519\u8BEF\uFF1A\u5728\u6CA1\u6709 --module \u6216 --main-jar \u5165\u53E3\u70B9\u9009\u9879\u65F6\uFF0C\u9009\u9879 [{0}] \u65E0\u6548
-ERR_MutuallyExclusiveOptions="\u9519\u8BEF\uFF1A\u9009\u9879 [{0}] \u548C [{1}] \u76F8\u4E92\u6392\u65A5
-ERR_InvalidOptionWithAppImageSigning=\u9519\u8BEF\uFF1A\u5BF9\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7B7E\u540D\u65F6\uFF0C\u9009\u9879 [{0}] \u65E0\u6548
+ERR_NoMainClass=错误：缺少主应用程序类
+ERR_UnsupportedOption=错误：选项 [{0}] 在此平台上无效
+ERR_InvalidTypeOption=错误：选项 [{0}] 对于类型 [{1}] 无效
+ERR_NoInstallerEntryPoint=错误：在没有 --module 或 --main-jar 入口点选项时，选项 [{0}] 无效
+ERR_MutuallyExclusiveOptions="错误：选项 [{0}] 和 [{1}] 相互排斥
+ERR_InvalidOptionWithAppImageSigning=错误：对应用程序映像签名时，选项 [{0}] 无效
 
-ERR_MissingArgument=\u9519\u8BEF: \u7F3A\u5C11\u53C2\u6570: {0}
-ERR_MissingAppResources=\u9519\u8BEF: \u627E\u4E0D\u5230\u5E94\u7528\u7A0B\u5E8F jar
-ERR_AppImageNotExist=\u9519\u8BEF\uFF1A\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u76EE\u5F55 "{0}" \u4E0D\u5B58\u5728
-ERR_NoAddLauncherName=\u9519\u8BEF\uFF1A--add-launcher \u9009\u9879\u9700\u8981\u4E00\u4E2A\u540D\u79F0\u548C\u4E00\u4E2A\u6587\u4EF6\u8DEF\u5F84 (--add-launcher <name>=<file path>)
-ERR_NoUniqueName=\u9519\u8BEF\uFF1A--add-launcher <name>=<file path> \u9700\u8981\u4E00\u4E2A\u552F\u4E00\u7684\u540D\u79F0
-ERR_NoJreInstallerName=\u9519\u8BEF\uFF1AJre \u5B89\u88C5\u7A0B\u5E8F\u9700\u8981\u4E00\u4E2A\u540D\u79F0\u53C2\u6570
-ERR_InvalidAppName=\u9519\u8BEF\uFF1A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0 {0} \u65E0\u6548
-ERR_InvalidSLName=\u9519\u8BEF\uFF1A\u6DFB\u52A0\u542F\u52A8\u7A0B\u5E8F\u540D\u79F0 {0} \u65E0\u6548
-ERR_IconFileNotExit=\u9519\u8BEF\uFF1A\u6307\u5B9A\u7684\u56FE\u6807\u6587\u4EF6 [{0}] \u4E0D\u5B58\u5728
-ERR_LicenseFileNotExit=\u9519\u8BEF\uFF1A\u6307\u5B9A\u7684\u8BB8\u53EF\u8BC1\u6587\u4EF6\u4E0D\u5B58\u5728
-ERR_BuildRootInvalid=\u9519\u8BEF\uFF1A\u4E34\u65F6\u76EE\u5F55 ({0}) \u5FC5\u987B\u662F\u4E0D\u5B58\u5728\u7684\u76EE\u5F55\u6216\u7A7A\u767D\u76EE\u5F55
-ERR_InvalidOption=\u9519\u8BEF\uFF1A\u9009\u9879 [{0}] \u65E0\u6548
-ERR_InvalidInstallerType=\u9519\u8BEF\uFF1A\u7C7B\u578B [{0}] \u65E0\u6548\u6216\u4E0D\u53D7\u652F\u6301
-ERR_BothMainJarAndModule=\u9519\u8BEF\uFF1A\u4E0D\u80FD\u540C\u65F6\u5305\u542B --main-jar \u548C --module \u9009\u9879
-ERR_NoEntryPoint=\u9519\u8BEF\uFF1A\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u9700\u8981 --main-jar \u6216 --module \u9009\u9879
-ERR_InputNotDirectory=\u9519\u8BEF\uFF1A\u6307\u5B9A\u7684\u8F93\u5165\u76EE\u5F55\u4E0D\u662F\u76EE\u5F55\uFF1A{0}
-ERR_CannotReadInputDir=\u9519\u8BEF\uFF1A\u65E0\u6743\u4ECE\u8F93\u5165\u76EE\u5F55\u8BFB\u53D6\uFF1A{0}
-ERR_CannotParseOptions=\u9519\u8BEF\uFF1A\u6B63\u5728\u5904\u7406 @filename \u9009\u9879\uFF1A{0}
-ERR_MissingJLinkOptMacAppStore=\u9519\u8BEF\uFF1A\u5BF9\u4E8E --jlink-options \u53C2\u6570\uFF0C--mac-app-store \u53C2\u6570\u9700\u8981 {0} \u9009\u9879
-ERR_MacAppStoreRuntimeBinExists=\u9519\u8BEF\uFF1A\u8FD0\u884C\u65F6\u6620\u50CF "{0}" \u4E0D\u5E94\u5305\u542B "bin" \u6587\u4EF6\u5939\u3002\u751F\u6210\u4E0E --mac-app-store \u53C2\u6570\u4E00\u8D77\u4F7F\u7528\u7684\u8FD0\u884C\u65F6\u6620\u50CF\u65F6\uFF0C\u4F7F\u7528 --strip-native-commands jlink \u9009\u9879\u3002
+ERR_MissingArgument=错误: 缺少参数: {0}
+ERR_MissingAppResources=错误: 找不到应用程序 jar
+ERR_AppImageNotExist=错误：应用程序映像目录 "{0}" 不存在
+ERR_NoAddLauncherName=错误：--add-launcher 选项需要一个名称和一个文件路径 (--add-launcher <name>=<file path>)
+ERR_NoUniqueName=错误：--add-launcher <name>=<file path> 需要一个唯一的名称
+ERR_NoJreInstallerName=错误：Jre 安装程序需要一个名称参数
+ERR_InvalidAppName=错误：应用程序名称 {0} 无效
+ERR_InvalidSLName=错误：添加启动程序名称 {0} 无效
+ERR_IconFileNotExit=错误：指定的图标文件 [{0}] 不存在
+ERR_LicenseFileNotExit=错误：指定的许可证文件不存在
+ERR_BuildRootInvalid=错误：临时目录 ({0}) 必须是不存在的目录或空白目录
+ERR_InvalidOption=错误：选项 [{0}] 无效
+ERR_InvalidInstallerType=错误：类型 [{0}] 无效或不受支持
+ERR_BothMainJarAndModule=错误：不能同时包含 --main-jar 和 --module 选项
+ERR_NoEntryPoint=错误：创建应用程序映像需要 --main-jar 或 --module 选项
+ERR_InputNotDirectory=错误：指定的输入目录不是目录：{0}
+ERR_CannotReadInputDir=错误：无权从输入目录读取：{0}
+ERR_CannotParseOptions=错误：正在处理 @filename 选项：{0}
+ERR_MissingJLinkOptMacAppStore=错误：对于 --jlink-options 参数，--mac-app-store 参数需要 {0} 选项
+ERR_MacAppStoreRuntimeBinExists=错误：运行时映像 "{0}" 不应包含 "bin" 文件夹。生成与 --mac-app-store 参数一起使用的运行时映像时，使用 --strip-native-commands jlink 选项。
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
index 06d1478f708..abae3d6b4d0 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
@@ -30,38 +30,38 @@ msi.bundler.name=MSI-Installationsprogrammpackage
 
 param.menu-group.default=Unbekannt
 
-resource.executable-properties-template=Vorlage f\u00FCr das Erstellen der ausf\u00FChrbaren Eigenschaftendatei
-resource.setup-icon=Symbol f\u00FCr Dialogfeld "Setup"
-resource.post-app-image-script=Auszuf\u00FChrendes Skript nach dem Auff\u00FCllen des Anwendungsimages
-resource.post-msi-script=Auszuf\u00FChrendes Skript nach dem Erstellen der MSI-Datei f\u00FCr das EXE-Installationsprogramm
+resource.executable-properties-template=Vorlage für das Erstellen der ausführbaren Eigenschaftendatei
+resource.setup-icon=Symbol für Dialogfeld "Setup"
+resource.post-app-image-script=Auszuführendes Skript nach dem Auffüllen des Anwendungsimages
+resource.post-msi-script=Auszuführendes Skript nach dem Erstellen der MSI-Datei für das EXE-Installationsprogramm
 resource.wxl-file=WiX-Lokalisierungsdatei
 resource.wxl-file-name=MsiInstallerStrings_de.wxl
 resource.main-wix-file=Haupt-WiX-Projektdatei
-resource.overrides-wix-file=\u00DCberschreibt WiX-Projektdatei
-resource.shortcutpromptdlg-wix-file=Dialogfeld f\u00FCr Verkn\u00FCpfungs-Prompt der WiX-Projektdatei
-resource.installdirnotemptydlg-wix-file=Nicht leeres Installationsverzeichnis in Dialogfeld f\u00FCr WiX-Projektdatei
-resource.launcher-as-service-wix-file=WiX-Projektdatei f\u00FCr Serviceinstallationsprogramm
+resource.overrides-wix-file=Überschreibt WiX-Projektdatei
+resource.shortcutpromptdlg-wix-file=Dialogfeld für Verknüpfungs-Prompt der WiX-Projektdatei
+resource.installdirnotemptydlg-wix-file=Nicht leeres Installationsverzeichnis in Dialogfeld für WiX-Projektdatei
+resource.launcher-as-service-wix-file=WiX-Projektdatei für Serviceinstallationsprogramm
 
 error.no-wix-tools=WiX-Tools (light.exe, candle.exe) nicht gefunden
-error.no-wix-tools.advice=Laden Sie WiX 3.0 oder h\u00F6her von https://wixtoolset.org herunter, und f\u00FCgen Sie es zu PATH hinzu.
-error.version-string-wrong-format.advice=Setzen Sie den Wert des --app-version-Parameters auf eine g\u00FCltige ProductVersion des Windows-Installationsprogramms.
+error.no-wix-tools.advice=Laden Sie WiX 3.0 oder höher von https://wixtoolset.org herunter, und fügen Sie es zu PATH hinzu.
+error.version-string-wrong-format.advice=Setzen Sie den Wert des --app-version-Parameters auf eine gültige ProductVersion des Windows-Installationsprogramms.
 error.msi-product-version-components=Versionszeichenfolge [{0}] muss zwischen 2 und 4 Komponenten aufweisen.
 error.msi-product-version-major-out-of-range=Hauptversion muss im Bereich [0, 255] liegen
 error.msi-product-version-build-out-of-range=Build-Teil der Version muss im Bereich [0, 65535] liegen
 error.msi-product-version-minor-out-of-range=Nebenversion muss im Bereich [0, 255] liegen
-error.version-swap=Versionsinformationen f\u00FCr {0} konnten nicht aktualisiert werden
-error.icon-swap=Symbol f\u00FCr {0} konnte nicht aktualisiert werden
-error.invalid-envvar=Ung\u00FCltiger Wert der {0}-Umgebungsvariable
+error.version-swap=Versionsinformationen für {0} konnten nicht aktualisiert werden
+error.icon-swap=Symbol für {0} konnte nicht aktualisiert werden
+error.invalid-envvar=Ungültiger Wert der {0}-Umgebungsvariable
 error.lock-resource=Sperren nicht erfolgreich: {0}
 error.read-wix-l10n-file=Datei {0} konnte nicht geparst werden
 error.extract-culture-from-wix-l10n-file=Kulturwert konnte nicht aus Datei {0} gelesen werden
 
 message.icon-not-ico=Das angegebene Symbol "{0}" ist keine ICO-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
-message.potential.windows.defender.issue=Warnung: Windows Defender verhindert eventuell die korrekte Ausf\u00FChrung von jpackage. Wenn ein Problem auftritt, deaktivieren Sie die Echtzeit\u00FCberwachung, oder f\u00FCgen Sie einen Ausschluss f\u00FCr das Verzeichnis "{0}" hinzu.
-message.outputting-to-location=EXE f\u00FCr Installationsprogramm wird generiert in: {0}.
+message.potential.windows.defender.issue=Warnung: Windows Defender verhindert eventuell die korrekte Ausführung von jpackage. Wenn ein Problem auftritt, deaktivieren Sie die Echtzeitüberwachung, oder fügen Sie einen Ausschluss für das Verzeichnis "{0}" hinzu.
+message.outputting-to-location=EXE für Installationsprogramm wird generiert in: {0}.
 message.output-location=Installationsprogramm (.exe) gespeichert in: {0}
 message.tool-version=[{0}]-Version [{1}] erkannt.
-message.creating-association-with-null-extension=Verkn\u00FCpfung mit Nullerweiterung wird erstellt.
+message.creating-association-with-null-extension=Verknüpfung mit Nullerweiterung wird erstellt.
 message.wrong-tool-version=[{0}]-Version {1} wurde erkannt. Erforderlich ist jedoch Version {2}.
 message.version-string-too-many-components=Versionszeichenfolge kann bis zu 3 Komponenten aufweisen: major.minor.build.
 message.use-wix36-features=WiX {0} erkannt. Erweiterte Bereinigungsaktion wird aktiviert.
@@ -69,5 +69,5 @@ message.product-code=MSI-ProductCode: {0}.
 message.upgrade-code=MSI-UpgradeCode: {0}.
 message.preparing-msi-config=MSI-Konfiguration wird vorbereitet: {0}.
 message.generating-msi=MSI wird generiert: {0}.
-message.invalid.install.dir=Warnung: Ung\u00FCltiges Installationsverzeichnis {0}. Installationsverzeichnis muss ein relativer Unterpfad unter dem Standardinstallationsverzeichnis wie "Programme" sein. Der Anwendungsname "{1}" wird als Standardwert verwendet.
+message.invalid.install.dir=Warnung: Ungültiges Installationsverzeichnis {0}. Installationsverzeichnis muss ein relativer Unterpfad unter dem Standardinstallationsverzeichnis wie "Programme" sein. Der Anwendungsname "{1}" wird als Standardwert verwendet.
 
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
index 2e36292ca42..89579e50c02 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
@@ -24,50 +24,50 @@
 #
 #
 
-app.bundler.name=Windows\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8
-exe.bundler.name=EXE\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8
-msi.bundler.name=MSI\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8
+app.bundler.name=Windowsアプリケーション・イメージ
+exe.bundler.name=EXEインストーラ・パッケージ
+msi.bundler.name=MSIインストーラ・パッケージ
 
-param.menu-group.default=\u4E0D\u660E
+param.menu-group.default=不明
 
-resource.executable-properties-template=\u5B9F\u884C\u53EF\u80FD\u306A\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u4F5C\u6210\u7528\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
-resource.setup-icon=\u8A2D\u5B9A\u30C0\u30A4\u30A2\u30ED\u30B0\u30FB\u30A2\u30A4\u30B3\u30F3
-resource.post-app-image-script=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u79FB\u5165\u3057\u305F\u5F8C\u306B\u5B9F\u884C\u3059\u308B\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.post-msi-script=exe\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u306Emsi\u30D5\u30A1\u30A4\u30EB\u304C\u4F5C\u6210\u3055\u308C\u305F\u5F8C\u306B\u5B9F\u884C\u3059\u308B\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.wxl-file=WiX\u30ED\u30FC\u30AB\u30EA\u30BC\u30FC\u30B7\u30E7\u30F3\u30FB\u30D5\u30A1\u30A4\u30EB
+resource.executable-properties-template=実行可能なプロパティ・ファイル作成用のテンプレート
+resource.setup-icon=設定ダイアログ・アイコン
+resource.post-app-image-script=アプリケーション・イメージを移入した後に実行するスクリプト
+resource.post-msi-script=exeインストーラのmsiファイルが作成された後に実行するスクリプト
+resource.wxl-file=WiXローカリゼーション・ファイル
 resource.wxl-file-name=MsiInstallerStrings_ja.wxl
-resource.main-wix-file=\u30E1\u30A4\u30F3WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
-resource.overrides-wix-file=WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9
-resource.shortcutpromptdlg-wix-file=\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30FB\u30D7\u30ED\u30F3\u30D7\u30C8\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
-resource.installdirnotemptydlg-wix-file=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u306EWiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u7A7A\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-resource.launcher-as-service-wix-file=\u30B5\u30FC\u30D3\u30B9\u30FB\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
+resource.main-wix-file=メインWiXプロジェクト・ファイル
+resource.overrides-wix-file=WiXプロジェクト・ファイルのオーバーライド
+resource.shortcutpromptdlg-wix-file=ショートカット・プロンプト・ダイアログWiXプロジェクト・ファイル
+resource.installdirnotemptydlg-wix-file=インストール・ディレクトリ・ダイアログのWiXプロジェクト・ファイルが空ではありません
+resource.launcher-as-service-wix-file=サービス・インストーラWiXプロジェクト・ファイル
 
-error.no-wix-tools=WiX\u30C4\u30FC\u30EB(light.exe\u3001candle.exe)\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-error.no-wix-tools.advice=WiX 3.0\u4EE5\u964D\u3092https://wixtoolset.org\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3001PATH\u306B\u8FFD\u52A0\u3057\u307E\u3059\u3002
-error.version-string-wrong-format.advice=--app-version\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u5024\u3092\u6709\u52B9\u306AWindows Installer ProductVersion\u306B\u8A2D\u5B9A\u3057\u307E\u3059\u3002
-error.msi-product-version-components=\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217[{0}]\u306B\u306F\u30012\u304B\u30894\u3064\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-error.msi-product-version-major-out-of-range=\u30E1\u30B8\u30E3\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u7BC4\u56F2[0, 255]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-error.msi-product-version-build-out-of-range=\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u30D3\u30EB\u30C9\u90E8\u5206\u306F\u7BC4\u56F2[0, 65535]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-error.msi-product-version-minor-out-of-range=\u30DE\u30A4\u30CA\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u7BC4\u56F2[0, 255]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-error.version-swap={0}\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u306E\u66F4\u65B0\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-error.icon-swap={0}\u306E\u30A2\u30A4\u30B3\u30F3\u306E\u66F4\u65B0\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-error.invalid-envvar={0}\u74B0\u5883\u5909\u6570\u306E\u5024\u304C\u7121\u52B9\u3067\u3059
-error.lock-resource=\u30ED\u30C3\u30AF\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
-error.read-wix-l10n-file={0}\u30D5\u30A1\u30A4\u30EB\u306E\u89E3\u6790\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-error.extract-culture-from-wix-l10n-file={0}\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u30AB\u30EB\u30C1\u30E3\u306E\u5024\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+error.no-wix-tools=WiXツール(light.exe、candle.exe)が見つかりません
+error.no-wix-tools.advice=WiX 3.0以降をhttps://wixtoolset.orgからダウンロードし、PATHに追加します。
+error.version-string-wrong-format.advice=--app-versionパラメータの値を有効なWindows Installer ProductVersionに設定します。
+error.msi-product-version-components=バージョン文字列[{0}]には、2から4つのコンポーネントが含まれている必要があります。
+error.msi-product-version-major-out-of-range=メジャー・バージョンは範囲[0, 255]内である必要があります
+error.msi-product-version-build-out-of-range=バージョンのビルド部分は範囲[0, 65535]内である必要があります
+error.msi-product-version-minor-out-of-range=マイナー・バージョンは範囲[0, 255]内である必要があります
+error.version-swap={0}のバージョン情報の更新に失敗しました
+error.icon-swap={0}のアイコンの更新に失敗しました
+error.invalid-envvar={0}環境変数の値が無効です
+error.lock-resource=ロックに失敗しました: {0}
+error.read-wix-l10n-file={0}ファイルの解析に失敗しました
+error.extract-culture-from-wix-l10n-file={0}ファイルからのカルチャの値の読取りに失敗しました
 
-message.icon-not-ico=\u6307\u5B9A\u3057\u305F\u30A2\u30A4\u30B3\u30F3"{0}"\u306FICO\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u306A\u304F\u3001\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u304C\u305D\u306E\u4F4D\u7F6E\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
-message.potential.windows.defender.issue=\u8B66\u544A: Windows Defender\u304C\u539F\u56E0\u3067jpackage\u304C\u6A5F\u80FD\u3057\u306A\u3044\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\u554F\u984C\u304C\u767A\u751F\u3057\u305F\u5834\u5408\u306F\u3001\u30EA\u30A2\u30EB\u30BF\u30A4\u30E0\u30FB\u30E2\u30CB\u30BF\u30EA\u30F3\u30B0\u3092\u7121\u52B9\u306B\u3059\u308B\u304B\u3001\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u306E\u9664\u5916\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u554F\u984C\u306B\u5BFE\u51E6\u3067\u304D\u307E\u3059\u3002
-message.outputting-to-location=\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u306EEXE\u3092\u6B21\u306B\u751F\u6210\u3057\u3066\u3044\u307E\u3059: {0}
-message.output-location=\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9(.exe)\u306F\u6B21\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F: {0}
-message.tool-version=[{0}]\u30D0\u30FC\u30B8\u30E7\u30F3[{1}]\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
-message.creating-association-with-null-extension=null\u62E1\u5F35\u5B50\u3068\u306E\u95A2\u9023\u4ED8\u3051\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059\u3002
-message.wrong-tool-version=[{0}]\u30D0\u30FC\u30B8\u30E7\u30F3{1}\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u30D0\u30FC\u30B8\u30E7\u30F3{2}\u304C\u5FC5\u8981\u3067\u3059\u3002
-message.version-string-too-many-components=\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217\u306B\u306F\u3001\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30923\u3064(\u30E1\u30B8\u30E3\u30FC.\u30DE\u30A4\u30CA\u30FC.\u30D3\u30EB\u30C9)\u307E\u3067\u542B\u3081\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
-message.use-wix36-features=WiX {0}\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u62E1\u5F35\u30AF\u30EA\u30FC\u30F3\u30A2\u30C3\u30D7\u30FB\u30A2\u30AF\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u5316\u3057\u3066\u3044\u307E\u3059\u3002
-message.product-code=MSI ProductCode: {0}\u3002
-message.upgrade-code=MSI UpgradeCode: {0}\u3002
-message.preparing-msi-config=MSI\u69CB\u6210\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}
-message.generating-msi=MSI\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059: {0}\u3002
-message.invalid.install.dir=\u8B66\u544A: \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u304C\u7121\u52B9\u3067\u3059\u3002\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5834\u6240("\u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D5\u30A1\u30A4\u30EB"\u306A\u3069)\u306E\u4E0B\u306E\u76F8\u5BFE\u30B5\u30D6\u30D1\u30B9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D"{1}"\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+message.icon-not-ico=指定したアイコン"{0}"はICOファイルではなく、使用されません。デフォルト・アイコンがその位置に使用されます。
+message.potential.windows.defender.issue=警告: Windows Defenderが原因でjpackageが機能しないことがあります。問題が発生した場合は、リアルタイム・モニタリングを無効にするか、ディレクトリ"{0}"の除外を追加することにより、問題に対処できます。
+message.outputting-to-location=インストーラのEXEを次に生成しています: {0}
+message.output-location=インストーラ(.exe)は次に保存されました: {0}
+message.tool-version=[{0}]バージョン[{1}]が検出されました。
+message.creating-association-with-null-extension=null拡張子との関連付けを作成しています。
+message.wrong-tool-version=[{0}]バージョン{1}が検出されましたが、バージョン{2}が必要です。
+message.version-string-too-many-components=バージョン文字列には、コンポーネントを3つ(メジャー.マイナー.ビルド)まで含めることができます。
+message.use-wix36-features=WiX {0}が検出されました。拡張クリーンアップ・アクションを有効化しています。
+message.product-code=MSI ProductCode: {0}。
+message.upgrade-code=MSI UpgradeCode: {0}。
+message.preparing-msi-config=MSI構成を準備しています: {0}
+message.generating-msi=MSIを生成しています: {0}。
+message.invalid.install.dir=警告: インストール・ディレクトリ{0}が無効です。インストール・ディレクトリはデフォルトのインストール場所("プログラム・ファイル"など)の下の相対サブパスである必要があります。アプリケーション名"{1}"にデフォルト設定されています。
 
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
index 7a5a51b1ef8..3e08edf2e64 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
@@ -24,50 +24,50 @@
 #
 #
 
-app.bundler.name=Windows \u5E94\u7528\u7A0B\u5E8F\u6620\u50CF
-exe.bundler.name=EXE \u5B89\u88C5\u7A0B\u5E8F\u5305
-msi.bundler.name=MSI \u5B89\u88C5\u7A0B\u5E8F\u5305
+app.bundler.name=Windows 应用程序映像
+exe.bundler.name=EXE 安装程序包
+msi.bundler.name=MSI 安装程序包
 
-param.menu-group.default=\u672A\u77E5
+param.menu-group.default=未知
 
-resource.executable-properties-template=\u7528\u4E8E\u521B\u5EFA\u53EF\u6267\u884C\u5C5E\u6027\u6587\u4EF6\u7684\u6A21\u677F
-resource.setup-icon=\u8BBE\u7F6E\u5BF9\u8BDD\u6846\u56FE\u6807
-resource.post-app-image-script=\u8981\u5728\u586B\u5145\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u4E4B\u540E\u8FD0\u884C\u7684\u811A\u672C
-resource.post-msi-script=\u5728\u4E3A exe \u5B89\u88C5\u7A0B\u5E8F\u521B\u5EFA msi \u6587\u4EF6\u4E4B\u540E\u8981\u8FD0\u884C\u7684\u811A\u672C
-resource.wxl-file=WiX \u672C\u5730\u5316\u6587\u4EF6
+resource.executable-properties-template=用于创建可执行属性文件的模板
+resource.setup-icon=设置对话框图标
+resource.post-app-image-script=要在填充应用程序映像之后运行的脚本
+resource.post-msi-script=在为 exe 安装程序创建 msi 文件之后要运行的脚本
+resource.wxl-file=WiX 本地化文件
 resource.wxl-file-name=MsiInstallerStrings_zh_CN.wxl
-resource.main-wix-file=\u4E3B WiX \u9879\u76EE\u6587\u4EF6
-resource.overrides-wix-file=\u8986\u76D6 WiX \u9879\u76EE\u6587\u4EF6
-resource.shortcutpromptdlg-wix-file=\u5FEB\u6377\u65B9\u5F0F\u63D0\u793A\u5BF9\u8BDD\u6846 WiX \u9879\u76EE\u6587\u4EF6
-resource.installdirnotemptydlg-wix-file=\u5B89\u88C5\u76EE\u5F55\u5BF9\u8BDD\u6846 WiX \u9879\u76EE\u6587\u4EF6\u975E\u7A7A
-resource.launcher-as-service-wix-file=\u670D\u52A1\u5B89\u88C5\u7A0B\u5E8F WiX \u9879\u76EE\u6587\u4EF6
+resource.main-wix-file=主 WiX 项目文件
+resource.overrides-wix-file=覆盖 WiX 项目文件
+resource.shortcutpromptdlg-wix-file=快捷方式提示对话框 WiX 项目文件
+resource.installdirnotemptydlg-wix-file=安装目录对话框 WiX 项目文件非空
+resource.launcher-as-service-wix-file=服务安装程序 WiX 项目文件
 
-error.no-wix-tools=\u627E\u4E0D\u5230 WiX \u5DE5\u5177 (light.exe, candle.exe)
-error.no-wix-tools.advice=\u4ECE https://wixtoolset.org \u4E0B\u8F7D WiX 3.0 \u6216\u66F4\u9AD8\u7248\u672C\uFF0C\u7136\u540E\u5C06\u5176\u6DFB\u52A0\u5230 PATH\u3002
-error.version-string-wrong-format.advice=\u5C06 --app-version \u53C2\u6570\u7684\u503C\u8BBE\u7F6E\u4E3A\u6709\u6548\u7684 Windows Installer ProductVersion\u3002
-error.msi-product-version-components=\u7248\u672C\u5B57\u7B26\u4E32 [{0}] \u5FC5\u987B\u5305\u542B 2 \u5230 4 \u4E2A\u7EC4\u6210\u90E8\u5206\u3002
-error.msi-product-version-major-out-of-range=\u4E3B\u7248\u672C\u5FC5\u987B\u4F4D\u4E8E [0, 255] \u8303\u56F4\u4E2D
-error.msi-product-version-build-out-of-range=\u7248\u672C\u7684\u5DE5\u4F5C\u7248\u672C\u90E8\u5206\u5FC5\u987B\u4F4D\u4E8E [0, 65535] \u8303\u56F4\u4E2D
-error.msi-product-version-minor-out-of-range=\u6B21\u7248\u672C\u5FC5\u987B\u4F4D\u4E8E [0, 255] \u8303\u56F4\u4E2D
-error.version-swap=\u65E0\u6CD5\u66F4\u65B0 {0} \u7684\u7248\u672C\u4FE1\u606F
-error.icon-swap=\u65E0\u6CD5\u66F4\u65B0 {0} \u7684\u56FE\u6807
-error.invalid-envvar={0} \u73AF\u5883\u53D8\u91CF\u7684\u503C\u65E0\u6548
-error.lock-resource=\u65E0\u6CD5\u9501\u5B9A\uFF1A{0}
-error.read-wix-l10n-file=\u65E0\u6CD5\u89E3\u6790 {0} \u6587\u4EF6
-error.extract-culture-from-wix-l10n-file=\u65E0\u6CD5\u4ECE {0} \u6587\u4EF6\u8BFB\u53D6\u6587\u5316\u503C
+error.no-wix-tools=找不到 WiX 工具 (light.exe, candle.exe)
+error.no-wix-tools.advice=从 https://wixtoolset.org 下载 WiX 3.0 或更高版本，然后将其添加到 PATH。
+error.version-string-wrong-format.advice=将 --app-version 参数的值设置为有效的 Windows Installer ProductVersion。
+error.msi-product-version-components=版本字符串 [{0}] 必须包含 2 到 4 个组成部分。
+error.msi-product-version-major-out-of-range=主版本必须位于 [0, 255] 范围中
+error.msi-product-version-build-out-of-range=版本的工作版本部分必须位于 [0, 65535] 范围中
+error.msi-product-version-minor-out-of-range=次版本必须位于 [0, 255] 范围中
+error.version-swap=无法更新 {0} 的版本信息
+error.icon-swap=无法更新 {0} 的图标
+error.invalid-envvar={0} 环境变量的值无效
+error.lock-resource=无法锁定：{0}
+error.read-wix-l10n-file=无法解析 {0} 文件
+error.extract-culture-from-wix-l10n-file=无法从 {0} 文件读取文化值
 
-message.icon-not-ico=\u6307\u5B9A\u7684\u56FE\u6807 "{0}" \u4E0D\u662F ICO \u6587\u4EF6, \u4E0D\u4F1A\u4F7F\u7528\u3002\u5C06\u4F7F\u7528\u9ED8\u8BA4\u56FE\u6807\u4EE3\u66FF\u3002
-message.potential.windows.defender.issue=\u8B66\u544A\uFF1AWindows Defender \u53EF\u80FD\u4F1A\u963B\u6B62 jpackage \u6B63\u5E38\u5DE5\u4F5C\u3002\u5982\u679C\u5B58\u5728\u95EE\u9898\uFF0C\u53EF\u4EE5\u901A\u8FC7\u7981\u7528\u5B9E\u65F6\u76D1\u89C6\u6216\u8005\u4E3A\u76EE\u5F55 "{0}" \u6DFB\u52A0\u6392\u9664\u9879\u6765\u89E3\u51B3\u3002
-message.outputting-to-location=\u6B63\u5728\u4E3A\u5B89\u88C5\u7A0B\u5E8F\u751F\u6210 EXE, \u4F4D\u7F6E: {0}\u3002
-message.output-location=\u5B89\u88C5\u7A0B\u5E8F (.exe) \u5DF2\u4FDD\u5B58\u5230: {0}
-message.tool-version=\u68C0\u6D4B\u5230 [{0}] \u7248\u672C [{1}]\u3002
-message.creating-association-with-null-extension=\u6B63\u5728\u4F7F\u7528\u7A7A\u6269\u5C55\u540D\u521B\u5EFA\u5173\u8054\u3002
-message.wrong-tool-version=\u68C0\u6D4B\u5230 [{0}] \u7248\u672C {1}, \u4F46\u9700\u8981\u7248\u672C {2}\u3002
-message.version-string-too-many-components=\u7248\u672C\u5B57\u7B26\u4E32\u6700\u591A\u53EF\u4EE5\u5177\u6709 3 \u4E2A\u7EC4\u6210\u90E8\u5206 - major.minor.build\u3002
-message.use-wix36-features=\u68C0\u6D4B\u5230 WiX {0}\u3002\u6B63\u5728\u542F\u7528\u9AD8\u7EA7\u6E05\u9664\u64CD\u4F5C\u3002
-message.product-code=MSI ProductCode\uFF1A{0}\u3002
-message.upgrade-code=MSI UpgradeCode\uFF1A{0}\u3002
-message.preparing-msi-config=\u6B63\u5728\u51C6\u5907 MSI \u914D\u7F6E: {0}\u3002
-message.generating-msi=\u6B63\u5728\u751F\u6210 MSI: {0}\u3002
-message.invalid.install.dir=\u8B66\u544A\uFF1A\u5B89\u88C5\u76EE\u5F55 {0} \u65E0\u6548\u3002\u5B89\u88C5\u76EE\u5F55\u5E94\u5F53\u662F\u9ED8\u8BA4\u5B89\u88C5\u4F4D\u7F6E\uFF08\u5982 "Program Files"\uFF09\u4E0B\u9762\u7684\u76F8\u5BF9\u5B50\u8DEF\u5F84\u3002\u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0 "{1}"\u3002
+message.icon-not-ico=指定的图标 "{0}" 不是 ICO 文件, 不会使用。将使用默认图标代替。
+message.potential.windows.defender.issue=警告：Windows Defender 可能会阻止 jpackage 正常工作。如果存在问题，可以通过禁用实时监视或者为目录 "{0}" 添加排除项来解决。
+message.outputting-to-location=正在为安装程序生成 EXE, 位置: {0}。
+message.output-location=安装程序 (.exe) 已保存到: {0}
+message.tool-version=检测到 [{0}] 版本 [{1}]。
+message.creating-association-with-null-extension=正在使用空扩展名创建关联。
+message.wrong-tool-version=检测到 [{0}] 版本 {1}, 但需要版本 {2}。
+message.version-string-too-many-components=版本字符串最多可以具有 3 个组成部分 - major.minor.build。
+message.use-wix36-features=检测到 WiX {0}。正在启用高级清除操作。
+message.product-code=MSI ProductCode：{0}。
+message.upgrade-code=MSI UpgradeCode：{0}。
+message.preparing-msi-config=正在准备 MSI 配置: {0}。
+message.generating-msi=正在生成 MSI: {0}。
+message.invalid.install.dir=警告：安装目录 {0} 无效。安装目录应当是默认安装位置（如 "Program Files"）下面的相对子路径。默认为应用程序名称 "{1}"。
 
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
index d03c1eb73ca..50c7515e9d8 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
@@ -23,9 +23,9 @@
 # questions.
 #
 
-jshell.msg.welcome =Willkommen bei JShell - Version {0}\nGeben Sie f\u00FCr eine Einf\u00FChrung Folgendes ein: /help intro
-jshell.err.opt.arg = Argument f\u00FCr {0} fehlt.
-jshell.err.opt.invalid = Ung\u00FCltige Optionen: {0}.
+jshell.msg.welcome =Willkommen bei JShell - Version {0}\nGeben Sie für eine Einführung Folgendes ein: /help intro
+jshell.err.opt.arg = Argument für {0} fehlt.
+jshell.err.opt.invalid = Ungültige Optionen: {0}.
 jshell.err.opt.one = Es darf nur eine {0}-Option verwendet werden.
 jshell.err.opt.startup.conflict = Nicht miteinander vereinbare Optionen: Es wurde sowohl --startup als auch --no-startup verwendet.
 jshell.err.opt.feedback.one = Es darf nur eine Feedbackoption (--feedback, -q, -s oder -v) verwendet werden.
@@ -36,29 +36,29 @@ jshell.msg.terminated.restore = Stellen Sie Definitionen wieder her mit: /reload
 
 jshell.msg.use.one.of = Verwenden Sie eine der folgenden Optionen: {0}
 jshell.msg.see.classes.etc = Siehe /types, /methods, /vars oder /list
-jshell.err.arg = Ung\u00FCltiges "{0}"-Argument: {1}
+jshell.err.arg = Ungültiges "{0}"-Argument: {1}
 jshell.msg.see = Hilfe finden Sie unter {0}.
 
-jshell.err.file.not.accessible = Auf Datei "{1}" f\u00FCr "{0}" kann nicht zugegriffen werden: {2}
-jshell.err.file.not.found = Datei "{1}" f\u00FCr "{0}" nicht gefunden.
-jshell.err.file.exception = Datei "{1}" f\u00FCr "{0}" hat eine Ausnahme ausgel\u00F6st: {2}
-jshell.err.file.filename = F\u00FCr "{0}" muss ein Dateinamenargument angegeben werden.
+jshell.err.file.not.accessible = Auf Datei "{1}" für "{0}" kann nicht zugegriffen werden: {2}
+jshell.err.file.not.found = Datei "{1}" für "{0}" nicht gefunden.
+jshell.err.file.exception = Datei "{1}" für "{0}" hat eine Ausnahme ausgelöst: {2}
+jshell.err.file.filename = Für "{0}" muss ein Dateinamenargument angegeben werden.
 
 jshell.err.startup.unexpected.exception = Unerwartete Ausnahme beim Lesen von Startinformationen: {0}
 jshell.err.unexpected.exception = Unerwartete Ausnahme: {0}
 
-jshell.err.invalid.command = Ung\u00FCltiger Befehl: {0}
+jshell.err.invalid.command = Ungültiger Befehl: {0}
 jshell.err.command.ambiguous = Befehl "{0}" ist mehrdeutig: {1}
 jshell.msg.set.restore = Es werden neue Optionen festgelegt, und der Status wird wiederhergestellt.
 jshell.msg.set.editor.set = Editor gesetzt auf: {0}
 jshell.msg.set.editor.retain = Editoreinstellung beibehalten: {0}
 jshell.msg.set.indent.set = Einzugsebene gesetzt auf: {0}
-jshell.err.invalid.indent = Ung\u00FCltige Einzugsebene: {0}
-jshell.err.no.builtin.editor = Integrierter Editor nicht verf\u00FCgbar.
+jshell.err.invalid.indent = Ungültige Einzugsebene: {0}
+jshell.err.no.builtin.editor = Integrierter Editor nicht verfügbar.
 jshell.err.cant.launch.editor = Integrierter Editor kann nicht gestartet werden - unerwartete Ausnahme: {0}
 jshell.msg.try.set.editor = Informationen zum Verwenden des externen Editors finden Sie unter "/help /set editor".
-jshell.msg.press.return.to.leave.edit.mode = Dr\u00FCcken Sie die Eingabetaste, um den Bearbeitungsmodus zu verlassen.
-jshell.err.wait.applies.to.external.editor = -wait gilt f\u00FCr externe Editoren
+jshell.msg.press.return.to.leave.edit.mode = Drücken Sie die Eingabetaste, um den Bearbeitungsmodus zu verlassen.
+jshell.err.wait.applies.to.external.editor = -wait gilt für externe Editoren
 jshell.label.editpad = JShell-Bearbeitungs-Pad
 
 jshell.err.setting.to.retain.must.be.specified = Die beizubehaltende Einstellung muss angegeben werden - {0}
@@ -68,48 +68,48 @@ jshell.err.continuation.prompt.required = Fortsetzungs-Prompt erforderlich - {0}
 jshell.msg.try.command.without.args = Verwenden Sie "{0}" ohne Argumente.
 jshell.msg.no.active = Keine aktiven Definitionen vorhanden.
 
-jshell.msg.resetting = Wird zur\u00FCckgesetzt...
-jshell.msg.resetting.state = Status wird zur\u00FCckgesetzt.
+jshell.msg.resetting = Wird zurückgesetzt...
+jshell.msg.resetting.state = Status wird zurückgesetzt.
 
 jshell.err.reload.no.previous = Keine vorherige Historie zum Wiederherstellen vorhanden
-jshell.err.reload.restarting.previous.state = Es wird ein Neustart ausgef\u00FChrt und der vorherige Status wiederhergestellt.
-jshell.err.reload.restarting.state = Neustart wird ausgef\u00FChrt und Status wiederhergestellt.
+jshell.err.reload.restarting.previous.state = Es wird ein Neustart ausgeführt und der vorherige Status wiederhergestellt.
+jshell.err.reload.restarting.state = Neustart wird ausgeführt und Status wiederhergestellt.
 
-jshell.err.restart.failed = Neustart nicht erfolgreich: {0}\n\nVorherige Einstellungen werden wiederhergestellt, und ein Neustart wird ausgef\u00FChrt...
+jshell.err.restart.failed = Neustart nicht erfolgreich: {0}\n\nVorherige Einstellungen werden wiederhergestellt, und ein Neustart wird ausgeführt...
 
 jshell.msg.vars.not.active = (nicht aktiv)
 
-jshell.err.out.of.range = Au\u00DFerhalb des zul\u00E4ssigen Bereichs
+jshell.err.out.of.range = Außerhalb des zulässigen Bereichs
 
 jshell.msg.error = Fehler:
 jshell.msg.warning = Warnung:
 
-jshell.err.sub.arg = F\u00FCr den Befehl "{0}" ist ein Unterbefehl erforderlich. Siehe: "/help {0}"
-jshell.err.sub.ambiguous = Mehrdeutiges Unterbefehlsargument f\u00FCr "{0}": {1}
+jshell.err.sub.arg = Für den Befehl "{0}" ist ein Unterbefehl erforderlich. Siehe: "/help {0}"
+jshell.err.sub.ambiguous = Mehrdeutiges Unterbefehlsargument für "{0}": {1}
 
-jshell.err.classpath.arg = F\u00FCr den /classpath-Befehl ist ein Pfadargument erforderlich.
-jshell.msg.classpath = Pfad "{0}" zu Classpath hinzugef\u00FCgt
+jshell.err.classpath.arg = Für den /classpath-Befehl ist ein Pfadargument erforderlich.
+jshell.msg.classpath = Pfad "{0}" zu Classpath hinzugefügt
 
 jshell.err.help.arg = Es beginnen keine Befehle oder Themen mit dem angegebenen Argument: {0}
-jshell.msg.help.begin =Geben Sie einen Java-Sprachausdruck, eine Anweisung oder eine Deklaration ein.\nSie k\u00F6nnen auch einen der folgenden Befehle eingeben:\n
+jshell.msg.help.begin =Geben Sie einen Java-Sprachausdruck, eine Anweisung oder eine Deklaration ein.\nSie können auch einen der folgenden Befehle eingeben:\n
 jshell.msg.help.subject =\nUm weitere Informationen zu erhalten, geben Sie "/help" gefolgt von dem Namen\neines Befehls oder Themas ein.\nBeispiel: "/help /list" oder "/help intro".\n\nThemen:\n\n
 
 jshell.err.no.snippet.with.id = Kein Snippet mit ID: {0}
 jshell.err.end.snippet.range.less.than.start = Snippet-Bereichsende niedriger als Bereichsanfang: {0} - {1}
-jshell.err.range.requires.id = F\u00FCr Snippet-Bereiche sind Snippet-IDs erforderlich: {0}
+jshell.err.range.requires.id = Für Snippet-Bereiche sind Snippet-IDs erforderlich: {0}
 
-jshell.err.exit.not.expression = Das Argument f\u00FCr /exit muss ein g\u00FCltiger ganzzahliger Ausdruck sein. Es ist jedoch kein Ausdruck: {0}
-jshell.err.exit.bad.type = Das Argument f\u00FCr /exit muss ein g\u00FCltiger ganzzahliger Ausdruck sein. Der Typ ist {1} : {0}
-jshell.err.exit.bad.value = Das Argument f\u00FCr /exit besitzt den ung\u00FCltigen Wert {1} : {0}
+jshell.err.exit.not.expression = Das Argument für /exit muss ein gültiger ganzzahliger Ausdruck sein. Es ist jedoch kein Ausdruck: {0}
+jshell.err.exit.bad.type = Das Argument für /exit muss ein gültiger ganzzahliger Ausdruck sein. Der Typ ist {1} : {0}
+jshell.err.exit.bad.value = Das Argument für /exit besitzt den ungültigen Wert {1} : {0}
 
-jshell.err.drop.arg =Geben Sie im /drop-Argument einen zu l\u00F6schenden Import oder eine zu l\u00F6schende Variable, Methode oder Klasse an.\nGeben Sie die Elemente nach ID oder Name an. Verwenden Sie /list, um IDs anzuzeigen. Verwenden Sie /reset, um den gesamten Status zur\u00FCckzusetzen.
+jshell.err.drop.arg =Geben Sie im /drop-Argument einen zu löschenden Import oder eine zu löschende Variable, Methode oder Klasse an.\nGeben Sie die Elemente nach ID oder Name an. Verwenden Sie /list, um IDs anzuzeigen. Verwenden Sie /reset, um den gesamten Status zurückzusetzen.
 jshell.err.failed = Nicht erfolgreich.
 jshell.msg.native.method = Native Methode
 jshell.msg.unknown.source = Unbekannte Quelle
 jshell.msg.goodbye = Auf Wiedersehen
 jshell.msg.goodbye.value = Auf Wiedersehen ({0})
 
-jshell.msg.help.for.help = Geben Sie /help f\u00FCr einen Hilfetext ein.
+jshell.msg.help.for.help = Geben Sie /help für einen Hilfetext ein.
 
 jshell.err.mode.name = Feedbackmodusname erwartet: {0}
 jshell.err.missing.mode = Feedbackmodus fehlt - {0}
@@ -118,101 +118,101 @@ jshell.err.mode.unknown = Kein Feedbackmodus benannt: {0} - {1}
 
 jshell.err.feedback.does.not.match.mode = Entspricht keinem aktuellen Feedbackmodus: {0} - {1}
 jshell.err.feedback.ambiguous.mode = Entspricht mehr als einem aktuellen Feedbackmodus: {0} - {1}
-jshell.err.feedback.must.be.quoted = Format "{0}" muss in Anf\u00FChrungszeichen gesetzt werden - {1}
-jshell.err.feedback.not.a.valid.selector = Kein g\u00FCltiger Selektor "{0}" in "{1}" - {2}
+jshell.err.feedback.must.be.quoted = Format "{0}" muss in Anführungszeichen gesetzt werden - {1}
+jshell.err.feedback.not.a.valid.selector = Kein gültiger Selektor "{0}" in "{1}" - {2}
 jshell.err.feedback.multiple.sections = Art des Selektors in mehreren Abschnitten der Selektorliste "{0}" in "{1}" - {2}
 jshell.err.feedback.different.selector.kinds = Unterschiedliche Arten von Selektoren in denselben Abschnitten der Selektorliste "{0}" in "{1}" - {2}
 
 jshell.msg.feedback.new.mode = Neuen Feedbackmodus erstellt: {0}
 jshell.msg.feedback.mode = Feedbackmodus: {0}
-jshell.msg.feedback.mode.following = Verf\u00FCgbare Feedbackmodi:
+jshell.msg.feedback.mode.following = Verfügbare Feedbackmodi:
 jshell.msg.feedback.retained.mode.following = Beibehaltene Feedbackmodi:
 jshell.err.mode.creation = Zum Erstellen eines neuen Modus muss entweder die Option -command oder die Option -quiet verwendet werden - {0}
 jshell.err.mode.exists = Zu erstellender Modus ist bereits vorhanden: {0} - {1}
 
-jshell.err.truncation.expected.length = Erwartete Abschneidel\u00E4nge - {0}
-jshell.err.truncation.length.not.integer = Abschneidel\u00E4nge muss eine Ganzzahl sein: {0} - {1}
+jshell.err.truncation.expected.length = Erwartete Abschneidelänge - {0}
+jshell.err.truncation.length.not.integer = Abschneidelänge muss eine Ganzzahl sein: {0} - {1}
 
-jshell.err.not.valid.with.predefined.mode = Nicht g\u00FCltig mit einem vordefinierten Modus: {0} - {1}
-jshell.err.retained.feedback.mode.must.be.retained.or.predefined = F\u00FCr "/set feedback -retain <Modus>" muss <Modus> vordefiniert werden oder mit "/set mode -retain" beibehalten worden sein - {0}
+jshell.err.not.valid.with.predefined.mode = Nicht gültig mit einem vordefinierten Modus: {0} - {1}
+jshell.err.retained.feedback.mode.must.be.retained.or.predefined = Für "/set feedback -retain <Modus>" muss <Modus> vordefiniert werden oder mit "/set mode -retain" beibehalten worden sein - {0}
 
 jshell.err.unknown.option = Unbekannte Option: {0} - {1}
 jshell.err.default.option.or.program = Geben Sie Option -default, Option -delete oder das Programm an - {0}
 jshell.err.option.or.filename = Geben Sie maximal eine der Optionen -default, -none oder einen Startdateinamen an - {0}
 jshell.err.unexpected.at.end = Unerwartete Argumente am Ende des Befehls: {0} - {1}
 jshell.err.conflicting.options = Nicht miteinander vereinbare Optionen - {0}
-jshell.err.cannot.delete.current.mode = Der aktuelle Feedbackmodus "{0}" kann nicht gel\u00F6scht werden. Verwenden Sie zun\u00E4chst "/set feedback" - {1}
-jshell.err.cannot.delete.retained.mode = Der beibehaltene Feedbackmodus "{0}" kann nicht gel\u00F6scht werden. Verwenden Sie zun\u00E4chst "/set feedback -retain" - {1}
-jshell.err.may.not.specify.options.and.snippets = Optionen und Snippets d\u00FCrfen nicht gemeinsam verwendet werden: {0}
+jshell.err.cannot.delete.current.mode = Der aktuelle Feedbackmodus "{0}" kann nicht gelöscht werden. Verwenden Sie zunächst "/set feedback" - {1}
+jshell.err.cannot.delete.retained.mode = Der beibehaltene Feedbackmodus "{0}" kann nicht gelöscht werden. Verwenden Sie zunächst "/set feedback -retain" - {1}
+jshell.err.may.not.specify.options.and.snippets = Optionen und Snippets dürfen nicht gemeinsam verwendet werden: {0}
 jshell.err.no.such.snippets = Snippet nicht vorhanden: {0}
 jshell.err.the.snippet.cannot.be.used.with.this.command = Dieser Befehl akzeptiert das Snippet "{0}" nicht: {1}
-jshell.err.retained.mode.failure = Fehler in beibehaltenen Modi (Modi gel\u00F6scht) - {0} {1}
+jshell.err.retained.mode.failure = Fehler in beibehaltenen Modi (Modi gelöscht) - {0} {1}
 
-jshell.err.corrupted.stored.startup = Gespeicherter Start besch\u00E4digt. Standardwert wird verwendet - {0}
+jshell.err.corrupted.stored.startup = Gespeicherter Start beschädigt. Standardwert wird verwendet - {0}
 
 jshell.err.exception.thrown = Ausnahme {0}
 jshell.err.exception.thrown.message = Ausnahme {0}: {1}
 jshell.err.exception.cause = Verursacht von: {0}
 jshell.err.exception.cause.message = Verursacht von: {0}: {1}
 
-jshell.console.see.synopsis = <Erneut Tabulatortaste dr\u00FCcken, um Zusammenfassung anzuzeigen>
-jshell.console.see.full.documentation = <Erneut Tabulatortaste dr\u00FCcken, um vollst\u00E4ndige Dokumentation anzuzeigen>
-jshell.console.see.documentation = <Erneut Tabulatortaste dr\u00FCcken, um Dokumentation anzuzeigen>
-jshell.console.see.next.page = <Erneut Tabulatortaste dr\u00FCcken, um n\u00E4chste Seite anzuzeigen>
-jshell.console.see.next.javadoc = <Tabulatortaste dr\u00FCcken, um n\u00E4chste Dokumentation anzuzeigen>
-jshell.console.see.next.command.doc = <Tabulatortaste dr\u00FCcken, um n\u00E4chsten Befehl anzuzeigen>
+jshell.console.see.synopsis = <Erneut Tabulatortaste drücken, um Zusammenfassung anzuzeigen>
+jshell.console.see.full.documentation = <Erneut Tabulatortaste drücken, um vollständige Dokumentation anzuzeigen>
+jshell.console.see.documentation = <Erneut Tabulatortaste drücken, um Dokumentation anzuzeigen>
+jshell.console.see.next.page = <Erneut Tabulatortaste drücken, um nächste Seite anzuzeigen>
+jshell.console.see.next.javadoc = <Tabulatortaste drücken, um nächste Dokumentation anzuzeigen>
+jshell.console.see.next.command.doc = <Tabulatortaste drücken, um nächsten Befehl anzuzeigen>
 jshell.console.no.such.command = Befehl nicht vorhanden
 jshell.console.completion.current.signatures = Signaturen:
-jshell.console.completion.all.completions.number = <Erneut Tabulatortaste dr\u00FCcken, um alle m\u00F6glichen Abschl\u00FCsse anzuzeigen. Insgesamt m\u00F6gliche Abschl\u00FCsse: {0}>
-jshell.console.completion.all.completions = <Erneut Tabulatortaste dr\u00FCcken, um alle m\u00F6glichen Abschl\u00FCsse anzuzeigen>
+jshell.console.completion.all.completions.number = <Erneut Tabulatortaste drücken, um alle möglichen Abschlüsse anzuzeigen. Insgesamt mögliche Abschlüsse: {0}>
+jshell.console.completion.all.completions = <Erneut Tabulatortaste drücken, um alle möglichen Abschlüsse anzuzeigen>
 jshell.console.no.javadoc = <Keine Dokumentation gefunden>
 jshell.console.do.nothing = Nichts machen
 jshell.console.choice = Auswahl:\u0020
 jshell.console.create.variable = Variable erstellen
 jshell.console.create.method = Methode erstellen
-jshell.console.resolvable = \nDie ID kann in diesem Kontext aufgel\u00F6st werden.
-jshell.console.no.candidate = \nKeine vollqualifizierten Kandidatennamen f\u00FCr Import gefunden.
-jshell.console.incomplete = \nErgebnisse sind m\u00F6glicherweise unvollst\u00E4ndig. Wiederholen Sie den Vorgang sp\u00E4ter, um vollst\u00E4ndige Ergebnisse zu erhalten.
-jshell.console.erroneous = \nUnvollst\u00E4ndig oder fehlerhaft. Ein einzelner g\u00FCltiger Ausdruck oder eine einzelne g\u00FCltige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
-jshell.console.exprstmt = \nEin einzelner g\u00FCltiger Ausdruck oder eine einzelne g\u00FCltige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
-jshell.console.empty = \nLeerer Eintrag. Ein einzelner g\u00FCltiger Ausdruck oder eine einzelne g\u00FCltige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
+jshell.console.resolvable = \nDie ID kann in diesem Kontext aufgelöst werden.
+jshell.console.no.candidate = \nKeine vollqualifizierten Kandidatennamen für Import gefunden.
+jshell.console.incomplete = \nErgebnisse sind möglicherweise unvollständig. Wiederholen Sie den Vorgang später, um vollständige Ergebnisse zu erhalten.
+jshell.console.erroneous = \nUnvollständig oder fehlerhaft. Ein einzelner gültiger Ausdruck oder eine einzelne gültige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
+jshell.console.exprstmt = \nEin einzelner gültiger Ausdruck oder eine einzelne gültige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
+jshell.console.empty = \nLeerer Eintrag. Ein einzelner gültiger Ausdruck oder eine einzelne gültige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
 
-jshell.fix.wrong.shortcut =Unerwartetes Zeichen nach Umschalt+Tab.\nVerwenden Sie "I" f\u00FCr automatischen Import, "V" zur Variablenerstellung oder "M" zur Methodenerstellung.\nWeitere Informationen finden Sie unter:\n/help shortcuts
+jshell.fix.wrong.shortcut =Unerwartetes Zeichen nach Umschalt+Tab.\nVerwenden Sie "I" für automatischen Import, "V" zur Variablenerstellung oder "M" zur Methodenerstellung.\nWeitere Informationen finden Sie unter:\n/help shortcuts
 
-help.usage = Verwendung:   jshell <Option>... <Ladedatei>...\nM\u00F6gliche Optionen:\n    --class-path <Pfad>   Gibt an, wo die Benutzerklassendateien gespeichert sind\n    --module-path <Pfad>  Gibt an, wo die Anwendungsmodule gespeichert sind\n    --add-modules <Modul>(,<Modul>)*\n                          Gibt aufzul\u00F6sende Module oder alle Module im\n                            Modulpfad an, wenn <Modul> ALL-MODULE-PATHs lautet\n    --enable-native-access\n                          Erm\u00F6glicht Ausf\u00FChrung eingeschr\u00E4nkter nativer Methoden durch Code\n    --enable-preview      Code kann Vorschaufeatures in diesem Release nutzen\n    --startup <Datei>      Ersetzung der Startdefinitionen mit einer Ausf\u00FChrung\n    --no-startup          Startdefinitionen werden nicht ausgef\u00FChrt\n    --feedback <Modus>     Gibt den anf\u00E4nglichen Feedbackmodus an. Der Modus kann\n                            vordefiniert (Silent, Concise, Normal oder Verbose) oder\n                            vorab benutzerdefiniert sein\n    -q                    Stilles Feedback. Identisch mit: --feedback concise\n    -s                    \u00C4u\u00DFerst stilles Feedback. Identisch mit: --feedback silent\n    -v                    Verbose-Feedback. Identisch mit: --feedback verbose\n    -J<Kennzeichen>              \u00DCbergibt <Kennzeichen> direkt an das Laufzeitsystem.\n                            Verwenden Sie ein -J pro Laufzeitkennzeichen oder Kennzeichenargument\n    -R<Kennzeichen>              \u00DCbergibt <Kennzeichen> an das Remotelaufzeitsystem.\n                            Verwenden Sie ein -R pro Remotekennzeichen oder Kennzeichenargument\n    -C<Kennzeichen>              \u00DCbergibt <Kennzeichen> an den Compiler.\n                            Verwenden Sie ein -C pro Compiler-Kennzeichen oder Kennzeichenargument\n    --version             Gibt Versionsinformationen aus und beendet den Vorgang\n    --show-version        Gibt Versionsinformationen aus und setzt den Vorgang fort\n    --help, -?, -h        Gibt diese Zusammenfassung der Standardoptionen aus und beendet den Vorgang\n    --help-extra, -X      Gibt Hilfetext zu Nicht-Standardoptionen aus und beendet den Vorgang\n\nEin Dateiargument kann ein Dateiname oder einer der vordefinierten Dateinamen sein: DEFAULT,\nPRINTING, TOOLING oder JAVASE.\nEine Ladedatei kann auch "-" zur Angabe einer Standardeingabe ohne interaktiven I/O sein.\n\nWeitere Informationen zu den Auswertungskontextoptionen (--class-path,\n--module-path und --add-modules) finden Sie unter:\n\t/help context\n\nEin Pfad listet die zu durchsuchenden Verzeichnisse und Archive auf. Verwenden Sie unter Windows ein\nSemikolon (;), um Elemente im Pfad zu trennen. Verwenden Sie auf anderen Plattformen einen\nDoppelpunkt (:), um Elemente zu trennen.\n
-help.usage.x = \    --add-exports <Modul>/<Package>   Gibt ein Package an, das als\n                                         Export aus seinem definierenden Modul gelten soll \n    --execution <Spezifikation>                 Gibt eine alternative Ausf\u00FChrungs-Engine an.\n                                         Dabei gilt: <Spezifikation> ist eine ExecutionControl-Spezifikation.\n                                         In der Dokumentation zu dem Package\n                                         jdk.jshell.spi finden Sie Informationen zur Syntax der Spezifikation\n    \nDies sind keine Standardoptionen und k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.\n
+help.usage = Verwendung:   jshell <Option>... <Ladedatei>...\nMögliche Optionen:\n    --class-path <Pfad>   Gibt an, wo die Benutzerklassendateien gespeichert sind\n    --module-path <Pfad>  Gibt an, wo die Anwendungsmodule gespeichert sind\n    --add-modules <Modul>(,<Modul>)*\n                          Gibt aufzulösende Module oder alle Module im\n                            Modulpfad an, wenn <Modul> ALL-MODULE-PATHs lautet\n    --enable-native-access\n                          Ermöglicht Ausführung eingeschränkter nativer Methoden durch Code\n    --enable-preview      Code kann Vorschaufeatures in diesem Release nutzen\n    --startup <Datei>      Ersetzung der Startdefinitionen mit einer Ausführung\n    --no-startup          Startdefinitionen werden nicht ausgeführt\n    --feedback <Modus>     Gibt den anfänglichen Feedbackmodus an. Der Modus kann\n                            vordefiniert (Silent, Concise, Normal oder Verbose) oder\n                            vorab benutzerdefiniert sein\n    -q                    Stilles Feedback. Identisch mit: --feedback concise\n    -s                    Äußerst stilles Feedback. Identisch mit: --feedback silent\n    -v                    Verbose-Feedback. Identisch mit: --feedback verbose\n    -J<Kennzeichen>              Übergibt <Kennzeichen> direkt an das Laufzeitsystem.\n                            Verwenden Sie ein -J pro Laufzeitkennzeichen oder Kennzeichenargument\n    -R<Kennzeichen>              Übergibt <Kennzeichen> an das Remotelaufzeitsystem.\n                            Verwenden Sie ein -R pro Remotekennzeichen oder Kennzeichenargument\n    -C<Kennzeichen>              Übergibt <Kennzeichen> an den Compiler.\n                            Verwenden Sie ein -C pro Compiler-Kennzeichen oder Kennzeichenargument\n    --version             Gibt Versionsinformationen aus und beendet den Vorgang\n    --show-version        Gibt Versionsinformationen aus und setzt den Vorgang fort\n    --help, -?, -h        Gibt diese Zusammenfassung der Standardoptionen aus und beendet den Vorgang\n    --help-extra, -X      Gibt Hilfetext zu Nicht-Standardoptionen aus und beendet den Vorgang\n\nEin Dateiargument kann ein Dateiname oder einer der vordefinierten Dateinamen sein: DEFAULT,\nPRINTING, TOOLING oder JAVASE.\nEine Ladedatei kann auch "-" zur Angabe einer Standardeingabe ohne interaktiven I/O sein.\n\nWeitere Informationen zu den Auswertungskontextoptionen (--class-path,\n--module-path und --add-modules) finden Sie unter:\n\t/help context\n\nEin Pfad listet die zu durchsuchenden Verzeichnisse und Archive auf. Verwenden Sie unter Windows ein\nSemikolon (;), um Elemente im Pfad zu trennen. Verwenden Sie auf anderen Plattformen einen\nDoppelpunkt (:), um Elemente zu trennen.\n
+help.usage.x = \    --add-exports <Modul>/<Package>   Gibt ein Package an, das als\n                                         Export aus seinem definierenden Modul gelten soll \n    --execution <Spezifikation>                 Gibt eine alternative Ausführungs-Engine an.\n                                         Dabei gilt: <Spezifikation> ist eine ExecutionControl-Spezifikation.\n                                         In der Dokumentation zu dem Package\n                                         jdk.jshell.spi finden Sie Informationen zur Syntax der Spezifikation\n    \nDies sind keine Standardoptionen und können jederzeit ohne vorherige Ankündigung geändert werden.\n
 
 help.list.summary = Listet die eingegebene Quelle auf
 help.list.args = [<Name oder ID>|-all|-start]
-help.list =Zeigt die Snippets mit vorangestellten Snippet-IDs an.\n\n/list\n\tListet die derzeit aktiven Code-Snippets auf, die Sie eingegeben oder mit /open eingelesen haben\n\n/list -start\n\tListet die ausgewerteten Start-Snippets auf\n\n/list -all\n\tListet alle Snippets auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Start-Snippets\n\n/list <Name>\n\tListet Snippets mit dem angegebenen Namen auf (aktive Snippets werden bevorzugt aufgef\u00FChrt)\n\n/list <ID>\n\tF\u00FChrt das Snippet mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
+help.list =Zeigt die Snippets mit vorangestellten Snippet-IDs an.\n\n/list\n\tListet die derzeit aktiven Code-Snippets auf, die Sie eingegeben oder mit /open eingelesen haben\n\n/list -start\n\tListet die ausgewerteten Start-Snippets auf\n\n/list -all\n\tListet alle Snippets auf, einschließlich aller nicht erfolgreichen, überschriebenen, gelöschten und Start-Snippets\n\n/list <Name>\n\tListet Snippets mit dem angegebenen Namen auf (aktive Snippets werden bevorzugt aufgeführt)\n\n/list <ID>\n\tFührt das Snippet mit der angegebenen Snippet-ID auf.\n\tEs können mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
 
 help.edit.summary = Bearbeitet einen Quelleintrag
 help.edit.args = <Name oder ID>
-help.edit =Bearbeitet ein oder mehrere Code-Snippets in einem externen Editor.\nDer zu verwendende Editor wird mit /set editor festgelegt. Wenn kein Editor festgelegt wird, werden\ndie folgenden Umgebungsvariablen in der folgenden Reihenfolge gepr\u00FCft: JSHELLEDITOR, VISUAL\nund EDITOR. Wenn kein Editor und auch keine der Editorumgebungsvariablen festgelegt wurde,\nwird ein einfacher Editor gestartet.\n\n/edit <Name>\n\tBearbeitet die Snippets mit den angegebenen Namen (aktive Snippets werden bevorzugt aufgef\u00FChrt)\n\n/edit <ID>\n\tBearbeitet das Snippet mit der angegebenen Snippet-ID.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/edit -start\n\tBearbeitet die Start-Snippets. Vorgenommene \u00C4nderungen gelten nur f\u00FCr diese Session und\n\twirken sich nicht auf die Starteinstellung aus\n\n/edit -all\n\tBearbeitet alle Snippets, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Start-Snippets\n\n/edit\n\tBearbeitet das derzeit aktive Code-Snippet, das Sie eingegeben oder mit /open eingelesen haben
+help.edit =Bearbeitet ein oder mehrere Code-Snippets in einem externen Editor.\nDer zu verwendende Editor wird mit /set editor festgelegt. Wenn kein Editor festgelegt wird, werden\ndie folgenden Umgebungsvariablen in der folgenden Reihenfolge geprüft: JSHELLEDITOR, VISUAL\nund EDITOR. Wenn kein Editor und auch keine der Editorumgebungsvariablen festgelegt wurde,\nwird ein einfacher Editor gestartet.\n\n/edit <Name>\n\tBearbeitet die Snippets mit den angegebenen Namen (aktive Snippets werden bevorzugt aufgeführt)\n\n/edit <ID>\n\tBearbeitet das Snippet mit der angegebenen Snippet-ID.\n\tEs können mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/edit -start\n\tBearbeitet die Start-Snippets. Vorgenommene Änderungen gelten nur für diese Session und\n\twirken sich nicht auf die Starteinstellung aus\n\n/edit -all\n\tBearbeitet alle Snippets, einschließlich aller nicht erfolgreichen, überschriebenen, gelöschten und Start-Snippets\n\n/edit\n\tBearbeitet das derzeit aktive Code-Snippet, das Sie eingegeben oder mit /open eingelesen haben
 
-help.drop.summary = L\u00F6scht einen Quelleintrag
+help.drop.summary = Löscht einen Quelleintrag
 help.drop.args = <Name oder ID>
-help.drop =L\u00F6scht ein Snippet (deaktiviert es).\n\n/drop <Name>\n\tL\u00F6scht das Snippet mit dem angegebenen Namen\n\n/drop <ID>\n\tL\u00F6scht das Snippet mit der angegebenen Snippet-ID.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
+help.drop =Löscht ein Snippet (deaktiviert es).\n\n/drop <Name>\n\tLöscht das Snippet mit dem angegebenen Namen\n\n/drop <ID>\n\tLöscht das Snippet mit der angegebenen Snippet-ID.\n\tEs können mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
 
 help.save.summary = Speichert die Snippet-Quelle in einer Datei
 help.save.args = [-all|-history|-start] <Datei>
-help.save =Speichert die angegebenen Snippets und/oder Befehle in der angegebenen Datei.\n\n/save <Datei>\n\tSpeichert die Quelle derzeit aktiver Snippets in der Datei.\n\n/save -all <Datei>\n\tSpeichert die Quelle aller Snippets in der Datei.\n\tUmfasst die Quelle von \u00FCberschriebenem, nicht erfolgreichem und Startcode\n\n/save -history <Datei>\n\tSpeichert die sequenzielle Historie aller Befehle und Snippets, die seit dem\n\tStart des JShell-Tools eingegeben wurden.\n\n/save -start <Datei>\n\tSpeichert die aktuellen Startdefinitionen in der Datei\n\n/save <ID> <Datei>\n\tSpeichert das Snippet mit der angegebenen Snippet-ID.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
+help.save =Speichert die angegebenen Snippets und/oder Befehle in der angegebenen Datei.\n\n/save <Datei>\n\tSpeichert die Quelle derzeit aktiver Snippets in der Datei.\n\n/save -all <Datei>\n\tSpeichert die Quelle aller Snippets in der Datei.\n\tUmfasst die Quelle von überschriebenem, nicht erfolgreichem und Startcode\n\n/save -history <Datei>\n\tSpeichert die sequenzielle Historie aller Befehle und Snippets, die seit dem\n\tStart des JShell-Tools eingegeben wurden.\n\n/save -start <Datei>\n\tSpeichert die aktuellen Startdefinitionen in der Datei\n\n/save <ID> <Datei>\n\tSpeichert das Snippet mit der angegebenen Snippet-ID.\n\tEs können mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
 
-help.open.summary = \u00D6ffnet eine Datei als Quelleingabe
+help.open.summary = Öffnet eine Datei als Quelleingabe
 help.open.args = <Datei>
-help.open =Datei \u00F6ffnen und ihren Inhalt als Snippets und Befehle lesen.\n\n/open <file>\n\tAngegebene Datei als JShell-Tooleingabe lesen.\n/open <URL>\n\tAngegebene URL herunterladen und als JShell-Tooleingabe verwenden.\n\n<file> kann der Name einer Betriebssystemdatei oder einer der folgenden vordefinierten\nDateinamen sein: DEFAULT, PRINTING, TOOLING oder JAVASE.\nHierbei handelt es sich jeweils um: die Standardimport-Snippets (wie von -default verwendet),\nDefinitionen der Methoden-Snippets print(), println() und printf(),\nDefinitionen\nvon Methoden-Snippets, die JDK-Tools ausf\u00FChren, oder Importe aller Java SE-Packages.\n
+help.open =Datei öffnen und ihren Inhalt als Snippets und Befehle lesen.\n\n/open <file>\n\tAngegebene Datei als JShell-Tooleingabe lesen.\n/open <URL>\n\tAngegebene URL herunterladen und als JShell-Tooleingabe verwenden.\n\n<file> kann der Name einer Betriebssystemdatei oder einer der folgenden vordefinierten\nDateinamen sein: DEFAULT, PRINTING, TOOLING oder JAVASE.\nHierbei handelt es sich jeweils um: die Standardimport-Snippets (wie von -default verwendet),\nDefinitionen der Methoden-Snippets print(), println() und printf(),\nDefinitionen\nvon Methoden-Snippets, die JDK-Tools ausführen, oder Importe aller Java SE-Packages.\n
 
-help.vars.summary = Listet die deklarierten Variablen und ihre zugeh\u00F6rigen Werte auf
+help.vars.summary = Listet die deklarierten Variablen und ihre zugehörigen Werte auf
 help.vars.args = [<Name oder ID>|-all|-start]
-help.vars =Listet den Typ, Namen und Wert der eingegebenen Variablen auf.\n\n/vars\n\tListet den Typ, Namen und Wert der derzeit aktiven Variablen auf\n\n/vars <Name>\n\tListet Variablen mit dem angegebenen Namen auf (aktive Variablen werden bevorzugt aufgef\u00FChrt)\n\n/vars <ID>\n\tListet die Variable mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/vars -start\n\tListet die Variablen in den ausgewerteten Start-Snippets auf\n\n/vars -all\n\tListet alle Variablen auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Startvariablen
+help.vars =Listet den Typ, Namen und Wert der eingegebenen Variablen auf.\n\n/vars\n\tListet den Typ, Namen und Wert der derzeit aktiven Variablen auf\n\n/vars <Name>\n\tListet Variablen mit dem angegebenen Namen auf (aktive Variablen werden bevorzugt aufgeführt)\n\n/vars <ID>\n\tListet die Variable mit der angegebenen Snippet-ID auf.\n\tEs können mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/vars -start\n\tListet die Variablen in den ausgewerteten Start-Snippets auf\n\n/vars -all\n\tListet alle Variablen auf, einschließlich aller nicht erfolgreichen, überschriebenen, gelöschten und Startvariablen
 
-help.methods.summary = Listet die deklarierten Methoden und ihre zugeh\u00F6rigen Signaturen auf
+help.methods.summary = Listet die deklarierten Methoden und ihre zugehörigen Signaturen auf
 help.methods.args = [<Name oder ID>|-all|-start]
-help.methods =Listet den Namen, die Parametertypen und den R\u00FCckgabetyp der eingegebenen Methoden auf.\n\n/methods\n\tListet den Namen, die Parametertypen und den R\u00FCckgabetyp der derzeit aktiven Methoden auf\n\n/methods <Name>\n\tListet die Methoden mit dem angegebenen Namen auf (aktive Methoden werden bevorzugt aufgef\u00FChrt)\n\n/methods <ID>\n\tListet die Methode mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/methods -start\n\tListet die Methoden in den ausgewerteten Start-Snippets auf\n\n/methods -all\n\tListet alle Snippets auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Start-Snippets
+help.methods =Listet den Namen, die Parametertypen und den Rückgabetyp der eingegebenen Methoden auf.\n\n/methods\n\tListet den Namen, die Parametertypen und den Rückgabetyp der derzeit aktiven Methoden auf\n\n/methods <Name>\n\tListet die Methoden mit dem angegebenen Namen auf (aktive Methoden werden bevorzugt aufgeführt)\n\n/methods <ID>\n\tListet die Methode mit der angegebenen Snippet-ID auf.\n\tEs können mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/methods -start\n\tListet die Methoden in den ausgewerteten Start-Snippets auf\n\n/methods -all\n\tListet alle Snippets auf, einschließlich aller nicht erfolgreichen, überschriebenen, gelöschten und Start-Snippets
 
 help.types.summary = Listet die Typdeklarationen auf
 help.types.args =[<Name oder ID>|-all|-start]
-help.types =Listet eingegebene Klassen und Schnittstellen auf.\n\n/types\n\tListet die derzeit aktiven Typdeklarationen auf\n\n/types <Name>\n\tListet die Typdeklarationen mit dem angegebenen Namen auf (aktive Snippets werden bevorzugt aufgef\u00FChrt)\n\n/types <ID>\n\tListet die Typdeklaration mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/types -start\n\tListet die Typdeklarationen in den ausgewerteten Start-Snippets auf\n\n/types -all\n\tListet alle Typdeklarationen auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Starttypdeklarationen
+help.types =Listet eingegebene Klassen und Schnittstellen auf.\n\n/types\n\tListet die derzeit aktiven Typdeklarationen auf\n\n/types <Name>\n\tListet die Typdeklarationen mit dem angegebenen Namen auf (aktive Snippets werden bevorzugt aufgeführt)\n\n/types <ID>\n\tListet die Typdeklaration mit der angegebenen Snippet-ID auf.\n\tEs können mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/types -start\n\tListet die Typdeklarationen in den ausgewerteten Start-Snippets auf\n\n/types -all\n\tListet alle Typdeklarationen auf, einschließlich aller nicht erfolgreichen, überschriebenen, gelöschten und Starttypdeklarationen
 
 help.imports.summary = Listet die importierten Elemente auf
 help.imports.args =
@@ -220,19 +220,19 @@ help.imports =Listet die derzeit aktiven Importe auf. Dies umfasst Importe aus\n
 
 help.exit.summary = Beendet das JShell-Tool
 help.exit.args =[<Snippet mit ganzzahligem Ausdruck>]
-help.exit =Beendet das JShell-Tool. \u00C4nderungen werden nicht gespeichert.\nSpeichern Sie Ihre \u00C4nderungen, bevor Sie diesen Befehl ausf\u00FChren\n\n/exit\n\tBeendet das JShell-Tool. Der Beendigungsstatus ist null\n\n/exit <Snippet mit ganzzahligem Ausdruck>\n\tWertet das Snippet aus. Wenn das Snippet nicht erfolgreich oder kein ganzzahliger Ausdruck ist,\n\twird der Fehler angezeigt. Andernfalls wird das JShell-Tool mit dem\n\tAusdruckswert als Beendigungsstatus beendet
+help.exit =Beendet das JShell-Tool. Änderungen werden nicht gespeichert.\nSpeichern Sie Ihre Änderungen, bevor Sie diesen Befehl ausführen\n\n/exit\n\tBeendet das JShell-Tool. Der Beendigungsstatus ist null\n\n/exit <Snippet mit ganzzahligem Ausdruck>\n\tWertet das Snippet aus. Wenn das Snippet nicht erfolgreich oder kein ganzzahliger Ausdruck ist,\n\twird der Fehler angezeigt. Andernfalls wird das JShell-Tool mit dem\n\tAusdruckswert als Beendigungsstatus beendet
 
-help.reset.summary = Setzt das JShell-Tool zur\u00FCck
+help.reset.summary = Setzt das JShell-Tool zurück
 help.reset.args = [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>]...
-help.reset =Setzt den Code und den Ausf\u00FChrungsstatus des JShell-Tools zur\u00FCck:\n\t* Der gesamte eingegebene Code geht verloren\n\t* Der Ausf\u00FChrungsstatus wird neu gestartet\n\t* Der Startcode wird erneut ausgef\u00FChrt\nSpeichern Sie Ihre \u00C4nderungen, bevor Sie diesen Befehl verwenden.\nDer /reset-Befehl akzeptiert Auswertungskontextoptionen, siehe:\n\n\t/help context\n
+help.reset =Setzt den Code und den Ausführungsstatus des JShell-Tools zurück:\n\t* Der gesamte eingegebene Code geht verloren\n\t* Der Ausführungsstatus wird neu gestartet\n\t* Der Startcode wird erneut ausgeführt\nSpeichern Sie Ihre Änderungen, bevor Sie diesen Befehl verwenden.\nDer /reset-Befehl akzeptiert Auswertungskontextoptionen, siehe:\n\n\t/help context\n
 
-help.reload.summary = Setzt die relevante Historie (derzeitige oder vorherige) zur\u00FCck und gibt sie erneut wieder (-restore)
+help.reload.summary = Setzt die relevante Historie (derzeitige oder vorherige) zurück und gibt sie erneut wieder (-restore)
 help.reload.args = [-restore] [-quiet] [-class-path <Pfad>] [-module-path <Pfad>]...
-help.reload =Setzt den Code und den Ausf\u00FChrungsstatus des JShell-Tools zur\u00FCck und gibt anschlie\u00DFend jedes g\u00FCltige Snippet\nsowie alle /drop-Befehle in der Reihenfolge wieder, in der sie eingegeben wurden.\n\n/reload\n\tDient zum Zur\u00FCcksetzen und Wiedergeben der g\u00FCltigen Historie seit Starten des JShell-Tools bzw.\n\tseit Ausf\u00FChrung eines /reset- oder /reload-Befehls - je nachdem, was\n\tals Letztes erfolgt ist\n\n/reload -restore\n\tDient zum Zur\u00FCcksetzen und Wiedergeben der g\u00FCltigen Historie zwischen dem vorherigen und aktuellen\n\tStarten des JShell-Tools bzw. der Ausf\u00FChrung eines /reset-, /reload- oder /env-\n\tBefehls. Diese Wiedergabe kann somit zum Wiederherstellen einer vorherigen\n\tJShell-Toolsession verwendet werden\n\n/reload [-restore] -quiet\n\tMit dem Argument "-quiet" wird die Wiedergabe nicht angezeigt, etwaige Fehler\n\thingegen schon\n\nJeder der obigen Befehle akzeptiert Auswertungskontextoptionen, siehe:\n\n\t/help context\n\nBeispiel:\n\n\t/reload -add-modules com.greetings -restore
+help.reload =Setzt den Code und den Ausführungsstatus des JShell-Tools zurück und gibt anschließend jedes gültige Snippet\nsowie alle /drop-Befehle in der Reihenfolge wieder, in der sie eingegeben wurden.\n\n/reload\n\tDient zum Zurücksetzen und Wiedergeben der gültigen Historie seit Starten des JShell-Tools bzw.\n\tseit Ausführung eines /reset- oder /reload-Befehls - je nachdem, was\n\tals Letztes erfolgt ist\n\n/reload -restore\n\tDient zum Zurücksetzen und Wiedergeben der gültigen Historie zwischen dem vorherigen und aktuellen\n\tStarten des JShell-Tools bzw. der Ausführung eines /reset-, /reload- oder /env-\n\tBefehls. Diese Wiedergabe kann somit zum Wiederherstellen einer vorherigen\n\tJShell-Toolsession verwendet werden\n\n/reload [-restore] -quiet\n\tMit dem Argument "-quiet" wird die Wiedergabe nicht angezeigt, etwaige Fehler\n\thingegen schon\n\nJeder der obigen Befehle akzeptiert Auswertungskontextoptionen, siehe:\n\n\t/help context\n\nBeispiel:\n\n\t/reload -add-modules com.greetings -restore
 
-help.env.summary = Zeigt den Auswertungskonzept an oder \u00E4ndert ihn
+help.env.summary = Zeigt den Auswertungskonzept an oder ändert ihn
 help.env.args = [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>] ...
-help.env =Zeigt den Auswertungskontext an oder \u00E4ndert ihn. Der Auswertungskontext ist der Classpath,\nModulpfad usw.\n\n/env\n\tZeigt den Auswertungskontext als Kontextoptionen an\n\n/env [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>] ...\n\tDurch Festlegen mindestens einer Option wird der Auswertungskontext festgelegt. Wenn Snippets\n\tdefiniert wurden, wird der Ausf\u00FChrungsstatus auf den neuen Auswertungskontext\n\tzur\u00FCckgesetzt, und die Snippets werden erneut wiedergegeben. Die Wiedergabe wird nicht \n\tangezeigt, etwaige Fehler hingegen schon. Dies entspricht:\n\n\t\t/reload -quiet ...\n\nWeitere Einzelheiten zu Auswertungskontextoptionen finden Sie unter:\n\n\t/help context\n\nBeispiel:\n\n\t/env -add-modules com.greetings
+help.env =Zeigt den Auswertungskontext an oder ändert ihn. Der Auswertungskontext ist der Classpath,\nModulpfad usw.\n\n/env\n\tZeigt den Auswertungskontext als Kontextoptionen an\n\n/env [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>] ...\n\tDurch Festlegen mindestens einer Option wird der Auswertungskontext festgelegt. Wenn Snippets\n\tdefiniert wurden, wird der Ausführungsstatus auf den neuen Auswertungskontext\n\tzurückgesetzt, und die Snippets werden erneut wiedergegeben. Die Wiedergabe wird nicht \n\tangezeigt, etwaige Fehler hingegen schon. Dies entspricht:\n\n\t\t/reload -quiet ...\n\nWeitere Einzelheiten zu Auswertungskontextoptionen finden Sie unter:\n\n\t/help context\n\nBeispiel:\n\n\t/env -add-modules com.greetings
 
 help.history.summary = Historie Ihrer Eingaben
 help.history.args = [-all]
@@ -240,83 +240,83 @@ help.history =Zeigt die Historie der Snippet- und Befehlseingaben an.\n\n/histor
 
 help.debug.summary = Schaltet Debugging des JShell-Tools um
 help.debug.args = [0][r][g][f][c][d][e]
-help.debug =Zeigt Debugginginformationen f\u00FCr die JShell-Toolimplementierung an.\n0: Debugging deaktiviert\nr: Debugging auf Toolebene aktiviert\ng: Allgemeines Debugging aktiviert\nf: Dateimanagerdebugging aktiviert\nc: Abschlussanalysedebugging aktiviert\nd: Abh\u00E4ngigkeitsdebugging aktiviert\ne: Ereignisdebugging aktiviert
+help.debug =Zeigt Debugginginformationen für die JShell-Toolimplementierung an.\n0: Debugging deaktiviert\nr: Debugging auf Toolebene aktiviert\ng: Allgemeines Debugging aktiviert\nf: Dateimanagerdebugging aktiviert\nc: Abschlussanalysedebugging aktiviert\nd: Abhängigkeitsdebugging aktiviert\ne: Ereignisdebugging aktiviert
 
 help.help.summary = Ruft Informationen zur Verwendung des JShell-Tools ab
 help.help.args = [<Befehl>|<Thema>]
-help.help =Zeigt Informationen zur Verwendung des JShell-Tools an.\n/help\n\tListet die Befehle und Hilfethemen des JShell-Tools auf\n\n/help <Befehl>\n\tZeigt Informationen zum angegebenen Befehl an.\n\tNur die ersten paar Buchstaben des Befehls werden ben\u00F6tigt - bei mehr als einer\n\t\u00DCbereinstimmung wird jede einzelne angezeigt. Beispiel: /help /li\n\n/help <Thema>\n\tZeigt Informationen zu dem angegebenen Hilfethema an. Beispiel: /help intro
+help.help =Zeigt Informationen zur Verwendung des JShell-Tools an.\n/help\n\tListet die Befehle und Hilfethemen des JShell-Tools auf\n\n/help <Befehl>\n\tZeigt Informationen zum angegebenen Befehl an.\n\tNur die ersten paar Buchstaben des Befehls werden benötigt - bei mehr als einer\n\tÜbereinstimmung wird jede einzelne angezeigt. Beispiel: /help /li\n\n/help <Thema>\n\tZeigt Informationen zu dem angegebenen Hilfethema an. Beispiel: /help intro
 
 help.set.summary = Legt Konfigurationsinformationen fest
 help.set.args = editor|start|feedback|mode|prompt|truncation|format ...
-help.set =Legt die Konfigurationsinformationen f\u00FCr das JShell-Tool fest, darunter:\nden zu verwendenden externen Editor, die zu verwendenden Startdefinitionen, einen neuen Feedbackmodus,\nden Befehls-Prompt, den zu verwendenden Feedbackmodus oder das Ausgabeformat.\n\n/set editor [-wait] <Befehl> <optionales Argument>...\n\tGibt den Befehl an, der f\u00FCr den /edit-Befehl gestartet werden soll.\n\tDer <Befehl> ist eine betriebssystemabh\u00E4ngige Zeichenfolge\n\n/set start <Datei>\n\tDer Inhalt der angegebenen <Datei> wird zu den Standardstart-Snippets und -befehlen\n\n/set feedback <Modus>\n\tLegt den Feedbackmodus fest, der das angezeigte Feedback f\u00FCr eingegebene Snippets und Befehle beschreibt\n\n/set mode <Modus> [<alter Modus>] -command|-quiet|-delete\n\tErstellt oder aktualisiert einen benutzerdefinierten Feedbackmodus. Optional kann er auch von einem vorhandenen Modus kopiert werden\n\n/set prompt <Modus> "<Prompt>" "<Fortsetzungs-Prompt>"\n\tLegt die angezeigten Prompts f\u00FCr einen angegebenen Feedbackmodus fest\n\n/set truncation <Modus> <L\u00E4nge> <Selektor>...\n\tLegt die maximale L\u00E4nge eines angezeigten Wertes fest\n\n/set format <Modus> <Feld> "<Format>" <Selektor>...\n\tKonfiguriert einen Feedbackmodus durch Festlegen des Formats eines Feldes, wenn der Selektor \u00FCbereinstimmt\n\n/set indent <Anzahl>\n\tLegt die Anzahl der Leerzeichen fest, mit denen Snippets automatisch einger\u00FCckt werden sollen\n\n/set\n\tZeigt Editor-, Start- und Feedbackeinstellungen als /set-Befehle an.\n\tLassen Sie den festgelegten Wert weg, um die Einstellungen eines der oben genannten Befehle anzuzeigen\n\nUm weitere Informationen zu einem dieser Formate zu erhalten, verwenden Sie /help mit dem angegebenen Format.\nBeispiel:   /help /set format
+help.set =Legt die Konfigurationsinformationen für das JShell-Tool fest, darunter:\nden zu verwendenden externen Editor, die zu verwendenden Startdefinitionen, einen neuen Feedbackmodus,\nden Befehls-Prompt, den zu verwendenden Feedbackmodus oder das Ausgabeformat.\n\n/set editor [-wait] <Befehl> <optionales Argument>...\n\tGibt den Befehl an, der für den /edit-Befehl gestartet werden soll.\n\tDer <Befehl> ist eine betriebssystemabhängige Zeichenfolge\n\n/set start <Datei>\n\tDer Inhalt der angegebenen <Datei> wird zu den Standardstart-Snippets und -befehlen\n\n/set feedback <Modus>\n\tLegt den Feedbackmodus fest, der das angezeigte Feedback für eingegebene Snippets und Befehle beschreibt\n\n/set mode <Modus> [<alter Modus>] -command|-quiet|-delete\n\tErstellt oder aktualisiert einen benutzerdefinierten Feedbackmodus. Optional kann er auch von einem vorhandenen Modus kopiert werden\n\n/set prompt <Modus> "<Prompt>" "<Fortsetzungs-Prompt>"\n\tLegt die angezeigten Prompts für einen angegebenen Feedbackmodus fest\n\n/set truncation <Modus> <Länge> <Selektor>...\n\tLegt die maximale Länge eines angezeigten Wertes fest\n\n/set format <Modus> <Feld> "<Format>" <Selektor>...\n\tKonfiguriert einen Feedbackmodus durch Festlegen des Formats eines Feldes, wenn der Selektor übereinstimmt\n\n/set indent <Anzahl>\n\tLegt die Anzahl der Leerzeichen fest, mit denen Snippets automatisch eingerückt werden sollen\n\n/set\n\tZeigt Editor-, Start- und Feedbackeinstellungen als /set-Befehle an.\n\tLassen Sie den festgelegten Wert weg, um die Einstellungen eines der oben genannten Befehle anzuzeigen\n\nUm weitere Informationen zu einem dieser Formate zu erhalten, verwenden Sie /help mit dem angegebenen Format.\nBeispiel:   /help /set format
 
 help.quest.summary = Ruft Informationen zur Verwendung des JShell-Tools ab
 help.quest.args = [<Befehl>|<Thema>]
-help.quest =Zeigt Informationen zur Verwendung des JShell-Tools an (Abk\u00FCrzung f\u00FCr /help).\n/?\n\tZeigt eine Liste der Befehle und Hilfethemen an\n/? <Befehl>\n\tZeigt Informationen zum angegebenen Befehl an.\n\tNur die ersten paar Buchstaben des Befehls werden ben\u00F6tigt - bei mehr als einer\n\t\u00DCbereinstimmung wird jeder einzelne angezeigt. Beispiel: /? /li\n\n/? <Thema>\n\tZeigt Informationen zu dem angegebenen Hilfethema an. Beispiel: /? intro
+help.quest =Zeigt Informationen zur Verwendung des JShell-Tools an (Abkürzung für /help).\n/?\n\tZeigt eine Liste der Befehle und Hilfethemen an\n/? <Befehl>\n\tZeigt Informationen zum angegebenen Befehl an.\n\tNur die ersten paar Buchstaben des Befehls werden benötigt - bei mehr als einer\n\tÜbereinstimmung wird jeder einzelne angezeigt. Beispiel: /? /li\n\n/? <Thema>\n\tZeigt Informationen zu dem angegebenen Hilfethema an. Beispiel: /? intro
 
-help.bang.summary = F\u00FChrt das letzte Snippet erneut aus, siehe: /help rerun
+help.bang.summary = Führt das letzte Snippet erneut aus, siehe: /help rerun
 help.bang.args =
 help.bang =Wertet das zuletzt eingegebene Snippet erneut aus.
 
-help.slashID.summary = F\u00FChrt Snippets nach ID oder ID-Bereich erneut aus, siehe: /help rerun
+help.slashID.summary = Führt Snippets nach ID oder ID-Bereich erneut aus, siehe: /help rerun
 help.slashID.args =
-help.slashID =/<id> <id> <id>\n\n/<id>-<id>\n\nWertet die durch die ID oder den ID-Bereich angegebenen Snippets erneut aus.\nEin ID-Bereich wird als zwei per Bindestrich getrennte IDs dargestellt. Beispiel:  3-17\nStart- und Fehler-Snippets k\u00F6nnen verwendet werden. Beispiel: s3-s9 oder e1-e4\nEs k\u00F6nnen beliebig viele IDs oder ID-Bereiche verwendet werden. Beispiel: /3-7 s4 14-16 e2\nSiehe "/help id".
+help.slashID =/<id> <id> <id>\n\n/<id>-<id>\n\nWertet die durch die ID oder den ID-Bereich angegebenen Snippets erneut aus.\nEin ID-Bereich wird als zwei per Bindestrich getrennte IDs dargestellt. Beispiel:  3-17\nStart- und Fehler-Snippets können verwendet werden. Beispiel: s3-s9 oder e1-e4\nEs können beliebig viele IDs oder ID-Bereiche verwendet werden. Beispiel: /3-7 s4 14-16 e2\nSiehe "/help id".
 
-help.previous.summary = F\u00FChrt das n-te vorherige Snippet erneut aus, siehe: /help rerun
+help.previous.summary = Führt das n-te vorherige Snippet erneut aus, siehe: /help rerun
 help.previous.args =
 help.previous =Wertet das n-te zuletzt eingegebene Snippet erneut aus.
 
-help.intro.summary = Einf\u00FChrung in das JShell-Tool
-help.intro =Mit dem JShell-Toll k\u00F6nnen Sie Java-Code ausf\u00FChren und umgehend Ergebnisse erhalten.\nSie k\u00F6nnen eine Java-Definition (Variable, Methode, Klasse usw.) wie int x = 8,\neinen Java-Ausdruck wie x + x,\neine Java-Anweisung oder einen Java-Import eingeben.\nDiese kleinen Java-Code-Chunks werden als "Snippets" bezeichnet.\n\nAu\u00DFerdem stehen Ihnen die JShell-Toolbefehle zur Verf\u00FCgung, mit denen Sie Ihr Vorgehen\nbesser verstehen und steuern k\u00F6nnen. Beispiel: /list\n\nEine Liste der Befehle k\u00F6nnen Sie aufrufen mit: /help
+help.intro.summary = Einführung in das JShell-Tool
+help.intro =Mit dem JShell-Toll können Sie Java-Code ausführen und umgehend Ergebnisse erhalten.\nSie können eine Java-Definition (Variable, Methode, Klasse usw.) wie int x = 8,\neinen Java-Ausdruck wie x + x,\neine Java-Anweisung oder einen Java-Import eingeben.\nDiese kleinen Java-Code-Chunks werden als "Snippets" bezeichnet.\n\nAußerdem stehen Ihnen die JShell-Toolbefehle zur Verfügung, mit denen Sie Ihr Vorgehen\nbesser verstehen und steuern können. Beispiel: /list\n\nEine Liste der Befehle können Sie aufrufen mit: /help
 
-help.keys.summary = Beschreibung der Readline-\u00E4hnlichen Eingabebearbeitung
-help.keys =Das JShell-Tool bietet Unterst\u00FCtzung f\u00FCr Zeilenbearbeitung, damit Sie in Snippets\nund Befehlen navigieren und diese bearbeiten k\u00F6nnen. Sie k\u00F6nnen den aktuellen Befehl/das aktuelle Snippet bearbeiten\noder vorherige Befehle/Snippets aus der Historie abrufen, bearbeiten und ausf\u00FChren.\nDiese Unterst\u00FCtzung \u00E4hnelt Readline/Editline mit einfachen Emacs-\u00E4hnlichen Bindings.\nEs gibt auch f\u00FCr das JShell-Tool spezifische Schl\u00FCsselsequenzen.\n\nZeilen- und Historiennavigation:\n\n\tEingabetaste\n\t\tGibt das aktuelle Snippet ein\n\tNach-links-Taste oder Strg+B\n\t\tNavigiert ein Zeichen zur\u00FCck\n\tNach-rechts-Taste oder Strg+F\n\t\tNavigiert ein Zeichen vorw\u00E4rts\n\tNach-oben-Taste oder Strg+P\n\t\tNavigiert eine Zeile nach oben, r\u00FCckw\u00E4rts in der Historie\n\tNach-unten-Taste oder Strg+N\n\t\tNavigiert eine Zeile nach unten, vorw\u00E4rts in der Historie\n\tStrg+A\n\t\tNavigiert an den Anfang der Zeile\n\tStrg+E\n\t\tNavigiert an das Ende der Zeile\n\tMeta+B\n\t\tNavigiert ein Wort zur\u00FCck\n\tMeta+F\n\t\tNavigiert ein Wort vorw\u00E4rts\n\tStrg+R\n\t\tDurchsucht die Historie r\u00FCckw\u00E4rts\n\n\nEinfache Zeilen- und Historienbearbeitung:\n\n\tMeta+Eingabetaste oder Strg+Eingabetaste (je nach Plattform)\n\t\tF\u00FCgt eine neue Zeile in das Snippet ein\n\tStrg+_ (f\u00FCr Unterstrich kann Umschalttaste erforderlich sein) oder Strg+X gefolgt von Strg+U\n\t\tMacht \u00C4nderung r\u00FCckg\u00E4ngig. Wiederholen Sie die Eingabe, um weitere \u00C4nderungen r\u00FCckg\u00E4ngig zu machen\n\tEntf\n\t\tL\u00F6scht das Zeichen bei dem oder hinter dem Cursor, je nach Betriebssystem\n\tR\u00FCcktaste\n\t\tL\u00F6scht das Zeichen vor dem Cursor\n\tStrg+K\n\t\tL\u00F6scht den Text vom Cursor bis zum Ende der Zeile\n\tMeta+D\n\t\tL\u00F6scht den Text vom Cursor bis zum Ende des Wortes\n\tStrg+W\n\t\tL\u00F6scht den Text vom Cursor bis zum vorangegangenen Leerzeichen\n\tStrg+Y\n\t\tF\u00FCgt den zuletzt gel\u00F6schten Text in die Zeile ein\n\tMeta+Y\n\t\tNach Strg+Y durchl\u00E4uft Meta+Y den zuletzt gel\u00F6schten Text\n\tStrg+X gefolgt von Strg+K\n\t\tL\u00F6scht das gesamte Snippet\n\n\nTastenkombinationen f\u00FCr JShell-Tool:\n\n\tWeitere Einzelheiten k\u00F6nnen Sie aufrufen \u00FCber: /help shortcuts\n\n\tTab\n\t\tSchlie\u00DFt Java-ID oder JShell-Befehl ab\n\tUmschalt+Tab gefolgt von V\n\t\tKonvertiert den Ausdruck in eine Variablendeklaration\n\tUmschalt+Tab gefolgt von M\n\t\tKonvertiert die Anweisung in eine Methodendeklaration\n\tUmschalt+Tab gefolgt von I\n\t\tF\u00FCgt Importe f\u00FCr diese ID hinzu\n\t\n\nWeitere Zeilen- und Historienbearbeitung:\n\n\tStrg+L\n\t\tBereinigt den Bildschirm und gibt das Snippet erneut aus\n\tStrg+U\n\t\tL\u00F6scht die gesamte Zeile\n\tStrg+T\n\t\tTransponiert Zeichen\n\tStrg+X gefolgt von Strg+B\n\t\tNavigiert zur entsprechenden Klammer, eckigen Klammer, ...\n\tStrg+X gefolgt von =\n\t\tAktiviert den Modus zum Anzeigen der aktuellen Zeichenposition\n\tStrg+X gefolgt von Strg+O\n\t\tSchaltet um zwischen \u00DCberschreiben und Einf\u00FCgen von Zeichen\n\tMeta+C\n\t\tSetzt Anfangsbuchstaben eines Wortes in Gro\u00DFbuchstaben\n\tMeta+U\n\t\tKonvertiert ein Wort in Gro\u00DFbuchstaben\n\tMeta+L\n\t\tKonvertiert ein Wort in Kleinbuchstaben\n\tMeta+0 bis Meta+9 gefolgt von Taste\n\t\tWiederholt den Vorgang die angegebene Anzahl von Malen\n\nDabei gilt z.B.: "Strg+A" bedeutet, dass Sie die Steuerungstaste gedr\u00FCckt halten und A dr\u00FCcken.\nAuf vielen Tastaturen ist die Taste "Meta" gleichbedeutend mit der Taste "Alt".\nUnterst\u00FCtzung f\u00FCr Zeilenbearbeitung wird von JLine 3 abgeleitet.
+help.keys.summary = Beschreibung der Readline-ähnlichen Eingabebearbeitung
+help.keys =Das JShell-Tool bietet Unterstützung für Zeilenbearbeitung, damit Sie in Snippets\nund Befehlen navigieren und diese bearbeiten können. Sie können den aktuellen Befehl/das aktuelle Snippet bearbeiten\noder vorherige Befehle/Snippets aus der Historie abrufen, bearbeiten und ausführen.\nDiese Unterstützung ähnelt Readline/Editline mit einfachen Emacs-ähnlichen Bindings.\nEs gibt auch für das JShell-Tool spezifische Schlüsselsequenzen.\n\nZeilen- und Historiennavigation:\n\n\tEingabetaste\n\t\tGibt das aktuelle Snippet ein\n\tNach-links-Taste oder Strg+B\n\t\tNavigiert ein Zeichen zurück\n\tNach-rechts-Taste oder Strg+F\n\t\tNavigiert ein Zeichen vorwärts\n\tNach-oben-Taste oder Strg+P\n\t\tNavigiert eine Zeile nach oben, rückwärts in der Historie\n\tNach-unten-Taste oder Strg+N\n\t\tNavigiert eine Zeile nach unten, vorwärts in der Historie\n\tStrg+A\n\t\tNavigiert an den Anfang der Zeile\n\tStrg+E\n\t\tNavigiert an das Ende der Zeile\n\tMeta+B\n\t\tNavigiert ein Wort zurück\n\tMeta+F\n\t\tNavigiert ein Wort vorwärts\n\tStrg+R\n\t\tDurchsucht die Historie rückwärts\n\n\nEinfache Zeilen- und Historienbearbeitung:\n\n\tMeta+Eingabetaste oder Strg+Eingabetaste (je nach Plattform)\n\t\tFügt eine neue Zeile in das Snippet ein\n\tStrg+_ (für Unterstrich kann Umschalttaste erforderlich sein) oder Strg+X gefolgt von Strg+U\n\t\tMacht Änderung rückgängig. Wiederholen Sie die Eingabe, um weitere Änderungen rückgängig zu machen\n\tEntf\n\t\tLöscht das Zeichen bei dem oder hinter dem Cursor, je nach Betriebssystem\n\tRücktaste\n\t\tLöscht das Zeichen vor dem Cursor\n\tStrg+K\n\t\tLöscht den Text vom Cursor bis zum Ende der Zeile\n\tMeta+D\n\t\tLöscht den Text vom Cursor bis zum Ende des Wortes\n\tStrg+W\n\t\tLöscht den Text vom Cursor bis zum vorangegangenen Leerzeichen\n\tStrg+Y\n\t\tFügt den zuletzt gelöschten Text in die Zeile ein\n\tMeta+Y\n\t\tNach Strg+Y durchläuft Meta+Y den zuletzt gelöschten Text\n\tStrg+X gefolgt von Strg+K\n\t\tLöscht das gesamte Snippet\n\n\nTastenkombinationen für JShell-Tool:\n\n\tWeitere Einzelheiten können Sie aufrufen über: /help shortcuts\n\n\tTab\n\t\tSchließt Java-ID oder JShell-Befehl ab\n\tUmschalt+Tab gefolgt von V\n\t\tKonvertiert den Ausdruck in eine Variablendeklaration\n\tUmschalt+Tab gefolgt von M\n\t\tKonvertiert die Anweisung in eine Methodendeklaration\n\tUmschalt+Tab gefolgt von I\n\t\tFügt Importe für diese ID hinzu\n\t\n\nWeitere Zeilen- und Historienbearbeitung:\n\n\tStrg+L\n\t\tBereinigt den Bildschirm und gibt das Snippet erneut aus\n\tStrg+U\n\t\tLöscht die gesamte Zeile\n\tStrg+T\n\t\tTransponiert Zeichen\n\tStrg+X gefolgt von Strg+B\n\t\tNavigiert zur entsprechenden Klammer, eckigen Klammer, ...\n\tStrg+X gefolgt von =\n\t\tAktiviert den Modus zum Anzeigen der aktuellen Zeichenposition\n\tStrg+X gefolgt von Strg+O\n\t\tSchaltet um zwischen Überschreiben und Einfügen von Zeichen\n\tMeta+C\n\t\tSetzt Anfangsbuchstaben eines Wortes in Großbuchstaben\n\tMeta+U\n\t\tKonvertiert ein Wort in Großbuchstaben\n\tMeta+L\n\t\tKonvertiert ein Wort in Kleinbuchstaben\n\tMeta+0 bis Meta+9 gefolgt von Taste\n\t\tWiederholt den Vorgang die angegebene Anzahl von Malen\n\nDabei gilt z.B.: "Strg+A" bedeutet, dass Sie die Steuerungstaste gedrückt halten und A drücken.\nAuf vielen Tastaturen ist die Taste "Meta" gleichbedeutend mit der Taste "Alt".\nUnterstützung für Zeilenbearbeitung wird von JLine 3 abgeleitet.
 
-help.shortcuts.summary = Beschreibung der Tastenanschl\u00E4ge f\u00FCr Snippet- und Befehlsabschluss,\nZugriff auf Informationen und automatische Codegenerierung
-help.shortcuts =Unterst\u00FCtzte Tastenkombinationen:\n\n\tTab\n\t\tDr\u00FCcken Sie nach Eingabe der ersten paar Buchstaben einer Java-ID,\n\t\teines JShell-Toolbefehls oder, in einigen F\u00E4llen, eines JShell-\n\t\tToolbefehlsarguments die Tabulatortaste, um die Eingabe abzuschlie\u00DFen.\n\t\tWenn mehrere Abschl\u00FCsse vorhanden sind, werden m\u00F6gliche Abschl\u00FCsse\n\t\tangezeigt.\n\t\tDurch erneutes Dr\u00FCcken der Tabulatortaste wird Dokumentation angezeigt, sofern vorhanden und relevant.\n\n\tUmschalt+Tab gefolgt von V\n\t\tHalten Sie nach einem abgeschlossenen Ausdruck die Umschalttaste gedr\u00FCckt,\n\t\tund dr\u00FCcken Sie die Tabulatortaste. Lassen Sie dann los, und dr\u00FCcken Sie die Taste V.\n\t\tDer Ausdruck wird in eine Variablendeklaration konvertiert, \n\t\tderen Typ auf dem Typ des Ausdrucks basiert.\n\n\tUmschalt+Tab gefolgt von M\n\t\tHalten Sie nach Abschluss eines Ausdrucks oder einer Anweisung die\n\t\tUmschalttaste gedr\u00FCckt, und dr\u00FCcken Sie die Tabulatortaste. Lassen Sie dann los, und dr\u00FCcken\n\t\tSie die Taste M. Der Ausdruck bzw. die Anweisung wird in eine\n\t\tMethodendeklaration konvertiert. Bei einem Ausdruck basiert der\n\t\tR\u00FCckgabetyp der Methode auf dem Typ des Ausdrucks.\n\n\tUmschalt+Tab gefolgt von I\n\t\tHalten Sie nach einer nicht aufl\u00F6sbaren ID die Umschalttaste gedr\u00FCckt,\n\t\tund dr\u00FCcken Sie die Tabulatortaste. Lassen Sie dann los, und dr\u00FCcken Sie die Taste I.\n\t\tDas JShell-Tool schl\u00E4gt daraufhin m\u00F6gliche Importe vor, die die\n\t\tID basierend auf dem Inhalt des angegebenen Classpath aufl\u00F6sen werden.\n\t\tGeben Sie die Ziffer ein, die dem gew\u00FCnschten Import entspricht,\n\t\toder dr\u00FCcken Sie die Taste 0, um keine Importe hinzuzuf\u00FCgen.\n\nInformationen zu weiteren Sondertasten k\u00F6nnen Sie aufrufen durch: /help keys
+help.shortcuts.summary = Beschreibung der Tastenanschläge für Snippet- und Befehlsabschluss,\nZugriff auf Informationen und automatische Codegenerierung
+help.shortcuts =Unterstützte Tastenkombinationen:\n\n\tTab\n\t\tDrücken Sie nach Eingabe der ersten paar Buchstaben einer Java-ID,\n\t\teines JShell-Toolbefehls oder, in einigen Fällen, eines JShell-\n\t\tToolbefehlsarguments die Tabulatortaste, um die Eingabe abzuschließen.\n\t\tWenn mehrere Abschlüsse vorhanden sind, werden mögliche Abschlüsse\n\t\tangezeigt.\n\t\tDurch erneutes Drücken der Tabulatortaste wird Dokumentation angezeigt, sofern vorhanden und relevant.\n\n\tUmschalt+Tab gefolgt von V\n\t\tHalten Sie nach einem abgeschlossenen Ausdruck die Umschalttaste gedrückt,\n\t\tund drücken Sie die Tabulatortaste. Lassen Sie dann los, und drücken Sie die Taste V.\n\t\tDer Ausdruck wird in eine Variablendeklaration konvertiert, \n\t\tderen Typ auf dem Typ des Ausdrucks basiert.\n\n\tUmschalt+Tab gefolgt von M\n\t\tHalten Sie nach Abschluss eines Ausdrucks oder einer Anweisung die\n\t\tUmschalttaste gedrückt, und drücken Sie die Tabulatortaste. Lassen Sie dann los, und drücken\n\t\tSie die Taste M. Der Ausdruck bzw. die Anweisung wird in eine\n\t\tMethodendeklaration konvertiert. Bei einem Ausdruck basiert der\n\t\tRückgabetyp der Methode auf dem Typ des Ausdrucks.\n\n\tUmschalt+Tab gefolgt von I\n\t\tHalten Sie nach einer nicht auflösbaren ID die Umschalttaste gedrückt,\n\t\tund drücken Sie die Tabulatortaste. Lassen Sie dann los, und drücken Sie die Taste I.\n\t\tDas JShell-Tool schlägt daraufhin mögliche Importe vor, die die\n\t\tID basierend auf dem Inhalt des angegebenen Classpath auflösen werden.\n\t\tGeben Sie die Ziffer ein, die dem gewünschten Import entspricht,\n\t\toder drücken Sie die Taste 0, um keine Importe hinzuzufügen.\n\nInformationen zu weiteren Sondertasten können Sie aufrufen durch: /help keys
 
-help.context.summary = Beschreibung der Auswertungskontextoptionen f\u00FCr /env /reload und /reset
-help.context =Mit diesen Optionen wird der Auswertungskontext konfiguriert. Sie k\u00F6nnen beim Starten des \nJShell-Tools in der Befehlszeile oder beim Neustarten des JShell-Tools mit den Befehlen\n/env, /reload oder /reset als Befehlsoptionen angegeben werden.\n\nSie lauten:\n\t--class-path <Pfad>\n\t\tDer <Pfad> ist eine Liste von Verzeichnissen, JAR-Archiven\n\t\tund ZIP-Archiven, die nach Klassendateien durchsucht werden sollen.\n\t\tVerwenden Sie unter Windows ein Semikolon (;), um Elemente im Pfad\n\t\tzu trennen. Verwenden Sie auf anderen Plattformen einen Doppelpunkt (:), um Elemente zu trennen.\n\t--module-path <Pfad>...\n\t\tDer <Pfad> ist eine Liste von Verzeichnissen, JAR-Archiven\n\t\tund ZIP-Archiven, die nach Modulen durchsucht werden sollen.\n\t\tVerwenden Sie unter Windows ein Semikolon (;), um Elemente im Pfad\n\t\tzu trennen. Verwenden Sie auf anderen Plattformen einen Doppelpunkt (:), um Elemente zu trennen.\n\t--add-modules <Modulname>[,<Modulname>...]\n\t\tRoot-Module, die zus\u00E4tzlich zum Ausgangsmodul aufgel\u00F6st werden sollen.\n\t\t<Modulname> kann auch ALL-DEFAULT, ALL-SYSTEM,\n\t\tALL-MODULE-PATH sein.\n\t--add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n\t\taktualisiert <Modul>, um <Package> in <Zielmodul> zu exportieren,\n\t\tunabh\u00E4ngig von der Moduldeklaration.\n\t\t<Zielmodul> kann ALL-UNNAMED sein, um in alle unbenannten\n\t\tModule zu exportieren. Wenn in JShell das <Zielmodul> nicht angegeben\n\t\twird (no =), wird ALL-UNNAMED verwendet.\n\nAuswertungskontextoptionen, die in der Befehlszeile eingegeben oder mit einem vorherigen\n/reset-, /env- oder /reload-Befehl angegeben werden, werden beibehalten, es sei denn,\nes wird eine Option eingegeben, die die Einstellung au\u00DFer Kraft setzt.\n\nIn der Befehlszeile ben\u00F6tigen diese Optionen zwei Bindestriche. Beispiel: --module-path\nIn den JShell-Toolbefehlen k\u00F6nnen sie ein oder zwei Bindestriche aufweisen. Beispiel: -module-path
+help.context.summary = Beschreibung der Auswertungskontextoptionen für /env /reload und /reset
+help.context =Mit diesen Optionen wird der Auswertungskontext konfiguriert. Sie können beim Starten des \nJShell-Tools in der Befehlszeile oder beim Neustarten des JShell-Tools mit den Befehlen\n/env, /reload oder /reset als Befehlsoptionen angegeben werden.\n\nSie lauten:\n\t--class-path <Pfad>\n\t\tDer <Pfad> ist eine Liste von Verzeichnissen, JAR-Archiven\n\t\tund ZIP-Archiven, die nach Klassendateien durchsucht werden sollen.\n\t\tVerwenden Sie unter Windows ein Semikolon (;), um Elemente im Pfad\n\t\tzu trennen. Verwenden Sie auf anderen Plattformen einen Doppelpunkt (:), um Elemente zu trennen.\n\t--module-path <Pfad>...\n\t\tDer <Pfad> ist eine Liste von Verzeichnissen, JAR-Archiven\n\t\tund ZIP-Archiven, die nach Modulen durchsucht werden sollen.\n\t\tVerwenden Sie unter Windows ein Semikolon (;), um Elemente im Pfad\n\t\tzu trennen. Verwenden Sie auf anderen Plattformen einen Doppelpunkt (:), um Elemente zu trennen.\n\t--add-modules <Modulname>[,<Modulname>...]\n\t\tRoot-Module, die zusätzlich zum Ausgangsmodul aufgelöst werden sollen.\n\t\t<Modulname> kann auch ALL-DEFAULT, ALL-SYSTEM,\n\t\tALL-MODULE-PATH sein.\n\t--add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n\t\taktualisiert <Modul>, um <Package> in <Zielmodul> zu exportieren,\n\t\tunabhängig von der Moduldeklaration.\n\t\t<Zielmodul> kann ALL-UNNAMED sein, um in alle unbenannten\n\t\tModule zu exportieren. Wenn in JShell das <Zielmodul> nicht angegeben\n\t\twird (no =), wird ALL-UNNAMED verwendet.\n\nAuswertungskontextoptionen, die in der Befehlszeile eingegeben oder mit einem vorherigen\n/reset-, /env- oder /reload-Befehl angegeben werden, werden beibehalten, es sei denn,\nes wird eine Option eingegeben, die die Einstellung außer Kraft setzt.\n\nIn der Befehlszeile benötigen diese Optionen zwei Bindestriche. Beispiel: --module-path\nIn den JShell-Toolbefehlen können sie ein oder zwei Bindestriche aufweisen. Beispiel: -module-path
 
 help.id.summary = Beschreibung der Snippet-IDs und deren Verwendung
-help.id =Jedes eingegebene Code-Snippet hat eine eindeutige Snippet-ID. Auch wenn Sie\ndasselbe Snippet erneut eingeben, erh\u00E4lt es eine neue ID. Bei normalen Snippets ist die ID\neine aufsteigende Zahl. Snippets, die mit einem Fehler nicht erfolgreich verlaufen, haben eine\nmit "e" beginnende Snippet-ID. Start-Snippets haben eine mit "s" beginnende ID.\n\nEine Snippet-ID stellt eine der M\u00F6glichkeiten dar, in einem Befehl auf ein Snippet zu verweisen. Beispiel:\nMit dem folgenden Befehl wird das Snippet mit der ID "14" gel\u00F6scht:\n\n\t/drop 14\n\nMit dem Befehl "/list" zeigen Sie die ID eines oder mehrerer Snippets an. Um die ID\naller Snippets anzuzeigen, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen und Start-Snippets,\nverwenden Sie den Befehl "/list -all".\n\nSie k\u00F6nnen auch auf einen ID-Bereich verweisen, indem Sie die Anfangs-ID und die End-ID mit einem\nBindestrich trennen. Beispiel: "1-4" entspricht "1 2 3 4". F\u00FCr alle Befehle,\ndie auf Snippets verweisen, kann eine Liste mit IDs, ID-Bereichen und Snippet-Namen\nals Argumenten angegeben werden. Diese Befehle sind: /list, /edit, /drop, /save, /vars, /methods,\n/types und /<id>. Einige Beispiele:\n\n\t/edit 7-23\n\n\t/save s1-s4 3-8 foo 12 myfile\n\n\t/9-12 33\n\nSiehe "/help /edit", "/help /save" bzw. "/help rerun".
+help.id =Jedes eingegebene Code-Snippet hat eine eindeutige Snippet-ID. Auch wenn Sie\ndasselbe Snippet erneut eingeben, erhält es eine neue ID. Bei normalen Snippets ist die ID\neine aufsteigende Zahl. Snippets, die mit einem Fehler nicht erfolgreich verlaufen, haben eine\nmit "e" beginnende Snippet-ID. Start-Snippets haben eine mit "s" beginnende ID.\n\nEine Snippet-ID stellt eine der Möglichkeiten dar, in einem Befehl auf ein Snippet zu verweisen. Beispiel:\nMit dem folgenden Befehl wird das Snippet mit der ID "14" gelöscht:\n\n\t/drop 14\n\nMit dem Befehl "/list" zeigen Sie die ID eines oder mehrerer Snippets an. Um die ID\naller Snippets anzuzeigen, einschließlich aller nicht erfolgreichen, überschriebenen und Start-Snippets,\nverwenden Sie den Befehl "/list -all".\n\nSie können auch auf einen ID-Bereich verweisen, indem Sie die Anfangs-ID und die End-ID mit einem\nBindestrich trennen. Beispiel: "1-4" entspricht "1 2 3 4". Für alle Befehle,\ndie auf Snippets verweisen, kann eine Liste mit IDs, ID-Bereichen und Snippet-Namen\nals Argumenten angegeben werden. Diese Befehle sind: /list, /edit, /drop, /save, /vars, /methods,\n/types und /<id>. Einige Beispiele:\n\n\t/edit 7-23\n\n\t/save s1-s4 3-8 foo 12 myfile\n\n\t/9-12 33\n\nSiehe "/help /edit", "/help /save" bzw. "/help rerun".
 
-help.rerun.summary = Beschreibung von M\u00F6glichkeiten zur erneuten Auswertung zuvor eingegebener Snippets
-help.rerun =Es gibt vier M\u00F6glichkeiten zur erneuten Auswertung zuvor eingegebener Snippets.\nDas letzte Snippet kann erneut ausgewertet werden mit: /!\nDas n-te vorherige Snippet kann mit Schr\u00E4gstrich-Minus und der jeweiligen Ziffer f\u00FCr n erneut ausgewertet werden. Beispiel: /-4\nBeispiel:\n\n\tjshell> 2 + 2\n\t$1 ==> 4\n\n\tjshell> /!\n\t2 + 2\n\t$2 ==> 4\n\n\tjshell> int z\n\tz ==> 0\n\n\tjshell> /-1\n\tint z;\n\tz ==> 0\n\n\tjshell> /-4\n\t2 + 2\n\t$5 ==> 4\n\nDie erneut auszuwertenden Snippets k\u00F6nnen per Snippet-ID oder ID-Bereich angegeben werden.\nEin ID-Bereich wird als zwei durch Bindestrich getrennte IDs dargestellt. Beispiel: 3-17\nEs k\u00F6nnen auch Start- und Fehler-Snippets verwendet werden. Beispiel: s3-s9 oder e1-e4\nEs k\u00F6nnen beliebig viele IDs oder ID-Bereiche verwendet werden. Beispiel: /3-7 s4 14-16 e2\nSiehe auch "/help id".\n\nAu\u00DFerdem k\u00F6nnen Sie die Historie auch r\u00FCckw\u00E4rts durchsuchen, indem Sie Strg+R gefolgt von der zu suchenden Zeichenfolge eingeben.
+help.rerun.summary = Beschreibung von Möglichkeiten zur erneuten Auswertung zuvor eingegebener Snippets
+help.rerun =Es gibt vier Möglichkeiten zur erneuten Auswertung zuvor eingegebener Snippets.\nDas letzte Snippet kann erneut ausgewertet werden mit: /!\nDas n-te vorherige Snippet kann mit Schrägstrich-Minus und der jeweiligen Ziffer für n erneut ausgewertet werden. Beispiel: /-4\nBeispiel:\n\n\tjshell> 2 + 2\n\t$1 ==> 4\n\n\tjshell> /!\n\t2 + 2\n\t$2 ==> 4\n\n\tjshell> int z\n\tz ==> 0\n\n\tjshell> /-1\n\tint z;\n\tz ==> 0\n\n\tjshell> /-4\n\t2 + 2\n\t$5 ==> 4\n\nDie erneut auszuwertenden Snippets können per Snippet-ID oder ID-Bereich angegeben werden.\nEin ID-Bereich wird als zwei durch Bindestrich getrennte IDs dargestellt. Beispiel: 3-17\nEs können auch Start- und Fehler-Snippets verwendet werden. Beispiel: s3-s9 oder e1-e4\nEs können beliebig viele IDs oder ID-Bereiche verwendet werden. Beispiel: /3-7 s4 14-16 e2\nSiehe auch "/help id".\n\nAußerdem können Sie die Historie auch rückwärts durchsuchen, indem Sie Strg+R gefolgt von der zu suchenden Zeichenfolge eingeben.
 
-help.set._retain = Mit der Option "-retain" wird eine Einstellung zur Verwendung in zuk\u00FCnftigen Sessions gespeichert.\nDie -retain-Option kann f\u00FCr die folgenden Formen von /set verwendet werden:\n\n\t/set editor -retain\n\t/set start -retain\n\t/set feedback -retain\n\t/set mode -retain\n\nWeitere Einzelheiten zu diesen Befehlen - Beispiel: /help /set editor
+help.set._retain = Mit der Option "-retain" wird eine Einstellung zur Verwendung in zukünftigen Sessions gespeichert.\nDie -retain-Option kann für die folgenden Formen von /set verwendet werden:\n\n\t/set editor -retain\n\t/set start -retain\n\t/set feedback -retain\n\t/set mode -retain\n\nWeitere Einzelheiten zu diesen Befehlen - Beispiel: /help /set editor
 
 help.set.format.summary = Legt das Format zum Melden eines Snippet-Ereignisses fest
 
-help.set.format = Legt das Format zum Melden eines Snippet-Ereignisses fest:\n\n\t/set format <Modus> <Feld> "<Format>" <Selektor>...\n\nZeigt Formateinstellungen an:\n\n\t/set format [<Modus> [<Feld>]]\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus - siehe "/help /set mode".\n<Feld> ist der Name des zu definierenden kontextspezifischen Formats.\n<Format> ist eine in Anf\u00FChrungszeichen gesetzte Zeichenfolge, die zum Wert des Feldes wird, wenn einer der\nSelektoren \u00FCbereinstimmt (oder keine Selektoren vorhanden sind). Bei Verwendung dieses Formats\nwerden in geschweiften Klammern eingeschlossene Feldnamen durch den Wert des Feldes zu diesem\nZeitpunkt ersetzt. Diese Felder k\u00F6nnen zuvor mit diesem Befehl definiert worden sein oder k\u00F6nnen\neines der folgenden vordefinierten, kontextspezifischen Felder sein:\n\t{name}       == Der Name. Beispiel: Variablenname, ...\n\t{type}       == Der Typname. Der Typ einer Variablen oder eines Ausdrucks, die\n\t\t\tParametertypen einer Methode\n\t{value}      == Der Ergebniswert eines Ausdrucks oder einer Variableninitialisierung\n\t{unresolved} == Die Liste nicht aufgel\u00F6ster Referenzen\n\t{errors}     == Die Liste behebbarer Fehler (nur w\u00E4hrend der Verarbeitung\n\t\t\tdes Feldes "display")\n\t{err}        == Eine nicht formatierte Fehlerzeile (nur w\u00E4hrend der Verarbeitung\n\t\t\tdes Feldes "errorline")\nZur Bestimmung des angezeigten Feedbacks greift das Tool auf folgende Felder zu:\n\t{display}    == Die angezeigte Meldung f\u00FCr ein Snippet-Ereignis\n\t{errorline}  == Das Format einer Fehlerzeile im Feld "errors"\n\t{pre}        == Das Feedbackpr\u00E4fix (am Beginn des Befehlsfeedbacks)\n\t{post}       == Das Feedback-Postfix (am Ende des Befehlsfeedbacks)\n\t{errorpre}   == Das Fehlerpr\u00E4fix (am Beginn des Fehlerfeedbacks)\n\t{errorpost}  == Das Fehler-Postfix (am Ende des Fehlerfeedbacks)\nDiese Fehler haben Standardeinstellungen (die \u00FCberschrieben werden k\u00F6nnen).\nDabei gilt: <Selektor> ist der Kontext, in dem das Format angewendet wird.\nDie Struktur des Selektors besteht aus einer durch Bindestriche getrennten Liste der Selektortyplisten.\nEine Selektortypliste ist eine durch Kommas getrennte Liste der Werte eines Selektortyps.\nEin Selektor stimmt \u00FCberein, wenn jede Selektortypliste \u00FCbereinstimmt. Eine Selektortypliste\nstimmt \u00FCberein, wenn einer der Werte \u00FCbereinstimmt.\n\nDer case-Selektortyp beschreibt die Art des Snippets. Die Werte lauten:\n\timport     -- Importdeklaration\n\tclass      -- Klassendeklaration\n\tinterface  -- Schnittstellendeklaration\n\tenum       -- Enum-Deklaration\n\tannotation -- Annotationsschnittstellendeklaration\n\trecord     -- Datensatzdeklaration\n\tmethod     -- Methodendeklaration -- Hinweis: {type}==parameter-types\n\tvardecl    -- Variablendeklaration ohne Initialisierung\n\tvarinit    -- Variablendeklaration mit Initialisierung\n\texpression -- Ausdruck -- Hinweis: {name}==Scratch-Variablenname\n\tvarvalue   -- Variablenwertausdruck\n\tassignment -- Variablenzuweisung\n\tstatement  -- Anweisung\nDer action-Selektortyp beschreibt, welcher Vorgang an dem Snippet vorgenommen wurde. Die Werte lauten:\n\tadded     -- Snippet wurde hinzugef\u00FCgt\n\tmodified  -- Ein vorhandenes Snippet wurde ge\u00E4ndert\n\treplaced  -- Ein vorhandenes Snippet wurde durch ein neues Snippet ersetzt\n\toverwrote -- Ein vorhandenes Snippet wurde \u00FCberschrieben\n\tdropped   -- Snippet wurde gel\u00F6scht\n\tused      -- Snippet wurde verwendet, wo es nicht zul\u00E4ssig war\nDer when-did-it-occur-Selektortyp beschreibt, ob es sich um eine direkte oder indirekte Aktion handelt. Die Werte lauten:\n\tprimary -- Das eingegebene Snippet\n\tupdate  -- Ein Update eines abh\u00E4ngigen Snippets\nDer resolution-state-Selektortyp beschreibt den Aufl\u00F6sungs-/Definitionsstatus des Snippets. Die Werte lauten:\n\tok         -- Korrekt aufgel\u00F6st\n\tdefined    -- Trotz \
-behebbarer nicht aufgel\u00F6ster Referenzen definiert\n\tnotdefined -- Aufgrund behebbarer nicht aufgel\u00F6ster Referenzen nicht definiert\nDer unresolved-count-Selektortyp beschreibt die Anzahl nicht aufgel\u00F6ster Referenzen. Die Werte lauten:\n\tunresolved0 -- Es sind keine nicht aufgel\u00F6sten Namen vorhanden\n\tunresolved1 -- Es ist ein nicht aufgel\u00F6ster Name vorhanden\n\tunresolved2 -- Es sind mindestens zwei nicht aufgel\u00F6ste Namen vorhanden\nDer errors-count-Selektortyp beschreibt die Anzahl der Fehler. Die Werte lauten:\n\terror0 -- Keine Fehler\n\terror1 -- Ein Fehler\n\terror2 -- Mindestens zwei Fehler\n\nBeispiele:\n\t/set format mymode action 'Erstellt' added-primary\n\t/set format mymode action 'Update ersetzt' replaced-update\n\t/set format mymode display '{pre}{action} Klasse {name}{post}' class-ok\n\t/set format mymode display '{pre}{action} Variable {name}, auf Null zur\u00FCckgesetzt{post}' replaced-vardecl,varinit-ok-update\n\nNachfolgende Selektoren f\u00FCr ein Feld k\u00F6nnen einige oder alle zuvor verwendeten Selektoren \u00FCberschreiben - "last one wins"-Prinzip\n\nBei fehlender Angabe von <Format> werden die aktuellen Formateinstellungen angezeigt.\nBei Angabe von <Modus> werden nur die Formateinstellungen f\u00FCr diesen Modus angezeigt.\nBei Angabe von sowohl <Modus> als auch <Feld> werden nur die Formateinstellungen f\u00FCr\ndiesen Modus und dieses Feld angezeigt. Beispiel:\n\t/set format mymode\nzeigt die Formateinstellungen f\u00FCr den Modus "mymode" an\n
+help.set.format = Legt das Format zum Melden eines Snippet-Ereignisses fest:\n\n\t/set format <Modus> <Feld> "<Format>" <Selektor>...\n\nZeigt Formateinstellungen an:\n\n\t/set format [<Modus> [<Feld>]]\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus - siehe "/help /set mode".\n<Feld> ist der Name des zu definierenden kontextspezifischen Formats.\n<Format> ist eine in Anführungszeichen gesetzte Zeichenfolge, die zum Wert des Feldes wird, wenn einer der\nSelektoren übereinstimmt (oder keine Selektoren vorhanden sind). Bei Verwendung dieses Formats\nwerden in geschweiften Klammern eingeschlossene Feldnamen durch den Wert des Feldes zu diesem\nZeitpunkt ersetzt. Diese Felder können zuvor mit diesem Befehl definiert worden sein oder können\neines der folgenden vordefinierten, kontextspezifischen Felder sein:\n\t{name}       == Der Name. Beispiel: Variablenname, ...\n\t{type}       == Der Typname. Der Typ einer Variablen oder eines Ausdrucks, die\n\t\t\tParametertypen einer Methode\n\t{value}      == Der Ergebniswert eines Ausdrucks oder einer Variableninitialisierung\n\t{unresolved} == Die Liste nicht aufgelöster Referenzen\n\t{errors}     == Die Liste behebbarer Fehler (nur während der Verarbeitung\n\t\t\tdes Feldes "display")\n\t{err}        == Eine nicht formatierte Fehlerzeile (nur während der Verarbeitung\n\t\t\tdes Feldes "errorline")\nZur Bestimmung des angezeigten Feedbacks greift das Tool auf folgende Felder zu:\n\t{display}    == Die angezeigte Meldung für ein Snippet-Ereignis\n\t{errorline}  == Das Format einer Fehlerzeile im Feld "errors"\n\t{pre}        == Das Feedbackpräfix (am Beginn des Befehlsfeedbacks)\n\t{post}       == Das Feedback-Postfix (am Ende des Befehlsfeedbacks)\n\t{errorpre}   == Das Fehlerpräfix (am Beginn des Fehlerfeedbacks)\n\t{errorpost}  == Das Fehler-Postfix (am Ende des Fehlerfeedbacks)\nDiese Fehler haben Standardeinstellungen (die überschrieben werden können).\nDabei gilt: <Selektor> ist der Kontext, in dem das Format angewendet wird.\nDie Struktur des Selektors besteht aus einer durch Bindestriche getrennten Liste der Selektortyplisten.\nEine Selektortypliste ist eine durch Kommas getrennte Liste der Werte eines Selektortyps.\nEin Selektor stimmt überein, wenn jede Selektortypliste übereinstimmt. Eine Selektortypliste\nstimmt überein, wenn einer der Werte übereinstimmt.\n\nDer case-Selektortyp beschreibt die Art des Snippets. Die Werte lauten:\n\timport     -- Importdeklaration\n\tclass      -- Klassendeklaration\n\tinterface  -- Schnittstellendeklaration\n\tenum       -- Enum-Deklaration\n\tannotation -- Annotationsschnittstellendeklaration\n\trecord     -- Datensatzdeklaration\n\tmethod     -- Methodendeklaration -- Hinweis: {type}==parameter-types\n\tvardecl    -- Variablendeklaration ohne Initialisierung\n\tvarinit    -- Variablendeklaration mit Initialisierung\n\texpression -- Ausdruck -- Hinweis: {name}==Scratch-Variablenname\n\tvarvalue   -- Variablenwertausdruck\n\tassignment -- Variablenzuweisung\n\tstatement  -- Anweisung\nDer action-Selektortyp beschreibt, welcher Vorgang an dem Snippet vorgenommen wurde. Die Werte lauten:\n\tadded     -- Snippet wurde hinzugefügt\n\tmodified  -- Ein vorhandenes Snippet wurde geändert\n\treplaced  -- Ein vorhandenes Snippet wurde durch ein neues Snippet ersetzt\n\toverwrote -- Ein vorhandenes Snippet wurde überschrieben\n\tdropped   -- Snippet wurde gelöscht\n\tused      -- Snippet wurde verwendet, wo es nicht zulässig war\nDer when-did-it-occur-Selektortyp beschreibt, ob es sich um eine direkte oder indirekte Aktion handelt. Die Werte lauten:\n\tprimary -- Das eingegebene Snippet\n\tupdate  -- Ein Update eines abhängigen Snippets\nDer resolution-state-Selektortyp beschreibt den Auflösungs-/Definitionsstatus des Snippets. Die Werte lauten:\n\tok         -- Korrekt aufgelöst\n\tdefined    -- Trotz \
+behebbarer nicht aufgelöster Referenzen definiert\n\tnotdefined -- Aufgrund behebbarer nicht aufgelöster Referenzen nicht definiert\nDer unresolved-count-Selektortyp beschreibt die Anzahl nicht aufgelöster Referenzen. Die Werte lauten:\n\tunresolved0 -- Es sind keine nicht aufgelösten Namen vorhanden\n\tunresolved1 -- Es ist ein nicht aufgelöster Name vorhanden\n\tunresolved2 -- Es sind mindestens zwei nicht aufgelöste Namen vorhanden\nDer errors-count-Selektortyp beschreibt die Anzahl der Fehler. Die Werte lauten:\n\terror0 -- Keine Fehler\n\terror1 -- Ein Fehler\n\terror2 -- Mindestens zwei Fehler\n\nBeispiele:\n\t/set format mymode action 'Erstellt' added-primary\n\t/set format mymode action 'Update ersetzt' replaced-update\n\t/set format mymode display '{pre}{action} Klasse {name}{post}' class-ok\n\t/set format mymode display '{pre}{action} Variable {name}, auf Null zurückgesetzt{post}' replaced-vardecl,varinit-ok-update\n\nNachfolgende Selektoren für ein Feld können einige oder alle zuvor verwendeten Selektoren überschreiben - "last one wins"-Prinzip\n\nBei fehlender Angabe von <Format> werden die aktuellen Formateinstellungen angezeigt.\nBei Angabe von <Modus> werden nur die Formateinstellungen für diesen Modus angezeigt.\nBei Angabe von sowohl <Modus> als auch <Feld> werden nur die Formateinstellungen für\ndiesen Modus und dieses Feld angezeigt. Beispiel:\n\t/set format mymode\nzeigt die Formateinstellungen für den Modus "mymode" an\n
 
-help.set.truncation.summary = Legt die maximale L\u00E4nge eines angezeigten Wertes fest
+help.set.truncation.summary = Legt die maximale Länge eines angezeigten Wertes fest
 
-help.set.truncation = Legt die maximale L\u00E4nge eines angezeigten Wertes fest:\n\n\t/set truncation <Modus> <L\u00E4nge> <Selektor>...\n\nAktuelle Abschneideeinstellungen anzeigen:\n\n\t/set truncation [<Modus>]\n\nHier gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus - siehe "/help /set mode".\n<L\u00E4nge> ist eine Ganzzahl ohne Vorzeichen, die eine Maximall\u00E4nge angibt.\n<Selektor> ist nur erforderlich, wenn Sie die Abschneidel\u00E4nge des Wertes nach Kontext\noptimieren m\u00F6chten. In diesem Fall ist <Selektor> der Kontext, in dem das Abschneiden angewendet wird.\nDie Struktur des Selektors besteht aus einer durch Bindestriche getrennten Liste der Selektortyplisten.\nEine Selektortypliste ist eine durch Kommas getrennte Liste der Werte eines Selektortyps.\nEin Selektor stimmt \u00FCberein, wenn jede Selektortypliste \u00FCbereinstimmt. Eine Selektortypliste\nstimmt \u00FCberein, wenn einer der Werte \u00FCbereinstimmt.\n\nNachfolgend sind die entsprechenden Selektortypen f\u00FCr das Abschneiden aufgelistet.\n\nDer case-Selektortyp beschreibt die Art des Snippets. Die Werte lauten:\n\tvardecl    -- Variablendeklaration ohne Initialisierung\n\tvarinit    -- Variablendeklaration mit Initialisierung\n\texpression -- Ausdruck -- Hinweis: {name}==Scratch-Variablenname\n\tvarvalue   -- Variablenwertausdruck\n\tassignment -- Variablenzuweisung\nDer action-Selektortyp beschreibt, welcher Vorgang an dem Snippet vorgenommen wurde. Die Werte lauten:\n\tadded     -- Snippet wurde hinzugef\u00FCgt\n\tmodified  -- Ein vorhandenes Snippet wurde ge\u00E4ndert\n\treplaced  -- Ein vorhandenes Snippet wurde durch ein neues Snippet ersetzt\nBeispiele:\n\t/set trunc mymode 80\n\t/set truncation mymode 45 expression\n\t/set truncation mymode 0 vardecl-modified,replaced\n\nNachfolgende Selektoren f\u00FCr ein Feld k\u00F6nnen einige oder alle zuvor verwendeten Selektoren \u00FCberschreiben - "last one wins"-Prinzip\n\nBei fehlender Angabe von <L\u00E4nge> werden die Abschneideeinstellungen angezeigt.\nBei Angabe von <Modus> werden nur die Abschneideeinstellungen f\u00FCr diesen Modus angezeigt.\nBeispiel:\n\t/set truncation mymode\nZeigt die Abschneideeinstellungen f\u00FCr den Modus "mymode" an\n
+help.set.truncation = Legt die maximale Länge eines angezeigten Wertes fest:\n\n\t/set truncation <Modus> <Länge> <Selektor>...\n\nAktuelle Abschneideeinstellungen anzeigen:\n\n\t/set truncation [<Modus>]\n\nHier gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus - siehe "/help /set mode".\n<Länge> ist eine Ganzzahl ohne Vorzeichen, die eine Maximallänge angibt.\n<Selektor> ist nur erforderlich, wenn Sie die Abschneidelänge des Wertes nach Kontext\noptimieren möchten. In diesem Fall ist <Selektor> der Kontext, in dem das Abschneiden angewendet wird.\nDie Struktur des Selektors besteht aus einer durch Bindestriche getrennten Liste der Selektortyplisten.\nEine Selektortypliste ist eine durch Kommas getrennte Liste der Werte eines Selektortyps.\nEin Selektor stimmt überein, wenn jede Selektortypliste übereinstimmt. Eine Selektortypliste\nstimmt überein, wenn einer der Werte übereinstimmt.\n\nNachfolgend sind die entsprechenden Selektortypen für das Abschneiden aufgelistet.\n\nDer case-Selektortyp beschreibt die Art des Snippets. Die Werte lauten:\n\tvardecl    -- Variablendeklaration ohne Initialisierung\n\tvarinit    -- Variablendeklaration mit Initialisierung\n\texpression -- Ausdruck -- Hinweis: {name}==Scratch-Variablenname\n\tvarvalue   -- Variablenwertausdruck\n\tassignment -- Variablenzuweisung\nDer action-Selektortyp beschreibt, welcher Vorgang an dem Snippet vorgenommen wurde. Die Werte lauten:\n\tadded     -- Snippet wurde hinzugefügt\n\tmodified  -- Ein vorhandenes Snippet wurde geändert\n\treplaced  -- Ein vorhandenes Snippet wurde durch ein neues Snippet ersetzt\nBeispiele:\n\t/set trunc mymode 80\n\t/set truncation mymode 45 expression\n\t/set truncation mymode 0 vardecl-modified,replaced\n\nNachfolgende Selektoren für ein Feld können einige oder alle zuvor verwendeten Selektoren überschreiben - "last one wins"-Prinzip\n\nBei fehlender Angabe von <Länge> werden die Abschneideeinstellungen angezeigt.\nBei Angabe von <Modus> werden nur die Abschneideeinstellungen für diesen Modus angezeigt.\nBeispiel:\n\t/set truncation mymode\nZeigt die Abschneideeinstellungen für den Modus "mymode" an\n
 
-help.set.feedback.summary = Legt den Feedbackmodus mit einer Beschreibung des angezeigten Feedbacks f\u00FCr eingegebene Snippets und Befehle fest
+help.set.feedback.summary = Legt den Feedbackmodus mit einer Beschreibung des angezeigten Feedbacks für eingegebene Snippets und Befehle fest
 
-help.set.feedback = Legt den Feedbackmodus mit einer Beschreibung des angezeigten Feedbacks f\u00FCr eingegebene Snippets und Befehle fest:\n\n\t/set feedback [-retain] <Modus>\n\nBeh\u00E4lt den aktuellen Feedbackmodus f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set feedback -retain\n\nZeigt den Feedbackmodus an und listet verf\u00FCgbare Modi auf:\n\n\t/set feedback\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus.\nSie d\u00FCrfen nur gerade gen\u00FCgend Buchstaben verwenden, um den Namen eindeutig zu machen.\nBenutzerdefinierte Modi k\u00F6nnen hinzugef\u00FCgt werden, siehe "/help /set mode"\n\nBei Verwendung der -retain-Option wird diese Einstellung in dieser und zuk\u00FCnftigen\nAusf\u00FChrungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Modus> oder -retain werden der aktuelle Feedbackmodus und verf\u00FCgbare Modi angezeigt.\n
+help.set.feedback = Legt den Feedbackmodus mit einer Beschreibung des angezeigten Feedbacks für eingegebene Snippets und Befehle fest:\n\n\t/set feedback [-retain] <Modus>\n\nBehält den aktuellen Feedbackmodus für zukünftige Sessions bei:\n\n\t/set feedback -retain\n\nZeigt den Feedbackmodus an und listet verfügbare Modi auf:\n\n\t/set feedback\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus.\nSie dürfen nur gerade genügend Buchstaben verwenden, um den Namen eindeutig zu machen.\nBenutzerdefinierte Modi können hinzugefügt werden, siehe "/help /set mode"\n\nBei Verwendung der -retain-Option wird diese Einstellung in dieser und zukünftigen\nAusführungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Modus> oder -retain werden der aktuelle Feedbackmodus und verfügbare Modi angezeigt.\n
 
 help.set.mode.summary = Erstellt einen benutzerdefinierten Feedbackmodus (optional durch Kopieren aus einem vorhandenen Modus)
 
-help.set.mode = Erstellt einen benutzerdefinierten Feedbackmodus (optional durch Kopieren aus einem vorhandenen Modus):\n\n\t/set mode <neuer Modus> [<alter Modus>] (-command|-quiet)\n\nBeh\u00E4lt einen benutzerdefinierten Feedbackmodus f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set mode -retain <Modus>\n\nL\u00F6scht einen benutzerdefinierten Feedbackmodus:\n\n\t/set mode -delete [-retain] <Modus>\n\nZeigt Feedbackmoduseinstellungen an:\n\n\t/set mode [<Modus>]\n\nDabei gilt: <neuer Modus> ist der Name des zu erstellenden Modus.\n<alter Modus> ist der Name eines vorhandenen Feedbackmodus.\n<Modus> ist der Name eines vorhandenen Feedbackmodus.\n\nBei Angabe von <alter Modus> werden die zugeh\u00F6rigen Einstellungen in den neuen Modus kopiert.\n\nDas Feedback, das ein Modus f\u00FCr eingegebene Snippets bereitstellt, wird von den "/set format"-Einstellungen\nbestimmt. F\u00FCr eingegebene Befehle ist das Feedback dagegen entweder aktiviert oder deaktiviert.\nDies wird durch die beim Erstellen des Modus verwendete Option bestimmt. Es muss entweder die Option "-command"\noder die Option "-quiet" angegeben werden. Bei Verwendung von "-command" wird im neuen Modus informatives\nund best\u00E4tigendes Befehlsfeedback angezeigt. Bei Verwendung von "-quiet" wird bei Befehlen\nnur erforderliches Feedback angegeben (z.B. Fehler).\n\nNach dem Erstellen des neuen Modus k\u00F6nnen Sie diesen mit "/set format", "/set prompt und "/set truncation"\nkonfigurieren. Verwenden Sie "/set feedback", um den neuen Modus zu verwenden.\n\nBei Verwendung der Option "-retain" (ohne Option "-delete") wird der Modus (einschlie\u00DFlich\ndes aktuellen Prompts, Formats und der Abschneideeinstellungen) zur Verwendung in\nzuk\u00FCnftigen Ausf\u00FChrungen des JShell-Tools gespeichert. Wenn "-retain" nicht verwendet wird, wird der Modus nur in\nder aktuellen Session definiert. Verwenden Sie "-retain" nach dem Aktualisieren der Moduseinstellungen erneut,\num die Updates session\u00FCbergreifend beizubehalten.\n\nWenn nur die Option "-delete" verwendet wird, wird der Modus aus der aktuellen Session gel\u00F6scht.\nWenn sowohl "-retain" als auch "-delete" verwendet werden, wird der Modus aus der aktuellen und aus\nzuk\u00FCnftigen Sessions gel\u00F6scht.\n\nBei fehlender Angabe von Optionen werden die Moduseinstellungen angezeigt.\nBei Angabe des <Modus> werden nur die Moduseinstellungen f\u00FCr diesen Modus angezeigt.\nHinweis: Die Einstellungen f\u00FCr den Modus umfassen die Einstellungen f\u00FCr Prompt, Format und\nAbschneiden.\nBeispiel:\n\t/set mode mymode\n\nZeigt Modus, Prompt, Format und Abschneideeinstellungen f\u00FCr den Modus "mymode" an
+help.set.mode = Erstellt einen benutzerdefinierten Feedbackmodus (optional durch Kopieren aus einem vorhandenen Modus):\n\n\t/set mode <neuer Modus> [<alter Modus>] (-command|-quiet)\n\nBehält einen benutzerdefinierten Feedbackmodus für zukünftige Sessions bei:\n\n\t/set mode -retain <Modus>\n\nLöscht einen benutzerdefinierten Feedbackmodus:\n\n\t/set mode -delete [-retain] <Modus>\n\nZeigt Feedbackmoduseinstellungen an:\n\n\t/set mode [<Modus>]\n\nDabei gilt: <neuer Modus> ist der Name des zu erstellenden Modus.\n<alter Modus> ist der Name eines vorhandenen Feedbackmodus.\n<Modus> ist der Name eines vorhandenen Feedbackmodus.\n\nBei Angabe von <alter Modus> werden die zugehörigen Einstellungen in den neuen Modus kopiert.\n\nDas Feedback, das ein Modus für eingegebene Snippets bereitstellt, wird von den "/set format"-Einstellungen\nbestimmt. Für eingegebene Befehle ist das Feedback dagegen entweder aktiviert oder deaktiviert.\nDies wird durch die beim Erstellen des Modus verwendete Option bestimmt. Es muss entweder die Option "-command"\noder die Option "-quiet" angegeben werden. Bei Verwendung von "-command" wird im neuen Modus informatives\nund bestätigendes Befehlsfeedback angezeigt. Bei Verwendung von "-quiet" wird bei Befehlen\nnur erforderliches Feedback angegeben (z.B. Fehler).\n\nNach dem Erstellen des neuen Modus können Sie diesen mit "/set format", "/set prompt und "/set truncation"\nkonfigurieren. Verwenden Sie "/set feedback", um den neuen Modus zu verwenden.\n\nBei Verwendung der Option "-retain" (ohne Option "-delete") wird der Modus (einschließlich\ndes aktuellen Prompts, Formats und der Abschneideeinstellungen) zur Verwendung in\nzukünftigen Ausführungen des JShell-Tools gespeichert. Wenn "-retain" nicht verwendet wird, wird der Modus nur in\nder aktuellen Session definiert. Verwenden Sie "-retain" nach dem Aktualisieren der Moduseinstellungen erneut,\num die Updates sessionübergreifend beizubehalten.\n\nWenn nur die Option "-delete" verwendet wird, wird der Modus aus der aktuellen Session gelöscht.\nWenn sowohl "-retain" als auch "-delete" verwendet werden, wird der Modus aus der aktuellen und aus\nzukünftigen Sessions gelöscht.\n\nBei fehlender Angabe von Optionen werden die Moduseinstellungen angezeigt.\nBei Angabe des <Modus> werden nur die Moduseinstellungen für diesen Modus angezeigt.\nHinweis: Die Einstellungen für den Modus umfassen die Einstellungen für Prompt, Format und\nAbschneiden.\nBeispiel:\n\t/set mode mymode\n\nZeigt Modus, Prompt, Format und Abschneideeinstellungen für den Modus "mymode" an
 
 help.set.prompt.summary = Legt die Prompts fest
 
-help.set.prompt = Legt die Prompts fest. Es m\u00FCssen sowohl der normale als auch der Fortsetzungs-Prompt festgelegt werden:\n\n\t/set prompt <mode> "<Prompt>" "<Fortsetzungs-Prompt>"\n\nZeigt den normalen und den Fortsetzungs-Prompt an:\n\n\t/set prompt [<Modus>]\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus.\n<Prompt> und <Fortsetzungs-Prompt> sind in Anf\u00FChrungszeichen gesetzte Zeichenfolgen, die als Eingabe-Prompts ausgegeben werden.\nOptional k\u00F6nnen beide "%%s" enthalten. Dies wird durch die n\u00E4chste Snippet-ID ersetzt.\nDer Eingabe wird unter Umst\u00E4nden keine ID zugewiesen, wenn es sich z.B. um einen Fehler oder Befehl handelt.\nDer Fortsetzungs-Prompt wird in einem mehrzeiligen Snippet in der zweiten und allen nachfolgenden Zeilen verwendet.\n\nBei fehlender Angabe von <Prompt> werden die aktuell festgelegten Prompts angezeigt.\nBei Angabe des <Modus> werden nur die Prompts f\u00FCr diesen Modus angezeigt.\nBeispiel:\n\t/set prompt mymode\nZeigt die f\u00FCr den Modus "mymode" festgelegten Prompts an\n
+help.set.prompt = Legt die Prompts fest. Es müssen sowohl der normale als auch der Fortsetzungs-Prompt festgelegt werden:\n\n\t/set prompt <mode> "<Prompt>" "<Fortsetzungs-Prompt>"\n\nZeigt den normalen und den Fortsetzungs-Prompt an:\n\n\t/set prompt [<Modus>]\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus.\n<Prompt> und <Fortsetzungs-Prompt> sind in Anführungszeichen gesetzte Zeichenfolgen, die als Eingabe-Prompts ausgegeben werden.\nOptional können beide "%%s" enthalten. Dies wird durch die nächste Snippet-ID ersetzt.\nDer Eingabe wird unter Umständen keine ID zugewiesen, wenn es sich z.B. um einen Fehler oder Befehl handelt.\nDer Fortsetzungs-Prompt wird in einem mehrzeiligen Snippet in der zweiten und allen nachfolgenden Zeilen verwendet.\n\nBei fehlender Angabe von <Prompt> werden die aktuell festgelegten Prompts angezeigt.\nBei Angabe des <Modus> werden nur die Prompts für diesen Modus angezeigt.\nBeispiel:\n\t/set prompt mymode\nZeigt die für den Modus "mymode" festgelegten Prompts an\n
 
 help.set.editor.summary =Legt den mit dem /edit-Befehl zu startenden Befehl fest
 
-help.set.editor =Legt den mit dem /edit-Befehl zu startenden Befehl fest:\n\n\t/set editor [-retain] [-wait] <Befehl>\n\n\t/set editor [-retain] -default\n\n\t/set editor [-retain] -delete\n\nBeh\u00E4lt die aktuelle Editoreinstellung f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set editor -retain\n\nZeigt den mit dem /edit-Befehl zu startenden Befehl an:\n\n\t/set editor\n\nDer <Befehl> ist eine betriebssystemabh\u00E4ngige Zeichenfolge.\nDer <Befehl> kann durch Leerzeichen getrennte Argumente (z.B. Kennzeichen) enthalten\n\nBei Angabe der Option -default wird der integrierte Standardeditor verwendet.\n\nBei Angabe der Option -delete werden vorherige Einstellungen ignoriert - die Editoreinstellungen\nwerden wie beim Starten des JShell-Tools initialisiert. Insbesondere wird eine eventuell vorhandene\nbeibehaltene Einstellung verwendet (es sei denn, es werden sowohl -retain als auch -delete angegeben - \nin diesem Fall wird die beibehaltene Einstellung gel\u00F6scht). Ist eine der folgenden Umgebungsvariablen festgelegt,\nwird sie verwendet: JSHELLEDITOR, VISUAL oder EDITOR (in dieser Reihenfolge). Andernfalls\nwird der integrierte Standardeditor verwendet.\n\nBei Angabe von <Befehl> wird dieser als externer Editor verwendet. Der <Befehl>\nbesteht aus dem Programm und null oder mehr Programmargumenten. Bei Verwendung von <Befehl>\nwird die zu bearbeitende tempor\u00E4re Datei als letztes Argument angeh\u00E4ngt.\nNormalerweise wird der Bearbeitungsmodus fortgesetzt, bis der externe Editor beendet wird. Einige externe Editoren\nwerden umgehend beendet (z.B. wenn das Bearbeitungsfenster vorhanden ist). Es m\u00FCssen entweder Kennzeichen\nf\u00FCr externe Editoren verwendet werden, um ein umgehendes Beenden zu verhindern, oder die Option -wait muss\nverwendet werden, um den Benutzer zur Angabe aufzufordern, wann der Bearbeitungsmodus beendet werden soll.\n\nHinweis: Bei aktivem Bearbeitungsmodus werden keine Befehlseingaben angezeigt. Nach Beenden des Bearbeitungsmodus\nwerden keine \u00C4nderungen an den bearbeiteten Snippets angezeigt.\n\nBei Verwendung der Option -retain wird die Einstellung in dieser und zuk\u00FCnftigen\nAusf\u00FChrungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Befehl> oder Optionen wird die Editoreinstellung angezeigt.\n
+help.set.editor =Legt den mit dem /edit-Befehl zu startenden Befehl fest:\n\n\t/set editor [-retain] [-wait] <Befehl>\n\n\t/set editor [-retain] -default\n\n\t/set editor [-retain] -delete\n\nBehält die aktuelle Editoreinstellung für zukünftige Sessions bei:\n\n\t/set editor -retain\n\nZeigt den mit dem /edit-Befehl zu startenden Befehl an:\n\n\t/set editor\n\nDer <Befehl> ist eine betriebssystemabhängige Zeichenfolge.\nDer <Befehl> kann durch Leerzeichen getrennte Argumente (z.B. Kennzeichen) enthalten\n\nBei Angabe der Option -default wird der integrierte Standardeditor verwendet.\n\nBei Angabe der Option -delete werden vorherige Einstellungen ignoriert - die Editoreinstellungen\nwerden wie beim Starten des JShell-Tools initialisiert. Insbesondere wird eine eventuell vorhandene\nbeibehaltene Einstellung verwendet (es sei denn, es werden sowohl -retain als auch -delete angegeben - \nin diesem Fall wird die beibehaltene Einstellung gelöscht). Ist eine der folgenden Umgebungsvariablen festgelegt,\nwird sie verwendet: JSHELLEDITOR, VISUAL oder EDITOR (in dieser Reihenfolge). Andernfalls\nwird der integrierte Standardeditor verwendet.\n\nBei Angabe von <Befehl> wird dieser als externer Editor verwendet. Der <Befehl>\nbesteht aus dem Programm und null oder mehr Programmargumenten. Bei Verwendung von <Befehl>\nwird die zu bearbeitende temporäre Datei als letztes Argument angehängt.\nNormalerweise wird der Bearbeitungsmodus fortgesetzt, bis der externe Editor beendet wird. Einige externe Editoren\nwerden umgehend beendet (z.B. wenn das Bearbeitungsfenster vorhanden ist). Es müssen entweder Kennzeichen\nfür externe Editoren verwendet werden, um ein umgehendes Beenden zu verhindern, oder die Option -wait muss\nverwendet werden, um den Benutzer zur Angabe aufzufordern, wann der Bearbeitungsmodus beendet werden soll.\n\nHinweis: Bei aktivem Bearbeitungsmodus werden keine Befehlseingaben angezeigt. Nach Beenden des Bearbeitungsmodus\nwerden keine Änderungen an den bearbeiteten Snippets angezeigt.\n\nBei Verwendung der Option -retain wird die Einstellung in dieser und zukünftigen\nAusführungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Befehl> oder Optionen wird die Editoreinstellung angezeigt.\n
 
 help.set.start.summary =Legt die Startkonfiguration fest
 
-help.set.start =Legt die Startkonfiguration fest - eine Abfolge aus Snippets und Befehlen, die beim Hochfahren gelesen werden:\n\n\t/set start [-retain] <Datei>...\n\n\t/set start [-retain] -default\n\n\t/set start [-retain] -none\n\nBeh\u00E4lt die Startkonfiguration f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set start -retain\n\nZeigt die Starteinstellung an:\n\n\t/set start\n\nDer Inhalt der angegebenen <Datei> wird zu den verwendeten Start-Snippets und -befehlen,\nwenn die Befehle /reset, /reload oder /env in dieser Session verwendet werden.\nWird stattdessen die Option -default angegeben, werden die vordefinierten Startimport-\nSnippets verwendet.\nBei Verwendung der Option -none sind die Starteinstellungen leer. Es werden keine\nStart-Snippets oder -befehle verwendet.\nDieser Befehl eignet sich zum Testen der Starteinstellungen. Um diese f\u00FCr zuk\u00FCnftige\nAusf\u00FChrungen des JShell-Tools beizubehalten, verwenden Sie den Befehl:\n\t/set start -retain\n\nBei Verwendung der Option -retain wird die Einstellung in dieser und zuk\u00FCnftigen\nAusf\u00FChrungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Datei> oder Optionen werden die Starteinstellungen angezeigt.\nHinweis: Wenn der Start zuletzt von einer Datei festgelegt wurde, wird das mit dem\nBefehl "set start" gefolgt vom Inhalt der Datei angezeigt.\n\nDie <Datei> kann der Name einer Betriebssystemdatei oder einer der vordefinierten\nStartdateinamen sein: DEFAULT, PRINTING, TOOLING oder JAVASE.\nHierbei handelt es sich jeweils um: die Standardimport-Snippets (wie von -default verwendet),\nDefinitionen der Methoden-Snippets print(), println() und printf() oder\nImporte aller Java SE-Packages.\nEs kann mehr als eine <Datei> angegeben werden. Beispiel:\n\n\t/set start -retain DEFAULT PRINTING
+help.set.start =Legt die Startkonfiguration fest - eine Abfolge aus Snippets und Befehlen, die beim Hochfahren gelesen werden:\n\n\t/set start [-retain] <Datei>...\n\n\t/set start [-retain] -default\n\n\t/set start [-retain] -none\n\nBehält die Startkonfiguration für zukünftige Sessions bei:\n\n\t/set start -retain\n\nZeigt die Starteinstellung an:\n\n\t/set start\n\nDer Inhalt der angegebenen <Datei> wird zu den verwendeten Start-Snippets und -befehlen,\nwenn die Befehle /reset, /reload oder /env in dieser Session verwendet werden.\nWird stattdessen die Option -default angegeben, werden die vordefinierten Startimport-\nSnippets verwendet.\nBei Verwendung der Option -none sind die Starteinstellungen leer. Es werden keine\nStart-Snippets oder -befehle verwendet.\nDieser Befehl eignet sich zum Testen der Starteinstellungen. Um diese für zukünftige\nAusführungen des JShell-Tools beizubehalten, verwenden Sie den Befehl:\n\t/set start -retain\n\nBei Verwendung der Option -retain wird die Einstellung in dieser und zukünftigen\nAusführungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Datei> oder Optionen werden die Starteinstellungen angezeigt.\nHinweis: Wenn der Start zuletzt von einer Datei festgelegt wurde, wird das mit dem\nBefehl "set start" gefolgt vom Inhalt der Datei angezeigt.\n\nDie <Datei> kann der Name einer Betriebssystemdatei oder einer der vordefinierten\nStartdateinamen sein: DEFAULT, PRINTING, TOOLING oder JAVASE.\nHierbei handelt es sich jeweils um: die Standardimport-Snippets (wie von -default verwendet),\nDefinitionen der Methoden-Snippets print(), println() und printf() oder\nImporte aller Java SE-Packages.\nEs kann mehr als eine <Datei> angegeben werden. Beispiel:\n\n\t/set start -retain DEFAULT PRINTING
 
-help.set.indent.summary =Gibt die Anzahl der Leerzeichen zum Einr\u00FCcken der Snippets an
+help.set.indent.summary =Gibt die Anzahl der Leerzeichen zum Einrücken der Snippets an
 
-help.set.indent =Gibt die Anzahl der Leerzeichen zum Einr\u00FCcken der Snippets an:\n\n\t/set indent <Anzahl>\n\nZeigt die Einzugseinstellung an:\n\n\t/set indent\n
-startup.feedback = /set mode verbose -command    \n\n/set prompt verbose '\\njshell> '   '   ...> '    \n\n/set format verbose pre '|  '    \n/set format verbose post '%n'    \n/set format verbose errorpre '|  '    \n/set format verbose errorpost '%n'    \n\n/set format verbose errorline '{post}{pre}    {err}'    \n\n/set format verbose action 'Erstellt' added-primary    \n/set format verbose action 'Ge\u00E4ndert' modified-primary    \n/set format verbose action 'Ersetzt' replaced-primary    \n/set format verbose action '\u00DCberschrieben' overwrote-primary    \n/set format verbose action 'Gel\u00F6scht' dropped-primary    \n/set format verbose action '  Update erstellt' added-update    \n/set format verbose action '  Update ge\u00E4ndert' modified-update    \n/set format verbose action '  Update ersetzt' replaced-update    \n/set format verbose action '  Update \u00FCberschrieben' overwrote-update    \n/set format verbose action '  Update gel\u00F6scht' dropped-update    \n\n/set format verbose until ', Instanziierung oder Aufruf der zugeh\u00F6rigen Methoden ist jedoch nicht m\u00F6glich bis'   defined-class,record-primary    \n/set format verbose until ', Aufruf der zugeh\u00F6rigen Methoden ist jedoch nicht m\u00F6glich bis'                      defined-interface-primary    \n/set format verbose until ', Verwendung ist jedoch nicht m\u00F6glich bis'                                  defined-enum,annotation-primary    \n/set format verbose until ', Aufruf ist jedoch nicht m\u00F6glich bis'                               defined-method-primary    \n/set format verbose until ', Referenzierung ist jedoch nicht m\u00F6glich bis'                            notdefined-primary    \n/set format verbose until ' Instanziierung oder Aufruf der zugeh\u00F6rigen Methoden ist nicht m\u00F6glich bis'          defined-class,record-update    \n/set format verbose until ' Aufruf der zugeh\u00F6rigen Methoden ist nicht m\u00F6glich bis'                              defined-interface-update    \n/set format verbose until ' Aufruf ist nicht m\u00F6glich bis'                                      defined-method-update    \n/set format verbose until ' Referenzierung ist nicht m\u00F6glich bis'                                   notdefined-update    \n\n/set format verbose unrerr '{unresolved} ist deklariert'                                           unresolved1-error0    \n/set format verbose unrerr '{unresolved} sind deklariert'                                          unresolved2-error0    \n/set format verbose unrerr ' dieser Fehler ist behoben: {errors}'                                 unresolved0-error1    \n/set format verbose unrerr '{unresolved} ist deklariert, und dieser Fehler ist behoben: {errors}'     unresolved1-error1    \n/set format verbose unrerr '{unresolved} sind deklariert, und dieser Fehler ist behoben: {errors}'    unresolved2-error1    \n/set format verbose unrerr ' diese Fehler sind behoben: {errors}'                              unresolved0-error2    \n/set format verbose unrerr '{unresolved} ist deklariert, und diese Fehler sind behoben: {errors}'  unresolved1-error2    \n/set format verbose unrerr '{unresolved} sind deklariert, und diese Fehler sind behoben: {errors}' unresolved2-error2    \n\n/set format verbose resolve '{until}{unrerr}'                                                   defined,notdefined-added,modified,replaced,used    \n\n/set format verbose typeKind 'Klasse'                  class    \n/set format verbose typeKind 'Schnittstelle'              interface    \n/set format verbose typeKind 'Enum'                   enum    \n/set format verbose typeKind 'Annotationsschnittstelle'   annotation    \n/set format verbose typeKind 'Datensatz'                 record    \n\n/set format verbose result '{name} ==> {value}{post}'                                        added,modified,replaced-ok-primary    \n\n/set format verbose display '{result}{pre}Scratch-Variable {name} erstellt: {type}{post}'    \
-expression-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}Wert von {name}: {type}{post}'                    varvalue-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}Zugewiesen zu {name}: {type}{post}'                 assignment-primary    \n/set format verbose display '{result}{pre}{action} Variable {name}: {type}{resolve}{post}'  varinit,vardecl    \n/set format verbose display '{pre}{action} Variable {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format verbose display '{pre}{action} Variable {name}{post}'                            dropped-vardecl,varinit,expression    \n/set format verbose display '{pre}{action} Variable {name}, auf Null zur\u00FCckgesetzt{post}'             replaced-vardecl,varinit-ok-update    \n\n/set format verbose display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation,record    \n/set format verbose display '{pre}{action} Methode {name}({type}){resolve}{post}'             method    \n\n/set format verbose display '{pre}Verwendung von {typeKind} {name} wurde versucht{resolve}{post}'         used-class,interface,enum,annotation,record    \n/set format verbose display '{pre}Aufruf der Methode {name} ({type}) wurde versucht{resolve}{post}'    used-method    \n\n/set truncation verbose 80\n/set truncation verbose 1000                                                                  varvalue,expression\n\n/set mode normal -command verbose    \n/set format normal display ''                                                               added,modified,replaced,overwrote,dropped-update    \n/set format normal display '{pre}{action} Variable {name}, auf Null zur\u00FCckgesetzt{post}'             replaced-vardecl,varinit-ok-update    \n/set format normal display '{pre}{action} Variable {name}{resolve}{post}'                   replaced-vardecl,varinit-notdefined    \n/set format normal display '{result}'                                                       added,modified,replaced-expression,varvalue,assignment,varinit,vardecl-ok-primary    \n/set mode concise -quiet normal    \n\n/set prompt concise 'jshell> '   '   ...> '    \n\n/set format concise display ''                                                              class,interface,enum,annotation,record,method,assignment,varinit,vardecl-ok    \n\n/set feedback normal    \n\n/set mode silent -quiet    \n/set prompt silent '-> ' '>> '    \n/set truncation silent 80\n/set truncation silent 1000                                                                  varvalue,expression\n/set format silent pre '|  '    \n/set format silent post '%n'    \n/set format silent errorpre '|  '    \n/set format silent errorpost '%n'    \n/set format silent display ''    \n
+help.set.indent =Gibt die Anzahl der Leerzeichen zum Einrücken der Snippets an:\n\n\t/set indent <Anzahl>\n\nZeigt die Einzugseinstellung an:\n\n\t/set indent\n
+startup.feedback = /set mode verbose -command    \n\n/set prompt verbose '\\njshell> '   '   ...> '    \n\n/set format verbose pre '|  '    \n/set format verbose post '%n'    \n/set format verbose errorpre '|  '    \n/set format verbose errorpost '%n'    \n\n/set format verbose errorline '{post}{pre}    {err}'    \n\n/set format verbose action 'Erstellt' added-primary    \n/set format verbose action 'Geändert' modified-primary    \n/set format verbose action 'Ersetzt' replaced-primary    \n/set format verbose action 'Überschrieben' overwrote-primary    \n/set format verbose action 'Gelöscht' dropped-primary    \n/set format verbose action '  Update erstellt' added-update    \n/set format verbose action '  Update geändert' modified-update    \n/set format verbose action '  Update ersetzt' replaced-update    \n/set format verbose action '  Update überschrieben' overwrote-update    \n/set format verbose action '  Update gelöscht' dropped-update    \n\n/set format verbose until ', Instanziierung oder Aufruf der zugehörigen Methoden ist jedoch nicht möglich bis'   defined-class,record-primary    \n/set format verbose until ', Aufruf der zugehörigen Methoden ist jedoch nicht möglich bis'                      defined-interface-primary    \n/set format verbose until ', Verwendung ist jedoch nicht möglich bis'                                  defined-enum,annotation-primary    \n/set format verbose until ', Aufruf ist jedoch nicht möglich bis'                               defined-method-primary    \n/set format verbose until ', Referenzierung ist jedoch nicht möglich bis'                            notdefined-primary    \n/set format verbose until ' Instanziierung oder Aufruf der zugehörigen Methoden ist nicht möglich bis'          defined-class,record-update    \n/set format verbose until ' Aufruf der zugehörigen Methoden ist nicht möglich bis'                              defined-interface-update    \n/set format verbose until ' Aufruf ist nicht möglich bis'                                      defined-method-update    \n/set format verbose until ' Referenzierung ist nicht möglich bis'                                   notdefined-update    \n\n/set format verbose unrerr '{unresolved} ist deklariert'                                           unresolved1-error0    \n/set format verbose unrerr '{unresolved} sind deklariert'                                          unresolved2-error0    \n/set format verbose unrerr ' dieser Fehler ist behoben: {errors}'                                 unresolved0-error1    \n/set format verbose unrerr '{unresolved} ist deklariert, und dieser Fehler ist behoben: {errors}'     unresolved1-error1    \n/set format verbose unrerr '{unresolved} sind deklariert, und dieser Fehler ist behoben: {errors}'    unresolved2-error1    \n/set format verbose unrerr ' diese Fehler sind behoben: {errors}'                              unresolved0-error2    \n/set format verbose unrerr '{unresolved} ist deklariert, und diese Fehler sind behoben: {errors}'  unresolved1-error2    \n/set format verbose unrerr '{unresolved} sind deklariert, und diese Fehler sind behoben: {errors}' unresolved2-error2    \n\n/set format verbose resolve '{until}{unrerr}'                                                   defined,notdefined-added,modified,replaced,used    \n\n/set format verbose typeKind 'Klasse'                  class    \n/set format verbose typeKind 'Schnittstelle'              interface    \n/set format verbose typeKind 'Enum'                   enum    \n/set format verbose typeKind 'Annotationsschnittstelle'   annotation    \n/set format verbose typeKind 'Datensatz'                 record    \n\n/set format verbose result '{name} ==> {value}{post}'                                        added,modified,replaced-ok-primary    \n\n/set format verbose display '{result}{pre}Scratch-Variable {name} erstellt: {type}{post}'    \
+expression-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}Wert von {name}: {type}{post}'                    varvalue-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}Zugewiesen zu {name}: {type}{post}'                 assignment-primary    \n/set format verbose display '{result}{pre}{action} Variable {name}: {type}{resolve}{post}'  varinit,vardecl    \n/set format verbose display '{pre}{action} Variable {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format verbose display '{pre}{action} Variable {name}{post}'                            dropped-vardecl,varinit,expression    \n/set format verbose display '{pre}{action} Variable {name}, auf Null zurückgesetzt{post}'             replaced-vardecl,varinit-ok-update    \n\n/set format verbose display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation,record    \n/set format verbose display '{pre}{action} Methode {name}({type}){resolve}{post}'             method    \n\n/set format verbose display '{pre}Verwendung von {typeKind} {name} wurde versucht{resolve}{post}'         used-class,interface,enum,annotation,record    \n/set format verbose display '{pre}Aufruf der Methode {name} ({type}) wurde versucht{resolve}{post}'    used-method    \n\n/set truncation verbose 80\n/set truncation verbose 1000                                                                  varvalue,expression\n\n/set mode normal -command verbose    \n/set format normal display ''                                                               added,modified,replaced,overwrote,dropped-update    \n/set format normal display '{pre}{action} Variable {name}, auf Null zurückgesetzt{post}'             replaced-vardecl,varinit-ok-update    \n/set format normal display '{pre}{action} Variable {name}{resolve}{post}'                   replaced-vardecl,varinit-notdefined    \n/set format normal display '{result}'                                                       added,modified,replaced-expression,varvalue,assignment,varinit,vardecl-ok-primary    \n/set mode concise -quiet normal    \n\n/set prompt concise 'jshell> '   '   ...> '    \n\n/set format concise display ''                                                              class,interface,enum,annotation,record,method,assignment,varinit,vardecl-ok    \n\n/set feedback normal    \n\n/set mode silent -quiet    \n/set prompt silent '-> ' '>> '    \n/set truncation silent 80\n/set truncation silent 1000                                                                  varvalue,expression\n/set format silent pre '|  '    \n/set format silent post '%n'    \n/set format silent errorpre '|  '    \n/set format silent errorpost '%n'    \n/set format silent display ''    \n
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
index 58b26187f4c..8f2029d291f 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
@@ -23,309 +23,309 @@
 # questions.
 #
 
-jshell.msg.welcome =JShell\u3078\u3088\u3046\u3053\u305D -- \u30D0\u30FC\u30B8\u30E7\u30F3{0}\n\u6982\u8981\u306B\u3064\u3044\u3066\u306F\u3001\u6B21\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: /help intro
-jshell.err.opt.arg = {0}\u3078\u306E\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-jshell.err.opt.invalid = \u7121\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}\u3002
-jshell.err.opt.one = {0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306F1\u3064\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-jshell.err.opt.startup.conflict = \u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u7AF6\u5408: --startup\u3068--no-startup\u306E\u4E21\u65B9\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-jshell.err.opt.feedback.one = \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3(--feedback\u3001-q\u3001-s\u307E\u305F\u306F-v)\u306F1\u3064\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-jshell.err.opt.unknown = \u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
-
-jshell.msg.terminated = \u72B6\u614B\u30A8\u30F3\u30B8\u30F3\u304C\u7D42\u4E86\u3057\u307E\u3057\u305F\u3002
-jshell.msg.terminated.restore = \u6B21\u3092\u6307\u5B9A\u3057\u3066\u5B9A\u7FA9\u3092\u5FA9\u5143\u3057\u3066\u304F\u3060\u3055\u3044: /reload -restore
-
-jshell.msg.use.one.of = \u6B21\u306E\u3044\u305A\u308C\u304B\u3092\u4F7F\u7528\u3057\u307E\u3059: {0}
-jshell.msg.see.classes.etc = /types\u3001/methods\u3001/vars\u307E\u305F\u306F/list\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
-jshell.err.arg = \u7121\u52B9\u306A''{0}''\u5F15\u6570: {1}
-jshell.msg.see = \u8A73\u7D30\u306F\u3001{0}\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-
-jshell.err.file.not.accessible = ''{0}''\u306E\u30D5\u30A1\u30A4\u30EB''{1}''\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {2}
-jshell.err.file.not.found = ''{0}''\u306E\u30D5\u30A1\u30A4\u30EB''{1}''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-jshell.err.file.exception = ''{0}''\u306E\u30D5\u30A1\u30A4\u30EB''{1}''\u304C\u4F8B\u5916\u3092\u30B9\u30ED\u30FC\u3057\u307E\u3057\u305F: {2}
-jshell.err.file.filename = ''{0}''\u306B\u306F\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002
-
-jshell.err.startup.unexpected.exception = \u8D77\u52D5\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u4E88\u671F\u3057\u306A\u3044\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}
-jshell.err.unexpected.exception = \u4E88\u671F\u3057\u306A\u3044\u4F8B\u5916: {0}
-
-jshell.err.invalid.command = \u7121\u52B9\u306A\u30B3\u30DE\u30F3\u30C9: {0}
-jshell.err.command.ambiguous = \u30B3\u30DE\u30F3\u30C9: ''{0}''\u306F\u3042\u3044\u307E\u3044\u3067\u3059: {1}
-jshell.msg.set.restore = \u65B0\u3057\u3044\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u8A2D\u5B9A\u3068\u72B6\u614B\u306E\u5FA9\u5143\u3002
-jshell.msg.set.editor.set = \u30A8\u30C7\u30A3\u30BF\u306F\u6B21\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-jshell.msg.set.editor.retain = \u30A8\u30C7\u30A3\u30BF\u8A2D\u5B9A\u304C\u4FDD\u6301\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-jshell.msg.set.indent.set = \u30A4\u30F3\u30C7\u30F3\u30C8\u30FB\u30EC\u30D9\u30EB\u306F\u6B21\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-jshell.err.invalid.indent = \u7121\u52B9\u306A\u30A4\u30F3\u30C7\u30F3\u30C8\u30FB\u30EC\u30D9\u30EB: {0}
-jshell.err.no.builtin.editor = \u7D44\u8FBC\u307F\u30A8\u30C7\u30A3\u30BF\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-jshell.err.cant.launch.editor = \u7D44\u8FBC\u307F\u30A8\u30C7\u30A3\u30BF\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093 -- \u4E88\u671F\u3057\u306A\u3044\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}
-jshell.msg.try.set.editor = \u5916\u90E8\u30A8\u30C7\u30A3\u30BF\u3092\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001''/help /set editor''\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-jshell.msg.press.return.to.leave.edit.mode = \u300C\u623B\u308B\u300D\u3092\u62BC\u3059\u3068\u7DE8\u96C6\u30E2\u30FC\u30C9\u304C\u7D42\u4E86\u3057\u307E\u3059\u3002
-jshell.err.wait.applies.to.external.editor = -wait\u306F\u5916\u90E8\u30A8\u30C7\u30A3\u30BF\u306B\u9069\u7528\u3055\u308C\u307E\u3059
+jshell.msg.welcome =JShellへようこそ -- バージョン{0}\n概要については、次を入力してください: /help intro
+jshell.err.opt.arg = {0}への引数がありません。
+jshell.err.opt.invalid = 無効なオプション: {0}。
+jshell.err.opt.one = {0}オプションは1つのみ使用できます。
+jshell.err.opt.startup.conflict = オプションの競合: --startupと--no-startupの両方が使用されています。
+jshell.err.opt.feedback.one = フィードバック・オプション(--feedback、-q、-sまたは-v)は1つのみ使用できます。
+jshell.err.opt.unknown = 不明なオプション: {0}
+
+jshell.msg.terminated = 状態エンジンが終了しました。
+jshell.msg.terminated.restore = 次を指定して定義を復元してください: /reload -restore
+
+jshell.msg.use.one.of = 次のいずれかを使用します: {0}
+jshell.msg.see.classes.etc = /types、/methods、/varsまたは/listを参照してください
+jshell.err.arg = 無効な''{0}''引数: {1}
+jshell.msg.see = 詳細は、{0}を参照してください。
+
+jshell.err.file.not.accessible = ''{0}''のファイル''{1}''にアクセスできません: {2}
+jshell.err.file.not.found = ''{0}''のファイル''{1}''が見つかりません。
+jshell.err.file.exception = ''{0}''のファイル''{1}''が例外をスローしました: {2}
+jshell.err.file.filename = ''{0}''にはファイル名の引数が必要です。
+
+jshell.err.startup.unexpected.exception = 起動の読取り中に予期しない例外が発生しました: {0}
+jshell.err.unexpected.exception = 予期しない例外: {0}
+
+jshell.err.invalid.command = 無効なコマンド: {0}
+jshell.err.command.ambiguous = コマンド: ''{0}''はあいまいです: {1}
+jshell.msg.set.restore = 新しいオプションの設定と状態の復元。
+jshell.msg.set.editor.set = エディタは次に設定されています: {0}
+jshell.msg.set.editor.retain = エディタ設定が保持されています: {0}
+jshell.msg.set.indent.set = インデント・レベルは次に設定されています: {0}
+jshell.err.invalid.indent = 無効なインデント・レベル: {0}
+jshell.err.no.builtin.editor = 組込みエディタがありません。
+jshell.err.cant.launch.editor = 組込みエディタを起動できません -- 予期しない例外が発生しました: {0}
+jshell.msg.try.set.editor = 外部エディタを使用するには、''/help /set editor''を参照してください。
+jshell.msg.press.return.to.leave.edit.mode = 「戻る」を押すと編集モードが終了します。
+jshell.err.wait.applies.to.external.editor = -waitは外部エディタに適用されます
 jshell.label.editpad = JShell Edit Pad
 
-jshell.err.setting.to.retain.must.be.specified = \u4FDD\u6301\u3059\u308B\u8A2D\u5B9A\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 -- {0}
-jshell.msg.set.show.mode.settings = \n\u30E2\u30FC\u30C9\u8A2D\u5B9A\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u3001''/set prompt''\u3001''/set truncation'' ...\u3092\u4F7F\u7528\u3059\u308B\u304B\u3001\n''/set mode''\u306E\u5F8C\u306B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u540D\u3092\u7D9A\u3051\u3066\u4F7F\u7528\u3057\u307E\u3059\u3002
-jshell.err.continuation.prompt.required = \u7D9A\u884C\u30D7\u30ED\u30F3\u30D7\u30C8\u304C\u5FC5\u8981\u3067\u3059 -- {0}
-
-jshell.msg.try.command.without.args = \u5F15\u6570\u3092\u6307\u5B9A\u305B\u305A\u306B''{0}''\u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-jshell.msg.no.active = \u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u5B9A\u7FA9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-
-jshell.msg.resetting = \u30EA\u30BB\u30C3\u30C8\u4E2D...
-jshell.msg.resetting.state = \u72B6\u614B\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u3044\u307E\u3059\u3002
-
-jshell.err.reload.no.previous = \u5FA9\u5143\u3059\u308B\u4EE5\u524D\u306E\u5C65\u6B74\u304C\u3042\u308A\u307E\u305B\u3093
-jshell.err.reload.restarting.previous.state = \u518D\u8D77\u52D5\u3057\u3001\u4EE5\u524D\u306E\u72B6\u614B\u304B\u3089\u5FA9\u5143\u3057\u3066\u3044\u307E\u3059\u3002
-jshell.err.reload.restarting.state = \u518D\u8D77\u52D5\u3057\u3001\u72B6\u614B\u3092\u5FA9\u5143\u3057\u3066\u3044\u307E\u3059\u3002
-
-jshell.err.restart.failed = \u518D\u8D77\u52D5\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}\n\n\u524D\u306E\u8A2D\u5B9A\u306B\u623B\u3057\u3001\u518D\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059...
-
-jshell.msg.vars.not.active = (\u975E\u30A2\u30AF\u30C6\u30A3\u30D6)
-
-jshell.err.out.of.range = \u7BC4\u56F2\u5916
-
-jshell.msg.error = \u30A8\u30E9\u30FC:
-jshell.msg.warning = \u8B66\u544A:
-
-jshell.err.sub.arg = ''{0}''\u30B3\u30DE\u30F3\u30C9\u306B\u306F\u30B5\u30D6\u30B3\u30DE\u30F3\u30C9\u304C\u5FC5\u8981\u3067\u3059\u3002''/help {0}''\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
-jshell.err.sub.ambiguous = ''{0}''\u3078\u306E\u30B5\u30D6\u30B3\u30DE\u30F3\u30C9\u5F15\u6570\u304C\u3042\u3044\u307E\u3044\u3067\u3059: {1}
-
-jshell.err.classpath.arg = /classpath\u30B3\u30DE\u30F3\u30C9\u306B\u306F\u30D1\u30B9\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002
-jshell.msg.classpath = \u30D1\u30B9''{0}''\u304C\u30AF\u30E9\u30B9\u30D1\u30B9\u306B\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F
-
-jshell.err.help.arg = \u6307\u5B9A\u3057\u305F\u5F15\u6570\u3067\u59CB\u307E\u308B\u30B3\u30DE\u30F3\u30C9\u307E\u305F\u306F\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u3042\u308A\u307E\u305B\u3093: {0}
-jshell.msg.help.begin =Java\u8A00\u8A9E\u306E\u5F0F\u3001\u6587\u307E\u305F\u306F\u5BA3\u8A00\u3092\u5165\u529B\u3057\u307E\u3059\u3002\n\u307E\u305F\u306F\u3001\u6B21\u306E\u30B3\u30DE\u30F3\u30C9\u306E\u3044\u305A\u308C\u304B\u3092\u5165\u529B\u3057\u307E\u3059:\n
-jshell.msg.help.subject =\n\u8A73\u7D30\u306F\u3001''/help''\u306E\u5F8C\u306B\u30B3\u30DE\u30F3\u30C9\u307E\u305F\u306F\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u540D\u524D\u3092\u7D9A\u3051\u3066\n\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u305F\u3068\u3048\u3070\u3001''/help /list''\u307E\u305F\u306F''/help intro''\u306A\u3069\u3067\u3059\u3002\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8:\n\n
-
-jshell.err.no.snippet.with.id = ID: {0}\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-jshell.err.end.snippet.range.less.than.start = \u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u7BC4\u56F2\u306E\u7D42\u4E86\u70B9\u304C\u958B\u59CB\u70B9\u3088\u308A\u5C0F\u3055\u304F\u306A\u3063\u3066\u3044\u307E\u3059: {0} - {1}
-jshell.err.range.requires.id = \u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u7BC4\u56F2\u306B\u306F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u304C\u5FC5\u8981\u3067\u3059: {0}
-
-jshell.err.exit.not.expression = /exit\u306E\u5F15\u6570\u306F\u3001\u6709\u52B9\u306A\u6574\u6570\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u306F\u5F0F\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0}
-jshell.err.exit.bad.type = /exit\u306E\u5F15\u6570\u306F\u3001\u6709\u52B9\u306A\u6574\u6570\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7\u306F{1}\u3067\u3059: {0}
-jshell.err.exit.bad.value = /exit\u306E\u5F15\u6570\u306B\u4E0D\u6B63\u306A\u5024\u306E{1}\u304C\u3042\u308A\u307E\u3059: {0}
-
-jshell.err.drop.arg =/drop\u5F15\u6570\u306B\u306F\u3001\u524A\u9664\u3059\u308B\u30A4\u30F3\u30DD\u30FC\u30C8\u3001\u5909\u6570\u3001\u30E1\u30BD\u30C3\u30C9\u307E\u305F\u306F\u30AF\u30E9\u30B9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002\nID\u307E\u305F\u306F\u540D\u524D\u3067\u6307\u5B9A\u3057\u307E\u3059\u3002ID\u3092\u53C2\u7167\u3059\u308B\u306B\u306F/list\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u72B6\u614B\u3092\u30EA\u30BB\u30C3\u30C8\u3059\u308B\u306B\u306F/reset\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
-jshell.err.failed = \u5931\u6557\u3057\u307E\u3057\u305F\u3002
-jshell.msg.native.method = Native\u30E1\u30BD\u30C3\u30C9
-jshell.msg.unknown.source = \u4E0D\u660E\u306A\u30BD\u30FC\u30B9
-jshell.msg.goodbye = \u7D42\u4E86\u3057\u307E\u3059
-jshell.msg.goodbye.value = \u7D42\u4E86\u3057\u307E\u3059({0})
-
-jshell.msg.help.for.help = \u30D8\u30EB\u30D7\u3092\u53C2\u7167\u3059\u308B\u306B\u306F\u3001/help\u3068\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-
-jshell.err.mode.name = \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u540D\u304C\u5FC5\u8981\u3067\u3059: {0}
-jshell.err.missing.mode = \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u304C\u3042\u308A\u307E\u305B\u3093 -- {0}
-jshell.err.field.name = \u30D5\u30A3\u30FC\u30EB\u30C9\u540D\u304C\u5FC5\u8981\u3067\u3059: {0} -- {1}
-jshell.err.mode.unknown = \u540D\u524D{0}\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u304C\u3042\u308A\u307E\u305B\u3093 -- {1}
-
-jshell.err.feedback.does.not.match.mode = \u73FE\u5728\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093: {0} -- {1}
-jshell.err.feedback.ambiguous.mode = \u8907\u6570\u306E\u73FE\u5728\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3068\u4E00\u81F4\u3057\u307E\u3059: {0} -- {1}
-jshell.err.feedback.must.be.quoted = \u30D5\u30A9\u30FC\u30DE\u30C3\u30C8''{0}''\u306F\u5F15\u7528\u7B26\u3067\u56F2\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 -- {1}
-jshell.err.feedback.not.a.valid.selector = ''{1}''\u306E\u6709\u52B9\u306A\u30BB\u30EC\u30AF\u30BF''{0}''\u3067\u306F\u3042\u308A\u307E\u305B\u3093 -- {2}
-jshell.err.feedback.multiple.sections = ''{1}''\u306E\u30BB\u30EC\u30AF\u30BF\u30FB\u30EA\u30B9\u30C8''{0}''\u306E\u8907\u6570\u30BB\u30AF\u30B7\u30E7\u30F3\u5185\u306E\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E -- {2}
-jshell.err.feedback.different.selector.kinds = ''{1}''\u306E\u30BB\u30EC\u30AF\u30BF\u30FB\u30EA\u30B9\u30C8''{0}''\u306E\u540C\u3058\u30BB\u30AF\u30B7\u30E7\u30F3\u5185\u306E\u7570\u306A\u308B\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E -- {2}
-
-jshell.msg.feedback.new.mode = \u65B0\u898F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F: {0}
-jshell.msg.feedback.mode = \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9: {0}
-jshell.msg.feedback.mode.following = \u4F7F\u7528\u53EF\u80FD\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9:
-jshell.msg.feedback.retained.mode.following = \u4FDD\u6301\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9:
-jshell.err.mode.creation = \u65B0\u3057\u3044\u30E2\u30FC\u30C9\u3092\u4F5C\u6210\u3059\u308B\u306B\u306F\u3001-command\u307E\u305F\u306F-quiet\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 -- {0}
-jshell.err.mode.exists = \u4F5C\u6210\u3055\u308C\u308B\u30E2\u30FC\u30C9\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059: {0} -- {1}
-
-jshell.err.truncation.expected.length = \u5207\u6368\u3066\u9577\u304C\u5FC5\u8981\u3067\u3059 -- {0}
-jshell.err.truncation.length.not.integer = \u5207\u6368\u3066\u9577\u306F\u6574\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0} -- {1}
-
-jshell.err.not.valid.with.predefined.mode = \u4E8B\u524D\u5B9A\u7FA9\u6E08\u30E2\u30FC\u30C9\u3067\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0} -- {1}
-jshell.err.retained.feedback.mode.must.be.retained.or.predefined = ''/set feedback -retain <mode>''\u3067\u306F\u3001<mode>\u304C\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u304B\u3001''/set mode -retain''\u3067\u4FDD\u6301\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 -- {0}
-
-jshell.err.unknown.option = \u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0} -- {1}
-jshell.err.default.option.or.program = -default\u30AA\u30D7\u30B7\u30E7\u30F3\u3001-delete\u30AA\u30D7\u30B7\u30E7\u30F3\u307E\u305F\u306F\u30D7\u30ED\u30B0\u30E9\u30E0\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044 -- {0}
-jshell.err.option.or.filename = -default\u3001-none\u307E\u305F\u306F\u8D77\u52D5\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u3044\u305A\u308C\u304B\u30921\u3064\u306E\u307F\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044 -- {0}
-jshell.err.unexpected.at.end = \u30B3\u30DE\u30F3\u30C9\u306E\u7D42\u308F\u308A\u306B\u4E88\u671F\u3057\u306A\u3044\u5F15\u6570\u304C\u3042\u308A\u307E\u3059: {0} -- {1}
-jshell.err.conflicting.options = \u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059 -- {0}
-jshell.err.cannot.delete.current.mode = \u73FE\u5728\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9''{0}''\u306F\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\u6700\u521D\u306B''/set feedback''\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044 -- {1}
-jshell.err.cannot.delete.retained.mode = \u4FDD\u6301\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9''{0}''\u306F\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\u6700\u521D\u306B''/set feedback -retain''\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044 -- {1}
-jshell.err.may.not.specify.options.and.snippets = \u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u4E21\u65B9\u3092\u4F7F\u7528\u3057\u3066\u306F\u3044\u3051\u307E\u305B\u3093: {0}
-jshell.err.no.such.snippets = \u6307\u5B9A\u3055\u308C\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u306F\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
-jshell.err.the.snippet.cannot.be.used.with.this.command = \u3053\u306E\u30B3\u30DE\u30F3\u30C9\u306F\u30B9\u30CB\u30DA\u30C3\u30C8''{0}''\u3092\u53D7\u3051\u5165\u308C\u307E\u305B\u3093: {1}
-jshell.err.retained.mode.failure = \u4FDD\u6301\u3055\u308C\u305F\u30E2\u30FC\u30C9\u3067\u5931\u6557\u3057\u307E\u3057\u305F(\u30E2\u30FC\u30C9\u306F\u30AF\u30EA\u30A2\u3055\u308C\u307E\u3057\u305F) -- {0} {1}
-
-jshell.err.corrupted.stored.startup = \u683C\u7D0D\u3055\u308C\u3066\u3044\u308B\u8D77\u52D5\u304C\u58CA\u308C\u3066\u3044\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u4F7F\u7528\u3057\u307E\u3059 -- {0}
-
-jshell.err.exception.thrown = \u4F8B\u5916{0}
-jshell.err.exception.thrown.message = \u4F8B\u5916{0}: {1}
-jshell.err.exception.cause = \u539F\u56E0: {0}
-jshell.err.exception.cause.message = \u539F\u56E0: {0}: {1}
-
-jshell.console.see.synopsis = <\u6982\u8981\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u30BF\u30D6\u3092\u518D\u5EA6\u62BC\u3057\u3066\u304F\u3060\u3055\u3044>
-jshell.console.see.full.documentation = <\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5168\u4F53\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u30BF\u30D6\u3092\u518D\u5EA6\u62BC\u3057\u3066\u304F\u3060\u3055\u3044>
-jshell.console.see.documentation = <\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u30BF\u30D6\u3092\u518D\u5EA6\u62BC\u3057\u3066\u304F\u3060\u3055\u3044>
-jshell.console.see.next.page = <\u6B21\u306E\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u30BF\u30D6\u3092\u518D\u5EA6\u62BC\u3057\u3066\u304F\u3060\u3055\u3044>
-jshell.console.see.next.javadoc = <\u6B21\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u30BF\u30D6\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044>
-jshell.console.see.next.command.doc = <\u6B21\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u30BF\u30D6\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044>
-jshell.console.no.such.command = \u6307\u5B9A\u3057\u305F\u30B3\u30DE\u30F3\u30C9\u304C\u5B58\u5728\u3057\u307E\u305B\u3093
-jshell.console.completion.current.signatures = \u30B7\u30B0\u30CD\u30C1\u30E3:
-jshell.console.completion.all.completions.number = <\u4F7F\u7528\u53EF\u80FD\u306A\u88DC\u5B8C\u7D50\u679C\u3092\u3059\u3079\u3066\u8868\u793A\u3059\u308B\u306B\u306F\u30BF\u30D6\u3092\u518D\u5EA6\u62BC\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u4F7F\u7528\u53EF\u80FD\u306A\u88DC\u5B8C\u7D50\u679C\u5408\u8A08: {0}>
-jshell.console.completion.all.completions = <\u4F7F\u7528\u53EF\u80FD\u306A\u88DC\u5B8C\u7D50\u679C\u3092\u3059\u3079\u3066\u8868\u793A\u3059\u308B\u306B\u306F\u30BF\u30D6\u3092\u518D\u5EA6\u62BC\u3057\u3066\u304F\u3060\u3055\u3044>
-jshell.console.no.javadoc = <\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093>
-jshell.console.do.nothing = \u4F55\u3082\u3057\u306A\u3044
-jshell.console.choice = \u9078\u629E:\u0020
-jshell.console.create.variable = \u5909\u6570\u306E\u4F5C\u6210
-jshell.console.create.method = \u30E1\u30BD\u30C3\u30C9\u306E\u4F5C\u6210
-jshell.console.resolvable = \n\u8B58\u5225\u5B50\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u89E3\u6C7A\u3067\u304D\u307E\u3059\u3002
-jshell.console.no.candidate = \n\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B\u5019\u88DC\u306E\u5B8C\u5168\u4FEE\u98FE\u3055\u308C\u305F\u540D\u524D\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-jshell.console.incomplete = \n\u7D50\u679C\u304C\u4E0D\u5B8C\u5168\u3067\u3042\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u7D50\u679C\u3092\u5B8C\u5168\u306B\u3059\u308B\u306B\u306F\u3001\u5F8C\u3067\u518D\u8A66\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-jshell.console.erroneous = \n\u4E0D\u5B8C\u5168\u307E\u305F\u306F\u30A8\u30E9\u30FC\u3002\u5358\u4E00\u306E\u6709\u52B9\u306A\u5F0F\u307E\u305F\u306F\u6587\u304C[Shift]+[Tab] m\u306B\u5148\u884C\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-jshell.console.exprstmt = \n\u5358\u4E00\u306E\u6709\u52B9\u306A\u5F0F\u307E\u305F\u306F\u6587\u304C[Shift]+[Tab] m\u306B\u5148\u884C\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-jshell.console.empty = \n\u7A7A\u306E\u30A8\u30F3\u30C8\u30EA\u3002\u5358\u4E00\u306E\u6709\u52B9\u306A\u5F0F\u307E\u305F\u306F\u6587\u304C[Shift]+[Tab] m\u306B\u5148\u884C\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-
-jshell.fix.wrong.shortcut =[Shift]+[Tab]\u306E\u5F8C\u306E\u6587\u5B57\u304C\u4E88\u671F\u3057\u306A\u3044\u6587\u5B57\u3067\u3059\u3002\n\u81EA\u52D5\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u306F"i"\u3001\u5909\u6570\u306E\u4F5C\u6210\u306B\u306F"v"\u3001\u30E1\u30BD\u30C3\u30C9\u306E\u4F5C\u6210\u306B\u306F"m"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u8A73\u7D30\u306F\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n/help shortcuts
-
-help.usage = \u4F7F\u7528\u65B9\u6CD5:   jshell <option>... <load-file>...\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:\n    --class-path <path>   \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --module-path <path>  \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --add-modules <module>(,<module>)*\n                          \u89E3\u6C7A\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F<module>\u304CALL-MODULE-PATH\n                            \u3067\u3042\u308B\u5834\u5408\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --enable-native-access\n                          \u30B3\u30FC\u30C9\u3067\u5236\u9650\u4ED8\u304D\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30E1\u30BD\u30C3\u30C9\u5B9F\u884C\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n    --enable-preview      \u30B3\u30FC\u30C9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n    --startup <file>      \u8D77\u52D5\u5B9A\u7FA9\u306E\u4EE3\u66FF\u3068\u3057\u3066\u5B9F\u884C\u3055\u308C\u307E\u3059\n    --no-startup          \u8D77\u52D5\u5B9A\u7FA9\u3092\u5B9F\u884C\u3057\u307E\u305B\u3093\n    --feedback <mode>     \u521D\u671F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u30E2\u30FC\u30C9\u306F\n                            \u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B(silent\u3001concise\u3001normal\u307E\u305F\u306Fverbose)\u304B\u3001\n                            \u4E8B\u524D\u306B\u30E6\u30FC\u30B6\u30FC\u304C\u5B9A\u7FA9\u3067\u304D\u307E\u3059\n    -q                    \u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback concise\u3068\u540C\u3058\n    -s                    \u975E\u5E38\u306B\u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback silent\u3068\u540C\u3058\n    -v                    \u8A73\u7D30\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback verbose\u3068\u540C\u3058\n    -J<flag>              <flag>\u3092\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3057\u307E\u3059\u3002\n                            \u5B9F\u884C\u6642\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-J\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -R<flag>              <flag>\u3092\u30EA\u30E2\u30FC\u30C8\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30EA\u30E2\u30FC\u30C8\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-R\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -C<flag>              <flag>\u3092\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30B3\u30F3\u30D1\u30A4\u30E9\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-C\u3092\u4F7F\u7528\u3057\u307E\u3059\n    --version             \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --show-version        \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D9A\u884C\u3057\u307E\u3059\n    --help, -?, -h        \u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u3053\u306E\u6982\u8981\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --help-extra, -X      \
-\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n\n\u30D5\u30A1\u30A4\u30EB\u5F15\u6570\u306B\u306F\u3001\u30D5\u30A1\u30A4\u30EB\u540D\u304B\u3001\u307E\u305F\u306F\u4E8B\u524D\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u540D(DEFAULT\u3001\nPRINTING\u3001TOOLING\u307E\u305F\u306FJAVASE)\u306E1\u3064\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\nload-file\u3067\u3082\u3001\u5BFE\u8A71\u578BI/O\u3092\u4F7F\u7528\u305B\u305A\u306B\u3001"-"\u3092\u6307\u5B9A\u3057\u3066\u6A19\u6E96\u5165\u529B\u3092\u793A\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n\n\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3(--class-path\u3001--module-path\u3001\n--add-modules)\u306E\u8A73\u7D30\u306F\u3001\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n\t/help context\n\n\u30D1\u30B9\u306B\u306F\u3001\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3068\u30A2\u30FC\u30AB\u30A4\u30D6\u304C\u30EA\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002Windows\u306E\u5834\u5408\u306F\u3001\n\u30BB\u30DF\u30B3\u30ED\u30F3(;)\u3092\u4F7F\u7528\u3057\u3066\u30D1\u30B9\u306E\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306F\u3001\n\u30B3\u30ED\u30F3(:)\u3092\u4F7F\u7528\u3057\u3066\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\n
-help.usage.x = \    --add-exports <module>/<package>   \u5B9A\u7FA9\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u3089\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u308B\u3068\n                                         \u307F\u306A\u3055\u308C\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --execution <spec>                 \u4EE3\u66FF\u5B9F\u884C\u30A8\u30F3\u30B8\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                                         \u3053\u3053\u3067\u3001<spec>\u306FExecutionControl spec\u3067\u3059\u3002\n                                         spec\u306E\u69CB\u6587\u306B\u3064\u3044\u3066\u306F\u3001\u30D1\u30C3\u30B1\u30FC\u30B8jdk.jshell.spi\u306E\n                                         \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    \n\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
-
-help.list.summary = \u5165\u529B\u3057\u305F\u30BD\u30FC\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+jshell.err.setting.to.retain.must.be.specified = 保持する設定を指定する必要があります -- {0}
+jshell.msg.set.show.mode.settings = \nモード設定を表示するには、''/set prompt''、''/set truncation'' ...を使用するか、\n''/set mode''の後にフィードバック・モード名を続けて使用します。
+jshell.err.continuation.prompt.required = 続行プロンプトが必要です -- {0}
+
+jshell.msg.try.command.without.args = 引数を指定せずに''{0}''を実行してください。
+jshell.msg.no.active = アクティブな定義がありません。
+
+jshell.msg.resetting = リセット中...
+jshell.msg.resetting.state = 状態をリセットしています。
+
+jshell.err.reload.no.previous = 復元する以前の履歴がありません
+jshell.err.reload.restarting.previous.state = 再起動し、以前の状態から復元しています。
+jshell.err.reload.restarting.state = 再起動し、状態を復元しています。
+
+jshell.err.restart.failed = 再起動に失敗しました: {0}\n\n前の設定に戻し、再起動しています...
+
+jshell.msg.vars.not.active = (非アクティブ)
+
+jshell.err.out.of.range = 範囲外
+
+jshell.msg.error = エラー:
+jshell.msg.warning = 警告:
+
+jshell.err.sub.arg = ''{0}''コマンドにはサブコマンドが必要です。''/help {0}''を参照してください
+jshell.err.sub.ambiguous = ''{0}''へのサブコマンド引数があいまいです: {1}
+
+jshell.err.classpath.arg = /classpathコマンドにはパス引数が必要です。
+jshell.msg.classpath = パス''{0}''がクラスパスに追加されました
+
+jshell.err.help.arg = 指定した引数で始まるコマンドまたはサブジェクトはありません: {0}
+jshell.msg.help.begin =Java言語の式、文または宣言を入力します。\nまたは、次のコマンドのいずれかを入力します:\n
+jshell.msg.help.subject =\n詳細は、''/help''の後にコマンドまたはサブジェクトの名前を続けて\n入力してください。\nたとえば、''/help /list''または''/help intro''などです。サブジェクト:\n\n
+
+jshell.err.no.snippet.with.id = ID: {0}のスニペットは存在しません
+jshell.err.end.snippet.range.less.than.start = スニペットの範囲の終了点が開始点より小さくなっています: {0} - {1}
+jshell.err.range.requires.id = スニペットの範囲にはスニペットIDが必要です: {0}
+
+jshell.err.exit.not.expression = /exitの引数は、有効な整数式である必要があります。これは式ではありません: {0}
+jshell.err.exit.bad.type = /exitの引数は、有効な整数式である必要があります。タイプは{1}です: {0}
+jshell.err.exit.bad.value = /exitの引数に不正な値の{1}があります: {0}
+
+jshell.err.drop.arg =/drop引数には、削除するインポート、変数、メソッドまたはクラスを指定してください。\nIDまたは名前で指定します。IDを参照するには/listを使用します。すべての状態をリセットするには/resetを使用します。
+jshell.err.failed = 失敗しました。
+jshell.msg.native.method = Nativeメソッド
+jshell.msg.unknown.source = 不明なソース
+jshell.msg.goodbye = 終了します
+jshell.msg.goodbye.value = 終了します({0})
+
+jshell.msg.help.for.help = ヘルプを参照するには、/helpと入力してください。
+
+jshell.err.mode.name = フィードバック・モード名が必要です: {0}
+jshell.err.missing.mode = フィードバック・モードがありません -- {0}
+jshell.err.field.name = フィールド名が必要です: {0} -- {1}
+jshell.err.mode.unknown = 名前{0}のフィードバック・モードがありません -- {1}
+
+jshell.err.feedback.does.not.match.mode = 現在のフィードバック・モードと一致しません: {0} -- {1}
+jshell.err.feedback.ambiguous.mode = 複数の現在のフィードバック・モードと一致します: {0} -- {1}
+jshell.err.feedback.must.be.quoted = フォーマット''{0}''は引用符で囲む必要があります -- {1}
+jshell.err.feedback.not.a.valid.selector = ''{1}''の有効なセレクタ''{0}''ではありません -- {2}
+jshell.err.feedback.multiple.sections = ''{1}''のセレクタ・リスト''{0}''の複数セクション内のセレクタ種類 -- {2}
+jshell.err.feedback.different.selector.kinds = ''{1}''のセレクタ・リスト''{0}''の同じセクション内の異なるセレクタ種類 -- {2}
+
+jshell.msg.feedback.new.mode = 新規フィードバック・モードが作成されました: {0}
+jshell.msg.feedback.mode = フィードバック・モード: {0}
+jshell.msg.feedback.mode.following = 使用可能なフィードバック・モード:
+jshell.msg.feedback.retained.mode.following = 保持されたフィードバック・モード:
+jshell.err.mode.creation = 新しいモードを作成するには、-commandまたは-quietオプションを使用する必要があります -- {0}
+jshell.err.mode.exists = 作成されるモードはすでに存在します: {0} -- {1}
+
+jshell.err.truncation.expected.length = 切捨て長が必要です -- {0}
+jshell.err.truncation.length.not.integer = 切捨て長は整数である必要があります: {0} -- {1}
+
+jshell.err.not.valid.with.predefined.mode = 事前定義済モードでは有効ではありません: {0} -- {1}
+jshell.err.retained.feedback.mode.must.be.retained.or.predefined = ''/set feedback -retain <mode>''では、<mode>が事前に定義されているか、''/set mode -retain''で保持されている必要があります -- {0}
+
+jshell.err.unknown.option = 不明なオプション: {0} -- {1}
+jshell.err.default.option.or.program = -defaultオプション、-deleteオプションまたはプログラムを指定してください -- {0}
+jshell.err.option.or.filename = -default、-noneまたは起動ファイル名のいずれかを1つのみ指定してください -- {0}
+jshell.err.unexpected.at.end = コマンドの終わりに予期しない引数があります: {0} -- {1}
+jshell.err.conflicting.options = オプションが競合しています -- {0}
+jshell.err.cannot.delete.current.mode = 現在のフィードバック・モード''{0}''は削除できません。最初に''/set feedback''を使用してください -- {1}
+jshell.err.cannot.delete.retained.mode = 保持されたフィードバック・モード''{0}''は削除できません。最初に''/set feedback -retain''を使用してください -- {1}
+jshell.err.may.not.specify.options.and.snippets = オプションとスニペットの両方を使用してはいけません: {0}
+jshell.err.no.such.snippets = 指定されたスニペットは存在しません: {0}
+jshell.err.the.snippet.cannot.be.used.with.this.command = このコマンドはスニペット''{0}''を受け入れません: {1}
+jshell.err.retained.mode.failure = 保持されたモードで失敗しました(モードはクリアされました) -- {0} {1}
+
+jshell.err.corrupted.stored.startup = 格納されている起動が壊れています。デフォルトを使用します -- {0}
+
+jshell.err.exception.thrown = 例外{0}
+jshell.err.exception.thrown.message = 例外{0}: {1}
+jshell.err.exception.cause = 原因: {0}
+jshell.err.exception.cause.message = 原因: {0}: {1}
+
+jshell.console.see.synopsis = <概要を表示するにはタブを再度押してください>
+jshell.console.see.full.documentation = <ドキュメント全体を表示するにはタブを再度押してください>
+jshell.console.see.documentation = <ドキュメントを表示するにはタブを再度押してください>
+jshell.console.see.next.page = <次のページを表示するにはタブを再度押してください>
+jshell.console.see.next.javadoc = <次のドキュメントを表示するにはタブを押してください>
+jshell.console.see.next.command.doc = <次のコマンドを表示するにはタブを押してください>
+jshell.console.no.such.command = 指定したコマンドが存在しません
+jshell.console.completion.current.signatures = シグネチャ:
+jshell.console.completion.all.completions.number = <使用可能な補完結果をすべて表示するにはタブを再度押してください。使用可能な補完結果合計: {0}>
+jshell.console.completion.all.completions = <使用可能な補完結果をすべて表示するにはタブを再度押してください>
+jshell.console.no.javadoc = <ドキュメントが見つかりません>
+jshell.console.do.nothing = 何もしない
+jshell.console.choice = 選択:\u0020
+jshell.console.create.variable = 変数の作成
+jshell.console.create.method = メソッドの作成
+jshell.console.resolvable = \n識別子はこのコンテキストで解決できます。
+jshell.console.no.candidate = \nインポートする候補の完全修飾された名前が見つかりません。
+jshell.console.incomplete = \n結果が不完全である可能性があります。結果を完全にするには、後で再試行してください。
+jshell.console.erroneous = \n不完全またはエラー。単一の有効な式または文が[Shift]+[Tab] mに先行する必要があります。
+jshell.console.exprstmt = \n単一の有効な式または文が[Shift]+[Tab] mに先行する必要があります。
+jshell.console.empty = \n空のエントリ。単一の有効な式または文が[Shift]+[Tab] mに先行する必要があります。
+
+jshell.fix.wrong.shortcut =[Shift]+[Tab]の後の文字が予期しない文字です。\n自動インポートには"i"、変数の作成には"v"、メソッドの作成には"m"を使用してください。\n詳細は次を参照してください:\n/help shortcuts
+
+help.usage = 使用方法:   jshell <option>... <load-file>...\n使用可能なオプションには次のものがあります:\n    --class-path <path>   ユーザー・クラス・ファイルのある場所を指定します\n    --module-path <path>  アプリケーション・モジュールのある場所を指定します\n    --add-modules <module>(,<module>)*\n                          解決するモジュール、または<module>がALL-MODULE-PATH\n                            である場合はモジュール・パスのすべてのモジュールを指定します\n    --enable-native-access\n                          コードで制限付きネイティブ・メソッド実行させることができます\n    --enable-preview      コードをこのリリースのプレビュー機能に依存させることができます\n    --startup <file>      起動定義の代替として実行されます\n    --no-startup          起動定義を実行しません\n    --feedback <mode>     初期フィードバック・モードを指定します。モードは\n                            事前に定義されている(silent、concise、normalまたはverbose)か、\n                            事前にユーザーが定義できます\n    -q                    簡潔なフィードバック。--feedback conciseと同じ\n    -s                    非常に簡潔なフィードバック。--feedback silentと同じ\n    -v                    詳細なフィードバック。--feedback verboseと同じ\n    -J<flag>              <flag>を実行時システムに直接渡します。\n                            実行時フラグまたはフラグ引数ごとに1つの-Jを使用します\n    -R<flag>              <flag>をリモート実行時システムに渡します。\n                            リモート・フラグまたはフラグ引数ごとに1つの-Rを使用します\n    -C<flag>              <flag>をコンパイラに渡します。\n                            コンパイラ・フラグまたはフラグ引数ごとに1つの-Cを使用します\n    --version             バージョン情報を出力し終了します\n    --show-version        バージョン情報を出力し続行します\n    --help, -?, -h        標準オプションのこの概要を出力し終了します\n    --help-extra, -X      \
+非標準オプションのヘルプを出力し終了します\n\nファイル引数には、ファイル名か、または事前定義されたファイル名(DEFAULT、\nPRINTING、TOOLINGまたはJAVASE)の1つを指定できます。\nload-fileでも、対話型I/Oを使用せずに、"-"を指定して標準入力を示すことができます。\n\n評価コンテキスト・オプション(--class-path、--module-path、\n--add-modules)の詳細は、次を参照してください:\n\t/help context\n\nパスには、検索するディレクトリとアーカイブがリストされます。Windowsの場合は、\nセミコロン(;)を使用してパスの項目を区切ります。その他のプラットフォームでは、\nコロン(:)を使用して項目を区切ります。\n
+help.usage.x = \    --add-exports <module>/<package>   定義モジュールからエクスポートされると\n                                         みなされるパッケージを指定します\n    --execution <spec>                 代替実行エンジンを指定します。\n                                         ここで、<spec>はExecutionControl specです。\n                                         specの構文については、パッケージjdk.jshell.spiの\n                                         ドキュメントを参照してください\n    \nこれらは非標準オプションであり予告なしに変更されることがあります。\n
+
+help.list.summary = 入力したソースをリストします
 help.list.args = [<name or id>|-all|-start]
-help.list =\u30B9\u30CB\u30DA\u30C3\u30C8ID\u304C\u4ED8\u304F\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n\n/list\n\t\u5165\u529B\u3057\u305F\u3001\u307E\u305F\u306F/open\u3067\u8AAD\u307F\u53D6\u3063\u305F\u30B3\u30FC\u30C9\u306E\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/list -start\n\t\u8A55\u4FA1\u3055\u308C\u305F\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/list -all\n\t\u5931\u6557\u3001\u4E0A\u66F8\u304D\u6E08\u3001\u524A\u9664\u6E08\u304A\u3088\u3073\u8D77\u52D5\u3092\u542B\u3080\u3059\u3079\u3066\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/list <name>\n\t\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059(\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D7\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9)\n\n/list <id>\n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\n\t1\u3064\u4EE5\u4E0A\u306EID\u307E\u305F\u306FID\u7BC4\u56F2\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002'/help id'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
+help.list =スニペットIDが付くスニペットを表示します。\n\n/list\n\t入力した、または/openで読み取ったコードの現在アクティブなスニペットをリストします\n\n/list -start\n\t評価された起動スニペットをリストします\n\n/list -all\n\t失敗、上書き済、削除済および起動を含むすべてのスニペットをリストします\n\n/list <name>\n\t指定した名前のスニペットをリストします(アクティブなスニペットのプリファレンス)\n\n/list <id>\n\t指定したスニペットIDのスニペットをリストします。\n\t1つ以上のIDまたはID範囲を使用できます。'/help id'を参照してください
 
-help.edit.summary = \u30BD\u30FC\u30B9\u30FB\u30A8\u30F3\u30C8\u30EA\u3092\u7DE8\u96C6\u3057\u307E\u3059
+help.edit.summary = ソース・エントリを編集します
 help.edit.args = <name or id>
-help.edit =\u5916\u90E8\u30A8\u30C7\u30A3\u30BF\u3067\u30BD\u30FC\u30B9\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u7DE8\u96C6\u3057\u307E\u3059\u3002\n\u4F7F\u7528\u3059\u308B\u30A8\u30C7\u30A3\u30BF\u306F/set editor\u3067\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002\u30A8\u30C7\u30A3\u30BF\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\n\u6B21\u306E\u74B0\u5883\u5909\u6570\u304C\u9806\u756A\u306B\u30C1\u30A7\u30C3\u30AF\u3055\u308C\u307E\u3059: JSHELLEDITOR\u3001VISUAL\u3001EDITOR\u3002\n\u30A8\u30C7\u30A3\u30BF\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u304A\u3089\u305A\u3001\u30A8\u30C7\u30A3\u30BF\u74B0\u5883\u5909\u6570\u304C\u3069\u308C\u3082\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\n\u7C21\u6613\u30A8\u30C7\u30A3\u30BF\u304C\u8D77\u52D5\u3057\u307E\u3059\u3002\n\n/edit <name>\n\t\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u7DE8\u96C6\u3057\u307E\u3059(\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D7\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9)\n\n/edit <id>\n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u7DE8\u96C6\u3057\u307E\u3059\u3002\n\t1\u3064\u4EE5\u4E0A\u306EID\u307E\u305F\u306FID\u7BC4\u56F2\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002'/help id'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n\n/edit -start\n\t\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u7DE8\u96C6\u3057\u307E\u3059\u3002\u306A\u3093\u3089\u304B\u306E\u5909\u66F4\u304C\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\n\t\u3067\u767A\u751F\u3057\u3066\u3082\u3001\u8D77\u52D5\u8A2D\u5B9A\u306B\u306F\u5F71\u97FF\u3042\u308A\u307E\u305B\u3093\n\n/edit -all\n\t\u5931\u6557\u3001\u4E0A\u66F8\u304D\u6E08\u3001\u524A\u9664\u6E08\u304A\u3088\u3073\u8D77\u52D5\u3092\u542B\u3080\u3059\u3079\u3066\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u7DE8\u96C6\u3057\u307E\u3059\n\n/edit\n\t\u5165\u529B\u3057\u305F\u3001\u307E\u305F\u306F/open\u3067\u8AAD\u307F\u53D6\u3063\u305F\u30B3\u30FC\u30C9\u306E\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u7DE8\u96C6\u3057\u307E\u3059
+help.edit =外部エディタでソースのスニペットを編集します。\n使用するエディタは/set editorで設定されます。エディタが設定されていない場合は、\n次の環境変数が順番にチェックされます: JSHELLEDITOR、VISUAL、EDITOR。\nエディタが設定されておらず、エディタ環境変数がどれも設定されていない場合は、\n簡易エディタが起動します。\n\n/edit <name>\n\t指定した名前のスニペットを編集します(アクティブなスニペットのプリファレンス)\n\n/edit <id>\n\t指定したスニペットIDのスニペットを編集します。\n\t1つ以上のIDまたはID範囲を使用できます。'/help id'を参照してください\n\n/edit -start\n\t起動スニペットを編集します。なんらかの変更がこのセッション\n\tで発生しても、起動設定には影響ありません\n\n/edit -all\n\t失敗、上書き済、削除済および起動を含むすべてのスニペットを編集します\n\n/edit\n\t入力した、または/openで読み取ったコードの現在アクティブなスニペットを編集します
 
-help.drop.summary = \u30BD\u30FC\u30B9\u30FB\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664\u3057\u307E\u3059
+help.drop.summary = ソース・エントリを削除します
 help.drop.args = <name or id>
-help.drop =\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u524A\u9664\u3057\u307E\u3059 -- \u975E\u30A2\u30AF\u30C6\u30A3\u30D6\u306B\u3057\u307E\u3059\u3002\n\n/drop <name>\n\t\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\n\n/drop <id>\n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002\n\t1\u3064\u4EE5\u4E0A\u306EID\u307E\u305F\u306FID\u7BC4\u56F2\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002'/help id'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
+help.drop =スニペットを削除します -- 非アクティブにします。\n\n/drop <name>\n\t指定した名前のスニペットを削除します\n\n/drop <id>\n\t指定したスニペットIDのスニペットを削除します。\n\t1つ以上のIDまたはID範囲を使用できます。'/help id'を参照してください
 
-help.save.summary = \u30D5\u30A1\u30A4\u30EB\u306B\u30B9\u30CB\u30DA\u30C3\u30C8\u30FB\u30BD\u30FC\u30B9\u3092\u4FDD\u5B58\u3057\u307E\u3059
+help.save.summary = ファイルにスニペット・ソースを保存します
 help.save.args = [-all|-history|-start] <file>
-help.save =\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u307E\u305F\u306F\u30B3\u30DE\u30F3\u30C9(\u3042\u308B\u3044\u306F\u305D\u306E\u4E21\u65B9)\u3092\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\n/save <file>\n\t\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30BD\u30FC\u30B9\u3092\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\n/save -all <file>\n\t\u3059\u3079\u3066\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30BD\u30FC\u30B9\u3092\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\t\u4E0A\u66F8\u304D\u6E08\u3001\u5931\u6557\u304A\u3088\u3073\u8D77\u52D5\u30B3\u30FC\u30C9\u3092\u542B\u3080\u30BD\u30FC\u30B9\u304C\u542B\u307E\u308C\u307E\u3059\n\n/save -history <file>\n\tjshell\u30C4\u30FC\u30EB\u306E\u8D77\u52D5\u4EE5\u964D\u5165\u529B\u3055\u308C\u305F\u3001\u3059\u3079\u3066\u306E\u30B3\u30DE\u30F3\u30C9\u304A\u3088\u3073\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\n\t\u9806\u6B21\u5C65\u6B74\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\n/save -start <file>\n\t\u73FE\u5728\u306E\u8D77\u52D5\u5B9A\u7FA9\u3092\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3059\n\n/save <id> <file>\n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\t1\u3064\u4EE5\u4E0A\u306EID\u307E\u305F\u306FID\u7BC4\u56F2\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002'/help id'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
+help.save =指定したスニペットまたはコマンド(あるいはその両方)を指定したファイルに保存します。\n\n/save <file>\n\t現在アクティブなスニペットのソースをファイルに保存します。\n\n/save -all <file>\n\tすべてのスニペットのソースをファイルに保存します。\n\t上書き済、失敗および起動コードを含むソースが含まれます\n\n/save -history <file>\n\tjshellツールの起動以降入力された、すべてのコマンドおよびスニペットの\n\t順次履歴を保存します。\n\n/save -start <file>\n\t現在の起動定義をファイルに保存します\n\n/save <id> <file>\n\t指定したスニペットIDのスニペットを保存します。\n\t1つ以上のIDまたはID範囲を使用できます。'/help id'を参照してください
 
-help.open.summary = \u30BD\u30FC\u30B9\u306E\u5165\u529B\u3068\u3057\u3066\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059
+help.open.summary = ソースの入力としてファイルを開きます
 help.open.args = <file>
-help.open =\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u3068\u3057\u3066\u305D\u306E\u5185\u5BB9\u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002\n\n/open <file>\n\t\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092jshell\u30C4\u30FC\u30EB\u306E\u5165\u529B\u3068\u3057\u3066\u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002\n/open <URL>\n\t\u6307\u5B9A\u3055\u308C\u305FURL\u3092jshell\u30C4\u30FC\u30EB\u306E\u5165\u529B\u3068\u3057\u3066\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3001\u4F7F\u7528\u3057\u307E\u3059\u3002\n\n<file>\u306F\u3001\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u304B\u3001\u4E8B\u524D\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u540D\n(DEFAULT\u3001PRINTING\u3001TOOLING\u307E\u305F\u306FJAVASE)\u306E\u3044\u305A\u308C\u304B\u306B\u306A\u308A\u307E\u3059\u3002\n\u3053\u308C\u3089\u306F\u305D\u308C\u305E\u308C\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u30FB\u30B9\u30CB\u30DA\u30C3\u30C8(-default\u3067\u4F7F\u7528)\u3001\nprint()\u3001println()\u3001printf()\u30E1\u30BD\u30C3\u30C9\u30FB\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u5B9A\u7FA9\u3001JDK\u30C4\u30FC\u30EB\u3092\n\u5B9F\u884C\u3057\u3066\u3044\u308B\u30E1\u30BD\u30C3\u30C9\u30FB\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u5B9A\u7FA9\u3001\u307E\u305F\u306F\u3059\u3079\u3066\u306EJava SE\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u3067\u3059\u3002\n
+help.open =ファイルを開き、スニペットおよびコマンドとしてその内容を読み取ります。\n\n/open <file>\n\t指定したファイルをjshellツールの入力として読み取ります。\n/open <URL>\n\t指定されたURLをjshellツールの入力としてダウンロードし、使用します。\n\n<file>は、オペレーティング・システム・ファイル名か、事前定義されたファイル名\n(DEFAULT、PRINTING、TOOLINGまたはJAVASE)のいずれかになります。\nこれらはそれぞれ、デフォルトのインポート・スニペット(-defaultで使用)、\nprint()、println()、printf()メソッド・スニペットの定義、JDKツールを\n実行しているメソッド・スニペットの定義、またはすべてのJava SEパッケージのインポートです。\n
 
-help.vars.summary = \u5BA3\u8A00\u3055\u308C\u305F\u5909\u6570\u304A\u3088\u3073\u305D\u306E\u5024\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+help.vars.summary = 宣言された変数およびその値をリストします
 help.vars.args = [<name or id>|-all|-start]
-help.vars =\u5165\u529B\u3055\u308C\u305F\u5909\u6570\u306E\u578B\u3001\u540D\u524D\u304A\u3088\u3073\u5024\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\n\n/vars\n\t\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u5909\u6570\u306E\u578B\u3001\u540D\u524D\u304A\u3088\u3073\u5024\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/vars <name>\n\t\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5909\u6570\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059(\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u5909\u6570\u306E\u30D7\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9)\n\n/vars <id>\n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306E\u5909\u6570\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\n\t1\u3064\u4EE5\u4E0A\u306EID\u307E\u305F\u306FID\u7BC4\u56F2\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002'/help id'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n\n/vars -start\n\t\u8A55\u4FA1\u3055\u308C\u305F\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u5909\u6570\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/vars -all\n\t\u5931\u6557\u3001\u4E0A\u66F8\u304D\u6E08\u3001\u524A\u9664\u6E08\u304A\u3088\u3073\u8D77\u52D5\u3092\u542B\u3080\u3059\u3079\u3066\u306E\u5909\u6570\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+help.vars =入力された変数の型、名前および値をリストします。\n\n/vars\n\t現在アクティブな変数の型、名前および値をリストします\n\n/vars <name>\n\t指定した名前の変数をリストします(アクティブな変数のプリファレンス)\n\n/vars <id>\n\t指定したスニペットIDの変数をリストします。\n\t1つ以上のIDまたはID範囲を使用できます。'/help id'を参照してください\n\n/vars -start\n\t評価された起動スニペットの変数をリストします\n\n/vars -all\n\t失敗、上書き済、削除済および起動を含むすべての変数をリストします
 
-help.methods.summary = \u5BA3\u8A00\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u305D\u306E\u7F72\u540D\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+help.methods.summary = 宣言されたメソッドおよびその署名をリストします
 help.methods.args = [<name or id>|-all|-start]
-help.methods =\u5165\u529B\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u306E\u540D\u524D\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\u304A\u3088\u3073\u623B\u308A\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\n\n/methods\n\t\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30E1\u30BD\u30C3\u30C9\u306E\u540D\u524D\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\u304A\u3088\u3073\u623B\u308A\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/methods <name>\n\t\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059(\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30E1\u30BD\u30C3\u30C9\u306E\u30D7\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9)\n\n/methods <id>\n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\n\t1\u3064\u4EE5\u4E0A\u306EID\u307E\u305F\u306FID\u7BC4\u56F2\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002'/help id'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n\n/methods -start\n\t\u8A55\u4FA1\u3055\u308C\u305F\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u5185\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/methods -all\n\t\u5931\u6557\u3001\u4E0A\u66F8\u304D\u6E08\u3001\u524A\u9664\u6E08\u304A\u3088\u3073\u8D77\u52D5\u3092\u542B\u3080\u3059\u3079\u3066\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+help.methods =入力されたメソッドの名前、パラメータ・タイプおよび戻り型をリストします。\n\n/methods\n\t現在アクティブなメソッドの名前、パラメータ・タイプおよび戻り型をリストします\n\n/methods <name>\n\t指定した名前のメソッドをリストします(アクティブなメソッドのプリファレンス)\n\n/methods <id>\n\t指定したスニペットIDのメソッドをリストします。\n\t1つ以上のIDまたはID範囲を使用できます。'/help id'を参照してください\n\n/methods -start\n\t評価された起動スニペット内のメソッドをリストします\n\n/methods -all\n\t失敗、上書き済、削除済および起動を含むすべてのスニペットをリストします
 
-help.types.summary = \u578B\u5BA3\u8A00\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+help.types.summary = 型宣言をリストします
 help.types.args =[<name or id>|-all|-start]
-help.types =\u5165\u529B\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\n\n/types\n\t\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u578B\u5BA3\u8A00\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/types <name>\n\t\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u578B\u5BA3\u8A00\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059(\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D7\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9)\n\n/types <id>\n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306E\u578B\u5BA3\u8A00\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\n\t1\u3064\u4EE5\u4E0A\u306EID\u307E\u305F\u306FID\u7BC4\u56F2\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002'/help id'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n\n/types -start\n\t\u8A55\u4FA1\u3055\u308C\u305F\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u578B\u5BA3\u8A00\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/types -all\n\t\u5931\u6557\u3001\u4E0A\u66F8\u304D\u6E08\u3001\u524A\u9664\u6E08\u304A\u3088\u3073\u8D77\u52D5\u3092\u542B\u3080\u3059\u3079\u3066\u306E\u578B\u5BA3\u8A00\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+help.types =入力されたクラスおよびインタフェースをリストします。\n\n/types\n\t現在アクティブな型宣言をリストします\n\n/types <name>\n\t指定した名前の型宣言をリストします(アクティブなスニペットのプリファレンス)\n\n/types <id>\n\t指定したスニペットIDの型宣言をリストします。\n\t1つ以上のIDまたはID範囲を使用できます。'/help id'を参照してください\n\n/types -start\n\t評価された起動スニペットの型宣言をリストします\n\n/types -all\n\t失敗、上書き済、削除済および起動を含むすべての型宣言をリストします
 
-help.imports.summary = \u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+help.imports.summary = インポートされたアイテムをリストします
 help.imports.args =
-help.imports =\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30A4\u30F3\u30DD\u30FC\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\u3053\u308C\u306B\u306F\u3001\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304B\u3089\u306E\n\u30A4\u30F3\u30DD\u30FC\u30C8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+help.imports =現在アクティブなインポートをリストします。これには、起動スニペットからの\nインポートが含まれます。
 
-help.exit.summary = jshell\u30C4\u30FC\u30EB\u3092\u7D42\u4E86\u3057\u307E\u3059
+help.exit.summary = jshellツールを終了します
 help.exit.args =[<integer-expression-snippet>]
-help.exit =jshell\u30C4\u30FC\u30EB\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002\u4F5C\u696D\u306F\u4FDD\u5B58\u3055\u308C\u307E\u305B\u3093\u3002\n\u3053\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306B\u3059\u3079\u3066\u306E\u4F5C\u696D\u3092\u4FDD\u5B58\u3057\u3066\u304F\u3060\u3055\u3044\n\n/exit\n\tjshell\u30C4\u30FC\u30EB\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002\u7D42\u4E86\u30B9\u30C6\u30FC\u30BF\u30B9\u306F\u30BC\u30ED\u3067\u3059\n\n/exit <integer-expression-snippet>\n\t\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u8A55\u4FA1\u3057\u307E\u3059\u3002\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u5931\u6557\u3059\u308B\u304B\u3001\u6574\u6570\u5F0F\u3067\u306F\u306A\u3044\u5834\u5408\u3001\n\t\u30A8\u30E9\u30FC\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u305D\u308C\u4EE5\u5916\u306E\u5834\u5408\u3001jshell\u30C4\u30FC\u30EB\u306F\u3001\n\t\u5F0F\u306E\u5024\u3092\u7D42\u4E86\u30B9\u30C6\u30FC\u30BF\u30B9\u3068\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059
+help.exit =jshellツールを終了します。作業は保存されません。\nこのコマンドを使用する前にすべての作業を保存してください\n\n/exit\n\tjshellツールを終了します。終了ステータスはゼロです\n\n/exit <integer-expression-snippet>\n\tスニペットを評価します。スニペットが失敗するか、整数式ではない場合、\n\tエラーが表示されます。それ以外の場合、jshellツールは、\n\t式の値を終了ステータスとして終了します
 
-help.reset.summary = jshell\u30C4\u30FC\u30EB\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u307E\u3059
+help.reset.summary = jshellツールをリセットします
 help.reset.args = [-class-path <path>] [-module-path <path>] [-add-modules <modules>]...
-help.reset =jshell\u30C4\u30FC\u30EB\u30FB\u30B3\u30FC\u30C9\u304A\u3088\u3073\u5B9F\u884C\u72B6\u614B\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u307E\u3059:\n\t* \u5165\u529B\u3057\u305F\u3059\u3079\u3066\u306E\u30B3\u30FC\u30C9\u304C\u5931\u308F\u308C\u307E\u3059\n\t* \u5B9F\u884C\u72B6\u614B\u306F\u518D\u5EA6\u958B\u59CB\u3055\u308C\u307E\u3059\n\t* \u8D77\u52D5\u30B3\u30FC\u30C9\u304C\u518D\u5B9F\u884C\u3055\u308C\u307E\u3059\n\u3053\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306B\u3059\u3079\u3066\u306E\u4F5C\u696D\u3092\u4FDD\u5B58\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n/reset\u30B3\u30DE\u30F3\u30C9\u306F\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u53D7\u3051\u5165\u308C\u307E\u3059\u3002\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n\n\t/help context\n
+help.reset =jshellツール・コードおよび実行状態をリセットします:\n\t* 入力したすべてのコードが失われます\n\t* 実行状態は再度開始されます\n\t* 起動コードが再実行されます\nこのコマンドを使用する前にすべての作業を保存してください。\n/resetコマンドは評価コンテキスト・オプションを受け入れます。次を参照してください:\n\n\t/help context\n
 
-help.reload.summary = \u30EA\u30BB\u30C3\u30C8\u3057\u3066\u95A2\u9023\u3059\u308B\u5C65\u6B74\u3092\u30EA\u30D7\u30EC\u30A4\u3057\u307E\u3059 -- \u73FE\u5728\u307E\u305F\u306F\u4EE5\u524D(-restore)
+help.reload.summary = リセットして関連する履歴をリプレイします -- 現在または以前(-restore)
 help.reload.args = [-restore] [-quiet] [-class-path <path>] [-module-path <path>]...
-help.reload =jshell\u30C4\u30FC\u30EB\u30FB\u30B3\u30FC\u30C9\u304A\u3088\u3073\u5B9F\u884C\u72B6\u614B\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u3001\u5404\u6709\u52B9\u30B9\u30CB\u30DA\u30C3\u30C8\n\u304A\u3088\u3073\u4EFB\u610F\u306E/drop\u30B3\u30DE\u30F3\u30C9\u3092\u5165\u529B\u3055\u308C\u305F\u9806\u756A\u3067\u30EA\u30D7\u30EC\u30A4\u3057\u307E\u3059\u3002\n\n/reload\n\t\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u3001jshell\u30C4\u30FC\u30EB\u306E\u5165\u529B\u3068\u3001/reset\u307E\u305F\u306F/reload\u30B3\u30DE\u30F3\u30C9\u306E\n\t\u5B9F\u884C\u306E\u3069\u3061\u3089\u304B(\u76F4\u8FD1\u306B\u884C\u308F\u308C\u305F\u65B9) \u4EE5\u964D\u306E\u6709\u52B9\u306A\u5C65\u6B74\u3092\u30EA\u30D7\u30EC\u30A4\n\t\u3057\u307E\u3059\n\n/reload -restore\n\t\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u3001jshell\u30C4\u30FC\u30EB\u304C\u5165\u529B\u3055\u308C\u305F\u3001\u3042\u308B\u3044\u306F/reset\u3001/reload\u307E\u305F\u306F\n\t/env\u30B3\u30DE\u30F3\u30C9\u304C\u5B9F\u884C\u3055\u308C\u305F\u3001\u6700\u65B0\u306E\u6642\u9593\u3068\u524D\u56DE\u306E\u6642\u9593\u306E\u9593\u306E\u6709\u52B9\u306A\u5C65\u6B74\u3092\n\t\u30EA\u30D7\u30EC\u30A4\u3057\u307E\u3059\u3002\u3053\u306E\u3088\u3046\u306B\u3001\u3053\u308C\u306F\u4EE5\u524D\u306Ejshell\u30C4\u30FC\u30EB\u30FB\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u5FA9\u5143\u306B\n\t\u4F7F\u7528\u3067\u304D\u307E\u3059\n\n/reload [-restore] -quiet\n\t'-quiet'\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u30EA\u30D7\u30EC\u30A4\u304C\u8868\u793A\u3055\u308C\u307E\u305B\u3093\u3002\u305F\u3060\u3057\u3001\n\t\u30A8\u30E9\u30FC\u306F\u8868\u793A\u3055\u308C\u307E\u3059\n\n\u4E0A\u306E\u5404\u3005\u306F\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u53D7\u3051\u5165\u308C\u307E\u3059\u3002\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n\n\t/help context\n\n\u4F8B:\n\n\t/reload -add-modules com.greetings -restore
+help.reload =jshellツール・コードおよび実行状態をリセットし、各有効スニペット\nおよび任意の/dropコマンドを入力された順番でリプレイします。\n\n/reload\n\tリセットして、jshellツールの入力と、/resetまたは/reloadコマンドの\n\t実行のどちらか(直近に行われた方) 以降の有効な履歴をリプレイ\n\tします\n\n/reload -restore\n\tリセットして、jshellツールが入力された、あるいは/reset、/reloadまたは\n\t/envコマンドが実行された、最新の時間と前回の時間の間の有効な履歴を\n\tリプレイします。このように、これは以前のjshellツール・セッションの復元に\n\t使用できます\n\n/reload [-restore] -quiet\n\t'-quiet'引数を指定すると、リプレイが表示されません。ただし、\n\tエラーは表示されます\n\n上の各々は評価コンテキスト・オプションを受け入れます。次を参照してください:\n\n\t/help context\n\n例:\n\n\t/reload -add-modules com.greetings -restore
 
-help.env.summary = \u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u8868\u793A\u307E\u305F\u306F\u5909\u66F4\u3057\u307E\u3059
+help.env.summary = 評価コンテキストを表示または変更します
 help.env.args = [-class-path <path>] [-module-path <path>] [-add-modules <modules>] ...
-help.env =\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u8868\u793A\u307E\u305F\u306F\u5909\u66F4\u3057\u307E\u3059\u3002\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306F\u3001\u30AF\u30E9\u30B9\u30D1\u30B9\u3001\n\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306A\u3069\u3067\u3059\u3002\n\n/env\n\t\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u3057\u3066\u8868\u793A\u3055\u308C\u3066\u3044\u308B\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u793A\u3057\u307E\u3059\n\n/env [-class-path <path>] [-module-path <path>] [-add-modules <modules>] ...\n\t1\u3064\u4EE5\u4E0A\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306B\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\t\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u5B9F\u884C\u72B6\u614B\u306F\u65B0\u3057\u3044\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u30EA\u30BB\u30C3\u30C8\u3055\u308C\u3001\n\t\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u30EA\u30D7\u30EC\u30A4\u3055\u308C\u307E\u3059\u3002\u305F\u3060\u3057\u30EA\u30D7\u30EC\u30A4\u306F\u8868\u793A\u3055\u308C\u305A\u3001\n\t\u30A8\u30E9\u30FC\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u3053\u308C\u306F\u6B21\u3068\u540C\u3058\u3067\u3059:\n\n\t\t/reload -quiet ...\n\n\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u8A73\u7D30\u306F\u3001\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n\n\t/help context\n\n\t\u4F8B:\n\n\t/env -add-modules com.greetings
+help.env =評価コンテキストを表示または変更します。評価コンテキストは、クラスパス、\nモジュール・パスなどです。\n\n/env\n\tコンテキスト・オプションとして表示されている評価コンテキストを示します\n\n/env [-class-path <path>] [-module-path <path>] [-add-modules <modules>] ...\n\t1つ以上のオプションが設定されている場合に評価コンテキストを設定します。\n\tスニペットが定義されている場合、実行状態は新しい評価コンテキストにリセットされ、\n\tスニペットがリプレイされます。ただしリプレイは表示されず、\n\tエラーが表示されます。これは次と同じです:\n\n\t\t/reload -quiet ...\n\n評価コンテキスト・オプションの詳細は、次を参照してください:\n\n\t/help context\n\n\t例:\n\n\t/env -add-modules com.greetings
 
-help.history.summary = \u5165\u529B\u3057\u305F\u5185\u5BB9\u306E\u5C65\u6B74
+help.history.summary = 入力した内容の履歴
 help.history.args = [-all]
-help.history =\u5165\u529B\u3055\u308C\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306E\u5C65\u6B74\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n\n/history\n\tjshell\u30C4\u30FC\u30EB\u306E\u8D77\u52D5\u4EE5\u964D\u5165\u529B\u3055\u308C\u305F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306E\u5C65\u6B74\u3092\u8868\u793A\u3057\u307E\u3059\n\n/history -all\n\t\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u3068\u4EE5\u524D\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u3067\u5165\u529B\u3055\u308C\u305F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306E\u3059\u3079\u3066\u306E\u5C65\u6B74\u3092\u8868\u793A\u3057\u307E\u3059
+help.history =入力されたスニペットおよびコマンドの履歴を表示します。\n\n/history\n\tjshellツールの起動以降入力された、スニペットおよびコマンドの履歴を表示します\n\n/history -all\n\tこのセッションと以前のセッションで入力された、スニペットおよびコマンドのすべての履歴を表示します
 
-help.debug.summary = jshell\u30C4\u30FC\u30EB\u306E\u30C7\u30D0\u30C3\u30B0\u3092\u5207\u308A\u66FF\u3048\u307E\u3059
+help.debug.summary = jshellツールのデバッグを切り替えます
 help.debug.args = [0][r][g][f][c][d][e]
-help.debug =jshell\u30C4\u30FC\u30EB\u5B9F\u88C5\u306B\u5BFE\u3059\u308B\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n0: \u30C7\u30D0\u30C3\u30B0\u30FB\u30AA\u30D5\nr: \u30C4\u30FC\u30EB\u30FB\u30EC\u30D9\u30EB\u306E\u30C7\u30D0\u30C3\u30B0\u30FB\u30AA\u30F3\ng: \u4E00\u822C\u7684\u306A\u30C7\u30D0\u30C3\u30B0\u30FB\u30AA\u30F3\nf: \u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u306E\u30C7\u30D0\u30C3\u30B0\u30FB\u30AA\u30F3\nc: \u5B8C\u4E86\u5206\u6790\u30C7\u30D0\u30C3\u30B0\u30FB\u30AA\u30F3\nd: \u4F9D\u5B58\u6027\u30C7\u30D0\u30C3\u30B0\u30FB\u30AA\u30F3\ne: \u30A4\u30D9\u30F3\u30C8\u30FB\u30C7\u30D0\u30C3\u30B0\u30FB\u30AA\u30F3
+help.debug =jshellツール実装に対するデバッグ情報を表示します。\n0: デバッグ・オフ\nr: ツール・レベルのデバッグ・オン\ng: 一般的なデバッグ・オン\nf: ファイル・マネージャのデバッグ・オン\nc: 完了分析デバッグ・オン\nd: 依存性デバッグ・オン\ne: イベント・デバッグ・オン
 
-help.help.summary = jshell\u30C4\u30FC\u30EB\u306E\u4F7F\u7528\u65B9\u6CD5\u306B\u95A2\u3059\u308B\u60C5\u5831\u3092\u53D6\u5F97\u3057\u307E\u3059
+help.help.summary = jshellツールの使用方法に関する情報を取得します
 help.help.args = [<command>|<subject>]
-help.help =jshell\u30C4\u30FC\u30EB\u306E\u4F7F\u7528\u65B9\u6CD5\u306B\u95A2\u3059\u308B\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n/help\n\tjshell\u30C4\u30FC\u30EB\u30FB\u30B3\u30DE\u30F3\u30C9\u304A\u3088\u3073\u30D8\u30EB\u30D7\u306E\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/help <command>\n\t\u6307\u5B9A\u3057\u305F\u30B3\u30DE\u30F3\u30C9\u306B\u95A2\u3059\u308B\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n\t\u5FC5\u8981\u306A\u306E\u306F\u30B3\u30DE\u30F3\u30C9\u306E\u6700\u521D\u306E\u6570\u6587\u5B57\u306E\u307F\u3067\u3059 -- \u4E00\u81F4\u304C\u8907\u6570\u3042\u308B\u5834\u5408\u306F\n\t\u305D\u308C\u305E\u308C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4F8B:  /help /li\n\n/help <subject>\n\t\u6307\u5B9A\u3057\u305F\u30D8\u30EB\u30D7\u306E\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306B\u95A2\u3059\u308B\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u4F8B: /help intro
+help.help =jshellツールの使用方法に関する情報を表示します。\n/help\n\tjshellツール・コマンドおよびヘルプのサブジェクトをリストします\n\n/help <command>\n\t指定したコマンドに関する情報を表示します。\n\t必要なのはコマンドの最初の数文字のみです -- 一致が複数ある場合は\n\tそれぞれ表示されます。例:  /help /li\n\n/help <subject>\n\t指定したヘルプのサブジェクトに関する情報を表示します。例: /help intro
 
-help.set.summary = \u69CB\u6210\u60C5\u5831\u3092\u8A2D\u5B9A\u3057\u307E\u3059
+help.set.summary = 構成情報を設定します
 help.set.args = editor|start|feedback|mode|prompt|truncation|format ...
-help.set =\u6B21\u306E\u3088\u3046\u306Ajshell\u30C4\u30FC\u30EB\u69CB\u6210\u60C5\u5831\u3092\u8A2D\u5B9A\u3057\u307E\u3059:\n\u4F7F\u7528\u3059\u308B\u5916\u90E8\u30A8\u30C7\u30A3\u30BF\u3001\u4F7F\u7528\u3059\u308B\u8D77\u52D5\u5B9A\u7FA9\u3001\u65B0\u898F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3001\n\u30B3\u30DE\u30F3\u30C9\u30FB\u30D7\u30ED\u30F3\u30D7\u30C8\u3001\u4F7F\u7528\u3059\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u307E\u305F\u306F\u51FA\u529B\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3002\n\n/set editor [-wait] <command> <optional-arg>...\n\t/edit\u30B3\u30DE\u30F3\u30C9\u3067\u8D77\u52D5\u3059\u308B\u30B3\u30DE\u30F3\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\t<command>\u306F\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u4F9D\u5B58\u6587\u5B57\u5217\u3067\u3059\n\n/set start <file>\n\t\u6307\u5B9A\u3057\u305F<file>\u306E\u5185\u5BB9\u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u306A\u308A\u307E\u3059\n\n/set feedback <mode>\n\t\u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u793A\u3059\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n\n/set mode <mode> [<old-mode>] -command|-quiet|-delete\n\t\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u4F5C\u6210\u307E\u305F\u306F\u66F4\u65B0\u3057\u307E\u3059\u3002\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u65E2\u5B58\u306E\u30E2\u30FC\u30C9\u304B\u3089\u30B3\u30D4\u30FC\u3057\u307E\u3059\n\n/set prompt <mode> "<prompt>" "<continuation-prompt>"\n\t\u6307\u5B9A\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n\n/set truncation <mode> <length> <selector>...\n\t\u8868\u793A\u3055\u308C\u308B\u5024\u306E\u6700\u5927\u9577\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n\n/set format <mode> <field> "<format>" <selector>...\n\t\u30BB\u30EC\u30AF\u30BF\u304C\u4E00\u81F4\u3057\u305F\u969B\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u3053\u3068\u3067\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u69CB\u6210\u3057\u307E\u3059\n\n/set indent <number>\n\t\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u81EA\u52D5\u7684\u306B\u30A4\u30F3\u30C7\u30F3\u30C8\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30B9\u30DA\u30FC\u30B9\u306E\u6570\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n\n/set\n\t/set\u30B3\u30DE\u30F3\u30C9\u3068\u3057\u3066editor\u3001start\u304A\u3088\u3073feedback\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n\t\u524D\u8FF0\u306E\u3044\u305A\u308C\u304B\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u3001set\u5024\u3092\u7701\u7565\u3057\u307E\u3059\n\n\u3053\u308C\u3089\u306E\u5F62\u5F0F\u306E\u8A73\u7D30\u306F\u3001\u5F62\u5F0F\u3092\u6307\u5B9A\u3057\u3066/help\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u4F8B:   /help /set format
+help.set =次のようなjshellツール構成情報を設定します:\n使用する外部エディタ、使用する起動定義、新規フィードバック・モード、\nコマンド・プロンプト、使用するフィードバック・モードまたは出力のフォーマット。\n\n/set editor [-wait] <command> <optional-arg>...\n\t/editコマンドで起動するコマンドを指定します。\n\t<command>はオペレーティング・システム依存文字列です\n\n/set start <file>\n\t指定した<file>の内容がデフォルトの起動スニペットおよびコマンドになります\n\n/set feedback <mode>\n\t入力したスニペットおよびコマンドに対して表示されるフィードバックを示す、フィードバック・モードを設定します\n\n/set mode <mode> [<old-mode>] -command|-quiet|-delete\n\tユーザー定義フィードバック・モードを作成または更新します。必要に応じて既存のモードからコピーします\n\n/set prompt <mode> "<prompt>" "<continuation-prompt>"\n\t指定のフィードバック・モードに対して表示されるプロンプトを設定します\n\n/set truncation <mode> <length> <selector>...\n\t表示される値の最大長を設定します\n\n/set format <mode> <field> "<format>" <selector>...\n\tセレクタが一致した際のフィールドのフォーマットを設定することで、フィードバック・モードを構成します\n\n/set indent <number>\n\tスニペットを自動的にインデントするために使用するスペースの数を設定します\n\n/set\n\t/setコマンドとしてeditor、startおよびfeedbackの設定を表示します。\n\t前述のいずれかの設定を表示するには、set値を省略します\n\nこれらの形式の詳細は、形式を指定して/helpを使用してください。\n例:   /help /set format
 
-help.quest.summary = jshell\u30C4\u30FC\u30EB\u306E\u4F7F\u7528\u65B9\u6CD5\u306B\u95A2\u3059\u308B\u60C5\u5831\u3092\u53D6\u5F97\u3057\u307E\u3059
+help.quest.summary = jshellツールの使用方法に関する情報を取得します
 help.quest.args = [<command>|<subject>]
-help.quest =jshell\u30C4\u30FC\u30EB\u306E\u4F7F\u7528\u65B9\u6CD5\u306B\u95A2\u3059\u308B\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059(/help\u306E\u7701\u7565\u5F62)\u3002\n/?\n\t\u30B3\u30DE\u30F3\u30C9\u304A\u3088\u3073\u30D8\u30EB\u30D7\u306E\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\n/? <command>\n\t\u6307\u5B9A\u3057\u305F\u30B3\u30DE\u30F3\u30C9\u306B\u95A2\u3059\u308B\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n\t\u5FC5\u8981\u306A\u306E\u306F\u30B3\u30DE\u30F3\u30C9\u306E\u6700\u521D\u306E\u6570\u6587\u5B57\u306E\u307F\u3067\u3059 -- \u4E00\u81F4\u304C\u8907\u6570\u3042\u308B\u5834\u5408\u306F\n\t\u305D\u308C\u305E\u308C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4F8B:  /? /li\n/? <subject>\n\t\u6307\u5B9A\u3057\u305F\u30D8\u30EB\u30D7\u306E\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306B\u95A2\u3059\u308B\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u4F8B: /? intro
+help.quest =jshellツールの使用方法に関する情報を表示します(/helpの省略形)。\n/?\n\tコマンドおよびヘルプのサブジェクトのリストを表示します\n/? <command>\n\t指定したコマンドに関する情報を表示します。\n\t必要なのはコマンドの最初の数文字のみです -- 一致が複数ある場合は\n\tそれぞれ表示されます。例:  /? /li\n/? <subject>\n\t指定したヘルプのサブジェクトに関する情報を表示します。例: /? intro
 
-help.bang.summary = \u6700\u5F8C\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u518D\u5B9F\u884C\u3057\u307E\u3059 -- /help rerun\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
+help.bang.summary = 最後のスニペットを再実行します -- /help rerunを参照してください
 help.bang.args =
-help.bang =\u6700\u5F8C\u306B\u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u518D\u8A55\u4FA1\u3057\u307E\u3059\u3002
+help.bang =最後に入力したスニペットを再評価します。
 
-help.slashID.summary = ID\u307E\u305F\u306FID\u7BC4\u56F2\u3067\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u518D\u5B9F\u884C\u3057\u307E\u3059 -- /help rerun\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
+help.slashID.summary = IDまたはID範囲でスニペットを再実行します -- /help rerunを参照してください
 help.slashID.args =
-help.slashID =/<id> <id> <id>\n\n/<id>-<id>\n\nID\u307E\u305F\u306FID\u7BC4\u56F2\u3067\u6307\u5B9A\u3055\u308C\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u518D\u8A55\u4FA1\u3057\u307E\u3059\u3002\nID\u7BC4\u56F2\u306F\u3001\u30CF\u30A4\u30D5\u30F3\u3067\u533A\u5207\u3089\u308C\u305F2\u3064\u306EID\u3067\u8868\u73FE\u3055\u308C\u307E\u3059(\u4F8B: 3-17)\n\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30A8\u30E9\u30FC\u30FB\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059(\u4F8B: s3-s9\u307E\u305F\u306Fe1-e4)\n\u4EFB\u610F\u306E\u6570\u306EID\u307E\u305F\u306FID\u7BC4\u56F2\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059(\u4F8B: /3-7 s4 14-16 e2)\n'/help id'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+help.slashID =/<id> <id> <id>\n\n/<id>-<id>\n\nIDまたはID範囲で指定されたスニペットを再評価します。\nID範囲は、ハイフンで区切られた2つのIDで表現されます(例: 3-17)\n起動スニペットおよびエラー・スニペットを使用できます(例: s3-s9またはe1-e4)\n任意の数のIDまたはID範囲を使用できます(例: /3-7 s4 14-16 e2)\n'/help id'を参照してください。
 
-help.previous.summary = n\u56DE\u524D\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u518D\u5B9F\u884C\u3057\u307E\u3059 -- /help rerun\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
+help.previous.summary = n回前のスニペットを再実行します -- /help rerunを参照してください
 help.previous.args =
-help.previous =n\u56DE\u524D\u306B\u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u518D\u8A55\u4FA1\u3057\u307E\u3059\u3002
+help.previous =n回前に入力したスニペットを再評価します。
 
-help.intro.summary = jshell\u30C4\u30FC\u30EB\u306E\u6982\u8981
-help.intro =jshell\u30C4\u30FC\u30EB\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001Java\u30B3\u30FC\u30C9\u3092\u5B9F\u884C\u3057\u3066\u5373\u5EA7\u306B\u7D50\u679C\u3092\u53D6\u5F97\u3067\u304D\u307E\u3059\u3002\nint x = 8\u306A\u3069\u306EJava\u5B9A\u7FA9(\u5909\u6570\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30AF\u30E9\u30B9\u306A\u3069)\u3001\nx + x\u306A\u3069\u306EJava\u5F0F\u307E\u305F\u306FJava\u6587\u3092\u5165\u529B\u3057\u305F\u308A\u3001\n\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u305F\u308A\u3067\u304D\u307E\u3059\u3002\n\u3053\u308C\u3089\u306EJava\u30B3\u30FC\u30C9\u306E\u5C0F\u3055\u306A\u30C1\u30E3\u30F3\u30AF\u3092\u300C\u30B9\u30CB\u30DA\u30C3\u30C8\u300D\u3068\u547C\u3073\u307E\u3059\u3002\n\n\u307E\u305F\u3001/list\u306A\u3069\u306E\u5B9F\u884C\u3059\u308B\u5185\u5BB9\u3092\u7406\u89E3\u304A\u3088\u3073\u5236\u5FA1\u3067\u304D\u308Bjshell\u30C4\u30FC\u30EB\u30FB\u30B3\u30DE\u30F3\u30C9\u3082\n\u3042\u308A\u307E\u3059\n\n\u30B3\u30DE\u30F3\u30C9\u306E\u30EA\u30B9\u30C8\u3092\u53C2\u7167\u3059\u308B\u5834\u5408: /help
+help.intro.summary = jshellツールの概要
+help.intro =jshellツールを使用すると、Javaコードを実行して即座に結果を取得できます。\nint x = 8などのJava定義(変数、メソッド、クラスなど)、\nx + xなどのJava式またはJava文を入力したり、\nインポートしたりできます。\nこれらのJavaコードの小さなチャンクを「スニペット」と呼びます。\n\nまた、/listなどの実行する内容を理解および制御できるjshellツール・コマンドも\nあります\n\nコマンドのリストを参照する場合: /help
 
-help.keys.summary = readline\u306B\u4F3C\u305F\u5165\u529B\u7DE8\u96C6\u306E\u8AAC\u660E
-help.keys =jshell\u30C4\u30FC\u30EB\u3067\u306F\u884C\u7DE8\u96C6\u30B5\u30DD\u30FC\u30C8\u3092\u63D0\u4F9B\u3057\u3066\u304A\u308A\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\n\u5185\u3092\u30CA\u30D3\u30B2\u30FC\u30C8\u3057\u3066\u7DE8\u96C6\u3067\u304D\u307E\u3059\u3002\u73FE\u5728\u306E\u30B3\u30DE\u30F3\u30C9/\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u7DE8\u96C6\u3057\u305F\u308A\u3001\n\u904E\u53BB\u306E\u30B3\u30DE\u30F3\u30C9/\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u5C65\u6B74\u304B\u3089\u53D6\u5F97\u3057\u3066\u7DE8\u96C6\u304A\u3088\u3073\u5B9F\u884C\u3067\u304D\u307E\u3059\u3002\n\u3053\u306E\u30B5\u30DD\u30FC\u30C8\u306F\u3001Emacs\u306E\u3088\u3046\u306A\u5358\u7D14\u306A\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u3092\u4F7F\u7528\u3057\u305Freadline/editline\u306B\u4F3C\u3066\u3044\u307E\u3059\u3002\njshell\u30C4\u30FC\u30EB\u56FA\u6709\u306E\u30AD\u30FC\u30FB\u30B7\u30FC\u30B1\u30F3\u30B9\u3082\u3042\u308A\u307E\u3059\u3002\n\n\u884C\u3068\u5C65\u6B74\u306E\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3:\n\n\t[Return]\n\t\t\u73FE\u5728\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u5165\u529B\u3057\u307E\u3059\n\t[\u2190]\u307E\u305F\u306F[Ctrl]+[B]\n\t\t1\u6587\u5B57\u524D\u306B\u623B\u308A\u307E\u3059\n\t[\u2192]\u307E\u305F\u306F[Ctrl]+[F]\n\t\t1\u6587\u5B57\u5148\u306B\u9032\u307F\u307E\u3059\n\t[\u2191]\u307E\u305F\u306F[Ctrl]+[P]\n\t\t\u5C65\u6B74\u30921\u884C\u524D(\u4E0A)\u306B\u623B\u308A\u307E\u3059\n\t[\u2193]\u307E\u305F\u306F[Ctrl]+[N]\n\t\t\u5C65\u6B74\u30921\u884C\u5148(\u4E0B)\u306B\u9032\u307F\u307E\u3059\n\t[Ctrl]+[A]\n\t\t\u884C\u306E\u5148\u982D\u306B\u79FB\u52D5\u3057\u307E\u3059\n\t[Ctrl]+[E]\n\t\t\u884C\u306E\u672B\u5C3E\u306B\u79FB\u52D5\u3057\u307E\u3059\n\t[Meta]+[B]\n\t\t1\u5358\u8A9E\u524D\u306B\u623B\u308A\u307E\u3059\n\t[Meta]+[F]\n\t\t1\u5358\u8A9E\u5148\u306B\u9032\u307F\u307E\u3059\n\t[Ctrl]+[R]\n\t\t\u5C65\u6B74\u3092\u524D\u306B\u623B\u3063\u3066\u691C\u7D22\u3057\u307E\u3059\n\n\n\u884C\u3068\u5C65\u6B74\u306E\u57FA\u672C\u7DE8\u96C6:\n\n\t[Meta]+[Return]\u307E\u305F\u306F[Ctrl]+[Return] (\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306B\u4F9D\u5B58\u3057\u307E\u3059)\n\t\t\u30B9\u30CB\u30DA\u30C3\u30C8\u306B\u65B0\u898F\u884C\u3092\u633F\u5165\u3057\u307E\u3059\n\t[Ctrl]+[_] \
-(\u30A2\u30F3\u30C0\u30FC\u30B9\u30B3\u30A2\u306F[Shift]\u30AD\u30FC\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059)\u307E\u305F\u306F[Ctrl]+[X]\u3092\u62BC\u3057\u3066\u304B\u3089[Ctrl]+[U]\n\t\t\u7DE8\u96C6\u3092\u5143\u306B\u623B\u3057\u307E\u3059(\u7E70\u308A\u8FD4\u3059\u3068\u3055\u3089\u306B\u7DE8\u96C6\u3092\u5143\u306B\u623B\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059)\n\t[Delete]\n\t\t\u30AB\u30FC\u30BD\u30EB\u306E\u4F4D\u7F6E\u307E\u305F\u306F\u305D\u306E\u5F8C\u306B\u3042\u308B\u6587\u5B57\u3092\u524A\u9664\u3057\u307E\u3059(\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u306B\u4F9D\u5B58\u3057\u307E\u3059)\n\t[Backspace]\n\t\t\u30AB\u30FC\u30BD\u30EB\u306E\u524D\u306B\u3042\u308B\u6587\u5B57\u3092\u524A\u9664\u3057\u307E\u3059\n\t[Ctrl]+[K]\n\t\t\u30AB\u30FC\u30BD\u30EB\u306E\u4F4D\u7F6E\u304B\u3089\u884C\u306E\u672B\u5C3E\u307E\u3067\u306E\u30C6\u30AD\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\n\t[Meta]+[D]\n\t\t\u30AB\u30FC\u30BD\u30EB\u306E\u4F4D\u7F6E\u304B\u3089\u5358\u8A9E\u306E\u672B\u5C3E\u307E\u3067\u306E\u30C6\u30AD\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\n\t[Ctrl]+[W]\n\t\t\u30AB\u30FC\u30BD\u30EB\u306E\u4F4D\u7F6E\u304B\u3089\u524D\u306E\u7A7A\u767D\u307E\u3067\u306E\u30C6\u30AD\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\n\t[Ctrl]+[Y]\n\t\t\u6700\u5F8C\u306B\u524A\u9664\u3057\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u884C\u306B\u8CBC\u308A\u4ED8\u3051\u307E\u3059\n\t[Meta]+[Y]\n\t\t[Ctrl]+[Y]\u306E\u5F8C\u3067[Meta]+[Y]\u3092\u62BC\u3059\u3068\u3001\u904E\u53BB\u306B\u524A\u9664\u3057\u305F\u30C6\u30AD\u30B9\u30C8\u304C\u30B5\u30A4\u30AF\u30EB\u8868\u793A\u3055\u308C\u307E\u3059\n\t[Ctrl]+[X]\u3092\u62BC\u3057\u3066\u304B\u3089[Ctrl]+[K]\n\t\t\u30B9\u30CB\u30DA\u30C3\u30C8\u5168\u4F53\u3092\u524A\u9664\u3057\u307E\u3059\n\n\njshell\u30C4\u30FC\u30EB\u306E\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8:\n\n\t\u8A73\u7D30\u306F\u3001/help \
-shortcuts\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n\n\t[Tab]\n\t\tJava\u8B58\u5225\u5B50\u307E\u305F\u306Fjshell\u30B3\u30DE\u30F3\u30C9\u3092\u5B8C\u4E86\u3057\u307E\u3059\n\t[Shift]+[Tab]\u3092\u62BC\u3057\u3066\u304B\u3089[v]\n\t\t\u5F0F\u3092\u5909\u6570\u5BA3\u8A00\u306B\u5909\u63DB\u3057\u307E\u3059\n\t[Shift]+[Tab]\u3092\u62BC\u3057\u3066\u304B\u3089[m]\n\t\t\u6587\u3092\u30E1\u30BD\u30C3\u30C9\u5BA3\u8A00\u306B\u5909\u63DB\u3057\u307E\u3059\n\t[Shift]+[Tab]\u3092\u62BC\u3057\u3066\u304B\u3089[i]\n\t\t\u3053\u306E\u8B58\u5225\u5B50\u306B\u30A4\u30F3\u30DD\u30FC\u30C8\u3092\u8FFD\u52A0\u3057\u307E\u3059\n\t\n\n\u884C\u3068\u5C65\u6B74\u306E\u62E1\u5F35\u7DE8\u96C6:\n\n\t[Ctrl]+[L]\n\t\t\u753B\u9762\u3092\u30AF\u30EA\u30A2\u3057\u3066\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u518D\u51FA\u529B\u3057\u307E\u3059\n\t[Ctrl]+[U]\n\t\t\u884C\u5168\u4F53\u3092\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3059\n\t[Ctrl]+[T]\n\t\t\u6587\u5B57\u3092\u7F6E\u63DB\u3057\u307E\u3059\n\t[Ctrl]+[X]\u3092\u62BC\u3057\u3066\u304B\u3089[Ctrl]+[B]\n\t\t\u4E00\u81F4\u3059\u308B\u5927\u30AB\u30C3\u30B3\u3001\u4E38\u30AB\u30C3\u30B3\u3001...\u306B\u79FB\u52D5\u3057\u307E\u3059\n\t[Ctrl]+[X]\u3092\u62BC\u3057\u3066\u304B\u3089[=]\n\t\t\u73FE\u884C\u6587\u5B57\u4F4D\u7F6E\u8868\u793A\u30E2\u30FC\u30C9\u306B\u5165\u308A\u307E\u3059\n\t[Ctrl]+[X]\u3092\u62BC\u3057\u3066\u304B\u3089[Ctrl]+[O]\n\t\t\u6587\u5B57\u306E\u4E0A\u66F8\u304D\u3068\u6587\u5B57\u306E\u633F\u5165\u3092\u5207\u308A\u66FF\u3048\u307E\u3059\n\t[Meta]+[C]\n\t\t\u5358\u8A9E\u306E\u5148\u982D\u3092\u5927\u6587\u5B57\u306B\u3057\u307E\u3059\n\t[Meta]+[U]\n\t\t\u5358\u8A9E\u3092\u5927\u6587\u5B57\u306B\u5909\u63DB\u3057\u307E\u3059\n\t[Meta]+[L]\n\t\t\u5358\u8A9E\u3092\u5C0F\u6587\u5B57\u306B\u5909\u63DB\u3057\u307E\u3059\n\t[Meta]+[0]\u304B\u3089[Meta]+[9]\u3092\u62BC\u3057\u3066\u304B\u3089\u30AD\u30FC\n\t\t\u6307\u5B9A\u3057\u305F\u56DE\u6570\u7E70\u308A\u8FD4\u3057\u307E\u3059\n\n\u305F\u3068\u3048\u3070\u3001[Ctrl]+[A]\u306F\u3001[Ctrl]\u30AD\u30FC\u3092\u62BC\u3057\u306A\u304C\u3089[A]\u3092\u62BC\u3059\u3068\u3044\u3046\u610F\u5473\u3067\u3059\u3002\n[Meta]\u306F\u3001\u591A\u304F\u306E\u30AD\u30FC\u30DC\u30FC\u30C9\u3067[Alt]\u3067\u3059\u3002\n\u884C\u7DE8\u96C6\u30B5\u30DD\u30FC\u30C8\u306F\u3001JLine 3\u304B\u3089\u6D3E\u751F\u3057\u3066\u3044\u307E\u3059\u3002
+help.keys.summary = readlineに似た入力編集の説明
+help.keys =jshellツールでは行編集サポートを提供しており、スニペットおよびコマンド\n内をナビゲートして編集できます。現在のコマンド/スニペットを編集したり、\n過去のコマンド/スニペットを履歴から取得して編集および実行できます。\nこのサポートは、Emacsのような単純なバインディングを使用したreadline/editlineに似ています。\njshellツール固有のキー・シーケンスもあります。\n\n行と履歴のナビゲーション:\n\n\t[Return]\n\t\t現在のスニペットを入力します\n\t[←]または[Ctrl]+[B]\n\t\t1文字前に戻ります\n\t[→]または[Ctrl]+[F]\n\t\t1文字先に進みます\n\t[↑]または[Ctrl]+[P]\n\t\t履歴を1行前(上)に戻ります\n\t[↓]または[Ctrl]+[N]\n\t\t履歴を1行先(下)に進みます\n\t[Ctrl]+[A]\n\t\t行の先頭に移動します\n\t[Ctrl]+[E]\n\t\t行の末尾に移動します\n\t[Meta]+[B]\n\t\t1単語前に戻ります\n\t[Meta]+[F]\n\t\t1単語先に進みます\n\t[Ctrl]+[R]\n\t\t履歴を前に戻って検索します\n\n\n行と履歴の基本編集:\n\n\t[Meta]+[Return]または[Ctrl]+[Return] (プラットフォームに依存します)\n\t\tスニペットに新規行を挿入します\n\t[Ctrl]+[_] \
+(アンダースコアは[Shift]キーを使用することがあります)または[Ctrl]+[X]を押してから[Ctrl]+[U]\n\t\t編集を元に戻します(繰り返すとさらに編集を元に戻すことができます)\n\t[Delete]\n\t\tカーソルの位置またはその後にある文字を削除します(オペレーティング・システムに依存します)\n\t[Backspace]\n\t\tカーソルの前にある文字を削除します\n\t[Ctrl]+[K]\n\t\tカーソルの位置から行の末尾までのテキストを削除します\n\t[Meta]+[D]\n\t\tカーソルの位置から単語の末尾までのテキストを削除します\n\t[Ctrl]+[W]\n\t\tカーソルの位置から前の空白までのテキストを削除します\n\t[Ctrl]+[Y]\n\t\t最後に削除したテキストを行に貼り付けます\n\t[Meta]+[Y]\n\t\t[Ctrl]+[Y]の後で[Meta]+[Y]を押すと、過去に削除したテキストがサイクル表示されます\n\t[Ctrl]+[X]を押してから[Ctrl]+[K]\n\t\tスニペット全体を削除します\n\n\njshellツールのショートカット:\n\n\t詳細は、/help \
+shortcutsを参照してください\n\n\t[Tab]\n\t\tJava識別子またはjshellコマンドを完了します\n\t[Shift]+[Tab]を押してから[v]\n\t\t式を変数宣言に変換します\n\t[Shift]+[Tab]を押してから[m]\n\t\t文をメソッド宣言に変換します\n\t[Shift]+[Tab]を押してから[i]\n\t\tこの識別子にインポートを追加します\n\t\n\n行と履歴の拡張編集:\n\n\t[Ctrl]+[L]\n\t\t画面をクリアしてスニペットを再出力します\n\t[Ctrl]+[U]\n\t\t行全体を強制終了します\n\t[Ctrl]+[T]\n\t\t文字を置換します\n\t[Ctrl]+[X]を押してから[Ctrl]+[B]\n\t\t一致する大カッコ、丸カッコ、...に移動します\n\t[Ctrl]+[X]を押してから[=]\n\t\t現行文字位置表示モードに入ります\n\t[Ctrl]+[X]を押してから[Ctrl]+[O]\n\t\t文字の上書きと文字の挿入を切り替えます\n\t[Meta]+[C]\n\t\t単語の先頭を大文字にします\n\t[Meta]+[U]\n\t\t単語を大文字に変換します\n\t[Meta]+[L]\n\t\t単語を小文字に変換します\n\t[Meta]+[0]から[Meta]+[9]を押してからキー\n\t\t指定した回数繰り返します\n\nたとえば、[Ctrl]+[A]は、[Ctrl]キーを押しながら[A]を押すという意味です。\n[Meta]は、多くのキーボードで[Alt]です。\n行編集サポートは、JLine 3から派生しています。
 
-help.shortcuts.summary = \u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306E\u88DC\u5B8C\u3001\u60C5\u5831\u30A2\u30AF\u30BB\u30B9\u3001\u304A\u3088\u3073\u81EA\u52D5\u30B3\u30FC\u30C9\u751F\u6210\n\u306E\u30AD\u30FC\u30B9\u30C8\u30ED\u30FC\u30AF\u306E\u8AAC\u660E
-help.shortcuts =\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\n\t[Tab]\n\t\tJava\u8B58\u5225\u5B50\u3001jshell\u30C4\u30FC\u30EB\u30FB\u30B3\u30DE\u30F3\u30C9\u3001\u5834\u5408\u306B\u3088\u3063\u3066\u306F\n\t\tjshell\u30C4\u30FC\u30EB\u30FB\u30B3\u30DE\u30F3\u30C9\u5F15\u6570\u306E\u6700\u521D\u306E\u6570\u6587\u5B57\u3092\u5165\u529B\u3057\u305F\u5F8C\u306B\u3001\n\t\t[Tab]\u30AD\u30FC\u3092\u62BC\u3059\u3068\u3001\u5165\u529B\u304C\u88DC\u5B8C\u3055\u308C\u307E\u3059\u3002\n\t\t\u88DC\u5B8C\u7D50\u679C\u304C\u8907\u6570\u3042\u308B\u5834\u5408\u3001\u4F7F\u7528\u53EF\u80FD\u306A\u88DC\u5B8C\u7D50\u679C\u304C\n\t\t\u8868\u793A\u3055\u308C\u307E\u3059\u3002\n\t\t\u3082\u30461\u56DE[Tab]\u3092\u62BC\u3059\u3068\u3001\u9069\u5207\u306A\u3082\u306E\u304C\u3042\u308B\u5834\u5408\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\n\n\t[Shift]+[Tab]\u3092\u62BC\u3057\u3066\u304B\u3089[v]\n\t\t\u5B8C\u5168\u306A\u5F0F\u306E\u5F8C\u306B\u3001[Shift]\u30AD\u30FC\u3092\u62BC\u3057\u306A\u304C\u3089[Tab]\u30AD\u30FC\u3092\u62BC\u3057\u3001\n\t\t\u6B21\u306B\u96E2\u3057\u3066[v]\u30AD\u30FC\u3092\u62BC\u3059\u3068\u3001\u5F0F\u304C\u3001\n\t\t\u305D\u306E\u5F0F\u306E\u30BF\u30A4\u30D7\u306B\u57FA\u3065\u304F\u30BF\u30A4\u30D7\u3092\u6301\u3064\n\t\t\u5909\u6570\u5BA3\u8A00\u306B\u5909\u63DB\u3055\u308C\u307E\u3059\u3002\n\n\t[Shift]+[Tab]\u3092\u62BC\u3057\u3066\u304B\u3089[m]\n\t\t\u5B8C\u5168\u306A\u5F0F\u307E\u305F\u306F\u6587\u306E\u5F8C\u306B\u3001[Shift]\u30AD\u30FC\u3092\u62BC\u3057\u306A\u304C\u3089\n\t\t[Tab]\u30AD\u30FC\u3092\u62BC\u3057\u3001\u6B21\u306B\u96E2\u3057\u3066[m]\u30AD\u30FC\u3092\u62BC\u3059\u3068\u3001\n\t\t\u5F0F\u307E\u305F\u306F\u6587\u304C\u30E1\u30BD\u30C3\u30C9\u5BA3\u8A00\u306B\u5909\u63DB\u3055\u308C\u307E\u3059\u3002\n\t\t\u5F0F\u306E\u5834\u5408\u3001\u30E1\u30BD\u30C3\u30C9\u306E\u623B\u308A\u5024\u306E\u30BF\u30A4\u30D7\u306F\u3001\u5F0F\u306E\u30BF\u30A4\u30D7\u306B\n\t\t\u57FA\u3065\u304D\u307E\u3059\u3002\n\n\t[Shift]+[Tab]\u3092\u62BC\u3057\u3066\u304B\u3089[i]\n\t\t\u89E3\u6C7A\u3067\u304D\u306A\u3044\u8B58\u5225\u5B50\u306E\u5F8C\u306B\u3001[Shift]\u30AD\u30FC\u3092\u62BC\u3057\u306A\u304C\u3089\n\t\t[Tab]\u30AD\u30FC\u3092\u62BC\u3057\u3001\u6B21\u306B\u96E2\u3057\u3066[i]\u30AD\u30FC\u3092\u62BC\u3059\u3068\u3001\n\t\tjshell\u30C4\u30FC\u30EB\u306B\u3088\u3063\u3066\u3001\u4F7F\u7528\u53EF\u80FD\u306A\u30A4\u30F3\u30DD\u30FC\u30C8\u304C\u63D0\u793A\u3055\u308C\u3001\n\t\t\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u6307\u5B9A\u3055\u308C\u305F\u30AF\u30E9\u30B9\u30D1\u30B9\u306E\u5185\u5BB9\u306B\u57FA\u3065\u3044\u3066\n\t\t\u8B58\u5225\u5B50\u304C\u89E3\u6C7A\u3055\u308C\u307E\u3059\u3002\u9069\u5207\u306A\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u5BFE\u5FDC\u3059\u308B\u6570\u5B57\u3092\u5165\u529B\u3057\u307E\u3059\u3002\n\t\t\u307E\u305F\u306F\u3001[0]\u30AD\u30FC\u3092\u62BC\u3059\u3068\u30A4\u30F3\u30DD\u30FC\u30C8\u306F\u8FFD\u52A0\u3055\u308C\u307E\u305B\u3093\u3002\n\n\u4ED6\u306E\u7279\u6B8A\u30AD\u30FC\u306E\u8A73\u7D30\u306F\u3001/help keys\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
+help.shortcuts.summary = スニペットおよびコマンドの補完、情報アクセス、および自動コード生成\nのキーストロークの説明
+help.shortcuts =サポートされているショートカットは次のとおりです:\n\n\t[Tab]\n\t\tJava識別子、jshellツール・コマンド、場合によっては\n\t\tjshellツール・コマンド引数の最初の数文字を入力した後に、\n\t\t[Tab]キーを押すと、入力が補完されます。\n\t\t補完結果が複数ある場合、使用可能な補完結果が\n\t\t表示されます。\n\t\tもう1回[Tab]を押すと、適切なものがある場合は、ドキュメントが表示されます。\n\n\t[Shift]+[Tab]を押してから[v]\n\t\t完全な式の後に、[Shift]キーを押しながら[Tab]キーを押し、\n\t\t次に離して[v]キーを押すと、式が、\n\t\tその式のタイプに基づくタイプを持つ\n\t\t変数宣言に変換されます。\n\n\t[Shift]+[Tab]を押してから[m]\n\t\t完全な式または文の後に、[Shift]キーを押しながら\n\t\t[Tab]キーを押し、次に離して[m]キーを押すと、\n\t\t式または文がメソッド宣言に変換されます。\n\t\t式の場合、メソッドの戻り値のタイプは、式のタイプに\n\t\t基づきます。\n\n\t[Shift]+[Tab]を押してから[i]\n\t\t解決できない識別子の後に、[Shift]キーを押しながら\n\t\t[Tab]キーを押し、次に離して[i]キーを押すと、\n\t\tjshellツールによって、使用可能なインポートが提示され、\n\t\tこれによって、指定されたクラスパスの内容に基づいて\n\t\t識別子が解決されます。適切なインポートに対応する数字を入力します。\n\t\tまたは、[0]キーを押すとインポートは追加されません。\n\n他の特殊キーの詳細は、/help keysを参照してください
 
-help.context.summary = /env /reload\u304A\u3088\u3073/reset\u306E\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u8AAC\u660E
-help.context =\u3053\u308C\u3089\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u69CB\u6210\u3057\u307E\u3059\u3002\u3053\u308C\u3089\u306F\u3001jshell\u30C4\u30FC\u30EB\u306E\n\u8D77\u52D5\u6642\u306B\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u3001\u307E\u305F\u306Fjshell\u30C4\u30FC\u30EB\u304C\u30B3\u30DE\u30F3\u30C9/env\u3001/reload\u307E\u305F\u306F\n/reset\u3067\u518D\u8D77\u52D5\u3055\u308C\u308B\u3068\u304D\u306B\u30B3\u30DE\u30F3\u30C9\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u3057\u3066\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\n\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\t--class-path <path>\n\t\t<path>\u306F\u3001\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n\t\tZIP\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u30EA\u30B9\u30C8\u3067\u3059\u3002\n\t\tWindows\u306E\u5834\u5408\u306F\u3001\u30BB\u30DF\u30B3\u30ED\u30F3(;)\u3092\u4F7F\u7528\u3057\u3066\u30D1\u30B9\u306E\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\n\t\t\u305D\u306E\u4ED6\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306F\u3001\u30B3\u30ED\u30F3(:)\u3092\u4F7F\u7528\u3057\u3066\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\n\t--module-path <path>...\n\t\t<path>\u306F\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n\t\tZIP\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u30EA\u30B9\u30C8\u3067\u3059\u3002\n\t\tWindows\u306E\u5834\u5408\u306F\u3001\u30BB\u30DF\u30B3\u30ED\u30F3(;)\u3092\u4F7F\u7528\u3057\u3066\u30D1\u30B9\u306E\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\n\t\t\u305D\u306E\u4ED6\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306F\u3001\u30B3\u30ED\u30F3(:)\u3092\u4F7F\u7528\u3057\u3066\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\n\t--add-modules <modulename>[,<modulename>...]\n\t\t\u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n\t\t<modulename>\u306B\u306FALL-DEFAULT\u3001ALL-SYSTEM\u3001\n\t\tALL-MODULE-PATH\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002\n\t--add-exports <module>/<package>=<target-module>(,<target-module>)*\n\t\t<module>\u3092\u66F4\u65B0\u3057\u3066\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F<package>\u3092<target-module>\n\t\t\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n\t\t<target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n\t\t\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002jshell\u3067\u306F\u3001<target-module>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408(\u300C=\u300D\u306A\u3057)\n\t\tALL-UNNAMED\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n\n\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u5165\u529B\u3055\u308C\u308B\u304B\u4EE5\u524D\u306E/reset\u3001/env\u307E\u305F\u306F/reload\u30B3\u30DE\u30F3\u30C9\u3067\n\u6307\u5B9A\u3055\u308C\u305F\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u8A2D\u5B9A\u3092\u4E0A\u66F8\u304D\u3059\u308B\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\n\u5165\u529B\u3055\u308C\u306A\u3044\u304B\u304E\u308A\u7DAD\u6301\u3055\u308C\u307E\u3059\u3002\n\n\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u306F\u3001\u3053\u308C\u3089\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F2\u3064\u306E\u30C0\u30C3\u30B7\u30E5\u304C\u5FC5\u8981\u3067\u3059\u3002\u4F8B: \
---module-path\njshell\u30C4\u30FC\u30EB\u30FB\u30B3\u30DE\u30F3\u30C9\u3067\u306F\u3001\u3053\u308C\u3089\u306B\u306F1\u3064\u307E\u305F\u306F2\u3064\u306E\u30C0\u30C3\u30B7\u30E5\u304C\u5FC5\u8981\u3067\u3059\u3002\u4F8B: -module-path
+help.context.summary = /env /reloadおよび/resetの評価コンテキスト・オプションの説明
+help.context =これらのオプションは、評価コンテキストを構成します。これらは、jshellツールの\n起動時にコマンドラインで、またはjshellツールがコマンド/env、/reloadまたは\n/resetで再起動されるときにコマンド・オプションとして指定できます。\n\nオプションは次のとおりです:\n\t--class-path <path>\n\t\t<path>は、クラス・ファイルを検索するディレクトリ、JARアーカイブ、\n\t\tZIPアーカイブのリストです。\n\t\tWindowsの場合は、セミコロン(;)を使用してパスの項目を区切ります。\n\t\tその他のプラットフォームでは、コロン(:)を使用して項目を区切ります。\n\t--module-path <path>...\n\t\t<path>は、モジュールを検索するディレクトリ、JARアーカイブ、\n\t\tZIPアーカイブのリストです。\n\t\tWindowsの場合は、セミコロン(;)を使用してパスの項目を区切ります。\n\t\tその他のプラットフォームでは、コロン(:)を使用して項目を区切ります。\n\t--add-modules <modulename>[,<modulename>...]\n\t\t初期モジュールに加えて解決するルート・モジュール。\n\t\t<modulename>にはALL-DEFAULT、ALL-SYSTEM、\n\t\tALL-MODULE-PATHを指定することもできます。\n\t--add-exports <module>/<package>=<target-module>(,<target-module>)*\n\t\t<module>を更新して、モジュール宣言に関係なく<package>を<target-module>\n\t\tにエクスポートします。\n\t\t<target-module>をALL-UNNAMEDに設定すると、すべての名前のないモジュールを\n\t\tエクスポートできます。jshellでは、<target-module>が指定されていない場合(「=」なし)\n\t\tALL-UNNAMEDが使用されます。\n\nコマンドラインで入力されるか以前の/reset、/envまたは/reloadコマンドで\n指定された評価コンテキスト・オプションは、設定を上書きするオプションが\n入力されないかぎり維持されます。\n\nコマンドラインでは、これらのオプションには2つのダッシュが必要です。例: \
+--module-path\njshellツール・コマンドでは、これらには1つまたは2つのダッシュが必要です。例: -module-path
 
-help.id.summary = \u30B9\u30CB\u30DA\u30C3\u30C8ID\u306E\u5BA3\u8A00\u3068\u305D\u308C\u3089\u306E\u4F7F\u7528\u65B9\u6CD5
-help.id =\u5165\u529B\u3057\u305F\u30B3\u30FC\u30C9\u306E\u3059\u3079\u3066\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u306B\u56FA\u6709\u306E\u30B9\u30CB\u30DA\u30C3\u30C8ID\u304C\u3042\u308A\u307E\u3059\u3002\n\u540C\u3058\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u518D\u5EA6\u5165\u529B\u3057\u305F\u5834\u5408\u3067\u3082\u3001\u305D\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u306F\u65B0\u3057\u3044ID\u3092\u6301\u3061\u307E\u3059\u3002\n\u901A\u5E38\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u5834\u5408\u3001ID\u306F\u5897\u52A0\u3059\u308B\u6570\u5024\u3067\u3059\u3002\u30A8\u30E9\u30FC\u3067\u5931\u6557\u3059\u308B\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\n\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306F'e'\u3067\u59CB\u307E\u308A\u307E\u3059\u3002\u8D77\u52D5\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u306EID\u306F's'\u3067\u59CB\u307E\u308A\u307E\u3059\u3002\n\n\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306F\u3001\u30B3\u30DE\u30F3\u30C9\u5185\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u53C2\u7167\u3059\u308B1\u3064\u306E\u65B9\u6CD5\u3067\u3059\u3002\u305F\u3068\u3048\u3070\u3001\n\u6B21\u306E\u30B3\u30DE\u30F3\u30C9\u306FID '14'\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002\n\n\t/drop 14\n\n1\u3064\u307E\u305F\u306F\u8907\u6570\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u306EID\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u3001'/list'\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\n\u5931\u6557\u3001\u8D77\u52D5\u3001\u4E0A\u66F8\u304D\u6E08\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u542B\u3080\u3059\u3079\u3066\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u306EID\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u3001\n'/list -all'\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\n\n\u958B\u59CBID\u3068\u7D42\u4E86ID\u3092\u30CF\u30A4\u30D5\u30F3\u3067\u533A\u5207\u3063\u305FID\u306E\u7BC4\u56F2\u3082\u53C2\u7167\u3067\u304D\u307E\u3059\u3002\n\u305F\u3068\u3048\u3070\u3001'1-4'\u306F'1 2 3 4'\u3068\u540C\u3058\u3067\u3059\u3002\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u53C2\u7167\u3059\u308B\u3059\u3079\u3066\u306E\u30B3\u30DE\u30F3\u30C9\u306F\u3001\nID\u306E\u30EA\u30B9\u30C8\u3001ID\u7BC4\u56F2\u304A\u3088\u3073\u30B9\u30CB\u30DA\u30C3\u30C8\u540D\u3092\u5F15\u6570\u3068\u3057\u3066\u53D7\u3051\u53D6\u308A\u307E\u3059\u3002\n\u3053\u308C\u3089\u306E\u30B3\u30DE\u30F3\u30C9\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059: /list\u3001/edit\u3001/drop\u3001/save\u3001/vars\u3001/methods\u3001\n/types\u3001/<id>\u3002\u4F8B\u3092\u3044\u304F\u3064\u304B\u793A\u3057\u307E\u3059\u3002\n\n\t/edit 7-23\n\n\t/save s1-s4 3-8 foo 12 myfile\n\n\t/9-12 33\n\n\u305D\u308C\u305E\u308C'/help /edit'\u3001'/help /save'\u3001'/help rerun'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+help.id.summary = スニペットIDの宣言とそれらの使用方法
+help.id =入力したコードのすべてのスニペットに固有のスニペットIDがあります。\n同じスニペットを再度入力した場合でも、そのスニペットは新しいIDを持ちます。\n通常のスニペットの場合、IDは増加する数値です。エラーで失敗するスニペットの\nスニペットIDは'e'で始まります。起動のスニペットのIDは's'で始まります。\n\nスニペットIDは、コマンド内のスニペットを参照する1つの方法です。たとえば、\n次のコマンドはID '14'のスニペットを削除します。\n\n\t/drop 14\n\n1つまたは複数のスニペットのIDを表示するには、'/list'コマンドを使用します。\n失敗、起動、上書き済スニペットを含むすべてのスニペットのIDを表示するには、\n'/list -all'コマンドを使用します。\n\n開始IDと終了IDをハイフンで区切ったIDの範囲も参照できます。\nたとえば、'1-4'は'1 2 3 4'と同じです。スニペットを参照するすべてのコマンドは、\nIDのリスト、ID範囲およびスニペット名を引数として受け取ります。\nこれらのコマンドは次のとおりです: /list、/edit、/drop、/save、/vars、/methods、\n/types、/<id>。例をいくつか示します。\n\n\t/edit 7-23\n\n\t/save s1-s4 3-8 foo 12 myfile\n\n\t/9-12 33\n\nそれぞれ'/help /edit'、'/help /save'、'/help rerun'を参照してください。
 
-help.rerun.summary = \u524D\u306B\u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u518D\u8A55\u4FA1\u3059\u308B\u65B9\u6CD5\u306E\u8AAC\u660E
-help.rerun =\u524D\u306B\u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u518D\u8A55\u4FA1\u3059\u308B\u65B9\u6CD5\u306F4\u3064\u3042\u308A\u307E\u3059\u3002\n\u6700\u5F8C\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u306F\u3001/!\u3092\u4F7F\u7528\u3057\u3066\u518D\u8A55\u4FA1\u3067\u304D\u307E\u3059\nn\u56DE\u524D\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u306F\u3001\u30B9\u30E9\u30C3\u30B7\u30E5\u3068\u30DE\u30A4\u30CA\u30B9\u304A\u3088\u3073n\u306E\u6570\u5B57\u3067\u518D\u8A55\u4FA1\u3067\u304D\u307E\u3059(\u4F8B: /-4)\n\u6B21\u306B\u4F8B\u3092\u793A\u3057\u307E\u3059\u3002\n\n\tjshell> 2 + 2\n\t$1 ==> 4\n\n\tjshell> /!\n\t2 + 2\n\t$2 ==> 4\n\n\tjshell> int z\n\tz ==> 0\n\n\tjshell> /-1\n\tint z;\n\tz ==> 0\n\n\tjshell> /-4\n\t2 + 2\n\t$5 ==> 4\n\n\u518D\u8A55\u4FA1\u3059\u308B\u30B9\u30CB\u30DA\u30C3\u30C8\u306F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8ID\u307E\u305F\u306FID\u7BC4\u56F2\u3067\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\nID\u7BC4\u56F2\u306F\u3001\u30CF\u30A4\u30D5\u30F3\u3067\u533A\u5207\u3089\u308C\u305F2\u3064\u306EID\u3067\u8868\u73FE\u3055\u308C\u307E\u3059(\u4F8B: 3-17)\n\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30A8\u30E9\u30FC\u30FB\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059(\u4F8B: s3-s9\u307E\u305F\u306Fe1-e4)\n\u4EFB\u610F\u306E\u6570\u306EID\u307E\u305F\u306FID\u7BC4\u56F2\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059(\u4F8B: /3-7 s4 14-16 e2)\n'/help id'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\n\u307E\u305F\u3001[Ctrl]+[R]\u3092\u62BC\u3057\u3066\u304B\u3089\u691C\u7D22\u6587\u5B57\u5217\u3092\u5165\u529B\u3059\u308B\u3068\u3001\u5C65\u6B74\u3092\u3055\u304B\u306E\u307C\u3063\u3066\u691C\u7D22\u3067\u304D\u307E\u3059\u3002
+help.rerun.summary = 前に入力したスニペットを再評価する方法の説明
+help.rerun =前に入力したスニペットを再評価する方法は4つあります。\n最後のスニペットは、/!を使用して再評価できます\nn回前のスニペットは、スラッシュとマイナスおよびnの数字で再評価できます(例: /-4)\n次に例を示します。\n\n\tjshell> 2 + 2\n\t$1 ==> 4\n\n\tjshell> /!\n\t2 + 2\n\t$2 ==> 4\n\n\tjshell> int z\n\tz ==> 0\n\n\tjshell> /-1\n\tint z;\n\tz ==> 0\n\n\tjshell> /-4\n\t2 + 2\n\t$5 ==> 4\n\n再評価するスニペットは、スニペットIDまたはID範囲で指定できます。\nID範囲は、ハイフンで区切られた2つのIDで表現されます(例: 3-17)\n起動スニペットおよびエラー・スニペットを使用できます(例: s3-s9またはe1-e4)\n任意の数のIDまたはID範囲を使用できます(例: /3-7 s4 14-16 e2)\n'/help id'を参照してください。\n\nまた、[Ctrl]+[R]を押してから検索文字列を入力すると、履歴をさかのぼって検索できます。
 
-help.set._retain = '-retain'\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u3088\u308A\u3001\u5C06\u6765\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u3067\u4F7F\u7528\u3059\u308B\u305F\u3081\u306B\u8A2D\u5B9A\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002\n-retain\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001/set\u306E\u6B21\u306E\u5F62\u5F0F\u3067\u4F7F\u7528\u3067\u304D\u307E\u3059:\n\n\t/set editor -retain\n\t/set start -retain\n\t/set feedback -retain\n\t/set mode -retain\n\n\u8A73\u7D30\u306F\u3001\u3053\u308C\u3089\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044 -- \u4F8B: /help /set editor
+help.set._retain = '-retain'オプションにより、将来のセッションで使用するために設定を保存します。\n-retainオプションは、/setの次の形式で使用できます:\n\n\t/set editor -retain\n\t/set start -retain\n\t/set feedback -retain\n\t/set mode -retain\n\n詳細は、これらのコマンドを参照してください -- 例: /help /set editor
 
-help.set.format.summary = \u30B9\u30CB\u30DA\u30C3\u30C8\u30FB\u30A4\u30D9\u30F3\u30C8\u3092\u30EC\u30DD\u30FC\u30C8\u3059\u308B\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059
+help.set.format.summary = スニペット・イベントをレポートするフォーマットを設定します
 
-help.set.format = \u30B9\u30CB\u30DA\u30C3\u30C8\u30FB\u30A4\u30D9\u30F3\u30C8\u3092\u30EC\u30DD\u30FC\u30C8\u3059\u308B\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059:\n\n\t/set format <mode> <field> "<format>" <selector>...\n\n\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059:\n\n\t/set format [<mode> [<field>]]\n\n<mode>\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059 -- '/help /set mode'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n<field>\u306F\u5B9A\u7FA9\u3059\u308B\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u56FA\u6709\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306E\u540D\u524D\u3067\u3059\u3002\n<format>\u306F\u5F15\u7528\u7B26\u306B\u56F2\u307E\u308C\u305F\u6587\u5B57\u5217\u3067\u3001\u6B21\u306E\u5834\u5408\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u5024\u3067\u3059: \n\u30BB\u30EC\u30AF\u30BF\u304C\u4E00\u81F4\u3059\u308B(\u307E\u305F\u306F\u30BB\u30EC\u30AF\u30BF\u304C\u306A\u3044)\u3002\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304C\u4F7F\u7528\u3055\u308C\u308B\u5834\u5408\u3001\n\u4E2D\u30AB\u30C3\u30B3\u3067\u56F2\u307E\u308C\u3066\u3044\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u540D\u304C\u305D\u306E\u3068\u304D\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u5024\u3067\u7F6E\u63DB\u3055\u308C\u307E\u3059\n\u3053\u308C\u3089\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u3001\u3053\u306E\u30B3\u30DE\u30F3\u30C9\u3067\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3082\u3001\n\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u56FA\u6709\u306E\u3053\u308C\u3089\u306E\u4E8B\u524D\u5B9A\u7FA9\u6E08\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u3044\u305A\u308C\u304B\u3067\u3042\u308B\u5834\u5408\u3082\u3042\u308A\u307E\u3059:\n\t{name}       == \u540D\u524D\u3001\u4F8B: \u5909\u6570\u540D\u3001 ...\n\t{type}       == \u30BF\u30A4\u30D7\u540D\u3002\u5909\u6570\u307E\u305F\u306F\u5F0F\u306E\u30BF\u30A4\u30D7\u3001\n\t\t\t\u30E1\u30BD\u30C3\u30C9\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\n\t{value}      == \u5F0F\u307E\u305F\u306F\u5909\u6570\u306E\u521D\u671F\u5316\u306E\u7D50\u679C\u5024\n\t{unresolved} == \u672A\u89E3\u6C7A\u306E\u53C2\u7167\u306E\u30EA\u30B9\u30C8\n\t{errors}     == \u30EA\u30AB\u30D0\u30EA\u53EF\u80FD\u306A\u30A8\u30E9\u30FC\u306E\u30EA\u30B9\u30C8(\u51E6\u7406\u6642-\n\t\t\t"display"\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u307F)\n\t{err}        == \u672A\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u30FB\u30A8\u30E9\u30FC\u884C(\u51E6\u7406\u6642-\n\t\t\t"errorline"\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u307F)\n\u6B21\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u30C4\u30FC\u30EB\u306B\u3088\u3063\u3066\u30A2\u30AF\u30BB\u30B9\u3055\u308C\u3001\u8868\u793A\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u6C7A\u5B9A\u3057\u307E\u3059:\n\t{display}    == \u30B9\u30CB\u30DA\u30C3\u30C8\u30FB\u30A4\u30D9\u30F3\u30C8\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30E1\u30C3\u30BB\u30FC\u30B8\n\t{errorline}  == \u300Cerrors\u300D\u30D5\u30A3\u30FC\u30EB\u30C9\u5185\u306E\u30A8\u30E9\u30FC\u884C\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\n\t{pre}        == \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u63A5\u982D\u8F9E(\u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u958B\u59CB\u3059\u308B)\n\t{post}       == \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u63A5\u5C3E\u8F9E(\u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u7D42\u4E86\u3059\u308B)\n\t{errorpre}   == \u30A8\u30E9\u30FC\u63A5\u982D\u8F9E(\u30A8\u30E9\u30FC\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u958B\u59CB\u3059\u308B)\n\t{errorpost}  == \
-\u30A8\u30E9\u30FC\u63A5\u5C3E\u8F9E(\u30A8\u30E9\u30FC\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u7D42\u4E86\u3059\u308B)\n\u3053\u308C\u3089\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8A2D\u5B9A\u304C\u3042\u308A\u307E\u3059(\u4E0A\u66F8\u304D\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059)\u3002\n<selector>\u306F\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304C\u9069\u7528\u3055\u308C\u308B\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u3059\u3002\n\u30BB\u30EC\u30AF\u30BF\u69CB\u9020\u306F\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u306E\u30CF\u30A4\u30D5\u30F3\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3067\u3059\u3002\n\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u306F\u30011\u3064\u306E\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306E\u5024\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3067\u3059\u3002\n\u30BB\u30EC\u30AF\u30BF\u306F\u5404\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u304C\u4E00\u81F4\u3059\u308C\u3070\u4E00\u81F4\u3068\u306A\u308A\u307E\u3059\u3002\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u306F\n\u3044\u305A\u308C\u304B\u306E\u5024\u304C\u4E00\u81F4\u3059\u308C\u3070\u4E00\u81F4\u3068\u306A\u308A\u307E\u3059\u3002\n\n\u30B1\u30FC\u30B9\u30FB\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u7A2E\u985E\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\timport     -- \u30A4\u30F3\u30DD\u30FC\u30C8\u5BA3\u8A00\n\tclass      -- \u30AF\u30E9\u30B9\u5BA3\u8A00\n\tinterface  -- \u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5BA3\u8A00\n\tenum       -- \u5217\u6319\u578B\u306E\u5BA3\u8A00\n\tannotation -- \u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5BA3\u8A00\n\trecord     -- \u30EC\u30B3\u30FC\u30C9\u5BA3\u8A00\n\tmethod     -- \u30E1\u30BD\u30C3\u30C9\u5BA3\u8A00 -- \u30CE\u30FC\u30C8: {type}==parameter-types\n\tvardecl    -- \u521D\u671F\u5316\u3057\u306A\u3044\u5909\u6570\u5BA3\u8A00\n\tvarinit    -- \u521D\u671F\u5316\u3059\u308B\u5909\u6570\u5BA3\u8A00\n\texpression -- \u5F0F -- \u30CE\u30FC\u30C8: {name}==scratch-variable-name\n\tvarvalue   -- \u5909\u6570\u5024\u5F0F\n\tassignment -- \u5909\u6570\u3092\u5272\u308A\u5F53\u3066\u307E\u3059\n\tstatement  -- \u6587\n\u30A2\u30AF\u30B7\u30E7\u30F3\u30FB\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u306B\u767A\u751F\u3057\u305F\u5185\u5BB9\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\tadded     -- \u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\n\tmodified  -- \u65E2\u5B58\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u5909\u66F4\u3055\u308C\u307E\u3057\u305F\n\treplaced  -- \u65E2\u5B58\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u65B0\u898F\u30B9\u30CB\u30DA\u30C3\u30C8\u3067\u7F6E\u63DB\u3055\u308C\u307E\u3057\u305F\n\toverwrote -- \u65E2\u5B58\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3057\u305F\n\tdropped   -- \u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F\n\tused      -- \u4F7F\u7528\u3067\u304D\u306A\u3044\u3068\u304D\u306B\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u4F7F\u7528\u3055\u308C\u307E\u3057\u305F\n\u767A\u751F\u6642\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u3053\u308C\u304C\u76F4\u63A5\u307E\u305F\u306F\u9593\u63A5\u30A2\u30AF\u30B7\u30E7\u30F3\u3067\u3042\u308B\u304B\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\tprimary -- \u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\n\tupdate  -- \u4F9D\u5B58\u30B9\u30CB\u30DA\u30C3\u30C8\u3078\u306E\u66F4\u65B0\n\u89E3\u6C7A\u72B6\u614B\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u89E3\u6C7A/\u5B9A\u7FA9\u306E\u72B6\u614B\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\tok         -- \
-\u6B63\u3057\u304F\u89E3\u6C7A\u3055\u308C\u307E\u3057\u305F\n\tdefined    -- \u5FA9\u5143\u53EF\u80FD\u3067\u672A\u89E3\u6C7A\u306E\u53C2\u7167\u306B\u3082\u304B\u304B\u308F\u3089\u305A\u5B9A\u7FA9\u3055\u308C\u307E\u3057\u305F\n\tnotdefined -- \u5FA9\u5143\u53EF\u80FD\u3067\u672A\u89E3\u6C7A\u306E\u53C2\u7167\u306E\u305F\u3081\u5B9A\u7FA9\u3055\u308C\u307E\u305B\u3093\n\u672A\u89E3\u6C7A\u6570\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u672A\u89E3\u6C7A\u306E\u53C2\u7167\u306E\u6570\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\tunresolved0 -- \u672A\u89E3\u6C7A\u306E\u540D\u524D\u306F\u3042\u308A\u307E\u305B\u3093\n\tunresolved1 -- 1\u3064\u306E\u540D\u524D\u304C\u89E3\u6C7A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n\tunresolved2 -- 2\u3064\u4EE5\u4E0A\u306E\u540D\u524D\u304C\u89E3\u6C7A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n\u30A8\u30E9\u30FC\u6570\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u30A8\u30E9\u30FC\u306E\u6570\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\terror0 -- \u30A8\u30E9\u30FC\u306A\u3057\n\terror1 -- 1\u3064\u306E\u30A8\u30E9\u30FC\n\terror2 -- 2\u3064\u4EE5\u4E0A\u306E\u30A8\u30E9\u30FC\n\n\u4F8B:\n\t/set format mymode action '\u6B21\u3092\u4F5C\u6210\u3057\u307E\u3057\u305F:' added-primary\n\t/set format mymode action '\u6B21\u3092\u66F4\u65B0/\u7F6E\u63DB\u3057\u307E\u3057\u305F:' replaced-update\n\t/set format mymode display '{pre}{action} \u30AF\u30E9\u30B9 {name}{post}' class-ok\n\t/set format mymode display '{pre}{action} \u5909\u6570 {name}\u3001null\u306B\u30EA\u30BB\u30C3\u30C8\u3055\u308C\u307E\u3057\u305F{post}' replaced-vardecl,varinit-ok-update\n\n\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u5BFE\u3059\u308B\u5F8C\u7D9A\u306E\u30BB\u30EC\u30AF\u30BF\u306B\u3088\u308A\u3001\u4EE5\u524D\u306B\u4F7F\u7528\u3055\u308C\u305F\u30BB\u30EC\u30AF\u30C8\u306E\u4E00\u90E8\u307E\u305F\u306F\u3059\u3079\u3066\u304C\u4E0A\u66F8\u304D\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059 -- \u6700\u5F8C\u306E\u30BB\u30EC\u30AF\u30BF\u304C\u6709\u52B9\u306B\u306A\u308A\u307E\u3059\n\n<format>\u306E\u306A\u3044\u5F62\u5F0F\u306F\u3001\u73FE\u5728\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n<mode>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u305D\u306E\u30E2\u30FC\u30C9\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u8A2D\u5B9A\u306E\u307F\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\n<mode>\u3068<field>\u306E\u4E21\u65B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\n\u305D\u306E\u30E2\u30FC\u30C9\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u8A2D\u5B9A\u306E\u307F\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4F8B:\n\t/set format mymode\n\u30E2\u30FC\u30C9mymode\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059\n
+help.set.format = スニペット・イベントをレポートするフォーマットを設定します:\n\n\t/set format <mode> <field> "<format>" <selector>...\n\nフォーマット設定を表示します:\n\n\t/set format [<mode> [<field>]]\n\n<mode>は事前に定義されたフィードバック・モードの名前です -- '/help /set mode'を参照してください。\n<field>は定義するコンテキスト固有のフォーマットの名前です。\n<format>は引用符に囲まれた文字列で、次の場合のフィールドの値です: \nセレクタが一致する(またはセレクタがない)。フォーマットが使用される場合、\n中カッコで囲まれているフィールド名がそのときのフィールドの値で置換されます\nこれらのフィールドは、このコマンドで事前に定義されている場合も、\nコンテキストに固有のこれらの事前定義済フィールドのいずれかである場合もあります:\n\t{name}       == 名前、例: 変数名、 ...\n\t{type}       == タイプ名。変数または式のタイプ、\n\t\t\tメソッドのパラメータ・タイプ\n\t{value}      == 式または変数の初期化の結果値\n\t{unresolved} == 未解決の参照のリスト\n\t{errors}     == リカバリ可能なエラーのリスト(処理時-\n\t\t\t"display"フィールドのみ)\n\t{err}        == 未フォーマット・エラー行(処理時-\n\t\t\t"errorline"フィールドのみ)\n次のフィールドはツールによってアクセスされ、表示されるフィードバックを決定します:\n\t{display}    == スニペット・イベントに対して表示されるメッセージ\n\t{errorline}  == 「errors」フィールド内のエラー行のフォーマット\n\t{pre}        == フィードバック接頭辞(コマンド・フィードバックを開始する)\n\t{post}       == フィードバック接尾辞(コマンド・フィードバックを終了する)\n\t{errorpre}   == エラー接頭辞(エラー・フィードバックを開始する)\n\t{errorpost}  == \
+エラー接尾辞(エラー・フィードバックを終了する)\nこれらのフィールドにはデフォルトの設定があります(上書きされる可能性があります)。\n<selector>はフォーマットが適用されるコンテキストです。\nセレクタ構造はセレクタ種類リストのハイフン区切りリストです。\nセレクタ種類リストは、1つのセレクタ種類の値のカンマ区切りリストです。\nセレクタは各セレクタ種類リストが一致すれば一致となります。セレクタ種類リストは\nいずれかの値が一致すれば一致となります。\n\nケース・セレクタ種類は、スニペットの種類を示します。値は次のとおりです:\n\timport     -- インポート宣言\n\tclass      -- クラス宣言\n\tinterface  -- インタフェース宣言\n\tenum       -- 列挙型の宣言\n\tannotation -- 注釈インタフェース宣言\n\trecord     -- レコード宣言\n\tmethod     -- メソッド宣言 -- ノート: {type}==parameter-types\n\tvardecl    -- 初期化しない変数宣言\n\tvarinit    -- 初期化する変数宣言\n\texpression -- 式 -- ノート: {name}==scratch-variable-name\n\tvarvalue   -- 変数値式\n\tassignment -- 変数を割り当てます\n\tstatement  -- 文\nアクション・セレクタ種類は、スニペットに発生した内容を示します。値は次のとおりです:\n\tadded     -- スニペットが追加されました\n\tmodified  -- 既存のスニペットが変更されました\n\treplaced  -- 既存のスニペットが新規スニペットで置換されました\n\toverwrote -- 既存のスニペットが上書きされました\n\tdropped   -- スニペットが削除されました\n\tused      -- 使用できないときにスニペットが使用されました\n発生時セレクタ種類は、これが直接または間接アクションであるかを示します。値は次のとおりです:\n\tprimary -- 入力したスニペット\n\tupdate  -- 依存スニペットへの更新\n解決状態セレクタ種類は、スニペットの解決/定義の状態を示します。値は次のとおりです:\n\tok         -- \
+正しく解決されました\n\tdefined    -- 復元可能で未解決の参照にもかかわらず定義されました\n\tnotdefined -- 復元可能で未解決の参照のため定義されません\n未解決数セレクタ種類は、未解決の参照の数を示します。値は次のとおりです:\n\tunresolved0 -- 未解決の名前はありません\n\tunresolved1 -- 1つの名前が解決されていません\n\tunresolved2 -- 2つ以上の名前が解決されていません\nエラー数セレクタ種類は、エラーの数を示します。値は次のとおりです:\n\terror0 -- エラーなし\n\terror1 -- 1つのエラー\n\terror2 -- 2つ以上のエラー\n\n例:\n\t/set format mymode action '次を作成しました:' added-primary\n\t/set format mymode action '次を更新/置換しました:' replaced-update\n\t/set format mymode display '{pre}{action} クラス {name}{post}' class-ok\n\t/set format mymode display '{pre}{action} 変数 {name}、nullにリセットされました{post}' replaced-vardecl,varinit-ok-update\n\nフィールドに対する後続のセレクタにより、以前に使用されたセレクトの一部またはすべてが上書きされる可能性があります -- 最後のセレクタが有効になります\n\n<format>のない形式は、現在のフォーマット設定を表示します。\n<mode>が指定されている場合、そのモードのフォーマット設定のみが表示されます。\n<mode>と<field>の両方が指定されている場合、\nそのモードおよびフィールドのフォーマット設定のみが表示されます。例:\n\t/set format mymode\nモードmymodeのフォーマット設定を表示します\n
 
-help.set.truncation.summary = \u8868\u793A\u3055\u308C\u308B\u5024\u306E\u6700\u5927\u9577\u3092\u8A2D\u5B9A\u3057\u307E\u3059
+help.set.truncation.summary = 表示される値の最大長を設定します
 
-help.set.truncation = \u8868\u793A\u3055\u308C\u308B\u5024\u306E\u6700\u5927\u9577\u3092\u8A2D\u5B9A\u3057\u307E\u3059:\n\n\t/set truncation <mode> <length> <selector>...\n\n\u73FE\u5728\u306E\u5207\u6368\u3066\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059:\n\n\t/set truncation [<mode>]\n\n<mode>\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059 -- '/help /set mode'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n<length>\u306F\u6700\u5927\u9577\u3092\u8868\u3059\u7B26\u53F7\u306A\u3057\u6574\u6570\u3067\u3059\u3002\n<selector>\u306F\u3001\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u3088\u3063\u3066\u5207\u6368\u3066\u9577\u306E\u5024\u3092\u5FAE\u8ABF\u6574\u3059\u308B\u5834\u5408\u306B\u306E\u307F\n\u5FC5\u8981\u3067\u3059\u3002<selector>\u306F\u3001\u5207\u6368\u3066\u304C\u9069\u7528\u3055\u308C\u308B\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u3059\u3002\n\u30BB\u30EC\u30AF\u30BF\u69CB\u9020\u306F\u3001\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u306E\u30CF\u30A4\u30D5\u30F3\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8\u3067\u3059\u3002\n\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u306F\u30011\u3064\u306E\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306E\u5024\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8\u3067\u3059\u3002\n\u30BB\u30EC\u30AF\u30BF\u306F\u5404\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u304C\u4E00\u81F4\u3059\u308C\u3070\u4E00\u81F4\u3068\u306A\u308A\u307E\u3059\u3002\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u306F\n\u3044\u305A\u308C\u304B\u306E\u5024\u304C\u4E00\u81F4\u3059\u308C\u3070\u4E00\u81F4\u3068\u306A\u308A\u307E\u3059\u3002\n\n\u6B21\u306B\u793A\u3059\u306E\u306F\u3001\u5207\u6368\u3066\u306B\u95A2\u9023\u3059\u308B\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u3067\u3059\u3002\n\n\u30B1\u30FC\u30B9\u30FB\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u7A2E\u985E\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\tvardecl    -- \u521D\u671F\u5316\u3057\u306A\u3044\u5909\u6570\u5BA3\u8A00\n\tvarinit    -- \u521D\u671F\u5316\u3059\u308B\u5909\u6570\u5BA3\u8A00\n\texpression -- \u5F0F -- \u30CE\u30FC\u30C8: {name}==scratch-variable-name\n\tvarvalue   -- \u5909\u6570\u5024\u5F0F\n\tassignment -- \u5909\u6570\u3092\u5272\u308A\u5F53\u3066\u307E\u3059\n\u30A2\u30AF\u30B7\u30E7\u30F3\u30FB\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u306B\u767A\u751F\u3057\u305F\u5185\u5BB9\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\tadded     -- \u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\n\tmodified  -- \u65E2\u5B58\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u5909\u66F4\u3055\u308C\u307E\u3057\u305F\n\treplaced  -- \u65E2\u5B58\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u65B0\u898F\u30B9\u30CB\u30DA\u30C3\u30C8\u3067\u7F6E\u63DB\u3055\u308C\u307E\u3057\u305F\n\u4F8B:\n\t/set trunc mymode 80\n\t/set truncation mymode 45 expression\n\t/set truncation mymode 0 vardecl-modified,replaced\n\n\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u5BFE\u3059\u308B\u5F8C\u7D9A\u306E\u30BB\u30EC\u30AF\u30BF\u306B\u3088\u308A\u3001\u4EE5\u524D\u306B\u4F7F\u7528\u3055\u308C\u305F\u30BB\u30EC\u30AF\u30BF\u306E\u4E00\u90E8\u307E\u305F\u306F\u3059\u3079\u3066\u304C\u4E0A\u66F8\u304D\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059 -- \u6700\u5F8C\u306E\u30BB\u30EC\u30AF\u30BF\u304C\u6709\u52B9\u306B\u306A\u308A\u307E\u3059\n\n<length>\u306E\u306A\u3044\u5F62\u5F0F\u306F\u3001\u5207\u6368\u3066\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n<mode>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u305D\u306E\u30E2\u30FC\u30C9\u306E\u5207\u6368\u3066\u8A2D\u5B9A\u306E\u307F\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\n\u4F8B:\n\t/set truncation \
-mymode\n\u30E2\u30FC\u30C9mymode\u306E\u5207\u6368\u3066\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059\n
+help.set.truncation = 表示される値の最大長を設定します:\n\n\t/set truncation <mode> <length> <selector>...\n\n現在の切捨て設定を表示します:\n\n\t/set truncation [<mode>]\n\n<mode>は事前に定義されたフィードバック・モードの名前です -- '/help /set mode'を参照してください。\n<length>は最大長を表す符号なし整数です。\n<selector>は、コンテキストによって切捨て長の値を微調整する場合にのみ\n必要です。<selector>は、切捨てが適用されるコンテキストです。\nセレクタ構造は、セレクタ種類リストのハイフン区切りのリストです。\nセレクタ種類リストは、1つのセレクタ種類の値のカンマ区切りのリストです。\nセレクタは各セレクタ種類リストが一致すれば一致となります。セレクタ種類リストは\nいずれかの値が一致すれば一致となります。\n\n次に示すのは、切捨てに関連するセレクタ種類です。\n\nケース・セレクタ種類は、スニペットの種類を示します。値は次のとおりです:\n\tvardecl    -- 初期化しない変数宣言\n\tvarinit    -- 初期化する変数宣言\n\texpression -- 式 -- ノート: {name}==scratch-variable-name\n\tvarvalue   -- 変数値式\n\tassignment -- 変数を割り当てます\nアクション・セレクタ種類は、スニペットに発生した内容を示します。値は次のとおりです:\n\tadded     -- スニペットが追加されました\n\tmodified  -- 既存のスニペットが変更されました\n\treplaced  -- 既存のスニペットが新規スニペットで置換されました\n例:\n\t/set trunc mymode 80\n\t/set truncation mymode 45 expression\n\t/set truncation mymode 0 vardecl-modified,replaced\n\nフィールドに対する後続のセレクタにより、以前に使用されたセレクタの一部またはすべてが上書きされる可能性があります -- 最後のセレクタが有効になります\n\n<length>のない形式は、切捨て設定を表示します。\n<mode>が指定されている場合、そのモードの切捨て設定のみが表示されます。\n例:\n\t/set truncation \
+mymode\nモードmymodeの切捨て設定を表示します\n
 
-help.set.feedback.summary = \u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u793A\u3059\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059
+help.set.feedback.summary = 入力したスニペットおよびコマンドに対して表示されるフィードバックを示す、フィードバック・モードを設定します
 
-help.set.feedback = \u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u793A\u3059\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059:\n\n\t/set feedback [-retain] <mode>\n\n\u5C06\u6765\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u305F\u3081\u306B\u73FE\u5728\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u4FDD\u6301\u3057\u307E\u3059:\n\n\t/set feedback -retain\n\n\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u8868\u793A\u3057\u3001\u4F7F\u7528\u53EF\u80FD\u306A\u30E2\u30FC\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059:\n\n\t/set feedback\n\n<mode>\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n\u4E00\u610F\u306B\u3059\u308B\u305F\u3081\u306B\u5FC5\u8981\u306A\u6587\u5B57\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30E2\u30FC\u30C9\u306F\u8FFD\u52A0\u3067\u304D\u307E\u3059\u3002'/help /set mode'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n\n-retain\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u8A2D\u5B9A\u306Fjshell\u30C4\u30FC\u30EB\u306E\u3053\u306E\u5B9F\u884C\u3068\u5C06\u6765\u306E\n\u5B9F\u884C\u3067\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n\n<mode>\u307E\u305F\u306F-retain\u306E\u306A\u3044\u5F62\u5F0F\u306F\u3001\u73FE\u5728\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u304A\u3088\u3073\u4F7F\u7528\u53EF\u80FD\u306A\u30E2\u30FC\u30C9\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n
+help.set.feedback = 入力したスニペットおよびコマンドに対して表示されるフィードバックを示す、フィードバック・モードを設定します:\n\n\t/set feedback [-retain] <mode>\n\n将来のセッションのために現在のフィードバック・モードを保持します:\n\n\t/set feedback -retain\n\nフィードバック・モードを表示し、使用可能なモードをリストします:\n\n\t/set feedback\n\n<mode>は事前に定義されたフィードバック・モードの名前です。\n一意にするために必要な文字を使用できます。\nユーザー定義モードは追加できます。'/help /set mode'を参照してください\n\n-retainオプションが使用されている場合、設定はjshellツールのこの実行と将来の\n実行で使用されます。\n\n<mode>または-retainのない形式は、現在のフィードバック・モードおよび使用可能なモードを表示します。\n
 
-help.set.mode.summary = \u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u65E2\u5B58\u306E\u30E2\u30FC\u30C9\u304B\u3089\u30B3\u30D4\u30FC\u3057\u307E\u3059
+help.set.mode.summary = ユーザー定義フィードバック・モードを作成します。必要に応じて既存のモードからコピーします
 
-help.set.mode = \u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u65E2\u5B58\u306E\u30E2\u30FC\u30C9\u304B\u3089\u30B3\u30D4\u30FC\u3057\u307E\u3059:\n\n\t/set mode <new-mode> [<old-mode>] (-command|-quiet)\n\n\u5C06\u6765\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u305F\u3081\u306B\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u4FDD\u6301\u3057\u307E\u3059:\n\n\t/set mode -retain <mode>\n\n\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u524A\u9664\u3057\u307E\u3059:\n\n\t/set mode -delete [-retain] <mode>\n\n\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059:\n\n\t/set mode [<mode>]\n\n<new-mode>\u306F\u4F5C\u6210\u3059\u308B\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n<old-mode>\u306F\u65E2\u5B58\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n<mode>\u306F\u65E2\u5B58\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n\n<old-mode>\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u3001\u305D\u306E\u8A2D\u5B9A\u304C\u65B0\u898F\u30E2\u30FC\u30C9\u306B\u30B3\u30D4\u30FC\u3055\u308C\u307E\u3059\u3002\n\n\u5165\u529B\u3055\u308C\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u306B\u30E2\u30FC\u30C9\u304C\u63D0\u4F9B\u3059\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u306F\u3001'/set format'\u8A2D\u5B9A\u306B\u3088\u3063\u3066\n\u6C7A\u5B9A\u3055\u308C\u307E\u3059\u3002\u305F\u3060\u3057\u3001\u5165\u529B\u3055\u308C\u305F\u30B3\u30DE\u30F3\u30C9\u306E\u5834\u5408\u3001\u30E2\u30FC\u30C9\u4F5C\u6210\u6642\u306B\n\u4F7F\u7528\u3055\u308C\u305F\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5F93\u3063\u3066\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u306F\u30AA\u30F3\u307E\u305F\u306F\u30AA\u30D5\u306E\u3044\u305A\u308C\u304B\u306B\u306A\u308A\u307E\u3059\u3002\n\u30AA\u30D7\u30B7\u30E7\u30F3'-command'\u307E\u305F\u306F\u30AA\u30D7\u30B7\u30E7\u30F3'-quiet'\u306E\u3044\u305A\u308C\u304B\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n'-command'\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u65B0\u898F\u30E2\u30FC\u30C9\u3067\u306F\u3001\u60C5\u5831/\u691C\u8A3C\u4E2D\u306E\u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\n'-quiet'\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u5FC5\u8981\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF(\u30A8\u30E9\u30FC\u306A\u3069)\u306E\u307F\u8868\u793A\u3055\u308C\u307E\u3059\u3002\n\n\u65B0\u898F\u30E2\u30FC\u30C9\u3092\u4F5C\u6210\u3057\u305F\u3089\u3001'/set format'\u3001'/set prompt'\u304A\u3088\u3073'/set truncation'\u3092\u4F7F\u7528\u3057\u3066\n\u69CB\u6210\u3057\u307E\u3059\u3002\u65B0\u898F\u30E2\u30FC\u30C9\u3092\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001'/set \
-feedback'\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\n\n'-retain'\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408('-delete'\u30AA\u30D7\u30B7\u30E7\u30F3\u306A\u3057)\u3001\n\u30E2\u30FC\u30C9(\u73FE\u5728\u306E\u30D7\u30ED\u30F3\u30D7\u30C8\u3001\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304A\u3088\u3073\u5207\u6368\u3066\u8A2D\u5B9A\u3092\u542B\u3080)\u306F\u3001\u5C06\u6765\u306E\u5B9F\u884C\u3067\n\u4F7F\u7528\u3067\u304D\u308B\u3088\u3046\u306Bjshell\u30C4\u30FC\u30EB\u306B\u683C\u7D0D\u3055\u308C\u307E\u3059\u3002retain\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001\n\u30E2\u30FC\u30C9\u306F\u73FE\u5728\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u3067\u306E\u307F\u5B9A\u7FA9\u3055\u308C\u307E\u3059\u3002\u30E2\u30FC\u30C9\u306E\u8A2D\u5B9A\u3092\u66F4\u65B0\u3057\u305F\u5F8C\u3001\n\u30BB\u30C3\u30B7\u30E7\u30F3\u9593\u3067\u66F4\u65B0\u3092\u4FDD\u5B58\u3059\u308B\u306B\u306F\u3001\u30E2\u30FC\u30C9\u3092\u518D\u5EA6\u4FDD\u6301\u3057\u307E\u3059\u3002\n\n'-delete'\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u307F\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30E2\u30FC\u30C9\u306F\u73FE\u5728\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u304B\u3089\u524A\u9664\u3055\u308C\u307E\u3059\u3002\n'-retain'\u3068'-delete'\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4E21\u65B9\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30E2\u30FC\u30C9\u306F\u73FE\u5728\u3068\u5C06\u6765\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u304B\u3089\n\u524A\u9664\u3055\u308C\u307E\u3059\u3002\n\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u306A\u3044\u5F62\u5F0F\u306F\u3001\u30E2\u30FC\u30C9\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n<mode>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u305D\u306E\u30E2\u30FC\u30C9\u306E\u30E2\u30FC\u30C9\u8A2D\u5B9A\u306E\u307F\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\n\u30CE\u30FC\u30C8: \u30E2\u30FC\u30C9\u306E\u8A2D\u5B9A\u306B\u306F\u3001\u30D7\u30ED\u30F3\u30D7\u30C8\u3001\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304A\u3088\u3073\u5207\u6368\u3066\u306E\u8A2D\u5B9A\u304C\n\u542B\u307E\u308C\u307E\u3059\u3002\n\u4F8B:\n\t/set mode mymode\n\n\u30E2\u30FC\u30C9mymode\u306E\u30E2\u30FC\u30C9\u3001\u30D7\u30ED\u30F3\u30D7\u30C8\u3001\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304A\u3088\u3073\u5207\u6368\u3066\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059
+help.set.mode = ユーザー定義フィードバック・モードを作成します。必要に応じて既存のモードからコピーします:\n\n\t/set mode <new-mode> [<old-mode>] (-command|-quiet)\n\n将来のセッションのためにユーザー定義フィードバック・モードを保持します:\n\n\t/set mode -retain <mode>\n\nユーザー定義フィードバック・モードを削除します:\n\n\t/set mode -delete [-retain] <mode>\n\nフィードバック・モード設定を表示します:\n\n\t/set mode [<mode>]\n\n<new-mode>は作成するモードの名前です。\n<old-mode>は既存のフィードバック・モードの名前です。\n<mode>は既存のフィードバック・モードの名前です。\n\n<old-mode>が存在する場合、その設定が新規モードにコピーされます。\n\n入力されたスニペットにモードが提供するフィードバックは、'/set format'設定によって\n決定されます。ただし、入力されたコマンドの場合、モード作成時に\n使用されたオプションに従って、フィードバックはオンまたはオフのいずれかになります。\nオプション'-command'またはオプション'-quiet'のいずれかを指定する必要があります。\n'-command'が使用されている場合、新規モードでは、情報/検証中のコマンド・フィードバックが表示されます。\n'-quiet'が使用されている場合、必要なフィードバック(エラーなど)のみ表示されます。\n\n新規モードを作成したら、'/set format'、'/set prompt'および'/set truncation'を使用して\n構成します。新規モードを使用するには、'/set \
+feedback'を使用します。\n\n'-retain'オプションが使用されている場合('-delete'オプションなし)、\nモード(現在のプロンプト、フォーマットおよび切捨て設定を含む)は、将来の実行で\n使用できるようにjshellツールに格納されます。retainが使用されていない場合、\nモードは現在のセッションでのみ定義されます。モードの設定を更新した後、\nセッション間で更新を保存するには、モードを再度保持します。\n\n'-delete'オプションのみが使用されている場合、モードは現在のセッションから削除されます。\n'-retain'と'-delete'オプションの両方が使用されている場合、モードは現在と将来のセッションから\n削除されます。\n\nオプションのない形式は、モード設定を表示します。\n<mode>が指定されている場合、そのモードのモード設定のみが表示されます。\nノート: モードの設定には、プロンプト、フォーマットおよび切捨ての設定が\n含まれます。\n例:\n\t/set mode mymode\n\nモードmymodeのモード、プロンプト、フォーマットおよび切捨て設定を表示します
 
-help.set.prompt.summary = \u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059
+help.set.prompt.summary = プロンプトを設定します
 
-help.set.prompt = \u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\u6A19\u6E96\u30D7\u30ED\u30F3\u30D7\u30C8\u3068\u7D9A\u884C\u30D7\u30ED\u30F3\u30D7\u30C8\u306E\u4E21\u65B9\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059:\n\n\t/set prompt <mode> "<prompt>" "<continuation-prompt>"\n\n\u6A19\u6E96\u30D7\u30ED\u30F3\u30D7\u30C8\u3068\u7D9A\u884C\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u8868\u793A\u3057\u307E\u3059:\n\n\t/set prompt [<mode>]\n\n<mode>\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n<prompt>\u304A\u3088\u3073<continuation-prompt>\u306F\u5165\u529B\u30D7\u30ED\u30F3\u30D7\u30C8\u3068\u3057\u3066\u51FA\u529B\u3055\u308C\u308B\u5F15\u7528\u7B26\u3067\u56F2\u307E\u308C\u305F\u6587\u5B57\u5217\u3067\u3059\u3002\n\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3001\u4E21\u65B9\u3068\u3082\u3001\u6B21\u306E\u30B9\u30CB\u30DA\u30C3\u30C8ID\u3067\u7F6E\u304D\u63DB\u3048\u3089\u308C\u308B'%%s'\u3092\u542B\u3080\u3053\u3068\u304C\u3067\u304D\u307E\u3059 --\n\u5165\u529B\u3057\u305F\u5185\u5BB9\u304C\u305D\u306EID\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u306A\u3044\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30A8\u30E9\u30FC\u307E\u305F\u306F\u30B3\u30DE\u30F3\u30C9\u3067\u3042\u308B\u5834\u5408\u306A\u3069\u3067\u3059\u3002\n\u7D9A\u884C\u30D7\u30ED\u30F3\u30D7\u30C8\u306F\u8907\u6570\u884C\u30B9\u30CB\u30DA\u30C3\u30C8\u306E2\u884C\u76EE\u4EE5\u964D\u3067\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n\n<prompt>\u306E\u306A\u3044\u5F62\u5F0F\u306F\u3001\u73FE\u5728\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n<mode>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u305D\u306E\u30E2\u30FC\u30C9\u306E\u30D7\u30ED\u30F3\u30D7\u30C8\u306E\u307F\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\n\u4F8B:\n\t/set prompt mymode\n\u30E2\u30FC\u30C9mymode\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\n
+help.set.prompt = プロンプトを設定します。標準プロンプトと続行プロンプトの両方を設定する必要があります:\n\n\t/set prompt <mode> "<prompt>" "<continuation-prompt>"\n\n標準プロンプトと続行プロンプトを表示します:\n\n\t/set prompt [<mode>]\n\n<mode>は事前に定義されたフィードバック・モードの名前です。\n<prompt>および<continuation-prompt>は入力プロンプトとして出力される引用符で囲まれた文字列です。\nオプションで、両方とも、次のスニペットIDで置き換えられる'%%s'を含むことができます --\n入力した内容がそのIDに割り当てられない場合があります。たとえば、エラーまたはコマンドである場合などです。\n続行プロンプトは複数行スニペットの2行目以降で使用されます。\n\n<prompt>のない形式は、現在設定されているプロンプトを表示します。\n<mode>が指定されている場合、そのモードのプロンプトのみが表示されます。\n例:\n\t/set prompt mymode\nモードmymodeに設定されているプロンプトを表示します\n
 
-help.set.editor.summary =/edit\u30B3\u30DE\u30F3\u30C9\u3067\u8D77\u52D5\u3059\u308B\u30B3\u30DE\u30F3\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059
+help.set.editor.summary =/editコマンドで起動するコマンドを指定します
 
-help.set.editor =/edit\u30B3\u30DE\u30F3\u30C9\u3067\u8D77\u52D5\u3059\u308B\u30B3\u30DE\u30F3\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059:\n\n\t/set editor [-retain] [-wait] <command>\n\n\t/set editor [-retain] -default\n\n\t/set editor [-retain] -delete\n\n\u5C06\u6765\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u305F\u3081\u306B\u73FE\u5728\u306E\u30A8\u30C7\u30A3\u30BF\u8A2D\u5B9A\u3092\u4FDD\u6301\u3057\u307E\u3059:\n\n\t/set editor -retain\n\n/edit\u30B3\u30DE\u30F3\u30C9\u3067\u8D77\u52D5\u3059\u308B\u30B3\u30DE\u30F3\u30C9\u3092\u8868\u793A\u3057\u307E\u3059:\n\n\t/set editor\n\n<command>\u306F\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u4F9D\u5B58\u6587\u5B57\u5217\u3067\u3059\u3002\n<command>\u306B\u306F\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u5F15\u6570(\u30D5\u30E9\u30B0\u306A\u3069)\u304C\u542B\u307E\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\n\n-default\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u7D44\u8FBC\u307F\u30A8\u30C7\u30A3\u30BF\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n\n-delete\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u4EE5\u524D\u306E\u8A2D\u5B9A\u306F\u7121\u8996\u3055\u308C\u307E\u3059 -- \u30A8\u30C7\u30A3\u30BF\n\u8A2D\u5B9A\u306F\u3001jshell\u30C4\u30FC\u30EB\u306E\u8D77\u52D5\u6642\u306B\u521D\u671F\u5316\u3055\u308C\u307E\u3059\u3002\u5177\u4F53\u7684\u306B\u306F\u3001\u4FDD\u6301\u3055\u308C\u305F\u8A2D\u5B9A\u304C\n\u5B58\u5728\u3059\u308B\u5834\u5408\u3001(\u4FDD\u6301\u3055\u308C\u305F\u8A2D\u5B9A\u3092\u524A\u9664\u3059\u308B-retain\u3068-delete\u306E\u4E21\u65B9\u304C\u6307\u5B9A\u3055\u308C\u3066\n\u3044\u306A\u3051\u308C\u3070)\u305D\u308C\u304C\u4F7F\u7528\u3055\u308C\u3001\u6B21\u306E\u74B0\u5883\u5909\u6570\u306E\u3044\u305A\u308C\u304B\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\n\u305D\u308C\u304C(\u305D\u306E\u9806\u5E8F\u3067)\u4F7F\u7528\u3055\u308C\u307E\u3059: JSHELLEDITOR\u3001VISUAL\u307E\u305F\u306FEDITOR\u3002\n\u305D\u308C\u4EE5\u5916\u306E\u5834\u5408\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u7D44\u8FBC\u307F\u30A8\u30C7\u30A3\u30BF\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n\n<command>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u305D\u308C\u304C\u5916\u90E8\u30A8\u30C7\u30A3\u30BF\u3068\u3057\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002<command>\u306F\u3001\n\u30D7\u30ED\u30B0\u30E9\u30E0\u3068\u30BC\u30ED\u500B\u4EE5\u4E0A\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u5F15\u6570\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002<command>\u304C\u4F7F\u7528\u3055\u308C\u308B\u5834\u5408\u3001\n\u7DE8\u96C6\u5BFE\u8C61\u306E\u4E00\u6642\u30D5\u30A1\u30A4\u30EB\u304C\u6700\u5F8C\u306E\u5F15\u6570\u3068\u3057\u3066\u8FFD\u52A0\u3055\u308C\u307E\u3059\u3002\n\u901A\u5E38\u3001\u7DE8\u96C6\u30E2\u30FC\u30C9\u306F\u5916\u90E8\u30A8\u30C7\u30A3\u30BF\u304C\u7D42\u4E86\u3059\u308B\u307E\u3067\u7D99\u7D9A\u3057\u307E\u3059\u3002\u4E00\u90E8\u306E\u5916\u90E8\u30A8\u30C7\u30A3\u30BF\u306F\u3001\n\u305F\u3068\u3048\u3070\u7DE8\u96C6\u30A6\u30A3\u30F3\u30C9\u30A6\u304C\u7D42\u4E86\u3059\u308B\u3068\u5373\u5EA7\u306B\u7D42\u4E86\u3059\u308B\u305F\u3081\u3001\u5916\u90E8\u30A8\u30C7\u30A3\u30BF\u30FB\u30D5\u30E9\u30B0\u3092\u4F7F\u7528\u3057\u3066\n\u5373\u6642\u306E\u7D42\u4E86\u3092\u56DE\u907F\u3059\u308B\u304B\u3001-wait\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u3001\u7DE8\u96C6\u30E2\u30FC\u30C9\u304C\u7D42\u4E86\u3059\u308B\u30BF\u30A4\u30DF\u30F3\u30B0\u3092\n\u6307\u5B9A\u3059\u308B\u3088\u3046\u30E6\u30FC\u30B6\u30FC\u306B\u8981\u6C42\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\n\u30CE\u30FC\u30C8: \
-\u7DE8\u96C6\u30E2\u30FC\u30C9\u4E2D\u3001\u30B3\u30DE\u30F3\u30C9\u5165\u529B\u306F\u8868\u793A\u3055\u308C\u307E\u305B\u3093\u3002\u7DE8\u96C6\u30E2\u30FC\u30C9\u306E\u7D42\u4E86\u5F8C\u3001\u7DE8\u96C6\u3055\u308C\u305F\n\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u5909\u66F4\u5185\u5BB9\u306F\u8868\u793A\u3055\u308C\u307E\u305B\u3093\u3002\n\n-retain\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u8A2D\u5B9A\u306Fjshell\u30C4\u30FC\u30EB\u306E\u3053\u306E\u5B9F\u884C\u3068\u5C06\u6765\u306E\n\u5B9F\u884C\u3067\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n\n<command>\u307E\u305F\u306F\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u306A\u3044\u5F62\u5F0F\u306F\u3001\u30A8\u30C7\u30A3\u30BF\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n
+help.set.editor =/editコマンドで起動するコマンドを指定します:\n\n\t/set editor [-retain] [-wait] <command>\n\n\t/set editor [-retain] -default\n\n\t/set editor [-retain] -delete\n\n将来のセッションのために現在のエディタ設定を保持します:\n\n\t/set editor -retain\n\n/editコマンドで起動するコマンドを表示します:\n\n\t/set editor\n\n<command>はオペレーティング・システム依存文字列です。\n<command>にはスペースで区切られた引数(フラグなど)が含まれることがあります\n\n-defaultオプションを指定すると、デフォルトの組込みエディタが使用されます。\n\n-deleteオプションを指定すると、以前の設定は無視されます -- エディタ\n設定は、jshellツールの起動時に初期化されます。具体的には、保持された設定が\n存在する場合、(保持された設定を削除する-retainと-deleteの両方が指定されて\nいなければ)それが使用され、次の環境変数のいずれかが設定されている場合、\nそれが(その順序で)使用されます: JSHELLEDITOR、VISUALまたはEDITOR。\nそれ以外の場合、デフォルトの組込みエディタが使用されます。\n\n<command>が指定されている場合、それが外部エディタとして使用されます。<command>は、\nプログラムとゼロ個以上のプログラム引数で構成されます。<command>が使用される場合、\n編集対象の一時ファイルが最後の引数として追加されます。\n通常、編集モードは外部エディタが終了するまで継続します。一部の外部エディタは、\nたとえば編集ウィンドウが終了すると即座に終了するため、外部エディタ・フラグを使用して\n即時の終了を回避するか、-waitオプションを使用して、編集モードが終了するタイミングを\n指定するようユーザーに要求する必要があります。\n\nノート: \
+編集モード中、コマンド入力は表示されません。編集モードの終了後、編集された\nスニペットの変更内容は表示されません。\n\n-retainオプションが使用されている場合、設定はjshellツールのこの実行と将来の\n実行で使用されます。\n\n<command>またはオプションのない形式は、エディタ設定を表示します。\n
 
-help.set.start.summary =\u8D77\u52D5\u69CB\u6210\u3092\u8A2D\u5B9A\u3057\u307E\u3059
+help.set.start.summary =起動構成を設定します
 
-help.set.start =\u8D77\u52D5\u69CB\u6210\u3092\u8A2D\u5B9A\u3057\u307E\u3059 -- \u8D77\u52D5\u6642\u306B\u8AAD\u307F\u53D6\u3089\u308C\u308B\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306E\u30B7\u30FC\u30B1\u30F3\u30B9:\n\n\t/set start [-retain] <file>...\n\n\t/set start [-retain] -default\n\n\t/set start [-retain] -none\n\n\u5C06\u6765\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u305F\u3081\u306B\u8D77\u52D5\u69CB\u6210\u3092\u4FDD\u6301\u3057\u307E\u3059:\n\n\t/set start -retain\n\n\u8D77\u52D5\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059:\n\n\t/set start\n\n\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u3067/reset\u3001/reload\u307E\u305F\u306F/env\u30B3\u30DE\u30F3\u30C9\u304C\u4F7F\u7528\u3055\u308C\u308B\u5834\u5408\u3001\n\u6307\u5B9A\u3057\u305F<file>\u306E\u5185\u5BB9\u304C\u3001\u4F7F\u7528\u3055\u308C\u308B\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u306A\u308A\u307E\u3059\u3002\n\u304B\u308F\u308A\u306B-default\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u8D77\u52D5\u30A4\u30F3\u30DD\u30FC\u30C8\u30FB\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\n\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n-none\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u8D77\u52D5\u304C\u7A7A\u306B\u306A\u308A\u307E\u3059 -- \u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u307E\u305F\u306F\n\u30B3\u30DE\u30F3\u30C9\u304C\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\n\u3053\u306E\u30B3\u30DE\u30F3\u30C9\u306F\u8D77\u52D5\u8A2D\u5B9A\u3092\u30C6\u30B9\u30C8\u3059\u308B\u306E\u306B\u6709\u52B9\u3067\u3059\u3002jshell\u30C4\u30FC\u30EB\u306E\u4ECA\u5F8C\u306E\u5B9F\u884C\u306E\u305F\u3081\u306B\n\u305D\u308C\u3089\u3092\u4FDD\u6301\u3059\u308B\u306B\u306F\u3001\u6B21\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u7528\u3057\u307E\u3059:\n\t/set start -retain\n\n-retain\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u8A2D\u5B9A\u306Fjshell\u30C4\u30FC\u30EB\u306E\u3053\u306E\u5B9F\u884C\u3068\u5C06\u6765\u306E\n\u5B9F\u884C\u3067\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n\n<file>\u307E\u305F\u306F\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u306A\u3044\u5F62\u5F0F\u306F\u3001\u8D77\u52D5\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n\u30CE\u30FC\u30C8: \u8D77\u52D5\u304C\u6700\u5F8C\u306B\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u3053\u308C\u306F'set start'\u30B3\u30DE\u30F3\u30C9\u304A\u3088\u3073\n\u305D\u306E\u30D5\u30A1\u30A4\u30EB\u306E\u5185\u5BB9\u3068\u3068\u3082\u306B\u8868\u793A\u3055\u308C\u307E\u3059\u3002\n\n<file>\u306F\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u304B\u3001\u4E8B\u524D\u5B9A\u7FA9\u3055\u308C\u305F\n\u8D77\u52D5\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u3044\u305A\u308C\u304B(DEFAULT\u3001PRINTING\u3001TOOLING\u307E\u305F\u306FJAVASE)\u306B\u306A\u308A\u307E\u3059\u3002\n\u3053\u308C\u3089\u306F\u3001\u305D\u308C\u305E\u308C\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A4\u30F3\u30DD\u30FC\u30C8\u30FB\u30B9\u30CB\u30DA\u30C3\u30C8(-default\u3067\u4F7F\u7528)\u3001print()\u3001\nprintln()\u304A\u3088\u3073printf()\u30E1\u30BD\u30C3\u30C9\u30FB\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u5B9A\u7FA9\u3001\u307E\u305F\u306F\u3059\u3079\u3066\u306E\nJava SE\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u3067\u3059\u3002\n\u8907\u6570\u306E<file>\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\u4F8B\u3092\u6B21\u306B\u793A\u3057\u307E\u3059:\n\n\t/set start -retain DEFAULT PRINTING
+help.set.start =起動構成を設定します -- 起動時に読み取られるスニペットおよびコマンドのシーケンス:\n\n\t/set start [-retain] <file>...\n\n\t/set start [-retain] -default\n\n\t/set start [-retain] -none\n\n将来のセッションのために起動構成を保持します:\n\n\t/set start -retain\n\n起動設定を表示します:\n\n\t/set start\n\nこのセッションで/reset、/reloadまたは/envコマンドが使用される場合、\n指定した<file>の内容が、使用される起動スニペットおよびコマンドになります。\nかわりに-defaultオプションを指定すると、事前に定義された起動インポート・スニペットが\n使用されます。\n-noneオプションを使用すると、起動が空になります -- 起動スニペットまたは\nコマンドが使用されません。\nこのコマンドは起動設定をテストするのに有効です。jshellツールの今後の実行のために\nそれらを保持するには、次のコマンドを使用します:\n\t/set start -retain\n\n-retainオプションが使用されている場合、設定はjshellツールのこの実行と将来の\n実行で使用されます。\n\n<file>またはオプションのない形式は、起動設定を表示します。\nノート: 起動が最後にファイルから設定されている場合、これは'set start'コマンドおよび\nそのファイルの内容とともに表示されます。\n\n<file>はオペレーティング・システムのファイル名か、事前定義された\n起動ファイル名のいずれか(DEFAULT、PRINTING、TOOLINGまたはJAVASE)になります。\nこれらは、それぞれデフォルト・インポート・スニペット(-defaultで使用)、print()、\nprintln()およびprintf()メソッド・スニペットの定義、またはすべての\nJava SEパッケージのインポートです。\n複数の<file>を指定できます。例を次に示します:\n\n\t/set start -retain DEFAULT PRINTING
 
-help.set.indent.summary =\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30A4\u30F3\u30C7\u30F3\u30C8\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30B9\u30DA\u30FC\u30B9\u306E\u6570\u3092\u6307\u5B9A\u3057\u307E\u3059
+help.set.indent.summary =スニペットをインデントするために使用するスペースの数を指定します
 
-help.set.indent =\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30A4\u30F3\u30C7\u30F3\u30C8\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30B9\u30DA\u30FC\u30B9\u306E\u6570\u3092\u6307\u5B9A\u3057\u307E\u3059:\n\n\t/set indent <number>\n\n\u30A4\u30F3\u30C7\u30F3\u30C8\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u307E\u3059:\n\n\t/set indent\n
-startup.feedback = /set mode verbose -command    \n\n/set prompt verbose '\\njshell> '   '   ...> '    \n\n/set format verbose pre '|  '    \n/set format verbose post '%n'    \n/set format verbose errorpre '|  '    \n/set format verbose errorpost '%n'    \n\n/set format verbose errorline '{post}{pre}    {err}'    \n\n/set format verbose action '\u6B21\u3092\u4F5C\u6210\u3057\u307E\u3057\u305F:' added-primary    \n/set format verbose action '\u6B21\u3092\u5909\u66F4\u3057\u307E\u3057\u305F:' modified-primary    \n/set format verbose action '\u6B21\u3092\u7F6E\u63DB\u3057\u307E\u3057\u305F:' replaced-primary    \n/set format verbose action '\u6B21\u3092\u4E0A\u66F8\u304D\u3057\u307E\u3057\u305F:' overwrote-primary    \n/set format verbose action '\u6B21\u3092\u524A\u9664\u3057\u307E\u3057\u305F:' dropped-primary    \n/set format verbose action '  \u6B21\u3092\u66F4\u65B0/\u4F5C\u6210\u3057\u307E\u3057\u305F:' added-update    \n/set format verbose action '  \u6B21\u3092\u66F4\u65B0/\u5909\u66F4\u3057\u307E\u3057\u305F:' modified-update    \n/set format verbose action '  \u6B21\u3092\u66F4\u65B0/\u7F6E\u63DB\u3057\u307E\u3057\u305F:' replaced-update    \n/set format verbose action '  \u6B21\u3092\u66F4\u65B0/\u4E0A\u66F8\u304D\u3057\u307E\u3057\u305F:' overwrote-update    \n/set format verbose action '  \u6B21\u3092\u66F4\u65B0/\u524A\u9664\u3057\u307E\u3057\u305F:' dropped-update    \n\n/set format verbose until '\u307E\u3067\u3001\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u306A\u3044\u304B\u3001\u305D\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093'   defined-class,record-primary    \n/set format verbose until '\u307E\u3067\u3001\u305D\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093'                      defined-interface-primary    \n/set format verbose until '\u307E\u3067\u3001\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093'                                  defined-enum,annotation-primary    \n/set format verbose until '\u307E\u3067\u3001\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093'                               defined-method-primary    \n/set format verbose until '\u307E\u3067\u3001\u53C2\u7167\u3067\u304D\u307E\u305B\u3093'                            notdefined-primary    \n/set format verbose until '\u307E\u3067\u3001\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u306A\u3044\u304B\u3001\u305D\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093'          defined-class,record-update    \n/set format verbose until '\u307E\u3067\u3001\u305D\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093'                              defined-interface-update    \n/set format verbose until '\u307E\u3067\u3001\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093'                                      defined-method-update    \n/set format verbose until '\u307E\u3067\u3001\u53C2\u7167\u3067\u304D\u307E\u305B\u3093'                                   notdefined-update    \n\n/set format verbose unrerr '\u3002\u3057\u304B\u3057\u3001{unresolved}\u304C\u5BA3\u8A00\u3055\u308C\u308B'                                           unresolved1-error0    \n/set format verbose unrerr '\u3002\u3057\u304B\u3057\u3001{unresolved}\u304C\u5BA3\u8A00\u3055\u308C\u308B'                                          unresolved2-error0    \n/set format verbose unrerr '\u3002\u3057\u304B\u3057\u3001\u3053\u306E\u30A8\u30E9\u30FC({errors})\u304C\u4FEE\u6B63\u3055\u308C\u308B'                                 unresolved0-error1    \n/set format verbose unrerr '\u3002\u3057\u304B\u3057\u3001{unresolved}\u304C\u5BA3\u8A00\u3055\u308C\u3001\u3053\u306E\u30A8\u30E9\u30FC({errors})\u304C\u4FEE\u6B63\u3055\u308C\u308B'     unresolved1-error1    \n/set format verbose unrerr '\u3002\u3057\u304B\u3057\u3001{unresolved}\u304C\u5BA3\u8A00\u3055\u308C\u3001\u3053\u306E\u30A8\u30E9\u30FC({errors})\u304C\u4FEE\u6B63\u3055\u308C\u308B'    unresolved2-error1    \n/set format \
-verbose unrerr '\u3002\u3057\u304B\u3057\u3001\u3053\u308C\u3089\u306E\u30A8\u30E9\u30FC({errors})\u304C\u4FEE\u6B63\u3055\u308C\u308B'                              unresolved0-error2    \n/set format verbose unrerr '\u3002\u3057\u304B\u3057\u3001{unresolved}\u304C\u5BA3\u8A00\u3055\u308C\u3001\u3053\u308C\u3089\u306E\u30A8\u30E9\u30FC({errors})\u304C\u4FEE\u6B63\u3055\u308C\u308B'  unresolved1-error2    \n/set format verbose unrerr '\u3002\u3057\u304B\u3057\u3001{unresolved}\u304C\u5BA3\u8A00\u3055\u308C\u3001\u3053\u308C\u3089\u306E\u30A8\u30E9\u30FC({errors})\u304C\u4FEE\u6B63\u3055\u308C\u308B' unresolved2-error2    \n\n/set format verbose resolve '{unrerr}{until}'                                                   defined,notdefined-added,modified,replaced,used    \n\n/set format verbose typeKind '\u30AF\u30E9\u30B9'                  class    \n/set format verbose typeKind '\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9'              interface    \n/set format verbose typeKind '\u5217\u6319\u578B'                   enum    \n/set format verbose typeKind '\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9'   annotation    \n/set format verbose typeKind '\u30EC\u30B3\u30FC\u30C9'                 record    \n\n/set format verbose result '{name} ==> {value}{post}'                                        added,modified,replaced-ok-primary    \n\n/set format verbose display '{result}{pre}\u30B9\u30AF\u30E9\u30C3\u30C1\u5909\u6570{name} : {type}\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F{post}'    expression-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}{name} : {type}\u306E\u5024{post}'                    varvalue-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}{name} : {type}\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u307E\u3057\u305F{post}'                 assignment-primary    \n/set format verbose display '{result}{pre}{action} \u5909\u6570 {name} : {type}{resolve}{post}'  varinit,vardecl    \n/set format verbose display '{pre}{action} \u5909\u6570 {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format verbose display '{pre}{action} \u5909\u6570 {name}{post}'                            dropped-vardecl,varinit,expression    \n/set format verbose display '{pre}{action} \u5909\u6570 {name}\u3002null\u306B\u30EA\u30BB\u30C3\u30C8\u3057\u307E\u3057\u305F{post}'             replaced-vardecl,varinit-ok-update    \n\n/set format verbose display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation,record    \n/set format verbose display '{pre}{action} \u30E1\u30BD\u30C3\u30C9 {name}({type}){resolve}{post}' method    \n\n/set format verbose display '{pre}\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F {typeKind} {name}{resolve}{post}'         used-class,interface,enum,annotation,record    \n/set format verbose display '{pre}\u30E1\u30BD\u30C3\u30C9{name}({type})\u3092\u547C\u3073\u51FA\u305D\u3046\u3068\u3057\u307E\u3057\u305F{resolve}{post}'    used-method    \n\n/set truncation verbose 80\n/set truncation verbose 1000                                                                  varvalue,expression\n\n/set mode normal -command verbose    \n/set format normal display ''                                                               added,modified,replaced,overwrote,dropped-update    \n/set format normal display '{pre}{action} \u5909\u6570 {name}\u3001null\u306B\u30EA\u30BB\u30C3\u30C8\u3055\u308C\u307E\u3057\u305F{post}' replaced-vardecl,varinit-ok-update    \n/set format normal display '{pre}{action} \u5909\u6570 {name}{resolve}{post}'                   replaced-vardecl,varinit-notdefined    \n/set format normal display '{result}'                                                       added,modified,replaced-expression,varvalue,assignment,varinit,vardecl-ok-primary    \n/set mode concise -quiet normal    \n\n/set prompt concise 'jshell> '   '   ...> '    \n\n/set format \
+help.set.indent =スニペットをインデントするために使用するスペースの数を指定します:\n\n\t/set indent <number>\n\nインデント設定を表示します:\n\n\t/set indent\n
+startup.feedback = /set mode verbose -command    \n\n/set prompt verbose '\\njshell> '   '   ...> '    \n\n/set format verbose pre '|  '    \n/set format verbose post '%n'    \n/set format verbose errorpre '|  '    \n/set format verbose errorpost '%n'    \n\n/set format verbose errorline '{post}{pre}    {err}'    \n\n/set format verbose action '次を作成しました:' added-primary    \n/set format verbose action '次を変更しました:' modified-primary    \n/set format verbose action '次を置換しました:' replaced-primary    \n/set format verbose action '次を上書きしました:' overwrote-primary    \n/set format verbose action '次を削除しました:' dropped-primary    \n/set format verbose action '  次を更新/作成しました:' added-update    \n/set format verbose action '  次を更新/変更しました:' modified-update    \n/set format verbose action '  次を更新/置換しました:' replaced-update    \n/set format verbose action '  次を更新/上書きしました:' overwrote-update    \n/set format verbose action '  次を更新/削除しました:' dropped-update    \n\n/set format verbose until 'まで、インスタンス化できないか、そのメソッドを起動できません'   defined-class,record-primary    \n/set format verbose until 'まで、そのメソッドを起動できません'                      defined-interface-primary    \n/set format verbose until 'まで、使用できません'                                  defined-enum,annotation-primary    \n/set format verbose until 'まで、起動できません'                               defined-method-primary    \n/set format verbose until 'まで、参照できません'                            notdefined-primary    \n/set format verbose until 'まで、インスタンス化できないか、そのメソッドを起動できません'          defined-class,record-update    \n/set format verbose until 'まで、そのメソッドを起動できません'                              defined-interface-update    \n/set format verbose until 'まで、起動できません'                                      defined-method-update    \n/set format verbose until 'まで、参照できません'                                   notdefined-update    \n\n/set format verbose unrerr '。しかし、{unresolved}が宣言される'                                           unresolved1-error0    \n/set format verbose unrerr '。しかし、{unresolved}が宣言される'                                          unresolved2-error0    \n/set format verbose unrerr '。しかし、このエラー({errors})が修正される'                                 unresolved0-error1    \n/set format verbose unrerr '。しかし、{unresolved}が宣言され、このエラー({errors})が修正される'     unresolved1-error1    \n/set format verbose unrerr '。しかし、{unresolved}が宣言され、このエラー({errors})が修正される'    unresolved2-error1    \n/set format \
+verbose unrerr '。しかし、これらのエラー({errors})が修正される'                              unresolved0-error2    \n/set format verbose unrerr '。しかし、{unresolved}が宣言され、これらのエラー({errors})が修正される'  unresolved1-error2    \n/set format verbose unrerr '。しかし、{unresolved}が宣言され、これらのエラー({errors})が修正される' unresolved2-error2    \n\n/set format verbose resolve '{unrerr}{until}'                                                   defined,notdefined-added,modified,replaced,used    \n\n/set format verbose typeKind 'クラス'                  class    \n/set format verbose typeKind 'インタフェース'              interface    \n/set format verbose typeKind '列挙型'                   enum    \n/set format verbose typeKind '注釈インタフェース'   annotation    \n/set format verbose typeKind 'レコード'                 record    \n\n/set format verbose result '{name} ==> {value}{post}'                                        added,modified,replaced-ok-primary    \n\n/set format verbose display '{result}{pre}スクラッチ変数{name} : {type}が作成されました{post}'    expression-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}{name} : {type}の値{post}'                    varvalue-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}{name} : {type}に割り当てられました{post}'                 assignment-primary    \n/set format verbose display '{result}{pre}{action} 変数 {name} : {type}{resolve}{post}'  varinit,vardecl    \n/set format verbose display '{pre}{action} 変数 {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format verbose display '{pre}{action} 変数 {name}{post}'                            dropped-vardecl,varinit,expression    \n/set format verbose display '{pre}{action} 変数 {name}。nullにリセットしました{post}'             replaced-vardecl,varinit-ok-update    \n\n/set format verbose display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation,record    \n/set format verbose display '{pre}{action} メソッド {name}({type}){resolve}{post}' method    \n\n/set format verbose display '{pre}を使用しようとしました {typeKind} {name}{resolve}{post}'         used-class,interface,enum,annotation,record    \n/set format verbose display '{pre}メソッド{name}({type})を呼び出そうとしました{resolve}{post}'    used-method    \n\n/set truncation verbose 80\n/set truncation verbose 1000                                                                  varvalue,expression\n\n/set mode normal -command verbose    \n/set format normal display ''                                                               added,modified,replaced,overwrote,dropped-update    \n/set format normal display '{pre}{action} 変数 {name}、nullにリセットされました{post}' replaced-vardecl,varinit-ok-update    \n/set format normal display '{pre}{action} 変数 {name}{resolve}{post}'                   replaced-vardecl,varinit-notdefined    \n/set format normal display '{result}'                                                       added,modified,replaced-expression,varvalue,assignment,varinit,vardecl-ok-primary    \n/set mode concise -quiet normal    \n\n/set prompt concise 'jshell> '   '   ...> '    \n\n/set format \
 concise display ''                                                              class,interface,enum,annotation,record,method,assignment,varinit,vardecl-ok    \n\n/set feedback normal    \n\n/set mode silent -quiet    \n/set prompt silent '-> ' '>> '    \n/set truncation silent 80\n/set truncation silent 1000                                                                  varvalue,expression\n/set format silent pre '|  '    \n/set format silent post '%n'    \n/set format silent errorpre '|  '    \n/set format silent errorpost '%n'    \n/set format silent display ''    \n
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
index a6526d65ae7..1c7d1848855 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
@@ -23,301 +23,301 @@
 # questions.
 #
 
-jshell.msg.welcome =\u6B22\u8FCE\u4F7F\u7528 JShell -- \u7248\u672C {0}\n\u8981\u5927\u81F4\u4E86\u89E3\u8BE5\u7248\u672C, \u8BF7\u952E\u5165: /help intro
-jshell.err.opt.arg = \u7F3A\u5C11 {0} \u7684\u53C2\u6570\u3002
-jshell.err.opt.invalid = \u65E0\u6548\u7684\u9009\u9879: {0}\u3002
-jshell.err.opt.one = \u53EA\u80FD\u4F7F\u7528\u4E00\u4E2A {0} \u9009\u9879\u3002
-jshell.err.opt.startup.conflict = \u51B2\u7A81\u7684\u9009\u9879: \u540C\u65F6\u4F7F\u7528\u4E86 --startup \u548C --no-startup\u3002
-jshell.err.opt.feedback.one = \u53EA\u80FD\u4F7F\u7528\u4E00\u4E2A\u53CD\u9988\u9009\u9879 (--feedback, -q, -s \u6216 -v)\u3002
-jshell.err.opt.unknown = \u672A\u77E5\u9009\u9879: {0}
-
-jshell.msg.terminated = \u72B6\u6001\u5F15\u64CE\u5DF2\u7EC8\u6B62\u3002
-jshell.msg.terminated.restore = \u4F7F\u7528 /reload -restore \u53EF\u8FD8\u539F\u5B9A\u4E49
-
-jshell.msg.use.one.of = \u4F7F\u7528\u4EE5\u4E0B\u4E4B\u4E00: {0}
-jshell.msg.see.classes.etc = \u8BF7\u53C2\u9605 /types, /methods, /vars \u6216 /list
-jshell.err.arg = \u65E0\u6548\u7684 ''{0}'' \u53C2\u6570: {1}
-jshell.msg.see = \u6709\u5173\u5E2E\u52A9\u4FE1\u606F, \u8BF7\u53C2\u9605{0}\u3002
-
-jshell.err.file.not.accessible = \u65E0\u6CD5\u8BBF\u95EE ''{0}'' \u7684\u6587\u4EF6 ''{1}'': {2}
-jshell.err.file.not.found = \u627E\u4E0D\u5230 ''{0}'' \u7684\u6587\u4EF6 ''{1}''\u3002
-jshell.err.file.exception = ''{0}'' \u7684\u6587\u4EF6 ''{1}'' \u5F15\u53D1\u4E86\u5F02\u5E38\u9519\u8BEF: {2}
-jshell.err.file.filename = ''{0}'' \u9700\u8981\u6587\u4EF6\u540D\u53C2\u6570\u3002
-
-jshell.err.startup.unexpected.exception = \u8BFB\u53D6\u542F\u52A8\u65F6\u51FA\u73B0\u610F\u5916\u7684\u5F02\u5E38\u9519\u8BEF\uFF1A{0}
-jshell.err.unexpected.exception = \u610F\u5916\u5F02\u5E38\u9519\u8BEF: {0}
-
-jshell.err.invalid.command = \u65E0\u6548\u7684\u547D\u4EE4: {0}
-jshell.err.command.ambiguous = \u547D\u4EE4 ''{0}'' \u4E0D\u660E\u786E: {1}
-jshell.msg.set.restore = \u6B63\u5728\u8BBE\u7F6E\u65B0\u9009\u9879\u5E76\u8FD8\u539F\u72B6\u6001\u3002
-jshell.msg.set.editor.set = \u7F16\u8F91\u5668\u8BBE\u7F6E\u4E3A: {0}
-jshell.msg.set.editor.retain = \u4FDD\u7559\u7684\u7F16\u8F91\u5668\u8BBE\u7F6E: {0}
-jshell.msg.set.indent.set = \u7F29\u8FDB\u7EA7\u522B\u8BBE\u7F6E\u4E3A\uFF1A{0}
-jshell.err.invalid.indent = \u7F29\u8FDB\u7EA7\u522B\u65E0\u6548\uFF1A{0}
-jshell.err.no.builtin.editor = \u5185\u7F6E\u7F16\u8F91\u5668\u4E0D\u53EF\u7528\u3002
-jshell.err.cant.launch.editor = \u65E0\u6CD5\u542F\u52A8\u5185\u7F6E\u7F16\u8F91\u5668 -- \u610F\u5916\u7684\u5F02\u5E38\u9519\u8BEF: {0}
-jshell.msg.try.set.editor = \u8BF7\u53C2\u9605 ''/help /set editor'' \u6765\u4E86\u89E3\u5982\u4F55\u4F7F\u7528\u5916\u90E8\u7F16\u8F91\u5668\u3002
-jshell.msg.press.return.to.leave.edit.mode = \u6309\u201C\u8FD4\u56DE\u201D\u9000\u51FA\u7F16\u8F91\u6A21\u5F0F\u3002
-jshell.err.wait.applies.to.external.editor = -wait \u9002\u7528\u4E8E\u5916\u90E8\u7F16\u8F91\u5668
+jshell.msg.welcome =欢迎使用 JShell -- 版本 {0}\n要大致了解该版本, 请键入: /help intro
+jshell.err.opt.arg = 缺少 {0} 的参数。
+jshell.err.opt.invalid = 无效的选项: {0}。
+jshell.err.opt.one = 只能使用一个 {0} 选项。
+jshell.err.opt.startup.conflict = 冲突的选项: 同时使用了 --startup 和 --no-startup。
+jshell.err.opt.feedback.one = 只能使用一个反馈选项 (--feedback, -q, -s 或 -v)。
+jshell.err.opt.unknown = 未知选项: {0}
+
+jshell.msg.terminated = 状态引擎已终止。
+jshell.msg.terminated.restore = 使用 /reload -restore 可还原定义
+
+jshell.msg.use.one.of = 使用以下之一: {0}
+jshell.msg.see.classes.etc = 请参阅 /types, /methods, /vars 或 /list
+jshell.err.arg = 无效的 ''{0}'' 参数: {1}
+jshell.msg.see = 有关帮助信息, 请参阅{0}。
+
+jshell.err.file.not.accessible = 无法访问 ''{0}'' 的文件 ''{1}'': {2}
+jshell.err.file.not.found = 找不到 ''{0}'' 的文件 ''{1}''。
+jshell.err.file.exception = ''{0}'' 的文件 ''{1}'' 引发了异常错误: {2}
+jshell.err.file.filename = ''{0}'' 需要文件名参数。
+
+jshell.err.startup.unexpected.exception = 读取启动时出现意外的异常错误：{0}
+jshell.err.unexpected.exception = 意外异常错误: {0}
+
+jshell.err.invalid.command = 无效的命令: {0}
+jshell.err.command.ambiguous = 命令 ''{0}'' 不明确: {1}
+jshell.msg.set.restore = 正在设置新选项并还原状态。
+jshell.msg.set.editor.set = 编辑器设置为: {0}
+jshell.msg.set.editor.retain = 保留的编辑器设置: {0}
+jshell.msg.set.indent.set = 缩进级别设置为：{0}
+jshell.err.invalid.indent = 缩进级别无效：{0}
+jshell.err.no.builtin.editor = 内置编辑器不可用。
+jshell.err.cant.launch.editor = 无法启动内置编辑器 -- 意外的异常错误: {0}
+jshell.msg.try.set.editor = 请参阅 ''/help /set editor'' 来了解如何使用外部编辑器。
+jshell.msg.press.return.to.leave.edit.mode = 按“返回”退出编辑模式。
+jshell.err.wait.applies.to.external.editor = -wait 适用于外部编辑器
 jshell.label.editpad = JShell Edit Pad
 
-jshell.err.setting.to.retain.must.be.specified = \u5FC5\u987B\u6307\u5B9A\u8981\u4FDD\u7559\u7684\u8BBE\u7F6E -- {0}
-jshell.msg.set.show.mode.settings = \n\u8981\u663E\u793A\u6A21\u5F0F\u8BBE\u7F6E, \u8BF7\u4F7F\u7528 ''/set prompt'', ''/set truncation'', ...\n\u6216\u8005\u4F7F\u7528 ''/set mode'' \u540E\u8DDF\u53CD\u9988\u6A21\u5F0F\u540D\u79F0\u3002
-jshell.err.continuation.prompt.required = \u66F4\u591A\u63D0\u793A\u662F\u5FC5\u586B\u7684 -- {0}
-
-jshell.msg.try.command.without.args = \u5C1D\u8BD5\u4F7F\u7528\u4E0D\u5E26\u53C2\u6570\u7684 ''{0}''\u3002
-jshell.msg.no.active = \u6CA1\u6709\u6D3B\u52A8\u5B9A\u4E49\u3002
-
-jshell.msg.resetting = \u6B63\u5728\u91CD\u7F6E...
-jshell.msg.resetting.state = \u6B63\u5728\u91CD\u7F6E\u72B6\u6001\u3002
-
-jshell.err.reload.no.previous = \u6CA1\u6709\u53EF\u8FD8\u539F\u7684\u4E0A\u4E00\u4E2A\u5386\u53F2\u8BB0\u5F55
-jshell.err.reload.restarting.previous.state = \u6B63\u5728\u91CD\u65B0\u542F\u52A8\u5E76\u8FD8\u539F\u5230\u5148\u524D\u7684\u72B6\u6001\u3002
-jshell.err.reload.restarting.state = \u6B63\u5728\u91CD\u65B0\u542F\u52A8\u5E76\u8FD8\u539F\u72B6\u6001\u3002
-
-jshell.err.restart.failed = \u91CD\u65B0\u542F\u52A8\u5931\u8D25: {0}\n\n\u6B63\u5728\u8FD8\u539F\u4E3A\u4EE5\u524D\u7684\u8BBE\u7F6E\u5E76\u91CD\u65B0\u542F\u52A8...
-
-jshell.msg.vars.not.active = (\u4E0D\u6D3B\u52A8)
-
-jshell.err.out.of.range = \u8D85\u51FA\u8303\u56F4
-
-jshell.msg.error = \u9519\u8BEF:
-jshell.msg.warning = \u8B66\u544A:
-
-jshell.err.sub.arg = ''{0}'' \u547D\u4EE4\u9700\u8981\u5B50\u547D\u4EE4\u3002\u8BF7\u53C2\u9605: ''/help {0}''
-jshell.err.sub.ambiguous = ''{0}'' \u7684\u5B50\u547D\u4EE4\u53C2\u6570\u4E0D\u660E\u786E: {1}
-
-jshell.err.classpath.arg = /classpath \u547D\u4EE4\u8981\u6C42\u8DEF\u5F84\u53C2\u6570\u3002
-jshell.msg.classpath = \u8DEF\u5F84 ''{0}'' \u5DF2\u6DFB\u52A0\u5230\u7C7B\u8DEF\u5F84
-
-jshell.err.help.arg = \u6CA1\u6709\u547D\u4EE4\u6216\u4E3B\u9898\u4EE5\u63D0\u4F9B\u7684\u53C2\u6570\u5F00\u59CB: {0}
-jshell.msg.help.begin =\u952E\u5165 Java \u8BED\u8A00\u8868\u8FBE\u5F0F, \u8BED\u53E5\u6216\u58F0\u660E\u3002\n\u6216\u8005\u952E\u5165\u4EE5\u4E0B\u547D\u4EE4\u4E4B\u4E00:\n
-jshell.msg.help.subject =\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u952E\u5165 ''/help'', \u540E\u8DDF\n\u547D\u4EE4\u6216\u4E3B\u9898\u7684\u540D\u79F0\u3002\n\u4F8B\u5982 ''/help /list'' \u6216 ''/help intro''\u3002\u4E3B\u9898:\n\n
-
-jshell.err.no.snippet.with.id = \u6CA1\u6709\u7247\u6BB5\u5177\u6709 ID\uFF1A{0}
-jshell.err.end.snippet.range.less.than.start = \u7247\u6BB5\u8303\u56F4\u7684\u7ED3\u675F\u503C\u5C0F\u4E8E\u5F00\u59CB\u503C: {0} - {1}
-jshell.err.range.requires.id = \u7247\u6BB5\u8303\u56F4\u9700\u8981\u7247\u6BB5 ID\uFF1A{0}
-
-jshell.err.exit.not.expression = /exit \u7684\u53C2\u6570\u5FC5\u987B\u662F\u6709\u6548\u7684\u6574\u6570\u8868\u8FBE\u5F0F, \u8FD9\u4E0D\u662F\u8868\u8FBE\u5F0F: {0}
-jshell.err.exit.bad.type = /exit \u7684\u53C2\u6570\u5FC5\u987B\u662F\u6709\u6548\u7684\u6574\u6570\u8868\u8FBE\u5F0F, \u7C7B\u578B\u4E3A {1}: {0}
-jshell.err.exit.bad.value = /exit \u7684\u53C2\u6570\u5177\u6709\u9519\u8BEF\u503C {1}: {0}
-
-jshell.err.drop.arg =\u5728 /drop \u53C2\u6570\u4E2D\uFF0C\u8BF7\u6307\u5B9A\u8981\u5220\u9664\u7684\u5BFC\u5165\u3001\u53D8\u91CF\u3001\u65B9\u6CD5\u6216\u7C7B\u3002\n\u6309 ID \u6216\u540D\u79F0\u6307\u5B9A\u3002\u4F7F\u7528 /list \u53EF\u67E5\u770B ID\u3002\u4F7F\u7528 /reset \u53EF\u91CD\u7F6E\u6240\u6709\u72B6\u6001\u3002
-jshell.err.failed = \u5931\u8D25\u3002
-jshell.msg.native.method = \u672C\u673A\u65B9\u6CD5
-jshell.msg.unknown.source = \u672A\u77E5\u6E90
-jshell.msg.goodbye = \u518D\u89C1
-jshell.msg.goodbye.value = \u518D\u89C1 ({0})
-
-jshell.msg.help.for.help = \u952E\u5165 /help \u4EE5\u83B7\u53D6\u5E2E\u52A9\u4FE1\u606F\u3002
-
-jshell.err.mode.name = \u9884\u671F\u53CD\u9988\u6A21\u5F0F\u540D\u79F0: {0}
-jshell.err.missing.mode = \u7F3A\u5C11\u53CD\u9988\u6A21\u5F0F -- {0}
-jshell.err.field.name = \u9884\u671F\u5B57\u6BB5\u540D: {0} -- {1}
-jshell.err.mode.unknown = \u672A\u6307\u5B9A\u53CD\u9988\u6A21\u5F0F: {0} -- {1}
-
-jshell.err.feedback.does.not.match.mode = \u4E0D\u5339\u914D\u4EFB\u4F55\u5F53\u524D\u53CD\u9988\u6A21\u5F0F: {0} -- {1}
-jshell.err.feedback.ambiguous.mode = \u5339\u914D\u4E86\u591A\u4E2A\u5F53\u524D\u53CD\u9988\u6A21\u5F0F: {0} -- {1}
-jshell.err.feedback.must.be.quoted = \u683C\u5F0F ''{0}'' \u5FC5\u987B\u4F7F\u7528\u5F15\u53F7\u62EC\u8D77\u6765 -- {1}
-jshell.err.feedback.not.a.valid.selector = \u4E0D\u662F ''{1}'' \u4E2D\u6709\u6548\u7684\u9009\u62E9\u5668 ''{0}'' -- {2}
-jshell.err.feedback.multiple.sections = \u9009\u62E9\u5668\u7C7B\u578B\u5728 ''{1}'' \u4E2D\u9009\u62E9\u5668\u5217\u8868 ''{0}'' \u7684\u591A\u4E2A\u90E8\u5206\u4E2D -- {2}
-jshell.err.feedback.different.selector.kinds = \u4E0D\u540C\u7684\u9009\u62E9\u5668\u7C7B\u578B\u4F4D\u4E8E ''{1}'' \u4E2D\u9009\u62E9\u5668\u5217\u8868 ''{0}'' \u7684\u76F8\u540C\u90E8\u5206\u4E2D -- {2}
-
-jshell.msg.feedback.new.mode = \u5DF2\u521B\u5EFA\u65B0\u7684\u53CD\u9988\u6A21\u5F0F: {0}
-jshell.msg.feedback.mode = \u53CD\u9988\u6A21\u5F0F: {0}
-jshell.msg.feedback.mode.following = \u53EF\u7528\u7684\u53CD\u9988\u6A21\u5F0F:
-jshell.msg.feedback.retained.mode.following = \u4FDD\u7559\u7684\u53CD\u9988\u6A21\u5F0F:
-jshell.err.mode.creation = \u8981\u521B\u5EFA\u65B0\u6A21\u5F0F, \u5FC5\u987B\u4F7F\u7528 -command \u6216 -quiet \u9009\u9879 -- {0}
-jshell.err.mode.exists = \u8981\u521B\u5EFA\u7684\u6A21\u5F0F\u5DF2\u5B58\u5728: {0} -- {1}
-
-jshell.err.truncation.expected.length = \u9884\u671F\u622A\u65AD\u957F\u5EA6 -- {0}
-jshell.err.truncation.length.not.integer = \u622A\u65AD\u957F\u5EA6\u5FC5\u987B\u4E3A\u6574\u6570: {0} -- {1}
-
-jshell.err.not.valid.with.predefined.mode = \u5BF9\u4E8E\u9884\u5B9A\u4E49\u7684\u6A21\u5F0F\u65E0\u6548: {0} -- {1}
-jshell.err.retained.feedback.mode.must.be.retained.or.predefined = ''/set feedback -retain <\u6A21\u5F0F>'' \u8981\u6C42 <\u6A21\u5F0F> \u4E3A\u9884\u5B9A\u4E49\u6A21\u5F0F\u6216\u8005\u5DF2\u7ECF\u4F7F\u7528 ''/set mode -retain'' \u4FDD\u7559 -- {0}
-
-jshell.err.unknown.option = \u672A\u77E5\u9009\u9879: {0} -- {1}
-jshell.err.default.option.or.program = \u6307\u5B9A -default \u9009\u9879, -delete \u9009\u9879\u6216\u7A0B\u5E8F -- {0}
-jshell.err.option.or.filename = \u6700\u591A\u6307\u5B9A -default, -none \u6216\u542F\u52A8\u6587\u4EF6\u540D\u4E2D\u7684\u4E00\u9879 -- {0}
-jshell.err.unexpected.at.end = \u547D\u4EE4\u7ED3\u5C3E\u5904\u9047\u5230\u610F\u5916\u7684\u53C2\u6570: {0} -- {1}
-jshell.err.conflicting.options = \u51B2\u7A81\u7684\u9009\u9879 -- {0}
-jshell.err.cannot.delete.current.mode = \u65E0\u6CD5\u5220\u9664\u5F53\u524D\u53CD\u9988\u6A21\u5F0F ''{0}'', \u8BF7\u5148\u4F7F\u7528 ''/set feedback'' -- {1}
-jshell.err.cannot.delete.retained.mode = \u65E0\u6CD5\u5220\u9664\u4FDD\u7559\u7684\u53CD\u9988\u6A21\u5F0F ''{0}'', \u8BF7\u5148\u4F7F\u7528 ''/set feedback -retain'' -- {1}
-jshell.err.may.not.specify.options.and.snippets = \u4E0D\u80FD\u540C\u65F6\u4F7F\u7528\u9009\u9879\u548C\u7247\u6BB5: {0}
-jshell.err.no.such.snippets = \u6CA1\u6709\u6B64\u7C7B\u7247\u6BB5: {0}
-jshell.err.the.snippet.cannot.be.used.with.this.command = \u6B64\u547D\u4EE4\u4E0D\u63A5\u53D7\u7247\u6BB5 ''{0}'' : {1}
-jshell.err.retained.mode.failure = \u4FDD\u7559\u6A21\u5F0F\u4E2D\u51FA\u73B0\u6545\u969C (\u5DF2\u6E05\u9664\u6A21\u5F0F) -- {0} {1}
-
-jshell.err.corrupted.stored.startup = \u5B58\u50A8\u7684\u542F\u52A8\u5DF2\u635F\u574F, \u6B63\u5728\u4F7F\u7528\u9ED8\u8BA4\u503C -- {0}
-
-jshell.err.exception.thrown = \u5F02\u5E38\u9519\u8BEF {0}
-jshell.err.exception.thrown.message = \u5F02\u5E38\u9519\u8BEF {0}\uFF1A{1}
-jshell.err.exception.cause = \u539F\u56E0\uFF1A{0}
-jshell.err.exception.cause.message = \u539F\u56E0: {0}\uFF1A {1}
-
-jshell.console.see.synopsis = <\u518D\u6B21\u6309 Tab \u53EF\u67E5\u770B\u63D0\u8981>
-jshell.console.see.full.documentation = <\u518D\u6B21\u6309 Tab \u53EF\u67E5\u770B\u5B8C\u6574\u6587\u6863>
-jshell.console.see.documentation = <\u518D\u6B21\u6309 Tab \u53EF\u67E5\u770B\u6587\u6863>
-jshell.console.see.next.page = <\u518D\u6B21\u6309 Tab \u53EF\u67E5\u770B\u4E0B\u4E00\u9875>
-jshell.console.see.next.javadoc = <\u6309 Tab \u53EF\u67E5\u770B\u4E0B\u4E00\u6587\u6863>
-jshell.console.see.next.command.doc = <\u6309 Tab \u53EF\u67E5\u770B\u4E0B\u4E00\u547D\u4EE4>
-jshell.console.no.such.command = \u8BE5\u547D\u4EE4\u4E0D\u5B58\u5728
-jshell.console.completion.current.signatures = \u7B7E\u540D:
-jshell.console.completion.all.completions.number = <\u518D\u6B21\u6309 Tab \u53EF\u67E5\u770B\u6240\u6709\u53EF\u80FD\u7684\u8F93\u5165\u63D0\u793A; \u53EF\u80FD\u7684\u8F93\u5165\u63D0\u793A\u603B\u8BA1: {0}>
-jshell.console.completion.all.completions = <\u518D\u6B21\u6309 Tab \u53EF\u67E5\u770B\u6240\u6709\u53EF\u80FD\u7684\u8F93\u5165\u63D0\u793A>
-jshell.console.no.javadoc = <\u627E\u4E0D\u5230\u6587\u6863>
-jshell.console.do.nothing = \u4E0D\u6267\u884C\u4EFB\u4F55\u64CD\u4F5C
-jshell.console.choice = \u9009\u9879:\u0020
-jshell.console.create.variable = \u521B\u5EFA\u53D8\u91CF
-jshell.console.create.method = \u521B\u5EFA\u65B9\u6CD5
-jshell.console.resolvable = \n\u6807\u8BC6\u7B26\u53EF\u5728\u6B64\u4E0A\u4E0B\u6587\u4E2D\u89E3\u6790\u3002
-jshell.console.no.candidate = \n\u6CA1\u6709\u627E\u5230\u53EF\u5BFC\u5165\u7684\u5019\u9009\u5168\u9650\u5B9A\u540D\u79F0\u3002
-jshell.console.incomplete = \n\u7ED3\u679C\u53EF\u80FD\u4E0D\u5B8C\u6574; \u8BF7\u7A0D\u5019\u91CD\u8BD5\u4EE5\u83B7\u53D6\u5B8C\u6574\u7ED3\u679C\u3002
-jshell.console.erroneous = \n\u4E0D\u5B8C\u6574\u6216\u9519\u8BEF\u3002Shift+Tab m \u524D\u5FC5\u987B\u4E3A\u5355\u4E2A\u6709\u6548\u7684\u8868\u8FBE\u5F0F\u6216\u8BED\u53E5\u3002
-jshell.console.exprstmt = \nShift+Tab m \u540E\u5FC5\u987B\u4E3A\u5355\u4E2A\u6709\u6548\u7684\u8868\u8FBE\u5F0F\u6216\u8BED\u53E5\u3002
-jshell.console.empty = \n\u7A7A\u6761\u76EE\u3002Shift+Tab m \u524D\u5FC5\u987B\u4E3A\u5355\u4E2A\u6709\u6548\u7684\u8868\u8FBE\u5F0F\u6216\u8BED\u53E5\u3002
-
-jshell.fix.wrong.shortcut =Shift+Tab \u540E\u51FA\u73B0\u610F\u5916\u7684\u5B57\u7B26\u3002\n\u4F7F\u7528 "i" \u8868\u793A\u81EA\u52A8\u5BFC\u5165\uFF0C\u4F7F\u7528 "v" \u8868\u793A\u53D8\u91CF\u521B\u5EFA\uFF0C\u4F7F\u7528 "i" \u8868\u793A\u65B9\u6CD5\u521B\u5EFA\u3002\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u9605\uFF1A\n/help \u5FEB\u6377\u65B9\u5F0F
-
-help.usage = \u7528\u6CD5\uFF1A   jshell <option>... <load-file>...\n\u5176\u4E2D\uFF0C\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC\uFF1A\n    --class-path <path>   \u6307\u5B9A\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u67E5\u627E\u4F4D\u7F6E\n    --module-path <path>  \u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u67E5\u627E\u4F4D\u7F6E\n    --add-modules <module>(,<module>)*\n                          \u6307\u5B9A\u8981\u89E3\u6790\u7684\u6A21\u5757\uFF1B\u5982\u679C <module> \u4E3A \n                            ALL-MODULE-PATHs\uFF0C\u5219\u4E3A\u6A21\u5757\u8DEF\u5F84\u4E2D\u7684\u6240\u6709\u6A21\u5757\n    --enable-native-access\n                          \u5141\u8BB8\u4EE3\u7801\u8FD0\u884C\u53D7\u9650\u7684\u672C\u673A\u65B9\u6CD5\n    --enable-preview      \u5141\u8BB8\u4EE3\u7801\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n    --startup <file>      \u5BF9\u542F\u52A8\u5B9A\u4E49\u6267\u884C\u5355\u6B21\u66FF\u6362\n    --no-startup          \u4E0D\u8FD0\u884C\u542F\u52A8\u5B9A\u4E49\n    --feedback <mode>     \u6307\u5B9A\u521D\u59CB\u53CD\u9988\u6A21\u5F0F\u3002\u8BE5\u6A21\u5F0F\u53EF\u4EE5\u662F\n                            \u9884\u5B9A\u4E49\u7684\uFF08silent\u3001concise\u3001normal \u6216 verbose\uFF09\uFF0C\n                            \u4E5F\u53EF\u4EE5\u662F\u7528\u6237\u4EE5\u524D\u5B9A\u4E49\u7684\n    -q                    \u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback concise\n    -s                    \u771F\u6B63\u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback silent\n    -v                    \u8BE6\u7EC6\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback verbose\n    -J<flag>              \u76F4\u63A5\u5C06 <flag> \u4F20\u9012\u5230\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FD0\u884C\u65F6\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -J\n    -R<flag>              \u5C06 <flag> \u4F20\u9012\u5230\u8FDC\u7A0B\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FDC\u7A0B\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -R\n    -C<flag>              \u5C06 <flag> \u4F20\u9012\u5230\u7F16\u8BD1\u5668\u3002\n                            \u4E3A\u6BCF\u4E2A\u7F16\u8BD1\u5668\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -C\n    --version             \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u9000\u51FA\n    --show-version        \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u7EE7\u7EED\n    --help, -?, -h        \u8F93\u51FA\u6807\u51C6\u9009\u9879\u7684\u6B64\u63D0\u8981\u5E76\u9000\u51FA\n    --help-extra, -X      \u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u5E2E\u52A9\u5E76\u9000\u51FA\n\n\u6587\u4EF6\u53C2\u6570\u53EF\u4EE5\u662F\u6587\u4EF6\u540D\uFF0C\u6216\u8005\u662F\u9884\u5B9A\u4E49\u7684\u6587\u4EF6\u540D\u4E4B\u4E00\uFF1ADEFAULT\u3001\nPRINTING\u3001TOOLING \u6216 JAVASE\u3002\n\u52A0\u8F7D\u6587\u4EF6\u8FD8\u53EF\u4EE5\u662F "-"\uFF0C\u7528\u4E8E\u6307\u660E\u6807\u51C6\u8F93\u5165\uFF0C\u6CA1\u6709\u4EA4\u4E92\u5F0F I/O\u3002\n\n\u6709\u5173\u8BC4\u4F30\u4E0A\u4E0B\u6587\u9009\u9879\uFF08--class-path\u3001--module-path \n\u548C --add-modules\uFF09\u7684\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u89C1\uFF1A\n\t/help context\n\n\u8DEF\u5F84\u5217\u51FA\u8981\u641C\u7D22\u7684\u76EE\u5F55\u548C\u6863\u6848\u3002\u5BF9\u4E8E Windows\uFF0C\u8BF7\u4F7F\u7528\n\u5206\u53F7 (;) \u6765\u5206\u9694\u8DEF\u5F84\u4E2D\u7684\u9879\u3002\u5728\u5176\u4ED6\u5E73\u53F0\u4E0A\uFF0C\u8BF7\u4F7F\u7528\n\u5192\u53F7 (:) \u6765\u5206\u9694\u5404\u9879\u3002\n
-help.usage.x = \    --add-exports <\u6A21\u5757>/<\u7A0B\u5E8F\u5305>      \u6307\u5B9A\u8981\u8003\u8651\u4ECE\u5176\u5B9A\u4E49\u6A21\u5757\u5BFC\u51FA\n                                         \u7684\u7A0B\u5E8F\u5305\n    --execution <\u89C4\u8303>                 \u6307\u5B9A\u66FF\u4EE3\u6267\u884C\u5F15\u64CE\u3002\n                                         \u5176\u4E2D <\u89C4\u8303> \u662F ExecutionControl \u89C4\u8303\u3002\n                                         \u6709\u5173\u89C4\u8303\u7684\u8BED\u6CD5\uFF0C\u8BF7\u53C2\u9605\u7A0B\u5E8F\u5305\n                                         jdk.jshell.spi \u7684\u6587\u6863\n    \n\u8FD9\u4E9B\u9009\u9879\u662F\u975E\u6807\u51C6\u9009\u9879\uFF0C\u5982\u6709\u66F4\u6539\uFF0C\u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
-
-help.list.summary = \u5217\u51FA\u60A8\u952E\u5165\u7684\u6E90
-help.list.args = [<\u540D\u79F0\u6216 id>|-all|-start]
-help.list =\u663E\u793A\u524D\u9762\u5E26\u6709\u5176\u7247\u6BB5 ID \u7684\u7247\u6BB5\u3002\n\n/list\n\t\u5217\u51FA\u60A8\u952E\u5165\u7684\u6216\u4F7F\u7528 /open \u8BFB\u53D6\u7684\u5F53\u524D\u6D3B\u52A8\u7684\u4EE3\u7801\u7247\u6BB5\n\n/list -start\n\t\u5217\u51FA\u8BC4\u4F30\u7684\u542F\u52A8\u7247\u6BB5\n\n/list -all\n\t\u5217\u51FA\u6240\u6709\u7247\u6BB5\uFF0C\u5305\u62EC\u5931\u8D25\u7684\u7247\u6BB5\u3001\u8986\u76D6\u7684\u7247\u6BB5\u3001\u5220\u9664\u7684\u7247\u6BB5\u548C\u542F\u52A8\u7247\u6BB5\n\n/list <\u540D\u79F0>\n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684\u7247\u6BB5\uFF08\u7279\u522B\u662F\u6D3B\u52A8\u7247\u6BB5\uFF09\n\n/list <id>\n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u7247\u6BB5 ID \u7684\u7247\u6BB5\u3002\n\t\u53EF\u4EE5\u4F7F\u7528\u4E00\u4E2A\u6216\u591A\u4E2A ID \u6216 ID \u8303\u56F4\uFF0C\u53C2\u89C1 '/help id'
-
-help.edit.summary = \u7F16\u8F91\u6E90\u6761\u76EE
-help.edit.args = <\u540D\u79F0\u6216 id>
-help.edit =\u5728\u5916\u90E8\u7F16\u8F91\u5668\u4E2D\u7F16\u8F91\u6E90\u7684\u7247\u6BB5\u3002\n\u4F7F\u7528 /set editor \u53EF\u4EE5\u8BBE\u7F6E\u8981\u4F7F\u7528\u7684\u7F16\u8F91\u5668\u3002\u5982\u679C\u5C1A\u672A\u8BBE\u7F6E\u7F16\u8F91\u5668\uFF0C\n\u5219\u5C06\u6309\u987A\u5E8F\u68C0\u67E5\u4EE5\u4E0B\u73AF\u5883\u53D8\u91CF\uFF1AJSHELLEDITOR\u3001VISUAL \n\u548C EDITOR\u3002\u5982\u679C\u5C1A\u672A\u8BBE\u7F6E\u7F16\u8F91\u5668\u5E76\u4E14\u672A\u8BBE\u7F6E\u4EFB\u4F55\n\u7F16\u8F91\u5668\u73AF\u5883\u53D8\u91CF\uFF0C\u5219\u5C06\u542F\u52A8\u4E00\u4E2A\u7B80\u5355\u7684\u7F16\u8F91\u5668\u3002\n\n/edit <\u540D\u79F0>\n\t\u7F16\u8F91\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684\u7247\u6BB5\uFF08\u7279\u522B\u662F\u6D3B\u52A8\u7247\u6BB5\uFF09\n\n/edit <id>\n\t\u7F16\u8F91\u5177\u6709\u6307\u5B9A\u7247\u6BB5 ID \u7684\u7247\u6BB5\u3002\n\t\u53EF\u4EE5\u4F7F\u7528\u4E00\u4E2A\u6216\u591A\u4E2A ID \u6216 ID \u8303\u56F4\uFF0C\u53C2\u89C1 '/help id'\n\n/edit -start\n\t\u7F16\u8F91\u542F\u52A8\u7247\u6BB5\u3002\u4EFB\u4F55\u66F4\u6539\u4FDD\u6301\u5728\u6B64\u4F1A\u8BDD\u4E2D\uFF0C\n\t\u4E0D\u5F71\u54CD\u542F\u52A8\u8BBE\u7F6E\n\n/edit -all\n\t\u7F16\u8F91\u6240\u6709\u7247\u6BB5\uFF0C\u5305\u62EC\u5931\u8D25\u7684\u7247\u6BB5\u3001\u8986\u76D6\u7684\u7247\u6BB5\u3001\u5220\u9664\u7684\u7247\u6BB5\u548C\u542F\u52A8\u7247\u6BB5\n\n/edit\n\t\u7F16\u8F91\u60A8\u952E\u5165\u6216\u4F7F\u7528 /open \u8BFB\u53D6\u7684\u5F53\u524D\u6D3B\u52A8\u7684\u4EE3\u7801\u7247\u6BB5
-
-help.drop.summary = \u5220\u9664\u6E90\u6761\u76EE
-help.drop.args = <\u540D\u79F0\u6216 id>
-help.drop =\u5220\u9664\u7247\u6BB5 -- \u4F7F\u7247\u6BB5\u5904\u4E8E\u4E0D\u6D3B\u52A8\u72B6\u6001\u3002\n\n/drop <\u540D\u79F0>\n\t\u5220\u9664\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684\u7247\u6BB5\n\n/drop <id>\n\t\u5220\u9664\u5177\u6709\u6307\u5B9A\u7247\u6BB5 ID \u7684\u7247\u6BB5\u3002\n\t\u53EF\u4EE5\u4F7F\u7528\u4E00\u4E2A\u6216\u591A\u4E2A ID \u6216 ID \u8303\u56F4\uFF0C\u53C2\u89C1 '/help id'
-
-help.save.summary = \u5C06\u7247\u6BB5\u6E90\u4FDD\u5B58\u5230\u6587\u4EF6
-help.save.args = [-all|-history|-start] <\u6587\u4EF6>
-help.save =\u5C06\u6307\u5B9A\u7684\u7247\u6BB5\u548C/\u6216\u547D\u4EE4\u4FDD\u5B58\u5230\u6307\u5B9A\u6587\u4EF6\u3002\n\n/save <\u6587\u4EF6>\n\t\u5C06\u5F53\u524D\u6D3B\u52A8\u7247\u6BB5\u7684\u6E90\u4FDD\u5B58\u5230\u6587\u4EF6\u3002\n\n/save -all <\u6587\u4EF6>\n\t\u5C06\u6240\u6709\u7247\u6BB5\u7684\u6E90\u4FDD\u5B58\u5230\u6587\u4EF6\u3002\n\t\u8FD9\u5305\u62EC\u8986\u76D6\u7684\u3001\u5931\u8D25\u7684\u4EE5\u53CA\u542F\u52A8\u4EE3\u7801\u7684\u6E90\u3002\n\n/save -history <\u6587\u4EF6>\n\t\u4FDD\u5B58\u81EA\u542F\u52A8 jshell \u5DE5\u5177\u4EE5\u6765\u8F93\u5165\u7684\u6240\u6709\u547D\u4EE4\u548C\u7247\u6BB5\u7684\n\t\u987A\u5E8F\u5386\u53F2\u8BB0\u5F55\u3002\n\n/save -start <\u6587\u4EF6>\n\t\u5C06\u5F53\u524D\u542F\u52A8\u5B9A\u4E49\u4FDD\u5B58\u5230\u6587\u4EF6\n\n/save <id> <\u6587\u4EF6>\n\t\u4FDD\u5B58\u5177\u6709\u6307\u5B9A\u7247\u6BB5 ID \u7684\u7247\u6BB5\u3002\n\t\u53EF\u4EE5\u4F7F\u7528\u4E00\u4E2A\u6216\u591A\u4E2A ID \u6216 ID \u8303\u56F4\uFF0C\u53C2\u89C1 '/help id'
-
-help.open.summary = \u6253\u5F00\u6587\u4EF6\u4F5C\u4E3A\u6E90\u8F93\u5165
+jshell.err.setting.to.retain.must.be.specified = 必须指定要保留的设置 -- {0}
+jshell.msg.set.show.mode.settings = \n要显示模式设置, 请使用 ''/set prompt'', ''/set truncation'', ...\n或者使用 ''/set mode'' 后跟反馈模式名称。
+jshell.err.continuation.prompt.required = 更多提示是必填的 -- {0}
+
+jshell.msg.try.command.without.args = 尝试使用不带参数的 ''{0}''。
+jshell.msg.no.active = 没有活动定义。
+
+jshell.msg.resetting = 正在重置...
+jshell.msg.resetting.state = 正在重置状态。
+
+jshell.err.reload.no.previous = 没有可还原的上一个历史记录
+jshell.err.reload.restarting.previous.state = 正在重新启动并还原到先前的状态。
+jshell.err.reload.restarting.state = 正在重新启动并还原状态。
+
+jshell.err.restart.failed = 重新启动失败: {0}\n\n正在还原为以前的设置并重新启动...
+
+jshell.msg.vars.not.active = (不活动)
+
+jshell.err.out.of.range = 超出范围
+
+jshell.msg.error = 错误:
+jshell.msg.warning = 警告:
+
+jshell.err.sub.arg = ''{0}'' 命令需要子命令。请参阅: ''/help {0}''
+jshell.err.sub.ambiguous = ''{0}'' 的子命令参数不明确: {1}
+
+jshell.err.classpath.arg = /classpath 命令要求路径参数。
+jshell.msg.classpath = 路径 ''{0}'' 已添加到类路径
+
+jshell.err.help.arg = 没有命令或主题以提供的参数开始: {0}
+jshell.msg.help.begin =键入 Java 语言表达式, 语句或声明。\n或者键入以下命令之一:\n
+jshell.msg.help.subject =\n有关详细信息, 请键入 ''/help'', 后跟\n命令或主题的名称。\n例如 ''/help /list'' 或 ''/help intro''。主题:\n\n
+
+jshell.err.no.snippet.with.id = 没有片段具有 ID：{0}
+jshell.err.end.snippet.range.less.than.start = 片段范围的结束值小于开始值: {0} - {1}
+jshell.err.range.requires.id = 片段范围需要片段 ID：{0}
+
+jshell.err.exit.not.expression = /exit 的参数必须是有效的整数表达式, 这不是表达式: {0}
+jshell.err.exit.bad.type = /exit 的参数必须是有效的整数表达式, 类型为 {1}: {0}
+jshell.err.exit.bad.value = /exit 的参数具有错误值 {1}: {0}
+
+jshell.err.drop.arg =在 /drop 参数中，请指定要删除的导入、变量、方法或类。\n按 ID 或名称指定。使用 /list 可查看 ID。使用 /reset 可重置所有状态。
+jshell.err.failed = 失败。
+jshell.msg.native.method = 本机方法
+jshell.msg.unknown.source = 未知源
+jshell.msg.goodbye = 再见
+jshell.msg.goodbye.value = 再见 ({0})
+
+jshell.msg.help.for.help = 键入 /help 以获取帮助信息。
+
+jshell.err.mode.name = 预期反馈模式名称: {0}
+jshell.err.missing.mode = 缺少反馈模式 -- {0}
+jshell.err.field.name = 预期字段名: {0} -- {1}
+jshell.err.mode.unknown = 未指定反馈模式: {0} -- {1}
+
+jshell.err.feedback.does.not.match.mode = 不匹配任何当前反馈模式: {0} -- {1}
+jshell.err.feedback.ambiguous.mode = 匹配了多个当前反馈模式: {0} -- {1}
+jshell.err.feedback.must.be.quoted = 格式 ''{0}'' 必须使用引号括起来 -- {1}
+jshell.err.feedback.not.a.valid.selector = 不是 ''{1}'' 中有效的选择器 ''{0}'' -- {2}
+jshell.err.feedback.multiple.sections = 选择器类型在 ''{1}'' 中选择器列表 ''{0}'' 的多个部分中 -- {2}
+jshell.err.feedback.different.selector.kinds = 不同的选择器类型位于 ''{1}'' 中选择器列表 ''{0}'' 的相同部分中 -- {2}
+
+jshell.msg.feedback.new.mode = 已创建新的反馈模式: {0}
+jshell.msg.feedback.mode = 反馈模式: {0}
+jshell.msg.feedback.mode.following = 可用的反馈模式:
+jshell.msg.feedback.retained.mode.following = 保留的反馈模式:
+jshell.err.mode.creation = 要创建新模式, 必须使用 -command 或 -quiet 选项 -- {0}
+jshell.err.mode.exists = 要创建的模式已存在: {0} -- {1}
+
+jshell.err.truncation.expected.length = 预期截断长度 -- {0}
+jshell.err.truncation.length.not.integer = 截断长度必须为整数: {0} -- {1}
+
+jshell.err.not.valid.with.predefined.mode = 对于预定义的模式无效: {0} -- {1}
+jshell.err.retained.feedback.mode.must.be.retained.or.predefined = ''/set feedback -retain <模式>'' 要求 <模式> 为预定义模式或者已经使用 ''/set mode -retain'' 保留 -- {0}
+
+jshell.err.unknown.option = 未知选项: {0} -- {1}
+jshell.err.default.option.or.program = 指定 -default 选项, -delete 选项或程序 -- {0}
+jshell.err.option.or.filename = 最多指定 -default, -none 或启动文件名中的一项 -- {0}
+jshell.err.unexpected.at.end = 命令结尾处遇到意外的参数: {0} -- {1}
+jshell.err.conflicting.options = 冲突的选项 -- {0}
+jshell.err.cannot.delete.current.mode = 无法删除当前反馈模式 ''{0}'', 请先使用 ''/set feedback'' -- {1}
+jshell.err.cannot.delete.retained.mode = 无法删除保留的反馈模式 ''{0}'', 请先使用 ''/set feedback -retain'' -- {1}
+jshell.err.may.not.specify.options.and.snippets = 不能同时使用选项和片段: {0}
+jshell.err.no.such.snippets = 没有此类片段: {0}
+jshell.err.the.snippet.cannot.be.used.with.this.command = 此命令不接受片段 ''{0}'' : {1}
+jshell.err.retained.mode.failure = 保留模式中出现故障 (已清除模式) -- {0} {1}
+
+jshell.err.corrupted.stored.startup = 存储的启动已损坏, 正在使用默认值 -- {0}
+
+jshell.err.exception.thrown = 异常错误 {0}
+jshell.err.exception.thrown.message = 异常错误 {0}：{1}
+jshell.err.exception.cause = 原因：{0}
+jshell.err.exception.cause.message = 原因: {0}： {1}
+
+jshell.console.see.synopsis = <再次按 Tab 可查看提要>
+jshell.console.see.full.documentation = <再次按 Tab 可查看完整文档>
+jshell.console.see.documentation = <再次按 Tab 可查看文档>
+jshell.console.see.next.page = <再次按 Tab 可查看下一页>
+jshell.console.see.next.javadoc = <按 Tab 可查看下一文档>
+jshell.console.see.next.command.doc = <按 Tab 可查看下一命令>
+jshell.console.no.such.command = 该命令不存在
+jshell.console.completion.current.signatures = 签名:
+jshell.console.completion.all.completions.number = <再次按 Tab 可查看所有可能的输入提示; 可能的输入提示总计: {0}>
+jshell.console.completion.all.completions = <再次按 Tab 可查看所有可能的输入提示>
+jshell.console.no.javadoc = <找不到文档>
+jshell.console.do.nothing = 不执行任何操作
+jshell.console.choice = 选项:\u0020
+jshell.console.create.variable = 创建变量
+jshell.console.create.method = 创建方法
+jshell.console.resolvable = \n标识符可在此上下文中解析。
+jshell.console.no.candidate = \n没有找到可导入的候选全限定名称。
+jshell.console.incomplete = \n结果可能不完整; 请稍候重试以获取完整结果。
+jshell.console.erroneous = \n不完整或错误。Shift+Tab m 前必须为单个有效的表达式或语句。
+jshell.console.exprstmt = \nShift+Tab m 后必须为单个有效的表达式或语句。
+jshell.console.empty = \n空条目。Shift+Tab m 前必须为单个有效的表达式或语句。
+
+jshell.fix.wrong.shortcut =Shift+Tab 后出现意外的字符。\n使用 "i" 表示自动导入，使用 "v" 表示变量创建，使用 "i" 表示方法创建。\n有关详细信息，请参阅：\n/help 快捷方式
+
+help.usage = 用法：   jshell <option>... <load-file>...\n其中，可能的选项包括：\n    --class-path <path>   指定用户类文件的查找位置\n    --module-path <path>  指定应用程序模块的查找位置\n    --add-modules <module>(,<module>)*\n                          指定要解析的模块；如果 <module> 为 \n                            ALL-MODULE-PATHs，则为模块路径中的所有模块\n    --enable-native-access\n                          允许代码运行受限的本机方法\n    --enable-preview      允许代码依赖于此发行版的预览功能\n    --startup <file>      对启动定义执行单次替换\n    --no-startup          不运行启动定义\n    --feedback <mode>     指定初始反馈模式。该模式可以是\n                            预定义的（silent、concise、normal 或 verbose），\n                            也可以是用户以前定义的\n    -q                    无提示反馈。等同于：--feedback concise\n    -s                    真正无提示反馈。等同于：--feedback silent\n    -v                    详细反馈。等同于：--feedback verbose\n    -J<flag>              直接将 <flag> 传递到运行时系统。\n                            为每个运行时标记或标记参数使用一个 -J\n    -R<flag>              将 <flag> 传递到远程运行时系统。\n                            为每个远程标记或标记参数使用一个 -R\n    -C<flag>              将 <flag> 传递到编译器。\n                            为每个编译器标记或标记参数使用一个 -C\n    --version             输出版本信息并退出\n    --show-version        输出版本信息并继续\n    --help, -?, -h        输出标准选项的此提要并退出\n    --help-extra, -X      输出非标准选项的帮助并退出\n\n文件参数可以是文件名，或者是预定义的文件名之一：DEFAULT、\nPRINTING、TOOLING 或 JAVASE。\n加载文件还可以是 "-"，用于指明标准输入，没有交互式 I/O。\n\n有关评估上下文选项（--class-path、--module-path \n和 --add-modules）的详细信息，请参见：\n\t/help context\n\n路径列出要搜索的目录和档案。对于 Windows，请使用\n分号 (;) 来分隔路径中的项。在其他平台上，请使用\n冒号 (:) 来分隔各项。\n
+help.usage.x = \    --add-exports <模块>/<程序包>      指定要考虑从其定义模块导出\n                                         的程序包\n    --execution <规范>                 指定替代执行引擎。\n                                         其中 <规范> 是 ExecutionControl 规范。\n                                         有关规范的语法，请参阅程序包\n                                         jdk.jshell.spi 的文档\n    \n这些选项是非标准选项，如有更改，恕不另行通知。\n
+
+help.list.summary = 列出您键入的源
+help.list.args = [<名称或 id>|-all|-start]
+help.list =显示前面带有其片段 ID 的片段。\n\n/list\n\t列出您键入的或使用 /open 读取的当前活动的代码片段\n\n/list -start\n\t列出评估的启动片段\n\n/list -all\n\t列出所有片段，包括失败的片段、覆盖的片段、删除的片段和启动片段\n\n/list <名称>\n\t列出具有指定名称的片段（特别是活动片段）\n\n/list <id>\n\t列出具有指定片段 ID 的片段。\n\t可以使用一个或多个 ID 或 ID 范围，参见 '/help id'
+
+help.edit.summary = 编辑源条目
+help.edit.args = <名称或 id>
+help.edit =在外部编辑器中编辑源的片段。\n使用 /set editor 可以设置要使用的编辑器。如果尚未设置编辑器，\n则将按顺序检查以下环境变量：JSHELLEDITOR、VISUAL \n和 EDITOR。如果尚未设置编辑器并且未设置任何\n编辑器环境变量，则将启动一个简单的编辑器。\n\n/edit <名称>\n\t编辑具有指定名称的片段（特别是活动片段）\n\n/edit <id>\n\t编辑具有指定片段 ID 的片段。\n\t可以使用一个或多个 ID 或 ID 范围，参见 '/help id'\n\n/edit -start\n\t编辑启动片段。任何更改保持在此会话中，\n\t不影响启动设置\n\n/edit -all\n\t编辑所有片段，包括失败的片段、覆盖的片段、删除的片段和启动片段\n\n/edit\n\t编辑您键入或使用 /open 读取的当前活动的代码片段
+
+help.drop.summary = 删除源条目
+help.drop.args = <名称或 id>
+help.drop =删除片段 -- 使片段处于不活动状态。\n\n/drop <名称>\n\t删除具有指定名称的片段\n\n/drop <id>\n\t删除具有指定片段 ID 的片段。\n\t可以使用一个或多个 ID 或 ID 范围，参见 '/help id'
+
+help.save.summary = 将片段源保存到文件
+help.save.args = [-all|-history|-start] <文件>
+help.save =将指定的片段和/或命令保存到指定文件。\n\n/save <文件>\n\t将当前活动片段的源保存到文件。\n\n/save -all <文件>\n\t将所有片段的源保存到文件。\n\t这包括覆盖的、失败的以及启动代码的源。\n\n/save -history <文件>\n\t保存自启动 jshell 工具以来输入的所有命令和片段的\n\t顺序历史记录。\n\n/save -start <文件>\n\t将当前启动定义保存到文件\n\n/save <id> <文件>\n\t保存具有指定片段 ID 的片段。\n\t可以使用一个或多个 ID 或 ID 范围，参见 '/help id'
+
+help.open.summary = 打开文件作为源输入
 help.open.args = <file>
-help.open =\u6253\u5F00\u6587\u4EF6\u5E76\u8BFB\u53D6\u5176\u5185\u5BB9\u4F5C\u4E3A\u7247\u6BB5\u548C\u547D\u4EE4\u3002\n\n/open <file>\n\t\u8BFB\u53D6\u6307\u5B9A\u7684\u6587\u4EF6\u4F5C\u4E3A jshell \u5DE5\u5177\u8F93\u5165\u3002\n/open <URL>\n\t\u4E0B\u8F7D\u5E76\u4F7F\u7528\u6307\u5B9A\u7684 URL \u4F5C\u4E3A jshell \u5DE5\u5177\u8F93\u5165\u3002\n\n<file> \u53EF\u4EE5\u662F\u64CD\u4F5C\u7CFB\u7EDF\u6587\u4EF6\u540D\uFF0C\u4E5F\u53EF\u4EE5\u662F\u9884\u5B9A\u4E49\u7684\n\u6587\u4EF6\u540D\u4E4B\u4E00\uFF1ADEFAULT\u3001PRINTING\u3001TOOLING \u6216 JAVASE\u3002\n\u8FD9\u4E9B\u9879\u7684\u8BF4\u660E\u5206\u522B\u5982\u4E0B\uFF1A\u9ED8\u8BA4\u5BFC\u5165\u7247\u6BB5\uFF08\u5982 -default \u6240\u4F7F\u7528\u7684\uFF09\uFF0C\nprint()\u3001println() \u548C printf() \u65B9\u6CD5\u7247\u6BB5\u7684\u5B9A\u4E49\uFF0C\u8FD0\u884C JDK \u5DE5\u5177\u7684\n\u65B9\u6CD5\u7247\u6BB5\u7684\u5B9A\u4E49\u6216\u6240\u6709 Java SE \u7A0B\u5E8F\u5305\u7684\u5BFC\u5165\u9879\u3002\n
+help.open =打开文件并读取其内容作为片段和命令。\n\n/open <file>\n\t读取指定的文件作为 jshell 工具输入。\n/open <URL>\n\t下载并使用指定的 URL 作为 jshell 工具输入。\n\n<file> 可以是操作系统文件名，也可以是预定义的\n文件名之一：DEFAULT、PRINTING、TOOLING 或 JAVASE。\n这些项的说明分别如下：默认导入片段（如 -default 所使用的），\nprint()、println() 和 printf() 方法片段的定义，运行 JDK 工具的\n方法片段的定义或所有 Java SE 程序包的导入项。\n
 
-help.vars.summary = \u5217\u51FA\u5DF2\u58F0\u660E\u53D8\u91CF\u53CA\u5176\u503C
-help.vars.args = [<\u540D\u79F0\u6216 id>|-all|-start]
-help.vars =\u5217\u51FA\u5DF2\u8F93\u5165\u53D8\u91CF\u7684\u7C7B\u578B\u3001\u540D\u79F0\u548C\u503C\u3002\n\n/vars\n\t\u5217\u51FA\u5F53\u524D\u6D3B\u52A8\u53D8\u91CF\u7684\u7C7B\u578B\u3001\u540D\u79F0\u548C\u503C\n\n/vars <\u540D\u79F0>\n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684\u53D8\u91CF\uFF08\u7279\u522B\u662F\u6D3B\u52A8\u53D8\u91CF\uFF09\n\n/vars <id>\n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u7247\u6BB5 ID \u7684\u53D8\u91CF\u3002\n\t\u53EF\u4EE5\u4F7F\u7528\u4E00\u4E2A\u6216\u591A\u4E2A ID \u6216 ID \u8303\u56F4\uFF0C\u53C2\u89C1 '/help id'\n\n/vars -start\n\t\u5217\u51FA\u5DF2\u8BC4\u4F30\u542F\u52A8\u7247\u6BB5\u4E2D\u7684\u53D8\u91CF\n\n/vars -all\n\t\u5217\u51FA\u6240\u6709\u53D8\u91CF\uFF0C\u5305\u62EC\u5DF2\u5931\u8D25\u53D8\u91CF\u3001\u5DF2\u8986\u76D6\u53D8\u91CF\u3001\u5DF2\u5220\u9664\u53D8\u91CF\u548C\u542F\u52A8\u53D8\u91CF
+help.vars.summary = 列出已声明变量及其值
+help.vars.args = [<名称或 id>|-all|-start]
+help.vars =列出已输入变量的类型、名称和值。\n\n/vars\n\t列出当前活动变量的类型、名称和值\n\n/vars <名称>\n\t列出具有指定名称的变量（特别是活动变量）\n\n/vars <id>\n\t列出具有指定片段 ID 的变量。\n\t可以使用一个或多个 ID 或 ID 范围，参见 '/help id'\n\n/vars -start\n\t列出已评估启动片段中的变量\n\n/vars -all\n\t列出所有变量，包括已失败变量、已覆盖变量、已删除变量和启动变量
 
-help.methods.summary = \u5217\u51FA\u5DF2\u58F0\u660E\u65B9\u6CD5\u53CA\u5176\u7B7E\u540D
-help.methods.args = [<\u540D\u79F0\u6216 id>|-all|-start]
-help.methods =\u5217\u51FA\u5DF2\u8F93\u5165\u65B9\u6CD5\u7684\u540D\u79F0\u3001\u53C2\u6570\u7C7B\u578B\u548C\u8FD4\u56DE\u7C7B\u578B\u3002\n\n/methods\n\t\u5217\u51FA\u5F53\u524D\u6D3B\u52A8\u65B9\u6CD5\u7684\u540D\u79F0\u3001\u53C2\u6570\u7C7B\u578B\u548C\u8FD4\u56DE\u7C7B\u578B\n\n/methods <\u540D\u79F0>\n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684\u65B9\u6CD5\uFF08\u7279\u522B\u662F\u6D3B\u52A8\u65B9\u6CD5\uFF09\n\n/methods <id>\n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u7247\u6BB5 ID \u7684\u65B9\u6CD5\u3002\n\t\u53EF\u4EE5\u4F7F\u7528\u4E00\u4E2A\u6216\u591A\u4E2A ID \u6216 ID \u8303\u56F4\uFF0C\u53C2\u89C1 '/help id'\n\n/methods -start\n\t\u5217\u51FA\u5DF2\u8BC4\u4F30\u542F\u52A8\u7247\u6BB5\u4E2D\u7684\u65B9\u6CD5\n\n/methods -all\n\t\u5217\u51FA\u6240\u6709\u7247\u6BB5\uFF0C\u5305\u62EC\u5931\u8D25\u7684\u7247\u6BB5\u3001\u8986\u76D6\u7684\u7247\u6BB5\u3001\u5220\u9664\u7684\u7247\u6BB5\u548C\u542F\u52A8\u7247\u6BB5
+help.methods.summary = 列出已声明方法及其签名
+help.methods.args = [<名称或 id>|-all|-start]
+help.methods =列出已输入方法的名称、参数类型和返回类型。\n\n/methods\n\t列出当前活动方法的名称、参数类型和返回类型\n\n/methods <名称>\n\t列出具有指定名称的方法（特别是活动方法）\n\n/methods <id>\n\t列出具有指定片段 ID 的方法。\n\t可以使用一个或多个 ID 或 ID 范围，参见 '/help id'\n\n/methods -start\n\t列出已评估启动片段中的方法\n\n/methods -all\n\t列出所有片段，包括失败的片段、覆盖的片段、删除的片段和启动片段
 
-help.types.summary = \u5217\u51FA\u7C7B\u578B\u58F0\u660E
-help.types.args =[<\u540D\u79F0\u6216 id>|-all|-start]
-help.types =\u5217\u51FA\u5DF2\u8F93\u5165\u7684\u7C7B\u548C\u63A5\u53E3\u3002\n\n/types\n\t\u5217\u51FA\u5F53\u524D\u6D3B\u52A8\u7684\u7C7B\u578B\u58F0\u660E\n\n/types <\u540D\u79F0>\n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684\u7C7B\u578B\u58F0\u660E\uFF08\u7279\u522B\u662F\u6D3B\u52A8\u7247\u6BB5\uFF09\n\n/types <id>\n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u7247\u6BB5 ID \u7684\u7C7B\u578B\u58F0\u660E\u3002\n\t\u53EF\u4EE5\u4F7F\u7528\u4E00\u4E2A\u6216\u591A\u4E2A ID \u6216 ID \u8303\u56F4\uFF0C\u53C2\u89C1 '/help id'\n\n/types -start\n\t\u5217\u51FA\u5DF2\u8BC4\u4F30\u542F\u52A8\u7247\u6BB5\u4E2D\u7684\u7C7B\u578B\u58F0\u660E\n\n/types -all\n\t\u5217\u51FA\u6240\u6709\u7C7B\u578B\u58F0\u660E\uFF0C\u5305\u62EC\u5DF2\u5931\u8D25\u7C7B\u578B\u58F0\u660E\u3001\u5DF2\u8986\u76D6\u7C7B\u578B\u58F0\u660E\u3001\u5DF2\u5220\u9664\u7C7B\u578B\u58F0\u660E\u548C\u542F\u52A8\u7C7B\u578B\u58F0\u660E
+help.types.summary = 列出类型声明
+help.types.args =[<名称或 id>|-all|-start]
+help.types =列出已输入的类和接口。\n\n/types\n\t列出当前活动的类型声明\n\n/types <名称>\n\t列出具有指定名称的类型声明（特别是活动片段）\n\n/types <id>\n\t列出具有指定片段 ID 的类型声明。\n\t可以使用一个或多个 ID 或 ID 范围，参见 '/help id'\n\n/types -start\n\t列出已评估启动片段中的类型声明\n\n/types -all\n\t列出所有类型声明，包括已失败类型声明、已覆盖类型声明、已删除类型声明和启动类型声明
 
-help.imports.summary = \u5217\u51FA\u5BFC\u5165\u7684\u9879
+help.imports.summary = 列出导入的项
 help.imports.args =
-help.imports =\u5217\u51FA\u5F53\u524D\u6D3B\u52A8\u7684\u5BFC\u5165\u3002\u8FD9\u5305\u62EC\u6765\u81EA\u542F\u52A8\u7247\u6BB5\u7684\n\u5BFC\u5165\u3002
+help.imports =列出当前活动的导入。这包括来自启动片段的\n导入。
 
-help.exit.summary = \u9000\u51FA jshell \u5DE5\u5177
+help.exit.summary = 退出 jshell 工具
 help.exit.args =[<integer-expression-snippet>]
-help.exit =\u9000\u51FA jshell \u5DE5\u5177\u3002\u4E0D\u4FDD\u5B58\u5DE5\u4F5C\u3002\n\u5728\u4F7F\u7528\u6B64\u547D\u4EE4\u524D\u5E94\u8BE5\u5148\u4FDD\u5B58\u4EFB\u4F55\u5DE5\u4F5C\n\n/exit\n\t\u9000\u51FA jshell \u5DE5\u5177\u3002\u9000\u51FA\u72B6\u6001\u4E3A\u96F6\n\n/exit <\u6574\u6570\u8868\u8FBE\u5F0F\u7247\u6BB5>\n\t\u8BC4\u4F30\u7247\u6BB5\u3002\u5982\u679C\u7247\u6BB5\u5931\u8D25\u6216\u8005\u4E0D\u662F\u6574\u6570\u8868\u8FBE\u5F0F\uFF0C\n\t\u5219\u663E\u793A\u9519\u8BEF\u3002\u5426\u5219\u9000\u51FA jshell \u5DE5\u5177\uFF0C\u5E76\u5C06\n\t\u8868\u8FBE\u5F0F\u7684\u503C\u4F5C\u4E3A\u9000\u51FA\u72B6\u6001
+help.exit =退出 jshell 工具。不保存工作。\n在使用此命令前应该先保存任何工作\n\n/exit\n\t退出 jshell 工具。退出状态为零\n\n/exit <整数表达式片段>\n\t评估片段。如果片段失败或者不是整数表达式，\n\t则显示错误。否则退出 jshell 工具，并将\n\t表达式的值作为退出状态
 
-help.reset.summary = \u91CD\u7F6E jshell \u5DE5\u5177
-help.reset.args = [-class-path <\u8DEF\u5F84>] [-module-path <\u8DEF\u5F84>] [-add-modules <\u6A21\u5757>]...
-help.reset =\u91CD\u7F6E jshell \u5DE5\u5177\u4EE3\u7801\u548C\u6267\u884C\u72B6\u6001\uFF1A\n\t* \u6240\u6709\u8F93\u5165\u7684\u4EE3\u7801\u4E22\u5931\n\t* \u91CD\u65B0\u542F\u52A8\u6267\u884C\u72B6\u6001\n\t* \u91CD\u65B0\u6267\u884C\u542F\u52A8\u4EE3\u7801\n\u5728\u4F7F\u7528\u6B64\u547D\u4EE4\u524D\u5E94\u8BE5\u5148\u4FDD\u5B58\u4EFB\u4F55\u5DE5\u4F5C\u3002\n/reset \u547D\u4EE4\u63A5\u53D7\u8BC4\u4F30\u4E0A\u4E0B\u6587\u9009\u9879\uFF0C\u53C2\u89C1\uFF1A\n\n\t/help context\n
+help.reset.summary = 重置 jshell 工具
+help.reset.args = [-class-path <路径>] [-module-path <路径>] [-add-modules <模块>]...
+help.reset =重置 jshell 工具代码和执行状态：\n\t* 所有输入的代码丢失\n\t* 重新启动执行状态\n\t* 重新执行启动代码\n在使用此命令前应该先保存任何工作。\n/reset 命令接受评估上下文选项，参见：\n\n\t/help context\n
 
-help.reload.summary = \u91CD\u7F6E\u548C\u91CD\u653E\u76F8\u5173\u5386\u53F2\u8BB0\u5F55 -- \u5F53\u524D\u5386\u53F2\u8BB0\u5F55\u6216\u4E0A\u4E00\u4E2A\u5386\u53F2\u8BB0\u5F55 (-restore)
-help.reload.args = [-restore] [-quiet] [-class-path <\u8DEF\u5F84>] [-module-path <\u8DEF\u5F84>]...
-help.reload =\u91CD\u7F6E jshell \u5DE5\u5177\u4EE3\u7801\u548C\u6267\u884C\u72B6\u6001\uFF0C\u7136\u540E\u6309\u7167\u5404\u6709\u6548\u7247\u6BB5\u548C\n\u4EFB\u4F55 /drop \u547D\u4EE4\u7684\u8F93\u5165\u987A\u5E8F\u91CD\u653E\u5B83\u4EEC\u3002\n\n/reload\n\t\u91CD\u7F6E\u548C\u91CD\u653E\u81EA\u8FDB\u5165 jshell \u5DE5\u5177\u4EE5\u6765\u7684\u6709\u6548\u5386\u53F2\u8BB0\u5F55\uFF0C\n\t\u6216\u8005\u6267\u884C /reset \u6216 /reload \u547D\u4EE4\u4E2D\u6700\u65B0\u7684\u90A3\u4E2A\n\t\u547D\u4EE4\n\n/reload -restore\n\t\u91CD\u7F6E\u5E76\u91CD\u653E\u4E0A\u4E00\u6B21\u8FDB\u5165 jshell \u5DE5\u5177\u4E0E\u6700\u8FD1\u8FDB\u5165 jshell\n\t\u5DE5\u5177\u4E4B\u95F4\u7684\u6709\u6548\u5386\u53F2\u8BB0\u5F55\uFF0C\u6216\u8005\u6267\u884C /reset\u3001/reload\n\t\u6216 /env \u547D\u4EE4\u3002\u8FD9\u8FDB\u800C\u53EF\u7528\u4E8E\u8FD8\u539F\u4E0A\u4E00\u4E2A\n\tjshell \u5DE5\u5177\u4F1A\u8BDD\n\n/reload [-restore] -quiet\n\t\u4F7F\u7528 '-quiet' \u53C2\u6570\u65F6\uFF0C\u4E0D\u663E\u793A\u91CD\u653E\uFF0C\u4F46\u5C06\u663E\u793A\n\t\u6240\u6709\u9519\u8BEF\n\n\u4E0A\u9762\u6BCF\u4E2A\u547D\u4EE4\u90FD\u63A5\u53D7\u8BC4\u4F30\u4E0A\u4E0B\u6587\u9009\u9879\uFF0C\u8BF7\u53C2\u89C1\uFF1A\n\n\t/help context\n\n\u4F8B\u5982\uFF1A\n\n\t/reload -add-modules com.greetings -restore
+help.reload.summary = 重置和重放相关历史记录 -- 当前历史记录或上一个历史记录 (-restore)
+help.reload.args = [-restore] [-quiet] [-class-path <路径>] [-module-path <路径>]...
+help.reload =重置 jshell 工具代码和执行状态，然后按照各有效片段和\n任何 /drop 命令的输入顺序重放它们。\n\n/reload\n\t重置和重放自进入 jshell 工具以来的有效历史记录，\n\t或者执行 /reset 或 /reload 命令中最新的那个\n\t命令\n\n/reload -restore\n\t重置并重放上一次进入 jshell 工具与最近进入 jshell\n\t工具之间的有效历史记录，或者执行 /reset、/reload\n\t或 /env 命令。这进而可用于还原上一个\n\tjshell 工具会话\n\n/reload [-restore] -quiet\n\t使用 '-quiet' 参数时，不显示重放，但将显示\n\t所有错误\n\n上面每个命令都接受评估上下文选项，请参见：\n\n\t/help context\n\n例如：\n\n\t/reload -add-modules com.greetings -restore
 
-help.env.summary = \u67E5\u770B\u6216\u66F4\u6539\u8BC4\u4F30\u4E0A\u4E0B\u6587
-help.env.args = [-class-path <\u8DEF\u5F84>] [-module-path <\u8DEF\u5F84>] [-add-modules <\u6A21\u5757>] ...
-help.env =\u67E5\u770B\u6216\u66F4\u6539\u8BC4\u4F30\u4E0A\u4E0B\u6587\u3002\u8BC4\u4F30\u4E0A\u4E0B\u6587\u662F\u7C7B\u8DEF\u5F84\uFF0C\n\u6A21\u5757\u8DEF\u5F84\u7B49\u7B49\u3002\n\n/env\n\t\u663E\u793A\u4F5C\u4E3A\u4E0A\u4E0B\u6587\u9009\u9879\u663E\u793A\u7684\u8BC4\u4F30\u4E0A\u4E0B\u6587\n\n/env [-class-path <\u8DEF\u5F84>] [-module-path <\u8DEF\u5F84>] [-add-modules <\u6A21\u5757>] ...\n\t\u5728\u81F3\u5C11\u8BBE\u7F6E\u4E00\u4E2A\u9009\u9879\u7684\u60C5\u51B5\u4E0B\uFF0C\u8BBE\u7F6E\u8BC4\u4F30\u4E0A\u4E0B\u6587\u3002\u5982\u679C\n\t\u5DF2\u5B9A\u4E49\u7247\u6BB5\uFF0C\u5219\u5C06\u4F7F\u7528\u65B0\u8BC4\u4F30\u4E0A\u4E0B\u6587\u91CD\u7F6E\n\t\u6267\u884C\u72B6\u6001\uFF0C\u5E76\u4E14\u5C06\u91CD\u653E\u7247\u6BB5 -- \u4E0D\u663E\u793A\n\t\u91CD\u653E\uFF0C\u4F46\u662F\u5C06\u663E\u793A\u6240\u6709\u9519\u8BEF\u3002\u8FD9\u7B49\u540C\u4E8E\uFF1A\n\n\t\t/reload -quiet ...\n\n\t\u6709\u5173\u8BC4\u4F30\u4E0A\u4E0B\u6587\u9009\u9879\u7684\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u89C1\uFF1A\n\n\t/help context\n\n\u4F8B\u5982\uFF1A\n\n\t/env -add-modules com.greetings
+help.env.summary = 查看或更改评估上下文
+help.env.args = [-class-path <路径>] [-module-path <路径>] [-add-modules <模块>] ...
+help.env =查看或更改评估上下文。评估上下文是类路径，\n模块路径等等。\n\n/env\n\t显示作为上下文选项显示的评估上下文\n\n/env [-class-path <路径>] [-module-path <路径>] [-add-modules <模块>] ...\n\t在至少设置一个选项的情况下，设置评估上下文。如果\n\t已定义片段，则将使用新评估上下文重置\n\t执行状态，并且将重放片段 -- 不显示\n\t重放，但是将显示所有错误。这等同于：\n\n\t\t/reload -quiet ...\n\n\t有关评估上下文选项的详细信息，请参见：\n\n\t/help context\n\n例如：\n\n\t/env -add-modules com.greetings
 
-help.history.summary = \u60A8\u952E\u5165\u7684\u5185\u5BB9\u7684\u5386\u53F2\u8BB0\u5F55
+help.history.summary = 您键入的内容的历史记录
 help.history.args = [-all]
-help.history =\u663E\u793A\u8F93\u5165\u7684\u7247\u6BB5\u548C\u547D\u4EE4\u7684\u5386\u53F2\u8BB0\u5F55\u3002\n\n/history\n\t\u5217\u51FA\u81EA\u542F\u52A8\u6B64 jshell \u5DE5\u5177\u4EE5\u6765\u8F93\u5165\u7684\u7247\u6BB5\u548C\u547D\u4EE4\u7684\u5386\u53F2\u8BB0\u5F55\n\n/history -all\n\t\u5217\u51FA\u6B64\u4F1A\u8BDD\u548C\u4EE5\u524D\u4F1A\u8BDD\u4E2D\u8F93\u5165\u7684\u7247\u6BB5\u548C\u547D\u4EE4\u7684\u5386\u53F2\u8BB0\u5F55
+help.history =显示输入的片段和命令的历史记录。\n\n/history\n\t列出自启动此 jshell 工具以来输入的片段和命令的历史记录\n\n/history -all\n\t列出此会话和以前会话中输入的片段和命令的历史记录
 
-help.debug.summary = \u5207\u6362 jshell \u5DE5\u5177\u7684\u8C03\u8BD5
+help.debug.summary = 切换 jshell 工具的调试
 help.debug.args = [0][r][g][f][c][d][e]
-help.debug =\u663E\u793A jshell \u5DE5\u5177\u5B9E\u73B0\u7684\u8C03\u8BD5\u4FE1\u606F\n0\uFF1A\u7981\u7528\u8C03\u8BD5\nr\uFF1A\u542F\u7528\u5DE5\u5177\u7EA7\u522B\u8C03\u8BD5\ng\uFF1A\u542F\u7528\u5E38\u89C4\u8C03\u8BD5\nf\uFF1A\u542F\u7528\u6587\u4EF6\u7BA1\u7406\u5668\u8C03\u8BD5\nc\uFF1A\u542F\u7528\u8F93\u5165\u63D0\u793A\u5206\u6790\u8C03\u8BD5\nd\uFF1A\u542F\u7528\u88AB\u4F9D\u8D56\u5BF9\u8C61\u8C03\u8BD5\ne\uFF1A\u542F\u7528\u4E8B\u4EF6\u8C03\u8BD5
+help.debug =显示 jshell 工具实现的调试信息\n0：禁用调试\nr：启用工具级别调试\ng：启用常规调试\nf：启用文件管理器调试\nc：启用输入提示分析调试\nd：启用被依赖对象调试\ne：启用事件调试
 
-help.help.summary = \u83B7\u53D6\u6709\u5173\u4F7F\u7528 jshell \u5DE5\u5177\u7684\u4FE1\u606F
+help.help.summary = 获取有关使用 jshell 工具的信息
 help.help.args = [<command>|<subject>]
-help.help =\u663E\u793A\u6709\u5173\u4F7F\u7528 jshell \u5DE5\u5177\u7684\u4FE1\u606F\u3002\n/help\n\t\u5217\u51FA jshell \u5DE5\u5177\u547D\u4EE4\u548C\u5E2E\u52A9\u4E3B\u9898\n\n/help <command>\n\t\u663E\u793A\u6709\u5173\u6307\u5B9A\u547D\u4EE4\u7684\u4FE1\u606F\u3002\n\t\u53EA\u9700\u8F93\u5165\u547D\u4EE4\u7684\u524D\u51E0\u4E2A\u5B57\u6BCD -- \u5982\u679C\u6709\u591A\u4E2A\u5339\u914D\u9879\uFF0C\n\t\u5219\u5C06\u663E\u793A\u9879\u3002\u793A\u4F8B\uFF1A/help /li\n\n/help <subject>\n\t\u663E\u793A\u6709\u5173\u6307\u5B9A\u5E2E\u52A9\u4E3B\u9898\u7684\u4FE1\u606F\u3002\u793A\u4F8B\uFF1A/help intro
+help.help =显示有关使用 jshell 工具的信息。\n/help\n\t列出 jshell 工具命令和帮助主题\n\n/help <command>\n\t显示有关指定命令的信息。\n\t只需输入命令的前几个字母 -- 如果有多个匹配项，\n\t则将显示项。示例：/help /li\n\n/help <subject>\n\t显示有关指定帮助主题的信息。示例：/help intro
 
-help.set.summary = \u8BBE\u7F6E\u914D\u7F6E\u4FE1\u606F
+help.set.summary = 设置配置信息
 help.set.args = editor|start|feedback|mode|prompt|truncation|format ...
-help.set =\u8BBE\u7F6E jshell \u5DE5\u5177\u914D\u7F6E\u4FE1\u606F\uFF0C\u5305\u62EC\uFF1A\n\u8981\u4F7F\u7528\u7684\u5916\u90E8\u7F16\u8F91\u5668\u3001\u8981\u4F7F\u7528\u7684\u542F\u52A8\u5B9A\u4E49\u3001\u65B0\u7684\u53CD\u9988\u6A21\u5F0F\u3001\n\u547D\u4EE4\u63D0\u793A\u7B26\u3001\u8981\u4F7F\u7528\u7684\u53CD\u9988\u6A21\u5F0F\u6216\u8F93\u51FA\u7684\u683C\u5F0F\u3002\n\n/set editor [-wait] <\u547D\u4EE4> <\u53EF\u9009\u53C2\u6570>...\n\t\u6307\u5B9A\u8981\u4E3A /edit \u547D\u4EE4\u542F\u52A8\u7684\u547D\u4EE4\u3002\n\t<\u547D\u4EE4> \u662F\u4E0E\u64CD\u4F5C\u7CFB\u7EDF\u76F8\u5173\u7684\u5B57\u7B26\u4E32\n\n/set start <\u6587\u4EF6>\n\t\u6307\u5B9A <\u6587\u4EF6> \u7684\u5185\u5BB9\u5C06\u6210\u4E3A\u9ED8\u8BA4\u542F\u52A8\u7247\u6BB5\u548C\u547D\u4EE4\n\n/set feedback <\u6A21\u5F0F>\n\t\u8BBE\u7F6E\u7528\u4E8E\u63CF\u8FF0\u4E3A\u6240\u8F93\u5165\u7247\u6BB5\u548C\u547D\u4EE4\u663E\u793A\u7684\u53CD\u9988\u7684\u53CD\u9988\u6A21\u5F0F\n\n/set mode <\u6A21\u5F0F> [<\u65E7\u6A21\u5F0F>] -command|-quiet|-delete\n\t\u521B\u5EFA\u6216\u66F4\u65B0\u7528\u6237\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\uFF0C\u53EF\u4EE5\u9009\u62E9\u4ECE\u73B0\u6709\u6A21\u5F0F\u590D\u5236\n\n/set prompt <\u6A21\u5F0F> "<\u63D0\u793A>" "<\u66F4\u591A\u63D0\u793A>"\n\t\u8BBE\u7F6E\u4E3A\u7ED9\u5B9A\u53CD\u9988\u6A21\u5F0F\u663E\u793A\u7684\u63D0\u793A\u7B26\n\n/set truncation <\u6A21\u5F0F> <\u957F\u5EA6> <\u9009\u62E9\u5668>...\n\t\u8BBE\u7F6E\u663E\u793A\u503C\u7684\u6700\u5927\u957F\u5EA6\n\n/set format <\u6A21\u5F0F> <\u5B57\u6BB5> "<\u683C\u5F0F>" <\u9009\u62E9\u5668>...\n\t\u901A\u8FC7\u8BBE\u7F6E\u5F53\u9009\u62E9\u5668\u5339\u914D\u65F6\u5B57\u6BB5\u7684\u683C\u5F0F\u6765\u914D\u7F6E\u53CD\u9988\u6A21\u5F0F\n\n/set indent <\u6570\u5B57>\n\t\u8BBE\u7F6E\u5E94\u7528\u4E8E\u81EA\u52A8\u7F29\u8FDB\u7247\u6BB5\u7684\u7A7A\u683C\u6570\n\n/set\n\t\u4EE5 /set \u547D\u4EE4\u5F62\u5F0F\u663E\u793A\u7F16\u8F91\u5668\u3001\u542F\u52A8\u548C\u53CD\u9988\u8BBE\u7F6E\u3002\n\t\u8981\u663E\u793A\u4EE5\u4E0A\u4EFB\u610F\u9879\u7684\u8BBE\u7F6E\uFF0C\u8BF7\u5FFD\u7565 set \u503C\n\n\u8981\u83B7\u53D6\u6709\u5173\u5176\u4E2D\u4E00\u4E2A\u683C\u5F0F\u7684\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u5BF9\u6307\u5B9A\u7684\u683C\u5F0F\u4F7F\u7528 /help\u3002\n\u4F8B\u5982\uFF1A   /help /set format
+help.set =设置 jshell 工具配置信息，包括：\n要使用的外部编辑器、要使用的启动定义、新的反馈模式、\n命令提示符、要使用的反馈模式或输出的格式。\n\n/set editor [-wait] <命令> <可选参数>...\n\t指定要为 /edit 命令启动的命令。\n\t<命令> 是与操作系统相关的字符串\n\n/set start <文件>\n\t指定 <文件> 的内容将成为默认启动片段和命令\n\n/set feedback <模式>\n\t设置用于描述为所输入片段和命令显示的反馈的反馈模式\n\n/set mode <模式> [<旧模式>] -command|-quiet|-delete\n\t创建或更新用户定义的反馈模式，可以选择从现有模式复制\n\n/set prompt <模式> "<提示>" "<更多提示>"\n\t设置为给定反馈模式显示的提示符\n\n/set truncation <模式> <长度> <选择器>...\n\t设置显示值的最大长度\n\n/set format <模式> <字段> "<格式>" <选择器>...\n\t通过设置当选择器匹配时字段的格式来配置反馈模式\n\n/set indent <数字>\n\t设置应用于自动缩进片段的空格数\n\n/set\n\t以 /set 命令形式显示编辑器、启动和反馈设置。\n\t要显示以上任意项的设置，请忽略 set 值\n\n要获取有关其中一个格式的详细信息，请对指定的格式使用 /help。\n例如：   /help /set format
 
-help.quest.summary = \u83B7\u53D6\u6709\u5173\u4F7F\u7528 jshell \u5DE5\u5177\u7684\u4FE1\u606F
+help.quest.summary = 获取有关使用 jshell 工具的信息
 help.quest.args = [<command>|<subject>]
-help.quest =\u663E\u793A\u6709\u5173\u4F7F\u7528 jshell \u5DE5\u5177\u7684\u4FE1\u606F\uFF08/help \u7684\u7F29\u5199\u5F62\u5F0F\uFF09\u3002\n/?\n\t\u663E\u793A\u547D\u4EE4\u548C\u5E2E\u52A9\u4E3B\u9898\u7684\u5217\u8868\n/? <command>\n\t\u663E\u793A\u6709\u5173\u6307\u5B9A\u547D\u4EE4\u7684\u4FE1\u606F\u3002\n\t\u53EA\u9700\u8F93\u5165\u547D\u4EE4\u7684\u524D\u51E0\u4E2A\u5B57\u6BCD -- \u5982\u679C\u6709\u591A\u4E2A\n\t\u5339\u914D\u9879\uFF0C\u5219\u5C06\u663E\u793A\u6240\u6709\u9879\u3002\u793A\u4F8B\uFF1A/? /li\n/? <subject>\n\t\u663E\u793A\u6709\u5173\u6307\u5B9A\u5E2E\u52A9\u4E3B\u9898\u7684\u4FE1\u606F\u3002\u793A\u4F8B\uFF1A/? intro
+help.quest =显示有关使用 jshell 工具的信息（/help 的缩写形式）。\n/?\n\t显示命令和帮助主题的列表\n/? <command>\n\t显示有关指定命令的信息。\n\t只需输入命令的前几个字母 -- 如果有多个\n\t匹配项，则将显示所有项。示例：/? /li\n/? <subject>\n\t显示有关指定帮助主题的信息。示例：/? intro
 
-help.bang.summary = \u91CD\u65B0\u8FD0\u884C\u4E0A\u4E00\u4E2A\u7247\u6BB5 -- \u8BF7\u53C2\u9605 /help rerun
+help.bang.summary = 重新运行上一个片段 -- 请参阅 /help rerun
 help.bang.args =
-help.bang =\u91CD\u65B0\u8BC4\u4F30\u6700\u8FD1\u8F93\u5165\u7684\u7247\u6BB5\u3002
+help.bang =重新评估最近输入的片段。
 
-help.slashID.summary = \u6309 ID \u6216 ID \u8303\u56F4\u91CD\u65B0\u8FD0\u884C\u7247\u6BB5 -- \u53C2\u89C1 /help rerun
+help.slashID.summary = 按 ID 或 ID 范围重新运行片段 -- 参见 /help rerun
 help.slashID.args =
-help.slashID =/<id> <id> <id>\n\n/<id>-<id>\n\n\u91CD\u65B0\u8BC4\u4F30\u6309 ID \u6216 ID \u8303\u56F4\u6307\u5B9A\u7684\u7247\u6BB5\u3002\nID \u8303\u56F4\u4F7F\u7528\u901A\u8FC7\u8FDE\u5B57\u7B26\u5206\u9694\u7684\u4E24\u4E2A ID \u8868\u793A\uFF0C\u4F8B\u5982\uFF1A3-17\n\u53EF\u4EE5\u4F7F\u7528\u542F\u52A8\u548C\u9519\u8BEF\u7247\u6BB5\uFF0C\u4F8B\u5982\uFF1As3-s9 \u6216 e1-e4\n\u53EF\u4EE5\u4F7F\u7528\u4EFB\u610F\u6570\u91CF\u7684 ID \u6216 ID \u8303\u56F4\uFF0C\u4F8B\u5982\uFF1A/3-7 s4 14-16 e2\n\u53C2\u89C1 '/help id'\u3002
+help.slashID =/<id> <id> <id>\n\n/<id>-<id>\n\n重新评估按 ID 或 ID 范围指定的片段。\nID 范围使用通过连字符分隔的两个 ID 表示，例如：3-17\n可以使用启动和错误片段，例如：s3-s9 或 e1-e4\n可以使用任意数量的 ID 或 ID 范围，例如：/3-7 s4 14-16 e2\n参见 '/help id'。
 
-help.previous.summary = \u91CD\u65B0\u8FD0\u884C\u4EE5\u524D\u7684\u7B2C n \u4E2A\u7247\u6BB5 -- \u8BF7\u53C2\u9605 /help rerun
+help.previous.summary = 重新运行以前的第 n 个片段 -- 请参阅 /help rerun
 help.previous.args =
-help.previous =\u91CD\u65B0\u8BC4\u4F30\u6700\u8FD1\u8F93\u5165\u7684\u7B2C n \u4E2A\u7247\u6BB5\u3002
+help.previous =重新评估最近输入的第 n 个片段。
 
-help.intro.summary = jshell \u5DE5\u5177\u7684\u7B80\u4ECB
-help.intro =\u4F7F\u7528 jshell \u5DE5\u5177\u53EF\u4EE5\u6267\u884C Java \u4EE3\u7801\uFF0C\u4ECE\u800C\u7ACB\u5373\u83B7\u53D6\u7ED3\u679C\u3002\n\u60A8\u53EF\u4EE5\u8F93\u5165 Java \u5B9A\u4E49\uFF08\u53D8\u91CF\u3001\u65B9\u6CD5\u3001\u7C7B\u7B49\u7B49\uFF09\uFF0C\u4F8B\u5982\uFF1Aint x = 8\n\u6216 Java \u8868\u8FBE\u5F0F\uFF0C\u4F8B\u5982\uFF1Ax + x\n\u6216 Java \u8BED\u53E5\u6216\u5BFC\u5165\u3002\n\u8FD9\u4E9B\u5C0F\u5757\u7684 Java \u4EE3\u7801\u79F0\u4E3A\u201C\u7247\u6BB5\u201D\u3002\n\n\u8FD9\u4E9B jshell \u5DE5\u5177\u547D\u4EE4\u8FD8\u53EF\u4EE5\u8BA9\u60A8\u4E86\u89E3\u548C\n\u63A7\u5236\u60A8\u6B63\u5728\u6267\u884C\u7684\u64CD\u4F5C\uFF0C\u4F8B\u5982\uFF1A/list\n\n\u6709\u5173\u547D\u4EE4\u7684\u5217\u8868\uFF0C\u8BF7\u6267\u884C\uFF1A/help
+help.intro.summary = jshell 工具的简介
+help.intro =使用 jshell 工具可以执行 Java 代码，从而立即获取结果。\n您可以输入 Java 定义（变量、方法、类等等），例如：int x = 8\n或 Java 表达式，例如：x + x\n或 Java 语句或导入。\n这些小块的 Java 代码称为“片段”。\n\n这些 jshell 工具命令还可以让您了解和\n控制您正在执行的操作，例如：/list\n\n有关命令的列表，请执行：/help
 
-help.keys.summary = \u7C7B\u4F3C readline \u7684\u8F93\u5165\u7F16\u8F91\u7684\u8BF4\u660E
-help.keys =jshell \u5DE5\u5177\u63D0\u4F9B\u884C\u7F16\u8F91\u652F\u6301\uFF0C\u5141\u8BB8\u60A8\u5728\u7247\u6BB5\u548C\u547D\u4EE4\u4E2D\n\u5BFC\u822A\u5E76\u8FDB\u884C\u7F16\u8F91\u3002\u60A8\u53EF\u4EE5\u7F16\u8F91\u5F53\u524D\u547D\u4EE4/\u7247\u6BB5\uFF0C\u4E5F\u53EF\u4EE5\n\u4ECE\u5386\u53F2\u8BB0\u5F55\u4E2D\u68C0\u7D22\u4EE5\u524D\u7684\u547D\u4EE4/\u7247\u6BB5\uFF0C\u8FDB\u884C\u7F16\u8F91\u5E76\u6267\u884C\u3002\n\u6B64\u652F\u6301\u7C7B\u4F3C\u4E8E readline/editline\uFF0C\u5177\u6709\u4E0E emacs \u76F8\u4F3C\u7684\n\u7B80\u5355\u7ED1\u5B9A\u3002\u8FD8\u6709\u7279\u5B9A\u4E8E jshell \u5DE5\u5177\u7684\u5173\u952E\u5B57\u5E8F\u5217\u3002\n\n\u884C\u548C\u5386\u53F2\u8BB0\u5F55\u5BFC\u822A\uFF1A\n\n\tReturn\n\t\t\u8F93\u5165\u5F53\u524D\u7247\u6BB5\n\t\u5DE6\u7BAD\u5934\u6216 Ctrl+B\n\t\t\u5411\u540E\u79FB\u52A8\u4E00\u4E2A\u5B57\u7B26\n\t\u53F3\u7BAD\u5934\u6216 Ctrl+F\n\t\t\u5411\u524D\u79FB\u52A8\u4E00\u4E2A\u5B57\u7B26\n\t\u4E0A\u7BAD\u5934\u6216 Ctrl+P\n\t\t\u5411\u4E0A\u79FB\u52A8\u4E00\u884C\uFF0C\u5411\u540E\u6D4F\u89C8\u5386\u53F2\u8BB0\u5F55\n\t\u4E0B\u7BAD\u5934\u6216 Ctrl+N\n\t\t\u5411\u4E0B\u79FB\u52A8\u4E00\u884C\uFF0C\u5411\u524D\u6D4F\u89C8\u5386\u53F2\u8BB0\u5F55\n\tCtrl+A\n\t\t\u79FB\u81F3\u884C\u7684\u5F00\u5934\n\tCtrl+E\n\t\t\u79FB\u81F3\u884C\u7684\u7ED3\u5C3E\n\tMeta+B\n\t\t\u5411\u540E\u79FB\u52A8\u4E00\u4E2A\u5355\u8BCD\n\tMeta+F\n\t\t\u5411\u524D\u79FB\u52A8\u4E00\u4E2A\u5355\u8BCD\n\tCtrl+R\n\t\t\u5411\u540E\u641C\u7D22\u5386\u53F2\u8BB0\u5F55\n\n\n\u884C\u548C\u5386\u53F2\u8BB0\u5F55\u57FA\u672C\u7F16\u8F91\uFF1A\n\n\tMeta+Return \u6216 Ctrl+Return\uFF08\u6839\u636E\u5E73\u53F0\uFF09\n\t\t\u5728\u7247\u6BB5\u4E2D\u63D2\u5165\u65B0\u884C\n\tCtrl+_\uFF08\u4E0B\u5212\u7EBF\u53EF\u80FD\u9700\u8981 Shift \u952E\uFF09\u6216 Ctrl+X \u7136\u540E Ctrl+U\n\t\t\u64A4\u6D88\u7F16\u8F91 - \u91CD\u590D\u64CD\u4F5C\u53EF\u64A4\u6D88\u591A\u9879\u7F16\u8F91\n\tDelete\n\t\t\u5220\u9664\u5149\u6807\u5904\u6216\u5176\u540E\u9762\u7684\u5B57\u7B26\uFF0C\u5177\u4F53\u53D6\u51B3\u4E8E\u64CD\u4F5C\u7CFB\u7EDF\n\tBackspace\n\t\t\u5220\u9664\u5149\u6807\u524D\u9762\u7684\u5B57\u7B26\n\tCtrl+K\n\t\t\u5220\u9664\u4ECE\u5149\u6807\u5230\u884C\u7ED3\u5C3E\u7684\u6587\u672C\n\tMeta+D\n\t\t\u5220\u9664\u4ECE\u5149\u6807\u5230\u5355\u8BCD\u7ED3\u5C3E\u7684\u6587\u672C\n\tCtrl+W\n\t\t\u5220\u9664\u4ECE\u5149\u6807\u5230\u524D\u4E00\u4E2A\u7A7A\u683C\u7684\u6587\u672C\n\tCtrl+Y\n\t\t\u5C06\u6700\u8FD1\u5220\u9664\u7684\u6587\u672C\u7C98\u8D34\u5230\u884C\u4E2D\n\tMeta+Y\n\t\t\u5728\u6309 Ctrl+Y \u4E4B\u540E\uFF0C\u6309 Meta+Y \u53EF\u5FAA\u73AF\u6D4F\u89C8\u5148\u524D\u5220\u9664\u7684\u6587\u672C\n\tCtrl+X \u7136\u540E Ctrl+K\n\t\t\u5220\u9664\u6574\u4E2A\u7247\u6BB5\n\n\njshell \u5DE5\u5177\u7684\u5FEB\u6377\u65B9\u5F0F\uFF1A\n\n\t\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u9605\uFF1A/help \u5FEB\u6377\u65B9\u5F0F\n\n\tTab\n\t\t\u5B8C\u6210 Java \u6807\u8BC6\u7B26\u6216 jshell \u547D\u4EE4\n\tShift+Tab \u7136\u540E v\n\t\t\u5C06\u8868\u8FBE\u5F0F\u8F6C\u6362\u4E3A\u53D8\u91CF\u58F0\u660E\n\tShift+Tab \u7136\u540E m\n\t\t\u5C06\u8BED\u53E5\u8F6C\u6362\u4E3A\u65B9\u6CD5\u58F0\u660E\n\tShift+Tab \u7136\u540E i\n\t\t\u4E3A\u6B64\u6807\u8BC6\u7B26\u6DFB\u52A0\u5BFC\u5165\n\t\n\n\u591A\u884C\u548C\u5386\u53F2\u8BB0\u5F55\u7F16\u8F91\uFF1A\n\n\tCtrl+L\n\t\t\u6E05\u9664\u5C4F\u5E55\u5E76\u91CD\u65B0\u8F93\u51FA\u7247\u6BB5\n\tCtrl+U\n\t\t\u7EC8\u6B62\u6574\u884C\n\tCtrl+T\n\t\t\u8F6C\u7F6E\u5B57\u7B26\n\tCtrl+X \u7136\u540E Ctrl+B\n\t\t\u5BFC\u822A\u5230\u5339\u914D\u7684\u65B9\u62EC\u53F7\u3001\u62EC\u53F7 ...\n\tCtrl+X \u7136\u540E =\n\t\t\u8FDB\u5165\u663E\u793A\u5F53\u524D\u5B57\u7B26\u4F4D\u7F6E\u7684\u6A21\u5F0F\n\tCtrl+X \u7136\u540E \
-Ctrl+O\n\t\t\u5728\u8986\u76D6\u5B57\u7B26\u4E0E\u63D2\u5165\u5B57\u7B26\u4E4B\u95F4\u5207\u6362\n\tMeta+C\n\t\t\u5355\u8BCD\u9996\u5B57\u6BCD\u5927\u5199\n\tMeta+U\n\t\t\u5C06\u5355\u8BCD\u8F6C\u6362\u4E3A\u5927\u5199\n\tMeta+L\n\t\t\u5C06\u5355\u8BCD\u8F6C\u6362\u4E3A\u5C0F\u5199\n\tMeta+0 \u81F3 Meta+9 \u7136\u540E\u952E\n\t\t\u91CD\u590D\u6307\u5B9A\u6B21\u6570\n\n\u4F8B\u5982 "Ctrl+A" \u8868\u793A\u6309\u4F4F Ctrl \u952E\u5E76\u6309 A\u3002\n\u5176\u4E2D "Meta" \u5728\u8BB8\u591A\u952E\u76D8\u4E0A\u662F "Alt"\u3002\n\u884C\u7F16\u8F91\u652F\u6301\u6E90\u81EA JLine 3\u3002
+help.keys.summary = 类似 readline 的输入编辑的说明
+help.keys =jshell 工具提供行编辑支持，允许您在片段和命令中\n导航并进行编辑。您可以编辑当前命令/片段，也可以\n从历史记录中检索以前的命令/片段，进行编辑并执行。\n此支持类似于 readline/editline，具有与 emacs 相似的\n简单绑定。还有特定于 jshell 工具的关键字序列。\n\n行和历史记录导航：\n\n\tReturn\n\t\t输入当前片段\n\t左箭头或 Ctrl+B\n\t\t向后移动一个字符\n\t右箭头或 Ctrl+F\n\t\t向前移动一个字符\n\t上箭头或 Ctrl+P\n\t\t向上移动一行，向后浏览历史记录\n\t下箭头或 Ctrl+N\n\t\t向下移动一行，向前浏览历史记录\n\tCtrl+A\n\t\t移至行的开头\n\tCtrl+E\n\t\t移至行的结尾\n\tMeta+B\n\t\t向后移动一个单词\n\tMeta+F\n\t\t向前移动一个单词\n\tCtrl+R\n\t\t向后搜索历史记录\n\n\n行和历史记录基本编辑：\n\n\tMeta+Return 或 Ctrl+Return（根据平台）\n\t\t在片段中插入新行\n\tCtrl+_（下划线可能需要 Shift 键）或 Ctrl+X 然后 Ctrl+U\n\t\t撤消编辑 - 重复操作可撤消多项编辑\n\tDelete\n\t\t删除光标处或其后面的字符，具体取决于操作系统\n\tBackspace\n\t\t删除光标前面的字符\n\tCtrl+K\n\t\t删除从光标到行结尾的文本\n\tMeta+D\n\t\t删除从光标到单词结尾的文本\n\tCtrl+W\n\t\t删除从光标到前一个空格的文本\n\tCtrl+Y\n\t\t将最近删除的文本粘贴到行中\n\tMeta+Y\n\t\t在按 Ctrl+Y 之后，按 Meta+Y 可循环浏览先前删除的文本\n\tCtrl+X 然后 Ctrl+K\n\t\t删除整个片段\n\n\njshell 工具的快捷方式：\n\n\t有关详细信息，请参阅：/help 快捷方式\n\n\tTab\n\t\t完成 Java 标识符或 jshell 命令\n\tShift+Tab 然后 v\n\t\t将表达式转换为变量声明\n\tShift+Tab 然后 m\n\t\t将语句转换为方法声明\n\tShift+Tab 然后 i\n\t\t为此标识符添加导入\n\t\n\n多行和历史记录编辑：\n\n\tCtrl+L\n\t\t清除屏幕并重新输出片段\n\tCtrl+U\n\t\t终止整行\n\tCtrl+T\n\t\t转置字符\n\tCtrl+X 然后 Ctrl+B\n\t\t导航到匹配的方括号、括号 ...\n\tCtrl+X 然后 =\n\t\t进入显示当前字符位置的模式\n\tCtrl+X 然后 \
+Ctrl+O\n\t\t在覆盖字符与插入字符之间切换\n\tMeta+C\n\t\t单词首字母大写\n\tMeta+U\n\t\t将单词转换为大写\n\tMeta+L\n\t\t将单词转换为小写\n\tMeta+0 至 Meta+9 然后键\n\t\t重复指定次数\n\n例如 "Ctrl+A" 表示按住 Ctrl 键并按 A。\n其中 "Meta" 在许多键盘上是 "Alt"。\n行编辑支持源自 JLine 3。
 
-help.shortcuts.summary = \u7247\u6BB5\u548C\u547D\u4EE4\u8F93\u5165\u63D0\u793A, \u4FE1\u606F\u8BBF\u95EE\u4EE5\u53CA\n\u81EA\u52A8\u4EE3\u7801\u751F\u6210\u7684\u6309\u952E\u8BF4\u660E
-help.shortcuts =\u652F\u6301\u7684\u5FEB\u6377\u65B9\u5F0F\u5305\u62EC\uFF1A\n\n\tTab\n\t\t\u5728\u8F93\u5165 Java \u6807\u8BC6\u7B26\u3001jshell \u5DE5\u5177\u547D\u4EE4\u6216\n\t\t\u5728\u67D0\u4E9B\u60C5\u51B5\u4E0B\u8F93\u5165 jshell \u5DE5\u5177\u547D\u4EE4\u53C2\u6570\u7684\n\t\t\u524D\u51E0\u4E2A\u5B57\u6BCD\u540E\uFF0C\u6309 Tab \u952E\u53EF\u4EE5\u5B8C\u6210\u8F93\u5165\u3002\n\t\t\u5982\u679C\u6709\u591A\u4E2A\u8F93\u5165\u63D0\u793A\uFF0C\u5C06\u663E\u793A\u53EF\u80FD\u7684\u8F93\u5165\u63D0\u793A\u3002\n\t\t\u518D\u6309\u4E00\u6B21 Tab \u5C06\u663E\u793A\u53EF\u7528\u7684\u9002\u7528\u6587\u6863\u3002\n\n\tShift+Tab \u7136\u540E v\n\t\t\u5728\u5B8C\u6574\u7684\u8868\u8FBE\u5F0F\u540E\u9762\uFF0C\u6309\u4F4F Tab \u952E\u7684\u540C\u65F6\n\t\t\u6309\u4E0B Shift \u952E\uFF0C\u7136\u540E\u91CA\u653E\u5E76\u6309 "v" \u952E\uFF0C\u8868\u8FBE\u5F0F\n\t\t\u5C06\u8F6C\u6362\u4E3A\u7C7B\u578B\u57FA\u4E8E\u8868\u8FBE\u5F0F\u7C7B\u578B\u7684\u53D8\u91CF\u58F0\u660E\u3002\n\n\tShift+Tab \u7136\u540E m\n\t\t\u5B8C\u6210\u8868\u8FBE\u5F0F\u6216\u8BED\u53E5\u4E4B\u540E\uFF0C\u6309\u4F4F Tab \u952E\u7684\u540C\u65F6\n\t\t\u6309\u4E0B Shift \u952E\uFF0C\u7136\u540E\u91CA\u653E\u5E76\u6309\u4F4F "m" \u952E\uFF0C\u8868\u8FBE\u5F0F\u6216\n\t\t\u8BED\u53E5\u5C06\u8F6C\u6362\u4E3A\u65B9\u6CD5\u58F0\u660E\u3002\u5982\u679C\u662F\u8868\u8FBE\u5F0F\uFF0C\n\t\t\u5219\u65B9\u6CD5\u8FD4\u56DE\u7C7B\u578B\u57FA\u4E8E\u8868\u8FBE\u5F0F\u7684\u7C7B\u578B\u3002\n\n\tShift+Tab \u7136\u540E i\n\t\t\u5728\u4E0D\u53EF\u89E3\u6790\u7684\u6807\u8BC6\u7B26\u540E\u9762\uFF0C\u6309\u4F4F Tab \u952E\u7684\u540C\u65F6\n\t\t\u6309\u4E0B Shift \u952E\uFF0C\u7136\u540E\u91CA\u653E\u5E76\u6309 "i" \u952E\uFF0Cjshell \u5DE5\u5177\u4F1A\n\t\t\u63A8\u8350\u53EF\u80FD\u7684\u5BFC\u5165\u9879\uFF0C\u4EE5\u57FA\u4E8E\u6307\u5B9A\u7C7B\u8DEF\u5F84\u7684\u5185\u5BB9\u89E3\u6790\u6807\u8BC6\u7B26\u3002\n\t\t\u8F93\u5165\u4E0E\u6240\u9700\u5BFC\u5165\u5BF9\u5E94\u7684\u6570\u5B57\uFF0C\u6216\u6309 "0" \u952E\u4E0D\u6DFB\u52A0\u5BFC\u5165\u9879\u3002\n\n\u6709\u5173\u7279\u6B8A\u952E\u7684\u4FE1\u606F\uFF0C\u8BF7\u53C2\u9605\uFF1A/help \u952E
+help.shortcuts.summary = 片段和命令输入提示, 信息访问以及\n自动代码生成的按键说明
+help.shortcuts =支持的快捷方式包括：\n\n\tTab\n\t\t在输入 Java 标识符、jshell 工具命令或\n\t\t在某些情况下输入 jshell 工具命令参数的\n\t\t前几个字母后，按 Tab 键可以完成输入。\n\t\t如果有多个输入提示，将显示可能的输入提示。\n\t\t再按一次 Tab 将显示可用的适用文档。\n\n\tShift+Tab 然后 v\n\t\t在完整的表达式后面，按住 Tab 键的同时\n\t\t按下 Shift 键，然后释放并按 "v" 键，表达式\n\t\t将转换为类型基于表达式类型的变量声明。\n\n\tShift+Tab 然后 m\n\t\t完成表达式或语句之后，按住 Tab 键的同时\n\t\t按下 Shift 键，然后释放并按住 "m" 键，表达式或\n\t\t语句将转换为方法声明。如果是表达式，\n\t\t则方法返回类型基于表达式的类型。\n\n\tShift+Tab 然后 i\n\t\t在不可解析的标识符后面，按住 Tab 键的同时\n\t\t按下 Shift 键，然后释放并按 "i" 键，jshell 工具会\n\t\t推荐可能的导入项，以基于指定类路径的内容解析标识符。\n\t\t输入与所需导入对应的数字，或按 "0" 键不添加导入项。\n\n有关特殊键的信息，请参阅：/help 键
 
-help.context.summary = /env /reload \u548C /reset \u7684\u8BC4\u4F30\u4E0A\u4E0B\u6587\u9009\u9879\u7684\u8BF4\u660E
-help.context =\u8FD9\u4E9B\u9009\u9879\u7528\u4E8E\u914D\u7F6E\u8BC4\u4F30\u4E0A\u4E0B\u6587\u3002\u5B83\u4EEC\u53EF\u4EE5\u5728\u542F\u52A8 jshell \u5DE5\u5177\u65F6\n\u5728\u547D\u4EE4\u884C\u4E0A\u6307\u5B9A\uFF0C\u6216\u8005\u5728\u4F7F\u7528\u547D\u4EE4 /env\u3001/reload \u6216 /reset \n\u91CD\u65B0\u542F\u52A8 jshell \u5DE5\u5177\u65F6\u4F5C\u4E3A\u547D\u4EE4\u9009\u9879\u6307\u5B9A\u3002\n\n\u5B83\u4EEC\u662F\uFF1A\n\t--class-path <\u8DEF\u5F84>\n\t\t<\u8DEF\u5F84> \u662F\u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u76EE\u5F55\u3001\n\t\tJAR \u6863\u6848\u548C ZIP \u6863\u6848\u7684\u5217\u8868\u3002\n\t\t\u5BF9\u4E8E Windows\uFF0C\u4F7F\u7528\u5206\u53F7 (;) \u5206\u9694\u8DEF\u5F84\u4E2D\u7684\u9879\u3002\n\t\t\u5728\u5176\u4ED6\u5E73\u53F0\u4E0A\uFF0C\u4F7F\u7528\u5192\u53F7 (:) \u5206\u9694\u5404\u9879\u3002\n\t--module-path <\u8DEF\u5F84>...\n\t\t<\u8DEF\u5F84> \u662F\u7528\u4E8E\u641C\u7D22\u6A21\u5757\u7684\u76EE\u5F55\u3001\n\t\tJAR \u6863\u6848\u548C ZIP \u6863\u6848\u7684\u5217\u8868\u3002\n\t\t\u5BF9\u4E8E Windows\uFF0C\u4F7F\u7528\u5206\u53F7 (;) \u5206\u9694\u8DEF\u5F84\u4E2D\u7684\u9879\u3002\n\t\t\u5728\u5176\u4ED6\u5E73\u53F0\u4E0A\uFF0C\u4F7F\u7528\u5192\u53F7 (:) \u5206\u9694\u5404\u9879\u3002\n\t--add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n\t\t\u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757\u3002\n\t\t<\u6A21\u5757\u540D\u79F0> \u8FD8\u53EF\u4EE5\u662F ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n\t\tALL-MODULE-PATH\u3002\n\t--add-exports <\u6A21\u5757>/<\u7A0B\u5E8F\u5305>=<\u76EE\u6807\u6A21\u5757>(,<\u76EE\u6807\u6A21\u5757>)*\n\t\t\u66F4\u65B0 <\u6A21\u5757> \u4EE5\u5C06 <\u7A0B\u5E8F\u5305> \u5BFC\u51FA\u5230 <\u76EE\u6807\u6A21\u5757>\uFF0C\n\t\t\u800C\u65E0\u8BBA\u6A21\u5757\u58F0\u660E\u5982\u4F55\u3002\n\t\t<\u76EE\u6807\u6A21\u5757> \u53EF\u4EE5\u662F ALL-UNNAMED \u4EE5\u5BFC\u51FA\u5230\u5168\u90E8\n\t\t\u672A\u547D\u540D\u6A21\u5757\u3002\u5728 jshell \u4E2D\uFF0C\u5982\u679C\u672A\u6307\u5B9A \n\t\t<\u76EE\u6807\u6A21\u5757> (no =)\uFF0C\u5219\u4F7F\u7528 ALL-UNNAMED\u3002\n\n\u9664\u975E\u8F93\u5165\u7684\u9009\u9879\u8986\u76D6\u4E86\u8BBE\u7F6E\uFF0C\u5426\u5219\u5728\u547D\u4EE4\u884C\u4E0A\u8F93\u5165\u7684\n\u6216\u8005\u4F7F\u7528\u4EE5\u524D\u7684 /reset\u3001/env \u6216 /reload \u547D\u4EE4\u63D0\u4F9B\u7684\n\u8BC4\u4F30\u4E0A\u4E0B\u6587\u9009\u9879\u5C06\u4F1A\u4FDD\u7559\u3002\n\n\u5728\u547D\u4EE4\u884C\u4E0A\uFF0C\u8FD9\u4E9B\u9009\u9879\u5FC5\u987B\u5177\u6709\u4E24\u4E2A\u77ED\u5212\u7EBF\uFF0C\u4F8B\u5982\uFF1A--module-path\n\u5728 jshell \u5DE5\u5177\u547D\u4EE4\u4E0A\uFF0C\u5B83\u4EEC\u5FC5\u987B\u5177\u6709\u4E00\u4E2A\u6216\u4E24\u4E2A\u77ED\u5212\u7EBF\uFF0C\u4F8B\u5982\uFF1A-module-path
+help.context.summary = /env /reload 和 /reset 的评估上下文选项的说明
+help.context =这些选项用于配置评估上下文。它们可以在启动 jshell 工具时\n在命令行上指定，或者在使用命令 /env、/reload 或 /reset \n重新启动 jshell 工具时作为命令选项指定。\n\n它们是：\n\t--class-path <路径>\n\t\t<路径> 是用于搜索类文件的目录、\n\t\tJAR 档案和 ZIP 档案的列表。\n\t\t对于 Windows，使用分号 (;) 分隔路径中的项。\n\t\t在其他平台上，使用冒号 (:) 分隔各项。\n\t--module-path <路径>...\n\t\t<路径> 是用于搜索模块的目录、\n\t\tJAR 档案和 ZIP 档案的列表。\n\t\t对于 Windows，使用分号 (;) 分隔路径中的项。\n\t\t在其他平台上，使用冒号 (:) 分隔各项。\n\t--add-modules <模块名称>[,<模块名称>...]\n\t\t除了初始模块之外要解析的根模块。\n\t\t<模块名称> 还可以是 ALL-DEFAULT、ALL-SYSTEM、\n\t\tALL-MODULE-PATH。\n\t--add-exports <模块>/<程序包>=<目标模块>(,<目标模块>)*\n\t\t更新 <模块> 以将 <程序包> 导出到 <目标模块>，\n\t\t而无论模块声明如何。\n\t\t<目标模块> 可以是 ALL-UNNAMED 以导出到全部\n\t\t未命名模块。在 jshell 中，如果未指定 \n\t\t<目标模块> (no =)，则使用 ALL-UNNAMED。\n\n除非输入的选项覆盖了设置，否则在命令行上输入的\n或者使用以前的 /reset、/env 或 /reload 命令提供的\n评估上下文选项将会保留。\n\n在命令行上，这些选项必须具有两个短划线，例如：--module-path\n在 jshell 工具命令上，它们必须具有一个或两个短划线，例如：-module-path
 
-help.id.summary = \u7247\u6BB5 ID \u4EE5\u53CA\u5982\u4F55\u4F7F\u7528\u5B83\u4EEC\u7684\u8BF4\u660E
-help.id =\u8F93\u5165\u7684\u6BCF\u4E2A\u4EE3\u7801\u7247\u6BB5\u6709\u81EA\u5DF1\u7684\u552F\u4E00\u7247\u6BB5 ID\u3002\u5373\u4F7F\u518D\u6B21\n\u8F93\u5165\u76F8\u540C\u7684\u7247\u6BB5\uFF0C\u5B83\u90FD\u4F1A\u5177\u6709\u65B0 ID\u3002\u5BF9\u4E8E\u666E\u901A\u7247\u6BB5\uFF0CID\n\u662F\u4E00\u4E2A\u589E\u957F\u7684\u7F16\u53F7\u3002\u5BF9\u4E8E\u5931\u8D25\u4E14\u51FA\u9519\u7684\u7247\u6BB5\uFF0C\u5176\u7247\u6BB5 ID\n\u4EE5 "e" \u5F00\u5934\u3002\u5BF9\u4E8E\u542F\u52A8\u4E2D\u7684\u7247\u6BB5\uFF0C\u5176 ID \u4EE5 "s" \u5F00\u5934\u3002\n\n\u7247\u6BB5 ID \u662F\u5728\u547D\u4EE4\u4E2D\u5F15\u7528\u7247\u6BB5\u7684\u4E00\u79CD\u65B9\u6CD5\u3002\u4F8B\u5982\uFF0C\n\u6B64\u547D\u4EE4\u5220\u9664 ID \u4E3A '14' \u7684\u7247\u6BB5\uFF1A\n\n\t/drop 14\n\n\u8981\u67E5\u770B\u4E00\u4E2A\u6216\u591A\u4E2A\u7247\u6BB5\u7684 ID\uFF0C\u8BF7\u4F7F\u7528 '/list' \u547D\u4EE4\u3002\u8981\u67E5\u770B\u6240\u6709\n\u7247\u6BB5\u7684 ID\uFF0C\u5305\u62EC\u5931\u8D25\u7247\u6BB5\u3001\u542F\u52A8\u7247\u6BB5\u548C\u8986\u76D6\u7247\u6BB5\uFF0C\u8BF7\u4F7F\u7528\n'/list -all' \u547D\u4EE4\u3002\n\n\u60A8\u8FD8\u53EF\u4EE5\u4F7F\u7528\u8FDE\u5B57\u7B26\u5206\u9694\u5F00\u59CB ID \u548C\u7ED3\u675F ID\uFF0C\n\u4EE5\u6B64\u6765\u5F15\u7528 ID \u8303\u56F4\u3002\u4F8B\u5982\uFF0C'1-4' \u4E0E '1 2 3 4' \u76F8\u540C\u3002\n\u5F15\u7528\u7247\u6BB5\u7684\u6240\u6709\u547D\u4EE4\u5C06\u83B7\u53D6 ID\u3001ID \u8303\u56F4\u4EE5\u53CA\u7247\u6BB5\u540D\u79F0\u7684\n\u5217\u8868\u4F5C\u4E3A\u53C2\u6570\u3002\u8FD9\u4E9B\u547D\u4EE4\u5305\u62EC\uFF1A/list\u3001/edit\u3001/drop\u3001/save\u3001/vars\u3001/methods\u3001\n/types \u548C /<id>\u3002\u4E00\u4E9B\u793A\u4F8B\uFF1A\n\n\t/edit 7-23\n\n\t/save s1-s4 3-8 foo 12 myfile\n\n\t/9-12 33\n\n\u5206\u522B\u53C2\u89C1 '/help /edit'\u3001'/help /save' \u548C '/help rerun'\u3002
+help.id.summary = 片段 ID 以及如何使用它们的说明
+help.id =输入的每个代码片段有自己的唯一片段 ID。即使再次\n输入相同的片段，它都会具有新 ID。对于普通片段，ID\n是一个增长的编号。对于失败且出错的片段，其片段 ID\n以 "e" 开头。对于启动中的片段，其 ID 以 "s" 开头。\n\n片段 ID 是在命令中引用片段的一种方法。例如，\n此命令删除 ID 为 '14' 的片段：\n\n\t/drop 14\n\n要查看一个或多个片段的 ID，请使用 '/list' 命令。要查看所有\n片段的 ID，包括失败片段、启动片段和覆盖片段，请使用\n'/list -all' 命令。\n\n您还可以使用连字符分隔开始 ID 和结束 ID，\n以此来引用 ID 范围。例如，'1-4' 与 '1 2 3 4' 相同。\n引用片段的所有命令将获取 ID、ID 范围以及片段名称的\n列表作为参数。这些命令包括：/list、/edit、/drop、/save、/vars、/methods、\n/types 和 /<id>。一些示例：\n\n\t/edit 7-23\n\n\t/save s1-s4 3-8 foo 12 myfile\n\n\t/9-12 33\n\n分别参见 '/help /edit'、'/help /save' 和 '/help rerun'。
 
-help.rerun.summary = \u91CD\u65B0\u8BC4\u4F30\u4EE5\u524D\u8F93\u5165\u7247\u6BB5\u7684\u65B9\u6CD5\u7684\u8BF4\u660E
-help.rerun =\u91CD\u65B0\u8BC4\u4F30\u4EE5\u524D\u8F93\u5165\u7684\u7247\u6BB5\u6709\u56DB\u79CD\u65B9\u6CD5\u3002\n\u53EF\u4F7F\u7528\u4EE5\u4E0B\u65B9\u6CD5\u91CD\u65B0\u8BC4\u4F30\u4E0A\u4E00\u4E2A\u7247\u6BB5\uFF1A/!\n\u53EF\u4EE5\u4F7F\u7528\u659C\u6760\u52A0\u51CF\u53F7\u52A0\u6570\u5B57 n \u7684\u65B9\u5F0F\u6765\u91CD\u65B0\u8BC4\u4F30\u4E4B\u524D\u7684\u7B2C n \u4E2A\u7247\u6BB5\uFF0C\u4F8B\u5982\uFF1A/-4\n\u4F8B\u5982\uFF1A\n\n\tjshell> 2 + 2\n\t$1 ==> 4\n\n\tjshell> /!\n\t2 + 2\n\t$2 ==> 4\n\n\tjshell> int z\n\tz ==> 0\n\n\tjshell> /-1\n\tint z;\n\tz ==> 0\n\n\tjshell> /-4\n\t2 + 2\n\t$5 ==> 4\n\n\u53EF\u4EE5\u4F7F\u7528\u7247\u6BB5 ID \u6216 ID \u8303\u56F4\u6307\u5B9A\u8981\u91CD\u65B0\u8BC4\u4F30\u7684\u7247\u6BB5\u3002\nID \u8303\u56F4\u4F7F\u7528\u8FDE\u5B57\u7B26\u5206\u9694\u7684\u4E24\u4E2A ID \u8868\u793A\uFF0C\u4F8B\u5982\uFF1A3-17\n\u53EF\u4EE5\u4F7F\u7528\u542F\u52A8\u548C\u9519\u8BEF\u7247\u6BB5\uFF0C\u4F8B\u5982\uFF1As3-s9 \u6216 e1-e4\n\u53EF\u4EE5\u4F7F\u7528\u4EFB\u610F\u6570\u91CF\u7684 ID \u6216 ID \u8303\u56F4\uFF0C\u4F8B\u5982\uFF1A/3-7 s4 14-16 e2\n\u53E6\u8BF7\u53C2\u89C1 '/help id'\u3002\n\n\u6700\u540E\uFF0C\u53EF\u4EE5\u901A\u8FC7\u8F93\u5165 Ctrl+R \u540E\u8DDF\u8981\u641C\u7D22\u7684\u5B57\u7B26\u4E32\uFF0C\u5728\u5386\u53F2\u8BB0\u5F55\u4E2D\u5411\u540E\u641C\u7D22\u3002
+help.rerun.summary = 重新评估以前输入片段的方法的说明
+help.rerun =重新评估以前输入的片段有四种方法。\n可使用以下方法重新评估上一个片段：/!\n可以使用斜杠加减号加数字 n 的方式来重新评估之前的第 n 个片段，例如：/-4\n例如：\n\n\tjshell> 2 + 2\n\t$1 ==> 4\n\n\tjshell> /!\n\t2 + 2\n\t$2 ==> 4\n\n\tjshell> int z\n\tz ==> 0\n\n\tjshell> /-1\n\tint z;\n\tz ==> 0\n\n\tjshell> /-4\n\t2 + 2\n\t$5 ==> 4\n\n可以使用片段 ID 或 ID 范围指定要重新评估的片段。\nID 范围使用连字符分隔的两个 ID 表示，例如：3-17\n可以使用启动和错误片段，例如：s3-s9 或 e1-e4\n可以使用任意数量的 ID 或 ID 范围，例如：/3-7 s4 14-16 e2\n另请参见 '/help id'。\n\n最后，可以通过输入 Ctrl+R 后跟要搜索的字符串，在历史记录中向后搜索。
 
-help.set._retain = '-retain' \u9009\u9879\u4FDD\u5B58\u8BBE\u7F6E\u4EE5\u4FBF\u5728\u5C06\u6765\u4F1A\u8BDD\u4E2D\u4F7F\u7528\u3002\n\u53EF\u4EE5\u5728 /set \u7684\u4EE5\u4E0B\u683C\u5F0F\u4E2D\u4F7F\u7528 -retain \u9009\u9879:\n\n\t/set editor -retain\n\t/set start -retain\n\t/set feedback -retain\n\t/set mode -retain\n\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u8FD9\u4E9B\u547D\u4EE4 -- \u4F8B\u5982, /help /set editor
+help.set._retain = '-retain' 选项保存设置以便在将来会话中使用。\n可以在 /set 的以下格式中使用 -retain 选项:\n\n\t/set editor -retain\n\t/set start -retain\n\t/set feedback -retain\n\t/set mode -retain\n\n有关详细信息, 请参阅这些命令 -- 例如, /help /set editor
 
-help.set.format.summary = \u8BBE\u7F6E\u7528\u4E8E\u62A5\u544A\u7247\u6BB5\u4E8B\u4EF6\u7684\u683C\u5F0F
+help.set.format.summary = 设置用于报告片段事件的格式
 
-help.set.format = \u8BBE\u7F6E\u7528\u4E8E\u62A5\u544A\u7247\u6BB5\u4E8B\u4EF6\u7684\u683C\u5F0F\uFF1A\n\n\t/set format <\u6A21\u5F0F> <\u5B57\u6BB5> "<\u683C\u5F0F>" <\u9009\u62E9\u5668>...\n\n\u663E\u793A\u683C\u5F0F\u8BBE\u7F6E:\n\n\t/set format [<\u6A21\u5F0F> [<\u5B57\u6BB5>]]\n\n\u5176\u4E2D <\u6A21\u5F0F> \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0 -- \u8BF7\u53C2\u9605 '/help /set mode'\u3002\n\u5176\u4E2D <\u5B57\u6BB5> \u662F\u8981\u5B9A\u4E49\u7684\u4E0A\u4E0B\u6587\u7279\u5B9A\u683C\u5F0F\u7684\u540D\u79F0\u3002\n\u5176\u4E2D <\u683C\u5F0F> \u662F\u4E00\u4E2A\u5E26\u5F15\u53F7\u7684\u5B57\u7B26\u4E32, \u8BE5\u5B57\u7B26\u4E32\u5C06\u4E3A\n\u5B57\u6BB5\u7684\u503C (\u5982\u679C\u9009\u62E9\u5668\u5339\u914D, \u6216\u8005\u6CA1\u6709\u4EFB\u4F55\u9009\u62E9\u5668)\u3002\n\u5728\u4F7F\u7528\u683C\u5F0F\u65F6, \u7528\u5927\u62EC\u53F7\u62EC\u8D77\u7684\u5B57\u6BB5\u540D\u5C06\u4F1A\u5728\u76F8\u5E94\u65F6\u95F4\n\u4F7F\u7528\u5B57\u6BB5\u503C\u66FF\u6362\u3002\u8FD9\u4E9B\u5B57\u6BB5\u53EF\u80FD\u5DF2\u4F7F\u7528\u6B64\u547D\u4EE4\u5B9A\u4E49, \n\u4E5F\u53EF\u80FD\u662F\u7279\u5B9A\u4E8E\u4E0A\u4E0B\u6587\u7684\u4EE5\u4E0B\u9884\u5B9A\u4E49\u5B57\u6BB5\u4E4B\u4E00:\n\t{name}       == \u540D\u79F0, \u4F8B\u5982: \u53D8\u91CF\u7684\u540D\u79F0, ...\n\t{type}       == \u7C7B\u578B\u540D\u79F0\u3002\u53D8\u91CF\u6216\u8868\u8FBE\u5F0F\u7684\u7C7B\u578B,\n\t\t\t\u65B9\u6CD5\u7684\u53C2\u6570\u7C7B\u578B\n\t{value}      == \u8868\u8FBE\u5F0F\u6216\u53D8\u91CF\u521D\u59CB\u5316\u7684\u7ED3\u679C\u503C\n\t{unresolved} == \u672A\u89E3\u6790\u5F15\u7528\u7684\u5217\u8868\n\t{errors}     == \u53EF\u6062\u590D\u9519\u8BEF\u7684\u5217\u8868 (\u53EA\u5728\u5904\u7406\n\t\t\t"display" \u5B57\u6BB5\u671F\u95F4)\n\t{err}        == \u65E0\u683C\u5F0F\u7684\u9519\u8BEF\u884C (\u53EA\u5728\u5904\u7406\n\t\t\t"errorline" \u5B57\u6BB5\u671F\u95F4)\n\u8BE5\u5DE5\u5177\u8BBF\u95EE\u4EE5\u4E0B\u5B57\u6BB5\u6765\u786E\u5B9A\u6240\u663E\u793A\u7684\u53CD\u9988:\n\t{display}    == \u4E3A\u7247\u6BB5\u4E8B\u4EF6\u663E\u793A\u7684\u6D88\u606F\n\t{errorline}  == "errors" \u5B57\u6BB5\u4E2D\u7684\u4E00\u4E2A\u9519\u8BEF\u884C\u7684\u683C\u5F0F\n\t{pre}        == \u53CD\u9988\u524D\u7F00 (\u4F5C\u4E3A\u547D\u4EE4\u53CD\u9988\u7684\u5F00\u5934)\n\t{post}       == \u53CD\u9988\u540E\u7F00 (\u4F5C\u4E3A\u547D\u4EE4\u53CD\u9988\u7684\u7ED3\u5C3E)\n\t{errorpre}   == \u9519\u8BEF\u524D\u7F00 (\u4F5C\u4E3A\u9519\u8BEF\u53CD\u9988\u7684\u5F00\u5934)\n\t{errorpost}  == \u9519\u8BEF\u540E\u7F00 (\u4F5C\u4E3A\u9519\u8BEF\u53CD\u9988\u7684\u7ED3\u5C3E)\n\u8FD9\u4E9B\u5B57\u6BB5\u5177\u6709\u9ED8\u8BA4\u8BBE\u7F6E (\u53EF\u8986\u76D6)\u3002\n\u5176\u4E2D <selector> \u662F\u5E94\u7528\u683C\u5F0F\u7684\u4E0A\u4E0B\u6587\u3002\n\u9009\u62E9\u5668\u7ED3\u6784\u662F\u4E00\u4E2A\u7531\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u6784\u6210\u7684\u5217\u8868, \u4F7F\u7528\u8FDE\u5B57\u7B26\u5206\u9694\u3002\n\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u662F\u5355\u4E2A\u9009\u62E9\u5668\u7C7B\u578B\u7684\u503C\u7684\u5217\u8868, \u4F7F\u7528\u9017\u53F7\u5206\u9694\u3002\n\u5982\u679C\u6BCF\u4E2A\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u5339\u914D, \u5219\u9009\u62E9\u5668\u5339\u914D; \u5982\u679C\u5176\u4E2D\u67D0\u4E2A\u503C\n\u5339\u914D, \u5219\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u5339\u914D\u3002\n\ncase \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u7247\u6BB5\u7684\u7C7B\u578B\u3002\u503C\u5305\u62EC:\n\timport     -- \u5BFC\u5165\u58F0\u660E\n\tclass      -- \u7C7B\u58F0\u660E\n\tinterface  -- \u63A5\u53E3\u58F0\u660E\n\tenum       -- \u679A\u4E3E\u58F0\u660E\n\tannotation -- \u6279\u6CE8\u63A5\u53E3\u58F0\u660E\n\trecord     -- \u8BB0\u5F55\u58F0\u660E\n\tmethod     -- \u65B9\u6CD5\u58F0\u660E -- \u6CE8: {type}==parameter-types\n\tvardecl    -- \u4E0D\u5E26\u521D\u59CB\u5316\u7684\u53D8\u91CF\u58F0\u660E\n\tvardecl    -- \u5E26\u521D\u59CB\u5316\u7684\u53D8\u91CF\u58F0\u660E\n\texpression -- \u8868\u8FBE\u5F0F -- \
-\u6CE8: {name}==scratch-variable-name\n\tvarvalue   -- \u53D8\u91CF\u503C\u8868\u8FBE\u5F0F\n\tassignment -- \u5206\u914D\u53D8\u91CF\n\tstatement  -- \u8BED\u53E5\n\u64CD\u4F5C\u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u5BF9\u7247\u6BB5\u6267\u884C\u7684\u64CD\u4F5C\u3002\u503C\u5305\u62EC:\n\tadded     -- \u7247\u6BB5\u5DF2\u6DFB\u52A0\n\tmodified  -- \u73B0\u6709\u7247\u6BB5\u5DF2\u4FEE\u6539\n\treplaced  -- \u73B0\u6709\u7247\u6BB5\u5DF2\u66FF\u6362\u4E3A\u65B0\u7247\u6BB5\n\toverwrote -- \u73B0\u6709\u7247\u6BB5\u5DF2\u8986\u76D6\n\tdropped   -- \u7247\u6BB5\u5DF2\u5220\u9664\n\tused      -- \u7247\u6BB5\u5728\u4E0D\u80FD\u4F7F\u7528\u7684\u65F6\u5019\u5DF2\u88AB\u4F7F\u7528\nwhen-did-it-occur \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u8FD9\u662F\u76F4\u63A5\u64CD\u4F5C\u8FD8\u662F\u95F4\u63A5\u64CD\u4F5C\u3002\u503C\u5305\u62EC:\n\tprimary -- \u8F93\u5165\u7684\u7247\u6BB5\n\tupdate  -- \u5BF9\u76F8\u5173\u7247\u6BB5\u7684\u66F4\u65B0\nresolution-state \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u7247\u6BB5\u7684\u89E3\u6790/\u5B9A\u4E49\u72B6\u6001\u3002\u503C\u5305\u62EC:\n\tok         -- \u5DF2\u6B63\u786E\u89E3\u6790\n\tdefined    -- \u5DF2\u5B9A\u4E49, \u4F46\u5B58\u5728\u53EF\u6062\u590D\u7684\u672A\u89E3\u6790\u5F15\u7528\n\tnotdefined -- \u7531\u4E8E\u5B58\u5728\u53EF\u6062\u590D\u7684\u672A\u89E3\u6790\u5F15\u7528\u800C\u672A\u5B9A\u4E49\nunresolved-count \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u672A\u89E3\u6790\u5F15\u7528\u7684\u6570\u91CF\u3002\u503C\u5305\u62EC:\n\tunresolved0 -- \u4E0D\u5B58\u5728\u672A\u89E3\u6790\u7684\u540D\u79F0\n\tunresolved1 -- \u4E00\u4E2A\u540D\u79F0\u672A\u89E3\u6790\n\tunresolved2 -- \u4E24\u4E2A\u6216\u66F4\u591A\u540D\u79F0\u672A\u89E3\u6790\nerrors-count \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u9519\u8BEF\u7684\u6570\u91CF\u3002\u503C\u5305\u62EC:\n\terror0 -- \u65E0\u9519\u8BEF\n\terror1 -- \u4E00\u4E2A\u9519\u8BEF\n\terror2 -- \u4E24\u4E2A\u6216\u66F4\u591A\u9519\u8BEF\n\n\u793A\u4F8B:\n\t/set format mymode action '\u5DF2\u521B\u5EFA' added-primary\n\t/set format mymode action '\u66F4\u65B0\u5DF2\u66FF\u6362' replaced-update\n\t/set format mymode display '{pre}{action} \u7C7B {name}{post}' class-ok\n\t/set format mymode display '{pre}{action} \u53D8\u91CF {name}, \u91CD\u7F6E\u4E3A\u7A7A\u503C{post}' replaced-vardecl,varinit-ok-update\n\n\u8BF7\u6CE8\u610F, \u67D0\u4E2A\u5B57\u6BB5\u7684\u540E\u7EED\u9009\u62E9\u5668\u53EF\u80FD\u4F1A\u8986\u76D6\u90E8\u5206\u6216\u5168\u90E8\u4EE5\u524D\u4F7F\u7528\u7684\u9009\u62E9\u5668 -- \u91C7\u7528\u6700\u540E\u4E00\u4E2A\u9009\u62E9\u5668\n\n\u4E0D\u5E26 <\u683C\u5F0F> \u7684\u683C\u5F0F\u663E\u793A\u5F53\u524D\u683C\u5F0F\u8BBE\u7F6E\u3002\n\u6307\u5B9A <\u6A21\u5F0F> \u65F6, \u5C06\u4EC5\u663E\u793A\u8BE5\u6A21\u5F0F\u7684\u683C\u5F0F\u8BBE\u7F6E\u3002\n\u540C\u65F6\u6307\u5B9A <\u6A21\u5F0F> \u548C <\u5B57\u6BB5> \u65F6, \u5C06\u4EC5\u663E\u793A\u8BE5\u6A21\u5F0F\u548C\u5B57\u6BB5\u7684\n\u683C\u5F0F\u8BBE\u7F6E\u3002\u793A\u4F8B:\n\t/set format mymode\n\u663E\u793A\u6A21\u5F0F mymode \u7684\u683C\u5F0F\u8BBE\u7F6E\n
+help.set.format = 设置用于报告片段事件的格式：\n\n\t/set format <模式> <字段> "<格式>" <选择器>...\n\n显示格式设置:\n\n\t/set format [<模式> [<字段>]]\n\n其中 <模式> 是以前定义的反馈模式的名称 -- 请参阅 '/help /set mode'。\n其中 <字段> 是要定义的上下文特定格式的名称。\n其中 <格式> 是一个带引号的字符串, 该字符串将为\n字段的值 (如果选择器匹配, 或者没有任何选择器)。\n在使用格式时, 用大括号括起的字段名将会在相应时间\n使用字段值替换。这些字段可能已使用此命令定义, \n也可能是特定于上下文的以下预定义字段之一:\n\t{name}       == 名称, 例如: 变量的名称, ...\n\t{type}       == 类型名称。变量或表达式的类型,\n\t\t\t方法的参数类型\n\t{value}      == 表达式或变量初始化的结果值\n\t{unresolved} == 未解析引用的列表\n\t{errors}     == 可恢复错误的列表 (只在处理\n\t\t\t"display" 字段期间)\n\t{err}        == 无格式的错误行 (只在处理\n\t\t\t"errorline" 字段期间)\n该工具访问以下字段来确定所显示的反馈:\n\t{display}    == 为片段事件显示的消息\n\t{errorline}  == "errors" 字段中的一个错误行的格式\n\t{pre}        == 反馈前缀 (作为命令反馈的开头)\n\t{post}       == 反馈后缀 (作为命令反馈的结尾)\n\t{errorpre}   == 错误前缀 (作为错误反馈的开头)\n\t{errorpost}  == 错误后缀 (作为错误反馈的结尾)\n这些字段具有默认设置 (可覆盖)。\n其中 <selector> 是应用格式的上下文。\n选择器结构是一个由选择器类型列表构成的列表, 使用连字符分隔。\n选择器类型列表是单个选择器类型的值的列表, 使用逗号分隔。\n如果每个选择器类型列表匹配, 则选择器匹配; 如果其中某个值\n匹配, 则选择器类型列表匹配。\n\ncase 选择器类型描述了片段的类型。值包括:\n\timport     -- 导入声明\n\tclass      -- 类声明\n\tinterface  -- 接口声明\n\tenum       -- 枚举声明\n\tannotation -- 批注接口声明\n\trecord     -- 记录声明\n\tmethod     -- 方法声明 -- 注: {type}==parameter-types\n\tvardecl    -- 不带初始化的变量声明\n\tvardecl    -- 带初始化的变量声明\n\texpression -- 表达式 -- \
+注: {name}==scratch-variable-name\n\tvarvalue   -- 变量值表达式\n\tassignment -- 分配变量\n\tstatement  -- 语句\n操作选择器类型描述了对片段执行的操作。值包括:\n\tadded     -- 片段已添加\n\tmodified  -- 现有片段已修改\n\treplaced  -- 现有片段已替换为新片段\n\toverwrote -- 现有片段已覆盖\n\tdropped   -- 片段已删除\n\tused      -- 片段在不能使用的时候已被使用\nwhen-did-it-occur 选择器类型描述了这是直接操作还是间接操作。值包括:\n\tprimary -- 输入的片段\n\tupdate  -- 对相关片段的更新\nresolution-state 选择器类型描述了片段的解析/定义状态。值包括:\n\tok         -- 已正确解析\n\tdefined    -- 已定义, 但存在可恢复的未解析引用\n\tnotdefined -- 由于存在可恢复的未解析引用而未定义\nunresolved-count 选择器类型描述了未解析引用的数量。值包括:\n\tunresolved0 -- 不存在未解析的名称\n\tunresolved1 -- 一个名称未解析\n\tunresolved2 -- 两个或更多名称未解析\nerrors-count 选择器类型描述了错误的数量。值包括:\n\terror0 -- 无错误\n\terror1 -- 一个错误\n\terror2 -- 两个或更多错误\n\n示例:\n\t/set format mymode action '已创建' added-primary\n\t/set format mymode action '更新已替换' replaced-update\n\t/set format mymode display '{pre}{action} 类 {name}{post}' class-ok\n\t/set format mymode display '{pre}{action} 变量 {name}, 重置为空值{post}' replaced-vardecl,varinit-ok-update\n\n请注意, 某个字段的后续选择器可能会覆盖部分或全部以前使用的选择器 -- 采用最后一个选择器\n\n不带 <格式> 的格式显示当前格式设置。\n指定 <模式> 时, 将仅显示该模式的格式设置。\n同时指定 <模式> 和 <字段> 时, 将仅显示该模式和字段的\n格式设置。示例:\n\t/set format mymode\n显示模式 mymode 的格式设置\n
 
-help.set.truncation.summary = \u8BBE\u7F6E\u663E\u793A\u503C\u7684\u6700\u5927\u957F\u5EA6
+help.set.truncation.summary = 设置显示值的最大长度
 
-help.set.truncation = \u8BBE\u7F6E\u663E\u793A\u503C\u7684\u6700\u5927\u957F\u5EA6:\n\n\t/set truncation <\u6A21\u5F0F> <\u957F\u5EA6> <\u9009\u62E9\u5668>...\n\n\u663E\u793A\u5F53\u524D\u622A\u65AD\u8BBE\u7F6E:\n\n\t/set truncation [<\u6A21\u5F0F>]\n\n\u5176\u4E2D <\u6A21\u5F0F> \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u540D\u79F0 -- \u8BF7\u53C2\u9605 '/help /set mode'\u3002\n\u800C <\u957F\u5EA6> \u662F\u65E0\u7B26\u53F7\u6574\u6570, \u8868\u793A\u6700\u5927\u957F\u5EA6\u3002\n<\u9009\u62E9\u5668> \u53EA\u6709\u5728\u60A8\u5E0C\u671B\u6839\u636E\u4E0A\u4E0B\u6587\u5FAE\u8C03\u503C\u622A\u65AD\u957F\u5EA6\u65F6\u624D\u9700\u8981,\n<\u9009\u62E9\u5668> \u662F\u5728\u5176\u4E2D\u5E94\u7528\u622A\u65AD\u7684\u4E0A\u4E0B\u6587\u3002\n\u9009\u62E9\u5668\u7ED3\u6784\u662F\u4E00\u4E2A\u8FDE\u5B57\u7B26\u5206\u9694\u7684\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u3002\n\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u662F\u4E00\u4E2A\u5305\u542B\u67D0\u79CD\u9009\u62E9\u5668\u7C7B\u578B\u7684\u503C\u7684\u9017\u53F7\u5206\u9694\u5217\u8868\u3002\n\u9009\u62E9\u5668\u5728\u6240\u6709\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u5339\u914D\u65F6\u5339\u914D; \u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\n\u5219\u5728\u5176\u4E2D\u4E00\u4E2A\u503C\u5339\u914D\u65F6\u5339\u914D\u3002\n\n\u4E0B\u9762\u662F\u7528\u4E8E\u622A\u65AD\u7684\u76F8\u5173\u9009\u62E9\u5668\u7C7B\u578B\u3002\n\ncase \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u7247\u6BB5\u7684\u7C7B\u578B\u3002\u503C\u5305\u62EC:\n\tvardecl    -- \u4E0D\u5E26\u521D\u59CB\u5316\u7684\u53D8\u91CF\u58F0\u660E\n\tvarinit    -- \u5E26\u521D\u59CB\u5316\u7684\u53D8\u91CF\u58F0\u660E\n\texpression -- \u8868\u8FBE\u5F0F -- \u6CE8: {name}==\u6682\u5B58\u53D8\u91CF\u540D\u79F0\n\tvarvalue   -- \u53D8\u91CF\u503C\u8868\u8FBE\u5F0F\n\tassignment -- \u5206\u914D\u53D8\u91CF\n\t\u64CD\u4F5C\u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u5BF9\u7247\u6BB5\u6267\u884C\u7684\u64CD\u4F5C\u3002\u503C\u5305\u62EC:\n\tadded     -- \u7247\u6BB5\u5DF2\u6DFB\u52A0\n\tmodified  -- \u73B0\u6709\u7247\u6BB5\u5DF2\u4FEE\u6539\n\treplaced  -- \u73B0\u6709\u7247\u6BB5\u5DF2\u66FF\u6362\u4E3A\u65B0\u7247\u6BB5\n\u793A\u4F8B:\n\t/set trunc mymode 80\n\t/set truncation mymode 45 expression\n\t/set truncation mymode 0 vardecl-modified,replaced\n\n\u8BF7\u6CE8\u610F, \u67D0\u4E2A\u5B57\u6BB5\u7684\u540E\u7EED\u9009\u62E9\u5668\u53EF\u80FD\u4F1A\u8986\u76D6\u90E8\u5206\u6216\u5168\u90E8\u4EE5\u524D\u4F7F\u7528\u7684\u9009\u62E9\u5668 -- \u91C7\u7528\u6700\u540E\u4E00\u4E2A\u9009\u62E9\u5668\n\n\u4E0D\u5E26 <\u957F\u5EA6> \u7684\u683C\u5F0F\u663E\u793A\u622A\u65AD\u8BBE\u7F6E\u3002\n\u6307\u5B9A <\u6A21\u5F0F> \u65F6, \u5C06\u4EC5\u663E\u793A\u8BE5\u6A21\u5F0F\u7684\u622A\u65AD\u8BBE\u7F6E\u3002\n\u793A\u4F8B:\n\t/set truncation mymode\n\u663E\u793A\u6A21\u5F0F mymode \u7684\u622A\u65AD\u8BBE\u7F6E\n
+help.set.truncation = 设置显示值的最大长度:\n\n\t/set truncation <模式> <长度> <选择器>...\n\n显示当前截断设置:\n\n\t/set truncation [<模式>]\n\n其中 <模式> 是以前定义的反馈模式名称 -- 请参阅 '/help /set mode'。\n而 <长度> 是无符号整数, 表示最大长度。\n<选择器> 只有在您希望根据上下文微调值截断长度时才需要,\n<选择器> 是在其中应用截断的上下文。\n选择器结构是一个连字符分隔的选择器类型列表。\n选择器类型列表是一个包含某种选择器类型的值的逗号分隔列表。\n选择器在所有选择器类型列表匹配时匹配; 选择器类型列表\n则在其中一个值匹配时匹配。\n\n下面是用于截断的相关选择器类型。\n\ncase 选择器类型描述了片段的类型。值包括:\n\tvardecl    -- 不带初始化的变量声明\n\tvarinit    -- 带初始化的变量声明\n\texpression -- 表达式 -- 注: {name}==暂存变量名称\n\tvarvalue   -- 变量值表达式\n\tassignment -- 分配变量\n\t操作选择器类型描述了对片段执行的操作。值包括:\n\tadded     -- 片段已添加\n\tmodified  -- 现有片段已修改\n\treplaced  -- 现有片段已替换为新片段\n示例:\n\t/set trunc mymode 80\n\t/set truncation mymode 45 expression\n\t/set truncation mymode 0 vardecl-modified,replaced\n\n请注意, 某个字段的后续选择器可能会覆盖部分或全部以前使用的选择器 -- 采用最后一个选择器\n\n不带 <长度> 的格式显示截断设置。\n指定 <模式> 时, 将仅显示该模式的截断设置。\n示例:\n\t/set truncation mymode\n显示模式 mymode 的截断设置\n
 
-help.set.feedback.summary = \u8BBE\u7F6E\u7528\u4E8E\u63CF\u8FF0\u4E3A\u6240\u8F93\u5165\u7247\u6BB5\u548C\u547D\u4EE4\u663E\u793A\u7684\u53CD\u9988\u7684\u53CD\u9988\u6A21\u5F0F
+help.set.feedback.summary = 设置用于描述为所输入片段和命令显示的反馈的反馈模式
 
-help.set.feedback = \u8BBE\u7F6E\u53CD\u9988\u6A21\u5F0F, \u8BE5\u6A21\u5F0F\u63CF\u8FF0\u4E3A\u6240\u8F93\u5165\u7684\u7247\u6BB5\u548C\u547D\u4EE4\u663E\u793A\u7684\u53CD\u9988:\n\n\t/set feedback [-retain] <\u6A21\u5F0F>\n\n\u4FDD\u7559\u5F53\u524D\u53CD\u9988\u6A21\u5F0F\u4EE5\u4FBF\u5728\u5C06\u6765\u4F1A\u8BDD\u4E2D\u4F7F\u7528:\n\n\t/set feedback -retain\n\n\u663E\u793A\u53CD\u9988\u6A21\u5F0F\u5E76\u5217\u51FA\u53EF\u7528\u6A21\u5F0F:\n\n\t/set feedback\n\n\u5176\u4E2D <\u6A21\u5F0F> \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u540D\u79F0\u3002\n\u60A8\u53EF\u4EE5\u4F7F\u7528\u8DB3\u591F\u591A\u7684\u5B57\u6BCD\u6765\u63D0\u4F9B\u552F\u4E00\u7684\u540D\u79F0\u3002\n\u53EF\u4EE5\u6DFB\u52A0\u7528\u6237\u5B9A\u4E49\u7684\u6A21\u5F0F, \u5177\u4F53\u8BF7\u53C2\u9605 '/help /set mode'\n\n\u4F7F\u7528 -retain \u9009\u9879\u65F6, \u5C06\u5728\u672C\u6B21\u8FD0\u884C\u548C\u5C06\u6765\u8FD0\u884C jshell \u5DE5\u5177\u65F6\n\u4F7F\u7528\u6B64\u8BBE\u7F6E\u3002\n\n\u4E0D\u5E26 <\u6A21\u5F0F> \u7684\u683C\u5F0F\u6216 -retain \u663E\u793A\u5F53\u524D\u53CD\u9988\u6A21\u5F0F\u548C\u53EF\u7528\u6A21\u5F0F\u3002\n
+help.set.feedback = 设置反馈模式, 该模式描述为所输入的片段和命令显示的反馈:\n\n\t/set feedback [-retain] <模式>\n\n保留当前反馈模式以便在将来会话中使用:\n\n\t/set feedback -retain\n\n显示反馈模式并列出可用模式:\n\n\t/set feedback\n\n其中 <模式> 是以前定义的反馈模式名称。\n您可以使用足够多的字母来提供唯一的名称。\n可以添加用户定义的模式, 具体请参阅 '/help /set mode'\n\n使用 -retain 选项时, 将在本次运行和将来运行 jshell 工具时\n使用此设置。\n\n不带 <模式> 的格式或 -retain 显示当前反馈模式和可用模式。\n
 
-help.set.mode.summary = \u521B\u5EFA\u7528\u6237\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F, \u53EF\u4EE5\u9009\u62E9\u4ECE\u73B0\u6709\u6A21\u5F0F\u590D\u5236
+help.set.mode.summary = 创建用户定义的反馈模式, 可以选择从现有模式复制
 
-help.set.mode = \u521B\u5EFA\u7528\u6237\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F, \u4E5F\u53EF\u4EE5\u9009\u62E9\u4ECE\u73B0\u6709\u6A21\u5F0F\u590D\u5236:\n\n\t/set mode <\u65B0\u6A21\u5F0F> [<\u65E7\u6A21\u5F0F>] (-command|-quiet)\n\n\u4FDD\u7559\u7528\u6237\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u4EE5\u4FBF\u5728\u5C06\u6765\u4F1A\u8BDD\u4E2D\u4F7F\u7528:\n\n\t/set mode -retain <\u6A21\u5F0F>\n\n\u5220\u9664\u7528\u6237\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F:\n\n\t/set mode -delete [-retain] <\u6A21\u5F0F>\n\n\u663E\u793A\u53CD\u9988\u6A21\u5F0F\u8BBE\u7F6E:\n\n\t/set mode [<\u6A21\u5F0F>]\n\n\u5176\u4E2D <\u65B0\u6A21\u5F0F> \u662F\u60A8\u5E0C\u671B\u521B\u5EFA\u7684\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n\u5176\u4E2D <\u65E7\u6A21\u5F0F> \u662F\u73B0\u6709\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n\u5176\u4E2D <\u6A21\u5F0F> \u662F\u73B0\u6709\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n\n\u5982\u679C\u5B58\u5728 <\u65E7\u6A21\u5F0F>, \u5176\u8BBE\u7F6E\u5C06\u4F1A\u590D\u5236\u5230\u65B0\u6A21\u5F0F\u3002\n\n\u6A21\u5F0F\u4E3A\u6240\u8F93\u5165\u7247\u6BB5\u63D0\u4F9B\u7684\u53CD\u9988\u7531 '/set format' \u8BBE\u7F6E\u786E\u5B9A\u3002\n\u4E0D\u8FC7, \u5BF9\u4E8E\u8F93\u5165\u7684\u547D\u4EE4, \u53CD\u9988\u7684\u542F\u7528\u6216\u7981\u7528\u662F\u6839\u636E\u521B\u5EFA\u6A21\u5F0F\u65F6\n\u4F7F\u7528\u7684\u9009\u9879\u786E\u5B9A\u7684\u3002\u5FC5\u987B\u6307\u5B9A\u9009\u9879 '-command' \u6216\n\u9009\u9879 '-quiet'\u3002\u5982\u679C\u4F7F\u7528 '-command', \u5219\u5728\u65B0\u6A21\u5F0F\n\u4E0B\u65F6\u4F1A\u663E\u793A\u4FE1\u606F\u6027\u548C\u9A8C\u8BC1\u547D\u4EE4\u53CD\u9988\u3002\u5982\u679C\u4F7F\u7528 '-quiet',\n\u5219\u547D\u4EE4\u53EA\u63D0\u4F9B\u57FA\u672C\u53CD\u9988 (\u4F8B\u5982, \u9519\u8BEF)\u3002\n\n\u4E00\u65E6\u521B\u5EFA\u65B0\u6A21\u5F0F, \u5373\u53EF\u4F7F\u7528 '/set format', '/set prompt' \u548C '/set truncation'\n\u8FDB\u884C\u914D\u7F6E\u3002\u4F7F\u7528 '/set feedback' \u53EF\u4F7F\u7528\u65B0\u6A21\u5F0F\u3002\n\n\u4F7F\u7528 -retain \u9009\u9879 (\u4E0D\u5E26 '-delete' \u9009\u9879) \u65F6, \u5C06\u5B58\u50A8\n\u6A21\u5F0F (\u5305\u62EC\u5176\u5F53\u524D\u63D0\u793A, \u683C\u5F0F\u548C\u622A\u65AD\u8BBE\u7F6E) \u4EE5\u4FBF\u5728\u5C06\u6765\u8FD0\u884C\njshell \u5DE5\u5177\u65F6\u4F7F\u7528\u3002\u5982\u679C\u4E0D\u4F7F\u7528 retain, \u5219\u4EC5\u5728\u5F53\u524D\u4F1A\u8BDD\n\u4E2D\u5B9A\u4E49\u6A21\u5F0F\u3002\u5728\u66F4\u65B0\u6A21\u5F0F\u7684\u8BBE\u7F6E\u4E4B\u540E, \u518D\u6B21\u4FDD\u7559\u6A21\u5F0F\u4EE5\u4FBF\u5728\n\u5404\u4E2A\u4F1A\u8BDD\u4E4B\u95F4\u4FDD\u7559\u66F4\u65B0\u3002\n\n\u4EC5\u4F7F\u7528 '-delete' \u9009\u9879\u65F6, \u5C06\u4ECE\u5F53\u524D\u4F1A\u8BDD\u4E2D\u5220\u9664\u6A21\u5F0F\u3002\n\u540C\u65F6\u4F7F\u7528 '-retain' \u548C '-delete' \u65F6, \u5C06\u4ECE\u5F53\u524D\u4F1A\u8BDD\u548C\n\u5C06\u6765\u4F1A\u8BDD\u4E2D\u5220\u9664\u6A21\u5F0F\u3002\n\n\u4F7F\u7528\u4E0D\u5E26\u9009\u9879\u7684\u683C\u5F0F\u65F6, \u5C06\u663E\u793A\u6A21\u5F0F\u8BBE\u7F6E\u3002\n\u6307\u5B9A <\u6A21\u5F0F> \u65F6, \u5C06\u4EC5\u663E\u793A\u8BE5\u6A21\u5F0F\u7684\u6A21\u5F0F\u8BBE\u7F6E\u3002\n\u6CE8: \u6A21\u5F0F\u8BBE\u7F6E\u5305\u62EC\u63D0\u793A, \u683C\u5F0F\u548C\u622A\u65AD\u7684\n\u8BBE\u7F6E\u3002\n\u793A\u4F8B:\n\t/set mode mymode\n\n\u663E\u793A\u6A21\u5F0F mymode \u7684\u6A21\u5F0F, \u63D0\u793A, \u683C\u5F0F\u548C\u622A\u65AD\u8BBE\u7F6E
+help.set.mode = 创建用户定义的反馈模式, 也可以选择从现有模式复制:\n\n\t/set mode <新模式> [<旧模式>] (-command|-quiet)\n\n保留用户定义的反馈模式以便在将来会话中使用:\n\n\t/set mode -retain <模式>\n\n删除用户定义的反馈模式:\n\n\t/set mode -delete [-retain] <模式>\n\n显示反馈模式设置:\n\n\t/set mode [<模式>]\n\n其中 <新模式> 是您希望创建的模式的名称。\n其中 <旧模式> 是现有反馈模式的名称。\n其中 <模式> 是现有反馈模式的名称。\n\n如果存在 <旧模式>, 其设置将会复制到新模式。\n\n模式为所输入片段提供的反馈由 '/set format' 设置确定。\n不过, 对于输入的命令, 反馈的启用或禁用是根据创建模式时\n使用的选项确定的。必须指定选项 '-command' 或\n选项 '-quiet'。如果使用 '-command', 则在新模式\n下时会显示信息性和验证命令反馈。如果使用 '-quiet',\n则命令只提供基本反馈 (例如, 错误)。\n\n一旦创建新模式, 即可使用 '/set format', '/set prompt' 和 '/set truncation'\n进行配置。使用 '/set feedback' 可使用新模式。\n\n使用 -retain 选项 (不带 '-delete' 选项) 时, 将存储\n模式 (包括其当前提示, 格式和截断设置) 以便在将来运行\njshell 工具时使用。如果不使用 retain, 则仅在当前会话\n中定义模式。在更新模式的设置之后, 再次保留模式以便在\n各个会话之间保留更新。\n\n仅使用 '-delete' 选项时, 将从当前会话中删除模式。\n同时使用 '-retain' 和 '-delete' 时, 将从当前会话和\n将来会话中删除模式。\n\n使用不带选项的格式时, 将显示模式设置。\n指定 <模式> 时, 将仅显示该模式的模式设置。\n注: 模式设置包括提示, 格式和截断的\n设置。\n示例:\n\t/set mode mymode\n\n显示模式 mymode 的模式, 提示, 格式和截断设置
 
-help.set.prompt.summary = \u8BBE\u7F6E\u63D0\u793A
+help.set.prompt.summary = 设置提示
 
-help.set.prompt = \u8BBE\u7F6E\u63D0\u793A\u3002\u5FC5\u987B\u540C\u65F6\u8BBE\u7F6E\u6B63\u5E38\u63D0\u793A\u548C\u66F4\u591A\u63D0\u793A\uFF1A\n\n\t/set prompt <\u6A21\u5F0F> "<\u63D0\u793A>" "<\u66F4\u591A\u63D0\u793A>"\n\n\u663E\u793A\u6B63\u5E38\u63D0\u793A\u548C\u66F4\u591A\u63D0\u793A\uFF1A\n\n\t/set prompt [<\u6A21\u5F0F>]\n\n\u5176\u4E2D <\u6A21\u5F0F> \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u540D\u79F0\u3002\n\u800C <\u63D0\u793A> \u548C <\u66F4\u591A\u63D0\u793A> \u662F\u4F5C\u4E3A\u8F93\u5165\u63D0\u793A\u8F93\u51FA\u7684\u5E26\u5F15\u53F7\u7684\u5B57\u7B26\u4E32\uFF1B\n\u5B83\u4EEC\u5747\u53EF\u9009\u62E9\u6027\u5730\u5305\u542B '%%s'\uFF0C\u8BE5\u53D8\u91CF\u5C06\u88AB\u66FF\u6362\u4E3A\u4E0B\u4E00\u4E2A\u7247\u6BB5 ID --\n\u8BF7\u6CE8\u610F\uFF0C\u53EF\u80FD\u65E0\u6CD5\u5411\u6240\u8F93\u5165\u5185\u5BB9\u5206\u914D\u8BE5 ID\uFF0C\u4F8B\u5982\u8FD9\u53EF\u80FD\u662F\u4E00\u4E2A\u9519\u8BEF\u6216\u547D\u4EE4\u3002\n\u66F4\u591A\u63D0\u793A\u5728\u591A\u884C\u7247\u6BB5\u7684\u7B2C\u4E8C\u884C\u4EE5\u53CA\u540E\u7EED\u884C\u4E0A\u4F7F\u7528\u3002\n\n\u4E0D\u5E26 <\u63D0\u793A> \u7684\u683C\u5F0F\u663E\u793A\u5F53\u524D\u8BBE\u7F6E\u7684\u63D0\u793A\u3002\n\u6307\u5B9A <\u6A21\u5F0F> \u65F6\uFF0C\u5C06\u4EC5\u663E\u793A\u8BE5\u6A21\u5F0F\u7684\u63D0\u793A\u3002\n\u793A\u4F8B\uFF1A\n\t/set prompt mymode\n\u663E\u793A\u4E3A\u6A21\u5F0F mymode \u8BBE\u7F6E\u7684\u63D0\u793A\n
+help.set.prompt = 设置提示。必须同时设置正常提示和更多提示：\n\n\t/set prompt <模式> "<提示>" "<更多提示>"\n\n显示正常提示和更多提示：\n\n\t/set prompt [<模式>]\n\n其中 <模式> 是以前定义的反馈模式名称。\n而 <提示> 和 <更多提示> 是作为输入提示输出的带引号的字符串；\n它们均可选择性地包含 '%%s'，该变量将被替换为下一个片段 ID --\n请注意，可能无法向所输入内容分配该 ID，例如这可能是一个错误或命令。\n更多提示在多行片段的第二行以及后续行上使用。\n\n不带 <提示> 的格式显示当前设置的提示。\n指定 <模式> 时，将仅显示该模式的提示。\n示例：\n\t/set prompt mymode\n显示为模式 mymode 设置的提示\n
 
-help.set.editor.summary =\u6307\u5B9A\u8981\u4E3A /edit \u547D\u4EE4\u542F\u52A8\u7684\u547D\u4EE4
+help.set.editor.summary =指定要为 /edit 命令启动的命令
 
-help.set.editor =\u6307\u5B9A\u8981\u4E3A /edit \u547D\u4EE4\u542F\u52A8\u7684\u547D\u4EE4:\n\n\t/set editor [-retain] [-wait] <\u547D\u4EE4>\n\n\t/set editor [-retain] -default\n\n\t/set editor [-retain] -delete\n\n\u4FDD\u7559\u5F53\u524D\u7F16\u8F91\u5668\u8BBE\u7F6E\u4EE5\u4FBF\u5728\u5C06\u6765\u4F1A\u8BDD\u4E2D\u4F7F\u7528:\n\n\t/set editor -retain\n\n\u663E\u793A\u8981\u4E3A /edit \u547D\u4EE4\u542F\u52A8\u7684\u547D\u4EE4:\n\n\t/set editor\n\n<\u547D\u4EE4> \u662F\u4E0E\u64CD\u4F5C\u7CFB\u7EDF\u76F8\u5173\u7684\u5B57\u7B26\u4E32\u3002\n<\u547D\u4EE4> \u53EF\u4EE5\u5305\u542B\u7528\u7A7A\u683C\u5206\u9694\u7684\u53C2\u6570 (\u4F8B\u5982\u6807\u8BB0)\n\n\u5982\u679C\u6307\u5B9A\u4E86 -default \u9009\u9879, \u5C06\u4F7F\u7528\u5185\u7F6E\u9ED8\u8BA4\u7F16\u8F91\u5668\u3002\n\n\u5982\u679C\u6307\u5B9A\u4E86 -delete \u9009\u9879, \u5C06\u5FFD\u7565\u4EE5\u524D\u7684\u8BBE\u7F6E -- \u542F\u52A8\njshell \u5DE5\u5177\u65F6\u5C06\u521D\u59CB\u5316\u7F16\u8F91\u5668\u8BBE\u7F6E\u3002\u5177\u4F53\u6765\u8BF4, \u5982\u679C\u5B58\u5728\n\u4FDD\u7559\u7684\u8BBE\u7F6E, \u5C06\u4F7F\u7528\u4FDD\u7559\u7684\u8BBE\u7F6E (\u9664\u975E\u540C\u65F6\u6307\u5B9A -retain \u548C -delete --\n\u8FD9\u5C06\u5220\u9664\u4FDD\u7559\u7684\u8BBE\u7F6E), \u5982\u679C\u8BBE\u7F6E\u4E86\u4EE5\u4E0B\u67D0\u4E2A\u73AF\u5883\u53D8\u91CF, \n\u5C06\u4F7F\u7528\u5B83: JSHELLEDITOR, VISUAL \u6216 EDITOR (\u6309\u6B64\u987A\u5E8F)\u3002\u5426\u5219\u5C06\u4F7F\u7528\n\u5185\u7F6E\u9ED8\u8BA4\u7F16\u8F91\u5668\u3002\n\n\u5982\u679C\u6307\u5B9A\u4E86 <\u547D\u4EE4>, \u5B83\u5C06\u7528\u4F5C\u5916\u90E8\u7F16\u8F91\u5668\u3002<\u547D\u4EE4>\n\u7531\u7A0B\u5E8F\u53CA\u96F6\u4E2A\u6216\u591A\u4E2A\u7A0B\u5E8F\u53C2\u6570\u7EC4\u6210\u3002\u4F7F\u7528 <\u547D\u4EE4>\n\u65F6, \u8981\u7F16\u8F91\u7684\u4E34\u65F6\u6587\u4EF6\u5C06\u4F5C\u4E3A\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u9644\u52A0\u3002\n\u901A\u5E38, \u7F16\u8F91\u6A21\u5F0F\u5C06\u6301\u7EED\u5230\u9000\u51FA\u5916\u90E8\u7F16\u8F91\u5668\u4E3A\u6B62\u3002\u67D0\u4E9B\u5916\u90E8\u7F16\u8F91\u5668\n\u5C06\u7ACB\u5373\u9000\u51FA (\u4F8B\u5982, \u5982\u679C\u9000\u51FA\u7F16\u8F91\u7A97\u53E3), \u5E94\u4F7F\u7528\u5916\u90E8\u7F16\u8F91\u5668\n\u6807\u8BB0\u963B\u6B62\u7ACB\u5373\u9000\u51FA, \u6216\u8005\u4F7F\u7528 -wait \u9009\u9879\n\u63D0\u793A\u7528\u6237\u6307\u793A\u4F55\u65F6\u5E94\u7ED3\u675F\u7F16\u8F91\u6A21\u5F0F\u3002\n\n\u6CE8: \u5728\u7F16\u8F91\u6A21\u5F0F\u4E0B, \u4E0D\u4F1A\u663E\u793A\u4EFB\u4F55\u547D\u4EE4\u8F93\u5165\u3002\u9000\u51FA\u7F16\u8F91\u6A21\u5F0F\u540E, \n\u5C06\u4E0D\u4F1A\u663E\u793A\u5BF9\u7F16\u8F91\u7684\u7247\u6BB5\u6240\u505A\u7684\u4EFB\u4F55\u66F4\u6539\u3002\n\n\u4F7F\u7528 -retain \u9009\u9879\u65F6, \u5C06\u5728\u672C\u6B21\u8FD0\u884C\u548C\u5C06\u6765\u8FD0\u884C jshell \u5DE5\u5177\u65F6\n\u4F7F\u7528\u8BE5\u8BBE\u7F6E\u3002\n\n\u4E0D\u5E26 <\u547D\u4EE4> \u6216\u9009\u9879\u7684\u683C\u5F0F\u663E\u793A\u7F16\u8F91\u5668\u8BBE\u7F6E\u3002\n
+help.set.editor =指定要为 /edit 命令启动的命令:\n\n\t/set editor [-retain] [-wait] <命令>\n\n\t/set editor [-retain] -default\n\n\t/set editor [-retain] -delete\n\n保留当前编辑器设置以便在将来会话中使用:\n\n\t/set editor -retain\n\n显示要为 /edit 命令启动的命令:\n\n\t/set editor\n\n<命令> 是与操作系统相关的字符串。\n<命令> 可以包含用空格分隔的参数 (例如标记)\n\n如果指定了 -default 选项, 将使用内置默认编辑器。\n\n如果指定了 -delete 选项, 将忽略以前的设置 -- 启动\njshell 工具时将初始化编辑器设置。具体来说, 如果存在\n保留的设置, 将使用保留的设置 (除非同时指定 -retain 和 -delete --\n这将删除保留的设置), 如果设置了以下某个环境变量, \n将使用它: JSHELLEDITOR, VISUAL 或 EDITOR (按此顺序)。否则将使用\n内置默认编辑器。\n\n如果指定了 <命令>, 它将用作外部编辑器。<命令>\n由程序及零个或多个程序参数组成。使用 <命令>\n时, 要编辑的临时文件将作为最后一个参数附加。\n通常, 编辑模式将持续到退出外部编辑器为止。某些外部编辑器\n将立即退出 (例如, 如果退出编辑窗口), 应使用外部编辑器\n标记阻止立即退出, 或者使用 -wait 选项\n提示用户指示何时应结束编辑模式。\n\n注: 在编辑模式下, 不会显示任何命令输入。退出编辑模式后, \n将不会显示对编辑的片段所做的任何更改。\n\n使用 -retain 选项时, 将在本次运行和将来运行 jshell 工具时\n使用该设置。\n\n不带 <命令> 或选项的格式显示编辑器设置。\n
 
-help.set.start.summary =\u8BBE\u7F6E\u542F\u52A8\u914D\u7F6E
+help.set.start.summary =设置启动配置
 
-help.set.start =\u8BBE\u7F6E\u542F\u52A8\u914D\u7F6E -- \u542F\u52A8\u65F6\u8BFB\u53D6\u7684\u7247\u6BB5\u548C\u547D\u4EE4\u5E8F\u5217\uFF1A\n\n\t/set start [-retain] <file>...\n\n\t/set start [-retain] -default\n\n\t/set start [-retain] -none\n\n\u4FDD\u7559\u542F\u52A8\u914D\u7F6E\u4EE5\u4FBF\u5728\u5C06\u6765\u4F1A\u8BDD\u4E2D\u4F7F\u7528\uFF1A\n\n\t/set start -retain\n\n\u663E\u793A\u542F\u52A8\u8BBE\u7F6E\uFF1A\n\n\t/set start\n\n\u5728\u6B64\u4F1A\u8BDD\u4E2D\u4F7F\u7528 /reset\u3001/reload \u6216 /env \u547D\u4EE4\u65F6\uFF0C\n\u6307\u5B9A <file> \u7684\u5185\u5BB9\u5C06\u6210\u4E3A\u4F7F\u7528\u7684\u542F\u52A8\u7247\u6BB5\u548C\u547D\u4EE4\u3002\n\u5982\u679C\u6539\u4E3A\u6307\u5B9A -default \u9009\u9879\uFF0C\u5219\u5C06\u4F7F\u7528\u9884\u5B9A\u4E49\u7684\n\u542F\u52A8\u5BFC\u5165\u7247\u6BB5\u3002\n\u5982\u679C\u4F7F\u7528 -none \u9009\u9879\uFF0C\u5219\u542F\u52A8\u8BBE\u7F6E\u5C06\u4E3A\u7A7A -- \u5C06\u4E0D\u4F7F\u7528\n\u542F\u52A8\u7247\u6BB5\u6216\u547D\u4EE4\n\u6B64\u547D\u4EE4\u5BF9\u4E8E\u6D4B\u8BD5\u542F\u52A8\u8BBE\u7F6E\u975E\u5E38\u6709\u7528\u3002\u8981\u4FDD\u7559\u8FD9\u4E9B\u5185\u5BB9\n\u4EE5\u4FBF\u5C06\u6765\u8FD0\u884C jshell \u5DE5\u5177\u65F6\u4F7F\u7528\uFF0C\u8BF7\u4F7F\u7528\u547D\u4EE4\uFF1A\n\t/set start -retain\n\n\u4F7F\u7528 -retain \u9009\u9879\u65F6\uFF0C\u5C06\u5728\u672C\u6B21\u8FD0\u884C\u548C\u5C06\u6765\n\u8FD0\u884C jshell \u5DE5\u5177\u65F6\u4F7F\u7528\u8BE5\u8BBE\u7F6E\u3002\n\n\u4E0D\u5E26 <file> \u6216\u9009\u9879\u7684\u683C\u5F0F\u663E\u793A\u542F\u52A8\u8BBE\u7F6E\u3002\n\u6CE8\uFF1A\u5982\u679C\u4E0A\u6B21\u662F\u4ECE\u6587\u4EF6\u8BBE\u7F6E\u7684\u542F\u52A8\u914D\u7F6E\uFF0C\u5219\u4F1A\u968F\n'set start' \u547D\u4EE4\u663E\u793A\u6B64\u5185\u5BB9\uFF08\u547D\u4EE4\u540E\u8DDF\u6587\u4EF6\u5185\u5BB9\uFF09\u3002\n\n<file> \u53EF\u4EE5\u662F\u64CD\u4F5C\u7CFB\u7EDF\u6587\u4EF6\u540D\uFF0C\u4E5F\u53EF\u662F\u9884\u5B9A\u4E49\u7684\n\u542F\u52A8\u6587\u4EF6\u540D\u4E4B\u4E00\uFF1ADEFAULT\u3001PRINTING\u3001TOOLING \u6216 JAVASE\u3002\n\u8FD9\u4E9B\u9879\u7684\u8BF4\u660E\u5206\u522B\u5982\u4E0B\uFF1A\u9ED8\u8BA4\u5BFC\u5165\u7247\u6BB5\uFF08\u5982 -default \u6240\u4F7F\u7528\u7684\uFF09\u3001\nprint()\u3001println() \u548C printf() \u65B9\u6CD5\u7247\u6BB5\u7684\u5B9A\u4E49\uFF0C\u6216\n\u6240\u6709 Java SE \u7A0B\u5E8F\u5305\u7684\u5BFC\u5165\u9879\u3002\n\u53EF\u4EE5\u6307\u5B9A\u591A\u4E2A <file>\uFF0C\u4F8B\u5982\uFF1A\n\n\t/set start -retain DEFAULT PRINTING
+help.set.start =设置启动配置 -- 启动时读取的片段和命令序列：\n\n\t/set start [-retain] <file>...\n\n\t/set start [-retain] -default\n\n\t/set start [-retain] -none\n\n保留启动配置以便在将来会话中使用：\n\n\t/set start -retain\n\n显示启动设置：\n\n\t/set start\n\n在此会话中使用 /reset、/reload 或 /env 命令时，\n指定 <file> 的内容将成为使用的启动片段和命令。\n如果改为指定 -default 选项，则将使用预定义的\n启动导入片段。\n如果使用 -none 选项，则启动设置将为空 -- 将不使用\n启动片段或命令\n此命令对于测试启动设置非常有用。要保留这些内容\n以便将来运行 jshell 工具时使用，请使用命令：\n\t/set start -retain\n\n使用 -retain 选项时，将在本次运行和将来\n运行 jshell 工具时使用该设置。\n\n不带 <file> 或选项的格式显示启动设置。\n注：如果上次是从文件设置的启动配置，则会随\n'set start' 命令显示此内容（命令后跟文件内容）。\n\n<file> 可以是操作系统文件名，也可是预定义的\n启动文件名之一：DEFAULT、PRINTING、TOOLING 或 JAVASE。\n这些项的说明分别如下：默认导入片段（如 -default 所使用的）、\nprint()、println() 和 printf() 方法片段的定义，或\n所有 Java SE 程序包的导入项。\n可以指定多个 <file>，例如：\n\n\t/set start -retain DEFAULT PRINTING
 
-help.set.indent.summary =\u6307\u5B9A\u5E94\u7528\u4E8E\u7F29\u8FDB\u7247\u6BB5\u7684\u7A7A\u683C\u6570
+help.set.indent.summary =指定应用于缩进片段的空格数
 
-help.set.indent =\u6307\u5B9A\u5E94\u7528\u4E8E\u7F29\u8FDB\u7247\u6BB5\u7684\u7A7A\u683C\u6570\uFF1A\n\n\t/set indent <number>\n\n\u663E\u793A\u7F29\u8FDB\u8BBE\u7F6E\uFF1A\n\n\t/set indent\n
-startup.feedback = /set mode verbose -command    \n\n/set prompt verbose '\\njshell> '   '   ...> '    \n\n/set format verbose pre '|  '    \n/set format verbose post '%n'    \n/set format verbose errorpre '|  '    \n/set format verbose errorpost '%n'    \n\n/set format verbose errorline '{post}{pre}    {err}'    \n\n/set format verbose action '\u5DF2\u521B\u5EFA' added-primary    \n/set format verbose action '\u5DF2\u4FEE\u6539' modified-primary    \n/set format verbose action '\u5DF2\u66FF\u6362' replaced-primary    \n/set format verbose action '\u5DF2\u8986\u76D6' overwrote-primary    \n/set format verbose action '\u5DF2\u5220\u9664' dropped-primary    \n/set format verbose action '  \u66F4\u65B0\u5DF2\u521B\u5EFA' added-update    \n/set format verbose action '  \u66F4\u65B0\u5DF2\u4FEE\u6539' modified-update    \n/set format verbose action '  \u66F4\u65B0\u5DF2\u66FF\u6362' replaced-update    \n/set format verbose action '  \u66F4\u65B0\u5DF2\u8986\u76D6' overwrote-update    \n/set format verbose action '  \u66F4\u65B0\u5DF2\u5220\u9664' dropped-update    \n\n/set format verbose until '\uFF0C\u4E0D\u8FC7\uFF0C\u5B83\u65E0\u6CD5\u5B9E\u4F8B\u5316\u6216\u8005\u5176\u65B9\u6CD5\u65E0\u6CD5\u8C03\u7528\uFF0C\u76F4\u81F3'   defined-class,record-primary    \n/set format verbose until ', \u4E0D\u8FC7, \u5176\u65B9\u6CD5\u65E0\u6CD5\u8C03\u7528, \u76F4\u81F3'                      defined-interface-primary    \n/set format verbose until ', \u4E0D\u8FC7, \u5B83\u65E0\u6CD5\u4F7F\u7528, \u76F4\u81F3'                                  defined-enum,annotation-primary    \n/set format verbose until ', \u4E0D\u8FC7, \u5B83\u65E0\u6CD5\u8C03\u7528, \u76F4\u81F3'                               defined-method-primary    \n/set format verbose until ', \u4E0D\u8FC7, \u5B83\u65E0\u6CD5\u5F15\u7528, \u76F4\u81F3'                            notdefined-primary    \n/set format verbose until '\u5B83\u65E0\u6CD5\u5B9E\u4F8B\u5316\u6216\u8005\u5176\u65B9\u6CD5\u65E0\u6CD5\u8C03\u7528\uFF0C\u76F4\u81F3'          defined-class,record-update    \n/set format verbose until ' \u5176\u65B9\u6CD5\u65E0\u6CD5\u8C03\u7528, \u76F4\u81F3'                              defined-interface-update    \n/set format verbose until ' \u5B83\u65E0\u6CD5\u8C03\u7528, \u76F4\u81F3'                                      defined-method-update    \n/set format verbose until ' \u5B83\u65E0\u6CD5\u5F15\u7528, \u76F4\u81F3'                                   notdefined-update    \n\n/set format verbose unrerr '{unresolved} \u5DF2\u58F0\u660E'                                           unresolved1-error0    \n/set format verbose unrerr '{unresolved} \u5DF2\u58F0\u660E'                                          unresolved2-error0    \n/set format verbose unrerr ' \u6B64\u9519\u8BEF\u5DF2\u66F4\u6B63: {errors}'                                 unresolved0-error1    \n/set format verbose unrerr '{unresolved} \u5DF2\u58F0\u660E, \u5E76\u4E14\u6B64\u9519\u8BEF\u5DF2\u66F4\u6B63: {errors}'     unresolved1-error1    \n/set format verbose unrerr '{unresolved} \u5DF2\u58F0\u660E, \u5E76\u4E14\u6B64\u9519\u8BEF\u5DF2\u66F4\u6B63: {errors}'    unresolved2-error1    \n/set format verbose unrerr ' \u8FD9\u4E9B\u9519\u8BEF\u5DF2\u66F4\u6B63: {errors}'                              unresolved0-error2    \n/set format verbose unrerr '{unresolved} \u5DF2\u58F0\u660E\u5E76\u4E14\u8FD9\u4E9B\u9519\u8BEF\u5DF2\u66F4\u6B63: {errors}'  unresolved1-error2    \n/set format verbose unrerr '{unresolved} \u5DF2\u58F0\u660E\u5E76\u4E14\u8FD9\u4E9B\u9519\u8BEF\u5DF2\u66F4\u6B63: {errors}' unresolved2-error2    \n\n/set format verbose resolve '{until}{unrerr}'                                                   defined,notdefined-added,modified,replaced,used    \n\n/set format verbose typeKind '\u7C7B'                  class    \n/set format verbose typeKind '\u63A5\u53E3'              interface    \n/set format verbose typeKind '\u679A\u4E3E'                   enum    \n/set format verbose typeKind \
-'\u6279\u6CE8\u63A5\u53E3'   annotation    \n/set format verbose typeKind '\u8BB0\u5F55'                 record    \n\n/set format verbose result '{name} ==> {value}{post}'                                        added,modified,replaced-ok-primary    \n\n/set format verbose display '{result}{pre}\u5DF2\u521B\u5EFA\u6682\u5B58\u53D8\u91CF {name} : {type}{post}'    expression-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}{name} \u7684\u503C: {type}{post}'                    varvalue-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}\u5DF2\u5206\u914D\u7ED9 {name} : {type}{post}'                 assignment-primary    \n/set format verbose display '{result}{pre}{action} \u53D8\u91CF {name} : {type}{resolve}{post}'  varinit,vardecl    \n/set format verbose display '{pre}{action} \u53D8\u91CF {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format verbose display '{pre}{action} \u53D8\u91CF {name}{post}'                            dropped-vardecl,varinit,expression    \n/set format verbose display '{pre}{action} \u53D8\u91CF {name}, \u91CD\u7F6E\u4E3A\u7A7A\u503C{post}'             replaced-vardecl,varinit-ok-update    \n\n/set format verbose display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation,record    \n/set format verbose display '{pre}{action} \u65B9\u6CD5 {name}({type}){resolve}{post}'             method    \n\n/set format verbose display '{pre}\u5DF2\u5C1D\u8BD5\u4F7F\u7528 {typeKind} {name}{resolve}{post}'         used-class,interface,enum,annotation,record    \n/set format verbose display '{pre}\u5DF2\u5C1D\u8BD5\u8C03\u7528\u65B9\u6CD5 {name}({type}){resolve}{post}'    used-method    \n\n/set truncation verbose 80\n/set truncation verbose 1000                                                                  varvalue,expression\n\n/set mode normal -command verbose    \n/set format normal display ''                                                               added,modified,replaced,overwrote,dropped-update    \n/set format normal display '{pre}{action} \u53D8\u91CF {name}, \u91CD\u7F6E\u4E3A\u7A7A\u503C{post}'             replaced-vardecl,varinit-ok-update    \n/set format normal display '{pre}{action} \u53D8\u91CF {name}{resolve}{post}'                   replaced-vardecl,varinit-notdefined    \n/set format normal display '{result}'                                                       added,modified,replaced-expression,varvalue,assignment,varinit,vardecl-ok-primary    \n/set mode concise -quiet normal    \n\n/set prompt concise 'jshell> '   '   ...> '    \n\n/set format concise display ''                                                              class,interface,enum,annotation,record,method,assignment,varinit,vardecl-ok    \n\n/set feedback normal    \n\n/set mode silent -quiet    \n/set prompt silent '-> ' '>> '    \n/set truncation silent 80\n/set truncation silent 1000                                                                  varvalue,expression\n/set format silent pre '|  '    \n/set format silent post '%n'    \n/set format silent errorpre '|  '    \n/set format silent errorpost '%n'    \n/set format silent display ''    \n
+help.set.indent =指定应用于缩进片段的空格数：\n\n\t/set indent <number>\n\n显示缩进设置：\n\n\t/set indent\n
+startup.feedback = /set mode verbose -command    \n\n/set prompt verbose '\\njshell> '   '   ...> '    \n\n/set format verbose pre '|  '    \n/set format verbose post '%n'    \n/set format verbose errorpre '|  '    \n/set format verbose errorpost '%n'    \n\n/set format verbose errorline '{post}{pre}    {err}'    \n\n/set format verbose action '已创建' added-primary    \n/set format verbose action '已修改' modified-primary    \n/set format verbose action '已替换' replaced-primary    \n/set format verbose action '已覆盖' overwrote-primary    \n/set format verbose action '已删除' dropped-primary    \n/set format verbose action '  更新已创建' added-update    \n/set format verbose action '  更新已修改' modified-update    \n/set format verbose action '  更新已替换' replaced-update    \n/set format verbose action '  更新已覆盖' overwrote-update    \n/set format verbose action '  更新已删除' dropped-update    \n\n/set format verbose until '，不过，它无法实例化或者其方法无法调用，直至'   defined-class,record-primary    \n/set format verbose until ', 不过, 其方法无法调用, 直至'                      defined-interface-primary    \n/set format verbose until ', 不过, 它无法使用, 直至'                                  defined-enum,annotation-primary    \n/set format verbose until ', 不过, 它无法调用, 直至'                               defined-method-primary    \n/set format verbose until ', 不过, 它无法引用, 直至'                            notdefined-primary    \n/set format verbose until '它无法实例化或者其方法无法调用，直至'          defined-class,record-update    \n/set format verbose until ' 其方法无法调用, 直至'                              defined-interface-update    \n/set format verbose until ' 它无法调用, 直至'                                      defined-method-update    \n/set format verbose until ' 它无法引用, 直至'                                   notdefined-update    \n\n/set format verbose unrerr '{unresolved} 已声明'                                           unresolved1-error0    \n/set format verbose unrerr '{unresolved} 已声明'                                          unresolved2-error0    \n/set format verbose unrerr ' 此错误已更正: {errors}'                                 unresolved0-error1    \n/set format verbose unrerr '{unresolved} 已声明, 并且此错误已更正: {errors}'     unresolved1-error1    \n/set format verbose unrerr '{unresolved} 已声明, 并且此错误已更正: {errors}'    unresolved2-error1    \n/set format verbose unrerr ' 这些错误已更正: {errors}'                              unresolved0-error2    \n/set format verbose unrerr '{unresolved} 已声明并且这些错误已更正: {errors}'  unresolved1-error2    \n/set format verbose unrerr '{unresolved} 已声明并且这些错误已更正: {errors}' unresolved2-error2    \n\n/set format verbose resolve '{until}{unrerr}'                                                   defined,notdefined-added,modified,replaced,used    \n\n/set format verbose typeKind '类'                  class    \n/set format verbose typeKind '接口'              interface    \n/set format verbose typeKind '枚举'                   enum    \n/set format verbose typeKind \
+'批注接口'   annotation    \n/set format verbose typeKind '记录'                 record    \n\n/set format verbose result '{name} ==> {value}{post}'                                        added,modified,replaced-ok-primary    \n\n/set format verbose display '{result}{pre}已创建暂存变量 {name} : {type}{post}'    expression-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}{name} 的值: {type}{post}'                    varvalue-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}已分配给 {name} : {type}{post}'                 assignment-primary    \n/set format verbose display '{result}{pre}{action} 变量 {name} : {type}{resolve}{post}'  varinit,vardecl    \n/set format verbose display '{pre}{action} 变量 {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format verbose display '{pre}{action} 变量 {name}{post}'                            dropped-vardecl,varinit,expression    \n/set format verbose display '{pre}{action} 变量 {name}, 重置为空值{post}'             replaced-vardecl,varinit-ok-update    \n\n/set format verbose display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation,record    \n/set format verbose display '{pre}{action} 方法 {name}({type}){resolve}{post}'             method    \n\n/set format verbose display '{pre}已尝试使用 {typeKind} {name}{resolve}{post}'         used-class,interface,enum,annotation,record    \n/set format verbose display '{pre}已尝试调用方法 {name}({type}){resolve}{post}'    used-method    \n\n/set truncation verbose 80\n/set truncation verbose 1000                                                                  varvalue,expression\n\n/set mode normal -command verbose    \n/set format normal display ''                                                               added,modified,replaced,overwrote,dropped-update    \n/set format normal display '{pre}{action} 变量 {name}, 重置为空值{post}'             replaced-vardecl,varinit-ok-update    \n/set format normal display '{pre}{action} 变量 {name}{resolve}{post}'                   replaced-vardecl,varinit-notdefined    \n/set format normal display '{result}'                                                       added,modified,replaced-expression,varvalue,assignment,varinit,vardecl-ok-primary    \n/set mode concise -quiet normal    \n\n/set prompt concise 'jshell> '   '   ...> '    \n\n/set format concise display ''                                                              class,interface,enum,annotation,record,method,assignment,varinit,vardecl-ok    \n\n/set feedback normal    \n\n/set mode silent -quiet    \n/set prompt silent '-> ' '>> '    \n/set truncation silent 80\n/set truncation silent 1000                                                                  varvalue,expression\n/set format silent pre '|  '    \n/set format silent post '%n'    \n/set format silent errorpre '|  '    \n/set format silent errorpost '%n'    \n/set format silent display ''    \n
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties
index 9a20c08fefb..4dda7f835a3 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties
+++ b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties
@@ -23,13 +23,13 @@
 # questions.
 #
 
-jshell.diag.modifier.plural.fatal = Modifikatoren {0} nicht zul\u00E4ssig
-jshell.diag.modifier.plural.ignore = Modifikatoren {0} nicht zul\u00E4ssig, ignoriert
-jshell.diag.modifier.single.fatal = Modifikator {0} nicht zul\u00E4ssig
-jshell.diag.modifier.single.ignore = Modifikator {0} nicht zul\u00E4ssig, ignoriert
-jshell.diag.object.method.fatal = JShell-Methodennamen d\u00FCrfen nicht mit Objektmethoden \u00FCbereinstimmen: {0}
+jshell.diag.modifier.plural.fatal = Modifikatoren {0} nicht zulässig
+jshell.diag.modifier.plural.ignore = Modifikatoren {0} nicht zulässig, ignoriert
+jshell.diag.modifier.single.fatal = Modifikator {0} nicht zulässig
+jshell.diag.modifier.single.ignore = Modifikator {0} nicht zulässig, ignoriert
+jshell.diag.object.method.fatal = JShell-Methodennamen dürfen nicht mit Objektmethoden übereinstimmen: {0}
 
 jshell.exc.null = Snippet darf nicht Null sein
 jshell.exc.alien = Snippet stammt nicht aus dieser JShell-Instanz: {0}
 jshell.exc.closed = JShell ({0}) wurde geschlossen.
-jshell.exc.var.not.valid = Snippet-Parameter von varValue() {0} muss g\u00FCltig (VALID) sein. Er lautet: {1}
+jshell.exc.var.not.valid = Snippet-Parameter von varValue() {0} muss gültig (VALID) sein. Er lautet: {1}
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties
index c2378cc5b9f..e465214e8a5 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties
+++ b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties
@@ -23,13 +23,13 @@
 # questions.
 #
 
-jshell.diag.modifier.plural.fatal = \u4FEE\u98FE\u5B50{0}\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-jshell.diag.modifier.plural.ignore = \u4FEE\u98FE\u5B50{0}\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u7121\u8996\u3055\u308C\u307E\u3059
-jshell.diag.modifier.single.fatal = \u4FEE\u98FE\u5B50{0}\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-jshell.diag.modifier.single.ignore = \u4FEE\u98FE\u5B50{0}\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u7121\u8996\u3055\u308C\u307E\u3059
-jshell.diag.object.method.fatal = JShell\u30E1\u30BD\u30C3\u30C9\u540D\u3092\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u3068\u540C\u4E00\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093: {0}
+jshell.diag.modifier.plural.fatal = 修飾子{0}は使用できません
+jshell.diag.modifier.plural.ignore = 修飾子{0}は使用できません。無視されます
+jshell.diag.modifier.single.fatal = 修飾子{0}は使用できません
+jshell.diag.modifier.single.ignore = 修飾子{0}は使用できません。無視されます
+jshell.diag.object.method.fatal = JShellメソッド名をオブジェクト・メソッドと同一にすることはできません: {0}
 
-jshell.exc.null = \u30B9\u30CB\u30DA\u30C3\u30C8\u306Fnull\u306B\u3067\u304D\u307E\u305B\u3093
-jshell.exc.alien = \u3053\u306EJShell\u304B\u3089\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0}
-jshell.exc.closed = JShell ({0})\u306F\u30AF\u30ED\u30FC\u30BA\u3055\u308C\u307E\u3057\u305F\u3002
-jshell.exc.var.not.valid = varValue() {0}\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF\u306FVALID\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u304C\u3001{1}\u3067\u3059
+jshell.exc.null = スニペットはnullにできません
+jshell.exc.alien = このJShellからのスニペットではありません: {0}
+jshell.exc.closed = JShell ({0})はクローズされました。
+jshell.exc.var.not.valid = varValue() {0}のスニペット・パラメータはVALIDにする必要がありますが、{1}です
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
index fdf1b7f6128..8b554efb3f8 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
+++ b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
@@ -23,13 +23,13 @@
 # questions.
 #
 
-jshell.diag.modifier.plural.fatal = \u4E0D\u5141\u8BB8\u4F7F\u7528\u4FEE\u9970\u7B26 {0}
-jshell.diag.modifier.plural.ignore = \u4E0D\u5141\u8BB8\u4F7F\u7528\u4FEE\u9970\u7B26 {0}\uFF0C\u5DF2\u5FFD\u7565
-jshell.diag.modifier.single.fatal = \u4E0D\u5141\u8BB8\u4F7F\u7528\u4FEE\u9970\u7B26 {0}
-jshell.diag.modifier.single.ignore = \u4E0D\u5141\u8BB8\u4F7F\u7528\u4FEE\u9970\u7B26 {0}\uFF0C\u5DF2\u5FFD\u7565
-jshell.diag.object.method.fatal = JShell \u65B9\u6CD5\u540D\u79F0\u4E0D\u80FD\u4E0E Object \u65B9\u6CD5\u5339\u914D: {0}
+jshell.diag.modifier.plural.fatal = 不允许使用修饰符 {0}
+jshell.diag.modifier.plural.ignore = 不允许使用修饰符 {0}，已忽略
+jshell.diag.modifier.single.fatal = 不允许使用修饰符 {0}
+jshell.diag.modifier.single.ignore = 不允许使用修饰符 {0}，已忽略
+jshell.diag.object.method.fatal = JShell 方法名称不能与 Object 方法匹配: {0}
 
-jshell.exc.null = \u7247\u6BB5\u4E0D\u80FD\u4E3A\u7A7A\u503C
-jshell.exc.alien = \u7247\u6BB5\u5E76\u975E\u6765\u81EA\u4E8E\u6B64 JShell: {0}
-jshell.exc.closed = JShell ({0}) \u5DF2\u5173\u95ED\u3002
-jshell.exc.var.not.valid = varValue() {0} \u7684\u7247\u6BB5\u53C2\u6570\u5FC5\u987B\u4E3A VALID, \u8BE5\u53C2\u6570\u4E3A: {1}
+jshell.exc.null = 片段不能为空值
+jshell.exc.alien = 片段并非来自于此 JShell: {0}
+jshell.exc.closed = JShell ({0}) 已关闭。
+jshell.exc.var.not.valid = varValue() {0} 的片段参数必须为 VALID, 该参数为: {1}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_AE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_AE.properties
index 5e70a7bac8f..b9eb4416bf9 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_AE.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_AE.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-AED=\u062f.\u0625.\u200f
+AED=د.إ.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_BH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_BH.properties
index 4e952b8fb64..85f9b230116 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_BH.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_BH.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-BHD=\u062f.\u0628.\u200f
+BHD=د.ب.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_DZ.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_DZ.properties
index c4098484739..6cbff925fe9 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_DZ.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_DZ.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-DZD=\u062f.\u062c.\u200f
+DZD=د.ج.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_EG.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_EG.properties
index e036f732f7e..5bc7432420a 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_EG.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_EG.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EGP=\u062c.\u0645.\u200f
+EGP=ج.م.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_IQ.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_IQ.properties
index ae61dd2c4fa..7f789f73948 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_IQ.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_IQ.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-IQD=\u062f.\u0639.\u200f
+IQD=د.ع.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_JO.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_JO.properties
index d9cd4b32467..a4892b421e5 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_JO.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_JO.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-JOD=\u062f.\u0623.\u200f
+JOD=د.أ.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_KW.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_KW.properties
index 01b39e7a8d6..90822d5c14a 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_KW.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_KW.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-KWD=\u062f.\u0643.\u200f
+KWD=د.ك.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LB.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LB.properties
index 2730794a682..63d9c8c7778 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LB.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LB.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-LBP=\u0644.\u0644.\u200f
+LBP=ل.ل.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LY.properties
index 901fa132396..3a688fe0a54 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LY.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_LY.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-LYD=\u062f.\u0644.\u200f
+LYD=د.ل.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_MA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_MA.properties
index 70f7b6e078c..1cbd3a09e0c 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_MA.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_MA.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-MAD=\u062f.\u0645.\u200f
+MAD=د.م.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_OM.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_OM.properties
index 4cb4ca42826..2ad8f771ae8 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_OM.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_OM.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-OMR=\u0631.\u0639.\u200f
+OMR=ر.ع.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_QA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_QA.properties
index 96c76745438..e23b805cd1a 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_QA.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_QA.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-QAR=\u0631.\u0642.\u200f
+QAR=ر.ق.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SA.properties
index 9a6a09aa901..e01772cb904 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SA.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SA.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-SAR=\u0631.\u0633.\u200f
+SAR=ر.س.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SD.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SD.properties
index 2f7fc25bc23..a4579035f61 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SD.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SD.properties
@@ -35,6 +35,6 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-SDG=\u062c.\u0633.\u200f
-SDD=\u062f.\u0633.\u200f
+SDG=ج.س.‏
+SDD=د.س.‏
 
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SY.properties
index 3fd70da1601..3e3801fec84 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SY.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_SY.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-SYP=\u0644.\u0633.\u200f
+SYP=ل.س.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_TN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_TN.properties
index 8a3234c8386..75405e4d612 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_TN.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_TN.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-TND=\u062f.\u062a.\u200f
+TND=د.ت.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_YE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_YE.properties
index 79aeab7887c..44a08d5204d 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_YE.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ar_YE.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-YER=\u0631.\u064a.\u200f
+YER=ر.ي.‏
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties
index ca581b9374c..b74c0df0397 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-BYN=\u0420\u0443\u0431
-BYR=\u0420\u0443\u0431
+BYN=Руб
+BYR=Руб
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_bg_BG.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_bg_BG.properties
index 578f479c2ec..14a755a7f6b 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_bg_BG.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_bg_BG.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-BGN=\u043B\u0432.
+BGN=лв.
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ca_ES.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ca_ES.properties
index 4ee09595177..f28d2994346 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ca_ES.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ca_ES.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 ESP=Pts
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_cs_CZ.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_cs_CZ.properties
index 89b9b75153b..e336ca32ed4 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_cs_CZ.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_cs_CZ.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-CZK=K\u010d
+CZK=Kč
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_da_DK.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_da_DK.properties
index e9b586acdcb..711095f4327 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_da_DK.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_da_DK.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 DKK=kr
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties
index f21a043e11c..382d075b222 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties
@@ -66,10 +66,10 @@ afa=Afghani (1927-2002)
 afn=Afghani
 all=Albanischer Lek
 amd=Armenischer Dram
-ang=Gulden (Niederl\u00E4ndische Antillen)
+ang=Gulden (Niederländische Antillen)
 aoa=Kwanza (Angola)
 ars=Argentinischer Peso
-ats=\u00D6sterreichischer Schilling
+ats=Österreichischer Schilling
 aud=Australische Dollar
 awg=Aruba Florin
 azm=Aserbaidschainischer Manat (1993-2006)
@@ -90,9 +90,9 @@ brl=Brasilianischer Real
 bsd=Bahama-Dollar
 btn=Ngultrum (Bhutan)
 bwp=Botswanischer Pula
-byb=Wei\u00DFrussischer Rubel (1994-1999)
-byn=Wei\u00DFrussischer Rubel
-byr=Wei\u00DFrussischer Rubel (2000-2016)
+byb=Weißrussischer Rubel (1994-1999)
+byn=Weißrussischer Rubel
+byr=Weißrussischer Rubel (2000-2016)
 bzd=Belize-Dollar
 cad=Kanadischer Dollar
 cdf=Kongo-Franc
@@ -101,7 +101,7 @@ clf=Chilenische Unidad de Fomento (UF)
 clp=Chilenischer Peso
 cny=Chinesischer Yuan
 cop=Kolumbianischer Peso
-crc=Costa-Rica-Col\u00F3n
+crc=Costa-Rica-Colón
 csd=Serbischer Dinar (2002-2006)
 cuc=Kubanischer konvertibler Peso
 cup=Kubanischer Peso
@@ -110,19 +110,19 @@ cyp=Zypern-Pfund
 czk=Tschechische Krone
 dem=Deutsche Mark
 djf=Dschibuti-Franc
-dkk=D\u00E4nische Krone
+dkk=Dänische Krone
 dop=Dominikanischer Peso
 dzd=Algerischer Dinar
 eek=Estnische Krone
-egp=\u00C4gyptisches Pfund
+egp=Ägyptisches Pfund
 ern=Eritreischer Nakfa
 esp=Spanische Pesete
-etb=\u00C4thiopischer Birr
+etb=Äthiopischer Birr
 eur=Euro
 fim=Finnische Mark
 fjd=Fidschi-Dollar
 fkp=Falklandinseln-Pfund
-frf=Franz\u00F6sischer Franc
+frf=Französischer Franc
 gbp=Britisches Pfund
 gel=Georgische Lari
 ghc=Ghanaischer Cedi (1979-2007)
@@ -145,7 +145,7 @@ ils=Neuer israelischer Schekel
 inr=Indische Rupie
 iqd=Irakischer Dinar
 irr=Iranischer Rial
-isk=Isl\u00E4ndische Krone
+isk=Isländische Krone
 itl=Italienische Lire
 jmd=Jamaikanischer Dollar
 jod=Jordanischer Dinar
@@ -155,7 +155,7 @@ kgs=Kirgisischer Som
 khr=Kambodschanischer Riel
 kmf=Komoren-Franc
 kpw=Nordkoreanischer Won
-krw=S\u00FCdkoreanischer Won
+krw=Südkoreanischer Won
 kwd=Kuwaitischer Dinar
 kyd=Kaiman-Dollar
 kzt=Kasachischer Tenge
@@ -189,11 +189,11 @@ mzm=Mosambikanischer Metical (1980-2006)
 mzn=Mosambikanischer Metical
 nad=Namibischer Dollar
 ngn=Nigerianische Naira
-nio=C\u00F3rdoba Oro
-nlg=Niederl\u00E4ndischer Gulden
+nio=Córdoba Oro
+nlg=Niederländischer Gulden
 nok=Norwegische Krone
 npr=Nepalesische Rupie
-nzd=Neuseel\u00E4ndischer Dollar
+nzd=Neuseeländischer Dollar
 omr=Omani-Rial
 pab=Panamaischer Balboa
 pen=Peruanischer Sol
@@ -204,8 +204,8 @@ pln=Polnischer Zloty
 pte=Portuguiesischer Escudo
 pyg=Paraguayischer Guarani
 qar=Katar-Riyal
-rol=Rum\u00E4nischer Leu (1952-2006)
-ron=Rum\u00E4nischer Leu
+rol=Rumänischer Leu (1952-2006)
+ron=Rumänischer Leu
 rsd=Serbischer Dinar
 rub=Russischer Rubel
 rur=Russischer Rubel (1991-1998)
@@ -225,35 +225,35 @@ sll=Sierra-leonischer Leone
 sos=Somalischer Schilling
 srd=Suriname-Dollar
 srg=Suriname-Gulden
-ssp=S\u00FCdsudanesisches Pfund
-std=Dobra (S\u00E3o Tom\u00E9 und Pr\u00EDncipe)
-stn=Dobra (S\u00E3o Tom\u00E9 und Pr\u00EDncipe)
-svc=El-Salvador-Col\u00F3n
+ssp=Südsudanesisches Pfund
+std=Dobra (São Tomé und Príncipe)
+stn=Dobra (São Tomé und Príncipe)
+svc=El-Salvador-Colón
 syp=Syrisches Pfund
 szl=Lilangeni (Swasiland)
-thb=Thail\u00E4ndischer Baht
+thb=Thailändischer Baht
 tjs=Somoni (Tadschikistan)
 tmm=Turkmenistan-Manat (1993-2009)
 tmt=Turkmenistan-Manat
 tnd=Tunesischer Dinar
 top=Pa'anga (Tonga)
 tpe=Escudo (Portugiesisch-Timor)
-trl=T\u00FCrkische Lira (1922-2005)
-try=T\u00FCrkische Lira
+trl=Türkische Lira (1922-2005)
+try=Türkische Lira
 ttd=Trinidad/Tobago-Dollar
 twd=Neu-Taiwan Dollar
 tzs=Tansania-Schilling
 uah=Ukrainische Hrywnja
 ugx=Uganda-Schilling
 usd=US-Dollar
-usn=US-Dollar (n\u00E4chster Tag)
+usn=US-Dollar (nächster Tag)
 uss=US-Dollar (gleicher Tag)
 uyu=Peso
 uzs=Usbekistan-Sum
-veb=Venezolanischer Bol\u00EDvar (1871-2008)
-ved=Venezolanischer Bol\u00EDvar
-vef=Venezolanischer Bol\u00EDvar Fuerte
-ves=Venezolanischer Bol\u00EDvar
+veb=Venezolanischer Bolívar (1871-2008)
+ved=Venezolanischer Bolívar
+vef=Venezolanischer Bolívar Fuerte
+ves=Venezolanischer Bolívar
 vnd=Vietnamesischer Dong
 vuv=Vanuatu-Vatu
 wst=Samoanischer Tala
@@ -262,23 +262,23 @@ xag=Silber
 xau=Gold
 xba=European Composite Unit
 xbb=European Monetary Unit
-xbc=Europ\u00E4ische Rechnungseinheit (XBC)
-xbd=Europ\u00E4ische Rechnungseinheit (XBD)
+xbc=Europäische Rechnungseinheit (XBC)
+xbd=Europäische Rechnungseinheit (XBD)
 xcd=Dollar, Ostkaribik
 xdr=Sonderziehungsrechte
-xfo=Franz\u00F6sischer Goldfranken
-xfu=Franz\u00F6sischer UIC-Franc
+xfo=Französischer Goldfranken
+xfu=Französischer UIC-Franc
 xof=CFA-Franc BCEAO
 xpd=Palladium
 xpf=CFP-Franc
 xpt=Platin
 xsu=Sucre
-xts=Testw\u00E4hrungscode
+xts=Testwährungscode
 xua=ADB Unit of Account
-xxx=Unbekannte W\u00E4hrung
+xxx=Unbekannte Währung
 yer=Jemen-Rial
 yum=Neuer jugoslawischer Dinar (1994-2002)
-zar=S\u00FCdafrikanischer Rand
+zar=Südafrikanischer Rand
 zmk=Sambischer Kwacha
 zwd=Simbabwe-Dollar (1980-2008)
 zwl=Simbabwe-Dollar (2009)
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_AT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_AT.properties
index 8480f12b88d..678e62c5136 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_AT.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_AT.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
-ATS=\u00F6S
+EUR=€
+ATS=öS
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_DE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_DE.properties
index 050dbc4d277..5bd79dfb9b0 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_DE.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_DE.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 DEM=DM
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_LU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_LU.properties
index 9703712c380..45bc48db0eb 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_LU.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de_LU.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 LUF=F
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_CY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_CY.properties
index 99395622561..14b7419daf6 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_CY.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_CY.properties
@@ -40,5 +40,5 @@
 
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
-CYP=\u00a3
-EUR=\u20ac
+CYP=£
+EUR=€
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_GR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_GR.properties
index be291b10a39..51c5a5c19a4 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_GR.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_el_GR.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
-GRD=\u03B4\u03C1\u03C7
+EUR=€
+GRD=δρχ
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_GB.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_GB.properties
index 0385077b3f8..7d54eef1d20 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_GB.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_GB.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
-GBP=\u00A3
+EUR=€
+GBP=£
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IE.properties
index 61e235108f7..09f53561af3 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IE.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_IE.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
-IEP=IR\u00A3
+EUR=€
+IEP=IR£
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_MT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_MT.properties
index 90c1ac608bd..5c14061e65c 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_MT.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_en_MT.properties
@@ -41,4 +41,4 @@
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
 MTL=Lm
-EUR=\u20ac
+EUR=€
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es.properties
index 185e4019168..77fe00691cc 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es.properties
@@ -64,53 +64,53 @@
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 #
 adp=peseta andorrana
-aed=d\u00edrham de los Emiratos \u00c1rabes Unidos
-afa=afgani (1927\u20132002)
+aed=dírham de los Emiratos Árabes Unidos
+afa=afgani (1927–2002)
 afn=afgani
 all=lek
 amd=dram
-ang=flor\u00edn antillano
+ang=florín antillano
 aoa=kuanza
 ars=peso argentino
-ats=chel\u00edn austriaco
-aud=d\u00f3lar australiano
-awg=flor\u00edn arube\u00f1o
-azm=manat azer\u00ed (1993\u20132006)
+ats=chelín austriaco
+aud=dólar australiano
+awg=florín arubeño
+azm=manat azerí (1993–2006)
 azn=manat azerbaiyano
 bam=marco convertible de Bosnia y Herzegovina
-bbd=d\u00f3lar barbadense
+bbd=dólar barbadense
 bdt=taka
 bef=franco belga
-bgl=lev fuerte b\u00falgaro
-bgn=leva b\u00falgara
-bhd=dinar barein\u00ed
-bif=franco burund\u00e9s
-bmd=d\u00f3lar bermude\u00f1o
-bnd=d\u00f3lar bruneano
+bgl=lev fuerte búlgaro
+bgn=leva búlgara
+bhd=dinar bareiní
+bif=franco burundés
+bmd=dólar bermudeño
+bnd=dólar bruneano
 bob=boliviano
 bov=MVDOL boliviano
-brl=real brasile\u00f1o
-bsd=d\u00f3lar bahame\u00f1o
+brl=real brasileño
+bsd=dólar bahameño
 btn=gultrum
 bwp=pula
-byb=nuevo rublo bielorruso (1994\u20131999)
-byr=rublo bielorruso (2000\u20132016)
-bzd=d\u00f3lar belice\u00f1o
-cad=d\u00f3lar canadiense
-cdf=franco congole\u00f1o
+byb=nuevo rublo bielorruso (1994–1999)
+byr=rublo bielorruso (2000–2016)
+bzd=dólar beliceño
+cad=dólar canadiense
+cdf=franco congoleño
 chf=franco suizo
 clf=unidad de fomento chilena
 clp=peso chileno
 cny=yuan
 cop=peso colombiano
-crc=col\u00f3n costarricense
+crc=colón costarricense
 csd=antiguo dinar serbio
 cuc=peso cubano convertible
 cup=peso cubano
 cve=escudo de Cabo Verde
 cyp=libra chipriota
 czk=corona checa
-dem=marco alem\u00e1n
+dem=marco alemán
 djf=franco yibutiano
 dkk=corona danesa
 dop=peso dominicano
@@ -118,59 +118,59 @@ dzd=dinar argelino
 eek=corona estonia
 egp=libra egipcia
 ern=nakfa
-esp=peseta espa\u00f1ola
+esp=peseta española
 etb=bir
 eur=euro
-fim=marco finland\u00e9s
-fjd=d\u00f3lar fiyiano
+fim=marco finlandés
+fjd=dólar fiyiano
 fkp=libra malvinense
-frf=franco franc\u00e9s
+frf=franco francés
 gbp=libra esterlina
 gel=lari
-ghc=cedi ghan\u00e9s (1979\u20132007)
+ghc=cedi ghanés (1979–2007)
 ghs=cedi
-gip=libra gibraltare\u00f1a
+gip=libra gibraltareña
 gmd=dalasi
 gnf=franco guineano
 grd=dracma griego
 gtq=quetzal guatemalteco
-gwp=peso de Guinea-Biss\u00e1u
-gyd=d\u00f3lar guyan\u00e9s
-hkd=d\u00f3lar hongkon\u00e9s
-hnl=lempira hondure\u00f1o
+gwp=peso de Guinea-Bissáu
+gyd=dólar guyanés
+hkd=dólar hongkonés
+hnl=lempira hondureño
 hrk=kuna
 htg=gurde haitiano
-huf=forinto h\u00fangaro
+huf=forinto húngaro
 idr=rupia indonesia
 iep=libra irlandesa
-ils=nuevo s\u00e9quel israel\u00ed
+ils=nuevo séquel israelí
 inr=rupia india
-iqd=dinar iraqu\u00ed
-irr=rial iran\u00ed
+iqd=dinar iraquí
+irr=rial iraní
 isk=corona islandesa
 itl=lira italiana
-jmd=d\u00f3lar jamaicano
+jmd=dólar jamaicano
 jod=dinar jordano
 jpy=yen
-kes=chel\u00edn keniano
+kes=chelín keniano
 kgs=som
 khr=riel
 kmf=franco comorense
 kpw=won norcoreano
 krw=won surcoreano
-kwd=dinar kuwait\u00ed
-kyd=d\u00f3lar de las Islas Caim\u00e1n
+kwd=dinar kuwaití
+kyd=dólar de las Islas Caimán
 kzt=tengue kazajo
 lak=kip
 lbp=libra libanesa
 lkr=rupia esrilanquesa
-lrd=d\u00f3lar liberiano
+lrd=dólar liberiano
 lsl=loti lesotense
 ltl=litas lituano
-luf=franco luxemburgu\u00e9s
-lvl=lats let\u00f3n
+luf=franco luxemburgués
+lvl=lats letón
 lyd=dinar libio
-mad=d\u00edrham marroqu\u00ed
+mad=dírham marroquí
 mdl=leu moldavo
 mga=ariari
 mgf=franco malgache
@@ -178,101 +178,101 @@ mkd=dinar macedonio
 mmk=kiat
 mnt=tugrik
 mop=pataca de Macao
-mro=uguiya (1973\u20132017)
+mro=uguiya (1973–2017)
 mtl=lira maltesa
 mur=rupia mauriciana
 mvr=rufiya
-mwk=kuacha malau\u00ed
+mwk=kuacha malauí
 mxn=peso mexicano
-mxv=unidad de inversi\u00f3n (UDI) mexicana
+mxv=unidad de inversión (UDI) mexicana
 myr=ringit
-mzm=antiguo metical mozambique\u00f1o
+mzm=antiguo metical mozambiqueño
 mzn=metical
-nad=d\u00f3lar namibio
+nad=dólar namibio
 ngn=naira
-nio=c\u00f3rdoba oro
-nlg=flor\u00edn neerland\u00e9s
+nio=córdoba oro
+nlg=florín neerlandés
 nok=corona noruega
-npr=rupia nepal\u00ed
-nzd=d\u00f3lar neozeland\u00e9s
-omr=rial oman\u00ed
-pab=balboa paname\u00f1o
+npr=rupia nepalí
+nzd=dólar neozelandés
+omr=rial omaní
+pab=balboa panameño
 pen=sol peruano
 pgk=kina
 php=peso filipino
-pkr=rupia pakistan\u00ed
+pkr=rupia pakistaní
 pln=esloti
-pte=escudo portugu\u00e9s
-pyg=guaran\u00ed paraguayo
-qar=rial catar\u00ed
+pte=escudo portugués
+pyg=guaraní paraguayo
+qar=rial catarí
 rol=antiguo leu rumano
 ron=leu rumano
 rsd=dinar serbio
 rub=rublo ruso
-rur=rublo ruso (1991\u20131998)
-rwf=franco ruand\u00e9s
-sar=rial saud\u00ed
-sbd=d\u00f3lar salomonense
+rur=rublo ruso (1991–1998)
+rwf=franco ruandés
+sar=rial saudí
+sbd=dólar salomonense
 scr=rupia seychellense
-sdd=dinar sudan\u00e9s
+sdd=dinar sudanés
 sdg=libra sudanesa
 sek=corona sueca
-sgd=d\u00f3lar singapurense
+sgd=dólar singapurense
 shp=libra de Santa Elena
-sit=t\u00f3lar esloveno
+sit=tólar esloveno
 skk=corona eslovaca
 sll=leona
-sos=chel\u00edn somal\u00ed
-srd=d\u00f3lar surinam\u00e9s
-srg=flor\u00edn surinam\u00e9s
-std=dobra (1977\u20132017)
-svc=col\u00f3n salvadore\u00f1o
+sos=chelín somalí
+srd=dólar surinamés
+srg=florín surinamés
+std=dobra (1977–2017)
+svc=colón salvadoreño
 syp=libra siria
 szl=lilangeni
 thb=bat
 tjs=somoni tayiko
-tmm=manat turcomano (1993\u20132009)
+tmm=manat turcomano (1993–2009)
 tmt=manat turcomano
 tnd=dinar tunecino
 top=paanga
 tpe=escudo timorense
-trl=lira turca (1922\u20132005)
+trl=lira turca (1922–2005)
 try=lira turca
-ttd=d\u00f3lar de Trinidad y Tobago
-twd=nuevo d\u00f3lar taiwan\u00e9s
-tzs=chel\u00edn tanzano
+ttd=dólar de Trinidad y Tobago
+twd=nuevo dólar taiwanés
+tzs=chelín tanzano
 uah=grivna
-ugx=chel\u00edn ugand\u00e9s
-usd=d\u00f3lar estadounidense
-usn=d\u00f3lar estadounidense (d\u00eda siguiente)
-uss=d\u00f3lar estadounidense (mismo d\u00eda)
+ugx=chelín ugandés
+usd=dólar estadounidense
+usn=dólar estadounidense (día siguiente)
+uss=dólar estadounidense (mismo día)
 uyu=peso uruguayo
 uzs=sum
-veb=bol\u00edvar venezolano (1871\u20132008)
-vef=bol\u00edvar venezolano (2008\u20132018)
+veb=bolívar venezolano (1871–2008)
+vef=bolívar venezolano (2008–2018)
 vnd=dong
 vuv=vatu
 wst=tala
-xaf=franco CFA de \u00c1frica Central
+xaf=franco CFA de África Central
 xag=plata
 xau=oro
 xba=unidad compuesta europea
 xbb=unidad monetaria europea
 xbc=unidad de cuenta europea (XBC)
 xbd=unidad de cuenta europea (XBD)
-xcd=d\u00f3lar del Caribe Oriental
+xcd=dólar del Caribe Oriental
 xdr=derechos especiales de giro
-xfo=franco oro franc\u00e9s
-xfu=franco UIC franc\u00e9s
-xof=franco CFA de \u00c1frica Occidental
+xfo=franco oro francés
+xfu=franco UIC francés
+xof=franco CFA de África Occidental
 xpd=paladio
 xpf=franco CFP
 xpt=platino
-xts=c\u00f3digo reservado para pruebas
+xts=código reservado para pruebas
 xxx=moneda desconocida
-yer=rial yemen\u00ed
+yer=rial yemení
 yum=super dinar yugoslavo
 zar=rand
-zmk=kwacha zambiano (1968\u20132012)
-zwd=d\u00f3lar de Zimbabue
-zwl=d\u00f3lar zimbabuense
+zmk=kwacha zambiano (1968–2012)
+zwd=dólar de Zimbabue
+zwl=dólar zimbabuense
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_ES.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_ES.properties
index 4ee09595177..f28d2994346 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_ES.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_es_ES.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 ESP=Pts
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_et_EE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_et_EE.properties
index cdc42148ad6..9de98942878 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_et_EE.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_et_EE.properties
@@ -65,5 +65,5 @@
 #
 EEK=kr
 eek=Eesti kroon
-EUR=\u20ac
+EUR=€
 eur=euro
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fi_FI.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fi_FI.properties
index fedab6eec8d..61a5103231d 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fi_FI.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fi_FI.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 FIM=mk
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr.properties
index ee1ab0e7255..acba66e9bca 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr.properties
@@ -64,107 +64,107 @@
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 #
 adp=peseta andorrane
-aed=dirham des \u00c9mirats arabes unis
-afa=afghani (1927\u20132002)
+aed=dirham des Émirats arabes unis
+afa=afghani (1927–2002)
 afn=afghani afghan
 all=lek albanais
-amd=dram arm\u00e9nien
+amd=dram arménien
 ang=florin antillais
 aoa=kwanza angolais
 ars=peso argentin
 ats=schilling autrichien
 aud=dollar australien
 awg=florin arubais
-azm=manat az\u00e9ri (1993\u20132006)
-azn=manat az\u00e9ri
+azm=manat azéri (1993–2006)
+azn=manat azéri
 bam=mark convertible bosniaque
 bbd=dollar barbadien
 bdt=taka bangladeshi
 bef=franc belge
-bgl=lev bulgare (1962\u20131999)
+bgl=lev bulgare (1962–1999)
 bgn=lev bulgare
-bhd=dinar bahre\u00efni
+bhd=dinar bahreïni
 bif=franc burundais
 bmd=dollar bermudien
-bnd=dollar brun\u00e9ien
+bnd=dollar brunéien
 bob=boliviano bolivien
 bov=mvdol bolivien
-brl=r\u00e9al br\u00e9silien
-bsd=dollar baham\u00e9en
+brl=réal brésilien
+bsd=dollar bahaméen
 btn=ngultrum bouthanais
 bwp=pula botswanais
-byb=nouveau rouble bi\u00e9lorusse (1994\u20131999)
-byr=rouble bi\u00e9lorusse (2000\u20132016)
-bzd=dollar b\u00e9liz\u00e9en
+byb=nouveau rouble biélorusse (1994–1999)
+byr=rouble biélorusse (2000–2016)
+bzd=dollar bélizéen
 cad=dollar canadien
 cdf=franc congolais
 chf=franc suisse
-clf=unit\u00e9 d\u2019investissement chilienne
+clf=unité d’investissement chilienne
 clp=peso chilien
 cny=yuan renminbi chinois
 cop=peso colombien
-crc=col\u00f3n costaricain
-csd=dinar serbo-mont\u00e9n\u00e9grin
+crc=colón costaricain
+csd=dinar serbo-monténégrin
 cuc=peso cubain convertible
 cup=peso cubain
 cve=escudo capverdien
 cyp=livre chypriote
-czk=couronne tch\u00e8que
+czk=couronne tchèque
 dem=mark allemand
 djf=franc djiboutien
 dkk=couronne danoise
 dop=peso dominicain
-dzd=dinar alg\u00e9rien
+dzd=dinar algérien
 eek=couronne estonienne
-egp=livre \u00e9gyptienne
-ern=nafka \u00e9rythr\u00e9en
+egp=livre égyptienne
+ern=nafka érythréen
 esp=peseta espagnole
-etb=birr \u00e9thiopien
+etb=birr éthiopien
 eur=euro
 fim=mark finlandais
 fjd=dollar fidjien
-fkp=livre des \u00eeles Malouines
-frf=franc fran\u00e7ais
+fkp=livre des îles Malouines
+frf=franc français
 gbp=livre sterling
-gel=lari g\u00e9orgien
-ghc=c\u00e9di
-ghs=c\u00e9di ghan\u00e9en
+gel=lari géorgien
+ghc=cédi
+ghs=cédi ghanéen
 gip=livre de Gibraltar
 gmd=dalasi gambien
-gnf=franc guin\u00e9en
+gnf=franc guinéen
 grd=drachme grecque
-gtq=quetzal guat\u00e9malt\u00e8que
-gwp=peso bissau-guin\u00e9en
+gtq=quetzal guatémaltèque
+gwp=peso bissau-guinéen
 gyd=dollar du Guyana
 hkd=dollar de Hong Kong
 hnl=lempira hondurien
 hrk=kuna croate
-htg=gourde ha\u00eftienne
+htg=gourde haïtienne
 huf=forint hongrois
-idr=roupie indon\u00e9sienne
+idr=roupie indonésienne
 iep=livre irlandaise
-ils=nouveau shekel isra\u00e9lien
+ils=nouveau shekel israélien
 inr=roupie indienne
 iqd=dinar irakien
 irr=riyal iranien
 isk=couronne islandaise
 itl=lire italienne
-jmd=dollar jama\u00efcain
+jmd=dollar jamaïcain
 jod=dinar jordanien
 jpy=yen japonais
-kes=shilling k\u00e9nyan
+kes=shilling kényan
 kgs=som kirghize
 khr=riel cambodgien
 kmf=franc comorien
-kpw=won nord-cor\u00e9en
-krw=won sud-cor\u00e9en
-kwd=dinar kowe\u00eftien
-kyd=dollar des \u00eeles Ca\u00efmans
+kpw=won nord-coréen
+krw=won sud-coréen
+kwd=dinar koweïtien
+kyd=dollar des îles Caïmans
 kzt=tenge kazakh
 lak=kip loatien
 lbp=livre libanaise
 lkr=roupie srilankaise
-lrd=dollar lib\u00e9rien
+lrd=dollar libérien
 lsl=loti lesothan
 ltl=litas lituanien
 luf=franc luxembourgeois
@@ -174,94 +174,94 @@ mad=dirham marocain
 mdl=leu moldave
 mga=ariary malgache
 mgf=franc malgache
-mkd=denar mac\u00e9donien
+mkd=denar macédonien
 mmk=kyat myanmarais
 mnt=tugrik mongol
 mop=pataca macanaise
-mro=ouguiya mauritanien (1973\u20132017)
+mro=ouguiya mauritanien (1973–2017)
 mtl=lire maltaise
 mur=roupie mauricienne
 mvr=rufiyaa maldivien
 mwk=kwacha malawite
 mxn=peso mexicain
-mxv=unit\u00e9 de conversion mexicaine (UDI)
+mxv=unité de conversion mexicaine (UDI)
 myr=ringgit malais
-mzm=m\u00e9tical
+mzm=métical
 mzn=metical mozambicain
 nad=dollar namibien
-ngn=naira nig\u00e9rian
-nio=c\u00f3rdoba oro nicaraguayen
-nlg=florin n\u00e9erlandais
-nok=couronne norv\u00e9gienne
-npr=roupie n\u00e9palaise
-nzd=dollar n\u00e9o-z\u00e9landais
+ngn=naira nigérian
+nio=córdoba oro nicaraguayen
+nlg=florin néerlandais
+nok=couronne norvégienne
+npr=roupie népalaise
+nzd=dollar néo-zélandais
 omr=riyal omanais
-pab=balboa panam\u00e9en
-pen=sol p\u00e9ruvien
-pgk=kina papouan-n\u00e9o-guin\u00e9en
+pab=balboa panaméen
+pen=sol péruvien
+pgk=kina papouan-néo-guinéen
 php=peso philippin
 pkr=roupie pakistanaise
 pln=zloty polonais
 pte=escudo portugais
-pyg=guaran\u00ed paraguayen
+pyg=guaraní paraguayen
 qar=riyal qatari
 rol=ancien leu roumain
 ron=leu roumain
 rsd=dinar serbe
 rub=rouble russe
-rur=rouble russe (1991\u20131998)
+rur=rouble russe (1991–1998)
 rwf=franc rwandais
 sar=riyal saoudien
-sbd=dollar des \u00eeles Salomon
+sbd=dollar des îles Salomon
 scr=roupie des Seychelles
 sdd=dinar soudanais
 sdg=livre soudanaise
-sek=couronne su\u00e9doise
+sek=couronne suédoise
 sgd=dollar de Singapour
-shp=livre de Sainte-H\u00e9l\u00e8ne
-sit=tolar slov\u00e8ne
+shp=livre de Sainte-Hélène
+sit=tolar slovène
 skk=couronne slovaque
-sll=leone sierra-l\u00e9onais
+sll=leone sierra-léonais
 sos=shilling somalien
 srd=dollar surinamais
 srg=florin surinamais
-std=dobra santom\u00e9en (1977\u20132017)
-svc=col\u00f3n salvadorien
+std=dobra santoméen (1977–2017)
+svc=colón salvadorien
 syp=livre syrienne
 szl=lilangeni swazi
-thb=baht tha\u00eflandais
+thb=baht thaïlandais
 tjs=somoni tadjik
-tmm=manat turkm\u00e8ne
-tmt=nouveau manat turkm\u00e8ne
+tmm=manat turkmène
+tmt=nouveau manat turkmène
 tnd=dinar tunisien
-top=pa\u2019anga tongan
+top=pa’anga tongan
 tpe=escudo timorais
-trl=livre turque (1844\u20132005)
+trl=livre turque (1844–2005)
 try=livre turque
-ttd=dollar de Trinit\u00e9-et-Tobago
-twd=nouveau dollar ta\u00efwanais
+ttd=dollar de Trinité-et-Tobago
+twd=nouveau dollar taïwanais
 tzs=shilling tanzanien
 uah=hryvnia ukrainienne
 ugx=shilling ougandais
-usd=dollar des \u00c9tats-Unis
+usd=dollar des États-Unis
 usn=dollar des Etats-Unis (jour suivant)
-uss=dollar des Etats-Unis (jour m\u00eame)
+uss=dollar des Etats-Unis (jour même)
 uyu=peso uruguayen
 uzs=sum ouzbek
-veb=bolivar v\u00e9n\u00e9zu\u00e9lien (1871\u20132008)
-vef=bolivar v\u00e9n\u00e9zu\u00e9lien (2008\u20132018)
-vnd=d\u00f4ng vietnamien
+veb=bolivar vénézuélien (1871–2008)
+vef=bolivar vénézuélien (2008–2018)
+vnd=dông vietnamien
 vuv=vatu vanuatuan
 wst=tala samoan
 xaf=franc CFA (BEAC)
 xag=argent
 xau=or
-xba=unit\u00e9 europ\u00e9enne compos\u00e9e
-xbb=unit\u00e9 mon\u00e9taire europ\u00e9enne
-xbc=unit\u00e9 de compte europ\u00e9enne (XBC)
-xbd=unit\u00e9 de compte europ\u00e9enne (XBD)
-xcd=dollar des Cara\u00efbes orientales
-xdr=droit de tirage sp\u00e9cial
+xba=unité européenne composée
+xbb=unité monétaire européenne
+xbc=unité de compte européenne (XBC)
+xbd=unité de compte européenne (XBD)
+xcd=dollar des Caraïbes orientales
+xdr=droit de tirage spécial
 xfo=franc or
 xfu=franc UIC
 xof=franc CFA (BCEAO)
@@ -270,8 +270,8 @@ xpf=franc CFP
 xpt=platine
 xts=(devise de test)
 xxx=devise inconnue ou non valide
-yer=riyal y\u00e9m\u00e9nite
+yer=riyal yéménite
 yum=dinar yougoslave Noviy
 zar=rand sud-africain
-zmk=kwacha zambien (1968\u20132012)
-zwd=dollar zimbabw\u00e9en
+zmk=kwacha zambien (1968–2012)
+zwd=dollar zimbabwéen
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_BE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_BE.properties
index 1c685faaa0f..2756c4b3970 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_BE.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_BE.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 BEF=FB
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_FR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_FR.properties
index 7b0618b34cf..37ef59334e0 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_FR.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_FR.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 FRF=F
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_LU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_LU.properties
index 9703712c380..45bc48db0eb 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_LU.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_fr_LU.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 LUF=F
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ga_IE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ga_IE.properties
index 580ffed1641..770a47ce5e2 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ga_IE.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ga_IE.properties
@@ -40,4 +40,4 @@
 
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
-EUR=\u20ac
+EUR=€
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_he_IL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_he_IL.properties
index e6d15ff7349..ddc6e578314 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_he_IL.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_he_IL.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-ILS=\u05e9\"\u05d7
+ILS=ש\"ח
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hi_IN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hi_IN.properties
index 84496306786..fa3755e45b9 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hi_IN.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hi_IN.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-INR=\u0930\u0942
+INR=रू
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
index dbb4aa39d21..a9d887d4af3 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 HRK=Kn
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties
index 34c50d5ccf2..13595c13707 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties
@@ -65,7 +65,7 @@
 #
 adp=peseta andorrana
 aed=dirham degli Emirati Arabi Uniti
-afa=afgani (1927\u20132002)
+afa=afgani (1927–2002)
 afn=afghani
 all=lek albanese
 amd=dram armeno
@@ -75,13 +75,13 @@ ars=peso argentino
 ats=scellino austriaco
 aud=dollaro australiano
 awg=fiorino di Aruba
-azm=manat azero (1993\u20132006)
+azm=manat azero (1993–2006)
 azn=manat azero
 bam=marco convertibile della Bosnia-Herzegovina
 bbd=dollaro di Barbados
 bdt=taka bangladese
 bef=franco belga
-bgl=lev bulgaro (1962\u20131999)
+bgl=lev bulgaro (1962–1999)
 bgn=lev bulgaro
 bhd=dinaro del Bahrein
 bif=franco del Burundi
@@ -93,8 +93,8 @@ brl=real brasiliano
 bsd=dollaro delle Bahamas
 btn=ngultrum bhutanese
 bwp=pula del Botswana
-byb=nuovo rublo bielorusso (1994\u20131999)
-byr=rublo bielorusso (2000\u20132016)
+byb=nuovo rublo bielorusso (1994–1999)
+byr=rublo bielorusso (2000–2016)
 bzd=dollaro del Belize
 cad=dollaro canadese
 cdf=franco congolese
@@ -103,7 +103,7 @@ clf=unidades de fomento chilene
 clp=peso cileno
 cny=renminbi cinese
 cop=peso colombiano
-crc=col\u00f3n costaricano
+crc=colón costaricano
 cup=peso cubano
 cve=escudo capoverdiano
 cyp=sterlina cipriota
@@ -113,7 +113,7 @@ djf=franco di Gibuti
 dkk=corona danese
 dop=peso dominicano
 dzd=dinaro algerino
-eek=corona dell\u2019Estonia
+eek=corona dell’Estonia
 egp=sterlina egiziana
 ern=nakfa eritreo
 esp=peseta spagnola
@@ -175,7 +175,7 @@ mkd=dinaro macedone
 mmk=kyat di Myanmar
 mnt=tugrik mongolo
 mop=pataca di Macao
-mro=ouguiya della Mauritania (1973\u20132017)
+mro=ouguiya della Mauritania (1973–2017)
 mtl=lira maltese
 mur=rupia mauriziana
 mvr=rufiyaa delle Maldive
@@ -186,7 +186,7 @@ myr=ringgit malese
 mzn=metical mozambicano
 nad=dollaro namibiano
 ngn=naira nigeriana
-nio=c\u00f3rdoba nicaraguense
+nio=córdoba nicaraguense
 nlg=fiorino olandese
 nok=corona norvegese
 npr=rupia nepalese
@@ -197,9 +197,9 @@ pen=sol peruviano
 pgk=kina papuana
 php=peso filippino
 pkr=rupia pakistana
-pln=z\u0142oty polacco
+pln=złoty polacco
 pte=escudo portoghese
-pyg=guaran\u00ed paraguayano
+pyg=guaraní paraguayano
 qar=rial qatariano
 rol=leu della Romania
 ron=leu rumeno
@@ -214,24 +214,24 @@ sdd=dinaro sudanese
 sdg=sterlina sudanese
 sek=corona svedese
 sgd=dollaro di Singapore
-shp=sterlina di Sant\u2019Elena
+shp=sterlina di Sant’Elena
 sit=tallero sloveno
 skk=corona slovacca
 sll=leone della Sierra Leone
 sos=scellino somalo
 srd=dollaro del Suriname
 srg=fiorino del Suriname
-std=dobra di Sao Tom\u00e9 e Principe (1977\u20132017)
-svc=col\u00f3n salvadoregno
+std=dobra di Sao Tomé e Principe (1977–2017)
+svc=colón salvadoregno
 syp=lira siriana
 szl=lilangeni dello Swaziland
 thb=baht thailandese
 tjs=somoni tagiko
-tmm=manat turkmeno (1993\u20132009)
+tmm=manat turkmeno (1993–2009)
 tnd=dinaro tunisino
-top=pa\u02bbanga tongano
+top=paʻanga tongano
 tpe=escudo di Timor
-trl=lira turca (1922\u20132005)
+trl=lira turca (1922–2005)
 try=lira turca
 ttd=dollaro di Trinidad e Tobago
 twd=nuovo dollaro taiwanese
@@ -243,18 +243,18 @@ usn=dollaro statunitense (next day)
 uss=dollaro statunitense (same day)
 uyu=peso uruguayano
 uzs=sum uzbeco
-veb=bolivar venezuelano (1871\u20132008)
-vef=bol\u00edvar venezuelano (2008\u20132018)
+veb=bolivar venezuelano (1871–2008)
+vef=bolívar venezuelano (2008–2018)
 vnd=dong vietnamita
 vuv=vatu di Vanuatu
 wst=tala samoano
 xaf=franco CFA BEAC
 xag=argento
 xau=oro
-xba=unit\u00e0 composita europea
-xbb=unit\u00e0 monetaria europea
-xbc=unit\u00e0 di acconto europea (XBC)
-xbd=unit\u00e0 di acconto europea (XBD)
+xba=unità composita europea
+xbb=unità monetaria europea
+xbc=unità di acconto europea (XBC)
+xbd=unità di acconto europea (XBD)
 xcd=dollaro dei Caraibi orientali
 xdr=diritti speciali di incasso
 xfo=franco oro francese
@@ -266,5 +266,5 @@ xxx=valuta sconosciuta
 yer=riyal yemenita
 yum=dinaro noviy yugoslavo
 zar=rand sudafricano
-zmk=kwacha dello Zambia (1968\u20132012)
+zmk=kwacha dello Zambia (1968–2012)
 zwd=dollaro dello Zimbabwe
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_IT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_IT.properties
index ed02f9cff44..7af1ecb52e1 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_IT.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it_IT.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 ITL=L.
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties
index 180d09008b1..b7e345de032 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties
@@ -60,226 +60,226 @@
 # or other dealings in these Data Files or Software without prior
 # written authorization of the copyright holder.
 
-adp=\u30A2\u30F3\u30C9\u30E9\u30FB\u30DA\u30BB\u30BF
-aed=\u30A2\u30E9\u30D6\u9996\u9577\u56FD\u9023\u90A6\u30C7\u30A3\u30EB\u30CF\u30E0
-afa=\u30A2\u30D5\u30AC\u30CB\u30B9\u30BF\u30F3\u30FB\u30A2\u30D5\u30AC\u30CB\u30FC(1927-2002)
-afn=\u30A2\u30D5\u30AC\u30CB\u30B9\u30BF\u30F3\u30FB\u30A2\u30D5\u30AC\u30CB\u30FC
-all=\u30A2\u30EB\u30D0\u30CB\u30A2\u30FB\u30EC\u30AF
-amd=\u30A2\u30EB\u30E1\u30CB\u30A2\u30FB\u30C9\u30E9\u30E0
-ang=\u30AA\u30E9\u30F3\u30C0\u9818\u30A2\u30F3\u30C6\u30A3\u30EB\u30FB\u30AE\u30EB\u30C0\u30FC
-aoa=\u30A2\u30F3\u30B4\u30E9\u30FB\u30AF\u30EF\u30F3\u30B6
-ars=\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3\u30FB\u30DA\u30BD
-ats=\u30AA\u30FC\u30B9\u30C8\u30EA\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
-aud=\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u30FB\u30C9\u30EB
-awg=\u30A2\u30EB\u30D0\u30FB\u30D5\u30ED\u30FC\u30EA\u30F3
-azm=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u30FB\u30DE\u30CA\u30C8(1993-2006)
-azn=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u30FB\u30DE\u30CA\u30C8
-bam=\u30DC\u30B9\u30CB\u30A2\u30FB\u30D8\u30EB\u30C4\u30A7\u30B4\u30D3\u30CA\u514C\u63DB\u30DE\u30EB\u30AF
-bbd=\u30D0\u30EB\u30D0\u30C9\u30B9\u30FB\u30C9\u30EB
-bdt=\u30D0\u30F3\u30B0\u30E9\u30C7\u30B7\u30E5\u30FB\u30BF\u30AB
-bef=\u30D9\u30EB\u30AE\u30FC\u30FB\u30D5\u30E9\u30F3
-bgl=\u30D6\u30EB\u30AC\u30EA\u30A2\u30FB\u30CF\u30FC\u30C9\u30FB\u30EC\u30D5
-bgn=\u30D6\u30EB\u30AC\u30EA\u30A2\u65B0\u30EC\u30D5
-bhd=\u30D0\u30FC\u30EC\u30FC\u30F3\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-bif=\u30D6\u30EB\u30F3\u30B8\u30FB\u30D5\u30E9\u30F3
-bmd=\u30D0\u30EB\u30DF\u30E5\u30FC\u30C0\u30FB\u30C9\u30EB
-bnd=\u30D6\u30EB\u30CD\u30A4\u30FB\u30C9\u30EB
-bob=\u30DC\u30EA\u30D3\u30A2\u30FB\u30DC\u30EA\u30D3\u30A2\u30FC\u30CE
-bov=\u30DC\u30EA\u30D3\u30A2Mvdol
-brl=\u30D6\u30E9\u30B8\u30EB\u30FB\u30EC\u30A2\u30EB
-bsd=\u30D0\u30CF\u30DE\u30FB\u30C9\u30EB
-btn=\u30D6\u30FC\u30BF\u30F3\u30FB\u30CB\u30E5\u30EB\u30BF\u30E0
-bwp=\u30DC\u30C4\u30EF\u30CA\u30FB\u30D7\u30E9
-byb=\u30D9\u30E9\u30EB\u30FC\u30B7\u30FB\u30EB\u30FC\u30D6\u30EB(1994-1999)
-byn=\u30D9\u30E9\u30EB\u30FC\u30B7\u30FB\u30EB\u30FC\u30D6\u30EB
-byr=\u30D9\u30E9\u30EB\u30FC\u30B7\u30FB\u30EB\u30FC\u30D6\u30EB(2000-2016)
-bzd=\u30D9\u30EA\u30FC\u30BA\u30FB\u30C9\u30EB
-cad=\u30AB\u30CA\u30C0\u30FB\u30C9\u30EB
-cdf=\u30B3\u30F3\u30B4\u30FB\u30D5\u30E9\u30F3
-chf=\u30B9\u30A4\u30B9\u30FB\u30D5\u30E9\u30F3
-clf=\u30C1\u30EA\u8A08\u7B97\u5358\u4F4D(UF)
-clp=\u30C1\u30EA\u30FB\u30DA\u30BD
-cny=\u4E2D\u56FD\u4EBA\u6C11\u5143
-cop=\u30B3\u30ED\u30F3\u30D3\u30A2\u30FB\u30DA\u30BD
-crc=\u30B3\u30B9\u30BF\u30EA\u30AB\u30FB\u30B3\u30ED\u30F3
-csd=\u30BB\u30EB\u30D3\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB(2002-2006)
-cuc=\u30AD\u30E5\u30FC\u30D0\u514C\u63DB\u30DA\u30BD
-cup=\u30AD\u30E5\u30FC\u30D0\u30FB\u30DA\u30BD
-cve=\u30AB\u30FC\u30DC\u30D9\u30EB\u30C7\u30FB\u30A8\u30B9\u30AF\u30FC\u30C9
-cyp=\u30AD\u30D7\u30ED\u30B9\u30FB\u30DD\u30F3\u30C9
-czk=\u30C1\u30A7\u30B3\u5171\u548C\u56FD\u30B3\u30EB\u30CA
-dem=\u30C9\u30A4\u30C4\u30FB\u30DE\u30EB\u30AF
-djf=\u30B8\u30D6\u30C1\u30FB\u30D5\u30E9\u30F3
-dkk=\u30C7\u30F3\u30DE\u30FC\u30AF\u30FB\u30AF\u30ED\u30FC\u30CD
-dop=\u30C9\u30DF\u30CB\u30AB\u30FB\u30DA\u30BD
-dzd=\u30A2\u30EB\u30B8\u30A7\u30EA\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-eek=\u30A8\u30B9\u30C8\u30CB\u30A2\u30FB\u30AF\u30EB\u30FC\u30F3
-egp=\u30A8\u30B8\u30D7\u30C8\u30FB\u30DD\u30F3\u30C9
-ern=\u30A8\u30EA\u30C8\u30EA\u30A2\u30FB\u30CA\u30AF\u30D5\u30A1
-esp=\u30B9\u30DA\u30A4\u30F3\u30FB\u30DA\u30BB\u30BF
-etb=\u30A8\u30C1\u30AA\u30D4\u30A2\u30FB\u30D6\u30EB
-eur=\u30E6\u30FC\u30ED
-fim=\u30D5\u30A3\u30F3\u30E9\u30F3\u30C9\u30FB\u30DE\u30EB\u30AB
-fjd=\u30D5\u30A3\u30B8\u30FC\u30FB\u30C9\u30EB
-fkp=\u30D5\u30A9\u30FC\u30AF\u30E9\u30F3\u30C9\u8AF8\u5CF6\u30DD\u30F3\u30C9
-frf=\u30D5\u30E9\u30F3\u30B9\u30FB\u30D5\u30E9\u30F3
-gbp=\u82F1\u30DD\u30F3\u30C9
-gel=\u30B8\u30E7\u30FC\u30B8\u30A2\u30FB\u30E9\u30EA
-ghc=\u30AC\u30FC\u30CA\u30FB\u30BB\u30C7\u30A3(1979-2007)
-ghs=\u30AC\u30FC\u30CA\u30FB\u30BB\u30C7\u30A3
-gip=\u30B8\u30D6\u30E9\u30EB\u30BF\u30EB\u30FB\u30DD\u30F3\u30C9
-gmd=\u30AC\u30F3\u30D3\u30A2\u30FB\u30C0\u30E9\u30B7
-gnf=\u30AE\u30CB\u30A2\u30FB\u30D5\u30E9\u30F3
-grd=\u30AE\u30EA\u30B7\u30E3\u30FB\u30C9\u30E9\u30AF\u30DE
-gtq=\u30B0\u30A2\u30C6\u30DE\u30E9\u30FB\u30B1\u30C4\u30A1\u30EB
-gwp=\u30AE\u30CB\u30A2\u30D3\u30B5\u30A6\u30FB\u30DA\u30BD
-gyd=\u30AC\u30A4\u30A2\u30CA\u30FB\u30C9\u30EB
-hkd=\u9999\u6E2F\u30C9\u30EB
-hnl=\u30DB\u30F3\u30B8\u30E5\u30E9\u30B9\u30FB\u30EC\u30F3\u30D4\u30E9
-hrk=\u30AF\u30FC\u30CA
-htg=\u30CF\u30A4\u30C1\u30FB\u30B0\u30FC\u30EB\u30C9
-huf=\u30CF\u30F3\u30AC\u30EA\u30FC\u30FB\u30D5\u30A9\u30EA\u30F3\u30C8
-idr=\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u30FB\u30EB\u30D4\u30A2
-iep=\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u30FB\u30DD\u30F3\u30C9
-ils=\u30A4\u30B9\u30E9\u30A8\u30EB\u65B0\u30B7\u30A7\u30B1\u30EB
-inr=\u30A4\u30F3\u30C9\u30FB\u30EB\u30D4\u30FC
-iqd=\u30A4\u30E9\u30AF\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-irr=\u30A4\u30E9\u30F3\u30FB\u30EA\u30A2\u30EB
-isk=\u30A2\u30A4\u30B9\u30E9\u30F3\u30C9\u30FB\u30AF\u30ED\u30FC\u30CA
-itl=\u30A4\u30BF\u30EA\u30A2\u30FB\u30EA\u30E9
-jmd=\u30B8\u30E3\u30DE\u30A4\u30AB\u30FB\u30C9\u30EB
-jod=\u30E8\u30EB\u30C0\u30F3\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-jpy=\u65E5\u672C\u5186
-kes=\u30B1\u30CB\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
-kgs=\u30AD\u30EB\u30AE\u30B9\u30FB\u30BD\u30E0
-khr=\u30AB\u30F3\u30DC\u30B8\u30A2\u30FB\u30EA\u30A8\u30EB
-kmf=\u30B3\u30E2\u30ED\u30FB\u30D5\u30E9\u30F3
-kpw=\u5317\u671D\u9BAE\u30A6\u30A9\u30F3
-krw=\u97D3\u56FD\u30A6\u30A9\u30F3
-kwd=\u30AF\u30A6\u30A7\u30FC\u30C8\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-kyd=\u30B1\u30A4\u30DE\u30F3\u8AF8\u5CF6\u30C9\u30EB
-kzt=\u30AB\u30B6\u30D5\u30B9\u30BF\u30F3\u30FB\u30C6\u30F3\u30B2
-lak=\u30E9\u30AA\u30B9\u30FB\u30AD\u30FC\u30D7
-lbp=\u30EC\u30D0\u30CE\u30F3\u30FB\u30DD\u30F3\u30C9
-lkr=\u30B9\u30EA\u30E9\u30F3\u30AB\u30FB\u30EB\u30D4\u30FC
-lrd=\u30EA\u30D9\u30EA\u30A2\u30FB\u30C9\u30EB
-lsl=\u30EC\u30BD\u30C8\u30FB\u30ED\u30C6\u30A3
-ltl=\u30EA\u30C8\u30A2\u30CB\u30A2\u30FB\u30EA\u30BF\u30B9
-luf=\u30EB\u30AF\u30BB\u30F3\u30D6\u30EB\u30AF\u30FB\u30D5\u30E9\u30F3
-lvl=\u30E9\u30C8\u30D3\u30A2\u30FB\u30E9\u30C3\u30C4
-lyd=\u30EA\u30D3\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-mad=\u30E2\u30ED\u30C3\u30B3\u30FB\u30C7\u30A3\u30EB\u30CF\u30E0
-mdl=\u30E2\u30EB\u30C9\u30D0\u30FB\u30EC\u30A4
-mga=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB\u30FB\u30A2\u30EA\u30A2\u30EA
-mgf=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB\u30FB\u30D5\u30E9\u30F3
-mkd=\u30DE\u30B1\u30C9\u30CB\u30A2\u30FB\u30C7\u30CA\u30EB
-mmk=\u30DF\u30E3\u30F3\u30DE\u30FC\u30FB\u30C1\u30E3\u30C3\u30C8
-mnt=\u30E2\u30F3\u30B4\u30EB\u30FB\u30C8\u30B0\u30ED\u30B0
-mop=\u30DE\u30AB\u30AA\u30FB\u30D1\u30BF\u30AB
-mro=\u30E2\u30FC\u30EA\u30BF\u30CB\u30A2\u30FB\u30A6\u30AE\u30A2
-mru=\u30E2\u30FC\u30EA\u30BF\u30CB\u30A2\u30FB\u30A6\u30AE\u30A2
-mtl=\u30DE\u30EB\u30BF\u30FB\u30EA\u30E9
-mur=\u30E2\u30FC\u30EA\u30B7\u30E3\u30B9\u30FB\u30EB\u30D4\u30FC
-mvr=\u30E2\u30EB\u30B8\u30D6\u30FB\u30EB\u30D5\u30A3\u30A2
-mwk=\u30DE\u30E9\u30A6\u30A3\u30A2\u30F3\u30FB\u30DE\u30E9\u30A6\u30A4\u30FB\u30AF\u30EF\u30C1\u30E3
-mxn=\u30E1\u30AD\u30B7\u30B3\u30FB\u30DA\u30BD
-mxv=\u30E1\u30AD\u30B7\u30B3\u6295\u8CC7\u5358\u4F4D
-myr=\u30DE\u30EC\u30FC\u30B7\u30A2\u30FB\u30EA\u30F3\u30AE\u30C3\u30C8
-mzm=\u30E2\u30B6\u30F3\u30D3\u30FC\u30AF\u30FB\u30E1\u30C6\u30A3\u30AB\u30EB(1980-2006)
-mzn=\u30E2\u30B6\u30F3\u30D3\u30FC\u30AF\u30FB\u30E1\u30C6\u30A3\u30AB\u30EB
-nad=\u30CA\u30DF\u30D3\u30A2\u30FB\u30C9\u30EB
-ngn=\u30CA\u30A4\u30B8\u30A7\u30EA\u30A2\u30FB\u30CA\u30A4\u30E9
-nio=\u30CB\u30AB\u30E9\u30B0\u30A2\u30FB\u30B3\u30EB\u30C9\u30D0
-nlg=\u30AA\u30E9\u30F3\u30C0\u30FB\u30AE\u30EB\u30C0\u30FC
-nok=\u30CE\u30EB\u30A6\u30A7\u30FC\u30FB\u30AF\u30ED\u30FC\u30CD
-npr=\u30CD\u30D1\u30FC\u30EB\u30FB\u30EB\u30D4\u30FC
-nzd=\u30CB\u30E5\u30FC\u30B8\u30FC\u30E9\u30F3\u30C9\u30FB\u30C9\u30EB
-omr=\u30AA\u30DE\u30FC\u30F3\u30FB\u30EA\u30A2\u30EB
-pab=\u30D1\u30CA\u30DE\u30FB\u30D0\u30EB\u30DC\u30A2
-pen=\u30DA\u30EB\u30FC\u30FB\u30BD\u30EB
-pgk=\u30D1\u30D7\u30A2\u30CB\u30E5\u30FC\u30AE\u30CB\u30A2\u30FB\u30AD\u30CA
-php=\u30D5\u30A3\u30EA\u30D4\u30F3\u30FB\u30DA\u30BD
-pkr=\u30D1\u30AD\u30B9\u30BF\u30F3\u30FB\u30EB\u30D4\u30FC
-pln=\u30DD\u30FC\u30E9\u30F3\u30C9\u30FB\u30BA\u30ED\u30C1
-pte=\u30DD\u30EB\u30C8\u30AC\u30EB\u30FB\u30A8\u30B9\u30AF\u30FC\u30C9
-pyg=\u30D1\u30E9\u30B0\u30A2\u30A4\u30FB\u30B0\u30A2\u30E9\u30CB\u30FC
-qar=\u30AB\u30BF\u30FC\u30EB\u30FB\u30EA\u30A2\u30EB
-rol=\u30EB\u30FC\u30DE\u30CB\u30A2\u30FB\u30EC\u30A4(1952-2006)
-ron=\u30EB\u30FC\u30DE\u30CB\u30A2\u30FB\u30EC\u30A4
-rsd=\u30BB\u30EB\u30D3\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-rub=\u30ED\u30B7\u30A2\u30FB\u30EB\u30FC\u30D6\u30EB
-rur=\u30ED\u30B7\u30A2\u30FB\u30EB\u30FC\u30D6\u30EB(1991-1998)
-rwf=\u30EB\u30EF\u30F3\u30C0\u30FB\u30D5\u30E9\u30F3
-sar=\u30B5\u30A6\u30B8\u30FB\u30EA\u30E4\u30EB
-sbd=\u30BD\u30ED\u30E2\u30F3\u8AF8\u5CF6\u30C9\u30EB
-scr=\u30E2\u30FC\u30EA\u30B7\u30E3\u30B9\u30FB\u30EB\u30D4\u30FC
-sdd=\u30B9\u30FC\u30C0\u30F3\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB(1992-2007)
-sdg=\u30B9\u30FC\u30C0\u30F3\u30FB\u30DD\u30F3\u30C9
-sek=\u30B9\u30A6\u30A7\u30FC\u30C7\u30F3\u30FB\u30AF\u30ED\u30FC\u30CA
-sgd=\u30B7\u30F3\u30AC\u30DD\u30FC\u30EB\u30FB\u30C9\u30EB
-shp=\u30BB\u30F3\u30C8\u30D8\u30EC\u30CA\u30FB\u30DD\u30F3\u30C9
-sit=\u30B9\u30ED\u30D9\u30CB\u30A2\u30FB\u30C8\u30E9\u30FC\u30EB
-skk=\u30B9\u30ED\u30D0\u30AD\u30A2\u30FB\u30B3\u30EB\u30CA
-sle=\u30B7\u30A8\u30E9\u30EC\u30AA\u30CD\u30FB\u30EC\u30AA\u30F3
-sll=\u30B7\u30A8\u30E9\u30EC\u30AA\u30CD\u30FB\u30EC\u30AA\u30F3
-sos=\u30BD\u30DE\u30EA\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
-srd=\u30B9\u30EA\u30CA\u30E0\u30FB\u30C9\u30EB
-srg=\u30B9\u30EA\u30CA\u30E0\u30FB\u30AE\u30EB\u30C0\u30FC
-ssp=\u5357\u30B9\u30FC\u30C0\u30F3\u30FB\u30DD\u30F3\u30C9
-std=\u30B5\u30F3\u30C8\u30E1\u30FB\u30D7\u30EA\u30F3\u30B7\u30DA\u30FB\u30C9\u30D6\u30E9
-stn=\u30B5\u30F3\u30C8\u30E1\u30FB\u30D7\u30EA\u30F3\u30B7\u30DA\u30FB\u30C9\u30D6\u30E9
-svc=\u30A8\u30EB\u30B5\u30EB\u30D0\u30C9\u30EB\u30FB\u30B3\u30ED\u30F3
-syp=\u30B7\u30EA\u30A2\u30FB\u30DD\u30F3\u30C9
-szl=\u30B9\u30EF\u30B8\u30E9\u30F3\u30C9\u30FB\u30EA\u30E9\u30F3\u30B8\u30A7\u30CB
-thb=\u30BF\u30A4\u30FB\u30D0\u30FC\u30C4
-tjs=\u30BF\u30B8\u30AD\u30B9\u30BF\u30F3\u30FB\u30BD\u30E2\u30CB
-tmm=\u30C8\u30EB\u30AF\u30E1\u30CB\u30B9\u30BF\u30F3\u30FB\u30DE\u30CA\u30C8(1993-2009)
-tmt=\u30C8\u30EB\u30AF\u30E1\u30CB\u30B9\u30BF\u30F3\u30FB\u30DE\u30CA\u30C8
-tnd=\u30C1\u30E5\u30CB\u30B8\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-top=\u30C8\u30F3\u30AC\u30FB\u30D1\u30FB\u30A2\u30F3\u30AC
-tpe=\u30C6\u30A3\u30E2\u30FC\u30EB\u30FB\u30A8\u30B9\u30AF\u30FC\u30C9
-trl=\u30C8\u30EB\u30B3\u30EA\u30E9(1922-2005)
-try=\u30C8\u30EB\u30B3\u30FB\u30EA\u30E9
-ttd=\u30C8\u30EA\u30CB\u30C0\u30FC\u30C9\u30FB\u30C8\u30D0\u30B4\u30FB\u30C9\u30EB
-twd=\u65B0\u53F0\u6E7E\u30C9\u30EB
-tzs=\u30BF\u30F3\u30B6\u30CB\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
-uah=\u30A6\u30AF\u30E9\u30A4\u30CA\u30FB\u30B0\u30EA\u30D6\u30CA
-ugx=\u30A6\u30AC\u30F3\u30C0\u30FB\u30B7\u30EA\u30F3\u30B0
-usd=US\u30C9\u30EB
-usn=US\u30C9\u30EB(\u7FCC\u65E5)
-uss=US\u30C9\u30EB(\u540C\u65E5)
-uyu=\u30A6\u30EB\u30B0\u30A2\u30A4\u30FB\u30DA\u30BD
-uzs=\u30A6\u30BA\u30D9\u30AD\u30B9\u30BF\u30F3\u30FB\u30BD\u30E0
-veb=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB(1871-2008)
-ved=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB\u30FB\u30BD\u30D9\u30E9\u30CE
-vef=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB
-ves=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB\u30FB\u30BD\u30D9\u30E9\u30CE
-vnd=\u30D9\u30C8\u30CA\u30E0\u30FB\u30C9\u30F3
-vuv=\u30D0\u30CC\u30A2\u30C4\u30FB\u30D0\u30C4
-wst=\u30B5\u30E2\u30A2\u30FB\u30BF\u30E9
-xaf=CFA\u30D5\u30E9\u30F3BEAC
-xag=\u9280
-xau=\u91D1
-xba=\u6B27\u5DDE\u901A\u8CA8\u6DF7\u5408\u5358\u4F4D
-xbb=\u6B27\u5DDE\u901A\u8CA8\u8A08\u7B97\u5358\u4F4D
-xbc=\u6B27\u5DDE\u8A08\u7B97\u5358\u4F4D(XBC)
-xbd=\u6B27\u5DDE\u8A08\u7B97\u5358\u4F4D(XBD)
-xcd=\u6771\u30AB\u30EA\u30D6EC\u30C9\u30EB
-xdr=\u7279\u5225\u5F15\u51FA\u6A29
-xfo=\u30D5\u30E9\u30F3\u30B9\u91D1\u30D5\u30E9\u30F3
-xfu=\u30D5\u30E9\u30F3\u30B9UIC\u30D5\u30E9\u30F3
-xof=CFA\u30D5\u30E9\u30F3BCEAO
-xpd=\u30D1\u30E9\u30B8\u30A6\u30E0
-xpf=CFP\u30D5\u30E9\u30F3
-xpt=\u30D7\u30E9\u30C1\u30CA
-xsu=\u30B9\u30AF\u30EC
-xts=\u30C6\u30B9\u30C8\u901A\u8CA8\u30B3\u30FC\u30C9
-xua=ADB\u8A08\u7B97\u5358\u4F4D
-xxx=\u4E0D\u660E\u306A\u901A\u8CA8
-yer=\u30A4\u30A8\u30E1\u30F3\u30FB\u30EA\u30A2\u30EB
-yum=\u30E6\u30FC\u30B4\u30B9\u30E9\u30D3\u30A2\u65B0\u30C7\u30A3\u30CA\u30FC\u30EB(1994-2002)
-zar=\u5357\u30A2\u30D5\u30EA\u30AB\u30FB\u30E9\u30F3\u30C9
-zmk=\u30B6\u30F3\u30D3\u30A2\u30FB\u30AF\u30EF\u30C1\u30E3
-zwd=\u30B8\u30F3\u30D0\u30D6\u30A8\u30FB\u30C9\u30EB(1980-2008)
-zwl=\u30B8\u30F3\u30D0\u30D6\u30A8\u30FB\u30C9\u30EB(2009)
-zwr=\u30B8\u30F3\u30D0\u30D6\u30A8\u30FB\u30C9\u30EB(2008)
+adp=アンドラ・ペセタ
+aed=アラブ首長国連邦ディルハム
+afa=アフガニスタン・アフガニー(1927-2002)
+afn=アフガニスタン・アフガニー
+all=アルバニア・レク
+amd=アルメニア・ドラム
+ang=オランダ領アンティル・ギルダー
+aoa=アンゴラ・クワンザ
+ars=アルゼンチン・ペソ
+ats=オーストリア・シリング
+aud=オーストラリア・ドル
+awg=アルバ・フローリン
+azm=アゼルバイジャン・マナト(1993-2006)
+azn=アゼルバイジャン・マナト
+bam=ボスニア・ヘルツェゴビナ兌換マルク
+bbd=バルバドス・ドル
+bdt=バングラデシュ・タカ
+bef=ベルギー・フラン
+bgl=ブルガリア・ハード・レフ
+bgn=ブルガリア新レフ
+bhd=バーレーン・ディナール
+bif=ブルンジ・フラン
+bmd=バルミューダ・ドル
+bnd=ブルネイ・ドル
+bob=ボリビア・ボリビアーノ
+bov=ボリビアMvdol
+brl=ブラジル・レアル
+bsd=バハマ・ドル
+btn=ブータン・ニュルタム
+bwp=ボツワナ・プラ
+byb=ベラルーシ・ルーブル(1994-1999)
+byn=ベラルーシ・ルーブル
+byr=ベラルーシ・ルーブル(2000-2016)
+bzd=ベリーズ・ドル
+cad=カナダ・ドル
+cdf=コンゴ・フラン
+chf=スイス・フラン
+clf=チリ計算単位(UF)
+clp=チリ・ペソ
+cny=中国人民元
+cop=コロンビア・ペソ
+crc=コスタリカ・コロン
+csd=セルビア・ディナール(2002-2006)
+cuc=キューバ兌換ペソ
+cup=キューバ・ペソ
+cve=カーボベルデ・エスクード
+cyp=キプロス・ポンド
+czk=チェコ共和国コルナ
+dem=ドイツ・マルク
+djf=ジブチ・フラン
+dkk=デンマーク・クローネ
+dop=ドミニカ・ペソ
+dzd=アルジェリア・ディナール
+eek=エストニア・クルーン
+egp=エジプト・ポンド
+ern=エリトリア・ナクファ
+esp=スペイン・ペセタ
+etb=エチオピア・ブル
+eur=ユーロ
+fim=フィンランド・マルカ
+fjd=フィジー・ドル
+fkp=フォークランド諸島ポンド
+frf=フランス・フラン
+gbp=英ポンド
+gel=ジョージア・ラリ
+ghc=ガーナ・セディ(1979-2007)
+ghs=ガーナ・セディ
+gip=ジブラルタル・ポンド
+gmd=ガンビア・ダラシ
+gnf=ギニア・フラン
+grd=ギリシャ・ドラクマ
+gtq=グアテマラ・ケツァル
+gwp=ギニアビサウ・ペソ
+gyd=ガイアナ・ドル
+hkd=香港ドル
+hnl=ホンジュラス・レンピラ
+hrk=クーナ
+htg=ハイチ・グールド
+huf=ハンガリー・フォリント
+idr=インドネシア・ルピア
+iep=アイルランド・ポンド
+ils=イスラエル新シェケル
+inr=インド・ルピー
+iqd=イラク・ディナール
+irr=イラン・リアル
+isk=アイスランド・クローナ
+itl=イタリア・リラ
+jmd=ジャマイカ・ドル
+jod=ヨルダン・ディナール
+jpy=日本円
+kes=ケニア・シリング
+kgs=キルギス・ソム
+khr=カンボジア・リエル
+kmf=コモロ・フラン
+kpw=北朝鮮ウォン
+krw=韓国ウォン
+kwd=クウェート・ディナール
+kyd=ケイマン諸島ドル
+kzt=カザフスタン・テンゲ
+lak=ラオス・キープ
+lbp=レバノン・ポンド
+lkr=スリランカ・ルピー
+lrd=リベリア・ドル
+lsl=レソト・ロティ
+ltl=リトアニア・リタス
+luf=ルクセンブルク・フラン
+lvl=ラトビア・ラッツ
+lyd=リビア・ディナール
+mad=モロッコ・ディルハム
+mdl=モルドバ・レイ
+mga=マダガスカル・アリアリ
+mgf=マダガスカル・フラン
+mkd=マケドニア・デナル
+mmk=ミャンマー・チャット
+mnt=モンゴル・トグログ
+mop=マカオ・パタカ
+mro=モーリタニア・ウギア
+mru=モーリタニア・ウギア
+mtl=マルタ・リラ
+mur=モーリシャス・ルピー
+mvr=モルジブ・ルフィア
+mwk=マラウィアン・マラウイ・クワチャ
+mxn=メキシコ・ペソ
+mxv=メキシコ投資単位
+myr=マレーシア・リンギット
+mzm=モザンビーク・メティカル(1980-2006)
+mzn=モザンビーク・メティカル
+nad=ナミビア・ドル
+ngn=ナイジェリア・ナイラ
+nio=ニカラグア・コルドバ
+nlg=オランダ・ギルダー
+nok=ノルウェー・クローネ
+npr=ネパール・ルピー
+nzd=ニュージーランド・ドル
+omr=オマーン・リアル
+pab=パナマ・バルボア
+pen=ペルー・ソル
+pgk=パプアニューギニア・キナ
+php=フィリピン・ペソ
+pkr=パキスタン・ルピー
+pln=ポーランド・ズロチ
+pte=ポルトガル・エスクード
+pyg=パラグアイ・グアラニー
+qar=カタール・リアル
+rol=ルーマニア・レイ(1952-2006)
+ron=ルーマニア・レイ
+rsd=セルビア・ディナール
+rub=ロシア・ルーブル
+rur=ロシア・ルーブル(1991-1998)
+rwf=ルワンダ・フラン
+sar=サウジ・リヤル
+sbd=ソロモン諸島ドル
+scr=モーリシャス・ルピー
+sdd=スーダン・ディナール(1992-2007)
+sdg=スーダン・ポンド
+sek=スウェーデン・クローナ
+sgd=シンガポール・ドル
+shp=セントヘレナ・ポンド
+sit=スロベニア・トラール
+skk=スロバキア・コルナ
+sle=シエラレオネ・レオン
+sll=シエラレオネ・レオン
+sos=ソマリア・シリング
+srd=スリナム・ドル
+srg=スリナム・ギルダー
+ssp=南スーダン・ポンド
+std=サントメ・プリンシペ・ドブラ
+stn=サントメ・プリンシペ・ドブラ
+svc=エルサルバドル・コロン
+syp=シリア・ポンド
+szl=スワジランド・リランジェニ
+thb=タイ・バーツ
+tjs=タジキスタン・ソモニ
+tmm=トルクメニスタン・マナト(1993-2009)
+tmt=トルクメニスタン・マナト
+tnd=チュニジア・ディナール
+top=トンガ・パ・アンガ
+tpe=ティモール・エスクード
+trl=トルコリラ(1922-2005)
+try=トルコ・リラ
+ttd=トリニダード・トバゴ・ドル
+twd=新台湾ドル
+tzs=タンザニア・シリング
+uah=ウクライナ・グリブナ
+ugx=ウガンダ・シリング
+usd=USドル
+usn=USドル(翌日)
+uss=USドル(同日)
+uyu=ウルグアイ・ペソ
+uzs=ウズベキスタン・ソム
+veb=ベネズエラ・ボリバル(1871-2008)
+ved=ベネズエラ・ボリバル・ソベラノ
+vef=ベネズエラ・ボリバル
+ves=ベネズエラ・ボリバル・ソベラノ
+vnd=ベトナム・ドン
+vuv=バヌアツ・バツ
+wst=サモア・タラ
+xaf=CFAフランBEAC
+xag=銀
+xau=金
+xba=欧州通貨混合単位
+xbb=欧州通貨計算単位
+xbc=欧州計算単位(XBC)
+xbd=欧州計算単位(XBD)
+xcd=東カリブECドル
+xdr=特別引出権
+xfo=フランス金フラン
+xfu=フランスUICフラン
+xof=CFAフランBCEAO
+xpd=パラジウム
+xpf=CFPフラン
+xpt=プラチナ
+xsu=スクレ
+xts=テスト通貨コード
+xua=ADB計算単位
+xxx=不明な通貨
+yer=イエメン・リアル
+yum=ユーゴスラビア新ディナール(1994-2002)
+zar=南アフリカ・ランド
+zmk=ザンビア・クワチャ
+zwd=ジンバブエ・ドル(1980-2008)
+zwl=ジンバブエ・ドル(2009)
+zwr=ジンバブエ・ドル(2008)
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja_JP.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja_JP.properties
index f29328977f7..4b643f98254 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja_JP.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja_JP.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-JPY=\uffe5
+JPY=￥
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko.properties
index 41e32f80935..39de2c7bd7e 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko.properties
@@ -63,214 +63,214 @@
 #
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 #
-adp=\uc548\ub3c4\ub77c \ud398\uc138\ud0c0
-aed=\uc544\ub78d\uc5d0\ubbf8\ub9ac\ud2b8 \ub514\ub974\ud568
-afa=\uc544\ud504\uac00\ub2c8 (1927\u20132002)
-afn=\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc544\ud504\uac00\ub2c8
-all=\uc54c\ubc14\ub2c8\uc544 \ub808\ud06c
-amd=\uc544\ub974\uba54\ub2c8\uc544 \ub4dc\ub78c
-ang=\ub124\ub35c\ub780\ub4dc\ub839 \uc548\ud2f8\ub808\uc2a4 \uae38\ub354
-aoa=\uc559\uace8\ub77c \ucf74\uc790
-ars=\uc544\ub974\ud5e8\ud2f0\ub098 \ud398\uc18c
-ats=\ud638\uc8fc \uc2e4\ub9c1
-aud=\ud638\uc8fc \ub2ec\ub7ec
-awg=\uc544\ub8e8\ubc14 \ud50c\ub85c\ub9b0
-azm=\uc544\uc81c\ub974\ubc14\uc774\uc820 \ub9c8\ub098\ud2b8(1993\u20132006)
-azn=\uc544\uc81c\ub974\ubc14\uc774\uc794 \ub9c8\ub098\ud2b8
-bam=\ubcf4\uc2a4\ub2c8\uc544-\ud5e4\ub974\uccb4\uace0\ube44\ub098 \ud0dc\ud658 \ub9c8\ub974\ud06c
-bbd=\ubc14\ubca0\uc774\ub3c4\uc2a4 \ub2ec\ub7ec
-bdt=\ubc29\uae00\ub77c\ub370\uc2dc \ud0c0\uce74
-bef=\ubca8\uae30\uc5d0 \ud504\ub791
-bgl=\ubd88\uac00\ub9ac\uc544 \ub3d9\uc804 \ub81b
-bgn=\ubd88\uac00\ub9ac\uc544 \ub808\ud504
-bhd=\ubc14\ub808\uc778 \ub514\ub098\ub974
-bif=\ubd80\ub8ec\ub514 \ud504\ub791
-bmd=\ubc84\ubba4\ub2e4 \ub2ec\ub7ec
-bnd=\ubd80\ub8e8\ub098\uc774 \ub2ec\ub7ec
-bob=\ubcfc\ub9ac\ube44\uc544\ub178
-bov=\ubcfc\ub9ac\ube44\uc544\ub178 Mvdol(\uae30\uae08)
-brl=\ube0c\ub77c\uc9c8 \ub808\uc54c
-bsd=\ubc14\ud558\ub9c8 \ub2ec\ub7ec
-btn=\ubd80\ud0c4 \ub20c\ud22c\ub214
-bwp=\ubcf4\uce20\uc640\ub098 \ud3f4\ub77c
-byb=\ubca8\ub77c\ub8e8\uc2a4 \uc2e0\uad8c \ub8e8\ube14 (1994\u20131999)
-byr=\ubca8\ub77c\ub8e8\uc2a4 \ub8e8\ube14 (2000\u20132016)
-bzd=\ubca8\ub9ac\uc988 \ub2ec\ub7ec
-cad=\uce90\ub098\ub2e4 \ub2ec\ub7ec
-cdf=\ucf69\uace0 \ud504\ub791 \ucf69\uace8\ub77c\uc2a4
-chf=\uc2a4\uc704\uc2a4 \ud504\ub791
-clf=\uce60\ub808 (UF)
-clp=\uce60\ub808 \ud398\uc18c
-cny=\uc911\uad6d \uc704\uc548\ud654
-cop=\ucf5c\ub86c\ube44\uc544 \ud398\uc18c
-crc=\ucf54\uc2a4\ud0c0\ub9ac\uce74 \ucf5c\ub860
-csd=\uace0 \uc138\ub974\ube44\uc544 \ub514\ub098\ub974
-cuc=\ucfe0\ubc14 \ud0dc\ud658 \ud398\uc18c
-cup=\ucfe0\ubc14 \ud398\uc18c
-cve=\uce74\ubcf4\ubca0\ub974\ub370 \uc5d0\uc2a4\ucfe0\ub3c4
-cyp=\uc2f8\uc774\ud504\ub7ec\uc2a4 \ud30c\uc6b4\ub4dc
-czk=\uccb4\ucf54 \uacf5\ud654\uad6d \ucf54\ub8e8\ub098
-dem=\ub3c5\uc77c \ub9c8\ub974\ud06c
-djf=\uc9c0\ubd80\ud2f0 \ud504\ub791
-dkk=\ub374\ub9c8\ud06c \ud06c\ub85c\ub124
-dop=\ub3c4\ubbf8\ub2c8\uce74 \ud398\uc18c
-dzd=\uc54c\uc81c\ub9ac \ub514\ub098\ub974
-eek=\uc5d0\uc2a4\ud1a0\ub2c8\uc544 \ud06c\ub8ec
-egp=\uc774\uc9d1\ud2b8 \ud30c\uc6b4\ub4dc
-ern=\uc5d0\ub9ac\ud2b8\ub9ac\uc544 \ub098\ud06c\ud30c
-esp=\uc2a4\ud398\uc778 \ud398\uc138\ud0c0
-etb=\uc5d0\ud2f0\uc624\ud53c\uc544 \ube44\ub974
-eur=\uc720\ub85c
-fim=\ud540\ub780\ub4dc \ub9c8\ub974\uce74
-fjd=\ud53c\uc9c0 \ub2ec\ub7ec
-fkp=\ud3ec\ud074\ub79c\ub4dc\uc81c\ub3c4 \ud30c\uc6b4\ub4dc
-frf=\ud504\ub791\uc2a4 \ud504\ub791
-gbp=\uc601\uad6d \ud30c\uc6b4\ub4dc
-gel=\uc870\uc9c0\uc544 \ub77c\ub9ac
-ghc=\uac00\ub098 \uc2dc\ub514 (1979\u20132007)
-ghs=\uac00\ub098 \uc2dc\ub514
-gip=\uc9c0\ube0c\ub864\ud130 \ud30c\uc6b4\ub4dc
-gmd=\uac10\ube44\uc544 \ub2ec\ub77c\uc2dc
-gnf=\uae30\ub2c8 \ud504\ub791
-grd=\uadf8\ub9ac\uc2a4 \ub4dc\ub77c\ud06c\ub9c8
-gtq=\uacfc\ud14c\ub9d0\ub77c \ucf00\ud2b8\uc0b4
-gwp=\uae30\ub124\ube44\uc3d8 \ud398\uc18c
-gyd=\uac00\uc774\uc544\ub098 \ub2ec\ub7ec
-hkd=\ud64d\ucf69 \ub2ec\ub7ec
-hnl=\uc628\ub450\ub77c\uc2a4 \ub818\ud53c\ub77c
-hrk=\ud06c\ub85c\uc544\ud2f0\uc544 \ucfe0\ub098
-htg=\ud558\uc774\ud2f0 \uad6c\ub974\ub4dc
-huf=\ud5dd\uac00\ub9ac \ud3ec\ub9b0\ud2b8
-idr=\uc778\ub3c4\ub124\uc2dc\uc544 \ub8e8\ud53c\uc544
-iep=\uc544\uc77c\ub79c\ub4dc \ud30c\uc6b4\ub4dc
-ils=\uc774\uc2a4\ub77c\uc5d8 \uc2e0\uad8c \uc138\ucf08
-inr=\uc778\ub3c4 \ub8e8\ud53c
-iqd=\uc774\ub77c\ud06c \ub514\ub098\ub974
-irr=\uc774\ub780 \ub9ac\uc584
-isk=\uc544\uc774\uc2ac\ub780\ub4dc \ud06c\ub85c\ub098
-itl=\uc774\ud0c8\ub9ac\uc544 \ub9ac\ub77c
-jmd=\uc790\uba54\uc774\uce74 \ub2ec\ub7ec
-jod=\uc694\ub974\ub2e8 \ub514\ub098\ub974
-jpy=\uc77c\ubcf8 \uc5d4\ud654
-kes=\ucf00\ub0d0 \uc2e4\ub9c1
-kgs=\ud0a4\ub974\uae30\uc2a4\uc2a4\ud0c4 \uc19c
-khr=\uce84\ubcf4\ub514\uc544 \ub9ac\uc584
-kmf=\ucf54\ubaa8\ub974 \ud504\ub791
-kpw=\uc870\uc120 \ubbfc\uc8fc\uc8fc\uc758 \uc778\ubbfc \uacf5\ud654\uad6d \uc6d0
-krw=\ub300\ud55c\ubbfc\uad6d \uc6d0
-kwd=\ucfe0\uc6e8\uc774\ud2b8 \ub514\ub098\ub974
-kyd=\ucf00\uc774\ub9e8 \uc81c\ub3c4 \ub2ec\ub7ec
-kzt=\uce74\uc790\ud750\uc2a4\ud0c4 \ud150\uac8c
-lak=\ub77c\uc624\uc2a4 \ud0a4\ud504
-lbp=\ub808\ubc14\ub17c \ud30c\uc6b4\ub4dc
-lkr=\uc2a4\ub9ac\ub791\uce74 \ub8e8\ud53c
-lrd=\ub77c\uc774\ubca0\ub9ac\uc544 \ub2ec\ub7ec
-lsl=\ub808\uc18c\ud1a0 \ub85c\ud2f0
-ltl=\ub9ac\ud22c\uc544\ub2c8\uc544 \ub9ac\ud0c0
-luf=\ub8e9\uc148\ubd80\ub974\ud06c \ud504\ub791
-lvl=\ub77c\ud2b8\ube44\uc544 \ub77c\ud2b8
-lyd=\ub9ac\ube44\uc544 \ub514\ub098\ub974
-mad=\ubaa8\ub85c\ucf54 \ub514\ub818
-mdl=\ubab0\ub3c4\ubc14 \ub808\uc774
-mga=\ub9c8\ub2e4\uac00\uc2a4\uce74\ub974 \uc544\ub9ac\uc544\ub9ac
-mgf=\ub9c8\ub2e4\uac00\uc2a4\uce74\ub974 \ud504\ub791
-mkd=\ub9c8\ucf00\ub3c4\ub2c8\uc544 \ub514\ub098\ub974
-mmk=\ubbf8\uc580\ub9c8 \ud0a4\uc58f
-mnt=\ubabd\uace8 \ud22c\uadf8\ub9ad
-mop=\ub9c8\uce74\uc624 \ud30c\ud0c0\uce74
-mro=\ubaa8\ub9ac\ud0c0\ub2c8 \uc6b0\uae30\uc57c (1973\u20132017)
-mtl=\ubab0\ud0c0 \ub9ac\ub77c
-mur=\ubaa8\ub9ac\uc154\uc2a4 \ub8e8\ud53c
-mvr=\ubab0\ub514\ube0c \uc81c\ub3c4 \ub8e8\ud53c\uc544
-mwk=\ub9d0\ub77c\uc704 \ucf70\uccd0
-mxn=\uba55\uc2dc\ucf54 \ud398\uc18c
-mxv=\uba55\uc2dc\ucf54 (UDI)
-myr=\ub9d0\ub808\uc774\uc2dc\uc544 \ub9c1\uae43
-mzm=\uace0 \ubaa8\uc7a0\ube44\ud06c \uba54\ud2f0\uce7c
-mzn=\ubaa8\uc7a0\ube44\ud06c \uba54\ud2f0\uce7c
-nad=\ub098\ubbf8\ube44\uc544 \ub2ec\ub7ec
-ngn=\ub2c8\uc81c\ub974 \ub098\uc774\ub77c
-nio=\ub2c8\uce74\ub77c\uacfc \ucf54\ub974\ub3c4\ubc14 \uc624\ub85c
-nlg=\ub124\ub378\ub780\ub4dc \uae38\ub354
-nok=\ub178\ub974\uc6e8\uc774 \ud06c\ub85c\ub124
-npr=\ub124\ud314 \ub8e8\ud53c
-nzd=\ub274\uc9c8\ub79c\ub4dc \ub2ec\ub7ec
-omr=\uc624\ub9cc \ub9ac\uc584
-pab=\ud30c\ub098\ub9c8 \ubc1c\ubcf4\uc544
-pen=\ud398\ub8e8 \uc194
-pgk=\ud30c\ud478\uc544\ub274\uae30\ub2c8 \ud0a4\ub098
-php=\ud544\ub9ac\ud540 \ud398\uc18c
-pkr=\ud30c\ud0a4\uc2a4\ud0c4 \ub8e8\ud53c
-pln=\ud3f4\ub780\ub4dc \uc990\ub85c\ud2f0
-pte=\ud3ec\ub974\ud22c\uac08 \uc5d0\uc2a4\ucfe0\ub3c4
-pyg=\ud30c\ub77c\uacfc\uc774 \uacfc\ub77c\ub2c8
-qar=\uce74\ud0c0\ub974 \ub9ac\uc584
-rol=\ub8e8\ub9c8\ub2c8\uc544 \ub808\uc774
-ron=\ub8e8\ub9c8\ub2c8\uc544 \ub808\uc6b0
-rsd=\uc138\ub974\ube44\uc544 \ub514\ub098\ub974
-rub=\ub7ec\uc2dc\uc544 \ub8e8\ube14
-rur=\ub7ec\uc2dc\uc544 \ub8e8\ube14 (1991\u20131998)
-rwf=\ub974\uc644\ub2e4 \ud504\ub791
-sar=\uc0ac\uc6b0\ub514\uc544\ub77c\ube44\uc544 \ub9ac\uc584
-sbd=\uc194\ub85c\ubaac \uc81c\ub3c4 \ub2ec\ub7ec
-scr=\uc138\uc774\uc178 \ub8e8\ud53c
-sdd=\uc218\ub2e8 \ub514\ub098\ub974
-sdg=\uc218\ub2e8 \ud30c\uc6b4\ub4dc
-sek=\uc2a4\uc6e8\ub374 \ud06c\ub85c\ub098
-sgd=\uc2f1\uac00\ud3f4 \ub2ec\ub7ec
-shp=\uc138\uc778\ud2b8\ud5ec\ub808\ub098 \ud30c\uc6b4\ub4dc
-sit=\uc2ac\ub85c\ubca0\ub2c8\uc544 \ud1a8\ub77c\ub974
-skk=\uc2ac\ub85c\ubc14\ud0a4\uc544 \ucf54\ub8e8\ub098
-sll=\uc2dc\uc5d0\ub77c\ub9ac\uc628 \ub9ac\uc628
-sos=\uc18c\ub9d0\ub9ac\uc544 \uc2e4\ub9c1
-srd=\uc218\ub9ac\ub0a8 \ub2ec\ub7ec
-srg=\uc218\ub9ac\ub0a8 \uae38\ub354
-std=\uc0c1\ud22c\uba54 \ud504\ub9b0\uc2dc\ud398 \ub3c4\ube0c\ub77c (1977\u20132017)
-svc=\uc5d8\uc0b4\ubc14\ub3c4\ub974 \ucf5c\ub860
-syp=\uc2dc\ub9ac\uc544 \ud30c\uc6b4\ub4dc
-szl=\uc2a4\uc640\uc9c8\ub780\ub4dc \ub9b4\ub791\uac8c\ub2c8
-thb=\ud0dc\uad6d \ubc14\ud2b8
-tjs=\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4 \uc18c\ubaa8\ub2c8
-tmm=\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \ub9c8\ub098\ud2b8 (1993\u20132009)
-tnd=\ud280\ub2c8\uc9c0 \ub514\ub098\ub974
-top=\ud1b5\uac00 \ud30c\uc559\uac00
-tpe=\ud2f0\ubaa8\ub974 \uc5d0\uc2a4\ucfe0\ub3c4
-trl=\ud130\ud0a4 \ub9ac\ub77c
-try=\uc2e0 \ud130\ud0a4 \ub9ac\ub77c
-ttd=\ud2b8\ub9ac\ub2c8\ub2e4\ub4dc \ud1a0\ubc14\uace0 \ub2ec\ub7ec
-twd=\uc2e0 \ud0c0\uc774\uc644 \ub2ec\ub7ec
-tzs=\ud0c4\uc790\ub2c8\uc544 \uc2e4\ub9c1
-uah=\uc6b0\ud06c\ub77c\uc774\ub098 \uadf8\ub9ac\ube0c\ub098
-ugx=\uc6b0\uac04\ub2e4 \uc2e4\ub9c1
-usd=\ubbf8\uad6d \ub2ec\ub7ec
-usn=\ubbf8\uad6d \ub2ec\ub7ec(\ub2e4\uc74c\ub0a0)
-uss=\ubbf8\uad6d \ub2ec\ub7ec(\ub2f9\uc77c)
-uyu=\uc6b0\ub8e8\uacfc\uc774 \ud398\uc18c \uc6b0\ub8e8\uacfc\uc694
-uzs=\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc228
-veb=\ubca0\ub124\uc8fc\uc5d8\ub77c \ubcfc\ub9ac\ubc14\ub974 (1871\u20132008)
-vef=\ubca0\ub124\uc218\uc5d8\ub77c \ubcfc\ub9ac\ubc14\ub974 (2008\u20132018)
-vnd=\ubca0\ud2b8\ub0a8 \ub3d9
-vuv=\ubc14\ub204\uc544\ud22c \ubc14\ud22c
-wst=\uc11c \uc0ac\ubaa8\uc544 \ud0c8\ub77c
-xaf=\uc911\uc559\uc544\ud504\ub9ac\uce74 CFA \ud504\ub791
-xag=\uc740\ud654
-xau=\uae08
-xba=\uc720\ub974\ucf54 (\uc720\ub7fd \ud68c\uacc4 \ub2e8\uc704)
-xbb=\uc720\ub7fd \ud1b5\ud654 \ub3d9\ub9f9
-xbc=\uc720\ub7fd \uacc4\uc0b0 \ub2e8\uc704 (XBC)
-xbd=\uc720\ub7fd \uacc4\uc0b0 \ub2e8\uc704 (XBD)
-xcd=\ub3d9\uce74\ub9ac\ube0c \ub2ec\ub7ec
-xdr=\ud2b9\ubcc4\uc778\ucd9c\uad8c
-xfo=\ud504\ub791\uc2a4 \ud504\ub791 (Gold)
-xfu=\ud504\ub791\uc2a4 \ud504\ub791 (UIC)
-xof=\uc11c\uc544\ud504\ub9ac\uce74 CFA \ud504\ub791
-xpd=\ud314\ub77c\ub4d0
-xpf=CFP \ud504\ub791
-xpt=\ubc31\uae08
-xts=\ud14c\uc2a4\ud2b8 \ud1b5\ud654 \ucf54\ub4dc
-xxx=\uc54c \uc218 \uc5c6\ub294 \ud1b5\ud654 \ub2e8\uc704
-yer=\uc608\uba58 \ub9ac\uc54c
-yum=\uc720\uace0\uc2ac\ub77c\ube44\uc544 \ub178\ube44 \ub514\ub098\ub974
-zar=\ub0a8\uc544\ud504\ub9ac\uce74 \ub79c\ub4dc
-zmk=\uc7d8\ube44\uc544 \ucf70\uccd0 (1968\u20132012)
-zwd=\uc9d0\ubc14\ube0c\uc6e8 \ub2ec\ub7ec
+adp=안도라 페세타
+aed=아랍에미리트 디르함
+afa=아프가니 (1927–2002)
+afn=아프가니스탄 아프가니
+all=알바니아 레크
+amd=아르메니아 드람
+ang=네덜란드령 안틸레스 길더
+aoa=앙골라 콴자
+ars=아르헨티나 페소
+ats=호주 실링
+aud=호주 달러
+awg=아루바 플로린
+azm=아제르바이젠 마나트(1993–2006)
+azn=아제르바이잔 마나트
+bam=보스니아-헤르체고비나 태환 마르크
+bbd=바베이도스 달러
+bdt=방글라데시 타카
+bef=벨기에 프랑
+bgl=불가리아 동전 렛
+bgn=불가리아 레프
+bhd=바레인 디나르
+bif=부룬디 프랑
+bmd=버뮤다 달러
+bnd=부루나이 달러
+bob=볼리비아노
+bov=볼리비아노 Mvdol(기금)
+brl=브라질 레알
+bsd=바하마 달러
+btn=부탄 눌투눔
+bwp=보츠와나 폴라
+byb=벨라루스 신권 루블 (1994–1999)
+byr=벨라루스 루블 (2000–2016)
+bzd=벨리즈 달러
+cad=캐나다 달러
+cdf=콩고 프랑 콩골라스
+chf=스위스 프랑
+clf=칠레 (UF)
+clp=칠레 페소
+cny=중국 위안화
+cop=콜롬비아 페소
+crc=코스타리카 콜론
+csd=고 세르비아 디나르
+cuc=쿠바 태환 페소
+cup=쿠바 페소
+cve=카보베르데 에스쿠도
+cyp=싸이프러스 파운드
+czk=체코 공화국 코루나
+dem=독일 마르크
+djf=지부티 프랑
+dkk=덴마크 크로네
+dop=도미니카 페소
+dzd=알제리 디나르
+eek=에스토니아 크룬
+egp=이집트 파운드
+ern=에리트리아 나크파
+esp=스페인 페세타
+etb=에티오피아 비르
+eur=유로
+fim=핀란드 마르카
+fjd=피지 달러
+fkp=포클랜드제도 파운드
+frf=프랑스 프랑
+gbp=영국 파운드
+gel=조지아 라리
+ghc=가나 시디 (1979–2007)
+ghs=가나 시디
+gip=지브롤터 파운드
+gmd=감비아 달라시
+gnf=기니 프랑
+grd=그리스 드라크마
+gtq=과테말라 케트살
+gwp=기네비쏘 페소
+gyd=가이아나 달러
+hkd=홍콩 달러
+hnl=온두라스 렘피라
+hrk=크로아티아 쿠나
+htg=하이티 구르드
+huf=헝가리 포린트
+idr=인도네시아 루피아
+iep=아일랜드 파운드
+ils=이스라엘 신권 세켈
+inr=인도 루피
+iqd=이라크 디나르
+irr=이란 리얄
+isk=아이슬란드 크로나
+itl=이탈리아 리라
+jmd=자메이카 달러
+jod=요르단 디나르
+jpy=일본 엔화
+kes=케냐 실링
+kgs=키르기스스탄 솜
+khr=캄보디아 리얄
+kmf=코모르 프랑
+kpw=조선 민주주의 인민 공화국 원
+krw=대한민국 원
+kwd=쿠웨이트 디나르
+kyd=케이맨 제도 달러
+kzt=카자흐스탄 텐게
+lak=라오스 키프
+lbp=레바논 파운드
+lkr=스리랑카 루피
+lrd=라이베리아 달러
+lsl=레소토 로티
+ltl=리투아니아 리타
+luf=룩셈부르크 프랑
+lvl=라트비아 라트
+lyd=리비아 디나르
+mad=모로코 디렘
+mdl=몰도바 레이
+mga=마다가스카르 아리아리
+mgf=마다가스카르 프랑
+mkd=마케도니아 디나르
+mmk=미얀마 키얏
+mnt=몽골 투그릭
+mop=마카오 파타카
+mro=모리타니 우기야 (1973–2017)
+mtl=몰타 리라
+mur=모리셔스 루피
+mvr=몰디브 제도 루피아
+mwk=말라위 콰쳐
+mxn=멕시코 페소
+mxv=멕시코 (UDI)
+myr=말레이시아 링깃
+mzm=고 모잠비크 메티칼
+mzn=모잠비크 메티칼
+nad=나미비아 달러
+ngn=니제르 나이라
+nio=니카라과 코르도바 오로
+nlg=네델란드 길더
+nok=노르웨이 크로네
+npr=네팔 루피
+nzd=뉴질랜드 달러
+omr=오만 리얄
+pab=파나마 발보아
+pen=페루 솔
+pgk=파푸아뉴기니 키나
+php=필리핀 페소
+pkr=파키스탄 루피
+pln=폴란드 즐로티
+pte=포르투갈 에스쿠도
+pyg=파라과이 과라니
+qar=카타르 리얄
+rol=루마니아 레이
+ron=루마니아 레우
+rsd=세르비아 디나르
+rub=러시아 루블
+rur=러시아 루블 (1991–1998)
+rwf=르완다 프랑
+sar=사우디아라비아 리얄
+sbd=솔로몬 제도 달러
+scr=세이셸 루피
+sdd=수단 디나르
+sdg=수단 파운드
+sek=스웨덴 크로나
+sgd=싱가폴 달러
+shp=세인트헬레나 파운드
+sit=슬로베니아 톨라르
+skk=슬로바키아 코루나
+sll=시에라리온 리온
+sos=소말리아 실링
+srd=수리남 달러
+srg=수리남 길더
+std=상투메 프린시페 도브라 (1977–2017)
+svc=엘살바도르 콜론
+syp=시리아 파운드
+szl=스와질란드 릴랑게니
+thb=태국 바트
+tjs=타지키스탄 소모니
+tmm=투르크메니스탄 마나트 (1993–2009)
+tnd=튀니지 디나르
+top=통가 파앙가
+tpe=티모르 에스쿠도
+trl=터키 리라
+try=신 터키 리라
+ttd=트리니다드 토바고 달러
+twd=신 타이완 달러
+tzs=탄자니아 실링
+uah=우크라이나 그리브나
+ugx=우간다 실링
+usd=미국 달러
+usn=미국 달러(다음날)
+uss=미국 달러(당일)
+uyu=우루과이 페소 우루과요
+uzs=우즈베키스탄 숨
+veb=베네주엘라 볼리바르 (1871–2008)
+vef=베네수엘라 볼리바르 (2008–2018)
+vnd=베트남 동
+vuv=바누아투 바투
+wst=서 사모아 탈라
+xaf=중앙아프리카 CFA 프랑
+xag=은화
+xau=금
+xba=유르코 (유럽 회계 단위)
+xbb=유럽 통화 동맹
+xbc=유럽 계산 단위 (XBC)
+xbd=유럽 계산 단위 (XBD)
+xcd=동카리브 달러
+xdr=특별인출권
+xfo=프랑스 프랑 (Gold)
+xfu=프랑스 프랑 (UIC)
+xof=서아프리카 CFA 프랑
+xpd=팔라듐
+xpf=CFP 프랑
+xpt=백금
+xts=테스트 통화 코드
+xxx=알 수 없는 통화 단위
+yer=예멘 리알
+yum=유고슬라비아 노비 디나르
+zar=남아프리카 랜드
+zmk=쟘비아 콰쳐 (1968–2012)
+zwd=짐바브웨 달러
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko_KR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko_KR.properties
index e489b25bce1..74e8786712b 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko_KR.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ko_KR.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-KRW=\uffe6
+KRW=￦
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lt_LT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lt_LT.properties
index 1f14d0bf7ef..beb39501bfb 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lt_LT.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lt_LT.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 LTL=Lt
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lv_LV.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lv_LV.properties
index 29ad4101dec..ccd8ba8cb96 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lv_LV.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_lv_LV.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 LVL=Ls
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mt_MT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mt_MT.properties
index 90c1ac608bd..5c14061e65c 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mt_MT.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_mt_MT.properties
@@ -41,4 +41,4 @@
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
 MTL=Lm
-EUR=\u20ac
+EUR=€
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_BE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_BE.properties
index 9f7b9bab100..6152ace855d 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_BE.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_BE.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 BEF=BF
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_NL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_NL.properties
index 469b94d2b53..4c7d87bd361 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_NL.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_nl_NL.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 NLG=fl
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pl_PL.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pl_PL.properties
index 63baa191358..56fb2b8871b 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pl_PL.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pl_PL.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-PLN=z\u0142
+PLN=zł
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt.properties
index ed6651933b9..df7f52ca86a 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt.properties
@@ -64,83 +64,83 @@
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 #
 adp=Peseta de Andorra
-aed=Dirham dos Emirados \u00c1rabes Unidos
-afa=Afegane (1927\u20132002)
-afn=Afegane afeg\u00e3o
-all=Lek alban\u00eas
-amd=Dram arm\u00eanio
+aed=Dirham dos Emirados Árabes Unidos
+afa=Afegane (1927–2002)
+afn=Afegane afegão
+all=Lek albanês
+amd=Dram armênio
 ang=Florim das Antilhas Holandesas
 aoa=Kwanza angolano
 ars=Peso argentino
-ats=Xelim austr\u00edaco
-aud=D\u00f3lar australiano
+ats=Xelim austríaco
+aud=Dólar australiano
 awg=Florim arubano
-azm=Manat azerbaijano (1993\u20132006)
+azm=Manat azerbaijano (1993–2006)
 azn=Manat azeri
-bam=Marco convers\u00edvel da B\u00f3snia e Herzegovina
-bbd=D\u00f3lar barbadense
+bam=Marco conversível da Bósnia e Herzegovina
+bbd=Dólar barbadense
 bdt=Taka bengali
 bef=Franco belga
-bgl=Lev forte b\u00falgaro
-bgn=Lev b\u00falgaro
+bgl=Lev forte búlgaro
+bgn=Lev búlgaro
 bhd=Dinar bareinita
 bif=Franco burundiano
-bmd=D\u00f3lar bermudense
-bnd=D\u00f3lar bruneano
-bob=Boliviano da Bol\u00edvia
+bmd=Dólar bermudense
+bnd=Dólar bruneano
+bob=Boliviano da Bolívia
 bov=Mvdol boliviano
 brl=Real brasileiro
-bsd=D\u00f3lar bahamense
-btn=Ngultrum butan\u00eas
+bsd=Dólar bahamense
+btn=Ngultrum butanês
 bwp=Pula botsuanesa
-byb=Rublo novo bielo-russo (1994\u20131999)
-byr=Rublo bielorrusso (2000\u20132016)
-bzd=D\u00f3lar belizenho
-cad=D\u00f3lar canadense
-cdf=Franco congol\u00eas
-chf=Franco su\u00ed\u00e7o
+byb=Rublo novo bielo-russo (1994–1999)
+byr=Rublo bielorrusso (2000–2016)
+bzd=Dólar belizenho
+cad=Dólar canadense
+cdf=Franco congolês
+chf=Franco suíço
 clf=Unidades de Fomento chilenas
 clp=Peso chileno
-cny=Yuan chin\u00eas
+cny=Yuan chinês
 cop=Peso colombiano
-crc=Col\u00f3n costarriquenho
-csd=Dinar s\u00e9rvio (2002\u20132006)
-cuc=Peso cubano convers\u00edvel
+crc=Colón costarriquenho
+csd=Dinar sérvio (2002–2006)
+cuc=Peso cubano conversível
 cup=Peso cubano
 cve=Escudo cabo-verdiano
 cyp=Libra cipriota
 czk=Coroa tcheca
-dem=Marco alem\u00e3o
+dem=Marco alemão
 djf=Franco djiboutiano
 dkk=Coroa dinamarquesa
 dop=Peso dominicano
 dzd=Dinar argelino
 eek=Coroa estoniana
-egp=Libra eg\u00edpcia
+egp=Libra egípcia
 ern=Nakfa da Eritreia
 esp=Peseta espanhola
-etb=Birr et\u00edope
+etb=Birr etíope
 fim=Marca finlandesa
-fjd=D\u00f3lar fijiano
+fjd=Dólar fijiano
 fkp=Libra malvinense
-frf=Franco franc\u00eas
+frf=Franco francês
 gbp=Libra esterlina
 gel=Lari georgiano
-ghc=Cedi de Gana (1979\u20132007)
-ghs=Cedi gan\u00eas
+ghc=Cedi de Gana (1979–2007)
+ghs=Cedi ganês
 gip=Libra de Gibraltar
 gmd=Dalasi gambiano
 gnf=Franco guineano
 grd=Dracma grego
 gtq=Quetzal guatemalteco
-gwp=Peso da Guin\u00e9-Bissau
-gyd=D\u00f3lar guianense
-hkd=D\u00f3lar de Hong Kong
+gwp=Peso da Guiné-Bissau
+gyd=Dólar guianense
+hkd=Dólar de Hong Kong
 hnl=Lempira hondurenha
 hrk=Kuna croata
 htg=Gourde haitiano
-huf=Florim h\u00fangaro
-idr=Rupia indon\u00e9sia
+huf=Florim húngaro
+idr=Rupia indonésia
 iep=Libra irlandesa
 ils=Novo shekel israelense
 inr=Rupia indiana
@@ -148,9 +148,9 @@ iqd=Dinar iraquiano
 irr=Rial iraniano
 isk=Coroa islandesa
 itl=Lira italiana
-jmd=D\u00f3lar jamaicano
+jmd=Dólar jamaicano
 jod=Dinar jordaniano
-jpy=Iene japon\u00eas
+jpy=Iene japonês
 kes=Xelim queniano
 kgs=Som quirguiz
 khr=Riel cambojano
@@ -158,26 +158,26 @@ kmf=Franco comoriano
 kpw=Won norte-coreano
 krw=Won sul-coreano
 kwd=Dinar kuwaitiano
-kyd=D\u00f3lar das Ilhas Cayman
+kyd=Dólar das Ilhas Cayman
 kzt=Tenge cazaque
 lak=Kip laosiano
 lbp=Libra libanesa
 lkr=Rupia cingalesa
-lrd=D\u00f3lar liberiano
+lrd=Dólar liberiano
 lsl=Loti lesotiano
 ltl=Litas lituano
-luf=Franco luxemburgu\u00eas
-lvl=Lats let\u00e3o
-lyd=Dinar l\u00edbio
+luf=Franco luxemburguês
+lvl=Lats letão
+lyd=Dinar líbio
 mad=Dirham marroquino
-mdl=Leu mold\u00e1vio
+mdl=Leu moldávio
 mga=Ariary malgaxe
 mgf=Franco de Madagascar
-mkd=Dinar maced\u00f4nio
+mkd=Dinar macedônio
 mmk=Quiate mianmarense
 mnt=Tugrik mongol
 mop=Pataca macaense
-mro=Ouguiya mauritana (1973\u20132017)
+mro=Ouguiya mauritana (1973–2017)
 mtl=Lira maltesa
 mur=Rupia mauriciana
 mvr=Rupia maldivana
@@ -185,70 +185,70 @@ mwk=Kwacha malauiana
 mxn=Peso mexicano
 mxv=Unidade Mexicana de Investimento (UDI)
 myr=Ringgit malaio
-mzm=Metical de Mo\u00e7ambique (1980\u20132006)
-mzn=Metical mo\u00e7ambicano
-nad=D\u00f3lar namibiano
+mzm=Metical de Moçambique (1980–2006)
+mzn=Metical moçambicano
+nad=Dólar namibiano
 ngn=Naira nigeriana
-nio=C\u00f3rdoba nicaraguense
-nlg=Florim holand\u00eas
+nio=Córdoba nicaraguense
+nlg=Florim holandês
 nok=Coroa norueguesa
 npr=Rupia nepalesa
-nzd=D\u00f3lar neozeland\u00eas
+nzd=Dólar neozelandês
 omr=Rial omanense
 pab=Balboa panamenho
 pen=Novo sol peruano
-pgk=Kina papu\u00e1sia
+pgk=Kina papuásia
 php=Peso filipino
 pkr=Rupia paquistanesa
-pln=Zloty polon\u00eas
-pte=Escudo portugu\u00eas
+pln=Zloty polonês
+pte=Escudo português
 pyg=Guarani paraguaio
 qar=Rial catariano
-rol=Leu romeno (1952\u20132006)
+rol=Leu romeno (1952–2006)
 ron=Leu romeno
-rsd=Dinar s\u00e9rvio
+rsd=Dinar sérvio
 rub=Rublo russo
-rur=Rublo russo (1991\u20131998)
-rwf=Franco ruand\u00eas
+rur=Rublo russo (1991–1998)
+rwf=Franco ruandês
 sar=Riyal saudita
-sbd=D\u00f3lar das Ilhas Salom\u00e3o
+sbd=Dólar das Ilhas Salomão
 scr=Rupia seichelense
-sdd=Dinar sudan\u00eas (1992\u20132007)
+sdd=Dinar sudanês (1992–2007)
 sdg=Libra sudanesa
 sek=Coroa sueca
-sgd=D\u00f3lar singapuriano
+sgd=Dólar singapuriano
 shp=Libra de Santa Helena
 sit=Tolar Bons esloveno
 skk=Coroa eslovaca
 sll=Leone de Serra Leoa
 sos=Xelim somali
-srd=D\u00f3lar surinam\u00eas
+srd=Dólar surinamês
 srg=Florim do Suriname
-std=Dobra de S\u00e3o Tom\u00e9 e Pr\u00edncipe (1977\u20132017)
+std=Dobra de São Tomé e Príncipe (1977–2017)
 svc=Colom salvadorenho
-syp=Libra s\u00edria
+syp=Libra síria
 szl=Lilangeni suazi
-thb=Baht tailand\u00eas
+thb=Baht tailandês
 tjs=Somoni tadjique
-tmm=Manat do Turcomenist\u00e3o (1993\u20132009)
+tmm=Manat do Turcomenistão (1993–2009)
 tmt=Manat turcomeno
 tnd=Dinar tunisiano
-top=Pa\u02bbanga tonganesa
+top=Paʻanga tonganesa
 tpe=Escudo timorense
-trl=Lira turca (1922\u20132005)
+trl=Lira turca (1922–2005)
 try=Lira turca
-ttd=D\u00f3lar de Trinidad e Tobago
-twd=Novo d\u00f3lar taiwan\u00eas
+ttd=Dólar de Trinidad e Tobago
+twd=Novo dólar taiwanês
 tzs=Xelim tanzaniano
 uah=Hryvnia ucraniano
 ugx=Xelim ugandense
-usd=D\u00f3lar americano
-usn=D\u00f3lar norte-americano (Dia seguinte)
-uss=D\u00f3lar norte-americano (Mesmo dia)
+usd=Dólar americano
+usn=Dólar norte-americano (Dia seguinte)
+uss=Dólar norte-americano (Mesmo dia)
 uyu=Peso uruguaio
 uzs=Som uzbeque
-veb=Bol\u00edvar venezuelano (1871\u20132008)
-vef=Bol\u00edvar venezuelano (2008\u20132018)
+veb=Bolívar venezuelano (1871–2008)
+vef=Bolívar venezuelano (2008–2018)
 vnd=Dong vietnamita
 vuv=Vatu de Vanuatu
 wst=Tala samoano
@@ -256,23 +256,23 @@ xaf=Franco CFA de BEAC
 xag=Prata
 xau=Ouro
 xba=Unidade Composta Europeia
-xbb=Unidade Monet\u00e1ria Europeia
+xbb=Unidade Monetária Europeia
 xbc=Unidade de Conta Europeia (XBC)
 xbd=Unidade de Conta Europeia (XBD)
-xcd=D\u00f3lar do Caribe Oriental
+xcd=Dólar do Caribe Oriental
 xdr=Direitos Especiais de Giro
-xfo=Franco-ouro franc\u00eas
-xfu=Franco UIC franc\u00eas
+xfo=Franco-ouro francês
+xfu=Franco UIC francês
 xof=Franco CFA de BCEAO
-xpd=Pal\u00e1dio
+xpd=Paládio
 xpf=Franco CFP
 xpt=Platina
-xts=C\u00f3digo de Moeda de Teste
+xts=Código de Moeda de Teste
 xxx=Moeda desconhecida
 yer=Rial iemenita
-yum=Dinar noviy iugoslavo (1994\u20132002)
+yum=Dinar noviy iugoslavo (1994–2002)
 zar=Rand sul-africano
-zmk=Cuacha zambiano (1968\u20132012)
-zwd=D\u00f3lar do Zimb\u00e1bue (1980\u20132008)
-zwl=D\u00f3lar do Zimb\u00e1bue (2009)
-zwr=D\u00f3lar do Zimb\u00e1bue (2008)
+zmk=Cuacha zambiano (1968–2012)
+zwd=Dólar do Zimbábue (1980–2008)
+zwl=Dólar do Zimbábue (2009)
+zwr=Dólar do Zimbábue (2008)
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_PT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_PT.properties
index 12f207cc4f5..0b9a51574cb 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_PT.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_pt_PT.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 PTE=Esc.
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ru_RU.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ru_RU.properties
index 43b6341103a..69c0a2f7f24 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ru_RU.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ru_RU.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-RUB=\u0440\u0443\u0431.
+RUB=руб.
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sk_SK.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sk_SK.properties
index b6248e1ab09..692d6ce3b7c 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sk_SK.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sk_SK.properties
@@ -64,5 +64,5 @@
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 #
 SKK=Sk
-skk=slovensk\u00e1 koruna
-EUR=\u20ac
+skk=slovenská koruna
+EUR=€
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sl_SI.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sl_SI.properties
index a1615dc403f..4fc0f46ca5e 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sl_SI.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sl_SI.properties
@@ -36,4 +36,4 @@
 # Taligent is a registered trademark of Taligent, Inc.
 
 SIT=tol
-EUR=\u20AC
+EUR=€
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_BA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_BA.properties
index 91a787d08b3..a929e59103d 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_BA.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_BA.properties
@@ -40,5 +40,5 @@
 
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
-BAM=\u041a\u041c.
-EUR=\u20ac
+BAM=КМ.
+EUR=€
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_CS.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_CS.properties
index 9ba91d7ea21..1214cf7bed5 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_CS.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_CS.properties
@@ -40,4 +40,4 @@
 
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
-EUR=\u20ac
+EUR=€
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_BA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_BA.properties
index 7d0d4b12726..5312a1852bc 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_BA.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_BA.properties
@@ -64,6 +64,6 @@
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 #
 BAM=KM
-bam=Bosanskohercegova\u010dka konvertibilna marka
-EUR=\u20ac
+bam=Bosanskohercegovačka konvertibilna marka
+EUR=€
 eur=Evro
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_ME.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_ME.properties
index 1d1cb181aaa..6f475270885 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_ME.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_Latn_ME.properties
@@ -63,5 +63,5 @@
 #
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 #
-EUR=\u20ac
+EUR=€
 eur=Evro
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_ME.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_ME.properties
index 9ff3530c227..3d4a62e99f8 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_ME.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_ME.properties
@@ -40,4 +40,4 @@
 
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
-EUR=\u20ac
+EUR=€
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_RS.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_RS.properties
index e9347f7e26e..7d86b234bce 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_RS.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sr_RS.properties
@@ -63,4 +63,4 @@
 #
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 #
-RSD=\u0434\u0438\u043d.
+RSD=дин.
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties
index 4325f926665..5ed800c274c 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties
@@ -65,23 +65,23 @@
 #
 adp=andorransk peseta
 aed=emiratisk dirham
-afa=afghani (1927\u20132002)
+afa=afghani (1927–2002)
 afn=afghansk afghani
 all=albansk lek
 amd=armenisk dram
 ang=antillergulden
 aoa=angolansk kwanza
 ars=argentinsk peso
-ats=\u00f6sterrikisk schilling
+ats=österrikisk schilling
 aud=australisk dollar
 awg=arubansk florin
-azm=azerbajdzjansk manat (1993\u20132006)
+azm=azerbajdzjansk manat (1993–2006)
 azn=azerbajdzjansk manat
 bam=bosnisk-hercegovinsk mark (konvertibel)
 bbd=barbadisk dollar
 bdt=bangladeshisk taka
 bef=belgisk franc
-bgl=bulgarisk h\u00e5rd lev (1962\u20131999)
+bgl=bulgarisk hård lev (1962–1999)
 bgn=bulgarisk lev
 bhd=bahrainsk dinar
 bif=burundisk franc
@@ -93,8 +93,8 @@ brl=brasiliansk real
 bsd=bahamansk dollar
 btn=bhutanesisk ngultrum
 bwp=botswansk pula
-byb=vitrysk ny rubel (1994\u20131999)
-byr=vitrysk rubel (2000\u20132016)
+byb=vitrysk ny rubel (1994–1999)
+byr=vitrysk rubel (2000–2016)
 bzd=belizisk dollar
 cad=kanadensisk dollar
 cdf=kongolesisk franc
@@ -103,8 +103,8 @@ clf=chilensk unidad de fomento
 clp=chilensk peso
 cny=kinesisk yuan
 cop=colombiansk peso
-crc=costarikansk col\u00f3n
-csd=serbisk dinar (2002\u20132006)
+crc=costarikansk colón
+csd=serbisk dinar (2002–2006)
 cup=kubansk peso
 cve=kapverdisk escudo
 cyp=cypriotiskt pund
@@ -126,7 +126,7 @@ fkp=Falklandspund
 frf=fransk franc
 gbp=brittiskt pund
 gel=georgisk lari
-ghc=ghanansk cedi (1979\u20132007)
+ghc=ghanansk cedi (1979–2007)
 ghs=ghanansk cedi
 gip=gibraltiskt pund
 gmd=gambisk dalasi
@@ -141,12 +141,12 @@ hrk=kroatisk kuna
 htg=haitisk gourde
 huf=ungersk forint
 idr=indonesisk rupie
-iep=irl\u00e4ndskt pund
+iep=irländskt pund
 ils=israelisk ny shekel
 inr=indisk rupie
 iqd=irakisk dinar
 irr=iransk rial
-isk=isl\u00e4ndsk krona
+isk=isländsk krona
 itl=italiensk lire
 jmd=jamaicansk dollar
 jod=jordansk dinar
@@ -175,9 +175,9 @@ mga=madagaskisk ariary
 mgf=madagaskisk franc
 mkd=makedonisk denar
 mmk=myanmarisk kyat
-mnt=mongolisk t\u00f6gr\u00f6g
+mnt=mongolisk tögrög
 mop=makanesisk pataca
-mro=mauretansk ouguiya (1973\u20132017)
+mro=mauretansk ouguiya (1973–2017)
 mtl=maltesisk lire
 mur=mauritisk rupie
 mvr=maldivisk rufiyaa
@@ -185,15 +185,15 @@ mwk=malawisk kwacha
 mxn=mexikansk peso
 mxv=mexikansk unidad de inversion
 myr=malaysisk ringgit
-mzm=gammal mo\u00e7ambikisk metical
-mzn=mo\u00e7ambikisk metical
+mzm=gammal moçambikisk metical
+mzn=moçambikisk metical
 nad=namibisk dollar
 ngn=nigeriansk naira
-nio=nicaraguansk c\u00f3rdoba
-nlg=nederl\u00e4ndsk gulden
+nio=nicaraguansk córdoba
+nlg=nederländsk gulden
 nok=norsk krona
 npr=nepalesisk rupie
-nzd=nyzeel\u00e4ndsk dollar
+nzd=nyzeeländsk dollar
 omr=omansk rial
 pab=panamansk balboa
 pen=peruansk sol
@@ -204,16 +204,16 @@ pln=polsk zloty
 pte=portugisisk escudo
 pyg=paraguayansk guarani
 qar=qatarisk rial
-rol=rum\u00e4nsk leu (1952\u20132005)
-ron=rum\u00e4nsk leu
+rol=rumänsk leu (1952–2005)
+ron=rumänsk leu
 rsd=serbisk dinar
 rub=rysk rubel
-rur=rysk rubel (1991\u20131998)
+rur=rysk rubel (1991–1998)
 rwf=rwandisk franc
 sar=saudisk riyal
 sbd=Salomondollar
 scr=seychellisk rupie
-sdd=sudansk dinar (1992\u20132007)
+sdd=sudansk dinar (1992–2007)
 sdg=sudanesiskt pund
 sek=svensk krona
 sgd=singaporiansk dollar
@@ -224,17 +224,17 @@ sll=sierraleonsk leone
 sos=somalisk shilling
 srd=surinamesisk dollar
 srg=surinamesisk gulden
-std=saotomeansk dobra (1977\u20132017)
-svc=salvadoransk col\u00f3n
+std=saotomeansk dobra (1977–2017)
+svc=salvadoransk colón
 syp=syriskt pund
-szl=swazil\u00e4ndsk lilangeni
-thb=thail\u00e4ndsk baht
+szl=swaziländsk lilangeni
+thb=thailändsk baht
 tjs=tadzjikisk somoni
-tmm=turkmenistansk manat (1993\u20132009)
+tmm=turkmenistansk manat (1993–2009)
 tnd=tunisisk dinar
-top=tongansk pa\u02bbanga
-tpe=\u00f6sttimoresisk escudo
-trl=turkisk lire (1922\u20132005)
+top=tongansk paʻanga
+tpe=östtimoresisk escudo
+trl=turkisk lire (1922–2005)
 try=turkisk lira
 ttd=Trinidaddollar
 twd=taiwanesisk dollar
@@ -242,34 +242,34 @@ tzs=tanzanisk shilling
 uah=ukrainsk hryvnia
 ugx=ugandisk shilling
 usd=amerikansk dollar
-usn=US-dollar (n\u00e4sta dag)
+usn=US-dollar (nästa dag)
 uss=US-dollar (samma dag)
 uyu=uruguayansk peso
 uzs=uzbekisk sum
-veb=venezuelansk bolivar (1871\u20132008)
-vef=venezuelansk bol\u00edvar (2008\u20132018)
+veb=venezuelansk bolivar (1871–2008)
+vef=venezuelansk bolívar (2008–2018)
 vnd=vietnamesisk dong
 vuv=vanuatisk vatu
-wst=v\u00e4stsamoansk tala
+wst=västsamoansk tala
 xaf=centralafrikansk franc
 xag=silver
 xau=guld
 xba=europeisk kompositenhet
-xbb=europeisk monet\u00e4r enhet
+xbb=europeisk monetär enhet
 xbc=europeisk kontoenhet (XBC)
 xbd=europeisk kontoenhet (XBD)
-xcd=\u00f6stkaribisk dollar
-xdr=IMF s\u00e4rskild dragningsr\u00e4tt
+xcd=östkaribisk dollar
+xdr=IMF särskild dragningsrätt
 xfo=fransk guldfranc
-xfu=internationella j\u00e4rnv\u00e4gsunionens franc
-xof=v\u00e4stafrikansk franc
+xfu=internationella järnvägsunionens franc
+xof=västafrikansk franc
 xpd=palladium
 xpf=CFP-franc
 xpt=platina
 xts=testvalutaenhet
-xxx=ok\u00e4nd valuta
+xxx=okänd valuta
 yer=jemenitisk rial
-yum=jugoslavisk dinar (1994\u20132002)
+yum=jugoslavisk dinar (1994–2002)
 zar=sydafrikansk rand
-zmk=zambisk kwacha (1968\u20132012)
+zmk=zambisk kwacha (1968–2012)
 zwd=Zimbabwe-dollar
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv_SE.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv_SE.properties
index 586e22a316d..1c3ed3faf27 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv_SE.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv_SE.properties
@@ -35,5 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-EUR=\u20AC
+EUR=€
 SEK=kr
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_th_TH.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_th_TH.properties
index 9f6212a4b10..83f45b5d18e 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_th_TH.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_th_TH.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-THB=\u0e3f
+THB=฿
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_uk_UA.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_uk_UA.properties
index 035a4103e3a..7cdbc2a70a7 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_uk_UA.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_uk_UA.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-UAH=\u0433\u0440\u043d.
+UAH=грн.
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_vi_VN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_vi_VN.properties
index 2770bb7fe36..72de5aa39a2 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_vi_VN.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_vi_VN.properties
@@ -35,4 +35,4 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
-VND=\u0111
+VND=đ
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties
index 0207cdf360b..eb31d40b691 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties
@@ -60,227 +60,227 @@
 # or other dealings in these Data Files or Software without prior
 # written authorization of the copyright holder.
 
-CNY=\uffe5
-adp=\u5B89\u9053\u5C14\u6BD4\u585E\u5854
-aed=\u963F\u62C9\u4F2F\u8054\u5408\u914B\u957F\u56FD\u8FEA\u62C9\u59C6
-afa=\u963F\u5BCC\u6C57\u963F\u5BCC\u6C57\u5C3C (1927-2002)
-afn=\u963F\u5BCC\u6C57\u963F\u5BCC\u6C57\u5C3C
-all=\u963F\u5C14\u5DF4\u5C3C\u4E9A\u5217\u514B
-amd=\u4E9A\u7F8E\u5C3C\u4E9A\u5FB7\u62C9\u59C6
-ang=\u8377\u5C5E\u5B89\u7684\u5217\u65AF\u76FE
-aoa=\u5B89\u54E5\u62C9\u5BBD\u624E
-ars=\u963F\u6839\u5EF7\u6BD4\u7D22
-ats=\u5965\u5730\u5229\u5148\u4EE4
-aud=\u6FB3\u5927\u5229\u4E9A\u5143
-awg=\u963F\u9C81\u5DF4\u5C9B\u5F17\u7F57\u6797
-azm=\u963F\u585E\u62DC\u7586\u9A6C\u7EB3\u7279 (1993-2006)
-azn=\u963F\u585E\u62DC\u7586\u9A6C\u7EB3\u7279
-bam=\u6CE2\u65AF\u5C3C\u4E9A\u548C\u9ED1\u585E\u54E5\u7EF4\u90A3\u53EF\u5151\u6362\u9A6C\u514B
-bbd=\u5DF4\u5DF4\u591A\u65AF\u5143
-bdt=\u5B5F\u52A0\u62C9\u5854\u5361
-bef=\u6BD4\u5229\u65F6\u6CD5\u90CE
-bgl=\u4FDD\u52A0\u5229\u4E9A\u5217\u5F17\uFF08\u786C\u5E01\uFF09
-bgn=\u4FDD\u52A0\u5229\u4E9A\u5217\u5F17
-bhd=\u5DF4\u6797\u7B2C\u7EB3\u5C14
-bif=\u5E03\u9686\u8FEA\u6CD5\u90CE
-bmd=\u767E\u6155\u5927\u5143
-bnd=\u6587\u83B1\u5143
-bob=\u6CE2\u5229\u7EF4\u4E9A\u73BB\u5229\u7EF4\u4E9A\u8BFA
-bov=\u73BB\u5229\u7EF4\u4E9A Mvdol
-brl=\u5DF4\u897F\u96F7\u4E9A\u5C14
-bsd=\u5DF4\u54C8\u9A6C\u5143
-btn=\u4E0D\u4E39\u52AA\u624E\u59C6
-bwp=\u535A\u8328\u74E6\u7EB3\u666E\u62C9
-byb=\u767D\u4FC4\u7F57\u65AF\u5362\u5E03 (1994-1999)
-byn=\u767D\u4FC4\u7F57\u65AF\u5362\u5E03
-byr=\u767D\u4FC4\u7F57\u65AF\u5362\u5E03 (2000-2016)
-bzd=\u4F2F\u5229\u5179\u5143
-cad=\u52A0\u62FF\u5927\u5143
-cdf=\u521A\u679C\u6CD5\u90CE
-chf=\u745E\u58EB\u6CD5\u90CE
-clf=\u667A\u5229\u8BB0\u8D26\u5355\u4F4D (UF)
-clp=\u667A\u5229\u6BD4\u7D22
-cny=\u4EBA\u6C11\u5E01
-cop=\u54E5\u4F26\u6BD4\u4E9A\u6BD4\u7D22
-crc=\u54E5\u65AF\u8FBE\u9ECE\u52A0\u79D1\u6717
-csd=\u585E\u5C14\u7EF4\u4E9A\u7B2C\u7EB3\u5C14 (2002-2006)
-cuc=\u53E4\u5DF4\u53EF\u5151\u6362\u6BD4\u7D22
-cup=\u53E4\u5DF4\u6BD4\u7D22
-cve=\u4F5B\u5F97\u89D2\u57C3\u65AF\u5E93\u591A
-cyp=\u585E\u6D66\u8DEF\u65AF\u9551
-czk=\u6377\u514B\u5171\u548C\u56FD\u514B\u90CE
-dem=\u5FB7\u56FD\u9A6C\u514B
-djf=\u5409\u5E03\u63D0\u6CD5\u90CE
-dkk=\u4E39\u9EA6\u514B\u6717
-dop=\u591A\u7C73\u5C3C\u52A0\u6BD4\u7D22
-dzd=\u963F\u5C14\u53CA\u5229\u4E9A\u7B2C\u7EB3\u5C14
-eek=\u7231\u6C99\u5C3C\u4E9A\u514B\u6717
-egp=\u57C3\u53CA\u9551
-ern=\u5384\u7ACB\u7279\u91CC\u4E9A\u7EB3\u514B\u6CD5
-esp=\u897F\u73ED\u7259\u6BD4\u585E\u5854
-etb=\u57C3\u585E\u4FC4\u6BD4\u4E9A\u6BD4\u5C14
-eur=\u6B27\u5143
-fim=\u82AC\u5170\u9A6C\u514B
-fjd=\u6590\u6D4E\u5143
-fkp=\u798F\u514B\u5170\u7FA4\u5C9B\u9551
-frf=\u6CD5\u56FD\u6CD5\u90CE
-gbp=\u82F1\u9551
-gel=\u683C\u9C81\u5409\u4E9A\u62C9\u91CC
-ghc=\u52A0\u7EB3\u585E\u5730 (1979-2007)
-ghs=\u52A0\u7EB3\u585E\u5730
-gip=\u76F4\u5E03\u7F57\u9640\u9551
-gmd=\u5188\u6BD4\u4E9A\u8FBE\u62C9\u897F
-gnf=\u51E0\u5185\u4E9A\u6CD5\u90CE
-grd=\u5E0C\u814A\u5FB7\u62C9\u9A6C\u514B
-gtq=\u5371\u5730\u9A6C\u62C9\u683C\u67E5\u5C14
-gwp=\u51E0\u5185\u4E9A\u6BD4\u7ECD\u6BD4\u7D22
-gyd=\u572D\u4E9A\u90A3\u5143
-hkd=\u6E2F\u5143
-hnl=\u6D2A\u90FD\u62C9\u65AF\u4F26\u76AE\u62C9
-hrk=\u5E93\u7EB3
-htg=\u6D77\u5730\u53E4\u5FB7
-huf=\u5308\u7259\u5229\u798F\u6797
-idr=\u5370\u5EA6\u5C3C\u897F\u4E9A\u5362\u6BD4
-iep=\u7231\u5C14\u5170\u9551
-ils=\u4EE5\u8272\u5217\u65B0\u8C22\u514B\u5C14
-inr=\u5370\u5EA6\u5362\u6BD4
-iqd=\u4F0A\u62C9\u514B\u7B2C\u7EB3\u5C14
-irr=\u4F0A\u6717\u91CC\u4E9A\u5C14
-isk=\u51B0\u5C9B\u514B\u6717
-itl=\u610F\u5927\u5229\u91CC\u62C9
-jmd=\u7259\u4E70\u52A0\u5143
-jod=\u7EA6\u65E6\u7B2C\u7EB3\u5C14
-jpy=\u65E5\u5143
-kes=\u80AF\u5C3C\u4E9A\u5148\u4EE4
-kgs=\u5409\u5C14\u5409\u65AF\u65AF\u5766\u7D22\u59C6
-khr=\u67EC\u57D4\u5BE8\u745E\u5C14
-kmf=\u79D1\u6469\u7F57\u6CD5\u90CE
-kpw=\u5317\u671D\u9C9C\u5143
-krw=\u97E9\u5143
-kwd=\u79D1\u5A01\u7279\u7B2C\u7EB3\u5C14
-kyd=\u5F00\u66FC\u7FA4\u5C9B\u5143
-kzt=\u54C8\u8428\u514B\u65AF\u5766\u817E\u683C
-lak=\u8001\u631D\u57FA\u666E
-lbp=\u9ECE\u5DF4\u5AE9\u9551
-lkr=\u65AF\u91CC\u5170\u5361\u5362\u6BD4
-lrd=\u5229\u6BD4\u91CC\u4E9A\u5143
-lsl=\u83B1\u7D22\u6258\u6D1B\u63D0
-ltl=\u7ACB\u9676\u5B9B\u7ACB\u7279
-luf=\u5362\u68EE\u5821\u6CD5\u90CE
-lvl=\u62C9\u8131\u7EF4\u4E9A\u62C9\u7279
-lyd=\u5229\u6BD4\u4E9A\u7B2C\u7EB3\u5C14
-mad=\u6469\u6D1B\u54E5\u8FEA\u62C9\u59C6
-mdl=\u6469\u5C14\u591A\u74E6\u5217\u4F0A
-mga=\u9A6C\u8FBE\u52A0\u65AF\u52A0\u963F\u91CC\u4E9A\u91CC
-mgf=\u9A6C\u8FBE\u52A0\u65AF\u52A0\u6CD5\u90CE
-mkd=\u9A6C\u5176\u987F\u7B2C\u7EB3\u5C14
-mmk=\u7F05\u7538\u5143
-mnt=\u8499\u53E4\u56FE\u683C\u91CC\u514B
-mop=\u6FB3\u95E8\u5143
-mro=\u6BDB\u91CC\u5854\u5C3C\u4E9A\u4E4C\u5409\u4E9A
-mru=\u6BDB\u91CC\u5854\u5C3C\u4E9A\u4E4C\u5409\u4E9A
-mtl=\u9A6C\u8033\u4ED6\u91CC\u62C9
-mur=\u6BDB\u91CC\u6C42\u65AF\u5362\u6BD4
-mvr=\u9A6C\u5C14\u4EE3\u592B\u7F57\u975E\u4E9A
-mwk=\u9A6C\u62C9\u7EF4\u9A6C\u62C9\u7EF4\u514B\u74E6\u67E5
-mxn=\u58A8\u897F\u54E5\u6BD4\u7D22
-mxv=\u58A8\u897F\u54E5\u6295\u8D44\u5355\u4F4D
-myr=\u9A6C\u6765\u897F\u4E9A\u6797\u5409\u7279
-mzm=\u83AB\u6851\u6BD4\u514B\u7F8E\u63D0\u5361 (1980-2006)
-mzn=\u83AB\u6851\u6BD4\u514B\u7F8E\u63D0\u5361
-nad=\u7EB3\u7C73\u6BD4\u4E9A\u5143
-ngn=\u5C3C\u65E5\u5229\u4E9A\u5948\u62C9
-nio=\u5C3C\u52A0\u62C9\u74DC\u79D1\u591A\u5DF4
-nlg=\u8377\u5170\u76FE
-nok=\u632A\u5A01\u514B\u6717
-npr=\u5C3C\u6CCA\u5C14\u5362\u6BD4
-nzd=\u65B0\u897F\u5170\u5143
-omr=\u963F\u66FC\u91CC\u4E9A\u5C14
-pab=\u5DF4\u62FF\u9A6C\u5DF4\u6CE2\u4E9A
-pen=\u79D8\u9C81\u7D22\u5C14
-pgk=\u5DF4\u5E03\u4E9A\u65B0\u51E0\u5185\u4E9A\u57FA\u90A3
-php=\u83F2\u5F8B\u5BBE\u6BD4\u7D22
-pkr=\u5DF4\u57FA\u65AF\u5766\u5362\u6BD4
-pln=\u6CE2\u5170\u5179\u7F57\u63D0
-pte=\u8461\u8404\u7259\u57C3\u65AF\u5E93\u591A
-pyg=\u5DF4\u62C9\u572D\u74DC\u62C9\u5C3C
-qar=\u5361\u5854\u5C14\u91CC\u4E9A\u5C14
-rol=\u7F57\u9A6C\u5C3C\u4E9A\u5217\u4F0A (1952-2006)
-ron=\u7F57\u9A6C\u5C3C\u4E9A\u5217\u4F0A
-rsd=\u585E\u5C14\u7EF4\u4E9A\u7B2C\u7EB3\u5C14
-rub=\u4FC4\u7F57\u65AF\u5362\u5E03
-rur=\u4FC4\u7F57\u65AF\u5362\u5E03 (1991-1998)
-rwf=\u5362\u65FA\u8FBE\u6CD5\u90CE
-sar=\u6C99\u7279\u91CC\u4E9A\u5C14
-sbd=\u6240\u7F57\u95E8\u7FA4\u5C9B\u5143
-scr=\u585E\u820C\u5C14\u5362\u6BD4
-sdd=\u82CF\u4E39\u7B2C\u7EB3\u5C14 (1992-2007)
-sdg=\u82CF\u4E39\u9551
-sek=\u745E\u5178\u514B\u6717
-sgd=\u65B0\u52A0\u5761\u5143
-shp=\u5723\u8D6B\u52D2\u62FF\u9551
-sit=\u65AF\u6D1B\u6587\u5C3C\u4E9A\u6258\u62C9\u5C14
-skk=\u65AF\u6D1B\u4F10\u514B\u514B\u6717
-sle=\u585E\u62C9\u5229\u6602\u5229\u6602
-sll=\u585E\u62C9\u5229\u6602\u5229\u6602
-sos=\u7D22\u9A6C\u91CC\u5148\u4EE4
-srd=\u82CF\u91CC\u5357\u5143
-srg=\u82CF\u91CC\u5357\u76FE
-ssp=\u5357\u82CF\u4E39\u9551
-std=\u5723\u591A\u7F8E\u548C\u666E\u6797\u897F\u6BD4\u591A\u5E03\u62C9
-stn=\u5723\u591A\u7F8E\u548C\u666E\u6797\u897F\u6BD4\u591A\u5E03\u62C9
-svc=\u8428\u5C14\u74E6\u591A\u79D1\u6717
-syp=\u53D9\u5229\u4E9A\u9551
-szl=\u65AF\u5A01\u58EB\u5170\u91CC\u5170\u5409\u5C3C
-thb=\u6CF0\u94E2
-tjs=\u5854\u5409\u514B\u65AF\u5766\u7D22\u6469\u5C3C
-tmm=\u571F\u5E93\u66FC\u65AF\u5766\u9A6C\u7EB3\u7279 (1993-2009)
-tmt=\u571F\u5E93\u66FC\u65AF\u5766\u9A6C\u7EB3\u7279
-tnd=\u7A81\u5C3C\u65AF\u7B2C\u7EB3\u5C14
-top=\u4E1C\u52A0\u5E01
-tpe=\u4E1C\u5E1D\u6C76\u57C3\u65AF\u5E93\u591A
-trl=\u571F\u8033\u5176\u91CC\u62C9 (1922-2005)
-try=\u571F\u8033\u5176\u91CC\u62C9
-ttd=\u7279\u7ACB\u5C3C\u8FBE\u591A\u5DF4\u54E5\u5143
-twd=\u65B0\u53F0\u5E01
-tzs=\u5766\u6851\u5C3C\u4E9A\u5148\u4EE4
-uah=\u4E4C\u514B\u5170\u683C\u91CC\u592B\u5C3C\u4E9A
-ugx=\u4E4C\u5E72\u8FBE\u5148\u4EE4
-usd=\u7F8E\u5143
-usn=\u7F8E\u5143\uFF08\u6B21\u65E5\uFF09
-uss=\u7F8E\u5143\uFF08\u540C\u65E5\uFF09
-uyu=\u4E4C\u62C9\u572D \u6BD4\u7D22
-uzs=\u4E4C\u5179\u522B\u514B\u671F\u5766\u7D22\u59C6
-veb=\u59D4\u5185\u745E\u62C9\u73BB\u5229\u74E6\u5C14 (1871-2008)
-ved=\u59D4\u5185\u745E\u62C9\u4E3B\u6743\u73BB\u5229\u74E6\u5C14
-vef=\u59D4\u5185\u745E\u62C9\u73BB\u5229\u74E6\u5C14
-ves=\u59D4\u5185\u745E\u62C9\u4E3B\u6743\u73BB\u5229\u74E6\u5C14
-vnd=\u8D8A\u5357\u76FE
-vuv=\u74E6\u52AA\u963F\u56FE\u74E6\u56FE
-wst=\u8428\u6469\u4E9A\u5854\u62C9
-xaf=CFA \u6CD5\u90CE BEAC
-xag=\u94F6\u8272
-xau=\u91D1\u8272
-xba=\u6B27\u6D32\u8D27\u5E01\u5408\u6210\u5355\u4F4D
-xbb=\u6B27\u6D32\u8D27\u5E01\u5355\u4F4D
-xbc=\u6B27\u6D32\u8BB0\u8D26\u5355\u4F4D (XBC)
-xbd=\u6B27\u6D32\u8BB0\u8D26\u5355\u4F4D (XBD)
-xcd=\u4E1C\u52A0\u52D2\u6BD4\u5143
-xdr=\u7279\u522B\u63D0\u6B3E\u6743
-xfo=\u6CD5\u56FD\u91D1\u6CD5\u90CE
-xfu=\u6CD5\u56FD UIC \u6CD5\u90CE
-xof=CFA \u6CD5\u90CE BCEAO
-xpd=\u94AF
-xpf=\u592A\u5E73\u6D0B\u6CD5\u90CE
-xpt=\u767D\u91D1
-xsu=\u82CF\u514B\u96F7
-xts=\u6D4B\u8BD5\u8D27\u5E01\u4EE3\u7801
-xua=ADB \u8BB0\u8D26\u5355\u4F4D
-xxx=\u672A\u77E5\u8D27\u5E01
-yer=\u4E5F\u95E8\u91CC\u4E9A\u5C14
-yum=\u5357\u65AF\u62C9\u592B\u65B0\u7B2C\u7EB3\u5C14 (1994-2002)
-zar=\u5357\u975E\u5170\u7279
-zmk=\u8D5E\u6BD4\u4E9A\u514B\u74E6\u67E5
-zwd=\u6D25\u5DF4\u5E03\u97E6\u5143 (1980-2008)
-zwl=\u6D25\u5DF4\u5E03\u97E6\u5143 (2009)
-zwr=\u6D25\u5DF4\u5E03\u97E6\u5143 (2008)
+CNY=￥
+adp=安道尔比塞塔
+aed=阿拉伯联合酋长国迪拉姆
+afa=阿富汗阿富汗尼 (1927-2002)
+afn=阿富汗阿富汗尼
+all=阿尔巴尼亚列克
+amd=亚美尼亚德拉姆
+ang=荷属安的列斯盾
+aoa=安哥拉宽扎
+ars=阿根廷比索
+ats=奥地利先令
+aud=澳大利亚元
+awg=阿鲁巴岛弗罗林
+azm=阿塞拜疆马纳特 (1993-2006)
+azn=阿塞拜疆马纳特
+bam=波斯尼亚和黑塞哥维那可兑换马克
+bbd=巴巴多斯元
+bdt=孟加拉塔卡
+bef=比利时法郎
+bgl=保加利亚列弗（硬币）
+bgn=保加利亚列弗
+bhd=巴林第纳尔
+bif=布隆迪法郎
+bmd=百慕大元
+bnd=文莱元
+bob=波利维亚玻利维亚诺
+bov=玻利维亚 Mvdol
+brl=巴西雷亚尔
+bsd=巴哈马元
+btn=不丹努扎姆
+bwp=博茨瓦纳普拉
+byb=白俄罗斯卢布 (1994-1999)
+byn=白俄罗斯卢布
+byr=白俄罗斯卢布 (2000-2016)
+bzd=伯利兹元
+cad=加拿大元
+cdf=刚果法郎
+chf=瑞士法郎
+clf=智利记账单位 (UF)
+clp=智利比索
+cny=人民币
+cop=哥伦比亚比索
+crc=哥斯达黎加科朗
+csd=塞尔维亚第纳尔 (2002-2006)
+cuc=古巴可兑换比索
+cup=古巴比索
+cve=佛得角埃斯库多
+cyp=塞浦路斯镑
+czk=捷克共和国克郎
+dem=德国马克
+djf=吉布提法郎
+dkk=丹麦克朗
+dop=多米尼加比索
+dzd=阿尔及利亚第纳尔
+eek=爱沙尼亚克朗
+egp=埃及镑
+ern=厄立特里亚纳克法
+esp=西班牙比塞塔
+etb=埃塞俄比亚比尔
+eur=欧元
+fim=芬兰马克
+fjd=斐济元
+fkp=福克兰群岛镑
+frf=法国法郎
+gbp=英镑
+gel=格鲁吉亚拉里
+ghc=加纳塞地 (1979-2007)
+ghs=加纳塞地
+gip=直布罗陀镑
+gmd=冈比亚达拉西
+gnf=几内亚法郎
+grd=希腊德拉马克
+gtq=危地马拉格查尔
+gwp=几内亚比绍比索
+gyd=圭亚那元
+hkd=港元
+hnl=洪都拉斯伦皮拉
+hrk=库纳
+htg=海地古德
+huf=匈牙利福林
+idr=印度尼西亚卢比
+iep=爱尔兰镑
+ils=以色列新谢克尔
+inr=印度卢比
+iqd=伊拉克第纳尔
+irr=伊朗里亚尔
+isk=冰岛克朗
+itl=意大利里拉
+jmd=牙买加元
+jod=约旦第纳尔
+jpy=日元
+kes=肯尼亚先令
+kgs=吉尔吉斯斯坦索姆
+khr=柬埔寨瑞尔
+kmf=科摩罗法郎
+kpw=北朝鲜元
+krw=韩元
+kwd=科威特第纳尔
+kyd=开曼群岛元
+kzt=哈萨克斯坦腾格
+lak=老挝基普
+lbp=黎巴嫩镑
+lkr=斯里兰卡卢比
+lrd=利比里亚元
+lsl=莱索托洛提
+ltl=立陶宛立特
+luf=卢森堡法郎
+lvl=拉脱维亚拉特
+lyd=利比亚第纳尔
+mad=摩洛哥迪拉姆
+mdl=摩尔多瓦列伊
+mga=马达加斯加阿里亚里
+mgf=马达加斯加法郎
+mkd=马其顿第纳尔
+mmk=缅甸元
+mnt=蒙古图格里克
+mop=澳门元
+mro=毛里塔尼亚乌吉亚
+mru=毛里塔尼亚乌吉亚
+mtl=马耳他里拉
+mur=毛里求斯卢比
+mvr=马尔代夫罗非亚
+mwk=马拉维马拉维克瓦查
+mxn=墨西哥比索
+mxv=墨西哥投资单位
+myr=马来西亚林吉特
+mzm=莫桑比克美提卡 (1980-2006)
+mzn=莫桑比克美提卡
+nad=纳米比亚元
+ngn=尼日利亚奈拉
+nio=尼加拉瓜科多巴
+nlg=荷兰盾
+nok=挪威克朗
+npr=尼泊尔卢比
+nzd=新西兰元
+omr=阿曼里亚尔
+pab=巴拿马巴波亚
+pen=秘鲁索尔
+pgk=巴布亚新几内亚基那
+php=菲律宾比索
+pkr=巴基斯坦卢比
+pln=波兰兹罗提
+pte=葡萄牙埃斯库多
+pyg=巴拉圭瓜拉尼
+qar=卡塔尔里亚尔
+rol=罗马尼亚列伊 (1952-2006)
+ron=罗马尼亚列伊
+rsd=塞尔维亚第纳尔
+rub=俄罗斯卢布
+rur=俄罗斯卢布 (1991-1998)
+rwf=卢旺达法郎
+sar=沙特里亚尔
+sbd=所罗门群岛元
+scr=塞舌尔卢比
+sdd=苏丹第纳尔 (1992-2007)
+sdg=苏丹镑
+sek=瑞典克朗
+sgd=新加坡元
+shp=圣赫勒拿镑
+sit=斯洛文尼亚托拉尔
+skk=斯洛伐克克朗
+sle=塞拉利昂利昂
+sll=塞拉利昂利昂
+sos=索马里先令
+srd=苏里南元
+srg=苏里南盾
+ssp=南苏丹镑
+std=圣多美和普林西比多布拉
+stn=圣多美和普林西比多布拉
+svc=萨尔瓦多科朗
+syp=叙利亚镑
+szl=斯威士兰里兰吉尼
+thb=泰铢
+tjs=塔吉克斯坦索摩尼
+tmm=土库曼斯坦马纳特 (1993-2009)
+tmt=土库曼斯坦马纳特
+tnd=突尼斯第纳尔
+top=东加币
+tpe=东帝汶埃斯库多
+trl=土耳其里拉 (1922-2005)
+try=土耳其里拉
+ttd=特立尼达多巴哥元
+twd=新台币
+tzs=坦桑尼亚先令
+uah=乌克兰格里夫尼亚
+ugx=乌干达先令
+usd=美元
+usn=美元（次日）
+uss=美元（同日）
+uyu=乌拉圭 比索
+uzs=乌兹别克期坦索姆
+veb=委内瑞拉玻利瓦尔 (1871-2008)
+ved=委内瑞拉主权玻利瓦尔
+vef=委内瑞拉玻利瓦尔
+ves=委内瑞拉主权玻利瓦尔
+vnd=越南盾
+vuv=瓦努阿图瓦图
+wst=萨摩亚塔拉
+xaf=CFA 法郎 BEAC
+xag=银色
+xau=金色
+xba=欧洲货币合成单位
+xbb=欧洲货币单位
+xbc=欧洲记账单位 (XBC)
+xbd=欧洲记账单位 (XBD)
+xcd=东加勒比元
+xdr=特别提款权
+xfo=法国金法郎
+xfu=法国 UIC 法郎
+xof=CFA 法郎 BCEAO
+xpd=钯
+xpf=太平洋法郎
+xpt=白金
+xsu=苏克雷
+xts=测试货币代码
+xua=ADB 记账单位
+xxx=未知货币
+yer=也门里亚尔
+yum=南斯拉夫新第纳尔 (1994-2002)
+zar=南非兰特
+zmk=赞比亚克瓦查
+zwd=津巴布韦元 (1980-2008)
+zwl=津巴布韦元 (2009)
+zwr=津巴布韦元 (2008)
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_TW.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_TW.properties
index bb37d848790..3f68856e9a1 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_TW.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_TW.properties
@@ -64,216 +64,216 @@
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 #
 TWD=NT$
-twd=\u65b0\u53f0\u5e63
-adp=\u5b89\u9053\u723e\u966a\u58eb\u7279
-aed=\u963f\u62c9\u4f2f\u806f\u5408\u5927\u516c\u570b\u8fea\u723e\u6c57
-afa=\u963f\u5bcc\u6c57\u5c3c (1927\u20132002)
-afn=\u963f\u5bcc\u6c57\u5c3c
-all=\u963f\u723e\u5df4\u5c3c\u4e9e\u5217\u514b
-amd=\u4e9e\u7f8e\u5c3c\u4e9e\u5fb7\u62c9\u59c6
-ang=\u8377\u5c6c\u5b89\u5730\u5217\u65af\u76fe
-aoa=\u5b89\u54e5\u62c9\u5bec\u624e
-ars=\u963f\u6839\u5ef7\u62ab\u7d22
-ats=\u5967\u5730\u5229\u5148\u4ee4
-aud=\u6fb3\u5e63
-awg=\u963f\u8def\u5df4\u76fe
-azm=\u4e9e\u585e\u62dc\u7136\u99ac\u7d0d\u7279 (1993\u20132006)
-azn=\u4e9e\u585e\u62dc\u7136\u99ac\u7d0d\u7279
-bam=\u6ce2\u58eb\u5c3c\u4e9e-\u8d6b\u585e\u54e5\u7dad\u7d0d\u53ef\u8f49\u63db\u99ac\u514b
-bbd=\u5df4\u8c9d\u591a\u5143
-bdt=\u5b5f\u52a0\u62c9\u5854\u5361
-bef=\u6bd4\u5229\u6642\u6cd5\u90ce
-bgl=\u4fdd\u52a0\u5229\u4e9e\u786c\u5217\u5f17
-bgn=\u4fdd\u52a0\u5229\u4e9e\u65b0\u5217\u5f17
-bhd=\u5df4\u6797\u7b2c\u7d0d\u723e
-bif=\u84b2\u9686\u5730\u6cd5\u90ce
-bmd=\u767e\u6155\u9054\u5e63
-bnd=\u6c76\u840a\u5143
-bob=\u73bb\u5229\u7dad\u4e9e\u8afe
-bov=\u73bb\u5229\u7dad\u4e9e\u5e55\u591a
-brl=\u5df4\u897f\u91cc\u62c9
-bsd=\u5df4\u54c8\u99ac\u5143
-btn=\u4e0d\u4e39\u90a3\u7279\u502b
-bwp=\u6ce2\u672d\u90a3\u666e\u62c9
-byb=\u767d\u4fc4\u7f85\u65af\u65b0\u76e7\u5e03 (1994\u20131999)
-byr=\u767d\u4fc4\u7f85\u65af\u76e7\u5e03 (2000\u20132016)
-bzd=\u8c9d\u91cc\u65af\u5143
-cad=\u52a0\u5e63
-cdf=\u525b\u679c\u6cd5\u90ce
-chf=\u745e\u58eb\u6cd5\u90ce
-clf=\u5361\u6797\u6cb9\u9054\u4f5b\u66fc\u8dce
-clp=\u667a\u5229\u62ab\u7d22
-cny=\u4eba\u6c11\u5e63
-cop=\u54e5\u502b\u6bd4\u4e9e\u62ab\u7d22
-crc=\u54e5\u65af\u5927\u9ece\u52a0\u79d1\u6717
-csd=\u820a\u585e\u723e\u7dad\u4e9e\u7b2c\u7d0d\u723e
-cuc=\u53e4\u5df4\u53ef\u8f49\u63db\u62ab\u7d22
-cup=\u53e4\u5df4\u62ab\u7d22
-cve=\u7dad\u5fb7\u89d2\u57c3\u65af\u5eab\u591a
-cyp=\u8cfd\u666e\u52d2\u65af\u938a
-czk=\u6377\u514b\u514b\u6717
-dem=\u5fb7\u570b\u99ac\u514b
-djf=\u5409\u5e03\u5730\u6cd5\u90ce
-dkk=\u4e39\u9ea5\u514b\u6717
-dop=\u591a\u660e\u5c3c\u52a0\u62ab\u7d22
-dzd=\u963f\u723e\u53ca\u5229\u4e9e\u7b2c\u7d0d\u723e
-eek=\u611b\u6c99\u5c3c\u4e9e\u514b\u6717
-egp=\u57c3\u53ca\u938a
-ern=\u5384\u7acb\u7279\u91cc\u4e9e\u7d0d\u514b\u6cd5
-esp=\u897f\u73ed\u7259\u966a\u58eb\u7279
-etb=\u8863\u7d22\u6bd4\u4e9e\u6bd4\u723e
-eur=\u6b50\u5143
-fim=\u82ac\u862d\u99ac\u514b
-fjd=\u6590\u6fdf\u5143
-fkp=\u798f\u514b\u862d\u7fa4\u5cf6\u938a
-frf=\u6cd5\u570b\u6cd5\u90ce
-gbp=\u82f1\u938a
-gel=\u55ac\u6cbb\u4e9e\u62c9\u91cc
-ghc=\u8fe6\u7d0d\u8cfd\u5730 (1979\u20132007)
-ghs=\u8fe6\u7d0d\u585e\u5730
-gip=\u76f4\u5e03\u7f85\u9640\u938a
-gmd=\u7518\u6bd4\u4e9e\u9054\u62c9\u897f
-gnf=\u5e7e\u5167\u4e9e\u6cd5\u90ce
-grd=\u5e0c\u81d8\u5fb7\u62c9\u514b\u99ac
-gtq=\u74dc\u5730\u99ac\u62c9\u683c\u67e5\u723e
-gwp=\u5e7e\u5167\u4e9e\u6bd4\u7d22\u62ab\u7d22
-gyd=\u572d\u4e9e\u90a3\u5143
-hkd=\u6e2f\u5e63
-hnl=\u6d2a\u90fd\u62c9\u65af\u502b\u76ae\u62c9
-hrk=\u514b\u7f85\u57c3\u897f\u4e9e\u5eab\u7d0d
-htg=\u6d77\u5730\u53e4\u5fb7
-huf=\u5308\u7259\u5229\u798f\u6797
-idr=\u5370\u5c3c\u76fe
-iep=\u611b\u723e\u862d\u938a
-ils=\u4ee5\u8272\u5217\u65b0\u8b1d\u514b\u723e
-inr=\u5370\u5ea6\u76e7\u6bd4
-iqd=\u4f0a\u62c9\u514b\u7b2c\u7d0d\u723e
-irr=\u4f0a\u6717\u91cc\u4e9e\u723e
-isk=\u51b0\u5cf6\u514b\u6717
-itl=\u7fa9\u5927\u5229\u91cc\u62c9
-jmd=\u7259\u8cb7\u52a0\u5143
-jod=\u7d04\u65e6\u7b2c\u7d0d\u723e
-jpy=\u65e5\u5713
-kes=\u80af\u5c3c\u4e9e\u5148\u4ee4
-kgs=\u5409\u723e\u5409\u65af\u7d22\u59c6
-khr=\u67ec\u57d4\u5be8\u745e\u723e
-kmf=\u79d1\u6469\u7f85\u6cd5\u90ce
-kpw=\u5317\u97d3\u5143
-krw=\u97d3\u5143
-kwd=\u79d1\u5a01\u7279\u7b2c\u7d0d\u723e
-kyd=\u958b\u66fc\u7fa4\u5cf6\u5143
-kzt=\u54c8\u85a9\u514b\u5805\u6208
-lak=\u5bee\u570b\u57fa\u666e
-lbp=\u9ece\u5df4\u5ae9\u938a
-lkr=\u65af\u91cc\u862d\u5361\u76e7\u6bd4
-lrd=\u8cf4\u6bd4\u745e\u4e9e\u5143
-lsl=\u8cf4\u7d22\u6258\u6d1b\u8482
-ltl=\u7acb\u9676\u5b9b\u7acb\u7279
-luf=\u76e7\u68ee\u5821\u6cd5\u90ce
-lvl=\u62c9\u812b\u7dad\u4e9e\u62c9\u7279\u9280\u5e63
-lyd=\u5229\u6bd4\u4e9e\u7b2c\u7d0d\u723e
-mad=\u6469\u6d1b\u54e5\u8fea\u62c9\u59c6
-mdl=\u6469\u675c\u96f2\u5217\u4f0a
-mga=\u99ac\u9054\u52a0\u65af\u52a0\u963f\u91cc\u4e9e\u91cc
-mgf=\u99ac\u9054\u52a0\u65af\u52a0\u6cd5\u90ce
-mkd=\u99ac\u5176\u9813\u7b2c\u7d0d\u723e
-mmk=\u7dec\u7538\u5143
-mnt=\u8499\u53e4\u5716\u683c\u91cc\u514b
-mop=\u6fb3\u9580\u5143
-mro=\u8305\u5229\u5854\u5c3c\u4e9e\u70cf\u5409\u4e9e (1973\u20132017)
-mtl=\u99ac\u723e\u4ed6\u91cc\u62c9
-mur=\u6a21\u91cc\u897f\u65af\u76e7\u6bd4
-mvr=\u99ac\u723e\u5730\u592b\u76e7\u975e\u4e9e
-mwk=\u99ac\u62c9\u7dad\u514b\u74e6\u67e5
-mxn=\u58a8\u897f\u54e5\u62ab\u7d22
-mxv=\u58a8\u897f\u54e5\u8f49\u63db\u55ae\u4f4d (UDI)
-myr=\u99ac\u4f86\u897f\u4e9e\u4ee4\u5409
-mzm=\u83ab\u4e09\u6bd4\u514b\u6885\u8482\u5361\u723e (1980\u20132006)
-mzn=\u83ab\u4e09\u6bd4\u514b\u6885\u8482\u5361\u723e
-nad=\u7d0d\u7c73\u6bd4\u4e9e\u5143
-ngn=\u5948\u53ca\u5229\u4e9e\u5948\u62c9
-nio=\u5c3c\u52a0\u62c9\u74dc\u91d1\u79d1\u591a\u5df4
-nlg=\u8377\u862d\u76fe
-nok=\u632a\u5a01\u514b\u6717
-npr=\u5c3c\u6cca\u723e\u76e7\u6bd4
-nzd=\u7d10\u897f\u862d\u5e63
-omr=\u963f\u66fc\u91cc\u4e9e\u723e
-pab=\u5df4\u62ff\u99ac\u5df4\u6ce2\u4e9e
-pen=\u79d8\u9b6f\u592a\u967d\u5e63
-pgk=\u5df4\u5e03\u4e9e\u7d10\u5e7e\u5167\u4e9e\u57fa\u90a3
-php=\u83f2\u5f8b\u8cd3\u62ab\u7d22
-pkr=\u5df4\u57fa\u65af\u5766\u76e7\u6bd4
-pln=\u6ce2\u862d\u8332\u7f85\u63d0
-pte=\u8461\u8404\u7259\u57c3\u65af\u5eab\u591a
-pyg=\u5df4\u62c9\u572d\u74dc\u62c9\u5c3c
-qar=\u5361\u9054\u91cc\u4e9e\u723e
-rol=\u820a\u7f85\u99ac\u5c3c\u4e9e\u5217\u4f0a
-ron=\u7f85\u99ac\u5c3c\u4e9e\u5217\u4f0a
-rsd=\u585e\u723e\u7dad\u4e9e\u6234\u7d0d
-rub=\u4fc4\u7f85\u65af\u76e7\u5e03
-rur=\u4fc4\u7f85\u65af\u76e7\u5e03 (1991\u20131998)
-rwf=\u76e7\u5b89\u9054\u6cd5\u90ce
-sar=\u6c99\u70cf\u5730\u91cc\u4e9e\u723e
-sbd=\u7d22\u7f85\u9580\u7fa4\u5cf6\u5143
-scr=\u585e\u5e2d\u723e\u76e7\u6bd4
-sdd=\u8607\u4e39\u7b2c\u7d0d\u723e
-sdg=\u8607\u4e39\u938a
-sek=\u745e\u5178\u514b\u6717
-sgd=\u65b0\u52a0\u5761\u5e63
-shp=\u8056\u8d6b\u52d2\u62ff\u938a
-sit=\u65af\u6d1b\u7dad\u5c3c\u4e9e\u6258\u52d2
-skk=\u65af\u6d1b\u4f10\u514b\u514b\u6717
-sll=\u7345\u5b50\u5c71\u5229\u6602
-sos=\u7d22\u99ac\u5229\u4e9e\u5148\u4ee4
-srd=\u8607\u5229\u5357\u5143
-srg=\u8607\u5229\u5357\u57fa\u723e
-std=\u8056\u591a\u7f8e\u5cf6\u548c\u666e\u6797\u897f\u6bd4\u5cf6\u591a\u5e03\u62c9 (1977\u20132017)
-svc=\u85a9\u723e\u74e6\u591a\u79d1\u90ce
-syp=\u6558\u5229\u4e9e\u938a
-szl=\u53f2\u74e6\u6fdf\u862d\u91cc\u6717\u5409\u5c3c
-thb=\u6cf0\u9296
-tjs=\u5854\u5409\u514b\u7d22\u83ab\u5c3c
-tmm=\u571f\u5eab\u66fc\u99ac\u7d0d\u7279 (1993\u20132009)
-tmt=\u571f\u5eab\u66fc\u99ac\u7d0d\u7279
-tnd=\u7a81\u5c3c\u897f\u4e9e\u7b2c\u7d0d\u723e
-top=\u6771\u52a0\u6f58\u52a0
-tpe=\u5e1d\u6c76\u57c3\u65af\u5eab\u591a
-trl=\u571f\u8033\u5176\u91cc\u62c9
-try=\u65b0\u571f\u8033\u5176\u91cc\u62c9
-ttd=\u5343\u91cc\u9054\u53ca\u6258\u5df4\u54e5\u5143
-tzs=\u5766\u5c1a\u5c3c\u4e9e\u5148\u4ee4
-uah=\u70cf\u514b\u862d\u683c\u91cc\u592b\u7d0d
-ugx=\u70cf\u5e72\u9054\u5148\u4ee4
-usd=\u7f8e\u5143
-usn=\u7f8e\u5143\uff08\u6b21\u65e5\uff09
-uss=\u7f8e\u5143\uff08\u7576\u65e5\uff09
-uyu=\u70cf\u62c9\u572d\u62ab\u7d22
-uzs=\u70cf\u8332\u5225\u514b\u7d22\u59c6
-veb=\u59d4\u5167\u745e\u62c9\u73bb\u5229\u74e6 (1871\u20132008)
-vef=\u59d4\u5167\u745e\u62c9\u73bb\u5229\u74e6 (2008\u20132018)
-vnd=\u8d8a\u5357\u76fe
-vuv=\u842c\u90a3\u675c\u74e6\u5716
-wst=\u897f\u85a9\u6469\u4e9e\u5854\u62c9
-xaf=\u6cd5\u90ce (CFA\u2013BEAC)
-xag=\u767d\u9280
-xau=\u9ec3\u91d1
-xba=\u6b50\u6d32\u7d9c\u5408\u55ae\u4f4d
-xbb=\u6b50\u6d32\u8ca8\u5e63\u55ae\u4f4d (XBB)
-xbc=\u6b50\u6d32\u6703\u8a08\u55ae\u4f4d (XBC)
-xbd=\u6b50\u6d32\u6703\u8a08\u55ae\u4f4d (XBD)
-xcd=\u683c\u745e\u90a3\u9054\u5143
-xdr=\u7279\u6b8a\u63d0\u6b3e\u6b0a
-xfo=\u6cd5\u570b\u91d1\u6cd5\u90ce
-xfu=\u6cd5\u570b\u6cd5\u90ce (UIC)
-xof=\u6cd5\u90ce (CFA\u2013BCEAO)
-xpd=\u5e15\u62c9\u72c4\u6602
-xpf=\u6cd5\u90ce (CFP)
-xpt=\u767d\u91d1
-xts=\u6e2c\u8a66\u7528\u8ca8\u5e63\u4ee3\u78bc
-xxx=\u672a\u77e5\u8ca8\u5e63
-yer=\u8449\u9580\u91cc\u4e9e\u723e
-yum=\u5357\u65af\u62c9\u592b\u632a\u5a01\u4e9e\u7b2c\u7d0d\u723e
-zar=\u5357\u975e\u862d\u7279
-zmk=\u5c1a\u6bd4\u4e9e\u514b\u74e6\u67e5 (1968\u20132012)
-zwd=\u8f9b\u5df4\u5a01\u5143 (1980\u20132008)
-zwl=\u8f9b\u5df4\u5a01\u5143 (2009)
+twd=新台幣
+adp=安道爾陪士特
+aed=阿拉伯聯合大公國迪爾汗
+afa=阿富汗尼 (1927–2002)
+afn=阿富汗尼
+all=阿爾巴尼亞列克
+amd=亞美尼亞德拉姆
+ang=荷屬安地列斯盾
+aoa=安哥拉寬扎
+ars=阿根廷披索
+ats=奧地利先令
+aud=澳幣
+awg=阿路巴盾
+azm=亞塞拜然馬納特 (1993–2006)
+azn=亞塞拜然馬納特
+bam=波士尼亞-赫塞哥維納可轉換馬克
+bbd=巴貝多元
+bdt=孟加拉塔卡
+bef=比利時法郎
+bgl=保加利亞硬列弗
+bgn=保加利亞新列弗
+bhd=巴林第納爾
+bif=蒲隆地法郎
+bmd=百慕達幣
+bnd=汶萊元
+bob=玻利維亞諾
+bov=玻利維亞幕多
+brl=巴西里拉
+bsd=巴哈馬元
+btn=不丹那特倫
+bwp=波札那普拉
+byb=白俄羅斯新盧布 (1994–1999)
+byr=白俄羅斯盧布 (2000–2016)
+bzd=貝里斯元
+cad=加幣
+cdf=剛果法郎
+chf=瑞士法郎
+clf=卡林油達佛曼跎
+clp=智利披索
+cny=人民幣
+cop=哥倫比亞披索
+crc=哥斯大黎加科朗
+csd=舊塞爾維亞第納爾
+cuc=古巴可轉換披索
+cup=古巴披索
+cve=維德角埃斯庫多
+cyp=賽普勒斯鎊
+czk=捷克克朗
+dem=德國馬克
+djf=吉布地法郎
+dkk=丹麥克朗
+dop=多明尼加披索
+dzd=阿爾及利亞第納爾
+eek=愛沙尼亞克朗
+egp=埃及鎊
+ern=厄立特里亞納克法
+esp=西班牙陪士特
+etb=衣索比亞比爾
+eur=歐元
+fim=芬蘭馬克
+fjd=斐濟元
+fkp=福克蘭群島鎊
+frf=法國法郎
+gbp=英鎊
+gel=喬治亞拉里
+ghc=迦納賽地 (1979–2007)
+ghs=迦納塞地
+gip=直布羅陀鎊
+gmd=甘比亞達拉西
+gnf=幾內亞法郎
+grd=希臘德拉克馬
+gtq=瓜地馬拉格查爾
+gwp=幾內亞比索披索
+gyd=圭亞那元
+hkd=港幣
+hnl=洪都拉斯倫皮拉
+hrk=克羅埃西亞庫納
+htg=海地古德
+huf=匈牙利福林
+idr=印尼盾
+iep=愛爾蘭鎊
+ils=以色列新謝克爾
+inr=印度盧比
+iqd=伊拉克第納爾
+irr=伊朗里亞爾
+isk=冰島克朗
+itl=義大利里拉
+jmd=牙買加元
+jod=約旦第納爾
+jpy=日圓
+kes=肯尼亞先令
+kgs=吉爾吉斯索姆
+khr=柬埔寨瑞爾
+kmf=科摩羅法郎
+kpw=北韓元
+krw=韓元
+kwd=科威特第納爾
+kyd=開曼群島元
+kzt=哈薩克堅戈
+lak=寮國基普
+lbp=黎巴嫩鎊
+lkr=斯里蘭卡盧比
+lrd=賴比瑞亞元
+lsl=賴索托洛蒂
+ltl=立陶宛立特
+luf=盧森堡法郎
+lvl=拉脫維亞拉特銀幣
+lyd=利比亞第納爾
+mad=摩洛哥迪拉姆
+mdl=摩杜雲列伊
+mga=馬達加斯加阿里亞里
+mgf=馬達加斯加法郎
+mkd=馬其頓第納爾
+mmk=緬甸元
+mnt=蒙古圖格里克
+mop=澳門元
+mro=茅利塔尼亞烏吉亞 (1973–2017)
+mtl=馬爾他里拉
+mur=模里西斯盧比
+mvr=馬爾地夫盧非亞
+mwk=馬拉維克瓦查
+mxn=墨西哥披索
+mxv=墨西哥轉換單位 (UDI)
+myr=馬來西亞令吉
+mzm=莫三比克梅蒂卡爾 (1980–2006)
+mzn=莫三比克梅蒂卡爾
+nad=納米比亞元
+ngn=奈及利亞奈拉
+nio=尼加拉瓜金科多巴
+nlg=荷蘭盾
+nok=挪威克朗
+npr=尼泊爾盧比
+nzd=紐西蘭幣
+omr=阿曼里亞爾
+pab=巴拿馬巴波亞
+pen=秘魯太陽幣
+pgk=巴布亞紐幾內亞基那
+php=菲律賓披索
+pkr=巴基斯坦盧比
+pln=波蘭茲羅提
+pte=葡萄牙埃斯庫多
+pyg=巴拉圭瓜拉尼
+qar=卡達里亞爾
+rol=舊羅馬尼亞列伊
+ron=羅馬尼亞列伊
+rsd=塞爾維亞戴納
+rub=俄羅斯盧布
+rur=俄羅斯盧布 (1991–1998)
+rwf=盧安達法郎
+sar=沙烏地里亞爾
+sbd=索羅門群島元
+scr=塞席爾盧比
+sdd=蘇丹第納爾
+sdg=蘇丹鎊
+sek=瑞典克朗
+sgd=新加坡幣
+shp=聖赫勒拿鎊
+sit=斯洛維尼亞托勒
+skk=斯洛伐克克朗
+sll=獅子山利昂
+sos=索馬利亞先令
+srd=蘇利南元
+srg=蘇利南基爾
+std=聖多美島和普林西比島多布拉 (1977–2017)
+svc=薩爾瓦多科郎
+syp=敘利亞鎊
+szl=史瓦濟蘭里朗吉尼
+thb=泰銖
+tjs=塔吉克索莫尼
+tmm=土庫曼馬納特 (1993–2009)
+tmt=土庫曼馬納特
+tnd=突尼西亞第納爾
+top=東加潘加
+tpe=帝汶埃斯庫多
+trl=土耳其里拉
+try=新土耳其里拉
+ttd=千里達及托巴哥元
+tzs=坦尚尼亞先令
+uah=烏克蘭格里夫納
+ugx=烏干達先令
+usd=美元
+usn=美元（次日）
+uss=美元（當日）
+uyu=烏拉圭披索
+uzs=烏茲別克索姆
+veb=委內瑞拉玻利瓦 (1871–2008)
+vef=委內瑞拉玻利瓦 (2008–2018)
+vnd=越南盾
+vuv=萬那杜瓦圖
+wst=西薩摩亞塔拉
+xaf=法郎 (CFA–BEAC)
+xag=白銀
+xau=黃金
+xba=歐洲綜合單位
+xbb=歐洲貨幣單位 (XBB)
+xbc=歐洲會計單位 (XBC)
+xbd=歐洲會計單位 (XBD)
+xcd=格瑞那達元
+xdr=特殊提款權
+xfo=法國金法郎
+xfu=法國法郎 (UIC)
+xof=法郎 (CFA–BCEAO)
+xpd=帕拉狄昂
+xpf=法郎 (CFP)
+xpt=白金
+xts=測試用貨幣代碼
+xxx=未知貨幣
+yer=葉門里亞爾
+yum=南斯拉夫挪威亞第納爾
+zar=南非蘭特
+zmk=尚比亞克瓦查 (1968–2012)
+zwd=辛巴威元 (1980–2008)
+zwl=辛巴威元 (2009)
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ar.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ar.properties
index 0b565e2d238..83ced4ca33c 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ar.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ar.properties
@@ -38,25 +38,25 @@
 # language names
 # key is ISO 639 language code
 
-ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
+ar=العربية
 
 # country names
 # key is ISO 3166 country code
 
-EG=\u0645\u0635\u0631
-DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-JO=\u0627\u0644\u0623\u0631\u062f\u0646
-KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LB=\u0644\u0628\u0646\u0627\u0646
-LY=\u0644\u064a\u0628\u064a\u0627
-MA=\u0627\u0644\u0645\u063a\u0631\u0628
-OM=\u0639\u064f\u0645\u0627\u0646
-QA=\u0642\u0637\u0631
-SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-SY=\u0633\u0648\u0631\u064a\u0627
-TN=\u062a\u0648\u0646\u0633
-AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-YE=\u0627\u0644\u064a\u0645\u0646
+EG=مصر
+DZ=الجزائر
+BH=البحرين
+IQ=العراق
+JO=الأردن
+KW=الكويت
+LB=لبنان
+LY=ليبيا
+MA=المغرب
+OM=عُمان
+QA=قطر
+SA=المملكة العربية السعودية
+SD=السودان
+SY=سوريا
+TN=تونس
+AE=الإمارات العربية المتحدة
+YE=اليمن
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_be.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_be.properties
index de832d42fda..2d76c54828d 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_be.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_be.properties
@@ -38,9 +38,9 @@
 # language names
 # key is ISO 639 language code
 
-be=\u0431\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f
+be=беларуская
 
 # country names
 # key is ISO 3166 country code
 
-BY=\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c
+BY=Беларусь
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_bg.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_bg.properties
index cec6a952fda..f6e4f90d911 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_bg.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_bg.properties
@@ -38,9 +38,9 @@
 # language names
 # key is ISO 639 language code
 
-bg=\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438
+bg=български
 
 # country names
 # key is ISO 3166 country code
 
-BG=\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f
+BG=България
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ca.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ca.properties
index 17cc80284a7..c7266fbf6e9 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ca.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ca.properties
@@ -39,143 +39,143 @@
 # key is ISO 639 language code
 
 ab=abkhaz
-aa=\u00e0far
+aa=àfar
 af=afrikaans
-sq=alban\u00e8s
-am=amh\u00e0ric
-ar=\u00e0rab
+sq=albanès
+am=amhàric
+ar=àrab
 hy=armeni
-as=assam\u00e8s
+as=assamès
 ay=aimara
-az=azerbaidjan\u00e8s
+az=azerbaidjanès
 ba=baixkir
 eu=basc
-bn=bengal\u00ed
+bn=bengalí
 dz=dzongka
 bh=bihari
 bi=bislama
-br=bret\u00f3
-bg=b\u00falgar
-my=birm\u00e0
-be=belar\u00fas
+br=bretó
+bg=búlgar
+my=birmà
+be=belarús
 km=khmer
-ca=catal\u00e0
-zh=xin\u00e8s
+ca=català
+zh=xinès
 co=cors
 hr=croat
 cs=txec
-da=dan\u00e8s
-nl=neerland\u00e8s
-en=angl\u00e8s
+da=danès
+nl=neerlandès
+en=anglès
 eo=esperanto
-et=estoni\u00e0
-fo=fero\u00e8s
-fj=fiji\u00e0
-fi=fin\u00e8s
-fr=franc\u00e8s
-fy=fris\u00f3 occidental
+et=estonià
+fo=feroès
+fj=fijià
+fi=finès
+fr=francès
+fy=frisó occidental
 gl=gallec
-ka=georgi\u00e0
+ka=georgià
 de=alemany
 el=grec
-kl=groenland\u00e8s
-gn=guaran\u00ed
+kl=groenlandès
+gn=guaraní
 gu=gujarati
 ha=haussa
 he=hebreu
 iw=hebreu
 hi=hindi
-hu=hongar\u00e8s
-is=island\u00e8s
+hu=hongarès
+is=islandès
 id=indonesi
 in=indonesi
 ia=interlingua
 ie=interlingue
 iu=inuktitut
 ik=inupiak
-ga=irland\u00e8s
-it=itali\u00e0
-ja=japon\u00e8s
-jw=javan\u00e8s
+ga=irlandès
+it=italià
+ja=japonès
+jw=javanès
 kn=kannada
 ks=caixmiri
 kk=kazakh
-rw=ruand\u00e8s
-ky=kirgu\u00eds
+rw=ruandès
+ky=kirguís
 rn=rundi
-ko=core\u00e0
+ko=coreà
 ku=kurd
-lo=laosi\u00e0
-la=llat\u00ed
-lv=let\u00f3
+lo=laosià
+la=llatí
+lv=letó
 ln=lingala
-lt=litu\u00e0
+lt=lituà
 mk=macedoni
 mg=malgaix
 ms=malai
-ml=malai\u00e0lam
-mt=malt\u00e8s
+ml=malaiàlam
+mt=maltès
 mi=maori
 mr=marathi
 mo=moldau
 mn=mongol
-na=nauru\u00e0
-ne=nepal\u00e8s
+na=nauruà
+ne=nepalès
 no=noruec
-oc=occit\u00e0
+oc=occità
 or=oriya
 om=oromo
 ps=paixtu
 fa=persa
-pl=polon\u00e8s
-pt=portugu\u00e8s
+pl=polonès
+pt=portuguès
 pa=panjabi
-qu=qu\u00edtxua
-rm=retorom\u00e0nic
-ro=roman\u00e8s
+qu=quítxua
+rm=retoromànic
+ro=romanès
 ru=rus
-sm=samo\u00e0
+sm=samoà
 sg=sango
-sa=s\u00e0nscrit
-gd=ga\u00e8lic escoc\u00e8s
+sa=sànscrit
+gd=gaèlic escocès
 sr=serbi
 st=sotho meridional
 tn=setswana
 sn=shona
 sd=sindi
-si=singal\u00e8s
+si=singalès
 ss=swazi
 sk=eslovac
-sl=eslov\u00e8
+sl=eslovè
 so=somali
 es=espanyol
-su=sondan\u00e8s
+su=sondanès
 sw=suahili
 sv=suec
 tl=tagal
 tg=tadjik
-ta=t\u00e0mil
-tt=t\u00e0tar
+ta=tàmil
+tt=tàtar
 te=telugu
 th=tai
-bo=tibet\u00e0
+bo=tibetà
 ti=tigrinya
-to=tongal\u00e8s
+to=tongalès
 ts=tsonga
 tr=turc
 tk=turcman
 tw=twi
 ug=uigur
-uk=ucra\u00efn\u00e8s
-ur=urd\u00fa
+uk=ucraïnès
+ur=urdú
 uz=uzbek
 vi=vietnamita
-vo=volap\u00fck
-cy=gal\u00b7l\u00e8s
-wo=w\u00f2lof
+vo=volapük
+cy=gal·lès
+wo=wòlof
 xh=xosa
-ji=\u00eddix
-yi=\u00eddix
+ji=ídix
+yi=ídix
 yo=ioruba
 za=zhuang
 zu=zulu
@@ -184,132 +184,132 @@ zu=zulu
 # key is ISO 3166 country code
 
 AF=Afganistan
-AL=Alb\u00e0nia
-DZ=Alg\u00e8ria
-AM=Arm\u00e8nia
-AU=Austr\u00e0lia
-AT=\u00c0ustria
+AL=Albània
+DZ=Algèria
+AM=Armènia
+AU=Austràlia
+AT=Àustria
 AZ=Azerbaidjan
 BS=Bahames
-BY=Belar\u00fas
-BE=B\u00e8lgica
-BJ=Ben\u00edn
+BY=Belarús
+BE=Bèlgica
+BJ=Benín
 BM=Bermudes
-BO=Bol\u00edvia
-BA=B\u00f2snia i Hercegovina
+BO=Bolívia
+BA=Bòsnia i Hercegovina
 BR=Brasil
-BG=Bulg\u00e0ria
+BG=Bulgària
 KH=Cambodja
 CM=Camerun
-CA=Canad\u00e0
+CA=Canadà
 CV=Cap Verd
-CF=Rep\u00fablica Centreafricana
+CF=República Centreafricana
 TD=Txad
 CL=Xile
 CN=Xina
-CO=Col\u00f2mbia
+CO=Colòmbia
 KM=Comores
-HR=Cro\u00e0cia
+HR=Croàcia
 CY=Xipre
-CZ=Tx\u00e8quia
+CZ=Txèquia
 DK=Dinamarca
-DO=Rep\u00fablica Dominicana
+DO=República Dominicana
 TP=Timor Oriental
 EC=Equador
 EG=Egipte
 GQ=Guinea Equatorial
-EE=Est\u00f2nia
-ET=Eti\u00f2pia
-FI=Finl\u00e0ndia
-FR=Fran\u00e7a
+EE=Estònia
+ET=Etiòpia
+FI=Finlàndia
+FR=França
 GF=Guaiana Francesa
-PF=Polin\u00e8sia Francesa
+PF=Polinèsia Francesa
 TF=Territoris Australs Francesos
-GM=G\u00e0mbia
-GE=Ge\u00f2rgia
+GM=Gàmbia
+GE=Geòrgia
 DE=Alemanya
-GR=Gr\u00e8cia
+GR=Grècia
 GP=Guadalupe
 GW=Guinea Bissau
-HT=Hait\u00ed
+HT=Haití
 HN=Hondures
 HK=Hong Kong (RAE Xina)
 HU=Hongria
-IS=Isl\u00e0ndia
-IN=\u00cdndia
-ID=Indon\u00e8sia
+IS=Islàndia
+IN=Índia
+ID=Indonèsia
 IE=Irlanda
-IT=It\u00e0lia
-JP=Jap\u00f3
-JO=Jord\u00e0nia
+IT=Itàlia
+JP=Japó
+JO=Jordània
 KP=Corea del Nord
 KR=Corea del Sud
 KG=Kirguizistan
-LV=Let\u00f2nia
-LB=L\u00edban
-LR=Lib\u00e8ria
-LY=L\u00edbia
-LT=Litu\u00e0nia
+LV=Letònia
+LB=Líban
+LR=Libèria
+LY=Líbia
+LT=Lituània
 LU=Luxemburg
-MK=Maced\u00f2nia del Nord
-MY=Mal\u00e0isia
+MK=Macedònia del Nord
+MY=Malàisia
 MQ=Martinica
-MR=Maurit\u00e0nia
+MR=Mauritània
 MU=Maurici
-MX=M\u00e8xic
-FM=Micron\u00e8sia
-MD=Mold\u00e0via
-MC=M\u00f2naco
-MN=Mong\u00f2lia
+MX=Mèxic
+FM=Micronèsia
+MD=Moldàvia
+MC=Mònaco
+MN=Mongòlia
 MA=Marroc
-MZ=Mo\u00e7ambic
-MM=Myanmar (Birm\u00e0nia)
-NA=Nam\u00edbia
-NL=Pa\u00efsos Baixos
+MZ=Moçambic
+MM=Myanmar (Birmània)
+NA=Namíbia
+NL=Països Baixos
 AN=Antilles Holandeses
-NC=Nova Caled\u00f2nia
+NC=Nova Caledònia
 NZ=Nova Zelanda
-NE=N\u00edger
-NG=Nig\u00e8ria
+NE=Níger
+NG=Nigèria
 NO=Noruega
-PA=Panam\u00e0
+PA=Panamà
 PG=Papua Nova Guinea
 PY=Paraguai
-PE=Per\u00fa
+PE=Perú
 PH=Filipines
-PL=Pol\u00f2nia
-RU=R\u00fassia
+PL=Polònia
+RU=Rússia
 RW=Ruanda
-SA=Ar\u00e0bia Saudita
-SP=S\u00e8rbia
+SA=Aràbia Saudita
+SP=Sèrbia
 SG=Singapur
-SK=Eslov\u00e0quia
-SI=Eslov\u00e8nia
-SO=Som\u00e0lia
-ZA=Rep\u00fablica de Sud-\u00e0frica
+SK=Eslovàquia
+SI=Eslovènia
+SO=Somàlia
+ZA=República de Sud-àfrica
 ES=Espanya
 SR=Surinam
 SZ=eSwatini
-SE=Su\u00e8cia
-CH=Su\u00efssa
-SY=S\u00edria
+SE=Suècia
+CH=Suïssa
+SY=Síria
 TJ=Tadjikistan
-TZ=Tanz\u00e0nia
-TH=Tail\u00e0ndia
+TZ=Tanzània
+TH=Tailàndia
 TT=Trinitat i Tobago
-TN=Tun\u00edsia
+TN=Tunísia
 TR=Turquia
-UA=Ucra\u00efna
-AE=Emirats \u00c0rabs Units
+UA=Ucraïna
+AE=Emirats Àrabs Units
 GB=Regne Unit
 US=Estats Units
 UY=Uruguai
-VA=Ciutat del Vatic\u00e0
-VE=Vene\u00e7uela
-VG=Illes Verges brit\u00e0niques
+VA=Ciutat del Vaticà
+VE=Veneçuela
+VG=Illes Verges britàniques
 VI=Illes Verges nord-americanes
-EH=S\u00e0hara Occidental
+EH=Sàhara Occidental
 YE=Iemen
 ZR=Zaire
-ZM=Z\u00e0mbia
-ZW=Zimb\u00e0bue
+ZM=Zàmbia
+ZW=Zimbàbue
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_cs.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_cs.properties
index e323e13d1bd..fbb5ed68f87 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_cs.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_cs.properties
@@ -38,9 +38,9 @@
 # language names
 # key is ISO 639 language code
 
-cs=\u010de\u0161tina
+cs=čeština
 
 # country names
 # key is ISO 3166 country code
 
-CZ=\u010cesko
+CZ=Česko
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_de.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_de.properties
index 7b29dcb96b7..afe1e7e168f 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_de.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_de.properties
@@ -61,7 +61,7 @@ cs=Tschechisch
 cu=Kirchenslawisch
 cv=Tschuwaschisch
 cy=Walisisch
-da=D\u00e4nisch
+da=Dänisch
 de=Deutsch
 dv=Dhivehi
 el=Griechisch
@@ -73,15 +73,15 @@ fa=Persisch
 ff=Ful
 fi=Finnisch
 fj=Fidschi
-fo=F\u00e4r\u00f6isch
-fr=Franz\u00f6sisch
+fo=Färöisch
+fr=Französisch
 fy=Westfriesisch
 ga=Irisch
-gd=G\u00e4lisch (Schottland)
+gd=Gälisch (Schottland)
 gl=Galicisch
-gn=Guaran\u00ed
+gn=Guaraní
 ha=Haussa
-he=Hebr\u00e4isch
+he=Hebräisch
 ho=Hiri-Motu
 hr=Kroatisch
 ht=Haiti-Kreolisch
@@ -91,9 +91,9 @@ id=Indonesisch
 ii=Yi
 ik=Inupiak
 in=Indonesisch
-is=Isl\u00e4ndisch
+is=Isländisch
 it=Italienisch
-iw=Hebr\u00e4isch
+iw=Hebräisch
 ja=Japanisch
 ji=Jiddisch
 jv=Javanisch
@@ -101,7 +101,7 @@ ka=Georgisch
 kg=Kongolesisch
 kj=Kwanyama
 kk=Kasachisch
-kl=Gr\u00f6nl\u00e4ndisch
+kl=Grönländisch
 ko=Koreanisch
 ks=Kaschmiri
 ku=Kurdisch
@@ -114,7 +114,7 @@ lo=Laotisch
 lt=Litauisch
 lv=Lettisch
 mh=Marschallesisch
-mi=M\u0101ori
+mi=Māori
 mk=Mazedonisch
 mn=Mongolisch
 mo=Moldavisch
@@ -122,21 +122,21 @@ ms=Malaiisch
 mt=Maltesisch
 my=Birmanisch
 na=Nauruisch
-nb=Norwegisch (Bokm\u00e5l)
+nb=Norwegisch (Bokmål)
 nd=Nord-Ndebele
 ne=Nepalesisch
-nl=Niederl\u00e4ndisch
+nl=Niederländisch
 nn=Norwegisch (Nynorsk)
 no=Norwegisch
-nr=S\u00fcd-Ndebele
+nr=Süd-Ndebele
 oc=Okzitanisch
 or=Oriya
 os=Ossetisch
 pl=Polnisch
 ps=Paschtu
 pt=Portugiesisch
-rm=R\u00e4toromanisch
-ro=Rum\u00e4nisch
+rm=Rätoromanisch
+ro=Rumänisch
 ru=Russisch
 sc=Sardisch
 se=Nordsamisch
@@ -147,15 +147,15 @@ sm=Samoanisch
 sq=Albanisch
 sr=Serbisch
 ss=Swazi
-st=S\u00fcd-Sotho
+st=Süd-Sotho
 su=Sundanesisch
 sv=Schwedisch
 sw=Suaheli
 tg=Tadschikisch
-th=Thail\u00e4ndisch
+th=Thailändisch
 tk=Turkmenisch
 to=Tongaisch
-tr=T\u00fcrkisch
+tr=Türkisch
 tt=Tatarisch
 ty=Tahitisch
 ug=Uigurisch
@@ -176,12 +176,12 @@ akk=Akkadisch
 alb=Albanisch
 ale=Aleutisch
 alg=Algonkin-Sprache
-alt=S\u00fcd-Altaisch
+alt=Süd-Altaisch
 amh=Amharisch
 ang=Altenglisch
 apa=Apache-Sprache
 ara=Arabisch
-arc=Aram\u00e4isch
+arc=Aramäisch
 arg=Aragonisch
 arm=Armenisch
 arn=Mapudungun
@@ -232,34 +232,34 @@ cmc=Cham-Sprache
 cop=Koptisch
 cos=Korsisch
 cpe=Kreolisch-Englische Sprache
-cpf=Kreolisch-Franz\u00f6sische Sprache
+cpf=Kreolisch-Französische Sprache
 cpp=Kreolisch-Portugiesische Sprache
 crh=Krimtatarisch
 crp=Kreolische Sprache 
 csb=Kaschubisch
 cus=Kuschitisch
 cze=Tschechisch
-dan=D\u00e4nisch
+dan=Dänisch
 dar=Darginisch
 day=Dajak
 dra=Drawidisch
 dsb=Niedersorbisch
-dum=Mittelniederl\u00e4ndisch
-dut=Niederl\u00e4ndisch
+dum=Mittelniederländisch
+dut=Niederländisch
 dzo=Bhutani
-egy=\u00c4gyptisch
+egy=Ägyptisch
 elx=Elamisch
 eng=Englisch
 enm=Mittelenglisch
 est=Estnisch
 fan=Pangwe
-fao=F\u00e4r\u00f6isch 
+fao=Färöisch 
 fij=Fidschi
 fin=Finnisch
 fiu=Finnougrisch
-fre=Franz\u00f6sisch
-frm=Mittelfranz\u00f6sisch
-fro=Altfranz\u00f6sisch
+fre=Französisch
+frm=Mittelfranzösisch
+fro=Altfranzösisch
 frr=Nordfriesisch
 frs=Ostfriesisch
 fry=Westfriesisch
@@ -268,7 +268,7 @@ gem=Germanisch
 geo=Georgisch
 ger=Deutsch
 gil=Kiribatisch
-gla=G\u00e4lisch
+gla=Gälisch
 gle=Irisch
 glg=Galizisch
 gmh=Mittelhochdeutsch
@@ -283,13 +283,13 @@ gwi=Kutchin
 hat=Haitisch
 hau=Haussa
 haw=Hawaiisch
-heb=Hebr\u00e4isch
+heb=Hebräisch
 hit=Hethitisch
 hmn=Miao
 hrv=Kroatisch
 hsb=Obersorbisch
 hun=Ungarisch
-ice=Isl\u00e4ndisch
+ice=Isländisch
 ijo=Ijo-Sprache
 ilo=Ilokano
 ina=Interlingua (Internationale Hilfssprache, Vereinigung)
@@ -303,11 +303,11 @@ iro=Irokesische Sprache
 ita=Italienisch
 jav=Javanesisch
 jpn=Japanisch
-jpr=J\u00fcdisch-Persisch
-jrb=J\u00fcdisch-Arabisch
+jpr=Jüdisch-Persisch
+jrb=Jüdisch-Arabisch
 kaa=Karakalpakisch
 kab=Kabylisch
-kal=Kalaallisut (Gr\u00f6nl\u00e4ndisch)
+kal=Kalaallisut (Grönländisch)
 kar=Karenisch
 kas=Kaschmirisch
 kaz=Kasachisch
@@ -322,7 +322,7 @@ krc=Karatschaiisch-Balkarisch
 krl=Karelisch
 kro=Kru-Sprache
 kru=Oraon
-kum=Kum\u00fckisch
+kum=Kumükisch
 kur=Kurdisch
 lao=Laotisch
 lat=Lateinisch
@@ -363,7 +363,7 @@ myn=Maya-Sprache
 myv=Ersja-Mordwinisch
 nai=Nordamerikanische Indianersprache
 nap=Neapolitanisch
-nbl=Ndebele, S\u00fcd
+nbl=Ndebele, Süd
 nde=Ndebele, Nord
 nds=Niederdeutsch
 nep=Nepalesisch
@@ -390,7 +390,7 @@ pau=Palau
 peo=Altpersisch
 per=Persisch
 phi=Philippinisch
-phn=Ph\u00f6nizisch
+phn=Phönizisch
 pol=Polnisch
 pon=Ponapeanisch
 por=Portugiesisch
@@ -400,12 +400,12 @@ rar=Rarotonganisch
 roa=Romanische Sprache
 roh=Romantsch
 rom=Romani
-rum=Rum\u00e4nisch
+rum=Rumänisch
 run=Kirundisch
 rup=Aromunisch
 rus=Russisch
 sah=Jakutisch
-sai=S\u00fcdamerikanische Indianersprache
+sai=Südamerikanische Indianersprache
 sal=Salish-Sprache
 sam=Samaritanisch
 scn=Sizilianisch
@@ -413,7 +413,7 @@ sco=Schottisch
 sel=Selkupisch
 sem=Semitisch
 sga=Altirisch
-sgn=Geb\u00e4rdensprache
+sgn=Gebärdensprache
 shn=Schan
 sin=Singhalesisch
 sio=Sioux-Sprache
@@ -421,7 +421,7 @@ sit=Tolar
 sla=Slawisch
 slo=Slowakisch
 slv=Slowenisch
-sma=S\u00fcdsamisch
+sma=Südsamisch
 sme=Nord-Samisch
 smi=Lappisch
 smj=Lule-Samisch
@@ -433,13 +433,13 @@ snd=Zinti-Sprache
 sog=Sogdisch
 som=Somalisch
 son=Songhai-Sprache
-sot=S\u00fcd-Sotho 
+sot=Süd-Sotho 
 spa=Spanisch
 srd=Sardisch
 srn=Srananisch
 srp=Serbisch
 ssa=Nilosaharanisch
-ssw=Swasil\u00e4ndisch
+ssw=Swasiländisch
 sun=Sundanesisch
 sux=Sumerisch
 swa=Suaheli
@@ -462,7 +462,7 @@ tpi=Neumelanesisch
 tsn=Sezuan
 tuk=Turkmenisch
 tup=Tupi-Sprache
-tur=T\u00fcrkisch
+tur=Türkisch
 tut=Altaisch
 tvl=Tuvaluisch
 tyv=Tuwinisch
@@ -479,7 +479,7 @@ wal=Walamo
 wel=Walisisch
 wen=Sorbisch
 wln=Wallonisch
-xal=Kalm\u00fcckisch
+xal=Kalmückisch
 yap=Yapesisch
 yid=Jiddish
 yor=Joruba
@@ -510,11 +510,11 @@ Cprt=Zypriotisch
 Cyrl=Kyrillisch
 Cyrs=Altkirchenslawisch
 Dupl=Duployanisch
-Egyd=\u00c4gyptisch - Demotisch
-Egyh=\u00c4gyptisch - Hieratisch
-Egyp=\u00c4gyptische Hieroglyphen
+Egyd=Ägyptisch - Demotisch
+Egyh=Ägyptisch - Hieratisch
+Egyp=Ägyptische Hieroglyphen
 Elba=Elbasanisch
-Ethi=\u00c4thiopisch
+Ethi=Äthiopisch
 Geok=Khutsuri
 Geor=Georgisch
 Glag=Glagolitisch
@@ -523,7 +523,7 @@ Grek=Griechisch
 Hani=Chinesisch
 Hans=Vereinfacht
 Hant=Traditionell
-Hebr=Hebr\u00e4isch
+Hebr=Hebräisch
 Hrkt=Japanische Silbenschrift
 Hung=Altungarisch
 Inds=Indus-Schrift
@@ -533,19 +533,19 @@ Jpan=Japanisch
 Kore=Koreanisch
 Laoo=Laotisch
 Latf=Lateinisch - Fraktur-Variante
-Latg=Lateinisch - G\u00e4lische Variante
+Latg=Lateinisch - Gälische Variante
 Latn=Lateinisch
 Lyci=Lykisch
 Lydi=Lydisch
-Mand=Mand\u00e4isch
-Mani=Manich\u00e4isch
+Mand=Mandäisch
+Mani=Manichäisch
 Maya=Maya-Hieroglyphen
 Merc=Meroitisch kursiv
 Mero=Meroitisch
 Mong=Mongolisch
 Mymr=Birmanisch
 Narb=Altnordarabisch
-Nbat=Nabat\u00e4isch
+Nbat=Nabatäisch
 Nkgb=Geba
 Orkh=Orchon-Runen
 Orya=Oriya
@@ -555,13 +555,13 @@ Perm=Altpermisch
 Phli=Buch-Pahlavi
 Phlp=Psalter-Pahlavi
 Phlv=Pahlavi
-Phnx=Ph\u00f6nizisch
+Phnx=Phönizisch
 Plrd=Pollard Phonetisch
 Prti=Parthisch
 Runr=Runenschrift
 Samr=Samaritanisch
-Sarb=Alts\u00fcdarabisch
-Sgnw=Geb\u00e4rdensprache
+Sarb=Altsüdarabisch
+Sgnw=Gebärdensprache
 Shaw=Shaw-Alphabet
 Sinh=Singhalesisch
 Sund=Sundanesisch
@@ -591,13 +591,13 @@ AE=Vereinigte Arabische Emirate
 AG=Antigua und Barbuda
 AL=Albanien
 AM=Armenien
-AN=Niederl\u00e4ndische Antillen
+AN=Niederländische Antillen
 AQ=Antarktis
 AR=Argentinien
 AS=Amerikanisch-Samoa
-AT=\u00d6sterreich
+AT=Österreich
 AU=Australien
-AX=\u00c5landinseln
+AX=Ålandinseln
 AZ=Aserbaidschan
 BA=Bosnien und Herzegowina
 BD=Bangladesch
@@ -625,28 +625,28 @@ CY=Zypern
 CZ=Tschechien
 DE=Deutschland
 DJ=Dschibuti
-DK=D\u00e4nemark
+DK=Dänemark
 DO=Dominikanische Republik
 DZ=Algerien
 EE=Estland
-EG=\u00c4gypten
+EG=Ägypten
 EH=Westsahara
 ES=Spanien
-ET=\u00c4thiopien
+ET=Äthiopien
 FI=Finnland
 FJ=Fidschi
 FK=Falklandinseln
 FM=Mikronesien
-FO=F\u00e4r\u00f6er
+FO=Färöer
 FR=Frankreich
 GA=Gabun
-GB=Vereinigtes K\u00f6nigreich
+GB=Vereinigtes Königreich
 GE=Georgien
-GF=Franz\u00f6sisch-Guayana
-GL=Gr\u00f6nland
-GQ=\u00c4quatorialguinea
+GF=Französisch-Guayana
+GL=Grönland
+GQ=Äquatorialguinea
 GR=Griechenland
-GS=S\u00fcdgeorgien und die S\u00fcdlichen Sandwichinseln
+GS=Südgeorgien und die Südlichen Sandwichinseln
 HK=Sonderverwaltungsregion Hongkong
 HM=Heard und McDonaldinseln
 HR=Kroatien
@@ -666,7 +666,7 @@ KH=Kambodscha
 KM=Komoren
 KN=St. Kitts und Nevis
 KP=Nordkorea
-KR=S\u00fcdkorea
+KR=Südkorea
 KY=Kaimaninseln
 KZ=Kasachstan
 LB=Libanon
@@ -682,7 +682,7 @@ MK=Nordmazedonien
 MM=Myanmar
 MN=Mongolei
 MO=Sonderverwaltungsregion Macau
-MP=N\u00f6rdliche Marianen
+MP=Nördliche Marianen
 MR=Mauretanien
 MV=Malediven
 MX=Mexiko
@@ -692,15 +692,15 @@ NF=Norfolkinsel
 NL=Niederlande
 NO=Norwegen
 NZ=Neuseeland
-PF=Franz\u00f6sisch-Polynesien
+PF=Französisch-Polynesien
 PG=Papua-Neuguinea
 PH=Philippinen
 PL=Polen
 PM=St. Pierre und Miquelon
 PN=Pitcairninseln
-PS=Pal\u00e4stinensische Autonomiegebiete
+PS=Palästinensische Autonomiegebiete
 QA=Katar
-RO=Rum\u00e4nien
+RO=Rumänien
 RS=Serbien
 RU=Russland
 RW=Ruanda
@@ -712,17 +712,17 @@ SG=Singapur
 SI=Slowenien
 SJ=Spitzbergen und Jan Mayen
 SK=Slowakei
-ST=S\u00e3o Tom\u00e9 und Pr\u00edncipe
+ST=São Tomé und Príncipe
 SY=Syrien
 TC=Turks- und Caicosinseln
 TD=Tschad
-TF=Franz\u00f6sische S\u00fcd- und Antarktisgebiete
+TF=Französische Süd- und Antarktisgebiete
 TJ=Tadschikistan
 TN=Tunesien
-TR=T\u00fcrkei
+TR=Türkei
 TT=Trinidad und Tobago
 TZ=Tansania
-UM=Amerikanische \u00dcberseeinseln
+UM=Amerikanische Überseeinseln
 US=Vereinigte Staaten
 UZ=Usbekistan
 VA=Vatikanstadt
@@ -731,7 +731,7 @@ VG=Britische Jungferninseln
 VI=Amerikanische Jungferninseln
 WF=Wallis und Futuna
 YE=Jemen
-ZA=S\u00fcdafrika
+ZA=Südafrika
 ZM=Sambia
 ZW=Simbabwe
 
@@ -741,21 +741,21 @@ ZW=Simbabwe
 001=Welt
 002=Afrika
 003=Nordamerika
-005=S\u00fcdamerika
+005=Südamerika
 009=Ozeanien
 011=Westafrika
 013=Mittelamerika
 014=Ostafrika
 015=Nordafrika
 017=Zentralafrika
-018=S\u00fcdliches Afrika
+018=Südliches Afrika
 019=Amerika
-021=N\u00f6rdliches Amerika
+021=Nördliches Amerika
 029=Karibik
 030=Ostasien
-034=S\u00fcdasien
-035=S\u00fcdostasien
-039=S\u00fcdeuropa
+034=Südasien
+035=Südostasien
+039=Südeuropa
 053=Australasien
 054=Melanesien
 057=Mikronesisches Inselgebiet
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el.properties
index bd69c4a0fc6..3cfbaf1da82 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_el.properties
@@ -40,303 +40,303 @@
 
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
-ar=\u0391\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac
-be=\u039b\u03b5\u03c5\u03ba\u03bf\u03c1\u03c9\u03c3\u03b9\u03ba\u03ac
-bg=\u0392\u03bf\u03c5\u03bb\u03b3\u03b1\u03c1\u03b9\u03ba\u03ac
-bn=\u0392\u03b5\u03b3\u03b3\u03b1\u03bb\u03b9\u03ba\u03ac
-bo=\u0398\u03b9\u03b2\u03b5\u03c4\u03b9\u03b1\u03bd\u03ac
-bs=\u0392\u03bf\u03c3\u03bd\u03b9\u03b1\u03ba\u03ac
-ca=\u039a\u03b1\u03c4\u03b1\u03bb\u03b1\u03bd\u03b9\u03ba\u03ac
-co=\u039a\u03bf\u03c1\u03c3\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ac
-cs=\u03a4\u03c3\u03b5\u03c7\u03b9\u03ba\u03ac
-cy=\u039f\u03c5\u03b1\u03bb\u03b9\u03ba\u03ac
-da=\u0394\u03b1\u03bd\u03b9\u03ba\u03ac
-de=\u0393\u03b5\u03c1\u03bc\u03b1\u03bd\u03b9\u03ba\u03ac
-el=\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac
-en=\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac
-es=\u0399\u03c3\u03c0\u03b1\u03bd\u03b9\u03ba\u03ac
-et=\u0395\u03c3\u03b8\u03bf\u03bd\u03b9\u03ba\u03ac
-eu=\u0392\u03b1\u03c3\u03ba\u03b9\u03ba\u03ac
-fa=\u03a0\u03b5\u03c1\u03c3\u03b9\u03ba\u03ac
-fi=\u03a6\u03b9\u03bd\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-fr=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac
-ga=\u0399\u03c1\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-gd=\u03a3\u03ba\u03c9\u03c4\u03b9\u03ba\u03ac \u039a\u03b5\u03bb\u03c4\u03b9\u03ba\u03ac
-he=\u0395\u03b2\u03c1\u03b1\u03ca\u03ba\u03ac
-hi=\u03a7\u03af\u03bd\u03c4\u03b9
-hr=\u039a\u03c1\u03bf\u03b1\u03c4\u03b9\u03ba\u03ac
-hu=\u039f\u03c5\u03b3\u03b3\u03c1\u03b9\u03ba\u03ac
-hy=\u0391\u03c1\u03bc\u03b5\u03bd\u03b9\u03ba\u03ac
-id=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03b9\u03b1\u03ba\u03ac
-in=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03b9\u03b1\u03ba\u03ac
-is=\u0399\u03c3\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-it=\u0399\u03c4\u03b1\u03bb\u03b9\u03ba\u03ac
-iw=\u0395\u03b2\u03c1\u03b1\u03ca\u03ba\u03ac
-ja=\u0399\u03b1\u03c0\u03c9\u03bd\u03b9\u03ba\u03ac
-ji=\u0393\u03af\u03bd\u03c4\u03b9\u03c2
-ka=\u0393\u03b5\u03c9\u03c1\u03b3\u03b9\u03b1\u03bd\u03ac
-ko=\u039a\u03bf\u03c1\u03b5\u03b1\u03c4\u03b9\u03ba\u03ac
-la=\u039b\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac
-lt=\u039b\u03b9\u03b8\u03bf\u03c5\u03b1\u03bd\u03b9\u03ba\u03ac
-lv=\u039b\u03b5\u03c4\u03bf\u03bd\u03b9\u03ba\u03ac
-mk=\u03a3\u03bb\u03b1\u03b2\u03bf\u03bc\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03b9\u03ba\u03ac
-mn=\u039c\u03bf\u03b3\u03b3\u03bf\u03bb\u03b9\u03ba\u03ac
-mo=\u039c\u03bf\u03bb\u03b4\u03b1\u03b2\u03b9\u03ba\u03ac
-mt=\u039c\u03b1\u03bb\u03c4\u03b5\u03b6\u03b9\u03ba\u03ac
-nl=\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-no=\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03b9\u03ba\u03ac
-pl=\u03a0\u03bf\u03bb\u03c9\u03bd\u03b9\u03ba\u03ac
-pt=\u03a0\u03bf\u03c1\u03c4\u03bf\u03b3\u03b1\u03bb\u03b9\u03ba\u03ac
-ro=\u03a1\u03bf\u03c5\u03bc\u03b1\u03bd\u03b9\u03ba\u03ac
-ru=\u03a1\u03c9\u03c3\u03b9\u03ba\u03ac
-sk=\u03a3\u03bb\u03bf\u03b2\u03b1\u03ba\u03b9\u03ba\u03ac
-sl=\u03a3\u03bb\u03bf\u03b2\u03b5\u03bd\u03b9\u03ba\u03ac
-sq=\u0391\u03bb\u03b2\u03b1\u03bd\u03b9\u03ba\u03ac
-sr=\u03a3\u03b5\u03c1\u03b2\u03b9\u03ba\u03ac
-sv=\u03a3\u03bf\u03c5\u03b7\u03b4\u03b9\u03ba\u03ac
-th=\u03a4\u03b1\u03ca\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-tr=\u03a4\u03bf\u03c5\u03c1\u03ba\u03b9\u03ba\u03ac
-uk=\u039f\u03c5\u03ba\u03c1\u03b1\u03bd\u03b9\u03ba\u03ac
-vi=\u0392\u03b9\u03b5\u03c4\u03bd\u03b1\u03bc\u03b9\u03ba\u03ac
-yi=\u0393\u03af\u03bd\u03c4\u03b9\u03c2
-zh=\u039a\u03b9\u03bd\u03b5\u03b6\u03b9\u03ba\u03ac
-AD=\u0391\u03bd\u03b4\u03cc\u03c1\u03b1
-AE=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b1 \u0391\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac \u0395\u03bc\u03b9\u03c1\u03ac\u03c4\u03b1
-AF=\u0391\u03c6\u03b3\u03b1\u03bd\u03b9\u03c3\u03c4\u03ac\u03bd
-AG=\u0391\u03bd\u03c4\u03af\u03b3\u03ba\u03bf\u03c5\u03b1 \u03ba\u03b1\u03b9 \u039c\u03c0\u03b1\u03c1\u03bc\u03c0\u03bf\u03cd\u03bd\u03c4\u03b1
-AI=\u0391\u03bd\u03b3\u03ba\u03bf\u03c5\u03af\u03bb\u03b1
-AL=\u0391\u03bb\u03b2\u03b1\u03bd\u03af\u03b1
-AM=\u0391\u03c1\u03bc\u03b5\u03bd\u03af\u03b1
-AN=\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ad\u03c2 \u0391\u03bd\u03c4\u03af\u03bb\u03bb\u03b5\u03c2
-AO=\u0391\u03b3\u03ba\u03cc\u03bb\u03b1
-AQ=\u0391\u03bd\u03c4\u03b1\u03c1\u03ba\u03c4\u03b9\u03ba\u03ae
-AR=\u0391\u03c1\u03b3\u03b5\u03bd\u03c4\u03b9\u03bd\u03ae
-AS=\u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ae \u03a3\u03b1\u03bc\u03cc\u03b1
-AT=\u0391\u03c5\u03c3\u03c4\u03c1\u03af\u03b1
-AU=\u0391\u03c5\u03c3\u03c4\u03c1\u03b1\u03bb\u03af\u03b1
-AW=\u0391\u03c1\u03bf\u03cd\u03bc\u03c0\u03b1
-AX=\u039d\u03ae\u03c3\u03bf\u03b9 \u038c\u03bb\u03b1\u03bd\u03c4
-AZ=\u0391\u03b6\u03b5\u03c1\u03bc\u03c0\u03b1\u03ca\u03c4\u03b6\u03ac\u03bd
-BA=\u0392\u03bf\u03c3\u03bd\u03af\u03b1 - \u0395\u03c1\u03b6\u03b5\u03b3\u03bf\u03b2\u03af\u03bd\u03b7
-BB=\u039c\u03c0\u03b1\u03c1\u03bc\u03c0\u03ad\u03b9\u03bd\u03c4\u03bf\u03c2
-BD=\u039c\u03c0\u03b1\u03bd\u03b3\u03ba\u03bb\u03b1\u03bd\u03c4\u03ad\u03c2
-BE=\u0392\u03ad\u03bb\u03b3\u03b9\u03bf
-BF=\u039c\u03c0\u03bf\u03c5\u03c1\u03ba\u03af\u03bd\u03b1 \u03a6\u03ac\u03c3\u03bf
-BG=\u0392\u03bf\u03c5\u03bb\u03b3\u03b1\u03c1\u03af\u03b1
-BH=\u039c\u03c0\u03b1\u03c7\u03c1\u03ad\u03b9\u03bd
-BI=\u039c\u03c0\u03bf\u03c5\u03c1\u03bf\u03cd\u03bd\u03c4\u03b9
-BJ=\u039c\u03c0\u03b5\u03bd\u03af\u03bd
-BM=\u0392\u03b5\u03c1\u03bc\u03bf\u03cd\u03b4\u03b5\u03c2
-BN=\u039c\u03c0\u03c1\u03bf\u03c5\u03bd\u03ad\u03b9
-BO=\u0392\u03bf\u03bb\u03b9\u03b2\u03af\u03b1
-BR=\u0392\u03c1\u03b1\u03b6\u03b9\u03bb\u03af\u03b1
-BS=\u039c\u03c0\u03b1\u03c7\u03ac\u03bc\u03b5\u03c2
-BT=\u039c\u03c0\u03bf\u03c5\u03c4\u03ac\u03bd
-BV=\u039d\u03ae\u03c3\u03bf\u03c2 \u039c\u03c0\u03bf\u03c5\u03b2\u03ad
-BW=\u039c\u03c0\u03bf\u03c4\u03c3\u03bf\u03c5\u03ac\u03bd\u03b1
-BY=\u039b\u03b5\u03c5\u03ba\u03bf\u03c1\u03c9\u03c3\u03af\u03b1
-BZ=\u039c\u03c0\u03b5\u03bb\u03af\u03b6
-CA=\u039a\u03b1\u03bd\u03b1\u03b4\u03ac\u03c2
-CC=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03cc\u03ba\u03bf\u03c2 (\u039a\u03af\u03bb\u03b9\u03bd\u03b3\u03ba)
-CD=\u039a\u03bf\u03bd\u03b3\u03ba\u03cc - \u039a\u03b9\u03bd\u03c3\u03ac\u03c3\u03b1
-CF=\u039a\u03b5\u03bd\u03c4\u03c1\u03bf\u03b1\u03c6\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ae \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1
-CG=\u039a\u03bf\u03bd\u03b3\u03ba\u03cc - \u039c\u03c0\u03c1\u03b1\u03b6\u03b1\u03b2\u03af\u03bb
-CH=\u0395\u03bb\u03b2\u03b5\u03c4\u03af\u03b1
-CI=\u0391\u03ba\u03c4\u03ae \u0395\u03bb\u03b5\u03c6\u03b1\u03bd\u03c4\u03bf\u03c3\u03c4\u03bf\u03cd
-CK=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03bf\u03c5\u03ba
-CL=\u03a7\u03b9\u03bb\u03ae
-CM=\u039a\u03b1\u03bc\u03b5\u03c1\u03bf\u03cd\u03bd
-CN=\u039a\u03af\u03bd\u03b1
-CO=\u039a\u03bf\u03bb\u03bf\u03bc\u03b2\u03af\u03b1
-CR=\u039a\u03cc\u03c3\u03c4\u03b1 \u03a1\u03af\u03ba\u03b1
-CS=\u03a3\u03b5\u03c1\u03b2\u03af\u03b1 \u03ba\u03b1\u03b9 \u039c\u03b1\u03c5\u03c1\u03bf\u03b2\u03bf\u03cd\u03bd\u03b9\u03bf
-CU=\u039a\u03bf\u03cd\u03b2\u03b1
-CV=\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf \u0391\u03ba\u03c1\u03c9\u03c4\u03ae\u03c1\u03b9\u03bf
-CX=\u039d\u03ae\u03c3\u03bf\u03c2 \u03c4\u03c9\u03bd \u03a7\u03c1\u03b9\u03c3\u03c4\u03bf\u03c5\u03b3\u03ad\u03bd\u03bd\u03c9\u03bd
-CY=\u039a\u03cd\u03c0\u03c1\u03bf\u03c2
-CZ=\u03a4\u03c3\u03b5\u03c7\u03af\u03b1
-DE=\u0393\u03b5\u03c1\u03bc\u03b1\u03bd\u03af\u03b1
-DJ=\u03a4\u03b6\u03b9\u03bc\u03c0\u03bf\u03c5\u03c4\u03af
-DK=\u0394\u03b1\u03bd\u03af\u03b1
-DM=\u039d\u03c4\u03bf\u03bc\u03af\u03bd\u03b9\u03ba\u03b1
-DO=\u0394\u03bf\u03bc\u03b9\u03bd\u03b9\u03ba\u03b1\u03bd\u03ae \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1
-DZ=\u0391\u03bb\u03b3\u03b5\u03c1\u03af\u03b1
-EC=\u0399\u03c3\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03cc\u03c2
-EE=\u0395\u03c3\u03b8\u03bf\u03bd\u03af\u03b1
-EG=\u0391\u03af\u03b3\u03c5\u03c0\u03c4\u03bf\u03c2
-EH=\u0394\u03c5\u03c4\u03b9\u03ba\u03ae \u03a3\u03b1\u03c7\u03ac\u03c1\u03b1
-ER=\u0395\u03c1\u03c5\u03b8\u03c1\u03b1\u03af\u03b1
-ES=\u0399\u03c3\u03c0\u03b1\u03bd\u03af\u03b1
-ET=\u0391\u03b9\u03b8\u03b9\u03bf\u03c0\u03af\u03b1
-FI=\u03a6\u03b9\u03bd\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-FJ=\u03a6\u03af\u03c4\u03b6\u03b9
-FK=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a6\u03cc\u03ba\u03bb\u03b1\u03bd\u03c4
-FM=\u039c\u03b9\u03ba\u03c1\u03bf\u03bd\u03b7\u03c3\u03af\u03b1
-FO=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a6\u03b5\u03c1\u03cc\u03b5\u03c2
-FR=\u0393\u03b1\u03bb\u03bb\u03af\u03b1
-GA=\u0393\u03ba\u03b1\u03bc\u03c0\u03cc\u03bd
-GB=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03bf \u0392\u03b1\u03c3\u03af\u03bb\u03b5\u03b9\u03bf
-GD=\u0393\u03c1\u03b5\u03bd\u03ac\u03b4\u03b1
-GE=\u0393\u03b5\u03c9\u03c1\u03b3\u03af\u03b1
-GF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ae \u0393\u03bf\u03c5\u03b9\u03ac\u03bd\u03b1
-GH=\u0393\u03ba\u03ac\u03bd\u03b1
-GI=\u0393\u03b9\u03b2\u03c1\u03b1\u03bb\u03c4\u03ac\u03c1
-GL=\u0393\u03c1\u03bf\u03b9\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-GM=\u0393\u03ba\u03ac\u03bc\u03c0\u03b9\u03b1
-GN=\u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-GP=\u0393\u03bf\u03c5\u03b1\u03b4\u03b5\u03bb\u03bf\u03cd\u03c0\u03b7
-GQ=\u0399\u03c3\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03ae \u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-GR=\u0395\u03bb\u03bb\u03ac\u03b4\u03b1
-GS=\u039d\u03ae\u03c3\u03bf\u03b9 \u039d\u03cc\u03c4\u03b9\u03b1 \u0393\u03b5\u03c9\u03c1\u03b3\u03af\u03b1 \u03ba\u03b1\u03b9 \u039d\u03cc\u03c4\u03b9\u03b5\u03c2 \u03a3\u03ac\u03bd\u03c4\u03bf\u03c5\u03b9\u03c4\u03c2
-GT=\u0393\u03bf\u03c5\u03b1\u03c4\u03b5\u03bc\u03ac\u03bb\u03b1
-GU=\u0393\u03ba\u03bf\u03c5\u03ac\u03bc
-GW=\u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1 \u039c\u03c0\u03b9\u03c3\u03ac\u03bf\u03c5
-GY=\u0393\u03bf\u03c5\u03b9\u03ac\u03bd\u03b1
-HK=\u03a7\u03bf\u03bd\u03b3\u03ba \u039a\u03bf\u03bd\u03b3\u03ba \u0395\u0394\u03a0 \u039a\u03af\u03bd\u03b1\u03c2
-HM=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a7\u03b5\u03c1\u03bd\u03c4 \u03ba\u03b1\u03b9 \u039c\u03b1\u03ba\u03bd\u03c4\u03cc\u03bd\u03b1\u03bb\u03bd\u03c4
-HN=\u039f\u03bd\u03b4\u03bf\u03cd\u03c1\u03b1
-HR=\u039a\u03c1\u03bf\u03b1\u03c4\u03af\u03b1
-HT=\u0391\u03ca\u03c4\u03ae
-HU=\u039f\u03c5\u03b3\u03b3\u03b1\u03c1\u03af\u03b1
-ID=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03af\u03b1
-IE=\u0399\u03c1\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-IL=\u0399\u03c3\u03c1\u03b1\u03ae\u03bb
-IN=\u0399\u03bd\u03b4\u03af\u03b1
-IO=\u0392\u03c1\u03b5\u03c4\u03b1\u03bd\u03b9\u03ba\u03ac \u0395\u03b4\u03ac\u03c6\u03b7 \u0399\u03bd\u03b4\u03b9\u03ba\u03bf\u03cd \u03a9\u03ba\u03b5\u03b1\u03bd\u03bf\u03cd
-IQ=\u0399\u03c1\u03ac\u03ba
-IR=\u0399\u03c1\u03ac\u03bd
-IS=\u0399\u03c3\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-IT=\u0399\u03c4\u03b1\u03bb\u03af\u03b1
-JM=\u03a4\u03b6\u03b1\u03bc\u03ac\u03b9\u03ba\u03b1
-JO=\u0399\u03bf\u03c1\u03b4\u03b1\u03bd\u03af\u03b1
-JP=\u0399\u03b1\u03c0\u03c9\u03bd\u03af\u03b1
-KE=\u039a\u03ad\u03bd\u03c5\u03b1
-KG=\u039a\u03b9\u03c1\u03b3\u03b9\u03c3\u03c4\u03ac\u03bd
-KH=\u039a\u03b1\u03bc\u03c0\u03cc\u03c4\u03b6\u03b7
-KI=\u039a\u03b9\u03c1\u03b9\u03bc\u03c0\u03ac\u03c4\u03b9
-KM=\u039a\u03bf\u03bc\u03cc\u03c1\u03b5\u03c2
-KN=\u03a3\u03b5\u03bd \u039a\u03b9\u03c4\u03c2 \u03ba\u03b1\u03b9 \u039d\u03ad\u03b2\u03b9\u03c2
-KP=\u0392\u03cc\u03c1\u03b5\u03b9\u03b1 \u039a\u03bf\u03c1\u03ad\u03b1
-KR=\u039d\u03cc\u03c4\u03b9\u03b1 \u039a\u03bf\u03c1\u03ad\u03b1
-KW=\u039a\u03bf\u03c5\u03b2\u03ad\u03b9\u03c4
-KY=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03ad\u03b9\u03bc\u03b1\u03bd
-KZ=\u039a\u03b1\u03b6\u03b1\u03ba\u03c3\u03c4\u03ac\u03bd
-LA=\u039b\u03ac\u03bf\u03c2
-LB=\u039b\u03af\u03b2\u03b1\u03bd\u03bf\u03c2
-LC=\u0391\u03b3\u03af\u03b1 \u039b\u03bf\u03c5\u03ba\u03af\u03b1
-LI=\u039b\u03b9\u03c7\u03c4\u03b5\u03bd\u03c3\u03c4\u03ac\u03b9\u03bd
-LK=\u03a3\u03c1\u03b9 \u039b\u03ac\u03bd\u03ba\u03b1
-LR=\u039b\u03b9\u03b2\u03b5\u03c1\u03af\u03b1
-LS=\u039b\u03b5\u03c3\u03cc\u03c4\u03bf
-LT=\u039b\u03b9\u03b8\u03bf\u03c5\u03b1\u03bd\u03af\u03b1
-LU=\u039b\u03bf\u03c5\u03be\u03b5\u03bc\u03b2\u03bf\u03cd\u03c1\u03b3\u03bf
-LV=\u039b\u03b5\u03c4\u03bf\u03bd\u03af\u03b1
-LY=\u039b\u03b9\u03b2\u03cd\u03b7
-MA=\u039c\u03b1\u03c1\u03cc\u03ba\u03bf
-MC=\u039c\u03bf\u03bd\u03b1\u03ba\u03cc
-MD=\u039c\u03bf\u03bb\u03b4\u03b1\u03b2\u03af\u03b1
-MG=\u039c\u03b1\u03b4\u03b1\u03b3\u03b1\u03c3\u03ba\u03ac\u03c1\u03b7
-MH=\u039d\u03ae\u03c3\u03bf\u03b9 \u039c\u03ac\u03c1\u03c3\u03b1\u03bb
-MK=\u0392\u03cc\u03c1\u03b5\u03b9\u03b1 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1
-ML=\u039c\u03ac\u03bb\u03b9
-MM=\u039c\u03b9\u03b1\u03bd\u03bc\u03ac\u03c1 (\u0392\u03b9\u03c1\u03bc\u03b1\u03bd\u03af\u03b1)
-MN=\u039c\u03bf\u03b3\u03b3\u03bf\u03bb\u03af\u03b1
-MO=\u039c\u03b1\u03ba\u03ac\u03bf \u0395\u0394\u03a0 \u039a\u03af\u03bd\u03b1\u03c2
-MP=\u039d\u03ae\u03c3\u03bf\u03b9 \u0392\u03cc\u03c1\u03b5\u03b9\u03b5\u03c2 \u039c\u03b1\u03c1\u03b9\u03ac\u03bd\u03b5\u03c2
-MQ=\u039c\u03b1\u03c1\u03c4\u03b9\u03bd\u03af\u03ba\u03b1
-MR=\u039c\u03b1\u03c5\u03c1\u03b9\u03c4\u03b1\u03bd\u03af\u03b1
-MS=\u039c\u03bf\u03bd\u03c3\u03b5\u03c1\u03ac\u03c4
-MT=\u039c\u03ac\u03bb\u03c4\u03b1
-MU=\u039c\u03b1\u03c5\u03c1\u03af\u03ba\u03b9\u03bf\u03c2
-MV=\u039c\u03b1\u03bb\u03b4\u03af\u03b2\u03b5\u03c2
-MW=\u039c\u03b1\u03bb\u03ac\u03bf\u03c5\u03b9
-MX=\u039c\u03b5\u03be\u03b9\u03ba\u03cc
-MY=\u039c\u03b1\u03bb\u03b1\u03b9\u03c3\u03af\u03b1
-MZ=\u039c\u03bf\u03b6\u03b1\u03bc\u03b2\u03af\u03ba\u03b7
-NA=\u039d\u03b1\u03bc\u03af\u03bc\u03c0\u03b9\u03b1
-NC=\u039d\u03ad\u03b1 \u039a\u03b1\u03bb\u03b7\u03b4\u03bf\u03bd\u03af\u03b1
-NE=\u039d\u03af\u03b3\u03b7\u03c1\u03b1\u03c2
-NF=\u039d\u03ae\u03c3\u03bf\u03c2 \u039d\u03cc\u03c1\u03c6\u03bf\u03bb\u03ba
-NG=\u039d\u03b9\u03b3\u03b7\u03c1\u03af\u03b1
-NI=\u039d\u03b9\u03ba\u03b1\u03c1\u03ac\u03b3\u03bf\u03c5\u03b1
-NL=\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-NO=\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03af\u03b1
-NP=\u039d\u03b5\u03c0\u03ac\u03bb
-NR=\u039d\u03b1\u03bf\u03c5\u03c1\u03bf\u03cd
-NU=\u039d\u03b9\u03bf\u03cd\u03b5
-NZ=\u039d\u03ad\u03b1 \u0396\u03b7\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-OM=\u039f\u03bc\u03ac\u03bd
-PA=\u03a0\u03b1\u03bd\u03b1\u03bc\u03ac\u03c2
-PE=\u03a0\u03b5\u03c1\u03bf\u03cd
-PF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ae \u03a0\u03bf\u03bb\u03c5\u03bd\u03b7\u03c3\u03af\u03b1
-PG=\u03a0\u03b1\u03c0\u03bf\u03cd\u03b1 \u039d\u03ad\u03b1 \u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-PH=\u03a6\u03b9\u03bb\u03b9\u03c0\u03c0\u03af\u03bd\u03b5\u03c2
-PK=\u03a0\u03b1\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-PL=\u03a0\u03bf\u03bb\u03c9\u03bd\u03af\u03b1
-PM=\u03a3\u03b5\u03bd \u03a0\u03b9\u03b5\u03c1 \u03ba\u03b1\u03b9 \u039c\u03b9\u03ba\u03b5\u03bb\u03cc\u03bd
-PN=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a0\u03af\u03c4\u03ba\u03b5\u03c1\u03bd
-PR=\u03a0\u03bf\u03c5\u03ad\u03c1\u03c4\u03bf \u03a1\u03af\u03ba\u03bf
-PS=\u03a0\u03b1\u03bb\u03b1\u03b9\u03c3\u03c4\u03b9\u03bd\u03b9\u03b1\u03ba\u03ac \u0395\u03b4\u03ac\u03c6\u03b7
-PT=\u03a0\u03bf\u03c1\u03c4\u03bf\u03b3\u03b1\u03bb\u03af\u03b1
-PW=\u03a0\u03b1\u03bb\u03ac\u03bf\u03c5
-PY=\u03a0\u03b1\u03c1\u03b1\u03b3\u03bf\u03c5\u03ac\u03b7
-QA=\u039a\u03b1\u03c4\u03ac\u03c1
-RE=\u03a1\u03b5\u03ca\u03bd\u03b9\u03cc\u03bd
-RO=\u03a1\u03bf\u03c5\u03bc\u03b1\u03bd\u03af\u03b1
-RU=\u03a1\u03c9\u03c3\u03af\u03b1
-RW=\u03a1\u03bf\u03c5\u03ac\u03bd\u03c4\u03b1
-SA=\u03a3\u03b1\u03bf\u03c5\u03b4\u03b9\u03ba\u03ae \u0391\u03c1\u03b1\u03b2\u03af\u03b1
-SB=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a3\u03bf\u03bb\u03bf\u03bc\u03ce\u03bd\u03c4\u03bf\u03c2
-SC=\u03a3\u03b5\u03cb\u03c7\u03ad\u03bb\u03bb\u03b5\u03c2
-SD=\u03a3\u03bf\u03c5\u03b4\u03ac\u03bd
-SE=\u03a3\u03bf\u03c5\u03b7\u03b4\u03af\u03b1
-SG=\u03a3\u03b9\u03b3\u03ba\u03b1\u03c0\u03bf\u03cd\u03c1\u03b7
-SH=\u0391\u03b3\u03af\u03b1 \u0395\u03bb\u03ad\u03bd\u03b7
-SI=\u03a3\u03bb\u03bf\u03b2\u03b5\u03bd\u03af\u03b1
-SJ=\u03a3\u03b2\u03ac\u03bb\u03bc\u03c0\u03b1\u03c1\u03bd\u03c4 \u03ba\u03b1\u03b9 \u0393\u03b9\u03b1\u03bd \u039c\u03b1\u03b3\u03b9\u03ad\u03bd
-SK=\u03a3\u03bb\u03bf\u03b2\u03b1\u03ba\u03af\u03b1
-SL=\u03a3\u03b9\u03ad\u03c1\u03b1 \u039b\u03b5\u03cc\u03bd\u03b5
-SM=\u0386\u03b3\u03b9\u03bf\u03c2 \u039c\u03b1\u03c1\u03af\u03bd\u03bf\u03c2
-SN=\u03a3\u03b5\u03bd\u03b5\u03b3\u03ac\u03bb\u03b7
-SO=\u03a3\u03bf\u03bc\u03b1\u03bb\u03af\u03b1
-SR=\u03a3\u03bf\u03c5\u03c1\u03b9\u03bd\u03ac\u03bc
-ST=\u03a3\u03ac\u03bf \u03a4\u03bf\u03bc\u03ad \u03ba\u03b1\u03b9 \u03a0\u03c1\u03af\u03bd\u03c3\u03b9\u03c0\u03b5
-SV=\u0395\u03bb \u03a3\u03b1\u03bb\u03b2\u03b1\u03b4\u03cc\u03c1
-SY=\u03a3\u03c5\u03c1\u03af\u03b1
-SZ=\u0395\u03c3\u03bf\u03c5\u03b1\u03c4\u03af\u03bd\u03b9
-TC=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a4\u03b5\u03c1\u03ba\u03c2 \u03ba\u03b1\u03b9 \u039a\u03ac\u03b9\u03ba\u03bf\u03c2
-TD=\u03a4\u03c3\u03b1\u03bd\u03c4
-TF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac \u039d\u03cc\u03c4\u03b9\u03b1 \u0395\u03b4\u03ac\u03c6\u03b7
-TG=\u03a4\u03cc\u03b3\u03ba\u03bf
-TH=\u03a4\u03b1\u03ca\u03bb\u03ac\u03bd\u03b4\u03b7
-TJ=\u03a4\u03b1\u03c4\u03b6\u03b9\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-TK=\u03a4\u03bf\u03ba\u03b5\u03bb\u03ac\u03bf\u03c5
-TL=\u03a4\u03b9\u03bc\u03cc\u03c1-\u039b\u03ad\u03c3\u03c4\u03b5
-TM=\u03a4\u03bf\u03c5\u03c1\u03ba\u03bc\u03b5\u03bd\u03b9\u03c3\u03c4\u03ac\u03bd
-TN=\u03a4\u03c5\u03bd\u03b7\u03c3\u03af\u03b1
-TO=\u03a4\u03cc\u03bd\u03b3\u03ba\u03b1
-TR=\u03a4\u03bf\u03c5\u03c1\u03ba\u03af\u03b1
-TT=\u03a4\u03c1\u03b9\u03bd\u03b9\u03bd\u03c4\u03ac\u03bd\u03c4 \u03ba\u03b1\u03b9 \u03a4\u03bf\u03bc\u03c0\u03ac\u03b3\u03ba\u03bf
-TV=\u03a4\u03bf\u03c5\u03b2\u03b1\u03bb\u03bf\u03cd
-TW=\u03a4\u03b1\u03ca\u03b2\u03ac\u03bd
-TZ=\u03a4\u03b1\u03bd\u03b6\u03b1\u03bd\u03af\u03b1
-UA=\u039f\u03c5\u03ba\u03c1\u03b1\u03bd\u03af\u03b1
-UG=\u039f\u03c5\u03b3\u03ba\u03ac\u03bd\u03c4\u03b1
-UM=\u0391\u03c0\u03bf\u03bc\u03b1\u03ba\u03c1\u03c5\u03c3\u03bc\u03ad\u03bd\u03b5\u03c2 \u039d\u03b7\u03c3\u03af\u03b4\u03b5\u03c2 \u0397\u03a0\u0391
-US=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a0\u03bf\u03bb\u03b9\u03c4\u03b5\u03af\u03b5\u03c2
-UY=\u039f\u03c5\u03c1\u03bf\u03c5\u03b3\u03bf\u03c5\u03ac\u03b7
-UZ=\u039f\u03c5\u03b6\u03bc\u03c0\u03b5\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-VA=\u0392\u03b1\u03c4\u03b9\u03ba\u03b1\u03bd\u03cc
-VC=\u0386\u03b3\u03b9\u03bf\u03c2 \u0392\u03b9\u03ba\u03ad\u03bd\u03c4\u03b9\u03bf\u03c2 \u03ba\u03b1\u03b9 \u0393\u03c1\u03b5\u03bd\u03b1\u03b4\u03af\u03bd\u03b5\u03c2
-VE=\u0392\u03b5\u03bd\u03b5\u03b6\u03bf\u03c5\u03ad\u03bb\u03b1
-VG=\u0392\u03c1\u03b5\u03c4\u03b1\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a0\u03b1\u03c1\u03b8\u03ad\u03bd\u03b5\u03c2 \u039d\u03ae\u03c3\u03bf\u03b9
-VI=\u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a0\u03b1\u03c1\u03b8\u03ad\u03bd\u03b5\u03c2 \u039d\u03ae\u03c3\u03bf\u03b9
-VN=\u0392\u03b9\u03b5\u03c4\u03bd\u03ac\u03bc
-VU=\u0392\u03b1\u03bd\u03bf\u03c5\u03ac\u03c4\u03bf\u03c5
-WF=\u0393\u03bf\u03c5\u03ac\u03bb\u03b9\u03c2 \u03ba\u03b1\u03b9 \u03a6\u03bf\u03c5\u03c4\u03bf\u03cd\u03bd\u03b1
-WS=\u03a3\u03b1\u03bc\u03cc\u03b1
-YE=\u03a5\u03b5\u03bc\u03ad\u03bd\u03b7
-YT=\u039c\u03b1\u03b3\u03b9\u03cc\u03c4
-ZA=\u039d\u03cc\u03c4\u03b9\u03b1 \u0391\u03c6\u03c1\u03b9\u03ba\u03ae
-ZM=\u0396\u03ac\u03bc\u03c0\u03b9\u03b1
-ZW=\u0396\u03b9\u03bc\u03c0\u03ac\u03bc\u03c0\u03bf\u03c5\u03b5
+ar=Αραβικά
+be=Λευκορωσικά
+bg=Βουλγαρικά
+bn=Βεγγαλικά
+bo=Θιβετιανά
+bs=Βοσνιακά
+ca=Καταλανικά
+co=Κορσικανικά
+cs=Τσεχικά
+cy=Ουαλικά
+da=Δανικά
+de=Γερμανικά
+el=Ελληνικά
+en=Αγγλικά
+es=Ισπανικά
+et=Εσθονικά
+eu=Βασκικά
+fa=Περσικά
+fi=Φινλανδικά
+fr=Γαλλικά
+ga=Ιρλανδικά
+gd=Σκωτικά Κελτικά
+he=Εβραϊκά
+hi=Χίντι
+hr=Κροατικά
+hu=Ουγγρικά
+hy=Αρμενικά
+id=Ινδονησιακά
+in=Ινδονησιακά
+is=Ισλανδικά
+it=Ιταλικά
+iw=Εβραϊκά
+ja=Ιαπωνικά
+ji=Γίντις
+ka=Γεωργιανά
+ko=Κορεατικά
+la=Λατινικά
+lt=Λιθουανικά
+lv=Λετονικά
+mk=Σλαβομακεδονικά
+mn=Μογγολικά
+mo=Μολδαβικά
+mt=Μαλτεζικά
+nl=Ολλανδικά
+no=Νορβηγικά
+pl=Πολωνικά
+pt=Πορτογαλικά
+ro=Ρουμανικά
+ru=Ρωσικά
+sk=Σλοβακικά
+sl=Σλοβενικά
+sq=Αλβανικά
+sr=Σερβικά
+sv=Σουηδικά
+th=Ταϊλανδικά
+tr=Τουρκικά
+uk=Ουκρανικά
+vi=Βιετναμικά
+yi=Γίντις
+zh=Κινεζικά
+AD=Ανδόρα
+AE=Ηνωμένα Αραβικά Εμιράτα
+AF=Αφγανιστάν
+AG=Αντίγκουα και Μπαρμπούντα
+AI=Ανγκουίλα
+AL=Αλβανία
+AM=Αρμενία
+AN=Ολλανδικές Αντίλλες
+AO=Αγκόλα
+AQ=Ανταρκτική
+AR=Αργεντινή
+AS=Αμερικανική Σαμόα
+AT=Αυστρία
+AU=Αυστραλία
+AW=Αρούμπα
+AX=Νήσοι Όλαντ
+AZ=Αζερμπαϊτζάν
+BA=Βοσνία - Ερζεγοβίνη
+BB=Μπαρμπέιντος
+BD=Μπανγκλαντές
+BE=Βέλγιο
+BF=Μπουρκίνα Φάσο
+BG=Βουλγαρία
+BH=Μπαχρέιν
+BI=Μπουρούντι
+BJ=Μπενίν
+BM=Βερμούδες
+BN=Μπρουνέι
+BO=Βολιβία
+BR=Βραζιλία
+BS=Μπαχάμες
+BT=Μπουτάν
+BV=Νήσος Μπουβέ
+BW=Μποτσουάνα
+BY=Λευκορωσία
+BZ=Μπελίζ
+CA=Καναδάς
+CC=Νήσοι Κόκος (Κίλινγκ)
+CD=Κονγκό - Κινσάσα
+CF=Κεντροαφρικανική Δημοκρατία
+CG=Κονγκό - Μπραζαβίλ
+CH=Ελβετία
+CI=Ακτή Ελεφαντοστού
+CK=Νήσοι Κουκ
+CL=Χιλή
+CM=Καμερούν
+CN=Κίνα
+CO=Κολομβία
+CR=Κόστα Ρίκα
+CS=Σερβία και Μαυροβούνιο
+CU=Κούβα
+CV=Πράσινο Ακρωτήριο
+CX=Νήσος των Χριστουγέννων
+CY=Κύπρος
+CZ=Τσεχία
+DE=Γερμανία
+DJ=Τζιμπουτί
+DK=Δανία
+DM=Ντομίνικα
+DO=Δομινικανή Δημοκρατία
+DZ=Αλγερία
+EC=Ισημερινός
+EE=Εσθονία
+EG=Αίγυπτος
+EH=Δυτική Σαχάρα
+ER=Ερυθραία
+ES=Ισπανία
+ET=Αιθιοπία
+FI=Φινλανδία
+FJ=Φίτζι
+FK=Νήσοι Φόκλαντ
+FM=Μικρονησία
+FO=Νήσοι Φερόες
+FR=Γαλλία
+GA=Γκαμπόν
+GB=Ηνωμένο Βασίλειο
+GD=Γρενάδα
+GE=Γεωργία
+GF=Γαλλική Γουιάνα
+GH=Γκάνα
+GI=Γιβραλτάρ
+GL=Γροιλανδία
+GM=Γκάμπια
+GN=Γουινέα
+GP=Γουαδελούπη
+GQ=Ισημερινή Γουινέα
+GR=Ελλάδα
+GS=Νήσοι Νότια Γεωργία και Νότιες Σάντουιτς
+GT=Γουατεμάλα
+GU=Γκουάμ
+GW=Γουινέα Μπισάου
+GY=Γουιάνα
+HK=Χονγκ Κονγκ ΕΔΠ Κίνας
+HM=Νήσοι Χερντ και Μακντόναλντ
+HN=Ονδούρα
+HR=Κροατία
+HT=Αϊτή
+HU=Ουγγαρία
+ID=Ινδονησία
+IE=Ιρλανδία
+IL=Ισραήλ
+IN=Ινδία
+IO=Βρετανικά Εδάφη Ινδικού Ωκεανού
+IQ=Ιράκ
+IR=Ιράν
+IS=Ισλανδία
+IT=Ιταλία
+JM=Τζαμάικα
+JO=Ιορδανία
+JP=Ιαπωνία
+KE=Κένυα
+KG=Κιργιστάν
+KH=Καμπότζη
+KI=Κιριμπάτι
+KM=Κομόρες
+KN=Σεν Κιτς και Νέβις
+KP=Βόρεια Κορέα
+KR=Νότια Κορέα
+KW=Κουβέιτ
+KY=Νήσοι Κέιμαν
+KZ=Καζακστάν
+LA=Λάος
+LB=Λίβανος
+LC=Αγία Λουκία
+LI=Λιχτενστάιν
+LK=Σρι Λάνκα
+LR=Λιβερία
+LS=Λεσότο
+LT=Λιθουανία
+LU=Λουξεμβούργο
+LV=Λετονία
+LY=Λιβύη
+MA=Μαρόκο
+MC=Μονακό
+MD=Μολδαβία
+MG=Μαδαγασκάρη
+MH=Νήσοι Μάρσαλ
+MK=Βόρεια Μακεδονία
+ML=Μάλι
+MM=Μιανμάρ (Βιρμανία)
+MN=Μογγολία
+MO=Μακάο ΕΔΠ Κίνας
+MP=Νήσοι Βόρειες Μαριάνες
+MQ=Μαρτινίκα
+MR=Μαυριτανία
+MS=Μονσεράτ
+MT=Μάλτα
+MU=Μαυρίκιος
+MV=Μαλδίβες
+MW=Μαλάουι
+MX=Μεξικό
+MY=Μαλαισία
+MZ=Μοζαμβίκη
+NA=Ναμίμπια
+NC=Νέα Καληδονία
+NE=Νίγηρας
+NF=Νήσος Νόρφολκ
+NG=Νιγηρία
+NI=Νικαράγουα
+NL=Ολλανδία
+NO=Νορβηγία
+NP=Νεπάλ
+NR=Ναουρού
+NU=Νιούε
+NZ=Νέα Ζηλανδία
+OM=Ομάν
+PA=Παναμάς
+PE=Περού
+PF=Γαλλική Πολυνησία
+PG=Παπούα Νέα Γουινέα
+PH=Φιλιππίνες
+PK=Πακιστάν
+PL=Πολωνία
+PM=Σεν Πιερ και Μικελόν
+PN=Νήσοι Πίτκερν
+PR=Πουέρτο Ρίκο
+PS=Παλαιστινιακά Εδάφη
+PT=Πορτογαλία
+PW=Παλάου
+PY=Παραγουάη
+QA=Κατάρ
+RE=Ρεϊνιόν
+RO=Ρουμανία
+RU=Ρωσία
+RW=Ρουάντα
+SA=Σαουδική Αραβία
+SB=Νήσοι Σολομώντος
+SC=Σεϋχέλλες
+SD=Σουδάν
+SE=Σουηδία
+SG=Σιγκαπούρη
+SH=Αγία Ελένη
+SI=Σλοβενία
+SJ=Σβάλμπαρντ και Γιαν Μαγιέν
+SK=Σλοβακία
+SL=Σιέρα Λεόνε
+SM=Άγιος Μαρίνος
+SN=Σενεγάλη
+SO=Σομαλία
+SR=Σουρινάμ
+ST=Σάο Τομέ και Πρίνσιπε
+SV=Ελ Σαλβαδόρ
+SY=Συρία
+SZ=Εσουατίνι
+TC=Νήσοι Τερκς και Κάικος
+TD=Τσαντ
+TF=Γαλλικά Νότια Εδάφη
+TG=Τόγκο
+TH=Ταϊλάνδη
+TJ=Τατζικιστάν
+TK=Τοκελάου
+TL=Τιμόρ-Λέστε
+TM=Τουρκμενιστάν
+TN=Τυνησία
+TO=Τόνγκα
+TR=Τουρκία
+TT=Τρινιντάντ και Τομπάγκο
+TV=Τουβαλού
+TW=Ταϊβάν
+TZ=Τανζανία
+UA=Ουκρανία
+UG=Ουγκάντα
+UM=Απομακρυσμένες Νησίδες ΗΠΑ
+US=Ηνωμένες Πολιτείες
+UY=Ουρουγουάη
+UZ=Ουζμπεκιστάν
+VA=Βατικανό
+VC=Άγιος Βικέντιος και Γρεναδίνες
+VE=Βενεζουέλα
+VG=Βρετανικές Παρθένες Νήσοι
+VI=Αμερικανικές Παρθένες Νήσοι
+VN=Βιετνάμ
+VU=Βανουάτου
+WF=Γουάλις και Φουτούνα
+WS=Σαμόα
+YE=Υεμένη
+YT=Μαγιότ
+ZA=Νότια Αφρική
+ZM=Ζάμπια
+ZW=Ζιμπάμπουε
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es.properties
index 59892468bdd..cf5ce32076f 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es.properties
@@ -40,124 +40,124 @@
 
 aa=afar
 ab=abjasio
-ae=av\u00e9stico
-af=afrik\u00e1ans
+ae=avéstico
+af=afrikáans
 ak=akan
-am=am\u00e1rico
-an=aragon\u00e9s
-ar=\u00e1rabe
-as=asam\u00e9s
+am=amárico
+an=aragonés
+ar=árabe
+as=asamés
 av=avar
 ay=aimara
 az=azerbaiyano
 ba=baskir
 be=bielorruso
-bg=b\u00falgaro
+bg=búlgaro
 bh=bihari
 bi=bislama
 bm=bambara
-bn=bengal\u00ed
+bn=bengalí
 bo=tibetano
-br=bret\u00f3n
+br=bretón
 bs=bosnio
-ca=catal\u00e1n
+ca=catalán
 ce=checheno
 ch=chamorro
 co=corso
 cr=cree
 cs=checo
-cu=eslavo eclesi\u00e1stico
+cu=eslavo eclesiástico
 cv=chuvasio
-cy=gal\u00e9s
-da=dan\u00e9s
-de=alem\u00e1n
+cy=galés
+da=danés
+de=alemán
 dv=divehi
 dz=dzongkha
-ee=ew\u00e9
+ee=ewé
 el=griego
-en=ingl\u00e9s
+en=inglés
 eo=esperanto
-es=espa\u00f1ol
+es=español
 et=estonio
 eu=euskera
 fa=persa
 ff=fula
-fi=fin\u00e9s
+fi=finés
 fj=fiyiano
-fo=fero\u00e9s
-fr=franc\u00e9s
-fy=fris\u00f3n occidental
-ga=irland\u00e9s
-gd=ga\u00e9lico escoc\u00e9s
+fo=feroés
+fr=francés
+fy=frisón occidental
+ga=irlandés
+gd=gaélico escocés
 gl=gallego
-gn=guaran\u00ed
-gu=guyarat\u00ed
-gv=man\u00e9s
+gn=guaraní
+gu=guyaratí
+gv=manés
 ha=hausa
 he=hebreo
 hi=hindi
 ho=hiri motu
 hr=croata
 ht=criollo haitiano
-hu=h\u00fangaro
+hu=húngaro
 hy=armenio
 hz=herero
 ia=interlingua
 id=indonesio
 ie=interlingue
 ig=igbo
-ii=yi de Sichu\u00e1n
+ii=yi de Sichuán
 ik=inupiaq
 in=indonesio
 io=ido
-is=island\u00e9s
+is=islandés
 it=italiano
 iu=inuktitut
 iw=hebreo
-ja=japon\u00e9s
+ja=japonés
 ji=yidis
-jv=javan\u00e9s
+jv=javanés
 ka=georgiano
 kg=kongo
 ki=kikuyu
 kj=kuanyama
 kk=kazajo
-kl=groenland\u00e9s
+kl=groenlandés
 km=jemer
-kn=canar\u00e9s
+kn=canarés
 ko=coreano
 kr=kanuri
 ks=cachemir
 ku=kurdo
 kv=komi
-kw=c\u00f3rnico
-ky=kirgu\u00eds
-la=lat\u00edn
-lb=luxemburgu\u00e9s
+kw=córnico
+ky=kirguís
+la=latín
+lb=luxemburgués
 lg=ganda
-li=limburgu\u00e9s
+li=limburgués
 ln=lingala
 lo=lao
 lt=lituano
 lu=luba-katanga
-lv=let\u00f3n
+lv=letón
 mg=malgache
-mh=marshal\u00e9s
-mi=maor\u00ed
+mh=marshalés
+mi=maorí
 mk=macedonio
-ml=malay\u00e1lam
+ml=malayálam
 mn=mongol
 mo=moldavo
-mr=marat\u00ed
+mr=maratí
 ms=malayo
-mt=malt\u00e9s
+mt=maltés
 my=birmano
 na=nauruano
 nb=noruego bokmal
 nd=ndebele septentrional
-ne=nepal\u00ed
+ne=nepalí
 ng=ndonga
-nl=neerland\u00e9s
+nl=neerlandés
 nn=noruego nynorsk
 no=noruego
 nr=ndebele meridional
@@ -167,48 +167,48 @@ oc=occitano
 oj=ojibwa
 om=oromo
 or=oriya
-os=os\u00e9tico
-pa=punyab\u00ed
+os=osético
+pa=punyabí
 pi=pali
 pl=polaco
-ps=past\u00fan
-pt=portugu\u00e9s
+ps=pastún
+pt=portugués
 qu=quechua
 rm=romanche
 rn=kirundi
 ro=rumano
 ru=ruso
 rw=kinyarwanda
-sa=s\u00e1nscrito
+sa=sánscrito
 sc=sardo
 sd=sindhi
 se=sami septentrional
 sg=sango
-si=cingal\u00e9s
+si=cingalés
 sk=eslovaco
 sl=esloveno
 sm=samoano
 sn=shona
-so=somal\u00ed
-sq=alban\u00e9s
+so=somalí
+sq=albanés
 sr=serbio
 ss=suazi
 st=sotho meridional
-su=sundan\u00e9s
+su=sundanés
 sv=sueco
 sw=suajili
 ta=tamil
 te=telugu
 tg=tayiko
-th=tailand\u00e9s
-ti=tigri\u00f1a
+th=tailandés
+ti=tigriña
 tk=turcomano
 tl=tagalo
 tn=setsuana
 to=tongano
 tr=turco
 ts=tsonga
-tt=t\u00e1rtaro
+tt=tártaro
 tw=twi
 ty=tahitiano
 ug=uigur
@@ -217,50 +217,50 @@ ur=urdu
 uz=uzbeko
 ve=venda
 vi=vietnamita
-vo=volap\u00fck
-wa=val\u00f3n
-wo=w\u00f3lof
+vo=volapük
+wa=valón
+wo=wólof
 xh=xhosa
 yi=yidis
 yo=yoruba
 za=zhuang
 zh=chino
-zu=zul\u00fa
+zu=zulú
 
 # key is ISO 639.2 language code
 aar=afar
 abk=Abjasio
-ace=acehn\u00e9s
+ace=acehnés
 ach=acoli
 ada=adangme
-ady=adigu\u00e9
+ady=adigué
 afa=afgani (1927-2002)
 afh=afrihili
 ain=ainu
 aka=Acano
 akk=acadio
-alb=Alban\u00e9s
+alb=Albanés
 ale=aleutiano
 alg=lenguas algonquinas
-alt=alt\u00e1i meridional
-amh=Am\u00e1rico
-ang=ingl\u00e9s antiguo
+alt=altái meridional
+amh=Amárico
+ang=inglés antiguo
 anp=angika
 apa=lenguas apache
 ara=australes argentinos
 arc=arameo
-arg=Aragon\u00e9s
+arg=Aragonés
 arm=Armenio
 arn=mapuche
 arp=arapaho
 art=lengua artificial
 arw=arahuaco
-asm=Asam\u00e9s
+asm=Asamés
 ast=asturiano
 ath=lenguas atabascas
 aus=lenguas australianas
-ava=\u00c1varo
-ave=Av\u00e9stico
+ava=Ávaro
+ave=Avéstico
 awa=avadhi
 aym=Aimara
 aze=Azerbaiyano
@@ -268,65 +268,65 @@ bad=dinares bosnios
 bai=lenguas bamileke
 bal=baluchi
 bam=marcos convertibles de Bosnia-Herzegovina
-ban=balin\u00e9s
+ban=balinés
 baq=Vasco
 bas=basaa
-bat=lengua b\u00e1ltica
+bat=lengua báltica
 bej=beja
 bel=francos belgas (financieros)
 bem=bemba
-ben=Bengal\u00ed
+ben=Bengalí
 ber=bereber
-bho=bhoyapur\u00ed
-bih=Bihar\u00ed
+bho=bhoyapurí
+bih=Biharí
 bik=bicol
 bin=bini
 bla=siksika
-bnt=bant\u00fa
+bnt=bantú
 bos=Bosnio
 bra=braj
-bre=cruceiros brasile\u00f1os (BRE)
+bre=cruceiros brasileños (BRE)
 btk=batak
 bua=buriato
-bug=bugin\u00e9s
-bul=B\u00falgaro
+bug=buginés
+bul=Búlgaro
 bur=Birmano
 byn=blin
 cad=caddo
 cai=lengua india centroamericana
 car=caribe
-cat=Catal\u00e1n
-cau=lengua cauc\u00e1sica
+cat=Catalán
+cau=lengua caucásica
 ceb=cebuano
 cel=lengua celta
 chb=chibcha
 che=euros WIR
-chg=chagat\u00e1i
+chg=chagatái
 chi=Chino
-chk=truk\u00e9s
-chm=mar\u00ed
+chk=trukés
+chm=marí
 chn=jerga chinuk
 cho=choctaw
 chp=chipewyan
 chr=cheroqui
-chu=Eslavo Eclesi\u00e1stico
+chu=Eslavo Eclesiástico
 chv=Chuvacho
 chy=cheyene
-cmc=lenguas ch\u00e1micas
+cmc=lenguas chámicas
 cop=copto
-cor=C\u00f3rnico
+cor=Córnico
 cos=corso
-cpe=lengua criolla o pidgin basada en el ingl\u00e9s
-cpf=lengua criolla o pidgin basada en el franc\u00e9s
-cpp=lengua criolla o pidgin basada en el portugu\u00e9s
+cpe=lengua criolla o pidgin basada en el inglés
+cpf=lengua criolla o pidgin basada en el francés
+cpp=lengua criolla o pidgin basada en el portugués
 cre=cree
-crh=t\u00e1rtaro de Crimea
+crh=tártaro de Crimea
 crp=lengua criolla o pidgin
 csb=casubio
 cus=lengua cusita
 cze=checo
 dak=dakota
-dan=dan\u00e9s
+dan=danés
 dar=dargva
 day=dayak
 del=delaware
@@ -335,59 +335,59 @@ dgr=dogrib
 din=dinka
 div=Dhivehi
 doi=dogri
-dra=lengua drav\u00eddica
+dra=lengua dravídica
 dsb=bajo sorbio
 dua=duala
-dum=neerland\u00e9s medio
-dut=Holand\u00e9s
+dum=neerlandés medio
+dut=Holandés
 dyu=diula
 efi=efik
 egy=egipcio antiguo
 eka=ekajuk
 elx=elamita
-eng=Ingl\u00e9s
-enm=ingl\u00e9s medio
+eng=Inglés
+enm=inglés medio
 est=Estonio
-ewe=Ef\u00e9
+ewe=Efé
 ewo=ewondo
 fan=fang
-fao=Faro\u00e9s
+fao=Faroés
 fat=fanti
 fij=fidjiano
 fil=filipino
-fin=Finland\u00e9s
-fiu=lengua fino\u00fagria
+fin=Finlandés
+fiu=lengua finoúgria
 fon=fon
-fre=franc\u00e9s
-frm=franc\u00e9s medio
-fro=franc\u00e9s antiguo
-frr=fris\u00f3n septentrional
-frs=fris\u00f3n oriental
+fre=francés
+frm=francés medio
+fro=francés antiguo
+frr=frisón septentrional
+frs=frisón oriental
 fry=Frisio del Oeste
 ful=Fula
 fur=friulano
 gaa=ga
 gay=gayo
 gba=gbaya
-gem=lengua germ\u00e1nica
+gem=lengua germánica
 geo=Georgiano
-ger=Alem\u00e1n
+ger=Alemán
 gez=geez
-gil=gilbert\u00e9s
-gla=Ga\u00e9lico
-gle=Irland\u00e9s
+gil=gilbertés
+gla=Gaélico
+gle=Irlandés
 glg=Gallego
-glv=Man\u00e9s
-gmh=alto alem\u00e1n medio
-goh=alto alem\u00e1n antiguo
+glv=Manés
+gmh=alto alemán medio
+goh=alto alemán antiguo
 gon=gondi
 gor=gorontalo
-got=g\u00f3tico
+got=gótico
 grb=grebo
 grc=griego antiguo
 gre=Griego moderno (1453-)
-grn=Guaran\u00ed
-gsw=alem\u00e1n suizo
+grn=Guaraní
+gsw=alemán suizo
 gwi=kutchin
 hai=haida
 hat=Haitiano
@@ -402,47 +402,47 @@ hmn=hmong
 hmo=Hiri motu
 hrv=Croata
 hsb=alto sorbio
-hun=h\u00fangaro
+hun=húngaro
 hup=hupa
 iba=iban
 ibo=Ibo
-ice=Island\u00e9s
-iii=Yi de Sichu\u00e1n
+ice=Islandés
+iii=Yi de Sichuán
 ijo=ijo
-ile=Interling\u00fce
+ile=Interlingüe
 ilo=ilocano
-ina=Interlingua (IALA, del ingl\u00e9s International Auxiliary Language Association)
-inc=lengua \u00edndica
+ina=Interlingua (IALA, del inglés International Auxiliary Language Association)
+inc=lengua índica
 ind=Indonesio
 ine=lengua indoeuropea
 inh=ingush
-ipk=I\u00f1upiaq
+ipk=Iñupiaq
 ira=lengua irania
 iro=lenguas iroquesas
 ita=Italiano
-jav=Javan\u00e9s
+jav=Javanés
 jbo=lojban
-jpn=Japon\u00e9s
+jpn=Japonés
 jpr=judeo-persa
-jrb=judeo-\u00e1rabe
+jrb=judeo-árabe
 kaa=karakalpako
 kab=cabila
 kac=kachin
 kam=kamba
-kan=Canar\u00e9s
+kan=Canarés
 kar=karen
-kas=Cachemir\u00ed
+kas=Cachemirí
 kaw=kawi
 kaz=Kazajo
 kbd=kabardiano
 kha=khasi
 khi=lengua joisana
 khm=Jemer Central
-kho=kotan\u00e9s
-kin=Ruand\u00e9s
+kho=kotanés
+kin=Ruandés
 kir=kirghiz
 kmb=kimbundu
-kok=konkan\u00ed
+kok=konkaní
 kon=Congo
 kor=Coreano
 kos=kosraeano
@@ -458,43 +458,43 @@ lad=ladino
 lah=lahnda
 lam=lamba
 lao=Laosiano
-lat=lat\u00edn
-lav=Let\u00f3n
+lat=latín
+lav=Letón
 lez=lezgiano
-lim=Limburgu\u00e9s
+lim=Limburgués
 lit=Lituano
 lol=mongo
 loz=lozi
-ltz=Luxemburgu\u00e9s
+ltz=Luxemburgués
 lua=luba-lulua
 lub=Luba-katanga
 lug=Luganda
-lui=luise\u00f1o
+lui=luiseño
 lun=lunda
 luo=luo
 lus=mizo
 mac=Macedonio
-mad=madur\u00e9s
+mad=madurés
 mag=magahi
-mah=marshal\u00e9s
+mah=marshalés
 mai=maithili
 mak=macasar
 man=mandingo
-mao=Maor\u00ed
+mao=Maorí
 map=lengua austronesia
-mas=mas\u00e1i
+mas=masái
 may=malayo
 mdf=moksha
 mdr=mandar
 men=mende
-mga=irland\u00e9s medio
+mga=irlandés medio
 mic=micmac
 min=minangkabau
 mis=lenguas varias
 mkh=lengua mon-jemer
 mlg=Malgache
-mlt=Malt\u00e9s
-mnc=manch\u00fa
+mlt=Maltés
+mnc=manchú
 mni=manipuri
 mno=lenguas manobo
 moh=mohawk
@@ -503,31 +503,31 @@ mos=mossi
 mul=varios idiomas
 mun=lenguas munda
 mus=creek
-mwl=mirand\u00e9s
+mwl=mirandés
 mwr=marwari
 myn=maya
 myv=erzya
-nah=n\u00e1huatl
+nah=náhuatl
 nai=lengua india norteamericana
 nap=napolitano
 nau=Nauruano
 nbl=Ndebele del Sur
 nde=ndebele septentrional
-nds=bajo alem\u00e1n
-nep=Nepal\u00ed
+nds=bajo alemán
+nep=Nepalí
 new=newari
 nia=nias
-nic=c\u00f3rdobas nicarag\u00fcenses
+nic=córdobas nicaragüenses
 niu=niueano
 nno=Noruego Nynorsk
 nob=Noruego Bokmal
 nog=nogai
-non=n\u00f3rdico antiguo
+non=nórdico antiguo
 nor=Noruego
-nqo=n\u2019ko
+nqo=n’ko
 nso=sotho septentrional
 nub=lenguas nubias
-nwc=newari cl\u00e1sico
+nwc=newari clásico
 nym=nyamwezi
 nyn=nyankole
 nyo=nyoro
@@ -535,14 +535,14 @@ nzi=nzima
 oci=Occitano (posterior a 1500)
 ori=oriya
 osa=osage
-oss=Os\u00e9tico
+oss=Osético
 ota=turco otomano
 oto=lenguas otomanas
-paa=lengua pap\u00fa
-pag=pangasin\u00e1n
+paa=lengua papú
+pag=pangasinán
 pal=pahlavi
 pam=pampanga
-pan=Penyab\u00ed
+pan=Penyabí
 pap=papiamento
 pau=palauano
 peo=persa antiguo
@@ -551,16 +551,16 @@ phi=lengua filipina
 phn=fenicio
 pol=Polaco
 pon=pohnpeiano
-por=Portugu\u00e9s
-pra=lenguas pr\u00e1critas
+por=Portugués
+pra=lenguas prácritas
 pro=provenzal antiguo
 raj=rajasthani
 rap=rapanui
 rar=rarotongano
 roa=lengua romance
-rom=roman\u00ed
+rom=romaní
 rum=rumano
-run=Rund\u00ed
+run=Rundí
 rup=arrumano
 rus=Ruso
 sad=sandawe
@@ -568,20 +568,20 @@ sah=sakha
 sai=lengua india sudamericana
 sal=lenguas salish
 sam=arameo samaritano
-san=S\u00e1nscrito
+san=Sánscrito
 sas=sasak
 sat=santali
 scn=siciliano
-sco=escoc\u00e9s
+sco=escocés
 sel=selkup
-sem=lengua sem\u00edtica
-sga=irland\u00e9s antiguo
+sem=lengua semítica
+sga=irlandés antiguo
 sgn=lenguajes de signos
 shn=shan
 sid=sidamo
-sin=Cingal\u00e9s
+sin=Cingalés
 sio=lenguas sioux
-sit=t\u00f3lares eslovenos
+sit=tólares eslovenos
 sla=lengua eslava
 slo=Eslovaco
 slv=Esloveno
@@ -593,34 +593,34 @@ smn=sami inari
 smo=Samoano
 sms=sami skolt
 sna=shona
-snk=sonink\u00e9
+snk=soninké
 sog=sogdiano
-som=Somal\u00ed
+som=Somalí
 son=songhai
 sot=Sotho del Sur
-spa=Espa\u00f1ol
-srd=d\u00f3lar surinam\u00e9s
+spa=Español
+srd=dólar surinamés
 srn=sranan tongo
 srp=serbio
 srr=serer
 ssa=lengua nilo-sahariana
 ssw=Suazi
 suk=sukuma
-sun=sudan\u00e9s
+sun=sudanés
 sus=susu
 sux=sumerio
 swe=Sueco
-syc=sir\u00edaco cl\u00e1sico
+syc=siríaco clásico
 syr=siriaco
 tah=tahitiano
 tai=lengua tai
 tem=temne
 ter=tereno
-tet=tet\u00fan
+tet=tetún
 tgl=Tagalo
-tha=Tailand\u00e9s
+tha=Tailandés
 tib=Tibetano
-tig=tigr\u00e9
+tig=tigré
 tiv=tiv
 tkl=tokelauano
 tlh=klingon
@@ -632,14 +632,14 @@ tpi=tok pisin
 tsi=tsimshiano
 tuk=Turcomano
 tum=tumbuka
-tup=lenguas tup\u00ed
+tup=lenguas tupí
 tur=Turco
 tut=lengua altaica
 tvl=tuvaluano
 twi=Tui
 tyv=tuviniano
 udm=udmurt
-uga=ugar\u00edtico
+uga=ugarítico
 uig=Uiguro
 ukr=Ucraniano
 umb=umbundu
@@ -648,67 +648,67 @@ uzb=Uzbeco
 vai=vai
 vie=vietnamita
 vol=Volapuk
-vot=v\u00f3tico
+vot=vótico
 wak=lenguas wakasha
 wal=wolayta
 war=waray
 was=washo
-wel=Gal\u00e9s
+wel=Galés
 wen=lenguas sorbias
-wln=val\u00f3n
+wln=valón
 wol=Uolof
 xal=kalmyk
 yao=yao
-yap=yap\u00e9s
-yid=Y\u00eddish
+yap=yapés
+yid=Yídish
 ypk=lenguas yupik
 zap=zapoteco
-zbl=s\u00edmbolos Bliss
+zbl=símbolos Bliss
 zen=zenaga
 znd=zande
-zul=Zul\u00fa
-zun=zu\u00f1i
-zxx=sin contenido ling\u00fc\u00edstico
+zul=Zulú
+zun=zuñi
+zxx=sin contenido lingüístico
 zza=zazaki
 
 # script names
 # key is ISO 15924 script code
 
-Arab=\u00e1rabe
+Arab=árabe
 Armi=Arameo Imperial
 Armn=armenio
-Avst=av\u00e9stico
-Bali=balin\u00e9s
+Avst=avéstico
+Bali=balinés
 Batk=batak
-Beng=bengal\u00ed
-Blis=s\u00edmbolos blis
+Beng=bengalí
+Blis=símbolos blis
 Bopo=bopomofo
 Brah=brahmi
 Brai=braille
-Bugi=bugin\u00e9s
+Bugi=buginés
 Buhd=buhid
-Cans=silabarios abor\u00edgenes canadienses unificados
+Cans=silabarios aborígenes canadienses unificados
 Cari=cario
 Cham=cham
 Cher=cherokee
 Cirt=cirth
 Copt=copto
 Cprt=chipriota
-Cyrl=cir\u00edlico
-Cyrs=cir\u00edlico del antiguo eslavo eclesi\u00e1stico
+Cyrl=cirílico
+Cyrs=cirílico del antiguo eslavo eclesiástico
 Deva=devanagari
 Dsrt=deseret
-Dupl=Taquigraf\u00eda Duploy\u00e9
-Egyd=egipcio dem\u00f3tico
-Egyh=egipcio hier\u00e1tico
-Egyp=jerogl\u00edficos egipcios
-Ethi=eti\u00f3pico
-Geok=georgiano eclesi\u00e1stico
+Dupl=Taquigrafía Duployé
+Egyd=egipcio demótico
+Egyh=egipcio hierático
+Egyp=jeroglíficos egipcios
+Ethi=etiópico
+Geok=georgiano eclesiástico
 Geor=georgiano
-Glag=glagol\u00edtico
-Goth=g\u00f3tico
+Glag=glagolítico
+Goth=gótico
 Grek=griego
-Gujr=guyarat\u00ed
+Gujr=guyaratí
 Guru=gurmuji
 Hang=hangul
 Hani=han
@@ -719,21 +719,21 @@ Hebr=hebreo
 Hira=hiragana
 Hmng=pahawh hmong
 Hrkt=silabarios japoneses
-Hung=h\u00fangaro antiguo
+Hung=húngaro antiguo
 Inds=Indio (harappan)
 Ital=antigua bastardilla
-Java=javan\u00e9s
-Jpan=japon\u00e9s
+Java=javanés
+Jpan=japonés
 Kali=kayah li
 Kana=katakana
 Khar=kharosthi
 Khmr=jemer
-Knda=canar\u00e9s
+Knda=canarés
 Kore=coreano
 Lana=lanna
 Laoo=laosiano
 Latf=latino fraktur
-Latg=latino ga\u00e9lico
+Latg=latino gaélico
 Latn=latino
 Lepc=lepcha
 Limb=limbu
@@ -743,26 +743,26 @@ Lisu=Lisu
 Lyci=licio
 Lydi=lidio
 Mand=mandeo
-Mani=Manique\u00edsmo
-Maya=jerogl\u00edficos mayas
-Mend=Mend\u00e9
-Merc=Mero\u00edtico Cursivo
-Mero=mero\u00edtico
-Mlym=malay\u00e1lam
+Mani=Maniqueísmo
+Maya=jeroglíficos mayas
+Mend=Mendé
+Merc=Meroítico Cursivo
+Mero=meroítico
+Mlym=malayálam
 Mong=mongol
 Moon=moon
 Mtei=manipuri
 Mymr=birmano
-Narb=\u00c1rabe del Norte Antiguo
+Narb=Árabe del Norte Antiguo
 Nbat=Nabateo
 Nkgb=Nakhi Geba
-Nkoo=n\u2019ko
+Nkoo=n’ko
 Ogam=ogham
 Olck=ol ciki
 Orkh=orkhon
 Orya=oriya
 Osma=osmaniya
-Palm=Palmire\u00f1o
+Palm=Palmireño
 Perm=permiano antiguo
 Phag=phags-pa
 Phli=Pahlavi, Inscripciones
@@ -773,21 +773,21 @@ Plrd=Pollard Miao
 Prti=Parto, Inscripciones
 Rjng=rejang
 Roro=rongo-rongo
-Runr=r\u00fanico
+Runr=rúnico
 Samr=Samaritano
 Sara=sarati
-Sarb=\u00c1rabe del Sur Antiguo
+Sarb=Árabe del Sur Antiguo
 Saur=saurashtra
 Shaw=shaviano
 Sind=Sindhi
-Sinh=cingal\u00e9s
-Sund=sundan\u00e9s
+Sinh=cingalés
+Sund=sundanés
 Sylo=syloti nagri
 Syrc=siriaco
 Syre=siriaco estrangelo
 Syrj=siriaco occidental
 Syrn=siriaco oriental
-Tagb=tagban\u00faa
+Tagb=tagbanúa
 Tale=tai le
 Talu=nuevo tai lue
 Taml=tamil
@@ -796,9 +796,9 @@ Teng=tengwar
 Tfng=tifinagh
 Tglg=tagalo
 Thaa=thaana
-Thai=tailand\u00e9s
+Thai=tailandés
 Tibt=tibetano
-Ugar=ugar\u00edtico
+Ugar=ugarítico
 Vaii=vai
 Visp=lenguaje visible
 Wara=Warang Citi
@@ -806,45 +806,45 @@ Xpeo=persa antiguo
 Xsux=cuneiforme sumerio-acadio
 Yiii=yi
 Zinh=heredado
-Zmth=notaci\u00f3n matem\u00e1tica
-Zsym=s\u00edmbolos
+Zmth=notación matemática
+Zsym=símbolos
 Zxxx=no escrito
-Zyyy=com\u00fan
+Zyyy=común
 Zzzz=alfabeto desconocido
 
 # country names
 # key is ISO 3166 country code
 
-AE=Emiratos \u00c1rabes Unidos
-AF=Afganist\u00e1n
+AE=Emiratos Árabes Unidos
+AF=Afganistán
 AG=Antigua y Barbuda
 AI=Anguila
 AN=Antillas Holandesas
-AQ=Ant\u00e1rtida
+AQ=Antártida
 AS=Samoa Americana
 AX=Islas Aland
-AZ=Azerbaiy\u00e1n
+AZ=Azerbaiyán
 BA=Bosnia y Herzegovina
-BD=Banglad\u00e9s
-BE=B\u00e9lgica
-BH=Bar\u00e9in
-BJ=Ben\u00edn
+BD=Bangladés
+BE=Bélgica
+BH=Baréin
+BJ=Benín
 BM=Bermudas
-BN=Brun\u00e9i
+BN=Brunéi
 BR=Brasil
-BT=But\u00e1n
+BT=Bután
 BV=Isla Bouvet
 BW=Botsuana
 BY=Bielorrusia
 BZ=Belice
-CA=Canad\u00e1
+CA=Canadá
 CC=Islas Cocos
-CD=Rep\u00fablica Democr\u00e1tica del Congo
-CF=Rep\u00fablica Centroafricana
+CD=República Democrática del Congo
+CF=República Centroafricana
 CG=Congo
 CH=Suiza
 CK=Islas Cook
-CM=Camer\u00fan
+CM=Camerún
 CS=Serbia y Montenegro
 CV=Cabo Verde
 CX=Isla de Navidad
@@ -853,18 +853,18 @@ CZ=Chequia
 DE=Alemania
 DJ=Yibuti
 DK=Dinamarca
-DO=Rep\u00fablica Dominicana
+DO=República Dominicana
 DZ=Argelia
 EG=Egipto
-EH=S\u00e1hara Occidental
-ES=Espa\u00f1a
-ET=Etiop\u00eda
+EH=Sáhara Occidental
+ES=España
+ET=Etiopía
 FI=Finlandia
 FJ=Fiyi
 FK=Islas Malvinas
 FO=Islas Feroe
 FR=Francia
-GA=Gab\u00f3n
+GA=Gabón
 GB=Reino Unido
 GD=Granada
 GF=Guayana Francesa
@@ -873,38 +873,38 @@ GP=Guadalupe
 GQ=Guinea Ecuatorial
 GR=Grecia
 GS=Islas Georgia del Sur y Sandwich del Sur
-GW=Guinea-Bis\u00e1u
+GW=Guinea-Bisáu
 HK=RAE de Hong Kong (China)
 HM=Islas Heard y McDonald
 HR=Croacia
-HT=Hait\u00ed
-HU=Hungr\u00eda
+HT=Haití
+HU=Hungría
 IE=Irlanda
-IO=Territorio Brit\u00e1nico del Oc\u00e9ano \u00cdndico
+IO=Territorio Británico del Océano Índico
 IQ=Irak
-IR=Ir\u00e1n
+IR=Irán
 IS=Islandia
 IT=Italia
 JO=Jordania
-JP=Jap\u00f3n
+JP=Japón
 KE=Kenia
-KG=Kirguist\u00e1n
+KG=Kirguistán
 KH=Camboya
 KM=Comoras
-KN=San Crist\u00f3bal y Nieves
+KN=San Cristóbal y Nieves
 KP=Corea del Norte
 KR=Corea del Sur
-KY=Islas Caim\u00e1n
-KZ=Kazajist\u00e1n
-LB=L\u00edbano
-LC=Santa Luc\u00eda
+KY=Islas Caimán
+KZ=Kazajistán
+LB=Líbano
+LC=Santa Lucía
 LS=Lesoto
 LT=Lituania
 LU=Luxemburgo
 LV=Letonia
 LY=Libia
 MA=Marruecos
-MC=M\u00f3naco
+MC=Mónaco
 MD=Moldavia
 MH=Islas Marshall
 MK=Macedonia del Norte
@@ -915,34 +915,34 @@ MQ=Martinica
 MU=Mauricio
 MV=Maldivas
 MW=Malaui
-MX=M\u00e9xico
+MX=México
 MY=Malasia
 NC=Nueva Caledonia
-NE=N\u00edger
+NE=Níger
 NF=Isla Norfolk
-NL=Pa\u00edses Bajos
+NL=Países Bajos
 NO=Noruega
 NZ=Nueva Zelanda
-OM=Om\u00e1n
-PA=Panam\u00e1
-PE=Per\u00fa
+OM=Omán
+PA=Panamá
+PE=Perú
 PF=Polinesia Francesa
-PG=Pap\u00faa Nueva Guinea
+PG=Papúa Nueva Guinea
 PH=Filipinas
-PK=Pakist\u00e1n
+PK=Pakistán
 PL=Polonia
-PM=San Pedro y Miquel\u00f3n
+PM=San Pedro y Miquelón
 PN=Islas Pitcairn
 PS=Territorios Palestinos
 PW=Palaos
 QA=Catar
-RE=Reuni\u00f3n
-RO=Ruman\u00eda
+RE=Reunión
+RO=Rumanía
 RU=Rusia
 RW=Ruanda
-SA=Arabia Saud\u00ed
-SB=Islas Salom\u00f3n
-SD=Sud\u00e1n
+SA=Arabia Saudí
+SB=Islas Salomón
+SD=Sudán
 SE=Suecia
 SG=Singapur
 SH=Santa Elena
@@ -951,52 +951,52 @@ SJ=Svalbard y Jan Mayen
 SK=Eslovaquia
 SL=Sierra Leona
 SR=Surinam
-ST=Santo Tom\u00e9 y Pr\u00edncipe
+ST=Santo Tomé y Príncipe
 SY=Siria
 SZ=Esuatini
 TC=Islas Turcas y Caicos
 TF=Territorios Australes Franceses
 TH=Tailandia
-TJ=Tayikist\u00e1n
-TM=Turkmenist\u00e1n
-TN=T\u00fanez
-TR=Turqu\u00eda
+TJ=Tayikistán
+TM=Turkmenistán
+TN=Túnez
+TR=Turquía
 TT=Trinidad y Tobago
-TW=Taiw\u00e1n
+TW=Taiwán
 UA=Ucrania
 UM=Islas menores alejadas de EE. UU.
 US=Estados Unidos
-UZ=Uzbekist\u00e1n
+UZ=Uzbekistán
 VA=Ciudad del Vaticano
 VC=San Vicente y las Granadinas
-VG=Islas V\u00edrgenes Brit\u00e1nicas
-VI=Islas V\u00edrgenes de EE. UU.
+VG=Islas Vírgenes Británicas
+VI=Islas Vírgenes de EE. UU.
 WF=Wallis y Futuna
-ZA=Sud\u00e1frica
+ZA=Sudáfrica
 ZW=Zimbabue
 
 # territory names
 # key is UN M.49 country and area code
 
 001=Mundo
-002=\u00c1frica
-003=Am\u00e9rica del Norte
-005=Sudam\u00e9rica
-009=Ocean\u00eda
-011=\u00c1frica occidental
-013=Centroam\u00e9rica
-014=\u00c1frica oriental
-015=\u00c1frica septentrional
-017=\u00c1frica central
-018=\u00c1frica meridional
-019=Am\u00e9rica
-021=Norteam\u00e9rica
+002=África
+003=América del Norte
+005=Sudamérica
+009=Oceanía
+011=África occidental
+013=Centroamérica
+014=África oriental
+015=África septentrional
+017=África central
+018=África meridional
+019=América
+021=Norteamérica
 029=Caribe
 030=Asia oriental
 034=Asia meridional
-035=Sudeste asi\u00e1tico
+035=Sudeste asiático
 039=Europa meridional
-057=Regi\u00f3n de Micronesia
+057=Región de Micronesia
 061=Polinesia
 143=Asia central
 145=Asia occidental
@@ -1004,4 +1004,4 @@ ZW=Zimbabue
 151=Europa oriental
 154=Europa septentrional
 155=Europa occidental
-419=Latinoam\u00e9rica
+419=Latinoamérica
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es_US.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es_US.properties
index 06840e7d2ce..5a2f0330cbe 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es_US.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_es_US.properties
@@ -40,7 +40,7 @@
 
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
-gu=gurayat\u00ed
+gu=gurayatí
 ks=cachemiro
 nd=ndebele del norte
 se=sami del norte
@@ -49,5 +49,5 @@ st=sesoto
 sw=swahili
 tn=setchwana
 AN=Antillas Neerlandesas
-AX=Islas \u00c5land
+AX=Islas Åland
 EH=Sahara Occidental
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fi.properties
index 789f95eb7c1..68ede9b5ba1 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fi.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fi.properties
@@ -39,10 +39,10 @@
 # key is ISO 639 language code
 
 ar=arabia
-ba=ba\u0161kiiri
+ba=baškiiri
 bg=bulgaria
 ca=katalaani
-cs=t\u0161ekki
+cs=tšekki
 da=tanska
 de=saksa
 el=kreikka
@@ -61,7 +61,7 @@ nl=hollanti
 no=norja
 pl=puola
 pt=portugali
-ru=ven\u00e4j\u00e4
+ru=venäjä
 sv=ruotsi
 th=thai
 tr=turkki
@@ -75,7 +75,7 @@ BR=Brasilia
 CA=Kanada
 CH=Sveitsi
 CN=Kiina
-CZ=T\u0161ekki
+CZ=Tšekki
 DE=Saksa
 DK=Tanska
 ES=Espanja
@@ -86,12 +86,12 @@ GR=Kreikka
 IE=Irlanti
 IT=Italia
 JP=Japani
-KR=Etel\u00e4-Korea
+KR=Etelä-Korea
 NL=Alankomaat
 NO=Norja
 PL=Puola
 PT=Portugali
-RU=Ven\u00e4j\u00e4
+RU=Venäjä
 SE=Ruotsi
 TR=Turkki
 US=Yhdysvallat
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fr.properties
index 68b7e99da93..0caa9be2f6f 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fr.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_fr.properties
@@ -49,34 +49,34 @@ ar=arabe
 as=assamais
 av=avar
 ay=aymara
-az=azerba\u00efdjanais
+az=azerbaïdjanais
 ba=bachkir
-be=bi\u00e9lorusse
+be=biélorusse
 bg=bulgare
 bh=bihari
 bi=bichelamar
 bm=bambara
 bn=bengali
-bo=tib\u00e9tain
+bo=tibétain
 br=breton
 bs=bosniaque
 ca=catalan
-ce=tch\u00e9tch\u00e8ne
+ce=tchétchène
 ch=chamorro
 co=corse
 cr=cree
-cs=tch\u00e8que
-cu=slavon d\u2019\u00e9glise
+cs=tchèque
+cu=slavon d’église
 cv=tchouvache
 cy=gallois
 da=danois
 de=allemand
 dv=maldivien
 dz=dzongkha
-ee=\u00e9w\u00e9
+ee=éwé
 el=grec
 en=anglais
-eo=esp\u00e9ranto
+eo=espéranto
 es=espagnol
 et=estonien
 eu=basque
@@ -84,40 +84,40 @@ fa=persan
 ff=peul
 fi=finnois
 fj=fidjien
-fo=f\u00e9ro\u00efen
-fr=fran\u00e7ais
+fo=féroïen
+fr=français
 fy=frison occidental
 ga=irlandais
-gd=ga\u00e9lique \u00e9cossais
+gd=gaélique écossais
 gl=galicien
 gn=guarani
 gu=goudjarati
 gv=mannois
 ha=haoussa
-he=h\u00e9breu
+he=hébreu
 hi=hindi
 ho=hiri motu
 hr=croate
-ht=cr\u00e9ole ha\u00eftien
+ht=créole haïtien
 hu=hongrois
-hy=arm\u00e9nien
-hz=h\u00e9r\u00e9ro
+hy=arménien
+hz=héréro
 ia=interlingua
-id=indon\u00e9sien
+id=indonésien
 ie=interlingue
 ig=igbo
 ii=yi du Sichuan
 ik=inupiaq
-in=indon\u00e9sien
+in=indonésien
 io=ido
 is=islandais
 it=italien
 iu=inuktitut
-iw=h\u00e9breu
+iw=hébreu
 ja=japonais
 ji=yiddish
 jv=javanais
-ka=g\u00e9orgien
+ka=géorgien
 kg=kikongo
 ki=kikuyu
 kj=kuanyama
@@ -125,7 +125,7 @@ kk=kazakh
 kl=groenlandais
 km=khmer
 kn=kannada
-ko=cor\u00e9en
+ko=coréen
 kr=kanouri
 ks=cachemiri
 ku=kurde
@@ -144,7 +144,7 @@ lv=letton
 mg=malgache
 mh=marshallais
 mi=maori
-mk=mac\u00e9donien
+mk=macédonien
 ml=malayalam
 mn=mongol
 mo=moldave
@@ -153,21 +153,21 @@ ms=malais
 mt=maltais
 my=birman
 na=nauruan
-nb=norv\u00e9gien bokm\u00e5l
-nd=nd\u00e9b\u00e9l\u00e9 du Nord
-ne=n\u00e9palais
+nb=norvégien bokmål
+nd=ndébélé du Nord
+ne=népalais
 ng=ndonga
-nl=n\u00e9erlandais
-nn=norv\u00e9gien nynorsk
-no=norv\u00e9gien
-nr=nd\u00e9b\u00e9l\u00e9 du Sud
+nl=néerlandais
+nn=norvégien nynorsk
+no=norvégien
+nr=ndébélé du Sud
 nv=navajo
 ny=chewa
 oc=occitan
 oj=ojibwa
 om=oromo
 or=odia
-os=oss\u00e8te
+os=ossète
 pa=pendjabi
 pi=pali
 pl=polonais
@@ -186,7 +186,7 @@ se=same du Nord
 sg=sango
 si=cingalais
 sk=slovaque
-sl=slov\u00e8ne
+sl=slovène
 sm=samoan
 sn=shona
 so=somali
@@ -195,14 +195,14 @@ sr=serbe
 ss=swati
 st=sotho du Sud
 su=soundanais
-sv=su\u00e9dois
+sv=suédois
 sw=swahili
 ta=tamoul
-te=t\u00e9lougou
+te=télougou
 tg=tadjik
-th=tha\u00ef
+th=thaï
 ti=tigrigna
-tk=turkm\u00e8ne
+tk=turkmène
 tl=tagalog
 tn=tswana
 to=tongien
@@ -211,13 +211,13 @@ ts=tsonga
 tt=tatar
 tw=twi
 ty=tahitien
-ug=ou\u00efghour
+ug=ouïghour
 uk=ukrainien
 ur=ourdou
 uz=ouzbek
 ve=venda
 vi=vietnamien
-vo=volap\u00fck
+vo=volapük
 wa=wallon
 wo=wolof
 xh=xhosa
@@ -232,23 +232,23 @@ abk=Abkhaze
 ace=aceh
 ach=acoli
 ada=adangme
-ady=adygu\u00e9en
+ady=adyguéen
 afa=Afro-asiatique
 afh=afrihili
-ain=a\u00efnou
+ain=aïnou
 akk=akkadien
 alb=Albanais
-ale=al\u00e9oute
+ale=aléoute
 alg=Langue algonquienne
-alt=alta\u00ef du Sud
+alt=altaï du Sud
 amh=Amharique
 ang=ancien anglais
 anp=angika
 apa=Langue apache
 ara=Arabe
-arc=aram\u00e9en
+arc=araméen
 arg=Aragonais
-arm=Arm\u00e9nien
+arm=Arménien
 arn=mapuche
 arp=arapaho
 art=Langue artificielle
@@ -260,17 +260,17 @@ aus=Langue australienne
 ava=Avar
 ave=Avestique
 awa=awadhi
-aze=Az\u00e9ri
-bai=Langue bamil\u00e9k\u00e9e
+aze=Azéri
+bai=Langue bamilékée
 bak=Bachkir
 bal=baloutchi
 ban=balinais
 bas=bassa
 bat=Langue balte
 bej=bedja
-bel=Bi\u00e9lorusse
+bel=Biélorusse
 bem=bemba
-ber=Berb\u00e8re
+ber=Berbère
 bho=bhodjpouri
 bik=bikol
 bin=bini
@@ -285,14 +285,14 @@ bul=Bulgare
 bur=Birman
 byn=blin
 cad=caddo
-cai=Langue am\u00e9rindienne centrale
+cai=Langue amérindienne centrale
 car=caribe
 cau=Langue caucasienne
 ceb=cebuano
 cel=Langue celtique
 chb=chibcha
-che=Tch\u00e9tch\u00e8ne
-chg=tchaghata\u00ef
+che=Tchétchène
+chg=tchaghataï
 chi=Chinois
 chk=chuuk
 chm=mari
@@ -307,15 +307,15 @@ cmc=Langue chame
 cop=copte
 cor=Cornouaillais
 cos=Corse
-cpe=Cr\u00e9ole ou pidgin anglais
-cpf=Cr\u00e9ole ou pidgin fran\u00e7ais
-cpp=Cr\u00e9ole ou pidgin portugais
+cpe=Créole ou pidgin anglais
+cpf=Créole ou pidgin français
+cpp=Créole ou pidgin portugais
 cre=Cri
-crh=tatar de Crim\u00e9e
-crp=Cr\u00e9ole ou pidgin
+crh=tatar de Crimée
+crp=Créole ou pidgin
 csb=kachoube
 cus=Langue couchitique
-cze=Tch\u00e8que
+cze=Tchèque
 dak=dakota
 dan=Danois
 dar=dargwa
@@ -328,29 +328,29 @@ doi=dogri
 dra=Langue dravidienne
 dsb=bas-sorabe
 dua=douala
-dum=moyen n\u00e9erlandais
-dut=N\u00e9erlandais
+dum=moyen néerlandais
+dut=Néerlandais
 dyu=dioula
-efi=\u00e9fik
-egy=\u00e9gyptien ancien
-eka=\u00e9kadjouk
-elx=\u00e9lamite
+efi=éfik
+egy=égyptien ancien
+eka=ékadjouk
+elx=élamite
 eng=Anglais
 enm=moyen anglais
-epo=Esp\u00e9ranto
+epo=Espéranto
 est=Estonien
-ewo=\u00e9wondo
+ewo=éwondo
 fan=fang
-fao=F\u00e9ro\u00efen
+fao=Féroïen
 fat=fanti
 fij=Fidjien
 fil=filipino
 fin=Finnois
 fiu=Langue finno-ougrienne
 fon=fon
-fre=Fran\u00e7ais
-frm=moyen fran\u00e7ais
-fro=ancien fran\u00e7ais
+fre=Français
+frm=moyen français
+fro=ancien français
 frr=frison du Nord
 frs=frison oriental
 fry=Frison occidental
@@ -360,9 +360,9 @@ gaa=ga
 gay=gayo
 gba=gbaya
 gem=Langue germanique
-geo=G\u00e9orgien
+geo=Géorgien
 ger=Allemand
-gez=gu\u00e8ze
+gez=guèze
 gil=gilbertin
 gla=Gallois
 gle=Irlandais
@@ -378,12 +378,12 @@ grc=grec ancien
 gre=Grec, moderne (1453 -)
 gsw=suisse allemand
 guj=Goudjarati
-gwi=gwich\u02bcin
+gwi=gwichʼin
 hai=haida
-hat=Ha\u00eftien
+hat=Haïtien
 hau=Haoussa
-haw=hawa\u00efen
-heb=H\u00e9breu
+haw=hawaïen
+heb=Hébreu
 hil=hiligaynon
 hit=hittite
 hmn=hmong
@@ -396,8 +396,8 @@ ice=Islandais
 iii=Yi de Sichuan
 ilo=ilocano
 inc=Langue indo-aryenne
-ind=Indon\u00e9sien
-ine=Langue indo-europ\u00e9enne
+ind=Indonésien
+ine=Langue indo-européenne
 inh=ingouche
 ira=Langue iranienne
 iro=Langue iroquoienne
@@ -405,8 +405,8 @@ ita=Italien
 jav=Javanais
 jbo=lojban
 jpn=Japonais
-jpr=jud\u00e9o-persan
-jrb=jud\u00e9o-arabe
+jpr=judéo-persan
+jrb=judéo-arabe
 kaa=karakalpak
 kab=kabyle
 kac=kachin
@@ -415,18 +415,18 @@ kam=kamba
 kaw=kawi
 kbd=kabarde
 kha=khasi
-khi=Langue kho\u00efsan
+khi=Langue khoïsan
 khm=Khmer central
 kho=khotanais
 kir=Kirghize
 kmb=kimboundou
 kok=konkani
 kon=Kikongo
-kor=Cor\u00e9en
-kos=kosra\u00e9en
-kpe=kpell\u00e9
-krc=karatcha\u00ef balkar
-krl=car\u00e9lien
+kor=Coréen
+kos=kosraéen
+kpe=kpellé
+krc=karatchaï balkar
+krl=carélien
 kro=Krou
 kru=kouroukh
 kua=Kwanyama
@@ -443,29 +443,29 @@ lit=Lituanien
 lol=mongo
 loz=lozi
 ltz=Luxembourgeois
-lua=luba-kasa\u00ef (ciluba)
-lui=luise\u00f1o
+lua=luba-kasaï (ciluba)
+lui=luiseño
 lun=lunda
 luo=luo
-lus=lusha\u00ef
-mac=Mac\u00e9donien
+lus=lushaï
+mac=Macédonien
 mad=madurais
 mag=magahi
 mah=Marshallais
-mai=ma\u00efthili
+mai=maïthili
 mak=makassar
 man=mandingue
-map=Malayo-polyn\u00e9sien
-mas=maasa\u00ef
+map=Malayo-polynésien
+mas=maasaï
 may=Malais
 mdf=mokcha
 mdr=mandar
-men=mend\u00e9
+men=mendé
 mga=moyen irlandais
 mic=micmac
 min=minangkabau
-mis=Non cod\u00e9
-mkh=Langue mon-khm\u00e8re
+mis=Non codé
+mkh=Langue mon-khmère
 mlg=Malgache
 mlt=Maltais
 mnc=mandchou
@@ -473,41 +473,41 @@ mni=manipuri
 mno=Langue manobo
 moh=mohawk
 mon=Mongol
-mos=mor\u00e9
+mos=moré
 mul=multilingue
 mun=Langue mounda
 mus=creek
 mwl=mirandais
-mwr=marwar\u00ee
+mwr=marwarî
 myn=Langue maya
 myv=erzya
-nai=Langue am\u00e9rindienne du Nord
+nai=Langue amérindienne du Nord
 nap=napolitain
 nau=Nauruan
 nbl=Ndebele, Sud
 nde=Ndebele, nord
 nds=bas-allemand
-nep=N\u00e9palais
+nep=Népalais
 new=newari
 nia=niha
 nic=Niger-kordofanian
-niu=niu\u00e9en
-nno=Norv\u00e9gien nynorsk
-nob=Bokmal, Norv\u00e9gien
-nog=noga\u00ef
+niu=niuéen
+nno=Norvégien nynorsk
+nob=Bokmal, Norvégien
+nog=nogaï
 non=vieux norrois
-nor=Norv\u00e9gien
-nqo=n\u2019ko
+nor=Norvégien
+nqo=n’ko
 nso=sotho du Nord
 nub=Langue nubienne
-nwc=newar\u00ee classique
+nwc=newarî classique
 nym=nyamwezi
-nyn=nyankol\u00e9
+nyn=nyankolé
 nyo=nyoro
 nzi=nzema
-oci=Occitan (apr\u00e8s 1500)
+oci=Occitan (après 1500)
 osa=osage
-oss=Oss\u00e8te
+oss=Ossète
 ota=turc ottoman
 oto=Langue otomangue
 paa=Langue papoue
@@ -519,12 +519,12 @@ pau=palau
 peo=persan ancien
 per=Persan
 phi=Langue philippine
-phn=ph\u00e9nicien
+phn=phénicien
 pol=Polonais
 pon=pohnpei
 por=Portugais
-pra=Langues pr\u00e2krit
-pro=proven\u00e7al ancien
+pra=Langues prâkrit
+pro=provençal ancien
 pus=Pushto ; Pashto
 raj=rajasthani
 rap=rapanui
@@ -537,59 +537,59 @@ rup=aroumain
 rus=Russe
 sad=sandawe
 sah=iakoute
-sai=Langue am\u00e9rindienne du Sud
+sai=Langue amérindienne du Sud
 sal=Langue salishenne
-sam=aram\u00e9en samaritain
+sam=araméen samaritain
 san=Sanscrit
 sas=sasak
 sat=santali
 scn=sicilien
-sco=\u00e9cossais
+sco=écossais
 sel=selkoupe
-sem=Langue s\u00e9mitique
+sem=Langue sémitique
 sga=ancien irlandais
 sgn=Langue des signes
 shn=shan
 sid=sidamo
 sio=Langue sioux
-sit=Sino-tib\u00e9tain
+sit=Sino-tibétain
 sla=Langue slave
 slo=Slovaque
-slv=Slov\u00e8ne
+slv=Slovène
 sma=same du Sud
 sme=Sami du Nord
 smi=Langue samie
 smj=same de Lule
-smn=same d\u2019Inari
+smn=same d’Inari
 sms=same skolt
-snk=sonink\u00e9
+snk=soninké
 sog=sogdien
 sot=Sotho, sud
 spa=Espagnol
 srd=Sarde
 srn=sranan tongo
 srp=Serbe
-srr=s\u00e9r\u00e8re
+srr=sérère
 ssa=Langue nilo-saharienne
 suk=soukouma
 sun=Soundanais
 sus=soussou
-sux=sum\u00e9rien
-swa=Souah\u00e9li
-swe=Su\u00e9dois
+sux=sumérien
+swa=Souahéli
+swe=Suédois
 syc=syriaque classique
 syr=syriaque
 tah=Tahitien
-tai=Langue ta\u00ef
+tai=Langue taï
 tam=Tamoul
-tel=T\u00e9lougou
-tem=timn\u00e9
+tel=Télougou
+tem=timné
 ter=tereno
-tet=t\u00e9toum
+tet=tétoum
 tgk=Tadjik
-tha=Tha\u00ef
-tib=Tib\u00e9tain
-tig=tigr\u00e9
+tha=Thaï
+tib=Tibétain
+tig=tigré
 tir=Tigrigna
 tiv=tiv
 tkl=tokelau
@@ -600,22 +600,22 @@ tog=tonga nyasa
 ton=Tonga (Iles Tonga)
 tpi=tok pisin
 tsi=tsimshian
-tuk=Turkm\u00e8ne
+tuk=Turkmène
 tum=tumbuka
 tup=Langue tupi
 tur=Turc
-tut=Langue alta\u00efque
+tut=Langue altaïque
 tvl=tuvalu
 tyv=touvain
 udm=oudmourte
 uga=ougaritique
-uig=Ou\u00efgour
+uig=Ouïgour
 ukr=Ukrainien
 umb=umbundu
-und=langue ind\u00e9termin\u00e9e
+und=langue indéterminée
 urd=Ourdou
 uzb=Ouzbek
-vai=va\u00ef
+vai=vaï
 vie=Vietnamien
 vol=Volapuk
 vot=vote
@@ -630,11 +630,11 @@ xal=kalmouk
 yao=yao
 yap=yapois
 ypk=Langues yupik
-zap=zapot\u00e8que
+zap=zapotèque
 zbl=symboles Bliss
 zen=zenaga
 zul=Zoulou
-zun=zu\u00f1i
+zun=zuñi
 zxx=sans contenu linguistique
 zza=zazaki
 
@@ -642,8 +642,8 @@ zza=zazaki
 # key is ISO 15924 script code
 
 Arab=arabe
-Armi=aram\u00e9en imp\u00e9rial
-Armn=arm\u00e9nien
+Armi=araméen impérial
+Armn=arménien
 Avst=avestique
 Bali=balinais
 Bamu=Bamoun
@@ -651,12 +651,12 @@ Batk=batak
 Beng=bengali
 Blis=symboles Bliss
 Bopo=bopomofo
-Brah=br\u00e2hm\u00ee
+Brah=brâhmî
 Brai=braille
 Bugi=bouguis
 Buhd=bouhide
 Cakm=chakma
-Cans=syllabaire autochtone canadien unifi\u00e9
+Cans=syllabaire autochtone canadien unifié
 Cari=carien
 Cham=cham
 Cher=cherokee
@@ -665,26 +665,26 @@ Copt=copte
 Cprt=syllabaire chypriote
 Cyrl=cyrillique
 Cyrs=cyrillique (variante slavonne)
-Deva=d\u00e9vanagari
-Dsrt=d\u00e9s\u00e9ret
-Dupl=St\u00e9nographie Duploy\u00e9
-Egyd=d\u00e9motique \u00e9gyptien
-Egyh=hi\u00e9ratique \u00e9gyptien
-Egyp=hi\u00e9roglyphes \u00e9gyptiens
-Ethi=\u00e9thiopique
-Geok=g\u00e9orgien khoutsouri
-Geor=g\u00e9orgien
+Deva=dévanagari
+Dsrt=déséret
+Dupl=Sténographie Duployé
+Egyd=démotique égyptien
+Egyh=hiératique égyptien
+Egyp=hiéroglyphes égyptiens
+Ethi=éthiopique
+Geok=géorgien khoutsouri
+Geor=géorgien
 Glag=glagolitique
 Goth=gotique
 Grek=grec
-Gujr=goudjar\u00e2t\u00ee
-Guru=gourmoukh\u00ee
-Hang=hang\u00fbl
+Gujr=goudjarâtî
+Guru=gourmoukhî
+Hang=hangûl
 Hani=sinogrammes
-Hano=hanoun\u00f3o
-Hans=simplifi\u00e9
+Hano=hanounóo
+Hans=simplifié
 Hant=traditionnel
-Hebr=h\u00e9breu
+Hebr=hébreu
 Hira=hiragana
 Hmng=pahawh hmong
 Hrkt=katakana ou hiragana
@@ -695,51 +695,51 @@ Java=javanais
 Jpan=japonais
 Kali=kayah li
 Kana=katakana
-Khar=kharochth\u00ee
+Khar=kharochthî
 Khmr=khmer
 Knda=kannara
-Kore=cor\u00e9en
-Kthi=kaith\u00ee
+Kore=coréen
+Kthi=kaithî
 Lana=lanna
 Laoo=lao
-Latf=latin (variante bris\u00e9e)
-Latg=latin (variante ga\u00e9lique)
+Latf=latin (variante brisée)
+Latg=latin (variante gaélique)
 Latn=latin
 Lepc=lepcha
 Limb=limbou
-Lina=lin\u00e9aire A
-Linb=lin\u00e9aire B
+Lina=linéaire A
+Linb=linéaire B
 Lisu=Lisu
 Lyci=lycien
 Lydi=lydien
-Mand=mand\u00e9en
-Mani=manich\u00e9en
-Maya=hi\u00e9roglyphes mayas
-Mend=Mend\u00e9
-Merc=Cursive m\u00e9ro\u00eftique
-Mero=m\u00e9ro\u00eftique
+Mand=mandéen
+Mani=manichéen
+Maya=hiéroglyphes mayas
+Mend=Mendé
+Merc=Cursive méroïtique
+Mero=méroïtique
 Mlym=malayalam
 Mong=mongol
 Moon=moon
 Mtei=meitei mayek
 Mymr=birman
 Narb=Arabe ancien du Nord
-Nbat=Nabat\u00e9en
+Nbat=Nabatéen
 Nkgb=Nakhi Geba
-Nkoo=n\u2019ko
+Nkoo=n’ko
 Ogam=ogam
 Olck=ol tchiki
 Orkh=orkhon
 Orya=odia
 Osma=osmanais
-Palm=Palmyr\u00e9en
+Palm=Palmyréen
 Perm=ancien permien
 Phag=phags pa
 Phli=pehlevi des inscriptions
 Phlp=pehlevi des psautiers
 Phlv=pehlevi des livres
-Phnx=ph\u00e9nicien
-Plrd=phon\u00e9tique de Pollard
+Phnx=phénicien
+Plrd=phonétique de Pollard
 Prti=parthe des inscriptions
 Rjng=rejang
 Roro=rongorongo
@@ -748,137 +748,137 @@ Samr=samaritain
 Sara=sarati
 Sarb=Arabe ancien du Sud
 Saur=saurashtra
-Sgnw=\u00e9criture des signes
+Sgnw=écriture des signes
 Shaw=shavien
 Sind=Sindhi
 Sinh=cingalais
 Sund=sundanais
-Sylo=sylot\u00ee n\u00e2gr\u00ee
+Sylo=sylotî nâgrî
 Syrc=syriaque
-Syre=syriaque estrangh\u00e9lo
+Syre=syriaque estranghélo
 Syrj=syriaque occidental
 Syrn=syriaque oriental
 Tagb=tagbanoua
-Tale=ta\u00ef-le
-Talu=nouveau ta\u00ef-lue
+Tale=taï-le
+Talu=nouveau taï-lue
 Taml=tamoul
-Tavt=ta\u00ef vi\u00eat
-Telu=t\u00e9lougou
+Tavt=taï viêt
+Telu=télougou
 Teng=tengwar
 Tfng=tifinagh
 Tglg=tagal
-Thaa=th\u00e2na
-Thai=tha\u00ef
-Tibt=tib\u00e9tain
+Thaa=thâna
+Thai=thaï
+Tibt=tibétain
 Ugar=ougaritique
-Vaii=va\u00ef
+Vaii=vaï
 Visp=parole visible
 Wara=Warang Citi
-Xpeo=cun\u00e9iforme pers\u00e9politain
-Xsux=cun\u00e9iforme sum\u00e9ro-akkadien
+Xpeo=cunéiforme persépolitain
+Xsux=cunéiforme suméro-akkadien
 Yiii=yi
-Zinh=h\u00e9rit\u00e9
-Zmth=notation math\u00e9matique
+Zinh=hérité
+Zmth=notation mathématique
 Zsym=symboles
-Zxxx=non \u00e9crit
+Zxxx=non écrit
 Zyyy=commun
-Zzzz=\u00e9criture inconnue
+Zzzz=écriture inconnue
 
 # country names
 # key is ISO 3166 country code
 
 AD=Andorre
-AE=\u00c9mirats arabes unis
+AE=Émirats arabes unis
 AG=Antigua-et-Barbuda
 AL=Albanie
-AM=Arm\u00e9nie
-AN=Antilles N\u00e9erlandaises
+AM=Arménie
+AN=Antilles Néerlandaises
 AQ=Antarctique
 AR=Argentine
-AS=Samoa am\u00e9ricaines
+AS=Samoa américaines
 AT=Autriche
 AU=Australie
-AX=\u00celes \u00c5land
-AZ=Azerba\u00efdjan
-BA=Bosnie-Herz\u00e9govine
+AX=Îles Åland
+AZ=Azerbaïdjan
+BA=Bosnie-Herzégovine
 BB=Barbade
 BE=Belgique
 BG=Bulgarie
-BH=Bahre\u00efn
-BJ=B\u00e9nin
+BH=Bahreïn
+BJ=Bénin
 BM=Bermudes
 BO=Bolivie
-BR=Br\u00e9sil
+BR=Brésil
 BT=Bhoutan
-BV=\u00cele Bouvet
-BY=Bi\u00e9lorussie
-CC=\u00celes Cocos
+BV=Île Bouvet
+BY=Biélorussie
+CC=Îles Cocos
 CD=Congo-Kinshasa
-CF=R\u00e9publique centrafricaine
+CF=République centrafricaine
 CG=Congo-Brazzaville
 CH=Suisse
-CK=\u00celes Cook
+CK=Îles Cook
 CL=Chili
 CM=Cameroun
 CN=Chine
 CO=Colombie
-CS=Serbie et Mont\u00e9n\u00e9gro
+CS=Serbie et Monténégro
 CV=Cap-Vert
-CX=\u00cele Christmas
+CX=Île Christmas
 CY=Chypre
-CZ=Tch\u00e9quie
+CZ=Tchéquie
 DE=Allemagne
 DK=Danemark
 DM=Dominique
-DO=R\u00e9publique dominicaine
-DZ=Alg\u00e9rie
-EC=\u00c9quateur
+DO=République dominicaine
+DZ=Algérie
+EC=Équateur
 EE=Estonie
-EG=\u00c9gypte
+EG=Égypte
 EH=Sahara occidental
-ER=\u00c9rythr\u00e9e
+ER=Érythrée
 ES=Espagne
-ET=\u00c9thiopie
+ET=Éthiopie
 FI=Finlande
 FJ=Fidji
-FK=\u00celes Malouines
-FM=Micron\u00e9sie
-FO=\u00celes F\u00e9ro\u00e9
+FK=Îles Malouines
+FM=Micronésie
+FO=Îles Féroé
 GB=Royaume-Uni
 GD=Grenade
-GE=G\u00e9orgie
-GF=Guyane fran\u00e7aise
+GE=Géorgie
+GF=Guyane française
 GL=Groenland
 GM=Gambie
-GN=Guin\u00e9e
-GQ=Guin\u00e9e \u00e9quatoriale
-GR=Gr\u00e8ce
-GS=G\u00e9orgie du Sud-et-les \u00celes Sandwich du Sud
-GW=Guin\u00e9e-Bissau
+GN=Guinée
+GQ=Guinée équatoriale
+GR=Grèce
+GS=Géorgie du Sud-et-les Îles Sandwich du Sud
+GW=Guinée-Bissau
 HK=R.A.S. chinoise de Hong Kong
-HM=\u00celes Heard-et-MacDonald
+HM=Îles Heard-et-MacDonald
 HR=Croatie
-HT=Ha\u00efti
+HT=Haïti
 HU=Hongrie
-ID=Indon\u00e9sie
+ID=Indonésie
 IE=Irlande
-IL=Isra\u00ebl
+IL=Israël
 IN=Inde
-IO=Territoire britannique de l\u2019oc\u00e9an Indien
+IO=Territoire britannique de l’océan Indien
 IQ=Irak
 IS=Islande
 IT=Italie
-JM=Jama\u00efque
+JM=Jamaïque
 JO=Jordanie
 JP=Japon
 KG=Kirghizstan
 KH=Cambodge
 KM=Comores
-KN=Saint-Christophe-et-Ni\u00e9v\u00e8s
-KP=Cor\u00e9e du Nord
-KR=Cor\u00e9e du Sud
-KW=Kowe\u00eft
-KY=\u00celes Ca\u00efmans
+KN=Saint-Christophe-et-Niévès
+KP=Corée du Nord
+KR=Corée du Sud
+KW=Koweït
+KY=Îles Caïmans
 LB=Liban
 LC=Sainte-Lucie
 LT=Lituanie
@@ -886,76 +886,76 @@ LV=Lettonie
 LY=Libye
 MA=Maroc
 MD=Moldavie
-ME=Mont\u00e9n\u00e9gro
-MH=\u00celes Marshall
-MK=Mac\u00e9doine du Nord
+ME=Monténégro
+MH=Îles Marshall
+MK=Macédoine du Nord
 MM=Myanmar (Birmanie)
 MN=Mongolie
 MO=R.A.S. chinoise de Macao
-MP=\u00celes Mariannes du Nord
+MP=Îles Mariannes du Nord
 MR=Mauritanie
 MT=Malte
 MU=Maurice
 MX=Mexique
 MY=Malaisie
 NA=Namibie
-NC=Nouvelle-Cal\u00e9donie
-NF=\u00cele Norfolk
+NC=Nouvelle-Calédonie
+NF=Île Norfolk
 NL=Pays-Bas
-NO=Norv\u00e8ge
-NP=N\u00e9pal
-NZ=Nouvelle-Z\u00e9lande
-PE=P\u00e9rou
-PF=Polyn\u00e9sie fran\u00e7aise
-PG=Papouasie-Nouvelle-Guin\u00e9e
+NO=Norvège
+NP=Népal
+NZ=Nouvelle-Zélande
+PE=Pérou
+PF=Polynésie française
+PG=Papouasie-Nouvelle-Guinée
 PL=Pologne
 PM=Saint-Pierre-et-Miquelon
-PN=\u00celes Pitcairn
+PN=Îles Pitcairn
 PR=Porto Rico
 PS=Territoires palestiniens
 PW=Palaos
-RE=La R\u00e9union
+RE=La Réunion
 RO=Roumanie
 RS=Serbie
 RU=Russie
 SA=Arabie saoudite
-SB=\u00celes Salomon
+SB=Îles Salomon
 SD=Soudan
-SE=Su\u00e8de
+SE=Suède
 SG=Singapour
-SH=Sainte-H\u00e9l\u00e8ne
-SI=Slov\u00e9nie
+SH=Sainte-Hélène
+SI=Slovénie
 SJ=Svalbard et Jan Mayen
 SK=Slovaquie
 SM=Saint-Marin
-SN=S\u00e9n\u00e9gal
+SN=Sénégal
 SO=Somalie
-ST=Sao Tom\u00e9-et-Principe
+ST=Sao Tomé-et-Principe
 SV=Salvador
 SY=Syrie
-TC=\u00celes Turques-et-Ca\u00efques
+TC=Îles Turques-et-Caïques
 TD=Tchad
-TF=Terres australes fran\u00e7aises
-TH=Tha\u00eflande
+TF=Terres australes françaises
+TH=Thaïlande
 TJ=Tadjikistan
 TL=Timor oriental
-TM=Turkm\u00e9nistan
+TM=Turkménistan
 TN=Tunisie
 TR=Turquie
-TT=Trinit\u00e9-et-Tobago
-TW=Ta\u00efwan
+TT=Trinité-et-Tobago
+TW=Taïwan
 TZ=Tanzanie
 UG=Ouganda
-UM=\u00celes mineures \u00e9loign\u00e9es des \u00c9tats-Unis
-US=\u00c9tats-Unis
-UZ=Ouzb\u00e9kistan
-VA=\u00c9tat de la Cit\u00e9 du Vatican
+UM=Îles mineures éloignées des États-Unis
+US=États-Unis
+UZ=Ouzbékistan
+VA=État de la Cité du Vatican
 VC=Saint-Vincent-et-les Grenadines
-VG=\u00celes Vierges britanniques
-VI=\u00celes Vierges des \u00c9tats-Unis
-VN=Vi\u00eat Nam
+VG=Îles Vierges britanniques
+VI=Îles Vierges des États-Unis
+VN=Viêt Nam
 WF=Wallis-et-Futuna
-YE=Y\u00e9men
+YE=Yémen
 ZA=Afrique du Sud
 ZM=Zambie
 
@@ -964,30 +964,30 @@ ZM=Zambie
 
 001=Monde
 002=Afrique
-003=Am\u00e9rique du Nord
-005=Am\u00e9rique du Sud
-009=Oc\u00e9anie
+003=Amérique du Nord
+005=Amérique du Sud
+009=Océanie
 011=Afrique occidentale
-013=Am\u00e9rique centrale
+013=Amérique centrale
 014=Afrique orientale
 015=Afrique septentrionale
 017=Afrique centrale
 018=Afrique australe
-019=Am\u00e9riques
-021=Am\u00e9rique septentrionale
-029=Cara\u00efbes
-030=Asie de l\u2019Est
+019=Amériques
+021=Amérique septentrionale
+029=Caraïbes
+030=Asie de l’Est
 034=Asie du Sud
 035=Asie du Sud-Est
 039=Europe du Sud
 053=Australasie
-054=M\u00e9lan\u00e9sie
-057=r\u00e9gion micron\u00e9sienne
-061=Polyn\u00e9sie
+054=Mélanésie
+057=région micronésienne
+061=Polynésie
 142=Asie
 143=Asie centrale
-145=Asie de l\u2019Ouest
-151=Europe de l\u2019Est
+145=Asie de l’Ouest
+151=Europe de l’Est
 154=Europe du Nord
-155=Europe de l\u2019Ouest
-419=Am\u00e9rique latine
+155=Europe de l’Ouest
+419=Amérique latine
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ga.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ga.properties
index 1e76a2fff2f..1f618289ecc 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ga.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ga.properties
@@ -40,336 +40,336 @@
 
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
-ab=Abc\u00e1isis
-ae=Aiv\u00e9istis
-af=Afrac\u00e1inis
+ab=Abcáisis
+ae=Aivéistis
+af=Afracáinis
 ar=Araibis
 as=Asaimis
-az=Asarbaise\u00e1inis
-ba=Baisc\u00edris
-be=Bealar\u00faisis
-bg=Bulg\u00e1iris
-bn=Beang\u00e1ilis
-bo=Tib\u00e9idis
-br=Briot\u00e1inis
+az=Asarbaiseáinis
+ba=Baiscíris
+be=Bealarúisis
+bg=Bulgáiris
+bn=Beangáilis
+bo=Tibéidis
+br=Briotáinis
 bs=Boisnis
-ca=Catal\u00f3inis
+ca=Catalóinis
 ce=Seisnis
 co=Corsaicis
-cr=Cra\u00eds
+cr=Craís
 cs=Seicis
 cu=Slavais na hEaglaise
 cv=Suvaisis
 cy=Breatnais
 da=Danmhairgis
-de=Gearm\u00e1inis
-el=Gr\u00e9igis
-en=B\u00e9arla
-es=Sp\u00e1innis
-et=East\u00f3inis
+de=Gearmáinis
+el=Gréigis
+en=Béarla
+es=Spáinnis
+et=Eastóinis
 eu=Bascais
 fa=Peirsis
 fi=Fionlainnis
 fj=Fidsis
-fo=Far\u00f3is
+fo=Faróis
 fr=Fraincis
 fy=Freaslainnis Iartharach
 ga=Gaeilge
 gd=Gaeilge na hAlban
-gu=G\u00faisear\u00e1itis
+gu=Gúisearáitis
 gv=Manainnis
 he=Eabhrais
-hi=Hiond\u00fais
-hr=Cr\u00f3itis
-hu=Ung\u00e1iris
-hy=Airm\u00e9inis
-id=Indin\u00e9isis
-in=Indin\u00e9isis
-is=\u00cdoslainnis
-it=Iod\u00e1ilis
-iu=Ion\u00faitis
+hi=Hiondúis
+hr=Cróitis
+hu=Ungáiris
+hy=Airméinis
+id=Indinéisis
+in=Indinéisis
+is=Íoslainnis
+it=Iodáilis
+iu=Ionúitis
 iw=Eabhrais
-ja=Seap\u00e1inis
-ji=Gi\u00fadais
-jv=I\u00e1ivis
+ja=Seapáinis
+ji=Giúdais
+jv=Iáivis
 ka=Seoirsis
 kk=Casaicis
 kn=Cannadais
-ko=C\u00f3ir\u00e9is
-ks=Caism\u00edris
+ko=Cóiréis
+ks=Caismíris
 kw=Coirnis
 ky=Cirgisis
 la=Laidin
 lb=Lucsambuirgis
 lo=Laoisis
-lt=Liotu\u00e1inis
+lt=Liotuáinis
 lv=Laitvis
-mg=Malag\u00e1isis
+mg=Malagáisis
 mi=Maorais
-mk=Macad\u00f3inis
-ml=Mail\u00e9alaimis
-mn=Mong\u00f3ilis
-mo=Mold\u00e1ivis
+mk=Macadóinis
+ml=Mailéalaimis
+mn=Mongóilis
+mo=Moldáivis
 mr=Maraitis
-mt=M\u00e1ltais
+mt=Máltais
 my=Burmais
-na=N\u00e1r\u00fais
-nb=Bocm\u00e1l
+na=Nárúis
+nb=Bocmál
 ne=Neipeailis
 nl=Ollainnis
 nn=Nua-Ioruais
 no=Ioruais
-nv=Navach\u00f3is
-oc=Ocsat\u00e1inis
-os=Ois\u00e9itis
-pa=Puinse\u00e1ibis
+nv=Navachóis
+oc=Ocsatáinis
+os=Oiséitis
+pa=Puinseáibis
 pl=Polainnis
 ps=Paistis
-pt=Portaing\u00e9ilis
+pt=Portaingéilis
 qu=Ceatsuais
-ro=R\u00f3m\u00e1inis
-ru=R\u00faisis
+ro=Rómáinis
+ru=Rúisis
 sa=Sanscrait
-sc=Saird\u00ednis
+sc=Sairdínis
 sd=Sindis
-se=S\u00e1imis an Tuaiscirt
-sk=Sl\u00f3vaicis
-sl=Sl\u00f3iv\u00e9inis
-sm=Sam\u00f3is
-so=Som\u00e1ilis
-sq=Alb\u00e1inis
+se=Sáimis an Tuaiscirt
+sk=Slóvaicis
+sl=Slóivéinis
+sm=Samóis
+so=Somáilis
+sq=Albáinis
 sr=Seirbis
 sv=Sualainnis
-sw=Svaha\u00edlis
+sw=Svahaílis
 ta=Tamailis
-th=T\u00e9alainnis
-tl=Tag\u00e1laigis
+th=Téalainnis
+tl=Tagálaigis
 tr=Tuircis
 tt=Tatairis
-ty=Taih\u00edtis
-uk=\u00dacr\u00e1inis
-ur=Urd\u00fais
-uz=\u00daisb\u00e9iceast\u00e1inis
-vi=V\u00edtneaimis
-wa=Vall\u00fanais
-yi=Gi\u00fadais
-zh=S\u00ednis
-zu=S\u00fal\u00fais
-AD=And\u00f3ra
-AE=Aontas na n\u00c9im\u00edr\u00edochta\u00ed Arabacha
-AF=an Afganast\u00e1in
-AG=Antigua agus Barb\u00fada
-AL=an Alb\u00e1in
-AM=an Airm\u00e9in
-AN=Antill\u00ed na h\u00cdsilt\u00edre
-AO=Ang\u00f3la
+ty=Taihítis
+uk=Úcráinis
+ur=Urdúis
+uz=Úisbéiceastáinis
+vi=Vítneaimis
+wa=Vallúnais
+yi=Giúdais
+zh=Sínis
+zu=Súlúis
+AD=Andóra
+AE=Aontas na nÉimíríochtaí Arabacha
+AF=an Afganastáin
+AG=Antigua agus Barbúda
+AL=an Albáin
+AM=an Airméin
+AN=Antillí na hÍsiltíre
+AO=Angóla
 AQ=Antartaice
-AR=an Airgint\u00edn
-AS=Sam\u00f3 Mheirice\u00e1
+AR=an Airgintín
+AS=Samó Mheiriceá
 AT=an Ostair
-AU=an Astr\u00e1il
-AZ=an Asarbaise\u00e1in
-BA=an Bhoisnia agus an Heirseagaiv\u00e9in
-BB=Barbad\u00f3s
-BD=an Bhanglaid\u00e9is
+AU=an Astráil
+AZ=an Asarbaiseáin
+BA=an Bhoisnia agus an Heirseagaivéin
+BB=Barbadós
+BD=an Bhanglaidéis
 BE=an Bheilg
-BF=Buirc\u00edne Fas\u00f3
-BG=an Bhulg\u00e1ir
-BH=Bair\u00e9in
-BI=an Bhur\u00fain
+BF=Buircíne Fasó
+BG=an Bhulgáir
+BH=Bairéin
+BI=an Bhurúin
 BJ=Beinin
-BM=Beirmi\u00fada
-BN=Br\u00fain\u00e9
+BM=Beirmiúda
+BN=Brúiné
 BO=an Bholaiv
-BR=an Bhrasa\u00edl
-BS=na Bah\u00e1ma\u00ed
-BT=an Bh\u00fat\u00e1in
-BV=Oile\u00e1n Bouvet
-BW=an Bhotsu\u00e1in
-BY=an Bhealar\u00fais
-BZ=an Bheil\u00eds
+BR=an Bhrasaíl
+BS=na Bahámaí
+BT=an Bhútáin
+BV=Oileán Bouvet
+BW=an Bhotsuáin
+BY=an Bhealarúis
+BZ=an Bheilís
 CA=Ceanada
-CC=Oile\u00e1in Cocos (Keeling)
-CD=Poblacht Dhaonlathach an Chong\u00f3
-CF=Poblacht na hAfraice L\u00e1ir
-CG=Cong\u00f3-Brazzaville
-CH=an Eilv\u00e9is
-CI=an C\u00f3sta Eabhair
-CK=Oile\u00e1in Cook
+CC=Oileáin Cocos (Keeling)
+CD=Poblacht Dhaonlathach an Chongó
+CF=Poblacht na hAfraice Láir
+CG=Congó-Brazzaville
+CH=an Eilvéis
+CI=an Cósta Eabhair
+CK=Oileáin Cook
 CL=an tSile
-CM=Camar\u00fan
-CN=an tS\u00edn
-CO=an Chol\u00f3im
-CR=C\u00f3sta R\u00edce
-CU=C\u00faba
+CM=Camarún
+CN=an tSín
+CO=an Cholóim
+CR=Cósta Ríce
+CU=Cúba
 CV=Rinn Verde
-CX=Oile\u00e1n na Nollag
+CX=Oileán na Nollag
 CY=an Chipir
 CZ=an tSeicia
-DE=an Ghearm\u00e1in
+DE=an Ghearmáin
 DK=an Danmhairg
 DM=Doiminice
 DO=an Phoblacht Dhoiminiceach
-DZ=an Ailg\u00e9ir
-EC=Eacuad\u00f3r
-EE=an East\u00f3in
-EG=an \u00c9igipt
-EH=an Sah\u00e1ra Thiar
-ES=an Sp\u00e1inn
-ET=an Aet\u00f3ip
+DZ=an Ailgéir
+EC=Eacuadór
+EE=an Eastóin
+EG=an Éigipt
+EH=an Sahára Thiar
+ES=an Spáinn
+ET=an Aetóip
 FI=an Fhionlainn
-FJ=Fids\u00ed
-FK=Oile\u00e1in Fh\u00e1clainne
-FM=an Mhicrin\u00e9is
-FO=Oile\u00e1in Fhar\u00f3
+FJ=Fidsí
+FK=Oileáin Fháclainne
+FM=an Mhicrinéis
+FO=Oileáin Fharó
 FR=an Fhrainc
-GA=an Ghab\u00fain
-GB=an R\u00edocht Aontaithe
+GA=an Ghabúin
+GB=an Ríocht Aontaithe
 GE=an tSeoirsia
-GF=Gu\u00e1in na Fraince
-GH=G\u00e1na
-GI=Giobr\u00e1ltar
+GF=Guáin na Fraince
+GH=Gána
+GI=Giobráltar
 GL=an Ghraonlainn
 GM=an Ghaimbia
 GN=an Ghuine
-GP=Guadal\u00faip
-GQ=an Ghuine Mhe\u00e1nchiorclach
-GR=an Ghr\u00e9ig
-GS=an tSeoirsia Theas agus Oile\u00e1in Sandwich Theas
+GP=Guadalúip
+GQ=an Ghuine Mheánchiorclach
+GR=an Ghréig
+GS=an tSeoirsia Theas agus Oileáin Sandwich Theas
 GT=Guatamala
 GW=Guine Bissau
-GY=an Ghu\u00e1in
-HM=Oile\u00e1n Heard agus Oile\u00e1in McDonald
-HN=Hond\u00faras
-HR=an Chr\u00f3it
-HT=H\u00e1\u00edt\u00ed
-HU=an Ung\u00e1ir
-ID=an Indin\u00e9is
-IE=\u00c9ire
+GY=an Ghuáin
+HM=Oileán Heard agus Oileáin McDonald
+HN=Hondúras
+HR=an Chróit
+HT=Háítí
+HU=an Ungáir
+ID=an Indinéis
+IE=Éire
 IL=Iosrael
 IN=an India
-IO=Cr\u00edoch Aig\u00e9an Indiach na Breataine
-IQ=an Iar\u00e1ic
-IR=an Iar\u00e1in
-IS=an \u00cdoslainn
-IT=an Iod\u00e1il
-JM=Iam\u00e1ice
-JO=an Iord\u00e1in
-JP=an tSeap\u00e1in
-KE=an Ch\u00e9inia
-KG=an Chirgeast\u00e1in
-KH=an Chamb\u00f3id
+IO=Críoch Aigéan Indiach na Breataine
+IQ=an Iaráic
+IR=an Iaráin
+IS=an Íoslainn
+IT=an Iodáil
+JM=Iamáice
+JO=an Iordáin
+JP=an tSeapáin
+KE=an Chéinia
+KG=an Chirgeastáin
+KH=an Chambóid
 KI=Ciribeas
-KM=Oile\u00e1in Chom\u00f3ra
-KN=San Cr\u00edost\u00f3ir-Nimheas
-KP=an Ch\u00f3ir\u00e9 Thuaidh
-KR=an Ch\u00f3ir\u00e9 Theas
-KW=Cu\u00e1it
-KY=Oile\u00e1in Cayman
-KZ=an Chasacst\u00e1in
-LB=an Liob\u00e1in
-LI=Lichtinst\u00e9in
-LK=Sr\u00ed Lanca
-LR=an Lib\u00e9ir
-LS=Leos\u00f3ta
-LT=an Liotu\u00e1in
+KM=Oileáin Chomóra
+KN=San Críostóir-Nimheas
+KP=an Chóiré Thuaidh
+KR=an Chóiré Theas
+KW=Cuáit
+KY=Oileáin Cayman
+KZ=an Chasacstáin
+LB=an Liobáin
+LI=Lichtinstéin
+LK=Srí Lanca
+LR=an Libéir
+LS=Leosóta
+LT=an Liotuáin
 LU=Lucsamburg
 LV=an Laitvia
 LY=an Libia
-MA=Marac\u00f3
-MC=Monac\u00f3
-MD=an Mhold\u00f3iv
-MH=Oile\u00e1in Marshall
-MK=an Mhacad\u00f3in Thuaidh
-ML=Mail\u00ed
+MA=Maracó
+MC=Monacó
+MD=an Mholdóiv
+MH=Oileáin Marshall
+MK=an Mhacadóin Thuaidh
+ML=Mailí
 MM=Maenmar (Burma)
-MN=an Mhong\u00f3il
-MP=na hOile\u00e1in Mh\u00e1irianacha Thuaidh
-MR=an Mh\u00e1rat\u00e1in
+MN=an Mhongóil
+MP=na hOileáin Mháirianacha Thuaidh
+MR=an Mháratáin
 MS=Montsarat
-MT=M\u00e1lta
-MU=Oile\u00e1n Mhuir\u00eds
-MV=Oile\u00e1in Mhaild\u00edve
-MW=an Mhal\u00e1iv
+MT=Málta
+MU=Oileán Mhuirís
+MV=Oileáin Mhaildíve
+MW=an Mhaláiv
 MX=Meicsiceo
 MY=an Mhalaeisia
-MZ=M\u00f3saimb\u00edc
+MZ=Mósaimbíc
 NA=an Namaib
-NC=an Nua-Chalad\u00f3in
-NE=an N\u00edgir
-NF=Oile\u00e1n Norfolk
-NG=an Nig\u00e9ir
+NC=an Nua-Chaladóin
+NE=an Nígir
+NF=Oileán Norfolk
+NG=an Nigéir
 NI=Nicearagua
-NL=an \u00cdsilt\u00edr
+NL=an Ísiltír
 NO=an Iorua
 NP=Neipeal
-NR=N\u00e1r\u00fa
-NZ=an Nua-Sh\u00e9alainn
-PE=Peiri\u00fa
-PF=Polain\u00e9is na Fraince
+NR=Nárú
+NZ=an Nua-Shéalainn
+PE=Peiriú
+PF=Polainéis na Fraince
 PG=Nua-Ghuine Phapua
-PH=na hOile\u00e1in Fhilip\u00edneacha
-PK=an Phacast\u00e1in
+PH=na hOileáin Fhilipíneacha
+PK=an Phacastáin
 PL=an Pholainn
 PM=San Pierre agus Miquelon
-PR=P\u00f3rt\u00f3 R\u00edce
-PS=na Cr\u00edocha Palaist\u00edneacha
-PT=an Phortaing\u00e9il
+PR=Pórtó Ríce
+PS=na Críocha Palaistíneacha
+PT=an Phortaingéil
 PY=Paragua
 QA=Catar
-RE=La R\u00e9union
-RO=an R\u00f3m\u00e1in
-RU=an R\u00fais
+RE=La Réunion
+RO=an Rómáin
+RU=an Rúis
 RW=Ruanda
-SA=an Araib Sh\u00e1dach
-SB=Oile\u00e1in Sholaimh
-SC=na S\u00e9is\u00e9il
-SD=an tS\u00fad\u00e1in
+SA=an Araib Shádach
+SB=Oileáin Sholaimh
+SC=na Séiséil
+SD=an tSúdáin
 SE=an tSualainn
-SG=Singeap\u00f3r
-SH=San H\u00e9ilin
-SI=an tSl\u00f3iv\u00e9in
+SG=Singeapór
+SH=San Héilin
+SI=an tSlóivéin
 SJ=Svalbard agus Jan Mayen
-SK=an tSl\u00f3vaic
+SK=an tSlóvaic
 SL=Siarra Leon
-SM=San Mair\u00edne
-SN=an tSeineag\u00e1il
-SO=an tSom\u00e1il
+SM=San Mairíne
+SN=an tSeineagáil
+SO=an tSomáil
 SR=Suranam
-ST=S\u00e3o Tom\u00e9 agus Pr\u00edncipe
-SV=an tSalvad\u00f3ir
+ST=São Tomé agus Príncipe
+SV=an tSalvadóir
 SY=an tSiria
-SZ=eSuait\u00edn\u00ed
-TC=Oile\u00e1in na dTurcach agus Caicos
+SZ=eSuaitíní
+TC=Oileáin na dTurcach agus Caicos
 TD=Sead
-TF=Cr\u00edocha Francacha Dheisceart an Domhain
-TG=T\u00f3ga
-TH=an T\u00e9alainn
-TJ=an T\u00e1ids\u00edceast\u00e1in
-TK=T\u00f3cal\u00e1
-TL=T\u00edom\u00f3r Thoir
-TM=an Tuircm\u00e9anast\u00e1in
-TN=an T\u00fain\u00e9is
+TF=Críocha Francacha Dheisceart an Domhain
+TG=Tóga
+TH=an Téalainn
+TJ=an Táidsíceastáin
+TK=Tócalá
+TL=Tíomór Thoir
+TM=an Tuircméanastáin
+TN=an Túinéis
 TR=an Tuirc
-TT=Oile\u00e1n na Tr\u00edon\u00f3ide agus Tob\u00e1ga
-TV=T\u00faval\u00fa
-TW=an T\u00e9av\u00e1in
-TZ=an Tans\u00e1in
-UA=an \u00dacr\u00e1in
-UM=Oile\u00e1in Imeallacha S.A.M.
-US=St\u00e1it Aontaithe Mheirice\u00e1
+TT=Oileán na Tríonóide agus Tobága
+TV=Túvalú
+TW=an Téaváin
+TZ=an Tansáin
+UA=an Úcráin
+UM=Oileáin Imeallacha S.A.M.
+US=Stáit Aontaithe Mheiriceá
 UY=Uragua
-UZ=an \u00daisb\u00e9iceast\u00e1in
-VA=Cathair na Vatac\u00e1ine
-VC=San Uinseann agus na Grean\u00e1id\u00edn\u00ed
-VE=Veinis\u00e9ala
-VG=Oile\u00e1in Bhriotanacha na Maighdean
-VI=Oile\u00e1in Mheirice\u00e1nacha na Maighdean
-VN=V\u00edtneam
-VU=Vanuat\u00fa
-WF=Vail\u00eds agus Fut\u00fana
-WS=Sam\u00f3
-YE=\u00c9imin
+UZ=an Úisbéiceastáin
+VA=Cathair na Vatacáine
+VC=San Uinseann agus na Greanáidíní
+VE=Veiniséala
+VG=Oileáin Bhriotanacha na Maighdean
+VI=Oileáin Mheiriceánacha na Maighdean
+VN=Vítneam
+VU=Vanuatú
+WF=Vailís agus Futúna
+WS=Samó
+YE=Éimin
 ZA=an Afraic Theas
 ZM=an tSaimbia
-ZW=an tSiomb\u00e1ib
+ZW=an tSiombáib
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_he.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_he.properties
index a52de447af2..cacc48a31e6 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_he.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_he.properties
@@ -38,9 +38,9 @@
 # language names
 # key is ISO 639 language code
 
-iw=\u05e2\u05d1\u05e8\u05d9\u05ea
+iw=עברית
 
 # country names
 # key is ISO 3166 country code
 
-IL=\u05d9\u05e9\u05e8\u05d0\u05dc
+IL=ישראל
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hi.properties
index a05311ba2aa..675c89875f2 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hi.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hi.properties
@@ -38,11 +38,11 @@
 # language names
 # key is ISO 639 language code
 
-hi=\u0939\u093f\u0928\u094d\u0926\u0940
-en=\u0905\u0902\u0917\u094d\u0930\u0947\u091c\u093c\u0940
+hi=हिन्दी
+en=अंग्रेज़ी
 
 # country names
 # key is ISO 3166 country code
 
-IN=\u092d\u093e\u0930\u0924
-US=\u0938\u0902\u092f\u0941\u0915\u094d\u0924 \u0930\u093e\u091c\u094d\u092f
+IN=भारत
+US=संयुक्त राज्य
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hu.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hu.properties
index 3853f337f28..7e6994672eb 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hu.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_hu.properties
@@ -43,4 +43,4 @@ hu=magyar
 # country names
 # key is ISO 3166 country code
 
-HU=Magyarorsz\u00e1g
+HU=Magyarország
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_is.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_is.properties
index 64645485d01..7a54412ca5b 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_is.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_is.properties
@@ -38,9 +38,9 @@
 # language names
 # key is ISO 639 language code
 
-is=\u00edslenska
+is=íslenska
 
 # country names
 # key is ISO 3166 country code
 
-IS=\u00cdsland
+IS=Ísland
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_it.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_it.properties
index 3564e7794a5..0b95f60818b 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_it.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_it.properties
@@ -90,7 +90,7 @@ fy=frisone occidentale
 ga=irlandese
 gd=gaelico scozzese
 gl=galiziano
-gn=guaran\u00ed
+gn=guaraní
 gu=gujarati
 gv=mannese
 ha=hausa
@@ -153,7 +153,7 @@ ms=malese
 mt=maltese
 my=birmano
 na=nauru
-nb=norvegese bokm\u00e5l
+nb=norvegese bokmål
 nd=ndebele del nord
 ne=nepalese
 ng=ndonga
@@ -217,7 +217,7 @@ ur=urdu
 uz=uzbeco
 ve=venda
 vi=vietnamita
-vo=volap\u00fck
+vo=volapük
 wa=vallone
 wo=wolof
 xh=xhosa
@@ -369,9 +369,9 @@ got=gotico
 grb=grebo
 grc=greco antico
 gre=Greco moderno (dal 1453)
-grn=Guaran\u00ec
+grn=Guaranì
 gsw=tedesco svizzero
-gwi=gwich\u02bcin
+gwi=gwichʼin
 hai=haida
 hat=Haitiano
 haw=hawaiano
@@ -480,11 +480,11 @@ nia=nias
 nic=Lingua niger-cordofan
 niu=niue
 nno=Norvegese nynorsk
-nob=Norvegese bokm\u00e5l
+nob=Norvegese bokmål
 nog=nogai
 non=norse antico
 nor=Norvegese
-nqo=n\u2019ko
+nqo=n’ko
 nso=sotho del nord
 nub=Nubiano
 nwc=newari classico
@@ -711,7 +711,7 @@ Mymr=birmano
 Narb=arabo settentrionale antico
 Nbat=nabateo
 Nkgb=geba naxi
-Nkoo=n\u2019ko
+Nkoo=n’ko
 Ogam=ogham
 Olck=ol chiki
 Orkh=orkhon
@@ -777,7 +777,7 @@ AG=Antigua e Barbuda
 AN=Antille Olandesi
 AQ=Antartide
 AS=Samoa americane
-AX=Isole \u00c5land
+AX=Isole Åland
 AZ=Azerbaigian
 BA=Bosnia ed Erzegovina
 BE=Belgio
@@ -789,7 +789,7 @@ CC=Isole Cocos (Keeling)
 CF=Repubblica Centrafricana
 CG=Congo-Brazzaville
 CH=Svizzera
-CI=Costa d\u2019Avorio
+CI=Costa d’Avorio
 CK=Isole Cook
 CL=Cile
 CM=Camerun
@@ -810,7 +810,7 @@ ET=Etiopia
 FI=Finlandia
 FJ=Figi
 FK=Isole Falkland
-FO=Isole F\u00e6r \u00d8er
+FO=Isole Fær Øer
 FR=Francia
 GB=Regno Unito
 GF=Guyana francese
@@ -826,7 +826,7 @@ HR=Croazia
 HU=Ungheria
 IE=Irlanda
 IL=Israele
-IO=Territorio britannico dell\u2019Oceano Indiano
+IO=Territorio britannico dell’Oceano Indiano
 IS=Islanda
 IT=Italia
 JM=Giamaica
@@ -862,8 +862,8 @@ NF=Isola Norfolk
 NL=Paesi Bassi
 NO=Norvegia
 NZ=Nuova Zelanda
-PA=Panam\u00e1
-PE=Per\u00f9
+PA=Panamá
+PE=Perù
 PF=Polinesia francese
 PG=Papua Nuova Guinea
 PH=Filippine
@@ -878,10 +878,10 @@ RW=Ruanda
 SA=Arabia Saudita
 SB=Isole Salomone
 SE=Svezia
-SH=Sant\u2019Elena
+SH=Sant’Elena
 SJ=Svalbard e Jan Mayen
 SK=Slovacchia
-ST=S\u00e3o Tom\u00e9 e Pr\u00edncipe
+ST=São Tomé e Príncipe
 SY=Siria
 SZ=Swaziland
 TC=Isole Turks e Caicos
@@ -895,7 +895,7 @@ TT=Trinidad e Tobago
 UA=Ucraina
 UM=Altre isole americane del Pacifico
 US=Stati Uniti
-VA=Citt\u00e0 del Vaticano
+VA=Città del Vaticano
 VC=Saint Vincent e Grenadine
 VG=Isole Vergini Britanniche
 VI=Isole Vergini Americane
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ja.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ja.properties
index 0d243070627..b1db50f1233 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ja.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ja.properties
@@ -38,1108 +38,1108 @@
 # language names
 # key is ISO 639 language code
 
-aa=\u30a2\u30d5\u30a1\u30eb\u8a9e
-ab=\u30a2\u30d6\u30cf\u30ba\u8a9e
-ae=\u30a2\u30f4\u30a7\u30b9\u30bf\u8a9e
-af=\u30a2\u30d5\u30ea\u30ab\u30fc\u30f3\u30b9\u8a9e
-ak=\u30a2\u30ab\u30f3\u8a9e
-am=\u30a2\u30e0\u30cf\u30e9\u8a9e
-an=\u30a2\u30e9\u30b4\u30f3\u8a9e
-ar=\u30a2\u30e9\u30d3\u30a2\u8a9e
-as=\u30a2\u30c3\u30b5\u30e0\u8a9e
-av=\u30a2\u30f4\u30a1\u30eb\u8a9e
-ay=\u30a2\u30a4\u30de\u30e9\u8a9e
-az=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3\u8a9e
-ba=\u30d0\u30b7\u30ad\u30fc\u30eb\u8a9e
-be=\u30d9\u30e9\u30eb\u30fc\u30b7\u8a9e
-bg=\u30d6\u30eb\u30ac\u30ea\u30a2\u8a9e
-bh=\u30d3\u30cf\u30fc\u30eb\u8a9e
-bi=\u30d3\u30b9\u30e9\u30de\u8a9e
-bm=\u30d0\u30f3\u30d0\u30e9\u8a9e
-bn=\u30d9\u30f3\u30ac\u30eb\u8a9e
-bo=\u30c1\u30d9\u30c3\u30c8\u8a9e
-br=\u30d6\u30eb\u30c8\u30f3\u8a9e
-bs=\u30dc\u30b9\u30cb\u30a2\u8a9e
-ca=\u30ab\u30bf\u30ed\u30cb\u30a2\u8a9e
-ce=\u30c1\u30a7\u30c1\u30a7\u30f3\u8a9e
-ch=\u30c1\u30e3\u30e2\u30ed\u8a9e
-co=\u30b3\u30eb\u30b7\u30ab\u8a9e
-cr=\u30af\u30ea\u30fc\u8a9e
-cs=\u30c1\u30a7\u30b3\u8a9e
-cu=\u6559\u4f1a\u30b9\u30e9\u30d6\u8a9e
-cv=\u30c1\u30e5\u30f4\u30a1\u30b7\u8a9e
-cy=\u30a6\u30a7\u30fc\u30eb\u30ba\u8a9e
-da=\u30c7\u30f3\u30de\u30fc\u30af\u8a9e
-de=\u30c9\u30a4\u30c4\u8a9e
-dv=\u30c7\u30a3\u30d9\u30d2\u8a9e
-dz=\u30be\u30f3\u30ab\u8a9e
-ee=\u30a8\u30a6\u30a7\u8a9e
-el=\u30ae\u30ea\u30b7\u30e3\u8a9e
-en=\u82f1\u8a9e
-eo=\u30a8\u30b9\u30da\u30e9\u30f3\u30c8\u8a9e
-es=\u30b9\u30da\u30a4\u30f3\u8a9e
-et=\u30a8\u30b9\u30c8\u30cb\u30a2\u8a9e
-eu=\u30d0\u30b9\u30af\u8a9e
-fa=\u30da\u30eb\u30b7\u30a2\u8a9e
-ff=\u30d5\u30e9\u8a9e
-fi=\u30d5\u30a3\u30f3\u30e9\u30f3\u30c9\u8a9e
-fj=\u30d5\u30a3\u30b8\u30fc\u8a9e
-fo=\u30d5\u30a7\u30ed\u30fc\u8a9e
-fr=\u30d5\u30e9\u30f3\u30b9\u8a9e
-fy=\u897f\u30d5\u30ea\u30b8\u30a2\u8a9e
-ga=\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u8a9e
-gd=\u30b9\u30b3\u30c3\u30c8\u30e9\u30f3\u30c9\u30fb\u30b2\u30fc\u30eb\u8a9e
-gl=\u30ac\u30ea\u30b7\u30a2\u8a9e
-gn=\u30b0\u30a2\u30e9\u30cb\u30fc\u8a9e
-gu=\u30b0\u30b8\u30e3\u30e9\u30fc\u30c8\u8a9e
-gv=\u30de\u30f3\u5cf6\u8a9e
-ha=\u30cf\u30a6\u30b5\u8a9e
-he=\u30d8\u30d6\u30e9\u30a4\u8a9e
-hi=\u30d2\u30f3\u30c7\u30a3\u30fc\u8a9e
-ho=\u30d2\u30ea\u30e2\u30c4\u8a9e
-hr=\u30af\u30ed\u30a2\u30c1\u30a2\u8a9e
-ht=\u30cf\u30a4\u30c1\u30fb\u30af\u30ec\u30aa\u30fc\u30eb\u8a9e
-hu=\u30cf\u30f3\u30ac\u30ea\u30fc\u8a9e
-hy=\u30a2\u30eb\u30e1\u30cb\u30a2\u8a9e
-hz=\u30d8\u30ec\u30ed\u8a9e
-ia=\u30a4\u30f3\u30bf\u30fc\u30ea\u30f3\u30b0\u30a2
-id=\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u8a9e
-ie=\u30a4\u30f3\u30bf\u30fc\u30ea\u30f3\u30b0
-ig=\u30a4\u30dc\u8a9e
-ii=\u56db\u5ddd\u30a4\u8a9e
-ik=\u30a4\u30cc\u30d4\u30a2\u30c3\u30af\u8a9e
-in=\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u8a9e
-io=\u30a4\u30c9\u8a9e
-is=\u30a2\u30a4\u30b9\u30e9\u30f3\u30c9\u8a9e
-it=\u30a4\u30bf\u30ea\u30a2\u8a9e
-iu=\u30a4\u30cc\u30af\u30c6\u30a3\u30c8\u30c3\u30c8\u8a9e
-iw=\u30d8\u30d6\u30e9\u30a4\u8a9e
-ja=\u65e5\u672c\u8a9e
-ji=\u30a4\u30c7\u30a3\u30c3\u30b7\u30e5\u8a9e
-jv=\u30b8\u30e3\u30ef\u8a9e
-ka=\u30b8\u30e7\u30fc\u30b8\u30a2\u8a9e
-kg=\u30b3\u30f3\u30b4\u8a9e
-ki=\u30ad\u30af\u30e6\u8a9e
-kj=\u30af\u30ef\u30cb\u30e3\u30de\u8a9e
-kk=\u30ab\u30b6\u30d5\u8a9e
-kl=\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u8a9e
-km=\u30af\u30e1\u30fc\u30eb\u8a9e
-kn=\u30ab\u30f3\u30ca\u30c0\u8a9e
-ko=\u97d3\u56fd\u8a9e
-kr=\u30ab\u30cc\u30ea\u8a9e
-ks=\u30ab\u30b7\u30df\u30fc\u30eb\u8a9e
-ku=\u30af\u30eb\u30c9\u8a9e
-kv=\u30b3\u30df\u8a9e
-kw=\u30b3\u30fc\u30f3\u30a6\u30a9\u30fc\u30eb\u8a9e
-ky=\u30ad\u30eb\u30ae\u30b9\u8a9e
-la=\u30e9\u30c6\u30f3\u8a9e
-lb=\u30eb\u30af\u30bb\u30f3\u30d6\u30eb\u30af\u8a9e
-lg=\u30ac\u30f3\u30c0\u8a9e
-li=\u30ea\u30f3\u30d6\u30eb\u30d5\u8a9e
-ln=\u30ea\u30f3\u30ac\u30e9\u8a9e
-lo=\u30e9\u30aa\u8a9e
-lt=\u30ea\u30c8\u30a2\u30cb\u30a2\u8a9e
-lu=\u30eb\u30d0\u30fb\u30ab\u30bf\u30f3\u30ac\u8a9e
-lv=\u30e9\u30c8\u30d3\u30a2\u8a9e
-mg=\u30de\u30c0\u30ac\u30b9\u30ab\u30eb\u8a9e
-mh=\u30de\u30fc\u30b7\u30e3\u30eb\u8a9e
-mi=\u30de\u30aa\u30ea\u8a9e
-mk=\u30de\u30b1\u30c9\u30cb\u30a2\u8a9e
-ml=\u30de\u30e9\u30e4\u30fc\u30e9\u30e0\u8a9e
-mn=\u30e2\u30f3\u30b4\u30eb\u8a9e
-mo=\u30e2\u30eb\u30c0\u30d3\u30a2\u8a9e
-mr=\u30de\u30e9\u30fc\u30c6\u30a3\u30fc\u8a9e
-ms=\u30de\u30ec\u30fc\u8a9e
-mt=\u30de\u30eb\u30bf\u8a9e
-my=\u30df\u30e3\u30f3\u30de\u30fc\u8a9e
-na=\u30ca\u30a6\u30eb\u8a9e
-nb=\u30ce\u30eb\u30a6\u30a7\u30fc\u8a9e(\u30d6\u30fc\u30af\u30e2\u30fc\u30eb)
-nd=\u5317\u30f3\u30c7\u30d9\u30ec\u8a9e
-ne=\u30cd\u30d1\u30fc\u30eb\u8a9e
-ng=\u30f3\u30c9\u30f3\u30ac\u8a9e
-nl=\u30aa\u30e9\u30f3\u30c0\u8a9e
-nn=\u30ce\u30eb\u30a6\u30a7\u30fc\u8a9e(\u30cb\u30fc\u30ce\u30b7\u30e5\u30af)
-no=\u30ce\u30eb\u30a6\u30a7\u30fc\u8a9e
-nr=\u5357\u30f3\u30c7\u30d9\u30ec\u8a9e
-nv=\u30ca\u30d0\u30db\u8a9e
-ny=\u30cb\u30e3\u30f3\u30b8\u30e3\u8a9e
-oc=\u30aa\u30c3\u30af\u8a9e
-oj=\u30aa\u30b8\u30d6\u30a6\u30a7\u30fc\u8a9e
-om=\u30aa\u30ed\u30e2\u8a9e
-or=\u30aa\u30c7\u30a3\u30a2\u8a9e
-os=\u30aa\u30bb\u30c3\u30c8\u8a9e
-pa=\u30d1\u30f3\u30b8\u30e3\u30d6\u8a9e
-pi=\u30d1\u30fc\u30ea\u8a9e
-pl=\u30dd\u30fc\u30e9\u30f3\u30c9\u8a9e
-ps=\u30d1\u30b7\u30e5\u30c8\u30a5\u30fc\u8a9e
-pt=\u30dd\u30eb\u30c8\u30ac\u30eb\u8a9e
-qu=\u30b1\u30c1\u30e5\u30a2\u8a9e
-rm=\u30ed\u30de\u30f3\u30b7\u30e5\u8a9e
-rn=\u30eb\u30f3\u30c7\u30a3\u8a9e
-ro=\u30eb\u30fc\u30de\u30cb\u30a2\u8a9e
-ru=\u30ed\u30b7\u30a2\u8a9e
-rw=\u30ad\u30cb\u30a2\u30eb\u30ef\u30f3\u30c0\u8a9e
-sa=\u30b5\u30f3\u30b9\u30af\u30ea\u30c3\u30c8\u8a9e
-sc=\u30b5\u30eb\u30c7\u30fc\u30cb\u30e3\u8a9e
-sd=\u30b7\u30f3\u30c9\u8a9e
-se=\u5317\u30b5\u30fc\u30df\u8a9e
-sg=\u30b5\u30f3\u30b4\u8a9e
-si=\u30b7\u30f3\u30cf\u30e9\u8a9e
-sk=\u30b9\u30ed\u30d0\u30ad\u30a2\u8a9e
-sl=\u30b9\u30ed\u30d9\u30cb\u30a2\u8a9e
-sm=\u30b5\u30e2\u30a2\u8a9e
-sn=\u30b7\u30e7\u30ca\u8a9e
-so=\u30bd\u30de\u30ea\u8a9e
-sq=\u30a2\u30eb\u30d0\u30cb\u30a2\u8a9e
-sr=\u30bb\u30eb\u30d3\u30a2\u8a9e
-ss=\u30b9\u30ef\u30b8\u8a9e
-st=\u5357\u90e8\u30bd\u30c8\u8a9e
-su=\u30b9\u30f3\u30c0\u8a9e
-sv=\u30b9\u30a6\u30a7\u30fc\u30c7\u30f3\u8a9e
-sw=\u30b9\u30ef\u30d2\u30ea\u8a9e
-ta=\u30bf\u30df\u30eb\u8a9e
-te=\u30c6\u30eb\u30b0\u8a9e
-tg=\u30bf\u30b8\u30af\u8a9e
-th=\u30bf\u30a4\u8a9e
-ti=\u30c6\u30a3\u30b0\u30ea\u30cb\u30a2\u8a9e
-tk=\u30c8\u30eb\u30af\u30e1\u30f3\u8a9e
-tl=\u30bf\u30ac\u30ed\u30b0\u8a9e
-tn=\u30c4\u30ef\u30ca\u8a9e
-to=\u30c8\u30f3\u30ac\u8a9e
-tr=\u30c8\u30eb\u30b3\u8a9e
-ts=\u30c4\u30a9\u30f3\u30ac\u8a9e
-tt=\u30bf\u30bf\u30fc\u30eb\u8a9e
-tw=\u30c8\u30a6\u30a3\u8a9e
-ty=\u30bf\u30d2\u30c1\u8a9e
-ug=\u30a6\u30a4\u30b0\u30eb\u8a9e
-uk=\u30a6\u30af\u30e9\u30a4\u30ca\u8a9e
-ur=\u30a6\u30eb\u30c9\u30a5\u30fc\u8a9e
-uz=\u30a6\u30ba\u30d9\u30af\u8a9e
-ve=\u30d9\u30f3\u30c0\u8a9e
-vi=\u30d9\u30c8\u30ca\u30e0\u8a9e
-vo=\u30f4\u30a9\u30e9\u30d4\u30e5\u30af\u8a9e
-wa=\u30ef\u30ed\u30f3\u8a9e
-wo=\u30a6\u30a9\u30ed\u30d5\u8a9e
-xh=\u30b3\u30b5\u8a9e
-yi=\u30a4\u30c7\u30a3\u30c3\u30b7\u30e5\u8a9e
-yo=\u30e8\u30eb\u30d0\u8a9e
-za=\u30c1\u30ef\u30f3\u8a9e
-zh=\u4e2d\u56fd\u8a9e
-zu=\u30ba\u30fc\u30eb\u30fc\u8a9e
+aa=アファル語
+ab=アブハズ語
+ae=アヴェスタ語
+af=アフリカーンス語
+ak=アカン語
+am=アムハラ語
+an=アラゴン語
+ar=アラビア語
+as=アッサム語
+av=アヴァル語
+ay=アイマラ語
+az=アゼルバイジャン語
+ba=バシキール語
+be=ベラルーシ語
+bg=ブルガリア語
+bh=ビハール語
+bi=ビスラマ語
+bm=バンバラ語
+bn=ベンガル語
+bo=チベット語
+br=ブルトン語
+bs=ボスニア語
+ca=カタロニア語
+ce=チェチェン語
+ch=チャモロ語
+co=コルシカ語
+cr=クリー語
+cs=チェコ語
+cu=教会スラブ語
+cv=チュヴァシ語
+cy=ウェールズ語
+da=デンマーク語
+de=ドイツ語
+dv=ディベヒ語
+dz=ゾンカ語
+ee=エウェ語
+el=ギリシャ語
+en=英語
+eo=エスペラント語
+es=スペイン語
+et=エストニア語
+eu=バスク語
+fa=ペルシア語
+ff=フラ語
+fi=フィンランド語
+fj=フィジー語
+fo=フェロー語
+fr=フランス語
+fy=西フリジア語
+ga=アイルランド語
+gd=スコットランド・ゲール語
+gl=ガリシア語
+gn=グアラニー語
+gu=グジャラート語
+gv=マン島語
+ha=ハウサ語
+he=ヘブライ語
+hi=ヒンディー語
+ho=ヒリモツ語
+hr=クロアチア語
+ht=ハイチ・クレオール語
+hu=ハンガリー語
+hy=アルメニア語
+hz=ヘレロ語
+ia=インターリングア
+id=インドネシア語
+ie=インターリング
+ig=イボ語
+ii=四川イ語
+ik=イヌピアック語
+in=インドネシア語
+io=イド語
+is=アイスランド語
+it=イタリア語
+iu=イヌクティトット語
+iw=ヘブライ語
+ja=日本語
+ji=イディッシュ語
+jv=ジャワ語
+ka=ジョージア語
+kg=コンゴ語
+ki=キクユ語
+kj=クワニャマ語
+kk=カザフ語
+kl=グリーンランド語
+km=クメール語
+kn=カンナダ語
+ko=韓国語
+kr=カヌリ語
+ks=カシミール語
+ku=クルド語
+kv=コミ語
+kw=コーンウォール語
+ky=キルギス語
+la=ラテン語
+lb=ルクセンブルク語
+lg=ガンダ語
+li=リンブルフ語
+ln=リンガラ語
+lo=ラオ語
+lt=リトアニア語
+lu=ルバ・カタンガ語
+lv=ラトビア語
+mg=マダガスカル語
+mh=マーシャル語
+mi=マオリ語
+mk=マケドニア語
+ml=マラヤーラム語
+mn=モンゴル語
+mo=モルダビア語
+mr=マラーティー語
+ms=マレー語
+mt=マルタ語
+my=ミャンマー語
+na=ナウル語
+nb=ノルウェー語(ブークモール)
+nd=北ンデベレ語
+ne=ネパール語
+ng=ンドンガ語
+nl=オランダ語
+nn=ノルウェー語(ニーノシュク)
+no=ノルウェー語
+nr=南ンデベレ語
+nv=ナバホ語
+ny=ニャンジャ語
+oc=オック語
+oj=オジブウェー語
+om=オロモ語
+or=オディア語
+os=オセット語
+pa=パンジャブ語
+pi=パーリ語
+pl=ポーランド語
+ps=パシュトゥー語
+pt=ポルトガル語
+qu=ケチュア語
+rm=ロマンシュ語
+rn=ルンディ語
+ro=ルーマニア語
+ru=ロシア語
+rw=キニアルワンダ語
+sa=サンスクリット語
+sc=サルデーニャ語
+sd=シンド語
+se=北サーミ語
+sg=サンゴ語
+si=シンハラ語
+sk=スロバキア語
+sl=スロベニア語
+sm=サモア語
+sn=ショナ語
+so=ソマリ語
+sq=アルバニア語
+sr=セルビア語
+ss=スワジ語
+st=南部ソト語
+su=スンダ語
+sv=スウェーデン語
+sw=スワヒリ語
+ta=タミル語
+te=テルグ語
+tg=タジク語
+th=タイ語
+ti=ティグリニア語
+tk=トルクメン語
+tl=タガログ語
+tn=ツワナ語
+to=トンガ語
+tr=トルコ語
+ts=ツォンガ語
+tt=タタール語
+tw=トウィ語
+ty=タヒチ語
+ug=ウイグル語
+uk=ウクライナ語
+ur=ウルドゥー語
+uz=ウズベク語
+ve=ベンダ語
+vi=ベトナム語
+vo=ヴォラピュク語
+wa=ワロン語
+wo=ウォロフ語
+xh=コサ語
+yi=イディッシュ語
+yo=ヨルバ語
+za=チワン語
+zh=中国語
+zu=ズールー語
 
 # key is ISO 639.2 language code
-aar=\u30a2\u30d5\u30a1\u30eb\u8a9e
-abk=\u30a2\u30d6\u30cf\u30fc\u30ba\u8a9e
-ace=\u30a2\u30c1\u30a7\u8a9e
-ach=\u30a2\u30c1\u30e7\u30ea\u8a9e
-ada=\u30a2\u30c0\u30f3\u30b0\u30e1\u8a9e
-ady=\u30a2\u30c7\u30a3\u30b2\u8a9e
-afa=\u30a2\u30d5\u30ac\u30cb\u30fc (1927-2002)
-afh=\u30a2\u30d5\u30ea\u30d2\u30ea\u8a9e
-afr=\u30a2\u30d5\u30ea\u30ab\u30fc\u30f3\u30b9\u8a9e
-ain=\u30a2\u30a4\u30cc\u8a9e
-aka=\u30a2\u30ab\u30f3\u8a9e
-akk=\u30a2\u30c3\u30ab\u30c9\u8a9e
-alb=\u30a2\u30eb\u30d0\u30cb\u30a2\u8a9e
-ale=\u30a2\u30ec\u30a6\u30c8\u8a9e
-alg=\u30a2\u30eb\u30b4\u30f3\u30ad\u30a2\u30f3\u8a9e\u65cf
-alt=\u5357\u30a2\u30eb\u30bf\u30a4\u8a9e
-amh=\u30a2\u30e0\u30cf\u30e9\u8a9e
-ang=\u53e4\u82f1\u8a9e
-anp=\u30a2\u30f3\u30ae\u30ab\u8a9e
-apa=\u30a2\u30d1\u30c3\u30c1\u8a9e\u65cf
-ara=\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3 \u30a2\u30a5\u30b9\u30c8\u30e9\u30fc\u30eb
-arc=\u30a2\u30e9\u30e0\u8a9e
-arg=\u30a2\u30e9\u30b4\u30f3\u8a9e
-arm=\u30a2\u30eb\u30e1\u30cb\u30a2\u8a9e
-arn=\u30de\u30d7\u30c1\u30a7\u8a9e
-arp=\u30a2\u30e9\u30d1\u30db\u30fc\u8a9e
-art=\u4eba\u5de5\u8af8\u8a9e
-arw=\u30a2\u30e9\u30ef\u30af\u8a9e
-asm=\u30a2\u30c3\u30b5\u30e0\u8a9e
-ast=\u30a2\u30b9\u30c8\u30a5\u30ea\u30a2\u30b9\u8a9e
-ath=\u30a2\u30b5\u30d1\u30b9\u30ab\u30f3\u8a9e\u65cf
-aus=\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2\u8a9e\u65cf
-ava=\u30a2\u30f4\u30a1\u30eb\u8a9e
-ave=\u30a2\u30f4\u30a7\u30b9\u30bf\u8a9e
-awa=\u30a2\u30ef\u30c7\u30a3\u30fc\u8a9e
-aym=\u30a2\u30a4\u30de\u30e9\u8a9e
-aze=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3\u8a9e
-bad=\u30dc\u30b9\u30cb\u30a2 \u30c7\u30a3\u30ca\u30fc\u30eb
-bai=\u30d0\u30df\u30ec\u30b1\u8a9e\u65cf
-bak=\u30d0\u30b7\u30ad\u30fc\u30eb\u8a9e
-bal=\u30d0\u30eb\u30fc\u30c1\u30fc\u8a9e
-bam=\u30dc\u30b9\u30cb\u30a2 \u30de\u30eb\u30af (BAM)
-ban=\u30d0\u30ea\u8a9e
-baq=\u30d0\u30b9\u30af\u8a9e
-bas=\u30d0\u30b5\u8a9e
-bat=\u30d0\u30eb\u30c8\u8af8\u8a9e
-bej=\u30d9\u30b8\u30e3\u8a9e
-bel=\u30d9\u30eb\u30ae\u30fc \u30d5\u30e9\u30f3 (BEL)
-bem=\u30d9\u30f3\u30d0\u8a9e
-ben=\u30d9\u30f3\u30ac\u30eb\u8a9e
-ber=\u30d9\u30eb\u30d9\u30eb\u8af8\u8a9e
-bho=\u30dc\u30fc\u30b8\u30e5\u30d7\u30ea\u30fc\u8a9e
-bih=\u30d3\u30cf\u30fc\u30eb\u8a9e
-bik=\u30d3\u30b3\u30eb\u8a9e
-bin=\u30d3\u30cb\u8a9e
-bis=\u30d3\u30b9\u30e9\u30de\u8a9e
-bla=\u30b7\u30af\u30b7\u30ab\u8a9e
-bnt=\u30d0\u30f3\u30c8\u30a5\u8af8\u8a9e
-bos=\u30dc\u30b9\u30cb\u30a2\u8a9e
-bra=\u30d6\u30e9\u30b8\u8a9e
-bre=\u30d6\u30e9\u30b8\u30eb \u30af\u30eb\u30bc\u30a4\u30ed (1990-1993)
-btk=\u30d0\u30bf\u30af\u8a9e
-bua=\u30d6\u30ea\u30e4\u30fc\u30c8\u8a9e
-bug=\u30d6\u30ae\u8a9e
-bul=\u30d6\u30eb\u30ac\u30ea\u30a2\u8a9e
-bur=\u30d3\u30eb\u30de\u8a9e
-byn=\u30d3\u30ea\u30f3\u8a9e
-cad=\u30ab\u30c9\u30fc\u8a9e
-cai=\u4e2d\u7c73\u30a4\u30f3\u30c7\u30a3\u30a2\u30f3\u8af8\u8a9e
-car=\u30ab\u30ea\u30d6\u8a9e
-cat=\u30ab\u30bf\u30ed\u30cb\u30a2\u8a9e
-cau=\u30b3\u30fc\u30ab\u30b5\u30b9\u8af8\u8a9e
-ceb=\u30bb\u30d6\u30a2\u30ce\u8a9e
-cel=\u30b1\u30eb\u30c8\u8af8\u8a9e
-cha=\u30c1\u30e3\u30e2\u30ed\u8a9e
-chb=\u30c1\u30d6\u30c1\u30e3\u8a9e
-che=\u30c1\u30a7\u30c1\u30a7\u30f3\u8a9e
-chg=\u30c1\u30e3\u30ac\u30bf\u30a4\u8a9e
-chi=\u4e2d\u56fd\u8a9e
-chk=\u30c1\u30e5\u30fc\u30af\u8a9e
-chm=\u30de\u30ea\u8a9e
-chn=\u30c1\u30cc\u30fc\u30af\u6df7\u6210\u8a9e
-cho=\u30c1\u30e7\u30af\u30c8\u30fc\u8a9e
-chp=\u30c1\u30da\u30ef\u30a4\u30a2\u30f3\u8a9e
-chr=\u30c1\u30a7\u30ed\u30ad\u30fc\u8a9e
-chu=\u6559\u4f1a\u30b9\u30e9\u30d6\u8a9e
-chv=\u30c1\u30e5\u30f4\u30a1\u30b7\u30e5\u8a9e
-chy=\u30b7\u30e3\u30a4\u30a2\u30f3\u8a9e
-cmc=\u30c1\u30e3\u30e0\u8a9e\u65cf
-cop=\u30b3\u30d7\u30c8\u8a9e
-cor=\u30b3\u30fc\u30f3\u30a6\u30a9\u30fc\u30eb\u8a9e
-cos=\u30b3\u30eb\u30b7\u30ab\u8a9e
-cpe=\u82f1\u8a9e\u304c\u57fa\u76e4\u306e\u6df7\u6210\u8a9e\u30fb\u6df7\u5408\u8a9e
-cpf=\u30d5\u30e9\u30f3\u30b9\u8a9e\u304c\u57fa\u76e4\u306e\u6df7\u6210\u8a9e\u30fb\u6df7\u5408\u8a9e
-cpp=\u30dd\u30eb\u30c8\u30ac\u30eb\u8a9e\u304c\u57fa\u76e4\u306e\u6df7\u6210\u8a9e\u30fb\u6df7\u5408\u8a9e
-cre=\u30af\u30ea\u30fc\u8a9e
-crh=\u30af\u30ea\u30df\u30a2\u30fb\u30bf\u30bf\u30fc\u30eb\u8a9e
-crp=\u305d\u306e\u4ed6\u306e\u6df7\u6210\u8a9e\u30fb\u6df7\u5408\u8a9e
-csb=\u30ab\u30b7\u30e5\u30fc\u30d6\u8a9e
-cus=\u30af\u30b7\u30e5\u8af8\u8a9e
-cze=\u30c1\u30a7\u30b3\u8a9e
-dak=\u30c0\u30b3\u30bf\u8a9e
-dan=\u30c7\u30f3\u30de\u30fc\u30af\u8a9e
-dar=\u30c0\u30eb\u30b0\u30ef\u8a9e
-day=\u30c0\u30e4\u30af\u8a9e
-del=\u30c7\u30e9\u30a6\u30a7\u30a2\u8a9e
-den=\u30b9\u30ec\u30a4\u30d3\u30fc\u8a9e
-dgr=\u30c9\u30b0\u30ea\u30d6\u8a9e
-din=\u30c7\u30a3\u30f3\u30ab\u8a9e
-div=\u30c7\u30a3\u30d9\u30d2\u8a9e
-doi=\u30c9\u30fc\u30b0\u30ea\u30fc\u8a9e
-dra=\u30c9\u30e9\u30f4\u30a3\u30c0\u8af8\u8a9e
-dsb=\u4f4e\u5730\u30bd\u30eb\u30d6\u8a9e
-dua=\u30c9\u30a5\u30a2\u30e9\u8a9e
-dum=\u4e2d\u4e16\u30aa\u30e9\u30f3\u30c0\u8a9e
-dut=\u30aa\u30e9\u30f3\u30c0\u8a9e
-dyu=\u30b8\u30e5\u30e9\u8a9e
-dzo=\u30be\u30f3\u30ab\u8a9e
-efi=\u30a8\u30d5\u30a3\u30af\u8a9e
-egy=\u53e4\u4ee3\u30a8\u30b8\u30d7\u30c8\u8a9e
-eka=\u30a8\u30ab\u30b8\u30e5\u30af\u8a9e
-elx=\u30a8\u30e9\u30e0\u8a9e
-eng=\u82f1\u8a9e
-enm=\u4e2d\u82f1\u8a9e
-epo=\u30a8\u30b9\u30da\u30e9\u30f3\u30c8\u8a9e
-est=\u30a8\u30b9\u30c8\u30cb\u30a2\u8a9e
-ewe=\u30a8\u30a6\u30a7\u8a9e
-ewo=\u30a8\u30a6\u30a9\u30f3\u30c9\u8a9e
-fan=\u30d5\u30a1\u30f3\u30b0\u8a9e
-fao=\u30d5\u30a7\u30ed\u30fc\u8a9e
-fat=\u30d5\u30a1\u30f3\u30c6\u30a3\u30fc\u8a9e
-fij=\u30d5\u30a3\u30b8\u30fc\u8a9e
-fil=\u30d5\u30a3\u30ea\u30d4\u30ce\u8a9e
-fin=\u30d5\u30a3\u30f3\u30e9\u30f3\u30c9\u8a9e
-fiu=\u30d5\u30a3\u30f3\u30fb\u30a6\u30b4\u30eb\u8af8\u8a9e
-fon=\u30d5\u30a9\u30f3\u8a9e
-fre=\u30d5\u30e9\u30f3\u30b9\u8a9e
-frm=\u4e2d\u671f\u30d5\u30e9\u30f3\u30b9\u8a9e
-fro=\u53e4\u30d5\u30e9\u30f3\u30b9\u8a9e
-frr=\u5317\u30d5\u30ea\u30b8\u30a2\u8a9e
-frs=\u6771\u30d5\u30ea\u30b8\u30a2\u8a9e
-fry=\u897f\u30d5\u30ea\u30b8\u30a2\u8a9e
-ful=\u30d5\u30e9\u8a9e
-fur=\u30d5\u30ea\u30a6\u30ea\u8a9e
-gaa=\u30ac\u8a9e
-gay=\u30ac\u30e8\u8a9e
-gba=\u30d0\u30e4\u8a9e
-gem=\u30b2\u30eb\u30de\u30f3\u8af8\u8a9e
-geo=\u30b0\u30eb\u30b8\u30a2\u8a9e
-ger=\u30c9\u30a4\u30c4\u8a9e
-gez=\u30b2\u30a8\u30ba\u8a9e
-gil=\u30ad\u30ea\u30d0\u30b9\u8a9e
-gla=\u30b2\u30fc\u30eb\u8a9e
-gle=\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u8a9e
-glg=\u30ac\u30ea\u30b7\u30a2\u8a9e
-glv=\u30de\u30f3\u5cf6\u8a9e
-gmh=\u4e2d\u9ad8\u30c9\u30a4\u30c4\u8a9e
-goh=\u53e4\u9ad8\u30c9\u30a4\u30c4\u8a9e
-gon=\u30b4\u30fc\u30f3\u30c7\u30a3\u30fc\u8a9e
-gor=\u30b4\u30ed\u30f3\u30bf\u30ed\u8a9e
-got=\u30b4\u30fc\u30c8\u8a9e
-grb=\u30b0\u30ec\u30dc\u8a9e
-grc=\u53e4\u4ee3\u30ae\u30ea\u30b7\u30e3\u8a9e
-gre=\u73fe\u4ee3\u30ae\u30ea\u30b7\u30e3\u8a9e(1453-)
-grn=\u30b0\u30a2\u30e9\u30cb\u30fc\u8a9e
-gsw=\u30b9\u30a4\u30b9\u30c9\u30a4\u30c4\u8a9e
-guj=\u30b0\u30b8\u30e3\u30e9\u30c8\u8a9e
-gwi=\u30b0\u30a6\u30a3\u30c3\u30c1\u30f3\u8a9e
-hai=\u30cf\u30a4\u30c0\u8a9e
-hat=\u30cf\u30a4\u30c1\u8a9e
-hau=\u30cf\u30a6\u30b5\u8a9e
-haw=\u30cf\u30ef\u30a4\u8a9e
-heb=\u30d8\u30d6\u30e9\u30a4\u8a9e
-her=\u30d8\u30ec\u30ed\u8a9e
-hil=\u30d2\u30ea\u30ac\u30a4\u30ce\u30f3\u8a9e
-him=\u30d2\u30de\u30c1\u30e3\u30eb\u8a9e
-hin=\u30d2\u30f3\u30c7\u30a3\u30fc\u8a9e
-hit=\u30d2\u30c3\u30bf\u30a4\u30c8\u8a9e
-hmn=\u30d5\u30e2\u30f3\u8a9e
-hmo=\u30d2\u30ea\u30e2\u30c8\u30a5\u8a9e
-hrv=\u30af\u30ed\u30a2\u30c1\u30a2\u8a9e
-hsb=\u9ad8\u5730\u30bd\u30eb\u30d6\u8a9e
-hun=\u30cf\u30f3\u30ac\u30ea\u30fc\u8a9e
-hup=\u30d5\u30d1\u8a9e
-iba=\u30a4\u30d0\u30f3\u8a9e
-ibo=\u30a4\u30dc\u8a9e
-ice=\u30a2\u30a4\u30b9\u30e9\u30f3\u30c9\u8a9e
-ido=\u30a4\u30c9\u8a9e
-iii=\u56db\u5ddd\u30a4(\u5f5d)\u8a9e
-ijo=\u30a4\u30b8\u30e7\u30fc\u8a9e
-iku=\u30a4\u30cc\u30af\u30a6\u30c6\u30a3\u30c8\u30c3\u30c8\u8a9e
-ile=\u30a4\u30f3\u30bf\u30fc\u30ea\u30f3\u30b0
-ilo=\u30a4\u30ed\u30ab\u30ce\u8a9e
-ina=\u30a4\u30f3\u30bf\u30fc\u30ea\u30f3\u30b0\u30a2\u8a9e(\u56fd\u969b\u88dc\u52a9\u8a9e\u5354\u4f1a)
-inc=\u30a4\u30f3\u30c9\u8af8\u8a9e
-ind=\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u8a9e
-ine=\u5370\u6b27\u8af8\u8a9e
-inh=\u30a4\u30f3\u30b0\u30fc\u30b7\u8a9e
-ipk=\u30a4\u30cc\u30d4\u30a2\u30c3\u30af\u8a9e
-ira=\u30a4\u30e9\u30f3\u8a9e
-iro=\u30a4\u30ed\u30b3\u30a4\u8a9e\u65cf
-ita=\u30a4\u30bf\u30ea\u30a2\u8a9e
-jav=\u30b8\u30e3\u30ef\u8a9e
-jbo=\u30ed\u30b8\u30d0\u30f3\u8a9e
-jpn=\u65e5\u672c\u8a9e
-jpr=\u30e6\u30c0\u30e4\u30fb\u30da\u30eb\u30b7\u30a2\u8a9e
-jrb=\u30e6\u30c0\u30e4\u30fb\u30a2\u30e9\u30d3\u30a2\u8a9e
-kaa=\u30ab\u30e9\u30ab\u30eb\u30d1\u30af\u8a9e
-kab=\u30ab\u30d3\u30eb\u8a9e
-kac=\u30ab\u30c1\u30f3\u8a9e
-kal=\u30ab\u30e9\u30a2\u30ea\u30b9\u8a9e
-kam=\u30ab\u30f3\u30d0\u8a9e
-kan=\u30ab\u30f3\u30ca\u30c0\u8a9e
-kar=\u30ab\u30ec\u30f3\u8a9e
-kas=\u30ab\u30b7\u30df\u30fc\u30eb\u8a9e
-kau=\u30ab\u30cc\u30ea\u8a9e
-kaw=\u30ab\u30a6\u30a3\u8a9e
-kaz=\u30ab\u30b6\u30d5\u8a9e
-kbd=\u30ab\u30d0\u30eb\u30c9\u8a9e
-kha=\u30ab\u30b7\u8a9e
-khi=\u30b3\u30a4\u30b5\u30f3\u8af8\u8a9e
-khm=\u4e2d\u592e\u30af\u30e1\u30fc\u30eb\u8a9e
-kho=\u30b3\u30fc\u30bf\u30f3\u8a9e
-kik=\u30ad\u30af\u30e6\u8a9e
-kin=\u30ad\u30cb\u30e4\u30eb\u30ef\u30f3\u30c0\u8a9e
-kir=\u30ad\u30eb\u30ae\u30b9\u8a9e
-kmb=\u30ad\u30f3\u30d6\u30f3\u30c9\u8a9e
-kok=\u30b3\u30f3\u30ab\u30cb\u8a9e
-kom=\u30b3\u30df\u8a9e
-kon=\u30b3\u30f3\u30b4\u8a9e
-kor=\u97d3\u56fd\u8a9e
-kos=\u30b3\u30b9\u30e9\u30a8\u8a9e
-kpe=\u30af\u30da\u30ec\u8a9e
-krc=\u30ab\u30e9\u30c1\u30e3\u30a4\u30fb\u30d0\u30eb\u30ab\u30eb\u8a9e
-krl=\u30ab\u30ec\u30ea\u30a2\u8a9e
-kro=\u30af\u30eb\u30fc\u8a9e
-kru=\u30af\u30eb\u30af\u8a9e
-kua=\u30af\u30a2\u30cb\u30e3\u30de\u8a9e
-kum=\u30af\u30e0\u30af\u8a9e
-kur=\u30af\u30eb\u30c9\u8a9e
-kut=\u30af\u30c6\u30ca\u30a4\u8a9e
-lad=\u30e9\u30c7\u30a3\u30ce\u8a9e
-lah=\u30e9\u30d5\u30f3\u30c0\u30fc\u8a9e
-lam=\u30e9\u30f3\u30d0\u8a9e
-lao=\u30e9\u30aa\u8a9e
-lat=\u30e9\u30c6\u30f3\u8a9e
-lav=\u30e9\u30c8\u30d3\u30a2\u8a9e
-lez=\u30ec\u30ba\u30ae\u8a9e
-lim=\u30ea\u30f3\u30d6\u30eb\u30d5\u8a9e
-lin=\u30ea\u30f3\u30ac\u30e9\u8a9e
-lit=\u30ea\u30c8\u30a2\u30cb\u30a2\u8a9e
-lol=\u30e2\u30f3\u30b4\u8a9e
-loz=\u30ed\u30b8\u8a9e
-ltz=\u30eb\u30af\u30bb\u30f3\u30d6\u30eb\u30b0\u8a9e
-lua=\u30eb\u30d0\u30fb\u30eb\u30eb\u30a2\u8a9e
-lub=\u30eb\u30d0\u30fb\u30ab\u30bf\u30f3\u30ac\u8a9e
-lug=\u30ac\u30f3\u30c0\u8a9e
-lui=\u30eb\u30a4\u30bb\u30fc\u30cb\u30e7\u8a9e
-lun=\u30eb\u30f3\u30c0\u8a9e
-luo=\u30eb\u30aa\u8a9e
-lus=\u30df\u30be\u8a9e
-mac=\u30de\u30b1\u30c9\u30cb\u30a2\u8a9e
-mad=\u30de\u30c9\u30a5\u30e9\u8a9e
-mag=\u30de\u30ac\u30d2\u30fc\u8a9e
-mah=\u30de\u30fc\u30b7\u30e3\u30eb\u8a9e
-mai=\u30de\u30a4\u30c6\u30a3\u30ea\u30fc\u8a9e
-mak=\u30de\u30ab\u30c3\u30b5\u30eb\u8a9e
-mal=\u30de\u30e9\u30e4\u30fc\u30e9\u30e0\u8a9e
-man=\u30de\u30f3\u30c7\u30a3\u30f3\u30b4\u8a9e
-mao=\u30de\u30aa\u30ea\u8a9e
-map=\u30aa\u30fc\u30b9\u30c8\u30ed\u30cd\u30b7\u30a2\u8af8\u8a9e
-mar=\u30de\u30e9\u30c6\u30a3\u30fc\u8a9e
-mas=\u30de\u30b5\u30a4\u8a9e
-may=\u30de\u30ec\u30fc\u8a9e
-mdf=\u30e2\u30af\u30b7\u30e3\u8a9e
-mdr=\u30de\u30f3\u30c0\u30eb\u8a9e
-men=\u30e1\u30f3\u30c7\u8a9e
-mga=\u4e2d\u671f\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u8a9e
-mic=\u30df\u30af\u30de\u30af\u8a9e
-min=\u30df\u30ca\u30f3\u30ab\u30d0\u30a6\u8a9e
-mis=\u305d\u306e\u4ed6\u306e\u8a00\u8a9e
-mkh=\u30e2\u30f3\u30fb\u30af\u30e1\u30fc\u30eb\u8af8\u8a9e
-mlg=\u30de\u30c0\u30ac\u30b9\u30ab\u30eb\u8a9e
-mlt=\u30de\u30eb\u30bf\u8a9e
-mnc=\u6e80\u5dde\u8a9e
-mni=\u30de\u30cb\u30d7\u30ea\u8a9e
-mno=\u30de\u30ce\u30dc\u8a9e\u65cf
-moh=\u30e2\u30fc\u30db\u30fc\u30af\u8a9e
-mon=\u30e2\u30f3\u30b4\u30eb\u8a9e
-mos=\u30e2\u30b7\u8a9e
-mul=\u8907\u6570\u8a00\u8a9e
-mun=\u30e0\u30f3\u30c0\u8a9e\u65cf
-mus=\u30af\u30ea\u30fc\u30af\u8a9e
-mwl=\u30df\u30e9\u30f3\u30c0\u8a9e
-mwr=\u30de\u30fc\u30eb\u30ef\u30fc\u30ea\u30fc\u8a9e
-myn=\u30de\u30e4\u8a9e\u65cf
-myv=\u30a8\u30eb\u30b8\u30e3\u8a9e
-nah=\u30ca\u30ef\u30c8\u30eb\u8a9e
-nai=\u5317\u7c73\u30a4\u30f3\u30c7\u30a3\u30a2\u30f3\u8af8\u8a9e
-nap=\u30ca\u30dd\u30ea\u8a9e
-nau=\u30ca\u30a6\u30eb\u8a9e
-nav=\u30ca\u30d0\u30db\u8a9e
-nbl=\u5357\u30f3\u30c7\u30d9\u30ec\u8a9e
-nde=\u5317\u30f3\u30c7\u30d9\u30ec\u8a9e
-ndo=\u30f3\u30c9\u30f3\u30ac\u8a9e
-nds=\u4f4e\u5730\u30c9\u30a4\u30c4\u8a9e
-nep=\u30cd\u30d1\u30fc\u30eb\u8a9e
-new=\u30cd\u30ef\u30fc\u30eb\u8a9e
-nia=\u30cb\u30a2\u30b9\u8a9e
-nic=\u30cb\u30ab\u30e9\u30b0\u30a2 \u30b3\u30eb\u30c9\u30d0
-niu=\u30cb\u30a6\u30fc\u30a8\u30a4\u8a9e
-nno=\u30ce\u30eb\u30a6\u30a7\u30fc\u8a9e(\u30cb\u30fc\u30ce\u30b7\u30af)
-nob=\u30ce\u30eb\u30a6\u30a7\u30fc\u8a9e(\u30d6\u30fc\u30af\u30e2\u30fc\u30eb)
-nog=\u30ce\u30ac\u30a4\u8a9e
-non=\u53e4\u30ce\u30eb\u30c9\u8a9e
-nor=\u30ce\u30eb\u30a6\u30a7\u30fc\u8a9e
-nqo=\u30f3\u30b3\u8a9e
-nso=\u5317\u90e8\u30bd\u30c8\u8a9e
-nub=\u30cc\u30d3\u30a2\u8a9e\u65cf
-nwc=\u53e4\u5178\u30cd\u30ef\u30fc\u30eb\u8a9e
-nya=\u30c1\u30c1\u30a7\u30ef\u8a9e
-nym=\u30cb\u30e3\u30e0\u30a6\u30a7\u30b8\u8a9e
-nyn=\u30cb\u30e3\u30f3\u30b3\u30ec\u8a9e
-nyo=\u30cb\u30e7\u30ed\u8a9e
-nzi=\u30f3\u30bc\u30de\u8a9e
-oci=\u30aa\u30c3\u30af\u8a9e(1500\u4ee5\u5f8c)
-oji=\u30aa\u30b8\u30d6\u30ef\u8a9e
-ori=\u30aa\u30ea\u30e4\u30fc\u8a9e
-orm=\u30aa\u30ed\u30e2\u8a9e
-osa=\u30aa\u30bb\u30fc\u30b8\u8a9e
-oss=\u30aa\u30bb\u30c3\u30c8\u8a9e
-ota=\u30aa\u30b9\u30de\u30f3\u30c8\u30eb\u30b3\u8a9e
-oto=\u30aa\u30c8\u30df\u8a9e\u65cf
-paa=\u30d1\u30d7\u30a2\u8af8\u8a9e
-pag=\u30d1\u30f3\u30ac\u30b7\u30ca\u30f3\u8a9e
-pal=\u30d1\u30d5\u30e9\u30f4\u30a3\u30fc\u8a9e
-pam=\u30d1\u30f3\u30d1\u30f3\u30ac\u8a9e
-pan=\u30d1\u30f3\u30b8\u30e3\u30d6\u8a9e
-pap=\u30d1\u30d4\u30a2\u30e1\u30f3\u30c8\u8a9e
-pau=\u30d1\u30e9\u30aa\u8a9e
-peo=\u53e4\u4ee3\u30da\u30eb\u30b7\u30a2\u8a9e
-per=\u30da\u30eb\u30b7\u30a2\u8a9e
-phi=\u30d5\u30a3\u30ea\u30d4\u30f3\u8af8\u8a9e
-phn=\u30d5\u30a7\u30cb\u30ad\u30a2\u8a9e
-pli=\u30d1\u30fc\u30ea\u8a9e
-pol=\u30dd\u30fc\u30e9\u30f3\u30c9\u8a9e
-pon=\u30dd\u30f3\u30da\u30a4\u8a9e
-por=\u30dd\u30eb\u30c8\u30ac\u30eb\u8a9e
-pra=\u30d7\u30e9\u30fc\u30af\u30ea\u30c3\u30c8\u8a9e\u65cf
-pro=\u53e4\u671f\u30d7\u30ed\u30d0\u30f3\u30b9\u8a9e
-pus=\u30d7\u30b7\u30e5\u30c8\u30a5\u30fc\u8a9e\u3001\u30d1\u30b7\u30e5\u30c8\u30a5\u30fc\u8a9e
-que=\u30b1\u30c1\u30e5\u30a2\u8a9e
-raj=\u30e9\u30fc\u30b8\u30e3\u30b9\u30bf\u30fc\u30f3\u8a9e
-rap=\u30e9\u30d1\u30cc\u30a4\u8a9e
-rar=\u30e9\u30ed\u30c8\u30f3\u30ac\u8a9e
-roa=\u30ed\u30de\u30f3\u30b9\u8af8\u8a9e
-roh=\u30ed\u30de\u30f3\u30b7\u30e5\u8a9e
-rom=\u30ed\u30de\u30fc\u30cb\u30fc\u8a9e
-rum=\u30eb\u30fc\u30de\u30cb\u30a2\u8a9e
-run=\u30eb\u30f3\u30c7\u30a3\u8a9e
-rup=\u30a2\u30eb\u30fc\u30de\u30cb\u30a2\u8a9e
-rus=\u30ed\u30b7\u30a2\u8a9e
-sad=\u30b5\u30f3\u30c0\u30a6\u30a7\u8a9e
-sag=\u30b5\u30f3\u30b4\u8a9e
-sah=\u30b5\u30cf\u8a9e
-sai=\u5357\u7c73\u30a4\u30f3\u30c7\u30a3\u30a2\u30f3\u8af8\u8a9e
-sal=\u30bb\u30a4\u30ea\u30c3\u30b7\u30e5\u8a9e\u65cf
-sam=\u30b5\u30de\u30ea\u30a2\u30fb\u30a2\u30e9\u30e0\u8a9e
-san=\u30b5\u30f3\u30b9\u30af\u30ea\u30c3\u30c8\u8a9e
-sas=\u30b5\u30b5\u30af\u8a9e
-sat=\u30b5\u30f3\u30bf\u30fc\u30ea\u30fc\u8a9e
-scn=\u30b7\u30c1\u30ea\u30a2\u8a9e
-sco=\u30b9\u30b3\u30c3\u30c8\u30e9\u30f3\u30c9\u8a9e
-sel=\u30bb\u30ea\u30af\u30d7\u8a9e
-sem=\u30bb\u30e0\u8af8\u8a9e
-sga=\u53e4\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u8a9e
-sgn=\u624b\u307e\u306d\u8a00\u8a9e
-shn=\u30b7\u30e3\u30f3\u8a9e
-sid=\u30b7\u30c0\u30e2\u8a9e
-sin=\u30b7\u30f3\u30cf\u30e9\u8a9e
-sio=\u30b9\u30fc\u8a9e\u65cf
-sit=\u30b9\u30ed\u30d9\u30cb\u30a2 \u30c8\u30e9\u30fc\u30eb
-sla=\u30b9\u30e9\u30d6\u8af8\u8a9e
-slo=\u30b9\u30ed\u30d0\u30ad\u30a2\u8a9e
-slv=\u30b9\u30ed\u30d9\u30cb\u30a2\u8a9e
-sma=\u5357\u30b5\u30fc\u30df\u8a9e
-sme=\u5317\u30b5\u30fc\u30df\u8a9e
-smi=\u30b5\u30fc\u30df\u8af8\u8a9e
-smj=\u30eb\u30ec\u30fb\u30b5\u30fc\u30df\u8a9e
-smn=\u30a4\u30ca\u30ea\u30fb\u30b5\u30fc\u30df\u8a9e
-smo=\u30b5\u30e2\u30a2\u8a9e
-sms=\u30b9\u30b3\u30eb\u30c8\u30fb\u30b5\u30fc\u30df\u8a9e
-sna=\u30b7\u30e7\u30ca\u8a9e
-snd=\u30b7\u30f3\u30c9\u8a9e
-snk=\u30bd\u30cb\u30f3\u30b1\u8a9e
-sog=\u30bd\u30b0\u30c9\u8a9e
-som=\u30bd\u30de\u30ea\u8a9e
-son=\u30bd\u30f3\u30ac\u30a4\u8a9e
-sot=\u5357\u90e8\u30bd\u30c8\u8a9e
-spa=\u30b9\u30da\u30a4\u30f3\u8a9e
-srd=\u30b9\u30ea\u30ca\u30e0 \u30c9\u30eb
-srn=\u30b9\u30ea\u30ca\u30e0\u8a9e
-srp=\u30bb\u30eb\u30d3\u30a2\u8a9e
-srr=\u30bb\u30ec\u30eb\u8a9e
-ssa=\u30ca\u30a4\u30eb\u30fb\u30b5\u30cf\u30e9\u8af8\u8a9e
-ssw=\u30b7\u30b9\u30ef\u30c6\u30a3\u8a9e
-suk=\u30b9\u30af\u30de\u8a9e
-sun=\u30b9\u30f3\u30c0\u8a9e
-sus=\u30b9\u30b9\u8a9e
-sux=\u30b7\u30e5\u30e1\u30fc\u30eb\u8a9e
-swa=\u30b9\u30ef\u30d2\u30ea\u8a9e
-swe=\u30b9\u30a6\u30a7\u30fc\u30c7\u30f3\u8a9e
-syc=\u53e4\u5178\u30b7\u30ea\u30a2\u8a9e
-syr=\u30b7\u30ea\u30a2\u8a9e
-tah=\u30bf\u30d2\u30c1\u8a9e
-tai=\u30bf\u30a4\u8af8\u8a9e
-tam=\u30bf\u30df\u30eb\u8a9e
-tat=\u30bf\u30bf\u30fc\u30eb\u8a9e
-tel=\u30c6\u30eb\u30b0\u8a9e
-tem=\u30c6\u30e0\u30cd\u8a9e
-ter=\u30c6\u30ec\u30fc\u30ce\u8a9e
-tet=\u30c6\u30c8\u30a5\u30f3\u8a9e
-tgk=\u30bf\u30b8\u30af\u8a9e
-tgl=\u30bf\u30ac\u30ed\u30b0\u8a9e
-tha=\u30bf\u30a4\u8a9e
-tib=\u30c1\u30d9\u30c3\u30c8\u8a9e
-tig=\u30c6\u30a3\u30b0\u30ec\u8a9e
-tir=\u30c6\u30a3\u30b0\u30ea\u30cb\u30e3\u8a9e
-tiv=\u30c6\u30a3\u30d6\u8a9e
-tkl=\u30c8\u30b1\u30e9\u30a6\u8a9e
-tlh=\u30af\u30ea\u30f3\u30b4\u30f3\u8a9e
-tli=\u30c8\u30ea\u30f3\u30ae\u30c3\u30c8\u8a9e
-tmh=\u30bf\u30de\u30b7\u30a7\u30af\u8a9e
-tog=\u30c8\u30f3\u30ac\u8a9e(\u30cb\u30a2\u30b5)
-ton=\u30c8\u30f3\u30ac\u8a9e(\u30c8\u30f3\u30ac\u8af8\u5cf6)
-tpi=\u30c8\u30af\u30fb\u30d4\u30b7\u30f3\u8a9e
-tsi=\u30c1\u30e0\u30b7\u30e5\u8a9e
-tsn=\u30c4\u30ef\u30ca\u8a9e
-tso=\u30c4\u30a9\u30f3\u30ac\u8a9e
-tuk=\u30c8\u30eb\u30af\u30e1\u30f3\u8a9e
-tum=\u30c8\u30a5\u30f3\u30d6\u30ab\u8a9e
-tup=\u30c8\u30a5\u30d4\u8a9e\u65cf
-tur=\u30c8\u30eb\u30b3\u8a9e
-tut=\u30a2\u30eb\u30bf\u30a4\u8af8\u8a9e
-tvl=\u30c4\u30d0\u30eb\u8a9e
-twi=\u30c8\u30a6\u30a3\u8a9e
-tyv=\u30c8\u30a5\u30f4\u30a1\u8a9e
-udm=\u30a6\u30c9\u30e0\u30eb\u30c8\u8a9e
-uga=\u30a6\u30ac\u30ea\u30c8\u8a9e
-uig=\u30a6\u30a4\u30b0\u30eb\u8a9e
-ukr=\u30a6\u30af\u30e9\u30a4\u30ca\u8a9e
-umb=\u30e0\u30d6\u30f3\u30c9\u30a5\u8a9e
-und=\u8a00\u8a9e\u4e0d\u660e
-urd=\u30a6\u30eb\u30c9\u30a5\u30fc\u8a9e
-uzb=\u30a6\u30ba\u30d9\u30af\u8a9e
-vai=\u30f4\u30a1\u30a4\u8a9e
-ven=\u30d9\u30f3\u30c0\u8a9e
-vie=\u30d9\u30c8\u30ca\u30e0\u8a9e
-vol=\u30f4\u30a9\u30e9\u30d4\u30e5\u30fc\u30af\u8a9e
-vot=\u30f4\u30a9\u30fc\u30c8\u8a9e
-wak=\u30ef\u30ab\u30b7\u8a9e\u65cf
-wal=\u30a6\u30a9\u30e9\u30a4\u30bf\u8a9e
-war=\u30ef\u30e9\u30a4\u8a9e
-was=\u30ef\u30b7\u30e7\u8a9e
-wel=\u30a6\u30a7\u30fc\u30eb\u30ba\u8a9e
-wen=\u30bd\u30eb\u30d3\u30a2\u8a9e\u65cf
-wln=\u30ef\u30ed\u30f3\u8a9e
-wol=\u30a6\u30a9\u30ed\u30d5\u8a9e
-xal=\u30ab\u30eb\u30e0\u30a4\u30af\u8a9e
-xho=\u30b3\u30fc\u30b5\u8a9e
-yao=\u30e4\u30aa\u8a9e
-yap=\u30e4\u30c3\u30d7\u8a9e
-yid=\u30a4\u30c7\u30a3\u30c3\u30b7\u30e5\u8a9e
-yor=\u30e8\u30eb\u30d0\u8a9e
-ypk=\u30e6\u30d4\u30c3\u30af\u8a9e\u65cf
-zap=\u30b5\u30dd\u30c6\u30ab\u8a9e
-zbl=\u30d6\u30ea\u30b9\u30b7\u30f3\u30dc\u30eb
-zen=\u30bc\u30ca\u30ac\u8a9e
-zha=\u30c1\u30e5\u30ef\u30f3\u8a9e
-znd=\u30b6\u30f3\u30c7\u8a9e
-zul=\u30ba\u30fc\u30eb\u30fc\u8a9e
-zun=\u30ba\u30cb\u8a9e
-zxx=\u8a00\u8a9e\u7684\u5185\u5bb9\u306a\u3057
-zza=\u30b6\u30b6\u8a9e
+aar=アファル語
+abk=アブハーズ語
+ace=アチェ語
+ach=アチョリ語
+ada=アダングメ語
+ady=アディゲ語
+afa=アフガニー (1927-2002)
+afh=アフリヒリ語
+afr=アフリカーンス語
+ain=アイヌ語
+aka=アカン語
+akk=アッカド語
+alb=アルバニア語
+ale=アレウト語
+alg=アルゴンキアン語族
+alt=南アルタイ語
+amh=アムハラ語
+ang=古英語
+anp=アンギカ語
+apa=アパッチ語族
+ara=アルゼンチン アゥストラール
+arc=アラム語
+arg=アラゴン語
+arm=アルメニア語
+arn=マプチェ語
+arp=アラパホー語
+art=人工諸語
+arw=アラワク語
+asm=アッサム語
+ast=アストゥリアス語
+ath=アサパスカン語族
+aus=オーストラリア語族
+ava=アヴァル語
+ave=アヴェスタ語
+awa=アワディー語
+aym=アイマラ語
+aze=アゼルバイジャン語
+bad=ボスニア ディナール
+bai=バミレケ語族
+bak=バシキール語
+bal=バルーチー語
+bam=ボスニア マルク (BAM)
+ban=バリ語
+baq=バスク語
+bas=バサ語
+bat=バルト諸語
+bej=ベジャ語
+bel=ベルギー フラン (BEL)
+bem=ベンバ語
+ben=ベンガル語
+ber=ベルベル諸語
+bho=ボージュプリー語
+bih=ビハール語
+bik=ビコル語
+bin=ビニ語
+bis=ビスラマ語
+bla=シクシカ語
+bnt=バントゥ諸語
+bos=ボスニア語
+bra=ブラジ語
+bre=ブラジル クルゼイロ (1990-1993)
+btk=バタク語
+bua=ブリヤート語
+bug=ブギ語
+bul=ブルガリア語
+bur=ビルマ語
+byn=ビリン語
+cad=カドー語
+cai=中米インディアン諸語
+car=カリブ語
+cat=カタロニア語
+cau=コーカサス諸語
+ceb=セブアノ語
+cel=ケルト諸語
+cha=チャモロ語
+chb=チブチャ語
+che=チェチェン語
+chg=チャガタイ語
+chi=中国語
+chk=チューク語
+chm=マリ語
+chn=チヌーク混成語
+cho=チョクトー語
+chp=チペワイアン語
+chr=チェロキー語
+chu=教会スラブ語
+chv=チュヴァシュ語
+chy=シャイアン語
+cmc=チャム語族
+cop=コプト語
+cor=コーンウォール語
+cos=コルシカ語
+cpe=英語が基盤の混成語・混合語
+cpf=フランス語が基盤の混成語・混合語
+cpp=ポルトガル語が基盤の混成語・混合語
+cre=クリー語
+crh=クリミア・タタール語
+crp=その他の混成語・混合語
+csb=カシューブ語
+cus=クシュ諸語
+cze=チェコ語
+dak=ダコタ語
+dan=デンマーク語
+dar=ダルグワ語
+day=ダヤク語
+del=デラウェア語
+den=スレイビー語
+dgr=ドグリブ語
+din=ディンカ語
+div=ディベヒ語
+doi=ドーグリー語
+dra=ドラヴィダ諸語
+dsb=低地ソルブ語
+dua=ドゥアラ語
+dum=中世オランダ語
+dut=オランダ語
+dyu=ジュラ語
+dzo=ゾンカ語
+efi=エフィク語
+egy=古代エジプト語
+eka=エカジュク語
+elx=エラム語
+eng=英語
+enm=中英語
+epo=エスペラント語
+est=エストニア語
+ewe=エウェ語
+ewo=エウォンド語
+fan=ファング語
+fao=フェロー語
+fat=ファンティー語
+fij=フィジー語
+fil=フィリピノ語
+fin=フィンランド語
+fiu=フィン・ウゴル諸語
+fon=フォン語
+fre=フランス語
+frm=中期フランス語
+fro=古フランス語
+frr=北フリジア語
+frs=東フリジア語
+fry=西フリジア語
+ful=フラ語
+fur=フリウリ語
+gaa=ガ語
+gay=ガヨ語
+gba=バヤ語
+gem=ゲルマン諸語
+geo=グルジア語
+ger=ドイツ語
+gez=ゲエズ語
+gil=キリバス語
+gla=ゲール語
+gle=アイルランド語
+glg=ガリシア語
+glv=マン島語
+gmh=中高ドイツ語
+goh=古高ドイツ語
+gon=ゴーンディー語
+gor=ゴロンタロ語
+got=ゴート語
+grb=グレボ語
+grc=古代ギリシャ語
+gre=現代ギリシャ語(1453-)
+grn=グアラニー語
+gsw=スイスドイツ語
+guj=グジャラト語
+gwi=グウィッチン語
+hai=ハイダ語
+hat=ハイチ語
+hau=ハウサ語
+haw=ハワイ語
+heb=ヘブライ語
+her=ヘレロ語
+hil=ヒリガイノン語
+him=ヒマチャル語
+hin=ヒンディー語
+hit=ヒッタイト語
+hmn=フモン語
+hmo=ヒリモトゥ語
+hrv=クロアチア語
+hsb=高地ソルブ語
+hun=ハンガリー語
+hup=フパ語
+iba=イバン語
+ibo=イボ語
+ice=アイスランド語
+ido=イド語
+iii=四川イ(彝)語
+ijo=イジョー語
+iku=イヌクウティトット語
+ile=インターリング
+ilo=イロカノ語
+ina=インターリングア語(国際補助語協会)
+inc=インド諸語
+ind=インドネシア語
+ine=印欧諸語
+inh=イングーシ語
+ipk=イヌピアック語
+ira=イラン語
+iro=イロコイ語族
+ita=イタリア語
+jav=ジャワ語
+jbo=ロジバン語
+jpn=日本語
+jpr=ユダヤ・ペルシア語
+jrb=ユダヤ・アラビア語
+kaa=カラカルパク語
+kab=カビル語
+kac=カチン語
+kal=カラアリス語
+kam=カンバ語
+kan=カンナダ語
+kar=カレン語
+kas=カシミール語
+kau=カヌリ語
+kaw=カウィ語
+kaz=カザフ語
+kbd=カバルド語
+kha=カシ語
+khi=コイサン諸語
+khm=中央クメール語
+kho=コータン語
+kik=キクユ語
+kin=キニヤルワンダ語
+kir=キルギス語
+kmb=キンブンド語
+kok=コンカニ語
+kom=コミ語
+kon=コンゴ語
+kor=韓国語
+kos=コスラエ語
+kpe=クペレ語
+krc=カラチャイ・バルカル語
+krl=カレリア語
+kro=クルー語
+kru=クルク語
+kua=クアニャマ語
+kum=クムク語
+kur=クルド語
+kut=クテナイ語
+lad=ラディノ語
+lah=ラフンダー語
+lam=ランバ語
+lao=ラオ語
+lat=ラテン語
+lav=ラトビア語
+lez=レズギ語
+lim=リンブルフ語
+lin=リンガラ語
+lit=リトアニア語
+lol=モンゴ語
+loz=ロジ語
+ltz=ルクセンブルグ語
+lua=ルバ・ルルア語
+lub=ルバ・カタンガ語
+lug=ガンダ語
+lui=ルイセーニョ語
+lun=ルンダ語
+luo=ルオ語
+lus=ミゾ語
+mac=マケドニア語
+mad=マドゥラ語
+mag=マガヒー語
+mah=マーシャル語
+mai=マイティリー語
+mak=マカッサル語
+mal=マラヤーラム語
+man=マンディンゴ語
+mao=マオリ語
+map=オーストロネシア諸語
+mar=マラティー語
+mas=マサイ語
+may=マレー語
+mdf=モクシャ語
+mdr=マンダル語
+men=メンデ語
+mga=中期アイルランド語
+mic=ミクマク語
+min=ミナンカバウ語
+mis=その他の言語
+mkh=モン・クメール諸語
+mlg=マダガスカル語
+mlt=マルタ語
+mnc=満州語
+mni=マニプリ語
+mno=マノボ語族
+moh=モーホーク語
+mon=モンゴル語
+mos=モシ語
+mul=複数言語
+mun=ムンダ語族
+mus=クリーク語
+mwl=ミランダ語
+mwr=マールワーリー語
+myn=マヤ語族
+myv=エルジャ語
+nah=ナワトル語
+nai=北米インディアン諸語
+nap=ナポリ語
+nau=ナウル語
+nav=ナバホ語
+nbl=南ンデベレ語
+nde=北ンデベレ語
+ndo=ンドンガ語
+nds=低地ドイツ語
+nep=ネパール語
+new=ネワール語
+nia=ニアス語
+nic=ニカラグア コルドバ
+niu=ニウーエイ語
+nno=ノルウェー語(ニーノシク)
+nob=ノルウェー語(ブークモール)
+nog=ノガイ語
+non=古ノルド語
+nor=ノルウェー語
+nqo=ンコ語
+nso=北部ソト語
+nub=ヌビア語族
+nwc=古典ネワール語
+nya=チチェワ語
+nym=ニャムウェジ語
+nyn=ニャンコレ語
+nyo=ニョロ語
+nzi=ンゼマ語
+oci=オック語(1500以後)
+oji=オジブワ語
+ori=オリヤー語
+orm=オロモ語
+osa=オセージ語
+oss=オセット語
+ota=オスマントルコ語
+oto=オトミ語族
+paa=パプア諸語
+pag=パンガシナン語
+pal=パフラヴィー語
+pam=パンパンガ語
+pan=パンジャブ語
+pap=パピアメント語
+pau=パラオ語
+peo=古代ペルシア語
+per=ペルシア語
+phi=フィリピン諸語
+phn=フェニキア語
+pli=パーリ語
+pol=ポーランド語
+pon=ポンペイ語
+por=ポルトガル語
+pra=プラークリット語族
+pro=古期プロバンス語
+pus=プシュトゥー語、パシュトゥー語
+que=ケチュア語
+raj=ラージャスターン語
+rap=ラパヌイ語
+rar=ラロトンガ語
+roa=ロマンス諸語
+roh=ロマンシュ語
+rom=ロマーニー語
+rum=ルーマニア語
+run=ルンディ語
+rup=アルーマニア語
+rus=ロシア語
+sad=サンダウェ語
+sag=サンゴ語
+sah=サハ語
+sai=南米インディアン諸語
+sal=セイリッシュ語族
+sam=サマリア・アラム語
+san=サンスクリット語
+sas=ササク語
+sat=サンターリー語
+scn=シチリア語
+sco=スコットランド語
+sel=セリクプ語
+sem=セム諸語
+sga=古アイルランド語
+sgn=手まね言語
+shn=シャン語
+sid=シダモ語
+sin=シンハラ語
+sio=スー語族
+sit=スロベニア トラール
+sla=スラブ諸語
+slo=スロバキア語
+slv=スロベニア語
+sma=南サーミ語
+sme=北サーミ語
+smi=サーミ諸語
+smj=ルレ・サーミ語
+smn=イナリ・サーミ語
+smo=サモア語
+sms=スコルト・サーミ語
+sna=ショナ語
+snd=シンド語
+snk=ソニンケ語
+sog=ソグド語
+som=ソマリ語
+son=ソンガイ語
+sot=南部ソト語
+spa=スペイン語
+srd=スリナム ドル
+srn=スリナム語
+srp=セルビア語
+srr=セレル語
+ssa=ナイル・サハラ諸語
+ssw=シスワティ語
+suk=スクマ語
+sun=スンダ語
+sus=スス語
+sux=シュメール語
+swa=スワヒリ語
+swe=スウェーデン語
+syc=古典シリア語
+syr=シリア語
+tah=タヒチ語
+tai=タイ諸語
+tam=タミル語
+tat=タタール語
+tel=テルグ語
+tem=テムネ語
+ter=テレーノ語
+tet=テトゥン語
+tgk=タジク語
+tgl=タガログ語
+tha=タイ語
+tib=チベット語
+tig=ティグレ語
+tir=ティグリニャ語
+tiv=ティブ語
+tkl=トケラウ語
+tlh=クリンゴン語
+tli=トリンギット語
+tmh=タマシェク語
+tog=トンガ語(ニアサ)
+ton=トンガ語(トンガ諸島)
+tpi=トク・ピシン語
+tsi=チムシュ語
+tsn=ツワナ語
+tso=ツォンガ語
+tuk=トルクメン語
+tum=トゥンブカ語
+tup=トゥピ語族
+tur=トルコ語
+tut=アルタイ諸語
+tvl=ツバル語
+twi=トウィ語
+tyv=トゥヴァ語
+udm=ウドムルト語
+uga=ウガリト語
+uig=ウイグル語
+ukr=ウクライナ語
+umb=ムブンドゥ語
+und=言語不明
+urd=ウルドゥー語
+uzb=ウズベク語
+vai=ヴァイ語
+ven=ベンダ語
+vie=ベトナム語
+vol=ヴォラピューク語
+vot=ヴォート語
+wak=ワカシ語族
+wal=ウォライタ語
+war=ワライ語
+was=ワショ語
+wel=ウェールズ語
+wen=ソルビア語族
+wln=ワロン語
+wol=ウォロフ語
+xal=カルムイク語
+xho=コーサ語
+yao=ヤオ語
+yap=ヤップ語
+yid=イディッシュ語
+yor=ヨルバ語
+ypk=ユピック語族
+zap=サポテカ語
+zbl=ブリスシンボル
+zen=ゼナガ語
+zha=チュワン語
+znd=ザンデ語
+zul=ズールー語
+zun=ズニ語
+zxx=言語的内容なし
+zza=ザザ語
 
 # script names
 # key is ISO 15924 script code
 
-Arab=\u30a2\u30e9\u30d3\u30a2\u6587\u5b57
-Armi=\u5e1d\u56fd\u30a2\u30e9\u30e0\u6587\u5b57
-Armn=\u30a2\u30eb\u30e1\u30cb\u30a2\u6587\u5b57
-Avst=\u30a2\u30f4\u30a7\u30b9\u30bf\u30fc\u6587\u5b57
-Bali=\u30d0\u30ea\u6587\u5b57
-Bamu=\u30d0\u30e0\u30f3\u6587\u5b57
-Bass=\u30d0\u30b5\u6587\u5b57
-Batk=\u30d0\u30bf\u30af\u6587\u5b57
-Beng=\u30d9\u30f3\u30ac\u30eb\u6587\u5b57
-Blis=\u30d6\u30ea\u30b9\u30b7\u30f3\u30dc\u30eb
-Bopo=\u6ce8\u97f3\u5b57\u6bcd
-Brah=\u30d6\u30e9\u30fc\u30d5\u30df\u30fc\u6587\u5b57
-Brai=\u30d6\u30e9\u30a4\u30e6\u70b9\u5b57
-Bugi=\u30d6\u30ae\u30b9\u6587\u5b57
-Buhd=\u30d6\u30d2\u30c3\u30c9\u6587\u5b57
-Cakm=\u30c1\u30e3\u30af\u30de\u6587\u5b57
-Cans=\u7d71\u5408\u30ab\u30ca\u30c0\u5148\u4f4f\u6c11\u97f3\u7bc0\u6587\u5b57
-Cari=\u30ab\u30ea\u30a2\u6587\u5b57
-Cham=\u30c1\u30e3\u30e0\u6587\u5b57
-Cher=\u30c1\u30a7\u30ed\u30ad\u30fc\u6587\u5b57
-Cirt=\u30ad\u30a2\u30b9\u6587\u5b57
-Copt=\u30b3\u30d7\u30c8\u6587\u5b57
-Cprt=\u30ad\u30d7\u30ed\u30b9\u6587\u5b57
-Cyrl=\u30ad\u30ea\u30eb\u6587\u5b57
-Cyrs=\u53e4\u4ee3\u6559\u4f1a\u30b9\u30e9\u30d6\u8a9e\u30ad\u30ea\u30eb\u6587\u5b57
-Deva=\u30c7\u30fc\u30d0\u30ca\u30fc\u30ac\u30ea\u30fc\u6587\u5b57
-Dsrt=\u30c7\u30bb\u30ec\u30c3\u30c8\u6587\u5b57
-Dupl=\u30c7\u30e5\u30d7\u30ed\u30ef\u30a8\u5f0f\u901f\u8a18
-Egyd=\u30a8\u30b8\u30d7\u30c8\u6c11\u8846\u6587\u5b57
-Egyh=\u30a8\u30b8\u30d7\u30c8\u795e\u5b98\u6587\u5b57
-Egyp=\u30a8\u30b8\u30d7\u30c8\u8056\u523b\u6587\u5b57
-Elba=\u30a8\u30eb\u30d0\u30b5\u30f3\u6587\u5b57
-Ethi=\u30a8\u30c1\u30aa\u30d4\u30a2\u6587\u5b57
-Geok=\u30b8\u30e7\u30fc\u30b8\u30a2\u6587\u5b57(\u30d5\u30c4\u30ea)
-Geor=\u30b8\u30e7\u30fc\u30b8\u30a2\u6587\u5b57
-Glag=\u30b0\u30e9\u30b4\u30eb\u6587\u5b57
-Goth=\u30b4\u30fc\u30c8\u6587\u5b57
-Gran=\u30b0\u30e9\u30f3\u30bf\u6587\u5b57
-Grek=\u30ae\u30ea\u30b7\u30e3\u6587\u5b57
-Gujr=\u30b0\u30b8\u30e3\u30e9\u30fc\u30c8\u6587\u5b57
-Guru=\u30b0\u30eb\u30e0\u30ad\u30fc\u6587\u5b57
-Hang=\u30cf\u30f3\u30b0\u30eb
-Hani=\u6f22\u5b57
-Hano=\u30cf\u30cc\u30ce\u30aa\u6587\u5b57
-Hans=\u7c21\u4f53\u5b57
-Hant=\u7e41\u4f53\u5b57
-Hebr=\u30d8\u30d6\u30e9\u30a4\u6587\u5b57
-Hira=\u3072\u3089\u304c\u306a
-Hmng=\u30d1\u30cf\u30a6\u30fb\u30d5\u30e2\u30f3\u6587\u5b57
-Hrkt=\u4eee\u540d
-Hung=\u53e4\u4ee3\u30cf\u30f3\u30ac\u30ea\u30fc\u6587\u5b57
-Inds=\u30a4\u30f3\u30c0\u30b9\u6587\u5b57
-Ital=\u53e4\u30a4\u30bf\u30ea\u30a2\u6587\u5b57
-Java=\u30b8\u30e3\u30ef\u6587\u5b57
-Jpan=\u65e5\u672c\u8a9e\u306e\u6587\u5b57
-Kali=\u30ab\u30e4\u30fc\u6587\u5b57
-Kana=\u30ab\u30bf\u30ab\u30ca
-Khar=\u30ab\u30ed\u30fc\u30b7\u30e5\u30c6\u30a3\u30fc\u6587\u5b57
-Khmr=\u30af\u30e1\u30fc\u30eb\u6587\u5b57
-Knda=\u30ab\u30f3\u30ca\u30c0\u6587\u5b57
-Kore=\u97d3\u56fd\u8a9e\u306e\u6587\u5b57
-Kpel=\u30af\u30da\u30ec\u6587\u5b57
-Kthi=\u30ab\u30a4\u30c6\u30a3\u6587\u5b57
-Lana=\u30e9\u30fc\u30f3\u30ca\u30fc\u6587\u5b57
-Laoo=\u30e9\u30aa\u6587\u5b57
-Latf=\u30e9\u30c6\u30f3\u6587\u5b57(\u30c9\u30a4\u30c4\u6587\u5b57)
-Latg=\u30e9\u30c6\u30f3\u6587\u5b57 (\u30b2\u30fc\u30eb\u6587\u5b57)
-Latn=\u30e9\u30c6\u30f3\u6587\u5b57
-Lepc=\u30ec\u30d7\u30c1\u30e3\u6587\u5b57
-Limb=\u30ea\u30f3\u30d6\u6587\u5b57
-Lina=\u7dda\u6587\u5b57A
-Linb=\u7dda\u6587\u5b57B
-Lisu=\u30d5\u30ec\u30a4\u30b6\u30fc\u6587\u5b57
-Loma=\u30ed\u30de\u6587\u5b57
-Lyci=\u30ea\u30ad\u30a2\u6587\u5b57
-Lydi=\u30ea\u30c7\u30a3\u30a2\u6587\u5b57
-Mand=\u30de\u30f3\u30c0\u6587\u5b57
-Mani=\u30de\u30cb\u6587\u5b57
-Maya=\u30de\u30e4\u8c61\u5f62\u6587\u5b57
-Mend=\u30e1\u30f3\u30c7\u6587\u5b57
-Merc=\u30e1\u30ed\u30a8\u6587\u5b57\u8349\u66f8\u4f53
-Mero=\u30e1\u30ed\u30a8\u6587\u5b57
-Mlym=\u30de\u30e9\u30e4\u30fc\u30e9\u30e0\u6587\u5b57
-Mong=\u30e2\u30f3\u30b4\u30eb\u6587\u5b57
-Moon=\u30e0\u30fc\u30f3\u6587\u5b57
-Mtei=\u30e1\u30a4\u30c6\u30a4\u6587\u5b57
-Mymr=\u30df\u30e3\u30f3\u30de\u30fc\u6587\u5b57
-Narb=\u53e4\u4ee3\u5317\u30a2\u30e9\u30d3\u30a2\u6587\u5b57
-Nbat=\u30ca\u30d0\u30c6\u30a2\u6587\u5b57
-Nkgb=\u30ca\u30b7\u65cf\u30b2\u30d0\u6587\u5b57
-Nkoo=\u30f3\u30b3\u6587\u5b57
-Ogam=\u30aa\u30ac\u30e0\u6587\u5b57
-Olck=\u30aa\u30eb\u30c1\u30ad\u6587\u5b57
-Orkh=\u30aa\u30eb\u30db\u30f3\u6587\u5b57
-Orya=\u30aa\u30c7\u30a3\u30a2\u6587\u5b57
-Osma=\u30aa\u30b9\u30de\u30cb\u30a2\u6587\u5b57
-Palm=\u30d1\u30eb\u30df\u30e9\u6587\u5b57
-Perm=\u53e4\u307a\u30eb\u30e0\u6587\u5b57
-Phag=\u30d1\u30b9\u30d1\u6587\u5b57
-Phli=\u7891\u6587\u30d1\u30d5\u30e9\u30f4\u30a3\u30fc\u6587\u5b57
-Phlp=\u8a69\u7de8\u7528\u30d1\u30d5\u30e9\u30f4\u30a3\u30fc\u6587\u5b57
-Phlv=\u66f8\u7269\u7528\u30d1\u30d5\u30e9\u30f4\u30a3\u30fc\u6587\u5b57
-Phnx=\u30d5\u30a7\u30cb\u30ad\u30a2\u6587\u5b57
-Plrd=\u30dd\u30e9\u30fc\u30c9\u97f3\u58f0\u8a18\u53f7
-Prti=\u7891\u6587\u30d1\u30eb\u30c6\u30a3\u30a2\u6587\u5b57
-Rjng=\u30eb\u30b8\u30e3\u30f3\u6587\u5b57
-Roro=\u30ed\u30f3\u30b4\u30ed\u30f3\u30b4\u6587\u5b57
-Runr=\u30eb\u30fc\u30f3\u6587\u5b57
-Samr=\u30b5\u30de\u30ea\u30a2\u6587\u5b57
-Sara=\u30b5\u30e9\u30c6\u30a3\u6587\u5b57
-Sarb=\u53e4\u4ee3\u5357\u30a2\u30e9\u30d3\u30a2\u6587\u5b57
-Saur=\u30b5\u30a6\u30e9\u30fc\u30b7\u30e5\u30c8\u30e9\u6587\u5b57
-Sgnw=\u624b\u8a71\u6587\u5b57
-Shaw=\u30b7\u30e7\u30fc\u6587\u5b57
-Sind=\u30af\u30c0\u30ef\u30c7\u30a3\u6587\u5b57
-Sinh=\u30b7\u30f3\u30cf\u30e9\u6587\u5b57
-Sund=\u30b9\u30f3\u30c0\u6587\u5b57
-Sylo=\u30b7\u30ed\u30c6\u30a3\u30fb\u30ca\u30b0\u30ea\u6587\u5b57
-Syrc=\u30b7\u30ea\u30a2\u6587\u5b57
-Syre=\u30b7\u30ea\u30a2\u6587\u5b57(\u30a8\u30b9\u30c8\u30e9\u30f3\u30b2\u30ed\u6587\u5b57)
-Syrj=\u30b7\u30ea\u30a2\u6587\u5b57(\u897f\u65b9\u30b7\u30ea\u30a2\u6587\u5b57)
-Syrn=\u30b7\u30ea\u30a2\u6587\u5b57(\u6771\u65b9\u30b7\u30ea\u30a2\u6587\u5b57)
-Tagb=\u30bf\u30b0\u30d0\u30f3\u30ef\u6587\u5b57
-Tale=\u30bf\u30a4\u30fb\u30ec\u6587\u5b57
-Talu=\u65b0\u30bf\u30a4\u30fb\u30eb\u30fc\u6587\u5b57
-Taml=\u30bf\u30df\u30eb\u6587\u5b57
-Tavt=\u30bf\u30a4\u30fb\u30f4\u30a7\u30c8\u6587\u5b57
-Telu=\u30c6\u30eb\u30b0\u6587\u5b57
-Teng=\u30c6\u30f3\u30b0\u30ef\u30fc\u30eb\u6587\u5b57
-Tfng=\u30c6\u30a3\u30d5\u30ca\u30b0\u6587\u5b57
-Tglg=\u30bf\u30ac\u30ed\u30b0\u6587\u5b57
-Thaa=\u30bf\u30fc\u30ca\u6587\u5b57
-Thai=\u30bf\u30a4\u6587\u5b57
-Tibt=\u30c1\u30d9\u30c3\u30c8\u6587\u5b57
-Ugar=\u30a6\u30ac\u30ea\u30c3\u30c8\u6587\u5b57
-Vaii=\u30f4\u30a1\u30a4\u6587\u5b57
-Visp=\u8996\u8a71\u6cd5
-Wara=\u30d0\u30e9\u30f3\u30fb\u30af\u30b7\u30c6\u30a3\u6587\u5b57
-Xpeo=\u53e4\u4ee3\u30da\u30eb\u30b7\u30a2\u6587\u5b57
-Xsux=\u30b7\u30e5\u30e1\u30fc\u30eb\uff1d\u30a2\u30c3\u30ab\u30c9\u8a9e\u6954\u5f62\u6587\u5b57
-Yiii=\u30a4\u6587\u5b57
-Zinh=\u57fa\u5e95\u6587\u5b57\u306e\u7a2e\u5225\u3092\u7d99\u627f\u3059\u308b\u7d50\u5408\u6587\u5b57
-Zmth=\u6570\u5b66\u8a18\u53f7
-Zsym=\u8a18\u53f7\u6587\u5b57
-Zxxx=\u975e\u8868\u8a18
-Zyyy=\u5171\u901a\u6587\u5b57
-Zzzz=\u4e0d\u660e\u306a\u6587\u5b57
+Arab=アラビア文字
+Armi=帝国アラム文字
+Armn=アルメニア文字
+Avst=アヴェスター文字
+Bali=バリ文字
+Bamu=バムン文字
+Bass=バサ文字
+Batk=バタク文字
+Beng=ベンガル文字
+Blis=ブリスシンボル
+Bopo=注音字母
+Brah=ブラーフミー文字
+Brai=ブライユ点字
+Bugi=ブギス文字
+Buhd=ブヒッド文字
+Cakm=チャクマ文字
+Cans=統合カナダ先住民音節文字
+Cari=カリア文字
+Cham=チャム文字
+Cher=チェロキー文字
+Cirt=キアス文字
+Copt=コプト文字
+Cprt=キプロス文字
+Cyrl=キリル文字
+Cyrs=古代教会スラブ語キリル文字
+Deva=デーバナーガリー文字
+Dsrt=デセレット文字
+Dupl=デュプロワエ式速記
+Egyd=エジプト民衆文字
+Egyh=エジプト神官文字
+Egyp=エジプト聖刻文字
+Elba=エルバサン文字
+Ethi=エチオピア文字
+Geok=ジョージア文字(フツリ)
+Geor=ジョージア文字
+Glag=グラゴル文字
+Goth=ゴート文字
+Gran=グランタ文字
+Grek=ギリシャ文字
+Gujr=グジャラート文字
+Guru=グルムキー文字
+Hang=ハングル
+Hani=漢字
+Hano=ハヌノオ文字
+Hans=簡体字
+Hant=繁体字
+Hebr=ヘブライ文字
+Hira=ひらがな
+Hmng=パハウ・フモン文字
+Hrkt=仮名
+Hung=古代ハンガリー文字
+Inds=インダス文字
+Ital=古イタリア文字
+Java=ジャワ文字
+Jpan=日本語の文字
+Kali=カヤー文字
+Kana=カタカナ
+Khar=カローシュティー文字
+Khmr=クメール文字
+Knda=カンナダ文字
+Kore=韓国語の文字
+Kpel=クペレ文字
+Kthi=カイティ文字
+Lana=ラーンナー文字
+Laoo=ラオ文字
+Latf=ラテン文字(ドイツ文字)
+Latg=ラテン文字 (ゲール文字)
+Latn=ラテン文字
+Lepc=レプチャ文字
+Limb=リンブ文字
+Lina=線文字A
+Linb=線文字B
+Lisu=フレイザー文字
+Loma=ロマ文字
+Lyci=リキア文字
+Lydi=リディア文字
+Mand=マンダ文字
+Mani=マニ文字
+Maya=マヤ象形文字
+Mend=メンデ文字
+Merc=メロエ文字草書体
+Mero=メロエ文字
+Mlym=マラヤーラム文字
+Mong=モンゴル文字
+Moon=ムーン文字
+Mtei=メイテイ文字
+Mymr=ミャンマー文字
+Narb=古代北アラビア文字
+Nbat=ナバテア文字
+Nkgb=ナシ族ゲバ文字
+Nkoo=ンコ文字
+Ogam=オガム文字
+Olck=オルチキ文字
+Orkh=オルホン文字
+Orya=オディア文字
+Osma=オスマニア文字
+Palm=パルミラ文字
+Perm=古ぺルム文字
+Phag=パスパ文字
+Phli=碑文パフラヴィー文字
+Phlp=詩編用パフラヴィー文字
+Phlv=書物用パフラヴィー文字
+Phnx=フェニキア文字
+Plrd=ポラード音声記号
+Prti=碑文パルティア文字
+Rjng=ルジャン文字
+Roro=ロンゴロンゴ文字
+Runr=ルーン文字
+Samr=サマリア文字
+Sara=サラティ文字
+Sarb=古代南アラビア文字
+Saur=サウラーシュトラ文字
+Sgnw=手話文字
+Shaw=ショー文字
+Sind=クダワディ文字
+Sinh=シンハラ文字
+Sund=スンダ文字
+Sylo=シロティ・ナグリ文字
+Syrc=シリア文字
+Syre=シリア文字(エストランゲロ文字)
+Syrj=シリア文字(西方シリア文字)
+Syrn=シリア文字(東方シリア文字)
+Tagb=タグバンワ文字
+Tale=タイ・レ文字
+Talu=新タイ・ルー文字
+Taml=タミル文字
+Tavt=タイ・ヴェト文字
+Telu=テルグ文字
+Teng=テングワール文字
+Tfng=ティフナグ文字
+Tglg=タガログ文字
+Thaa=ターナ文字
+Thai=タイ文字
+Tibt=チベット文字
+Ugar=ウガリット文字
+Vaii=ヴァイ文字
+Visp=視話法
+Wara=バラン・クシティ文字
+Xpeo=古代ペルシア文字
+Xsux=シュメール＝アッカド語楔形文字
+Yiii=イ文字
+Zinh=基底文字の種別を継承する結合文字
+Zmth=数学記号
+Zsym=記号文字
+Zxxx=非表記
+Zyyy=共通文字
+Zzzz=不明な文字
 
 # country names
 # key is ISO 3166 country code
 
-AD=\u30a2\u30f3\u30c9\u30e9
-AE=\u30a2\u30e9\u30d6\u9996\u9577\u56fd\u9023\u90a6
-AF=\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3
-AG=\u30a2\u30f3\u30c6\u30a3\u30b0\u30a2\u30fb\u30d0\u30fc\u30d6\u30fc\u30c0
-AI=\u30a2\u30f3\u30ae\u30e9
-AL=\u30a2\u30eb\u30d0\u30cb\u30a2
-AM=\u30a2\u30eb\u30e1\u30cb\u30a2
-AN=\u30aa\u30e9\u30f3\u30c0\u9818\u30a2\u30f3\u30c6\u30a3\u30eb\u8af8\u5cf6
-AO=\u30a2\u30f3\u30b4\u30e9
-AQ=\u5357\u6975
-AR=\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3
-AS=\u7c73\u9818\u30b5\u30e2\u30a2
-AT=\u30aa\u30fc\u30b9\u30c8\u30ea\u30a2
-AU=\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2
-AW=\u30a2\u30eb\u30d0
-AX=\u30aa\u30fc\u30e9\u30f3\u30c9\u8af8\u5cf6
-AZ=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3
-BA=\u30dc\u30b9\u30cb\u30a2\u30fb\u30d8\u30eb\u30c4\u30a7\u30b4\u30d3\u30ca
-BB=\u30d0\u30eb\u30d0\u30c9\u30b9
-BD=\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5
-BE=\u30d9\u30eb\u30ae\u30fc
-BF=\u30d6\u30eb\u30ad\u30ca\u30d5\u30a1\u30bd
-BG=\u30d6\u30eb\u30ac\u30ea\u30a2
-BH=\u30d0\u30fc\u30ec\u30fc\u30f3
-BI=\u30d6\u30eb\u30f3\u30b8
-BJ=\u30d9\u30ca\u30f3
-BM=\u30d0\u30df\u30e5\u30fc\u30c0
-BN=\u30d6\u30eb\u30cd\u30a4
-BO=\u30dc\u30ea\u30d3\u30a2
-BR=\u30d6\u30e9\u30b8\u30eb
-BS=\u30d0\u30cf\u30de
-BT=\u30d6\u30fc\u30bf\u30f3
-BV=\u30d6\u30fc\u30d9\u5cf6
-BW=\u30dc\u30c4\u30ef\u30ca
-BY=\u30d9\u30e9\u30eb\u30fc\u30b7
-BZ=\u30d9\u30ea\u30fc\u30ba
-CA=\u30ab\u30ca\u30c0
-CC=\u30b3\u30b3\u30b9(\u30ad\u30fc\u30ea\u30f3\u30b0)\u8af8\u5cf6
-CD=\u30b3\u30f3\u30b4\u6c11\u4e3b\u5171\u548c\u56fd(\u30ad\u30f3\u30b7\u30e3\u30b5)
-CF=\u4e2d\u592e\u30a2\u30d5\u30ea\u30ab\u5171\u548c\u56fd
-CG=\u30b3\u30f3\u30b4\u5171\u548c\u56fd(\u30d6\u30e9\u30b6\u30d3\u30eb)
-CH=\u30b9\u30a4\u30b9
-CI=\u30b3\u30fc\u30c8\u30b8\u30dc\u30ef\u30fc\u30eb
-CK=\u30af\u30c3\u30af\u8af8\u5cf6
-CL=\u30c1\u30ea
-CM=\u30ab\u30e1\u30eb\u30fc\u30f3
-CN=\u4e2d\u56fd
-CO=\u30b3\u30ed\u30f3\u30d3\u30a2
-CR=\u30b3\u30b9\u30bf\u30ea\u30ab
-CS=\u30bb\u30eb\u30d3\u30a2\u30fb\u30e2\u30f3\u30c6\u30cd\u30b0\u30ed
-CU=\u30ad\u30e5\u30fc\u30d0
-CV=\u30ab\u30fc\u30dc\u30d9\u30eb\u30c7
-CX=\u30af\u30ea\u30b9\u30de\u30b9\u5cf6
-CY=\u30ad\u30d7\u30ed\u30b9
-CZ=\u30c1\u30a7\u30b3
-DE=\u30c9\u30a4\u30c4
-DJ=\u30b8\u30d6\u30c1
-DK=\u30c7\u30f3\u30de\u30fc\u30af
-DM=\u30c9\u30df\u30cb\u30ab\u56fd
-DO=\u30c9\u30df\u30cb\u30ab\u5171\u548c\u56fd
-DZ=\u30a2\u30eb\u30b8\u30a7\u30ea\u30a2
-EC=\u30a8\u30af\u30a2\u30c9\u30eb
-EE=\u30a8\u30b9\u30c8\u30cb\u30a2
-EG=\u30a8\u30b8\u30d7\u30c8
-EH=\u897f\u30b5\u30cf\u30e9
-ER=\u30a8\u30ea\u30c8\u30ea\u30a2
-ES=\u30b9\u30da\u30a4\u30f3
-ET=\u30a8\u30c1\u30aa\u30d4\u30a2
-FI=\u30d5\u30a3\u30f3\u30e9\u30f3\u30c9
-FJ=\u30d5\u30a3\u30b8\u30fc
-FK=\u30d5\u30a9\u30fc\u30af\u30e9\u30f3\u30c9\u8af8\u5cf6
-FM=\u30df\u30af\u30ed\u30cd\u30b7\u30a2\u9023\u90a6
-FO=\u30d5\u30a7\u30ed\u30fc\u8af8\u5cf6
-FR=\u30d5\u30e9\u30f3\u30b9
-GA=\u30ac\u30dc\u30f3
-GB=\u30a4\u30ae\u30ea\u30b9
-GD=\u30b0\u30ec\u30ca\u30c0
-GE=\u30b8\u30e7\u30fc\u30b8\u30a2
-GF=\u4ecf\u9818\u30ae\u30a2\u30ca
-GH=\u30ac\u30fc\u30ca
-GI=\u30b8\u30d6\u30e9\u30eb\u30bf\u30eb
-GL=\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9
-GM=\u30ac\u30f3\u30d3\u30a2
-GN=\u30ae\u30cb\u30a2
-GP=\u30b0\u30a2\u30c9\u30eb\u30fc\u30d7
-GQ=\u8d64\u9053\u30ae\u30cb\u30a2
-GR=\u30ae\u30ea\u30b7\u30e3
-GS=\u30b5\u30a6\u30b9\u30b8\u30e7\u30fc\u30b8\u30a2\u30fb\u30b5\u30a6\u30b9\u30b5\u30f3\u30c9\u30a6\u30a3\u30c3\u30c1\u8af8\u5cf6
-GT=\u30b0\u30a2\u30c6\u30de\u30e9
-GU=\u30b0\u30a2\u30e0
-GW=\u30ae\u30cb\u30a2\u30d3\u30b5\u30a6
-GY=\u30ac\u30a4\u30a2\u30ca
-HK=\u4e2d\u83ef\u4eba\u6c11\u5171\u548c\u56fd\u9999\u6e2f\u7279\u5225\u884c\u653f\u533a
-HM=\u30cf\u30fc\u30c9\u5cf6\u30fb\u30de\u30af\u30c9\u30ca\u30eb\u30c9\u8af8\u5cf6
-HN=\u30db\u30f3\u30b8\u30e5\u30e9\u30b9
-HR=\u30af\u30ed\u30a2\u30c1\u30a2
-HT=\u30cf\u30a4\u30c1
-HU=\u30cf\u30f3\u30ac\u30ea\u30fc
-ID=\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2
-IE=\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9
-IL=\u30a4\u30b9\u30e9\u30a8\u30eb
-IN=\u30a4\u30f3\u30c9
-IO=\u82f1\u9818\u30a4\u30f3\u30c9\u6d0b\u5730\u57df
-IQ=\u30a4\u30e9\u30af
-IR=\u30a4\u30e9\u30f3
-IS=\u30a2\u30a4\u30b9\u30e9\u30f3\u30c9
-IT=\u30a4\u30bf\u30ea\u30a2
-JM=\u30b8\u30e3\u30de\u30a4\u30ab
-JO=\u30e8\u30eb\u30c0\u30f3
-JP=\u65e5\u672c
-KE=\u30b1\u30cb\u30a2
-KG=\u30ad\u30eb\u30ae\u30b9
-KH=\u30ab\u30f3\u30dc\u30b8\u30a2
-KI=\u30ad\u30ea\u30d0\u30b9
-KM=\u30b3\u30e2\u30ed
-KN=\u30bb\u30f3\u30c8\u30af\u30ea\u30b9\u30c8\u30d5\u30a1\u30fc\u30fb\u30cd\u30fc\u30f4\u30a3\u30b9
-KP=\u5317\u671d\u9bae
-KR=\u97d3\u56fd
-KW=\u30af\u30a6\u30a7\u30fc\u30c8
-KY=\u30b1\u30a4\u30de\u30f3\u8af8\u5cf6
-KZ=\u30ab\u30b6\u30d5\u30b9\u30bf\u30f3
-LA=\u30e9\u30aa\u30b9
-LB=\u30ec\u30d0\u30ce\u30f3
-LC=\u30bb\u30f3\u30c8\u30eb\u30b7\u30a2
-LI=\u30ea\u30d2\u30c6\u30f3\u30b7\u30e5\u30bf\u30a4\u30f3
-LK=\u30b9\u30ea\u30e9\u30f3\u30ab
-LR=\u30ea\u30d9\u30ea\u30a2
-LS=\u30ec\u30bd\u30c8
-LT=\u30ea\u30c8\u30a2\u30cb\u30a2
-LU=\u30eb\u30af\u30bb\u30f3\u30d6\u30eb\u30af
-LV=\u30e9\u30c8\u30d3\u30a2
-LY=\u30ea\u30d3\u30a2
-MA=\u30e2\u30ed\u30c3\u30b3
-MC=\u30e2\u30ca\u30b3
-MD=\u30e2\u30eb\u30c9\u30d0
-ME=\u30e2\u30f3\u30c6\u30cd\u30b0\u30ed
-MG=\u30de\u30c0\u30ac\u30b9\u30ab\u30eb
-MH=\u30de\u30fc\u30b7\u30e3\u30eb\u8af8\u5cf6
-MK=\u5317\u30de\u30b1\u30c9\u30cb\u30a2
-ML=\u30de\u30ea
-MM=\u30df\u30e3\u30f3\u30de\u30fc (\u30d3\u30eb\u30de)
-MN=\u30e2\u30f3\u30b4\u30eb
-MO=\u4e2d\u83ef\u4eba\u6c11\u5171\u548c\u56fd\u30de\u30ab\u30aa\u7279\u5225\u884c\u653f\u533a
-MP=\u5317\u30de\u30ea\u30a2\u30ca\u8af8\u5cf6
-MQ=\u30de\u30eb\u30c6\u30a3\u30cb\u30fc\u30af
-MR=\u30e2\u30fc\u30ea\u30bf\u30cb\u30a2
-MS=\u30e2\u30f3\u30c8\u30bb\u30e9\u30c8
-MT=\u30de\u30eb\u30bf
-MU=\u30e2\u30fc\u30ea\u30b7\u30e3\u30b9
-MV=\u30e2\u30eb\u30c7\u30a3\u30d6
-MW=\u30de\u30e9\u30a6\u30a4
-MX=\u30e1\u30ad\u30b7\u30b3
-MY=\u30de\u30ec\u30fc\u30b7\u30a2
-MZ=\u30e2\u30b6\u30f3\u30d3\u30fc\u30af
-NA=\u30ca\u30df\u30d3\u30a2
-NC=\u30cb\u30e5\u30fc\u30ab\u30ec\u30c9\u30cb\u30a2
-NE=\u30cb\u30b8\u30a7\u30fc\u30eb
-NF=\u30ce\u30fc\u30d5\u30a9\u30fc\u30af\u5cf6
-NG=\u30ca\u30a4\u30b8\u30a7\u30ea\u30a2
-NI=\u30cb\u30ab\u30e9\u30b0\u30a2
-NL=\u30aa\u30e9\u30f3\u30c0
-NO=\u30ce\u30eb\u30a6\u30a7\u30fc
-NP=\u30cd\u30d1\u30fc\u30eb
-NR=\u30ca\u30a6\u30eb
-NU=\u30cb\u30a6\u30a8
-NZ=\u30cb\u30e5\u30fc\u30b8\u30fc\u30e9\u30f3\u30c9
-OM=\u30aa\u30de\u30fc\u30f3
-PA=\u30d1\u30ca\u30de
-PE=\u30da\u30eb\u30fc
-PF=\u4ecf\u9818\u30dd\u30ea\u30cd\u30b7\u30a2
-PG=\u30d1\u30d7\u30a2\u30cb\u30e5\u30fc\u30ae\u30cb\u30a2
-PH=\u30d5\u30a3\u30ea\u30d4\u30f3
-PK=\u30d1\u30ad\u30b9\u30bf\u30f3
-PL=\u30dd\u30fc\u30e9\u30f3\u30c9
-PM=\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u5cf6\u30fb\u30df\u30af\u30ed\u30f3\u5cf6
-PN=\u30d4\u30c8\u30b1\u30a2\u30f3\u8af8\u5cf6
-PR=\u30d7\u30a8\u30eb\u30c8\u30ea\u30b3
-PS=\u30d1\u30ec\u30b9\u30c1\u30ca\u81ea\u6cbb\u533a
-PT=\u30dd\u30eb\u30c8\u30ac\u30eb
-PW=\u30d1\u30e9\u30aa
-PY=\u30d1\u30e9\u30b0\u30a2\u30a4
-QA=\u30ab\u30bf\u30fc\u30eb
-RE=\u30ec\u30e6\u30cb\u30aa\u30f3
-RO=\u30eb\u30fc\u30de\u30cb\u30a2
-RS=\u30bb\u30eb\u30d3\u30a2
-RU=\u30ed\u30b7\u30a2
-RW=\u30eb\u30ef\u30f3\u30c0
-SA=\u30b5\u30a6\u30b8\u30a2\u30e9\u30d3\u30a2
-SB=\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6
-SC=\u30bb\u30fc\u30b7\u30a7\u30eb
-SD=\u30b9\u30fc\u30c0\u30f3
-SE=\u30b9\u30a6\u30a7\u30fc\u30c7\u30f3
-SG=\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb
-SH=\u30bb\u30f3\u30c8\u30d8\u30ec\u30ca
-SI=\u30b9\u30ed\u30d9\u30cb\u30a2
-SJ=\u30b9\u30d0\u30fc\u30eb\u30d0\u30eb\u8af8\u5cf6\u30fb\u30e4\u30f3\u30de\u30a4\u30a8\u30f3\u5cf6
-SK=\u30b9\u30ed\u30d0\u30ad\u30a2
-SL=\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd
-SM=\u30b5\u30f3\u30de\u30ea\u30ce
-SN=\u30bb\u30cd\u30ac\u30eb
-SO=\u30bd\u30de\u30ea\u30a2
-SR=\u30b9\u30ea\u30ca\u30e0
-ST=\u30b5\u30f3\u30c8\u30e1\u30fb\u30d7\u30ea\u30f3\u30b7\u30da
-SV=\u30a8\u30eb\u30b5\u30eb\u30d0\u30c9\u30eb
-SY=\u30b7\u30ea\u30a2
-SZ=\u30a8\u30b9\u30ef\u30c6\u30a3\u30cb
-TC=\u30bf\u30fc\u30af\u30b9\u30fb\u30ab\u30a4\u30b3\u30b9\u8af8\u5cf6
-TD=\u30c1\u30e3\u30c9
-TF=\u4ecf\u9818\u6975\u5357\u8af8\u5cf6
-TG=\u30c8\u30fc\u30b4
-TH=\u30bf\u30a4
-TJ=\u30bf\u30b8\u30ad\u30b9\u30bf\u30f3
-TK=\u30c8\u30b1\u30e9\u30a6
-TL=\u6771\u30c6\u30a3\u30e2\u30fc\u30eb
-TM=\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3
-TN=\u30c1\u30e5\u30cb\u30b8\u30a2
-TO=\u30c8\u30f3\u30ac
-TR=\u30c8\u30eb\u30b3
-TT=\u30c8\u30ea\u30cb\u30c0\u30fc\u30c9\u30fb\u30c8\u30d0\u30b4
-TV=\u30c4\u30d0\u30eb
-TW=\u53f0\u6e7e
-TZ=\u30bf\u30f3\u30b6\u30cb\u30a2
-UA=\u30a6\u30af\u30e9\u30a4\u30ca
-UG=\u30a6\u30ac\u30f3\u30c0
-UM=\u5408\u8846\u56fd\u9818\u6709\u5c0f\u96e2\u5cf6
-US=\u30a2\u30e1\u30ea\u30ab\u5408\u8846\u56fd
-UY=\u30a6\u30eb\u30b0\u30a2\u30a4
-UZ=\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3
-VA=\u30d0\u30c1\u30ab\u30f3\u5e02\u56fd
-VC=\u30bb\u30f3\u30c8\u30d3\u30f3\u30bb\u30f3\u30c8\u53ca\u3073\u30b0\u30ec\u30ca\u30c7\u30a3\u30fc\u30f3\u8af8\u5cf6
-VE=\u30d9\u30cd\u30ba\u30a8\u30e9
-VG=\u82f1\u9818\u30f4\u30a1\u30fc\u30b8\u30f3\u8af8\u5cf6
-VI=\u7c73\u9818\u30f4\u30a1\u30fc\u30b8\u30f3\u8af8\u5cf6
-VN=\u30d9\u30c8\u30ca\u30e0
-VU=\u30d0\u30cc\u30a2\u30c4
-WF=\u30a6\u30a9\u30ea\u30b9\u30fb\u30d5\u30c4\u30ca
-WS=\u30b5\u30e2\u30a2
-YE=\u30a4\u30a8\u30e1\u30f3
-YT=\u30de\u30e8\u30c3\u30c8
-ZA=\u5357\u30a2\u30d5\u30ea\u30ab
-ZM=\u30b6\u30f3\u30d3\u30a2
-ZW=\u30b8\u30f3\u30d0\u30d6\u30a8
+AD=アンドラ
+AE=アラブ首長国連邦
+AF=アフガニスタン
+AG=アンティグア・バーブーダ
+AI=アンギラ
+AL=アルバニア
+AM=アルメニア
+AN=オランダ領アンティル諸島
+AO=アンゴラ
+AQ=南極
+AR=アルゼンチン
+AS=米領サモア
+AT=オーストリア
+AU=オーストラリア
+AW=アルバ
+AX=オーランド諸島
+AZ=アゼルバイジャン
+BA=ボスニア・ヘルツェゴビナ
+BB=バルバドス
+BD=バングラデシュ
+BE=ベルギー
+BF=ブルキナファソ
+BG=ブルガリア
+BH=バーレーン
+BI=ブルンジ
+BJ=ベナン
+BM=バミューダ
+BN=ブルネイ
+BO=ボリビア
+BR=ブラジル
+BS=バハマ
+BT=ブータン
+BV=ブーベ島
+BW=ボツワナ
+BY=ベラルーシ
+BZ=ベリーズ
+CA=カナダ
+CC=ココス(キーリング)諸島
+CD=コンゴ民主共和国(キンシャサ)
+CF=中央アフリカ共和国
+CG=コンゴ共和国(ブラザビル)
+CH=スイス
+CI=コートジボワール
+CK=クック諸島
+CL=チリ
+CM=カメルーン
+CN=中国
+CO=コロンビア
+CR=コスタリカ
+CS=セルビア・モンテネグロ
+CU=キューバ
+CV=カーボベルデ
+CX=クリスマス島
+CY=キプロス
+CZ=チェコ
+DE=ドイツ
+DJ=ジブチ
+DK=デンマーク
+DM=ドミニカ国
+DO=ドミニカ共和国
+DZ=アルジェリア
+EC=エクアドル
+EE=エストニア
+EG=エジプト
+EH=西サハラ
+ER=エリトリア
+ES=スペイン
+ET=エチオピア
+FI=フィンランド
+FJ=フィジー
+FK=フォークランド諸島
+FM=ミクロネシア連邦
+FO=フェロー諸島
+FR=フランス
+GA=ガボン
+GB=イギリス
+GD=グレナダ
+GE=ジョージア
+GF=仏領ギアナ
+GH=ガーナ
+GI=ジブラルタル
+GL=グリーンランド
+GM=ガンビア
+GN=ギニア
+GP=グアドループ
+GQ=赤道ギニア
+GR=ギリシャ
+GS=サウスジョージア・サウスサンドウィッチ諸島
+GT=グアテマラ
+GU=グアム
+GW=ギニアビサウ
+GY=ガイアナ
+HK=中華人民共和国香港特別行政区
+HM=ハード島・マクドナルド諸島
+HN=ホンジュラス
+HR=クロアチア
+HT=ハイチ
+HU=ハンガリー
+ID=インドネシア
+IE=アイルランド
+IL=イスラエル
+IN=インド
+IO=英領インド洋地域
+IQ=イラク
+IR=イラン
+IS=アイスランド
+IT=イタリア
+JM=ジャマイカ
+JO=ヨルダン
+JP=日本
+KE=ケニア
+KG=キルギス
+KH=カンボジア
+KI=キリバス
+KM=コモロ
+KN=セントクリストファー・ネーヴィス
+KP=北朝鮮
+KR=韓国
+KW=クウェート
+KY=ケイマン諸島
+KZ=カザフスタン
+LA=ラオス
+LB=レバノン
+LC=セントルシア
+LI=リヒテンシュタイン
+LK=スリランカ
+LR=リベリア
+LS=レソト
+LT=リトアニア
+LU=ルクセンブルク
+LV=ラトビア
+LY=リビア
+MA=モロッコ
+MC=モナコ
+MD=モルドバ
+ME=モンテネグロ
+MG=マダガスカル
+MH=マーシャル諸島
+MK=北マケドニア
+ML=マリ
+MM=ミャンマー (ビルマ)
+MN=モンゴル
+MO=中華人民共和国マカオ特別行政区
+MP=北マリアナ諸島
+MQ=マルティニーク
+MR=モーリタニア
+MS=モントセラト
+MT=マルタ
+MU=モーリシャス
+MV=モルディブ
+MW=マラウイ
+MX=メキシコ
+MY=マレーシア
+MZ=モザンビーク
+NA=ナミビア
+NC=ニューカレドニア
+NE=ニジェール
+NF=ノーフォーク島
+NG=ナイジェリア
+NI=ニカラグア
+NL=オランダ
+NO=ノルウェー
+NP=ネパール
+NR=ナウル
+NU=ニウエ
+NZ=ニュージーランド
+OM=オマーン
+PA=パナマ
+PE=ペルー
+PF=仏領ポリネシア
+PG=パプアニューギニア
+PH=フィリピン
+PK=パキスタン
+PL=ポーランド
+PM=サンピエール島・ミクロン島
+PN=ピトケアン諸島
+PR=プエルトリコ
+PS=パレスチナ自治区
+PT=ポルトガル
+PW=パラオ
+PY=パラグアイ
+QA=カタール
+RE=レユニオン
+RO=ルーマニア
+RS=セルビア
+RU=ロシア
+RW=ルワンダ
+SA=サウジアラビア
+SB=ソロモン諸島
+SC=セーシェル
+SD=スーダン
+SE=スウェーデン
+SG=シンガポール
+SH=セントヘレナ
+SI=スロベニア
+SJ=スバールバル諸島・ヤンマイエン島
+SK=スロバキア
+SL=シエラレオネ
+SM=サンマリノ
+SN=セネガル
+SO=ソマリア
+SR=スリナム
+ST=サントメ・プリンシペ
+SV=エルサルバドル
+SY=シリア
+SZ=エスワティニ
+TC=タークス・カイコス諸島
+TD=チャド
+TF=仏領極南諸島
+TG=トーゴ
+TH=タイ
+TJ=タジキスタン
+TK=トケラウ
+TL=東ティモール
+TM=トルクメニスタン
+TN=チュニジア
+TO=トンガ
+TR=トルコ
+TT=トリニダード・トバゴ
+TV=ツバル
+TW=台湾
+TZ=タンザニア
+UA=ウクライナ
+UG=ウガンダ
+UM=合衆国領有小離島
+US=アメリカ合衆国
+UY=ウルグアイ
+UZ=ウズベキスタン
+VA=バチカン市国
+VC=セントビンセント及びグレナディーン諸島
+VE=ベネズエラ
+VG=英領ヴァージン諸島
+VI=米領ヴァージン諸島
+VN=ベトナム
+VU=バヌアツ
+WF=ウォリス・フツナ
+WS=サモア
+YE=イエメン
+YT=マヨット
+ZA=南アフリカ
+ZM=ザンビア
+ZW=ジンバブエ
 
 # territory names
 # key is UN M.49 country and area code
 
-001=\u4e16\u754c
-002=\u30a2\u30d5\u30ea\u30ab
-003=\u5317\u30a2\u30e1\u30ea\u30ab\u5927\u9678
-005=\u5357\u30a2\u30e1\u30ea\u30ab
-009=\u30aa\u30bb\u30a2\u30cb\u30a2
-011=\u897f\u30a2\u30d5\u30ea\u30ab
-013=\u4e2d\u592e\u30a2\u30e1\u30ea\u30ab
-014=\u6771\u30a2\u30d5\u30ea\u30ab
-015=\u5317\u30a2\u30d5\u30ea\u30ab
-017=\u4e2d\u90e8\u30a2\u30d5\u30ea\u30ab
-018=\u5357\u90e8\u30a2\u30d5\u30ea\u30ab
-019=\u30a2\u30e1\u30ea\u30ab\u5927\u9678
-021=\u5317\u30a2\u30e1\u30ea\u30ab
-029=\u30ab\u30ea\u30d6
-030=\u6771\u30a2\u30b8\u30a2
-034=\u5357\u30a2\u30b8\u30a2
-035=\u6771\u5357\u30a2\u30b8\u30a2
-039=\u5357\u30e8\u30fc\u30ed\u30c3\u30d1
-053=\u30aa\u30fc\u30b9\u30c8\u30e9\u30e9\u30b7\u30a2
-054=\u30e1\u30e9\u30cd\u30b7\u30a2
-057=\u30df\u30af\u30ed\u30cd\u30b7\u30a2
-061=\u30dd\u30ea\u30cd\u30b7\u30a2
-142=\u30a2\u30b8\u30a2
-143=\u4e2d\u592e\u30a2\u30b8\u30a2
-145=\u897f\u30a2\u30b8\u30a2
-150=\u30e8\u30fc\u30ed\u30c3\u30d1
-151=\u6771\u30e8\u30fc\u30ed\u30c3\u30d1
-154=\u5317\u30e8\u30fc\u30ed\u30c3\u30d1
-155=\u897f\u30e8\u30fc\u30ed\u30c3\u30d1
-419=\u30e9\u30c6\u30f3\u30a2\u30e1\u30ea\u30ab
+001=世界
+002=アフリカ
+003=北アメリカ大陸
+005=南アメリカ
+009=オセアニア
+011=西アフリカ
+013=中央アメリカ
+014=東アフリカ
+015=北アフリカ
+017=中部アフリカ
+018=南部アフリカ
+019=アメリカ大陸
+021=北アメリカ
+029=カリブ
+030=東アジア
+034=南アジア
+035=東南アジア
+039=南ヨーロッパ
+053=オーストララシア
+054=メラネシア
+057=ミクロネシア
+061=ポリネシア
+142=アジア
+143=中央アジア
+145=西アジア
+150=ヨーロッパ
+151=東ヨーロッパ
+154=北ヨーロッパ
+155=西ヨーロッパ
+419=ラテンアメリカ
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ko.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ko.properties
index 2ac7b5d3a06..b68cd8f8785 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ko.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ko.properties
@@ -38,1108 +38,1108 @@
 # language names
 # key is ISO 639 language code
 
-aa=\uc544\ud30c\ub974\uc5b4
-ab=\uc555\uce74\uc988\uc5b4
-ae=\uc544\ubca0\uc2a4\ud0c0\uc5b4
-af=\uc544\ud504\ub9ac\uce78\uc2a4\uc5b4
-ak=\uc544\uce78\uc5b4
-am=\uc554\ud558\ub77c\uc5b4
-an=\uc544\ub77c\uace4\uc5b4
-ar=\uc544\ub78d\uc5b4
-as=\uc544\uc0bc\uc5b4
-av=\uc544\ubc14\ub9ad\uc5b4
-ay=\uc544\uc774\ub9c8\ub77c\uc5b4
-az=\uc544\uc81c\ub974\ubc14\uc774\uc794\uc5b4
-ba=\ubc14\uc288\ud0a4\ub974\uc5b4
-be=\ubca8\ub77c\ub8e8\uc2a4\uc5b4
-bg=\ubd88\uac00\ub9ac\uc544\uc5b4
-bh=\ube44\ud558\ub974\uc5b4
-bi=\ube44\uc2ac\ub77c\ub9c8\uc5b4
-bm=\ubc24\ubc14\ub77c\uc5b4
-bn=\ubcb5\uace8\uc5b4
-bo=\ud2f0\ubca0\ud2b8\uc5b4
-br=\ube0c\ub974\ud0c0\ub274\uc5b4
-bs=\ubcf4\uc2a4\ub2c8\uc544\uc5b4
-ca=\uce74\ud0c8\ub85c\ub2c8\uc544\uc5b4
-ce=\uccb4\uccb8\uc5b4
-ch=\ucc28\ubaa8\ub85c\uc5b4
-co=\ucf54\ub974\uc2dc\uce74\uc5b4
-cr=\ud06c\ub9ac\uc5b4
-cs=\uccb4\ucf54\uc5b4
-cu=\uad50\ud68c \uc2ac\ub77c\ube0c\uc5b4
-cv=\ucd94\ubc14\uc2dc\uc5b4
-cy=\uc6e8\uc77c\uc2a4\uc5b4
-da=\ub374\ub9c8\ud06c\uc5b4
-de=\ub3c5\uc77c\uc5b4
-dv=\ub514\ubca0\ud788\uc5b4
-dz=\uc885\uce74\uc5b4
-ee=\uc5d0\uc6e8\uc5b4
-el=\uadf8\ub9ac\uc2a4\uc5b4
-en=\uc601\uc5b4
-eo=\uc5d0\uc2a4\ud398\ub780\ud1a0\uc5b4
-es=\uc2a4\ud398\uc778\uc5b4
-et=\uc5d0\uc2a4\ud1a0\ub2c8\uc544\uc5b4
-eu=\ubc14\uc2a4\ud06c\uc5b4
-fa=\ud398\ub974\uc2dc\uc544\uc5b4
-ff=\ud480\ub77c\uc5b4
-fi=\ud540\ub780\ub4dc\uc5b4
-fj=\ud53c\uc9c0\uc5b4
-fo=\ud398\ub85c\uc5b4
-fr=\ud504\ub791\uc2a4\uc5b4
-fy=\uc11c\ubd80 \ud504\ub9ac\uc9c0\uc544\uc5b4
-ga=\uc544\uc77c\ub79c\ub4dc\uc5b4
-gd=\uc2a4\ucf54\ud2c0\ub79c\ub4dc \uac8c\uc77c\uc5b4
-gl=\uac08\ub9ac\uc2dc\uc544\uc5b4
-gn=\uacfc\ub77c\ub2c8\uc5b4
-gu=\uad6c\uc790\ub77c\ud2b8\uc5b4
-gv=\ub9f9\ud06c\uc2a4\uc5b4
-ha=\ud558\uc6b0\uc0ac\uc5b4
-he=\ud788\ube0c\ub9ac\uc5b4
-hi=\ud78c\ub514\uc5b4
-ho=\ud788\ub9ac \ubaa8\ud22c\uc5b4
-hr=\ud06c\ub85c\uc544\ud2f0\uc544\uc5b4
-ht=\uc544\uc774\ud2f0\uc5b4
-hu=\ud5dd\uac00\ub9ac\uc5b4
-hy=\uc544\ub974\uba54\ub2c8\uc544\uc5b4
-hz=\ud5e4\ub808\ub85c\uc5b4
-ia=\uc778\ud130\ub9c1\uad6c\uc544
-id=\uc778\ub3c4\ub124\uc2dc\uc544\uc5b4
-ie=\uc778\ud14c\ub974\ub9c1\uad6c\uc5d0
-ig=\uc774\uadf8\ubcf4\uc5b4
-ii=\uc4f0\ucd28 \uc774\uc5b4
-ik=\uc774\ub204\ud53c\uc544\ud06c\uc5b4
-in=\uc778\ub3c4\ub124\uc2dc\uc544\uc5b4
-io=\uc774\ub3c4\uc5b4
-is=\uc544\uc774\uc2ac\ub780\ub4dc\uc5b4
-it=\uc774\ud0c8\ub9ac\uc544\uc5b4
-iu=\uc774\ub205\ud2f0\ud22c\ud2b8\uc5b4
-iw=\ud788\ube0c\ub9ac\uc5b4
-ja=\uc77c\ubcf8\uc5b4
-ji=\uc774\ub514\uc2dc\uc5b4
-jv=\uc790\ubc14\uc5b4
-ka=\uc870\uc9c0\uc544\uc5b4
-kg=\ucf69\uace0\uc5b4
-ki=\ud0a4\ucfe0\uc720\uc5b4
-kj=\ucfe0\uc548\uc57c\ub9c8\uc5b4
-kk=\uce74\uc790\ud750\uc5b4
-kl=\uadf8\ub9b0\ub780\ub4dc\uc5b4
-km=\ud06c\uba54\ub974\uc5b4
-kn=\uce78\ub098\ub2e4\uc5b4
-ko=\ud55c\uad6d\uc5b4
-kr=\uce78\ub204\ub9ac\uc5b4
-ks=\uce74\uc288\ubbf8\ub974\uc5b4
-ku=\ucfe0\ub974\ub4dc\uc5b4
-kv=\ucf54\ubbf8\uc5b4
-kw=\ucf58\uc6d4\uc5b4
-ky=\ud0a4\ub974\uae30\uc2a4\uc5b4
-la=\ub77c\ud2f4\uc5b4
-lb=\ub8e9\uc148\ubd80\ub974\ud06c\uc5b4
-lg=\uac04\ub2e4\uc5b4
-li=\ub9bc\ubc84\uac70\uc5b4
-ln=\ub9c1\uac08\ub77c\uc5b4
-lo=\ub77c\uc624\uc5b4
-lt=\ub9ac\ud22c\uc544\ub2c8\uc544\uc5b4
-lu=\ub8e8\ubc14-\uce74\ud0c4\uac00\uc5b4
-lv=\ub77c\ud2b8\ube44\uc544\uc5b4
-mg=\ub9d0\ub77c\uac00\uc2dc\uc5b4
-mh=\ub9c8\uc15c\uc5b4
-mi=\ub9c8\uc624\ub9ac\uc5b4
-mk=\ub9c8\ucf00\ub3c4\ub2c8\uc544\uc5b4
-ml=\ub9d0\ub77c\uc584\ub78c\uc5b4
-mn=\ubabd\uace8\uc5b4
-mo=\ubab0\ub2e4\ube44\uc544\uc5b4
-mr=\ub9c8\ub77c\ud2f0\uc5b4
-ms=\ub9d0\ub808\uc774\uc5b4
-mt=\ubab0\ud0c0\uc5b4
-my=\ubc84\ub9c8\uc5b4
-na=\ub098\uc6b0\ub8e8\uc5b4
-nb=\ub178\ub974\uc6e8\uc774\uc5b4(\ubcf4\ud06c\ub9d0)
-nd=\ubd81\ubd80 \uc740\ub370\ubca8\ub808\uc5b4
-ne=\ub124\ud314\uc5b4
-ng=\ub290\ub3d9\uac00\uc5b4
-nl=\ub124\ub35c\ub780\ub4dc\uc5b4
-nn=\ub178\ub974\uc6e8\uc774\uc5b4(\ub2c8\ub178\ub974\uc2a4\ud06c)
-no=\ub178\ub974\uc6e8\uc774\uc5b4
-nr=\ub0a8\ubd80 \uc740\ub370\ubca8\ub808\uc5b4
-nv=\ub098\ubc14\ud638\uc5b4
-ny=\ub0d4\uc790\uc5b4
-oc=\uc624\ud06c\uc5b4
-oj=\uc624\uc9c0\ube0c\uc640\uc5b4
-om=\uc624\ub85c\ubaa8\uc5b4
-or=\uc624\ub9ac\uc57c\uc5b4
-os=\uc624\uc138\ud2b8\uc5b4
-pa=\ud380\uc7a1\uc5b4
-pi=\ud314\ub9ac\uc5b4
-pl=\ud3f4\ub780\ub4dc\uc5b4
-ps=\ud30c\uc288\ud1a0\uc5b4
-pt=\ud3ec\ub974\ud22c\uac08\uc5b4
-qu=\ucf00\ucd94\uc544\uc5b4
-rm=\ub85c\ub9cc\uc2dc\uc5b4
-rn=\ub8ec\ub514\uc5b4
-ro=\ub8e8\ub9c8\ub2c8\uc544\uc5b4
-ru=\ub7ec\uc2dc\uc544\uc5b4
-rw=\ub974\uc644\ub2e4\uc5b4
-sa=\uc0b0\uc2a4\ud06c\ub9ac\ud2b8\uc5b4
-sc=\uc0ac\ub974\ub514\ub2c8\uc544\uc5b4
-sd=\uc2e0\ub514\uc5b4
-se=\ubd81\ubd80 \uc0ac\ubbf8\uc5b4
-sg=\uc0b0\uace0\uc5b4
-si=\uc2f1\ud560\ub77c\uc5b4
-sk=\uc2ac\ub85c\ubc14\ud0a4\uc544\uc5b4
-sl=\uc2ac\ub85c\ubca0\ub2c8\uc544\uc5b4
-sm=\uc0ac\ubaa8\uc544\uc5b4
-sn=\uc1fc\ub098\uc5b4
-so=\uc18c\ub9d0\ub9ac\uc544\uc5b4
-sq=\uc54c\ubc14\ub2c8\uc544\uc5b4
-sr=\uc138\ub974\ube44\uc544\uc5b4
-ss=\uc2dc\uc2a4\uc640\ud2f0\uc5b4
-st=\ub0a8\ubd80 \uc18c\ud1a0\uc5b4
-su=\uc21c\ub2e4\uc5b4
-sv=\uc2a4\uc6e8\ub374\uc5b4
-sw=\uc2a4\uc640\ud790\ub9ac\uc5b4
-ta=\ud0c0\ubc00\uc5b4
-te=\ud154\ub8e8\uad6c\uc5b4
-tg=\ud0c0\uc9c0\ud06c\uc5b4
-th=\ud0dc\uad6d\uc5b4
-ti=\ud2f0\uadf8\ub9ac\ub0d0\uc5b4
-tk=\ud22c\ub974\ud06c\uba58\uc5b4
-tl=\ud0c0\uac08\ub85c\uadf8\uc5b4
-tn=\uce20\uc640\ub098\uc5b4
-to=\ud1b5\uac00\uc5b4
-tr=\ud130\ud0a4\uc5b4
-ts=\ucd1d\uac00\uc5b4
-tt=\ud0c0\ud0c0\ub974\uc5b4
-tw=\ud2b8\uc704\uc5b4
-ty=\ud0c0\ud788\ud2f0\uc5b4
-ug=\uc704\uad6c\ub974\uc5b4
-uk=\uc6b0\ud06c\ub77c\uc774\ub098\uc5b4
-ur=\uc6b0\ub974\ub450\uc5b4
-uz=\uc6b0\uc988\ubca0\ud06c\uc5b4
-ve=\ubca4\ub2e4\uc5b4
-vi=\ubca0\ud2b8\ub0a8\uc5b4
-vo=\ubcfc\ub77c\ud4cc\ud06c\uc5b4
-wa=\uc648\ub860\uc5b4
-wo=\uc6d4\ub85c\ud504\uc5b4
-xh=\ucf54\uc0ac\uc5b4
-yi=\uc774\ub514\uc2dc\uc5b4
-yo=\uc694\ub8e8\ubc14\uc5b4
-za=\uc8fc\uc559\uc5b4
-zh=\uc911\uad6d\uc5b4
-zu=\uc904\ub8e8\uc5b4
+aa=아파르어
+ab=압카즈어
+ae=아베스타어
+af=아프리칸스어
+ak=아칸어
+am=암하라어
+an=아라곤어
+ar=아랍어
+as=아삼어
+av=아바릭어
+ay=아이마라어
+az=아제르바이잔어
+ba=바슈키르어
+be=벨라루스어
+bg=불가리아어
+bh=비하르어
+bi=비슬라마어
+bm=밤바라어
+bn=벵골어
+bo=티베트어
+br=브르타뉴어
+bs=보스니아어
+ca=카탈로니아어
+ce=체첸어
+ch=차모로어
+co=코르시카어
+cr=크리어
+cs=체코어
+cu=교회 슬라브어
+cv=추바시어
+cy=웨일스어
+da=덴마크어
+de=독일어
+dv=디베히어
+dz=종카어
+ee=에웨어
+el=그리스어
+en=영어
+eo=에스페란토어
+es=스페인어
+et=에스토니아어
+eu=바스크어
+fa=페르시아어
+ff=풀라어
+fi=핀란드어
+fj=피지어
+fo=페로어
+fr=프랑스어
+fy=서부 프리지아어
+ga=아일랜드어
+gd=스코틀랜드 게일어
+gl=갈리시아어
+gn=과라니어
+gu=구자라트어
+gv=맹크스어
+ha=하우사어
+he=히브리어
+hi=힌디어
+ho=히리 모투어
+hr=크로아티아어
+ht=아이티어
+hu=헝가리어
+hy=아르메니아어
+hz=헤레로어
+ia=인터링구아
+id=인도네시아어
+ie=인테르링구에
+ig=이그보어
+ii=쓰촨 이어
+ik=이누피아크어
+in=인도네시아어
+io=이도어
+is=아이슬란드어
+it=이탈리아어
+iu=이눅티투트어
+iw=히브리어
+ja=일본어
+ji=이디시어
+jv=자바어
+ka=조지아어
+kg=콩고어
+ki=키쿠유어
+kj=쿠안야마어
+kk=카자흐어
+kl=그린란드어
+km=크메르어
+kn=칸나다어
+ko=한국어
+kr=칸누리어
+ks=카슈미르어
+ku=쿠르드어
+kv=코미어
+kw=콘월어
+ky=키르기스어
+la=라틴어
+lb=룩셈부르크어
+lg=간다어
+li=림버거어
+ln=링갈라어
+lo=라오어
+lt=리투아니아어
+lu=루바-카탄가어
+lv=라트비아어
+mg=말라가시어
+mh=마셜어
+mi=마오리어
+mk=마케도니아어
+ml=말라얄람어
+mn=몽골어
+mo=몰다비아어
+mr=마라티어
+ms=말레이어
+mt=몰타어
+my=버마어
+na=나우루어
+nb=노르웨이어(보크말)
+nd=북부 은데벨레어
+ne=네팔어
+ng=느동가어
+nl=네덜란드어
+nn=노르웨이어(니노르스크)
+no=노르웨이어
+nr=남부 은데벨레어
+nv=나바호어
+ny=냔자어
+oc=오크어
+oj=오지브와어
+om=오로모어
+or=오리야어
+os=오세트어
+pa=펀잡어
+pi=팔리어
+pl=폴란드어
+ps=파슈토어
+pt=포르투갈어
+qu=케추아어
+rm=로만시어
+rn=룬디어
+ro=루마니아어
+ru=러시아어
+rw=르완다어
+sa=산스크리트어
+sc=사르디니아어
+sd=신디어
+se=북부 사미어
+sg=산고어
+si=싱할라어
+sk=슬로바키아어
+sl=슬로베니아어
+sm=사모아어
+sn=쇼나어
+so=소말리아어
+sq=알바니아어
+sr=세르비아어
+ss=시스와티어
+st=남부 소토어
+su=순다어
+sv=스웨덴어
+sw=스와힐리어
+ta=타밀어
+te=텔루구어
+tg=타지크어
+th=태국어
+ti=티그리냐어
+tk=투르크멘어
+tl=타갈로그어
+tn=츠와나어
+to=통가어
+tr=터키어
+ts=총가어
+tt=타타르어
+tw=트위어
+ty=타히티어
+ug=위구르어
+uk=우크라이나어
+ur=우르두어
+uz=우즈베크어
+ve=벤다어
+vi=베트남어
+vo=볼라퓌크어
+wa=왈론어
+wo=월로프어
+xh=코사어
+yi=이디시어
+yo=요루바어
+za=주앙어
+zh=중국어
+zu=줄루어
 
 # key is ISO 639.2 language code
-aar=\uc544\ud30c\ub974\uc5b4
-abk=\uc544\ube0c\ud558\uc988\uc5b4
-ace=\uc544\uccb4\uc5b4
-ach=\uc544\ucf5c\ub9ac\uc5b4
-ada=\uc544\ub2f9\uba54\uc5b4
-ady=\uc544\ub514\uac8c\uc5b4
-afa=\uc544\ud504\uac00\ub2c8(1927-2002)
-afh=\uc544\ud504\ub9ac\ud790\ub9ac\uc5b4
-afr=\ub0a8\uc544\uacf5 \uacf5\uc6a9\uc5b4
-ain=\uc544\uc774\ub204\uc5b4
-aka=\uc544\uce78\uc5b4
-akk=\uc544\uce74\ub4dc\uc5b4
-alb=\uc54c\ubc14\ub2c8\uc544\uc5b4
-ale=\uc54c\ub958\ud2b8\uc5b4
-alg=\uc54c\uacf5\ud0a8\uc5b4\uc871
-alt=\ub0a8\ubd80 \uc54c\ud0c0\uc774\uc5b4
-amh=\uc554\ud558\ub77c\uc5b4
-ang=\uace0\ub300 \uc601\uc5b4
-anp=\uc559\uac00\uc5b4
-apa=\uc544\ud30c\uce58\uc5b4
-ara=\uc544\ub78d\uc5b4
-arc=\uc544\ub78c\uc5b4
-arg=\uc544\ub77c\uace4\uc5b4
-arm=\uc544\ub974\uba54\ub2c8\uc544\uc5b4
-arn=\ub9c8\ud478\ub465\uad70\uc5b4
-arp=\uc544\ub77c\ud30c\ud638\uc5b4
-art=\uae30\uacc4\uc5b4(\uae30\ud0c0)
-arw=\uc544\ub77c\uc640\ud06c\uc5b4
-asm=\uc544\uc0d8\uc5b4
-ast=\uc544\uc2a4\ud22c\ub9ac\uc544\uc5b4
-ath=\uc544\ud0c0\ud30c\uc2a4\uce74\uc5b4\uad70
-aus=\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544\uc5b4\uc871
-ava=\uc544\ubc14\ub974\uc5b4
-ave=\uc544\ubca0\uc2a4\ud0c0\uc5b4
-awa=\uc544\uc640\ud788\uc5b4
-aym=\uc544\uc774\ub9c8\ub77c\uc5b4
-aze=\uc544\uc81c\ub974\ubc14\uc774\uc794\uc5b4
-bad=\ubcf4\uc2a4\ub2c8\uc544-\ud5e4\ub974\uccb4\uace0\ube44\ub098 \ub514\ub098\ub974
-bai=\ubc14\ubc00\ub808\ucf00\uc5b4\uc871
-bak=\ubc14\uc288\ud0a4\ub974\uc5b4
-bal=\ubc1c\ub8e8\uce58\uc5b4
-bam=\ubc24\ubc14\ub77c\uc5b4
-ban=\ubc1c\ub9ac\uc5b4
-baq=\ubc14\uc2a4\ud06c\uc5b4
-bas=\ubc14\uc0ac\uc5b4
-bat=\ubc1c\ud2b8\uc5b4(\uae30\ud0c0)
-bej=\ubca0\uc790\uc5b4
-bel=\ubca8\ub77c\ub8e8\uc2a4\uc5b4
-bem=\ubcb0\ubc14\uc5b4
-ben=\ubcb5\uace8\uc5b4
-ber=\ubca0\ub974\ubca0\ub974\uc5b4
-bho=\ud638\uc988\ud478\ub9ac\uc5b4
-bih=\ube44\ud558\ub974\uc5b4
-bik=\ube44\ucf5c\uc5b4
-bin=\ube44\ub2c8\uc5b4
-bis=\ube44\uc2ac\ub77c\ub9c8\uc5b4
-bla=\uc2dd\uc2dc\uce74\uc5b4
-bnt=\ubc18\ud22c\uc5b4
-bos=\ubcf4\uc2a4\ub2c8\uc544\uc5b4
-bra=\ube0c\ub77c\uc9c0\uc5b4
-bre=\ube0c\ub77c\uc9c8 \ud06c\ub8e8\uc81c\uc774\ub8e8 (1990-1993)
-btk=\ubc14\ud0c0\ud06c\uc5b4
-bua=\ubd80\ub9ac\uc544\ud0c0
-bug=\ubd80\uae30\uc5b4
-bul=\ubd88\uac00\ub9ac\uc544\uc5b4
-bur=\ubc84\ub9c8\uc5b4
-byn=\ube0c\ub9b0\uc5b4
-cad=\uce74\ub3c4\uc5b4
-cai=\uc911\uc559 \uc544\uba54\ub9ac\uce74 \uc778\ub514\uc548\uc5b4(\uae30\ud0c0)
-car=\uce74\ub9ac\ube0c\uc5b4
-cat=\uce74\ud0c8\ub85c\ub2c8\uc544\uc5b4
-cau=\uce74\ud504\uce74\uc2a4\uc5b4(\uae30\ud0c0)
-ceb=\uc138\ubd80\uc544\ub178\uc5b4
-cel=\ucf08\ud2b8\uc5b4(\uae30\ud0c0)
-cha=\ucc28\ubaa8\ub85c\uc5b4
-chb=\uce58\ube0c\ucc28\uc5b4
-che=\uccb4\uccb8\uc5b4
-chg=\ucc28\uac00\ud0c0\uc774\uc5b4
-chi=\uc911\uad6d\uc5b4
-chk=\ucd94\ud06c\uc5b4
-chm=\ub9c8\ub9ac\uc5b4
-chn=\uce58\ub204\ud06c \uc790\uace4
-cho=\ucd09\ud1a0\uc5b4
-chp=\uce58\ud398\uc6b0\uc580
-chr=\uccb4\ub85c\ud0a4\uc5b4
-chu=\uad50\ud68c \uc2ac\ub77c\ube0c\uc5b4
-chv=\ucd94\ubc14\uc26c\uc5b4
-chy=\uc0e4\uc774\uc5d4\uc5b4
-cmc=\ucc38\uc5b4\uad70
-cop=\ucf65\ud2b8\uc5b4
-cor=\ucf58\uc6d4\uc5b4
-cos=\ucf54\ub974\uc2dc\uce74\uc5b4
-cpe=\ud06c\ub9ac\uc62c\uc5b4 \ubc0f \ud53c\uc9c4\uc5b4(\uc601\uc5b4\ub97c \uae30\ubc18\uc73c\ub85c \ud55c \uae30\ud0c0)
-cpf=\ud06c\ub9ac\uc62c\uc5b4 \ubc0f \ud53c\uc9c4\uc5b4(\ud504\ub791\uc2a4\uc5b4\ub97c \uae30\ubc18\uc73c\ub85c \ud55c \uae30\ud0c0)
-cpp=\ud06c\ub9ac\uc62c\uc5b4 \ubc0f \ud53c\uc9c4\uc5b4(\ud3ec\ub974\ud22c\uce7c\uc5b4\ub97c \uae30\ubc18\uc73c\ub85c \ud55c \uae30\ud0c0)
-cre=\ud06c\ub9ac\uc5b4
-crh=\ud06c\ub9ac\ubbfc \ud130\ud0a4\uc5b4; \ud06c\ub9ac\ubbfc \ud0c0\ud0c0\ub974\uc5b4
-crp=\ud06c\ub9ac\uc62c\uc5b4 \ubc0f \ud53c\uc9c4\uc5b4 (\uae30\ud0c0)
-csb=\uce74\uc288\ube44\uc544\uc5b4
-cus=\ucfe0\uc2dc\uc5b4\uc871
-cze=\uccb4\ucf54\uc5b4
-dak=\ub2e4\ucf54\ud0c0\uc5b4
-dan=\ub374\ub9c8\ud06c\uc5b4
-dar=\ub2e4\ub974\uadf8\uc640\uc5b4
-day=\ub2e4\uc57c\ud06c\uc5b4
-del=\ub378\ub77c\uc6e8\uc5b4\uc5b4
-den=\uc2ac\ub77c\ube0c\uc5b4
-dgr=\ub3c4\uadf8\ub9ac\ube0c\uc5b4
-din=\ub529\uce74\uc5b4
-div=\ub514\ubca0\ud788\uc5b4
-doi=\ub3c4\uadf8\ub9ac\uc5b4
-dra=\ub4dc\ub77c\ube44\ub2e4\uc5b4 (\uae30\ud0c0)
-dsb=\uc800\uc9c0 \uc18c\ub974\ube44\uc544\uc5b4
-dua=\ub450\uc54c\ub77c\uc5b4
-dum=\uc911\uc138 \ub124\ub35c\ub780\ub4dc\uc5b4
-dut=\ub124\ub35c\ub780\ub4dc\uc5b4
-dyu=\ub4dc\uc728\ub77c\uc5b4
-dzo=\ubd80\ud0c4\uc5b4
-efi=\uc774\ud53d\uc5b4
-egy=\uace0\ub300 \uc774\uc9d1\ud2b8\uc5b4
-eka=\uc774\uce74\uc8fd\uc5b4
-elx=\uc5d8\ub78c\uc5b4
-eng=\uc601\uc5b4
-enm=\uc911\uc138 \uc601\uc5b4
-epo=\uc5d0\uc2a4\ud398\ub780\ud1a0\uc5b4
-est=\uc5d0\uc2a4\ud1a0\ub2c8\uc544\uc5b4
-ewe=\uc5d0\uc6e8\uc5b4
-ewo=\uc774\uc6d0\ub3c4\uc5b4
-fan=\ud321\uadf8\uc5b4
-fao=\ud398\ub85c\uc2a4\uc5b4
-fat=\ud310\ud2f0\uc5b4
-fij=\ud53c\uc9c0\uc5b4
-fil=\ud544\ub9ac\ud540\uc5b4
-fin=\ud540\ub780\ub4dc\uc5b4
-fiu=\ud53c\ub178\uc6b0\uadf8\ub9ac\uc544\uc5b4(\uae30\ud0c0)
-fon=\ud3f0\uc5b4
-fre=\ud504\ub791\uc2a4\uc5b4
-frm=\uc911\uc138 \ud504\ub791\uc2a4\uc5b4
-fro=\uace0\ub300 \ud504\ub791\uc2a4\uc5b4
-frr=\ubd81\ubd80 \ud504\ub9ac\uc9c0\uc544\uc5b4
-frs=\ub3d9\ubd80 \ud504\ub9ac\uc2ac\ub780\ub4dc\uc5b4
-fry=\uc11c\ubd80 \ud504\ub9ac\uc2ac\ub780\ub4dc\uc5b4
-ful=\ud480\ub77c\ub2c8\uc5b4
-fur=\ud504\ub9ac\uc6b8\ub9ac\uc5b4
-gaa=\uac00\uc5b4
-gay=\uac00\uc694\uc5b4
-gba=\uadf8\ubc14\uc57c\uc5b4
-gem=\ub3c5\uc77c\uc5b4(\uae30\ud0c0)
-geo=\uadf8\ub8e8\uc9c0\uc57c\uc5b4
-ger=\ub3c5\uc77c\uc5b4
-gez=\uac8c\uc774\uc988\uc5b4
-gil=\ud0a4\ub9ac\ubc14\uc2dc\uc5b4
-gla=\uac8c\uc77c\uc5b4
-gle=\uc544\uc77c\ub79c\ub4dc\uc5b4
-glg=\uac08\ub9ac\uc2dc\uc544\uc5b4
-glv=\ub9f9\ud06c\uc2a4\uc5b4
-gmh=\uc911\uc138 \uace0\uc9c0 \ub3c5\uc77c\uc5b4
-goh=\uace0\ub300 \uace0\uc9c0 \ub3c5\uc77c\uc5b4
-gon=\uace4\ub514\uc5b4
-gor=\uace0\ub860\ud0c8\ub85c\uc5b4
-got=\uace0\ud2b8\uc5b4
-grb=\uac8c\ub974\ubcf4\uc5b4
-grc=\uace0\ub300 \uadf8\ub9ac\uc2a4\uc5b4
-gre=\uadf8\ub9ac\uc2a4\uc5b4, \uadfc\uc138(1453\ub144\ubd80\ud130)
-grn=\uad6c\uc544\ub77c\ub2c8\uc5b4
-gsw=\ub3c5\uc77c\uc5b4(\uc2a4\uc704\uc2a4)
-guj=\uad6c\uc790\ub77c\ud2b8\uc5b4
-gwi=\uadf8\uc704\uce5c\uc5b4
-hai=\ud558\uc774\ub2e4\uc5b4
-hat=\uc544\uc774\ud2f0\uc5b4
-hau=\ud558\uc6b0\uc790\uc5b4
-haw=\ud558\uc640\uc774\uc5b4
-heb=\ud788\ube0c\ub9ac \ubb38\uc790
-her=\ud5e4\ub808\ub85c\uc5b4
-hil=\ud5e4\ub9ac\uac00\ub1ec\uc5b4
-him=\ud788\ub9c8\ucc28\ub9ac\uc5b4
-hin=\ud78c\ub514\uc5b4
-hit=\ud558\ud0c0\uc774\ud2b8\uc5b4
-hmn=\ud788\ubab8\uc5b4
-hmo=\ud788\ub9ac\ubaa8\ud22c\uc5b4
-hrv=\ud06c\ub85c\uc544\ud2f0\uc544\uc5b4
-hsb=\uace0\uc9c0 \uc18c\ub974\ube44\uc544\uc5b4
-hun=\ud5dd\uac00\ub9ac\uc5b4
-hup=\ud6c4\ud30c\uc5b4
-iba=\uc774\ubc18\uc5b4
-ibo=\uc774\uadf8\ubcf4\uc5b4
-ice=\uc544\uc774\uc2ac\ub780\ub4dc\uc5b4
-ido=\uc774\ub3c4\uc5b4
-iii=\uc4f0\ucd28 \uc774\uc5b4
-ijo=\uc774\uc870\uc5b4
-iku=\uc774\ub205\ud2f0\ud22c\ud2b8\uc5b4
-ile=\uc778\ud130\ub9c1\uac8c\uc5b4
-ilo=\uc774\ub85c\ucf54\uc5b4
-ina=\uc778\ud130\ub9c1\uac70(\uad6d\uc81c \ubcf4\uc870 \uc5b8\uc5b4 \ud611\ud68c)
-inc=\uc778\ub3c4\uc5b4(\uae30\ud0c0)
-ind=\uc778\ub3c4\ub124\uc2dc\uc544\uc5b4
-ine=\uc778\ub3c4\uc720\ub7fd\uc5b4(\uae30\ud0c0)
-inh=\uc778\uadc0\uc2dc\uc5b4
-ipk=\uc774\ub204\ud53c\uc544\ud06c\uc5b4
-ira=\uc774\ub780\uc5b4 [ira]
-iro=\uc774\ub7ec\ucffc\uc774\uc5b4
-ita=\uc774\ud0c8\ub9ac\uc544\uc5b4
-jav=\uc790\ubc14\uc5b4
-jbo=\ub85c\ubc18\uc5b4
-jpn=\uc77c\ubcf8\uc5b4
-jpr=\uc720\ub300-\ud398\ub974\uc2dc\uc544\uc5b4
-jrb=\uc720\ub300-\uc544\ub77c\ube44\uc544\uc5b4
-kaa=\uce74\ub77c\uce7c\ud30c\ud06c\uc5b4
-kab=\ucee4\ubc14\uc77c\uc5b4
-kac=\uce74\uce5c\uc5b4
-kal=\uce7c\ub784\ub9ac\uc218\ud2b8
-kam=\uce84\ubc14\uc5b4
-kan=\uce78\ub098\ub2e4 \ubb38\uc790
-kar=\uce74\ub80c\uc5b4
-kas=\uce74\uc288\ubbf8\ub974\uc5b4
-kau=\uce74\ub204\ub9ac\uc5b4
-kaw=\uce74\uc704\uc5b4
-kaz=\uce74\uc790\ud750\uc5b4
-kbd=\uce74\ubc14\ub974\ub514\uc5b4
-kha=\uce74\uc2dc\uc5b4
-khi=\ucf54\uc774\uc0b0\uc5b4
-khm=\uc911\uc559 \ud06c\uba54\ub974 \ubb38\uc790
-kho=\ud638\ud0c4\uc5b4
-kik=\ud0a4\ucfe0\uc720\uc5b4
-kin=\ubc18\ud22c\uc5b4(\ub8e8\uc644\ub2e4)
-kir=\ud0a4\ub974\uae30\uc2a4\uc5b4
-kmb=\ud0b4\ubd84\ub450\uc5b4
-kok=\ucf54\uce74\ub2c8\uc5b4
-kom=\ucf54\ubbf8\uc5b4
-kon=\ucf69\uace0\uc5b4
-kor=\ud55c\uad6d\uc5b4
-kos=\ucf54\uc2a4\ub77c\uc774\uc5d4\uc5b4
-kpe=\ud06c\ud3a0\ub808\uc5b4
-krc=\uce74\ub77c\ucc60\uc774-\ubc1c\uce74\ub974\uc5b4
-krl=\uce74\ub810\ub9ac\uc57c\uc5b4
-kro=\ud06c\ub8e8\uc5b4
-kru=\ucfe0\ub974\ud06c\uc5b4
-kua=\ucfe0\uc548\uc57c\ub9c8\uc5b4
-kum=\ucfe0\ubbf9\uc5b4
-kur=\ud06c\ub974\ub4dc\uc5b4
-kut=\ucfe0\ud14c\ub124\uc5b4
-lad=\ub77c\ub514\ub178\uc5b4
-lah=\ub77c\ud55c\ub2e4\uc5b4
-lam=\ub78c\ubc14\uc5b4
-lao=\ub77c\uc624\uc5b4
-lat=\ub77c\ud2f4\uc5b4
-lav=\ub77c\ud2b8\ube44\uc544\uc5b4
-lez=\ub808\uc988\uae30\uc548\uc5b4
-lim=\ub9bc\ubc84\uadf8\uc5b4
-lin=\ub9c1\uac08\ub77c\uc5b4
-lit=\ub9ac\ud22c\uc544\ub2c8\uc544\uc5b4
-lol=\ubabd\uace0\uc5b4
-loz=\ub85c\uc9c0\uc5b4
-ltz=\ub8e9\uc148\ubd80\ub974\ud06c\uc5b4
-lua=\ub8e8\ubc14-\ub8f0\ub8e8\uc544\uc5b4
-lub=\ub8e8\ubc14\uc5b4(\uce74\ud0d5\uac00)
-lug=\uac04\ub2e4\uc5b4
-lui=\ub8e8\uc774\uc138\ub178\uc5b4
-lun=\ub8ec\ub2e4\uc5b4
-luo=\ub8e8\uc624\uc5b4
-lus=\ub8e8\uc0e4\uc774\uc5b4
-mac=\ub9c8\ucf00\ub3c4\ub2c8\uc544\uc5b4
-mad=\ub9c8\ub450\ub77c\uc5b4
-mag=\ub9c8\uac00\ud788\uc5b4
-mah=\ub9d0\uc0b4\ub808\uc2a4\uc5b4
-mai=\ub9c8\uc774\ud2f8\ub9ac\uc5b4
-mak=\ub9c8\uce74\uc0ac\uc5b4
-mal=\ub9d0\ub77c\uc584\ub78c\uc5b4
-man=\ub9cc\ub529\uace0\uc5b4
-mao=\ub9c8\uc624\ub9ac\uc5b4
-map=\ub0a8\ub3c4\uc5b4
-mar=\ub9c8\ub77c\ud2f0\uc5b4
-mas=\ub9c8\uc0ac\uc774\uc5b4
-may=\ub9d0\ub808\uc774\uc5b4
-mdf=\ubaa8\ud06c\uc0e4\uc5b4
-mdr=\ub9cc\ub2e4\ub974\uc5b4
-men=\uba58\ub370\uc5b4
-mga=\uc911\uc138 \uc544\uc77c\ub79c\ub4dc\uc5b4
-mic=\ubbf8\ud06c\ub9e5\uc5b4
-min=\ubbf8\ub0ad\uce74\ubc14\uc6b0\uc5b4
-mis=\uae30\ud0c0 \uc5b8\uc5b4
-mkh=\ubaac\ud06c\uba54\ub974\uc5b4 (\uae30\ud0c0)
-mlg=\ub9c8\ub2e4\uac00\uc2a4\uce74\ub974\uc5b4
-mlt=\ubab0\ud0c0\uc5b4
-mnc=\ub9cc\uc8fc\uc5b4
-mni=\ub9c8\ub2c8\ud478\ub9ac\uc5b4
-mno=\ub9c8\ub178\ubcf4\uc5b4
-moh=\ubaa8\ud638\ud06c\uc5b4
-mon=\ubabd\uace8\uc5b4
-mos=\ubaa8\uc2dc\uc5b4
-mul=\ub2e4\uc911 \uc5b8\uc5b4
-mun=\ubb38\ub2e4\uc5b4
-mus=\ud06c\ub9ac\ud06c\uc5b4
-mwl=\ubbf8\ub780\ub370\uc5b4
-mwr=\ub9c8\ub974\uc640\ub9ac\uc5b4
-myn=\ub9c8\uc57c\uc5b4
-myv=\uc5d8\uc988\uc57c\uc5b4
-nah=\ub098\uc6b0\uc544\ud2c0\uc5b4
-nai=\ubd81\uc544\uba54\ub9ac\uce74 \uc778\ub514\uc5b8\uc5b4 (\uae30\ud0c0)
-nap=\ub098\ud3f4\ub9ac\uc5b4
-nau=\ub098\uc6b0\ub8e8\uc5b4
-nav=\ub098\ubc14\ud638\uc5b4
-nbl=\ub370\ubca0\ub808\uc5b4, \ub0a8\ubd80
-nde=\ub370\ubca0\ub808\uc5b4, \ubd81\ubd80
-ndo=\uc740\ub3d9\uac00\uc5b4
-nds=\uc800\uc9c0 \ub3c5\uc77c\uc5b4
-nep=\ub124\ud314\uc5b4
-new=\ub124\uc640\ub974\uc5b4
-nia=\ub2c8\uc544\uc2a4\uc5b4
-nic=\ub2c8\uce74\ub77c\uacfc \ucf54\ub974\ub3c4\ubc14
-niu=\ub2c8\uc6e8\uc5b8\uc5b4
-nno=\ub178\ub974\uc6e8\uc774\uc5b4(\ub2c8\ub178\ub974\uc2a4\ud06c)
-nob=\ub178\ub974\uc6e8\uc774\uc5b4(\ubd81\ubab0)
-nog=\ub178\uac00\uc774\uc5b4
-non=\uace0\ub300 \ub178\ub974\uc6e8\uc774\uc5b4
-nor=\ub178\ub974\uc6e8\uc774\uc5b4
-nqo=\uc751\ucf54\uc5b4
-nso=\ubd81\ubd80 \uc18c\ud1a0\uc5b4
-nub=\ub204\ube44\uc548\uc5b4
-nwc=\uace0\uc804 \ub124\uc640\ub974\uc5b4
-nya=\uce58\uccb4\uc640\uc5b4
-nym=\ub2c8\uc554\uc6e8\uc9c0\uc5b4
-nyn=\ub2c8\uc548\ucf5c\uc5b4
-nyo=\ub274\ub85c\uc5b4
-nzi=\ub290\uc9c0\ub9c8\uc5b4
-oci=\uc625\uc2dc\ud2b8\uc5b4(1500\ub144 \uc774\ud6c4)
-oji=\uc624\uc9c0\ube0c\uc640\uc5b4
-ori=\uc624\ub9ac\uc57c\uc5b4
-orm=\uc624\ub85c\ubaa8\uc5b4
-osa=\uc624\uc138\uc774\uc9c0\uc5b4
-oss=\uc624\uc138\ud2f0\uc548\uc5b4
-ota=\uc624\uc2a4\ub9cc \ud130\ud0a4\uc5b4
-oto=\uc624\ud1a0\ubbf8\uc548\uc5b4
-paa=\ud30c\ud478\uc544\uc5b4(\uae30\ud0c0)
-pag=\ud310\uac00\uc2dc\ub09c\uc5b4
-pal=\ud314\ub808\ube44\uc5b4
-pam=\ud31c\ud321\uac00\uc5b4
-pan=\ud380\uc7a1\uc5b4
-pap=\ud30c\ud53c\uc544\uba3c\ud1a0\uc5b4
-pau=\ud314\ub77c\uc6b0\uc5b4
-peo=\uace0\ub300 \ud398\ub974\uc2dc\uc544\uc5b4
-per=\ud398\ub974\uc2dc\uc544\uc5b4
-phi=\ud544\ub9ac\ud540\uc5b4(\uae30\ud0c0)
-phn=\ud398\ub2c8\ud0a4\uc544\uc5b4
-pli=\ud314\ub9ac\uc5b4
-pol=\ud3f4\ub780\ub4dc\uc5b4
-pon=\ud3fc\ud398\uc774\uc5b4
-por=\ud3ec\ub974\ud22c\uce7c\uc5b4
-pra=\ud504\ub77c\ud06c\ub9ac\ud2b8\uc5b4
-pro=\uace0\ub300 \ud504\ub85c\ubc29\uc2a4\uc5b4
-pus=\ud30c\uc288\ud1a0(\ud30c\uc288\ud1a0\uc5b4)
-que=\ucf00\ucd94\uc544\uc5b4
-raj=\ub77c\uc790\uc2a4\ud0c4\uc5b4
-rap=\ub77c\ud30c\ub274\uc774
-rar=\ub77c\ub85c\ud1b5\uac00\uc5b4
-roa=\ub85c\ub9dd\uc2a4\uc5b4(\uae30\ud0c0)
-roh=\ub85c\ub9dd\uc288\uc5b4
-rom=\uc9d1\uc2dc\uc5b4
-rum=\ub8e8\ub9c8\ub2c8\uc544\uc5b4
-run=\ub8ec\ub514\uc5b4
-rup=\uc544\ub85c\ub9c8\ub2c8\uc544\uc5b4
-rus=\ub7ec\uc2dc\uc544\uc5b4
-sad=\uc0b0\ub2e4\uc6e8\uc5b4
-sag=\uc0b0\uace0\uc5b4
-sah=\uc57c\ucfe0\ud2b8\uc5b4
-sai=\ub0a8\uc544\uba54\ub9ac\uce74 \uc778\ub514\uc5b8\uc5b4 (\uae30\ud0c0)
-sal=\uc0d0\ub9ac\uc2dc\uc5b4\uc5b4
-sam=\uc0ac\ub9c8\ub9ac\uc544 \uc544\ub78d\uc5b4
-san=\uc0b0\uc2a4\ud06c\ub9ac\ud2b8\uc5b4
-sas=\uc0ac\uc0ac\ud06c\uc5b4
-sat=\uc0b0\ud0c8\ub9ac\uc5b4
-scn=\uc2dc\uce60\ub9ac\uc544\uc5b4
-sco=\uc2a4\ucf54\ud2c0\ub79c\ub4dc\uc5b4
-sel=\uc140\ucfe0\ud504\uc5b4
-sem=\uc148\uc5b4(\uae30\ud0c0)
-sga=\uace0\ub300 \uc544\uc77c\ub79c\ub4dc\uc5b4
-sgn=\uc218\ud654
-shn=\uc0e8\uc5b4
-sid=\uc2dc\ub2e4\ubaa8\uc5b4
-sin=\uc2a4\ub9ac\ub791\uce74\uc5b4
-sio=\uc218\uc871\uc5b4
-sit=\uc2ac\ub85c\ubca0\ub2c8\uc544 \ud1a8\ub77c\ub974
-sla=\uc2ac\ub77c\ube0c\uc5b4
-slo=\uc2ac\ub85c\ubc14\ud0a4\uc544\uc5b4
-slv=\uc2ac\ub85c\ubca0\ub2c8\uc544\uc5b4
-sma=\ub0a8\ubd80 \uc0ac\ubbf8\uc5b4
-sme=\ubd81\ubd80 \uc0ac\ubbf8\uc5b4
-smi=\uc0ac\ubbf8\uc5b4 (\uae30\ud0c0)
-smj=\ub8f0\ub808 \uc0ac\ubbf8\uc5b4
-smn=\uc774\ub098\ub9ac \uc0ac\ubbf8\uc5b4
-smo=\uc0ac\ubaa8\uc544\uc5b4
-sms=\uc2a4\ucf5c\ud2b8 \uc0ac\ubbf8\uc5b4
-sna=\uc1fc\ub098\uc5b4
-snd=\uc2e0\ub514\uc5b4
-snk=\uc18c\ub2cc\ucf00\uc5b4
-sog=\uc18c\uadf8\ub514\uc5d4\uc5b4
-som=\uc18c\ub9d0\ub9ac\uc544\uc5b4
-son=\uc1a1\uac00\uc774\uc871\uc5b4
-sot=\uc18c\ud1a0\uc5b4, \ub0a8\ubd80
-spa=\uc2a4\ud398\uc778\uc5b4
-srd=\uc0ac\ub974\ub514\ub2c8\uc544\uc5b4
-srn=\uc2a4\ub77c\ub09c \ud1b5\uac00\uc5b4
-srp=\uc138\ub974\ube44\uc544\uc5b4
-srr=\uc138\ub808\ub974\uc5b4
-ssa=\ub2c8\ub85c-\uc0ac\ud558\ub78c\uc5b4 (\uae30\ud0c0)
-ssw=\uc2dc\uc2a4\uc640\ud2f0\uc5b4
-suk=\uc218\ucfe0\ub9c8\uc5b4
-sun=\uc21c\ub2e8\uc5b4
-sus=\uc218\uc218\uc5b4
-sux=\uc218\uba54\ub974\uc5b4
-swa=\uc2a4\uc640\ud790\ub9ac\uc5b4
-swe=\uc2a4\uc6e8\ub374\uc5b4
-syc=\uace0\uc804 \uc2dc\ub9ac\uc544\uc5b4
-syr=\uc2dc\ub9ac\uc544\uc5b4
-tah=\ud0c0\ud788\ud2f0\uc548\uc5b4
-tai=\ud0dc\uad6d\uc5b4(\uae30\ud0c0)
-tam=\ud0c0\ubc00\uc5b4
-tat=\ud0c0\ud0c0\ub974\uc5b4
-tel=\ud154\ub8e8\uad6c\uc5b4
-tem=\ud300\ub2c8\uc5b4
-ter=\ud14c\ub808\ub178\uc5b4
-tet=\ud14c\ud23c\uc5b4
-tgk=\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4\uc5b4
-tgl=\ud0c0\uac08\ub85c\uadf8\uc5b4
-tha=\ud0dc\uad6d\uc5b4
-tib=\ud2f0\ubca0\ud2b8\uc5b4
-tig=\ud2f0\uadf8\ub808\uc5b4
-tir=\ud2f0\uadf8\ub9ac\ub0d0\uc5b4
-tiv=\ud2f0\ube0c\uc5b4
-tkl=\ud1a0\ucf08\ub77c\uc6b0\uc81c\ub3c4\uc5b4
-tlh=\ud074\ub9c1\uc628\uc5b4
-tli=\ud2c0\ub9c1\uae43\uc871\uc5b4
-tmh=\ud0c0\ub9c8\uc139\uc5b4
-tog=\ub2c8\uc544\uc0ac \ud1b5\uac00\uc5b4
-ton=\ud1b5\uac00\uc5b4(\ud1b5\uac00 \uc12c)
-tpi=\ud1a0\ud06c \ud53c\uc2e0\uc5b4
-tsi=\ud2b8\uc2ec\uc2dc\uc548\uc5b4
-tsn=\uc138\uce20\uc640\ub098\uc5b4
-tso=\ud1b5\uac00\uc5b4
-tuk=\ud22c\ub974\ud06c\uba58\uc5b4
-tum=\ud23c\ubd80\uce74\uc5b4
-tup=\ud22c\ud53c\uc5b4
-tur=\ud130\ud0a4\uc5b4
-tut=\uc54c\ud0c0\uc774\uc81c\uc5b4 (\uae30\ud0c0)
-tvl=\ud22c\ubc1c\ub8e8\uc5b4
-twi=\ud2b8\uc704\uc5b4
-tyv=\ud22c\ube44\ub2c8\uc548\uc5b4
-udm=\uc6b0\ub4dc\ub9d0\ud2b8\uc5b4
-uga=\uc720\uac00\ub9ac\ud2f1\uc5b4
-uig=\uc704\uad6c\ub974\uc5b4
-ukr=\uc6b0\ud06c\ub77c\uc774\ub098\uc5b4
-umb=\uc6c0\ubd84\ub450\uc5b4
-und=\uc54c \uc218 \uc5c6\ub294 \uc5b8\uc5b4
-urd=\uc6b0\ub974\ub450\uc5b4
-uzb=\uc6b0\uc988\ubca0\ud06c\uc5b4
-vai=\ubc14\uc774\uc5b4
-ven=\ubca4\ub2e4\uc5b4
-vie=\ubca0\ud2b8\ub0a8\uc5b4
-vol=\ubcfc\ub77c\ud4cc\ud06c\uc5b4
-vot=\ubcf4\ud2f1\uc5b4
-wak=\uc640\uce74\uc0e8\uc5b4
-wal=\uc6d4\ub77c\uc774\ud0c0\uc5b4
-war=\uc640\ub77c\uc774\uc5b4
-was=\uc640\uc1fc\uc5b4
-wel=\uc6e8\uc77c\uc2a4\uc5b4
-wen=\uc18c\ub974\ube0c\uc5b4
-wln=\uc648\ub8ec\uc5b4
-wol=\uc62c\ub85c\ud504\uc5b4
-xal=\uce7c\ubbf8\ud06c\uc5b4
-xho=\ubc18\ud22c\uc5b4(\ub0a8\uc544\ud504\ub9ac\uce74)
-yao=\uc57c\uc624\uc871\uc5b4
-yap=\uc58d\ud398\uc138\uc5b4
-yid=\uc774\ub514\uc2dc\uc5b4
-yor=\uc694\ub8e8\ubc14\uc5b4
-ypk=\uc57c\ud53d\uc5b4
-zap=\uc0ac\ud3ec\ud14c\ud06c\uc5b4
-zbl=\ube14\ub9ac\uc2a4 \uc2ec\ubcfc
-zen=\uc81c\ub098\uac00\uc5b4
-zha=\uc8fc\uc559\uc5b4
-znd=\uc544\uc794\ub370\uc871\uc5b4
-zul=\uc904\ub8e8\uc5b4
-zun=\uc8fc\ub2c8\uc5b4
-zxx=\uc5b8\uc5b4 \uad00\ub828 \ub0b4\uc6a9 \uc5c6\uc74c
-zza=\uc790\uc790\uc5b4
+aar=아파르어
+abk=아브하즈어
+ace=아체어
+ach=아콜리어
+ada=아당메어
+ady=아디게어
+afa=아프가니(1927-2002)
+afh=아프리힐리어
+afr=남아공 공용어
+ain=아이누어
+aka=아칸어
+akk=아카드어
+alb=알바니아어
+ale=알류트어
+alg=알공킨어족
+alt=남부 알타이어
+amh=암하라어
+ang=고대 영어
+anp=앙가어
+apa=아파치어
+ara=아랍어
+arc=아람어
+arg=아라곤어
+arm=아르메니아어
+arn=마푸둥군어
+arp=아라파호어
+art=기계어(기타)
+arw=아라와크어
+asm=아샘어
+ast=아스투리아어
+ath=아타파스카어군
+aus=오스트레일리아어족
+ava=아바르어
+ave=아베스타어
+awa=아와히어
+aym=아이마라어
+aze=아제르바이잔어
+bad=보스니아-헤르체고비나 디나르
+bai=바밀레케어족
+bak=바슈키르어
+bal=발루치어
+bam=밤바라어
+ban=발리어
+baq=바스크어
+bas=바사어
+bat=발트어(기타)
+bej=베자어
+bel=벨라루스어
+bem=벰바어
+ben=벵골어
+ber=베르베르어
+bho=호즈푸리어
+bih=비하르어
+bik=비콜어
+bin=비니어
+bis=비슬라마어
+bla=식시카어
+bnt=반투어
+bos=보스니아어
+bra=브라지어
+bre=브라질 크루제이루 (1990-1993)
+btk=바타크어
+bua=부리아타
+bug=부기어
+bul=불가리아어
+bur=버마어
+byn=브린어
+cad=카도어
+cai=중앙 아메리카 인디안어(기타)
+car=카리브어
+cat=카탈로니아어
+cau=카프카스어(기타)
+ceb=세부아노어
+cel=켈트어(기타)
+cha=차모로어
+chb=치브차어
+che=체첸어
+chg=차가타이어
+chi=중국어
+chk=추크어
+chm=마리어
+chn=치누크 자곤
+cho=촉토어
+chp=치페우얀
+chr=체로키어
+chu=교회 슬라브어
+chv=추바쉬어
+chy=샤이엔어
+cmc=참어군
+cop=콥트어
+cor=콘월어
+cos=코르시카어
+cpe=크리올어 및 피진어(영어를 기반으로 한 기타)
+cpf=크리올어 및 피진어(프랑스어를 기반으로 한 기타)
+cpp=크리올어 및 피진어(포르투칼어를 기반으로 한 기타)
+cre=크리어
+crh=크리민 터키어; 크리민 타타르어
+crp=크리올어 및 피진어 (기타)
+csb=카슈비아어
+cus=쿠시어족
+cze=체코어
+dak=다코타어
+dan=덴마크어
+dar=다르그와어
+day=다야크어
+del=델라웨어어
+den=슬라브어
+dgr=도그리브어
+din=딩카어
+div=디베히어
+doi=도그리어
+dra=드라비다어 (기타)
+dsb=저지 소르비아어
+dua=두알라어
+dum=중세 네덜란드어
+dut=네덜란드어
+dyu=드율라어
+dzo=부탄어
+efi=이픽어
+egy=고대 이집트어
+eka=이카죽어
+elx=엘람어
+eng=영어
+enm=중세 영어
+epo=에스페란토어
+est=에스토니아어
+ewe=에웨어
+ewo=이원도어
+fan=팡그어
+fao=페로스어
+fat=판티어
+fij=피지어
+fil=필리핀어
+fin=핀란드어
+fiu=피노우그리아어(기타)
+fon=폰어
+fre=프랑스어
+frm=중세 프랑스어
+fro=고대 프랑스어
+frr=북부 프리지아어
+frs=동부 프리슬란드어
+fry=서부 프리슬란드어
+ful=풀라니어
+fur=프리울리어
+gaa=가어
+gay=가요어
+gba=그바야어
+gem=독일어(기타)
+geo=그루지야어
+ger=독일어
+gez=게이즈어
+gil=키리바시어
+gla=게일어
+gle=아일랜드어
+glg=갈리시아어
+glv=맹크스어
+gmh=중세 고지 독일어
+goh=고대 고지 독일어
+gon=곤디어
+gor=고론탈로어
+got=고트어
+grb=게르보어
+grc=고대 그리스어
+gre=그리스어, 근세(1453년부터)
+grn=구아라니어
+gsw=독일어(스위스)
+guj=구자라트어
+gwi=그위친어
+hai=하이다어
+hat=아이티어
+hau=하우자어
+haw=하와이어
+heb=히브리 문자
+her=헤레로어
+hil=헤리가뇬어
+him=히마차리어
+hin=힌디어
+hit=하타이트어
+hmn=히몸어
+hmo=히리모투어
+hrv=크로아티아어
+hsb=고지 소르비아어
+hun=헝가리어
+hup=후파어
+iba=이반어
+ibo=이그보어
+ice=아이슬란드어
+ido=이도어
+iii=쓰촨 이어
+ijo=이조어
+iku=이눅티투트어
+ile=인터링게어
+ilo=이로코어
+ina=인터링거(국제 보조 언어 협회)
+inc=인도어(기타)
+ind=인도네시아어
+ine=인도유럽어(기타)
+inh=인귀시어
+ipk=이누피아크어
+ira=이란어 [ira]
+iro=이러쿼이어
+ita=이탈리아어
+jav=자바어
+jbo=로반어
+jpn=일본어
+jpr=유대-페르시아어
+jrb=유대-아라비아어
+kaa=카라칼파크어
+kab=커바일어
+kac=카친어
+kal=칼랄리수트
+kam=캄바어
+kan=칸나다 문자
+kar=카렌어
+kas=카슈미르어
+kau=카누리어
+kaw=카위어
+kaz=카자흐어
+kbd=카바르디어
+kha=카시어
+khi=코이산어
+khm=중앙 크메르 문자
+kho=호탄어
+kik=키쿠유어
+kin=반투어(루완다)
+kir=키르기스어
+kmb=킴분두어
+kok=코카니어
+kom=코미어
+kon=콩고어
+kor=한국어
+kos=코스라이엔어
+kpe=크펠레어
+krc=카라챠이-발카르어
+krl=카렐리야어
+kro=크루어
+kru=쿠르크어
+kua=쿠안야마어
+kum=쿠믹어
+kur=크르드어
+kut=쿠테네어
+lad=라디노어
+lah=라한다어
+lam=람바어
+lao=라오어
+lat=라틴어
+lav=라트비아어
+lez=레즈기안어
+lim=림버그어
+lin=링갈라어
+lit=리투아니아어
+lol=몽고어
+loz=로지어
+ltz=룩셈부르크어
+lua=루바-룰루아어
+lub=루바어(카탕가)
+lug=간다어
+lui=루이세노어
+lun=룬다어
+luo=루오어
+lus=루샤이어
+mac=마케도니아어
+mad=마두라어
+mag=마가히어
+mah=말살레스어
+mai=마이틸리어
+mak=마카사어
+mal=말라얄람어
+man=만딩고어
+mao=마오리어
+map=남도어
+mar=마라티어
+mas=마사이어
+may=말레이어
+mdf=모크샤어
+mdr=만다르어
+men=멘데어
+mga=중세 아일랜드어
+mic=미크맥어
+min=미낭카바우어
+mis=기타 언어
+mkh=몬크메르어 (기타)
+mlg=마다가스카르어
+mlt=몰타어
+mnc=만주어
+mni=마니푸리어
+mno=마노보어
+moh=모호크어
+mon=몽골어
+mos=모시어
+mul=다중 언어
+mun=문다어
+mus=크리크어
+mwl=미란데어
+mwr=마르와리어
+myn=마야어
+myv=엘즈야어
+nah=나우아틀어
+nai=북아메리카 인디언어 (기타)
+nap=나폴리어
+nau=나우루어
+nav=나바호어
+nbl=데베레어, 남부
+nde=데베레어, 북부
+ndo=은동가어
+nds=저지 독일어
+nep=네팔어
+new=네와르어
+nia=니아스어
+nic=니카라과 코르도바
+niu=니웨언어
+nno=노르웨이어(니노르스크)
+nob=노르웨이어(북몰)
+nog=노가이어
+non=고대 노르웨이어
+nor=노르웨이어
+nqo=응코어
+nso=북부 소토어
+nub=누비안어
+nwc=고전 네와르어
+nya=치체와어
+nym=니암웨지어
+nyn=니안콜어
+nyo=뉴로어
+nzi=느지마어
+oci=옥시트어(1500년 이후)
+oji=오지브와어
+ori=오리야어
+orm=오로모어
+osa=오세이지어
+oss=오세티안어
+ota=오스만 터키어
+oto=오토미안어
+paa=파푸아어(기타)
+pag=판가시난어
+pal=팔레비어
+pam=팜팡가어
+pan=펀잡어
+pap=파피아먼토어
+pau=팔라우어
+peo=고대 페르시아어
+per=페르시아어
+phi=필리핀어(기타)
+phn=페니키아어
+pli=팔리어
+pol=폴란드어
+pon=폼페이어
+por=포르투칼어
+pra=프라크리트어
+pro=고대 프로방스어
+pus=파슈토(파슈토어)
+que=케추아어
+raj=라자스탄어
+rap=라파뉴이
+rar=라로통가어
+roa=로망스어(기타)
+roh=로망슈어
+rom=집시어
+rum=루마니아어
+run=룬디어
+rup=아로마니아어
+rus=러시아어
+sad=산다웨어
+sag=산고어
+sah=야쿠트어
+sai=남아메리카 인디언어 (기타)
+sal=샐리시어어
+sam=사마리아 아랍어
+san=산스크리트어
+sas=사사크어
+sat=산탈리어
+scn=시칠리아어
+sco=스코틀랜드어
+sel=셀쿠프어
+sem=셈어(기타)
+sga=고대 아일랜드어
+sgn=수화
+shn=샨어
+sid=시다모어
+sin=스리랑카어
+sio=수족어
+sit=슬로베니아 톨라르
+sla=슬라브어
+slo=슬로바키아어
+slv=슬로베니아어
+sma=남부 사미어
+sme=북부 사미어
+smi=사미어 (기타)
+smj=룰레 사미어
+smn=이나리 사미어
+smo=사모아어
+sms=스콜트 사미어
+sna=쇼나어
+snd=신디어
+snk=소닌케어
+sog=소그디엔어
+som=소말리아어
+son=송가이족어
+sot=소토어, 남부
+spa=스페인어
+srd=사르디니아어
+srn=스라난 통가어
+srp=세르비아어
+srr=세레르어
+ssa=니로-사하람어 (기타)
+ssw=시스와티어
+suk=수쿠마어
+sun=순단어
+sus=수수어
+sux=수메르어
+swa=스와힐리어
+swe=스웨덴어
+syc=고전 시리아어
+syr=시리아어
+tah=타히티안어
+tai=태국어(기타)
+tam=타밀어
+tat=타타르어
+tel=텔루구어
+tem=팀니어
+ter=테레노어
+tet=테툼어
+tgk=타지키스탄어
+tgl=타갈로그어
+tha=태국어
+tib=티베트어
+tig=티그레어
+tir=티그리냐어
+tiv=티브어
+tkl=토켈라우제도어
+tlh=클링온어
+tli=틀링깃족어
+tmh=타마섹어
+tog=니아사 통가어
+ton=통가어(통가 섬)
+tpi=토크 피신어
+tsi=트심시안어
+tsn=세츠와나어
+tso=통가어
+tuk=투르크멘어
+tum=툼부카어
+tup=투피어
+tur=터키어
+tut=알타이제어 (기타)
+tvl=투발루어
+twi=트위어
+tyv=투비니안어
+udm=우드말트어
+uga=유가리틱어
+uig=위구르어
+ukr=우크라이나어
+umb=움분두어
+und=알 수 없는 언어
+urd=우르두어
+uzb=우즈베크어
+vai=바이어
+ven=벤다어
+vie=베트남어
+vol=볼라퓌크어
+vot=보틱어
+wak=와카샨어
+wal=월라이타어
+war=와라이어
+was=와쇼어
+wel=웨일스어
+wen=소르브어
+wln=왈룬어
+wol=올로프어
+xal=칼미크어
+xho=반투어(남아프리카)
+yao=야오족어
+yap=얍페세어
+yid=이디시어
+yor=요루바어
+ypk=야픽어
+zap=사포테크어
+zbl=블리스 심볼
+zen=제나가어
+zha=주앙어
+znd=아잔데족어
+zul=줄루어
+zun=주니어
+zxx=언어 관련 내용 없음
+zza=자자어
 
 # script names
 # key is ISO 15924 script code
 
-Arab=\uc544\ub78d \ubb38\uc790
-Armi=\uc544\ub78d\uc81c\uad6d \ubb38\uc790
-Armn=\uc544\ub974\uba54\ub2c8\uc544 \ubb38\uc790
-Avst=\uc544\ubca0\uc2a4\ud0c0 \ubb38\uc790
-Bali=\ubc1c\ub9ac \ubb38\uc790
-Bamu=\ubc14\ubb44 \ubb38\uc790
-Bass=\ubc14\uc0ac\ubc14\ud750 \ubb38\uc790
-Batk=\ubc14\ud0c0\ud06c \ubb38\uc790
-Beng=\ubcb5\uace8 \ubb38\uc790
-Blis=\ube14\ub9ac\uc2a4\uae30\ud638 \ubb38\uc790
-Bopo=\uc8fc\uc74c\ubd80\ud638
-Brah=\ube0c\ub77c\ubbf8
-Brai=\ube0c\ub77c\uc720 \uc810\uc790
-Bugi=\ubd80\uae30 \ubb38\uc790
-Buhd=\ubd80\ud788\ub4dc \ubb38\uc790
-Cakm=\ucc28\ud06c\ub9c8 \ubb38\uc790
-Cans=\ud1b5\ud569 \uce90\ub098\ub2e4 \ud1a0\ucc29\uc5b4
-Cari=\uce74\ub9ac \ubb38\uc790
-Cham=\uce78 \uace0\uc5b4
-Cher=\uccb4\ub85c\ud0a4 \ubb38\uc790
-Cirt=\ud0a4\ub974\uc4f0
-Copt=\ucf65\ud2b8 \ubb38\uc790
-Cprt=\ud0a4\ud504\ub85c\uc2a4 \ubb38\uc790
-Cyrl=\ud0a4\ub9b4 \ubb38\uc790
-Cyrs=\uace0\ub300\uad50\ud68c\uc2ac\ub77c\ube0c\uc5b4 \ud0a4\ub9b4\ubb38\uc790
-Deva=\ub370\ubc14\ub098\uac00\ub9ac \ubb38\uc790
-Dsrt=\ub514\uc800\ub81b \ubb38\uc790
-Dupl=\ub4c0\ud50c\ub85c\uc774\uc548 \ubb38\uc790
-Egyd=\uace0\ub300 \uc774\uc9d1\ud2b8 \ubbfc\uc911\ubb38\uc790
-Egyh=\uace0\ub300 \uc774\uc9d1\ud2b8 \uc2e0\uad00\ubb38\uc790
-Egyp=\uace0\ub300 \uc774\uc9d1\ud2b8 \uc2e0\uc131\ubb38\uc790
-Elba=\uc5d8\ubc14\uc0b0 \ubb38\uc790
-Ethi=\uc5d0\ud2f0\uc624\ud53c\uc544 \ubb38\uc790
-Geok=\uadf8\ub8e8\uc9c0\uc57c \ucfe0\uce20\ub9ac \ubb38\uc790
-Geor=\uc870\uc9c0\uc544 \ubb38\uc790
-Glag=\uae00\ub77c\uace8 \ubb38\uc790
-Goth=\uace0\ud2b8 \ubb38\uc790
-Gran=\uadf8\ub780\ud0c0 \ubb38\uc790
-Grek=\uadf8\ub9ac\uc2a4 \ubb38\uc790
-Gujr=\uad6c\uc790\ub77c\ud2b8 \ubb38\uc790
-Guru=\uad6c\ub974\ubb34\ud0a4 \ubb38\uc790
-Hang=\ud55c\uae00
-Hani=\ud55c\uc790
-Hano=\ud558\ub204\ub204 \ubb38\uc790
-Hans=\uac04\uccb4
-Hant=\ubc88\uccb4
-Hebr=\ud788\ube0c\ub9ac \ubb38\uc790
-Hira=\ud788\ub77c\uac00\ub098
-Hmng=\ud30c\ud558\uc6b0 \ubabd \ubb38\uc790
-Hrkt=\uac00\ub098
-Hung=\uace0\ub300 \ud5dd\uac00\ub9ac \ubb38\uc790
-Inds=\uc778\ub354\uc2a4 \ubb38\uc790
-Ital=\uace0\ub300 \uc774\ud0c8\ub9ac\uc544 \ubb38\uc790
-Java=\uc790\ubc14 \ubb38\uc790
-Jpan=\uc77c\ubcf8 \ubb38\uc790
-Kali=\uce74\uc57c \ub9ac \ubb38\uc790
-Kana=\uac00\ud0c0\uce74\ub098
-Khar=\uce74\ub85c\uc288\ud2f0 \ubb38\uc790
-Khmr=\ud06c\uba54\ub974 \ubb38\uc790
-Knda=\uce78\ub098\ub2e4 \ubb38\uc790
-Kore=\ud55c\uad6d \ubb38\uc790
-Kpel=\ud06c\ud3a0\ub808 \ubb38\uc790
-Kthi=\uce74\uc774\uc2dc \ubb38\uc790
-Lana=\ub780\ub098 \ubb38\uc790
-Laoo=\ub77c\uc624 \ubb38\uc790
-Latf=\ub3c5\uc77c\uc2dd \ub85c\ub9c8\uc790
-Latg=\uc544\uc77c\ub79c\ub4dc\uc2dd \ub85c\ub9c8\uc790
-Latn=\ub85c\ub9c8\uc790
-Lepc=\ub819\ucc28 \ubb38\uc790
-Limb=\ub9bc\ubd80 \ubb38\uc790
-Lina=\uc120\ud615 \ubb38\uc790(A)
-Linb=\uc120\ud615 \ubb38\uc790(B)
-Lisu=\ud504\ub808\uc774\uc800 \ubb38\uc790
-Loma=\ub85c\ub9c8 \ubb38\uc790
-Lyci=\ub9ac\ud0a4\uc544 \ubb38\uc790
-Lydi=\ub9ac\ub514\uc544 \ubb38\uc790
-Mand=\ub9cc\ub2e4\uc774\uc544 \ubb38\uc790
-Mani=\ub9c8\ub2c8\uad50 \ubb38\uc790
-Maya=\ub9c8\uc57c \uc0c1\ud615 \ubb38\uc790
-Mend=\uba58\ub370 \ubb38\uc790
-Merc=\uba54\ub85c\uc5d0 \ud544\uae30\uccb4
-Mero=\uba54\ub85c\uc5d0 \ubb38\uc790
-Mlym=\ub9d0\ub77c\uc584\ub78c \ubb38\uc790
-Mong=\ubabd\uace8 \ubb38\uc790
-Moon=\ubb38 \ubb38\uc790
-Mtei=\uba54\uc774\ud14c\uc774 \ub9c8\uc609 \ubb38\uc790
-Mymr=\ubbf8\uc580\ub9c8 \ubb38\uc790
-Narb=\uc61b \ubd81\ubd80 \uc544\ub77c\ube44\uc544 \ubb38\uc790
-Nbat=\ub098\ubc14\ud14c\uc544 \ubb38\uc790
-Nkgb=\ub098\uc2dc \uac8c\ubc14 \ubb38\uc790
-Nkoo=\uc751\ucf54 \ubb38\uc790
-Ogam=\uc624\uac80 \ubb38\uc790
-Olck=\uc62c \uce58\ud0a4 \ubb38\uc790
-Orkh=\uc624\ub974\ud63c\uc5b4
-Orya=\uc624\ub9ac\uc57c \ubb38\uc790
-Osma=\uc624\uc2a4\ub9c8\ub2c8\uc544 \ubb38\uc790
-Palm=\ud314\ubbf8\ub77c \ubb38\uc790
-Perm=\uace0\ub300 \ud398\ub984 \ubb38\uc790
-Phag=\ud30c\uc2a4\ud30c \ubb38\uc790
-Phli=\uba85\ubb38 \ud314\ub77c\ube44 \ubb38\uc790
-Phlp=\uc194\ud130 \ud314\ub77c\ube44 \ubb38\uc790
-Phlv=\ubd81 \ud314\ub77c\ube44 \ubb38\uc790
-Phnx=\ud398\ub2c8\ud0a4\uc544 \ubb38\uc790
-Plrd=\ud3f4\ub77c\ub4dc \ud45c\uc74c \ubb38\uc790
-Prti=\uba85\ubb38 \ud30c\ub77c\ud2f0\uc544 \ubb38\uc790
-Rjng=\ub808\uc7a5 \ubb38\uc790
-Roro=\ub871\uace0\ub871\uace0
-Runr=\ub8ec \ubb38\uc790
-Samr=\uc0ac\ub9c8\ub9ac\uc544 \ubb38\uc790
-Sara=\uc0ac\ub77c\ud2f0
-Sarb=\uc61b \ub0a8\ubd80 \uc544\ub77c\ube44\uc544 \ubb38\uc790
-Saur=\uc0ac\uc6b0\ub77c\uc288\ud2b8\ub77c \ubb38\uc790
-Sgnw=\uc218\ud654 \ubb38\uc790
-Shaw=\uc0e4\ube44\uc548 \ubb38\uc790
-Sind=\ucfe0\ub2e4\uc640\ub514 \ubb38\uc790
-Sinh=\uc2e0\ud560\ub77c \ubb38\uc790
-Sund=\uc21c\ub2e4 \ubb38\uc790
-Sylo=\uc2e4\ud5e4\ud2f0 \ub098\uac00\ub9ac
-Syrc=\uc2dc\ub9ac\uc544 \ubb38\uc790
-Syre=\uc5d0\uc2a4\ud2b8\ub791\uac94\ub85c\uc2dd \uc2dc\ub9ac\uc544 \ubb38\uc790
-Syrj=\uc11c\ubd80 \uc2dc\ub9ac\uc544 \ubb38\uc790
-Syrn=\ub3d9\ubd80 \uc2dc\ub9ac\uc544 \ubb38\uc790
-Tagb=\ud0c0\uadf8\ubc18\uc640 \ubb38\uc790
-Tale=\ud0c0\uc774 \ub808 \ubb38\uc790
-Talu=\uc2e0 \ud0c0\uc774 \ub8e8\uc5d0
-Taml=\ud0c0\ubc00 \ubb38\uc790
-Tavt=\ud0dc\uad6d \ubca0\ud2b8\ub0a8 \ubb38\uc790
-Telu=\ud154\ub8e8\uad6c \ubb38\uc790
-Teng=\ud161\uacfc\ub974 \ubb38\uc790
-Tfng=\ud2f0\ud53c\ub098\uadf8 \ubb38\uc790
-Tglg=\ud0c0\uac08\ub85c\uadf8 \ubb38\uc790
-Thaa=\ud0c0\ub098 \ubb38\uc790
-Thai=\ud0c0\uc774 \ubb38\uc790
-Tibt=\ud2f0\ubca0\ud2b8 \ubb38\uc790
-Ugar=\uc6b0\uac00\ub9ac\ud2b8 \ubb38\uc790
-Vaii=\ubc14\uc774 \ubb38\uc790
-Visp=\uc2dc\ud654\ubc95
-Wara=\ubc14\ub791 \ud06c\uc2dc\ud2f0 \ubb38\uc790
-Xpeo=\uace0\ub300 \ud398\ub974\uc2dc\uc544 \ubb38\uc790
-Xsux=\uc218\uba54\ub974-\uc544\uce74\ub4dc\uc5b4 \uc124\ud615\ubb38\uc790
-Yiii=\uc774 \ubb38\uc790
-Zinh=\uad6c\uc804 \ubb38\uc790
-Zmth=\uc218\ud559 \uae30\ud638
-Zsym=\uae30\ud638
-Zxxx=\uad6c\uc804
-Zyyy=\uc77c\ubc18 \ubb38\uc790
-Zzzz=\uc54c \uc218 \uc5c6\ub294 \ubb38\uc790
+Arab=아랍 문자
+Armi=아랍제국 문자
+Armn=아르메니아 문자
+Avst=아베스타 문자
+Bali=발리 문자
+Bamu=바뭄 문자
+Bass=바사바흐 문자
+Batk=바타크 문자
+Beng=벵골 문자
+Blis=블리스기호 문자
+Bopo=주음부호
+Brah=브라미
+Brai=브라유 점자
+Bugi=부기 문자
+Buhd=부히드 문자
+Cakm=차크마 문자
+Cans=통합 캐나다 토착어
+Cari=카리 문자
+Cham=칸 고어
+Cher=체로키 문자
+Cirt=키르쓰
+Copt=콥트 문자
+Cprt=키프로스 문자
+Cyrl=키릴 문자
+Cyrs=고대교회슬라브어 키릴문자
+Deva=데바나가리 문자
+Dsrt=디저렛 문자
+Dupl=듀플로이안 문자
+Egyd=고대 이집트 민중문자
+Egyh=고대 이집트 신관문자
+Egyp=고대 이집트 신성문자
+Elba=엘바산 문자
+Ethi=에티오피아 문자
+Geok=그루지야 쿠츠리 문자
+Geor=조지아 문자
+Glag=글라골 문자
+Goth=고트 문자
+Gran=그란타 문자
+Grek=그리스 문자
+Gujr=구자라트 문자
+Guru=구르무키 문자
+Hang=한글
+Hani=한자
+Hano=하누누 문자
+Hans=간체
+Hant=번체
+Hebr=히브리 문자
+Hira=히라가나
+Hmng=파하우 몽 문자
+Hrkt=가나
+Hung=고대 헝가리 문자
+Inds=인더스 문자
+Ital=고대 이탈리아 문자
+Java=자바 문자
+Jpan=일본 문자
+Kali=카야 리 문자
+Kana=가타카나
+Khar=카로슈티 문자
+Khmr=크메르 문자
+Knda=칸나다 문자
+Kore=한국 문자
+Kpel=크펠레 문자
+Kthi=카이시 문자
+Lana=란나 문자
+Laoo=라오 문자
+Latf=독일식 로마자
+Latg=아일랜드식 로마자
+Latn=로마자
+Lepc=렙차 문자
+Limb=림부 문자
+Lina=선형 문자(A)
+Linb=선형 문자(B)
+Lisu=프레이저 문자
+Loma=로마 문자
+Lyci=리키아 문자
+Lydi=리디아 문자
+Mand=만다이아 문자
+Mani=마니교 문자
+Maya=마야 상형 문자
+Mend=멘데 문자
+Merc=메로에 필기체
+Mero=메로에 문자
+Mlym=말라얄람 문자
+Mong=몽골 문자
+Moon=문 문자
+Mtei=메이테이 마옉 문자
+Mymr=미얀마 문자
+Narb=옛 북부 아라비아 문자
+Nbat=나바테아 문자
+Nkgb=나시 게바 문자
+Nkoo=응코 문자
+Ogam=오검 문자
+Olck=올 치키 문자
+Orkh=오르혼어
+Orya=오리야 문자
+Osma=오스마니아 문자
+Palm=팔미라 문자
+Perm=고대 페름 문자
+Phag=파스파 문자
+Phli=명문 팔라비 문자
+Phlp=솔터 팔라비 문자
+Phlv=북 팔라비 문자
+Phnx=페니키아 문자
+Plrd=폴라드 표음 문자
+Prti=명문 파라티아 문자
+Rjng=레장 문자
+Roro=롱고롱고
+Runr=룬 문자
+Samr=사마리아 문자
+Sara=사라티
+Sarb=옛 남부 아라비아 문자
+Saur=사우라슈트라 문자
+Sgnw=수화 문자
+Shaw=샤비안 문자
+Sind=쿠다와디 문자
+Sinh=신할라 문자
+Sund=순다 문자
+Sylo=실헤티 나가리
+Syrc=시리아 문자
+Syre=에스트랑겔로식 시리아 문자
+Syrj=서부 시리아 문자
+Syrn=동부 시리아 문자
+Tagb=타그반와 문자
+Tale=타이 레 문자
+Talu=신 타이 루에
+Taml=타밀 문자
+Tavt=태국 베트남 문자
+Telu=텔루구 문자
+Teng=텡과르 문자
+Tfng=티피나그 문자
+Tglg=타갈로그 문자
+Thaa=타나 문자
+Thai=타이 문자
+Tibt=티베트 문자
+Ugar=우가리트 문자
+Vaii=바이 문자
+Visp=시화법
+Wara=바랑 크시티 문자
+Xpeo=고대 페르시아 문자
+Xsux=수메르-아카드어 설형문자
+Yiii=이 문자
+Zinh=구전 문자
+Zmth=수학 기호
+Zsym=기호
+Zxxx=구전
+Zyyy=일반 문자
+Zzzz=알 수 없는 문자
 
 # country names
 # key is ISO 3166 country code
 
-AD=\uc548\ub3c4\ub77c
-AE=\uc544\ub78d\uc5d0\ubbf8\ub9ac\ud2b8
-AF=\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4
-AG=\uc564\ud2f0\uac00 \ubc14\ubd80\ub2e4
-AI=\uc575\uadc8\ub77c
-AL=\uc54c\ubc14\ub2c8\uc544
-AM=\uc544\ub974\uba54\ub2c8\uc544
-AN=\ub124\ub35c\ub780\ub4dc\ub839 \uc548\ud2f8\ub808\uc2a4
-AO=\uc559\uace8\ub77c
-AQ=\ub0a8\uadf9 \ub300\ub959
-AR=\uc544\ub974\ud5e8\ud2f0\ub098
-AS=\uc544\uba54\ub9ac\uce78 \uc0ac\ubaa8\uc544
-AT=\uc624\uc2a4\ud2b8\ub9ac\uc544
-AU=\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544
-AW=\uc544\ub8e8\ubc14
-AX=\uc62c\ub780\ub4dc \uc81c\ub3c4
-AZ=\uc544\uc81c\ub974\ubc14\uc774\uc794
-BA=\ubcf4\uc2a4\ub2c8\uc544 \ud5e4\ub974\uccb4\uace0\ube44\ub098
-BB=\ubc14\ubca0\uc774\ub3c4\uc2a4
-BD=\ubc29\uae00\ub77c\ub370\uc2dc
-BE=\ubca8\uae30\uc5d0
-BF=\ubd80\ub974\ud0a4\ub098\ud30c\uc18c
-BG=\ubd88\uac00\ub9ac\uc544
-BH=\ubc14\ub808\uc778
-BI=\ubd80\ub8ec\ub514
-BJ=\ubca0\ub0c9
-BM=\ubc84\ubba4\ub2e4
-BN=\ube0c\ub8e8\ub098\uc774
-BO=\ubcfc\ub9ac\ube44\uc544
-BR=\ube0c\ub77c\uc9c8
-BS=\ubc14\ud558\ub9c8
-BT=\ubd80\ud0c4
-BV=\ubd80\ubca0\uc12c
-BW=\ubcf4\uce20\uc640\ub098
-BY=\ubca8\ub77c\ub8e8\uc2a4
-BZ=\ubca8\ub9ac\uc988
-CA=\uce90\ub098\ub2e4
-CC=\ucf54\ucf54\uc2a4 \uc81c\ub3c4
-CD=\ucf69\uace0-\ud0a8\uc0e4\uc0ac
-CF=\uc911\uc559 \uc544\ud504\ub9ac\uce74 \uacf5\ud654\uad6d
-CG=\ucf69\uace0-\ube0c\ub77c\uc790\ube4c
-CH=\uc2a4\uc704\uc2a4
-CI=\ucf54\ud2b8\ub514\ubd80\uc544\ub974
-CK=\ucfe1 \uc81c\ub3c4
-CL=\uce60\ub808
-CM=\uce74\uba54\ub8ec
-CN=\uc911\uad6d
-CO=\ucf5c\ub86c\ube44\uc544
-CR=\ucf54\uc2a4\ud0c0\ub9ac\uce74
-CS=\uc138\ub974\ube44\uc544 \ubaac\ud14c\ub124\uadf8\ub85c(\uc720\uace0\uc2ac\ub77c\ube44\uc544)
-CU=\ucfe0\ubc14
-CV=\uce74\ubcf4\ubca0\ub974\ub370
-CX=\ud06c\ub9ac\uc2a4\ub9c8\uc2a4\uc12c
-CY=\ud0a4\ud504\ub85c\uc2a4
-CZ=\uccb4\ucf54
-DE=\ub3c5\uc77c
-DJ=\uc9c0\ubd80\ud2f0
-DK=\ub374\ub9c8\ud06c
-DM=\ub3c4\ubbf8\ub2c8\uce74
-DO=\ub3c4\ubbf8\ub2c8\uce74 \uacf5\ud654\uad6d
-DZ=\uc54c\uc81c\ub9ac
-EC=\uc5d0\ucf70\ub3c4\ub974
-EE=\uc5d0\uc2a4\ud1a0\ub2c8\uc544
-EG=\uc774\uc9d1\ud2b8
-EH=\uc11c\uc0ac\ud558\ub77c
-ER=\uc5d0\ub9ac\ud2b8\ub9ac\uc544
-ES=\uc2a4\ud398\uc778
-ET=\uc5d0\ud2f0\uc624\ud53c\uc544
-FI=\ud540\ub780\ub4dc
-FJ=\ud53c\uc9c0
-FK=\ud3ec\ud074\ub79c\ub4dc \uc81c\ub3c4
-FM=\ubbf8\ud06c\ub85c\ub124\uc2dc\uc544
-FO=\ud398\ub85c \uc81c\ub3c4
-FR=\ud504\ub791\uc2a4
-GA=\uac00\ubd09
-GB=\uc601\uad6d
-GD=\uadf8\ub808\ub098\ub2e4
-GE=\uc870\uc9c0\uc544
-GF=\ud504\ub791\uc2a4\ub839 \uae30\uc544\ub098
-GH=\uac00\ub098
-GI=\uc9c0\ube0c\ub864\ud130
-GL=\uadf8\ub9b0\ub780\ub4dc
-GM=\uac10\ube44\uc544
-GN=\uae30\ub2c8
-GP=\uacfc\ub4e4\ub8e8\ud504
-GQ=\uc801\ub3c4 \uae30\ub2c8
-GR=\uadf8\ub9ac\uc2a4
-GS=\uc0ac\uc6b0\uc2a4\uc870\uc9c0\uc544 \uc0ac\uc6b0\uc2a4\uc0cc\ub4dc\uc704\uce58 \uc81c\ub3c4
-GT=\uacfc\ud14c\ub9d0\ub77c
-GU=\uad0c
-GW=\uae30\ub2c8\ube44\uc0ac\uc6b0
-GY=\uac00\uc774\uc544\ub098
-HK=\ud64d\ucf69(\uc911\uad6d \ud2b9\ubcc4\ud589\uc815\uad6c)
-HM=\ud5c8\ub4dc \ub9e5\ub3c4\ub110\ub4dc \uc81c\ub3c4
-HN=\uc628\ub450\ub77c\uc2a4
-HR=\ud06c\ub85c\uc544\ud2f0\uc544
-HT=\uc544\uc774\ud2f0
-HU=\ud5dd\uac00\ub9ac
-ID=\uc778\ub3c4\ub124\uc2dc\uc544
-IE=\uc544\uc77c\ub79c\ub4dc
-IL=\uc774\uc2a4\ub77c\uc5d8
-IN=\uc778\ub3c4
-IO=\uc601\uad6d\ub839 \uc778\ub3c4\uc591 \uc2dd\ubbfc\uc9c0
-IQ=\uc774\ub77c\ud06c
-IR=\uc774\ub780
-IS=\uc544\uc774\uc2ac\ub780\ub4dc
-IT=\uc774\ud0c8\ub9ac\uc544
-JM=\uc790\uba54\uc774\uce74
-JO=\uc694\ub974\ub2e8
-JP=\uc77c\ubcf8
-KE=\ucf00\ub0d0
-KG=\ud0a4\ub974\uae30\uc2a4\uc2a4\ud0c4
-KH=\uce84\ubcf4\ub514\uc544
-KI=\ud0a4\ub9ac\ubc14\uc2dc
-KM=\ucf54\ubaa8\ub85c
-KN=\uc138\uc778\ud2b8\ud0a4\uce20 \ub124\ube44\uc2a4
-KP=\ubd81\ud55c
-KR=\ub300\ud55c\ubbfc\uad6d
-KW=\ucfe0\uc6e8\uc774\ud2b8
-KY=\ucf00\uc774\ub9e8 \uc81c\ub3c4
-KZ=\uce74\uc790\ud750\uc2a4\ud0c4
-LA=\ub77c\uc624\uc2a4
-LB=\ub808\ubc14\ub17c
-LC=\uc138\uc778\ud2b8\ub8e8\uc2dc\uc544
-LI=\ub9ac\ud788\ud150\uc288\ud0c0\uc778
-LK=\uc2a4\ub9ac\ub791\uce74
-LR=\ub77c\uc774\ubca0\ub9ac\uc544
-LS=\ub808\uc18c\ud1a0
-LT=\ub9ac\ud22c\uc544\ub2c8\uc544
-LU=\ub8e9\uc148\ubd80\ub974\ud06c
-LV=\ub77c\ud2b8\ube44\uc544
-LY=\ub9ac\ube44\uc544
-MA=\ubaa8\ub85c\ucf54
-MC=\ubaa8\ub098\ucf54
-MD=\ubab0\ub3c4\ubc14
-ME=\ubaac\ud14c\ub124\uadf8\ub85c
-MG=\ub9c8\ub2e4\uac00\uc2a4\uce74\ub974
-MH=\ub9c8\uc15c \uc81c\ub3c4
-MK=\ubd81\ub9c8\ucf00\ub3c4\ub2c8\uc544
-ML=\ub9d0\ub9ac
-MM=\ubbf8\uc580\ub9c8
-MN=\ubabd\uace8
-MO=\ub9c8\uce74\uc624(\uc911\uad6d \ud2b9\ubcc4\ud589\uc815\uad6c)
-MP=\ubd81\ub9c8\ub9ac\uc544\ub098\uc81c\ub3c4
-MQ=\ub9c8\ub974\ud2f0\ub2c8\ud06c
-MR=\ubaa8\ub9ac\ud0c0\ub2c8
-MS=\ubaac\ud2b8\uc138\ub77c\ud2b8
-MT=\ubab0\ud0c0
-MU=\ubaa8\ub9ac\uc154\uc2a4
-MV=\ubab0\ub514\ube0c
-MW=\ub9d0\ub77c\uc704
-MX=\uba55\uc2dc\ucf54
-MY=\ub9d0\ub808\uc774\uc2dc\uc544
-MZ=\ubaa8\uc7a0\ube44\ud06c
-NA=\ub098\ubbf8\ube44\uc544
-NC=\ub274\uce7c\ub808\ub3c4\ub2c8\uc544
-NE=\ub2c8\uc81c\ub974
-NF=\ub178\ud37d\uc12c
-NG=\ub098\uc774\uc9c0\ub9ac\uc544
-NI=\ub2c8\uce74\ub77c\uacfc
-NL=\ub124\ub35c\ub780\ub4dc
-NO=\ub178\ub974\uc6e8\uc774
-NP=\ub124\ud314
-NR=\ub098\uc6b0\ub8e8
-NU=\ub2c8\uc6b0\uc5d0
-NZ=\ub274\uc9c8\ub79c\ub4dc
-OM=\uc624\ub9cc
-PA=\ud30c\ub098\ub9c8
-PE=\ud398\ub8e8
-PF=\ud504\ub791\uc2a4\ub839 \ud3f4\ub9ac\ub124\uc2dc\uc544
-PG=\ud30c\ud478\uc544\ub274\uae30\ub2c8
-PH=\ud544\ub9ac\ud540
-PK=\ud30c\ud0a4\uc2a4\ud0c4
-PL=\ud3f4\ub780\ub4dc
-PM=\uc0dd\ud53c\uc5d0\ub974 \ubbf8\ud074\ub871
-PN=\ud54f\ucf00\uc5b8 \uc81c\ub3c4
-PR=\ud478\uc5d0\ub974\ud1a0\ub9ac\ucf54
-PS=\ud314\ub808\uc2a4\ud0c0\uc778 \uc9c0\uad6c
-PT=\ud3ec\ub974\ud22c\uac08
-PW=\ud314\ub77c\uc6b0
-PY=\ud30c\ub77c\uacfc\uc774
-QA=\uce74\ud0c0\ub974
-RE=\ub808\uc704\ub2c8\uc639
-RO=\ub8e8\ub9c8\ub2c8\uc544
-RS=\uc138\ub974\ube44\uc544
-RU=\ub7ec\uc2dc\uc544
-RW=\ub974\uc644\ub2e4
-SA=\uc0ac\uc6b0\ub514\uc544\ub77c\ube44\uc544
-SB=\uc194\ub85c\ubaac \uc81c\ub3c4
-SC=\uc138\uc774\uc178
-SD=\uc218\ub2e8
-SE=\uc2a4\uc6e8\ub374
-SG=\uc2f1\uac00\ud3ec\ub974
-SH=\uc138\uc778\ud2b8\ud5ec\ub808\ub098
-SI=\uc2ac\ub85c\ubca0\ub2c8\uc544
-SJ=\uc2a4\ubc1c\ubc14\ub974\uc81c\ub3c4-\uc580\ub9c8\uc6ec\uc12c
-SK=\uc2ac\ub85c\ubc14\ud0a4\uc544
-SL=\uc2dc\uc5d0\ub77c\ub9ac\uc628
-SM=\uc0b0\ub9c8\ub9ac\ub178
-SN=\uc138\ub124\uac08
-SO=\uc18c\ub9d0\ub9ac\uc544
-SR=\uc218\ub9ac\ub0a8
-ST=\uc0c1\ud22c\uba54 \ud504\ub9b0\uc2dc\ud398
-SV=\uc5d8\uc0b4\ubc14\ub3c4\ub974
-SY=\uc2dc\ub9ac\uc544
-SZ=\uc5d0\uc2a4\uc640\ud2f0\ub2c8
-TC=\ud130\ud06c\uc2a4 \ucf00\uc774\ucee4\uc2a4 \uc81c\ub3c4
-TD=\ucc28\ub4dc
-TF=\ud504\ub791\uc2a4 \ub0a8\ubd80 \uc9c0\ubc29
-TG=\ud1a0\uace0
-TH=\ud0dc\uad6d
-TJ=\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4
-TK=\ud1a0\ucf08\ub77c\uc6b0
-TL=\ub3d9\ud2f0\ubaa8\ub974
-TM=\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4
-TN=\ud280\ub2c8\uc9c0
-TO=\ud1b5\uac00
-TR=\ud130\ud0a4
-TT=\ud2b8\ub9ac\ub2c8\ub2e4\ub4dc \ud1a0\ubc14\uace0
-TV=\ud22c\ubc1c\ub8e8
-TW=\ub300\ub9cc
-TZ=\ud0c4\uc790\ub2c8\uc544
-UA=\uc6b0\ud06c\ub77c\uc774\ub098
-UG=\uc6b0\uac04\ub2e4
-UM=\ubbf8\uad6d\ub839 \ud574\uc678 \uc81c\ub3c4
-US=\ubbf8\uad6d
-UY=\uc6b0\ub8e8\uacfc\uc774
-UZ=\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4
-VA=\ubc14\ud2f0\uce78 \uc2dc\uad6d
-VC=\uc138\uc778\ud2b8\ube48\uc13c\ud2b8\uadf8\ub808\ub098\ub518
-VE=\ubca0\ub124\uc218\uc5d8\ub77c
-VG=\uc601\uad6d\ub839 \ubc84\uc9c4\uc544\uc77c\ub79c\ub4dc
-VI=\ubbf8\uad6d\ub839 \ubc84\uc9c4\uc544\uc77c\ub79c\ub4dc
-VN=\ubca0\ud2b8\ub0a8
-VU=\ubc14\ub204\uc544\ud22c
-WF=\uc648\ub9ac\uc2a4-\ud478\ud22c\ub098 \uc81c\ub3c4
-WS=\uc0ac\ubaa8\uc544
-YE=\uc608\uba58
-YT=\ub9c8\uc694\ud2b8
-ZA=\ub0a8\uc544\ud504\ub9ac\uce74
-ZM=\uc7a0\ube44\uc544
-ZW=\uc9d0\ubc14\ube0c\uc6e8
+AD=안도라
+AE=아랍에미리트
+AF=아프가니스탄
+AG=앤티가 바부다
+AI=앵귈라
+AL=알바니아
+AM=아르메니아
+AN=네덜란드령 안틸레스
+AO=앙골라
+AQ=남극 대륙
+AR=아르헨티나
+AS=아메리칸 사모아
+AT=오스트리아
+AU=오스트레일리아
+AW=아루바
+AX=올란드 제도
+AZ=아제르바이잔
+BA=보스니아 헤르체고비나
+BB=바베이도스
+BD=방글라데시
+BE=벨기에
+BF=부르키나파소
+BG=불가리아
+BH=바레인
+BI=부룬디
+BJ=베냉
+BM=버뮤다
+BN=브루나이
+BO=볼리비아
+BR=브라질
+BS=바하마
+BT=부탄
+BV=부베섬
+BW=보츠와나
+BY=벨라루스
+BZ=벨리즈
+CA=캐나다
+CC=코코스 제도
+CD=콩고-킨샤사
+CF=중앙 아프리카 공화국
+CG=콩고-브라자빌
+CH=스위스
+CI=코트디부아르
+CK=쿡 제도
+CL=칠레
+CM=카메룬
+CN=중국
+CO=콜롬비아
+CR=코스타리카
+CS=세르비아 몬테네그로(유고슬라비아)
+CU=쿠바
+CV=카보베르데
+CX=크리스마스섬
+CY=키프로스
+CZ=체코
+DE=독일
+DJ=지부티
+DK=덴마크
+DM=도미니카
+DO=도미니카 공화국
+DZ=알제리
+EC=에콰도르
+EE=에스토니아
+EG=이집트
+EH=서사하라
+ER=에리트리아
+ES=스페인
+ET=에티오피아
+FI=핀란드
+FJ=피지
+FK=포클랜드 제도
+FM=미크로네시아
+FO=페로 제도
+FR=프랑스
+GA=가봉
+GB=영국
+GD=그레나다
+GE=조지아
+GF=프랑스령 기아나
+GH=가나
+GI=지브롤터
+GL=그린란드
+GM=감비아
+GN=기니
+GP=과들루프
+GQ=적도 기니
+GR=그리스
+GS=사우스조지아 사우스샌드위치 제도
+GT=과테말라
+GU=괌
+GW=기니비사우
+GY=가이아나
+HK=홍콩(중국 특별행정구)
+HM=허드 맥도널드 제도
+HN=온두라스
+HR=크로아티아
+HT=아이티
+HU=헝가리
+ID=인도네시아
+IE=아일랜드
+IL=이스라엘
+IN=인도
+IO=영국령 인도양 식민지
+IQ=이라크
+IR=이란
+IS=아이슬란드
+IT=이탈리아
+JM=자메이카
+JO=요르단
+JP=일본
+KE=케냐
+KG=키르기스스탄
+KH=캄보디아
+KI=키리바시
+KM=코모로
+KN=세인트키츠 네비스
+KP=북한
+KR=대한민국
+KW=쿠웨이트
+KY=케이맨 제도
+KZ=카자흐스탄
+LA=라오스
+LB=레바논
+LC=세인트루시아
+LI=리히텐슈타인
+LK=스리랑카
+LR=라이베리아
+LS=레소토
+LT=리투아니아
+LU=룩셈부르크
+LV=라트비아
+LY=리비아
+MA=모로코
+MC=모나코
+MD=몰도바
+ME=몬테네그로
+MG=마다가스카르
+MH=마셜 제도
+MK=북마케도니아
+ML=말리
+MM=미얀마
+MN=몽골
+MO=마카오(중국 특별행정구)
+MP=북마리아나제도
+MQ=마르티니크
+MR=모리타니
+MS=몬트세라트
+MT=몰타
+MU=모리셔스
+MV=몰디브
+MW=말라위
+MX=멕시코
+MY=말레이시아
+MZ=모잠비크
+NA=나미비아
+NC=뉴칼레도니아
+NE=니제르
+NF=노퍽섬
+NG=나이지리아
+NI=니카라과
+NL=네덜란드
+NO=노르웨이
+NP=네팔
+NR=나우루
+NU=니우에
+NZ=뉴질랜드
+OM=오만
+PA=파나마
+PE=페루
+PF=프랑스령 폴리네시아
+PG=파푸아뉴기니
+PH=필리핀
+PK=파키스탄
+PL=폴란드
+PM=생피에르 미클롱
+PN=핏케언 제도
+PR=푸에르토리코
+PS=팔레스타인 지구
+PT=포르투갈
+PW=팔라우
+PY=파라과이
+QA=카타르
+RE=레위니옹
+RO=루마니아
+RS=세르비아
+RU=러시아
+RW=르완다
+SA=사우디아라비아
+SB=솔로몬 제도
+SC=세이셸
+SD=수단
+SE=스웨덴
+SG=싱가포르
+SH=세인트헬레나
+SI=슬로베니아
+SJ=스발바르제도-얀마웬섬
+SK=슬로바키아
+SL=시에라리온
+SM=산마리노
+SN=세네갈
+SO=소말리아
+SR=수리남
+ST=상투메 프린시페
+SV=엘살바도르
+SY=시리아
+SZ=에스와티니
+TC=터크스 케이커스 제도
+TD=차드
+TF=프랑스 남부 지방
+TG=토고
+TH=태국
+TJ=타지키스탄
+TK=토켈라우
+TL=동티모르
+TM=투르크메니스탄
+TN=튀니지
+TO=통가
+TR=터키
+TT=트리니다드 토바고
+TV=투발루
+TW=대만
+TZ=탄자니아
+UA=우크라이나
+UG=우간다
+UM=미국령 해외 제도
+US=미국
+UY=우루과이
+UZ=우즈베키스탄
+VA=바티칸 시국
+VC=세인트빈센트그레나딘
+VE=베네수엘라
+VG=영국령 버진아일랜드
+VI=미국령 버진아일랜드
+VN=베트남
+VU=바누아투
+WF=왈리스-푸투나 제도
+WS=사모아
+YE=예멘
+YT=마요트
+ZA=남아프리카
+ZM=잠비아
+ZW=짐바브웨
 
 # territory names
 # key is UN M.49 country and area code
 
-001=\uc138\uacc4
-002=\uc544\ud504\ub9ac\uce74
-003=\ubd81\uc544\uba54\ub9ac\uce74
-005=\ub0a8\uc544\uba54\ub9ac\uce74
-009=\uc624\uc138\uc544\ub2c8\uc544
-011=\uc11c\ubd80 \uc544\ud504\ub9ac\uce74
-013=\uc911\uc559 \uc544\uba54\ub9ac\uce74
-014=\ub3d9\ubd80 \uc544\ud504\ub9ac\uce74
-015=\ubd81\ubd80 \uc544\ud504\ub9ac\uce74
-017=\uc911\ubd80 \uc544\ud504\ub9ac\uce74
-018=\ub0a8\ubd80 \uc544\ud504\ub9ac\uce74
-019=\uc544\uba54\ub9ac\uce74 \ub300\ub959
-021=\ubd81\ubd80 \uc544\uba54\ub9ac\uce74
-029=\uce74\ub9ac\ube0c \uc81c\ub3c4
-030=\ub3d9\uc544\uc2dc\uc544
-034=\ub0a8\uc544\uc2dc\uc544
-035=\ub3d9\ub0a8\uc544\uc2dc\uc544
-039=\ub0a8\uc720\ub7fd
-053=\uc624\uc2a4\ud2b8\ub784\ub77c\uc2dc\uc544
-054=\uba5c\ub77c\ub124\uc2dc\uc544
-057=\ubbf8\ud06c\ub85c\ub124\uc2dc\uc544 \uc9c0\uc5ed
-061=\ud3f4\ub9ac\ub124\uc2dc\uc544
-142=\uc544\uc2dc\uc544
-143=\uc911\uc559 \uc544\uc2dc\uc544
-145=\uc11c\uc544\uc2dc\uc544
-150=\uc720\ub7fd
-151=\ub3d9\uc720\ub7fd
-154=\ubd81\uc720\ub7fd
-155=\uc11c\uc720\ub7fd
-419=\ub77c\ud2f4 \uc544\uba54\ub9ac\uce74
+001=세계
+002=아프리카
+003=북아메리카
+005=남아메리카
+009=오세아니아
+011=서부 아프리카
+013=중앙 아메리카
+014=동부 아프리카
+015=북부 아프리카
+017=중부 아프리카
+018=남부 아프리카
+019=아메리카 대륙
+021=북부 아메리카
+029=카리브 제도
+030=동아시아
+034=남아시아
+035=동남아시아
+039=남유럽
+053=오스트랄라시아
+054=멜라네시아
+057=미크로네시아 지역
+061=폴리네시아
+142=아시아
+143=중앙 아시아
+145=서아시아
+150=유럽
+151=동유럽
+154=북유럽
+155=서유럽
+419=라틴 아메리카
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lt.properties
index 1a6c815ab00..e24c8831499 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lt.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lt.properties
@@ -38,7 +38,7 @@
 # language names
 # key is ISO 639 language code
 
-lt=lietuvi\u0173
+lt=lietuvių
 
 # country names
 # key is ISO 3166 country code
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lv.properties
index 9283bc230a1..07426bc61a0 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lv.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_lv.properties
@@ -38,7 +38,7 @@
 # language names
 # key is ISO 639 language code
 
-lv=latvie\u0161u
+lv=latviešu
 
 # country names
 # key is ISO 3166 country code
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mk.properties
index e03e6d00495..e80d35dc68b 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mk.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mk.properties
@@ -38,9 +38,9 @@
 # language names
 # key is ISO 639 language code
 
-mk=\u043c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438
+mk=македонски
 
 # country names
 # key is ISO 3166 country code
 
-MK=\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0438\u0458\u0430
+MK=Северна Македонија
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ms.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ms.properties
index 7b78dbb763a..e2e6a96c56a 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ms.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ms.properties
@@ -47,7 +47,7 @@ BA=Bosnia dan Herzegovina
 CA=Kanada
 CC=Kepulauan Cocos (Keeling)
 CF=Republik Afrika Tengah
-CI=Cote d\u2019Ivoire
+CI=Cote d’Ivoire
 DE=Jerman
 DO=Republik Dominica
 EG=Mesir
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mt.properties
index e659fcd97ab..97b4bc59890 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mt.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_mt.properties
@@ -40,78 +40,78 @@
 
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
-ab=Abka\u017cjan
+ab=Abkażjan
 af=Afrikans
 am=Amhariku
-ar=G\u0127arbi
+ar=Għarbi
 av=Avarik
-az=A\u017cerbaj\u0121ani
+az=Ażerbajġani
 be=Belarussu
 bg=Bulgaru
-bh=Bi\u0127ari
+bh=Biħari
 bo=Tibetjan
-bs=Bo\u017cnijaku
+bs=Bożnijaku
 ca=Katalan
 co=Korsiku
-cs=\u010aek
+cs=Ċek
 cu=Slaviku tal-Knisja
-da=Dani\u017c
-de=\u0120ermani\u017c
+da=Daniż
+de=Ġermaniż
 el=Grieg
-en=Ingli\u017c
+en=Ingliż
 es=Spanjol
 et=Estonjan
 eu=Bask
 fa=Persjan
-fi=Finlandi\u017c
-fj=Fi\u0121jan
-fr=Fran\u010bi\u017c
+fi=Finlandiż
+fj=Fiġjan
+fr=Franċiż
 fy=Frisian tal-Punent
-ga=Irlandi\u017c
-gd=Galliku Sko\u010b\u010bi\u017c
-gl=Gali\u010bjan
+ga=Irlandiż
+gd=Galliku Skoċċiż
+gl=Galiċjan
 he=Ebrajk
 hr=Kroat
-hu=Ungeri\u017c
+hu=Ungeriż
 hy=Armen
-id=Indone\u017cjan
+id=Indoneżjan
 ik=Inupjak
-in=Indone\u017cjan
-is=I\u017clandi\u017c
+in=Indoneżjan
+is=Iżlandiż
 it=Taljan
 iw=Ebrajk
-ja=\u0120appuni\u017c
-jv=\u0120avani\u017c
-ka=\u0120or\u0121jan
+ja=Ġappuniż
+jv=Ġavaniż
+ka=Ġorġjan
 ki=Kikuju
-kk=Ka\u017cak
+kk=Każak
 kl=Kalallisut
 ku=Kurd
 kw=Korniku
-ky=Kirgi\u017c
-lb=Lussemburgi\u017c
+ky=Kirgiż
+lb=Lussemburgiż
 ln=Lingaljan
 lt=Litwan
 lv=Latvjan
-mh=Marshalljani\u017c
-mk=Ma\u010bedonjan
+mh=Marshalljaniż
+mk=Maċedonjan
 mn=Mongoljan
 mo=Moldavjan
 mt=Malti
-my=Burmi\u017c
+my=Burmiż
 na=Naurujan
-nb=Bokmal Norve\u0121i\u017c
+nb=Bokmal Norveġiż
 nd=Ndebeli tat-Tramuntana
-ne=Nepali\u017c
-nl=Olandi\u017c
-nn=Ninorsk Norve\u0121i\u017c
-no=Norve\u0121i\u017c
+ne=Nepaliż
+nl=Olandiż
+nn=Ninorsk Norveġiż
+no=Norveġiż
 nr=Ndebele tan-Nofsinhar
-oc=O\u010b\u010bitan
-oj=O\u0121ibwa
+oc=Oċċitan
+oj=Oġibwa
 os=Ossettiku
 pl=Pollakk
-pt=Portugi\u017c
+pt=Portugiż
 rm=Romanz
 ro=Rumen
 ru=Russu
@@ -120,111 +120,111 @@ sc=Sardinjan
 se=Sami tat-Tramuntana
 sk=Slovakk
 sl=Sloven
-sq=Albani\u017c
+sq=Albaniż
 sr=Serb
 st=Soto tan-Nofsinhar
-su=Sundani\u017c
-sv=\u017bvedi\u017c
-tg=Ta\u0121ik
-th=Tajlandi\u017c
+su=Sundaniż
+sv=Żvediż
+tg=Taġik
+th=Tajlandiż
 tk=Turkmeni
 tr=Tork
-ty=Ta\u0127itjan
+ty=Taħitjan
 uk=Ukren
-vi=Vjetnami\u017c
+vi=Vjetnamiż
 vo=Volapuk
-zh=\u010aini\u017c
-AE=l-Emirati G\u0127arab Mag\u0127quda
+zh=Ċiniż
+AE=l-Emirati Għarab Magħquda
 AF=l-Afganistan
 AL=l-Albanija
 AM=l-Armenja
-AN=Antilles Olandi\u017ci
+AN=Antilles Olandiżi
 AQ=l-Antartika
-AR=l-Ar\u0121entina
+AR=l-Arġentina
 AS=is-Samoa Amerikana
 AT=l-Awstrija
 AU=l-Awstralja
-AZ=l-A\u017cerbaj\u0121an
-BA=il-Bo\u017cnija-\u0126erzegovina
+AZ=l-Ażerbajġan
+BA=il-Bożnija-Ħerzegovina
 BD=il-Bangladesh
-BE=il-Bel\u0121ju
+BE=il-Belġju
 BG=il-Bulgarija
 BH=il-Bahrain
 BN=il-Brunei
 BO=il-Bolivja
-BR=Il-Bra\u017cil
+BR=Il-Brażil
 BS=il-Bahamas
 BT=il-Bhutan
 BY=il-Belarussja
 BZ=il-Belize
 CA=il-Kanada
-CC=G\u017cejjer Cocos (Keeling)
+CC=Gżejjer Cocos (Keeling)
 CD=ir-Repubblika Demokratika tal-Kongo
-CF=ir-Repubblika \u010aentru-Afrikana
+CF=ir-Repubblika Ċentru-Afrikana
 CG=il-Kongo - Brazzaville
-CH=l-I\u017cvizzera
+CH=l-Iżvizzera
 CI=il-Kosta tal-Avorju
-CL=i\u010b-\u010aili
+CL=iċ-Ċili
 CM=il-Kamerun
-CN=i\u010b-\u010aina
+CN=iċ-Ċina
 CO=il-Kolombja
 CR=il-Costa Rica
 CS=Serbja u Montenegro
 CU=Kuba
-CY=\u010aipru
-CZ=ir-Repubblika \u010aeka
-DE=il-\u0120ermanja
+CY=Ċipru
+CZ=ir-Repubblika Ċeka
+DE=il-Ġermanja
 DJ=il-Djibouti
 DK=id-Danimarka
 DO=ir-Repubblika Dominicana
-DZ=l-Al\u0121erija
+DZ=l-Alġerija
 EC=l-Ekwador
 EE=l-Estonja
-EG=l-E\u0121ittu
-EH=is-Sa\u0127ara tal-Punent
+EG=l-Eġittu
+EH=is-Saħara tal-Punent
 ER=l-Eritrea
 ES=Spanja
 ET=l-Etjopja
 FI=il-Finlandja
-FJ=Fi\u0121i
-FM=il-Mikrone\u017cja
-FO=il-G\u017cejjer Faeroe
+FJ=Fiġi
+FM=il-Mikroneżja
+FO=il-Gżejjer Faeroe
 FR=Franza
 GB=ir-Renju Unit
 GE=il-Georgia
-GF=il-Guyana Fran\u010bi\u017ca
+GF=il-Guyana Franċiża
 GH=il-Ghana
 GM=il-Gambja
 GN=il-Guinea
 GQ=il-Guinea Ekwatorjali
-GR=il-Gre\u010bja
-GS=il-Georgia tan-Nofsinhar u l-G\u017cejjer Sandwich tan-Nofsinhar
+GR=il-Greċja
+GS=il-Georgia tan-Nofsinhar u l-Gżejjer Sandwich tan-Nofsinhar
 GT=il-Gwatemala
 GW=il-Guinea-Bissau
 GY=il-Guyana
-HK=ir-Re\u0121jun Amministrattiv Spe\u010bjali ta\u2019 Hong Kong tar-Repubblika tal-Poplu ta\u010b-\u010aina
-HM=il-G\u017cejjer Heard u l-G\u017cejjer McDonald
+HK=ir-Reġjun Amministrattiv Speċjali ta’ Hong Kong tar-Repubblika tal-Poplu taċ-Ċina
+HM=il-Gżejjer Heard u l-Gżejjer McDonald
 HN=il-Honduras
 HR=il-Kroazja
 HT=il-Haiti
 HU=l-Ungerija
-ID=l-Indone\u017cja
+ID=l-Indoneżja
 IE=l-Irlanda
-IL=I\u017crael
+IL=Iżrael
 IN=l-Indja
-IS=l-I\u017clanda
+IS=l-Iżlanda
 IT=l-Italja
-JM=il-\u0120amajka
-JO=il-\u0120ordan
-JP=il-\u0120appun
+JM=il-Ġamajka
+JO=il-Ġordan
+JP=il-Ġappun
 KE=il-Kenja
-KG=il-Kirgi\u017cistan
+KG=il-Kirgiżistan
 KH=il-Kambodja
 KN=Saint Kitts u Nevis
-KP=il-Korea ta\u2019 Fuq
-KR=il-Korea t\u2019Isfel
+KP=il-Korea ta’ Fuq
+KR=il-Korea t’Isfel
 KW=il-Kuwajt
-KZ=il-Ka\u017cakistan
+KZ=il-Każakistan
 LB=il-Libanu
 LC=Saint Lucia
 LR=il-Liberja
@@ -235,23 +235,23 @@ LV=il-Latvja
 LY=il-Libja
 MA=il-Marokk
 MD=il-Moldova
-MH=G\u017cejjer Marshall
-MK=il-Ma\u010bedonja ta\u2019 Fuq
+MH=Gżejjer Marshall
+MK=il-Maċedonja ta’ Fuq
 MM=il-Myanmar/Burma
 MN=il-Mongolja
-MO=ir-Re\u0121jun Amministrattiv Spe\u010bjali tal-Macao tar-Repubblika tal-Poplu ta\u010b-\u010aina
-MP=\u0120\u017cejjer Mariana tat-Tramuntana
+MO=ir-Reġjun Amministrattiv Speċjali tal-Macao tar-Repubblika tal-Poplu taċ-Ċina
+MP=Ġżejjer Mariana tat-Tramuntana
 MR=il-Mauritania
 MX=il-Messiku
 MY=il-Malasja
 MZ=il-Mozambique
 NA=in-Namibja
-NE=in-Ni\u0121er
-NG=in-Ni\u0121erja
+NE=in-Niġer
+NG=in-Niġerja
 NI=in-Nikaragwa
 NL=in-Netherlands
-NO=in-Norve\u0121ja
-PF=Poline\u017cja Fran\u010bi\u017ca
+NO=in-Norveġja
+PF=Polineżja Franċiża
 PH=il-Filippini
 PL=il-Polonja
 PM=Saint Pierre u Miquelon
@@ -261,23 +261,23 @@ PY=il-Paragwaj
 RO=ir-Rumanija
 RU=ir-Russja
 SA=l-Arabja Sawdija
-SE=l-I\u017cvezja
+SE=l-Iżvezja
 SI=is-Slovenja
 SJ=Svalbard u Jan Mayen
 SK=is-Slovakkja
 SO=is-Somalja
 SR=is-Suriname
-ST=S\u00e3o Tom\u00e9 u Pr\u00edncipe
+ST=São Tomé u Príncipe
 SY=is-Sirja
 SZ=l-Eswatini
-TC=il-G\u017cejjer Turks u Caicos
-TD=i\u010b-Chad
-TF=It-Territorji Fran\u010bi\u017ci tan-Nofsinhar
+TC=il-Gżejjer Turks u Caicos
+TD=iċ-Chad
+TF=It-Territorji Franċiżi tan-Nofsinhar
 TH=it-Tajlandja
-TJ=it-Ta\u0121ikistan
+TJ=it-Taġikistan
 TK=it-Tokelau
 TL=Timor Leste
-TN=it-Tune\u017cija
+TN=it-Tuneżija
 TR=it-Turkija
 TT=Trinidad u Tobago
 TW=it-Tajwan
@@ -285,13 +285,13 @@ TZ=it-Tanzanija
 UA=l-Ukrajna
 US=l-Istati Uniti
 UY=l-Urugwaj
-UZ=l-U\u017cbekistan
+UZ=l-Użbekistan
 VA=l-Istat tal-Belt tal-Vatikan
 VC=Saint Vincent u l-Grenadini
 VE=il-Venezwela
 VN=il-Vjetnam
 WF=Wallis u Futuna
 YE=il-Jemen
-ZA=l-Afrika t\u2019Isfel
-ZM=i\u017c-\u017bambja
-ZW=i\u017c-\u017bimbabwe
+ZA=l-Afrika t’Isfel
+ZM=iż-Żambja
+ZW=iż-Żimbabwe
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_nl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_nl.properties
index 0e13449cdf1..0ed815b8913 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_nl.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_nl.properties
@@ -68,16 +68,16 @@ eu=Baskisch
 fa=Perzisch
 fi=Fins
 fj=Fijisch
-fo=Faer\u00f6ers
+fo=Faeröers
 fr=Frans
 fy=Fries
 ga=Iers
 gd=Schots-Gaelisch
 gl=Galicisch
-gn=Guaran\u00ed
+gn=Guaraní
 he=Hebreeuws
 hr=Kroatisch
-ht=Ha\u00eftiaans Creools
+ht=Haïtiaans Creools
 hu=Hongaars
 hy=Armeens
 id=Indonesisch
@@ -110,7 +110,7 @@ ms=Maleis
 mt=Maltees
 my=Birmaans
 na=Nauruaans
-nb=Noors - Bokm\u00e5l
+nb=Noors - Bokmål
 nd=Noord-Ndebele
 ne=Nepalees
 nl=Nederlands
@@ -148,7 +148,7 @@ tr=Turks
 tt=Tataars
 ty=Tahitiaans
 ug=Oeigoers
-uk=Oekra\u00efens
+uk=Oekraïens
 uz=Oezbeeks
 vi=Vietnamees
 wa=Waals
@@ -161,21 +161,21 @@ zu=Zoeloe
 
 AE=Verenigde Arabische Emiraten
 AG=Antigua en Barbuda
-AL=Albani\u00eb
-AM=Armeni\u00eb
+AL=Albanië
+AM=Armenië
 AN=Nederlandse Antillen
-AR=Argentini\u00eb
+AR=Argentinië
 AS=Amerikaans-Samoa
 AT=Oostenrijk
-AU=Australi\u00eb
-AX=\u00c5land
+AU=Australië
+AX=Åland
 AZ=Azerbeidzjan
-BA=Bosni\u00eb en Herzegovina
-BE=Belgi\u00eb
+BA=Bosnië en Herzegovina
+BE=België
 BG=Bulgarije
 BH=Bahrein
-BR=Brazili\u00eb
-BS=Bahama\u2019s
+BR=Brazilië
+BS=Bahama’s
 BV=Bouveteiland
 CC=Cocoseilanden
 CD=Congo-Kinshasa
@@ -186,10 +186,10 @@ CI=Ivoorkust
 CK=Cookeilanden
 CL=Chili
 CM=Kameroen
-CS=Servi\u00eb en Montenegro
-CV=Kaapverdi\u00eb
+CS=Servië en Montenegro
+CV=Kaapverdië
 CX=Christmaseiland
-CZ=Tsjechi\u00eb
+CZ=Tsjechië
 DE=Duitsland
 DK=Denemarken
 DO=Dominicaanse Republiek
@@ -198,12 +198,12 @@ EE=Estland
 EG=Egypte
 EH=Westelijke Sahara
 ES=Spanje
-ET=Ethiopi\u00eb
+ET=Ethiopië
 FK=Falklandeilanden
-FO=Faer\u00f6er
+FO=Faeröer
 FR=Frankrijk
 GB=Verenigd Koninkrijk
-GE=Georgi\u00eb
+GE=Georgië
 GF=Frans-Guyana
 GL=Groenland
 GN=Guinee
@@ -213,19 +213,19 @@ GS=Zuid-Georgia en Zuidelijke Sandwicheilanden
 GW=Guinee-Bissau
 HK=Hongkong SAR van China
 HM=Heard en McDonaldeilanden
-HR=Kroati\u00eb
-HT=Ha\u00efti
+HR=Kroatië
+HT=Haïti
 HU=Hongarije
-ID=Indonesi\u00eb
+ID=Indonesië
 IE=Ierland
-IL=Isra\u00ebl
+IL=Israël
 IO=Brits Indische Oceaanterritorium
 IQ=Irak
 IS=IJsland
-IT=Itali\u00eb
-JO=Jordani\u00eb
+IT=Italië
+JO=Jordanië
 KE=Kenia
-KG=Kirgizi\u00eb
+KG=Kirgizië
 KH=Cambodja
 KM=Comoren
 KN=Saint Kitts en Nevis
@@ -239,56 +239,56 @@ LC=Saint Lucia
 LT=Litouwen
 LU=Luxemburg
 LV=Letland
-LY=Libi\u00eb
+LY=Libië
 MA=Marokko
-MD=Moldavi\u00eb
+MD=Moldavië
 MG=Madagaskar
 MH=Marshalleilanden
-MK=Noord-Macedoni\u00eb
+MK=Noord-Macedonië
 MM=Myanmar (Birma)
-MN=Mongoli\u00eb
+MN=Mongolië
 MO=Macau SAR van China
 MP=Noordelijke Marianen
-MR=Mauritani\u00eb
+MR=Mauritanië
 MV=Maldiven
-MY=Maleisi\u00eb
-NA=Namibi\u00eb
-NC=Nieuw-Caledoni\u00eb
+MY=Maleisië
+NA=Namibië
+NC=Nieuw-Caledonië
 NF=Norfolk
 NL=Nederland
 NO=Noorwegen
 NZ=Nieuw-Zeeland
-PF=Frans-Polynesi\u00eb
+PF=Frans-Polynesië
 PG=Papoea-Nieuw-Guinea
 PH=Filipijnen
 PL=Polen
 PM=Saint-Pierre en Miquelon
 PN=Pitcairneilanden
 PS=Palestijnse gebieden
-RO=Roemeni\u00eb
-RS=Servi\u00eb
+RO=Roemenië
+RS=Servië
 RU=Rusland
-SA=Saoedi-Arabi\u00eb
+SA=Saoedi-Arabië
 SB=Salomonseilanden
 SC=Seychellen
 SD=Soedan
 SE=Zweden
 SH=Sint-Helena
-SI=Sloveni\u00eb
+SI=Slovenië
 SJ=Spitsbergen en Jan Mayen
 SK=Slowakije
-SO=Somali\u00eb
-ST=Sao Tom\u00e9 en Principe
-SY=Syri\u00eb
+SO=Somalië
+ST=Sao Tomé en Principe
+SY=Syrië
 TC=Turks- en Caicoseilanden
 TD=Tsjaad
 TF=Franse Gebieden in de zuidelijke Indische Oceaan
 TJ=Tadzjikistan
 TL=Oost-Timor
-TN=Tunesi\u00eb
+TN=Tunesië
 TR=Turkije
 TT=Trinidad en Tobago
-UA=Oekra\u00efne
+UA=Oekraïne
 UG=Oeganda
 UM=Kleine afgelegen eilanden van de Verenigde Staten
 US=Verenigde Staten
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no.properties
index 9e415f81608..b4365f5ef27 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no.properties
@@ -38,7 +38,7 @@
 # language names
 # key is ISO 639 language code
 
-nb=norsk bokm\u00e5l
+nb=norsk bokmål
 nn=norsk nynorsk
 no=norsk
 
@@ -52,5 +52,5 @@ NO=Norge
 # key is %%variant
 # rarely localized
 
-%%B=bokm\u00e5l
+%%B=bokmål
 %%NY=nynorsk
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no_NO_NY.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no_NO_NY.properties
index 1ae8098296f..1a706e9cdc5 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no_NO_NY.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_no_NO_NY.properties
@@ -38,7 +38,7 @@
 # language names
 # key is ISO 639 language code
 
-nb=norsk bokm\u00e5l
+nb=norsk bokmål
 nn=norsk nynorsk
 no=norsk
 
@@ -52,5 +52,5 @@ NO=Noreg
 # key is %%variant
 # rarely localized
 
-%%B=bokm\u00e5l
+%%B=bokmål
 %%NY=nynorsk
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pl.properties
index 0b9a3037eb7..d7ff0669b80 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pl.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pl.properties
@@ -41,51 +41,51 @@
 ab=abchaski
 aa=afar
 af=afrikaans
-sq=alba\u0144ski
+sq=albański
 am=amharski
 ar=arabski
-hy=ormia\u0144ski
+hy=ormiański
 as=asamski
 ay=ajmara
-az=azerbejd\u017ca\u0144ski
+az=azerbejdżański
 ba=baszkirski
 eu=baskijski
 bn=bengalski
 dz=dzongkha
 bh=biharski
 bi=bislama
-br=breto\u0144ski
-bg=bu\u0142garski
-my=birma\u0144ski
-be=bia\u0142oruski
+br=bretoński
+bg=bułgarski
+my=birmański
+be=białoruski
 km=khmerski
-ca=katalo\u0144ski
-zh=chi\u0144ski
-co=korsyka\u0144ski
+ca=kataloński
+zh=chiński
+co=korsykański
 hr=chorwacki
 cs=czeski
-da=du\u0144ski
+da=duński
 nl=niderlandzki
 en=angielski
 eo=esperanto
-et=esto\u0144ski
+et=estoński
 fo=farerski
-fj=fid\u017cijski
-fi=fi\u0144ski
+fj=fidżijski
+fi=fiński
 fr=francuski
 fy=zachodniofryzyjski
 gl=galicyjski
-ka=gruzi\u0144ski
+ka=gruziński
 de=niemiecki
 el=grecki
 kl=grenlandzki
 gn=guarani
-gu=gud\u017carati
+gu=gudżarati
 ha=hausa
 he=hebrajski
 iw=hebrajski
 hi=hindi
-hu=w\u0119gierski
+hu=węgierski
 is=islandzki
 id=indonezyjski
 in=indonezyjski
@@ -94,8 +94,8 @@ ie=interlingue
 iu=inuktitut
 ik=inupiak
 ga=irlandzki
-it=w\u0142oski
-ja=japo\u0144ski
+it=włoski
+ja=japoński
 jw=jawajski
 kn=kannada
 ks=kaszmirski
@@ -103,70 +103,70 @@ kk=kazachski
 rw=kinya-ruanda
 ky=kirgiski
 rn=rundi
-ko=korea\u0144ski
+ko=koreański
 ku=kurdyjski
-lo=laota\u0144ski
-la=\u0142aci\u0144ski
-lv=\u0142otewski
+lo=laotański
+la=łaciński
+lv=łotewski
 ln=lingala
 lt=litewski
-mk=macedo\u0144ski
+mk=macedoński
 mg=malgaski
 ms=malajski
 ml=malajalam
-mt=malta\u0144ski
+mt=maltański
 mi=maoryjski
 mr=marathi
-mo=mo\u0142dawski
+mo=mołdawski
 mn=mongolski
-na=naurua\u0144ski
+na=nauruański
 ne=nepalski
 no=norweski
-oc=oksyta\u0144ski
+oc=oksytański
 or=orija
 om=oromo
 ps=paszto
 fa=perski
 pl=polski
 pt=portugalski
-pa=pend\u017cabski
+pa=pendżabski
 qu=keczua
-rm=retoroma\u0144ski
-ro=rumu\u0144ski
+rm=retoromański
+ro=rumuński
 ru=rosyjski
-sm=samoa\u0144ski
+sm=samoański
 sg=sango
 sa=sanskryt
 gd=szkocki gaelicki
 sr=serbski
-st=sotho po\u0142udniowy
+st=sotho południowy
 tn=setswana
 sn=shona
 sd=sindhi
 si=syngaleski
 ss=suazi
-sk=s\u0142owacki
-sl=s\u0142owe\u0144ski
+sk=słowacki
+sl=słoweński
 so=somalijski
-es=hiszpa\u0144ski
+es=hiszpański
 su=sundajski
 sw=suahili
 sv=szwedzki
 tl=tagalski
-tg=tad\u017cycki
+tg=tadżycki
 ta=tamilski
 tt=tatarski
 te=telugu
 th=tajski
-bo=tybeta\u0144ski
+bo=tybetański
 ti=tigrinia
 to=tonga
 ts=tsonga
 tr=turecki
-tk=turkme\u0144ski
+tk=turkmeński
 tw=twi
 ug=ujgurski
-uk=ukrai\u0144ski
+uk=ukraiński
 ur=urdu
 uz=uzbecki
 vi=wietnamski
@@ -187,22 +187,22 @@ AF=Afganistan
 DZ=Algieria
 AD=Andora
 AR=Argentyna
-AZ=Azerbejd\u017can
+AZ=Azerbejdżan
 BS=Bahamy
 BH=Bahrajn
 BD=Bangladesz
-BY=Bia\u0142oru\u015b
+BY=Białoruś
 BE=Belgia
 BM=Bermudy
 BO=Boliwia
-BA=Bo\u015bnia i Hercegowina
+BA=Bośnia i Hercegowina
 BR=Brazylia
-BG=Bu\u0142garia
-KH=Kambod\u017ca
+BG=Bułgaria
+KH=Kambodża
 CM=Kamerun
 CA=Kanada
-CV=Republika Zielonego Przyl\u0105dka
-CF=Republika \u015arodkowoafryka\u0144ska
+CV=Republika Zielonego Przylądka
+CF=Republika Środkowoafrykańska
 TD=Czad
 CN=Chiny
 CO=Kolumbia
@@ -214,22 +214,22 @@ CU=Kuba
 CY=Cypr
 CZ=Czechy
 DK=Dania
-DJ=D\u017cibuti
+DJ=Dżibuti
 DM=Dominika
 DO=Dominikana
 TP=Wschodni Timor
 EC=Ekwador
 EG=Egipt
 SV=Salwador
-GQ=Gwinea R\u00f3wnikowa
+GQ=Gwinea Równikowa
 ER=Erytrea
 ET=Etiopia
-FJ=Fid\u017ci
+FJ=Fidżi
 FI=Finlandia
 FR=Francja
 GF=Gujana Francuska
 PF=Polinezja Francuska
-TF=Francuskie Terytoria Po\u0142udniowe i Antarktyczne
+TF=Francuskie Terytoria Południowe i Antarktyczne
 GE=Gruzja
 DE=Niemcy
 GR=Grecja
@@ -239,29 +239,29 @@ GN=Gwinea
 GW=Gwinea Bissau
 GY=Gujana
 HK=SRA Hongkong (Chiny)
-HU=W\u0119gry
+HU=Węgry
 IS=Islandia
 IN=Indie
 ID=Indonezja
 IQ=Irak
 IE=Irlandia
 IL=Izrael
-IT=W\u0142ochy
+IT=Włochy
 JM=Jamajka
 JP=Japonia
 JO=Jordania
 KZ=Kazachstan
 KE=Kenia
-KP=Korea P\u00f3\u0142nocna
-KR=Korea Po\u0142udniowa
+KP=Korea Północna
+KR=Korea Południowa
 KW=Kuwejt
 KG=Kirgistan
-LV=\u0141otwa
+LV=Łotwa
 LB=Liban
 LY=Libia
 LT=Litwa
 LU=Luksemburg
-MK=Macedonia P\u00f3\u0142nocna
+MK=Macedonia Północna
 MG=Madagaskar
 MY=Malezja
 MQ=Martynika
@@ -269,7 +269,7 @@ MR=Mauretania
 YT=Majotta
 MX=Meksyk
 FM=Mikronezja
-MD=Mo\u0142dawia
+MD=Mołdawia
 MC=Monako
 MA=Maroko
 MZ=Mozambik
@@ -293,15 +293,15 @@ SA=Arabia Saudyjska
 SP=Serbia
 SC=Seszele
 SG=Singapur
-SK=S\u0142owacja
-SI=S\u0142owenia
-ZA=Republika Po\u0142udniowej Afryki
+SK=Słowacja
+SI=Słowenia
+ZA=Republika Południowej Afryki
 ES=Hiszpania
 SR=Surinam
 SE=Szwecja
 CH=Szwajcaria
 TW=Tajwan
-TJ=Tad\u017cykistan
+TJ=Tadżykistan
 TH=Tajlandia
 TT=Trynidad i Tobago
 TN=Tunezja
@@ -315,7 +315,7 @@ VA=Watykan
 VE=Wenezuela
 VN=Wietnam
 VG=Brytyjskie Wyspy Dziewicze
-VI=Wyspy Dziewicze Stan\u00f3w Zjednoczonych
+VI=Wyspy Dziewicze Stanów Zjednoczonych
 EH=Sahara Zachodnia
 YE=Jemen
 ZR=Zair
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt.properties
index 94bf3d9727d..db303c49bbc 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt.properties
@@ -41,170 +41,170 @@
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
 aa=afar
-ab=abc\u00e1zio
-ae=av\u00e9stico
-af=afric\u00e2ner
-am=am\u00e1rico
-an=aragon\u00eas
-ar=\u00e1rabe
-as=assam\u00eas
-av=av\u00e1rico
-ay=aimar\u00e1
+ab=abcázio
+ae=avéstico
+af=africâner
+am=amárico
+an=aragonês
+ar=árabe
+as=assamês
+av=avárico
+ay=aimará
 az=azerbaijano
 ba=bashkir
 be=bielorrusso
-bg=b\u00falgaro
+bg=búlgaro
 bh=biari
-bi=bislam\u00e1
+bi=bislamá
 bm=bambara
 bn=bengali
 bo=tibetano
-br=bret\u00e3o
-bs=b\u00f3snio
-ca=catal\u00e3o
+br=bretão
+bs=bósnio
+ca=catalão
 ce=checheno
 ch=chamorro
 co=corso
 cr=cree
 cs=tcheco
-cu=eslavo eclesi\u00e1stico
+cu=eslavo eclesiástico
 cv=tchuvache
-cy=gal\u00eas
-da=dinamarqu\u00eas
-de=alem\u00e3o
+cy=galês
+da=dinamarquês
+de=alemão
 dv=divehi
 dz=dzonga
 ee=ewe
 el=grego
-en=ingl\u00eas
+en=inglês
 eo=esperanto
 es=espanhol
 et=estoniano
 eu=basco
 fa=persa
 ff=fula
-fi=finland\u00eas
+fi=finlandês
 fj=fijiano
-fo=fero\u00eas
-fr=franc\u00eas
-fy=fr\u00edsio ocidental
-ga=irland\u00eas
-gd=ga\u00e9lico escoc\u00eas
+fo=feroês
+fr=francês
+fy=frísio ocidental
+ga=irlandês
+gd=gaélico escocês
 gl=galego
 gn=guarani
 gu=guzerate
 gv=manx
-ha=hau\u00e7\u00e1
+ha=hauçá
 he=hebraico
-hi=h\u00edndi
+hi=híndi
 ho=hiri motu
 hr=croata
 ht=haitiano
-hu=h\u00fangaro
-hy=arm\u00eanio
+hu=húngaro
+hy=armênio
 hz=herero
-ia=interl\u00edngua
-id=indon\u00e9sio
+ia=interlíngua
+id=indonésio
 ie=interlingue
 ig=igbo
 ii=sichuan yi
-in=indon\u00e9sio
+in=indonésio
 io=ido
-is=island\u00eas
+is=islandês
 it=italiano
 iu=inuktitut
 iw=hebraico
-ja=japon\u00eas
-ji=i\u00eddiche
+ja=japonês
+ji=iídiche
 ka=georgiano
-kg=congol\u00eas
+kg=congolês
 ki=quicuio
 kj=cuanhama
 kk=cazaque
-kl=groenland\u00eas
+kl=groenlandês
 km=khmer
 kn=canarim
 ko=coreano
-kr=can\u00fari
+kr=canúri
 ks=caxemira
 ku=curdo
 kv=komi
-kw=c\u00f3rnico
+kw=córnico
 ky=quirguiz
 la=latim
-lb=luxemburgu\u00eas
+lb=luxemburguês
 lg=luganda
-li=limburgu\u00eas
+li=limburguês
 ln=lingala
 lo=laosiano
 lt=lituano
 lu=luba-catanga
-lv=let\u00e3o
+lv=letão
 mg=malgaxe
-mh=marshal\u00eas
+mh=marshalês
 mi=maori
-mk=maced\u00f4nio
+mk=macedônio
 ml=malaiala
 mn=mongol
-mo=mold\u00e1vio
+mo=moldávio
 mr=marati
 ms=malaio
-mt=malt\u00eas
-my=birman\u00eas
+mt=maltês
+my=birmanês
 na=nauruano
-nb=bokm\u00e5l noruegu\u00eas
+nb=bokmål norueguês
 nd=ndebele do norte
-ne=nepal\u00eas
+ne=nepalês
 ng=dongo
-nl=holand\u00eas
-nn=nynorsk noruegu\u00eas
-no=noruegu\u00eas
+nl=holandês
+nn=nynorsk norueguês
+no=norueguês
 nr=ndebele do sul
 nv=navajo
 ny=nianja
-oc=occit\u00e2nico
+oc=occitânico
 oj=ojibwa
 om=oromo
-or=ori\u00e1
+or=oriá
 os=osseto
 pa=panjabi
-pi=p\u00e1li
-pl=polon\u00eas
+pi=páli
+pl=polonês
 ps=pashto
-pt=portugu\u00eas
-qu=qu\u00edchua
+pt=português
+qu=quíchua
 rm=romanche
 rn=rundi
 ro=romeno
 ru=russo
 rw=quiniaruanda
-sa=s\u00e2nscrito
+sa=sânscrito
 sc=sardo
 sd=sindi
 se=sami setentrional
 sg=sango
-si=cingal\u00eas
+si=cingalês
 sk=eslovaco
 sl=esloveno
 so=somali
-sq=alban\u00eas
-sr=s\u00e9rvio
-ss=su\u00e1zi
+sq=albanês
+sr=sérvio
+ss=suázi
 st=soto do sul
-su=sundan\u00eas
+su=sundanês
 sv=sueco
-sw=sua\u00edli
-ta=t\u00e2mil
-te=t\u00e9lugo
+sw=suaíli
+ta=tâmil
+te=télugo
 tg=tadjique
-th=tailand\u00eas
-ti=tigr\u00ednia
+th=tailandês
+ti=tigrínia
 tk=turcomeno
 tn=tswana
-to=tongan\u00eas
+to=tonganês
 tr=turco
 ts=tsonga
-tt=t\u00e1rtaro
+tt=tártaro
 tw=twi
 ty=taitiano
 ug=uigur
@@ -214,190 +214,190 @@ uz=uzbeque
 ve=venda
 vi=vietnamita
 vo=volapuque
-wa=val\u00e3o
+wa=valão
 wo=uolofe
 xh=xhosa
-yi=i\u00eddiche
-yo=iorub\u00e1
+yi=iídiche
+yo=iorubá
 za=zhuang
-zh=chin\u00eas
+zh=chinês
 zu=zulu
-AE=Emirados \u00c1rabes Unidos
-AF=Afeganist\u00e3o
-AG=Ant\u00edgua e Barbuda
-AL=Alb\u00e2nia
-AM=Arm\u00eania
+AE=Emirados Árabes Unidos
+AF=Afeganistão
+AG=Antígua e Barbuda
+AL=Albânia
+AM=Armênia
 AN=Antilhas Holandesas
-AQ=Ant\u00e1rtida
+AQ=Antártida
 AS=Samoa Americana
-AT=\u00c1ustria
-AU=Austr\u00e1lia
-AZ=Azerbaij\u00e3o
-BA=B\u00f3snia e Herzegovina
-BE=B\u00e9lgica
+AT=Áustria
+AU=Austrália
+AZ=Azerbaijão
+BA=Bósnia e Herzegovina
+BE=Bélgica
 BF=Burquina Faso
-BG=Bulg\u00e1ria
+BG=Bulgária
 BH=Barein
 BM=Bermudas
-BO=Bol\u00edvia
+BO=Bolívia
 BR=Brasil
-BT=But\u00e3o
+BT=Butão
 BV=Ilha Bouvet
 BW=Botsuana
-CA=Canad\u00e1
+CA=Canadá
 CC=Ilhas Cocos (Keeling)
-CF=Rep\u00fablica Centro-Africana
-CH=Su\u00ed\u00e7a
+CF=República Centro-Africana
+CH=Suíça
 CI=Costa do Marfim
 CK=Ilhas Cook
-CM=Camar\u00f5es
-CO=Col\u00f4mbia
-CS=S\u00e9rvia e Montenegro
+CM=Camarões
+CO=Colômbia
+CS=Sérvia e Montenegro
 CV=Cabo Verde
 CX=Ilha Christmas
 CY=Chipre
-CZ=Tch\u00e9quia
+CZ=Tchéquia
 DE=Alemanha
 DJ=Djibuti
 DK=Dinamarca
-DO=Rep\u00fablica Dominicana
-DZ=Arg\u00e9lia
+DO=República Dominicana
+DZ=Argélia
 EC=Equador
-EE=Est\u00f4nia
+EE=Estônia
 EG=Egito
 EH=Saara Ocidental
 ER=Eritreia
 ES=Espanha
-ET=Eti\u00f3pia
-FI=Finl\u00e2ndia
+ET=Etiópia
+FI=Finlândia
 FK=Ilhas Malvinas
-FM=Micron\u00e9sia
-FO=Ilhas Faro\u00e9
-FR=Fran\u00e7a
-GA=Gab\u00e3o
+FM=Micronésia
+FO=Ilhas Faroé
+FR=França
+GA=Gabão
 GB=Reino Unido
 GD=Granada
-GE=Ge\u00f3rgia
+GE=Geórgia
 GF=Guiana Francesa
 GH=Gana
-GL=Groenl\u00e2ndia
-GM=G\u00e2mbia
-GN=Guin\u00e9
+GL=Groenlândia
+GM=Gâmbia
+GN=Guiné
 GP=Guadalupe
-GQ=Guin\u00e9 Equatorial
-GR=Gr\u00e9cia
-GS=Ilhas Ge\u00f3rgia do Sul e Sandwich do Sul
-GW=Guin\u00e9-Bissau
+GQ=Guiné Equatorial
+GR=Grécia
+GS=Ilhas Geórgia do Sul e Sandwich do Sul
+GW=Guiné-Bissau
 GY=Guiana
 HK=Hong Kong, RAE da China
 HM=Ilhas Heard e McDonald
-HR=Cro\u00e1cia
+HR=Croácia
 HU=Hungria
-ID=Indon\u00e9sia
+ID=Indonésia
 IE=Irlanda
-IN=\u00cdndia
-IO=Territ\u00f3rio Brit\u00e2nico do Oceano \u00cdndico
+IN=Índia
+IO=Território Britânico do Oceano Índico
 IQ=Iraque
-IR=Ir\u00e3
-IS=Isl\u00e2ndia
-IT=It\u00e1lia
-JO=Jord\u00e2nia
-JP=Jap\u00e3o
-KE=Qu\u00eania
-KG=Quirguist\u00e3o
+IR=Irã
+IS=Islândia
+IT=Itália
+JO=Jordânia
+JP=Japão
+KE=Quênia
+KG=Quirguistão
 KH=Camboja
 KI=Quiribati
 KM=Comores
-KN=S\u00e3o Crist\u00f3v\u00e3o e N\u00e9vis
+KN=São Cristóvão e Névis
 KP=Coreia do Norte
 KR=Coreia do Sul
 KY=Ilhas Cayman
-KZ=Cazaquist\u00e3o
-LB=L\u00edbano
-LC=Santa L\u00facia
-LR=Lib\u00e9ria
+KZ=Cazaquistão
+LB=Líbano
+LC=Santa Lúcia
+LR=Libéria
 LS=Lesoto
-LT=Litu\u00e2nia
+LT=Lituânia
 LU=Luxemburgo
-LV=Let\u00f4nia
-LY=L\u00edbia
+LV=Letônia
+LY=Líbia
 MA=Marrocos
-MC=M\u00f4naco
-MD=Mold\u00e1via
+MC=Mônaco
+MD=Moldávia
 MH=Ilhas Marshall
-MK=Maced\u00f4nia do Norte
-MM=Mianmar (Birm\u00e2nia)
-MN=Mong\u00f3lia
+MK=Macedônia do Norte
+MM=Mianmar (Birmânia)
+MN=Mongólia
 MO=Macau, RAE da China
 MP=Ilhas Marianas do Norte
 MQ=Martinica
-MR=Maurit\u00e2nia
-MU=Maur\u00edcio
+MR=Mauritânia
+MU=Maurício
 MV=Maldivas
-MX=M\u00e9xico
-MY=Mal\u00e1sia
-MZ=Mo\u00e7ambique
-NA=Nam\u00edbia
-NC=Nova Caled\u00f4nia
-NE=N\u00edger
+MX=México
+MY=Malásia
+MZ=Moçambique
+NA=Namíbia
+NC=Nova Caledônia
+NE=Níger
 NF=Ilha Norfolk
-NG=Nig\u00e9ria
-NI=Nicar\u00e1gua
-NL=Pa\u00edses Baixos
+NG=Nigéria
+NI=Nicarágua
+NL=Países Baixos
 NO=Noruega
-NZ=Nova Zel\u00e2ndia
-OM=Om\u00e3
-PA=Panam\u00e1
-PF=Polin\u00e9sia Francesa
-PG=Papua-Nova Guin\u00e9
+NZ=Nova Zelândia
+OM=Omã
+PA=Panamá
+PF=Polinésia Francesa
+PG=Papua-Nova Guiné
 PH=Filipinas
-PK=Paquist\u00e3o
-PL=Pol\u00f4nia
-PM=S\u00e3o Pedro e Miquel\u00e3o
+PK=Paquistão
+PL=Polônia
+PM=São Pedro e Miquelão
 PR=Porto Rico
-PS=Territ\u00f3rios palestinos
+PS=Territórios palestinos
 PY=Paraguai
 QA=Catar
-RE=Reuni\u00e3o
-RO=Rom\u00eania
-RU=R\u00fassia
+RE=Reunião
+RO=Romênia
+RU=Rússia
 RW=Ruanda
-SA=Ar\u00e1bia Saudita
-SB=Ilhas Salom\u00e3o
-SD=Sud\u00e3o
-SE=Su\u00e9cia
+SA=Arábia Saudita
+SB=Ilhas Salomão
+SD=Sudão
+SE=Suécia
 SG=Singapura
 SH=Santa Helena
-SI=Eslov\u00eania
+SI=Eslovênia
 SJ=Svalbard e Jan Mayen
-SK=Eslov\u00e1quia
+SK=Eslováquia
 SL=Serra Leoa
-SO=Som\u00e1lia
-ST=S\u00e3o Tom\u00e9 e Pr\u00edncipe
-SY=S\u00edria
-SZ=Essuat\u00edni
+SO=Somália
+ST=São Tomé e Príncipe
+SY=Síria
+SZ=Essuatíni
 TC=Ilhas Turcas e Caicos
 TD=Chade
-TF=Territ\u00f3rios Franceses do Sul
-TH=Tail\u00e2ndia
-TJ=Tadjiquist\u00e3o
-TM=Turcomenist\u00e3o
-TN=Tun\u00edsia
+TF=Territórios Franceses do Sul
+TH=Tailândia
+TJ=Tadjiquistão
+TM=Turcomenistão
+TN=Tunísia
 TR=Turquia
 TT=Trinidad e Tobago
-TZ=Tanz\u00e2nia
-UA=Ucr\u00e2nia
+TZ=Tanzânia
+UA=Ucrânia
 UM=Ilhas Menores Distantes dos EUA
 US=Estados Unidos
 UY=Uruguai
-UZ=Uzbequist\u00e3o
+UZ=Uzbequistão
 VA=Cidade do Vaticano
-VC=S\u00e3o Vicente e Granadinas
-VG=Ilhas Virgens Brit\u00e2nicas
+VC=São Vicente e Granadinas
+VG=Ilhas Virgens Britânicas
 VI=Ilhas Virgens Americanas
-VN=Vietn\u00e3
+VN=Vietnã
 WF=Wallis e Futuna
-YE=I\u00eamen
-ZA=\u00c1frica do Sul
-ZM=Z\u00e2mbia
-ZW=Zimb\u00e1bue
+YE=Iêmen
+ZA=África do Sul
+ZM=Zâmbia
+ZW=Zimbábue
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_BR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_BR.properties
index cfed210191c..fa283f49ede 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_BR.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_BR.properties
@@ -41,5 +41,5 @@
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
 ik=inupiaque
-jv=javan\u00eas
+jv=javanês
 AX=Ilhas Aland
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_PT.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_PT.properties
index 26ead9121f7..6d8bb56b0fa 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_PT.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_pt_PT.properties
@@ -41,37 +41,37 @@
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
 cs=checo
-et=est\u00f3nio
+et=estónio
 pl=polaco
-AM=Arm\u00e9nia
+AM=Arménia
 BJ=Benim
-BY=Bielorr\u00fassia
+BY=Bielorrússia
 CX=Ilha do Natal
-CZ=Ch\u00e9quia
-EE=Est\u00f3nia
+CZ=Chéquia
+EE=Estónia
 EH=Sara Ocidental
 FK=Ilhas Falkland
-GL=Gronel\u00e2ndia
-KE=Qu\u00e9nia
-KN=S\u00e3o Crist\u00f3v\u00e3o e Neves
-KY=Ilhas Caim\u00e3o
-LV=Let\u00f3nia
-MC=M\u00f3naco
-MG=Madag\u00e1scar
-MK=Maced\u00f3nia do Norte
-MU=Maur\u00edcia
-NC=Nova Caled\u00f3nia
-PL=Pol\u00f3nia
-PS=Territ\u00f3rios palestinianos
-RO=Rom\u00e9nia
+GL=Gronelândia
+KE=Quénia
+KN=São Cristóvão e Neves
+KY=Ilhas Caimão
+LV=Letónia
+MC=Mónaco
+MG=Madagáscar
+MK=Macedónia do Norte
+MU=Maurícia
+NC=Nova Caledónia
+PL=Polónia
+PS=Territórios palestinianos
+RO=Roménia
 SC=Seicheles
-SI=Eslov\u00e9nia
-SM=S\u00e3o Marinho
-TF=Territ\u00f3rios Austrais Franceses
-TJ=Tajiquist\u00e3o
-TM=Turquemenist\u00e3o
+SI=Eslovénia
+SM=São Marinho
+TF=Territórios Austrais Franceses
+TJ=Tajiquistão
+TM=Turquemenistão
 UM=Ilhas Menores Afastadas dos EUA
-UZ=Usbequist\u00e3o
+UZ=Usbequistão
 VI=Ilhas Virgens dos EUA
 VN=Vietname
-YE=I\u00e9men
+YE=Iémen
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ro.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ro.properties
index 752ef799163..05e5acb696e 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ro.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ro.properties
@@ -38,9 +38,9 @@
 # language names
 # key is ISO 639 language code
 
-ro=rom\u00e2n\u0103
+ro=română
 
 # country names
 # key is ISO 3166 country code
 
-RO=Rom\u00e2nia
+RO=România
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ru.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ru.properties
index 7def6737148..922d9c8896c 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ru.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_ru.properties
@@ -38,345 +38,345 @@
 # language names
 # key is ISO 639 language code
 
-ab=\u0430\u0431\u0445\u0430\u0437\u0441\u043a\u0438\u0439
-aa=\u0430\u0444\u0430\u0440\u0441\u043a\u0438\u0439
-af=\u0430\u0444\u0440\u0438\u043a\u0430\u0430\u043d\u0441
-sq=\u0430\u043b\u0431\u0430\u043d\u0441\u043a\u0438\u0439
-am=\u0430\u043c\u0445\u0430\u0440\u0441\u043a\u0438\u0439
-ar=\u0430\u0440\u0430\u0431\u0441\u043a\u0438\u0439
-hy=\u0430\u0440\u043c\u044f\u043d\u0441\u043a\u0438\u0439
-as=\u0430\u0441\u0441\u0430\u043c\u0441\u043a\u0438\u0439
-ay=\u0430\u0439\u043c\u0430\u0440\u0430
-az=\u0430\u0437\u0435\u0440\u0431\u0430\u0439\u0434\u0436\u0430\u043d\u0441\u043a\u0438\u0439
-ba=\u0431\u0430\u0448\u043a\u0438\u0440\u0441\u043a\u0438\u0439
-eu=\u0431\u0430\u0441\u043a\u0441\u043a\u0438\u0439
-bn=\u0431\u0435\u043d\u0433\u0430\u043b\u044c\u0441\u043a\u0438\u0439
-dz=\u0434\u0437\u043e\u043d\u0433-\u043a\u044d
-bh=\u0431\u0438\u0445\u0430\u0440\u0438
-bi=\u0431\u0438\u0441\u043b\u0430\u043c\u0430
-br=\u0431\u0440\u0435\u0442\u043e\u043d\u0441\u043a\u0438\u0439
-bg=\u0431\u043e\u043b\u0433\u0430\u0440\u0441\u043a\u0438\u0439
-my=\u0431\u0438\u0440\u043c\u0430\u043d\u0441\u043a\u0438\u0439
-be=\u0431\u0435\u043b\u043e\u0440\u0443\u0441\u0441\u043a\u0438\u0439
-km=\u043a\u0445\u043c\u0435\u0440\u0441\u043a\u0438\u0439
-ca=\u043a\u0430\u0442\u0430\u043b\u0430\u043d\u0441\u043a\u0438\u0439
-zh=\u043a\u0438\u0442\u0430\u0439\u0441\u043a\u0438\u0439
-co=\u043a\u043e\u0440\u0441\u0438\u043a\u0430\u043d\u0441\u043a\u0438\u0439
-hr=\u0445\u043e\u0440\u0432\u0430\u0442\u0441\u043a\u0438\u0439
-cs=\u0447\u0435\u0448\u0441\u043a\u0438\u0439
-da=\u0434\u0430\u0442\u0441\u043a\u0438\u0439
-nl=\u043d\u0438\u0434\u0435\u0440\u043b\u0430\u043d\u0434\u0441\u043a\u0438\u0439
-en=\u0430\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438\u0439
-eo=\u044d\u0441\u043f\u0435\u0440\u0430\u043d\u0442\u043e
-et=\u044d\u0441\u0442\u043e\u043d\u0441\u043a\u0438\u0439
-fo=\u0444\u0430\u0440\u0435\u0440\u0441\u043a\u0438\u0439
-fj=\u0444\u0438\u0434\u0436\u0438
-fi=\u0444\u0438\u043d\u0441\u043a\u0438\u0439
-fr=\u0444\u0440\u0430\u043d\u0446\u0443\u0437\u0441\u043a\u0438\u0439
-fy=\u0437\u0430\u043f\u0430\u0434\u043d\u043e\u0444\u0440\u0438\u0437\u0441\u043a\u0438\u0439
-gl=\u0433\u0430\u043b\u0438\u0441\u0438\u0439\u0441\u043a\u0438\u0439
-ka=\u0433\u0440\u0443\u0437\u0438\u043d\u0441\u043a\u0438\u0439
-de=\u043d\u0435\u043c\u0435\u0446\u043a\u0438\u0439
-el=\u0433\u0440\u0435\u0447\u0435\u0441\u043a\u0438\u0439
-kl=\u0433\u0440\u0435\u043d\u043b\u0430\u043d\u0434\u0441\u043a\u0438\u0439
-gn=\u0433\u0443\u0430\u0440\u0430\u043d\u0438
-gu=\u0433\u0443\u0434\u0436\u0430\u0440\u0430\u0442\u0438
-ha=\u0445\u0430\u0443\u0441\u0430
-he=\u0438\u0432\u0440\u0438\u0442
-iw=\u0438\u0432\u0440\u0438\u0442
-hi=\u0445\u0438\u043d\u0434\u0438
-hu=\u0432\u0435\u043d\u0433\u0435\u0440\u0441\u043a\u0438\u0439
-is=\u0438\u0441\u043b\u0430\u043d\u0434\u0441\u043a\u0438\u0439
-id=\u0438\u043d\u0434\u043e\u043d\u0435\u0437\u0438\u0439\u0441\u043a\u0438\u0439
-in=\u0438\u043d\u0434\u043e\u043d\u0435\u0437\u0438\u0439\u0441\u043a\u0438\u0439
-ia=\u0438\u043d\u0442\u0435\u0440\u043b\u0438\u043d\u0433\u0432\u0430
-ie=\u0438\u043d\u0442\u0435\u0440\u043b\u0438\u043d\u0433\u0432\u0435
-iu=\u0438\u043d\u0443\u043a\u0442\u0438\u0442\u0443\u0442
-ik=\u0438\u043d\u0443\u043f\u0438\u0430\u043a
-ga=\u0438\u0440\u043b\u0430\u043d\u0434\u0441\u043a\u0438\u0439
-it=\u0438\u0442\u0430\u043b\u044c\u044f\u043d\u0441\u043a\u0438\u0439
-ja=\u044f\u043f\u043e\u043d\u0441\u043a\u0438\u0439
-jw=\u044f\u0432\u0430\u043d\u0441\u043a\u0438\u0439
-kn=\u043a\u0430\u043d\u043d\u0430\u0434\u0430
-ks=\u043a\u0430\u0448\u043c\u0438\u0440\u0438
-kk=\u043a\u0430\u0437\u0430\u0445\u0441\u043a\u0438\u0439
-rw=\u043a\u0438\u043d\u044c\u044f\u0440\u0443\u0430\u043d\u0434\u0430
-ky=\u043a\u0438\u0440\u0433\u0438\u0437\u0441\u043a\u0438\u0439
-rn=\u0440\u0443\u043d\u0434\u0438
-ko=\u043a\u043e\u0440\u0435\u0439\u0441\u043a\u0438\u0439
-ku=\u043a\u0443\u0440\u0434\u0441\u043a\u0438\u0439
-lo=\u043b\u0430\u043e\u0441\u0441\u043a\u0438\u0439
-la=\u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438\u0439
-lv=\u043b\u0430\u0442\u044b\u0448\u0441\u043a\u0438\u0439
-ln=\u043b\u0438\u043d\u0433\u0430\u043b\u0430
-lt=\u043b\u0438\u0442\u043e\u0432\u0441\u043a\u0438\u0439
-mk=\u043c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438\u0439
-mg=\u043c\u0430\u043b\u0430\u0433\u0430\u0441\u0438\u0439\u0441\u043a\u0438\u0439
-ms=\u043c\u0430\u043b\u0430\u0439\u0441\u043a\u0438\u0439
-ml=\u043c\u0430\u043b\u0430\u044f\u043b\u0430\u043c
-mt=\u043c\u0430\u043b\u044c\u0442\u0438\u0439\u0441\u043a\u0438\u0439
-mi=\u043c\u0430\u043e\u0440\u0438
-mr=\u043c\u0430\u0440\u0430\u0442\u0445\u0438
-mo=\u043c\u043e\u043b\u0434\u0430\u0432\u0430\u043d\u0441\u043a\u0438\u0439
-mn=\u043c\u043e\u043d\u0433\u043e\u043b\u044c\u0441\u043a\u0438\u0439
-na=\u043d\u0430\u0443\u0440\u0443
-ne=\u043d\u0435\u043f\u0430\u043b\u044c\u0441\u043a\u0438\u0439
-no=\u043d\u043e\u0440\u0432\u0435\u0436\u0441\u043a\u0438\u0439
-oc=\u043e\u043a\u0441\u0438\u0442\u0430\u043d\u0441\u043a\u0438\u0439
-or=\u043e\u0440\u0438\u044f
-om=\u043e\u0440\u043e\u043c\u043e
-ps=\u043f\u0443\u0448\u0442\u0443
-fa=\u043f\u0435\u0440\u0441\u0438\u0434\u0441\u043a\u0438\u0439
-pl=\u043f\u043e\u043b\u044c\u0441\u043a\u0438\u0439
-pt=\u043f\u043e\u0440\u0442\u0443\u0433\u0430\u043b\u044c\u0441\u043a\u0438\u0439
-pa=\u043f\u0430\u043d\u0434\u0436\u0430\u0431\u0438
-qu=\u043a\u0435\u0447\u0443\u0430
-rm=\u0440\u043e\u043c\u0430\u043d\u0448\u0441\u043a\u0438\u0439
-ro=\u0440\u0443\u043c\u044b\u043d\u0441\u043a\u0438\u0439
-ru=\u0440\u0443\u0441\u0441\u043a\u0438\u0439
-sm=\u0441\u0430\u043c\u043e\u0430\u043d\u0441\u043a\u0438\u0439
-sg=\u0441\u0430\u043d\u0433\u043e
-sa=\u0441\u0430\u043d\u0441\u043a\u0440\u0438\u0442
-gd=\u0433\u044d\u043b\u044c\u0441\u043a\u0438\u0439
-sr=\u0441\u0435\u0440\u0431\u0441\u043a\u0438\u0439
-st=\u044e\u0436\u043d\u044b\u0439 \u0441\u043e\u0442\u043e
-tn=\u0442\u0441\u0432\u0430\u043d\u0430
-sn=\u0448\u043e\u043d\u0430
-sd=\u0441\u0438\u043d\u0434\u0445\u0438
-si=\u0441\u0438\u043d\u0433\u0430\u043b\u044c\u0441\u043a\u0438\u0439
-ss=\u0441\u0432\u0430\u0437\u0438
-sk=\u0441\u043b\u043e\u0432\u0430\u0446\u043a\u0438\u0439
-sl=\u0441\u043b\u043e\u0432\u0435\u043d\u0441\u043a\u0438\u0439
-so=\u0441\u043e\u043c\u0430\u043b\u0438
-es=\u0438\u0441\u043f\u0430\u043d\u0441\u043a\u0438\u0439
-su=\u0441\u0443\u043d\u0434\u0430\u043d\u0441\u043a\u0438\u0439
-sw=\u0441\u0443\u0430\u0445\u0438\u043b\u0438
-sv=\u0448\u0432\u0435\u0434\u0441\u043a\u0438\u0439
-tl=\u0442\u0430\u0433\u0430\u043b\u043e\u0433
-tg=\u0442\u0430\u0434\u0436\u0438\u043a\u0441\u043a\u0438\u0439
-ta=\u0442\u0430\u043c\u0438\u043b\u044c\u0441\u043a\u0438\u0439
-tt=\u0442\u0430\u0442\u0430\u0440\u0441\u043a\u0438\u0439
-te=\u0442\u0435\u043b\u0443\u0433\u0443
-th=\u0442\u0430\u0439\u0441\u043a\u0438\u0439
-bo=\u0442\u0438\u0431\u0435\u0442\u0441\u043a\u0438\u0439
-ti=\u0442\u0438\u0433\u0440\u0438\u043d\u044c\u044f
-to=\u0442\u043e\u043d\u0433\u0430\u043d\u0441\u043a\u0438\u0439
-ts=\u0442\u0441\u043e\u043d\u0433\u0430
-tr=\u0442\u0443\u0440\u0435\u0446\u043a\u0438\u0439
-tk=\u0442\u0443\u0440\u043a\u043c\u0435\u043d\u0441\u043a\u0438\u0439
-tw=\u0442\u0432\u0438
-ug=\u0443\u0439\u0433\u0443\u0440\u0441\u043a\u0438\u0439
-uk=\u0443\u043a\u0440\u0430\u0438\u043d\u0441\u043a\u0438\u0439
-ur=\u0443\u0440\u0434\u0443
-uz=\u0443\u0437\u0431\u0435\u043a\u0441\u043a\u0438\u0439
-vi=\u0432\u044c\u0435\u0442\u043d\u0430\u043c\u0441\u043a\u0438\u0439
-vo=\u0432\u043e\u043b\u0430\u043f\u044e\u043a
-cy=\u0432\u0430\u043b\u043b\u0438\u0439\u0441\u043a\u0438\u0439
-wo=\u0432\u043e\u043b\u043e\u0444
-xh=\u043a\u043e\u0441\u0430
-ji=\u0438\u0434\u0438\u0448
-yi=\u0438\u0434\u0438\u0448
-yo=\u0439\u043e\u0440\u0443\u0431\u0430
-za=\u0447\u0436\u0443\u0430\u043d\u044c
-zu=\u0437\u0443\u043b\u0443
+ab=абхазский
+aa=афарский
+af=африкаанс
+sq=албанский
+am=амхарский
+ar=арабский
+hy=армянский
+as=ассамский
+ay=аймара
+az=азербайджанский
+ba=башкирский
+eu=баскский
+bn=бенгальский
+dz=дзонг-кэ
+bh=бихари
+bi=бислама
+br=бретонский
+bg=болгарский
+my=бирманский
+be=белорусский
+km=кхмерский
+ca=каталанский
+zh=китайский
+co=корсиканский
+hr=хорватский
+cs=чешский
+da=датский
+nl=нидерландский
+en=английский
+eo=эсперанто
+et=эстонский
+fo=фарерский
+fj=фиджи
+fi=финский
+fr=французский
+fy=западнофризский
+gl=галисийский
+ka=грузинский
+de=немецкий
+el=греческий
+kl=гренландский
+gn=гуарани
+gu=гуджарати
+ha=хауса
+he=иврит
+iw=иврит
+hi=хинди
+hu=венгерский
+is=исландский
+id=индонезийский
+in=индонезийский
+ia=интерлингва
+ie=интерлингве
+iu=инуктитут
+ik=инупиак
+ga=ирландский
+it=итальянский
+ja=японский
+jw=яванский
+kn=каннада
+ks=кашмири
+kk=казахский
+rw=киньяруанда
+ky=киргизский
+rn=рунди
+ko=корейский
+ku=курдский
+lo=лаосский
+la=латинский
+lv=латышский
+ln=лингала
+lt=литовский
+mk=македонский
+mg=малагасийский
+ms=малайский
+ml=малаялам
+mt=мальтийский
+mi=маори
+mr=маратхи
+mo=молдаванский
+mn=монгольский
+na=науру
+ne=непальский
+no=норвежский
+oc=окситанский
+or=ория
+om=оромо
+ps=пушту
+fa=персидский
+pl=польский
+pt=португальский
+pa=панджаби
+qu=кечуа
+rm=романшский
+ro=румынский
+ru=русский
+sm=самоанский
+sg=санго
+sa=санскрит
+gd=гэльский
+sr=сербский
+st=южный сото
+tn=тсвана
+sn=шона
+sd=синдхи
+si=сингальский
+ss=свази
+sk=словацкий
+sl=словенский
+so=сомали
+es=испанский
+su=сунданский
+sw=суахили
+sv=шведский
+tl=тагалог
+tg=таджикский
+ta=тамильский
+tt=татарский
+te=телугу
+th=тайский
+bo=тибетский
+ti=тигринья
+to=тонганский
+ts=тсонга
+tr=турецкий
+tk=туркменский
+tw=тви
+ug=уйгурский
+uk=украинский
+ur=урду
+uz=узбекский
+vi=вьетнамский
+vo=волапюк
+cy=валлийский
+wo=волоф
+xh=коса
+ji=идиш
+yi=идиш
+yo=йоруба
+za=чжуань
+zu=зулу
 
 # country names
 # key is ISO 3166 country code
 
-AF=\u0410\u0444\u0433\u0430\u043d\u0438\u0441\u0442\u0430\u043d
-AL=\u0410\u043b\u0431\u0430\u043d\u0438\u044f
-DZ=\u0410\u043b\u0436\u0438\u0440
-AD=\u0410\u043d\u0434\u043e\u0440\u0440\u0430
-AO=\u0410\u043d\u0433\u043e\u043b\u0430
-AI=\u0410\u043d\u0433\u0438\u043b\u044c\u044f
-AR=\u0410\u0440\u0433\u0435\u043d\u0442\u0438\u043d\u0430
-AM=\u0410\u0440\u043c\u0435\u043d\u0438\u044f
-AW=\u0410\u0440\u0443\u0431\u0430
-AU=\u0410\u0432\u0441\u0442\u0440\u0430\u043b\u0438\u044f
-AT=\u0410\u0432\u0441\u0442\u0440\u0438\u044f
-AZ=\u0410\u0437\u0435\u0440\u0431\u0430\u0439\u0434\u0436\u0430\u043d
-BS=\u0411\u0430\u0433\u0430\u043c\u044b
-BH=\u0411\u0430\u0445\u0440\u0435\u0439\u043d
-BD=\u0411\u0430\u043d\u0433\u043b\u0430\u0434\u0435\u0448
-BB=\u0411\u0430\u0440\u0431\u0430\u0434\u043e\u0441
-BY=\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c
-BE=\u0411\u0435\u043b\u044c\u0433\u0438\u044f
-BZ=\u0411\u0435\u043b\u0438\u0437
-BJ=\u0411\u0435\u043d\u0438\u043d
-BM=\u0411\u0435\u0440\u043c\u0443\u0434\u0441\u043a\u0438\u0435 \u043e-\u0432\u0430
-BT=\u0411\u0443\u0442\u0430\u043d
-BO=\u0411\u043e\u043b\u0438\u0432\u0438\u044f
-BA=\u0411\u043e\u0441\u043d\u0438\u044f \u0438 \u0413\u0435\u0440\u0446\u0435\u0433\u043e\u0432\u0438\u043d\u0430
-BW=\u0411\u043e\u0442\u0441\u0432\u0430\u043d\u0430
-BR=\u0411\u0440\u0430\u0437\u0438\u043b\u0438\u044f
-BN=\u0411\u0440\u0443\u043d\u0435\u0439-\u0414\u0430\u0440\u0443\u0441\u0441\u0430\u043b\u0430\u043c
-BG=\u0411\u043e\u043b\u0433\u0430\u0440\u0438\u044f
-BF=\u0411\u0443\u0440\u043a\u0438\u043d\u0430-\u0424\u0430\u0441\u043e
-BI=\u0411\u0443\u0440\u0443\u043d\u0434\u0438
-KH=\u041a\u0430\u043c\u0431\u043e\u0434\u0436\u0430
-CM=\u041a\u0430\u043c\u0435\u0440\u0443\u043d
-CA=\u041a\u0430\u043d\u0430\u0434\u0430
-CV=\u041a\u0430\u0431\u043e-\u0412\u0435\u0440\u0434\u0435
-CF=\u0426\u0435\u043d\u0442\u0440\u0430\u043b\u044c\u043d\u043e-\u0410\u0444\u0440\u0438\u043a\u0430\u043d\u0441\u043a\u0430\u044f \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430
-TD=\u0427\u0430\u0434
-CL=\u0427\u0438\u043b\u0438
-CN=\u041a\u0438\u0442\u0430\u0439
-CO=\u041a\u043e\u043b\u0443\u043c\u0431\u0438\u044f
-KM=\u041a\u043e\u043c\u043e\u0440\u044b
-CG=\u041a\u043e\u043d\u0433\u043e - \u0411\u0440\u0430\u0437\u0437\u0430\u0432\u0438\u043b\u044c
-CR=\u041a\u043e\u0441\u0442\u0430-\u0420\u0438\u043a\u0430
-CI=\u041a\u043e\u0442-\u0434\u2019\u0418\u0432\u0443\u0430\u0440
-HR=\u0425\u043e\u0440\u0432\u0430\u0442\u0438\u044f
-CU=\u041a\u0443\u0431\u0430
-CY=\u041a\u0438\u043f\u0440
-CZ=\u0427\u0435\u0445\u0438\u044f
-DK=\u0414\u0430\u043d\u0438\u044f
-DJ=\u0414\u0436\u0438\u0431\u0443\u0442\u0438
-DM=\u0414\u043e\u043c\u0438\u043d\u0438\u043a\u0430
-DO=\u0414\u043e\u043c\u0438\u043d\u0438\u043a\u0430\u043d\u0441\u043a\u0430\u044f \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430
-TP=\u0412\u043e\u0441\u0442\u043e\u0447\u043d\u044b\u0439 \u0422\u0438\u043c\u043e\u0440
-EC=\u042d\u043a\u0432\u0430\u0434\u043e\u0440
-EG=\u0415\u0433\u0438\u043f\u0435\u0442
-SV=\u0421\u0430\u043b\u044c\u0432\u0430\u0434\u043e\u0440
-GQ=\u042d\u043a\u0432\u0430\u0442\u043e\u0440\u0438\u0430\u043b\u044c\u043d\u0430\u044f \u0413\u0432\u0438\u043d\u0435\u044f
-ER=\u042d\u0440\u0438\u0442\u0440\u0435\u044f
-EE=\u042d\u0441\u0442\u043e\u043d\u0438\u044f
-ET=\u042d\u0444\u0438\u043e\u043f\u0438\u044f
-FJ=\u0424\u0438\u0434\u0436\u0438
-FI=\u0424\u0438\u043d\u043b\u044f\u043d\u0434\u0438\u044f
-FR=\u0424\u0440\u0430\u043d\u0446\u0438\u044f
-GF=\u0424\u0440\u0430\u043d\u0446\u0443\u0437\u0441\u043a\u0430\u044f \u0413\u0432\u0438\u0430\u043d\u0430
-PF=\u0424\u0440\u0430\u043d\u0446\u0443\u0437\u0441\u043a\u0430\u044f \u041f\u043e\u043b\u0438\u043d\u0435\u0437\u0438\u044f
-TF=\u0424\u0440\u0430\u043d\u0446\u0443\u0437\u0441\u043a\u0438\u0435 \u042e\u0436\u043d\u044b\u0435 \u0442\u0435\u0440\u0440\u0438\u0442\u043e\u0440\u0438\u0438
-GA=\u0413\u0430\u0431\u043e\u043d
-GM=\u0413\u0430\u043c\u0431\u0438\u044f
-GE=\u0413\u0440\u0443\u0437\u0438\u044f
-DE=\u0413\u0435\u0440\u043c\u0430\u043d\u0438\u044f
-GH=\u0413\u0430\u043d\u0430
-GR=\u0413\u0440\u0435\u0446\u0438\u044f
-GP=\u0413\u0432\u0430\u0434\u0435\u043b\u0443\u043f\u0430
-GT=\u0413\u0432\u0430\u0442\u0435\u043c\u0430\u043b\u0430
-GN=\u0413\u0432\u0438\u043d\u0435\u044f
-GW=\u0413\u0432\u0438\u043d\u0435\u044f-\u0411\u0438\u0441\u0430\u0443
-GY=\u0413\u0430\u0439\u0430\u043d\u0430
-HT=\u0413\u0430\u0438\u0442\u0438
-HN=\u0413\u043e\u043d\u0434\u0443\u0440\u0430\u0441
-HK=\u0413\u043e\u043d\u043a\u043e\u043d\u0433 (\u0421\u0410\u0420)
-HU=\u0412\u0435\u043d\u0433\u0440\u0438\u044f
-IS=\u0418\u0441\u043b\u0430\u043d\u0434\u0438\u044f
-IN=\u0418\u043d\u0434\u0438\u044f
-ID=\u0418\u043d\u0434\u043e\u043d\u0435\u0437\u0438\u044f
-IR=\u0418\u0440\u0430\u043d
-IQ=\u0418\u0440\u0430\u043a
-IE=\u0418\u0440\u043b\u0430\u043d\u0434\u0438\u044f
-IL=\u0418\u0437\u0440\u0430\u0438\u043b\u044c
-IT=\u0418\u0442\u0430\u043b\u0438\u044f
-JM=\u042f\u043c\u0430\u0439\u043a\u0430
-JP=\u042f\u043f\u043e\u043d\u0438\u044f
-JO=\u0418\u043e\u0440\u0434\u0430\u043d\u0438\u044f
-KZ=\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d
-KE=\u041a\u0435\u043d\u0438\u044f
-KI=\u041a\u0438\u0440\u0438\u0431\u0430\u0442\u0438
-KP=\u041a\u041d\u0414\u0420
-KR=\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u043e\u0440\u0435\u044f
-KW=\u041a\u0443\u0432\u0435\u0439\u0442
-KG=\u041a\u0438\u0440\u0433\u0438\u0437\u0438\u044f
-LA=\u041b\u0430\u043e\u0441
-LV=\u041b\u0430\u0442\u0432\u0438\u044f
-LB=\u041b\u0438\u0432\u0430\u043d
-LS=\u041b\u0435\u0441\u043e\u0442\u043e
-LR=\u041b\u0438\u0431\u0435\u0440\u0438\u044f
-LY=\u041b\u0438\u0432\u0438\u044f
-LI=\u041b\u0438\u0445\u0442\u0435\u043d\u0448\u0442\u0435\u0439\u043d
-LT=\u041b\u0438\u0442\u0432\u0430
-LU=\u041b\u044e\u043a\u0441\u0435\u043c\u0431\u0443\u0440\u0433
-MK=\u0421\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0438\u044f
-MG=\u041c\u0430\u0434\u0430\u0433\u0430\u0441\u043a\u0430\u0440
-MY=\u041c\u0430\u043b\u0430\u0439\u0437\u0438\u044f
-ML=\u041c\u0430\u043b\u0438
-MT=\u041c\u0430\u043b\u044c\u0442\u0430
-MQ=\u041c\u0430\u0440\u0442\u0438\u043d\u0438\u043a\u0430
-MR=\u041c\u0430\u0432\u0440\u0438\u0442\u0430\u043d\u0438\u044f
-MU=\u041c\u0430\u0432\u0440\u0438\u043a\u0438\u0439
-YT=\u041c\u0430\u0439\u043e\u0442\u0442\u0430
-MX=\u041c\u0435\u043a\u0441\u0438\u043a\u0430
-FM=\u0424\u0435\u0434\u0435\u0440\u0430\u0442\u0438\u0432\u043d\u044b\u0435 \u0428\u0442\u0430\u0442\u044b \u041c\u0438\u043a\u0440\u043e\u043d\u0435\u0437\u0438\u0438
-MD=\u041c\u043e\u043b\u0434\u043e\u0432\u0430
-MC=\u041c\u043e\u043d\u0430\u043a\u043e
-MN=\u041c\u043e\u043d\u0433\u043e\u043b\u0438\u044f
-MS=\u041c\u043e\u043d\u0442\u0441\u0435\u0440\u0440\u0430\u0442
-MA=\u041c\u0430\u0440\u043e\u043a\u043a\u043e
-MZ=\u041c\u043e\u0437\u0430\u043c\u0431\u0438\u043a
-MM=\u041c\u044c\u044f\u043d\u043c\u0430 (\u0411\u0438\u0440\u043c\u0430)
-NA=\u041d\u0430\u043c\u0438\u0431\u0438\u044f
-NP=\u041d\u0435\u043f\u0430\u043b
-NL=\u041d\u0438\u0434\u0435\u0440\u043b\u0430\u043d\u0434\u044b
-AN=\u041d\u0438\u0434\u0435\u0440\u043b\u0430\u043d\u0434\u0441\u043a\u0438\u0435 \u0410\u043d\u0442\u0438\u043b\u044c\u0441\u043a\u0438\u0435 \u043e\u0441\u0442\u0440\u043e\u0432\u0430
-NC=\u041d\u043e\u0432\u0430\u044f \u041a\u0430\u043b\u0435\u0434\u043e\u043d\u0438\u044f
-NZ=\u041d\u043e\u0432\u0430\u044f \u0417\u0435\u043b\u0430\u043d\u0434\u0438\u044f
-NI=\u041d\u0438\u043a\u0430\u0440\u0430\u0433\u0443\u0430
-NE=\u041d\u0438\u0433\u0435\u0440
-NG=\u041d\u0438\u0433\u0435\u0440\u0438\u044f
-NU=\u041d\u0438\u0443\u044d
-NO=\u041d\u043e\u0440\u0432\u0435\u0433\u0438\u044f
-OM=\u041e\u043c\u0430\u043d
-PK=\u041f\u0430\u043a\u0438\u0441\u0442\u0430\u043d
-PA=\u041f\u0430\u043d\u0430\u043c\u0430
-PG=\u041f\u0430\u043f\u0443\u0430 \u2014 \u041d\u043e\u0432\u0430\u044f \u0413\u0432\u0438\u043d\u0435\u044f
-PY=\u041f\u0430\u0440\u0430\u0433\u0432\u0430\u0439
-PE=\u041f\u0435\u0440\u0443
-PH=\u0424\u0438\u043b\u0438\u043f\u043f\u0438\u043d\u044b
-PL=\u041f\u043e\u043b\u044c\u0448\u0430
-PT=\u041f\u043e\u0440\u0442\u0443\u0433\u0430\u043b\u0438\u044f
-PR=\u041f\u0443\u044d\u0440\u0442\u043e-\u0420\u0438\u043a\u043e
-QA=\u041a\u0430\u0442\u0430\u0440
-RO=\u0420\u0443\u043c\u044b\u043d\u0438\u044f
-RU=\u0420\u043e\u0441\u0441\u0438\u044f
-RW=\u0420\u0443\u0430\u043d\u0434\u0430
-SA=\u0421\u0430\u0443\u0434\u043e\u0432\u0441\u043a\u0430\u044f \u0410\u0440\u0430\u0432\u0438\u044f
-SN=\u0421\u0435\u043d\u0435\u0433\u0430\u043b
-SP=\u0421\u0435\u0440\u0431\u0438\u044f
-SC=\u0421\u0435\u0439\u0448\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u041e\u0441\u0442\u0440\u043e\u0432\u0430
-SL=\u0421\u044c\u0435\u0440\u0440\u0430-\u041b\u0435\u043e\u043d\u0435
-SG=\u0421\u0438\u043d\u0433\u0430\u043f\u0443\u0440
-SK=\u0421\u043b\u043e\u0432\u0430\u043a\u0438\u044f
-SI=\u0421\u043b\u043e\u0432\u0435\u043d\u0438\u044f
-SO=\u0421\u043e\u043c\u0430\u043b\u0438
-ZA=\u042e\u0436\u043d\u043e-\u0410\u0444\u0440\u0438\u043a\u0430\u043d\u0441\u043a\u0430\u044f \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430
-ES=\u0418\u0441\u043f\u0430\u043d\u0438\u044f
-LK=\u0428\u0440\u0438-\u041b\u0430\u043d\u043a\u0430
-SD=\u0421\u0443\u0434\u0430\u043d
-SR=\u0421\u0443\u0440\u0438\u043d\u0430\u043c
-SZ=\u042d\u0441\u0432\u0430\u0442\u0438\u043d\u0438
-SE=\u0428\u0432\u0435\u0446\u0438\u044f
-CH=\u0428\u0432\u0435\u0439\u0446\u0430\u0440\u0438\u044f
-SY=\u0421\u0438\u0440\u0438\u044f
-TW=\u0422\u0430\u0439\u0432\u0430\u043d\u044c
-TJ=\u0422\u0430\u0434\u0436\u0438\u043a\u0438\u0441\u0442\u0430\u043d
-TZ=\u0422\u0430\u043d\u0437\u0430\u043d\u0438\u044f
-TH=\u0422\u0430\u0438\u043b\u0430\u043d\u0434
-TG=\u0422\u043e\u0433\u043e
-TK=\u0422\u043e\u043a\u0435\u043b\u0430\u0443
-TO=\u0422\u043e\u043d\u0433\u0430
-TT=\u0422\u0440\u0438\u043d\u0438\u0434\u0430\u0434 \u0438 \u0422\u043e\u0431\u0430\u0433\u043e
-TN=\u0422\u0443\u043d\u0438\u0441
-TR=\u0422\u0443\u0440\u0446\u0438\u044f
-TM=\u0422\u0443\u0440\u043a\u043c\u0435\u043d\u0438\u0441\u0442\u0430\u043d
-UG=\u0423\u0433\u0430\u043d\u0434\u0430
-UA=\u0423\u043a\u0440\u0430\u0438\u043d\u0430
-AE=\u041e\u0410\u042d
-GB=\u0412\u0435\u043b\u0438\u043a\u043e\u0431\u0440\u0438\u0442\u0430\u043d\u0438\u044f
-US=\u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u043d\u044b\u0435 \u0428\u0442\u0430\u0442\u044b
-UY=\u0423\u0440\u0443\u0433\u0432\u0430\u0439
-UZ=\u0423\u0437\u0431\u0435\u043a\u0438\u0441\u0442\u0430\u043d
-VU=\u0412\u0430\u043d\u0443\u0430\u0442\u0443
-VA=\u0412\u0430\u0442\u0438\u043a\u0430\u043d
-VE=\u0412\u0435\u043d\u0435\u0441\u0443\u044d\u043b\u0430
-VN=\u0412\u044c\u0435\u0442\u043d\u0430\u043c
-VG=\u0412\u0438\u0440\u0433\u0438\u043d\u0441\u043a\u0438\u0435 \u043e-\u0432\u0430 (\u0412\u0435\u043b\u0438\u043a\u043e\u0431\u0440\u0438\u0442\u0430\u043d\u0438\u044f)
-VI=\u0412\u0438\u0440\u0433\u0438\u043d\u0441\u043a\u0438\u0435 \u043e-\u0432\u0430 (\u0421\u0428\u0410)
-EH=\u0417\u0430\u043f\u0430\u0434\u043d\u0430\u044f \u0421\u0430\u0445\u0430\u0440\u0430
-YE=\u0419\u0435\u043c\u0435\u043d
-ZR=\u0417\u0430\u0438\u0440
-ZM=\u0417\u0430\u043c\u0431\u0438\u044f
-ZW=\u0417\u0438\u043c\u0431\u0430\u0431\u0432\u0435
+AF=Афганистан
+AL=Албания
+DZ=Алжир
+AD=Андорра
+AO=Ангола
+AI=Ангилья
+AR=Аргентина
+AM=Армения
+AW=Аруба
+AU=Австралия
+AT=Австрия
+AZ=Азербайджан
+BS=Багамы
+BH=Бахрейн
+BD=Бангладеш
+BB=Барбадос
+BY=Беларусь
+BE=Бельгия
+BZ=Белиз
+BJ=Бенин
+BM=Бермудские о-ва
+BT=Бутан
+BO=Боливия
+BA=Босния и Герцеговина
+BW=Ботсвана
+BR=Бразилия
+BN=Бруней-Даруссалам
+BG=Болгария
+BF=Буркина-Фасо
+BI=Бурунди
+KH=Камбоджа
+CM=Камерун
+CA=Канада
+CV=Кабо-Верде
+CF=Центрально-Африканская Республика
+TD=Чад
+CL=Чили
+CN=Китай
+CO=Колумбия
+KM=Коморы
+CG=Конго - Браззавиль
+CR=Коста-Рика
+CI=Кот-д’Ивуар
+HR=Хорватия
+CU=Куба
+CY=Кипр
+CZ=Чехия
+DK=Дания
+DJ=Джибути
+DM=Доминика
+DO=Доминиканская Республика
+TP=Восточный Тимор
+EC=Эквадор
+EG=Египет
+SV=Сальвадор
+GQ=Экваториальная Гвинея
+ER=Эритрея
+EE=Эстония
+ET=Эфиопия
+FJ=Фиджи
+FI=Финляндия
+FR=Франция
+GF=Французская Гвиана
+PF=Французская Полинезия
+TF=Французские Южные территории
+GA=Габон
+GM=Гамбия
+GE=Грузия
+DE=Германия
+GH=Гана
+GR=Греция
+GP=Гваделупа
+GT=Гватемала
+GN=Гвинея
+GW=Гвинея-Бисау
+GY=Гайана
+HT=Гаити
+HN=Гондурас
+HK=Гонконг (САР)
+HU=Венгрия
+IS=Исландия
+IN=Индия
+ID=Индонезия
+IR=Иран
+IQ=Ирак
+IE=Ирландия
+IL=Израиль
+IT=Италия
+JM=Ямайка
+JP=Япония
+JO=Иордания
+KZ=Казахстан
+KE=Кения
+KI=Кирибати
+KP=КНДР
+KR=Республика Корея
+KW=Кувейт
+KG=Киргизия
+LA=Лаос
+LV=Латвия
+LB=Ливан
+LS=Лесото
+LR=Либерия
+LY=Ливия
+LI=Лихтенштейн
+LT=Литва
+LU=Люксембург
+MK=Северная Македония
+MG=Мадагаскар
+MY=Малайзия
+ML=Мали
+MT=Мальта
+MQ=Мартиника
+MR=Мавритания
+MU=Маврикий
+YT=Майотта
+MX=Мексика
+FM=Федеративные Штаты Микронезии
+MD=Молдова
+MC=Монако
+MN=Монголия
+MS=Монтсеррат
+MA=Марокко
+MZ=Мозамбик
+MM=Мьянма (Бирма)
+NA=Намибия
+NP=Непал
+NL=Нидерланды
+AN=Нидерландские Антильские острова
+NC=Новая Каледония
+NZ=Новая Зеландия
+NI=Никарагуа
+NE=Нигер
+NG=Нигерия
+NU=Ниуэ
+NO=Норвегия
+OM=Оман
+PK=Пакистан
+PA=Панама
+PG=Папуа — Новая Гвинея
+PY=Парагвай
+PE=Перу
+PH=Филиппины
+PL=Польша
+PT=Португалия
+PR=Пуэрто-Рико
+QA=Катар
+RO=Румыния
+RU=Россия
+RW=Руанда
+SA=Саудовская Аравия
+SN=Сенегал
+SP=Сербия
+SC=Сейшельские Острова
+SL=Сьерра-Леоне
+SG=Сингапур
+SK=Словакия
+SI=Словения
+SO=Сомали
+ZA=Южно-Африканская Республика
+ES=Испания
+LK=Шри-Ланка
+SD=Судан
+SR=Суринам
+SZ=Эсватини
+SE=Швеция
+CH=Швейцария
+SY=Сирия
+TW=Тайвань
+TJ=Таджикистан
+TZ=Танзания
+TH=Таиланд
+TG=Того
+TK=Токелау
+TO=Тонга
+TT=Тринидад и Тобаго
+TN=Тунис
+TR=Турция
+TM=Туркменистан
+UG=Уганда
+UA=Украина
+AE=ОАЭ
+GB=Великобритания
+US=Соединенные Штаты
+UY=Уругвай
+UZ=Узбекистан
+VU=Вануату
+VA=Ватикан
+VE=Венесуэла
+VN=Вьетнам
+VG=Виргинские о-ва (Великобритания)
+VI=Виргинские о-ва (США)
+EH=Западная Сахара
+YE=Йемен
+ZR=Заир
+ZM=Замбия
+ZW=Зимбабве
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sk.properties
index eb736e3b994..7f2eef04b7b 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sk.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sk.properties
@@ -38,7 +38,7 @@
 # language names
 # key is ISO 639 language code
 
-sk=sloven\u010dina
+sk=slovenčina
 
 # country names
 # key is ISO 3166 country code
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sl.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sl.properties
index b4f5467d0ac..3c73d2f800d 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sl.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sl.properties
@@ -38,7 +38,7 @@
 # language names
 # key is ISO 639 language code
 
-sl=sloven\u0161\u010dina
+sl=slovenščina
 
 # country names
 # key is ISO 3166 country code
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sq.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sq.properties
index 86105e5d8c9..2201cc0ce8f 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sq.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sq.properties
@@ -43,4 +43,4 @@ sq=shqip
 # country names
 # key is ISO 3166 country code
 
-AL=Shqip\u00ebri
+AL=Shqipëri
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr.properties
index 1112dbc5a8a..a6367399f36 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr.properties
@@ -40,300 +40,300 @@
 
 # Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
 
-af=\u0430\u0444\u0440\u0438\u043a\u0430\u043d\u0441
-ar=\u0430\u0440\u0430\u043f\u0441\u043a\u0438
-be=\u0431\u0435\u043b\u043e\u0440\u0443\u0441\u043a\u0438
-bg=\u0431\u0443\u0433\u0430\u0440\u0441\u043a\u0438
-br=\u0431\u0440\u0435\u0442\u043e\u043d\u0441\u043a\u0438
-ca=\u043a\u0430\u0442\u0430\u043b\u043e\u043d\u0441\u043a\u0438
-co=\u043a\u043e\u0440\u0437\u0438\u043a\u0430\u043d\u0441\u043a\u0438
-cs=\u0447\u0435\u0448\u043a\u0438
-da=\u0434\u0430\u043d\u0441\u043a\u0438
-de=\u043d\u0435\u043c\u0430\u0447\u043a\u0438
-el=\u0433\u0440\u0447\u043a\u0438
-en=\u0435\u043d\u0433\u043b\u0435\u0441\u043a\u0438
-eo=\u0435\u0441\u043f\u0435\u0440\u0430\u043d\u0442\u043e
-es=\u0448\u043f\u0430\u043d\u0441\u043a\u0438
-et=\u0435\u0441\u0442\u043e\u043d\u0441\u043a\u0438
-eu=\u0431\u0430\u0441\u043a\u0438\u0458\u0441\u043a\u0438
-fa=\u043f\u0435\u0440\u0441\u0438\u0458\u0441\u043a\u0438
-fi=\u0444\u0438\u043d\u0441\u043a\u0438
-fr=\u0444\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0438
-ga=\u0438\u0440\u0441\u043a\u0438
-he=\u0445\u0435\u0431\u0440\u0435\u0458\u0441\u043a\u0438
-hi=\u0445\u0438\u043d\u0434\u0438
-hr=\u0445\u0440\u0432\u0430\u0442\u0441\u043a\u0438
-hu=\u043c\u0430\u0452\u0430\u0440\u0441\u043a\u0438
-hy=\u0458\u0435\u0440\u043c\u0435\u043d\u0441\u043a\u0438
-id=\u0438\u043d\u0434\u043e\u043d\u0435\u0436\u0430\u043d\u0441\u043a\u0438
-in=\u0438\u043d\u0434\u043e\u043d\u0435\u0436\u0430\u043d\u0441\u043a\u0438
-is=\u0438\u0441\u043b\u0430\u043d\u0434\u0441\u043a\u0438
-it=\u0438\u0442\u0430\u043b\u0438\u0458\u0430\u043d\u0441\u043a\u0438
-iw=\u0445\u0435\u0431\u0440\u0435\u0458\u0441\u043a\u0438
-ja=\u0458\u0430\u043f\u0430\u043d\u0441\u043a\u0438
-ji=\u0458\u0438\u0434\u0438\u0448
-ka=\u0433\u0440\u0443\u0437\u0438\u0458\u0441\u043a\u0438
-km=\u043a\u043c\u0435\u0440\u0441\u043a\u0438
-ko=\u043a\u043e\u0440\u0435\u0458\u0441\u043a\u0438
-ku=\u043a\u0443\u0440\u0434\u0441\u043a\u0438
-ky=\u043a\u0438\u0440\u0433\u0438\u0441\u043a\u0438
-la=\u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438
-lt=\u043b\u0438\u0442\u0432\u0430\u043d\u0441\u043a\u0438
-lv=\u043b\u0435\u0442\u043e\u043d\u0441\u043a\u0438
-mk=\u043c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438
-mn=\u043c\u043e\u043d\u0433\u043e\u043b\u0441\u043a\u0438
-mo=\u041c\u043e\u043b\u0434\u0430\u0432\u0441\u043a\u0438
-my=\u0431\u0443\u0440\u043c\u0430\u043d\u0441\u043a\u0438
-nl=\u0445\u043e\u043b\u0430\u043d\u0434\u0441\u043a\u0438
-no=\u043d\u043e\u0440\u0432\u0435\u0448\u043a\u0438
-pl=\u043f\u043e\u0459\u0441\u043a\u0438
-pt=\u043f\u043e\u0440\u0442\u0443\u0433\u0430\u043b\u0441\u043a\u0438
-rm=\u0440\u043e\u043c\u0430\u043d\u0448
-ro=\u0440\u0443\u043c\u0443\u043d\u0441\u043a\u0438
-ru=\u0440\u0443\u0441\u043a\u0438
-sa=\u0441\u0430\u043d\u0441\u043a\u0440\u0438\u0442
-sk=\u0441\u043b\u043e\u0432\u0430\u0447\u043a\u0438
-sl=\u0441\u043b\u043e\u0432\u0435\u043d\u0430\u0447\u043a\u0438
-sq=\u0430\u043b\u0431\u0430\u043d\u0441\u043a\u0438
-sr=\u0441\u0440\u043f\u0441\u043a\u0438
-sv=\u0448\u0432\u0435\u0434\u0441\u043a\u0438
-sw=\u0441\u0432\u0430\u0445\u0438\u043b\u0438
-tr=\u0442\u0443\u0440\u0441\u043a\u0438
-uk=\u0443\u043a\u0440\u0430\u0458\u0438\u043d\u0441\u043a\u0438
-vi=\u0432\u0438\u0458\u0435\u0442\u043d\u0430\u043c\u0441\u043a\u0438
-yi=\u0458\u0438\u0434\u0438\u0448
-zh=\u043a\u0438\u043d\u0435\u0441\u043a\u0438
-AD=\u0410\u043d\u0434\u043e\u0440\u0430
-AE=\u0423\u0458\u0435\u0434\u0438\u045a\u0435\u043d\u0438 \u0410\u0440\u0430\u043f\u0441\u043a\u0438 \u0415\u043c\u0438\u0440\u0430\u0442\u0438
-AF=\u0410\u0432\u0433\u0430\u043d\u0438\u0441\u0442\u0430\u043d
-AL=\u0410\u043b\u0431\u0430\u043d\u0438\u0458\u0430
-AM=\u0408\u0435\u0440\u043c\u0435\u043d\u0438\u0458\u0430
-AN=\u0425\u043e\u043b\u0430\u043d\u0434\u0441\u043a\u0438 \u0410\u043d\u0442\u0438\u043b\u0438
-AO=\u0410\u043d\u0433\u043e\u043b\u0430
-AR=\u0410\u0440\u0433\u0435\u043d\u0442\u0438\u043d\u0430
-AT=\u0410\u0443\u0441\u0442\u0440\u0438\u0458\u0430
-AU=\u0410\u0443\u0441\u0442\u0440\u0430\u043b\u0438\u0458\u0430
-AW=\u0410\u0440\u0443\u0431\u0430
-AX=\u041e\u043b\u0430\u043d\u0434\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-AZ=\u0410\u0437\u0435\u0440\u0431\u0435\u0458\u045f\u0430\u043d
-BA=\u0411\u043e\u0441\u043d\u0430 \u0438 \u0425\u0435\u0440\u0446\u0435\u0433\u043e\u0432\u0438\u043d\u0430
-BB=\u0411\u0430\u0440\u0431\u0430\u0434\u043e\u0441
-BD=\u0411\u0430\u043d\u0433\u043b\u0430\u0434\u0435\u0448
-BE=\u0411\u0435\u043b\u0433\u0438\u0458\u0430
-BF=\u0411\u0443\u0440\u043a\u0438\u043d\u0430 \u0424\u0430\u0441\u043e
-BG=\u0411\u0443\u0433\u0430\u0440\u0441\u043a\u0430
-BH=\u0411\u0430\u0445\u0440\u0435\u0438\u043d
-BI=\u0411\u0443\u0440\u0443\u043d\u0434\u0438
-BJ=\u0411\u0435\u043d\u0438\u043d
-BM=\u0411\u0435\u0440\u043c\u0443\u0434\u0430
-BN=\u0411\u0440\u0443\u043d\u0435\u0458
-BO=\u0411\u043e\u043b\u0438\u0432\u0438\u0458\u0430
-BR=\u0411\u0440\u0430\u0437\u0438\u043b
-BS=\u0411\u0430\u0445\u0430\u043c\u0438
-BT=\u0411\u0443\u0442\u0430\u043d
-BV=\u041e\u0441\u0442\u0440\u0432\u043e \u0411\u0443\u0432\u0435
-BW=\u0411\u043e\u0446\u0432\u0430\u043d\u0430
-BY=\u0411\u0435\u043b\u043e\u0440\u0443\u0441\u0438\u0458\u0430
-BZ=\u0411\u0435\u043b\u0438\u0437\u0435
-CA=\u041a\u0430\u043d\u0430\u0434\u0430
-CC=\u041a\u043e\u043a\u043e\u0441\u043e\u0432\u0430 (\u041a\u0438\u043b\u0438\u043d\u0433\u043e\u0432\u0430) \u041e\u0441\u0442\u0440\u0432\u0430
-CD=\u041a\u043e\u043d\u0433\u043e - \u041a\u0438\u043d\u0448\u0430\u0441\u0430
-CF=\u0426\u0435\u043d\u0442\u0440\u0430\u043b\u043d\u043e\u0430\u0444\u0440\u0438\u0447\u043a\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430
-CG=\u041a\u043e\u043d\u0433\u043e - \u0411\u0440\u0430\u0437\u0430\u0432\u0438\u043b
-CH=\u0428\u0432\u0430\u0458\u0446\u0430\u0440\u0441\u043a\u0430
-CI=\u041e\u0431\u0430\u043b\u0430 \u0421\u043b\u043e\u043d\u043e\u0432\u0430\u0447\u0435 (\u041a\u043e\u0442 \u0434\u2019\u0418\u0432\u043e\u0430\u0440)
-CL=\u0427\u0438\u043b\u0435
-CM=\u041a\u0430\u043c\u0435\u0440\u0443\u043d
-CN=\u041a\u0438\u043d\u0430
-CO=\u041a\u043e\u043b\u0443\u043c\u0431\u0438\u0458\u0430
-CR=\u041a\u043e\u0441\u0442\u0430\u0440\u0438\u043a\u0430
-CS=\u0421\u0440\u0431\u0438\u0458\u0430 \u0438 \u0426\u0440\u043d\u0430 \u0413\u043e\u0440\u0430
-CU=\u041a\u0443\u0431\u0430
-CV=\u0417\u0435\u043b\u0435\u043d\u043e\u0440\u0442\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-CX=\u0411\u043e\u0436\u0438\u045b\u043d\u043e \u041e\u0441\u0442\u0440\u0432\u043e
-CY=\u041a\u0438\u043f\u0430\u0440
-CZ=\u0427\u0435\u0448\u043a\u0430
-DE=\u041d\u0435\u043c\u0430\u0447\u043a\u0430
-DJ=\u040f\u0438\u0431\u0443\u0442\u0438
-DK=\u0414\u0430\u043d\u0441\u043a\u0430
-DM=\u0414\u043e\u043c\u0438\u043d\u0438\u043a\u0430
-DO=\u0414\u043e\u043c\u0438\u043d\u0438\u043a\u0430\u043d\u0441\u043a\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430
-DZ=\u0410\u043b\u0436\u0438\u0440
-EC=\u0415\u043a\u0432\u0430\u0434\u043e\u0440
-EE=\u0415\u0441\u0442\u043e\u043d\u0438\u0458\u0430
-EG=\u0415\u0433\u0438\u043f\u0430\u0442
-EH=\u0417\u0430\u043f\u0430\u0434\u043d\u0430 \u0421\u0430\u0445\u0430\u0440\u0430
-ER=\u0415\u0440\u0438\u0442\u0440\u0435\u0458\u0430
-ES=\u0428\u043f\u0430\u043d\u0438\u0458\u0430
-ET=\u0415\u0442\u0438\u043e\u043f\u0438\u0458\u0430
-FI=\u0424\u0438\u043d\u0441\u043a\u0430
-FJ=\u0424\u0438\u045f\u0438
-FK=\u0424\u043e\u043a\u043b\u0430\u043d\u0434\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-FM=\u041c\u0438\u043a\u0440\u043e\u043d\u0435\u0437\u0438\u0458\u0430
-FO=\u0424\u0430\u0440\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-FR=\u0424\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0430
-GA=\u0413\u0430\u0431\u043e\u043d
-GB=\u0423\u0458\u0435\u0434\u0438\u045a\u0435\u043d\u043e \u041a\u0440\u0430\u0459\u0435\u0432\u0441\u0442\u0432\u043e
-GD=\u0413\u0440\u0435\u043d\u0430\u0434\u0430
-GE=\u0413\u0440\u0443\u0437\u0438\u0458\u0430
-GF=\u0424\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0430 \u0413\u0432\u0430\u0458\u0430\u043d\u0430
-GH=\u0413\u0430\u043d\u0430
-GI=\u0413\u0438\u0431\u0440\u0430\u043b\u0442\u0430\u0440
-GL=\u0413\u0440\u0435\u043d\u043b\u0430\u043d\u0434
-GM=\u0413\u0430\u043c\u0431\u0438\u0458\u0430
-GN=\u0413\u0432\u0438\u043d\u0435\u0458\u0430
-GP=\u0413\u0432\u0430\u0434\u0435\u043b\u0443\u043f
-GQ=\u0415\u043a\u0432\u0430\u0442\u043e\u0440\u0438\u0458\u0430\u043b\u043d\u0430 \u0413\u0432\u0438\u043d\u0435\u0458\u0430
-GR=\u0413\u0440\u0447\u043a\u0430
-GS=\u0408\u0443\u0436\u043d\u0430 \u040f\u043e\u0440\u045f\u0438\u0458\u0430 \u0438 \u0408\u0443\u0436\u043d\u0430 \u0421\u0435\u043d\u0434\u0432\u0438\u0447\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-GT=\u0413\u0432\u0430\u0442\u0435\u043c\u0430\u043b\u0430
-GU=\u0413\u0443\u0430\u043c
-GW=\u0413\u0432\u0438\u043d\u0435\u0458\u0430-\u0411\u0438\u0441\u0430\u043e
-GY=\u0413\u0432\u0430\u0458\u0430\u043d\u0430
-HK=\u0421\u0410\u0420 \u0425\u043e\u043d\u0433\u043a\u043e\u043d\u0433 (\u041a\u0438\u043d\u0430)
-HM=\u041e\u0441\u0442\u0440\u0432\u043e \u0425\u0435\u0440\u0434 \u0438 \u041c\u0435\u043a\u0434\u043e\u043d\u0430\u043b\u0434\u043e\u0432\u0430 \u043e\u0441\u0442\u0440\u0432\u0430
-HN=\u0425\u043e\u043d\u0434\u0443\u0440\u0430\u0441
-HR=\u0425\u0440\u0432\u0430\u0442\u0441\u043a\u0430
-HT=\u0425\u0430\u0438\u0442\u0438
-HU=\u041c\u0430\u0452\u0430\u0440\u0441\u043a\u0430
-ID=\u0418\u043d\u0434\u043e\u043d\u0435\u0437\u0438\u0458\u0430
-IE=\u0418\u0440\u0441\u043a\u0430
-IL=\u0418\u0437\u0440\u0430\u0435\u043b
-IN=\u0418\u043d\u0434\u0438\u0458\u0430
-IQ=\u0418\u0440\u0430\u043a
-IR=\u0418\u0440\u0430\u043d
-IS=\u0418\u0441\u043b\u0430\u043d\u0434
-IT=\u0418\u0442\u0430\u043b\u0438\u0458\u0430
-JM=\u0408\u0430\u043c\u0430\u0458\u043a\u0430
-JO=\u0408\u043e\u0440\u0434\u0430\u043d
-JP=\u0408\u0430\u043f\u0430\u043d
-KE=\u041a\u0435\u043d\u0438\u0458\u0430
-KG=\u041a\u0438\u0440\u0433\u0438\u0441\u0442\u0430\u043d
-KH=\u041a\u0430\u043c\u0431\u043e\u045f\u0430
-KI=\u041a\u0438\u0440\u0438\u0431\u0430\u0442\u0438
-KM=\u041a\u043e\u043c\u043e\u0440\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-KN=\u0421\u0435\u043d\u0442 \u041a\u0438\u0442\u0441 \u0438 \u041d\u0435\u0432\u0438\u0441
-KP=\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041a\u043e\u0440\u0435\u0458\u0430
-KR=\u0408\u0443\u0436\u043d\u0430 \u041a\u043e\u0440\u0435\u0458\u0430
-KW=\u041a\u0443\u0432\u0430\u0458\u0442
-KY=\u041a\u0430\u0458\u043c\u0430\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-KZ=\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d
-LA=\u041b\u0430\u043e\u0441
-LB=\u041b\u0438\u0431\u0430\u043d
-LC=\u0421\u0432\u0435\u0442\u0430 \u041b\u0443\u0446\u0438\u0458\u0430
-LI=\u041b\u0438\u0445\u0442\u0435\u043d\u0448\u0442\u0430\u0458\u043d
-LK=\u0428\u0440\u0438 \u041b\u0430\u043d\u043a\u0430
-LR=\u041b\u0438\u0431\u0435\u0440\u0438\u0458\u0430
-LS=\u041b\u0435\u0441\u043e\u0442\u043e
-LT=\u041b\u0438\u0442\u0432\u0430\u043d\u0438\u0458\u0430
-LU=\u041b\u0443\u043a\u0441\u0435\u043c\u0431\u0443\u0440\u0433
-LV=\u041b\u0435\u0442\u043e\u043d\u0438\u0458\u0430
-LY=\u041b\u0438\u0431\u0438\u0458\u0430
-MA=\u041c\u0430\u0440\u043e\u043a\u043e
-MC=\u041c\u043e\u043d\u0430\u043a\u043e
-MD=\u041c\u043e\u043b\u0434\u0430\u0432\u0438\u0458\u0430
-MG=\u041c\u0430\u0434\u0430\u0433\u0430\u0441\u043a\u0430\u0440
-MH=\u041c\u0430\u0440\u0448\u0430\u043b\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-MK=\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0438\u0458\u0430
-ML=\u041c\u0430\u043b\u0438
-MM=\u041c\u0438\u0458\u0430\u043d\u043c\u0430\u0440 (\u0411\u0443\u0440\u043c\u0430)
-MN=\u041c\u043e\u043d\u0433\u043e\u043b\u0438\u0458\u0430
-MO=\u0421\u0410\u0420 \u041c\u0430\u043a\u0430\u043e (\u041a\u0438\u043d\u0430)
-MP=\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041c\u0430\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-MQ=\u041c\u0430\u0440\u0442\u0438\u043d\u0438\u043a
-MR=\u041c\u0430\u0443\u0440\u0438\u0442\u0430\u043d\u0438\u0458\u0430
-MS=\u041c\u043e\u043d\u0441\u0435\u0440\u0430\u0442
-MT=\u041c\u0430\u043b\u0442\u0430
-MU=\u041c\u0430\u0443\u0440\u0438\u0446\u0438\u0458\u0443\u0441
-MV=\u041c\u0430\u043b\u0434\u0438\u0432\u0438
-MW=\u041c\u0430\u043b\u0430\u0432\u0438
-MX=\u041c\u0435\u043a\u0441\u0438\u043a\u043e
-MY=\u041c\u0430\u043b\u0435\u0437\u0438\u0458\u0430
-MZ=\u041c\u043e\u0437\u0430\u043c\u0431\u0438\u043a
-NA=\u041d\u0430\u043c\u0438\u0431\u0438\u0458\u0430
-NC=\u041d\u043e\u0432\u0430 \u041a\u0430\u043b\u0435\u0434\u043e\u043d\u0438\u0458\u0430
-NE=\u041d\u0438\u0433\u0435\u0440
-NF=\u041e\u0441\u0442\u0440\u0432\u043e \u041d\u043e\u0440\u0444\u043e\u043a
-NG=\u041d\u0438\u0433\u0435\u0440\u0438\u0458\u0430
-NI=\u041d\u0438\u043a\u0430\u0440\u0430\u0433\u0432\u0430
-NL=\u0425\u043e\u043b\u0430\u043d\u0434\u0438\u0458\u0430
-NO=\u041d\u043e\u0440\u0432\u0435\u0448\u043a\u0430
-NP=\u041d\u0435\u043f\u0430\u043b
-NR=\u041d\u0430\u0443\u0440\u0443
-NU=\u041d\u0438\u0443\u0435
-NZ=\u041d\u043e\u0432\u0438 \u0417\u0435\u043b\u0430\u043d\u0434
-OM=\u041e\u043c\u0430\u043d
-PA=\u041f\u0430\u043d\u0430\u043c\u0430
-PE=\u041f\u0435\u0440\u0443
-PF=\u0424\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0430 \u041f\u043e\u043b\u0438\u043d\u0435\u0437\u0438\u0458\u0430
-PG=\u041f\u0430\u043f\u0443\u0430 \u041d\u043e\u0432\u0430 \u0413\u0432\u0438\u043d\u0435\u0458\u0430
-PH=\u0424\u0438\u043b\u0438\u043f\u0438\u043d\u0438
-PK=\u041f\u0430\u043a\u0438\u0441\u0442\u0430\u043d
-PL=\u041f\u043e\u0459\u0441\u043a\u0430
-PM=\u0421\u0435\u043d \u041f\u0458\u0435\u0440 \u0438 \u041c\u0438\u043a\u0435\u043b\u043e\u043d
-PN=\u041f\u0438\u0442\u043a\u0435\u0440\u043d
-PR=\u041f\u043e\u0440\u0442\u043e\u0440\u0438\u043a\u043e
-PS=\u041f\u0430\u043b\u0435\u0441\u0442\u0438\u043d\u0441\u043a\u0435 \u0442\u0435\u0440\u0438\u0442\u043e\u0440\u0438\u0458\u0435
-PT=\u041f\u043e\u0440\u0442\u0443\u0433\u0430\u043b\u0438\u0458\u0430
-PW=\u041f\u0430\u043b\u0430\u0443
-PY=\u041f\u0430\u0440\u0430\u0433\u0432\u0430\u0458
-QA=\u041a\u0430\u0442\u0430\u0440
-RE=\u0420\u0435\u0438\u043d\u0438\u043e\u043d
-RO=\u0420\u0443\u043c\u0443\u043d\u0438\u0458\u0430
-RU=\u0420\u0443\u0441\u0438\u0458\u0430
-RW=\u0420\u0443\u0430\u043d\u0434\u0430
-SA=\u0421\u0430\u0443\u0434\u0438\u0458\u0441\u043a\u0430 \u0410\u0440\u0430\u0431\u0438\u0458\u0430
-SB=\u0421\u043e\u043b\u043e\u043c\u043e\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-SC=\u0421\u0435\u0458\u0448\u0435\u043b\u0438
-SD=\u0421\u0443\u0434\u0430\u043d
-SE=\u0428\u0432\u0435\u0434\u0441\u043a\u0430
-SG=\u0421\u0438\u043d\u0433\u0430\u043f\u0443\u0440
-SH=\u0421\u0432\u0435\u0442\u0430 \u0408\u0435\u043b\u0435\u043d\u0430
-SI=\u0421\u043b\u043e\u0432\u0435\u043d\u0438\u0458\u0430
-SJ=\u0421\u0432\u0430\u043b\u0431\u0430\u0440\u0434 \u0438 \u0408\u0430\u043d \u041c\u0430\u0458\u0435\u043d
-SK=\u0421\u043b\u043e\u0432\u0430\u0447\u043a\u0430
-SL=\u0421\u0438\u0458\u0435\u0440\u0430 \u041b\u0435\u043e\u043d\u0435
-SM=\u0421\u0430\u043d \u041c\u0430\u0440\u0438\u043d\u043e
-SN=\u0421\u0435\u043d\u0435\u0433\u0430\u043b
-SO=\u0421\u043e\u043c\u0430\u043b\u0438\u0458\u0430
-SR=\u0421\u0443\u0440\u0438\u043d\u0430\u043c
-ST=\u0421\u0430\u043e \u0422\u043e\u043c\u0435 \u0438 \u041f\u0440\u0438\u043d\u0446\u0438\u043f\u0435
-SV=\u0421\u0430\u043b\u0432\u0430\u0434\u043e\u0440
-SY=\u0421\u0438\u0440\u0438\u0458\u0430
-SZ=\u0421\u0432\u0430\u0437\u0438\u043b\u0435\u043d\u0434
-TC=\u041e\u0441\u0442\u0440\u0432\u0430 \u0422\u0443\u0440\u043a\u0441 \u0438 \u041a\u0430\u0438\u043a\u043e\u0441
-TD=\u0427\u0430\u0434
-TF=\u0424\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0435 \u0408\u0443\u0436\u043d\u0435 \u0422\u0435\u0440\u0438\u0442\u043e\u0440\u0438\u0458\u0435
-TG=\u0422\u043e\u0433\u043e
-TH=\u0422\u0430\u0458\u043b\u0430\u043d\u0434
-TJ=\u0422\u0430\u045f\u0438\u043a\u0438\u0441\u0442\u0430\u043d
-TK=\u0422\u043e\u043a\u0435\u043b\u0430\u0443
-TL=\u0422\u0438\u043c\u043e\u0440-\u041b\u0435\u0441\u0442\u0435 (\u0418\u0441\u0442\u043e\u0447\u043d\u0438 \u0422\u0438\u043c\u043e\u0440)
-TM=\u0422\u0443\u0440\u043a\u043c\u0435\u043d\u0438\u0441\u0442\u0430\u043d
-TN=\u0422\u0443\u043d\u0438\u0441
-TO=\u0422\u043e\u043d\u0433\u0430
-TR=\u0422\u0443\u0440\u0441\u043a\u0430
-TT=\u0422\u0440\u0438\u043d\u0438\u0434\u0430\u0434 \u0438 \u0422\u043e\u0431\u0430\u0433\u043e
-TV=\u0422\u0443\u0432\u0430\u043b\u0443
-TW=\u0422\u0430\u0458\u0432\u0430\u043d
-TZ=\u0422\u0430\u043d\u0437\u0430\u043d\u0438\u0458\u0430
-UA=\u0423\u043a\u0440\u0430\u0458\u0438\u043d\u0430
-UG=\u0423\u0433\u0430\u043d\u0434\u0430
-UM=\u0423\u0434\u0430\u0459\u0435\u043d\u0430 \u043e\u0441\u0442\u0440\u0432\u0430 \u0421\u0410\u0414
-US=\u0421\u0458\u0435\u0434\u0438\u045a\u0435\u043d\u0435 \u0414\u0440\u0436\u0430\u0432\u0435
-UY=\u0423\u0440\u0443\u0433\u0432\u0430\u0458
-UZ=\u0423\u0437\u0431\u0435\u043a\u0438\u0441\u0442\u0430\u043d
-VA=\u0412\u0430\u0442\u0438\u043a\u0430\u043d
-VC=\u0421\u0435\u043d\u0442 \u0412\u0438\u043d\u0441\u0435\u043d\u0442 \u0438 \u0413\u0440\u0435\u043d\u0430\u0434\u0438\u043d\u0438
-VE=\u0412\u0435\u043d\u0435\u0446\u0443\u0435\u043b\u0430
-VG=\u0411\u0440\u0438\u0442\u0430\u043d\u0441\u043a\u0430 \u0414\u0435\u0432\u0438\u0447\u0430\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-VI=\u0410\u043c\u0435\u0440\u0438\u0447\u043a\u0430 \u0414\u0435\u0432\u0438\u0447\u0430\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-VN=\u0412\u0438\u0458\u0435\u0442\u043d\u0430\u043c
-VU=\u0412\u0430\u043d\u0443\u0430\u0442\u0443
-WF=\u0412\u0430\u043b\u0438\u0441 \u0438 \u0424\u0443\u0442\u0443\u043d\u0430
-WS=\u0421\u0430\u043c\u043e\u0430
-YE=\u0408\u0435\u043c\u0435\u043d
-YT=\u041c\u0430\u0458\u043e\u0442
-ZA=\u0408\u0443\u0436\u043d\u043e\u0430\u0444\u0440\u0438\u0447\u043a\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430
-ZM=\u0417\u0430\u043c\u0431\u0438\u0458\u0430
-ZW=\u0417\u0438\u043c\u0431\u0430\u0431\u0432\u0435
+af=африканс
+ar=арапски
+be=белоруски
+bg=бугарски
+br=бретонски
+ca=каталонски
+co=корзикански
+cs=чешки
+da=дански
+de=немачки
+el=грчки
+en=енглески
+eo=есперанто
+es=шпански
+et=естонски
+eu=баскијски
+fa=персијски
+fi=фински
+fr=француски
+ga=ирски
+he=хебрејски
+hi=хинди
+hr=хрватски
+hu=мађарски
+hy=јерменски
+id=индонежански
+in=индонежански
+is=исландски
+it=италијански
+iw=хебрејски
+ja=јапански
+ji=јидиш
+ka=грузијски
+km=кмерски
+ko=корејски
+ku=курдски
+ky=киргиски
+la=латински
+lt=литвански
+lv=летонски
+mk=македонски
+mn=монголски
+mo=Молдавски
+my=бурмански
+nl=холандски
+no=норвешки
+pl=пољски
+pt=португалски
+rm=романш
+ro=румунски
+ru=руски
+sa=санскрит
+sk=словачки
+sl=словеначки
+sq=албански
+sr=српски
+sv=шведски
+sw=свахили
+tr=турски
+uk=украјински
+vi=вијетнамски
+yi=јидиш
+zh=кинески
+AD=Андора
+AE=Уједињени Арапски Емирати
+AF=Авганистан
+AL=Албанија
+AM=Јерменија
+AN=Холандски Антили
+AO=Ангола
+AR=Аргентина
+AT=Аустрија
+AU=Аустралија
+AW=Аруба
+AX=Оландска Острва
+AZ=Азербејџан
+BA=Босна и Херцеговина
+BB=Барбадос
+BD=Бангладеш
+BE=Белгија
+BF=Буркина Фасо
+BG=Бугарска
+BH=Бахреин
+BI=Бурунди
+BJ=Бенин
+BM=Бермуда
+BN=Брунеј
+BO=Боливија
+BR=Бразил
+BS=Бахами
+BT=Бутан
+BV=Острво Буве
+BW=Боцвана
+BY=Белорусија
+BZ=Белизе
+CA=Канада
+CC=Кокосова (Килингова) Острва
+CD=Конго - Киншаса
+CF=Централноафричка Република
+CG=Конго - Бразавил
+CH=Швајцарска
+CI=Обала Слоноваче (Кот д’Ивоар)
+CL=Чиле
+CM=Камерун
+CN=Кина
+CO=Колумбија
+CR=Костарика
+CS=Србија и Црна Гора
+CU=Куба
+CV=Зеленортска Острва
+CX=Божићно Острво
+CY=Кипар
+CZ=Чешка
+DE=Немачка
+DJ=Џибути
+DK=Данска
+DM=Доминика
+DO=Доминиканска Република
+DZ=Алжир
+EC=Еквадор
+EE=Естонија
+EG=Египат
+EH=Западна Сахара
+ER=Еритреја
+ES=Шпанија
+ET=Етиопија
+FI=Финска
+FJ=Фиџи
+FK=Фокландска Острва
+FM=Микронезија
+FO=Фарска Острва
+FR=Француска
+GA=Габон
+GB=Уједињено Краљевство
+GD=Гренада
+GE=Грузија
+GF=Француска Гвајана
+GH=Гана
+GI=Гибралтар
+GL=Гренланд
+GM=Гамбија
+GN=Гвинеја
+GP=Гваделуп
+GQ=Екваторијална Гвинеја
+GR=Грчка
+GS=Јужна Џорџија и Јужна Сендвичка Острва
+GT=Гватемала
+GU=Гуам
+GW=Гвинеја-Бисао
+GY=Гвајана
+HK=САР Хонгконг (Кина)
+HM=Острво Херд и Мекдоналдова острва
+HN=Хондурас
+HR=Хрватска
+HT=Хаити
+HU=Мађарска
+ID=Индонезија
+IE=Ирска
+IL=Израел
+IN=Индија
+IQ=Ирак
+IR=Иран
+IS=Исланд
+IT=Италија
+JM=Јамајка
+JO=Јордан
+JP=Јапан
+KE=Кенија
+KG=Киргистан
+KH=Камбоџа
+KI=Кирибати
+KM=Коморска Острва
+KN=Сент Китс и Невис
+KP=Северна Кореја
+KR=Јужна Кореја
+KW=Кувајт
+KY=Кајманска Острва
+KZ=Казахстан
+LA=Лаос
+LB=Либан
+LC=Света Луција
+LI=Лихтенштајн
+LK=Шри Ланка
+LR=Либерија
+LS=Лесото
+LT=Литванија
+LU=Луксембург
+LV=Летонија
+LY=Либија
+MA=Мароко
+MC=Монако
+MD=Молдавија
+MG=Мадагаскар
+MH=Маршалска Острва
+MK=Северна Македонија
+ML=Мали
+MM=Мијанмар (Бурма)
+MN=Монголија
+MO=САР Макао (Кина)
+MP=Северна Маријанска Острва
+MQ=Мартиник
+MR=Мауританија
+MS=Монсерат
+MT=Малта
+MU=Маурицијус
+MV=Малдиви
+MW=Малави
+MX=Мексико
+MY=Малезија
+MZ=Мозамбик
+NA=Намибија
+NC=Нова Каледонија
+NE=Нигер
+NF=Острво Норфок
+NG=Нигерија
+NI=Никарагва
+NL=Холандија
+NO=Норвешка
+NP=Непал
+NR=Науру
+NU=Ниуе
+NZ=Нови Зеланд
+OM=Оман
+PA=Панама
+PE=Перу
+PF=Француска Полинезија
+PG=Папуа Нова Гвинеја
+PH=Филипини
+PK=Пакистан
+PL=Пољска
+PM=Сен Пјер и Микелон
+PN=Питкерн
+PR=Порторико
+PS=Палестинске територије
+PT=Португалија
+PW=Палау
+PY=Парагвај
+QA=Катар
+RE=Реинион
+RO=Румунија
+RU=Русија
+RW=Руанда
+SA=Саудијска Арабија
+SB=Соломонска Острва
+SC=Сејшели
+SD=Судан
+SE=Шведска
+SG=Сингапур
+SH=Света Јелена
+SI=Словенија
+SJ=Свалбард и Јан Мајен
+SK=Словачка
+SL=Сијера Леоне
+SM=Сан Марино
+SN=Сенегал
+SO=Сомалија
+SR=Суринам
+ST=Сао Томе и Принципе
+SV=Салвадор
+SY=Сирија
+SZ=Свазиленд
+TC=Острва Туркс и Каикос
+TD=Чад
+TF=Француске Јужне Територије
+TG=Того
+TH=Тајланд
+TJ=Таџикистан
+TK=Токелау
+TL=Тимор-Лесте (Источни Тимор)
+TM=Туркменистан
+TN=Тунис
+TO=Тонга
+TR=Турска
+TT=Тринидад и Тобаго
+TV=Тувалу
+TW=Тајван
+TZ=Танзанија
+UA=Украјина
+UG=Уганда
+UM=Удаљена острва САД
+US=Сједињене Државе
+UY=Уругвај
+UZ=Узбекистан
+VA=Ватикан
+VC=Сент Винсент и Гренадини
+VE=Венецуела
+VG=Британска Девичанска Острва
+VI=Америчка Девичанска Острва
+VN=Вијетнам
+VU=Вануату
+WF=Валис и Футуна
+WS=Самоа
+YE=Јемен
+YT=Мајот
+ZA=Јужноафричка Република
+ZM=Замбија
+ZW=Зимбабве
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr_Latn.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr_Latn.properties
index 65c9b088e76..9f5ff1b34af 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr_Latn.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sr_Latn.properties
@@ -73,8 +73,8 @@ ar=arapski
 as=asamski
 av=avarski
 ay=ajmara
-az=azerbejd\u017eanski
-ba=ba\u0161kirski
+az=azerbejdžanski
+ba=baškirski
 be=beloruski
 bg=bugarski
 bh=Biharski
@@ -83,76 +83,76 @@ bo=tibetanski
 br=bretonski
 bs=bosanski
 ca=katalonski
-ce=\u010de\u010denski
-ch=\u010damoro
+ce=čečenski
+ch=čamoro
 co=korzikanski
 cr=kri
-cs=\u010de\u0161ki
+cs=češki
 cu=crkvenoslovenski
-cv=\u010duva\u0161ki
-cy=vel\u0161ki
+cv=čuvaški
+cy=velški
 da=danski
-de=nema\u010dki
+de=nemački
 dv=maldivski
-dz=d\u017eonga
+dz=džonga
 ee=eve
-el=gr\u010dki
+el=grčki
 en=engleski
 eo=esperanto
-es=\u0161panski
+es=španski
 et=estonski
 eu=baskijski
 fa=persijski
 fi=finski
-fj=fid\u017eijski
+fj=fidžijski
 fo=farski
 fr=francuski
 fy=zapadni frizijski
 ga=irski
-gd=\u0161kotski gelski
+gd=škotski gelski
 gl=galicijski
 gn=gvarani
-gu=gud\u017earati
+gu=gudžarati
 gv=manks
 he=hebrejski
 hi=hindi
 hr=hrvatski
-ht=hai\u0107anski
-hu=ma\u0111arski
+ht=haićanski
+hu=mađarski
 hy=jermenski
 ia=interlingva
-id=indone\u017eanski
+id=indonežanski
 ie=interlingve
-ii=se\u010duanski ji
+ii=sečuanski ji
 ik=inupik
-in=indone\u017eanski
+in=indonežanski
 is=islandski
 it=italijanski
 iw=hebrejski
 ja=japanski
-ji=jidi\u0161
+ji=jidiš
 jv=javanski
 ka=gruzijski
 ki=kikuju
 kj=kvanjama
-kk=kaza\u0161ki
+kk=kazaški
 kl=grenlandski
 km=kmerski
 kn=kanada
 ko=korejski
-ks=ka\u0161mirski
+ks=kašmirski
 ku=kurdski
 kw=kornvolski
 ky=kirgiski
 la=latinski
-lb=luksembur\u0161ki
-li=limbur\u0161ki
+lb=luksemburški
+li=limburški
 lo=laoski
 lt=litvanski
 lu=luba-katanga
 lv=letonski
-mg=malga\u0161ki
-mh=mar\u0161alski
+mg=malgaški
+mh=maršalski
 mi=maorski
 mk=makedonski
 ml=malajalam
@@ -160,27 +160,27 @@ mn=mongolski
 mo=Moldavski
 mr=marati
 ms=malajski
-mt=malte\u0161ki
+mt=malteški
 my=burmanski
-nb=norve\u0161ki bukmol
+nb=norveški bukmol
 nd=severni ndebele
 ne=nepalski
 nl=holandski
-nn=norve\u0161ki ninorsk
-no=norve\u0161ki
-nr=ju\u017eni ndebele
+nn=norveški ninorsk
+no=norveški
+nr=južni ndebele
 nv=navaho
-ny=njand\u017ea
+ny=njandža
 oc=oksitanski
-oj=od\u017eibve
+oj=odžibve
 or=odija
 os=osetinski
-pa=pend\u017eapski
+pa=pendžapski
 pl=poljski
-ps=pa\u0161tunski
+ps=paštunski
 pt=portugalski
-qu=ke\u010dua
-rm=roman\u0161
+qu=kečua
+rm=romanš
 ro=rumunski
 ru=ruski
 rw=kinjaruanda
@@ -188,21 +188,21 @@ sa=sanskrit
 sc=sardinski
 sd=sindi
 se=severni sami
-si=sinhale\u0161ki
-sk=slova\u010dki
-sl=slovena\u010dki
+si=sinhaleški
+sk=slovački
+sl=slovenački
 sm=samoanski
-sn=\u0161ona
+sn=šona
 so=somalski
 sq=albanski
 sr=srpski
 ss=svazi
 st=sesoto
 su=sundanski
-sv=\u0161vedski
+sv=švedski
 sw=svahili
 ta=tamilski
-tg=tad\u017ei\u010dki
+tg=tadžički
 th=tajski
 ti=tigrinja
 tk=turkmenski
@@ -211,17 +211,17 @@ tn=cvana
 tr=turski
 tt=tatarski
 tw=tvi
-ty=tahi\u0107anski
+ty=tahićanski
 ug=ujgurski
 uk=ukrajinski
-uz=uzbe\u010dki
+uz=uzbečki
 vi=vijetnamski
 wa=valonski
 wo=volof
 xh=kosa
-yi=jidi\u0161
+yi=jidiš
 yo=joruba
-za=d\u017euan\u0161ki
+za=džuanški
 zh=kineski
 AD=Andora
 AE=Ujedinjeni Arapski Emirati
@@ -234,15 +234,15 @@ AN=Holandski Antili
 AO=Angola
 AQ=Antarktik
 AR=Argentina
-AS=Ameri\u010dka Samoa
+AS=Američka Samoa
 AT=Austrija
 AU=Australija
 AW=Aruba
 AX=Olandska Ostrva
-AZ=Azerbejd\u017ean
+AZ=Azerbejdžan
 BA=Bosna i Hercegovina
 BB=Barbados
-BD=Banglade\u0161
+BD=Bangladeš
 BE=Belgija
 BF=Burkina Faso
 BG=Bugarska
@@ -262,37 +262,37 @@ BY=Belorusija
 BZ=Belize
 CA=Kanada
 CC=Kokosova (Kilingova) Ostrva
-CD=Kongo - Kin\u0161asa
-CF=Centralnoafri\u010dka Republika
+CD=Kongo - Kinšasa
+CF=Centralnoafrička Republika
 CG=Kongo - Brazavil
-CH=\u0160vajcarska
-CI=Obala Slonova\u010de (Kot d\u2019Ivoar)
+CH=Švajcarska
+CI=Obala Slonovače (Kot d’Ivoar)
 CK=Kukova Ostrva
-CL=\u010cile
+CL=Čile
 CM=Kamerun
 CN=Kina
 CO=Kolumbija
 CR=Kostarika
 CU=Kuba
 CV=Zelenortska Ostrva
-CX=Bo\u017ei\u0107no Ostrvo
+CX=Božićno Ostrvo
 CY=Kipar
-CZ=\u010ce\u0161ka
-DE=Nema\u010dka
-DJ=D\u017eibuti
+CZ=Češka
+DE=Nemačka
+DJ=Džibuti
 DK=Danska
 DM=Dominika
 DO=Dominikanska Republika
-DZ=Al\u017eir
+DZ=Alžir
 EC=Ekvador
 EE=Estonija
 EG=Egipat
 EH=Zapadna Sahara
 ER=Eritreja
-ES=\u0160panija
+ES=Španija
 ET=Etiopija
 FI=Finska
-FJ=Fid\u017ei
+FJ=Fidži
 FK=Foklandska Ostrva
 FM=Mikronezija
 FO=Farska Ostrva
@@ -310,8 +310,8 @@ GM=Gambija
 GN=Gvineja
 GP=Gvadelup
 GQ=Ekvatorijalna Gvineja
-GR=Gr\u010dka
-GS=Ju\u017ena D\u017eord\u017eija i Ju\u017ena Sendvi\u010dka Ostrva
+GR=Grčka
+GS=Južna Džordžija i Južna Sendvička Ostrva
 GT=Gvatemala
 GU=Guam
 GW=Gvineja-Bisao
@@ -321,7 +321,7 @@ HM=Ostrvo Herd i Mekdonaldova ostrva
 HN=Honduras
 HR=Hrvatska
 HT=Haiti
-HU=Ma\u0111arska
+HU=Mađarska
 ID=Indonezija
 IE=Irska
 IL=Izrael
@@ -332,26 +332,26 @@ IQ=Irak
 IR=Iran
 IS=Island
 IT=Italija
-JE=D\u017eerzi
+JE=Džerzi
 JM=Jamajka
 JO=Jordan
 JP=Japan
 KE=Kenija
 KG=Kirgistan
-KH=Kambod\u017ea
+KH=Kambodža
 KI=Kiribati
 KM=Komorska Ostrva
 KN=Sent Kits i Nevis
 KP=Severna Koreja
-KR=Ju\u017ena Koreja
+KR=Južna Koreja
 KW=Kuvajt
 KY=Kajmanska Ostrva
 KZ=Kazahstan
 LA=Laos
 LB=Liban
 LC=Sveta Lucija
-LI=Lihten\u0161tajn
-LK=\u0160ri Lanka
+LI=Lihtenštajn
+LK=Šri Lanka
 LR=Liberija
 LS=Lesoto
 LT=Litvanija
@@ -364,7 +364,7 @@ MD=Moldavija
 ME=Crna Gora
 MF=Sveti Martin (Francuska)
 MG=Madagaskar
-MH=Mar\u0161alska Ostrva
+MH=Maršalska Ostrva
 MK=Severna Makedonija
 ML=Mali
 MM=Mijanmar (Burma)
@@ -388,7 +388,7 @@ NF=Ostrvo Norfok
 NG=Nigerija
 NI=Nikaragva
 NL=Holandija
-NO=Norve\u0161ka
+NO=Norveška
 NP=Nepal
 NR=Nauru
 NU=Niue
@@ -416,14 +416,14 @@ RU=Rusija
 RW=Ruanda
 SA=Saudijska Arabija
 SB=Solomonska Ostrva
-SC=Sej\u0161eli
+SC=Sejšeli
 SD=Sudan
-SE=\u0160vedska
+SE=Švedska
 SG=Singapur
 SH=Sveta Jelena
 SI=Slovenija
 SJ=Svalbard i Jan Majen
-SK=Slova\u010dka
+SK=Slovačka
 SL=Sijera Leone
 SM=San Marino
 SN=Senegal
@@ -434,13 +434,13 @@ SV=Salvador
 SY=Sirija
 SZ=Svazilend
 TC=Ostrva Turks i Kaikos
-TD=\u010cad
-TF=Francuske Ju\u017ene Teritorije
+TD=Čad
+TF=Francuske Južne Teritorije
 TG=Togo
 TH=Tajland
-TJ=Tad\u017eikistan
+TJ=Tadžikistan
 TK=Tokelau
-TL=Timor-Leste (Isto\u010dni Timor)
+TL=Timor-Leste (Istočni Timor)
 TM=Turkmenistan
 TN=Tunis
 TO=Tonga
@@ -452,20 +452,20 @@ TZ=Tanzanija
 UA=Ukrajina
 UG=Uganda
 UM=Udaljena ostrva SAD
-US=Sjedinjene Dr\u017eave
+US=Sjedinjene Države
 UY=Urugvaj
 UZ=Uzbekistan
 VA=Vatikan
 VC=Sent Vinsent i Grenadini
 VE=Venecuela
-VG=Britanska Devi\u010danska Ostrva
-VI=Ameri\u010dka Devi\u010danska Ostrva
+VG=Britanska Devičanska Ostrva
+VI=Američka Devičanska Ostrva
 VN=Vijetnam
 VU=Vanuatu
 WF=Valis i Futuna
 WS=Samoa
 YE=Jemen
 YT=Majot
-ZA=Ju\u017enoafri\u010dka Republika
+ZA=Južnoafrička Republika
 ZM=Zambija
 ZW=Zimbabve
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sv.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sv.properties
index bbca033f2e9..cc201fdbe3f 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sv.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_sv.properties
@@ -84,13 +84,13 @@ fa=persiska
 ff=fulani
 fi=finska
 fj=fijianska
-fo=f\u00e4r\u00f6iska
+fo=färöiska
 fr=franska
-fy=v\u00e4stfrisiska
+fy=västfrisiska
 ga=iriska
-gd=skotsk g\u00e4liska
+gd=skotsk gäliska
 gl=galiciska
-gn=guaran\u00ed
+gn=guaraní
 gu=gujarati
 gv=manx
 ha=hausa
@@ -110,7 +110,7 @@ ii=szezuan i
 ik=inupiak
 in=indonesiska
 io=ido
-is=isl\u00e4ndska
+is=isländska
 it=italienska
 iu=inuktitut
 iw=hebreiska
@@ -122,7 +122,7 @@ kg=kikongo
 ki=kikuyu
 kj=kuanyama
 kk=kazakiska
-kl=gr\u00f6nl\u00e4ndska
+kl=grönländska
 km=kambodjanska
 kn=kannada
 ko=koreanska
@@ -153,11 +153,11 @@ ms=malajiska
 mt=maltesiska
 my=burmesiska
 na=nauruanska
-nb=norskt bokm\u00e5l
+nb=norskt bokmål
 nd=nordndebele
 ne=nepalesiska
 ng=ndonga
-nl=nederl\u00e4ndska
+nl=nederländska
 nn=nynorska
 no=norska
 nr=sydndebele
@@ -174,9 +174,9 @@ pl=polska
 ps=afghanska
 pt=portugisiska
 qu=quechua
-rm=r\u00e4toromanska
+rm=rätoromanska
 rn=rundi
-ro=rum\u00e4nska
+ro=rumänska
 ru=ryska
 rw=kinjarwanda
 sa=sanskrit
@@ -200,7 +200,7 @@ sw=swahili
 ta=tamil
 te=telugu
 tg=tadzjikiska
-th=thail\u00e4ndska
+th=thailändska
 ti=tigrinja
 tk=turkmeniska
 tl=tagalog
@@ -217,7 +217,7 @@ ur=urdu
 uz=uzbekiska
 ve=venda
 vi=vietnamesiska
-vo=volap\u00fck
+vo=volapük
 wa=vallonska
 wo=wolof
 xh=xhosa
@@ -233,7 +233,7 @@ ace=acehnesiska
 ach=acholi
 ada=adangme
 ady=adygeiska
-afa=Afroasiatiskt spr\u00e5k
+afa=Afroasiatiskt språk
 afh=afrihili
 ain=ainu
 akk=akkadiska
@@ -256,7 +256,7 @@ asm=Assamesiska
 ast=asturiska
 ath=Athabaskiska
 aus=Australiska
-ava=Avariskt spr\u00e5k
+ava=Avariskt språk
 ave=Avestiska
 awa=awadhi
 aze=Azerbajdzjanska
@@ -265,31 +265,31 @@ bal=baluchiska
 ban=balinesiska
 baq=Baskiska
 bas=basa
-bat=Baltiskt spr\u00e5k
+bat=Baltiskt språk
 bej=beja
 bel=Vitryska
 bem=bemba
-ber=Berberspr\u00e5k
+ber=Berberspråk
 bho=bhojpuri
 bik=bikol
 bin=bini
 bla=siksika
-bnt=Bantuspr\u00e5k
+bnt=Bantuspråk
 bos=Bosniska
 bra=braj
 bre=Bretonska
-bua=burj\u00e4tiska
+bua=burjätiska
 bug=buginesiska
 bul=Bulgariska
 bur=Burmesiska
 byn=blin
 cad=caddo
-cai=Centralamerikanskt indianspr\u00e5k
+cai=Centralamerikanskt indianspråk
 car=karibiska
 cat=Katalanska
-cau=Kaukasiskt spr\u00e5k
+cau=Kaukasiskt språk
 ceb=cebuano
-cel=Keltiskt spr\u00e5k
+cel=Keltiskt språk
 chb=chibcha
 che=Tjetjenska
 chg=chagatai
@@ -306,13 +306,13 @@ chy=cheyenne
 cop=koptiska
 cor=Korniska
 cos=Korsikanska
-cpe=Kreol-/Pidginspr\u00e5k, engelskbaserade
-cpf=Kreol-/Pidginspr\u00e5k, franskbaserade
-cpp=Kreol-/Pidginspr\u00e5k, portugisiskbaserade
+cpe=Kreol-/Pidginspråk, engelskbaserade
+cpf=Kreol-/Pidginspråk, franskbaserade
+cpp=Kreol-/Pidginspråk, portugisiskbaserade
 crh=krimtatariska
-crp=Kreol-/Pidginspr\u00e5k
+crp=Kreol-/Pidginspråk
 csb=kasjubiska
-cus=Kusjitiskt spr\u00e5k
+cus=Kusjitiskt språk
 cze=Tjeckiska
 dak=dakota
 dan=Danska
@@ -322,11 +322,11 @@ den=slavej
 dgr=dogrib
 din=dinka
 doi=dogri
-dra=Dravidiskt spr\u00e5k
-dsb=l\u00e5gsorbiska
+dra=Dravidiskt språk
+dsb=lågsorbiska
 dua=duala
-dum=medelnederl\u00e4ndska
-dut=Nederl\u00e4ndska
+dum=medelnederländska
+dut=Nederländska
 dyu=dyula
 dzo=Bhutanesiska (Dzongkha)
 efi=efik
@@ -338,22 +338,22 @@ enm=medelengelska
 est=Estniska
 ewo=ewondo
 fan=fang
-fao=F\u00e4r\u00f6iska
+fao=Färöiska
 fat=fanti
 fij=Fidjianska
 fil=filippinska
 fin=Finska
-fiu=Finsk-ugriskt spr\u00e5k
-fon=fonspr\u00e5ket
+fiu=Finsk-ugriskt språk
+fon=fonspråket
 fre=Franska
 frm=medelfranska
 fro=fornfranska
 frr=nordfrisiska
-frs=\u00f6stfrisiska
-fry=V\u00e4stfrisiska
+frs=östfrisiska
+fry=Västfrisiska
 ful=Fulani
 fur=friulianska
-gaa=g\u00e3
+gaa=gã
 gay=gayo
 gba=gbaya
 gem=Germanska
@@ -364,8 +364,8 @@ gil=gilbertiska
 gla=Gaeliska
 gle=Iriska
 glg=Galiciska
-gmh=medelh\u00f6gtyska
-goh=fornh\u00f6gtyska
+gmh=medelhögtyska
+goh=fornhögtyska
 gon=gondi
 gor=gorontalo
 got=gotiska
@@ -382,22 +382,22 @@ heb=Hebreiska
 hil=hiligaynon
 him=Pahari (Himachali)
 hit=hettitiska
-hmn=hmongspr\u00e5k
+hmn=hmongspråk
 hmo=Hirimotu
 hrv=Kroatiska
-hsb=h\u00f6gsorbiska
+hsb=högsorbiska
 hun=Ungerska
 hup=hupa
 iba=ibanska
 ibo=Ibo (Igbo)
-ice=Isl\u00e4ndska
+ice=Isländska
 ilo=iloko
-inc=Indo-ariskt spr\u00e5k
+inc=Indo-ariskt språk
 ind=Indonesiska
-ine=Indoeuropeiskt spr\u00e5k
+ine=Indoeuropeiskt språk
 inh=ingusjiska
 ira=Iranska
-iro=Irokesiska spr\u00e5k
+iro=Irokesiska språk
 ita=Italienska
 jav=Javanesiska
 jbo=lojban
@@ -412,7 +412,7 @@ kaw=kawi
 kaz=Kazakiska
 kbd=kabardinska
 kha=khasi
-khi=Khoisanspr\u00e5k
+khi=Khoisanspråk
 khm=Central-Khmer
 kho=khotanesiska
 kin=Rwanda
@@ -425,7 +425,7 @@ kos=kosreanska
 kpe=kpelle
 krc=karachay-balkar
 krl=karelska
-kro=Kru-spr\u00e5k
+kro=Kru-språk
 kru=kurukh
 kua=Ovambo
 kum=kumykiska
@@ -444,7 +444,7 @@ loz=lozi
 ltz=Luxemburgiska
 lua=luba-lulua
 lug=Luganda
-lui=luise\u00f1o
+lui=luiseño
 lun=lunda
 luo=luo
 lus=lushai
@@ -455,17 +455,17 @@ mah=Marshallesiska
 mai=maithili
 mak=makasar
 man=mande
-map=Austronesiskt spr\u00e5k
+map=Austronesiskt språk
 mas=massajiska
 may=Malajiska
 mdf=moksja
 mdr=mandar
 men=mende
 mga=medeliriska
-mic=mi\u2019kmaq
+mic=mi’kmaq
 min=minangkabau
 mis=Okodat
-mkh=Mon-khmerspr\u00e5k
+mkh=Mon-khmerspråk
 mlg=Malagassiska
 mlt=Maltesiska
 mnc=manchuriska
@@ -473,27 +473,27 @@ mni=manipuri
 moh=mohawk
 mon=Mongoliska
 mos=mossi
-mul=flera spr\u00e5k
+mul=flera språk
 mus=muskogee
 mwl=mirandesiska
 mwr=marwari
-myn=Maya-spr\u00e5k
+myn=Maya-språk
 myv=erjya
-nai=Nordamerikanskt indianspr\u00e5k
+nai=Nordamerikanskt indianspråk
 nap=napolitanska
 nbl=Ndebele (syd)
 nde=Ndebele (nord)
-nds=l\u00e5gtyska
+nds=lågtyska
 new=newariska
 nia=nias
-nic=Niger-/Kongospr\u00e5k
+nic=Niger-/Kongospråk
 niu=niueanska
 nno=Norska (Nynorska)
-nob=Bokm\u00e5l, norska
+nob=Bokmål, norska
 nog=nogai
 non=fornnordiska
 nor=Norska
-nqo=n-k\u00e5
+nqo=n-kå
 nso=nordsotho
 nub=Nubiska
 nwc=klassisk newariska
@@ -507,7 +507,7 @@ osa=osage
 oss=Ossetiska
 ota=ottomanska
 oto=Otomi
-paa=Papuanskt spr\u00e5k
+paa=Papuanskt språk
 pag=pangasinan
 pal=medelpersiska
 pam=pampanga
@@ -526,14 +526,14 @@ raj=rajasthani
 rap=rapanui
 rar=rarotonganska
 roa=Romanska
-roh=R\u00e4toromanska
+roh=Rätoromanska
 rom=romani
-rum=Rum\u00e4nska
-rup=arum\u00e4nska
+rum=Rumänska
+rup=arumänska
 rus=Ryska
 sad=sandawe
 sah=jakutiska
-sai=Sydamerikanskt indianspr\u00e5k
+sai=Sydamerikanskt indianspråk
 sal=Saliska
 sam=samaritanska
 sas=sasak
@@ -541,15 +541,15 @@ sat=santali
 scn=sicilianska
 sco=skotska
 sel=selkup
-sem=Semitiskt spr\u00e5k
+sem=Semitiskt språk
 sga=forniriska
-sgn=Teckenspr\u00e5k
+sgn=Teckenspråk
 shn=shan
 sid=sidamo
 sin=Singalesiska
-sio=Sioux-spr\u00e5k
-sit=Sino-tibetanskt spr\u00e5k
-sla=Slaviskt spr\u00e5k
+sio=Sioux-språk
+sit=Sino-tibetanskt språk
+sla=Slaviskt språk
 slo=Slovakiska
 slv=Slovenska
 sma=sydsamiska
@@ -568,7 +568,7 @@ srd=Sardiska
 srn=sranan tongo
 srp=Serbiska
 srr=serer
-ssa=Nilo-sahariskt spr\u00e5k
+ssa=Nilo-sahariskt språk
 ssw=Swazi
 suk=sukuma
 sun=Sundanesiska
@@ -578,16 +578,16 @@ swe=Svenska
 syc=klassisk syriska
 syr=syriska
 tah=Tahitiska
-tai=Thaispr\u00e5k
+tai=Thaispråk
 tat=Tatariska
 tel=Telugo
 tem=temne
 ter=tereno
 tet=tetum
 tgk=Tadzjikiska
-tha=Thail\u00e4ndska
+tha=Thailändska
 tib=Tibetanska
-tig=tigr\u00e9
+tig=tigré
 tir=Tigrinja
 tiv=tivi
 tkl=tokelauiska
@@ -595,13 +595,13 @@ tlh=klingonska
 tli=tlingit
 tmh=tamashek
 tog=nyasatonganska
-ton=Tonga (Tonga\u00f6arna)
+ton=Tonga (Tongaöarna)
 tpi=tok pisin
 tsi=tsimshian
 tuk=Turkmeniska
 tum=tumbuka
 tur=Turkiska
-tut=Altaiskt spr\u00e5k
+tut=Altaiskt språk
 tvl=tuvaluanska
 tyv=tuviniska
 udm=udmurtiska
@@ -609,7 +609,7 @@ uga=ugaritiska
 uig=Uiguriska
 ukr=Ukrainska
 umb=umbundu
-und=obest\u00e4mt spr\u00e5k
+und=obestämt språk
 uzb=Uzbekiska
 vai=vaj
 vie=Vietnamesiska
@@ -629,7 +629,7 @@ zap=zapotek
 zbl=blissymboler
 zen=zenaga
 zun=zuni
-zxx=inget spr\u00e5kligt inneh\u00e5ll
+zxx=inget språkligt innehåll
 zza=zazaiska
 
 # script names
@@ -662,7 +662,7 @@ Cyrl=kyrilliska
 Cyrs=fornkyrkoslavisk kyrilliska
 Deva=devanagari
 Dsrt=deseret
-Dupl=Duploy\u00e9stenografiska
+Dupl=Duployéstenografiska
 Egyd=demotiska
 Egyh=hieratiska
 Egyp=egyptiska hieroglyfer
@@ -678,8 +678,8 @@ Gujr=gujarati
 Guru=gurmukhiska
 Hang=hangul
 Hani=han
-Hano=hanun\u00f3\u2019o
-Hans=f\u00f6renklad
+Hano=hanunó’o
+Hans=förenklad
 Hant=traditionell
 Hebr=hebreiska
 Hira=hiragana
@@ -696,7 +696,7 @@ Khar=kharoshti
 Khmr=khmeriska
 Knda=kanaresiska
 Kore=koreanska
-Kpel=kpell\u00e9
+Kpel=kpellé
 Kthi=kaithiska
 Lana=lanna
 Laoo=laotiska
@@ -705,12 +705,12 @@ Latg=gaeliskt latin
 Latn=latinska
 Lepc=rong
 Limb=limbu
-Lina=linj\u00e4r A
-Linb=linj\u00e4r B
+Lina=linjär A
+Linb=linjär B
 Loma=loma
 Lyci=lykiska
 Lydi=lydiska
-Mand=manda\u00e9iska
+Mand=mandaéiska
 Mani=manikeanska
 Maya=mayahieroglyfer
 Mend=mende
@@ -724,7 +724,7 @@ Mymr=burmesiska
 Narb=fornnordarabiska
 Nbat=nabateiska
 Nkgb=naxi geba
-Nkoo=n-k\u00e5
+Nkoo=n-kå
 Ogam=ogham
 Olck=ol-chiki
 Orkh=orkon
@@ -754,8 +754,8 @@ Sund=sundanesiska
 Sylo=syloti nagri
 Syrc=syriska
 Syre=estrangelosyriska
-Syrj=v\u00e4stsyriska
-Syrn=\u00f6stsyriska
+Syrj=västsyriska
+Syrn=östsyriska
 Tagb=tagbanwa
 Tale=tai le
 Talu=tai lue
@@ -766,7 +766,7 @@ Teng=tengwar
 Tfng=tifinaghiska
 Tglg=tagalog
 Thaa=taana
-Thai=thail\u00e4ndska
+Thai=thailändska
 Tibt=tibetanska
 Ugar=ugaritiska
 Vaii=vaj
@@ -775,46 +775,46 @@ Wara=varang kshiti
 Xpeo=fornpersiska
 Xsux=sumero-akkadisk kilskrift
 Yiii=yi
-Zinh=\u00e4rvda
+Zinh=ärvda
 Zmth=matematisk notation
 Zsym=symboler
-Zxxx=oskrivet spr\u00e5k
+Zxxx=oskrivet språk
 Zyyy=gemensamma
-Zzzz=ok\u00e4nt skriftsystem
+Zzzz=okänt skriftsystem
 
 # country names
 # key is ISO 3166 country code
 
-AE=F\u00f6renade Arabemiraten
+AE=Förenade Arabemiraten
 AG=Antigua och Barbuda
 AL=Albanien
 AM=Armenien
-AN=Nederl\u00e4ndska Antillerna 
+AN=Nederländska Antillerna 
 AQ=Antarktis
 AS=Amerikanska Samoa
-AT=\u00d6sterrike
+AT=Österrike
 AU=Australien
-AX=\u00c5land
+AX=Åland
 AZ=Azerbajdzjan
 BA=Bosnien och Hercegovina
 BE=Belgien
 BG=Bulgarien
 BR=Brasilien
-BV=Bouvet\u00f6n
+BV=Bouvetön
 BY=Vitryssland
 CA=Kanada
-CC=Kokos\u00f6arna
+CC=Kokosöarna
 CD=Kongo-Kinshasa
 CF=Centralafrikanska republiken
 CG=Kongo-Brazzaville
 CH=Schweiz
-CK=Cook\u00f6arna
+CK=Cooköarna
 CM=Kamerun
 CN=Kina
 CS=Serbien och Montenegro
 CU=Kuba
 CV=Kap Verde
-CX=Jul\u00f6n
+CX=Julön
 CY=Cypern
 CZ=Tjeckien
 DE=Tyskland
@@ -823,22 +823,22 @@ DO=Dominikanska republiken
 DZ=Algeriet
 EE=Estland
 EG=Egypten
-EH=V\u00e4stsahara
+EH=Västsahara
 ES=Spanien
 ET=Etiopien
-FK=Falklands\u00f6arna
+FK=Falklandsöarna
 FM=Mikronesien
-FO=F\u00e4r\u00f6arna
+FO=Färöarna
 FR=Frankrike
 GB=Storbritannien
 GE=Georgien
 GF=Franska Guyana
-GL=Gr\u00f6nland
+GL=Grönland
 GQ=Ekvatorialguinea
 GR=Grekland
-GS=Sydgeorgien och Sydsandwich\u00f6arna
+GS=Sydgeorgien och Sydsandwichöarna
 HK=Hongkong SAR
-HM=Heard\u00f6n och McDonald\u00f6arna
+HM=Heardön och McDonaldöarna
 HR=Kroatien
 HU=Ungern
 ID=Indonesien
@@ -855,7 +855,7 @@ KM=Komorerna
 KN=S:t Kitts och Nevis
 KP=Nordkorea
 KR=Sydkorea
-KY=Cayman\u00f6arna
+KY=Caymanöarna
 KZ=Kazakstan
 LB=Libanon
 LC=S:t Lucia
@@ -866,7 +866,7 @@ LY=Libyen
 MA=Marocko
 MD=Moldavien
 MG=Madagaskar
-MH=Marshall\u00f6arna
+MH=Marshallöarna
 MK=Nordmakedonien
 MN=Mongoliet
 MO=Macao SAR
@@ -874,10 +874,10 @@ MP=Nordmarianerna
 MR=Mauretanien
 MV=Maldiverna
 MX=Mexiko
-MZ=Mo\u00e7ambique
+MZ=Moçambique
 NC=Nya Kaledonien
-NF=Norfolk\u00f6n
-NL=Nederl\u00e4nderna
+NF=Norfolkön
+NL=Nederländerna
 NO=Norge
 NZ=Nya Zeeland
 PF=Franska Polynesien
@@ -885,13 +885,13 @@ PG=Papua Nya Guinea
 PH=Filippinerna
 PL=Polen
 PM=S:t Pierre och Miquelon
-PN=Pitcairn\u00f6arna
+PN=Pitcairnöarna
 PS=Palestinska territorierna
-RO=Rum\u00e4nien
+RO=Rumänien
 RS=Serbien
 RU=Ryssland
 SA=Saudiarabien
-SB=Salomon\u00f6arna
+SB=Salomonöarna
 SC=Seychellerna
 SE=Sverige
 SH=S:t Helena
@@ -899,59 +899,59 @@ SI=Slovenien
 SJ=Svalbard och Jan Mayen
 SK=Slovakien
 SR=Surinam
-ST=S\u00e3o Tom\u00e9 och Pr\u00edncipe
+ST=São Tomé och Príncipe
 SY=Syrien
 SZ=Swaziland
-TC=Turks- och Caicos\u00f6arna
+TC=Turks- och Caicosöarna
 TD=Tchad
 TF=Franska sydterritorierna
 TJ=Tadzjikistan
-TK=Tokelau\u00f6arna
-TL=\u00d6sttimor
+TK=Tokelauöarna
+TL=Östtimor
 TN=Tunisien
 TR=Turkiet
 TT=Trinidad och Tobago
 UA=Ukraina
-UM=USA:s yttre \u00f6ar
+UM=USA:s yttre öar
 US=USA
 VA=Vatikanstaten
 VC=S:t Vincent och Grenadinerna
-VG=Brittiska Jungfru\u00f6arna
-VI=Amerikanska Jungfru\u00f6arna
-WF=Wallis- och Futuna\u00f6arna
+VG=Brittiska Jungfruöarna
+VI=Amerikanska Jungfruöarna
+WF=Wallis- och Futunaöarna
 YE=Jemen
 ZA=Sydafrika
 
 # territory names
 # key is UN M.49 country and area code
 
-001=v\u00e4rlden
+001=världen
 002=Afrika
 003=Nordamerika
 005=Sydamerika
 009=Oceanien
-011=V\u00e4stafrika
+011=Västafrika
 013=Centralamerika
-014=\u00d6stafrika
+014=Östafrika
 015=Nordafrika
 017=Centralafrika
-018=s\u00f6dra Afrika
+018=södra Afrika
 019=Nord- och Sydamerika
 021=Norra Amerika
 029=Karibien
-030=\u00d6stasien
+030=Östasien
 034=Sydasien
 035=Sydostasien
 039=Sydeuropa
 053=Australasien
 054=Melanesien
-057=Mikronesiska \u00f6arna
+057=Mikronesiska öarna
 061=Polynesien
 142=Asien
 143=Centralasien
-145=V\u00e4stasien
+145=Västasien
 150=Europa
-151=\u00d6steuropa
+151=Östeuropa
 154=Nordeuropa
-155=V\u00e4steuropa
+155=Västeuropa
 419=Latinamerika
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_th.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_th.properties
index 9a839efe1a9..afb6ac55a0c 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_th.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_th.properties
@@ -38,345 +38,345 @@
 # language names
 # key is ISO 639 language code
 
-ab=\u0e2d\u0e31\u0e1a\u0e2e\u0e32\u0e40\u0e0b\u0e35\u0e22
-aa=\u0e2d\u0e30\u0e1f\u0e32\u0e23\u0e4c
-af=\u0e41\u0e2d\u0e1f\u0e23\u0e34\u0e01\u0e32\u0e19\u0e2a\u0e4c
-sq=\u0e41\u0e2d\u0e25\u0e40\u0e1a\u0e40\u0e19\u0e35\u0e22
-am=\u0e2d\u0e31\u0e21\u0e2e\u0e32\u0e23\u0e32
-ar=\u0e2d\u0e32\u0e2b\u0e23\u0e31\u0e1a
-hy=\u0e2d\u0e32\u0e23\u0e4c\u0e40\u0e21\u0e40\u0e19\u0e35\u0e22
-as=\u0e2d\u0e31\u0e2a\u0e2a\u0e31\u0e21
-ay=\u0e44\u0e2d\u0e22\u0e4c\u0e21\u0e32\u0e23\u0e32
-az=\u0e2d\u0e32\u0e40\u0e0b\u0e2d\u0e23\u0e4c\u0e44\u0e1a\u0e08\u0e32\u0e19
-ba=\u0e1a\u0e31\u0e0a\u0e04\u0e35\u0e23\u0e4c
-eu=\u0e1a\u0e32\u0e2a\u0e01\u0e4c
-bn=\u0e1a\u0e31\u0e07\u0e01\u0e25\u0e32
-dz=\u0e0b\u0e2d\u0e07\u0e04\u0e32
-bh=\u0e1a\u0e34\u0e2e\u0e32\u0e23\u0e35
-bi=\u0e1a\u0e34\u0e2a\u0e25\u0e32\u0e21\u0e32
-br=\u0e40\u0e1a\u0e23\u0e15\u0e31\u0e19
-bg=\u0e1a\u0e31\u0e25\u0e41\u0e01\u0e40\u0e23\u0e35\u0e22
-my=\u0e1e\u0e21\u0e48\u0e32
-be=\u0e40\u0e1a\u0e25\u0e32\u0e23\u0e38\u0e2a
-km=\u0e40\u0e02\u0e21\u0e23
-ca=\u0e04\u0e32\u0e15\u0e32\u0e25\u0e31\u0e19
-zh=\u0e08\u0e35\u0e19
-co=\u0e04\u0e2d\u0e23\u0e4c\u0e0b\u0e34\u0e01\u0e32
-hr=\u0e42\u0e04\u0e23\u0e40\u0e2d\u0e40\u0e0a\u0e35\u0e22
-cs=\u0e40\u0e0a\u0e47\u0e01
-da=\u0e40\u0e14\u0e19\u0e21\u0e32\u0e23\u0e4c\u0e01
-nl=\u0e14\u0e31\u0e15\u0e0a\u0e4c
-en=\u0e2d\u0e31\u0e07\u0e01\u0e24\u0e29
-eo=\u0e40\u0e2d\u0e2a\u0e40\u0e1b\u0e23\u0e31\u0e19\u0e42\u0e15
-et=\u0e40\u0e2d\u0e2a\u0e42\u0e15\u0e40\u0e19\u0e35\u0e22
-fo=\u0e41\u0e1f\u0e42\u0e23
-fj=\u0e1f\u0e34\u0e08\u0e34
-fi=\u0e1f\u0e34\u0e19\u0e41\u0e25\u0e19\u0e14\u0e4c
-fr=\u0e1d\u0e23\u0e31\u0e48\u0e07\u0e40\u0e28\u0e2a
-fy=\u0e1f\u0e23\u0e34\u0e40\u0e0b\u0e35\u0e22\u0e19\u0e15\u0e30\u0e27\u0e31\u0e19\u0e15\u0e01
-gl=\u0e01\u0e32\u0e25\u0e34\u0e40\u0e0b\u0e35\u0e22
-ka=\u0e08\u0e2d\u0e23\u0e4c\u0e40\u0e08\u0e35\u0e22
-de=\u0e40\u0e22\u0e2d\u0e23\u0e21\u0e31\u0e19
-el=\u0e01\u0e23\u0e35\u0e01
-kl=\u0e01\u0e23\u0e35\u0e19\u0e41\u0e25\u0e19\u0e14\u0e4c
-gn=\u0e01\u0e31\u0e27\u0e23\u0e32\u0e19\u0e35
-gu=\u0e04\u0e38\u0e0a\u0e23\u0e32\u0e15
-ha=\u0e40\u0e2e\u0e32\u0e0b\u0e32
-he=\u0e2e\u0e34\u0e1a\u0e23\u0e39
-iw=\u0e2e\u0e34\u0e1a\u0e23\u0e39
-hi=\u0e2e\u0e34\u0e19\u0e14\u0e35
-hu=\u0e2e\u0e31\u0e07\u0e01\u0e32\u0e23\u0e35
-is=\u0e44\u0e2d\u0e0b\u0e4c\u0e41\u0e25\u0e19\u0e14\u0e4c
-id=\u0e2d\u0e34\u0e19\u0e42\u0e14\u0e19\u0e35\u0e40\u0e0b\u0e35\u0e22
-in=\u0e2d\u0e34\u0e19\u0e42\u0e14\u0e19\u0e35\u0e40\u0e0b\u0e35\u0e22
-ia=\u0e2d\u0e34\u0e19\u0e40\u0e15\u0e2d\u0e23\u0e4c\u0e25\u0e34\u0e07\u0e01\u0e31\u0e27
-ie=\u0e2d\u0e34\u0e19\u0e40\u0e15\u0e2d\u0e23\u0e4c\u0e25\u0e34\u0e07\u0e01\u0e34\u0e27
-iu=\u0e2d\u0e34\u0e19\u0e38\u0e01\u0e15\u0e34\u0e15\u0e38\u0e15
-ik=\u0e2d\u0e35\u0e19\u0e39\u0e40\u0e1b\u0e35\u0e22\u0e01
-ga=\u0e44\u0e2d\u0e23\u0e34\u0e0a
-it=\u0e2d\u0e34\u0e15\u0e32\u0e25\u0e35
-ja=\u0e0d\u0e35\u0e48\u0e1b\u0e38\u0e48\u0e19
-jw=\u0e0a\u0e27\u0e32
-kn=\u0e01\u0e31\u0e19\u0e19\u0e32\u0e14\u0e32
-ks=\u0e41\u0e04\u0e0a\u0e40\u0e21\u0e35\u0e22\u0e23\u0e4c
-kk=\u0e04\u0e32\u0e0b\u0e31\u0e04
-rw=\u0e23\u0e27\u0e31\u0e19\u0e14\u0e32
-ky=\u0e04\u0e35\u0e23\u0e4c\u0e01\u0e35\u0e0b
-rn=\u0e1a\u0e38\u0e23\u0e38\u0e19\u0e14\u0e35
-ko=\u0e40\u0e01\u0e32\u0e2b\u0e25\u0e35
-ku=\u0e40\u0e04\u0e34\u0e23\u0e4c\u0e14
-lo=\u0e25\u0e32\u0e27
-la=\u0e25\u0e30\u0e15\u0e34\u0e19
-lv=\u0e25\u0e31\u0e15\u0e40\u0e27\u0e35\u0e22
-ln=\u0e25\u0e34\u0e07\u0e01\u0e32\u0e25\u0e32
-lt=\u0e25\u0e34\u0e17\u0e31\u0e27\u0e40\u0e19\u0e35\u0e22
-mk=\u0e21\u0e32\u0e0b\u0e34\u0e42\u0e14\u0e40\u0e19\u0e35\u0e22
-mg=\u0e21\u0e32\u0e25\u0e32\u0e01\u0e32\u0e0b\u0e35
-ms=\u0e21\u0e32\u0e40\u0e25\u0e22\u0e4c
-ml=\u0e21\u0e32\u0e25\u0e32\u0e22\u0e32\u0e25\u0e31\u0e21
-mt=\u0e21\u0e2d\u0e25\u0e15\u0e32
-mi=\u0e40\u0e21\u0e32\u0e23\u0e35
-mr=\u0e21\u0e23\u0e32\u0e10\u0e35
-mo=\u0e42\u0e21\u0e14\u0e32\u0e40\u0e27\u0e35\u0e22
-mn=\u0e21\u0e2d\u0e07\u0e42\u0e01\u0e40\u0e25\u0e35\u0e22
-na=\u0e19\u0e32\u0e2d\u0e39\u0e23\u0e39
-ne=\u0e40\u0e19\u0e1b\u0e32\u0e25
-no=\u0e19\u0e2d\u0e23\u0e4c\u0e40\u0e27\u0e22\u0e4c
-oc=\u0e2d\u0e47\u0e2d\u0e01\u0e0b\u0e34\u0e15\u0e31\u0e19
-or=\u0e42\u0e2d\u0e14\u0e34\u0e22\u0e32
-om=\u0e42\u0e2d\u0e42\u0e23\u0e42\u0e21
-ps=\u0e1e\u0e31\u0e0a\u0e42\u0e15
-fa=\u0e40\u0e1b\u0e2d\u0e23\u0e4c\u0e40\u0e0b\u0e35\u0e22
-pl=\u0e42\u0e1b\u0e41\u0e25\u0e19\u0e14\u0e4c
-pt=\u0e42\u0e1b\u0e23\u0e15\u0e38\u0e40\u0e01\u0e2a
-pa=\u0e1b\u0e31\u0e0d\u0e08\u0e32\u0e1a
-qu=\u0e40\u0e04\u0e0a\u0e27\u0e32
-rm=\u0e42\u0e23\u0e41\u0e21\u0e19\u0e0b\u0e4c
-ro=\u0e42\u0e23\u0e21\u0e32\u0e40\u0e19\u0e35\u0e22
-ru=\u0e23\u0e31\u0e2a\u0e40\u0e0b\u0e35\u0e22
-sm=\u0e0b\u0e32\u0e21\u0e31\u0e27
-sg=\u0e0b\u0e31\u0e19\u0e42\u0e01
-sa=\u0e2a\u0e31\u0e19\u0e2a\u0e01\u0e24\u0e15
-gd=\u0e40\u0e01\u0e25\u0e34\u0e01\u0e2a\u0e01\u0e2d\u0e15
-sr=\u0e40\u0e0b\u0e2d\u0e23\u0e4c\u0e40\u0e1a\u0e35\u0e22
-st=\u0e42\u0e0b\u0e42\u0e17\u0e43\u0e15\u0e49
-tn=\u0e1a\u0e2d\u0e15\u0e2a\u0e27\u0e32\u0e19\u0e32
-sn=\u0e42\u0e0a\u0e19\u0e32
-sd=\u0e2a\u0e34\u0e19\u0e18\u0e34
-si=\u0e2a\u0e34\u0e07\u0e2b\u0e25
-ss=\u0e2a\u0e27\u0e32\u0e15\u0e34
-sk=\u0e2a\u0e42\u0e25\u0e27\u0e31\u0e01
-sl=\u0e2a\u0e42\u0e25\u0e27\u0e35\u0e40\u0e19\u0e35\u0e22
-so=\u0e42\u0e0b\u0e21\u0e32\u0e25\u0e35
-es=\u0e2a\u0e40\u0e1b\u0e19
-su=\u0e0b\u0e38\u0e19\u0e14\u0e32
-sw=\u0e2a\u0e27\u0e32\u0e2e\u0e35\u0e25\u0e35
-sv=\u0e2a\u0e27\u0e35\u0e40\u0e14\u0e19
-tl=\u0e15\u0e32\u0e01\u0e32\u0e25\u0e47\u0e2d\u0e01
-tg=\u0e17\u0e32\u0e08\u0e34\u0e01
-ta=\u0e17\u0e21\u0e34\u0e2c
-tt=\u0e15\u0e32\u0e15\u0e32\u0e23\u0e4c
-te=\u0e40\u0e15\u0e25\u0e39\u0e01\u0e39
-th=\u0e44\u0e17\u0e22
-bo=\u0e17\u0e34\u0e40\u0e1a\u0e15
-ti=\u0e15\u0e34\u0e01\u0e23\u0e34\u0e0d\u0e0d\u0e32
-to=\u0e15\u0e2d\u0e07\u0e01\u0e32
-ts=\u0e0b\u0e34\u0e15\u0e0b\u0e2d\u0e07\u0e01\u0e32
-tr=\u0e15\u0e38\u0e23\u0e01\u0e35
-tk=\u0e40\u0e15\u0e34\u0e23\u0e4c\u0e01\u0e40\u0e21\u0e19
-tw=\u0e17\u0e27\u0e34
-ug=\u0e2d\u0e38\u0e22\u0e01\u0e39\u0e23\u0e4c
-uk=\u0e22\u0e39\u0e40\u0e04\u0e23\u0e19
-ur=\u0e2d\u0e39\u0e23\u0e14\u0e39
-uz=\u0e2d\u0e38\u0e0b\u0e40\u0e1a\u0e01
-vi=\u0e40\u0e27\u0e35\u0e22\u0e14\u0e19\u0e32\u0e21
-vo=\u0e42\u0e27\u0e25\u0e32\u0e1e\u0e36\u0e04
-cy=\u0e40\u0e27\u0e25\u0e2a\u0e4c
-wo=\u0e42\u0e27\u0e25\u0e2d\u0e1f
-xh=\u0e04\u0e30\u0e2b\u0e4c\u0e42\u0e2d\u0e0b\u0e32
-ji=\u0e22\u0e34\u0e14\u0e14\u0e34\u0e0a
-yi=\u0e22\u0e34\u0e14\u0e14\u0e34\u0e0a
-yo=\u0e42\u0e22\u0e23\u0e39\u0e1a\u0e32
-za=\u0e08\u0e49\u0e27\u0e07
-zu=\u0e0b\u0e39\u0e25\u0e39
+ab=อับฮาเซีย
+aa=อะฟาร์
+af=แอฟริกานส์
+sq=แอลเบเนีย
+am=อัมฮารา
+ar=อาหรับ
+hy=อาร์เมเนีย
+as=อัสสัม
+ay=ไอย์มารา
+az=อาเซอร์ไบจาน
+ba=บัชคีร์
+eu=บาสก์
+bn=บังกลา
+dz=ซองคา
+bh=บิฮารี
+bi=บิสลามา
+br=เบรตัน
+bg=บัลแกเรีย
+my=พม่า
+be=เบลารุส
+km=เขมร
+ca=คาตาลัน
+zh=จีน
+co=คอร์ซิกา
+hr=โครเอเชีย
+cs=เช็ก
+da=เดนมาร์ก
+nl=ดัตช์
+en=อังกฤษ
+eo=เอสเปรันโต
+et=เอสโตเนีย
+fo=แฟโร
+fj=ฟิจิ
+fi=ฟินแลนด์
+fr=ฝรั่งเศส
+fy=ฟริเซียนตะวันตก
+gl=กาลิเซีย
+ka=จอร์เจีย
+de=เยอรมัน
+el=กรีก
+kl=กรีนแลนด์
+gn=กัวรานี
+gu=คุชราต
+ha=เฮาซา
+he=ฮิบรู
+iw=ฮิบรู
+hi=ฮินดี
+hu=ฮังการี
+is=ไอซ์แลนด์
+id=อินโดนีเซีย
+in=อินโดนีเซีย
+ia=อินเตอร์ลิงกัว
+ie=อินเตอร์ลิงกิว
+iu=อินุกติตุต
+ik=อีนูเปียก
+ga=ไอริช
+it=อิตาลี
+ja=ญี่ปุ่น
+jw=ชวา
+kn=กันนาดา
+ks=แคชเมียร์
+kk=คาซัค
+rw=รวันดา
+ky=คีร์กีซ
+rn=บุรุนดี
+ko=เกาหลี
+ku=เคิร์ด
+lo=ลาว
+la=ละติน
+lv=ลัตเวีย
+ln=ลิงกาลา
+lt=ลิทัวเนีย
+mk=มาซิโดเนีย
+mg=มาลากาซี
+ms=มาเลย์
+ml=มาลายาลัม
+mt=มอลตา
+mi=เมารี
+mr=มราฐี
+mo=โมดาเวีย
+mn=มองโกเลีย
+na=นาอูรู
+ne=เนปาล
+no=นอร์เวย์
+oc=อ็อกซิตัน
+or=โอดิยา
+om=โอโรโม
+ps=พัชโต
+fa=เปอร์เซีย
+pl=โปแลนด์
+pt=โปรตุเกส
+pa=ปัญจาบ
+qu=เคชวา
+rm=โรแมนซ์
+ro=โรมาเนีย
+ru=รัสเซีย
+sm=ซามัว
+sg=ซันโก
+sa=สันสกฤต
+gd=เกลิกสกอต
+sr=เซอร์เบีย
+st=โซโทใต้
+tn=บอตสวานา
+sn=โชนา
+sd=สินธิ
+si=สิงหล
+ss=สวาติ
+sk=สโลวัก
+sl=สโลวีเนีย
+so=โซมาลี
+es=สเปน
+su=ซุนดา
+sw=สวาฮีลี
+sv=สวีเดน
+tl=ตากาล็อก
+tg=ทาจิก
+ta=ทมิฬ
+tt=ตาตาร์
+te=เตลูกู
+th=ไทย
+bo=ทิเบต
+ti=ติกริญญา
+to=ตองกา
+ts=ซิตซองกา
+tr=ตุรกี
+tk=เติร์กเมน
+tw=ทวิ
+ug=อุยกูร์
+uk=ยูเครน
+ur=อูรดู
+uz=อุซเบก
+vi=เวียดนาม
+vo=โวลาพึค
+cy=เวลส์
+wo=โวลอฟ
+xh=คะห์โอซา
+ji=ยิดดิช
+yi=ยิดดิช
+yo=โยรูบา
+za=จ้วง
+zu=ซูลู
 
 # country names
 # key is ISO 3166 country code
 
-AF=\u0e2d\u0e31\u0e1f\u0e01\u0e32\u0e19\u0e34\u0e2a\u0e16\u0e32\u0e19
-AL=\u0e41\u0e2d\u0e25\u0e40\u0e1a\u0e40\u0e19\u0e35\u0e22
-DZ=\u0e41\u0e2d\u0e25\u0e08\u0e35\u0e40\u0e23\u0e35\u0e22
-AD=\u0e2d\u0e31\u0e19\u0e14\u0e2d\u0e23\u0e4c\u0e23\u0e32
-AO=\u0e41\u0e2d\u0e07\u0e42\u0e01\u0e25\u0e32
-AI=\u0e41\u0e2d\u0e07\u0e01\u0e27\u0e34\u0e25\u0e25\u0e32
-AR=\u0e2d\u0e32\u0e23\u0e4c\u0e40\u0e08\u0e19\u0e15\u0e34\u0e19\u0e32
-AM=\u0e2d\u0e32\u0e23\u0e4c\u0e40\u0e21\u0e40\u0e19\u0e35\u0e22
-AW=\u0e2d\u0e32\u0e23\u0e39\u0e1a\u0e32
-AU=\u0e2d\u0e2d\u0e2a\u0e40\u0e15\u0e23\u0e40\u0e25\u0e35\u0e22
-AT=\u0e2d\u0e2d\u0e2a\u0e40\u0e15\u0e23\u0e35\u0e22
-AZ=\u0e2d\u0e32\u0e40\u0e0b\u0e2d\u0e23\u0e4c\u0e44\u0e1a\u0e08\u0e32\u0e19
-BS=\u0e1a\u0e32\u0e2e\u0e32\u0e21\u0e32\u0e2a
-BH=\u0e1a\u0e32\u0e2b\u0e4c\u0e40\u0e23\u0e19
-BD=\u0e1a\u0e31\u0e07\u0e01\u0e25\u0e32\u0e40\u0e17\u0e28
-BB=\u0e1a\u0e32\u0e23\u0e4c\u0e40\u0e1a\u0e42\u0e14\u0e2a
-BY=\u0e40\u0e1a\u0e25\u0e32\u0e23\u0e38\u0e2a
-BE=\u0e40\u0e1a\u0e25\u0e40\u0e22\u0e35\u0e22\u0e21
-BZ=\u0e40\u0e1a\u0e25\u0e35\u0e0b
-BJ=\u0e40\u0e1a\u0e19\u0e34\u0e19
-BM=\u0e40\u0e1a\u0e2d\u0e23\u0e4c\u0e21\u0e34\u0e27\u0e14\u0e32
-BT=\u0e20\u0e39\u0e0f\u0e32\u0e19
-BO=\u0e42\u0e1a\u0e25\u0e34\u0e40\u0e27\u0e35\u0e22
-BA=\u0e1a\u0e2d\u0e2a\u0e40\u0e19\u0e35\u0e22\u0e41\u0e25\u0e30\u0e40\u0e2e\u0e2d\u0e23\u0e4c\u0e40\u0e0b\u0e42\u0e01\u0e27\u0e35\u0e19\u0e32
-BW=\u0e1a\u0e2d\u0e15\u0e2a\u0e27\u0e32\u0e19\u0e32
-BR=\u0e1a\u0e23\u0e32\u0e0b\u0e34\u0e25
-BN=\u0e1a\u0e23\u0e39\u0e44\u0e19
-BG=\u0e1a\u0e31\u0e25\u0e41\u0e01\u0e40\u0e23\u0e35\u0e22
-BF=\u0e1a\u0e39\u0e23\u0e4c\u0e01\u0e34\u0e19\u0e32\u0e1f\u0e32\u0e42\u0e0b
-BI=\u0e1a\u0e38\u0e23\u0e38\u0e19\u0e14\u0e35
-KH=\u0e01\u0e31\u0e21\u0e1e\u0e39\u0e0a\u0e32
-CM=\u0e41\u0e04\u0e40\u0e21\u0e2d\u0e23\u0e39\u0e19
-CA=\u0e41\u0e04\u0e19\u0e32\u0e14\u0e32
-CV=\u0e40\u0e04\u0e1b\u0e40\u0e27\u0e34\u0e23\u0e4c\u0e14
-CF=\u0e2a\u0e32\u0e18\u0e32\u0e23\u0e13\u0e23\u0e31\u0e10\u0e41\u0e2d\u0e1f\u0e23\u0e34\u0e01\u0e32\u0e01\u0e25\u0e32\u0e07
-TD=\u0e0a\u0e32\u0e14
-CL=\u0e0a\u0e34\u0e25\u0e35
-CN=\u0e08\u0e35\u0e19
-CO=\u0e42\u0e04\u0e25\u0e2d\u0e21\u0e40\u0e1a\u0e35\u0e22
-KM=\u0e04\u0e2d\u0e42\u0e21\u0e42\u0e23\u0e2a
-CG=\u0e04\u0e2d\u0e07\u0e42\u0e01 - \u0e1a\u0e23\u0e32\u0e0b\u0e0b\u0e32\u0e27\u0e34\u0e25
-CR=\u0e04\u0e2d\u0e2a\u0e15\u0e32\u0e23\u0e34\u0e01\u0e32
-CI=\u0e42\u0e01\u0e15\u0e14\u0e34\u0e27\u0e31\u0e27\u0e23\u0e4c
-HR=\u0e42\u0e04\u0e23\u0e40\u0e2d\u0e40\u0e0a\u0e35\u0e22
-CU=\u0e04\u0e34\u0e27\u0e1a\u0e32
-CY=\u0e44\u0e0b\u0e1b\u0e23\u0e31\u0e2a
-CZ=\u0e40\u0e0a\u0e47\u0e01
-DK=\u0e40\u0e14\u0e19\u0e21\u0e32\u0e23\u0e4c\u0e01
-DJ=\u0e08\u0e34\u0e1a\u0e39\u0e15\u0e35
-DM=\u0e42\u0e14\u0e21\u0e34\u0e19\u0e34\u0e01\u0e32
-DO=\u0e2a\u0e32\u0e18\u0e32\u0e23\u0e13\u0e23\u0e31\u0e10\u0e42\u0e14\u0e21\u0e34\u0e19\u0e34\u0e01\u0e31\u0e19
-TP=\u0e15\u0e34\u0e21\u0e2d\u0e23\u0e4c\u0e15\u0e30\u0e27\u0e31\u0e19\u0e2d\u0e2d\u0e01
-EC=\u0e40\u0e2d\u0e01\u0e27\u0e32\u0e14\u0e2d\u0e23\u0e4c
-EG=\u0e2d\u0e35\u0e22\u0e34\u0e1b\u0e15\u0e4c
-SV=\u0e40\u0e2d\u0e25\u0e0b\u0e31\u0e25\u0e27\u0e32\u0e14\u0e2d\u0e23\u0e4c
-GQ=\u0e2d\u0e34\u0e40\u0e04\u0e27\u0e17\u0e2d\u0e40\u0e23\u0e35\u0e22\u0e25\u0e01\u0e34\u0e19\u0e35
-ER=\u0e40\u0e2d\u0e23\u0e34\u0e40\u0e17\u0e23\u0e35\u0e22
-EE=\u0e40\u0e2d\u0e2a\u0e42\u0e15\u0e40\u0e19\u0e35\u0e22
-ET=\u0e40\u0e2d\u0e18\u0e34\u0e42\u0e2d\u0e40\u0e1b\u0e35\u0e22
-FJ=\u0e1f\u0e34\u0e08\u0e34
-FI=\u0e1f\u0e34\u0e19\u0e41\u0e25\u0e19\u0e14\u0e4c
-FR=\u0e1d\u0e23\u0e31\u0e48\u0e07\u0e40\u0e28\u0e2a
-GF=\u0e40\u0e1f\u0e23\u0e19\u0e0a\u0e4c\u0e40\u0e01\u0e35\u0e22\u0e19\u0e32
-PF=\u0e40\u0e1f\u0e23\u0e19\u0e0a\u0e4c\u0e42\u0e1b\u0e25\u0e34\u0e19\u0e35\u0e40\u0e0b\u0e35\u0e22
-TF=\u0e40\u0e1f\u0e23\u0e19\u0e0a\u0e4c\u0e40\u0e0b\u0e32\u0e40\u0e17\u0e34\u0e23\u0e4c\u0e19\u0e40\u0e17\u0e23\u0e4c\u0e23\u0e34\u0e17\u0e2d\u0e23\u0e35\u0e2a\u0e4c
-GA=\u0e01\u0e32\u0e1a\u0e2d\u0e07
-GM=\u0e41\u0e01\u0e21\u0e40\u0e1a\u0e35\u0e22
-GE=\u0e08\u0e2d\u0e23\u0e4c\u0e40\u0e08\u0e35\u0e22
-DE=\u0e40\u0e22\u0e2d\u0e23\u0e21\u0e19\u0e35
-GH=\u0e01\u0e32\u0e19\u0e32
-GR=\u0e01\u0e23\u0e35\u0e0b
-GP=\u0e01\u0e27\u0e32\u0e40\u0e14\u0e2d\u0e25\u0e39\u0e1b
-GT=\u0e01\u0e31\u0e27\u0e40\u0e15\u0e21\u0e32\u0e25\u0e32
-GN=\u0e01\u0e34\u0e19\u0e35
-GW=\u0e01\u0e34\u0e19\u0e35-\u0e1a\u0e34\u0e2a\u0e40\u0e0b\u0e32
-GY=\u0e01\u0e32\u0e22\u0e2d\u0e32\u0e19\u0e32
-HT=\u0e40\u0e2e\u0e15\u0e34
-HN=\u0e2e\u0e2d\u0e19\u0e14\u0e39\u0e23\u0e31\u0e2a
-HK=\u0e40\u0e02\u0e15\u0e1b\u0e01\u0e04\u0e23\u0e2d\u0e07\u0e1e\u0e34\u0e40\u0e28\u0e29\u0e2e\u0e48\u0e2d\u0e07\u0e01\u0e07\u0e41\u0e2b\u0e48\u0e07\u0e2a\u0e32\u0e18\u0e32\u0e23\u0e13\u0e23\u0e31\u0e10\u0e1b\u0e23\u0e30\u0e0a\u0e32\u0e0a\u0e19\u0e08\u0e35\u0e19
-HU=\u0e2e\u0e31\u0e07\u0e01\u0e32\u0e23\u0e35
-IS=\u0e44\u0e2d\u0e0b\u0e4c\u0e41\u0e25\u0e19\u0e14\u0e4c
-IN=\u0e2d\u0e34\u0e19\u0e40\u0e14\u0e35\u0e22
-ID=\u0e2d\u0e34\u0e19\u0e42\u0e14\u0e19\u0e35\u0e40\u0e0b\u0e35\u0e22
-IR=\u0e2d\u0e34\u0e2b\u0e23\u0e48\u0e32\u0e19
-IQ=\u0e2d\u0e34\u0e23\u0e31\u0e01
-IE=\u0e44\u0e2d\u0e23\u0e4c\u0e41\u0e25\u0e19\u0e14\u0e4c
-IL=\u0e2d\u0e34\u0e2a\u0e23\u0e32\u0e40\u0e2d\u0e25
-IT=\u0e2d\u0e34\u0e15\u0e32\u0e25\u0e35
-JM=\u0e08\u0e32\u0e40\u0e21\u0e01\u0e32
-JP=\u0e0d\u0e35\u0e48\u0e1b\u0e38\u0e48\u0e19
-JO=\u0e08\u0e2d\u0e23\u0e4c\u0e41\u0e14\u0e19
-KZ=\u0e04\u0e32\u0e0b\u0e31\u0e04\u0e2a\u0e16\u0e32\u0e19
-KE=\u0e40\u0e04\u0e19\u0e22\u0e32
-KI=\u0e04\u0e34\u0e23\u0e34\u0e1a\u0e32\u0e2a
-KP=\u0e40\u0e01\u0e32\u0e2b\u0e25\u0e35\u0e40\u0e2b\u0e19\u0e37\u0e2d
-KR=\u0e40\u0e01\u0e32\u0e2b\u0e25\u0e35\u0e43\u0e15\u0e49
-KW=\u0e04\u0e39\u0e40\u0e27\u0e15
-KG=\u0e04\u0e35\u0e23\u0e4c\u0e01\u0e35\u0e0b\u0e2a\u0e16\u0e32\u0e19
-LA=\u0e25\u0e32\u0e27
-LV=\u0e25\u0e31\u0e15\u0e40\u0e27\u0e35\u0e22
-LB=\u0e40\u0e25\u0e1a\u0e32\u0e19\u0e2d\u0e19
-LS=\u0e40\u0e25\u0e42\u0e0b\u0e42\u0e17
-LR=\u0e44\u0e25\u0e1a\u0e35\u0e40\u0e23\u0e35\u0e22
-LY=\u0e25\u0e34\u0e40\u0e1a\u0e35\u0e22
-LI=\u0e25\u0e34\u0e01\u0e40\u0e15\u0e19\u0e2a\u0e44\u0e15\u0e19\u0e4c
-LT=\u0e25\u0e34\u0e17\u0e31\u0e27\u0e40\u0e19\u0e35\u0e22
-LU=\u0e25\u0e31\u0e01\u0e40\u0e0b\u0e21\u0e40\u0e1a\u0e34\u0e23\u0e4c\u0e01
-MK=\u0e21\u0e32\u0e0b\u0e34\u0e42\u0e14\u0e40\u0e19\u0e35\u0e22\u0e40\u0e2b\u0e19\u0e37\u0e2d
-MG=\u0e21\u0e32\u0e14\u0e32\u0e01\u0e31\u0e2a\u0e01\u0e32\u0e23\u0e4c
-MY=\u0e21\u0e32\u0e40\u0e25\u0e40\u0e0b\u0e35\u0e22
-ML=\u0e21\u0e32\u0e25\u0e35
-MT=\u0e21\u0e2d\u0e25\u0e15\u0e32
-MQ=\u0e21\u0e32\u0e23\u0e4c\u0e15\u0e34\u0e19\u0e35\u0e01
-MR=\u0e21\u0e2d\u0e23\u0e34\u0e40\u0e15\u0e40\u0e19\u0e35\u0e22
-MU=\u0e21\u0e2d\u0e23\u0e34\u0e40\u0e0a\u0e35\u0e22\u0e2a
-YT=\u0e21\u0e32\u0e22\u0e2d\u0e15
-MX=\u0e40\u0e21\u0e47\u0e01\u0e0b\u0e34\u0e42\u0e01
-FM=\u0e44\u0e21\u0e42\u0e04\u0e23\u0e19\u0e35\u0e40\u0e0b\u0e35\u0e22
-MD=\u0e21\u0e2d\u0e25\u0e42\u0e14\u0e27\u0e32
-MC=\u0e42\u0e21\u0e19\u0e32\u0e42\u0e01
-MN=\u0e21\u0e2d\u0e07\u0e42\u0e01\u0e40\u0e25\u0e35\u0e22
-MS=\u0e21\u0e2d\u0e19\u0e15\u0e4c\u0e40\u0e0b\u0e2d\u0e23\u0e4c\u0e23\u0e31\u0e15
-MA=\u0e42\u0e21\u0e23\u0e47\u0e2d\u0e01\u0e42\u0e01
-MZ=\u0e42\u0e21\u0e0b\u0e31\u0e21\u0e1a\u0e34\u0e01
-MM=\u0e40\u0e21\u0e35\u0e22\u0e19\u0e21\u0e32 (\u0e1e\u0e21\u0e48\u0e32)
-NA=\u0e19\u0e32\u0e21\u0e34\u0e40\u0e1a\u0e35\u0e22
-NP=\u0e40\u0e19\u0e1b\u0e32\u0e25
-NL=\u0e40\u0e19\u0e40\u0e18\u0e2d\u0e23\u0e4c\u0e41\u0e25\u0e19\u0e14\u0e4c
-AN=\u0e40\u0e19\u0e40\u0e18\u0e2d\u0e23\u0e4c\u0e41\u0e25\u0e19\u0e14\u0e4c\u0e41\u0e2d\u0e19\u0e17\u0e34\u0e25\u0e25\u0e4c
-NC=\u0e19\u0e34\u0e27\u0e41\u0e04\u0e25\u0e34\u0e42\u0e14\u0e40\u0e19\u0e35\u0e22
-NZ=\u0e19\u0e34\u0e27\u0e0b\u0e35\u0e41\u0e25\u0e19\u0e14\u0e4c
-NI=\u0e19\u0e34\u0e01\u0e32\u0e23\u0e32\u0e01\u0e31\u0e27
-NE=\u0e44\u0e19\u0e40\u0e08\u0e2d\u0e23\u0e4c
-NG=\u0e44\u0e19\u0e08\u0e35\u0e40\u0e23\u0e35\u0e22
-NU=\u0e19\u0e35\u0e2d\u0e39\u0e40\u0e2d
-NO=\u0e19\u0e2d\u0e23\u0e4c\u0e40\u0e27\u0e22\u0e4c
-OM=\u0e42\u0e2d\u0e21\u0e32\u0e19
-PK=\u0e1b\u0e32\u0e01\u0e35\u0e2a\u0e16\u0e32\u0e19
-PA=\u0e1b\u0e32\u0e19\u0e32\u0e21\u0e32
-PG=\u0e1b\u0e32\u0e1b\u0e31\u0e27\u0e19\u0e34\u0e27\u0e01\u0e34\u0e19\u0e35
-PY=\u0e1b\u0e32\u0e23\u0e32\u0e01\u0e27\u0e31\u0e22
-PE=\u0e40\u0e1b\u0e23\u0e39
-PH=\u0e1f\u0e34\u0e25\u0e34\u0e1b\u0e1b\u0e34\u0e19\u0e2a\u0e4c
-PL=\u0e42\u0e1b\u0e41\u0e25\u0e19\u0e14\u0e4c
-PT=\u0e42\u0e1b\u0e23\u0e15\u0e38\u0e40\u0e01\u0e2a
-PR=\u0e40\u0e1b\u0e2d\u0e23\u0e4c\u0e42\u0e15\u0e23\u0e34\u0e42\u0e01
-QA=\u0e01\u0e32\u0e15\u0e32\u0e23\u0e4c
-RO=\u0e42\u0e23\u0e21\u0e32\u0e40\u0e19\u0e35\u0e22
-RU=\u0e23\u0e31\u0e2a\u0e40\u0e0b\u0e35\u0e22
-RW=\u0e23\u0e27\u0e31\u0e19\u0e14\u0e32
-SA=\u0e0b\u0e32\u0e2d\u0e38\u0e14\u0e35\u0e2d\u0e32\u0e23\u0e30\u0e40\u0e1a\u0e35\u0e22
-SN=\u0e40\u0e0b\u0e40\u0e19\u0e01\u0e31\u0e25
-SP=\u0e40\u0e0b\u0e2d\u0e23\u0e4c\u0e40\u0e1a\u0e35\u0e22
-SC=\u0e40\u0e0b\u0e40\u0e0a\u0e25\u0e2a\u0e4c
-SL=\u0e40\u0e0b\u0e35\u0e22\u0e23\u0e4c\u0e23\u0e32\u0e25\u0e35\u0e42\u0e2d\u0e19
-SG=\u0e2a\u0e34\u0e07\u0e04\u0e42\u0e1b\u0e23\u0e4c
-SK=\u0e2a\u0e42\u0e25\u0e27\u0e30\u0e40\u0e01\u0e35\u0e22
-SI=\u0e2a\u0e42\u0e25\u0e27\u0e35\u0e40\u0e19\u0e35\u0e22
-SO=\u0e42\u0e0b\u0e21\u0e32\u0e40\u0e25\u0e35\u0e22
-ZA=\u0e41\u0e2d\u0e1f\u0e23\u0e34\u0e01\u0e32\u0e43\u0e15\u0e49
-ES=\u0e2a\u0e40\u0e1b\u0e19
-LK=\u0e28\u0e23\u0e35\u0e25\u0e31\u0e07\u0e01\u0e32
-SD=\u0e0b\u0e39\u0e14\u0e32\u0e19
-SR=\u0e0b\u0e39\u0e23\u0e34\u0e19\u0e32\u0e40\u0e21
-SZ=\u0e40\u0e2d\u0e2a\u0e27\u0e32\u0e15\u0e35\u0e19\u0e35
-SE=\u0e2a\u0e27\u0e35\u0e40\u0e14\u0e19
-CH=\u0e2a\u0e27\u0e34\u0e15\u0e40\u0e0b\u0e2d\u0e23\u0e4c\u0e41\u0e25\u0e19\u0e14\u0e4c
-SY=\u0e0b\u0e35\u0e40\u0e23\u0e35\u0e22
-TW=\u0e44\u0e15\u0e49\u0e2b\u0e27\u0e31\u0e19
-TJ=\u0e17\u0e32\u0e08\u0e34\u0e01\u0e34\u0e2a\u0e16\u0e32\u0e19
-TZ=\u0e41\u0e17\u0e19\u0e0b\u0e32\u0e40\u0e19\u0e35\u0e22
-TH=\u0e44\u0e17\u0e22
-TG=\u0e42\u0e15\u0e42\u0e01
-TK=\u0e42\u0e15\u0e40\u0e01\u0e40\u0e25\u0e32
-TO=\u0e15\u0e2d\u0e07\u0e01\u0e32
-TT=\u0e15\u0e23\u0e34\u0e19\u0e34\u0e41\u0e14\u0e14\u0e41\u0e25\u0e30\u0e42\u0e15\u0e40\u0e1a\u0e42\u0e01
-TN=\u0e15\u0e39\u0e19\u0e34\u0e40\u0e0b\u0e35\u0e22
-TR=\u0e15\u0e38\u0e23\u0e01\u0e35
-TM=\u0e40\u0e15\u0e34\u0e23\u0e4c\u0e01\u0e40\u0e21\u0e19\u0e34\u0e2a\u0e16\u0e32\u0e19
-UG=\u0e22\u0e39\u0e01\u0e31\u0e19\u0e14\u0e32
-UA=\u0e22\u0e39\u0e40\u0e04\u0e23\u0e19
-AE=\u0e2a\u0e2b\u0e23\u0e31\u0e10\u0e2d\u0e32\u0e2b\u0e23\u0e31\u0e1a\u0e40\u0e2d\u0e21\u0e34\u0e40\u0e23\u0e15\u0e2a\u0e4c
-GB=\u0e2a\u0e2b\u0e23\u0e32\u0e0a\u0e2d\u0e32\u0e13\u0e32\u0e08\u0e31\u0e01\u0e23
-US=\u0e2a\u0e2b\u0e23\u0e31\u0e10\u0e2d\u0e40\u0e21\u0e23\u0e34\u0e01\u0e32
-UY=\u0e2d\u0e38\u0e23\u0e38\u0e01\u0e27\u0e31\u0e22
-UZ=\u0e2d\u0e38\u0e0b\u0e40\u0e1a\u0e01\u0e34\u0e2a\u0e16\u0e32\u0e19
-VU=\u0e27\u0e32\u0e19\u0e39\u0e2d\u0e32\u0e15\u0e39
-VA=\u0e19\u0e04\u0e23\u0e27\u0e32\u0e15\u0e34\u0e01\u0e31\u0e19
-VE=\u0e40\u0e27\u0e40\u0e19\u0e0b\u0e38\u0e40\u0e2d\u0e25\u0e32
-VN=\u0e40\u0e27\u0e35\u0e22\u0e14\u0e19\u0e32\u0e21
-VG=\u0e2b\u0e21\u0e39\u0e48\u0e40\u0e01\u0e32\u0e30\u0e1a\u0e23\u0e34\u0e15\u0e34\u0e0a\u0e40\u0e27\u0e2d\u0e23\u0e4c\u0e08\u0e34\u0e19
-VI=\u0e2b\u0e21\u0e39\u0e48\u0e40\u0e01\u0e32\u0e30\u0e40\u0e27\u0e2d\u0e23\u0e4c\u0e08\u0e34\u0e19\u0e02\u0e2d\u0e07\u0e2a\u0e2b\u0e23\u0e31\u0e10\u0e2d\u0e40\u0e21\u0e23\u0e34\u0e01\u0e32
-EH=\u0e0b\u0e32\u0e2e\u0e32\u0e23\u0e32\u0e15\u0e30\u0e27\u0e31\u0e19\u0e15\u0e01
-YE=\u0e40\u0e22\u0e40\u0e21\u0e19
-ZR=\u0e41\u0e0b\u0e23\u0e4c
-ZM=\u0e41\u0e0b\u0e21\u0e40\u0e1a\u0e35\u0e22
-ZW=\u0e0b\u0e34\u0e21\u0e1a\u0e31\u0e1a\u0e40\u0e27
+AF=อัฟกานิสถาน
+AL=แอลเบเนีย
+DZ=แอลจีเรีย
+AD=อันดอร์รา
+AO=แองโกลา
+AI=แองกวิลลา
+AR=อาร์เจนตินา
+AM=อาร์เมเนีย
+AW=อารูบา
+AU=ออสเตรเลีย
+AT=ออสเตรีย
+AZ=อาเซอร์ไบจาน
+BS=บาฮามาส
+BH=บาห์เรน
+BD=บังกลาเทศ
+BB=บาร์เบโดส
+BY=เบลารุส
+BE=เบลเยียม
+BZ=เบลีซ
+BJ=เบนิน
+BM=เบอร์มิวดา
+BT=ภูฏาน
+BO=โบลิเวีย
+BA=บอสเนียและเฮอร์เซโกวีนา
+BW=บอตสวานา
+BR=บราซิล
+BN=บรูไน
+BG=บัลแกเรีย
+BF=บูร์กินาฟาโซ
+BI=บุรุนดี
+KH=กัมพูชา
+CM=แคเมอรูน
+CA=แคนาดา
+CV=เคปเวิร์ด
+CF=สาธารณรัฐแอฟริกากลาง
+TD=ชาด
+CL=ชิลี
+CN=จีน
+CO=โคลอมเบีย
+KM=คอโมโรส
+CG=คองโก - บราซซาวิล
+CR=คอสตาริกา
+CI=โกตดิวัวร์
+HR=โครเอเชีย
+CU=คิวบา
+CY=ไซปรัส
+CZ=เช็ก
+DK=เดนมาร์ก
+DJ=จิบูตี
+DM=โดมินิกา
+DO=สาธารณรัฐโดมินิกัน
+TP=ติมอร์ตะวันออก
+EC=เอกวาดอร์
+EG=อียิปต์
+SV=เอลซัลวาดอร์
+GQ=อิเควทอเรียลกินี
+ER=เอริเทรีย
+EE=เอสโตเนีย
+ET=เอธิโอเปีย
+FJ=ฟิจิ
+FI=ฟินแลนด์
+FR=ฝรั่งเศส
+GF=เฟรนช์เกียนา
+PF=เฟรนช์โปลินีเซีย
+TF=เฟรนช์เซาเทิร์นเทร์ริทอรีส์
+GA=กาบอง
+GM=แกมเบีย
+GE=จอร์เจีย
+DE=เยอรมนี
+GH=กานา
+GR=กรีซ
+GP=กวาเดอลูป
+GT=กัวเตมาลา
+GN=กินี
+GW=กินี-บิสเซา
+GY=กายอานา
+HT=เฮติ
+HN=ฮอนดูรัส
+HK=เขตปกครองพิเศษฮ่องกงแห่งสาธารณรัฐประชาชนจีน
+HU=ฮังการี
+IS=ไอซ์แลนด์
+IN=อินเดีย
+ID=อินโดนีเซีย
+IR=อิหร่าน
+IQ=อิรัก
+IE=ไอร์แลนด์
+IL=อิสราเอล
+IT=อิตาลี
+JM=จาเมกา
+JP=ญี่ปุ่น
+JO=จอร์แดน
+KZ=คาซัคสถาน
+KE=เคนยา
+KI=คิริบาส
+KP=เกาหลีเหนือ
+KR=เกาหลีใต้
+KW=คูเวต
+KG=คีร์กีซสถาน
+LA=ลาว
+LV=ลัตเวีย
+LB=เลบานอน
+LS=เลโซโท
+LR=ไลบีเรีย
+LY=ลิเบีย
+LI=ลิกเตนสไตน์
+LT=ลิทัวเนีย
+LU=ลักเซมเบิร์ก
+MK=มาซิโดเนียเหนือ
+MG=มาดากัสการ์
+MY=มาเลเซีย
+ML=มาลี
+MT=มอลตา
+MQ=มาร์ตินีก
+MR=มอริเตเนีย
+MU=มอริเชียส
+YT=มายอต
+MX=เม็กซิโก
+FM=ไมโครนีเซีย
+MD=มอลโดวา
+MC=โมนาโก
+MN=มองโกเลีย
+MS=มอนต์เซอร์รัต
+MA=โมร็อกโก
+MZ=โมซัมบิก
+MM=เมียนมา (พม่า)
+NA=นามิเบีย
+NP=เนปาล
+NL=เนเธอร์แลนด์
+AN=เนเธอร์แลนด์แอนทิลล์
+NC=นิวแคลิโดเนีย
+NZ=นิวซีแลนด์
+NI=นิการากัว
+NE=ไนเจอร์
+NG=ไนจีเรีย
+NU=นีอูเอ
+NO=นอร์เวย์
+OM=โอมาน
+PK=ปากีสถาน
+PA=ปานามา
+PG=ปาปัวนิวกินี
+PY=ปารากวัย
+PE=เปรู
+PH=ฟิลิปปินส์
+PL=โปแลนด์
+PT=โปรตุเกส
+PR=เปอร์โตริโก
+QA=กาตาร์
+RO=โรมาเนีย
+RU=รัสเซีย
+RW=รวันดา
+SA=ซาอุดีอาระเบีย
+SN=เซเนกัล
+SP=เซอร์เบีย
+SC=เซเชลส์
+SL=เซียร์ราลีโอน
+SG=สิงคโปร์
+SK=สโลวะเกีย
+SI=สโลวีเนีย
+SO=โซมาเลีย
+ZA=แอฟริกาใต้
+ES=สเปน
+LK=ศรีลังกา
+SD=ซูดาน
+SR=ซูรินาเม
+SZ=เอสวาตีนี
+SE=สวีเดน
+CH=สวิตเซอร์แลนด์
+SY=ซีเรีย
+TW=ไต้หวัน
+TJ=ทาจิกิสถาน
+TZ=แทนซาเนีย
+TH=ไทย
+TG=โตโก
+TK=โตเกเลา
+TO=ตองกา
+TT=ตรินิแดดและโตเบโก
+TN=ตูนิเซีย
+TR=ตุรกี
+TM=เติร์กเมนิสถาน
+UG=ยูกันดา
+UA=ยูเครน
+AE=สหรัฐอาหรับเอมิเรตส์
+GB=สหราชอาณาจักร
+US=สหรัฐอเมริกา
+UY=อุรุกวัย
+UZ=อุซเบกิสถาน
+VU=วานูอาตู
+VA=นครวาติกัน
+VE=เวเนซุเอลา
+VN=เวียดนาม
+VG=หมู่เกาะบริติชเวอร์จิน
+VI=หมู่เกาะเวอร์จินของสหรัฐอเมริกา
+EH=ซาฮาราตะวันตก
+YE=เยเมน
+ZR=แซร์
+ZM=แซมเบีย
+ZW=ซิมบับเว
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_tr.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_tr.properties
index a69cde7aad2..efce71219e7 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_tr.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_tr.properties
@@ -38,9 +38,9 @@
 # language names
 # key is ISO 639 language code
 
-tr=T\u00fcrk\u00e7e
+tr=Türkçe
 
 # country names
 # key is ISO 3166 country code
 
-TR=T\u00fcrkiye
+TR=Türkiye
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_uk.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_uk.properties
index ee420eb789e..efedadcd4ce 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_uk.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_uk.properties
@@ -38,9 +38,9 @@
 # language names
 # key is ISO 639 language code
 
-uk=\u0443\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430
+uk=українська
 
 # country names
 # key is ISO 3166 country code
 
-UA=\u0423\u043a\u0440\u0430\u0457\u043d\u0430
+UA=Україна
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_vi.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_vi.properties
index 7310176e0d9..146233e37cf 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_vi.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_vi.properties
@@ -42,122 +42,122 @@
 # language names
 # key is ISO 639 language code
 
-ar=Ti\u1ebfng \u1ea2 R\u1eadp
-az=Ti\u1ebfng Azerbaijan
-be=Ti\u1ebfng Belarus
-bg=Ti\u1ebfng Bulgaria
-bo=Ti\u1ebfng T\u00e2y T\u1ea1ng
-ca=Ti\u1ebfng Catalan
-cs=Ti\u1ebfng S\u00e9c
-da=Ti\u1ebfng \u0110an M\u1ea1ch
-de=Ti\u1ebfng \u0110\u1ee9c
-el=Ti\u1ebfng Hy L\u1ea1p
-en=Ti\u1ebfng Anh
-eo=Ti\u1ebfng Qu\u1ed1c T\u1ebf Ng\u1eef
-es=Ti\u1ebfng T\u00e2y Ban Nha
-et=Ti\u1ebfng Estonia
-fa=Ti\u1ebfng Ba T\u01b0
-fi=Ti\u1ebfng Ph\u1ea7n Lan
-fr=Ti\u1ebfng Ph\u00e1p
-ga=Ti\u1ebfng Ireland
-he=Ti\u1ebfng Do Th\u00e1i
-hi=Ti\u1ebfng Hindi
-hr=Ti\u1ebfng Croatia
-hu=Ti\u1ebfng Hungary
-hy=Ti\u1ebfng Armenia
-ia=Ti\u1ebfng Khoa H\u1ecdc Qu\u1ed1c T\u1ebf
-id=Ti\u1ebfng Indonesia
-is=Ti\u1ebfng Iceland
-it=Ti\u1ebfng Italy
-ja=Ti\u1ebfng Nh\u1eadt
-jv=Ti\u1ebfng Java
-km=Ti\u1ebfng Khmer
-kn=Ti\u1ebfng Kannada
-ko=Ti\u1ebfng H\u00e0n
-la=Ti\u1ebfng La-tinh
-lo=Ti\u1ebfng L\u00e0o
-lt=Ti\u1ebfng Litva
-lv=Ti\u1ebfng Latvia
-mk=Ti\u1ebfng Macedonia
-mn=Ti\u1ebfng M\u00f4ng C\u1ed5
-ms=Ti\u1ebfng M\u00e3 Lai
-ne=Ti\u1ebfng Nepal
-nl=Ti\u1ebfng H\u00e0 Lan
-no=Ti\u1ebfng Na Uy
-pl=Ti\u1ebfng Ba Lan
-pt=Ti\u1ebfng B\u1ed3 \u0110\u00e0o Nha
-ro=Ti\u1ebfng Romania
-ru=Ti\u1ebfng Nga
-sa=Ti\u1ebfng Ph\u1ea1n
-sk=Ti\u1ebfng Slovak
-sl=Ti\u1ebfng Slovenia
-so=Ti\u1ebfng Somali
-sq=Ti\u1ebfng Albania
-sr=Ti\u1ebfng Serbia
-sv=Ti\u1ebfng Th\u1ee5y \u0110i\u1ec3n
-th=Ti\u1ebfng Th\u00e1i
-tr=Ti\u1ebfng Th\u1ed5 Nh\u0129 K\u1ef3
-uk=Ti\u1ebfng Ukraina
-uz=Ti\u1ebfng Uzbek
-vi=Ti\u1ebfng Vi\u1ec7t
-yi=Ti\u1ebfng Yiddish
-zh=Ti\u1ebfng Trung
+ar=Tiếng Ả Rập
+az=Tiếng Azerbaijan
+be=Tiếng Belarus
+bg=Tiếng Bulgaria
+bo=Tiếng Tây Tạng
+ca=Tiếng Catalan
+cs=Tiếng Séc
+da=Tiếng Đan Mạch
+de=Tiếng Đức
+el=Tiếng Hy Lạp
+en=Tiếng Anh
+eo=Tiếng Quốc Tế Ngữ
+es=Tiếng Tây Ban Nha
+et=Tiếng Estonia
+fa=Tiếng Ba Tư
+fi=Tiếng Phần Lan
+fr=Tiếng Pháp
+ga=Tiếng Ireland
+he=Tiếng Do Thái
+hi=Tiếng Hindi
+hr=Tiếng Croatia
+hu=Tiếng Hungary
+hy=Tiếng Armenia
+ia=Tiếng Khoa Học Quốc Tế
+id=Tiếng Indonesia
+is=Tiếng Iceland
+it=Tiếng Italy
+ja=Tiếng Nhật
+jv=Tiếng Java
+km=Tiếng Khmer
+kn=Tiếng Kannada
+ko=Tiếng Hàn
+la=Tiếng La-tinh
+lo=Tiếng Lào
+lt=Tiếng Litva
+lv=Tiếng Latvia
+mk=Tiếng Macedonia
+mn=Tiếng Mông Cổ
+ms=Tiếng Mã Lai
+ne=Tiếng Nepal
+nl=Tiếng Hà Lan
+no=Tiếng Na Uy
+pl=Tiếng Ba Lan
+pt=Tiếng Bồ Đào Nha
+ro=Tiếng Romania
+ru=Tiếng Nga
+sa=Tiếng Phạn
+sk=Tiếng Slovak
+sl=Tiếng Slovenia
+so=Tiếng Somali
+sq=Tiếng Albania
+sr=Tiếng Serbia
+sv=Tiếng Thụy Điển
+th=Tiếng Thái
+tr=Tiếng Thổ Nhĩ Kỳ
+uk=Tiếng Ukraina
+uz=Tiếng Uzbek
+vi=Tiếng Việt
+yi=Tiếng Yiddish
+zh=Tiếng Trung
 
 # country names
 # key is ISO 3166 country code
 
-AE=C\u00e1c Ti\u1ec3u V\u01b0\u01a1ng qu\u1ed1c \u1ea2 R\u1eadp Th\u1ed1ng nh\u1ea5t
-AG=Antigua v\u00e0 Barbuda
-AT=\u00c1o
-BA=Bosnia v\u00e0 Herzegovina
-BE=B\u1ec9
-CF=C\u1ed9ng h\u00f2a Trung Phi
-CH=Th\u1ee5y S\u0129
-CN=Trung Qu\u1ed1c
-CY=S\u00edp
-CZ=S\u00e9c
-DE=\u0110\u1ee9c
-DK=\u0110an M\u1ea1ch
-EG=Ai C\u1eadp
-EH=T\u00e2y Sahara
-ES=T\u00e2y Ban Nha
-FI=Ph\u1ea7n Lan
-FR=Ph\u00e1p
-GB=V\u01b0\u01a1ng qu\u1ed1c Anh
-GQ=Guinea X\u00edch \u0110\u1ea1o
-GR=Hy L\u1ea1p
-IN=\u1ea4n \u0110\u1ed9
-JP=Nh\u1eadt B\u1ea3n
+AE=Các Tiểu Vương quốc Ả Rập Thống nhất
+AG=Antigua và Barbuda
+AT=Áo
+BA=Bosnia và Herzegovina
+BE=Bỉ
+CF=Cộng hòa Trung Phi
+CH=Thụy Sĩ
+CN=Trung Quốc
+CY=Síp
+CZ=Séc
+DE=Đức
+DK=Đan Mạch
+EG=Ai Cập
+EH=Tây Sahara
+ES=Tây Ban Nha
+FI=Phần Lan
+FR=Pháp
+GB=Vương quốc Anh
+GQ=Guinea Xích Đạo
+GR=Hy Lạp
+IN=Ấn Độ
+JP=Nhật Bản
 KH=Campuchia
-KN=St. Kitts v\u00e0 Nevis
-KP=Tri\u1ec1u Ti\u00ean
-KR=H\u00e0n Qu\u1ed1c
-LA=L\u00e0o
-LB=Li-b\u0103ng
+KN=St. Kitts và Nevis
+KP=Triều Tiên
+KR=Hàn Quốc
+LA=Lào
+LB=Li-băng
 LT=Litva
-MA=Ma-r\u1ed1c
-MH=Qu\u1ea7n \u0111\u1ea3o Marshall
-MK=B\u1eafc Macedonia
-MM=Myanmar (Mi\u1ebfn \u0110i\u1ec7n)
-MN=M\u00f4ng C\u1ed5
-NL=H\u00e0 Lan
+MA=Ma-rốc
+MH=Quần đảo Marshall
+MK=Bắc Macedonia
+MM=Myanmar (Miến Điện)
+MN=Mông Cổ
+NL=Hà Lan
 NO=Na Uy
 PL=Ba Lan
-PT=B\u1ed3 \u0110\u00e0o Nha
+PT=Bồ Đào Nha
 RU=Nga
-SA=\u1ea2 R\u1eadp X\u00ea-\u00fat
-SB=Qu\u1ea7n \u0111\u1ea3o Solomon
-SE=Th\u1ee5y \u0110i\u1ec3n
-SP=S\u00e9c-bia
-ST=S\u00e3o Tom\u00e9 v\u00e0 Pr\u00edncipe
-TH=Th\u00e1i Lan
-TR=Th\u1ed5 Nh\u0129 K\u1ef3
-TT=Trinidad v\u00e0 Tobago
-TW=\u0110\u00e0i Loan
+SA=Ả Rập Xê-út
+SB=Quần đảo Solomon
+SE=Thụy Điển
+SP=Séc-bia
+ST=São Tomé và Príncipe
+TH=Thái Lan
+TR=Thổ Nhĩ Kỳ
+TT=Trinidad và Tobago
+TW=Đài Loan
 UA=Ukraina
-US=Hoa K\u1ef3
-VA=Th\u00e0nh Vatican
-VC=St. Vincent v\u00e0 Grenadines
-VN=Vi\u1ec7t Nam
-YU=Nam T\u01b0
+US=Hoa Kỳ
+VA=Thành Vatican
+VC=St. Vincent và Grenadines
+VN=Việt Nam
+YU=Nam Tư
 ZA=Nam Phi
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh.properties
index 6c4f5a0a947..ffd74ab11ce 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh.properties
@@ -38,1108 +38,1108 @@
 # language names
 # key is ISO 639 language code
 
-aa=\u963f\u6cd5\u5c14\u8bed
-ab=\u963f\u5e03\u54c8\u897f\u4e9a\u8bed
-ae=\u963f\u7ef4\u65af\u5854\u8bed
-af=\u5357\u975e\u8377\u5170\u8bed
-ak=\u963f\u80af\u8bed
-am=\u963f\u59c6\u54c8\u62c9\u8bed
-an=\u963f\u62c9\u8d21\u8bed
-ar=\u963f\u62c9\u4f2f\u8bed
-as=\u963f\u8428\u59c6\u8bed
-av=\u963f\u74e6\u5c14\u8bed
-ay=\u827e\u9a6c\u62c9\u8bed
-az=\u963f\u585e\u62dc\u7586\u8bed
-ba=\u5df4\u4ec0\u57fa\u5c14\u8bed
-be=\u767d\u4fc4\u7f57\u65af\u8bed
-bg=\u4fdd\u52a0\u5229\u4e9a\u8bed
-bh=\u6bd4\u54c8\u5c14\u6587
-bi=\u6bd4\u65af\u62c9\u9a6c\u8bed
-bm=\u73ed\u5df4\u62c9\u8bed
-bn=\u5b5f\u52a0\u62c9\u8bed
-bo=\u85cf\u8bed
-br=\u5e03\u5217\u5854\u5c3c\u8bed
-bs=\u6ce2\u65af\u5c3c\u4e9a\u8bed
-ca=\u52a0\u6cf0\u7f57\u5c3c\u4e9a\u8bed
-ce=\u8f66\u81e3\u8bed
-ch=\u67e5\u83ab\u7f57\u8bed
-co=\u79d1\u897f\u5609\u8bed
-cr=\u514b\u91cc\u65cf\u8bed
-cs=\u6377\u514b\u8bed
-cu=\u6559\u4f1a\u65af\u62c9\u592b\u8bed
-cv=\u695a\u74e6\u4ec0\u8bed
-cy=\u5a01\u5c14\u58eb\u8bed
-da=\u4e39\u9ea6\u8bed
-de=\u5fb7\u8bed
-dv=\u8fea\u7ef4\u5e0c\u8bed
-dz=\u5b97\u5361\u8bed
-ee=\u57c3\u7ef4\u8bed
-el=\u5e0c\u814a\u8bed
-en=\u82f1\u8bed
-eo=\u4e16\u754c\u8bed
-es=\u897f\u73ed\u7259\u8bed
-et=\u7231\u6c99\u5c3c\u4e9a\u8bed
-eu=\u5df4\u65af\u514b\u8bed
-fa=\u6ce2\u65af\u8bed
-ff=\u5bcc\u62c9\u8bed
-fi=\u82ac\u5170\u8bed
-fj=\u6590\u6d4e\u8bed
-fo=\u6cd5\u7f57\u8bed
-fr=\u6cd5\u8bed
-fy=\u897f\u5f17\u91cc\u897f\u4e9a\u8bed
-ga=\u7231\u5c14\u5170\u8bed
-gd=\u82cf\u683c\u5170\u76d6\u5c14\u8bed
-gl=\u52a0\u5229\u897f\u4e9a\u8bed
-gn=\u74dc\u62c9\u5c3c\u8bed
-gu=\u53e4\u5409\u62c9\u7279\u8bed
-gv=\u9a6c\u6069\u8bed
-ha=\u8c6a\u8428\u8bed
-he=\u5e0c\u4f2f\u6765\u8bed
-hi=\u5370\u5730\u8bed
-ho=\u5e0c\u91cc\u83ab\u56fe\u8bed
-hr=\u514b\u7f57\u5730\u4e9a\u8bed
-ht=\u6d77\u5730\u514b\u91cc\u5965\u5c14\u8bed
-hu=\u5308\u7259\u5229\u8bed
-hy=\u4e9a\u7f8e\u5c3c\u4e9a\u8bed
-hz=\u8d6b\u96f7\u7f57\u8bed
-ia=\u56fd\u9645\u8bed
-id=\u5370\u5ea6\u5c3c\u897f\u4e9a\u8bed
-ie=\u56fd\u9645\u6587\u5b57\uff08E\uff09
-ig=\u4f0a\u535a\u8bed
-ii=\u56db\u5ddd\u5f5d\u8bed
-ik=\u4f0a\u52aa\u76ae\u514b\u8bed
-in=\u5370\u5ea6\u5c3c\u897f\u4e9a\u8bed
-io=\u4f0a\u591a\u8bed
-is=\u51b0\u5c9b\u8bed
-it=\u610f\u5927\u5229\u8bed
-iu=\u56e0\u7ebd\u7279\u8bed
-iw=\u5e0c\u4f2f\u6765\u8bed
-ja=\u65e5\u8bed
-ji=\u610f\u7b2c\u7eea\u8bed
-jv=\u722a\u54c7\u8bed
-ka=\u683c\u9c81\u5409\u4e9a\u8bed
-kg=\u521a\u679c\u8bed
-ki=\u5409\u5e93\u5c24\u8bed
-kj=\u5bbd\u4e9a\u739b\u8bed
-kk=\u54c8\u8428\u514b\u8bed
-kl=\u683c\u9675\u5170\u8bed
-km=\u9ad8\u68c9\u8bed
-kn=\u5361\u7eb3\u8fbe\u8bed
-ko=\u97e9\u8bed
-kr=\u5361\u52aa\u91cc\u8bed
-ks=\u514b\u4ec0\u7c73\u5c14\u8bed
-ku=\u5e93\u5c14\u5fb7\u8bed
-kv=\u79d1\u7c73\u8bed
-kw=\u5eb7\u6c83\u5c14\u8bed
-ky=\u67ef\u5c14\u514b\u5b5c\u8bed
-la=\u62c9\u4e01\u8bed
-lb=\u5362\u68ee\u5821\u8bed
-lg=\u5362\u5e72\u8fbe\u8bed
-li=\u6797\u5821\u8bed
-ln=\u6797\u52a0\u62c9\u8bed
-lo=\u8001\u631d\u8bed
-lt=\u7acb\u9676\u5b9b\u8bed
-lu=\u9c81\u5df4\u52a0\u4e39\u52a0\u8bed
-lv=\u62c9\u8131\u7ef4\u4e9a\u8bed
-mg=\u9a6c\u62c9\u52a0\u65af\u8bed
-mh=\u9a6c\u7ecd\u5c14\u8bed
-mi=\u6bdb\u5229\u8bed
-mk=\u9a6c\u5176\u987f\u8bed
-ml=\u9a6c\u62c9\u96c5\u62c9\u59c6\u8bed
-mn=\u8499\u53e4\u8bed
-mo=\u6469\u5c14\u591a\u74e6\u6587
-mr=\u9a6c\u62c9\u5730\u8bed
-ms=\u9a6c\u6765\u8bed
-mt=\u9a6c\u8033\u4ed6\u8bed
-my=\u7f05\u7538\u8bed
-na=\u7459\u9c81\u8bed
-nb=\u4e66\u9762\u632a\u5a01\u8bed
-nd=\u5317\u6069\u5fb7\u8d1d\u52d2\u8bed
-ne=\u5c3c\u6cca\u5c14\u8bed
-ng=\u6069\u4e1c\u52a0\u8bed
-nl=\u8377\u5170\u8bed
-nn=\u632a\u5a01\u5c3c\u8bfa\u65af\u514b\u8bed
-no=\u632a\u5a01\u8bed
-nr=\u5357\u6069\u5fb7\u8d1d\u52d2\u8bed
-nv=\u7eb3\u74e6\u970d\u8bed
-ny=\u9f50\u5207\u74e6\u8bed
-oc=\u5965\u514b\u8bed
-oj=\u5965\u5409\u5e03\u74e6\u8bed
-om=\u5965\u7f57\u83ab\u8bed
-or=\u5965\u91cc\u4e9a\u8bed
-os=\u5965\u585e\u68af\u8bed
-pa=\u65c1\u906e\u666e\u8bed
-pi=\u5df4\u5229\u8bed
-pl=\u6ce2\u5170\u8bed
-ps=\u666e\u4ec0\u56fe\u8bed
-pt=\u8461\u8404\u7259\u8bed
-qu=\u514b\u4e18\u4e9a\u8bed
-rm=\u7f57\u66fc\u4ec0\u8bed
-rn=\u9686\u8fea\u8bed
-ro=\u7f57\u9a6c\u5c3c\u4e9a\u8bed
-ru=\u4fc4\u8bed
-rw=\u5362\u65fa\u8fbe\u8bed
-sa=\u68b5\u8bed
-sc=\u8428\u4e01\u8bed
-sd=\u4fe1\u5fb7\u8bed
-se=\u5317\u65b9\u8428\u7c73\u8bed
-sg=\u6851\u6208\u8bed
-si=\u50e7\u4f3d\u7f57\u8bed
-sk=\u65af\u6d1b\u4f10\u514b\u8bed
-sl=\u65af\u6d1b\u6587\u5c3c\u4e9a\u8bed
-sm=\u8428\u6469\u4e9a\u8bed
-sn=\u7ecd\u7eb3\u8bed
-so=\u7d22\u9a6c\u91cc\u8bed
-sq=\u963f\u5c14\u5df4\u5c3c\u4e9a\u8bed
-sr=\u585e\u5c14\u7ef4\u4e9a\u8bed
-ss=\u65af\u74e6\u8482\u8bed
-st=\u5357\u7d22\u6258\u8bed
-su=\u5dfd\u4ed6\u8bed
-sv=\u745e\u5178\u8bed
-sw=\u65af\u74e6\u5e0c\u91cc\u8bed
-ta=\u6cf0\u7c73\u5c14\u8bed
-te=\u6cf0\u5362\u56fa\u8bed
-tg=\u5854\u5409\u514b\u8bed
-th=\u6cf0\u8bed
-ti=\u63d0\u683c\u5229\u5c3c\u4e9a\u8bed
-tk=\u571f\u5e93\u66fc\u8bed
-tl=\u4ed6\u52a0\u7984\u8bed
-tn=\u8328\u74e6\u7eb3\u8bed
-to=\u6c64\u52a0\u8bed
-tr=\u571f\u8033\u5176\u8bed
-ts=\u806a\u52a0\u8bed
-tt=\u9791\u977c\u8bed
-tw=\u5951\u7ef4\u8bed
-ty=\u5854\u5e0c\u63d0\u8bed
-ug=\u7ef4\u543e\u5c14\u8bed
-uk=\u4e4c\u514b\u5170\u8bed
-ur=\u4e4c\u5c14\u90fd\u8bed
-uz=\u4e4c\u5179\u522b\u514b\u8bed
-ve=\u6587\u8fbe\u8bed
-vi=\u8d8a\u5357\u8bed
-vo=\u6c83\u62c9\u666e\u514b\u8bed
-wa=\u74e6\u9686\u8bed
-wo=\u6c83\u6d1b\u592b\u8bed
-xh=\u79d1\u8428\u8bed
-yi=\u610f\u7b2c\u7eea\u8bed
-yo=\u7ea6\u9c81\u5df4\u8bed
-za=\u58ee\u8bed
-zh=\u4e2d\u6587
-zu=\u7956\u9c81\u8bed
+aa=阿法尔语
+ab=阿布哈西亚语
+ae=阿维斯塔语
+af=南非荷兰语
+ak=阿肯语
+am=阿姆哈拉语
+an=阿拉贡语
+ar=阿拉伯语
+as=阿萨姆语
+av=阿瓦尔语
+ay=艾马拉语
+az=阿塞拜疆语
+ba=巴什基尔语
+be=白俄罗斯语
+bg=保加利亚语
+bh=比哈尔文
+bi=比斯拉马语
+bm=班巴拉语
+bn=孟加拉语
+bo=藏语
+br=布列塔尼语
+bs=波斯尼亚语
+ca=加泰罗尼亚语
+ce=车臣语
+ch=查莫罗语
+co=科西嘉语
+cr=克里族语
+cs=捷克语
+cu=教会斯拉夫语
+cv=楚瓦什语
+cy=威尔士语
+da=丹麦语
+de=德语
+dv=迪维希语
+dz=宗卡语
+ee=埃维语
+el=希腊语
+en=英语
+eo=世界语
+es=西班牙语
+et=爱沙尼亚语
+eu=巴斯克语
+fa=波斯语
+ff=富拉语
+fi=芬兰语
+fj=斐济语
+fo=法罗语
+fr=法语
+fy=西弗里西亚语
+ga=爱尔兰语
+gd=苏格兰盖尔语
+gl=加利西亚语
+gn=瓜拉尼语
+gu=古吉拉特语
+gv=马恩语
+ha=豪萨语
+he=希伯来语
+hi=印地语
+ho=希里莫图语
+hr=克罗地亚语
+ht=海地克里奥尔语
+hu=匈牙利语
+hy=亚美尼亚语
+hz=赫雷罗语
+ia=国际语
+id=印度尼西亚语
+ie=国际文字（E）
+ig=伊博语
+ii=四川彝语
+ik=伊努皮克语
+in=印度尼西亚语
+io=伊多语
+is=冰岛语
+it=意大利语
+iu=因纽特语
+iw=希伯来语
+ja=日语
+ji=意第绪语
+jv=爪哇语
+ka=格鲁吉亚语
+kg=刚果语
+ki=吉库尤语
+kj=宽亚玛语
+kk=哈萨克语
+kl=格陵兰语
+km=高棉语
+kn=卡纳达语
+ko=韩语
+kr=卡努里语
+ks=克什米尔语
+ku=库尔德语
+kv=科米语
+kw=康沃尔语
+ky=柯尔克孜语
+la=拉丁语
+lb=卢森堡语
+lg=卢干达语
+li=林堡语
+ln=林加拉语
+lo=老挝语
+lt=立陶宛语
+lu=鲁巴加丹加语
+lv=拉脱维亚语
+mg=马拉加斯语
+mh=马绍尔语
+mi=毛利语
+mk=马其顿语
+ml=马拉雅拉姆语
+mn=蒙古语
+mo=摩尔多瓦文
+mr=马拉地语
+ms=马来语
+mt=马耳他语
+my=缅甸语
+na=瑙鲁语
+nb=书面挪威语
+nd=北恩德贝勒语
+ne=尼泊尔语
+ng=恩东加语
+nl=荷兰语
+nn=挪威尼诺斯克语
+no=挪威语
+nr=南恩德贝勒语
+nv=纳瓦霍语
+ny=齐切瓦语
+oc=奥克语
+oj=奥吉布瓦语
+om=奥罗莫语
+or=奥里亚语
+os=奥塞梯语
+pa=旁遮普语
+pi=巴利语
+pl=波兰语
+ps=普什图语
+pt=葡萄牙语
+qu=克丘亚语
+rm=罗曼什语
+rn=隆迪语
+ro=罗马尼亚语
+ru=俄语
+rw=卢旺达语
+sa=梵语
+sc=萨丁语
+sd=信德语
+se=北方萨米语
+sg=桑戈语
+si=僧伽罗语
+sk=斯洛伐克语
+sl=斯洛文尼亚语
+sm=萨摩亚语
+sn=绍纳语
+so=索马里语
+sq=阿尔巴尼亚语
+sr=塞尔维亚语
+ss=斯瓦蒂语
+st=南索托语
+su=巽他语
+sv=瑞典语
+sw=斯瓦希里语
+ta=泰米尔语
+te=泰卢固语
+tg=塔吉克语
+th=泰语
+ti=提格利尼亚语
+tk=土库曼语
+tl=他加禄语
+tn=茨瓦纳语
+to=汤加语
+tr=土耳其语
+ts=聪加语
+tt=鞑靼语
+tw=契维语
+ty=塔希提语
+ug=维吾尔语
+uk=乌克兰语
+ur=乌尔都语
+uz=乌兹别克语
+ve=文达语
+vi=越南语
+vo=沃拉普克语
+wa=瓦隆语
+wo=沃洛夫语
+xh=科萨语
+yi=意第绪语
+yo=约鲁巴语
+za=壮语
+zh=中文
+zu=祖鲁语
 
 # key is ISO 639.2 language code
-aar=\u963f\u6cd5\u5c14\u6587
-abk=\u963f\u5e03\u54c8\u897f\u4e9a\u6587
-ace=\u4e9a\u9f50\u8bed
-ach=\u963f\u4e54\u5229\u8bed
-ada=\u963f\u5f53\u6885\u8bed
-ady=\u963f\u8fea\u683c\u8bed
-afa=\u4e9a\u975e\u8bf8\u8bed\u8a00
-afh=\u963f\u5f17\u91cc\u5e0c\u5229\u8bed
-afr=\u5357\u975e\u8377\u5170\u6587
-ain=\u963f\u4f0a\u52aa\u8bed
-aka=\u5e93\u963f\u6587
-akk=\u963f\u5361\u5fb7\u8bed
-alb=\u963f\u5c14\u5df4\u5c3c\u4e9a\u6587
-ale=\u963f\u7559\u7533\u8bed
-alg=\u5176\u4ed6\u963f\u5c14\u8d21\u8bed\u7cfb
-alt=\u5357\u963f\u5c14\u6cf0\u8bed
-amh=\u963f\u59c6\u54c8\u62c9\u6587
-ang=\u53e4\u82f1\u8bed
-anp=\u6602\u52a0\u8bed
-apa=\u963f\u5e15\u5207\u6587
-ara=\u963f\u62c9\u4f2f\u6587
-arc=\u963f\u62c9\u7c73\u8bed
-arg=\u963f\u62c9\u8d21\u6587
-arm=\u4e9a\u7f8e\u5c3c\u4e9a\u6587
-arn=\u9a6c\u666e\u5207\u8bed
-arp=\u963f\u62c9\u5e15\u970d\u8bed
-art=\u5176\u4ed6\u4eba\u5de5\u8bed\u7cfb
-arw=\u963f\u62c9\u74e6\u514b\u8bed
-asm=\u963f\u8428\u59c6\u6587
-ast=\u963f\u65af\u56fe\u91cc\u4e9a\u65af\u8bed
-ath=\u963f\u8428\u5e15\u65af\u574e\u8bed\u7cfb
-aus=\u6fb3\u5927\u5229\u4e9a\u8bed\u7cfb
-ava=\u963f\u74e6\u5c14\u6587
-ave=\u963f\u7ef4\u65af\u9640\u6587
-awa=\u963f\u74e6\u5fb7\u8bed
-aym=\u827e\u9a6c\u62c9\u6587
-aze=\u963f\u585e\u62dc\u7586\u6587
-bad=\u73ed\u8fbe\u6587
-bai=\u5df4\u7c73\u7d2f\u514b\u8bed\u7cfb
-bak=\u5df4\u4ec0\u5ba2\u5c14\u6587
-bal=\u4ffe\u8def\u652f\u8bed
-bam=\u73ed\u5df4\u62c9\u6587
-ban=\u5df4\u5398\u8bed
-baq=\u5df4\u65af\u514b\u6587
-bas=\u5df4\u8428\u8bed
-bat=\u5176\u4ed6\u6ce2\u7f57\u7684\u8bed\u7cfb
-bej=\u8d1d\u6c99\u8bed
-bel=\u767d\u4fc4\u7f57\u65af\u6587
-bem=\u672c\u5df4\u8bed
-ben=\u5b5f\u52a0\u62c9\u6587
-ber=\u67cf\u67cf\u5c14\u6587
-bho=\u535a\u6770\u666e\u5c14\u8bed
-bih=\u6bd4\u54c8\u5c14\u6587
-bik=\u6bd4\u79d1\u5c14\u8bed
-bin=\u6bd4\u5c3c\u8bed
-bis=\u6bd4\u65af\u62c9\u9a6c\u6587
-bla=\u897f\u514b\u897f\u5361\u8bed
-bnt=\u73ed\u56fe\u6587
-bos=\u6ce2\u65af\u5c3c\u4e9a\u6587
-bra=\u5e03\u62c9\u6770\u8bed
-bre=\u5e03\u91cc\u591a\u5c3c\u6587
-btk=\u5df4\u5854\u514b\u8bed
-bua=\u5e03\u91cc\u4e9a\u7279\u8bed
-bug=\u5e03\u5409\u8bed
-bul=\u4fdd\u52a0\u5229\u4e9a\u6587
-bur=\u7f05\u7538\u6587
-byn=\u6bd4\u6797\u8bed
-cad=\u5361\u591a\u8bed
-cai=\u5176\u4ed6\u4e2d\u7f8e\u5370\u7b2c\u5b89\u8bed\u7cfb
-car=\u52a0\u52d2\u6bd4\u8bed
-cat=\u52a0\u6cf0\u7f57\u5c3c\u4e9a\u6587
-cau=\u5176\u4ed6\u9ad8\u52a0\u7d22\u8bed\u7cfb
-ceb=\u5bbf\u52a1\u8bed
-cel=\u5176\u4ed6\u51ef\u5c14\u7279\u8bed\u7cfb
-cha=\u67e5\u83ab\u7f57\u6587
-chb=\u5947\u5e03\u67e5\u8bed
-che=\u8f66\u81e3\u6587
-chg=\u5bdf\u5408\u53f0\u8bed
-chi=\u4e2d\u6587
-chk=\u695a\u514b\u8bed
-chm=\u9a6c\u91cc\u8bed
-chn=\u5947\u52aa\u514b\u6df7\u5408\u8bed
-cho=\u4e54\u514b\u6258\u8bed
-chp=\u5947\u4f69\u7ef4\u5b89\u8bed
-chr=\u5207\u7f57\u57fa\u8bed
-chu=\u6559\u4f1a\u65af\u62c9\u592b\u6587
-chv=\u695a\u74e6\u4ec0\u6587
-chy=\u590f\u5ef6\u8bed
-cmc=\u67e5\u7c73\u514b\u6587
-cop=\u79d1\u666e\u7279\u8bed
-cor=\u5eb7\u6c83\u5c14\u6587
-cos=\u79d1\u897f\u5609\u6587
-cpe=\u5176\u4ed6\u4ee5\u82f1\u6587\u4e3a\u57fa\u7840\u7684\u514b\u91cc\u5965\u5c14\u6df7\u5408\u8bed\u7cfb
-cpf=\u5176\u4ed6\u4ee5\u6cd5\u6587\u4e3a\u57fa\u7840\u7684\u514b\u91cc\u5965\u5c14\u6df7\u5408\u8bed\u7cfb
-cpp=\u5176\u4ed6\u4ee5\u8461\u8404\u7259\u6587\u4e3a\u57fa\u7840\u7684\u514b\u91cc\u5965\u5c14\u6df7\u5408\u8bed\u7cfb
-cre=\u514b\u91cc\u6587
-crh=\u514b\u91cc\u7c73\u4e9a\u571f\u8033\u5176\u8bed
-crp=\u5176\u4ed6\u514b\u91cc\u5965\u5c14\u6df7\u5408\u8bed\u7cfb
-csb=\u5361\u8212\u6bd4\u8bed
-cus=\u5176\u4ed6\u5e93\u65bd\u7279\u8bed\u7cfb
-cze=\u6377\u514b\u6587
-dak=\u8fbe\u79d1\u4ed6\u8bed
-dan=\u4e39\u9ea6\u6587
-dar=\u8fbe\u5c14\u683c\u74e6\u8bed
-day=\u8fbe\u96c5\u514b\u6587
-del=\u7279\u62c9\u534e\u8bed
-den=\u53f2\u62c9\u7ef4\u8bed
-dgr=\u591a\u683c\u91cc\u5e03\u8bed
-din=\u4e01\u5361\u8bed
-div=\u8fea\u7ef4\u5e0c\u6587
-doi=\u591a\u683c\u62c9\u8bed
-dra=\u5176\u4ed6\u5fb7\u62c9\u7ef4\u8bed\u7cfb
-dsb=\u4e0b\u7d22\u5e03\u8bed
-dua=\u675c\u963f\u62c9\u8bed
-dum=\u4e2d\u53e4\u8377\u5170\u8bed
-dut=\u8377\u5170\u6587
-dyu=\u8fea\u5c24\u62c9\u8bed
-dzo=\u4e0d\u4e39\u6587
-efi=\u57c3\u83f2\u514b\u8bed
-egy=\u53e4\u57c3\u53ca\u8bed
-eka=\u827e\u5361\u6731\u514b\u8bed
-elx=\u57c3\u5170\u8bed
-eng=\u82f1\u6587
-enm=\u4e2d\u53e4\u82f1\u8bed
-epo=\u4e16\u754c\u6587
-est=\u7231\u6c99\u5c3c\u4e9a\u6587
-ewe=\u57c3\u7ef4\u6587
-ewo=\u57c3\u7fc1\u591a\u8bed
-fan=\u82b3\u683c\u8bed
-fao=\u6cd5\u7f57\u6587
-fat=\u82b3\u8482\u8bed
-fij=\u6590\u6d4e\u6587
-fil=\u83f2\u5f8b\u5bbe\u8bed
-fin=\u82ac\u5170\u6587
-fiu=\u5176\u4ed6\u82ac\u5170\u4e4c\u6208\u5c14\u8bed\u7cfb
-fon=\u4e30\u8bed
-fre=\u6cd5\u6587
-frm=\u4e2d\u53e4\u6cd5\u8bed
-fro=\u53e4\u6cd5\u8bed
-frr=\u5317\u5f17\u91cc\u897f\u4e9a\u8bed
-frs=\u4e1c\u5f17\u91cc\u897f\u4e9a\u8bed
-fry=\u897f\u5f17\u91cc\u65af\u5170\u8bed
-ful=\u5bcc\u62c9\u6587
-fur=\u5f17\u7559\u5229\u8bed
-gaa=\u52a0\u65cf\u8bed
-gay=\u8fe6\u7ea6\u8bed
-gba=\u683c\u5df4\u4e9a\u8bed
-gem=\u5176\u4ed6\u65e5\u5c14\u66fc\u8bed\u7cfb
-geo=\u683c\u9c81\u5409\u4e9a\u6587
-ger=\u5fb7\u6587
-gez=\u5409\u5179\u8bed
-gil=\u5409\u5c14\u4f2f\u7279\u8bed
-gla=\u76d6\u5c14\u8bed
-gle=\u7231\u5c14\u5170\u6587
-glg=\u52a0\u5229\u897f\u4e9a\u6587
-glv=\u9a6c\u6069\u6587
-gmh=\u4e2d\u53e4\u9ad8\u5730\u5fb7\u8bed
-goh=\u53e4\u9ad8\u5730\u5fb7\u8bed
-gon=\u5188\u5fb7\u8bed
-gor=\u54e5\u4f26\u6253\u6d1b\u8bed
-got=\u54e5\u7279\u8bed
-grb=\u683c\u5217\u535a\u8bed
-grc=\u53e4\u5e0c\u814a\u8bed
-gre=\u5e0c\u814a\u8bed, \u73b0\u4ee3 (1453-)
-grn=\u74dc\u62c9\u5c3c\u6587
-gsw=\u745e\u58eb\u5fb7\u8bed
-guj=\u53e4\u52a0\u62c9\u63d0\u6587
-gwi=\u54e5\u5a01\u8fc5\u8bed
-hai=\u6d77\u8fbe\u8bed
-hat=\u6d77\u5730\u6587
-hau=\u8c6a\u6492\u6587
-haw=\u590f\u5a01\u5937\u8bed
-heb=\u5e0c\u4f2f\u6765\u6587
-her=\u8d6b\u96f7\u7f57\u6587
-hil=\u5e0c\u5229\u76d6\u519c\u8bed
-him=\u8d6b\u9a6c\u67e5\u5229\u6587
-hin=\u5370\u5730\u6587
-hit=\u8d6b\u68af\u8bed
-hmn=\u82d7\u8bed
-hmo=\u65b0\u91cc\u6728\u6258\u6587
-hrv=\u514b\u7f57\u5730\u4e9a\u6587
-hsb=\u4e0a\u7d22\u5e03\u8bed
-hun=\u5308\u7259\u5229\u6587
-hup=\u80e1\u5e15\u8bed
-iba=\u4f0a\u73ed\u8bed
-ibo=\u4f0a\u535a\u6587
-ice=\u51b0\u5c9b\u6587
-ido=\u4f0a\u591a\u6587
-iii=\u56db\u5ddd\u5f5d\u6587
-ijo=\u4f0a\u4e54\u6587
-iku=\u7231\u65af\u57fa\u6469\u6587
-ile=\u62c9\u4e01\u56fd\u9645\u6587
-ilo=\u4f0a\u6d1b\u5361\u8bfa\u8bed
-ina=\u62c9\u4e01\u56fd\u9645\u8bed (\u56fd\u9645\u8f85\u52a9\u8bed\u8054\u76df)
-inc=\u5176\u4ed6\u5370\u5ea6\u8bed\u7cfb
-ind=\u5370\u5ea6\u5c3c\u897f\u4e9a\u6587
-ine=\u5176\u4ed6\u5370\u6b27\u8bed\u7cfb
-inh=\u5370\u53e4\u4ec0\u8bed
-ipk=\u4f9d\u5974\u76ae\u7ef4\u514b\u6587
-ira=\u4f0a\u6717\u6587
-iro=\u4f0a\u6d1b\u9b41\u8bed\u7cfb
-ita=\u610f\u5927\u5229\u6587
-jav=\u722a\u54c7\u6587
-jbo=\u903b\u8f91\u8bed
-jpn=\u65e5\u6587
-jpr=\u72b9\u592a\u6ce2\u65af\u8bed
-jrb=\u72b9\u592a\u963f\u62c9\u4f2f\u8bed
-kaa=\u5361\u62c9\u5361\u5c14\u5e15\u514b\u8bed
-kab=\u5361\u62dc\u5c14\u8bed
-kac=\u514b\u94a6\u8bed
-kal=\u683c\u9675\u5170\u6587
-kam=\u5361\u59c6\u5df4\u8bed
-kan=\u5361\u7eb3\u5854\u514b\u8bed
-kar=\u5580\u4f26\u6587
-kas=\u514b\u4ec0\u7c73\u5c14\u6587
-kau=\u5361\u52aa\u91cc\u6587
-kaw=\u5361\u5a01\u8bed
-kaz=\u54c8\u8428\u514b\u6587
-kbd=\u5361\u5df4\u5c14\u5fb7\u8bed
-kha=\u5361\u897f\u8bed
-khi=\u5176\u4ed6\u79d1\u4f0a\u6851\u8bed\u7cfb
-khm=\u4e2d\u9ad8\u68c9\u8bed
-kho=\u548c\u7530\u8bed
-kik=\u5409\u5e93\u5c24\u6587
-kin=\u5362\u65fa\u8fbe\u6587
-kir=\u5409\u5c14\u5409\u65af\u6587
-kmb=\u91d1\u90a6\u675c\u8bed
-kok=\u5b54\u5361\u5c3c\u8bed
-kom=\u79d1\u7c73\u6587
-kon=\u521a\u679c\u6587
-kor=\u671d\u9c9c\u6587
-kos=\u79d1\u65af\u62c9\u4f0a\u8bed
-kpe=\u514b\u4f69\u5217\u8bed
-krc=\u5361\u62c9\u6070\u4f0a\u5df4\u5c14\u5361\u5c14\u8bed
-krl=\u5361\u7d2f\u5229\u963f\u8bed
-kro=\u514b\u9c81\u6587
-kru=\u5e93\u9c81\u514b\u8bed
-kua=\u5bbd\u4e9a\u739b\u8bed
-kum=\u5e93\u6885\u514b\u8bed
-kur=\u5e93\u5c14\u5fb7\u6587
-kut=\u5e93\u7279\u5948\u8bed
-lad=\u62c9\u8fea\u8bfa\u8bed
-lah=\u5370\u5ea6-\u96c5\u5229\u5b89\u8bed
-lam=\u5170\u5df4\u8bed
-lao=\u8001\u631d\u6587
-lat=\u62c9\u4e01\u6587
-lav=\u62c9\u6258\u7ef4\u4e9a\u6587 (\u5217\u6258)
-lez=\u5217\u5179\u91d1\u8bed
-lim=\u6797\u5821\u6587
-lin=\u6797\u52a0\u62c9\u6587
-lit=\u7acb\u9676\u5b9b\u6587
-lol=\u8499\u6208\u8bed
-loz=\u6d1b\u9f50\u8bed
-ltz=\u5362\u68ee\u5821\u6587
-lua=\u5362\u5df4-\u5362\u62c9\u8bed
-lub=\u5362\u5df4-\u52a0\u4e39\u52a0\u6587
-lug=\u5e72\u8fbe\u6587
-lui=\u5362\u4f0a\u585e\u8bfa\u8bed
-lun=\u9686\u8fbe\u8bed
-luo=\u5362\u5965\u8bed
-lus=\u7c73\u4f50\u8bed
-mac=\u9a6c\u5176\u987f\u6587
-mad=\u9a6c\u90fd\u62c9\u8bed
-mag=\u6469\u63ed\u9640\u8bed
-mah=\u9a6c\u7ecd\u5c14\u6587
-mai=\u8fc8\u8482\u5229\u8bed
-mak=\u671b\u52a0\u9521\u8bed
-mal=\u9a6c\u6765\u4e9a\u62c9\u59c6\u6587
-man=\u66fc\u4e01\u54e5\u8bed
-mao=\u6bdb\u5229\u6587
-map=\u6fb3\u65af\u7279\u7f57\u5c3c\u897f\u4e9a\u8bed\u7cfb
-mar=\u9a6c\u62c9\u5730\u6587
-mas=\u9a6c\u8d5b\u8bed
-may=\u9a6c\u6765\u6587
-mdf=\u83ab\u514b\u6c99\u8bed
-mdr=\u66fc\u8fbe\u5c14\u8bed
-men=\u95e8\u5fb7\u8bed
-mga=\u4e2d\u53e4\u7231\u5c14\u5170\u8bed
-mic=\u5bc6\u514b\u9a6c\u514b\u8bed
-min=\u7c73\u5357\u4f73\u4fdd\u8bed
-mis=\u5404\u79cd\u4e0d\u540c\u8bed\u7cfb
-mkh=\u5176\u4ed6\u5b5f\u9ad8\u68c9\u8bed\u7cfb
-mlg=\u9a6c\u5c14\u52a0\u4ec0\u6587
-mlt=\u9a6c\u8033\u4ed6\u6587
-mnc=\u6ee1\u8bed
-mni=\u66fc\u5c3c\u666e\u5c14\u8bed
-mno=\u9a6c\u8bfa\u535a\u8bed\u7cfb
-moh=\u6469\u970d\u514b\u8bed
-mon=\u8499\u53e4\u6587
-mos=\u83ab\u897f\u8bed
-mul=\u591a\u8bed\u79cd
-mun=\u8499\u8fbe\u8bed\u7cfb
-mus=\u514b\u91cc\u514b\u8bed
-mwl=\u7c73\u5170\u5fb7\u65af\u8bed
-mwr=\u9a6c\u5c14\u74e6\u91cc\u8bed
-myn=\u739b\u96c5\u8bed\u7cfb
-myv=\u5384\u5c14\u5179\u4e9a\u8bed
-nah=\u7eb3\u74e6\u7279\u5c14\u6587
-nai=\u5176\u4ed6\u5317\u7f8e\u5370\u7b2c\u5b89\u8bed\u7cfb
-nap=\u90a3\u4e0d\u52d2\u65af\u8bed
-nau=\u7459\u9c81\u6587
-nav=\u7eb3\u74e6\u970d\u6587
-nbl=\u6069\u5fb7\u8d1d\u52d2\u8bed, \u5357\u90e8
-nde=\u6069\u5fb7\u8d1d\u52d2\u8bed, \u5317\u90e8
-ndo=\u6069\u4e1c\u52a0\u6587
-nds=\u4f4e\u5730\u5fb7\u8bed
-nep=\u5c3c\u6cca\u5c14\u6587
-new=\u5c3c\u74e6\u5c14\u8bed
-nia=\u5c3c\u4e9a\u65af\u8bed
-nic=\u5c3c\u52a0\u62c9\u74dc\u79d1\u591a\u5df4
-niu=\u7ebd\u57c3\u8bed
-nno=\u632a\u5a01\u5c3c\u8bfa\u65af\u514b\u6587
-nob=\u632a\u5a01\u535a\u514b\u9a6c\u5c14\u8bed
-nog=\u8bfa\u76d6\u8bed
-non=\u53e4\u8bfa\u5c14\u65af\u8bed
-nor=\u632a\u5a01\u6587
-nqo=\u897f\u975e\u4e66\u9762\u6587\u5b57
-nso=\u5317\u7d22\u6258\u8bed
-nub=\u52aa\u6bd4\u4e9a\u8bed\u7cfb
-nwc=\u53e4\u5178\u5c3c\u74e6\u5c14\u8bed
-nya=\u9f50\u5207\u74e6\u8bed
-nym=\u5c3c\u626c\u97e6\u9f50\u8bed
-nyn=\u5c3c\u6602\u79d1\u52d2\u8bed
-nyo=\u5c3c\u5965\u7f57\u8bed
-nzi=\u6069\u6d4e\u9a6c\u8bed
-oci=\u5965\u897f\u5766\u6587 (1500 \u540e)
-oji=\u5965\u5409\u5e03\u74e6\u6587
-ori=\u6b27\u91cc\u4e9a\u6587
-orm=\u963f\u66fc\u6587
-osa=\u5965\u585e\u6cbb\u8bed
-oss=\u5965\u585e\u68af\u6587
-ota=\u5965\u65af\u66fc\u571f\u8033\u5176\u8bed
-oto=\u5965\u6258\u7c73\u8bed\u7cfb
-paa=\u5176\u4ed6\u5df4\u5e03\u4e9a\u6587
-pag=\u90a6\u963f\u897f\u5357\u8bed
-pal=\u5df4\u62c9\u7ef4\u8bed
-pam=\u90a6\u677f\u7259\u8bed
-pan=\u65c1\u906e\u666e\u6587
-pap=\u5e15\u76ae\u963f\u95e8\u6258\u8bed
-pau=\u5e15\u52b3\u8bed
-peo=\u53e4\u6ce2\u65af\u8bed
-per=\u6ce2\u65af\u6587
-phi=\u5176\u4ed6\u83f2\u5f8b\u5bbe\u8bed\u7cfb
-phn=\u8153\u5c3c\u57fa\u8bed
-pli=\u5df4\u5229\u6587
-pol=\u6ce2\u5170\u6587
-pon=\u6ce2\u7eb3\u4f69\u8bed
-por=\u8461\u8404\u7259\u6587
-pra=\u666e\u62c9\u514b\u91cc\u7279\u8bf8\u8bed\u8a00
-pro=\u53e4\u666e\u7f57\u6587\u65af\u8bed
-pus=\u666e\u4ec0\u56fe\u6587
-que=\u76d6\u4e18\u4e9a\u6587
-raj=\u62c9\u8d3e\u65af\u5766\u8bed
-rap=\u62c9\u5e15\u52aa\u4f0a\u8bed
-rar=\u62c9\u7f57\u6c64\u52a0\u8bed
-roa=\u5176\u4ed6\u62c9\u4e01\u8bed\u7cfb
-roh=\u7f57\u66fc\u4ec0\u8bed
-rom=\u5409\u666e\u8d5b\u8bed
-rum=\u7f57\u9a6c\u5c3c\u4e9a\u6587
-run=\u57fa\u9686\u8fea\u6587
-rup=\u963f\u7f57\u9a6c\u5c3c\u4e9a\u8bed
-rus=\u4fc4\u6587
-sad=\u6851\u8fbe\u97e6\u8bed
-sag=\u6851\u6208\u6587
-sah=\u8428\u54c8\u8bed
-sai=\u5176\u4ed6\u5357\u7f8e\u5370\u7b2c\u5b89\u6587
-sal=\u8428\u5229\u4ec0\u6587
-sam=\u8428\u9a6c\u5229\u4e9a\u963f\u62c9\u59c6\u8bed
-san=\u68b5\u6587
-sas=\u8428\u8428\u514b\u6587
-sat=\u6851\u5854\u5229\u8bed
-scn=\u897f\u897f\u91cc\u8bed
-sco=\u82cf\u683c\u5170\u8bed
-sel=\u585e\u5c14\u5e93\u666e\u8bed
-sem=\u5176\u4ed6\u95ea\u65cf\u8bed\u7cfb
-sga=\u53e4\u7231\u5c14\u5170\u8bed
-sgn=\u624b\u8bed
-shn=\u63b8\u8bed
-sid=\u6089\u8fbe\u6469\u8bed
-sin=\u8f9b\u54c8\u62c9\u8bed
-sio=\u82cf\u8bed\u8bf8\u8bed\u8a00
-sit=\u6c49\u85cf\u8bf8\u8bed\u8a00
-sla=\u5176\u4ed6\u65af\u62c9\u592b\u8bed\u7cfb
-slo=\u65af\u6d1b\u4f10\u514b\u6587
-slv=\u65af\u6d1b\u6587\u5c3c\u4e9a\u6587
-sma=\u5357\u8428\u7c73\u8bed
-sme=\u5317\u6c99\u5bc6\u6587
-smi=\u5176\u4ed6\u8428\u7c73\u6587
-smj=\u5415\u52d2\u8428\u7c73\u8bed
-smn=\u4f0a\u7eb3\u91cc\u8428\u7c73\u8bed
-smo=\u8428\u6469\u4e9a\u6587
-sms=\u65af\u79d1\u7279\u8428\u7c73\u8bed
-sna=\u4fee\u7eb3\u6587
-snd=\u4fe1\u5fb7\u6587
-snk=\u7d22\u5b81\u514b\u8bed
-sog=\u7c9f\u7279\u8bed
-som=\u7d22\u9a6c\u91cc\u6587
-son=\u6851\u6d77\u6587
-sot=\u7d22\u6258\u8bed, \u5357\u90e8
-spa=\u897f\u73ed\u7259\u6587
-srd=\u6492\u4e01\u6587
-srn=\u82cf\u91cc\u5357\u6c64\u52a0\u8bed
-srp=\u585e\u5c14\u7ef4\u4e9a\u6587
-srr=\u585e\u96f7\u5c14\u8bed
-ssa=\u975e\u6d32\u6492\u54c8\u62c9\u6c99\u6f20\u8fb9\u7f18\u5730\u5e26\u8bed\u8a00
-ssw=\u65af\u74e6\u7279\u6587
-suk=\u82cf\u5e93\u9a6c\u8bed
-sun=\u5dfd\u4ed6\u6587
-sus=\u82cf\u82cf\u8bed
-sux=\u82cf\u7f8e\u5c14\u8bed
-swa=\u65af\u74e6\u5e0c\u91cc\u6587
-swe=\u745e\u5178\u6587
-syc=\u53e4\u5178\u53d9\u5229\u4e9a\u8bed
-syr=\u53d9\u5229\u4e9a\u8bed
-tah=\u5854\u5e0c\u63d0\u6587
-tai=\u50a3\u8bed\u8bf8\u8bed\u8a00 (\u5176\u4ed6)
-tam=\u6cf0\u7c73\u5c14\u6587
-tat=\u9791\u977c\u6587
-tel=\u6cf0\u5362\u56fa\u6587
-tem=\u6cf0\u59c6\u5948\u8bed
-ter=\u7279\u4f26\u8bfa\u8bed
-tet=\u5fb7\u987f\u8bed
-tgk=\u5854\u5409\u514b\u6587
-tgl=\u5854\u52a0\u8def\u65cf\u6587
-tha=\u6cf0\u6587
-tib=\u897f\u85cf\u6587
-tig=\u63d0\u683c\u96f7\u8bed
-tir=\u63d0\u683c\u91cc\u5c3c\u4e9a\u6587
-tiv=\u8482\u592b\u8bed
-tkl=\u6258\u514b\u52b3\u8bed
-tlh=\u514b\u6797\u8d21\u8bed
-tli=\u7279\u6797\u5409\u7279\u8bed
-tmh=\u5854\u9a6c\u5947\u514b\u8bed
-tog=\u5c3c\u4e9a\u8428\u6c64\u52a0\u8bed
-ton=\u6c64\u52a0\u8bed (\u6c64\u52a0\u5c9b)
-tpi=\u6258\u514b\u76ae\u8f9b\u8bed
-tsi=\u94a6\u897f\u5b89\u8bed
-tsn=\u7a81\u5c3c\u65af\u6587
-tso=\u7279\u677e\u52a0\u6587
-tuk=\u571f\u5e93\u66fc\u6587
-tum=\u901a\u5e03\u5361\u8bed
-tup=\u56fe\u76ae\u8bed\u7cfb
-tur=\u571f\u8033\u5176\u6587
-tut=\u963f\u5c14\u6cf0\u8bf8\u8bed\u8a00 (\u5176\u4ed6)
-tvl=\u56fe\u74e6\u5362\u8bed
-twi=\u5951\u7ef4\u6587
-tyv=\u56fe\u74e6\u8bed
-udm=\u4e4c\u5fb7\u7a46\u5c14\u7279\u8bed
-uga=\u4e4c\u52a0\u91cc\u7279\u8bed
-uig=\u7ef4\u543e\u5c14\u6587
-ukr=\u4e4c\u514b\u5170\u6587
-umb=\u7fc1\u672c\u675c\u8bed
-und=\u672a\u77e5\u8bed\u8a00
-urd=\u4e4c\u5c14\u90fd\u6587
-uzb=\u4e4c\u5179\u522b\u514b\u6587
-vai=\u74e6\u4f0a\u8bed
-ven=\u6587\u8fbe\u6587
-vie=\u8d8a\u5357\u6587
-vol=\u6c83\u62c9\u666e\u514b\u6587
-vot=\u6c83\u63d0\u514b\u8bed
-wak=\u74e6\u5361\u4ec0\u8bf8\u8bed\u8a00
-wal=\u74e6\u62c9\u83ab\u8bed
-war=\u74e6\u745e\u8bed
-was=\u74e6\u7ecd\u8bed
-wel=\u5a01\u5c14\u58eb\u6587
-wen=\u7d22\u5e03\u8bf8\u8bed\u8a00
-wln=\u74e6\u9f99\u6587
-wol=\u6c83\u5c14\u592b\u6587
-xal=\u5361\u5c14\u6885\u514b\u8bed
-xho=\u73ed\u56fe\u6587
-yao=\u7476\u65cf\u8bed
-yap=\u96c5\u6d66\u8bed
-yid=\u4f9d\u5730\u6587
-yor=\u7ea6\u9c81\u5df4\u6587
-ypk=\u5c24\u76ae\u514b\u8bf8\u8bed\u8a00
-zap=\u8428\u6ce2\u8482\u514b\u8bed
-zbl=\u5e03\u91cc\u65af\u7b26\u53f7
-zen=\u6cfd\u7eb3\u52a0\u8bed
-zha=\u58ee\u6587
-znd=\u8d5e\u5fb7\u6587
-zul=\u7956\u9c81\u6587
-zun=\u7956\u5c3c\u8bed
-zxx=\u65e0\u8bed\u8a00\u5185\u5bb9
-zza=\u624e\u624e\u8bed
+aar=阿法尔文
+abk=阿布哈西亚文
+ace=亚齐语
+ach=阿乔利语
+ada=阿当梅语
+ady=阿迪格语
+afa=亚非诸语言
+afh=阿弗里希利语
+afr=南非荷兰文
+ain=阿伊努语
+aka=库阿文
+akk=阿卡德语
+alb=阿尔巴尼亚文
+ale=阿留申语
+alg=其他阿尔贡语系
+alt=南阿尔泰语
+amh=阿姆哈拉文
+ang=古英语
+anp=昂加语
+apa=阿帕切文
+ara=阿拉伯文
+arc=阿拉米语
+arg=阿拉贡文
+arm=亚美尼亚文
+arn=马普切语
+arp=阿拉帕霍语
+art=其他人工语系
+arw=阿拉瓦克语
+asm=阿萨姆文
+ast=阿斯图里亚斯语
+ath=阿萨帕斯坎语系
+aus=澳大利亚语系
+ava=阿瓦尔文
+ave=阿维斯陀文
+awa=阿瓦德语
+aym=艾马拉文
+aze=阿塞拜疆文
+bad=班达文
+bai=巴米累克语系
+bak=巴什客尔文
+bal=俾路支语
+bam=班巴拉文
+ban=巴厘语
+baq=巴斯克文
+bas=巴萨语
+bat=其他波罗的语系
+bej=贝沙语
+bel=白俄罗斯文
+bem=本巴语
+ben=孟加拉文
+ber=柏柏尔文
+bho=博杰普尔语
+bih=比哈尔文
+bik=比科尔语
+bin=比尼语
+bis=比斯拉马文
+bla=西克西卡语
+bnt=班图文
+bos=波斯尼亚文
+bra=布拉杰语
+bre=布里多尼文
+btk=巴塔克语
+bua=布里亚特语
+bug=布吉语
+bul=保加利亚文
+bur=缅甸文
+byn=比林语
+cad=卡多语
+cai=其他中美印第安语系
+car=加勒比语
+cat=加泰罗尼亚文
+cau=其他高加索语系
+ceb=宿务语
+cel=其他凯尔特语系
+cha=查莫罗文
+chb=奇布查语
+che=车臣文
+chg=察合台语
+chi=中文
+chk=楚克语
+chm=马里语
+chn=奇努克混合语
+cho=乔克托语
+chp=奇佩维安语
+chr=切罗基语
+chu=教会斯拉夫文
+chv=楚瓦什文
+chy=夏延语
+cmc=查米克文
+cop=科普特语
+cor=康沃尔文
+cos=科西嘉文
+cpe=其他以英文为基础的克里奥尔混合语系
+cpf=其他以法文为基础的克里奥尔混合语系
+cpp=其他以葡萄牙文为基础的克里奥尔混合语系
+cre=克里文
+crh=克里米亚土耳其语
+crp=其他克里奥尔混合语系
+csb=卡舒比语
+cus=其他库施特语系
+cze=捷克文
+dak=达科他语
+dan=丹麦文
+dar=达尔格瓦语
+day=达雅克文
+del=特拉华语
+den=史拉维语
+dgr=多格里布语
+din=丁卡语
+div=迪维希文
+doi=多格拉语
+dra=其他德拉维语系
+dsb=下索布语
+dua=杜阿拉语
+dum=中古荷兰语
+dut=荷兰文
+dyu=迪尤拉语
+dzo=不丹文
+efi=埃菲克语
+egy=古埃及语
+eka=艾卡朱克语
+elx=埃兰语
+eng=英文
+enm=中古英语
+epo=世界文
+est=爱沙尼亚文
+ewe=埃维文
+ewo=埃翁多语
+fan=芳格语
+fao=法罗文
+fat=芳蒂语
+fij=斐济文
+fil=菲律宾语
+fin=芬兰文
+fiu=其他芬兰乌戈尔语系
+fon=丰语
+fre=法文
+frm=中古法语
+fro=古法语
+frr=北弗里西亚语
+frs=东弗里西亚语
+fry=西弗里斯兰语
+ful=富拉文
+fur=弗留利语
+gaa=加族语
+gay=迦约语
+gba=格巴亚语
+gem=其他日尔曼语系
+geo=格鲁吉亚文
+ger=德文
+gez=吉兹语
+gil=吉尔伯特语
+gla=盖尔语
+gle=爱尔兰文
+glg=加利西亚文
+glv=马恩文
+gmh=中古高地德语
+goh=古高地德语
+gon=冈德语
+gor=哥伦打洛语
+got=哥特语
+grb=格列博语
+grc=古希腊语
+gre=希腊语, 现代 (1453-)
+grn=瓜拉尼文
+gsw=瑞士德语
+guj=古加拉提文
+gwi=哥威迅语
+hai=海达语
+hat=海地文
+hau=豪撒文
+haw=夏威夷语
+heb=希伯来文
+her=赫雷罗文
+hil=希利盖农语
+him=赫马查利文
+hin=印地文
+hit=赫梯语
+hmn=苗语
+hmo=新里木托文
+hrv=克罗地亚文
+hsb=上索布语
+hun=匈牙利文
+hup=胡帕语
+iba=伊班语
+ibo=伊博文
+ice=冰岛文
+ido=伊多文
+iii=四川彝文
+ijo=伊乔文
+iku=爱斯基摩文
+ile=拉丁国际文
+ilo=伊洛卡诺语
+ina=拉丁国际语 (国际辅助语联盟)
+inc=其他印度语系
+ind=印度尼西亚文
+ine=其他印欧语系
+inh=印古什语
+ipk=依奴皮维克文
+ira=伊朗文
+iro=伊洛魁语系
+ita=意大利文
+jav=爪哇文
+jbo=逻辑语
+jpn=日文
+jpr=犹太波斯语
+jrb=犹太阿拉伯语
+kaa=卡拉卡尔帕克语
+kab=卡拜尔语
+kac=克钦语
+kal=格陵兰文
+kam=卡姆巴语
+kan=卡纳塔克语
+kar=喀伦文
+kas=克什米尔文
+kau=卡努里文
+kaw=卡威语
+kaz=哈萨克文
+kbd=卡巴尔德语
+kha=卡西语
+khi=其他科伊桑语系
+khm=中高棉语
+kho=和田语
+kik=吉库尤文
+kin=卢旺达文
+kir=吉尔吉斯文
+kmb=金邦杜语
+kok=孔卡尼语
+kom=科米文
+kon=刚果文
+kor=朝鲜文
+kos=科斯拉伊语
+kpe=克佩列语
+krc=卡拉恰伊巴尔卡尔语
+krl=卡累利阿语
+kro=克鲁文
+kru=库鲁克语
+kua=宽亚玛语
+kum=库梅克语
+kur=库尔德文
+kut=库特奈语
+lad=拉迪诺语
+lah=印度-雅利安语
+lam=兰巴语
+lao=老挝文
+lat=拉丁文
+lav=拉托维亚文 (列托)
+lez=列兹金语
+lim=林堡文
+lin=林加拉文
+lit=立陶宛文
+lol=蒙戈语
+loz=洛齐语
+ltz=卢森堡文
+lua=卢巴-卢拉语
+lub=卢巴-加丹加文
+lug=干达文
+lui=卢伊塞诺语
+lun=隆达语
+luo=卢奥语
+lus=米佐语
+mac=马其顿文
+mad=马都拉语
+mag=摩揭陀语
+mah=马绍尔文
+mai=迈蒂利语
+mak=望加锡语
+mal=马来亚拉姆文
+man=曼丁哥语
+mao=毛利文
+map=澳斯特罗尼西亚语系
+mar=马拉地文
+mas=马赛语
+may=马来文
+mdf=莫克沙语
+mdr=曼达尔语
+men=门德语
+mga=中古爱尔兰语
+mic=密克马克语
+min=米南佳保语
+mis=各种不同语系
+mkh=其他孟高棉语系
+mlg=马尔加什文
+mlt=马耳他文
+mnc=满语
+mni=曼尼普尔语
+mno=马诺博语系
+moh=摩霍克语
+mon=蒙古文
+mos=莫西语
+mul=多语种
+mun=蒙达语系
+mus=克里克语
+mwl=米兰德斯语
+mwr=马尔瓦里语
+myn=玛雅语系
+myv=厄尔兹亚语
+nah=纳瓦特尔文
+nai=其他北美印第安语系
+nap=那不勒斯语
+nau=瑙鲁文
+nav=纳瓦霍文
+nbl=恩德贝勒语, 南部
+nde=恩德贝勒语, 北部
+ndo=恩东加文
+nds=低地德语
+nep=尼泊尔文
+new=尼瓦尔语
+nia=尼亚斯语
+nic=尼加拉瓜科多巴
+niu=纽埃语
+nno=挪威尼诺斯克文
+nob=挪威博克马尔语
+nog=诺盖语
+non=古诺尔斯语
+nor=挪威文
+nqo=西非书面文字
+nso=北索托语
+nub=努比亚语系
+nwc=古典尼瓦尔语
+nya=齐切瓦语
+nym=尼扬韦齐语
+nyn=尼昂科勒语
+nyo=尼奥罗语
+nzi=恩济马语
+oci=奥西坦文 (1500 后)
+oji=奥吉布瓦文
+ori=欧里亚文
+orm=阿曼文
+osa=奥塞治语
+oss=奥塞梯文
+ota=奥斯曼土耳其语
+oto=奥托米语系
+paa=其他巴布亚文
+pag=邦阿西南语
+pal=巴拉维语
+pam=邦板牙语
+pan=旁遮普文
+pap=帕皮阿门托语
+pau=帕劳语
+peo=古波斯语
+per=波斯文
+phi=其他菲律宾语系
+phn=腓尼基语
+pli=巴利文
+pol=波兰文
+pon=波纳佩语
+por=葡萄牙文
+pra=普拉克里特诸语言
+pro=古普罗文斯语
+pus=普什图文
+que=盖丘亚文
+raj=拉贾斯坦语
+rap=拉帕努伊语
+rar=拉罗汤加语
+roa=其他拉丁语系
+roh=罗曼什语
+rom=吉普赛语
+rum=罗马尼亚文
+run=基隆迪文
+rup=阿罗马尼亚语
+rus=俄文
+sad=桑达韦语
+sag=桑戈文
+sah=萨哈语
+sai=其他南美印第安文
+sal=萨利什文
+sam=萨马利亚阿拉姆语
+san=梵文
+sas=萨萨克文
+sat=桑塔利语
+scn=西西里语
+sco=苏格兰语
+sel=塞尔库普语
+sem=其他闪族语系
+sga=古爱尔兰语
+sgn=手语
+shn=掸语
+sid=悉达摩语
+sin=辛哈拉语
+sio=苏语诸语言
+sit=汉藏诸语言
+sla=其他斯拉夫语系
+slo=斯洛伐克文
+slv=斯洛文尼亚文
+sma=南萨米语
+sme=北沙密文
+smi=其他萨米文
+smj=吕勒萨米语
+smn=伊纳里萨米语
+smo=萨摩亚文
+sms=斯科特萨米语
+sna=修纳文
+snd=信德文
+snk=索宁克语
+sog=粟特语
+som=索马里文
+son=桑海文
+sot=索托语, 南部
+spa=西班牙文
+srd=撒丁文
+srn=苏里南汤加语
+srp=塞尔维亚文
+srr=塞雷尔语
+ssa=非洲撒哈拉沙漠边缘地带语言
+ssw=斯瓦特文
+suk=苏库马语
+sun=巽他文
+sus=苏苏语
+sux=苏美尔语
+swa=斯瓦希里文
+swe=瑞典文
+syc=古典叙利亚语
+syr=叙利亚语
+tah=塔希提文
+tai=傣语诸语言 (其他)
+tam=泰米尔文
+tat=鞑靼文
+tel=泰卢固文
+tem=泰姆奈语
+ter=特伦诺语
+tet=德顿语
+tgk=塔吉克文
+tgl=塔加路族文
+tha=泰文
+tib=西藏文
+tig=提格雷语
+tir=提格里尼亚文
+tiv=蒂夫语
+tkl=托克劳语
+tlh=克林贡语
+tli=特林吉特语
+tmh=塔马奇克语
+tog=尼亚萨汤加语
+ton=汤加语 (汤加岛)
+tpi=托克皮辛语
+tsi=钦西安语
+tsn=突尼斯文
+tso=特松加文
+tuk=土库曼文
+tum=通布卡语
+tup=图皮语系
+tur=土耳其文
+tut=阿尔泰诸语言 (其他)
+tvl=图瓦卢语
+twi=契维文
+tyv=图瓦语
+udm=乌德穆尔特语
+uga=乌加里特语
+uig=维吾尔文
+ukr=乌克兰文
+umb=翁本杜语
+und=未知语言
+urd=乌尔都文
+uzb=乌兹别克文
+vai=瓦伊语
+ven=文达文
+vie=越南文
+vol=沃拉普克文
+vot=沃提克语
+wak=瓦卡什诸语言
+wal=瓦拉莫语
+war=瓦瑞语
+was=瓦绍语
+wel=威尔士文
+wen=索布诸语言
+wln=瓦龙文
+wol=沃尔夫文
+xal=卡尔梅克语
+xho=班图文
+yao=瑶族语
+yap=雅浦语
+yid=依地文
+yor=约鲁巴文
+ypk=尤皮克诸语言
+zap=萨波蒂克语
+zbl=布里斯符号
+zen=泽纳加语
+zha=壮文
+znd=赞德文
+zul=祖鲁文
+zun=祖尼语
+zxx=无语言内容
+zza=扎扎语
 
 # script names
 # key is ISO 15924 script code
 
-Arab=\u963f\u62c9\u4f2f\u6587
-Armi=\u7687\u5ba4\u4e9a\u62c9\u59c6\u6587
-Armn=\u4e9a\u7f8e\u5c3c\u4e9a\u6587
-Avst=\u963f\u7ef4\u65af\u9640\u6587
-Bali=\u5df4\u5398\u6587
-Bamu=\u5df4\u59c6\u7a46\u6587
-Bass=\u5df4\u8428\u6587
-Batk=\u5df4\u5854\u514b\u6587
-Beng=\u5b5f\u52a0\u62c9\u6587
-Blis=\u5e03\u5217\u65af\u7b26\u53f7
-Bopo=\u6c49\u8bed\u62fc\u97f3
-Brah=\u5a46\u7f57\u7c73\u6587\u5b57
-Brai=\u5e03\u83b1\u53f6\u76f2\u6587
-Bugi=\u5e03\u5409\u6587
-Buhd=\u5e03\u5e0c\u5fb7\u6587
-Cakm=\u67e5\u514b\u9a6c\u6587
-Cans=\u52a0\u62ff\u5927\u571f\u8457\u7edf\u4e00\u97f3\u8282
-Cari=\u5361\u91cc\u4e9a\u6587
-Cham=\u5360\u6587
-Cher=\u5207\u7f57\u57fa\u6587
-Cirt=\u8272\u65af\u6587
-Copt=\u514b\u666e\u7279\u6587
-Cprt=\u585e\u6d66\u8def\u65af\u6587
-Cyrl=\u897f\u91cc\u5c14\u6587
-Cyrs=\u897f\u91cc\u5c14\u6587\u5b57\uff08\u53e4\u6559\u4f1a\u65af\u62c9\u592b\u6587\u7684\u53d8\u4f53\uff09
-Deva=\u5929\u57ce\u6587
-Dsrt=\u5fb7\u585e\u83b1\u7279\u6587
-Dupl=\u675c\u666e\u6d1b\u4f0a\u901f\u8bb0
-Egyd=\u540e\u671f\u57c3\u53ca\u6587
-Egyh=\u53e4\u57c3\u53ca\u50e7\u4fa3\u4e66\u5199\u4f53
-Egyp=\u53e4\u57c3\u53ca\u8c61\u5f62\u6587
-Elba=\u7231\u5c14\u5df4\u6851\u6587
-Ethi=\u57c3\u585e\u4fc4\u6bd4\u4e9a\u6587
-Geok=\u683c\u9c81\u5409\u4e9a\u6587\uff08\u6559\u5802\u4f53\uff09
-Geor=\u683c\u9c81\u5409\u4e9a\u6587
-Glag=\u683c\u62c9\u54e5\u91cc\u6587
-Goth=\u54e5\u7279\u6587
-Gran=\u683c\u5170\u5854\u6587
-Grek=\u5e0c\u814a\u6587
-Gujr=\u53e4\u5409\u62c9\u7279\u6587
-Guru=\u679c\u9c81\u7a46\u5947\u6587
-Hang=\u8c1a\u6587
-Hani=\u6c49\u5b57
-Hano=\u6c49\u5974\u7f57\u6587
-Hans=\u7b80\u4f53
-Hant=\u7e41\u4f53
-Hebr=\u5e0c\u4f2f\u6765\u6587
-Hira=\u5e73\u5047\u540d
-Hmng=\u6768\u677e\u5f55\u82d7\u6587
-Hrkt=\u5047\u540d\u8868
-Hung=\u53e4\u5308\u7259\u5229\u6587
-Inds=\u5370\u5ea6\u6cb3\u6587\u5b57
-Ital=\u53e4\u610f\u5927\u5229\u6587
-Java=\u722a\u54c7\u6587
-Jpan=\u65e5\u6587
-Kali=\u514b\u8036\u674e\u6587\u5b57
-Kana=\u7247\u5047\u540d
-Khar=\u5361\u7f57\u987b\u63d0\u6587
-Khmr=\u9ad8\u68c9\u6587
-Knda=\u5361\u7eb3\u8fbe\u6587
-Kore=\u97e9\u6587
-Kpel=\u514b\u4f69\u5217\u6587
-Kthi=\u51ef\u63d0\u6587
-Lana=\u5170\u62ff\u6587
-Laoo=\u8001\u631d\u6587
-Latf=\u62c9\u4e01\u6587\uff08\u54e5\u7279\u5f0f\u5b57\u4f53\u53d8\u4f53\uff09
-Latg=\u62c9\u4e01\u6587\uff08\u76d6\u5c14\u6587\u53d8\u4f53\uff09
-Latn=\u62c9\u4e01\u6587
-Lepc=\u96f7\u5e03\u67e5\u6587
-Limb=\u6797\u5e03\u6587
-Lina=\u7ebf\u5f62\u6587\u5b57\uff08A\uff09
-Linb=\u7ebf\u5f62\u6587\u5b57\uff08B\uff09
-Lisu=\u5088\u50f3\u6587
-Loma=\u6d1b\u9a6c\u6587
-Lyci=\u5229\u897f\u4e9a\u6587
-Lydi=\u5415\u5e95\u4e9a\u6587
-Mand=\u963f\u62c9\u7c73\u6587
-Mani=\u6469\u5c3c\u6559\u6587
-Maya=\u739b\u96c5\u5723\u7b26\u6587
-Mend=\u95e8\u8fea\u6587
-Merc=\u9ea6\u7f57\u57c3\u8349\u4e66
-Mero=\u9ea6\u82e5\u63d0\u514b\u6587
-Mlym=\u9a6c\u62c9\u96c5\u62c9\u59c6\u6587
-Mong=\u8499\u53e4\u6587
-Moon=\u97e9\u6587\u8bed\u7cfb
-Mtei=\u66fc\u5c3c\u666e\u5c14\u6587
-Mymr=\u7f05\u7538\u6587
-Narb=\u53e4\u5317\u65b9\u963f\u62c9\u4f2f\u6587
-Nbat=\u7eb3\u5df4\u6cf0\u6587
-Nkgb=\u7eb3\u897f\u683c\u5df4\u6587
-Nkoo=\u897f\u975e\u4e66\u9762\u6587\u5b57\uff08N\u2019Ko\uff09
-Ogam=\u6b27\u7518\u6587
-Olck=\u6851\u5854\u5229\u6587
-Orkh=\u9102\u5c14\u6d51\u6587
-Orya=\u5965\u91cc\u4e9a\u6587
-Osma=\u5965\u65af\u66fc\u4e9a\u6587
-Palm=\u5e15\u5c14\u8fc8\u62c9\u6587
-Perm=\u53e4\u5f7c\u5c14\u59c6\u6587
-Phag=\u516b\u601d\u5df4\u6587
-Phli=\u5df4\u5217\u7ef4\u6587\u7891\u94ed\u4f53
-Phlp=\u5df4\u5217\u7ef4\u6587\uff08\u5723\u8bd7\u4f53\uff09
-Phlv=\u5df4\u5217\u7ef4\u6587\uff08\u4e66\u4f53\uff09
-Phnx=\u8153\u5c3c\u57fa\u6587
-Plrd=\u6ce2\u62c9\u5fb7\u97f3\u6807\u6587\u5b57
-Prti=\u5e15\u63d0\u4e9a\u6587\u7891\u94ed\u4f53
-Rjng=\u62c9\u8ba9\u6587
-Roro=\u6717\u683c\u6717\u683c\u6587
-Runr=\u53e4\u4ee3\u5317\u6b27\u6587
-Samr=\u6492\u9a6c\u5229\u4e9a\u6587
-Sara=\u6c99\u62c9\u5824\u6587
-Sarb=\u53e4\u5357\u963f\u62c9\u4f2f\u6587
-Saur=\u7d22\u62c9\u4ec0\u7279\u62c9\u6587
-Sgnw=\u4e66\u5199\u7b26\u53f7
-Shaw=\u8427\u4f2f\u7eb3\u5f0f\u6587
-Sind=\u4fe1\u5fb7\u6587
-Sinh=\u50e7\u4f3d\u7f57\u6587
-Sund=\u5dfd\u4ed6\u6587
-Sylo=\u9521\u5c14\u8d6b\u7279\u6587
-Syrc=\u53d9\u5229\u4e9a\u6587
-Syre=\u798f\u97f3\u4f53\u53d9\u5229\u4e9a\u6587
-Syrj=\u897f\u53d9\u5229\u4e9a\u6587
-Syrn=\u4e1c\u53d9\u5229\u4e9a\u6587
-Tagb=\u5854\u683c\u73ed\u74e6\u6587
-Tale=\u6cf0\u4e50\u6587
-Talu=\u65b0\u50a3\u6587
-Taml=\u6cf0\u7c73\u5c14\u6587
-Tavt=\u8d8a\u5357\u50a3\u6587
-Telu=\u6cf0\u5362\u56fa\u6587
-Teng=\u817e\u683c\u74e6\u6587\u5b57
-Tfng=\u63d0\u975e\u7eb3\u6587
-Tglg=\u5854\u52a0\u8def\u6587
-Thaa=\u5854\u5b89\u90a3\u6587
-Thai=\u6cf0\u6587
-Tibt=\u85cf\u6587
-Ugar=\u4e4c\u52a0\u91cc\u7279\u6587
-Vaii=\u74e6\u4f9d\u6587
-Visp=\u53ef\u89c1\u8bed\u8a00
-Wara=\u74e6\u90ce\u5947\u8482\u6587\u5b57
-Xpeo=\u53e4\u6ce2\u65af\u6587
-Xsux=\u82cf\u7f8e\u5c14-\u963f\u5361\u5fb7\u6954\u5f62\u6587\u5b57
-Yiii=\u5f5d\u6587
-Zinh=\u9057\u4f20\u5b66\u672f\u8bed
-Zmth=\u6570\u5b66\u7b26\u53f7
-Zsym=\u7b26\u53f7
-Zxxx=\u975e\u4e66\u9762\u6587\u5b57
-Zyyy=\u901a\u7528
-Zzzz=\u672a\u77e5\u6587\u5b57
+Arab=阿拉伯文
+Armi=皇室亚拉姆文
+Armn=亚美尼亚文
+Avst=阿维斯陀文
+Bali=巴厘文
+Bamu=巴姆穆文
+Bass=巴萨文
+Batk=巴塔克文
+Beng=孟加拉文
+Blis=布列斯符号
+Bopo=汉语拼音
+Brah=婆罗米文字
+Brai=布莱叶盲文
+Bugi=布吉文
+Buhd=布希德文
+Cakm=查克马文
+Cans=加拿大土著统一音节
+Cari=卡里亚文
+Cham=占文
+Cher=切罗基文
+Cirt=色斯文
+Copt=克普特文
+Cprt=塞浦路斯文
+Cyrl=西里尔文
+Cyrs=西里尔文字（古教会斯拉夫文的变体）
+Deva=天城文
+Dsrt=德塞莱特文
+Dupl=杜普洛伊速记
+Egyd=后期埃及文
+Egyh=古埃及僧侣书写体
+Egyp=古埃及象形文
+Elba=爱尔巴桑文
+Ethi=埃塞俄比亚文
+Geok=格鲁吉亚文（教堂体）
+Geor=格鲁吉亚文
+Glag=格拉哥里文
+Goth=哥特文
+Gran=格兰塔文
+Grek=希腊文
+Gujr=古吉拉特文
+Guru=果鲁穆奇文
+Hang=谚文
+Hani=汉字
+Hano=汉奴罗文
+Hans=简体
+Hant=繁体
+Hebr=希伯来文
+Hira=平假名
+Hmng=杨松录苗文
+Hrkt=假名表
+Hung=古匈牙利文
+Inds=印度河文字
+Ital=古意大利文
+Java=爪哇文
+Jpan=日文
+Kali=克耶李文字
+Kana=片假名
+Khar=卡罗须提文
+Khmr=高棉文
+Knda=卡纳达文
+Kore=韩文
+Kpel=克佩列文
+Kthi=凯提文
+Lana=兰拿文
+Laoo=老挝文
+Latf=拉丁文（哥特式字体变体）
+Latg=拉丁文（盖尔文变体）
+Latn=拉丁文
+Lepc=雷布查文
+Limb=林布文
+Lina=线形文字（A）
+Linb=线形文字（B）
+Lisu=傈僳文
+Loma=洛马文
+Lyci=利西亚文
+Lydi=吕底亚文
+Mand=阿拉米文
+Mani=摩尼教文
+Maya=玛雅圣符文
+Mend=门迪文
+Merc=麦罗埃草书
+Mero=麦若提克文
+Mlym=马拉雅拉姆文
+Mong=蒙古文
+Moon=韩文语系
+Mtei=曼尼普尔文
+Mymr=缅甸文
+Narb=古北方阿拉伯文
+Nbat=纳巴泰文
+Nkgb=纳西格巴文
+Nkoo=西非书面文字（N’Ko）
+Ogam=欧甘文
+Olck=桑塔利文
+Orkh=鄂尔浑文
+Orya=奥里亚文
+Osma=奥斯曼亚文
+Palm=帕尔迈拉文
+Perm=古彼尔姆文
+Phag=八思巴文
+Phli=巴列维文碑铭体
+Phlp=巴列维文（圣诗体）
+Phlv=巴列维文（书体）
+Phnx=腓尼基文
+Plrd=波拉德音标文字
+Prti=帕提亚文碑铭体
+Rjng=拉让文
+Roro=朗格朗格文
+Runr=古代北欧文
+Samr=撒马利亚文
+Sara=沙拉堤文
+Sarb=古南阿拉伯文
+Saur=索拉什特拉文
+Sgnw=书写符号
+Shaw=萧伯纳式文
+Sind=信德文
+Sinh=僧伽罗文
+Sund=巽他文
+Sylo=锡尔赫特文
+Syrc=叙利亚文
+Syre=福音体叙利亚文
+Syrj=西叙利亚文
+Syrn=东叙利亚文
+Tagb=塔格班瓦文
+Tale=泰乐文
+Talu=新傣文
+Taml=泰米尔文
+Tavt=越南傣文
+Telu=泰卢固文
+Teng=腾格瓦文字
+Tfng=提非纳文
+Tglg=塔加路文
+Thaa=塔安那文
+Thai=泰文
+Tibt=藏文
+Ugar=乌加里特文
+Vaii=瓦依文
+Visp=可见语言
+Wara=瓦郎奇蒂文字
+Xpeo=古波斯文
+Xsux=苏美尔-阿卡德楔形文字
+Yiii=彝文
+Zinh=遗传学术语
+Zmth=数学符号
+Zsym=符号
+Zxxx=非书面文字
+Zyyy=通用
+Zzzz=未知文字
 
 # country names
 # key is ISO 3166 country code
 
-AD=\u5b89\u9053\u5c14
-AE=\u963f\u62c9\u4f2f\u8054\u5408\u914b\u957f\u56fd
-AF=\u963f\u5bcc\u6c57
-AG=\u5b89\u63d0\u74dc\u548c\u5df4\u5e03\u8fbe
-AI=\u5b89\u572d\u62c9
-AL=\u963f\u5c14\u5df4\u5c3c\u4e9a
-AM=\u4e9a\u7f8e\u5c3c\u4e9a
-AN=\u8377\u5c5e\u5b89\u7684\u5217\u65af\u7fa4\u5c9b
-AO=\u5b89\u54e5\u62c9
-AQ=\u5357\u6781\u6d32
-AR=\u963f\u6839\u5ef7
-AS=\u7f8e\u5c5e\u8428\u6469\u4e9a
-AT=\u5965\u5730\u5229
-AU=\u6fb3\u5927\u5229\u4e9a
-AW=\u963f\u9c81\u5df4
-AX=\u5965\u5170\u7fa4\u5c9b
-AZ=\u963f\u585e\u62dc\u7586
-BA=\u6ce2\u65af\u5c3c\u4e9a\u548c\u9ed1\u585e\u54e5\u7ef4\u90a3
-BB=\u5df4\u5df4\u591a\u65af
-BD=\u5b5f\u52a0\u62c9\u56fd
-BE=\u6bd4\u5229\u65f6
-BF=\u5e03\u57fa\u7eb3\u6cd5\u7d22
-BG=\u4fdd\u52a0\u5229\u4e9a
-BH=\u5df4\u6797
-BI=\u5e03\u9686\u8fea
-BJ=\u8d1d\u5b81
-BM=\u767e\u6155\u5927
-BN=\u6587\u83b1
-BO=\u73bb\u5229\u7ef4\u4e9a
-BR=\u5df4\u897f
-BS=\u5df4\u54c8\u9a6c
-BT=\u4e0d\u4e39
-BV=\u5e03\u97e6\u5c9b
-BW=\u535a\u8328\u74e6\u7eb3
-BY=\u767d\u4fc4\u7f57\u65af
-BZ=\u4f2f\u5229\u5179
-CA=\u52a0\u62ff\u5927
-CC=\u79d1\u79d1\u65af\uff08\u57fa\u6797\uff09\u7fa4\u5c9b
-CD=\u521a\u679c\uff08\u91d1\uff09
-CF=\u4e2d\u975e\u5171\u548c\u56fd
-CG=\u521a\u679c\uff08\u5e03\uff09
-CH=\u745e\u58eb
-CI=\u79d1\u7279\u8fea\u74e6
-CK=\u5e93\u514b\u7fa4\u5c9b
-CL=\u667a\u5229
-CM=\u5580\u9ea6\u9686
-CN=\u4e2d\u56fd
-CO=\u54e5\u4f26\u6bd4\u4e9a
-CR=\u54e5\u65af\u8fbe\u9ece\u52a0
-CS=\u585e\u5c14\u7ef4\u4e9a\u53ca\u9ed1\u5c71
-CU=\u53e4\u5df4
-CV=\u4f5b\u5f97\u89d2
-CX=\u5723\u8bde\u5c9b
-CY=\u585e\u6d66\u8def\u65af
-CZ=\u6377\u514b
-DE=\u5fb7\u56fd
-DJ=\u5409\u5e03\u63d0
-DK=\u4e39\u9ea6
-DM=\u591a\u7c73\u5c3c\u514b
-DO=\u591a\u7c73\u5c3c\u52a0\u5171\u548c\u56fd
-DZ=\u963f\u5c14\u53ca\u5229\u4e9a
-EC=\u5384\u74dc\u591a\u5c14
-EE=\u7231\u6c99\u5c3c\u4e9a
-EG=\u57c3\u53ca
-EH=\u897f\u6492\u54c8\u62c9
-ER=\u5384\u7acb\u7279\u91cc\u4e9a
-ES=\u897f\u73ed\u7259
-ET=\u57c3\u585e\u4fc4\u6bd4\u4e9a
-FI=\u82ac\u5170
-FJ=\u6590\u6d4e
-FK=\u798f\u514b\u5170\u7fa4\u5c9b
-FM=\u5bc6\u514b\u7f57\u5c3c\u897f\u4e9a
-FO=\u6cd5\u7f57\u7fa4\u5c9b
-FR=\u6cd5\u56fd
-GA=\u52a0\u84ec
-GB=\u82f1\u56fd
-GD=\u683c\u6797\u7eb3\u8fbe
-GE=\u683c\u9c81\u5409\u4e9a
-GF=\u6cd5\u5c5e\u572d\u4e9a\u90a3
-GH=\u52a0\u7eb3
-GI=\u76f4\u5e03\u7f57\u9640
-GL=\u683c\u9675\u5170
-GM=\u5188\u6bd4\u4e9a
-GN=\u51e0\u5185\u4e9a
-GP=\u74dc\u5fb7\u7f57\u666e
-GQ=\u8d64\u9053\u51e0\u5185\u4e9a
-GR=\u5e0c\u814a
-GS=\u5357\u4e54\u6cbb\u4e9a\u548c\u5357\u6851\u5a01\u5947\u7fa4\u5c9b
-GT=\u5371\u5730\u9a6c\u62c9
-GU=\u5173\u5c9b
-GW=\u51e0\u5185\u4e9a\u6bd4\u7ecd
-GY=\u572d\u4e9a\u90a3
-HK=\u4e2d\u56fd\u9999\u6e2f\u7279\u522b\u884c\u653f\u533a
-HM=\u8d6b\u5fb7\u5c9b\u548c\u9ea6\u514b\u5510\u7eb3\u7fa4\u5c9b
-HN=\u6d2a\u90fd\u62c9\u65af
-HR=\u514b\u7f57\u5730\u4e9a
-HT=\u6d77\u5730
-HU=\u5308\u7259\u5229
-ID=\u5370\u5ea6\u5c3c\u897f\u4e9a
-IE=\u7231\u5c14\u5170
-IL=\u4ee5\u8272\u5217
-IN=\u5370\u5ea6
-IO=\u82f1\u5c5e\u5370\u5ea6\u6d0b\u9886\u5730
-IQ=\u4f0a\u62c9\u514b
-IR=\u4f0a\u6717
-IS=\u51b0\u5c9b
-IT=\u610f\u5927\u5229
-JM=\u7259\u4e70\u52a0
-JO=\u7ea6\u65e6
-JP=\u65e5\u672c
-KE=\u80af\u5c3c\u4e9a
-KG=\u5409\u5c14\u5409\u65af\u65af\u5766
-KH=\u67ec\u57d4\u5be8
-KI=\u57fa\u91cc\u5df4\u65af
-KM=\u79d1\u6469\u7f57
-KN=\u5723\u57fa\u8328\u548c\u5c3c\u7ef4\u65af
-KP=\u671d\u9c9c
-KR=\u97e9\u56fd
-KW=\u79d1\u5a01\u7279
-KY=\u5f00\u66fc\u7fa4\u5c9b
-KZ=\u54c8\u8428\u514b\u65af\u5766
-LA=\u8001\u631d
-LB=\u9ece\u5df4\u5ae9
-LC=\u5723\u5362\u897f\u4e9a
-LI=\u5217\u652f\u6566\u58eb\u767b
-LK=\u65af\u91cc\u5170\u5361
-LR=\u5229\u6bd4\u91cc\u4e9a
-LS=\u83b1\u7d22\u6258
-LT=\u7acb\u9676\u5b9b
-LU=\u5362\u68ee\u5821
-LV=\u62c9\u8131\u7ef4\u4e9a
-LY=\u5229\u6bd4\u4e9a
-MA=\u6469\u6d1b\u54e5
-MC=\u6469\u7eb3\u54e5
-MD=\u6469\u5c14\u591a\u74e6
-ME=\u9ed1\u5c71
-MG=\u9a6c\u8fbe\u52a0\u65af\u52a0
-MH=\u9a6c\u7ecd\u5c14\u7fa4\u5c9b
-MK=\u5317\u9a6c\u5176\u987f
-ML=\u9a6c\u91cc
-MM=\u7f05\u7538
-MN=\u8499\u53e4
-MO=\u4e2d\u56fd\u6fb3\u95e8\u7279\u522b\u884c\u653f\u533a
-MP=\u5317\u9a6c\u91cc\u4e9a\u7eb3\u7fa4\u5c9b
-MQ=\u9a6c\u63d0\u5c3c\u514b
-MR=\u6bdb\u91cc\u5854\u5c3c\u4e9a
-MS=\u8499\u7279\u585e\u62c9\u7279
-MT=\u9a6c\u8033\u4ed6
-MU=\u6bdb\u91cc\u6c42\u65af
-MV=\u9a6c\u5c14\u4ee3\u592b
-MW=\u9a6c\u62c9\u7ef4
-MX=\u58a8\u897f\u54e5
-MY=\u9a6c\u6765\u897f\u4e9a
-MZ=\u83ab\u6851\u6bd4\u514b
-NA=\u7eb3\u7c73\u6bd4\u4e9a
-NC=\u65b0\u5580\u91cc\u591a\u5c3c\u4e9a
-NE=\u5c3c\u65e5\u5c14
-NF=\u8bfa\u798f\u514b\u5c9b
-NG=\u5c3c\u65e5\u5229\u4e9a
-NI=\u5c3c\u52a0\u62c9\u74dc
-NL=\u8377\u5170
-NO=\u632a\u5a01
-NP=\u5c3c\u6cca\u5c14
-NR=\u7459\u9c81
-NU=\u7ebd\u57c3
-NZ=\u65b0\u897f\u5170
-OM=\u963f\u66fc
-PA=\u5df4\u62ff\u9a6c
-PE=\u79d8\u9c81
-PF=\u6cd5\u5c5e\u6ce2\u5229\u5c3c\u897f\u4e9a
-PG=\u5df4\u5e03\u4e9a\u65b0\u51e0\u5185\u4e9a
-PH=\u83f2\u5f8b\u5bbe
-PK=\u5df4\u57fa\u65af\u5766
-PL=\u6ce2\u5170
-PM=\u5723\u76ae\u57c3\u5c14\u548c\u5bc6\u514b\u9686\u7fa4\u5c9b
-PN=\u76ae\u7279\u51ef\u6069\u7fa4\u5c9b
-PR=\u6ce2\u591a\u9ece\u5404
-PS=\u5df4\u52d2\u65af\u5766\u9886\u571f
-PT=\u8461\u8404\u7259
-PW=\u5e15\u52b3
-PY=\u5df4\u62c9\u572d
-QA=\u5361\u5854\u5c14
-RE=\u7559\u5c3c\u6c6a
-RO=\u7f57\u9a6c\u5c3c\u4e9a
-RS=\u585e\u5c14\u7ef4\u4e9a
-RU=\u4fc4\u7f57\u65af
-RW=\u5362\u65fa\u8fbe
-SA=\u6c99\u7279\u963f\u62c9\u4f2f
-SB=\u6240\u7f57\u95e8\u7fa4\u5c9b
-SC=\u585e\u820c\u5c14
-SD=\u82cf\u4e39
-SE=\u745e\u5178
-SG=\u65b0\u52a0\u5761
-SH=\u5723\u8d6b\u52d2\u62ff
-SI=\u65af\u6d1b\u6587\u5c3c\u4e9a
-SJ=\u65af\u74e6\u5c14\u5df4\u548c\u626c\u9a6c\u5ef6
-SK=\u65af\u6d1b\u4f10\u514b
-SL=\u585e\u62c9\u5229\u6602
-SM=\u5723\u9a6c\u529b\u8bfa
-SN=\u585e\u5185\u52a0\u5c14
-SO=\u7d22\u9a6c\u91cc
-SR=\u82cf\u91cc\u5357
-ST=\u5723\u591a\u7f8e\u548c\u666e\u6797\u897f\u6bd4
-SV=\u8428\u5c14\u74e6\u591a
-SY=\u53d9\u5229\u4e9a
-SZ=\u65af\u5a01\u58eb\u5170
-TC=\u7279\u514b\u65af\u548c\u51ef\u79d1\u65af\u7fa4\u5c9b
-TD=\u4e4d\u5f97
-TF=\u6cd5\u5c5e\u5357\u90e8\u9886\u5730
-TG=\u591a\u54e5
-TH=\u6cf0\u56fd
-TJ=\u5854\u5409\u514b\u65af\u5766
-TK=\u6258\u514b\u52b3
-TL=\u4e1c\u5e1d\u6c76
-TM=\u571f\u5e93\u66fc\u65af\u5766
-TN=\u7a81\u5c3c\u65af
-TO=\u6c64\u52a0
-TR=\u571f\u8033\u5176
-TT=\u7279\u7acb\u5c3c\u8fbe\u548c\u591a\u5df4\u54e5
-TV=\u56fe\u74e6\u5362
-TW=\u53f0\u6e7e
-TZ=\u5766\u6851\u5c3c\u4e9a
-UA=\u4e4c\u514b\u5170
-UG=\u4e4c\u5e72\u8fbe
-UM=\u7f8e\u56fd\u672c\u571f\u5916\u5c0f\u5c9b\u5c7f
-US=\u7f8e\u56fd
-UY=\u4e4c\u62c9\u572d
-UZ=\u4e4c\u5179\u522b\u514b\u65af\u5766
-VA=\u68b5\u8482\u5188
-VC=\u5723\u6587\u68ee\u7279\u548c\u683c\u6797\u7eb3\u4e01\u65af
-VE=\u59d4\u5185\u745e\u62c9
-VG=\u82f1\u5c5e\u7ef4\u5c14\u4eac\u7fa4\u5c9b
-VI=\u7f8e\u5c5e\u7ef4\u5c14\u4eac\u7fa4\u5c9b
-VN=\u8d8a\u5357
-VU=\u74e6\u52aa\u963f\u56fe
-WF=\u74e6\u5229\u65af\u548c\u5bcc\u56fe\u7eb3
-WS=\u8428\u6469\u4e9a
-YE=\u4e5f\u95e8
-YT=\u9a6c\u7ea6\u7279
-ZA=\u5357\u975e
-ZM=\u8d5e\u6bd4\u4e9a
-ZW=\u6d25\u5df4\u5e03\u97e6
+AD=安道尔
+AE=阿拉伯联合酋长国
+AF=阿富汗
+AG=安提瓜和巴布达
+AI=安圭拉
+AL=阿尔巴尼亚
+AM=亚美尼亚
+AN=荷属安的列斯群岛
+AO=安哥拉
+AQ=南极洲
+AR=阿根廷
+AS=美属萨摩亚
+AT=奥地利
+AU=澳大利亚
+AW=阿鲁巴
+AX=奥兰群岛
+AZ=阿塞拜疆
+BA=波斯尼亚和黑塞哥维那
+BB=巴巴多斯
+BD=孟加拉国
+BE=比利时
+BF=布基纳法索
+BG=保加利亚
+BH=巴林
+BI=布隆迪
+BJ=贝宁
+BM=百慕大
+BN=文莱
+BO=玻利维亚
+BR=巴西
+BS=巴哈马
+BT=不丹
+BV=布韦岛
+BW=博茨瓦纳
+BY=白俄罗斯
+BZ=伯利兹
+CA=加拿大
+CC=科科斯（基林）群岛
+CD=刚果（金）
+CF=中非共和国
+CG=刚果（布）
+CH=瑞士
+CI=科特迪瓦
+CK=库克群岛
+CL=智利
+CM=喀麦隆
+CN=中国
+CO=哥伦比亚
+CR=哥斯达黎加
+CS=塞尔维亚及黑山
+CU=古巴
+CV=佛得角
+CX=圣诞岛
+CY=塞浦路斯
+CZ=捷克
+DE=德国
+DJ=吉布提
+DK=丹麦
+DM=多米尼克
+DO=多米尼加共和国
+DZ=阿尔及利亚
+EC=厄瓜多尔
+EE=爱沙尼亚
+EG=埃及
+EH=西撒哈拉
+ER=厄立特里亚
+ES=西班牙
+ET=埃塞俄比亚
+FI=芬兰
+FJ=斐济
+FK=福克兰群岛
+FM=密克罗尼西亚
+FO=法罗群岛
+FR=法国
+GA=加蓬
+GB=英国
+GD=格林纳达
+GE=格鲁吉亚
+GF=法属圭亚那
+GH=加纳
+GI=直布罗陀
+GL=格陵兰
+GM=冈比亚
+GN=几内亚
+GP=瓜德罗普
+GQ=赤道几内亚
+GR=希腊
+GS=南乔治亚和南桑威奇群岛
+GT=危地马拉
+GU=关岛
+GW=几内亚比绍
+GY=圭亚那
+HK=中国香港特别行政区
+HM=赫德岛和麦克唐纳群岛
+HN=洪都拉斯
+HR=克罗地亚
+HT=海地
+HU=匈牙利
+ID=印度尼西亚
+IE=爱尔兰
+IL=以色列
+IN=印度
+IO=英属印度洋领地
+IQ=伊拉克
+IR=伊朗
+IS=冰岛
+IT=意大利
+JM=牙买加
+JO=约旦
+JP=日本
+KE=肯尼亚
+KG=吉尔吉斯斯坦
+KH=柬埔寨
+KI=基里巴斯
+KM=科摩罗
+KN=圣基茨和尼维斯
+KP=朝鲜
+KR=韩国
+KW=科威特
+KY=开曼群岛
+KZ=哈萨克斯坦
+LA=老挝
+LB=黎巴嫩
+LC=圣卢西亚
+LI=列支敦士登
+LK=斯里兰卡
+LR=利比里亚
+LS=莱索托
+LT=立陶宛
+LU=卢森堡
+LV=拉脱维亚
+LY=利比亚
+MA=摩洛哥
+MC=摩纳哥
+MD=摩尔多瓦
+ME=黑山
+MG=马达加斯加
+MH=马绍尔群岛
+MK=北马其顿
+ML=马里
+MM=缅甸
+MN=蒙古
+MO=中国澳门特别行政区
+MP=北马里亚纳群岛
+MQ=马提尼克
+MR=毛里塔尼亚
+MS=蒙特塞拉特
+MT=马耳他
+MU=毛里求斯
+MV=马尔代夫
+MW=马拉维
+MX=墨西哥
+MY=马来西亚
+MZ=莫桑比克
+NA=纳米比亚
+NC=新喀里多尼亚
+NE=尼日尔
+NF=诺福克岛
+NG=尼日利亚
+NI=尼加拉瓜
+NL=荷兰
+NO=挪威
+NP=尼泊尔
+NR=瑙鲁
+NU=纽埃
+NZ=新西兰
+OM=阿曼
+PA=巴拿马
+PE=秘鲁
+PF=法属波利尼西亚
+PG=巴布亚新几内亚
+PH=菲律宾
+PK=巴基斯坦
+PL=波兰
+PM=圣皮埃尔和密克隆群岛
+PN=皮特凯恩群岛
+PR=波多黎各
+PS=巴勒斯坦领土
+PT=葡萄牙
+PW=帕劳
+PY=巴拉圭
+QA=卡塔尔
+RE=留尼汪
+RO=罗马尼亚
+RS=塞尔维亚
+RU=俄罗斯
+RW=卢旺达
+SA=沙特阿拉伯
+SB=所罗门群岛
+SC=塞舌尔
+SD=苏丹
+SE=瑞典
+SG=新加坡
+SH=圣赫勒拿
+SI=斯洛文尼亚
+SJ=斯瓦尔巴和扬马延
+SK=斯洛伐克
+SL=塞拉利昂
+SM=圣马力诺
+SN=塞内加尔
+SO=索马里
+SR=苏里南
+ST=圣多美和普林西比
+SV=萨尔瓦多
+SY=叙利亚
+SZ=斯威士兰
+TC=特克斯和凯科斯群岛
+TD=乍得
+TF=法属南部领地
+TG=多哥
+TH=泰国
+TJ=塔吉克斯坦
+TK=托克劳
+TL=东帝汶
+TM=土库曼斯坦
+TN=突尼斯
+TO=汤加
+TR=土耳其
+TT=特立尼达和多巴哥
+TV=图瓦卢
+TW=台湾
+TZ=坦桑尼亚
+UA=乌克兰
+UG=乌干达
+UM=美国本土外小岛屿
+US=美国
+UY=乌拉圭
+UZ=乌兹别克斯坦
+VA=梵蒂冈
+VC=圣文森特和格林纳丁斯
+VE=委内瑞拉
+VG=英属维尔京群岛
+VI=美属维尔京群岛
+VN=越南
+VU=瓦努阿图
+WF=瓦利斯和富图纳
+WS=萨摩亚
+YE=也门
+YT=马约特
+ZA=南非
+ZM=赞比亚
+ZW=津巴布韦
 
 # territory names
 # key is UN M.49 country and area code
 
-001=\u4e16\u754c
-002=\u975e\u6d32
-003=\u5317\u7f8e\u6d32
-005=\u5357\u7f8e\u6d32
-009=\u5927\u6d0b\u6d32
-011=\u897f\u975e
-013=\u4e2d\u7f8e\u6d32
-014=\u4e1c\u975e
-015=\u5317\u975e
-017=\u4e2d\u975e
-018=\u5357\u90e8\u975e\u6d32
-019=\u7f8e\u6d32
-021=\u7f8e\u6d32\u5317\u90e8
-029=\u52a0\u52d2\u6bd4\u5730\u533a
-030=\u4e1c\u4e9a
-034=\u5357\u4e9a
-035=\u4e1c\u5357\u4e9a
-039=\u5357\u6b27
-053=\u6fb3\u5927\u62c9\u897f\u4e9a
-054=\u7f8e\u62c9\u5c3c\u897f\u4e9a
-057=\u5bc6\u514b\u7f57\u5c3c\u897f\u4e9a\u5730\u533a
-061=\u73bb\u5229\u5c3c\u897f\u4e9a
-142=\u4e9a\u6d32
-143=\u4e2d\u4e9a
-145=\u897f\u4e9a
-150=\u6b27\u6d32
-151=\u4e1c\u6b27
-154=\u5317\u6b27
-155=\u897f\u6b27
-419=\u62c9\u4e01\u7f8e\u6d32
+001=世界
+002=非洲
+003=北美洲
+005=南美洲
+009=大洋洲
+011=西非
+013=中美洲
+014=东非
+015=北非
+017=中非
+018=南部非洲
+019=美洲
+021=美洲北部
+029=加勒比地区
+030=东亚
+034=南亚
+035=东南亚
+039=南欧
+053=澳大拉西亚
+054=美拉尼西亚
+057=密克罗尼西亚地区
+061=玻利尼西亚
+142=亚洲
+143=中亚
+145=西亚
+150=欧洲
+151=东欧
+154=北欧
+155=西欧
+419=拉丁美洲
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_TW.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_TW.properties
index 26b19edbb42..b867e2259ae 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_TW.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/LocaleNames_zh_TW.properties
@@ -38,972 +38,972 @@
 # language names
 # key is ISO 639 language code
 
-aa=\u963f\u6cd5\u6587
-ab=\u963f\u5e03\u54c8\u8332\u6587
-ae=\u963f\u7dad\u65af\u5854\u6587
-af=\u5357\u975e\u8377\u862d\u6587
-ak=\u963f\u574e\u6587
-am=\u963f\u59c6\u54c8\u62c9\u6587
-an=\u963f\u62c9\u8ca2\u6587
-ar=\u963f\u62c9\u4f2f\u6587
-as=\u963f\u85a9\u59c6\u6587
-av=\u963f\u74e6\u723e\u6587
-ay=\u827e\u99ac\u62c9\u6587
-az=\u4e9e\u585e\u62dc\u7136\u6587
-ba=\u5df4\u4ec0\u5580\u723e\u6587
-be=\u767d\u4fc4\u7f85\u65af\u6587
-bg=\u4fdd\u52a0\u5229\u4e9e\u6587
-bh=\u6bd4\u54c8\u723e\u6587
-bi=\u6bd4\u65af\u62c9\u99ac\u6587
-bm=\u73ed\u5df4\u62c9\u6587
-bn=\u5b5f\u52a0\u62c9\u6587
-bo=\u85cf\u6587
-br=\u5e03\u5217\u5854\u5c3c\u6587
-bs=\u6ce2\u58eb\u5c3c\u4e9e\u6587
-ca=\u52a0\u6cf0\u862d\u6587
-ce=\u8eca\u81e3\u6587
-ch=\u67e5\u83ab\u6d1b\u6587
-co=\u79d1\u897f\u5609\u6587
-cr=\u514b\u91cc\u6587
-cs=\u6377\u514b\u6587
-cu=\u5b97\u6559\u65af\u62c9\u592b\u6587
-cv=\u695a\u74e6\u4ec0\u6587
-cy=\u5a01\u723e\u65af\u6587
-da=\u4e39\u9ea5\u6587
-de=\u5fb7\u6587
-dv=\u8fea\u7dad\u897f\u6587
-dz=\u5b97\u5361\u6587
-ee=\u57c3\u7dad\u6587
-el=\u5e0c\u81d8\u6587
-en=\u82f1\u6587
-eo=\u4e16\u754c\u6587
-es=\u897f\u73ed\u7259\u6587
-et=\u611b\u6c99\u5c3c\u4e9e\u6587
-eu=\u5df4\u65af\u514b\u6587
-fa=\u6ce2\u65af\u6587
-ff=\u5bcc\u62c9\u6587
-fi=\u82ac\u862d\u6587
-fj=\u6590\u6fdf\u6587
-fo=\u6cd5\u7f85\u6587
-fr=\u6cd5\u6587
-fy=\u897f\u5f17\u91cc\u897f\u4e9e\u6587
-ga=\u611b\u723e\u862d\u6587
-gd=\u8607\u683c\u862d\u84cb\u723e\u6587
-gl=\u52a0\u5229\u897f\u4e9e\u6587
-gn=\u74dc\u62c9\u5c3c\u6587
-gu=\u53e4\u5409\u62c9\u7279\u6587
-gv=\u66fc\u5cf6\u6587
-ha=\u8c6a\u6492\u6587
-he=\u5e0c\u4f2f\u4f86\u6587
-hi=\u5370\u5730\u6587
-ho=\u897f\u91cc\u83ab\u5716\u571f\u6587
-hr=\u514b\u7f85\u57c3\u897f\u4e9e\u6587
-ht=\u6d77\u5730\u6587
-hu=\u5308\u7259\u5229\u6587
-hy=\u4e9e\u7f8e\u5c3c\u4e9e\u6587
-hz=\u8d6b\u96f7\u7f85\u6587
-ia=\u570b\u969b\u6587
-id=\u5370\u5c3c\u6587
-ie=\u570b\u969b\u6587\uff08E\uff09
-ig=\u4f0a\u5e03\u6587
-ii=\u56db\u5ddd\u5f5d\u6587
-ik=\u4f9d\u5974\u76ae\u7dad\u514b\u6587
-in=\u5370\u5c3c\u6587
-io=\u4f0a\u591a\u6587
-is=\u51b0\u5cf6\u6587
-it=\u7fa9\u5927\u5229\u6587
-iu=\u56e0\u7d10\u7279\u6587
-iw=\u5e0c\u4f2f\u4f86\u6587
-ja=\u65e5\u6587
-ji=\u610f\u7b2c\u7dd2\u6587
-jv=\u722a\u54c7\u6587
-ka=\u55ac\u6cbb\u4e9e\u6587
-kg=\u525b\u679c\u6587
-ki=\u5409\u5eab\u5c24\u6587
-kj=\u5ee3\u4e9e\u99ac\u6587
-kk=\u54c8\u85a9\u514b\u6587
-kl=\u683c\u9675\u862d\u6587
-km=\u9ad8\u68c9\u6587
-kn=\u574e\u90a3\u9054\u6587
-ko=\u97d3\u6587
-kr=\u5361\u52aa\u91cc\u6587
-ks=\u5580\u4ec0\u7c73\u723e\u6587
-ku=\u5eab\u5fb7\u6587
-kv=\u79d1\u7c73\u6587
-kw=\u5eb7\u74e6\u8033\u6587
-ky=\u5409\u723e\u5409\u65af\u6587
-la=\u62c9\u4e01\u6587
-lb=\u76e7\u68ee\u5821\u6587
-lg=\u5e72\u9054\u6587
-li=\u6797\u5821\u6587
-ln=\u6797\u52a0\u62c9\u6587
-lo=\u5bee\u6587
-lt=\u7acb\u9676\u5b9b\u6587
-lu=\u9b6f\u5df4\u52a0\u4e39\u52a0\u6587
-lv=\u62c9\u812b\u7dad\u4e9e\u6587
-mg=\u99ac\u9054\u52a0\u65af\u52a0\u6587
-mh=\u99ac\u7d39\u723e\u6587
-mi=\u6bdb\u5229\u6587
-mk=\u99ac\u5176\u9813\u6587
-ml=\u99ac\u4f86\u4e9e\u62c9\u59c6\u6587
-mn=\u8499\u53e4\u6587
-mo=\u6469\u723e\u9054\u7dad\u4e9e\u6587
-mr=\u99ac\u62c9\u5730\u6587
-ms=\u99ac\u4f86\u6587
-mt=\u99ac\u723e\u4ed6\u6587
-my=\u7dec\u7538\u6587
-na=\u8afe\u9b6f\u6587
-nb=\u5df4\u514b\u6469\u632a\u5a01\u6587
-nd=\u5317\u5730\u7562\u5217\u6587
-ne=\u5c3c\u6cca\u723e\u6587
-ng=\u6069\u6771\u52a0\u6587
-nl=\u8377\u862d\u6587
-nn=\u8010\u8afe\u65af\u514b\u632a\u5a01\u6587
-no=\u632a\u5a01\u6587
-nr=\u5357\u5730\u7562\u5217\u6587
-nv=\u7d0d\u74e6\u970d\u6587
-ny=\u5c3c\u63da\u8cc8\u6587
-oc=\u5967\u514b\u897f\u5766\u6587
-oj=\u5967\u6770\u5e03\u74e6\u6587
-om=\u5967\u7f85\u83ab\u6587
-or=\u6b50\u8fea\u4e9e\u6587
-os=\u5967\u585e\u63d0\u6587
-pa=\u65c1\u906e\u666e\u6587
-pi=\u5df4\u5229\u6587
-pl=\u6ce2\u862d\u6587
-ps=\u666e\u4ec0\u5716\u6587
-pt=\u8461\u8404\u7259\u6587
-qu=\u84cb\u695a\u74e6\u6587
-rm=\u7f85\u66fc\u65af\u6587
-rn=\u9686\u8fea\u6587
-ro=\u7f85\u99ac\u5c3c\u4e9e\u6587
-ru=\u4fc4\u6587
-rw=\u76e7\u5b89\u9054\u6587
-sa=\u68b5\u6587
-sc=\u6492\u4e01\u6587
-sd=\u4fe1\u5fb7\u6587
-se=\u5317\u85a9\u7c73\u6587
-sg=\u6851\u6208\u6587
-si=\u50e7\u4f3d\u7f85\u6587
-sk=\u65af\u6d1b\u4f10\u514b\u6587
-sl=\u65af\u6d1b\u7dad\u5c3c\u4e9e\u6587
-sm=\u85a9\u6469\u4e9e\u6587
-sn=\u7d39\u7d0d\u6587
-so=\u7d22\u99ac\u5229\u6587
-sq=\u963f\u723e\u5df4\u5c3c\u4e9e\u6587
-sr=\u585e\u723e\u7dad\u4e9e\u6587
-ss=\u65af\u74e6\u7279\u6587
-st=\u585e\u7d22\u6258\u6587
-su=\u5dfd\u4ed6\u6587
-sv=\u745e\u5178\u6587
-sw=\u53f2\u74e6\u5e0c\u91cc\u6587
-ta=\u5766\u7c73\u723e\u6587
-te=\u6cf0\u76e7\u56fa\u6587
-tg=\u5854\u5409\u514b\u6587
-th=\u6cf0\u6587
-ti=\u63d0\u683c\u5229\u5c3c\u4e9e\u6587
-tk=\u571f\u5eab\u66fc\u6587
-tl=\u5854\u52a0\u8def\u65cf\u6587
-tn=\u585e\u8332\u74e6\u7d0d\u6587
-to=\u6771\u52a0\u6587
-tr=\u571f\u8033\u5176\u6587
-ts=\u7279\u677e\u52a0\u6587
-tt=\u97c3\u977c\u6587
-tw=\u7279\u5a01\u6587
-ty=\u5927\u6eaa\u5730\u6587
-ug=\u7dad\u543e\u723e\u6587
-uk=\u70cf\u514b\u862d\u6587
-ur=\u70cf\u90fd\u6587
-uz=\u70cf\u8332\u5225\u514b\u6587
-ve=\u6eab\u9054\u6587
-vi=\u8d8a\u5357\u6587
-vo=\u6c83\u62c9\u666e\u514b\u6587
-wa=\u74e6\u9686\u6587
-wo=\u6c83\u6d1b\u592b\u6587
-xh=\u79d1\u85a9\u6587
-yi=\u610f\u7b2c\u7dd2\u6587
-yo=\u7d04\u9b6f\u5df4\u6587
-za=\u58ef\u6587
-zu=\u7956\u9b6f\u6587
+aa=阿法文
+ab=阿布哈茲文
+ae=阿維斯塔文
+af=南非荷蘭文
+ak=阿坎文
+am=阿姆哈拉文
+an=阿拉貢文
+ar=阿拉伯文
+as=阿薩姆文
+av=阿瓦爾文
+ay=艾馬拉文
+az=亞塞拜然文
+ba=巴什喀爾文
+be=白俄羅斯文
+bg=保加利亞文
+bh=比哈爾文
+bi=比斯拉馬文
+bm=班巴拉文
+bn=孟加拉文
+bo=藏文
+br=布列塔尼文
+bs=波士尼亞文
+ca=加泰蘭文
+ce=車臣文
+ch=查莫洛文
+co=科西嘉文
+cr=克里文
+cs=捷克文
+cu=宗教斯拉夫文
+cv=楚瓦什文
+cy=威爾斯文
+da=丹麥文
+de=德文
+dv=迪維西文
+dz=宗卡文
+ee=埃維文
+el=希臘文
+en=英文
+eo=世界文
+es=西班牙文
+et=愛沙尼亞文
+eu=巴斯克文
+fa=波斯文
+ff=富拉文
+fi=芬蘭文
+fj=斐濟文
+fo=法羅文
+fr=法文
+fy=西弗里西亞文
+ga=愛爾蘭文
+gd=蘇格蘭蓋爾文
+gl=加利西亞文
+gn=瓜拉尼文
+gu=古吉拉特文
+gv=曼島文
+ha=豪撒文
+he=希伯來文
+hi=印地文
+ho=西里莫圖土文
+hr=克羅埃西亞文
+ht=海地文
+hu=匈牙利文
+hy=亞美尼亞文
+hz=赫雷羅文
+ia=國際文
+id=印尼文
+ie=國際文（E）
+ig=伊布文
+ii=四川彝文
+ik=依奴皮維克文
+in=印尼文
+io=伊多文
+is=冰島文
+it=義大利文
+iu=因紐特文
+iw=希伯來文
+ja=日文
+ji=意第緒文
+jv=爪哇文
+ka=喬治亞文
+kg=剛果文
+ki=吉庫尤文
+kj=廣亞馬文
+kk=哈薩克文
+kl=格陵蘭文
+km=高棉文
+kn=坎那達文
+ko=韓文
+kr=卡努里文
+ks=喀什米爾文
+ku=庫德文
+kv=科米文
+kw=康瓦耳文
+ky=吉爾吉斯文
+la=拉丁文
+lb=盧森堡文
+lg=干達文
+li=林堡文
+ln=林加拉文
+lo=寮文
+lt=立陶宛文
+lu=魯巴加丹加文
+lv=拉脫維亞文
+mg=馬達加斯加文
+mh=馬紹爾文
+mi=毛利文
+mk=馬其頓文
+ml=馬來亞拉姆文
+mn=蒙古文
+mo=摩爾達維亞文
+mr=馬拉地文
+ms=馬來文
+mt=馬爾他文
+my=緬甸文
+na=諾魯文
+nb=巴克摩挪威文
+nd=北地畢列文
+ne=尼泊爾文
+ng=恩東加文
+nl=荷蘭文
+nn=耐諾斯克挪威文
+no=挪威文
+nr=南地畢列文
+nv=納瓦霍文
+ny=尼揚賈文
+oc=奧克西坦文
+oj=奧杰布瓦文
+om=奧羅莫文
+or=歐迪亞文
+os=奧塞提文
+pa=旁遮普文
+pi=巴利文
+pl=波蘭文
+ps=普什圖文
+pt=葡萄牙文
+qu=蓋楚瓦文
+rm=羅曼斯文
+rn=隆迪文
+ro=羅馬尼亞文
+ru=俄文
+rw=盧安達文
+sa=梵文
+sc=撒丁文
+sd=信德文
+se=北薩米文
+sg=桑戈文
+si=僧伽羅文
+sk=斯洛伐克文
+sl=斯洛維尼亞文
+sm=薩摩亞文
+sn=紹納文
+so=索馬利文
+sq=阿爾巴尼亞文
+sr=塞爾維亞文
+ss=斯瓦特文
+st=塞索托文
+su=巽他文
+sv=瑞典文
+sw=史瓦希里文
+ta=坦米爾文
+te=泰盧固文
+tg=塔吉克文
+th=泰文
+ti=提格利尼亞文
+tk=土庫曼文
+tl=塔加路族文
+tn=塞茲瓦納文
+to=東加文
+tr=土耳其文
+ts=特松加文
+tt=韃靼文
+tw=特威文
+ty=大溪地文
+ug=維吾爾文
+uk=烏克蘭文
+ur=烏都文
+uz=烏茲別克文
+ve=溫達文
+vi=越南文
+vo=沃拉普克文
+wa=瓦隆文
+wo=沃洛夫文
+xh=科薩文
+yi=意第緒文
+yo=約魯巴文
+za=壯文
+zu=祖魯文
 
 # key is ISO 639.2 language code
-aar=\u963f\u6cd5\u6587
-abk=\u963f\u5e03\u54c8\u897f\u4e9e\u6587
-ace=\u4e9e\u9f4a\u6587
-ach=\u963f\u50d1\u5229\u6587
-ada=\u963f\u7576\u83ab\u6587
-ady=\u963f\u8fea\u5404\u6587
-afa=\u4e9e\u975e\u8a9e\u7cfb
-afh=\u963f\u5f17\u91cc\u5e0c\u5229\u6587
-afr=\u5357\u975e\u8377\u862d\u6587
-ain=\u963f\u4f0a\u52aa\u6587
-aka=\u963f\u5bd2\u6587
-akk=\u963f\u5361\u5fb7\u6587
-alb=\u963f\u723e\u5df4\u5c3c\u4e9e\u6587
-ale=\u963f\u7559\u7533\u6587
-alg=\u963f\u723e\u5ca1\u6606\u8af8\u8a9e\u8a00
-alt=\u5357\u963f\u723e\u6cf0\u6587
-amh=\u8863\u7d22\u6bd4\u4e9e\u6587
-ang=\u53e4\u82f1\u6587
-anp=\u6602\u52a0\u6587
-apa=\u963f\u5e15\u5207\u8af8\u8a9e\u8a00
-arc=\u963f\u62c9\u7c73\u6587
-arg=\u4e9e\u62c9\u5ca1\u6587
-arm=\u4e9e\u7f8e\u5c3c\u4e9e\u6587
-arn=\u99ac\u666e\u5207\u6587
-arp=\u963f\u62c9\u5e15\u970d\u6587
-art=\u4eba\u5de5\u8a9e\u8a00
-arw=\u963f\u62c9\u74e6\u514b\u6587
-asm=\u963f\u85a9\u59c6\u6587
-ast=\u963f\u65af\u5716\u91cc\u4e9e\u6587
-ath=\u963f\u85a9\u5e15\u65af\u574e\u8af8\u8a9e\u8a00
-aus=\u6fb3\u6d32\u8af8\u8a9e\u8a00
-ava=\u963f\u74e6\u96f7\u6587
-ave=\u963f\u672a\u65af\u5854\u6587
-awa=\u963f\u74e6\u6587
-aym=\u4e9e\u6469\u62c9\u6587
-aze=\u4e9e\u585e\u62dc\u7136\u6587
-bad=\u73ed\u9054\u6587
-bai=\u5df4\u7c73\u7d2f\u514b\u8af8\u8a9e\u8a00
-bak=\u5df4\u4ec0\u5580\u723e\u6587
-bal=\u4ffe\u8def\u652f\u6587
-ban=\u5cc7\u91cc\u6587
-bas=\u5df4\u85a9\u6587
-bat=\u6ce2\u7f85\u7684\u6d77\u8af8\u8a9e\u8a00
-bej=\u8c9d\u624e\u6587
-bel=\u767d\u4fc4\u7f85\u65af\u6587
-bem=\u5225\u59c6\u5df4\u6587
-ber=\u67cf\u67cf\u723e\u6587
-bho=\u535a\u5091\u666e\u723e\u6587
-bih=\u6bd4\u54c8\u723e\u6587
-bik=\u6bd4\u79d1\u723e\u6587
-bin=\u6bd4\u5c3c\u6587
-bis=\u6bd4\u65af\u62c9\u99ac\u6587
-bla=\u932b\u514b\u932b\u5361\u6587
-bnt=\u73ed\u5716\u8af8\u8a9e\u8a00
-bos=\u6ce2\u58eb\u5c3c\u4e9e\u6587
-bra=\u5e03\u62c9\u6770\u6587
-bre=\u4e0d\u5217\u5854\u5c3c\u6587
-btk=\u5df4\u5854\u514b\u6587
-bua=\u5e03\u91cc\u963f\u7279\u6587
-bug=\u5e03\u5409\u65af\u6587
-bul=\u4fdd\u52a0\u5229\u4e9e\u6587
-bur=\u7dec\u7538\u6587
-byn=\u6bd4\u6797\u6587
-cad=\u5361\u591a\u6587
-cai=\u4e2d\u7f8e\u5370\u7b2c\u5b89\u8af8\u8a9e\u8a00
-car=\u52a0\u52d2\u6bd4\u6587
-cat=\u5609\u6cf0\u7f85\u5c3c\u4e9e\u6587
-cau=\u9ad8\u52a0\u7d22\u8af8\u8a9e\u8a00
-ceb=\u5bbf\u9727\u6587
-cel=\u51f1\u723e\u7279\u8af8\u8a9e\u8a00
-cha=\u67e5\u6469\u6d1b\u6587
-chb=\u5947\u5e03\u67e5\u6587
-che=\u8eca\u81e3\u6587
-chg=\u67e5\u52a0\u6587
-chk=\u8655\u5947\u65af\u6587
-chm=\u99ac\u91cc\u6587
-chn=\u5951\u5974\u514b\u6587
-cho=\u55ac\u514b\u6258\u6587
-chp=\u5947\u4f69\u74e6\u63da\u6587
-chr=\u67f4\u7f85\u57fa\u6587
-chu=\u6559\u6703\u65af\u62c9\u592b\u6587
-chv=\u695a\u74e6\u58eb\u6587
-chy=\u6c99\u4f0a\u5b89\u6587
-cop=\u79d1\u666e\u7279\u6587
-cor=\u5eb7\u74e6\u8033\u6587
-cpe=\u6b50\u6d32\u8154\u8abf\u548c\u6d0b\u6d87\u6ff1\uff0c\u6e90\u81ea\u82f1\u6587\u7684(\u5176\u4ed6)
-cpf=\u6b50\u6d32\u8154\u8abf\u548c\u6d0b\u6d87\u6ff1\uff0c\u6e90\u81ea\u6cd5\u6587\u7684(\u5176\u4ed6)
-cpp=\u6b50\u6d32\u8154\u8abf\u548c\u6d0b\u6d87\u6ff1\uff0c\u6e90\u81ea\u8461\u8404\u7259\u6587\u7684(\u5176\u4ed6)
-crh=\u571f\u8033\u5176\u6587\uff08\u514b\u91cc\u7c73\u4e9e\u534a\u5cf6\uff09
-crp=\u5176\u4ed6\u514b\u91cc\u5967\u723e\u6df7\u548c\u8a9e\u7cfb
-csb=\u5361\u8212\u5e03\u6587
-cus=\u5eab\u65bd\u7279\u8af8\u8a9e\u8a00
-dak=\u9054\u79d1\u4ed6\u6587
-dan=\u4e39\u9ea5\u6587
-dar=\u9054\u723e\u683c\u74e6\u6587
-day=\u8fea\u96c5\u514b\u6587
-del=\u5fb7\u62c9\u74e6\u6587
-den=\u65af\u62c9\u592b
-dgr=\u591a\u683c\u91cc\u5e03\u6587
-din=\u4e01\u5361\u6587
-div=\u8fea\u7dad\u897f\u6587
-doi=\u591a\u683c\u4f86\u6587
-dra=\u5fb7\u62c9\u5a01\u8af8\u8a9e\u8a00
-dsb=\u4e0b\u7d22\u5e03\u6587
-dua=\u675c\u4e9e\u62c9\u6587
-dum=\u4e2d\u53e4\u8377\u862d\u6587
-dut=\u8377\u862d\u6587
-dyu=\u8fea\u5c24\u62c9\u6587
-efi=\u57c3\u83f2\u514b\u6587
-egy=\u53e4\u57c3\u53ca\u6587
-eka=\u827e\u5361\u6731\u514b\u6587
-elx=\u57c3\u862d\u6587
-enm=\u4e2d\u53e4\u82f1\u6587
-est=\u611b\u6c99\u5c3c\u4e9e\u6587
-ewe=\u57c3\u7dad\u6587
-ewo=\u4f9d\u6c6a\u90fd\u6587
-fan=\u82b3\u65cf\u6587
-fao=\u6cd5\u7f85\u6587
-fat=\u82b3\u8482\u6587
-fij=\u6590\u6fdf\u6587
-fil=\u83f2\u5f8b\u8cd3\u6587
-fin=\u82ac\u862d\u6587
-fiu=\u82ac\u70cf\u8af8\u8a9e\u8a00
-fon=\u8c50\u6587
-frm=\u4e2d\u53e4\u6cd5\u6587
-fro=\u53e4\u6cd5\u6587
-frr=\u5317\u5f17\u91cc\u897f\u4e9e\u6587
-frs=\u6771\u5f17\u91cc\u897f\u4e9e\u6587
-fry=\u897f\u5f17\u91cc\u897f\u4e9e\u6587
-fur=\u5f17\u7559\u5229\u6587
-gaa=\u52a0\u65cf\u6587
-gay=\u52a0\u7d04\u6587
-gba=\u845b\u5df4\u4e9e\u6587
-gem=\u5176\u4ed6\u65e5\u8033\u66fc\u8a9e\u7cfb
-geo=\u55ac\u6cbb\u4e9e\u6587
-gez=\u5409\u8332\u6587
-gil=\u5409\u723e\u4f2f\u7279\u7fa4\u5cf6\u6587
-gla=\u84cb\u723e\u6587
-gle=\u611b\u723e\u862d\u6587
-glg=\u52a0\u91cc\u897f\u4e9e\u6587
-glv=\u66fc\u5cf6\u6587
-gmh=\u4e2d\u53e4\u9ad8\u5730\u5fb7\u6587
-goh=\u53e4\u9ad8\u5730\u5fb7\u6587
-gon=\u5ca1\u5fb7\u6587
-gor=\u79d1\u9686\u9054\u7f85\u6587
-got=\u54e5\u5fb7\u6587
-grb=\u683c\u5217\u535a\u6587
-grc=\u53e4\u5e0c\u81d8\u6587
-gre=\u4e2d\u53e4\u5e0c\u81d8\u6587 (1453-)
-gsw=\u5fb7\u6587\uff08\u745e\u58eb\uff09
-guj=\u53e4\u5409\u62c9\u7279\u6587
-gwi=\u572d\u5951\u6587
-hai=\u6d77\u9054\u6587
-hau=\u8c6a\u85a9\u6587
-haw=\u590f\u5a01\u5937\u6587
-heb=\u5e0c\u4f2f\u4f86\u6587
-her=\u8d6b\u96f7\u7f85\u6587
-hil=\u5e0c\u5229\u84cb\u8fb2\u6587
-him=\u8d6b\u99ac\u67e5\u5229\u6587
-hin=\u5317\u5370\u5ea6\u6587
-hit=\u8d6b\u68af\u6587
-hmn=\u5b5f\u6587
-hrv=\u514b\u7f85\u57c3\u897f\u4e9e\u6587
-hsb=\u4e0a\u7d22\u5e03\u6587
-hup=\u80e1\u5e15\u6587
-iba=\u4f0a\u73ed\u6587
-ibo=\u4f0a\u5e03\u6587
-ice=\u51b0\u5cf6\u6587
-iii=\u56db\u5ddd\u5937\u6587
-ijo=\u4f0a\u55ac\u6587
-iku=\u4f0a\u52aa\u4f0a\u7279\u6587
-ile=\u4eba\u5de5\u570b\u969b\u6587
-ilo=\u4f0a\u6d1b\u95ca\u6587
-ina=\u4eba\u5de5\u570b\u969b\u6587 (\u570b\u969b\u8f14\u52a9\u8a9e\u8a00\u5354\u6703)
-inc=\u5370\u5ea6\u8af8\u8a9e\u8a00
-ind=\u5370\u5c3c\u6587
-ine=\u5370\u6b50\u8af8\u8a9e\u8a00
-inh=\u5370\u53e4\u4ec0\u6587
-ipk=\u4f9d\u5974\u76ae\u7dad\u514b\u6587
-ira=\u4f0a\u6717\u8af8\u8a9e\u8a00
-iro=\u6613\u6d1b\u9b41\u6587
-ita=\u7fa9\u5927\u5229\u6587
-jbo=\u908f\u8f2f\u6587
-jpr=\u7336\u592a\u6559-\u6ce2\u65af\u6587
-jrb=\u7336\u592a\u963f\u62c9\u4f2f\u6587
-kaa=\u5361\u62c9\u5361\u723e\u5e15\u514b\u6587
-kab=\u5361\u6bd4\u723e\u6587
-kac=\u5361\u7434\u6587
-kal=\u683c\u9675\u862d\u6587
-kam=\u5361\u59c6\u5df4\u6587
-kan=\u574e\u90a3\u9054\u6587
-kar=\u514b\u502b\u6587
-kas=\u5580\u4ec0\u7c73\u723e\u6587
-kaw=\u5361\u5a01\u6587
-kaz=\u54c8\u85a9\u514b\u6587
-kbd=\u5361\u5df4\u723e\u9054\u6587
-kha=\u5361\u897f\u6587
-khi=\u79d1\u4f9d\u6851\u8af8\u8a9e\u8a00
-khm=\u4e2d\u592e\u67ec\u57d4\u5be8\u6587
-kho=\u548c\u95d0\u6587
-kik=\u57fa\u5eab\u7336\u6587
-kin=\u91d1\u63da\u842c\u7b54\u6587
-kir=\u5409\u723e\u5409\u65af\u6587
-kmb=\u91d1\u90a6\u675c\u6587
-kok=\u8ca2\u6839\u6587
-kom=\u79d1\u5bc6\u6587
-kon=\u525b\u679c\u6587
-kor=\u97d3\u6587
-kos=\u79d1\u65af\u96f7\u6069\u6587
-kpe=\u514b\u4f69\u5217\u6587
-krc=\u5361\u62c9\u67f4-\u5305\u723e\u5361\u723e\u6587
-krl=\u5361\u7d2f\u5229\u963f\u6587
-kro=\u514b\u9b6f\u6587
-kru=\u5eab\u9b6f\u79d1\u6587
-kua=\u95dc\u4e9e\u99ac\u6587
-kum=\u5eab\u5bc6\u514b\u6587
-kur=\u5eab\u5fb7\u6587
-kut=\u5eab\u7279\u5948\u6587
-lad=\u62c9\u8fea\u8afe\u6587
-lah=\u62c9\u4ea8\u9054\u6587
-lam=\u862d\u5df4\u6587
-lao=\u5bee\u6587
-lav=\u62c9\u812b\u7dad\u4e9e\u6587 (\u5217\u7279\u6587)
-lez=\u5217\u8332\u5e72\u6587
-lim=\u5229\u535a\u574e\u6587
-lin=\u9675\u52a0\u62c9\u6587
-lol=\u8292\u6208\u6587
-loz=\u6d1b\u9f4a\u6587
-ltz=\u76e7\u68ee\u5821\u6587
-lua=\u9b6f\u5df4\u9b6f\u9b6f\u4e9e\u6587
-lub=\u76e7\u5df4-\u52a0\u4e39\u52a0\u6587
-lug=\u5e72\u9054\u6587
-lui=\u8def\u6613\u585e\u8afe\u6587
-lun=\u76e7\u6069\u9054\u6587
-luo=\u76e7\u5967\u6587
-lus=\u7c73\u4f50\u6587
-mac=\u99ac\u5176\u9813\u6587
-mad=\u99ac\u90fd\u62c9\u6587
-mag=\u99ac\u52a0\u4f0a\u6587
-mah=\u99ac\u7d39\u723e\u7fa4\u5cf6\u6587
-mai=\u9081\u8482\u5229\u6587
-mak=\u671b\u52a0\u932b\u6587
-mal=\u99ac\u4f86\u4e9e\u62c9\u59c6\u6587
-man=\u66fc\u4e01\u54e5\u6587
-map=\u5357\u5cf6\u8af8\u8a9e\u8a00
-mar=\u99ac\u62c9\u5730\u6587
-mas=\u99ac\u8cfd\u6587
-may=\u99ac\u4f86\u6587
-mdf=\u83ab\u514b\u6c99\u6587
-mdr=\u66fc\u9054\u6587
-men=\u9580\u5fb7\u6587
-mga=\u4e2d\u53e4\u611b\u723e\u862d\u6587
-mic=\u7c73\u514b\u99ac\u514b\u6587
-min=\u7c73\u5357\u5361\u5821\u6587
-mis=\u6df7\u96dc\u8a9e\u8af8\u8a9e\u8a00
-mkh=\u5b5f\u9ad8\u68c9\u8af8\u8a9e\u8a00
-mlg=\u99ac\u62c9\u52a0\u897f\u6587
-mlt=\u99ac\u723e\u4ed6\u6587
-mnc=\u6eff\u65cf\u6587
-mni=\u66fc\u5c3c\u666e\u723e\u6587
-mno=\u99ac\u8afe\u535a\u8af8\u8a9e\u8a00
-moh=\u83ab\u970d\u514b\u6587
-mos=\u83ab\u897f\u6587
-mul=\u591a\u7a2e\u8a9e\u8a00
-mun=\u8499\u9054\u8af8\u8a9e\u8a00
-mus=\u514b\u91cc\u514b\u6587
-mwl=\u7c73\u862d\u5fb7\u65af\u6587
-mwr=\u99ac\u74e6\u91cc\u6587
-myn=\u99ac\u96c5\u8af8\u8a9e\u8a00
-myv=\u5384\u723e\u8332\u4e9e\u6587
-nah=\u7d0d\u74e6\u7279\u6587
-nai=\u5317\u7f8e\u5370\u7b2c\u5b89\u8af8\u8a9e\u8a00
-nap=\u62ff\u6ce2\u91cc\u6587
-nau=\u8afe\u9b6f\u6587
-nav=\u7d0d\u74e6\u8377\u6587
-nbl=\u5357\u6069\u5fb7\u6bd4\u5229\u6587
-nde=\u5317\u6069\u5fb7\u6bd4\u5229\u6587
-ndo=\u6069\u6771\u52a0\u6587
-nds=\u4f4e\u5730\u5fb7\u6587
-nep=\u5c3c\u6cca\u723e\u6587
-new=\u5c3c\u74e6\u723e\u6587
-nia=\u5c3c\u4e9e\u65af\u6587
-niu=\u7d10\u57c3\u6587
-nno=\u632a\u5a01\u8010\u8afe\u65af\u514b\u6587
-nob=\u535a\u514b\u99ac\u723e\u6587\uff0c\u632a\u5a01
-nog=\u8afe\u84cb\u6587
-non=\u53e4\u8afe\u723e\u65af\u6587
-nqo=\u66fc\u5fb7\u6587\u5b57 (N\u2019Ko)
-nso=\u5317\u7d22\u6258\u6587
-nub=\u52aa\u6bd4\u4e9e\u8af8\u8a9e\u8a00
-nwc=\u53e4\u5c3c\u74e6\u723e\u6587
-nya=\u9f4a\u5207\u74e6\u6587
-nym=\u5c3c\u63da\u97cb\u9f4a\u6587
-nyn=\u5c3c\u63da\u79d1\u840a\u6587
-nyo=\u5c3c\u5967\u56c9\u6587
-nzi=\u5c3c\u8332\u99ac\u6587
-oci=\u6b50\u897f\u5766\u6587 (\u524d 1500)
-oji=\u5967\u6770\u5e03\u97cb\u6587
-ori=\u6b50\u5229\u4e9e\u6587
-orm=\u5967\u7f85\u8499\u6587
-osa=\u6b50\u585e\u5947\u6587
-oss=\u5967\u585e\u68af\u6587
-ota=\u9102\u5716\u66fc\u571f\u8033\u5176\u6587
-oto=\u5967\u6258\u7c73\u8af8\u8a9e\u8a00
-paa=\u5df4\u5e03\u4e9e\u8af8\u8a9e\u8a00
-pag=\u6f58\u52a0\u8f9b\u6587
-pal=\u5df4\u5217\u7dad\u6587
-pam=\u6f58\u5e15\u5609\u6587
-pap=\u5e15\u76ae\u963f\u9580\u6258\u6587
-pau=\u5e1b\u7409\u6587
-peo=\u53e4\u6ce2\u65af\u6587
-phi=\u83f2\u5f8b\u8cd3\u8af8\u8a9e\u8a00
-phn=\u8153\u5c3c\u57fa\u6587
-pli=\u5e15\u91cc\u6587
-pol=\u6ce2\u862d\u6587
-pon=\u6ce2\u90a3\u8c9d\u6587
-pra=\u666e\u62c9\u514b\u91cc\u7279\u8af8\u8a9e\u8a00
-pro=\u53e4\u666e\u7f85\u65fa\u65af\u6587
-pus=\u666e\u4ec0\u5716\u6587
-que=\u84cb\u695a\u74e6\u6587
-raj=\u62c9\u8cc8\u65af\u5766\u8af8\u6587
-rap=\u5fa9\u6d3b\u5cf6\u6587
-rar=\u62c9\u7f85\u901a\u52a0\u6587
-roa=\u7f85\u66fc\u8af8\u8a9e\u8a00
-roh=\u7f85\u66fc\u4ec0\u6587
-rom=\u5409\u666e\u8cfd\u6587
-rum=\u7f85\u99ac\u5c3c\u4e9e\u6587
-run=\u79d1\u9686\u5730\u6587
-rup=\u7f85\u99ac\u5c3c\u4e9e\u8a9e\u7cfb
-sad=\u6851\u9054\u97cb\u6587
-sag=\u6851\u6208\u8a9e
-sah=\u96c5\u5eab\u7279\u6587
-sal=\u85a9\u5229\u4ec0\u8af8\u8a9e\u8a00
-sam=\u85a9\u746a\u5229\u4e9e\u963f\u62c9\u59c6\u6587
-san=\u68b5\u6587\u5b57\u6bcd
-sas=\u6492\u6492\u514b\u6587
-sat=\u6851\u5854\u5229\u6587
-scn=\u897f\u897f\u91cc\u6587
-sco=\u8607\u683c\u862d\u6587
-sel=\u585e\u723e\u5eab\u666e\u6587
-sem=\u9583\u8a9e\u8af8\u8a9e\u8a00
-sga=\u53e4\u611b\u723e\u862d\u6587
-sgn=\u624b\u8a9e
-shn=\u64a3\u6587
-sid=\u5e0c\u9054\u6469\u6587
-sin=\u932b\u862d\u6587
-sio=\u8607\u8a9e\u8af8\u8a9e\u8a00
-sit=\u6f22\u85cf\u8a9e\u7cfb
-sla=\u65af\u62c9\u592b\u8af8\u8a9e\u8a00
-slv=\u65af\u6d1b\u7dad\u5c3c\u4e9e\u8a9e
-sma=\u5357\u85a9\u7c73\u6587
-smi=\u85a9\u7c73\u8af8\u8a9e\u8a00
-smj=\u9b6f\u52d2\u85a9\u7c73\u6587
-smn=\u4f0a\u7d0d\u91cc\u85a9\u7c73\u6587
-smo=\u85a9\u6469\u4e9e\u6587
-sms=\u65af\u79d1\u7279\u85a9\u7c73\u6587
-sna=\u980c\u54c8\u6587
-snk=\u7d22\u5c3c\u57fa\u6587
-sog=\u7d22\u683c\u5e95\u4e9e\u7d0d\u6587
-som=\u7d22\u99ac\u5229\u6587
-sot=\u7d22\u6258\u6587, \u5357\u90e8
-srd=\u85a9\u4e01\u5c3c\u4e9e\u6587
-srn=\u8607\u62c9\u5357\u6771\u588e\u6587
-srp=\u585e\u723e\u7dad\u4e9e\u6587
-srr=\u585e\u96f7\u723e\u6587
-ssa=\u5c3c\u7f85\u6492\u54c8\u62c9\u8af8\u8a9e\u8a00
-ssw=\u897f\u65af\u74e6\u63d0\u6587
-suk=\u8607\u5eab\u99ac\u6587
-sun=\u5dfd\u4e39\u6587
-sus=\u8607\u8607\u6587
-sux=\u8607\u7f8e\u6587
-swa=\u53f2\u74e6\u897f\u91cc\u6587
-syc=\u53e4\u6558\u5229\u4e9e\u6587
-syr=\u6558\u5229\u4e9e\u6587
-tah=\u5927\u6eaa\u5730\u6587
-tai=\u50a3\u8a9e\u8af8\u8a9e\u8a00
-tam=\u5766\u7c73\u723e\u6587
-tat=\u97c3\u977c\u6587
-tel=\u7279\u62c9\u53e4\u6587
-tem=\u63d0\u59c6\u6587
-ter=\u6cf0\u96f7\u8afe\u6587
-tet=\u6cf0\u9813\u6587
-tgl=\u5854\u52a0\u62c9\u65cf\u6587
-tig=\u8482\u683c\u96f7\u6587
-tir=\u63d0\u683c\u5229\u5c3c\u4e9e\u6587
-tiv=\u63d0\u592b\u6587
-tkl=\u6258\u514b\u52de\u6587
-tlh=\u514b\u6797\u8ca2\u6587
-tli=\u7279\u6797\u57fa\u7279\u6587
-tmh=\u5854\u99ac\u5947\u514b\u6587
-tog=\u6771\u52a0\u6587\uff08\u5c3c\u4e9e\u85a9\uff09
-ton=\u6771\u52a0\u6587 (\u6771\u52a0\u7fa4\u5cf6)
-tpi=\u6258\u6bd4\u8f9b\u6587
-tsi=\u6b3d\u897f\u5b89\u6587
-tsn=\u585e\u8332\u74e6\u7d0d\u6587
-tso=\u980c\u52a0\u6587
-tuk=\u571f\u5eab\u66fc\u6587
-tum=\u5716\u59c6\u5e03\u5361\u6587
-tup=\u5716\u76ae\u8af8\u8a9e\u8a00
-tut=\u963f\u723e\u6cf0\u8af8\u8a9e\u8a00 (\u5176\u4ed6)
-tvl=\u5410\u74e6\u9b6f\u6587
-twi=\u5951\u7dad\u6587
-tyv=\u5716\u74e6\u6587
-udm=\u70cf\u5fb7\u7a46\u723e\u7279\u6587
-uga=\u70cf\u52a0\u5217\u6587
-uig=\u7dad\u543e\u723e\u6587
-ukr=\u70cf\u514b\u862d\u6587
-umb=\u59c6\u672c\u675c\u6587
-und=\u672a\u77e5\u8a9e\u8a00
-urd=\u70cf\u90fd\u6587
-uzb=\u70cf\u8332\u5225\u514b\u6587
-vai=\u74e6\u4f0a\u6587
-ven=\u6587\u9054\u6587
-vot=\u6c83\u63d0\u514b\u6587
-wak=\u74e6\u5361\u4ec0\u8af8\u8a9e\u8a00
-wal=\u74e6\u62c9\u83ab\u6587
-war=\u74e6\u745e\u6587
-was=\u74e6\u7d39\u6587
-wel=\u5a01\u723e\u65af\u6587
-wen=\u7d22\u5e03\u8af8\u8a9e\u8a00
-wln=\u83ef\u9686\u6587
-wol=\u6c83\u6d1b\u592b\u6587
-xal=\u5361\u723e\u6885\u514b\u6587
-xho=\u5ed3\u85a9\u6587
-yao=\u7464\u6587
-yap=\u96c5\u6d66\u6587
-yid=\u610f\u7b2c\u7dd2\u6587
-yor=\u512a\u9b6f\u5df4\u6587
-ypk=\u5c24\u76ae\u514b\u8af8\u8a9e\u8a00
-zap=\u85a9\u6ce2\u7279\u514b\u6587
-zbl=\u5e03\u5217\u65af\u7b26\u865f
-zen=\u6fa4\u7d0d\u52a0\u6587
-zha=\u58ef\u6587
-znd=\u8d0a\u5fb7\u6587
-zul=\u7956\u9b6f\u6587
-zun=\u7956\u5c3c\u6587
-zxx=\u7121\u8a9e\u8a00\u5167\u5bb9
-zza=\u624e\u624e\u6587
+aar=阿法文
+abk=阿布哈西亞文
+ace=亞齊文
+ach=阿僑利文
+ada=阿當莫文
+ady=阿迪各文
+afa=亞非語系
+afh=阿弗里希利文
+afr=南非荷蘭文
+ain=阿伊努文
+aka=阿寒文
+akk=阿卡德文
+alb=阿爾巴尼亞文
+ale=阿留申文
+alg=阿爾岡昆諸語言
+alt=南阿爾泰文
+amh=衣索比亞文
+ang=古英文
+anp=昂加文
+apa=阿帕切諸語言
+arc=阿拉米文
+arg=亞拉岡文
+arm=亞美尼亞文
+arn=馬普切文
+arp=阿拉帕霍文
+art=人工語言
+arw=阿拉瓦克文
+asm=阿薩姆文
+ast=阿斯圖里亞文
+ath=阿薩帕斯坎諸語言
+aus=澳洲諸語言
+ava=阿瓦雷文
+ave=阿未斯塔文
+awa=阿瓦文
+aym=亞摩拉文
+aze=亞塞拜然文
+bad=班達文
+bai=巴米累克諸語言
+bak=巴什喀爾文
+bal=俾路支文
+ban=峇里文
+bas=巴薩文
+bat=波羅的海諸語言
+bej=貝扎文
+bel=白俄羅斯文
+bem=別姆巴文
+ber=柏柏爾文
+bho=博傑普爾文
+bih=比哈爾文
+bik=比科爾文
+bin=比尼文
+bis=比斯拉馬文
+bla=錫克錫卡文
+bnt=班圖諸語言
+bos=波士尼亞文
+bra=布拉杰文
+bre=不列塔尼文
+btk=巴塔克文
+bua=布里阿特文
+bug=布吉斯文
+bul=保加利亞文
+bur=緬甸文
+byn=比林文
+cad=卡多文
+cai=中美印第安諸語言
+car=加勒比文
+cat=嘉泰羅尼亞文
+cau=高加索諸語言
+ceb=宿霧文
+cel=凱爾特諸語言
+cha=查摩洛文
+chb=奇布查文
+che=車臣文
+chg=查加文
+chk=處奇斯文
+chm=馬里文
+chn=契奴克文
+cho=喬克托文
+chp=奇佩瓦揚文
+chr=柴羅基文
+chu=教會斯拉夫文
+chv=楚瓦士文
+chy=沙伊安文
+cop=科普特文
+cor=康瓦耳文
+cpe=歐洲腔調和洋涇濱，源自英文的(其他)
+cpf=歐洲腔調和洋涇濱，源自法文的(其他)
+cpp=歐洲腔調和洋涇濱，源自葡萄牙文的(其他)
+crh=土耳其文（克里米亞半島）
+crp=其他克里奧爾混和語系
+csb=卡舒布文
+cus=庫施特諸語言
+dak=達科他文
+dan=丹麥文
+dar=達爾格瓦文
+day=迪雅克文
+del=德拉瓦文
+den=斯拉夫
+dgr=多格里布文
+din=丁卡文
+div=迪維西文
+doi=多格來文
+dra=德拉威諸語言
+dsb=下索布文
+dua=杜亞拉文
+dum=中古荷蘭文
+dut=荷蘭文
+dyu=迪尤拉文
+efi=埃菲克文
+egy=古埃及文
+eka=艾卡朱克文
+elx=埃蘭文
+enm=中古英文
+est=愛沙尼亞文
+ewe=埃維文
+ewo=依汪都文
+fan=芳族文
+fao=法羅文
+fat=芳蒂文
+fij=斐濟文
+fil=菲律賓文
+fin=芬蘭文
+fiu=芬烏諸語言
+fon=豐文
+frm=中古法文
+fro=古法文
+frr=北弗里西亞文
+frs=東弗里西亞文
+fry=西弗里西亞文
+fur=弗留利文
+gaa=加族文
+gay=加約文
+gba=葛巴亞文
+gem=其他日耳曼語系
+geo=喬治亞文
+gez=吉茲文
+gil=吉爾伯特群島文
+gla=蓋爾文
+gle=愛爾蘭文
+glg=加里西亞文
+glv=曼島文
+gmh=中古高地德文
+goh=古高地德文
+gon=岡德文
+gor=科隆達羅文
+got=哥德文
+grb=格列博文
+grc=古希臘文
+gre=中古希臘文 (1453-)
+gsw=德文（瑞士）
+guj=古吉拉特文
+gwi=圭契文
+hai=海達文
+hau=豪薩文
+haw=夏威夷文
+heb=希伯來文
+her=赫雷羅文
+hil=希利蓋農文
+him=赫馬查利文
+hin=北印度文
+hit=赫梯文
+hmn=孟文
+hrv=克羅埃西亞文
+hsb=上索布文
+hup=胡帕文
+iba=伊班文
+ibo=伊布文
+ice=冰島文
+iii=四川夷文
+ijo=伊喬文
+iku=伊努伊特文
+ile=人工國際文
+ilo=伊洛闊文
+ina=人工國際文 (國際輔助語言協會)
+inc=印度諸語言
+ind=印尼文
+ine=印歐諸語言
+inh=印古什文
+ipk=依奴皮維克文
+ira=伊朗諸語言
+iro=易洛魁文
+ita=義大利文
+jbo=邏輯文
+jpr=猶太教-波斯文
+jrb=猶太阿拉伯文
+kaa=卡拉卡爾帕克文
+kab=卡比爾文
+kac=卡琴文
+kal=格陵蘭文
+kam=卡姆巴文
+kan=坎那達文
+kar=克倫文
+kas=喀什米爾文
+kaw=卡威文
+kaz=哈薩克文
+kbd=卡巴爾達文
+kha=卡西文
+khi=科依桑諸語言
+khm=中央柬埔寨文
+kho=和闐文
+kik=基庫猶文
+kin=金揚萬答文
+kir=吉爾吉斯文
+kmb=金邦杜文
+kok=貢根文
+kom=科密文
+kon=剛果文
+kor=韓文
+kos=科斯雷恩文
+kpe=克佩列文
+krc=卡拉柴-包爾卡爾文
+krl=卡累利阿文
+kro=克魯文
+kru=庫魯科文
+kua=關亞馬文
+kum=庫密克文
+kur=庫德文
+kut=庫特奈文
+lad=拉迪諾文
+lah=拉亨達文
+lam=蘭巴文
+lao=寮文
+lav=拉脫維亞文 (列特文)
+lez=列茲干文
+lim=利博坎文
+lin=陵加拉文
+lol=芒戈文
+loz=洛齊文
+ltz=盧森堡文
+lua=魯巴魯魯亞文
+lub=盧巴-加丹加文
+lug=干達文
+lui=路易塞諾文
+lun=盧恩達文
+luo=盧奧文
+lus=米佐文
+mac=馬其頓文
+mad=馬都拉文
+mag=馬加伊文
+mah=馬紹爾群島文
+mai=邁蒂利文
+mak=望加錫文
+mal=馬來亞拉姆文
+man=曼丁哥文
+map=南島諸語言
+mar=馬拉地文
+mas=馬賽文
+may=馬來文
+mdf=莫克沙文
+mdr=曼達文
+men=門德文
+mga=中古愛爾蘭文
+mic=米克馬克文
+min=米南卡堡文
+mis=混雜語諸語言
+mkh=孟高棉諸語言
+mlg=馬拉加西文
+mlt=馬爾他文
+mnc=滿族文
+mni=曼尼普爾文
+mno=馬諾博諸語言
+moh=莫霍克文
+mos=莫西文
+mul=多種語言
+mun=蒙達諸語言
+mus=克里克文
+mwl=米蘭德斯文
+mwr=馬瓦里文
+myn=馬雅諸語言
+myv=厄爾茲亞文
+nah=納瓦特文
+nai=北美印第安諸語言
+nap=拿波里文
+nau=諾魯文
+nav=納瓦荷文
+nbl=南恩德比利文
+nde=北恩德比利文
+ndo=恩東加文
+nds=低地德文
+nep=尼泊爾文
+new=尼瓦爾文
+nia=尼亞斯文
+niu=紐埃文
+nno=挪威耐諾斯克文
+nob=博克馬爾文，挪威
+nog=諾蓋文
+non=古諾爾斯文
+nqo=曼德文字 (N’Ko)
+nso=北索托文
+nub=努比亞諸語言
+nwc=古尼瓦爾文
+nya=齊切瓦文
+nym=尼揚韋齊文
+nyn=尼揚科萊文
+nyo=尼奧囉文
+nzi=尼茲馬文
+oci=歐西坦文 (前 1500)
+oji=奧杰布韋文
+ori=歐利亞文
+orm=奧羅蒙文
+osa=歐塞奇文
+oss=奧塞梯文
+ota=鄂圖曼土耳其文
+oto=奧托米諸語言
+paa=巴布亞諸語言
+pag=潘加辛文
+pal=巴列維文
+pam=潘帕嘉文
+pap=帕皮阿門托文
+pau=帛琉文
+peo=古波斯文
+phi=菲律賓諸語言
+phn=腓尼基文
+pli=帕里文
+pol=波蘭文
+pon=波那貝文
+pra=普拉克里特諸語言
+pro=古普羅旺斯文
+pus=普什圖文
+que=蓋楚瓦文
+raj=拉賈斯坦諸文
+rap=復活島文
+rar=拉羅通加文
+roa=羅曼諸語言
+roh=羅曼什文
+rom=吉普賽文
+rum=羅馬尼亞文
+run=科隆地文
+rup=羅馬尼亞語系
+sad=桑達韋文
+sag=桑戈語
+sah=雅庫特文
+sal=薩利什諸語言
+sam=薩瑪利亞阿拉姆文
+san=梵文字母
+sas=撒撒克文
+sat=桑塔利文
+scn=西西里文
+sco=蘇格蘭文
+sel=塞爾庫普文
+sem=閃語諸語言
+sga=古愛爾蘭文
+sgn=手語
+shn=撣文
+sid=希達摩文
+sin=錫蘭文
+sio=蘇語諸語言
+sit=漢藏語系
+sla=斯拉夫諸語言
+slv=斯洛維尼亞語
+sma=南薩米文
+smi=薩米諸語言
+smj=魯勒薩米文
+smn=伊納里薩米文
+smo=薩摩亞文
+sms=斯科特薩米文
+sna=頌哈文
+snk=索尼基文
+sog=索格底亞納文
+som=索馬利文
+sot=索托文, 南部
+srd=薩丁尼亞文
+srn=蘇拉南東墎文
+srp=塞爾維亞文
+srr=塞雷爾文
+ssa=尼羅撒哈拉諸語言
+ssw=西斯瓦提文
+suk=蘇庫馬文
+sun=巽丹文
+sus=蘇蘇文
+sux=蘇美文
+swa=史瓦西里文
+syc=古敘利亞文
+syr=敘利亞文
+tah=大溪地文
+tai=傣語諸語言
+tam=坦米爾文
+tat=韃靼文
+tel=特拉古文
+tem=提姆文
+ter=泰雷諾文
+tet=泰頓文
+tgl=塔加拉族文
+tig=蒂格雷文
+tir=提格利尼亞文
+tiv=提夫文
+tkl=托克勞文
+tlh=克林貢文
+tli=特林基特文
+tmh=塔馬奇克文
+tog=東加文（尼亞薩）
+ton=東加文 (東加群島)
+tpi=托比辛文
+tsi=欽西安文
+tsn=塞茲瓦納文
+tso=頌加文
+tuk=土庫曼文
+tum=圖姆布卡文
+tup=圖皮諸語言
+tut=阿爾泰諸語言 (其他)
+tvl=吐瓦魯文
+twi=契維文
+tyv=圖瓦文
+udm=烏德穆爾特文
+uga=烏加列文
+uig=維吾爾文
+ukr=烏克蘭文
+umb=姆本杜文
+und=未知語言
+urd=烏都文
+uzb=烏茲別克文
+vai=瓦伊文
+ven=文達文
+vot=沃提克文
+wak=瓦卡什諸語言
+wal=瓦拉莫文
+war=瓦瑞文
+was=瓦紹文
+wel=威爾斯文
+wen=索布諸語言
+wln=華隆文
+wol=沃洛夫文
+xal=卡爾梅克文
+xho=廓薩文
+yao=瑤文
+yap=雅浦文
+yid=意第緒文
+yor=優魯巴文
+ypk=尤皮克諸語言
+zap=薩波特克文
+zbl=布列斯符號
+zen=澤納加文
+zha=壯文
+znd=贊德文
+zul=祖魯文
+zun=祖尼文
+zxx=無語言內容
+zza=扎扎文
 
 # script names
 # key is ISO 15924 script code
 
-Armi=\u7687\u5ba4\u4e9e\u7f8e\u5c3c\u4e9e\u6587
-Armn=\u4e9e\u7f8e\u5c3c\u4e9e\u6587
-Avst=\u963f\u7dad\u65af\u9640\u6587
-Bali=\u5cc7\u91cc\u6587
-Bass=\u5df4\u85a9\u6587
-Blis=\u5e03\u5217\u65af\u6587
-Bopo=\u6ce8\u97f3\u7b26\u865f
-Brah=\u5a46\u7f85\u7c73\u6587
-Brai=\u76f2\u4eba\u7528\u9ede\u5b57
-Bugi=\u5e03\u5409\u65af\u6587
-Cakm=\u67e5\u514b\u99ac\u6587
-Cans=\u52a0\u62ff\u5927\u539f\u4f4f\u6c11\u901a\u7528\u5b57\u7b26
-Cari=\u5361\u91cc\u4e9e\u6587
-Cher=\u67f4\u7f85\u57fa\u6587
-Copt=\u79d1\u666e\u7279\u6587
-Cyrl=\u65af\u62c9\u592b\u6587
-Cyrs=\u897f\u91cc\u723e\u6587\uff08\u53e4\u6559\u6703\u65af\u62c9\u592b\u6587\u8b8a\u9ad4\uff09
-Dsrt=\u5fb7\u745f\u96f7\u7279\u6587
-Dupl=\u675c\u666e\u6d1b\u4f0a\u901f\u8a18
-Egyd=\u53e4\u57c3\u53ca\u4e16\u4fd7\u9ad4
-Egyh=\u53e4\u57c3\u53ca\u50e7\u4fb6\u9ad4
-Egyp=\u53e4\u57c3\u53ca\u8c61\u5f62\u6587\u5b57
-Elba=\u611b\u723e\u5df4\u6851\u6587
-Ethi=\u8863\u7d22\u6bd4\u4e9e\u6587
-Geok=\u55ac\u6cbb\u4e9e\u8a9e\u7cfb\uff08\u963f\u7d22\u4ed6\u8def\u91cc\u548c\u52aa\u65af\u514b\u80e1\u91cc\u6587\uff09
-Geor=\u55ac\u6cbb\u4e9e\u6587
-Goth=\u6b4c\u5fb7\u6587
-Gran=\u683c\u862d\u4ed6\u6587\u5b57
-Grek=\u5e0c\u81d8\u6587
-Guru=\u53e4\u9b6f\u7a46\u5947\u6587
-Hang=\u97d3\u6587\u5b57
-Hani=\u6f22\u5b57
-Hano=\u54c8\u52aa\u8afe\u6587
-Hans=\u7c21\u9ad4
-Hant=\u7e41\u9ad4
-Hebr=\u5e0c\u4f2f\u4f86\u6587
-Hmng=\u694a\u677e\u9304\u82d7\u6587
-Hrkt=\u7247\u5047\u540d\u6216\u5e73\u5047\u540d
-Inds=\u5370\u5ea6\u6cb3\u6d41\u57df\uff08\u54c8\u62c9\u5e15\u6587\uff09
-Kali=\u514b\u8036\u674e\u6587
-Khar=\u5361\u7f85\u9808\u63d0\u6587
-Knda=\u574e\u90a3\u9054\u6587
-Kore=\u97d3\u6587
-Kpel=\u514b\u57f9\u5217\u6587
-Kthi=\u51f1\u63d0\u6587
-Lana=\u85cd\u62ff\u6587
-Laoo=\u5bee\u570b\u6587
-Latf=\u62c9\u4e01\u6587\uff08\u5c16\u89d2\u9ad4\u6d3b\u5b57\u8b8a\u9ad4\uff09
-Latg=\u62c9\u4e01\u6587\uff08\u84cb\u723e\u8a9e\u8b8a\u9ad4\uff09
-Limb=\u6797\u4f48\u6587
-Lina=\u7dda\u6027\u6587\u5b57\uff08A\uff09
-Linb=\u7dda\u6027\u6587\u5b57\uff08B\uff09
-Lisu=\u6817\u50f3\u6587
-Loma=\u6d1b\u99ac\u6587
-Lyci=\u5442\u897f\u4e9e\u8a9e
-Lydi=\u91cc\u5e95\u4e9e\u8a9e
-Mand=\u66fc\u5e95\u5b89\u6587
-Maya=\u746a\u96c5\u8c61\u5f62\u6587\u5b57
-Mend=\u9580\u5fb7\u6587
-Merc=\u9ea5\u7f85\u57c3\u6587\uff08\u66f2\u7dda\u5b57\u9ad4\uff09
-Mero=\u9ea5\u7f85\u57c3\u6587
-Mlym=\u99ac\u4f86\u4e9e\u62c9\u59c6\u6587
-Moon=\u8499\u6c0f\u9ede\u5b57
-Mtei=\u66fc\u5c3c\u666e\u723e\u6587
-Mymr=\u7dec\u7538\u6587
-Narb=\u53e4\u5317\u963f\u62c9\u4f2f\u6587
-Nbat=\u7d0d\u5df4\u6cf0\u6587\u5b57
-Nkgb=\u7d0d\u897f\u683c\u5df4\u6587
-Nkoo=\u897f\u975e\u66f8\u9762\u8a9e\u8a00 (N\u2019Ko)
-Ogam=\u6b50\u7518\u6587
-Orkh=\u9102\u723e\u6e3e\u6587
-Orya=\u6b50\u8fea\u4e9e\u6587
-Osma=\u6b50\u65af\u66fc\u4e9e\u6587
-Palm=\u5e15\u7c73\u745e\u62c9\u6587\u5b57
-Perm=\u53e4\u5f7c\u723e\u59c6\u8af8\u6587
-Phli=\u5df4\u5217\u7dad\u6587\uff08\u7891\u9298\u9ad4\uff09
-Phlp=\u5df4\u5217\u7dad\u6587\uff08\u8056\u8a69\u9ad4\uff09
-Phlv=\u5df4\u5217\u7dad\u6587\uff08\u66f8\u9ad4\uff09
-Plrd=\u67cf\u683c\u7406\u62fc\u97f3\u7b26
-Prti=\u5e15\u63d0\u4e9e\u6587\uff08\u7891\u9298\u9ad4\uff09
-Rjng=\u62c9\u8b93\u6587
-Roro=\u6717\u683c\u6717\u683c\u8c61\u5f62\u6587
-Runr=\u53e4\u5317\u6b50\u6587\u5b57
-Samr=\u6492\u99ac\u5229\u4e9e\u6587
-Sgnw=\u624b\u8a9e\u66f8\u5beb\u7b26\u865f
-Shaw=\u7c2b\u67cf\u7d0d\u5b57\u7b26
-Sinh=\u932b\u862d\u6587
-Sylo=\u5e0c\u6d1b\u5f1f\u7d0d\u683c\u91cc\u6587
-Syrc=\u654d\u5229\u4e9e\u6587
-Syre=\u6558\u5229\u4e9e\u6587\uff08\u798f\u97f3\u9ad4\u6587\u5b57\u8b8a\u9ad4\uff09
-Syrj=\u6558\u5229\u4e9e\u6587\uff08\u897f\u65b9\u6587\u5b57\u8b8a\u9ad4\uff09
-Syrn=\u6558\u5229\u4e9e\u6587\uff08\u6771\u65b9\u6587\u5b57\u8b8a\u9ad4\uff09
-Tagb=\u5357\u5cf6\u6587
-Tale=\u50a3\u54ea\u6587
-Talu=\u897f\u96d9\u7248\u7d0d\u65b0\u50a3\u6587
-Taml=\u5766\u7c73\u723e\u6587
-Tavt=\u50a3\u64d4\u6587
-Telu=\u6cf0\u76e7\u56fa\u6587
-Teng=\u8ac7\u683c\u74e6\u6587
-Tfng=\u63d0\u975e\u7d0d\u6587
-Tglg=\u5854\u52a0\u62c9\u6587
-Tibt=\u897f\u85cf\u6587
-Ugar=\u70cf\u52a0\u5217\u6587
-Visp=\u8996\u89ba\u8a9e\u97f3\u6587\u5b57
-Xsux=\u8607\u7c73\u9b6f\u4e9e\u7532\u6587\u6954\u5f62\u6587\u5b57
-Yiii=\u5f5e\u6587
-Zinh=\u7e7c\u627f\u6587\u5b57\uff08Unicode\uff09
-Zmth=\u6578\u5b78\u7b26\u865f
-Zsym=\u7b26\u865f
-Zxxx=\u975e\u66f8\u5beb\u8a9e\u8a00
-Zyyy=\u4e00\u822c\u6587\u5b57
+Armi=皇室亞美尼亞文
+Armn=亞美尼亞文
+Avst=阿維斯陀文
+Bali=峇里文
+Bass=巴薩文
+Blis=布列斯文
+Bopo=注音符號
+Brah=婆羅米文
+Brai=盲人用點字
+Bugi=布吉斯文
+Cakm=查克馬文
+Cans=加拿大原住民通用字符
+Cari=卡里亞文
+Cher=柴羅基文
+Copt=科普特文
+Cyrl=斯拉夫文
+Cyrs=西里爾文（古教會斯拉夫文變體）
+Dsrt=德瑟雷特文
+Dupl=杜普洛伊速記
+Egyd=古埃及世俗體
+Egyh=古埃及僧侶體
+Egyp=古埃及象形文字
+Elba=愛爾巴桑文
+Ethi=衣索比亞文
+Geok=喬治亞語系（阿索他路里和努斯克胡里文）
+Geor=喬治亞文
+Goth=歌德文
+Gran=格蘭他文字
+Grek=希臘文
+Guru=古魯穆奇文
+Hang=韓文字
+Hani=漢字
+Hano=哈努諾文
+Hans=簡體
+Hant=繁體
+Hebr=希伯來文
+Hmng=楊松錄苗文
+Hrkt=片假名或平假名
+Inds=印度河流域（哈拉帕文）
+Kali=克耶李文
+Khar=卡羅須提文
+Knda=坎那達文
+Kore=韓文
+Kpel=克培列文
+Kthi=凱提文
+Lana=藍拿文
+Laoo=寮國文
+Latf=拉丁文（尖角體活字變體）
+Latg=拉丁文（蓋爾語變體）
+Limb=林佈文
+Lina=線性文字（A）
+Linb=線性文字（B）
+Lisu=栗僳文
+Loma=洛馬文
+Lyci=呂西亞語
+Lydi=里底亞語
+Mand=曼底安文
+Maya=瑪雅象形文字
+Mend=門德文
+Merc=麥羅埃文（曲線字體）
+Mero=麥羅埃文
+Mlym=馬來亞拉姆文
+Moon=蒙氏點字
+Mtei=曼尼普爾文
+Mymr=緬甸文
+Narb=古北阿拉伯文
+Nbat=納巴泰文字
+Nkgb=納西格巴文
+Nkoo=西非書面語言 (N’Ko)
+Ogam=歐甘文
+Orkh=鄂爾渾文
+Orya=歐迪亞文
+Osma=歐斯曼亞文
+Palm=帕米瑞拉文字
+Perm=古彼爾姆諸文
+Phli=巴列維文（碑銘體）
+Phlp=巴列維文（聖詩體）
+Phlv=巴列維文（書體）
+Plrd=柏格理拼音符
+Prti=帕提亞文（碑銘體）
+Rjng=拉讓文
+Roro=朗格朗格象形文
+Runr=古北歐文字
+Samr=撒馬利亞文
+Sgnw=手語書寫符號
+Shaw=簫柏納字符
+Sinh=錫蘭文
+Sylo=希洛弟納格里文
+Syrc=敍利亞文
+Syre=敘利亞文（福音體文字變體）
+Syrj=敘利亞文（西方文字變體）
+Syrn=敘利亞文（東方文字變體）
+Tagb=南島文
+Tale=傣哪文
+Talu=西雙版納新傣文
+Taml=坦米爾文
+Tavt=傣擔文
+Telu=泰盧固文
+Teng=談格瓦文
+Tfng=提非納文
+Tglg=塔加拉文
+Tibt=西藏文
+Ugar=烏加列文
+Visp=視覺語音文字
+Xsux=蘇米魯亞甲文楔形文字
+Yiii=彞文
+Zinh=繼承文字（Unicode）
+Zmth=數學符號
+Zsym=符號
+Zxxx=非書寫語言
+Zyyy=一般文字
 
 # country names
 # key is ISO 3166 country code
 
-AD=\u5b89\u9053\u723e
-AE=\u963f\u62c9\u4f2f\u806f\u5408\u5927\u516c\u570b
-AG=\u5b89\u5730\u5361\u53ca\u5df4\u5e03\u9054
-AI=\u5b89\u594e\u62c9
-AL=\u963f\u723e\u5df4\u5c3c\u4e9e
-AM=\u4e9e\u7f8e\u5c3c\u4e9e
-AN=\u8377\u5c6c\u5b89\u66ff\u5217\u65af
-AQ=\u5357\u6975\u6d32
-AS=\u7f8e\u5c6c\u85a9\u6469\u4e9e
-AT=\u5967\u5730\u5229
-AU=\u6fb3\u6d32
-AW=\u8377\u5c6c\u963f\u9b6f\u5df4
-AX=\u5967\u862d\u7fa4\u5cf6
-AZ=\u4e9e\u585e\u62dc\u7136
-BA=\u6ce2\u58eb\u5c3c\u4e9e\u8207\u8d6b\u585e\u54e5\u7dad\u7d0d
-BB=\u5df4\u8c9d\u591a
-BD=\u5b5f\u52a0\u62c9
-BE=\u6bd4\u5229\u6642
-BF=\u5e03\u5409\u7d0d\u6cd5\u7d22
-BG=\u4fdd\u52a0\u5229\u4e9e
-BI=\u84b2\u9686\u5730
-BJ=\u8c9d\u5357
-BM=\u767e\u6155\u9054
-BN=\u6c76\u840a
-BO=\u73bb\u5229\u7dad\u4e9e
-BS=\u5df4\u54c8\u99ac
-BV=\u5e03\u5a01\u5cf6
-BW=\u6ce2\u672d\u90a3
-BY=\u767d\u4fc4\u7f85\u65af
-BZ=\u8c9d\u91cc\u65af
-CC=\u79d1\u514b\u65af\uff08\u57fa\u9748\uff09\u7fa4\u5cf6
-CD=\u525b\u679c\uff08\u91d1\u590f\u6c99\uff09
-CF=\u4e2d\u975e\u5171\u548c\u570b
-CG=\u525b\u679c\uff08\u5e03\u62c9\u85a9\uff09
-CI=\u8c61\u7259\u6d77\u5cb8
-CK=\u5eab\u514b\u7fa4\u5cf6
-CM=\u5580\u9ea5\u9686
-CN=\u4e2d\u570b
-CO=\u54e5\u502b\u6bd4\u4e9e
-CR=\u54e5\u65af\u5927\u9ece\u52a0
-CS=\u585e\u723e\u7dad\u4e9e\u53ca\u8499\u7279\u5c3c\u54e5\u7f85
-CV=\u7dad\u5fb7\u89d2
-CX=\u8056\u8a95\u5cf6
-CY=\u8cfd\u666e\u52d2\u65af
-DE=\u5fb7\u570b
-DJ=\u5409\u5e03\u5730
-DK=\u4e39\u9ea5
-DO=\u591a\u660e\u5c3c\u52a0\u5171\u548c\u570b
-DZ=\u963f\u723e\u53ca\u5229\u4e9e
-EC=\u5384\u74dc\u591a
-EE=\u611b\u6c99\u5c3c\u4e9e
-ER=\u5384\u5229\u5782\u4e9e
-ET=\u8863\u7d22\u6bd4\u4e9e
-FI=\u82ac\u862d
-FJ=\u6590\u6fdf
-FK=\u798f\u514b\u862d\u7fa4\u5cf6
-FM=\u5bc6\u514b\u7f85\u5c3c\u897f\u4e9e
-FO=\u6cd5\u7f85\u7fa4\u5cf6
-FR=\u6cd5\u570b
-GA=\u52a0\u5f6d
-GB=\u82f1\u570b
-GD=\u683c\u745e\u90a3\u9054
-GE=\u55ac\u6cbb\u4e9e
-GF=\u6cd5\u5c6c\u572d\u4e9e\u90a3
-GH=\u8fe6\u7d0d
-GI=\u76f4\u5e03\u7f85\u9640
-GL=\u683c\u9675\u862d
-GM=\u7518\u6bd4\u4e9e
-GN=\u5e7e\u5167\u4e9e
-GP=\u74dc\u5730\u6d1b\u666e
-GQ=\u8d64\u9053\u5e7e\u5167\u4e9e
-GR=\u5e0c\u81d8
-GS=\u5357\u55ac\u6cbb\u4e9e\u8207\u5357\u4e09\u660e\u6cbb\u7fa4\u5cf6
-GT=\u74dc\u5730\u99ac\u62c9
-GU=\u95dc\u5cf6
-GW=\u5e7e\u5167\u4e9e\u6bd4\u7d22
-GY=\u84cb\u4e9e\u90a3
-HK=\u4e2d\u570b\u9999\u6e2f\u7279\u5225\u884c\u653f\u5340
-HM=\u8d6b\u5fb7\u5cf6\u53ca\u9ea5\u5510\u7d0d\u7fa4\u5cf6
-HN=\u5b8f\u90fd\u62c9\u65af
-HR=\u514b\u7f85\u57c3\u897f\u4e9e
-ID=\u5370\u5c3c
-IE=\u611b\u723e\u862d
-IO=\u82f1\u5c6c\u5370\u5ea6\u6d0b\u9818\u5730
-IS=\u51b0\u5cf6
-IT=\u7fa9\u5927\u5229
-JM=\u7259\u8cb7\u52a0
-JO=\u7d04\u65e6
-KE=\u80af\u4e9e
-KG=\u5409\u723e\u5409\u65af
-KI=\u5409\u91cc\u5df4\u65af
-KM=\u845b\u6469
-KN=\u8056\u514b\u91cc\u65af\u591a\u798f\u53ca\u5c3c\u7dad\u65af
-KP=\u5317\u97d3
-KR=\u5357\u97d3
-KY=\u958b\u66fc\u7fa4\u5cf6
-KZ=\u54c8\u85a9\u514b
-LA=\u5bee\u570b
-LC=\u8056\u9732\u897f\u4e9e
-LI=\u5217\u652f\u6566\u65af\u767b
-LK=\u65af\u91cc\u862d\u5361
-LR=\u8cf4\u6bd4\u745e\u4e9e
-LS=\u8cf4\u7d22\u6258
-LU=\u76e7\u68ee\u5821
-LV=\u62c9\u812b\u7dad\u4e9e
-LY=\u5229\u6bd4\u4e9e
-MC=\u6469\u7d0d\u54e5
-MD=\u6469\u723e\u591a\u74e6
-ME=\u8499\u7279\u5167\u54e5\u7f85
-MG=\u99ac\u9054\u52a0\u65af\u52a0
-MH=\u99ac\u7d39\u723e\u7fa4\u5cf6
-MK=\u5317\u99ac\u5176\u9813
-ML=\u99ac\u5229
-MM=\u7dec\u7538
-MO=\u4e2d\u570b\u6fb3\u9580\u7279\u5225\u884c\u653f\u5340
-MP=\u5317\u99ac\u5229\u5b89\u7d0d\u7fa4\u5cf6
-MQ=\u99ac\u4e01\u5c3c\u514b
-MR=\u8305\u5229\u5854\u5c3c\u4e9e
-MS=\u8499\u54f2\u81d8
-MT=\u99ac\u723e\u4ed6
-MU=\u6a21\u91cc\u897f\u65af
-MV=\u99ac\u723e\u5730\u592b
-MW=\u99ac\u62c9\u5a01
-MY=\u99ac\u4f86\u897f\u4e9e
-MZ=\u83ab\u4e09\u6bd4\u514b
-NA=\u7d0d\u7c73\u6bd4\u4e9e
-NC=\u65b0\u5580\u91cc\u591a\u5c3c\u4e9e
-NE=\u5c3c\u65e5
-NF=\u8afe\u798f\u514b\u5cf6
-NG=\u5948\u53ca\u5229\u4e9e
-NL=\u8377\u862d
-NP=\u5c3c\u6cca\u723e
-NR=\u8afe\u9b6f
-NU=\u7d10\u57c3\u5cf6
-NZ=\u7d10\u897f\u862d
-PA=\u5df4\u62ff\u99ac
-PE=\u79d8\u9b6f
-PF=\u6cd5\u5c6c\u73bb\u91cc\u5c3c\u897f\u4e9e
-PG=\u5df4\u5e03\u4e9e\u7d10\u5e7e\u5167\u4e9e
-PH=\u83f2\u5f8b\u8cd3
-PL=\u6ce2\u862d
-PM=\u8056\u76ae\u57c3\u8207\u5bc6\u514b\u9686\u7fa4\u5cf6
-PN=\u76ae\u7279\u80af\u7fa4\u5cf6
-PS=\u5df4\u52d2\u65af\u5766\u81ea\u6cbb\u5340
-PW=\u5e1b\u7409
-QA=\u5361\u9054
-RE=\u7559\u5c3c\u65fa
-RO=\u7f85\u99ac\u5c3c\u4e9e
-RS=\u585e\u723e\u7dad\u4e9e
-RU=\u4fc4\u7f85\u65af
-RW=\u76e7\u5b89\u9054
-SA=\u6c99\u70cf\u5730\u963f\u62c9\u4f2f
-SB=\u7d22\u7f85\u9580\u7fa4\u5cf6
-SC=\u585e\u5e2d\u723e
-SD=\u8607\u4e39
-SH=\u8056\u8d6b\u52d2\u62ff\u5cf6
-SI=\u65af\u6d1b\u7dad\u5c3c\u4e9e
-SJ=\u632a\u5a01\u5c6c\u65af\u74e6\u5df4\u53ca\u5c16\u68c9
-SL=\u7345\u5b50\u5c71
-SM=\u8056\u99ac\u5229\u8afe
-SN=\u585e\u5167\u52a0\u723e
-SO=\u7d22\u99ac\u5229\u4e9e
-SR=\u8607\u5229\u5357
-ST=\u8056\u591a\u7f8e\u666e\u6797\u897f\u6bd4
-SV=\u85a9\u723e\u74e6\u591a
-SY=\u6558\u5229\u4e9e
-SZ=\u53f2\u74e6\u5e1d\u5c3c
-TC=\u571f\u514b\u65af\u53ca\u958b\u79d1\u65af\u7fa4\u5cf6
-TD=\u67e5\u5fb7
-TF=\u6cd5\u5c6c\u5357\u90e8\u5c6c\u5730
-TH=\u6cf0\u570b
-TJ=\u5854\u5409\u514b
-TK=\u6258\u514b\u52de\u7fa4\u5cf6
-TL=\u6771\u5e1d\u6c76
-TM=\u571f\u5eab\u66fc
-TN=\u7a81\u5c3c\u897f\u4e9e
-TO=\u6771\u52a0
-TT=\u5343\u91cc\u9054\u53ca\u6258\u5df4\u54e5
-TV=\u5410\u74e6\u9b6f
-TW=\u53f0\u7063
-TZ=\u5766\u5c1a\u5c3c\u4e9e
-UA=\u70cf\u514b\u862d
-UG=\u70cf\u5e72\u9054
-UM=\u7f8e\u570b\u672c\u571f\u5916\u5c0f\u5cf6\u5dbc
-US=\u7f8e\u570b
-UY=\u70cf\u62c9\u572d
-UZ=\u70cf\u8332\u5225\u514b
-VA=\u68b5\u8482\u5ca1
-VC=\u8056\u6587\u68ee\u53ca\u683c\u745e\u90a3\u4e01
-VE=\u59d4\u5167\u745e\u62c9
-VG=\u82f1\u5c6c\u7dad\u4eac\u7fa4\u5cf6
-VI=\u7f8e\u5c6c\u7dad\u4eac\u7fa4\u5cf6
-VU=\u842c\u90a3\u675c
-WF=\u74e6\u5229\u65af\u7fa4\u5cf6\u548c\u5bcc\u5716\u90a3\u7fa4\u5cf6
-WS=\u85a9\u6469\u4e9e
-YE=\u8449\u9580
-YT=\u99ac\u7d04\u7279\u5cf6
-ZM=\u5c1a\u6bd4\u4e9e
-ZW=\u8f9b\u5df4\u5a01
+AD=安道爾
+AE=阿拉伯聯合大公國
+AG=安地卡及巴布達
+AI=安奎拉
+AL=阿爾巴尼亞
+AM=亞美尼亞
+AN=荷屬安替列斯
+AQ=南極洲
+AS=美屬薩摩亞
+AT=奧地利
+AU=澳洲
+AW=荷屬阿魯巴
+AX=奧蘭群島
+AZ=亞塞拜然
+BA=波士尼亞與赫塞哥維納
+BB=巴貝多
+BD=孟加拉
+BE=比利時
+BF=布吉納法索
+BG=保加利亞
+BI=蒲隆地
+BJ=貝南
+BM=百慕達
+BN=汶萊
+BO=玻利維亞
+BS=巴哈馬
+BV=布威島
+BW=波札那
+BY=白俄羅斯
+BZ=貝里斯
+CC=科克斯（基靈）群島
+CD=剛果（金夏沙）
+CF=中非共和國
+CG=剛果（布拉薩）
+CI=象牙海岸
+CK=庫克群島
+CM=喀麥隆
+CN=中國
+CO=哥倫比亞
+CR=哥斯大黎加
+CS=塞爾維亞及蒙特尼哥羅
+CV=維德角
+CX=聖誕島
+CY=賽普勒斯
+DE=德國
+DJ=吉布地
+DK=丹麥
+DO=多明尼加共和國
+DZ=阿爾及利亞
+EC=厄瓜多
+EE=愛沙尼亞
+ER=厄利垂亞
+ET=衣索比亞
+FI=芬蘭
+FJ=斐濟
+FK=福克蘭群島
+FM=密克羅尼西亞
+FO=法羅群島
+FR=法國
+GA=加彭
+GB=英國
+GD=格瑞那達
+GE=喬治亞
+GF=法屬圭亞那
+GH=迦納
+GI=直布羅陀
+GL=格陵蘭
+GM=甘比亞
+GN=幾內亞
+GP=瓜地洛普
+GQ=赤道幾內亞
+GR=希臘
+GS=南喬治亞與南三明治群島
+GT=瓜地馬拉
+GU=關島
+GW=幾內亞比索
+GY=蓋亞那
+HK=中國香港特別行政區
+HM=赫德島及麥唐納群島
+HN=宏都拉斯
+HR=克羅埃西亞
+ID=印尼
+IE=愛爾蘭
+IO=英屬印度洋領地
+IS=冰島
+IT=義大利
+JM=牙買加
+JO=約旦
+KE=肯亞
+KG=吉爾吉斯
+KI=吉里巴斯
+KM=葛摩
+KN=聖克里斯多福及尼維斯
+KP=北韓
+KR=南韓
+KY=開曼群島
+KZ=哈薩克
+LA=寮國
+LC=聖露西亞
+LI=列支敦斯登
+LK=斯里蘭卡
+LR=賴比瑞亞
+LS=賴索托
+LU=盧森堡
+LV=拉脫維亞
+LY=利比亞
+MC=摩納哥
+MD=摩爾多瓦
+ME=蒙特內哥羅
+MG=馬達加斯加
+MH=馬紹爾群島
+MK=北馬其頓
+ML=馬利
+MM=緬甸
+MO=中國澳門特別行政區
+MP=北馬利安納群島
+MQ=馬丁尼克
+MR=茅利塔尼亞
+MS=蒙哲臘
+MT=馬爾他
+MU=模里西斯
+MV=馬爾地夫
+MW=馬拉威
+MY=馬來西亞
+MZ=莫三比克
+NA=納米比亞
+NC=新喀里多尼亞
+NE=尼日
+NF=諾福克島
+NG=奈及利亞
+NL=荷蘭
+NP=尼泊爾
+NR=諾魯
+NU=紐埃島
+NZ=紐西蘭
+PA=巴拿馬
+PE=秘魯
+PF=法屬玻里尼西亞
+PG=巴布亞紐幾內亞
+PH=菲律賓
+PL=波蘭
+PM=聖皮埃與密克隆群島
+PN=皮特肯群島
+PS=巴勒斯坦自治區
+PW=帛琉
+QA=卡達
+RE=留尼旺
+RO=羅馬尼亞
+RS=塞爾維亞
+RU=俄羅斯
+RW=盧安達
+SA=沙烏地阿拉伯
+SB=索羅門群島
+SC=塞席爾
+SD=蘇丹
+SH=聖赫勒拿島
+SI=斯洛維尼亞
+SJ=挪威屬斯瓦巴及尖棉
+SL=獅子山
+SM=聖馬利諾
+SN=塞內加爾
+SO=索馬利亞
+SR=蘇利南
+ST=聖多美普林西比
+SV=薩爾瓦多
+SY=敘利亞
+SZ=史瓦帝尼
+TC=土克斯及開科斯群島
+TD=查德
+TF=法屬南部屬地
+TH=泰國
+TJ=塔吉克
+TK=托克勞群島
+TL=東帝汶
+TM=土庫曼
+TN=突尼西亞
+TO=東加
+TT=千里達及托巴哥
+TV=吐瓦魯
+TW=台灣
+TZ=坦尚尼亞
+UA=烏克蘭
+UG=烏干達
+UM=美國本土外小島嶼
+US=美國
+UY=烏拉圭
+UZ=烏茲別克
+VA=梵蒂岡
+VC=聖文森及格瑞那丁
+VE=委內瑞拉
+VG=英屬維京群島
+VI=美屬維京群島
+VU=萬那杜
+WF=瓦利斯群島和富圖那群島
+WS=薩摩亞
+YE=葉門
+YT=馬約特島
+ZM=尚比亞
+ZW=辛巴威
 
 # territory names
 # key is UN M.49 country and area code
 
-013=\u4e2d\u7f8e
-014=\u6771\u975e
-018=\u975e\u6d32\u5357\u90e8
-021=\u5317\u7f8e
-029=\u52a0\u52d2\u6bd4\u6d77
-030=\u6771\u4e9e
-034=\u5357\u4e9e
-035=\u6771\u5357\u4e9e
-039=\u5357\u6b50
-053=\u6fb3\u6d32\u8207\u7d10\u897f\u862d
-054=\u7f8e\u62c9\u5c3c\u897f\u4e9e
-057=\u5bc6\u514b\u7f85\u5c3c\u897f\u4e9e\u7fa4\u5cf6
-061=\u73bb\u91cc\u5c3c\u897f\u4e9e
-142=\u4e9e\u6d32
-143=\u4e2d\u4e9e
-145=\u897f\u4e9e
-150=\u6b50\u6d32
-151=\u6771\u6b50
-154=\u5317\u6b50
-155=\u897f\u6b50
+013=中美
+014=東非
+018=非洲南部
+021=北美
+029=加勒比海
+030=東亞
+034=南亞
+035=東南亞
+039=南歐
+053=澳洲與紐西蘭
+054=美拉尼西亞
+057=密克羅尼西亞群島
+061=玻里尼西亞
+142=亞洲
+143=中亞
+145=西亞
+150=歐洲
+151=東歐
+154=北歐
+155=西歐
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
index 4def676fd9d..db550944140 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
@@ -24,7 +24,7 @@
 #
 
 agent.err.error			   = Fehler
-agent.err.exception                = Ausnahme von Agent ausgel\u00F6st 
+agent.err.exception                = Ausnahme von Agent ausgelöst 
 agent.err.warning		   = Warnung
 
 agent.err.configfile.notfound      = Konfigurationsdatei wurde nicht gefunden
@@ -38,22 +38,22 @@ agent.err.agentclass.notfound      = Management Agent-Klasse nicht gefunden
 agent.err.agentclass.failed        = Management Agent-Klasse nicht erfolgreich
 agent.err.premain.notfound         = premain(String) ist in Agent-Klasse nicht vorhanden
 agent.err.agentclass.access.denied = Zugriff auf premain(String) wurde abgelehnt
-agent.err.invalid.agentclass       = Ung\u00FCltiger Eigenschaftswert f\u00FCr com.sun.management.agent.class
-agent.err.invalid.state            = Ung\u00FCltiger Agent-Zustand: {0}
-agent.err.invalid.jmxremote.port   = Ung\u00FCltige Nummer f\u00FCr com.sun.management.jmxremote.port
-agent.err.invalid.jmxremote.rmi.port = Ung\u00FCltige Nummer f\u00FCr com.sun.management.jmxremote.rmi.port
+agent.err.invalid.agentclass       = Ungültiger Eigenschaftswert für com.sun.management.agent.class
+agent.err.invalid.state            = Ungültiger Agent-Zustand: {0}
+agent.err.invalid.jmxremote.port   = Ungültige Nummer für com.sun.management.jmxremote.port
+agent.err.invalid.jmxremote.rmi.port = Ungültige Nummer für com.sun.management.jmxremote.rmi.port
 
 agent.err.file.not.set               = Datei nicht angegeben
 agent.err.file.not.readable          = Datei nicht lesbar
 agent.err.file.read.failed           = Datei konnte nicht gelesen werden
 agent.err.file.not.found             = Datei wurde nicht gefunden
-agent.err.file.access.not.restricted = Lesezugriff auf Datei muss eingeschr\u00E4nkt werden
+agent.err.file.access.not.restricted = Lesezugriff auf Datei muss eingeschränkt werden
 
 agent.err.password.file.notset     = Es wurde keine Kennwortdatei angegeben, obwohl com.sun.management.jmxremote.authenticate auf "true" gesetzt ist
 agent.err.password.file.not.readable = Kennwortdatei nicht lesbar
 agent.err.password.file.read.failed = Kennwortdatei konnte nicht gelesen werden
 agent.err.password.file.notfound   = Kennwortdatei nicht gefunden
-agent.err.password.file.access.notrestricted = Lesezugriff auf Kennwortdatei muss eingeschr\u00E4nkt werden
+agent.err.password.file.access.notrestricted = Lesezugriff auf Kennwortdatei muss eingeschränkt werden
 
 agent.err.access.file.notset       = Es wurde keine Zugriffsdatei angegeben, obwohl com.sun.management.jmxremote.authenticate auf "true" gesetzt ist
 agent.err.access.file.not.readable = Zugriffsdatei kann nicht gelesen werden
@@ -62,10 +62,10 @@ agent.err.access.file.notfound     = Zugriffsdatei nicht gefunden
 
 agent.err.connector.server.io.error = Fehler bei JMX-Connector-Serverkommunikation
 
-agent.err.invalid.option	   = Ung\u00FCltige Option angegeben
+agent.err.invalid.option	   = Ungültige Option angegeben
 
 jmxremote.ConnectorBootstrap.starting = JMX-Connector-Server starten:
 jmxremote.ConnectorBootstrap.noAuthentication = Keine Authentifizierung
 jmxremote.ConnectorBootstrap.ready = JMX-Connector bereit unter: {0}
-jmxremote.ConnectorBootstrap.password.readonly = Lesezugriff auf Kennwortdatei muss eingeschr\u00E4nkt werden: {0}
-jmxremote.ConnectorBootstrap.file.readonly = Lesezugriff auf Datei muss eingeschr\u00E4nkt werden: {0}
+jmxremote.ConnectorBootstrap.password.readonly = Lesezugriff auf Kennwortdatei muss eingeschränkt werden: {0}
+jmxremote.ConnectorBootstrap.file.readonly = Lesezugriff auf Datei muss eingeschränkt werden: {0}
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties
index 474fc1d145f..90d77a7e936 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties
@@ -24,24 +24,24 @@
 #
 
 agent.err.error			   = Error
-agent.err.exception                = Excepci\u00F3n devuelta por el agente 
+agent.err.exception                = Excepción devuelta por el agente 
 agent.err.warning		   = Advertencia
 
-agent.err.configfile.notfound      = No se ha encontrado el archivo de configuraci\u00F3n
-agent.err.configfile.failed        = Fallo al leer el archivo de configuraci\u00F3n
-agent.err.configfile.closed.failed = Fallo al cerrar el archivo de configuraci\u00F3n
-agent.err.configfile.access.denied = Acceso denegado al archivo de configuraci\u00F3n
+agent.err.configfile.notfound      = No se ha encontrado el archivo de configuración
+agent.err.configfile.failed        = Fallo al leer el archivo de configuración
+agent.err.configfile.closed.failed = Fallo al cerrar el archivo de configuración
+agent.err.configfile.access.denied = Acceso denegado al archivo de configuración
 
-agent.err.exportaddress.failed	   = Fallo al exportar la direcci\u00F3n del conector JMX al buffer de instrumentaci\u00F3n
+agent.err.exportaddress.failed	   = Fallo al exportar la dirección del conector JMX al buffer de instrumentación
 
-agent.err.agentclass.notfound      = Clase de agente de gesti\u00F3n no encontrada
-agent.err.agentclass.failed        = Fallo de clase de agente de gesti\u00F3n 
+agent.err.agentclass.notfound      = Clase de agente de gestión no encontrada
+agent.err.agentclass.failed        = Fallo de clase de agente de gestión 
 agent.err.premain.notfound         = premain(String) no existe en la clase del agente
 agent.err.agentclass.access.denied = Acceso denegado a premain(String)
-agent.err.invalid.agentclass       = Valor de propiedad com.sun.management.agent.class no v\u00E1lido
-agent.err.invalid.state            = Estado de agente no v\u00E1lido: {0}
-agent.err.invalid.jmxremote.port   = N\u00FAmero com.sun.management.jmxremote.port no v\u00E1lido
-agent.err.invalid.jmxremote.rmi.port = N\u00FAmero com.sun.management.jmxremote.rmi.port no v\u00E1lido
+agent.err.invalid.agentclass       = Valor de propiedad com.sun.management.agent.class no válido
+agent.err.invalid.state            = Estado de agente no válido: {0}
+agent.err.invalid.jmxremote.port   = Número com.sun.management.jmxremote.port no válido
+agent.err.invalid.jmxremote.rmi.port = Número com.sun.management.jmxremote.rmi.port no válido
 
 agent.err.file.not.set               = Archivo no especificado
 agent.err.file.not.readable          = Archivo ilegible
@@ -49,23 +49,23 @@ agent.err.file.read.failed           = Fallo al leer el archivo
 agent.err.file.not.found             = Archivo no encontrado
 agent.err.file.access.not.restricted = El acceso de lectura al archivo debe ser restringido
 
-agent.err.password.file.notset     = El archivo de contrase\u00F1as no se ha especificado, pero com.sun.management.jmxremote.authenticate=true
-agent.err.password.file.not.readable = No se puede leer el archivo de contrase\u00F1as
-agent.err.password.file.read.failed = Fallo al leer el archivo de contrase\u00F1as
-agent.err.password.file.notfound   = Archivo de contrase\u00F1as no encontrado
-agent.err.password.file.access.notrestricted = Se debe restringir el acceso de lectura al archivo de contrase\u00F1as
+agent.err.password.file.notset     = El archivo de contraseñas no se ha especificado, pero com.sun.management.jmxremote.authenticate=true
+agent.err.password.file.not.readable = No se puede leer el archivo de contraseñas
+agent.err.password.file.read.failed = Fallo al leer el archivo de contraseñas
+agent.err.password.file.notfound   = Archivo de contraseñas no encontrado
+agent.err.password.file.access.notrestricted = Se debe restringir el acceso de lectura al archivo de contraseñas
 
 agent.err.access.file.notset       = El archivo de acceso no se ha especificado, pero com.sun.management.jmxremote.authenticate=true
 agent.err.access.file.not.readable = No se puede leer el archivo de acceso
 agent.err.access.file.read.failed  = Fallo al leer el archivo de acceso
 agent.err.access.file.notfound     = Archivo de acceso no encontrado
 
-agent.err.connector.server.io.error = Error de comunicaci\u00F3n con el servidor de conector JMX
+agent.err.connector.server.io.error = Error de comunicación con el servidor de conector JMX
 
-agent.err.invalid.option	   = Opci\u00F3n especificada no v\u00E1lida
+agent.err.invalid.option	   = Opción especificada no válida
 
 jmxremote.ConnectorBootstrap.starting = Iniciando servidor de conector JMX:
-jmxremote.ConnectorBootstrap.noAuthentication = Sin autenticaci\u00F3n
+jmxremote.ConnectorBootstrap.noAuthentication = Sin autenticación
 jmxremote.ConnectorBootstrap.ready = Conector JMX listo en: {0}
-jmxremote.ConnectorBootstrap.password.readonly = Se debe restringir el acceso de lectura al archivo de contrase\u00F1as: {0}
+jmxremote.ConnectorBootstrap.password.readonly = Se debe restringir el acceso de lectura al archivo de contraseñas: {0}
 jmxremote.ConnectorBootstrap.file.readonly = El acceso de lectura al archivo debe ser restringido: {0}
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties
index 6705bd0473c..d268b381e47 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties
@@ -24,48 +24,48 @@
 #
 
 agent.err.error			   = Erreur
-agent.err.exception                = Exception envoy\u00E9e par l'agent 
+agent.err.exception                = Exception envoyée par l'agent 
 agent.err.warning		   = Avertissement
 
 agent.err.configfile.notfound      = Fichier de configuration introuvable
 agent.err.configfile.failed        = Impossible de lire le fichier de configuration
 agent.err.configfile.closed.failed = Impossible de fermer le fichier de configuration
-agent.err.configfile.access.denied = Acc\u00E8s refus\u00E9 au fichier de configuration
+agent.err.configfile.access.denied = Accès refusé au fichier de configuration
 
 agent.err.exportaddress.failed	   = Impossible d'exporter l'adresse du connecteur JMX dans le tampon d'instrumentation
 
 agent.err.agentclass.notfound      = Classe d'agents de gestion introuvable
 agent.err.agentclass.failed        = Echec de la classe d'agents de gestion 
 agent.err.premain.notfound         = premain(String) n'existe pas dans la classe d'agents
-agent.err.agentclass.access.denied = Acc\u00E8s \u00E0 premain(String) refus\u00E9
-agent.err.invalid.agentclass       = Valeur de propri\u00E9t\u00E9 com.sun.management.agent.class incorrecte
+agent.err.agentclass.access.denied = Accès à premain(String) refusé
+agent.err.invalid.agentclass       = Valeur de propriété com.sun.management.agent.class incorrecte
 agent.err.invalid.state            = Etat de l''agent non valide : {0}
-agent.err.invalid.jmxremote.port   = Num\u00E9ro com.sun.management.jmxremote.port incorrect
-agent.err.invalid.jmxremote.rmi.port = Num\u00E9ro com.sun.management.jmxremote.rmi.port non valide
+agent.err.invalid.jmxremote.port   = Numéro com.sun.management.jmxremote.port incorrect
+agent.err.invalid.jmxremote.rmi.port = Numéro com.sun.management.jmxremote.rmi.port non valide
 
-agent.err.file.not.set               = Fichier non sp\u00E9cifi\u00E9
+agent.err.file.not.set               = Fichier non spécifié
 agent.err.file.not.readable          = Fichier illisible
 agent.err.file.read.failed           = Impossible de lire le fichier
 agent.err.file.not.found             = Fichier introuvable
-agent.err.file.access.not.restricted = L'acc\u00E8s en lecture au fichier doit \u00EAtre limit\u00E9
+agent.err.file.access.not.restricted = L'accès en lecture au fichier doit être limité
 
-agent.err.password.file.notset     = Le fichier de mots de passe n'est pas sp\u00E9cifi\u00E9 mais com.sun.management.jmxremote.authenticate=true
+agent.err.password.file.notset     = Le fichier de mots de passe n'est pas spécifié mais com.sun.management.jmxremote.authenticate=true
 agent.err.password.file.not.readable = Fichier de mots de passe illisible
 agent.err.password.file.read.failed = Impossible de lire le fichier de mots de passe
 agent.err.password.file.notfound   = Fichier de mots de passe introuvable
-agent.err.password.file.access.notrestricted = L'acc\u00E8s en lecture au fichier de mots de passe doit \u00EAtre limit\u00E9
+agent.err.password.file.access.notrestricted = L'accès en lecture au fichier de mots de passe doit être limité
 
-agent.err.access.file.notset       = Le fichier d'acc\u00E8s n'est pas sp\u00E9cifi\u00E9 mais com.sun.management.jmxremote.authenticate=true
-agent.err.access.file.not.readable = Fichier d'acc\u00E8s illisible
-agent.err.access.file.read.failed  = Impossible de lire le fichier d'acc\u00E8s
-agent.err.access.file.notfound     = Fichier d'acc\u00E8s introuvable
+agent.err.access.file.notset       = Le fichier d'accès n'est pas spécifié mais com.sun.management.jmxremote.authenticate=true
+agent.err.access.file.not.readable = Fichier d'accès illisible
+agent.err.access.file.read.failed  = Impossible de lire le fichier d'accès
+agent.err.access.file.notfound     = Fichier d'accès introuvable
 
 agent.err.connector.server.io.error = Erreur de communication avec le serveur du connecteur JMX
 
-agent.err.invalid.option	   = Option sp\u00E9cifi\u00E9e non valide
+agent.err.invalid.option	   = Option spécifiée non valide
 
-jmxremote.ConnectorBootstrap.starting = D\u00E9marrage du serveur du connecteur JMX :
+jmxremote.ConnectorBootstrap.starting = Démarrage du serveur du connecteur JMX :
 jmxremote.ConnectorBootstrap.noAuthentication = Pas d'authentification
-jmxremote.ConnectorBootstrap.ready = Connecteur JMX pr\u00EAt \u00E0 : {0}
-jmxremote.ConnectorBootstrap.password.readonly = L''acc\u00E8s en lecture au fichier de mots de passe doit \u00EAtre limit\u00E9 : {0}
-jmxremote.ConnectorBootstrap.file.readonly = L''acc\u00E8s en lecture au fichier doit \u00EAtre limit\u00E9 : {0}
+jmxremote.ConnectorBootstrap.ready = Connecteur JMX prêt à : {0}
+jmxremote.ConnectorBootstrap.password.readonly = L''accès en lecture au fichier de mots de passe doit être limité : {0}
+jmxremote.ConnectorBootstrap.file.readonly = L''accès en lecture au fichier doit être limité : {0}
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties
index 606edacf5a3..706d392f433 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties
@@ -38,7 +38,7 @@ agent.err.agentclass.notfound      = Classe agente gestione non trovata
 agent.err.agentclass.failed        = Errore classe agente gestione 
 agent.err.premain.notfound         = premain(String) non esiste nella classe agente
 agent.err.agentclass.access.denied = Accesso negato a premain(String)
-agent.err.invalid.agentclass       = Valore propriet\u00E0 com.sun.management.agent.class non valido
+agent.err.invalid.agentclass       = Valore proprietà com.sun.management.agent.class non valido
 agent.err.invalid.state            = Stato agente non valido: {0}
 agent.err.invalid.jmxremote.port   = Numero com.sun.management.jmxremote.port non valido
 agent.err.invalid.jmxremote.rmi.port = Numero com.sun.management.jmxremote.rmi.port non valido
@@ -49,13 +49,13 @@ agent.err.file.read.failed           = Errore di lettura file
 agent.err.file.not.found             = File non trovato
 agent.err.file.access.not.restricted = Limitare l'accesso in lettura al file
 
-agent.err.password.file.notset     = Il password file non \u00E8 specificato ma com.sun.management.jmxremote.authenticate=true
+agent.err.password.file.notset     = Il password file non è specificato ma com.sun.management.jmxremote.authenticate=true
 agent.err.password.file.not.readable = Password file non leggibile
 agent.err.password.file.read.failed = Errore di lettura password file
 agent.err.password.file.notfound   = Password file non trovato
 agent.err.password.file.access.notrestricted = Limitare l'accesso in lettura al password file
 
-agent.err.access.file.notset       = Il file di accesso non \u00E8 specificato ma com.sun.management.jmxremote.authenticate=true
+agent.err.access.file.notset       = Il file di accesso non è specificato ma com.sun.management.jmxremote.authenticate=true
 agent.err.access.file.not.readable = File di accesso non leggibile
 agent.err.access.file.read.failed  = Errore di lettura file di accesso
 agent.err.access.file.notfound     = File di accesso non trovato
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
index 6499da87c9c..942f87d8da7 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
@@ -23,49 +23,49 @@
 # questions.
 #
 
-agent.err.error			   = \u30A8\u30E9\u30FC
-agent.err.exception                = \u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u304C\u4F8B\u5916\u3092\u30B9\u30ED\u30FC\u3057\u307E\u3057\u305F 
-agent.err.warning		   = \u8B66\u544A
+agent.err.error			   = エラー
+agent.err.exception                = エージェントが例外をスローしました 
+agent.err.warning		   = 警告
 
-agent.err.configfile.notfound      = \u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-agent.err.configfile.failed        = \u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-agent.err.configfile.closed.failed = \u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u3092\u9589\u3058\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-agent.err.configfile.access.denied = \u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F
+agent.err.configfile.notfound      = 構成ファイルが見つかりません
+agent.err.configfile.failed        = 構成ファイルの読取りに失敗しました
+agent.err.configfile.closed.failed = 構成ファイルを閉じることができませんでした
+agent.err.configfile.access.denied = 構成ファイルへのアクセスが拒否されました
 
-agent.err.exportaddress.failed	   = JMX\u30B3\u30CD\u30AF\u30BF\u30FB\u30A2\u30C9\u30EC\u30B9\u306E\u8A08\u6E2C\u30D0\u30C3\u30D5\u30A1\u3078\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u304C\u5931\u6557\u3057\u307E\u3057\u305F
+agent.err.exportaddress.failed	   = JMXコネクタ・アドレスの計測バッファへのエクスポートが失敗しました
 
-agent.err.agentclass.notfound      = \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-agent.err.agentclass.failed        = \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30AF\u30E9\u30B9\u304C\u5931\u6557\u3057\u307E\u3057\u305F 
-agent.err.premain.notfound         = premain(String)\u304C\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30AF\u30E9\u30B9\u306B\u5B58\u5728\u3057\u307E\u305B\u3093
-agent.err.agentclass.access.denied = premain(String)\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F
-agent.err.invalid.agentclass       = com.sun.management.agent.class\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u304C\u7121\u52B9\u3067\u3059
-agent.err.invalid.state            = \u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306E\u72B6\u614B\u304C\u7121\u52B9\u3067\u3059: {0}
-agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port\u306E\u756A\u53F7\u304C\u7121\u52B9\u3067\u3059
-agent.err.invalid.jmxremote.rmi.port = com.sun.management.jmxremote.rmi.port\u306E\u756A\u53F7\u304C\u7121\u52B9\u3067\u3059
+agent.err.agentclass.notfound      = 管理エージェント・クラスが見つかりません
+agent.err.agentclass.failed        = 管理エージェント・クラスが失敗しました 
+agent.err.premain.notfound         = premain(String)がエージェント・クラスに存在しません
+agent.err.agentclass.access.denied = premain(String)へのアクセスが拒否されました
+agent.err.invalid.agentclass       = com.sun.management.agent.classプロパティの値が無効です
+agent.err.invalid.state            = エージェントの状態が無効です: {0}
+agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.portの番号が無効です
+agent.err.invalid.jmxremote.rmi.port = com.sun.management.jmxremote.rmi.portの番号が無効です
 
-agent.err.file.not.set               = \u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-agent.err.file.not.readable          = \u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
-agent.err.file.read.failed           = \u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-agent.err.file.not.found             = \u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
-agent.err.file.access.not.restricted = \u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A2\u30AF\u30BB\u30B9\u306F\u5236\u9650\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+agent.err.file.not.set               = ファイルが指定されていません
+agent.err.file.not.readable          = ファイルを読み取ることができません
+agent.err.file.read.failed           = ファイルの読取りに失敗しました
+agent.err.file.not.found             = ファイルが見つかりませんでした
+agent.err.file.access.not.restricted = ファイルの読取りアクセスは制限する必要があります
 
-agent.err.password.file.notset     = \u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u304C\u3001com.sun.management.jmxremote.authenticate=true\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
-agent.err.password.file.not.readable = \u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
-agent.err.password.file.read.failed = \u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-agent.err.password.file.notfound   = \u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-agent.err.password.file.access.notrestricted = \u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A2\u30AF\u30BB\u30B9\u306F\u5236\u9650\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+agent.err.password.file.notset     = パスワード・ファイルが指定されていませんが、com.sun.management.jmxremote.authenticate=trueが設定されています
+agent.err.password.file.not.readable = パスワード・ファイルを読み取ることができません
+agent.err.password.file.read.failed = パスワード・ファイルの読取りに失敗しました
+agent.err.password.file.notfound   = パスワード・ファイルが見つかりません
+agent.err.password.file.access.notrestricted = パスワード・ファイルの読取りアクセスは制限する必要があります
 
-agent.err.access.file.notset       = \u30A2\u30AF\u30BB\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u304C\u3001com.sun.management.jmxremote.authenticate=true\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
-agent.err.access.file.not.readable = \u30A2\u30AF\u30BB\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
-agent.err.access.file.read.failed  = \u30A2\u30AF\u30BB\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-agent.err.access.file.notfound     = \u30A2\u30AF\u30BB\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+agent.err.access.file.notset       = アクセス・ファイルが指定されていませんが、com.sun.management.jmxremote.authenticate=trueが設定されています
+agent.err.access.file.not.readable = アクセス・ファイルを読み取ることができません
+agent.err.access.file.read.failed  = アクセス・ファイルの読取りに失敗しました
+agent.err.access.file.notfound     = アクセス・ファイルが見つかりません
 
-agent.err.connector.server.io.error = JMX\u30B3\u30CD\u30AF\u30BF\u30FB\u30B5\u30FC\u30D0\u30FC\u306E\u901A\u4FE1\u30A8\u30E9\u30FC
+agent.err.connector.server.io.error = JMXコネクタ・サーバーの通信エラー
 
-agent.err.invalid.option	   = \u7121\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F
+agent.err.invalid.option	   = 無効なオプションが指定されました
 
-jmxremote.ConnectorBootstrap.starting = JMX\u30B3\u30CD\u30AF\u30BF\u30FB\u30B5\u30FC\u30D0\u30FC\u3092\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059:
-jmxremote.ConnectorBootstrap.noAuthentication = \u8A8D\u8A3C\u306A\u3057
-jmxremote.ConnectorBootstrap.ready = JMX\u30B3\u30CD\u30AF\u30BF\u306E\u6E96\u5099\u304C\u3067\u304D\u307E\u3057\u305F: {0}
-jmxremote.ConnectorBootstrap.password.readonly = \u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A2\u30AF\u30BB\u30B9\u306F\u5236\u9650\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
-jmxremote.ConnectorBootstrap.file.readonly = \u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A2\u30AF\u30BB\u30B9\u306F\u5236\u9650\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
+jmxremote.ConnectorBootstrap.starting = JMXコネクタ・サーバーを起動しています:
+jmxremote.ConnectorBootstrap.noAuthentication = 認証なし
+jmxremote.ConnectorBootstrap.ready = JMXコネクタの準備ができました: {0}
+jmxremote.ConnectorBootstrap.password.readonly = パスワード・ファイルの読取りアクセスは制限する必要があります: {0}
+jmxremote.ConnectorBootstrap.file.readonly = ファイルの読取りアクセスは制限する必要があります: {0}
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties
index 71dfa0503aa..3bebb89f763 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties
@@ -23,49 +23,49 @@
 # questions.
 #
 
-agent.err.error			   = \uC624\uB958
-agent.err.exception                = \uC5D0\uC774\uC804\uD2B8\uC5D0 \uC608\uC678\uC0AC\uD56D\uC774 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. 
-agent.err.warning		   = \uACBD\uACE0
+agent.err.error			   = 오류
+agent.err.exception                = 에이전트에 예외사항이 발생했습니다. 
+agent.err.warning		   = 경고
 
-agent.err.configfile.notfound      = \uAD6C\uC131 \uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-agent.err.configfile.failed        = \uAD6C\uC131 \uD30C\uC77C \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-agent.err.configfile.closed.failed = \uAD6C\uC131 \uD30C\uC77C \uB2EB\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-agent.err.configfile.access.denied = \uAD6C\uC131 \uD30C\uC77C\uC5D0 \uB300\uD55C \uC561\uC138\uC2A4\uAC00 \uAC70\uBD80\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+agent.err.configfile.notfound      = 구성 파일을 찾을 수 없습니다.
+agent.err.configfile.failed        = 구성 파일 읽기를 실패했습니다.
+agent.err.configfile.closed.failed = 구성 파일 닫기를 실패했습니다.
+agent.err.configfile.access.denied = 구성 파일에 대한 액세스가 거부되었습니다.
 
-agent.err.exportaddress.failed	   = \uAE30\uAE30 \uBC84\uD37C\uB85C JMX \uCEE4\uB125\uD130 \uC8FC\uC18C \uC775\uC2A4\uD3EC\uD2B8\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
+agent.err.exportaddress.failed	   = 기기 버퍼로 JMX 커넥터 주소 익스포트를 실패했습니다.
 
-agent.err.agentclass.notfound      = \uAD00\uB9AC \uC5D0\uC774\uC804\uD2B8 \uD074\uB798\uC2A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-agent.err.agentclass.failed        = \uAD00\uB9AC \uC5D0\uC774\uC804\uD2B8 \uD074\uB798\uC2A4\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. 
-agent.err.premain.notfound         = \uC5D0\uC774\uC804\uD2B8 \uD074\uB798\uC2A4\uC5D0 premain(\uBB38\uC790\uC5F4)\uC774 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-agent.err.agentclass.access.denied = premain(\uBB38\uC790\uC5F4)\uC5D0 \uB300\uD55C \uC561\uC138\uC2A4\uAC00 \uAC70\uBD80\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-agent.err.invalid.agentclass       = com.sun.management.agent.class \uC18D\uC131 \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-agent.err.invalid.state            = \uBD80\uC801\uD569\uD55C \uC5D0\uC774\uC804\uD2B8 \uC0C1\uD0DC: {0}
-agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port \uBC88\uD638\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-agent.err.invalid.jmxremote.rmi.port = \uBD80\uC801\uD569\uD55C com.sun.management.jmxremote.rmi.port \uBC88\uD638
+agent.err.agentclass.notfound      = 관리 에이전트 클래스를 찾을 수 없습니다.
+agent.err.agentclass.failed        = 관리 에이전트 클래스를 실패했습니다. 
+agent.err.premain.notfound         = 에이전트 클래스에 premain(문자열)이 존재하지 않습니다.
+agent.err.agentclass.access.denied = premain(문자열)에 대한 액세스가 거부되었습니다.
+agent.err.invalid.agentclass       = com.sun.management.agent.class 속성 값이 부적합합니다.
+agent.err.invalid.state            = 부적합한 에이전트 상태: {0}
+agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port 번호가 부적합합니다.
+agent.err.invalid.jmxremote.rmi.port = 부적합한 com.sun.management.jmxremote.rmi.port 번호
 
-agent.err.file.not.set               = \uD30C\uC77C\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-agent.err.file.not.readable          = \uD30C\uC77C\uC744 \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-agent.err.file.read.failed           = \uD30C\uC77C \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-agent.err.file.not.found             = \uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-agent.err.file.access.not.restricted = \uD30C\uC77C \uC77D\uAE30 \uC561\uC138\uC2A4\uB294 \uC81C\uD55C\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+agent.err.file.not.set               = 파일이 지정되지 않았습니다.
+agent.err.file.not.readable          = 파일을 읽을 수 없습니다.
+agent.err.file.read.failed           = 파일 읽기를 실패했습니다.
+agent.err.file.not.found             = 파일을 찾을 수 없습니다.
+agent.err.file.access.not.restricted = 파일 읽기 액세스는 제한되어야 합니다.
 
-agent.err.password.file.notset     = \uBE44\uBC00\uBC88\uD638 \uD30C\uC77C\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC558\uC9C0\uB9CC com.sun.management.jmxremote.authenticate=true\uC785\uB2C8\uB2E4.
-agent.err.password.file.not.readable = \uBE44\uBC00\uBC88\uD638 \uD30C\uC77C\uC744 \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-agent.err.password.file.read.failed = \uBE44\uBC00\uBC88\uD638 \uD30C\uC77C \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-agent.err.password.file.notfound   = \uBE44\uBC00\uBC88\uD638 \uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-agent.err.password.file.access.notrestricted = \uBE44\uBC00\uBC88\uD638 \uD30C\uC77C \uC77D\uAE30 \uC561\uC138\uC2A4\uB294 \uC81C\uD55C\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+agent.err.password.file.notset     = 비밀번호 파일이 지정되지 않았지만 com.sun.management.jmxremote.authenticate=true입니다.
+agent.err.password.file.not.readable = 비밀번호 파일을 읽을 수 없습니다.
+agent.err.password.file.read.failed = 비밀번호 파일 읽기를 실패했습니다.
+agent.err.password.file.notfound   = 비밀번호 파일을 찾을 수 없습니다.
+agent.err.password.file.access.notrestricted = 비밀번호 파일 읽기 액세스는 제한되어야 합니다.
 
-agent.err.access.file.notset       = \uC561\uC138\uC2A4 \uD30C\uC77C\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC558\uC9C0\uB9CC com.sun.management.jmxremote.authenticate=true\uC785\uB2C8\uB2E4.
-agent.err.access.file.not.readable = \uC561\uC138\uC2A4 \uD30C\uC77C\uC744 \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-agent.err.access.file.read.failed  = \uC561\uC138\uC2A4 \uD30C\uC77C \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-agent.err.access.file.notfound     = \uC561\uC138\uC2A4 \uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+agent.err.access.file.notset       = 액세스 파일이 지정되지 않았지만 com.sun.management.jmxremote.authenticate=true입니다.
+agent.err.access.file.not.readable = 액세스 파일을 읽을 수 없습니다.
+agent.err.access.file.read.failed  = 액세스 파일 읽기를 실패했습니다.
+agent.err.access.file.notfound     = 액세스 파일을 찾을 수 없습니다.
 
-agent.err.connector.server.io.error = JMX \uCEE4\uB125\uD130 \uC11C\uBC84 \uD1B5\uC2E0 \uC624\uB958
+agent.err.connector.server.io.error = JMX 커넥터 서버 통신 오류
 
-agent.err.invalid.option	   = \uBD80\uC801\uD569\uD55C \uC635\uC158\uC774 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+agent.err.invalid.option	   = 부적합한 옵션이 지정되었습니다.
 
-jmxremote.ConnectorBootstrap.starting = JMX \uCEE4\uB125\uD130 \uC11C\uBC84\uB97C \uC2DC\uC791\uD558\uB294 \uC911:
-jmxremote.ConnectorBootstrap.noAuthentication = \uC778\uC99D \uC5C6\uC74C
-jmxremote.ConnectorBootstrap.ready = {0}\uC5D0\uC11C JMX \uCEE4\uB125\uD130\uAC00 \uC900\uBE44\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-jmxremote.ConnectorBootstrap.password.readonly = \uBE44\uBC00\uBC88\uD638 \uD30C\uC77C \uC77D\uAE30 \uC561\uC138\uC2A4\uB294 \uC81C\uD55C\uB418\uC5B4\uC57C \uD568: {0}
-jmxremote.ConnectorBootstrap.file.readonly = \uD30C\uC77C \uC77D\uAE30 \uC561\uC138\uC2A4\uB294 \uC81C\uD55C\uB418\uC5B4\uC57C \uD568: {0}
+jmxremote.ConnectorBootstrap.starting = JMX 커넥터 서버를 시작하는 중:
+jmxremote.ConnectorBootstrap.noAuthentication = 인증 없음
+jmxremote.ConnectorBootstrap.ready = {0}에서 JMX 커넥터가 준비되었습니다.
+jmxremote.ConnectorBootstrap.password.readonly = 비밀번호 파일 읽기 액세스는 제한되어야 함: {0}
+jmxremote.ConnectorBootstrap.file.readonly = 파일 읽기 액세스는 제한되어야 함: {0}
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties
index 209eb35e267..1aa860e2018 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties
@@ -24,48 +24,48 @@
 #
 
 agent.err.error			   = Erro
-agent.err.exception                = Exce\u00E7\u00E3o gerada pelo agente 
-agent.err.warning		   = Advert\u00EAncia
+agent.err.exception                = Exceção gerada pelo agente 
+agent.err.warning		   = Advertência
 
-agent.err.configfile.notfound      = Arquivo de configura\u00E7\u00E3o n\u00E3o encontrado
-agent.err.configfile.failed        = Falha ao ler o arquivo de configura\u00E7\u00E3o
-agent.err.configfile.closed.failed = Falha ao fechar o arquivo de configura\u00E7\u00E3o
-agent.err.configfile.access.denied = Acesso negado ao arquivo de configura\u00E7\u00E3o
+agent.err.configfile.notfound      = Arquivo de configuração não encontrado
+agent.err.configfile.failed        = Falha ao ler o arquivo de configuração
+agent.err.configfile.closed.failed = Falha ao fechar o arquivo de configuração
+agent.err.configfile.access.denied = Acesso negado ao arquivo de configuração
 
-agent.err.exportaddress.failed	   = Falha na exporta\u00E7\u00E3o do endere\u00E7o do conector JMX para o buffer de instrumenta\u00E7\u00E3o
+agent.err.exportaddress.failed	   = Falha na exportação do endereço do conector JMX para o buffer de instrumentação
 
-agent.err.agentclass.notfound      = Classe do agente de gerenciamento n\u00E3o encontrada
+agent.err.agentclass.notfound      = Classe do agente de gerenciamento não encontrada
 agent.err.agentclass.failed        = Falha na classe do agente de gerenciamento 
-agent.err.premain.notfound         = premain(String) n\u00E3o existe na classe do agente
+agent.err.premain.notfound         = premain(String) não existe na classe do agente
 agent.err.agentclass.access.denied = Acesso negado a premain(String)
-agent.err.invalid.agentclass       = Valor inv\u00E1lido da propriedade com.sun.management.agent.class
-agent.err.invalid.state            = Estado inv\u00E1lido do agente: {0}
-agent.err.invalid.jmxremote.port   = N\u00FAmero inv\u00E1lido de com.sun.management.jmxremote.port
-agent.err.invalid.jmxremote.rmi.port = N\u00FAmero inv\u00E1lido do com.sun.management.jmxremote.rmi.port
+agent.err.invalid.agentclass       = Valor inválido da propriedade com.sun.management.agent.class
+agent.err.invalid.state            = Estado inválido do agente: {0}
+agent.err.invalid.jmxremote.port   = Número inválido de com.sun.management.jmxremote.port
+agent.err.invalid.jmxremote.rmi.port = Número inválido do com.sun.management.jmxremote.rmi.port
 
-agent.err.file.not.set               = Arquivo n\u00E3o especificado
-agent.err.file.not.readable          = Arquivo ileg\u00EDvel
+agent.err.file.not.set               = Arquivo não especificado
+agent.err.file.not.readable          = Arquivo ilegível
 agent.err.file.read.failed           = Falha ao ler o arquivo
-agent.err.file.not.found             = Arquivo n\u00E3o encontrado
+agent.err.file.not.found             = Arquivo não encontrado
 agent.err.file.access.not.restricted = O acesso de leitura do arquivo deve ser limitado
 
-agent.err.password.file.notset     = O arquivo de senha n\u00E3o est\u00E1 especificado, mas com.sun.management.jmxremote.authenticate=true
-agent.err.password.file.not.readable = Arquivo de senha ileg\u00EDvel
+agent.err.password.file.notset     = O arquivo de senha não está especificado, mas com.sun.management.jmxremote.authenticate=true
+agent.err.password.file.not.readable = Arquivo de senha ilegível
 agent.err.password.file.read.failed = Falha ao ler o arquivo de senha
-agent.err.password.file.notfound   = Arquivo de senha n\u00E3o encontrado
+agent.err.password.file.notfound   = Arquivo de senha não encontrado
 agent.err.password.file.access.notrestricted = O acesso de leitura do arquivo de senha deve ser limitado
 
-agent.err.access.file.notset       = O arquivo de acesso n\u00E3o est\u00E1 especificado, mas com.sun.management.jmxremote.authenticate=true
-agent.err.access.file.not.readable = Arquivo de acesso ileg\u00EDvel
+agent.err.access.file.notset       = O arquivo de acesso não está especificado, mas com.sun.management.jmxremote.authenticate=true
+agent.err.access.file.not.readable = Arquivo de acesso ilegível
 agent.err.access.file.read.failed  = Falha ao ler o arquivo de acesso
-agent.err.access.file.notfound     = Arquivo de acesso n\u00E3o encontrado
+agent.err.access.file.notfound     = Arquivo de acesso não encontrado
 
-agent.err.connector.server.io.error = Erro de comunica\u00E7\u00E3o do servidor do conector JMX
+agent.err.connector.server.io.error = Erro de comunicação do servidor do conector JMX
 
-agent.err.invalid.option	   = Op\u00E7\u00E3o especificada inv\u00E1lida
+agent.err.invalid.option	   = Opção especificada inválida
 
 jmxremote.ConnectorBootstrap.starting = Iniciando o Servidor do Conector JMX:
-jmxremote.ConnectorBootstrap.noAuthentication = Sem autentica\u00E7\u00E3o
+jmxremote.ConnectorBootstrap.noAuthentication = Sem autenticação
 jmxremote.ConnectorBootstrap.ready = Conector JMX pronto em: {0}
 jmxremote.ConnectorBootstrap.password.readonly = O acesso de leitura do arquivo de senha deve ser limitado: {0}
 jmxremote.ConnectorBootstrap.file.readonly = O acesso de leitura do arquivo deve ser limitado: {0}
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties
index d9882be628a..c56dd50d630 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties
@@ -28,44 +28,44 @@ agent.err.exception                = Agenten orsakade ett undantag
 agent.err.warning		   = Varning
 
 agent.err.configfile.notfound      = Konfigurationsfilen hittades inte
-agent.err.configfile.failed        = Kunde inte l\u00E4sa konfigurationsfilen
-agent.err.configfile.closed.failed = Kunde inte st\u00E4nga konfigurationsfilen
-agent.err.configfile.access.denied = \u00C5tkomst till konfigurationsfilen nekad
+agent.err.configfile.failed        = Kunde inte läsa konfigurationsfilen
+agent.err.configfile.closed.failed = Kunde inte stänga konfigurationsfilen
+agent.err.configfile.access.denied = Åtkomst till konfigurationsfilen nekad
 
 agent.err.exportaddress.failed	   = Kunde inte exportera JMX-anslutningsadressen till instrumentbufferten
 
 agent.err.agentclass.notfound      = Administrationsagentklassen hittades inte
-agent.err.agentclass.failed        = Administrationsagentklassen utf\u00F6rdes inte 
+agent.err.agentclass.failed        = Administrationsagentklassen utfördes inte 
 agent.err.premain.notfound         = premain(String) finns inte i agentklassen
-agent.err.agentclass.access.denied = \u00C5tkomst till premain(String) nekad
-agent.err.invalid.agentclass       = Ogiltigt egenskapsv\u00E4rde f\u00F6r com.sun.management.agent.class
+agent.err.agentclass.access.denied = Åtkomst till premain(String) nekad
+agent.err.invalid.agentclass       = Ogiltigt egenskapsvärde för com.sun.management.agent.class
 agent.err.invalid.state            = Ogiltig agentstatus: {0}
 agent.err.invalid.jmxremote.port   = Ogiltigt com.sun.management.jmxremote.port-nummer
 agent.err.invalid.jmxremote.rmi.port = Ogiltigt com.sun.management.jmxremote.rmi.port-nummer
 
-agent.err.file.not.set               = Filen \u00E4r inte angiven
-agent.err.file.not.readable          = Filen \u00E4r inte l\u00E4sbar
-agent.err.file.read.failed           = Kunde inte l\u00E4sa filen
+agent.err.file.not.set               = Filen är inte angiven
+agent.err.file.not.readable          = Filen är inte läsbar
+agent.err.file.read.failed           = Kunde inte läsa filen
 agent.err.file.not.found             = Filen hittades inte
-agent.err.file.access.not.restricted = Fill\u00E4snings\u00E5tkomst m\u00E5ste begr\u00E4nsas
+agent.err.file.access.not.restricted = Filläsningsåtkomst måste begränsas
 
-agent.err.password.file.notset     = L\u00F6senordsfilen har inte angetts men com.sun.management.jmxremote.authenticate=true
-agent.err.password.file.not.readable = L\u00F6senordsfilen \u00E4r inte l\u00E4sbar
-agent.err.password.file.read.failed = Kunde inte l\u00E4sa l\u00F6senordsfilen
-agent.err.password.file.notfound   = Hittar inte l\u00F6senordsfilen
-agent.err.password.file.access.notrestricted = L\u00E4sbeh\u00F6righeten f\u00F6r filen m\u00E5ste begr\u00E4nsas
+agent.err.password.file.notset     = Lösenordsfilen har inte angetts men com.sun.management.jmxremote.authenticate=true
+agent.err.password.file.not.readable = Lösenordsfilen är inte läsbar
+agent.err.password.file.read.failed = Kunde inte läsa lösenordsfilen
+agent.err.password.file.notfound   = Hittar inte lösenordsfilen
+agent.err.password.file.access.notrestricted = Läsbehörigheten för filen måste begränsas
 
-agent.err.access.file.notset       = \u00C5tkomstfilen har inte angetts men com.sun.management.jmxremote.authenticate=true
-agent.err.access.file.not.readable = Access-filen \u00E4r inte l\u00E4sbar
-agent.err.access.file.read.failed  = Kunde inte l\u00E4sa \u00E5tkomstfilen
+agent.err.access.file.notset       = Åtkomstfilen har inte angetts men com.sun.management.jmxremote.authenticate=true
+agent.err.access.file.not.readable = Access-filen är inte läsbar
+agent.err.access.file.read.failed  = Kunde inte läsa åtkomstfilen
 agent.err.access.file.notfound     = Access-filen hittades inte
 
-agent.err.connector.server.io.error = Serverkommunikationsfel f\u00F6r JMX-anslutning
+agent.err.connector.server.io.error = Serverkommunikationsfel för JMX-anslutning
 
-agent.err.invalid.option	   = Det angivna alternativet \u00E4r ogiltigt
+agent.err.invalid.option	   = Det angivna alternativet är ogiltigt
 
-jmxremote.ConnectorBootstrap.starting = Startar server f\u00F6r JMX-anslutning:
+jmxremote.ConnectorBootstrap.starting = Startar server för JMX-anslutning:
 jmxremote.ConnectorBootstrap.noAuthentication = Ingen autentisering
-jmxremote.ConnectorBootstrap.ready = JMX-anslutning redo p\u00E5: {0}
-jmxremote.ConnectorBootstrap.password.readonly = L\u00E4sbeh\u00F6righeten f\u00F6r l\u00F6senordsfilen m\u00E5ste begr\u00E4nsas: {0}
-jmxremote.ConnectorBootstrap.file.readonly = Fill\u00E4snings\u00E5tkomst m\u00E5ste begr\u00E4nsas {0}
+jmxremote.ConnectorBootstrap.ready = JMX-anslutning redo på: {0}
+jmxremote.ConnectorBootstrap.password.readonly = Läsbehörigheten för lösenordsfilen måste begränsas: {0}
+jmxremote.ConnectorBootstrap.file.readonly = Filläsningsåtkomst måste begränsas {0}
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
index c75e86b55f6..e487f52631d 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
@@ -23,49 +23,49 @@
 # questions.
 #
 
-agent.err.error			   = \u9519\u8BEF
-agent.err.exception                = \u4EE3\u7406\u629B\u51FA\u5F02\u5E38\u9519\u8BEF
-agent.err.warning		   = \u8B66\u544A
+agent.err.error			   = 错误
+agent.err.exception                = 代理抛出异常错误
+agent.err.warning		   = 警告
 
-agent.err.configfile.notfound      = \u627E\u4E0D\u5230\u914D\u7F6E\u6587\u4EF6
-agent.err.configfile.failed        = \u672A\u80FD\u8BFB\u53D6\u914D\u7F6E\u6587\u4EF6
-agent.err.configfile.closed.failed = \u672A\u80FD\u5173\u95ED\u914D\u7F6E\u6587\u4EF6
-agent.err.configfile.access.denied = \u62D2\u7EDD\u8BBF\u95EE\u914D\u7F6E\u6587\u4EF6
+agent.err.configfile.notfound      = 找不到配置文件
+agent.err.configfile.failed        = 未能读取配置文件
+agent.err.configfile.closed.failed = 未能关闭配置文件
+agent.err.configfile.access.denied = 拒绝访问配置文件
 
-agent.err.exportaddress.failed	   = \u672A\u80FD\u5C06 JMX \u8FDE\u63A5\u5668\u5730\u5740\u5BFC\u51FA\u5230\u68C0\u6D4B\u7F13\u51B2\u533A
+agent.err.exportaddress.failed	   = 未能将 JMX 连接器地址导出到检测缓冲区
 
-agent.err.agentclass.notfound      = \u627E\u4E0D\u5230\u7BA1\u7406\u4EE3\u7406\u7C7B
-agent.err.agentclass.failed        = \u7BA1\u7406\u4EE3\u7406\u7C7B\u5931\u8D25 
-agent.err.premain.notfound         = \u4EE3\u7406\u7C7B\u4E2D\u4E0D\u5B58\u5728 premain(String)
-agent.err.agentclass.access.denied = \u62D2\u7EDD\u8BBF\u95EE premain(String)
-agent.err.invalid.agentclass       = com.sun.management.agent.class \u5C5E\u6027\u503C\u65E0\u6548
-agent.err.invalid.state            = \u65E0\u6548\u7684\u4EE3\u7406\u72B6\u6001: {0}
-agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port \u7F16\u53F7\u65E0\u6548
-agent.err.invalid.jmxremote.rmi.port = com.sun.management.jmxremote.rmi.port \u7F16\u53F7\u65E0\u6548
+agent.err.agentclass.notfound      = 找不到管理代理类
+agent.err.agentclass.failed        = 管理代理类失败 
+agent.err.premain.notfound         = 代理类中不存在 premain(String)
+agent.err.agentclass.access.denied = 拒绝访问 premain(String)
+agent.err.invalid.agentclass       = com.sun.management.agent.class 属性值无效
+agent.err.invalid.state            = 无效的代理状态: {0}
+agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port 编号无效
+agent.err.invalid.jmxremote.rmi.port = com.sun.management.jmxremote.rmi.port 编号无效
 
-agent.err.file.not.set               = \u672A\u6307\u5B9A\u6587\u4EF6
-agent.err.file.not.readable          = \u6587\u4EF6\u4E0D\u53EF\u8BFB\u53D6
-agent.err.file.read.failed           = \u672A\u80FD\u8BFB\u53D6\u6587\u4EF6
-agent.err.file.not.found             = \u627E\u4E0D\u5230\u6587\u4EF6
-agent.err.file.access.not.restricted = \u5FC5\u987B\u9650\u5236\u6587\u4EF6\u8BFB\u53D6\u8BBF\u95EE\u6743\u9650
+agent.err.file.not.set               = 未指定文件
+agent.err.file.not.readable          = 文件不可读取
+agent.err.file.read.failed           = 未能读取文件
+agent.err.file.not.found             = 找不到文件
+agent.err.file.access.not.restricted = 必须限制文件读取访问权限
 
-agent.err.password.file.notset     = \u672A\u6307\u5B9A\u53E3\u4EE4\u6587\u4EF6, \u4F46 com.sun.management.jmxremote.authenticate=true
-agent.err.password.file.not.readable = \u53E3\u4EE4\u6587\u4EF6\u4E0D\u53EF\u8BFB\u53D6
-agent.err.password.file.read.failed = \u8BFB\u53D6\u53E3\u4EE4\u6587\u4EF6\u5931\u8D25
-agent.err.password.file.notfound   = \u627E\u4E0D\u5230\u53E3\u4EE4\u6587\u4EF6
-agent.err.password.file.access.notrestricted = \u5FC5\u987B\u9650\u5236\u53E3\u4EE4\u6587\u4EF6\u8BFB\u53D6\u8BBF\u95EE\u6743\u9650
+agent.err.password.file.notset     = 未指定口令文件, 但 com.sun.management.jmxremote.authenticate=true
+agent.err.password.file.not.readable = 口令文件不可读取
+agent.err.password.file.read.failed = 读取口令文件失败
+agent.err.password.file.notfound   = 找不到口令文件
+agent.err.password.file.access.notrestricted = 必须限制口令文件读取访问权限
 
-agent.err.access.file.notset       = \u672A\u6307\u5B9A\u8BBF\u95EE\u6587\u4EF6, \u4F46 com.sun.management.jmxremote.authenticate=true
-agent.err.access.file.not.readable = \u8BBF\u95EE\u6587\u4EF6\u4E0D\u53EF\u8BFB\u53D6
-agent.err.access.file.read.failed  = \u8BFB\u53D6\u8BBF\u95EE\u6587\u4EF6\u5931\u8D25
-agent.err.access.file.notfound     = \u627E\u4E0D\u5230\u8BBF\u95EE\u6587\u4EF6
+agent.err.access.file.notset       = 未指定访问文件, 但 com.sun.management.jmxremote.authenticate=true
+agent.err.access.file.not.readable = 访问文件不可读取
+agent.err.access.file.read.failed  = 读取访问文件失败
+agent.err.access.file.notfound     = 找不到访问文件
 
-agent.err.connector.server.io.error = JMX \u8FDE\u63A5\u5668\u670D\u52A1\u5668\u901A\u4FE1\u9519\u8BEF
+agent.err.connector.server.io.error = JMX 连接器服务器通信错误
 
-agent.err.invalid.option	   = \u6307\u5B9A\u7684\u9009\u9879\u65E0\u6548
+agent.err.invalid.option	   = 指定的选项无效
 
-jmxremote.ConnectorBootstrap.starting = \u6B63\u5728\u542F\u52A8 JMX \u8FDE\u63A5\u5668\u670D\u52A1\u5668:
-jmxremote.ConnectorBootstrap.noAuthentication = \u65E0\u9A8C\u8BC1
-jmxremote.ConnectorBootstrap.ready = \u4F4D\u4E8E{0}\u7684 JMX \u8FDE\u63A5\u5668\u5DF2\u5C31\u7EEA
-jmxremote.ConnectorBootstrap.password.readonly = \u5FC5\u987B\u9650\u5236\u53E3\u4EE4\u6587\u4EF6\u8BFB\u53D6\u8BBF\u95EE\u6743\u9650: {0}
-jmxremote.ConnectorBootstrap.file.readonly = \u5FC5\u987B\u9650\u5236\u6587\u4EF6\u8BFB\u53D6\u8BBF\u95EE\u6743\u9650: {0}
+jmxremote.ConnectorBootstrap.starting = 正在启动 JMX 连接器服务器:
+jmxremote.ConnectorBootstrap.noAuthentication = 无验证
+jmxremote.ConnectorBootstrap.ready = 位于{0}的 JMX 连接器已就绪
+jmxremote.ConnectorBootstrap.password.readonly = 必须限制口令文件读取访问权限: {0}
+jmxremote.ConnectorBootstrap.file.readonly = 必须限制文件读取访问权限: {0}
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties
index b8b5d8c1159..893fe43304d 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties
@@ -23,49 +23,49 @@
 # questions.
 #
 
-agent.err.error			   = \u932F\u8AA4
-agent.err.exception                = \u4EE3\u7406\u7A0B\u5F0F\u767C\u751F\u7570\u5E38 
-agent.err.warning		   = \u8B66\u544A
+agent.err.error			   = 錯誤
+agent.err.exception                = 代理程式發生異常 
+agent.err.warning		   = 警告
 
-agent.err.configfile.notfound      = \u627E\u4E0D\u5230\u8A2D\u5B9A\u6A94\u6848
-agent.err.configfile.failed        = \u7121\u6CD5\u8B80\u53D6\u8A2D\u5B9A\u6A94\u6848
-agent.err.configfile.closed.failed = \u7121\u6CD5\u95DC\u9589\u8A2D\u5B9A\u6A94\u6848
-agent.err.configfile.access.denied = \u5B58\u53D6\u8A2D\u5B9A\u6A94\u6848\u906D\u5230\u62D2\u7D55
+agent.err.configfile.notfound      = 找不到設定檔案
+agent.err.configfile.failed        = 無法讀取設定檔案
+agent.err.configfile.closed.failed = 無法關閉設定檔案
+agent.err.configfile.access.denied = 存取設定檔案遭到拒絕
 
-agent.err.exportaddress.failed	   = \u5C07 JMX \u9023\u63A5\u5668\u4F4D\u5740\u532F\u51FA\u81F3\u8A2D\u5099\u7DE9\u885D\u5340\u5931\u6557
+agent.err.exportaddress.failed	   = 將 JMX 連接器位址匯出至設備緩衝區失敗
 
-agent.err.agentclass.notfound      = \u627E\u4E0D\u5230\u7BA1\u7406\u4EE3\u7406\u7A0B\u5F0F\u985E\u5225
-agent.err.agentclass.failed        = \u7BA1\u7406\u4EE3\u7406\u7A0B\u5F0F\u985E\u5225\u5931\u6557 
-agent.err.premain.notfound         = \u4EE3\u7406\u7A0B\u5F0F\u985E\u5225\u4E2D\u4E0D\u5B58\u5728 premain(String)
-agent.err.agentclass.access.denied = \u5B58\u53D6 premain(String) \u906D\u5230\u62D2\u7D55
-agent.err.invalid.agentclass       = com.sun.management.agent.class \u5C6C\u6027\u503C\u7121\u6548
-agent.err.invalid.state            = \u7121\u6548\u7684\u4EE3\u7406\u7A0B\u5F0F\u72C0\u614B: {0}
-agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port \u865F\u78BC\u7121\u6548
-agent.err.invalid.jmxremote.rmi.port = com.sun.management.jmxremote.rmi.port \u865F\u78BC\u7121\u6548
+agent.err.agentclass.notfound      = 找不到管理代理程式類別
+agent.err.agentclass.failed        = 管理代理程式類別失敗 
+agent.err.premain.notfound         = 代理程式類別中不存在 premain(String)
+agent.err.agentclass.access.denied = 存取 premain(String) 遭到拒絕
+agent.err.invalid.agentclass       = com.sun.management.agent.class 屬性值無效
+agent.err.invalid.state            = 無效的代理程式狀態: {0}
+agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port 號碼無效
+agent.err.invalid.jmxremote.rmi.port = com.sun.management.jmxremote.rmi.port 號碼無效
 
-agent.err.file.not.set               = \u672A\u6307\u5B9A\u6A94\u6848
-agent.err.file.not.readable          = \u6A94\u6848\u7121\u6CD5\u8B80\u53D6
-agent.err.file.read.failed           = \u7121\u6CD5\u8B80\u53D6\u6A94\u6848
-agent.err.file.not.found             = \u627E\u4E0D\u5230\u6A94\u6848
-agent.err.file.access.not.restricted = \u5FC5\u9808\u9650\u5236\u6A94\u6848\u8B80\u53D6\u5B58\u53D6\u6B0A
+agent.err.file.not.set               = 未指定檔案
+agent.err.file.not.readable          = 檔案無法讀取
+agent.err.file.read.failed           = 無法讀取檔案
+agent.err.file.not.found             = 找不到檔案
+agent.err.file.access.not.restricted = 必須限制檔案讀取存取權
 
-agent.err.password.file.notset     = \u672A\u6307\u5B9A\u5BC6\u78BC\u6A94\u6848\uFF0C\u4F46 com.sun.management.jmxremote.authenticate=true
-agent.err.password.file.not.readable = \u5BC6\u78BC\u6A94\u6848\u7121\u6CD5\u8B80\u53D6
-agent.err.password.file.read.failed = \u7121\u6CD5\u8B80\u53D6\u5BC6\u78BC\u6A94\u6848
-agent.err.password.file.notfound   = \u627E\u4E0D\u5230\u5BC6\u78BC\u6A94\u6848
-agent.err.password.file.access.notrestricted = \u5FC5\u9808\u9650\u5236\u5BC6\u78BC\u6A94\u6848\u8B80\u53D6\u5B58\u53D6
+agent.err.password.file.notset     = 未指定密碼檔案，但 com.sun.management.jmxremote.authenticate=true
+agent.err.password.file.not.readable = 密碼檔案無法讀取
+agent.err.password.file.read.failed = 無法讀取密碼檔案
+agent.err.password.file.notfound   = 找不到密碼檔案
+agent.err.password.file.access.notrestricted = 必須限制密碼檔案讀取存取
 
-agent.err.access.file.notset       = \u672A\u6307\u5B9A\u5B58\u53D6\u6A94\u6848\uFF0C\u4F46 com.sun.management.jmxremote.authenticate=true
-agent.err.access.file.not.readable = \u5B58\u53D6\u6A94\u6848\u7121\u6CD5\u8B80\u53D6
-agent.err.access.file.read.failed  = \u7121\u6CD5\u8B80\u53D6\u5B58\u53D6\u6A94\u6848
-agent.err.access.file.notfound     = \u627E\u4E0D\u5230\u5B58\u53D6\u6A94\u6848
+agent.err.access.file.notset       = 未指定存取檔案，但 com.sun.management.jmxremote.authenticate=true
+agent.err.access.file.not.readable = 存取檔案無法讀取
+agent.err.access.file.read.failed  = 無法讀取存取檔案
+agent.err.access.file.notfound     = 找不到存取檔案
 
-agent.err.connector.server.io.error = JMX \u9023\u63A5\u5668\u4F3A\u670D\u5668\u901A\u8A0A\u932F\u8AA4
+agent.err.connector.server.io.error = JMX 連接器伺服器通訊錯誤
 
-agent.err.invalid.option	   = \u6307\u5B9A\u7684\u9078\u9805\u7121\u6548
+agent.err.invalid.option	   = 指定的選項無效
 
-jmxremote.ConnectorBootstrap.starting = \u6B63\u5728\u555F\u52D5 JMX \u9023\u63A5\u5668\u4F3A\u670D\u5668:
-jmxremote.ConnectorBootstrap.noAuthentication = \u7121\u8A8D\u8B49
-jmxremote.ConnectorBootstrap.ready = JMX \u9023\u63A5\u5668\u5C31\u7DD2\uFF0C\u4F4D\u65BC: {0}
-jmxremote.ConnectorBootstrap.password.readonly = \u5FC5\u9808\u9650\u5236\u5BC6\u78BC\u6A94\u6848\u8B80\u53D6\u5B58\u53D6: {0}
-jmxremote.ConnectorBootstrap.file.readonly = \u5FC5\u9808\u9650\u5236\u6A94\u6848\u8B80\u53D6\u5B58\u53D6\u6B0A: {0}
+jmxremote.ConnectorBootstrap.starting = 正在啟動 JMX 連接器伺服器:
+jmxremote.ConnectorBootstrap.noAuthentication = 無認證
+jmxremote.ConnectorBootstrap.ready = JMX 連接器就緒，位於: {0}
+jmxremote.ConnectorBootstrap.password.readonly = 必須限制密碼檔案讀取存取: {0}
+jmxremote.ConnectorBootstrap.file.readonly = 必須限制檔案讀取存取權: {0}
diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java b/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java
index b3a7bb21eca..8ed5ad8ce20 100644
--- a/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java
+++ b/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4290801 4942982 5102005 8008577 8021121 8210153 8227313
+ * @bug 4290801 4942982 5102005 8008577 8021121 8210153 8227313 8301991
  * @summary Basic tests for currency formatting.
  * @modules jdk.localedata
  * @run main/othervm -Djava.locale.providers=COMPAT CurrencyFormat COMPAT
@@ -32,6 +32,8 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Currency;
 import java.util.Locale;
 import java.util.Properties;
@@ -123,8 +125,9 @@ static void testSymbols() throws Exception {
         }
 
         FileInputStream stream = new FileInputStream(new File(System.getProperty("test.src", "."), "CurrencySymbols.properties"));
+        InputStreamReader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
         Properties props = new Properties();
-        props.load(stream);
+        props.load(streamReader);
         SimpleDateFormat format = null;
 
         Locale[] locales = NumberFormat.getAvailableLocales();
diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
index 9ee1ea52ca6..a324fb19f02 100644
--- a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
+++ b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
@@ -21,53 +21,53 @@
 # questions.
 #
 
-ar=\u00A4
-ar_AE=\u062F.\u0625.\u200F
-ar_BH=\u062F.\u0628.\u200F
-ar_DZ=\u062F.\u062C.\u200F
-ar_EG=\u062C.\u0645.\u200F
-ar_IQ=\u062F.\u0639.\u200F
-ar_JO=\u062F.\u0623.\u200F
-ar_KW=\u062F.\u0643.\u200F
-ar_LB=\u0644.\u0644.\u200F
-ar_LY=\u062F.\u0644.\u200F
-ar_MA=\u062F.\u0645.\u200F
-ar_OM=\u0631.\u0639.\u200F
-ar_QA=\u0631.\u0642.\u200F
-ar_SA=\u0631.\u0633.\u200F
+ar=¤
+ar_AE=د.إ.‏
+ar_BH=د.ب.‏
+ar_DZ=د.ج.‏
+ar_EG=ج.م.‏
+ar_IQ=د.ع.‏
+ar_JO=د.أ.‏
+ar_KW=د.ك.‏
+ar_LB=ل.ل.‏
+ar_LY=د.ل.‏
+ar_MA=د.م.‏
+ar_OM=ر.ع.‏
+ar_QA=ر.ق.‏
+ar_SA=ر.س.‏
 # see bug 4412080
-# ar_SD=\u062C.\u0633.\u200F
-ar_SY=\u0644.\u0633.\u200F
-ar_TN=\u062F.\u062A.\u200F
-ar_YE=\u0631.\u064A.\u200F
-be=\u00A4
+# ar_SD=ج.س.‏
+ar_SY=ل.س.‏
+ar_TN=د.ت.‏
+ar_YE=ر.ي.‏
+be=¤
 # see bug 4412080
-# be_BY=\u0420\u0443\u0431
-bg=\u00A4
+# be_BY=Руб
+bg=¤
 # see bug 4412080
 # bg_BG=Lr
-ca=\u00A4
-ca_ES=\u20AC
-cs=\u00A4
-cs_CZ=K\u010D
-da=\u00A4
+ca=¤
+ca_ES=€
+cs=¤
+cs_CZ=Kč
+da=¤
 da_DK=kr
-de=\u00A4
-de_AT=\u20AC
+de=¤
+de_AT=€
 de_CH=SFr.
-de_DE=\u20AC
-de_LU=\u20AC
-el=\u00A4
-el_GR=\u20AC
-en=\u00A4
+de_DE=€
+de_LU=€
+el=¤
+el_GR=€
+en=¤
 en_AU=$
 en_CA=$
-en_GB=\u00A3
-en_IE=\u20AC
+en_GB=£
+en_IE=€
 en_NZ=$
 en_US=$
 en_ZA=R
-es=\u00A4
+es=¤
 es_AR=$
 es_BO=B$
 es_CL=Ch$
@@ -78,7 +78,7 @@ es_CU=CU$
 es_DO=RD$
 # see bug 4412080
 # es_EC=S/
-es_ES=\u20AC
+es_ES=€
 es_GT=Q
 es_HN=L
 es_MX=$
@@ -90,68 +90,68 @@ es_PY=G
 es_SV=C
 es_UY=NU$
 es_VE=Bs.S.
-et=\u00A4
-et_EE=\u20AC
-fi=\u00A4
-fi_FI=\u20AC
-fr=\u00A4
-fr_BE=\u20AC
+et=¤
+et_EE=€
+fi=¤
+fi_FI=€
+fr=¤
+fr_BE=€
 fr_CA=$
 fr_CH=SFr.
-fr_FR=\u20AC
-fr_LU=\u20AC
-hi_IN=\u0930\u0942
-hr=\u00A4
-hr_HR=\u20AC
-hu=\u00A4
+fr_FR=€
+fr_LU=€
+hi_IN=रू
+hr=¤
+hr_HR=€
+hu=¤
 hu_HU=Ft
-is=\u00A4
+is=¤
 is_IS=kr.
-it=\u00A4
+it=¤
 it_CH=SFr.
-it_IT=\u20AC
-iw=\u00A4
-iw_IL=\u05E9"\u05D7
-ja=\u00A4
-ja_JP=\uFFE5
-ko=\u00A4
-ko_KR=\uFFE6
-lt=\u00A4
-lt_LT=\u20AC
-lv=\u00A4
-lv_LV=\u20AC
-mk=\u00A4
+it_IT=€
+iw=¤
+iw_IL=ש"ח
+ja=¤
+ja_JP=￥
+ko=¤
+ko_KR=￦
+lt=¤
+lt_LT=€
+lv=¤
+lv_LV=€
+mk=¤
 mk_MK=Den
-nl=\u00A4
-nl_BE=\u20AC
-nl_NL=\u20AC
-no=\u00A4
+nl=¤
+nl_BE=€
+nl_NL=€
+no=¤
 no_NO=kr
 no_NO_NY=kr
-pl=\u00A4
-pl_PL=z\u0142
-pt=\u00A4
+pl=¤
+pl_PL=zł
+pt=¤
 pt_BR=R$
-pt_PT=\u20AC
-ro=\u00A4
+pt_PT=€
+ro=¤
 ro_RO=LEI
-ru=\u00A4
-ru_RU=\u0440\u0443\u0431.
-sk=\u00A4
-sk_SK=\u20AC
-sl=\u00A4
-sl_SI=\u20AC
-sq=\u00A4
+ru=¤
+ru_RU=руб.
+sk=¤
+sk_SK=€
+sl=¤
+sl_SI=€
+sq=¤
 sq_AL=Lek
-sv=\u00A4
+sv=¤
 sv_SE=kr
-th=\u00A4
-th_TH=\u0E3F
-tr=\u00A4
+th=¤
+th_TH=฿
+tr=¤
 tr_TR=TL
-uk=\u00A4
-uk_UA=\u0433\u0440\u043d.
-zh=\u00A4
-zh_CN=\uFFE5
+uk=¤
+uk_UA=грн.
+zh=¤
+zh_CN=￥
 zh_HK=HK$
 zh_TW=NT$
diff --git a/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames.properties b/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames.properties
index e3be3c32945..39371780072 100644
--- a/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames.properties
+++ b/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames.properties
@@ -20,6 +20,6 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-osaka=Osaka
-kyoto=Kyoto
-xx=batsubatsu
+osaka=Osaka
+kyoto=Kyoto
+xx=batsubatsu
diff --git a/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_ja.properties b/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_ja.properties
index f74ec50ecf1..b68233a119d 100644
--- a/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_ja.properties
+++ b/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_ja.properties
@@ -20,11 +20,11 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-ja=\u65e5\u672c\u8a9e\u3067\u3059\u3002
-JP=\u65e5\u672c\u3067\u3059\u3002
+ja=日本語です。
+JP=日本です。
 #
 # added ones
 #
-osaka=\u5927\u962a\u3067\u3059\u3002
-kyoto=\u4eac\u90fd\u3067\u3059\u3002
-xx=\u3070\u3064\u3070\u3064\u3067\u3059\u3002
+osaka=大阪です。
+kyoto=京都です。
+xx=ばつばつです。
diff --git a/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_ja_JP_kyoto.properties b/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_ja_JP_kyoto.properties
index 3d6632061e2..b949ff07166 100644
--- a/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_ja_JP_kyoto.properties
+++ b/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_ja_JP_kyoto.properties
@@ -20,9 +20,9 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-ja=\u65e5\u672c\u8a9e\u3069\u3059\u3002
-JP=\u65e5\u672c\u3069\u3059\u3002
+ja=日本語どす。
+JP=日本どす。
 #
-osaka=\u5927\u962a\u3069\u3059\u3002
-kyoto=\u4eac\u90fd\u3069\u3059\u3002
-xx=\u307a\u3051\u307a\u3051\u3069\u3059\u3002
+osaka=大阪どす。
+kyoto=京都どす。
+xx=ぺけぺけどす。
diff --git a/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_ja_JP_osaka.properties b/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_ja_JP_osaka.properties
index 83fe5818d2b..b23878f2e96 100644
--- a/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_ja_JP_osaka.properties
+++ b/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_ja_JP_osaka.properties
@@ -20,9 +20,9 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-ja=\u7956\u56fd\u8a9e\u3084\u3002
-JP=\u3084\u307e\u3068\u3084\u3002
+ja=祖国語や。
+JP=やまとや。
 #
-osaka=\u5927\u962a\u3084\u3002
-kyoto=\u4eac\u90fd\u3084\u3002
-xx=\u307a\u3051\u307a\u3051\u3084\u3002
+osaka=大阪や。
+kyoto=京都や。
+xx=ぺけぺけや。
diff --git a/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_xx.properties b/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_xx.properties
index 16a4da16849..5e055cb941f 100644
--- a/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_xx.properties
+++ b/test/jdk/java/util/PluggableLocale/providersrc/barprovider/com/bar/LocaleNames_xx.properties
@@ -20,4 +20,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-xx=batsubatsu
+xx=batsubatsu
diff --git a/test/jdk/java/util/ResourceBundle/Bug6204853.properties b/test/jdk/java/util/ResourceBundle/Bug6204853.properties
index 6e787746c62..2aeb5958ff3 100644
--- a/test/jdk/java/util/ResourceBundle/Bug6204853.properties
+++ b/test/jdk/java/util/ResourceBundle/Bug6204853.properties
@@ -22,6 +22,7 @@
 #
 #
 
+# These should remain Unicode escape sequences
 key1 = \u30b5\u30f3\u30bf\u30af\u30e9\u30e9
 key2 = \u30ab\u30ea\u30d5\u30a9\u30eb\u30cb\u30a2
 key3 = \u30a2\u30e1\u30ea\u30ab\u5408\u8846\u56fd
diff --git a/test/jdk/performance/client/SwingMark/src/resources/JMTest_04_ja.properties b/test/jdk/performance/client/SwingMark/src/resources/JMTest_04_ja.properties
index b3d79c809c3..3b94c0fe0ea 100644
--- a/test/jdk/performance/client/SwingMark/src/resources/JMTest_04_ja.properties
+++ b/test/jdk/performance/client/SwingMark/src/resources/JMTest_04_ja.properties
@@ -29,6 +29,6 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # Resource bundle for Menu Test
-MenuString=\uff2a\uff2d\uff45\uff4e\uff55
-SubMenuString=\uff33\uff55\uff42\uff2d\uff45\uff4e\uff55
-MenuItemString=\uff2a\uff2d\uff45\uff4e\uff55\uff29\uff54\uff45\uff4d
+MenuString=ＪＭｅｎｕ
+SubMenuString=ＳｕｂＭｅｎｕ
+MenuItemString=ＪＭｅｎｕＩｔｅｍ
diff --git a/test/jdk/performance/client/SwingMark/src/resources/ListTest_ja.properties b/test/jdk/performance/client/SwingMark/src/resources/ListTest_ja.properties
index 9e70ac633a1..377a3cae3f8 100644
--- a/test/jdk/performance/client/SwingMark/src/resources/ListTest_ja.properties
+++ b/test/jdk/performance/client/SwingMark/src/resources/ListTest_ja.properties
@@ -29,4 +29,4 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # Resource bundle for List Test
-DisplayString=\uff2c\uff49\uff53\uff54\uff29\uff54\uff45\uff4d
+DisplayString=ＬｉｓｔＩｔｅｍ
diff --git a/test/jdk/performance/client/SwingMark/src/resources/TextAreaTest_ja.properties b/test/jdk/performance/client/SwingMark/src/resources/TextAreaTest_ja.properties
index 2b757c03447..7957983a5aa 100644
--- a/test/jdk/performance/client/SwingMark/src/resources/TextAreaTest_ja.properties
+++ b/test/jdk/performance/client/SwingMark/src/resources/TextAreaTest_ja.properties
@@ -29,4 +29,4 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # Resource bundle for Menu Test
-DisplayString=\uff33\uff57\uff49\uff4e\uff47\u3000\uff49\uff53\u3000\uff26\uff41\uff53\uff54\uff01\uff01\uff01\u3000\u3000\u3000
+DisplayString=Ｓｗｉｎｇ　ｉｓ　Ｆａｓｔ！！！　　　

From 96781ba33d4717c8df2b9ba4cd5d66858cf5c2d1 Mon Sep 17 00:00:00 2001
From: Pengfei Li <pli@openjdk.org>
Date: Fri, 15 Sep 2023 01:02:44 +0000
Subject: [PATCH 029/112] 8312332: C2: Refactor SWPointer out from SuperWord

Reviewed-by: epeter, kvn
---
 src/hotspot/share/opto/loopnode.cpp      |  49 +-
 src/hotspot/share/opto/loopnode.hpp      |  10 +-
 src/hotspot/share/opto/node.hpp          |   3 +
 src/hotspot/share/opto/superword.cpp     | 779 ++---------------------
 src/hotspot/share/opto/superword.hpp     | 249 +-------
 src/hotspot/share/opto/vectorization.cpp | 689 ++++++++++++++++++++
 src/hotspot/share/opto/vectorization.hpp | 248 ++++++++
 7 files changed, 1043 insertions(+), 984 deletions(-)
 create mode 100644 src/hotspot/share/opto/vectorization.cpp
 create mode 100644 src/hotspot/share/opto/vectorization.hpp

diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 7bd92f33af7..23251efd9d1 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -620,7 +620,7 @@ static bool no_side_effect_since_safepoint(Compile* C, Node* x, Node* mem, Merge
   SafePointNode* safepoint = nullptr;
   for (DUIterator_Fast imax, i = x->fast_outs(imax); i < imax; i++) {
     Node* u = x->fast_out(i);
-    if (u->is_Phi() && u->bottom_type() == Type::MEMORY) {
+    if (u->is_memory_phi()) {
       Node* m = u->in(LoopNode::LoopBackControl);
       if (u->adr_type() == TypePtr::BOTTOM) {
         if (m->is_MergeMem() && mem->is_MergeMem()) {
@@ -2639,7 +2639,7 @@ void OuterStripMinedLoopNode::fix_sunk_stores(CountedLoopEndNode* inner_cle, Loo
 #ifdef ASSERT
         for (DUIterator_Fast jmax, j = inner_cl->fast_outs(jmax); j < jmax; j++) {
           Node* uu = inner_cl->fast_out(j);
-          if (uu->is_Phi() && uu->bottom_type() == Type::MEMORY) {
+          if (uu->is_memory_phi()) {
             if (uu->adr_type() == igvn->C->get_adr_type(igvn->C->get_alias_index(u->adr_type()))) {
               assert(phi == uu, "what's that phi?");
             } else if (uu->adr_type() == TypePtr::BOTTOM) {
@@ -5715,6 +5715,51 @@ Node* CountedLoopNode::is_canonical_loop_entry() {
   return res ? cmpzm->in(input) : nullptr;
 }
 
+// Find pre loop end from main loop. Returns nullptr if none.
+CountedLoopEndNode* CountedLoopNode::find_pre_loop_end() {
+  assert(is_main_loop(), "Can only find pre-loop from main-loop");
+  // The loop cannot be optimized if the graph shape at the loop entry is
+  // inappropriate.
+  if (is_canonical_loop_entry() == nullptr) {
+    return nullptr;
+  }
+
+  Node* p_f = skip_assertion_predicates_with_halt()->in(0)->in(0);
+  if (!p_f->is_IfFalse() || !p_f->in(0)->is_CountedLoopEnd()) {
+    return nullptr;
+  }
+  CountedLoopEndNode* pre_end = p_f->in(0)->as_CountedLoopEnd();
+  CountedLoopNode* loop_node = pre_end->loopnode();
+  if (loop_node == nullptr || !loop_node->is_pre_loop()) {
+    return nullptr;
+  }
+  return pre_end;
+}
+
+  CountedLoopNode* CountedLoopNode::pre_loop_head() const {
+    assert(is_main_loop(), "Only main loop has pre loop");
+    assert(_pre_loop_end != nullptr && _pre_loop_end->loopnode() != nullptr,
+           "should find head from pre loop end");
+    return _pre_loop_end->loopnode();
+  }
+
+  CountedLoopEndNode* CountedLoopNode::pre_loop_end() {
+#ifdef ASSERT
+    assert(is_main_loop(), "Only main loop has pre loop");
+    assert(_pre_loop_end != nullptr, "should be set when fetched");
+    Node* found_pre_end = find_pre_loop_end();
+    assert(_pre_loop_end == found_pre_end && _pre_loop_end == pre_loop_head()->loopexit(),
+           "should find the pre loop end and must be the same result");
+#endif
+    return _pre_loop_end;
+  }
+
+  void CountedLoopNode::set_pre_loop_end(CountedLoopEndNode* pre_loop_end) {
+    assert(is_main_loop(), "Only main loop has pre loop");
+    assert(pre_loop_end, "must be valid");
+    _pre_loop_end = pre_loop_end;
+  }
+
 //------------------------------get_late_ctrl----------------------------------
 // Compute latest legal control.
 Node *PhaseIdealLoop::get_late_ctrl( Node *n, Node *early ) {
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 7544ef98da7..1ec00a8642f 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -232,14 +232,14 @@ class CountedLoopNode : public BaseCountedLoopNode {
   // vector mapped unroll factor here
   int _slp_maximum_unroll_factor;
 
-  // The eventual count of vectorizable packs in slp
-  int _slp_vector_pack_count;
+  // Cached CountedLoopEndNode of pre loop for main loops
+  CountedLoopEndNode* _pre_loop_end;
 
 public:
   CountedLoopNode(Node *entry, Node *backedge)
     : BaseCountedLoopNode(entry, backedge), _main_idx(0), _trip_count(max_juint),
       _unrolled_count_log2(0), _node_count_before_unroll(0),
-      _slp_maximum_unroll_factor(0), _slp_vector_pack_count(0) {
+      _slp_maximum_unroll_factor(0), _pre_loop_end(nullptr) {
     init_class_id(Class_CountedLoop);
     // Initialize _trip_count to the largest possible value.
     // Will be reset (lower) if the loop's trip count is known.
@@ -330,6 +330,10 @@ class CountedLoopNode : public BaseCountedLoopNode {
   }
 
   Node* is_canonical_loop_entry();
+  CountedLoopEndNode* find_pre_loop_end();
+  CountedLoopNode* pre_loop_head() const;
+  CountedLoopEndNode* pre_loop_end();
+  void set_pre_loop_end(CountedLoopEndNode* pre_loop_end);
 
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 50134fe0e02..c94c439430b 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1219,6 +1219,9 @@ class Node {
   // Whether this is a memory-writing machine node.
   bool is_memory_writer() const { return is_Mach() && bottom_type()->has_memory(); }
 
+  // Whether this is a memory phi node
+  bool is_memory_phi() const { return is_Phi() && bottom_type() == Type::MEMORY; }
+
 //----------------- Printing, etc
 #ifndef PRODUCT
  public:
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 8cd3e46dcf5..c6ada90cbcc 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -22,21 +22,16 @@
  */
 
 #include "precompiled.hpp"
-#include "compiler/compileLog.hpp"
 #include "libadt/vectset.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "opto/addnode.hpp"
-#include "opto/callnode.hpp"
 #include "opto/castnode.hpp"
 #include "opto/convertnode.hpp"
-#include "opto/divnode.hpp"
 #include "opto/matcher.hpp"
 #include "opto/memnode.hpp"
-#include "opto/mulnode.hpp"
 #include "opto/opcodes.hpp"
 #include "opto/opaquenode.hpp"
-#include "opto/rootnode.hpp"
 #include "opto/superword.hpp"
 #include "opto/vectornode.hpp"
 #include "opto/movenode.hpp"
@@ -69,7 +64,6 @@ SuperWord::SuperWord(PhaseIdealLoop* phase) :
   _stk(arena(), 8, 0, nullptr),                             // scratch stack of nodes
   _lpt(nullptr),                                            // loop tree node
   _lp(nullptr),                                             // CountedLoopNode
-  _pre_loop_end(nullptr),                                   // Pre loop CountedLoopEndNode
   _loop_reductions(arena()),                                // reduction nodes in the current loop
   _bb(nullptr),                                             // basic block
   _iv(nullptr),                                             // induction var
@@ -153,7 +147,7 @@ bool SuperWord::transform_loop(IdealLoopTree* lpt, bool do_optimization) {
 
   if (cl->is_main_loop()) {
     // Check for pre-loop ending with CountedLoopEnd(Bool(Cmp(x,Opaque1(limit))))
-    CountedLoopEndNode* pre_end = find_pre_loop_end(cl);
+    CountedLoopEndNode* pre_end = cl->find_pre_loop_end();
     if (pre_end == nullptr) {
       return false;
     }
@@ -161,7 +155,7 @@ bool SuperWord::transform_loop(IdealLoopTree* lpt, bool do_optimization) {
     if (pre_opaq1->Opcode() != Op_Opaque1) {
       return false;
     }
-    set_pre_loop_end(pre_end);
+    cl->set_pre_loop_end(pre_end);
   }
 
   init(); // initialize data structures
@@ -216,7 +210,7 @@ void SuperWord::unrolling_analysis(int &local_loop_unroll_factor) {
       }
     }
 
-    if (n->is_Phi() && (n->bottom_type() == Type::MEMORY)) {
+    if (n->is_memory_phi()) {
       Node* n_tail = n->in(LoopNode::LoopBackControl);
       if (n_tail != n->in(LoopNode::EntryControl)) {
         if (!n_tail->is_Mem()) {
@@ -264,7 +258,7 @@ void SuperWord::unrolling_analysis(int &local_loop_unroll_factor) {
           nstack.push(adr, stack_idx++);
         } else {
           // Mark the components of the memory operation in nstack
-          SWPointer p1(current, this, &nstack, true);
+          VPointer p1(current, phase(), lpt(), &nstack, true);
           have_side_effects = p1.node_stack()->is_nonempty();
         }
 
@@ -625,13 +619,13 @@ void SuperWord::find_adjacent_refs() {
       NOT_PRODUCT(find_adjacent_refs_trace_1(best_align_to_mem_ref, best_iv_adjustment);)
     }
 
-    SWPointer align_to_ref_p(mem_ref, this, nullptr, false);
+    VPointer align_to_ref_p(mem_ref, phase(), lpt(), nullptr, false);
     // Set alignment relative to "align_to_ref" for all related memory operations.
     for (int i = memops.size() - 1; i >= 0; i--) {
       MemNode* s = memops.at(i)->as_Mem();
       if (isomorphic(s, mem_ref) &&
            (!_do_vector_loop || same_origin_idx(s, mem_ref))) {
-        SWPointer p2(s, this, nullptr, false);
+        VPointer p2(s, phase(), lpt(), nullptr, false);
         if (p2.comparable(align_to_ref_p)) {
           int align = memory_alignment(s, iv_adjustment);
           set_alignment(s, align);
@@ -753,7 +747,7 @@ void SuperWord::find_adjacent_refs_trace_1(Node* best_align_to_mem_ref, int best
 
 // If strict memory alignment is required (vectors_should_be_aligned), then check if
 // mem_ref is aligned with best_align_to_mem_ref.
-bool SuperWord::mem_ref_has_no_alignment_violation(MemNode* mem_ref, int iv_adjustment, SWPointer &align_to_ref_p,
+bool SuperWord::mem_ref_has_no_alignment_violation(MemNode* mem_ref, int iv_adjustment, VPointer& align_to_ref_p,
                                                    MemNode* best_align_to_mem_ref, int best_iv_adjustment,
                                                    Node_List &align_to_refs) {
   if (!vectors_should_be_aligned()) {
@@ -784,7 +778,7 @@ bool SuperWord::mem_ref_has_no_alignment_violation(MemNode* mem_ref, int iv_adju
   // (3) Ensure that all vectors have the same invariant. We model memory accesses like this
   //     address = base + k*iv + constant [+ invar]
   //     memory_alignment ignores the invariant.
-  SWPointer p2(best_align_to_mem_ref, this, nullptr, false);
+  VPointer p2(best_align_to_mem_ref, phase(), lpt(), nullptr, false);
   if (!align_to_ref_p.invar_equals(p2)) {
     // Do not vectorize memory accesses with different invariants
     // if unaligned memory accesses are not allowed.
@@ -803,7 +797,7 @@ MemNode* SuperWord::find_align_to_ref(Node_List &memops, int &idx) {
   // Count number of comparable memory ops
   for (uint i = 0; i < memops.size(); i++) {
     MemNode* s1 = memops.at(i)->as_Mem();
-    SWPointer p1(s1, this, nullptr, false);
+    VPointer p1(s1, phase(), lpt(), nullptr, false);
     // Only discard unalignable memory references if vector memory references
     // should be aligned on this platform.
     if (vectors_should_be_aligned() && !ref_is_alignable(p1)) {
@@ -813,7 +807,7 @@ MemNode* SuperWord::find_align_to_ref(Node_List &memops, int &idx) {
     for (uint j = i+1; j < memops.size(); j++) {
       MemNode* s2 = memops.at(j)->as_Mem();
       if (isomorphic(s1, s2)) {
-        SWPointer p2(s2, this, nullptr, false);
+        VPointer p2(s2, phase(), lpt(), nullptr, false);
         if (p1.comparable(p2)) {
           (*cmp_ct.adr_at(i))++;
           (*cmp_ct.adr_at(j))++;
@@ -834,7 +828,7 @@ MemNode* SuperWord::find_align_to_ref(Node_List &memops, int &idx) {
     if (s->is_Store()) {
       int vw = vector_width_in_bytes(s);
       assert(vw > 1, "sanity");
-      SWPointer p(s, this, nullptr, false);
+      VPointer p(s, phase(), lpt(), nullptr, false);
       if ( cmp_ct.at(j) >  max_ct ||
           (cmp_ct.at(j) == max_ct &&
             ( vw >  max_vw ||
@@ -857,7 +851,7 @@ MemNode* SuperWord::find_align_to_ref(Node_List &memops, int &idx) {
       if (s->is_Load()) {
         int vw = vector_width_in_bytes(s);
         assert(vw > 1, "sanity");
-        SWPointer p(s, this, nullptr, false);
+        VPointer p(s, phase(), lpt(), nullptr, false);
         if ( cmp_ct.at(j) >  max_ct ||
             (cmp_ct.at(j) == max_ct &&
               ( vw >  max_vw ||
@@ -921,11 +915,11 @@ static bool span_works_for_memory_size(MemNode* mem, int span, int mem_size, int
 
 //------------------------------ref_is_alignable---------------------------
 // Can the preloop align the reference to position zero in the vector?
-bool SuperWord::ref_is_alignable(SWPointer& p) {
+bool SuperWord::ref_is_alignable(VPointer& p) {
   if (!p.has_iv()) {
     return true;   // no induction variable
   }
-  CountedLoopEndNode* pre_end = pre_loop_end();
+  CountedLoopEndNode* pre_end = lp()->pre_loop_end();
   assert(pre_end->stride_is_con(), "pre loop stride is constant");
   int preloop_stride = pre_end->stride_con();
 
@@ -1019,7 +1013,7 @@ int SuperWord::get_vw_bytes_special(MemNode* s) {
 //---------------------------get_iv_adjustment---------------------------
 // Calculate loop's iv adjustment for this memory ops.
 int SuperWord::get_iv_adjustment(MemNode* mem_ref) {
-  SWPointer align_to_ref_p(mem_ref, this, nullptr, false);
+  VPointer align_to_ref_p(mem_ref, phase(), lpt(), nullptr, false);
   int offset = align_to_ref_p.offset_in_bytes();
   int scale  = align_to_ref_p.scale_in_bytes();
   int elt_size = align_to_ref_p.memory_size();
@@ -1063,7 +1057,7 @@ void SuperWord::dependence_graph() {
   // First, assign a dependence node to each memory node
   for (int i = 0; i < _block.length(); i++ ) {
     Node *n = _block.at(i);
-    if (n->is_Mem() || (n->is_Phi() && n->bottom_type() == Type::MEMORY)) {
+    if (n->is_Mem() || n->is_memory_phi()) {
       _dg.make_node(n);
     }
   }
@@ -1100,13 +1094,13 @@ void SuperWord::dependence_graph() {
       if (_dg.dep(s1)->in_cnt() == 0) {
         _dg.make_edge(slice, s1);
       }
-      SWPointer p1(s1->as_Mem(), this, nullptr, false);
+      VPointer p1(s1->as_Mem(), phase(), lpt(), nullptr, false);
       bool sink_dependent = true;
       for (int k = j - 1; k >= 0; k--) {
         Node* s2 = _nlist.at(k);
         if (s1->is_Load() && s2->is_Load())
           continue;
-        SWPointer p2(s2->as_Mem(), this, nullptr, false);
+        VPointer p2(s2->as_Mem(), phase(), lpt(), nullptr, false);
 
         int cmp = p1.cmp(p2);
         if (SuperWordRTDepCheck &&
@@ -1115,7 +1109,7 @@ void SuperWord::dependence_graph() {
           OrderedPair pp(p1.base(), p2.base());
           _disjoint_ptrs.append_if_missing(pp);
         }
-        if (!SWPointer::not_equal(cmp)) {
+        if (!VPointer::not_equal(cmp)) {
           // Possibly same address
           _dg.make_edge(s1, s2);
           sink_dependent = false;
@@ -1171,7 +1165,7 @@ void SuperWord::mem_slice_preds(Node* start, Node* stop, GrowableArray<Node*> &p
         if (out->is_MergeMem() && !in_bb(out)) {
           // Either unrolling is causing a memory edge not to disappear,
           // or need to run igvn.optimize() again before SLP
-        } else if (out->is_Phi() && out->bottom_type() == Type::MEMORY && !in_bb(out)) {
+        } else if (out->is_memory_phi() && !in_bb(out)) {
           // Ditto.  Not sure what else to check further.
         } else if (out->Opcode() == Op_StoreCM && out->in(MemNode::OopStore) == n) {
           // StoreCM has an input edge used as a precedence edge.
@@ -1257,8 +1251,8 @@ bool SuperWord::are_adjacent_refs(Node* s1, Node* s2) {
 
   // Adjacent memory references must have the same base, be comparable
   // and have the correct distance between them.
-  SWPointer p1(s1->as_Mem(), this, nullptr, false);
-  SWPointer p2(s2->as_Mem(), this, nullptr, false);
+  VPointer p1(s1->as_Mem(), phase(), lpt(), nullptr, false);
+  VPointer p2(s2->as_Mem(), phase(), lpt(), nullptr, false);
   if (p1.base() != p2.base() || !p1.comparable(p2)) return false;
   int diff = p2.offset_in_bytes() - p1.offset_in_bytes();
   return diff == data_size(s1);
@@ -2544,14 +2538,14 @@ bool SuperWord::output() {
   uint max_vlen_in_bytes = 0;
   uint max_vlen = 0;
 
-  NOT_PRODUCT(if(is_trace_loop_reverse()) {tty->print_cr("SWPointer::output: print loop before create_reserve_version_of_loop"); print_loop(true);})
+  NOT_PRODUCT(if(is_trace_loop_reverse()) {tty->print_cr("VPointer::output: print loop before create_reserve_version_of_loop"); print_loop(true);})
 
   CountedLoopReserveKit make_reversable(_phase, _lpt, do_reserve_copy());
 
-  NOT_PRODUCT(if(is_trace_loop_reverse()) {tty->print_cr("SWPointer::output: print loop after create_reserve_version_of_loop"); print_loop(true);})
+  NOT_PRODUCT(if(is_trace_loop_reverse()) {tty->print_cr("VPointer::output: print loop after create_reserve_version_of_loop"); print_loop(true);})
 
   if (do_reserve_copy() && !make_reversable.has_reserved()) {
-    NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: loop was not reserved correctly, exiting SuperWord");})
+    NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("VPointer::output: loop was not reserved correctly, exiting SuperWord");})
     return false;
   }
 
@@ -2566,20 +2560,20 @@ bool SuperWord::output() {
       uint vlen = p->size();
       uint vlen_in_bytes = 0;
       Node* vn = nullptr;
-      NOT_PRODUCT(if(is_trace_cmov()) {tty->print_cr("SWPointer::output: %d executed first, %d executed last in pack", first->_idx, n->_idx); print_pack(p);})
+      NOT_PRODUCT(if(is_trace_cmov()) {tty->print_cr("VPointer::output: %d executed first, %d executed last in pack", first->_idx, n->_idx); print_pack(p);})
       int   opc = n->Opcode();
       if (n->is_Load()) {
         Node* ctl = n->in(MemNode::Control);
         Node* mem = first->in(MemNode::Memory);
-        SWPointer p1(n->as_Mem(), this, nullptr, false);
+        VPointer p1(n->as_Mem(), phase(), lpt(), nullptr, false);
         // Identify the memory dependency for the new loadVector node by
         // walking up through memory chain.
         // This is done to give flexibility to the new loadVector node so that
         // it can move above independent storeVector nodes.
         while (mem->is_StoreVector()) {
-          SWPointer p2(mem->as_Mem(), this, nullptr, false);
+          VPointer p2(mem->as_Mem(), phase(), lpt(), nullptr, false);
           int cmp = p1.cmp(p2);
-          if (SWPointer::not_equal(cmp) || !SWPointer::comparable(cmp)) {
+          if (VPointer::not_equal(cmp) || !VPointer::comparable(cmp)) {
             mem = mem->in(MemNode::Memory);
           } else {
             break; // dependent memory
@@ -2594,7 +2588,7 @@ bool SuperWord::output() {
         Node* val = vector_opd(p, MemNode::ValueIn);
         if (val == nullptr) {
           if (do_reserve_copy()) {
-            NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: val should not be null, exiting SuperWord");})
+            NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("VPointer::output: val should not be null, exiting SuperWord");})
             assert(false, "input to vector store was not created");
             return false; //and reverse to backup IG
           }
@@ -2736,7 +2730,7 @@ bool SuperWord::output() {
           in1 = vector_opd(p, 1);
           if (in1 == nullptr) {
             if (do_reserve_copy()) {
-              NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: in1 should not be null, exiting SuperWord");})
+              NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("VPointer::output: in1 should not be null, exiting SuperWord");})
               assert(false, "input in1 to vector operand was not created");
               return false; //and reverse to backup IG
             }
@@ -2746,7 +2740,7 @@ bool SuperWord::output() {
         Node* in2 = vector_opd(p, 2);
         if (in2 == nullptr) {
           if (do_reserve_copy()) {
-            NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: in2 should not be null, exiting SuperWord");})
+            NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("VPointer::output: in2 should not be null, exiting SuperWord");})
             assert(false, "input in2 to vector operand was not created");
             return false; //and reverse to backup IG
           }
@@ -2820,7 +2814,7 @@ bool SuperWord::output() {
         vlen_in_bytes = vn->as_Vector()->length_in_bytes();
       } else {
         if (do_reserve_copy()) {
-          NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: Unhandled scalar opcode (%s), ShouldNotReachHere, exiting SuperWord", NodeClassNames[opc]);})
+          NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("VPointer::output: Unhandled scalar opcode (%s), ShouldNotReachHere, exiting SuperWord", NodeClassNames[opc]);})
           assert(false, "Unhandled scalar opcode (%s)", NodeClassNames[opc]);
           return false; //and reverse to backup IG
         }
@@ -2830,7 +2824,7 @@ bool SuperWord::output() {
       assert(vn != nullptr, "sanity");
       if (vn == nullptr) {
         if (do_reserve_copy()){
-          NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: got null node, cannot proceed, exiting SuperWord");})
+          NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("VPointer::output: got null node, cannot proceed, exiting SuperWord");})
           return false; //and reverse to backup IG
         }
         ShouldNotReachHere();
@@ -3190,7 +3184,7 @@ bool SuperWord::construct_bb() {
   // Find memory slices (head and tail)
   for (DUIterator_Fast imax, i = lp()->fast_outs(imax); i < imax; i++) {
     Node *n = lp()->fast_out(i);
-    if (in_bb(n) && (n->is_Phi() && n->bottom_type() == Type::MEMORY)) {
+    if (in_bb(n) && n->is_memory_phi()) {
       Node* n_tail  = n->in(LoopNode::LoopBackControl);
       if (n_tail != n->in(LoopNode::EntryControl)) {
         if (!n_tail->is_Mem()) {
@@ -3501,15 +3495,14 @@ int SuperWord::memory_alignment(MemNode* s, int iv_adjust) {
     tty->print("SuperWord::memory_alignment within a vector memory reference for %d:  ", s->_idx); s->dump();
   }
 #endif
-  NOT_PRODUCT(SWPointer::Tracer::Depth ddd(0);)
-  SWPointer p(s, this, nullptr, false);
+  VPointer p(s, phase(), lpt(), nullptr, false);
   if (!p.valid()) {
-    NOT_PRODUCT(if(is_trace_alignment()) tty->print_cr("SWPointer::memory_alignment: SWPointer p invalid, return bottom_align");)
+    NOT_PRODUCT(if(is_trace_alignment()) tty->print_cr("VPointer::memory_alignment: VPointer p invalid, return bottom_align");)
     return bottom_align;
   }
   int vw = get_vw_bytes_special(s);
   if (vw < 2) {
-    NOT_PRODUCT(if(is_trace_alignment()) tty->print_cr("SWPointer::memory_alignment: vector_width_in_bytes < 2, return bottom_align");)
+    NOT_PRODUCT(if(is_trace_alignment()) tty->print_cr("VPointer::memory_alignment: vector_width_in_bytes < 2, return bottom_align");)
     return bottom_align; // No vectors for this type
   }
   int offset  = p.offset_in_bytes();
@@ -3518,7 +3511,7 @@ int SuperWord::memory_alignment(MemNode* s, int iv_adjust) {
   int off_mod = off_rem >= 0 ? off_rem : off_rem + vw;
 #ifndef PRODUCT
   if ((TraceSuperWord && Verbose) || is_trace_alignment()) {
-    tty->print_cr("SWPointer::memory_alignment: off_rem = %d, off_mod = %d (offset = %d)", off_rem, off_mod, offset);
+    tty->print_cr("VPointer::memory_alignment: off_rem = %d, off_mod = %d (offset = %d)", off_rem, off_mod, offset);
   }
 #endif
   return off_mod;
@@ -3637,21 +3630,21 @@ LoadNode::ControlDependency SuperWord::control_dependency(Node_List* p) {
 //   (iv + k) mod vector_align == 0
 void SuperWord::align_initial_loop_index(MemNode* align_to_ref) {
   assert(lp()->is_main_loop(), "");
-  CountedLoopEndNode* pre_end = pre_loop_end();
+  CountedLoopEndNode* pre_end = lp()->pre_loop_end();
   Node* pre_opaq1 = pre_end->limit();
   assert(pre_opaq1->Opcode() == Op_Opaque1, "");
   Opaque1Node* pre_opaq = (Opaque1Node*)pre_opaq1;
   Node* lim0 = pre_opaq->in(1);
 
   // Where we put new limit calculations
-  Node* pre_ctrl = pre_loop_head()->in(LoopNode::EntryControl);
+  Node* pre_ctrl = lp()->pre_loop_head()->in(LoopNode::EntryControl);
 
   // Ensure the original loop limit is available from the
   // pre-loop Opaque1 node.
   Node* orig_limit = pre_opaq->original_loop_limit();
   assert(orig_limit != nullptr && _igvn.type(orig_limit) != Type::TOP, "");
 
-  SWPointer align_to_ref_p(align_to_ref, this, nullptr, false);
+  VPointer align_to_ref_p(align_to_ref, phase(), lpt(), nullptr, false);
   assert(align_to_ref_p.valid(), "sanity");
 
   // Given:
@@ -3793,24 +3786,6 @@ void SuperWord::align_initial_loop_index(MemNode* align_to_ref) {
   _igvn.replace_input_of(pre_opaq, 1, constrained);
 }
 
-//----------------------------get_pre_loop_end---------------------------
-// Find pre loop end from main loop.  Returns null if none.
-CountedLoopEndNode* SuperWord::find_pre_loop_end(CountedLoopNode* cl) const {
-  // The loop cannot be optimized if the graph shape at
-  // the loop entry is inappropriate.
-  if (cl->is_canonical_loop_entry() == nullptr) {
-    return nullptr;
-  }
-
-  Node* p_f = cl->skip_assertion_predicates_with_halt()->in(0)->in(0);
-  if (!p_f->is_IfFalse()) return nullptr;
-  if (!p_f->in(0)->is_CountedLoopEnd()) return nullptr;
-  CountedLoopEndNode* pre_end = p_f->in(0)->as_CountedLoopEnd();
-  CountedLoopNode* loop_node = pre_end->loopnode();
-  if (loop_node == nullptr || !loop_node->is_pre_loop()) return nullptr;
-  return pre_end;
-}
-
 //------------------------------init---------------------------
 void SuperWord::init() {
   _dg.init();
@@ -3873,673 +3848,6 @@ void SuperWord::print_stmt(Node* s) {
 #endif
 }
 
-//==============================SWPointer===========================
-#ifndef PRODUCT
-int SWPointer::Tracer::_depth = 0;
-#endif
-//----------------------------SWPointer------------------------
-SWPointer::SWPointer(MemNode* mem, SuperWord* slp, Node_Stack *nstack, bool analyze_only) :
-  _mem(mem), _slp(slp), _base(nullptr), _adr(nullptr),
-  _scale(0), _offset(0), _invar(nullptr),
-#ifdef ASSERT
-  _debug_invar(nullptr), _debug_negate_invar(false), _debug_invar_scale(nullptr),
-#endif
-  _nstack(nstack), _analyze_only(analyze_only),
-  _stack_idx(0)
-#ifndef PRODUCT
-  , _tracer(slp)
-#endif
-{
-  NOT_PRODUCT(_tracer.ctor_1(mem);)
-
-  Node* adr = mem->in(MemNode::Address);
-  if (!adr->is_AddP()) {
-    assert(!valid(), "too complex");
-    return;
-  }
-  // Match AddP(base, AddP(ptr, k*iv [+ invariant]), constant)
-  Node* base = adr->in(AddPNode::Base);
-  // The base address should be loop invariant
-  if (is_loop_member(base)) {
-    assert(!valid(), "base address is loop variant");
-    return;
-  }
-  // unsafe references require misaligned vector access support
-  if (base->is_top() && !Matcher::misaligned_vectors_ok()) {
-    assert(!valid(), "unsafe access");
-    return;
-  }
-
-  NOT_PRODUCT(if(_slp->is_trace_alignment()) _tracer.store_depth();)
-  NOT_PRODUCT(_tracer.ctor_2(adr);)
-
-  int i;
-  for (i = 0; ; i++) {
-    NOT_PRODUCT(_tracer.ctor_3(adr, i);)
-
-    if (!scaled_iv_plus_offset(adr->in(AddPNode::Offset))) {
-      assert(!valid(), "too complex");
-      return;
-    }
-    adr = adr->in(AddPNode::Address);
-    NOT_PRODUCT(_tracer.ctor_4(adr, i);)
-
-    if (base == adr || !adr->is_AddP()) {
-      NOT_PRODUCT(_tracer.ctor_5(adr, base, i);)
-      break; // stop looking at addp's
-    }
-  }
-  if (is_loop_member(adr)) {
-    assert(!valid(), "adr is loop variant");
-    return;
-  }
-
-  if (!base->is_top() && adr != base) {
-    assert(!valid(), "adr and base differ");
-    return;
-  }
-
-  NOT_PRODUCT(if(_slp->is_trace_alignment()) _tracer.restore_depth();)
-  NOT_PRODUCT(_tracer.ctor_6(mem);)
-
-  _base = base;
-  _adr  = adr;
-  assert(valid(), "Usable");
-}
-
-// Following is used to create a temporary object during
-// the pattern match of an address expression.
-SWPointer::SWPointer(SWPointer* p) :
-  _mem(p->_mem), _slp(p->_slp), _base(nullptr), _adr(nullptr),
-  _scale(0), _offset(0), _invar(nullptr),
-#ifdef ASSERT
-  _debug_invar(nullptr), _debug_negate_invar(false), _debug_invar_scale(nullptr),
-#endif
-  _nstack(p->_nstack), _analyze_only(p->_analyze_only),
-  _stack_idx(p->_stack_idx)
-  #ifndef PRODUCT
-  , _tracer(p->_slp)
-  #endif
-{}
-
-bool SWPointer::is_loop_member(Node* n) const {
-  Node* n_c = phase()->get_ctrl(n);
-  return lpt()->is_member(phase()->get_loop(n_c));
-}
-
-bool SWPointer::invariant(Node* n) const {
-  NOT_PRODUCT(Tracer::Depth dd;)
-  Node* n_c = phase()->get_ctrl(n);
-  NOT_PRODUCT(_tracer.invariant_1(n, n_c);)
-  bool is_not_member = !is_loop_member(n);
-  if (is_not_member && _slp->lp()->is_main_loop()) {
-    // Check that n_c dominates the pre loop head node. If it does not, then we cannot use n as invariant for the pre loop
-    // CountedLoopEndNode check because n_c is either part of the pre loop or between the pre and the main loop (illegal
-    // invariant: Happens, for example, when n_c is a CastII node that prevents data nodes to flow above the main loop).
-    return phase()->is_dominator(n_c, _slp->pre_loop_head());
-  }
-  return is_not_member;
-}
-
-//------------------------scaled_iv_plus_offset--------------------
-// Match: k*iv + offset
-// where: k is a constant that maybe zero, and
-//        offset is (k2 [+/- invariant]) where k2 maybe zero and invariant is optional
-bool SWPointer::scaled_iv_plus_offset(Node* n) {
-  NOT_PRODUCT(Tracer::Depth ddd;)
-  NOT_PRODUCT(_tracer.scaled_iv_plus_offset_1(n);)
-
-  if (scaled_iv(n)) {
-    NOT_PRODUCT(_tracer.scaled_iv_plus_offset_2(n);)
-    return true;
-  }
-
-  if (offset_plus_k(n)) {
-    NOT_PRODUCT(_tracer.scaled_iv_plus_offset_3(n);)
-    return true;
-  }
-
-  int opc = n->Opcode();
-  if (opc == Op_AddI) {
-    if (offset_plus_k(n->in(2)) && scaled_iv_plus_offset(n->in(1))) {
-      NOT_PRODUCT(_tracer.scaled_iv_plus_offset_4(n);)
-      return true;
-    }
-    if (offset_plus_k(n->in(1)) && scaled_iv_plus_offset(n->in(2))) {
-      NOT_PRODUCT(_tracer.scaled_iv_plus_offset_5(n);)
-      return true;
-    }
-  } else if (opc == Op_SubI || opc == Op_SubL) {
-    if (offset_plus_k(n->in(2), true) && scaled_iv_plus_offset(n->in(1))) {
-      NOT_PRODUCT(_tracer.scaled_iv_plus_offset_6(n);)
-      return true;
-    }
-    if (offset_plus_k(n->in(1)) && scaled_iv_plus_offset(n->in(2))) {
-      _scale *= -1;
-      NOT_PRODUCT(_tracer.scaled_iv_plus_offset_7(n);)
-      return true;
-    }
-  }
-
-  NOT_PRODUCT(_tracer.scaled_iv_plus_offset_8(n);)
-  return false;
-}
-
-//----------------------------scaled_iv------------------------
-// Match: k*iv where k is a constant that's not zero
-bool SWPointer::scaled_iv(Node* n) {
-  NOT_PRODUCT(Tracer::Depth ddd;)
-  NOT_PRODUCT(_tracer.scaled_iv_1(n);)
-
-  if (_scale != 0) { // already found a scale
-    NOT_PRODUCT(_tracer.scaled_iv_2(n, _scale);)
-    return false;
-  }
-
-  if (n == iv()) {
-    _scale = 1;
-    NOT_PRODUCT(_tracer.scaled_iv_3(n, _scale);)
-    return true;
-  }
-  if (_analyze_only && (is_loop_member(n))) {
-    _nstack->push(n, _stack_idx++);
-  }
-
-  int opc = n->Opcode();
-  if (opc == Op_MulI) {
-    if (n->in(1) == iv() && n->in(2)->is_Con()) {
-      _scale = n->in(2)->get_int();
-      NOT_PRODUCT(_tracer.scaled_iv_4(n, _scale);)
-      return true;
-    } else if (n->in(2) == iv() && n->in(1)->is_Con()) {
-      _scale = n->in(1)->get_int();
-      NOT_PRODUCT(_tracer.scaled_iv_5(n, _scale);)
-      return true;
-    }
-  } else if (opc == Op_LShiftI) {
-    if (n->in(1) == iv() && n->in(2)->is_Con()) {
-      _scale = 1 << n->in(2)->get_int();
-      NOT_PRODUCT(_tracer.scaled_iv_6(n, _scale);)
-      return true;
-    }
-  } else if (opc == Op_ConvI2L || opc == Op_CastII) {
-    if (scaled_iv_plus_offset(n->in(1))) {
-      NOT_PRODUCT(_tracer.scaled_iv_7(n);)
-      return true;
-    }
-  } else if (opc == Op_LShiftL && n->in(2)->is_Con()) {
-    if (!has_iv()) {
-      // Need to preserve the current _offset value, so
-      // create a temporary object for this expression subtree.
-      // Hacky, so should re-engineer the address pattern match.
-      NOT_PRODUCT(Tracer::Depth dddd;)
-      SWPointer tmp(this);
-      NOT_PRODUCT(_tracer.scaled_iv_8(n, &tmp);)
-
-      if (tmp.scaled_iv_plus_offset(n->in(1))) {
-        int scale = n->in(2)->get_int();
-        _scale   = tmp._scale  << scale;
-        _offset += tmp._offset << scale;
-        if (tmp._invar != nullptr) {
-          BasicType bt = tmp._invar->bottom_type()->basic_type();
-          assert(bt == T_INT || bt == T_LONG, "");
-          maybe_add_to_invar(register_if_new(LShiftNode::make(tmp._invar, n->in(2), bt)), false);
-#ifdef ASSERT
-          _debug_invar_scale = n->in(2);
-#endif
-        }
-        NOT_PRODUCT(_tracer.scaled_iv_9(n, _scale, _offset, _invar);)
-        return true;
-      }
-    }
-  }
-  NOT_PRODUCT(_tracer.scaled_iv_10(n);)
-  return false;
-}
-
-//----------------------------offset_plus_k------------------------
-// Match: offset is (k [+/- invariant])
-// where k maybe zero and invariant is optional, but not both.
-bool SWPointer::offset_plus_k(Node* n, bool negate) {
-  NOT_PRODUCT(Tracer::Depth ddd;)
-  NOT_PRODUCT(_tracer.offset_plus_k_1(n);)
-
-  int opc = n->Opcode();
-  if (opc == Op_ConI) {
-    _offset += negate ? -(n->get_int()) : n->get_int();
-    NOT_PRODUCT(_tracer.offset_plus_k_2(n, _offset);)
-    return true;
-  } else if (opc == Op_ConL) {
-    // Okay if value fits into an int
-    const TypeLong* t = n->find_long_type();
-    if (t->higher_equal(TypeLong::INT)) {
-      jlong loff = n->get_long();
-      jint  off  = (jint)loff;
-      _offset += negate ? -off : loff;
-      NOT_PRODUCT(_tracer.offset_plus_k_3(n, _offset);)
-      return true;
-    }
-    NOT_PRODUCT(_tracer.offset_plus_k_4(n);)
-    return false;
-  }
-  assert((_debug_invar == nullptr) == (_invar == nullptr), "");
-
-  if (_analyze_only && is_loop_member(n)) {
-    _nstack->push(n, _stack_idx++);
-  }
-  if (opc == Op_AddI) {
-    if (n->in(2)->is_Con() && invariant(n->in(1))) {
-      maybe_add_to_invar(n->in(1), negate);
-      _offset += negate ? -(n->in(2)->get_int()) : n->in(2)->get_int();
-      NOT_PRODUCT(_tracer.offset_plus_k_6(n, _invar, negate, _offset);)
-      return true;
-    } else if (n->in(1)->is_Con() && invariant(n->in(2))) {
-      _offset += negate ? -(n->in(1)->get_int()) : n->in(1)->get_int();
-      maybe_add_to_invar(n->in(2), negate);
-      NOT_PRODUCT(_tracer.offset_plus_k_7(n, _invar, negate, _offset);)
-      return true;
-    }
-  }
-  if (opc == Op_SubI) {
-    if (n->in(2)->is_Con() && invariant(n->in(1))) {
-      maybe_add_to_invar(n->in(1), negate);
-      _offset += !negate ? -(n->in(2)->get_int()) : n->in(2)->get_int();
-      NOT_PRODUCT(_tracer.offset_plus_k_8(n, _invar, negate, _offset);)
-      return true;
-    } else if (n->in(1)->is_Con() && invariant(n->in(2))) {
-      _offset += negate ? -(n->in(1)->get_int()) : n->in(1)->get_int();
-      maybe_add_to_invar(n->in(2), !negate);
-      NOT_PRODUCT(_tracer.offset_plus_k_9(n, _invar, !negate, _offset);)
-      return true;
-    }
-  }
-
-  if (!is_loop_member(n)) {
-    // 'n' is loop invariant. Skip ConvI2L and CastII nodes before checking if 'n' is dominating the pre loop.
-    if (opc == Op_ConvI2L) {
-      n = n->in(1);
-    }
-    if (n->Opcode() == Op_CastII) {
-      // Skip CastII nodes
-      assert(!is_loop_member(n), "sanity");
-      n = n->in(1);
-    }
-    // Check if 'n' can really be used as invariant (not in main loop and dominating the pre loop).
-    if (invariant(n)) {
-      maybe_add_to_invar(n, negate);
-      NOT_PRODUCT(_tracer.offset_plus_k_10(n, _invar, negate, _offset);)
-      return true;
-    }
-  }
-
-  NOT_PRODUCT(_tracer.offset_plus_k_11(n);)
-  return false;
-}
-
-Node* SWPointer::maybe_negate_invar(bool negate, Node* invar) {
-#ifdef ASSERT
-  _debug_negate_invar = negate;
-#endif
-  if (negate) {
-    BasicType bt = invar->bottom_type()->basic_type();
-    assert(bt == T_INT || bt == T_LONG, "");
-    PhaseIterGVN& igvn = phase()->igvn();
-    Node* zero = igvn.zerocon(bt);
-    phase()->set_ctrl(zero, phase()->C->root());
-    Node* sub = SubNode::make(zero, invar, bt);
-    invar = register_if_new(sub);
-  }
-  return invar;
-}
-
-Node* SWPointer::register_if_new(Node* n) const {
-  PhaseIterGVN& igvn = phase()->igvn();
-  Node* prev = igvn.hash_find_insert(n);
-  if (prev != nullptr) {
-    n->destruct(&igvn);
-    n = prev;
-  } else {
-    Node* c = phase()->get_early_ctrl(n);
-    phase()->register_new_node(n, c);
-  }
-  return n;
-}
-
-void SWPointer::maybe_add_to_invar(Node* new_invar, bool negate) {
-  new_invar = maybe_negate_invar(negate, new_invar);
-  if (_invar == nullptr) {
-    _invar = new_invar;
-#ifdef ASSERT
-    _debug_invar = new_invar;
-#endif
-    return;
-  }
-#ifdef ASSERT
-  _debug_invar = NodeSentinel;
-#endif
-  BasicType new_invar_bt = new_invar->bottom_type()->basic_type();
-  assert(new_invar_bt == T_INT || new_invar_bt == T_LONG, "");
-  BasicType invar_bt = _invar->bottom_type()->basic_type();
-  assert(invar_bt == T_INT || invar_bt == T_LONG, "");
-
-  BasicType bt = (new_invar_bt == T_LONG || invar_bt == T_LONG) ? T_LONG : T_INT;
-  Node* current_invar = _invar;
-  if (invar_bt != bt) {
-    assert(bt == T_LONG && invar_bt == T_INT, "");
-    assert(new_invar_bt == bt, "");
-    current_invar = register_if_new(new ConvI2LNode(current_invar));
-  } else if (new_invar_bt != bt) {
-    assert(bt == T_LONG && new_invar_bt == T_INT, "");
-    assert(invar_bt == bt, "");
-    new_invar = register_if_new(new ConvI2LNode(new_invar));
-  }
-  Node* add = AddNode::make(current_invar, new_invar, bt);
-  _invar = register_if_new(add);
-}
-
-//----------------------------print------------------------
-void SWPointer::print() {
-#ifndef PRODUCT
-  tty->print("base: [%d]  adr: [%d]  scale: %d  offset: %d",
-             _base != nullptr ? _base->_idx : 0,
-             _adr  != nullptr ? _adr->_idx  : 0,
-             _scale, _offset);
-  if (_invar != nullptr) {
-    tty->print("  invar: [%d]", _invar->_idx);
-  }
-  tty->cr();
-#endif
-}
-
-//----------------------------tracing------------------------
-#ifndef PRODUCT
-void SWPointer::Tracer::print_depth() const {
-  for (int ii = 0; ii < _depth; ++ii) {
-    tty->print("  ");
-  }
-}
-
-void SWPointer::Tracer::ctor_1 (Node* mem) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print(" %d SWPointer::SWPointer: start alignment analysis", mem->_idx); mem->dump();
-  }
-}
-
-void SWPointer::Tracer::ctor_2(Node* adr) {
-  if(_slp->is_trace_alignment()) {
-    //store_depth();
-    inc_depth();
-    print_depth(); tty->print(" %d (adr) SWPointer::SWPointer: ", adr->_idx); adr->dump();
-    inc_depth();
-    print_depth(); tty->print(" %d (base) SWPointer::SWPointer: ", adr->in(AddPNode::Base)->_idx); adr->in(AddPNode::Base)->dump();
-  }
-}
-
-void SWPointer::Tracer::ctor_3(Node* adr, int i) {
-  if(_slp->is_trace_alignment()) {
-    inc_depth();
-    Node* offset = adr->in(AddPNode::Offset);
-    print_depth(); tty->print(" %d (offset) SWPointer::SWPointer: i = %d: ", offset->_idx, i); offset->dump();
-  }
-}
-
-void SWPointer::Tracer::ctor_4(Node* adr, int i) {
-  if(_slp->is_trace_alignment()) {
-    inc_depth();
-    print_depth(); tty->print(" %d (adr) SWPointer::SWPointer: i = %d: ", adr->_idx, i); adr->dump();
-  }
-}
-
-void SWPointer::Tracer::ctor_5(Node* adr, Node* base, int i) {
-  if(_slp->is_trace_alignment()) {
-    inc_depth();
-    if (base == adr) {
-      print_depth(); tty->print_cr("  \\ %d (adr) == %d (base) SWPointer::SWPointer: breaking analysis at i = %d", adr->_idx, base->_idx, i);
-    } else if (!adr->is_AddP()) {
-      print_depth(); tty->print_cr("  \\ %d (adr) is NOT Addp SWPointer::SWPointer: breaking analysis at i = %d", adr->_idx, i);
-    }
-  }
-}
-
-void SWPointer::Tracer::ctor_6(Node* mem) {
-  if(_slp->is_trace_alignment()) {
-    //restore_depth();
-    print_depth(); tty->print_cr(" %d (adr) SWPointer::SWPointer: stop analysis", mem->_idx);
-  }
-}
-
-void SWPointer::Tracer::invariant_1(Node *n, Node *n_c) const {
-  if (_slp->do_vector_loop() && _slp->is_debug() && _slp->_lpt->is_member(_slp->_phase->get_loop(n_c)) != (int)_slp->in_bb(n)) {
-    int is_member =  _slp->_lpt->is_member(_slp->_phase->get_loop(n_c));
-    int in_bb     =  _slp->in_bb(n);
-    print_depth(); tty->print("  \\ ");  tty->print_cr(" %d SWPointer::invariant  conditions differ: n_c %d", n->_idx, n_c->_idx);
-    print_depth(); tty->print("  \\ ");  tty->print_cr("is_member %d, in_bb %d", is_member, in_bb);
-    print_depth(); tty->print("  \\ ");  n->dump();
-    print_depth(); tty->print("  \\ ");  n_c->dump();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_plus_offset_1(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print(" %d SWPointer::scaled_iv_plus_offset testing node: ", n->_idx);
-    n->dump();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_plus_offset_2(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv_plus_offset: PASSED", n->_idx);
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_plus_offset_3(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv_plus_offset: PASSED", n->_idx);
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_plus_offset_4(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv_plus_offset: Op_AddI PASSED", n->_idx);
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv_plus_offset: in(1) is scaled_iv: ", n->in(1)->_idx); n->in(1)->dump();
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv_plus_offset: in(2) is offset_plus_k: ", n->in(2)->_idx); n->in(2)->dump();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_plus_offset_5(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv_plus_offset: Op_AddI PASSED", n->_idx);
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv_plus_offset: in(2) is scaled_iv: ", n->in(2)->_idx); n->in(2)->dump();
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv_plus_offset: in(1) is offset_plus_k: ", n->in(1)->_idx); n->in(1)->dump();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_plus_offset_6(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv_plus_offset: Op_%s PASSED", n->_idx, n->Name());
-    print_depth(); tty->print("  \\  %d SWPointer::scaled_iv_plus_offset: in(1) is scaled_iv: ", n->in(1)->_idx); n->in(1)->dump();
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv_plus_offset: in(2) is offset_plus_k: ", n->in(2)->_idx); n->in(2)->dump();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_plus_offset_7(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv_plus_offset: Op_%s PASSED", n->_idx, n->Name());
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv_plus_offset: in(2) is scaled_iv: ", n->in(2)->_idx); n->in(2)->dump();
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv_plus_offset: in(1) is offset_plus_k: ", n->in(1)->_idx); n->in(1)->dump();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_plus_offset_8(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv_plus_offset: FAILED", n->_idx);
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_1(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print(" %d SWPointer::scaled_iv: testing node: ", n->_idx); n->dump();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_2(Node* n, int scale) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv: FAILED since another _scale has been detected before", n->_idx);
-    print_depth(); tty->print_cr("  \\ SWPointer::scaled_iv: _scale (%d) != 0", scale);
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_3(Node* n, int scale) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv: is iv, setting _scale = %d", n->_idx, scale);
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_4(Node* n, int scale) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv: Op_MulI PASSED, setting _scale = %d", n->_idx, scale);
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv: in(1) is iv: ", n->in(1)->_idx); n->in(1)->dump();
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv: in(2) is Con: ", n->in(2)->_idx); n->in(2)->dump();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_5(Node* n, int scale) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv: Op_MulI PASSED, setting _scale = %d", n->_idx, scale);
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv: in(2) is iv: ", n->in(2)->_idx); n->in(2)->dump();
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv: in(1) is Con: ", n->in(1)->_idx); n->in(1)->dump();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_6(Node* n, int scale) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv: Op_LShiftI PASSED, setting _scale = %d", n->_idx, scale);
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv: in(1) is iv: ", n->in(1)->_idx); n->in(1)->dump();
-    print_depth(); tty->print("  \\ %d SWPointer::scaled_iv: in(2) is Con: ", n->in(2)->_idx); n->in(2)->dump();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_7(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv: Op_ConvI2L PASSED", n->_idx);
-    print_depth(); tty->print_cr("  \\ SWPointer::scaled_iv: in(1) %d is scaled_iv_plus_offset: ", n->in(1)->_idx);
-    inc_depth(); inc_depth();
-    print_depth(); n->in(1)->dump();
-    dec_depth(); dec_depth();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_8(Node* n, SWPointer* tmp) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print(" %d SWPointer::scaled_iv: Op_LShiftL, creating tmp SWPointer: ", n->_idx); tmp->print();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_9(Node* n, int scale, int offset, Node* invar) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv: Op_LShiftL PASSED, setting _scale = %d, _offset = %d", n->_idx, scale, offset);
-    print_depth(); tty->print_cr("  \\ SWPointer::scaled_iv: in(1) [%d] is scaled_iv_plus_offset, in(2) [%d] used to scale: _scale = %d, _offset = %d",
-    n->in(1)->_idx, n->in(2)->_idx, scale, offset);
-    if (invar != nullptr) {
-      print_depth(); tty->print_cr("  \\ SWPointer::scaled_iv: scaled invariant: [%d]", invar->_idx);
-    }
-    inc_depth(); inc_depth();
-    print_depth(); n->in(1)->dump();
-    print_depth(); n->in(2)->dump();
-    if (invar != nullptr) {
-      print_depth(); invar->dump();
-    }
-    dec_depth(); dec_depth();
-  }
-}
-
-void SWPointer::Tracer::scaled_iv_10(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::scaled_iv: FAILED", n->_idx);
-  }
-}
-
-void SWPointer::Tracer::offset_plus_k_1(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print(" %d SWPointer::offset_plus_k: testing node: ", n->_idx); n->dump();
-  }
-}
-
-void SWPointer::Tracer::offset_plus_k_2(Node* n, int _offset) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::offset_plus_k: Op_ConI PASSED, setting _offset = %d", n->_idx, _offset);
-  }
-}
-
-void SWPointer::Tracer::offset_plus_k_3(Node* n, int _offset) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::offset_plus_k: Op_ConL PASSED, setting _offset = %d", n->_idx, _offset);
-  }
-}
-
-void SWPointer::Tracer::offset_plus_k_4(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::offset_plus_k: FAILED", n->_idx);
-    print_depth(); tty->print_cr("  \\ " JLONG_FORMAT " SWPointer::offset_plus_k: Op_ConL FAILED, k is too big", n->get_long());
-  }
-}
-
-void SWPointer::Tracer::offset_plus_k_5(Node* n, Node* _invar) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::offset_plus_k: FAILED since another invariant has been detected before", n->_idx);
-    print_depth(); tty->print("  \\ %d SWPointer::offset_plus_k: _invar is not null: ", _invar->_idx); _invar->dump();
-  }
-}
-
-void SWPointer::Tracer::offset_plus_k_6(Node* n, Node* _invar, bool _negate_invar, int _offset) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::offset_plus_k: Op_AddI PASSED, setting _debug_negate_invar = %d, _invar = %d, _offset = %d",
-    n->_idx, _negate_invar, _invar->_idx, _offset);
-    print_depth(); tty->print("  \\ %d SWPointer::offset_plus_k: in(2) is Con: ", n->in(2)->_idx); n->in(2)->dump();
-    print_depth(); tty->print("  \\ %d SWPointer::offset_plus_k: in(1) is invariant: ", _invar->_idx); _invar->dump();
-  }
-}
-
-void SWPointer::Tracer::offset_plus_k_7(Node* n, Node* _invar, bool _negate_invar, int _offset) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::offset_plus_k: Op_AddI PASSED, setting _debug_negate_invar = %d, _invar = %d, _offset = %d",
-    n->_idx, _negate_invar, _invar->_idx, _offset);
-    print_depth(); tty->print("  \\ %d SWPointer::offset_plus_k: in(1) is Con: ", n->in(1)->_idx); n->in(1)->dump();
-    print_depth(); tty->print("  \\ %d SWPointer::offset_plus_k: in(2) is invariant: ", _invar->_idx); _invar->dump();
-  }
-}
-
-void SWPointer::Tracer::offset_plus_k_8(Node* n, Node* _invar, bool _negate_invar, int _offset) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::offset_plus_k: Op_SubI is PASSED, setting _debug_negate_invar = %d, _invar = %d, _offset = %d",
-    n->_idx, _negate_invar, _invar->_idx, _offset);
-    print_depth(); tty->print("  \\ %d SWPointer::offset_plus_k: in(2) is Con: ", n->in(2)->_idx); n->in(2)->dump();
-    print_depth(); tty->print("  \\ %d SWPointer::offset_plus_k: in(1) is invariant: ", _invar->_idx); _invar->dump();
-  }
-}
-
-void SWPointer::Tracer::offset_plus_k_9(Node* n, Node* _invar, bool _negate_invar, int _offset) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::offset_plus_k: Op_SubI PASSED, setting _debug_negate_invar = %d, _invar = %d, _offset = %d", n->_idx, _negate_invar, _invar->_idx, _offset);
-    print_depth(); tty->print("  \\ %d SWPointer::offset_plus_k: in(1) is Con: ", n->in(1)->_idx); n->in(1)->dump();
-    print_depth(); tty->print("  \\ %d SWPointer::offset_plus_k: in(2) is invariant: ", _invar->_idx); _invar->dump();
-  }
-}
-
-void SWPointer::Tracer::offset_plus_k_10(Node* n, Node* _invar, bool _negate_invar, int _offset) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::offset_plus_k: PASSED, setting _debug_negate_invar = %d, _invar = %d, _offset = %d", n->_idx, _negate_invar, _invar->_idx, _offset);
-    print_depth(); tty->print_cr("  \\ %d SWPointer::offset_plus_k: is invariant", n->_idx);
-  }
-}
-
-void SWPointer::Tracer::offset_plus_k_11(Node* n) {
-  if(_slp->is_trace_alignment()) {
-    print_depth(); tty->print_cr(" %d SWPointer::offset_plus_k: FAILED", n->_idx);
-  }
-}
-
-#endif
 // ========================= OrderedPair =====================
 
 const OrderedPair OrderedPair::initial;
@@ -4659,7 +3967,7 @@ DepSuccs::DepSuccs(Node* n, DepGraph& dg) {
     _next_idx = 0;
     _end_idx  = _n->outcnt();
     _dep_next = dg.dep(_n)->out_head();
-  } else if (_n->is_Mem() || (_n->is_Phi() && _n->bottom_type() == Type::MEMORY)) {
+  } else if (_n->is_Mem() || _n->is_memory_phi()) {
     _next_idx = 0;
     _end_idx  = 0;
     _dep_next = dg.dep(_n)->out_head();
@@ -4692,4 +4000,3 @@ bool SuperWord::same_origin_idx(Node* a, Node* b) const {
 bool SuperWord::same_generation(Node* a, Node* b) const {
   return a != nullptr && b != nullptr && _clone_map.same_gen(a->_idx, b->_idx);
 }
-
diff --git a/src/hotspot/share/opto/superword.hpp b/src/hotspot/share/opto/superword.hpp
index 01a99589ec8..46cce4a9663 100644
--- a/src/hotspot/share/opto/superword.hpp
+++ b/src/hotspot/share/opto/superword.hpp
@@ -24,13 +24,9 @@
 #ifndef SHARE_OPTO_SUPERWORD_HPP
 #define SHARE_OPTO_SUPERWORD_HPP
 
-#include "opto/loopnode.hpp"
-#include "opto/node.hpp"
-#include "opto/phaseX.hpp"
-#include "opto/vectornode.hpp"
+#include "opto/vectorization.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/pair.hpp"
-#include "libadt/dict.hpp"
 
 //
 //                  S U P E R W O R D   T R A N S F O R M
@@ -60,7 +56,7 @@
 // first statement is considered the left element, and the
 // second statement is considered the right element.
 
-class SWPointer;
+class VPointer;
 class OrderedPair;
 
 // ========================= Dependence Graph =====================
@@ -229,49 +225,10 @@ class OrderedPair {
   static const OrderedPair initial;
 };
 
-// -----------------------VectorElementSizeStats-----------------------
-// Vector lane size statistics for loop vectorization with vector masks
-class VectorElementSizeStats {
- private:
-  static const int NO_SIZE = -1;
-  static const int MIXED_SIZE = -2;
-  int* _stats;
-
- public:
-  VectorElementSizeStats(Arena* a) : _stats(NEW_ARENA_ARRAY(a, int, 4)) {
-    memset(_stats, 0, sizeof(int) * 4);
-  }
-
-  void record_size(int size) {
-    assert(1 <= size && size <= 8 && is_power_of_2(size), "Illegal size");
-    _stats[exact_log2(size)]++;
-  }
-
-  int smallest_size() {
-    for (int i = 0; i <= 3; i++) {
-      if (_stats[i] > 0) return (1 << i);
-    }
-    return NO_SIZE;
-  }
-
-  int largest_size() {
-    for (int i = 3; i >= 0; i--) {
-      if (_stats[i] > 0) return (1 << i);
-    }
-    return NO_SIZE;
-  }
-
-  int unique_size() {
-    int small = smallest_size();
-    int large = largest_size();
-    return (small == large) ? small : MIXED_SIZE;
-  }
-};
-
 // -----------------------------SuperWord---------------------------------
 // Transforms scalar operations into packed (superword) operations.
 class SuperWord : public ResourceObj {
- friend class SWPointer;
+ friend class VPointer;
  friend class CMoveKit;
  private:
   PhaseIdealLoop* _phase;
@@ -310,7 +267,7 @@ class SuperWord : public ResourceObj {
 
   void unrolling_analysis(int &local_loop_unroll_factor);
 
-  // Accessors for SWPointer
+  // Accessors for VPointer
   PhaseIdealLoop* phase() const    { return _phase; }
   IdealLoopTree* lpt() const       { return _lpt; }
   PhiNode* iv() const              { return _iv; }
@@ -335,7 +292,6 @@ class SuperWord : public ResourceObj {
  private:
   IdealLoopTree* _lpt;             // Current loop tree node
   CountedLoopNode* _lp;            // Current CountedLoopNode
-  CountedLoopEndNode* _pre_loop_end; // Current CountedLoopEndNode of pre loop
   VectorSet      _loop_reductions; // Reduction nodes in the current loop
   Node*          _bb;              // Current basic block
   PhiNode*       _iv;              // Induction var
@@ -362,25 +318,6 @@ class SuperWord : public ResourceObj {
   }
   int iv_stride() const            { return lp()->stride_con(); }
 
-  CountedLoopNode* pre_loop_head() const {
-    assert(_pre_loop_end != nullptr && _pre_loop_end->loopnode() != nullptr, "should find head from pre loop end");
-    return _pre_loop_end->loopnode();
-  }
-  void set_pre_loop_end(CountedLoopEndNode* pre_loop_end) {
-    assert(pre_loop_end, "must be valid");
-    _pre_loop_end = pre_loop_end;
-  }
-  CountedLoopEndNode* pre_loop_end() const {
-#ifdef ASSERT
-    assert(_lp != nullptr, "sanity");
-    assert(_pre_loop_end != nullptr, "should be set when fetched");
-    Node* found_pre_end = find_pre_loop_end(_lp);
-    assert(_pre_loop_end == found_pre_end && _pre_loop_end == pre_loop_head()->loopexit(),
-           "should find the pre loop end and must be the same result");
-#endif
-    return _pre_loop_end;
-  }
-
   int vector_width(Node* n) {
     BasicType bt = velt_basic_type(n);
     return MIN2(ABS(iv_stride()), Matcher::max_vector_size(bt));
@@ -514,7 +451,7 @@ class SuperWord : public ResourceObj {
   #endif
   // If strict memory alignment is required (vectors_should_be_aligned), then check if
   // mem_ref is aligned with best_align_to_mem_ref.
-  bool mem_ref_has_no_alignment_violation(MemNode* mem_ref, int iv_adjustment, SWPointer &align_to_ref_p,
+  bool mem_ref_has_no_alignment_violation(MemNode* mem_ref, int iv_adjustment, VPointer& align_to_ref_p,
                                           MemNode* best_align_to_mem_ref, int best_iv_adjustment,
                                           Node_List &align_to_refs);
   // Find a memory reference to align the loop induction variable to.
@@ -522,7 +459,7 @@ class SuperWord : public ResourceObj {
   // Calculate loop's iv adjustment for this memory ops.
   int get_iv_adjustment(MemNode* mem);
   // Can the preloop align the reference to position zero in the vector?
-  bool ref_is_alignable(SWPointer& p);
+  bool ref_is_alignable(VPointer& p);
   // Construct dependency graph.
   void dependence_graph();
   // Return a memory slice (node list) in predecessor order starting at "start"
@@ -614,8 +551,6 @@ class SuperWord : public ResourceObj {
   // Adjust pre-loop limit so that in main loop, a load/store reference
   // to align_to_ref will be a position zero in the vector.
   void align_initial_loop_index(MemNode* align_to_ref);
-  // Find pre loop end from main loop.  Returns null if none.
-  CountedLoopEndNode* find_pre_loop_end(CountedLoopNode *cl) const;
   // Is the use of d1 in u1 at the same operand position as d2 in u2?
   bool opnd_positions_match(Node* d1, Node* u1, Node* d2, Node* u2);
   void init();
@@ -629,176 +564,4 @@ class SuperWord : public ResourceObj {
   void packset_sort(int n);
 };
 
-
-
-//------------------------------SWPointer---------------------------
-// Information about an address for dependence checking and vector alignment
-class SWPointer : public ArenaObj {
- protected:
-  MemNode*   _mem;           // My memory reference node
-  SuperWord* _slp;           // SuperWord class
-
-  Node* _base;               // null if unsafe nonheap reference
-  Node* _adr;                // address pointer
-  int   _scale;              // multiplier for iv (in bytes), 0 if no loop iv
-  int   _offset;             // constant offset (in bytes)
-
-  Node* _invar;              // invariant offset (in bytes), null if none
-#ifdef ASSERT
-  Node* _debug_invar;
-  bool  _debug_negate_invar;       // if true then use: (0 - _invar)
-  Node* _debug_invar_scale;        // multiplier for invariant
-#endif
-
-  Node_Stack* _nstack;       // stack used to record a swpointer trace of variants
-  bool        _analyze_only; // Used in loop unrolling only for swpointer trace
-  uint        _stack_idx;    // Used in loop unrolling only for swpointer trace
-
-  PhaseIdealLoop* phase() const { return _slp->phase(); }
-  IdealLoopTree*  lpt() const   { return _slp->lpt(); }
-  PhiNode*        iv() const    { return _slp->iv();  } // Induction var
-
-  bool is_loop_member(Node* n) const;
-  bool invariant(Node* n) const;
-
-  // Match: k*iv + offset
-  bool scaled_iv_plus_offset(Node* n);
-  // Match: k*iv where k is a constant that's not zero
-  bool scaled_iv(Node* n);
-  // Match: offset is (k [+/- invariant])
-  bool offset_plus_k(Node* n, bool negate = false);
-
- public:
-  enum CMP {
-    Less          = 1,
-    Greater       = 2,
-    Equal         = 4,
-    NotEqual      = (Less | Greater),
-    NotComparable = (Less | Greater | Equal)
-  };
-
-  SWPointer(MemNode* mem, SuperWord* slp, Node_Stack *nstack, bool analyze_only);
-  // Following is used to create a temporary object during
-  // the pattern match of an address expression.
-  SWPointer(SWPointer* p);
-
-  bool valid()  { return _adr != nullptr; }
-  bool has_iv() { return _scale != 0; }
-
-  Node* base()             { return _base; }
-  Node* adr()              { return _adr; }
-  MemNode* mem()           { return _mem; }
-  int   scale_in_bytes()   { return _scale; }
-  Node* invar()            { return _invar; }
-  int   offset_in_bytes()  { return _offset; }
-  int   memory_size()      { return _mem->memory_size(); }
-  Node_Stack* node_stack() { return _nstack; }
-
-  // Comparable?
-  bool invar_equals(SWPointer& q) {
-    assert(_debug_invar == NodeSentinel || q._debug_invar == NodeSentinel ||
-           (_invar == q._invar) == (_debug_invar == q._debug_invar &&
-                                    _debug_invar_scale == q._debug_invar_scale &&
-                                    _debug_negate_invar == q._debug_negate_invar), "");
-    return _invar == q._invar;
-  }
-
-  int cmp(SWPointer& q) {
-    if (valid() && q.valid() &&
-        (_adr == q._adr || (_base == _adr && q._base == q._adr)) &&
-        _scale == q._scale   && invar_equals(q)) {
-      bool overlap = q._offset <   _offset +   memory_size() &&
-                       _offset < q._offset + q.memory_size();
-      return overlap ? Equal : (_offset < q._offset ? Less : Greater);
-    } else {
-      return NotComparable;
-    }
-  }
-
-  bool not_equal(SWPointer& q)    { return not_equal(cmp(q)); }
-  bool equal(SWPointer& q)        { return equal(cmp(q)); }
-  bool comparable(SWPointer& q)   { return comparable(cmp(q)); }
-  static bool not_equal(int cmp)  { return cmp <= NotEqual; }
-  static bool equal(int cmp)      { return cmp == Equal; }
-  static bool comparable(int cmp) { return cmp < NotComparable; }
-
-  void print();
-
-#ifndef PRODUCT
-  class Tracer {
-    friend class SuperWord;
-    friend class SWPointer;
-    SuperWord*   _slp;
-    static int   _depth;
-    int _depth_save;
-    void print_depth() const;
-    int  depth() const    { return _depth; }
-    void set_depth(int d) { _depth = d; }
-    void inc_depth()      { _depth++;}
-    void dec_depth()      { if (_depth > 0) _depth--;}
-    void store_depth()    {_depth_save = _depth;}
-    void restore_depth()  {_depth = _depth_save;}
-
-    class Depth {
-      friend class Tracer;
-      friend class SWPointer;
-      friend class SuperWord;
-      Depth()  { ++_depth; }
-      Depth(int x)  { _depth = 0; }
-      ~Depth() { if (_depth > 0) --_depth;}
-    };
-    Tracer (SuperWord* slp) : _slp(slp) {}
-
-    // tracing functions
-    void ctor_1(Node* mem);
-    void ctor_2(Node* adr);
-    void ctor_3(Node* adr, int i);
-    void ctor_4(Node* adr, int i);
-    void ctor_5(Node* adr, Node* base,  int i);
-    void ctor_6(Node* mem);
-
-    void invariant_1(Node *n, Node *n_c) const;
-
-    void scaled_iv_plus_offset_1(Node* n);
-    void scaled_iv_plus_offset_2(Node* n);
-    void scaled_iv_plus_offset_3(Node* n);
-    void scaled_iv_plus_offset_4(Node* n);
-    void scaled_iv_plus_offset_5(Node* n);
-    void scaled_iv_plus_offset_6(Node* n);
-    void scaled_iv_plus_offset_7(Node* n);
-    void scaled_iv_plus_offset_8(Node* n);
-
-    void scaled_iv_1(Node* n);
-    void scaled_iv_2(Node* n, int scale);
-    void scaled_iv_3(Node* n, int scale);
-    void scaled_iv_4(Node* n, int scale);
-    void scaled_iv_5(Node* n, int scale);
-    void scaled_iv_6(Node* n, int scale);
-    void scaled_iv_7(Node* n);
-    void scaled_iv_8(Node* n, SWPointer* tmp);
-    void scaled_iv_9(Node* n, int _scale, int _offset, Node* _invar);
-    void scaled_iv_10(Node* n);
-
-    void offset_plus_k_1(Node* n);
-    void offset_plus_k_2(Node* n, int _offset);
-    void offset_plus_k_3(Node* n, int _offset);
-    void offset_plus_k_4(Node* n);
-    void offset_plus_k_5(Node* n, Node* _invar);
-    void offset_plus_k_6(Node* n, Node* _invar, bool _negate_invar, int _offset);
-    void offset_plus_k_7(Node* n, Node* _invar, bool _negate_invar, int _offset);
-    void offset_plus_k_8(Node* n, Node* _invar, bool _negate_invar, int _offset);
-    void offset_plus_k_9(Node* n, Node* _invar, bool _negate_invar, int _offset);
-    void offset_plus_k_10(Node* n, Node* _invar, bool _negate_invar, int _offset);
-    void offset_plus_k_11(Node* n);
-
-  } _tracer;//TRacer;
-#endif
-
-  Node* maybe_negate_invar(bool negate, Node* invar);
-
-  void maybe_add_to_invar(Node* new_invar, bool negate);
-
-  Node* register_if_new(Node* n) const;
-};
-
 #endif // SHARE_OPTO_SUPERWORD_HPP
diff --git a/src/hotspot/share/opto/vectorization.cpp b/src/hotspot/share/opto/vectorization.cpp
new file mode 100644
index 00000000000..7158f400929
--- /dev/null
+++ b/src/hotspot/share/opto/vectorization.cpp
@@ -0,0 +1,689 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, Arm Limited. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "precompiled.hpp"
+#include "opto/addnode.hpp"
+#include "opto/connode.hpp"
+#include "opto/convertnode.hpp"
+#include "opto/matcher.hpp"
+#include "opto/mulnode.hpp"
+#include "opto/rootnode.hpp"
+#include "opto/vectorization.hpp"
+
+#ifndef PRODUCT
+int VPointer::Tracer::_depth = 0;
+#endif
+
+VPointer::VPointer(MemNode* mem, PhaseIdealLoop* phase, IdealLoopTree* lpt,
+                   Node_Stack* nstack, bool analyze_only) :
+  _mem(mem), _phase(phase), _lpt(lpt),
+  _iv(lpt->_head->as_CountedLoop()->phi()->as_Phi()),
+  _base(nullptr), _adr(nullptr), _scale(0), _offset(0), _invar(nullptr),
+#ifdef ASSERT
+  _debug_invar(nullptr), _debug_negate_invar(false), _debug_invar_scale(nullptr),
+#endif
+  _nstack(nstack), _analyze_only(analyze_only), _stack_idx(0)
+#ifndef PRODUCT
+  , _tracer((phase->C->directive()->VectorizeDebugOption & 2) > 0)
+#endif
+{
+  NOT_PRODUCT(_tracer.ctor_1(mem);)
+
+  Node* adr = mem->in(MemNode::Address);
+  if (!adr->is_AddP()) {
+    assert(!valid(), "too complex");
+    return;
+  }
+  // Match AddP(base, AddP(ptr, k*iv [+ invariant]), constant)
+  Node* base = adr->in(AddPNode::Base);
+  // The base address should be loop invariant
+  if (is_loop_member(base)) {
+    assert(!valid(), "base address is loop variant");
+    return;
+  }
+  // unsafe references require misaligned vector access support
+  if (base->is_top() && !Matcher::misaligned_vectors_ok()) {
+    assert(!valid(), "unsafe access");
+    return;
+  }
+
+  NOT_PRODUCT(if(_tracer._is_trace_alignment) _tracer.store_depth();)
+  NOT_PRODUCT(_tracer.ctor_2(adr);)
+
+  int i;
+  for (i = 0; ; i++) {
+    NOT_PRODUCT(_tracer.ctor_3(adr, i);)
+
+    if (!scaled_iv_plus_offset(adr->in(AddPNode::Offset))) {
+      assert(!valid(), "too complex");
+      return;
+    }
+    adr = adr->in(AddPNode::Address);
+    NOT_PRODUCT(_tracer.ctor_4(adr, i);)
+
+    if (base == adr || !adr->is_AddP()) {
+      NOT_PRODUCT(_tracer.ctor_5(adr, base, i);)
+      break; // stop looking at addp's
+    }
+  }
+  if (is_loop_member(adr)) {
+    assert(!valid(), "adr is loop variant");
+    return;
+  }
+
+  if (!base->is_top() && adr != base) {
+    assert(!valid(), "adr and base differ");
+    return;
+  }
+
+  NOT_PRODUCT(if(_tracer._is_trace_alignment) _tracer.restore_depth();)
+  NOT_PRODUCT(_tracer.ctor_6(mem);)
+
+  _base = base;
+  _adr  = adr;
+  assert(valid(), "Usable");
+}
+
+// Following is used to create a temporary object during
+// the pattern match of an address expression.
+VPointer::VPointer(VPointer* p) :
+  _mem(p->_mem), _phase(p->_phase), _lpt(p->_lpt), _iv(p->_iv),
+  _base(nullptr), _adr(nullptr), _scale(0), _offset(0), _invar(nullptr),
+#ifdef ASSERT
+  _debug_invar(nullptr), _debug_negate_invar(false), _debug_invar_scale(nullptr),
+#endif
+  _nstack(p->_nstack), _analyze_only(p->_analyze_only), _stack_idx(p->_stack_idx)
+#ifndef PRODUCT
+  , _tracer(p->_tracer._is_trace_alignment)
+#endif
+{}
+
+bool VPointer::is_loop_member(Node* n) const {
+  Node* n_c = phase()->get_ctrl(n);
+  return lpt()->is_member(phase()->get_loop(n_c));
+}
+
+bool VPointer::invariant(Node* n) const {
+  NOT_PRODUCT(Tracer::Depth dd;)
+  bool is_not_member = !is_loop_member(n);
+  if (is_not_member) {
+    CountedLoopNode* cl = lpt()->_head->as_CountedLoop();
+    if (cl->is_main_loop()) {
+      // Check that n_c dominates the pre loop head node. If it does not, then
+      // we cannot use n as invariant for the pre loop CountedLoopEndNode check
+      // because n_c is either part of the pre loop or between the pre and the
+      // main loop (Illegal invariant happens when n_c is a CastII node that
+      // prevents data nodes to flow above the main loop).
+      Node* n_c = phase()->get_ctrl(n);
+      return phase()->is_dominator(n_c, cl->pre_loop_head());
+    }
+  }
+  return is_not_member;
+}
+
+// Match: k*iv + offset
+// where: k is a constant that maybe zero, and
+//        offset is (k2 [+/- invariant]) where k2 maybe zero and invariant is optional
+bool VPointer::scaled_iv_plus_offset(Node* n) {
+  NOT_PRODUCT(Tracer::Depth ddd;)
+  NOT_PRODUCT(_tracer.scaled_iv_plus_offset_1(n);)
+
+  if (scaled_iv(n)) {
+    NOT_PRODUCT(_tracer.scaled_iv_plus_offset_2(n);)
+    return true;
+  }
+
+  if (offset_plus_k(n)) {
+    NOT_PRODUCT(_tracer.scaled_iv_plus_offset_3(n);)
+    return true;
+  }
+
+  int opc = n->Opcode();
+  if (opc == Op_AddI) {
+    if (offset_plus_k(n->in(2)) && scaled_iv_plus_offset(n->in(1))) {
+      NOT_PRODUCT(_tracer.scaled_iv_plus_offset_4(n);)
+      return true;
+    }
+    if (offset_plus_k(n->in(1)) && scaled_iv_plus_offset(n->in(2))) {
+      NOT_PRODUCT(_tracer.scaled_iv_plus_offset_5(n);)
+      return true;
+    }
+  } else if (opc == Op_SubI || opc == Op_SubL) {
+    if (offset_plus_k(n->in(2), true) && scaled_iv_plus_offset(n->in(1))) {
+      NOT_PRODUCT(_tracer.scaled_iv_plus_offset_6(n);)
+      return true;
+    }
+    if (offset_plus_k(n->in(1)) && scaled_iv_plus_offset(n->in(2))) {
+      _scale *= -1;
+      NOT_PRODUCT(_tracer.scaled_iv_plus_offset_7(n);)
+      return true;
+    }
+  }
+
+  NOT_PRODUCT(_tracer.scaled_iv_plus_offset_8(n);)
+  return false;
+}
+
+// Match: k*iv where k is a constant that's not zero
+bool VPointer::scaled_iv(Node* n) {
+  NOT_PRODUCT(Tracer::Depth ddd;)
+  NOT_PRODUCT(_tracer.scaled_iv_1(n);)
+
+  if (_scale != 0) { // already found a scale
+    NOT_PRODUCT(_tracer.scaled_iv_2(n, _scale);)
+    return false;
+  }
+
+  if (n == iv()) {
+    _scale = 1;
+    NOT_PRODUCT(_tracer.scaled_iv_3(n, _scale);)
+    return true;
+  }
+  if (_analyze_only && (is_loop_member(n))) {
+    _nstack->push(n, _stack_idx++);
+  }
+
+  int opc = n->Opcode();
+  if (opc == Op_MulI) {
+    if (n->in(1) == iv() && n->in(2)->is_Con()) {
+      _scale = n->in(2)->get_int();
+      NOT_PRODUCT(_tracer.scaled_iv_4(n, _scale);)
+      return true;
+    } else if (n->in(2) == iv() && n->in(1)->is_Con()) {
+      _scale = n->in(1)->get_int();
+      NOT_PRODUCT(_tracer.scaled_iv_5(n, _scale);)
+      return true;
+    }
+  } else if (opc == Op_LShiftI) {
+    if (n->in(1) == iv() && n->in(2)->is_Con()) {
+      _scale = 1 << n->in(2)->get_int();
+      NOT_PRODUCT(_tracer.scaled_iv_6(n, _scale);)
+      return true;
+    }
+  } else if (opc == Op_ConvI2L || opc == Op_CastII) {
+    if (scaled_iv_plus_offset(n->in(1))) {
+      NOT_PRODUCT(_tracer.scaled_iv_7(n);)
+      return true;
+    }
+  } else if (opc == Op_LShiftL && n->in(2)->is_Con()) {
+    if (!has_iv()) {
+      // Need to preserve the current _offset value, so
+      // create a temporary object for this expression subtree.
+      // Hacky, so should re-engineer the address pattern match.
+      NOT_PRODUCT(Tracer::Depth dddd;)
+      VPointer tmp(this);
+      NOT_PRODUCT(_tracer.scaled_iv_8(n, &tmp);)
+
+      if (tmp.scaled_iv_plus_offset(n->in(1))) {
+        int scale = n->in(2)->get_int();
+        _scale   = tmp._scale  << scale;
+        _offset += tmp._offset << scale;
+        if (tmp._invar != nullptr) {
+          BasicType bt = tmp._invar->bottom_type()->basic_type();
+          assert(bt == T_INT || bt == T_LONG, "");
+          maybe_add_to_invar(register_if_new(LShiftNode::make(tmp._invar, n->in(2), bt)), false);
+#ifdef ASSERT
+          _debug_invar_scale = n->in(2);
+#endif
+        }
+        NOT_PRODUCT(_tracer.scaled_iv_9(n, _scale, _offset, _invar);)
+        return true;
+      }
+    }
+  }
+  NOT_PRODUCT(_tracer.scaled_iv_10(n);)
+  return false;
+}
+
+// Match: offset is (k [+/- invariant])
+// where k maybe zero and invariant is optional, but not both.
+bool VPointer::offset_plus_k(Node* n, bool negate) {
+  NOT_PRODUCT(Tracer::Depth ddd;)
+  NOT_PRODUCT(_tracer.offset_plus_k_1(n);)
+
+  int opc = n->Opcode();
+  if (opc == Op_ConI) {
+    _offset += negate ? -(n->get_int()) : n->get_int();
+    NOT_PRODUCT(_tracer.offset_plus_k_2(n, _offset);)
+    return true;
+  } else if (opc == Op_ConL) {
+    // Okay if value fits into an int
+    const TypeLong* t = n->find_long_type();
+    if (t->higher_equal(TypeLong::INT)) {
+      jlong loff = n->get_long();
+      jint  off  = (jint)loff;
+      _offset += negate ? -off : loff;
+      NOT_PRODUCT(_tracer.offset_plus_k_3(n, _offset);)
+      return true;
+    }
+    NOT_PRODUCT(_tracer.offset_plus_k_4(n);)
+    return false;
+  }
+  assert((_debug_invar == nullptr) == (_invar == nullptr), "");
+
+  if (_analyze_only && is_loop_member(n)) {
+    _nstack->push(n, _stack_idx++);
+  }
+  if (opc == Op_AddI) {
+    if (n->in(2)->is_Con() && invariant(n->in(1))) {
+      maybe_add_to_invar(n->in(1), negate);
+      _offset += negate ? -(n->in(2)->get_int()) : n->in(2)->get_int();
+      NOT_PRODUCT(_tracer.offset_plus_k_6(n, _invar, negate, _offset);)
+      return true;
+    } else if (n->in(1)->is_Con() && invariant(n->in(2))) {
+      _offset += negate ? -(n->in(1)->get_int()) : n->in(1)->get_int();
+      maybe_add_to_invar(n->in(2), negate);
+      NOT_PRODUCT(_tracer.offset_plus_k_7(n, _invar, negate, _offset);)
+      return true;
+    }
+  }
+  if (opc == Op_SubI) {
+    if (n->in(2)->is_Con() && invariant(n->in(1))) {
+      maybe_add_to_invar(n->in(1), negate);
+      _offset += !negate ? -(n->in(2)->get_int()) : n->in(2)->get_int();
+      NOT_PRODUCT(_tracer.offset_plus_k_8(n, _invar, negate, _offset);)
+      return true;
+    } else if (n->in(1)->is_Con() && invariant(n->in(2))) {
+      _offset += negate ? -(n->in(1)->get_int()) : n->in(1)->get_int();
+      maybe_add_to_invar(n->in(2), !negate);
+      NOT_PRODUCT(_tracer.offset_plus_k_9(n, _invar, !negate, _offset);)
+      return true;
+    }
+  }
+
+  if (!is_loop_member(n)) {
+    // 'n' is loop invariant. Skip ConvI2L and CastII nodes before checking if 'n' is dominating the pre loop.
+    if (opc == Op_ConvI2L) {
+      n = n->in(1);
+    }
+    if (n->Opcode() == Op_CastII) {
+      // Skip CastII nodes
+      assert(!is_loop_member(n), "sanity");
+      n = n->in(1);
+    }
+    // Check if 'n' can really be used as invariant (not in main loop and dominating the pre loop).
+    if (invariant(n)) {
+      maybe_add_to_invar(n, negate);
+      NOT_PRODUCT(_tracer.offset_plus_k_10(n, _invar, negate, _offset);)
+      return true;
+    }
+  }
+
+  NOT_PRODUCT(_tracer.offset_plus_k_11(n);)
+  return false;
+}
+
+Node* VPointer::maybe_negate_invar(bool negate, Node* invar) {
+#ifdef ASSERT
+  _debug_negate_invar = negate;
+#endif
+  if (negate) {
+    BasicType bt = invar->bottom_type()->basic_type();
+    assert(bt == T_INT || bt == T_LONG, "");
+    PhaseIterGVN& igvn = phase()->igvn();
+    Node* zero = igvn.zerocon(bt);
+    phase()->set_ctrl(zero, phase()->C->root());
+    Node* sub = SubNode::make(zero, invar, bt);
+    invar = register_if_new(sub);
+  }
+  return invar;
+}
+
+Node* VPointer::register_if_new(Node* n) const {
+  PhaseIterGVN& igvn = phase()->igvn();
+  Node* prev = igvn.hash_find_insert(n);
+  if (prev != nullptr) {
+    n->destruct(&igvn);
+    n = prev;
+  } else {
+    Node* c = phase()->get_early_ctrl(n);
+    phase()->register_new_node(n, c);
+  }
+  return n;
+}
+
+void VPointer::maybe_add_to_invar(Node* new_invar, bool negate) {
+  new_invar = maybe_negate_invar(negate, new_invar);
+  if (_invar == nullptr) {
+    _invar = new_invar;
+#ifdef ASSERT
+    _debug_invar = new_invar;
+#endif
+    return;
+  }
+#ifdef ASSERT
+  _debug_invar = NodeSentinel;
+#endif
+  BasicType new_invar_bt = new_invar->bottom_type()->basic_type();
+  assert(new_invar_bt == T_INT || new_invar_bt == T_LONG, "");
+  BasicType invar_bt = _invar->bottom_type()->basic_type();
+  assert(invar_bt == T_INT || invar_bt == T_LONG, "");
+
+  BasicType bt = (new_invar_bt == T_LONG || invar_bt == T_LONG) ? T_LONG : T_INT;
+  Node* current_invar = _invar;
+  if (invar_bt != bt) {
+    assert(bt == T_LONG && invar_bt == T_INT, "");
+    assert(new_invar_bt == bt, "");
+    current_invar = register_if_new(new ConvI2LNode(current_invar));
+  } else if (new_invar_bt != bt) {
+    assert(bt == T_LONG && new_invar_bt == T_INT, "");
+    assert(invar_bt == bt, "");
+    new_invar = register_if_new(new ConvI2LNode(new_invar));
+  }
+  Node* add = AddNode::make(current_invar, new_invar, bt);
+  _invar = register_if_new(add);
+}
+
+// Function for printing the fields of a VPointer
+void VPointer::print() {
+#ifndef PRODUCT
+  tty->print("base: [%d]  adr: [%d]  scale: %d  offset: %d",
+             _base != nullptr ? _base->_idx : 0,
+             _adr  != nullptr ? _adr->_idx  : 0,
+             _scale, _offset);
+  if (_invar != nullptr) {
+    tty->print("  invar: [%d]", _invar->_idx);
+  }
+  tty->cr();
+#endif
+}
+
+// Following are functions for tracing VPointer match
+#ifndef PRODUCT
+void VPointer::Tracer::print_depth() const {
+  for (int ii = 0; ii < _depth; ++ii) {
+    tty->print("  ");
+  }
+}
+
+void VPointer::Tracer::ctor_1(Node* mem) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print(" %d VPointer::VPointer: start alignment analysis", mem->_idx); mem->dump();
+  }
+}
+
+void VPointer::Tracer::ctor_2(Node* adr) {
+  if (_is_trace_alignment) {
+    //store_depth();
+    inc_depth();
+    print_depth(); tty->print(" %d (adr) VPointer::VPointer: ", adr->_idx); adr->dump();
+    inc_depth();
+    print_depth(); tty->print(" %d (base) VPointer::VPointer: ", adr->in(AddPNode::Base)->_idx); adr->in(AddPNode::Base)->dump();
+  }
+}
+
+void VPointer::Tracer::ctor_3(Node* adr, int i) {
+  if (_is_trace_alignment) {
+    inc_depth();
+    Node* offset = adr->in(AddPNode::Offset);
+    print_depth(); tty->print(" %d (offset) VPointer::VPointer: i = %d: ", offset->_idx, i); offset->dump();
+  }
+}
+
+void VPointer::Tracer::ctor_4(Node* adr, int i) {
+  if (_is_trace_alignment) {
+    inc_depth();
+    print_depth(); tty->print(" %d (adr) VPointer::VPointer: i = %d: ", adr->_idx, i); adr->dump();
+  }
+}
+
+void VPointer::Tracer::ctor_5(Node* adr, Node* base, int i) {
+  if (_is_trace_alignment) {
+    inc_depth();
+    if (base == adr) {
+      print_depth(); tty->print_cr("  \\ %d (adr) == %d (base) VPointer::VPointer: breaking analysis at i = %d", adr->_idx, base->_idx, i);
+    } else if (!adr->is_AddP()) {
+      print_depth(); tty->print_cr("  \\ %d (adr) is NOT Addp VPointer::VPointer: breaking analysis at i = %d", adr->_idx, i);
+    }
+  }
+}
+
+void VPointer::Tracer::ctor_6(Node* mem) {
+  if (_is_trace_alignment) {
+    //restore_depth();
+    print_depth(); tty->print_cr(" %d (adr) VPointer::VPointer: stop analysis", mem->_idx);
+  }
+}
+
+void VPointer::Tracer::scaled_iv_plus_offset_1(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print(" %d VPointer::scaled_iv_plus_offset testing node: ", n->_idx);
+    n->dump();
+  }
+}
+
+void VPointer::Tracer::scaled_iv_plus_offset_2(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv_plus_offset: PASSED", n->_idx);
+  }
+}
+
+void VPointer::Tracer::scaled_iv_plus_offset_3(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv_plus_offset: PASSED", n->_idx);
+  }
+}
+
+void VPointer::Tracer::scaled_iv_plus_offset_4(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv_plus_offset: Op_AddI PASSED", n->_idx);
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv_plus_offset: in(1) is scaled_iv: ", n->in(1)->_idx); n->in(1)->dump();
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv_plus_offset: in(2) is offset_plus_k: ", n->in(2)->_idx); n->in(2)->dump();
+  }
+}
+
+void VPointer::Tracer::scaled_iv_plus_offset_5(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv_plus_offset: Op_AddI PASSED", n->_idx);
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv_plus_offset: in(2) is scaled_iv: ", n->in(2)->_idx); n->in(2)->dump();
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv_plus_offset: in(1) is offset_plus_k: ", n->in(1)->_idx); n->in(1)->dump();
+  }
+}
+
+void VPointer::Tracer::scaled_iv_plus_offset_6(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv_plus_offset: Op_%s PASSED", n->_idx, n->Name());
+    print_depth(); tty->print("  \\  %d VPointer::scaled_iv_plus_offset: in(1) is scaled_iv: ", n->in(1)->_idx); n->in(1)->dump();
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv_plus_offset: in(2) is offset_plus_k: ", n->in(2)->_idx); n->in(2)->dump();
+  }
+}
+
+void VPointer::Tracer::scaled_iv_plus_offset_7(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv_plus_offset: Op_%s PASSED", n->_idx, n->Name());
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv_plus_offset: in(2) is scaled_iv: ", n->in(2)->_idx); n->in(2)->dump();
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv_plus_offset: in(1) is offset_plus_k: ", n->in(1)->_idx); n->in(1)->dump();
+  }
+}
+
+void VPointer::Tracer::scaled_iv_plus_offset_8(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv_plus_offset: FAILED", n->_idx);
+  }
+}
+
+void VPointer::Tracer::scaled_iv_1(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print(" %d VPointer::scaled_iv: testing node: ", n->_idx); n->dump();
+  }
+}
+
+void VPointer::Tracer::scaled_iv_2(Node* n, int scale) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv: FAILED since another _scale has been detected before", n->_idx);
+    print_depth(); tty->print_cr("  \\ VPointer::scaled_iv: _scale (%d) != 0", scale);
+  }
+}
+
+void VPointer::Tracer::scaled_iv_3(Node* n, int scale) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv: is iv, setting _scale = %d", n->_idx, scale);
+  }
+}
+
+void VPointer::Tracer::scaled_iv_4(Node* n, int scale) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv: Op_MulI PASSED, setting _scale = %d", n->_idx, scale);
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv: in(1) is iv: ", n->in(1)->_idx); n->in(1)->dump();
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv: in(2) is Con: ", n->in(2)->_idx); n->in(2)->dump();
+  }
+}
+
+void VPointer::Tracer::scaled_iv_5(Node* n, int scale) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv: Op_MulI PASSED, setting _scale = %d", n->_idx, scale);
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv: in(2) is iv: ", n->in(2)->_idx); n->in(2)->dump();
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv: in(1) is Con: ", n->in(1)->_idx); n->in(1)->dump();
+  }
+}
+
+void VPointer::Tracer::scaled_iv_6(Node* n, int scale) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv: Op_LShiftI PASSED, setting _scale = %d", n->_idx, scale);
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv: in(1) is iv: ", n->in(1)->_idx); n->in(1)->dump();
+    print_depth(); tty->print("  \\ %d VPointer::scaled_iv: in(2) is Con: ", n->in(2)->_idx); n->in(2)->dump();
+  }
+}
+
+void VPointer::Tracer::scaled_iv_7(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv: Op_ConvI2L PASSED", n->_idx);
+    print_depth(); tty->print_cr("  \\ VPointer::scaled_iv: in(1) %d is scaled_iv_plus_offset: ", n->in(1)->_idx);
+    inc_depth(); inc_depth();
+    print_depth(); n->in(1)->dump();
+    dec_depth(); dec_depth();
+  }
+}
+
+void VPointer::Tracer::scaled_iv_8(Node* n, VPointer* tmp) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print(" %d VPointer::scaled_iv: Op_LShiftL, creating tmp VPointer: ", n->_idx); tmp->print();
+  }
+}
+
+void VPointer::Tracer::scaled_iv_9(Node* n, int scale, int offset, Node* invar) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv: Op_LShiftL PASSED, setting _scale = %d, _offset = %d", n->_idx, scale, offset);
+    print_depth(); tty->print_cr("  \\ VPointer::scaled_iv: in(1) [%d] is scaled_iv_plus_offset, in(2) [%d] used to scale: _scale = %d, _offset = %d",
+    n->in(1)->_idx, n->in(2)->_idx, scale, offset);
+    if (invar != nullptr) {
+      print_depth(); tty->print_cr("  \\ VPointer::scaled_iv: scaled invariant: [%d]", invar->_idx);
+    }
+    inc_depth(); inc_depth();
+    print_depth(); n->in(1)->dump();
+    print_depth(); n->in(2)->dump();
+    if (invar != nullptr) {
+      print_depth(); invar->dump();
+    }
+    dec_depth(); dec_depth();
+  }
+}
+
+void VPointer::Tracer::scaled_iv_10(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::scaled_iv: FAILED", n->_idx);
+  }
+}
+
+void VPointer::Tracer::offset_plus_k_1(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print(" %d VPointer::offset_plus_k: testing node: ", n->_idx); n->dump();
+  }
+}
+
+void VPointer::Tracer::offset_plus_k_2(Node* n, int _offset) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::offset_plus_k: Op_ConI PASSED, setting _offset = %d", n->_idx, _offset);
+  }
+}
+
+void VPointer::Tracer::offset_plus_k_3(Node* n, int _offset) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::offset_plus_k: Op_ConL PASSED, setting _offset = %d", n->_idx, _offset);
+  }
+}
+
+void VPointer::Tracer::offset_plus_k_4(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::offset_plus_k: FAILED", n->_idx);
+    print_depth(); tty->print_cr("  \\ " JLONG_FORMAT " VPointer::offset_plus_k: Op_ConL FAILED, k is too big", n->get_long());
+  }
+}
+
+void VPointer::Tracer::offset_plus_k_5(Node* n, Node* _invar) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::offset_plus_k: FAILED since another invariant has been detected before", n->_idx);
+    print_depth(); tty->print("  \\ %d VPointer::offset_plus_k: _invar is not null: ", _invar->_idx); _invar->dump();
+  }
+}
+
+void VPointer::Tracer::offset_plus_k_6(Node* n, Node* _invar, bool _negate_invar, int _offset) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::offset_plus_k: Op_AddI PASSED, setting _debug_negate_invar = %d, _invar = %d, _offset = %d",
+    n->_idx, _negate_invar, _invar->_idx, _offset);
+    print_depth(); tty->print("  \\ %d VPointer::offset_plus_k: in(2) is Con: ", n->in(2)->_idx); n->in(2)->dump();
+    print_depth(); tty->print("  \\ %d VPointer::offset_plus_k: in(1) is invariant: ", _invar->_idx); _invar->dump();
+  }
+}
+
+void VPointer::Tracer::offset_plus_k_7(Node* n, Node* _invar, bool _negate_invar, int _offset) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::offset_plus_k: Op_AddI PASSED, setting _debug_negate_invar = %d, _invar = %d, _offset = %d",
+    n->_idx, _negate_invar, _invar->_idx, _offset);
+    print_depth(); tty->print("  \\ %d VPointer::offset_plus_k: in(1) is Con: ", n->in(1)->_idx); n->in(1)->dump();
+    print_depth(); tty->print("  \\ %d VPointer::offset_plus_k: in(2) is invariant: ", _invar->_idx); _invar->dump();
+  }
+}
+
+void VPointer::Tracer::offset_plus_k_8(Node* n, Node* _invar, bool _negate_invar, int _offset) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::offset_plus_k: Op_SubI is PASSED, setting _debug_negate_invar = %d, _invar = %d, _offset = %d",
+    n->_idx, _negate_invar, _invar->_idx, _offset);
+    print_depth(); tty->print("  \\ %d VPointer::offset_plus_k: in(2) is Con: ", n->in(2)->_idx); n->in(2)->dump();
+    print_depth(); tty->print("  \\ %d VPointer::offset_plus_k: in(1) is invariant: ", _invar->_idx); _invar->dump();
+  }
+}
+
+void VPointer::Tracer::offset_plus_k_9(Node* n, Node* _invar, bool _negate_invar, int _offset) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::offset_plus_k: Op_SubI PASSED, setting _debug_negate_invar = %d, _invar = %d, _offset = %d", n->_idx, _negate_invar, _invar->_idx, _offset);
+    print_depth(); tty->print("  \\ %d VPointer::offset_plus_k: in(1) is Con: ", n->in(1)->_idx); n->in(1)->dump();
+    print_depth(); tty->print("  \\ %d VPointer::offset_plus_k: in(2) is invariant: ", _invar->_idx); _invar->dump();
+  }
+}
+
+void VPointer::Tracer::offset_plus_k_10(Node* n, Node* _invar, bool _negate_invar, int _offset) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::offset_plus_k: PASSED, setting _debug_negate_invar = %d, _invar = %d, _offset = %d", n->_idx, _negate_invar, _invar->_idx, _offset);
+    print_depth(); tty->print_cr("  \\ %d VPointer::offset_plus_k: is invariant", n->_idx);
+  }
+}
+
+void VPointer::Tracer::offset_plus_k_11(Node* n) {
+  if (_is_trace_alignment) {
+    print_depth(); tty->print_cr(" %d VPointer::offset_plus_k: FAILED", n->_idx);
+  }
+}
+
+#endif
diff --git a/src/hotspot/share/opto/vectorization.hpp b/src/hotspot/share/opto/vectorization.hpp
new file mode 100644
index 00000000000..f53b8299986
--- /dev/null
+++ b/src/hotspot/share/opto/vectorization.hpp
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, Arm Limited. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#ifndef SHARE_OPTO_VECTORIZATION_HPP
+#define SHARE_OPTO_VECTORIZATION_HPP
+
+#include "opto/node.hpp"
+#include "opto/loopnode.hpp"
+
+// Code in this file and the vectorization.cpp contains shared logics and
+// utilities for C2's loop auto-vectorization.
+
+// A vectorization pointer (VPointer) has information about an address for
+// dependence checking and vector alignment. It's usually bound to a memory
+// operation in a counted loop for vectorizable analysis.
+class VPointer : public ArenaObj {
+ protected:
+  MemNode*        _mem;      // My memory reference node
+  PhaseIdealLoop* _phase;    // PhaseIdealLoop handle
+  IdealLoopTree*  _lpt;      // Current IdealLoopTree
+  PhiNode*        _iv;       // The loop induction variable
+
+  Node* _base;               // null if unsafe nonheap reference
+  Node* _adr;                // address pointer
+  int   _scale;              // multiplier for iv (in bytes), 0 if no loop iv
+  int   _offset;             // constant offset (in bytes)
+
+  Node* _invar;              // invariant offset (in bytes), null if none
+#ifdef ASSERT
+  Node* _debug_invar;
+  bool  _debug_negate_invar; // if true then use: (0 - _invar)
+  Node* _debug_invar_scale;  // multiplier for invariant
+#endif
+
+  Node_Stack* _nstack;       // stack used to record a vpointer trace of variants
+  bool        _analyze_only; // Used in loop unrolling only for vpointer trace
+  uint        _stack_idx;    // Used in loop unrolling only for vpointer trace
+
+  PhaseIdealLoop* phase() const { return _phase; }
+  IdealLoopTree*  lpt() const   { return _lpt; }
+  PhiNode*        iv() const    { return _iv; }
+
+  bool is_loop_member(Node* n) const;
+  bool invariant(Node* n) const;
+
+  // Match: k*iv + offset
+  bool scaled_iv_plus_offset(Node* n);
+  // Match: k*iv where k is a constant that's not zero
+  bool scaled_iv(Node* n);
+  // Match: offset is (k [+/- invariant])
+  bool offset_plus_k(Node* n, bool negate = false);
+
+ public:
+  enum CMP {
+    Less          = 1,
+    Greater       = 2,
+    Equal         = 4,
+    NotEqual      = (Less | Greater),
+    NotComparable = (Less | Greater | Equal)
+  };
+
+  VPointer(MemNode* mem, PhaseIdealLoop* phase, IdealLoopTree* lpt,
+            Node_Stack* nstack, bool analyze_only);
+  // Following is used to create a temporary object during
+  // the pattern match of an address expression.
+  VPointer(VPointer* p);
+
+  bool valid()  { return _adr != nullptr; }
+  bool has_iv() { return _scale != 0; }
+
+  Node* base()             { return _base; }
+  Node* adr()              { return _adr; }
+  MemNode* mem()           { return _mem; }
+  int   scale_in_bytes()   { return _scale; }
+  Node* invar()            { return _invar; }
+  int   offset_in_bytes()  { return _offset; }
+  int   memory_size()      { return _mem->memory_size(); }
+  Node_Stack* node_stack() { return _nstack; }
+
+  // Comparable?
+  bool invar_equals(VPointer& q) {
+    assert(_debug_invar == NodeSentinel || q._debug_invar == NodeSentinel ||
+           (_invar == q._invar) == (_debug_invar == q._debug_invar &&
+                                    _debug_invar_scale == q._debug_invar_scale &&
+                                    _debug_negate_invar == q._debug_negate_invar), "");
+    return _invar == q._invar;
+  }
+
+  int cmp(VPointer& q) {
+    if (valid() && q.valid() &&
+        (_adr == q._adr || (_base == _adr && q._base == q._adr)) &&
+        _scale == q._scale   && invar_equals(q)) {
+      bool overlap = q._offset <   _offset +   memory_size() &&
+                       _offset < q._offset + q.memory_size();
+      return overlap ? Equal : (_offset < q._offset ? Less : Greater);
+    } else {
+      return NotComparable;
+    }
+  }
+
+  bool not_equal(VPointer& q)     { return not_equal(cmp(q)); }
+  bool equal(VPointer& q)         { return equal(cmp(q)); }
+  bool comparable(VPointer& q)    { return comparable(cmp(q)); }
+  static bool not_equal(int cmp)  { return cmp <= NotEqual; }
+  static bool equal(int cmp)      { return cmp == Equal; }
+  static bool comparable(int cmp) { return cmp < NotComparable; }
+
+  void print();
+
+#ifndef PRODUCT
+  class Tracer {
+    friend class VPointer;
+    bool _is_trace_alignment;
+    static int _depth;
+    int _depth_save;
+    void print_depth() const;
+    int  depth() const    { return _depth; }
+    void set_depth(int d) { _depth = d; }
+    void inc_depth()      { _depth++; }
+    void dec_depth()      { if (_depth > 0) _depth--; }
+    void store_depth()    { _depth_save = _depth; }
+    void restore_depth()  { _depth = _depth_save; }
+
+    class Depth {
+      friend class VPointer;
+      Depth()      { ++_depth; }
+      Depth(int x) { _depth = 0; }
+      ~Depth()     { if (_depth > 0) --_depth; }
+    };
+    Tracer(bool is_trace_alignment) : _is_trace_alignment(is_trace_alignment) {}
+
+    // tracing functions
+    void ctor_1(Node* mem);
+    void ctor_2(Node* adr);
+    void ctor_3(Node* adr, int i);
+    void ctor_4(Node* adr, int i);
+    void ctor_5(Node* adr, Node* base,  int i);
+    void ctor_6(Node* mem);
+
+    void scaled_iv_plus_offset_1(Node* n);
+    void scaled_iv_plus_offset_2(Node* n);
+    void scaled_iv_plus_offset_3(Node* n);
+    void scaled_iv_plus_offset_4(Node* n);
+    void scaled_iv_plus_offset_5(Node* n);
+    void scaled_iv_plus_offset_6(Node* n);
+    void scaled_iv_plus_offset_7(Node* n);
+    void scaled_iv_plus_offset_8(Node* n);
+
+    void scaled_iv_1(Node* n);
+    void scaled_iv_2(Node* n, int scale);
+    void scaled_iv_3(Node* n, int scale);
+    void scaled_iv_4(Node* n, int scale);
+    void scaled_iv_5(Node* n, int scale);
+    void scaled_iv_6(Node* n, int scale);
+    void scaled_iv_7(Node* n);
+    void scaled_iv_8(Node* n, VPointer* tmp);
+    void scaled_iv_9(Node* n, int _scale, int _offset, Node* _invar);
+    void scaled_iv_10(Node* n);
+
+    void offset_plus_k_1(Node* n);
+    void offset_plus_k_2(Node* n, int _offset);
+    void offset_plus_k_3(Node* n, int _offset);
+    void offset_plus_k_4(Node* n);
+    void offset_plus_k_5(Node* n, Node* _invar);
+    void offset_plus_k_6(Node* n, Node* _invar, bool _negate_invar, int _offset);
+    void offset_plus_k_7(Node* n, Node* _invar, bool _negate_invar, int _offset);
+    void offset_plus_k_8(Node* n, Node* _invar, bool _negate_invar, int _offset);
+    void offset_plus_k_9(Node* n, Node* _invar, bool _negate_invar, int _offset);
+    void offset_plus_k_10(Node* n, Node* _invar, bool _negate_invar, int _offset);
+    void offset_plus_k_11(Node* n);
+  } _tracer; // Tracer
+#endif
+
+  Node* maybe_negate_invar(bool negate, Node* invar);
+
+  void maybe_add_to_invar(Node* new_invar, bool negate);
+
+  Node* register_if_new(Node* n) const;
+};
+
+
+// Vector element size statistics for loop vectorization with vector masks
+class VectorElementSizeStats {
+ private:
+  static const int NO_SIZE = -1;
+  static const int MIXED_SIZE = -2;
+  int* _stats;
+
+ public:
+  VectorElementSizeStats(Arena* a) : _stats(NEW_ARENA_ARRAY(a, int, 4)) {
+    clear();
+  }
+
+  void clear() { memset(_stats, 0, sizeof(int) * 4); }
+
+  void record_size(int size) {
+    assert(1 <= size && size <= 8 && is_power_of_2(size), "Illegal size");
+    _stats[exact_log2(size)]++;
+  }
+
+  int count_size(int size) {
+    assert(1 <= size && size <= 8 && is_power_of_2(size), "Illegal size");
+    return _stats[exact_log2(size)];
+  }
+
+  int smallest_size() {
+    for (int i = 0; i <= 3; i++) {
+      if (_stats[i] > 0) return (1 << i);
+    }
+    return NO_SIZE;
+  }
+
+  int largest_size() {
+    for (int i = 3; i >= 0; i--) {
+      if (_stats[i] > 0) return (1 << i);
+    }
+    return NO_SIZE;
+  }
+
+  int unique_size() {
+    int small = smallest_size();
+    int large = largest_size();
+    return (small == large) ? small : MIXED_SIZE;
+  }
+};
+
+#endif // SHARE_OPTO_VECTORIZATION_HPP

From 783e44d07ee9dccf46c5df1c604290fd311cdb18 Mon Sep 17 00:00:00 2001
From: Jayathirth D V <jdv@openjdk.org>
Date: Fri, 15 Sep 2023 03:04:28 +0000
Subject: [PATCH 030/112] 8316326: ProblemList
 java/awt/Mouse/EnterExitEvents/DragWindowTest.java on macosx-all again

Reviewed-by: dholmes
---
 test/jdk/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index f369d4fb434..3428cd56b47 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -175,6 +175,7 @@ java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java 8158801 windows-all
 java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java 8158801 windows-all
 java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java 8158801 windows-all
 java/awt/Mixing/NonOpaqueInternalFrame.java 7124549 macosx-all
+java/awt/Mouse/EnterExitEvents/DragWindowTest.java 8298823 macosx-all
 java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java 6829264 generic-all
 java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java 8080982 generic-all
 java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java 8079268 linux-all

From 8dc2d9280e9d100374a6e33b5d32905bc909a52d Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Fri, 15 Sep 2023 05:43:57 +0000
Subject: [PATCH 031/112] 8316190: Improve MemorySegment::toString

Reviewed-by: rriggs
---
 .../foreign/AbstractMemorySegmentImpl.java      |  6 +++++-
 .../classes/jdk/internal/foreign/Utils.java     |  5 +++++
 test/jdk/java/foreign/TestSegments.java         | 17 ++++++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
index fc56785ce07..c2c3ef3da18 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
@@ -505,7 +505,11 @@ public int characteristics() {
 
     @Override
     public String toString() {
-        return "MemorySegment{ heapBase: " + heapBase() + " address: 0x" + Long.toHexString(address()) + " byteSize: " + length + " }";
+        return "MemorySegment{ " +
+                heapBase().map(hb -> "heapBase: " + hb + ", ").orElse("") +
+                "address: " + Utils.toHexString(address()) +
+                ", byteSize: " + length +
+                " }";
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/foreign/Utils.java b/src/java.base/share/classes/jdk/internal/foreign/Utils.java
index ca1a6941530..3e8f012891e 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/Utils.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/Utils.java
@@ -273,4 +273,9 @@ public static <L extends MemoryLayout> L wrapOverflow(Supplier<L> layoutSupplier
     public static boolean containsNullChars(String s) {
         return s.indexOf('\u0000') >= 0;
     }
+
+    public static String toHexString(long value) {
+        return "0x" + Long.toHexString(value);
+    }
+
 }
diff --git a/test/jdk/java/foreign/TestSegments.java b/test/jdk/java/foreign/TestSegments.java
index b2cd0d5557a..f8f5a2b0896 100644
--- a/test/jdk/java/foreign/TestSegments.java
+++ b/test/jdk/java/foreign/TestSegments.java
@@ -225,6 +225,21 @@ public void testIsAccessibleBy(Arena arena, boolean isConfined) {
         assertTrue(segment.isAccessibleBy(new Thread()) != isConfined);
     }
 
+    @Test(dataProvider = "segmentFactories")
+    public void testToString(Supplier<MemorySegment> segmentSupplier) {
+        var segment = segmentSupplier.get();
+        String s = segment.toString();
+        assertTrue(s.startsWith("MemorySegment{"));
+        assertTrue(s.contains("address: 0x"));
+        assertTrue(s.contains("byteSize: "));
+        if (segment.heapBase().isPresent()) {
+            assertTrue(s.contains("heapBase: ["));
+        } else {
+            assertFalse(s.contains("heapBase: "));
+        }
+        assertFalse(s.contains("Optional"));
+    }
+
     @DataProvider(name = "segmentFactories")
     public Object[][] segmentFactories() {
         List<Supplier<MemorySegment>> l = List.of(
@@ -233,7 +248,7 @@ public Object[][] segmentFactories() {
                 () -> MemorySegment.ofArray(new double[] { 1d, 2d, 3d, 4d} ),
                 () -> MemorySegment.ofArray(new float[] { 1.0f, 2.0f, 3.0f, 4.0f }),
                 () -> MemorySegment.ofArray(new int[] { 1, 2, 3, 4 }),
-                () -> MemorySegment.ofArray(new long[] { 1l, 2l, 3l, 4l } ),
+                () -> MemorySegment.ofArray(new long[] { 1L, 2L, 3L, 4L } ),
                 () -> MemorySegment.ofArray(new short[] { 1, 2, 3, 4 } ),
                 () -> Arena.ofAuto().allocate(4L, 1),
                 () -> Arena.ofAuto().allocate(4L, 8),

From 4a63eb05221c1829b157a025a4d35cdd77a9fe04 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Fri, 15 Sep 2023 06:08:27 +0000
Subject: [PATCH 032/112] 8315834: Open source several Swing JSpinner related
 tests

Reviewed-by: psadhukhan, abhiscxk
---
 test/jdk/javax/swing/JSpinner/bug4522737.java |  51 ++++++++
 test/jdk/javax/swing/JSpinner/bug4656590.java | 117 ++++++++++++++++++
 test/jdk/javax/swing/JSpinner/bug4680204.java | 116 +++++++++++++++++
 test/jdk/javax/swing/JSpinner/bug4862257.java |  40 ++++++
 test/jdk/javax/swing/JSpinner/bug5104421.java |  46 +++++++
 5 files changed, 370 insertions(+)
 create mode 100644 test/jdk/javax/swing/JSpinner/bug4522737.java
 create mode 100644 test/jdk/javax/swing/JSpinner/bug4656590.java
 create mode 100644 test/jdk/javax/swing/JSpinner/bug4680204.java
 create mode 100644 test/jdk/javax/swing/JSpinner/bug4862257.java
 create mode 100644 test/jdk/javax/swing/JSpinner/bug5104421.java

diff --git a/test/jdk/javax/swing/JSpinner/bug4522737.java b/test/jdk/javax/swing/JSpinner/bug4522737.java
new file mode 100644
index 00000000000..60ea8d5c10f
--- /dev/null
+++ b/test/jdk/javax/swing/JSpinner/bug4522737.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JComponent;
+import javax.swing.JSpinner;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+
+/*
+ * @test
+ * @bug 4522737
+ * @summary Cannot serialize JSpinner twice.
+ * @run main bug4522737
+ */
+
+public class bug4522737 {
+    public static void main(String[] args) throws Exception {
+        final JComponent originalComponent = new JSpinner();
+
+        ByteArrayOutputStream byteArrayOutputStream =
+                new ByteArrayOutputStream();
+        ObjectOutputStream objectOutputStream =
+                new ObjectOutputStream(byteArrayOutputStream);
+        objectOutputStream.writeObject(originalComponent);
+
+        objectOutputStream = new ObjectOutputStream(byteArrayOutputStream);
+        objectOutputStream.writeObject(originalComponent);
+
+        System.out.println("Test Passed!");
+    }
+}
diff --git a/test/jdk/javax/swing/JSpinner/bug4656590.java b/test/jdk/javax/swing/JSpinner/bug4656590.java
new file mode 100644
index 00000000000..b2cfd3123ee
--- /dev/null
+++ b/test/jdk/javax/swing/JSpinner/bug4656590.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JFormattedTextField;
+import javax.swing.JFrame;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerDateModel;
+import javax.swing.SpinnerListModel;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.SwingUtilities;
+import java.awt.Font;
+import java.awt.GridLayout;
+import java.awt.Robot;
+
+/*
+ * @test
+ * @bug 4656590
+ * @summary JSpinner.setFont() does nothing
+ * @key headful
+ * @run main bug4656590
+ */
+
+public class bug4656590 {
+    private static JSpinner[] spinner = new JSpinner[6];
+    private static Font font = new Font("Arial", Font.BOLD, 24);
+    private static volatile boolean failed = false;
+    private static JFrame frame;
+    private static Robot robot;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame();
+                frame.getContentPane().setLayout(new GridLayout(3, 2));
+                spinner[0] = new JSpinner();
+                spinner[0].setModel(new SpinnerNumberModel());
+                spinner[0].setFont(font);
+                frame.getContentPane().add(spinner[0]);
+
+                spinner[1] = new JSpinner();
+                spinner[1].setModel(new SpinnerDateModel());
+                spinner[1].setFont(font);
+                frame.getContentPane().add(spinner[1]);
+
+                spinner[2] = new JSpinner();
+                spinner[2].setModel(new SpinnerListModel
+                        (new Object[]{"one", "two", "three"}));
+                spinner[2].setFont(font);
+                frame.getContentPane().add(spinner[2]);
+
+                spinner[3] = new JSpinner();
+                spinner[3].setFont(font);
+                spinner[3].setModel(new SpinnerNumberModel());
+                frame.getContentPane().add(spinner[3]);
+
+                spinner[4] = new JSpinner();
+                spinner[4].setFont(font);
+                spinner[4].setModel(new SpinnerDateModel());
+                frame.getContentPane().add(spinner[4]);
+
+                spinner[5] = new JSpinner();
+                spinner[5].setFont(font);
+                spinner[5].setModel(new SpinnerListModel
+                        (new Object[]{"one", "two", "three"}));
+                frame.getContentPane().add(spinner[5]);
+                frame.pack();
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                JFormattedTextField ftf;
+                for (int i = 1; i < 6; i++) {
+                    ftf = ((JSpinner.DefaultEditor)
+                            spinner[i].getEditor()).getTextField();
+                    if (!ftf.getFont().equals(font)) {
+                        failed = true;
+                    }
+                }
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            if (failed) {
+                throw new RuntimeException("JSpinner.setFont() " +
+                        "doesn't set the font properly");
+            }
+            System.out.println("Test Passed!");
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JSpinner/bug4680204.java b/test/jdk/javax/swing/JSpinner/bug4680204.java
new file mode 100644
index 00000000000..ecd923f2a4d
--- /dev/null
+++ b/test/jdk/javax/swing/JSpinner/bug4680204.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JSpinner;
+import javax.swing.JTextField;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.SwingUtilities;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.Robot;
+
+/*
+ * @test
+ * @bug 4680204
+ * @summary JSpinner shows ToolTipText only on it's border
+ * @key headful
+ * @run main bug4680204
+ */
+
+public class bug4680204 {
+
+    private static JSpinner sp1, sp2;
+    private static final String TOOL_TIP_TEXT = "ToolTipText";
+    private static JFrame frame;
+    private static Robot robot;
+    private static volatile boolean failed = false;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame();
+                frame.getContentPane().setLayout(new FlowLayout());
+
+                sp1 = new JSpinner(new SpinnerNumberModel(1, 1, 100, 1));
+                sp1.setToolTipText(TOOL_TIP_TEXT);
+                frame.getContentPane().add(sp1);
+
+                sp2 = new JSpinner();
+                sp2.setToolTipText(TOOL_TIP_TEXT);
+                frame.getContentPane().add(sp2);
+                sp2.setModel(new SpinnerNumberModel(1, 1, 100, 1));
+                frame.setLocationRelativeTo(null);
+                frame.pack();
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                Component[] children = sp1.getComponents();
+                for (int i = 0; i < children.length; i++) {
+                    if (children[i] instanceof JSpinner.DefaultEditor) {
+                        JTextField tf = ((JSpinner.DefaultEditor) children[i]).getTextField();
+                        if (!TOOL_TIP_TEXT.equals(tf.getToolTipText())) {
+                            failed = true;
+                        }
+                    } else if (children[i] instanceof JComponent) {
+                        String text = ((JComponent) children[i]).getToolTipText();
+                        if (!TOOL_TIP_TEXT.equals(text)) {
+                            failed = true;
+                        }
+                    }
+                }
+
+                children = sp2.getComponents();
+                for (int i = 0; i < children.length; i++) {
+                    if (children[i] instanceof JSpinner.DefaultEditor) {
+                        JTextField tf = ((JSpinner.DefaultEditor) children[i]).getTextField();
+                        if (!TOOL_TIP_TEXT.equals(tf.getToolTipText())) {
+                            failed = true;
+                        }
+                    } else if (children[i] instanceof JComponent) {
+                        String text = ((JComponent) children[i]).getToolTipText();
+                        if (!TOOL_TIP_TEXT.equals(text)) {
+                            failed = true;
+                        }
+                    }
+                }
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            if (failed) {
+                throw new RuntimeException("The tooltip text is not correctly set for JSpinner");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+        System.out.println("Test Passed!");
+    }
+}
diff --git a/test/jdk/javax/swing/JSpinner/bug4862257.java b/test/jdk/javax/swing/JSpinner/bug4862257.java
new file mode 100644
index 00000000000..b87b7b359a3
--- /dev/null
+++ b/test/jdk/javax/swing/JSpinner/bug4862257.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JButton;
+import javax.swing.JSpinner;
+
+/*
+ * @test
+ * @bug 4862257
+ * @summary Class cast Exception occurred when JButton is set to JSpinner
+ * @run main bug4862257
+ */
+
+public class bug4862257 {
+    public static void main(String[] argv) {
+        JSpinner spinner = new JSpinner();
+        spinner.setEditor(new JButton("JButton"));
+        System.out.println("Test Passed!");
+    }
+}
diff --git a/test/jdk/javax/swing/JSpinner/bug5104421.java b/test/jdk/javax/swing/JSpinner/bug5104421.java
new file mode 100644
index 00000000000..cad5d8c9e0a
--- /dev/null
+++ b/test/jdk/javax/swing/JSpinner/bug5104421.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.SpinnerDateModel;
+
+/*
+ * @test
+ * @bug 5104421
+ * @summary SpinnerDateModel.setValue(Object) throws exception with incorrect message
+ * @run main bug5104421
+ */
+
+public class bug5104421 {
+    public static void main(String[] args) {
+        SpinnerDateModel model = new SpinnerDateModel();
+        try {
+            model.setValue(Integer.valueOf(42));
+        } catch (IllegalArgumentException e) {
+            if (e.getMessage().toLowerCase().indexOf("null value") != -1) {
+                throw new RuntimeException("SpinnerDateModel.setValue(Object) throws " +
+                        "exception with incorrect message");
+            }
+        }
+        System.out.println("Test Passed!");
+    }
+}

From 0775bf2f0375b1bc63c187399cbc3fdc5a192bce Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 15 Sep 2023 06:18:36 +0000
Subject: [PATCH 033/112] 8316106: Open source few swing JInternalFrame and
 JMenuBar tests

Reviewed-by: kizune, tr
---
 .../swing/JInternalFrame/bug4268949.java      |  63 ++++++++
 .../swing/JInternalFrame/bug4309079.java      | 110 +++++++++++++
 .../swing/JInternalFrame/bug4732229.java      | 151 ++++++++++++++++++
 .../swing/JInternalFrame/bug5009724.java      |  67 ++++++++
 test/jdk/javax/swing/JMenuBar/bug4191374.java |  66 ++++++++
 5 files changed, 457 insertions(+)
 create mode 100644 test/jdk/javax/swing/JInternalFrame/bug4268949.java
 create mode 100644 test/jdk/javax/swing/JInternalFrame/bug4309079.java
 create mode 100644 test/jdk/javax/swing/JInternalFrame/bug4732229.java
 create mode 100644 test/jdk/javax/swing/JInternalFrame/bug5009724.java
 create mode 100644 test/jdk/javax/swing/JMenuBar/bug4191374.java

diff --git a/test/jdk/javax/swing/JInternalFrame/bug4268949.java b/test/jdk/javax/swing/JInternalFrame/bug4268949.java
new file mode 100644
index 00000000000..83a200bbc79
--- /dev/null
+++ b/test/jdk/javax/swing/JInternalFrame/bug4268949.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4268949
+ * @summary Tests if JInternalFrame can do setBackground()
+ * @run main bug4268949
+ */
+
+import java.awt.Color;
+import javax.swing.JInternalFrame;
+import javax.swing.SwingUtilities;
+
+public class bug4268949 {
+
+    static Color c1;
+    static Color c2;
+    static Color c3;
+
+    public static void main(String[] argv) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JInternalFrame if1, if2, if3;
+            if1 = new JInternalFrame("Frame 1");
+            if2 = new JInternalFrame("Frame 2");
+            if3 = new JInternalFrame("Frame 3");
+            if1.setBounds(20, 20, 95, 95);
+            if2.setBounds(120, 20, 95, 95);
+            if3.setBounds(220, 20, 95, 95);
+            if1.setBackground(Color.red);
+            if2.setBackground(Color.blue);
+            if3.setBackground(Color.green);
+            c1 = if1.getContentPane().getBackground();
+            c2 = if2.getContentPane().getBackground();
+            c3 = if3.getContentPane().getBackground();
+        });
+        if (!(c1.equals(Color.red)) || !(c2.equals(Color.blue))
+                || !(c3.equals(Color.green))) {
+            throw new RuntimeException("Test failed: JInternalFrame " +
+                    "cannot do setBackground()");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JInternalFrame/bug4309079.java b/test/jdk/javax/swing/JInternalFrame/bug4309079.java
new file mode 100644
index 00000000000..b87748cc212
--- /dev/null
+++ b/test/jdk/javax/swing/JInternalFrame/bug4309079.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4309079
+ * @summary Tests that when a JInternalFrame is activated,
+            focused JTextField shows cursor.
+ * @key headful
+ * @run main bug4309079
+ */
+
+import java.awt.FlowLayout;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import javax.swing.JFrame;
+import javax.swing.JDesktopPane;
+import javax.swing.JInternalFrame;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+
+public class bug4309079 {
+
+    private static JFrame f;
+    private static JTextField tf;
+    private static JDesktopPane desktop;
+    private static JInternalFrame f1;
+    private static JInternalFrame f2;
+    private static volatile boolean passed = true;
+    private static volatile Point p;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoDelay(100);
+            SwingUtilities.invokeAndWait(() -> {
+                f = new JFrame();
+                f.setSize(500, 300);
+                tf = new JTextField(10);
+                tf.addFocusListener(new FocusListener() {
+                    public void focusGained(FocusEvent e) {
+                        passed = tf.getCaret().isVisible();
+                    }
+                    public void focusLost(FocusEvent e) {
+                    }
+                });
+                tf.requestFocus();
+                f1 = AddFrame(new JTextField(10));
+                f2 = AddFrame(tf);
+                f.getContentPane().add(desktop);
+                f.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(500);
+
+            SwingUtilities.invokeAndWait(() -> {
+                f1.toFront();
+                f2.toFront();
+                p = tf.getLocationOnScreen();
+            });
+            robot.mouseMove(p.x, p.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK );
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK );
+
+            if (!passed) {
+                throw new RuntimeException("Test failed.");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (f != null) {
+                    f.dispose();
+                }
+            });
+        }
+    }
+
+    private static JInternalFrame AddFrame(JTextField tf) {
+        JInternalFrame frame = new JInternalFrame();
+        desktop = new JDesktopPane();
+        desktop.add(frame);
+        frame.getContentPane().setLayout(new FlowLayout());
+        frame.getContentPane().add(tf);
+        frame.setSize(300, 200);
+        frame.setVisible(true);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JInternalFrame/bug4732229.java b/test/jdk/javax/swing/JInternalFrame/bug4732229.java
new file mode 100644
index 00000000000..bf3eefefd43
--- /dev/null
+++ b/test/jdk/javax/swing/JInternalFrame/bug4732229.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4732229
+ * @summary Ctrl+Space, bringing up System menu on a JIF errors using Win LAF
+ * @key headful
+ * @run main bug4732229
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JDesktopPane;
+import javax.swing.JInternalFrame;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import java.awt.Robot;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.KeyEvent;
+
+public class bug4732229 {
+
+    JFrame frame;
+    JDesktopPane desktop;
+    JInternalFrame jif;
+    JTextArea ta;
+    Robot robot;
+    volatile boolean keyTyped = false;
+
+    public static void main(String[] args) throws Exception {
+        bug4732229 b = new bug4732229();
+        b.init();
+    }
+
+    public void init() throws Exception {
+        robot = new Robot();
+        robot.setAutoDelay(100);
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame("bug4732229");
+                desktop = new JDesktopPane();
+                frame.getContentPane().add(desktop);
+
+                ta = new JTextArea();
+                ta.addFocusListener(new FocusAdapter() {
+                    public void focusGained(FocusEvent e) {
+                        synchronized (bug4732229.this) {
+                            keyTyped = true;
+                            bug4732229.this.notifyAll();
+                        }
+                    }
+                });
+                frame.setSize(200, 200);
+                frame.setLocationRelativeTo(null);
+                frame.setVisible(true);
+                jif = new JInternalFrame("Internal Frame", true, false, true,
+                        true);
+                jif.setBounds(10, 10, 100, 100);
+                jif.getContentPane().add(ta);
+                jif.setVisible(true);
+                desktop.add(jif);
+                try {
+                    jif.setSelected(true);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+
+            });
+            synchronized (this) {
+                while (!keyTyped) {
+                    bug4732229.this.wait();
+                }
+            }
+            robot.waitForIdle();
+            robot.delay(200);
+            robot.keyPress(KeyEvent.VK_CONTROL);
+            robot.keyPress(KeyEvent.VK_SPACE);
+            robot.keyRelease(KeyEvent.VK_SPACE);
+            robot.keyRelease(KeyEvent.VK_CONTROL);
+            robot.waitForIdle();
+            robot.delay(200);
+            SwingUtilities.invokeAndWait(() -> {
+                try {
+                    jif.setSelected(false);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+                jif.setVisible(false);
+                desktop.remove(jif);
+                try {
+                    UIManager.setLookAndFeel(
+                            UIManager.getSystemLookAndFeelClassName());
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+                desktop.updateUI();
+
+                jif = new JInternalFrame("Internal Frame", true, false, true,
+                        true);
+                jif.setBounds(10, 10, 100, 100);
+                jif.getContentPane().add(ta);
+                jif.setVisible(true);
+                desktop.add(jif);
+                try {
+                    jif.setSelected(true);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
+            synchronized (this) {
+                while (!keyTyped) {
+                    bug4732229.this.wait();
+                }
+            }
+            robot.keyPress(KeyEvent.VK_CONTROL);
+            robot.keyPress(KeyEvent.VK_SPACE);
+            robot.keyRelease(KeyEvent.VK_SPACE);
+            robot.keyRelease(KeyEvent.VK_CONTROL);
+            robot.waitForIdle();
+            robot.delay(200);
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JInternalFrame/bug5009724.java b/test/jdk/javax/swing/JInternalFrame/bug5009724.java
new file mode 100644
index 00000000000..aab86232a3d
--- /dev/null
+++ b/test/jdk/javax/swing/JInternalFrame/bug5009724.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 5009724
+ * @requires (os.family == "linux")
+ * @summary JInternalFrame not serializable in GTK L&F
+ * @key headful
+ * @run main bug5009724
+ */
+
+import java.awt.event.ActionEvent;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import javax.swing.AbstractAction;
+import javax.swing.JInternalFrame;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+public class bug5009724 {
+
+    public static void main(String []args) throws Exception {
+        UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+        SwingUtilities.invokeAndWait(() -> {
+            JInternalFrame frame = new JInternalFrame();
+            ObjectOutputStream out = null;
+            ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+            try {
+                out = new ObjectOutputStream(byteStream);
+            } catch (IOException e) {
+
+            }
+            if (out != null) {
+                System.out.println("Testing...");
+                try {
+                    out.writeObject(frame);
+                } catch (Exception e) {
+                    System.out.println(e);
+                    throw new RuntimeException("Serialization exception. Test failed.");
+                }
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JMenuBar/bug4191374.java b/test/jdk/javax/swing/JMenuBar/bug4191374.java
new file mode 100644
index 00000000000..eecbfde9cf7
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuBar/bug4191374.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4191374
+ * @summary Verify if JMenuBar.getSubElements returns an array
+            with null values
+ * @run main bug4191374
+ */
+
+import javax.swing.Box;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.MenuElement;
+import javax.swing.SwingUtilities;
+
+public class bug4191374 {
+    static JMenuBar mb;
+    static volatile boolean pass = true;
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            mb = new JMenuBar();
+            newMenu(mb);
+            newMenu(mb);
+            mb.add(Box.createGlue());
+            mb.add(new JMenu("Help"));
+            MenuElement[] me = mb.getSubElements();
+            for (int i = 0; i < me.length; i++) {
+                if (me[i] == null)
+                    pass = false;
+            }
+        });
+        if (!pass) {
+            throw new RuntimeException("Bug 4191374 FAILED");
+        }
+    }
+
+    public static void newMenu(JMenuBar mb) {
+        JMenu m = (JMenu) mb.add(new JMenu("File"));
+        m.add("Menu item");
+        m.add("Menu item");
+        m.add("Menu item");
+    }
+}

From bfbc41c1f177c7a2b8e91351ac41eaffaab2d8fc Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 15 Sep 2023 06:23:20 +0000
Subject: [PATCH 034/112] 8315741: Open source few swing JFormattedTextField
 and JPopupMenu tests

Reviewed-by: kizune, tr
---
 .../swing/JFormattedTextField/bug4741926.java | 134 ++++++++++++++++++
 .../swing/JFormattedTextField/bug4863121.java | 101 +++++++++++++
 .../swing/JFormattedTextField/bug4886538.java |  75 ++++++++++
 .../javax/swing/JPopupMenu/bug4123919.java    |  74 ++++++++++
 .../javax/swing/JPopupMenu/bug4197019.java    | 102 +++++++++++++
 5 files changed, 486 insertions(+)
 create mode 100644 test/jdk/javax/swing/JFormattedTextField/bug4741926.java
 create mode 100644 test/jdk/javax/swing/JFormattedTextField/bug4863121.java
 create mode 100644 test/jdk/javax/swing/JFormattedTextField/bug4886538.java
 create mode 100644 test/jdk/javax/swing/JPopupMenu/bug4123919.java
 create mode 100644 test/jdk/javax/swing/JPopupMenu/bug4197019.java

diff --git a/test/jdk/javax/swing/JFormattedTextField/bug4741926.java b/test/jdk/javax/swing/JFormattedTextField/bug4741926.java
new file mode 100644
index 00000000000..58725e68780
--- /dev/null
+++ b/test/jdk/javax/swing/JFormattedTextField/bug4741926.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4741926
+ * @summary JFormattedTextField/JSpinner always consumes certain key events
+ * @key headful
+ * @run main bug4741926
+ */
+
+import java.awt.Robot;
+import java.awt.event.ActionEvent;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.KeyEvent;
+import java.util.Date;
+import javax.swing.AbstractAction;
+import javax.swing.InputMap;
+import javax.swing.JComponent;
+import javax.swing.JFormattedTextField;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
+
+public class bug4741926 {
+
+    static MyFormattedTextField ftf;
+    static JFrame fr;
+    static Robot robot;
+    static volatile boolean passed_enter = false;
+    static volatile boolean passed_escape = false;
+    static volatile boolean ftfFocused = false;
+    static volatile boolean keyProcessed = false;
+
+    public static void main(String[] args) throws Exception {
+
+        try {
+            robot = new Robot();
+            robot.setAutoDelay(100);
+            SwingUtilities.invokeAndWait(() -> {
+                fr = new JFrame("Test");
+                ftf = new MyFormattedTextField();
+                ftf.setValue("JFormattedTextField");
+                JPanel p = (JPanel) fr.getContentPane();
+                p.add(ftf);
+                ftf.addFocusListener(new FocusAdapter() {
+                    public void focusGained(FocusEvent e) {
+                        ftfFocused = true;
+                    }
+                });
+                InputMap map = p.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
+
+                map.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),
+                        "enter-action");
+                p.getActionMap().put("enter-action", new AbstractAction() {
+                    public void actionPerformed(ActionEvent e) {
+                        passed_enter = true;
+                        keyProcessed = true;
+                    }
+                });
+                map.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
+                        "escape-action");
+                p.getActionMap().put("escape-action", new AbstractAction() {
+                    public void actionPerformed(ActionEvent e) {
+                        passed_escape = true;
+                        keyProcessed = true;
+                    }
+                });
+                fr.pack();
+                fr.setLocationRelativeTo(null);
+                fr.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            test();
+            if (!(passed_enter && passed_escape)) {
+                throw new RuntimeException("JFormattedTextField consume " +
+                        "Enter/Escape key event");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (fr != null) {
+                    fr.dispose();
+                }
+            });
+        }
+    }
+
+    public static void test() throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            ftf.requestFocus();
+        });
+        robot.delay(500);
+        doTest(KeyEvent.VK_ENTER);
+        doTest(KeyEvent.VK_ESCAPE);
+    }
+
+    static void doTest(int keyCode) throws InterruptedException {
+        keyProcessed = false;
+        KeyEvent key = new KeyEvent(ftf, KeyEvent.KEY_PRESSED,
+                                    new Date().getTime(), 0,
+                                    keyCode,
+                                    KeyEvent.CHAR_UNDEFINED);
+        ftf.processKey(key);
+    }
+
+    static class MyFormattedTextField extends JFormattedTextField {
+        public void processKey(KeyEvent e) {
+            processKeyEvent(e);
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JFormattedTextField/bug4863121.java b/test/jdk/javax/swing/JFormattedTextField/bug4863121.java
new file mode 100644
index 00000000000..22e50f087c7
--- /dev/null
+++ b/test/jdk/javax/swing/JFormattedTextField/bug4863121.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4863121
+ * @summary JFormattedTextField's NotifyAction should invoke invalidEdit if
+   commit fails
+ * @key headful
+ * @run main bug4863121
+ */
+
+import java.awt.Robot;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.KeyEvent;
+import java.text.Format;
+import java.text.DecimalFormat;
+import javax.swing.JFormattedTextField;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+public class bug4863121 {
+
+    static TestFormattedTextField ftf;
+    static JFrame fr;
+    static Robot robot;
+
+    private static volatile boolean focused = false;
+    private static volatile boolean passed = false;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            robot = new Robot();
+            robot.setAutoDelay(100);
+            SwingUtilities.invokeAndWait(() -> {
+                fr = new JFrame("Test");
+                ftf = new TestFormattedTextField(new DecimalFormat("####"));
+                ftf.setText("q");
+                fr.getContentPane().add(ftf);
+
+                ftf.addFocusListener(new FocusAdapter() {
+                    public void focusGained(FocusEvent e) {
+                        focused = true;
+                    }
+                });
+                fr.pack();
+                fr.setLocationRelativeTo(null);
+                fr.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                ftf.requestFocus();
+            });
+            robot.waitForIdle();
+            robot.delay(500);
+            robot.keyPress(KeyEvent.VK_ENTER);
+            robot.keyRelease(KeyEvent.VK_ENTER);
+            if (!passed) {
+                throw new RuntimeException("JFormattedTextField's NotifyAction " +
+                        "should invoke invalidEdit if commit fails");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (fr != null) {
+                    fr.dispose();
+                }
+            });
+        }
+    }
+
+    public static class TestFormattedTextField extends JFormattedTextField {
+        public TestFormattedTextField(Format f) {
+            super(f);
+        }
+        protected void invalidEdit() {
+            passed = true;
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JFormattedTextField/bug4886538.java b/test/jdk/javax/swing/JFormattedTextField/bug4886538.java
new file mode 100644
index 00000000000..e50b15e9175
--- /dev/null
+++ b/test/jdk/javax/swing/JFormattedTextField/bug4886538.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4886538
+ * @summary JFormattedTextField not returning correct value (class)
+ * @run main bug4886538
+ */
+
+import javax.swing.JFormattedTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.text.DefaultFormatterFactory;
+
+public class bug4886538 {
+
+    public static void main(String[] args) throws Exception {
+        // test default display formatter
+        TestFormattedTextField field = new TestFormattedTextField(0.0);
+        field.setFormatter(((DefaultFormatterFactory) field.
+                getFormatterFactory()).getDisplayFormatter());
+        field.setText("10");
+        field.commitEdit();
+
+        Object dblValue = field.getValue();
+        if (!(dblValue instanceof Double)) {
+            throw new RuntimeException("The JFormattedTextField's value " +
+                    "should be instanceof Double");
+        }
+
+        // test default editor formatter
+        field = new TestFormattedTextField(0.0);
+        field.setFormatter(((DefaultFormatterFactory) field.
+                getFormatterFactory()).getEditFormatter());
+        field.setText("10");
+        field.commitEdit();
+
+        dblValue = field.getValue();
+        if (!(dblValue instanceof Double)) {
+            throw new RuntimeException("The JFormattedTextField's value " +
+                    "should be instanceof Double");
+        }
+
+    }
+
+    static class TestFormattedTextField extends JFormattedTextField {
+        public TestFormattedTextField(Object value) {
+            super(value);
+        }
+        public void setFormatter(JFormattedTextField.AbstractFormatter formatter) {
+            super.setFormatter(formatter);
+        }
+    }
+
+}
diff --git a/test/jdk/javax/swing/JPopupMenu/bug4123919.java b/test/jdk/javax/swing/JPopupMenu/bug4123919.java
new file mode 100644
index 00000000000..fcc37795b7d
--- /dev/null
+++ b/test/jdk/javax/swing/JPopupMenu/bug4123919.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4123919
+ * @requires (os.family == "windows")
+ * @summary JPopupMenu.isPopupTrigger() under a different L&F.
+ * @key headful
+ * @run main bug4123919
+ */
+
+import javax.swing.JLabel;
+import javax.swing.JPopupMenu;
+import javax.swing.UIManager;
+import javax.swing.SwingUtilities;
+import java.awt.event.MouseEvent;
+import java.util.Date;
+
+public class bug4123919 {
+
+    public static void main(String[] args) throws Exception {
+        JPopupMenu popup = new JPopupMenu("Test");
+        JLabel lb = new JLabel();
+        UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
+        SwingUtilities.updateComponentTreeUI(lb);
+        SwingUtilities.updateComponentTreeUI(popup);
+        if (!popup.isPopupTrigger(new MouseEvent(lb, MouseEvent.MOUSE_PRESSED,
+                (new Date()).getTime(), MouseEvent.BUTTON3_MASK, 10, 10, 1, true))) {
+            throw new RuntimeException("JPopupMenu.isPopupTrigger() fails on" +
+                    " MotifLookAndFeel when mouse pressed...");
+        }
+        if (popup.isPopupTrigger(new MouseEvent(lb, MouseEvent.MOUSE_RELEASED,
+                (new Date()).getTime(), MouseEvent.BUTTON3_MASK, 10, 10, 1, true))) {
+            throw new RuntimeException("JPopupMenu.isPopupTrigger() fails on" +
+                    " MotifLookAndFeel when mouse released...");
+        }
+
+        UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+        SwingUtilities.updateComponentTreeUI(lb);
+        SwingUtilities.updateComponentTreeUI(popup);
+
+        if (popup.isPopupTrigger(new MouseEvent(lb, MouseEvent.MOUSE_PRESSED,
+                (new Date()).getTime(), MouseEvent.BUTTON3_MASK, 10, 10, 1, true))) {
+            throw new RuntimeException("JPopupMenu.isPopupTrigger() fails on" +
+                    " WindowsLookAndFeel when mouse pressed...");
+        }
+        if (!popup.isPopupTrigger(new MouseEvent(lb, MouseEvent.MOUSE_RELEASED,
+                (new Date()).getTime(), MouseEvent.BUTTON3_MASK, 10, 10, 1, true))) {
+            throw new RuntimeException("JPopupMenu.isPopupTrigger() fails on" +
+                    " WindowsLookAndFeel when mouse released...");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JPopupMenu/bug4197019.java b/test/jdk/javax/swing/JPopupMenu/bug4197019.java
new file mode 100644
index 00000000000..428bef49174
--- /dev/null
+++ b/test/jdk/javax/swing/JPopupMenu/bug4197019.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4197019
+ * @key headful
+ * @run main bug4197019
+ */
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Polygon;
+import java.awt.event.ActionEvent;
+
+import javax.swing.Action;
+import javax.swing.AbstractAction;
+import javax.swing.Icon;
+import javax.swing.JMenuItem;
+import javax.swing.JMenu;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+
+public class bug4197019 {
+    static volatile JMenuItem mi1;
+    static volatile JMenuItem mi2;
+    static volatile Icon i2;
+    static volatile boolean isPassed = false;
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JMenu fileMenu = new JMenu("File");
+            JPopupMenu p = new JPopupMenu();
+            Icon i = new ArrowIcon();
+            Action a = new TestAction("Test", i);
+            mi1 = fileMenu.add(a);
+            mi2 = p.add(a);
+
+            i2 = new SquareIcon();
+            a.putValue(Action.SMALL_ICON, i2);
+
+            isPassed = (mi2.getIcon() != i2) || (mi1.getIcon() != i2) ||
+                    (mi1.getIcon() != mi2.getIcon());
+        });
+        if (isPassed) {
+            throw new RuntimeException("Failed bug test 4197019");
+        }
+    }
+
+    private static class TestAction extends AbstractAction {
+        public TestAction(String s, Icon i) {
+            super(s,i);
+        }
+        public void actionPerformed(ActionEvent e) {
+
+        }
+    }
+
+    private static class ArrowIcon implements Icon {
+        public void paintIcon(Component c, Graphics g, int x, int y) {
+            Polygon p = new Polygon();
+            p.addPoint(x, y);
+            p.addPoint(x+getIconWidth(), y+getIconHeight()/2);
+            p.addPoint(x, y+getIconHeight());
+            g.fillPolygon(p);
+
+        }
+        public int getIconWidth() { return 4; }
+        public int getIconHeight() { return 8; }
+    } // End class MenuArrowIcon
+
+    private static class SquareIcon implements Icon {
+        public void paintIcon(Component c, Graphics g, int x, int y) {
+            g.setColor(Color.red);
+            g.fill3DRect(x,y,4,8,true);
+        }
+        public int getIconWidth() { return 8; }
+        public int getIconHeight() { return 8; }
+    } // End class MenuArrowIcon
+
+}

From d575968b4bde74bd557cb84e89f0fa0f96b04087 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 15 Sep 2023 07:14:35 +0000
Subject: [PATCH 035/112] 8316178: Better diagnostic header for CodeBlobs

Reviewed-by: thartmann, kvn
---
 src/hotspot/share/code/codeBlob.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index 18843ad9622..afb807065ab 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -204,7 +204,8 @@ void RuntimeBlob::trace_new_stub(RuntimeBlob* stub, const char* name1, const cha
     if (PrintStubCode) {
       ttyLocker ttyl;
       tty->print_cr("- - - [BEGIN] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -");
-      tty->print_cr("Decoding %s " INTPTR_FORMAT, stub_id, (intptr_t) stub);
+      tty->print_cr("Decoding %s " PTR_FORMAT " [" PTR_FORMAT ", " PTR_FORMAT "] (%d bytes)",
+                    stub_id, p2i(stub), p2i(stub->code_begin()), p2i(stub->code_end()), stub->code_size());
       Disassembler::decode(stub->code_begin(), stub->code_end(), tty
                            NOT_PRODUCT(COMMA &stub->asm_remarks()));
       if ((stub->oop_maps() != nullptr) && AbstractDisassembler::show_structs()) {

From 4070829ae589678578a93b2886e02e04cf0a1b01 Mon Sep 17 00:00:00 2001
From: Gui Cao <gcao@openjdk.org>
Date: Fri, 15 Sep 2023 07:42:23 +0000
Subject: [PATCH 036/112] 8315931: RISC-V: xxxMaxVectorTestsSmokeTest fails
 when using RVV

Reviewed-by: fyang, dzhang
---
 src/hotspot/cpu/riscv/riscv_v.ad | 38 ++++++++++++++++----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index a3e0b50f501..7810c914906 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -2900,11 +2900,9 @@ instruct vmask_gen_I(vRegMask dst, iRegI src) %{
   format %{ "vmask_gen_I $dst, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
-    Assembler::SEW sew = Assembler::elemtype_to_sew(bt);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
-    __ vmclr_m(as_VectorRegister($dst$$reg));
-    __ vsetvli(t0, $src$$Register, sew);
-    __ vmset_m(as_VectorRegister($dst$$reg));
+    __ vid_v(as_VectorRegister($dst$$reg));
+    __ vmsltu_vx(as_VectorRegister($dst$$reg), as_VectorRegister($dst$$reg), $src$$Register);
   %}
   ins_pipe(pipe_slow);
 %}
@@ -2914,26 +2912,30 @@ instruct vmask_gen_L(vRegMask dst, iRegL src) %{
   format %{ "vmask_gen_L $dst, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
-    Assembler::SEW sew = Assembler::elemtype_to_sew(bt);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
-    __ vmclr_m(as_VectorRegister($dst$$reg));
-    __ vsetvli(t0, $src$$Register, sew);
-    __ vmset_m(as_VectorRegister($dst$$reg));
+    __ vid_v(as_VectorRegister($dst$$reg));
+    __ vmsltu_vx(as_VectorRegister($dst$$reg), as_VectorRegister($dst$$reg), $src$$Register);
   %}
   ins_pipe(pipe_slow);
 %}
 
 instruct vmask_gen_imm(vRegMask dst, immL con) %{
+  predicate(n->in(1)->get_long() <= 16 ||
+            n->in(1)->get_long() == Matcher::vector_length(n));
   match(Set dst (VectorMaskGen con));
   format %{ "vmask_gen_imm $dst, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
-    if ($con$$constant != Matcher::vector_length(this)) {
-      __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    if ((uint)($con$$constant) == 0) {
       __ vmclr_m(as_VectorRegister($dst$$reg));
+    } else if ((uint)($con$$constant) == Matcher::vector_length(this)) {
+      __ vmset_m(as_VectorRegister($dst$$reg));
+    } else {
+      assert((uint)($con$$constant) < Matcher::vector_length(this), "unsupported input lane_cnt");
+      __ vid_v(as_VectorRegister($dst$$reg));
+      __ vmsleu_vi(as_VectorRegister($dst$$reg), as_VectorRegister($dst$$reg), (uint)($con$$constant) - 1);
     }
-    __ vsetvli_helper(bt, (uint)($con$$constant));
-    __ vmset_m(as_VectorRegister($dst$$reg));
   %}
   ins_pipe(pipe_slow);
 %}
@@ -3497,18 +3499,16 @@ instruct extractD(fRegD dst, vReg src, immI idx, vReg tmp)
 
 // ------------------------------ Compress/Expand Operations -------------------
 
-instruct mcompress(vRegMask dst, vRegMask src, iRegLNoSp tmp) %{
+instruct mcompress(vRegMask dst, vRegMask src, vReg tmp) %{
   match(Set dst (CompressM src));
-  effect(TEMP_DEF dst, TEMP tmp);
+  effect(TEMP tmp);
   format %{ "mcompress $dst, $src\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
-    Assembler::SEW sew = Assembler::elemtype_to_sew(bt);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
-    __ vmclr_m(as_VectorRegister($dst$$reg));
-    __ vcpop_m($tmp$$Register, as_VectorRegister($src$$reg));
-    __ vsetvli(t0, $tmp$$Register, sew);
-    __ vmset_m(as_VectorRegister($dst$$reg));
+    __ vid_v(as_VectorRegister($tmp$$reg));
+    __ vcpop_m(t0, as_VectorRegister($src$$reg));
+    __ vmsltu_vx(as_VectorRegister($dst$$reg), as_VectorRegister($tmp$$reg), t0);
   %}
   ins_pipe(pipe_slow);
 %}

From 4f864faf428c8171be975a79db5bc2bc145f8805 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Fri, 15 Sep 2023 08:30:18 +0000
Subject: [PATCH 037/112] 8314136: Test
 java/net/httpclient/CancelRequestTest.java failed: WARNING: tracker for
 HttpClientImpl(42) has outstanding operations

Reviewed-by: jpai
---
 .../net/httpclient/CancelRequestTest.java     | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/test/jdk/java/net/httpclient/CancelRequestTest.java b/test/jdk/java/net/httpclient/CancelRequestTest.java
index 32ca1337162..7851b112498 100644
--- a/test/jdk/java/net/httpclient/CancelRequestTest.java
+++ b/test/jdk/java/net/httpclient/CancelRequestTest.java
@@ -35,9 +35,6 @@
  */
 // *                     -Dseed=3582896013206826205L
 // *                     -Dseed=5784221742235559231L
-import com.sun.net.httpserver.HttpServer;
-import com.sun.net.httpserver.HttpsConfigurator;
-import com.sun.net.httpserver.HttpsServer;
 import jdk.internal.net.http.common.OperationTrackers.Tracker;
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
@@ -56,8 +53,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.ref.Reference;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpConnectTimeoutException;
@@ -80,17 +75,15 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
-import jdk.httpclient.test.lib.http2.Http2TestServer;
 
-import static java.lang.System.arraycopy;
 import static java.lang.System.out;
 import static java.lang.System.err;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 public class CancelRequestTest implements HttpServerAdapters {
@@ -179,19 +172,19 @@ void beforeMethod(ITestContext context) {
     }
 
     @AfterClass
-    static final void printFailedTests(ITestContext context) {
+    static void printFailedTests(ITestContext context) {
         out.println("\n=========================");
         var failed = context.getFailedTests().getAllResults().stream()
-                .collect(Collectors.toMap(r -> name(r), ITestResult::getThrowable));
+                .collect(Collectors.toMap(CancelRequestTest::name, ITestResult::getThrowable));
         FAILURES.putAll(failed);
         try {
             out.printf("%n%sCreated %d servers and %d clients%n",
                     now(), serverCount.get(), clientCount.get());
             if (FAILURES.isEmpty()) return;
             out.println("Failed tests: ");
-            FAILURES.entrySet().forEach((e) -> {
-                out.printf("\t%s: %s%n", e.getKey(), e.getValue());
-                e.getValue().printStackTrace(out);
+            FAILURES.forEach((key, value) -> {
+                out.printf("\t%s: %s%n", key, value);
+                value.printStackTrace(out);
             });
             if (tasksFailed) {
                 System.out.println("WARNING: Some tasks failed");
@@ -327,7 +320,7 @@ public void testGetSendAsync(String uri, boolean sameClient, boolean mayInterrup
             out.println("cf2 after cancel: " + cf2);
             try {
                 String body = cf2.get().body();
-                assertEquals(body, Stream.of(BODY.split("\\|")).collect(Collectors.joining()));
+                assertEquals(body, String.join("", BODY.split("\\|")));
                 throw new AssertionError("Expected CancellationException not received");
             } catch (ExecutionException x) {
                 out.println("Got expected exception: " + x);
@@ -348,14 +341,14 @@ public void testGetSendAsync(String uri, boolean sameClient, boolean mayInterrup
             // completed yet - so wait for it here...
             try {
                 String body = response.get().body();
-                assertEquals(body, Stream.of(BODY.split("\\|")).collect(Collectors.joining()));
+                assertEquals(body, String.join("", BODY.split("\\|")));
                 if (mayInterruptIfRunning) {
                     // well actually - this could happen... In which case we'll need to
                     // increase the latency in the server handler...
                     throw new AssertionError("Expected Exception not received");
                 }
             } catch (ExecutionException x) {
-                assertEquals(response.isDone(), true);
+                assertTrue(response.isDone());
                 Throwable wrapped = x.getCause();
                 Throwable cause = wrapped;
                 if (mayInterruptIfRunning) {
@@ -383,11 +376,11 @@ public void testGetSendAsync(String uri, boolean sameClient, boolean mayInterrup
                 }
             }
 
-            assertEquals(response.isDone(), true);
-            assertEquals(response.isCancelled(), false);
+            assertTrue(response.isDone());
+            assertFalse(response.isCancelled());
             assertEquals(cf1.isCancelled(), hasCancellationException);
-            assertEquals(cf2.isDone(), true);
-            assertEquals(cf2.isCancelled(), false);
+            assertTrue(cf2.isDone());
+            assertFalse(cf2.isCancelled());
             assertEquals(latch.getCount(), 0);
 
             var error = TRACKER.check(tracker, 1000,
@@ -397,6 +390,8 @@ public void testGetSendAsync(String uri, boolean sameClient, boolean mayInterrup
             Reference.reachabilityFence(client);
             if (error != null) throw error;
         }
+        assert client != null;
+        if (!sameClient) client.close();
     }
 
     @Test(dataProvider = "asyncurls")
@@ -413,7 +408,7 @@ public void testPostSendAsync(String uri, boolean sameClient, boolean mayInterru
 
             CompletableFuture<CompletableFuture<?>> cancelFuture = new CompletableFuture<>();
 
-            Iterable<byte[]> iterable = new Iterable<byte[]>() {
+            Iterable<byte[]> iterable = new Iterable<>() {
                 @Override
                 public Iterator<byte[]> iterator() {
                     // this is dangerous
@@ -448,7 +443,7 @@ public Iterator<byte[]> iterator() {
             out.println("cf2 after cancel: " + cf2);
             try {
                 String body = cf2.get().body();
-                assertEquals(body, Stream.of(BODY.split("\\|")).collect(Collectors.joining()));
+                assertEquals(body, String.join("", BODY.split("\\|")));
                 throw new AssertionError("Expected CancellationException not received");
             } catch (ExecutionException x) {
                 out.println("Got expected exception: " + x);
@@ -469,14 +464,14 @@ public Iterator<byte[]> iterator() {
             // completed yet - so wait for it here...
             try {
                 String body = response.get().body();
-                assertEquals(body, Stream.of(BODY.split("\\|")).collect(Collectors.joining()));
+                assertEquals(body, String.join("", BODY.split("\\|")));
                 if (mayInterruptIfRunning) {
                     // well actually - this could happen... In which case we'll need to
                     // increase the latency in the server handler...
                     throw new AssertionError("Expected Exception not received");
                 }
             } catch (ExecutionException x) {
-                assertEquals(response.isDone(), true);
+                assertTrue(response.isDone());
                 Throwable wrapped = x.getCause();
                 assertTrue(CancellationException.class.isAssignableFrom(wrapped.getClass()));
                 Throwable cause = wrapped.getCause();
@@ -495,11 +490,11 @@ public Iterator<byte[]> iterator() {
                 }
             }
 
-            assertEquals(response.isDone(), true);
-            assertEquals(response.isCancelled(), false);
+            assertTrue(response.isDone());
+            assertFalse(response.isCancelled());
             assertEquals(cf1.isCancelled(), hasCancellationException);
-            assertEquals(cf2.isDone(), true);
-            assertEquals(cf2.isCancelled(), false);
+            assertTrue(cf2.isDone());
+            assertFalse(cf2.isCancelled());
             assertEquals(latch.getCount(), 0);
 
             var error = TRACKER.check(tracker, 1000,
@@ -509,6 +504,8 @@ public Iterator<byte[]> iterator() {
             Reference.reachabilityFence(client);
             if (error != null) throw error;
         }
+        assert client != null;
+        if (!sameClient) client.close();
     }
 
     @Test(dataProvider = "urls")
@@ -572,17 +569,19 @@ public void testPostInterrupt(String uri, boolean sameClient)
             } else {
                 assert failed == null;
                 out.println(uriStr + ": got body: " + body);
-                assertEquals(body, Stream.of(BODY.split("\\|")).collect(Collectors.joining()));
+                assertEquals(body, String.join("", BODY.split("\\|")));
             }
             out.println("next iteration");
 
-            var error = TRACKER.check(tracker, 1000,
+            var error = TRACKER.check(tracker, 2000,
                     (t) -> t.getOutstandingOperations() > 0 || t.getOutstandingSubscribers() > 0,
                     "subscribers for testPostInterrupt(%s)\n\t step [%s]".formatted(req.uri(), i),
                     false);
             Reference.reachabilityFence(client);
             if (error != null) throw error;
         }
+        assert client != null;
+        if (!sameClient) client.close();
     }
 
 

From 86dde5e02b170c60e18930b66e05f0f3dd482e29 Mon Sep 17 00:00:00 2001
From: Leo Korinth <lkorinth@openjdk.org>
Date: Fri, 15 Sep 2023 08:59:48 +0000
Subject: [PATCH 038/112] 8316001: GC: Make TestArrayAllocatorMallocLimit use
 createTestJvm

Reviewed-by: ayang, tschatzl
---
 .../jtreg/gc/arguments/TestArrayAllocatorMallocLimit.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/gc/arguments/TestArrayAllocatorMallocLimit.java b/test/hotspot/jtreg/gc/arguments/TestArrayAllocatorMallocLimit.java
index 163be84db03..80f0ec4f0cc 100644
--- a/test/hotspot/jtreg/gc/arguments/TestArrayAllocatorMallocLimit.java
+++ b/test/hotspot/jtreg/gc/arguments/TestArrayAllocatorMallocLimit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@ public static void main(String [] args) throws Exception {
   private static final String printFlagsFinalPattern = " *size_t *" + flagName + " *:?= *(\\d+) *\\{experimental\\} *";
 
   public static void testDefaultValue()  throws Exception {
-    ProcessBuilder pb = GCArguments.createJavaProcessBuilder(
+    ProcessBuilder pb = GCArguments.createTestJvm(
       "-XX:+UnlockExperimentalVMOptions", "-XX:+PrintFlagsFinal", "-version");
 
     OutputAnalyzer output = new OutputAnalyzer(pb.start());

From 25f32f353830fddd4883f0fd191303b9dd9898c7 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Fri, 15 Sep 2023 09:09:21 +0000
Subject: [PATCH 039/112] 8316160: Remove
 sun.misc.Unsafe.{shouldBeInitialized,ensureClassInitialized}

Reviewed-by: rriggs, mchung, jpai
---
 .../share/classes/sun/misc/Unsafe.java        | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java b/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java
index a90b6d8b95b..419a59bf67c 100644
--- a/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java
+++ b/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java
@@ -727,42 +727,6 @@ public Object staticFieldBase(Field f) {
         return theInternalUnsafe.staticFieldBase(f);
     }
 
-    /**
-     * Detects if the given class may need to be initialized. This is often
-     * needed in conjunction with obtaining the static field base of a
-     * class.
-     *
-     * @deprecated No replacement API for this method.  As multiple threads
-     * may be trying to initialize the same class or interface at the same time.
-     * The only reliable result returned by this method is {@code false}
-     * indicating that the given class has been initialized.  Instead, simply
-     * call {@link java.lang.invoke.MethodHandles.Lookup#ensureInitialized(Class)}
-     * that does nothing if the given class has already been initialized.
-     * This method is subject to removal in a future version of JDK.
-     *
-     * @return false only if a call to {@code ensureClassInitialized} would have no effect
-     *
-     */
-    @Deprecated(since = "15", forRemoval = true)
-    @ForceInline
-    public boolean shouldBeInitialized(Class<?> c) {
-        return theInternalUnsafe.shouldBeInitialized(c);
-    }
-
-    /**
-     * Ensures the given class has been initialized. This is often
-     * needed in conjunction with obtaining the static field base of a
-     * class.
-     *
-     * @deprecated Use the {@link java.lang.invoke.MethodHandles.Lookup#ensureInitialized(Class)}
-     * method instead.  This method is subject to removal in a future version of JDK.
-     */
-    @Deprecated(since = "15", forRemoval = true)
-    @ForceInline
-    public void ensureClassInitialized(Class<?> c) {
-        theInternalUnsafe.ensureClassInitialized(c);
-    }
-
     /**
      * Reports the offset of the first element in the storage allocation of a
      * given array class.  If {@link #arrayIndexScale} returns a non-zero value

From 89cb290bb0b3947126d836789f0f68a6b98215cd Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Fri, 15 Sep 2023 09:18:28 +0000
Subject: [PATCH 040/112] 8312165: Fix typos in java.desktop Swing

Co-authored-by: Alexey Ivanov <aivanov@openjdk.org>
Reviewed-by: aivanov
---
 .../com/apple/laf/AquaFileChooserUI.java      |  8 ++++----
 .../java/swing/plaf/gtk/GTKFileChooserUI.java |  8 ++++----
 .../com/sun/java/swing/plaf/gtk/GTKStyle.java | 12 +++++------
 .../swing/plaf/motif/MotifDesktopPaneUI.java  |  4 ++--
 .../swing/plaf/motif/MotifFileChooserUI.java  |  8 ++++----
 .../swing/plaf/motif/MotifLookAndFeel.java    |  4 ++--
 .../swing/plaf/motif/MotifOptionPaneUI.java   |  4 ++--
 .../swing/BufferStrategyPaintManager.java     | 16 +++++++--------
 .../classes/javax/swing/FocusManager.java     |  4 ++--
 .../classes/javax/swing/GroupLayout.java      |  4 ++--
 .../share/classes/javax/swing/JComponent.java | 12 +++++------
 .../classes/javax/swing/JEditorPane.java      |  8 ++++----
 .../classes/javax/swing/JFileChooser.java     |  4 ++--
 .../classes/javax/swing/JLayeredPane.java     |  8 ++++----
 .../share/classes/javax/swing/JList.java      |  4 ++--
 .../share/classes/javax/swing/JMenu.java      |  4 ++--
 .../share/classes/javax/swing/JMenuItem.java  |  8 ++++----
 .../share/classes/javax/swing/JPopupMenu.java |  4 ++--
 .../share/classes/javax/swing/JSlider.java    |  8 ++++----
 .../share/classes/javax/swing/JSplitPane.java |  4 ++--
 .../share/classes/javax/swing/JTable.java     |  6 +++---
 .../share/classes/javax/swing/JTree.java      |  6 +++---
 .../classes/javax/swing/PopupFactory.java     |  4 ++--
 .../classes/javax/swing/ProgressMonitor.java  |  6 +++---
 .../classes/javax/swing/RepaintManager.java   |  4 ++--
 .../swing/SortingFocusTraversalPolicy.java    |  6 +++---
 .../classes/javax/swing/SpinnerListModel.java |  4 ++--
 .../classes/javax/swing/SwingWorker.java      |  4 ++--
 .../classes/javax/swing/ToolTipManager.java   |  4 ++--
 .../share/classes/javax/swing/UIDefaults.java |  6 +++---
 .../swing/event/InternalFrameListener.java    | 16 +++++++--------
 .../javax/swing/event/TreeModelEvent.java     |  4 ++--
 .../javax/swing/event/TreeSelectionEvent.java |  4 ++--
 .../javax/swing/plaf/BorderUIResource.java    |  4 ++--
 .../javax/swing/plaf/basic/BasicBorders.java  |  4 ++--
 .../plaf/basic/BasicInternalFrameUI.java      |  6 +++---
 .../javax/swing/plaf/basic/BasicListUI.java   |  8 ++++----
 .../swing/plaf/basic/BasicLookAndFeel.java    |  2 +-
 .../swing/plaf/basic/BasicPopupMenuUI.java    |  6 +++---
 .../swing/plaf/basic/BasicProgressBarUI.java  |  6 +++---
 .../swing/plaf/basic/BasicScrollPaneUI.java   |  4 ++--
 .../plaf/basic/BasicSplitPaneDivider.java     |  6 +++---
 .../swing/plaf/basic/BasicTabbedPaneUI.java   |  4 ++--
 .../javax/swing/plaf/basic/BasicTableUI.java  |  4 ++--
 .../swing/plaf/basic/BasicToolTipUI.java      |  4 ++--
 .../javax/swing/plaf/basic/BasicTreeUI.java   |  6 +++---
 .../swing/plaf/metal/DefaultMetalTheme.java   | 10 +++++-----
 .../swing/plaf/metal/MetalCheckBoxUI.java     |  4 ++--
 .../swing/plaf/metal/MetalComboBoxUI.java     | 14 ++++++-------
 .../swing/plaf/metal/MetalDesktopIconUI.java  |  4 ++--
 .../swing/plaf/metal/MetalFileChooserUI.java  |  6 +++---
 .../plaf/metal/MetalSplitPaneDivider.java     |  4 ++--
 .../swing/plaf/metal/MetalToggleButtonUI.java |  6 +++---
 .../plaf/nimbus/AbstractRegionPainter.java    |  6 +++---
 .../swing/plaf/nimbus/DropShadowEffect.java   | 10 ++++------
 .../javax/swing/plaf/nimbus/Effect.java       | 16 ++++++++++-----
 .../javax/swing/plaf/nimbus/ImageCache.java   |  4 ++--
 .../swing/plaf/nimbus/InnerShadowEffect.java  | 20 +++++++++----------
 .../swing/plaf/nimbus/NimbusLookAndFeel.java  |  2 +-
 .../swing/plaf/synth/SynthArrowButton.java    |  4 ++--
 .../swing/plaf/synth/SynthGraphicsUtils.java  |  6 +++---
 .../javax/swing/plaf/synth/SynthParser.java   |  4 ++--
 .../swing/plaf/synth/SynthProgressBarUI.java  |  6 +++---
 .../swing/plaf/synth/SynthScrollBarUI.java    |  4 ++--
 .../javax/swing/plaf/synth/SynthSliderUI.java |  4 ++--
 .../javax/swing/text/AbstractDocument.java    |  4 ++--
 .../javax/swing/text/AbstractWriter.java      |  4 ++--
 .../javax/swing/text/CompositeView.java       |  4 ++--
 .../javax/swing/text/DefaultCaret.java        | 10 +++++-----
 .../javax/swing/text/DefaultEditorKit.java    |  4 ++--
 .../javax/swing/text/DefaultFormatter.java    |  6 +++---
 .../swing/text/DefaultStyledDocument.java     |  4 ++--
 .../classes/javax/swing/text/Document.java    |  4 ++--
 .../classes/javax/swing/text/GapContent.java  |  6 +++---
 .../classes/javax/swing/text/GlyphView.java   |  4 ++--
 .../swing/text/InternationalFormatter.java    |  4 ++--
 .../javax/swing/text/JTextComponent.java      |  4 ++--
 .../javax/swing/text/StringContent.java       |  4 ++--
 .../javax/swing/text/StyleContext.java        |  8 ++++----
 .../javax/swing/text/StyledEditorKit.java     |  4 ++--
 .../classes/javax/swing/text/Utilities.java   |  8 ++++----
 .../javax/swing/text/html/AccessibleHTML.java |  2 +-
 .../javax/swing/text/html/HTMLDocument.java   |  4 ++--
 .../javax/swing/text/html/ImageView.java      |  4 ++--
 .../classes/javax/swing/text/html/Map.java    |  4 ++--
 .../javax/swing/text/html/parser/Parser.java  |  4 ++--
 .../javax/swing/tree/DefaultTreeModel.java    |  6 +++---
 .../classes/javax/swing/tree/TreeNode.java    |  4 ++--
 .../javax/swing/tree/TreeSelectionModel.java  |  4 ++--
 .../sun/swing/AccumulativeRunnable.java       |  4 ++--
 .../classes/sun/swing/DefaultLookup.java      |  4 ++--
 .../share/classes/sun/swing/FilePane.java     |  4 ++--
 .../classes/sun/swing/LightweightContent.java |  4 ++--
 .../classes/sun/swing/PrintingStatus.java     |  6 +++---
 .../classes/sun/swing/SwingUtilities2.java    | 12 +++++------
 .../classes/sun/swing/icon/SortArrowIcon.java |  6 +++---
 .../sun/swing/plaf/DesktopProperty.java       |  4 ++--
 .../swing/plaf/synth/DefaultSynthStyle.java   |  4 ++--
 .../plaf/synth/SynthFileChooserUIImpl.java    | 10 +++++-----
 .../swing/text/TextComponentPrintable.java    |  2 +-
 .../swing/plaf/windows/WindowsCheckBoxUI.java |  6 +++---
 .../plaf/windows/WindowsDesktopProperty.java  |  4 ++--
 .../plaf/windows/WindowsFileChooserUI.java    | 10 +++++-----
 .../plaf/windows/WindowsLookAndFeel.java      |  4 ++--
 .../plaf/windows/WindowsPopupWindow.java      |  4 ++--
 .../sun/java/swing/plaf/windows/XPStyle.java  |  6 +++---
 106 files changed, 309 insertions(+), 307 deletions(-)

diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
index 91fb2bb8333..0a843f3fa71 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
@@ -1259,7 +1259,7 @@ public Component getListCellRendererComponent(final JList<? extends File> list,
     }
 
     //
-    // DataModel for DirectoryComboxbox
+    // DataModel for DirectoryCombobox
     //
     protected DirectoryComboBoxModel createDirectoryComboBoxModel(final JFileChooser fc) {
         return new DirectoryComboBoxModel();
@@ -1368,7 +1368,7 @@ public Component getListCellRendererComponent(final JList<? extends FileFilter>
     }
 
     //
-    // DataModel for Types Comboxbox
+    // DataModel for Types Combobox
     //
     protected FilterComboBoxModel createFilterComboBoxModel() {
         return new FilterComboBoxModel();
@@ -1412,9 +1412,9 @@ private boolean isSelectedFileFilterInModel(Object filter) {
 
         public Object getSelectedItem() {
             // Ensure that the current filter is in the list.
-            // NOTE: we shouldnt' have to do this, since JFileChooser adds
+            // NOTE: we shouldn't have to do this, since JFileChooser adds
             // the filter to the choosable filters list when the filter
-            // is set. Lets be paranoid just in case someone overrides
+            // is set. Let's be paranoid just in case someone overrides
             // setFileFilter in JFileChooser.
             FileFilter currentFilter = getFileChooser().getFileFilter();
             boolean found = false;
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java
index 6a2564b49bc..8f1759f44e9 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1179,7 +1179,7 @@ public Action getNewFolderAction() {
     }
 
     //
-    // DataModel for DirectoryComboxbox
+    // DataModel for DirectoryCombobox
     //
     protected DirectoryComboBoxModel createDirectoryComboBoxModel(JFileChooser fc) {
         return new DirectoryComboBoxModel();
@@ -1468,9 +1468,9 @@ public void setSelectedItem(Object filter) {
 
         public Object getSelectedItem() {
             // Ensure that the current filter is in the list.
-            // NOTE: we shouldnt' have to do this, since JFileChooser adds
+            // NOTE: we shouldn't have to do this, since JFileChooser adds
             // the filter to the choosable filters list when the filter
-            // is set. Lets be paranoid just in case someone overrides
+            // is set. Let's be paranoid just in case someone overrides
             // setFileFilter in JFileChooser.
             FileFilter currentFilter = getFileChooser().getFileFilter();
             boolean found = false;
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
index 9f1b468007f..48bf95e16e7 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -775,10 +775,10 @@ public Object get(SynthContext context, Object key) {
             Object value = getClassSpecificValue(classKey);
             if (value != null) {
                 //This is a workaround as the "slider-length" property has been
-                //deprecated for GtkScale from gtk 3.20, so default value of 31
-                //is used and makes redering of slider wrong. Value 14 is being
-                //used as default value for Slider.thumbHeight is 14 and making
-                //width 14 as well makes slider thumb render in proper shape
+                //deprecated for GtkScale from gtk 3.20, so the default value of 31
+                //is used and makes rendering of the slider wrong. Value 14 is being
+                //used as the default value for Slider.thumbHeight is 14 and making
+                //width 14 as well makes the slider thumb render in proper shape
                 if ("Slider.thumbWidth".equals(key) && value.equals(31)) {
                     return 14;
                 }
@@ -1127,7 +1127,7 @@ else if (!loadedRTL) {
     }
 
     /**
-     * GTKLazyValue is a slimmed down version of <code>ProxyLaxyValue</code>.
+     * GTKLazyValue is a slimmed down version of <code>ProxyLazyValue</code>.
      * The code is duplicate so that it can get at the package private
      * classes in gtk.
      */
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java
index 41f1bdbf8b1..50563a971da 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -216,7 +216,7 @@ protected void adjustBoundsForIcon(JInternalFrame.JDesktopIcon icon,
 
             /* Fix for disappearing icons. If the y value is maxy then this
              * algorithm would place the icon in a non-displayed cell.  Never
-             * to be ssen again.*/
+             * to be seen again.*/
             y = y >= maxy ? (maxy - 1) : y;
 
             /* Compute the offset for the cell we are trying to go in. */
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
index 847fbf4117d..a6d2f5bbb0e 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -762,7 +762,7 @@ public void contentsChanged(ListDataEvent e) {
     }
 
     //
-    // DataModel for Types Comboxbox
+    // DataModel for Types Combobox
     //
     protected FilterComboBoxModel createFilterComboBoxModel() {
         return new FilterComboBoxModel();
@@ -826,9 +826,9 @@ public void setSelectedItem(Object filter) {
 
         public Object getSelectedItem() {
             // Ensure that the current filter is in the list.
-            // NOTE: we shouldnt' have to do this, since JFileChooser adds
+            // NOTE: we shouldn't have to do this, since JFileChooser adds
             // the filter to the choosable filters list when the filter
-            // is set. Lets be paranoid just in case someone overrides
+            // is set. Let's be paranoid just in case someone overrides
             // setFileFilter in JFileChooser.
             FileFilter currentFilter = getFileChooser().getFileFilter();
             boolean found = false;
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
index 02d1c335747..120d59fbcbb 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -760,7 +760,7 @@ public Object createValue(UIDefaults table) {
                                                          MotifLookAndFeel.class,
                                                          "icons/DesktopIcon.gif"),
             "DesktopIcon.border", null,
-            // These are a little odd, MotifInternalFrameUI isntalls em!
+            // These are a little odd, MotifInternalFrameUI installs em!
             "DesktopIcon.windowBindings", new Object[]
               { "ESCAPE", "hideSystemMenu" },
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java
index 7da390bad23..a9c40aa71af 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ public static ComponentUI createUI(JComponent x) {
     }
 
     /**
-     * Creates and returns a Container containin the buttons. The buttons
+     * Creates and returns a Container containing the buttons. The buttons
      * are created by calling <code>getButtons</code>.
      */
     protected Container createButtonArea() {
diff --git a/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java b/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java
index a21745e9b76..d0b763187fb 100644
--- a/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java
+++ b/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -556,7 +556,7 @@ else if (!root.isLightweight()) {
         }
         if ((root instanceof RootPaneContainer) &&
             (rootJ instanceof JRootPane)) {
-            // We're in a Swing heavyeight (JFrame/JWindow...), use double
+            // We're in a Swing heavyweight (JFrame/JWindow...), use double
             // buffering if double buffering enabled on the JRootPane and
             // the JRootPane wants true double buffering.
             if (rootJ.isDoubleBuffered() &&
@@ -685,12 +685,12 @@ public Container getRoot() {
         }
 
         /**
-         * Returns the BufferStartegy.  This will return null if
-         * the BufferStartegy hasn't been created and <code>create</code> is
+         * Returns the BufferStrategy.  This will return null if
+         * the BufferStrategy hasn't been created and <code>create</code> is
          * false, or if there is a problem in creating the
-         * <code>BufferStartegy</code>.
+         * <code>BufferStrategy</code>.
          *
-         * @param create If true, and the BufferStartegy is currently null,
+         * @param create If true and the BufferStrategy is currently null,
          *               one will be created.
          */
         public BufferStrategy getBufferStrategy(boolean create) {
@@ -793,7 +793,7 @@ private BufferStrategy createBufferStrategy(Container root,
                 } catch (AWTException e) {
                     // Type is not supported
                     if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
-                        LOGGER.finer("createBufferStratety failed",
+                        LOGGER.finer("createBufferStrategy failed",
                                      e);
                     }
                 }
@@ -805,7 +805,7 @@ private BufferStrategy createBufferStrategy(Container root,
                 } catch (AWTException e) {
                     // Type not supported
                     if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
-                        LOGGER.finer("createBufferStratety failed",
+                        LOGGER.finer("createBufferStrategy failed",
                                      e);
                     }
                 }
diff --git a/src/java.desktop/share/classes/javax/swing/FocusManager.java b/src/java.desktop/share/classes/javax/swing/FocusManager.java
index 4ed6655c6ce..104039397b9 100644
--- a/src/java.desktop/share/classes/javax/swing/FocusManager.java
+++ b/src/java.desktop/share/classes/javax/swing/FocusManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,7 +95,7 @@ public static FocusManager getCurrentManager() {
      * <p>
      * If a <code>SecurityManager</code> is installed,
      * the calling thread must be granted the <code>AWTPermission</code>
-     * "replaceKeyboardFocusManager" in order to replace the
+     * "replaceKeyboardFocusManager" in order to replace
      * the current <code>KeyboardFocusManager</code>.
      * If this permission is not granted,
      * this method will throw a <code>SecurityException</code>,
diff --git a/src/java.desktop/share/classes/javax/swing/GroupLayout.java b/src/java.desktop/share/classes/javax/swing/GroupLayout.java
index 8b932742eed..3a4a6d78ca6 100644
--- a/src/java.desktop/share/classes/javax/swing/GroupLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/GroupLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3521,7 +3521,7 @@ String getMatchDescription() {
     }
 
 
-    // LinkInfo contains the set of ComponentInfosthat are linked along a
+    // LinkInfo contains the set of ComponentInfos that are linked along a
     // particular axis.
     private static class LinkInfo {
         private final int axis;
diff --git a/src/java.desktop/share/classes/javax/swing/JComponent.java b/src/java.desktop/share/classes/javax/swing/JComponent.java
index bad33b52ca1..d1b1313ebb4 100644
--- a/src/java.desktop/share/classes/javax/swing/JComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/JComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -5050,11 +5050,11 @@ public void paintImmediately(int x,int y,int w, int h) {
             return;
         }
 
-        JComponent paintingOigin = SwingUtilities.getPaintingOrigin(this);
-        if (paintingOigin != null) {
+        JComponent paintingOrigin = SwingUtilities.getPaintingOrigin(this);
+        if (paintingOrigin != null) {
             Rectangle rectangle = SwingUtilities.convertRectangle(
-                    c, new Rectangle(x, y, w, h), paintingOigin);
-            paintingOigin.paintImmediately(rectangle.x, rectangle.y, rectangle.width, rectangle.height);
+                    c, new Rectangle(x, y, w, h), paintingOrigin);
+            paintingOrigin.paintImmediately(rectangle.x, rectangle.y, rectangle.width, rectangle.height);
             return;
         }
 
@@ -5510,7 +5510,7 @@ private static class ReadObjectCallback implements ObjectInputValidation {
         /**
          * This is the method that's called after the entire graph
          * of objects has been read in.  It initializes
-         * the UI property of all of the copmonents with
+         * the UI property of all of the components with
          * <code>SwingUtilities.updateComponentTreeUI</code>.
          */
         public void validateObject() throws InvalidObjectException {
diff --git a/src/java.desktop/share/classes/javax/swing/JEditorPane.java b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
index 00e2db39556..7ce3ff47872 100644
--- a/src/java.desktop/share/classes/javax/swing/JEditorPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1227,7 +1227,7 @@ public void replaceSelection(String content) {
      */
     @SuppressWarnings("deprecation")
     public static EditorKit createEditorKitForContentType(String type) {
-        Hashtable<String, EditorKit> kitRegistry = getKitRegisty();
+        Hashtable<String, EditorKit> kitRegistry = getKitRegistry();
         EditorKit k = kitRegistry.get(type);
         if (k == null) {
             // try to dynamically load the support
@@ -1294,7 +1294,7 @@ public static void registerEditorKitForContentType(String type, String classname
         } else {
             getKitLoaderRegistry().remove(type);
         }
-        getKitRegisty().remove(type);
+        getKitRegistry().remove(type);
     }
 
     /**
@@ -1326,7 +1326,7 @@ private static Hashtable<String, ClassLoader> getKitLoaderRegistry() {
         return tmp;
     }
 
-    private static Hashtable<String, EditorKit> getKitRegisty() {
+    private static Hashtable<String, EditorKit> getKitRegistry() {
         @SuppressWarnings("unchecked")
         Hashtable<String, EditorKit> ht =
             (Hashtable)SwingUtilities.appContextGet(kitRegistryKey);
diff --git a/src/java.desktop/share/classes/javax/swing/JFileChooser.java b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
index 069bbb5d536..eb4263349df 100644
--- a/src/java.desktop/share/classes/javax/swing/JFileChooser.java
+++ b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1665,7 +1665,7 @@ public boolean accept(File f) {
      * @see FileSystemView
      */
     @BeanProperty(expert = true, description
-            = "Sets the FileSytemView used to get filesystem information.")
+            = "Sets the FileSystemView used to get filesystem information.")
     public void setFileSystemView(FileSystemView fsv) {
         FileSystemView oldValue = fileSystemView;
         fileSystemView = fsv;
diff --git a/src/java.desktop/share/classes/javax/swing/JLayeredPane.java b/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
index 2b07f65da3c..db842302e41 100644
--- a/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -465,7 +465,7 @@ public void setPosition(Component c, int position) {
      * @param c  the Component to check
      * @return an int giving the component's position, where 0 is the
      *         topmost position and the highest index value = the count
-     *         count of components at that layer, minus 1
+     *         of components at that layer minus 1
      *
      * @see #getComponentCountInLayer
      */
@@ -529,7 +529,7 @@ public int getComponentCountInLayer(int layer) {
             curLayer = getLayer(getComponent(i));
             if(curLayer == layer) {
                 layerCount++;
-            /// Short-circuit the counting when we have them all
+            // Short-circuit the counting when we have them all
             } else if(layerCount > 0 || curLayer < layer) {
                 break;
             }
@@ -555,7 +555,7 @@ public Component[] getComponentsInLayer(int layer) {
             curLayer = getLayer(getComponent(i));
             if(curLayer == layer) {
                 results[layerCount++] = getComponent(i);
-            /// Short-circuit the counting when we have them all
+            // Short-circuit the counting when we have them all
             } else if(layerCount > 0 || curLayer < layer) {
                 break;
             }
diff --git a/src/java.desktop/share/classes/javax/swing/JList.java b/src/java.desktop/share/classes/javax/swing/JList.java
index da67a89ee5f..301813533d7 100644
--- a/src/java.desktop/share/classes/javax/swing/JList.java
+++ b/src/java.desktop/share/classes/javax/swing/JList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1769,7 +1769,7 @@ public void setListData(final Vector<? extends E> listData) {
      * during construction to initialize the list's selection model
      * property.
      *
-     * @return a {@code DefaultListSelecitonModel}, used to initialize
+     * @return a {@code DefaultListSelectionModel}, used to initialize
      *         the list's selection model property during construction
      * @see #setSelectionModel
      * @see DefaultListSelectionModel
diff --git a/src/java.desktop/share/classes/javax/swing/JMenu.java b/src/java.desktop/share/classes/javax/swing/JMenu.java
index bc233147fd8..91cb63e2ed5 100644
--- a/src/java.desktop/share/classes/javax/swing/JMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JMenu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -362,7 +362,7 @@ protected Point getPopupMenuOrigin() {
         int x;
         int y;
         JPopupMenu pm = getPopupMenu();
-        // Figure out the sizes needed to caclulate the menu position
+        // Figure out the sizes needed to calculate the menu position
         Dimension s = getSize();
         Dimension pmSize = pm.getSize();
         // For the first time the menu is popped up,
diff --git a/src/java.desktop/share/classes/javax/swing/JMenuItem.java b/src/java.desktop/share/classes/javax/swing/JMenuItem.java
index edafeee4eae..8d0745a4272 100644
--- a/src/java.desktop/share/classes/javax/swing/JMenuItem.java
+++ b/src/java.desktop/share/classes/javax/swing/JMenuItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -185,8 +185,8 @@ public void setModel(ButtonModel newModel) {
     }
 
     /**
-     * Inititalizes the focusability of the <code>JMenuItem</code>.
-     * <code>JMenuItem</code>'s are focusable, but subclasses may
+     * Initializes the focusability of the <code>JMenuItem</code>.
+     * <code>JMenuItem</code>'s are non-focusable, but subclasses may
      * want to be, this provides them the opportunity to override this
      * and invoke something else, or nothing at all. Refer to
      * {@link javax.swing.JMenu#initFocusability} for the motivation of
@@ -808,7 +808,7 @@ protected String paramString() {
      * <code>JMenuItem</code>. For <code>JMenuItem</code>s,
      * the <code>AccessibleContext</code> takes the form of an
      * <code>AccessibleJMenuItem</code>.
-     * A new AccessibleJMenuItme instance is created if necessary.
+     * A new <code>AccessibleJMenuItem</code> instance is created if necessary.
      *
      * @return an <code>AccessibleJMenuItem</code> that serves as the
      *         <code>AccessibleContext</code> of this <code>JMenuItem</code>
diff --git a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
index f0e135d3e46..d21f01f6b12 100644
--- a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
@@ -120,7 +120,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
 
     /** Bug#4425878-Property javax.swing.adjustPopupLocationToFit introduced */
     @SuppressWarnings("removal")
-    static boolean popupPostionFixDisabled =
+    static boolean popupPositionFixDisabled =
             java.security.AccessController.doPrivileged(
                 new sun.security.action.GetPropertyAction(
                     "javax.swing.adjustPopupLocationToFit","")).equals("false");
@@ -342,7 +342,7 @@ public JMenuItem add(Action a) {
     Point adjustPopupLocationToFitScreen(int xPosition, int yPosition) {
         Point popupLocation = new Point(xPosition, yPosition);
 
-        if(popupPostionFixDisabled == true || GraphicsEnvironment.isHeadless()) {
+        if (popupPositionFixDisabled || GraphicsEnvironment.isHeadless()) {
             return popupLocation;
         }
 
diff --git a/src/java.desktop/share/classes/javax/swing/JSlider.java b/src/java.desktop/share/classes/javax/swing/JSlider.java
index 4682acb8a54..a9c9cbe887b 100644
--- a/src/java.desktop/share/classes/javax/swing/JSlider.java
+++ b/src/java.desktop/share/classes/javax/swing/JSlider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -361,7 +361,7 @@ public String getUIClassID() {
 
 
     /**
-     * We pass Change events along to the listeners with the
+     * We pass Change events along to the listeners with
      * the slider (instead of the model itself) as the event source.
      */
     private class ModelListener implements ChangeListener, Serializable {
@@ -930,7 +930,7 @@ public Hashtable<Integer, JComponent> createStandardLabels( int increment, int s
         }
 
         if ( increment <= 0 ) {
-            throw new IllegalArgumentException( "Label incremement must be > 0" );
+            throw new IllegalArgumentException( "Label increment must be > 0" );
         }
 
         class SmartHashtable extends Hashtable<Integer, JComponent> implements PropertyChangeListener {
@@ -1595,7 +1595,7 @@ public boolean doAccessibleAction(int i) {
             if (i < 0 || i > 1) {
                 return false;
             }
-            //0 is increment, 1 is decrrement
+            //0 is increment, 1 is decrement
             int delta = ((i > 0) ? -1 : 1);
             JSlider.this.setValue(oldModelValue + delta);
             return true;
diff --git a/src/java.desktop/share/classes/javax/swing/JSplitPane.java b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
index e51a6451560..14f62565d40 100644
--- a/src/java.desktop/share/classes/javax/swing/JSplitPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -912,7 +912,7 @@ public void remove(int index) {
 
     /**
      * Removes all the child components from the split pane. Resets the
-     * <code>leftComonent</code> and <code>rightComponent</code>
+     * <code>leftComponent</code> and <code>rightComponent</code>
      * instance variables.
      */
     public void removeAll() {
diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
index 7d7c8d657ae..fa2d94b3e25 100644
--- a/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3209,7 +3209,7 @@ public void doLayout() {
             // would have resulted in the layout the user has chosen.
             // Thereafter, during window resizing etc. it has to work off
             // the preferred sizes as usual - the idea being that, whatever
-            // the user does, everything stays in synch and things don't jump
+            // the user does, everything stays in sync and things don't jump
             // around.
             setWidthsFromPreferredWidths(true);
         }
@@ -4036,7 +4036,7 @@ private void cacheModelSelection(RowSorterEvent sortEvent) {
         }
 
         /**
-         * Inovked when either the table has changed or the sorter has changed
+         * Invoked when either the table has changed or the sorter has changed
          * and after the sorter has been notified. If necessary this will
          * reapply the selection and variable row heights.
          */
diff --git a/src/java.desktop/share/classes/javax/swing/JTree.java b/src/java.desktop/share/classes/javax/swing/JTree.java
index 7cecd30d66d..c081b3cfff8 100644
--- a/src/java.desktop/share/classes/javax/swing/JTree.java
+++ b/src/java.desktop/share/classes/javax/swing/JTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1573,7 +1573,7 @@ private void cancelDropTimer() {
 
     /**
      * Returns <code>isEditable</code>. This is invoked from the UI before
-     * editing begins to insure that the given path can be edited. This
+     * editing begins to ensure that the given path can be edited. This
      * is provided as an entry point for subclassers to add filtered
      * editing without having to resort to creating a new editor.
      *
@@ -3104,7 +3104,7 @@ public TreePath getNextMatch(String prefix, int startingRow,
         }
         prefix = prefix.toUpperCase();
 
-        // start search from the next/previous element froom the
+        // start search from the next/previous element of the
         // selected element
         int increment = (bias == Position.Bias.Forward) ? 1 : -1;
         int row = startingRow;
diff --git a/src/java.desktop/share/classes/javax/swing/PopupFactory.java b/src/java.desktop/share/classes/javax/swing/PopupFactory.java
index b2809423a5f..9789e95e7ff 100644
--- a/src/java.desktop/share/classes/javax/swing/PopupFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/PopupFactory.java
@@ -537,8 +537,8 @@ public void hide() {
         }
 
         /**
-         * As we recycle the <code>Window</code>, we don't want to dispose it,
-         * thus this method does nothing, instead use <code>_dipose</code>
+         * As we recycle the <code>Window</code>, we don't want to dispose of it,
+         * thus this method does nothing, instead use <code>_dispose</code>
          * which will handle the disposing.
          */
         void dispose() {
diff --git a/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java b/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java
index 38cac5ba1df..cea800d42f2 100644
--- a/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java
+++ b/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -432,7 +432,7 @@ public void setMillisToPopup(int millisToPopup) {
     /**
      * Returns the amount of time it will take for the popup to appear.
      *
-     * @return the amont of time in milliseconds it will take for the
+     * @return the amount of time in milliseconds it will take for the
      *         popup to appear
      * @see #setMillisToPopup
      */
@@ -527,7 +527,7 @@ protected class AccessibleProgressMonitor extends AccessibleContext
          *           JLabel
          *           JProgressBar
          *
-         * The AccessibleProgessMonitor accessibility hierarchy is:
+         * The AccessibleProgressMonitor accessibility hierarchy is:
          *   AccessibleJDialog
          *     AccessibleProgressMonitor
          *       AccessibleJLabel
diff --git a/src/java.desktop/share/classes/javax/swing/RepaintManager.java b/src/java.desktop/share/classes/javax/swing/RepaintManager.java
index f6e6dbdf0a2..eb696a7b489 100644
--- a/src/java.desktop/share/classes/javax/swing/RepaintManager.java
+++ b/src/java.desktop/share/classes/javax/swing/RepaintManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1865,7 +1865,7 @@ public void run() {
      * Runnable used to process all repaint/revalidate requests.
      */
     private final class ProcessingRunnable implements Runnable {
-        // If true, we're wainting on the EventQueue.
+        // If true, we're waiting on the EventQueue.
         private boolean pending;
 
         /**
diff --git a/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java b/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java
index daae05f2cf0..384a8059962 100644
--- a/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java
+++ b/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -281,8 +281,8 @@ public Component getComponentAfter(Container aContainer, Component aComponent) {
             throw new IllegalArgumentException("aContainer is not a focus cycle root of aComponent");
         }
 
-        // Before all the ckecks below we first see if it's an FTP provider or a focus cycle root.
-        // If it's the case just go down cycle (if it's set to "implicit").
+        // Before all the checks below we first see if it's an FTP provider or a focus cycle root.
+        // If it's the case, just go down cycle (if it's set to "implicit").
         Component comp = getComponentDownCycle(aComponent, FORWARD_TRAVERSAL);
         if (comp != null) {
             return comp;
diff --git a/src/java.desktop/share/classes/javax/swing/SpinnerListModel.java b/src/java.desktop/share/classes/javax/swing/SpinnerListModel.java
index 9f33772d400..c70f198de50 100644
--- a/src/java.desktop/share/classes/javax/swing/SpinnerListModel.java
+++ b/src/java.desktop/share/classes/javax/swing/SpinnerListModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@ public class SpinnerListModel extends AbstractSpinnerModel implements Serializab
      * The initial value (<i>current element</i>)
      * of the model will be <code>values.get(0)</code>.
      * If <code>values</code> is <code>null</code> or has zero
-     * size, an <code>IllegalArugmentException</code> is thrown.
+     * size, an <code>IllegalArgumentException</code> is thrown.
      *
      * @param values the sequence this model represents
      * @throws IllegalArgumentException if <code>values</code> is
diff --git a/src/java.desktop/share/classes/javax/swing/SwingWorker.java b/src/java.desktop/share/classes/javax/swing/SwingWorker.java
index 5e6f2dd6545..4eacdfcbf50 100644
--- a/src/java.desktop/share/classes/javax/swing/SwingWorker.java
+++ b/src/java.desktop/share/classes/javax/swing/SwingWorker.java
@@ -248,8 +248,8 @@ public abstract class SwingWorker<T, V> implements RunnableFuture<T> {
     private volatile StateValue state;
 
     /**
-     * everything is run inside this FutureTask. Also it is used as
-     * a delegatee for the Future API.
+     * Everything is run inside this FutureTask. Also it is used as
+     * a delegate for the Future API.
      */
     private final FutureTask<T> future;
 
diff --git a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
index b7f555b6644..6b3619e8a7b 100644
--- a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
+++ b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -220,7 +220,7 @@ public void setReshowDelay(int milliseconds) {
     /**
      * Returns the reshow delay property.
      *
-     * @return reshown delay property
+     * @return reshow delay property
      * @see #setReshowDelay
      */
     public int getReshowDelay() {
diff --git a/src/java.desktop/share/classes/javax/swing/UIDefaults.java b/src/java.desktop/share/classes/javax/swing/UIDefaults.java
index e98cbff1df4..97f061fdb3d 100644
--- a/src/java.desktop/share/classes/javax/swing/UIDefaults.java
+++ b/src/java.desktop/share/classes/javax/swing/UIDefaults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1372,8 +1372,8 @@ public Object get(Object key) {
             return value;
         }
 
-        String composeKey(String key, int reduce, String sufix) {
-            return key.substring(0, key.length() - reduce) + sufix;
+        String composeKey(String key, int reduce, String suffix) {
+            return key.substring(0, key.length() - reduce) + suffix;
         }
 
         String getTextFromProperty(String text) {
diff --git a/src/java.desktop/share/classes/javax/swing/event/InternalFrameListener.java b/src/java.desktop/share/classes/javax/swing/event/InternalFrameListener.java
index 31301230232..13ba35c6e5d 100644
--- a/src/java.desktop/share/classes/javax/swing/event/InternalFrameListener.java
+++ b/src/java.desktop/share/classes/javax/swing/event/InternalFrameListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ public interface InternalFrameListener extends EventListener {
      * Invoked when a internal frame has been opened.
      *
      * @param e an {@code InternalFrameEvent} with information about the
-     *          {@code JInteralFrame} that originated the event
+     *          {@code JInternalFrame} that originated the event
      * @see javax.swing.JInternalFrame#show
      */
     public void internalFrameOpened(InternalFrameEvent e);
@@ -54,7 +54,7 @@ public interface InternalFrameListener extends EventListener {
      * The close operation can be overridden at this point.
      *
      * @param e an {@code InternalFrameEvent} with information about the
-     *          {@code JInteralFrame} that originated the event
+     *          {@code JInternalFrame} that originated the event
      * @see javax.swing.JInternalFrame#setDefaultCloseOperation
      */
     public void internalFrameClosing(InternalFrameEvent e);
@@ -63,7 +63,7 @@ public interface InternalFrameListener extends EventListener {
      * Invoked when an internal frame has been closed.
      *
      * @param e an {@code InternalFrameEvent} with information about the
-     *          {@code JInteralFrame} that originated the event
+     *          {@code JInternalFrame} that originated the event
      * @see javax.swing.JInternalFrame#setClosed
      */
     public void internalFrameClosed(InternalFrameEvent e);
@@ -72,7 +72,7 @@ public interface InternalFrameListener extends EventListener {
      * Invoked when an internal frame is iconified.
      *
      * @param e an {@code InternalFrameEvent} with information about the
-     *          {@code JInteralFrame} that originated the event
+     *          {@code JInternalFrame} that originated the event
      * @see javax.swing.JInternalFrame#setIcon
      */
     public void internalFrameIconified(InternalFrameEvent e);
@@ -81,7 +81,7 @@ public interface InternalFrameListener extends EventListener {
      * Invoked when an internal frame is de-iconified.
      *
      * @param e an {@code InternalFrameEvent} with information about the
-     *          {@code JInteralFrame} that originated the event
+     *          {@code JInternalFrame} that originated the event
      * @see javax.swing.JInternalFrame#setIcon
      */
     public void internalFrameDeiconified(InternalFrameEvent e);
@@ -90,7 +90,7 @@ public interface InternalFrameListener extends EventListener {
      * Invoked when an internal frame is activated.
      *
      * @param e an {@code InternalFrameEvent} with information about the
-     *          {@code JInteralFrame} that originated the event
+     *          {@code JInternalFrame} that originated the event
      * @see javax.swing.JInternalFrame#setSelected
      */
     public void internalFrameActivated(InternalFrameEvent e);
@@ -99,7 +99,7 @@ public interface InternalFrameListener extends EventListener {
      * Invoked when an internal frame is de-activated.
      *
      * @param e an {@code InternalFrameEvent} with information about the
-     *          {@code JInteralFrame} that originated the event
+     *          {@code JInternalFrame} that originated the event
      * @see javax.swing.JInternalFrame#setSelected
      */
     public void internalFrameDeactivated(InternalFrameEvent e);
diff --git a/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java b/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java
index 6661cb3775e..bc34e9b4fd4 100644
--- a/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,7 +81,7 @@ public class TreeModelEvent extends EventObject {
      * starting at the lowest index and working towards the highest. Accumulate
      * a Vector of <code>Integer</code> objects that specify the
      * insert-locations as you go, then convert the Vector to an
-     * array of <code>int</code> to create the event. When the postition-index
+     * array of <code>int</code> to create the event. When the position-index
      * equals zero, the node is inserted at the beginning of the list. When the
      * position index equals the size of the list, the node is "inserted" at
      * (appended to) the end of the list.
diff --git a/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java b/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java
index a7b91e8e050..82134fd9aeb 100644
--- a/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -112,7 +112,7 @@ public TreeSelectionEvent(Object source, TreePath path, boolean isNew,
     /**
       * Returns the paths that have been added or removed from the selection.
       *
-      * @return copy of the array of {@code TreePath} obects for this event.
+      * @return copy of the array of {@code TreePath} objects for this event.
       */
     public TreePath[] getPaths()
     {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java
index 64102ca51bb..c1caf61a514 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -172,7 +172,7 @@ public EmptyBorderUIResource(int top, int left, int bottom, int right)   {
         /**
          * Constructs an {@code EmptyBorderUIResource}.
          * @param insets the insets of the border
-         * @throws NullPointerException if the spcecified {@code insets}
+         * @throws NullPointerException if the specified {@code insets}
          *         is {@code null}
          */
         @ConstructorProperties({"borderInsets"})
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicBorders.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicBorders.java
index 4bb0bf9e0d1..a1062d70d38 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicBorders.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicBorders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -226,7 +226,7 @@ public void paintBorder( Component c, Graphics g, int x, int y, int w, int h ) {
                 g.translate(x, y);
 
                 if (model.isPressed() && model.isArmed() || model.isSelected()) {
-                    // Draw the pressd button
+                    // Draw the pressed button
                     g.setColor(shade);
                     g.drawRect(0, 0, w-1, h-1);
                     g.setColor(lightHighlight);
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
index a94a051f554..601fe0c2a54 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -423,9 +423,9 @@ public Dimension getMaximumSize(JComponent x) {
      * and adds it to the frame.
      * Reverse process for the <code>currentPane</code>.
      *
-     * @param currentPane this {@code Jcomponent} is the current pane being
+     * @param currentPane this {@code JComponent} is the current pane being
      * viewed that has mouse handlers installed
-     * @param newPane this {@code Jcomponent} is the pane which will be added
+     * @param newPane this {@code JComponent} is the pane which will be added
      * and have mouse handlers installed
      */
     protected void replacePane(JComponent currentPane, JComponent newPane) {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java
index 50138e6b3ee..53eb25a76d7 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -363,7 +363,7 @@ private void paintImpl(Graphics g, JComponent c)
 
         for (int colCounter = startColumn; colCounter <= endColumn;
              colCounter++) {
-            // And then how many rows in this columnn
+            // And then how many rows in this column
             int row = convertLocationToRowInColumn(paintBounds.y, colCounter);
             int rowCount = getRowCount(colCounter);
             int index = getModelIndex(colCounter, row);
@@ -2237,7 +2237,7 @@ private int getNextPageIndex(JList<?> list, int direction) {
                         }
                         Rectangle cellBounds = list.getCellBounds(index, index);
                         // go one cell down if first visible cell doesn't fit
-                        // into adjasted visible rectangle
+                        // into adjusted visible rectangle
                         if (cellBounds != null && cellBounds.y < visRect.y) {
                             p.y = cellBounds.y + cellBounds.height;
                             index = list.locationToIndex(p);
@@ -2290,7 +2290,7 @@ private int getNextPageIndex(JList<?> list, int direction) {
                         }
                         cellBounds = list.getCellBounds(index, index);
                         // go one cell up if last visible cell doesn't fit
-                        // into adjasted visible rectangle
+                        // into adjusted visible rectangle
                         if (cellBounds != null &&
                                 cellBounds.y + cellBounds.height >
                                 visRect.y + visRect.height)
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
index f35ae683812..0a861e76a8a 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
@@ -219,7 +219,7 @@ public void uninitialize() {
         if (disposer != null) {
             // Note that we're likely calling removePropertyChangeListener()
             // during the course of AppContext.firePropertyChange().
-            // However, EventListenerAggreggate has code to safely modify
+            // However, EventListenerAggregate has code to safely modify
             // the list under such circumstances.
             context.removePropertyChangeListener(AppContext.GUI_DISPOSED,
                                                  disposer);
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
index f9de13876bd..db68e126afa 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1026,8 +1026,8 @@ static class MenuKeyboardHelper
         void removeItems() {
             if (lastFocused != null) {
                 if(!lastFocused.requestFocusInWindow()) {
-                    // Workarounr for 4810575.
-                    // If lastFocused is not in currently focused window
+                    // Workaround for 4810575.
+                    // If lastFocused is not in currently focused window,
                     // requestFocusInWindow will fail. In this case we must
                     // request focus by requestFocus() if it was not
                     // transferred from our popup.
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java
index dfcf4023ce0..74ba5272554 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -913,7 +913,7 @@ public Dimension getPreferredSize(JComponent c) {
                 // there is more than enough room in the progress bar
                 // for everything.
                 // This does have a strange dependency on
-                // getStringPlacememnt() in a funny way.
+                // getStringPlacement() in a funny way.
                 int stringHeight = fontSizer.getHeight() +
                                    fontSizer.getDescent();
                 if (stringHeight > size.height) {
@@ -980,7 +980,7 @@ protected int getAnimationIndex() {
 
     /**
      * Returns the number of frames for the complete animation loop
-     * used by an indeterminate JProgessBar. The progress chunk will go
+     * used by an indeterminate JProgressBar. The progress chunk will go
      * from one end to the other and back during the entire loop. This
      * visual behavior may be changed by subclasses in other Look and Feels.
      *
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
index e864ecd0548..49a44fbb2b2 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,7 +370,7 @@ protected void syncScrollPaneWithViewport()
                         } else {
                            /* The following line can't handle a small value of
                             * viewPosition.x like Integer.MIN_VALUE correctly
-                            * because (max - extent - viewPositoiin.x) causes
+                            * because (max - extent - viewPosition.x) causes
                             * an overflow. As a result, value becomes zero.
                             * (e.g. setViewPosition(Integer.MAX_VALUE, ...)
                             *       in a user program causes a overflow.
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
index 2609ab4da88..3018de4fd93 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -970,7 +970,7 @@ protected int positionForMouseEvent(MouseEvent e) {
             newY = Math.min(maxX, Math.max(minX, newY - offset));
             return newY;
         }
-    } // End of BasicSplitPaneDividier.VerticalDragController
+    } // End of BasicSplitPaneDivider.VerticalDragController
 
 
     /**
@@ -1118,7 +1118,7 @@ public void actionPerformed(ActionEvent e) {
             int     newLoc;
 
             // We use the location from the UI directly, as the location the
-            // JSplitPane itself maintains is not necessarly correct.
+            // JSplitPane itself maintains is not necessarily correct.
             if (toMinimum) {
                 if (orientation == JSplitPane.VERTICAL_SPLIT) {
                     if (currentLoc >= (splitPane.getHeight() -
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index 2fac8b2e211..3f4712cda08 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -616,7 +616,7 @@ protected void uninstallKeyboardActions() {
     }
 
     /**
-     * Reloads the mnemonics. This should be invoked when a memonic changes,
+     * Reloads the mnemonics. This should be invoked when a mnemonic changes,
      * when the title of a mnemonic changes, or when tabs are added/removed.
      */
     private void updateMnemonics() {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java
index 27ce7e22702..4825e140902 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java
@@ -206,7 +206,7 @@ private static class Actions extends UIAction {
                 boolean inSelection) {
             super(name);
 
-            // Actions spcifying true for "inSelection" are
+            // Actions specifying true for "inSelection" are
             // fairly sensitive to bad parameter values. They require
             // that one of dx and dy be 0 and the other be -1 or 1.
             // Bogus parameter values could cause an infinite loop.
@@ -526,7 +526,7 @@ public void actionPerformed(ActionEvent e) {
                 // for the focus regardless of who owns the focus at the
                 // time the call to requestFocus() is made. The optimisation
                 // to ignore the call to requestFocus() when the component
-                // already has focus may ligitimately be made as the
+                // already has focus may legitimately be made as the
                 // request focus event is dequeued, not before.
 
                 // boolean wasEditingWithFocus = table.isEditing() &&
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
index 2e50057b320..042a49aaa65 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -222,7 +222,7 @@ public Dimension getMaximumSize(JComponent c) {
     }
 
     /**
-     * Invoked when the <code>JCompoment</code> associated with the
+     * Invoked when the <code>JComponent</code> associated with the
      * <code>JToolTip</code> has changed, or at initialization time. This
      * should update any state dependent upon the <code>JComponent</code>.
      *
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
index a951eb454d0..01bf20cfd7c 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -168,7 +168,7 @@ public class BasicTreeUI extends TreeUI
     /** Set to true if the editor has a different size than the renderer. */
     protected boolean           editorHasDifferentSize;
 
-    /** Row correspondin to lead path. */
+    /** Row corresponding to lead path. */
     private int                 leadRow;
     /** If true, the property change event for LEAD_SELECTION_PATH_PROPERTY,
      * or ANCHOR_SELECTION_PATH_PROPERTY will not generate a repaint. */
@@ -984,7 +984,7 @@ else if (condition == JComponent.WHEN_FOCUSED) {
     }
 
     /**
-     * Intalls the subcomponents of the tree, which is the renderer pane.
+     * Installs the subcomponents of the tree, which is the renderer pane.
      */
     protected void installComponents() {
         if ((rendererPane = createCellRendererPane()) != null) {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
index 697cf6de675..e6d44c0fae4 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -405,21 +405,21 @@ public Font run() {
      */
     private static class WindowsFontDelegate extends FontDelegate {
         private MetalFontDesktopProperty[] props;
-        private boolean[] checkedPriviledged;
+        private boolean[] checkedPrivileged;
 
         public WindowsFontDelegate() {
             props = new MetalFontDesktopProperty[6];
-            checkedPriviledged = new boolean[6];
+            checkedPrivileged = new boolean[6];
         }
 
         public FontUIResource getFont(int type) {
             if (fonts[type] != null) {
                 return fonts[type];
             }
-            if (!checkedPriviledged[type]) {
+            if (!checkedPrivileged[type]) {
                 Font f = getPrivilegedFont(type);
 
-                checkedPriviledged[type] = true;
+                checkedPrivileged[type] = true;
                 if (f != null) {
                     fonts[type] = new FontUIResource(f);
                     return fonts[type];
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
index 8dd677f1675..0470d15718a 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@
 @SuppressWarnings("serial") // Same-version serialization only
 public class MetalCheckBoxUI extends MetalRadioButtonUI {
 
-    // NOTE: MetalCheckBoxUI inherts from MetalRadioButtonUI instead
+    // NOTE: MetalCheckBoxUI inherits from MetalRadioButtonUI instead
     // of BasicCheckBoxUI because we want to pick up all the
     // painting changes made in MetalRadioButtonUI.
 
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java
index 71822983356..38507c5858a 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -338,10 +338,10 @@ protected void removeListeners() {
         }
     }
 
-    // These two methods were overloaded and made public. This was probably a
-    // mistake in the implementation. The functionality that they used to
+    // These two methods were overridden and made public. This was probably
+    // a mistake in the implementation. The functionality that they used to
     // provide is no longer necessary and should be removed. However,
-    // removing them will create an uncompatible API change.
+    // removing them will create an incompatible API change.
 
     public void configureEditor() {
         super.configureEditor();
@@ -410,10 +410,10 @@ public MetalComboPopup( JComboBox<Object> cBox) {
             super( cBox );
         }
 
-        // This method was overloaded and made public. This was probably
-        // mistake in the implementation. The functionality that they used to
+        // This method was overridden and made public. This was probably
+        // a mistake in the implementation. The functionality that it used to
         // provide is no longer necessary and should be removed. However,
-        // removing them will create an uncompatible API change.
+        // removing it will create an incompatible API change.
 
         public void delegateFocus(MouseEvent e) {
             super.delegateFocus(e);
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java
index ec3921b5671..3658256b248 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -126,7 +126,7 @@ public Dimension getPreferredSize(JComponent c) {
     }
 
     public Dimension getMinimumSize(JComponent c) {
-        // For the metal desktop icon we will use the layout maanger to
+        // For the metal desktop icon we will use the layout manager to
         // determine the correct height of the component, but we want to keep
         // the width consistent according to the jlf spec.
         return new Dimension(width,
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
index 3edd9708a50..23803dafde9 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1197,9 +1197,9 @@ public void setSelectedItem(Object filter) {
 
         public Object getSelectedItem() {
             // Ensure that the current filter is in the list.
-            // NOTE: we shouldnt' have to do this, since JFileChooser adds
+            // NOTE: we shouldn't have to do this, since JFileChooser adds
             // the filter to the choosable filters list when the filter
-            // is set. Lets be paranoid just in case someone overrides
+            // is set. Let's be paranoid just in case someone overrides
             // setFileFilter in JFileChooser.
             FileFilter currentFilter = getFileChooser().getFileFilter();
             boolean found = false;
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java
index 81938208b72..f864c3f77b8 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -332,7 +332,7 @@ public void layoutContainer(Container c) {
             Insets      insets = getInsets();
 
             // This layout differs from the one used in BasicSplitPaneDivider.
-            // It does not center justify the oneTouchExpadable buttons.
+            // It does not center justify the oneTouchExpandable buttons.
             // This was necessary in order to meet the spec of the Metal
             // splitpane divider.
             if (leftButton != null && rightButton != null &&
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
index c4dc70b0cad..325f30f7e0a 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,10 +87,10 @@ public class MetalToggleButtonUI extends BasicToggleButtonUI {
     public MetalToggleButtonUI() {}
 
     /**
-     * Constructs the {@code MetalToogleButtonUI}.
+     * Constructs the {@code MetalToggleButtonUI}.
      *
      * @param b a component
-     * @return the {@code MetalToogleButtonUI}.
+     * @return the {@code MetalToggleButtonUI}.
      */
     public static ComponentUI createUI(JComponent b) {
         AppContext appContext = AppContext.getAppContext();
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
index dfaa554e1a5..1bdff19fa2d 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -655,12 +655,12 @@ private void paintWith9SquareCaching(Graphics2D g, PaintContext ctx,
                     dstInsets = insets;
                 }
                 // paint 9 square scaled
-                Object oldScaleingHints = g.getRenderingHint(RenderingHints.KEY_INTERPOLATION);
+                Object oldScalingHints = g.getRenderingHint(RenderingHints.KEY_INTERPOLATION);
                 g.setRenderingHint(RenderingHints.KEY_INTERPOLATION,RenderingHints.VALUE_INTERPOLATION_BILINEAR);
                 ImageScalingHelper.paint(g, 0, 0, w, h, img, insets, dstInsets,
                         ImageScalingHelper.PaintType.PAINT9_STRETCH, ImageScalingHelper.PAINT_ALL);
                 g.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
-                    oldScaleingHints!=null?oldScaleingHints:RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR);
+                    oldScalingHints!=null?oldScalingHints:RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR);
             } else {
                 // render directly
                 paint0(g, c, w, h, extendedCacheKeys);
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java
index 7e81e8e5412..33648dfb3a7 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,11 +41,9 @@ class DropShadowEffect extends ShadowEffect {
     // Effect Methods
 
     /**
-     * Get the type of this effect, one of UNDER,BLENDED,OVER. UNDER means the result of apply effect should be painted
-     * under the src image. BLENDED means the result of apply sffect contains a modified src image so just it should be
-     * painted. OVER means the result of apply effect should be painted over the src image.
+     * {@inheritDoc}
      *
-     * @return The effect type
+     * @return {@inheritDoc}
      */
     @Override
     EffectType getEffectType() {
@@ -78,7 +76,7 @@ BufferedImage applyEffect(BufferedImage src, BufferedImage dst, int w, int h) {
         double trangleAngle = Math.toRadians(angle - 90);
         int offsetX = (int) (Math.sin(trangleAngle) * distance);
         int offsetY = (int) (Math.cos(trangleAngle) * distance);
-        // clac expanded size
+        // calc expanded size
         int tmpOffX = offsetX + size;
         int tmpOffY = offsetX + size;
         int tmpW = w + offsetX + size + size;
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java
index e990ce46bff..30bed2207e4 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,9 +43,15 @@ enum EffectType {
     // Abstract Methods
 
     /**
-     * Get the type of this effect, one of UNDER,BLENDED,OVER. UNDER means the result of apply effect should be painted
-     * under the src image. BLENDED means the result of apply sffect contains a modified src image so just it should be
-     * painted. OVER means the result of apply effect should be painted over the src image.
+     * Get the type of this effect, one of {@code UNDER}, {@code BLENDED}, {@code OVER}.
+     * <ul>
+     *   <li><b>{@code UNDER}</b> means the result of applying the effect
+     *       should be painted under the src image.</li>
+     *   <li><b>{@code BLENDED}</b> means the result of applying the effect
+     *       contains a modified src image, so it should just be painted.</li>
+     *   <li><b>{@code OVER}</b> means the result of applying the effect
+     *       should be painted over the src image.</li>
+     * </ul>
      *
      * @return The effect type
      */
@@ -68,7 +74,7 @@ enum EffectType {
      *            the area the need effect applied to it
      * @param h   The height of the src image to apply effect to, this allow the src and dst buffers to be bigger than
      *            the area the need effect applied to it
-     * @return The result of appl
+     * @return The result of applying the effect
      */
     abstract BufferedImage applyEffect(BufferedImage src, BufferedImage dst, int w, int h);
 
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageCache.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageCache.java
index 5bc8504b3c2..6cbdc5acdd4 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageCache.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ class ImageCache {
             new LinkedHashMap<Integer, PixelCountSoftReference>(16, 0.75f, true);
     // Maximum number of pixels to cache, this is used if maxCount
     private final int maxPixelCount;
-    // Maximum cached image size in pxiels
+    // Maximum cached image size in pixels
     private final int maxSingleImagePixelSize;
     // The current number of pixels stored in the cache
     private int currentPixelCount = 0;
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java
index ae27e526a6e..46e638ea751 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,11 +41,9 @@ class InnerShadowEffect extends ShadowEffect {
     // Effect Methods
 
     /**
-     * Get the type of this effect, one of UNDER,BLENDED,OVER. UNDER means the result of apply effect should be painted
-     * under the src image. BLENDED means the result of apply sffect contains a modified src image so just it should be
-     * painted. OVER means the result of apply effect should be painted over the src image.
+     * {@inheritDoc}
      *
-     * @return The effect type
+     * @return {@inheritDoc}
      */
     Effect.EffectType getEffectType() {
         return Effect.EffectType.OVER;
@@ -73,10 +71,10 @@ BufferedImage applyEffect(BufferedImage src, BufferedImage dst, int w, int h) {
                     "destination images of type BufferedImage.TYPE_INT_ARGB.");
         }
         // calculate offset
-        double trangleAngle = Math.toRadians(angle - 90);
-        int offsetX = (int) (Math.sin(trangleAngle) * distance);
-        int offsetY = (int) (Math.cos(trangleAngle) * distance);
-        // clac expanded size
+        double triangleAngle = Math.toRadians(angle - 90);
+        int offsetX = (int) (Math.sin(triangleAngle) * distance);
+        int offsetY = (int) (Math.cos(triangleAngle) * distance);
+        // calc expanded size
         int tmpOffX = offsetX + size;
         int tmpOffY = offsetX + size;
         int tmpW = w + offsetX + size + size;
@@ -119,9 +117,9 @@ BufferedImage applyEffect(BufferedImage src, BufferedImage dst, int w, int h) {
             int shadowOffset = (srcY - offsetY) * tmpW;
             for (int x = 0; x < w; x++) {
                 int srcX = x + tmpOffX;
-                int origianlAlphaVal = 255 - ((int) srcAlphaBuf[offset + srcX] & 0xFF);
+                int originalAlphaVal = 255 - ((int) srcAlphaBuf[offset + srcX] & 0xFF);
                 int shadowVal = (int) tmpBuf1[shadowOffset + (srcX - offsetX)] & 0xFF;
-                int alphaVal = Math.min(origianlAlphaVal, shadowVal);
+                int alphaVal = Math.min(originalAlphaVal, shadowVal);
                 lineBuf[x] = ((byte) alphaVal & 0xFF) << 24 | red << 16 | green << 8 | blue;
             }
             shadowRaster.setDataElements(0, y, w, 1, lineBuf);
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
index c8832f8cac6..c9340a62368 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
@@ -484,7 +484,7 @@ static int deriveARGB(Color color1, Color color2, float midPoint) {
     }
 
     /**
-     * Simple Symbolic Link style UIDefalts Property
+     * Simple Symbolic Link style UIDefaults Property
      */
     private static class LinkProperty implements UIDefaults.ActiveValue, UIResource{
         private String dstPropName;
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthArrowButton.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthArrowButton.java
index 71a136f0d63..96e9276a9d2 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthArrowButton.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthArrowButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -115,7 +115,7 @@ public Dimension getPreferredSize(JComponent c) {
                 dim = new Dimension(size, size);
             }
 
-            // handle scaling for sizeVarients for special case components. The
+            // handle scaling for sizeVariants for special case components. The
             // key "JComponent.sizeVariant" scales for large/small/mini
             // components are based on Apples LAF
             Container parent = context.getComponent().getParent();
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java
index 586b280120e..bea838684cc 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -545,8 +545,8 @@ static Dimension getPreferredMenuItemSize(SynthContext context,
              result.height += insets.top + insets.bottom;
          }
 
-         // if the width is even, bump it up one. This is critical
-         // for the focus dash lhne to draw properly
+         // if the width is even, bump it up by one. This is critical
+         // for the focus dash line to draw properly
          if (result.width % 2 == 0) {
              result.width++;
          }
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
index 2da1f958718..c660665d10b 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -182,7 +182,7 @@ class SynthParser extends DefaultHandler {
     private List<ColorType> _colorTypes;
 
     /**
-     * defaultsPropertys are placed here.
+     * Default properties are placed here.
      */
     private Map<String, Object> _defaultsMap;
 
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
index 687fb33df8d..0adf45df1ff 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -108,7 +108,7 @@ private void updateStyle(JProgressBar c) {
                 "ProgressBar.rotateText", false);
         tileWhenIndeterminate = style.getBoolean(context, "ProgressBar.tileWhenIndeterminate", false);
         tileWidth = style.getInt(context, "ProgressBar.tileWidth", 15);
-        // handle scaling for sizeVarients for special case components. The
+        // handle scaling for sizeVariants for special case components. The
         // key "JComponent.sizeVariant" scales for large/small/mini
         // components are based on Apples LAF
         String scaleKey = (String)progressBar.getClientProperty(
@@ -456,7 +456,7 @@ public Dimension getPreferredSize(JComponent c) {
             }
         }
 
-        // handle scaling for sizeVarients for special case components. The
+        // handle scaling for sizeVariants for special case components. The
         // key "JComponent.sizeVariant" scales for large/small/mini
         // components are based on Apples LAF
         String scaleKey = (String)progressBar.getClientProperty(
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java
index cb89edf0981..52ab14a359f 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,7 +109,7 @@ private void updateStyle(JScrollBar c) {
             incrGap = style.getInt(context, "ScrollBar.incrementButtonGap", 0);
             decrGap = style.getInt(context, "ScrollBar.decrementButtonGap", 0);
 
-            // handle scaling for sizeVarients for special case components. The
+            // handle scaling for sizeVariants for special case components. The
             // key "JComponent.sizeVariant" scales for large/small/mini
             // components are based on Apples LAF
             String scaleKey = (String)scrollbar.getClientProperty(
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSliderUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSliderUI.java
index bdc2dd08182..038adcce9f5 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSliderUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSliderUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -157,7 +157,7 @@ private void updateStyle(JSlider c) {
             thumbHeight =
                 style.getInt(context, "Slider.thumbHeight", 14);
 
-            // handle scaling for sizeVarients for special case components. The
+            // handle scaling for sizeVariants for special case components. The
             // key "JComponent.sizeVariant" scales for large/small/mini
             // components are based on Apples LAF
             String scaleKey = (String)slider.getClientProperty(
diff --git a/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
index db19b81e8e5..6c21e71c2ef 100644
--- a/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2192,7 +2192,7 @@ public TreeNode getChildAt(int childIndex) {
         /**
          * Returns the number of children <code>TreeNode</code>'s
          * receiver contains.
-         * @return the number of children <code>TreeNodews</code>'s
+         * @return the number of children <code>TreeNode</code>'s
          * receiver contains
          */
         public int getChildCount() {
diff --git a/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java b/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
index 07a8301f0b5..ea7e35a0ae3 100644
--- a/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@ public abstract class AbstractWriter {
     private int startOffset = 0;
     private int endOffset = 0;
     // If (indentLevel * indentSpace) becomes >= maxLineLength, this will
-    // get incremened instead of indentLevel to avoid indenting going greater
+    // get incremented instead of indentLevel to avoid indenting going greater
     // than line length.
     private int offsetIndent = 0;
 
diff --git a/src/java.desktop/share/classes/javax/swing/text/CompositeView.java b/src/java.desktop/share/classes/javax/swing/text/CompositeView.java
index ce1f11dae97..a79bb9b9ac3 100644
--- a/src/java.desktop/share/classes/javax/swing/text/CompositeView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/CompositeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
  *
  * <p>While <code>CompositeView</code>
  * does not impose a layout policy on its child <code>View</code>s,
- * it does allow for inseting the child <code>View</code>s
+ * it does allow for insetting the child <code>View</code>s
  * it will contain.  The insets can be set by either
  * {@link #setInsets} or {@link #setParagraphInsets}.
  *
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java b/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
index 4449519ce40..cf8220efb75 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
@@ -252,7 +252,7 @@ public int getUpdatePolicy() {
     }
 
     /**
-     * Gets the text editor component that this caret is
+     * Gets the text editor component that this caret
      * is bound to.
      *
      * @return the component
@@ -1287,12 +1287,12 @@ boolean isPositionLTR(int position, Position.Bias bias) {
 
     Position.Bias guessBiasForOffset(int offset, Position.Bias lastBias,
                                      boolean lastLTR) {
-        // There is an abiguous case here. That if your model looks like:
+        // There is an ambiguous case here. If your model looks like:
         // abAB with the cursor at abB]A (visual representation of
         // 3 forward) deleting could either become abB] or
-        // ab[B. I'ld actually prefer abB]. But, if I implement that
-        // a delete at abBA] would result in aBA] vs a[BA which I
-        // think is totally wrong. To get this right we need to know what
+        // ab[B. I'd actually prefer abB]. But, if I implement that,
+        // a delete at abBA] would result in aBA] vs a[BA which, I
+        // think, is totally wrong. To get this right we need to know what
         // was deleted. And we could get this from the bidi structure
         // in the change event. So:
         // PENDING: base this off what was deleted.
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
index d31f1abd147..b71d30656db 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1570,7 +1570,7 @@ private int constrainOffset(JTextComponent text, int offset) {
         }
 
         /**
-         * Returns adjustsed {@code y} position that indicates the location to scroll to
+         * Returns adjusted {@code y} position that indicates the location to scroll to
          * after selecting <code>index</code>.
          */
         @SuppressWarnings("deprecation")
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java b/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java
index a3c5e0f1d0f..df7417ccf13 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,7 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
     /** Indicates if the value being edited must match the mask. */
     private boolean allowsInvalid;
 
-    /** If true, editing mode is in overwrite (or strikethough). */
+    /** If true, overwrite mode is enabled. */
     private boolean overwriteMode;
 
     /** If true, any time a valid edit happens commitEdit is invoked. */
@@ -159,7 +159,7 @@ public boolean getCommitsOnValidEdit() {
      * <code>overwriteMode</code> is true (the default), new characters
      * overwrite existing characters in the model.
      *
-     * @param overwriteMode Indicates if overwrite or overstrike mode is used
+     * @param overwriteMode Indicates if overwrite mode is used
      */
     public void setOverwriteMode(boolean overwriteMode) {
         this.overwriteMode = overwriteMode;
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java b/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
index eae6add9cd4..60ca2d72634 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2351,7 +2351,7 @@ void fractureFrom(ElemChanges[] changed, int startIndex,
          * Recreates <code>toDuplicate</code>. This is called when an
          * element needs to be created as the result of an insertion. This
          * will recurse and create all the children. This is similar to
-         * <code>clone</code>, but deteremines the offsets differently.
+         * <code>clone</code>, but determines the offsets differently.
          */
         Element recreateFracturedElement(Element parent, Element toDuplicate) {
             if(toDuplicate.isLeaf()) {
diff --git a/src/java.desktop/share/classes/javax/swing/text/Document.java b/src/java.desktop/share/classes/javax/swing/text/Document.java
index b36d7b984e3..53ff88749cd 100644
--- a/src/java.desktop/share/classes/javax/swing/text/Document.java
+++ b/src/java.desktop/share/classes/javax/swing/text/Document.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -467,7 +467,7 @@ public interface Document {
     /**
      * Inserts a string of content.  This will cause a DocumentEvent
      * of type DocumentEvent.EventType.INSERT to be sent to the
-     * registered DocumentListers, unless an exception is thrown.
+     * registered DocumentListeners, unless an exception is thrown.
      * The DocumentEvent will be delivered by calling the
      * insertUpdate method on the DocumentListener.
      * The offset and length of the generated DocumentEvent
diff --git a/src/java.desktop/share/classes/javax/swing/text/GapContent.java b/src/java.desktop/share/classes/javax/swing/text/GapContent.java
index bff876ed8cc..2c198fbc763 100644
--- a/src/java.desktop/share/classes/javax/swing/text/GapContent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/GapContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -256,7 +256,7 @@ public Position createPosition(int offset) throws BadLocationException {
         if (sortIndex < marks.size()
             && (m = marks.elementAt(sortIndex)).index == index
             && (position = m.getPosition()) != null) {
-            //position references the correct StickyPostition
+            //position references the correct StickyPosition
         } else {
             position = new StickyPosition();
             m = new MarkData(index,position,queue);
@@ -784,7 +784,7 @@ protected void updateUndoPositions(Vector positions, int offset,
             startIndex = 0;
         }
 
-        // Reset the location of the refenences.
+        // Reset the location of the references.
         for(int counter = positions.size() - 1; counter >= 0; counter--) {
             UndoPosRef ref = (UndoPosRef) positions.elementAt(counter);
             ref.resetLocation(endOffset, g1);
diff --git a/src/java.desktop/share/classes/javax/swing/text/GlyphView.java b/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
index ba5364b5130..07fff2e9989 100644
--- a/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -973,7 +973,7 @@ void updateAfterChange() {
     }
 
     /**
-     * Class to hold data needed to justify this GlyphView in a PargraphView.Row
+     * Class to hold data needed to justify this GlyphView in a ParagraphView.Row
      */
     static class JustificationInfo {
         //justifiable content start
diff --git a/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java b/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java
index e18a772e1c1..c9baae02ca1 100644
--- a/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -113,7 +113,7 @@ public class InternationalFormatter extends DefaultFormatter {
     private Comparable<?> min;
 
     /**
-     * <code>InternationalFormatter</code>'s behavior is dicatated by a
+     * <code>InternationalFormatter</code>'s behavior is dictated by a
      * <code>AttributedCharacterIterator</code> that is obtained from
      * the <code>Format</code>. On every edit, assuming
      * allows invalid is false, the <code>Format</code> instance is invoked
diff --git a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
index c5e9dbd94df..1a11f5c6e37 100644
--- a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -4317,7 +4317,7 @@ public String toString() {
      * Action is returned, if not and the KeyStroke represents a
      * KeyTyped event and the Keymap has a defaultAction,
      * <code>DefaultActionKey</code> is returned.
-     * <p>KeymapActionMap is then able to transate the object passed in
+     * <p>KeymapActionMap is then able to translate the object passed in
      * to either message the Keymap, or message its default implementation.
      */
     static class KeymapWrapper extends InputMap {
diff --git a/src/java.desktop/share/classes/javax/swing/text/StringContent.java b/src/java.desktop/share/classes/javax/swing/text/StringContent.java
index 256f11478ca..562b336c770 100644
--- a/src/java.desktop/share/classes/javax/swing/text/StringContent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StringContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -382,7 +382,7 @@ protected void resetLocation() {
             rec.offset = undoLocation;
         }
 
-        /** Location to reset to when resetLocatino is invoked. */
+        /** Location to reset to when resetLocation is invoked. */
         protected int undoLocation;
         /** Position to reset offset. */
         protected PosRec rec;
diff --git a/src/java.desktop/share/classes/javax/swing/text/StyleContext.java b/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
index 641dcf9bb10..e01703ea35f 100644
--- a/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -496,7 +496,7 @@ protected int getCompressionThreshold() {
      * behavior of SmallAttributeSet.  This can be reimplemented
      * to return an AttributeSet that provides some sort of
      * attribute conversion.
-     * @param a The set of attributes to be represented in the
+     * @param a The set of attributes to be represented in
      *  the compact form.
      * @return a compact set of attributes that might be shared
      */
@@ -513,7 +513,7 @@ protected SmallAttributeSet createSmallAttributeSet(AttributeSet a) {
      * to return a MutableAttributeSet that provides some sort of
      * attribute conversion.
      *
-     * @param a The set of attributes to be represented in the
+     * @param a The set of attributes to be represented in
      *  the larger form.
      * @return a large set of attributes that should trade off
      * space for time
@@ -535,7 +535,7 @@ synchronized void removeUnusedSets() {
      * is not found, we create a new set and add it to the pool.
      */
     AttributeSet getImmutableUniqueSet() {
-        // PENDING(prinz) should consider finding a alternative to
+        // PENDING(prinz) should consider finding an alternative to
         // generating extra garbage on search key.
         SmallAttributeSet key = createSmallAttributeSet(search);
         WeakReference<SmallAttributeSet> reference = attributesPool.get(key);
diff --git a/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
index a4984efce6c..e2630c93623 100644
--- a/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -243,7 +243,7 @@ void updateInputAttributes(int dot, int mark, JTextComponent c) {
             currentParagraph = doc.getParagraphElement(start);
             if (currentParagraph.getStartOffset() == start || dot != mark) {
                 // Get the attributes from the character at the selection
-                // if in a different paragrah!
+                // if in a different paragraph!
                 run = doc.getCharacterElement(start);
             }
             else {
diff --git a/src/java.desktop/share/classes/javax/swing/text/Utilities.java b/src/java.desktop/share/classes/javax/swing/text/Utilities.java
index a9d51d6d9f6..2c7a8c671da 100644
--- a/src/java.desktop/share/classes/javax/swing/text/Utilities.java
+++ b/src/java.desktop/share/classes/javax/swing/text/Utilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -140,7 +140,7 @@ static final int drawTabbedText(View view,
     // In addition to the previous method it can extend spaces for
     // justification.
     //
-    // all params are the same as in the preious method except the last
+    // all params are the same as in the previous method except the last
     // one:
     // @param justificationData justificationData for the row.
     // if null not justification is needed
@@ -275,7 +275,7 @@ public static final float getTabbedTextWidth(Segment s, FontMetrics metrics,
     // In addition to the previous method it can extend spaces for
     // justification.
     //
-    // all params are the same as in the preious method except the last
+    // all params are the same as in the previous method except the last
     // one:
     // @param justificationData justificationData for the row.
     // if null not justification is needed
@@ -475,7 +475,7 @@ public static final int getTabbedTextOffset(Segment s,
     // In addition to the previous method it can extend spaces for
     // justification.
     //
-    // all params are the same as in the preious method except the last
+    // all params are the same as in the previous method except the last
     // one:
     // @param justificationData justificationData for the row.
     // if null not justification is needed
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java
index db09ab17d24..4f775580946 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java
@@ -1654,7 +1654,7 @@ public AccessibleRole getAccessibleRole() {
              *
              * @see #getAccessibleParent
              * @see #getAccessibleChildrenCount
-             * @gsee #getAccessibleChild
+             * @see #getAccessibleChild
              */
             public int getAccessibleIndexInParent() {
                 return elementInfo.getIndexInParent();
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
index 61463eb431f..4fb374d8018 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1641,7 +1641,7 @@ private void removeElementsAtEnd(Element e, int index, int count,
             // e.getElement(index - 1) should represent the newline.
             index--;
             if (endE.getParentElement() != e) {
-                // The hiearchies don't match, we'll have to manually
+                // The hierarchies don't match, we'll have to manually
                 // recreate the leaf at e.getElement(index - 1)
                 replace(dde, e, index, ++count, start, end, true, true);
             }
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java b/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java
index 9f7b334edbe..78e3e1f0d5d 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -893,7 +893,7 @@ private View getAltView() {
     }
 
     /**
-     * Invokes <code>preferenceChanged</code> on the event displatching
+     * Invokes <code>preferenceChanged</code> on the event dispatching
      * thread.
      */
     private void safePreferenceChanged() {
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/Map.java b/src/java.desktop/share/classes/javax/swing/text/html/Map.java
index c88d4e7495b..39660cc4f11 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/Map.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/Map.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,7 +93,7 @@ public void removeArea(AttributeSet as) {
     }
 
     /**
-     * Returns the AttributeSets representing the differet areas of the Map.
+     * Returns the AttributeSets representing the different areas of the Map.
      */
     public AttributeSet[] getAreas() {
         int numAttributes = (areaAttributes != null) ? areaAttributes.size() :
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java
index 4704cfd2583..b448fef1091 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -928,7 +928,7 @@ void skipSpace() throws IOException {
 
     /**
      * Parse identifier. Uppercase characters are folded
-     * to lowercase when lower is true. Returns falsed if
+     * to lowercase when lower is true. Returns false if
      * no identifier is found. [55] 346:17
      */
     boolean parseIdentifier(boolean lower) throws IOException {
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
index 425e79f8541..822cbf8c98a 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -348,7 +348,7 @@ public void nodesWereInserted(TreeNode node, int[] childIndices) {
       * must be sorted in ascending order. And removedChildren should be
       * the array of the children objects that were removed.
       *
-      * @param node             parent node which childred were removed
+      * @param node             parent node from which children were removed
       * @param childIndices     indexes of removed children
       * @param removedChildren  array of the children objects that were removed
       */
@@ -362,7 +362,7 @@ public void nodesWereRemoved(TreeNode node, int[] childIndices,
 
     /**
       * Invoke this method after you've changed how the children identified by
-      * childIndicies are to be represented in the tree.
+      * childIndices are to be represented in the tree.
       *
       * @param node         changed node
       * @param childIndices indexes of changed children
diff --git a/src/java.desktop/share/classes/javax/swing/tree/TreeNode.java b/src/java.desktop/share/classes/javax/swing/tree/TreeNode.java
index 04ad545b919..49d05368893 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/TreeNode.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/TreeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,7 @@ public interface TreeNode
      * If the receiver does not contain <code>node</code>, -1 will be
      * returned.
      *
-     * @param   node        node to be loked for
+     * @param   node        node to be looked for
      * @return              index of specified node
      */
     int getIndex(TreeNode node);
diff --git a/src/java.desktop/share/classes/javax/swing/tree/TreeSelectionModel.java b/src/java.desktop/share/classes/javax/swing/tree/TreeSelectionModel.java
index 1c790532e88..7a803592094 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/TreeSelectionModel.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/TreeSelectionModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -209,7 +209,7 @@ public interface TreeSelectionModel
       * Returns true if the path, <code>path</code>, is in the current
       * selection.
       *
-      * @param  path    the path to be loked for
+      * @param  path    the path to be looked for
       * @return         whether the {@code path} is in the current selection
       */
     boolean isPathSelected(TreePath path);
diff --git a/src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java b/src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java
index aea072f3ea8..f593a99bb99 100644
--- a/src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java
+++ b/src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,7 +66,7 @@
  * <p>
  * Say we want to implement addDirtyRegion(Rectangle rect)
  * which sends this region to the
- * {@code handleDirtyRegions(List<Rect> regiouns)} on the EDT.
+ * {@code handleDirtyRegions(List<Rect> regions)} on the EDT.
  * addDirtyRegions better be accumulated before handling on the EDT.
  *
  * <p>
diff --git a/src/java.desktop/share/classes/sun/swing/DefaultLookup.java b/src/java.desktop/share/classes/sun/swing/DefaultLookup.java
index bc17c0bae2e..d7a7f22eba3 100644
--- a/src/java.desktop/share/classes/sun/swing/DefaultLookup.java
+++ b/src/java.desktop/share/classes/sun/swing/DefaultLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,7 @@ public static void setDefaultLookup(DefaultLookup lookup) {
             }
             else if (lookup == null) {
                 // null was passed in, but someone has invoked setDefaultLookup
-                // with a non-null value, use an instance of DefautLookup
+                // with a non-null value, use an instance of DefaultLookup
                 // which will fallback to UIManager.
                 lookup = new DefaultLookup();
             }
diff --git a/src/java.desktop/share/classes/sun/swing/FilePane.java b/src/java.desktop/share/classes/sun/swing/FilePane.java
index d391eba5bb8..7f83625f476 100644
--- a/src/java.desktop/share/classes/sun/swing/FilePane.java
+++ b/src/java.desktop/share/classes/sun/swing/FilePane.java
@@ -130,8 +130,8 @@
  * this public API.
  * <p>
  * This component is intended to be used in a subclass of
- * javax.swing.plaf.basic.BasicFileChooserUI. It realies heavily on the
- * implementation of BasicFileChooserUI, and is intended to be API compatible
+ * javax.swing.plaf.basic.BasicFileChooserUI. It relies heavily on the
+ * implementation of BasicFileChooserUI and is intended to be API compatible
  * with earlier implementations of MetalFileChooserUI and WindowsFileChooserUI.
  *
  * @author Leif Samuelsson
diff --git a/src/java.desktop/share/classes/sun/swing/LightweightContent.java b/src/java.desktop/share/classes/sun/swing/LightweightContent.java
index 4fef821cfce..eb283908e81 100644
--- a/src/java.desktop/share/classes/sun/swing/LightweightContent.java
+++ b/src/java.desktop/share/classes/sun/swing/LightweightContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,7 +117,7 @@ public interface LightweightContent {
      * @param height the logical height of the image
      * @param linestride the line stride of the pixel buffer
      * @param scale the scale factor of the pixel buffer
-     * @Deprecated replaced by
+     * @deprecated replaced by
      * {@link #imageBufferReset(int[],int,int,int,int,int,double,double)}
      */
     @Deprecated(since = "9")
diff --git a/src/java.desktop/share/classes/sun/swing/PrintingStatus.java b/src/java.desktop/share/classes/sun/swing/PrintingStatus.java
index 05b730c620e..1f7358a2881 100644
--- a/src/java.desktop/share/classes/sun/swing/PrintingStatus.java
+++ b/src/java.desktop/share/classes/sun/swing/PrintingStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -236,9 +236,9 @@ private void disposeOnEDT() {
     }
 
     /**
-     * Returns whether the printng was aborted using this PrintingStatus
+     * Returns whether the printing was aborted using this PrintingStatus
      *
-     * @return whether the printng was aborted using this PrintingStatus
+     * @return whether the printing was aborted using this PrintingStatus
      */
     public boolean isAborted() {
         return isAborted.get();
diff --git a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
index 706ba51b740..85c242ece4f 100644
--- a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
+++ b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -234,7 +234,7 @@ public static final boolean isComplexLayout(char[] text, int start, int limit) {
     // WARNING WARNING WARNING WARNING WARNING WARNING
     // Many of the following methods are invoked from older API.
     // As this older API was not passed a Component, a null Component may
-    // now be passsed in.  For example, SwingUtilities.computeStringWidth
+    // now be passed in.  For example, SwingUtilities.computeStringWidth
     // is implemented to call SwingUtilities2.stringWidth, the
     // SwingUtilities variant does not take a JComponent, as such
     // SwingUtilities2.stringWidth can be passed a null Component.
@@ -334,7 +334,7 @@ public static FontMetrics getFontMetrics(JComponent c, Graphics g) {
      * painting.  If a Graphics is not available the JComponent method of
      * the same name should be used.
      * <p>
-     * Callers should pass in a non-null JComonent, the exception
+     * Callers should pass in a non-null JComponent, the exception
      * to this is if a JComponent is not readily available at the time of
      * painting.
      * <p>
@@ -342,7 +342,7 @@ public static FontMetrics getFontMetrics(JComponent c, Graphics g) {
      * Graphics.
      *
      * @param c JComponent requesting FontMetrics, may be null
-     * @param c Graphics Graphics
+     * @param g Graphics
      * @param font Font to get FontMetrics for
      */
     @SuppressWarnings("deprecation")
@@ -350,7 +350,7 @@ public static FontMetrics getFontMetrics(JComponent c, Graphics g,
                                              Font font) {
         if (c != null) {
             // Note: We assume that we're using the FontMetrics
-            // from the widget to layout out text, otherwise we can get
+            // from the widget to lay out text, otherwise we can get
             // mismatches when printing.
             return c.getFontMetrics(font);
         }
@@ -2187,7 +2187,7 @@ public static int convertColumnIndexToView(TableColumnModel cm,
     /**
      * Sets the InputEvent.ALT_GRAPH mask on any modifier passed to the function
      * @param modifier the modifier passed
-     * @return the modifier retiurned with ALT_GRAPH flag set
+     * @return the modifier returned with ALT_GRAPH flag set
      */
     public static int setAltGraphMask(int modifier) {
         return (modifier | InputEvent.ALT_GRAPH_DOWN_MASK);
diff --git a/src/java.desktop/share/classes/sun/swing/icon/SortArrowIcon.java b/src/java.desktop/share/classes/sun/swing/icon/SortArrowIcon.java
index 54a0238640c..be0df72d274 100644
--- a/src/java.desktop/share/classes/sun/swing/icon/SortArrowIcon.java
+++ b/src/java.desktop/share/classes/sun/swing/icon/SortArrowIcon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@ public class SortArrowIcon implements Icon, UIResource, Serializable {
     /**
      * Creates a <code>SortArrowIcon</code>.
      *
-     * @param ascending if true, icon respresenting ascending sort, otherwise
+     * @param ascending if true, icon representing ascending sort, otherwise
      *        descending
      * @param color the color to render the icon
      */
@@ -72,7 +72,7 @@ public SortArrowIcon(boolean ascending, Color color) {
     /**
      * Creates a <code>SortArrowIcon</code>.
      *
-     * @param ascending if true, icon respresenting ascending sort, otherwise
+     * @param ascending if true, icon representing ascending sort, otherwise
      *        descending
      * @param colorKey the key used to find color in UIManager
      */
diff --git a/src/java.desktop/share/classes/sun/swing/plaf/DesktopProperty.java b/src/java.desktop/share/classes/sun/swing/plaf/DesktopProperty.java
index 3a8bbd5f269..86d240a91fc 100644
--- a/src/java.desktop/share/classes/sun/swing/plaf/DesktopProperty.java
+++ b/src/java.desktop/share/classes/sun/swing/plaf/DesktopProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -195,7 +195,7 @@ public void invalidate(LookAndFeel laf) {
     }
 
     /**
-     * Invalides the current value so that the next invocation of
+     * Invalidates the current value so that the next invocation of
      * <code>createValue</code> will ask for the property again.
      */
     public void invalidate() {
diff --git a/src/java.desktop/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java b/src/java.desktop/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java
index 55cf2bfdebc..448d3b31f95 100644
--- a/src/java.desktop/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java
+++ b/src/java.desktop/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,7 +88,7 @@ public DefaultSynthStyle() {
 
     /**
      * Creates a new DefaultSynthStyle that is a copy of the passed in
-     * style. Any StateInfo's of the passed in style are clonsed as well.
+     * style. Any StateInfo's of the passed in style are cloned as well.
      *
      * @param style Style to duplicate
      */
diff --git a/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java b/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
index 30b8ea05b2d..81789bcfdcf 100644
--- a/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
+++ b/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -721,7 +721,7 @@ public int getIconHeight() {
     }
 
     //
-    // DataModel for DirectoryComboxbox
+    // DataModel for DirectoryCombobox
     //
     protected DirectoryComboBoxModel createDirectoryComboBoxModel(JFileChooser fc) {
         return new DirectoryComboBoxModel();
@@ -905,7 +905,7 @@ public Component getListCellRendererComponent(JList<? extends FileFilter> list,
     }
 
     //
-    // DataModel for Types Comboxbox
+    // DataModel for Types Combobox
     //
     protected FilterComboBoxModel createFilterComboBoxModel() {
         return new FilterComboBoxModel();
@@ -942,9 +942,9 @@ public void setSelectedItem(Object filter) {
 
         public Object getSelectedItem() {
             // Ensure that the current filter is in the list.
-            // NOTE: we shouldnt' have to do this, since JFileChooser adds
+            // NOTE: we shouldn't have to do this, since JFileChooser adds
             // the filter to the choosable filters list when the filter
-            // is set. Lets be paranoid just in case someone overrides
+            // is set. Let's be paranoid just in case someone overrides
             // setFileFilter in JFileChooser.
             FileFilter currentFilter = getFileChooser().getFileFilter();
             boolean found = false;
diff --git a/src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java b/src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java
index 52635d738ce..3a2495b8957 100644
--- a/src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java
+++ b/src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java
@@ -198,7 +198,7 @@ private static boolean isFrameSetDocument(final Document document) {
      * Returns frames under the {@code editor}.
      * The frames are created if necessary.
      *
-     * @param editor the {@JEditorPane} to find the frames for
+     * @param editor the {@link JEditorPane} to find the frames for
      * @return list of all frames
      */
     private static List<JEditorPane> getFrames(final JEditorPane editor) {
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
index 65b1131a351..f94b58c5610 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,9 @@
  */
 public class WindowsCheckBoxUI extends WindowsRadioButtonUI
 {
-    // NOTE: MetalCheckBoxUI inherts from MetalRadioButtonUI instead
+    // NOTE: WindowsCheckBoxUI inherits from WindowsRadioButtonUI instead
     // of BasicCheckBoxUI because we want to pick up all the
-    // painting changes made in MetalRadioButtonUI.
+    // painting changes made in WindowsRadioButtonUI.
 
     private static final Object WINDOWS_CHECK_BOX_UI_KEY = new Object();
 
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopProperty.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopProperty.java
index 22a2f70d904..a7e7b428ab1 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopProperty.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ public class WindowsDesktopProperty extends DesktopProperty {
      */
     @Override
     protected final void updateAllUIs() {
-        // Check if the current UI is WindowsLookAndfeel and flush the XP style map.
+        // Check if the current UI is WindowsLookAndFeel and flush the XP style map.
         // Note: Change the package test if this class is moved to a different package.
         Class<?> uiClass = UIManager.getLookAndFeel().getClass();
         if (uiClass.getPackage().equals(WindowsDesktopProperty.class.getPackage())) {
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
index 92980c52a00..ed384932ff0 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1078,7 +1078,7 @@ public int getIconHeight() {
     }
 
     //
-    // DataModel for DirectoryComboxbox
+    // DataModel for DirectoryCombobox
     //
     protected DirectoryComboBoxModel createDirectoryComboBoxModel(JFileChooser fc) {
         return new DirectoryComboBoxModel();
@@ -1230,7 +1230,7 @@ public Component getListCellRendererComponent(JList<?> list,
     }
 
     //
-    // DataModel for Types Comboxbox
+    // DataModel for Types Combobox
     //
     protected FilterComboBoxModel createFilterComboBoxModel() {
         return new FilterComboBoxModel();
@@ -1267,9 +1267,9 @@ public void setSelectedItem(Object filter) {
 
         public Object getSelectedItem() {
             // Ensure that the current filter is in the list.
-            // NOTE: we shouldnt' have to do this, since JFileChooser adds
+            // NOTE: we shouldn't have to do this, since JFileChooser adds
             // the filter to the choosable filters list when the filter
-            // is set. Lets be paranoid just in case someone overrides
+            // is set. Let's be paranoid just in case someone overrides
             // setFileFilter in JFileChooser.
             FileFilter currentFilter = getFileChooser().getFileFilter();
             boolean found = false;
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
index d85fc0d9981..c730140c01c 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -628,7 +628,7 @@ protected void initComponentDefaults(UIDefaults table)
             "Button.font", ControlFont,
             "Button.background", ControlBackgroundColor,
             // Button.foreground, Button.shadow, Button.darkShadow,
-            // Button.disabledForground, and Button.disabledShadow are only
+            // Button.disabledForeground, and Button.disabledShadow are only
             // used for Windows Classic. Windows XP will use colors
             // from the current visual style.
             "Button.foreground", ControlTextColor,
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
index bf01850297b..f23cb31dff0 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
 
 /**
  * A class which tags a window with a particular semantic usage,
- * either tooltip, menu, sub-menu, popup-menu, or comobobox-popup.
+ * either tooltip, menu, sub-menu, popup-menu, or combobox-popup.
  * This is used as a temporary solution for getting native AWT support
  * for transition effects in Windows 98 and Windows 2000.  The native
  * code will interpret the windowType property and automatically
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java
index a215277ba43..5723d4274af 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java
@@ -162,7 +162,7 @@ static boolean isVista() {
      *    in the current style
      *
      * This is currently only used by WindowsInternalFrameTitlePane for painting
-     * title foregound and can be removed when no longer needed
+     * title foreground and can be removed when no longer needed
      */
     String getString(Component c, Part part, State state, Prop prop) {
         return getTypeEnumName(c, part, state, prop);
@@ -222,7 +222,7 @@ Dimension getDimension(Component c, Part part, State state, Prop prop) {
      *    in the current style
      *
      * This is currently only used by WindowsInternalFrameTitlePane for painting
-     * title foregound and can be removed when no longer needed
+     * title foreground and can be removed when no longer needed
      */
     Point getPoint(Component c, Part part, State state, Prop prop) {
         Dimension d = ThemeReader.getPosition(part.getControlName(c), part.getValue(),
@@ -237,7 +237,7 @@ Point getPoint(Component c, Part part, State state, Prop prop) {
      *    in the current style
      *
      * This is currently only used to create borders and by
-     * WindowsInternalFrameTitlePane for painting title foregound.
+     * WindowsInternalFrameTitlePane for painting title foreground.
      * The return value is already cached in those places.
      */
     Insets getMargin(Component c, Part part, State state, Prop prop) {

From 31c4e03d5d4682a10825bd7cf2d37971e686b31e Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Fri, 15 Sep 2023 09:48:58 +0000
Subject: [PATCH 041/112] 8314551: More generic way to handshake GC threads
 with monitor deflation

Reviewed-by: jsjolen, eosterlund
---
 src/hotspot/share/runtime/synchronizer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index 0d98e921470..c83df922e0d 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -24,7 +24,7 @@
 
 #include "precompiled.hpp"
 #include "classfile/vmSymbols.hpp"
-#include "gc/shared/suspendibleThreadSet.hpp"
+#include "gc/shared/collectedHeap.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
@@ -1641,8 +1641,8 @@ class VM_RendezvousGCThreads : public VM_Operation {
   bool evaluate_at_safepoint() const override { return false; }
   VMOp_Type type() const override { return VMOp_RendezvousGCThreads; }
   void doit() override {
-    SuspendibleThreadSet::synchronize();
-    SuspendibleThreadSet::desynchronize();
+    Universe::heap()->safepoint_synchronize_begin();
+    Universe::heap()->safepoint_synchronize_end();
   };
 };
 

From 42dc6b5d3a620c208717d875eb4caa5dc74013f2 Mon Sep 17 00:00:00 2001
From: Feilong Jiang <fjiang@openjdk.org>
Date: Fri, 15 Sep 2023 10:04:43 +0000
Subject: [PATCH 042/112] 8316182: RISC-V: SA stack walking code having trouble
 finding sender frame when invoking LambdaForms is involved

Reviewed-by: fyang
---
 .../hotspot/runtime/riscv64/RISCV64Frame.java | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64Frame.java
index 90d070112db..b21a163e970 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64Frame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64Frame.java
@@ -322,24 +322,17 @@ private Frame senderForEntryFrame(RISCV64RegisterMap map) {
   //------------------------------------------------------------------------------
   // frame::adjust_unextended_sp
   private void adjustUnextendedSP() {
-    // If we are returning to a compiled MethodHandle call site, the
-    // saved_fp will in fact be a saved value of the unextended SP.  The
-    // simplest way to tell whether we are returning to such a call site
-    // is as follows:
+    // Sites calling method handle intrinsics and lambda forms are
+    // treated as any other call site. Therefore, no special action is
+    // needed when we are returning to any of these call sites.
 
     CodeBlob cb = cb();
     NMethod senderNm = (cb == null) ? null : cb.asNMethodOrNull();
     if (senderNm != null) {
-      // If the sender PC is a deoptimization point, get the original
-      // PC.  For MethodHandle call site the unextended_sp is stored in
-      // saved_fp.
-      if (senderNm.isDeoptMhEntry(getPC())) {
-        raw_unextendedSP = getFP();
-      }
-      else if (senderNm.isDeoptEntry(getPC())) {
-      }
-      else if (senderNm.isMethodHandleReturn(getPC())) {
-        raw_unextendedSP = getFP();
+      // If the sender PC is a deoptimization point, get the original PC.
+      if (senderNm.isDeoptEntry(getPC()) ||
+          senderNm.isDeoptMhEntry(getPC())) {
+        // DEBUG_ONLY(verifyDeoptriginalPc(senderNm, raw_unextendedSp));
       }
     }
   }

From bd268137ed2e97d5ca6842758bd49ca66e8a3859 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Fri, 15 Sep 2023 11:39:16 +0000
Subject: [PATCH 043/112] 8316295: Serial: Remove empty
 Generation::promotion_failure_occurred

Reviewed-by: tschatzl
---
 src/hotspot/share/gc/serial/defNewGeneration.cpp | 2 --
 src/hotspot/share/gc/shared/generation.hpp       | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index 5c5b68e1414..541521e3411 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -846,8 +846,6 @@ void DefNewGeneration::collect(bool   full,
     from()->set_next_compaction_space(to());
     heap->set_incremental_collection_failed();
 
-    // Inform the next generation that a promotion failure occurred.
-    _old_gen->promotion_failure_occurred();
     _gc_tracer->report_promotion_failed(_promotion_failed_info);
 
     // Reset the PromotionFailureALot counters.
diff --git a/src/hotspot/share/gc/shared/generation.hpp b/src/hotspot/share/gc/shared/generation.hpp
index 59d07cb9210..6af578e4ab2 100644
--- a/src/hotspot/share/gc/shared/generation.hpp
+++ b/src/hotspot/share/gc/shared/generation.hpp
@@ -142,12 +142,6 @@ class Generation: public CHeapObj<mtGC> {
   // might be attempted in the worst case.
   virtual bool promotion_attempt_is_safe(size_t max_promotion_in_bytes) const;
 
-  // For a non-young generation, this interface can be used to inform a
-  // generation that a promotion attempt into that generation failed.
-  // Typically used to enable diagnostic output for post-mortem analysis,
-  // but other uses of the interface are not ruled out.
-  virtual void promotion_failure_occurred() { /* does nothing */ }
-
   // Return an estimate of the maximum allocation that could be performed
   // in the generation without triggering any collection or expansion
   // activity.  It is "unsafe" because no locks are taken; the result

From 3c743cfea00692d0b938cb1cbde936084eecf369 Mon Sep 17 00:00:00 2001
From: Sean Mullan <mullan@openjdk.org>
Date: Fri, 15 Sep 2023 13:12:15 +0000
Subject: [PATCH 044/112] 8312126: NullPointerException in CertStore.getCRLs
 after 8297955

Reviewed-by: weijun
---
 .../security/provider/certpath/ldap/LDAPCertStoreImpl.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java b/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java
index caff5e76104..39a787bf4fb 100644
--- a/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java
+++ b/src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java
@@ -779,9 +779,13 @@ synchronized Collection<X509CRL> getCRLs(X509CRLSelector xsel,
                 } catch (IllegalArgumentException e) {
                     continue;
                 }
-            } else {
+            } else if (nameObject instanceof String) {
                 issuerName = (String)nameObject;
+            } else {
+                throw new CertStoreException(
+                    "unrecognized issuerName: must be String or byte[]");
             }
+
             // If all we want is CA certs, try to get the (probably shorter) ARL
             Collection<X509CRL> entryCRLs = Collections.emptySet();
             if (certChecking == null || certChecking.getBasicConstraints() != -1) {

From 8dfde28b289cbb53173f0ab759156088bbaf74f1 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Fri, 15 Sep 2023 15:15:46 +0000
Subject: [PATCH 045/112] 8315485: (fs) Move java/nio/file/Path/Misc.java tests
 into java/nio/file/Path/PathOps.java

Reviewed-by: alanb
---
 test/jdk/java/nio/file/Path/Misc.java    | 88 ------------------------
 test/jdk/java/nio/file/Path/PathOps.java | 64 ++++++++++++++++-
 2 files changed, 61 insertions(+), 91 deletions(-)
 delete mode 100644 test/jdk/java/nio/file/Path/Misc.java

diff --git a/test/jdk/java/nio/file/Path/Misc.java b/test/jdk/java/nio/file/Path/Misc.java
deleted file mode 100644
index 550f4588f20..00000000000
--- a/test/jdk/java/nio/file/Path/Misc.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @bug 4313887 6838333 7029979
- * @summary Unit test for miscellenous java.nio.file.Path methods
- * @library .. /test/lib
- * @build jdk.test.lib.Platform
- * @run main Misc
- */
-
-import java.io.*;
-import java.nio.file.*;
-
-import jdk.test.lib.Platform;
-
-public class Misc {
-    public static void main(String[] args) throws IOException {
-        Path dir = TestUtil.createTemporaryDirectory();
-        try {
-            // equals and hashCode methods
-            testEqualsAndHashCode();
-
-            // toFile method
-            testToFile(dir);
-        } finally {
-            TestUtil.removeAll(dir);
-        }
-    }
-
-    /**
-     * Exercise equals and hashCode methods
-     */
-    static void testEqualsAndHashCode() {
-        Path thisFile = Paths.get("this");
-        Path thatFile = Paths.get("that");
-
-        assertTrue(thisFile.equals(thisFile));
-        assertTrue(!thisFile.equals(thatFile));
-
-        assertTrue(!thisFile.equals(null));
-        assertTrue(!thisFile.equals(new Object()));
-
-        Path likeThis = Paths.get("This");
-        if (Platform.isWindows()) {
-            // case insensitive
-            assertTrue(thisFile.equals(likeThis));
-            assertTrue(thisFile.hashCode() == likeThis.hashCode());
-        } else {
-            // case senstive
-            assertTrue(!thisFile.equals(likeThis));
-        }
-    }
-
-    /**
-     * Exercise toFile method
-     */
-    static void testToFile(Path dir) throws IOException {
-        File d = dir.toFile();
-        assertTrue(d.toString().equals(dir.toString()));
-        assertTrue(d.toPath().equals(dir));
-    }
-
-    static void assertTrue(boolean okay) {
-        if (!okay)
-            throw new RuntimeException("Assertion Failed");
-    }
-}
diff --git a/test/jdk/java/nio/file/Path/PathOps.java b/test/jdk/java/nio/file/Path/PathOps.java
index eab74101769..a2d9dd69f99 100644
--- a/test/jdk/java/nio/file/Path/PathOps.java
+++ b/test/jdk/java/nio/file/Path/PathOps.java
@@ -22,16 +22,22 @@
  */
 
 /* @test
- * @bug 4313887 6838333 6925932 7006126 8037945 8072495 8140449 8254876 8262742
- *      8298478
+ * @bug 4313887 6838333 6925932 7006126 7029979 8037945 8072495 8140449
+ *      8254876 8262742 8298478
  * @summary Unit test for java.nio.file.Path path operations
+ * @library .. /test/lib
+ * @build jdk.test.lib.Platform
+ * @run main PathOps
  */
 
+import java.io.File;
 import java.nio.file.FileSystems;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import jdk.test.lib.Platform;
+
 public class PathOps {
 
     static final java.io.PrintStream out = System.out;
@@ -239,6 +245,34 @@ PathOps normalize(String expected) {
         return this;
     }
 
+    PathOps equals(String other) {
+        out.format("test equals %s\n", other);
+        checkPath();
+
+        Path that = Path.of(other);
+        check(that, path.toString());
+        check(path.hashCode() == that.hashCode(), true);
+
+        return this;
+    }
+
+    PathOps notEquals(Object other) {
+        out.format("test not equals %s\n", other);
+        checkPath();
+        check(path.equals(other), false);
+
+        return this;
+    }
+
+    PathOps toFile() {
+        out.println("check toFile");
+        checkPath();
+        File file = path.toFile();
+        check(file.toString(), path.toString());
+        check(file.toPath().equals(path), true);
+        return this;
+    }
+
     PathOps string(String expected) {
         out.println("check string representation");
         checkPath();
@@ -1444,6 +1478,18 @@ static void doWindowsTests() {
             .parent(null)
             .name(null);
 
+        // equals
+        test("this")
+            .equals("this")
+            .notEquals(Path.of("that"))
+            .notEquals(null)
+            .notEquals(new Object())
+            .equals(Path.of("This"));
+
+        // toFile
+        test("C:\\foo\\bar\\gus")
+            .toFile();
+
         // invalid
         test(":\\foo")
             .invalid();
@@ -2121,6 +2167,18 @@ static void doUnixTests() {
         test("/foo/bar/gus/../..")
             .normalize("/foo");
 
+        // equals
+        test("this")
+            .equals("this")
+            .notEquals(Path.of("that"))
+            .notEquals(null)
+            .notEquals(new Object())
+            .notEquals(Path.of("This"));
+
+        // toFile
+        test("/foo/bar/gus")
+            .toFile();
+
         // invalid
         test("foo\u0000bar")
             .invalid();
@@ -2198,7 +2256,7 @@ public static void main(String[] args) {
 
         // operating system specific
         String osname = System.getProperty("os.name");
-        if (osname.startsWith("Windows")) {
+        if (Platform.isWindows()) {
             doWindowsTests();
         } else {
             doUnixTests();

From dc5ca1d3798727fd29a6a40e9f7777cb7f85c004 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Fri, 15 Sep 2023 17:21:27 +0000
Subject: [PATCH 046/112] 8316031: SSLFlowDelegate should not log from
 synchronized block

Reviewed-by: djelinski
---
 .../jdk/internal/net/http/common/SSLFlowDelegate.java  | 10 ++++++----
 .../java/net/httpclient/HttpClientLocalAddrTest.java   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLFlowDelegate.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLFlowDelegate.java
index 659e5289ce5..09845636b89 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLFlowDelegate.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLFlowDelegate.java
@@ -971,10 +971,12 @@ private void handleError(Throwable t) {
 
     boolean stopped;
 
-    private synchronized void normalStop() {
-        if (stopped)
-            return;
-        stopped = true;
+    private void normalStop() {
+        synchronized (this) {
+            if (stopped)
+                return;
+            stopped = true;
+        }
         reader.stop();
         writer.stop();
         // make sure the alpnCF is completed.
diff --git a/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java b/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
index d09322fd4a6..f97cfcec243 100644
--- a/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
+++ b/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
@@ -54,7 +54,7 @@
  * @test
  * @summary Tests HttpClient usage when configured with a local address to bind
  *          to, when sending requests
- * @bug 8209137
+ * @bug 8209137 8316031
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  *
  * @build jdk.test.lib.net.SimpleSSLContext jdk.test.lib.net.IPSupport

From 149acd186ed68d290e22dc2c86e17f46ef68b124 Mon Sep 17 00:00:00 2001
From: Pavel Rappo <prappo@openjdk.org>
Date: Fri, 15 Sep 2023 17:32:41 +0000
Subject: [PATCH 047/112] 8316207: Fix typos in java.io.StreamTokenizer

Reviewed-by: naoto
---
 src/java.base/share/classes/java/io/StreamTokenizer.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/io/StreamTokenizer.java b/src/java.base/share/classes/java/io/StreamTokenizer.java
index 292e7ff15a8..e44f95d6169 100644
--- a/src/java.base/share/classes/java/io/StreamTokenizer.java
+++ b/src/java.base/share/classes/java/io/StreamTokenizer.java
@@ -115,7 +115,7 @@ public class StreamTokenizer {
      *     has been reached.
      * </ul>
      * <p>
-     * The initial value of this field is -4.
+     * The initial value of this field is {@value TT_NOTHING}.
      *
      * @see     java.io.StreamTokenizer#eolIsSignificant(boolean)
      * @see     java.io.StreamTokenizer#nextToken()
@@ -344,7 +344,7 @@ public void ordinaryChar(int ch) {
     }
 
     /**
-     * Specified that the character argument starts a single-line
+     * Specifies that the character argument starts a single-line
      * comment. All characters from the comment character to the end of
      * the line are ignored by this stream tokenizer.
      *
@@ -478,7 +478,7 @@ public void slashSlashComments(boolean flag) {
      * If the flag argument is {@code true}, then the value in the
      * {@code sval} field is lowercased whenever a word token is
      * returned (the {@code ttype} field has the
-     * value {@code TT_WORD} by the {@code nextToken} method
+     * value {@code TT_WORD}) by the {@code nextToken} method
      * of this tokenizer.
      * <p>
      * If the flag argument is {@code false}, then the
@@ -755,7 +755,7 @@ public void pushBack() {
     }
 
     /**
-     * Return the current line number.
+     * Returns the current line number.
      *
      * @return  the current line number of this stream tokenizer.
      */

From 00504472b979a33a7a19a56dee8d332ad82e6bf4 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Fri, 15 Sep 2023 20:22:03 +0000
Subject: [PATCH 048/112] 8316148: Remove sun/tools/jhsdb/JStackStressTest.java
 from problem list

Reviewed-by: dholmes
---
 test/jdk/ProblemList.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 3428cd56b47..9f4a3b55c4c 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -730,8 +730,6 @@ sun/tools/jstat/jstatLineCounts2.sh                             8268211 linux-aa
 sun/tools/jstat/jstatLineCounts3.sh                             8268211 linux-aarch64
 sun/tools/jstat/jstatLineCounts4.sh                             8268211 linux-aarch64
 
-sun/tools/jhsdb/JStackStressTest.java                           8276210 linux-aarch64
-
 ############################################################################
 
 # jdk_other

From 8f46abc938ffe338e25d5fdbdcfa0aaa12edfa58 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Fri, 15 Sep 2023 20:32:38 +0000
Subject: [PATCH 049/112] 8315889: Open source several Swing HTMLDocument
 related tests

Reviewed-by: tr, azvegint
---
 .../text/html/HTMLDocument/bug4226914.java    | 52 ++++++++++++++
 .../text/html/HTMLDocument/bug4251593.java    | 64 +++++++++++++++++
 .../text/html/HTMLDocument/bug4687405.java    | 72 +++++++++++++++++++
 .../text/html/HTMLEditorKit/bug4213373.java   | 62 ++++++++++++++++
 4 files changed, 250 insertions(+)
 create mode 100644 test/jdk/javax/swing/text/html/HTMLDocument/bug4226914.java
 create mode 100644 test/jdk/javax/swing/text/html/HTMLDocument/bug4251593.java
 create mode 100644 test/jdk/javax/swing/text/html/HTMLDocument/bug4687405.java
 create mode 100644 test/jdk/javax/swing/text/html/HTMLEditorKit/bug4213373.java

diff --git a/test/jdk/javax/swing/text/html/HTMLDocument/bug4226914.java b/test/jdk/javax/swing/text/html/HTMLDocument/bug4226914.java
new file mode 100644
index 00000000000..8bfaae935a2
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/HTMLDocument/bug4226914.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+import javax.swing.JEditorPane;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+
+/*
+ * @test
+ * @bug 4226914
+ * @summary Tests if HTMLDocument streaming is broken
+ */
+
+public class bug4226914 {
+
+    public static void main(String[] args) throws Exception {
+        ObjectOutputStream oos = null;
+        try {
+            JEditorPane jtp = new JEditorPane("text/html", "<html></html>");
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            oos = new ObjectOutputStream(baos);
+            oos.writeObject(jtp.getDocument());
+            oos.flush();
+            baos.toByteArray();
+        } finally {
+            if (oos != null) {
+                oos.close();
+            }
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/HTMLDocument/bug4251593.java b/test/jdk/javax/swing/text/html/HTMLDocument/bug4251593.java
new file mode 100644
index 00000000000..bdd51d68a2e
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/HTMLDocument/bug4251593.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.event.ActionEvent;
+import javax.swing.Action;
+import javax.swing.JTextPane;
+import javax.swing.SwingUtilities;
+import javax.swing.text.html.HTML;
+import javax.swing.text.html.HTMLEditorKit;
+
+/*
+ * @test
+ * @bug 4251593
+ * @summary Tests that hyperlinks can be inserted into JTextPane
+ *          via InsertHTMLTextAction.
+ */
+
+public class bug4251593 {
+    private static JTextPane editor;
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            editor = new JTextPane();
+            editor.setContentType("text/html");
+            editor.setEditable(true);
+
+            int beforeLen = editor.getDocument().getLength();
+
+            String href = "<a HREF=\"https://java.sun.com\">javasoft </a>";
+            Action a = new HTMLEditorKit.InsertHTMLTextAction("Tester", href, HTML.Tag.BODY, HTML.Tag.A);
+            a.actionPerformed(new ActionEvent(editor, 0, null));
+
+            int afterLen = editor.getDocument().getLength();
+            try {
+                Thread.sleep(300);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            if ((afterLen - beforeLen) < 8) {
+                throw new RuntimeException("Test Failed: link not inserted!!");
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/HTMLDocument/bug4687405.java b/test/jdk/javax/swing/text/html/HTMLDocument/bug4687405.java
new file mode 100644
index 00000000000..5e549477072
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/HTMLDocument/bug4687405.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JEditorPane;
+import javax.swing.SwingUtilities;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.View;
+import javax.swing.text.html.CSS;
+import javax.swing.text.html.HTMLEditorKit;
+
+/*
+ * @test
+ * @bug 4687405
+ * @summary  Tests if HTMLDocument very first paragraph doesn't have top margin.
+ */
+
+public class bug4687405 {
+    private static JEditorPane jep;
+    private static volatile boolean passed = false;
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(bug4687405::createHTMLEditor);
+        Thread.sleep(200);
+
+        SwingUtilities.invokeAndWait(bug4687405::testEditorPane);
+        Thread.sleep(500);
+
+        if (!passed) {
+            throw new RuntimeException("Test failed!!" +
+                    " Top margin present in HTMLDocument");
+        }
+    }
+
+    public static void createHTMLEditor() {
+        jep = new JEditorPane();
+        jep.setEditorKit(new HTMLEditorKit());
+        jep.setEditable(false);
+    }
+
+    private static void testEditorPane() {
+        View v = jep.getUI().getRootView(jep);
+        while (!(v instanceof javax.swing.text.html.ParagraphView)) {
+            int n = v.getViewCount();
+            v = v.getView(n - 1);
+        }
+        AttributeSet attrs = v.getAttributes();
+        String marginTop = attrs.getAttribute(CSS.Attribute.MARGIN_TOP).toString();
+        // MARGIN_TOP of the very first paragraph of the default html
+        // document should be 0.
+        passed = "0".equals(marginTop);
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/HTMLEditorKit/bug4213373.java b/test/jdk/javax/swing/text/html/HTMLEditorKit/bug4213373.java
new file mode 100644
index 00000000000..621547faca5
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/HTMLEditorKit/bug4213373.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.text.html.HTMLEditorKit;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+/*
+ * @test
+ * @bug 4213373
+ * @summary  Serialization bug on HTMLEditorKit.
+ */
+
+public class bug4213373 {
+
+    public static void main(String[] args) throws Exception {
+        HTMLEditorKit ekr = null;
+        ObjectOutputStream oos = null;
+        ObjectInputStream ois = null;
+
+        try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            HTMLEditorKit ekw = new HTMLEditorKit();
+            oos = new ObjectOutputStream(baos);
+            oos.writeObject(ekw);
+            byte[] buf = baos.toByteArray();
+
+            ByteArrayInputStream bais = new ByteArrayInputStream(buf);
+            ois = new ObjectInputStream(bais);
+            ekr = (HTMLEditorKit) ois.readObject();
+        } finally {
+           if (oos != null) {
+               oos.close();
+           }
+           if (ois != null) {
+                ois.close();
+            }
+        }
+    }
+}

From c92bdb0e917e1251c0c2ef6b873df702b816c1f4 Mon Sep 17 00:00:00 2001
From: Pavel Rappo <prappo@openjdk.org>
Date: Sat, 16 Sep 2023 07:51:34 +0000
Subject: [PATCH 050/112] 8316187: Modernize examples in StringTokenizer and
 {Date,Number}Format

Reviewed-by: naoto
---
 src/java.base/share/classes/java/text/DateFormat.java      | 4 ++--
 src/java.base/share/classes/java/text/NumberFormat.java    | 4 ++--
 src/java.base/share/classes/java/util/StringTokenizer.java | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/java.base/share/classes/java/text/DateFormat.java b/src/java.base/share/classes/java/text/DateFormat.java
index ed6356e3fd8..162a89d7915 100644
--- a/src/java.base/share/classes/java/text/DateFormat.java
+++ b/src/java.base/share/classes/java/text/DateFormat.java
@@ -85,8 +85,8 @@
  * <blockquote>
  * {@snippet lang=java :
  * DateFormat df = DateFormat.getDateInstance();
- * for (int i = 0; i < myDate.length; ++i) {
- *     output.println(df.format(myDate[i]) + "; ");
+ * for (Date myDate : dates) {
+ *     output.println(df.format(myDate) + "; ");
  * }
  * }
  * </blockquote>
diff --git a/src/java.base/share/classes/java/text/NumberFormat.java b/src/java.base/share/classes/java/text/NumberFormat.java
index 4628870bbdb..19d4e2b6ee2 100644
--- a/src/java.base/share/classes/java/text/NumberFormat.java
+++ b/src/java.base/share/classes/java/text/NumberFormat.java
@@ -82,8 +82,8 @@
  * <blockquote>
  * {@snippet lang=java :
  * NumberFormat nf = NumberFormat.getInstance();
- * for (int i = 0; i < myNumber.length; ++i) {
- *     output.println(nf.format(myNumber[i]) + "; ");
+ * for (var myNumber : numbers) {
+ *     output.println(nf.format(myNumber) + "; ");
  * }
  * }
  * </blockquote>
diff --git a/src/java.base/share/classes/java/util/StringTokenizer.java b/src/java.base/share/classes/java/util/StringTokenizer.java
index 61fbfe8a716..fae1cd609ad 100644
--- a/src/java.base/share/classes/java/util/StringTokenizer.java
+++ b/src/java.base/share/classes/java/util/StringTokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,8 +83,8 @@
  * method can be used to break up a string into its basic tokens:
  * <blockquote><pre>
  *     String[] result = "this is a test".split("\\s");
- *     for (int x=0; x&lt;result.length; x++)
- *         System.out.println(result[x]);
+ *     for (String r : result)
+ *         System.out.println(r);
  * </pre></blockquote>
  * <p>
  * prints the following output:

From e62419823a06ebd4499c5fadfc1f53a9bc3f71ce Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Sat, 16 Sep 2023 21:08:49 +0000
Subject: [PATCH 051/112] 8316387: Exclude more failing multicast tests on AIX
 after JDK-8315651

Reviewed-by: alanb
---
 test/jdk/ProblemList.txt | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 9f4a3b55c4c..a65c872fa9b 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -535,26 +535,31 @@ javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java
 
 # jdk_net
 
+java/net/DatagramSocket/DatagramSocketExample.java              8308807 aix-ppc64
+java/net/DatagramSocket/DatagramSocketMulticasting.java         8308807 aix-ppc64
+
+java/net/MulticastSocket/B6427403.java                          8308807 aix-ppc64
+java/net/MulticastSocket/IPMulticastIF.java                     8308807 aix-ppc64
+java/net/MulticastSocket/JoinLeave.java                         8308807 aix-ppc64
+java/net/MulticastSocket/MulticastAddresses.java                8308807 aix-ppc64
 java/net/MulticastSocket/NoLoopbackPackets.java                 7122846,8308807 macosx-all,aix-ppc64
+java/net/MulticastSocket/NoSetNetworkInterface.java             8308807 aix-ppc64
+java/net/MulticastSocket/SetGetNetworkInterfaceTest.java        8308807 aix-ppc64
 java/net/MulticastSocket/SetLoopbackMode.java                   7122846,8308807 macosx-all,aix-ppc64
-
+java/net/MulticastSocket/SetOutgoingIf.java                     8308807 aix-ppc64
 java/net/MulticastSocket/Test.java                              7145658,8308807 macosx-all,aix-ppc64
 
 java/net/ServerSocket/AcceptInheritHandle.java                  8211854 aix-ppc64
 
-java/net/MulticastSocket/B6427403.java                          8308807 aix-ppc64
-java/net/MulticastSocket/SetOutgoingIf.java                     8308807 aix-ppc64
-
 ############################################################################
 
 # jdk_nio
 
 java/nio/channels/AsynchronousSocketChannel/StressLoopback.java 8211851 aix-ppc64
 
+java/nio/channels/DatagramChannel/AdaptorMulticasting.java      8308807 aix-ppc64
 java/nio/channels/DatagramChannel/AfterDisconnect.java          8308807 aix-ppc64
-
 java/nio/channels/DatagramChannel/ManySourcesAndTargets.java    8264385 macosx-aarch64
-
 java/nio/channels/DatagramChannel/Unref.java                    8233437 generic-all
 
 java/nio/file/Path/ToRealPath.java                              8315273 windows-all

From 4b8f5d031a081347ca611fa649cd75c4c1ec9fb3 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Sat, 16 Sep 2023 21:31:23 +0000
Subject: [PATCH 052/112] 8316273: JDK-8315818 broke JVMCIPrintProperties on
 libgraal

Reviewed-by: never, kvn
---
 src/hotspot/share/compiler/compileBroker.cpp         |  6 +-----
 src/hotspot/share/compiler/compileBroker.hpp         |  3 +--
 src/hotspot/share/runtime/threads.cpp                | 12 ++++++++++--
 .../jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java       |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index e9859d98280..2eedda37b43 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -591,7 +591,7 @@ void register_jfr_phasetype_serializer(CompilerType compiler_type) {
 // CompileBroker::compilation_init
 //
 // Initialize the Compilation object
-void CompileBroker::compilation_init_phase1(JavaThread* THREAD) {
+void CompileBroker::compilation_init(JavaThread* THREAD) {
   // No need to initialize compilation system if we do not use it.
   if (!UseCompiler) {
     return;
@@ -750,11 +750,7 @@ void CompileBroker::compilation_init_phase1(JavaThread* THREAD) {
                                           (jlong)CompileBroker::no_compile,
                                           CHECK);
   }
-}
 
-// Completes compiler initialization. Compilation requests submitted
-// prior to this will be silently ignored.
-void CompileBroker::compilation_init_phase2() {
   _initialized = true;
 }
 
diff --git a/src/hotspot/share/compiler/compileBroker.hpp b/src/hotspot/share/compiler/compileBroker.hpp
index 26029307a5e..1ce736528ac 100644
--- a/src/hotspot/share/compiler/compileBroker.hpp
+++ b/src/hotspot/share/compiler/compileBroker.hpp
@@ -291,8 +291,7 @@ class CompileBroker: AllStatic {
     CompileQueue *q = compile_queue(comp_level);
     return q != nullptr ? q->size() : 0;
   }
-  static void compilation_init_phase1(JavaThread* THREAD);
-  static void compilation_init_phase2();
+  static void compilation_init(JavaThread* THREAD);
   static void init_compiler_thread_log();
   static nmethod* compile_method(const methodHandle& method,
                                  int osr_bci,
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 1838167c172..648637b1fc0 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -692,16 +692,24 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
 
   // initialize compiler(s)
 #if defined(COMPILER1) || COMPILER2_OR_JVMCI
+  bool init_compilation = true;
 #if INCLUDE_JVMCI
   bool force_JVMCI_initialization = false;
   if (EnableJVMCI) {
     // Initialize JVMCI eagerly when it is explicitly requested.
     // Or when JVMCILibDumpJNIConfig or JVMCIPrintProperties is enabled.
     force_JVMCI_initialization = EagerJVMCI || JVMCIPrintProperties || JVMCILibDumpJNIConfig;
+    if (JVMCIPrintProperties || JVMCILibDumpJNIConfig) {
+      // Both JVMCILibDumpJNIConfig and JVMCIPrintProperties exit the VM
+      // so compilation should be disabled. This prevents dumping or
+      // printing from happening more than once.
+      init_compilation = false;
+    }
   }
 #endif
-  CompileBroker::compilation_init_phase1(CHECK_JNI_ERR);
-  CompileBroker::compilation_init_phase2();
+  if (init_compilation) {
+    CompileBroker::compilation_init(CHECK_JNI_ERR);
+  }
 #endif
 
   // Start string deduplication thread if requested.
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index 1f2276757c5..b0ee27f36a7 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -564,7 +564,7 @@ private HotSpotJVMCIRuntime() {
             }
             Option.printProperties(vmLogStream);
             compilerFactory.printProperties(vmLogStream);
-            System.exit(0);
+            exitHotSpot(0);
         }
 
         if (Option.PrintConfig.getBoolean()) {

From f44032969f37948a49e5bd0ed6738aa4d93687da Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Sun, 17 Sep 2023 11:53:12 +0000
Subject: [PATCH 053/112] 8316391: (zipfs) ZipFileSystem.readFullyAt does not
 tolerate short reads

Reviewed-by: jpai, lancea
---
 .../classes/jdk/nio/zipfs/ZipFileSystem.java  | 53 +++++++++++--------
 .../share/classes/jdk/nio/zipfs/ZipInfo.java  |  6 +--
 .../FileChannel/LargeGatheringWrite.java      | 34 +++++++-----
 3 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
index c1a13c8627d..0ee156f03f0 100644
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
@@ -1224,23 +1224,34 @@ protected void finalize() throws IOException {
         close();
     }
 
-    // Reads len bytes of data from the specified offset into buf.
-    // Returns the total number of bytes read.
-    // Each/every byte read from here (except the cen, which is mapped).
-    final long readFullyAt(byte[] buf, int off, long len, long pos)
-        throws IOException
-    {
+    /**
+     * Reads len bytes of data at the given file position into the given byte array
+     * starting at the given array offset. The method blocks until len bytes have been
+     * read, end of stream is detected, or an exception is thrown. Returns the total
+     * number of bytes read.
+     */
+    final long readNBytesAt(byte[] buf, int off, long len, long pos) throws IOException {
         ByteBuffer bb = ByteBuffer.wrap(buf);
         bb.position(off);
         bb.limit((int)(off + len));
-        return readFullyAt(bb, pos);
+
+        long totalRead = 0;
+        while (totalRead < len) {
+            int n = readAt(bb, pos);
+            if (n < 0) {
+                break;
+            }
+            pos += n;
+            totalRead +=n;
+        }
+        return totalRead;
     }
 
-    private long readFullyAt(ByteBuffer bb, long pos) throws IOException {
-        if (ch instanceof FileChannel fch) {
-            return fch.read(bb, pos);
+    private int readAt(ByteBuffer bb, long pos) throws IOException {
+        if (ch instanceof FileChannel fc) {
+            return fc.read(bb, pos);
         } else {
-            synchronized(ch) {
+            synchronized (ch) {
                 return ch.position(pos).read(bb);
             }
         }
@@ -1264,7 +1275,7 @@ private END findEND() throws IOException {
                 Arrays.fill(buf, 0, off, (byte)0);
             }
             int len = buf.length - off;
-            if (readFullyAt(buf, off, len, pos + off) != len)
+            if (readNBytesAt(buf, off, len, pos + off) != len)
                 throw new ZipException("zip END header not found");
 
             // Now scan the block backwards for END header signature
@@ -1286,14 +1297,14 @@ private END findEND() throws IOException {
                     // try if there is zip64 end;
                     byte[] loc64 = new byte[ZIP64_LOCHDR];
                     if (end.endpos < ZIP64_LOCHDR ||
-                        readFullyAt(loc64, 0, loc64.length, end.endpos - ZIP64_LOCHDR)
+                        readNBytesAt(loc64, 0, loc64.length, end.endpos - ZIP64_LOCHDR)
                         != loc64.length ||
                         !locator64SigAt(loc64, 0)) {
                         return end;
                     }
                     long end64pos = ZIP64_LOCOFF(loc64);
                     byte[] end64buf = new byte[ZIP64_ENDHDR];
-                    if (readFullyAt(end64buf, 0, end64buf.length, end64pos)
+                    if (readNBytesAt(end64buf, 0, end64buf.length, end64pos)
                         != end64buf.length ||
                         !end64SigAt(end64buf, 0)) {
                         return end;
@@ -1557,7 +1568,7 @@ private byte[] initCEN() throws IOException {
 
         // read in the CEN and END
         byte[] cen = new byte[(int)(end.cenlen + ENDHDR)];
-        if (readFullyAt(cen, 0, cen.length, cenpos) != end.cenlen + ENDHDR) {
+        if (readNBytesAt(cen, 0, cen.length, cenpos) != end.cenlen + ENDHDR) {
             throw new ZipException("read CEN tables failed");
         }
         // Iterate through the entries in the central directory
@@ -1706,7 +1717,7 @@ private long copyLOCEntry(Entry e, boolean updateHeader,
         // 'name' field of the loc. if this byte is '/', which means the original
         // entry has an absolute path in original zip/jar file, the e.writeLOC()
         // is used to output the loc, in which the leading "/" will be removed
-        if (readFullyAt(buf, 0, LOCHDR + 1 , locoff) != LOCHDR + 1)
+        if (readNBytesAt(buf, 0, LOCHDR + 1 , locoff) != LOCHDR + 1)
             throw new ZipException("loc: reading failed");
 
         if (updateHeader || LOCNAM(buf) > 0 && buf[LOCHDR] == '/') {
@@ -1723,7 +1734,7 @@ private long copyLOCEntry(Entry e, boolean updateHeader,
         }
         int n;
         while (size > 0 &&
-            (n = (int)readFullyAt(buf, 0, buf.length, locoff)) != -1)
+            (n = (int)readNBytesAt(buf, 0, buf.length, locoff)) != -1)
         {
             if (size < n)
                 n = (int)size;
@@ -2338,7 +2349,7 @@ public int read(byte[] b, int off, int len) throws IOException {
             ByteBuffer bb = ByteBuffer.wrap(b);
             bb.position(off);
             bb.limit(off + len);
-            long n = readFullyAt(bb, pos);
+            long n = readAt(bb, pos);
             if (n > 0) {
                 pos += n;
                 rem -= n;
@@ -2383,7 +2394,7 @@ private void initDataPos() throws IOException {
             if (pos <= 0) {
                 pos = -pos + locpos;
                 byte[] buf = new byte[LOCHDR];
-                if (readFullyAt(buf, 0, buf.length, pos) != LOCHDR) {
+                if (readNBytesAt(buf, 0, buf.length, pos) != LOCHDR) {
                     throw new ZipException("invalid loc " + pos + " for entry reading");
                 }
                 pos += LOCHDR + LOCNAM(buf) + LOCEXT(buf);
@@ -3224,7 +3235,7 @@ private static boolean isZip64ExtBlockSizeValid(int blockSize) {
          */
         private void readLocEXTT(ZipFileSystem zipfs) throws IOException {
             byte[] buf = new byte[LOCHDR];
-            if (zipfs.readFullyAt(buf, 0, buf.length , locoff)
+            if (zipfs.readNBytesAt(buf, 0, buf.length , locoff)
                 != buf.length)
                 throw new ZipException("loc: reading failed");
             if (!locSigAt(buf, 0))
@@ -3235,7 +3246,7 @@ private void readLocEXTT(ZipFileSystem zipfs) throws IOException {
                 return;
             int locNlen = LOCNAM(buf);
             buf = new byte[locElen];
-            if (zipfs.readFullyAt(buf, 0, buf.length , locoff + LOCHDR + locNlen)
+            if (zipfs.readNBytesAt(buf, 0, buf.length , locoff + LOCHDR + locNlen)
                 != buf.length)
                 throw new ZipException("loc extra: reading failed");
             int locPos = 0;
diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipInfo.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipInfo.java
index 06173b724e5..58aec2bd732 100644
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipInfo.java
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,12 +65,12 @@ public static void main(String[] args) throws Throwable {
                 // loc.extra is bigger than the cen.extra, try to avoid to read
                 // twice
                 long len = LOCHDR + CENNAM(cen, pos) + CENEXT(cen, pos) + CENHDR;
-                if (zfs.readFullyAt(buf, 0, len, locoff(cen, pos)) != len)
+                if (zfs.readNBytesAt(buf, 0, len, locoff(cen, pos)) != len)
                     throw new ZipException("read loc header failed");
                 if (LOCEXT(buf) > CENEXT(cen, pos) + CENHDR) {
                     // have to read the second time;
                     len = LOCHDR + LOCNAM(buf) + LOCEXT(buf);
-                    if (zfs.readFullyAt(buf, 0, len, locoff(cen, pos)) != len)
+                    if (zfs.readNBytesAt(buf, 0, len, locoff(cen, pos)) != len)
                         throw new ZipException("read loc header failed");
                 }
                 printLOC(buf);
diff --git a/test/jdk/java/nio/channels/FileChannel/LargeGatheringWrite.java b/test/jdk/java/nio/channels/FileChannel/LargeGatheringWrite.java
index 49a8ca1e0c5..b2a09a88ea4 100644
--- a/test/jdk/java/nio/channels/FileChannel/LargeGatheringWrite.java
+++ b/test/jdk/java/nio/channels/FileChannel/LargeGatheringWrite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,18 +92,19 @@ public static void main(String[] args) throws IOException {
 
         // Write the data to a temporary file
         Path tempFile = Files.createTempFile("LargeGatheringWrite", ".dat");
-
-        printTime("before writing");
-        System.out.printf("Writing %d bytes of data...%n", totalLength);
-        try (FileChannel fcw = FileChannel.open(tempFile, CREATE, WRITE);) {
-            // Print size of individual writes and total number written
-            long bytesWritten = 0;
-            long n;
-            while ((n = fcw.write(bigBuffers)) > 0) {
-                System.out.printf("Wrote %d bytes\n", n);
-                bytesWritten += n;
+        try {
+            printTime("before writing");
+            System.out.printf("Writing %d bytes of data...%n", totalLength);
+            try (FileChannel fcw = FileChannel.open(tempFile, CREATE, WRITE);) {
+                // Print size of individual writes and total number written
+                long bytesWritten = 0;
+                long n;
+                while ((n = fcw.write(bigBuffers)) > 0) {
+                    System.out.printf("Wrote %d bytes\n", n);
+                    bytesWritten += n;
+                }
+                System.out.printf("Total of %d bytes written\n", bytesWritten);
             }
-            System.out.printf("Total of %d bytes written\n", bytesWritten);
             printTime("after writing");
 
             // Verify the content written
@@ -121,8 +122,13 @@ public static void main(String[] args) throws IOException {
                     ByteBuffer dst = ByteBuffer.wrap(bytes).slice(0, length);
                     if (dst.remaining() != length)
                         throw new RuntimeException("remaining");
-                    if (fcr.read(dst) != length)
-                        throw new RuntimeException("length");
+                    long totalRead = 0;
+                    while (totalRead < length) {
+                        int bytesRead = fcr.read(dst);
+                        if (bytesRead < 0)
+                            throw new RuntimeException("premature EOF");
+                        totalRead += bytesRead;
+                    }
                     dst.rewind();
 
                     // Verify that the bytes read from the file match the buffer

From ca3fe7b3fd9c4d08ac7a40d9bd36149ce3d71d9b Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 18 Sep 2023 05:53:12 +0000
Subject: [PATCH 054/112] 8315932: runtime/InvocationTests spend a lot of time
 on dependency verification

Reviewed-by: phh, vlivanov
---
 .../hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java | 1 +
 .../jtreg/runtime/InvocationTests/invocationOldCHATests.java     | 1 +
 .../jtreg/runtime/InvocationTests/invokeinterfaceTests.java      | 1 +
 .../jtreg/runtime/InvocationTests/invokespecialTests.java        | 1 +
 .../jtreg/runtime/InvocationTests/invokevirtualTests.java        | 1 +
 5 files changed, 5 insertions(+)

diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java b/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java
index a5fe4b2a148..4375521a037 100644
--- a/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java
@@ -72,6 +72,7 @@ public static void runTest(String whichTests, String classFileVersion) throws Th
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xmx128M",
             "-Xcomp", "-XX:TieredStopAtLevel=1",
+            "-XX:MetaspaceSize=128K", "-XX:MaxMetaspaceSize=4M",
             "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
             whichTests, "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invocationOldCHATests.java b/test/hotspot/jtreg/runtime/InvocationTests/invocationOldCHATests.java
index 2d4c2a38b21..68acc6f0bb1 100644
--- a/test/hotspot/jtreg/runtime/InvocationTests/invocationOldCHATests.java
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invocationOldCHATests.java
@@ -69,6 +69,7 @@ public static void runTest(String whichTests, String classFileVersion) throws Th
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xmx128M",
             "-Xcomp", "-XX:+UnlockDiagnosticVMOptions", "-XX:-UseVtableBasedCHA",
+            "-XX:MetaspaceSize=128K", "-XX:MaxMetaspaceSize=4M",
             "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
             whichTests, "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java
index 9d8a164637e..7113cb87613 100644
--- a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java
@@ -75,6 +75,7 @@ public static void runTest(String classFileVersion, String option) throws Throwa
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xmx128M", option,
             "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
+            "-XX:MetaspaceSize=128K", "-XX:MaxMetaspaceSize=4M",
             "invokeinterface.Generator", "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         try {
diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java b/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java
index 564f83d822e..5f5d64060ec 100644
--- a/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java
@@ -72,6 +72,7 @@ public static void runTest(String classFileVersion, String option) throws Throwa
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xmx128M", option,
             "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
+            "-XX:MetaspaceSize=128K", "-XX:MaxMetaspaceSize=4M",
             "invokespecial.Generator", "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         try {
diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java b/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java
index 9cc19b6081c..f5f700e9fd6 100644
--- a/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java
@@ -72,6 +72,7 @@ public static void runTest(String classFileVersion, String option) throws Throwa
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xmx128M", option,
             "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
+            "-XX:MetaspaceSize=128K", "-XX:MaxMetaspaceSize=4M",
             "invokevirtual.Generator", "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         try {

From aa0ebeedb18c5fafb4a86a53e1b1f59f330f0eed Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Mon, 18 Sep 2023 07:01:48 +0000
Subject: [PATCH 055/112] 8316341: sun/security/pkcs11/PKCS11Test.java needs
 adjustment on Linux ppc64le Ubuntu 22

Reviewed-by: lucy, clanger
---
 test/jdk/sun/security/pkcs11/PKCS11Test.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/jdk/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java
index 5a619ec59b5..51b614c9f94 100644
--- a/test/jdk/sun/security/pkcs11/PKCS11Test.java
+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java
@@ -616,7 +616,10 @@ private static Map<String, String[]> getOsMap() {
                 "/usr/lib/x86_64-linux-gnu/nss/",
                 "/usr/lib64/"});
         osMap.put("Linux-ppc64-64", new String[]{"/usr/lib64/"});
-        osMap.put("Linux-ppc64le-64", new String[]{"/usr/lib64/"});
+        osMap.put("Linux-ppc64le-64", new String[]{
+                 "/usr/lib/powerpc64le-linux-gnu/",
+                 "/usr/lib/powerpc64le-linux-gnu/nss/",
+                 "/usr/lib64/"});
         osMap.put("Linux-s390x-64", new String[]{"/usr/lib64/"});
         osMap.put("Windows-x86-32", new String[]{});
         osMap.put("Windows-amd64-64", new String[]{});

From fbc766ee21ff7e6d414bd7d2c8bd7c9e1889a8af Mon Sep 17 00:00:00 2001
From: Leo Korinth <lkorinth@openjdk.org>
Date: Mon, 18 Sep 2023 07:14:53 +0000
Subject: [PATCH 056/112] 8315988: Parallel: Make TestAggressiveHeap use
 createTestJvm

Reviewed-by: ayang, tschatzl
---
 test/hotspot/jtreg/gc/arguments/TestAggressiveHeap.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/gc/arguments/TestAggressiveHeap.java b/test/hotspot/jtreg/gc/arguments/TestAggressiveHeap.java
index 914603c556f..4070c36f8d7 100644
--- a/test/hotspot/jtreg/gc/arguments/TestAggressiveHeap.java
+++ b/test/hotspot/jtreg/gc/arguments/TestAggressiveHeap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@ public static void main(String args[]) throws Exception {
         " *bool +UseParallelGC *= *true +\\{product\\} *\\{command line\\}";
 
     private static void testFlag() throws Exception {
-        ProcessBuilder pb = GCArguments.createJavaProcessBuilder(
+        ProcessBuilder pb = GCArguments.createTestJvm(
             option, heapSizeOption, "-XX:+PrintFlagsFinal", "-version");
 
         OutputAnalyzer output = new OutputAnalyzer(pb.start());

From 1203e11a8d9b3ef0695282d980ad411213e6aa6c Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Mon, 18 Sep 2023 08:35:31 +0000
Subject: [PATCH 057/112] 8294969: Convert jdk.jdeps javap to use the Classfile
 API

Reviewed-by: vromero
---
 .../jdk/internal/classfile/ClassReader.java   |   10 +
 .../DynamicConstantPoolEntry.java             |    5 +
 .../classfile/impl/AbstractInstruction.java   |    8 +-
 .../classfile/impl/AbstractPoolEntry.java     |    7 +
 .../classfile/impl/AnnotationReader.java      |   16 +-
 .../classfile/impl/BoundAttribute.java        |    2 +-
 .../classfile/impl/ClassReaderImpl.java       |   33 +-
 src/java.base/share/classes/module-info.java  |    4 +
 .../com/sun/tools/javap/AnnotationWriter.java |  396 ++---
 .../com/sun/tools/javap/AttributeWriter.java  | 1582 ++++++-----------
 .../com/sun/tools/javap/BasicWriter.java      |   33 +-
 .../com/sun/tools/javap/ClassWriter.java      |  961 +++++-----
 .../com/sun/tools/javap/CodeWriter.java       |  262 ++-
 .../com/sun/tools/javap/ConstantWriter.java   |  589 ++----
 .../tools/javap/InstructionDetailWriter.java  |    6 +-
 .../com/sun/tools/javap/JavapTask.java        |  142 +-
 .../tools/javap/LocalVariableTableWriter.java |   85 +-
 .../javap/LocalVariableTypeTableWriter.java   |   82 +-
 .../classes/com/sun/tools/javap/Options.java  |   14 +-
 .../com/sun/tools/javap/SourceWriter.java     |   64 +-
 .../com/sun/tools/javap/StackMapWriter.java   |  245 +--
 .../com/sun/tools/javap/TryBlockWriter.java   |   71 +-
 .../sun/tools/javap/TypeAnnotationWriter.java |   66 +-
 test/hotspot/jtreg/ProblemList.txt            |    1 +
 .../tools/javap/8260403/T8260403.java         |   16 +-
 test/langtools/tools/javap/T6866657.java      |    4 +-
 test/langtools/tools/javap/T7186925.java      |    4 +-
 .../tools/javap/malformed/Malformed.jcod      |   54 +
 .../tools/javap/malformed/MalformedTest.java  |   50 +
 29 files changed, 1977 insertions(+), 2835 deletions(-)
 create mode 100644 test/langtools/tools/javap/malformed/Malformed.jcod
 create mode 100644 test/langtools/tools/javap/malformed/MalformedTest.java

diff --git a/src/java.base/share/classes/jdk/internal/classfile/ClassReader.java b/src/java.base/share/classes/jdk/internal/classfile/ClassReader.java
index 7904038e41d..7884714dfde 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/ClassReader.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/ClassReader.java
@@ -102,6 +102,16 @@ public sealed interface ClassReader extends ConstantPool
      */
     PoolEntry readEntry(int offset);
 
+    /**
+     * {@return the constant pool entry of a given type whose index is given
+     * at the specified offset within the classfile}
+     * @param offset the offset of the index within the classfile
+     * @param cls the entry type
+     * @throws ConstantPoolException if the index is out of range of the
+     *         constant pool size, or zero, or the entry is not of the given type
+     */
+    <T extends PoolEntry> T readEntry(int offset, Class<T> cls);
+
     /**
      * {@return the constant pool entry whose index is given at the specified
      * offset within the classfile, or null if the index at the specified
diff --git a/src/java.base/share/classes/jdk/internal/classfile/constantpool/DynamicConstantPoolEntry.java b/src/java.base/share/classes/jdk/internal/classfile/constantpool/DynamicConstantPoolEntry.java
index cd4ce92da0c..dda49a6e097 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/constantpool/DynamicConstantPoolEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/constantpool/DynamicConstantPoolEntry.java
@@ -38,6 +38,11 @@ public sealed interface DynamicConstantPoolEntry extends PoolEntry
      */
     BootstrapMethodEntry bootstrap();
 
+    /**
+     * {@return index of the entry in the bootstrap method table for this constant}
+     */
+    int bootstrapMethodIndex();
+
     /**
      * {@return the invocation name and type}
      */
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
index fa729ae961a..6d6a222d78d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
@@ -383,7 +383,7 @@ public BoundFieldInstruction(Opcode op, CodeImpl code, int pos) {
         @Override
         public FieldRefEntry field() {
             if (fieldEntry == null)
-                fieldEntry = (FieldRefEntry) code.classReader.readEntry(pos + 1);
+                fieldEntry = code.classReader.readEntry(pos + 1, FieldRefEntry.class);
             return fieldEntry;
         }
 
@@ -413,7 +413,7 @@ public BoundInvokeInstruction(Opcode op, CodeImpl code, int pos) {
         @Override
         public MemberRefEntry method() {
             if (methodEntry == null)
-                methodEntry = (MemberRefEntry) code.classReader.readEntry(pos + 1);
+                methodEntry = code.classReader.readEntry(pos + 1, MemberRefEntry.class);
             return methodEntry;
         }
 
@@ -453,7 +453,7 @@ public BoundInvokeInterfaceInstruction(Opcode op, CodeImpl code, int pos) {
         @Override
         public MemberRefEntry method() {
             if (methodEntry == null)
-                methodEntry = (InterfaceMethodRefEntry) code.classReader.readEntry(pos + 1);
+                methodEntry = code.classReader.readEntry(pos + 1, InterfaceMethodRefEntry.class);
             return methodEntry;
         }
 
@@ -493,7 +493,7 @@ public static final class BoundInvokeDynamicInstruction
         @Override
         public InvokeDynamicEntry invokedynamic() {
             if (indyEntry == null)
-                indyEntry = (InvokeDynamicEntry) code.classReader.readEntry(pos + 1);
+                indyEntry = code.classReader.readEntry(pos + 1, InvokeDynamicEntry.class);
             return indyEntry;
         }
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
index 3b011920415..86a9bb10b58 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
@@ -815,6 +815,13 @@ public BootstrapMethodEntryImpl bootstrap() {
             return bootstrapMethod;
         }
 
+        /**
+         * @return the bsmIndex
+         */
+        public int bootstrapMethodIndex() {
+            return bsmIndex;
+        }
+
         /**
          * @return the nameAndType
          */
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java
index ae80c1ced00..c4cfcaa119b 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java
@@ -58,14 +58,14 @@ public static AnnotationValue readElementValue(ClassReader classReader, int p) {
         char tag = (char) classReader.readU1(p);
         ++p;
         return switch (tag) {
-            case AEV_BYTE -> new AnnotationImpl.OfByteImpl((IntegerEntry)classReader.readEntry(p));
-            case AEV_CHAR -> new AnnotationImpl.OfCharacterImpl((IntegerEntry)classReader.readEntry(p));
-            case AEV_DOUBLE -> new AnnotationImpl.OfDoubleImpl((DoubleEntry)classReader.readEntry(p));
-            case AEV_FLOAT -> new AnnotationImpl.OfFloatImpl((FloatEntry)classReader.readEntry(p));
-            case AEV_INT -> new AnnotationImpl.OfIntegerImpl((IntegerEntry)classReader.readEntry(p));
-            case AEV_LONG -> new AnnotationImpl.OfLongImpl((LongEntry)classReader.readEntry(p));
-            case AEV_SHORT -> new AnnotationImpl.OfShortImpl((IntegerEntry)classReader.readEntry(p));
-            case AEV_BOOLEAN -> new AnnotationImpl.OfBooleanImpl((IntegerEntry)classReader.readEntry(p));
+            case AEV_BYTE -> new AnnotationImpl.OfByteImpl(classReader.readEntry(p, IntegerEntry.class));
+            case AEV_CHAR -> new AnnotationImpl.OfCharacterImpl(classReader.readEntry(p, IntegerEntry.class));
+            case AEV_DOUBLE -> new AnnotationImpl.OfDoubleImpl(classReader.readEntry(p, DoubleEntry.class));
+            case AEV_FLOAT -> new AnnotationImpl.OfFloatImpl(classReader.readEntry(p, FloatEntry.class));
+            case AEV_INT -> new AnnotationImpl.OfIntegerImpl(classReader.readEntry(p, IntegerEntry.class));
+            case AEV_LONG -> new AnnotationImpl.OfLongImpl(classReader.readEntry(p, LongEntry.class));
+            case AEV_SHORT -> new AnnotationImpl.OfShortImpl(classReader.readEntry(p, IntegerEntry.class));
+            case AEV_BOOLEAN -> new AnnotationImpl.OfBooleanImpl(classReader.readEntry(p, IntegerEntry.class));
             case AEV_STRING -> new AnnotationImpl.OfStringImpl(classReader.readUtf8Entry(p));
             case AEV_ENUM -> new AnnotationImpl.OfEnumImpl(classReader.readUtf8Entry(p), classReader.readUtf8Entry(p + 2));
             case AEV_CLASS -> new AnnotationImpl.OfClassImpl(classReader.readUtf8Entry(p));
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
index 1a518b10f4d..179c170bf5e 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
@@ -483,7 +483,7 @@ public BoundConstantValueAttribute(ClassReader cf, AttributeMapper<ConstantValue
 
         @Override
         public ConstantValueEntry constant() {
-            return (ConstantValueEntry) classReader.readEntry(payloadStart);
+            return classReader.readEntry(payloadStart, ConstantValueEntry.class);
         }
 
     }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
index 70bd140f905..8e583012b94 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
@@ -27,7 +27,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -37,10 +36,6 @@
 import jdk.internal.classfile.constantpool.ClassEntry;
 import jdk.internal.classfile.constantpool.ConstantPoolException;
 import jdk.internal.classfile.constantpool.LoadableConstantEntry;
-import jdk.internal.classfile.constantpool.MethodHandleEntry;
-import jdk.internal.classfile.constantpool.ModuleEntry;
-import jdk.internal.classfile.constantpool.NameAndTypeEntry;
-import jdk.internal.classfile.constantpool.PackageEntry;
 import jdk.internal.classfile.constantpool.PoolEntry;
 import jdk.internal.classfile.constantpool.Utf8Entry;
 
@@ -61,6 +56,10 @@
 import static jdk.internal.classfile.Classfile.TAG_PACKAGE;
 import static jdk.internal.classfile.Classfile.TAG_STRING;
 import static jdk.internal.classfile.Classfile.TAG_UTF8;
+import jdk.internal.classfile.constantpool.MethodHandleEntry;
+import jdk.internal.classfile.constantpool.ModuleEntry;
+import jdk.internal.classfile.constantpool.NameAndTypeEntry;
+import jdk.internal.classfile.constantpool.PackageEntry;
 
 public final class ClassReaderImpl
         implements ClassReader {
@@ -156,7 +155,7 @@ public int flags() {
     @Override
     public ClassEntry thisClassEntry() {
         if (thisClass == null) {
-            thisClass = readClassEntry(thisClassPos);
+            thisClass = readEntry(thisClassPos, ClassEntry.class);
         }
         return thisClass;
     }
@@ -391,6 +390,13 @@ public PoolEntry readEntry(int pos) {
         return entryByIndex(readU2(pos));
     }
 
+    @Override
+    public <T extends PoolEntry> T readEntry(int pos, Class<T> cls) {
+        var e = readEntry(pos);
+        if (cls.isInstance(e)) return cls.cast(e);
+        throw new ConstantPoolException("Not a " + cls.getSimpleName() + " at index: " + readU2(pos));
+    }
+
     @Override
     public PoolEntry readEntryOrNull(int pos) {
         int index = readU2(pos);
@@ -417,32 +423,27 @@ public Utf8Entry readUtf8EntryOrNull(int pos) {
 
     @Override
     public ModuleEntry readModuleEntry(int pos) {
-        if (readEntry(pos) instanceof ModuleEntry me) return me;
-        throw new ConstantPoolException("Not a module entry at pos: " + pos);
+        return readEntry(pos, ModuleEntry.class);
     }
 
     @Override
     public PackageEntry readPackageEntry(int pos) {
-        if (readEntry(pos) instanceof PackageEntry pe) return pe;
-        throw new ConstantPoolException("Not a package entry at pos: " + pos);
+        return readEntry(pos, PackageEntry.class);
     }
 
     @Override
     public ClassEntry readClassEntry(int pos) {
-        if (readEntry(pos) instanceof ClassEntry ce) return ce;
-        throw new ConstantPoolException("Not a class entry at pos: " + pos);
+        return readEntry(pos, ClassEntry.class);
     }
 
     @Override
     public NameAndTypeEntry readNameAndTypeEntry(int pos) {
-        if (readEntry(pos) instanceof NameAndTypeEntry nate) return nate;
-        throw new ConstantPoolException("Not a name and type entry at pos: " + pos);
+        return readEntry(pos, NameAndTypeEntry.class);
     }
 
     @Override
     public MethodHandleEntry readMethodHandleEntry(int pos) {
-        if (readEntry(pos) instanceof MethodHandleEntry mhe) return mhe;
-        throw new ConstantPoolException("Not a method handle entry at pos: " + pos);
+        return readEntry(pos, MethodHandleEntry.class);
     }
 
     @Override
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index bf3d34abd7a..26be8e9b587 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -186,15 +186,19 @@
         java.logging;
     exports jdk.internal.classfile to
         jdk.jartool,
+        jdk.jdeps,
         jdk.jlink,
         jdk.jshell;
     exports jdk.internal.classfile.attribute to
         jdk.jartool,
+        jdk.jdeps,
         jdk.jlink;
     exports jdk.internal.classfile.constantpool to
         jdk.jartool,
+        jdk.jdeps,
         jdk.jlink;
     exports jdk.internal.classfile.instruction to
+        jdk.jdeps,
         jdk.jlink,
         jdk.jshell;
     exports jdk.internal.org.objectweb.asm to
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/AnnotationWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/AnnotationWriter.java
index bfe3d231c4f..1501077ba62 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/AnnotationWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/AnnotationWriter.java
@@ -25,17 +25,14 @@
 
 package com.sun.tools.javap;
 
-import com.sun.tools.classfile.Annotation;
-import com.sun.tools.classfile.TypeAnnotation;
-import com.sun.tools.classfile.Annotation.Annotation_element_value;
-import com.sun.tools.classfile.Annotation.Array_element_value;
-import com.sun.tools.classfile.Annotation.Class_element_value;
-import com.sun.tools.classfile.Annotation.Enum_element_value;
-import com.sun.tools.classfile.Annotation.Primitive_element_value;
-import com.sun.tools.classfile.ConstantPool;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Descriptor;
-import com.sun.tools.classfile.Descriptor.InvalidDescriptor;
+import java.util.List;
+import jdk.internal.classfile.Annotation;
+import jdk.internal.classfile.AnnotationElement;
+import jdk.internal.classfile.AnnotationValue;
+import jdk.internal.classfile.constantpool.*;
+import jdk.internal.classfile.Signature;
+import jdk.internal.classfile.TypeAnnotation;
+import jdk.internal.classfile.attribute.CodeAttribute;
 
 /**
  *  A writer for writing annotations as text.
@@ -68,15 +65,15 @@ public void write(Annotation annot) {
     }
 
     public void write(Annotation annot, boolean resolveIndices) {
-        writeDescriptor(annot.type_index, resolveIndices);
+        writeDescriptor(annot.className(), resolveIndices);
         if (resolveIndices) {
-            boolean showParens = annot.num_element_value_pairs > 0;
+            boolean showParens = annot.elements().size() > 0;
             if (showParens) {
                 println("(");
                 indent(+1);
             }
-            for (int i = 0; i < annot.num_element_value_pairs; i++) {
-                write(annot.element_value_pairs[i], true);
+            for (var element : annot.elements()) {
+                write(element, true);
                 println();
             }
             if (showParens) {
@@ -85,143 +82,126 @@ public void write(Annotation annot, boolean resolveIndices) {
             }
         } else {
             print("(");
-            for (int i = 0; i < annot.num_element_value_pairs; i++) {
+            for (int i = 0; i < annot.elements().size(); i++) {
                 if (i > 0)
                     print(",");
-                write(annot.element_value_pairs[i], false);
+                write(annot.elements().get(i), false);
             }
             print(")");
         }
     }
 
-    public void write(TypeAnnotation annot) {
-        write(annot, true, false);
+    public void write(TypeAnnotation annot, CodeAttribute lr) {
+        write(annot, true, false, lr);
         println();
         indent(+1);
-        write(annot.annotation, true);
+        write(annot, true);
         indent(-1);
     }
 
-    public void write(TypeAnnotation annot, boolean showOffsets, boolean resolveIndices) {
-        write(annot.annotation, resolveIndices);
+    public void write(TypeAnnotation annot, boolean showOffsets,
+            boolean resolveIndices, CodeAttribute lr) {
+        write(annot, resolveIndices);
         print(": ");
-        write(annot.position, showOffsets);
+        write(annot.targetInfo(), annot.targetPath(), showOffsets, lr);
     }
 
-    public void write(TypeAnnotation.Position pos, boolean showOffsets) {
-        print(pos.type);
+    public void write(TypeAnnotation.TargetInfo targetInfo,
+            List<TypeAnnotation.TypePathComponent> targetPath,
+            boolean showOffsets, CodeAttribute lr) {
+        print(targetInfo.targetType());
 
-        switch (pos.type) {
-        // instanceof
-        case INSTANCEOF:
-        // new expression
-        case NEW:
-        // constructor/method reference receiver
-        case CONSTRUCTOR_REFERENCE:
-        case METHOD_REFERENCE:
-            if (showOffsets) {
-                print(", offset=");
-                print(pos.offset);
+        switch (targetInfo) {
+            // instanceof
+            // new expression
+            // constructor/method reference receiver
+            case TypeAnnotation.OffsetTarget pos -> {
+                if (showOffsets) {
+                    print(", offset=");
+                    print(lr.labelToBci(pos.target()));
+                }
+            }
+            case TypeAnnotation.LocalVarTarget pos -> {
+                if (pos.table().isEmpty()) {
+                    print(", lvarOffset is Null!");
+                    break;
+                }
+                print(", {");
+                var table = pos.table();
+                for (int i = 0; i < table.size(); ++i) {
+                    var e = table.get(i);
+                    if (i != 0) print("; ");
+                    int startPc = lr.labelToBci(e.startLabel());
+                    if (showOffsets) {
+                        print("start_pc=");
+                        print(startPc);
+                    }
+                    print(", length=");
+                    print(lr.labelToBci(e.endLabel()) - startPc);
+                    print(", index=");
+                    print(e.index());
+                }
+                print("}");
+            }
+            case TypeAnnotation.CatchTarget pos -> {
+                print(", exception_index=");
+                print(pos.exceptionTableIndex());
+            }
+            case TypeAnnotation.TypeParameterTarget pos -> {
+                print(", param_index=");
+                print(pos.typeParameterIndex());
+            }
+            case TypeAnnotation.TypeParameterBoundTarget pos -> {
+                print(", param_index=");
+                print(pos.typeParameterIndex());
+                print(", bound_index=");
+                print(pos.boundIndex());
             }
-            break;
-        // local variable
-        case LOCAL_VARIABLE:
-        // resource variable
-        case RESOURCE_VARIABLE:
-            if (pos.lvarOffset == null) {
-                print(", lvarOffset is Null!");
-                break;
+            case TypeAnnotation.SupertypeTarget pos -> {
+                print(", type_index=");
+                print(pos.supertypeIndex());
             }
-            print(", {");
-            for (int i = 0; i < pos.lvarOffset.length; ++i) {
-                if (i != 0) print("; ");
+            case TypeAnnotation.ThrowsTarget pos -> {
+                print(", type_index=");
+                print(pos.throwsTargetIndex());
+            }
+            case TypeAnnotation.FormalParameterTarget pos -> {
+                print(", param_index=");
+                print(pos.formalParameterIndex());
+            }
+            case TypeAnnotation.TypeArgumentTarget pos -> {
                 if (showOffsets) {
-                    print("start_pc=");
-                    print(pos.lvarOffset[i]);
+                    print(", offset=");
+                    print(lr.labelToBci(pos.target()));
                 }
-                print(", length=");
-                print(pos.lvarLength[i]);
-                print(", index=");
-                print(pos.lvarIndex[i]);
+                print(", type_index=");
+                print(pos.typeArgumentIndex());
             }
-            print("}");
-            break;
-        // exception parameter
-        case EXCEPTION_PARAMETER:
-            print(", exception_index=");
-            print(pos.exception_index);
-            break;
-        // method receiver
-        case METHOD_RECEIVER:
-            // Do nothing
-            break;
-        // type parameter
-        case CLASS_TYPE_PARAMETER:
-        case METHOD_TYPE_PARAMETER:
-            print(", param_index=");
-            print(pos.parameter_index);
-            break;
-        // type parameter bound
-        case CLASS_TYPE_PARAMETER_BOUND:
-        case METHOD_TYPE_PARAMETER_BOUND:
-            print(", param_index=");
-            print(pos.parameter_index);
-            print(", bound_index=");
-            print(pos.bound_index);
-            break;
-        // class extends or implements clause
-        case CLASS_EXTENDS:
-            print(", type_index=");
-            print(pos.type_index);
-            break;
-        // throws
-        case THROWS:
-            print(", type_index=");
-            print(pos.type_index);
-            break;
-        // method parameter
-        case METHOD_FORMAL_PARAMETER:
-            print(", param_index=");
-            print(pos.parameter_index);
-            break;
-        // type cast
-        case CAST:
-        // method/constructor/reference type argument
-        case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
-        case METHOD_INVOCATION_TYPE_ARGUMENT:
-        case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT:
-        case METHOD_REFERENCE_TYPE_ARGUMENT:
-            if (showOffsets) {
-                print(", offset=");
-                print(pos.offset);
+            case TypeAnnotation.EmptyTarget pos -> {
+                // Do nothing
             }
-            print(", type_index=");
-            print(pos.type_index);
-            break;
-        // We don't need to worry about these
-        case METHOD_RETURN:
-        case FIELD:
-            break;
-        case UNKNOWN:
-            throw new AssertionError("AnnotationWriter: UNKNOWN target type should never occur!");
-        default:
-            throw new AssertionError("AnnotationWriter: Unknown target type for position: " + pos);
+            default ->
+                throw new AssertionError("AnnotationWriter: Unhandled target type: "
+                        + targetInfo.getClass());
         }
 
         // Append location data for generics/arrays.
-        if (!pos.location.isEmpty()) {
+        if (!targetPath.isEmpty()) {
             print(", location=");
-            print(pos.location);
+            print(targetPath.stream().map(tp -> tp.typePathKind().toString() +
+                    (tp.typePathKind() == TypeAnnotation.TypePathComponent.Kind.TYPE_ARGUMENT
+                            ? ("(" + tp.typeArgumentIndex() + ")")
+                            : "")).toList());
         }
     }
 
-    public void write(Annotation.element_value_pair pair, boolean resolveIndices) {
-        writeIndex(pair.element_name_index, resolveIndices);
+    public void write(AnnotationElement pair, boolean resolveIndices) {
+        writeIndex(pair.name(), resolveIndices);
         print("=");
-        write(pair.value, resolveIndices);
+        write(pair.value(), resolveIndices);
     }
 
-    public void write(Annotation.element_value value) {
+    public void write(AnnotationValue value) {
         write(value, false);
         println();
         indent(+1);
@@ -229,122 +209,94 @@ public void write(Annotation.element_value value) {
         indent(-1);
     }
 
-    public void write(Annotation.element_value value, boolean resolveIndices) {
-        ev_writer.write(value, resolveIndices);
-    }
-
-    private void writeDescriptor(int index, boolean resolveIndices) {
+    private void writeDescriptor(Utf8Entry entry, boolean resolveIndices) {
         if (resolveIndices) {
-            try {
-                ConstantPool constant_pool = classWriter.getClassFile().constant_pool;
-                Descriptor d = new Descriptor(index);
-                print(d.getFieldType(constant_pool));
-                return;
-            } catch (ConstantPoolException | InvalidDescriptor ignore) {
-            }
+            print(classWriter.sigPrinter.print(Signature.parseFrom(entry.stringValue())));
+            return;
         }
-
-        print("#" + index);
+        print("#" + entry.index());
     }
 
-    private void writeIndex(int index, boolean resolveIndices) {
+    private void writeIndex(PoolEntry entry, boolean resolveIndices) {
         if (resolveIndices) {
-            print(constantWriter.stringValue(index));
+            print(constantWriter.stringValue(entry));
         } else
-            print("#" + index);
+            print("#" + entry.index());
     }
 
-    element_value_Writer ev_writer = new element_value_Writer();
-
-    class element_value_Writer implements Annotation.element_value.Visitor<Void,Boolean> {
-        public void write(Annotation.element_value value, boolean resolveIndices) {
-            value.accept(this, resolveIndices);
-        }
-
-        @Override
-        public Void visitPrimitive(Primitive_element_value ev, Boolean resolveIndices) {
-            if (resolveIndices) {
-                int index = ev.const_value_index;
-                switch (ev.tag) {
-                    case 'B':
-                        print("(byte) ");
-                        print(constantWriter.stringValue(index));
-                        break;
-                    case 'C':
-                        print("'");
-                        print(constantWriter.charValue(index));
-                        print("'");
-                        break;
-                    case 'D':
-                    case 'F':
-                    case 'I':
-                    case 'J':
-                        print(constantWriter.stringValue(index));
-                        break;
-                    case 'S':
-                        print("(short) ");
-                        print(constantWriter.stringValue(index));
-                        break;
-                    case 'Z':
-                        print(constantWriter.booleanValue(index));
-                        break;
-                    case 's':
-                        print("\"");
-                        print(constantWriter.stringValue(index));
-                        print("\"");
-                        break;
-                    default:
-                        print(((char) ev.tag) + "#" + ev.const_value_index);
-                        break;
+    public void write(AnnotationValue value, boolean resolveIndices) {
+        switch (value) {
+            case AnnotationValue.OfConstant ev -> {
+                if (resolveIndices) {
+                    var entry = ev.constant();
+                    switch (ev.tag()) {
+                        case 'B':
+                            print("(byte) ");
+                            print(constantWriter.stringValue(entry));
+                            break;
+                        case 'C':
+                            print("'");
+                            print(constantWriter.charValue(entry));
+                            print("'");
+                            break;
+                        case 'D':
+                        case 'F':
+                        case 'I':
+                        case 'J':
+                            print(constantWriter.stringValue(entry));
+                            break;
+                        case 'S':
+                            print("(short) ");
+                            print(constantWriter.stringValue(entry));
+                            break;
+                        case 'Z':
+                            print(constantWriter.booleanValue(entry));
+                            break;
+                        case 's':
+                            print("\"");
+                            print(constantWriter.stringValue(entry));
+                            print("\"");
+                            break;
+                        default:
+                            print(ev.tag() + "#" + entry.index());
+                            break;
+                    }
+                } else {
+                    print(ev.tag() + "#" + ev.constant().index());
                 }
-            } else {
-                print(((char) ev.tag) + "#" + ev.const_value_index);
             }
-            return null;
-        }
-
-        @Override
-        public Void visitEnum(Enum_element_value ev, Boolean resolveIndices) {
-            if (resolveIndices) {
-                writeIndex(ev.type_name_index, resolveIndices);
-                print(".");
-                writeIndex(ev.const_name_index, resolveIndices);
-            } else {
-                print(((char) ev.tag) + "#" + ev.type_name_index + ".#" + ev.const_name_index);
+            case AnnotationValue.OfEnum ev -> {
+                if (resolveIndices) {
+                    writeIndex(ev.className(), resolveIndices);
+                    print(".");
+                    writeIndex(ev.constantName(), resolveIndices);
+                } else {
+                    print(ev.tag() + "#" + ev.className().index() + ".#"
+                            + ev.constantName().index());
+                }
             }
-            return null;
-        }
-
-        @Override
-        public Void visitClass(Class_element_value ev, Boolean resolveIndices) {
-            if (resolveIndices) {
-                print("class ");
-                writeIndex(ev.class_info_index, resolveIndices);
-            } else {
-                print(((char) ev.tag) + "#" + ev.class_info_index);
+            case AnnotationValue.OfClass ev -> {
+                if (resolveIndices) {
+                    print("class ");
+                    writeIndex(ev.className(), resolveIndices);
+                } else {
+                    print(ev.tag() + "#" + ev.className().index());
+                }
             }
-            return null;
-        }
-
-        @Override
-        public Void visitAnnotation(Annotation_element_value ev, Boolean resolveIndices) {
-            print((char) ev.tag);
-            AnnotationWriter.this.write(ev.annotation_value, resolveIndices);
-            return null;
-        }
-
-        @Override
-        public Void visitArray(Array_element_value ev, Boolean resolveIndices) {
-            print("[");
-            for (int i = 0; i < ev.num_values; i++) {
-                if (i > 0)
-                    print(",");
-                write(ev.values[i], resolveIndices);
+            case AnnotationValue.OfAnnotation ev -> {
+                print(ev.tag());
+                AnnotationWriter.this.write(ev.annotation(), resolveIndices);
+            }
+            case AnnotationValue.OfArray ev -> {
+                print("[");
+                for (int i = 0; i < ev.values().size(); i++) {
+                    if (i > 0)
+                        print(",");
+                    write(ev.values().get(i), resolveIndices);
+                }
+                print("]");
             }
-            print("]");
-            return null;
         }
-
     }
 
     private final ClassWriter classWriter;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java
index 67dbaebe827..13c5c10e890 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java
@@ -25,63 +25,16 @@
 
 package com.sun.tools.javap;
 
-import java.util.Collection;
-
-import com.sun.tools.classfile.AccessFlags;
-import com.sun.tools.classfile.AnnotationDefault_attribute;
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.Attributes;
-import com.sun.tools.classfile.BootstrapMethods_attribute;
-import com.sun.tools.classfile.CharacterRangeTable_attribute;
-import com.sun.tools.classfile.CharacterRangeTable_attribute.Entry;
-import com.sun.tools.classfile.Code_attribute;
-import com.sun.tools.classfile.CompilationID_attribute;
-import com.sun.tools.classfile.ConstantPool;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Class_info;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.ConstantValue_attribute;
-import com.sun.tools.classfile.DefaultAttribute;
-import com.sun.tools.classfile.Deprecated_attribute;
-import com.sun.tools.classfile.Descriptor;
-import com.sun.tools.classfile.Descriptor.InvalidDescriptor;
-import com.sun.tools.classfile.EnclosingMethod_attribute;
-import com.sun.tools.classfile.Exceptions_attribute;
-import com.sun.tools.classfile.InnerClasses_attribute;
-import com.sun.tools.classfile.InnerClasses_attribute.Info;
-import com.sun.tools.classfile.LineNumberTable_attribute;
-import com.sun.tools.classfile.LocalVariableTable_attribute;
-import com.sun.tools.classfile.LocalVariableTypeTable_attribute;
-import com.sun.tools.classfile.MethodParameters_attribute;
-import com.sun.tools.classfile.Module_attribute;
-import com.sun.tools.classfile.ModuleHashes_attribute;
-import com.sun.tools.classfile.ModuleMainClass_attribute;
-import com.sun.tools.classfile.ModulePackages_attribute;
-import com.sun.tools.classfile.ModuleResolution_attribute;
-import com.sun.tools.classfile.ModuleTarget_attribute;
-import com.sun.tools.classfile.NestHost_attribute;
-import com.sun.tools.classfile.NestMembers_attribute;
-import com.sun.tools.classfile.Record_attribute;
-import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute;
-import com.sun.tools.classfile.RuntimeInvisibleParameterAnnotations_attribute;
-import com.sun.tools.classfile.RuntimeInvisibleTypeAnnotations_attribute;
-import com.sun.tools.classfile.RuntimeParameterAnnotations_attribute;
-import com.sun.tools.classfile.RuntimeVisibleAnnotations_attribute;
-import com.sun.tools.classfile.RuntimeVisibleParameterAnnotations_attribute;
-import com.sun.tools.classfile.RuntimeVisibleTypeAnnotations_attribute;
-import com.sun.tools.classfile.PermittedSubclasses_attribute;
-import com.sun.tools.classfile.Signature_attribute;
-import com.sun.tools.classfile.SourceDebugExtension_attribute;
-import com.sun.tools.classfile.SourceFile_attribute;
-import com.sun.tools.classfile.SourceID_attribute;
-import com.sun.tools.classfile.StackMapTable_attribute;
-import com.sun.tools.classfile.StackMap_attribute;
-import com.sun.tools.classfile.Synthetic_attribute;
-import com.sun.tools.classfile.Type;
-
-import static com.sun.tools.classfile.AccessFlags.*;
-
-import com.sun.tools.javac.util.Assert;
-import com.sun.tools.javac.util.StringUtils;
+import java.lang.reflect.Modifier;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Locale;
+import jdk.internal.classfile.*;
+import java.lang.reflect.AccessFlag;
+import jdk.internal.classfile.constantpool.*;
+import jdk.internal.classfile.attribute.*;
+import static jdk.internal.classfile.Classfile.*;
+import static jdk.internal.classfile.attribute.StackMapFrameInfo.*;
 
 /*
  *  A writer for writing Attributes as text.
@@ -91,9 +44,8 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
-public class AttributeWriter extends BasicWriter
-        implements Attribute.Visitor<Void,Void>
-{
+public class AttributeWriter extends BasicWriter {
+
     public static AttributeWriter instance(Context context) {
         AttributeWriter instance = context.get(AttributeWriter.class);
         if (instance == null)
@@ -110,446 +62,575 @@ protected AttributeWriter(Context context) {
         options = Options.instance(context);
     }
 
-    public void write(Object owner, Attribute attr, ConstantPool constant_pool) {
-        if (attr != null) {
-            Assert.checkNonNull(constant_pool);
-            Assert.checkNonNull(owner);
-            this.constant_pool = constant_pool;
-            this.owner = owner;
-            attr.accept(this, null);
-        }
+    public void write(List<Attribute<?>> attrs) {
+        write(attrs, null);
     }
 
-    public void write(Object owner, Attributes attrs, ConstantPool constant_pool) {
+    public void write(List<Attribute<?>> attrs, CodeAttribute lr) {
         if (attrs != null) {
-            Assert.checkNonNull(constant_pool);
-            Assert.checkNonNull(owner);
-            this.constant_pool = constant_pool;
-            this.owner = owner;
-            for (Attribute attr: attrs)
-                attr.accept(this, null);
+            for (var attr : attrs) try {
+                write(attr, lr);
+            } catch (IllegalArgumentException e) {
+                report(e);
+            }
         }
     }
 
-    @Override
-    public Void visitDefault(DefaultAttribute attr, Void ignore) {
-        byte[] data = attr.info;
-        int i = 0;
-        int j = 0;
-        print("  ");
-        try {
-            print(attr.getName(constant_pool));
-        } catch (ConstantPoolException e) {
-            report(e);
-            print("attribute name = #" + attr.attribute_name_index);
-        }
-        print(": ");
-        print("length = 0x" + toHex(attr.info.length));
-        if (attr.reason != null) {
-            print(" (" + attr.reason + ")");
-        }
-        println();
-
-        print("   ");
-
-        while (i < data.length) {
-            print(toHex(data[i], 2));
-
-            j++;
-            if (j == 16) {
+    public void write(Attribute<?> a, CodeAttribute lr) {
+        switch (a) {
+            case UnknownAttribute attr -> {
+                byte[] data = attr.contents();
+                int i = 0;
+                int j = 0;
+                print("  ");
+                print(attr.attributeName());
+                print(": ");
+                print("length = 0x" + toHex(data.length));
+                print(" (unknown attribute)");
                 println();
                 print("   ");
-                j = 0;
-            } else {
-                print(" ");
+                while (i < data.length) {
+                    print(toHex(data[i], 2));
+
+                    j++;
+                    if (j == 16) {
+                        println();
+                        print("   ");
+                        j = 0;
+                    } else {
+                        print(" ");
+                    }
+                    i++;
+                }
+                println();
             }
-            i++;
-        }
-        println();
-        return null;
-    }
-
-    @Override
-    public Void visitAnnotationDefault(AnnotationDefault_attribute attr, Void ignore) {
-        println("AnnotationDefault:");
-        indent(+1);
-        print("default_value: ");
-        annotationWriter.write(attr.default_value);
-        indent(-1);
-        println();
-        return null;
-    }
-
-    @Override
-    public Void visitBootstrapMethods(BootstrapMethods_attribute attr, Void p) {
-        println(Attribute.BootstrapMethods + ":");
-        for (int i = 0; i < attr.bootstrap_method_specifiers.length ; i++) {
-            BootstrapMethods_attribute.BootstrapMethodSpecifier bsm = attr.bootstrap_method_specifiers[i];
-            indent(+1);
-            print(i + ": #" + bsm.bootstrap_method_ref + " ");
-            println(constantWriter.stringValue(bsm.bootstrap_method_ref));
-            indent(+1);
-            println("Method arguments:");
-            indent(+1);
-            for (int j = 0; j < bsm.bootstrap_arguments.length; j++) {
-                print("#" + bsm.bootstrap_arguments[j] + " ");
-                println(constantWriter.stringValue(bsm.bootstrap_arguments[j]));
+            case AnnotationDefaultAttribute attr -> {
+                println("AnnotationDefault:");
+                indent(+1);
+                print("default_value: ");
+                annotationWriter.write(attr.defaultValue());
+                indent(-1);
+                println();
             }
-            indent(-3);
-        }
-        return null;
-    }
-
-    @Override
-    public Void visitCharacterRangeTable(CharacterRangeTable_attribute attr, Void ignore) {
-        println("CharacterRangeTable:");
-        indent(+1);
-        for (Entry e : attr.character_range_table) {
-            print(String.format("    %2d, %2d, %6x, %6x, %4x",
-                    e.start_pc, e.end_pc,
-                    e.character_range_start, e.character_range_end,
-                    e.flags));
-            tab();
-            print(String.format("// %2d, %2d, %4d:%02d, %4d:%02d",
-                    e.start_pc, e.end_pc,
-                    (e.character_range_start >> 10), (e.character_range_start & 0x3ff),
-                    (e.character_range_end >> 10), (e.character_range_end & 0x3ff)));
-            if ((e.flags & CharacterRangeTable_attribute.CRT_STATEMENT) != 0)
-                print(", statement");
-            if ((e.flags & CharacterRangeTable_attribute.CRT_BLOCK) != 0)
-                print(", block");
-            if ((e.flags & CharacterRangeTable_attribute.CRT_ASSIGNMENT) != 0)
-                print(", assignment");
-            if ((e.flags & CharacterRangeTable_attribute.CRT_FLOW_CONTROLLER) != 0)
-                print(", flow-controller");
-            if ((e.flags & CharacterRangeTable_attribute.CRT_FLOW_TARGET) != 0)
-                print(", flow-target");
-            if ((e.flags & CharacterRangeTable_attribute.CRT_INVOKE) != 0)
-                print(", invoke");
-            if ((e.flags & CharacterRangeTable_attribute.CRT_CREATE) != 0)
-                print(", create");
-            if ((e.flags & CharacterRangeTable_attribute.CRT_BRANCH_TRUE) != 0)
-                print(", branch-true");
-            if ((e.flags & CharacterRangeTable_attribute.CRT_BRANCH_FALSE) != 0)
-                print(", branch-false");
-            println();
-        }
-        indent(-1);
-        return null;
-    }
-
-    @Override
-    public Void visitCode(Code_attribute attr, Void ignore) {
-        codeWriter.write(attr, constant_pool);
-        return null;
-    }
-
-    @Override
-    public Void visitCompilationID(CompilationID_attribute attr, Void ignore) {
-        constantWriter.write(attr.compilationID_index);
-        return null;
-    }
-
-    @Override
-    public Void visitConstantValue(ConstantValue_attribute attr, Void ignore) {
-        print("ConstantValue: ");
-        constantWriter.write(attr.constantvalue_index);
-        println();
-        return null;
-    }
-
-    @Override
-    public Void visitDeprecated(Deprecated_attribute attr, Void ignore) {
-        println("Deprecated: true");
-        return null;
-    }
-
-    @Override
-    public Void visitEnclosingMethod(EnclosingMethod_attribute attr, Void ignore) {
-        print("EnclosingMethod: #" + attr.class_index + ".#" + attr.method_index);
-        tab();
-        print("// " + getJavaClassName(attr));
-        if (attr.method_index != 0)
-            print("." + getMethodName(attr));
-        println();
-        return null;
-    }
-
-    private String getJavaClassName(EnclosingMethod_attribute a) {
-        try {
-            return getJavaName(a.getClassName(constant_pool));
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    private String getMethodName(EnclosingMethod_attribute a) {
-        try {
-            return a.getMethodName(constant_pool);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    @Override
-    public Void visitExceptions(Exceptions_attribute attr, Void ignore) {
-        println("Exceptions:");
-        indent(+1);
-        print("throws ");
-        for (int i = 0; i < attr.number_of_exceptions; i++) {
-            if (i > 0)
-                print(", ");
-            print(getJavaException(attr, i));
-        }
-        println();
-        indent(-1);
-        return null;
-    }
-
-    private String getJavaException(Exceptions_attribute attr, int index) {
-        try {
-            return getJavaName(attr.getException(index, constant_pool));
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
+            case BootstrapMethodsAttribute attr -> {
+                println("BootstrapMethods:");
+                for (int i = 0; i < attr.bootstrapMethodsSize() ; i++) {
+                    var bsm = attr.bootstrapMethods().get(i);
+                    indent(+1);
+                    print(i + ": #" + bsm.bootstrapMethod().index() + " ");
+                    println(constantWriter.stringValue(bsm.bootstrapMethod()));
+                    indent(+1);
+                    println("Method arguments:");
+                    indent(+1);
+                    for (var arg : bsm.arguments()) {
+                        print("#" + arg.index() + " ");
+                        println(constantWriter.stringValue(arg));
+                    }
+                    indent(-3);
+                }
+            }
+            case CharacterRangeTableAttribute attr -> {
+                println("CharacterRangeTable:");
+                indent(+1);
+                for (var e : attr.characterRangeTable()) {
+                    print(String.format("    %2d, %2d, %6x, %6x, %4x",
+                            e.startPc(), e.endPc(),
+                            e.characterRangeStart(), e.characterRangeEnd(),
+                            e.flags()));
+                    tab();
+                    print(String.format("// %2d, %2d, %4d:%02d, %4d:%02d",
+                            e.startPc(), e.endPc(),
+                            (e.characterRangeStart() >> 10),
+                            (e.characterRangeStart() & 0x3ff),
+                            (e.characterRangeEnd() >> 10),
+                            (e.characterRangeEnd() & 0x3ff)));
+                    if ((e.flags() & CRT_STATEMENT) != 0)
+                        print(", statement");
+                    if ((e.flags() & CRT_BLOCK) != 0)
+                        print(", block");
+                    if ((e.flags() & CRT_ASSIGNMENT) != 0)
+                        print(", assignment");
+                    if ((e.flags() & CRT_FLOW_CONTROLLER) != 0)
+                        print(", flow-controller");
+                    if ((e.flags() & CRT_FLOW_TARGET) != 0)
+                        print(", flow-target");
+                    if ((e.flags() & CRT_INVOKE) != 0)
+                        print(", invoke");
+                    if ((e.flags() & CRT_CREATE) != 0)
+                        print(", create");
+                    if ((e.flags() & CRT_BRANCH_TRUE) != 0)
+                        print(", branch-true");
+                    if ((e.flags() & CRT_BRANCH_FALSE) != 0)
+                        print(", branch-false");
+                    println();
+                }
+                indent(-1);
+            }
+            case CodeAttribute attr -> codeWriter.write(attr);
+            case CompilationIDAttribute attr ->
+                constantWriter.write(attr.compilationId().index());
+            case ConstantValueAttribute attr -> {
+                print("ConstantValue: ");
+                constantWriter.write(attr.constant().index());
+                println();
+            }
+            case DeprecatedAttribute attr -> println("Deprecated: true");
+            case EnclosingMethodAttribute attr -> {
+                print("EnclosingMethod: #" + attr.enclosingClass().index() + ".#"
+                        +  attr.enclosingMethod().map(PoolEntry::index).orElse(0));
+                tab();
+                print("// " + getJavaName(attr.enclosingClass().asInternalName()));
+                if (attr.enclosingMethod().isPresent())
+                    print("." + attr.enclosingMethod().get().name().stringValue());
+                println();
+            }
+            case ExceptionsAttribute attr -> {
+                println("Exceptions:");
+                indent(+1);
+                print("throws ");
+                var exc = attr.exceptions();
+                for (int i = 0; i < exc.size(); i++) {
+                    if (i > 0)
+                        print(", ");
+                    print(getJavaName(exc.get(i).asInternalName()));
+                }
+                println();
+                indent(-1);
+            }
+            case InnerClassesAttribute attr -> {
+                boolean first = true;
+                for (var info : attr.classes()) {
+                    //access
+                    int access_flags = info.flagsMask();
+                    if (options.checkAccess(access_flags)) {
+                        if (first) {
+                            println("InnerClasses:");
+                            indent(+1);
+                            first = false;
+                        }
+                        for (var flag : info.flags()) {
+                            if (flag.sourceModifier() && (flag != AccessFlag.ABSTRACT
+                                    || !info.has(AccessFlag.INTERFACE))) {
+                                print(Modifier.toString(flag.mask()) + " ");
+                            }
+                        }
+                        if (info.innerName().isPresent()) {
+                            print("#" + info.innerName().get().index() + "= ");
+                        }
+                        print("#" + info.innerClass().index());
+                        if (info.outerClass().isPresent()) {
+                            print(" of #" + info.outerClass().get().index());
+                        }
+                        print(";");
+                        tab();
+                        print("// ");
+                        if (info.innerName().isPresent()) {
+                            print(info.innerName().get().stringValue() + "=");
+                        }
+                        constantWriter.write(info.innerClass().index());
+                        if (info.outerClass().isPresent()) {
+                            print(" of ");
+                            constantWriter.write(info.outerClass().get().index());
+                        }
+                        println();
+                    }
+                }
+                if (!first)
+                    indent(-1);
+            }
+            case LineNumberTableAttribute attr -> {
+                println("LineNumberTable:");
+                indent(+1);
+                for (var entry: attr.lineNumbers()) {
+                    println("line " + entry.lineNumber() + ": " + entry.startPc());
+                }
+                indent(-1);
+            }
+            case LocalVariableTableAttribute attr -> {
+                println("LocalVariableTable:");
+                indent(+1);
+                println("Start  Length  Slot  Name   Signature");
+                for (var entry : attr.localVariables()) {
+                    println(String.format("%5d %7d %5d %5s   %s",
+                            entry.startPc(), entry.length(), entry.slot(),
+                            constantWriter.stringValue(entry.name()),
+                            constantWriter.stringValue(entry.type())));
+                }
+                indent(-1);
+            }
+            case LocalVariableTypeTableAttribute attr -> {
+                println("LocalVariableTypeTable:");
+                indent(+1);
+                println("Start  Length  Slot  Name   Signature");
+                for (var entry : attr.localVariableTypes()) {
+                    println(String.format("%5d %7d %5d %5s   %s",
+                            entry.startPc(), entry.length(), entry.slot(),
+                            constantWriter.stringValue(entry.name()),
+                            constantWriter.stringValue(entry.signature())));
+                }
+                indent(-1);
+            }
+            case NestHostAttribute attr -> {
+                print("NestHost: ");
+                constantWriter.write(attr.nestHost().index());
+                println();
+            }
+            case MethodParametersAttribute attr -> {
+                final String header = String.format(format, "Name", "Flags");
+                println("MethodParameters:");
+                indent(+1);
+                println(header);
+                for (var entry : attr.parameters()) {
+                    String namestr =
+                        entry.name().isPresent() ?
+                        constantWriter.stringValue(entry.name().get()) : "<no name>";
+                    String flagstr =
+                        (entry.has(AccessFlag.FINAL) ? "final " : "") +
+                        (entry.has(AccessFlag.MANDATED) ? "mandated " : "") +
+                        (entry.has(AccessFlag.SYNTHETIC) ? "synthetic" : "");
+                    println(String.format(format, namestr, flagstr));
+                }
+                indent(-1);
+            }
+            case ModuleAttribute attr -> {
+                println("Module:");
+                indent(+1);
 
-    @Override
-    public Void visitInnerClasses(InnerClasses_attribute attr, Void ignore) {
-        boolean first = true;
-        for (Info info : attr.classes) {
-            //access
-            AccessFlags access_flags = info.inner_class_access_flags;
-            if (options.checkAccess(access_flags)) {
-                if (first) {
-                    writeInnerClassHeader();
-                    first = false;
+                print("#" + attr.moduleName().index());
+                print(",");
+                print(String.format("%x", attr.moduleFlagsMask()));
+                tab();
+                print("// " + constantWriter.stringValue(attr.moduleName()));
+                if (attr.has(AccessFlag.OPEN))
+                    print(" ACC_OPEN");
+                if (attr.has(AccessFlag.MANDATED))
+                    print(" ACC_MANDATED");
+                if (attr.has(AccessFlag.SYNTHETIC))
+                    print(" ACC_SYNTHETIC");
+                println();
+                var ver = attr.moduleVersion();
+                print("#" + ver.map(Utf8Entry::index).orElse(0));
+                if (ver.isPresent()) {
+                    tab();
+                    print("// " + constantWriter.stringValue(ver.get()));
+                }
+                println();
+                {
+                    var entries = attr.requires();
+                    print(entries.size());
+                    tab();
+                    println("// " + "requires");
+                    indent(+1);
+                    for (var e: entries) {
+                        print("#" + e.requires().index() + ","
+                                + String.format("%x", e.requiresFlagsMask()));
+                        tab();
+                        print("// " + constantWriter.stringValue(e.requires()));
+                        if (e.has(AccessFlag.TRANSITIVE))
+                            print(" ACC_TRANSITIVE");
+                        if (e.has(AccessFlag.STATIC_PHASE))
+                            print(" ACC_STATIC_PHASE");
+                        if (e.has(AccessFlag.SYNTHETIC))
+                            print(" ACC_SYNTHETIC");
+                        if (e.has(AccessFlag.MANDATED))
+                            print(" ACC_MANDATED");
+                        println();
+                        var reqVer = e.requiresVersion();
+                        print("#" + reqVer.map(Utf8Entry::index).orElse(0));
+                        if (reqVer.isPresent()) {
+                            tab();
+                            print("// " + constantWriter.stringValue(reqVer.get()));
+                        }
+                        println();
+                    }
+                    indent(-1);
+                }
+                {
+                    var entries = attr.exports();
+                    print(entries.size());
+                    tab();
+                    println("// exports");
+                    indent(+1);
+                    for (var e: entries) {
+                        printExportOpenEntry(e.exportedPackage().index(),
+                                e.exportsFlagsMask(), e.exportsTo());
+                    }
+                    indent(-1);
+                }
+                {
+                    var entries = attr.opens();
+                    print(entries.size());
+                    tab();
+                    println("// opens");
+                    indent(+1);
+                    for (var e: entries) {
+                        printExportOpenEntry(e.openedPackage().index(),
+                                e.opensFlagsMask(), e.opensTo());
+                    }
+                    indent(-1);
                 }
-                for (String name: access_flags.getInnerClassModifiers())
-                    print(name + " ");
-                if (info.inner_name_index != 0) {
-                    print("#" + info.inner_name_index + "= ");
+                {
+                    var entries = attr.uses();
+                    print(entries.size());
+                    tab();
+                    println("// " + "uses");
+                    indent(+1);
+                    for (var e: entries) {
+                        print("#" + e.index());
+                        tab();
+                        println("// " + constantWriter.stringValue(e));
+                    }
+                    indent(-1);
                 }
-                print("#" + info.inner_class_info_index);
-                if (info.outer_class_info_index != 0) {
-                    print(" of #" + info.outer_class_info_index);
+                {
+                    var entries = attr.provides();
+                    print(entries.size());
+                    tab();
+                    println("// " + "provides");
+                    indent(+1);
+                    for (var e: entries) {
+                        print("#" + e.provides().index());
+                        tab();
+                        print("// ");
+                        print(constantWriter.stringValue(e.provides()));
+                        println(" with ... " + e.providesWith().size());
+                        indent(+1);
+                        for (var with : e.providesWith()) {
+                            print("#" + with.index());
+                            tab();
+                            println("// ... with " + constantWriter.stringValue(with));
+                        }
+                        indent(-1);
+                    }
+                    indent(-1);
                 }
-                print(";");
+                indent(-1);
+            }
+            case ModuleHashesAttribute attr -> {
+                println("ModuleHashes:");
+                indent(+1);
+                print("algorithm: #" + attr.algorithm().index());
                 tab();
-                print("// ");
-                if (info.inner_name_index != 0) {
-                    print(getInnerName(constant_pool, info) + "=");
+                println("// " + attr.algorithm().stringValue());
+                print(attr.hashes().size());
+                tab();
+                println("// hashes");
+                for (var e : attr.hashes()) {
+                    print("#" + e.moduleName().index());
+                    tab();
+                    println("// " + e.moduleName().name().stringValue());
+                    println("hash_length: " + e.hash().length);
+                    println("hash: [" + toHex(e.hash()) + "]");
                 }
-                constantWriter.write(info.inner_class_info_index);
-                if (info.outer_class_info_index != 0) {
-                    print(" of ");
-                    constantWriter.write(info.outer_class_info_index);
+                indent(-1);
+            }
+            case ModuleMainClassAttribute attr -> {
+                print("ModuleMainClass: #" + attr.mainClass().index());
+                tab();
+                print("// " + getJavaName(attr.mainClass().asInternalName()));
+                println();
+            }
+            case ModulePackagesAttribute attr -> {
+                println("ModulePackages: ");
+                indent(+1);
+                for (var p : attr.packages()) {
+                    print("#" + p.index());
+                    tab();
+                    println("// " + getJavaName(p.name().stringValue()));
                 }
+                indent(-1);
+            }
+            case ModuleResolutionAttribute attr -> {
+                println("ModuleResolution:");
+                indent(+1);
+                print(String.format("%x", attr.resolutionFlags()));
+                tab();
+                print("// ");
+                int flags = attr.resolutionFlags();
+                if ((flags & DO_NOT_RESOLVE_BY_DEFAULT) != 0)
+                    print(" DO_NOT_RESOLVE_BY_DEFAULT");
+                if ((flags & WARN_DEPRECATED) != 0)
+                    print(" WARN_DEPRECATED");
+                if ((flags & WARN_DEPRECATED_FOR_REMOVAL) != 0)
+                    print(" WARN_DEPRECATED_FOR_REMOVAL");
+                if ((flags & WARN_INCUBATING) != 0)
+                    print(" WARN_INCUBATING");
                 println();
+                indent(-1);
             }
-        }
-        if (!first)
-            indent(-1);
-        return null;
-    }
-
-    String getInnerName(ConstantPool constant_pool, InnerClasses_attribute.Info info) {
-        try {
-            return info.getInnerName(constant_pool);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    private void writeInnerClassHeader() {
-        println("InnerClasses:");
-        indent(+1);
-    }
-
-    @Override
-    public Void visitLineNumberTable(LineNumberTable_attribute attr, Void ignore) {
-        println("LineNumberTable:");
-        indent(+1);
-        for (LineNumberTable_attribute.Entry entry: attr.line_number_table) {
-            println("line " + entry.line_number + ": " + entry.start_pc);
-        }
-        indent(-1);
-        return null;
-    }
-
-    @Override
-    public Void visitLocalVariableTable(LocalVariableTable_attribute attr, Void ignore) {
-        println("LocalVariableTable:");
-        indent(+1);
-        println("Start  Length  Slot  Name   Signature");
-        for (LocalVariableTable_attribute.Entry entry : attr.local_variable_table) {
-            println(String.format("%5d %7d %5d %5s   %s",
-                    entry.start_pc, entry.length, entry.index,
-                    constantWriter.stringValue(entry.name_index),
-                    constantWriter.stringValue(entry.descriptor_index)));
-        }
-        indent(-1);
-        return null;
-    }
-
-    @Override
-    public Void visitLocalVariableTypeTable(LocalVariableTypeTable_attribute attr, Void ignore) {
-        println("LocalVariableTypeTable:");
-        indent(+1);
-        println("Start  Length  Slot  Name   Signature");
-        for (LocalVariableTypeTable_attribute.Entry entry : attr.local_variable_table) {
-            println(String.format("%5d %7d %5d %5s   %s",
-                    entry.start_pc, entry.length, entry.index,
-                    constantWriter.stringValue(entry.name_index),
-                    constantWriter.stringValue(entry.signature_index)));
-        }
-        indent(-1);
-        return null;
-    }
-
-    @Override
-    public Void visitNestHost(NestHost_attribute attr, Void aVoid) {
-        print("NestHost: ");
-        constantWriter.write(attr.top_index);
-        println();
-        return null;
-    }
-
-    private String getJavaClassName(ModuleMainClass_attribute a) {
-        try {
-            return getJavaName(a.getMainClassName(constant_pool));
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    private static final String format = "%-31s%s";
-
-    @Override
-    public Void visitMethodParameters(MethodParameters_attribute attr,
-                                      Void ignore) {
-        final String header = String.format(format, "Name", "Flags");
-        println("MethodParameters:");
-        indent(+1);
-        println(header);
-        for (MethodParameters_attribute.Entry entry :
-                 attr.method_parameter_table) {
-            String namestr =
-                entry.name_index != 0 ?
-                constantWriter.stringValue(entry.name_index) : "<no name>";
-            String flagstr =
-                (0 != (entry.flags & ACC_FINAL) ? "final " : "") +
-                (0 != (entry.flags & ACC_MANDATED) ? "mandated " : "") +
-                (0 != (entry.flags & ACC_SYNTHETIC) ? "synthetic" : "");
-            println(String.format(format, namestr, flagstr));
-        }
-        indent(-1);
-        return null;
-    }
-
-    @Override
-    public Void visitModule(Module_attribute attr, Void ignore) {
-        println("Module:");
-        indent(+1);
-
-        print("#" + attr.module_name);
-        print(",");
-        print(String.format("%x", attr.module_flags));
-        tab();
-        print("// " + constantWriter.stringValue(attr.module_name));
-        if ((attr.module_flags & Module_attribute.ACC_OPEN) != 0)
-            print(" ACC_OPEN");
-        if ((attr.module_flags & Module_attribute.ACC_MANDATED) != 0)
-            print(" ACC_MANDATED");
-        if ((attr.module_flags & Module_attribute.ACC_SYNTHETIC) != 0)
-            print(" ACC_SYNTHETIC");
-        println();
-        print("#" + attr.module_version_index);
-        if (attr.module_version_index != 0) {
-            tab();
-            print("// " + constantWriter.stringValue(attr.module_version_index));
-        }
-        println();
-
-        printRequiresTable(attr);
-        printExportsTable(attr);
-        printOpensTable(attr);
-        printUsesTable(attr);
-        printProvidesTable(attr);
-        indent(-1);
-        return null;
-    }
-
-    protected void printRequiresTable(Module_attribute attr) {
-        Module_attribute.RequiresEntry[] entries = attr.requires;
-        print(entries.length);
-        tab();
-        println("// " + "requires");
-        indent(+1);
-        for (Module_attribute.RequiresEntry e: entries) {
-            print("#" + e.requires_index + "," + String.format("%x", e.requires_flags));
-            tab();
-            print("// " + constantWriter.stringValue(e.requires_index));
-            if ((e.requires_flags & Module_attribute.ACC_TRANSITIVE) != 0)
-                print(" ACC_TRANSITIVE");
-            if ((e.requires_flags & Module_attribute.ACC_STATIC_PHASE) != 0)
-                print(" ACC_STATIC_PHASE");
-            if ((e.requires_flags & Module_attribute.ACC_SYNTHETIC) != 0)
-                print(" ACC_SYNTHETIC");
-            if ((e.requires_flags & Module_attribute.ACC_MANDATED) != 0)
-                print(" ACC_MANDATED");
-            println();
-            print("#" + e.requires_version_index);
-            if (e.requires_version_index != 0) {
+            case ModuleTargetAttribute attr -> {
+                println("ModuleTarget:");
+                indent(+1);
+                print("target_platform: #" + attr.targetPlatform().index());
                 tab();
-                print("// " + constantWriter.stringValue(e.requires_version_index));
+                println("// " + attr.targetPlatform().stringValue());
+                indent(-1);
             }
-            println();
+            case NestMembersAttribute attr -> {
+                println("NestMembers:");
+                indent(+1);
+                for (var m : attr.nestMembers()) {
+                    println(constantWriter.stringValue(m));
+                }
+                indent(-1);
+            }
+            case RecordAttribute attr -> {
+                println("Record:");
+                indent(+1);
+                for (var componentInfo : attr.components()) {
+                    var sigAttr = componentInfo.findAttribute(Attributes.SIGNATURE);
+                    print(getJavaName(
+                            new ClassWriter.SignaturePrinter(options.verbose).print(
+                                    sigAttr.map(SignatureAttribute::asTypeSignature)
+                                            .orElse(Signature.of(
+                                                    componentInfo.descriptorSymbol())))));
+                    print(" ");
+                    print(componentInfo.name().stringValue());
+                    print(";");
+                    println();
+                    indent(+1);
+                    if (options.showDescriptors) {
+                        println("descriptor: " + componentInfo.descriptor().stringValue());
+                    }
+                    if (options.showAllAttrs) {
+                        write(componentInfo.attributes());
+                        println();
+                    }
+                    indent(-1);
+                }
+                indent(-1);
+            }
+            case RuntimeVisibleAnnotationsAttribute attr ->
+                printAnnotations("RuntimeVisibleAnnotations:", attr.annotations());
+            case RuntimeInvisibleAnnotationsAttribute attr ->
+                printAnnotations("RuntimeInvisibleAnnotations:", attr.annotations());
+            case RuntimeVisibleTypeAnnotationsAttribute attr ->
+                printTypeAnnotations("RuntimeVisibleTypeAnnotations:",
+                        attr.annotations(), lr);
+            case RuntimeInvisibleTypeAnnotationsAttribute attr ->
+                printTypeAnnotations("RuntimeInvisibleTypeAnnotations:",
+                        attr.annotations(), lr);
+            case RuntimeVisibleParameterAnnotationsAttribute attr ->
+                printParameterAnnotations("RuntimeVisibleParameterAnnotations:",
+                        attr.parameterAnnotations());
+            case RuntimeInvisibleParameterAnnotationsAttribute attr ->
+                printParameterAnnotations("RuntimeInvisibleParameterAnnotations:",
+                        attr.parameterAnnotations());
+            case PermittedSubclassesAttribute attr -> {
+                println("PermittedSubclasses:");
+                indent(+1);
+                for (var sc : attr.permittedSubclasses()) {
+                    println(constantWriter.stringValue(sc));
+                }
+                indent(-1);
+            }
+            case SignatureAttribute attr -> {
+                print("Signature: #" + attr.signature().index());
+                tab();
+                println("// " + attr.signature().stringValue());
+            }
+            case SourceDebugExtensionAttribute attr -> {
+                println("SourceDebugExtension:");
+                indent(+1);
+                for (String s: new String(attr.contents(), StandardCharsets.UTF_8)
+                        .split("[\r\n]+")) {
+                    println(s);
+                }
+                indent(-1);
+            }
+            case SourceFileAttribute attr ->
+                println("SourceFile: \"" + attr.sourceFile().stringValue() + "\"");
+            case SourceIDAttribute attr ->
+                constantWriter.write(attr.sourceId().index());
+            case StackMapTableAttribute attr -> {
+                var entries = attr.entries();
+                println("StackMapTable: number_of_entries = " + entries.size());
+                indent(+1);
+                int lastOffset = -1;
+                for (var frame : entries) {
+                    int frameType = frame.frameType();
+                    if (frameType < 64) {
+                        printHeader(frameType, "/* same */");
+                    } else if (frameType < 128) {
+                        printHeader(frameType, "/* same_locals_1_stack_item */");
+                        indent(+1);
+                        printMap("stack", frame.stack(), lr);
+                        indent(-1);
+                    } else {
+                        int offsetDelta = lr.labelToBci(frame.target()) - lastOffset - 1;
+                        switch (frameType) {
+                            case 247 -> {
+                                printHeader(frameType, "/* same_locals_1_stack_item_frame_extended */");
+                                indent(+1);
+                                println("offset_delta = " + offsetDelta);
+                                printMap("stack", frame.stack(), lr);
+                                indent(-1);
+                            }
+                            case 248, 249, 250 -> {
+                                printHeader(frameType, "/* chop */");
+                                indent(+1);
+                                println("offset_delta = " + offsetDelta);
+                                indent(-1);
+                            }
+                            case 251 -> {
+                                printHeader(frameType, "/* same_frame_extended */");
+                                indent(+1);
+                                println("offset_delta = " + offsetDelta);
+                                indent(-1);
+                            }
+                            case 252, 253, 254 -> {
+                                printHeader(frameType, "/* append */");
+                                indent(+1);
+                                println("offset_delta = " + offsetDelta);
+                                var locals = frame.locals();
+                                printMap("locals", locals.subList(locals.size()
+                                        - frameType + 251, locals.size()), lr);
+                                indent(-1);
+                            }
+                            case 255 -> {
+                                printHeader(frameType, "/* full_frame */");
+                                indent(+1);
+                                println("offset_delta = " + offsetDelta);
+                                printMap("locals", frame.locals(), lr);
+                                printMap("stack", frame.stack(), lr);
+                                indent(-1);
+                            }
+                        }
+                    }
+                    lastOffset = lr.labelToBci(frame.target());
+                }
+                indent(-1);
+            }
+            case SyntheticAttribute attr ->
+                println("Synthetic: true");
+            default -> {}
         }
-        indent(-1);
     }
 
-    protected void printExportsTable(Module_attribute attr) {
-        Module_attribute.ExportsEntry[] entries = attr.exports;
-        print(entries.length);
-        tab();
-        println("// exports");
-        indent(+1);
-        for (Module_attribute.ExportsEntry e: entries) {
-            printExportOpenEntry(e.exports_index, e.exports_flags, e.exports_to_index);
-        }
-        indent(-1);
-    }
+    //ToDo move somewhere to Bytecode API
+    public static final int DO_NOT_RESOLVE_BY_DEFAULT   = 0x0001;
+    public static final int WARN_DEPRECATED             = 0x0002;
+    public static final int WARN_DEPRECATED_FOR_REMOVAL = 0x0004;
+    public static final int WARN_INCUBATING             = 0x0008;
 
-    protected void printOpensTable(Module_attribute attr) {
-        Module_attribute.OpensEntry[] entries = attr.opens;
-        print(entries.length);
-        tab();
-        println("// opens");
-        indent(+1);
-        for (Module_attribute.OpensEntry e: entries) {
-            printExportOpenEntry(e.opens_index, e.opens_flags, e.opens_to_index);
-        }
-        indent(-1);
-    }
+    private static final String format = "%-31s%s";
 
-    protected void printExportOpenEntry(int index, int flags, int[] to_index) {
+    protected void printExportOpenEntry(int index, int flags, List<ModuleEntry> to_index) {
         print("#" + index + "," + String.format("%x", flags));
         tab();
         print("// ");
         print(constantWriter.stringValue(index));
-        if ((flags & Module_attribute.ACC_MANDATED) != 0)
+        if ((flags & ACC_MANDATED) != 0)
             print(" ACC_MANDATED");
-        if ((flags & Module_attribute.ACC_SYNTHETIC) != 0)
+        if ((flags & ACC_SYNTHETIC) != 0)
             print(" ACC_SYNTHETIC");
-        if (to_index.length == 0) {
+        if (to_index.size() == 0) {
             println();
         } else {
-            println(" to ... " + to_index.length);
+            println(" to ... " + to_index.size());
             indent(+1);
-            for (int to: to_index) {
-                print("#" + to);
+            for (var to: to_index) {
+                print("#" + to.index());
                 tab();
                 println("// ... to " + constantWriter.stringValue(to));
             }
@@ -557,311 +638,39 @@ protected void printExportOpenEntry(int index, int flags, int[] to_index) {
         }
     }
 
-    protected void printUsesTable(Module_attribute attr) {
-        int[] entries = attr.uses_index;
-        print(entries.length);
-        tab();
-        println("// " + "uses");
-        indent(+1);
-        for (int e: entries) {
-            print("#" + e);
-            tab();
-            println("// " + constantWriter.stringValue(e));
-        }
-        indent(-1);
-    }
-
-    protected void printProvidesTable(Module_attribute attr) {
-        Module_attribute.ProvidesEntry[] entries = attr.provides;
-        print(entries.length);
-        tab();
-        println("// " + "provides");
-        indent(+1);
-        for (Module_attribute.ProvidesEntry e: entries) {
-            print("#" + e.provides_index);
-            tab();
-            print("// ");
-            print(constantWriter.stringValue(e.provides_index));
-            println(" with ... " + e.with_count);
-            indent(+1);
-            for (int with : e.with_index) {
-                print("#" + with);
-                tab();
-                println("// ... with " + constantWriter.stringValue(with));
-            }
-            indent(-1);
-        }
-        indent(-1);
-    }
-
-    @Override
-    public Void visitModuleHashes(ModuleHashes_attribute attr, Void ignore) {
-        println("ModuleHashes:");
-        indent(+1);
-        print("algorithm: #" + attr.algorithm_index);
-        tab();
-        println("// " + getAlgorithm(attr));
-        print(attr.hashes_table_length);
-        tab();
-        println("// hashes");
-        for (ModuleHashes_attribute.Entry e : attr.hashes_table) {
-            print("#" + e.module_name_index);
-            tab();
-            println("// " + getModuleName(e));
-            println("hash_length: " + e.hash.length);
-            println("hash: [" + toHex(e.hash) + "]");
-        }
-        indent(-1);
-        return null;
-    }
-
-    private String getAlgorithm(ModuleHashes_attribute attr) {
-        try {
-            return constant_pool.getUTF8Value(attr.algorithm_index);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    private String getModuleName(ModuleHashes_attribute.Entry entry) {
-        try {
-            int utf8Index = constant_pool.getModuleInfo(entry.module_name_index).name_index;
-            return constant_pool.getUTF8Value(utf8Index);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    @Override
-    public Void visitModuleMainClass(ModuleMainClass_attribute attr, Void ignore) {
-        print("ModuleMainClass: #" + attr.main_class_index);
-        tab();
-        print("// " + getJavaClassName(attr));
-        println();
-        return null;
-    }
-
-    @Override
-    public Void visitModulePackages(ModulePackages_attribute attr, Void ignore) {
-        println("ModulePackages: ");
-        indent(+1);
-        for (int i = 0; i < attr.packages_count; i++) {
-            print("#" + attr.packages_index[i]);
-            tab();
-            println("// " + getJavaPackage(attr, i));
-        }
-        indent(-1);
-        return null;
-    }
-
-    private String getJavaPackage(ModulePackages_attribute attr, int index) {
-        try {
-            return getJavaName(attr.getPackage(index, constant_pool));
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    @Override
-    public Void visitModuleResolution(ModuleResolution_attribute attr, Void ignore) {
-        println("ModuleResolution:");
-        indent(+1);
-        print(String.format("%x", attr.resolution_flags));
-        tab();
-        print("// ");
-        int flags = attr.resolution_flags;
-        if ((flags & ModuleResolution_attribute.DO_NOT_RESOLVE_BY_DEFAULT) != 0)
-            print(" DO_NOT_RESOLVE_BY_DEFAULT");
-        if ((flags & ModuleResolution_attribute.WARN_DEPRECATED) != 0)
-            print(" WARN_DEPRECATED");
-        if ((flags & ModuleResolution_attribute.WARN_DEPRECATED_FOR_REMOVAL) != 0)
-            print(" WARN_DEPRECATED_FOR_REMOVAL");
-        if ((flags & ModuleResolution_attribute.WARN_INCUBATING) != 0)
-            print(" WARN_INCUBATING");
-        println();
-        indent(-1);
-        return null;
-    }
-
-    @Override
-    public Void visitModuleTarget(ModuleTarget_attribute attr, Void ignore) {
-        println("ModuleTarget:");
-        indent(+1);
-        print("target_platform: #" + attr.target_platform_index);
-        if (attr.target_platform_index != 0) {
-            tab();
-            print("// " + getTargetPlatform(attr));
-        }
-        println();
-        indent(-1);
-        return null;
-    }
-
-    private String getTargetPlatform(ModuleTarget_attribute attr) {
-        try {
-            return constant_pool.getUTF8Value(attr.target_platform_index);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    @Override
-    public Void visitNestMembers(NestMembers_attribute attr, Void aVoid) {
-        println("NestMembers:");
-        indent(+1);
-        try {
-            CONSTANT_Class_info[] children = attr.getChildren(constant_pool);
-            for (int i = 0; i < attr.members_indexes.length; i++) {
-                println(constantWriter.stringValue(children[i]));
-            }
-            indent(-1);
-        } catch (ConstantPoolException ex) {
-            throw new AssertionError(ex);
-        }
-        return null;
-    }
-
-    @Override
-    public Void visitRecord(Record_attribute attr, Void p) {
-        println("Record:");
-        indent(+1);
-        for (Record_attribute.ComponentInfo componentInfo : attr.component_info_arr) {
-            Signature_attribute sigAttr = (Signature_attribute) componentInfo.attributes.get(Attribute.Signature);
-
-            if (sigAttr == null)
-                print(getJavaFieldType(componentInfo.descriptor));
-            else {
-                try {
-                    Type t = sigAttr.getParsedSignature().getType(constant_pool);
-                    print(getJavaName(t.toString()));
-                } catch (ConstantPoolException e) {
-                    // report error?
-                    // fall back on non-generic descriptor
-                    print(getJavaFieldType(componentInfo.descriptor));
-                }
-            }
-
-            print(" ");
-            try {
-                print(componentInfo.getName(constant_pool));
-            } catch (ConstantPoolException e) {
-                report(e);
-                return null;
-            }
-            print(";");
-            println();
-            indent(+1);
-            if (options.showDescriptors) {
-                println("descriptor: " + getValue(componentInfo.descriptor));
-            }
-            if (options.showAllAttrs) {
-                for (Attribute componentAttr: componentInfo.attributes)
-                    write(componentInfo, componentAttr, constant_pool);
-                println();
-            }
-            indent(-1);
-        }
-        indent(-1);
-        return null;
-    }
-
-    String getValue(Descriptor d) {
-        try {
-            return d.getValue(constant_pool);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    void writeList(String prefix, Collection<?> items, String suffix) {
-        print(prefix);
-        String sep = "";
-        for (Object item: items) {
-            print(sep);
-            print(item);
-            sep = ", ";
-        }
-        print(suffix);
-    }
-
-    String getJavaFieldType(Descriptor d) {
-        try {
-            return getJavaName(d.getFieldType(constant_pool));
-        } catch (ConstantPoolException e) {
-            return report(e);
-        } catch (InvalidDescriptor e) {
-            return report(e);
-        }
-    }
-
-    void writeModifiers(Collection<String> items) {
-        for (Object item: items) {
-            print(item);
-            print(" ");
-        }
-    }
-
-    @Override
-    public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, Void ignore) {
-        println("RuntimeVisibleAnnotations:");
-        indent(+1);
-        for (int i = 0; i < attr.annotations.length; i++) {
-            print(i + ": ");
-            annotationWriter.write(attr.annotations[i]);
-            println();
-        }
-        indent(-1);
-        return null;
-    }
-
-    @Override
-    public Void visitRuntimeInvisibleAnnotations(RuntimeInvisibleAnnotations_attribute attr, Void ignore) {
-        println("RuntimeInvisibleAnnotations:");
-        indent(+1);
-        for (int i = 0; i < attr.annotations.length; i++) {
-            print(i + ": ");
-            annotationWriter.write(attr.annotations[i]);
-            println();
-        }
-        indent(-1);
-        return null;
-    }
-
-    @Override
-    public Void visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, Void ignore) {
-        println("RuntimeVisibleTypeAnnotations:");
+    private void printAnnotations(String message, List<? extends Annotation> anno) {
+        println(message);
         indent(+1);
-        for (int i = 0; i < attr.annotations.length; i++) {
+        for (int i = 0; i < anno.size(); i++) {
             print(i + ": ");
-            annotationWriter.write(attr.annotations[i]);
+            annotationWriter.write(anno.get(i));
             println();
         }
         indent(-1);
-        return null;
     }
 
-    @Override
-    public Void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute attr, Void ignore) {
-        println("RuntimeInvisibleTypeAnnotations:");
+    private void printTypeAnnotations(String message,
+            List<? extends TypeAnnotation> anno, CodeAttribute lr) {
+        println(message);
         indent(+1);
-        for (int i = 0; i < attr.annotations.length; i++) {
+        for (int i = 0; i < anno.size(); i++) {
             print(i + ": ");
-            annotationWriter.write(attr.annotations[i]);
+            annotationWriter.write(anno.get(i), lr);
             println();
         }
         indent(-1);
-        return null;
     }
 
-    private void visitParameterAnnotations(String message, RuntimeParameterAnnotations_attribute attr) {
+    private void printParameterAnnotations(String message, List<List<Annotation>> paramsAnno) {
         println(message);
         indent(+1);
-        for (int param = 0; param < attr.parameter_annotations.length; param++) {
+        for (int param = 0; param < paramsAnno.size(); param++) {
             println("parameter " + param + ": ");
             indent(+1);
-            for (int i = 0; i < attr.parameter_annotations[param].length; i++) {
+            var annos = paramsAnno.get(param);
+            for (int i = 0; i < annos.size(); i++) {
                 print(i + ": ");
-                annotationWriter.write(attr.parameter_annotations[param][i]);
+                annotationWriter.write(annos.get(i));
                 println();
             }
             indent(-1);
@@ -869,247 +678,41 @@ private void visitParameterAnnotations(String message, RuntimeParameterAnnotatio
         indent(-1);
     }
 
-    @Override
-    public Void visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, Void ignore) {
-        visitParameterAnnotations("RuntimeVisibleParameterAnnotations:", (RuntimeParameterAnnotations_attribute) attr);
-        return null;
-    }
-
-    @Override
-    public Void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisibleParameterAnnotations_attribute attr, Void ignore) {
-        visitParameterAnnotations("RuntimeInvisibleParameterAnnotations:", (RuntimeParameterAnnotations_attribute) attr);
-        return null;
-    }
-
-    @Override
-    public Void visitPermittedSubclasses(PermittedSubclasses_attribute attr, Void ignore) {
-        println("PermittedSubclasses:");
-        indent(+1);
-        try {
-            CONSTANT_Class_info[] subtypes = attr.getSubtypes(constant_pool);
-            for (int i = 0; i < subtypes.length; i++) {
-                println(constantWriter.stringValue(subtypes[i]));
-            }
-            indent(-1);
-        } catch (ConstantPoolException ex) {
-            throw new AssertionError(ex);
-        }
-        return null;
-    }
-
-    @Override
-    public Void visitSignature(Signature_attribute attr, Void ignore) {
-        print("Signature: #" + attr.signature_index);
-        tab();
-        println("// " + getSignature(attr));
-        return null;
-    }
-
-    String getSignature(Signature_attribute info) {
-        try {
-            return info.getSignature(constant_pool);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    @Override
-    public Void visitSourceDebugExtension(SourceDebugExtension_attribute attr, Void ignore) {
-        println("SourceDebugExtension:");
-        indent(+1);
-        for (String s: attr.getValue().split("[\r\n]+")) {
-            println(s);
-        }
-        indent(-1);
-        return null;
-    }
-
-    @Override
-    public Void visitSourceFile(SourceFile_attribute attr, Void ignore) {
-        println("SourceFile: \"" + getSourceFile(attr) + "\"");
-        return null;
-    }
-
-    private String getSourceFile(SourceFile_attribute attr) {
-        try {
-            return attr.getSourceFile(constant_pool);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    @Override
-    public Void visitSourceID(SourceID_attribute attr, Void ignore) {
-        constantWriter.write(attr.sourceID_index);
-        return null;
-    }
-
-    @Override
-    public Void visitStackMap(StackMap_attribute attr, Void ignore) {
-        println("StackMap: number_of_entries = " + attr.number_of_entries);
-        indent(+1);
-        StackMapTableWriter w = new StackMapTableWriter();
-        for (StackMapTable_attribute.stack_map_frame entry : attr.entries) {
-            w.write(entry);
-        }
-        indent(-1);
-        return null;
-    }
-
-    @Override
-    public Void visitStackMapTable(StackMapTable_attribute attr, Void ignore) {
-        println("StackMapTable: number_of_entries = " + attr.number_of_entries);
-        indent(+1);
-        StackMapTableWriter w = new StackMapTableWriter();
-        for (StackMapTable_attribute.stack_map_frame entry : attr.entries) {
-            w.write(entry);
-        }
-        indent(-1);
-        return null;
+    void printHeader(int frameType, String extra) {
+        print("frame_type = " + frameType + " ");
+        println(extra);
     }
 
-    class StackMapTableWriter // also handles CLDC StackMap attributes
-            implements StackMapTable_attribute.stack_map_frame.Visitor<Void,Void> {
-        public void write(StackMapTable_attribute.stack_map_frame frame) {
-            frame.accept(this, null);
-        }
-
-        @Override
-        public Void visit_same_frame(StackMapTable_attribute.same_frame frame, Void p) {
-            printHeader(frame, "/* same */");
-            return null;
-        }
-
-        @Override
-        public Void visit_same_locals_1_stack_item_frame(StackMapTable_attribute.same_locals_1_stack_item_frame frame, Void p) {
-            printHeader(frame, "/* same_locals_1_stack_item */");
-            indent(+1);
-            printMap("stack", frame.stack);
-            indent(-1);
-            return null;
-        }
-
-        @Override
-        public Void visit_same_locals_1_stack_item_frame_extended(StackMapTable_attribute.same_locals_1_stack_item_frame_extended frame, Void p) {
-            printHeader(frame, "/* same_locals_1_stack_item_frame_extended */");
-            indent(+1);
-            println("offset_delta = " + frame.offset_delta);
-            printMap("stack", frame.stack);
-            indent(-1);
-            return null;
-        }
-
-        @Override
-        public Void visit_chop_frame(StackMapTable_attribute.chop_frame frame, Void p) {
-            printHeader(frame, "/* chop */");
-            indent(+1);
-            println("offset_delta = " + frame.offset_delta);
-            indent(-1);
-            return null;
-        }
-
-        @Override
-        public Void visit_same_frame_extended(StackMapTable_attribute.same_frame_extended frame, Void p) {
-            printHeader(frame, "/* same_frame_extended */");
-            indent(+1);
-            println("offset_delta = " + frame.offset_delta);
-            indent(-1);
-            return null;
-        }
-
-        @Override
-        public Void visit_append_frame(StackMapTable_attribute.append_frame frame, Void p) {
-            printHeader(frame, "/* append */");
-            indent(+1);
-            println("offset_delta = " + frame.offset_delta);
-            printMap("locals", frame.locals);
-            indent(-1);
-            return null;
-        }
-
-        @Override
-        public Void visit_full_frame(StackMapTable_attribute.full_frame frame, Void p) {
-            if (frame instanceof StackMap_attribute.stack_map_frame) {
-                printHeader(frame, "offset = " + frame.offset_delta);
-                indent(+1);
-            } else {
-                printHeader(frame, "/* full_frame */");
-                indent(+1);
-                println("offset_delta = " + frame.offset_delta);
-            }
-            printMap("locals", frame.locals);
-            printMap("stack", frame.stack);
-            indent(-1);
-            return null;
-        }
-
-        void printHeader(StackMapTable_attribute.stack_map_frame frame, String extra) {
-            print("frame_type = " + frame.frame_type + " ");
-            println(extra);
-        }
-
-        void printMap(String name, StackMapTable_attribute.verification_type_info[] map) {
-            print(name + " = [");
-            for (int i = 0; i < map.length; i++) {
-                StackMapTable_attribute.verification_type_info info = map[i];
-                int tag = info.tag;
-                switch (tag) {
-                    case StackMapTable_attribute.verification_type_info.ITEM_Object:
-                        print(" ");
-                        constantWriter.write(((StackMapTable_attribute.Object_variable_info) info).cpool_index);
-                        break;
-                    case StackMapTable_attribute.verification_type_info.ITEM_Uninitialized:
-                        print(" " + mapTypeName(tag));
-                        print(" " + ((StackMapTable_attribute.Uninitialized_variable_info) info).offset);
-                        break;
-                    default:
-                        print(" " + mapTypeName(tag));
+    void printMap(String name, List<VerificationTypeInfo> map, CodeAttribute lr) {
+        print(name + " = [");
+        for (int i = 0; i < map.size(); i++) {
+            var info = map.get(i);
+            switch (info) {
+                case ObjectVerificationTypeInfo obj -> {
+                    print(" ");
+                    constantWriter.write(obj.className().index());
                 }
-                print(i == (map.length - 1) ? " " : ",");
-            }
-            println("]");
-        }
-
-        String mapTypeName(int tag) {
-            switch (tag) {
-            case StackMapTable_attribute.verification_type_info.ITEM_Top:
-                return "top";
-
-            case StackMapTable_attribute.verification_type_info.ITEM_Integer:
-                return "int";
-
-            case StackMapTable_attribute.verification_type_info.ITEM_Float:
-                return "float";
-
-            case StackMapTable_attribute.verification_type_info.ITEM_Long:
-                return "long";
-
-            case StackMapTable_attribute.verification_type_info.ITEM_Double:
-                return "double";
-
-            case StackMapTable_attribute.verification_type_info.ITEM_Null:
-                return "null";
-
-            case StackMapTable_attribute.verification_type_info.ITEM_UninitializedThis:
-                return "this";
-
-            case StackMapTable_attribute.verification_type_info.ITEM_Object:
-                return "CP";
-
-            case StackMapTable_attribute.verification_type_info.ITEM_Uninitialized:
-                return "uninitialized";
-
-            default:
-                report("unrecognized verification_type_info tag: " + tag);
-                return "[tag:" + tag + "]";
+                case UninitializedVerificationTypeInfo u -> {
+                    print(" uninitialized " + lr.labelToBci(u.newTarget()));
+                }
+                case SimpleVerificationTypeInfo s ->
+                    print(" " + mapTypeName(s));
             }
+            print(i == (map.size() - 1) ? " " : ",");
         }
+        println("]");
     }
 
-    @Override
-    public Void visitSynthetic(Synthetic_attribute attr, Void ignore) {
-        println("Synthetic: true");
-        return null;
+    String mapTypeName(SimpleVerificationTypeInfo type) {
+        return switch (type) {
+            case ITEM_TOP -> "top";
+            case ITEM_INTEGER -> "int";
+            case ITEM_FLOAT -> "float";
+            case ITEM_LONG -> "long";
+            case ITEM_DOUBLE -> "double";
+            case ITEM_NULL -> "null";
+            case ITEM_UNINITIALIZED_THIS -> "this";
+        };
     }
 
     static String getJavaName(String name) {
@@ -1121,14 +724,14 @@ String toHex(byte b, int w) {
     }
 
     static String toHex(int i) {
-        return StringUtils.toUpperCase(Integer.toString(i, 16));
+        return Integer.toString(i, 16).toUpperCase(Locale.US);
     }
 
     static String toHex(int i, int w) {
-        String s = StringUtils.toUpperCase(Integer.toHexString(i));
+        String s = Integer.toHexString(i).toUpperCase(Locale.US);
         while (s.length() < w)
             s = "0" + s;
-        return StringUtils.toUpperCase(s);
+        return s;
     }
 
     static String toHex(byte[] ba) {
@@ -1143,7 +746,4 @@ static String toHex(byte[] ba) {
     private final CodeWriter codeWriter;
     private final ConstantWriter constantWriter;
     private final Options options;
-
-    private ConstantPool constant_pool;
-    private Object owner;
 }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java
index 899bc415125..8629957f907 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java
@@ -26,10 +26,7 @@
 package com.sun.tools.javap;
 
 import java.io.PrintWriter;
-
-import com.sun.tools.classfile.AttributeException;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.DescriptorException;
+import java.util.function.Supplier;
 
 /*
  *  A writer similar to a PrintWriter but which does not hide exceptions.
@@ -57,6 +54,14 @@ protected void print(Object o) {
         lineWriter.print(o == null ? null : o.toString());
     }
 
+    protected void print(Supplier<Object> safeguardedCode) {
+        try {
+            print(safeguardedCode.get());
+        } catch (IllegalArgumentException e) {
+            print(report(e));
+        }
+    }
+
     protected void println() {
         lineWriter.println();
     }
@@ -71,6 +76,11 @@ protected void println(Object o) {
         lineWriter.println();
     }
 
+    protected void println(Supplier<Object> safeguardedCode) {
+        print(safeguardedCode);
+        lineWriter.println();
+    }
+
     protected void indent(int delta) {
         lineWriter.indent(delta);
     }
@@ -83,23 +93,15 @@ protected void setPendingNewline(boolean b) {
         lineWriter.pendingNewline = b;
     }
 
-    protected String report(AttributeException e) {
-        out.println("Error: " + e.getMessage()); // i18n?
-        return "???";
-    }
-
-    protected String report(ConstantPoolException e) {
-        out.println("Error: " + e.getMessage()); // i18n?
-        return "???";
-    }
-
-    protected String report(DescriptorException e) {
+    protected String report(Exception e) {
         out.println("Error: " + e.getMessage()); // i18n?
+        errorReported = true;
         return "???";
     }
 
     protected String report(String msg) {
         out.println("Error: " + msg); // i18n?
+        errorReported = true;
         return "???";
     }
 
@@ -123,6 +125,7 @@ protected String space(int w) {
     private LineWriter lineWriter;
     private PrintWriter out;
     protected Messages messages;
+    protected boolean errorReported;
 
     private static class LineWriter {
         static LineWriter instance(Context context) {
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
index ccd0ea5df53..508fbd9e03a 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
@@ -32,35 +32,23 @@
 import java.util.List;
 import java.util.Set;
 
-import com.sun.tools.classfile.AccessFlags;
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.Attributes;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.Code_attribute;
-import com.sun.tools.classfile.ConstantPool;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.ConstantValue_attribute;
-import com.sun.tools.classfile.Descriptor;
-import com.sun.tools.classfile.Descriptor.InvalidDescriptor;
-import com.sun.tools.classfile.Exceptions_attribute;
-import com.sun.tools.classfile.Field;
-import com.sun.tools.classfile.Method;
-import com.sun.tools.classfile.Module_attribute;
-import com.sun.tools.classfile.Signature;
-import com.sun.tools.classfile.Signature_attribute;
-import com.sun.tools.classfile.SourceFile_attribute;
-import com.sun.tools.classfile.Type;
-import com.sun.tools.classfile.Type.ArrayType;
-import com.sun.tools.classfile.Type.ClassSigType;
-import com.sun.tools.classfile.Type.ClassType;
-import com.sun.tools.classfile.Type.MethodType;
-import com.sun.tools.classfile.Type.SimpleType;
-import com.sun.tools.classfile.Type.TypeParamType;
-import com.sun.tools.classfile.Type.WildcardType;
-
-import static com.sun.tools.classfile.AccessFlags.*;
-import static com.sun.tools.classfile.ConstantPool.CONSTANT_Module;
-import static com.sun.tools.classfile.ConstantPool.CONSTANT_Package;
+import java.lang.constant.ClassDesc;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import jdk.internal.classfile.AccessFlags;
+import jdk.internal.classfile.Attributes;
+import jdk.internal.classfile.ClassModel;
+import jdk.internal.classfile.ClassSignature;
+import jdk.internal.classfile.Classfile;
+import static jdk.internal.classfile.Classfile.*;
+import jdk.internal.classfile.constantpool.*;
+import jdk.internal.classfile.FieldModel;
+import jdk.internal.classfile.MethodModel;
+import jdk.internal.classfile.MethodSignature;
+import jdk.internal.classfile.Signature;
+import jdk.internal.classfile.attribute.CodeAttribute;
+import jdk.internal.classfile.attribute.SignatureAttribute;
 
 /*
  *  The main javap class to write the contents of a class file as text.
@@ -85,6 +73,7 @@ protected ClassWriter(Context context) {
         attrWriter = AttributeWriter.instance(context);
         codeWriter = CodeWriter.instance(context);
         constantWriter = ConstantWriter.instance(context);
+        sigPrinter = new SignaturePrinter(options.verbose);
     }
 
     void setDigest(String name, byte[] digest) {
@@ -104,25 +93,25 @@ void setLastModified(long lastModified) {
         this.lastModified = lastModified;
     }
 
-    protected ClassFile getClassFile() {
-        return classFile;
+    protected ClassModel getClassModel() {
+        return classModel;
     }
 
-    protected void setClassFile(ClassFile cf) {
-        classFile = cf;
-        constant_pool = classFile.constant_pool;
+    protected void setClassFile(ClassModel cm) {
+        classModel = cm;
     }
 
-    protected Method getMethod() {
+    protected MethodModel getMethod() {
         return method;
     }
 
-    protected void setMethod(Method m) {
+    protected void setMethod(MethodModel m) {
         method = m;
     }
 
-    public void write(ClassFile cf) {
-        setClassFile(cf);
+    public boolean write(ClassModel cm) {
+        errorReported = false;
+        setClassFile(cm);
 
         if (options.sysInfo || options.verbose) {
             if (uri != null) {
@@ -136,7 +125,8 @@ public void write(ClassFile cf) {
                 Date lm = new Date(lastModified);
                 DateFormat df = DateFormat.getDateInstance();
                 if (size > 0) {
-                    println("Last modified " + df.format(lm) + "; size " + size + " bytes");
+                    println("Last modified " + df.format(lm) + "; size " + size
+                            + " bytes");
                 } else {
                     println("Last modified " + df.format(lm));
                 }
@@ -151,111 +141,94 @@ public void write(ClassFile cf) {
             }
         }
 
-        Attribute sfa = cf.getAttribute(Attribute.SourceFile);
-        if (sfa instanceof SourceFile_attribute) {
-            println("Compiled from \"" + getSourceFile((SourceFile_attribute) sfa) + "\"");
-        }
+        cm.findAttribute(Attributes.SOURCE_FILE).ifPresent(sfa ->
+            println("Compiled from \"" + sfa.sourceFile().stringValue() + "\""));
 
         if (options.sysInfo || options.verbose) {
             indent(-1);
         }
 
-        AccessFlags flags = cf.access_flags;
-        writeModifiers(flags.getClassModifiers());
-
-        if (classFile.access_flags.is(AccessFlags.ACC_MODULE)) {
-            Attribute attr = classFile.attributes.get(Attribute.Module);
-            if (attr instanceof Module_attribute) {
-                Module_attribute modAttr = (Module_attribute) attr;
-                String name;
-                try {
-                    // FIXME: compatibility code
-                    if (constant_pool.get(modAttr.module_name).getTag() == CONSTANT_Module) {
-                        name = getJavaName(constant_pool.getModuleInfo(modAttr.module_name).getName());
-                    } else {
-                        name = getJavaName(constant_pool.getUTF8Value(modAttr.module_name));
-                    }
-                } catch (ConstantPoolException e) {
-                    name = report(e);
-                }
-                if ((modAttr.module_flags & Module_attribute.ACC_OPEN) != 0) {
+        writeModifiers(getClassModifiers(cm.flags().flagsMask()));
+
+        if ((classModel.flags().flagsMask() & ACC_MODULE) != 0) {
+            var attr = classModel.findAttribute(Attributes.MODULE);
+            if (attr.isPresent()) {
+                var modAttr = attr.get();
+                if ((modAttr.moduleFlagsMask() & ACC_OPEN) != 0) {
                     print("open ");
                 }
                 print("module ");
-                print(name);
-                if (modAttr.module_version_index != 0) {
+                print(() -> modAttr.moduleName().name().stringValue());
+                if (modAttr.moduleVersion().isPresent()) {
                     print("@");
-                    print(getUTF8Value(modAttr.module_version_index));
+                    print(() -> modAttr.moduleVersion().get().stringValue());
                 }
             } else {
                 // fallback for malformed class files
                 print("class ");
-                print(getJavaName(classFile));
+                print(() -> getJavaName(classModel.thisClass().asInternalName()));
             }
         } else {
-            if (classFile.isClass())
+            if ((classModel.flags().flagsMask() & ACC_INTERFACE) == 0)
                 print("class ");
-            else if (classFile.isInterface())
+            else
                 print("interface ");
 
-            print(getJavaName(classFile));
+            print(() -> getJavaName(classModel.thisClass().asInternalName()));
         }
 
-        Signature_attribute sigAttr = getSignature(cf.attributes);
-        if (sigAttr == null) {
-            // use info from class file header
-            if (classFile.isClass() && classFile.super_class != 0 ) {
-                String sn = getJavaSuperclassName(cf);
-                if (!sn.equals("java.lang.Object")) {
-                    print(" extends ");
-                    print(sn);
+        try {
+            var sigAttr = classModel.findAttribute(Attributes.SIGNATURE).orElse(null);
+            if (sigAttr == null) {
+                // use info from class file header
+                if ((classModel.flags().flagsMask() & ACC_INTERFACE) == 0
+                        && classModel.superclass().isPresent()) {
+                    String sn = getJavaName(classModel.superclass().get().asInternalName());
+                    if (!sn.equals("java.lang.Object")) {
+                        print(" extends ");
+                        print(sn);
+                    }
                 }
-            }
-            for (int i = 0; i < classFile.interfaces.length; i++) {
-                print(i == 0 ? (classFile.isClass() ? " implements " : " extends ") : ",");
-                print(getJavaInterfaceName(classFile, i));
-            }
-        } else {
-            try {
-                Type t = sigAttr.getParsedSignature().getType(constant_pool);
-                JavaTypePrinter p = new JavaTypePrinter(classFile.isInterface());
-                // The signature parser cannot disambiguate between a
-                // FieldType and a ClassSignatureType that only contains a superclass type.
-                if (t instanceof Type.ClassSigType) {
-                    print(p.print(t));
-                } else if (options.verbose || !t.isObject()) {
-                    print(" extends ");
-                    print(p.print(t));
+                var interfaces = classModel.interfaces();
+                for (int i = 0; i < interfaces.size(); i++) {
+                    print(i == 0 ? ((classModel.flags().flagsMask() & ACC_INTERFACE) == 0
+                            ? " implements " : " extends ") : ",");
+                    print(getJavaName(interfaces.get(i).asInternalName()));
                 }
-            } catch (ConstantPoolException e) {
-                print(report(e));
-            } catch (IllegalStateException e) {
-                report("Invalid value for Signature attribute: " + e.getMessage());
+            } else {
+                var t = sigAttr.asClassSignature();
+                print(sigPrinter.print(t, (classModel.flags().flagsMask() & ACC_INTERFACE) != 0));
             }
+        } catch (IllegalArgumentException e) {
+            report(e);
         }
 
         if (options.verbose) {
             println();
             indent(+1);
-            println("minor version: " + cf.minor_version);
-            println("major version: " + cf.major_version);
-            writeList(String.format("flags: (0x%04x) ", flags.flags), flags.getClassFlags(), "\n");
-            print("this_class: #" + cf.this_class);
-            if (cf.this_class != 0) {
-                tab();
-                print("// " + constantWriter.stringValue(cf.this_class));
-            }
+            println("minor version: " + classModel.minorVersion());
+            println("major version: " + classModel.majorVersion());
+            writeList(String.format("flags: (0x%04x) ", cm.flags().flagsMask()),
+                    getClassFlags(cm.flags().flagsMask()), "\n");
+            print("this_class: #");print(() -> classModel.thisClass().index());
+            tab();
+            print(() -> "// " + classModel.thisClass().asInternalName());
             println();
-            print("super_class: #" + cf.super_class);
-            if (cf.super_class != 0) {
-                tab();
-                print("// " + constantWriter.stringValue(cf.super_class));
+            print("super_class: #");print(() -> classModel.superclass()
+                    .map(ClassEntry::index).orElse(0));
+            try {
+                if (classModel.superclass().isPresent()) {
+                    tab();
+                    print(() -> "// " + classModel.superclass().get().asInternalName());
+                }
+            } catch (IllegalArgumentException e) {
+                report(e);
             }
             println();
-            print("interfaces: " + cf.interfaces.length);
-            print(", fields: " + cf.fields.length);
-            print(", methods: " + cf.methods.length);
-            println(", attributes: " + cf.attributes.attrs.length);
+            print("interfaces: ");print(() -> classModel.interfaces().size());
+            print(", fields: " + classModel.fields().size());
+            print(", methods: " + classModel.methods().size());
+            println(", attributes: " + classModel.attributes().size());
             indent(-1);
             constantWriter.writeConstantPool();
         } else {
@@ -264,7 +237,7 @@ else if (classFile.isInterface())
 
         println("{");
         indent(+1);
-        if (flags.is(AccessFlags.ACC_MODULE) && !options.verbose) {
+        if ((cm.flags().flagsMask() & ACC_MODULE) != 0 && !options.verbose) {
             writeDirectives();
         }
         writeFields();
@@ -273,174 +246,166 @@ else if (classFile.isInterface())
         println("}");
 
         if (options.verbose) {
-            attrWriter.write(cf, cf.attributes, constant_pool);
+            attrWriter.write(classModel.attributes());
         }
+        return !errorReported;
     }
     // where
-        class JavaTypePrinter implements Type.Visitor<StringBuilder,StringBuilder> {
-            boolean isInterface;
 
-            JavaTypePrinter(boolean isInterface) {
-                this.isInterface = isInterface;
-            }
+    final SignaturePrinter sigPrinter;
 
-            String print(Type t) {
-                return t.accept(this, new StringBuilder()).toString();
-            }
+    public static record SignaturePrinter(boolean verbose) {
 
-            String printTypeArgs(List<? extends TypeParamType> typeParamTypes) {
-                StringBuilder builder = new StringBuilder();
-                appendIfNotEmpty(builder, "<", typeParamTypes, "> ");
-                return builder.toString();
+        public String print(ClassSignature cs, boolean isInterface) {
+            var sb = new StringBuilder();
+            print(sb, cs.typeParameters());
+            if (isInterface) {
+                String sep = " extends ";
+                for (var is : cs.superinterfaceSignatures()) {
+                    sb.append(sep);
+                    print(sb, is);
+                    sep = ", ";
+                }
+            } else {
+                if (cs.superclassSignature() != null
+                        && (verbose || !isObject(cs.superclassSignature()))) {
+                    sb.append(" extends ");
+                    print(sb, cs.superclassSignature());
+                }
+                String sep = " implements ";
+                for (var is : cs.superinterfaceSignatures()) {
+                    sb.append(sep);
+                    print(sb, is);
+                    sep = ", ";
+                }
             }
+            return sb.toString();
+        }
 
-            @Override
-            public StringBuilder visitSimpleType(SimpleType type, StringBuilder sb) {
-                sb.append(getJavaName(type.name));
-                return sb;
-            }
+        public String print(Signature sig) {
+            var sb = new StringBuilder();
+            print(sb, sig);
+            return sb.toString();
+        }
 
-            @Override
-            public StringBuilder visitArrayType(ArrayType type, StringBuilder sb) {
-                append(sb, type.elemType);
-                sb.append("[]");
-                return sb;
-            }
+        public String printTypeParams(List<Signature.TypeParam> tps) {
+            var sb = new StringBuilder();
+            print(sb, tps);
+            return sb.toString();
+        }
 
-            @Override
-            public StringBuilder visitMethodType(MethodType type, StringBuilder sb) {
-                appendIfNotEmpty(sb, "<", type.typeParamTypes, "> ");
-                append(sb, type.returnType);
-                append(sb, " (", type.paramTypes, ")");
-                appendIfNotEmpty(sb, " throws ", type.throwsTypes, "");
-                return sb;
+        public String printList(String prefix, List<? extends Signature> args,
+                String postfix) {
+            var sb = new StringBuilder();
+            sb.append(prefix);
+            String sep = "";
+            for (var arg : args) {
+                sb.append(sep);
+                print(sb, arg);
+                sep = ", ";
             }
+            return sb.append(postfix).toString();
+        }
 
-            @Override
-            public StringBuilder visitClassSigType(ClassSigType type, StringBuilder sb) {
-                appendIfNotEmpty(sb, "<", type.typeParamTypes, ">");
-                if (isInterface) {
-                    appendIfNotEmpty(sb, " extends ", type.superinterfaceTypes, "");
-                } else {
-                    if (type.superclassType != null
-                            && (options.verbose || !type.superclassType.isObject())) {
-                        sb.append(" extends ");
-                        append(sb, type.superclassType);
+        private boolean isObject(Signature sig) {
+            return (sig instanceof Signature.ClassTypeSig cts)
+                    && cts.outerType().isEmpty()
+                    && cts.className().equals("java/lang/Object")
+                    && (cts.typeArgs().isEmpty());
+        }
+
+        private void print(StringBuilder sb, List<Signature.TypeParam> tps) {
+            if (!tps.isEmpty()) {
+                sb.append('<');
+                String sep = "";
+                for (var tp : tps) {
+                    sb.append(sep).append(tp.identifier());
+                    sep = " extends ";
+                    if (tp.classBound().isPresent()
+                            && (verbose || !isObject(tp.classBound().get()))) {
+                        sb.append(sep);
+                        print(sb, tp.classBound().get());
+                        sep = " & ";
+                    }
+                    for (var bound: tp.interfaceBounds()) {
+                        sb.append(sep);
+                        print(sb, bound);
+                        sep = " & ";
                     }
-                    appendIfNotEmpty(sb, " implements ", type.superinterfaceTypes, "");
+                    sep = ", ";
                 }
-                return sb;
+                sb.append('>');
             }
+        }
 
-            @Override
-            public StringBuilder visitClassType(ClassType type, StringBuilder sb) {
-                if (type.outerType != null) {
-                    append(sb, type.outerType);
+        private void print(StringBuilder sb, Signature sig) {
+            if (sig instanceof Signature.BaseTypeSig bts) {
+                    sb.append(ClassDesc.ofDescriptor("" + bts.baseType()).displayName());
+            } else if (sig instanceof Signature.ClassTypeSig cts) {
+                if (cts.outerType().isPresent()) {
+                    print(sb, cts.outerType().get());
                     sb.append(".");
                 }
-                sb.append(getJavaName(type.name));
-                appendIfNotEmpty(sb, "<", type.typeArgs, ">");
-                return sb;
-            }
-
-            @Override
-            public StringBuilder visitTypeParamType(TypeParamType type, StringBuilder sb) {
-                sb.append(type.name);
-                String sep = " extends ";
-                if (type.classBound != null
-                        && (options.verbose || !type.classBound.isObject())) {
-                    sb.append(sep);
-                    append(sb, type.classBound);
-                    sep = " & ";
-                }
-                if (type.interfaceBounds != null) {
-                    for (Type bound: type.interfaceBounds) {
+                sb.append(getJavaName(cts.className()));
+                if (!cts.typeArgs().isEmpty()) {
+                    String sep = "";
+                    sb.append('<');
+                    for (var ta : cts.typeArgs()) {
                         sb.append(sep);
-                        append(sb, bound);
-                        sep = " & ";
+                        print(sb, ta);
+                        sep = ", ";
                     }
+                    sb.append('>');
                 }
-                return sb;
+            } else if (sig instanceof Signature.TypeVarSig tvs) {
+                sb.append(tvs.identifier());
+            } else if (sig instanceof Signature.ArrayTypeSig ats) {
+                print(sb, ats.componentSignature());
+                sb.append("[]");
             }
+        }
 
-            @Override
-            public StringBuilder visitWildcardType(WildcardType type, StringBuilder sb) {
-                switch (type.kind) {
-                    case UNBOUNDED:
-                        sb.append("?");
-                        break;
-                    case EXTENDS:
-                        sb.append("? extends ");
-                        append(sb, type.boundType);
-                        break;
-                    case SUPER:
-                        sb.append("? super ");
-                        append(sb, type.boundType);
-                        break;
-                    default:
-                        throw new AssertionError();
+        private void print(StringBuilder sb, Signature.TypeArg ta) {
+            switch (ta.wildcardIndicator()) {
+                case DEFAULT -> print(sb, ta.boundType().get());
+                case UNBOUNDED -> sb.append('?');
+                case EXTENDS -> {
+                    sb.append("? extends ");
+                    print(sb, ta.boundType().get());
                 }
-                return sb;
-            }
-
-            private void append(StringBuilder sb, Type t) {
-                t.accept(this, sb);
-            }
-
-            private void append(StringBuilder sb, String prefix, List<? extends Type> list, String suffix) {
-                sb.append(prefix);
-                String sep = "";
-                for (Type t: list) {
-                    sb.append(sep);
-                    append(sb, t);
-                    sep = ", ";
+                case SUPER -> {
+                    sb.append("? super ");
+                    print(sb, ta.boundType().get());
                 }
-                sb.append(suffix);
-            }
-
-            private void appendIfNotEmpty(StringBuilder sb, String prefix, List<? extends Type> list, String suffix) {
-                if (!isEmpty(list))
-                    append(sb, prefix, list, suffix);
-            }
-
-            private boolean isEmpty(List<? extends Type> list) {
-                return (list == null || list.isEmpty());
             }
         }
+    }
 
     protected void writeFields() {
-        for (Field f: classFile.fields) {
+        for (var f: classModel.fields()) {
             writeField(f);
         }
     }
 
-    protected void writeField(Field f) {
-        if (!options.checkAccess(f.access_flags))
+    protected void writeField(FieldModel f) {
+        if (!options.checkAccess(f.flags().flagsMask()))
             return;
 
-        AccessFlags flags = f.access_flags;
-        writeModifiers(flags.getFieldModifiers());
-        Signature_attribute sigAttr = getSignature(f.attributes);
-        if (sigAttr == null)
-            print(getJavaFieldType(f.descriptor));
-        else {
-            try {
-                Type t = sigAttr.getParsedSignature().getType(constant_pool);
-                print(getJavaName(t.toString()));
-            } catch (ConstantPoolException e) {
-                // report error?
-                // fall back on non-generic descriptor
-                print(getJavaFieldType(f.descriptor));
-            }
-        }
+        var flags = AccessFlags.ofField(f.flags().flagsMask());
+        writeModifiers(flags.flags().stream().filter(fl -> fl.sourceModifier())
+                .map(fl -> Modifier.toString(fl.mask())).toList());
+        print(() -> sigPrinter.print(
+                f.findAttribute(Attributes.SIGNATURE)
+                        .map(SignatureAttribute::asTypeSignature)
+                        .orElseGet(() -> Signature.of(f.fieldTypeSymbol()))));
         print(" ");
-        print(getFieldName(f));
+        print(() -> f.fieldName().stringValue());
         if (options.showConstants) {
-            Attribute a = f.attributes.get(Attribute.ConstantValue);
-            if (a instanceof ConstantValue_attribute) {
+            var a = f.findAttribute(Attributes.CONSTANT_VALUE);
+            if (a.isPresent()) {
                 print(" = ");
-                ConstantValue_attribute cv = (ConstantValue_attribute) a;
-                print(getConstantValue(f.descriptor, cv.constantvalue_index));
+                var cv = a.get();
+                print(() -> getConstantValue(f.fieldTypeSymbol(), cv.constant()));
             }
         }
         print(";");
@@ -450,15 +415,17 @@ protected void writeField(Field f) {
 
         boolean showBlank = false;
 
-        if (options.showDescriptors)
-            println("descriptor: " + getValue(f.descriptor));
+        if (options.showDescriptors) {
+            print("descriptor: ");println(() -> f.fieldType().stringValue());
+        }
 
         if (options.verbose)
-            writeList(String.format("flags: (0x%04x) ", flags.flags), flags.getFieldFlags(), "\n");
+            writeList(String.format("flags: (0x%04x) ", flags.flagsMask()),
+                    flags.flags().stream().map(fl -> "ACC_" + fl.name()).toList(),
+                    "\n");
 
         if (options.showAllAttrs) {
-            for (Attribute attr: f.attributes)
-                attrWriter.write(f, attr, constant_pool);
+            attrWriter.write(f.attributes());
             showBlank = true;
         }
 
@@ -469,7 +436,7 @@ protected void writeField(Field f) {
     }
 
     protected void writeMethods() {
-        for (Method m: classFile.methods)
+        for (MethodModel m: classModel.methods())
             writeMethod(m);
         setPendingNewline(false);
     }
@@ -477,89 +444,84 @@ protected void writeMethods() {
     private static final int DEFAULT_ALLOWED_MAJOR_VERSION = 52;
     private static final int DEFAULT_ALLOWED_MINOR_VERSION = 0;
 
-    protected void writeMethod(Method m) {
-        if (!options.checkAccess(m.access_flags))
+    protected void writeMethod(MethodModel m) {
+        if (!options.checkAccess(m.flags().flagsMask()))
             return;
 
         method = m;
 
-        AccessFlags flags = m.access_flags;
+        int flags = m.flags().flagsMask();
 
-        Descriptor d;
-        Type.MethodType methodType;
-        List<? extends Type> methodExceptions;
+        var modifiers = new ArrayList<String>();
+        for (var f : AccessFlags.ofMethod(flags).flags())
+            if (f.sourceModifier()) modifiers.add(Modifier.toString(f.mask()));
 
-        Signature_attribute sigAttr = getSignature(m.attributes);
-        if (sigAttr == null) {
-            d = m.descriptor;
-            methodType = null;
-            methodExceptions = null;
-        } else {
-            Signature methodSig = sigAttr.getParsedSignature();
-            d = methodSig;
-            try {
-                methodType = (Type.MethodType) methodSig.getType(constant_pool);
-                methodExceptions = methodType.throwsTypes;
-                if (methodExceptions != null && methodExceptions.isEmpty())
-                    methodExceptions = null;
-            } catch (ConstantPoolException | IllegalStateException e) {
-                // report error?
-                // fall back on standard descriptor
-                methodType = null;
-                methodExceptions = null;
-            }
+        String name = "???";
+        try {
+            name = m.methodName().stringValue();
+        } catch (IllegalArgumentException e) {
+            report(e);
         }
 
-        Set<String> modifiers = flags.getMethodModifiers();
-
-        String name = getName(m);
-        if (classFile.isInterface() &&
-                (!flags.is(AccessFlags.ACC_ABSTRACT)) && !name.equals("<clinit>")) {
-            if (classFile.major_version > DEFAULT_ALLOWED_MAJOR_VERSION ||
-                    (classFile.major_version == DEFAULT_ALLOWED_MAJOR_VERSION && classFile.minor_version >= DEFAULT_ALLOWED_MINOR_VERSION)) {
-                if (!flags.is(AccessFlags.ACC_STATIC | AccessFlags.ACC_PRIVATE)) {
+        if ((classModel.flags().flagsMask() & ACC_INTERFACE) != 0 &&
+                ((flags & ACC_ABSTRACT) == 0) && !name.equals("<clinit>")) {
+            if (classModel.majorVersion() > DEFAULT_ALLOWED_MAJOR_VERSION ||
+                    (classModel.majorVersion() == DEFAULT_ALLOWED_MAJOR_VERSION
+                    && classModel.minorVersion() >= DEFAULT_ALLOWED_MINOR_VERSION)) {
+                if ((flags & (ACC_STATIC | ACC_PRIVATE)) == 0) {
                     modifiers.add("default");
                 }
             }
         }
-
         writeModifiers(modifiers);
-        if (methodType != null) {
-            print(new JavaTypePrinter(false).printTypeArgs(methodType.typeParamTypes));
-        }
-        switch (name) {
-            case "<init>":
-                print(getJavaName(classFile));
-                print(getJavaParameterTypes(d, flags));
-                break;
-            case "<clinit>":
-                print("{}");
-                break;
-            default:
-                print(getJavaReturnType(d));
-                print(" ");
-                print(name);
-                print(getJavaParameterTypes(d, flags));
-                break;
-        }
 
-        Attribute e_attr = m.attributes.get(Attribute.Exceptions);
-        if (e_attr != null) { // if there are generic exceptions, there must be erased exceptions
-            if (e_attr instanceof Exceptions_attribute) {
-                Exceptions_attribute exceptions = (Exceptions_attribute) e_attr;
+        try {
+            var sigAttr = m.findAttribute(Attributes.SIGNATURE);
+            MethodSignature d;
+            if (sigAttr.isEmpty()) {
+                d = MethodSignature.parseFrom(m.methodType().stringValue());
+            } else {
+                d = sigAttr.get().asMethodSignature();
+            }
+
+            if (!d.typeParameters().isEmpty()) {
+                print(sigPrinter.printTypeParams(d.typeParameters()) + " ");
+            }
+            switch (name) {
+                case "<init>":
+                    print(getJavaName(classModel.thisClass().asInternalName()));
+                    print(getJavaParameterTypes(d, flags));
+                    break;
+                case "<clinit>":
+                    print("{}");
+                    break;
+                default:
+                    print(getJavaName(sigPrinter.print(d.result())));
+                    print(" ");
+                    print(name);
+                    print(getJavaParameterTypes(d, flags));
+                    break;
+            }
+
+            var e_attr = m.findAttribute(Attributes.EXCEPTIONS);
+            // if there are generic exceptions, there must be erased exceptions
+            if (e_attr.isPresent()) {
+                var exceptions = e_attr.get();
                 print(" throws ");
-                if (methodExceptions != null) { // use generic list if available
-                    writeList("", methodExceptions, "");
+                if (d != null && !d.throwableSignatures().isEmpty()) { // use generic list if available
+                    print(() -> sigPrinter.printList("", d.throwableSignatures(), ""));
                 } else {
-                    for (int i = 0; i < exceptions.number_of_exceptions; i++) {
+                    var exNames = exceptions.exceptions();
+                    for (int i = 0; i < exNames.size(); i++) {
                         if (i > 0)
                             print(", ");
-                        print(getJavaException(exceptions, i));
+                        int ii = i;
+                        print(() -> getJavaName(exNames.get(ii).asInternalName()));
                     }
                 }
-            } else {
-                report("Unexpected or invalid value for Exceptions attribute");
             }
+        } catch (IllegalArgumentException e) {
+            report(e);
         }
 
         println(";");
@@ -567,26 +529,24 @@ protected void writeMethod(Method m) {
         indent(+1);
 
         if (options.showDescriptors) {
-            println("descriptor: " + getValue(m.descriptor));
+            print("descriptor: ");println(() -> m.methodType().stringValue());
         }
 
         if (options.verbose) {
-            writeList(String.format("flags: (0x%04x) ", flags.flags), flags.getMethodFlags(), "\n");
+            StringBuilder sb = new StringBuilder();
+            String sep = "";
+            sb.append(String.format("flags: (0x%04x) ", flags));
+            for (var f : AccessFlags.ofMethod(flags).flags()) {
+                sb.append(sep).append("ACC_").append(f.name());
+                sep = ", ";
+            }
+            println(sb.toString());
         }
 
-        Code_attribute code = null;
-        Attribute c_attr = m.attributes.get(Attribute.Code);
-        if (c_attr != null) {
-            if (c_attr instanceof Code_attribute)
-                code = (Code_attribute) c_attr;
-            else
-                report("Unexpected or invalid value for Code attribute");
-        }
+        var code = (CodeAttribute)m.code().orElse(null);
 
         if (options.showAllAttrs) {
-            Attribute[] attrs = m.attributes.attrs;
-            for (Attribute attr: attrs)
-                attrWriter.write(m, attr, constant_pool);
+            attrWriter.write(m.attributes());
         } else if (code != null) {
             if (options.showDisassembled) {
                 println("Code:");
@@ -595,8 +555,10 @@ protected void writeMethod(Method m) {
             }
 
             if (options.showLineAndLocalVariableTables) {
-                attrWriter.write(code, code.attributes.get(Attribute.LineNumberTable), constant_pool);
-                attrWriter.write(code, code.attributes.get(Attribute.LocalVariableTable), constant_pool);
+                code.findAttribute(Attributes.LINE_NUMBER_TABLE)
+                        .ifPresent(a -> attrWriter.write(a, code));
+                code.findAttribute(Attributes.LOCAL_VARIABLE_TABLE)
+                        .ifPresent(a -> attrWriter.write(a, code));
             }
         }
 
@@ -619,47 +581,33 @@ void writeModifiers(Collection<String> items) {
         }
     }
 
+    public static final int ACC_TRANSITIVE = 0x0020;
+    public static final int ACC_STATIC_PHASE = 0x0040;
+
     void writeDirectives() {
-        Attribute attr = classFile.attributes.get(Attribute.Module);
-        if (!(attr instanceof Module_attribute))
+        var attr = classModel.findAttribute(Attributes.MODULE);
+        if (attr.isEmpty())
             return;
 
-        Module_attribute m = (Module_attribute) attr;
-        for (Module_attribute.RequiresEntry entry: m.requires) {
+        var m = attr.get();
+        for (var entry: m.requires()) {
             print("requires");
-            if ((entry.requires_flags & Module_attribute.ACC_STATIC_PHASE) != 0)
+            if ((entry.requiresFlagsMask() & ACC_STATIC_PHASE) != 0)
                 print(" static");
-            if ((entry.requires_flags & Module_attribute.ACC_TRANSITIVE) != 0)
+            if ((entry.requiresFlagsMask() & ACC_TRANSITIVE) != 0)
                 print(" transitive");
             print(" ");
             String mname;
-            try {
-                mname = getModuleName(entry.requires_index);
-            } catch (ConstantPoolException e) {
-                mname = report(e);
-            }
-            print(mname);
+            print(entry.requires().name().stringValue());
             println(";");
         }
 
-        for (Module_attribute.ExportsEntry entry: m.exports) {
+        for (var entry: m.exports()) {
             print("exports");
             print(" ");
-            String pname;
-            try {
-                pname = getPackageName(entry.exports_index).replace('/', '.');
-            } catch (ConstantPoolException e) {
-                pname = report(e);
-            }
-            print(pname);
+            print(entry.exportedPackage().name().stringValue().replace('/', '.'));
             boolean first = true;
-            for (int i: entry.exports_to_index) {
-                String mname;
-                try {
-                    mname = getModuleName(i);
-                } catch (ConstantPoolException e) {
-                    mname = report(e);
-                }
+            for (var mod: entry.exportsTo()) {
                 if (first) {
                     println(" to");
                     indent(+1);
@@ -667,31 +615,19 @@ void writeDirectives() {
                 } else {
                     println(",");
                 }
-                print(mname);
+                print(mod.name().stringValue());
             }
             println(";");
             if (!first)
                 indent(-1);
         }
 
-        for (Module_attribute.OpensEntry entry: m.opens) {
+        for (var entry: m.opens()) {
             print("opens");
             print(" ");
-            String pname;
-            try {
-                pname = getPackageName(entry.opens_index).replace('/', '.');
-            } catch (ConstantPoolException e) {
-                pname = report(e);
-            }
-            print(pname);
+            print(entry.openedPackage().name().stringValue().replace('/', '.'));
             boolean first = true;
-            for (int i: entry.opens_to_index) {
-                String mname;
-                try {
-                    mname = getModuleName(i);
-                } catch (ConstantPoolException e) {
-                    mname = report(e);
-                }
+            for (var mod: entry.opensTo()) {
                 if (first) {
                     println(" to");
                     indent(+1);
@@ -699,24 +635,24 @@ void writeDirectives() {
                 } else {
                     println(",");
                 }
-                print(mname);
+                print(mod.name().stringValue());
             }
             println(";");
             if (!first)
                 indent(-1);
         }
 
-        for (int entry: m.uses_index) {
+        for (var entry: m.uses()) {
             print("uses ");
-            print(getClassName(entry).replace('/', '.'));
+            print(entry.asInternalName().replace('/', '.'));
             println(";");
         }
 
-        for (Module_attribute.ProvidesEntry entry: m.provides) {
+        for (var entry: m.provides()) {
             print("provides  ");
-            print(getClassName(entry.provides_index).replace('/', '.'));
+            print(entry.provides().asInternalName().replace('/', '.'));
             boolean first = true;
-            for (int i: entry.with_index) {
+            for (var ce: entry.providesWith()) {
                 if (first) {
                     println(" with");
                     indent(+1);
@@ -724,7 +660,7 @@ void writeDirectives() {
                 } else {
                     println(",");
                 }
-                print(getClassName(i).replace('/', '.'));
+                print(ce.asInternalName().replace('/', '.'));
             }
             println(";");
             if (!first)
@@ -732,38 +668,6 @@ void writeDirectives() {
         }
     }
 
-    String getModuleName(int index) throws ConstantPoolException {
-        if (constant_pool.get(index).getTag() == CONSTANT_Module) {
-            return constant_pool.getModuleInfo(index).getName();
-        } else {
-            return constant_pool.getUTF8Value(index);
-        }
-    }
-
-    String getPackageName(int index) throws ConstantPoolException {
-        if (constant_pool.get(index).getTag() == CONSTANT_Package) {
-            return constant_pool.getPackageInfo(index).getName();
-        } else {
-            return constant_pool.getUTF8Value(index);
-        }
-    }
-
-    String getUTF8Value(int index) {
-        try {
-            return classFile.constant_pool.getUTF8Value(index);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    String getClassName(int index) {
-        try {
-            return classFile.constant_pool.getClassInfo(index).getName();
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
     void writeList(String prefix, Collection<?> items, String suffix) {
         print(prefix);
         String sep = "";
@@ -780,12 +684,8 @@ void writeListIfNotEmpty(String prefix, List<?> items, String suffix) {
             writeList(prefix, items, suffix);
     }
 
-    Signature_attribute getSignature(Attributes attributes) {
-        return (Signature_attribute) attributes.get(Attribute.Signature);
-    }
-
-    String adjustVarargs(AccessFlags flags, String params) {
-        if (flags.is(ACC_VARARGS)) {
+    String adjustVarargs(int flags, String params) {
+        if ((flags & ACC_VARARGS) != 0) {
             int i = params.lastIndexOf("[]");
             if (i > 0)
                 return params.substring(0, i) + "..." + params.substring(i+2);
@@ -794,104 +694,15 @@ String adjustVarargs(AccessFlags flags, String params) {
         return params;
     }
 
-    String getJavaName(ClassFile cf) {
-        try {
-            return getJavaName(cf.getName());
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    String getJavaSuperclassName(ClassFile cf) {
-        try {
-            return getJavaName(cf.getSuperclassName());
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    String getJavaInterfaceName(ClassFile cf, int index) {
-        try {
-            return getJavaName(cf.getInterfaceName(index));
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    String getJavaFieldType(Descriptor d) {
-        try {
-            return getJavaName(d.getFieldType(constant_pool));
-        } catch (ConstantPoolException e) {
-            return report(e);
-        } catch (InvalidDescriptor e) {
-            return report(e);
-        }
-    }
-
-    String getJavaReturnType(Descriptor d) {
-        try {
-            return getJavaName(d.getReturnType(constant_pool));
-        } catch (ConstantPoolException e) {
-            return report(e);
-        } catch (InvalidDescriptor e) {
-            return report(e);
-        }
-    }
-
-    String getJavaParameterTypes(Descriptor d, AccessFlags flags) {
-        try {
-            return getJavaName(adjustVarargs(flags, d.getParameterTypes(constant_pool)));
-        } catch (ConstantPoolException e) {
-            return report(e);
-        } catch (InvalidDescriptor e) {
-            return report(e);
-        }
-    }
-
-    String getJavaException(Exceptions_attribute attr, int index) {
-        try {
-            return getJavaName(attr.getException(index, constant_pool));
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    String getValue(Descriptor d) {
-        try {
-            return d.getValue(constant_pool);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    String getFieldName(Field f) {
-        try {
-            return f.getName(constant_pool);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
-    String getName(Method m) {
-        try {
-            return m.getName(constant_pool);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
+    String getJavaParameterTypes(MethodSignature d, int flags) {
+        return getJavaName(adjustVarargs(flags,
+                sigPrinter.printList("(", d.arguments(), ")")));
     }
 
     static String getJavaName(String name) {
         return name.replace('/', '.');
     }
 
-    String getSourceFile(SourceFile_attribute attr) {
-        try {
-            return attr.getSourceFile(constant_pool);
-        } catch (ConstantPoolException e) {
-            return report(e);
-        }
-    }
-
     /**
      * Get the value of an entry in the constant pool as a Java constant.
      * Characters and booleans are represented by CONSTANT_Intgere entries.
@@ -901,39 +712,26 @@ String getSourceFile(SourceFile_attribute attr) {
      * @param index the index of the value in the constant pool
      * @return a printable string containing the value of the constant.
      */
-    String getConstantValue(Descriptor d, int index) {
-        try {
-            ConstantPool.CPInfo cpInfo = constant_pool.get(index);
-
-            switch (cpInfo.getTag()) {
-                case ConstantPool.CONSTANT_Integer: {
-                    ConstantPool.CONSTANT_Integer_info info =
-                            (ConstantPool.CONSTANT_Integer_info) cpInfo;
-                    String t = d.getValue(constant_pool);
-                    switch (t) {
-                        case "C":
-                            // character
-                            return getConstantCharValue((char) info.value);
-                        case "Z":
-                            // boolean
-                            return String.valueOf(info.value == 1);
-                        default:
-                            // other: assume integer
-                            return String.valueOf(info.value);
-                    }
-                }
-
-                case ConstantPool.CONSTANT_String: {
-                    ConstantPool.CONSTANT_String_info info =
-                            (ConstantPool.CONSTANT_String_info) cpInfo;
-                    return getConstantStringValue(info.getString());
+    String getConstantValue(ClassDesc d, ConstantValueEntry cpInfo) {
+        switch (cpInfo.tag()) {
+            case Classfile.TAG_INTEGER: {
+                var val = (Integer)cpInfo.constantValue();
+                switch (d.descriptorString()) {
+                    case "C":
+                        // character
+                        return getConstantCharValue((char)val.intValue());
+                    case "Z":
+                        // boolean
+                        return String.valueOf(val == 1);
+                    default:
+                        // other: assume integer
+                        return String.valueOf(val);
                 }
-
-                default:
-                    return constantWriter.stringValue(cpInfo);
             }
-        } catch (ConstantPoolException e) {
-            return "#" + index;
+            case Classfile.TAG_STRING:
+                return getConstantStringValue(cpInfo.constantValue().toString());
+            default:
+                return constantWriter.stringValue(cpInfo);
         }
     }
 
@@ -971,16 +769,97 @@ else switch (c) {
         }
     }
 
+    private static Set<String> getClassModifiers(int mask) {
+        return getModifiers(AccessFlags.ofClass((mask & ACC_INTERFACE) != 0
+                ? mask & ~ACC_ABSTRACT : mask).flags());
+    }
+
+    private static Set<String> getMethodModifiers(int mask) {
+        return getModifiers(AccessFlags.ofMethod(mask).flags());
+    }
+
+    private static Set<String> getFieldModifiers(int mask) {
+        return getModifiers(AccessFlags.ofField(mask).flags());
+    }
+
+    private static Set<String> getModifiers(Set<java.lang.reflect.AccessFlag> flags) {
+        Set<String> s = new LinkedHashSet<>();
+        for (var f : flags)
+            if (f.sourceModifier()) s.add(Modifier.toString(f.mask()));
+        return s;
+    }
+
+    private static Set<String> getClassFlags(int mask) {
+        return getFlags(mask, AccessFlags.ofClass(mask).flags());
+    }
+
+    private static Set<String> getMethodFlags(int mask) {
+        return getFlags(mask, AccessFlags.ofMethod(mask).flags());
+    }
+
+    private static Set<String> getFieldFlags(int mask) {
+        return getFlags(mask, AccessFlags.ofField(mask).flags());
+    }
+
+    private static Set<String> getFlags(int mask, Set<java.lang.reflect.AccessFlag> flags) {
+        Set<String> s = new LinkedHashSet<>();
+        for (var f: flags) {
+            s.add("ACC_" + f.name());
+            mask = mask & ~f.mask();
+        }
+        while (mask != 0) {
+            int bit = Integer.highestOneBit(mask);
+            s.add("0x" + Integer.toHexString(bit));
+            mask = mask & ~bit;
+        }
+        return s;
+    }
+
+    public static enum AccessFlag {
+        ACC_PUBLIC      (Classfile.ACC_PUBLIC,       "public",       true,  true,  true,  true ),
+        ACC_PRIVATE     (Classfile.ACC_PRIVATE,      "private",      false, true,  true,  true ),
+        ACC_PROTECTED   (Classfile.ACC_PROTECTED,    "protected",    false, true,  true,  true ),
+        ACC_STATIC      (Classfile.ACC_STATIC,       "static",       false, true,  true,  true ),
+        ACC_FINAL       (Classfile.ACC_FINAL,        "final",        true,  true,  true,  true ),
+        ACC_SUPER       (Classfile.ACC_SUPER,        null,           true,  false, false, false),
+        ACC_SYNCHRONIZED(Classfile.ACC_SYNCHRONIZED, "synchronized", false, false, false, true ),
+        ACC_VOLATILE    (Classfile.ACC_VOLATILE,     "volatile",     false, false, true,  false),
+        ACC_BRIDGE      (Classfile.ACC_BRIDGE,       null,           false, false, false, true ),
+        ACC_TRANSIENT   (Classfile.ACC_TRANSIENT,    "transient",    false, false, true,  false),
+        ACC_VARARGS     (Classfile.ACC_VARARGS,      null,           false, false, false, true ),
+        ACC_NATIVE      (Classfile.ACC_NATIVE,       "native",       false, false, false, true ),
+        ACC_INTERFACE   (Classfile.ACC_INTERFACE,    null,           true,   true, false, false),
+        ACC_ABSTRACT    (Classfile.ACC_ABSTRACT,     "abstract",     true,   true, false, true ),
+        ACC_STRICT      (Classfile.ACC_STRICT,       "strictfp",     false, false, false, true ),
+        ACC_SYNTHETIC   (Classfile.ACC_SYNTHETIC,    null,           true,  true,  true,  true ),
+        ACC_ANNOTATION  (Classfile.ACC_ANNOTATION,   null,           true,   true, false, false),
+        ACC_ENUM        (Classfile.ACC_ENUM,         null,           true,   true, true,  false),
+        ACC_MODULE      (Classfile.ACC_MODULE,       null,           true,  false, false, false);
+
+        public final int flag;
+        public final String modifier;
+        public final boolean isClass, isInnerClass, isField, isMethod;
+
+        AccessFlag(int flag, String modifier, boolean isClass,
+                boolean isInnerClass, boolean isField, boolean isMethod) {
+            this.flag = flag;
+            this.modifier = modifier;
+            this.isClass = isClass;
+            this.isInnerClass = isInnerClass;
+            this.isField = isField;
+            this.isMethod = isMethod;
+        }
+    }
+
     private final Options options;
     private final AttributeWriter attrWriter;
     private final CodeWriter codeWriter;
     private final ConstantWriter constantWriter;
-    private ClassFile classFile;
+    private ClassModel classModel;
     private URI uri;
     private long lastModified;
     private String digestName;
     private byte[] digest;
     private int size;
-    private ConstantPool constant_pool;
-    private Method method;
+    private MethodModel method;
 }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java
index 231706c6900..64e947b9992 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java
@@ -28,14 +28,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.sun.tools.classfile.AccessFlags;
-import com.sun.tools.classfile.Code_attribute;
-import com.sun.tools.classfile.ConstantPool;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.DescriptorException;
-import com.sun.tools.classfile.Instruction;
-import com.sun.tools.classfile.Instruction.TypeKind;
-import com.sun.tools.classfile.Method;
+import java.util.Locale;
+import java.util.stream.Collectors;
+import jdk.internal.classfile.Classfile;
+import jdk.internal.classfile.Opcode;
+import jdk.internal.classfile.constantpool.*;
+import jdk.internal.classfile.Instruction;
+import jdk.internal.classfile.MethodModel;
+import jdk.internal.classfile.attribute.CodeAttribute;
+import jdk.internal.classfile.instruction.*;
 
 /*
  *  Write the contents of a Code attribute.
@@ -68,161 +69,148 @@ protected CodeWriter(Context context) {
         options = Options.instance(context);
     }
 
-    void write(Code_attribute attr, ConstantPool constant_pool) {
+    void write(CodeAttribute attr) {
         println("Code:");
         indent(+1);
-        writeVerboseHeader(attr, constant_pool);
+        writeVerboseHeader(attr);
         writeInstrs(attr);
         writeExceptionTable(attr);
-        attrWriter.write(attr, attr.attributes, constant_pool);
+        attrWriter.write(attr.attributes(), attr);
         indent(-1);
     }
 
-    public void writeVerboseHeader(Code_attribute attr, ConstantPool constant_pool) {
-        Method method = classWriter.getMethod();
-        String argCount;
-        try {
-            int n = method.descriptor.getParameterCount(constant_pool);
-            if (!method.access_flags.is(AccessFlags.ACC_STATIC))
-                ++n;  // for 'this'
-            argCount = Integer.toString(n);
-        } catch (ConstantPoolException e) {
-            argCount = report(e);
-        } catch (DescriptorException e) {
-            argCount = report(e);
-        }
-
-        println("stack=" + attr.max_stack +
-                ", locals=" + attr.max_locals +
-                ", args_size=" + argCount);
-
+    public void writeVerboseHeader(CodeAttribute attr) {
+        MethodModel method = attr.parent().get();
+        int n = method.methodTypeSymbol().parameterCount();
+        if ((method.flags().flagsMask() & Classfile.ACC_STATIC) == 0)
+            ++n;  // for 'this'
+        println("stack=" + attr.maxStack() +
+                ", locals=" + attr.maxLocals() +
+                ", args_size=" + Integer.toString(n));
     }
 
-    public void writeInstrs(Code_attribute attr) {
+    public void writeInstrs(CodeAttribute attr) {
         List<InstructionDetailWriter> detailWriters = getDetailWriters(attr);
 
-        for (Instruction instr: attr.getInstructions()) {
-            try {
-                for (InstructionDetailWriter w: detailWriters)
-                    w.writeDetails(instr);
-                writeInstr(instr);
-            } catch (ArrayIndexOutOfBoundsException | IllegalStateException e) {
-                println(report("error at or after byte " + instr.getPC()));
-                break;
+        int pc = 0;
+        try {
+            for (var coe: attr) {
+                if (coe instanceof Instruction instr) {
+                    for (InstructionDetailWriter w: detailWriters)
+                        w.writeDetails(pc, instr);
+                    writeInstr(pc, instr, attr);
+                    pc += instr.sizeInBytes();
+                }
             }
+        } catch (IllegalArgumentException e) {
+            report("error at or after byte " + pc);
         }
 
         for (InstructionDetailWriter w: detailWriters)
-            w.flush();
-    }
-
-    public void writeInstr(Instruction instr) {
-        print(String.format("%4d: %-13s ", instr.getPC(), instr.getMnemonic()));
-        // compute the number of indentations for the body of multi-line instructions
-        // This is 6 (the width of "%4d: "), divided by the width of each indentation level,
-        // and rounded up to the next integer.
-        int indentWidth = options.indentWidth;
-        int indent = (6 + indentWidth - 1) / indentWidth;
-        instr.accept(instructionPrinter, indent);
-        println();
+            w.flush(pc);
     }
-    // where
-    Instruction.KindVisitor<Void,Integer> instructionPrinter =
-            new Instruction.KindVisitor<>() {
-
-        public Void visitNoOperands(Instruction instr, Integer indent) {
-            return null;
-        }
 
-        public Void visitArrayType(Instruction instr, TypeKind kind, Integer indent) {
-            print(" " + kind.name);
-            return null;
-        }
-
-        public Void visitBranch(Instruction instr, int offset, Integer indent) {
-            print((instr.getPC() + offset));
-            return null;
-        }
-
-        public Void visitConstantPoolRef(Instruction instr, int index, Integer indent) {
-            print("#" + index);
-            tab();
-            print("// ");
-            printConstant(index);
-            return null;
-        }
-
-        public Void visitConstantPoolRefAndValue(Instruction instr, int index, int value, Integer indent) {
-            print("#" + index + ",  " + value);
-            tab();
-            print("// ");
-            printConstant(index);
-            return null;
-        }
-
-        public Void visitLocal(Instruction instr, int index, Integer indent) {
-            print(index);
-            return null;
-        }
-
-        public Void visitLocalAndValue(Instruction instr, int index, int value, Integer indent) {
-            print(index + ", " + value);
-            return null;
-        }
-
-        public Void visitLookupSwitch(Instruction instr,
-                int default_, int npairs, int[] matches, int[] offsets, Integer indent) {
-            int pc = instr.getPC();
-            print("{ // " + npairs);
-            indent(indent);
-            for (int i = 0; i < npairs; i++) {
-                print(String.format("%n%12d: %d", matches[i], (pc + offsets[i])));
-            }
-            print("\n     default: " + (pc + default_) + "\n}");
-            indent(-indent);
-            return null;
-        }
-
-        public Void visitTableSwitch(Instruction instr,
-                int default_, int low, int high, int[] offsets, Integer indent) {
-            int pc = instr.getPC();
-            print("{ // " + low + " to " + high);
-            indent(indent);
-            for (int i = 0; i < offsets.length; i++) {
-                print(String.format("%n%12d: %d", (low + i), (pc + offsets[i])));
+    public void writeInstr(int pc, Instruction ins, CodeAttribute lr) {
+        print(String.format("%4d: %-13s ", pc, ins.opcode().name().toLowerCase(Locale.US)));
+        try {
+            // compute the number of indentations for the body of multi-line instructions
+            // This is 6 (the width of "%4d: "), divided by the width of each indentation level,
+            // and rounded up to the next integer.
+            int indentWidth = options.indentWidth;
+            int indent = (6 + indentWidth - 1) / indentWidth;
+            switch (ins) {
+                case BranchInstruction instr ->
+                    print(lr.labelToBci(instr.target()));
+                case ConstantInstruction.ArgumentConstantInstruction instr ->
+                    print(instr.constantValue());
+                case ConstantInstruction.LoadConstantInstruction instr ->
+                    printConstantPoolRef(instr.constantEntry());
+                case FieldInstruction instr ->
+                    printConstantPoolRef(instr.field());
+                case InvokeDynamicInstruction instr ->
+                    printConstantPoolRefAndValue(instr.invokedynamic(), 0);
+                case InvokeInstruction instr -> {
+                    if (instr.isInterface() && instr.opcode() != Opcode.INVOKESTATIC)
+                        printConstantPoolRefAndValue(instr.method(), instr.count());
+                    else printConstantPoolRef(instr.method());
+                }
+                case LoadInstruction instr ->
+                    print(instr.sizeInBytes() > 1 ? instr.slot() : "");
+                case StoreInstruction instr ->
+                    print(instr.sizeInBytes() > 1 ? instr.slot() : "");
+                case IncrementInstruction instr ->
+                    print(instr.slot() + ", " + instr.constant());
+                case LookupSwitchInstruction instr -> {
+                    var cases = instr.cases();
+                    print("{ // " + cases.size());
+                    indent(indent);
+                    for (var c : cases)
+                        print(String.format("%n%12d: %d", c.caseValue(),
+                                lr.labelToBci(c.target())));
+                    print("\n     default: " + lr.labelToBci(instr.defaultTarget()) + "\n}");
+                    indent(-indent);
+                }
+                case NewMultiArrayInstruction instr ->
+                    printConstantPoolRefAndValue(instr.arrayType(), instr.dimensions());
+                case NewObjectInstruction instr ->
+                    printConstantPoolRef(instr.className());
+                case NewPrimitiveArrayInstruction instr ->
+                    print(" " + instr.typeKind().typeName());
+                case NewReferenceArrayInstruction instr ->
+                    printConstantPoolRef(instr.componentType());
+                case TableSwitchInstruction instr -> {
+                    print("{ // " + instr.lowValue() + " to " + instr.highValue());
+                    indent(indent);
+                    var caseMap = instr.cases().stream().collect(
+                            Collectors.toMap(SwitchCase::caseValue, SwitchCase::target));
+                    for (int i = instr.lowValue(); i <= instr.highValue(); i++)
+                        print(String.format("%n%12d: %d", i,
+                                lr.labelToBci(caseMap.getOrDefault(i, instr.defaultTarget()))));
+                    print("\n     default: " + lr.labelToBci(instr.defaultTarget()) + "\n}");
+                    indent(-indent);
+                }
+                case TypeCheckInstruction instr ->
+                    printConstantPoolRef(instr.type());
+                default -> {}
             }
-            print("\n     default: " + (pc + default_) + "\n}");
-            indent(-indent);
-            return null;
-        }
-
-        public Void visitValue(Instruction instr, int value, Integer indent) {
-            print(value);
-            return null;
+            println();
+        } catch (IllegalArgumentException e) {
+            println(report(e));
         }
+    }
 
-        public Void visitUnknown(Instruction instr, Integer indent) {
-            return null;
-        }
-    };
+    private void printConstantPoolRef(PoolEntry entry) {
+        print("#" + entry.index());
+        tab();
+        print("// ");
+        constantWriter.write(entry.index());
+    }
 
+    private void printConstantPoolRefAndValue(PoolEntry entry, int value) {
+        print("#" + entry.index() + ",  " + value);
+        tab();
+        print("// ");
+        constantWriter.write(entry.index());
+    }
 
-    public void writeExceptionTable(Code_attribute attr) {
-        if (attr.exception_table_length > 0) {
+    public void writeExceptionTable(CodeAttribute attr) {
+        var excTable = attr.exceptionHandlers();
+        if (excTable.size() > 0) {
             println("Exception table:");
             indent(+1);
             println(" from    to  target type");
-            for (int i = 0; i < attr.exception_table.length; i++) {
-                Code_attribute.Exception_data handler = attr.exception_table[i];
+            for (var handler : excTable) {
                 print(String.format(" %5d %5d %5d",
-                        handler.start_pc, handler.end_pc, handler.handler_pc));
+                        attr.labelToBci(handler.tryStart()),
+                        attr.labelToBci(handler.tryEnd()),
+                        attr.labelToBci(handler.handler())));
                 print("   ");
-                int catch_type = handler.catch_type;
-                if (catch_type == 0) {
+                var catch_type = handler.catchType();
+                if (catch_type.isEmpty()) {
                     println("any");
                 } else {
                     print("Class ");
-                    println(constantWriter.stringValue(catch_type));
+                    println(constantWriter.stringValue(catch_type.get()));
                 }
             }
             indent(-1);
@@ -230,14 +218,10 @@ public void writeExceptionTable(Code_attribute attr) {
 
     }
 
-    private void printConstant(int index) {
-        constantWriter.write(index);
-    }
-
-    private List<InstructionDetailWriter> getDetailWriters(Code_attribute attr) {
+    private List<InstructionDetailWriter> getDetailWriters(CodeAttribute attr) {
         List<InstructionDetailWriter> detailWriters = new ArrayList<>();
         if (options.details.contains(InstructionDetailWriter.Kind.SOURCE)) {
-            sourceWriter.reset(classWriter.getClassFile(), attr);
+            sourceWriter.reset(attr);
             if (sourceWriter.hasSource())
                 detailWriters.add(sourceWriter);
             else
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java
index 59f8c4e935c..096ca97e0b6 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java
@@ -25,11 +25,8 @@
 
 package com.sun.tools.javap;
 
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPool;
-import com.sun.tools.classfile.ConstantPoolException;
-
-import static com.sun.tools.classfile.ConstantPool.*;
+import jdk.internal.classfile.constantpool.*;
+import static jdk.internal.classfile.Classfile.*;
 
 /*
  *  Write a constant pool entry.
@@ -55,122 +52,11 @@ protected ConstantWriter(Context context) {
     }
 
     protected void writeConstantPool() {
-        ConstantPool constant_pool = classWriter.getClassFile().constant_pool;
+        var constant_pool = classWriter.getClassModel().constantPool();
         writeConstantPool(constant_pool);
     }
 
     protected void writeConstantPool(ConstantPool constant_pool) {
-        ConstantPool.Visitor<Integer, Void> v = new ConstantPool.Visitor<>() {
-            public Integer visitClass(CONSTANT_Class_info info, Void p) {
-                print("#" + info.name_index);
-                tab();
-                println("// " + stringValue(info));
-                return 1;
-            }
-
-            public Integer visitDouble(CONSTANT_Double_info info, Void p) {
-                println(stringValue(info));
-                return 2;
-            }
-
-            public Integer visitFieldref(CONSTANT_Fieldref_info info, Void p) {
-                print("#" + info.class_index + ".#" + info.name_and_type_index);
-                tab();
-                println("// " + stringValue(info));
-                return 1;
-            }
-
-            public Integer visitFloat(CONSTANT_Float_info info, Void p) {
-                println(stringValue(info));
-                return 1;
-            }
-
-            public Integer visitInteger(CONSTANT_Integer_info info, Void p) {
-                println(stringValue(info));
-                return 1;
-            }
-
-            public Integer visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, Void p) {
-                print("#" + info.class_index + ".#" + info.name_and_type_index);
-                tab();
-                println("// " + stringValue(info));
-                return 1;
-            }
-
-            public Integer visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, Void p) {
-                print("#" + info.bootstrap_method_attr_index + ":#" + info.name_and_type_index);
-                tab();
-                println("// " + stringValue(info));
-                return 1;
-            }
-
-            public Integer visitDynamicConstant(CONSTANT_Dynamic_info info, Void p) {
-                print("#" + info.bootstrap_method_attr_index + ":#" + info.name_and_type_index);
-                tab();
-                println("// " + stringValue(info));
-                return 1;
-            }
-
-            public Integer visitLong(CONSTANT_Long_info info, Void p) {
-                println(stringValue(info));
-                return 2;
-            }
-
-            public Integer visitMethodref(CONSTANT_Methodref_info info, Void p) {
-                print("#" + info.class_index + ".#" + info.name_and_type_index);
-                tab();
-                println("// " + stringValue(info));
-                return 1;
-            }
-
-            public Integer visitMethodHandle(CONSTANT_MethodHandle_info info, Void p) {
-                print(info.reference_kind.tag + ":#" + info.reference_index);
-                tab();
-                println("// " + stringValue(info));
-                return 1;
-            }
-
-            public Integer visitMethodType(CONSTANT_MethodType_info info, Void p) {
-                print("#" + info.descriptor_index);
-                tab();
-                println("//  " + stringValue(info));
-                return 1;
-            }
-
-            public Integer visitModule(CONSTANT_Module_info info, Void p) {
-                print("#" + info.name_index);
-                tab();
-                println("// " + stringValue(info));
-                return 1;
-            }
-
-            public Integer visitNameAndType(CONSTANT_NameAndType_info info, Void p) {
-                print("#" + info.name_index + ":#" + info.type_index);
-                tab();
-                println("// " + stringValue(info));
-                return 1;
-            }
-
-            public Integer visitPackage(CONSTANT_Package_info info, Void p) {
-                print("#" + info.name_index);
-                tab();
-                println("// " + stringValue(info));
-                return 1;
-            }
-
-            public Integer visitString(CONSTANT_String_info info, Void p) {
-                print("#" + info.string_index);
-                tab();
-                println("// " + stringValue(info));
-                return 1;
-            }
-
-            public Integer visitUtf8(CONSTANT_Utf8_info info, Void p) {
-                println(stringValue(info));
-                return 1;
-            }
-
-        };
         println("Constant pool:");
         indent(+1);
         int width = String.valueOf(constant_pool.size()).length() + 1;
@@ -178,321 +64,228 @@ public Integer visitUtf8(CONSTANT_Utf8_info info, Void p) {
         while (cpx < constant_pool.size()) {
             print(String.format("%" + width + "s", ("#" + cpx)));
             try {
-                CPInfo cpInfo = constant_pool.get(cpx);
-                print(String.format(" = %-18s ", cpTagName(cpInfo)));
-                cpx += cpInfo.accept(v, null);
-            } catch (ConstantPool.InvalidIndex ex) {
-                // should not happen
+                var cpInfo = constant_pool.entryByIndex(cpx);
+                print(String.format(" = %-18s ", cpTagName(cpInfo.tag())));
+                switch (cpInfo) {
+                    case ClassEntry info -> {
+                        print(() -> "#" + info.name().index());
+                        tab();
+                        println(() -> "// " + stringValue(info));
+                    }
+                    case AnnotationConstantValueEntry info -> {
+                        println(() -> stringValue(info));
+                    }
+                    case MemberRefEntry info -> {
+                        print(() -> "#" + info.owner().index() + ".#"
+                                + info.nameAndType().index());
+                        tab();
+                        println(() -> "// " + stringValue(info));
+                    }
+                    case DynamicConstantPoolEntry info -> {
+                        print(() -> "#" + info.bootstrapMethodIndex() + ":#"
+                                + info.nameAndType().index());
+                        tab();
+                        println(() -> "// " + stringValue(info));
+                    }
+                    case MethodHandleEntry info -> {
+                        print(() -> info.kind() + ":#" + info.reference().index());
+                        tab();
+                        println(() -> "// " + stringValue(info));
+                    }
+                    case MethodTypeEntry info -> {
+                        print(() -> "#" + info.descriptor().index());
+                        tab();
+                        println(() -> "//  " + stringValue(info));
+                    }
+                    case ModuleEntry info -> {
+                        print(() -> "#" + info.name().index());
+                        tab();
+                        println(() -> "// " + stringValue(info));
+                    }
+                    case NameAndTypeEntry info -> {
+                        print(() -> "#" + info.name().index() + ":#" + info.type().index());
+                        tab();
+                        println(() -> "// " + stringValue(info));
+                    }
+                    case PackageEntry info -> {
+                        print(() -> "#" + info.name().index());
+                        tab();
+                        println("// " + stringValue(info));
+                    }
+                    case StringEntry info -> {
+                        print(() -> "#" + info.utf8().index());
+                        tab();
+                        println(() -> "// " + stringValue(info));
+                    }
+                    default ->
+                        throw new IllegalArgumentException("unknown entry: "+ cpInfo);
+                }
+                cpx += cpInfo.width();
+            } catch (IllegalArgumentException e) {
+                println(report(e));
+                cpx++;
             }
         }
         indent(-1);
     }
 
     protected void write(int cpx) {
-        ClassFile classFile = classWriter.getClassFile();
         if (cpx == 0) {
             print("#0");
             return;
         }
+        var classModel = classWriter.getClassModel();
 
-        CPInfo cpInfo;
-        try {
-            cpInfo = classFile.constant_pool.get(cpx);
-        } catch (ConstantPoolException e) {
-            print("#" + cpx);
-            return;
-        }
-
-        int tag = cpInfo.getTag();
-        switch (tag) {
-            case CONSTANT_Methodref:
-            case CONSTANT_InterfaceMethodref:
-            case CONSTANT_Fieldref:
-                // simplify references within this class
-                CPRefInfo ref = (CPRefInfo) cpInfo;
-                try {
-                    if (ref.class_index == classFile.this_class)
-                         cpInfo = classFile.constant_pool.get(ref.name_and_type_index);
-                } catch (ConstantPool.InvalidIndex e) {
-                    // ignore, for now
-                }
+        var cpInfo = classModel.constantPool().entryByIndex(cpx);
+        var tag = cpInfo.tag();
+        if (cpInfo instanceof MemberRefEntry ref) {
+            // simplify references within this class
+            if (ref.owner().index() == classModel.thisClass().index())
+                 cpInfo = ref.nameAndType();
         }
         print(tagName(tag) + " " + stringValue(cpInfo));
     }
 
-    String cpTagName(CPInfo cpInfo) {
-        String n = cpInfo.getClass().getSimpleName();
-        return n.replace("CONSTANT_", "").replace("_info", "");
+    String cpTagName(int tag) {
+        return switch (tag) {
+            case TAG_UTF8 -> "Utf8";
+            case TAG_INTEGER -> "Integer";
+            case TAG_FLOAT -> "Float";
+            case TAG_LONG -> "Long";
+            case TAG_DOUBLE -> "Double";
+            case TAG_CLASS -> "Class";
+            case TAG_STRING -> "String";
+            case TAG_FIELDREF -> "Fieldref";
+            case TAG_METHODHANDLE -> "MethodHandle";
+            case TAG_METHODTYPE -> "MethodType";
+            case TAG_METHODREF -> "Methodref";
+            case TAG_INTERFACEMETHODREF -> "InterfaceMethodref";
+            case TAG_INVOKEDYNAMIC -> "InvokeDynamic";
+            case TAG_CONSTANTDYNAMIC -> "Dynamic";
+            case TAG_NAMEANDTYPE -> "NameAndType";
+            default -> "Unknown";
+        };
     }
 
     String tagName(int tag) {
-        switch (tag) {
-            case CONSTANT_Utf8:
-                return "Utf8";
-            case CONSTANT_Integer:
-                return "int";
-            case CONSTANT_Float:
-                return "float";
-            case CONSTANT_Long:
-                return "long";
-            case CONSTANT_Double:
-                return "double";
-            case CONSTANT_Class:
-                return "class";
-            case CONSTANT_String:
-                return "String";
-            case CONSTANT_Fieldref:
-                return "Field";
-            case CONSTANT_MethodHandle:
-                return "MethodHandle";
-            case CONSTANT_MethodType:
-                return "MethodType";
-            case CONSTANT_Methodref:
-                return "Method";
-            case CONSTANT_InterfaceMethodref:
-                return "InterfaceMethod";
-            case CONSTANT_InvokeDynamic:
-                return "InvokeDynamic";
-            case CONSTANT_Dynamic:
-                return "Dynamic";
-            case CONSTANT_NameAndType:
-                return "NameAndType";
-            default:
-                return "(unknown tag " + tag + ")";
+        return switch (tag) {
+            case TAG_UTF8 -> "Utf8";
+            case TAG_INTEGER -> "int";
+            case TAG_FLOAT -> "float";
+            case TAG_LONG -> "long";
+            case TAG_DOUBLE -> "double";
+            case TAG_CLASS -> "class";
+            case TAG_STRING -> "String";
+            case TAG_FIELDREF -> "Field";
+            case TAG_METHODHANDLE -> "MethodHandle";
+            case TAG_METHODTYPE -> "MethodType";
+            case TAG_METHODREF -> "Method";
+            case TAG_INTERFACEMETHODREF -> "InterfaceMethod";
+            case TAG_INVOKEDYNAMIC -> "InvokeDynamic";
+            case TAG_CONSTANTDYNAMIC -> "Dynamic";
+            case TAG_NAMEANDTYPE -> "NameAndType";
+            default -> "(unknown tag " + tag + ")";
+        };
+    }
+
+    String booleanValue(PoolEntry info) {
+        if (info instanceof IntegerEntry ie) {
+           switch (ie.intValue()) {
+               case 0: return "false";
+               case 1: return "true";
+           }
         }
+        return "#" + info.index();
     }
 
     String booleanValue(int constant_pool_index) {
-        ClassFile classFile = classWriter.getClassFile();
-        try {
-            CPInfo info = classFile.constant_pool.get(constant_pool_index);
-            if (info instanceof CONSTANT_Integer_info) {
-                int value = ((CONSTANT_Integer_info) info).value;
-               switch (value) {
-                   case 0: return "false";
-                   case 1: return "true";
-               }
-            }
-            return "#" + constant_pool_index;
-        } catch (ConstantPool.InvalidIndex e) {
-            return report(e);
-        }
+        var info = classWriter.getClassModel().constantPool()
+                .entryByIndex(constant_pool_index);
+        if (info instanceof IntegerEntry ie) {
+           switch (ie.intValue()) {
+               case 0: return "false";
+               case 1: return "true";
+           }
+        }
+        return "#" + constant_pool_index;
     }
 
-    String charValue(int constant_pool_index) {
-        ClassFile classFile = classWriter.getClassFile();
-        try {
-            CPInfo info = classFile.constant_pool.get(constant_pool_index);
-            if (info instanceof CONSTANT_Integer_info) {
-                int value = ((CONSTANT_Integer_info) info).value;
-                return String.valueOf((char) value);
-            } else {
-                return "#" + constant_pool_index;
-            }
-        } catch (ConstantPool.InvalidIndex e) {
-            return report(e);
+    String charValue(PoolEntry info) {
+        if (info instanceof IntegerEntry ie) {
+            int value = ie.intValue();
+            return String.valueOf((char) value);
+        } else {
+            return "#" + info.index();
         }
     }
 
-    String stringValue(int constant_pool_index) {
-        ClassFile classFile = classWriter.getClassFile();
-        try {
-            return stringValue(classFile.constant_pool.get(constant_pool_index));
-        } catch (ConstantPool.InvalidIndex e) {
-            return report(e);
+    String charValue(int constant_pool_index) {
+        var info = classWriter.getClassModel().constantPool()
+                .entryByIndex(constant_pool_index);
+        if (info instanceof IntegerEntry ie) {
+            int value = ie.intValue();
+            return String.valueOf((char) value);
+        } else {
+            return "#" + constant_pool_index;
         }
     }
 
-    String stringValue(CPInfo cpInfo) {
-        return stringValueVisitor.visit(cpInfo);
+    String stringValue(int constant_pool_index) {
+        return stringValue(classWriter.getClassModel().constantPool()
+                .entryByIndex(constant_pool_index));
     }
 
-    StringValueVisitor stringValueVisitor = new StringValueVisitor();
-
-    private class StringValueVisitor implements ConstantPool.Visitor<String, Void> {
-        public String visit(CPInfo info) {
-            return info.accept(this, null);
-        }
-
-        public String visitClass(CONSTANT_Class_info info, Void p) {
-            return getCheckedName(info);
-        }
-
-        String getCheckedName(CONSTANT_Class_info info) {
-            try {
-                return checkName(info.getName());
-            } catch (ConstantPoolException e) {
-                return report(e);
-            }
-        }
-
-        public String visitDouble(CONSTANT_Double_info info, Void p) {
-            return info.value + "d";
-        }
-
-        public String visitFieldref(CONSTANT_Fieldref_info info, Void p) {
-            return visitRef(info, p);
-        }
-
-        public String visitFloat(CONSTANT_Float_info info, Void p) {
-            return info.value + "f";
-        }
-
-        public String visitInteger(CONSTANT_Integer_info info, Void p) {
-            return String.valueOf(info.value);
-        }
-
-        public String visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, Void p) {
-            return visitRef(info, p);
-        }
-
-        public String visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, Void p) {
-            try {
-                String callee = stringValue(info.getNameAndTypeInfo());
-                return "#" + info.bootstrap_method_attr_index + ":" + callee;
-            } catch (ConstantPoolException e) {
-                return report(e);
-            }
-        }
-
-        public String visitDynamicConstant(CONSTANT_Dynamic_info info, Void p) {
-            try {
-                String callee = stringValue(info.getNameAndTypeInfo());
-                return "#" + info.bootstrap_method_attr_index + ":" + callee;
-            } catch (ConstantPoolException e) {
-                return report(e);
-            }
-        }
-
-        public String visitLong(CONSTANT_Long_info info, Void p) {
-            return info.value + "l";
-        }
-
-        public String visitModule(CONSTANT_Module_info info, Void p) {
-            try {
-                return checkName(info.getName());
-            } catch (ConstantPoolException e) {
-                return report(e);
-            }
-        }
-
-        public String visitNameAndType(CONSTANT_NameAndType_info info, Void p) {
-            return getCheckedName(info) + ":" + getType(info);
-        }
-
-        String getCheckedName(CONSTANT_NameAndType_info info) {
-            try {
-                return checkName(info.getName());
-            } catch (ConstantPoolException e) {
-                return report(e);
-            }
-        }
-
-        public String visitPackage(CONSTANT_Package_info info, Void p) {
-            try {
-                return checkName(info.getName());
-            } catch (ConstantPoolException e) {
-                return report(e);
-            }
-        }
-
-        String getType(CONSTANT_NameAndType_info info) {
-            try {
-                return info.getType();
-            } catch (ConstantPoolException e) {
-                return report(e);
-            }
-        }
-
-        public String visitMethodHandle(CONSTANT_MethodHandle_info info, Void p) {
-            try {
-                return info.reference_kind + " " + stringValue(info.getCPRefInfo());
-            } catch (ConstantPoolException e) {
-                return report(e);
-            }
-        }
-
-        public String visitMethodType(CONSTANT_MethodType_info info, Void p) {
-            try {
-                return info.getType();
-            } catch (ConstantPoolException e) {
-                return report(e);
-            }
-        }
-
-        public String visitMethodref(CONSTANT_Methodref_info info, Void p) {
-            return visitRef(info, p);
-        }
-
-        public String visitString(CONSTANT_String_info info, Void p) {
-            try {
-                ClassFile classFile = classWriter.getClassFile();
-                int string_index = info.string_index;
-                return stringValue(classFile.constant_pool.getUTF8Info(string_index));
-            } catch (ConstantPoolException e) {
-                return report(e);
-            }
-        }
-
-        public String visitUtf8(CONSTANT_Utf8_info info, Void p) {
-            String s = info.value;
-            StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < s.length(); i++) {
-                char c = s.charAt(i);
-                switch (c) {
-                    case '\t':
-                        sb.append('\\').append('t');
-                        break;
-                    case '\n':
-                        sb.append('\\').append('n');
-                        break;
-                    case '\r':
-                        sb.append('\\').append('r');
-                        break;
-                    case '\b':
-                        sb.append('\\').append('b');
-                        break;
-                    case '\f':
-                        sb.append('\\').append('f');
-                        break;
-                    case '\"':
-                        sb.append('\\').append('\"');
-                        break;
-                    case '\'':
-                        sb.append('\\').append('\'');
-                        break;
-                    case '\\':
-                        sb.append('\\').append('\\');
-                        break;
-                    default:
-                        if (Character.isISOControl(c)) {
-                            sb.append(String.format("\\u%04x", (int) c));
-                            break;
-                        }
-                        sb.append(c);
+    String stringValue(PoolEntry cpInfo) {
+        return switch (cpInfo) {
+            case ClassEntry info -> checkName(info.asInternalName());
+            case DoubleEntry info -> info.doubleValue() + "d";
+            case MemberRefEntry info -> checkName(info.owner().asInternalName())
+                + '.' + stringValue(info.nameAndType());
+            case FloatEntry info -> info.floatValue()+ "f";
+            case IntegerEntry info -> String.valueOf(info.intValue());
+            case DynamicConstantPoolEntry info -> "#" + info.bootstrapMethodIndex()
+                + ":" + stringValue(info.nameAndType());
+            case LongEntry info -> info.longValue()+ "l";
+            case ModuleEntry info -> checkName(info.name().stringValue());
+            case NameAndTypeEntry info -> checkName(info.name().stringValue())
+                + ':' + info.type().stringValue();
+            case PackageEntry info -> checkName(info.name().stringValue());
+            case MethodHandleEntry info -> {
+                String kind = switch (info.asSymbol().kind()) {
+                    case STATIC, INTERFACE_STATIC -> "REF_invokeStatic";
+                    case VIRTUAL -> "REF_invokeVirtual";
+                    case INTERFACE_VIRTUAL -> "REF_invokeInterface";
+                    case SPECIAL, INTERFACE_SPECIAL -> "REF_invokeSpecial";
+                    case CONSTRUCTOR -> "REF_newInvokeSpecial";
+                    case GETTER -> "REF_getField";
+                    case SETTER -> "REF_putField";
+                    case STATIC_GETTER -> "REF_getStatic";
+                    case STATIC_SETTER -> "REF_putStatic";
+                };
+                yield kind + " " + stringValue(info.reference());
+            }
+            case MethodTypeEntry info -> info.descriptor().stringValue();
+            case StringEntry info -> stringValue(info.utf8());
+            case Utf8Entry info -> {
+                StringBuilder sb = new StringBuilder();
+                for (char c : info.stringValue().toCharArray()) {
+                    sb.append(switch (c) {
+                        case '\t' -> "\\t";
+                        case '\n' -> "\\n";
+                        case '\r' -> "\\r";
+                        case '\b' -> "\\b";
+                        case '\f' -> "\\f";
+                        case '\"' -> "\\\"";
+                        case '\'' -> "\\\'";
+                        case '\\' -> "\\\\";
+                        default -> Character.isISOControl(c)
+                                ? String.format("\\u%04x", (int) c) : c;
+                    });
                 }
+                yield sb.toString();
             }
-            return sb.toString();
-        }
-
-        String visitRef(CPRefInfo info, Void p) {
-            String cn = getCheckedClassName(info);
-            String nat;
-            try {
-                nat = stringValue(info.getNameAndTypeInfo());
-            } catch (ConstantPoolException e) {
-                nat = report(e);
-            }
-            return cn + "." + nat;
-        }
-
-        String getCheckedClassName(CPRefInfo info) {
-            try {
-                return checkName(info.getClassName());
-            } catch (ConstantPoolException e) {
-                return report(e);
-            }
-        }
+            default -> throw new IllegalArgumentException("unknown " + cpInfo);
+        };
     }
 
     /* If name is a valid binary name, return it; otherwise quote it. */
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/InstructionDetailWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/InstructionDetailWriter.java
index 8a828b8f2b3..ad59393694f 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/InstructionDetailWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/InstructionDetailWriter.java
@@ -25,7 +25,7 @@
 
 package com.sun.tools.javap;
 
-import com.sun.tools.classfile.Instruction;
+import jdk.internal.classfile.Instruction;
 
 
 /*
@@ -56,6 +56,6 @@ public enum Kind {
         super(context);
     }
 
-    abstract void writeDetails(Instruction instr);
-    void flush() { }
+    abstract void writeDetails(int pc, Instruction instr);
+    void flush(int pc) { }
 }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java
index 638043d5620..134b4b424b7 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java
@@ -67,7 +67,10 @@
 import javax.tools.StandardJavaFileManager;
 import javax.tools.StandardLocation;
 
-import com.sun.tools.classfile.*;
+import jdk.internal.classfile.ClassModel;
+import jdk.internal.classfile.Classfile;
+import jdk.internal.classfile.constantpool.*;
+import static jdk.internal.classfile.Classfile.*;
 
 /**
  *  "Main" class for javap, normally accessed from the command line
@@ -166,7 +169,7 @@ void process(JavapTask task, String opt, String arg) {
             @Override
             void process(JavapTask task, String opt, String arg) {
                 task.options.accessOptions.add(opt);
-                task.options.showAccess = AccessFlags.ACC_PUBLIC;
+                task.options.showAccess = ACC_PUBLIC;
             }
         },
 
@@ -174,7 +177,7 @@ void process(JavapTask task, String opt, String arg) {
             @Override
             void process(JavapTask task, String opt, String arg) {
                 task.options.accessOptions.add(opt);
-                task.options.showAccess = AccessFlags.ACC_PROTECTED;
+                task.options.showAccess = ACC_PROTECTED;
             }
         },
 
@@ -193,7 +196,7 @@ void process(JavapTask task, String opt, String arg) {
                         !task.options.accessOptions.contains("-private")) {
                     task.options.accessOptions.add(opt);
                 }
-                task.options.showAccess = AccessFlags.ACC_PRIVATE;
+                task.options.showAccess = ACC_PRIVATE;
             }
         },
 
@@ -349,7 +352,6 @@ public JavapTask() {
         context = new Context();
         context.put(Messages.class, this);
         options = Options.instance(context);
-        attributeFactory = new Attribute.Factory();
     }
 
     public JavapTask(Writer out,
@@ -633,7 +635,7 @@ public int run() {
             } catch (OutOfMemoryError e) {
                 reportError("err.nomem");
                 result = EXIT_ERROR;
-            } catch (FatalError e) {
+            } catch (IllegalArgumentException e) {
                 Object msg = e.getLocalizedMessage();
                 if (msg == null) {
                     msg = e;
@@ -654,7 +656,7 @@ public int run() {
     }
 
     protected int writeClass(ClassWriter classWriter, String className)
-            throws IOException, ConstantPoolException {
+            throws IOException {
         JavaFileObject fo = open(className);
         if (fo == null) {
             reportError("err.class.not.found", className);
@@ -663,34 +665,26 @@ protected int writeClass(ClassWriter classWriter, String className)
 
         ClassFileInfo cfInfo = read(fo);
         if (!className.endsWith(".class")) {
-            if (cfInfo.cf.this_class == 0) {
-                if (!className.equals("module-info")) {
-                    reportWarning("warn.unexpected.class", fo.getName(), className);
-                }
-            } else {
-                String cfName = cfInfo.cf.getName();
-                if (!cfName.replaceAll("[/$]", ".").equals(className.replaceAll("[/$]", "."))) {
-                    reportWarning("warn.unexpected.class", fo.getName(), className);
-                }
+            String cfName = cfInfo.cm.thisClass().asInternalName();
+            if (!cfName.replaceAll("[/$]", ".").equals(className.replaceAll("[/$]", "."))) {
+                reportWarning("warn.unexpected.class", fo.getName(), className);
             }
         }
-        write(cfInfo);
+        if (!write(cfInfo)) return EXIT_ERROR;
 
         if (options.showInnerClasses) {
-            ClassFile cf = cfInfo.cf;
-            Attribute a = cf.getAttribute(Attribute.InnerClasses);
-            if (a instanceof InnerClasses_attribute) {
-                InnerClasses_attribute inners = (InnerClasses_attribute) a;
+            ClassModel cm = cfInfo.cm;
+            var a = cm.findAttribute(jdk.internal.classfile.Attributes.INNER_CLASSES);
+            if (a.isPresent()) {
+                var inners = a.get();
                 try {
                     int result = EXIT_OK;
-                    for (int i = 0; i < inners.classes.length; i++) {
-                        int outerIndex = inners.classes[i].outer_class_info_index;
-                        ConstantPool.CONSTANT_Class_info outerClassInfo = cf.constant_pool.getClassInfo(outerIndex);
-                        String outerClassName = outerClassInfo.getName();
-                        if (outerClassName.equals(cf.getName())) {
-                            int innerIndex = inners.classes[i].inner_class_info_index;
-                            ConstantPool.CONSTANT_Class_info innerClassInfo = cf.constant_pool.getClassInfo(innerIndex);
-                            String innerClassName = innerClassInfo.getName();
+                    for (var inner : inners.classes()) {
+                        var outerClassInfo = inner.outerClass();
+                        String outerClassName = outerClassInfo.map(ClassEntry::asInternalName).orElse(null);
+                        if (cm.thisClass().asInternalName().equals(outerClassName)) {
+                            var innerClassInfo = inner.innerClass();
+                            String innerClassName = innerClassInfo.asInternalName();
                             classWriter.println("// inner class " + innerClassName.replaceAll("[/$]", "."));
                             classWriter.println();
                             result = writeClass(classWriter, innerClassName);
@@ -698,13 +692,10 @@ protected int writeClass(ClassWriter classWriter, String className)
                         }
                     }
                     return result;
-                } catch (ConstantPoolException e) {
+                } catch (IllegalArgumentException e) {
                     reportError("err.bad.innerclasses.attribute", className);
                     return EXIT_ERROR;
                 }
-            } else if (a != null) {
-                reportError("err.bad.innerclasses.attribute", className);
-                return EXIT_ERROR;
             }
         }
 
@@ -811,19 +802,19 @@ public boolean delete() {
     }
 
     public static class ClassFileInfo {
-        ClassFileInfo(JavaFileObject fo, ClassFile cf, byte[] digest, int size) {
+        ClassFileInfo(JavaFileObject fo, ClassModel cm, byte[] digest, int size) {
             this.fo = fo;
-            this.cf = cf;
+            this.cm = cm;
             this.digest = digest;
             this.size = size;
         }
         public final JavaFileObject fo;
-        public final ClassFile cf;
+        public final ClassModel cm;
         public final byte[] digest;
         public final int size;
     }
 
-    public ClassFileInfo read(JavaFileObject fo) throws IOException, ConstantPoolException {
+    public ClassFileInfo read(JavaFileObject fo) throws IOException {
         InputStream in = fo.openInputStream();
         try {
             SizeInputStream sizeIn = null;
@@ -836,17 +827,16 @@ public ClassFileInfo read(JavaFileObject fo) throws IOException, ConstantPoolExc
                 in = new DigestInputStream(in, md);
                 in = sizeIn = new SizeInputStream(in);
             }
-
-            ClassFile cf = ClassFile.read(in, attributeFactory);
+            ClassModel cm = Classfile.of().parse(in.readAllBytes());
             byte[] digest = (md == null) ? null : md.digest();
             int size = (sizeIn == null) ? -1 : sizeIn.size();
-            return new ClassFileInfo(fo, cf, digest, size);
+            return new ClassFileInfo(fo, cm, digest, size);
         } finally {
             in.close();
         }
     }
 
-    public void write(ClassFileInfo info) {
+    public boolean write(ClassFileInfo info) {
         ClassWriter classWriter = ClassWriter.instance(context);
         if (options.sysInfo || options.verbose) {
             classWriter.setFile(info.fo.toUri());
@@ -855,56 +845,7 @@ public void write(ClassFileInfo info) {
             classWriter.setFileSize(info.size);
         }
 
-        classWriter.write(info.cf);
-    }
-
-    protected void setClassFile(ClassFile classFile) {
-        ClassWriter classWriter = ClassWriter.instance(context);
-        classWriter.setClassFile(classFile);
-    }
-
-    protected void setMethod(Method enclosingMethod) {
-        ClassWriter classWriter = ClassWriter.instance(context);
-        classWriter.setMethod(enclosingMethod);
-    }
-
-    protected void write(Attribute value) {
-        AttributeWriter attrWriter = AttributeWriter.instance(context);
-        ClassWriter classWriter = ClassWriter.instance(context);
-        ClassFile cf = classWriter.getClassFile();
-        attrWriter.write(cf, value, cf.constant_pool);
-    }
-
-    protected void write(Attributes attrs) {
-        AttributeWriter attrWriter = AttributeWriter.instance(context);
-        ClassWriter classWriter = ClassWriter.instance(context);
-        ClassFile cf = classWriter.getClassFile();
-        attrWriter.write(cf, attrs, cf.constant_pool);
-    }
-
-    protected void write(ConstantPool constant_pool) {
-        ConstantWriter constantWriter = ConstantWriter.instance(context);
-        constantWriter.writeConstantPool(constant_pool);
-    }
-
-    protected void write(ConstantPool constant_pool, int value) {
-        ConstantWriter constantWriter = ConstantWriter.instance(context);
-        constantWriter.write(value);
-    }
-
-    protected void write(ConstantPool.CPInfo value) {
-        ConstantWriter constantWriter = ConstantWriter.instance(context);
-        constantWriter.println(value);
-    }
-
-    protected void write(Field value) {
-        ClassWriter classWriter = ClassWriter.instance(context);
-        classWriter.writeField(value);
-    }
-
-    protected void write(Method value) {
-        ClassWriter classWriter = ClassWriter.instance(context);
-        classWriter.writeMethod(value);
+        return classWriter.write(info.cm);
     }
 
     private JavaFileManager getDefaultFileManager(final DiagnosticListener<? super JavaFileObject> dl, PrintWriter log) {
@@ -944,7 +885,8 @@ private Location findModule(String moduleName) throws IOException {
                         if (result == null)
                             result = l;
                         else
-                            throw new IOException("multiple definitions found for " + moduleName);
+                            throw new IOException("multiple definitions found for "
+                                    + moduleName);
                     }
                 }
                 if (result != null)
@@ -957,7 +899,8 @@ private Location findModule(String moduleName) throws IOException {
     private void showHelp() {
         printLines(getMessage("main.usage", progname));
         for (Option o: recognizedOptions) {
-            String name = o.aliases[0].replaceAll("^-+", "").replaceAll("-+", "_"); // there must always be at least one name
+            // there must always be at least one name
+            String name = o.aliases[0].replaceAll("^-+", "").replaceAll("-+", "_");
             if (name.startsWith("X") || name.equals("fullversion"))
                 continue;
             printLines(getMessage("main.opt." + name));
@@ -1000,7 +943,8 @@ private String version(String key) {
             try {
                 versionRB = ResourceBundle.getBundle(versionRBName);
             } catch (MissingResourceException e) {
-                return getMessage("version.resource.missing", System.getProperty("java.version"));
+                return getMessage("version.resource.missing",
+                        System.getProperty("java.version"));
             }
         }
         try {
@@ -1064,7 +1008,8 @@ public String getMessage(Locale locale) {
 
             @Override
             public String toString() {
-                return getClass().getName() + "[key=" + key + ",args=" + Arrays.asList(args) + "]";
+                return getClass().getName() + "[key=" + key + ",args="
+                        + Arrays.asList(args) + "]";
             }
 
         };
@@ -1089,10 +1034,12 @@ public String getMessage(Locale locale, String key, Object... args) {
         ResourceBundle b = bundles.get(locale);
         if (b == null) {
             try {
-                b = ResourceBundle.getBundle("com.sun.tools.javap.resources.javap", locale);
+                b = ResourceBundle.getBundle("com.sun.tools.javap.resources.javap",
+                        locale);
                 bundles.put(locale, b);
             } catch (MissingResourceException e) {
-                throw new InternalError("Cannot find javap resource bundle for locale " + locale);
+                throw new InternalError("Cannot find javap resource bundle for locale "
+                        + locale);
             }
         }
 
@@ -1114,7 +1061,6 @@ public String getMessage(Locale locale, String key, Object... args) {
     //ResourceBundle bundle;
     Locale task_locale;
     Map<Locale, ResourceBundle> bundles;
-    protected Attribute.Factory attributeFactory;
 
     private static final String progname = "javap";
 
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java
index d8438daf971..76141ce039a 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java
@@ -25,19 +25,15 @@
 
 package com.sun.tools.javap;
 
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.Code_attribute;
-import com.sun.tools.classfile.ConstantPool;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Descriptor;
-import com.sun.tools.classfile.Descriptor.InvalidDescriptor;
-import com.sun.tools.classfile.Instruction;
-import com.sun.tools.classfile.LocalVariableTable_attribute;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
+import jdk.internal.classfile.Attributes;
+import jdk.internal.classfile.CodeModel;
+import jdk.internal.classfile.Instruction;
+import jdk.internal.classfile.Signature;
+import jdk.internal.classfile.attribute.LocalVariableInfo;
 
 /**
  * Annotate instructions with details about local variables.
@@ -47,22 +43,24 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
-public class LocalVariableTableWriter extends  InstructionDetailWriter {
+public class LocalVariableTableWriter extends InstructionDetailWriter {
     public enum NoteKind {
         START("start") {
-            public boolean match(LocalVariableTable_attribute.Entry entry, int pc) {
-                return (pc == entry.start_pc);
+            @Override
+            public boolean match(LocalVariableInfo entry, int pc) {
+                return (pc == entry.startPc());
             }
         },
         END("end") {
-            public boolean match(LocalVariableTable_attribute.Entry entry, int pc) {
-                return (pc == entry.start_pc + entry.length);
+            @Override
+            public boolean match(LocalVariableInfo entry, int pc) {
+                return (pc == entry.startPc() + entry.length());
             }
         };
         NoteKind(String text) {
             this.text = text;
         }
-        public abstract boolean match(LocalVariableTable_attribute.Entry entry, int pc);
+        public abstract boolean match(LocalVariableInfo entry, int pc);
         public final String text;
     }
 
@@ -79,71 +77,56 @@ protected LocalVariableTableWriter(Context context) {
         classWriter = ClassWriter.instance(context);
     }
 
-    public void reset(Code_attribute attr) {
+    public void reset(CodeModel attr) {
         codeAttr = attr;
         pcMap = new HashMap<>();
-        LocalVariableTable_attribute lvt =
-                (LocalVariableTable_attribute) (attr.attributes.get(Attribute.LocalVariableTable));
-        if (lvt == null)
+        var lvt = attr.findAttribute(Attributes.LOCAL_VARIABLE_TABLE);
+
+        if (lvt.isEmpty())
             return;
 
-        for (int i = 0; i < lvt.local_variable_table.length; i++) {
-            LocalVariableTable_attribute.Entry entry = lvt.local_variable_table[i];
-            put(entry.start_pc, entry);
-            put(entry.start_pc + entry.length, entry);
+        for (var entry : lvt.get().localVariables()) {
+            put(entry.startPc(), entry);
+            put(entry.startPc() + entry.length(), entry);
         }
     }
 
-    public void writeDetails(Instruction instr) {
-        int pc = instr.getPC();
+    @Override
+    public void writeDetails(int pc, Instruction instr) {
         writeLocalVariables(pc, NoteKind.END);
         writeLocalVariables(pc, NoteKind.START);
     }
 
     @Override
-    public void flush() {
-        int pc = codeAttr.code_length;
+    public void flush(int pc) {
         writeLocalVariables(pc, NoteKind.END);
     }
 
     public void writeLocalVariables(int pc, NoteKind kind) {
-        ConstantPool constant_pool = classWriter.getClassFile().constant_pool;
         String indent = space(2); // get from Options?
-        List<LocalVariableTable_attribute.Entry> entries = pcMap.get(pc);
+        var entries = pcMap.get(pc);
         if (entries != null) {
-            for (ListIterator<LocalVariableTable_attribute.Entry> iter =
-                    entries.listIterator(kind == NoteKind.END ? entries.size() : 0);
+            for (var iter = entries.listIterator(kind == NoteKind.END ? entries.size() : 0);
                     kind == NoteKind.END ? iter.hasPrevious() : iter.hasNext() ; ) {
-                LocalVariableTable_attribute.Entry entry =
-                        kind == NoteKind.END ? iter.previous() : iter.next();
+                var entry = kind == NoteKind.END ? iter.previous() : iter.next();
                 if (kind.match(entry, pc)) {
                     print(indent);
                     print(kind.text);
                     print(" local ");
-                    print(entry.index);
+                    print(entry.slot());
                     print(" // ");
-                    Descriptor d = new Descriptor(entry.descriptor_index);
-                    try {
-                        print(d.getFieldType(constant_pool));
-                    } catch (InvalidDescriptor e) {
-                        print(report(e));
-                    } catch (ConstantPoolException e) {
-                        print(report(e));
-                    }
+                    print(classWriter.sigPrinter.print(
+                            Signature.parseFrom(entry.type().stringValue())));
                     print(" ");
-                    try {
-                        print(constant_pool.getUTF8Value(entry.name_index));
-                    } catch (ConstantPoolException e) {
-                        print(report(e));
-                    }
+                    print(entry.name().stringValue());
                     println();
                 }
             }
         }
     }
 
-    private void put(int pc, LocalVariableTable_attribute.Entry entry) {
-        List<LocalVariableTable_attribute.Entry> list = pcMap.get(pc);
+    private void put(int pc, LocalVariableInfo entry) {
+        var list = pcMap.get(pc);
         if (list == null) {
             list = new ArrayList<>();
             pcMap.put(pc, list);
@@ -153,6 +136,6 @@ private void put(int pc, LocalVariableTable_attribute.Entry entry) {
     }
 
     private ClassWriter classWriter;
-    private Code_attribute codeAttr;
-    private Map<Integer, List<LocalVariableTable_attribute.Entry>> pcMap;
+    private CodeModel codeAttr;
+    private Map<Integer, List<LocalVariableInfo>> pcMap;
 }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
index d1a8c68de72..fce73156c06 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
@@ -25,20 +25,15 @@
 
 package com.sun.tools.javap;
 
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.Code_attribute;
-import com.sun.tools.classfile.ConstantPool;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Descriptor;
-import com.sun.tools.classfile.Descriptor.InvalidDescriptor;
-import com.sun.tools.classfile.Instruction;
-import com.sun.tools.classfile.LocalVariableTypeTable_attribute;
-import com.sun.tools.classfile.Signature;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
+import jdk.internal.classfile.Attributes;
+import jdk.internal.classfile.CodeModel;
+import jdk.internal.classfile.Instruction;
+import jdk.internal.classfile.Signature;
+import jdk.internal.classfile.attribute.LocalVariableTypeInfo;
 
 /**
  * Annotate instructions with details about local variables.
@@ -51,19 +46,21 @@
 public class LocalVariableTypeTableWriter extends  InstructionDetailWriter {
     public enum NoteKind {
         START("start") {
-            public boolean match(LocalVariableTypeTable_attribute.Entry entry, int pc) {
-                return (pc == entry.start_pc);
+            @Override
+            public boolean match(LocalVariableTypeInfo entry, int pc) {
+                return (pc == entry.startPc());
             }
         },
         END("end") {
-            public boolean match(LocalVariableTypeTable_attribute.Entry entry, int pc) {
-                return (pc == entry.start_pc + entry.length);
+            @Override
+            public boolean match(LocalVariableTypeInfo entry, int pc) {
+                return (pc == entry.startPc() + entry.length());
             }
         };
         NoteKind(String text) {
             this.text = text;
         }
-        public abstract boolean match(LocalVariableTypeTable_attribute.Entry entry, int pc);
+        public abstract boolean match(LocalVariableTypeInfo entry, int pc);
         public final String text;
     }
 
@@ -80,71 +77,60 @@ protected LocalVariableTypeTableWriter(Context context) {
         classWriter = ClassWriter.instance(context);
     }
 
-    public void reset(Code_attribute attr) {
+    public void reset(CodeModel attr) {
         codeAttr = attr;
         pcMap = new HashMap<>();
-        LocalVariableTypeTable_attribute lvt =
-                (LocalVariableTypeTable_attribute) (attr.attributes.get(Attribute.LocalVariableTypeTable));
-        if (lvt == null)
+        var lvt = attr.findAttribute(Attributes.LOCAL_VARIABLE_TYPE_TABLE);
+
+        if (lvt.isEmpty())
             return;
 
-        for (int i = 0; i < lvt.local_variable_table.length; i++) {
-            LocalVariableTypeTable_attribute.Entry entry = lvt.local_variable_table[i];
-            put(entry.start_pc, entry);
-            put(entry.start_pc + entry.length, entry);
+        for (var entry : lvt.get().localVariableTypes()) {
+            put(entry.startPc(), entry);
+            put(entry.startPc() + entry.length(), entry);
         }
     }
 
-    public void writeDetails(Instruction instr) {
-        int pc = instr.getPC();
+    @Override
+    public void writeDetails(int pc, Instruction instr) {
         writeLocalVariables(pc, NoteKind.END);
         writeLocalVariables(pc, NoteKind.START);
     }
 
     @Override
-    public void flush() {
-        int pc = codeAttr.code_length;
+    public void flush(int pc) {
         writeLocalVariables(pc, NoteKind.END);
     }
 
     public void writeLocalVariables(int pc, NoteKind kind) {
-        ConstantPool constant_pool = classWriter.getClassFile().constant_pool;
         String indent = space(2); // get from Options?
-        List<LocalVariableTypeTable_attribute.Entry> entries = pcMap.get(pc);
+        var entries = pcMap.get(pc);
         if (entries != null) {
-            for (ListIterator<LocalVariableTypeTable_attribute.Entry> iter =
-                    entries.listIterator(kind == NoteKind.END ? entries.size() : 0);
+            for (var iter = entries.listIterator(kind == NoteKind.END ? entries.size() : 0);
                     kind == NoteKind.END ? iter.hasPrevious() : iter.hasNext() ; ) {
-                LocalVariableTypeTable_attribute.Entry entry =
-                        kind == NoteKind.END ? iter.previous() : iter.next();
+                var entry = kind == NoteKind.END ? iter.previous() : iter.next();
                 if (kind.match(entry, pc)) {
                     print(indent);
                     print(kind.text);
                     print(" generic local ");
-                    print(entry.index);
+                    print(entry.slot());
                     print(" // ");
-                    Descriptor d = new Signature(entry.signature_index);
                     try {
-                        print(d.getFieldType(constant_pool).replace("/", "."));
-                    } catch (InvalidDescriptor e) {
-                        print(report(e));
-                    } catch (ConstantPoolException e) {
+                        print(classWriter.sigPrinter.print(Signature.parseFrom(
+                                entry.signature().stringValue())).replace("/", "."));
+                    } catch (Exception e) {
                         print(report(e));
                     }
                     print(" ");
-                    try {
-                        print(constant_pool.getUTF8Value(entry.name_index));
-                    } catch (ConstantPoolException e) {
-                        print(report(e));
-                    }
+                    print(entry.name().stringValue());
                     println();
                 }
             }
         }
     }
 
-    private void put(int pc, LocalVariableTypeTable_attribute.Entry entry) {
-        List<LocalVariableTypeTable_attribute.Entry> list = pcMap.get(pc);
+    private void put(int pc, LocalVariableTypeInfo entry) {
+        var list = pcMap.get(pc);
         if (list == null) {
             list = new ArrayList<>();
             pcMap.put(pc, list);
@@ -154,6 +140,6 @@ private void put(int pc, LocalVariableTypeTable_attribute.Entry entry) {
     }
 
     private ClassWriter classWriter;
-    private Code_attribute codeAttr;
-    private Map<Integer, List<LocalVariableTypeTable_attribute.Entry>> pcMap;
+    private CodeModel codeAttr;
+    private Map<Integer, List<LocalVariableTypeInfo>> pcMap;
 }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/Options.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/Options.java
index 3a31155d688..2beefb66dbd 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/Options.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/Options.java
@@ -29,7 +29,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import com.sun.tools.classfile.AccessFlags;
+import static jdk.internal.classfile.Classfile.*;
 
 /*
  *  Provides access to javap's options, set via the command line
@@ -54,16 +54,16 @@ protected Options(Context context) {
     /**
      * Checks access of class, field or method.
      */
-    public boolean checkAccess(AccessFlags flags){
+    public boolean checkAccess(int flags){
 
-        boolean isPublic = flags.is(AccessFlags.ACC_PUBLIC);
-        boolean isProtected = flags.is(AccessFlags.ACC_PROTECTED);
-        boolean isPrivate = flags.is(AccessFlags.ACC_PRIVATE);
+        boolean isPublic = (flags & ACC_PUBLIC) != 0;
+        boolean isProtected = (flags & ACC_PROTECTED) != 0;
+        boolean isPrivate = (flags & ACC_PRIVATE) != 0;
         boolean isPackage = !(isPublic || isProtected || isPrivate);
 
-        if ((showAccess == AccessFlags.ACC_PUBLIC) && (isProtected || isPrivate || isPackage))
+        if ((showAccess == ACC_PUBLIC) && (isProtected || isPrivate || isPackage))
             return false;
-        else if ((showAccess == AccessFlags.ACC_PROTECTED) && (isPrivate || isPackage))
+        else if ((showAccess == ACC_PROTECTED) && (isPrivate || isPackage))
             return false;
         else if ((showAccess == 0) && (isPrivate))
             return false;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/SourceWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/SourceWriter.java
index da31777f3b7..775ab6f1ba8 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/SourceWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/SourceWriter.java
@@ -30,7 +30,6 @@
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.TreeMap;
@@ -40,13 +39,10 @@
 import javax.tools.JavaFileObject;
 import javax.tools.StandardLocation;
 
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.Code_attribute;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Instruction;
-import com.sun.tools.classfile.LineNumberTable_attribute;
-import com.sun.tools.classfile.SourceFile_attribute;
+import jdk.internal.classfile.Attributes;
+import jdk.internal.classfile.ClassModel;
+import jdk.internal.classfile.CodeModel;
+import jdk.internal.classfile.Instruction;
 
 
 /**
@@ -74,14 +70,15 @@ void setFileManager(JavaFileManager fileManager) {
         this.fileManager = fileManager;
     }
 
-    public void reset(ClassFile cf, Code_attribute attr) {
-        setSource(cf);
+    public void reset(CodeModel attr) {
+        setSource(attr.parent().get().parent().get());
         setLineMap(attr);
     }
 
-    public void writeDetails(Instruction instr) {
+    @Override
+    public void writeDetails(int pc, Instruction instr) {
         String indent = space(40); // could get from Options?
-        Set<Integer> lines = lineMap.get(instr.getPC());
+        var lines = lineMap.get(pc);
         if (lines != null) {
             for (int line: lines) {
                 print(indent);
@@ -105,37 +102,34 @@ public boolean hasSource() {
         return (sourceLines.length > 0);
     }
 
-    private void setLineMap(Code_attribute attr) {
+    private void setLineMap(CodeModel attr) {
         SortedMap<Integer, SortedSet<Integer>> map = new TreeMap<>();
         SortedSet<Integer> allLines = new TreeSet<>();
-        for (Attribute a: attr.attributes) {
-            if (a instanceof LineNumberTable_attribute) {
-                LineNumberTable_attribute t = (LineNumberTable_attribute) a;
-                for (LineNumberTable_attribute.Entry e: t.line_number_table) {
-                    int start_pc = e.start_pc;
-                    int line = e.line_number;
-                    SortedSet<Integer> pcLines = map.get(start_pc);
-                    if (pcLines == null) {
-                        pcLines = new TreeSet<>();
-                        map.put(start_pc, pcLines);
-                    }
-                    pcLines.add(line);
-                    allLines.add(line);
+        for (var t : attr.findAttributes(Attributes.LINE_NUMBER_TABLE)) {
+            for (var e: t.lineNumbers()) {
+                int start_pc = e.startPc();
+                int line = e.lineNumber();
+                SortedSet<Integer> pcLines = map.get(start_pc);
+                if (pcLines == null) {
+                    pcLines = new TreeSet<>();
+                    map.put(start_pc, pcLines);
                 }
+                pcLines.add(line);
+                allLines.add(line);
             }
         }
         lineMap = map;
         lineList = new ArrayList<>(allLines);
     }
 
-    private void setSource(ClassFile cf) {
+    private void setSource(ClassModel cf) {
         if (cf != classFile) {
             classFile = cf;
             sourceLines = splitLines(readSource(cf));
         }
     }
 
-    private String readSource(ClassFile cf) {
+    private String readSource(ClassModel cf) {
         if (fileManager == null)
             return null;
 
@@ -150,14 +144,13 @@ private String readSource(ClassFile cf) {
         // additional classes to determine the outmost class from any
         // InnerClasses and EnclosingMethod attributes.
         try {
-            String className = cf.getName();
-            SourceFile_attribute sf =
-                    (SourceFile_attribute) cf.attributes.get(Attribute.SourceFile);
-            if (sf == null) {
+            String className = cf.thisClass().asInternalName();
+            var sf = cf.findAttribute(Attributes.SOURCE_FILE);
+            if (sf.isEmpty()) {
                 report(messages.getMessage("err.no.SourceFile.attribute"));
                 return null;
             }
-            String sourceFile = sf.getSourceFile(cf.constant_pool);
+            String sourceFile = sf.get().sourceFile().stringValue();
             String fileBase = sourceFile.endsWith(".java")
                 ? sourceFile.substring(0, sourceFile.length() - 5) : sourceFile;
             int sep = className.lastIndexOf("/");
@@ -172,9 +165,6 @@ private String readSource(ClassFile cf) {
                 return null;
             }
             return fo.getCharContent(true).toString();
-        } catch (ConstantPoolException e) {
-            report(e);
-            return null;
         } catch (IOException e) {
             report(e.getLocalizedMessage());
             return null;
@@ -205,7 +195,7 @@ private int nextLine(int line) {
     }
 
     private JavaFileManager fileManager;
-    private ClassFile classFile;
+    private ClassModel classFile;
     private SortedMap<Integer, SortedSet<Integer>> lineMap;
     private List<Integer> lineList;
     private String[] sourceLines;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/StackMapWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/StackMapWriter.java
index 872521e176c..5c66deab634 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/StackMapWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/StackMapWriter.java
@@ -25,23 +25,16 @@
 
 package com.sun.tools.javap;
 
-import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import jdk.internal.classfile.Attributes;
+import jdk.internal.classfile.Classfile;
 
-import com.sun.tools.classfile.AccessFlags;
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.Code_attribute;
-import com.sun.tools.classfile.ConstantPool;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Descriptor;
-import com.sun.tools.classfile.Descriptor.InvalidDescriptor;
-import com.sun.tools.classfile.Instruction;
-import com.sun.tools.classfile.Method;
-import com.sun.tools.classfile.StackMapTable_attribute;
-import com.sun.tools.classfile.StackMapTable_attribute.*;
-
-import static com.sun.tools.classfile.StackMapTable_attribute.verification_type_info.*;
+import jdk.internal.classfile.Instruction;
+import jdk.internal.classfile.attribute.CodeAttribute;
+import jdk.internal.classfile.attribute.StackMapFrameInfo;
+import jdk.internal.classfile.attribute.StackMapTableAttribute;
 
 /**
  * Annotate instructions with stack map.
@@ -62,228 +55,108 @@ static StackMapWriter instance(Context context) {
     protected StackMapWriter(Context context) {
         super(context);
         context.put(StackMapWriter.class, this);
-        classWriter = ClassWriter.instance(context);
     }
 
-    public void reset(Code_attribute attr) {
-        setStackMap((StackMapTable_attribute) attr.attributes.get(Attribute.StackMapTable));
+    public void reset(CodeAttribute code) {
+        setStackMap(code);
     }
 
-    void setStackMap(StackMapTable_attribute attr) {
+    void setStackMap(CodeAttribute code) {
+        StackMapTableAttribute attr = code.findAttribute(Attributes.STACK_MAP_TABLE)
+                .orElse(null);
         if (attr == null) {
             map = null;
             return;
         }
-
-        Method m = classWriter.getMethod();
-        Descriptor d = m.descriptor;
-        String[] args;
-        try {
-            ConstantPool cp = classWriter.getClassFile().constant_pool;
-            String argString = d.getParameterTypes(cp);
-            args = argString.substring(1, argString.length() - 1).split("[, ]+");
-        } catch (ConstantPoolException | InvalidDescriptor e) {
-            return;
-        }
-        boolean isStatic = m.access_flags.is(AccessFlags.ACC_STATIC);
-
-        verification_type_info[] initialLocals = new verification_type_info[(isStatic ? 0 : 1) + args.length];
-        if (!isStatic)
-            initialLocals[0] = new CustomVerificationTypeInfo("this");
-        for (int i = 0; i < args.length; i++) {
-            initialLocals[(isStatic ? 0 : 1) + i] =
-                    new CustomVerificationTypeInfo(args[i].replace(".", "/"));
+        var m = code.parent().get();
+        if ((m.flags().flagsMask() & Classfile.ACC_STATIC) == 0) {
+            thisClassName =  m.parent().get().thisClass().asInternalName();
+        } else {
+            thisClassName = null;
         }
 
         map = new HashMap<>();
-        StackMapBuilder builder = new StackMapBuilder();
-
-        // using -1 as the pc for the initial frame effectively compensates for
-        // the difference in behavior for the first stack map frame (where the
-        // pc offset is just offset_delta) compared to subsequent frames (where
-        // the pc offset is always offset_delta+1).
-        int pc = -1;
-
-        map.put(pc, new StackMap(initialLocals, empty));
-
-        for (int i = 0; i < attr.entries.length; i++)
-            pc = attr.entries[i].accept(builder, pc);
+        this.code = code;
+        for (var fr : attr.entries())
+            map.put(code.labelToBci(fr.target()), fr);
     }
 
     public void writeInitialDetails() {
         writeDetails(-1);
     }
 
-    public void writeDetails(Instruction instr) {
-        writeDetails(instr.getPC());
+    @Override
+    public void writeDetails(int pc, Instruction instr) {
+        writeDetails(pc);
     }
 
     private void writeDetails(int pc) {
         if (map == null)
             return;
 
-        StackMap m = map.get(pc);
+        var m = map.get(pc);
         if (m != null) {
-            print("StackMap locals: ", m.locals);
-            print("StackMap stack: ", m.stack);
+            print("StackMap locals: ", m.locals(), true);
+            print("StackMap stack: ", m.stack(), false);
         }
 
     }
 
-    void print(String label, verification_type_info[] entries) {
+    void print(String label, List<StackMapFrameInfo.VerificationTypeInfo> entries,
+            boolean firstThis) {
         print(label);
-        for (int i = 0; i < entries.length; i++) {
+        for (var e : entries) {
             print(" ");
-            print(entries[i]);
+            print(e, firstThis);
+            firstThis = false;
         }
         println();
     }
 
-    void print(verification_type_info entry) {
+    void print(StackMapFrameInfo.VerificationTypeInfo entry, boolean firstThis) {
         if (entry == null) {
             print("ERROR");
             return;
         }
 
-        switch (entry.tag) {
-            case -1:
-                print(((CustomVerificationTypeInfo) entry).text);
-                break;
-
-            case ITEM_Top:
-                print("top");
-                break;
+        switch (entry) {
+            case StackMapFrameInfo.SimpleVerificationTypeInfo s -> {
+                switch (s) {
+                    case ITEM_TOP ->
+                        print("top");
 
-            case ITEM_Integer:
-                print("int");
-                break;
+                    case ITEM_INTEGER ->
+                        print("int");
 
-            case ITEM_Float:
-                print("float");
-                break;
+                    case ITEM_FLOAT ->
+                        print("float");
 
-            case ITEM_Long:
-                print("long");
-                break;
+                    case ITEM_LONG ->
+                        print("long");
 
-            case ITEM_Double:
-                print("double");
-                break;
+                    case ITEM_DOUBLE ->
+                        print("double");
 
-            case ITEM_Null:
-                print("null");
-                break;
+                    case ITEM_NULL ->
+                        print("null");
 
-            case ITEM_UninitializedThis:
-                print("uninit_this");
-                break;
-
-            case ITEM_Object:
-                try {
-                    ConstantPool cp = classWriter.getClassFile().constant_pool;
-                    ConstantPool.CONSTANT_Class_info class_info = cp.getClassInfo(((Object_variable_info) entry).cpool_index);
-                    print(cp.getUTF8Value(class_info.name_index));
-                } catch (ConstantPoolException e) {
-                    print("??");
+                    case ITEM_UNINITIALIZED_THIS ->
+                        print("uninit_this");
                 }
-                break;
-
-            case ITEM_Uninitialized:
-                print(((Uninitialized_variable_info) entry).offset);
-                break;
-        }
-
-    }
-
-    private Map<Integer, StackMap> map;
-    private ClassWriter classWriter;
-
-    class StackMapBuilder
-            implements StackMapTable_attribute.stack_map_frame.Visitor<Integer, Integer> {
-
-        public Integer visit_same_frame(same_frame frame, Integer pc) {
-            int new_pc = pc + frame.getOffsetDelta() + 1;
-            StackMap m = map.get(pc);
-            assert (m != null);
-            map.put(new_pc, m);
-            return new_pc;
-        }
+            }
 
-        public Integer visit_same_locals_1_stack_item_frame(same_locals_1_stack_item_frame frame, Integer pc) {
-            int new_pc = pc + frame.getOffsetDelta() + 1;
-            StackMap prev = map.get(pc);
-            assert (prev != null);
-            StackMap m = new StackMap(prev.locals, frame.stack);
-            map.put(new_pc, m);
-            return new_pc;
-        }
+            case StackMapFrameInfo.ObjectVerificationTypeInfo o -> {
+                String cln = o.className().asInternalName();
+                print(firstThis && cln.equals(thisClassName) ? "this" : cln);
+            }
 
-        public Integer visit_same_locals_1_stack_item_frame_extended(same_locals_1_stack_item_frame_extended frame, Integer pc) {
-            int new_pc = pc + frame.getOffsetDelta() + 1;
-            StackMap prev = map.get(pc);
-            assert (prev != null);
-            StackMap m = new StackMap(prev.locals, frame.stack);
-            map.put(new_pc, m);
-            return new_pc;
+            case StackMapFrameInfo.UninitializedVerificationTypeInfo u ->
+                print(code.labelToBci(u.newTarget()));
         }
 
-        public Integer visit_chop_frame(chop_frame frame, Integer pc) {
-            int new_pc = pc + frame.getOffsetDelta() + 1;
-            StackMap prev = map.get(pc);
-            assert (prev != null);
-            int k = 251 - frame.frame_type;
-            verification_type_info[] new_locals = Arrays.copyOf(prev.locals, prev.locals.length - k);
-            StackMap m = new StackMap(new_locals, empty);
-            map.put(new_pc, m);
-            return new_pc;
-        }
-
-        public Integer visit_same_frame_extended(same_frame_extended frame, Integer pc) {
-            int new_pc = pc + frame.getOffsetDelta();
-            StackMap m = map.get(pc);
-            assert (m != null);
-            map.put(new_pc, m);
-            return new_pc;
-        }
-
-        public Integer visit_append_frame(append_frame frame, Integer pc) {
-            int new_pc = pc + frame.getOffsetDelta() + 1;
-            StackMap prev = map.get(pc);
-            assert (prev != null);
-            verification_type_info[] new_locals = new verification_type_info[prev.locals.length + frame.locals.length];
-            System.arraycopy(prev.locals, 0, new_locals, 0, prev.locals.length);
-            System.arraycopy(frame.locals, 0, new_locals, prev.locals.length, frame.locals.length);
-            StackMap m = new StackMap(new_locals, empty);
-            map.put(new_pc, m);
-            return new_pc;
-        }
-
-        public Integer visit_full_frame(full_frame frame, Integer pc) {
-            int new_pc = pc + frame.getOffsetDelta() + 1;
-            StackMap m = new StackMap(frame.locals, frame.stack);
-            map.put(new_pc, m);
-            return new_pc;
-        }
-
-    }
-
-    static class StackMap {
-        StackMap(verification_type_info[] locals, verification_type_info[] stack) {
-            this.locals = locals;
-            this.stack = stack;
-        }
-
-        private final verification_type_info[] locals;
-        private final verification_type_info[] stack;
-    }
-
-    static class CustomVerificationTypeInfo extends verification_type_info {
-        public CustomVerificationTypeInfo(String text) {
-            super(-1);
-            this.text = text;
-        }
-        private String text;
     }
 
-    private final verification_type_info[] empty = { };
+    private Map<Integer, StackMapFrameInfo> map;
+    private String thisClassName;
+    private CodeAttribute code;
 }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/TryBlockWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/TryBlockWriter.java
index 6cbf363b578..05e127a3f82 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/TryBlockWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/TryBlockWriter.java
@@ -25,14 +25,13 @@
 
 package com.sun.tools.javap;
 
-import com.sun.tools.classfile.Code_attribute;
-import com.sun.tools.classfile.Code_attribute.Exception_data;
-import com.sun.tools.classfile.Instruction;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
+import jdk.internal.classfile.Instruction;
+import jdk.internal.classfile.instruction.ExceptionCatch;
+import jdk.internal.classfile.attribute.CodeAttribute;
 
 /**
  * Annotate instructions with details about try blocks.
@@ -45,24 +44,24 @@
 public class TryBlockWriter extends InstructionDetailWriter {
     public enum NoteKind {
         START("try") {
-            public boolean match(Exception_data entry, int pc) {
-                return (pc == entry.start_pc);
+            public boolean match(ExceptionCatch entry, int pc, CodeAttribute lr) {
+                return (pc == lr.labelToBci(entry.tryStart()));
             }
         },
         END("end try") {
-            public boolean match(Exception_data entry, int pc) {
-                return (pc == entry.end_pc);
+            public boolean match(ExceptionCatch entry, int pc, CodeAttribute lr) {
+                return (pc == lr.labelToBci(entry.tryEnd()));
             }
         },
         HANDLER("catch") {
-            public boolean match(Exception_data entry, int pc) {
-                return (pc == entry.handler_pc);
+            public boolean match(ExceptionCatch entry, int pc, CodeAttribute lr) {
+                return (pc == lr.labelToBci(entry.handler()));
             }
         };
         NoteKind(String text) {
             this.text = text;
         }
-        public abstract boolean match(Exception_data entry, int pc);
+        public abstract boolean match(ExceptionCatch entry, int pc, CodeAttribute lr);
         public final String text;
     }
 
@@ -79,46 +78,49 @@ protected TryBlockWriter(Context context) {
         constantWriter = ConstantWriter.instance(context);
     }
 
-    public void reset(Code_attribute attr) {
+    public void reset(CodeAttribute attr) {
         indexMap = new HashMap<>();
         pcMap = new HashMap<>();
-        for (int i = 0; i < attr.exception_table.length; i++) {
-            Exception_data entry = attr.exception_table[i];
+        lr = attr;
+        var excs = attr.exceptionHandlers();
+        for (int i = 0; i < excs.size(); i++) {
+            var entry = excs.get(i);
             indexMap.put(entry, i);
-            put(entry.start_pc, entry);
-            put(entry.end_pc, entry);
-            put(entry.handler_pc, entry);
+            put(lr.labelToBci(entry.tryStart()), entry);
+            put(lr.labelToBci(entry.tryEnd()), entry);
+            put(lr.labelToBci(entry.handler()), entry);
         }
     }
 
-    public void writeDetails(Instruction instr) {
-        writeTrys(instr, NoteKind.END);
-        writeTrys(instr, NoteKind.START);
-        writeTrys(instr, NoteKind.HANDLER);
+    @Override
+    public void writeDetails(int pc, Instruction instr) {
+        writeTrys(pc, instr, NoteKind.END);
+        writeTrys(pc, instr, NoteKind.START);
+        writeTrys(pc, instr, NoteKind.HANDLER);
     }
 
-    public void writeTrys(Instruction instr, NoteKind kind) {
+    public void writeTrys(int pc, Instruction instr, NoteKind kind) {
         String indent = space(2); // get from Options?
-        int pc = instr.getPC();
-        List<Exception_data> entries = pcMap.get(pc);
+        var entries = pcMap.get(pc);
         if (entries != null) {
-            for (ListIterator<Exception_data> iter =
+            for (var iter =
                     entries.listIterator(kind == NoteKind.END ? entries.size() : 0);
                     kind == NoteKind.END ? iter.hasPrevious() : iter.hasNext() ; ) {
-                Exception_data entry =
+                var entry =
                         kind == NoteKind.END ? iter.previous() : iter.next();
-                if (kind.match(entry, pc)) {
+                if (kind.match(entry, pc, lr)) {
                     print(indent);
                     print(kind.text);
                     print("[");
                     print(indexMap.get(entry));
                     print("] ");
-                    if (entry.catch_type == 0)
+                    var ct = entry.catchType();
+                    if (ct.isEmpty())
                         print("finally");
                     else {
-                        print("#" + entry.catch_type);
+                        print("#" + ct.get().index());
                         print(" // ");
-                        constantWriter.write(entry.catch_type);
+                        constantWriter.write(ct.get().index());
                     }
                     println();
                 }
@@ -126,8 +128,8 @@ public void writeTrys(Instruction instr, NoteKind kind) {
         }
     }
 
-    private void put(int pc, Exception_data entry) {
-        List<Exception_data> list = pcMap.get(pc);
+    private void put(int pc, ExceptionCatch entry) {
+        var list = pcMap.get(pc);
         if (list == null) {
             list = new ArrayList<>();
             pcMap.put(pc, list);
@@ -136,7 +138,8 @@ private void put(int pc, Exception_data entry) {
             list.add(entry);
     }
 
-    private Map<Integer, List<Exception_data>> pcMap;
-    private Map<Exception_data, Integer> indexMap;
+    private Map<Integer, List<ExceptionCatch>> pcMap;
+    private Map<ExceptionCatch, Integer> indexMap;
     private ConstantWriter constantWriter;
+    private CodeAttribute lr;
 }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
index 180c995557e..95222c6de3f 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
@@ -25,20 +25,17 @@
 
 package com.sun.tools.javap;
 
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.Code_attribute;
-import com.sun.tools.classfile.TypeAnnotation;
-import com.sun.tools.classfile.TypeAnnotation.Position;
-import com.sun.tools.classfile.Instruction;
-import com.sun.tools.classfile.Method;
-import com.sun.tools.classfile.RuntimeInvisibleTypeAnnotations_attribute;
-import com.sun.tools.classfile.RuntimeTypeAnnotations_attribute;
-import com.sun.tools.classfile.RuntimeVisibleTypeAnnotations_attribute;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
-import com.sun.tools.javac.util.StringUtils;
+import java.util.Optional;
+import jdk.internal.classfile.Attributes;
+import jdk.internal.classfile.Instruction;
+import jdk.internal.classfile.MethodModel;
+import jdk.internal.classfile.TypeAnnotation;
+import jdk.internal.classfile.attribute.CodeAttribute;
 
 /**
  * Annotate instructions with details about type annotations.
@@ -74,28 +71,37 @@ protected TypeAnnotationWriter(Context context) {
         classWriter = ClassWriter.instance(context);
     }
 
-    public void reset(Code_attribute attr) {
-        Method m = classWriter.getMethod();
+    public void reset(CodeAttribute attr) {
+        MethodModel m = attr.parent().get();
         pcMap = new HashMap<>();
-        check(NoteKind.VISIBLE, (RuntimeVisibleTypeAnnotations_attribute) m.attributes.get(Attribute.RuntimeVisibleTypeAnnotations));
-        check(NoteKind.INVISIBLE, (RuntimeInvisibleTypeAnnotations_attribute) m.attributes.get(Attribute.RuntimeInvisibleTypeAnnotations));
+        codeAttribute = attr;
+        check(NoteKind.VISIBLE,
+                m.findAttribute(Attributes.RUNTIME_VISIBLE_TYPE_ANNOTATIONS)
+                        .map(a -> a.annotations()));
+        check(NoteKind.INVISIBLE,
+                m.findAttribute(Attributes.RUNTIME_INVISIBLE_TYPE_ANNOTATIONS)
+                        .map(a -> a.annotations()));
     }
 
-    private void check(NoteKind kind, RuntimeTypeAnnotations_attribute attr) {
-        if (attr == null)
+    private void check(NoteKind kind, Optional<List<TypeAnnotation>> annos) {
+        if (annos.isEmpty())
             return;
 
-        for (TypeAnnotation anno: attr.annotations) {
-            Position p = anno.position;
-            Note note = null;
-            if (p.offset != -1)
-                addNote(p.offset, note = new Note(kind, anno));
-            if (p.lvarOffset != null) {
-                for (int i = 0; i < p.lvarOffset.length; i++) {
-                    if (note == null)
-                        note = new Note(kind, anno);
-                    addNote(p.lvarOffset[i], note);
+        for (TypeAnnotation anno: annos.get()) {
+            switch (anno.targetInfo()) {
+                case TypeAnnotation.LocalVarTarget p -> {
+                    Note note = null;
+                    for (var lvar : p.table()) {
+                        if (note == null)
+                            note = new Note(kind, anno);
+                        addNote(codeAttribute.labelToBci(lvar.startLabel()), note);
+                    }
                 }
+                case TypeAnnotation.OffsetTarget p ->
+                    addNote(codeAttribute.labelToBci(p.target()), new Note(kind, anno));
+                case TypeAnnotation.TypeArgumentTarget p ->
+                    addNote(codeAttribute.labelToBci(p.target()), new Note(kind, anno));
+                default -> {}
             }
         }
     }
@@ -108,17 +114,16 @@ private void addNote(int pc, Note note) {
     }
 
     @Override
-    void writeDetails(Instruction instr) {
+    void writeDetails(int pc, Instruction instr) {
         String indent = space(2); // get from Options?
-        int pc = instr.getPC();
         List<Note> notes = pcMap.get(pc);
         if (notes != null) {
             for (Note n: notes) {
                 print(indent);
                 print("@");
-                annotationWriter.write(n.anno, false, true);
+                annotationWriter.write(n.anno, false, true, codeAttribute);
                 print(", ");
-                println(StringUtils.toLowerCase(n.kind.toString()));
+                println(n.kind.toString().toLowerCase(Locale.US));
             }
         }
     }
@@ -126,4 +131,5 @@ void writeDetails(Instruction instr) {
     private AnnotationWriter annotationWriter;
     private ClassWriter classWriter;
     private Map<Integer, List<Note>> pcMap;
+    private CodeAttribute codeAttribute;
 }
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index ce78e592180..4d53879d642 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -130,6 +130,7 @@ serviceability/sa/ClhsdbPmap.java#core 8267433 macosx-x64
 serviceability/sa/ClhsdbPstack.java#core 8267433 macosx-x64
 serviceability/sa/TestJmapCore.java 8267433 macosx-x64
 serviceability/sa/TestJmapCoreMetaspace.java 8267433 macosx-x64
+serviceability/sa/ClhsdbDumpclass.java 8316342 generic-all
 
 serviceability/attach/ConcAttachTest.java 8290043 linux-all
 
diff --git a/test/langtools/tools/javap/8260403/T8260403.java b/test/langtools/tools/javap/8260403/T8260403.java
index be13ea79572..84f7dcde602 100644
--- a/test/langtools/tools/javap/8260403/T8260403.java
+++ b/test/langtools/tools/javap/8260403/T8260403.java
@@ -30,13 +30,21 @@
  * @modules jdk.jdeps/com.sun.tools.javap
  */
 import java.io.PrintWriter;
+import java.io.StringWriter;
 
 public class T8260403 {
 
     public static void main(String args[]) throws Exception {
-        if (com.sun.tools.javap.Main.run(new String[]{"-c", System.getProperty("test.classes") + "/InvalidSignature.class"},
-                new PrintWriter(System.out)) != 0) {
-            throw new AssertionError();
-        }
+        var sw = new StringWriter();
+        int res = com.sun.tools.javap.Main.run(
+                new String[]{"-c", System.getProperty("test.classes") + "/InvalidSignature.class"},
+                new PrintWriter(sw));
+        System.out.println(sw);
+        if (res == 0)
+            throw new AssertionError("Failure exit code expected");
+        if (sw.toString().contains("Fatal error"))
+            throw new AssertionError("Unguarded fatal error");
+        if (sw.toString().contains("error while reading constant pool"))
+            throw new AssertionError("Unguarded constant pool error");
     }
 }
diff --git a/test/langtools/tools/javap/T6866657.java b/test/langtools/tools/javap/T6866657.java
index 4273b03fb72..c935d4747f8 100644
--- a/test/langtools/tools/javap/T6866657.java
+++ b/test/langtools/tools/javap/T6866657.java
@@ -60,7 +60,9 @@ void verify(String className) {
                 JavapTask t = new JavapTask(log, fileManager, null);
                 t.handleOptions(new String[] { "-sysinfo", className });
                 JavapTask.ClassFileInfo cfInfo = t.read(fo);
-                expectEqual(cfInfo.cf.byteLength(), cfInfo.size);
+                try (var in = fo.openInputStream()) {
+                    expectEqual(in.readAllBytes().length, cfInfo.size);
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/test/langtools/tools/javap/T7186925.java b/test/langtools/tools/javap/T7186925.java
index 8309ec0be26..2d4553526b1 100644
--- a/test/langtools/tools/javap/T7186925.java
+++ b/test/langtools/tools/javap/T7186925.java
@@ -56,7 +56,9 @@ void verify(String className) {
                 JavapTask t = new JavapTask(null, fileManager, null);
                 t.handleOptions(new String[] { "-sysinfo", className });
                 JavapTask.ClassFileInfo cfInfo = t.read(fo);
-                expectEqual(cfInfo.cf.byteLength(), cfInfo.size);
+                try (var in = fo.openInputStream()) {
+                    expectEqual(in.readAllBytes().length, cfInfo.size);
+                }
             }
         } catch (NullPointerException ee) {
             ee.printStackTrace();
diff --git a/test/langtools/tools/javap/malformed/Malformed.jcod b/test/langtools/tools/javap/malformed/Malformed.jcod
new file mode 100644
index 00000000000..df1baa6c80d
--- /dev/null
+++ b/test/langtools/tools/javap/malformed/Malformed.jcod
@@ -0,0 +1,54 @@
+class Malformed {
+  0xCAFEBABE;
+  0; // minor version
+  0; // version
+  [] { // Constant Pool
+    ; // first element is empty
+    Utf8 "Code"; // #1
+    Method #0 #0; // #2
+    class #0; // #3
+  } // Constant Pool
+
+  0x0000; // access
+  #0;// this_cpx
+  #3;// super_cpx
+
+  [] { // Interfaces
+    #0;
+    #3;
+  } // Interfaces
+
+  [] { // fields
+    { // Member
+      0x0000; // access
+      #0; // name_cpx
+      #0; // sig_cpx
+      [] { // Attributes
+      } // Attributes
+    } // Member
+  } // fields
+
+  [] { // methods
+    { // Member
+      0x0000; // access
+      #0; // name_cpx
+      #0; // sig_cpx
+      [] { // Attributes
+        Attr(#1) { // Code
+          0; // max_stack
+          0; // max_locals
+          Bytes[]{
+          }
+          [] { // Traps
+          } // end Traps
+          [] { // Attributes
+          } // Attributes
+        } // end Code
+      } // Attributes
+    } // Member
+  } // methods
+
+  [] { // Attributes
+  } // Attributes
+} // end class Malformed
+
diff --git a/test/langtools/tools/javap/malformed/MalformedTest.java b/test/langtools/tools/javap/malformed/MalformedTest.java
new file mode 100644
index 00000000000..ad7ba221211
--- /dev/null
+++ b/test/langtools/tools/javap/malformed/MalformedTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8294969
+ * @summary javap test safeguarding malformed class file
+ * @build Malformed
+ * @run main MalformedTest
+ * @modules jdk.jdeps/com.sun.tools.javap
+ */
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+public class MalformedTest {
+
+    public static void main(String args[]) throws Exception {
+        var sw = new StringWriter();
+        int res = com.sun.tools.javap.Main.run(
+                new String[]{"-c", "-v", System.getProperty("test.classes") + "/Malformed.class"},
+                new PrintWriter(sw));
+        System.out.println(sw);
+        if (res == 0)
+            throw new AssertionError("Failure exit code expected");
+        if (sw.toString().contains("Fatal error"))
+            throw new AssertionError("Unguarded fatal error");
+        if (sw.toString().contains("error while reading constant pool"))
+            throw new AssertionError("Unguarded constant pool error");
+    }
+}

From 3828dc913a3ea28d622b69bd07f26949128eb5f7 Mon Sep 17 00:00:00 2001
From: Nikita Sakharin <17588081+nikita-sakharin@users.noreply.github.com>
Date: Mon, 18 Sep 2023 09:20:11 +0000
Subject: [PATCH 058/112] 8314236: Overflow in Collections.rotate

Co-authored-by: Nikita Sakharin <17588081+nikita-sakharin@users.noreply.github.com>
Reviewed-by: shade, smarks
---
 .../share/classes/java/util/Collections.java  |  9 +-
 .../jdk/java/util/Collections/RotateHuge.java | 83 +++++++++++++++++++
 2 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 test/jdk/java/util/Collections/RotateHuge.java

diff --git a/src/java.base/share/classes/java/util/Collections.java b/src/java.base/share/classes/java/util/Collections.java
index f45d297f300..63949db2cc0 100644
--- a/src/java.base/share/classes/java/util/Collections.java
+++ b/src/java.base/share/classes/java/util/Collections.java
@@ -816,15 +816,16 @@ private static <T> void rotate1(List<T> list, int distance) {
         if (distance == 0)
             return;
 
-        for (int cycleStart = 0, nMoved = 0; nMoved != size; cycleStart++) {
+        int bound = size - distance;
+        for (int cycleStart = 0, nMoved = 0; nMoved < size; cycleStart++) {
             T displaced = list.get(cycleStart);
             int i = cycleStart;
             do {
-                i += distance;
-                if (i >= size)
+                if (i >= bound)
                     i -= size;
+                i += distance;
                 displaced = list.set(i, displaced);
-                nMoved ++;
+                nMoved++;
             } while (i != cycleStart);
         }
     }
diff --git a/test/jdk/java/util/Collections/RotateHuge.java b/test/jdk/java/util/Collections/RotateHuge.java
new file mode 100644
index 00000000000..44368aff266
--- /dev/null
+++ b/test/jdk/java/util/Collections/RotateHuge.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8314236
+ * @summary Overflow in Collections.rotate
+ */
+
+import java.util.AbstractList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.RandomAccess;
+
+public class RotateHuge {
+
+    private static final class MockList extends AbstractList<Object>
+            implements RandomAccess {
+        private final int size;
+
+        public MockList(final int size) {
+            if (size < 0)
+                throw new IllegalArgumentException("Illegal size: " + size);
+            this.size = size;
+        }
+
+        @Override
+        public Object get(final int index) {
+            Objects.checkIndex(index, size);
+            return null;
+        }
+
+        @Override
+        public Object set(final int index, final Object element) {
+            Objects.checkIndex(index, size);
+            return null;
+        }
+
+        @Override
+        public int size() {
+            return size;
+        }
+    }
+
+    public static void main(final String[] args) {
+        testRotate((1 << 30) + 1, -(1 << 30) - 2);
+        testRotate((1 << 30) + 1, 1 << 30);
+        testRotate(Integer.MAX_VALUE, Integer.MIN_VALUE);
+        testRotate(Integer.MAX_VALUE, Integer.MIN_VALUE + 3);
+        testRotate(Integer.MAX_VALUE, 2);
+        testRotate(Integer.MAX_VALUE, Integer.MAX_VALUE - 1);
+    }
+
+    /*
+     * This test covers only index computations.
+     * Correctness of elements rotation is not checked.
+     */
+    private static void testRotate(final int size, final int distance) {
+        final List<Object> list = new MockList(size);
+        Collections.rotate(list, distance);
+    }
+}

From ecce2afc1a99bc0be53097ef89d2726201da04bb Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 18 Sep 2023 11:36:42 +0000
Subject: [PATCH 059/112] 8316357: Serial: Remove unused
 GenCollectedHeap::space_containing

Reviewed-by: tschatzl
---
 src/hotspot/share/gc/shared/genCollectedHeap.cpp | 10 ----------
 src/hotspot/share/gc/shared/genCollectedHeap.hpp |  1 -
 src/hotspot/share/gc/shared/generation.cpp       |  7 -------
 src/hotspot/share/gc/shared/generation.hpp       |  4 ----
 4 files changed, 22 deletions(-)

diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp
index 341b1bb77bc..88feee798c7 100644
--- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp
@@ -842,16 +842,6 @@ void GenCollectedHeap::object_iterate(ObjectClosure* cl) {
   _old_gen->object_iterate(cl);
 }
 
-Space* GenCollectedHeap::space_containing(const void* addr) const {
-  Space* res = _young_gen->space_containing(addr);
-  if (res != nullptr) {
-    return res;
-  }
-  res = _old_gen->space_containing(addr);
-  assert(res != nullptr, "Could not find containing space");
-  return res;
-}
-
 HeapWord* GenCollectedHeap::block_start(const void* addr) const {
   assert(is_in_reserved(addr), "block_start of address outside of heap");
   if (_young_gen->is_in_reserved(addr)) {
diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.hpp b/src/hotspot/share/gc/shared/genCollectedHeap.hpp
index a725a936a2c..f1f3fcf4e08 100644
--- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp
@@ -197,7 +197,6 @@ class GenCollectedHeap : public CollectedHeap {
   // Iteration functions.
   void oop_iterate(OopIterateClosure* cl);
   void object_iterate(ObjectClosure* cl) override;
-  Space* space_containing(const void* addr) const;
 
   // A CollectedHeap is divided into a dense sequence of "blocks"; that is,
   // each address in the (reserved) heap is a member of exactly
diff --git a/src/hotspot/share/gc/shared/generation.cpp b/src/hotspot/share/gc/shared/generation.cpp
index b09b609e8d4..1da1d9cab46 100644
--- a/src/hotspot/share/gc/shared/generation.cpp
+++ b/src/hotspot/share/gc/shared/generation.cpp
@@ -172,13 +172,6 @@ oop Generation::promote(oop obj, size_t obj_size) {
   return new_obj;
 }
 
-Space* Generation::space_containing(const void* p) const {
-  GenerationIsInReservedClosure blk(p);
-  // Cast away const
-  ((Generation*)this)->space_iterate(&blk);
-  return blk.sp;
-}
-
 // Some of these are mediocre general implementations.  Should be
 // overridden to get better performance.
 
diff --git a/src/hotspot/share/gc/shared/generation.hpp b/src/hotspot/share/gc/shared/generation.hpp
index 6af578e4ab2..eb8b5a19f33 100644
--- a/src/hotspot/share/gc/shared/generation.hpp
+++ b/src/hotspot/share/gc/shared/generation.hpp
@@ -176,10 +176,6 @@ class Generation: public CHeapObj<mtGC> {
     return _reserved.contains(p);
   }
 
-  // If some space in the generation contains the given "addr", return a
-  // pointer to that space, else return "null".
-  virtual Space* space_containing(const void* addr) const;
-
   // Iteration - do not use for time critical operations
   virtual void space_iterate(SpaceClosure* blk, bool usedOnly = false) = 0;
 

From 21c2dac15957e6d71e8f32a55f3825671da097a9 Mon Sep 17 00:00:00 2001
From: Joachim Kern <jkern@openjdk.org>
Date: Mon, 18 Sep 2023 11:57:48 +0000
Subject: [PATCH 060/112] 8315706:
 com/sun/tools/attach/warnings/DynamicLoadWarningTest.java real fix for
 failure on AIX

Reviewed-by: dholmes, mbaesken
---
 src/hotspot/os/aix/os_aix.cpp                 | 29 +++++++++++++
 src/hotspot/os/aix/os_aix.hpp                 |  5 ++-
 src/hotspot/share/prims/jvmtiAgent.cpp        | 43 +++++++++++++++++++
 src/hotspot/share/prims/jvmtiAgent.hpp        | 10 +++++
 src/hotspot/share/prims/jvmtiAgentList.cpp    | 13 ++++++
 src/hotspot/share/prims/jvmtiAgentList.hpp    |  3 ++
 .../warnings/DynamicLoadWarningTest.java      | 21 ++++-----
 7 files changed, 111 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 641a1652bbd..c0253debdae 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -3043,3 +3043,32 @@ void os::print_memory_mappings(char* addr, size_t bytes, outputStream* st) {}
 void os::jfr_report_memory_info() {}
 
 #endif // INCLUDE_JFR
+
+// Simulate the library search algorithm of dlopen() (in os::dll_load)
+int os::Aix::stat64x_via_LIBPATH(const char* path, struct stat64x* stat) {
+  if (path[0] == '/' ||
+      (path[0] == '.' && (path[1] == '/' ||
+                          (path[1] == '.' && path[2] == '/')))) {
+    return stat64x(path, stat);
+  }
+
+  const char* env = getenv("LIBPATH");
+  if (env == nullptr || *env == 0)
+    return -1;
+
+  int ret = -1;
+  size_t libpathlen = strlen(env);
+  char* libpath = NEW_C_HEAP_ARRAY(char, libpathlen + 1, mtServiceability);
+  char* combined = NEW_C_HEAP_ARRAY(char, libpathlen + strlen(path) + 1, mtServiceability);
+  char *saveptr, *token;
+  strcpy(libpath, env);
+  for (token = strtok_r(libpath, ":", &saveptr); token != nullptr; token = strtok_r(nullptr, ":", &saveptr)) {
+    sprintf(combined, "%s/%s", token, path);
+    if (0 == (ret = stat64x(combined, stat)))
+      break;
+  }
+
+  FREE_C_HEAP_ARRAY(char*, combined);
+  FREE_C_HEAP_ARRAY(char*, libpath);
+  return ret;
+}
diff --git a/src/hotspot/os/aix/os_aix.hpp b/src/hotspot/os/aix/os_aix.hpp
index 9756734efd2..f2596874b05 100644
--- a/src/hotspot/os/aix/os_aix.hpp
+++ b/src/hotspot/os/aix/os_aix.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013, 2016 SAP SE. All rights reserved.
+ * Copyright (c) 2013, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -174,6 +174,9 @@ class os::Aix {
 
   static bool platform_print_native_stack(outputStream* st, const void* context, char *buf, int buf_size, address& lastpc);
   static void* resolve_function_descriptor(void* p);
+
+  // Simulate the library search algorithm of dlopen() (in os::dll_load)
+  static int stat64x_via_LIBPATH(const char* path, struct stat64x* stat);
 };
 
 #endif // OS_AIX_OS_AIX_HPP
diff --git a/src/hotspot/share/prims/jvmtiAgent.cpp b/src/hotspot/share/prims/jvmtiAgent.cpp
index f70935982b5..86c5a32a1df 100644
--- a/src/hotspot/share/prims/jvmtiAgent.cpp
+++ b/src/hotspot/share/prims/jvmtiAgent.cpp
@@ -74,6 +74,10 @@ JvmtiAgent::JvmtiAgent(const char* name, const char* options, bool is_absolute_p
   _options(copy_string(options)),
   _os_lib(nullptr),
   _os_lib_path(nullptr),
+#ifdef AIX
+  _inode(0),
+  _device(0),
+#endif
   _jplis(nullptr),
   _loaded(false),
   _absolute_path(is_absolute_path),
@@ -118,6 +122,24 @@ const char* JvmtiAgent::os_lib_path() const {
   return _os_lib_path;
 }
 
+#ifdef AIX
+void JvmtiAgent::set_inode(ino64_t inode) {
+  _inode = inode;
+}
+
+void JvmtiAgent::set_device(dev64_t device) {
+  _device = device;
+}
+
+ino64_t JvmtiAgent::inode() const {
+  return _inode;
+}
+
+dev64_t JvmtiAgent::device() const {
+  return _device;
+}
+#endif
+
 bool JvmtiAgent::is_loaded() const {
   return _loaded;
 }
@@ -272,6 +294,20 @@ static bool load_agent_from_executable(JvmtiAgent* agent, const char* on_load_sy
   return os::find_builtin_agent(agent, &on_load_symbols[0], num_symbol_entries);
 }
 
+#ifdef AIX
+// save the inode and device of the library's file as a signature. This signature can be used
+// in the same way as the library handle as a signature on other platforms.
+static void save_library_signature(JvmtiAgent* agent, const char* name) {
+  struct stat64x libstat;
+  if (0 == os::Aix::stat64x_via_LIBPATH(name, &libstat)) {
+    agent->set_inode(libstat.st_ino);
+    agent->set_device(libstat.st_dev);
+  } else {
+    assert(false, "stat64x failed");
+  }
+}
+#endif
+
 // Load the library from the absolute path of the agent, if available.
 static void* load_agent_from_absolute_path(JvmtiAgent* agent, bool vm_exit_on_error) {
   DEBUG_ONLY(assert_preload(agent);)
@@ -281,6 +317,7 @@ static void* load_agent_from_absolute_path(JvmtiAgent* agent, bool vm_exit_on_er
   if (library == nullptr && vm_exit_on_error) {
     vm_exit(agent, " in absolute path, with error: ", nullptr);
   }
+  AIX_ONLY(if (library != nullptr) save_library_signature(agent, agent->name());)
   return library;
 }
 
@@ -293,11 +330,13 @@ static void* load_agent_from_relative_path(JvmtiAgent* agent, bool vm_exit_on_er
   // Try to load the agent from the standard dll directory
   if (os::dll_locate_lib(&buffer[0], sizeof buffer, Arguments::get_dll_dir(), name)) {
     library = os::dll_load(&buffer[0], &ebuf[0], sizeof ebuf);
+    AIX_ONLY(if (library != nullptr) save_library_signature(agent, &buffer[0]);)
   }
   if (library == nullptr && os::dll_build_name(&buffer[0], sizeof buffer, name)) {
     // Try the library path directory.
     library = os::dll_load(&buffer[0], &ebuf[0], sizeof ebuf);
     if (library != nullptr) {
+      AIX_ONLY(save_library_signature(agent, &buffer[0]);)
       return library;
     }
     if (vm_exit_on_error) {
@@ -515,7 +554,11 @@ static bool invoke_Agent_OnAttach(JvmtiAgent* agent, outputStream* st) {
     agent->set_os_lib_path(&buffer[0]);
     agent->set_os_lib(library);
     agent->set_loaded();
+  #ifdef AIX
+    previously_loaded = JvmtiAgentList::is_dynamic_lib_loaded(agent->device(), agent->inode());
+  #else
     previously_loaded = JvmtiAgentList::is_dynamic_lib_loaded(library);
+  #endif
   }
 
   // Print warning if agent was not previously loaded and EnableDynamicAgentLoading not enabled on the command line.
diff --git a/src/hotspot/share/prims/jvmtiAgent.hpp b/src/hotspot/share/prims/jvmtiAgent.hpp
index 9baf6698868..95e910354e6 100644
--- a/src/hotspot/share/prims/jvmtiAgent.hpp
+++ b/src/hotspot/share/prims/jvmtiAgent.hpp
@@ -43,6 +43,10 @@ class JvmtiAgent : public CHeapObj<mtServiceability> {
   const char* _options;
   void* _os_lib;
   const char* _os_lib_path;
+#ifdef AIX
+  ino64_t _inode;
+  dev64_t _device;
+#endif
   const void* _jplis;
   bool _loaded;
   bool _absolute_path;
@@ -80,6 +84,12 @@ class JvmtiAgent : public CHeapObj<mtServiceability> {
   void initialization_end();
   const Ticks& initialization_time() const;
   const Tickspan& initialization_duration() const;
+#ifdef AIX
+  void set_inode(ino64_t inode);
+  void set_device(dev64_t device);
+  unsigned long inode() const;
+  unsigned long device() const;
+#endif
 
   bool load(outputStream* st = nullptr);
   void unload();
diff --git a/src/hotspot/share/prims/jvmtiAgentList.cpp b/src/hotspot/share/prims/jvmtiAgentList.cpp
index a32eeb7076c..b7312b9b75e 100644
--- a/src/hotspot/share/prims/jvmtiAgentList.cpp
+++ b/src/hotspot/share/prims/jvmtiAgentList.cpp
@@ -243,6 +243,19 @@ bool JvmtiAgentList::is_dynamic_lib_loaded(void* os_lib) {
   }
   return false;
 }
+#ifdef AIX
+bool JvmtiAgentList::is_dynamic_lib_loaded(dev64_t device, ino64_t inode) {
+  JvmtiAgentList::Iterator it = JvmtiAgentList::agents();
+  while (it.has_next()) {
+    JvmtiAgent* const agent = it.next();
+    if (!agent->is_static_lib() && device != 0 && inode != 0 &&
+        agent->device() == device && agent->inode() == inode) {
+      return true;
+    }
+  }
+  return false;
+}
+#endif
 
 static bool match(JvmtiEnv* env, const JvmtiAgent* agent, const void* os_module_address) {
   assert(env != nullptr, "invariant");
diff --git a/src/hotspot/share/prims/jvmtiAgentList.hpp b/src/hotspot/share/prims/jvmtiAgentList.hpp
index cf698c69c01..95dad006ec3 100644
--- a/src/hotspot/share/prims/jvmtiAgentList.hpp
+++ b/src/hotspot/share/prims/jvmtiAgentList.hpp
@@ -78,6 +78,9 @@ class JvmtiAgentList : AllStatic {
 
   static bool is_static_lib_loaded(const char* name);
   static bool is_dynamic_lib_loaded(void* os_lib);
+#ifdef AIX
+  static bool is_dynamic_lib_loaded(dev64_t device, ino64_t inode);
+#endif
 
   static JvmtiAgent* lookup(JvmtiEnv* env, void* f_ptr);
 
diff --git a/test/jdk/com/sun/tools/attach/warnings/DynamicLoadWarningTest.java b/test/jdk/com/sun/tools/attach/warnings/DynamicLoadWarningTest.java
index dab4d9ac0ce..c78bb081b9b 100644
--- a/test/jdk/com/sun/tools/attach/warnings/DynamicLoadWarningTest.java
+++ b/test/jdk/com/sun/tools/attach/warnings/DynamicLoadWarningTest.java
@@ -123,18 +123,15 @@ void testLoadOneJvmtiAgent(OnAttachAction loadJvmtiAgent1) throws Exception {
                 .whenRunning(loadJvmtiAgent1)
                 .stderrShouldNotContain(JVMTI_AGENT_WARNING);
 
-        // test behavior on platforms that can detect if an agent library was previously loaded
-        if (!Platform.isAix()) {
-            // start loadJvmtiAgent1 via the command line, then dynamically load loadJvmtiAgent1
-            test().withOpts("-agentpath:" + jvmtiAgentPath1)
-                    .whenRunning(loadJvmtiAgent1)
-                    .stderrShouldNotContain(JVMTI_AGENT_WARNING);
-
-            // dynamically load loadJvmtiAgent1 twice, should be one warning
-            test().whenRunning(loadJvmtiAgent1)
-                    .whenRunning(loadJvmtiAgent1)
-                    .stderrShouldContain(JVMTI_AGENT_WARNING, 1);
-        }
+        // start loadJvmtiAgent1 via the command line, then dynamically load loadJvmtiAgent1
+        test().withOpts("-agentpath:" + jvmtiAgentPath1)
+                .whenRunning(loadJvmtiAgent1)
+                .stderrShouldNotContain(JVMTI_AGENT_WARNING);
+
+        // dynamically load loadJvmtiAgent1 twice, should be one warning
+        test().whenRunning(loadJvmtiAgent1)
+                .whenRunning(loadJvmtiAgent1)
+                .stderrShouldContain(JVMTI_AGENT_WARNING, 1);
     }
 
     /**

From bf9d1e2071d54df1abaead43665f8652fe0acfb5 Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Mon, 18 Sep 2023 12:31:14 +0000
Subject: [PATCH 061/112] 8316399: Exclude
 java/net/MulticastSocket/Promiscuous.java on AIX

Reviewed-by: alanb
---
 test/jdk/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index a65c872fa9b..0c6b18593f2 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -544,6 +544,7 @@ java/net/MulticastSocket/JoinLeave.java                         8308807 aix-ppc6
 java/net/MulticastSocket/MulticastAddresses.java                8308807 aix-ppc64
 java/net/MulticastSocket/NoLoopbackPackets.java                 7122846,8308807 macosx-all,aix-ppc64
 java/net/MulticastSocket/NoSetNetworkInterface.java             8308807 aix-ppc64
+java/net/MulticastSocket/Promiscuous.java                       8308807 aix-ppc64
 java/net/MulticastSocket/SetGetNetworkInterfaceTest.java        8308807 aix-ppc64
 java/net/MulticastSocket/SetLoopbackMode.java                   7122846,8308807 macosx-all,aix-ppc64
 java/net/MulticastSocket/SetOutgoingIf.java                     8308807 aix-ppc64

From 2e2d49c76d7bb43a431b5c4f2552beef8798258b Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Mon, 18 Sep 2023 12:31:36 +0000
Subject: [PATCH 062/112] 8316400: Exclude
 jdk/jfr/event/runtime/TestResidentSetSizeEvent.java on AIX

Reviewed-by: mbaesken
---
 test/jdk/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 0c6b18593f2..4d0ae5ed38b 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -748,6 +748,7 @@ jdk/incubator/vector/LoadJsvmlTest.java                         8305390 windows-
 # jdk_jfr
 
 jdk/jfr/event/compiler/TestCodeSweeper.java                     8225209 generic-all
+jdk/jfr/event/runtime/TestResidentSetSizeEvent.java             8309846 aix-ppc64
 jdk/jfr/startupargs/TestStartName.java                          8214685 windows-x64
 jdk/jfr/startupargs/TestStartDuration.java                      8214685 windows-x64
 jdk/jfr/jvm/TestWaste.java                                      8282427 generic-all

From f09b7af6851c725b0fc4d63832b52e17c4d24836 Mon Sep 17 00:00:00 2001
From: "shaojin.wensj" <shaojin.wensj@alibaba-inc.com>
Date: Mon, 18 Sep 2023 17:04:50 +0000
Subject: [PATCH 063/112] 8311220: Optimization for StringLatin UpperLower

Reviewed-by: redestad, liach
---
 .../share/classes/java/lang/StringLatin1.java | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/StringLatin1.java b/src/java.base/share/classes/java/lang/StringLatin1.java
index b39b8aa7262..102f4c5f476 100644
--- a/src/java.base/share/classes/java/lang/StringLatin1.java
+++ b/src/java.base/share/classes/java/lang/StringLatin1.java
@@ -531,10 +531,9 @@ public static String toLowerCase(String str, byte[] value, Locale locale) {
         }
         int first;
         final int len = value.length;
-        // Now check if there are any characters that need to be changed, or are surrogate
+        // Now check if there are any characters that need to be changed
         for (first = 0 ; first < len; first++) {
-            int cp = value[first] & 0xff;
-            if (cp != CharacterDataLatin1.instance.toLowerCase(cp)) {  // no need to check Character.ERROR
+            if (CharacterDataLatin1.instance.isUpperCase(value[first] & 0xff)) {
                 break;
             }
         }
@@ -548,12 +547,7 @@ public static String toLowerCase(String str, byte[] value, Locale locale) {
         System.arraycopy(value, 0, result, 0, first);  // Just copy the first few
                                                        // lowerCase characters.
         for (int i = first; i < len; i++) {
-            int cp = value[i] & 0xff;
-            cp = CharacterDataLatin1.instance.toLowerCase(cp);
-            if (!canEncode(cp)) {                      // not a latin1 character
-                return toLowerCaseEx(str, value, first, locale, false);
-            }
-            result[i] = (byte)cp;
+            result[i] = (byte)CharacterDataLatin1.instance.toLowerCase(value[i] & 0xff);
         }
         return new String(result, LATIN1);
     }
@@ -605,10 +599,11 @@ public static String toUpperCase(String str, byte[] value, Locale locale) {
         int first;
         final int len = value.length;
 
-        // Now check if there are any characters that need to be changed, or are surrogate
+        // Now check if there are any characters that need to be changed
         for (first = 0 ; first < len; first++ ) {
             int cp = value[first] & 0xff;
-            if (cp != CharacterDataLatin1.instance.toUpperCaseEx(cp)) {   // no need to check Character.ERROR
+            boolean notUpperCaseEx = cp >= 'a' && (cp <= 'z' || cp == 0xb5 || (cp >= 0xdf && cp != 0xf7));
+            if (notUpperCaseEx) {
                 break;
             }
         }
@@ -623,8 +618,7 @@ public static String toUpperCase(String str, byte[] value, Locale locale) {
         System.arraycopy(value, 0, result, 0, first);  // Just copy the first few
                                                        // upperCase characters.
         for (int i = first; i < len; i++) {
-            int cp = value[i] & 0xff;
-            cp = CharacterDataLatin1.instance.toUpperCaseEx(cp);
+            int cp = CharacterDataLatin1.instance.toUpperCaseEx(value[i] & 0xff);
             if (!canEncode(cp)) {                      // not a latin1 character
                 return toUpperCaseEx(str, value, first, locale, false);
             }

From 4421951d8f1c6fb16255851a803252fe96a453e5 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 18 Sep 2023 18:29:33 +0000
Subject: [PATCH 064/112] 8316142: Enable parallelism in
 vmTestbase/nsk/monitoring/stress/lowmem tests

Reviewed-by: lmesnik, cjplummer
---
 .../stress/lowmem/lowmem001/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem002/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem003/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem004/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem005/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem006/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem007/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem008/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem009/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem010/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem011/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem012/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem013/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem014/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem015/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem016/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem017/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem018/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem019/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem020/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem021/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem022/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem023/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem024/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem025/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem026/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem027/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem028/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem029/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem030/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem031/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem032/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem033/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem034/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem035/TEST.properties   | 23 -------------------
 .../stress/lowmem/lowmem036/TEST.properties   | 23 -------------------
 36 files changed, 828 deletions(-)
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem001/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem002/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem003/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem004/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem005/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem006/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem007/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem008/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem009/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem010/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem011/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem012/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem013/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem014/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem015/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem016/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem017/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem018/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem019/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem020/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem021/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem022/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem023/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem024/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem025/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem026/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem027/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem028/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem029/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem030/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem031/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem032/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem033/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem034/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem035/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem036/TEST.properties

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem001/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem001/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem001/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem002/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem002/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem002/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem003/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem003/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem003/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem004/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem004/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem004/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem005/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem005/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem005/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem006/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem006/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem006/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem007/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem007/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem007/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem008/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem008/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem008/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem009/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem009/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem009/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem010/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem010/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem010/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem011/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem011/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem011/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem012/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem012/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem012/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem013/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem013/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem013/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem014/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem014/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem014/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem015/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem015/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem015/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem016/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem016/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem016/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem017/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem017/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem017/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem018/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem018/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem018/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem019/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem019/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem019/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem020/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem020/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem020/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem021/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem021/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem021/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem022/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem022/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem022/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem023/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem023/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem023/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem024/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem024/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem024/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem025/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem025/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem025/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem026/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem026/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem026/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem027/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem027/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem027/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem028/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem028/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem028/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem029/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem029/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem029/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem030/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem030/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem030/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem031/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem031/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem031/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem032/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem032/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem032/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem033/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem033/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem033/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem034/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem034/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem034/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem035/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem035/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem035/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem036/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem036/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem036/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-exclusiveAccess.dirs=.

From 1b104b63a97ec947b34b85658153ab6c182cb56c Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Mon, 18 Sep 2023 20:12:38 +0000
Subject: [PATCH 065/112] 8314909: tools/jpackage/windows/Win8282351Test.java
 fails with java.lang.AssertionError: Expected [0]. Actual [1618]:

Reviewed-by: almatvee
---
 test/jdk/tools/jpackage/TEST.properties | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/jdk/tools/jpackage/TEST.properties b/test/jdk/tools/jpackage/TEST.properties
index db9d15e9e78..ab013166faa 100644
--- a/test/jdk/tools/jpackage/TEST.properties
+++ b/test/jdk/tools/jpackage/TEST.properties
@@ -1,3 +1,12 @@
 keys=jpackagePlatformPackage
 requires.properties=jpackage.test.SQETest
 maxOutputSize=2000000
+
+# Run jpackage tests on windows platform sequentially.
+# Having "share" directory in the list affects tests on other platforms.
+# The better option would be:
+#   if (platfrom == windowws) {
+#     exclusiveAccess.dirs=share windows
+#   }
+# but conditionals are not supported by jtreg configuration files.
+exclusiveAccess.dirs=share windows

From dcea9bf087c87548d9caa899c52e95d17478da22 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Mon, 18 Sep 2023 20:19:36 +0000
Subject: [PATCH 066/112] 8301247: JPackage app-image exe launches multiple
 exe's in JDK 17+

Reviewed-by: almatvee
---
 .../native/applauncher/WinLauncher.cpp        |  41 ++---
 .../{msiwrapper => common}/Executor.cpp       |  51 +++++-
 .../native/{msiwrapper => common}/Executor.h  |  31 +++-
 .../jpackage/windows/Win8301247Test.java      | 152 ++++++++++++++++++
 4 files changed, 246 insertions(+), 29 deletions(-)
 rename src/jdk.jpackage/windows/native/{msiwrapper => common}/Executor.cpp (71%)
 rename src/jdk.jpackage/windows/native/{msiwrapper => common}/Executor.h (76%)
 create mode 100644 test/jdk/tools/jpackage/windows/Win8301247Test.java

diff --git a/src/jdk.jpackage/windows/native/applauncher/WinLauncher.cpp b/src/jdk.jpackage/windows/native/applauncher/WinLauncher.cpp
index b81dc27d278..407cf00693b 100644
--- a/src/jdk.jpackage/windows/native/applauncher/WinLauncher.cpp
+++ b/src/jdk.jpackage/windows/native/applauncher/WinLauncher.cpp
@@ -34,6 +34,7 @@
 #include "Dll.h"
 #include "WinApp.h"
 #include "Toolbox.h"
+#include "Executor.h"
 #include "FileUtils.h"
 #include "PackageFile.h"
 #include "UniqueHandle.h"
@@ -180,29 +181,29 @@ void launchApp() {
 
         jvm = std::unique_ptr<Jvm>();
 
-        STARTUPINFOW si;
-        ZeroMemory(&si, sizeof(si));
-        si.cb = sizeof(si);
-
-        PROCESS_INFORMATION pi;
-        ZeroMemory(&pi, sizeof(pi));
-
-        if (!CreateProcessW(launcherPath.c_str(), GetCommandLineW(),
-                NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) {
-            JP_THROW(SysError(tstrings::any() << "CreateProcessW() failed",
-                                                            CreateProcessW));
+        UniqueHandle jobHandle(CreateJobObject(NULL, NULL));
+        if (jobHandle.get() == NULL) {
+            JP_THROW(SysError(tstrings::any() << "CreateJobObject() failed",
+                                                            CreateJobObject));
+        }
+        JOBOBJECT_EXTENDED_LIMIT_INFORMATION jobInfo = { };
+        jobInfo.BasicLimitInformation.LimitFlags =
+                                          JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
+        if (!SetInformationJobObject(jobHandle.get(),
+                JobObjectExtendedLimitInformation, &jobInfo, sizeof(jobInfo))) {
+            JP_THROW(SysError(tstrings::any() <<
+                                            "SetInformationJobObject() failed",
+                                                    SetInformationJobObject));
         }
 
-        WaitForSingleObject(pi.hProcess, INFINITE);
-
-        UniqueHandle childProcessHandle(pi.hProcess);
-        UniqueHandle childThreadHandle(pi.hThread);
+        Executor exec(launcherPath);
+        exec.visible(true).withJobObject(jobHandle.get()).suspended(true).inherit(true);
+        const auto args = SysInfo::getCommandArgs();
+        std::for_each(args.begin(), args.end(), [&exec] (const tstring& arg) {
+            exec.arg(arg);
+        });
 
-        DWORD exitCode;
-        if (!GetExitCodeProcess(pi.hProcess, &exitCode)) {
-            JP_THROW(SysError(tstrings::any() << "GetExitCodeProcess() failed",
-                                                        GetExitCodeProcess));
-        }
+        DWORD exitCode = static_cast<DWORD>(exec.execAndWaitForExit());
 
         exit(exitCode);
         return;
diff --git a/src/jdk.jpackage/windows/native/msiwrapper/Executor.cpp b/src/jdk.jpackage/windows/native/common/Executor.cpp
similarity index 71%
rename from src/jdk.jpackage/windows/native/msiwrapper/Executor.cpp
rename to src/jdk.jpackage/windows/native/common/Executor.cpp
index 5535d81b482..edb850afdbb 100644
--- a/src/jdk.jpackage/windows/native/msiwrapper/Executor.cpp
+++ b/src/jdk.jpackage/windows/native/common/Executor.cpp
@@ -60,7 +60,15 @@ std::wstring Executor::args() const {
 
 
 int Executor::execAndWaitForExit() const {
-    UniqueHandle h = startProcess();
+    UniqueHandle threadHandle;
+    UniqueHandle h = startProcess(&threadHandle);
+
+    if (theSuspended) {
+        LOG_TRACE(tstrings::any() << "ResumeThread()");
+        if (((DWORD)-1) == ResumeThread(threadHandle.get())) {
+            JP_THROW(SysError("ResumeThread() failed", ResumeThread));
+        }
+    }
 
     const DWORD res = ::WaitForSingleObject(h.get(), INFINITE);
     if (WAIT_FAILED ==  res) {
@@ -85,7 +93,7 @@ int Executor::execAndWaitForExit() const {
 }
 
 
-UniqueHandle Executor::startProcess() const {
+UniqueHandle Executor::startProcess(UniqueHandle* threadHandle) const {
     const std::wstring argsStr = args();
 
     std::vector<TCHAR> argsBuffer(argsStr.begin(), argsStr.end());
@@ -100,6 +108,10 @@ UniqueHandle Executor::startProcess() const {
 
     DWORD creationFlags = 0;
 
+    if (theSuspended) {
+        creationFlags |= CREATE_SUSPENDED;
+    }
+
     if (!theVisible) {
         // For GUI applications.
         startupInfo.dwFlags |= STARTF_USESHOWWINDOW;
@@ -110,10 +122,21 @@ UniqueHandle Executor::startProcess() const {
     }
 
     tstrings::any msg;
-    msg << "CreateProcess(" << appPath << ", " << argsStr << ")";
+    msg << "CreateProcess";
+    if (theSuspended) {
+        msg << "[suspended]";
+    }
+    if (theVisible) {
+        msg << "[visible]";
+    }
+    if (theInherit) {
+        msg << "[inherit]";
+    }
+    msg << "(" << appPath << ", " << argsStr << ")";
 
-    if (!CreateProcess(appPath.c_str(), argsBuffer.data(), NULL, NULL, FALSE,
-                    creationFlags, NULL, NULL, &startupInfo, &processInfo)) {
+    if (!CreateProcess(appPath.c_str(), argsBuffer.data(), NULL, NULL,
+                      theInherit ? TRUE : FALSE, creationFlags, NULL, NULL,
+                      &startupInfo, &processInfo)) {
         msg << " failed";
         JP_THROW(SysError(msg, CreateProcess));
     }
@@ -121,8 +144,22 @@ UniqueHandle Executor::startProcess() const {
     msg << " succeeded; PID=" << processInfo.dwProcessId;
     LOG_TRACE(msg);
 
-    // Close unneeded handles immediately.
-    UniqueHandle(processInfo.hThread);
+    if (threadHandle) {
+        *threadHandle = UniqueHandle(processInfo.hThread);
+    } else {
+        // Close unneeded handle immediately.
+        UniqueHandle(processInfo.hThread);
+    }
+
+    if (jobHandle != NULL) {
+        LOG_TRACE(tstrings::any() << "AssignProcessToJobObject(PID="
+                << processInfo.dwProcessId << ")");
+        if (!AssignProcessToJobObject(jobHandle, processInfo.hProcess)) {
+            JP_THROW(SysError(tstrings::any() <<
+                    "AssignProcessToJobObject() failed",
+                    AssignProcessToJobObject));
+        }
+    }
 
     // Return process handle.
     return UniqueHandle(processInfo.hProcess);
diff --git a/src/jdk.jpackage/windows/native/msiwrapper/Executor.h b/src/jdk.jpackage/windows/native/common/Executor.h
similarity index 76%
rename from src/jdk.jpackage/windows/native/msiwrapper/Executor.h
rename to src/jdk.jpackage/windows/native/common/Executor.h
index 72f33db57b5..a6edcbd4f76 100644
--- a/src/jdk.jpackage/windows/native/msiwrapper/Executor.h
+++ b/src/jdk.jpackage/windows/native/common/Executor.h
@@ -33,7 +33,7 @@
 class Executor {
 public:
     explicit Executor(const std::wstring& appPath=std::wstring()) {
-        app(appPath).visible(false);
+        app(appPath).visible(false).suspended(false).withJobObject(NULL).inherit(false);
     }
 
     /**
@@ -65,6 +65,30 @@ class Executor {
         return *this;
     }
 
+    /**
+     * Controls if the process should inherit handles.
+     */
+    Executor& inherit(bool v) {
+        theInherit = v;
+        return *this;
+    }
+
+    /**
+     * Controls if the process should be started suspended.
+     */
+    Executor& suspended(bool v) {
+        theSuspended = v;
+        return *this;
+    }
+
+    /**
+     * Use the given job object with started process.
+     */
+    Executor& withJobObject(HANDLE v) {
+        jobHandle = v;
+        return *this;
+    }
+
     /**
      * Starts application process and blocks waiting when the started
      * process terminates.
@@ -74,9 +98,12 @@ class Executor {
     int execAndWaitForExit() const;
 
 private:
-    UniqueHandle startProcess() const;
+    UniqueHandle startProcess(UniqueHandle* threadHandle=0) const;
 
     bool theVisible;
+    bool theInherit;
+    bool theSuspended;
+    HANDLE jobHandle;
     tstring_array argsArray;
     std::wstring appPath;
 };
diff --git a/test/jdk/tools/jpackage/windows/Win8301247Test.java b/test/jdk/tools/jpackage/windows/Win8301247Test.java
new file mode 100644
index 00000000000..67163ee5c60
--- /dev/null
+++ b/test/jdk/tools/jpackage/windows/Win8301247Test.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.Executor;
+import jdk.jpackage.test.HelloApp;
+import jdk.jpackage.test.TKit;
+
+/**
+ * Test that terminating of the parent app launcher process automatically
+ * terminates child app launcher process.
+ */
+
+/*
+ * @test
+ * @summary Test case for JDK-8301247
+ * @library ../helpers
+ * @build jdk.jpackage.test.*
+ * @build Win8301247Test
+ * @requires (os.family == "windows")
+ * @modules jdk.jpackage/jdk.jpackage.internal
+ * @run main/othervm/timeout=360 -Xmx512m  jdk.jpackage.test.Main
+ *  --jpt-run=Win8301247Test
+ */
+public class Win8301247Test {
+
+    @Test
+    public void test() throws IOException, InterruptedException {
+        JPackageCommand cmd = JPackageCommand.helloAppImage();
+
+        // Launch the app in a way it doesn't exit to let us trap app laucnher
+        // processes in the process list
+        cmd.addArguments("--java-options", "-Djpackage.test.noexit=true");
+        cmd.executeAndAssertImageCreated();
+
+        if (!cmd.canRunLauncher("Not running the test")) {
+            return;
+        }
+
+        try ( // Launch the app in a separate thread
+                ExecutorService exec = Executors.newSingleThreadExecutor()) {
+            exec.execute(() -> {
+                HelloApp.executeLauncher(cmd);
+            });
+
+            // Wait a bit to let the app start
+            Thread.sleep(Duration.ofSeconds(10));
+
+            // Get PID of the main app launcher process
+            final long pid = findMainAppLauncherPID(cmd, 2).get();
+
+            // Kill the main app launcher process
+            Executor.of("taskkill", "/F", "/PID", Long.toString(pid)).
+                    dumpOutput(true).execute();
+
+            // Wait a bit and check if child app launcher process is still running (it must NOT)
+            Thread.sleep(Duration.ofSeconds(5));
+
+            findMainAppLauncherPID(cmd, 0);
+        }
+    }
+
+    private static Optional<Long> findMainAppLauncherPID(JPackageCommand cmd,
+            int expectedCount) {
+        // Get the list of PIDs and PPIDs of app launcher processes.
+        // wmic process where (name = "foo.exe") get ProcessID,ParentProcessID
+        List<String> output = Executor.of("wmic", "process", "where", "(name",
+                "=",
+                "\"" + cmd.appLauncherPath().getFileName().toString() + "\"",
+                ")", "get", "ProcessID,ParentProcessID").dumpOutput(true).
+                saveOutput().executeAndGetOutput();
+
+        if (expectedCount == 0) {
+            TKit.assertEquals("No Instance(s) Available.", output.getFirst().
+                    trim(), "Check no app launcher processes found running");
+            return Optional.empty();
+        }
+
+        String[] headers = Stream.of(output.getFirst().split("\\s+", 2)).map(
+                String::trim).map(String::toLowerCase).toArray(String[]::new);
+        Pattern pattern;
+        if (headers[0].equals("parentprocessid") && headers[1].equals(
+                "processid")) {
+            pattern = Pattern.compile("^(?<ppid>\\d+)\\s+(?<pid>\\d+)\\s+$");
+        } else if (headers[1].equals("parentprocessid") && headers[0].equals(
+                "processid")) {
+            pattern = Pattern.compile("^(?<pid>\\d+)\\s+(?<ppid>\\d+)\\s+$");
+        } else {
+            throw new RuntimeException(
+                    "Unrecognizable output of \'wmic process\' command");
+        }
+
+        List<long[]> processes = output.stream().skip(1).map(line -> {
+            Matcher m = pattern.matcher(line);
+            long[] pids = null;
+            if (m.matches()) {
+                pids = new long[]{Long.parseLong(m.group("pid")), Long.
+                    parseLong(m.group("ppid"))};
+            }
+            return pids;
+        }).filter(Objects::nonNull).toList();
+
+        TKit.assertEquals(expectedCount, processes.size(), String.format(
+                "Check [%d] app launcher processes found running", expectedCount));
+
+        switch (expectedCount) {
+            case 2 -> {
+                if (processes.get(0)[0] == processes.get(1)[1]) {
+                    return Optional.of(processes.get(0)[0]);
+                } else if (processes.get(1)[0] == processes.get(0)[1]) {
+                    return Optional.of(processes.get(1)[0]);
+                } else {
+                    throw new RuntimeException(
+                            "App launcher processes unrelated");
+                }
+            }
+            default ->
+                throw new IllegalArgumentException();
+        }
+    }
+}

From 5308bbbcf8005560478d221d44f00fd2849d44f0 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Mon, 18 Sep 2023 20:40:01 +0000
Subject: [PATCH 067/112] 8246280: Refine API to model sealed classes and
 interfaces in javax.lang.model

Reviewed-by: vromero, jjg
---
 .../share/classes/javax/lang/model/element/TypeElement.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java b/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
index b99903a03fe..d430e33e591 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
@@ -255,6 +255,8 @@ default List<? extends RecordComponentElement> getRecordComponents() {
     /**
      * Returns the permitted classes of this class or interface
      * element in declaration order.
+     * Note that for an interface, permitted subclasses and
+     * subinterfaces can be returned.
      *
      * @implSpec The default implementations of this method returns an
      * empty and unmodifiable list.
@@ -262,6 +264,8 @@ default List<? extends RecordComponentElement> getRecordComponents() {
      * @return the permitted classes, or an empty list if there are none
      *
      * @since 17
+     * @jls 8.1.6 Permitted Direct Subclasses
+     * @jls 9.1.4 Permitted Direct Subclasses and Subinterfaces
      */
     default List<? extends TypeMirror> getPermittedSubclasses() {
         return List.of();

From 373e37bf13df654ba40c0bd9fcf345215be4eafb Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Mon, 18 Sep 2023 22:08:17 +0000
Subject: [PATCH 068/112] 8313813: Field
 sun.util.calendar.CalendarDate#forceStandardTime is never set

Reviewed-by: aturbanov, naoto
---
 .../sun/util/calendar/AbstractCalendar.java   | 33 ++++++-------------
 .../sun/util/calendar/CalendarDate.java       | 16 ---------
 .../util/calendar/ImmutableGregorianDate.java |  9 -----
 3 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java b/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java
index 0362db82cec..50c8be6e314 100644
--- a/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java
+++ b/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java
@@ -165,31 +165,18 @@ public long getTime(CalendarDate date) {
             if (date.isNormalized()) {
                 return ms - date.getZoneOffset();
             }
+
             // adjust time zone and daylight saving
-            int[] offsets = new int[2];
-            if (date.isStandardTime()) {
-                // 1) 2:30am during starting-DST transition is
-                //    intrepreted as 2:30am ST
-                // 2) 5:00pm during DST is still interpreted as 5:00pm ST
-                // 3) 1:30am during ending-DST transition is interpreted
-                //    as 1:30am ST (after transition)
-                if (zi instanceof ZoneInfo) {
-                    ((ZoneInfo)zi).getOffsetsByStandard(ms, offsets);
-                    zoneOffset = offsets[0];
-                } else {
-                    zoneOffset = zi.getOffset(ms - zi.getRawOffset());
-                }
+            // 1) 2:30am during starting-DST transition is
+            //    interpreted as 3:30am DT
+            // 2) 5:00pm during DST is interpreted as 5:00pm DT
+            // 3) 1:30am during ending-DST transition is interpreted
+            //    as 1:30am DT/0:30am ST (before transition)
+            if (zi instanceof ZoneInfo zInfo) {
+                // Offset value adjusts accordingly depending on DST status of date
+                zoneOffset = zInfo.getOffsetsByWall(ms, new int[2]);
             } else {
-                // 1) 2:30am during starting-DST transition is
-                //    intrepreted as 3:30am DT
-                // 2) 5:00pm during DST is intrepreted as 5:00pm DT
-                // 3) 1:30am during ending-DST transition is interpreted
-                //    as 1:30am DT/0:30am ST (before transition)
-                if (zi instanceof ZoneInfo) {
-                    zoneOffset = ((ZoneInfo)zi).getOffsetsByWall(ms, offsets);
-                } else {
-                    zoneOffset = zi.getOffset(ms - zi.getRawOffset());
-                }
+                zoneOffset = zi.getOffset(ms - zi.getRawOffset());
             }
         }
         ms -= zoneOffset;
diff --git a/src/java.base/share/classes/sun/util/calendar/CalendarDate.java b/src/java.base/share/classes/sun/util/calendar/CalendarDate.java
index 5ecde812607..528baa9e317 100644
--- a/src/java.base/share/classes/sun/util/calendar/CalendarDate.java
+++ b/src/java.base/share/classes/sun/util/calendar/CalendarDate.java
@@ -26,7 +26,6 @@
 package sun.util.calendar;
 
 import java.lang.Cloneable;
-import java.util.Locale;
 import java.util.TimeZone;
 
 /**
@@ -82,9 +81,6 @@ public abstract class CalendarDate implements Cloneable {
     private TimeZone zoneinfo;
     private int zoneOffset;
     private int daylightSaving;
-    private boolean forceStandardTime;
-
-    private Locale locale;
 
     protected CalendarDate() {
         this(TimeZone.getDefault());
@@ -293,22 +289,10 @@ public boolean isNormalized() {
         return normalized;
     }
 
-
-    public boolean isStandardTime() {
-        return forceStandardTime;
-    }
-
     public boolean isDaylightTime() {
-        if (isStandardTime()) {
-            return false;
-        }
         return daylightSaving != 0;
     }
 
-    protected void setLocale(Locale loc) {
-        locale = loc;
-    }
-
     public TimeZone getZone() {
         return zoneinfo;
     }
diff --git a/src/java.base/share/classes/sun/util/calendar/ImmutableGregorianDate.java b/src/java.base/share/classes/sun/util/calendar/ImmutableGregorianDate.java
index 77fa4609397..3d9b2da548a 100644
--- a/src/java.base/share/classes/sun/util/calendar/ImmutableGregorianDate.java
+++ b/src/java.base/share/classes/sun/util/calendar/ImmutableGregorianDate.java
@@ -25,7 +25,6 @@
 
 package sun.util.calendar;
 
-import java.util.Locale;
 import java.util.TimeZone;
 
 class ImmutableGregorianDate extends BaseCalendar.Date {
@@ -146,18 +145,10 @@ public boolean isNormalized() {
         return date.isNormalized();
     }
 
-    public boolean isStandardTime() {
-        return date.isStandardTime();
-    }
-
     public boolean isDaylightTime() {
         return date.isDaylightTime();
     }
 
-    protected void setLocale(Locale loc) {
-        unsupported();
-    }
-
     public TimeZone getZone() {
         return date.getZone();
     }

From 24c3d86f32a2e2d9cb24cd8827ef1f20bb53fead Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Mon, 18 Sep 2023 23:08:26 +0000
Subject: [PATCH 069/112] 8315804: Open source several Swing JTabbedPane
 JTextArea JTextField tests

Reviewed-by: honkar, aivanov
---
 .../swing/JTabbedPane/GetComponentAtTest.java |  96 ++++++++++++
 .../swing/JTabbedPane/ReplaceCompTab.java     |  97 ++++++++++++
 .../javax/swing/JTabbedPane/bug4703690.java   | 148 ++++++++++++++++++
 .../jdk/javax/swing/JTextArea/bug4849868.java | 103 ++++++++++++
 .../javax/swing/JTextField/bug4244613.java    |  52 ++++++
 5 files changed, 496 insertions(+)
 create mode 100644 test/jdk/javax/swing/JTabbedPane/GetComponentAtTest.java
 create mode 100644 test/jdk/javax/swing/JTabbedPane/ReplaceCompTab.java
 create mode 100644 test/jdk/javax/swing/JTabbedPane/bug4703690.java
 create mode 100644 test/jdk/javax/swing/JTextArea/bug4849868.java
 create mode 100644 test/jdk/javax/swing/JTextField/bug4244613.java

diff --git a/test/jdk/javax/swing/JTabbedPane/GetComponentAtTest.java b/test/jdk/javax/swing/JTabbedPane/GetComponentAtTest.java
new file mode 100644
index 00000000000..ddefd541f40
--- /dev/null
+++ b/test/jdk/javax/swing/JTabbedPane/GetComponentAtTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4122109
+ * @summary Ensure SwingUtilities.getDeepestComponentAt() works correctly
+ *    (in this particular case, with JTabbedPane)
+ * @key headful
+ * @run main GetComponentAtTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Robot;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
+
+public class GetComponentAtTest {
+   static JFrame f;
+
+   public static void main(String[] args) throws Exception {
+      try {
+         Robot robot = new Robot();
+         SwingUtilities.invokeAndWait(() -> {
+            f = new JFrame("GetComponentAtTest");
+            JTabbedPane tabbedpane = new JTabbedPane();
+            f.getContentPane().add(tabbedpane, BorderLayout.CENTER);
+
+            JPanel panel1 = new JPanel();
+            panel1.setName("Panel 1");
+            panel1.setLayout(new BorderLayout());
+            tabbedpane.add(panel1);
+            JPanel subPanel = new JPanel();
+            subPanel.setName("Sub-Panel");
+            subPanel.setBackground(Color.green);
+            panel1.add(subPanel); // add sub panel to 1st tab
+
+            JPanel panel2 = new JPanel();
+            panel2.setName("Panel 2");
+            tabbedpane.add(panel2);
+
+            f.setSize(150, 150);
+            f.setVisible(true);
+
+            robot.delay(1000);
+
+            tabbedpane.setSelectedIndex(1); // display 2nd tab
+            tabbedpane.invalidate();
+            tabbedpane.validate();
+            if (SwingUtilities.getDeepestComponentAt(tabbedpane, 50, 50) != panel2) {
+               throw new RuntimeException("SwingUtilities.getDeepestComponentAt() " +
+                       "returned incorrect component! (1)");
+            }
+
+            tabbedpane.setSelectedIndex(0); // display 1st tab
+            tabbedpane.invalidate();
+            tabbedpane.validate();
+            if (SwingUtilities.getDeepestComponentAt(tabbedpane, 50, 50) != subPanel) {
+               throw new RuntimeException("SwingUtilities.getDeepestComponentAt() " +
+                       "returned incorrect component! (2)");
+            }
+         });
+      } finally {
+         SwingUtilities.invokeAndWait(() -> {
+            if (f != null) {
+               f.dispose();
+            }
+         });
+      }
+
+   }
+}
diff --git a/test/jdk/javax/swing/JTabbedPane/ReplaceCompTab.java b/test/jdk/javax/swing/JTabbedPane/ReplaceCompTab.java
new file mode 100644
index 00000000000..92e9ffeff13
--- /dev/null
+++ b/test/jdk/javax/swing/JTabbedPane/ReplaceCompTab.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4213896 4228439
+ * @summary Ensure that inserting a new tab with a component
+ * where that component already exists as another tab is handled
+ * properly. The old tab should be removed and the new tab added.
+ * @key headful
+ * @run main ReplaceCompTab
+ */
+
+import java.awt.BorderLayout;
+
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
+
+public class ReplaceCompTab {
+    static JFrame f;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                f = new JFrame("ReplaceCompTab");
+                JTabbedPane tabbedpane = new JTabbedPane();
+                f.getContentPane().add(tabbedpane, BorderLayout.CENTER);
+
+                JPanel comp = new JPanel();
+
+                // Add first tab
+                tabbedpane.addTab("First(temp)", comp);
+
+                // Add second tab with same component (should just replace first one)
+                tabbedpane.insertTab("First", null, comp, "component added next", 0);
+
+                // Check to ensure only a single tab exists
+                if (tabbedpane.getTabCount() > 1) {
+                    throw new RuntimeException("Only one tab should exist");
+                }
+                // Check to make sure second tab correctly replaced the first
+                if (!(tabbedpane.getTitleAt(0).equals("First"))) {
+                    throw new RuntimeException("Tab not replaced correctly");
+                }
+                // Check to make sure adding null continues to work
+                try {
+                    tabbedpane.addTab("Second", null);
+                } catch (Exception e) {
+                    throw new RuntimeException("Adding first null " +
+                            "component failed:", e);
+                }
+                try {
+                    tabbedpane.addTab("Third", null);
+                } catch (Exception e) {
+                    throw new RuntimeException("Adding subsequent null " +
+                            "component failed: ", e);
+                }
+                try {
+                    tabbedpane.setComponentAt(1, new JLabel("Second Component"));
+                    tabbedpane.setComponentAt(2, new JLabel("Third Component"));
+                } catch (Exception e) {
+                    throw new RuntimeException("Setting null component " +
+                            "to non-null failed: ", e);
+                }
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (f != null) {
+                    f.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JTabbedPane/bug4703690.java b/test/jdk/javax/swing/JTabbedPane/bug4703690.java
new file mode 100644
index 00000000000..08be30def82
--- /dev/null
+++ b/test/jdk/javax/swing/JTabbedPane/bug4703690.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4703690
+ * @summary JTabbedPane should focus proper component at the tab container
+ * @key headful
+ * @run main bug4703690
+ */
+
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.InputEvent;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
+
+public class bug4703690 {
+    static JFrame frame;
+    static JTabbedPane tabbedPane;
+    static JButton one, two;
+
+    static final CountDownLatch focusButtonTwo = new CountDownLatch(1);
+    static final CountDownLatch switchToTabTwo = new CountDownLatch(1);
+    static final CountDownLatch focusButtonOne = new CountDownLatch(1);
+    static Robot robot;
+
+    static Point p;
+    static Rectangle rect;
+
+    public static void main(String[] args) throws Exception {
+        bug4703690 test = new bug4703690();
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame("bug4703690");
+
+                JPanel panel = new JPanel();
+                one = new JButton("Button 1");
+                panel.add(one);
+                two = new JButton("Button 2");
+                panel.add(two);
+
+                tabbedPane = new JTabbedPane();
+                frame.getContentPane().add(tabbedPane);
+                tabbedPane.addTab("Tab one", panel);
+                tabbedPane.addTab("Tab two", new JPanel());
+
+                two.addFocusListener(new FocusAdapter() {
+                    public void focusGained(FocusEvent e) {
+                        focusButtonTwo.countDown();
+                    }
+                });
+
+                tabbedPane.addChangeListener(e -> {
+                    if (tabbedPane.getSelectedIndex() == 1) {
+                        switchToTabTwo.countDown();
+                    }
+                });
+
+                frame.setSize(200, 200);
+                frame.setLocationRelativeTo(null);
+                frame.setVisible(true);
+            });
+
+            test.execute();
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public void execute() throws Exception {
+        robot = new Robot();
+        robot.setAutoDelay(50);
+
+        SwingUtilities.invokeAndWait(two::requestFocus);
+
+        if (!focusButtonTwo.await(1, TimeUnit.SECONDS)) {
+            throw new RuntimeException("Button two didn't receive focus");
+        }
+
+        one.addFocusListener(new FocusAdapter() {
+            public void focusGained(FocusEvent e) {
+                focusButtonOne.countDown();
+            }
+        });
+
+        // Switch to tab two
+        SwingUtilities.invokeAndWait(() -> {
+            p = tabbedPane.getLocationOnScreen();
+            rect = tabbedPane.getBoundsAt(1);
+        });
+        robot.mouseMove(p.x + rect.x + rect.width / 2,
+                p.y + rect.y + rect.height / 2);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+        if (!switchToTabTwo.await(1, TimeUnit.SECONDS)) {
+            throw new RuntimeException("Switching to tab two failed");
+        }
+
+        // Switch to tab one
+        SwingUtilities.invokeAndWait(() -> {
+            p = tabbedPane.getLocationOnScreen();
+            rect = tabbedPane.getBoundsAt(0);
+        });
+        robot.mouseMove(p.x + rect.x + rect.width / 2,
+                p.y + rect.y + rect.height / 2);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+        if (!focusButtonOne.await(1, TimeUnit.SECONDS)) {
+            throw new RuntimeException("The 'Button 1' button doesn't have focus");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JTextArea/bug4849868.java b/test/jdk/javax/swing/JTextArea/bug4849868.java
new file mode 100644
index 00000000000..efd94b46336
--- /dev/null
+++ b/test/jdk/javax/swing/JTextArea/bug4849868.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4849868
+ * @summary Tests if JTextArea.getSelectionEnd works correctly
+ * @key headful
+ * @run main bug4849868
+ */
+
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+
+public class bug4849868 {
+
+    private static volatile boolean passed = false;
+
+    private static JTextArea textArea;
+    private static JFrame f;
+    private static Point p;
+
+    private static int end;
+    private static int len;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoDelay(100);
+            robot.setAutoWaitForIdle(true);
+
+            SwingUtilities.invokeAndWait(() -> {
+                f = new JFrame("bug4849868");
+                textArea = new JTextArea("1234");
+                textArea.setLineWrap(true);
+                JScrollPane pane = new JScrollPane(textArea,
+                        JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+                        JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+                f.getContentPane().add(pane);
+                f.setSize(300, 300);
+                f.setLocationRelativeTo(null);
+                f.setVisible(true);
+            });
+
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() ->
+                    p = textArea.getLocationOnScreen());
+
+            robot.mouseMove(p.x, p.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseMove(p.x + 350, p.y);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                end = textArea.getSelectionEnd();
+                len = textArea.getDocument().getLength();
+            });
+            passed = (end <= len);
+
+            System.out.println("end: " + end);
+            System.out.println("len: " + len);
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (f != null) {
+                    f.dispose();
+                }
+            });
+        }
+
+        if (!passed) {
+            throw new RuntimeException("Test failed.");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JTextField/bug4244613.java b/test/jdk/javax/swing/JTextField/bug4244613.java
new file mode 100644
index 00000000000..6a1a8bb9d23
--- /dev/null
+++ b/test/jdk/javax/swing/JTextField/bug4244613.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4244613
+ * @summary Tests that JTextField has setAction(Action) constructor
+ * @run main bug4244613
+ */
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JTextField;
+
+public class bug4244613 {
+    /** Auxilliary class implementing Action
+    */
+    static class NullAction extends AbstractAction {
+        @Override
+        public void actionPerformed(ActionEvent e) {}
+        public Object getValue(String key) { return null; }
+        public boolean isEnabled() { return false; }
+    }
+
+    public static void main(String[] args) {
+        JTextField tf = new JTextField("bug4244613");
+        Action action = new NullAction();
+        tf.setAction(action);
+    }
+}

From f226ceb4351c94486c754fdefe15049b9b197e44 Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Tue, 19 Sep 2023 00:12:36 +0000
Subject: [PATCH 070/112] 8316440: LambdasInTwoArchives.java failed to find
 WhiteBox.class

Reviewed-by: iklam
---
 .../runtime/cds/appcds/dynamicArchive/LambdasInTwoArchives.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdasInTwoArchives.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdasInTwoArchives.java
index 1b77c53b25e..8c66225b95f 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdasInTwoArchives.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdasInTwoArchives.java
@@ -33,7 +33,7 @@
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
  *          /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes
- * @build LambdasWithSameKey
+ * @build LambdasWithSameKey jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar lambdas_same_key.jar LambdasWithSameKey
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar WhiteBox.jar jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox

From 3760a0448df7024f9b44fa2af11007de4dfcbbe2 Mon Sep 17 00:00:00 2001
From: Yi Yang <yyang@openjdk.org>
Date: Tue, 19 Sep 2023 02:03:15 +0000
Subject: [PATCH 071/112] 8314021: HeapDump: Optimize segmented heap file
 merging phase

Reviewed-by: amenkov, kevinw
---
 src/hotspot/os/linux/os_linux.cpp             |  8 +++
 src/hotspot/os/linux/os_linux.hpp             |  2 +
 src/hotspot/share/services/heapDumper.cpp     | 72 ++++++++++++++++---
 .../share/services/heapDumperCompression.hpp  |  2 +
 4 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 3a1785b27b5..11869b39854 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -89,6 +89,7 @@
 # include <sys/mman.h>
 # include <sys/stat.h>
 # include <sys/select.h>
+# include <sys/sendfile.h>
 # include <pthread.h>
 # include <signal.h>
 # include <endian.h>
@@ -4368,6 +4369,13 @@ jlong os::Linux::fast_thread_cpu_time(clockid_t clockid) {
   return (tp.tv_sec * NANOSECS_PER_SEC) + tp.tv_nsec;
 }
 
+// copy data between two file descriptor within the kernel
+// the number of bytes written to out_fd is returned if transfer was successful
+// otherwise, returns -1 that implies an error
+jlong os::Linux::sendfile(int out_fd, int in_fd, jlong* offset, jlong count) {
+  return sendfile64(out_fd, in_fd, (off64_t*)offset, (size_t)count);
+}
+
 // Determine if the vmid is the parent pid for a child in a PID namespace.
 // Return the namespace pid if so, otherwise -1.
 int os::Linux::get_namespace_pid(int vmid) {
diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp
index 6dd33b94efa..2267826b284 100644
--- a/src/hotspot/os/linux/os_linux.hpp
+++ b/src/hotspot/os/linux/os_linux.hpp
@@ -167,6 +167,8 @@ class os::Linux {
 
   static jlong fast_thread_cpu_time(clockid_t clockid);
 
+  static jlong sendfile(int out_fd, int in_fd, jlong* offset, jlong count);
+
   // Determine if the vmid is the parent pid for a child in a PID namespace.
   // Return the namespace pid if so, otherwise -1.
   static int get_namespace_pid(int vmid);
diff --git a/src/hotspot/share/services/heapDumper.cpp b/src/hotspot/share/services/heapDumper.cpp
index 23e83939bd3..e58d3e542c3 100644
--- a/src/hotspot/share/services/heapDumper.cpp
+++ b/src/hotspot/share/services/heapDumper.cpp
@@ -62,6 +62,9 @@
 #include "utilities/checkedCast.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
+#ifdef LINUX
+#include "os_linux.hpp"
+#endif
 
 /*
  * HPROF binary format - description copied from:
@@ -630,6 +633,7 @@ class DumpWriter : public AbstractDumpWriter {
   AbstractCompressor* compressor()             { return _compressor; }
   void set_compressor(AbstractCompressor* p)   { _compressor = p; }
   bool is_overwrite() const                    { return _writer->is_overwrite(); }
+  int get_fd() const                           { return _writer->get_fd(); }
 
   void flush() override;
 };
@@ -1533,6 +1537,7 @@ class DumpMerger : public StackObj {
 private:
   void merge_file(char* path);
   void merge_done();
+  void set_error(const char* msg);
 
 public:
   DumpMerger(const char* path, DumpWriter* writer, int dump_seq) :
@@ -1553,15 +1558,62 @@ void DumpMerger::merge_done() {
   _dump_seq = 0; //reset
 }
 
+void DumpMerger::set_error(const char* msg) {
+  assert(msg != nullptr, "sanity check");
+  log_error(heapdump)("%s (file: %s)", msg, _path);
+  _writer->set_error(msg);
+  _has_error = true;
+}
+
+#ifdef LINUX
+// Merge segmented heap files via sendfile, it's more efficient than the
+// read+write combination, which would require transferring data to and from
+// user space.
+void DumpMerger::merge_file(char* path) {
+  assert(!SafepointSynchronize::is_at_safepoint(), "merging happens outside safepoint");
+  TraceTime timer("Merge segmented heap file directly", TRACETIME_LOG(Info, heapdump));
+
+  int segment_fd = os::open(path, O_RDONLY, 0);
+  if (segment_fd == -1) {
+    set_error("Can not open segmented heap file during merging");
+    return;
+  }
+
+  struct stat st;
+  if (os::stat(path, &st) != 0) {
+    ::close(segment_fd);
+    set_error("Can not get segmented heap file size during merging");
+    return;
+  }
+
+  // A successful call to sendfile may write fewer bytes than requested; the
+  // caller should be prepared to retry the call if there were unsent bytes.
+  jlong offset = 0;
+  while (offset < st.st_size) {
+    int ret = os::Linux::sendfile(_writer->get_fd(), segment_fd, &offset, st.st_size);
+    if (ret == -1) {
+      ::close(segment_fd);
+      set_error("Failed to merge segmented heap file");
+      return;
+    }
+  }
+
+  // As sendfile variant does not call the write method of the global writer,
+  // bytes_written is also incorrect for this variant, we need to explicitly
+  // accumulate bytes_written for the global writer in this case
+  julong accum = _writer->bytes_written() + st.st_size;
+  _writer->set_bytes_written(accum);
+  ::close(segment_fd);
+}
+#else
+// Generic implementation using read+write
 void DumpMerger::merge_file(char* path) {
   assert(!SafepointSynchronize::is_at_safepoint(), "merging happens outside safepoint");
   TraceTime timer("Merge segmented heap file", TRACETIME_LOG(Info, heapdump));
 
   fileStream segment_fs(path, "rb");
   if (!segment_fs.is_open()) {
-    log_error(heapdump)("Can not open segmented heap file %s during merging", path);
-    _writer->set_error("Can not open segmented heap file during merging");
-    _has_error = true;
+    set_error("Can not open segmented heap file during merging");
     return;
   }
 
@@ -1575,12 +1627,10 @@ void DumpMerger::merge_file(char* path) {
 
   _writer->flush();
   if (segment_fs.fileSize() != total) {
-    log_error(heapdump)("Merged heap dump %s is incomplete, expect %ld but read " JLONG_FORMAT " bytes",
-                        path, segment_fs.fileSize(), total);
-    _writer->set_error("Merged heap dump is incomplete");
-    _has_error = true;
+    set_error("Merged heap dump is incomplete");
   }
 }
+#endif
 
 void DumpMerger::do_merge() {
   assert(!SafepointSynchronize::is_at_safepoint(), "merging happens outside safepoint");
@@ -1591,7 +1641,8 @@ void DumpMerger::do_merge() {
   AbstractCompressor* saved_compressor = _writer->compressor();
   _writer->set_compressor(nullptr);
 
-  // merge segmented heap file and remove it anyway
+  // Merge the content of the remaining files into base file. Regardless of whether
+  // the merge process is successful or not, these segmented files will be deleted.
   char path[JVM_MAXPATHLEN];
   for (int i = 0; i < _dump_seq; i++) {
     memset(path, 0, JVM_MAXPATHLEN);
@@ -1599,6 +1650,7 @@ void DumpMerger::do_merge() {
     if (!_has_error) {
       merge_file(path);
     }
+    // Delete selected segmented heap file nevertheless
     remove(path);
   }
 
@@ -2012,6 +2064,7 @@ DumpWriter* VM_HeapDumper::create_local_writer() {
 
   // generate segmented heap file path
   const char* base_path = writer()->get_file_path();
+  // share global compressor, local DumpWriter is not responsible for its life cycle
   AbstractCompressor* compressor = writer()->compressor();
   int seq = Atomic::fetch_then_add(&_dump_seq, 1);
   os::snprintf(path, JVM_MAXPATHLEN, "%s.p%d", base_path, seq);
@@ -2256,6 +2309,9 @@ int HeapDumper::dump(const char* path, outputStream* out, int compression, bool
     }
   }
 
+  if (compressor != nullptr) {
+    delete compressor;
+  }
   return (writer.error() == nullptr) ? 0 : -1;
 }
 
diff --git a/src/hotspot/share/services/heapDumperCompression.hpp b/src/hotspot/share/services/heapDumperCompression.hpp
index f8199fc5df2..99482b1f7d8 100644
--- a/src/hotspot/share/services/heapDumperCompression.hpp
+++ b/src/hotspot/share/services/heapDumperCompression.hpp
@@ -78,6 +78,8 @@ class FileWriter : public AbstractWriter {
   const char* get_file_path() { return _path; }
 
   bool is_overwrite() const { return _overwrite; }
+
+  int get_fd() const {return _fd; }
 };
 
 

From f52e500f806085f9645cb7857cc7b4e648685351 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Tue, 19 Sep 2023 05:15:01 +0000
Subject: [PATCH 072/112] 8316104: Open source several Swing SplitPane and
 RadioButton related tests

Reviewed-by: kizune, abhiscxk
---
 .../javax/swing/JRadioButton/bug4823809.java  |  93 +++++++++
 .../javax/swing/JSplitPane/bug4147653.java    |  58 ++++++
 .../javax/swing/JSplitPane/bug4870674.java    | 181 ++++++++++++++++++
 3 files changed, 332 insertions(+)
 create mode 100644 test/jdk/javax/swing/JRadioButton/bug4823809.java
 create mode 100644 test/jdk/javax/swing/JSplitPane/bug4147653.java
 create mode 100644 test/jdk/javax/swing/JSplitPane/bug4870674.java

diff --git a/test/jdk/javax/swing/JRadioButton/bug4823809.java b/test/jdk/javax/swing/JRadioButton/bug4823809.java
new file mode 100644
index 00000000000..810f4f42939
--- /dev/null
+++ b/test/jdk/javax/swing/JRadioButton/bug4823809.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JRadioButton;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.ButtonUI;
+import javax.swing.plaf.metal.MetalRadioButtonUI;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.awt.Robot;
+
+/*
+ * @test
+ * @bug 4823809
+ * @summary No Mnemonic or Focus Indicator when using HTML for a Component Text
+ * @key headful
+ * @run main bug4823809
+ */
+
+public class bug4823809 {
+    private static ButtonUI testUI;
+    private static volatile boolean passed = false;
+    private static JFrame frame;
+    private static Robot robot;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame("RadioButton Test");
+                testUI = new TestRadioButtonUI();
+                JRadioButton radio = new TestRadioButton("<html>This is a radiobutton test!</html>");
+
+                frame.getContentPane().add(radio);
+                frame.pack();
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            if (!passed) {
+                throw new Error("Focus isn't painted for JRadioButton with HTML text.");
+            }
+            System.out.println("Test Passed!");
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    static class TestRadioButton extends JRadioButton {
+        public TestRadioButton(String s) {
+            super(s);
+        }
+
+        public void setUI(ButtonUI ui) {
+            super.setUI(testUI);
+        }
+    }
+
+    static class TestRadioButtonUI extends MetalRadioButtonUI {
+        protected void paintFocus(Graphics g, Rectangle t, Dimension d) {
+            super.paintFocus(g, t, d);
+            passed = true;
+        }
+    }
+
+}
diff --git a/test/jdk/javax/swing/JSplitPane/bug4147653.java b/test/jdk/javax/swing/JSplitPane/bug4147653.java
new file mode 100644
index 00000000000..ed84776d46d
--- /dev/null
+++ b/test/jdk/javax/swing/JSplitPane/bug4147653.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JSplitPane;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+/*
+ * @test
+ * @bug 4147653
+ * @summary JSplitPane.DIVIDER_LOCATION_PROPERTY is a property,
+ * you can use that to know when the position changes.
+ * @run main bug4147653
+ */
+
+public class bug4147653 {
+    private static volatile boolean flag = false;
+
+    static class DevMoved implements PropertyChangeListener {
+        public void propertyChange(PropertyChangeEvent evt) {
+            flag = true;
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        JSplitPane sp = new JSplitPane();
+
+        DevMoved pl = new DevMoved();
+        sp.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, pl);
+        sp.setDividerLocation(sp.getDividerLocation() + 10);
+        Thread.sleep(1000);
+
+        if (!flag) {
+            throw new RuntimeException("Divider property was not changed...");
+        }
+        System.out.println("Test Passed!");
+    }
+}
diff --git a/test/jdk/javax/swing/JSplitPane/bug4870674.java b/test/jdk/javax/swing/JSplitPane/bug4870674.java
new file mode 100644
index 00000000000..1984d747f76
--- /dev/null
+++ b/test/jdk/javax/swing/JSplitPane/bug4870674.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
+import javax.swing.plaf.basic.BasicSplitPaneUI;
+import java.awt.GridLayout;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+
+/*
+ * @test
+ * @bug 4870674
+ * @summary JSplitPane's one-touch buttons should deal with resized split panes better
+ * @key headful
+ * @run main bug4870674
+ */
+
+public class bug4870674 {
+    private static JSplitPane jsp0, jsp1;
+    private static JButton[] leftOneTouchButton = new JButton[2];
+    private static JButton[] rightOneTouchButton = new JButton[2];
+    private static JFrame frame;
+    private static Robot robot;
+    private static volatile boolean passed = true;
+    private static volatile Point rightBtnPos0;
+    private static volatile Point leftBtnPos0;
+    private static volatile Point rightBtnPos1;
+    private static volatile Point leftBtnPos1;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame("Test");
+                frame.getContentPane().setLayout(new GridLayout(2, 1));
+
+                jsp0 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,
+                        new JButton("Left"),
+                        new JButton("Right"));
+                frame.getContentPane().add(jsp0);
+
+                jsp0.setUI(new TestSplitPaneUI(0));
+                jsp0.setOneTouchExpandable(true);
+
+                jsp1 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,
+                        new JButton("Left"),
+                        new JButton("Right"));
+                frame.getContentPane().add(jsp1);
+
+                jsp1.setUI(new TestSplitPaneUI(1));
+                jsp1.setOneTouchExpandable(true);
+
+                frame.setSize(300, 100);
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                rightBtnPos0 = rightOneTouchButton[0].getLocationOnScreen();
+                rightBtnPos0.x += rightOneTouchButton[0].getWidth() / 2;
+                rightBtnPos0.y += rightOneTouchButton[0].getHeight() / 2;
+
+                leftBtnPos1 = leftOneTouchButton[1].getLocationOnScreen();
+                leftBtnPos1.x += leftOneTouchButton[0].getWidth() / 2;
+                leftBtnPos1.y += leftOneTouchButton[0].getHeight() / 2;
+
+                leftBtnPos0 = leftOneTouchButton[0].getLocationOnScreen();
+                leftBtnPos0.x += leftOneTouchButton[0].getWidth() / 2;
+                leftBtnPos0.y += leftOneTouchButton[0].getHeight() / 2;
+
+                rightBtnPos1 = rightOneTouchButton[1].getLocationOnScreen();
+                rightBtnPos1.x += rightOneTouchButton[0].getWidth() / 2;
+                rightBtnPos1.y += rightOneTouchButton[0].getHeight() / 2;
+
+                jsp0.setDividerLocation(250);
+            });
+            robot.mouseMove(rightBtnPos0.x, rightBtnPos0.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            SwingUtilities.invokeAndWait(() -> {
+                jsp1.setDividerLocation(250);
+            });
+            robot.waitForIdle();
+            robot.delay(100);
+            robot.mouseMove(leftBtnPos1.x, leftBtnPos1.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            SwingUtilities.invokeAndWait(() -> {
+                frame.setSize(200, 100);
+            });
+            robot.waitForIdle();
+            robot.delay(100);
+            robot.mouseMove(leftBtnPos0.x, leftBtnPos0.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+            robot.delay(100);
+            robot.mouseMove(rightBtnPos1.x, rightBtnPos1.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+            robot.delay(100);
+
+            SwingUtilities.invokeAndWait(() -> {
+                if (jsp0.getDividerLocation() > jsp0.getMaximumDividerLocation() ||
+                        jsp1.getDividerLocation() > jsp1.getMaximumDividerLocation()) {
+                    passed = false;
+                }
+            });
+
+            if (!passed) {
+                throw new RuntimeException("The divider location couldn't " +
+                        "be greater then its maximum location");
+            }
+            System.out.println("Test Passed!");
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    static class TestSplitPaneUI extends BasicSplitPaneUI {
+        int i;
+
+        public TestSplitPaneUI(int i) {
+            super();
+            this.i = i;
+        }
+
+        public BasicSplitPaneDivider createDefaultDivider() {
+            return new TestSplitPaneDivider(this, i);
+        }
+    }
+
+    static class TestSplitPaneDivider extends BasicSplitPaneDivider {
+        int i = 0;
+
+        public TestSplitPaneDivider(BasicSplitPaneUI ui, int i) {
+            super(ui);
+            this.i = i;
+        }
+
+        protected JButton createLeftOneTouchButton() {
+            leftOneTouchButton[i] = super.createLeftOneTouchButton();
+            return leftOneTouchButton[i];
+        }
+
+        protected JButton createRightOneTouchButton() {
+            rightOneTouchButton[i] = super.createRightOneTouchButton();
+            return rightOneTouchButton[i];
+        }
+    }
+}

From 138542de7889e8002df0e15a79e31d824c6a0473 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Tue, 19 Sep 2023 05:15:33 +0000
Subject: [PATCH 073/112] 8316061: Open source several Swing RootPane and
 Slider related tests

Reviewed-by: kizune, abhiscxk
---
 .../jdk/javax/swing/JRootPane/bug4207333.java | 70 ++++++++++++++++
 .../jdk/javax/swing/JRootPane/bug4224113.java | 41 +++++++++
 .../jdk/javax/swing/JRootPane/bug4627806.java | 65 +++++++++++++++
 test/jdk/javax/swing/JSlider/bug4200901.java  | 44 ++++++++++
 test/jdk/javax/swing/JSlider/bug4203754.java  | 83 +++++++++++++++++++
 5 files changed, 303 insertions(+)
 create mode 100644 test/jdk/javax/swing/JRootPane/bug4207333.java
 create mode 100644 test/jdk/javax/swing/JRootPane/bug4224113.java
 create mode 100644 test/jdk/javax/swing/JRootPane/bug4627806.java
 create mode 100644 test/jdk/javax/swing/JSlider/bug4200901.java
 create mode 100644 test/jdk/javax/swing/JSlider/bug4203754.java

diff --git a/test/jdk/javax/swing/JRootPane/bug4207333.java b/test/jdk/javax/swing/JRootPane/bug4207333.java
new file mode 100644
index 00000000000..b93438eae50
--- /dev/null
+++ b/test/jdk/javax/swing/JRootPane/bug4207333.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JButton;
+import javax.swing.JRootPane;
+import java.lang.reflect.Field;
+
+/*
+ * @test
+ * @bug 4207333
+ * @summary Inadvertant API regression in JRootPane
+ * @run main bug4207333
+ */
+
+public class bug4207333 {
+    public static void main(String[] argv) {
+        TestableRootPane rp = new TestableRootPane();
+        rp.setDefaultButton(new JButton("Default, eh?"));
+
+        if (!rp.test("defaultPressAction")) {
+            throw new RuntimeException("Failed test for bug 4207333");
+        }
+        if (!rp.test("defaultReleaseAction")) {
+            throw new RuntimeException("Failed test for bug 4207333");
+        }
+        System.out.println("Test Passed!");
+    }
+
+    private static class TestableRootPane extends JRootPane {
+        public boolean test(String fieldName) {
+            boolean result = false;
+            try {
+                Class superClass = getClass().getSuperclass();
+                Field field = superClass.getDeclaredField(fieldName);
+                Class fieldClass = field.getType();
+                Class actionClass = Class.forName("javax.swing.Action");
+
+                // Is the Field an Action?
+                result = actionClass.isAssignableFrom(fieldClass);
+            } catch (NoSuchFieldException pe) {
+                // Not a bug if the fields are removed since their
+                // type was a package private class!
+                result = true;
+            } catch (Exception iae) {
+                System.out.println("Exception " + iae);
+            }
+            return result;
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JRootPane/bug4224113.java b/test/jdk/javax/swing/JRootPane/bug4224113.java
new file mode 100644
index 00000000000..e52b369a886
--- /dev/null
+++ b/test/jdk/javax/swing/JRootPane/bug4224113.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.plaf.RootPaneUI;
+
+/*
+ * @test
+ * @bug 4224113
+ * @summary Tests the presence of RootPaneUI
+ * @run main bug4224113
+ */
+
+public class bug4224113 {
+    public static class TestRootPaneUI extends RootPaneUI {
+    }
+
+    public static void main(String[] args) {
+        TestRootPaneUI r = new TestRootPaneUI();
+        System.out.println("Test Passed!");
+    }
+}
diff --git a/test/jdk/javax/swing/JRootPane/bug4627806.java b/test/jdk/javax/swing/JRootPane/bug4627806.java
new file mode 100644
index 00000000000..cd6d64213a2
--- /dev/null
+++ b/test/jdk/javax/swing/JRootPane/bug4627806.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JRootPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+/*
+ * @test
+ * @bug 4627806
+ * @key headful
+ * @summary MetalRootPaneUI calls validate() instead of revalidate()
+ * @run main bug4627806
+ */
+
+public class bug4627806 {
+    private static JFrame frame;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame("Test");
+                JPanel p = new JPanel();
+                JMenuItem c = new JMenuItem();
+                p.add(c);
+                frame.getContentPane().add(p);
+                frame.pack();
+                c.getUI().uninstallUI(c);
+                JRootPane rootPane = frame.getRootPane();
+                rootPane.getUI().uninstallUI(rootPane);
+                System.out.println("Test Passed!");
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JSlider/bug4200901.java b/test/jdk/javax/swing/JSlider/bug4200901.java
new file mode 100644
index 00000000000..cf4810a54ca
--- /dev/null
+++ b/test/jdk/javax/swing/JSlider/bug4200901.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JSlider;
+
+/*
+ * @test
+ * @bug 4200901
+ * @summary Test to check if JSlider.createStandardLabels() throws Exception
+ * @run main bug4200901
+ */
+
+public class bug4200901 {
+    public static void main(String[] args) {
+        try {
+            JSlider slider = new JSlider();
+            slider.createStandardLabels( -1 );
+        } catch ( IllegalArgumentException e ) {
+            System.out.println("Test Passed!");
+            return;
+        }
+        throw new RuntimeException( "TEST FAILED!");
+    }
+}
diff --git a/test/jdk/javax/swing/JSlider/bug4203754.java b/test/jdk/javax/swing/JSlider/bug4203754.java
new file mode 100644
index 00000000000..21eb898d275
--- /dev/null
+++ b/test/jdk/javax/swing/JSlider/bug4203754.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JSlider;
+import javax.swing.SwingUtilities;
+import java.awt.FlowLayout;
+import java.awt.Robot;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+/*
+ * @test
+ * @bug 4203754
+ * @key headful
+ * @summary Labels in a JSlider don't disable or enable with the slider
+ * @run main bug4203754
+ */
+
+public class bug4203754 {
+    private static JFrame frame;
+    private static Robot robot;
+    private static JLabel label;
+
+    public static void main(String[] argv) throws Exception {
+        try {
+            robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame("Test");
+                frame.getContentPane().setLayout(new FlowLayout());
+                JSlider slider = new JSlider(0, 100, 25);
+                frame.getContentPane().add(slider);
+
+                label = new JLabel("0", JLabel.CENTER) {
+                    public void setEnabled(boolean b) {
+                        super.setEnabled(b);
+                    }
+                };
+
+                Dictionary labels = new Hashtable();
+                labels.put(Integer.valueOf(0), label);
+                slider.setLabelTable(labels);
+                slider.setPaintLabels(true);
+                slider.setEnabled(false);
+                frame.setSize(250, 150);
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            if (label.isEnabled()) {
+                throw new RuntimeException("Label should be disabled");
+            }
+            System.out.println("Test Passed!");
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}

From d0385712130ad1073741d7861f6bee432f8d7210 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Tue, 19 Sep 2023 08:23:57 +0000
Subject: [PATCH 074/112] 8030815: Code roots are not accounted for in region
 prediction

Reviewed-by: iwalulya, ayang
---
 src/hotspot/share/gc/g1/g1Analytics.cpp       | 19 +++++++
 src/hotspot/share/gc/g1/g1Analytics.hpp       |  8 +++
 .../share/gc/g1/g1ConcurrentRefine.cpp        | 11 ++--
 src/hotspot/share/gc/g1/g1Policy.cpp          | 54 ++++++++++++++-----
 src/hotspot/share/gc/g1/g1Policy.hpp          | 17 +++---
 src/hotspot/share/gc/g1/g1_globals.hpp        | 11 ++--
 6 files changed, 93 insertions(+), 27 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1Analytics.cpp b/src/hotspot/share/gc/g1/g1Analytics.cpp
index 6a7f4a5deed..f1d032061dc 100644
--- a/src/hotspot/share/gc/g1/g1Analytics.cpp
+++ b/src/hotspot/share/gc/g1/g1Analytics.cpp
@@ -80,9 +80,11 @@ G1Analytics::G1Analytics(const G1Predictions* predictor) :
     _card_scan_to_merge_ratio_seq(TruncatedSeqLength),
     _cost_per_card_scan_ms_seq(TruncatedSeqLength),
     _cost_per_card_merge_ms_seq(TruncatedSeqLength),
+    _cost_per_code_root_ms_seq(TruncatedSeqLength),
     _cost_per_byte_copied_ms_seq(TruncatedSeqLength),
     _pending_cards_seq(TruncatedSeqLength),
     _rs_length_seq(TruncatedSeqLength),
+    _code_root_rs_length_seq(TruncatedSeqLength),
     _constant_other_time_ms_seq(TruncatedSeqLength),
     _young_other_cost_per_region_ms_seq(TruncatedSeqLength),
     _non_young_other_cost_per_region_ms_seq(TruncatedSeqLength),
@@ -104,6 +106,7 @@ G1Analytics::G1Analytics(const G1Predictions* predictor) :
   _card_scan_to_merge_ratio_seq.set_initial(young_card_scan_to_merge_ratio_defaults[index]);
   _cost_per_card_scan_ms_seq.set_initial(young_only_cost_per_card_scan_ms_defaults[index]);
   _rs_length_seq.set_initial(0);
+  _code_root_rs_length_seq.set_initial(0);
   _cost_per_byte_copied_ms_seq.set_initial(cost_per_byte_ms_defaults[index]);
 
   _constant_other_time_ms_seq.add(constant_other_time_ms_defaults[index]);
@@ -186,6 +189,10 @@ void G1Analytics::report_cost_per_card_merge_ms(double cost_per_card_ms, bool fo
   _cost_per_card_merge_ms_seq.add(cost_per_card_ms, for_young_only_phase);
 }
 
+void G1Analytics::report_cost_per_code_root_scan_ms(double cost_per_code_root_ms, bool for_young_only_phase) {
+  _cost_per_code_root_ms_seq.add(cost_per_code_root_ms, for_young_only_phase);
+}
+
 void G1Analytics::report_card_scan_to_merge_ratio(double merge_to_scan_ratio, bool for_young_only_phase) {
   _card_scan_to_merge_ratio_seq.add(merge_to_scan_ratio, for_young_only_phase);
 }
@@ -214,6 +221,10 @@ void G1Analytics::report_rs_length(double rs_length, bool for_young_only_phase)
   _rs_length_seq.add(rs_length, for_young_only_phase);
 }
 
+void G1Analytics::report_code_root_rs_length(double code_root_rs_length, bool for_young_only_phase) {
+  _code_root_rs_length_seq.add(code_root_rs_length, for_young_only_phase);
+}
+
 double G1Analytics::predict_alloc_rate_ms() const {
   if (enough_samples_available(&_alloc_rate_ms_seq)) {
     return predict_zero_bounded(&_alloc_rate_ms_seq);
@@ -242,6 +253,10 @@ double G1Analytics::predict_card_merge_time_ms(size_t card_num, bool for_young_o
   return card_num * predict_zero_bounded(&_cost_per_card_merge_ms_seq, for_young_only_phase);
 }
 
+double G1Analytics::predict_code_root_scan_time_ms(size_t code_root_num, bool for_young_only_phase) const {
+  return code_root_num * predict_zero_bounded(&_cost_per_code_root_ms_seq, for_young_only_phase);
+}
+
 double G1Analytics::predict_card_scan_time_ms(size_t card_num, bool for_young_only_phase) const {
   return card_num * predict_zero_bounded(&_cost_per_card_scan_ms_seq, for_young_only_phase);
 }
@@ -274,6 +289,10 @@ size_t G1Analytics::predict_rs_length(bool for_young_only_phase) const {
   return predict_size(&_rs_length_seq, for_young_only_phase);
 }
 
+size_t G1Analytics::predict_code_root_rs_length(bool for_young_only_phase) const {
+  return predict_size(&_code_root_rs_length_seq, for_young_only_phase);
+}
+
 size_t G1Analytics::predict_pending_cards(bool for_young_only_phase) const {
   return predict_size(&_pending_cards_seq, for_young_only_phase);
 }
diff --git a/src/hotspot/share/gc/g1/g1Analytics.hpp b/src/hotspot/share/gc/g1/g1Analytics.hpp
index fd9c25e6757..fa9bb59bb7a 100644
--- a/src/hotspot/share/gc/g1/g1Analytics.hpp
+++ b/src/hotspot/share/gc/g1/g1Analytics.hpp
@@ -57,11 +57,14 @@ class G1Analytics: public CHeapObj<mtGC> {
   G1PhaseDependentSeq _cost_per_card_scan_ms_seq;
   // The cost to merge a card during young-only and mixed gcs in ms.
   G1PhaseDependentSeq _cost_per_card_merge_ms_seq;
+  // The cost to scan entries in the code root remembered set in ms.
+  G1PhaseDependentSeq _cost_per_code_root_ms_seq;
   // The cost to copy a byte in ms.
   G1PhaseDependentSeq _cost_per_byte_copied_ms_seq;
 
   G1PhaseDependentSeq _pending_cards_seq;
   G1PhaseDependentSeq _rs_length_seq;
+  G1PhaseDependentSeq _code_root_rs_length_seq;
 
   TruncatedSeq _constant_other_time_ms_seq;
   TruncatedSeq _young_other_cost_per_region_ms_seq;
@@ -127,6 +130,7 @@ class G1Analytics: public CHeapObj<mtGC> {
   void report_dirtied_cards_in_thread_buffers(size_t num_cards);
   void report_cost_per_card_scan_ms(double cost_per_remset_card_ms, bool for_young_only_phase);
   void report_cost_per_card_merge_ms(double cost_per_card_ms, bool for_young_only_phase);
+  void report_cost_per_code_root_scan_ms(double cost_per_code_root_ms, bool for_young_only_phase);
   void report_card_scan_to_merge_ratio(double cards_per_entry_ratio, bool for_young_only_phase);
   void report_rs_length_diff(double rs_length_diff, bool for_young_only_phase);
   void report_cost_per_byte_ms(double cost_per_byte_ms, bool for_young_only_phase);
@@ -135,6 +139,7 @@ class G1Analytics: public CHeapObj<mtGC> {
   void report_constant_other_time_ms(double constant_other_time_ms);
   void report_pending_cards(double pending_cards, bool for_young_only_phase);
   void report_rs_length(double rs_length, bool for_young_only_phase);
+  void report_code_root_rs_length(double code_root_rs_length, bool for_young_only_phase);
 
   double predict_alloc_rate_ms() const;
   int num_alloc_rate_ms() const;
@@ -150,6 +155,8 @@ class G1Analytics: public CHeapObj<mtGC> {
   double predict_card_merge_time_ms(size_t card_num, bool for_young_only_phase) const;
   double predict_card_scan_time_ms(size_t card_num, bool for_young_only_phase) const;
 
+  double predict_code_root_scan_time_ms(size_t code_root_num, bool for_young_only_phase) const;
+
   double predict_object_copy_time_ms(size_t bytes_to_copy, bool for_young_only_phase) const;
 
   double predict_constant_other_time_ms() const;
@@ -163,6 +170,7 @@ class G1Analytics: public CHeapObj<mtGC> {
   double predict_cleanup_time_ms() const;
 
   size_t predict_rs_length(bool for_young_only_phase) const;
+  size_t predict_code_root_rs_length(bool for_young_only_phase) const;
   size_t predict_pending_cards(bool for_young_only_phase) const;
 
   // Add a new GC of the given duration and end time to the record.
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
index ff4e95dceca..9aab42afc45 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
@@ -280,18 +280,21 @@ uint64_t G1ConcurrentRefine::adjust_threads_wait_ms() const {
 class G1ConcurrentRefine::RemSetSamplingClosure : public HeapRegionClosure {
   G1CollectionSet* _cset;
   size_t _sampled_rs_length;
+  size_t _sampled_code_root_rs_length;
 
 public:
   explicit RemSetSamplingClosure(G1CollectionSet* cset) :
-    _cset(cset), _sampled_rs_length(0) {}
+    _cset(cset), _sampled_rs_length(0), _sampled_code_root_rs_length(0) {}
 
   bool do_heap_region(HeapRegion* r) override {
-    size_t rs_length = r->rem_set()->occupied();
-    _sampled_rs_length += rs_length;
+    HeapRegionRemSet* rem_set = r->rem_set();
+    _sampled_rs_length += rem_set->occupied();
+    _sampled_code_root_rs_length += rem_set->code_roots_list_length();
     return false;
   }
 
   size_t sampled_rs_length() const { return _sampled_rs_length; }
+  size_t sampled_code_root_rs_length() const { return _sampled_code_root_rs_length; }
 };
 
 // Adjust the target length (in regions) of the young gen, based on the the
@@ -311,7 +314,7 @@ void G1ConcurrentRefine::adjust_young_list_target_length() {
     G1CollectionSet* cset = G1CollectedHeap::heap()->collection_set();
     RemSetSamplingClosure cl{cset};
     cset->iterate(&cl);
-    _policy->revise_young_list_target_length(cl.sampled_rs_length());
+    _policy->revise_young_list_target_length(cl.sampled_rs_length(), cl.sampled_code_root_rs_length());
   }
 }
 
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index 95603039e8b..4990dd64217 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -189,13 +189,14 @@ void G1Policy::update_young_length_bounds() {
   assert(!Universe::is_fully_initialized() || SafepointSynchronize::is_at_safepoint(), "must be");
   bool for_young_only_phase = collector_state()->in_young_only_phase();
   update_young_length_bounds(_analytics->predict_pending_cards(for_young_only_phase),
-                             _analytics->predict_rs_length(for_young_only_phase));
+                             _analytics->predict_rs_length(for_young_only_phase),
+                             _analytics->predict_code_root_rs_length(for_young_only_phase));
 }
 
-void G1Policy::update_young_length_bounds(size_t pending_cards, size_t rs_length) {
+void G1Policy::update_young_length_bounds(size_t pending_cards, size_t rs_length, size_t code_root_rs_length) {
   uint old_young_list_target_length = young_list_target_length();
 
-  uint new_young_list_desired_length = calculate_young_desired_length(pending_cards, rs_length);
+  uint new_young_list_desired_length = calculate_young_desired_length(pending_cards, rs_length, code_root_rs_length);
   uint new_young_list_target_length = calculate_young_target_length(new_young_list_desired_length);
   uint new_young_list_max_length = calculate_young_max_length(new_young_list_target_length);
 
@@ -234,7 +235,9 @@ void G1Policy::update_young_length_bounds(size_t pending_cards, size_t rs_length
 // value smaller than what is already allocated or what can actually be allocated.
 // This return value is only an expectation.
 //
-uint G1Policy::calculate_young_desired_length(size_t pending_cards, size_t rs_length) const {
+uint G1Policy::calculate_young_desired_length(size_t pending_cards,
+                                              size_t rs_length,
+                                              size_t code_root_rs_length) const {
   uint min_young_length_by_sizer = _young_gen_sizer.min_desired_young_length();
   uint max_young_length_by_sizer = _young_gen_sizer.max_desired_young_length();
 
@@ -267,7 +270,7 @@ uint G1Policy::calculate_young_desired_length(size_t pending_cards, size_t rs_le
   if (use_adaptive_young_list_length()) {
     desired_eden_length_by_mmu = calculate_desired_eden_length_by_mmu();
 
-    double base_time_ms = predict_base_time_ms(pending_cards, rs_length);
+    double base_time_ms = predict_base_time_ms(pending_cards, rs_length, code_root_rs_length);
     double retained_time_ms = predict_retained_regions_evac_time();
     double total_time_ms = base_time_ms + retained_time_ms;
 
@@ -550,13 +553,13 @@ G1GCPhaseTimes* G1Policy::phase_times() const {
   return _phase_times;
 }
 
-void G1Policy::revise_young_list_target_length(size_t rs_length) {
+void G1Policy::revise_young_list_target_length(size_t rs_length, size_t code_root_rs_length) {
   guarantee(use_adaptive_young_list_length(), "should not call this otherwise" );
 
   size_t thread_buffer_cards = _analytics->predict_dirtied_cards_in_thread_buffers();
   G1DirtyCardQueueSet& dcqs = G1BarrierSet::dirty_card_queue_set();
   size_t pending_cards = dcqs.num_cards() + thread_buffer_cards;
-  update_young_length_bounds(pending_cards, rs_length);
+  update_young_length_bounds(pending_cards, rs_length, code_root_rs_length);
 }
 
 void G1Policy::record_full_collection_start() {
@@ -890,6 +893,17 @@ void G1Policy::record_young_collection_end(bool concurrent_operation_is_full_mar
     }
     _analytics->report_card_scan_to_merge_ratio(scan_to_merge_ratio, is_young_only_pause);
 
+    // Update prediction for code root scan
+    size_t const total_code_roots_scanned = p->sum_thread_work_items(G1GCPhaseTimes::CodeRoots, G1GCPhaseTimes::CodeRootsScannedNMethods) +
+                                            p->sum_thread_work_items(G1GCPhaseTimes::OptCodeRoots, G1GCPhaseTimes::CodeRootsScannedNMethods);
+
+    if (total_code_roots_scanned >= G1NumCodeRootsCostSampleThreshold) {
+      double avg_time_code_root_scan = average_time_ms(G1GCPhaseTimes::CodeRoots) +
+                                       average_time_ms(G1GCPhaseTimes::OptCodeRoots);
+
+      _analytics->report_cost_per_code_root_scan_ms(avg_time_code_root_scan / total_code_roots_scanned, is_young_only_pause);
+    }
+
     // Update prediction for copy cost per byte
     size_t copied_bytes = p->sum_thread_work_items(G1GCPhaseTimes::MergePSS, G1GCPhaseTimes::MergePSSCopiedBytes);
 
@@ -912,6 +926,7 @@ void G1Policy::record_young_collection_end(bool concurrent_operation_is_full_mar
 
     _analytics->report_pending_cards((double)pending_cards_at_gc_start(), is_young_only_pause);
     _analytics->report_rs_length((double)_rs_length, is_young_only_pause);
+    _analytics->report_code_root_rs_length((double)total_code_roots_scanned, is_young_only_pause);
   }
 
   assert(!(G1GCPauseTypeHelper::is_concurrent_start_pause(this_pause) && collector_state()->mark_or_rebuild_in_progress()),
@@ -1033,7 +1048,8 @@ void G1Policy::record_young_gc_pause_end(bool evacuation_failed) {
 }
 
 double G1Policy::predict_base_time_ms(size_t pending_cards,
-                                      size_t rs_length) const {
+                                      size_t rs_length,
+                                      size_t code_root_rs_length) const {
   bool in_young_only_phase = collector_state()->in_young_only_phase();
 
   size_t unique_cards_from_rs = _analytics->predict_scan_card_num(rs_length, in_young_only_phase);
@@ -1043,22 +1059,26 @@ double G1Policy::predict_base_time_ms(size_t pending_cards,
 
   double card_merge_time = _analytics->predict_card_merge_time_ms(pending_cards + rs_length, in_young_only_phase);
   double card_scan_time = _analytics->predict_card_scan_time_ms(effective_scanned_cards, in_young_only_phase);
+  double code_root_scan_time = _analytics->predict_code_root_scan_time_ms(code_root_rs_length, in_young_only_phase);
   double constant_other_time = _analytics->predict_constant_other_time_ms();
   double survivor_evac_time = predict_survivor_regions_evac_time();
 
-  double total_time = card_merge_time + card_scan_time + constant_other_time + survivor_evac_time;
+  double total_time = card_merge_time + card_scan_time + code_root_scan_time + constant_other_time + survivor_evac_time;
 
   log_trace(gc, ergo, heap)("Predicted base time: total %f lb_cards %zu rs_length %zu effective_scanned_cards %zu "
-                            "card_merge_time %f card_scan_time %f constant_other_time %f survivor_evac_time %f",
+                            "card_merge_time %f card_scan_time %f code_root_rs_length %zu code_root_scan_time %f "
+                            "constant_other_time %f survivor_evac_time %f",
                             total_time, pending_cards, rs_length, effective_scanned_cards,
-                            card_merge_time, card_scan_time, constant_other_time, survivor_evac_time);
+                            card_merge_time, card_scan_time, code_root_rs_length, code_root_scan_time,
+                            constant_other_time, survivor_evac_time);
   return total_time;
 }
 
 double G1Policy::predict_base_time_ms(size_t pending_cards) const {
   bool for_young_only_phase = collector_state()->in_young_only_phase();
   size_t rs_length = _analytics->predict_rs_length(for_young_only_phase);
-  return predict_base_time_ms(pending_cards, rs_length);
+  size_t code_root_rs_length = _analytics->predict_code_root_rs_length(for_young_only_phase);
+  return predict_base_time_ms(pending_cards, rs_length, code_root_rs_length);
 }
 
 size_t G1Policy::predict_bytes_to_copy(HeapRegion* hr) const {
@@ -1100,10 +1120,18 @@ double G1Policy::predict_region_merge_scan_time(HeapRegion* hr, bool for_young_o
     _analytics->predict_card_scan_time_ms(scan_card_num, for_young_only_phase);
 }
 
+double G1Policy::predict_region_code_root_scan_time(HeapRegion* hr, bool for_young_only_phase) const {
+  size_t code_root_length = hr->rem_set()->code_roots_list_length();
+
+  return
+    _analytics->predict_code_root_scan_time_ms(code_root_length, for_young_only_phase);
+}
+
 double G1Policy::predict_region_non_copy_time_ms(HeapRegion* hr,
                                                  bool for_young_only_phase) const {
 
-  double region_elapsed_time_ms = predict_region_merge_scan_time(hr, for_young_only_phase);
+  double region_elapsed_time_ms = predict_region_merge_scan_time(hr, for_young_only_phase) +
+                                  predict_region_code_root_scan_time(hr, for_young_only_phase);
   // The prediction of the "other" time for this region is based
   // upon the region type and NOT the GC type.
   if (hr->is_young()) {
diff --git a/src/hotspot/share/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp
index fa9ae52c647..e478f7ebcdb 100644
--- a/src/hotspot/share/gc/g1/g1Policy.hpp
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp
@@ -142,12 +142,15 @@ class G1Policy: public CHeapObj<mtGC> {
   // Base time contains handling remembered sets and constant other time of the
   // whole young gen, refinement buffers, and copying survivors.
   // Basically everything but copying eden regions.
-  double predict_base_time_ms(size_t pending_cards, size_t rs_length) const;
+  double predict_base_time_ms(size_t pending_cards, size_t rs_length, size_t code_root_length) const;
 
   // Copy time for a region is copying live data.
   double predict_region_copy_time_ms(HeapRegion* hr, bool for_young_only_phase) const;
-  // Merge-scan time for a region is handling remembered sets of that region (as a single unit).
+  // Merge-scan time for a region is handling card-based remembered sets of that region
+  // (as a single unit).
   double predict_region_merge_scan_time(HeapRegion* hr, bool for_young_only_phase) const;
+  // Code root scan time prediction for the given region.
+  double predict_region_code_root_scan_time(HeapRegion* hr, bool for_young_only_phase) const;
   // Non-copy time for a region is handling remembered sets and other time.
   double predict_region_non_copy_time_ms(HeapRegion* hr, bool for_young_only_phase) const;
 
@@ -207,10 +210,10 @@ class G1Policy: public CHeapObj<mtGC> {
   double _mark_cleanup_start_sec;
 
   // Updates the internal young gen maximum and target and desired lengths.
-  // If no parameters are passed, predict pending cards and the RS length using
-  // the prediction model.
+  // If no parameters are passed, predict pending cards, card set remset length and
+  // code root remset length using the prediction model.
   void update_young_length_bounds();
-  void update_young_length_bounds(size_t pending_cards, size_t rs_length);
+  void update_young_length_bounds(size_t pending_cards, size_t rs_length, size_t code_root_rs_length);
 
   // Calculate and return the minimum desired eden length based on the MMU target.
   uint calculate_desired_eden_length_by_mmu() const;
@@ -238,7 +241,7 @@ class G1Policy: public CHeapObj<mtGC> {
 
   // Calculate desired young length based on current situation without taking actually
   // available free regions into account.
-  uint calculate_young_desired_length(size_t pending_cards, size_t rs_length) const;
+  uint calculate_young_desired_length(size_t pending_cards, size_t rs_length, size_t code_root_rs_length) const;
   // Limit the given desired young length to available free regions.
   uint calculate_young_target_length(uint desired_young_length) const;
   // The GCLocker might cause us to need more regions than the target. Calculate
@@ -301,7 +304,7 @@ class G1Policy: public CHeapObj<mtGC> {
   // Check the current value of the young list RSet length and
   // compare it against the last prediction. If the current value is
   // higher, recalculate the young list target length prediction.
-  void revise_young_list_target_length(size_t rs_length);
+  void revise_young_list_target_length(size_t rs_length, size_t code_root_rs_length);
 
   // This should be called after the heap is resized.
   void record_new_heap_size(uint new_number_of_regions);
diff --git a/src/hotspot/share/gc/g1/g1_globals.hpp b/src/hotspot/share/gc/g1/g1_globals.hpp
index 73f082b530e..9ec0b45d22a 100644
--- a/src/hotspot/share/gc/g1/g1_globals.hpp
+++ b/src/hotspot/share/gc/g1/g1_globals.hpp
@@ -325,9 +325,14 @@
           range(1, 256)                                                     \
                                                                             \
   product(uint, G1NumCardsCostSampleThreshold, 1000, DIAGNOSTIC,            \
-          "Threshold for the number of cards when reporting card cost "     \
-          "related prediction sample. That sample must involve the same or "\
-          "more than that number of cards to be used.")                     \
+          "Threshold for the number of cards when reporting remembered set "\
+          "card cost related prediction samples. A sample must involve "    \
+          "the same or more than that number of cards to be used.")         \
+                                                                            \
+  product(uint, G1NumCodeRootsCostSampleThreshold, 100, DIAGNOSTIC,         \
+          "Threshold for the number of code roots when reporting code root "\
+          "scan cost related prediction samples. A sample must involve "    \
+          "the same or more than this number of code roots to be used.")    \
                                                                             \
   GC_G1_EVACUATION_FAILURE_FLAGS(develop,                                   \
                     develop_pd,                                             \

From 86115c2a2e9912c5cd5861e4fa16ac09dee24f6d Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 19 Sep 2023 08:25:52 +0000
Subject: [PATCH 075/112] 8316420: Serial: Remove unused
 GenCollectedHeap::oop_iterate

Reviewed-by: stefank, tschatzl
---
 src/hotspot/share/gc/shared/genCollectedHeap.cpp |  5 -----
 src/hotspot/share/gc/shared/genCollectedHeap.hpp |  1 -
 src/hotspot/share/gc/shared/generation.cpp       | 15 ---------------
 src/hotspot/share/gc/shared/generation.hpp       |  4 ----
 src/hotspot/share/gc/shared/space.cpp            | 15 ---------------
 src/hotspot/share/gc/shared/space.hpp            |  6 ------
 6 files changed, 46 deletions(-)

diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp
index 88feee798c7..5924477e452 100644
--- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp
@@ -832,11 +832,6 @@ bool GenCollectedHeap::is_in_partial_collection(const void* p) {
 }
 #endif
 
-void GenCollectedHeap::oop_iterate(OopIterateClosure* cl) {
-  _young_gen->oop_iterate(cl);
-  _old_gen->oop_iterate(cl);
-}
-
 void GenCollectedHeap::object_iterate(ObjectClosure* cl) {
   _young_gen->object_iterate(cl);
   _old_gen->object_iterate(cl);
diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.hpp b/src/hotspot/share/gc/shared/genCollectedHeap.hpp
index f1f3fcf4e08..131a274813d 100644
--- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp
@@ -195,7 +195,6 @@ class GenCollectedHeap : public CollectedHeap {
   void prune_scavengable_nmethods();
 
   // Iteration functions.
-  void oop_iterate(OopIterateClosure* cl);
   void object_iterate(ObjectClosure* cl) override;
 
   // A CollectedHeap is divided into a dense sequence of "blocks"; that is,
diff --git a/src/hotspot/share/gc/shared/generation.cpp b/src/hotspot/share/gc/shared/generation.cpp
index 1da1d9cab46..5339bd677a0 100644
--- a/src/hotspot/share/gc/shared/generation.cpp
+++ b/src/hotspot/share/gc/shared/generation.cpp
@@ -233,21 +233,6 @@ bool Generation::block_is_obj(const HeapWord* p) const {
   return blk.is_obj;
 }
 
-class GenerationOopIterateClosure : public SpaceClosure {
- public:
-  OopIterateClosure* _cl;
-  virtual void do_space(Space* s) {
-    s->oop_iterate(_cl);
-  }
-  GenerationOopIterateClosure(OopIterateClosure* cl) :
-    _cl(cl) {}
-};
-
-void Generation::oop_iterate(OopIterateClosure* cl) {
-  GenerationOopIterateClosure blk(cl);
-  space_iterate(&blk);
-}
-
 class GenerationObjIterateClosure : public SpaceClosure {
  private:
   ObjectClosure* _cl;
diff --git a/src/hotspot/share/gc/shared/generation.hpp b/src/hotspot/share/gc/shared/generation.hpp
index eb8b5a19f33..371692bcd8b 100644
--- a/src/hotspot/share/gc/shared/generation.hpp
+++ b/src/hotspot/share/gc/shared/generation.hpp
@@ -322,10 +322,6 @@ class Generation: public CHeapObj<mtGC> {
 
   // Iteration.
 
-  // Iterate over all the ref-containing fields of all objects in the
-  // generation, calling "cl.do_oop" on each.
-  virtual void oop_iterate(OopIterateClosure* cl);
-
   // Iterate over all objects in the generation, calling "cl.do_object" on
   // each.
   virtual void object_iterate(ObjectClosure* cl);
diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
index 48a1f01b917..e78bc79759c 100644
--- a/src/hotspot/share/gc/shared/space.cpp
+++ b/src/hotspot/share/gc/shared/space.cpp
@@ -518,26 +518,11 @@ void ContiguousSpace::verify() const {
   }
 }
 
-void Space::oop_iterate(OopIterateClosure* blk) {
-  ObjectToOopClosure blk2(blk);
-  object_iterate(&blk2);
-}
-
 bool Space::obj_is_alive(const HeapWord* p) const {
   assert (block_is_obj(p), "The address should point to an object");
   return true;
 }
 
-void ContiguousSpace::oop_iterate(OopIterateClosure* blk) {
-  if (is_empty()) return;
-  HeapWord* obj_addr = bottom();
-  HeapWord* t = top();
-  // Could call objects iterate, but this is easier.
-  while (obj_addr < t) {
-    obj_addr += cast_to_oop(obj_addr)->oop_iterate_size(blk);
-  }
-}
-
 void ContiguousSpace::object_iterate(ObjectClosure* blk) {
   if (is_empty()) return;
   object_iterate_from(bottom(), blk);
diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index 7282b4de2bf..514504c2fe0 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.hpp
@@ -163,11 +163,6 @@ class Space: public CHeapObj<mtGC> {
   virtual size_t used() const = 0;
   virtual size_t free() const = 0;
 
-  // Iterate over all the ref-containing fields of all objects in the
-  // space, calling "cl.do_oop" on each.  Fields in objects allocated by
-  // applications of the closure are not included in the iteration.
-  virtual void oop_iterate(OopIterateClosure* cl);
-
   // Iterate over all objects in the space, calling "cl.do_object" on
   // each.  Objects allocated by applications of the closure are not
   // included in the iteration.
@@ -444,7 +439,6 @@ class ContiguousSpace: public Space {
   HeapWord* par_allocate(size_t word_size) override;
 
   // Iteration
-  void oop_iterate(OopIterateClosure* cl) override;
   void object_iterate(ObjectClosure* blk) override;
 
   // Compaction support

From 283c360392a88c362b2087ca12413552b6e44d0f Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Tue, 19 Sep 2023 08:26:25 +0000
Subject: [PATCH 076/112] 8314877: Make fields final in 'java.net' package

Reviewed-by: jpai
---
 .../share/classes/java/net/HttpConnectSocketImpl.java  |  2 +-
 .../share/classes/java/net/HttpRetryException.java     |  4 ++--
 src/java.base/share/classes/java/net/IDN.java          |  8 +++++---
 .../share/classes/java/net/PasswordAuthentication.java |  6 +++---
 src/java.base/share/classes/java/net/Proxy.java        |  4 ++--
 .../share/classes/java/net/SocketPermission.java       | 10 ++--------
 src/java.base/share/classes/java/net/URI.java          |  4 ++--
 src/java.base/share/classes/java/net/URL.java          |  8 ++++----
 .../share/classes/java/net/URLClassLoader.java         |  2 +-
 .../share/classes/java/net/URLConnection.java          |  2 +-
 10 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java b/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
index ab8429d7d51..742187e3454 100644
--- a/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
+++ b/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
@@ -53,7 +53,7 @@
     private final String server;
     private final Socket socket;
     private InetSocketAddress external_address;
-    private HashMap<Integer, Object> optionsMap = new HashMap<>();
+    private final HashMap<Integer, Object> optionsMap = new HashMap<>();
 
     static  {
         try {
diff --git a/src/java.base/share/classes/java/net/HttpRetryException.java b/src/java.base/share/classes/java/net/HttpRetryException.java
index 310a9e7b5fa..fefeb9bb687 100644
--- a/src/java.base/share/classes/java/net/HttpRetryException.java
+++ b/src/java.base/share/classes/java/net/HttpRetryException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@ public class HttpRetryException extends IOException {
     /**
      * The response code.
      */
-    private int responseCode;
+    private final int responseCode;
 
     /**
      * The URL to be redirected to.
diff --git a/src/java.base/share/classes/java/net/IDN.java b/src/java.base/share/classes/java/net/IDN.java
index 14fc3a28396..5e01ab6532d 100644
--- a/src/java.base/share/classes/java/net/IDN.java
+++ b/src/java.base/share/classes/java/net/IDN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -242,9 +242,10 @@ public static String toUnicode(String input) {
     private static final int MAX_LABEL_LENGTH   = 63;
 
     // single instance of nameprep
-    private static StringPrep namePrep = null;
+    private static final StringPrep namePrep;
 
     static {
+        StringPrep stringPrep = null;
         try {
             final String IDN_PROFILE = "/sun/net/idn/uidna.spp";
             @SuppressWarnings("removal")
@@ -255,12 +256,13 @@ public InputStream run() {
                             }})
                     : StringPrep.class.getResourceAsStream(IDN_PROFILE);
 
-            namePrep = new StringPrep(stream);
+            stringPrep = new StringPrep(stream);
             stream.close();
         } catch (IOException e) {
             // should never reach here
             assert false;
         }
+        namePrep = stringPrep;
     }
 
 
diff --git a/src/java.base/share/classes/java/net/PasswordAuthentication.java b/src/java.base/share/classes/java/net/PasswordAuthentication.java
index 5529568f3a3..d2bc4fa0b73 100644
--- a/src/java.base/share/classes/java/net/PasswordAuthentication.java
+++ b/src/java.base/share/classes/java/net/PasswordAuthentication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,8 +39,8 @@
 
 public final class PasswordAuthentication {
 
-    private String userName;
-    private char[] password;
+    private final String userName;
+    private final char[] password;
 
     /**
      * Creates a new {@code PasswordAuthentication} object from the given
diff --git a/src/java.base/share/classes/java/net/Proxy.java b/src/java.base/share/classes/java/net/Proxy.java
index 13624e7681e..db434238558 100644
--- a/src/java.base/share/classes/java/net/Proxy.java
+++ b/src/java.base/share/classes/java/net/Proxy.java
@@ -59,8 +59,8 @@ public enum Type {
         SOCKS
     };
 
-    private Type type;
-    private SocketAddress sa;
+    private final Type type;
+    private final SocketAddress sa;
 
     /**
      * A proxy setting that represents a {@code DIRECT} connection,
diff --git a/src/java.base/share/classes/java/net/SocketPermission.java b/src/java.base/share/classes/java/net/SocketPermission.java
index 2027676c36a..6c9647d888c 100644
--- a/src/java.base/share/classes/java/net/SocketPermission.java
+++ b/src/java.base/share/classes/java/net/SocketPermission.java
@@ -44,6 +44,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import sun.net.util.IPAddressUtil;
 import sun.net.PortConfig;
+import sun.security.action.GetBooleanAction;
 import sun.security.util.RegisteredDomain;
 import sun.security.util.SecurityConstants;
 import sun.security.util.Debug;
@@ -234,7 +235,7 @@ public final class SocketPermission extends Permission
     private transient boolean trusted;
 
     // true if the sun.net.trustNameService system property is set
-    private static boolean trustNameService;
+    private static final boolean trustNameService = GetBooleanAction.privilegedGetProperty("sun.net.trustNameService");
 
     private static Debug debug = null;
     private static boolean debugInit = false;
@@ -245,13 +246,6 @@ private static class EphemeralRange {
             static final int high = initEphemeralPorts("high", PORT_MAX);
     };
 
-    static {
-        @SuppressWarnings("removal")
-        Boolean tmp = java.security.AccessController.doPrivileged(
-                new sun.security.action.GetBooleanAction("sun.net.trustNameService"));
-        trustNameService = tmp.booleanValue();
-    }
-
     private static synchronized Debug getDebug() {
         if (!debugInit) {
             debug = Debug.getInstance("access");
diff --git a/src/java.base/share/classes/java/net/URI.java b/src/java.base/share/classes/java/net/URI.java
index 2e01b0cf32b..3aa2a18ccf8 100644
--- a/src/java.base/share/classes/java/net/URI.java
+++ b/src/java.base/share/classes/java/net/URI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2977,7 +2977,7 @@ private static String decode(String s, boolean ignorePercentInBrackets) {
 
     private class Parser {
 
-        private String input;           // URI input string
+        private final String input;           // URI input string
         private boolean requireServerAuthority = false;
 
         Parser(String s) {
diff --git a/src/java.base/share/classes/java/net/URL.java b/src/java.base/share/classes/java/net/URL.java
index db4065a6808..cc9829c3102 100644
--- a/src/java.base/share/classes/java/net/URL.java
+++ b/src/java.base/share/classes/java/net/URL.java
@@ -1471,10 +1471,10 @@ private static URLStreamHandler lookupViaProperty(String protocol) {
     private static Iterator<URLStreamHandlerProvider> providers() {
         return new Iterator<>() {
 
-            ClassLoader cl = ClassLoader.getSystemClassLoader();
-            ServiceLoader<URLStreamHandlerProvider> sl =
+            final ClassLoader cl = ClassLoader.getSystemClassLoader();
+            final ServiceLoader<URLStreamHandlerProvider> sl =
                     ServiceLoader.load(URLStreamHandlerProvider.class, cl);
-            Iterator<URLStreamHandlerProvider> i = sl.iterator();
+            final Iterator<URLStreamHandlerProvider> i = sl.iterator();
 
             URLStreamHandlerProvider next = null;
 
@@ -1589,7 +1589,7 @@ static boolean isOverrideable(String protocol) {
     /**
      * A table of protocol handlers.
      */
-    static Hashtable<String,URLStreamHandler> handlers = new Hashtable<>();
+    private static final Hashtable<String, URLStreamHandler> handlers = new Hashtable<>();
     private static final Object streamHandlerLock = new Object();
 
     /**
diff --git a/src/java.base/share/classes/java/net/URLClassLoader.java b/src/java.base/share/classes/java/net/URLClassLoader.java
index 724ead583e4..3f530ec4618 100644
--- a/src/java.base/share/classes/java/net/URLClassLoader.java
+++ b/src/java.base/share/classes/java/net/URLClassLoader.java
@@ -264,7 +264,7 @@ public URLClassLoader(String name, URL[] urls, ClassLoader parent,
      * we have to keep a weak reference to each stream.
      */
 
-    private WeakHashMap<Closeable,Void>
+    private final WeakHashMap<Closeable,Void>
         closeables = new WeakHashMap<>();
 
     /**
diff --git a/src/java.base/share/classes/java/net/URLConnection.java b/src/java.base/share/classes/java/net/URLConnection.java
index 3ffcdba1848..aa95ca0e204 100644
--- a/src/java.base/share/classes/java/net/URLConnection.java
+++ b/src/java.base/share/classes/java/net/URLConnection.java
@@ -308,7 +308,7 @@ public static FileNameMap getFileNameMap() {
 
         if (map == null) {
             fileNameMap = map = new FileNameMap() {
-                private FileNameMap internalMap =
+                private final FileNameMap internalMap =
                     sun.net.www.MimeTable.loadTable();
 
                 public String getContentTypeFor(String fileName) {

From fab372d3a23b17f64ae4306e28bdb0bc511f4912 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Tue, 19 Sep 2023 08:30:17 +0000
Subject: [PATCH 077/112] 8316428: G1: Nmethod count statistics only count last
 code root set iterated

Reviewed-by: iwalulya, ayang
---
 src/hotspot/share/gc/g1/g1RemSet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index 2a7077d3724..09b5f4ee80e 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -849,7 +849,7 @@ class G1ScanCollectionSetRegionClosure : public HeapRegionClosure {
       // Scan the code root list attached to the current region
       r->code_roots_do(&cl);
 
-      _code_roots_scanned = cl.count();
+      _code_roots_scanned += cl.count();
 
       event.commit(GCId::current(), _worker_id, G1GCPhaseTimes::phase_name(_code_roots_phase));
     }

From 670b4567cf8229c9fd40c639a04dd1f1b7cfd551 Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@openjdk.org>
Date: Tue, 19 Sep 2023 09:16:57 +0000
Subject: [PATCH 078/112] 8315038: Capstone disassembler stops when it sees a
 bad instruction

Reviewed-by: jvernee, shade
---
 src/utils/hsdis/capstone/hsdis-capstone.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/utils/hsdis/capstone/hsdis-capstone.c b/src/utils/hsdis/capstone/hsdis-capstone.c
index 3212030bb95..ef65a01efca 100644
--- a/src/utils/hsdis/capstone/hsdis-capstone.c
+++ b/src/utils/hsdis/capstone/hsdis-capstone.c
@@ -150,6 +150,11 @@ void* decode_instructions_virtual(uintptr_t start_va, uintptr_t end_va,
   Options ops = parse_options(options, printf_callback, printf_stream);
   cs_option(cs_handle, CS_OPT_SYNTAX, ops.intel_syntax ? CS_OPT_SYNTAX_INTEL : CS_OPT_SYNTAX_ATT);
 
+  // Turn on SKIPDATA mode to skip broken instructions. HotSpot often
+  // has embedded data in method bodies, and we need disassembly to
+  // continue when such non-instructions are not recognized.
+  cs_option(cs_handle, CS_OPT_SKIPDATA, CS_OPT_ON);
+
   cs_insn *insn;
   size_t count = cs_disasm(cs_handle, buffer, length, (uintptr_t) buffer, 0 , &insn);
   if (count) {

From 4461eeb31d5ccc89e304329a7dccb9cb130713fc Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 19 Sep 2023 10:58:12 +0000
Subject: [PATCH 079/112] 8312498: Thread::getState and JVM TI GetThreadState
 should return TIMED_WAITING virtual thread is timed parked

Reviewed-by: sspitsyn, rpressler
---
 src/hotspot/share/classfile/javaClasses.cpp   |   9 +-
 src/hotspot/share/classfile/javaClasses.hpp   |  29 +-
 .../classes/java/lang/VirtualThread.java      |  78 ++--
 .../GetThreadState/GetThreadStateTest.java    | 416 ++++++++++++++++++
 .../GetThreadState/libGetThreadStateTest.c    |  51 +++
 .../VThreadEventTest/VThreadEventTest.java    |   6 +-
 .../lang/Thread/virtual/CustomScheduler.java  |  15 -
 .../java/lang/Thread/virtual/ThreadAPI.java   | 293 +++++++-----
 .../lang/Thread/virtual/ThreadBuilders.java   |   1 -
 .../lang/Thread/virtual/stress/ParkALot.java  |  94 ++++
 10 files changed, 816 insertions(+), 176 deletions(-)
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/GetThreadStateTest.java
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/libGetThreadStateTest.c
 create mode 100644 test/jdk/java/lang/Thread/virtual/stress/ParkALot.java

diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index 0c016202b8e..badab7aa6ef 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -1986,23 +1986,26 @@ int java_lang_VirtualThread::state(oop vthread) {
 
 JavaThreadStatus java_lang_VirtualThread::map_state_to_thread_status(int state) {
   JavaThreadStatus status = JavaThreadStatus::NEW;
-  switch (state) {
+  switch (state & ~SUSPENDED) {
     case NEW :
       status = JavaThreadStatus::NEW;
       break;
     case STARTED :
     case RUNNABLE :
-    case RUNNABLE_SUSPENDED :
     case RUNNING :
     case PARKING :
+    case TIMED_PARKING:
     case YIELDING :
       status = JavaThreadStatus::RUNNABLE;
       break;
     case PARKED :
-    case PARKED_SUSPENDED :
     case PINNED :
       status = JavaThreadStatus::PARKED;
       break;
+    case TIMED_PARKED:
+    case TIMED_PINNED:
+      status = JavaThreadStatus::PARKED_TIMED;
+      break;
     case TERMINATED :
       status = JavaThreadStatus::TERMINATED;
       break;
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index ee4ab1e80ae..c4a457e142b 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -521,20 +521,21 @@ class java_lang_VirtualThread : AllStatic {
   JFR_ONLY(static int _jfr_epoch_offset;)
  public:
   enum {
-    NEW          = 0,
-    STARTED      = 1,
-    RUNNABLE     = 2,
-    RUNNING      = 3,
-    PARKING      = 4,
-    PARKED       = 5,
-    PINNED       = 6,
-    YIELDING     = 7,
-    TERMINATED   = 99,
-
-    // can be suspended from scheduling when unmounted
-    SUSPENDED    = 1 << 8,
-    RUNNABLE_SUSPENDED = (RUNNABLE | SUSPENDED),
-    PARKED_SUSPENDED   = (PARKED | SUSPENDED)
+    NEW           = 0,
+    STARTED       = 1,
+    RUNNABLE      = 2,
+    RUNNING       = 3,
+    PARKING       = 4,
+    PARKED        = 5,
+    PINNED        = 6,
+    TIMED_PARKING = 7,
+    TIMED_PARKED  = 8,
+    TIMED_PINNED  = 9,
+    YIELDING      = 10,
+    TERMINATED    = 99,
+
+    // additional state bits
+    SUSPENDED    = 1 << 8,   // suspended when unmounted
   };
 
   static void compute_offsets();
diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
index 92a5b9547dd..e3b94c4ef90 100644
--- a/src/java.base/share/classes/java/lang/VirtualThread.java
+++ b/src/java.base/share/classes/java/lang/VirtualThread.java
@@ -86,41 +86,52 @@ final class VirtualThread extends BaseVirtualThread {
     private volatile int state;
 
     /*
-     * Virtual thread state and transitions:
+     * Virtual thread state transitions:
      *
-     *      NEW -> STARTED         // Thread.start
+     *      NEW -> STARTED         // Thread.start, schedule to run
      *  STARTED -> TERMINATED      // failed to start
      *  STARTED -> RUNNING         // first run
+     *  RUNNING -> TERMINATED      // done
      *
-     *  RUNNING -> PARKING         // Thread attempts to park
-     *  PARKING -> PARKED          // cont.yield successful, thread is parked
-     *  PARKING -> PINNED          // cont.yield failed, thread is pinned
+     *  RUNNING -> PARKING         // Thread parking with LockSupport.park
+     *  PARKING -> PARKED          // cont.yield successful, parked indefinitely
+     *  PARKING -> PINNED          // cont.yield failed, parked indefinitely on carrier
+     *   PARKED -> RUNNABLE        // unparked, schedule to continue
+     *   PINNED -> RUNNING         // unparked, continue execution on same carrier
      *
-     *   PARKED -> RUNNABLE        // unpark or interrupted
-     *   PINNED -> RUNNABLE        // unpark or interrupted
+     *       RUNNING -> TIMED_PARKING   // Thread parking with LockSupport.parkNanos
+     * TIMED_PARKING -> TIMED_PARKED    // cont.yield successful, timed-parked
+     * TIMED_PARKING -> TIMED_PINNED    // cont.yield failed, timed-parked on carrier
+     *  TIMED_PARKED -> RUNNABLE        // unparked, schedule to continue
+     *  TIMED_PINNED -> RUNNING         // unparked, continue execution on same carrier
      *
      * RUNNABLE -> RUNNING         // continue execution
-     *
+
      *  RUNNING -> YIELDING        // Thread.yield
      * YIELDING -> RUNNABLE        // yield successful
      * YIELDING -> RUNNING         // yield failed
-     *
-     *  RUNNING -> TERMINATED      // done
      */
     private static final int NEW      = 0;
     private static final int STARTED  = 1;
     private static final int RUNNABLE = 2;     // runnable-unmounted
     private static final int RUNNING  = 3;     // runnable-mounted
+
+    // untimed parking
     private static final int PARKING  = 4;
     private static final int PARKED   = 5;     // unmounted
     private static final int PINNED   = 6;     // mounted
-    private static final int YIELDING = 7;     // Thread.yield
+
+    // timed parking
+    private static final int TIMED_PARKING = 7;
+    private static final int TIMED_PARKED  = 8;
+    private static final int TIMED_PINNED  = 9;
+
+    private static final int YIELDING   = 10;  // Thread.yield
+
     private static final int TERMINATED = 99;  // final state
 
     // can be suspended from scheduling when unmounted
     private static final int SUSPENDED = 1 << 8;
-    private static final int RUNNABLE_SUSPENDED = (RUNNABLE | SUSPENDED);
-    private static final int PARKED_SUSPENDED   = (PARKED | SUSPENDED);
 
     // parking permit
     private volatile boolean parkPermit;
@@ -434,17 +445,18 @@ private boolean yieldContinuation() {
      * If yielding due to Thread.yield then it just submits the task to continue.
      */
     private void afterYield() {
-        int s = state();
-        assert (s == PARKING || s == YIELDING) && (carrierThread == null);
+        assert carrierThread == null;
 
-        if (s == PARKING) {
-            setState(PARKED);
+        int s = state();
+        if (s == PARKING || s == TIMED_PARKING) {
+            int newState = (s == PARKING) ? PARKED : TIMED_PARKED;
+            setState(newState);
 
             // notify JVMTI that unmount has completed, thread is parked
             notifyJvmtiUnmount(/*hide*/false);
 
             // may have been unparked while parking
-            if (parkPermit && compareAndSetState(PARKED, RUNNABLE)) {
+            if (parkPermit && compareAndSetState(newState, RUNNABLE)) {
                 // lazy submit to continue on the current thread as carrier if possible
                 if (currentThread() instanceof CarrierThread ct) {
                     lazySubmitRunContinuation(ct.getPool());
@@ -465,6 +477,8 @@ private void afterYield() {
             } else {
                 submitRunContinuation();
             }
+        } else {
+            assert false;
         }
     }
 
@@ -607,13 +621,13 @@ void parkNanos(long nanos) {
 
             boolean yielded = false;
             Future<?> unparker = scheduleUnpark(this::unpark, nanos);
-            setState(PARKING);
+            setState(TIMED_PARKING);
             try {
                 yielded = yieldContinuation();  // may throw
             } finally {
                 assert (Thread.currentThread() == this) && (yielded == (state() == RUNNING));
                 if (!yielded) {
-                    assert state() == PARKING;
+                    assert state() == TIMED_PARKING;
                     setState(RUNNING);
                 }
                 cancel(unparker);
@@ -645,7 +659,7 @@ private void parkOnCarrierThread(boolean timed, long nanos) {
             event = null;
         }
 
-        setState(PINNED);
+        setState(timed ? TIMED_PINNED : PINNED);
         try {
             if (!parkPermit) {
                 if (!timed) {
@@ -713,7 +727,8 @@ void unpark() {
         Thread currentThread = Thread.currentThread();
         if (!getAndSetParkPermit(true) && currentThread != this) {
             int s = state();
-            if (s == PARKED && compareAndSetState(PARKED, RUNNABLE)) {
+            boolean parked = (s == PARKED) || (s == TIMED_PARKED);
+            if (parked && compareAndSetState(s, RUNNABLE)) {
                 if (currentThread instanceof VirtualThread vthread) {
                     vthread.switchToCarrierThread();
                     try {
@@ -724,11 +739,11 @@ void unpark() {
                 } else {
                     submitRunContinuation();
                 }
-            } else if (s == PINNED) {
+            } else if ((s == PINNED) || (s == TIMED_PINNED)) {
                 // unpark carrier thread when pinned.
                 synchronized (carrierThreadAccessLock()) {
                     Thread carrier = carrierThread;
-                    if (carrier != null && state() == PINNED) {
+                    if (carrier != null && ((s = state()) == PINNED || s == TIMED_PINNED)) {
                         U.unpark(carrier);
                     }
                 }
@@ -865,7 +880,8 @@ boolean getAndClearInterrupt() {
 
     @Override
     Thread.State threadState() {
-        switch (state()) {
+        int s = state();
+        switch (s & ~SUSPENDED) {
             case NEW:
                 return Thread.State.NEW;
             case STARTED:
@@ -876,7 +892,6 @@ Thread.State threadState() {
                     return Thread.State.RUNNABLE;
                 }
             case RUNNABLE:
-            case RUNNABLE_SUSPENDED:
                 // runnable, not mounted
                 return Thread.State.RUNNABLE;
             case RUNNING:
@@ -890,13 +905,16 @@ Thread.State threadState() {
                 // runnable, mounted
                 return Thread.State.RUNNABLE;
             case PARKING:
+            case TIMED_PARKING:
             case YIELDING:
                 // runnable, mounted, not yet waiting
                 return Thread.State.RUNNABLE;
             case PARKED:
-            case PARKED_SUSPENDED:
             case PINNED:
-                return Thread.State.WAITING;
+                return State.WAITING;
+            case TIMED_PARKED:
+            case TIMED_PINNED:
+                return State.TIMED_WAITING;
             case TERMINATED:
                 return Thread.State.TERMINATED;
             default:
@@ -936,7 +954,7 @@ StackTraceElement[] asyncGetStackTrace() {
     private StackTraceElement[] tryGetStackTrace() {
         int initialState = state();
         return switch (initialState) {
-            case RUNNABLE, PARKED -> {
+            case RUNNABLE, PARKED, TIMED_PARKED -> {
                 int suspendedState = initialState | SUSPENDED;
                 if (compareAndSetState(initialState, suspendedState)) {
                     try {
@@ -948,7 +966,7 @@ private StackTraceElement[] tryGetStackTrace() {
                         // re-submit if runnable
                         // re-submit if unparked while suspended
                         if (initialState == RUNNABLE
-                            || (parkPermit && compareAndSetState(PARKED, RUNNABLE))) {
+                            || (parkPermit && compareAndSetState(initialState, RUNNABLE))) {
                             try {
                                 submitRunContinuation();
                             } catch (RejectedExecutionException ignore) { }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/GetThreadStateTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/GetThreadStateTest.java
new file mode 100644
index 00000000000..17c17b9b1f5
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/GetThreadStateTest.java
@@ -0,0 +1,416 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=default
+ * @bug 8312498
+ * @summary Basic test for JVMTI GetThreadState with virtual threads
+ * @run junit/othervm/native GetThreadStateTest
+ */
+
+/*
+ * @test id=no-vmcontinuations
+ * @requires vm.continuations
+ * @run junit/othervm/native -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations GetThreadStateTest
+ */
+
+import java.util.StringJoiner;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.LockSupport;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class GetThreadStateTest {
+
+    @BeforeAll
+    static void setup() {
+        System.loadLibrary("GetThreadStateTest");
+        init();
+    }
+
+    /**
+     * Test state of new/unstarted thread.
+     */
+    @Test
+    void testUnstarted() {
+        var thread = Thread.ofVirtual().unstarted(() -> { });
+        check(thread, /*new*/ 0);
+    }
+
+    /**
+     * Test state of terminated thread.
+     */
+    @Test
+    void testTerminated() throws Exception {
+        var thread = Thread.ofVirtual().start(() -> { });
+        thread.join();
+        check(thread, JVMTI_THREAD_STATE_TERMINATED);
+    }
+
+    /**
+     * Test state of runnable thread.
+     */
+    @Test
+    void testRunnable() throws Exception {
+        var latch = new CountDownLatch(1);
+        var done = new AtomicBoolean();
+        var thread = Thread.ofVirtual().start(() -> {
+            latch.countDown();
+
+            // spin until done
+            while (!done.get()) {
+                Thread.onSpinWait();
+            }
+        });
+        try {
+            // wait for thread to start execution
+            latch.await();
+
+            // thread should be runnable
+            int expected = JVMTI_THREAD_STATE_ALIVE | JVMTI_THREAD_STATE_RUNNABLE;
+            check(thread, expected);
+
+            // re-test with interrupt status set
+            thread.interrupt();
+            check(thread, expected | JVMTI_THREAD_STATE_INTERRUPTED);
+        } finally {
+            done.set(true);
+            thread.join();
+        }
+    }
+
+    /**
+     * Test state of thread waiting to enter a monitor.
+     */
+    @Test
+    void testMonitorEnter() throws Exception {
+        var latch = new CountDownLatch(1);
+        Object lock = new Object();
+        var thread = Thread.ofVirtual().unstarted(() -> {
+            latch.countDown();
+            synchronized (lock) { }
+        });
+        try {
+            synchronized (lock) {
+                // start thread and wait for it to start execution
+                thread.start();
+                latch.await();
+
+                // thread should block on monitor enter
+                int expected = JVMTI_THREAD_STATE_ALIVE | JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER;
+                await(thread, expected);
+
+                // re-test with interrupt status set
+                thread.interrupt();
+                check(thread, expected | JVMTI_THREAD_STATE_INTERRUPTED);
+            }
+        } finally {
+            thread.join();
+        }
+    }
+
+    /**
+     * Test state of thread waiting in Object.wait().
+     */
+    @Test
+    void testObjectWait() throws Exception {
+        var latch = new CountDownLatch(1);
+        Object lock = new Object();
+        var thread = Thread.ofVirtual().start(() -> {
+            synchronized (lock) {
+                latch.countDown();
+                try {
+                    lock.wait();
+                } catch (InterruptedException e) { }
+            }
+        });
+        try {
+            // wait for thread to own monitor
+            latch.await();
+
+            // thread should wait
+            int expected = JVMTI_THREAD_STATE_ALIVE |
+                    JVMTI_THREAD_STATE_WAITING |
+                    JVMTI_THREAD_STATE_WAITING_INDEFINITELY |
+                    JVMTI_THREAD_STATE_IN_OBJECT_WAIT;
+            await(thread, expected);
+
+            // notify so thread waits to re-enter monitor
+            synchronized (lock) {
+                lock.notifyAll();
+                expected = JVMTI_THREAD_STATE_ALIVE | JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER;
+                check(thread, expected);
+
+                // re-test with interrupt status set
+                thread.interrupt();
+                check(thread, expected | JVMTI_THREAD_STATE_INTERRUPTED);
+            }
+        } finally {
+            thread.interrupt();
+            thread.join();
+        }
+    }
+
+    /**
+     * Test state of thread waiting in Object.wait(millis).
+     */
+    @Test
+    void testObjectWaitMillis() throws Exception {
+        var latch = new CountDownLatch(1);
+        Object lock = new Object();
+        var thread = Thread.ofVirtual().start(() -> {
+            synchronized (lock) {
+                latch.countDown();
+                try {
+                    lock.wait(Long.MAX_VALUE);
+                } catch (InterruptedException e) { }
+            }
+        });
+        try {
+            // wait for thread to own monitor
+            latch.await();
+
+            // thread should wait
+            int expected = JVMTI_THREAD_STATE_ALIVE |
+                    JVMTI_THREAD_STATE_WAITING |
+                    JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT |
+                    JVMTI_THREAD_STATE_IN_OBJECT_WAIT;
+            await(thread, expected);
+
+            // notify so thread waits to re-enter monitor
+            synchronized (lock) {
+                lock.notifyAll();
+                expected = JVMTI_THREAD_STATE_ALIVE | JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER;
+                check(thread, expected);
+
+                // re-test with interrupt status set
+                thread.interrupt();
+                check(thread, expected | JVMTI_THREAD_STATE_INTERRUPTED);
+            }
+        } finally {
+            thread.interrupt();
+            thread.join();
+        }
+    }
+
+    /**
+     * Test state of thread parked with LockSupport.park.
+     */
+    @Test
+    void testPark() throws Exception {
+        var latch = new CountDownLatch(1);
+        var done = new AtomicBoolean();
+        var thread = Thread.ofVirtual().start(() -> {
+            latch.countDown();
+            while (!done.get()) {
+                LockSupport.park();
+            }
+        });
+        try {
+            // wait for thread to start execution
+            latch.await();
+
+            // thread should park
+            int expected = JVMTI_THREAD_STATE_ALIVE |
+                    JVMTI_THREAD_STATE_WAITING |
+                    JVMTI_THREAD_STATE_WAITING_INDEFINITELY |
+                    JVMTI_THREAD_STATE_PARKED;
+            await(thread, expected);
+        } finally {
+            done.set(true);
+            LockSupport.unpark(thread);
+            thread.join();
+        }
+    }
+
+    /**
+     * Test state of thread parked with LockSupport.parkNanos.
+     */
+    @Test
+    void testParkNanos() throws Exception {
+        var latch = new CountDownLatch(1);
+        var done = new AtomicBoolean();
+        var thread = Thread.ofVirtual().start(() -> {
+            latch.countDown();
+            while (!done.get()) {
+                LockSupport.parkNanos(Long.MAX_VALUE);
+            }
+        });
+        try {
+            // wait for thread to start execution
+            latch.await();
+
+            // thread should park
+            int expected = JVMTI_THREAD_STATE_ALIVE |
+                    JVMTI_THREAD_STATE_WAITING |
+                    JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT |
+                    JVMTI_THREAD_STATE_PARKED;
+            await(thread, expected);
+        } finally {
+            done.set(true);
+            LockSupport.unpark(thread);
+            thread.join();
+        }
+    }
+
+    /**
+     * Test state of thread parked with LockSupport.park while holding a monitor.
+     */
+    @Test
+    void testParkWhenPinned() throws Exception {
+        var latch = new CountDownLatch(1);
+        Object lock = new Object();
+        var done = new AtomicBoolean();
+        var thread = Thread.ofVirtual().start(() -> {
+            synchronized (lock) {
+                latch.countDown();
+                while (!done.get()) {
+                    LockSupport.park();
+                }
+            }
+        });
+        try {
+            // wait for thread to own monitor
+            latch.await();
+
+            // thread should park
+            int expected = JVMTI_THREAD_STATE_ALIVE |
+                    JVMTI_THREAD_STATE_WAITING |
+                    JVMTI_THREAD_STATE_WAITING_INDEFINITELY |
+                    JVMTI_THREAD_STATE_PARKED;
+            await(thread, expected);
+        } finally {
+            done.set(true);
+            LockSupport.unpark(thread);
+            thread.join();
+        }
+    }
+
+    /**
+     * Test state of thread parked with LockSupport.parkNanos while holding a monitor.
+     */
+    @Test
+    void testParkNanosWhenPinned() throws Exception {
+        var latch = new CountDownLatch(1);
+        Object lock = new Object();
+        var done = new AtomicBoolean();
+        var thread = Thread.ofVirtual().start(() -> {
+            synchronized (lock) {
+                latch.countDown();
+                while (!done.get()) {
+                    LockSupport.parkNanos(Long.MAX_VALUE);
+                }
+            }
+        });
+        try {
+            // wait for thread to own monitor
+            latch.await();
+
+            // thread should park
+            int expected = JVMTI_THREAD_STATE_ALIVE |
+                    JVMTI_THREAD_STATE_WAITING |
+                    JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT |
+                    JVMTI_THREAD_STATE_PARKED;
+            await(thread, expected);
+        } finally {
+            done.set(true);
+            LockSupport.unpark(thread);
+            thread.join();
+        }
+    }
+
+    /**
+     * Asserts that the given thread has the expected JVMTI state.
+     */
+    private static void check(Thread thread, int expected) {
+        System.err.format("  expect state=0x%x (%s) ...%n", expected, jvmtiStateToString(expected));
+        int state = jvmtiState(thread);
+        System.err.format("  thread state=0x%x (%s)%n", state, jvmtiStateToString(state));
+        assertEquals(expected, state);
+    }
+
+    /**
+     * Waits indefinitely for the given thread to get to the target JVMTI state.
+     */
+    private static void await(Thread thread, int targetState) throws Exception {
+        System.err.format("  await state=0x%x (%s) ...%n", targetState, jvmtiStateToString(targetState));
+        int state = jvmtiState(thread);
+        System.err.format("  thread state=0x%x (%s)%n", state, jvmtiStateToString(state));
+        while (state != targetState) {
+            assertTrue(thread.isAlive(), "Thread has terminated");
+            Thread.sleep(20);
+            state = jvmtiState(thread);
+            System.err.format("  thread state=0x%x (%s)%n", state, jvmtiStateToString(state));
+        }
+    }
+
+    private static final int JVMTI_THREAD_STATE_ALIVE = 0x0001;
+    private static final int JVMTI_THREAD_STATE_TERMINATED = 0x0002;
+    private static final int JVMTI_THREAD_STATE_RUNNABLE = 0x0004;
+    private static final int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400;
+    private static final int JVMTI_THREAD_STATE_WAITING = 0x0080;
+    private static final int JVMTI_THREAD_STATE_WAITING_INDEFINITELY = 0x0010;
+    private static final int JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT = 0x0020;
+    private static final int JVMTI_THREAD_STATE_SLEEPING = 0x0040;
+    private static final int JVMTI_THREAD_STATE_IN_OBJECT_WAIT = 0x0100;
+    private static final int JVMTI_THREAD_STATE_PARKED = 0x0200;
+    private static final int JVMTI_THREAD_STATE_SUSPENDED = 0x100000;
+    private static final int JVMTI_THREAD_STATE_INTERRUPTED = 0x200000;
+    private static final int JVMTI_THREAD_STATE_IN_NATIVE = 0x400000;
+
+    private static native void init();
+    private static native int jvmtiState(Thread thread);
+
+    private static String jvmtiStateToString(int state) {
+        StringJoiner sj = new StringJoiner(" | ");
+        if ((state & JVMTI_THREAD_STATE_ALIVE) != 0)
+            sj.add("JVMTI_THREAD_STATE_ALIVE");
+        if ((state & JVMTI_THREAD_STATE_TERMINATED) != 0)
+            sj.add("JVMTI_THREAD_STATE_TERMINATED");
+        if ((state & JVMTI_THREAD_STATE_RUNNABLE) != 0)
+            sj.add("JVMTI_THREAD_STATE_RUNNABLE");
+        if ((state & JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER) != 0)
+            sj.add("JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER");
+        if ((state & JVMTI_THREAD_STATE_WAITING) != 0)
+            sj.add("JVMTI_THREAD_STATE_WAITING");
+        if ((state & JVMTI_THREAD_STATE_WAITING_INDEFINITELY) != 0)
+            sj.add("JVMTI_THREAD_STATE_WAITING_INDEFINITELY");
+        if ((state & JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT) != 0)
+            sj.add("JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT");
+        if ((state & JVMTI_THREAD_STATE_IN_OBJECT_WAIT) != 0)
+            sj.add("JVMTI_THREAD_STATE_IN_OBJECT_WAIT");
+        if ((state & JVMTI_THREAD_STATE_PARKED) != 0)
+            sj.add("JVMTI_THREAD_STATE_PARKED");
+        if ((state & JVMTI_THREAD_STATE_SUSPENDED) != 0)
+            sj.add("JVMTI_THREAD_STATE_SUSPENDED");
+        if ((state & JVMTI_THREAD_STATE_INTERRUPTED) != 0)
+            sj.add("JVMTI_THREAD_STATE_INTERRUPTED");
+        if ((state & JVMTI_THREAD_STATE_IN_NATIVE) != 0)
+            sj.add("JVMTI_THREAD_STATE_IN_NATIVE");
+        String s = sj.toString();
+        return s.isEmpty() ? "<empty>" : s;
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/libGetThreadStateTest.c b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/libGetThreadStateTest.c
new file mode 100644
index 00000000000..532225670f5
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/libGetThreadStateTest.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "jni.h"
+#include "jvmti.h"
+
+static jvmtiEnv *jvmti;
+
+JNIEXPORT void JNICALL Java_GetThreadStateTest_init(JNIEnv *env, jclass clazz) {
+    JavaVM* vm;
+    jint res;
+    res = (*env)->GetJavaVM(env, &vm);
+    if (res != 0) {
+        (*env)->FatalError(env, "GetJavaVM failed");
+    } else {
+        res = (*vm)->GetEnv(vm, (void**)&jvmti, JVMTI_VERSION);
+        if (res != JNI_OK) {
+            (*env)->FatalError(env, "GetEnv failed");
+        }
+    }
+}
+
+JNIEXPORT jint JNICALL Java_GetThreadStateTest_jvmtiState(JNIEnv *env, jclass clazz, jobject thread) {
+    jvmtiError err;
+    jint state = 0;
+    err = (*jvmti)->GetThreadState(jvmti, thread, &state);
+    if (err != JVMTI_ERROR_NONE) {
+        (*env)->FatalError(env, "GetThreadState failed");
+    }
+    return state;
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/VThreadEventTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/VThreadEventTest.java
index 554e83c231c..61b94a4484b 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/VThreadEventTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/VThreadEventTest.java
@@ -149,12 +149,12 @@ public static void main(String[] args) throws Exception {
             }
             await(ready0);
             mready.countDown();
-            await(ready1); // to guaranty state is not State.WAITING after await(mready) in test1()
-            // wait for test1 threads to reach WAITING state in sleep()
+            await(ready1); // to guarantee state is not State.TIMED_WAITING after await(mready) in test1()
+            // wait for test1 threads to reach TIMED_WAITING state in sleep()
             for (Thread t : test1Threads) {
                 Thread.State state = t.getState();
                 log("DBG: state: " + state);
-                while (state != Thread.State.WAITING) {
+                while (state != Thread.State.TIMED_WAITING) {
                     Thread.sleep(10);
                     state = t.getState();
                     log("DBG: state: " + state);
diff --git a/test/jdk/java/lang/Thread/virtual/CustomScheduler.java b/test/jdk/java/lang/Thread/virtual/CustomScheduler.java
index 6d4e029f280..5bde81905ec 100644
--- a/test/jdk/java/lang/Thread/virtual/CustomScheduler.java
+++ b/test/jdk/java/lang/Thread/virtual/CustomScheduler.java
@@ -45,7 +45,6 @@
 import static org.junit.jupiter.api.Assumptions.*;
 
 class CustomScheduler {
-    private static final Executor DEFAULT_SCHEDULER = defaultScheduler();
     private static ExecutorService scheduler1;
     private static ExecutorService scheduler2;
 
@@ -216,20 +215,6 @@ void testRunWithInterruptSet() throws Exception {
         }
     }
 
-    /**
-     * Returns the default scheduler.
-     */
-    private static Executor defaultScheduler() {
-        try {
-            Field defaultScheduler = Class.forName("java.lang.VirtualThread")
-                    .getDeclaredField("DEFAULT_SCHEDULER");
-            defaultScheduler.setAccessible(true);
-            return (Executor) defaultScheduler.get(null);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     /**
      * Returns the scheduler for the given virtual thread.
      */
diff --git a/test/jdk/java/lang/Thread/virtual/ThreadAPI.java b/test/jdk/java/lang/Thread/virtual/ThreadAPI.java
index 8afb472d3f4..27d21a79346 100644
--- a/test/jdk/java/lang/Thread/virtual/ThreadAPI.java
+++ b/test/jdk/java/lang/Thread/virtual/ThreadAPI.java
@@ -106,7 +106,7 @@ void testCurrentThread1() throws Exception {
             LockSupport.park();
             after.set(Thread.currentThread());
         });
-        awaitParked(thread);
+        await(thread, Thread.State.WAITING);
         LockSupport.unpark(thread);
         thread.join();
         assertTrue(before.get() == thread);
@@ -130,7 +130,7 @@ void testCurrentThread2() throws Exception {
         });
         synchronized (lock) {
             thread.start();
-            awaitBlocked(thread);
+            await(thread, Thread.State.BLOCKED);
         }
         thread.join();
         assertTrue(ref1.get() == thread);
@@ -160,7 +160,7 @@ void testCurrentThread3() throws Exception {
         lock.lock();
         try {
             thread.start();
-            awaitParked(thread);
+            await(thread, Thread.State.WAITING);
         } finally {
             lock.unlock();
         }
@@ -765,6 +765,7 @@ void testJoin33() throws Exception {
             assertFalse(thread.join(Duration.ofMillis(100)));
         } finally {
             done.set(true);
+            thread.join();
         }
     }
 
@@ -897,7 +898,7 @@ void testInterrupt6() throws Exception {
                 exception.set(e);
             }
         });
-        awaitParked(thread);
+        await(thread, Thread.State.TIMED_WAITING);
         thread.interrupt();
         thread.join();
         assertNull(exception.get());
@@ -917,7 +918,7 @@ void testInterrupt7() throws Exception {
                 exception.set(e);
             }
         });
-        awaitParked(thread);
+        await(thread, Thread.State.WAITING);
         thread.interrupt();
         thread.join();
         assertNull(exception.get());
@@ -1032,16 +1033,16 @@ void testSetName3() throws Exception {
     void testSetPriority1() throws Exception {
         VThreadRunner.run(() -> {
             Thread me = Thread.currentThread();
-            assertTrue(me.getPriority() == Thread.NORM_PRIORITY);
+            assertEquals(Thread.NORM_PRIORITY, me.getPriority());
 
             me.setPriority(Thread.MAX_PRIORITY);
-            assertTrue(me.getPriority() == Thread.NORM_PRIORITY);
+            assertEquals(Thread.NORM_PRIORITY, me.getPriority());
 
             me.setPriority(Thread.NORM_PRIORITY);
-            assertTrue(me.getPriority() == Thread.NORM_PRIORITY);
+            assertEquals(Thread.NORM_PRIORITY, me.getPriority());
 
             me.setPriority(Thread.MIN_PRIORITY);
-            assertTrue(me.getPriority() == Thread.NORM_PRIORITY);
+            assertEquals(Thread.NORM_PRIORITY, me.getPriority());
 
             assertThrows(IllegalArgumentException.class, () -> me.setPriority(-1));
         });
@@ -1055,33 +1056,33 @@ void testSetPriority2() throws Exception {
         var thread = Thread.ofVirtual().unstarted(LockSupport::park);
 
         // not started
-        assertTrue(thread.getPriority() == Thread.NORM_PRIORITY);
+        assertEquals(Thread.NORM_PRIORITY, thread.getPriority());
 
         thread.setPriority(Thread.MAX_PRIORITY);
-        assertTrue(thread.getPriority() == Thread.NORM_PRIORITY);
+        assertEquals(Thread.NORM_PRIORITY, thread.getPriority());
 
         thread.setPriority(Thread.NORM_PRIORITY);
-        assertTrue(thread.getPriority() == Thread.NORM_PRIORITY);
+        assertEquals(Thread.NORM_PRIORITY, thread.getPriority());
 
         thread.setPriority(Thread.MIN_PRIORITY);
-        assertTrue(thread.getPriority() == Thread.NORM_PRIORITY);
+        assertEquals(Thread.NORM_PRIORITY, thread.getPriority());
 
         assertThrows(IllegalArgumentException.class, () -> thread.setPriority(-1));
 
         // running
         thread.start();
         try {
-            assertTrue(thread.getPriority() == Thread.NORM_PRIORITY);
+            assertEquals(Thread.NORM_PRIORITY, thread.getPriority());
             thread.setPriority(Thread.NORM_PRIORITY);
 
             thread.setPriority(Thread.MAX_PRIORITY);
-            assertTrue(thread.getPriority() == Thread.NORM_PRIORITY);
+            assertEquals(Thread.NORM_PRIORITY, thread.getPriority());
 
             thread.setPriority(Thread.NORM_PRIORITY);
-            assertTrue(thread.getPriority() == Thread.NORM_PRIORITY);
+            assertEquals(Thread.NORM_PRIORITY, thread.getPriority());
 
             thread.setPriority(Thread.MIN_PRIORITY);
-            assertTrue(thread.getPriority() == Thread.NORM_PRIORITY);
+            assertEquals(Thread.NORM_PRIORITY, thread.getPriority());
 
             assertThrows(IllegalArgumentException.class, () -> thread.setPriority(-1));
 
@@ -1091,7 +1092,7 @@ void testSetPriority2() throws Exception {
         thread.join();
 
         // terminated
-        assertTrue(thread.getPriority() == Thread.NORM_PRIORITY);
+        assertEquals(Thread.NORM_PRIORITY, thread.getPriority());
     }
 
     /**
@@ -1650,53 +1651,79 @@ void testThreadId2() throws Exception {
     }
 
     /**
-     * Test Thread::getState when thread is not started.
+     * Test Thread::getState when thread is new/unstarted.
      */
     @Test
     void testGetState1() {
         var thread = Thread.ofVirtual().unstarted(() -> { });
-        assertTrue(thread.getState() == Thread.State.NEW);
+        assertEquals(Thread.State.NEW, thread.getState());
     }
 
     /**
-     * Test Thread::getState when thread is runnable (mounted).
+     * Test Thread::getState when thread is terminated.
      */
     @Test
     void testGetState2() throws Exception {
-        VThreadRunner.run(() -> {
-            Thread.State state = Thread.currentThread().getState();
-            assertTrue(state == Thread.State.RUNNABLE);
+        var thread = Thread.ofVirtual().start(() -> { });
+        thread.join();
+        assertEquals(Thread.State.TERMINATED, thread.getState());
+    }
+
+    /**
+     * Test Thread::getState when thread is runnable (mounted).
+     */
+    @Test
+    void testGetState3() throws Exception {
+        var started = new CountDownLatch(1);
+        var done = new AtomicBoolean();
+        var thread = Thread.ofVirtual().start(() -> {
+            started.countDown();
+
+            // spin until done
+            while (!done.get()) {
+                Thread.onSpinWait();
+            }
         });
+        try {
+            // wait for thread to start
+            started.await();
+
+            // thread should be runnable
+            assertEquals(Thread.State.RUNNABLE, thread.getState());
+        } finally {
+            done.set(true);
+            thread.join();
+        }
     }
 
     /**
      * Test Thread::getState when thread is runnable (not mounted).
      */
     @Test
-    void testGetState3() throws Exception {
+    void testGetState4() throws Exception {
         assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
         AtomicBoolean completed = new AtomicBoolean();
         try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
             Thread.Builder builder = ThreadBuilders.virtualThreadBuilder(scheduler);
             Thread t1 = builder.start(() -> {
                 Thread t2 = builder.unstarted(LockSupport::park);
-                assertTrue(t2.getState() == Thread.State.NEW);
+                assertEquals(Thread.State.NEW, t2.getState());
 
                 // start t2 to make it runnable
                 t2.start();
                 try {
-                    assertTrue(t2.getState() == Thread.State.RUNNABLE);
+                    assertEquals(Thread.State.RUNNABLE, t2.getState());
 
                     // yield to allow t2 to run and park
                     Thread.yield();
-                    assertTrue(t2.getState() == Thread.State.WAITING);
+                    assertEquals(Thread.State.WAITING, t2.getState());
                 } finally {
                     // unpark t2 to make it runnable again
                     LockSupport.unpark(t2);
                 }
 
                 // t2 should be runnable (not mounted)
-                assertTrue(t2.getState() == Thread.State.RUNNABLE);
+                assertEquals(Thread.State.RUNNABLE, t2.getState());
 
                 completed.set(true);
             });
@@ -1706,77 +1733,147 @@ void testGetState3() throws Exception {
     }
 
     /**
-     * Test Thread::getState when thread is parked.
+     * Test Thread::getState when thread is waiting to enter a monitor.
      */
     @Test
-    void testGetState4() throws Exception {
-        var thread = Thread.ofVirtual().start(LockSupport::park);
-        while (thread.getState() != Thread.State.WAITING) {
-            Thread.sleep(20);
+    void testGetState5() throws Exception {
+        var started = new CountDownLatch(1);
+        var thread = Thread.ofVirtual().unstarted(() -> {
+            started.countDown();
+            synchronized (lock) { }
+        });
+        synchronized (lock) {
+            thread.start();
+            started.await();
+
+            // wait for thread to block
+            await(thread, Thread.State.BLOCKED);
         }
-        LockSupport.unpark(thread);
         thread.join();
     }
 
     /**
-     * Test Thread::getState when thread is parked while holding a monitor.
+     * Test Thread::getState when thread is waiting in Object.wait.
      */
     @Test
-    void testGetState5() throws Exception {
+    void testGetState6() throws Exception {
         var thread = Thread.ofVirtual().start(() -> {
             synchronized (lock) {
-                LockSupport.park();
+                try { lock.wait(); } catch (InterruptedException e) { }
             }
         });
-        while (thread.getState() != Thread.State.WAITING) {
-            Thread.sleep(20);
+        try {
+            // wait for thread to wait
+            await(thread, Thread.State.WAITING);
+        } finally {
+            thread.interrupt();
+            thread.join();
         }
-        LockSupport.unpark(thread);
-        thread.join();
     }
 
     /**
-     * Test Thread::getState when thread is waiting for a monitor.
+     * Test Thread::getState when thread is waiting in Object.wait(millis).
      */
     @Test
-    void testGetState6() throws Exception {
-        var thread = Thread.ofVirtual().unstarted(() -> {
-            synchronized (lock) { }
-        });
-        synchronized (lock) {
-            thread.start();
-            while (thread.getState() != Thread.State.BLOCKED) {
-                Thread.sleep(20);
+    void testGetState7() throws Exception {
+        var thread = Thread.ofVirtual().start(() -> {
+            synchronized (lock) {
+                try {
+                    lock.wait(Long.MAX_VALUE);
+                } catch (InterruptedException e) { }
             }
+        });
+        try {
+            // wait for thread to wait
+            await(thread, Thread.State.TIMED_WAITING);
+        } finally {
+            thread.interrupt();
+            thread.join();
         }
-        thread.join();
     }
 
     /**
-     * Test Thread::getState when thread is waiting in Object.wait.
+     * Test Thread::getState when thread is parked.
      */
     @Test
-    void testGetState7() throws Exception {
+    void testGetState8() throws Exception {
+        var thread = Thread.ofVirtual().start(LockSupport::park);
+        try {
+            await(thread, Thread.State.WAITING);
+        } finally {
+            LockSupport.unpark(thread);
+            thread.join();
+        }
+    }
+
+    /**
+     * Test Thread::getState when thread is timed parked.
+     */
+    @Test
+    void testGetState9() throws Exception {
+        var thread = Thread.ofVirtual().start(() -> LockSupport.parkNanos(Long.MAX_VALUE));
+        try {
+            await(thread, Thread.State.TIMED_WAITING);
+        } finally {
+            LockSupport.unpark(thread);
+            thread.join();
+        }
+    }
+
+    /**
+     * Test Thread::getState when thread is parked while holding a monitor.
+     */
+    @Test
+    void testGetState10() throws Exception {
+        var started = new CountDownLatch(1);
+        var done = new AtomicBoolean();
         var thread = Thread.ofVirtual().start(() -> {
+            started.countDown();
             synchronized (lock) {
-                try { lock.wait(); } catch (InterruptedException e) { }
+                while (!done.get()) {
+                    LockSupport.park();
+                }
             }
         });
-        while (thread.getState() != Thread.State.WAITING) {
-            Thread.sleep(20);
+        try {
+            // wait for thread to start
+            started.await();
+
+            // wait for thread to park
+            await(thread, Thread.State.WAITING);
+        } finally {
+            done.set(true);
+            LockSupport.unpark(thread);
+            thread.join();
         }
-        thread.interrupt();
-        thread.join();
     }
 
     /**
-     * Test Thread::getState when thread is terminated.
+     * Test Thread::getState when thread is timed parked while holding a monitor.
      */
     @Test
-    void testGetState8() throws Exception {
-        var thread = Thread.ofVirtual().start(() -> { });
-        thread.join();
-        assertTrue(thread.getState() == Thread.State.TERMINATED);
+    void testGetState11() throws Exception {
+        var started = new CountDownLatch(1);
+        var done = new AtomicBoolean();
+        var thread = Thread.ofVirtual().start(() -> {
+            started.countDown();
+            synchronized (lock) {
+                while (!done.get()) {
+                    LockSupport.parkNanos(Long.MAX_VALUE);
+                }
+            }
+        });
+        try {
+            // wait for thread to start
+            started.await();
+
+            // wait for thread to park
+            await(thread, Thread.State.TIMED_WAITING);
+        } finally {
+            done.set(true);
+            LockSupport.unpark(thread);
+            thread.join();
+        }
     }
 
     /**
@@ -1899,9 +1996,7 @@ void testGetStackTrace4() throws Exception {
             }
 
             // wait for virtual thread to block in wait
-            while (vthread.getState() != Thread.State.WAITING) {
-                Thread.sleep(20);
-            }
+            await(vthread, Thread.State.WAITING);
 
             // get stack trace of both carrier and virtual thread
             StackTraceElement[] carrierStackTrace = carrier.getStackTrace();
@@ -1928,12 +2023,7 @@ void testGetStackTrace4() throws Exception {
     @Test
     void testGetStackTrace5() throws Exception {
         var thread = Thread.ofVirtual().start(LockSupport::park);
-
-        // wait for thread to park
-        while (thread.getState() != Thread.State.WAITING) {
-            Thread.sleep(20);
-        }
-
+        await(thread, Thread.State.WAITING);
         try {
             StackTraceElement[] stack = thread.getStackTrace();
             assertTrue(contains(stack, "LockSupport.park"));
@@ -1996,9 +2086,7 @@ void testGetAllStackTraces2() throws Exception {
             }
 
             // wait for virtual thread to block in wait
-            while (vthread.getState() != Thread.State.WAITING) {
-                Thread.sleep(20);
-            }
+            await(vthread, Thread.State.WAITING);
 
             // get all stack traces
             Map<Thread, StackTraceElement[]> map = Thread.getAllStackTraces();
@@ -2034,7 +2122,7 @@ void testThreadGroup1() throws Exception {
         var vgroup = thread.getThreadGroup();
         thread.start();
         try {
-            assertTrue(thread.getThreadGroup() == vgroup);
+            assertEquals(vgroup, thread.getThreadGroup());
         } finally {
             LockSupport.unpark(thread);
             thread.join();
@@ -2051,7 +2139,7 @@ void testThreadGroup2() throws Exception {
             ThreadGroup vgroup = Thread.currentThread().getThreadGroup();
             Thread child = new Thread(() -> { });
             ThreadGroup group = child.getThreadGroup();
-            assertTrue(group == vgroup);
+            assertEquals(vgroup, group);
         });
     }
 
@@ -2068,19 +2156,19 @@ void testThreadGroup3() throws Exception {
         thread.join();
 
         ThreadGroup vgroup = ref.get();
-        assertTrue(vgroup.getMaxPriority() == Thread.MAX_PRIORITY);
+        assertEquals(Thread.MAX_PRIORITY, vgroup.getMaxPriority());
 
         ThreadGroup group = new ThreadGroup(vgroup, "group");
         assertTrue(group.getParent() == vgroup);
-        assertTrue(group.getMaxPriority() == Thread.MAX_PRIORITY);
+        assertEquals(Thread.MAX_PRIORITY, group.getMaxPriority());
 
         vgroup.setMaxPriority(Thread.MAX_PRIORITY - 1);
-        assertTrue(vgroup.getMaxPriority() == Thread.MAX_PRIORITY);
-        assertTrue(group.getMaxPriority() == Thread.MAX_PRIORITY - 1);
+        assertEquals(Thread.MAX_PRIORITY, vgroup.getMaxPriority());
+        assertEquals(Thread.MAX_PRIORITY - 1, group.getMaxPriority());
 
         vgroup.setMaxPriority(Thread.MIN_PRIORITY);
-        assertTrue(vgroup.getMaxPriority() == Thread.MAX_PRIORITY);
-        assertTrue(group.getMaxPriority() == Thread.MIN_PRIORITY);
+        assertEquals(Thread.MAX_PRIORITY, vgroup.getMaxPriority());
+        assertEquals(Thread.MIN_PRIORITY, group.getMaxPriority());
     }
 
     /**
@@ -2091,20 +2179,19 @@ void testThreadGroup3() throws Exception {
     void testThreadGroup4() throws Exception {
         VThreadRunner.run(() -> {
             ThreadGroup vgroup = Thread.currentThread().getThreadGroup();
-
-            assertTrue(vgroup.getMaxPriority() == Thread.MAX_PRIORITY);
+            assertEquals(Thread.MAX_PRIORITY, vgroup.getMaxPriority());
 
             ThreadGroup group = new ThreadGroup("group");
-            assertTrue(group.getParent() == vgroup);
-            assertTrue(group.getMaxPriority() == Thread.MAX_PRIORITY);
+            assertEquals(vgroup, group.getParent());
+            assertEquals(Thread.MAX_PRIORITY, group.getMaxPriority());
 
             vgroup.setMaxPriority(Thread.MAX_PRIORITY - 1);
-            assertTrue(vgroup.getMaxPriority() == Thread.MAX_PRIORITY);
-            assertTrue(group.getMaxPriority() == Thread.MAX_PRIORITY - 1);
+            assertEquals(Thread.MAX_PRIORITY, vgroup.getMaxPriority());
+            assertEquals(Thread.MAX_PRIORITY - 1, group.getMaxPriority());
 
             vgroup.setMaxPriority(Thread.MIN_PRIORITY);
-            assertTrue(vgroup.getMaxPriority() == Thread.MAX_PRIORITY);
-            assertTrue(group.getMaxPriority() == Thread.MIN_PRIORITY);
+            assertEquals(Thread.MAX_PRIORITY, vgroup.getMaxPriority());
+            assertEquals(Thread.MIN_PRIORITY, group.getMaxPriority());
         });
     }
 
@@ -2208,9 +2295,7 @@ void testToString3() throws Exception {
             me.setName("fred");
             LockSupport.park();
         });
-        while (thread.getState() != Thread.State.WAITING) {
-            Thread.sleep(10);
-        }
+        await(thread, Thread.State.WAITING);
         try {
             assertTrue(thread.toString().contains("fred"));
         } finally {
@@ -2233,23 +2318,11 @@ void testToString4() throws Exception {
     }
 
     /**
-     * Waits for the given thread to park.
-     */
-    static void awaitParked(Thread thread) throws InterruptedException {
-        Thread.State state = thread.getState();
-        while (state != Thread.State.WAITING && state != Thread.State.TIMED_WAITING) {
-            assertTrue(state != Thread.State.TERMINATED, "Thread has terminated");
-            Thread.sleep(10);
-            state = thread.getState();
-        }
-    }
-
-    /**
-     * Waits for the given thread to block waiting on a monitor.
+     * Waits for the given thread to reach a given state.
      */
-    static void awaitBlocked(Thread thread) throws InterruptedException {
+    private void await(Thread thread, Thread.State expectedState) throws InterruptedException {
         Thread.State state = thread.getState();
-        while (state != Thread.State.BLOCKED) {
+        while (state != expectedState) {
             assertTrue(state != Thread.State.TERMINATED, "Thread has terminated");
             Thread.sleep(10);
             state = thread.getState();
diff --git a/test/jdk/java/lang/Thread/virtual/ThreadBuilders.java b/test/jdk/java/lang/Thread/virtual/ThreadBuilders.java
index 9283bf99321..a6a5d6abdbc 100644
--- a/test/jdk/java/lang/Thread/virtual/ThreadBuilders.java
+++ b/test/jdk/java/lang/Thread/virtual/ThreadBuilders.java
@@ -51,7 +51,6 @@ private ThreadBuilders() { }
      * @throws UnsupportedOperationException if custom schedulers are not supported
      */
     static Thread.Builder.OfVirtual virtualThreadBuilder(Executor scheduler) {
-        Thread.Builder.OfVirtual builder = Thread.ofVirtual();
         try {
             return (Thread.Builder.OfVirtual) VTBUILDER_CTOR.newInstance(scheduler);
         } catch (InvocationTargetException e) {
diff --git a/test/jdk/java/lang/Thread/virtual/stress/ParkALot.java b/test/jdk/java/lang/Thread/virtual/stress/ParkALot.java
new file mode 100644
index 00000000000..a5eb98d207d
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/stress/ParkALot.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Stress test parking and unparking
+ * @requires vm.debug != true
+ * @run main/othervm ParkALot 500000
+ */
+
+/*
+ * @test
+ * @requires vm.debug == true
+ * @run main/othervm ParkALot 200000
+ */
+
+import java.time.Instant;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.locks.LockSupport;
+
+public class ParkALot {
+    private static final int ITERATIONS = 1_000_000;
+
+    public static void main(String[] args) {
+        int iterations;
+        if (args.length > 0) {
+            iterations = Integer.parseInt(args[0]);
+        } else {
+            iterations = ITERATIONS;
+        }
+
+        int maxThreads = Math.max(Runtime.getRuntime().availableProcessors() / 2, 1);
+        for (int nthreads = 1; nthreads <= maxThreads; nthreads++) {
+            System.out.format("%s %d threads ...%n", Instant.now(), nthreads);
+            ThreadFactory factory = Thread.ofPlatform().factory();
+            try (var executor = Executors.newThreadPerTaskExecutor(factory)) {
+                for (int i = 0; i < nthreads; i++) {
+                    executor.submit(() -> parkALot(iterations));
+                }
+            }
+        }
+    }
+
+    /**
+     * Creates a virtual thread that alternates between untimed and timed parking.
+     * A platform thread spins unparking the virtual thread.
+     */
+    private static void parkALot(int iterations) {
+        Thread vthread = Thread.ofVirtual().start(() -> {
+            int i = 0;
+            boolean timed = false;
+            while (i < iterations) {
+                if (timed) {
+                    LockSupport.parkNanos(Long.MAX_VALUE);
+                    timed = false;
+                } else {
+                    LockSupport.park();
+                    timed = true;
+                }
+                i++;
+            }
+        });
+
+        Thread.State state;
+        while ((state = vthread.getState()) != Thread.State.TERMINATED) {
+            if (state == Thread.State.WAITING || state == Thread.State.TIMED_WAITING) {
+                LockSupport.unpark(vthread);
+            } else {
+                Thread.onSpinWait();
+            }
+        }
+    }
+}

From cf74b8c2a32f33019a13ce80b6667da502cc6722 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Tue, 19 Sep 2023 13:10:51 +0000
Subject: [PATCH 080/112] 8316337: (bf) Concurrency issue in
 DirectByteBuffer.Deallocator

Reviewed-by: alanb, liach
---
 .../java/nio/Direct-X-Buffer.java.template    | 22 ++-------
 .../classes/java/nio/MappedByteBuffer.java    | 49 ++++++++++---------
 .../classes/sun/nio/ch/FileChannelImpl.java   | 11 ++---
 3 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
index f7f1d33228d..e8551bd78c6 100644
--- a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
@@ -75,31 +75,15 @@ class Direct$Type$Buffer$RW$$BO$
 
 #if[byte]
 
-    private static class Deallocator
-        implements Runnable
-    {
-
-        private long address;
-        private long size;
-        private int capacity;
-
-        private Deallocator(long address, long size, int capacity) {
-            assert (address != 0);
-            this.address = address;
-            this.size = size;
-            this.capacity = capacity;
+    private record Deallocator(long address, long size, int capacity) implements Runnable {
+        private Deallocator {
+            assert address != 0;
         }
 
         public void run() {
-            if (address == 0) {
-                // Paranoia
-                return;
-            }
             UNSAFE.freeMemory(address);
-            address = 0;
             Bits.unreserveMemory(size, capacity);
         }
-
     }
 
     private final Cleaner cleaner;
diff --git a/src/java.base/share/classes/java/nio/MappedByteBuffer.java b/src/java.base/share/classes/java/nio/MappedByteBuffer.java
index be7a7988ec3..8b51d602f28 100644
--- a/src/java.base/share/classes/java/nio/MappedByteBuffer.java
+++ b/src/java.base/share/classes/java/nio/MappedByteBuffer.java
@@ -116,28 +116,33 @@ public abstract sealed class MappedByteBuffer
     }
 
     UnmapperProxy unmapper() {
-        return fd != null ?
-                new UnmapperProxy() {
-                    @Override
-                    public long address() {
-                        return address;
-                    }
-
-                    @Override
-                    public FileDescriptor fileDescriptor() {
-                        return fd;
-                    }
-
-                    @Override
-                    public boolean isSync() {
-                        return isSync;
-                    }
-
-                    @Override
-                    public void unmap() {
-                        Unsafe.getUnsafe().invokeCleaner(MappedByteBuffer.this);
-                    }
-                } : null;
+        return fd == null
+                ? null
+                : new UnmapperProxy() {
+
+            // Ensure safe publication as MappedByteBuffer.this.address is not final
+            private final long addr = address;
+
+            @Override
+            public long address() {
+                return addr;
+            }
+
+            @Override
+            public FileDescriptor fileDescriptor() {
+                return fd;
+            }
+
+            @Override
+            public boolean isSync() {
+                return isSync;
+            }
+
+            @Override
+            public void unmap() {
+                Unsafe.getUnsafe().invokeCleaner(MappedByteBuffer.this);
+            }
+        };
     }
 
     /**
diff --git a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
index 04a22102b26..0cbcdf7c94a 100644
--- a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
@@ -1154,10 +1154,10 @@ private int writeInternal(ByteBuffer src, long position) throws IOException {
 
     // -- Memory-mapped buffers --
 
-    private abstract static class Unmapper
+    private sealed abstract static class Unmapper
         implements Runnable, UnmapperProxy
     {
-        private volatile long address;
+        private final long address;
         protected final long size;
         protected final long cap;
         private final FileDescriptor fd;
@@ -1194,10 +1194,7 @@ public long capacity() {
         }
 
         public void unmap() {
-            if (address == 0)
-                return;
             nd.unmap(address, size);
-            address = 0;
 
             // if this mapping has a valid file descriptor then we close it
             if (fd.valid()) {
@@ -1214,7 +1211,7 @@ public void unmap() {
         protected abstract void decrementStats();
     }
 
-    private static class DefaultUnmapper extends Unmapper {
+    private static final class DefaultUnmapper extends Unmapper {
 
         // keep track of non-sync mapped buffer usage
         static volatile int count;
@@ -1247,7 +1244,7 @@ public boolean isSync() {
         }
     }
 
-    private static class SyncUnmapper extends Unmapper {
+    private static final class SyncUnmapper extends Unmapper {
 
         // keep track of mapped buffer usage
         static volatile int count;

From 7c5f2a2db941d30a5425d358607a6b4e63879ab7 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Tue, 19 Sep 2023 13:36:16 +0000
Subject: [PATCH 081/112] 8315669: Open source several Swing PopupMenu related
 tests

Reviewed-by: dnguyen, psadhukhan
---
 .../javax/swing/JPopupMenu/bug4236750.java    | 106 +++++++++++++
 .../javax/swing/JPopupMenu/bug4321273.java    |  88 ++++++++++
 .../javax/swing/JPopupMenu/bug4711693.java    | 126 +++++++++++++++
 .../javax/swing/JPopupMenu/bug4962731.java    | 136 ++++++++++++++++
 .../javax/swing/JPopupMenu/bug4966109.java    | 144 +++++++++++++++++
 .../javax/swing/JPopupMenu/bug5091257.java    | 150 ++++++++++++++++++
 6 files changed, 750 insertions(+)
 create mode 100644 test/jdk/javax/swing/JPopupMenu/bug4236750.java
 create mode 100644 test/jdk/javax/swing/JPopupMenu/bug4321273.java
 create mode 100644 test/jdk/javax/swing/JPopupMenu/bug4711693.java
 create mode 100644 test/jdk/javax/swing/JPopupMenu/bug4962731.java
 create mode 100644 test/jdk/javax/swing/JPopupMenu/bug4966109.java
 create mode 100644 test/jdk/javax/swing/JPopupMenu/bug5091257.java

diff --git a/test/jdk/javax/swing/JPopupMenu/bug4236750.java b/test/jdk/javax/swing/JPopupMenu/bug4236750.java
new file mode 100644
index 00000000000..2090c7feb23
--- /dev/null
+++ b/test/jdk/javax/swing/JPopupMenu/bug4236750.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.Action;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.MenuElement;
+import javax.swing.SwingUtilities;
+import java.awt.event.ActionEvent;
+import java.beans.PropertyChangeListener;
+
+/*
+ * @test
+ * @bug 4236750
+ * @summary Tests presence of JPopupMenu.insert(Action, int)
+ * @run main bug4236750
+ */
+
+public class bug4236750 {
+    private static MenuElement[] elements;
+    private static volatile boolean passed = true;
+
+    /**
+     * Auxilliary class implementing Action
+     */
+    static class NullAction implements Action {
+        public void addPropertyChangeListener(
+                PropertyChangeListener listener) {
+        }
+
+        public void removePropertyChangeListener(
+                PropertyChangeListener listener) {
+        }
+
+        public void setEnabled(boolean b) {
+        }
+
+        public boolean isEnabled() {
+            return true;
+        }
+
+        public void actionPerformed(ActionEvent e) {
+        }
+
+        private String name;
+
+        public NullAction(String s) {
+            name = s;
+        }
+
+        public void putValue(String key, Object value) {
+            if (key.equals(Action.NAME)) {
+                name = (String) value;
+            }
+        }
+
+        public Object getValue(String key) {
+            if (key.equals(Action.NAME)) {
+                return name;
+            }
+            return null;
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JPopupMenu popup;
+            popup = new JPopupMenu("Test Popup");
+            JMenuItem item0 = popup.add(new NullAction("0"));
+            JMenuItem item2 = popup.add(new NullAction("2"));
+            popup.insert(new NullAction("1"), 1);
+            elements = popup.getSubElements();
+            for (int i = 0; i < 3; i++) {
+                JMenuItem mi = (JMenuItem) elements[i];
+                if (!mi.getText().equals("" + i)) {
+                    passed = false;
+                }
+            }
+        });
+
+        if (!passed) {
+            throw new RuntimeException("Failed: wrong order of menuitems");
+        }
+        System.out.println("Test Passed!");
+    }
+}
diff --git a/test/jdk/javax/swing/JPopupMenu/bug4321273.java b/test/jdk/javax/swing/JPopupMenu/bug4321273.java
new file mode 100644
index 00000000000..a19210373fd
--- /dev/null
+++ b/test/jdk/javax/swing/JPopupMenu/bug4321273.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.SwingUtilities;
+import java.awt.Robot;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+
+
+/*
+ * @test
+ * @bug 4321273
+ * @summary NotSerializableException during the menu serialization
+ * @key headful
+ * @run main bug4321273
+*/
+
+public class bug4321273 {
+    public static JFrame frame;
+    public static JMenu menu;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> {
+                JMenuBar menuBar = new JMenuBar();
+                frame = new JFrame();
+                frame.setJMenuBar(menuBar);
+                menu = new JMenu("Menu");
+                menuBar.add(menu);
+                menu.add(new JMenuItem("item 1"));
+                menu.add(new JMenuItem("item 2"));
+                menu.add(new JMenuItem("item 3"));
+                frame.pack();
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                menu.doClick();
+                try {
+                    ByteArrayOutputStream byteArrayOutputStream =
+                            new ByteArrayOutputStream();
+                    ObjectOutputStream oos =
+                            new ObjectOutputStream(byteArrayOutputStream);
+                    oos.writeObject(menu);
+                } catch (Exception se) {
+                    throw new RuntimeException("NotSerializableException " +
+                            "during the menu serialization", se);
+                }
+            });
+
+            robot.waitForIdle();
+            robot.delay(100);
+            System.out.println("Test Passed!");
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JPopupMenu/bug4711693.java b/test/jdk/javax/swing/JPopupMenu/bug4711693.java
new file mode 100644
index 00000000000..f24b2eb7c42
--- /dev/null
+++ b/test/jdk/javax/swing/JPopupMenu/bug4711693.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Insets;
+import java.awt.Robot;
+import java.awt.Window;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.InputEvent;
+
+/*
+ * @test
+ * @bug 4711693
+ * @summary Pop-up doesn't stay up
+ * @key headful
+ * @run main bug4711693
+ */
+
+public class bug4711693 {
+    static JFrame fr;
+    static Robot robot;
+    static volatile boolean passed = true;
+    static volatile Dimension scr;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> {
+                fr = new JFrame("Test 4711693");
+                scr = new Dimension();
+                fr.setSize(600, 600);
+                GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+                GraphicsDevice[] gs = ge.getScreenDevices();
+                GraphicsConfiguration gc = null;
+
+                for (int j = 0; j < gs.length; j++) {
+                    GraphicsDevice gd = gs[j];
+                    gc = gd.getDefaultConfiguration();
+                    if (gc.getBounds().contains(100, 100)) break;
+                }
+                scr = Toolkit.getDefaultToolkit().getScreenSize();
+                Insets ins = Toolkit.getDefaultToolkit().getScreenInsets(gc);
+                scr.width -= ins.right;
+                scr.height -= ins.bottom;
+                fr.setLocation(scr.width - 400, scr.height - 400);
+                fr.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                final JPopupMenu popupMenu = new JPopupMenu();
+                final Component pane = fr.getContentPane();
+                for (int i = 1; i < 10; i++) {
+                    final String itemName = "Item " + i;
+                    JMenuItem it = popupMenu.add(new JMenuItem(itemName));
+                    it.addActionListener(new ActionListener() {
+                        public void actionPerformed(ActionEvent a) {
+                            passed = false;
+                        }
+                    });
+                }
+
+                pane.addMouseListener(new MouseAdapter() {
+                    public void mousePressed(MouseEvent e) {
+                        if ((e.isAltDown() ||
+                                ((e.getModifiersEx() &
+                                        InputEvent.BUTTON3_DOWN_MASK) != 0))) {
+                            Component parent = e.getComponent();
+                            while (parent != null && !(parent instanceof Window)) {
+                                parent = parent.getParent();
+                            }
+                            popupMenu.show(pane, e.getX(), e.getY());
+                        }
+                    }
+                });
+            });
+
+            robot.mouseMove(scr.width - 55, scr.height - 55);
+            robot.mousePress(InputEvent.BUTTON3_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON3_DOWN_MASK);
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (fr != null) {
+                    fr.dispose();
+                }
+            });
+        }
+        if (!passed) {
+            throw new RuntimeException("Test failed. Popup disposed on mouse release.");
+        } else {
+            System.out.println("Test Passed!");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JPopupMenu/bug4962731.java b/test/jdk/javax/swing/JPopupMenu/bug4962731.java
new file mode 100644
index 00000000000..651678cf386
--- /dev/null
+++ b/test/jdk/javax/swing/JPopupMenu/bug4962731.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.plaf.PopupMenuUI;
+import java.awt.BorderLayout;
+import java.awt.Robot;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/*
+ * @test
+ * @bug 4962731
+ * @summary The PopupMenu is not repainted if the LAF is changed.
+ * @key headful
+ * @run main bug4962731
+ */
+
+public class bug4962731 {
+
+    public static volatile boolean passed = false;
+    public static boolean isLafOk = true;
+    public static JFrame mainFrame;
+    public static JButton button;
+    public static MyPopup popup;
+    public static Robot robot;
+
+    public static void main(String[] args) throws Exception {
+
+        try {
+            UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
+        } catch (Exception ex) {
+            System.err.println("Can not initialize Motif L&F. Testing skipped.");
+            isLafOk = false;
+        }
+
+        try {
+            UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+        } catch (Exception ex) {
+            System.err.println("Can not initialize Metal L&F. Testing skipped.");
+            isLafOk = false;
+        }
+
+        if (isLafOk) {
+            try {
+                robot = new Robot();
+                SwingUtilities.invokeAndWait(() -> {
+                    mainFrame = new JFrame("Bug4962731");
+                    button = new JButton("Popup!");
+                    popup = new MyPopup();
+                    popup.add("one");
+                    popup.add("two");
+                    button.setComponentPopupMenu(popup);
+                    button.addActionListener(new ActionListener() {
+                        public void actionPerformed(ActionEvent e) {
+                            popup.show(button, 300, 300);
+                            popup.engage();
+                            try {
+                                Thread.sleep(1000);
+                            } catch (InterruptedException e1) {
+                            }
+                            try {
+                                UIManager.setLookAndFeel
+                                        ("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
+                            } catch (Exception ex) {
+                            }
+                            try {
+                                Thread.sleep(1000);
+                            } catch (InterruptedException e1) {
+                            }
+                            SwingUtilities.updateComponentTreeUI(mainFrame);
+                            passed = popup.check();
+                        }
+                    });
+                    mainFrame.setLayout(new BorderLayout());
+                    mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+                    mainFrame.add(button, BorderLayout.CENTER);
+                    mainFrame.pack();
+                    mainFrame.setVisible(true);
+                });
+
+                robot.delay(1000);
+                SwingUtilities.invokeAndWait(() -> {
+                    button.doClick();
+                });
+
+                if (!passed) {
+                    throw new RuntimeException("The UI of popup was not changed");
+                }
+            } finally {
+                SwingUtilities.invokeAndWait(() -> {
+                    if (mainFrame != null) {
+                        mainFrame.dispose();
+                    }
+                });
+            }
+        }
+        System.out.println("test Passed!");
+    }
+
+    public static class MyPopup extends JPopupMenu {
+        PopupMenuUI thisUI;
+
+        public void engage() {
+            thisUI = getUI();
+        }
+
+        public boolean check() {
+            return getUI() != thisUI;
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JPopupMenu/bug4966109.java b/test/jdk/javax/swing/JPopupMenu/bug4966109.java
new file mode 100644
index 00000000000..a643448a7bb
--- /dev/null
+++ b/test/jdk/javax/swing/JPopupMenu/bug4966109.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JLabel;
+import javax.swing.JFrame;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import java.awt.BorderLayout;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+/*
+ * @test
+ * @bug 4966109
+ * @summary Popup is not populated by mouse actions on lightweight components without mouse
+ * @key headful
+ * @run main bug4966109
+ */
+
+public class bug4966109 {
+    public static JFrame mainFrame;
+    public static JPopupMenu popup;
+    public static JLabel label1;
+    public static JLabel label2;
+    public static Robot robot;
+    public static volatile Point loc;
+    public static volatile Boolean passed = true;
+    public static int popupTrigger;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> {
+                mainFrame = new JFrame("Bug4966109");
+                popup = new JPopupMenu();
+                label1 = new JLabel("Label with the listener");
+                label2 = new JLabel("Label w/o listener");
+                mainFrame.setLayout(new BorderLayout());
+                mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+                mainFrame.add(label1, BorderLayout.NORTH);
+                mainFrame.add(label2, BorderLayout.SOUTH);
+                mainFrame.pack();
+                mainFrame.setVisible(true);
+                popup.add("One");
+                popup.add("Two");
+                popup.add("Three");
+                label1.setComponentPopupMenu(popup);
+                label1.addMouseListener(new MouseAdapter() {
+                });
+                label2.setComponentPopupMenu(popup);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                loc = label1.getLocationOnScreen();
+                loc.x = loc.x + (int) (label1.getWidth() / 2);
+                loc.y = loc.y + (int) (label1.getHeight() / 2);
+            });
+            popupTrigger = MouseEvent.BUTTON2_DOWN_MASK;
+            robot.mouseMove(loc.x, loc.y);
+            robot.mousePress(popupTrigger);
+            robot.mouseRelease(popupTrigger);
+            robot.waitForIdle();
+            robot.delay(100);
+
+            SwingUtilities.invokeAndWait(() -> {
+                if (popup.isVisible()) {
+                    System.out.println("ZAV: Good!!! BUTTON2 is the way to go.");
+                } else {
+                    System.out.println("ZAV: Bad :( Let's try BUTTON3");
+                    popupTrigger = MouseEvent.BUTTON3_DOWN_MASK;
+                }
+            });
+
+            robot.mousePress(popupTrigger);
+            robot.mouseRelease(popupTrigger);
+            robot.waitForIdle();
+            robot.delay(100);
+
+            SwingUtilities.invokeAndWait(() -> {
+                if (popup.isVisible()) {
+                    System.out.println("ZAV: Good!!! BUTTON3 is working. At last :)");
+                    popup.setVisible(false);
+                } else {
+                    System.out.println("ZAV: Bad :( Very bad. Nothing is working...");
+                    passed = false;
+                }
+            });
+            if (!passed) {
+                throw new RuntimeException("No popup trigger mouse events found");
+            }
+            robot.waitForIdle();
+            robot.delay(100);
+
+            SwingUtilities.invokeAndWait(() -> {
+                loc = label2.getLocationOnScreen();
+                loc.x = loc.x + (int) (label2.getWidth() / 2);
+                loc.y = loc.y + (int) (label2.getHeight() / 2);
+            });
+            robot.mouseMove(loc.x, loc.y);
+            robot.mousePress(popupTrigger);
+            robot.mouseRelease(popupTrigger);
+            robot.waitForIdle();
+            robot.delay(100);
+
+            SwingUtilities.invokeAndWait(() -> {
+                if (!popup.isVisible()) {
+                    passed = false;
+                }
+            });
+            if (!passed) {
+                throw new RuntimeException("Regression: bug 4966109, popup is not visible");
+            }
+        } finally {
+            if (mainFrame != null) {
+                mainFrame.dispose();
+            }
+        }
+        System.out.println("test Passed!");
+    }
+}
diff --git a/test/jdk/javax/swing/JPopupMenu/bug5091257.java b/test/jdk/javax/swing/JPopupMenu/bug5091257.java
new file mode 100644
index 00000000000..cd4d285f9cb
--- /dev/null
+++ b/test/jdk/javax/swing/JPopupMenu/bug5091257.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import javax.swing.event.PopupMenuListener;
+import javax.swing.event.PopupMenuEvent;
+import java.awt.BorderLayout;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
+
+/*
+ * @test
+ * @bug 5091257
+ * @summary Application key does not display a pop-up menu in users view.
+ * @key headful
+ * @run main bug5091257
+ */
+
+public class bug5091257 {
+    public static volatile boolean passed = false;
+    public static volatile boolean isKeyOk = false;
+    public static JFrame mainFrame;
+    public static JButton button;
+    public static Robot robot;
+    public static JPopupMenu popup;
+    public static volatile Point loc;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            robot = new Robot();
+            robot.setAutoDelay(50);
+            SwingUtilities.invokeAndWait(() -> {
+                button = new JButton("Popup button");
+                button.addKeyListener(new KeyListener() {
+                    public void keyTyped(KeyEvent e) {
+                        if (e.getKeyCode() == KeyEvent.VK_CONTEXT_MENU) {
+                            isKeyOk = true;
+                        }
+                    }
+
+                    public void keyPressed(KeyEvent e) {
+                        if (e.getKeyCode() == KeyEvent.VK_CONTEXT_MENU) {
+                            isKeyOk = true;
+                        }
+                    }
+
+                    public void keyReleased(KeyEvent e) {
+                        if (e.getKeyCode() == KeyEvent.VK_CONTEXT_MENU) {
+                            isKeyOk = true;
+                        }
+                    }
+                });
+                mainFrame = new JFrame("Bug5091257");
+                mainFrame.setLayout(new BorderLayout());
+                mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+                mainFrame.add(button, BorderLayout.CENTER);
+                mainFrame.pack();
+                mainFrame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                loc = button.getLocationOnScreen();
+                loc.x = loc.x + (int) (button.getWidth() / 2);
+                loc.y = loc.y + (int) (button.getHeight() / 2);
+            });
+            robot.mouseMove(loc.x, loc.y);
+            robot.mousePress(MouseEvent.BUTTON3_DOWN_MASK);
+            robot.mouseRelease(MouseEvent.BUTTON3_DOWN_MASK);
+
+            robot.waitForIdle();
+            robot.delay(100);
+
+            try {
+                robot.keyPress(KeyEvent.VK_CONTEXT_MENU);
+                robot.keyRelease(KeyEvent.VK_CONTEXT_MENU);
+            } catch (IllegalArgumentException ex) {
+                isKeyOk = false;
+            }
+
+            if (!isKeyOk) {
+                System.out.println("KeyEvent can't create or deliver " +
+                        "VK_CONTEXT_MENU event to component. Testing skipped.");
+                passed = true;
+            } else {
+                SwingUtilities.invokeAndWait(() -> {
+                    popup = new JPopupMenu();
+                    popup.add("Item to make popup not empty");
+                    popup.addPopupMenuListener(new PopupMenuListener() {
+                        public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                            System.out.println("Popup menu became visible " +
+                                    "on context menu key press. Test passed.");
+                            passed = true;
+                        }
+
+                        public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+                        }
+
+                        public void popupMenuCanceled(PopupMenuEvent e) {
+                        }
+                    });
+                    button.setComponentPopupMenu(popup);
+                });
+                robot.keyPress(KeyEvent.VK_CONTEXT_MENU);
+                robot.keyRelease(KeyEvent.VK_CONTEXT_MENU);
+
+                robot.waitForIdle();
+                robot.delay(100);
+
+                if (!passed) {
+                    throw new RuntimeException("Popup did not open on " +
+                            "VK_CONTEXT_MENU press. Test failed.");
+                }
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (mainFrame != null) {
+                    mainFrame.dispose();
+                }
+            });
+        }
+    }
+}

From f25c920fd35972179d595bf0b0410c082ad45639 Mon Sep 17 00:00:00 2001
From: Glavo <zjx001202@gmail.com>
Date: Tue, 19 Sep 2023 13:49:58 +0000
Subject: [PATCH 082/112] 8314774: Optimize URLEncoder

Reviewed-by: redestad, dfuchs
---
 .../share/classes/java/net/URLEncoder.java    |  74 +++++------
 .../java/net/URLEncoder/SurrogatePairs.java   | 125 ++++++------------
 2 files changed, 75 insertions(+), 124 deletions(-)

diff --git a/src/java.base/share/classes/java/net/URLEncoder.java b/src/java.base/share/classes/java/net/URLEncoder.java
index 41b9ae791fb..2f4c855af8d 100644
--- a/src/java.base/share/classes/java/net/URLEncoder.java
+++ b/src/java.base/share/classes/java/net/URLEncoder.java
@@ -32,6 +32,7 @@
 import java.nio.charset.UnsupportedCharsetException ;
 import java.util.BitSet;
 import java.util.Objects;
+import java.util.HexFormat;
 import java.util.function.IntPredicate;
 
 import jdk.internal.util.ImmutableBitSetPredicate;
@@ -81,7 +82,6 @@
  */
 public class URLEncoder {
     private static final IntPredicate DONT_NEED_ENCODING;
-    private static final int CASE_DIFF = ('a' - 'A');
     private static final String DEFAULT_ENCODING_NAME;
 
     static {
@@ -138,6 +138,11 @@ public class URLEncoder {
         DEFAULT_ENCODING_NAME = StaticProperty.fileEncoding();
     }
 
+    private static void encodeByte(StringBuilder out, byte b) {
+        out.append('%');
+        HexFormat.of().withUpperCase().toHexDigits(out, b);
+    }
+
     /**
      * You can't call the constructor.
      */
@@ -222,20 +227,30 @@ public static String encode(String s, String enc)
     public static String encode(String s, Charset charset) {
         Objects.requireNonNull(charset, "charset");
 
-        boolean needToChange = false;
-        StringBuilder out = new StringBuilder(s.length());
+        int i;
+        for (i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+            if (!DONT_NEED_ENCODING.test(c) || c == ' ') {
+                break;
+            }
+        }
+        if (i == s.length()) {
+            return s;
+        }
+
+        StringBuilder out = new StringBuilder(s.length() << 1);
         CharArrayWriter charArrayWriter = new CharArrayWriter();
+        if (i > 0) {
+            out.append(s, 0, i);
+        }
 
-        for (int i = 0; i < s.length();) {
-            int c = s.charAt(i);
-            //System.out.println("Examining character: " + c);
+        while (i < s.length()) {
+            char c = s.charAt(i);
             if (DONT_NEED_ENCODING.test(c)) {
                 if (c == ' ') {
                     c = '+';
-                    needToChange = true;
                 }
-                //System.out.println("Storing: " + c);
-                out.append((char)c);
+                out.append(c);
                 i++;
             } else {
                 // convert to external encoding before hex conversion
@@ -245,27 +260,14 @@ public static String encode(String s, Charset charset) {
                      * If this character represents the start of a Unicode
                      * surrogate pair, then pass in two characters. It's not
                      * clear what should be done if a byte reserved in the
-                     * surrogate pairs range occurs outside of a legal
+                     * surrogate pairs range occurs outside a legal
                      * surrogate pair. For now, just treat it as if it were
                      * any other character.
                      */
-                    if (c >= 0xD800 && c <= 0xDBFF) {
-                        /*
-                          System.out.println(Integer.toHexString(c)
-                          + " is high surrogate");
-                        */
-                        if ( (i+1) < s.length()) {
-                            int d = s.charAt(i+1);
-                            /*
-                              System.out.println("\tExamining "
-                              + Integer.toHexString(d));
-                            */
-                            if (d >= 0xDC00 && d <= 0xDFFF) {
-                                /*
-                                  System.out.println("\t"
-                                  + Integer.toHexString(d)
-                                  + " is low surrogate");
-                                */
+                    if (Character.isHighSurrogate(c)) {
+                        if ((i + 1) < s.length()) {
+                            char d = s.charAt(i + 1);
+                            if (Character.isLowSurrogate(d)) {
                                 charArrayWriter.write(d);
                                 i++;
                             }
@@ -274,29 +276,15 @@ public static String encode(String s, Charset charset) {
                     i++;
                 } while (i < s.length() && !DONT_NEED_ENCODING.test((c = s.charAt(i))));
 
-                charArrayWriter.flush();
                 String str = charArrayWriter.toString();
                 byte[] ba = str.getBytes(charset);
                 for (byte b : ba) {
-                    out.append('%');
-                    char ch = Character.forDigit((b >> 4) & 0xF, 16);
-                    // converting to use uppercase letter as part of
-                    // the hex value if ch is a letter.
-                    if (Character.isLetter(ch)) {
-                        ch -= CASE_DIFF;
-                    }
-                    out.append(ch);
-                    ch = Character.forDigit(b & 0xF, 16);
-                    if (Character.isLetter(ch)) {
-                        ch -= CASE_DIFF;
-                    }
-                    out.append(ch);
+                    encodeByte(out, b);
                 }
                 charArrayWriter.reset();
-                needToChange = true;
             }
         }
 
-        return (needToChange? out.toString() : s);
+        return out.toString();
     }
 }
diff --git a/test/jdk/java/net/URLEncoder/SurrogatePairs.java b/test/jdk/java/net/URLEncoder/SurrogatePairs.java
index dc715bbb3c4..da68f394507 100644
--- a/test/jdk/java/net/URLEncoder/SurrogatePairs.java
+++ b/test/jdk/java/net/URLEncoder/SurrogatePairs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,18 @@
  * @bug 4396708
  * @summary Test URL encoder and decoder on a string that contains
  * surrogate pairs.
- *
+ * @run junit SurrogatePairs
  */
 
-import java.io.*;
-import java.net.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.stream.Collectors;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.*;
 
 /*
  * Surrogate pairs are two character Unicode sequences where the first
@@ -40,86 +47,42 @@
  */
 public class SurrogatePairs {
 
-    static String[] testStrings = {"\uD800\uDC00",
-                                   "\uD800\uDFFF",
-                                   "\uDBFF\uDC00",
-                                   "\uDBFF\uDFFF",
-                                   "1\uDBFF\uDC00",
-                                   "@\uDBFF\uDC00",
-                                   "\uDBFF\uDC001",
-                                   "\uDBFF\uDC00@",
-                                   "\u0101\uDBFF\uDC00",
-                                   "\uDBFF\uDC00\u0101"
-    };
-
-    static String[] correctEncodings = {"%F0%90%80%80",
-                                        "%F0%90%8F%BF",
-                                        "%F4%8F%B0%80",
-                                        "%F4%8F%BF%BF",
-                                        "1%F4%8F%B0%80",
-                                        "%40%F4%8F%B0%80",
-                                        "%F4%8F%B0%801",
-                                        "%F4%8F%B0%80%40",
-                                        "%C4%81%F4%8F%B0%80",
-                                        "%F4%8F%B0%80%C4%81"
-    };
-
-    public static void main(String[] args) throws Exception {
-
-        for (int i=0; i < testStrings.length; i++) {
-            test(testStrings[i], correctEncodings[i]);
-        }
+    public static String[][] arguments() {
+        return new String[][] {
+                {"\uD800\uDC00", "%F0%90%80%80"},
+                {"\uD800\uDFFF", "%F0%90%8F%BF"},
+                {"\uDBFF\uDC00", "%F4%8F%B0%80"},
+                {"\uDBFF\uDFFF", "%F4%8F%BF%BF"},
+                {"1\uDBFF\uDC00", "1%F4%8F%B0%80"},
+                {"@\uDBFF\uDC00", "%40%F4%8F%B0%80"},
+                {"\uDBFF\uDC001", "%F4%8F%B0%801"},
+                {"\uDBFF\uDC00@", "%F4%8F%B0%80%40"},
+                {"\u0101\uDBFF\uDC00", "%C4%81%F4%8F%B0%80"},
+                {"\uDBFF\uDC00\u0101", "%F4%8F%B0%80%C4%81"},
+                {"\uDE0A\uD83D", "%3F%3F"},
+                {"1\uDE0A\uD83D", "1%3F%3F"},
+                {"@\uDE0A\uD83D", "%40%3F%3F"},
+                {"1@1\uDE0A\uD800\uDC00 \uD83D", "1%401%3F%F0%90%80%80+%3F"}
+        };
     }
 
-    private static void test(String str, String correctEncoding)
-        throws Exception {
-
-        System.out.println("Unicode bytes of test string are: "
-                           + getHexBytes(str));
-
-        String encoded = URLEncoder.encode(str, "UTF-8");
-
-        System.out.println("URLEncoding is: " + encoded);
-
-        if (encoded.equals(correctEncoding))
-            System.out.println("The encoding is correct!");
-        else {
-            throw new Exception("The encoding is incorrect!" +
-                                " It should be " + correctEncoding);
-        }
-
-        String decoded = URLDecoder.decode(encoded, "UTF-8");
-
-        System.out.println("Unicode bytes for URLDecoding are: "
-                           + getHexBytes(decoded));
-
-        if (str.equals(decoded))
-            System.out.println("The decoding is correct");
-        else {
-            throw new Exception("The decoded is not equal to the original");
-        }
-        System.out.println("---");
+    @ParameterizedTest
+    @MethodSource("arguments")
+    public void test(String str, String correctEncoding) {
+        String encoded = URLEncoder.encode(str, UTF_8);
+        assertEquals(correctEncoding, encoded, () ->
+                "str=%s, expected=%s, actual=%s"
+                        .formatted(escape(str), escape(correctEncoding), escape(encoded)));
+
+        // Map unmappable characters to '?'
+        String cleanStr = new String(str.getBytes(UTF_8), UTF_8);
+        String decoded = URLDecoder.decode(encoded, UTF_8);
+        assertEquals(cleanStr, decoded, () ->
+                "expected=%s, actual=%s".formatted(escape(str), escape(decoded)));
     }
 
-    private static String getHexBytes(String s) throws Exception {
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < s.length(); i++) {
-
-            int a = s.charAt(i);
-            int b1 = (a >>8) & 0xff;
-            int b2 = (byte)a;
-            int b11 = (b1>>4) & 0x0f;
-            int b12 = b1 & 0x0f;
-            int b21 = (b2 >>4) & 0x0f;
-            int b22 = b2 & 0x0f;
-
-            sb.append(Integer.toHexString(b11));
-            sb.append(Integer.toHexString(b12));
-            sb.append(Integer.toHexString(b21));
-            sb.append(Integer.toHexString(b22));
-            sb.append(' ');
-        }
-        return sb.toString();
+    private static String escape(String s) {
+        return s.chars().mapToObj(c -> String.format("\\u%04x", c))
+                .collect(Collectors.joining());
     }
-
 }

From 607bd4ed849d2ad22d5f36ecbdf1fcaf93af519f Mon Sep 17 00:00:00 2001
From: Adam Farley <afarley@openjdk.org>
Date: Tue, 19 Sep 2023 14:13:40 +0000
Subject: [PATCH 083/112] 8316294: AIX: Build fopen system call fails on file
 _BUILD_LIBJDWP_objectfilenames.txt

Reviewed-by: clanger, erikj
---
 make/common/NativeCompilation.gmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index 9b847fe35f0..6056f4632a5 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -1165,9 +1165,9 @@ define SetupNativeCompilationBody
       $1_LD_OBJ_ARG := `cat $$($1_OBJ_FILE_LIST)`
     endif
 
-    # If we are building static library, 'AR' on macosx may not support @-file.
+    # If we are building static library, 'AR' on macosx/aix may not support @-file.
     ifeq ($$($1_TYPE), STATIC_LIBRARY)
-      ifeq ($(call isTargetOs, macosx), true)
+      ifeq ($(call isTargetOs, macosx aix), true)
         $1_LD_OBJ_ARG := `cat $$($1_OBJ_FILE_LIST)`
       endif
     endif

From a6d120d4df60564986e8db03a92bb9fcc463a07d Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 19 Sep 2023 15:20:51 +0000
Subject: [PATCH 084/112] 8316513: Serial: Remove unused
 invalidate_remembered_set

Reviewed-by: tschatzl
---
 src/hotspot/share/gc/serial/tenuredGeneration.cpp | 6 ------
 src/hotspot/share/gc/serial/tenuredGeneration.hpp | 2 --
 src/hotspot/share/gc/shared/generation.hpp        | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index 70674461135..ff9b5c73064 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -143,12 +143,6 @@ void TenuredGeneration::shrink(size_t bytes) {
                       name(), old_mem_size/K, new_mem_size/K);
 }
 
-// Objects in this generation may have moved, invalidate this
-// generation's cards.
-void TenuredGeneration::invalidate_remembered_set() {
-  _rs->invalidate(used_region());
-}
-
 void TenuredGeneration::compute_new_size_inner() {
   assert(_shrink_factor <= 100, "invalid shrink factor");
   size_t current_shrink_factor = _shrink_factor;
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index 1a15a3614d7..32c0bd98f47 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -85,8 +85,6 @@ class TenuredGeneration: public Generation {
  public:
   virtual void compute_new_size();
 
-  virtual void invalidate_remembered_set();
-
   // Grow generation with specified size (returns false if unable to grow)
   bool grow_by(size_t bytes);
   // Grow generation to reserved size.
diff --git a/src/hotspot/share/gc/shared/generation.hpp b/src/hotspot/share/gc/shared/generation.hpp
index 371692bcd8b..18f682eedd4 100644
--- a/src/hotspot/share/gc/shared/generation.hpp
+++ b/src/hotspot/share/gc/shared/generation.hpp
@@ -326,10 +326,6 @@ class Generation: public CHeapObj<mtGC> {
   // each.
   virtual void object_iterate(ObjectClosure* cl);
 
-  // Inform a generation that some of its objects have moved.  [e.g. The
-  // generation's spaces were compacted, invalidating the card table.]
-  virtual void invalidate_remembered_set() { }
-
   // Block abstraction.
 
   // Returns the address of the start of the "block" that contains the

From da57d2a1eb409ddc64117865c7d24ed518421cab Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Tue, 19 Sep 2023 16:11:23 +0000
Subject: [PATCH 085/112] 8308592: Framework for CA interoperability testing

Reviewed-by: mullan
---
 .../certification/ActalisCA.java              | 217 ------
 .../certification/AmazonCA.java               | 613 -----------------
 .../certification/BuypassCA.java              | 330 ---------
 .../certification/CAInterop.java              | 561 +++++++++++++++
 .../{CertignaRoots.java => CertignaCA.java}   |  95 +--
 .../certification/ComodoCA.java               | 643 ------------------
 .../certification/EntrustCA.java              | 319 ---------
 .../certification/GlobalSignR6CA.java         | 212 ------
 .../certification/GoDaddyCA.java              | 346 ----------
 .../certification/GoogleCA.java               | 621 -----------------
 .../certification/LetsEncryptCA.java          | 180 -----
 .../certification/MicrosoftTLS.java           | 348 ----------
 .../certification/QuoVadisCA.java             | 495 --------------
 .../certification/SSLCA.java                  | 490 -------------
 .../certification/TWCAGlobalCA.java           | 206 ------
 .../certification/TeliaSoneraCA.java          | 195 ------
 .../certification/ValidatePathWithURL.java    | 229 +++++++
 17 files changed, 801 insertions(+), 5299 deletions(-)
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java
 create mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
 rename test/jdk/security/infra/java/security/cert/CertPathValidator/certification/{CertignaRoots.java => CertignaCA.java} (74%)
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ComodoCA.java
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GlobalSignR6CA.java
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GoDaddyCA.java
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/LetsEncryptCA.java
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/MicrosoftTLS.java
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/SSLCA.java
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/TWCAGlobalCA.java
 delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/TeliaSoneraCA.java
 create mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ValidatePathWithURL.java

diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java
deleted file mode 100644
index cd1db71c418..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
- /*
- * @test
- * @bug 8189131
- * @summary Interoperability tests with Actalis CA
- * @build ValidatePathWithParams
- * @run main/othervm/timeout=180 -Djava.security.debug=certpath ActalisCA OCSP
- * @run main/othervm/timeout=180 -Djava.security.debug=certpath ActalisCA CRL
- */
-
- /*
- * Obtain test artifacts for Actalis CA from:
- *
- * Test website with *active* TLS Server certificate:
- * https://ssltest-active.actalis.it/
- *
- * Test website with *revoked* TLS Server certificate:
- * https://ssltest-revoked.actalis.it/
- *
- * Test website with *expired* TLS Server certificate:
- * https://ssltest-expired.actalis.it/
- */
-public class ActalisCA {
-
-    // Owner: CN=Actalis Organization Validated Server CA G3, O=Actalis S.p.A.,
-    //        L=Ponte San Pietro, ST=Bergamo, C=IT
-    // Issuer: CN=Actalis Authentication Root CA, O=Actalis S.p.A ./03358520967,
-    //         L=Milan, C=IT
-    // Serial number: 5c3b3f37adfc28fe0fcfd3abf83f8551
-    // Valid from: Mon Jul 06 00:20:55 PDT 2020 until: Sun Sep 22 04:22:02 PDT 2030
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHdTCCBV2gAwIBAgIQXDs/N638KP4Pz9Or+D+FUTANBgkqhkiG9w0BAQsFADBr\n" +
-            "MQswCQYDVQQGEwJJVDEOMAwGA1UEBwwFTWlsYW4xIzAhBgNVBAoMGkFjdGFsaXMg\n" +
-            "Uy5wLkEuLzAzMzU4NTIwOTY3MScwJQYDVQQDDB5BY3RhbGlzIEF1dGhlbnRpY2F0\n" +
-            "aW9uIFJvb3QgQ0EwHhcNMjAwNzA2MDcyMDU1WhcNMzAwOTIyMTEyMjAyWjCBiTEL\n" +
-            "MAkGA1UEBhMCSVQxEDAOBgNVBAgMB0JlcmdhbW8xGTAXBgNVBAcMEFBvbnRlIFNh\n" +
-            "biBQaWV0cm8xFzAVBgNVBAoMDkFjdGFsaXMgUy5wLkEuMTQwMgYDVQQDDCtBY3Rh\n" +
-            "bGlzIE9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgU2VydmVyIENBIEczMIICIjANBgkq\n" +
-            "hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAs73Ch+t2owm3ayTkyqy0OPuCTiybxTyS\n" +
-            "4cU4y0t2RGSwCNjLh/rcutO0yoriZxVtPrNMcIRQ544BQhHFt/ypW7e+t8wWKrHa\n" +
-            "r3BkKwSUbqNwpDWP1bXs7IJTVhHXWGAm7Ak1FhrrBmtXk8QtdzTzDDuxfFBK7sCL\n" +
-            "N0Jdqoqb1V1z3wsWqAvr4KlSCFW05Nh4baWm/kXOmb8U+XR6kUmuoVvia3iBhotR\n" +
-            "TzAHTO9SWWkgjTcir/nhBvyL2RoqkgYyP/k50bznaVOGFnFWzfl0XnrM/salfCBh\n" +
-            "O0/1vNaoU8elR6AtbdCFAupgQy95GuFIRVS8n/cF0QupfPjUl+kGSLzvGAc+6oNE\n" +
-            "alpAhKIS/+P0uODzRrS9Eq0WX1iSj6KHtQMNN4ZKsS4nsuvYCahnAc0QwQyoduAW\n" +
-            "iU/ynhU9WTIEe1VIoEDE79NPOI2/80RqbZqdpAKUaf0FvuqVXhEcjiJJu+d0w9YN\n" +
-            "b7gurd6xkaSXemW/fP4idBiNkd8aCVAdshGQYn6yh+na0Lu5IG88Z2kSIFcXDtwy\n" +
-            "zjcxkW86pwkO6GekEomVBNKcv0Cey2Smf8uhpZk15TSCeyFDrZBWH9OsDst/Tnhz\n" +
-            "pN156Huw3M3RRdEegt33fcyPykgt0HThxrEv9DwOzhs6lCQ5RNQJO7ZvZF1ZiqgT\n" +
-            "FOJ6vs1xMqECAwEAAaOCAfQwggHwMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgw\n" +
-            "FoAUUtiIOsifeGbtifN7OHCUyQICNtAwQQYIKwYBBQUHAQEENTAzMDEGCCsGAQUF\n" +
-            "BzABhiVodHRwOi8vb2NzcDA1LmFjdGFsaXMuaXQvVkEvQVVUSC1ST09UMEUGA1Ud\n" +
-            "IAQ+MDwwOgYEVR0gADAyMDAGCCsGAQUFBwIBFiRodHRwczovL3d3dy5hY3RhbGlz\n" +
-            "Lml0L2FyZWEtZG93bmxvYWQwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB\n" +
-            "MIHjBgNVHR8EgdswgdgwgZaggZOggZCGgY1sZGFwOi8vbGRhcDA1LmFjdGFsaXMu\n" +
-            "aXQvY24lM2RBY3RhbGlzJTIwQXV0aGVudGljYXRpb24lMjBSb290JTIwQ0EsbyUz\n" +
-            "ZEFjdGFsaXMlMjBTLnAuQS4lMmYwMzM1ODUyMDk2NyxjJTNkSVQ/Y2VydGlmaWNh\n" +
-            "dGVSZXZvY2F0aW9uTGlzdDtiaW5hcnkwPaA7oDmGN2h0dHA6Ly9jcmwwNS5hY3Rh\n" +
-            "bGlzLml0L1JlcG9zaXRvcnkvQVVUSC1ST09UL2dldExhc3RDUkwwHQYDVR0OBBYE\n" +
-            "FJ+KsbXxsd6C9Cd8vojN3qlDgaNLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0B\n" +
-            "AQsFAAOCAgEAJbygMnKJ5M6byr5Ectq05ODqwNMtky8TEF3O55g6RHhxblf6OegZ\n" +
-            "4ui4+ElHNOIXjycbeuUGuFA4LScCC9fnI1Rnn8TI2Q7OP5YWifEfnrdp99t/tJzQ\n" +
-            "hfdi7ZTdRRZZGV9x+grfR/RtjT2C3Lt9X4lcbuSxTea3PHAwwi0A3bYRR1L5ciPm\n" +
-            "eAnYtG9kpat8/RuC22oxiZZ5FdjU6wrRWkASRLiIwNcFIYfvpUbMWElaCUhqaB2y\n" +
-            "YvWF8o02pnaYb4bvTCg4cVabVnojUuuXH81LeQhhsSXLwcdwSdew0NL4zCiNCn2Q\n" +
-            "iDZpz2biCWDggibmWxsUUF6AbqMHnwsdS8vsKXiFQJHeAdNAhA+kwpqYAdhUiCdj\n" +
-            "RTUdtRNUucLvZEN1OAvVYyog9xYCfhtkqgXQROMANP+Z/+yaZahaP/Vgak/V00se\n" +
-            "Hdh7F+B6h5HVdwdh+17E2jl+aMTfyvBFcg2H/9Qjyl4TY8NW/6v0DPK52sVt8a35\n" +
-            "I+7xLGLPohAl4z6pEf2OxgjMNfXXCXS33smRgz1dLQFo8UpAb3rf84zkXaqEI6Qi\n" +
-            "2P+5pibVFQigRbn4RcE+K2a/nm2M/o+WZTSio+E+YXacnNk71VcO82biOof+jBKT\n" +
-            "iC3Xi7rAlypmme+QFBw9F1J89ig3smV/HaN8tO0lfTpvm7Zvzd5TkMs=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=ssltest-active.actalis.it, O=Actalis S.p.A., L=Ponte San Pietro,
-    //        ST=Bergamo, C=IT
-    // Issuer: CN=Actalis Organization Validated Server CA G3, O=Actalis S.p A.,
-    //         L=Ponte San Pietro, ST=Bergamo, C=IT
-    // Serial number: 4a49e2afcd448af3b7f5f14e1cd5954
-    // Valid from: Tue Mar 08 08:00:57 PST 2022 until: Wed Mar 08 08:00:57 PST 2023
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIH0jCCBbqgAwIBAgIQBKSeKvzUSK87f18U4c1ZVDANBgkqhkiG9w0BAQsFADCB\n" +
-            "iTELMAkGA1UEBhMCSVQxEDAOBgNVBAgMB0JlcmdhbW8xGTAXBgNVBAcMEFBvbnRl\n" +
-            "IFNhbiBQaWV0cm8xFzAVBgNVBAoMDkFjdGFsaXMgUy5wLkEuMTQwMgYDVQQDDCtB\n" +
-            "Y3RhbGlzIE9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgU2VydmVyIENBIEczMB4XDTIy\n" +
-            "MDMwODE2MDA1N1oXDTIzMDMwODE2MDA1N1owdzELMAkGA1UEBhMCSVQxEDAOBgNV\n" +
-            "BAgMB0JlcmdhbW8xGTAXBgNVBAcMEFBvbnRlIFNhbiBQaWV0cm8xFzAVBgNVBAoM\n" +
-            "DkFjdGFsaXMgUy5wLkEuMSIwIAYDVQQDDBlzc2x0ZXN0LWFjdGl2ZS5hY3RhbGlz\n" +
-            "Lml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsJnlOatNNth7gfqZ\n" +
-            "WN8HMfp9qlkDf/YW8ReNXyTtqFEy2xZrVVmAV2XIqL1lJDYJz86mdVsz3AqIMTzo\n" +
-            "GxPlmn/oEnF0YeRYQ1coKRdwP7hWSwqyMMhh+C7r5zMA9gQQVXV5wWR5U+bgvt23\n" +
-            "Y/55DOqk3Fp5Odt6Lyu6xA45MwHrj2Gr/nMKe8L7f8UYPWT98MJa1+TXB24yllOw\n" +
-            "rZE8gZByLBCVzDkVwRwTgu+HgY6zm5sJTvBT4tyJy4QD8u2xLWoZ5sXodrU0Z3Nf\n" +
-            "xU9keMFp6CIh1t+akqFgpW81b/HWkfUO0+L6PH4hgaSPtiwp2dVFsF9v5p4on9qA\n" +
-            "2j1d9QIDAQABo4IDRTCCA0EwDAYDVR0TAQH/BAIwADAfBgNVHSMEGDAWgBSfirG1\n" +
-            "8bHegvQnfL6Izd6pQ4GjSzB+BggrBgEFBQcBAQRyMHAwOwYIKwYBBQUHMAKGL2h0\n" +
-            "dHA6Ly9jYWNlcnQuYWN0YWxpcy5pdC9jZXJ0cy9hY3RhbGlzLWF1dGhvdmczMDEG\n" +
-            "CCsGAQUFBzABhiVodHRwOi8vb2NzcDA5LmFjdGFsaXMuaXQvVkEvQVVUSE9WLUcz\n" +
-            "MCQGA1UdEQQdMBuCGXNzbHRlc3QtYWN0aXZlLmFjdGFsaXMuaXQwUQYDVR0gBEow\n" +
-            "SDA8BgYrgR8BFAEwMjAwBggrBgEFBQcCARYkaHR0cHM6Ly93d3cuYWN0YWxpcy5p\n" +
-            "dC9hcmVhLWRvd25sb2FkMAgGBmeBDAECAjAdBgNVHSUEFjAUBggrBgEFBQcDAgYI\n" +
-            "KwYBBQUHAwEwSAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL2NybDA5LmFjdGFsaXMu\n" +
-            "aXQvUmVwb3NpdG9yeS9BVVRIT1YtRzMvZ2V0TGFzdENSTDAdBgNVHQ4EFgQUIbcm\n" +
-            "54DVM6gC8DYhvnZg8ILaLrAwDgYDVR0PAQH/BAQDAgWgMIIBfQYKKwYBBAHWeQIE\n" +
-            "AgSCAW0EggFpAWcAdQCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAA\n" +
-            "AX9qTFEkAAAEAwBGMEQCIFB4RW+Fca/jj96sFg9JtZVe/CAQq74HAezTi2AD07qL\n" +
-            "AiBej8APns5uKmaHNYbU6lel6kdowIaUY/+iqX82e2KhrAB2AOg+0No+9QY1MudX\n" +
-            "KLyJa8kD08vREWvs62nhd31tBr1uAAABf2pMUVMAAAQDAEcwRQIgcopYpSUDiQ2C\n" +
-            "7j06vgbfsn3ux4REvpbrbWatifLtfVMCIQCi96i+4EhAUOw4dumA7hJwlG+qD/+5\n" +
-            "uSL3aKB9KR7apAB2AG9Tdqwx8DEZ2JkApFEV/3cVHBHZAsEAKQaNsgiaN9kTAAAB\n" +
-            "f2pMUYEAAAQDAEcwRQIgdCNjaV7nQcCiVefX28u1vtQMy+rqT4F4i9EVJ2xbqbQC\n" +
-            "IQCrpcYqt53tX/rSMoGnjFhDGnMhnYyc2AqzpokfhmdcVTANBgkqhkiG9w0BAQsF\n" +
-            "AAOCAgEAfXISBKP1dZQv1kkWZVDXiVY/fv+068DKq2e8hgBcsN6b9a2rlVfBU2iq\n" +
-            "W9KqFNET5GDWf1wjM71Itjau8b1A3+apcNdEGQk3eqIOymK5kVtVvAI2ahp4926x\n" +
-            "Kkt/sexmi1pJGA+eLfTixkCoaESh5P8U7HDW/vUFXm2AtLQih+oT5OVoYt5e9pXr\n" +
-            "hr8oadm/ZDJxiyDL1vcTIsl2TM4/Fpo2IWxYzUC+YshnuLiRwWI840maJmWFx/lJ\n" +
-            "Pzdik3P51Uef7VsCSBhTxER09/B4IrEUMDAhVgG5QNbcFSHvnmpV8JLrNuBKUROU\n" +
-            "xnDsWieKlb5YO6S6PjGOncOrd+k4RCIYRaekSnx52WBKkpqxMEv/rjY1Glx4Cota\n" +
-            "mpNiYDvZHGzrRQtY2eH17XhFatBxEEbJMA+0QPbFksHcKxAxJgMDncqag4TDq5fT\n" +
-            "I2NUxqiB51F5w0x+++lyLnUZ+z4BJFZ73VdtfoJ2fsuRhemOoZjHPi/V2exXpAfb\n" +
-            "pomha3KCrTcuFv1lj8mPx5L4ciNPxuDFgjeXEaTGjS8IvdNoJIrgdHdahMwkwS/y\n" +
-            "wei7FJ1Ey0maqRUpUlAY6sIQPQ/KDltTuKX/C94C5pYLI0JXCScr5xg6C+r2ckbA\n" +
-            "rjhpn3C/NptVyZgT8bL4XT5ITrAjwPciBj0yxYzUkrLZO1wKQSQ=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=ssltest-revoked.actalis.it, O=Actalis S.p.A., L=Ponte San Pietro, ST=Bergamo, C=IT
-    // Issuer: CN=Actalis Organization Validated Server CA G3, O=Actalis S.p.A.,
-    // L=Ponte San Pietro, ST=Bergamo, C=IT
-    // Serial number: 320955171b78d49507508910da2c5bc4
-    // Valid from: Tue Sep 27 03:40:43 PDT 2022 until: Wed Sep 27 03:40:43 PDT 2023
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIH1TCCBb2gAwIBAgIQMglVFxt41JUHUIkQ2ixbxDANBgkqhkiG9w0BAQsFADCB\n" +
-            "iTELMAkGA1UEBhMCSVQxEDAOBgNVBAgMB0JlcmdhbW8xGTAXBgNVBAcMEFBvbnRl\n" +
-            "IFNhbiBQaWV0cm8xFzAVBgNVBAoMDkFjdGFsaXMgUy5wLkEuMTQwMgYDVQQDDCtB\n" +
-            "Y3RhbGlzIE9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgU2VydmVyIENBIEczMB4XDTIy\n" +
-            "MDkyNzEwNDA0M1oXDTIzMDkyNzEwNDA0M1oweDELMAkGA1UEBhMCSVQxEDAOBgNV\n" +
-            "BAgMB0JlcmdhbW8xGTAXBgNVBAcMEFBvbnRlIFNhbiBQaWV0cm8xFzAVBgNVBAoM\n" +
-            "DkFjdGFsaXMgUy5wLkEuMSMwIQYDVQQDDBpzc2x0ZXN0LXJldm9rZWQuYWN0YWxp\n" +
-            "cy5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdBnbeFtw/Ejp1U\n" +
-            "gr86BQ5rqgGXWWXb7fsOhPb5On9RXTojg6oaeIV4GxHsMZhEDKQdcZ6JWAo2dbtp\n" +
-            "/7ereFEDWG/YJahLHFZ/ihXG4AmfObYEhoGbKitW75fOs/aWC7Veck/sXsw7cjLW\n" +
-            "GY623ybcF9DBExg3S4uLRaSkv5hXUDu/CzphUgwiEd5YNBZjcryOiS8+Y5EQ+2q+\n" +
-            "g+tdRG9m5G5YxeHWgQz2HDDwLDsJhWkb8/RsUurU/I+avHPhYk13K5Ysf311gww8\n" +
-            "bAsplfdJ2gdn8Is+EAEH4GJHqMybC95YDh1w5dY7dk/lIoNX4hYUIQimirIr3OW8\n" +
-            "Svkj1G8CAwEAAaOCA0cwggNDMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUn4qx\n" +
-            "tfGx3oL0J3y+iM3eqUOBo0swfgYIKwYBBQUHAQEEcjBwMDsGCCsGAQUFBzAChi9o\n" +
-            "dHRwOi8vY2FjZXJ0LmFjdGFsaXMuaXQvY2VydHMvYWN0YWxpcy1hdXRob3ZnMzAx\n" +
-            "BggrBgEFBQcwAYYlaHR0cDovL29jc3AwOS5hY3RhbGlzLml0L1ZBL0FVVEhPVi1H\n" +
-            "MzAlBgNVHREEHjAcghpzc2x0ZXN0LXJldm9rZWQuYWN0YWxpcy5pdDBRBgNVHSAE\n" +
-            "SjBIMDwGBiuBHwEUATAyMDAGCCsGAQUFBwIBFiRodHRwczovL3d3dy5hY3RhbGlz\n" +
-            "Lml0L2FyZWEtZG93bmxvYWQwCAYGZ4EMAQICMB0GA1UdJQQWMBQGCCsGAQUFBwMC\n" +
-            "BggrBgEFBQcDATBIBgNVHR8EQTA/MD2gO6A5hjdodHRwOi8vY3JsMDkuYWN0YWxp\n" +
-            "cy5pdC9SZXBvc2l0b3J5L0FVVEhPVi1HMy9nZXRMYXN0Q1JMMB0GA1UdDgQWBBS6\n" +
-            "o8qJpg3ixoyA2QBayptaTfc+5DAOBgNVHQ8BAf8EBAMCBaAwggF+BgorBgEEAdZ5\n" +
-            "AgQCBIIBbgSCAWoBaAB2AK33vvp8/xDIi509nB4+GGq0Zyldz7EMJMqFhjTr3IKK\n" +
-            "AAABg36SGRYAAAQDAEcwRQIgDXxSCQGfcIYroxNiDJg08IX38Y9+r5CC6T4NeW14\n" +
-            "FzgCIQDdEhEYsGIWpwyrnTLr4RFB5CMEq+84dByNT07UYkiVwwB2AHoyjFTYty22\n" +
-            "IOo44FIe6YQWcDIThU070ivBOlejUutSAAABg36SGTUAAAQDAEcwRQIgL2ig9RrM\n" +
-            "FPWESGRYGJJJYRHdcayHev66jawrf98saN8CIQD/CInlI3Vo7SBzzN/4uykjYsFZ\n" +
-            "u9RypT6AYv6AHPlNdQB2AG9Tdqwx8DEZ2JkApFEV/3cVHBHZAsEAKQaNsgiaN9kT\n" +
-            "AAABg36SGU0AAAQDAEcwRQIhAOCD/dOs4HjyC+GQaQRh4U+/mUwWyu+CnlHdebmD\n" +
-            "hAvFAiAvBE0rbxgm8TpZLG2TaMk3dqZj7Q6FFdLlqTsvwhKa3jANBgkqhkiG9w0B\n" +
-            "AQsFAAOCAgEAEnPALMVp1pySJgHhugLWAUgiD6stpDWCKfaBxPr+jf34A5wS+m5r\n" +
-            "2VhYyNQpOwIQB76K2RSJQrdpg7Dg2L6EiUnbbClSTrOkZ4XX5ggBIjldDEx4ZxhI\n" +
-            "zwSw4KB6+DDAVMwsCL0q0E7AAPOMaZ0RDLteusqQYIYm08TXfJPWD8LjQPt/8Uie\n" +
-            "LOqm1eLUuwJc+eHFWV+Xr8Uea6SFwqNEj7qPHb2MElctET/MhSIIUKI1ObmrFwyB\n" +
-            "ElKEPaUh9L0HXpnuD8IWc7tw2mdvnWJhuGG8G6JkasTGvtZ4gKIDBdTrJcuj7MCS\n" +
-            "amz3ZBCY47tP1ohgImjqwg4ITYjX6UQXgj/nBVDdu+nXkEhx16uPJkTYWaun9Nio\n" +
-            "8RjYIOxXmDD39QbGUElP0Epsr2wcVT9tIFYMGzUpIO51mCk3Aq1AmiQZwZZhqOIN\n" +
-            "RDx7lGESPj3IgdVfJi9Ing/OUNtS46Ug9DSuDcGqdY7KnTYEUdWGsUJNtnpjd4lS\n" +
-            "U6oIAeW1aKuOve6iNg1vsFAN57aJNh1ih3BOup58J9ve42bNlAYWN8wiNxM+Aeba\n" +
-            "ArUSTnH/QEYCyMRD0XqIREVR9VhNODgSZbL3XedYBAW9wImi1whp+u+8aReXd7lC\n" +
-            "Q3kD9KRyfZ9Kk05Glf3DsZMWvp1N2ZZWaU2Ms5U3ijUheCiBrqrs8a8=\n" +
-            "-----END CERTIFICATE-----";
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-        }
-
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Tue Sep 27 03:52:40 PDT 2022", System.out);
-    }
-}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java
deleted file mode 100644
index dec0ff8872a..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8233223
- * @summary Interoperability tests with Amazon's CA1, CA2, CA3, and CA4
- * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath AmazonCA OCSP
- * @run main/othervm -Djava.security.debug=certpath AmazonCA CRL
- */
-
-/*
- * Obtain TLS test artifacts for Amazon CAs from:
- *
- * Amazon Root CA 1
- *     Valid - https://good.sca1a.amazontrust.com/
- *     Revoked - https://revoked.sca1a.amazontrust.com/
- * Amazon Root CA 2
- *     Valid - https://good.sca2a.amazontrust.com/
- *     Revoked - https://revoked.sca2a.amazontrust.com/
- * Amazon Root CA 3
- *     Valid - https://good.sca3a.amazontrust.com/
- *     Revoked - https://revoked.sca3a.amazontrust.com/
- * Amazon Root CA 4
- *     Valid - https://good.sca4a.amazontrust.com/
- *     Revoked - https://revoked.sca4a.amazontrust.com/
- */
-public class AmazonCA {
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-        }
-
-        new AmazonCA_1().runTest(pathValidator);
-        new AmazonCA_2().runTest(pathValidator);
-        new AmazonCA_3().runTest(pathValidator);
-        new AmazonCA_4().runTest(pathValidator);
-    }
-}
-
-class AmazonCA_1 {
-
-    // Owner: CN=Amazon RSA 2048 M02, O=Amazon, C=US
-    // Issuer: CN=Amazon Root CA 1, O=Amazon, C=US
-    // Serial number: 773124a4bcbd44ec7b53beaf194842d3a0fa1
-    // Valid from: Tue Aug 23 15:25:30 PDT 2022 until: Fri Aug 23 15:25:30 PDT 2030
-    private static final String INT_VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIEXjCCA0agAwIBAgITB3MSSkvL1E7HtTvq8ZSELToPoTANBgkqhkiG9w0BAQsF\n" +
-            "ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6\n" +
-            "b24gUm9vdCBDQSAxMB4XDTIyMDgyMzIyMjUzMFoXDTMwMDgyMzIyMjUzMFowPDEL\n" +
-            "MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEcMBoGA1UEAxMTQW1hem9uIFJT\n" +
-            "QSAyMDQ4IE0wMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALtDGMZa\n" +
-            "qHneKei1by6+pUPPLljTB143Si6VpEWPc6mSkFhZb/6qrkZyoHlQLbDYnI2D7hD0\n" +
-            "sdzEqfnuAjIsuXQLG3A8TvX6V3oFNBFVe8NlLJHvBseKY88saLwufxkZVwk74g4n\n" +
-            "WlNMXzla9Y5F3wwRHwMVH443xGz6UtGSZSqQ94eFx5X7Tlqt8whi8qCaKdZ5rNak\n" +
-            "+r9nUThOeClqFd4oXych//Rc7Y0eX1KNWHYSI1Nk31mYgiK3JvH063g+K9tHA63Z\n" +
-            "eTgKgndlh+WI+zv7i44HepRZjA1FYwYZ9Vv/9UkC5Yz8/yU65fgjaE+wVHM4e/Yy\n" +
-            "C2osrPWE7gJ+dXMCAwEAAaOCAVowggFWMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD\n" +
-            "VR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNV\n" +
-            "HQ4EFgQUwDFSzVpQw4J8dHHOy+mc+XrrguIwHwYDVR0jBBgwFoAUhBjMhTTsvAyU\n" +
-            "lC4IWZzHshBOCggwewYIKwYBBQUHAQEEbzBtMC8GCCsGAQUFBzABhiNodHRwOi8v\n" +
-            "b2NzcC5yb290Y2ExLmFtYXpvbnRydXN0LmNvbTA6BggrBgEFBQcwAoYuaHR0cDov\n" +
-            "L2NydC5yb290Y2ExLmFtYXpvbnRydXN0LmNvbS9yb290Y2ExLmNlcjA/BgNVHR8E\n" +
-            "ODA2MDSgMqAwhi5odHRwOi8vY3JsLnJvb3RjYTEuYW1hem9udHJ1c3QuY29tL3Jv\n" +
-            "b3RjYTEuY3JsMBMGA1UdIAQMMAowCAYGZ4EMAQIBMA0GCSqGSIb3DQEBCwUAA4IB\n" +
-            "AQAtTi6Fs0Azfi+iwm7jrz+CSxHH+uHl7Law3MQSXVtR8RV53PtR6r/6gNpqlzdo\n" +
-            "Zq4FKbADi1v9Bun8RY8D51uedRfjsbeodizeBB8nXmeyD33Ep7VATj4ozcd31YFV\n" +
-            "fgRhvTSxNrrTlNpWkUk0m3BMPv8sg381HhA6uEYokE5q9uws/3YkKqRiEz3TsaWm\n" +
-            "JqIRZhMbgAfp7O7FUwFIb7UIspogZSKxPIWJpxiPo3TcBambbVtQOcNRWz5qCQdD\n" +
-            "slI2yayq0n2TXoHyNCLEH8rpsJRVILFsg0jc7BaFrMnF462+ajSehgj12IidNeRN\n" +
-            "4zl+EoNaWdpnWndvSpAEkq2P\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=Amazon RSA 2048 M01, O=Amazon, C=US
-    // Issuer: CN=Amazon Root CA 1, O=Amazon, C=US
-    // Serial number: 77312380b9d6688a33b1ed9bf9ccda68e0e0f
-    // Valid from: Tue Aug 23 15:21:28 PDT 2022 until: Fri Aug 23 15:21:28 PDT 2030
-    private static final String INT_REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIEXjCCA0agAwIBAgITB3MSOAudZoijOx7Zv5zNpo4ODzANBgkqhkiG9w0BAQsF\n" +
-            "ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6\n" +
-            "b24gUm9vdCBDQSAxMB4XDTIyMDgyMzIyMjEyOFoXDTMwMDgyMzIyMjEyOFowPDEL\n" +
-            "MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEcMBoGA1UEAxMTQW1hem9uIFJT\n" +
-            "QSAyMDQ4IE0wMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOtxLKnL\n" +
-            "H4gokjIwr4pXD3i3NyWVVYesZ1yX0yLI2qIUZ2t88Gfa4gMqs1YSXca1R/lnCKeT\n" +
-            "epWSGA+0+fkQNpp/L4C2T7oTTsddUx7g3ZYzByDTlrwS5HRQQqEFE3O1T5tEJP4t\n" +
-            "f+28IoXsNiEzl3UGzicYgtzj2cWCB41eJgEmJmcf2T8TzzK6a614ZPyq/w4CPAff\n" +
-            "nAV4coz96nW3AyiE2uhuB4zQUIXvgVSycW7sbWLvj5TDXunEpNCRwC4kkZjK7rol\n" +
-            "jtT2cbb7W2s4Bkg3R42G3PLqBvt2N32e/0JOTViCk8/iccJ4sXqrS1uUN4iB5Nmv\n" +
-            "JK74csVl+0u0UecCAwEAAaOCAVowggFWMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD\n" +
-            "VR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNV\n" +
-            "HQ4EFgQUgbgOY4qJEhjl+js7UJWf5uWQE4UwHwYDVR0jBBgwFoAUhBjMhTTsvAyU\n" +
-            "lC4IWZzHshBOCggwewYIKwYBBQUHAQEEbzBtMC8GCCsGAQUFBzABhiNodHRwOi8v\n" +
-            "b2NzcC5yb290Y2ExLmFtYXpvbnRydXN0LmNvbTA6BggrBgEFBQcwAoYuaHR0cDov\n" +
-            "L2NydC5yb290Y2ExLmFtYXpvbnRydXN0LmNvbS9yb290Y2ExLmNlcjA/BgNVHR8E\n" +
-            "ODA2MDSgMqAwhi5odHRwOi8vY3JsLnJvb3RjYTEuYW1hem9udHJ1c3QuY29tL3Jv\n" +
-            "b3RjYTEuY3JsMBMGA1UdIAQMMAowCAYGZ4EMAQIBMA0GCSqGSIb3DQEBCwUAA4IB\n" +
-            "AQCtAN4CBSMuBjJitGuxlBbkEUDeK/pZwTXv4KqPK0G50fOHOQAd8j21p0cMBgbG\n" +
-            "kfMHVwLU7b0XwZCav0h1ogdPMN1KakK1DT0VwA/+hFvGPJnMV1Kx2G4S1ZaSk0uU\n" +
-            "5QfoiYIIano01J5k4T2HapKQmmOhS/iPtuo00wW+IMLeBuKMn3OLn005hcrOGTad\n" +
-            "hcmeyfhQP7Z+iKHvyoQGi1C0ClymHETx/chhQGDyYSWqB/THwnN15AwLQo0E5V9E\n" +
-            "SJlbe4mBlqeInUsNYugExNf+tOiybcrswBy8OFsd34XOW3rjSUtsuafd9AWySa3h\n" +
-            "xRRrwszrzX/WWGm6wyB+f7C4\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=valid.rootca1.demo.amazontrust.com
-    // Issuer: CN=Amazon RSA 2048 M02, O=Amazon, C=US
-    // Serial number: 60c6e837b2e7586d8464eb34f4a85fe
-    // Valid from: Tue May 09 17:00:00 PDT 2023 until: Fri Jun 07 16:59:59 PDT 2024
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGKDCCBRCgAwIBAgIQBgxug3sudYbYRk6zT0qF/jANBgkqhkiG9w0BAQsFADA8\n" +
-            "MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRwwGgYDVQQDExNBbWF6b24g\n" +
-            "UlNBIDIwNDggTTAyMB4XDTIzMDUxMDAwMDAwMFoXDTI0MDYwNzIzNTk1OVowLTEr\n" +
-            "MCkGA1UEAxMidmFsaWQucm9vdGNhMS5kZW1vLmFtYXpvbnRydXN0LmNvbTCCASIw\n" +
-            "DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3hA+omhUcO8nYO8/+dkpbYz8WI\n" +
-            "1ms7Y7JA2pPFfp2N/aWcf6m5ORm1BkyGLOttjTu318Qpa9eahQ1Pi3RNe3BtqjD9\n" +
-            "jcHncpwAFMsXy1beZA7sZ7AA4vKltA3t6yrU5ruTLUGQwUndeIBBSTW5QpdT9I/p\n" +
-            "EM7d+Miwre63kofbJ1lVPAJvN/udMVqGWNF8V5qscklUUHoSKA3FWWsiCyIgnthg\n" +
-            "G3u6R1KH66Qionp0ho/ttvrBCI0C/bdrdH+wybFv8oFFvAW2U9xn2Azt47/2kHHm\n" +
-            "tTRjrgufhDbcz/MLR6hwBXAJuwVvJZmSqe7B4IILFexu6wjxZfyqVm2FMr8CAwEA\n" +
-            "AaOCAzMwggMvMB8GA1UdIwQYMBaAFMAxUs1aUMOCfHRxzsvpnPl664LiMB0GA1Ud\n" +
-            "DgQWBBSkrnsTnjwYhDRAeLy/9FXm/7hApDBlBgNVHREEXjBcgiJ2YWxpZC5yb290\n" +
-            "Y2ExLmRlbW8uYW1hem9udHJ1c3QuY29tghpnb29kLnNjYTBhLmFtYXpvbnRydXN0\n" +
-            "LmNvbYIaZ29vZC5zY2ExYS5hbWF6b250cnVzdC5jb20wDgYDVR0PAQH/BAQDAgWg\n" +
-            "MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjA7BgNVHR8ENDAyMDCgLqAs\n" +
-            "hipodHRwOi8vY3JsLnIybTAyLmFtYXpvbnRydXN0LmNvbS9yMm0wMi5jcmwwEwYD\n" +
-            "VR0gBAwwCjAIBgZngQwBAgEwdQYIKwYBBQUHAQEEaTBnMC0GCCsGAQUFBzABhiFo\n" +
-            "dHRwOi8vb2NzcC5yMm0wMi5hbWF6b250cnVzdC5jb20wNgYIKwYBBQUHMAKGKmh0\n" +
-            "dHA6Ly9jcnQucjJtMDIuYW1hem9udHJ1c3QuY29tL3IybTAyLmNlcjAMBgNVHRMB\n" +
-            "Af8EAjAAMIIBfgYKKwYBBAHWeQIEAgSCAW4EggFqAWgAdgDuzdBk1dsazsVct520\n" +
-            "zROiModGfLzs3sNRSFlGcR+1mwAAAYgHvXWVAAAEAwBHMEUCICAs74qT1f9ufSr5\n" +
-            "PgQqtQFiXBbmbb3i4xwVV78USU5NAiEA/iJEfnTG+hZZaHYv2wVbg6tUY8fQgIhI\n" +
-            "2rbl6PrD9FIAdgBIsONr2qZHNA/lagL6nTDrHFIBy1bdLIHZu7+rOdiEcwAAAYgH\n" +
-            "vXWWAAAEAwBHMEUCIQDf2nWyee/5+vSgk/O8P0BFvXYu89cyAugZHyd919BdAgIg\n" +
-            "UnGGpQtZmWnPMmdgpzI7jrCLuC370Tn0i7Aktdzj2X8AdgDatr9rP7W2Ip+bwrtc\n" +
-            "a+hwkXFsu1GEhTS9pD0wSNf7qwAAAYgHvXVpAAAEAwBHMEUCIGN6cT+6uwDospXe\n" +
-            "gMa8b38oXouXUT66X2gOiJ0SoRyQAiEAjDMu2vEll5tRpUvU8cD4gR2xV4hqoDxx\n" +
-            "Q+QGW+PvJxcwDQYJKoZIhvcNAQELBQADggEBACtxC3LlQvULeI3lt7ZYFSWndEhm\n" +
-            "tNUotoeKSXJXdoIpqSr10bzMPX9SHvemgOUtzP3JNqWPHw1uW9YFyeDE6yWj/B13\n" +
-            "Xj1hv1cqYIwyaOZBerU/9PT5PaCn20AC9DHbc7iBv+zs+DYiqlAFJ1GVaprwLul4\n" +
-            "8wp3gnC3Hjb8NykydCo6vw0AJ2UzjpjiTyVZ93jITzLOiboOUa1gQGnojzWlYaet\n" +
-            "sXe+RDylBp/Wuj1ZS7v/etltzYm5GanPi4y/p7Ta3Uky6std/GM6XbPRdBEFboFR\n" +
-            "B2IP0divd9c74Q+tLgpsAz5yXm9LtYPMcEPC2YRN2PgBg67c5+A7eIOluuw=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked.rootca1.demo.amazontrust.com
-    // Issuer: CN=Amazon RSA 2048 M01, O=Amazon, C=US
-    // Serial number: e1023665b1268d788cc25bf69a9d05e
-    // Valid from: Tue May 09 17:00:00 PDT 2023 until: Fri Jun 07 16:59:59 PDT 2024
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGMjCCBRqgAwIBAgIQDhAjZlsSaNeIzCW/aanQXjANBgkqhkiG9w0BAQsFADA8\n" +
-            "MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRwwGgYDVQQDExNBbWF6b24g\n" +
-            "UlNBIDIwNDggTTAxMB4XDTIzMDUxMDAwMDAwMFoXDTI0MDYwNzIzNTk1OVowLzEt\n" +
-            "MCsGA1UEAxMkcmV2b2tlZC5yb290Y2ExLmRlbW8uYW1hem9udHJ1c3QuY29tMIIB\n" +
-            "IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxSPd1PWACxZohFCAJT1JWuXK\n" +
-            "GY29wZZ9yY0zoiq6+qYiUIU0crktytUNNI1ZpW/3qXpEw2ZQkM6WF1LshXtwGwrA\n" +
-            "zJwSeX1L9T5rOKhoBvoFeqfX7xu4VBM1/fDGt5X+NRFfD9Op9UfK5OsnL05TYach\n" +
-            "rdnfOA5wKGvMgFiN5CeOD0AtumXSuAnTZC85ojJTHjPF+hqV893WvrrUxLyyxtvh\n" +
-            "lq/WttFOjhfQu2IkfyDAFiH939uzUi0WSTAdsbsHuko5mDTDnOfMRbaaWZu0At01\n" +
-            "EgaIPeK+kGdi7EYwVndIwTKLeQ4mjIM8aj8Heg/y2hZ0kOmfCUZdUmJFlNoCIQID\n" +
-            "AQABo4IDOzCCAzcwHwYDVR0jBBgwFoAUgbgOY4qJEhjl+js7UJWf5uWQE4UwHQYD\n" +
-            "VR0OBBYEFMeBhIOkuWUY4DYqFrfgbD2eUeFtMG0GA1UdEQRmMGSCJHJldm9rZWQu\n" +
-            "cm9vdGNhMS5kZW1vLmFtYXpvbnRydXN0LmNvbYIdcmV2b2tlZC5zY2EwYS5hbWF6\n" +
-            "b250cnVzdC5jb22CHXJldm9rZWQuc2NhMWEuYW1hem9udHJ1c3QuY29tMA4GA1Ud\n" +
-            "DwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwOwYDVR0f\n" +
-            "BDQwMjAwoC6gLIYqaHR0cDovL2NybC5yMm0wMS5hbWF6b250cnVzdC5jb20vcjJt\n" +
-            "MDEuY3JsMBMGA1UdIAQMMAowCAYGZ4EMAQIBMHUGCCsGAQUFBwEBBGkwZzAtBggr\n" +
-            "BgEFBQcwAYYhaHR0cDovL29jc3AucjJtMDEuYW1hem9udHJ1c3QuY29tMDYGCCsG\n" +
-            "AQUFBzAChipodHRwOi8vY3J0LnIybTAxLmFtYXpvbnRydXN0LmNvbS9yMm0wMS5j\n" +
-            "ZXIwDAYDVR0TAQH/BAIwADCCAX4GCisGAQQB1nkCBAIEggFuBIIBagFoAHYA7s3Q\n" +
-            "ZNXbGs7FXLedtM0TojKHRny87N7DUUhZRnEftZsAAAGIB72TggAABAMARzBFAiAZ\n" +
-            "naLbRHRuaRrE304GSuWX/79MU/e+SSlr0cNJ0kNNaAIhAPnz9HayL4txhkTEZiMs\n" +
-            "nttNnNqD17I0J17JLVOF4i/4AHYASLDja9qmRzQP5WoC+p0w6xxSActW3SyB2bu/\n" +
-            "qznYhHMAAAGIB72TmwAABAMARzBFAiEAgEqT7CYGQ/u36/3YcxBH78QfknI9kgcY\n" +
-            "sgJLkurUF6cCIFZZ/b803+ek6o+bmdV/uVx2UlskAyyolZ2okBAb6IscAHYA2ra/\n" +
-            "az+1tiKfm8K7XGvocJFxbLtRhIU0vaQ9MEjX+6sAAAGIB72TbQAABAMARzBFAiEA\n" +
-            "6z2RSoK263hvYF71rj1d0TpC70/6zagSRR4glHOT6IACICYvaMAnrCNSTSiZ20Wz\n" +
-            "Ju5roTippO3BWKhQYrTKZuu4MA0GCSqGSIb3DQEBCwUAA4IBAQB4S1JGulFpMIaP\n" +
-            "NtLUJmjWz8eexQdWLDVF+H8dd6xpZgpiYtig/Ynphzuk1IIF8DkT3CeK/9vrezgI\n" +
-            "igNjneN9B4eIuzi/rJzIKeUwpZ2k5D+36Ab4esseoc+TopmNerw8hidt2g818jER\n" +
-            "D71ppSMakeQFPGe/Hs2/cVa/G1DNVcU2XAut45yRZ/+xsZ0/mcBDVsG9P5uGCN5O\n" +
-            "7SAp4J959WnKDqgVuU9WowPE5IjmS9BAv2gjniFYdDV2yksyf7+8edHd1KfSVX06\n" +
-            "pLx6CuCVZGJFG4Q2Aa1YAh1Wvt9hqWeXXpNRO2/wChL5rhT4GajsrGepsk4bjxYX\n" +
-            "Wf2iZ8mX\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT_VALID},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT_REVOKED},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon May 15 13:36:57 PDT 2023", System.out);
-    }
-}
-
-class AmazonCA_2 {
-
-    // Owner: CN=Amazon RSA 4096 M02, O=Amazon, C=US
-    // Issuer: CN=Amazon Root CA 2, O=Amazon, C=US
-    // Serial number: 773125b0c34c3c940299a9f04a39e5a52ccd9
-    // Valid from: Tue Aug 23 15:29:13 PDT 2022 until: Fri Aug 23 15:29:13 PDT 2030
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGXjCCBEagAwIBAgITB3MSWww0w8lAKZqfBKOeWlLM2TANBgkqhkiG9w0BAQwF\n" +
-            "ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6\n" +
-            "b24gUm9vdCBDQSAyMB4XDTIyMDgyMzIyMjkxM1oXDTMwMDgyMzIyMjkxM1owPDEL\n" +
-            "MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEcMBoGA1UEAxMTQW1hem9uIFJT\n" +
-            "QSA0MDk2IE0wMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMGMl/pZ\n" +
-            "1OsxHY9gw/YfdON4mmrANkPwi7z2djHA5ELt/vRI3Su0le6OoipLf03iyoCnYy4Y\n" +
-            "rpfTbhyDriE8NJpps2ODJ5W1h0rz6FM1Q5Jt35wfk+4CEfATBTegHVlUJ0rJgzK5\n" +
-            "Yl/jrk12ZsC4ZeRn54shszcK6bHj4LZIHXhrYIIfetBMMD8V7hlhd54AclEWutUV\n" +
-            "eBEjkSCzDSk+pQKIjCL0crqvRSPvUNry/BV65zfGmceSYxpcLmV7k7Spwpo+1z8w\n" +
-            "+Odfnx2vsm7olPldfaThqk6fXBtInORl4Ef32xF3VDT13UeXtQPolFhnp8UOci64\n" +
-            "bW+R8tbtGpUXIA8Dhr8SgYPH6NW4jhUD4+AG8yer8ctA1Hl9tq+6tYr26q3yuCLu\n" +
-            "5rwJdfMG634fWIRXSj+GJi8SfAdGtPyXwu5799NWesV4vUkrkSXdIBK4TQCuK+jx\n" +
-            "aJ5Y+Zo2l3GFsWyMPNORLjoQXbjF6KAyjTyICLq9VzoQKhyx4Ll2CNrQv8CxqtDC\n" +
-            "GvXi9kREJYAF6lscOB0xglAAF5lndcaNkVHEVOMdg9ZZtdJywHWm8Qed1Wty2qr+\n" +
-            "hmA7booWQNRE12nW1niC5D4cP2ykPK9HSgb7xWdUF32VidUc9tNKM6xKjSd/R/tP\n" +
-            "p+XAybNSwEooPt3/OvyhpVRjLuWoqqbClTKdAgMBAAGjggFaMIIBVjASBgNVHRMB\n" +
-            "Af8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcD\n" +
-            "AQYIKwYBBQUHAwIwHQYDVR0OBBYEFJ5xHxodk6nZLY7MSFM/A1TznuZmMB8GA1Ud\n" +
-            "IwQYMBaAFLAM8Eww9AVYAkj9M+VSr0uE42ZSMHsGCCsGAQUFBwEBBG8wbTAvBggr\n" +
-            "BgEFBQcwAYYjaHR0cDovL29jc3Aucm9vdGNhMi5hbWF6b250cnVzdC5jb20wOgYI\n" +
-            "KwYBBQUHMAKGLmh0dHA6Ly9jcnQucm9vdGNhMi5hbWF6b250cnVzdC5jb20vcm9v\n" +
-            "dGNhMi5jZXIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5yb290Y2EyLmFt\n" +
-            "YXpvbnRydXN0LmNvbS9yb290Y2EyLmNybDATBgNVHSAEDDAKMAgGBmeBDAECATAN\n" +
-            "BgkqhkiG9w0BAQwFAAOCAgEAl1GgKXOn0j1MWT1KJVSewQ28SGbie3UwZj1dMsjJ\n" +
-            "amCrQPn2ngSNbLm9+ulFiBDU8xKR9Zx3tZps55IUKWLUPkfMC+vkV7asDBqqzzE0\n" +
-            "F/MkekgPfOjx1V9S6Wfg3sSg+9KcluurXFElruqKfOm4cqmkV776X1G+AaaQ7mlU\n" +
-            "giCYi6NqRQSyhn8zrKkNnbO6QL5a9ICC47kiZYRAR/hRvZOt11QUK5tCMXJXo0iO\n" +
-            "4XKkMu+jdnehP1kh4xuZhYznIgKK6MJIITFI/Jj89U4SOPncyuS94sUuE2EqvvO/\n" +
-            "t81qeoey6wThz5iRbU/0CvDFnTMgebWGUZ2UZJ+az/rb3KYXGfVWasLIonkvYT7z\n" +
-            "vHOGNAA9oQ8TTgPOmPfSVyfpplKtO/aybWp5QSH2csIwuvw5dkmpkc42iD57XHob\n" +
-            "5LbMJg99z3vQBmod/ipmOpND95/BeA2mllBZgZ53S0nvDXDzbzR9Fd81PAz9Qruo\n" +
-            "dOJKcD6plKQjZjkLzNh1v/RoCFO8kiJGE4UBMTM8FUk0DXH4bALII4wwmDelrSUu\n" +
-            "lKvDTDxZvPF4dbEXICNPd51EMGPgETxwboOV+bzWFVI0IWQ8PhZ2VuMPDk2taOMp\n" +
-            "NsuLtlYc2twPb9r/Hvgv7G6+ItpBHZwOVt1oI3pHbjMp7P3pOZSPr6G1WkNy9mX8\n" +
-            "rVc=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=valid.rootca2.demo.amazontrust.com
-    // Issuer: CN=Amazon RSA 4096 M02, O=Amazon, C=US
-    // Serial number: 662f7646d76193cbb76946d111e49fa
-    // Valid from: Tue May 09 17:00:00 PDT 2023 until: Fri Jun 07 16:59:59 PDT 2024
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIICzCCBfOgAwIBAgIQBmL3ZG12GTy7dpRtER5J+jANBgkqhkiG9w0BAQwFADA8\n" +
-            "MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRwwGgYDVQQDExNBbWF6b24g\n" +
-            "UlNBIDQwOTYgTTAyMB4XDTIzMDUxMDAwMDAwMFoXDTI0MDYwNzIzNTk1OVowLTEr\n" +
-            "MCkGA1UEAxMidmFsaWQucm9vdGNhMi5kZW1vLmFtYXpvbnRydXN0LmNvbTCCAiIw\n" +
-            "DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAON5EbEKoBiujI7Ja8mLZLJbaY7f\n" +
-            "RtoWIjU/F0l9ueWFogXmEaA1jWsl97F3WTHTyGKz6ChCjPMSyoXXpY+yoE90QUyX\n" +
-            "w35uWEhNrc40drMJkyN+QXitSrH346GCOKvpYVvu18UD4W8hDhg8vvbOQYhtmSf7\n" +
-            "Rfrs7/qUdXpzpvR9VjWktbQAzJT8fB/jFNjNQJTknynjGiYO5GF51+peOCLK6qw8\n" +
-            "9kKYEigR4K8/aWL283rC4xRxZqVioy433VG02l/Fwdv8o/vL9YYIqkyspCB9fpFw\n" +
-            "Q50yYrwEomxuOz7rXhmdfeNaFYuyTtOUSKff6p2oqO0S7pcLujUVMlO4dYBDELQF\n" +
-            "cabByNjwblviCtGKJMIzD6Thkgamp3iXQgcU498+P5r7N5CYbMmkJEdcuILg+bgJ\n" +
-            "/LUUTT+IMt2txYlO/ld3N0EHlgVt7rztW5mtm6Ba8jN7cLSh7ZWu6Fr1+oK7bl5T\n" +
-            "wPxSfqT5W3BwQKS3YptIoKEWUb+VNnS/dYx/7IspF9+z6kw4g+V2EY9M4ZYNakzM\n" +
-            "AI7KIj4thMFoWeYrJq0dUMZ297QCBPRdAwh9hhkq2LYi2x8tMUtcBnhb/q75sO+E\n" +
-            "icPqFVv7iMDZ/8Xep+0UoClF3JGmZW3UNtwcbi7Pn/OqtaMi7E8xnHUgc4ZchtXO\n" +
-            "v8VtVvDeZAlY5TjVAgMBAAGjggMWMIIDEjAfBgNVHSMEGDAWgBSecR8aHZOp2S2O\n" +
-            "zEhTPwNU857mZjAdBgNVHQ4EFgQUnGekBRKIZBYgCEajbpCMC24bp2owSQYDVR0R\n" +
-            "BEIwQIIidmFsaWQucm9vdGNhMi5kZW1vLmFtYXpvbnRydXN0LmNvbYIaZ29vZC5z\n" +
-            "Y2EyYS5hbWF6b250cnVzdC5jb20wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQG\n" +
-            "CCsGAQUFBwMBBggrBgEFBQcDAjA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3Js\n" +
-            "LnI0bTAyLmFtYXpvbnRydXN0LmNvbS9yNG0wMi5jcmwwEwYDVR0gBAwwCjAIBgZn\n" +
-            "gQwBAgEwdQYIKwYBBQUHAQEEaTBnMC0GCCsGAQUFBzABhiFodHRwOi8vb2NzcC5y\n" +
-            "NG0wMi5hbWF6b250cnVzdC5jb20wNgYIKwYBBQUHMAKGKmh0dHA6Ly9jcnQucjRt\n" +
-            "MDIuYW1hem9udHJ1c3QuY29tL3I0bTAyLmNlcjAMBgNVHRMBAf8EAjAAMIIBfQYK\n" +
-            "KwYBBAHWeQIEAgSCAW0EggFpAWcAdgDuzdBk1dsazsVct520zROiModGfLzs3sNR\n" +
-            "SFlGcR+1mwAAAYgHvX9QAAAEAwBHMEUCIQD8qPPCLL2Grd+/YNALWqAq7LC7YBaa\n" +
-            "dNg5+6Q4kRDEqgIgEkf/UMsMNfTRaOZvoOgAK9/F0xX/CfdcUTjULhmoA+cAdQBI\n" +
-            "sONr2qZHNA/lagL6nTDrHFIBy1bdLIHZu7+rOdiEcwAAAYgHvX8UAAAEAwBGMEQC\n" +
-            "IBVFDtapMMWJOqyu8Cv6XEhFmbU8N33c2owed//pa80xAiAT9T6Wba3B9DFUmrL5\n" +
-            "cCGKLqciIEUPhPbvjCuUepelrAB2ANq2v2s/tbYin5vCu1xr6HCRcWy7UYSFNL2k\n" +
-            "PTBI1/urAAABiAe9ft8AAAQDAEcwRQIhAP2XDC/RlmVtH4WrfSwVosR/f/WXRhG5\n" +
-            "mk9Nwq+ZOIriAiAopPXSH7VwXa3bEAIiTwcV1l10QIDZaIPCU5olknU5CjANBgkq\n" +
-            "hkiG9w0BAQwFAAOCAgEAFuwMIJdP5rgz6cqOIj2EgF2OU8CUGi/wJ45BomXWv4Rv\n" +
-            "U5mOKB+jHOGZZC9dncjAMa44RwoF2I7/8Y3qLVaoNm46ObvvS+6UvzTcyQqXM7JU\n" +
-            "cSmdlf9DkspjKPDvMBokVrM4ak5AoxUjuru5qaia3nvbxq7XKO9/FGUaUaU8Xlsd\n" +
-            "V6Fo8VmNwFc88VCqOp8eI/IicHxMDLl8TKXMvr3CYh8A9nCeFGcV+4CL+7JF2t5K\n" +
-            "YvV5r074Wyk0QMlRVYMNDl0t+VAEoDJ7RRE+kEvplWcsX9S2wvr4HhkA4iChpwFm\n" +
-            "2UDTppHskSWyLsuNQvipn0zTzZ8RIxXd/ei0qCdhKmkV7x9cgbTiyXgaI7iJEtdo\n" +
-            "RvYNcXc2RmitWjY5Av8yJGOk0eYpCwRrBv6ughbtJe3NMrqUeTyrKidIEo9KnRSA\n" +
-            "rMokRbHunkroS97VkoK/9j9pNJki+qAH9XTLYWcm/5+cTSGRsN+escRgZwV6KWg/\n" +
-            "JQQe5LbwU2HHzNqWuk63GC/ngVlWXjaVFfbNVmYEKZFFazcZchesN1YyDu+WndOx\n" +
-            "+rTcuke2feOvQ4EnVviM0k85JZNiqPDH2iafAWyqZFUYTnb7XK3HhJflAniv/SLq\n" +
-            "DQfbJmtQtNHdJYgVmC1u2RT9gbJDIAj0ZI4vU2WVB5Hmd9F31un6jundEuG4+S4=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked.rootca2.demo.amazontrust.com
-    // Issuer: CN=Amazon RSA 4096 M02, O=Amazon, C=US
-    // Serial number: 788baa8f47bc5b1c624424216240fd3
-    // Valid from: Tue May 09 17:00:00 PDT 2023 until: Fri Jun 07 16:59:59 PDT 2024
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIIEjCCBfqgAwIBAgIQB4i6qPR7xbHGJEJCFiQP0zANBgkqhkiG9w0BAQwFADA8\n" +
-            "MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRwwGgYDVQQDExNBbWF6b24g\n" +
-            "UlNBIDQwOTYgTTAyMB4XDTIzMDUxMDAwMDAwMFoXDTI0MDYwNzIzNTk1OVowLzEt\n" +
-            "MCsGA1UEAxMkcmV2b2tlZC5yb290Y2EyLmRlbW8uYW1hem9udHJ1c3QuY29tMIIC\n" +
-            "IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzJfddWdrWhA9dSJdmy23veN9\n" +
-            "oLvSqpM4YaXGZmPtKUmbFMLs2I3vCKrzflRKeOpl3MCc2hh6TH/3z+Q/fGugXLsY\n" +
-            "H8QcjSbiIOd15n+3dUFTLKaoWMyseMcWiOIVaN5rCDVXiAHdt1pc147wyFQIzqNK\n" +
-            "J/xiV1u9eT2MFue+4bd7kUNAcmI8M+SXruhto4jtAV8ugpTEChTDlyO/l8xmaM1Q\n" +
-            "HkijsHX7Aq72Q/3PH/U+wbJ9pmpTp4x2AEJoo45IGfB/NKDTrv5otLBuiP8Y0M7b\n" +
-            "K7irRPDFBqMNZw7S7p39SnC+V/WibJQk5Bo/8vcwDJX+WnDkw1QD/uXu3ugDzSDD\n" +
-            "iBDViMOdN+3K47s4x2kdssoh4WWScMlAVb4vyN7IA3J4TnwA/1uCWhw4LE1WvY7N\n" +
-            "etekhVP1eWF8IzNY0oo2u2ie79777xvBtmtp7RnvYLGv7I+xVhjH5qGNzn9fRCUm\n" +
-            "QDego5HAfJ0PLlMEagdW8asCak1WaC117adnibL6WPtFA2FD2i6gNalTvhXhK2Ex\n" +
-            "alGxrVd/BCseT3bMp783jqScJO1g6xRHu0Qx+RyrOGVvcKZa6Y0DcAc8psRpkHaO\n" +
-            "HZY+lE8O2CIxpAJlwSnD6BoDNo8sg1IqFNkECw3wqfeMPBcg38k6zjAxwRDcIx6U\n" +
-            "SwDl4d3sjrmy3gOFFXMCAwEAAaOCAxswggMXMB8GA1UdIwQYMBaAFJ5xHxodk6nZ\n" +
-            "LY7MSFM/A1TznuZmMB0GA1UdDgQWBBQXpWT7gMHO+HKoHM1gU1VQVnylRzBOBgNV\n" +
-            "HREERzBFgiRyZXZva2VkLnJvb3RjYTIuZGVtby5hbWF6b250cnVzdC5jb22CHXJl\n" +
-            "dm9rZWQuc2NhMmEuYW1hem9udHJ1c3QuY29tMA4GA1UdDwEB/wQEAwIFoDAdBgNV\n" +
-            "HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwOwYDVR0fBDQwMjAwoC6gLIYqaHR0\n" +
-            "cDovL2NybC5yNG0wMi5hbWF6b250cnVzdC5jb20vcjRtMDIuY3JsMBMGA1UdIAQM\n" +
-            "MAowCAYGZ4EMAQIBMHUGCCsGAQUFBwEBBGkwZzAtBggrBgEFBQcwAYYhaHR0cDov\n" +
-            "L29jc3AucjRtMDIuYW1hem9udHJ1c3QuY29tMDYGCCsGAQUFBzAChipodHRwOi8v\n" +
-            "Y3J0LnI0bTAyLmFtYXpvbnRydXN0LmNvbS9yNG0wMi5jZXIwDAYDVR0TAQH/BAIw\n" +
-            "ADCCAX0GCisGAQQB1nkCBAIEggFtBIIBaQFnAHYA7s3QZNXbGs7FXLedtM0TojKH\n" +
-            "Rny87N7DUUhZRnEftZsAAAGIB72CzgAABAMARzBFAiEA2vPYIPfGJeynPaZHq/c0\n" +
-            "GGvyT6MpvFGMW0s0woLRT28CIEFbZbFSCnKugaqw9QDNi7vYmIF3Gyi3s6G2cCxY\n" +
-            "4RJXAHYASLDja9qmRzQP5WoC+p0w6xxSActW3SyB2bu/qznYhHMAAAGIB72DDgAA\n" +
-            "BAMARzBFAiAvfNcgtFEwk5C9dvMUYANbIAv0IOdF1new8Umn3cM+JwIhALbs/3L9\n" +
-            "0ndF7sRKDZmfronNruptFlrI528P5Qi2P528AHUA2ra/az+1tiKfm8K7XGvocJFx\n" +
-            "bLtRhIU0vaQ9MEjX+6sAAAGIB72CxQAABAMARjBEAiBKUns2FPbs0cThb6e7SnyL\n" +
-            "y4/qP3V1Q/ASt/ZDRTeEQQIgWSQO4Gsz32srtqYuTM9AsFd92WA44kJHincdcGVX\n" +
-            "XbIwDQYJKoZIhvcNAQEMBQADggIBAAnaNbn2wXylTCS7dtgB3rWdUf6hja1UDuvB\n" +
-            "uZEL2dUOvyXfVFLNxKdeWBPzqpwEBNNwPQXhoI97TXlyu2x60jLzQamoGoRQ3s0P\n" +
-            "NLhasLGEIQH/oYdMV/yp8EI8fUuRVE3xyw39FRqOrmsUFAnxNQmBO/09JM7sLcvS\n" +
-            "wwh14p9dFTTolJHgnL4ZEtmZxSddFG+GBSTJ/A7dVSmwIudwzd+goA6173BI6yeT\n" +
-            "hhQumLctQiOM7y1MzFeV8rL+oIpd2xuzyhKKT1EgvU6/wyt0Ib8QqsFsrXPnUOKk\n" +
-            "HAq3SeZyq35QUaTKoaH9L1iZMbSCG9Jm6FMb12SdAz53653tYvAiUS76oD8Jot13\n" +
-            "RZu5NUlWAVLLq0OaEtuGp0bh+cVtzVnCC9m1qa46YpY0SojpvSbakgQMMGIgDlT3\n" +
-            "wFE7tST4WlsDC1f/m+H9V5qz/j0U8D3eNNdowxPqx/JZq/sk9ZK5KyMFARrvM+fh\n" +
-            "YrVYjKt91mu7JaS4pPOyZmJ8OQ14EvrN7BXc7IkNrI1reeaRFe49k5DAETB8VmP5\n" +
-            "2F0SWou2KkgtJvU4Z7YjlZ2HNHnpjTK5KdPNpRSt7EUy2zn9NCNoyQhnws70FyXv\n" +
-            "oPFyG92lnUQOKaAUhVRwTr9fvnkdMOzSKg/spxi2Ogdzym5Jw68eguwi0dVqX2+9\n" +
-            "3zViP2aH\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon May 15 13:38:54 PDT 2023", System.out);
-    }
-}
-
-class AmazonCA_3 {
-
-    // Owner: CN=Amazon ECDSA 256 M02, O=Amazon, C=US
-    // Issuer: CN=Amazon Root CA 3, O=Amazon, C=US
-    // Serial number: 773126de2c2fafd2c47ad88b1566e0182046d
-    // Valid from: Tue Aug 23 15:33:24 PDT 2022 until: Fri Aug 23 15:33:24 PDT 2030
-    private static final String INT_VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIC1DCCAnmgAwIBAgITB3MSbeLC+v0sR62IsVZuAYIEbTAKBggqhkjOPQQDAjA5\n" +
-            "MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24g\n" +
-            "Um9vdCBDQSAzMB4XDTIyMDgyMzIyMzMyNFoXDTMwMDgyMzIyMzMyNFowPTELMAkG\n" +
-            "A1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEdMBsGA1UEAxMUQW1hem9uIEVDRFNB\n" +
-            "IDI1NiBNMDIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS9vQLD4W/Kg4AnFRl8\n" +
-            "x/FUbLqtd5ICYjUijGsytF9hmgb/Dyk+Ebt4cw6rAlGbaiOLapSJKZiZr+UQdh3I\n" +
-            "QOr+o4IBWjCCAVYwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYw\n" +
-            "HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdDgQWBBS7eJrXaDMy\n" +
-            "nRq7bP2xNEwB3svQdTAfBgNVHSMEGDAWgBSrttvXBp43rDCGB5Fwx5zEGbF4wDB7\n" +
-            "BggrBgEFBQcBAQRvMG0wLwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLnJvb3RjYTMu\n" +
-            "YW1hem9udHJ1c3QuY29tMDoGCCsGAQUFBzAChi5odHRwOi8vY3J0LnJvb3RjYTMu\n" +
-            "YW1hem9udHJ1c3QuY29tL3Jvb3RjYTMuY2VyMD8GA1UdHwQ4MDYwNKAyoDCGLmh0\n" +
-            "dHA6Ly9jcmwucm9vdGNhMy5hbWF6b250cnVzdC5jb20vcm9vdGNhMy5jcmwwEwYD\n" +
-            "VR0gBAwwCjAIBgZngQwBAgEwCgYIKoZIzj0EAwIDSQAwRgIhAKSYEcDcp3kcPMzh\n" +
-            "OIYDWZOLu4InPod4fQhRTmc2zBAgAiEAmwdGE4AuNWhw9N8REhf82rJLNm7h9Myg\n" +
-            "TsR9Wu0bQYU=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=Amazon ECDSA 256 M01, O=Amazon, C=US
-    // Issuer: CN=Amazon Root CA 3, O=Amazon, C=US
-    // Serial number: 773126684d577c0fcf8d3a342bea86f94fc8f
-    // Valid from: Tue Aug 23 15:31:46 PDT 2022 until: Fri Aug 23 15:31:46 PDT 2030
-    private static final String INT_REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIC0zCCAnmgAwIBAgITB3MSZoTVd8D8+NOjQr6ob5T8jzAKBggqhkjOPQQDAjA5\n" +
-            "MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24g\n" +
-            "Um9vdCBDQSAzMB4XDTIyMDgyMzIyMzE0NloXDTMwMDgyMzIyMzE0NlowPTELMAkG\n" +
-            "A1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEdMBsGA1UEAxMUQW1hem9uIEVDRFNB\n" +
-            "IDI1NiBNMDEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT80w+2RwNHzyXmVUM/\n" +
-            "OUKBZpJkTzHyCKDl4sBrUfjzVjot/lNba9kYzMKSHYv95CUDoMaF2h2KAqx65uLQ\n" +
-            "Y8ago4IBWjCCAVYwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYw\n" +
-            "HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdDgQWBBRPWfy8BhYo\n" +
-            "v6LI2wj7zxMkumlCXDAfBgNVHSMEGDAWgBSrttvXBp43rDCGB5Fwx5zEGbF4wDB7\n" +
-            "BggrBgEFBQcBAQRvMG0wLwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLnJvb3RjYTMu\n" +
-            "YW1hem9udHJ1c3QuY29tMDoGCCsGAQUFBzAChi5odHRwOi8vY3J0LnJvb3RjYTMu\n" +
-            "YW1hem9udHJ1c3QuY29tL3Jvb3RjYTMuY2VyMD8GA1UdHwQ4MDYwNKAyoDCGLmh0\n" +
-            "dHA6Ly9jcmwucm9vdGNhMy5hbWF6b250cnVzdC5jb20vcm9vdGNhMy5jcmwwEwYD\n" +
-            "VR0gBAwwCjAIBgZngQwBAgEwCgYIKoZIzj0EAwIDSAAwRQIhALRfxq3SQIhj5xA4\n" +
-            "S5UAY/KlKqayZDpnbBdCDH8Kqmf/AiAUVZddALefnqRe+ifxN2FUp461LL6/cgVM\n" +
-            "EH3Ty27f1Q==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=valid.rootca3.demo.amazontrust.com
-    // Issuer: CN=Amazon ECDSA 256 M02, O=Amazon, C=US
-    // Serial number: 8e2f14864fb28e4a1da0f15a5118cc8
-    // Valid from: Tue May 09 17:00:00 PDT 2023 until: Fri Jun 07 16:59:59 PDT 2024
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIEfjCCBCWgAwIBAgIQCOLxSGT7KOSh2g8VpRGMyDAKBggqhkjOPQQDAjA9MQsw\n" +
-            "CQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMR0wGwYDVQQDExRBbWF6b24gRUNE\n" +
-            "U0EgMjU2IE0wMjAeFw0yMzA1MTAwMDAwMDBaFw0yNDA2MDcyMzU5NTlaMC0xKzAp\n" +
-            "BgNVBAMTInZhbGlkLnJvb3RjYTMuZGVtby5hbWF6b250cnVzdC5jb20wWTATBgcq\n" +
-            "hkjOPQIBBggqhkjOPQMBBwNCAAQfWc7gBGBBBmseCb2XWWRQVhCUQDVml3mVgvj5\n" +
-            "RmnP1y5wpifUTFqu8ELdI7YGZ4JMSnetiKNmLtg5yhTEjzCQo4IDFTCCAxEwHwYD\n" +
-            "VR0jBBgwFoAUu3ia12gzMp0au2z9sTRMAd7L0HUwHQYDVR0OBBYEFHCE8orvZDUK\n" +
-            "5TI9MYadzxWR9CZGMEkGA1UdEQRCMECCInZhbGlkLnJvb3RjYTMuZGVtby5hbWF6\n" +
-            "b250cnVzdC5jb22CGmdvb2Quc2NhM2EuYW1hem9udHJ1c3QuY29tMA4GA1UdDwEB\n" +
-            "/wQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwOwYDVR0fBDQw\n" +
-            "MjAwoC6gLIYqaHR0cDovL2NybC5lMm0wMi5hbWF6b250cnVzdC5jb20vZTJtMDIu\n" +
-            "Y3JsMBMGA1UdIAQMMAowCAYGZ4EMAQIBMHUGCCsGAQUFBwEBBGkwZzAtBggrBgEF\n" +
-            "BQcwAYYhaHR0cDovL29jc3AuZTJtMDIuYW1hem9udHJ1c3QuY29tMDYGCCsGAQUF\n" +
-            "BzAChipodHRwOi8vY3J0LmUybTAyLmFtYXpvbnRydXN0LmNvbS9lMm0wMi5jZXIw\n" +
-            "DAYDVR0TAQH/BAIwADCCAXwGCisGAQQB1nkCBAIEggFsBIIBaAFmAHUA7s3QZNXb\n" +
-            "Gs7FXLedtM0TojKHRny87N7DUUhZRnEftZsAAAGIB71y/gAABAMARjBEAiAEAXIb\n" +
-            "aOVR26HgFaI+qoIasCb8w2sOqVxGAxf5iPgX6QIgdAlMjqeoihi1arnJpzN8Bqxy\n" +
-            "5ULMUO7GK3JEgcogJHMAdgBIsONr2qZHNA/lagL6nTDrHFIBy1bdLIHZu7+rOdiE\n" +
-            "cwAAAYgHvXLkAAAEAwBHMEUCIF7wDDmWxTHwBZM7Me8eOCM1aQ/g1c1rJg/I+NJa\n" +
-            "HkZYAiEA8p+IviuY5piHBELjUtVlZLiS9XSSMxpQNhUerqC/YFoAdQDatr9rP7W2\n" +
-            "Ip+bwrtca+hwkXFsu1GEhTS9pD0wSNf7qwAAAYgHvXKvAAAEAwBGMEQCIFLskZDs\n" +
-            "UG4+/88D/5/QbD9zT6ZmZlwXiPZ6H2YR/KiJAiBvi4vvNsb9KNAhJMgI2T2iCg9U\n" +
-            "CIru+US6y3ua7dKKDTAKBggqhkjOPQQDAgNHADBEAiAzvgzKV/kvBbKWCT1NNUBD\n" +
-            "AF9okIEcJx/ukFgzmYMwUQIgXeJeVf3izkxsgiEUSknwHsErLFs/cEme2PSRj2AW\n" +
-            "dYA=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked.rootca3.demo.amazontrust.com
-    // Issuer: CN=Amazon ECDSA 256 M01, O=Amazon, C=US
-    // Serial number: c458bfaeedae16a5e61fe64773fc898
-    // Valid from: Tue May 09 17:00:00 PDT 2023 until: Fri Jun 07 16:59:59 PDT 2024
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIEhzCCBC2gAwIBAgIQDEWL+u7a4WpeYf5kdz/ImDAKBggqhkjOPQQDAjA9MQsw\n" +
-            "CQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMR0wGwYDVQQDExRBbWF6b24gRUNE\n" +
-            "U0EgMjU2IE0wMTAeFw0yMzA1MTAwMDAwMDBaFw0yNDA2MDcyMzU5NTlaMC8xLTAr\n" +
-            "BgNVBAMTJHJldm9rZWQucm9vdGNhMy5kZW1vLmFtYXpvbnRydXN0LmNvbTBZMBMG\n" +
-            "ByqGSM49AgEGCCqGSM49AwEHA0IABAsSs5kW5TZlS0SDrMb9iUQAqEaKa12Fc6SN\n" +
-            "9UR6qtOFdW/1UuziDq3Hl5dqsAYZJkbJSPCIsD2HTP/EGTMKITCjggMbMIIDFzAf\n" +
-            "BgNVHSMEGDAWgBRPWfy8BhYov6LI2wj7zxMkumlCXDAdBgNVHQ4EFgQUeE55ET2e\n" +
-            "i8KbY7KHTxOuvCkRpTowTgYDVR0RBEcwRYIkcmV2b2tlZC5yb290Y2EzLmRlbW8u\n" +
-            "YW1hem9udHJ1c3QuY29tgh1yZXZva2VkLnNjYTNhLmFtYXpvbnRydXN0LmNvbTAO\n" +
-            "BgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDsG\n" +
-            "A1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmwuZTJtMDEuYW1hem9udHJ1c3QuY29t\n" +
-            "L2UybTAxLmNybDATBgNVHSAEDDAKMAgGBmeBDAECATB1BggrBgEFBQcBAQRpMGcw\n" +
-            "LQYIKwYBBQUHMAGGIWh0dHA6Ly9vY3NwLmUybTAxLmFtYXpvbnRydXN0LmNvbTA2\n" +
-            "BggrBgEFBQcwAoYqaHR0cDovL2NydC5lMm0wMS5hbWF6b250cnVzdC5jb20vZTJt\n" +
-            "MDEuY2VyMAwGA1UdEwEB/wQCMAAwggF9BgorBgEEAdZ5AgQCBIIBbQSCAWkBZwB2\n" +
-            "AHb/iD8KtvuVUcJhzPWHujS0pM27KdxoQgqf5mdMWjp0AAABiAe9lQ8AAAQDAEcw\n" +
-            "RQIgZVFAX5WPZRBpEOqk620v4Rbzxh/3wrJ5QBMBJ0Mb8B0CIQC0oxFVLfs+PAv7\n" +
-            "25wawOu2VgDXG9lJAJtCwk3gN8BshQB2AEiw42vapkc0D+VqAvqdMOscUgHLVt0s\n" +
-            "gdm7v6s52IRzAAABiAe9lQ4AAAQDAEcwRQIhAIPVMj6IfjAUKeGYbpG9s0DRdWbc\n" +
-            "b8OzsOf+kRqk03NMAiB777hfoFCUMPrN0g8o5v6zp3T3qOhRnYY0TZN4q4NnMgB1\n" +
-            "ANq2v2s/tbYin5vCu1xr6HCRcWy7UYSFNL2kPTBI1/urAAABiAe9lN4AAAQDAEYw\n" +
-            "RAIgL0qoVbKLFD+Y3f/V6Rw+euZrPO6d1HEVPQGo7wLzkl8CIGHp3PQmmrEofl76\n" +
-            "4da7bY0L+csFW0sB8clN0KziMfe6MAoGCCqGSM49BAMCA0gAMEUCIQC+6VdX9X5g\n" +
-            "x3NSUmJ7py01Zxf26TNBv1ildxqesvZ/7wIgIrefriRzPiIFDHCUbdjk0VlmMwZR\n" +
-            "VzXXHINsGCiCKOs=\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT_VALID},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT_REVOKED},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon May 15 13:41:22 PDT 2023", System.out);
-    }
-}
-
-class AmazonCA_4 {
-
-    // Owner: CN=Amazon ECDSA 384 M02, O=Amazon, C=US
-    // Issuer: CN=Amazon Root CA 4, O=Amazon, C=US
-    // Serial number: 773127dfaa6b9e2b95538aa76dde4307f17c4
-    // Valid from: Tue Aug 23 15:36:58 PDT 2022 until: Fri Aug 23 15:36:58 PDT 2030
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIDETCCApagAwIBAgITB3MSffqmueK5VTiqdt3kMH8XxDAKBggqhkjOPQQDAzA5\n" +
-            "MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24g\n" +
-            "Um9vdCBDQSA0MB4XDTIyMDgyMzIyMzY1OFoXDTMwMDgyMzIyMzY1OFowPTELMAkG\n" +
-            "A1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEdMBsGA1UEAxMUQW1hem9uIEVDRFNB\n" +
-            "IDM4NCBNMDIwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATNYzWQDXV0NoNmR0hJPwJq\n" +
-            "hjYOOS9z0B2Z7MQudxg5x3Vsib6N+tJkq8dljRq5o6K0bbh/kRVfoi9wfKhB03Yz\n" +
-            "gkerrwRCH7Z9gU5nbBY+Y5+EtImq4yOB0n7JQgQxWemjggFaMIIBVjASBgNVHRMB\n" +
-            "Af8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcD\n" +
-            "AQYIKwYBBQUHAwIwHQYDVR0OBBYEFKbZqzuHmTP/6Gj4i2GDbNCyuq+9MB8GA1Ud\n" +
-            "IwQYMBaAFNPsxzplbszh2naaVvuc84ZtV+WBMHsGCCsGAQUFBwEBBG8wbTAvBggr\n" +
-            "BgEFBQcwAYYjaHR0cDovL29jc3Aucm9vdGNhNC5hbWF6b250cnVzdC5jb20wOgYI\n" +
-            "KwYBBQUHMAKGLmh0dHA6Ly9jcnQucm9vdGNhNC5hbWF6b250cnVzdC5jb20vcm9v\n" +
-            "dGNhNC5jZXIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5yb290Y2E0LmFt\n" +
-            "YXpvbnRydXN0LmNvbS9yb290Y2E0LmNybDATBgNVHSAEDDAKMAgGBmeBDAECATAK\n" +
-            "BggqhkjOPQQDAwNpADBmAjEA2zCG6x0xMlgSXWEGLN8+1XN+OCYF5vj0Z1jtVy+A\n" +
-            "pdLlzuxNt9HBWn3hvqvO2W8KAjEApNdsZOCmk5uZBYiuCSBnDH3jyKhN6dWyuuHW\n" +
-            "9Wj7SxKnOU5+wYWZA0BQAv1KT62i\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=valid.rootca4.demo.amazontrust.com
-    // Issuer: CN=Amazon ECDSA 384 M02, O=Amazon, C=US
-    // Serial number: f579bed3369f1a147ea5d0e8e6532d3
-    // Valid from: Tue May 09 17:00:00 PDT 2023 until: Fri Jun 07 16:59:59 PDT 2024
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIEvjCCBESgAwIBAgIQD1eb7TNp8aFH6l0OjmUy0zAKBggqhkjOPQQDAzA9MQsw\n" +
-            "CQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMR0wGwYDVQQDExRBbWF6b24gRUNE\n" +
-            "U0EgMzg0IE0wMjAeFw0yMzA1MTAwMDAwMDBaFw0yNDA2MDcyMzU5NTlaMC0xKzAp\n" +
-            "BgNVBAMTInZhbGlkLnJvb3RjYTQuZGVtby5hbWF6b250cnVzdC5jb20wdjAQBgcq\n" +
-            "hkjOPQIBBgUrgQQAIgNiAAT6/95JFuvx5t9MVeRZmBtXq63Q2fXZnSwEy2U2F4Qc\n" +
-            "ejhDwcYfD2HmT6S6GrKqLNJMa5n2YOvet4LZpKJLFF+BQo6FJt5cXkzHHxZ1I4z3\n" +
-            "8pGU79CpCgFOFy6QUlF68NajggMXMIIDEzAfBgNVHSMEGDAWgBSm2as7h5kz/+ho\n" +
-            "+Ithg2zQsrqvvTAdBgNVHQ4EFgQUR/GnpQkrUsCj8jF6/JIE1Rs07zswSQYDVR0R\n" +
-            "BEIwQIIidmFsaWQucm9vdGNhNC5kZW1vLmFtYXpvbnRydXN0LmNvbYIaZ29vZC5z\n" +
-            "Y2E0YS5hbWF6b250cnVzdC5jb20wDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQG\n" +
-            "CCsGAQUFBwMBBggrBgEFBQcDAjA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3Js\n" +
-            "LmUzbTAyLmFtYXpvbnRydXN0LmNvbS9lM20wMi5jcmwwEwYDVR0gBAwwCjAIBgZn\n" +
-            "gQwBAgEwdQYIKwYBBQUHAQEEaTBnMC0GCCsGAQUFBzABhiFodHRwOi8vb2NzcC5l\n" +
-            "M20wMi5hbWF6b250cnVzdC5jb20wNgYIKwYBBQUHMAKGKmh0dHA6Ly9jcnQuZTNt\n" +
-            "MDIuYW1hem9udHJ1c3QuY29tL2UzbTAyLmNlcjAMBgNVHRMBAf8EAjAAMIIBfgYK\n" +
-            "KwYBBAHWeQIEAgSCAW4EggFqAWgAdgDuzdBk1dsazsVct520zROiModGfLzs3sNR\n" +
-            "SFlGcR+1mwAAAYgHvZA9AAAEAwBHMEUCIQCmzmQOzunsuAg1GpIcNx0isG6ylbhP\n" +
-            "y9JP4UFclL2hdwIgBtTM89mE7QJDj7h7xr2eRPio1ehgmeYH1PHXxCqHIGYAdgBI\n" +
-            "sONr2qZHNA/lagL6nTDrHFIBy1bdLIHZu7+rOdiEcwAAAYgHvZB1AAAEAwBHMEUC\n" +
-            "IF9hbi82CLU5umfRze4NpX6u4jlT+N8KSaBe6UbhqjBZAiEAi2Y6PTt2+107LxtM\n" +
-            "oBpHprph7hQvGfjPE+p+rfM/X+EAdgDatr9rP7W2Ip+bwrtca+hwkXFsu1GEhTS9\n" +
-            "pD0wSNf7qwAAAYgHvZBeAAAEAwBHMEUCIAI+m4mVE3HtZOEMC5VI7m0nEPdPPJUq\n" +
-            "fxUKPpeIVmk5AiEA0scVJy7g3Fv+2nTVhbcwWCwn/Gvc+0txQrc529juflcwCgYI\n" +
-            "KoZIzj0EAwMDaAAwZQIxAKV837BpqlNHg35EsCCtrJPoQ6RuY9UoHm1O2CdsCXGR\n" +
-            "Z3kAnlgIV8A/waI6wQqfsQIwdCqaC+qN60JCnX09YKRD15eQjq1rN3w+llI+lEbS\n" +
-            "FSMsnoHJcqMZLo9s+4Rf0zS3\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked.rootca4.demo.amazontrust.com
-    // Issuer: CN=Amazon ECDSA 384 M02, O=Amazon, C=US
-    // Serial number: 4a5d392936b4decb818b7fb106ebbd8
-    // Valid from: Tue May 09 17:00:00 PDT 2023 until: Fri Jun 07 16:59:59 PDT 2024
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIExjCCBEygAwIBAgIQBKXTkpNrTey4GLf7EG672DAKBggqhkjOPQQDAzA9MQsw\n" +
-            "CQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMR0wGwYDVQQDExRBbWF6b24gRUNE\n" +
-            "U0EgMzg0IE0wMjAeFw0yMzA1MTAwMDAwMDBaFw0yNDA2MDcyMzU5NTlaMC8xLTAr\n" +
-            "BgNVBAMTJHJldm9rZWQucm9vdGNhNC5kZW1vLmFtYXpvbnRydXN0LmNvbTB2MBAG\n" +
-            "ByqGSM49AgEGBSuBBAAiA2IABFYfMbv5/vgqDunZj4ffJiuELtdwfEPXx9QlZnCm\n" +
-            "rBP3Z4/GvUVRVmyh5sYdnbCGCEClH/RxU6BC5SKv+TzhsFLEumhezanljnQXRAIL\n" +
-            "a1OGbP8zLLP6FuAD0cjY3P3adKOCAx0wggMZMB8GA1UdIwQYMBaAFKbZqzuHmTP/\n" +
-            "6Gj4i2GDbNCyuq+9MB0GA1UdDgQWBBSqnGV5pN/agPCtVdV37CP1z/DUqjBOBgNV\n" +
-            "HREERzBFgiRyZXZva2VkLnJvb3RjYTQuZGVtby5hbWF6b250cnVzdC5jb22CHXJl\n" +
-            "dm9rZWQuc2NhNGEuYW1hem9udHJ1c3QuY29tMA4GA1UdDwEB/wQEAwIHgDAdBgNV\n" +
-            "HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwOwYDVR0fBDQwMjAwoC6gLIYqaHR0\n" +
-            "cDovL2NybC5lM20wMi5hbWF6b250cnVzdC5jb20vZTNtMDIuY3JsMBMGA1UdIAQM\n" +
-            "MAowCAYGZ4EMAQIBMHUGCCsGAQUFBwEBBGkwZzAtBggrBgEFBQcwAYYhaHR0cDov\n" +
-            "L29jc3AuZTNtMDIuYW1hem9udHJ1c3QuY29tMDYGCCsGAQUFBzAChipodHRwOi8v\n" +
-            "Y3J0LmUzbTAyLmFtYXpvbnRydXN0LmNvbS9lM20wMi5jZXIwDAYDVR0TAQH/BAIw\n" +
-            "ADCCAX8GCisGAQQB1nkCBAIEggFvBIIBawFpAHYAdv+IPwq2+5VRwmHM9Ye6NLSk\n" +
-            "zbsp3GhCCp/mZ0xaOnQAAAGIB72QJQAABAMARzBFAiA74zKrlL+y5rYwSLxBL8fs\n" +
-            "QYRYXF0s0sGoaSEeAg1DkgIhAPu8Z0TLIFoppmyiv+A5z6S+SG+v/kOsAYmQmiUO\n" +
-            "5scIAHcASLDja9qmRzQP5WoC+p0w6xxSActW3SyB2bu/qznYhHMAAAGIB72QJgAA\n" +
-            "BAMASDBGAiEAg+x7JBT3oIaZdnfgGN1G6SAiNUL7zR/tBhbWIG9tz94CIQDGwBiV\n" +
-            "Tslt11+W3ZaNsS7UtUIiB45YHUc4qKm5ry2fTAB2ANq2v2s/tbYin5vCu1xr6HCR\n" +
-            "cWy7UYSFNL2kPTBI1/urAAABiAe9kAgAAAQDAEcwRQIgPvKfSpMJKRocGk9+GNr3\n" +
-            "hUj8x8WySB//0X116TNgA0gCIQDhGRqxnEZmEFGEfj5GY9vjEfm0kKwcL0lCuwBu\n" +
-            "NZG4dzAKBggqhkjOPQQDAwNoADBlAjEA1PLdsrko3tDs50aAeEU9Gn+0CG8QKy7R\n" +
-            "fQaXBTjGETDgGJk/7zGNpGelKPr/UYV9AjASwdA32S8jIADxA8HrqiMsVYDFMnbU\n" +
-            "jLLwR6CTLtAcWtwVmoQ2x0usvTvN8YJBPoA=\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon May 15 13:42:48 PDT 2023", System.out);
-    }
-}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java
deleted file mode 100644
index 9ad20271bec..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
- /*
- * @test
- * @bug 8189131
- * @summary Interoperability tests with Buypass Class 2 and Class 3 CA
- * @build ValidatePathWithParams
- * @run main/othervm/timeout=180 -Djava.security.debug=certpath BuypassCA OCSP
- * @run main/othervm/timeout=180 -Djava.security.debug=certpath BuypassCA CRL
- */
-
- /*
- * Obtain test artifacts for Buypass Class 2 and Class 3 CAs from:
- *  Buypass Class 3 CA 2
- *  https://valid.qcevident.ca23.ssl.buypass.no/
- *  https://revoked.qcevident.ca23.ssl.buypass.no/
- *  https://expired.qcevident.ca23.ssl.buypass.no/
- *  https://valid.evident.ca23.ssl.buypass.no/
- *  https://revoked.evident.ca23.ssl.buypass.no/
- *  https://expired.evident.ca23.ssl.buypass.no/
- *  https://valid.businessplus.ca23.ssl.buypass.no
- *  https://revoked.businessplus.ca23.ssl.buypass.no
- *  https://expired.businessplus.ca23.ssl.buypass.no
-
- *  Buypass Class 2 CA 2
- *  https://valid.business.ca22.ssl.buypass.no
- *  https://revoked.business.ca22.ssl.buypass.no
- *  https://expired.business.ca22.ssl.buypass.no
- *  https://valid.domain.ca22.ssl.buypass.no
- *  https://revoked.domain.ca22.ssl.buypass.no
- *  https://expired.domain.ca22.ssl.buypass.no/
- */
-public class BuypassCA {
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-        }
-
-        new BuypassClass2().runTest(pathValidator);
-        new BuypassClass3().runTest(pathValidator);
-    }
-}
-
-class BuypassClass2 {
-
-    // Owner: CN=Buypass Class 2 CA 2, O=Buypass AS-983163327, C=NO
-    // Issuer: CN=Buypass Class 2 Root CA, O=Buypass AS-983163327, C=NO
-    // Serial number: 1b781c6d5e34ce1f77
-    // Valid from: Mon Mar 25 05:17:10 PDT 2019 until: Sat Oct 26 02:16:17 PDT 2030
-    private static final String INT_CLASS_2 = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFKTCCAxGgAwIBAgIJG3gcbV40zh93MA0GCSqGSIb3DQEBCwUAME4xCzAJBgNV\n" +
-            "BAYTAk5PMR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEgMB4GA1UEAwwX\n" +
-            "QnV5cGFzcyBDbGFzcyAyIFJvb3QgQ0EwHhcNMTkwMzI1MTIxNzEwWhcNMzAxMDI2\n" +
-            "MDkxNjE3WjBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwUQnV5cGFzcyBBUy05ODMx\n" +
-            "NjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAyMIIBIjANBgkqhkiG\n" +
-            "9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnKtnxpZLDQ+R0uzKzDMr83L8Dn+5ToSpD31z\n" +
-            "qiYMykj7I2geNQ7javKsBOzhgeVr7GP4yJ5bK/P0dhoKesYvQITihfwztbMP6DyH\n" +
-            "q1QJLQBqQnF0Lk8GhxSSNAZnlkCgX3aazoL32p9BeEfHuUE/8BlPywJY/RyE5/39\n" +
-            "w3EKmWylhUkeRCMo3dUZr4khJq8JwGp/feKFs9n5FouM5PGhpFpZO+WQXEeqxpnc\n" +
-            "CxbvWpInBoTnmX3+ofjm+fmY+sdAnyHkuOBBw3koGbFQygDaJP9VItOGByCX4iSV\n" +
-            "ty/2uzppowIkf7Mpu5v5HJGKObLMP1gGv5lNqjAe8mz0bn25kwIDAQABo4IBCzCC\n" +
-            "AQcwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTJgHfgYpKC9Uac87r3TMPe\n" +
-            "uKOtOTAdBgNVHQ4EFgQUkq1libIAD8tRDcEj7JROj8EEP3cwDgYDVR0PAQH/BAQD\n" +
-            "AgEGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjARBgNVHSAECjAIMAYG\n" +
-            "BFUdIAAwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2NybC5idXlwYXNzLm5vL2Ny\n" +
-            "bC9CUENsYXNzMlJvb3RDQS5jcmwwMwYIKwYBBQUHAQEEJzAlMCMGCCsGAQUFBzAB\n" +
-            "hhdodHRwOi8vb2NzcC5idXlwYXNzLmNvbTANBgkqhkiG9w0BAQsFAAOCAgEApNka\n" +
-            "48a+qhJXXS9R24p34CWnirlyxPMhxFfQyvPFXnwBQGHvrm7H5KY3/9/etShFXdY/\n" +
-            "N05Aq6UnE8my8jR4iHMm2e9iEf4v+O2E2JGH/5/H8wup160GBAsp4zAmJIT8KEgh\n" +
-            "YAA1j+NaClVryZfEaaDfAdF6LbU3cW0ZgooILPMeeCEXso23KsdCD1Q+SMvD6nQJ\n" +
-            "86iTvzWPY2GFJyEmvG/N2f29nBaHxWwZBwCfWB4Hqsw9wdKfY5M9SE/AGSLZ7LRM\n" +
-            "BmkkF9nqkWxxISadx12nbxn0LsU2k8Xyt830DqhHGSoYHEC/iGxbU4Bub8NC0uw/\n" +
-            "QNBj5Gd5cXLFhRUWLLBTq4p6P6kLc7JudpM4FNQ+stWK/eDZylbDLN3iCBRnHH4p\n" +
-            "qg6HAlWuieiAKVsidBMxPUyDLJ/8Dt+aW8Z3vCNcYC2n7wqrLZz5e4FG+Wn9teFW\n" +
-            "Rt5pO6ZUZAkDS59ZVojbbjOdQzNw3QHtZl0IMHeNYXJlPIUlHi4hGL3maGZ9sBF+\n" +
-            "AMfMLDu56+J2DewIuTXPzCeJeSTam/ybNt5FxTznxCSCIDqwmZMy3AQEz9nGSbE8\n" +
-            "zfwB5VT2ijLB0PpPX4YbLf33Vodf0NAkBUv6N5It30XiTUPhdk+caBYPoljz/J9U\n" +
-            "15T5+EGHs8ccHQWyYQ6gqYk8o4JgP4rSJqO1sMI=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=valid.domain.ca22.ssl.buypass.no
-    // Issuer: CN=Buypass Class 2 CA 2, O=Buypass AS-983163327, C=NO
-    // Serial number: 34e2bff8063debd18d79
-    // Valid from: Mon Sep 23 04:12:34 PDT 2019 until: Mon Oct 11 14:59:00 PDT 2021
-    private static final String VALID_CLASS_2 = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIF8jCCBNqgAwIBAgIKNOK/+AY969GNeTANBgkqhkiG9w0BAQsFADBLMQswCQYD\n" +
-            "VQQGEwJOTzEdMBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMM\n" +
-            "FEJ1eXBhc3MgQ2xhc3MgMiBDQSAyMB4XDTE5MDkyMzExMTIzNFoXDTIxMTAxMTIx\n" +
-            "NTkwMFowKzEpMCcGA1UEAwwgdmFsaWQuZG9tYWluLmNhMjIuc3NsLmJ1eXBhc3Mu\n" +
-            "bm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeu/8j7y55R3OucDek\n" +
-            "gtdoVOEJQb2XaCR4OwiRzn74hLYhKGdFmFwSp+bPCT62NzjdK1urVeKrCQdC1Gkm\n" +
-            "e7iSOsHHO5aC8oxkgdv8mwEwwvH7xHCcpEVLDlE5Oc0d4cS4QIwFAhNIC77slixL\n" +
-            "fEdupc5e8FfQf3MlnhX+8gpgRzTx3iw8sb3gUwi3+7PRommHOhC7Ll+iI9LiLODJ\n" +
-            "qrkHnCbM2HJMK+SGTOQ/whiQwMCnkLaEG0WO1rYc4BGRGfFb8qmQWw/tDKkEey7X\n" +
-            "nLIFHSC33OiexQshAwRIAE7r1h9gMY1aAAB2Uxwi9/3l6fsd/VPmK7s7lYTBsrpK\n" +
-            "r4bTAgMBAAGjggL2MIIC8jAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFJKtZYmyAA/L\n" +
-            "UQ3BI+yUTo/BBD93MB0GA1UdDgQWBBSy+COaEmU2/BeF4g1OglFvAEYkIDAOBgNV\n" +
-            "HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1Ud\n" +
-            "IAQYMBYwCgYIYIRCARoBAgQwCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0\n" +
-            "dHA6Ly9jcmwuYnV5cGFzcy5uby9jcmwvQlBDbGFzczJDQTIuY3JsMCsGA1UdEQQk\n" +
-            "MCKCIHZhbGlkLmRvbWFpbi5jYTIyLnNzbC5idXlwYXNzLm5vMGoGCCsGAQUFBwEB\n" +
-            "BF4wXDAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuYnV5cGFzcy5jb20wNQYIKwYB\n" +
-            "BQUHMAKGKWh0dHA6Ly9jcnQuYnV5cGFzcy5uby9jcnQvQlBDbGFzczJDQTIuY2Vy\n" +
-            "MIIBfgYKKwYBBAHWeQIEAgSCAW4EggFqAWgAdwC72d+8H4pxtZOUI5eqkntHOFeV\n" +
-            "CqtS6BqQlmQ2jh7RhQAAAW1d0tivAAAEAwBIMEYCIQDFRAH98gYpvMMTVa3d5Wcq\n" +
-            "0tOwpZZyUHiOjUlR3SD14QIhAKZp0cdwFpm+hh0taFVSTmluGsHmXPMCIQq9hLAB\n" +
-            "VYgyAHYApLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFtXdLbFwAA\n" +
-            "BAMARzBFAiBhr7KQc9yO3zb1iLlE0JW9whR0/bhrPDkk5BYnBKjzFAIhAMMTdHfk\n" +
-            "1ljso5jKzIUcBpSW0HnTcuKiB3VxGpL7GFVWAHUAb1N2rDHwMRnYmQCkURX/dxUc\n" +
-            "EdkCwQApBo2yCJo32RMAAAFtXdLYSAAABAMARjBEAiADoZr6Cp5AGM1eT2aUeRaQ\n" +
-            "kv0vRaegjRGIhKRCvRGyFAIgWLU/7zh28LI8vAyWr8mpDqlUXvF13i3zSD3whq4L\n" +
-            "Lu4wDQYJKoZIhvcNAQELBQADggEBAJH1RhTuMbhEOYlw+Efbx7PP7EEC/GQ1ijET\n" +
-            "vZS45jFQyTKhFUcdP2QPAtEVo1nS8PBs0txQJBf0xceWUjer9ruxiAS+JlW21AOi\n" +
-            "Uq9Kahpj5k63Z7tN8KTeOUE8wZGmHyvVcPP6mkC94RbjYIb4gd13eYxd2Vv1a7YX\n" +
-            "dNI+J3g7sX5ijssfJxzDd0hORj2584YY2WiKKvIGxwDnLkxk09i3IvjEKsAi4Cgn\n" +
-            "5798X5sSL1Q9C6gHEWt+cB5UtfILCfbLNRczS9zGku6gjh1c8dB7zc63mn7oCf1C\n" +
-            "gnQ2xqwbZb3Wau8CPwcMqJWgQZLQFPbZd+4Xo5SDDqYppV4oN2A=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked.domain.ca22.ssl.buypass.no
-    // Issuer: CN=Buypass Class 2 CA 2, O=Buypass AS-983163327, C=NO
-    // Serial number: 34e4b97261795f98c495
-    // Valid from: Mon Sep 23 04:52:42 PDT 2019 until: Thu Sep 23 14:59:00 PDT 2021
-    private static final String REVOKED_CLASS_2 = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIF9zCCBN+gAwIBAgIKNOS5cmF5X5jElTANBgkqhkiG9w0BAQsFADBLMQswCQYD\n" +
-            "VQQGEwJOTzEdMBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMM\n" +
-            "FEJ1eXBhc3MgQ2xhc3MgMiBDQSAyMB4XDTE5MDkyMzExNTI0MloXDTIxMDkyMzIx\n" +
-            "NTkwMFowLTErMCkGA1UEAwwicmV2b2tlZC5kb21haW4uY2EyMi5zc2wuYnV5cGFz\n" +
-            "cy5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOiChajGbQktGjbl\n" +
-            "k/i5PtqfMN6cMyjJdOirxzXdUG8dT+QErC5zcElCwuyy5MH7DQJRbSYsPxQmr6z5\n" +
-            "OSheBxX0lPPLjJFfEafBZ+Fw1xmCVy3Xjt3GEl85iqv5y0/E/UlQPc0f7s6WxU0L\n" +
-            "cItkyN0rWAa+uQY018qDFn+gDYIKWPzTCf5nkXIgob/IgBM1Bj7vSZ/LI1iB+I+G\n" +
-            "dgLbSGBlJgK6lhCTc1tunZlSbKdPM2Th8Hbl6Uk7WormR/8SrGQA9AAd7BWa43V5\n" +
-            "HHvf/oArsx0afp3zXNiMw9RgHVHI5uUAzkNnL8NMUpI1sK7/ndTlm0nXsHpPKrPo\n" +
-            "e+NpKaMCAwEAAaOCAvkwggL1MAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUkq1libIA\n" +
-            "D8tRDcEj7JROj8EEP3cwHQYDVR0OBBYEFDoBaIahoDhRhA3WVyT/XukqZzmAMA4G\n" +
-            "A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD\n" +
-            "VR0gBBgwFjAKBghghEIBGgECBDAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4Yp\n" +
-            "aHR0cDovL2NybC5idXlwYXNzLm5vL2NybC9CUENsYXNzMkNBMi5jcmwwLQYDVR0R\n" +
-            "BCYwJIIicmV2b2tlZC5kb21haW4uY2EyMi5zc2wuYnV5cGFzcy5ubzBqBggrBgEF\n" +
-            "BQcBAQReMFwwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmJ1eXBhc3MuY29tMDUG\n" +
-            "CCsGAQUFBzAChilodHRwOi8vY3J0LmJ1eXBhc3Mubm8vY3J0L0JQQ2xhc3MyQ0Ey\n" +
-            "LmNlcjCCAX8GCisGAQQB1nkCBAIEggFvBIIBawFpAHYAu9nfvB+KcbWTlCOXqpJ7\n" +
-            "RzhXlQqrUugakJZkNo4e0YUAAAFtXfeApgAABAMARzBFAiARoEDgK57YWEW2R21d\n" +
-            "jFMphF5c9PypIwbZFHiWxdyCyAIhALsjjtPGgcrT/7KebYFPuKDyQO6rc8YYvm0z\n" +
-            "Q+Xt7NhxAHYApLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFtXfeD\n" +
-            "eQAABAMARzBFAiBCXKlCGkqa85QVqMR5dYDDz3F5aQgLXPubrQLX7cAZ0wIhALRr\n" +
-            "p8F6OfIdccSUhzEcNdtensQ/7zxgn81bUzn1ar9EAHcAb1N2rDHwMRnYmQCkURX/\n" +
-            "dxUcEdkCwQApBo2yCJo32RMAAAFtXfeBSQAABAMASDBGAiEAyrR31T85HGekHZdD\n" +
-            "r/m6flxqQaUIGcAJ5WcrBuIBuYkCIQD0rDdm+vM5/lNXIfjjrPLhATFEvrxpXJvu\n" +
-            "+sW4Ntm94jANBgkqhkiG9w0BAQsFAAOCAQEAjbMEFeNXFy3YQSr8O0+fY7qwaAzk\n" +
-            "vq65Ef/B2zvqO375+JI21grUikmFUnDiAaM8Y+8PJkOXDiuxR2/XCLsXpxCcPqQh\n" +
-            "V0MZlqXtjKZjBACILBX7aqGibojJTIlo0Dkd+LfPwswfXscTbb1CUXpUPn7CiUj5\n" +
-            "0WwfvjjQXny0NAB6WEkBMEBx6/Q75dvltoV9N1BZVer9hov6UTDuSad86faX2QF2\n" +
-            "aIEjrTJY3m2HqnIYf/lQxuDUDW0h7ddGGsIEBDM8z7M/rvT068ssRqJ8uecGjMaz\n" +
-            "JElX8VDgMux2kyjTAiAFD5QO+KTfySri9QXptik3wo66zDOmkVES1snvVQ==\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID_CLASS_2, INT_CLASS_2},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED_CLASS_2, INT_CLASS_2},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon Sep 23 04:53:18 PDT 2019", System.out);
-    }
-}
-
-class BuypassClass3 {
-
-    // Owner: CN=Buypass Class 3 CA 2, O=Buypass AS-983163327, C=NO
-    // Issuer: CN=Buypass Class 3 Root CA, O=Buypass AS-983163327, C=NO
-    // Serial number: 1be0dc6a3e7f220475
-    // Valid from: Mon Mar 25 05:12:16 PDT 2019 until: Sat Oct 26 01:16:17 PDT 2030
-    private static final String INT_CLASS_3 = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFKTCCAxGgAwIBAgIJG+Dcaj5/IgR1MA0GCSqGSIb3DQEBCwUAME4xCzAJBgNV\n" +
-            "BAYTAk5PMR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEgMB4GA1UEAwwX\n" +
-            "QnV5cGFzcyBDbGFzcyAzIFJvb3QgQ0EwHhcNMTkwMzI1MTIxMjE2WhcNMzAxMDI2\n" +
-            "MDgxNjE3WjBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwUQnV5cGFzcyBBUy05ODMx\n" +
-            "NjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAyMIIBIjANBgkqhkiG\n" +
-            "9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvU4V2hRFFe4K7BMEmm4IoMTwS7NyDQB4JEar\n" +
-            "dV1qBsKHIIQJDm9hbCakcLIWXVv6vYrJZ1AEF0b6awBwhhlqXlyNnOtNa9uR+IAP\n" +
-            "86d4yOGpgHSlNAhdtOOk9Qw6MUzzBo1lyoYmoL0f5n02SMrlMcArSg458o08eDUx\n" +
-            "4iZs4dXDR9Hjxac2s+mdAO35Js8VK/D50AIMDJvHVeCMw+rumZkNZuRqM7PjIK+u\n" +
-            "BmbqO8A95PeqQEWHvM5nchlV1+ZGNVqHHSJenlMnVKytGv+4KJp7U741H/9cMbd2\n" +
-            "X2PXsewWWFhGXoS8R9VXQ5xb3hF6324FQXvcA1mXRv6DAJedXQIDAQABo4IBCzCC\n" +
-            "AQcwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBRHuM3/5W/u+LLsL04O+SWw\n" +
-            "jjxrwzAdBgNVHQ4EFgQUIjAu0vv2S8rAuDvSBMTpcuaXmwwwDgYDVR0PAQH/BAQD\n" +
-            "AgEGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjARBgNVHSAECjAIMAYG\n" +
-            "BFUdIAAwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2NybC5idXlwYXNzLm5vL2Ny\n" +
-            "bC9CUENsYXNzM1Jvb3RDQS5jcmwwMwYIKwYBBQUHAQEEJzAlMCMGCCsGAQUFBzAB\n" +
-            "hhdodHRwOi8vb2NzcC5idXlwYXNzLmNvbTANBgkqhkiG9w0BAQsFAAOCAgEAo42Y\n" +
-            "fp96nUiZbZsqvYBID3Sqtx3jJfU8gNHFeXgkS0pxYHHYUwsVSVRjw+BGVEGUswpF\n" +
-            "MaYMCZD37ZL0JpvvXWrCDaMb/GqDJAQHLLTyVKPGGGIWCZH/FrhnNvcpt2XXA8lU\n" +
-            "Ujzp5nZPuqvenzQ/aXHI4sH5sN/QjyKVMSa/6RbWBeQmvIdgyM+0jIR5/r6UGiKM\n" +
-            "ar55trZgnlIbvQJ/w8QTmI/NwvA5CtRaOslQBxeKoAR0BuA/lRWnocXa/BM5uO6P\n" +
-            "ULL7ct/uI1bS+YThHXHmFybI6kDf+RhRzWY9165ZP96PBph6smQkxPDAz2b8v+mh\n" +
-            "LThH+5hkqnoetYfK2MdBYinceGPP3gZ+uBSDDI2o6vdVvdg7G96GP1OEtgTEqZa3\n" +
-            "glVafckpn/8F5CisypdQuZ5zyy/6SXZCKkPcikR87ysSKnjtteXbxMWVtwkeBALT\n" +
-            "K7DbJA+5aOCYRNj6CJGULQKiGlC01/ipORKewf5J3yus81lLHzBmgQMA5l9RL8rV\n" +
-            "6dI246mPpQ+8WDLsDrK3ydSDv5izgdVHzhL0tT2u4vwSq2WUqCgi4xLIA1N/fA2H\n" +
-            "xEW7zh0X/3YVz++g/6bd7iqRD9nRRZxACekRbza7AqU5xN1UjvVtCJQ9VC74K9KP\n" +
-            "pBoLWE2Bz5ksL9VUc4kS+WGORvZrSE1EpBq6cHc=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: SERIALNUMBER=983163327, CN=valid.businessplus.ca23.ssl.buypass.no, O=BUYPASS AS,
-    // L=OSLO, OID.2.5.4.17=0484, C=NO
-    // Issuer: CN=Buypass Class 3 CA 2, O=Buypass AS-983163327, C=NO
-    // Serial number: 267b7a9f0c3da9b94b39
-    // Valid from: Mon Sep 23 04:17:42 PDT 2019 until: Mon Oct 11 14:59:00 PDT 2021
-    private static final String VALID_CLASS_3 = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGUTCCBTmgAwIBAgIKJnt6nww9qblLOTANBgkqhkiG9w0BAQsFADBLMQswCQYD\n" +
-            "VQQGEwJOTzEdMBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMM\n" +
-            "FEJ1eXBhc3MgQ2xhc3MgMyBDQSAyMB4XDTE5MDkyMzExMTc0MloXDTIxMTAxMTIx\n" +
-            "NTkwMFowgYUxCzAJBgNVBAYTAk5PMQ0wCwYDVQQRDAQwNDg0MQ0wCwYDVQQHDARP\n" +
-            "U0xPMRMwEQYDVQQKDApCVVlQQVNTIEFTMS8wLQYDVQQDDCZ2YWxpZC5idXNpbmVz\n" +
-            "c3BsdXMuY2EyMy5zc2wuYnV5cGFzcy5ubzESMBAGA1UEBRMJOTgzMTYzMzI3MIIB\n" +
-            "IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArqj6dPVIQUULBV/S+u2/Rfko\n" +
-            "3BljX/KMEAclJHPu6AbJ2Dw5oLqCynOfTwLmGl3IRBQuDUAuoLdaptIhaXR2VTsF\n" +
-            "8SWdHNXkykC2eD0XkAUdTuKgRm/3U4f0T3XQsjwKOEQGECwGEWJekBL73retSRWe\n" +
-            "Ccc19NpSKZ5rmRnQSlKLfqUyihmw2xXmIWwEmBq0OOyG8ic3C11Zxh6yUOtlZJqB\n" +
-            "lWqbAAOK5SXTNV0qozwgkSvtAtJvUo2++rng35Oj8MvjKQjLi92NnSpjbj3rUivW\n" +
-            "++44X94IgoF9dITkSMnubXhaTLnciM08R8jmCFj877NRrVJRmcJhPfP1yHnR3wID\n" +
-            "AQABo4IC+jCCAvYwCQYDVR0TBAIwADAfBgNVHSMEGDAWgBQiMC7S+/ZLysC4O9IE\n" +
-            "xOly5pebDDAdBgNVHQ4EFgQUKJCKAxRR7K6pedVONDSn58EOzQcwDgYDVR0PAQH/\n" +
-            "BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSAEGDAW\n" +
-            "MAoGCGCEQgEaAQMEMAgGBmeBDAECAjA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v\n" +
-            "Y3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EyLmNybDAxBgNVHREEKjAogiZ2\n" +
-            "YWxpZC5idXNpbmVzc3BsdXMuY2EyMy5zc2wuYnV5cGFzcy5ubzBqBggrBgEFBQcB\n" +
-            "AQReMFwwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmJ1eXBhc3MuY29tMDUGCCsG\n" +
-            "AQUFBzAChilodHRwOi8vY3J0LmJ1eXBhc3Mubm8vY3J0L0JQQ2xhc3MzQ0EyLmNl\n" +
-            "cjCCAXwGCisGAQQB1nkCBAIEggFsBIIBaAFmAHYAu9nfvB+KcbWTlCOXqpJ7RzhX\n" +
-            "lQqrUugakJZkNo4e0YUAAAFtXdd3CgAABAMARzBFAiEA/pTOtw6i2DJS0R56KwVF\n" +
-            "Huy+LonG7bICWAe1vnCNud4CIE7/KRDu9Jys24rtmLz9yCNYJfZDvooK5PT9+rWR\n" +
-            "OC4+AHUApLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFtXdd54gAA\n" +
-            "BAMARjBEAiB09qp4sGA+Kxg823hea3ZyTV7mU1ZQ9j9fqqX8KZ1mpwIgUICM2H0Y\n" +
-            "8z+V9m+6SutZ5WTD+Arg3K8O6/dvyKu0QmEAdQBvU3asMfAxGdiZAKRRFf93FRwR\n" +
-            "2QLBACkGjbIImjfZEwAAAW1d13cSAAAEAwBGMEQCIFLqxvNOKVFlTjHPXwk93VeW\n" +
-            "zCqFtcxJkunD/iiv0Kn9AiBoyvUrjYn4MPTht9zb0OyaSMWb00/HXP/4AVmUzHrz\n" +
-            "YzANBgkqhkiG9w0BAQsFAAOCAQEAsmQAOn1f1CbvnOpggS2efmy1pQXvvw+YeCYP\n" +
-            "bElO578h7scn8al4N7huQZ/z14BELe0chGWNA/ReW5nAu3SUOiv+E8/kv9i9Y8ul\n" +
-            "MJPL62nXW6Z/mkyystuBNtON420iWL/gS/vduxSZE/iBB4znctDpXS917/XWf31Y\n" +
-            "ZonemF3MSfi/s9V0Ic82ZY/+HZ4NLTDyKRd4kFF58OoH9RZNb6g8MbTp+gPadiUG\n" +
-            "UcfPGV3yGiugQa7WHTl7QJ9ishyafiZ4hpeKem6TMDEztgGyLIZ4MSxQvoeI2jJP\n" +
-            "KjHd5fW/HClbEcrN+w0a0MUNMaAOaZfMS7jS6sDpaVL8D0EX5A==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: SERIALNUMBER=983163327, CN=revoked.businessplus.ca23.ssl.buypass.no, O=BUYPASS AS,
-    // L=OSLO, OID.2.5.4.17=0484, C=NO
-    // Issuer: CN=Buypass Class 3 CA 2, O=Buypass AS-983163327, C=NO
-    // Serial number: 267cee3fab06c615fb27
-    // Valid from: Mon Sep 23 04:56:56 PDT 2019 until: Thu Sep 23 14:59:00 PDT 2021
-    private static final String REVOKED_CLASS_3 = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGWDCCBUCgAwIBAgIKJnzuP6sGxhX7JzANBgkqhkiG9w0BAQsFADBLMQswCQYD\n" +
-            "VQQGEwJOTzEdMBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMM\n" +
-            "FEJ1eXBhc3MgQ2xhc3MgMyBDQSAyMB4XDTE5MDkyMzExNTY1NloXDTIxMDkyMzIx\n" +
-            "NTkwMFowgYcxCzAJBgNVBAYTAk5PMQ0wCwYDVQQRDAQwNDg0MQ0wCwYDVQQHDARP\n" +
-            "U0xPMRMwEQYDVQQKDApCVVlQQVNTIEFTMTEwLwYDVQQDDChyZXZva2VkLmJ1c2lu\n" +
-            "ZXNzcGx1cy5jYTIzLnNzbC5idXlwYXNzLm5vMRIwEAYDVQQFEwk5ODMxNjMzMjcw\n" +
-            "ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtpNExWd+hjl/ouL/B/pdc\n" +
-            "InUzEywQO3rzXs3psBdQ1lDhG/9Fcq78uqyri4edtJNDGb1XadktKeRC+NtUqMkE\n" +
-            "IFOXvaVjLxa61c8K5mh3CVDrAiPyxVcnm8vkuQPMsy1BTOl9TZq9heIukG/lcfzW\n" +
-            "6tU6mOD9yx1NzXSVN5cvDCbbDnEZiJSuazXI4O02as66SWI27WKsk21+SKCGAtGC\n" +
-            "kI0PW4FrXm43/jxX1CoImIfTLkDInMq7HHsQRsGQ3OjbJLfRz/2obyjHUU5ki6vd\n" +
-            "z16mA5ITLFIG36HxbPn337175R9RwOpWkN84xVlL3VQdznCVoiOjzBiOMpdm0Jwp\n" +
-            "AgMBAAGjggL/MIIC+zAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFCIwLtL79kvKwLg7\n" +
-            "0gTE6XLml5sMMB0GA1UdDgQWBBSGUQTUB4BilG/EMaHHDAYNPewf8zAOBgNVHQ8B\n" +
-            "Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIAQY\n" +
-            "MBYwCgYIYIRCARoBAwQwCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6\n" +
-            "Ly9jcmwuYnV5cGFzcy5uby9jcmwvQlBDbGFzczNDQTIuY3JsMDMGA1UdEQQsMCqC\n" +
-            "KHJldm9rZWQuYnVzaW5lc3NwbHVzLmNhMjMuc3NsLmJ1eXBhc3Mubm8wagYIKwYB\n" +
-            "BQUHAQEEXjBcMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5idXlwYXNzLmNvbTA1\n" +
-            "BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NB\n" +
-            "Mi5jZXIwggF/BgorBgEEAdZ5AgQCBIIBbwSCAWsBaQB2ALvZ37wfinG1k5Qjl6qS\n" +
-            "e0c4V5UKq1LoGpCWZDaOHtGFAAABbV37Y7oAAAQDAEcwRQIgYbaNSR3R5x9p9sYJ\n" +
-            "UzRDdd/lbELb05u9GqlLtl4M61YCIQCTBecXTbMs4zuG/wu722HZy/XgD6fiQySp\n" +
-            "FhHDO3CYagB2AKS5CZC0GFgUh7sTosxncAo8NZgE+RvfuON3zQ7IDdwQAAABbV37\n" +
-            "Y7wAAAQDAEcwRQIgD8j40M03oLMCg5WmFBN7VL6169F7rKatE12btLQRYtYCIQC0\n" +
-            "rDhQiZP7j14Y4JqEFQx6UHl3dvxLxZTDW34Z54IUWQB3AG9Tdqwx8DEZ2JkApFEV\n" +
-            "/3cVHBHZAsEAKQaNsgiaN9kTAAABbV37YOUAAAQDAEgwRgIhANTGHD1g2pbsTtoN\n" +
-            "CJ2m6nfxm9jB3huftKGDjeo7EyxHAiEA3EYNUc6hr+4Q9lMAphUgpW6oyaNCsIzl\n" +
-            "izbNhq8dBRYwDQYJKoZIhvcNAQELBQADggEBADUuO4MmYjPkmkik5tjUPiiDDXEQ\n" +
-            "A41jr72qmdleYdkhnaKAJa8Enn6j/ySRV0enA7yqJeNp1qgPQFvlOh3TqFB3Ae5b\n" +
-            "XAfL2B7vKbegpjKm8dVH5RurqVm9xZcXb1nbwfu2k3lqqsp/uwqvLBItJDvA8pfi\n" +
-            "2R46sEtj2gFpAlKFDwepuaklqhrvEoIjIaAL0RrGfKY0oRQw1YMbPNIebsVaWr04\n" +
-            "rt6tlxrq7PyW1w9Mt3445WA1NzSWc7pAjFLfY6u87QaPHI4ES31H9xxRDsxmr6Y3\n" +
-            "BJmiWd5uUxev0nVw0saqvlo4yAEBq4rI/DieKcQI4qEI8myzoS0R0azMfLM=\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID_CLASS_3, INT_CLASS_3},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED_CLASS_3, INT_CLASS_3},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon Sep 23 04:57:31 PDT 2019", System.out);
-    }
-}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
new file mode 100644
index 00000000000..2cf9ae88397
--- /dev/null
+++ b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
@@ -0,0 +1,561 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=actalisauthenticationrootca
+ * @bug 8189131
+ * @summary Interoperability tests with Actalis CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp
+ *  CAInterop actalisauthenticationrootca OCSP
+ * @run main/othervm/timeout=180 -Djava.security.debug=certpath,ocsp
+ *  CAInterop actalisauthenticationrootca CRL
+ */
+
+/*
+ * @test id=amazonrootca1
+ * @bug 8233223
+ * @summary Interoperability tests with Amazon's CA1
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop amazonrootca1 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop amazonrootca1 CRL
+ */
+
+/*
+ * @test id=amazonrootca2
+ * @bug 8233223
+ * @summary Interoperability tests with Amazon's CA2
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop amazonrootca2 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop amazonrootca2 CRL
+ */
+
+/*
+ * @test id=amazonrootca3
+ * @bug 8233223
+ * @summary Interoperability tests with Amazon's CA3
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop amazonrootca3 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop amazonrootca3 CRL
+ */
+
+/*
+ * @test id=amazonrootca4
+ * @bug 8233223
+ * @summary Interoperability tests with Amazon's CA4
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop amazonrootca4 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop amazonrootca4 CRL
+ */
+
+/*
+ * @test id=buypassclass2ca
+ * @bug 8189131
+ * @summary Interoperability tests with Buypass Class 2 CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop buypassclass2ca OCSP
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop buypassclass2ca CRL
+ */
+
+/*
+ * @test id=buypassclass3ca
+ * @bug 8189131
+ * @summary Interoperability tests with Buypass Class 3 CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop buypassclass3ca OCSP
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop buypassclass3ca CRL
+ */
+
+/*
+ * @test id=comodorsaca
+ * @bug 8189131
+ * @summary Interoperability tests with Comodo RSA CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop comodorsaca OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop comodorsaca CRL
+ */
+
+/*
+ * @test id=comodoeccca
+ * @bug 8189131
+ * @summary Interoperability tests with Comodo ECC CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop comodoeccca OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop comodoeccca CRL
+ */
+
+/*
+ * @test id=usertrustrsaca
+ * @bug 8189131
+ * @summary Interoperability tests with Comodo userTrust RSA CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop usertrustrsaca OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop usertrustrsaca CRL
+ */
+
+/*
+ * @test id=usertrusteccca
+ * @bug 8189131
+ * @summary Interoperability tests with Comodo userTrust ECC CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop usertrusteccca OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop usertrusteccca CRL
+ */
+
+/*
+ * @test id=letsencryptisrgx1
+ * @bug 8189131
+ * @summary Interoperability tests with Let's Encrypt CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop letsencryptisrgx1 DEFAULT
+ */
+
+/*
+ * @test id=globalsignrootcar6
+ * @bug 8216577
+ * @summary Interoperability tests with GlobalSign R6 CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop globalsignrootcar6 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop globalsignrootcar6 CRL
+ */
+
+/*
+ * @test id=entrustrootcaec1
+ * @bug 8195774
+ * @summary Interoperability tests with Entrust CAs
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop entrustrootcaec1 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop entrustrootcaec1 CRL
+ */
+
+/*
+ * @test id=entrustrootcag4
+ * @bug 8243321
+ * @summary Interoperability tests with Entrust CAs
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop entrustrootcag4 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop entrustrootcag4 CRL
+ */
+
+/*
+ * @test id=godaddyrootg2ca
+ * @bug 8196141
+ * @summary Interoperability tests with GoDaddy CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop godaddyrootg2ca OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop godaddyrootg2ca CRL
+ */
+
+/*
+ * @test id=starfieldrootg2ca
+ * @bug 8196141
+ * @summary Interoperability tests with Starfield CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop starfieldrootg2ca OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop starfieldrootg2ca CRL
+ */
+
+/*
+ * @test id=globalsigneccrootcar4
+ * @bug 8307134
+ * @summary Interoperability tests with Google's GlobalSign R4 and GTS Root certificates
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop globalsigneccrootcar4 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop globalsigneccrootcar4 CRL
+ */
+
+/*
+ * @test id=gtsrootcar1
+ * @bug 8307134
+ * @summary Interoperability tests with Google's GlobalSign R4 and GTS Root certificates
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop gtsrootcar1 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop gtsrootcar1 CRL
+ */
+
+/*
+ * @test id=gtsrootcar2
+ * @bug 8307134
+ * @summary Interoperability tests with Google's GlobalSign R4 and GTS Root certificates
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop gtsrootcar2 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop gtsrootcar2 CRL
+ */
+
+/*
+ * @test id=gtsrootecccar3
+ * @bug 8307134
+ * @summary Interoperability tests with Google's GlobalSign R4 and GTS Root certificates
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop gtsrootecccar3 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop gtsrootecccar3 CRL
+ */
+
+/*
+ * @test id=gtsrootecccar4
+ * @bug 8307134
+ * @summary Interoperability tests with Google's GlobalSign R4 and GTS Root certificates
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop gtsrootecccar4 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop gtsrootecccar4 CRL
+ */
+
+/*
+ * @test id=microsoftecc2017
+ * @bug 8304760
+ * @summary Interoperability tests with Microsoft TLS root CAs
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop microsoftecc2017 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop microsoftecc2017 CRL
+ */
+
+/*
+ * @test id=microsoftrsa2017
+ * @bug 8304760
+ * @summary Interoperability tests with Microsoft TLS root CAs
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop microsoftrsa2017 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop microsoftrsa2017 CRL
+ */
+
+/*
+ * @test id=quovadisrootca1g3
+ * @bug 8189131
+ * @summary Interoperability tests with QuoVadis Root CA1 G3 CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop quovadisrootca1g3 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop quovadisrootca1g3 CRL
+ */
+
+/*
+ * @test id=quovadisrootca2g3
+ * @bug 8189131
+ * @summary Interoperability tests with QuoVadis Root CA2 G3 CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop quovadisrootca2g3 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop quovadisrootca2g3 CRL
+ */
+
+/*
+ * @test id=quovadisrootca3g3
+ * @bug 8189131
+ * @summary Interoperability tests with QuoVadis Root CA3 G3 CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop quovadisrootca3g3 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop quovadisrootca3g3 CRL
+ */
+
+/*
+ * @test id=sslrootrsaca
+ * @bug 8243320
+ * @summary Interoperability tests with SSL.com's RSA CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop sslrootrsaca OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop sslrootrsaca CRL
+ */
+
+/*
+ * @test id=sslrootevrsaca
+ * @bug 8243320
+ * @summary Interoperability tests with SSL.com's EV RSA CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop sslrootevrsaca OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop sslrootevrsaca CRL
+ */
+
+/*
+ * @test id=sslrooteccca
+ * @bug 8243320
+ * @summary Interoperability tests with SSL.com's ECC CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop sslrooteccca OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop sslrooteccca CRL
+ */
+
+/*
+ * @test id=teliasonerarootcav1
+ * @bug 8210432
+ * @summary Interoperability tests with TeliaSonera Root CA v1
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop teliasonerarootcav1 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop teliasonerarootcav1 CRL
+ */
+
+/*
+ * @test id=twcaglobalrootca
+ * @bug 8305975
+ * @summary Interoperability tests with TWCA Global Root CA from TAIWAN-CA
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop twcaglobalrootca OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop twcaglobalrootca CRL
+ */
+
+/*
+ * @test id=certignarootca
+ * @bug 8314960
+ * @summary Interoperability tests with Certigna Root CAs from Dhimyotis
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop certignarootca OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop certignarootca CRL
+ */
+
+/**
+ * Collection of certificate validation tests for interoperability with external CAs
+ */
+public class CAInterop {
+
+    /**
+     * Returns the test configuration for CA
+     *
+     * @param alias from the cacerts file without [jdk]
+     * @return CATestURLs
+     */
+    private CATestURLs getTestURLs(String alias) {
+        return switch (alias) {
+            case "actalisauthenticationrootca" ->
+                    new CATestURLs("https://ssltest-active.actalis.it",
+                            "https://ssltest-revoked.actalis.it");
+
+            case "amazonrootca1" ->
+                    new CATestURLs("https://valid.rootca1.demo.amazontrust.com",
+                    "https://revoked.rootca1.demo.amazontrust.com");
+            case "amazonrootca2" ->
+                    new CATestURLs("https://valid.rootca2.demo.amazontrust.com",
+                    "https://revoked.rootca2.demo.amazontrust.com");
+            case "amazonrootca3" ->
+                    new CATestURLs("https://valid.rootca3.demo.amazontrust.com",
+                    "https://revoked.rootca3.demo.amazontrust.com");
+            case "amazonrootca4" ->
+                    new CATestURLs("https://valid.rootca4.demo.amazontrust.com",
+                    "https://revoked.rootca4.demo.amazontrust.com");
+
+            case "buypassclass2ca" ->
+                    new CATestURLs("https://valid.business.ca22.ssl.buypass.no",
+                    "https://revoked.business.ca22.ssl.buypass.no");
+            case "buypassclass3ca" ->
+                    new CATestURLs("https://valid.qcevident.ca23.ssl.buypass.no",
+                    "https://revoked.qcevident.ca23.ssl.buypass.no");
+
+            case "comodorsaca" ->
+                    new CATestURLs("https://comodorsacertificationauthority-ev.comodoca.com",
+                    "https://comodorsacertificationauthority-ev.comodoca.com:444");
+            case "comodoeccca" ->
+                    new CATestURLs("https://comodoecccertificationauthority-ev.comodoca.com",
+                    "https://comodoecccertificationauthority-ev.comodoca.com:444");
+            case "usertrustrsaca" ->
+                    new CATestURLs("https://usertrustrsacertificationauthority-ev.comodoca.com",
+                    "https://usertrustrsacertificationauthority-ev.comodoca.com:444");
+            case "usertrusteccca" ->
+                    new CATestURLs("https://usertrustecccertificationauthority-ev.comodoca.com",
+                    "https://usertrustecccertificationauthority-ev.comodoca.com:444");
+
+            case "letsencryptisrgx1" ->
+                    new CATestURLs("https://valid-isrgrootx1.letsencrypt.org",
+                            "https://revoked-isrgrootx1.letsencrypt.org");
+
+            case "globalsignrootcar6" ->
+                    new CATestURLs("https://valid.r6.roots.globalsign.com",
+                            "https://revoked.r6.roots.globalsign.com");
+
+            case "entrustrootcaec1" ->
+                    new CATestURLs("https://validec.entrust.net",
+                            "https://revokedec.entrust.net");
+            case "entrustrootcag4" ->
+                    new CATestURLs("https://validg4.entrust.net",
+                            "https://revokedg4.entrust.net");
+
+            case "godaddyrootg2ca" ->
+                    new CATestURLs("https://valid.gdig2.catest.godaddy.com",
+                    "https://revoked.gdig2.catest.godaddy.com");
+            case "starfieldrootg2ca" ->
+                    new CATestURLs("https://valid.sfig2.catest.starfieldtech.com",
+                    "https://revoked.sfig2.catest.starfieldtech.com");
+
+            case "globalsigneccrootcar4" ->
+                    new CATestURLs("https://good.gsr4.demo.pki.goog",
+                    "https://revoked.gsr4.demo.pki.goog");
+            case "gtsrootcar1" ->
+                    new CATestURLs("https://good.gtsr1.demo.pki.goog",
+                    "https://revoked.gtsr1.demo.pki.goog");
+            case "gtsrootcar2" ->
+                    new CATestURLs("https://good.gtsr2.demo.pki.goog",
+                    "https://revoked.gtsr2.demo.pki.goog");
+            case "gtsrootecccar3" ->
+                    new CATestURLs("https://good.gtsr3.demo.pki.goog",
+                    "https://revoked.gtsr3.demo.pki.goog");
+            case "gtsrootecccar4" ->
+                    new CATestURLs("https://good.gtsr4.demo.pki.goog",
+                    "https://revoked.gtsr4.demo.pki.goog");
+
+            case "microsoftecc2017" ->
+                    new CATestURLs("https://acteccroot2017.pki.microsoft.com",
+                    "https://rvkeccroot2017.pki.microsoft.com");
+            case "microsoftrsa2017" ->
+                    new CATestURLs("https://actrsaroot2017.pki.microsoft.com",
+                    "https://rvkrsaroot2017.pki.microsoft.com");
+
+            case "quovadisrootca1g3" ->
+                    new CATestURLs("https://quovadis-root-ca-1-g3.chain-demos.digicert.com",
+                    "https://quovadis-root-ca-1-g3-revoked.chain-demos.digicert.com");
+            case "quovadisrootca2g3" ->
+                    new CATestURLs("https://quovadis-root-ca-2-g3.chain-demos.digicert.com",
+                    "https://quovadis-root-ca-2-g3-revoked.chain-demos.digicert.com");
+            case "quovadisrootca3g3" ->
+                    new CATestURLs("https://quovadis-root-ca-3-g3.chain-demos.digicert.com",
+                    "https://quovadis-root-ca-3-g3-revoked.chain-demos.digicert.com");
+
+            case "sslrootrsaca" ->
+                    new CATestURLs("https://test-dv-rsa.ssl.com",
+                    "https://revoked-rsa-dv.ssl.com");
+            case "sslrootevrsaca" ->
+                    new CATestURLs("https://test-ev-rsa.ssl.com",
+                    "https://revoked-rsa-ev.ssl.com");
+            case "sslrooteccca" ->
+                    new CATestURLs("https://test-dv-ecc.ssl.com",
+                    "https://revoked-ecc-dv.ssl.com");
+
+            case "teliasonerarootcav1" ->
+                    new CATestURLs("https://juolukka.cover.sonera.net:10443",
+                            "https://juolukka.cover.sonera.net:10444");
+
+            case "twcaglobalrootca" ->
+                    new CATestURLs("https://evssldemo6.twca.com.tw",
+                            "https://evssldemo7.twca.com.tw");
+
+            case "certignarootca" ->
+                    new CATestURLs("https://valid.servicesca.dhimyotis.com",
+                            "https://revoked.servicesca.dhimyotis.com");
+
+            default -> throw new RuntimeException("No test setup found for: " + alias);
+        };
+    }
+
+    public static void main(String[] args) throws Exception {
+        if (args.length < 2) {
+            throw new RuntimeException("Run as: CAInterop <alias> <OCSP/CRL/DEFAULT>");
+        }
+
+        String caAlias = args[0];
+
+        CAInterop caInterop = new CAInterop(args[1]);
+        CATestURLs caTestURLs = caInterop.getTestURLs(caAlias);
+
+        caInterop.validate(caAlias + " [jdk]",
+                caTestURLs.getVALID_URL(),
+                caTestURLs.getREVOKED_URL());
+    }
+
+    static class CATestURLs {
+        final String VALID_URL;
+        final String REVOKED_URL;
+
+        public CATestURLs(String validURL,
+                           String revokedURL) {
+            VALID_URL = validURL;
+            REVOKED_URL = revokedURL;
+        }
+
+        public String getVALID_URL() {
+            return VALID_URL;
+        }
+
+        public String getREVOKED_URL() {
+            return REVOKED_URL;
+        }
+    }
+
+    /**
+     * Constructor for interoperability test with third party CA.
+     *
+     * @param revocationMode revocation checking mode to use
+     */
+    public CAInterop(String revocationMode) {
+        if ("CRL".equalsIgnoreCase(revocationMode)) {
+            ValidatePathWithURL.enableCRLOnly();
+        } else if ("OCSP".equalsIgnoreCase(revocationMode)) {
+            ValidatePathWithURL.enableOCSPOnly();
+        } else {
+            // OCSP and CRL check by default
+            ValidatePathWithURL.enableOCSPAndCRL();
+        }
+
+        ValidatePathWithURL.logRevocationSettings();
+    }
+
+    /**
+     * Validates provided URLs using <code>HttpsURLConnection</code> making sure they
+     * anchor to the root CA found in <code>cacerts</code> using provided alias.
+     *
+     * @param caAlias        CA alis from <code>cacerts</code> file
+     * @param validCertURL   valid test URL
+     * @param revokedCertURL revoked test URL
+     * @throws Exception thrown when certificate can't be validated as valid or revoked
+     */
+    public void validate(String caAlias,
+                         String validCertURL,
+                         String revokedCertURL) throws Exception {
+
+        ValidatePathWithURL validatePathWithURL = new ValidatePathWithURL(caAlias);
+
+        if (validCertURL != null) {
+            validatePathWithURL.validateDomain(validCertURL, false);
+        }
+
+        if (revokedCertURL != null) {
+            validatePathWithURL.validateDomain(revokedCertURL, true);
+        }
+    }
+}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CertignaRoots.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java
similarity index 74%
rename from test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CertignaRoots.java
rename to test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java
index 92744eac3d0..f1dd2d6229a 100644
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CertignaRoots.java
+++ b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java
@@ -23,70 +23,13 @@
 
 /*
  * @test
- * @bug 8245654 8314960
+ * @bug 8245654 8256895
  * @summary Interoperability tests with Certigna Root CAs from Dhimyotis
  * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath CertignaRoots OCSP
- * @run main/othervm -Djava.security.debug=certpath CertignaRoots CRL
+ * @run main/othervm -Djava.security.debug=certpath CertignaCA OCSP
+ * @run main/othervm -Djava.security.debug=certpath CertignaCA CRL
  */
-
-/*
- * Obtain TLS test artifacts for Certigna Root CAs from:
- *
- * Valid TLS Certificates:
- * https://valid.servicesca.dhimyotis.com/
- *
- * Revoked TLS Certificates:
- * https://revoked.servicesca.dhimyotis.com/
- */
-public class CertignaRoots {
-
-    // Owner: CN=Certigna Services CA, OID.2.5.4.97=NTRFR-48146308100036,
-    // OU=0002 48146308100036, O=DHIMYOTIS, C=FR
-    // Issuer: CN=Certigna Root CA, OU=0002 48146308100036, O=Dhimyotis, C=FR
-    // Serial number: fd30cf04344fc38dd90c4e70753d0623
-    // Valid from: Wed Nov 25 03:37:21 PST 2015 until: Fri Jun 03 04:37:21 PDT 2033
-    private static final String INT_CERTIGNA_ROOT_CA = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHETCCBPmgAwIBAgIRAP0wzwQ0T8ON2QxOcHU9BiMwDQYJKoZIhvcNAQELBQAw\n" +
-            "WjELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAw\n" +
-            "MiA0ODE0NjMwODEwMDAzNjEZMBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0x\n" +
-            "NTExMjUxMTM3MjFaFw0zMzA2MDMxMTM3MjFaMH0xCzAJBgNVBAYTAkZSMRIwEAYD\n" +
-            "VQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAb\n" +
-            "BgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQQDDBRDZXJ0aWduYSBT\n" +
-            "ZXJ2aWNlcyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALPM+7Lp\n" +
-            "WBz9wFcPaTc3xnB+5g0XrnptB0EPPfrR04vO52Ykm4ky1d4ZLd10tbM1fa1RqNSO\n" +
-            "VWWg93O4pL7zCFKlz6JV74ZZVhHpEAwzBwv2oPnxvVbxtSN67xsSY66ahUYxjzs8\n" +
-            "+3FhmsiRxqwnTYvK2u70uglUvRisOKyTL/M6JnrC4y8tlmoz7OSa5BmBMVplJFQt\n" +
-            "vmON6N9aHLvYMz+EyJPCbXL6pELxeHjFT5QmIaRamsr2DOTaCjtBZKI1Wnh3X7ln\n" +
-            "bjM8MESJiV2t7E9tIQNG0Z/HI3tO4aaUMum3KysY5sC8v3vi7rryGidgzHQhrtP0\n" +
-            "ZXWW5UH/k7umLS/P/XXWnCFpc2Lxa1uDGfc2im7xibRoPP+JNZszN76euFlls6jy\n" +
-            "EXAiwnVr14tVVTewLK0OWs5SJHpEKp8PGMZRDj59EmMvokWwzL6QzNZ6vVAp00oO\n" +
-            "m05sbspNY9+MFqGKKUsKvhFGEa4XmRNxDe6KswLcjPZB+NKHZ0QWFd4ip5C5XmEK\n" +
-            "/8qIPjwVr9dah9+oiHGGO8Wx7gJAMF5DTmkvW7GhqCKj1LmHnabjzc8av6kxWVQZ\n" +
-            "i/C7HCm9i/W4wio+JA2EAFLqNL3GPNbK9kau4yPhQt/c7zxzo0OHnlsV4THCG7oO\n" +
-            "Cd3cfCiyfQcb3FBt6OSpaKRZxjCLBwP00r0fAgMBAAGjggGtMIIBqTASBgNVHRMB\n" +
-            "Af8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrOyGj0s3HLh/\n" +
-            "FxsZ0K7oTuM0XBIwHwYDVR0jBBgwFoAUGIdW4G537iQ1PE5zmh/W4eJ5fiswSQYD\n" +
-            "VR0gBEIwQDA+BgoqgXoBgTECAAEBMDAwLgYIKwYBBQUHAgEWImh0dHBzOi8vd3d3\n" +
-            "LmNlcnRpZ25hLmZyL2F1dG9yaXRlcy8wgYgGCCsGAQUFBwEBBHwwejA6BggrBgEF\n" +
-            "BQcwAoYuaHR0cDovL2F1dG9yaXRlLmNlcnRpZ25hLmZyL2NlcnRpZ25hcm9vdGNh\n" +
-            "LmRlcjA8BggrBgEFBQcwAoYwaHR0cDovL2F1dG9yaXRlLmRoaW15b3Rpcy5jb20v\n" +
-            "Y2VydGlnbmFyb290Y2EuZGVyMG0GA1UdHwRmMGQwL6AtoCuGKWh0dHA6Ly9jcmwu\n" +
-            "Y2VydGlnbmEuZnIvY2VydGlnbmFyb290Y2EuY3JsMDGgL6AthitodHRwOi8vY3Js\n" +
-            "LmRoaW15b3Rpcy5jb20vY2VydGlnbmFyb290Y2EuY3JsMA0GCSqGSIb3DQEBCwUA\n" +
-            "A4ICAQCI5QbprXJ93L+JWHYpUTinXAMSvXMx2dmNm4mIiJRAbGnBOoEYx7M61fbL\n" +
-            "L5EJIYZhw8jLmeYVFuMao5OJLwda+RMmVzE7lyTGsY64IDKdwogByNCqbKzrlhnU\n" +
-            "8myyMNB0BDs2jgwQe2Dj9v+MddeHr7sDqvs7R1tSS5hoASLtdQhO7oxUzr3m7M8q\n" +
-            "+lh4jszli+cjfiPUVS2ADFu4ccQIh4OsIX6SWdU+8R+c/fn0FV6ip4SAVbNyCToz\n" +
-            "0ZbZKO8YTJgORxRmvrop9dPyuLWjaRrZ0LMx4a3EM3sQDPDqmsG0lHtfFj2PiJvq\n" +
-            "4lEYA+gDiLKODI+3DJMqo559m3QSS52DsShomHX/Txd0lJoZwepCE6X4KkG9FHjV\n" +
-            "WXyLgYFwCOcn+hkLhdpblms0wtjeSPITGOioSkefzhleJnDgJ9X4M3svd0HLTpJi\n" +
-            "lC1DmDZgdrXWITVdOoCogr2LFKNiGd0tbpKG533eKpfBALlm+afc6j73p1KhJEAn\n" +
-            "AfydDZqBRqv6+HHYplNDn/K2I1CZdkwaGrx3HOR/voGUi1sUI+hYbsPAFu8ZxrhD\n" +
-            "9UiysmLCfEUhqkbojony+L2mKsoLqyd24emQzn7GgMa7emlWX2jQUTwrD4SliZ2u\n" +
-            "OetVaZX5RLyqJWs4Igo/xye0xtMQN8INJ4hSZvnMQ1qFtuSRcQ==\n" +
-            "-----END CERTIFICATE-----";
-
+public class CertignaCA {
     // Owner: CN=Certigna Services CA, OID.2.5.4.97=NTRFR-48146308100036,
     // OU=0002 48146308100036, O=DHIMYOTIS, C=FR
     // Issuer: CN=Certigna, O=Dhimyotis, C=FR
@@ -239,28 +182,12 @@ public class CertignaRoots {
             "-----END CERTIFICATE-----";
 
     public static void main(String[] args) throws Exception {
-        // OCSP check by default
-        boolean ocspEnabled = args.length < 1 || !"CRL".equalsIgnoreCase(args[0]);
-
-        // CN=Certigna
-        new CertignaCAs().runTest(ocspEnabled,
-                VALID,
-                REVOKED,
-                INT_CERTIGNA);
 
-        // CN=Certigna Root CA
-        new CertignaCAs().runTest(ocspEnabled,
-                VALID,
-                REVOKED,
-                INT_CERTIGNA_ROOT_CA);
-    }
-}
+        // Added to test for JDK-8256895
+        System.setProperty("jdk.security.certpath.ocspNonce", "true");
 
-class CertignaCAs {
-    public void runTest(boolean ocspEnabled,
-                        final String VALID,
-                        final String REVOKED,
-                        final String INT_CERT) throws Exception {
+        // OCSP check by default
+        boolean ocspEnabled = args.length < 1 || !"CRL".equalsIgnoreCase(args[0]);
 
         ValidatePathWithParams pathValidator;
         String[] validChainToValidate;
@@ -270,11 +197,11 @@ public void runTest(boolean ocspEnabled,
             pathValidator = new ValidatePathWithParams(null);
             pathValidator.enableCRLCheck();
 
-            validChainToValidate = new String[]{VALID, INT_CERT};
-            revChainToValidate = new String[]{REVOKED, INT_CERT};
+            validChainToValidate = new String[]{VALID, INT_CERTIGNA};
+            revChainToValidate = new String[]{REVOKED, INT_CERTIGNA};
         } else {
             // int certificate doesn't specify OCSP responder
-            pathValidator = new ValidatePathWithParams(new String[]{INT_CERT});
+            pathValidator = new ValidatePathWithParams(new String[]{INT_CERTIGNA});
             pathValidator.enableOCSPCheck();
 
             validChainToValidate = new String[]{VALID};
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ComodoCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ComodoCA.java
deleted file mode 100644
index 73d7171b906..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ComodoCA.java
+++ /dev/null
@@ -1,643 +0,0 @@
-/*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
- /*
- * @test
- * @bug 8189131 8231887
- * @summary Interoperability tests with Comodo RSA, ECC, userTrust RSA, and
- *          userTrust ECC CAs
- * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath ComodoCA OCSP
- * @run main/othervm -Djava.security.debug=certpath ComodoCA CRL
- */
-
- /*
- * Obtain TLS test artifacts for Comodo CAs from:
- *
- * Valid TLS Certificates:
- * https://comodorsacertificationauthority-ev.comodoca.com
- * https://comodoecccertificationauthority-ev.comodoca.com
- * https://usertrustrsacertificationauthority-ev.comodoca.com
- * https://usertrustecccertificationauthority-ev.comodoca.com
- *
- * Revoked TLS Certificates:
- * https://comodorsacertificationauthority-ev.comodoca.com:444
- * https://comodoecccertificationauthority-ev.comodoca.com:444
- * https://usertrustrsacertificationauthority-ev.comodoca.com:444
- * https://usertrustecccertificationauthority-ev.comodoca.com:444
- */
-public class ComodoCA {
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-        }
-
-        new ComodoRSA().runTest(pathValidator);
-        new ComodoECC().runTest(pathValidator);
-        new ComodoUserTrustRSA().runTest(pathValidator);
-        new ComodoUserTrustECC().runTest(pathValidator);
-    }
-}
-
-class ComodoRSA {
-
-    // Owner: CN=COMODO RSA Extended Validation Secure Server CA,
-    // O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB
-    // Issuer: CN=COMODO RSA Certification Authority, O=COMODO CA Limited,
-    // L=Salford, ST=Greater Manchester, C=GB
-    // Serial number: 6a74380d4ebfed435b5a3f7e16abdd8
-    // Valid from: Sat Feb 11 16:00:00 PST 2012 until: Thu Feb 11 15:59:59 PST 2027
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n"
-            + "MIIGDjCCA/agAwIBAgIQBqdDgNTr/tQ1taP34Wq92DANBgkqhkiG9w0BAQwFADCB\n"
-            + "hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G\n"
-            + "A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV\n"
-            + "BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTIwMjEy\n"
-            + "MDAwMDAwWhcNMjcwMjExMjM1OTU5WjCBkjELMAkGA1UEBhMCR0IxGzAZBgNVBAgT\n"
-            + "EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR\n"
-            + "Q09NT0RPIENBIExpbWl0ZWQxODA2BgNVBAMTL0NPTU9ETyBSU0EgRXh0ZW5kZWQg\n"
-            + "VmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC\n"
-            + "AQ8AMIIBCgKCAQEAlVbeVLTf1QJJe9FbXKKyHo+cK2JMK40SKPMalaPGEP0p3uGf\n"
-            + "CzhAk9HvbpUQ/OGQF3cs7nU+e2PsYZJuTzurgElr3wDqAwB/L3XVKC/sVmePgIOj\n"
-            + "vdwDmZOLlJFWW6G4ajo/Br0OksxgnP214J9mMF/b5pTwlWqvyIqvgNnmiDkBfBzA\n"
-            + "xSr3e5Wg8narbZtyOTDr0VdVAZ1YEZ18bYSPSeidCfw8/QpKdhQhXBZzQCMZdMO6\n"
-            + "WAqmli7eNuWf0MLw4eDBYuPCGEUZUaoXHugjddTI0JYT/8ck0YwLJ66eetw6YWNg\n"
-            + "iJctXQUL5Tvrrs46R3N2qPos3cCHF+msMJn4HwIDAQABo4IBaTCCAWUwHwYDVR0j\n"
-            + "BBgwFoAUu69+Aj36pvE8hI6t7jiY7NkyMtQwHQYDVR0OBBYEFDna/8ooFIqodBMI\n"
-            + "ueQOqdL6fp1pMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMD4G\n"
-            + "A1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5j\n"
-            + "b21vZG8uY29tL0NQUzBMBgNVHR8ERTBDMEGgP6A9hjtodHRwOi8vY3JsLmNvbW9k\n"
-            + "b2NhLmNvbS9DT01PRE9SU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDBxBggr\n"
-            + "BgEFBQcBAQRlMGMwOwYIKwYBBQUHMAKGL2h0dHA6Ly9jcnQuY29tb2RvY2EuY29t\n"
-            + "L0NPTU9ET1JTQUFkZFRydXN0Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2Nz\n"
-            + "cC5jb21vZG9jYS5jb20wDQYJKoZIhvcNAQEMBQADggIBAERCnUFRK0iIXZebeV4R\n"
-            + "AUpSGXtBLMeJPNBy3IX6WK/VJeQT+FhlZ58N/1eLqYVeyqZLsKeyLeCMIs37/3mk\n"
-            + "jCuN/gI9JN6pXV/kD0fQ22YlPodHDK4ixVAihNftSlka9pOlk7DgG4HyVsTIEFPk\n"
-            + "1Hax0VtpS3ey4E/EhOfUoFDuPPpE/NBXueEoU/1Tzdy5H3pAvTA/2GzS8+cHnx8i\n"
-            + "teoiccsq8FZ8/qyo0QYPFBRSTP5kKwxpKrgNUG4+BAe/eiCL+O5lCeHHSQgyPQ0o\n"
-            + "fkkdt0rvAucNgBfIXOBhYsvss2B5JdoaZXOcOBCgJjqwyBZ9kzEi7nQLiMBciUEA\n"
-            + "KKlHMd99SUWa9eanRRrSjhMQ34Ovmw2tfn6dNVA0BM7pINae253UqNpktNEvWS5e\n"
-            + "ojZh1CSggjMziqHRbO9haKPl0latxf1eYusVqHQSTC8xjOnB3xBLAer2VBvNfzu9\n"
-            + "XJ/B288ByvK6YBIhMe2pZLiySVgXbVrXzYxtvp5/4gJYp9vDLVj2dAZqmvZh+fYA\n"
-            + "tmnYOosxWd2R5nwnI4fdAw+PKowegwFOAWEMUnNt/AiiuSpm5HZNMaBWm9lTjaK2\n"
-            + "jwLI5jqmBNFI+8NKAnb9L9K8E7bobTQk+p0pisehKxTxlgBzuRPpwLk6R1YCcYAn\n"
-            + "pLwltum95OmYdBbxN4SBB7SC\n"
-            + "-----END CERTIFICATE-----";
-
-    // Owner: CN=comodorsacertificationauthority-ev.comodoca.com,
-    // O=Sectigo Limited, STREET="3rd Floor, 26 Office Village", STREET=Exchange Quay, STREET=Trafford Road,
-    // L=Salford, ST=Manchester, OID.2.5.4.17=M5 3EQ, C=GB, OID.2.5.4.15=Private Organization,
-    // OID.1.3.6.1.4.1.311.60.2.1.3=GB, SERIALNUMBER=04058690
-    // Issuer: CN=COMODO RSA Extended Validation Secure Server CA, O=COMODO CA Limited, L=Salford,
-    // ST=Greater Manchester, C=GB
-    // Serial number: 9eb246629030e0b527ca2f93e5ebf25a
-    // Valid from: Mon Mar 01 16:00:00 PST 2021 until: Sat Apr 02 16:59:59 PDT 2022
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHSzCCBjOgAwIBAgIRAJ6yRmKQMOC1J8ovk+Xr8lowDQYJKoZIhvcNAQELBQAw\n" +
-            "gZIxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO\n" +
-            "BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTgwNgYD\n" +
-            "VQQDEy9DT01PRE8gUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZl\n" +
-            "ciBDQTAeFw0yMTAzMDIwMDAwMDBaFw0yMjA0MDIyMzU5NTlaMIIBNzERMA8GA1UE\n" +
-            "BRMIMDQwNTg2OTAxEzARBgsrBgEEAYI3PAIBAxMCR0IxHTAbBgNVBA8TFFByaXZh\n" +
-            "dGUgT3JnYW5pemF0aW9uMQswCQYDVQQGEwJHQjEPMA0GA1UEERMGTTUgM0VRMRMw\n" +
-            "EQYDVQQIEwpNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRYwFAYDVQQJEw1U\n" +
-            "cmFmZm9yZCBSb2FkMRYwFAYDVQQJEw1FeGNoYW5nZSBRdWF5MSUwIwYDVQQJExwz\n" +
-            "cmQgRmxvb3IsIDI2IE9mZmljZSBWaWxsYWdlMRgwFgYDVQQKEw9TZWN0aWdvIExp\n" +
-            "bWl0ZWQxODA2BgNVBAMTL2NvbW9kb3JzYWNlcnRpZmljYXRpb25hdXRob3JpdHkt\n" +
-            "ZXYuY29tb2RvY2EuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\n" +
-            "0P95lAFOOkEOy614rCX7OlOK0Xy0nPAcCFxAcLYBosX8YmXWuePHg596UyEqE3U5\n" +
-            "30pTqiccY53bDiYPgSJgr1OlfC7BPLN+QKaeSrFmNgrcoAk3TXejgv7zLXOwZVS6\n" +
-            "Wk38Z8xrFNvhd2Z5J6RM/3U+HDfF7OKMGrexr77Ws7lEFpPUgd4eEe+IL1Y2sbwI\n" +
-            "iD+PkzIL2LjctkeJFcsRHUvNP8wIhGyIbkARuJhdXkE13lKKIe0EnWrRkkf4DEvY\n" +
-            "RFpPjVUKmluhnBOGYkYaiTL0VaOnrPxToSfHR8Awkhk0TNbosAkUo8TKcRTTTiMU\n" +
-            "UIS6Y9SqoILiiDG6WmFjzQIDAQABo4IC8jCCAu4wHwYDVR0jBBgwFoAUOdr/yigU\n" +
-            "iqh0Ewi55A6p0vp+nWkwHQYDVR0OBBYEFD5LhmEivA6h4az0EFPi5erz1TH+MA4G\n" +
-            "A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB\n" +
-            "BggrBgEFBQcDAjBJBgNVHSAEQjBAMDUGDCsGAQQBsjEBAgEFATAlMCMGCCsGAQUF\n" +
-            "BwIBFhdodHRwczovL3NlY3RpZ28uY29tL0NQUzAHBgVngQwBATBWBgNVHR8ETzBN\n" +
-            "MEugSaBHhkVodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FFeHRlbmRl\n" +
-            "ZFZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYcGCCsGAQUFBwEBBHsweTBR\n" +
-            "BggrBgEFBQcwAoZFaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRXh0\n" +
-            "ZW5kZWRWYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhho\n" +
-            "dHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOgYDVR0RBDMwMYIvY29tb2RvcnNhY2Vy\n" +
-            "dGlmaWNhdGlvbmF1dGhvcml0eS1ldi5jb21vZG9jYS5jb20wggEEBgorBgEEAdZ5\n" +
-            "AgQCBIH1BIHyAPAAdgBGpVXrdfqRIDC1oolp9PN9ESxBdL79SbiFq/L8cP5tRwAA\n" +
-            "AXfyqEfyAAAEAwBHMEUCIQDJbHPgbqK21/Nugwl5mgMO81YQSHOm4VcQ8UvOJjnN\n" +
-            "JQIgWw9fortwJBtv2Mts6xJYr5D6itPpEYP8uegURneBwRsAdgBvU3asMfAxGdiZ\n" +
-            "AKRRFf93FRwR2QLBACkGjbIImjfZEwAAAXfyqEjyAAAEAwBHMEUCIDifAsuw37D4\n" +
-            "beHZ9Ed5/Pab0Eg6Cobrh4jv3bjfA6KIAiEAmiA/XD+AccfI85c+C2zH9wNIs+Zm\n" +
-            "/V/uo/sv0i9eCAYwDQYJKoZIhvcNAQELBQADggEBADRFnOFgb3mzCUpXxiU5/mM5\n" +
-            "ECRj3NzXKXjcYlSMhVcWA7Eqa5rhJuh11vbPoDQzQcGxntS/zhRwJFRF3hnyFa3m\n" +
-            "4t+7ZnUaJN+GOMTABh4kYiOSpE9id12URdJzWv2IHg4CU3OLnsBHGh7H9eWfbPvn\n" +
-            "OW4owV1ChpiEHh40i/NQkTn9JzjlZepI9+EsSdhn2tpis7tko6PX/plgw8bRgm7f\n" +
-            "ong2QaX/DE6z4VIdomW8TQhB9turhKxwjzPTbtYDQIgZfRP/H1S5jYutqbE5yL5B\n" +
-            "r+VOiSuB8234P4xWg1IBL2EFbxPdgOSMTWRJutUcj44kJKmwp5GUQtySSccw4gk=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=comodorsacertificationauthority-ev.comodoca.com, OU=COMODO EV SGC SSL,
-    // O=Sectigo Limited, STREET="3rd Floor, 26 Office Village", STREET=Exchange Quay, STREET=Trafford Road,
-    // L=Salford, OID.2.5.4.17=M5 3EQ, C=GB, OID.2.5.4.15=Private Organization,
-    // OID.1.3.6.1.4.1.311.60.2.1.3=GB, SERIALNUMBER=04058690
-    // Issuer: CN=COMODO RSA Extended Validation Secure Server CA, O=COMODO CA Limited, L=Salford,
-    // ST=Greater Manchester, C=GB
-    // Serial number: a0c7cabcc25ed9358ded02cc1d485545
-    // Valid from: Sun Sep 29 17:00:00 PDT 2019 until: Tue Dec 28 15:59:59 PST 2021
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIH0TCCBrmgAwIBAgIRAKDHyrzCXtk1je0CzB1IVUUwDQYJKoZIhvcNAQELBQAw\n" +
-            "gZIxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO\n" +
-            "BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTgwNgYD\n" +
-            "VQQDEy9DT01PRE8gUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZl\n" +
-            "ciBDQTAeFw0xOTA5MzAwMDAwMDBaFw0yMTEyMjgyMzU5NTlaMIIBPjERMA8GA1UE\n" +
-            "BRMIMDQwNTg2OTAxEzARBgsrBgEEAYI3PAIBAxMCR0IxHTAbBgNVBA8TFFByaXZh\n" +
-            "dGUgT3JnYW5pemF0aW9uMQswCQYDVQQGEwJHQjEPMA0GA1UEERMGTTUgM0VRMRAw\n" +
-            "DgYDVQQHEwdTYWxmb3JkMRYwFAYDVQQJEw1UcmFmZm9yZCBSb2FkMRYwFAYDVQQJ\n" +
-            "Ew1FeGNoYW5nZSBRdWF5MSUwIwYDVQQJExwzcmQgRmxvb3IsIDI2IE9mZmljZSBW\n" +
-            "aWxsYWdlMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxGjAYBgNVBAsTEUNPTU9E\n" +
-            "TyBFViBTR0MgU1NMMTgwNgYDVQQDEy9jb21vZG9yc2FjZXJ0aWZpY2F0aW9uYXV0\n" +
-            "aG9yaXR5LWV2LmNvbW9kb2NhLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC\n" +
-            "AQoCggEBAND/eZQBTjpBDsuteKwl+zpTitF8tJzwHAhcQHC2AaLF/GJl1rnjx4Of\n" +
-            "elMhKhN1Od9KU6onHGOd2w4mD4EiYK9TpXwuwTyzfkCmnkqxZjYK3KAJN013o4L+\n" +
-            "8y1zsGVUulpN/GfMaxTb4XdmeSekTP91Phw3xezijBq3sa++1rO5RBaT1IHeHhHv\n" +
-            "iC9WNrG8CIg/j5MyC9i43LZHiRXLER1LzT/MCIRsiG5AEbiYXV5BNd5SiiHtBJ1q\n" +
-            "0ZJH+AxL2ERaT41VCppboZwThmJGGoky9FWjp6z8U6Enx0fAMJIZNEzW6LAJFKPE\n" +
-            "ynEU004jFFCEumPUqqCC4ogxulphY80CAwEAAaOCA3EwggNtMB8GA1UdIwQYMBaA\n" +
-            "FDna/8ooFIqodBMIueQOqdL6fp1pMB0GA1UdDgQWBBQ+S4ZhIrwOoeGs9BBT4uXq\n" +
-            "89Ux/jAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr\n" +
-            "BgEFBQcDAQYIKwYBBQUHAwIwTwYDVR0gBEgwRjA7BgwrBgEEAbIxAQIBBQEwKzAp\n" +
-            "BggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwBwYFZ4EM\n" +
-            "AQEwVgYDVR0fBE8wTTBLoEmgR4ZFaHR0cDovL2NybC5jb21vZG9jYS5jb20vQ09N\n" +
-            "T0RPUlNBRXh0ZW5kZWRWYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGHBggr\n" +
-            "BgEFBQcBAQR7MHkwUQYIKwYBBQUHMAKGRWh0dHA6Ly9jcnQuY29tb2RvY2EuY29t\n" +
-            "L0NPTU9ET1JTQUV4dGVuZGVkVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAk\n" +
-            "BggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMDoGA1UdEQQzMDGC\n" +
-            "L2NvbW9kb3JzYWNlcnRpZmljYXRpb25hdXRob3JpdHktZXYuY29tb2RvY2EuY29t\n" +
-            "MIIBfQYKKwYBBAHWeQIEAgSCAW0EggFpAWcAdQDuS723dc5guuFCaR+r4Z5mow9+\n" +
-            "X7By2IMAxHuJeqj9ywAAAW2DAXefAAAEAwBGMEQCIDqP1einOiPHnaG1fOZMDrEc\n" +
-            "RAxjq3vEl94fp4pkmke7AiBsJOvPE6irgcOO1/lnP7NRuln7iPJjU7T20PEK5/rm\n" +
-            "KwB2AFWB1MIWkDYBSuoLm1c8U/DA5Dh4cCUIFy+jqh0HE9MMAAABbYMBd0kAAAQD\n" +
-            "AEcwRQIhALgUI5XxM1NHbJDdr19h2pe3LhzK4tpuB/OQ9BgCyrGXAiBdr6mNCB/G\n" +
-            "rbdVx0u7iezwC7mq7iaWugR3rrWlSA8fWQB2ALvZ37wfinG1k5Qjl6qSe0c4V5UK\n" +
-            "q1LoGpCWZDaOHtGFAAABbYMBd1oAAAQDAEcwRQIgXbG32dagMeLhuZb+LSpJO1vI\n" +
-            "BmxmRnNdiz5FbG9cCbwCIQCr1X9f+ebT5fhlDUNBURUorTtM8QQciBiueBqvHk7+\n" +
-            "1DANBgkqhkiG9w0BAQsFAAOCAQEAM/A/1dgoc5NP1n+w3SX9qWcN7QT7ExdrnZSl\n" +
-            "Ygn0PF2fx4gz7cvNKucbpQJNA4C9awGydyYK8/o5KDUXt3K7eb1OAZ/NZBjygsJs\n" +
-            "ikXvxlBh8oEoqBOfOtr24l0NGUWnP8Qeu/VPcIMER4V8qX+in0pCXkSd67nkp6Bs\n" +
-            "EcqhDPgmzdSC1gQHsZuBdotG14OfdH1cG1bRK6GadISLG1h8BFukVem42B149v8F\n" +
-            "MCIUQAYprAVv2WlTZKBx9XzuK6IK3+klHZ07Jfvjvt7PPG5HKSMWBMnMaTHKcyQI\n" +
-            "G3t91yw7BnNNInZlBSsFtqjbHhDcr7uruZdbi0rerSsi2qDr0w==\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Tue Mar 02 02:51:39 PST 2021", System.out);
-    }
-}
-
-class ComodoECC {
-
-    // Owner: CN=COMODO ECC Extended Validation Secure Server CA,
-    // O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB
-    // Issuer: CN=COMODO ECC Certification Authority, O=COMODO CA Limited,
-    // L=Salford, ST=Greater Manchester, C=GB
-    // Serial number: 61d4643b412b5d8d715499d8553aa03
-    // Valid from: Sun Apr 14 17:00:00 PDT 2013 until: Fri Apr 14 16:59:59 PDT 2028
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n"
-            + "MIIDojCCAyigAwIBAgIQBh1GQ7QStdjXFUmdhVOqAzAKBggqhkjOPQQDAzCBhTEL\n"
-            + "MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE\n"
-            + "BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT\n"
-            + "IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTMwNDE1MDAw\n"
-            + "MDAwWhcNMjgwNDE0MjM1OTU5WjCBkjELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy\n"
-            + "ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N\n"
-            + "T0RPIENBIExpbWl0ZWQxODA2BgNVBAMTL0NPTU9ETyBFQ0MgRXh0ZW5kZWQgVmFs\n"
-            + "aWRhdGlvbiBTZWN1cmUgU2VydmVyIENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD\n"
-            + "QgAEV3AaPyeTQy0aWXXkBJMR42DsJ5pnbliJe7ndaHzCDslVlY8ofpxeFiqluZrK\n"
-            + "KNcJeBU/Jl1YI9jLMyMZKsfSoaOCAWkwggFlMB8GA1UdIwQYMBaAFHVxpxlIGbyd\n"
-            + "nepBR9+UxEh3mdN5MB0GA1UdDgQWBBTTTsMZulhZ0Rxgt2FTRzund4/4ijAOBgNV\n"
-            + "HQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADA+BgNVHSAENzA1MDMGBFUd\n"
-            + "IAAwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMw\n"
-            + "TAYDVR0fBEUwQzBBoD+gPYY7aHR0cDovL2NybC5jb21vZG9jYS5jb20vQ09NT0RP\n"
-            + "RUNDQ2VydGlmaWNhdGlvbkF1dGhvcml0eS5jcmwwcQYIKwYBBQUHAQEEZTBjMDsG\n"
-            + "CCsGAQUFBzAChi9odHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9DT01PRE9FQ0NBZGRU\n"
-            + "cnVzdENBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29t\n"
-            + "MAoGCCqGSM49BAMDA2gAMGUCMQDmPWS98nREWdt4xB83r9MVvgG5INpKHi6V1dUY\n"
-            + "lCqvSvXXjK0QvZSrOB7cj9RavGgCMG2xJNG+SvlTWEYpmK7eXSgmRUgoBDeQ0yDK\n"
-            + "lnxmeeOBnnCaDIxAcA3aCj2Gtdt3sA==\n"
-            + "-----END CERTIFICATE-----";
-
-    // Owner: CN=comodoecccertificationauthority-ev.comodoca.com, O=Sectigo Limited, STREET="3rd Floor,
-    // 26 Office Village", STREET=Exchange Quay, STREET=Trafford Road, L=Salford, ST=Manchester, OID.2.5.4.17=M5 3EQ,
-    // C=GB, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.3=GB, SERIALNUMBER=04058690
-    // Issuer: CN=COMODO ECC Extended Validation Secure Server CA, O=COMODO CA Limited, L=Salford,
-    // ST=Greater Manchester, C=GB
-    // Serial number: db437a31e5be29a62443e3caa1479001
-    // Valid from: Mon Mar 01 16:00:00 PST 2021 until: Sat Apr 02 16:59:59 PDT 2022
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFvzCCBWWgAwIBAgIRANtDejHlvimmJEPjyqFHkAEwCgYIKoZIzj0EAwIwgZIx\n" +
-            "CzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNV\n" +
-            "BAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTgwNgYDVQQD\n" +
-            "Ey9DT01PRE8gRUNDIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD\n" +
-            "QTAeFw0yMTAzMDIwMDAwMDBaFw0yMjA0MDIyMzU5NTlaMIIBNzERMA8GA1UEBRMI\n" +
-            "MDQwNTg2OTAxEzARBgsrBgEEAYI3PAIBAxMCR0IxHTAbBgNVBA8TFFByaXZhdGUg\n" +
-            "T3JnYW5pemF0aW9uMQswCQYDVQQGEwJHQjEPMA0GA1UEERMGTTUgM0VRMRMwEQYD\n" +
-            "VQQIEwpNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRYwFAYDVQQJEw1UcmFm\n" +
-            "Zm9yZCBSb2FkMRYwFAYDVQQJEw1FeGNoYW5nZSBRdWF5MSUwIwYDVQQJExwzcmQg\n" +
-            "Rmxvb3IsIDI2IE9mZmljZSBWaWxsYWdlMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0\n" +
-            "ZWQxODA2BgNVBAMTL2NvbW9kb2VjY2NlcnRpZmljYXRpb25hdXRob3JpdHktZXYu\n" +
-            "Y29tb2RvY2EuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEt26qBS7TRu/y\n" +
-            "fR+RiqLAzW2C+UspFZlORc4EhLfNYMgFkoZKjEnwJzudH6a+uRPqPOhPgUd6PFfR\n" +
-            "QFOcLjmhgaOCAvIwggLuMB8GA1UdIwQYMBaAFNNOwxm6WFnRHGC3YVNHO6d3j/iK\n" +
-            "MB0GA1UdDgQWBBTpZ0tzKscFw6Z3vCEDFzGR5VSkVzAOBgNVHQ8BAf8EBAMCBYAw\n" +
-            "DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwSQYD\n" +
-            "VR0gBEIwQDA1BgwrBgEEAbIxAQIBBQEwJTAjBggrBgEFBQcCARYXaHR0cHM6Ly9z\n" +
-            "ZWN0aWdvLmNvbS9DUFMwBwYFZ4EMAQEwVgYDVR0fBE8wTTBLoEmgR4ZFaHR0cDov\n" +
-            "L2NybC5jb21vZG9jYS5jb20vQ09NT0RPRUNDRXh0ZW5kZWRWYWxpZGF0aW9uU2Vj\n" +
-            "dXJlU2VydmVyQ0EuY3JsMIGHBggrBgEFBQcBAQR7MHkwUQYIKwYBBQUHMAKGRWh0\n" +
-            "dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0VDQ0V4dGVuZGVkVmFsaWRhdGlv\n" +
-            "blNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29t\n" +
-            "b2RvY2EuY29tMDoGA1UdEQQzMDGCL2NvbW9kb2VjY2NlcnRpZmljYXRpb25hdXRo\n" +
-            "b3JpdHktZXYuY29tb2RvY2EuY29tMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHYA\n" +
-            "RqVV63X6kSAwtaKJafTzfREsQXS+/Um4havy/HD+bUcAAAF38qtH4AAABAMARzBF\n" +
-            "AiBsKoB1TTfoUYUNqF160/vlOENHyK1zzARcnfGKYURHTwIhANKYWg1CO7jyCPk+\n" +
-            "IrrLaR+461snNK4LJZXJm4o/9GeeAHYAb1N2rDHwMRnYmQCkURX/dxUcEdkCwQAp\n" +
-            "Bo2yCJo32RMAAAF38qtJIAAABAMARzBFAiEA1hgxkYZb5Tc9+vQsDnsfXVewClN2\n" +
-            "7gzwd4hZdqAsOSYCID9CWcBvkKrL44mfe9ky1Z6BnAWHUBMCxTjt8MO/IMZ8MAoG\n" +
-            "CCqGSM49BAMCA0gAMEUCIBa3sfOiVb0q4LcXU9umKjzVw3Ib8VdiPTtXSnyl0oLb\n" +
-            "AiEAnpRB53UtLAF7xw98ELmK/LEk1b5KSlqoO8sFHgwQ8vI=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=comodoecccertificationauthority-ev.comodoca.com, OU=COMODO EV SSL, O=Sectigo Limited,
-    // STREET="3rd Floor, 26 Office Village", STREET=Exchange Quay, STREET=Trafford Road, L=Salford, OID.2.5.4.17=M5 3EQ,
-    // C=GB, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.3=GB, SERIALNUMBER=04058690
-    // Issuer: CN=COMODO ECC Extended Validation Secure Server CA, O=COMODO CA Limited, L=Salford,
-    // ST=Greater Manchester, C=GB
-    // Serial number: 7972d9d8472a2d52ad1ee6edfb16cbe1
-    // Valid from: Sun Sep 29 17:00:00 PDT 2019 until: Tue Dec 28 15:59:59 PST 2021
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGPzCCBeWgAwIBAgIQeXLZ2EcqLVKtHubt+xbL4TAKBggqhkjOPQQDAjCBkjEL\n" +
-            "MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE\n" +
-            "BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxODA2BgNVBAMT\n" +
-            "L0NPTU9ETyBFQ0MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB\n" +
-            "MB4XDTE5MDkzMDAwMDAwMFoXDTIxMTIyODIzNTk1OVowggE6MREwDwYDVQQFEwgw\n" +
-            "NDA1ODY5MDETMBEGCysGAQQBgjc8AgEDEwJHQjEdMBsGA1UEDxMUUHJpdmF0ZSBP\n" +
-            "cmdhbml6YXRpb24xCzAJBgNVBAYTAkdCMQ8wDQYDVQQREwZNNSAzRVExEDAOBgNV\n" +
-            "BAcTB1NhbGZvcmQxFjAUBgNVBAkTDVRyYWZmb3JkIFJvYWQxFjAUBgNVBAkTDUV4\n" +
-            "Y2hhbmdlIFF1YXkxJTAjBgNVBAkTHDNyZCBGbG9vciwgMjYgT2ZmaWNlIFZpbGxh\n" +
-            "Z2UxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDEWMBQGA1UECxMNQ09NT0RPIEVW\n" +
-            "IFNTTDE4MDYGA1UEAxMvY29tb2RvZWNjY2VydGlmaWNhdGlvbmF1dGhvcml0eS1l\n" +
-            "di5jb21vZG9jYS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS3bqoFLtNG\n" +
-            "7/J9H5GKosDNbYL5SykVmU5FzgSEt81gyAWShkqMSfAnO50fpr65E+o86E+BR3o8\n" +
-            "V9FAU5wuOaGBo4IDcDCCA2wwHwYDVR0jBBgwFoAU007DGbpYWdEcYLdhU0c7p3eP\n" +
-            "+IowHQYDVR0OBBYEFOlnS3MqxwXDpne8IQMXMZHlVKRXMA4GA1UdDwEB/wQEAwIF\n" +
-            "gDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBP\n" +
-            "BgNVHSAESDBGMDsGDCsGAQQBsjEBAgEFATArMCkGCCsGAQUFBwIBFh1odHRwczov\n" +
-            "L3NlY3VyZS5jb21vZG8uY29tL0NQUzAHBgVngQwBATBWBgNVHR8ETzBNMEugSaBH\n" +
-            "hkVodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9FQ0NFeHRlbmRlZFZhbGlk\n" +
-            "YXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYcGCCsGAQUFBwEBBHsweTBRBggrBgEF\n" +
-            "BQcwAoZFaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPRUNDRXh0ZW5kZWRW\n" +
-            "YWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8v\n" +
-            "b2NzcC5jb21vZG9jYS5jb20wOgYDVR0RBDMwMYIvY29tb2RvZWNjY2VydGlmaWNh\n" +
-            "dGlvbmF1dGhvcml0eS1ldi5jb21vZG9jYS5jb20wggF8BgorBgEEAdZ5AgQCBIIB\n" +
-            "bASCAWgBZgB1AO5Lvbd1zmC64UJpH6vhnmajD35fsHLYgwDEe4l6qP3LAAABbYME\n" +
-            "EzgAAAQDAEYwRAIgbdo71lBleuJiq+D0ZLp51oVUyWD9EyrtgBSCNwIW4cMCIAqg\n" +
-            "0VFTWHEmAVjaV23fGj3Ybu3mpSiHr6viGlgA2lYaAHUAVYHUwhaQNgFK6gubVzxT\n" +
-            "8MDkOHhwJQgXL6OqHQcT0wwAAAFtgwQTKAAABAMARjBEAiBb/gW1RU7kgFBiNpHx\n" +
-            "LStujKIocyENUTXsMbsac+LktwIgXbEr8vOOCEdBdXQ2F/FKec8ft6gz57mHNmwl\n" +
-            "pp7phbQAdgC72d+8H4pxtZOUI5eqkntHOFeVCqtS6BqQlmQ2jh7RhQAAAW2DBBM6\n" +
-            "AAAEAwBHMEUCIQDjKN3h86ofR94+JxLFoYuoA+DRtxEY8XGg+NQXlZfUrgIgEoO2\n" +
-            "ZzKbGfohdwj/WtDwJDRX5pjXF4M0nECiwtYXDIwwCgYIKoZIzj0EAwIDSAAwRQIg\n" +
-            "AkIRVQBwrElFjrnqk5XPvnlnwkIm1A70ayqOf1FexoQCIQC8tBTn//RCfrhcgTjd\n" +
-            "ER4wRjFfFoc6lC68OHGVg9CZZg==\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Tue Mar 02 02:53:40 PST 2021", System.out);
-    }
-}
-
-class ComodoUserTrustRSA {
-
-    // Owner: CN=Sectigo RSA Extended Validation Secure Server CA, O=Sectigo Limited, L=Salford,
-    // ST=Greater Manchester, C=GB
-    // Issuer: CN=USERTrust RSA Certification Authority, O=The USERTRUST Network, L=Jersey City, ST=New Jersey, C=US
-    // Serial number: 284e39c14b386d889c7299e58cd05a57
-    // Valid from: Thu Nov 01 17:00:00 PDT 2018 until: Tue Dec 31 15:59:59 PST 2030
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGNDCCBBygAwIBAgIQKE45wUs4bYiccpnljNBaVzANBgkqhkiG9w0BAQwFADCB\n" +
-            "iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl\n" +
-            "cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV\n" +
-            "BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTgx\n" +
-            "MTAyMDAwMDAwWhcNMzAxMjMxMjM1OTU5WjCBkTELMAkGA1UEBhMCR0IxGzAZBgNV\n" +
-            "BAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEYMBYGA1UE\n" +
-            "ChMPU2VjdGlnbyBMaW1pdGVkMTkwNwYDVQQDEzBTZWN0aWdvIFJTQSBFeHRlbmRl\n" +
-            "ZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EwggEiMA0GCSqGSIb3DQEBAQUA\n" +
-            "A4IBDwAwggEKAoIBAQCaoslYBiqFev0Yc4TXPa0s9oliMcn9VaENfTUK4GVT7niB\n" +
-            "QXxC6Mt8kTtvyr5lU92hDQDh2WDPQsZ7oibh75t2kowT3z1S+Sy1GsUDM4NbdOde\n" +
-            "orcmzFm/b4bwD4G/G+pB4EX1HSfjN9eT0Hje+AGvCrd2MmnxJ+Yymv9BH9OB65jK\n" +
-            "rUO9Na4iHr48XWBDFvzsPCJ11Uioof6dRBVp+Lauj88Z7k2X8d606HeXn43h6acp\n" +
-            "LLURWyqXM0CrzedVWBzuXKuBEaqD6w/1VpLJvSU+wl3ScvXSLFp82DSRJVJONXWl\n" +
-            "dp9gjJioPGRByeZw11k3galbbF5gFK9xSnbDx29LAgMBAAGjggGNMIIBiTAfBgNV\n" +
-            "HSMEGDAWgBRTeb9aqitKz1SA4dibwJ3ysgNmyzAdBgNVHQ4EFgQULGn/gMmHkK40\n" +
-            "4bTnTJOFmUDpp7IwDgYDVR0PAQH/BAQDAgGGMBIGA1UdEwEB/wQIMAYBAf8CAQAw\n" +
-            "HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDoGA1UdIAQzMDEwLwYEVR0g\n" +
-            "ADAnMCUGCCsGAQUFBwIBFhlodHRwczovL2Nwcy51c2VydHJ1c3QuY29tMFAGA1Ud\n" +
-            "HwRJMEcwRaBDoEGGP2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RS\n" +
-            "U0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDB2BggrBgEFBQcBAQRqMGgwPwYI\n" +
-            "KwYBBQUHMAKGM2h0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FB\n" +
-            "ZGRUcnVzdENBLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0\n" +
-            "LmNvbTANBgkqhkiG9w0BAQwFAAOCAgEAQ4AzPxVypLyy3IjUUmVl7FaxrHsXQq2z\n" +
-            "Zt2gKnHQShuA+5xpRPNndjvhHk4D08PZXUe6Im7E5knqxtyl5aYdldb+HI/7f+zd\n" +
-            "W/1ub2N4Vq4ZYUjcZ1ECOFK7Z2zoNicDmU+Fe/TreXPuPsDicTG/tMcWEVM558OQ\n" +
-            "TJkB2LK3ZhGukWM/RTMRcRdXaXOX8Lh0ylzRO1O0ObXytvOFpkkkD92HGsfS06i7\n" +
-            "NLDPJEeZXqzHE5Tqj7VSAj+2luwfaXaPLD8lQEVci8xmsPGOn0mXE1ZzsChEPhVq\n" +
-            "FYQUsbiRJRhidKauhd+G2CkRTcR5fpsuz+iStB9s5Fks9lKoXnn0hv78VYjvR78C\n" +
-            "Cvj5FW/ounHjWTWMb3il9S5ngbFGcelB1l/MQkR63+1ybdi2OpjNWJCftxOWUpkC\n" +
-            "xaRdnOnSj7GQY0NLn8Gtq9FcSZydtkVgXpouSFZkXNS/MYwbcCCcRKBbrk8ss0SI\n" +
-            "Xg1gTURjh9VP1OHm0OktYcUw9e90wHIDn7h0qA+bWOsZquSRzT4s2crF3ZSA3tuV\n" +
-            "/UJ33mjdVO8wBD8aI5y10QreSPJvZHHNDyCmoyjXvNhR+u3arXUoHWxO+MZBeXbi\n" +
-            "iF7Nwn/IEmQvWBW8l6D26CXIavcY1kAJcfyzHkrPbLo+fAOa/KFl3lIU+0biEVNk\n" +
-            "Q9zXE6hC6X4=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=usertrustrsacertificationauthority-ev.comodoca.com, O=Sectigo Limited, STREET="3rd Floor,
-    // 26 Office Village", STREET=Exchange Quay, STREET=Trafford Road, L=Salford, ST=Manchester, OID.2.5.4.17=M5 3EQ,
-    // C=GB, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.3=GB, SERIALNUMBER=04058690
-    // Issuer: CN=Sectigo RSA Extended Validation Secure Server CA, O=Sectigo Limited, L=Salford,
-    // ST=Greater Manchester, C=GB
-    // Serial number: 4e484426dbfed0c222b2ed152465614a
-    // Valid from: Mon Mar 01 16:00:00 PST 2021 until: Sat Apr 02 16:59:59 PDT 2022
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHTzCCBjegAwIBAgIQTkhEJtv+0MIisu0VJGVhSjANBgkqhkiG9w0BAQsFADCB\n" +
-            "kTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G\n" +
-            "A1UEBxMHU2FsZm9yZDEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTkwNwYDVQQD\n" +
-            "EzBTZWN0aWdvIFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg\n" +
-            "Q0EwHhcNMjEwMzAyMDAwMDAwWhcNMjIwNDAyMjM1OTU5WjCCAToxETAPBgNVBAUT\n" +
-            "CDA0MDU4NjkwMRMwEQYLKwYBBAGCNzwCAQMTAkdCMR0wGwYDVQQPExRQcml2YXRl\n" +
-            "IE9yZ2FuaXphdGlvbjELMAkGA1UEBhMCR0IxDzANBgNVBBETBk01IDNFUTETMBEG\n" +
-            "A1UECBMKTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEWMBQGA1UECRMNVHJh\n" +
-            "ZmZvcmQgUm9hZDEWMBQGA1UECRMNRXhjaGFuZ2UgUXVheTElMCMGA1UECRMcM3Jk\n" +
-            "IEZsb29yLCAyNiBPZmZpY2UgVmlsbGFnZTEYMBYGA1UEChMPU2VjdGlnbyBMaW1p\n" +
-            "dGVkMTswOQYDVQQDEzJ1c2VydHJ1c3Ryc2FjZXJ0aWZpY2F0aW9uYXV0aG9yaXR5\n" +
-            "LWV2LmNvbW9kb2NhLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB\n" +
-            "AJ4f68XomMKS2uudXi7xp0fkRK4Q1pE2bamXB8PTsuyS9rhC8hD2zPr9Gs+NHAR0\n" +
-            "tG0GSWW1plzbpDFDEsCG+M+7fDl5cc/br8RLn75agZeKngv89y6RQUURxHq6N8hi\n" +
-            "lcJKHtWj9j6u1HYvu4u3lWWXQNbYnMWVqP1AVPZsGyDmKn/+Mc2ehvPdYSm/jQLr\n" +
-            "hH8Rudr12ZfKHTE4Xx7g5ZH0u52TEAWjuNCiXkhAYa/uUyEu3e7VlsnvxeqBENPn\n" +
-            "RwYhfT8mdXV6DvGrnv/NJj/tBTGE5kRbCh4HumY6I3x/XC5UeZE6rT+U6oeRgUOM\n" +
-            "6d7siAQVOspSqfTzR5HsBlECAwEAAaOCAvUwggLxMB8GA1UdIwQYMBaAFCxp/4DJ\n" +
-            "h5CuNOG050yThZlA6aeyMB0GA1UdDgQWBBR8+3Lw59S2HtjPs+KZcEJ+67fd/DAO\n" +
-            "BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD\n" +
-            "AQYIKwYBBQUHAwIwSQYDVR0gBEIwQDA1BgwrBgEEAbIxAQIBBQEwJTAjBggrBgEF\n" +
-            "BQcCARYXaHR0cHM6Ly9zZWN0aWdvLmNvbS9DUFMwBwYFZ4EMAQEwVgYDVR0fBE8w\n" +
-            "TTBLoEmgR4ZFaHR0cDovL2NybC5zZWN0aWdvLmNvbS9TZWN0aWdvUlNBRXh0ZW5k\n" +
-            "ZWRWYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGGBggrBgEFBQcBAQR6MHgw\n" +
-            "UQYIKwYBBQUHMAKGRWh0dHA6Ly9jcnQuc2VjdGlnby5jb20vU2VjdGlnb1JTQUV4\n" +
-            "dGVuZGVkVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAjBggrBgEFBQcwAYYX\n" +
-            "aHR0cDovL29jc3Auc2VjdGlnby5jb20wPQYDVR0RBDYwNIIydXNlcnRydXN0cnNh\n" +
-            "Y2VydGlmaWNhdGlvbmF1dGhvcml0eS1ldi5jb21vZG9jYS5jb20wggEFBgorBgEE\n" +
-            "AdZ5AgQCBIH2BIHzAPEAdwBGpVXrdfqRIDC1oolp9PN9ESxBdL79SbiFq/L8cP5t\n" +
-            "RwAAAXfyrRCwAAAEAwBIMEYCIQCeOHfnABa6cl0EHTzyMj2t2qBqORBAC16hJIIl\n" +
-            "Y52W4QIhAKHDk1m9lW0kmcZJWEko3eA9QKJSDLNLpdUoBPzNNc76AHYAb1N2rDHw\n" +
-            "MRnYmQCkURX/dxUcEdkCwQApBo2yCJo32RMAAAF38q0R6wAABAMARzBFAiEAywsh\n" +
-            "8Ki6fFOExwR6de0qzTmf7bJMuQcY0Ry463/9R44CIDeAcX7Z9S1vlRB9gzVomNIN\n" +
-            "vkcnUazq7dowPnr5rYMOMA0GCSqGSIb3DQEBCwUAA4IBAQA3a+PBgH1SBVEDpgAN\n" +
-            "mWaqIQzJzMRfSgvopQ6nC8iD95SfYD/rvic7aOeBLh/5aEs/CknJsg6o0qB3wz1v\n" +
-            "T5JXd5JldRWw3nP80jkIaYgq97RUIkjcHhuw4hTyQP6wk7XVlPVLvBo9ePWxJjmn\n" +
-            "whxlSyxQ5A5NdrTqZOJmu9nFr2HXpX75kGwCkUKZI050FAZZydsK3LfMBTqe1Xwi\n" +
-            "PKyjXDWd40LjOEg31sA43ofO8n2pySP5LG5XAsvoAyPCy3zXhx5cdtmQFLIkntus\n" +
-            "DCfN+n51HPUo8r4PUhQtOiRUB3K871LTdwyv4/CRXS2fIhtO1pxYNKFOw0yrUf6j\n" +
-            "ECgk\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=usertrustrsacertificationauthority-ev.comodoca.com, OU=COMODO EV SGC SSL, O=Sectigo Limited,
-    // STREET="3rd Floor, 26 Office Village", STREET=Exchange Quay, STREET=Trafford Road, L=Salford, ST=Manchester,
-    // OID.2.5.4.17=M5 3EQ, C=GB, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.3=GB, SERIALNUMBER=04058690
-    // Issuer: CN=Sectigo RSA Extended Validation Secure Server CA, O=Sectigo Limited, L=Salford,
-    // ST=Greater Manchester, C=GB
-    // Serial number: b07fd164b5790c9d5d1fddff5819cdb2
-    // Valid from: Sun Sep 29 17:00:00 PDT 2019 until: Tue Dec 28 15:59:59 PST 2021
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIH5TCCBs2gAwIBAgIRALB/0WS1eQydXR/d/1gZzbIwDQYJKoZIhvcNAQELBQAw\n" +
-            "gZExCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO\n" +
-            "BgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE5MDcGA1UE\n" +
-            "AxMwU2VjdGlnbyBSU0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVy\n" +
-            "IENBMB4XDTE5MDkzMDAwMDAwMFoXDTIxMTIyODIzNTk1OVowggFWMREwDwYDVQQF\n" +
-            "EwgwNDA1ODY5MDETMBEGCysGAQQBgjc8AgEDEwJHQjEdMBsGA1UEDxMUUHJpdmF0\n" +
-            "ZSBPcmdhbml6YXRpb24xCzAJBgNVBAYTAkdCMQ8wDQYDVQQREwZNNSAzRVExEzAR\n" +
-            "BgNVBAgTCk1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxFjAUBgNVBAkTDVRy\n" +
-            "YWZmb3JkIFJvYWQxFjAUBgNVBAkTDUV4Y2hhbmdlIFF1YXkxJTAjBgNVBAkTHDNy\n" +
-            "ZCBGbG9vciwgMjYgT2ZmaWNlIFZpbGxhZ2UxGDAWBgNVBAoTD1NlY3RpZ28gTGlt\n" +
-            "aXRlZDEaMBgGA1UECxMRQ09NT0RPIEVWIFNHQyBTU0wxOzA5BgNVBAMTMnVzZXJ0\n" +
-            "cnVzdHJzYWNlcnRpZmljYXRpb25hdXRob3JpdHktZXYuY29tb2RvY2EuY29tMIIB\n" +
-            "IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnh/rxeiYwpLa651eLvGnR+RE\n" +
-            "rhDWkTZtqZcHw9Oy7JL2uELyEPbM+v0az40cBHS0bQZJZbWmXNukMUMSwIb4z7t8\n" +
-            "OXlxz9uvxEufvlqBl4qeC/z3LpFBRRHEero3yGKVwkoe1aP2Pq7Udi+7i7eVZZdA\n" +
-            "1ticxZWo/UBU9mwbIOYqf/4xzZ6G891hKb+NAuuEfxG52vXZl8odMThfHuDlkfS7\n" +
-            "nZMQBaO40KJeSEBhr+5TIS7d7tWWye/F6oEQ0+dHBiF9PyZ1dXoO8aue/80mP+0F\n" +
-            "MYTmRFsKHge6ZjojfH9cLlR5kTqtP5Tqh5GBQ4zp3uyIBBU6ylKp9PNHkewGUQID\n" +
-            "AQABo4IDbjCCA2owHwYDVR0jBBgwFoAULGn/gMmHkK404bTnTJOFmUDpp7IwHQYD\n" +
-            "VR0OBBYEFHz7cvDn1LYe2M+z4plwQn7rt938MA4GA1UdDwEB/wQEAwIFoDAMBgNV\n" +
-            "HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHSAE\n" +
-            "QjBAMDUGDCsGAQQBsjEBAgEFATAlMCMGCCsGAQUFBwIBFhdodHRwczovL3NlY3Rp\n" +
-            "Z28uY29tL0NQUzAHBgVngQwBATBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3Js\n" +
-            "LnNlY3RpZ28uY29tL1NlY3RpZ29SU0FFeHRlbmRlZFZhbGlkYXRpb25TZWN1cmVT\n" +
-            "ZXJ2ZXJDQS5jcmwwgYYGCCsGAQUFBwEBBHoweDBRBggrBgEFBQcwAoZFaHR0cDov\n" +
-            "L2NydC5zZWN0aWdvLmNvbS9TZWN0aWdvUlNBRXh0ZW5kZWRWYWxpZGF0aW9uU2Vj\n" +
-            "dXJlU2VydmVyQ0EuY3J0MCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5zZWN0aWdv\n" +
-            "LmNvbTA9BgNVHREENjA0gjJ1c2VydHJ1c3Ryc2FjZXJ0aWZpY2F0aW9uYXV0aG9y\n" +
-            "aXR5LWV2LmNvbW9kb2NhLmNvbTCCAX4GCisGAQQB1nkCBAIEggFuBIIBagFoAHYA\n" +
-            "7ku9t3XOYLrhQmkfq+GeZqMPfl+wctiDAMR7iXqo/csAAAFtgzv54wAABAMARzBF\n" +
-            "AiB5PmhsK3zU3XdKvyxw/wWHMmLI7apHLa1yKdjkA8H+ggIhALdUx7Tl8aeWhK6z\n" +
-            "lh+PHvMAdCcAJK6w9qBJGQtSrYO5AHUAVYHUwhaQNgFK6gubVzxT8MDkOHhwJQgX\n" +
-            "L6OqHQcT0wwAAAFtgzv5zgAABAMARjBEAiBumSwAUamibqJXTN2cf/H3mjd0T35/\n" +
-            "UK9w2hu9gFobxgIgSXTLndHyqFUmcmquu3It0WC1yl6YMceGixbQL1e8BQcAdwC7\n" +
-            "2d+8H4pxtZOUI5eqkntHOFeVCqtS6BqQlmQ2jh7RhQAAAW2DO/nXAAAEAwBIMEYC\n" +
-            "IQDHRs10oYoXE5yq6WsiksjdQsUWZNpbSsrmz0u+KlxTVQIhAJ4rvHItKSeJLkaN\n" +
-            "S3YpVZnkN8tOwuxPsYeyVx/BtaNpMA0GCSqGSIb3DQEBCwUAA4IBAQAPFIsUFymo\n" +
-            "VTp0vntHrZpBApBQzDeriQv7Bi7tmou/Ng47RtXW3DjGdrePGSfOdl7h62k8qprU\n" +
-            "JeLyloDqhvmT/CG/hdwrfZ3Sv3N2xpetGcnW5S3oEi3m+/M1ls9eD+x1vybqV9Kd\n" +
-            "lcjuV7SYDlbvAS9w7TcygudhdW0cI8XTCvesGKohBkAlqaQ/MWYpt4WvsxHjbWgn\n" +
-            "5ZlIYR6A1ZFEjADifViH/5AA79lgGhAskkIWPjvRFalEVKTKtjhRK76eCfZs4Frr\n" +
-            "CEOpon+BeNKk+x/K/r10dSoWe0SV2uGVxTD83zkP++eREwo1hTgn8bXn7ftlnA3j\n" +
-            "7ml+Usz6udaD\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Tue Mar 02 02:55:42 PST 2021", System.out);
-    }
-}
-
-class ComodoUserTrustECC {
-
-    // Owner: CN=Sectigo ECC Extended Validation Secure Server CA, O=Sectigo Limited, L=Salford,
-    // ST=Greater Manchester, C=GB
-    // Issuer: CN=USERTrust ECC Certification Authority, O=The USERTRUST Network, L=Jersey City, ST=New Jersey, C=US
-    // Serial number: 80f5606d3a162b143adc12fbe8c2066f
-    // Valid from: Thu Nov 01 17:00:00 PDT 2018 until: Tue Dec 31 15:59:59 PST 2030
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIDyTCCA0+gAwIBAgIRAID1YG06FisUOtwS++jCBm8wCgYIKoZIzj0EAwMwgYgx\n" +
-            "CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtKZXJz\n" +
-            "ZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYDVQQD\n" +
-            "EyVVU0VSVHJ1c3QgRUNDIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTE4MTEw\n" +
-            "MjAwMDAwMFoXDTMwMTIzMTIzNTk1OVowgZExCzAJBgNVBAYTAkdCMRswGQYDVQQI\n" +
-            "ExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoT\n" +
-            "D1NlY3RpZ28gTGltaXRlZDE5MDcGA1UEAxMwU2VjdGlnbyBFQ0MgRXh0ZW5kZWQg\n" +
-            "VmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBMFkwEwYHKoZIzj0CAQYIKoZIzj0D\n" +
-            "AQcDQgAEAyJ5Ca9JyXq8bO+krLVWysbtm7fdMSJ54uFD23t0x6JAC4IjxevfQJzW\n" +
-            "z4T6yY+FybTBqtOa++ijJFnkB5wKy6OCAY0wggGJMB8GA1UdIwQYMBaAFDrhCYbU\n" +
-            "zxnClnZ0SXbc4DXGY2OaMB0GA1UdDgQWBBTvwSqVDDLa+3Mw3IoT2BVL9xPo+DAO\n" +
-            "BgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUEFjAUBggr\n" +
-            "BgEFBQcDAQYIKwYBBQUHAwIwOgYDVR0gBDMwMTAvBgRVHSAAMCcwJQYIKwYBBQUH\n" +
-            "AgEWGWh0dHBzOi8vY3BzLnVzZXJ0cnVzdC5jb20wUAYDVR0fBEkwRzBFoEOgQYY/\n" +
-            "aHR0cDovL2NybC51c2VydHJ1c3QuY29tL1VTRVJUcnVzdEVDQ0NlcnRpZmljYXRp\n" +
-            "b25BdXRob3JpdHkuY3JsMHYGCCsGAQUFBwEBBGowaDA/BggrBgEFBQcwAoYzaHR0\n" +
-            "cDovL2NydC51c2VydHJ1c3QuY29tL1VTRVJUcnVzdEVDQ0FkZFRydXN0Q0EuY3J0\n" +
-            "MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMAoGCCqGSM49\n" +
-            "BAMDA2gAMGUCMQCjHztBDL90GCRXHlGqm0H7kzP04hd0MxwakKjWzOmstXNFLONj\n" +
-            "RFa0JqI/iKUJMFcCMCbLgyzcFW7DihtY5XE0XCLCw+git0NjxiFB6FaOFIlyDdqT\n" +
-            "j+Th+DJ92JLvICVD/g==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=usertrustecccertificationauthority-ev.comodoca.com, O=Sectigo Limited,
-    // STREET="3rd Floor, 26 Office Village", STREET=Exchange Quay, STREET=Trafford Road, L=Salford,
-    // ST=Manchester, OID.2.5.4.17=M5 3EQ,
-    // C=GB, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.3=GB, SERIALNUMBER=04058690
-    // Issuer: CN=Sectigo ECC Extended Validation Secure Server CA, O=Sectigo Limited, L=Salford,
-    // ST=Greater Manchester, C=GB
-    // Serial number: 9aa5da67480446fd7bf408fd5fdaa1d8
-    // Valid from: Mon Mar 01 16:00:00 PST 2021 until: Sat Apr 02 16:59:59 PDT 2022
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFwTCCBWigAwIBAgIRAJql2mdIBEb9e/QI/V/aodgwCgYIKoZIzj0EAwIwgZEx\n" +
-            "CzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNV\n" +
-            "BAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE5MDcGA1UEAxMw\n" +
-            "U2VjdGlnbyBFQ0MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB\n" +
-            "MB4XDTIxMDMwMjAwMDAwMFoXDTIyMDQwMjIzNTk1OVowggE6MREwDwYDVQQFEwgw\n" +
-            "NDA1ODY5MDETMBEGCysGAQQBgjc8AgEDEwJHQjEdMBsGA1UEDxMUUHJpdmF0ZSBP\n" +
-            "cmdhbml6YXRpb24xCzAJBgNVBAYTAkdCMQ8wDQYDVQQREwZNNSAzRVExEzARBgNV\n" +
-            "BAgTCk1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxFjAUBgNVBAkTDVRyYWZm\n" +
-            "b3JkIFJvYWQxFjAUBgNVBAkTDUV4Y2hhbmdlIFF1YXkxJTAjBgNVBAkTHDNyZCBG\n" +
-            "bG9vciwgMjYgT2ZmaWNlIFZpbGxhZ2UxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRl\n" +
-            "ZDE7MDkGA1UEAxMydXNlcnRydXN0ZWNjY2VydGlmaWNhdGlvbmF1dGhvcml0eS1l\n" +
-            "di5jb21vZG9jYS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQtMl8R33Za\n" +
-            "WD6H8BW0+wybBf0+6+L5YYK/eyAVGm6vwjLaQZWlcdFBMKfaP1qTLi0VAabs4baS\n" +
-            "UkD8wR568pVpo4IC8zCCAu8wHwYDVR0jBBgwFoAU78EqlQwy2vtzMNyKE9gVS/cT\n" +
-            "6PgwHQYDVR0OBBYEFLOtYfOaIfDHZGubtKNELRR6A2srMA4GA1UdDwEB/wQEAwIH\n" +
-            "gDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJ\n" +
-            "BgNVHSAEQjBAMDUGDCsGAQQBsjEBAgEFATAlMCMGCCsGAQUFBwIBFhdodHRwczov\n" +
-            "L3NlY3RpZ28uY29tL0NQUzAHBgVngQwBATBWBgNVHR8ETzBNMEugSaBHhkVodHRw\n" +
-            "Oi8vY3JsLnNlY3RpZ28uY29tL1NlY3RpZ29FQ0NFeHRlbmRlZFZhbGlkYXRpb25T\n" +
-            "ZWN1cmVTZXJ2ZXJDQS5jcmwwgYYGCCsGAQUFBwEBBHoweDBRBggrBgEFBQcwAoZF\n" +
-            "aHR0cDovL2NydC5zZWN0aWdvLmNvbS9TZWN0aWdvRUNDRXh0ZW5kZWRWYWxpZGF0\n" +
-            "aW9uU2VjdXJlU2VydmVyQ0EuY3J0MCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5z\n" +
-            "ZWN0aWdvLmNvbTA9BgNVHREENjA0gjJ1c2VydHJ1c3RlY2NjZXJ0aWZpY2F0aW9u\n" +
-            "YXV0aG9yaXR5LWV2LmNvbW9kb2NhLmNvbTCCAQMGCisGAQQB1nkCBAIEgfQEgfEA\n" +
-            "7wB2AEalVet1+pEgMLWiiWn0830RLEF0vv1JuIWr8vxw/m1HAAABd/Kung0AAAQD\n" +
-            "AEcwRQIhAI16l52NctGAphhc6eh2kK2vO5QYk5nyouL3P6U/gG/dAiBfJRJ+iqE/\n" +
-            "noco35RpNtlV4GABrwmw1I/1R+L79VzwEAB1AG9Tdqwx8DEZ2JkApFEV/3cVHBHZ\n" +
-            "AsEAKQaNsgiaN9kTAAABd/KunvwAAAQDAEYwRAIgS+r3C10ua38DPJKvUJvW5bvL\n" +
-            "SCQ949n3sBJvhV6aXq4CIH/oEGgvJmKtMEjVKUQg8TrZO6LwQ+0sYfL79Qvm8wL3\n" +
-            "MAoGCCqGSM49BAMCA0cAMEQCID4Q9cc8OQ9tmKnnKZyplPsPipI5apVGkBqFRUSt\n" +
-            "zzM3AiAw5tw3cv/oabDsYdU+lmp5kZ/S3Z97ANAAaHE0AfXe/Q==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=usertrustecccertificationauthority-ev.comodoca.com, OU=COMODO EV SGC SSL,
-    // O=Sectigo Limited, STREET="3rd Floor, 26 Office Village", STREET=Exchange Quay, STREET=Trafford Road,
-    // L=Salford, OID.2.5.4.17=M5 3EQ,
-    // C=GB, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.3=GB, SERIALNUMBER=04058690
-    // Issuer: CN=Sectigo ECC Extended Validation Secure Server CA, O=Sectigo Limited, L=Salford,
-    // ST=Greater Manchester, C=GB
-    // Serial number: 8b72489b7f505a55e2a22659c90ed2ab
-    // Valid from: Sun Sep 29 17:00:00 PDT 2019 until: Tue Dec 28 15:59:59 PST 2021
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGRTCCBeugAwIBAgIRAItySJt/UFpV4qImWckO0qswCgYIKoZIzj0EAwIwgZEx\n" +
-            "CzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNV\n" +
-            "BAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE5MDcGA1UEAxMw\n" +
-            "U2VjdGlnbyBFQ0MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB\n" +
-            "MB4XDTE5MDkzMDAwMDAwMFoXDTIxMTIyODIzNTk1OVowggFBMREwDwYDVQQFEwgw\n" +
-            "NDA1ODY5MDETMBEGCysGAQQBgjc8AgEDEwJHQjEdMBsGA1UEDxMUUHJpdmF0ZSBP\n" +
-            "cmdhbml6YXRpb24xCzAJBgNVBAYTAkdCMQ8wDQYDVQQREwZNNSAzRVExEDAOBgNV\n" +
-            "BAcTB1NhbGZvcmQxFjAUBgNVBAkTDVRyYWZmb3JkIFJvYWQxFjAUBgNVBAkTDUV4\n" +
-            "Y2hhbmdlIFF1YXkxJTAjBgNVBAkTHDNyZCBGbG9vciwgMjYgT2ZmaWNlIFZpbGxh\n" +
-            "Z2UxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDEaMBgGA1UECxMRQ09NT0RPIEVW\n" +
-            "IFNHQyBTU0wxOzA5BgNVBAMTMnVzZXJ0cnVzdGVjY2NlcnRpZmljYXRpb25hdXRo\n" +
-            "b3JpdHktZXYuY29tb2RvY2EuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE\n" +
-            "LTJfEd92Wlg+h/AVtPsMmwX9Puvi+WGCv3sgFRpur8Iy2kGVpXHRQTCn2j9aky4t\n" +
-            "FQGm7OG2klJA/MEeevKVaaOCA28wggNrMB8GA1UdIwQYMBaAFO/BKpUMMtr7czDc\n" +
-            "ihPYFUv3E+j4MB0GA1UdDgQWBBSzrWHzmiHwx2Rrm7SjRC0UegNrKzAOBgNVHQ8B\n" +
-            "Af8EBAMCB4AwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB\n" +
-            "BQUHAwIwSQYDVR0gBEIwQDA1BgwrBgEEAbIxAQIBBQEwJTAjBggrBgEFBQcCARYX\n" +
-            "aHR0cHM6Ly9zZWN0aWdvLmNvbS9DUFMwBwYFZ4EMAQEwVgYDVR0fBE8wTTBLoEmg\n" +
-            "R4ZFaHR0cDovL2NybC5zZWN0aWdvLmNvbS9TZWN0aWdvRUNDRXh0ZW5kZWRWYWxp\n" +
-            "ZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGGBggrBgEFBQcBAQR6MHgwUQYIKwYB\n" +
-            "BQUHMAKGRWh0dHA6Ly9jcnQuc2VjdGlnby5jb20vU2VjdGlnb0VDQ0V4dGVuZGVk\n" +
-            "VmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAjBggrBgEFBQcwAYYXaHR0cDov\n" +
-            "L29jc3Auc2VjdGlnby5jb20wPQYDVR0RBDYwNIIydXNlcnRydXN0ZWNjY2VydGlm\n" +
-            "aWNhdGlvbmF1dGhvcml0eS1ldi5jb21vZG9jYS5jb20wggF/BgorBgEEAdZ5AgQC\n" +
-            "BIIBbwSCAWsBaQB2AO5Lvbd1zmC64UJpH6vhnmajD35fsHLYgwDEe4l6qP3LAAAB\n" +
-            "bYL/SJoAAAQDAEcwRQIhAL7EJt/Rgz6NBnx2v8Hevux3Gpcxy64kaeyLVgFeNqFk\n" +
-            "AiBRf+OWLOtZzEav/oERljrk8hgZB4CR1nj/Tn98cmRrwwB2AFWB1MIWkDYBSuoL\n" +
-            "m1c8U/DA5Dh4cCUIFy+jqh0HE9MMAAABbYL/SIgAAAQDAEcwRQIgVtZZaiBMC2lu\n" +
-            "atBzUHQmOq4qrUQP7nS83cd3VzPhToECIQDnlpOCdaxJwr8C0MtkvYpKSabwBPFL\n" +
-            "ASEkwmOpjuQErAB3ALvZ37wfinG1k5Qjl6qSe0c4V5UKq1LoGpCWZDaOHtGFAAAB\n" +
-            "bYL/SJoAAAQDAEgwRgIhAI8OgzP/kzF1bOJRHU2S/ewij/6HpGPy7Mbm7Hyuv3IU\n" +
-            "AiEAxDmX2FmORlgeerQmQ+ar3D9/TwA9RQckVDu5IrgweREwCgYIKoZIzj0EAwID\n" +
-            "SAAwRQIhAPwQWGWd3oR7YJ7ngCDQ9TAbdPgND51SiR34WfEgaTQtAiAxD4umKm02\n" +
-            "59GEMj5NpyF2ZQEq5mEGcjJNojrn+PC4zg==\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Tue Mar 02 02:59:25 PST 2021", System.out);
-    }
-}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java
deleted file mode 100644
index 40b01309ccb..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8195774 8243321
- * @summary Interoperability tests with Entrust CAs
- * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath EntrustCA OCSP
- * @run main/othervm -Djava.security.debug=certpath EntrustCA CRL
- */
-
-/*
- * Obtain test artifacts for Entrust CA from:
- *
- * EC CA:
- * Valid: https://validec.entrust.net
- * Revoked https://revokedec.entrust.net
- *
- * G4 CA:
- * Valid: https://validg4.entrust.net
- * Revoked: https://revokedg4.entrust.net
- */
-public class EntrustCA {
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-        boolean ocspEnabled = false;
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-            ocspEnabled = true;
-        }
-
-        new Entrust_ECCA().runTest(pathValidator, ocspEnabled);
-        new Entrust_G4().runTest(pathValidator, ocspEnabled);
-    }
-}
-
-class Entrust_ECCA {
-
-    // Owner: CN=Entrust Certification Authority - L1J, OU="(c) 2016 Entrust, Inc. - for authorized use only",
-    // OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
-    // Issuer: CN=Entrust Root Certification Authority - EC1, OU="(c) 2012 Entrust, Inc. - for authorized use only",
-    // OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIID5zCCA2ygAwIBAgIQCoPUgD5+n1EAAAAAUdTB9zAKBggqhkjOPQQDAzCBvzEL\n" +
-            "MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1Nl\n" +
-            "ZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEy\n" +
-            "IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEzMDEGA1UE\n" +
-            "AxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRUMxMB4X\n" +
-            "DTE2MDQwNTIwMTk1NFoXDTM3MTAwNTIwNDk1NFowgboxCzAJBgNVBAYTAlVTMRYw\n" +
-            "FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3Qu\n" +
-            "bmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNiBFbnRydXN0LCBJbmMu\n" +
-            "IC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxLjAsBgNVBAMTJUVudHJ1c3QgQ2Vy\n" +
-            "dGlmaWNhdGlvbiBBdXRob3JpdHkgLSBMMUowdjAQBgcqhkjOPQIBBgUrgQQAIgNi\n" +
-            "AAT14eFXmpQX/dEf7NAxrMH13n0btz1KKvH2S1rROGPAKex2CY8yxznbffK/MbCk\n" +
-            "F7ByYXGs1+8kL5xmTysU/c+YmjOZx2mMSAk2DPw30fijJ3tRrwChZ+TBpgtB6+A5\n" +
-            "MsCjggEuMIIBKjAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAz\n" +
-            "BggrBgEFBQcBAQQnMCUwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVudHJ1c3Qu\n" +
-            "bmV0MDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9jcmwuZW50cnVzdC5uZXQvZWMx\n" +
-            "cm9vdC5jcmwwOwYDVR0gBDQwMjAwBgRVHSAAMCgwJgYIKwYBBQUHAgEWGmh0dHA6\n" +
-            "Ly93d3cuZW50cnVzdC5uZXQvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF\n" +
-            "BQcDAjAdBgNVHQ4EFgQUw/lFA77I+Qs8RTXz63Ls5+jrlJswHwYDVR0jBBgwFoAU\n" +
-            "t2PnGt2N6QimVYOk4GpQQWURQkkwCgYIKoZIzj0EAwMDaQAwZgIxAPnVAOqxKDd7\n" +
-            "v37EBmpPqWCCWBFPKW6HpRx3GUWc9caeQIw8rO2HXYgf92pb/TsJYAIxAJhI0MpR\n" +
-            "z5L42xF1R9UIPfQxCMwgsnWBqIqcfMrMO+2DxQy6GIP3cFFj9gRyxguKWw==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=validec.entrust.net, SERIALNUMBER=D15576572, OID.2.5.4.15=Private Organization, O="Entrust, Inc.",
-    // OID.1.3.6.1.4.1.311.60.2.1.2=Maryland, OID.1.3.6.1.4.1.311.60.2.1.3=US, L=Kanata, ST=Ontario, C=CA
-    // Issuer: CN=Entrust Certification Authority - L1J, OU="(c) 2016 Entrust, Inc. - for authorized use only",
-    // OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFrTCCBTKgAwIBAgIQYtgW4DLwh74AAAAAVqBXkTAKBggqhkjOPQQDAjCBujEL\n" +
-            "MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1Nl\n" +
-            "ZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDE2\n" +
-            "IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEuMCwGA1UE\n" +
-            "AxMlRW50cnVzdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEwxSjAeFw0xODA2\n" +
-            "MjUxMzE1NTdaFw0xOTA2MjUxMzQ1NTBaMIHJMQswCQYDVQQGEwJDQTEQMA4GA1UE\n" +
-            "CBMHT250YXJpbzEPMA0GA1UEBxMGS2FuYXRhMRMwEQYLKwYBBAGCNzwCAQMTAlVT\n" +
-            "MRkwFwYLKwYBBAGCNzwCAQITCE1hcnlsYW5kMRYwFAYDVQQKEw1FbnRydXN0LCBJ\n" +
-            "bmMuMR0wGwYDVQQPExRQcml2YXRlIE9yZ2FuaXphdGlvbjESMBAGA1UEBRMJRDE1\n" +
-            "NTc2NTcyMRwwGgYDVQQDExN2YWxpZGVjLmVudHJ1c3QubmV0MFkwEwYHKoZIzj0C\n" +
-            "AQYIKoZIzj0DAQcDQgAEHQe7lUaAUgIwR9EiLJlhkbx+HfSr22M3JvQD6+fnYgqd\n" +
-            "55e6E1UE45fk92UpqPi1CEbXrdpmWKu1Z470B9cPGaOCAwcwggMDMB4GA1UdEQQX\n" +
-            "MBWCE3ZhbGlkZWMuZW50cnVzdC5uZXQwggF/BgorBgEEAdZ5AgQCBIIBbwSCAWsB\n" +
-            "aQB1AFWB1MIWkDYBSuoLm1c8U/DA5Dh4cCUIFy+jqh0HE9MMAAABZDcxpMkAAAQD\n" +
-            "AEYwRAIgIb0PwjCcNOchJg8Zywz/0Lwm2vEOJUSao6BqNUIsyaYCIElHHexB06LE\n" +
-            "yXWDXO7UqOtWT6uqkdJN8V4TzwT9B4o4AHcA3esdK3oNT6Ygi4GtgWhwfi6OnQHV\n" +
-            "XIiNPRHEzbbsvswAAAFkNzGkvgAABAMASDBGAiEAlxy/kxB9waIifYn+EV550pvA\n" +
-            "C3jUfS/bjsKbcsBH9cQCIQDSHTJORz6fZu8uLFhpV525pw7iHVh2dSn3gpcteObh\n" +
-            "DQB3ALvZ37wfinG1k5Qjl6qSe0c4V5UKq1LoGpCWZDaOHtGFAAABZDcxpTsAAAQD\n" +
-            "AEgwRgIhAPCBqVqSvAEIXMPloV0tfBEEdjRrAhiG407cPqYwt9AFAiEAuQf4R5os\n" +
-            "MLkD3XhxvrTDvnD+PUOf8PzPevsWkuxNqcQwDgYDVR0PAQH/BAQDAgeAMB0GA1Ud\n" +
-            "JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBjBggrBgEFBQcBAQRXMFUwIwYIKwYB\n" +
-            "BQUHMAGGF2h0dHA6Ly9vY3NwLmVudHJ1c3QubmV0MC4GCCsGAQUFBzAChiJodHRw\n" +
-            "Oi8vYWlhLmVudHJ1c3QubmV0L2wxai1lYzEuY2VyMDMGA1UdHwQsMCowKKAmoCSG\n" +
-            "Imh0dHA6Ly9jcmwuZW50cnVzdC5uZXQvbGV2ZWwxai5jcmwwSgYDVR0gBEMwQTA2\n" +
-            "BgpghkgBhvpsCgECMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZW50cnVzdC5u\n" +
-            "ZXQvcnBhMAcGBWeBDAEBMB8GA1UdIwQYMBaAFMP5RQO+yPkLPEU18+ty7Ofo65Sb\n" +
-            "MB0GA1UdDgQWBBT+J7OhS6gskCanmOGnx10DPSF8ATAJBgNVHRMEAjAAMAoGCCqG\n" +
-            "SM49BAMCA2kAMGYCMQCQLUQABT74TmdHzAtB97uNF5+Zy15wzkmlKeRSOXCIf2C5\n" +
-            "YKjsgdkR1OdzZXcpjNgCMQDfWcdPhodNXZC4l1lLPOPaTzPPw6uVqqoITQlc6r1t\n" +
-            "dRkkD6K9ii/X8EtwoFp7s80=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revokedec.entrust.net, SERIALNUMBER=115868500, OID.2.5.4.15=Private Organization, O="Entrust, Inc.",
-    // OID.1.3.6.1.4.1.311.60.2.1.2=Texas, OID.1.3.6.1.4.1.311.60.2.1.3=US, L=Kanata, ST=Ontario, C=CA
-    // Issuer: CN=Entrust Certification Authority - L1J, OU="(c) 2016 Entrust, Inc. - for authorized use only",
-    // OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGJzCCBaygAwIBAgIRAM0WDfag1taIAAAAAFagJ5gwCgYIKoZIzj0EAwIwgbox\n" +
-            "CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9T\n" +
-            "ZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAx\n" +
-            "NiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxLjAsBgNV\n" +
-            "BAMTJUVudHJ1c3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBMMUowHhcNMTcw\n" +
-            "NTI0MTcwNzA4WhcNMTkwNTI0MTczNjU1WjCByDELMAkGA1UEBhMCQ0ExEDAOBgNV\n" +
-            "BAgTB09udGFyaW8xDzANBgNVBAcTBkthbmF0YTETMBEGCysGAQQBgjc8AgEDEwJV\n" +
-            "UzEWMBQGCysGAQQBgjc8AgECEwVUZXhhczEWMBQGA1UEChMNRW50cnVzdCwgSW5j\n" +
-            "LjEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24xEjAQBgNVBAUTCTExNTg2\n" +
-            "ODUwMDEeMBwGA1UEAxMVcmV2b2tlZGVjLmVudHJ1c3QubmV0MFkwEwYHKoZIzj0C\n" +
-            "AQYIKoZIzj0DAQcDQgAEN5MP/59yrs9uwVM/Mrc8IuHonMChAZgN2twwvh8KTnR2\n" +
-            "3stfem/R+NtLccq+4ds1+8ktnXgP7u1x0as6IJOH1qOCA4EwggN9MCAGA1UdEQQZ\n" +
-            "MBeCFXJldm9rZWRlYy5lbnRydXN0Lm5ldDCCAfcGCisGAQQB1nkCBAIEggHnBIIB\n" +
-            "4wHhAHYA7ku9t3XOYLrhQmkfq+GeZqMPfl+wctiDAMR7iXqo/csAAAFcO4iiogAA\n" +
-            "BAMARzBFAiAgHVpryyNVgnsUIihu+5DC2/vuP8Cy5iXq8NhCBXg8UgIhAKi5jImT\n" +
-            "f1FJksvHboc0EZh9TWhWljVZ6E5jB2CL+qzeAHcAVhQGmi/XwuzT9eG9RLI+x0Z2\n" +
-            "ubyZEVzA75SYVdaJ0N0AAAFcO4ij9QAABAMASDBGAiEA4B2p2726ISSkKC9WVlzj\n" +
-            "BVwYZ1Hr7mTjPrFqkoGpEHYCIQC5iuInkJXGBANLTH06BHIQkkr4KnFRl9QBOSw4\n" +
-            "b+kNqgB1AN3rHSt6DU+mIIuBrYFocH4ujp0B1VyIjT0RxM227L7MAAABXDuIpkcA\n" +
-            "AAQDAEYwRAIgQ9ssw19wIhHWW6IWgwnIyB7e30HacBNX6S1eQ3GUX04CICffGj3A\n" +
-            "WWmK9lixmk35YklMnSXNqHQezSYRiCYtXxejAHcApLkJkLQYWBSHuxOizGdwCjw1\n" +
-            "mAT5G9+443fNDsgN3BAAAAFcO4inUwAABAMASDBGAiEA+8T9tpPw/mU/STsNv0oz\n" +
-            "8Nla21fKlpEOyWqDKWPSUeYCIQCwI5tDyyaJtyFY9/OVqLG+BKPKjscUtTqGJYl4\n" +
-            "XbOo1jAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF\n" +
-            "BwMCMGMGCCsGAQUFBwEBBFcwVTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZW50\n" +
-            "cnVzdC5uZXQwLgYIKwYBBQUHMAKGImh0dHA6Ly9haWEuZW50cnVzdC5uZXQvbDFq\n" +
-            "LWVjMS5jZXIwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5lbnRydXN0Lm5l\n" +
-            "dC9sZXZlbDFqLmNybDBKBgNVHSAEQzBBMDYGCmCGSAGG+mwKAQIwKDAmBggrBgEF\n" +
-            "BQcCARYaaHR0cDovL3d3dy5lbnRydXN0Lm5ldC9ycGEwBwYFZ4EMAQEwHwYDVR0j\n" +
-            "BBgwFoAUw/lFA77I+Qs8RTXz63Ls5+jrlJswHQYDVR0OBBYEFIj28ytR8ulo1p2t\n" +
-            "ZnBQOLK0rlLUMAkGA1UdEwQCMAAwCgYIKoZIzj0EAwIDaQAwZgIxANzqGRI0en5P\n" +
-            "gSUDcdwoQSNKrBPBfGz2AQVLHAXsxvIlGhKZAQtM49zxA8AdFy/agwIxAMEjJH6A\n" +
-            "4UbcGZc40eYu6wUbAxiUDD3gwSElNQ8Z6IhNLPCCdMM6KZORyaagAcXn4A==\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator, boolean ocspEnabled) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Wed May 24 10:39:28 PDT 2017", System.out);
-    }
-}
-
-class Entrust_G4 {
-
-    // Owner: CN=Entrust Certification Authority - L1N, OU="(c) 2014 Entrust, Inc. - for authorized use only",
-    // OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
-    // Issuer: CN=Entrust Root Certification Authority - G4, OU="(c) 2015 Entrust, Inc. - for authorized use only",
-    // OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGMjCCBBqgAwIBAgIRAKvsd/8bQQwHAAAAAFVl2AUwDQYJKoZIhvcNAQELBQAw\n" +
-            "gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL\n" +
-            "Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg\n" +
-            "MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw\n" +
-            "BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0\n" +
-            "MB4XDTE3MTEyMjIwMDQyMFoXDTMwMTIyMjIwMzQyMFowgboxCzAJBgNVBAYTAlVT\n" +
-            "MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1\n" +
-            "c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNCBFbnRydXN0LCBJ\n" +
-            "bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxLjAsBgNVBAMTJUVudHJ1c3Qg\n" +
-            "Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBMMU4wggEiMA0GCSqGSIb3DQEBAQUA\n" +
-            "A4IBDwAwggEKAoIBAQDcSG+caYQ4xcvf+dt8bgCEHorO0g5j0H1NOtQzRXgUoG8y\n" +
-            "QuRbJX9swyKqQZbsc18YvTV8OKA/uSNE46Jvq47TFPojWWTVLbNDqpM07e4EFYKs\n" +
-            "A9NFzAUngijnf3ivnXA6iNPAMXaEhXmhY/YFjk8NoM7Y1PFsA0oj5hamKQ06iO/j\n" +
-            "gvBScLmnQ1ju9Qj9IGIg18UL5AJNw0frspLUQBYVrLGaqAy5Nl2BUJKaZ4vnSLvP\n" +
-            "nk6YrB15mo1phHae10Ba4fx7R3z8IZ/hby4OXTy/KZpu107VEQPAwTuDK8ZXxB5y\n" +
-            "0DSzi4vaw27aLrUsq4aFqUo03gEfC31vWW76TNkFAgMBAAGjggErMIIBJzAOBgNV\n" +
-            "HQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUEFjAUBggrBgEF\n" +
-            "BQcDAQYIKwYBBQUHAwIwOwYDVR0gBDQwMjAwBgRVHSAAMCgwJgYIKwYBBQUHAgEW\n" +
-            "Gmh0dHA6Ly93d3cuZW50cnVzdC5uZXQvcnBhMDMGCCsGAQUFBwEBBCcwJTAjBggr\n" +
-            "BgEFBQcwAYYXaHR0cDovL29jc3AuZW50cnVzdC5uZXQwMAYDVR0fBCkwJzAloCOg\n" +
-            "IYYfaHR0cDovL2NybC5lbnRydXN0Lm5ldC9nNGNhLmNybDAdBgNVHQ4EFgQU7kfR\n" +
-            "hXHx/S23P7s+Y1h3F0lADpUwHwYDVR0jBBgwFoAUnzjEViPDOeigcWzoVEzk6Dqx\n" +
-            "v2cwDQYJKoZIhvcNAQELBQADggIBACMeFFgsWmC7h6D1v8DJUkOpm/m5UhVhO0hb\n" +
-            "pQMQKMhKkl744Y9SWG4WNmpQy743TTciEJPZFhc7ke2R6VmK8ZJUqro2awOw1RWZ\n" +
-            "OtHla59Btf1NQd41vOVdU+qFhs8lFfXg9sK7YHTrfxHtMXLoGnkkamK3xJgn7sXa\n" +
-            "/zUvUDBTpDCXcpO9SyHoKIQswmkIPpRyIdPF4biRdR3N+9MYmlfqN/Nk3OEZ73xZ\n" +
-            "AUZP6Gu+f9cEiHTA8NdYHCPLJWyFnIHWK+QuTFEnKYnOYxCeroLBNOO64e8JWZ39\n" +
-            "kZ22BBXhHzqOCCczS7JOJTRF+JgvWuxbFwRstj8qf3fE+JndWmq2FC4hTHtpuK5K\n" +
-            "ENuiRm5gdkXfsXmB+qB6y5gaajiTIMscGIcZIKTe2YdKrLoicvEz8k+loM7favik\n" +
-            "vzFioTNTDHYGx3mkfElBE7ycY8n+jZE3QBBv33k28MeQi7XNgEaMc4tYwoZIdE9A\n" +
-            "xVccXTzEQzka82dOkRB1dU0XZId9XAWv+CtNc2TjF6Wgx2seA/c6H8S0IfgQBIV2\n" +
-            "8iN2wZns2QFdawkdy3hMUqPnA++kuGhLW3GemsIY5dP/WxY8rd+OfLb/Ks9T1pCd\n" +
-            "28t7PQRcQsgkYmouzrOW9ASBvYqLLdhl4y+fFXff8RkPIKMNoYP06WJvRKmky9R/\n" +
-            "41/nXRas\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=validg4.entrust.net, SERIALNUMBER=1913605, OID.2.5.4.15=Private Organization,
-    // O=Entrust Datacard Limited, OID.1.3.6.1.4.1.311.60.2.1.2=Ontario, OID.1.3.6.1.4.1.311.60.2.1.3=CA,
-    // L=Ottawa, ST=Ontario, C=CA
-    // Issuer: CN=Entrust Certification Authority - L1N, OU="(c) 2014 Entrust, Inc. - for authorized use only",
-    // OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
-    // Serial number: 83790beb78eeb966007ad3dbf11d570
-    // Valid from: Fri May 29 13:29:00 PDT 2020 until: Sun Aug 28 13:34:23 PDT 2022
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFpjCCBI6gAwIBAgIQCDeQvreO65ZgB609vxHVcDANBgkqhkiG9w0BAQsFADCB\n" +
-            "ujELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsT\n" +
-            "H1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAy\n" +
-            "MDE0IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEuMCwG\n" +
-            "A1UEAxMlRW50cnVzdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEwxTjAeFw0y\n" +
-            "MDA1MjkyMDI5MDBaFw0yMjA4MjgyMDM0MjNaMIHRMQswCQYDVQQGEwJDQTEQMA4G\n" +
-            "A1UECBMHT250YXJpbzEPMA0GA1UEBxMGT3R0YXdhMRMwEQYLKwYBBAGCNzwCAQMT\n" +
-            "AkNBMRgwFgYLKwYBBAGCNzwCAQITB09udGFyaW8xITAfBgNVBAoTGEVudHJ1c3Qg\n" +
-            "RGF0YWNhcmQgTGltaXRlZDEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x\n" +
-            "EDAOBgNVBAUTBzE5MTM2MDUxHDAaBgNVBAMTE3ZhbGlkZzQuZW50cnVzdC5uZXQw\n" +
-            "ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC508f77Kp/kfbqs9DHfa+V\n" +
-            "977gsVzI78TzfN4tF3ujwnPgd9mzLArM71VJvceOJUto7ywRasxmFxOLHf7WN2Kg\n" +
-            "U1yk/Kp9WUNfjmjIkI+JfCTkaz1RztpW85GNN9SL/W2yFIxv0ijAiGoQeC7J80Ni\n" +
-            "+y31Q5+M0oPMzngBOtD8LpyVt+/lSwUvxwhlChu7LWpIFmBUriILkvh11vxaItZV\n" +
-            "Jm4g8amE33/eXPFjZxB4ABQpBMC4QVg10UP+DpimZuJa6oQZfoNUjDF2yKlyrA+z\n" +
-            "s3kK8SXzJhE5LQxBp158jAoCVZuER08cumw3wvXI5NGzkzDxpTGacDO0bDo2ULpN\n" +
-            "AgMBAAGjggGNMIIBiTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH\n" +
-            "AwIGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFOA38RC6Sv6hMUgY\n" +
-            "eLACjvqO13vsMB8GA1UdIwQYMBaAFO5H0YVx8f0ttz+7PmNYdxdJQA6VMGgGCCsG\n" +
-            "AQUFBwEBBFwwWjAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZW50cnVzdC5uZXQw\n" +
-            "MwYIKwYBBQUHMAKGJ2h0dHA6Ly9haWEuZW50cnVzdC5uZXQvbDFuLWNoYWluMjU2\n" +
-            "LmNlcjAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3JsLmVudHJ1c3QubmV0L2xl\n" +
-            "dmVsMW4uY3JsMB4GA1UdEQQXMBWCE3ZhbGlkZzQuZW50cnVzdC5uZXQwSwYDVR0g\n" +
-            "BEQwQjA3BgpghkgBhvpsCgECMCkwJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3LmVu\n" +
-            "dHJ1c3QubmV0L3JwYTAHBgVngQwBATANBgkqhkiG9w0BAQsFAAOCAQEAOExxxxEk\n" +
-            "iAZZ4RJSWwI/CBQYAlUmd2wb/SBk9eYNAu/UL0XiAbwbOjH2dV6JHwAdwn0eoPR1\n" +
-            "KK/E1/OVoVibVBdxLMISPqdodRgHps6kGCOJxS8Zz8d3AEvx27EQ/Hg/EwIJZsUK\n" +
-            "dyb48V6a3XzExqLiwGu9oI9Ozm3/mo11ixmhvSFXH+FZf93qvvCSO+XTGGrLv5ja\n" +
-            "Tkazn/HgnwUBHd1TiO0jLhAdc+rZyd/SDjXMAXsa99zVfc2MY0Mb8+MohNHOwqYg\n" +
-            "tuYuirvtt9P0oteauL+iEBCRcqsmJaHGeaEyJH2QMxC5W22KpW245eHisW7rMoGQ\n" +
-            "9nbGmfe97p7bHQ==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revokedg4.entrust.net, SERIALNUMBER=1913605, OID.2.5.4.15=Private Organization,
-    // O=Entrust Datacard Limited, OID.1.3.6.1.4.1.311.60.2.1.2=Ontario, OID.1.3.6.1.4.1.311.60.2.1.3=CA,
-    // L=Ottawa, ST=Ontario, C=CA
-    // Issuer: CN=Entrust Certification Authority - L1N, OU="(c) 2014 Entrust, Inc. - for authorized use only",
-    // OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
-    // Serial number: 24c5f46412b9dcc242a93017176979d6
-    // Valid from: Fri May 29 13:36:00 PDT 2020 until: Sun Aug 28 13:40:43 PDT 2022
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFqjCCBJKgAwIBAgIQJMX0ZBK53MJCqTAXF2l51jANBgkqhkiG9w0BAQsFADCB\n" +
-            "ujELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsT\n" +
-            "H1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAy\n" +
-            "MDE0IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEuMCwG\n" +
-            "A1UEAxMlRW50cnVzdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEwxTjAeFw0y\n" +
-            "MDA1MjkyMDM2MDBaFw0yMjA4MjgyMDQwNDNaMIHTMQswCQYDVQQGEwJDQTEQMA4G\n" +
-            "A1UECBMHT250YXJpbzEPMA0GA1UEBxMGT3R0YXdhMRMwEQYLKwYBBAGCNzwCAQMT\n" +
-            "AkNBMRgwFgYLKwYBBAGCNzwCAQITB09udGFyaW8xITAfBgNVBAoTGEVudHJ1c3Qg\n" +
-            "RGF0YWNhcmQgTGltaXRlZDEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x\n" +
-            "EDAOBgNVBAUTBzE5MTM2MDUxHjAcBgNVBAMTFXJldm9rZWRnNC5lbnRydXN0Lm5l\n" +
-            "dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6Bvaj7EG752e15UQH9\n" +
-            "4o8+660Gi3caUAAu45vZebO7EfRgrz0zyalpiexmQzocGn6Zog2yVqmMZjrMY11a\n" +
-            "q96s0pzVKImnA/787G7J5lRncP+PM6/WGtUUGS2hHiifoW5Ya/kcI1uk6EDT0leb\n" +
-            "HIedOiwcfDkq38g5ckuWNae24DAD8AM9XBJXMuNbuiqo03wMlDL3Jif8wNQfpmPD\n" +
-            "b+KR6IwGJdYwLBMoMcPmZF0rykW3YTO2NTDGCwvT8zzvjIKp8caRkI6pfkKmc89U\n" +
-            "Nvgbk/d9JEsgQLbYmRKVnhtnt756U7v3+0kZITxzfsBvQZ6zC7X4FAcTN1302RGn\n" +
-            "NGsCAwEAAaOCAY8wggGLMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEF\n" +
-            "BQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULjRc9DEsa0kD\n" +
-            "uhKNo6cCqQ+mPjgwHwYDVR0jBBgwFoAU7kfRhXHx/S23P7s+Y1h3F0lADpUwaAYI\n" +
-            "KwYBBQUHAQEEXDBaMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5lbnRydXN0Lm5l\n" +
-            "dDAzBggrBgEFBQcwAoYnaHR0cDovL2FpYS5lbnRydXN0Lm5ldC9sMW4tY2hhaW4y\n" +
-            "NTYuY2VyMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9jcmwuZW50cnVzdC5uZXQv\n" +
-            "bGV2ZWwxbi5jcmwwIAYDVR0RBBkwF4IVcmV2b2tlZGc0LmVudHJ1c3QubmV0MEsG\n" +
-            "A1UdIAREMEIwNwYKYIZIAYb6bAoBAjApMCcGCCsGAQUFBwIBFhtodHRwczovL3d3\n" +
-            "dy5lbnRydXN0Lm5ldC9ycGEwBwYFZ4EMAQEwDQYJKoZIhvcNAQELBQADggEBAGab\n" +
-            "wtgpooQW3YL2Cqk9RDJFbNct5BSbzgY9qN1TOe4L7gbjV0BJBCcsHOCjvbgEuzME\n" +
-            "FC/kAmBu7eMnKVAqCCsWaI8XV7xB7P/BqHpvf9LI/GyHg4wCYdxgFGBXHOjlSy+8\n" +
-            "YWRM5UnFUknqbj1B4u2/U+U3X66QXi+MWrmBdjpcMahpY5zP1Bh90OmIc8DY4arf\n" +
-            "widObgJe2H/VFScudLf5JMpBso2v772GYTRr5Tqqq3ouS9WvDf0NBvoStt1oiUMP\n" +
-            "oowesfNiaYa/rZzWRlhYNs089KUeLhjOZswtIY5LCyy+Wt3CHgXljGEQFgi7p59s\n" +
-            "gk0aMRYM9Gri26VbD5A=\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator, boolean ocspEnabled) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Fri May 29 13:42:13 PDT 2020", System.out);
-    }
-}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GlobalSignR6CA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GlobalSignR6CA.java
deleted file mode 100644
index 244ef26c2ca..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GlobalSignR6CA.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
- /*
- * @test
- * @bug 8216577 8249176
- * @summary Interoperability tests with GlobalSign R6 CA
- * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath GlobalSignR6CA OCSP
- * @run main/othervm -Djava.security.debug=certpath GlobalSignR6CA CRL
- */
-
- /*
- *
- * Obtain TLS test artifacts for GlobalSign R6 CA from:
- *
- * Valid TLS Certificates:
- * https://valid.r6.roots.globalsign.com/
- *
- * Revoked TLS Certificates:
- * https://revoked.r6.roots.globalsign.com/
- */
-public class GlobalSignR6CA {
-
-    // Owner: CN=GlobalSign Atlas R6 EV TLS CA 2020, O=GlobalSign nv-sa, C=BE
-    // Issuer: CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R6
-    // Serial number: 7803182afbecd89eb19309bb4a25bdaa
-    // Valid from: Mon Jul 27 17:00:00 PDT 2020 until: Sat Jul 27 17:00:00 PDT 2030
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGwDCCBKigAwIBAgIQeAMYKvvs2J6xkwm7SiW9qjANBgkqhkiG9w0BAQwFADBM\n" +
-            "MSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xv\n" +
-            "YmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjAeFw0yMDA3MjgwMDAwMDBaFw0z\n" +
-            "MDA3MjgwMDAwMDBaMFUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWdu\n" +
-            "IG52LXNhMSswKQYDVQQDEyJHbG9iYWxTaWduIEF0bGFzIFI2IEVWIFRMUyBDQSAy\n" +
-            "MDIwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtQ8IiN2Ukq/Clynv\n" +
-            "HhqugFQg5SXIyVO4ZRnxo0hNnaek78LRn4Bkaqcwv6Ls0Ftn4bK2zvBaS1zsfUTA\n" +
-            "vfup/s86zHCRvOqAL8zO/WiMV1G5ikHSlD6RtpIOHRX4y0oIGW59ADY0ANwDeDWL\n" +
-            "x/RgSltuQIqeGXwZnyZFwWtxVkSE4p5tn2Lb6USzwcD22taiXmeYsPMWfJfmWPRj\n" +
-            "ZuYBgxn6tvUVRO+ZzAUKEEaJK/LVLieAVEmfR6anEJ/gWczxz12Lwu6qF5ov0OQt\n" +
-            "AP0rfruyje/EJt6xHjpJ2OgDzCWYstXOpRPDHYS3klpaRbowAlpJdYMRAqY5CNiP\n" +
-            "RAx3wvsWCVI5UkzKVD6RuHHVpfzfdKAfsjHa/aSunHtTpE+NUf3Q/3qHXW5cyDnP\n" +
-            "Jt6VTVVVevjTquwH1xrUigukDbeopV1owsqIA5aw2io7RbBorwPBA0veinHN4vP9\n" +
-            "X8jbTiIiLjlfJOnHZe7pIhb3T9WCqhwwsBNPQpKizGHCj5kL2UJe7N5u4RywFOZE\n" +
-            "l5mbTX4zO6Vj3WM9ZVbZgXVNwEjS5mYq/rvC1yr9obNUJ8br6JAd2ZBnzhA5Zn4s\n" +
-            "bIP99TlUBZWczw+vPM7g1S4e4cyd+8CULVhVs87QlyvwWnRbH7fXZo8xLzhzMCjB\n" +
-            "8Y0cNdL1S6QKrrhC6Pf6tV/JU20CAwEAAaOCAZMwggGPMA4GA1UdDwEB/wQEAwIB\n" +
-            "hjAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwEgYDVR0TAQH/BAgwBgEB\n" +
-            "/wIBADAdBgNVHQ4EFgQUhNwhC8eoXXKXhId+8tW2+nFWTvswHwYDVR0jBBgwFoAU\n" +
-            "rmwFo5MT4qLn4tcc1sfwf8hnU6AwewYIKwYBBQUHAQEEbzBtMC4GCCsGAQUFBzAB\n" +
-            "hiJodHRwOi8vb2NzcDIuZ2xvYmFsc2lnbi5jb20vcm9vdHI2MDsGCCsGAQUFBzAC\n" +
-            "hi9odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9yb290LXI2LmNy\n" +
-            "dDA2BgNVHR8ELzAtMCugKaAnhiVodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL3Jv\n" +
-            "b3QtcjYuY3JsMFUGA1UdIAROMEwwQQYJKwYBBAGgMgEBMDQwMgYIKwYBBQUHAgEW\n" +
-            "Jmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMAcGBWeBDAEB\n" +
-            "MA0GCSqGSIb3DQEBDAUAA4ICAQBD+97H2N1BgiliKQFrb+jcWjkmPP8cdF/eiBW1\n" +
-            "cEzOOhsuVqxbyIk8qdw3UueHSDjqWUjHYoo8TV3DLqUXmIy1Ks3MkESsFKeLpEbk\n" +
-            "VMZga0lbDnqqRc5a2yzrXmwVYDeWVeD20s5vPoKCnFzmcR+2v9TKD4bI6XWVl84q\n" +
-            "GzfFRVdY9f8KN+7891+47ZhptvxtNqJKVI2O+EAP/PvTpwes983LkFzsev4/+Qxs\n" +
-            "EszD7/pE+Byj3t9CMat2XoX0jfJjbEXgewFb/gCwHvqNKLNWrYfE9qN8b6qm4xQk\n" +
-            "qGQKTrFKsBJx4TU+h10qXDhpmOBswiJqoG16XCV32oSn0JUYvXVAvP6YjueOv/jr\n" +
-            "0ZMTWGh8wCz6v3XBaXR0rxDAz9GImpU+xPx2XjuHac7OnYbN+i8p7cJPUxABjHiA\n" +
-            "LWXIZtCn5ziCfvYC6+SCp8x9TPJzAIfJ4NKv/8SpvvzuchVkAQqlQaGFBEdkX84R\n" +
-            "I/WYYG+2BliFIpbQnfljYWCURbfsYz7+Zxb94+4yzva49p8T6lALoK3s2kqIVLKN\n" +
-            "s6qAnk/qX6JihkaR3W+iViHMC5tqQX/pd8QIXccF3PA2OdeNGU4iUNZqUbYB4VZd\n" +
-            "AaOaeaUl0LwAta6DB5w344eUIqDgaitSwQZBnxppmwL3tGzP1ero2e2RvBmphbxI\n" +
-            "atIdxA==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=valid.r6.roots.globalsign.com,
-    // O=GMO GlobalSign LTD, STREET="Springfield House, Sandling Road", OID.2.5.4.17=ME14 2LP, L=Maidstone, ST=Kent,
-    // C=GB, SERIALNUMBER=04705639, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.3=GB
-    // Issuer: CN=GlobalSign Atlas R6 EV TLS CA 2020, O=GlobalSign nv-sa, C=BE
-    // Serial number: 1aff2829dd8bf07aa65a7b3c920ca4b
-    // Valid from: Thu Aug 27 00:20:06 PDT 2020 until: Tue Sep 28 00:20:06 PDT 2021
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHyjCCBbKgAwIBAgIQAa/ygp3YvweqZaezySDKSzANBgkqhkiG9w0BAQsFADBV\n" +
-            "MQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTErMCkGA1UE\n" +
-            "AxMiR2xvYmFsU2lnbiBBdGxhcyBSNiBFViBUTFMgQ0EgMjAyMDAeFw0yMDA4Mjcw\n" +
-            "NzIwMDZaFw0yMTA5MjgwNzIwMDZaMIH6MRMwEQYLKwYBBAGCNzwCAQMTAkdCMR0w\n" +
-            "GwYDVQQPDBRQcml2YXRlIE9yZ2FuaXphdGlvbjERMA8GA1UEBRMIMDQ3MDU2Mzkx\n" +
-            "CzAJBgNVBAYTAkdCMQ0wCwYDVQQIDARLZW50MRIwEAYDVQQHDAlNYWlkc3RvbmUx\n" +
-            "ETAPBgNVBBEMCE1FMTQgMkxQMSkwJwYDVQQJDCBTcHJpbmdmaWVsZCBIb3VzZSwg\n" +
-            "U2FuZGxpbmcgUm9hZDEbMBkGA1UECgwSR01PIEdsb2JhbFNpZ24gTFREMSYwJAYD\n" +
-            "VQQDDB12YWxpZC5yNi5yb290cy5nbG9iYWxzaWduLmNvbTCCASIwDQYJKoZIhvcN\n" +
-            "AQEBBQADggEPADCCAQoCggEBAMOxbh7fZVLUB06xxNBePa9vpOuAS5km1w8ngsTu\n" +
-            "SvH1LZnPFd4nu40fi8bPbHd4J2oRWZ28f7LKVQgBupn9knrTQxfTV361WpmwqCcH\n" +
-            "MxornKyHx4t5uGrtTtX2fYoNQQk330dIKAfKpUrOiaDybB7irG2JEHdGD3Iv7ud8\n" +
-            "FXfXgXte26mUDX3XeCvE0pbuNKpTKApqOeojlVR6TCNB1n6KGYLMIz/1ow6XBZ64\n" +
-            "1zKG/9o0gSHelkUHGmGLzOAE5YpkhwzhpND9opycnfieHuy5BcoBIpeMqGNwOsGu\n" +
-            "p+nhFz+N8mPjSjZEf0qx+FLF2cBmNFknJJCdnV7OYfKZHE0CAwEAAaOCAu4wggLq\n" +
-            "MCgGA1UdEQQhMB+CHXZhbGlkLnI2LnJvb3RzLmdsb2JhbHNpZ24uY29tMA4GA1Ud\n" +
-            "DwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0O\n" +
-            "BBYEFLZolpEC8/bF44e/gnh4StQ9+URwMFUGA1UdIAROMEwwBwYFZ4EMAQEwQQYJ\n" +
-            "KwYBBAGgMgEBMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24u\n" +
-            "Y29tL3JlcG9zaXRvcnkvMAwGA1UdEwEB/wQCMAAwgZoGCCsGAQUFBwEBBIGNMIGK\n" +
-            "MD4GCCsGAQUFBzABhjJodHRwOi8vb2NzcC5nbG9iYWxzaWduLmNvbS9jYS9nc2F0\n" +
-            "bGFzcjZldnRsc2NhMjAyMDBIBggrBgEFBQcwAoY8aHR0cDovL3NlY3VyZS5nbG9i\n" +
-            "YWxzaWduLmNvbS9jYWNlcnQvZ3NhdGxhc3I2ZXZ0bHNjYTIwMjAuY3J0MB8GA1Ud\n" +
-            "IwQYMBaAFITcIQvHqF1yl4SHfvLVtvpxVk77MEYGA1UdHwQ/MD0wO6A5oDeGNWh0\n" +
-            "dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vY2EvZ3NhdGxhc3I2ZXZ0bHNjYTIwMjAu\n" +
-            "Y3JsMIIBAwYKKwYBBAHWeQIEAgSB9ASB8QDvAHYAfT7y+I//iFVoJMLAyp5SiXkr\n" +
-            "xQ54CX8uapdomX4i8NcAAAF0Lsm7CwAABAMARzBFAiB0fLxAlPzkPxZOVj7c8OFc\n" +
-            "YwycekW0Mo+sRm/BQYoeOgIhAK2lNW7ebraH//ZlLQD7dyzWCO+kgmkQo+mqdm1x\n" +
-            "4P15AHUAb1N2rDHwMRnYmQCkURX/dxUcEdkCwQApBo2yCJo32RMAAAF0Lsm7JAAA\n" +
-            "BAMARjBEAiALOZvdNiA9q1Ysr7ejTGdivUqNJNm9KftmGXwHFGwf2QIgDodNLmbZ\n" +
-            "JFGt8l5ul0fHw2Gn8KqhRUW6CMRT58svhcswDQYJKoZIhvcNAQELBQADggIBAByb\n" +
-            "hoL/sArmkNjTFiEEBocMfb+brgRQdb08NKC1BDxGnfIFjUmOFzI2SVgtBmcoF8FI\n" +
-            "0WyXQv6ZxVE01DFZpeZpsJJYfBAjg9NR4/B7UjajvOJwQNpaciAGQ0ZzTu+SmHja\n" +
-            "jIiC2KqiA7Me2MoUne6hhxZ3dXEneIml8hnbTf2mjSBCVpQqyf2goslhGduPitI6\n" +
-            "guTtVD2PVaNCVkjlRn4Euspl2JjQWzGcEruqGyQN+Bu4yt1hsD4Jj6V9Hmzo8Vrd\n" +
-            "5LUxFPRGIgCUDiiwnENVsQB/D24y3IapPkojujrvsVsmQN42GIgOY5tLK/8cCziD\n" +
-            "vf0GzZnmL1D2ezi3TaBj+XBWFcAyF2Y9AnVRmC9CrVcp6EX0KhD4g9ZgbpJZpVlk\n" +
-            "G3xfOiZWTeqLnQhCMXcdcutWIwXAX5gueyF1t545vECCE4PeGZNAeWqdbrj7xaS8\n" +
-            "3rKQdgwF9r6p7F5HHwEVCckhovEYU4DNFzYb9n/YmC3hmskFB1keTYqydKUYEGZ5\n" +
-            "fvLvsjRj9xwOCqIs5j1vuKw2CaqmHxrfYaDMMSZPq/iYrOWrf72wZIvtnAHePt3X\n" +
-            "atQMqNbDMQrjul31ljDP9CIbbtuZSkSACyMxiC10l4uTTLQiTxtZPkwIazOjnbBe\n" +
-            "A4fruOEQ2k1gu5oFgqmo+xuclOKNjwd/RkK4FXnD\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked.r6.roots.globalsign.com,
-    // O=GMO GlobalSign LTD, STREET="Springfield House, Sandling Road", OID.2.5.4.17=ME14 2LP, L=Maidstone, ST=Kent,
-    // C=GB, SERIALNUMBER=04705639, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.3=GB
-    // Issuer: CN=GlobalSign Atlas R6 EV TLS CA 2020, O=GlobalSign nv-sa, C=BE
-    // Serial number: 1df30d84796ac20c47da63b8e681e8f
-    // Valid from: Thu Aug 27 00:37:53 PDT 2020 until: Tue Sep 28 00:37:53 PDT 2021
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHzzCCBbegAwIBAgIQAd8w2EeWrCDEfaY7jmgejzANBgkqhkiG9w0BAQsFADBV\n" +
-            "MQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTErMCkGA1UE\n" +
-            "AxMiR2xvYmFsU2lnbiBBdGxhcyBSNiBFViBUTFMgQ0EgMjAyMDAeFw0yMDA4Mjcw\n" +
-            "NzM3NTNaFw0yMTA5MjgwNzM3NTNaMIH8MRMwEQYLKwYBBAGCNzwCAQMTAkdCMR0w\n" +
-            "GwYDVQQPDBRQcml2YXRlIE9yZ2FuaXphdGlvbjERMA8GA1UEBRMIMDQ3MDU2Mzkx\n" +
-            "CzAJBgNVBAYTAkdCMQ0wCwYDVQQIDARLZW50MRIwEAYDVQQHDAlNYWlkc3RvbmUx\n" +
-            "ETAPBgNVBBEMCE1FMTQgMkxQMSkwJwYDVQQJDCBTcHJpbmdmaWVsZCBIb3VzZSwg\n" +
-            "U2FuZGxpbmcgUm9hZDEbMBkGA1UECgwSR01PIEdsb2JhbFNpZ24gTFREMSgwJgYD\n" +
-            "VQQDDB9yZXZva2VkLnI2LnJvb3RzLmdsb2JhbHNpZ24uY29tMIIBIjANBgkqhkiG\n" +
-            "9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvaNcp7bzmm02Z0S92ZzJ/ul3uQWz3EnBORcI\n" +
-            "RuEzm0HY4t0n9DGnxpxOi/aWGX/Vj7qZC4m3G7uCE7dMy6CfXTwh4UZ+nPVijImo\n" +
-            "q/msJzmju/pk8HVeOEhk88yvwfzmzYLjoQagmHnDUSQULEmNWihejIh4B61qx4SI\n" +
-            "UoBPoBgqDfZW27HkJeqNAO6rljZTZwLenJesm2QMjebYaKxQBi3fLy0Lua2sxTik\n" +
-            "fbT3swEPN9xxvMomtNNM2tJwdExL2RpO8dObUe37ep6roG7gWh8NYDKMo6j9Rn9e\n" +
-            "f0S9jwkcRM2kZSHR09HSu8ULBgP+KYa8DDpOyt+HO+2G57MhbQIDAQABo4IC8TCC\n" +
-            "Au0wKgYDVR0RBCMwIYIfcmV2b2tlZC5yNi5yb290cy5nbG9iYWxzaWduLmNvbTAO\n" +
-            "BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0G\n" +
-            "A1UdDgQWBBTa1/37G4T022LEW3WwIVV99qtjsjBVBgNVHSAETjBMMAcGBWeBDAEB\n" +
-            "MEEGCSsGAQQBoDIBATA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9iYWxz\n" +
-            "aWduLmNvbS9yZXBvc2l0b3J5LzAMBgNVHRMBAf8EAjAAMIGaBggrBgEFBQcBAQSB\n" +
-            "jTCBijA+BggrBgEFBQcwAYYyaHR0cDovL29jc3AuZ2xvYmFsc2lnbi5jb20vY2Ev\n" +
-            "Z3NhdGxhc3I2ZXZ0bHNjYTIwMjAwSAYIKwYBBQUHMAKGPGh0dHA6Ly9zZWN1cmUu\n" +
-            "Z2xvYmFsc2lnbi5jb20vY2FjZXJ0L2dzYXRsYXNyNmV2dGxzY2EyMDIwLmNydDAf\n" +
-            "BgNVHSMEGDAWgBSE3CELx6hdcpeEh37y1bb6cVZO+zBGBgNVHR8EPzA9MDugOaA3\n" +
-            "hjVodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2NhL2dzYXRsYXNyNmV2dGxzY2Ey\n" +
-            "MDIwLmNybDCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2AG9Tdqwx8DEZ2JkApFEV\n" +
-            "/3cVHBHZAsEAKQaNsgiaN9kTAAABdC7aAfUAAAQDAEcwRQIgHIAHHw/Y/VKaaHhy\n" +
-            "rZ/cMinivfZ4lUq2ejV7FRPbT8ECIQD3RoE13/MBVMVBLCQ2ErKsB5+7F31dX/tv\n" +
-            "Z/muQi5UrQB2AH0+8viP/4hVaCTCwMqeUol5K8UOeAl/LmqXaJl+IvDXAAABdC7a\n" +
-            "AegAAAQDAEcwRQIhALl0LXt6pFqS0cHF/XkxSfDJJdhppR2eSlcMFpZY0q1PAiBJ\n" +
-            "YkKHqq/YD0gwtZAUEPSk54G1cLxFoUiounjya1XTRzANBgkqhkiG9w0BAQsFAAOC\n" +
-            "AgEAdeQotBhB7bn+CztQmF13rdBphHrGkkyHC3hL1bxkmHJcrLQ5ochqPvgdgAVq\n" +
-            "DXcV8zSyNwVxW6REi+uYzcsOPKo/llmgF7Psqn1t/EDcutWlykh8UwE5UaLJ2EWD\n" +
-            "HnIu06n47lWtAwlNMXJ/ce0oVjqsgY52Y1u54e8wFXt6lsSw02tzIC6eo1BFKxQ3\n" +
-            "lDKYVXgg0OvMG/C2rvH/EIq5r+st49rNGWfcWRoHsDUruChZOHwJ9PrXKBLB/QVd\n" +
-            "4uw2V/0ipOETDudly7yLodXP8quhet4bCEO9gweXppL/MikLrE5xt46HW1/6w+jF\n" +
-            "wKCHWlq4ViswlaQ8q0oY/97o2udnuDQaNdrLgW3VofMeBIMNPBgkLDicOH6bLwNf\n" +
-            "lV68qi1ZBxBuOdoOqQyZ9RU9d3EL50XEJ4MtUvjJRAT5EWdFaB8SGGZbD5fyza8c\n" +
-            "KmeO5tkZWYecLd8CKqwKcW7umPflEwOzw60Cxg6eyBYA8Jfagpbdb/kXsF6Ov8IW\n" +
-            "vxNdHCnXnR3oBWm2uHddESO2zGF1ZfOb0O3cHHG5nCgVkWW68VpgX/LaN90u6Dzw\n" +
-            "diJX7esZV5ZaniqD+flWldgAdcfeXlJ5b7I7GnFr61ycmZT/qupagUS1WDq/zfct\n" +
-            "QcB4QmnAzGe6kcqiDOSyIYWpiw09jha63KpJtJDWRemrlQI=\n" +
-            "-----END CERTIFICATE-----";
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-        }
-
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Thu Aug 27 00:38:11 PDT 2020", System.out);
-    }
-}
-
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GoDaddyCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GoDaddyCA.java
deleted file mode 100644
index e8971b987ca..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GoDaddyCA.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * @test
- * @bug 8196141
- * @summary Interoperability tests with GoDaddy/Starfield CA
- * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath GoDaddyCA OCSP
- * @run main/othervm -Djava.security.debug=certpath GoDaddyCA CRL
- */
-
-/*
- * Obtain test artifacts for GoDaddy/Starfield CAs from:
- *
- * Go Daddy Root Certificate Authority - G2:
- *    valid: https://valid.gdig2.catest.godaddy.com/
- *    expired: https://expired.gdig2.catest.godaddy.com/
- *    revoked: https://revoked.gdig2.catest.godaddy.com/
- *
- * Starfield Root Certificate Authority - G2:
- *    valid: https://valid.sfig2.catest.starfieldtech.com/
- *    expired: https://expired.sfig2.catest.starfieldtech.com/
- *    revoked: https://revoked.sfig2.catest.starfieldtech.com/
- */
-public class GoDaddyCA {
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            // CRL check
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-        }
-
-        new GoDaddyGdig2().runTest(pathValidator);
-        new GoDaddySfig2().runTest(pathValidator);
-    }
-}
-
-class GoDaddyGdig2 {
-
-    // Owner: CN=Go Daddy Secure Certificate Authority - G2,
-    // OU=http://certs.godaddy.com/repository/, O="GoDaddy.com, Inc.",
-    // L=Scottsdale, ST=Arizona, C=US
-    // Issuer: CN=Go Daddy Root Certificate Authority - G2, O="GoDaddy.com, Inc.",
-    // L=Scottsdale, ST=Arizona, C=US
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n"
-            + "MIIE0DCCA7igAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx\n"
-            + "EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT\n"
-            + "EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp\n"
-            + "ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTExMDUwMzA3MDAwMFoXDTMxMDUwMzA3\n"
-            + "MDAwMFowgbQxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH\n"
-            + "EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UE\n"
-            + "CxMkaHR0cDovL2NlcnRzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMTMwMQYDVQQD\n"
-            + "EypHbyBEYWRkeSBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwggEi\n"
-            + "MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC54MsQ1K92vdSTYuswZLiBCGzD\n"
-            + "BNliF44v/z5lz4/OYuY8UhzaFkVLVat4a2ODYpDOD2lsmcgaFItMzEUz6ojcnqOv\n"
-            + "K/6AYZ15V8TPLvQ/MDxdR/yaFrzDN5ZBUY4RS1T4KL7QjL7wMDge87Am+GZHY23e\n"
-            + "cSZHjzhHU9FGHbTj3ADqRay9vHHZqm8A29vNMDp5T19MR/gd71vCxJ1gO7GyQ5HY\n"
-            + "pDNO6rPWJ0+tJYqlxvTV0KaudAVkV4i1RFXULSo6Pvi4vekyCgKUZMQWOlDxSq7n\n"
-            + "eTOvDCAHf+jfBDnCaQJsY1L6d8EbyHSHyLmTGFBUNUtpTrw700kuH9zB0lL7AgMB\n"
-            + "AAGjggEaMIIBFjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV\n"
-            + "HQ4EFgQUQMK9J47MNIMwojPX+2yz8LQsgM4wHwYDVR0jBBgwFoAUOpqFBxBnKLbv\n"
-            + "9r0FQW4gwZTaD94wNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8v\n"
-            + "b2NzcC5nb2RhZGR5LmNvbS8wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5n\n"
-            + "b2RhZGR5LmNvbS9nZHJvb3QtZzIuY3JsMEYGA1UdIAQ/MD0wOwYEVR0gADAzMDEG\n"
-            + "CCsGAQUFBwIBFiVodHRwczovL2NlcnRzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkv\n"
-            + "MA0GCSqGSIb3DQEBCwUAA4IBAQAIfmyTEMg4uJapkEv/oV9PBO9sPpyIBslQj6Zz\n"
-            + "91cxG7685C/b+LrTW+C05+Z5Yg4MotdqY3MxtfWoSKQ7CC2iXZDXtHwlTxFWMMS2\n"
-            + "RJ17LJ3lXubvDGGqv+QqG+6EnriDfcFDzkSnE3ANkR/0yBOtg2DZ2HKocyQetawi\n"
-            + "DsoXiWJYRBuriSUBAA/NxBti21G00w9RKpv0vHP8ds42pM3Z2Czqrpv1KrKQ0U11\n"
-            + "GIo/ikGQI31bS/6kA1ibRrLDYGCD+H1QQc7CoZDDu+8CL9IVVO5EFdkKrqeKM+2x\n"
-            + "LXY2JtwE65/3YR8V3Idv7kaWKK2hJn0KCacuBKONvPi8BDAB\n"
-            + "-----END CERTIFICATE-----";
-
-    // 1.3.6.1.4.1.311.60.2.1.3=US/1.3.6.1.4.1.311.60.2.1.2=Delaware/businessCategory=Private
-    // Organization/serialNumber=5510922, C=US, ST=Arizona, L=Scottsdale, O=GoDaddy INC., CN=valid.gdig2.catest.godaddy.com
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHbzCCBlegAwIBAgIIC3Go9uPeseowDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV\n" +
-            "BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow\n" +
-            "GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz\n" +
-            "LmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMTMwMQYDVQQDEypHbyBEYWRkeSBTZWN1\n" +
-            "cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTcwOTE1MjMyMzAyWhcN\n" +
-            "MTkwOTE1MjMyMzAyWjCB1TETMBEGCysGAQQBgjc8AgEDEwJVUzEZMBcGCysGAQQB\n" +
-            "gjc8AgECEwhEZWxhd2FyZTEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x\n" +
-            "EDAOBgNVBAUTBzU1MTA5MjIxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25h\n" +
-            "MRMwEQYDVQQHEwpTY290dHNkYWxlMRUwEwYDVQQKEwxHb0RhZGR5IElOQy4xJzAl\n" +
-            "BgNVBAMTHnZhbGlkLmdkaWcyLmNhdGVzdC5nb2RhZGR5LmNvbTCCASIwDQYJKoZI\n" +
-            "hvcNAQEBBQADggEPADCCAQoCggEBAO3xTbLfdIHiG1MIsBCz0oIg5vBxlzZyK5Rw\n" +
-            "DM6A/TWUDelFWyYj6fZDXYyHby4nAK9ibfhiT2f+q+5lEslye5Mt9gC39pZbpHE2\n" +
-            "eyJgmtNgmPGq15pf/87JE697BRwp9CWJP3yNYeamFl/F2THZOqlXCiSRbIGZ5TsZ\n" +
-            "sVb1vjFPmh249Ujw1zSThY9hA669Cyp3xb4iTowjCqdNYqbn22Jbk0SEXPYzLMf0\n" +
-            "mlY8xZ/e/8NxzJgev3N1LR3bPEijLYDZeZJ6WKc75pqNvgo8A+dEeX9bxFkCnstY\n" +
-            "6Iq0HTJua0TTD6V585YXNm4Z5OxjBE5kPkkFfwW0bb5dRZp86HUCAwEAAaOCA2Aw\n" +
-            "ggNcMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC\n" +
-            "MA4GA1UdDwEB/wQEAwIFoDA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLmdv\n" +
-            "ZGFkZHkuY29tL2dkaWcyczMtOS5jcmwwXAYDVR0gBFUwUzBIBgtghkgBhv1tAQcX\n" +
-            "AzA5MDcGCCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29t\n" +
-            "L3JlcG9zaXRvcnkvMAcGBWeBDAEBMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcw\n" +
-            "AYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEAGCCsGAQUFBzAChjRodHRwOi8v\n" +
-            "Y2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RpZzIuY3J0MB8G\n" +
-            "A1UdIwQYMBaAFEDCvSeOzDSDMKIz1/tss/C0LIDOME0GA1UdEQRGMESCHnZhbGlk\n" +
-            "LmdkaWcyLmNhdGVzdC5nb2RhZGR5LmNvbYIid3d3LnZhbGlkLmdkaWcyLmNhdGVz\n" +
-            "dC5nb2RhZGR5LmNvbTAdBgNVHQ4EFgQUKSs41O+5SnkjAEaNyHk6sxq5sn8wggF/\n" +
-            "BgorBgEEAdZ5AgQCBIIBbwSCAWsBaQB3AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFc\n" +
-            "wO+UmFXWidDdAAABXofbjGMAAAQDAEgwRgIhAPZEqPZAlYpSTx+R/+7mOUa+BcBz\n" +
-            "U1JHZDpcy98am0glAiEA1u2FxjgAa4L5HVGYV2LSQZIltGRJ8mBT8V0JVsdm3dsA\n" +
-            "dgDuS723dc5guuFCaR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAV6H25ASAAAEAwBH\n" +
-            "MEUCIQCFowkRXyR8gkX8cL7RbPSwiKCHy/1I1WVzpinmrHlZFQIgE5nShGeK7cqT\n" +
-            "j2C9FfrPc/Axe3/pzAFxD/BNQD1RO5sAdgCkuQmQtBhYFIe7E6LMZ3AKPDWYBPkb\n" +
-            "37jjd80OyA3cEAAAAV6H25GdAAAEAwBHMEUCIBQrE+FqILUhI0wdp2X+lf/e3UG1\n" +
-            "gyxHmSVeN2+CkrXPAiEA1mIIVmLNURGyI8wnZ5KRnBPOKYM2MC54RJ8CFrEHIz4w\n" +
-            "DQYJKoZIhvcNAQELBQADggEBADInvf3eS6SgQ1qxPx4RT2hPeU5frlWJWcOWUdZB\n" +
-            "6mVNcmUQMkYnjkg8+PQ782HGP0DvAfcIRDhSfXdIqzEk8MPUq1XHEOfwRzLpTiCN\n" +
-            "FQDQIt1LXnzESCUurJS8r4mxgaVLAwHFytOTDrQn0Xfs93dm0tnRGAg7iBg+N33V\n" +
-            "zOR4aqojdDUWa1Rr4WFqZMkZIxzREQCYC8HXSYqLA1oPuoMMog8dId7XSalBmGJ4\n" +
-            "KQVsZ0/Hpi0y9k/Zw5obGcEYJWMbuU1iaEkvdtXOiXEQfJ1WS+Yy55J4GSjpIiop\n" +
-            "qDZD88xA9r7ttzM/khao7jfIpVWG2HuX0JlHWdh3y9aegiw=\n" +
-            "-----END CERTIFICATE-----";
-
-    // 1.3.6.1.4.1.311.60.2.1.3=US/1.3.6.1.4.1.311.60.2.1.2=Delaware/businessCategory=Private
-    // Organization/serialNumber=5510922, C=US, ST=Arizona, L=Scottsdale, O=GoDaddy INC., CN=revoked.gdig2.catest.godaddy.com
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHdDCCBlygAwIBAgIIEBJV3vmogM8wDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV\n" +
-            "BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow\n" +
-            "GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz\n" +
-            "LmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMTMwMQYDVQQDEypHbyBEYWRkeSBTZWN1\n" +
-            "cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTcwOTE1MjMyMzAzWhcN\n" +
-            "MTkwOTE1MjMyMzAzWjCB1zETMBEGCysGAQQBgjc8AgEDEwJVUzEZMBcGCysGAQQB\n" +
-            "gjc8AgECEwhEZWxhd2FyZTEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x\n" +
-            "EDAOBgNVBAUTBzU1MTA5MjIxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25h\n" +
-            "MRMwEQYDVQQHEwpTY290dHNkYWxlMRUwEwYDVQQKEwxHb0RhZGR5IElOQy4xKTAn\n" +
-            "BgNVBAMTIHJldm9rZWQuZ2RpZzIuY2F0ZXN0LmdvZGFkZHkuY29tMIIBIjANBgkq\n" +
-            "hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCuBsAR2XGf05mYOuag+0aS4lBuLO5/f\n" +
-            "kEO7KNo7BcdY7J78yXYRYW0jGnV29bjrQZJfu5yv5bU+OjTIDVbCWZAwtBXEKrJj\n" +
-            "riIOUXi3hXphtlyMMAaiXQoA84jwS634DsD0w6XUUP2Lem8jC3RudjvmkDQHoY3M\n" +
-            "uhhS7jLxKnYKnXbLwlqxpdwmEgbqIb5DN5snLAyinTkALLVWZ6RneIuSjhKWbuef\n" +
-            "cEKFScHm6SFsKraltV/T17SWi6zQd/AypKA8JeWXD9WZcsSR9z/41VMJbvTeuP+d\n" +
-            "ZBA4dqPsBTl4N4i54rNEyzMyxDwdvIGrJJ+FVRMKoYjuUi5wY9zO4QIDAQABo4ID\n" +
-            "YzCCA18wDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH\n" +
-            "AwIwDgYDVR0PAQH/BAQDAgWgMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwu\n" +
-            "Z29kYWRkeS5jb20vZ2RpZzJzMy05LmNybDBcBgNVHSAEVTBTMEgGC2CGSAGG/W0B\n" +
-            "BxcDMDkwNwYIKwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5j\n" +
-            "b20vcmVwb3NpdG9yeS8wBwYFZ4EMAQEwdgYIKwYBBQUHAQEEajBoMCQGCCsGAQUF\n" +
-            "BzABhhhodHRwOi8vb2NzcC5nb2RhZGR5LmNvbS8wQAYIKwYBBQUHMAKGNGh0dHA6\n" +
-            "Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS9nZGlnMi5jcnQw\n" +
-            "HwYDVR0jBBgwFoAUQMK9J47MNIMwojPX+2yz8LQsgM4wUQYDVR0RBEowSIIgcmV2\n" +
-            "b2tlZC5nZGlnMi5jYXRlc3QuZ29kYWRkeS5jb22CJHd3dy5yZXZva2VkLmdkaWcy\n" +
-            "LmNhdGVzdC5nb2RhZGR5LmNvbTAdBgNVHQ4EFgQUCJELlWq8+ntmR5JTjmZMG+HI\n" +
-            "e5EwggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB1AFYUBpov18Ls0/XhvUSyPsdG\n" +
-            "drm8mRFcwO+UmFXWidDdAAABXofbk3cAAAQDAEYwRAIgHo8UllsN8FcaF16xx7kT\n" +
-            "vQU1wM7qUKnhN38/z8dU4QUCIFrzGJyajoVPQ2fzOTb9ygzA7T3wqsnT3ML5/KJ6\n" +
-            "+6+CAHYA7ku9t3XOYLrhQmkfq+GeZqMPfl+wctiDAMR7iXqo/csAAAFeh9uXHQAA\n" +
-            "BAMARzBFAiEA5DENZZT7SBxNRvo9yFHNNeWqH2d4uqGUwc1rKILrMGsCIHZ3N4dZ\n" +
-            "zv/J+7fbLP1nrAmdUT92ow1bhtMPuq2PfXsAAHcApLkJkLQYWBSHuxOizGdwCjw1\n" +
-            "mAT5G9+443fNDsgN3BAAAAFeh9uYjAAABAMASDBGAiEAyY8ylnGHiH5L3yXE7BsH\n" +
-            "v75ja2RtuuYbMADAlDK/ZDoCIQDwuCq3x+egpB/GISxTnwkrDwhNhhIJNyk5F4j1\n" +
-            "/J8A0DANBgkqhkiG9w0BAQsFAAOCAQEAMGot6gBZ77HIDMb1n/HPrKdSHN0ngq7Z\n" +
-            "rhrkgbp+mH1Cs1lZA3qldMDxKXgNiodFqU/e4VewasQ9tJMmDXrTZIHualJGmIvq\n" +
-            "ISvV0ZUfSW/sJmo0ZDw8iBM993LDkA4wSc6SunhjOwu3LBfl9aKkeq6IhUEAG8X7\n" +
-            "54oO4iApt+APLMyeV9lZ/T7MGVbAjwdm+T1RMa/Ca99BahaRWN7hiM+zS3Ly+l6G\n" +
-            "7kqAkBFuJWbbZImADZ2RPldY6hBzTk6MT2hLCV40UD8JqwJo+qq7nGfJdTaFyZI6\n" +
-            "nJvrVATO7jL64YFP3xlVi8EQaCeKdZdn+BCCNA/ja0mWMj8EU9Islg==\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED, null, System.out);
-    }
-}
-
-class GoDaddySfig2 {
-
-    // Owner: CN=Starfield Secure Certificate Authority - G2,
-    // OU=http://certs.starfieldtech.com/repository/, O="Starfield Technologies, Inc.",
-    // L=Scottsdale, ST=Arizona, C=US
-    // Issuer: CN=Starfield Root Certificate Authority - G2,
-    // O="Starfield Technologies, Inc.", L=Scottsdale, ST=Arizona, C=US
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n"
-            + "MIIFADCCA+igAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx\n"
-            + "EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT\n"
-            + "HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs\n"
-            + "ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTExMDUwMzA3MDAw\n"
-            + "MFoXDTMxMDUwMzA3MDAwMFowgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6\n"
-            + "b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj\n"
-            + "aG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxk\n"
-            + "dGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUg\n"
-            + "Q2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IB\n"
-            + "DwAwggEKAoIBAQDlkGZL7PlGcakgg77pbL9KyUhpgXVObST2yxcT+LBxWYR6ayuF\n"
-            + "pDS1FuXLzOlBcCykLtb6Mn3hqN6UEKwxwcDYav9ZJ6t21vwLdGu4p64/xFT0tDFE\n"
-            + "3ZNWjKRMXpuJyySDm+JXfbfYEh/JhW300YDxUJuHrtQLEAX7J7oobRfpDtZNuTlV\n"
-            + "Bv8KJAV+L8YdcmzUiymMV33a2etmGtNPp99/UsQwxaXJDgLFU793OGgGJMNmyDd+\n"
-            + "MB5FcSM1/5DYKp2N57CSTTx/KgqT3M0WRmX3YISLdkuRJ3MUkuDq7o8W6o0OPnYX\n"
-            + "v32JgIBEQ+ct4EMJddo26K3biTr1XRKOIwSDAgMBAAGjggEsMIIBKDAPBgNVHRMB\n"
-            + "Af8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUJUWBaFAmOD07LSy+\n"
-            + "zWrZtj2zZmMwHwYDVR0jBBgwFoAUfAwyH6fZMH/EfWijYqihzqsHWycwOgYIKwYB\n"
-            + "BQUHAQEELjAsMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5zdGFyZmllbGR0ZWNo\n"
-            + "LmNvbS8wOwYDVR0fBDQwMjAwoC6gLIYqaHR0cDovL2NybC5zdGFyZmllbGR0ZWNo\n"
-            + "LmNvbS9zZnJvb3QtZzIuY3JsMEwGA1UdIARFMEMwQQYEVR0gADA5MDcGCCsGAQUF\n"
-            + "BwIBFitodHRwczovL2NlcnRzLnN0YXJmaWVsZHRlY2guY29tL3JlcG9zaXRvcnkv\n"
-            + "MA0GCSqGSIb3DQEBCwUAA4IBAQBWZcr+8z8KqJOLGMfeQ2kTNCC+Tl94qGuc22pN\n"
-            + "QdvBE+zcMQAiXvcAngzgNGU0+bE6TkjIEoGIXFs+CFN69xpk37hQYcxTUUApS8L0\n"
-            + "rjpf5MqtJsxOYUPl/VemN3DOQyuwlMOS6eFfqhBJt2nk4NAfZKQrzR9voPiEJBjO\n"
-            + "eT2pkb9UGBOJmVQRDVXFJgt5T1ocbvlj2xSApAer+rKluYjdkf5lO6Sjeb6JTeHQ\n"
-            + "sPTIFwwKlhR8Cbds4cLYVdQYoKpBaXAko7nv6VrcPuuUSvC33l8Odvr7+2kDRUBQ\n"
-            + "7nIMpBKGgc0T0U7EPMpODdIm8QC3tKai4W56gf0wrHofx1l7\n"
-            + "-----END CERTIFICATE-----";
-
-    // 1.3.6.1.4.1.311.60.2.1.3=US/1.3.6.1.4.1.311.60.2.1.2=Arizona/businessCategory=Private
-    // Organization/serialNumber=R17247416, C=US, ST=Arizona, L=Scottsdale, O=Starfield Technologies, LLC,
-    // CN=valid.sfig2.catest.starfieldtech.com
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHuzCCBqOgAwIBAgIIaZoUcUIjkGwwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNV\n" +
-            "BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUw\n" +
-            "IwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypo\n" +
-            "dHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNV\n" +
-            "BAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIw\n" +
-            "HhcNMTcwOTE3MDM0ODAxWhcNMTkwOTE3MDM0ODAxWjCB6zETMBEGCysGAQQBgjc8\n" +
-            "AgEDEwJVUzEYMBYGCysGAQQBgjc8AgECEwdBcml6b25hMR0wGwYDVQQPExRQcml2\n" +
-            "YXRlIE9yZ2FuaXphdGlvbjESMBAGA1UEBRMJUjE3MjQ3NDE2MQswCQYDVQQGEwJV\n" +
-            "UzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEkMCIGA1UE\n" +
-            "ChMbU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgTExDMS0wKwYDVQQDEyR2YWxpZC5z\n" +
-            "ZmlnMi5jYXRlc3Quc3RhcmZpZWxkdGVjaC5jb20wggEiMA0GCSqGSIb3DQEBAQUA\n" +
-            "A4IBDwAwggEKAoIBAQDVxhI45IQtNrJuun7HU8v2CKg/h/euysft2VrRsaGSMAln\n" +
-            "V6TtpWj2UGm7OmzE2NNzOhD9JJQSc1W6aHEsCTVJ148sgldFFmP39cboBFoLCFlJ\n" +
-            "DxsVGeyKu+KlDKq7Vp2+ty3TeFNOBXEVtEc8SsC8mVjsk2VWW7X/fCVFYEzzyPUI\n" +
-            "sJPWahNOW2wVxNWKeW5jwzeNMOFVQiT9+YpZVQnV06uK3rPd9tVYU5SfdfPVpScY\n" +
-            "/O/tyZyflTGuXZ+YXn1CYRsOq3VypVFfhXunV5prQ/vTnyjddVWce1wwoUT5DvFO\n" +
-            "/0vcWolHktiOAJkmAiGRfHvjhxW8mkjKqaMnstKRAgMBAAGjggOEMIIDgDAMBgNV\n" +
-            "HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8B\n" +
-            "Af8EBAMCBaAwOwYDVR0fBDQwMjAwoC6gLIYqaHR0cDovL2NybC5zdGFyZmllbGR0\n" +
-            "ZWNoLmNvbS9zZmlnMnMzLTEuY3JsMGIGA1UdIARbMFkwTgYLYIZIAYb9bgEHFwMw\n" +
-            "PzA9BggrBgEFBQcCARYxaHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNo\n" +
-            "LmNvbS9yZXBvc2l0b3J5LzAHBgVngQwBATCBggYIKwYBBQUHAQEEdjB0MCoGCCsG\n" +
-            "AQUFBzABhh5odHRwOi8vb2NzcC5zdGFyZmllbGR0ZWNoLmNvbS8wRgYIKwYBBQUH\n" +
-            "MAKGOmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3Np\n" +
-            "dG9yeS9zZmlnMi5jcnQwHwYDVR0jBBgwFoAUJUWBaFAmOD07LSy+zWrZtj2zZmMw\n" +
-            "WQYDVR0RBFIwUIIkdmFsaWQuc2ZpZzIuY2F0ZXN0LnN0YXJmaWVsZHRlY2guY29t\n" +
-            "gih3d3cudmFsaWQuc2ZpZzIuY2F0ZXN0LnN0YXJmaWVsZHRlY2guY29tMB0GA1Ud\n" +
-            "DgQWBBTxiYdHMn55sMWTFgp7xif7ludWTjCCAX4GCisGAQQB1nkCBAIEggFuBIIB\n" +
-            "agFoAHcAVhQGmi/XwuzT9eG9RLI+x0Z2ubyZEVzA75SYVdaJ0N0AAAFejfR7OAAA\n" +
-            "BAMASDBGAiEA/s7a5OGhtaCutT1l4KNE7dUbM3WGUExG/ZJ+Y6IH3nUCIQCvpVJf\n" +
-            "Y0XBInIUv391hNzSEhv6nvIBEjZtKdvGcP8/5QB2AO5Lvbd1zmC64UJpH6vhnmaj\n" +
-            "D35fsHLYgwDEe4l6qP3LAAABXo30fxEAAAQDAEcwRQIhANqG9yfi3ax0pTnwr4Ti\n" +
-            "wVfUrZclJDS06ePkTHppLkLTAiBTRKkVf1df4Irvmd7neT1wdS2fhDxmnVIYAN5J\n" +
-            "6tOGDQB1AKS5CZC0GFgUh7sTosxncAo8NZgE+RvfuON3zQ7IDdwQAAABXo30gFsA\n" +
-            "AAQDAEYwRAIgb8Xc54M+QD4wfSWLj5Ae/wrSEgRp7Kbf4Lf4vT4W0usCIGAShkJI\n" +
-            "CRxoudQDRxooNJhfXgsTB8QhwFC9PUPo3ZV+MA0GCSqGSIb3DQEBCwUAA4IBAQBt\n" +
-            "TqvwxqrkPYm/ssbN9cpVWlrQPw3DblsAEV6gnrrTJMd7HB042H3HLUiitddRjO40\n" +
-            "0EJM/tUOSGcWfqnJHWFDKoWzdrF5lHAzSRkMjdXgY9TTN5K5tUMEpfRjtink/zoY\n" +
-            "pNyc5ua4SXn94KfMZcOYGRvUM+0q6vLRBBMH541E3M6q6JbEBqZJFY8gBWwYqHH0\n" +
-            "xNGahm5++v4trFFCJzSfvfV1v+rnqy8tRivi7ZFLXWCcSyAqMH+T9Q36lKeFtaw4\n" +
-            "Sapf+dh2yrd2IBLW5eaAD13nCAjO/W0GuC7zw4+4mhW5+DTVJXrCkK5XddkVLhML\n" +
-            "k5pMoIv5EsFIm0Cs+DfF\n" +
-            "-----END CERTIFICATE-----";
-
-    // 1.3.6.1.4.1.311.60.2.1.3=US/1.3.6.1.4.1.311.60.2.1.2=Arizona/businessCategory=Private
-    // Organization/serialNumber=R17247416, C=US, ST=Arizona, L=Scottsdale, O=Starfield Technologies, LLC,
-    // CN=revoked.sfig2.catest.starfieldtech.com
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHwTCCBqmgAwIBAgIJAPc1qVz+WDxpMA0GCSqGSIb3DQEBCwUAMIHGMQswCQYD\n" +
-            "VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEl\n" +
-            "MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEzMDEGA1UECxMq\n" +
-            "aHR0cDovL2NlcnRzLnN0YXJmaWVsZHRlY2guY29tL3JlcG9zaXRvcnkvMTQwMgYD\n" +
-            "VQQDEytTdGFyZmllbGQgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy\n" +
-            "MB4XDTE3MDkxOTEzMDkwMVoXDTE5MDkxOTEzMDkwMVowge0xEzARBgsrBgEEAYI3\n" +
-            "PAIBAxMCVVMxGDAWBgsrBgEEAYI3PAIBAhMHQXJpem9uYTEdMBsGA1UEDxMUUHJp\n" +
-            "dmF0ZSBPcmdhbml6YXRpb24xEjAQBgNVBAUTCVIxNzI0NzQxNjELMAkGA1UEBhMC\n" +
-            "VVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJDAiBgNV\n" +
-            "BAoTG1N0YXJmaWVsZCBUZWNobm9sb2dpZXMsIExMQzEvMC0GA1UEAxMmcmV2b2tl\n" +
-            "ZC5zZmlnMi5jYXRlc3Quc3RhcmZpZWxkdGVjaC5jb20wggEiMA0GCSqGSIb3DQEB\n" +
-            "AQUAA4IBDwAwggEKAoIBAQCWsAZC9goWW6yzg9HiLjCG4Gv2PCHlUIQGqyhc1y9a\n" +
-            "YZVXUI27/NhHjNNMTwP9TKmncrxnGaTZ9+ZCS1JlSgsNYQcLKKZW+SiEOzwpOfwV\n" +
-            "dOCSWrt/EDyJHktx3VIbfi+mD7dvzH3B/iGxMrmdCGIy3xiVAc7MkfsWzcLlPUP3\n" +
-            "oUpPBYyzWqZ2tVsBDigoirERFqZNfHZ7ZNMnn8FcmAt7udKjAAewNRlwzR7ZVp5s\n" +
-            "f5pbnRlRikF30msSHVJoPBICEYmzCxUI+zFlDBjf4vlJojwV0/Rfq85it2yhN/MV\n" +
-            "we2IBC+z9FAAogYo+JFw7Uxq8nsLCKX1tTPsqxGXWNonAgMBAAGjggOHMIIDgzAM\n" +
-            "BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNV\n" +
-            "HQ8BAf8EBAMCBaAwOwYDVR0fBDQwMjAwoC6gLIYqaHR0cDovL2NybC5zdGFyZmll\n" +
-            "bGR0ZWNoLmNvbS9zZmlnMnMzLTEuY3JsMGIGA1UdIARbMFkwTgYLYIZIAYb9bgEH\n" +
-            "FwMwPzA9BggrBgEFBQcCARYxaHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0\n" +
-            "ZWNoLmNvbS9yZXBvc2l0b3J5LzAHBgVngQwBATCBggYIKwYBBQUHAQEEdjB0MCoG\n" +
-            "CCsGAQUFBzABhh5odHRwOi8vb2NzcC5zdGFyZmllbGR0ZWNoLmNvbS8wRgYIKwYB\n" +
-            "BQUHMAKGOmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVw\n" +
-            "b3NpdG9yeS9zZmlnMi5jcnQwHwYDVR0jBBgwFoAUJUWBaFAmOD07LSy+zWrZtj2z\n" +
-            "ZmMwXQYDVR0RBFYwVIImcmV2b2tlZC5zZmlnMi5jYXRlc3Quc3RhcmZpZWxkdGVj\n" +
-            "aC5jb22CKnd3dy5yZXZva2VkLnNmaWcyLmNhdGVzdC5zdGFyZmllbGR0ZWNoLmNv\n" +
-            "bTAdBgNVHQ4EFgQU9hCSl7QoQ8KdsGgwMDwlvSurKNcwggF9BgorBgEEAdZ5AgQC\n" +
-            "BIIBbQSCAWkBZwB1AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDdAAAB\n" +
-            "XppC0cEAAAQDAEYwRAIgIO8sIG88JlA73P2myZ7EshemxaR8qBgf3wlYZpg5aZEC\n" +
-            "IGtlcUL7Il1uOLN0LTAzNTQ7pfb7oFYbr0R4LWe2ZvBIAHYA7ku9t3XOYLrhQmkf\n" +
-            "q+GeZqMPfl+wctiDAMR7iXqo/csAAAFemkLVbwAABAMARzBFAiEAmWkzcotxZSwb\n" +
-            "xPS3MG13TVXGu2+MiXXjOIf42DR8zJQCIBL4cSOJh+LX5kpPub6KOiEOn7TVE1Zv\n" +
-            "IQUxuf+vyAD4AHYApLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFe\n" +
-            "mkLXRQAABAMARzBFAiBX8foh/KrYr34O2c9cH6uyWW2XjBHNLsYX1mr+8VuNaAIh\n" +
-            "AObDQwpDYh/bNp6k547gDxnR73LeU3kvl1Y76GjgxLAhMA0GCSqGSIb3DQEBCwUA\n" +
-            "A4IBAQDJ5vlagzOH8/ORUMgT33muSDFXCe5el/sQzVg8dridw9qjnxOpkGibdCiT\n" +
-            "b9Il1bdi7UnG8MlA3XpDjGgp6J/mUTijD9WcFx4lp5JnPaIbShHWCyIlRVZJzrZc\n" +
-            "UYhR56xXOKDYKYOIvM6qTqegXyEynJrIVTArMk7jQf0oNQLLHzXE1fVS1zut0H5l\n" +
-            "GE+TBgjasMEa1o1e/H/heSytb2zFNsZr8oxojzGBmlKyfCoIIcCv3PxX2ur57zJE\n" +
-            "9ADWoYK/7gYVba0JmLV4nQltDPp06nOYT9imxBWTrFahgPx1jOQDLgIpitkjyCy4\n" +
-            "xpmxUk8L6yc3O3aSD9OU/fzk/t/d\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED, null, System.out);
-    }
-}
-
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java
deleted file mode 100644
index 95ac059de03..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java
+++ /dev/null
@@ -1,621 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8307134
- * @summary Interoperability tests with Google's GlobalSign R4 and GTS Root certificates
- * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath GoogleCA OCSP
- * @run main/othervm -Djava.security.debug=certpath GoogleCA CRL
- */
-
-/*
- * Obtain TLS test artifacts for Google CAs from:
- *
- * https://pki.goog/repository/
- */
-public class GoogleCA {
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-        boolean ocspEnabled = false;
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-            ocspEnabled = true;
-        }
-
-        new GoogleGSR4().runTest(pathValidator);
-        new GoogleGTSR1().runTest(pathValidator);
-        new GoogleGTSR2().runTest(pathValidator);
-        new GoogleGTSR3().runTest(pathValidator);
-        new GoogleGTSR4().runTest(pathValidator);
-    }
-}
-
-class GoogleGSR4 {
-
-    // Owner: CN=GTS CA 2D4, O=Google Trust Services LLC, C=US
-    // Issuer: CN=GlobalSign, O=GlobalSign, OU=GlobalSign ECC Root CA - R4
-    // Serial number: 21668f1cd0a2a8f847d8aad34
-    // Valid from: Tue Oct 04 17:00:42 PDT 2022 until: Wed Sep 29 17:00:42 PDT 2027
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIDBDCCAqugAwIBAgINAhZo8c0KKo+EfYqtNDAKBggqhkjOPQQDAjBQMSQwIgYD\n" +
-            "VQQLExtHbG9iYWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2Jh\n" +
-            "bFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMjIxMDA1MDAwMDQyWhcNMjcw\n" +
-            "OTMwMDAwMDQyWjBGMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0\n" +
-            "IFNlcnZpY2VzIExMQzETMBEGA1UEAxMKR1RTIENBIDJENDBZMBMGByqGSM49AgEG\n" +
-            "CCqGSM49AwEHA0IABPQdCdV61990MPueGTVpXAjRmp2JIxt0Yuy59RZYT/XKg1lN\n" +
-            "gpRc0eh/bHtpehigtqe+llKTiVEkMhSMURoQQsOjggFyMIIBbjAOBgNVHQ8BAf8E\n" +
-            "BAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQI\n" +
-            "MAYBAf8CAQAwHQYDVR0OBBYEFKiI2Yo5rGXVgks3qJVsZUPNRAHgMB8GA1UdIwQY\n" +
-            "MBaAFFSwe61FuOJAf/sKbvu+M8k8o4TVMGYGCCsGAQUFBwEBBFowWDAlBggrBgEF\n" +
-            "BQcwAYYZaHR0cDovL29jc3AucGtpLmdvb2cvZ3NyNDAvBggrBgEFBQcwAoYjaHR0\n" +
-            "cDovL3BraS5nb29nL3JlcG8vY2VydHMvZ3NyNC5kZXIwMgYDVR0fBCswKTAnoCWg\n" +
-            "I4YhaHR0cDovL2NybC5wa2kuZ29vZy9nc3I0L2dzcjQuY3JsME0GA1UdIARGMEQw\n" +
-            "CAYGZ4EMAQIBMDgGCisGAQQB1nkCBQMwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly9w\n" +
-            "a2kuZ29vZy9yZXBvc2l0b3J5LzAKBggqhkjOPQQDAgNHADBEAiBi+ikli1YBHQGs\n" +
-            "b5mnyBo5mydw04o386BPgaPpiBzgagIgbcpwQJCalLIekv8XRMoWFr3nV5XJfWRU\n" +
-            "5QPpOX0rXbg=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=good.gsr4.demo.pki.goog
-    // Issuer: CN=GTS CA 2D4, O=Google Trust Services LLC, C=US
-    // Serial number: 4c435754ee6e013c10efaff908a58cbb
-    // Valid from: Mon Mar 27 12:41:45 PDT 2023 until: Sun Jun 25 12:41:44 PDT 2023
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIEsTCCBFegAwIBAgIQTENXVO5uATwQ76/5CKWMuzAKBggqhkjOPQQDAjBGMQsw\n" +
-            "CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzET\n" +
-            "MBEGA1UEAxMKR1RTIENBIDJENDAeFw0yMzAzMjcxOTQxNDVaFw0yMzA2MjUxOTQx\n" +
-            "NDRaMCIxIDAeBgNVBAMTF2dvb2QuZ3NyNC5kZW1vLnBraS5nb29nMIIBIjANBgkq\n" +
-            "hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAymtcnnxJ8pSF4YJUKTWKcHbRw28ShLzo\n" +
-            "KVTRPUsRrZZDqyDx296k3e0D04kBhcvEduxtEabCe89m06SH7L+bGVi25j35AXwn\n" +
-            "6aziLs/EV4BRy9ACfYipeT5PnQbaMmVe65q/RYKmWqD/z0SEh2uMFxRVl1CBmS/J\n" +
-            "owbNUlrEEDiYkE/nGfCmacpW0QZ7kxGjSR34mCSDugIYE/HME3ZVcZOVf2LT0lBA\n" +
-            "DhQtZI6cXy2lO8Ro/dUtcZKjo8iu0xW1pQeiJq9+CGp62MJFmpl+EfzP/B8aXQiF\n" +
-            "+m44LJJgAjiShAwVo9HbJUYv0dqCS9G22FL43xXqAdDlWZeuZyg7bQIDAQABo4IC\n" +
-            "fjCCAnowDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1Ud\n" +
-            "EwEB/wQCMAAwHQYDVR0OBBYEFKMuYkTnbWyrTBfBqbNNe91z3GPjMB8GA1UdIwQY\n" +
-            "MBaAFKiI2Yo5rGXVgks3qJVsZUPNRAHgMHgGCCsGAQUFBwEBBGwwajA1BggrBgEF\n" +
-            "BQcwAYYpaHR0cDovL29jc3AucGtpLmdvb2cvcy9ndHMyZDQvS2tnczU5VFFIelkw\n" +
-            "MQYIKwYBBQUHMAKGJWh0dHA6Ly9wa2kuZ29vZy9yZXBvL2NlcnRzL2d0czJkNC5k\n" +
-            "ZXIwIgYDVR0RBBswGYIXZ29vZC5nc3I0LmRlbW8ucGtpLmdvb2cwIQYDVR0gBBow\n" +
-            "GDAIBgZngQwBAgEwDAYKKwYBBAHWeQIFAzA8BgNVHR8ENTAzMDGgL6AthitodHRw\n" +
-            "Oi8vY3Jscy5wa2kuZ29vZy9ndHMyZDQvSUlXMzNMVUVwV3cuY3JsMIIBBAYKKwYB\n" +
-            "BAHWeQIEAgSB9QSB8gDwAHcA6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0G\n" +
-            "vW4AAAGHJM62ygAABAMASDBGAiEAkeiqmfYYCVEmGA12/RJUZPdmxRP2ZXF0Xm30\n" +
-            "Oz+q2tgCIQCgSYqT/6RH+PCOauOVW4uaoshT+HfqurghVCzwGgBFvwB1ALc++yTf\n" +
-            "nE26dfI5xbpY9Gxd/ELPep81xJ4dCYEl7bSZAAABhyTOttoAAAQDAEYwRAIgBXao\n" +
-            "3Pry1nCHu3bngW3q3CHSLzmNHmO4cXMSdN2sAOkCIDE5DUyok3TRsOIHu1QTB0R2\n" +
-            "UxPeFm9KS73TBT8JEZykMAoGCCqGSM49BAMCA0gAMEUCIG1m91VOq3tghyLPA6YR\n" +
-            "/Pkq+gQylyM8wGJgnRMRE0lhAiEAxBgYXImtVqbfymq2MYwhV9KmG9gPIfqN6qWi\n" +
-            "lzblUM0=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked.gsr4.demo.pki.goog
-    // Issuer: CN=GTS CA 2D4, O=Google Trust Services LLC, C=US
-    // Serial number: 1f9bd55e26716b3710b2614cec6fff02
-    // Valid from: Mon Mar 27 12:48:37 PDT 2023 until: Sun Jun 25 12:48:36 PDT 2023
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIEtzCCBFygAwIBAgIQH5vVXiZxazcQsmFM7G//AjAKBggqhkjOPQQDAjBGMQsw\n" +
-            "CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzET\n" +
-            "MBEGA1UEAxMKR1RTIENBIDJENDAeFw0yMzAzMjcxOTQ4MzdaFw0yMzA2MjUxOTQ4\n" +
-            "MzZaMCUxIzAhBgNVBAMTGnJldm9rZWQuZ3NyNC5kZW1vLnBraS5nb29nMIIBIjAN\n" +
-            "BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApVuoZ/bS9c2WSQ8W1FjPEsdGoANj\n" +
-            "PqKaPwdyUhnko9ayyGGi5hHLYqir2tiNjfO8i5e3ybe6CIaybY37SQebquV+rioH\n" +
-            "O9BS75GgtYXCaMK/8prya9RiaUjy7kecvpKtJNiaXrLJy8Vzq9g39n9hiXJYMGkc\n" +
-            "fCWYjWd5jU4pAsYTslmuIYoIZuwRRX34iET6Brs3ijykcmYtG5F90wqFlvRxRh0x\n" +
-            "vD0EeTOLGZSDQMYxlhfrqG449I10iTHusSxI2AXB6k7N2UXMJ44D7Z3RWkv1ItsY\n" +
-            "eKVXQyLAYd8YYTFNdGa75SoRr+ChFbLCgSUMg188T/SS013bH/XSHpCbQQIDAQAB\n" +
-            "o4ICgDCCAnwwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwG\n" +
-            "A1UdEwEB/wQCMAAwHQYDVR0OBBYEFLXeKzKKPx+Vs7YEKdmz9Vur9BZiMB8GA1Ud\n" +
-            "IwQYMBaAFKiI2Yo5rGXVgks3qJVsZUPNRAHgMHgGCCsGAQUFBwEBBGwwajA1Bggr\n" +
-            "BgEFBQcwAYYpaHR0cDovL29jc3AucGtpLmdvb2cvcy9ndHMyZDQvaG5fZHY1dHlS\n" +
-            "SVkwMQYIKwYBBQUHMAKGJWh0dHA6Ly9wa2kuZ29vZy9yZXBvL2NlcnRzL2d0czJk\n" +
-            "NC5kZXIwJQYDVR0RBB4wHIIacmV2b2tlZC5nc3I0LmRlbW8ucGtpLmdvb2cwIQYD\n" +
-            "VR0gBBowGDAIBgZngQwBAgEwDAYKKwYBBAHWeQIFAzA8BgNVHR8ENTAzMDGgL6At\n" +
-            "hitodHRwOi8vY3Jscy5wa2kuZ29vZy9ndHMyZDQvSUlXMzNMVUVwV3cuY3JsMIIB\n" +
-            "AwYKKwYBBAHWeQIEAgSB9ASB8QDvAHYAejKMVNi3LbYg6jjgUh7phBZwMhOFTTvS\n" +
-            "K8E6V6NS61IAAAGHJNUx1gAABAMARzBFAiEAj/RgXx1ScnsOf9R9N3eyPMJtH33C\n" +
-            "mOrRCOodG8QXmE0CIHwNJC5E53BVmfMzZwJH9f2BiUx31SGHWFvG283zVtX/AHUA\n" +
-            "6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0GvW4AAAGHJNUxnAAABAMARjBE\n" +
-            "AiAI7pcrKatsz0G4QYPKmS74VQVEgnHqgKSoqv0ghTJXTgIgPyoYubz4MEHYirBu\n" +
-            "69BLC2jioXr8+wS7MK1IPqjdH44wCgYIKoZIzj0EAwIDSQAwRgIhAI4NdZ5JwTuW\n" +
-            "P+RH2bsAc5xrb804G9mOc3WMRVxTUKesAiEA/jHMJ2YdPv0WXKjKY7nUyFjUPdin\n" +
-            "BHRHfBeltynaFzU=\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon Mar 27 13:49:33 PDT 2023", System.out);
-    }
-}
-
-class GoogleGTSR1 {
-
-    // Owner: CN=GTS CA 1D4, O=Google Trust Services LLC, C=US
-    // Issuer: CN=GTS Root R1, O=Google Trust Services LLC, C=US
-    // Serial number: 2008eb2023336658b64cddb9b
-    // Valid from: Wed Aug 12 17:00:42 PDT 2020 until: Wed Sep 29 17:00:42 PDT 2027
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFjDCCA3SgAwIBAgINAgCOsgIzNmWLZM3bmzANBgkqhkiG9w0BAQsFADBHMQsw\n" +
-            "CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEU\n" +
-            "MBIGA1UEAxMLR1RTIFJvb3QgUjEwHhcNMjAwODEzMDAwMDQyWhcNMjcwOTMwMDAw\n" +
-            "MDQyWjBGMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZp\n" +
-            "Y2VzIExMQzETMBEGA1UEAxMKR1RTIENBIDFENDCCASIwDQYJKoZIhvcNAQEBBQAD\n" +
-            "ggEPADCCAQoCggEBAKvAqqPCE27l0w9zC8dTPIE89bA+xTmDaG7y7VfQ4c+mOWhl\n" +
-            "UebUQpK0yv2r678RJExK0HWDjeq+nLIHN1Em5j6rARZixmyRSjhIR0KOQPGBMUld\n" +
-            "saztIIJ7O0g/82qj/vGDl//3t4tTqxiRhLQnTLXJdeB+2DhkdU6IIgx6wN7E5NcU\n" +
-            "H3Rcsejcqj8p5Sj19vBm6i1FhqLGymhMFroWVUGO3xtIH91dsgy4eFKcfKVLWK3o\n" +
-            "2190Q0Lm/SiKmLbRJ5Au4y1euFJm2JM9eB84Fkqa3ivrXWUeVtye0CQdKvsY2Fka\n" +
-            "zvxtxvusLJzLWYHk55zcRAacDA2SeEtBbQfD1qsCAwEAAaOCAXYwggFyMA4GA1Ud\n" +
-            "DwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwEgYDVR0T\n" +
-            "AQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUJeIYDrJXkZQq5dRdhpCD3lOzuJIwHwYD\n" +
-            "VR0jBBgwFoAU5K8rJnEaK0gnhS9SZizv8IkTcT4waAYIKwYBBQUHAQEEXDBaMCYG\n" +
-            "CCsGAQUFBzABhhpodHRwOi8vb2NzcC5wa2kuZ29vZy9ndHNyMTAwBggrBgEFBQcw\n" +
-            "AoYkaHR0cDovL3BraS5nb29nL3JlcG8vY2VydHMvZ3RzcjEuZGVyMDQGA1UdHwQt\n" +
-            "MCswKaAnoCWGI2h0dHA6Ly9jcmwucGtpLmdvb2cvZ3RzcjEvZ3RzcjEuY3JsME0G\n" +
-            "A1UdIARGMEQwCAYGZ4EMAQIBMDgGCisGAQQB1nkCBQMwKjAoBggrBgEFBQcCARYc\n" +
-            "aHR0cHM6Ly9wa2kuZ29vZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAgEA\n" +
-            "IVToy24jwXUr0rAPc924vuSVbKQuYw3nLflLfLh5AYWEeVl/Du18QAWUMdcJ6o/q\n" +
-            "FZbhXkBH0PNcw97thaf2BeoDYY9Ck/b+UGluhx06zd4EBf7H9P84nnrwpR+4GBDZ\n" +
-            "K+Xh3I0tqJy2rgOqNDflr5IMQ8ZTWA3yltakzSBKZ6XpF0PpqyCRvp/NCGv2KX2T\n" +
-            "uPCJvscp1/m2pVTtyBjYPRQ+QuCQGAJKjtN7R5DFrfTqMWvYgVlpCJBkwlu7+7KY\n" +
-            "3cTIfzE7cmALskMKNLuDz+RzCcsYTsVaU7Vp3xL60OYhqFkuAOOxDZ6pHOj9+OJm\n" +
-            "YgPmOT4X3+7L51fXJyRH9KfLRP6nT31D5nmsGAOgZ26/8T9hsBW1uo9ju5fZLZXV\n" +
-            "VS5H0HyIBMEKyGMIPhFWrlt/hFS28N1zaKI0ZBGD3gYgDLbiDT9fGXstpk+Fmc4o\n" +
-            "lVlWPzXe81vdoEnFbr5M272HdgJWo+WhT9BYM0Ji+wdVmnRffXgloEoluTNcWzc4\n" +
-            "1dFpgJu8fF3LG0gl2ibSYiCi9a6hvU0TppjJyIWXhkJTcMJlPrWx1VytEUGrX2l0\n" +
-            "JDwRjW/656r0KVB02xHRKvm2ZKI03TglLIpmVCK3kBKkKNpBNkFt8rhafcCKOb9J\n" +
-            "x/9tpNFlQTl7B39rJlJWkR17QnZqVptFePFORoZmFzM=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=good.gtsr1.demo.pki.goog
-    // Issuer: CN=GTS CA 1D4, O=Google Trust Services LLC, C=US
-    // Serial number: 19c08d5cde41fc84108f54c8d2a1aeca
-    // Valid from: Mon Mar 27 12:33:43 PDT 2023 until: Sun Jun 25 12:33:42 PDT 2023
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFcjCCBFqgAwIBAgIQGcCNXN5B/IQQj1TI0qGuyjANBgkqhkiG9w0BAQsFADBG\n" +
-            "MQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExM\n" +
-            "QzETMBEGA1UEAxMKR1RTIENBIDFENDAeFw0yMzAzMjcxOTMzNDNaFw0yMzA2MjUx\n" +
-            "OTMzNDJaMCMxITAfBgNVBAMTGGdvb2QuZ3RzcjEuZGVtby5wa2kuZ29vZzCCASIw\n" +
-            "DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkOYhMM6kQMlep+l2/l5KTC1ow8\n" +
-            "nXHwXQzugR2Js302pM3p2UCfnfhlK0a9UUSVtAZa8ydVUyVRF9LzW1rOIK8UdlEj\n" +
-            "O6qAvPnPw8laY7rCPWRPibxu0OqL/5sYD+a4hQ7GhVsYDXXxnWQvLV5mppRlYF/8\n" +
-            "80ugGggRb+U3y6V84f1JnwSMvZFULe19BOeV5qWAHHFfgy0zePzcDMy8AqxaVBOb\n" +
-            "FVSsbdql2gnRyC4WZ9D5lc8vwS84KrJbce2+VtrpcKVALtyVA0Zzor2lr2wOVc4i\n" +
-            "OOwMNk9948eStAjOV8N4B1h9D/pd+cFSWfgXufr5ZClwijLr3zLvZxDGI6ECAwEA\n" +
-            "AaOCAn0wggJ5MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAM\n" +
-            "BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSTKR+0ebWnH3uGz5qju5/LpkCjYzAfBgNV\n" +
-            "HSMEGDAWgBQl4hgOsleRlCrl1F2GkIPeU7O4kjB4BggrBgEFBQcBAQRsMGowNQYI\n" +
-            "KwYBBQUHMAGGKWh0dHA6Ly9vY3NwLnBraS5nb29nL3MvZ3RzMWQ0L3B6OThKdFZT\n" +
-            "RnRjMDEGCCsGAQUFBzAChiVodHRwOi8vcGtpLmdvb2cvcmVwby9jZXJ0cy9ndHMx\n" +
-            "ZDQuZGVyMCMGA1UdEQQcMBqCGGdvb2QuZ3RzcjEuZGVtby5wa2kuZ29vZzAhBgNV\n" +
-            "HSAEGjAYMAgGBmeBDAECATAMBgorBgEEAdZ5AgUDMDwGA1UdHwQ1MDMwMaAvoC2G\n" +
-            "K2h0dHA6Ly9jcmxzLnBraS5nb29nL2d0czFkNC92My1EUW1sYi1ZWS5jcmwwggEC\n" +
-            "BgorBgEEAdZ5AgQCBIHzBIHwAO4AdQC3Pvsk35xNunXyOcW6WPRsXfxCz3qfNcSe\n" +
-            "HQmBJe20mQAAAYckx1OMAAAEAwBGMEQCICQ4Do1cKFsqmm/swKZkdM/qGluDbctL\n" +
-            "tIgp0YnoZTlEAiByAeAEaVQiU27AnpUerimnjPnThQq26vqvnWdstb0mwgB1AK33\n" +
-            "vvp8/xDIi509nB4+GGq0Zyldz7EMJMqFhjTr3IKKAAABhyTHU7UAAAQDAEYwRAIg\n" +
-            "WAIAOov42kcgOj0rYO3qb4/HTsW3o69x4IKd8ycsaVkCICIQUaeKwNp4aW/civO9\n" +
-            "No/v5Ner5bmlwheqFAJcR/HCMA0GCSqGSIb3DQEBCwUAA4IBAQBEKKdwuzuAhdir\n" +
-            "3hbPQIosD6H9vatr8tExWCDmw+PHOoiWIUTBu5fVZPQ27EgehTIA6kNhQj2g7fkF\n" +
-            "Bd5zAl4k7WdsDZCeOHml6XXQZHvc+p4DYBKTTt3h81lsMLw8aWCOaiSmrQ0hZS/E\n" +
-            "iuaqvlOFpOTd0x+MN2qcU14hi8SKxBgpraqR/s7OCwUFltxcPq0GAybzDGc9lgB+\n" +
-            "Jt56QviN641s7hxThyGhFIHSePgWuwbT1grJKQiSW35yI4PJO90HoCpd2MLrC5Ic\n" +
-            "B89ykY8mQcx+naGPZQdwdpx9GvKwSZdn+cq3kZwD66iXnwhqmiEdq4eBZr8ygSya\n" +
-            "lnGV2OW+\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked.gtsr1.demo.pki.goog
-    // Issuer: CN=GTS CA 1D4, O=Google Trust Services LLC, C=US
-    // Serial number: c414c34e6c2cc66c102b8d3502be3bb4
-    // Valid from: Mon Mar 27 12:42:39 PDT 2023 until: Sun Jun 25 12:42:38 PDT 2023
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFfDCCBGSgAwIBAgIRAMQUw05sLMZsECuNNQK+O7QwDQYJKoZIhvcNAQELBQAw\n" +
-            "RjELMAkGA1UEBhMCVVMxIjAgBgNVBAoTGUdvb2dsZSBUcnVzdCBTZXJ2aWNlcyBM\n" +
-            "TEMxEzARBgNVBAMTCkdUUyBDQSAxRDQwHhcNMjMwMzI3MTk0MjM5WhcNMjMwNjI1\n" +
-            "MTk0MjM4WjAmMSQwIgYDVQQDExtyZXZva2VkLmd0c3IxLmRlbW8ucGtpLmdvb2cw\n" +
-            "ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCOeL80aphh8K8Cz41Sl2Cv\n" +
-            "cI3Elrrm/2sQH5Q0nxNuoZcxTGk3hD75Ntf6eqgclUQXJDEGbfoo3q7kYIQPXEIy\n" +
-            "+AuiMTd80ZRHuPBp8ci/wkh6N7B9mE/rjzJz77QgJluykoXRx9SiDyE4Yn9sRbBH\n" +
-            "jNm/KBv8wMV6hzJZYaALyDpGVNuAx9cHE91LaSvamPiccJn4wb9zDtyFduS3yYbz\n" +
-            "FREt960j420TeHjeWFkuXXVQMnPeRAWugclhJKzLz1U1gm5PWGxThMgVIy0v8v63\n" +
-            "3qFT09I4avi0AzBaRtINCaS39Mo2AoX1jZNjFDNLzRO1fSSJpzJmWyXJ2jRI7MwF\n" +
-            "AgMBAAGjggKDMIICfzAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUH\n" +
-            "AwEwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUCuJDEKGIdbWqxyVFZmIZoyQZ4T4w\n" +
-            "HwYDVR0jBBgwFoAUJeIYDrJXkZQq5dRdhpCD3lOzuJIweAYIKwYBBQUHAQEEbDBq\n" +
-            "MDUGCCsGAQUFBzABhilodHRwOi8vb2NzcC5wa2kuZ29vZy9zL2d0czFkNC9rb2Zm\n" +
-            "cmFBODZBdzAxBggrBgEFBQcwAoYlaHR0cDovL3BraS5nb29nL3JlcG8vY2VydHMv\n" +
-            "Z3RzMWQ0LmRlcjAmBgNVHREEHzAdghtyZXZva2VkLmd0c3IxLmRlbW8ucGtpLmdv\n" +
-            "b2cwIQYDVR0gBBowGDAIBgZngQwBAgEwDAYKKwYBBAHWeQIFAzA8BgNVHR8ENTAz\n" +
-            "MDGgL6AthitodHRwOi8vY3Jscy5wa2kuZ29vZy9ndHMxZDQvODJFckFFQVVsR1ku\n" +
-            "Y3JsMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYArfe++nz/EMiLnT2cHj4YarRn\n" +
-            "KV3PsQwkyoWGNOvcgooAAAGHJM+cawAABAMARzBFAiB568monxGD3NiHsqNmsy+t\n" +
-            "IL4kCc71UNCCJthgnlL7HgIhAKSYf7P7CFO2wWdAt8LBMrsLoip9lytrinj0JR8R\n" +
-            "CYK9AHcAtz77JN+cTbp18jnFulj0bF38Qs96nzXEnh0JgSXttJkAAAGHJM+cZAAA\n" +
-            "BAMASDBGAiEAj8nBf1ihput8Gb8qCqVgvqAxPv9t4xLVhWg3tqv8gGMCIQDPiNbu\n" +
-            "vsyOi9nE6pDm86nggExXRa13wwCtr2wjAn5IpDANBgkqhkiG9w0BAQsFAAOCAQEA\n" +
-            "ezldM/NCUH58eXPZnbPaMMKrT5oNBxv+hypDy96+PyAqKtbC2bK+7sobGMZkfpG5\n" +
-            "8dW0mFmfazzjgbZUj54ZVHG4KaHeit8Nq1s07wh2Jo1c2JQdKxEXAOItax/IOfEd\n" +
-            "tqSg8AwSmhogQeiA7EXRspw4dYXL5uP/8jPPqByMI3PRmm3y7wyQLKNlNAfSgn7m\n" +
-            "wkrZxMRAENML4JND5UKxg7zo9e/Wvf4UPtEVVZaEj6ZxOe4JljvErCtayaw03t5p\n" +
-            "I18IAhXRpqm8JG1UGWjn49O8vkjB0bf/7iVXXI4rg6gGVia+HFuxKVGk5OQzo4Qd\n" +
-            "wBl6yOc8tpUH3phFPYbiMg==\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon Mar 27 13:43:25 PDT 2023", System.out);
-    }
-}
-
-class GoogleGTSR2 {
-
-    // Owner: CN=GTS CA 1D8, O=Google Trust Services LLC, C=US
-    // Issuer: CN=GTS Root R2, O=Google Trust Services LLC, C=US
-    // Serial number: 219c15ac025a1b0a5c1d9d501
-    // Valid from: Tue Oct 04 17:00:42 PDT 2022 until: Wed Sep 29 17:00:42 PDT 2027
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFjDCCA3SgAwIBAgINAhnBWsAlobClwdnVATANBgkqhkiG9w0BAQsFADBHMQsw\n" +
-            "CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEU\n" +
-            "MBIGA1UEAxMLR1RTIFJvb3QgUjIwHhcNMjIxMDA1MDAwMDQyWhcNMjcwOTMwMDAw\n" +
-            "MDQyWjBGMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZp\n" +
-            "Y2VzIExMQzETMBEGA1UEAxMKR1RTIENBIDFEODCCASIwDQYJKoZIhvcNAQEBBQAD\n" +
-            "ggEPADCCAQoCggEBAKgpBAgi9bhOp5nCIELI/W+1rMoxNH3isu2LuDI3pPEPYJ0o\n" +
-            "YDxXB1zKHvUqn1VWDlF+K4vLPzjTRv2MUw8fHH9IAd/Rx+mrUHUxffTPU5O41tPj\n" +
-            "OdzFRO+FOr5RqZfbtXWbEUNyv7wyyCYr9gaDvDeQgDnHTfHAafdoDracNLm2LS3r\n" +
-            "8iznvJltsboRm+fBwTH99nHciN/h/hHEWlRriUGZ+Cz+5YVB9Tm4gAOByyYYbAa4\n" +
-            "ES0PhzkIUHaq+56cTDVhK0DM5ZtnZJqV8amhBFssswPttAXT9pNCzoDLCtxeZ2Lw\n" +
-            "r7bcaGaDcuDmv4j8zAw3BOR73O0Xk1VcBYPBBUcCAwEAAaOCAXYwggFyMA4GA1Ud\n" +
-            "DwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwEgYDVR0T\n" +
-            "AQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUkPhQ+ueQJcnkJ30S3UdY53QPtmowHwYD\n" +
-            "VR0jBBgwFoAUu//KjiOfT5nK2+JopqUVJxce2Q4waAYIKwYBBQUHAQEEXDBaMCYG\n" +
-            "CCsGAQUFBzABhhpodHRwOi8vb2NzcC5wa2kuZ29vZy9ndHNyMjAwBggrBgEFBQcw\n" +
-            "AoYkaHR0cDovL3BraS5nb29nL3JlcG8vY2VydHMvZ3RzcjIuZGVyMDQGA1UdHwQt\n" +
-            "MCswKaAnoCWGI2h0dHA6Ly9jcmwucGtpLmdvb2cvZ3RzcjIvZ3RzcjIuY3JsME0G\n" +
-            "A1UdIARGMEQwCAYGZ4EMAQIBMDgGCisGAQQB1nkCBQMwKjAoBggrBgEFBQcCARYc\n" +
-            "aHR0cHM6Ly9wa2kuZ29vZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAgEA\n" +
-            "q3rJUW9syti3qkV5WNXCpJj2WoCptfxOdIrojT4Q1CIGzruFu4GXB8pfkJu7iU8k\n" +
-            "Aklel6RCn7MG/aI12ndmvUsW86e6UJDWEMz1CsQPA92AOsktAVXiGVDx3RAiPfP2\n" +
-            "9W9yNwlImSVZhGNQISC0SueK7QOv+mHHWE/7G0G0/YqAxMbVZzyrPYHfPUh0SD1g\n" +
-            "k7qYjq9hGJB7w7cfepZ2iPdKzlj/4aFOe04gho1zHMLJYIs03nb6uWg0AwX55SSu\n" +
-            "KvehoYs1ItHdEV1J2XfATZpCn6jMTEB/JYERbXW0VWLUhdaZORtaayQoU5YXbgvg\n" +
-            "bsPgqdIsPaxs/Chrp6zIKvs503YYcvs0GQSUQ1MFAWc+Loc39669T7WnL8Uu2yCO\n" +
-            "RxjFp3+fhTVA5UYwL1vy4wPnNUoa4+CA6JypT6ODUWcXZa8pWOdyHpbg0IeL389D\n" +
-            "s67kirG8/eKQxFzckbhL5AD8BJS3wkF7O7A8Gd+2VvSWhmEQzzOBHcvT/lqrCSe0\n" +
-            "7R7CV/Pw4E9C2GBLGfw8opxGXrdfJRjU6nHf5c+tC4xIjH/i3PQjaIFLG3D60mav\n" +
-            "0nkS92iorZl2dCiHTKxaD/J4B6VV03lpEcUdVg4WeGAmTClsXUnMOjCnlVYMLg9v\n" +
-            "URq0LbylxbGBelBrCNyqBS5UO6+9F4/Yi4vzoIvvbJ0=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=good.gtsr2.demo.pki.goog
-    // Issuer: CN=GTS CA 1D8, O=Google Trust Services LLC, C=US
-    // Serial number: 428fe99edb0df46e1008e4452f6cbfd2
-    // Valid from: Mon Mar 27 12:52:12 PDT 2023 until: Sun Jun 25 12:52:11 PDT 2023
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFdDCCBFygAwIBAgIQQo/pntsN9G4QCORFL2y/0jANBgkqhkiG9w0BAQsFADBG\n" +
-            "MQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExM\n" +
-            "QzETMBEGA1UEAxMKR1RTIENBIDFEODAeFw0yMzAzMjcxOTUyMTJaFw0yMzA2MjUx\n" +
-            "OTUyMTFaMCMxITAfBgNVBAMTGGdvb2QuZ3RzcjIuZGVtby5wa2kuZ29vZzCCASIw\n" +
-            "DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMaC0h20vohsggOQ0XGL5ca3Gqyf\n" +
-            "2n44PhYBrhzPpbq9/Mk9BKYYFy9osH0HwTFkYRYnI5fDeK6s/7svufiEwH8LtXK7\n" +
-            "A3juxf3k65cJ8M5bbBwDDW7Prgp86ueUd6pzqv23rLPc9Kv6vvtNYzgaTd4COU38\n" +
-            "3zFnuudAh8gvEbIQD+Nqis+kc4kEO3JfZBlAF883YRQZRpm6c4bWxKm1Atco53/6\n" +
-            "fYOota/XUgdJ8zQWOH1f9iaKX3kiDn76djxT9v/8MrcK2gRkHJJDo72HtCPuhdt8\n" +
-            "UkVLX4C3KF6eSUrgZ1gxA92ikAWxI4tn5D70yEffH0A7by0/b/C6uPMvXCECAwEA\n" +
-            "AaOCAn8wggJ7MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAM\n" +
-            "BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTegr5Cc+1LmL/c1H3sXVKufKZE8DAfBgNV\n" +
-            "HSMEGDAWgBSQ+FD655AlyeQnfRLdR1jndA+2ajB4BggrBgEFBQcBAQRsMGowNQYI\n" +
-            "KwYBBQUHMAGGKWh0dHA6Ly9vY3NwLnBraS5nb29nL3MvZ3RzMWQ4L0FoZFdDWF9D\n" +
-            "QUJFMDEGCCsGAQUFBzAChiVodHRwOi8vcGtpLmdvb2cvcmVwby9jZXJ0cy9ndHMx\n" +
-            "ZDguZGVyMCMGA1UdEQQcMBqCGGdvb2QuZ3RzcjIuZGVtby5wa2kuZ29vZzAhBgNV\n" +
-            "HSAEGjAYMAgGBmeBDAECATAMBgorBgEEAdZ5AgUDMDwGA1UdHwQ1MDMwMaAvoC2G\n" +
-            "K2h0dHA6Ly9jcmxzLnBraS5nb29nL2d0czFkOC8tME5ITHA5Y0w5US5jcmwwggEE\n" +
-            "BgorBgEEAdZ5AgQCBIH1BIHyAPAAdgB6MoxU2LcttiDqOOBSHumEFnAyE4VNO9Ir\n" +
-            "wTpXo1LrUgAAAYck2PpFAAAEAwBHMEUCIAznUI2WdAkwXBvnx0a8Io6hnZReoXsd\n" +
-            "Y+o+xpXqZsbbAiEAw/i7jWA43QWEMZz265nflCNxAS1W+s7nsZaKL512/S8AdgDo\n" +
-            "PtDaPvUGNTLnVyi8iWvJA9PL0RFr7Otp4Xd9bQa9bgAAAYck2PoBAAAEAwBHMEUC\n" +
-            "IHWqRE57W1pJJJAXrxFNMrjEO3f0YejAfi47mdyS1zJYAiEA4ye+achvGTYIMRnl\n" +
-            "jwBlTsYQQYt7KAVt2VAGMRB4H8kwDQYJKoZIhvcNAQELBQADggEBAGf9hz7NJRow\n" +
-            "veCSrfeVav2tDkx8s9VU7VD+lApip1mdqOGsqkCkeaA5hsGfhqleQFwsOAjduBFA\n" +
-            "nSV6KgiqFsgHSuS9zuSp2aVe8xhxq6mpr4LngkeUDc32mB9tW9AMaiYp8UeYyFGq\n" +
-            "hvjUb7/H2wFlT6qO+Qp/+hmfulKqNnrSzpZLIl+x2EBn3L6CFe5xaKzNaANgbShI\n" +
-            "cQsyKdaUrSAzNJZWnHwaAyQ1msqqXXoVzKmjAGMgZrXZNxv8Lh9V1v+F9WHDIjeQ\n" +
-            "TtahntIgq38eGtZAnyjdrUtfQwBlQI3zaE0n7n6Fq8ocglJE5woRlL/eTmSKiZr9\n" +
-            "rrEY0sJ0fCw=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked.gtsr2.demo.pki.goog
-    // Issuer: CN=GTS CA 1D8, O=Google Trust Services LLC, C=US
-    // Serial number: df9af5c19e9dbdf6107cb03548ffbd06
-    // Valid from: Mon Mar 27 12:45:09 PDT 2023 until: Sun Jun 25 12:45:08 PDT 2023
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFejCCBGKgAwIBAgIRAN+a9cGenb32EHywNUj/vQYwDQYJKoZIhvcNAQELBQAw\n" +
-            "RjELMAkGA1UEBhMCVVMxIjAgBgNVBAoTGUdvb2dsZSBUcnVzdCBTZXJ2aWNlcyBM\n" +
-            "TEMxEzARBgNVBAMTCkdUUyBDQSAxRDgwHhcNMjMwMzI3MTk0NTA5WhcNMjMwNjI1\n" +
-            "MTk0NTA4WjAmMSQwIgYDVQQDExtyZXZva2VkLmd0c3IyLmRlbW8ucGtpLmdvb2cw\n" +
-            "ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFJUSh0aOOjj6BXJqBFDOD\n" +
-            "GFjnr1VKDfWYdGWfB3QNhcbjz7qJRLeZDSYQZ3H2D5pkOQhl6xYLOZ1L0v+0TWW9\n" +
-            "5lCXQ476jdZXzPlOC29gYFX4VzS9w92ochg0dUhHdzKcWsqBjqChZdudGydYfwNS\n" +
-            "edZIhd4AcamVsXbCqAhS01Evo2hiBRlmMgryR9Ok2xRqbJiyvd8awhBIB4L0vMN+\n" +
-            "CgMpWMgaV1nn+LjEa3bHisyNVsRLdDZXY6Bgq3hUQ9jQWJdK/vGxHqunqC5ByrqG\n" +
-            "iN+4/+kK/PS8okkpAEAOXFoohogb6BQASMRgO/l50Mz8B24NGgWVLlWdaNysgU8f\n" +
-            "AgMBAAGjggKBMIICfTAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUH\n" +
-            "AwEwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUh/wMqf9pabUzGDoQvsyHVaT1rjAw\n" +
-            "HwYDVR0jBBgwFoAUkPhQ+ueQJcnkJ30S3UdY53QPtmoweAYIKwYBBQUHAQEEbDBq\n" +
-            "MDUGCCsGAQUFBzABhilodHRwOi8vb2NzcC5wa2kuZ29vZy9zL2d0czFkOC9CdWF6\n" +
-            "OFdQMnoybzAxBggrBgEFBQcwAoYlaHR0cDovL3BraS5nb29nL3JlcG8vY2VydHMv\n" +
-            "Z3RzMWQ4LmRlcjAmBgNVHREEHzAdghtyZXZva2VkLmd0c3IyLmRlbW8ucGtpLmdv\n" +
-            "b2cwIQYDVR0gBBowGDAIBgZngQwBAgEwDAYKKwYBBAHWeQIFAzA8BgNVHR8ENTAz\n" +
-            "MDGgL6AthitodHRwOi8vY3Jscy5wa2kuZ29vZy9ndHMxZDgvLTBOSExwOWNMOVEu\n" +
-            "Y3JsMIIBAwYKKwYBBAHWeQIEAgSB9ASB8QDvAHYAejKMVNi3LbYg6jjgUh7phBZw\n" +
-            "MhOFTTvSK8E6V6NS61IAAAGHJNGpywAABAMARzBFAiEApXndD34BJ3oOCLvGoa5f\n" +
-            "Xu0P6t4yf1pdCQONuLTSrX4CIDMp1N5/VKjClXqE/t2xux3mvJH2ceVECID4B69v\n" +
-            "WfOhAHUA6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0GvW4AAAGHJNGphwAA\n" +
-            "BAMARjBEAiBa5aSnTCc2ceQj/asKFYRRGbwzXTnaDbvNMMeB4ogEXAIgZykyJVPh\n" +
-            "4Sfkroi8tvV6dwxexp0dT2EXHAmr+/GzZU0wDQYJKoZIhvcNAQELBQADggEBAHVn\n" +
-            "uWbk/OaljXKeyhlDCgdvnzJGCFQXwGyIJzNDkCs8k3iA1iwJKArvpkczxnCBxCPE\n" +
-            "imW2MHWCayT9JXKuO4ppU0oTh6GYvRV6DV1OkuWXsna7+dGf3+tkm9k0wauI6J8X\n" +
-            "H1T8Dq3W0+S+8UNSftduYSR1wTcN15OxIzlZ/FrV3LLRDxH2RKSsXfXBLgP1befh\n" +
-            "m+8SPQTpZ5NdMl7my0gmVgNF5ZIbFiHYzJkF2vS4iXJCI6fTWyoA1u/7jQyHdLOy\n" +
-            "pY0s6gKWEwwtpYC1lWI6ek/wLfuNrJbiRRiRs8e3HHQymn8K3T1PM+7n8huDy95b\n" +
-            "f1EgLMjvEtx6xpIqrqg=\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon Mar 27 13:45:40 PDT 2023", System.out);
-    }
-}
-
-class GoogleGTSR3 {
-
-    // Owner: CN=GTS CA 2D3, O=Google Trust Services LLC, C=US
-    // Issuer: CN=GTS Root R3, O=Google Trust Services LLC, C=US
-    // Serial number: 21668d8d65bc4320e5b8e5e76
-    // Valid from: Tue Oct 04 17:00:42 PDT 2022 until: Wed Sep 29 17:00:42 PDT 2027
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIDIDCCAqagAwIBAgINAhZo2NZbxDIOW45edjAKBggqhkjOPQQDAzBHMQswCQYD\n" +
-            "VQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIG\n" +
-            "A1UEAxMLR1RTIFJvb3QgUjMwHhcNMjIxMDA1MDAwMDQyWhcNMjcwOTMwMDAwMDQy\n" +
-            "WjBGMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2Vz\n" +
-            "IExMQzETMBEGA1UEAxMKR1RTIENBIDJEMzBZMBMGByqGSM49AgEGCCqGSM49AwEH\n" +
-            "A0IABGQQXn8LoR0OtyBn+KkEav3utA7WFBgWEb/8bXVlW6xJLTZJIC04lsNmNKWJ\n" +
-            "P/fwHYfrZcx1o4vvOUTO9OD/7pijggF2MIIBcjAOBgNVHQ8BAf8EBAMCAYYwHQYD\n" +
-            "VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8CAQAw\n" +
-            "HQYDVR0OBBYEFL+pU78badiFKTSaaUPL1nrUmf9tMB8GA1UdIwQYMBaAFMHxJrqg\n" +
-            "La6Fgc/T8SoSvbgKZ/28MGgGCCsGAQUFBwEBBFwwWjAmBggrBgEFBQcwAYYaaHR0\n" +
-            "cDovL29jc3AucGtpLmdvb2cvZ3RzcjMwMAYIKwYBBQUHMAKGJGh0dHA6Ly9wa2ku\n" +
-            "Z29vZy9yZXBvL2NlcnRzL2d0c3IzLmRlcjA0BgNVHR8ELTArMCmgJ6AlhiNodHRw\n" +
-            "Oi8vY3JsLnBraS5nb29nL2d0c3IzL2d0c3IzLmNybDBNBgNVHSAERjBEMAgGBmeB\n" +
-            "DAECATA4BgorBgEEAdZ5AgUDMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vcGtpLmdv\n" +
-            "b2cvcmVwb3NpdG9yeS8wCgYIKoZIzj0EAwMDaAAwZQIxAO3wG4U11INX3hl2UyCn\n" +
-            "0A/upBaO+BBzX1OiQx7UfmMXc65kqkdIcNzZc6G6EWnNVAIwBG0LuIKWXfYc+Wbk\n" +
-            "STfMvwatUvd6QjdIKsYF0e8Hiaav+hLI0DzOuJcDPFtfYIyY\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=good.gtsr3.demo.pki.goog
-    // Issuer: CN=GTS CA 2D3, O=Google Trust Services LLC, C=US
-    // Serial number: 7d08ad6716e51d1210bfc149e3d0af19
-    // Valid from: Mon Mar 27 12:37:41 PDT 2023 until: Sun Jun 25 12:37:40 PDT 2023
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIEszCCBFmgAwIBAgIQfQitZxblHRIQv8FJ49CvGTAKBggqhkjOPQQDAjBGMQsw\n" +
-            "CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzET\n" +
-            "MBEGA1UEAxMKR1RTIENBIDJEMzAeFw0yMzAzMjcxOTM3NDFaFw0yMzA2MjUxOTM3\n" +
-            "NDBaMCMxITAfBgNVBAMTGGdvb2QuZ3RzcjMuZGVtby5wa2kuZ29vZzCCASIwDQYJ\n" +
-            "KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7R40feuILVPC65FhoVh3kZ8mJuEKpJ\n" +
-            "SiSB9gbKRkaKBr4kHOm7+sa0RkAm3Zgbomd2JGiJbYYcQ4lY8MMlXruFLLY+0AMf\n" +
-            "Pf5mQbn6i+oSyfaNwV0Hk1q1MhZL5WSKLywXS0NVw50JGQw/SiIRhmR22DdOtxuh\n" +
-            "VC7ZOebYTbHzTBSYTxvoyJZ0bGUQMWQ0rI2lzOp+2kqSTDMmRejXUNm14ZrsdXUb\n" +
-            "F8nOunZpT5ppESFvsK7TFrWJlAFHNVxJjPkNaRyfIaR7G+hORoV5tHGaNeTzmFkO\n" +
-            "3ySGcRlvL41IWqBN4LwLiS6QN+Je7nIBDojEPTBVhPCzP++1uLKEKusCAwEAAaOC\n" +
-            "An8wggJ7MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNV\n" +
-            "HRMBAf8EAjAAMB0GA1UdDgQWBBRRhq17jer1cVfi0eFV+LIwk+Lk8jAfBgNVHSME\n" +
-            "GDAWgBS/qVO/G2nYhSk0mmlDy9Z61Jn/bTB4BggrBgEFBQcBAQRsMGowNQYIKwYB\n" +
-            "BQUHMAGGKWh0dHA6Ly9vY3NwLnBraS5nb29nL3MvZ3RzMmQzL09KOENlY2cwdWNV\n" +
-            "MDEGCCsGAQUFBzAChiVodHRwOi8vcGtpLmdvb2cvcmVwby9jZXJ0cy9ndHMyZDMu\n" +
-            "ZGVyMCMGA1UdEQQcMBqCGGdvb2QuZ3RzcjMuZGVtby5wa2kuZ29vZzAhBgNVHSAE\n" +
-            "GjAYMAgGBmeBDAECATAMBgorBgEEAdZ5AgUDMDwGA1UdHwQ1MDMwMaAvoC2GK2h0\n" +
-            "dHA6Ly9jcmxzLnBraS5nb29nL2d0czJkMy9WREItNVdJSTVRSS5jcmwwggEEBgor\n" +
-            "BgEEAdZ5AgQCBIH1BIHyAPAAdgDoPtDaPvUGNTLnVyi8iWvJA9PL0RFr7Otp4Xd9\n" +
-            "bQa9bgAAAYckzOfmAAAEAwBHMEUCIF0wxIlFnHLMan20Gtbnia+mzuA1Re0dhoIS\n" +
-            "wOAO7aC4AiEA7cYfSflOAA0DLxHsHAXpVs2LuLYlq34bSxbyUa85UyYAdgCzc3cH\n" +
-            "4YRQ+GOG1gWp3BEJSnktsWcMC4fc8AMOeTalmgAAAYckzOf5AAAEAwBHMEUCICza\n" +
-            "2nef9GWr9tF/ZXxhMYP15JQsdWPWmpQkdS/xUBWyAiEAs9AaeMarT7EaBVoSatAT\n" +
-            "Poj6cOhdvF/uDOHigyQdVd8wCgYIKoZIzj0EAwIDSAAwRQIhALv6jaEFgAIe3NbX\n" +
-            "87YEjhMMymK7wl435DQD9syoOEx2AiBbcYXr6nLNWA1pPoRiA1WvHgTVJFWftpYt\n" +
-            "e8CkUXnIxA==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked.gtsr3.demo.pki.goog
-    // Issuer: CN=GTS CA 2D3, O=Google Trust Services LLC, C=US
-    // Serial number: 7ffa6a827df64c6010ebc47b5ca3eda7
-    // Valid from: Mon Mar 27 12:45:58 PDT 2023 until: Sun Jun 25 12:45:57 PDT 2023
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIEuTCCBF+gAwIBAgIQf/pqgn32TGAQ68R7XKPtpzAKBggqhkjOPQQDAjBGMQsw\n" +
-            "CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzET\n" +
-            "MBEGA1UEAxMKR1RTIENBIDJEMzAeFw0yMzAzMjcxOTQ1NThaFw0yMzA2MjUxOTQ1\n" +
-            "NTdaMCYxJDAiBgNVBAMTG3Jldm9rZWQuZ3RzcjMuZGVtby5wa2kuZ29vZzCCASIw\n" +
-            "DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpn78KglifqiS3f5hPLH64og4aH\n" +
-            "7a1tDBza2ebTLYB74i1u65EIENCyzvz6OYvh8kKzhqZMPFbORd8OCESzebjv/Dc2\n" +
-            "BJJV498N3BfSZYWN+baVxKuOZ4HWXV5NyP85rEvbcaAWcmqvh++G88FOCTQvYd4D\n" +
-            "/RKgAMptDjM+4X6V2NIRXcmOZJWZ2iItao76FARvbKH0D2UJLG4ENdOznRonnItP\n" +
-            "74UEVfNCb/i7I+NMJYTuDA4/rr+AS6pttvsVM9pqWkIJqOloEVNcCyyr1buflfJO\n" +
-            "j4A8Nz9fTUffpfApQnPi394iUcdCVyCrcjB2ta2eMR/3AyhiSXOmxcGjUcECAwEA\n" +
-            "AaOCAoIwggJ+MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAM\n" +
-            "BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSg57WFIkW4b1eTcWX+qZsN+JEewTAfBgNV\n" +
-            "HSMEGDAWgBS/qVO/G2nYhSk0mmlDy9Z61Jn/bTB4BggrBgEFBQcBAQRsMGowNQYI\n" +
-            "KwYBBQUHMAGGKWh0dHA6Ly9vY3NwLnBraS5nb29nL3MvZ3RzMmQzL1pEZWExWTdT\n" +
-            "SlBZMDEGCCsGAQUFBzAChiVodHRwOi8vcGtpLmdvb2cvcmVwby9jZXJ0cy9ndHMy\n" +
-            "ZDMuZGVyMCYGA1UdEQQfMB2CG3Jldm9rZWQuZ3RzcjMuZGVtby5wa2kuZ29vZzAh\n" +
-            "BgNVHSAEGjAYMAgGBmeBDAECATAMBgorBgEEAdZ5AgUDMDwGA1UdHwQ1MDMwMaAv\n" +
-            "oC2GK2h0dHA6Ly9jcmxzLnBraS5nb29nL2d0czJkMy9WREItNVdJSTVRSS5jcmww\n" +
-            "ggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAAdQDoPtDaPvUGNTLnVyi8iWvJA9PL0RFr\n" +
-            "7Otp4Xd9bQa9bgAAAYck00MJAAAEAwBGMEQCIALwbMReWy/zrvUwV1G5XOxN8koN\n" +
-            "VJ1pp7s1d7ClE9ebAiBYWwJeccnfHLIh9AJTdeuN+R/pDzEudVBSC2rIdo3HhgB3\n" +
-            "ALc++yTfnE26dfI5xbpY9Gxd/ELPep81xJ4dCYEl7bSZAAABhyTTQzMAAAQDAEgw\n" +
-            "RgIhAOEO0oyiRgMNDdWvRTobr7sex2SUFsjpKmwenYAULrRiAiEA6uKFK1sbnJ1J\n" +
-            "lW8Tw2G4jGpEFIc4C9duRbU6DIbGnckwCgYIKoZIzj0EAwIDSAAwRQIgN3byD4lu\n" +
-            "a8A0hzUR1OnPoXSyfus6HOhmBozH6coY9MICIQDsT5jj5GKVtxtlcki5iE08K70Z\n" +
-            "gt/tkcE1Fkk4RsZORA==\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon Mar 27 13:47:24 PDT 2023", System.out);
-    }
-}
-
-class GoogleGTSR4 {
-
-    // Owner: CN=GTS CA 2P2, O=Google Trust Services LLC, C=US
-    // Issuer: CN=GTS Root R4, O=Google Trust Services LLC, C=US
-    // Serial number: 2166825e1700440612491f540
-    // Valid from: Tue Oct 04 17:00:42 PDT 2022 until: Wed Sep 29 17:00:42 PDT 2027
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIDITCCAqagAwIBAgINAhZoJeFwBEBhJJH1QDAKBggqhkjOPQQDAzBHMQswCQYD\n" +
-            "VQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIG\n" +
-            "A1UEAxMLR1RTIFJvb3QgUjQwHhcNMjIxMDA1MDAwMDQyWhcNMjcwOTMwMDAwMDQy\n" +
-            "WjBGMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2Vz\n" +
-            "IExMQzETMBEGA1UEAxMKR1RTIENBIDJQMjBZMBMGByqGSM49AgEGCCqGSM49AwEH\n" +
-            "A0IABKdQkzjAHqOUsb/TkH7cz5lRtD374tNZ8rYrCUb1mxypE+VmCb1Jgzq+93tR\n" +
-            "dE78GRzPI4+q6raha1TEyWgoniOjggF2MIIBcjAOBgNVHQ8BAf8EBAMCAYYwHQYD\n" +
-            "VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8CAQAw\n" +
-            "HQYDVR0OBBYEFIcjqVBIDgeJVApxMPYz0gpH9p2sMB8GA1UdIwQYMBaAFIBM1ut0\n" +
-            "/0k2o9XY/LU+xWrwlB2MMGgGCCsGAQUFBwEBBFwwWjAmBggrBgEFBQcwAYYaaHR0\n" +
-            "cDovL29jc3AucGtpLmdvb2cvZ3RzcjQwMAYIKwYBBQUHMAKGJGh0dHA6Ly9wa2ku\n" +
-            "Z29vZy9yZXBvL2NlcnRzL2d0c3I0LmRlcjA0BgNVHR8ELTArMCmgJ6AlhiNodHRw\n" +
-            "Oi8vY3JsLnBraS5nb29nL2d0c3I0L2d0c3I0LmNybDBNBgNVHSAERjBEMAgGBmeB\n" +
-            "DAECATA4BgorBgEEAdZ5AgUDMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vcGtpLmdv\n" +
-            "b2cvcmVwb3NpdG9yeS8wCgYIKoZIzj0EAwMDaQAwZgIxAMnbIiQb5fsdexUuVGoB\n" +
-            "MVwsDPGd7VC13Y0OBezt7FqFHDwqm8nnVdV/FkNyXNv9/AIxAN51NGqMcbexMOYK\n" +
-            "pLC0zXfjNwvqBsZhmzCCQIM6MVyBID0rjjxPu7laIaHqAu6T5Q==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=good.gtsr4.demo.pki.goog
-    // Issuer: CN=GTS CA 2P2, O=Google Trust Services LLC, C=US
-    // Serial number: 743c4f78750e30f0d407a19254ba96a
-    // Valid from: Mon Mar 27 12:40:42 PDT 2023 until: Sun Jun 25 12:40:41 PDT 2023
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIEsTCCBFegAwIBAgIQB0PE94dQ4w8NQHoZJUupajAKBggqhkjOPQQDAjBGMQsw\n" +
-            "CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzET\n" +
-            "MBEGA1UEAxMKR1RTIENBIDJQMjAeFw0yMzAzMjcxOTQwNDJaFw0yMzA2MjUxOTQw\n" +
-            "NDFaMCMxITAfBgNVBAMTGGdvb2QuZ3RzcjQuZGVtby5wa2kuZ29vZzCCASIwDQYJ\n" +
-            "KoZIhvcNAQEBBQADggEPADCCAQoCggEBAOdkWBg3i5CxzH1dvlBoWHtIUyk78OAA\n" +
-            "bZdq7pKWB8i8C9Rf089uQ+7jQWOmqCNxU+OXdjumPfk/4MQvvtkmaqKi7HCN1bvQ\n" +
-            "0CrW7Zhi5jx11QuzEEZVdvXcchzmodp9GSl9t6zK/ItNiIYVisH9dqRWrZ/KZnO+\n" +
-            "y13dlr5UXAXVvNKx1L4TjhGlam7IEJdrAjkLJk4wXAFhv9HaPNJnjj0306xNm2h+\n" +
-            "VzldpMPlaXGN9JcGQdMVFpa9f0AI/r7SF7I2EDXaIKFToJ4jQurEGc3oxayiv9wB\n" +
-            "QapXqSTbPztb5SPGdX1yawDeigNHf10tDqFzCpfI/AwLxagpA2YyyXMCAwEAAaOC\n" +
-            "An0wggJ5MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNV\n" +
-            "HRMBAf8EAjAAMB0GA1UdDgQWBBTZs4UFHCFLlXnJswubCMxEhtgPmjAfBgNVHSME\n" +
-            "GDAWgBSHI6lQSA4HiVQKcTD2M9IKR/adrDB4BggrBgEFBQcBAQRsMGowNQYIKwYB\n" +
-            "BQUHMAGGKWh0dHA6Ly9vY3NwLnBraS5nb29nL3MvZ3RzMnAyL3dKWTY1eFNLQUNB\n" +
-            "MDEGCCsGAQUFBzAChiVodHRwOi8vcGtpLmdvb2cvcmVwby9jZXJ0cy9ndHMycDIu\n" +
-            "ZGVyMCMGA1UdEQQcMBqCGGdvb2QuZ3RzcjQuZGVtby5wa2kuZ29vZzAhBgNVHSAE\n" +
-            "GjAYMAgGBmeBDAECATAMBgorBgEEAdZ5AgUDMDwGA1UdHwQ1MDMwMaAvoC2GK2h0\n" +
-            "dHA6Ly9jcmxzLnBraS5nb29nL2d0czJwMi94NWswT2ZlZ0o4OC5jcmwwggECBgor\n" +
-            "BgEEAdZ5AgQCBIHzBIHwAO4AdQDoPtDaPvUGNTLnVyi8iWvJA9PL0RFr7Otp4Xd9\n" +
-            "bQa9bgAAAYckzdBSAAAEAwBGMEQCICpm7XEQds5Pzk59Qhhlx3PjipAEVzxVJB3H\n" +
-            "UmmGlHYKAiBG39UauHNNQDMYK2PEnILbFI0AvVWpCBUck4CHbs+9xAB1AHoyjFTY\n" +
-            "ty22IOo44FIe6YQWcDIThU070ivBOlejUutSAAABhyTN0JoAAAQDAEYwRAIgekoP\n" +
-            "yJFspEfqvzW/pzVtRn8oz1L/PBzw2NYRPFdDkRUCIG1uIaGUA7uqiILD6vvp/1VD\n" +
-            "XriEIH8/qz/3qWqxsZanMAoGCCqGSM49BAMCA0gAMEUCIQCnpyh5H9Hn+f8nOFZp\n" +
-            "wz7p+x5pmMVvPzah1g+EmoFO/wIgStidgVhudT/vpM2OH/oN30Na+EJJDqWxousN\n" +
-            "6t9L8FQ=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked.gtsr4.demo.pki.goog
-    // Issuer: CN=GTS CA 2P2, O=Google Trust Services LLC, C=US
-    // Serial number: 6b2d650d4bc3bd3f11a595bf05187915
-    // Valid from: Mon Mar 27 12:47:43 PDT 2023 until: Sun Jun 25 12:47:42 PDT 2023
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIEuDCCBF6gAwIBAgIQay1lDUvDvT8RpZW/BRh5FTAKBggqhkjOPQQDAjBGMQsw\n" +
-            "CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzET\n" +
-            "MBEGA1UEAxMKR1RTIENBIDJQMjAeFw0yMzAzMjcxOTQ3NDNaFw0yMzA2MjUxOTQ3\n" +
-            "NDJaMCYxJDAiBgNVBAMTG3Jldm9rZWQuZ3RzcjQuZGVtby5wa2kuZ29vZzCCASIw\n" +
-            "DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOEKoC1Zv/m2G8DrGkOgLq5TPSeC\n" +
-            "X3cClcI6s4JS5Cld2DKX7m4P8rXAxJyVHvlmkxZQoD6Y7JxsavlJ/Yw0qdqkNLTv\n" +
-            "kviEiLNYEn8Qu0SoRLNanzoFUINZkAZ4/0Lfvsrl9tTigLsCJ4jQauemGmGcmKUy\n" +
-            "qsKisfrMC0ZG9EP9WRjc9WF13Jqe55+gZ7LqaAAoPVR/7J6T1VAKteaYaXrORtVF\n" +
-            "uMeinE4c9YuxRCLa+3X1qqc3HAsvZEBOdb35fC0cN/ILktCQpq1Fj+QD4jfR6bVQ\n" +
-            "E8eA6Jy+5qHSg2VjAm6wNLd5QkfE7D8uC9sYs638r48ahcXhy3zwpzGhuH0CAwEA\n" +
-            "AaOCAoEwggJ9MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAM\n" +
-            "BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQl5Uh4jTR3l8PkcLdBwtwQXkUzBjAfBgNV\n" +
-            "HSMEGDAWgBSHI6lQSA4HiVQKcTD2M9IKR/adrDB4BggrBgEFBQcBAQRsMGowNQYI\n" +
-            "KwYBBQUHMAGGKWh0dHA6Ly9vY3NwLnBraS5nb29nL3MvZ3RzMnAyL3h5WmtBTEE3\n" +
-            "aGY0MDEGCCsGAQUFBzAChiVodHRwOi8vcGtpLmdvb2cvcmVwby9jZXJ0cy9ndHMy\n" +
-            "cDIuZGVyMCYGA1UdEQQfMB2CG3Jldm9rZWQuZ3RzcjQuZGVtby5wa2kuZ29vZzAh\n" +
-            "BgNVHSAEGjAYMAgGBmeBDAECATAMBgorBgEEAdZ5AgUDMDwGA1UdHwQ1MDMwMaAv\n" +
-            "oC2GK2h0dHA6Ly9jcmxzLnBraS5nb29nL2d0czJwMi9sU1htaTNxZWRoYy5jcmww\n" +
-            "ggEDBgorBgEEAdZ5AgQCBIH0BIHxAO8AdgCt9776fP8QyIudPZwePhhqtGcpXc+x\n" +
-            "DCTKhYY069yCigAAAYck1BYGAAAEAwBHMEUCIGM5ykDTU3mqgLIk+fPmVn6JGUXB\n" +
-            "W4xouGUA1iiNs7G0AiEAtuWnV/J5llcxB7ZTwkCb6cviyv4Z6O396ZGW8GsrqAQA\n" +
-            "dQC3Pvsk35xNunXyOcW6WPRsXfxCz3qfNcSeHQmBJe20mQAAAYck1BYIAAAEAwBG\n" +
-            "MEQCIHcK1H025GIv8klzQGSZAL9NnuH5EzeGra0jRRg5RM4UAiAQaJyJDBkJRL/C\n" +
-            "F9WCg9Lmp8bdsXkG5WPreI24ansAPTAKBggqhkjOPQQDAgNIADBFAiBehPLU7raP\n" +
-            "509khaP9yiKiL3mbygtfQo4MDpBnd2RI6wIhAOdlQythGgU+nOENodsB+wUOQXOb\n" +
-            "akcBOxrDWfyhxmpk\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon Mar 27 13:48:18 PDT 2023", System.out);
-    }
-}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/LetsEncryptCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/LetsEncryptCA.java
deleted file mode 100644
index d97342ae8d2..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/LetsEncryptCA.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
- /*
- * @test
- * @bug 8189131
- * @summary Interoperability tests with Let's Encrypt CA
- * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath LetsEncryptCA OCSP
- * @run main/othervm -Djava.security.debug=certpath LetsEncryptCA CRL
- */
-
- /*
- * Obtain TLS test artifacts for Let's Encrypt CA from:
- *
- * Valid TLS Certificates:
- * https://valid-isrgrootx1.letsencrypt.org/
- *
- * Revoked TLS Certificates:
- * https://revoked-isrgrootx1.letsencrypt.org/
- *
- * Test artifacts don't have CRLs listed and intermediate cert doesn't have OCSP.
- */
-public class LetsEncryptCA {
-
-     // Owner: CN=R3, O=Let's Encrypt, C=US
-     // Issuer: CN=ISRG Root X1, O=Internet Security Research Group, C=US
-     // Serial number: 912b084acf0c18a753f6d62e25a75f5a
-     // Valid from: Thu Sep 03 17:00:00 PDT 2020 until: Mon Sep 15 09:00:00 PDT 2025
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw\n" +
-            "TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh\n" +
-            "cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw\n" +
-            "WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg\n" +
-            "RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\n" +
-            "AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP\n" +
-            "R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx\n" +
-            "sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm\n" +
-            "NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg\n" +
-            "Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG\n" +
-            "/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC\n" +
-            "AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB\n" +
-            "Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA\n" +
-            "FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw\n" +
-            "AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw\n" +
-            "Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB\n" +
-            "gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W\n" +
-            "PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl\n" +
-            "ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz\n" +
-            "CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm\n" +
-            "lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4\n" +
-            "avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2\n" +
-            "yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O\n" +
-            "yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids\n" +
-            "hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+\n" +
-            "HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv\n" +
-            "MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX\n" +
-            "nLRbwHOoq7hHwg==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=valid-isrgrootx1.letsencrypt.org
-    // Issuer: CN=R3, O=Let's Encrypt, C=US
-    // Serial number: 46326744d1c2f3feeca7148ed59353144a6
-    // Valid from: Wed Jun 02 08:00:18 PDT 2021 until: Tue Aug 31 08:00:18 PDT 2021
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFSDCCBDCgAwIBAgISBGMmdE0cLz/uynFI7Vk1MUSmMA0GCSqGSIb3DQEBCwUA\n" +
-            "MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD\n" +
-            "EwJSMzAeFw0yMTA2MDIxNTAwMThaFw0yMTA4MzExNTAwMThaMCsxKTAnBgNVBAMT\n" +
-            "IHZhbGlkLWlzcmdyb290eDEubGV0c2VuY3J5cHQub3JnMIIBIjANBgkqhkiG9w0B\n" +
-            "AQEFAAOCAQ8AMIIBCgKCAQEAmdx7jlaUZ0MgEvqzYWXItAFxVAOmR3KF+79vU195\n" +
-            "O5X54Go1+GU+eyFAeTqr6W1gC/MIrSA9LO4neJUx5AWCYaLq7IE7/YnmXTT6BB0x\n" +
-            "WFN3V1OJg9bAqpcEclQp6fbQS6DjdQvUUaEvVIwPzaen6Hmtw6LuHOYOdLk4fUSm\n" +
-            "zadWiyNlMm0/ts+MLHY5iQd9ypGhJED7KBDQ4d4wvyMYo/MYKOUQ+dTXcIegh7p4\n" +
-            "0OVtbrkdCuGJL+cEw1IUtSNQD+MnvUIu1je7Yb6iZ6Qd3iopNLykHYZb8YemakGX\n" +
-            "SDdC54yi35NU+Y+l23vycbVmRd8vK1sizhjRSE+ufmEqXQIDAQABo4ICXTCCAlkw\n" +
-            "DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM\n" +
-            "BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBR300bKVFG2auzS0mO4+E57SN6QLzAfBgNV\n" +
-            "HSMEGDAWgBQULrMXt1hWy65QCUDmH6+dixTCxjBVBggrBgEFBQcBAQRJMEcwIQYI\n" +
-            "KwYBBQUHMAGGFWh0dHA6Ly9yMy5vLmxlbmNyLm9yZzAiBggrBgEFBQcwAoYWaHR0\n" +
-            "cDovL3IzLmkubGVuY3Iub3JnLzArBgNVHREEJDAigiB2YWxpZC1pc3Jncm9vdHgx\n" +
-            "LmxldHNlbmNyeXB0Lm9yZzBMBgNVHSAERTBDMAgGBmeBDAECATA3BgsrBgEEAYLf\n" +
-            "EwEBATAoMCYGCCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCC\n" +
-            "AQYGCisGAQQB1nkCBAIEgfcEgfQA8gB3APZclC/RdzAiFFQYCDCUVo7jTRMZM7/f\n" +
-            "DC8gC8xO8WTjAAABec10PpUAAAQDAEgwRgIhAPDWvnP5mA0RhPa9oiTlE21Ppcez\n" +
-            "eF1+wU0MeoQcjq/7AiEAsox8kMGpWXq0ZVPweTpw1So/sNOZTsSPyBUdbLwjf+MA\n" +
-            "dwBvU3asMfAxGdiZAKRRFf93FRwR2QLBACkGjbIImjfZEwAAAXnNdD7rAAAEAwBI\n" +
-            "MEYCIQCYBSmmb5P+DZGANyYTPHlEbmqOBkEOblkEHq5Lf+wtkQIhAO2HhwOm3wns\n" +
-            "ZTsXjUCcfQA0lKBI2TKkg9tJKFs3uuKDMA0GCSqGSIb3DQEBCwUAA4IBAQBJJ47x\n" +
-            "ZhKN3QRBYVROpoYDSh0a/JW7zPGRCxK5fnDY9UT8m4gEh3yhDTkycX+vo8TReK6W\n" +
-            "fEYareTSTq71MYgtKDYEARm10DuL7Vdig9Tf5DpjXLHaba+wqPz24lwhiJgoKRRr\n" +
-            "8by3wXPFCGSuQyDo1ZUNrAJVYKO4hPMob1ZE8z9IYW63GvzBjEla/HxoVa9iTkv+\n" +
-            "31rsKzpSbMJpnQ7WcgkUPdpoDo4JElGCyf7VZHNicumipAiCmKu0Q6TRCPOXxlKE\n" +
-            "/BIyDey3rXVw3wzOlxmVF6t/V3vGtbgVvN/feUe/ytyv4vLfRR4udi2XxWt3x1la\n" +
-            "7R3zuWdRQhh21p1H\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked-isrgrootx1.letsencrypt.org
-    // Issuer: CN=R3, O=Let's Encrypt, C=US
-    // Serial number: 4f1333011635d76d6356c5f1fb8a7273617
-    // Valid from: Fri Jun 25 08:18:10 PDT 2021 until: Thu Sep 23 08:18:09 PDT 2021
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFSTCCBDGgAwIBAgISBPEzMBFjXXbWNWxfH7inJzYXMA0GCSqGSIb3DQEBCwUA\n" +
-            "MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD\n" +
-            "EwJSMzAeFw0yMTA2MjUxNTE4MTBaFw0yMTA5MjMxNTE4MDlaMC0xKzApBgNVBAMT\n" +
-            "InJldm9rZWQtaXNyZ3Jvb3R4MS5sZXRzZW5jcnlwdC5vcmcwggEiMA0GCSqGSIb3\n" +
-            "DQEBAQUAA4IBDwAwggEKAoIBAQCkCp4fq7FnN5lfAWX0vhCcyC5WO9TuU6ckuYYj\n" +
-            "8/wQ8GQ/FIl+vXCAmHIfIX14irQN8TISeVdMOP0C7sa73d3GSawX7qMaRhddXn7V\n" +
-            "EL+4CbHQ6qit5YkakwhHz9tKbYX16wPj+inn22kJVwi8iLbhYB9WWSvv7OyiNSHv\n" +
-            "nmlYUkMv8+9UhgPT4yCKF1OEI5ajUOuecjOKc+EzsT/JqPRErvBOIKn3PRn4h8UM\n" +
-            "0BJDrDtZMpkvD4/lyRs3g/BLsf3DQjlEgKit0hvc72yyhiDbKd41EmBoQC5rNF7o\n" +
-            "B0CnBXhDLHbC/YRunVrYGsF0h2J9hw4055BdaXbS2BJnPEFnAgMBAAGjggJcMIIC\n" +
-            "WDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC\n" +
-            "MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFJBkf3Z/ICoCTUx3JCgrBeoMyedQMB8G\n" +
-            "A1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUGCCsGAQUFBwEBBEkwRzAh\n" +
-            "BggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3JnMCIGCCsGAQUFBzAChhZo\n" +
-            "dHRwOi8vcjMuaS5sZW5jci5vcmcvMC0GA1UdEQQmMCSCInJldm9rZWQtaXNyZ3Jv\n" +
-            "b3R4MS5sZXRzZW5jcnlwdC5vcmcwTAYDVR0gBEUwQzAIBgZngQwBAgEwNwYLKwYB\n" +
-            "BAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5v\n" +
-            "cmcwggEDBgorBgEEAdZ5AgQCBIH0BIHxAO8AdQCUILwejtWNbIhzH4KLIiwN0dpN\n" +
-            "XmxPlD1h204vWE2iwgAAAXpD9t6nAAAEAwBGMEQCIHwF9NcPqsovYp56lhqFkWYj\n" +
-            "QCATATrLzzxgUoLDYRwgAiBBecqe5Ub32I+q9oqH1nbK/s8QadcafIL3bkrRVbFB\n" +
-            "TAB2AH0+8viP/4hVaCTCwMqeUol5K8UOeAl/LmqXaJl+IvDXAAABekP23sYAAAQD\n" +
-            "AEcwRQIgGli/1mmKKnZ0uxDIX7ySqAyD2C7FTf+y3py2S0Xcv4YCIQCZve3cqKZ2\n" +
-            "lrEyyaMeLZA+PIxUMniHx3gDkro0sKLzOzANBgkqhkiG9w0BAQsFAAOCAQEAle42\n" +
-            "p58OTusm7DAOcdK4ld+pJu2bz9F940Wrnql08rciRjGIVpp5PhMNFm9AOaptKPNY\n" +
-            "h62V2GEOVaLxmvr9/8EDFcCCPAGV1DNYrG9aTKaiXk7IzO4UxKbzox4iUcuop/zB\n" +
-            "uofxT8uBLmT4XYZrQXXKj1KdfJGzgeoXqBv5PPCiP3hmBQixoJnSKImnUIXWh4O8\n" +
-            "kBtmgII5ug0q+jI3LvpJuv7xQsaNYFBcmFiQQ7YRt4W99GMdbYGjhzT8iBDEH7nG\n" +
-            "MsqWuwB5TN5vIuw2aWxcfaqKayq7UPA4rJePWdD/5RzKlQKLQx0BA3AL+3Nnj1fT\n" +
-            "NEKwCWWylIND6z/9Xw==\n" +
-            "-----END CERTIFICATE-----";
-
-    public static void main(String[] args) throws Exception {
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-            pathValidator.enableCRLCheck();
-
-            // Validate int, EE certs don't have CRLs
-            pathValidator.validate(new String[]{INT},
-                    ValidatePathWithParams.Status.GOOD, null, System.out);
-
-            return;
-        }
-
-        // OCSP check by default
-        // intermediate cert R3 doesn't specify OCSP responder
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(new String[]{INT});
-        pathValidator.enableOCSPCheck();
-
-        // Validate valid
-        pathValidator.validate(new String[]{VALID},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED},
-                ValidatePathWithParams.Status.REVOKED,
-                "Fri Jun 25 09:18:12 PDT 2021", System.out);
-    }
-}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/MicrosoftTLS.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/MicrosoftTLS.java
deleted file mode 100644
index e21aad61b83..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/MicrosoftTLS.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8304760
- * @summary Interoperability tests with Microsoft TLS root CAs
- * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath MicrosoftTLS OCSP
- * @run main/othervm -Djava.security.debug=certpath MicrosoftTLS CRL
- */
-
-/*
- * Microsoft ECC Root Certificate Authority 2017:
- * Valid: http://acteccroot2017.pki.microsoft.com/
- * Revoked: http://rvkeccroot2017.pki.microsoft.com/
- * Expired: http://expeccroot2017.pki.microsoft.com/
- *
- * Microsoft RSA Root Certificate Authority 2017:
- * Valid: http://actrsaroot2017.pki.microsoft.com/
- * Revoked: http://rvkrsaroot2017.pki.microsoft.com/
- * Expired: http://exprsaroot2017.pki.microsoft.com/
- */
-public class MicrosoftTLS {
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-        }
-
-        new MicrosoftECCTLS().runTest(pathValidator);
-        new MicrosoftRSATLS().runTest(pathValidator);
-    }
-}
-
-class MicrosoftECCTLS {
-
-    // Owner: CN=Microsoft ECC TLS Issuing AOC CA 01, O=Microsoft Corporation, C=US
-    // Issuer: CN=Microsoft ECC Root Certificate Authority 2017, O=Microsoft
-    // Corporation, C=US
-    // Serial number: 33000000282bfd23e7d1add707000000000028
-    // Valid from: Thu Jun 24 12:58:36 PDT 2021 until: Wed Jun 24 12:58:36 PDT 2026
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIESTCCA8+gAwIBAgITMwAAACgr/SPn0a3XBwAAAAAAKDAKBggqhkjOPQQDAzBl\n" +
-            "MQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYw\n" +
-            "NAYDVQQDEy1NaWNyb3NvZnQgRUNDIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5\n" +
-            "IDIwMTcwHhcNMjEwNjI0MTk1ODM2WhcNMjYwNjI0MTk1ODM2WjBbMQswCQYDVQQG\n" +
-            "EwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSwwKgYDVQQDEyNN\n" +
-            "aWNyb3NvZnQgRUNDIFRMUyBJc3N1aW5nIEFPQyBDQSAwMTB2MBAGByqGSM49AgEG\n" +
-            "BSuBBAAiA2IABMBXcHExvrYrhw7v30oPR4aBaMne5o0FtTtbMV7iqVhTJDQSWDEJ\n" +
-            "hr528nyS6jcLLu9pLXQMJYxVd7bz4wWXgVtZnnbQ7trAAIPWVh5B6f5eJf5OQ7w7\n" +
-            "AwJgz3snP5Hx16OCAkkwggJFMA4GA1UdDwEB/wQEAwIBhjAQBgkrBgEEAYI3FQEE\n" +
-            "AwIBADAdBgNVHQ4EFgQUMVu5zlEbfNGqA8Dr7TZdwp3TieEwHQYDVR0lBBYwFAYI\n" +
-            "KwYBBQUHAwEGCCsGAQUFBwMCMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMBIG\n" +
-            "A1UdEwEB/wQIMAYBAf8CAQAwHwYDVR0jBBgwFoAUyMuZcnBSDPjmvrIEVykqz0IQ\n" +
-            "7TUwcAYDVR0fBGkwZzBloGOgYYZfaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3Br\n" +
-            "aW9wcy9jcmwvTWljcm9zb2Z0JTIwRUNDJTIwUm9vdCUyMENlcnRpZmljYXRlJTIw\n" +
-            "QXV0aG9yaXR5JTIwMjAxNy5jcmwwga4GCCsGAQUFBwEBBIGhMIGeMG0GCCsGAQUF\n" +
-            "BzAChmFodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jv\n" +
-            "c29mdCUyMEVDQyUyMFJvb3QlMjBDZXJ0aWZpY2F0ZSUyMEF1dGhvcml0eSUyMDIw\n" +
-            "MTcuY3J0MC0GCCsGAQUFBzABhiFodHRwOi8vb25lb2NzcC5taWNyb3NvZnQuY29t\n" +
-            "L29jc3AwcAYDVR0gBGkwZzAIBgZngQwBAgEwCAYGZ4EMAQICMFEGDCsGAQQBgjdM\n" +
-            "g30BATBBMD8GCCsGAQUFBwIBFjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtp\n" +
-            "b3BzL0RvY3MvUmVwb3NpdG9yeS5odG0wCgYIKoZIzj0EAwMDaAAwZQIxANmPydUj\n" +
-            "lgj/2K77UnMeMkSGIgXzOhcTsixzZL+NmTR1Bq2hSPeA6Y3mn3lMlwxZmAIwIio6\n" +
-            "KrgItH4YmLWKd8QClIrE9QjbDlR7oFqaU3J34bWbMlAEjRARdZhhQlNwdORe\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: O=Microsoft Corporation, L=Redmond, ST=Washington, C=US
-    // Issuer: CN=Microsoft ECC TLS Issuing AOC CA 01, O=Microsoft Corporation, C=US
-    // Serial number: 3300000154e1c6007ee3d5c903000000000154
-    // Valid from: Fri Oct 14 13:44:52 PDT 2022 until: Mon Oct 09 13:44:52 PDT 2023
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIF3zCCBWSgAwIBAgITMwAAAVThxgB+49XJAwAAAAABVDAKBggqhkjOPQQDAzBb\n" +
-            "MQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSww\n" +
-            "KgYDVQQDEyNNaWNyb3NvZnQgRUNDIFRMUyBJc3N1aW5nIEFPQyBDQSAwMTAeFw0y\n" +
-            "MjEwMTQyMDQ0NTJaFw0yMzEwMDkyMDQ0NTJaMFQxCzAJBgNVBAYTAlVTMRMwEQYD\n" +
-            "VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy\n" +
-            "b3NvZnQgQ29ycG9yYXRpb24wdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARk86yqvyiv\n" +
-            "jH2Frg2l6bmh1f0CqiKAEHdA2S2vTQhR4CtvFArkrPdqcKrhAAfQSgnC8KJQ08gl\n" +
-            "QvjK55202ib55YX3h+96IW6fQOkE18cvPwqkD3DVQuROouLaL1r70NWjggPvMIID\n" +
-            "6zCCAX8GCisGAQQB1nkCBAIEggFvBIIBawFpAHYA6D7Q2j71BjUy51covIlryQPT\n" +
-            "y9ERa+zraeF3fW0GvW4AAAGD2EdUigAABAMARzBFAiEA6rbt+9QhpuqX36PnuckO\n" +
-            "fR0Wu/8z3Yry9fdFKvJDCEUCIGBz901b4ZGEjCaSJdlZVr29v2td4crPa9I6S97i\n" +
-            "nShAAHYAs3N3B+GEUPhjhtYFqdwRCUp5LbFnDAuH3PADDnk2pZoAAAGD2EdU/wAA\n" +
-            "BAMARzBFAiBIvnSKGeCIWOlZowi7s7ZdwmyGhv2waJWSdewUSS6UOAIhALJhPQ19\n" +
-            "nmjjTwWB9sgCIF7RZbd2xwBd1hno06MQMSqTAHcAejKMVNi3LbYg6jjgUh7phBZw\n" +
-            "MhOFTTvSK8E6V6NS61IAAAGD2EdUxwAABAMASDBGAiEArrc6Fu74KTj/z4lGCK9A\n" +
-            "O6UkhLpKnXdxEHilY7ghcZICIQCUjkvK4wehX1qEonjQoBkBJxLCus6y8WbkoxCe\n" +
-            "jHu2HTAbBgkrBgEEAYI3FQoEDjAMMAoGCCsGAQUFBwMBMDwGCSsGAQQBgjcVBwQv\n" +
-            "MC0GJSsGAQQBgjcVCIe91xuB5+tGgoGdLo7QDIfw2h1dgbXdUIWf/XUCAWQCAR0w\n" +
-            "gaYGCCsGAQUFBwEBBIGZMIGWMGUGCCsGAQUFBzAChllodHRwOi8vd3d3Lm1pY3Jv\n" +
-            "c29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMEVDQyUyMFRMUyUyMElz\n" +
-            "c3VpbmclMjBBT0MlMjBDQSUyMDAxLmNydDAtBggrBgEFBQcwAYYhaHR0cDovL29u\n" +
-            "ZW9jc3AubWljcm9zb2Z0LmNvbS9vY3NwMB0GA1UdDgQWBBTVpTA+3jWCa1okX5Ri\n" +
-            "HnuY2/b+IzAOBgNVHQ8BAf8EBAMCB4AwKwYDVR0RBCQwIoIgYWN0ZWNjcm9vdDIw\n" +
-            "MTcucGtpLm1pY3Jvc29mdC5jb20waAYDVR0fBGEwXzBdoFugWYZXaHR0cDovL3d3\n" +
-            "dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljcm9zb2Z0JTIwRUNDJTIwVExT\n" +
-            "JTIwSXNzdWluZyUyMEFPQyUyMENBJTIwMDEuY3JsMGYGA1UdIARfMF0wUQYMKwYB\n" +
-            "BAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93d3cubWljcm9zb2Z0LmNv\n" +
-            "bS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTAIBgZngQwBAgIwHwYDVR0jBBgw\n" +
-            "FoAUMVu5zlEbfNGqA8Dr7TZdwp3TieEwEwYDVR0lBAwwCgYIKwYBBQUHAwEwCgYI\n" +
-            "KoZIzj0EAwMDaQAwZgIxAOKV8s3SpXVd6zho8zQa4uGXkxPVocYo410FdTwu0lw7\n" +
-            "G/MQPhLmj4DNsQJ/nYzDcwIxAMw7iZExsY9Is66/EaAty4rA+yuliwCag88VnDRH\n" +
-            "9cjiongZgpddIYS8xf76B2pi/Q==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: O=Microsoft Corporation, L=Redmond, ST=Washington, C=US
-    // Issuer: CN=Microsoft ECC TLS Issuing AOC CA 01, O=Microsoft Corporation, C=US
-    // Serial number: 3300000155ea28117be8708034000000000155
-    // Valid from: Fri Oct 14 13:50:39 PDT 2022 until: Mon Oct 09 13:50:39 PDT 2023
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIF3TCCBWOgAwIBAgITMwAAAVXqKBF76HCANAAAAAABVTAKBggqhkjOPQQDAzBb\n" +
-            "MQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSww\n" +
-            "KgYDVQQDEyNNaWNyb3NvZnQgRUNDIFRMUyBJc3N1aW5nIEFPQyBDQSAwMTAeFw0y\n" +
-            "MjEwMTQyMDUwMzlaFw0yMzEwMDkyMDUwMzlaMFQxCzAJBgNVBAYTAlVTMRMwEQYD\n" +
-            "VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy\n" +
-            "b3NvZnQgQ29ycG9yYXRpb24wdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARbimHzMojc\n" +
-            "ilBoJCu+adc99oS855DwGTmkKofXfEf6Ej6G9v6Zg1Y2a1wqs5Wd3IcqQONeqKK8\n" +
-            "EGxUL7DBpf1dBDsRpWSfenYIRtAzs/JznW0dfGPgnY0kGi4g52JegCOjggPuMIID\n" +
-            "6jCCAX4GCisGAQQB1nkCBAIEggFuBIIBagFoAHUArfe++nz/EMiLnT2cHj4YarRn\n" +
-            "KV3PsQwkyoWGNOvcgooAAAGD2EyY+gAABAMARjBEAiBnysZazdmXKeL4CnYkJxI2\n" +
-            "g5juWT5jQfBi5Nxfc3zc9gIgGSGTTGw+E0864BRuAJjhFRF+j5keQ7Rik+PhGnd1\n" +
-            "P1gAdgB6MoxU2LcttiDqOOBSHumEFnAyE4VNO9IrwTpXo1LrUgAAAYPYTJjXAAAE\n" +
-            "AwBHMEUCIQDmYqZ1fw/8X2lBl51TknJ8t8sRz4fEFkayqFrmNug1WQIgELQm99K3\n" +
-            "QH+Rr8rk9x6835NjXBBAyrrI2B8XLiELITUAdwCzc3cH4YRQ+GOG1gWp3BEJSnkt\n" +
-            "sWcMC4fc8AMOeTalmgAAAYPYTJkaAAAEAwBIMEYCIQD+jnAFon/1Bobh3R4wzym7\n" +
-            "yiDQ35ZUeRcfFes1IvgyvgIhAPILSf2w3HW7YmbthAVT4P13G+8xFIVlYihgVegU\n" +
-            "cJy8MBsGCSsGAQQBgjcVCgQOMAwwCgYIKwYBBQUHAwEwPAYJKwYBBAGCNxUHBC8w\n" +
-            "LQYlKwYBBAGCNxUIh73XG4Hn60aCgZ0ujtAMh/DaHV2Btd1QhZ/9dQIBZAIBHTCB\n" +
-            "pgYIKwYBBQUHAQEEgZkwgZYwZQYIKwYBBQUHMAKGWWh0dHA6Ly93d3cubWljcm9z\n" +
-            "b2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljcm9zb2Z0JTIwRUNDJTIwVExTJTIwSXNz\n" +
-            "dWluZyUyMEFPQyUyMENBJTIwMDEuY3J0MC0GCCsGAQUFBzABhiFodHRwOi8vb25l\n" +
-            "b2NzcC5taWNyb3NvZnQuY29tL29jc3AwHQYDVR0OBBYEFN3cgtHESQ8o7thvaL42\n" +
-            "bD7mpfktMA4GA1UdDwEB/wQEAwIHgDArBgNVHREEJDAigiBydmtlY2Nyb290MjAx\n" +
-            "Ny5wa2kubWljcm9zb2Z0LmNvbTBoBgNVHR8EYTBfMF2gW6BZhldodHRwOi8vd3d3\n" +
-            "Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBFQ0MlMjBUTFMl\n" +
-            "MjBJc3N1aW5nJTIwQU9DJTIwQ0ElMjAwMS5jcmwwZgYDVR0gBF8wXTBRBgwrBgEE\n" +
-            "AYI3TIN9AQEwQTA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29t\n" +
-            "L3BraW9wcy9Eb2NzL1JlcG9zaXRvcnkuaHRtMAgGBmeBDAECAjAfBgNVHSMEGDAW\n" +
-            "gBQxW7nOURt80aoDwOvtNl3CndOJ4TATBgNVHSUEDDAKBggrBgEFBQcDATAKBggq\n" +
-            "hkjOPQQDAwNoADBlAjBBhbuh/iukcibeEh/Op3RfNf6jUSyza4lZvsJsRiEVwySa\n" +
-            "ofmg8OvBO2l2+9MjoCUCMQCoiyS1tDgtjW9gguKDgPXypURpL27KfnCzwx6ar2LN\n" +
-            "gCZ/soGnLsgPIscuNH/BK20=\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Fri Oct 14 15:46:18 PDT 2022", System.out);
-    }
-}
-
-class MicrosoftRSATLS {
-
-    // Owner: CN=Microsoft RSA TLS Issuing AOC CA 01, O=Microsoft Corporation, C=US
-    // Issuer: CN=Microsoft RSA Root Certificate Authority 2017, O=Microsoft
-    // Corporation, C=US
-    // Serial number: 330000002ffaf06f6697e2469c00000000002f
-    // Valid from: Thu Jun 24 13:57:35 PDT 2021 until: Wed Jun 24 13:57:35 PDT 2026
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHmDCCBYCgAwIBAgITMwAAAC/68G9ml+JGnAAAAAAALzANBgkqhkiG9w0BAQwF\n" +
-            "ADBlMQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9u\n" +
-            "MTYwNAYDVQQDEy1NaWNyb3NvZnQgUlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9y\n" +
-            "aXR5IDIwMTcwHhcNMjEwNjI0MjA1NzM1WhcNMjYwNjI0MjA1NzM1WjBbMQswCQYD\n" +
-            "VQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSwwKgYDVQQD\n" +
-            "EyNNaWNyb3NvZnQgUlNBIFRMUyBJc3N1aW5nIEFPQyBDQSAwMTCCAiIwDQYJKoZI\n" +
-            "hvcNAQEBBQADggIPADCCAgoCggIBAKAYz8zB6I+LeiWYURf1QUaISydvRgxWfcc6\n" +
-            "UvEiwvryj2UsRfFuREo2ErLTvP9qQ9E0YBTyWEqI2TXn4jo2uZ2cpGODiQQWlixe\n" +
-            "aAFcYgSqLzidFXj401vzQsz4E0zylD/ZeY+xkQ6xrdg5312x2u2Ap7AWLzqolZHZ\n" +
-            "gR0aicn9gcO6M4qn6Uuge8mOve1N7U6j8ebhSiw0KlkzY9ha1Kvrez+NXQdeLC+V\n" +
-            "PDWPPPlBWeysTnIM6dusbV1v2/C7Ooz9TuGb8wiXRriPpI7+igSIPqBebF00rHGJ\n" +
-            "Dmx9eN3g78VF9JpTrrRkV8alpMYVZKAh9IzMp9NWVZsw5wgZaX2W05SaXkSHP3zR\n" +
-            "OBANhKzwkBkCcDMbmF1LFOk+wgkcEtFlKEnfgvOQVHTp02gTzyhSxstw0buon4Cy\n" +
-            "ZAm1L+6bJJ+puNL8HuLTJxq1mqiaY0T50olJeySSX5uJBo/l29Pz+0WjANnhRLVq\n" +
-            "e5xdxPV11QGHDxnvsXaMgC4y/5sLo5v4UEZT+4VDcKiRHReusJD+kUt92FSYqWTK\n" +
-            "xs6zwuxf25as/rJbZT99o9QVFLfHEs6DgHKNIqQuVxZxH0T3M6XqfmnRTo1FrD8i\n" +
-            "p/93Q4zQta5S9whe/sAxpizwyMw/9fhBDHGVHfgFV1C0EP9zxkyHEya0CGAMhbzp\n" +
-            "+0Y/ZYxrAgMBAAGjggJJMIICRTAOBgNVHQ8BAf8EBAMCAYYwEAYJKwYBBAGCNxUB\n" +
-            "BAMCAQAwHQYDVR0OBBYEFOtMMXw9PzK4g9fF23va5HjanBRXMB0GA1UdJQQWMBQG\n" +
-            "CCsGAQUFBwMBBggrBgEFBQcDAjAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTAS\n" +
-            "BgNVHRMBAf8ECDAGAQH/AgEAMB8GA1UdIwQYMBaAFAnLWX+GsnCPGsM548DZ6b+7\n" +
-            "TbIjMHAGA1UdHwRpMGcwZaBjoGGGX2h0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9w\n" +
-            "a2lvcHMvY3JsL01pY3Jvc29mdCUyMFJTQSUyMFJvb3QlMjBDZXJ0aWZpY2F0ZSUy\n" +
-            "MEF1dGhvcml0eSUyMDIwMTcuY3JsMIGuBggrBgEFBQcBAQSBoTCBnjBtBggrBgEF\n" +
-            "BQcwAoZhaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jZXJ0cy9NaWNy\n" +
-            "b3NvZnQlMjBSU0ElMjBSb290JTIwQ2VydGlmaWNhdGUlMjBBdXRob3JpdHklMjAy\n" +
-            "MDE3LmNydDAtBggrBgEFBQcwAYYhaHR0cDovL29uZW9jc3AubWljcm9zb2Z0LmNv\n" +
-            "bS9vY3NwMHAGA1UdIARpMGcwCAYGZ4EMAQIBMAgGBmeBDAECAjBRBgwrBgEEAYI3\n" +
-            "TIN9AQEwQTA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3Br\n" +
-            "aW9wcy9Eb2NzL1JlcG9zaXRvcnkuaHRtMA0GCSqGSIb3DQEBDAUAA4ICAQAkucWk\n" +
-            "Mrgs2ahYrG7y4sY2yZno4f9TGyk7p+Srg4Yz/g7LmVeyOob9o579Omw9AiyeDK8Y\n" +
-            "/dXnTTof+sKJrlNTpIzyEBkzCiGGkWtp7x2yxLCm12L65wtmD/6OAV9Bm1kOhf3p\n" +
-            "7v+d3gtFt7cw46W35lr+fguy62s7uuytTV9hfhQ0pp2E2E9F6B7U71jR4bC+6zGq\n" +
-            "+34AmqTirjKHwXOhWDRDpEJIkaFAh+qdz/nqJktZj3n5GdC94jfWrMUJjClGjlc4\n" +
-            "+Ws3AxN46oFpx8oIXDG9wIPfFhUf0SdnCYJL8TD5+qBNp0H5q/V2R31Wi8rijHGQ\n" +
-            "4CxHqzP5VJbjgvRQgxAp39BrmLQ+JSvf9e5VqQqaH4NYgpB1WObq12B73BJHjBOv\n" +
-            "pRrULFjPqDW8sPRBzBTRXkXOPEdZbzQj6O/CWEFsg6ilO4thk3n3drb9FEJjVh9u\n" +
-            "GtRXV6Ea5bNaPvJppZNXb7M9mORk3mddx/K1FgOETQE3quh+mU4ojbSRUWMVmjcb\n" +
-            "6bKF5oQd+Q0do4yaEIfH1oVnIas/FIE/xu3Z4fvBs0qdiNLCeNT6uS26vqD2PEvV\n" +
-            "lFWb683Do3Ls59MMCxhy6Erb7kFQgu1oUWXGFhbMQkeLN4TXGi6X3loXYfING9om\n" +
-            "nWa/udxvPRwAZmcHU2l2W8cwVXiy6uucsh3kPQ==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: O=Microsoft Corporation, L=Redmond, ST=Washington, C=US
-    // Issuer: CN=Microsoft RSA TLS Issuing AOC CA 01, O=Microsoft Corporation, C=US
-    // Serial number: 330000014a3b44c12636e54b9f00000000014a
-    // Valid from: Fri Oct 14 13:55:34 PDT 2022 until: Mon Oct 09 13:55:34 PDT 2023
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIILDCCBhSgAwIBAgITMwAAAUo7RMEmNuVLnwAAAAABSjANBgkqhkiG9w0BAQwF\n" +
-            "ADBbMQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9u\n" +
-            "MSwwKgYDVQQDEyNNaWNyb3NvZnQgUlNBIFRMUyBJc3N1aW5nIEFPQyBDQSAwMTAe\n" +
-            "Fw0yMjEwMTQyMDU1MzRaFw0yMzEwMDkyMDU1MzRaMFQxCzAJBgNVBAYTAlVTMRMw\n" +
-            "EQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVN\n" +
-            "aWNyb3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\n" +
-            "AoIBAQDTo/3ysrrKP2eOLQ8JUFhQT09HJM1lUr0nH7RiP4VAKFrGFMIQSCsq17y7\n" +
-            "PuTHxW53Fvxb5s/EKZobzhlgv4rHQxvoMuGWRBgJN6KfspQAuFnUVG+3y70fHy/O\n" +
-            "PiVUJdfTupsys/fjzERqzx6FZoU1RzQ08na36SicSOQmj5svtHHxL8ZibDD48Xzp\n" +
-            "oIEBh2uUDhevkZedBmqlIdAhNgKXqf2lieLjWXZQLzUyXHikQJxNFOHFVjBqH3pu\n" +
-            "pYt2XD78bS/xeKRbGLw52+o3/u4eaPyiJoG0GaVSG2HRGcplu7Auk6ycD3htispr\n" +
-            "dviXfHa3tW1hO52PrQBOWvpsP3jdAgMBAAGjggPuMIID6jCCAX4GCisGAQQB1nkC\n" +
-            "BAIEggFuBIIBagFoAHUA6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0GvW4A\n" +
-            "AAGD2FEl4wAABAMARjBEAiBStVFeTYxl3DxgsM2z7VsvWZ5n7V0SXjnNdgFfmjfL\n" +
-            "twIgQ6Xfm7oJQDMyBIuPVF0qxLr+EqZ71HDHz5n6g60orlcAdgB6MoxU2LcttiDq\n" +
-            "OOBSHumEFnAyE4VNO9IrwTpXo1LrUgAAAYPYUSX8AAAEAwBHMEUCIFbeyJxWClLT\n" +
-            "C1YjUizDHmL5TeKFluRsL0of3NXn7LXuAiEAoZLtiZOie9QLWA66IN3NO8F4VE72\n" +
-            "m4hZyo0tcJ2FrDkAdwCzc3cH4YRQ+GOG1gWp3BEJSnktsWcMC4fc8AMOeTalmgAA\n" +
-            "AYPYUSZUAAAEAwBIMEYCIQD7nnuRlDX0iUH+vfbl3aKgn6siy8fL5Dl6HczdPXgD\n" +
-            "2AIhAJE6xuIKnLOC/BqVG8DydYmhM17TTSK3T98pBtvU9SDcMBsGCSsGAQQBgjcV\n" +
-            "CgQOMAwwCgYIKwYBBQUHAwEwPAYJKwYBBAGCNxUHBC8wLQYlKwYBBAGCNxUIh73X\n" +
-            "G4Hn60aCgZ0ujtAMh/DaHV2Btd1QhZ/9dQIBZAIBHTCBpgYIKwYBBQUHAQEEgZkw\n" +
-            "gZYwZQYIKwYBBQUHMAKGWWh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMv\n" +
-            "Y2VydHMvTWljcm9zb2Z0JTIwUlNBJTIwVExTJTIwSXNzdWluZyUyMEFPQyUyMENB\n" +
-            "JTIwMDEuY3J0MC0GCCsGAQUFBzABhiFodHRwOi8vb25lb2NzcC5taWNyb3NvZnQu\n" +
-            "Y29tL29jc3AwHQYDVR0OBBYEFJ+DafMSR5RMWJrM6iGS024FVuBYMA4GA1UdDwEB\n" +
-            "/wQEAwIEsDArBgNVHREEJDAigiBhY3Ryc2Fyb290MjAxNy5wa2kubWljcm9zb2Z0\n" +
-            "LmNvbTBoBgNVHR8EYTBfMF2gW6BZhldodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20v\n" +
-            "cGtpb3BzL2NybC9NaWNyb3NvZnQlMjBSU0ElMjBUTFMlMjBJc3N1aW5nJTIwQU9D\n" +
-            "JTIwQ0ElMjAwMS5jcmwwZgYDVR0gBF8wXTBRBgwrBgEEAYI3TIN9AQEwQTA/Bggr\n" +
-            "BgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9Eb2NzL1Jl\n" +
-            "cG9zaXRvcnkuaHRtMAgGBmeBDAECAjAfBgNVHSMEGDAWgBTrTDF8PT8yuIPXxdt7\n" +
-            "2uR42pwUVzATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQwFAAOCAgEA\n" +
-            "j80IEKdsV/mWM5LwiS12qjOFzukGhpaFgM4XVQV9QJ/oEwworf7KEFfp4YlrSbtw\n" +
-            "Wwrh06LESleEfCqY+pbYHUx6ox4LvI5EYu23+YINSdhkTaITFZ1DDrYEHX08r26I\n" +
-            "rdaTkUOLzP9CRuSw1tbcf0gsj/Dqr8ec3usktccOE6QFbCA9yCsKOr6WdPc4h3PV\n" +
-            "WKHnpf4n46fZ+N+d7+eAOUZSjqsw/5i6/yiQ0Vx6rBMSKmEzkZx72Xkh9IowCeZJ\n" +
-            "w/gstrzKepSljWUuNi2iXJB2OuIqydFodLXFc9eeH8MXShDqwFF77nf3R3jMAhvI\n" +
-            "6fHnEz7+UqhMuyiAU5TfSjC1WyeqHhDZawWPumFyXEh0XX1eUphfoN3bApbZJhEE\n" +
-            "tyhcz44mGawrjSpxlJGgE5TmKJ+CC73TcBC5Ehelo+Is1gzbbVQCu6gMZQyYS8qf\n" +
-            "kg+JqJAOfx+YFn4bPAio8uF6XpcvMkcd9dyEYi2Q9zMhnQoOjLWj0pPSQaCBmmbI\n" +
-            "ougVo16GCOdcOG9+c6dBjbHseaQY0a95ZirtNLbutIvmvMIysvAHMC3NkunnD0cQ\n" +
-            "BxF47+meDc80QJGCaNlJ8E1SlUbEtRfVNsbcw1skO3hAsYAIA8M//BW7XcKRDvLn\n" +
-            "nPrC+5fWtDzmXgUE/Sve3rCr/AfBiBrLERcJHxYy41U=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: O=Microsoft Corporation, L=Redmond, ST=Washington, C=US
-    // Issuer: CN=Microsoft RSA TLS Issuing AOC CA 01, O=Microsoft Corporation, C=US
-    // Serial number: 330000014b4c2b0b9955688feb00000000014b
-    // Valid from: Fri Oct 14 13:56:58 PDT 2022 until: Mon Oct 09 13:56:58 PDT 2023
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIIKjCCBhKgAwIBAgITMwAAAUtMKwuZVWiP6wAAAAABSzANBgkqhkiG9w0BAQwF\n" +
-            "ADBbMQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9u\n" +
-            "MSwwKgYDVQQDEyNNaWNyb3NvZnQgUlNBIFRMUyBJc3N1aW5nIEFPQyBDQSAwMTAe\n" +
-            "Fw0yMjEwMTQyMDU2NThaFw0yMzEwMDkyMDU2NThaMFQxCzAJBgNVBAYTAlVTMRMw\n" +
-            "EQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVN\n" +
-            "aWNyb3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\n" +
-            "AoIBAQD2UxPzrv61IqG8jCFPWM3KeQpBeBlxh3mzvWVFmo340r0J1C3uLaUTPYLo\n" +
-            "P+Xndq2GqYLlm/5FEY7ynU1as57SH0tHbKCIYYJezn/ZJHUYcOY80uGKpP3bdbRq\n" +
-            "W51Xo7/gzTrXFJ2Nrn05d9mKBq+Oxs71+Nj7QuzjHYAF0n8OWNwZCBOBdAX3EDVQ\n" +
-            "4HBMSkIzriodM0FD2zkT8RIvZ7WbpLxvZXqWbynAeLirTRYE2lY9UalxrP+wCef9\n" +
-            "DARxcpEgF30nwRnALfOhnuOhdrtdLYhArfQMyDcvJnDyzCWEZCaPNtBhdsziJjf9\n" +
-            "A8R4/qdnlQE4/24O9MXQja5dwyyRAgMBAAGjggPsMIID6DCCAXwGCisGAQQB1nkC\n" +
-            "BAIEggFsBIIBaAFmAHYA6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0GvW4A\n" +
-            "AAGD2FJirgAABAMARzBFAiBct8qI4aiBtisWWMKAtwCueQWAnFtxcrGBiZjwctiB\n" +
-            "pwIhAPasvYgCS4Rbhb6p2//TCeq0P2H3jUftmi0afwhJYXLaAHUAs3N3B+GEUPhj\n" +
-            "htYFqdwRCUp5LbFnDAuH3PADDnk2pZoAAAGD2FJjIwAABAMARjBEAiBjbry24wGs\n" +
-            "tpzJFzxWAk7h3IHMKiY1KxIieJMBe7k1dQIgPvDrVgOiUeWlYJmDSdRafTVZHfQg\n" +
-            "bODj86WqyB5ndt4AdQB6MoxU2LcttiDqOOBSHumEFnAyE4VNO9IrwTpXo1LrUgAA\n" +
-            "AYPYUmLUAAAEAwBGMEQCIHlmAPOJT2CSJPnupJqbiUOE8nukIuNxaayaEROQQC16\n" +
-            "AiBufiWDUp9FNjGdZVhjX3t/Bh3iSNrMJD22k5BcNzUbIjAbBgkrBgEEAYI3FQoE\n" +
-            "DjAMMAoGCCsGAQUFBwMBMDwGCSsGAQQBgjcVBwQvMC0GJSsGAQQBgjcVCIe91xuB\n" +
-            "5+tGgoGdLo7QDIfw2h1dgbXdUIWf/XUCAWQCAR0wgaYGCCsGAQUFBwEBBIGZMIGW\n" +
-            "MGUGCCsGAQUFBzAChllodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2Nl\n" +
-            "cnRzL01pY3Jvc29mdCUyMFJTQSUyMFRMUyUyMElzc3VpbmclMjBBT0MlMjBDQSUy\n" +
-            "MDAxLmNydDAtBggrBgEFBQcwAYYhaHR0cDovL29uZW9jc3AubWljcm9zb2Z0LmNv\n" +
-            "bS9vY3NwMB0GA1UdDgQWBBQVaBKJl3UpdKhMrW9owCC3eUdMWzAOBgNVHQ8BAf8E\n" +
-            "BAMCBLAwKwYDVR0RBCQwIoIgcnZrcnNhcm9vdDIwMTcucGtpLm1pY3Jvc29mdC5j\n" +
-            "b20waAYDVR0fBGEwXzBdoFugWYZXaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3Br\n" +
-            "aW9wcy9jcmwvTWljcm9zb2Z0JTIwUlNBJTIwVExTJTIwSXNzdWluZyUyMEFPQyUy\n" +
-            "MENBJTIwMDEuY3JsMGYGA1UdIARfMF0wUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYB\n" +
-            "BQUHAgEWM2h0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBv\n" +
-            "c2l0b3J5Lmh0bTAIBgZngQwBAgIwHwYDVR0jBBgwFoAU60wxfD0/MriD18Xbe9rk\n" +
-            "eNqcFFcwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQEMBQADggIBAFHb\n" +
-            "lQDG/Jk+kOLRWlZiya00OkZiXrueh4NgfwybZAx3O344+FzP4TsneUys16GO7Pti\n" +
-            "UTKkxF42INw/3TAC4iOMg4RS4dm+Fn1G7xM59lwqnZLn48a6jORKwZIG0H/2Fevr\n" +
-            "bGn3ZcTw+NP02OA7X1/ewRfljDZfHNmzdVTSVlqzhliv2cRuZyk7lf1LoIXBTz3Y\n" +
-            "6ofOjgsP05XEZmMxMwM40FVeslTfuu301plj5KuHpQfbSny0VES3DQnZi+gHX+Zn\n" +
-            "XuIYQL9stePqQr1GJBqAHM4sRgUCnW5t8efIYDMpYhQynXbniowLGbXOa0OP1IFG\n" +
-            "oGmhPRonR1aJ2eFBfe0pnc4WO5qdiXQp/XWWYmUJaD7SdGDQF7wH9BUJdldIk6uI\n" +
-            "SGTh4YD2VAXAGH4e9wHI5t9Lyah/VeBoLU1j3SsJfL6XfcWCwFG2sdqFFQHcONBl\n" +
-            "ApIjebH4RlOGiRRRJ5/Wz9Wk850mEvF16UlB1MUpLiKU63/nJvuR1TvOisAUl+5L\n" +
-            "oAfBFVkX4IGJU+9tc4VXYvTpd24xLHk/o6Fnl23D6zWlsZKldNxYPhiriXN9Duvb\n" +
-            "6xmaQX4gua6jmTFUhKDyyVJpW1A4GjuenPYsCmabzydiAeMIQirCCLSTqXrSw1YL\n" +
-            "2+608l1nqYy1JOrSq/zFp3c5buSFbjj7jVJB5LEh\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Fri Oct 14 15:46:18 PDT 2022", System.out);
-    }
-}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java
deleted file mode 100644
index e171bafe1ad..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8189131 8207059
- * @key intermittent
- * @summary Interoperability tests with QuoVadis Root CA1, CA2, and CA3 G3 CAs
- * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath QuoVadisCA OCSP
- * @run main/othervm -Djava.security.debug=certpath QuoVadisCA CRL
- */
-
-/*
- * Obtain TLS test artifacts for QuoVadis CAs from:
- *
- * https://www.quovadisglobal.com/download-roots-crl/
- *
- */
-public class QuoVadisCA {
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-        }
-
-        new RootCA1G3().runTest(pathValidator);
-        new RootCA2G3().runTest(pathValidator);
-        new RootCA3G3().runTest(pathValidator);
-    }
-}
-
-class RootCA1G3 {
-
-    // Owner: CN=DigiCert QuoVadis TLS ICA QV Root CA 1 G3, O="DigiCert, Inc", C=US
-    // Issuer: CN=QuoVadis Root CA 1 G3, O=QuoVadis Limited, C=BM
-    // Serial number: 2837d5c3c2b57294becf99afe8bbdcd1bb0b20f1
-    // Valid from: Wed Jan 06 12:50:51 PST 2021 until: Sat Jan 04 12:50:51 PST 2031
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFgDCCA2igAwIBAgIUKDfVw8K1cpS+z5mv6Lvc0bsLIPEwDQYJKoZIhvcNAQEL\n" +
-            "BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc\n" +
-            "BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMSBHMzAeFw0yMTAxMDYyMDUwNTFaFw0z\n" +
-            "MTAxMDQyMDUwNTFaMFkxCzAJBgNVBAYTAlVTMRYwFAYDVQQKDA1EaWdpQ2VydCwg\n" +
-            "SW5jMTIwMAYDVQQDDClEaWdpQ2VydCBRdW9WYWRpcyBUTFMgSUNBIFFWIFJvb3Qg\n" +
-            "Q0EgMSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALMrbkb9kz/4\n" +
-            "y00r7tfK+uDRomMNd5iCDVMWOvSx1VygKoBn3aavw7gq9Vfb2fIMIWkWG0GMxWbG\n" +
-            "cx3wDHLWemd7yl9MxRUTGXkvH6/dNEavAQhUTL9TSf/N2e8f7q2dRDNYT7lXi/vR\n" +
-            "fTBiYlY7BLNha8C3sPHsKduaJN32cjdjVFH51rFDRdhUXlo2hhOjgB6bqoqs75A3\n" +
-            "Y3w88AdbMkapT63oGsCDO6N/uX2Mo9GSWREvlxHiXSMFf5qFw41vn5QIa5ADL1MP\n" +
-            "CzlLmJSHXE138H1+cG5IutD7tIieKjo/t+66PGMo8xicj3yUd8rHEmBqClG4Ty3d\n" +
-            "fF+bETFjLIUCAwEAAaOCAU8wggFLMBIGA1UdEwEB/wQIMAYBAf8CAQAwHwYDVR0j\n" +
-            "BBgwFoAUo5fW816iEOGrRZ88F2Q87gFwnMwwdAYIKwYBBQUHAQEEaDBmMDgGCCsG\n" +
-            "AQUFBzAChixodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2cmNhMWcz\n" +
-            "LmNydDAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29t\n" +
-            "MBMGA1UdIAQMMAowCAYGZ4EMAQICMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF\n" +
-            "BQcDATA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFs\n" +
-            "LmNvbS9xdnJjYTFnMy5jcmwwHQYDVR0OBBYEFJkRfemwrS1iWnDTPI2HIK3a2i5B\n" +
-            "MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAb6tTptzzi4ssb+jA\n" +
-            "n2O2vAjAo7ydlfN9v+QH0ZuGHlUc9bm8dpNpBo9yt6fWHIprGLJjVOF7HwVDQcJD\n" +
-            "DhX4638Q7ETDrbTVQ4/edX6Yesq6C1G8Pza1LwStXD/jCQHFvWbPud86V0ikS4rS\n" +
-            "qlmu3fzUrGZ2/Q+n5jrnRqM5IS8TXYcnzLD3azH1+aZjkwQt9HP4IuvAe/Bg9aWE\n" +
-            "XeDmksbg0SqQInrWn+BVYtD+hCZNz8K0GnKKpx3Q9VxzRv+BMbO5e9iqK1Hcj5Wv\n" +
-            "ZXvU45j2r5y9WML4fc8CvphzbF6ezr1e51i+yabNmfld33gRX48V5oNk16wX32ed\n" +
-            "kQ83sKNomQm1dXURWK8aSDcZFAvJQ8vKTLIE9wiQmtjfSGoJzQhKLaN+egrp4L9y\n" +
-            "fjpFIeK4zgAH39P4s4kaPWTdfXe2n6P5o7Xolp4R22SVkI76d8d+5Iv7Rtqd+mqI\n" +
-            "y1hkwyTBbOBLtyF7yMtJQewkkZ0MWxkPvWg193RbYVRx8w1EycnxMgNwy2sJw7MR\n" +
-            "XM6Mihkw910BkvlbsFUXw4uSvRkkRWSBWVrkM5hvZGtbIJkqrdnj55RSk4DLOOT/\n" +
-            "LUyji/KpgD7YCi7emFA4tH6OpkNrjUJ3gdRnD4GwQj/87tYeoQWZ6uCl0MHDUCmw\n" +
-            "73bpxSkjPrYbmKo9mGEAMhW1ZxY=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=quovadis-root-ca-1-g3.chain-demos.digicert.com, O="DigiCert, Inc.",
-    //        L=Lehi, ST=Utah, C=US
-    // Issuer: CN=DigiCert QuoVadis TLS ICA QV Root CA 1 G3, O="DigiCert, Inc", C=US
-    // Serial number: a94cc08600f5fe5d3f0659bfcfec6f0
-    // Valid from: Fri Mar 04 16:00:00 PST 2022 until: Wed Apr 05 16:59:59 PDT 2023
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIG/DCCBeSgAwIBAgIQCpTMCGAPX+XT8GWb/P7G8DANBgkqhkiG9w0BAQsFADBZ\n" +
-            "MQswCQYDVQQGEwJVUzEWMBQGA1UECgwNRGlnaUNlcnQsIEluYzEyMDAGA1UEAwwp\n" +
-            "RGlnaUNlcnQgUXVvVmFkaXMgVExTIElDQSBRViBSb290IENBIDEgRzMwHhcNMjIw\n" +
-            "MzA1MDAwMDAwWhcNMjMwNDA1MjM1OTU5WjB9MQswCQYDVQQGEwJVUzENMAsGA1UE\n" +
-            "CBMEVXRhaDENMAsGA1UEBxMETGVoaTEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4x\n" +
-            "NzA1BgNVBAMTLnF1b3ZhZGlzLXJvb3QtY2EtMS1nMy5jaGFpbi1kZW1vcy5kaWdp\n" +
-            "Y2VydC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3HrwaCagg\n" +
-            "6bxmgEC+neLN/ShfNYuOMQ2Slk5q/zDUhQRpNQnh3nUwoRSWRvwGxDFsRj++LECF\n" +
-            "TMdfzIu+0rlFzGqd3B5mlRsJrcycy/+ILwGNtIooUSU7pvJAVgLZ5N1SSVZoY+i3\n" +
-            "bqLiMmv2/JfouT1SQB3U0tGmS+QKyBtVyKPVeuAhnLdyw90UiB7Gu9qXQpCawac8\n" +
-            "pXPQLFzyEP7VJO0wDXanXvi6YPuIhh4m+j2YVCd9d2zI3y3kOrkuaUY5UCBvMG/b\n" +
-            "Pc7/5pBsqf+E+7RHF24JAR2aqXzARWt2MzRiwpE/DJDfu097IUtR5aEdCRIKw/b4\n" +
-            "GcHEbVaE3c8RAgMBAAGjggOaMIIDljAfBgNVHSMEGDAWgBSZEX3psK0tYlpw0zyN\n" +
-            "hyCt2touQTAdBgNVHQ4EFgQUsG1/1d7ATEocqm82IRByZD/1qQIwOQYDVR0RBDIw\n" +
-            "MIIucXVvdmFkaXMtcm9vdC1jYS0xLWczLmNoYWluLWRlbW9zLmRpZ2ljZXJ0LmNv\n" +
-            "bTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC\n" +
-            "MIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9E\n" +
-            "aWdpQ2VydFF1b1ZhZGlzVExTSUNBUVZSb290Q0ExRzMuY3JsMESgQqBAhj5odHRw\n" +
-            "Oi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRRdW9WYWRpc1RMU0lDQVFWUm9v\n" +
-            "dENBMUczLmNybDA+BgNVHSAENzA1MDMGBmeBDAECAjApMCcGCCsGAQUFBwIBFhto\n" +
-            "dHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwgYMGCCsGAQUFBwEBBHcwdTAkBggr\n" +
-            "BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tME0GCCsGAQUFBzAChkFo\n" +
-            "dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRRdW9WYWRpc1RMU0lD\n" +
-            "QVFWUm9vdENBMUczLmNydDAJBgNVHRMEAjAAMIIBfQYKKwYBBAHWeQIEAgSCAW0E\n" +
-            "ggFpAWcAdgCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAX9cPNEg\n" +
-            "AAAEAwBHMEUCIEcb3zz7lhKT26HkZpFPF9e7AsHY4HR3pO5LJ5+b2iDGAiEAjEHh\n" +
-            "4H3Vl+j95X65uBdkODnqjlxRc6OrqCRor71nKTYAdQA1zxkbv7FsV78PrUxtQsu7\n" +
-            "ticgJlHqP+Eq76gDwzvWTAAAAX9cPNEMAAAEAwBGMEQCIBbRZ9t9oUODHhZfa7n3\n" +
-            "0lGGmEpnZP9dZw375SuVX6OjAiBbfpZesx7GgSNygEF+zkBAXx+AFJF5GoGiOjFX\n" +
-            "0ykjDAB2ALNzdwfhhFD4Y4bWBancEQlKeS2xZwwLh9zwAw55NqWaAAABf1w80SoA\n" +
-            "AAQDAEcwRQIgfSXjtjuKjFiVYwdlitFNgTTSc7uP9hyazlrCKO9GsaYCIQCKimXl\n" +
-            "j4LjJ4BlG9H1J+V747tuf7ONnAzkCPsa2ymOuzANBgkqhkiG9w0BAQsFAAOCAQEA\n" +
-            "b9havJS9egan+4dgMhI6gDt6rjdWRniyi7kXv7/vWJXOxR1xl2d/WYDLsfp3BbqW\n" +
-            "YuKQwB5tTH1hEoNhQIyGnuE1Y1ZgtX24rSVfTCkU/3dnTZaIhaZgFHyftAum7xSI\n" +
-            "Qzu7pwih+PXrGNXupsnZ+VUE7a7zHyRDajixhSp7dZS4zLoDTxeyKX0MDmo4e8Mi\n" +
-            "HNYVASYcrdld90jVJaeI/V3EkJAX7/Eyo9JqzivEwGM0e0JhCLekcVSzhjGoAlbQ\n" +
-            "tIzCIaeVUlWKKiNXSKr1WD4oCD3ky4Y5VekTGzyUf/0LYzV+Y7p8epc5vTWKwYx/\n" +
-            "vQwJ4RsgFit+c84mSg4qug==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=quovadis-root-ca-1-g3-revoked.chain-demos.digicert.com,
-    //        O="DigiCert, Inc.", L=Lehi, ST=Utah, C=US
-    // Issuer: CN=DigiCert QuoVadis TLS ICA QV Root CA 1 G3, O="DigiCert, Inc", C=US
-    // Serial number: e7eff4cdd14ebed1daa7bb7e07300ed
-    // Valid from: Fri Mar 04 16:00:00 PST 2022 until: Wed Apr 05 16:59:59 PDT 2023
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHDjCCBfagAwIBAgIQDn7/TN0U6+0dqnu34HMA7TANBgkqhkiG9w0BAQsFADBZ\n" +
-            "MQswCQYDVQQGEwJVUzEWMBQGA1UECgwNRGlnaUNlcnQsIEluYzEyMDAGA1UEAwwp\n" +
-            "RGlnaUNlcnQgUXVvVmFkaXMgVExTIElDQSBRViBSb290IENBIDEgRzMwHhcNMjIw\n" +
-            "MzA1MDAwMDAwWhcNMjMwNDA1MjM1OTU5WjCBhTELMAkGA1UEBhMCVVMxDTALBgNV\n" +
-            "BAgTBFV0YWgxDTALBgNVBAcTBExlaGkxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMu\n" +
-            "MT8wPQYDVQQDEzZxdW92YWRpcy1yb290LWNhLTEtZzMtcmV2b2tlZC5jaGFpbi1k\n" +
-            "ZW1vcy5kaWdpY2VydC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB\n" +
-            "AQDCQQ2S25TEDDGHa/zvFUex4mD7pUAS7g80g8mQVII2v9Cg6F2tIEbay/IDhV3D\n" +
-            "NtxJcaqiMpT9oMA5jhMSOqcoq8QFzdqugtIvxQ3obrIZysxjjluB2b1T5UhlnND1\n" +
-            "ShXlSWRhwkCN8qfO+VJ8wrpVH45mj+DsiSLWrY8Vw4q+gcJgoUV0Vj87m1H93JTf\n" +
-            "pF68NjljUOOTTXZSzsvTRpDsnOizbVeyZoRawRP8D4UbxA8P28Q5W7a/uZSnUkfo\n" +
-            "1U1QFDd/ii/PCt6TVGYCNUehb8eSrEyjAtIZ/ricIVkKxcqzQ3Tuq7HefH/KiAqD\n" +
-            "GWr0NfO1JhX5ILmDZcosdsW1AgMBAAGjggOjMIIDnzAfBgNVHSMEGDAWgBSZEX3p\n" +
-            "sK0tYlpw0zyNhyCt2touQTAdBgNVHQ4EFgQUK6amWfyhRxRpr+fT1tpYV14n2wgw\n" +
-            "QQYDVR0RBDowOII2cXVvdmFkaXMtcm9vdC1jYS0xLWczLXJldm9rZWQuY2hhaW4t\n" +
-            "ZGVtb3MuZGlnaWNlcnQuY29tMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr\n" +
-            "BgEFBQcDAQYIKwYBBQUHAwIwgZcGA1UdHwSBjzCBjDBEoEKgQIY+aHR0cDovL2Ny\n" +
-            "bDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0UXVvVmFkaXNUTFNJQ0FRVlJvb3RDQTFH\n" +
-            "My5jcmwwRKBCoECGPmh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFF1\n" +
-            "b1ZhZGlzVExTSUNBUVZSb290Q0ExRzMuY3JsMD4GA1UdIAQ3MDUwMwYGZ4EMAQIC\n" +
-            "MCkwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzCBgwYI\n" +
-            "KwYBBQUHAQEEdzB1MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j\n" +
-            "b20wTQYIKwYBBQUHMAKGQWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdp\n" +
-            "Q2VydFF1b1ZhZGlzVExTSUNBUVZSb290Q0ExRzMuY3J0MAkGA1UdEwQCMAAwggF+\n" +
-            "BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB3AOg+0No+9QY1MudXKLyJa8kD08vREWvs\n" +
-            "62nhd31tBr1uAAABf1xeMeAAAAQDAEgwRgIhALuEk3mDbnEEkboc95mrKMgibE0K\n" +
-            "0QAWMu1gI/teH06xAiEA7dbuLv66ScQkOq0zbfnUM8ih1Bw+Wb29jQRyTEXCaxEA\n" +
-            "dgA1zxkbv7FsV78PrUxtQsu7ticgJlHqP+Eq76gDwzvWTAAAAX9cXjIwAAAEAwBH\n" +
-            "MEUCIBvEfG23Yewp6oXQJExXQ+Am7z4i0X5NqSz8ohAXT3NiAiEAhDjy2H2Z5CV5\n" +
-            "gZ8TACTVgNyvEIH0cS4DjH6/ILknLDEAdQCzc3cH4YRQ+GOG1gWp3BEJSnktsWcM\n" +
-            "C4fc8AMOeTalmgAAAX9cXjJBAAAEAwBGMEQCIGuxWoTPcFYQlVF9q/F1JbaZj/VT\n" +
-            "O6Oa8ionxCC/8aqrAiAUCUoDcwphZ25ZFC+xGiP0kUiWgUwuQH7lBpTgoZp/BjAN\n" +
-            "BgkqhkiG9w0BAQsFAAOCAQEAFrVjcQxq81PXEgHCf48+FOle8kUpJGxpH1n1Sp0p\n" +
-            "V95wrXj47oT1Vt9WqXPrNDfDkxwAvvXrCMXjHEg2YN0FCEanVec8GciuRRRtXrOE\n" +
-            "QOXAqGv5j+KG7bEvMNUFS90fesxfxVAQkr1zIT70nMAOKV1NOyQ/q8bZ+jehcRZB\n" +
-            "wUKrCWAzvOw4DPytrDcQmflvQN+Bw92T3uDuoYT/oBcobpVfKpfuW/+ZxxXTIp4L\n" +
-            "sixlx82SZNTo6e3LOqsgZnR6TFyRJ63sK65M+W0d55bHvleUAHRCOiGhhgqE/cby\n" +
-            "z50hDzJMLnjskMSpkxMoeSeutAS2e7oIvA//7C37LrQccQ==\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator)
-            throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Tue Mar 08 11:22:28 PST 2022", System.out);
-    }
-}
-
-class RootCA2G3 {
-
-    // Owner: CN=DigiCert QV EV TLS ICA G1, O="DigiCert, Inc.", C=US
-    // Issuer: CN=QuoVadis Root CA 2 G3, O=QuoVadis Limited, C=BM
-    // Serial number: 65e9bcd53e791df22dffeb5ecc2bc7a5588d0883
-    // Valid from: Mon Mar 16 12:39:42 PDT 2020 until: Thu Mar 14 12:39:42 PDT 2030
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFbzCCA1egAwIBAgIUZem81T55HfIt/+tezCvHpViNCIMwDQYJKoZIhvcNAQEL\n" +
-            "BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc\n" +
-            "BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0yMDAzMTYxOTM5NDJaFw0z\n" +
-            "MDAzMTQxOTM5NDJaMEoxCzAJBgNVBAYTAlVTMRcwFQYDVQQKDA5EaWdpQ2VydCwg\n" +
-            "SW5jLjEiMCAGA1UEAwwZRGlnaUNlcnQgUVYgRVYgVExTIElDQSBHMTCCASIwDQYJ\n" +
-            "KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhwn6I+pGrJsnisnzP7EU5cFN9UT5XF\n" +
-            "auA13F3jHeUUZmBOcMSOJEhx/e7oeVScTnmKpe7t7uey7lIIC9DWFmP8klbtLBgL\n" +
-            "0jY4MPlCkVyxUIhZ73EHCPqDCX9bo+rMB6C758/tKZOPcoWRixQypPwoC4cXNOOk\n" +
-            "ntqFPRxFSZoBdTDNlAmkAQJCRsXGCEC5pZ0JqzGcAA0/Pw1fB8lSPAti3trubYmd\n" +
-            "aaPFAKzGK7vsexxpuSUKO0opNkFWbLdHZ8jkr86R80oo1vhURJXWNeMS74ws5nbt\n" +
-            "Ll9sJTDW33MQPS0/JO3xYI7bQcW3K1sPSERa4BahqgOJvEXMk1eWRcUCAwEAAaOC\n" +
-            "AU0wggFJMBIGA1UdEwEB/wQIMAYBAf8CAQAwHwYDVR0jBBgwFoAU7edvdlq/YOxJ\n" +
-            "W8ald7tyFnGbxD0wOgYIKwYBBQUHAQEELjAsMCoGCCsGAQUFBzABhh5odHRwOi8v\n" +
-            "b2NzcC5xdW92YWRpc2dsb2JhbC5jb20wSwYDVR0gBEQwQjAHBgVngQwBATA3Bglg\n" +
-            "hkgBhv1sAgEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29t\n" +
-            "L0NQUzAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwOwYDVR0fBDQwMjAw\n" +
-            "oC6gLIYqaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZyY2EyZzMuY3Js\n" +
-            "MB0GA1UdDgQWBBQTL6fobnFR9uIMmEeDnn+deHk08zAOBgNVHQ8BAf8EBAMCAYYw\n" +
-            "DQYJKoZIhvcNAQELBQADggIBAEoOxze3kgnR39LX8M63EjiNxx0LThZHROqYqev6\n" +
-            "5ox/c5NNitk8/ODA8osdPpvnUBAlmE0+gqBvnTBRPVrJFd9bOr5BK8z6Os9/U0ed\n" +
-            "c3UINkWLS05B7ChC9s6Zw1Vd/WlW08TQJ80GpvAIbEKcg8EO/DXPniHxC4cMtv1T\n" +
-            "jtNeh98XiVgQXHL1FY+u/l413J8C4utKi4ZOQeCJDqvlSDzRsOi+tHsXrCJxnMWN\n" +
-            "2QBgMGgdPW37zwf0EffoH0Gee3pTgg7I5SzmvBq0t5xRDfv4N0OdM/sN1mc5f3o7\n" +
-            "0YCd9WXhyDCV5W2O8QIbrd42CK5k1rlM6gXwOyDmYY5CVAl1QeXEeRfDk/zNjU/1\n" +
-            "+LnH/Dv88VcZhODYq+VGbyM8bpNr0v95PY3yaH4kzpWGqWAN5i9LosfcaqRPmyL4\n" +
-            "PcKTQwcA9AVTjITExFua/QtGrXLPvMVxR248G9IQpJMxP3JEGkjlKCenmc29r2u1\n" +
-            "KE4TeCs2xxjR1PusTfX91bBW3YAoAPDTRQKZjolegLUY44j3uKSzAdhMEbZQhovH\n" +
-            "Lraqx1WjTayTuq1Vuakcia5shmgFVSNcE+NVgLEIe32oTOm/G6Kd1lcm9C4Ph1Cg\n" +
-            "nfDuqohZrk76kJTk8poAY5aFCQHhVzbpSw3zooMGjjvWnkG+/DC6SZM8rKoOdKiB\n" +
-            "cy+N\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=quovadis-root-ca-2-g3.chain-demos.digicert.com, O="DigiCert,
-    //        Inc.", L=Lehi, ST=Utah, C=US, SERIALNUMBER=5299537-0142, OID.1.3.6.1.4
-    //        1.311.60.2.1.2=Utah, OID.1.3.6.1.4.1.311.60.2.1.3=US,
-    //        OID.2.5.4 .15=Private Organization
-    // Issuer: CN=DigiCert QV EV TLS ICA G1, O="DigiCert, Inc.", C=US
-    // Serial number: 9c5e9d5f169d3a59e64db208d3e849d
-    // Valid from: Wed Feb 02 16:00:00 PST 2022 until: Mon Mar 06 15:59:59 PST 2023
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHNDCCBhygAwIBAgIQCcXp1fFp06WeZNsgjT6EnTANBgkqhkiG9w0BAQsFADBK\n" +
-            "MQswCQYDVQQGEwJVUzEXMBUGA1UECgwORGlnaUNlcnQsIEluYy4xIjAgBgNVBAMM\n" +
-            "GURpZ2lDZXJ0IFFWIEVWIFRMUyBJQ0EgRzEwHhcNMjIwMjAzMDAwMDAwWhcNMjMw\n" +
-            "MzA2MjM1OTU5WjCB3zEdMBsGA1UEDwwUUHJpdmF0ZSBPcmdhbml6YXRpb24xEzAR\n" +
-            "BgsrBgEEAYI3PAIBAxMCVVMxFTATBgsrBgEEAYI3PAIBAhMEVXRhaDEVMBMGA1UE\n" +
-            "BRMMNTI5OTUzNy0wMTQyMQswCQYDVQQGEwJVUzENMAsGA1UECBMEVXRhaDENMAsG\n" +
-            "A1UEBxMETGVoaTEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xNzA1BgNVBAMTLnF1\n" +
-            "b3ZhZGlzLXJvb3QtY2EtMi1nMy5jaGFpbi1kZW1vcy5kaWdpY2VydC5jb20wggEi\n" +
-            "MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfknHK7boXh9ysZ0FLDQKEyT2x\n" +
-            "Swtyecb5kkVgJU75XpXccV724mntCu5hpZ7Yt4tOmDZvbpYcqWbhIJgxGFNLyPdB\n" +
-            "Fn8jgZ4N0WoD7u295HI9izEmbM0XrO2rvHUc6ZhFFyx0jhvJPf/k9QbQB4TwKZri\n" +
-            "Iuf1E1Ek70DkTWAg6OrPHMe2ER3aSz2S2rNkMSopURvZuabzPovsGaz+XEZNfE4N\n" +
-            "UfkBLa0DUjFCamOMZKIfkzxpH/NhQcigGnZgxiyUb6KRhu9ydpWeOvOHwPWwR/fV\n" +
-            "7WT+X1DUHojoXeCk2RtIRMihDWPd+lqiUppM8IlEW/gxWbK1wP41qioiK9j5AgMB\n" +
-            "AAGjggN+MIIDejAfBgNVHSMEGDAWgBQTL6fobnFR9uIMmEeDnn+deHk08zAdBgNV\n" +
-            "HQ4EFgQUtAEN4g3bzwES6MoOINihiZQrt+owOQYDVR0RBDIwMIIucXVvdmFkaXMt\n" +
-            "cm9vdC1jYS0yLWczLmNoYWluLWRlbW9zLmRpZ2ljZXJ0LmNvbTAOBgNVHQ8BAf8E\n" +
-            "BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMHsGA1UdHwR0MHIw\n" +
-            "N6A1oDOGMWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFFWRVZUTFNJ\n" +
-            "Q0FHMS5jcmwwN6A1oDOGMWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9EaWdpQ2Vy\n" +
-            "dFFWRVZUTFNJQ0FHMS5jcmwwSgYDVR0gBEMwQTALBglghkgBhv1sAgEwMgYFZ4EM\n" +
-            "AQEwKTAnBggrBgEFBQcCARYbaHR0cDovL3d3dy5kaWdpY2VydC5jb20vQ1BTMHYG\n" +
-            "CCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQu\n" +
-            "Y29tMEAGCCsGAQUFBzAChjRodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGln\n" +
-            "aUNlcnRRVkVWVExTSUNBRzEuY3J0MAwGA1UdEwEB/wQCMAAwggF9BgorBgEEAdZ5\n" +
-            "AgQCBIIBbQSCAWkBZwB2AOg+0No+9QY1MudXKLyJa8kD08vREWvs62nhd31tBr1u\n" +
-            "AAABfsHcGW0AAAQDAEcwRQIgSMSWvB5/8sf6CAZYojDI+t3bmcVHtIJT3T+Z3TcZ\n" +
-            "MFMCIQD5Qyb6jwHOAscsPeID156bUZIw+PeB652u+Q8gTU8C5gB1ADXPGRu/sWxX\n" +
-            "vw+tTG1Cy7u2JyAmUeo/4SrvqAPDO9ZMAAABfsHcGUcAAAQDAEYwRAIgL68Riq9a\n" +
-            "l17hobjQopbfzvcQi4KT1+DlqO2dAeCuF80CIAy19t3bAxcJRmbXWo9J2dGc7WuE\n" +
-            "r+bLfnQoerq9KB1bAHYAs3N3B+GEUPhjhtYFqdwRCUp5LbFnDAuH3PADDnk2pZoA\n" +
-            "AAF+wdwZZAAABAMARzBFAiEA4vYazXAaD1BfJ8MqEmrfxeTIDQ6LZkmqfh8xEnVz\n" +
-            "8VYCIF/RgfyBhOeH40wfgwpFTa+Y+t7EWg0PtjC4IaIFTKYKMA0GCSqGSIb3DQEB\n" +
-            "CwUAA4IBAQC5KLlms/+5XcCIEFBpQSwT7VoRcqnrVWlhya+9ClA98LYuDUeHcHt6\n" +
-            "lHvfjEEmy2s2GoKHK/JxXzftBau5LbDWlvQ6EF+22fnaVDsKIwNgYwbhJb+6zr8t\n" +
-            "LOFS6Y51YSlRrDUvy94S3PE7N8D3wyKq18IhXOI1WUeR0bKHLlXtl+ZjKMIMkd/l\n" +
-            "YtLnnskRCQa0P/HLwQYLUpgiNGVZJQbjrWsVzcw12mR/gza1KjR02STJRGZad7L0\n" +
-            "Oz48CRhm94iaEjFcVKT3vcDUrtCKpkmhBACcdA3NNqDq10i/SLspOeDLSESkkJKF\n" +
-            "w8w3YCqXjZn5JyV3sVHYNezNKtLdCxn4\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=quovadis-root-ca-2-g3-revoked.chain-demos.digicert.com,
-    //           O="DigiCert, Inc.", L=Lehi, ST=Utah, C=US, SERIALNUMBER=5299537-0142,
-    //           OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.2=Utah,
-    //           OID.1.3.6.1.4.1.311.60.2.1.3=US
-    // Issuer: CN=DigiCert QV EV TLS ICA G1, O="DigiCert, Inc.", C=US
-    // Serial number: 3f84605850df3ac98fcc15adec269f8
-    // Valid from: Sun Apr 17 17:00:00 PDT 2022 until: Fri May 19 16:59:59 PDT 2023
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHQDCCBiigAwIBAgIQA/hGBYUN86yY/MFa3sJp+DANBgkqhkiG9w0BAQsFADBK\n" +
-            "MQswCQYDVQQGEwJVUzEXMBUGA1UECgwORGlnaUNlcnQsIEluYy4xIjAgBgNVBAMM\n" +
-            "GURpZ2lDZXJ0IFFWIEVWIFRMUyBJQ0EgRzEwHhcNMjIwNDE4MDAwMDAwWhcNMjMw\n" +
-            "NTE5MjM1OTU5WjCB5zETMBEGCysGAQQBgjc8AgEDEwJVUzEVMBMGCysGAQQBgjc8\n" +
-            "AgECEwRVdGFoMR0wGwYDVQQPDBRQcml2YXRlIE9yZ2FuaXphdGlvbjEVMBMGA1UE\n" +
-            "BRMMNTI5OTUzNy0wMTQyMQswCQYDVQQGEwJVUzENMAsGA1UECBMEVXRhaDENMAsG\n" +
-            "A1UEBxMETGVoaTEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xPzA9BgNVBAMTNnF1\n" +
-            "b3ZhZGlzLXJvb3QtY2EtMi1nMy1yZXZva2VkLmNoYWluLWRlbW9zLmRpZ2ljZXJ0\n" +
-            "LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANfUkoe8l/AFhMH5\n" +
-            "NtRR2Ztx4xVINz1celdjQE7xgjyHoQY6EMhuI+tvTpwJr9wJEFl7YBiIUFUgJZo6\n" +
-            "lCLZtXI5t6rN0PhI+F03vGj5ukOkBBcsNVuKPJjud78sHL7u4w7RL3agrQIG7sff\n" +
-            "bQK4qieUDPxiE8TO8mIzUKnIvYeNA8aJe4zxWf6Mn64WvnudsxYFgMDL4L0ryYKy\n" +
-            "Ls53Co0OweOl4qnNSne8eIGfb6UaUBQvWbnVfRSHzf+skrF1qstWlFhUsqR07HtF\n" +
-            "6BqVrAsRA8tmXisyXrMp9jTcIsG7LXVLOqxN07mAvpateExZs3WWRhfQl4Z+HpHD\n" +
-            "80WbTI0CAwEAAaOCA4IwggN+MB8GA1UdIwQYMBaAFBMvp+hucVH24gyYR4Oef514\n" +
-            "eTTzMB0GA1UdDgQWBBSTXYbD9dwCDxIH/aN5vIr02uLz5DBBBgNVHREEOjA4gjZx\n" +
-            "dW92YWRpcy1yb290LWNhLTItZzMtcmV2b2tlZC5jaGFpbi1kZW1vcy5kaWdpY2Vy\n" +
-            "dC5jb20wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF\n" +
-            "BQcDAjB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY3JsMy5kaWdpY2VydC5jb20v\n" +
-            "RGlnaUNlcnRRVkVWVExTSUNBRzEuY3JsMDegNaAzhjFodHRwOi8vY3JsNC5kaWdp\n" +
-            "Y2VydC5jb20vRGlnaUNlcnRRVkVWVExTSUNBRzEuY3JsMEoGA1UdIARDMEEwCwYJ\n" +
-            "YIZIAYb9bAIBMDIGBWeBDAEBMCkwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuZGln\n" +
-            "aWNlcnQuY29tL0NQUzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6\n" +
-            "Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL2NhY2VydHMu\n" +
-            "ZGlnaWNlcnQuY29tL0RpZ2lDZXJ0UVZFVlRMU0lDQUcxLmNydDAJBgNVHRMEAjAA\n" +
-            "MIIBfAYKKwYBBAHWeQIEAgSCAWwEggFoAWYAdQDoPtDaPvUGNTLnVyi8iWvJA9PL\n" +
-            "0RFr7Otp4Xd9bQa9bgAAAYA+bejFAAAEAwBGMEQCIFDhmaB4BXmOw2SKONPFBU8t\n" +
-            "qXb7DXeG6JHGcONDqITjAiAqozEj7/1ULu6t/uzfwOSgC7xEmUsLGzQVnaOF9m3s\n" +
-            "swB1ADXPGRu/sWxXvw+tTG1Cy7u2JyAmUeo/4SrvqAPDO9ZMAAABgD5t6QkAAAQD\n" +
-            "AEYwRAIgfVEs7Ph+wOpoCGl4woa3aUWH1COGx1SwvHZ8lH21xfsCIBI1IpR6goya\n" +
-            "iz47tT/Uz+26RnkHiAApYsdMOPyevkzhAHYAs3N3B+GEUPhjhtYFqdwRCUp5LbFn\n" +
-            "DAuH3PADDnk2pZoAAAGAPm3pPgAABAMARzBFAiAKBon1PVoqJAF49jMQd2c222TK\n" +
-            "sWkL5sLFqLVZj2vOugIhAODd/OUy236+9alC2U5nxl1oej9fOF4por2OZMFQfpFF\n" +
-            "MA0GCSqGSIb3DQEBCwUAA4IBAQAyrJzyOiRAETfoYddTmRmbnFNuHx4YAkkdxn2d\n" +
-            "BXdy4jPn0kTtDo4592KnbTdieSCWghmEmcEY1sQXdX6iqKwzmp408jfUDohl5evV\n" +
-            "oZrum3P3zgLRz1qswFM5a2HteWzCWWi/n6d6nKXj6PGGVAMQfk1s6PaWhYBuiaag\n" +
-            "myYss/LTPzaLGUfFzlt/HfomiD+BNuBOVa+pPrmTWhex+e02z95n6RPYCiazuZNZ\n" +
-            "xiarN83pRNu/fIjVXw2jENg7+kaC1wwLqET0x6/EJa6YI3Xa7Aumb8Pp2r2UZ5Tr\n" +
-            "7BUhmiRLkvw/9SI8ceXNSwuTTGK2fKHm2/CWqI0cS3zWk3dC\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator)
-            throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon Apr 18 14:07:46 PDT 2022", System.out);
-    }
-}
-
-class RootCA3G3 {
-
-    // Owner: CN=DigiCert QuoVadis TLS ICA QV Root CA 3 G3, O="DigiCert, Inc", C=US
-    // Issuer: CN=QuoVadis Root CA 3 G3, O=QuoVadis Limited, C=BM
-    // Serial number: 427dd33a8ff51d8152e813c7dec93ba76312a7d8
-    // Valid from: Wed Jan 06 12:55:40 PST 2021 until: Sat Jan 04 12:55:40 PST 2031
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFgDCCA2igAwIBAgIUQn3TOo/1HYFS6BPH3sk7p2MSp9gwDQYJKoZIhvcNAQEL\n" +
-            "BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc\n" +
-            "BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMyBHMzAeFw0yMTAxMDYyMDU1NDBaFw0z\n" +
-            "MTAxMDQyMDU1NDBaMFkxCzAJBgNVBAYTAlVTMRYwFAYDVQQKDA1EaWdpQ2VydCwg\n" +
-            "SW5jMTIwMAYDVQQDDClEaWdpQ2VydCBRdW9WYWRpcyBUTFMgSUNBIFFWIFJvb3Qg\n" +
-            "Q0EgMyBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxNTdqnFD+A\n" +
-            "MhketYfVfVUWQKPkVEuyYj7Y2uwXBMRP4RStO4CoQih+hX/h94vRlObOIsqcNnyC\n" +
-            "ElwBnLbmusaWYLYnDEWoROL8uN0pkWk0asfhhEsXTkAJ6FLHUD85WBkED4gIVWPi\n" +
-            "Sp4AOwiA+/zpbwgVAgdjJTO3jjMsp4F1lBrdViYSwoPRACH1ZMjJG572oXTpZkQX\n" +
-            "uWmEKLUOnik1i5cbqGLnwXiDvTAhxit7aBlj/C5IDvONWVQL34ZTYppvo8S3Hhy9\n" +
-            "xX0S4HCpTpeBe3mas7VOrjsXNlEoFvejrxcQ+fB/gUf6fLUPxUhcPtm8keBPQuxc\n" +
-            "qP12/+KG0WECAwEAAaOCAU8wggFLMBIGA1UdEwEB/wQIMAYBAf8CAQAwHwYDVR0j\n" +
-            "BBgwFoAUxhfQvKjqAkPyGwaZXSuQILnXnOQwdAYIKwYBBQUHAQEEaDBmMDgGCCsG\n" +
-            "AQUFBzAChixodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2cmNhM2cz\n" +
-            "LmNydDAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29t\n" +
-            "MBMGA1UdIAQMMAowCAYGZ4EMAQICMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF\n" +
-            "BQcDATA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFs\n" +
-            "LmNvbS9xdnJjYTNnMy5jcmwwHQYDVR0OBBYEFDNm+y+RBcyzYlLvzTz1fhzOpxeW\n" +
-            "MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAY0ZuDgyM4I4MO9ll\n" +
-            "D8qFUPQ8xtcGOuJgSRhDS2onIJ0M8yOGOYJCobIEGIgqyx94kI/n/1Xw+Wvsnhwb\n" +
-            "OYOtVedx6VGDu6IuSKTVgPPhzwKP5ZA7wtmgKR8+W4E3DM1VerA9Po9ycDK9qCdl\n" +
-            "K4tuF37grKEzlQKovG+kn0z+Zi0D/E1kN1Q8YmX35HHRenJWKEnAL9QROh0X9jFi\n" +
-            "SlsHPrxWC3adOdAW+B+kVG0cM2nurd0Ic2YkiLKOOaSd5hbCQY/fCZwohtest+ZU\n" +
-            "Ajyd+FVzSNvEFrwPzZwKfcdemvD4kew8lx5sG6BUL4GkFWnotxSr+F9Huwgj4pC+\n" +
-            "cxE2841a/9r/gliuwDM/8jkt16epFAdw0fXemyM8FdHJDnB++3d8SyjOOQ8j+VHW\n" +
-            "31NWx27sORa5CgRchlldXWDzIIEwbc82a1OAfGUmNAsdEHjMl1HMcZHbjCmdSdsw\n" +
-            "fmyldZrj2YmvOI5ZlE9z4vzi35KyqlxWCtu9O/SJq/rBvYS0TPmm8HbhJQbeMe6p\n" +
-            "vJGrxcb1muSBANn9T9wvukjiNNw32ciSDCjZ0h4N+CGxbzoZtgIAQ29IunYdnJix\n" +
-            "ZiP+ED6xvwgVRBkDSgWD2W/hex/+z4fNmGQJDcri51/tZCqHHv2Y7XReuf4Fk+nP\n" +
-            "l8Sd/Kpqwde/sJkoqwDcBSJygh0=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=quovadis-root-ca-3-g3.chain-demos.digicert.com, O="DigiCert, Inc.",
-    //        L=Lehi, ST=Utah, C=US
-    // Issuer: CN=DigiCert QuoVadis TLS ICA QV Root CA 3 G3, O="DigiCert, Inc", C=US
-    // Serial number: f27ee3fad1d754ae78d7866da0a4f6f
-    // Valid from: Fri Mar 04 16:00:00 PST 2022 until: Wed Apr 05 16:59:59 PDT 2023
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIG/jCCBeagAwIBAgIQDyfuP60ddUrnjXhm2gpPbzANBgkqhkiG9w0BAQsFADBZ\n" +
-            "MQswCQYDVQQGEwJVUzEWMBQGA1UECgwNRGlnaUNlcnQsIEluYzEyMDAGA1UEAwwp\n" +
-            "RGlnaUNlcnQgUXVvVmFkaXMgVExTIElDQSBRViBSb290IENBIDMgRzMwHhcNMjIw\n" +
-            "MzA1MDAwMDAwWhcNMjMwNDA1MjM1OTU5WjB9MQswCQYDVQQGEwJVUzENMAsGA1UE\n" +
-            "CBMEVXRhaDENMAsGA1UEBxMETGVoaTEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4x\n" +
-            "NzA1BgNVBAMTLnF1b3ZhZGlzLXJvb3QtY2EtMy1nMy5jaGFpbi1kZW1vcy5kaWdp\n" +
-            "Y2VydC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOZpBBS8yo\n" +
-            "ioVgFUQDCVcnkHTL4/PfaPKGK1owE0+mKz1AXmYX1rzFfp6gFqjbZeclhWCKoINE\n" +
-            "OrZ2+1mGp75+nCP89NgoGzPgjYLVsM97gN2Y36/jXu8TwsZdYfBw9gxL+YApvq2r\n" +
-            "NbPfxXaYfWdq8bz0RzqXRgS8BqKi1q8tKyahx5EJ3fCpozY9NPvCnipwbWXL9evF\n" +
-            "Oak3c5Ip2YME4mHh8PujrznCVBte7KGLDn2KwbOUbh5SKKBL32vzTPOERWEDMbAu\n" +
-            "3XqQh/cc4LTp32Lf/XkfnUOSbzNh+Te8ZjeDzI+SYNg9bleKpPxLSkBZyurs4mCD\n" +
-            "92L8BXPlMaGjAgMBAAGjggOcMIIDmDAfBgNVHSMEGDAWgBQzZvsvkQXMs2JS7808\n" +
-            "9X4czqcXljAdBgNVHQ4EFgQUnf71SuL2Z73DAgGKgO7UVFDBIkgwOQYDVR0RBDIw\n" +
-            "MIIucXVvdmFkaXMtcm9vdC1jYS0zLWczLmNoYWluLWRlbW9zLmRpZ2ljZXJ0LmNv\n" +
-            "bTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC\n" +
-            "MIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9E\n" +
-            "aWdpQ2VydFF1b1ZhZGlzVExTSUNBUVZSb290Q0EzRzMuY3JsMESgQqBAhj5odHRw\n" +
-            "Oi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRRdW9WYWRpc1RMU0lDQVFWUm9v\n" +
-            "dENBM0czLmNybDA+BgNVHSAENzA1MDMGBmeBDAECAjApMCcGCCsGAQUFBwIBFhto\n" +
-            "dHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwgYMGCCsGAQUFBwEBBHcwdTAkBggr\n" +
-            "BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tME0GCCsGAQUFBzAChkFo\n" +
-            "dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRRdW9WYWRpc1RMU0lD\n" +
-            "QVFWUm9vdENBM0czLmNydDAJBgNVHRMEAjAAMIIBfwYKKwYBBAHWeQIEAgSCAW8E\n" +
-            "ggFrAWkAdwDoPtDaPvUGNTLnVyi8iWvJA9PL0RFr7Otp4Xd9bQa9bgAAAX9cGyUR\n" +
-            "AAAEAwBIMEYCIQDjpwE/uiXodkY8Cx3ecooM7gxZp+Qi3aQSIi3SWam6YwIhAPqz\n" +
-            "8AdaOw+FTZApiEiO2PXww8Y98YtivwXay8v/ZFxrAHYANc8ZG7+xbFe/D61MbULL\n" +
-            "u7YnICZR6j/hKu+oA8M71kwAAAF/XBsk5gAABAMARzBFAiEA4v9FfzFKPr8hPM1O\n" +
-            "jPSlboD96ufdyFBy9KmD8pFcI6ECIBY6pcURmWtsE/G2jQgC+qvueJqSycNP2qTM\n" +
-            "iJ3pO/U1AHYAs3N3B+GEUPhjhtYFqdwRCUp5LbFnDAuH3PADDnk2pZoAAAF/XBsl\n" +
-            "BwAABAMARzBFAiEAsHzOaXv9OIo4RvaKUEscoLpnM98C+4hc6v4Z26d41aICIC2o\n" +
-            "aTrc5JsqgDhJXp7UArQPziUqDso967W2mrLa0nLdMA0GCSqGSIb3DQEBCwUAA4IB\n" +
-            "AQC2CaUwlIb+uKsELGw5U2KV0q8uMp/nBIyFaW/HNOJUf8j1keaf31WWBAFfUQVY\n" +
-            "pzFRUnRmNTtGxCvzyY1YhoQSwswGghz8ZCSQPWCST/Tl8kKuVFas8wSUXaEV23t4\n" +
-            "G0pfIlXL2oIuJwREjzv54SK7xsQ4whco0nw8DvLt+/5us4t96u8r1EuBKkF45ngz\n" +
-            "t77MTqpa0nvWUT7q9POT7xwQNui7P0j5t7prVX/fBKm5EfK1Jdi1Toj9+VxTIWYk\n" +
-            "splUCXw7zxaA3nlrncAmnHxZEY8sQjpGY1OGY0udd+m5bldJNbRTA1Q+VoPVMiU6\n" +
-            "osdBQGUbbWrqm1fnoFW1VvUt\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=quovadis-root-ca-3-g3-revoked.chain-demos.digicert.com,
-    //        O="DigiCert, Inc.", L=Lehi, ST=Utah, C=US
-    // Issuer: CN=DigiCert QuoVadis TLS ICA QV Root CA 3 G3, O="DigiCert, Inc", C=US
-    // Serial number: aafa7cafda91796626f5fc8bcb38702
-    // Valid from: Fri Mar 04 16:00:00 PST 2022 until: Wed Apr 05 16:59:59 PDT 2023
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHDTCCBfWgAwIBAgIQCq+nyv2pF5Zib1/IvLOHAjANBgkqhkiG9w0BAQsFADBZ\n" +
-            "MQswCQYDVQQGEwJVUzEWMBQGA1UECgwNRGlnaUNlcnQsIEluYzEyMDAGA1UEAwwp\n" +
-            "RGlnaUNlcnQgUXVvVmFkaXMgVExTIElDQSBRViBSb290IENBIDMgRzMwHhcNMjIw\n" +
-            "MzA1MDAwMDAwWhcNMjMwNDA1MjM1OTU5WjCBhTELMAkGA1UEBhMCVVMxDTALBgNV\n" +
-            "BAgTBFV0YWgxDTALBgNVBAcTBExlaGkxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMu\n" +
-            "MT8wPQYDVQQDEzZxdW92YWRpcy1yb290LWNhLTMtZzMtcmV2b2tlZC5jaGFpbi1k\n" +
-            "ZW1vcy5kaWdpY2VydC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB\n" +
-            "AQDofDJ1xHHWMhbWwU7e4cY3u2NjvE4ur/A0Y13UK53zoH8qDunV6ORAXQ+zSpev\n" +
-            "kPlnIbdjYOK1v5RJn2ZRgCafj8Bc/9GnfQ1uE7P9dRkC9ZQwvb6Eh6f4RT7gaOPX\n" +
-            "UXSXwtr96xdXDvtlJqWx13YQPnSGXUNNT1NH8bs2Myr9j+I5bUcUGsKsGheZoib3\n" +
-            "6IFINss+ouOhZ+HP6ganS5cQVsUGk5u6BT6oH9VgwfVMjpDqmRkwc6UJmiij/Nz4\n" +
-            "NOLOx2tivUjhk0eTPUaErUqYipGBSuwww6Linc/0IAIxGJ2k0J3Qz9PthJzG0P47\n" +
-            "J5U5ej6FimnRS6Rrk5Ywk2HNAgMBAAGjggOiMIIDnjAfBgNVHSMEGDAWgBQzZvsv\n" +
-            "kQXMs2JS78089X4czqcXljAdBgNVHQ4EFgQU9qXify+xtHlQIniZABL1pv7gcb4w\n" +
-            "QQYDVR0RBDowOII2cXVvdmFkaXMtcm9vdC1jYS0zLWczLXJldm9rZWQuY2hhaW4t\n" +
-            "ZGVtb3MuZGlnaWNlcnQuY29tMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr\n" +
-            "BgEFBQcDAQYIKwYBBQUHAwIwgZcGA1UdHwSBjzCBjDBEoEKgQIY+aHR0cDovL2Ny\n" +
-            "bDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0UXVvVmFkaXNUTFNJQ0FRVlJvb3RDQTNH\n" +
-            "My5jcmwwRKBCoECGPmh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFF1\n" +
-            "b1ZhZGlzVExTSUNBUVZSb290Q0EzRzMuY3JsMD4GA1UdIAQ3MDUwMwYGZ4EMAQIC\n" +
-            "MCkwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzCBgwYI\n" +
-            "KwYBBQUHAQEEdzB1MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j\n" +
-            "b20wTQYIKwYBBQUHMAKGQWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdp\n" +
-            "Q2VydFF1b1ZhZGlzVExTSUNBUVZSb290Q0EzRzMuY3J0MAkGA1UdEwQCMAAwggF9\n" +
-            "BgorBgEEAdZ5AgQCBIIBbQSCAWkBZwB1AOg+0No+9QY1MudXKLyJa8kD08vREWvs\n" +
-            "62nhd31tBr1uAAABf1wc0LIAAAQDAEYwRAIgdmF6UFe2jgbM3FjYRMmcNaXfpleT\n" +
-            "E8hmYfmAVy5lSoUCIDPCV27IP9wpdGoxnnCMBwuekg6E4SB0lj49+o9OHHjDAHUA\n" +
-            "Nc8ZG7+xbFe/D61MbULLu7YnICZR6j/hKu+oA8M71kwAAAF/XBzQ0QAABAMARjBE\n" +
-            "AiBO6vYHFci7OWvqDHRlgTn+Q6zNG/LysZEOlrO4W8ZZ2gIgDY5+qjlar3esPN0b\n" +
-            "JUR5vfITl7UiZoqINJSm1gZ4Nm4AdwCzc3cH4YRQ+GOG1gWp3BEJSnktsWcMC4fc\n" +
-            "8AMOeTalmgAAAX9cHNDdAAAEAwBIMEYCIQCB52OPhdnYybsWzmkdSGSbgQVmS0V7\n" +
-            "ZumbThJSJwpuiwIhAP+JRx+Eu3MYRp5iyLb+xlWqghMnDnF9aCfm1VuW4aDuMA0G\n" +
-            "CSqGSIb3DQEBCwUAA4IBAQBO/4LljBpMGYYxBang12UIQ+FIjxAfKqqIklSa+du2\n" +
-            "ea0VHqaRrdfh/aTxzb0WaU++bgQN+MeHmQdvwYSgAyU/lY7mIvDTNxFOO6IG2vfR\n" +
-            "+JAUnS9iVUQ1rXHU72cxUsne5aRyLQ0W/2Zayx85O6/C9gIUJgJVRuk0dTPZ6tnq\n" +
-            "FoW1S4GwqEpzTuJU8rP5IvMYoYo8jItpjzS0W90gtDvev/XBRs1ig28Ky7ZS5AtQ\n" +
-            "S2Q6Ikg9YzegE9YNj2wqdZnEneoce0G1InysM/geY1BZ57G9RAUZkzWVTJRLJgbg\n" +
-            "2nWSqpQJ765gg9JdsRo+zqj1kUBbUYoTSlaAJG6ucrlB\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator)
-            throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Tue Mar 08 11:23:06 PST 2022", System.out);
-    }
-}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/SSLCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/SSLCA.java
deleted file mode 100644
index dd0b982f58b..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/SSLCA.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8243320 8256895
- * @summary Interoperability tests with SSL.com's RSA, EV RSA, and ECC CA
- * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath SSLCA OCSP
- * @run main/othervm -Djava.security.debug=certpath SSLCA CRL
- */
-
-/*
- * Obtain TLS test artifacts for SSL.com CAs from:
- *
- * SSL.com RSA CA
- *     Valid - https://test-dv-rsa.ssl.com
- *     Revoked - https://revoked-rsa-dv.ssl.com/
- * SSL.com EV RSA CA
- *     Valid - https://test-ev-rsa.ssl.com
- *     Revoked - https://revoked-rsa-ev.ssl.com/
- * SSL.com ECC CA
- *     Valid - https://test-dv-ecc.ssl.com
- *     Revoked - https://revoked-ecc-dv.ssl.com/
- */
-public class SSLCA {
-
-    public static void main(String[] args) throws Exception {
-
-        System.setProperty("jdk.security.certpath.ocspNonce", "true");
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-        boolean ocspEnabled = false;
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-            ocspEnabled = true;
-        }
-
-        new SSLCA_RSA().runTest(pathValidator, ocspEnabled);
-        new SSLCA_EV_RSA().runTest(pathValidator, ocspEnabled);
-        new SSLCA_ECC().runTest(pathValidator, ocspEnabled);
-    }
-}
-
-class SSLCA_RSA {
-
-    // Owner: CN=SSL.com RSA SSL subCA, O=SSL Corporation, L=Houston, ST=Texas, C=US
-    // Issuer: CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, ST=Texas, C=US
-    // Serial number: 997ed109d1f07fc
-    // Valid from: Fri Feb 12 10:48:52 PST 2016 until: Wed Feb 12 10:48:52 PST 2031
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGbzCCBFegAwIBAgIICZftEJ0fB/wwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UE\n" +
-            "BhMCVVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQK\n" +
-            "DA9TU0wgQ29ycG9yYXRpb24xMTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZp\n" +
-            "Y2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYwMjEyMTg0ODUyWhcNMzEwMjEyMTg0\n" +
-            "ODUyWjBpMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hv\n" +
-            "dXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjEeMBwGA1UEAwwVU1NMLmNv\n" +
-            "bSBSU0EgU1NMIHN1YkNBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA\n" +
-            "hPYpOunhcxiF6xNzl6Tsm/Q89rnu2jVTXTBOZPaBkSD1Ic4lm7qkYwlZ/UgV5nn1\n" +
-            "5ohhceYDC2AlR9RvGbP+26qrNcuE0XOdHJOB4SoY4d6OqLAQ6ZB0LdERK1Saa5lp\n" +
-            "QlqHE8936dpr3hGWyqMb2LsdUuhQIzwNkLU/n9HO35irKCbKgS3FeejqkdqK5l6B\n" +
-            "b11693o4bz9UZCUdBcQ/Xz06tA5cfnHvYkmmjxhj1lLTKwkQhWuIDrpbwWLO0QVO\n" +
-            "c29s9ieomRKm8sYMyiBG4QqRQ/+bXwp48cF0qAByGWD6b8/gG4Xq1IBgO5p+aWFS\n" +
-            "0mszkk5rsh4b3XbTHohP3oWQIOV20WWdtVWXiQuBB8RocAl0Ga//b+epiGgME5JX\n" +
-            "LWXD1aDg/xHy8MUsaMlh6jDfVIFepkPnkwXDpR/n36hpgKa9dErMkgbYeEaPanLH\n" +
-            "Yd0kv4xQ36PlMMs9WhoDErGcEG9KxAXN4Axr5wl6PTDn/lXcUFvQoIq/5CSP+Kt5\n" +
-            "jq9tK/gRrAc4AWqRugDvQPYUm00Rqzj5Oxm5NVQYDzbyoA66CD68LETuVrfa9GuW\n" +
-            "9MAZRO6CDzonAezIdNHsslDb1H8VN/k0zMxjI+0ub4IAmc3I5GfZtvYcpjtMj8L4\n" +
-            "2TDS34/COov/Pf2HZ/XXGlzjZ7WPmLl4fdB6hhjs2BsCAwEAAaOCAQYwggECMDAG\n" +
-            "CCsGAQUFBwEBBCQwIjAgBggrBgEFBQcwAYYUaHR0cDovL29jc3BzLnNzbC5jb20w\n" +
-            "HQYDVR0OBBYEFCYUfuDc16b34tQEJ99h8cLs5zLKMA8GA1UdEwEB/wQFMAMBAf8w\n" +
-            "HwYDVR0jBBgwFoAU3QQJB6L1en1SUxKSle44gCUNplkwEQYDVR0gBAowCDAGBgRV\n" +
-            "HSAAMDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmxzLnNzbC5jb20vc3NsLmNv\n" +
-            "bS1yc2EtUm9vdENBLmNybDAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYB\n" +
-            "BQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4ICAQAi6e/iSV5DEqDO6XjQ\n" +
-            "SIIzXgc255yv6Oc2sqZnvRyVBHtHvo62jMoHY3Xunc/EofbeS4aHdYBvgkn6CNTj\n" +
-            "VkCU+psWwcT3Pg83uP4k4Thu7bXvrClfS+XBlbJiCF/PSJxLrKnxRn+XIGiYl62H\n" +
-            "glBhq9K8/fZrI2Qh1mZJmWE0FlxEDCb4i8SBNi8lmDogaFi8/yl32Z9ahmhxcLit\n" +
-            "DU/XyKA0yOqvIrOGKH95v+/l8fQkzE1VEFvj+iyv4TXd7mRZDOsfqfIDZhrpou02\n" +
-            "kXH/hcXlrR++t8kjj9wt8HHQ+FkryWI6bU3KPRJR6N8EH2EHi23Rp8/kyMs+gwaz\n" +
-            "zMqnkNPbMME723rXk6/85sjOUaZCmhmRIx9rgqIWQesU962J0FruGOOasLT7WbZi\n" +
-            "FsmSblmpjUAo49sIRi7X493qegyCEAa412ynybhQ7LVsTLEPxVbdmGVih3jVTif/\n" +
-            "Nztr2Isaaz4LpMEo4mGCiGxec5mKr1w8AE9n6D91CvxR5/zL1VU1JCVC7sAtkdki\n" +
-            "vnN1/6jEKFJvlUr5/FX04JXeomIjXTI8ciruZ6HIkbtJup1n9Zxvmr9JQcFTsP2c\n" +
-            "bRbjaT7JD6MBidAWRCJWClR/5etTZwWwWrRCrzvIHC7WO6rCzwu69a+l7ofCKlWs\n" +
-            "y702dmPTKEdEfwhgLx0LxJr/Aw==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=test-dv-rsa.ssl.com
-    // Issuer: CN=SSL.com RSA SSL subCA, O=SSL Corporation, L=Houston, ST=Texas, C=US
-    // Serial number: 4ceada4ade82a6ccd0b2ae32c0dbfd62
-    // Valid from: Fri Jun 28 07:06:50 PDT 2019 until: Sun Jun 27 07:06:50 PDT 2021
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHTjCCBTagAwIBAgIQTOraSt6CpszQsq4ywNv9YjANBgkqhkiG9w0BAQsFADBp\n" +
-            "MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24x\n" +
-            "GDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjEeMBwGA1UEAwwVU1NMLmNvbSBSU0Eg\n" +
-            "U1NMIHN1YkNBMB4XDTE5MDYyODE0MDY1MFoXDTIxMDYyNzE0MDY1MFowHjEcMBoG\n" +
-            "A1UEAwwTdGVzdC1kdi1yc2Euc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP\n" +
-            "ADCCAQoCggEBAKlOrYr8fnHN8REfJDwgsBhJvnsU4beQIYYaOAzR8pmo8eq1U/K0\n" +
-            "uwRrgJ5K61V78zBO5qmZNiivBobViftObWrq2H6QhQsYdMYXld3SEnEotIIriRHY\n" +
-            "2PcqlgnFYXkqI0ZKs4kNs+j3GS0IwncJJwKtypmtLTCLK5J/kG7qB2MNfXZTIzKI\n" +
-            "iZza4RUM1j67Hv3fPJzNEJ9urfjaI4xcRh5airlzBWOBU9pW87P7BgQN7cNzJQji\n" +
-            "4DSvb1pSXv8sBbZk5fmG+81PyUxcfqj7Dbih0J1Aoq0YysHugsrK/kLz+CvqL9B2\n" +
-            "a1JMZfob9jzcA7XPjpggLc3az2Wvv3XKqokCAwEAAaOCAzswggM3MB8GA1UdIwQY\n" +
-            "MBaAFCYUfuDc16b34tQEJ99h8cLs5zLKMHwGCCsGAQUFBwEBBHAwbjBKBggrBgEF\n" +
-            "BQcwAoY+aHR0cDovL3d3dy5zc2wuY29tL3JlcG9zaXRvcnkvU1NMY29tLVN1YkNB\n" +
-            "LVNTTC1SU0EtNDA5Ni1SMS5jcnQwIAYIKwYBBQUHMAGGFGh0dHA6Ly9vY3Nwcy5z\n" +
-            "c2wuY29tMDcGA1UdEQQwMC6CE3Rlc3QtZHYtcnNhLnNzbC5jb22CF3d3dy50ZXN0\n" +
-            "LWR2LXJzYS5zc2wuY29tMFEGA1UdIARKMEgwCAYGZ4EMAQIBMDwGDCsGAQQBgqkw\n" +
-            "AQMBATAsMCoGCCsGAQUFBwIBFh5odHRwczovL3d3dy5zc2wuY29tL3JlcG9zaXRv\n" +
-            "cnkwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMDoGA1UdHwQzMDEwL6At\n" +
-            "oCuGKWh0dHA6Ly9jcmxzLnNzbC5jb20vU1NMY29tUlNBU1NMc3ViQ0EuY3JsMB0G\n" +
-            "A1UdDgQWBBQD/cmwQI853u0mOlmCjNRsAZOlEDAOBgNVHQ8BAf8EBAMCBaAwggF+\n" +
-            "BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB2AO5Lvbd1zmC64UJpH6vhnmajD35fsHLY\n" +
-            "gwDEe4l6qP3LAAABa55yL0QAAAQDAEcwRQIgWo8UQY3EYwyzkGLBLS0Zxu7oMmB7\n" +
-            "dnpzsEcoexWzZrQCIQCR6FkAe5ns84x2phRkn6nV7a0anjnxjpJUNeCfc3/pxAB2\n" +
-            "AG9Tdqwx8DEZ2JkApFEV/3cVHBHZAsEAKQaNsgiaN9kTAAABa55yLzsAAAQDAEcw\n" +
-            "RQIhAKhGKQIpSd59tJm/Yac7Xo05u93CWbnDwoDgSMS+HBs5AiAfOSOc3BzY/2MF\n" +
-            "AM4GWrkK5Ehs9JMafo/+VBM0OrwVKQB2AId1v+dZfPiMQ5lfvfNu/1aNR1Y2/0q1\n" +
-            "YMG06v9eoIMPAAABa55yL4IAAAQDAEcwRQIhANcF26iGoUuzZL6rGKduPtyyYusf\n" +
-            "03lBKSyvxabB9WuvAiBNbxR210L+JP89s/ONw53lYVr+1m/c3u9/9Wpu7c3n5jAN\n" +
-            "BgkqhkiG9w0BAQsFAAOCAgEACX2CbVM8MCIJ+2Wsap1v6VU2kpCS/FBIsLSTWNEf\n" +
-            "dREv1nh93qQ2CPIxj5kP/0EOUfq7tmQCJHMODVgz3iHrdxRB1E58nXHlZ6vUdrCo\n" +
-            "pD9d6Cp+AwvrOdv6MndVJgel9tVOAqAUblwdLzPNQHEcXoKnFEVv2SVQCmAYLlkP\n" +
-            "xX2RS73gseiit4QnVZOWi/wDhqMm7/iq8n7rL/f7+ly2+7e3LVjxd24HZkgxNgbn\n" +
-            "JDjYvIla+EvyrY8514Ru3Pf1UICY03VpYjE8R7SxrqcvOLtwvOVew6TuCUl6RNpl\n" +
-            "xeC9Oa1dgf+QRXN7LvmBXUP2nOCnwJE1ENvThPLw9BXLatVJgkA/v/mYWE5VjzIL\n" +
-            "hboPH2fNWemUv5QMzxUkqhgHgrhr8wnhI6xYIYciGDbmmfnItHex7bxktT7axoCD\n" +
-            "3dTQQe01YfK/LlkHtnBmJf/t0F33m8KXcQ51fic/TR2U5Tampxp2kdFdTyvRRqMl\n" +
-            "igqo3EhiPmB9bKsnXDA2AnvdjZT9uFwbUu5lNxjiMQcSZikjQAjJPgjCZ9BQOGbL\n" +
-            "eqgZcw2CxWMxFSTLL3TIBlNL/0GpRlTvr3IGyvHEr7EESXKD+Ar8XW+4VlMc1s8F\n" +
-            "cdtnus71s7wm+JUSXcM0WJUkRUvWqHlPi3Ucfe7k6x6BG9Mb42ECjorefPXvFu7v\n" +
-            "OT4=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked-rsa-dv.ssl.com
-    // Issuer: CN=SSL.com RSA SSL subCA, O=SSL Corporation, L=Houston, ST=Texas, C=US
-    // Serial number: 3f527e677d00558272ac90d1620b67f4
-    // Valid from: Fri Jun 28 07:13:48 PDT 2019 until: Sun Jun 27 07:13:48 PDT 2021
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHVzCCBT+gAwIBAgIQP1J+Z30AVYJyrJDRYgtn9DANBgkqhkiG9w0BAQsFADBp\n" +
-            "MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24x\n" +
-            "GDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjEeMBwGA1UEAwwVU1NMLmNvbSBSU0Eg\n" +
-            "U1NMIHN1YkNBMB4XDTE5MDYyODE0MTM0OFoXDTIxMDYyNzE0MTM0OFowITEfMB0G\n" +
-            "A1UEAwwWcmV2b2tlZC1yc2EtZHYuc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD\n" +
-            "ggEPADCCAQoCggEBAMKtMVeo+fMoeu1nLrcwxNAdfUysNKEhNZbMUOu9pzCChEvJ\n" +
-            "QHUicdrIZYl9m59uKUMh3Dj2nJLZ3a0pP4iWKcOEfCVMtA83/GDJl/BVj3XFbsMl\n" +
-            "+HSIu7R0vQM4enOztLabnOzvE4pQOFUp8u5SKO+hmB0zQ1iWkevYjJOf5DBZ7Zsa\n" +
-            "uF4qy9JqSF07gj/7FNqmqnfy6Z8yc8WAMjoUJrVrvmHQZeX/bCWxczFhYmAtYlwO\n" +
-            "7a914VP79b3Jq60HbLbYBdILnuU1Uu5L/JbG+hm/fH2meY30aWUaKcGY04ej6xuM\n" +
-            "hWsLhOrmcl3P7/E5UUojaR1Zvdtsn7jkQ8Y3iOsCAwEAAaOCA0EwggM9MB8GA1Ud\n" +
-            "IwQYMBaAFCYUfuDc16b34tQEJ99h8cLs5zLKMHwGCCsGAQUFBwEBBHAwbjBKBggr\n" +
-            "BgEFBQcwAoY+aHR0cDovL3d3dy5zc2wuY29tL3JlcG9zaXRvcnkvU1NMY29tLVN1\n" +
-            "YkNBLVNTTC1SU0EtNDA5Ni1SMS5jcnQwIAYIKwYBBQUHMAGGFGh0dHA6Ly9vY3Nw\n" +
-            "cy5zc2wuY29tMD0GA1UdEQQ2MDSCFnJldm9rZWQtcnNhLWR2LnNzbC5jb22CGnd3\n" +
-            "dy5yZXZva2VkLXJzYS1kdi5zc2wuY29tMFEGA1UdIARKMEgwCAYGZ4EMAQIBMDwG\n" +
-            "DCsGAQQBgqkwAQMBATAsMCoGCCsGAQUFBwIBFh5odHRwczovL3d3dy5zc2wuY29t\n" +
-            "L3JlcG9zaXRvcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMDoGA1Ud\n" +
-            "HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmxzLnNzbC5jb20vU1NMY29tUlNBU1NMc3Vi\n" +
-            "Q0EuY3JsMB0GA1UdDgQWBBSTrHG0Sh+8BEp+oP+avIGAtSdyajAOBgNVHQ8BAf8E\n" +
-            "BAMCBaAwggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB2AESUZS6w7s6vxEAH2Kj+\n" +
-            "KMDa5oK+2MsxtT/TM5a1toGoAAABa554kQsAAAQDAEcwRQIhAIfU+5HWDnqZdlMN\n" +
-            "Z+CEkBE8wBFUWzG0ixSQ5S1Tryt4AiAQevLU7OF3N90zIt2QpwVAIGve5lBElhMH\n" +
-            "fRqXTkeZZwB2AG9Tdqwx8DEZ2JkApFEV/3cVHBHZAsEAKQaNsgiaN9kTAAABa554\n" +
-            "jJQAAAQDAEcwRQIhAPd8mNiDFHA74Bl16nwOPehQZmiFltzCYDsd0uHv5qCfAiB+\n" +
-            "S43G7Yhq62Ofma6wXsag+UEl/tttzfbfASGz1WPBOQB2AKS5CZC0GFgUh7sTosxn\n" +
-            "cAo8NZgE+RvfuON3zQ7IDdwQAAABa554kDoAAAQDAEcwRQIgUs8O4gQ34Sp0K4Dn\n" +
-            "Wh7FRFJWwZ6cGYvqmKT+UyCeVisCIQDl0AYXsn4ILMafvmJwnXlcduZ3z6P0jwGK\n" +
-            "Cjh26ETDFzANBgkqhkiG9w0BAQsFAAOCAgEAAtTlh2YMwe6E0+EWKU3H79NmgLjK\n" +
-            "xoR3VtT56ILRt0qJuJ+z1iqq/IxZBe7wnUUWU46SWmBfDEQcGI7Hdomr67QBZNZz\n" +
-            "+wvnatMzrCPM7jPsb05Motz99NSk6yzQzR2c030sy1d78mRKJ/4wpidNDHpjuYL9\n" +
-            "cBp2gKf2/RxU74+BhugCjLqB1gojGO0CT1/g5a1QMtqRMM0EPrJrrtcEM0zG48yI\n" +
-            "P3b57Nl2ZbshRvY9bVi3of2SaPFQgu99/zAlerPUThz4O2CskOgKt77y6KOgCbBp\n" +
-            "7fQF6vh/aOm0Xba2Z0CtB+uVN2g4+LwyuovOy+JyjGKv7GxRKEQmGZsRLDVpxOs5\n" +
-            "W47K+iuOEhTRWRkStfuk2LcCLwTrgxHv2/Wo+80ME/7wxGKs1IzlkcFtFLhaeN4p\n" +
-            "QsmADpcyBfeWmvTdKgaVBOE2F/nenIiKpo+0jcoMAW6JgMD+otn8gofBq+Za1N4X\n" +
-            "xckvLWbMDAj4lELBHXu7gLHHLJCL9GGPD5HKjH/RyLtKKaRgT/AV6jl/woKTAzGF\n" +
-            "SPqgNQsu+sCdUbO0nDONkXDxhfan8XNrd32KMPGucJySiyjpHkurobMuGbs/LQzd\n" +
-            "JLTSTIIIPpEHBk7PHRGPSFewIhi0aDhupgZLU9UGrLRw/xV/KlGqTcGFWBvvOC+I\n" +
-            "CSZFRr0hWBv/dfw=\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator, boolean ocspEnabled) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Fri Jun 28 07:25:02 PDT 2019", System.out);
-    }
-}
-
-class SSLCA_EV_RSA {
-
-    // Owner: CN=SSL.com EV SSL Intermediate CA RSA R3, O=SSL Corp, L=Houston, ST=Texas, C=US
-    // Issuer: CN=SSL.com EV Root Certification Authority RSA R2, O=SSL Corporation, L=Houston, ST=Texas, C=US
-    // Serial number: 56b629cd34bc78f6
-    // Valid from: Wed May 31 11:14:37 PDT 2017 until: Fri May 30 11:14:37 PDT 2042
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIG4DCCBMigAwIBAgIQA6P00GAwUqM3zjgKiDAxjDANBgkqhkiG9w0BAQsFADCB\n" +
-            "gjELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9u\n" +
-            "MRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNzA1BgNVBAMMLlNTTC5jb20gRVYg\n" +
-            "Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EgUjIwHhcNMTkwMzI2MTc0\n" +
-            "NjUzWhcNMzQwMzIyMTc0NjUzWjByMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4\n" +
-            "YXMxEDAOBgNVBAcMB0hvdXN0b24xETAPBgNVBAoMCFNTTCBDb3JwMS4wLAYDVQQD\n" +
-            "DCVTU0wuY29tIEVWIFNTTCBJbnRlcm1lZGlhdGUgQ0EgUlNBIFIzMIICIjANBgkq\n" +
-            "hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAkby+CNUTyO0wakMc6VeJxQLGcTtfwJG6\n" +
-            "W9MYhMBWW22YUMtfCL7at/ey89eCc0cNy9uekJqitJe78Ion5qHBLfSpahYWttzr\n" +
-            "LflXkdlPz6xsZuw7F/tp6oYrcUpRIX92ci0EhORtb5xoX7rwzrBnG2Jv7fPn8JGj\n" +
-            "wmvYPS0meVkuKGtdR/s3dkl0tDraq2xti8cN7W9VawzLDL9yNyEw2GWAp3M5Uqex\n" +
-            "Yjh9HY5w/4bgk7K0KSw+2njaXCEa2MugM6txHDKjocVFBe7G8JPMKkCcbbrgZo/q\n" +
-            "ygTnIY8q7B1XQG2wrdsu4LTo9ijIYmoZHBAKN/XCdPecQYF9cHrv6NjVUcMrNmHT\n" +
-            "B43NrIvrXmm3lZJU4PZNUhb7YrDtpN+rV6zSaKAu/EArGDzYv8iHKT2E+wjhwqOC\n" +
-            "WnXv1qSa//xvN6RSoDMpj7q7iTxfdrQqRFsr70hyPrUmnoJLrBBg1+IqFTkaNtuk\n" +
-            "misP4Bd0zeqkEuxYCmhKcCTM2iS9RMCIot5HI5qeAcVs63WzM+ax0zbHK1F9AIOG\n" +
-            "gwrVRrdwXRSXO4TlvamsL6klJMnjSCs7E1l8xeE403nZPp4RGr5ZQFrhfdG9nL7w\n" +
-            "66osGX+dGHGZkFjASS3Bw0RCiz4oCJxFGE+FAD7pJaV8GP6XTkaZp9n1ooYzCC48\n" +
-            "vq0OtfRS62MCAwEAAaOCAV8wggFbMBIGA1UdEwEB/wQIMAYBAf8CAQAwHwYDVR0j\n" +
-            "BBgwFoAU+WC71OPVNPa49QaAJadz20ZpqJ4wfAYIKwYBBQUHAQEEcDBuMEoGCCsG\n" +
-            "AQUFBzAChj5odHRwOi8vd3d3LnNzbC5jb20vcmVwb3NpdG9yeS9TU0xjb20tUm9v\n" +
-            "dENBLUVWLVJTQS00MDk2LVIyLmNydDAgBggrBgEFBQcwAYYUaHR0cDovL29jc3Bz\n" +
-            "LnNzbC5jb20wEQYDVR0gBAowCDAGBgRVHSAAMB0GA1UdJQQWMBQGCCsGAQUFBwMC\n" +
-            "BggrBgEFBQcDATBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vY3Jscy5zc2wuY29t\n" +
-            "L1NTTGNvbS1Sb290Q0EtRVYtUlNBLTQwOTYtUjIuY3JsMB0GA1UdDgQWBBS/wVqH\n" +
-            "/yj6QT39t0/kHa+gYVgpvTAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD\n" +
-            "ggIBAAoTAGRea1Lg+Rlvnhj6lHbvhn9mjUlXZuI1b4d4jDDk5X29gNKhW7Rg97Qt\n" +
-            "oBoJaLb9gZkJ2MkUbCE1x2jIghjLmmFvaIq+nAZEMtWWEi0ycqQm8rVUHioZ2Mfn\n" +
-            "2SoFtQeY+5MFLO9l8IeDaNZ+LV3su8YTsh/453vExhiNhPVEqLyGlkkW0B2gNW8z\n" +
-            "bsRy6L5QW0cZ4gZrY86MvHB0Gl299mTJ4jcgic+Oalbz9SZJ+EiW/aUDSpZ2zawi\n" +
-            "ackPWmAbk0y0gouOymrwOJZTuq+AJEJ6M+WSVdknwE7YwDpVMszHXS38BS1A5N1i\n" +
-            "rzW3BcARHbtCb00vEy2mzW5JPM2LjkzfgJ0lBiyDCE3ZeBeUtKmcdFUFrHwHl3gV\n" +
-            "aRipD+xMa1hGOTh33eMzwWoRxvk6o7y73Sy6XBfycN+8LhXUZT0X8STmWtBtLSMp\n" +
-            "blWMjuuFyUVQvIj05N7hORY/LhdQhEx8kVwS5RkLVSpRnohdk+nI69yIA7EwZKlw\n" +
-            "kKEsDqlVOeDYWVWQANDC55kJ7nOyJbqtGJqImwWXdQcf37fi80cf+mKOYs5vNmkx\n" +
-            "D9bwFWsKnP71x0liSlv8z79vRAo8FJwTgXRNO1c0ACf0rXEJy3GRAXRWiTvuGahR\n" +
-            "JVM3Jnn0G6o3+vTfwa7CKR/9Jc4t25iRU3xmSgiusg4u8i5x\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: OID.1.3.6.1.4.1.311.60.2.1.3=US, OID.1.3.6.1.4.1.311.60.2.1.2=Nevada, STREET=3100 Richmond Ave,
-    // OID.2.5.4.15=Private Organization, OID.2.5.4.17=77098, CN=test-ev-rsa.ssl.com, SERIALNUMBER=NV20081614243,
-    // O=SSL Corp, L=Houston, ST=Texas, C=US
-    // Issuer: CN=SSL.com EV SSL Intermediate CA RSA R3, O=SSL Corp, L=Houston, ST=Texas, C=US
-    // Serial number: 558089b221d7cd9c7a4bc4a7fd7e2969
-    // Valid from: Mon Jul 01 13:28:01 PDT 2019 until: Wed Jun 30 13:28:01 PDT 2021
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIISTCCBjGgAwIBAgIQVYCJsiHXzZx6S8Sn/X4paTANBgkqhkiG9w0BAQsFADBy\n" +
-            "MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24x\n" +
-            "ETAPBgNVBAoMCFNTTCBDb3JwMS4wLAYDVQQDDCVTU0wuY29tIEVWIFNTTCBJbnRl\n" +
-            "cm1lZGlhdGUgQ0EgUlNBIFIzMB4XDTE5MDcwMTIwMjgwMVoXDTIxMDYzMDIwMjgw\n" +
-            "MVowgfExCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91\n" +
-            "c3RvbjERMA8GA1UECgwIU1NMIENvcnAxFjAUBgNVBAUTDU5WMjAwODE2MTQyNDMx\n" +
-            "HDAaBgNVBAMME3Rlc3QtZXYtcnNhLnNzbC5jb20xDjAMBgNVBBEMBTc3MDk4MR0w\n" +
-            "GwYDVQQPDBRQcml2YXRlIE9yZ2FuaXphdGlvbjEaMBgGA1UECQwRMzEwMCBSaWNo\n" +
-            "bW9uZCBBdmUxFzAVBgsrBgEEAYI3PAIBAgwGTmV2YWRhMRMwEQYLKwYBBAGCNzwC\n" +
-            "AQMTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsmMOHfREGN48\n" +
-            "nlgxYiF0EJsytoM98UAslRRlGHJyZw3SLcPx9u/I82h0KKjLtnY3/o62mCoEZYlc\n" +
-            "1UKKEIi3NgByU8yJ0yynm3I0LJHEZqOKoahtzwP787/OtqsSsWeblrTnfxVO7G1J\n" +
-            "bPYrPtNuQ9ZnmByyhA+hlTIY48kJh5WtmBeftBSynuKCgpVnkv2y2LKZJc4t6JQX\n" +
-            "XO6Geev8LPUd2uPVjatZv0se2YKdixFQQKwWcLJV5LZqjZDhZtPomCN0sp+wle4p\n" +
-            "rRTZPSWRB98mI1X+UBTFGFKS9cxzO2NwmVcbgN2WYR+FpWbatoS/RThGC7mKQB7i\n" +
-            "5BEQHNZMawIDAQABo4IDWTCCA1UwHwYDVR0jBBgwFoAUv8Fah/8o+kE9/bdP5B2v\n" +
-            "oGFYKb0wfwYIKwYBBQUHAQEEczBxME0GCCsGAQUFBzAChkFodHRwOi8vd3d3LnNz\n" +
-            "bC5jb20vcmVwb3NpdG9yeS9TU0xjb20tU3ViQ0EtRVYtU1NMLVJTQS00MDk2LVIz\n" +
-            "LmNydDAgBggrBgEFBQcwAYYUaHR0cDovL29jc3BzLnNzbC5jb20wNwYDVR0RBDAw\n" +
-            "LoITdGVzdC1ldi1yc2Euc3NsLmNvbYIXd3d3LnRlc3QtZXYtcnNhLnNzbC5jb20w\n" +
-            "XwYDVR0gBFgwVjAHBgVngQwBATANBgsqhGgBhvZ3AgUBATA8BgwrBgEEAYKpMAED\n" +
-            "AQQwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cuc3NsLmNvbS9yZXBvc2l0b3J5\n" +
-            "MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBIBgNVHR8EQTA/MD2gO6A5\n" +
-            "hjdodHRwOi8vY3Jscy5zc2wuY29tL1NTTGNvbS1TdWJDQS1FVi1TU0wtUlNBLTQw\n" +
-            "OTYtUjMuY3JsMB0GA1UdDgQWBBTIDVTF3DDhdwudatuodPyHe1jcOzAOBgNVHQ8B\n" +
-            "Af8EBAMCBaAwggF9BgorBgEEAdZ5AgQCBIIBbQSCAWkBZwB1AG9Tdqwx8DEZ2JkA\n" +
-            "pFEV/3cVHBHZAsEAKQaNsgiaN9kTAAABa69CQcUAAAQDAEYwRAIgEYzpfp8v+gG3\n" +
-            "S9cgZIuFCKPeoSM85gag8/iBJhNIb9oCIDcq+2Pi8+E3LAVmZfgcMhg30t821LNn\n" +
-            "PWATU5+gAmmzAHUAh3W/51l8+IxDmV+9827/Vo1HVjb/SrVgwbTq/16ggw8AAAFr\n" +
-            "r0JCCQAABAMARjBEAiAzeyNw/2osk+xktY8VpFTsROj7jRODS2G3G2MDV6ZmMwIg\n" +
-            "bwuFbNxSEqUfKhveZJVVLYzZtzXcjkhflaazupumZrkAdwC72d+8H4pxtZOUI5eq\n" +
-            "kntHOFeVCqtS6BqQlmQ2jh7RhQAAAWuvQkGUAAAEAwBIMEYCIQCEfoPIKoy0Rv/d\n" +
-            "DXOVm0FzKDH2zWHN/oQZ/7gwd21hvAIhAL2gDESf+tcjCkbjdj9NpDa/fVWO9VZD\n" +
-            "uPPnAZ6jf2G3MA0GCSqGSIb3DQEBCwUAA4ICAQAcYH/+o9N0E3H9h0GfohGElfRw\n" +
-            "XPUnQI3/CZwuG0ShCbpVspvUkuR/P0Hjr9XgDVy39R9SOaEDK3/coG8/Ry56Lrm0\n" +
-            "17v+yeEzAVK51eQeinHoCYc9TIwmyrwt36JE/zIwnDB623Y4ccxYN5LZxjVx668/\n" +
-            "xj3JffaY5185qPjAqkjLUzj9TeeAJk/ws1YXbQJvO4CZV2QXrishC+dEoqvfOe/u\n" +
-            "sMHcMJy+cFrPhe4cC7s9fHeYTpF36yvfWrgjGwDki/9zgRhOvDuM72dIMkrcHkZi\n" +
-            "OvZMgyoXz/Nw3D514K9BSt6xRB2qGzI8fx0EOGzEEjX1Zdie2uVDy9aC8k8TjQAM\n" +
-            "v/YT7Bggpv300hWvBGw0QT8l7Nk1PZFBagAhqRCKRsR1pUZ8CyZzwNkNyUSYV4Or\n" +
-            "n0vYwVEgpMeSMu/ObWwWPM7QKSNcSSIV5lxmsZX+wS76OpDMHm27P94RTEePF4sG\n" +
-            "QmvY6hgHSlREJUL0vyGGY2Rbm3cL3zaM4qTquN18v61uUVKakELYIcRZwVTyBj5M\n" +
-            "KxOkjGXnLYpDOLFHD4WB1q7J+SorG43V+nbmTEN5fshGUjjWoz5ykfErnyJa1+Py\n" +
-            "FXWoPFb425DelhuDe94btROuJELRfzhqDXoKrhDgSQGV2qM3sk6uIPOaoH4N31ko\n" +
-            "C41bezSdJ5r4mif8iA==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: OID.1.3.6.1.4.1.311.60.2.1.3=US, OID.1.3.6.1.4.1.311.60.2.1.2=Nevada, STREET=3100 Richmond Ave,
-    // OID.2.5.4.15=Private Organization, OID.2.5.4.17=77098, CN=revoked-rsa-ev.ssl.com, SERIALNUMBER=NV20081614243,
-    // O=SSL Corp, L=Houston, ST=Texas, C=US
-    // Issuer: CN=SSL.com EV SSL Intermediate CA RSA R3, O=SSL Corp, L=Houston, ST=Texas, C=US
-    // Serial number: 1ea7f53492bded2d425135bdf525889f
-    // Valid from: Mon Jul 01 13:29:02 PDT 2019 until: Wed Jun 30 13:29:02 PDT 2021
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIIUzCCBjugAwIBAgIQHqf1NJK97S1CUTW99SWInzANBgkqhkiG9w0BAQsFADBy\n" +
-            "MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24x\n" +
-            "ETAPBgNVBAoMCFNTTCBDb3JwMS4wLAYDVQQDDCVTU0wuY29tIEVWIFNTTCBJbnRl\n" +
-            "cm1lZGlhdGUgQ0EgUlNBIFIzMB4XDTE5MDcwMTIwMjkwMloXDTIxMDYzMDIwMjkw\n" +
-            "MlowgfQxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91\n" +
-            "c3RvbjERMA8GA1UECgwIU1NMIENvcnAxFjAUBgNVBAUTDU5WMjAwODE2MTQyNDMx\n" +
-            "HzAdBgNVBAMMFnJldm9rZWQtcnNhLWV2LnNzbC5jb20xDjAMBgNVBBEMBTc3MDk4\n" +
-            "MR0wGwYDVQQPDBRQcml2YXRlIE9yZ2FuaXphdGlvbjEaMBgGA1UECQwRMzEwMCBS\n" +
-            "aWNobW9uZCBBdmUxFzAVBgsrBgEEAYI3PAIBAgwGTmV2YWRhMRMwEQYLKwYBBAGC\n" +
-            "NzwCAQMTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlqZwW2n7\n" +
-            "Ot8ujRGyCkzf/FqkiIi6+mq7QXlBMsZVNmLcWzatoS9K8WOviU+lmYpdV3rkrX1v\n" +
-            "e/FZBwtBR/x1FRN3CPoGcO0Yu6CZjknHtyyNQ36mwUy7UW+rQKYjDfU4aXme4bP8\n" +
-            "Dk2rUYQtM/xpYHKDk9x7Vg4zAmk+L0LQmSU0103DRuANnxOszEK196UbLE4W+2+i\n" +
-            "Xat40jHW3KU2PxVfCajgB1mdrDt2b5j/qDAL+Wo2DzCtE62UPJvI6UyEqJ24jinS\n" +
-            "A4l4NgkMPDMWNU5QIkV/EhQvZMUKCvNUv+Gsq8pcOeDXxKpBIe/KoQSMH18mym1U\n" +
-            "vIaTjAzDDsWjqwIDAQABo4IDYDCCA1wwHwYDVR0jBBgwFoAUv8Fah/8o+kE9/bdP\n" +
-            "5B2voGFYKb0wfwYIKwYBBQUHAQEEczBxME0GCCsGAQUFBzAChkFodHRwOi8vd3d3\n" +
-            "LnNzbC5jb20vcmVwb3NpdG9yeS9TU0xjb20tU3ViQ0EtRVYtU1NMLVJTQS00MDk2\n" +
-            "LVIzLmNydDAgBggrBgEFBQcwAYYUaHR0cDovL29jc3BzLnNzbC5jb20wPQYDVR0R\n" +
-            "BDYwNIIWcmV2b2tlZC1yc2EtZXYuc3NsLmNvbYIad3d3LnJldm9rZWQtcnNhLWV2\n" +
-            "LnNzbC5jb20wXwYDVR0gBFgwVjAHBgVngQwBATANBgsqhGgBhvZ3AgUBATA8Bgwr\n" +
-            "BgEEAYKpMAEDAQQwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cuc3NsLmNvbS9y\n" +
-            "ZXBvc2l0b3J5MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBIBgNVHR8E\n" +
-            "QTA/MD2gO6A5hjdodHRwOi8vY3Jscy5zc2wuY29tL1NTTGNvbS1TdWJDQS1FVi1T\n" +
-            "U0wtUlNBLTQwOTYtUjMuY3JsMB0GA1UdDgQWBBQnclOL04VraXmRZEkhwgMbajmy\n" +
-            "YTAOBgNVHQ8BAf8EBAMCBaAwggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB3AG9T\n" +
-            "dqwx8DEZ2JkApFEV/3cVHBHZAsEAKQaNsgiaN9kTAAABa69DLjEAAAQDAEgwRgIh\n" +
-            "AMd3B9Gt/hpTCZ+2xsOTTKBaDjh+EsMcKuwZkEpO6UN0AiEA8yiZ9ZIrCOUxsdQp\n" +
-            "FJi+MtsNQxvgu8igdv+l34jHZA0AdgCHdb/nWXz4jEOZX73zbv9WjUdWNv9KtWDB\n" +
-            "tOr/XqCDDwAAAWuvQy52AAAEAwBHMEUCIQCFPALMZd6xk4NgYuTXoJGo/FRX0Wub\n" +
-            "VWSgTZQwld5fTQIgDDp8vajs+7R7XyKOv41xP26NQ3zR4EegwOGeb0paiIIAdQC7\n" +
-            "2d+8H4pxtZOUI5eqkntHOFeVCqtS6BqQlmQ2jh7RhQAAAWuvQy4MAAAEAwBGMEQC\n" +
-            "IGFiEQ8fMrjm1bV/mbT35bvJWf4mUbb92/NkHkQvHcaQAiBcS4CclZmzQLj4w6CV\n" +
-            "JsLf1P6+OhCDtvxWZdndGwJRczANBgkqhkiG9w0BAQsFAAOCAgEAFwE/RMAk871D\n" +
-            "acLlB0Jb29+WBmCgIu1pA+bh5/lMxn5KoPxkbHPFVHlfenDgZHUNU6DKH4HdCUG7\n" +
-            "GSAyajLiYRkcrDtBfp5MtNUAqnOJbh2NWiJ3FgSdAjfeSXPhhGfQ3U+0YCWarBfO\n" +
-            "xZ49eyhTzhHMoW+caJV3jC442Ebzh2X243MwcxqIkjgzWs6duiHnpHfT9gZBl3ou\n" +
-            "eu85LVFwzxNdrrAx1yG9PA05wCsYYlzwx7fC8ycfbvs+2ORIztiEScyr9VCg5sho\n" +
-            "YGuBFuP38sWRwiV5K7+EqpGjY+4R3BLWol7lzWsqWJC1J4zkd6Df5reSGBt0wlbx\n" +
-            "7MdUTXzHMtP8NDIYpdMBrPbkzOKIDzO6bDMsBWWFz7rWCmxUI6sSf0yknPtmBgCd\n" +
-            "rJAq25V/DqSRGrkaY4Dx1CPGtwYN34fCDLxKeN69rG5mkR2w7HRR5eMXek6oi3Pr\n" +
-            "hQrKt5NgrYjO6HJ6ABI5xoDM9doXy9BYbz5RX43RTU399aIqyXZh0d3W0rr7wggt\n" +
-            "+PFRU1OJqhpPQgKsB5zFT3G2HgVBD0hawHS+0Hu+CHpngiDziH+eyvTk3tdhIq2x\n" +
-            "oDZXs7SSZK6hf/im+7OFSkROy6CwhAn3nxRI9lpag1tTgF4kVSctBv+301ev0twX\n" +
-            "0w6RymKcvEbcuSDHkzOYWxc1cqwOxjA=\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator, boolean ocspEnabled) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Mon Jul 01 20:53:13 PDT 2019", System.out);
-    }
-}
-
-class SSLCA_ECC {
-
-    // Owner: CN=SSL.com SSL Intermediate CA ECC R2, O=SSL Corp, L=Houston, ST=Texas, C=US
-    // Issuer: CN=SSL.com Root Certification Authority ECC, O=SSL Corporation, L=Houston, ST=Texas, C=US
-    // Serial number: 75e6dfcbc1685ba8
-    // Valid from: Fri Feb 12 10:14:03 PST 2016 until: Tue Feb 12 10:14:03 PST 2041
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIDejCCAv+gAwIBAgIQHNcSEt4VENkSgtozEEoQLzAKBggqhkjOPQQDAzB8MQsw\n" +
-            "CQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xGDAW\n" +
-            "BgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNvbSBSb290IENl\n" +
-            "cnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzAeFw0xOTAzMDcxOTQyNDJaFw0zNDAz\n" +
-            "MDMxOTQyNDJaMG8xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UE\n" +
-            "BwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxKzApBgNVBAMMIlNTTC5jb20g\n" +
-            "U1NMIEludGVybWVkaWF0ZSBDQSBFQ0MgUjIwdjAQBgcqhkjOPQIBBgUrgQQAIgNi\n" +
-            "AASEOWn30uEYKDLFu4sCjFQ1VupFaeMtQjqVWyWSA7+KFljnsVaFQ2hgs4cQk1f/\n" +
-            "RQ2INSwdVCYU0i5qsbom20rigUhDh9dM/r6bEZ75eFE899kSCI14xqThYVLPdLEl\n" +
-            "+dyjggFRMIIBTTASBgNVHRMBAf8ECDAGAQH/AgEAMB8GA1UdIwQYMBaAFILRhXMw\n" +
-            "5zUE044CkvvlpNHEIejNMHgGCCsGAQUFBwEBBGwwajBGBggrBgEFBQcwAoY6aHR0\n" +
-            "cDovL3d3dy5zc2wuY29tL3JlcG9zaXRvcnkvU1NMY29tLVJvb3RDQS1FQ0MtMzg0\n" +
-            "LVIxLmNydDAgBggrBgEFBQcwAYYUaHR0cDovL29jc3BzLnNzbC5jb20wEQYDVR0g\n" +
-            "BAowCDAGBgRVHSAAMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATA7BgNV\n" +
-            "HR8ENDAyMDCgLqAshipodHRwOi8vY3Jscy5zc2wuY29tL3NzbC5jb20tZWNjLVJv\n" +
-            "b3RDQS5jcmwwHQYDVR0OBBYEFA10Zgpen+Is7NXCXSUEf3Uyuv99MA4GA1UdDwEB\n" +
-            "/wQEAwIBhjAKBggqhkjOPQQDAwNpADBmAjEAxYt6Ylk/N8Fch/3fgKYKwI5A011Q\n" +
-            "MKW0h3F9JW/NX/F7oYtWrxljheH8n2BrkDybAjEAlCxkLE0vQTYcFzrR24oogyw6\n" +
-            "VkgTm92+jiqJTO5SSA9QUa092S5cTKiHkH2cOM6m\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=test-dv-ecc.ssl.com
-    // Issuer: CN=SSL.com SSL Intermediate CA ECC R2, O=SSL Corp, L=Houston, ST=Texas, C=US
-    // Serial number: 1bfbd8e4bea894f3d1887c50e7d366d7
-    // Valid from: Fri Jun 28 06:58:27 PDT 2019 until: Sun Jun 27 06:58:27 PDT 2021
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIE9TCCBHqgAwIBAgIQG/vY5L6olPPRiHxQ59Nm1zAKBggqhkjOPQQDAzBvMQsw\n" +
-            "CQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xETAP\n" +
-            "BgNVBAoMCFNTTCBDb3JwMSswKQYDVQQDDCJTU0wuY29tIFNTTCBJbnRlcm1lZGlh\n" +
-            "dGUgQ0EgRUNDIFIyMB4XDTE5MDYyODEzNTgyN1oXDTIxMDYyNzEzNTgyN1owHjEc\n" +
-            "MBoGA1UEAwwTdGVzdC1kdi1lY2Muc3NsLmNvbTBZMBMGByqGSM49AgEGCCqGSM49\n" +
-            "AwEHA0IABJ5u0b8BID+8+TKxn+os0rdwvWB7mUJ4lcCthTADMhnr1VUWBbmBEelB\n" +
-            "666WbvbVXooPMUbhE5JvhXCTDyI7RRmjggNHMIIDQzAfBgNVHSMEGDAWgBQNdGYK\n" +
-            "Xp/iLOzVwl0lBH91Mrr/fTB7BggrBgEFBQcBAQRvMG0wSQYIKwYBBQUHMAKGPWh0\n" +
-            "dHA6Ly93d3cuc3NsLmNvbS9yZXBvc2l0b3J5L1NTTGNvbS1TdWJDQS1TU0wtRUND\n" +
-            "LTM4NC1SMi5jcnQwIAYIKwYBBQUHMAGGFGh0dHA6Ly9vY3Nwcy5zc2wuY29tMDcG\n" +
-            "A1UdEQQwMC6CE3Rlc3QtZHYtZWNjLnNzbC5jb22CF3d3dy50ZXN0LWR2LWVjYy5z\n" +
-            "c2wuY29tMFEGA1UdIARKMEgwCAYGZ4EMAQIBMDwGDCsGAQQBgqkwAQMBATAsMCoG\n" +
-            "CCsGAQUFBwIBFh5odHRwczovL3d3dy5zc2wuY29tL3JlcG9zaXRvcnkwHQYDVR0l\n" +
-            "BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6\n" +
-            "Ly9jcmxzLnNzbC5jb20vU1NMY29tLVN1YkNBLVNTTC1FQ0MtMzg0LVIyLmNybDAd\n" +
-            "BgNVHQ4EFgQUGCTbprTbVmmNOgJjUgiHonbu8b8wDgYDVR0PAQH/BAQDAgeAMIIB\n" +
-            "gQYKKwYBBAHWeQIEAgSCAXEEggFtAWsAdwCHdb/nWXz4jEOZX73zbv9WjUdWNv9K\n" +
-            "tWDBtOr/XqCDDwAAAWueaoEnAAAEAwBIMEYCIQCdy3N9w0pem1XShE/rkVSpHxQb\n" +
-            "8QdUu3E6R+oncxOGXgIhAJoWg2gJYc9DWDl5ImnrqsmVS6OPgSQRvDsjRIN9gH7a\n" +
-            "AHcAu9nfvB+KcbWTlCOXqpJ7RzhXlQqrUugakJZkNo4e0YUAAAFrnmqArQAABAMA\n" +
-            "SDBGAiEAs2yfi9e1h6dTQbe4WPd7+5qf7kvP7Vr2k0nAtBS1IgECIQCQYL9he9J4\n" +
-            "Bh5cpQezTVPgLAOGcf5xIcCrBs1QJe66/AB3AFWB1MIWkDYBSuoLm1c8U/DA5Dh4\n" +
-            "cCUIFy+jqh0HE9MMAAABa55qgaEAAAQDAEgwRgIhAI/27txsvzpbBXkMICi/UOzE\n" +
-            "t8uZidbF9KSwmGRPT/6gAiEAhm/VeWHDeWK8gFMU+f0/x4jK7UbzySGBvPzbPpNd\n" +
-            "EDwwCgYIKoZIzj0EAwMDaQAwZgIxAJKn8Hr68Z/2rA+VHfZo8eeIFaZ3nvSvQO92\n" +
-            "1Byl6cPAm8DsdCnYT16uNSL8Zb5IQAIxAOFLsqPDCSAYkpgutAnVgwI+c549SIRU\n" +
-            "k8ol+wUx6zgMmt8VHYagyj6IO0GRDjm/eA==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=revoked-ecc-dv.ssl.com
-    // Issuer: CN=SSL.com SSL Intermediate CA ECC R2, O=SSL Corp, L=Houston, ST=Texas, C=US
-    // Serial number: 423c2b57dfa379d0c45ffceb6284ed99
-    // Valid from: Fri Jun 28 07:09:30 PDT 2019 until: Sun Jun 27 07:09:30 PDT 2021
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIE+TCCBH+gAwIBAgIQQjwrV9+jedDEX/zrYoTtmTAKBggqhkjOPQQDAzBvMQsw\n" +
-            "CQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xETAP\n" +
-            "BgNVBAoMCFNTTCBDb3JwMSswKQYDVQQDDCJTU0wuY29tIFNTTCBJbnRlcm1lZGlh\n" +
-            "dGUgQ0EgRUNDIFIyMB4XDTE5MDYyODE0MDkzMFoXDTIxMDYyNzE0MDkzMFowITEf\n" +
-            "MB0GA1UEAwwWcmV2b2tlZC1lY2MtZHYuc3NsLmNvbTBZMBMGByqGSM49AgEGCCqG\n" +
-            "SM49AwEHA0IABH4nWtnAwPIdcQOSNI72IJJ/I1ZL2XQUAfa3ox5taFQQAalng6N9\n" +
-            "Od9t9de1vIMDzUvs5sMWw4YrqAlywFKMraajggNJMIIDRTAfBgNVHSMEGDAWgBQN\n" +
-            "dGYKXp/iLOzVwl0lBH91Mrr/fTB7BggrBgEFBQcBAQRvMG0wSQYIKwYBBQUHMAKG\n" +
-            "PWh0dHA6Ly93d3cuc3NsLmNvbS9yZXBvc2l0b3J5L1NTTGNvbS1TdWJDQS1TU0wt\n" +
-            "RUNDLTM4NC1SMi5jcnQwIAYIKwYBBQUHMAGGFGh0dHA6Ly9vY3Nwcy5zc2wuY29t\n" +
-            "MD0GA1UdEQQ2MDSCFnJldm9rZWQtZWNjLWR2LnNzbC5jb22CGnd3dy5yZXZva2Vk\n" +
-            "LWVjYy1kdi5zc2wuY29tMFEGA1UdIARKMEgwCAYGZ4EMAQIBMDwGDCsGAQQBgqkw\n" +
-            "AQMBATAsMCoGCCsGAQUFBwIBFh5odHRwczovL3d3dy5zc2wuY29tL3JlcG9zaXRv\n" +
-            "cnkwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMEQGA1UdHwQ9MDswOaA3\n" +
-            "oDWGM2h0dHA6Ly9jcmxzLnNzbC5jb20vU1NMY29tLVN1YkNBLVNTTC1FQ0MtMzg0\n" +
-            "LVIyLmNybDAdBgNVHQ4EFgQUY7q+xN9nV1nPQ/dJ5rUC8OKgaoMwDgYDVR0PAQH/\n" +
-            "BAQDAgeAMIIBfQYKKwYBBAHWeQIEAgSCAW0EggFpAWcAdQBElGUusO7Or8RAB9io\n" +
-            "/ijA2uaCvtjLMbU/0zOWtbaBqAAAAWuedJ/tAAAEAwBGMEQCIGPBF546Tn/lzB22\n" +
-            "ICpFLOWOIyIOPwL9S4ikS8Vt1aFTAiBe8mp/WCJnV7WxMIVWEUSLVOYn7erwyu6D\n" +
-            "hWNIST4W8wB2AG9Tdqwx8DEZ2JkApFEV/3cVHBHZAsEAKQaNsgiaN9kTAAABa550\n" +
-            "oQEAAAQDAEcwRQIhAJ3nwLI7kLP2SKicFKuJoqRYKE/FR2Ff65WL+iWxm/6nAiAJ\n" +
-            "cd9EKnBETwM9qQfKoSSs2oTQL4QjSKJZi/sPfKQaagB2ALvZ37wfinG1k5Qjl6qS\n" +
-            "e0c4V5UKq1LoGpCWZDaOHtGFAAABa550oH4AAAQDAEcwRQIhAIo6k5BMSFN3FnD4\n" +
-            "UFbyJJG/Bujh+OFTYzVM8vuIBoU0AiAhBe+air4wHvd68ykK6xOPv9Qshje9F6LC\n" +
-            "gxTqbMOEkDAKBggqhkjOPQQDAwNoADBlAjEAyayBtbcCQB0fE+cCc7OHLuNvb9tl\n" +
-            "uiHWy/Ika6IA72WJLLmED971ik08OMa2mGt4AjAklxdElQ5Z/nSeJ2CNEwD7pcYz\n" +
-            "468kkrMoGU2lk3QmwcXZscPIoh4Pwew6QteY4J0=\n" +
-            "-----END CERTIFICATE-----";
-
-    public void runTest(ValidatePathWithParams pathValidator, boolean ocspEnabled) throws Exception {
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Fri Jun 28 07:59:20 PDT 2019", System.out);
-    }
-}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/TWCAGlobalCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/TWCAGlobalCA.java
deleted file mode 100644
index 48c4d77a6ba..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/TWCAGlobalCA.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8305975
- * @summary Interoperability tests with TWCA Global Root CA from TAIWAN-CA
- * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath TWCAGlobalCA OCSP
- * @run main/othervm -Djava.security.debug=certpath TWCAGlobalCA CRL
- */
-
-/*
- * Obtain TLS test artifacts for TWCA Global Root CA from:
- *
- * Valid TLS Certificates:
- * https://evssldemo6.twca.com.tw
- *
- * Revoked TLS Certificates:
- * https://evssldemo7.twca.com.tw
- */
-public class TWCAGlobalCA {
-
-    // Owner: CN=TWCA Global EVSSL Certification Authority, OU=Global EVSSL Sub-CA, O=TAIWAN-CA, C=TW
-    // Issuer: CN=TWCA Global Root CA, OU=Root CA, O=TAIWAN-CA, C=TW
-    // Serial number: 40013304f70000000000000cc042cd6d
-    // Valid from: Thu Aug 23 02:53:30 PDT 2012 until: Fri Aug 23 08:59:59 PDT 2030
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIFdzCCA1+gAwIBAgIQQAEzBPcAAAAAAAAMwELNbTANBgkqhkiG9w0BAQsFADBR\n" +
-            "MQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRAwDgYDVQQLEwdSb290\n" +
-            "IENBMRwwGgYDVQQDExNUV0NBIEdsb2JhbCBSb290IENBMB4XDTEyMDgyMzA5NTMz\n" +
-            "MFoXDTMwMDgyMzE1NTk1OVowczELMAkGA1UEBhMCVFcxEjAQBgNVBAoTCVRBSVdB\n" +
-            "Ti1DQTEcMBoGA1UECxMTR2xvYmFsIEVWU1NMIFN1Yi1DQTEyMDAGA1UEAxMpVFdD\n" +
-            "QSBHbG9iYWwgRVZTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqG\n" +
-            "SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7MIaeq4wMnTjA5C2LsR6HJUj6rZbs8Nmq\n" +
-            "sSqFoqu6LwjrMbzkAg274EL6913MQ6eOy6VUDRzqAfgBEYcwFofe/w8nC7Q6Nrzz\n" +
-            "xTkl9lovXLJIm0CI44Qk2IhiCkoYaPlIoqexqnm3Fc2QRdRNeLk2pU/s86DpGrwT\n" +
-            "BqRRRkziBlhcgo7K5Z9ihf+c82DT31iIUIi2nr0ES1eaRR7zpKrzJPZ8foNxRPwT\n" +
-            "2D0tJWQJ4hNzbFGSKsSzshdwQ/p4JP9AEjK2eeXXbEePt0/JarwBjO2Lwign38/g\n" +
-            "0ZiP3uE47bItxZhgXlnR5L/0bhJitE6U1xgVFbbrQnG2B2kZxVKxAgMBAAGjggEn\n" +
-            "MIIBIzAfBgNVHSMEGDAWgBRI283ejulJclqI6LHYPQezuWtmUDAdBgNVHQ4EFgQU\n" +
-            "br2hK87kwtUodFy92YxvBHIqBt4wDgYDVR0PAQH/BAQDAgEGMDgGA1UdIAQxMC8w\n" +
-            "LQYEVR0gADAlMCMGCCsGAQUFBwIBFhdodHRwOi8vd3d3LnR3Y2EuY29tLnR3LzBJ\n" +
-            "BgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vUm9vdENBLnR3Y2EuY29tLnR3L1RXQ0FS\n" +
-            "Q0EvZ2xvYmFsX3Jldm9rZV80MDk2LmNybDASBgNVHRMBAf8ECDAGAQH/AgEAMDgG\n" +
-            "CCsGAQUFBwEBBCwwKjAoBggrBgEFBQcwAYYcaHR0cDovL1Jvb3RPY3NwLnR3Y2Eu\n" +
-            "Y29tLnR3LzANBgkqhkiG9w0BAQsFAAOCAgEAaOmLaZ2+WN2EtB6feuSV5KnL88ck\n" +
-            "I9jsUTB4YtKsv0ViORkeBMCQur5OoAgRE9VYdRVlWHN0zJAX232fdoZmnajl8gtj\n" +
-            "u0AOOyDDJ7Vlh38rDMRlX/u+MS2DFcsq5Vd3EMwJsWWFR9D3Dcey+Tu9uEmEdqeB\n" +
-            "+Erd4YjCeV9PyOW3SzPQ47RdW6XYmHArPh65/LcmSxTn/lxQy/NEBGGWqhm6s6n1\n" +
-            "49mPq4MtQcMLo/NBI+8jv7BVjnThbbEh2edHHxMNiAd5kLZFDCyJuFkoezjWL4AH\n" +
-            "ratXdoHtqvqtPoy97LyGrLrJeh+0hkO9u8QOt2gF7BEhNfid7o5dnsPRk+8l77Hn\n" +
-            "T1dvBs++M0r0QG4AWMSMj9uUn6rhl4FGTvAsyB1fA8p/xCLoIEetIpKRP3BD+ve2\n" +
-            "eYjWPorR/0W77iMTeoQEeuxDIxi2J/U9QLKKvzzqBy1TYrqqPe5YxqHLNAcfHZvo\n" +
-            "BTPPbtP0WAiXrJiELTYcqFXETvQcGw0XjoUZNvJE8RD7vssSNT17RKU8iBRX7CbL\n" +
-            "AB3T8gYykPMJTUqQSmdgEdVRBcqRMMdU+XRAEoU/Mz5oHAkm3ZNTDNwsEp2Dg1/b\n" +
-            "qzfPMhg4/3/YyWzGrzNeCSWZkjYImAzLCvN0D5rbdVHEmFIrEJt+igocGozroq5x\n" +
-            "DT5KhixlrqexzWE=\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: OID.2.5.4.17=100, STREET="10F.,NO.85,Yanping S. Rd.,Taipei City 100,Taiwan (R.O.C)",
-    // SERIALNUMBER=70759028, OID.1.3.6.1.4.1.311.60.2.1.3=TW, OID.1.3.6.1.4.1.311.60.2.1.2=Taiwan,
-    // OID.1.3.6.1.4.1.311.60.2.1.1=Taipei, OID.2.5.4.15=Private Organization,
-    // CN=evssldemo6.twca.com.tw, O=TAIWAN-CA INC., L=Taipei, ST=Taiwan, C=TW
-    // Issuer: CN=TWCA Global EVSSL Certification Authority, OU=Global EVSSL Sub-CA,
-    // O=TAIWAN-CA, C=TW
-    // Serial number: 47e70000001258ff71d89af7f0353fef
-    // Valid from: Thu Mar 02 00:49:56 PST 2023 until: Sun Mar 31 08:59:59 PDT 2024
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIH7zCCBtegAwIBAgIQR+cAAAASWP9x2Jr38DU/7zANBgkqhkiG9w0BAQsFADBz\n" +
-            "MQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRwwGgYDVQQLExNHbG9i\n" +
-            "YWwgRVZTU0wgU3ViLUNBMTIwMAYDVQQDEylUV0NBIEdsb2JhbCBFVlNTTCBDZXJ0\n" +
-            "aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0yMzAzMDIwODQ5NTZaFw0yNDAzMzExNTU5\n" +
-            "NTlaMIIBMzELMAkGA1UEBhMCVFcxDzANBgNVBAgTBlRhaXdhbjEPMA0GA1UEBxMG\n" +
-            "VGFpcGVpMRcwFQYDVQQKEw5UQUlXQU4tQ0EgSU5DLjEfMB0GA1UEAxMWZXZzc2xk\n" +
-            "ZW1vNi50d2NhLmNvbS50dzEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x\n" +
-            "FzAVBgsrBgEEAYI3PAIBARMGVGFpcGVpMRcwFQYLKwYBBAGCNzwCAQITBlRhaXdh\n" +
-            "bjETMBEGCysGAQQBgjc8AgEDEwJUVzERMA8GA1UEBRMINzA3NTkwMjgxQTA/BgNV\n" +
-            "BAkTODEwRi4sTk8uODUsWWFucGluZyBTLiBSZC4sVGFpcGVpIENpdHkgMTAwLFRh\n" +
-            "aXdhbiAoUi5PLkMpMQwwCgYDVQQREwMxMDAwggEiMA0GCSqGSIb3DQEBAQUAA4IB\n" +
-            "DwAwggEKAoIBAQDEgj/jtcAtGPkiBilLajzHIqfiAxpwwnKhdHwyOnqfcqur1p2R\n" +
-            "Cxl0Q8jYGmY8ZUq7716XnIGN3bn3Wu10BvmHi07h8f54/G/K7xBKjkasAh44zW1P\n" +
-            "hgdaxH0huRvoQOoSRCitew8YpMN4B++uOQ8yu2pWDGDdQHW4VaWt/e+QtZbQtp/b\n" +
-            "7vUWgcuhxDStj97B8Dcb5PY+sbLy6dfDiXnTaSpuWhjKmEcpknagGyn4uCFBSppZ\n" +
-            "/PYcTsg+Nk8Ae/SDMpc7XWBCjmxMG2GI0IVW4un9UOuElYgWVjMWnBAiGMDkVMEQ\n" +
-            "jLRxEYOh+NJ3izMyD/ufLrA/YwJMI1LgFcOJAgMBAAGjggO7MIIDtzAfBgNVHSME\n" +
-            "GDAWgBRuvaErzuTC1Sh0XL3ZjG8EcioG3jAdBgNVHQ4EFgQUg4msPcTFvDjwluRf\n" +
-            "inEn9qMC7OYwUwYDVR0fBEwwSjBIoEagRIZCaHR0cDovL3NzbHNlcnZlci50d2Nh\n" +
-            "LmNvbS50dy9zc2xzZXJ2ZXIvR2xvYmFsRVZTU0xfUmV2b2tlXzIwMTIuY3JsMCEG\n" +
-            "A1UdEQQaMBiCFmV2c3NsZGVtbzYudHdjYS5jb20udHcwfwYIKwYBBQUHAQEEczBx\n" +
-            "MEQGCCsGAQUFBzAChjhodHRwOi8vc3Nsc2VydmVyLnR3Y2EuY29tLnR3L2NhY2Vy\n" +
-            "dC9HbG9iYWxFdnNzbF8yMDEyLnA3YjApBggrBgEFBQcwAYYdaHR0cDovL2V2c3Ns\n" +
-            "b2NzcC50d2NhLmNvbS50dy8wSAYDVR0gBEEwPzA0BgwrBgEEAYK/JQEBFgMwJDAi\n" +
-            "BggrBgEFBQcCARYWaHR0cDovL3d3dy50d2NhLmNvbS50dzAHBgVngQwBATAJBgNV\n" +
-            "HRMEAjAAMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB\n" +
-            "BQUHAwIwggH2BgorBgEEAdZ5AgQCBIIB5gSCAeIB4AB2AEiw42vapkc0D+VqAvqd\n" +
-            "MOscUgHLVt0sgdm7v6s52IRzAAABhqGDiCYAAAQDAEcwRQIgd7uqvHdSTSXqNPWs\n" +
-            "OQeCeT2vuKY3vj8jRcoJ9IIohqgCIQCtQfZ0lfZ1Y1GmwCTDc5NM++5mgp+ZpNWu\n" +
-            "F9OKsWoCPQB2AFWB1MIWkDYBSuoLm1c8U/DA5Dh4cCUIFy+jqh0HE9MMAAABhqGD\n" +
-            "iJYAAAQDAEcwRQIgIHKa+XeYyDURUq9AVYEntGS5oJitKyWZjSOlpD+udZgCIQC/\n" +
-            "oVPtjJpcXP4OScYFsNWMPKUtZOO5mY5y7V65S84DrQB2ADtTd3U+LbmAToswWwb+\n" +
-            "QDtn2E/D9Me9AA0tcm/h+tQXAAABhqGDh8YAAAQDAEcwRQIgYT7aPr9YCtF5TCTp\n" +
-            "NICK9c5eiL6Ku/y9wM6ARgG2k1UCIQDomqlwGur+AMI4YIc1SNqyNVCyxgP1DxXP\n" +
-            "FYkX6BX17gB2AO7N0GTV2xrOxVy3nbTNE6Iyh0Z8vOzew1FIWUZxH7WbAAABhqGD\n" +
-            "iKkAAAQDAEcwRQIhAKTMliyTn48vvP9hN8jucD6rGZwRCqQI6suE6ADpN7bNAiB3\n" +
-            "zFZFdH8eJRn3RXjD/mzbmF201sNLitp9SOYAazubljANBgkqhkiG9w0BAQsFAAOC\n" +
-            "AQEAOOtzqtRFvxlJro61O0dEkDottToFh88vib3N3AofS5uW0nDpoS0L27XR8IDd\n" +
-            "2NfN+2XKAQXdz2BqHnjW1nAMXUx4TAMi4jG8XpOkvpSDXbjghD5EB10FyAzCuGmv\n" +
-            "mKxkVOU1DzL0kSLLQjLaJ57WUYsoE97f5O6rY9jlJpid32o1WgM1oZsBjPhO8Kiy\n" +
-            "KJ5zZHppolGPtuFYMUcatiqv//pH/5piwtlYSkbwMj5nYidSrSBciBzO53HFk1pE\n" +
-            "TABXFcoK3gmhWM04lysmJMwAzRUbNQVizpGDICbRjCOVnwCbutnSnka8pDHkq4Zy\n" +
-            "BrUeZe2xJe8jWvukwqvNzIIvwg==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: OID.2.5.4.17=100, STREET="10F.,NO.85,Yanping S. Rd.,Taipei City 100,Taiwan (R.O.C)",
-    // SERIALNUMBER=70759028, OID.1.3.6.1.4.1.311.60.2.1.3=TW, OID.1.3.6.1.4.1.311.60.2.1.2=Taiwan,
-    // OID.1.3.6.1.4.1.311.60.2.1.1=Taipei, OID.2.5.4.15=Private Organization,
-    // CN=evssldemo7.twca.com.tw, O=TAIWAN-CA INC., L=Taipei, ST=Taiwan, C=TW
-    // Issuer: CN=TWCA Global EVSSL Certification Authority, OU=Global EVSSL Sub-CA,
-    // O=TAIWAN-CA, C=TW
-    // Serial number: 47e70000001258f036a5b513091ccb2e
-    // Valid from: Tue Feb 07 02:03:08 PST 2023 until: Thu Mar 07 07:59:59 PST 2024
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHdjCCBl6gAwIBAgIQR+cAAAASWPA2pbUTCRzLLjANBgkqhkiG9w0BAQsFADBz\n" +
-            "MQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRwwGgYDVQQLExNHbG9i\n" +
-            "YWwgRVZTU0wgU3ViLUNBMTIwMAYDVQQDEylUV0NBIEdsb2JhbCBFVlNTTCBDZXJ0\n" +
-            "aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0yMzAyMDcxMDAzMDhaFw0yNDAzMDcxNTU5\n" +
-            "NTlaMIIBMzELMAkGA1UEBhMCVFcxDzANBgNVBAgTBlRhaXdhbjEPMA0GA1UEBxMG\n" +
-            "VGFpcGVpMRcwFQYDVQQKEw5UQUlXQU4tQ0EgSU5DLjEfMB0GA1UEAxMWZXZzc2xk\n" +
-            "ZW1vNy50d2NhLmNvbS50dzEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x\n" +
-            "FzAVBgsrBgEEAYI3PAIBARMGVGFpcGVpMRcwFQYLKwYBBAGCNzwCAQITBlRhaXdh\n" +
-            "bjETMBEGCysGAQQBgjc8AgEDEwJUVzERMA8GA1UEBRMINzA3NTkwMjgxQTA/BgNV\n" +
-            "BAkTODEwRi4sTk8uODUsWWFucGluZyBTLiBSZC4sVGFpcGVpIENpdHkgMTAwLFRh\n" +
-            "aXdhbiAoUi5PLkMpMQwwCgYDVQQREwMxMDAwggEiMA0GCSqGSIb3DQEBAQUAA4IB\n" +
-            "DwAwggEKAoIBAQDSX3co7XUdwxv8OEj7Mipq0Ot+1w+VYTFlPvdnryrv9st7ERLb\n" +
-            "+xJPJo7swgqbHeHKWlwYu4lkzJq6s3nAOkuYIP/O3uVmGDiilLSAVkukz9MooyjB\n" +
-            "466eArXY1VT9vpXVNmSLunAp5RU8H+2WWOUMmtJx/oYojqEbtWqnltlErvEjb2TM\n" +
-            "vR16d/vXI6QtMc+IV3nZ0SVdetH2E7ZvpP5mZqVSHNnOnVjqdd69hAJ4SJgG9lCM\n" +
-            "87ysm6UaJxQbEGxc6YkwrUNVet1tx2hBWltTyRw3oOBCBUwrPUTx7/pFh7yhci6p\n" +
-            "AhHp1j0OzAmZHOFTM+qO1L1vlmguO8zW0zWtAgMBAAGjggNCMIIDPjAfBgNVHSME\n" +
-            "GDAWgBRuvaErzuTC1Sh0XL3ZjG8EcioG3jAdBgNVHQ4EFgQUvvbgZHRNPdmGlxQS\n" +
-            "fcTzM2A14EkwUwYDVR0fBEwwSjBIoEagRIZCaHR0cDovL3NzbHNlcnZlci50d2Nh\n" +
-            "LmNvbS50dy9zc2xzZXJ2ZXIvR2xvYmFsRVZTU0xfUmV2b2tlXzIwMTIuY3JsMCEG\n" +
-            "A1UdEQQaMBiCFmV2c3NsZGVtbzcudHdjYS5jb20udHcwfwYIKwYBBQUHAQEEczBx\n" +
-            "MEQGCCsGAQUFBzAChjhodHRwOi8vc3Nsc2VydmVyLnR3Y2EuY29tLnR3L2NhY2Vy\n" +
-            "dC9HbG9iYWxFdnNzbF8yMDEyLnA3YjApBggrBgEFBQcwAYYdaHR0cDovL2V2c3Ns\n" +
-            "b2NzcC50d2NhLmNvbS50dy8wSAYDVR0gBEEwPzA0BgwrBgEEAYK/JQEBFgMwJDAi\n" +
-            "BggrBgEFBQcCARYWaHR0cDovL3d3dy50d2NhLmNvbS50dzAHBgVngQwBATAJBgNV\n" +
-            "HRMEAjAAMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB\n" +
-            "BQUHAwIwggF9BgorBgEEAdZ5AgQCBIIBbQSCAWkBZwB2AFWB1MIWkDYBSuoLm1c8\n" +
-            "U/DA5Dh4cCUIFy+jqh0HE9MMAAABhitUR1YAAAQDAEcwRQIhANv7DhQm67R1Ilmg\n" +
-            "k5StrFQ1dqyELzZTAT3on84g0G/vAiAttP+EWWmztK2luQ7SxvQsmExDh/qGiZHq\n" +
-            "NAd2a8dUIgB1AO7N0GTV2xrOxVy3nbTNE6Iyh0Z8vOzew1FIWUZxH7WbAAABhitU\n" +
-            "RycAAAQDAEYwRAIgcU5n4DJaGWvTr3wZug59ItynMgCZ5z0ZVrZr2KwV70wCIHEv\n" +
-            "DAwNBLGsdj5IX/4E5hnzJvS7WroSLnRB6OW931JbAHYAdv+IPwq2+5VRwmHM9Ye6\n" +
-            "NLSkzbsp3GhCCp/mZ0xaOnQAAAGGK1RKDwAABAMARzBFAiBvlIvOnE8PhYJQueMh\n" +
-            "AOCwgREvnAsk3Edt59lcuqPrrQIhAOSRb3UmBYkHQ6k5pUJva0Mgk0GmnLR0de0s\n" +
-            "VxW3TTASMA0GCSqGSIb3DQEBCwUAA4IBAQAQB7oaouXBI6VpLzL+kzOZXSTbSClv\n" +
-            "LS33DTEBI3A8LTXHbFq6c4/ZdqieUzy42Kd0i9e3hI1hwQYPgEwxpROOcldX72r0\n" +
-            "EUTh0L+XrxN3YEgod6aCsjIiJlWYy6J2ZXVURnk/iWYAwYLa0JmmBGuWFjEnq4lO\n" +
-            "xL1C3M2mYAEC+Beb7Xyq1rcu97p4P8igJYM+VfwXNwYYRCXUr9f4ESD7t5vXlYoE\n" +
-            "c4m5KiBQD9XtZS77QRon9JCQklxTvMkxuLwWvSdzicEUzWeFp+kN/fcXL2SVsb17\n" +
-            "xDPMMsMMh7L/f+uMWDYZ+wH17LYQxOLi7VXT3fv8nl2X2iD3d4CCh0Tu\n" +
-            "-----END CERTIFICATE-----";
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-        }
-
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Thu Mar 23 17:30:19 PDT 2023", System.out);
-    }
-}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/TeliaSoneraCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/TeliaSoneraCA.java
deleted file mode 100644
index 3dc0c94abc2..00000000000
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/TeliaSoneraCA.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8210432
- * @summary Interoperability tests with TeliaSonera Root CA v1
- * @build ValidatePathWithParams
- * @run main/othervm -Djava.security.debug=certpath TeliaSoneraCA OCSP
- * @run main/othervm -Djava.security.debug=certpath TeliaSoneraCA CRL
- */
-
-/*
- * Obtain TLS test artifacts for TeliaSonera Root CA v1 from:
- *
- * Valid TLS Certificates:
- * https://juolukka.cover.sonera.net:10443/
- *
- * Revoked TLS Certificates:
- * https://juolukka.cover.sonera.net:10444/
- */
-public class TeliaSoneraCA {
-
-    // Owner: CN=TeliaSonera Server CA v2, O=TeliaSonera, C=FI
-    // Issuer: CN=TeliaSonera Root CA v1, O=TeliaSonera
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n"
-            + "MIIHHjCCBQagAwIBAgIQTEYq9tv794BPhMF8/qlytjANBgkqhkiG9w0BAQsFADA3\n"
-            + "MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwWVGVsaWFTb25lcmEgUm9v\n"
-            + "dCBDQSB2MTAeFw0xNDEwMTYwODA5NTdaFw0zMjEwMTYwNTA0MDBaMEYxCzAJBgNV\n"
-            + "BAYTAkZJMRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEhMB8GA1UEAwwYVGVsaWFTb25l\n"
-            + "cmEgU2VydmVyIENBIHYyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA\n"
-            + "rwQN5rfRLbVAiYWLJF9SI4YLm8oqrtf8OjGybgoLyiMIo8nhY/atuGRFWCQNOnUK\n"
-            + "caZn29C360PlC5yYrsrSHuouROisqHSJcgA7HvV+37Rcry7daeDj6rfyx4yI5dmj\n"
-            + "LwHkK0j1NzhX1JxFDgPeLNuebgzv/j8OfRhYK/BttpystC4Zgm3gZheKDjYsDS5D\n"
-            + "gjffuOysP3vewrcuw0EIZFx+HawuwNBLq4tMf4VSitYDHJSLIM2TeXZGGY5slTbT\n"
-            + "yLnrU5mIzG9WKqxyy7qHuFw1JtlAXkCLmUEVaF9M+dRPiGIjlDrpBgbDD9mT2CSk\n"
-            + "V/XG1696/voY5xB8KNIC1cOSmSO7kdJyR5tWiDIJiwMXrTwG+kZiqlbcKDsZeJ9p\n"
-            + "5bZxXO0pEpde3wgEYRvFr5Cx4vcz4h5pom9coJOCW9tqXU43KcueTrt4Ks9f92q1\n"
-            + "ehjyEnCh0BCdrjUOXsUtFosm9qxJnDwVlThYhS9EHuCTNBgj1Yxj6A+8fwwJP9DN\n"
-            + "CbWQx5afT+h+9FNDNRC/nEcesP1Yh9s15Se270pQW0CejUNziYG7Dft7T+PVH/fU\n"
-            + "zaWU8g0tJjtuQgiCWVqw4WkUmYY2S0R89zAotcpz2mvNO8ma2iJbubHi3c0ULfHH\n"
-            + "nkWKsdpzZmK4N0Wi6/V5yWdmL5RFkFecL8r7+9OtCB0CAwEAAaOCAhUwggIRMIGK\n"
-            + "BggrBgEFBQcBAQR+MHwwLQYIKwYBBQUHMAGGIWh0dHA6Ly9vY3NwLnRydXN0LnRl\n"
-            + "bGlhc29uZXJhLmNvbTBLBggrBgEFBQcwAoY/aHR0cDovL3JlcG9zaXRvcnkudHJ1\n"
-            + "c3QudGVsaWFzb25lcmEuY29tL3RlbGlhc29uZXJhcm9vdGNhdjEuY2VyMBIGA1Ud\n"
-            + "EwEB/wQIMAYBAf8CAQAwVQYDVR0gBE4wTDBKBgwrBgEEAYIPAgMBAQIwOjA4Bggr\n"
-            + "BgEFBQcCARYsaHR0cHM6Ly9yZXBvc2l0b3J5LnRydXN0LnRlbGlhc29uZXJhLmNv\n"
-            + "bS9DUFMwDgYDVR0PAQH/BAQDAgEGMIHGBgNVHR8Egb4wgbswQKA+oDyGOmh0dHA6\n"
-            + "Ly9jcmwtMy50cnVzdC50ZWxpYXNvbmVyYS5jb20vdGVsaWFzb25lcmFyb290Y2F2\n"
-            + "MS5jcmwwd6B1oHOGcWxkYXA6Ly9jcmwtMS50cnVzdC50ZWxpYXNvbmVyYS5jb20v\n"
-            + "Y249VGVsaWFTb25lcmElMjBSb290JTIwQ0ElMjB2MSxvPVRlbGlhU29uZXJhP2Nl\n"
-            + "cnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q7YmluYXJ5MB0GA1UdDgQWBBQvSTwpT9cH\n"
-            + "JfnGjNVk9WY9EoMilTAfBgNVHSMEGDAWgBTwj1k4ALP1j5qWDNXr+nuqF+gTEjAN\n"
-            + "BgkqhkiG9w0BAQsFAAOCAgEAg9EVFW6ioZ2ctrX8KqvW9XPYZR01yNgqlO7pwBWf\n"
-            + "HzuBCbUdyVzumfQnU24Sce92oMtEfyuxIOmhvoXU7LpnYlH3Q29UGP5dL0D3edGz\n"
-            + "HeU6Tf8bkcOEHtnTrkd+y+rfFSDWYl9r1y993NAcrBHhroQCE53mlrO7TjXa3zDq\n"
-            + "6LGR8T8VgvGw0IBz6mzAks0wMYB0b4uREPmWXi+m+RqG3lnpl+eBzz6YVLkxIYMq\n"
-            + "QIXJIBsu4/ybmadsfdql6E8Lo3dKVD4UG10mtd+iPbJiBiW/a9VbEe3NVKIv4H2y\n"
-            + "HqYcxDXAeUI66E3K2cjCmKoQaa0Ywt02ikZFd0v1OWNPS7YWbEJWkVR1PcPMESK9\n"
-            + "6HKI4xhG2tJesmXjQ8q8aSx2u79Zts3ewjKqTmurf6FXW3u9TpSCUe6Drr/3X7Ve\n"
-            + "nBy4M0sLwCecD/L9gjTa+EItQTYzCkpxiMO49tQdX/BpwgWju4Kg3qkaBNTzvSlk\n"
-            + "gdnRJqCUkVuzwK4yBqUoyRz3prlhvvRGdZJKf6IXRDhncpey5pm0PQYQ4cArx7Go\n"
-            + "AaAKz0ZTHOKjnM2KIdUhBJQybL7oPklSfkeMWoUoYED6R4YMTt/JXX4ixEb5DgDJ\n"
-            + "0F+bNcF7qGrJTkTx0Ccy4BuuY05hJckd72E7WdmjN7DDeosghgWZNV/6D7N5tfxo\n"
-            + "nlU=\n"
-            + "-----END CERTIFICATE-----";
-
-    // Owner: CN=juolukka.cover.sonera.net, OU=security, O=Telia Finland Oyj, L=helsinki, C=FI
-    // Issuer: CN=TeliaSonera Server CA v2, O=TeliaSonera, C=FI
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIHiDCCBXCgAwIBAgIPAWOq14hk136UDQY3WSjLMA0GCSqGSIb3DQEBCwUAMEYx\n" +
-            "CzAJBgNVBAYTAkZJMRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEhMB8GA1UEAwwYVGVs\n" +
-            "aWFTb25lcmEgU2VydmVyIENBIHYyMB4XDTE4MDUyOTA3NDA0MVoXDTE5MDUyOTA3\n" +
-            "NDA0MVowczELMAkGA1UEBhMCRkkxETAPBgNVBAcMCGhlbHNpbmtpMRowGAYDVQQK\n" +
-            "DBFUZWxpYSBGaW5sYW5kIE95ajERMA8GA1UECwwIc2VjdXJpdHkxIjAgBgNVBAMM\n" +
-            "GWp1b2x1a2thLmNvdmVyLnNvbmVyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IB\n" +
-            "DwAwggEKAoIBAQDLks9F8ZUqV9G4jn3fY234OX09Dmqqtuk0qAmjWpF0JAn2o64t\n" +
-            "whVxFLx9e2IwUPTQgyo6FwRsiT19m99BhgxYnJOxVRwURxSL3mqlV9gX4oFMmT4O\n" +
-            "EOYEjaJXi8ne1pJX80y2hVQ48XqgODnKdKZVwa5YoeWZQJiaq+C5JkMDN8qzpiyQ\n" +
-            "X3EfJspLkKy2E+UVxWmfnyf0v70ES9TQ8qgxwvsf7LRZ8Jixq7TTO5VbqWsdBvJC\n" +
-            "9Zm2aBOYJ7ptSZQ5YDfeUJG2c9S/zFmngoPnTrvAZwUeU3YTrbdZQy899ZOatWac\n" +
-            "6lHUYU2EagEmbj/jtIvJ6wMbzhleIXRQFWibAgMBAAGjggNEMIIDQDAfBgNVHSME\n" +
-            "GDAWgBQvSTwpT9cHJfnGjNVk9WY9EoMilTAdBgNVHQ4EFgQUbMozh4osL4gFJvb5\n" +
-            "baELpQSKEhIwDgYDVR0PAQH/BAQDAgSwME4GA1UdIARHMEUwQwYGZ4EMAQICMDkw\n" +
-            "NwYIKwYBBQUHAgEWK2h0dHA6Ly9yZXBvc2l0b3J5LnRydXN0LnRlbGlhc29uZXJh\n" +
-            "LmNvbS9DUFMwJAYDVR0RBB0wG4IZanVvbHVra2EuY292ZXIuc29uZXJhLm5ldDBN\n" +
-            "BgNVHR8ERjBEMEKgQKA+hjxodHRwOi8vY3JsLTMudHJ1c3QudGVsaWFzb25lcmEu\n" +
-            "Y29tL3RlbGlhc29uZXJhc2VydmVyY2F2Mi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUH\n" +
-            "AwIGCCsGAQUFBwMBMIGGBggrBgEFBQcBAQR6MHgwJwYIKwYBBQUHMAGGG2h0dHA6\n" +
-            "Ly9vY3NwLnRydXN0LnRlbGlhLmNvbTBNBggrBgEFBQcwAoZBaHR0cDovL3JlcG9z\n" +
-            "aXRvcnkudHJ1c3QudGVsaWFzb25lcmEuY29tL3RlbGlhc29uZXJhc2VydmVyY2F2\n" +
-            "Mi5jZXIwggF/BgorBgEEAdZ5AgQCBIIBbwSCAWsBaQB2AG9Tdqwx8DEZ2JkApFEV\n" +
-            "/3cVHBHZAsEAKQaNsgiaN9kTAAABY6rXpS0AAAQDAEcwRQIgfMLEFYxQcncL3am/\n" +
-            "W2x7DMZ1+Vh1tDLw/0qIQB40VBQCIQC1eyF8Q6CcQs+gIgzpy7OiZSosSlykyOgW\n" +
-            "qHkj/0UPygB3AO5Lvbd1zmC64UJpH6vhnmajD35fsHLYgwDEe4l6qP3LAAABY6rX\n" +
-            "pLEAAAQDAEgwRgIhAJxveFVsFrfttSJIxHsMPAvvevptaV2CxsGwubAi8wDDAiEA\n" +
-            "jNbbYfUiYtmQ5v4yc6T+GcixztNIlMzQ7OTK+u9zqSoAdgBVgdTCFpA2AUrqC5tX\n" +
-            "PFPwwOQ4eHAlCBcvo6odBxPTDAAAAWOq16YXAAAEAwBHMEUCIQCCkCL2zn/AoMVI\n" +
-            "BdsoJelUBLsAnQ+GlIafiyZYcCwhBAIgdsFM05eNmL5hfn3+WtfgmipwcK1qp7kO\n" +
-            "ONzO69aqrnEwDQYJKoZIhvcNAQELBQADggIBAIl5UWSwCXF85+2lU6t89K7I4TvZ\n" +
-            "Ggof0NLngea9qxBq00opfnl9i2LPRnsjh9s3iA29i2daTEuJn3qt3Ygcm27Jd7WM\n" +
-            "5StcxQ483GAaL5s5m2QqkZB8eLfez3tIyCMGCAyixBDNRNPVI4xZr6sSOenWtipo\n" +
-            "gMt+/gvRIMdMT79IXPFz4W9RWCwnfJNOlfH2OkS3KZYaPSaEvs6sfMW1DDZosrBy\n" +
-            "6F+DITPLllOVSE4+PTxvXLKVy+srFwF1VocQXKkWMHQ7AfWNnOGzb7B1qg7gsw0n\n" +
-            "axqinyCjkhMpHpcVtmD9Pi15HLFDIy9yI2S+FHJQfhUSmM/LdCWzQpnee6/Wo+uw\n" +
-            "p0Jg2v6v9GGaqfpuiVJPFN9dOv3OjMU7DL5lgMRWFRo2T8+wBHXDyBhT0W0y5kRJ\n" +
-            "eWA7t6CnkziHuaOihZAHUH3nn5exjqUFVS0ThbF6hxN7HAlq/xIbTKlZjkLlc14W\n" +
-            "fB8vkxJyy/tgBZ4dCj9Y1Y32d4eFT5JZJgqgkN59SmX56BswNXncGrk/vWZFFx+g\n" +
-            "9dgb8QSe8KseD1iSLc7SsqVDv8NPYdaI3eZ90W8Wv0/CDls321O6UbAmURzQwFGB\n" +
-            "w8WnteoVBi6Wf6M1TxIfJsXBYeIN0BB6AYc8cmZIOtx2C8aH4JJT45MyFnBv3ac5\n" +
-            "Ahs9pGn/+K+5yb2e\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=juolukka.cover.sonera.net, OU=Security, O=TeliaSonera Finland, L=Helsinki, C=FI
-    // Issuer: CN=TeliaSonera Server CA v2, O=TeliaSonera, C=FI
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGEDCCA/igAwIBAgIRAKWJTjs6v04ZTyb2wJxfnJswDQYJKoZIhvcNAQELBQAw\n" +
-            "RjELMAkGA1UEBhMCRkkxFDASBgNVBAoMC1RlbGlhU29uZXJhMSEwHwYDVQQDDBhU\n" +
-            "ZWxpYVNvbmVyYSBTZXJ2ZXIgQ0EgdjIwHhcNMTYxMjIzMDcwMTQ2WhcNMTkxMjIz\n" +
-            "MDcwMTQ2WjB1MQswCQYDVQQGEwJGSTERMA8GA1UEBwwISGVsc2lua2kxHDAaBgNV\n" +
-            "BAoME1RlbGlhU29uZXJhIEZpbmxhbmQxETAPBgNVBAsMCFNlY3VyaXR5MSIwIAYD\n" +
-            "VQQDDBlqdW9sdWtrYS5jb3Zlci5zb25lcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF\n" +
-            "AAOCAQ8AMIIBCgKCAQEAt2u92TgTFdm1OEfmWFPe+ESBi+2ox4y1EDoin8RydMyO\n" +
-            "DI6+0HHnKfDZa1YViI5b6MLJKWIAyUszAg5hc0S3upElfSsBvUW6zuQTxMi2vTYE\n" +
-            "4tcqwIEyCUaiv4wC+DuO5CyGR32yR6HB/W5Ny200dPs2SO03ESEJ+LH4Tw5AI8JJ\n" +
-            "UZHW+lA+yUHnlc3q47svpbspjt0C/THyukd1hbXTBB0mPXqPux+ClvtZBWUJb7ti\n" +
-            "1cPfcCNd79KRObzcgxqcOIaUFz4LjjKezhzVSL7tJOANOHZ09qDeOAkk/X9POx4h\n" +
-            "a5XyWfH1zaQ0QlZ2mKBeHebCIJkgTZZVipagRVOgcwIDAQABo4IByDCCAcQwgY0G\n" +
-            "CCsGAQUFBwEBBIGAMH4wLQYIKwYBBQUHMAGGIWh0dHA6Ly9vY3NwLnRydXN0LnRl\n" +
-            "bGlhc29uZXJhLmNvbTBNBggrBgEFBQcwAoZBaHR0cDovL3JlcG9zaXRvcnkudHJ1\n" +
-            "c3QudGVsaWFzb25lcmEuY29tL3RlbGlhc29uZXJhc2VydmVyY2F2Mi5jZXIwHwYD\n" +
-            "VR0jBBgwFoAUL0k8KU/XByX5xozVZPVmPRKDIpUwTgYDVR0gBEcwRTBDBgZngQwB\n" +
-            "AgIwOTA3BggrBgEFBQcCARYraHR0cDovL3JlcG9zaXRvcnkudHJ1c3QudGVsaWFz\n" +
-            "b25lcmEuY29tL0NQUzBNBgNVHR8ERjBEMEKgQKA+hjxodHRwOi8vY3JsLTMudHJ1\n" +
-            "c3QudGVsaWFzb25lcmEuY29tL3RlbGlhc29uZXJhc2VydmVyY2F2Mi5jcmwwHQYD\n" +
-            "VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA4GA1UdDwEB/wQEAwIEsDAkBgNV\n" +
-            "HREEHTAbghlqdW9sdWtrYS5jb3Zlci5zb25lcmEubmV0MB0GA1UdDgQWBBSa+vJH\n" +
-            "I6Lt9Aqw5ondhoZu4/IJezANBgkqhkiG9w0BAQsFAAOCAgEASRK1l1MZb/IRlyi+\n" +
-            "XjfZcxJdFuNzW2kpZstW6Ni2XiD3p7aROBfDFtu7GajzZHb6p76auDb4NwJgeE/3\n" +
-            "6gnXoIK00HwpF2RAhxDpkF8r3q0jSqGhSv/xz9Nx7JBzgqfSw3Ha4ohioIed3uc+\n" +
-            "nMDyvVenio4GYgtxIIubSybCxMv/lBA/S4daIVCYK3VOoBbM2F36ecAKvRU5vIWM\n" +
-            "urXsfANL3u4qgJpaM0DclzFsOkVsRPffzToko/Nr6pGXYjt47IzTRlwLMnLehoZW\n" +
-            "ZZMGMVVOlR7XGf81UjWB6OsKeoQ4FWgcb/rIJcZusm+LqvnsCHuC3gtuC2nGA7lr\n" +
-            "fseUlG7QZN9/QfUIyvL69wAzeVj1cUcd7GHcAH9DyZJfI8orv4PyUvitDdgISkFu\n" +
-            "GZ562O7cGmCv00/6I4t0z9wZal8a5lRDoKXAYy+u/adrO1JjLwi11y/DTw9LQ7sJ\n" +
-            "gVP/v2GsI0ajF9A6z33UHN9uxXZVmQNvOiMkcJiGLovFgu5zxoAg2W3pHjbBbeL8\n" +
-            "v5MPqgsKafgzaSRtXBBvaISHi9hhRR8v/qSwO3NyLm8uAhQD4x+OPHrmQ/s16j45\n" +
-            "Ib53UHj1k6byXGUqDgzFBsmEPV6Shf2C4/HcRHpAX8wQx3xVwDtRzDpNUR6vnNfi\n" +
-            "PwzRU1xsQKd8llmgl4l+fYV0tBA=\n" +
-            "-----END CERTIFICATE-----";
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-        }
-
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Thu Dec 22 23:14:55 PST 2016", System.out);
-
-        // reset validation date back to current date
-        pathValidator.resetValidationDate();
-    }
-}
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ValidatePathWithURL.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ValidatePathWithURL.java
new file mode 100644
index 00000000000..5d18b599c65
--- /dev/null
+++ b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ValidatePathWithURL.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jtreg.SkippedException;
+
+import javax.net.ssl.*;
+import javax.security.auth.x500.X500Principal;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.security.*;
+import java.security.cert.*;
+import java.security.cert.Certificate;
+
+public class ValidatePathWithURL {
+
+    private final X509Certificate rootCertificate;
+    private final X500Principal rootPrincipal;
+
+    /**
+     * Enables the certificate revocation checking and loads the certificate from
+     * <code>cacerts</code> file for give caAlias
+     *
+     * @param caAlias CA alias for CA certificate in <code>cacerts</code> file
+     * @throws Exception when fails to get CA certificate from <code>cacerts</code> file
+     */
+    public ValidatePathWithURL(String caAlias) throws Exception {
+        System.setProperty("com.sun.net.ssl.checkRevocation", "true");
+        Security.setProperty("ssl.TrustManagerFactory.algorithm", "SunPKIX");
+
+        // some test sites don't have correct hostname specified in test certificate
+        HttpsURLConnection.setDefaultHostnameVerifier(new CustomHostnameVerifier());
+
+        String FS = System.getProperty("file.separator");
+        String CACERTS_STORE =
+                System.getProperty("test.jdk") + FS + "lib" + FS + "security" + FS + "cacerts";
+
+        KeyStore cacerts = KeyStore.getInstance("PKCS12");
+        try (FileInputStream fis = new FileInputStream(CACERTS_STORE)) {
+            cacerts.load(fis, null);
+        }
+
+        rootCertificate = (X509Certificate) cacerts.getCertificate(caAlias);
+        rootPrincipal = rootCertificate.getSubjectX500Principal();
+    }
+
+    /**
+     * Enable revocation checking using OCSP and disables CRL check
+     */
+    public static void enableOCSPOnly() {
+        System.setProperty("com.sun.security.enableCRLDP", "false");
+        Security.setProperty("ocsp.enable", "true");
+    }
+
+    /**
+     * Enable revocation checking using CRL
+     */
+    public static void enableCRLOnly() {
+        System.setProperty("com.sun.security.enableCRLDP", "true");
+        Security.setProperty("ocsp.enable", "false");
+    }
+
+    /**
+     * Enable revocation checking using OCSP or CRL
+     */
+    public static void enableOCSPAndCRL() {
+        System.setProperty("com.sun.security.enableCRLDP", "true");
+        Security.setProperty("ocsp.enable", "true");
+    }
+
+    /**
+     * Logs revocation settings
+     */
+    public static void logRevocationSettings() {
+        System.out.println("=====================================================");
+        System.out.println("CONFIGURATION");
+        System.out.println("=====================================================");
+        System.out.println("http.proxyHost :" + System.getProperty("http.proxyHost"));
+        System.out.println("http.proxyPort :" + System.getProperty("http.proxyPort"));
+        System.out.println("https.proxyHost :" + System.getProperty("https.proxyHost"));
+        System.out.println("https.proxyPort :" + System.getProperty("https.proxyPort"));
+        System.out.println("https.socksProxyHost :"
+                + System.getProperty("https.socksProxyHost"));
+        System.out.println("https.socksProxyPort :"
+                + System.getProperty("https.socksProxyPort"));
+        System.out.println("jdk.certpath.disabledAlgorithms :"
+                + Security.getProperty("jdk.certpath.disabledAlgorithms"));
+        System.out.println("com.sun.security.enableCRLDP :"
+                + System.getProperty("com.sun.security.enableCRLDP"));
+        System.out.println("ocsp.enable :" + Security.getProperty("ocsp.enable"));
+        System.out.println("=====================================================");
+    }
+
+    /**
+     * Validates end entity certificate used in provided test URL using
+     * <code>HttpsURLConnection</code>. Validation is skipped on network error or if
+     * the certificate is expired.
+     *
+     * @param testURL     URL to validate
+     * @param revokedCert if <code>true</code> then validate is REVOKED certificate
+     * @throws Exception on failure to validate certificate
+     */
+    public void validateDomain(final String testURL,
+                               final boolean revokedCert)
+            throws Exception {
+        System.out.println();
+        System.out.println("===== Validate " + testURL + "=====");
+        if (!validateDomainCertChain(testURL, revokedCert)) {
+            throw new RuntimeException("Failed to validate " + testURL);
+        }
+        System.out.println("======> SUCCESS");
+    }
+
+    private boolean validateDomainCertChain(final String testURL,
+                                            final boolean revokedCert)
+            throws Exception {
+        HttpsURLConnection httpsURLConnection = null;
+        try {
+            URL url = new URL(testURL);
+            httpsURLConnection = (HttpsURLConnection) url.openConnection();
+            httpsURLConnection.setInstanceFollowRedirects(false);
+            httpsURLConnection.connect();
+
+            // certain that test certificate anchors to trusted CA for VALID certificate
+            // if the connection is successful
+            Certificate[] chain = httpsURLConnection.getServerCertificates();
+            httpsURLConnection.disconnect();
+            validateAnchor(chain);
+        } catch (SSLHandshakeException e) {
+            System.out.println("SSLHandshakeException: " + e.getMessage());
+            Throwable cause = e.getCause();
+
+            while (cause != null) {
+                if (cause instanceof CertPathValidatorException cpve) {
+                    if (cpve.getReason() == CertPathValidatorException.BasicReason.REVOKED
+                            || cpve.getCause() instanceof CertificateRevokedException) {
+                        System.out.println("Certificate is revoked");
+
+                        // We can validate anchor for revoked certificates as well
+                        Certificate[] chain = cpve.getCertPath().getCertificates().toArray(new Certificate[0]);
+                        validateAnchor(chain);
+
+                        if (revokedCert) {
+                            return true;
+                        }
+                    } else if (cpve.getReason() == CertPathValidatorException.BasicReason.EXPIRED
+                            || cpve.getCause() instanceof CertificateExpiredException) {
+                        System.out.println("Certificate is expired");
+                        throw new SkippedException("Certificate is expired, skip the test");
+                    }
+                    break;
+                }
+                cause = cause.getCause();
+            }
+
+            throw new RuntimeException("Unhandled exception", e);
+        } catch (SSLException e) {
+            // thrown if root CA is not included in cacerts
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new SkippedException("Network setup issue, skip this test", e);
+        } finally {
+            if (httpsURLConnection != null) {
+                httpsURLConnection.disconnect();
+            }
+        }
+
+        return !revokedCert;
+    }
+
+    private void validateAnchor(Certificate[] chain) throws Exception {
+        X509Certificate interCert = null;
+
+        // fail if there is no intermediate CA or self-signed
+        if (chain.length < 2) {
+            throw new RuntimeException("Cert chain too short " + chain.length);
+        } else {
+            System.out.println("Finding intermediate certificate issued by CA");
+            for (Certificate cert : chain) {
+                if (cert instanceof X509Certificate certificate) {
+                    System.out.println("Checking: " + certificate.getSubjectX500Principal());
+                    System.out.println("Issuer: " + certificate.getIssuerX500Principal());
+                    if (certificate.getIssuerX500Principal().equals(rootPrincipal)) {
+                        interCert = certificate;
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (interCert == null) {
+            throw new RuntimeException("Intermediate Root CA not found in the chain");
+        }
+
+        // validate intermediate CA signed by root CA under test
+        System.out.println("Found intermediate root CA: " + interCert.getSubjectX500Principal());
+        System.out.println("intermediate CA Issuer: " + interCert.getIssuerX500Principal());
+        interCert.verify(rootCertificate.getPublicKey());
+        System.out.println("Verified: Intermediate CA signed by test root CA");
+    }
+
+    private static class CustomHostnameVerifier implements HostnameVerifier {
+        @Override
+        public boolean verify(String hostname, SSLSession session) {
+            // Allow any hostname
+            return true;
+        }
+    }
+}

From 7b1e2bfe0f805a69b59839b6bf8250b62ea356b8 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Tue, 19 Sep 2023 16:33:31 +0000
Subject: [PATCH 086/112] 8315415: OutputAnalyzer.shouldMatchByLine() fails in
 some cases

Reviewed-by: dholmes
---
 .../jdk/test/lib/process/OutputAnalyzer.java  | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/test/lib/jdk/test/lib/process/OutputAnalyzer.java b/test/lib/jdk/test/lib/process/OutputAnalyzer.java
index 7d566a83624..41b240b9e48 100644
--- a/test/lib/jdk/test/lib/process/OutputAnalyzer.java
+++ b/test/lib/jdk/test/lib/process/OutputAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -671,15 +671,15 @@ public OutputAnalyzer stdoutShouldMatchByLine(String pattern) {
     /**
      * @see #shouldMatchByLine(String, String, String)
      */
-    public OutputAnalyzer shouldMatchByLineFrom(String from, String pattern) {
-        return shouldMatchByLine(from, null, pattern);
+    public OutputAnalyzer shouldMatchByLineFrom(String fromPattern, String pattern) {
+        return shouldMatchByLine(fromPattern, null, pattern);
     }
 
     /**
      * @see #shouldMatchByLine(String, String, String)
      */
-    public OutputAnalyzer shouldMatchByLineTo(String to, String pattern) {
-        return shouldMatchByLine(null, to, pattern);
+    public OutputAnalyzer shouldMatchByLineTo(String toPattern, String pattern) {
+        return shouldMatchByLine(null, toPattern, pattern);
     }
 
     /**
@@ -687,17 +687,17 @@ public OutputAnalyzer shouldMatchByLineTo(String to, String pattern) {
      * {@code pattern} line by line. The whole output could be matched or
      * just a subset of it.
      *
-     * @param from
-     *            The line (excluded) from where output will be matched.
-     *            Set {@code from} to null for matching from the first line.
-     * @param to
-     *            The line (excluded) until where output will be matched.
-     *            Set {@code to} to null for matching until the last line.
+     * @param fromPattern
+     *            The pattern of line (excluded) from where output will be matched.
+     *            Set {@code fromPattern} to null for matching from the first line.
+     * @param toPattern
+     *            The pattern of line (excluded) until where output will be matched.
+     *            Set {@code toPattern} to null for matching until the last line.
      * @param pattern
      *            Matching pattern
      */
-    public OutputAnalyzer shouldMatchByLine(String from, String to, String pattern) {
-        return shouldMatchByLine(getOutput(), from, to, pattern);
+    public OutputAnalyzer shouldMatchByLine(String fromPattern, String toPattern, String pattern) {
+        return shouldMatchByLine(getOutput(), fromPattern, toPattern, pattern);
     }
 
     /**
@@ -705,34 +705,34 @@ public OutputAnalyzer shouldMatchByLine(String from, String to, String pattern)
      * {@code pattern} line by line. The whole stdout could be matched or
      * just a subset of it.
      *
-     * @param from
-     *            The line (excluded) from where stdout will be matched.
-     *            Set {@code from} to null for matching from the first line.
-     * @param to
-     *            The line (excluded) until where stdout will be matched.
-     *            Set {@code to} to null for matching until the last line.
+     * @param fromPattern
+     *            The pattern of line (excluded) from where stdout will be matched.
+     *            Set {@code fromPattern} to null for matching from the first line.
+     * @param toPattern
+     *            The pattern of line (excluded) until where stdout will be matched.
+     *            Set {@code toPattern} to null for matching until the last line.
      * @param pattern
      *            Matching pattern
      */
-    public OutputAnalyzer stdoutShouldMatchByLine(String from, String to, String pattern) {
-        return shouldMatchByLine(getStdout(), from, to, pattern);
+    public OutputAnalyzer stdoutShouldMatchByLine(String fromPattern, String toPattern, String pattern) {
+        return shouldMatchByLine(getStdout(), fromPattern, toPattern, pattern);
     }
 
-    private OutputAnalyzer shouldMatchByLine(String buffer, String from, String to, String pattern) {
+    private OutputAnalyzer shouldMatchByLine(String buffer, String fromPattern, String toPattern, String pattern) {
         List<String> lines = asLines(buffer);
 
         int fromIndex = 0;
-        if (from != null) {
-            fromIndex = indexOf(lines, from, 0) + 1; // + 1 -> apply 'pattern' to lines after 'from' match
+        if (fromPattern != null) {
+            fromIndex = indexOf(lines, fromPattern, 0) + 1; // + 1 -> apply 'pattern' to lines after 'from' match
             Asserts.assertGreaterThan(fromIndex, 0,
-                    "The line/pattern '" + from + "' from where the output should match can not be found");
+                    "The line matched with pattern '" + fromPattern + "' from where the output should match can not be found");
         }
 
         int toIndex = lines.size();
-        if (to != null) {
-            toIndex = indexOf(lines, to, fromIndex);
+        if (toPattern != null) {
+            toIndex = indexOf(lines, toPattern, fromIndex);
             Asserts.assertGreaterThan(toIndex, fromIndex,
-                    "The line/pattern '" + to + "' until where the output should match can not be found");
+                    "The line matched with pattern '" + toPattern + "' until where the output should match can not be found");
         }
 
         List<String> subList = lines.subList(fromIndex, toIndex);

From e0f8d16833c8212a79ea3dda3f4fe31134c41025 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Tue, 19 Sep 2023 16:35:50 +0000
Subject: [PATCH 087/112] 8314829:
 serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java ignores vm flags

Reviewed-by: cjplummer
---
 test/hotspot/jtreg/ProblemList-zgc.txt                        | 1 +
 .../serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList-zgc.txt b/test/hotspot/jtreg/ProblemList-zgc.txt
index 89882754d8e..f648cc136e2 100644
--- a/test/hotspot/jtreg/ProblemList-zgc.txt
+++ b/test/hotspot/jtreg/ProblemList-zgc.txt
@@ -30,6 +30,7 @@
 resourcehogs/serviceability/sa/TestHeapDumpForLargeArray.java 8276539   generic-all
 serviceability/sa/CDSJMapClstats.java                         8276539   generic-all
 serviceability/sa/ClhsdbJhisto.java                           8276539   generic-all
+serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java      8276539   generic-all
 
 serviceability/sa/ClhsdbFindPC.java#xcomp-core                8284045   generic-all
 serviceability/sa/TestJmapCore.java                           8268283,8270202   linux-aarch64,linux-x64,macosx-aarch64
diff --git a/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java b/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
index 692fc0153e3..2ecb1d9bf41 100644
--- a/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,7 +77,7 @@ public static void main(String[] args) throws Exception {
     private static void testHProfFileFormat(String vmArgs, long heapSize,
             String expectedFormat) throws Exception, IOException,
             InterruptedException, FileNotFoundException {
-        ProcessBuilder procBuilder = ProcessTools.createJavaProcessBuilder(
+        ProcessBuilder procBuilder = ProcessTools.createTestJvm(
                 "--add-exports=java.management/sun.management=ALL-UNNAMED", vmArgs, "JMapHProfLargeHeapProc", String.valueOf(heapSize));
         procBuilder.redirectError(ProcessBuilder.Redirect.INHERIT);
         Process largeHeapProc = procBuilder.start();

From b685ee00b273f029aa2ed5015e64cf409b0b0408 Mon Sep 17 00:00:00 2001
From: Mikhailo Seledtsov <mseledtsov@openjdk.org>
Date: Tue, 19 Sep 2023 16:42:23 +0000
Subject: [PATCH 088/112] 8314830: runtime/ErrorHandling/ tests ignore external
 VM flags

Reviewed-by: dholmes, lmesnik
---
 .../ErrorHandling/BadNativeStackInErrorHandlingTest.java    | 3 ++-
 .../jtreg/runtime/ErrorHandling/ClassPathEnvVar.java        | 3 ++-
 .../jtreg/runtime/ErrorHandling/ErrorFileOverwriteTest.java | 3 ++-
 .../jtreg/runtime/ErrorHandling/ErrorFileRedirectTest.java  | 3 ++-
 .../runtime/ErrorHandling/MachCodeFramesInErrorFile.java    | 3 ++-
 .../NestedThreadsListHandleInErrorHandlingTest.java         | 3 ++-
 .../jtreg/runtime/ErrorHandling/ProblematicFrameTest.java   | 3 ++-
 .../jtreg/runtime/ErrorHandling/ReattemptErrorTest.java     | 1 +
 .../jtreg/runtime/ErrorHandling/ResourceMarkTest.java       | 3 ++-
 .../runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java | 3 ++-
 .../jtreg/runtime/ErrorHandling/SecondaryErrorTest.java     | 4 +++-
 .../runtime/ErrorHandling/ShowRegistersOnAssertTest.java    | 1 +
 .../jtreg/runtime/ErrorHandling/TestAbortVmOnException.java | 1 +
 .../runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java  | 1 +
 .../runtime/ErrorHandling/TestExitOnOutOfMemoryError.java   | 3 ++-
 .../TestGZippedHeapDumpOnOutOfMemoryError.java              | 2 ++
 .../ErrorHandling/TestHeapDumpOnOutOfMemoryError.java       | 4 +++-
 .../jtreg/runtime/ErrorHandling/TestHeapDumpPath.java       | 3 ++-
 test/hotspot/jtreg/runtime/ErrorHandling/TestOnError.java   | 3 ++-
 .../jtreg/runtime/ErrorHandling/TestOnOutOfMemoryError.java | 3 ++-
 .../jtreg/runtime/ErrorHandling/TestSigInfoInHsErrFile.java | 3 ++-
 .../ErrorHandling/ThreadsListHandleInErrorHandlingTest.java | 3 ++-
 .../runtime/ErrorHandling/TimeoutInErrorHandlingTest.java   | 4 +++-
 .../jtreg/runtime/ErrorHandling/VeryEarlyAssertTest.java    | 6 +++---
 24 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/BadNativeStackInErrorHandlingTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/BadNativeStackInErrorHandlingTest.java
index 0da66113db4..af4553f0022 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/BadNativeStackInErrorHandlingTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/BadNativeStackInErrorHandlingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@
  * @bug 8194652
  * @summary Printing native stack shows an "error occurred during error reporting".
  * @modules java.base/jdk.internal.misc
+ * @requires vm.flagless
  * @requires vm.debug
  * @requires vm.flavor != "zero"
  * @library /test/lib
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ClassPathEnvVar.java b/test/hotspot/jtreg/runtime/ErrorHandling/ClassPathEnvVar.java
index e0aeb937910..68fbf40e441 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ClassPathEnvVar.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ClassPathEnvVar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8271003
  * @summary CLASSPATH env variable setting should not be truncated in a hs err log.
+ * @requires vm.flagless
  * @requires vm.debug
  * @library /test/lib
  * @run driver ClassPathEnvVar
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileOverwriteTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileOverwriteTest.java
index c9b9e433e18..ea8e944aebb 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileOverwriteTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileOverwriteTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019, SAP. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,6 +30,7 @@
  *           in the error file name)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
+ * @requires vm.flagless
  * @requires (vm.debug == true)
  * @run driver ErrorFileOverwriteTest
  */
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileRedirectTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileRedirectTest.java
index 154d5cf0e12..3c32c6f8141 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileRedirectTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileRedirectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019, SAP. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,6 +29,7 @@
  * @summary Test ErrorFileToStderr and ErrorFileToStdout
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
+ * @requires vm.flagless
  * @requires (vm.debug == true)
  * @run driver ErrorFileRedirectTest
  */
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/MachCodeFramesInErrorFile.java b/test/hotspot/jtreg/runtime/ErrorHandling/MachCodeFramesInErrorFile.java
index fabc477a631..8dced9a3a9c 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/MachCodeFramesInErrorFile.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/MachCodeFramesInErrorFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8272586
+ * @requires vm.flagless
  * @requires vm.compiler2.enabled
  * @summary Test that abstract machine code is dumped for the top frames in a hs-err log
  * @library /test/lib
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java
index 75ce802890e..d57a2bf29c2 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 
 /*
  * @test
+ * @requires vm.flagless
  * @requires (vm.debug == true)
  * @bug 8167108
  * @summary Nested ThreadsListHandle info should be in error handling output.
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ProblematicFrameTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ProblematicFrameTest.java
index 0f0b48bedec..dc54b09156c 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ProblematicFrameTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ProblematicFrameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  *          java.compiler
  *          java.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @requires vm.flagless
  * @run driver ProblematicFrameTest
  */
 
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ReattemptErrorTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ReattemptErrorTest.java
index daadf00714c..279b07ffff7 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ReattemptErrorTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ReattemptErrorTest.java
@@ -26,6 +26,7 @@
  * @test
  * @summary Check secondary error handling
  * @library /test/lib
+ * @requires vm.flagless
  * @requires vm.debug
  * @requires os.family != "windows"
  * @modules java.base/jdk.internal.misc
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ResourceMarkTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ResourceMarkTest.java
index 1e5550afcad..77f8be01887 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ResourceMarkTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ResourceMarkTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @bug 8284274
  * @summary Test that reporting doesn't crash because missing ResourceMarks
  * @library /test/lib
+ * @requires vm.flagless
  * @requires vm.debug
  * @requires os.family != "windows"
  * @modules java.base/jdk.internal.misc
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java
index 8c9d70373f7..01c5c5e7953 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2015, 2022 SAP SE. All rights reserved.
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@
  * @summary SafeFetch32 and SafeFetchN do not work in error handling
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @requires vm.flagless
  * @requires vm.debug
  * @requires vm.flavor != "zero"
  * @author Thomas Stuefe (SAP)
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java
index 2a3ddd808e9..9f689380c70 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, 2022 SAP SE. All rights reserved.
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @summary Check secondary error handling
  * @library /test/lib
+ * @requires vm.flagless
  * @requires vm.debug
  * @requires os.family != "windows"
  * @modules java.base/jdk.internal.misc
@@ -38,6 +39,7 @@
  * @test
  * @summary Check secondary error handling
  * @library /test/lib
+ * @requires vm.flagless
  * @requires vm.debug
  * @requires os.family != "windows"
  * @modules java.base/jdk.internal.misc
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java
index b5ce0952ff6..f2214204f4e 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java
@@ -28,6 +28,7 @@
  * @bug 8191101
  * @summary Show Registers on assert/guarantee
  * @library /test/lib
+ * @requires vm.flagless
  * @requires (vm.debug == true) & (os.family == "linux")
  * @author Thomas Stuefe (SAP)
  * @modules java.base/jdk.internal.misc
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestAbortVmOnException.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestAbortVmOnException.java
index 232cde09043..f71bc0ef8af 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestAbortVmOnException.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestAbortVmOnException.java
@@ -25,6 +25,7 @@
  * @test TestAbortVmOnException
  * @summary Test -XX:AbortVMOnException=MyAbortException with C1 compilation
  * @library /test/lib
+ * @requires vm.flagless
  * @run driver TestAbortVmOnException
  * @bug 8264899
  */
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java
index a4c470e5ba4..da46cd9e811 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java
@@ -26,6 +26,7 @@
  * @summary Test using -XX:+CrashOnOutOfMemoryError
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @requires vm.flagless
  * @run driver TestCrashOnOutOfMemoryError
  * @bug 8138745
  */
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java
index 2159442c08c..e56ed4a1b03 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @summary Test using -XX:ExitOnOutOfMemoryError
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @requires vm.flagless
  * @run driver TestExitOnOutOfMemoryError
  * @bug 8138745
  */
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestGZippedHeapDumpOnOutOfMemoryError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestGZippedHeapDumpOnOutOfMemoryError.java
index 40f6a6e4705..a2a0154f0b3 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestGZippedHeapDumpOnOutOfMemoryError.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestGZippedHeapDumpOnOutOfMemoryError.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2021 SAP SE. All rights reserved.
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +33,7 @@
  * @test
  * @summary Test verifies that -XX:HeapDumpGzipLevel=1 works
  * @library /test/lib
+ * @requires vm.flagless
  * @run driver/timeout=240 TestGZippedHeapDumpOnOutOfMemoryError run 1
  */
 
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java
index d5293cde704..9324adbb2e0 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test TestHeapDumpOnOutOfMemoryError
  * @summary Test verifies that -XX:HeapDumpOnOutOfMemoryError dumps heap when OutOfMemory is thrown in heap
  * @library /test/lib
+ * @requires vm.flagless
  * @run driver TestHeapDumpOnOutOfMemoryError run heap
  */
 
@@ -32,6 +33,7 @@
  * @test TestHeapDumpOnOutOfMemoryError
  * @summary Test verifies that -XX:HeapDumpOnOutOfMemoryError dumps heap when OutOfMemory is thrown in metaspace.
  * @library /test/lib
+ * @requires vm.flagless
  * @run driver/timeout=240 TestHeapDumpOnOutOfMemoryError run metaspace
  */
 
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestHeapDumpPath.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestHeapDumpPath.java
index b1c4dc0c357..0cc6dbc765f 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestHeapDumpPath.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestHeapDumpPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test TestHeapDumpPath
  * @summary Test verifies that -XX:HeapDumpPath= supports directory as a parameter.
  * @library /test/lib
+ * @requires vm.flagless
  * @run driver TestHeapDumpPath
  */
 
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestOnError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestOnError.java
index 776d1c9dfe7..00475f8bdd7 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestOnError.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestOnError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test using -XX:OnError=<cmd>
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @requires vm.flagless
  * @requires vm.debug
  * @run driver TestOnError
  */
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestOnOutOfMemoryError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestOnOutOfMemoryError.java
index 6d72bd59b6d..fe3c5c34f80 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestOnOutOfMemoryError.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestOnOutOfMemoryError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @summary Test using single and multiple -XX:OnOutOfMemoryError=<cmd>
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @requires vm.flagless
  * @run driver TestOnOutOfMemoryError
  * @bug 8078470 8177522
  */
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestSigInfoInHsErrFile.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestSigInfoInHsErrFile.java
index 7d8fb77b512..a33a2b38ca1 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestSigInfoInHsErrFile.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestSigInfoInHsErrFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,6 +27,7 @@
  * @test segv
  * @summary Test that for a given crash situation we see the correct siginfo in the hs-err file
  * @library /test/lib
+ * @requires vm.flagless
  * @requires vm.debug
  * @requires os.family != "windows"
  * @modules java.base/jdk.internal.misc
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java
index 682753b2464..f2930e5c5bd 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@
  * @summary ThreadsListHandle info should be in error handling output.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @requires vm.flagless
  * @run driver ThreadsListHandleInErrorHandlingTest
  */
 
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java
index 0c3c2997b0e..0ff835a8c0d 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2017, 2022 SAP SE. All rights reserved.
  * Copyright (c) 2023, Red Hat, Inc. and/or its affiliates.
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,7 @@
  * @summary Hanging Error Reporting steps may lead to torn error logs
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @requires vm.flagless
  * @requires (vm.debug == true) & (os.family != "windows")
  * @run driver TimeoutInErrorHandlingTest
  * @author Thomas Stuefe (SAP)
@@ -53,6 +54,7 @@
  * @summary Error handling step timeouts should never be blocked by OnError etc.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @requires vm.flagless
  * @requires (vm.debug == true) & (os.family != "windows")
  * @run driver TimeoutInErrorHandlingTest with-on-error
  */
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/VeryEarlyAssertTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/VeryEarlyAssertTest.java
index b8170ee2426..348ce77c4dc 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/VeryEarlyAssertTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/VeryEarlyAssertTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2022 SAP. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,6 +29,7 @@
  * @summary No hs-err file if fatal error is raised during dynamic initialization.
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
+ * @requires vm.flagless
  * @requires (vm.debug == true)
  * @requires os.family == "linux"
  * @run driver VeryEarlyAssertTest
@@ -49,8 +50,7 @@ public class VeryEarlyAssertTest {
   public static void main(String[] args) throws Exception {
 
 
-    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-            "-version");
+    ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-version");
     Map<String, String> env = pb.environment();
     env.put("HOTSPOT_FATAL_ERROR_DURING_DYNAMIC_INITIALIZATION", "1");
 

From 5f6cee86ef765677b0b9dc3662f4f20b636732bc Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Tue, 19 Sep 2023 16:56:12 +0000
Subject: [PATCH 089/112] 8316056: Open source several Swing JTree tests

Reviewed-by: honkar, aivanov
---
 test/jdk/javax/swing/JTree/bug4210432.java | 80 +++++++++++++++++++++
 test/jdk/javax/swing/JTree/bug4213868.java | 62 +++++++++++++++++
 test/jdk/javax/swing/JTree/bug4224491.java | 61 ++++++++++++++++
 test/jdk/javax/swing/JTree/bug4237370.java | 81 ++++++++++++++++++++++
 test/jdk/javax/swing/JTree/bug4662505.java | 63 +++++++++++++++++
 5 files changed, 347 insertions(+)
 create mode 100644 test/jdk/javax/swing/JTree/bug4210432.java
 create mode 100644 test/jdk/javax/swing/JTree/bug4213868.java
 create mode 100644 test/jdk/javax/swing/JTree/bug4224491.java
 create mode 100644 test/jdk/javax/swing/JTree/bug4237370.java
 create mode 100644 test/jdk/javax/swing/JTree/bug4662505.java

diff --git a/test/jdk/javax/swing/JTree/bug4210432.java b/test/jdk/javax/swing/JTree/bug4210432.java
new file mode 100644
index 00000000000..680e8e1e457
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug4210432.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4210432
+ * @summary Tests if JTree allows nodes not visible to be selected
+ * @run main bug4210432
+ */
+
+import javax.swing.JPanel;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreePath;
+
+public class bug4210432 {
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JPanel p = new JPanel();
+            DefaultMutableTreeNode expansible =
+                    new DefaultMutableTreeNode("expansible");
+            DefaultMutableTreeNode unexpansible =
+                    new DefaultMutableTreeNode("unexpansible");
+            DefaultMutableTreeNode root = new DefaultMutableTreeNode("root");
+            DefaultMutableTreeNode subexpansible1 =
+                    new DefaultMutableTreeNode("sub-expansible 1");
+            DefaultMutableTreeNode subexpansible2 =
+                    new DefaultMutableTreeNode("sub-expansible 2");
+            DefaultMutableTreeNode subsubexpansible1 =
+                    new DefaultMutableTreeNode("sub-sub-expansible 1");
+            DefaultMutableTreeNode subsubexpansible2 =
+                    new DefaultMutableTreeNode("sub-sub-expansible 2");
+            expansible.add(subexpansible1);
+            expansible.add(subexpansible2);
+            subexpansible1.add(subsubexpansible1);
+            subexpansible1.add(subsubexpansible2);
+            root.add(expansible);
+            root.add(unexpansible);
+            DefaultTreeModel model = new DefaultTreeModel(root);
+            JTree t = new JTree(model);
+            Object[] tpa = {root, expansible, subexpansible1};
+            Object[] tpa2 = {root, expansible};
+            t.setExpandsSelectedPaths(false);
+            t.setSelectionPath(new TreePath(tpa));
+            p.add(t);
+            if (t.isExpanded(new TreePath(tpa2))) {
+                throw new RuntimeException("Test failed: JTree should not have " +
+                        "expanded path");
+            }
+            t.clearSelection();
+            t.setExpandsSelectedPaths(true);
+            t.setSelectionPath(new TreePath(tpa));
+            if (!t.isExpanded(new TreePath(tpa2))) {
+                throw new RuntimeException("Test failed: JTree should have " +
+                        "expanded path");
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JTree/bug4213868.java b/test/jdk/javax/swing/JTree/bug4213868.java
new file mode 100644
index 00000000000..60148becb4c
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug4213868.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4213868
+ * @summary Tests if AccessibleJTreeNode.getAccessibleIndexInParent() returns
+ * correct value
+ * @run main bug4213868
+ */
+
+import javax.accessibility.AccessibleContext;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+public class bug4213868 {
+    public static JTree createTree() {
+        DefaultMutableTreeNode root =
+                new DefaultMutableTreeNode(0, true);
+        JTree tree = new JTree(root);
+        for (int i = 1; i < 10; i++) {
+            root.add(new DefaultMutableTreeNode(i));
+        }
+        return tree;
+    }
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JTree parent = createTree();
+            AccessibleContext c = parent.getAccessibleContext()
+                                        .getAccessibleChild(0)
+                                        .getAccessibleContext();
+            if (c.getAccessibleChild(1)
+                 .getAccessibleContext()
+                 .getAccessibleIndexInParent() != 1) {
+                throw new RuntimeException("Test failed: " +
+                        "AccessibleJTreeNode.getAccessibleIndexInParent() " +
+                        "returns incorrect value");
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JTree/bug4224491.java b/test/jdk/javax/swing/JTree/bug4224491.java
new file mode 100644
index 00000000000..e22aca64a9c
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug4224491.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4224491
+ * @summary Tests if JTree's model & invokesStopCellEditing bound properties
+ * are working
+ * @run main bug4224491
+ */
+
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+
+public class bug4224491 {
+    private static boolean modelChanged = false;
+    private static boolean invokesStopCellEditingChanged = false;
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            DefaultMutableTreeNode root = new DefaultMutableTreeNode();
+            JTree jt = new JTree(new DefaultTreeModel(root));
+            jt.addPropertyChangeListener(evt -> {
+                if (evt.getPropertyName().equals("model")) {
+                    modelChanged = true;
+                }
+                if (evt.getPropertyName().equals("invokesStopCellEditing")) {
+                    invokesStopCellEditingChanged = true;
+                }
+            });
+            jt.setModel(new DefaultTreeModel(root));
+            jt.setInvokesStopCellEditing(true);
+            if (!(modelChanged && invokesStopCellEditingChanged)) {
+                throw new RuntimeException("Test failed: JTree's model " +
+                        "& invokesStopCellEditing bound properties " +
+                        "are not working");
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JTree/bug4237370.java b/test/jdk/javax/swing/JTree/bug4237370.java
new file mode 100644
index 00000000000..207bbd4b2e8
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug4237370.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4237370
+ * @summary Tests that JTree calls TreeExpansionListener methods
+ *          after it has been updated due to expanded/collapsed event
+ * @run main bug4237370
+ */
+
+import java.lang.reflect.InvocationTargetException;
+
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.event.TreeExpansionEvent;
+import javax.swing.event.TreeExpansionListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeModel;
+
+public class bug4237370 {
+    static class TestTree extends JTree implements TreeExpansionListener {
+        int[] testMap = {1, 2};
+        int testIndex = 0;
+
+        private void testRowCount() {
+            int rows = getRowCount();
+            if (rows != testMap[testIndex]) {
+                throw new RuntimeException("Bad row count: reported " + rows +
+                                " instead of " + testMap[testIndex]);
+            } else {
+                testIndex++;
+            }
+        }
+
+        public void treeExpanded(TreeExpansionEvent e) {
+            testRowCount();
+        }
+
+        public void treeCollapsed(TreeExpansionEvent e) {
+            testRowCount();
+        }
+
+        public TestTree() {
+            super((TreeModel)null);
+            DefaultMutableTreeNode top = new DefaultMutableTreeNode("Root");
+            top.add(new DefaultMutableTreeNode("Sub 1"));
+            setModel(new DefaultTreeModel(top));
+            addTreeExpansionListener(this);
+        }
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+        SwingUtilities.invokeAndWait(() -> {
+            TestTree tree = new TestTree();
+            tree.collapseRow(0);
+            tree.expandRow(0);
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JTree/bug4662505.java b/test/jdk/javax/swing/JTree/bug4662505.java
new file mode 100644
index 00000000000..b231d8c2228
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug4662505.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4662505
+ * @summary IllegalArgumentException with empty JTree and key event
+ * @run main bug4662505
+ */
+
+import java.awt.event.KeyEvent;
+import java.util.Date;
+
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+
+public class bug4662505 {
+    static DummyTree tree;
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            tree = new DummyTree();
+
+            try {
+                tree.doTest();
+            } catch (Exception e) {
+                throw new RuntimeException("Empty JTree shouldn't handle " +
+                        "first letter navigation", e);
+            }
+        });
+    }
+
+    static class DummyTree extends JTree {
+        public DummyTree() {
+            super(new Object[]{});
+        }
+
+        public void doTest() {
+            KeyEvent key = new KeyEvent(tree, KeyEvent.KEY_TYPED,
+                    new Date().getTime(), 0, KeyEvent.VK_UNDEFINED, 'a');
+            processKeyEvent(key);
+        }
+    }
+}

From d2b2f6759f7b9eb6df8eaa84b88e064c636b24a8 Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Tue, 19 Sep 2023 17:34:03 +0000
Subject: [PATCH 090/112] 8315952: Open source several Swing JToolbar JTooltip
 JTree tests

Reviewed-by: aivanov, honkar
---
 test/jdk/javax/swing/JToolBar/bug4368050.java | 51 +++++++++++++++
 test/jdk/javax/swing/JToolBar/bug4465534.java | 43 +++++++++++++
 test/jdk/javax/swing/JToolBar/bug4700351.java | 64 +++++++++++++++++++
 test/jdk/javax/swing/JToolTip/bug4107843.java | 52 +++++++++++++++
 test/jdk/javax/swing/JTree/bug4161685.java    | 52 +++++++++++++++
 5 files changed, 262 insertions(+)
 create mode 100644 test/jdk/javax/swing/JToolBar/bug4368050.java
 create mode 100644 test/jdk/javax/swing/JToolBar/bug4465534.java
 create mode 100644 test/jdk/javax/swing/JToolBar/bug4700351.java
 create mode 100644 test/jdk/javax/swing/JToolTip/bug4107843.java
 create mode 100644 test/jdk/javax/swing/JTree/bug4161685.java

diff --git a/test/jdk/javax/swing/JToolBar/bug4368050.java b/test/jdk/javax/swing/JToolBar/bug4368050.java
new file mode 100644
index 00000000000..d0c99d4825f
--- /dev/null
+++ b/test/jdk/javax/swing/JToolBar/bug4368050.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4368050
+ * @summary Default toolbar layout manager should be serializable.
+ * @run main bug4368050
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import javax.swing.JToolBar;
+
+public class bug4368050 {
+    public static void main(String[] args) throws Exception {
+        JToolBar toolBar = new JToolBar();
+
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+             ObjectOutputStream oos = new ObjectOutputStream(baos)) {
+            oos.writeObject(toolBar);
+            byte[] buf = baos.toByteArray();
+            try (ByteArrayInputStream bais = new ByteArrayInputStream(buf);
+                 ObjectInputStream ois = new ObjectInputStream(bais)) {
+                ois.readObject();
+            }
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JToolBar/bug4465534.java b/test/jdk/javax/swing/JToolBar/bug4465534.java
new file mode 100644
index 00000000000..08035da8cd2
--- /dev/null
+++ b/test/jdk/javax/swing/JToolBar/bug4465534.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4465534
+ * @summary Tests adding borderless button to a toolbar
+ * @run main bug4465534
+ */
+
+import javax.swing.JButton;
+import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
+
+public class bug4465534 {
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JToolBar toolbar = new JToolBar();
+            JButton button = new JButton("text");
+            button.setBorder(null);
+            toolbar.add(button);
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JToolBar/bug4700351.java b/test/jdk/javax/swing/JToolBar/bug4700351.java
new file mode 100644
index 00000000000..1b2b28b9f2f
--- /dev/null
+++ b/test/jdk/javax/swing/JToolBar/bug4700351.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4700351
+ * @summary Checks if JToolBar keeps orientation when dragged off
+ * @key headful
+ * @run main bug4700351
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.basic.BasicToolBarUI;
+
+public class bug4700351 {
+    static JFrame fr;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                fr = new JFrame("bug4700351");
+                JToolBar tb = new JToolBar();
+                tb.setOrientation(JToolBar.VERTICAL);
+                fr.add(tb);
+                BasicToolBarUI ui = (javax.swing.plaf.basic.BasicToolBarUI) tb.getUI();
+                if (!ui.isFloating()) {
+                    ui.setFloatingLocation(100, 100);
+                    ui.setFloating(true, tb.getLocation());
+                }
+                if (tb.getOrientation() != JToolBar.VERTICAL) {
+                    throw new RuntimeException("Error: toolbar's orientation " +
+                            "has changed");
+                }
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (fr != null) {
+                    fr.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JToolTip/bug4107843.java b/test/jdk/javax/swing/JToolTip/bug4107843.java
new file mode 100644
index 00000000000..0714871a707
--- /dev/null
+++ b/test/jdk/javax/swing/JToolTip/bug4107843.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4107843
+ * @summary ToolTipText for JTabbedPane.
+ * @run main bug4107843
+ */
+
+import javax.swing.JButton;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
+
+public class bug4107843 {
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JTabbedPane tp = new JTabbedPane();
+            tp.add("First", new JButton("Button1"));
+            tp.add("Second", new JButton("Button2"));
+            tp.setToolTipTextAt(0, "first button");
+            if (!tp.getToolTipTextAt(0).equals("first button")) {
+                throw new RuntimeException("ToolTipText isn't set " +
+                        "as expected...");
+            }
+            tp.setToolTipTextAt(1, "second button");
+            if (!tp.getToolTipTextAt(1).equals("second button")) {
+                throw new RuntimeException("ToolTipText isn't set " +
+                        "as expected...");
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JTree/bug4161685.java b/test/jdk/javax/swing/JTree/bug4161685.java
new file mode 100644
index 00000000000..5820bd1a076
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug4161685.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4161685
+ * @summary JTree now has the public methods setAnchorSelectionPath,
+ * getAnchorSelectionPath, setLeadSelectionPath.
+ * @run main bug4161685
+ */
+
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.TreePath;
+
+public class bug4161685 {
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JTree tr = new JTree();
+            TreePath tp = tr.getPathForRow(2);
+            tr.setAnchorSelectionPath(tp);
+            if (tr.getAnchorSelectionPath() != tp) {
+                throw new RuntimeException("AnchorSelectionPath isn't " +
+                        "set correctly...");
+            }
+            tr.setLeadSelectionPath(tp);
+            if (tr.getLeadSelectionPath() != tp) {
+                throw new RuntimeException("LeadSelectionPath isn't " +
+                        "set correctly...");
+            }
+        });
+    }
+}

From 0c972468e7d72c991f28943f602232e0317ea21d Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Tue, 19 Sep 2023 17:37:49 +0000
Subject: [PATCH 091/112] 8311113: Remove invalid pointer cast and clean up
 setLabel() in awt_MenuItem.cpp

Reviewed-by: aivanov, serb
---
 .../sun/awt/windows/WMenuItemPeer.java        |   6 +-
 .../native/libawt/windows/awt_MenuItem.cpp    |  69 +------
 .../native/libawt/windows/awt_MenuItem.h      |   4 +-
 test/jdk/java/awt/MenuItem/SetLabelTest.java  | 186 ++++++++++++++++++
 4 files changed, 197 insertions(+), 68 deletions(-)
 create mode 100644 test/jdk/java/awt/MenuItem/SetLabelTest.java

diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
index 49e0c9895d8..344a8e7dbc8 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,9 +75,9 @@ private void readShortcutLabel() {
     public void setLabel(String label) {
         //Fix for 6288578: PIT. Windows: Shortcuts displayed for the menuitems in a popup menu
         readShortcutLabel();
-        _setLabel(label);
+        _setLabel();
     }
-    public native void _setLabel(String label);
+    public native void _setLabel();
 
     // Toolkit & peer internals
 
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp b/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp
index 69a7f4606e2..72f5a70a8e0 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,6 @@
 // struct for _SetLabel() method
 struct SetLabelStruct {
     jobject menuitem;
-    jstring label;
 };
 // struct for _SetEnable() method
 struct SetEnableStruct {
@@ -685,7 +684,7 @@ void AwtMenuItem::DoCommand()
     }
 }
 
-void AwtMenuItem::SetLabel(LPCTSTR sb)
+void AwtMenuItem::SetLabel()
 {
     AwtMenu* menu = GetMenuContainer();
     /* Fix for bug 4257944 by ssi@sparc.spb.su
@@ -704,12 +703,11 @@ void AwtMenuItem::SetLabel(LPCTSTR sb)
     memset(&mii, 0, sizeof(MENUITEMINFO));
     mii.cbSize = sizeof(MENUITEMINFO);
     mii.fMask = MIIM_CHECKMARKS | MIIM_DATA | MIIM_ID
-              | MIIM_STATE | MIIM_SUBMENU | MIIM_TYPE;
+              | MIIM_STATE | MIIM_SUBMENU | MIIM_FTYPE;
 
     ::GetMenuItemInfo(hMenu, GetID(), FALSE, &mii);
 
     mii.fType = MFT_OWNERDRAW;
-    mii.dwTypeData = (LPTSTR)(*sb);
 
     // find index by menu item id
     int nMenuItemCount = ::GetMenuItemCount(hMenu);
@@ -784,7 +782,6 @@ void AwtMenuItem::_SetLabel(void *param) {
 
         SetLabelStruct *sls = (SetLabelStruct *)param;
         jobject self = sls->menuitem;
-        jstring label = sls->label;
 
         int badAlloc = 0;
         AwtMenuItem *m = NULL;
@@ -792,64 +789,12 @@ void AwtMenuItem::_SetLabel(void *param) {
         PDATA pData;
         JNI_CHECK_PEER_GOTO(self, ret);
         m = (AwtMenuItem *)pData;
-//    if (::IsWindow(m->GetOwnerHWnd()))
-        {
-            // fix for bug 4251036 MenuItem setLabel(null/"") behaves differently
-            // under Win32 and Solaris
-            jstring empty = NULL;
-            if (JNU_IsNull(env, label))
-            {
-                empty = JNU_NewStringPlatform(env, TEXT(""));
-            }
-            if (env->ExceptionCheck()) {
-                badAlloc = 1;
-                goto ret;
-            }
-            LPCTSTR labelPtr;
-            if (empty != NULL)
-            {
-                labelPtr = JNU_GetStringPlatformChars(env, empty, 0);
-            }
-            else
-            {
-                labelPtr = JNU_GetStringPlatformChars(env, label, 0);
-            }
-            if (labelPtr == NULL)
-            {
-                badAlloc = 1;
-            }
-            else
-            {
-                DASSERT(!IsBadStringPtr(labelPtr, 20));
-                m->SetLabel(labelPtr);
-                if (empty != NULL)
-                {
-                    JNU_ReleaseStringPlatformChars(env, empty, labelPtr);
-                }
-                else
-                {
-                    JNU_ReleaseStringPlatformChars(env, label, labelPtr);
-                }
-            }
-            if (empty != NULL)
-            {
-                env->DeleteLocalRef(empty);
-            }
-        }
+        m->SetLabel();
 
 ret:
         env->DeleteGlobalRef(self);
-        if (label != NULL)
-        {
-            env->DeleteGlobalRef(label);
-        }
 
         delete sls;
-
-        if (badAlloc)
-        {
-            throw std::bad_alloc();
-        }
     } else {
         AwtToolkit::GetInstance().InvokeFunction(AwtMenuItem::_SetLabel, param);
     }
@@ -1031,17 +976,15 @@ Java_sun_awt_windows_WMenuItemPeer_initIDs(JNIEnv *env, jclass cls)
 /*
  * Class:     sun_awt_windows_WMenuItemPeer
  * Method:    _setLabel
- * Signature: (Ljava/lang/String;)V
+ * Signature: ()V
  */
 JNIEXPORT void JNICALL
-Java_sun_awt_windows_WMenuItemPeer__1setLabel(JNIEnv *env, jobject self,
-                                              jstring label)
+Java_sun_awt_windows_WMenuItemPeer__1setLabel(JNIEnv *env, jobject self)
 {
     TRY;
 
     SetLabelStruct *sls = new SetLabelStruct;
     sls->menuitem = env->NewGlobalRef(self);
-    sls->label = (label == NULL) ? NULL : (jstring)env->NewGlobalRef(label);
 
     AwtToolkit::GetInstance().SyncCall(AwtMenuItem::_SetLabel, sls);
     // global refs and sls are deleted in _SetLabel
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h b/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h
index 50c204f34ed..15c71357f7f 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,7 @@ class AwtMenuItem : public AwtObject {
     virtual BOOL IsTopMenu();
     void DrawCheck(HDC hDC, RECT rect);
 
-    void SetLabel(LPCTSTR sb);
+    void SetLabel();
     virtual void Enable(BOOL isEnabled);
     virtual void UpdateContainerLayout();
     virtual void RedrawMenuBar();
diff --git a/test/jdk/java/awt/MenuItem/SetLabelTest.java b/test/jdk/java/awt/MenuItem/SetLabelTest.java
new file mode 100644
index 00000000000..f8a506ed7e4
--- /dev/null
+++ b/test/jdk/java/awt/MenuItem/SetLabelTest.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
+import java.awt.Point;
+import java.awt.PopupMenu;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+
+/*
+ * @test
+ * @key headful
+ * @bug 4234266
+ * @summary To test setLabel functionality on Windows.
+ * @requires (os.family == "windows")
+ */
+
+public class SetLabelTest {
+    private static Robot robot;
+    private static Frame frame;
+    private static MenuBar mb;
+    private static PopupMenu pm;
+    private static Point frameLoc;
+    private static final StringBuffer errorLog = new StringBuffer();
+
+    public static void main(String[] args) throws Exception {
+        try {
+            robot = new Robot();
+
+            EventQueue.invokeAndWait(() -> createTestUI());
+            robot.delay(1000);
+            EventQueue.invokeAndWait(() -> frameLoc = frame.getLocationOnScreen());
+
+            checkMenu();
+            checkPopupMenu();
+            robot.delay(200);
+            if (!errorLog.isEmpty()) {
+                throw new RuntimeException("Before & After screenshots are same." +
+                        " Test fails for the following case(s):\n" + errorLog);
+            }
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    private static void createTestUI() {
+        frame = new Frame("Menu SetLabel Test");
+        frame.setUndecorated(true);
+        mb = new MenuBar();
+
+        //Menu 1
+        Menu menu1 = new Menu("Menu");
+        MenuItem mi1 = new MenuItem("Item-1");
+        menu1.add(mi1);
+        menu1.addSeparator();
+        MenuItem mi2 = new MenuItem("Item-2");
+        menu1.add(mi2);
+        mb.add(menu1);
+
+        //Popup menu
+        pm = new PopupMenu("Popup");
+        MenuItem pm1 = new MenuItem("Item-1");
+        pm.add(pm1);
+        pm.addSeparator();
+        MenuItem pm2 = new MenuItem("Item-2");
+        pm.add(pm2);
+        frame.add(pm);
+
+        frame.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent e) {
+                showPopup(e);
+            }
+
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                showPopup(e);
+            }
+
+            private void showPopup(MouseEvent e) {
+                if (e.isPopupTrigger()) {
+                    pm.show(e.getComponent(),
+                            e.getX(), e.getY());
+                }
+            }
+        });
+        frame.setMenuBar(mb);
+        frame.setSize(300, 200);
+        frame.setLocation(500,500);
+        frame.setVisible(true);
+    }
+
+    private static void checkMenu() throws IOException {
+        robot.mouseMove(frameLoc.x + 8, frameLoc.y + 8);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        robot.delay(200);
+        BufferedImage beforeImgMenu = robot.createScreenCapture(frame.getBounds());
+
+        //Change Menu & MenuItem label
+        Menu m1 = mb.getMenu(0);
+        m1.setLabel("New Menu");
+        m1.getItem(0).setLabel("New Item-1");
+        m1.getItem(2).setLabel("New Item-2");
+        robot.delay(200);
+        BufferedImage afterImgMenu = robot.createScreenCapture(frame.getBounds());
+
+        if (compareImages(beforeImgMenu, afterImgMenu)) {
+            errorLog.append("Menu case\n");
+            ImageIO.write(beforeImgMenu, "png", new File("MenuBefore.png"));
+            ImageIO.write(afterImgMenu, "png", new File("MenuAfter.png"));
+        }
+    }
+
+    private static void checkPopupMenu() throws IOException {
+        robot.mouseMove(frameLoc.x + (frame.getWidth() / 2),
+                frameLoc.y + (frame.getHeight() /2));
+        robot.mousePress(InputEvent.BUTTON3_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON3_DOWN_MASK);
+        robot.delay(200);
+        BufferedImage beforeImgPopup = robot.createScreenCapture(frame.getBounds());
+
+        //Change popup menu label
+        pm.setLabel("Changed Popup");
+        pm.getItem(0).setLabel("New Item-1");
+        pm.getItem(2).setLabel("New Item-2");
+        robot.delay(200);
+        BufferedImage afterImgPopup = robot.createScreenCapture(frame.getBounds());
+        robot.mouseMove(frameLoc.x + (frame.getWidth() - 10),
+                frameLoc.y + (frame.getHeight() - 10));
+        robot.delay(100);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+        if (compareImages(beforeImgPopup, afterImgPopup)) {
+            errorLog.append("Popup case\n");
+            ImageIO.write(beforeImgPopup, "png", new File("PopupBefore.png"));
+            ImageIO.write(afterImgPopup, "png", new File("PopupAfter.png"));
+        }
+    }
+
+    private static boolean compareImages(BufferedImage beforeImg, BufferedImage afterImg) {
+        for (int x = 0; x < beforeImg.getWidth(); x++) {
+            for (int y = 0; y < beforeImg.getHeight(); y++) {
+                if (beforeImg.getRGB(x, y) != afterImg.getRGB(x, y)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}

From 62c0a1b9ac6462233f3ee06af470be9844e9e226 Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Tue, 19 Sep 2023 18:28:37 +0000
Subject: [PATCH 092/112] 8315883: Open source several Swing JToolbar tests

Reviewed-by: honkar, aivanov
---
 test/jdk/javax/swing/JToolBar/bug4138694.java | 59 +++++++++++++++++++
 test/jdk/javax/swing/JToolBar/bug4140421.java | 42 +++++++++++++
 test/jdk/javax/swing/JToolBar/bug4196662.java | 48 +++++++++++++++
 test/jdk/javax/swing/JToolBar/bug4243930.java | 50 ++++++++++++++++
 4 files changed, 199 insertions(+)
 create mode 100644 test/jdk/javax/swing/JToolBar/bug4138694.java
 create mode 100644 test/jdk/javax/swing/JToolBar/bug4140421.java
 create mode 100644 test/jdk/javax/swing/JToolBar/bug4196662.java
 create mode 100644 test/jdk/javax/swing/JToolBar/bug4243930.java

diff --git a/test/jdk/javax/swing/JToolBar/bug4138694.java b/test/jdk/javax/swing/JToolBar/bug4138694.java
new file mode 100644
index 00000000000..2750fe91bc9
--- /dev/null
+++ b/test/jdk/javax/swing/JToolBar/bug4138694.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4138694
+ * @summary When adding an Action object to a toolbar, the Action object's
+ * SHORT_DESCRIPTION property (if present) should be automatically used
+ * for toolTip text.
+ * @run main bug4138694
+ */
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JComponent;
+import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
+
+public class bug4138694 {
+    public static final String actionName = "Action";
+
+    private static class MyAction extends AbstractAction {
+        public void actionPerformed(ActionEvent e) {}
+    }
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JToolBar jtb = new JToolBar();
+            MyAction aa = new MyAction();
+            aa.putValue(Action.SHORT_DESCRIPTION, actionName);
+            jtb.add(aa);
+            JComponent c = (JComponent)jtb.getComponentAtIndex(0);
+            if (!c.getToolTipText().equals(actionName)) {
+                throw new RuntimeException("ToolTip not set automatically...");
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JToolBar/bug4140421.java b/test/jdk/javax/swing/JToolBar/bug4140421.java
new file mode 100644
index 00000000000..f089c96fdf8
--- /dev/null
+++ b/test/jdk/javax/swing/JToolBar/bug4140421.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4140421
+ * @summary Tests JToolBar set title correctly
+ * @run main bug4140421
+ */
+
+import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
+
+public class bug4140421 {
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JToolBar tb = new JToolBar("MyToolBar");
+            if (!tb.getName().equals("MyToolBar")) {
+                throw new RuntimeException("Title of JToolBar set incorrectly...");
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JToolBar/bug4196662.java b/test/jdk/javax/swing/JToolBar/bug4196662.java
new file mode 100644
index 00000000000..309d2fff104
--- /dev/null
+++ b/test/jdk/javax/swing/JToolBar/bug4196662.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4196662
+ * @summary JToolBar has remove(int) method.
+ * @run main bug4196662
+ */
+
+import javax.swing.JButton;
+import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
+
+public class bug4196662 {
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JToolBar tb = new JToolBar();
+            tb.add(new JButton("Button1"));
+            JButton bt2 = new JButton("Button2");
+            tb.add(bt2);
+            tb.add(new JButton("Button3"));
+            tb.remove(1);
+            if (tb.getComponentCount() != 2 || tb.getComponent(1) == bt2) {
+                throw new RuntimeException("Component wasn't removed...");
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JToolBar/bug4243930.java b/test/jdk/javax/swing/JToolBar/bug4243930.java
new file mode 100644
index 00000000000..c6702f1fa44
--- /dev/null
+++ b/test/jdk/javax/swing/JToolBar/bug4243930.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4243930
+ * @summary Tests that JToolBar.remove() does not throw StackOverflowError
+ * @run main bug4243930
+ */
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
+import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
+
+public class bug4243930 {
+
+    private static class NullAction extends AbstractAction {
+        public void actionPerformed(ActionEvent e){}
+    }
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JToolBar tb = new JToolBar();
+            JButton test = tb.add(new NullAction());
+            tb.remove(test);
+        });
+    }
+}

From d19e017d3fd87a6b7613f44a3757d574a6560680 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Tue, 19 Sep 2023 18:42:56 +0000
Subject: [PATCH 093/112] 8315951: Open source several Swing HTMLEditorKit
 related tests

Reviewed-by: dnguyen, aivanov
---
 .../awt/event/PaintEvent/RepaintTest.java     | 133 ++++++++++++++++++
 .../text/html/HTMLEditorKit/bug4214848.java   |  49 +++++++
 .../text/html/HTMLEditorKit/bug4230197.java   |  58 ++++++++
 .../text/html/HTMLEditorKit/bug4238223.java   | 125 ++++++++++++++++
 4 files changed, 365 insertions(+)
 create mode 100644 test/jdk/java/awt/event/PaintEvent/RepaintTest.java
 create mode 100644 test/jdk/javax/swing/text/html/HTMLEditorKit/bug4214848.java
 create mode 100644 test/jdk/javax/swing/text/html/HTMLEditorKit/bug4230197.java
 create mode 100644 test/jdk/javax/swing/text/html/HTMLEditorKit/bug4238223.java

diff --git a/test/jdk/java/awt/event/PaintEvent/RepaintTest.java b/test/jdk/java/awt/event/PaintEvent/RepaintTest.java
new file mode 100644
index 00000000000..caeeaf7d5a8
--- /dev/null
+++ b/test/jdk/java/awt/event/PaintEvent/RepaintTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.FontMetrics;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Panel;
+import java.awt.Robot;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/*
+ * @test
+ * @bug 4394287
+ * @key headful
+ * @summary Paint pending on heavyweight component move
+ */
+
+public class RepaintTest {
+    private static Frame frame;
+    private static Panel panel;
+    private static volatile IncrementComponent counter;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            EventQueue.invokeAndWait(RepaintTest::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            EventQueue.invokeAndWait(() -> panel.setLocation(panel.getX() + 10,
+                                                             panel.getY() + 10));
+            robot.waitForIdle();
+            robot.delay(500);
+
+            int count = counter.getCount().get();
+
+            EventQueue.invokeAndWait(panel::repaint);
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            if (counter.getCount().get() == count) {
+                throw new RuntimeException("Failed");
+            }
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    private static void createAndShowUI() {
+        frame = new MyFrame("Repaint Test");
+        frame.setLayout(null);
+
+        counter = new IncrementComponent();
+        panel = new Panel();
+        panel.add(counter);
+        frame.add(panel);
+        panel.setBounds(0, 0, 100, 100);
+        frame.setSize(200, 200);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    private static class MyFrame extends Frame {
+
+         public MyFrame(String title) {
+            super(title);
+        }
+
+        public void update(Graphics g) {
+            System.out.println("UPDATE: " + g.getClipBounds());
+            super.update(g);
+        }
+
+        public void paint(Graphics g) {
+            System.out.println("PAINT: " + g.getClipBounds());
+            super.paint(g);
+        }
+    }
+
+    // Subclass of Component, everytime paint is invoked a counter
+    // is incremented, this counter is displayed in the component.
+    private static class IncrementComponent extends Component {
+        private static final AtomicInteger paintCount = new AtomicInteger(0);
+
+        public Dimension getPreferredSize() {
+            return new Dimension(100, 100);
+        }
+
+        public AtomicInteger getCount() {
+            return paintCount;
+        }
+
+        public void paint(Graphics g) {
+            g.setColor(Color.red);
+            g.fillRect(0, 0, getWidth(), getHeight());
+            g.setColor(Color.white);
+
+            String string = Integer.toString(paintCount.getAndIncrement());
+            FontMetrics metrics = g.getFontMetrics();
+            int x = (getWidth() - metrics.stringWidth(string)) / 2;
+            int y = (getHeight() + metrics.getHeight()) / 2;
+            g.drawString(string, x, y);
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/HTMLEditorKit/bug4214848.java b/test/jdk/javax/swing/text/html/HTMLEditorKit/bug4214848.java
new file mode 100644
index 00000000000..9a535359866
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/HTMLEditorKit/bug4214848.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.StringReader;
+import java.io.StringWriter;
+import javax.swing.text.Document;
+import javax.swing.text.html.HTMLEditorKit;
+
+/*
+ * @test
+ * @bug 4214848
+ * @summary Tests whether  HTMLEditorKit.read(...)
+ *          creates Document for html with empty BODY
+ */
+
+public class bug4214848 {
+    public static void main (String[] args) throws Exception {
+        StringWriter sw = new StringWriter();
+        String test = "<HTML><BODY></BODY></HTML>";
+        HTMLEditorKit kit = new HTMLEditorKit();
+        Document doc = kit.createDefaultDocument();
+        kit.read(new StringReader(test), doc, 0); // prepare test document
+        kit.write(sw, doc, 0, 10);
+        String out = sw.toString().toLowerCase();
+        if (out.indexOf("<body>") != out.lastIndexOf("<body>")) {
+            throw new RuntimeException("Test failed: extra <body> section generated");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/HTMLEditorKit/bug4230197.java b/test/jdk/javax/swing/text/html/HTMLEditorKit/bug4230197.java
new file mode 100644
index 00000000000..59d4952c323
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/HTMLEditorKit/bug4230197.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.StringWriter;
+import javax.swing.text.html.HTML;
+import javax.swing.text.html.HTMLDocument;
+import javax.swing.text.html.HTMLEditorKit;
+
+/*
+ * @test
+ * @bug 4230197
+ * @summary Tests if HTMLEditorKit.insertHTML() works for font/phrase tags
+ */
+
+public class bug4230197 {
+
+    public static void main(String[] args) throws Exception {
+        HTMLEditorKit kit = new HTMLEditorKit();
+        StringWriter sw = new StringWriter();
+        HTMLDocument doc = (HTMLDocument) kit.createDefaultDocument();
+        kit.insertHTML(doc, doc.getLength(), "<sub>0</sub>", 0, 0, HTML.Tag.SUB);
+        kit.insertHTML(doc, doc.getLength(), "<sup>0</sup>", 0, 0, HTML.Tag.SUP);
+        kit.insertHTML(doc, doc.getLength(), "<b>0</b>", 0, 0, HTML.Tag.B);
+        kit.insertHTML(doc, doc.getLength(), "<i>0</i>", 0, 0, HTML.Tag.I);
+        kit.insertHTML(doc, doc.getLength(), "<code>0</code>", 0, 0, HTML.Tag.CODE);
+        kit.write(sw, doc, 0, doc.getLength());
+
+        String out = sw.toString().toLowerCase();
+        if ((!out.contains("<sub>0</sub>"))
+                || (!out.contains("<sup>0</sup>"))
+                || (!out.contains("<code>0</code>"))
+                || (!out.contains("<b>0</b>"))
+                || (!out.contains("<i>0</i>"))) {
+            throw new RuntimeException("Test failed: HTMLEditorKit.insertHTML()" +
+                    " doesn't work for font/phrase tags");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/HTMLEditorKit/bug4238223.java b/test/jdk/javax/swing/text/html/HTMLEditorKit/bug4238223.java
new file mode 100644
index 00000000000..86479ea5570
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/HTMLEditorKit/bug4238223.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.Reader;
+import java.io.StringReader;
+import javax.swing.text.MutableAttributeSet;
+import javax.swing.text.html.HTML;
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.parser.ParserDelegator;
+
+/*
+ * @test
+ * @bug 4238223
+ * @summary Tests that HTMLEditorKit.ParserCallback methods receive
+ *          correct 'pos' argument.
+ */
+
+public class bug4238223 {
+
+    public static void main(String[] argv) throws Exception {
+        TestParser parser = new TestParser();
+        String testHTML = "<HTML><HEAD><TITLE>Text</TITLE></HEAD>" +
+                "<BODY><WRONGTAG>Simple text<!--comment--></BODY></HTML>";
+        parser.parse(testHTML);
+    }
+
+    static class TestCallback extends HTMLEditorKit.ParserCallback {
+        String commentData = "comment";
+        int commentIndex = 65;
+
+        public void handleComment(char[] data, int pos) {
+            if (!(new String(data)).equals(commentData)
+                    || pos != commentIndex) {
+
+                throw new RuntimeException("handleComment failed");
+            }
+        }
+
+        HTML.Tag[] endTags = {HTML.Tag.TITLE, HTML.Tag.HEAD,
+                HTML.Tag.BODY, HTML.Tag.HTML};
+        int[] endTagPositions = {23, 31, 79, 86};
+        int endTagIndex = 0;
+        public void handleEndTag(HTML.Tag tag, int pos) {
+            if (!tag.equals(endTags[endTagIndex])
+                    || pos != endTagPositions[endTagIndex]) {
+
+                throw new RuntimeException("handleEndTag failed");
+            } else {
+                endTagIndex++;
+            }
+        }
+
+        int errorIndex = 54;
+        public void handleError(String errorMsg, int pos) {
+            if (pos != errorIndex) {
+                throw new RuntimeException("handleError failed");
+            }
+        }
+
+        int[] simpleTagPositions = {44, 93};
+        int simpleTagIndex = 0;
+        public void handleSimpleTag(HTML.Tag tag, MutableAttributeSet attr,
+                                    int pos) {
+            if (pos != simpleTagPositions[simpleTagIndex++]) {
+                throw new RuntimeException("handleSimpleTag failed");
+            }
+        }
+
+        HTML.Tag[] startTags = {HTML.Tag.HTML, HTML.Tag.HEAD,
+                HTML.Tag.TITLE, HTML.Tag.BODY};
+        int[] startTagPositions = {0, 6, 12, 38};
+        int startTagIndex = 0;
+        public void handleStartTag(HTML.Tag tag, MutableAttributeSet attr,
+                                   int pos) {
+            if (!tag.equals(startTags[startTagIndex])
+                    || pos != startTagPositions[startTagIndex]) {
+
+                throw new RuntimeException("handleStartTag failed");
+            } else {
+                startTagIndex++;
+            }
+        }
+
+        String[] textData = {"Text", "Simple text"};
+        int[] textPositions = {19, 54};
+        int textIndex = 0;
+        public void handleText(char[] data, int pos) {
+            if (!textData[textIndex].equals(new String(data))
+                    || pos != textPositions[textIndex]) {
+
+                throw new RuntimeException("handleText failed");
+            } else {
+                textIndex++;
+            }
+        }
+    }
+
+    static class TestParser extends ParserDelegator {
+        public void parse(String html) throws Exception {
+            Reader r = new StringReader(html);
+            super.parse(r, new TestCallback(), false);
+            r.close();
+        }
+    }
+}

From 7ce5bd159024e70f5a997c47ed2ce962d6e6091b Mon Sep 17 00:00:00 2001
From: Man Cao <manc@openjdk.org>
Date: Tue, 19 Sep 2023 20:06:40 +0000
Subject: [PATCH 094/112] 8316468: os::write incorrectly handles partial write

Reviewed-by: dholmes, shade
---
 src/hotspot/share/runtime/os.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 30573591a54..41b951b8801 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1439,7 +1439,7 @@ bool os::write(int fd, const void *buf, size_t nBytes) {
     if (res == OS_ERR) {
       return false;
     }
-    buf = (void *)((char *)buf + nBytes);
+    buf = (void *)((char *)buf + res);
     nBytes -= res;
   }
 

From 833a82872c0b2517c7f4ae5d512cff3a428a071c Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Tue, 19 Sep 2023 20:41:57 +0000
Subject: [PATCH 095/112] 8315876: Open source several Swing CSS related tests

Reviewed-by: azvegint, dnguyen, aivanov
---
 .../javax/swing/text/html/CSS/bug4174871.java | 101 +++++++++++++++++
 .../javax/swing/text/html/CSS/bug4174874.java | 100 ++++++++++++++++
 .../javax/swing/text/html/CSS/bug4284162.java |  96 ++++++++++++++++
 .../javax/swing/text/html/CSS/bug4764897.java | 107 ++++++++++++++++++
 .../text/html/HTMLDocument/bug4209280.java    |  39 +++++++
 5 files changed, 443 insertions(+)
 create mode 100644 test/jdk/javax/swing/text/html/CSS/bug4174871.java
 create mode 100644 test/jdk/javax/swing/text/html/CSS/bug4174874.java
 create mode 100644 test/jdk/javax/swing/text/html/CSS/bug4284162.java
 create mode 100644 test/jdk/javax/swing/text/html/CSS/bug4764897.java
 create mode 100644 test/jdk/javax/swing/text/html/HTMLDocument/bug4209280.java

diff --git a/test/jdk/javax/swing/text/html/CSS/bug4174871.java b/test/jdk/javax/swing/text/html/CSS/bug4174871.java
new file mode 100644
index 00000000000..7ae27150be5
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/CSS/bug4174871.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Robot;
+import java.awt.Shape;
+import javax.swing.JFrame;
+import javax.swing.JTextPane;
+import javax.swing.SwingUtilities;
+import javax.swing.text.View;
+
+/*
+ * @test
+ * @bug 4174871
+ * @key headful
+ * @summary Tests if CELLSPACING attribute in HTML table is rendered.
+ */
+
+public class bug4174871 {
+    private static JFrame frame;
+    private static JTextPane pane;
+    private static volatile boolean passed = false;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+
+            SwingUtilities.invokeAndWait(bug4174871::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(500);
+
+            SwingUtilities.invokeAndWait(bug4174871::testUI);
+
+            if (!passed) {
+                throw new RuntimeException("Test failed!!" +
+                        " CELLSPACING attribute in HTML table is NOT rendered");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createAndShowUI() {
+        pane = new JTextPane();
+        pane.setContentType("text/html");
+        pane.setText("<html>"
+                + "<html><head><table border=1 cellspacing=20>"
+                + "<tr><td width=100>one</td><td width=100>two</td><td width=100>three</td></tr>"
+                + "</table></body></html>");
+
+        frame = new JFrame("Table CellSpacing Test");
+        frame.getContentPane().add(pane);
+        frame.setSize(600, 200);
+        frame.setVisible(true);
+    }
+
+    private static void testUI() {
+        int tableWidth = 0;
+        Shape r = pane.getBounds();
+        View v = pane.getUI().getRootView(pane);
+
+        while (!(v instanceof javax.swing.text.html.ParagraphView)) {
+            int n = v.getViewCount();
+            Shape sh = v.getChildAllocation(n - 1, r);
+            String viewName = v.getClass().getName();
+            if (viewName.endsWith("TableView")) {
+                tableWidth = r.getBounds().width;
+            }
+            v = v.getView(n - 1);
+            if (sh != null) {
+                r = sh;
+            }
+        }
+        // tableWidth should be the sum of TD's widths (300)
+        // and cellspacings (80)
+        passed = (tableWidth >= 380);
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/CSS/bug4174874.java b/test/jdk/javax/swing/text/html/CSS/bug4174874.java
new file mode 100644
index 00000000000..b6ba85014da
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/CSS/bug4174874.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JTextPane;
+import javax.swing.SwingUtilities;
+import javax.swing.text.View;
+import java.awt.Robot;
+import java.awt.Shape;
+
+/*
+ * @test
+ * @bug 4174874
+ * @key headful
+ * @summary  Tests if borders in HTML table are rendered
+ */
+
+public class bug4174874 {
+    private static JFrame frame;
+    private static JTextPane pane;
+    private static volatile boolean passed = false;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+
+            SwingUtilities.invokeAndWait(bug4174874::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(500);
+
+            SwingUtilities.invokeAndWait(bug4174874::testUI);
+
+            if (!passed) {
+                throw new RuntimeException("Test failed!!" +
+                        " Borders of HTML table not rendered correctly");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createAndShowUI() {
+        pane = new JTextPane();
+        pane.setContentType("text/html");
+        pane.setText("<html>"
+                + "<html><head><table border=20>"
+                + "<tr><td width=100>one</td><td width=100>two</td><td width=100>three</td></tr>"
+                + "</table></body></html>");
+
+        frame = new JFrame("Table Border Test");
+        frame.getContentPane().add(pane);
+        frame.setSize(600, 200);
+        frame.setVisible(true);
+    }
+
+    private static void testUI() {
+        Shape r = pane.getBounds();
+        View v = pane.getUI().getRootView(pane);
+        int tableWidth = 0;
+        while (!(v instanceof javax.swing.text.html.ParagraphView)) {
+            int n = v.getViewCount();
+            Shape sh = v.getChildAllocation(n - 1,  r);
+            String viewName = v.getClass().getName();
+            if (viewName.endsWith("TableView")) {
+                tableWidth = r.getBounds().width;
+            }
+            v = v.getView(n - 1);
+            if (sh != null) {
+                r = sh;
+            }
+        }
+        // tableWidth should be the sum of TD's widths (300)
+        // and border width * 2 (40)
+        passed = tableWidth >= 340;
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/CSS/bug4284162.java b/test/jdk/javax/swing/text/html/CSS/bug4284162.java
new file mode 100644
index 00000000000..e1f7116c0a8
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/CSS/bug4284162.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Robot;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.View;
+import javax.swing.text.html.HTMLEditorKit;
+
+
+/*
+ * @test
+ * @bug 4284162
+ * @key headful
+ * @summary Tests if css text-indent attribute is supported with negative values.
+ */
+
+public class bug4284162 {
+    private static JEditorPane jep;
+    private static JFrame frame;
+    private static volatile boolean passed = false;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+
+            SwingUtilities.invokeAndWait(bug4284162::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(500);
+
+            SwingUtilities.invokeAndWait(bug4284162::testUI);
+
+            if (!passed) {
+                throw new RuntimeException("Test failed!!" +
+                        " CSS Text-indent attribute doesn't support negative values");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createAndShowUI() {
+        String text ="<html><head><style>body {text-indent: -24.000000pt;}</style></head>"
+                + "<body><p>paragraph</body></html>";
+
+        frame = new JFrame("CSS Text-Indent Test");
+        jep = new JEditorPane();
+        jep.setEditorKit(new HTMLEditorKit());
+        jep.setEditable(false);
+
+        jep.setText(text);
+
+        frame.getContentPane().add(jep);
+        frame.setSize(200, 200);
+        frame.setVisible(true);
+    }
+
+    private static void testUI() {
+        View v = jep.getUI().getRootView(jep);
+        while (!(v instanceof javax.swing.text.html.ParagraphView)) {
+            int n = v.getViewCount();
+            v = v.getView(n - 1);
+        }
+
+        AttributeSet attrs = v.getAttributes();
+        Object attr = attrs.getAttribute(StyleConstants.FirstLineIndent);
+        passed = (attr.toString().startsWith("-"));
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/CSS/bug4764897.java b/test/jdk/javax/swing/text/html/CSS/bug4764897.java
new file mode 100644
index 00000000000..68de9b1bb84
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/CSS/bug4764897.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Robot;
+import java.awt.Shape;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.JTextPane;
+import javax.swing.SwingUtilities;
+import javax.swing.text.View;
+
+/*
+ * @test
+ * @bug 4764897
+ * @key headful
+ * @summary Tests if text and borders in HTML table doesn't run over right edge
+ */
+
+public class bug4764897 {
+    private static JEditorPane pane;
+    private static JFrame frame;
+    private static volatile boolean passed = false;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+
+            SwingUtilities.invokeAndWait(bug4764897::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(500);
+
+            SwingUtilities.invokeAndWait(bug4764897::testUI);
+
+            if (!passed) {
+                throw new RuntimeException("Test failed!!" +
+                        " Text and Borders of HTML table run over the right edge");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createAndShowUI() {
+        pane = new JTextPane();
+        pane.setContentType("text/html");
+        pane.setText("<html>"
+                + "<html><head><table border>"
+                + "<tr><td width=20%>one</td><td width=20%>&nbsp;</td>"
+                + "<td width=20%>ThisIsAnExtraWideWord</td><td width=40%>"
+                + "This is text that won't get displayed correctly.</td></tr>"
+                + "</table></body></html>");
+
+        frame = new JFrame("Table Border & Text Test");
+        frame.getContentPane().add(pane);
+        frame.setSize(600, 200);
+        frame.setVisible(true);
+    }
+
+    private static void testUI() {
+        Shape r = pane.getBounds();
+        View v = pane.getUI().getRootView(pane);
+        int tableWidth = 0;
+        int cellsWidth = 0;
+        while (!(v instanceof javax.swing.text.html.ParagraphView)) {
+            int n = v.getViewCount();
+            Shape sh = v.getChildAllocation(n - 1, r);
+            String viewName = v.getClass().getName();
+            if (viewName.endsWith("TableView")) {
+                tableWidth = r.getBounds().width;
+            }
+
+            if (viewName.endsWith("CellView")) {
+                cellsWidth = r.getBounds().x + r.getBounds().width;
+            }
+
+            v = v.getView(n - 1);
+            if (sh != null) {
+                r = sh;
+            }
+        }
+        passed = cellsWidth <= tableWidth;
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/HTMLDocument/bug4209280.java b/test/jdk/javax/swing/text/html/HTMLDocument/bug4209280.java
new file mode 100644
index 00000000000..e9170d8cf2d
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/HTMLDocument/bug4209280.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JLabel;
+
+/*
+ * @test
+ * @bug 4209280
+ * @summary Tests that no exception is thrown on unknown HTML tag
+ */
+
+public class bug4209280 {
+
+    public static void main(String[] args) throws Exception {
+        String html = "<html><bold>Foo</bold></html>";
+        // The following line should throw no exceptions
+        new JLabel(html);
+    }
+}

From 25681886304a87053574d4e4b0d1c3eeb4f02093 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 19 Sep 2023 21:43:35 +0000
Subject: [PATCH 096/112] 8316547: Use JUnit.dir jtreg property with jpackage
 JUnit tests

Reviewed-by: almatvee
---
 test/jdk/tools/jpackage/junit/TEST.properties            | 1 +
 .../jdk/jpackage/internal/AppImageFileTest.java          | 8 +-------
 .../jdk/jpackage/internal/ApplicationLayoutTest.java     | 8 +-------
 .../jdk/jpackage/internal/CompareDottedVersionTest.java  | 8 +-------
 .../jdk/jpackage/internal/DeployParamsTest.java          | 9 +--------
 .../jdk/jpackage/internal/DottedVersionTest.java         | 8 +-------
 .../jdk/jpackage/internal/EnquoterTest.java              | 8 +-------
 .../jdk/jpackage/internal/InvalidDottedVersionTest.java  | 8 +-------
 .../jdk/jpackage/internal/OverridableResourceTest.java   | 6 ------
 .../jdk/jpackage/internal/PathGroupTest.java             | 8 +-------
 .../jdk/jpackage/internal/PlatformVersionTest.java       | 8 +-------
 .../jdk/jpackage/internal/ToolValidatorTest.java         | 6 ------
 12 files changed, 10 insertions(+), 76 deletions(-)
 create mode 100644 test/jdk/tools/jpackage/junit/TEST.properties
 rename test/jdk/tools/jpackage/junit/{ => jdk.jpackage}/jdk/jpackage/internal/AppImageFileTest.java (95%)
 rename test/jdk/tools/jpackage/junit/{ => jdk.jpackage}/jdk/jpackage/internal/ApplicationLayoutTest.java (87%)
 rename test/jdk/tools/jpackage/junit/{ => jdk.jpackage}/jdk/jpackage/internal/CompareDottedVersionTest.java (88%)
 rename test/jdk/tools/jpackage/junit/{ => jdk.jpackage}/jdk/jpackage/internal/DeployParamsTest.java (89%)
 rename test/jdk/tools/jpackage/junit/{ => jdk.jpackage}/jdk/jpackage/internal/DottedVersionTest.java (88%)
 rename test/jdk/tools/jpackage/junit/{ => jdk.jpackage}/jdk/jpackage/internal/EnquoterTest.java (80%)
 rename test/jdk/tools/jpackage/junit/{ => jdk.jpackage}/jdk/jpackage/internal/InvalidDottedVersionTest.java (81%)
 rename test/jdk/tools/jpackage/junit/{ => jdk.jpackage}/jdk/jpackage/internal/OverridableResourceTest.java (95%)
 rename test/jdk/tools/jpackage/junit/{ => jdk.jpackage}/jdk/jpackage/internal/PathGroupTest.java (95%)
 rename test/jdk/tools/jpackage/junit/{ => jdk.jpackage}/jdk/jpackage/internal/PlatformVersionTest.java (90%)
 rename test/jdk/tools/jpackage/junit/{ => jdk.jpackage}/jdk/jpackage/internal/ToolValidatorTest.java (89%)

diff --git a/test/jdk/tools/jpackage/junit/TEST.properties b/test/jdk/tools/jpackage/junit/TEST.properties
new file mode 100644
index 00000000000..1c6e6a23986
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/TEST.properties
@@ -0,0 +1 @@
+JUnit.dirs = .
diff --git a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/AppImageFileTest.java b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
similarity index 95%
rename from test/jdk/tools/jpackage/junit/jdk/jpackage/internal/AppImageFileTest.java
rename to test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
index cbf06a5e241..4ecadf86005 100644
--- a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/AppImageFileTest.java
+++ b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,12 +37,6 @@
 import org.junit.rules.TemporaryFolder;
 import org.junit.function.ThrowingRunnable;
 
-/*
- * @test
- * @modules jdk.jpackage
- * @compile --patch-module jdk.jpackage=${test.src} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED AppImageFileTest.java
- * @run junit/othervm --patch-module jdk.jpackage=${test.classes} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED jdk.jpackage.internal.AppImageFileTest
- */
 public class AppImageFileTest {
 
     @Rule
diff --git a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ApplicationLayoutTest.java b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java
similarity index 87%
rename from test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ApplicationLayoutTest.java
rename to test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java
index ca23ec413b9..b047a6d64d7 100644
--- a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ApplicationLayoutTest.java
+++ b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,12 +32,6 @@
 import static org.junit.Assert.assertTrue;
 
 
-/*
- * @test
- * @modules jdk.jpackage
- * @compile --patch-module jdk.jpackage=${test.src} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED ApplicationLayoutTest.java
- * @run junit/othervm --patch-module jdk.jpackage=${test.classes} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED jdk.jpackage.internal.ApplicationLayoutTest
- */
 public class ApplicationLayoutTest {
 
     @Rule
diff --git a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/CompareDottedVersionTest.java b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/CompareDottedVersionTest.java
similarity index 88%
rename from test/jdk/tools/jpackage/junit/jdk/jpackage/internal/CompareDottedVersionTest.java
rename to test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/CompareDottedVersionTest.java
index a035eb1c1c8..aef0092748a 100644
--- a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/CompareDottedVersionTest.java
+++ b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/CompareDottedVersionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,12 +31,6 @@
 import org.junit.runners.Parameterized.Parameters;
 import static org.junit.Assert.assertEquals;
 
-/*
- * @test
- * @modules jdk.jpackage
- * @compile --patch-module jdk.jpackage=${test.src} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED CompareDottedVersionTest.java
- * @run junit/othervm --patch-module jdk.jpackage=${test.classes} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED jdk.jpackage.internal.CompareDottedVersionTest
- */
 @RunWith(Parameterized.class)
 public class CompareDottedVersionTest {
 
diff --git a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DeployParamsTest.java b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java
similarity index 89%
rename from test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DeployParamsTest.java
rename to test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java
index 986d1f2a795..53fe04509b0 100644
--- a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DeployParamsTest.java
+++ b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,13 +32,6 @@
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 
-/*
- * @test
- * @summary Test for JDK-8211285
- * @modules jdk.jpackage
- * @compile --patch-module jdk.jpackage=${test.src} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED DeployParamsTest.java
- * @run junit/othervm --patch-module jdk.jpackage=${test.classes} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED jdk.jpackage.internal.DeployParamsTest
- */
 public class DeployParamsTest {
 
     @Rule
diff --git a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DottedVersionTest.java b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java
similarity index 88%
rename from test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DottedVersionTest.java
rename to test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java
index 67fbc7a89c3..d924611b4ae 100644
--- a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DottedVersionTest.java
+++ b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,12 +34,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-/*
- * @test
- * @modules jdk.jpackage
- * @compile --patch-module jdk.jpackage=${test.src} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED DottedVersionTest.java
- * @run junit/othervm --patch-module jdk.jpackage=${test.classes} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED jdk.jpackage.internal.DottedVersionTest
- */
 @RunWith(Parameterized.class)
 public class DottedVersionTest {
 
diff --git a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/EnquoterTest.java b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/EnquoterTest.java
similarity index 80%
rename from test/jdk/tools/jpackage/junit/jdk/jpackage/internal/EnquoterTest.java
rename to test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/EnquoterTest.java
index 69d89924180..7d58dd483c8 100644
--- a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/EnquoterTest.java
+++ b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/EnquoterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,6 @@
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
-/*
- * @test
- * @modules jdk.jpackage
- * @compile --patch-module jdk.jpackage=${test.src} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED EnquoterTest.java
- * @run junit/othervm --patch-module jdk.jpackage=${test.classes} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED jdk.jpackage.internal.EnquoterTest
- */
 public class EnquoterTest {
 
     @Test
diff --git a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/InvalidDottedVersionTest.java b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/InvalidDottedVersionTest.java
similarity index 81%
rename from test/jdk/tools/jpackage/junit/jdk/jpackage/internal/InvalidDottedVersionTest.java
rename to test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/InvalidDottedVersionTest.java
index e79cfe6b5c0..b0b866e41fb 100644
--- a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/InvalidDottedVersionTest.java
+++ b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/InvalidDottedVersionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,12 +32,6 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-/*
- * @test
- * @modules jdk.jpackage
- * @compile --patch-module jdk.jpackage=${test.src} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED InvalidDottedVersionTest.java
- * @run junit/othervm --patch-module jdk.jpackage=${test.classes} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED jdk.jpackage.internal.InvalidDottedVersionTest
- */
 @RunWith(Parameterized.class)
 public class InvalidDottedVersionTest {
 
diff --git a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/OverridableResourceTest.java b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java
similarity index 95%
rename from test/jdk/tools/jpackage/junit/jdk/jpackage/internal/OverridableResourceTest.java
rename to test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java
index 025f74eb6b4..02bb56c7d7f 100644
--- a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/OverridableResourceTest.java
+++ b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java
@@ -46,12 +46,6 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-/*
- * @test
- * @modules jdk.jpackage
- * @compile --patch-module jdk.jpackage=${test.src} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED OverridableResourceTest.java
- * @run junit/othervm --patch-module jdk.jpackage=${test.classes} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED jdk.jpackage.internal.OverridableResourceTest
- */
 public class OverridableResourceTest {
 
     @Rule
diff --git a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PathGroupTest.java b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/PathGroupTest.java
similarity index 95%
rename from test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PathGroupTest.java
rename to test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/PathGroupTest.java
index 6d2d3883d30..c14bdf3cb60 100644
--- a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PathGroupTest.java
+++ b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/PathGroupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,12 +47,6 @@
 import org.junit.rules.TemporaryFolder;
 
 
-/*
- * @test
- * @modules jdk.jpackage
- * @compile --patch-module jdk.jpackage=${test.src} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED PathGroupTest.java
- * @run junit/othervm --patch-module jdk.jpackage=${test.classes} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED jdk.jpackage.internal.PathGroupTest
- */
 public class PathGroupTest {
 
     @Rule
diff --git a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PlatformVersionTest.java b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/PlatformVersionTest.java
similarity index 90%
rename from test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PlatformVersionTest.java
rename to test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/PlatformVersionTest.java
index 46af4a6c289..b17a98a1783 100644
--- a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PlatformVersionTest.java
+++ b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/PlatformVersionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,12 +37,6 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-/*
- * @test
- * @modules jdk.jpackage
- * @compile --patch-module jdk.jpackage=${test.src} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED PlatformVersionTest.java
- * @run junit/othervm --patch-module jdk.jpackage=${test.classes} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED jdk.jpackage.internal.PlatformVersionTest
- */
 @RunWith(Parameterized.class)
 public class PlatformVersionTest {
 
diff --git a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ToolValidatorTest.java b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/ToolValidatorTest.java
similarity index 89%
rename from test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ToolValidatorTest.java
rename to test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/ToolValidatorTest.java
index 0aa104ced3a..eaddbb9eaa9 100644
--- a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ToolValidatorTest.java
+++ b/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/ToolValidatorTest.java
@@ -33,12 +33,6 @@
 import org.junit.Test;
 
 
-/*
- * @test
- * @modules jdk.jpackage
- * @compile --patch-module jdk.jpackage=${test.src} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED ToolValidatorTest.java
- * @run junit/othervm --patch-module jdk.jpackage=${test.classes} --add-reads jdk.jpackage=ALL-UNNAMED --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED jdk.jpackage.internal.ToolValidatorTest
- */
 public class ToolValidatorTest {
 
     @Test

From ec74194cb75afcaab2f77e8728391bb9104ccc73 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 20 Sep 2023 05:33:36 +0000
Subject: [PATCH 097/112] 8316546: Backout JDK-8315932: runtime/InvocationTests
 spend a lot of time on dependency verification

Reviewed-by: dholmes
---
 .../hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java | 1 -
 .../jtreg/runtime/InvocationTests/invocationOldCHATests.java     | 1 -
 .../jtreg/runtime/InvocationTests/invokeinterfaceTests.java      | 1 -
 .../jtreg/runtime/InvocationTests/invokespecialTests.java        | 1 -
 .../jtreg/runtime/InvocationTests/invokevirtualTests.java        | 1 -
 5 files changed, 5 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java b/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java
index 4375521a037..a5fe4b2a148 100644
--- a/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java
@@ -72,7 +72,6 @@ public static void runTest(String whichTests, String classFileVersion) throws Th
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xmx128M",
             "-Xcomp", "-XX:TieredStopAtLevel=1",
-            "-XX:MetaspaceSize=128K", "-XX:MaxMetaspaceSize=4M",
             "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
             whichTests, "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invocationOldCHATests.java b/test/hotspot/jtreg/runtime/InvocationTests/invocationOldCHATests.java
index 68acc6f0bb1..2d4c2a38b21 100644
--- a/test/hotspot/jtreg/runtime/InvocationTests/invocationOldCHATests.java
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invocationOldCHATests.java
@@ -69,7 +69,6 @@ public static void runTest(String whichTests, String classFileVersion) throws Th
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xmx128M",
             "-Xcomp", "-XX:+UnlockDiagnosticVMOptions", "-XX:-UseVtableBasedCHA",
-            "-XX:MetaspaceSize=128K", "-XX:MaxMetaspaceSize=4M",
             "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
             whichTests, "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java
index 7113cb87613..9d8a164637e 100644
--- a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java
@@ -75,7 +75,6 @@ public static void runTest(String classFileVersion, String option) throws Throwa
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xmx128M", option,
             "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
-            "-XX:MetaspaceSize=128K", "-XX:MaxMetaspaceSize=4M",
             "invokeinterface.Generator", "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         try {
diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java b/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java
index 5f5d64060ec..564f83d822e 100644
--- a/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java
@@ -72,7 +72,6 @@ public static void runTest(String classFileVersion, String option) throws Throwa
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xmx128M", option,
             "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
-            "-XX:MetaspaceSize=128K", "-XX:MaxMetaspaceSize=4M",
             "invokespecial.Generator", "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         try {
diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java b/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java
index f5f700e9fd6..9cc19b6081c 100644
--- a/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java
@@ -72,7 +72,6 @@ public static void runTest(String classFileVersion, String option) throws Throwa
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xmx128M", option,
             "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
-            "-XX:MetaspaceSize=128K", "-XX:MaxMetaspaceSize=4M",
             "invokevirtual.Generator", "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         try {

From e1870d360e05c372e672b519d7de2a60c333675b Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 20 Sep 2023 09:08:52 +0000
Subject: [PATCH 098/112] 8316411:
 compiler/compilercontrol/TestConflictInlineCommands.java fails intermittent
 with force inline by CompileCommand missing

Reviewed-by: mdoerr, chagedorn
---
 .../compiler/compilercontrol/TestConflictInlineCommands.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/hotspot/jtreg/compiler/compilercontrol/TestConflictInlineCommands.java b/test/hotspot/jtreg/compiler/compilercontrol/TestConflictInlineCommands.java
index dc4aefcca16..2b33cbb5cef 100644
--- a/test/hotspot/jtreg/compiler/compilercontrol/TestConflictInlineCommands.java
+++ b/test/hotspot/jtreg/compiler/compilercontrol/TestConflictInlineCommands.java
@@ -52,6 +52,7 @@ public static void main(String[] args) throws Exception {
         analyzer.shouldNotContain("force inline by CompileCommand");
 
         pb = ProcessTools.createJavaProcessBuilder(
+                "-Xbatch",
                 "-XX:CompileCommand=dontinline,*TestConflictInlineCommands::*caller",
                 "-XX:CompileCommand=inline,*TestConflictInlineCommands::caller",
                 "-XX:CompileCommand=quiet", "-XX:CompileCommand=compileonly,*Launcher::main",
@@ -77,6 +78,9 @@ public static void main(String[] args) {
                     sum += caller(i, 0);
                 }
             }
+            System.out.println("sum is:" + sum);
+            System.out.flush();
+            System.err.flush();
         }
     }
 }

From b275bdd9b55b567cfe60c389d5ef8b70615928f4 Mon Sep 17 00:00:00 2001
From: Tim Prinzing <tprinzing@openjdk.org>
Date: Wed, 20 Sep 2023 12:34:08 +0000
Subject: [PATCH 099/112] 8308995: Update Network IO JFR events to be static
 mirror events

Reviewed-by: egahlin, alanb
---
 make/test/BuildMicrobenchmark.gmk             |   3 +-
 .../share/classes/java/net/Socket.java        |  38 +++-
 .../jdk/internal/event/SocketReadEvent.java   | 134 ++++++++++++
 .../jdk/internal/event/SocketWriteEvent.java  | 126 +++++++++++
 .../classes/sun/nio/ch/SocketChannelImpl.java |  63 +++++-
 .../jdk/jfr/events/EventConfigurations.java   |   2 -
 .../jdk/jfr/events/SocketReadEvent.java       |  10 +-
 .../jdk/jfr/events/SocketWriteEvent.java      |  10 +-
 .../jfr/internal/instrument/JDKEvents.java    |   9 +-
 .../SocketChannelImplInstrumentor.java        | 201 ------------------
 .../SocketInputStreamInstrumentor.java        |  76 -------
 .../SocketOutputStreamInstrumentor.java       |  75 -------
 .../bench/java/net/SocketEventOverhead.java   | 167 +++++++++++++++
 13 files changed, 527 insertions(+), 387 deletions(-)
 create mode 100644 src/java.base/share/classes/jdk/internal/event/SocketReadEvent.java
 create mode 100644 src/java.base/share/classes/jdk/internal/event/SocketWriteEvent.java
 delete mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketChannelImplInstrumentor.java
 delete mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketInputStreamInstrumentor.java
 delete mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketOutputStreamInstrumentor.java
 create mode 100644 test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java

diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk
index e4d6ebc9a52..0369b4e0bb3 100644
--- a/make/test/BuildMicrobenchmark.gmk
+++ b/make/test/BuildMicrobenchmark.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -105,6 +105,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
         --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.vm=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.event=ALL-UNNAMED \
         --enable-preview, \
     JAVA_FLAGS := --add-modules jdk.unsupported --limit-modules java.management \
         --add-exports java.base/jdk.internal.vm=ALL-UNNAMED \
diff --git a/src/java.base/share/classes/java/net/Socket.java b/src/java.base/share/classes/java/net/Socket.java
index 82a7a42badf..ada2073c408 100644
--- a/src/java.base/share/classes/java/net/Socket.java
+++ b/src/java.base/share/classes/java/net/Socket.java
@@ -25,6 +25,8 @@
 
 package java.net;
 
+import jdk.internal.event.SocketReadEvent;
+import jdk.internal.event.SocketWriteEvent;
 import sun.security.util.SecurityConstants;
 
 import java.io.InputStream;
@@ -1073,9 +1075,6 @@ public InputStream getInputStream() throws IOException {
     /**
      * An InputStream that delegates read/available operations to an underlying
      * input stream. The close method is overridden to close the Socket.
-     *
-     * This class is instrumented by Java Flight Recorder (JFR) to get socket
-     * I/O events.
      */
     private static class SocketInputStream extends InputStream {
         private final Socket parent;
@@ -1092,6 +1091,16 @@ public int read() throws IOException {
         }
         @Override
         public int read(byte[] b, int off, int len) throws IOException {
+            if (!SocketReadEvent.enabled()) {
+                return implRead(b, off, len);
+            }
+            long start = SocketReadEvent.timestamp();
+            int nbytes = implRead(b, off, len);
+            SocketReadEvent.offer(start, nbytes, parent.getRemoteSocketAddress(), getSoTimeout());
+            return nbytes;
+        }
+
+        private int implRead(byte[] b, int off, int len) throws IOException {
             try {
                 return in.read(b, off, len);
             } catch (SocketTimeoutException e) {
@@ -1105,6 +1114,16 @@ public int read(byte[] b, int off, int len) throws IOException {
                 throw e;
             }
         }
+
+        private int getSoTimeout() {
+            try {
+                return parent.getSoTimeout();
+            } catch (SocketException e) {
+                // ignored - avoiding exceptions in jfr event data gathering
+            }
+            return 0;
+        }
+
         @Override
         public int available() throws IOException {
             return in.available();
@@ -1169,9 +1188,6 @@ public OutputStream getOutputStream() throws IOException {
     /**
      * An OutputStream that delegates write operations to an underlying output
      * stream. The close method is overridden to close the Socket.
-     *
-     * This class is instrumented by Java Flight Recorder (JFR) to get socket
-     * I/O events.
      */
     private static class SocketOutputStream extends OutputStream {
         private final Socket parent;
@@ -1187,6 +1203,16 @@ public void write(int b) throws IOException {
         }
         @Override
         public void write(byte[] b, int off, int len) throws IOException {
+            if (!SocketWriteEvent.enabled()) {
+                implWrite(b, off, len);
+                return;
+            }
+            long start = SocketWriteEvent.timestamp();
+            implWrite(b, off, len);
+            SocketWriteEvent.offer(start, len, parent.getRemoteSocketAddress());
+        }
+
+        private void implWrite(byte[] b, int off, int len) throws IOException {
             try {
                 out.write(b, off, len);
             } catch (InterruptedIOException e) {
diff --git a/src/java.base/share/classes/jdk/internal/event/SocketReadEvent.java b/src/java.base/share/classes/jdk/internal/event/SocketReadEvent.java
new file mode 100644
index 00000000000..8f9b6ac5710
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/event/SocketReadEvent.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.event;
+
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.net.UnixDomainSocketAddress;
+
+/**
+ * A JFR event for socket read operations.  This event is mirrored in
+ * {@code jdk.jfr.events.SocketReadEvent } where the metadata for the event is
+ * provided with annotations.  Some of the methods are replaced by generated
+ * methods when jfr is enabled.  Note that the order of the arguments of the
+ * {@link #commit(long, long, String, String, int, long, long, boolean)} method
+ * must be the same as the order of the fields.
+ */
+public class SocketReadEvent extends Event {
+
+    // THE ORDER OF THE FOLLOWING FIELDS IS IMPORTANT!
+    // The order must match the argument order of the generated commit method.
+    public String host;
+    public String address;
+    public int port;
+    public long timeout;
+    public long bytesRead;
+    public boolean endOfStream;
+
+    /**
+     * Actually commit a socket read event.  The implementation
+     * of this method is generated automatically if jfr is enabled.
+     * The order of the fields must be the same as the parameters in this method.
+     * {@code commit(..., String, String, int, long, long, boolean)}
+     *
+     * @param start     timestamp of the start of the operation
+     * @param duration  time in nanoseconds to complete the operation
+     * @param host      remote host of the transfer
+     * @param address   remote address of the transfer
+     * @param port      remote port of the transfer
+     * @param timeout   timeout setting for the read
+     * @param bytes     number of bytes that were transferred
+     * @param endOfStream  has the end of the stream been reached
+     */
+    public static void commit(long start, long duration, String host, String address, int port, long timeout, long bytes, boolean endOfStream) {
+        // Generated by JFR
+    }
+
+    /**
+     * Determine if an event should be emitted.  The duration of the operation
+     * must exceed some threshold in order to commit the event.  The implementation
+     * of this method is generated automatically if jfr is enabled.
+     *
+     * @param duration  time in nanoseconds to complete the operation
+     * @return  true if the event should be commited
+     */
+    public static boolean shouldCommit(long duration) {
+        // Generated by JFR
+        return false;
+    }
+
+    /**
+     * Determine if this kind of event is enabled.  The implementation
+     * of this method is generated automatically if jfr is enabled.
+     *
+     * @return true if socket read events are enabled, false otherwise
+     */
+    public static boolean enabled() {
+        // Generated by JFR
+        return false;
+    }
+
+    /**
+     * Fetch the current timestamp in nanoseconds.  This method is used
+     * to determine the start and end of an operation.  The implementation
+     * of this method is generated automatically if jfr is enabled.
+     *
+     * @return  the current timestamp value
+     */
+    public static long timestamp() {
+        // Generated by JFR
+        return 0L;
+    }
+
+    /**
+     * Helper method to offer the data needed to potentially commit an event.
+     * The duration of the operation is computed using the current
+     * timestamp and the given start time.  If the duration is meets
+     * or exceeds the configured value (determined by calling the generated method
+     * {@link #shouldCommit(long)}), an event will be emitted by calling
+     * {@link #commit(long, long, String, String, int, long, long, boolean)}.
+     *
+     * @param start  the start time
+     * @param nbytes  how many bytes were transferred
+     * @param remote  the address of the remote socket
+     * @param timeout  maximum time to wait
+     */
+    public static void offer(long start, long nbytes, SocketAddress remote, long timeout) {
+        long duration = timestamp() - start;
+        if (shouldCommit(duration)) {
+            boolean eof = nbytes < 0 ? true : false;
+            nbytes = nbytes < 0 ? 0 : nbytes;
+            if (remote instanceof InetSocketAddress isa) {
+                commit(start, duration, isa.getHostString(), isa.getAddress().getHostAddress(), isa.getPort(), timeout, nbytes, eof);
+            } else if (remote instanceof UnixDomainSocketAddress udsa) {
+                String path = "[" + udsa.getPath().toString() + "]";
+                commit(start, duration, "Unix domain socket", path, 0, timeout, nbytes, eof);
+            }
+        }
+    }
+
+}
diff --git a/src/java.base/share/classes/jdk/internal/event/SocketWriteEvent.java b/src/java.base/share/classes/jdk/internal/event/SocketWriteEvent.java
new file mode 100644
index 00000000000..4fba69d3efe
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/event/SocketWriteEvent.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.event;
+
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.net.UnixDomainSocketAddress;
+
+/**
+ * A JFR event for socket write operations.  This event is mirrored in
+ * {@code jdk.jfr.events.SocketWriteEvent } where the metadata for the event is
+ * provided with annotations.  Some of the methods are replaced by generated
+ * methods when jfr is enabled.  Note that the order of the arguments of the
+ * {@link #commit(long, long, String, String, int, long)} method
+ * must be the same as the order of the fields.
+ */
+public class SocketWriteEvent extends Event {
+
+    // THE ORDER OF THE FOLLOWING FIELDS IS IMPORTANT!
+    // The order must match the argument order of the generated commit method.
+    public String host;
+    public String address;
+    public int port;
+    public long bytesWritten;
+
+    /**
+     * Actually commit a socket write event.  This is generated automatically.
+     * The order of the fields must be the same as the parameters in this method.
+     * {@code commit(..., String, String, int, long)}
+     *
+     * @param start     timestamp of the start of the operation
+     * @param duration  time in nanoseconds to complete the operation
+     * @param host      remote host of the transfer
+     * @param address   remote address of the transfer
+     * @param port      remote port of the transfer
+     * @param bytes     number of bytes that were transferred
+     */
+    public static void commit(long start, long duration, String host, String address, int port, long bytes) {
+        // Generated by JFR
+    }
+
+    /**
+     * Determine if an event should be emitted.  The duration of the operation
+     * must exceed some threshold in order to commit the event.  The implementation
+     * of this method is generated automatically if jfr is enabled.
+     *
+     * @param duration  time in nanoseconds to complete the operation
+     * @return  true if the event should be commited
+     */
+    public static boolean shouldCommit(long duration) {
+        // Generated by JFR
+        return false;
+    }
+
+    /**
+     * Determine if this kind of event is enabled.  The implementation
+     * of this method is generated automatically if jfr is enabled.
+     *
+     * @return true if socket write events are enabled, false otherwise
+     */
+    public static boolean enabled() {
+        // Generated by JFR
+        return false;
+    }
+
+    /**
+     * Fetch the current timestamp in nanoseconds.  This method is used
+     * to determine the start and end of an operation.  The implementation
+     * of this method is generated automatically if jfr is enabled.
+     *
+     * @return  the current timestamp value
+     */
+    public static long timestamp() {
+        // Generated by JFR
+        return 0L;
+    }
+
+    /**
+     * Helper method to offer the data needed to potentially commit an event.
+     * The duration of the operation is computed using the current
+     * timestamp and the given start time.  If the duration is meets
+     * or exceeds the configured value (determined by calling the generated method
+     * {@link #shouldCommit(long)}), an event will be emitted by calling
+     * {@link #commit(long, long, String, String, int, long)}.
+     *
+     * @param start  the start time
+     * @param bytesWritten  how many bytes were sent
+     * @param remote  the address of the remote socket being written to
+     */
+    public static void offer(long start, long bytesWritten, SocketAddress remote) {
+        long duration = timestamp() - start;
+        if (shouldCommit(duration)) {
+            long bytes = bytesWritten < 0 ? 0 : bytesWritten;
+            if (remote instanceof InetSocketAddress isa) {
+                commit(start, duration, isa.getHostString(), isa.getAddress().getHostAddress(), isa.getPort(), bytes);
+            } else if (remote instanceof UnixDomainSocketAddress udsa) {
+                String path = "[" + udsa.getPath().toString() + "]";
+                commit(start, duration, "Unix domain socket", path, 0, bytes);
+            }
+        }
+    }
+}
diff --git a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
index e002e35ce8d..6c65a964a65 100644
--- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
@@ -59,6 +59,8 @@
 import static java.net.StandardProtocolFamily.INET6;
 import static java.net.StandardProtocolFamily.UNIX;
 
+import jdk.internal.event.SocketReadEvent;
+import jdk.internal.event.SocketWriteEvent;
 import sun.net.ConnectionResetException;
 import sun.net.NetHooks;
 import sun.net.ext.ExtendedSocketOptions;
@@ -401,8 +403,7 @@ private void throwConnectionReset() throws SocketException {
         throw new SocketException("Connection reset");
     }
 
-    @Override
-    public int read(ByteBuffer buf) throws IOException {
+    private int implRead(ByteBuffer buf) throws IOException {
         Objects.requireNonNull(buf);
 
         readLock.lock();
@@ -443,8 +444,7 @@ public int read(ByteBuffer buf) throws IOException {
         }
     }
 
-    @Override
-    public long read(ByteBuffer[] dsts, int offset, int length)
+    private long implRead(ByteBuffer[] dsts, int offset, int length)
         throws IOException
     {
         Objects.checkFromIndexSize(offset, length, dsts.length);
@@ -487,6 +487,31 @@ public long read(ByteBuffer[] dsts, int offset, int length)
         }
     }
 
+    @Override
+    public int read(ByteBuffer buf) throws IOException {
+        if (!SocketReadEvent.enabled()) {
+            return implRead(buf);
+        }
+        long start = SocketReadEvent.timestamp();
+        int nbytes = implRead(buf);
+        SocketReadEvent.offer(start, nbytes, remoteAddress(), 0);
+        return nbytes;
+    }
+
+
+    @Override
+    public long read(ByteBuffer[] dsts, int offset, int length)
+        throws IOException
+    {
+        if (!SocketReadEvent.enabled()) {
+            return implRead(dsts, offset, length);
+        }
+        long start = SocketReadEvent.timestamp();
+        long nbytes = implRead(dsts, offset, length);
+        SocketReadEvent.offer(start, nbytes, remoteAddress(), 0);
+        return nbytes;
+    }
+
     /**
      * Marks the beginning of a write operation that might block.
      *
@@ -528,8 +553,7 @@ private void endWrite(boolean blocking, boolean completed)
         }
     }
 
-    @Override
-    public int write(ByteBuffer buf) throws IOException {
+    private int implWrite(ByteBuffer buf) throws IOException {
         Objects.requireNonNull(buf);
         writeLock.lock();
         try {
@@ -557,8 +581,7 @@ public int write(ByteBuffer buf) throws IOException {
         }
     }
 
-    @Override
-    public long write(ByteBuffer[] srcs, int offset, int length)
+    private long implWrite(ByteBuffer[] srcs, int offset, int length)
         throws IOException
     {
         Objects.checkFromIndexSize(offset, length, srcs.length);
@@ -589,6 +612,30 @@ public long write(ByteBuffer[] srcs, int offset, int length)
         }
     }
 
+    @Override
+    public int write(ByteBuffer buf) throws IOException {
+        if (!SocketWriteEvent.enabled()) {
+            return implWrite(buf);
+        }
+        long start = SocketWriteEvent.timestamp();
+        int nbytes = implWrite(buf);
+        SocketWriteEvent.offer(start, nbytes, remoteAddress());
+        return nbytes;
+    }
+
+    @Override
+    public long write(ByteBuffer[] srcs, int offset, int length)
+        throws IOException
+    {
+        if (!SocketWriteEvent.enabled()) {
+            return implWrite(srcs, offset, length);
+        }
+        long start = SocketWriteEvent.timestamp();
+        long nbytes = implWrite(srcs, offset, length);
+        SocketWriteEvent.offer(start, nbytes, remoteAddress());
+        return nbytes;
+    }
+
     /**
      * Writes a byte of out of band data.
      */
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/EventConfigurations.java b/src/jdk.jfr/share/classes/jdk/jfr/events/EventConfigurations.java
index 383feaee73e..8853c60ce45 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/EventConfigurations.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/EventConfigurations.java
@@ -28,8 +28,6 @@
 import jdk.jfr.internal.event.EventConfiguration;
 
 public final class EventConfigurations {
-    public static final EventConfiguration SOCKET_READ = JVMSupport.getConfiguration(SocketReadEvent.class);
-    public static final EventConfiguration SOCKET_WRITE = JVMSupport.getConfiguration(SocketWriteEvent.class);
     public static final EventConfiguration FILE_READ = JVMSupport.getConfiguration(FileReadEvent.class);
     public static final EventConfiguration FILE_WRITE = JVMSupport.getConfiguration(FileWriteEvent.class);
     public static final EventConfiguration FILE_FORCE = JVMSupport.getConfiguration(FileForceEvent.class);
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java
index 8daf4726f67..7ef63765eec 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,17 +31,16 @@
 import jdk.jfr.DataAmount;
 import jdk.jfr.Name;
 import jdk.jfr.Timespan;
+import jdk.jfr.internal.MirrorEvent;
 import jdk.jfr.internal.Type;
 
 @Name(Type.EVENT_NAME_PREFIX + "SocketRead")
 @Label("Socket Read")
 @Category("Java Application")
 @Description("Reading data from a socket")
+@MirrorEvent(className = "jdk.internal.event.SocketReadEvent")
 public final class SocketReadEvent extends AbstractJDKEvent {
 
-    // The order of these fields must be the same as the parameters in
-    // commit(..., String, String, int, long, long, boolean)
-
     @Label("Remote Host")
     public String host;
 
@@ -64,7 +63,4 @@ public final class SocketReadEvent extends AbstractJDKEvent {
     @Description("If end of stream was reached")
     public boolean endOfStream;
 
-    public static void commit(long start, long duration, String host, String address, int port, long timeout, long byteRead, boolean endOfStream) {
-        // Generated
-    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java
index 1ba40d29146..6e776b8871d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,16 @@
 import jdk.jfr.Label;
 import jdk.jfr.DataAmount;
 import jdk.jfr.Name;
+import jdk.jfr.internal.MirrorEvent;
 import jdk.jfr.internal.Type;
 
 @Name(Type.EVENT_NAME_PREFIX + "SocketWrite")
 @Label("Socket Write")
 @Category("Java Application")
 @Description("Writing data to a socket")
+@MirrorEvent(className = "jdk.internal.event.SocketWriteEvent")
 public final class SocketWriteEvent extends AbstractJDKEvent {
 
-    // The order of these fields must be the same as the parameters in
-    // commit(..., String, String, int, long)
-
     @Label("Remote Host")
     public String host;
 
@@ -55,7 +54,4 @@ public final class SocketWriteEvent extends AbstractJDKEvent {
     @DataAmount
     public long bytesWritten;
 
-    public static void commit(long start, long duration, String host, String address, int port, long bytes) {
-        // Generated
-    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
index 9405dfff8e0..6a5981073c5 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
@@ -75,6 +75,8 @@ public final class JDKEvents {
         ProcessStartEvent.class,
         SecurityPropertyModificationEvent.class,
         SecurityProviderServiceEvent.class,
+        SocketReadEvent.class,
+        SocketWriteEvent.class,
         ThreadSleepEvent.class,
         TLSHandshakeEvent.class,
         VirtualThreadStartEvent.class,
@@ -100,6 +102,8 @@ public final class JDKEvents {
         jdk.internal.event.ProcessStartEvent.class,
         jdk.internal.event.SecurityPropertyModificationEvent.class,
         jdk.internal.event.SecurityProviderServiceEvent.class,
+        jdk.internal.event.SocketReadEvent.class,
+        jdk.internal.event.SocketWriteEvent.class,
         jdk.internal.event.ThreadSleepEvent.class,
         jdk.internal.event.TLSHandshakeEvent.class,
         jdk.internal.event.VirtualThreadStartEvent.class,
@@ -118,10 +122,7 @@ public final class JDKEvents {
         FileInputStreamInstrumentor.class,
         FileOutputStreamInstrumentor.class,
         RandomAccessFileInstrumentor.class,
-        FileChannelImplInstrumentor.class,
-        SocketInputStreamInstrumentor.class,
-        SocketOutputStreamInstrumentor.class,
-        SocketChannelImplInstrumentor.class
+        FileChannelImplInstrumentor.class
     };
 
     private static final Class<?>[] targetClasses = new Class<?>[instrumentationClasses.length];
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketChannelImplInstrumentor.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketChannelImplInstrumentor.java
deleted file mode 100644
index b911ab1fd50..00000000000
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketChannelImplInstrumentor.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.internal.instrument;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.net.UnixDomainSocketAddress;
-import java.nio.ByteBuffer;
-import jdk.jfr.events.EventConfigurations;
-import jdk.jfr.events.SocketReadEvent;
-import jdk.jfr.events.SocketWriteEvent;
-import jdk.jfr.internal.event.EventConfiguration;
-
-/**
- * See {@link JITracer} for an explanation of this code.
- */
-@JIInstrumentationTarget("sun.nio.ch.SocketChannelImpl")
-final class SocketChannelImplInstrumentor {
-
-    private SocketChannelImplInstrumentor() {
-    }
-
-    @JIInstrumentationMethod
-    public int read(ByteBuffer dst) throws IOException {
-        EventConfiguration eventConfiguration = EventConfigurations.SOCKET_READ;
-        if (!eventConfiguration.isEnabled()) {
-            return read(dst);
-        }
-        int bytesRead = 0;
-        long start  = 0;
-        try {
-            start = EventConfiguration.timestamp();;
-            bytesRead = read(dst);
-        } finally {
-            long duration = EventConfiguration.timestamp() - start;
-            if (eventConfiguration.shouldCommit(duration))  {
-                SocketAddress remoteAddress = getRemoteAddress();
-                if (remoteAddress instanceof InetSocketAddress isa) {
-                    String hostString  = isa.getAddress().toString();
-                    int delimiterIndex = hostString.lastIndexOf('/');
-
-                    String host = hostString.substring(0, delimiterIndex);
-                    String address = hostString.substring(delimiterIndex + 1);
-                    int port = isa.getPort();
-                    if (bytesRead < 0) {
-                        SocketReadEvent.commit(start, duration, host, address, port, 0, 0L, true);
-                    } else {
-                        SocketReadEvent.commit(start, duration, host, address, port, 0, bytesRead, false);
-                    }
-                } else {
-                    UnixDomainSocketAddress udsa = (UnixDomainSocketAddress) remoteAddress;
-                    String path = "[" + udsa.getPath().toString() + "]";
-                    if (bytesRead < 0) {
-                        SocketReadEvent.commit(start, duration, "Unix domain socket", path, 0, 0, 0L, true);
-                    } else {
-                        SocketReadEvent.commit(start, duration, "Unix domain socket", path, 0, 0, bytesRead, false);
-                    }
-                }
-            }
-        }
-        return bytesRead;
-    }
-
-    @JIInstrumentationMethod
-    public long read(ByteBuffer[] dsts, int offset, int length) throws IOException {
-        EventConfiguration eventConfiguration = EventConfigurations.SOCKET_READ;
-        if (!eventConfiguration.isEnabled()) {
-            return read(dsts, offset, length);
-        }
-        long bytesRead = 0;
-        long start = 0;
-        try {
-            start = EventConfiguration.timestamp();
-            bytesRead = read(dsts, offset, length);
-        } finally {
-            long duration = EventConfiguration.timestamp() - start;
-            if (eventConfiguration.shouldCommit(duration)) {
-                SocketAddress remoteAddress = getRemoteAddress();
-                if (remoteAddress instanceof InetSocketAddress isa) {
-                    String hostString  = isa.getAddress().toString();
-                    int delimiterIndex = hostString.lastIndexOf('/');
-
-                    String host = hostString.substring(0, delimiterIndex);
-                    String address = hostString.substring(delimiterIndex + 1);
-                    int port = isa.getPort();
-                    if (bytesRead < 0) {
-                        SocketReadEvent.commit(start, duration, host, address, port, 0, 0L, true);
-                    } else {
-                        SocketReadEvent.commit(start, duration, host, address, port, 0, bytesRead, false);
-                    }
-                } else {
-                    UnixDomainSocketAddress udsa = (UnixDomainSocketAddress) remoteAddress;
-                    String path = "[" + udsa.getPath().toString() + "]";
-                    if (bytesRead < 0) {
-                        SocketReadEvent.commit(start, duration, "Unix domain socket", path, 0, 0, 0L, true);
-                    } else {
-                        SocketReadEvent.commit(start, duration, "Unix domain socket", path, 0, 0, bytesRead, false);
-                    }
-                }
-            }
-        }
-        return bytesRead;
-    }
-
-    @JIInstrumentationMethod
-    public int write(ByteBuffer buf) throws IOException {
-        EventConfiguration eventConfiguration = EventConfigurations.SOCKET_WRITE;
-        if (!eventConfiguration.isEnabled()) {
-            return write(buf);
-        }
-        int bytesWritten = 0;
-        long start = 0;
-        try {
-            start = EventConfiguration.timestamp();
-            bytesWritten = write(buf);
-        } finally {
-            long duration = EventConfiguration.timestamp() - start;
-            if (eventConfiguration.shouldCommit(duration)) {
-                long bytes = bytesWritten < 0 ? 0 : bytesWritten;
-                SocketAddress remoteAddress = getRemoteAddress();
-                if (remoteAddress instanceof InetSocketAddress isa) {
-                    String hostString  = isa.getAddress().toString();
-                    int delimiterIndex = hostString.lastIndexOf('/');
-
-                    String host = hostString.substring(0, delimiterIndex);
-                    String address = hostString.substring(delimiterIndex + 1);
-                    int port = isa.getPort();
-                    SocketWriteEvent.commit(start, duration, host, address, port, bytes);
-                } else {
-                    UnixDomainSocketAddress udsa = (UnixDomainSocketAddress) remoteAddress;
-                    String path = "[" + udsa.getPath().toString() + "]";
-                    SocketWriteEvent.commit(start, duration, "Unix domain socket", path, 0, bytes);
-                }
-            }
-        }
-        return bytesWritten;
-    }
-
-    public SocketAddress getRemoteAddress() throws IOException {
-        // gets replaced by call to instrumented class
-        return null;
-    }
-
-    @JIInstrumentationMethod
-    public long write(ByteBuffer[] srcs, int offset, int length) throws IOException {
-        EventConfiguration eventConfiguration = EventConfigurations.SOCKET_WRITE;
-        if (!eventConfiguration.isEnabled()) {
-            return write(srcs, offset, length);
-        }
-        long bytesWritten = 0;
-        long start = 0;
-        try {
-            start = EventConfiguration.timestamp();
-            bytesWritten = write(srcs, offset, length);
-        } finally {
-            long duration = EventConfiguration.timestamp() - start;
-            if (eventConfiguration.shouldCommit(duration)) {
-                long bytes = bytesWritten < 0 ? 0 : bytesWritten;
-                SocketAddress remoteAddress = getRemoteAddress();
-                if (remoteAddress instanceof InetSocketAddress isa) {
-                    String hostString  = isa.getAddress().toString();
-                    int delimiterIndex = hostString.lastIndexOf('/');
-
-                    String host = hostString.substring(0, delimiterIndex);
-                    String address = hostString.substring(delimiterIndex + 1);
-                    int port = isa.getPort();
-                    SocketWriteEvent.commit(start, duration, host, address, port, bytes);
-                } else {
-                    UnixDomainSocketAddress udsa = (UnixDomainSocketAddress) remoteAddress;
-                    String path = "[" + udsa.getPath().toString() + "]";
-                    SocketWriteEvent.commit(start, duration, "Unix domain socket", path, 0, bytes);
-                }
-            }
-        }
-        return bytesWritten;
-    }
-}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketInputStreamInstrumentor.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketInputStreamInstrumentor.java
deleted file mode 100644
index f0ced1df9be..00000000000
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketInputStreamInstrumentor.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.internal.instrument;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-
-import jdk.jfr.events.EventConfigurations;
-import jdk.jfr.events.SocketReadEvent;
-import jdk.jfr.internal.event.EventConfiguration;
-
-/**
- * See {@link JITracer} for an explanation of this code.
- */
-@JIInstrumentationTarget("java.net.Socket$SocketInputStream")
-final class SocketInputStreamInstrumentor {
-
-    private SocketInputStreamInstrumentor() {
-    }
-
-    @JIInstrumentationMethod
-    public int read(byte b[], int off, int length) throws IOException {
-        EventConfiguration eventConfiguration = EventConfigurations.SOCKET_READ;
-        if (!eventConfiguration.isEnabled()) {
-            return read(b, off, length);
-        }
-        int bytesRead = 0;
-        long start = 0;
-        try {
-            start = EventConfiguration.timestamp();
-            bytesRead = read(b, off, length);
-        } finally {
-            long duration = EventConfiguration.timestamp() - start;
-            if (eventConfiguration.shouldCommit(duration)) {
-                InetAddress remote = parent.getInetAddress();
-                String host = remote.getHostName();
-                String address = remote.getHostAddress();
-                int port = parent.getPort();
-                int timeout = parent.getSoTimeout();
-                if (bytesRead < 0) {
-                    SocketReadEvent.commit(start, duration, host, address, port, timeout, 0L, true);
-                } else {
-                    SocketReadEvent.commit(start, duration, host, address, port, timeout, bytesRead, false);
-                }
-            }
-        }
-        return bytesRead;
-    }
-
-    // private field in java.net.Socket$SocketInputStream
-    private Socket parent;
-}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketOutputStreamInstrumentor.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketOutputStreamInstrumentor.java
deleted file mode 100644
index d2752b2bbc1..00000000000
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketOutputStreamInstrumentor.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.internal.instrument;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-
-import jdk.jfr.events.EventConfigurations;
-import jdk.jfr.events.SocketWriteEvent;
-import jdk.jfr.internal.event.EventConfiguration;
-
-/**
- * See {@link JITracer} for an explanation of this code.
- */
-@JIInstrumentationTarget("java.net.Socket$SocketOutputStream")
-final class SocketOutputStreamInstrumentor {
-
-    private SocketOutputStreamInstrumentor() {
-    }
-
-    @JIInstrumentationMethod
-    public void write(byte b[], int off, int len) throws IOException {
-        EventConfiguration eventConfiguration = EventConfigurations.SOCKET_WRITE;
-        if (!eventConfiguration.isEnabled()) {
-            write(b, off, len);
-            return;
-        }
-        int bytesWritten = 0;
-        long start = 0;
-        try {
-            start = EventConfiguration.timestamp();
-            write(b, off, len);
-            bytesWritten = len;
-        } finally {
-            long duration = EventConfiguration.timestamp() - start;
-            if (eventConfiguration.shouldCommit(duration)) {
-                InetAddress remote = parent.getInetAddress();
-                SocketWriteEvent.commit(
-                        start,
-                        duration,
-                        remote.getHostName(),
-                        remote.getHostAddress(),
-                        parent.getPort(),
-                        bytesWritten);
-            }
-        }
-    }
-
-    // private field in java.net.Socket$SocketOutputStream
-    private Socket parent;
-}
diff --git a/test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java b/test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java
new file mode 100644
index 00000000000..e54b42cd6fe
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.openjdk.bench.java.net;
+
+import jdk.internal.event.SocketReadEvent;
+import jdk.internal.event.SocketWriteEvent;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Test the overhead of the handling jfr events SocketReadEvent and
+ * SocketWriteEvent without the latencies of the actual I/O code.
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Warmup(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
+@State(Scope.Thread)
+public class SocketEventOverhead {
+
+    @Fork(value = 1, jvmArgsAppend = {
+        "--add-exports",
+        "java.base/jdk.internal.event=ALL-UNNAMED" })
+    @Benchmark
+    public int socketWriteJFRDisabled(SkeletonFixture fixture) {
+        return fixture.write();
+    }
+
+    @Fork(value = 1, jvmArgsAppend = {
+        "--add-exports",
+        "java.base/jdk.internal.event=ALL-UNNAMED",
+        "-XX:StartFlightRecording:jdk.SocketWrite#enabled=false"})
+    @Benchmark
+    public int socketWriteJFREnabledEventDisabled(SkeletonFixture fixture) {
+        return fixture.write();
+    }
+
+    @Fork(value = 1, jvmArgsAppend = {
+        "--add-exports",
+        "java.base/jdk.internal.event=ALL-UNNAMED",
+        "-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=1s"})
+    @Benchmark
+    public int socketWriteJFREnabledEventNotEmitted(SkeletonFixture fixture) {
+        return fixture.write();
+    }
+
+    @Fork(value = 1, jvmArgsAppend = {
+        "--add-exports","java.base/jdk.internal.event=ALL-UNNAMED",
+        "-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=0ms,disk=false,jdk.SocketWrite#stackTrace=false"})
+    @Benchmark
+    public int socketWriteJFREnabledEventEmitted(SkeletonFixture fixture) {
+        return fixture.write();
+    }
+
+    @Fork(value = 1, jvmArgsAppend = {
+        "--add-exports",
+        "java.base/jdk.internal.event=ALL-UNNAMED" })
+    @Benchmark
+    public int socketReadJFRDisabled(SkeletonFixture fixture) {
+        return fixture.read();
+    }
+
+    @Fork(value = 1, jvmArgsAppend = {
+        "--add-exports",
+        "java.base/jdk.internal.event=ALL-UNNAMED",
+        "-XX:StartFlightRecording:jdk.SocketRead#enabled=false"})
+    @Benchmark
+    public int socketReadJFREnabledEventDisabled(SkeletonFixture fixture) {
+        return fixture.read();
+    }
+
+    @Fork(value = 1, jvmArgsAppend = {
+        "--add-exports",
+        "java.base/jdk.internal.event=ALL-UNNAMED",
+        "-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=1s"})
+    @Benchmark
+    public int socketReadJFREnabledEventNotEmitted(SkeletonFixture fixture) {
+        return fixture.read();
+    }
+
+    @Fork(value = 1, jvmArgsAppend = {
+        "--add-exports","java.base/jdk.internal.event=ALL-UNNAMED",
+        "-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=0ms,disk=false,jdk.SocketRead#stackTrace=false"})
+    @Benchmark
+    public int socketReadJFREnabledEventEmitted(SkeletonFixture fixture) {
+        return fixture.read();
+    }
+
+    /**
+     * Fixture with fake read/write operations that have only the JFR event
+     * boilerplate code for managing jfr events.  No actual transfer is done
+     * to eliminate the I/O portion and measure the overhead of JFR event
+     * handling in it's various states.
+     */
+    @State(Scope.Thread)
+    public static class SkeletonFixture {
+
+        private final InetSocketAddress remote = new InetSocketAddress("localhost",5000);
+
+        public SocketAddress getRemoteAddress() {
+            return remote;
+        }
+
+        public int write() {
+            if (! SocketWriteEvent.enabled()) {
+                return write0();
+            }
+            int nbytes = 0;
+            long start = SocketWriteEvent.timestamp();
+            try {
+                nbytes = write0();
+            } finally {
+                SocketWriteEvent.offer(start, nbytes, getRemoteAddress());
+            }
+            return nbytes;
+        }
+
+        private int write0() {
+            return 1024;
+        }
+
+        public int read() {
+            if (! SocketReadEvent.enabled()) {
+                return read0();
+            }
+            int nbytes = 0;
+            long start = SocketReadEvent.timestamp();
+            try {
+                nbytes = read0();
+            } finally {
+                SocketReadEvent.offer(start, nbytes, getRemoteAddress(), 0);
+            }
+            return nbytes;
+        }
+
+        private int read0() {
+            return 1024;
+        }
+    }
+}

From 242eeaea47a259cab4ad2d4f0e055959e9870b8d Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 20 Sep 2023 12:48:19 +0000
Subject: [PATCH 100/112] 8286757: adlc tries to build with /pathmap but
 without /experimental:deterministic

Reviewed-by: jwaters, ihse
---
 make/autoconf/flags-cflags.m4      | 1 +
 make/autoconf/spec.gmk.in          | 1 +
 make/hotspot/gensrc/GensrcAdlc.gmk | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 8655dfe41fb..cf7f4534c89 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -818,6 +818,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
             REPRODUCIBLE_CFLAGS=
         ]
     )
+    AC_SUBST(REPRODUCIBLE_CFLAGS)
   fi
 
   # Prevent the __FILE__ macro from generating absolute paths into the built
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index a3755f82a7c..1cead7d051d 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -424,6 +424,7 @@ LIBFFI_CFLAGS:=@LIBFFI_CFLAGS@
 ENABLE_LIBFFI_BUNDLING:=@ENABLE_LIBFFI_BUNDLING@
 LIBFFI_LIB_FILE:=@LIBFFI_LIB_FILE@
 FILE_MACRO_CFLAGS := @FILE_MACRO_CFLAGS@
+REPRODUCIBLE_CFLAGS := @REPRODUCIBLE_CFLAGS@
 BRANCH_PROTECTION_CFLAGS := @BRANCH_PROTECTION_CFLAGS@
 
 STATIC_LIBS_CFLAGS := @STATIC_LIBS_CFLAGS@
diff --git a/make/hotspot/gensrc/GensrcAdlc.gmk b/make/hotspot/gensrc/GensrcAdlc.gmk
index 427a0dfd34b..1b752bacc00 100644
--- a/make/hotspot/gensrc/GensrcAdlc.gmk
+++ b/make/hotspot/gensrc/GensrcAdlc.gmk
@@ -62,7 +62,7 @@ ifeq ($(call check-jvm-feature, compiler2), true)
   ADLC_CFLAGS += -I$(TOPDIR)/src/hotspot/share
 
   # Add file macro mappings
-  ADLC_CFLAGS += $(FILE_MACRO_CFLAGS)
+  ADLC_CFLAGS += $(FILE_MACRO_CFLAGS) $(REPRODUCIBLE_CFLAGS)
 
   ifeq ($(UBSAN_ENABLED), true)
     ADLC_CFLAGS += $(UBSAN_CFLAGS)

From e30e3564420c631f08ac3d613ab91c93227a00b3 Mon Sep 17 00:00:00 2001
From: Leo Korinth <lkorinth@openjdk.org>
Date: Wed, 20 Sep 2023 13:04:45 +0000
Subject: [PATCH 101/112] 8316461: Fix: make test outputs TEST SUCCESS after
 unsuccessful exit

Reviewed-by: ihse, erikj
---
 make/RunTests.gmk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 25dcdbb083d..75b19cbb2b3 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -862,8 +862,9 @@ define SetupRunJtregTestBody
 
   $$(eval $$(call SetupRunJtregTestCustom, $1))
 
-  clean-workdir-$1:
+  clean-outputdirs-$1:
 	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
+	$$(RM) -r $$($1_TEST_RESULTS_DIR)
 
   $1_COMMAND_LINE := \
       $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
@@ -909,7 +910,7 @@ define SetupRunJtregTestBody
         done
   endif
 
-  run-test-$1: pre-run-test clean-workdir-$1
+  run-test-$1: pre-run-test clean-outputdirs-$1
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR) \
@@ -946,9 +947,9 @@ define SetupRunJtregTestBody
 	  $$(eval $1_TOTAL := 1) \
 	)
 
-  $1: run-test-$1 parse-test-$1 clean-workdir-$1
+  $1: run-test-$1 parse-test-$1 clean-outputdirs-$1
 
-  TARGETS += $1 run-test-$1 parse-test-$1 clean-workdir-$1
+  TARGETS += $1 run-test-$1 parse-test-$1 clean-outputdirs-$1
   TEST_TARGETS += parse-test-$1
 
 endef

From c43ebd34afeab9ece9dee05f0da184a20e487a12 Mon Sep 17 00:00:00 2001
From: Alexander Zuev <kizune@openjdk.org>
Date: Wed, 20 Sep 2023 14:31:42 +0000
Subject: [PATCH 102/112] 8315981: Opensource five more random Swing tests

Reviewed-by: tr, azvegint
---
 .../4180943/bug4180943.java                   |  40 +++++++
 .../DefaultListModel/4466250/bug4466250.java  |  47 ++++++++
 .../4140619/bug4140619.java                   |  50 ++++++++
 .../4177723/bug4177723.java                   |  51 ++++++++
 .../swing/ImageIcon/4827074/bug4827074.java   | 109 ++++++++++++++++++
 5 files changed, 297 insertions(+)
 create mode 100644 test/jdk/javax/swing/DefaultListCellRenderer/4180943/bug4180943.java
 create mode 100644 test/jdk/javax/swing/DefaultListModel/4466250/bug4466250.java
 create mode 100644 test/jdk/javax/swing/DefaultListSelectionModel/4140619/bug4140619.java
 create mode 100644 test/jdk/javax/swing/DefaultListSelectionModel/4177723/bug4177723.java
 create mode 100644 test/jdk/javax/swing/ImageIcon/4827074/bug4827074.java

diff --git a/test/jdk/javax/swing/DefaultListCellRenderer/4180943/bug4180943.java b/test/jdk/javax/swing/DefaultListCellRenderer/4180943/bug4180943.java
new file mode 100644
index 00000000000..24a6257c155
--- /dev/null
+++ b/test/jdk/javax/swing/DefaultListCellRenderer/4180943/bug4180943.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4180943
+ * @summary Extra borders created by DefaultListCellRenderer
+ * @run main bug4180943
+ */
+
+import javax.swing.DefaultListCellRenderer;
+
+public class bug4180943 {
+    public static void main(String[] argv) {
+        DefaultListCellRenderer lcr1 = new DefaultListCellRenderer();
+        DefaultListCellRenderer lcr2 = new DefaultListCellRenderer();
+        if (lcr1.getBorder() != lcr2.getBorder()) {
+            throw new RuntimeException("Extra borders created by DefaultListCellRenderer");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/DefaultListModel/4466250/bug4466250.java b/test/jdk/javax/swing/DefaultListModel/4466250/bug4466250.java
new file mode 100644
index 00000000000..16c3899ea6d
--- /dev/null
+++ b/test/jdk/javax/swing/DefaultListModel/4466250/bug4466250.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4466250
+ * @summary DefaultListModel.removeRange does not throw IllegalArgumentException
+ * @run main bug4466250
+*/
+
+import javax.swing.DefaultListModel;
+import javax.swing.JLabel;
+
+public class bug4466250 {
+    public static void main(String[] args) {
+        DefaultListModel model = new DefaultListModel();
+        int size = 16;
+        for (int i = 0; i < size; i++ ) {
+            model.addElement(new JLabel("wow"));
+        }
+
+        try {
+            model.removeRange(3, 1);
+            throw new RuntimeException("IllegalArgumentException has not been thrown");
+        } catch (IllegalArgumentException e) {
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/DefaultListSelectionModel/4140619/bug4140619.java b/test/jdk/javax/swing/DefaultListSelectionModel/4140619/bug4140619.java
new file mode 100644
index 00000000000..3ea55270b7a
--- /dev/null
+++ b/test/jdk/javax/swing/DefaultListSelectionModel/4140619/bug4140619.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4140619
+ * @summary Breaks SINGLE_SELECTION in DefaultListSelectionModel.setLeadSelectionIndex()
+ * @run main bug4140619
+ */
+
+import javax.swing.DefaultListSelectionModel;
+import javax.swing.ListSelectionModel;
+
+public class bug4140619 {
+    public static void main(String[] args) {
+        DefaultListSelectionModel selection = new DefaultListSelectionModel();
+        selection.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        selection.setSelectionInterval(10, 10);
+        selection.removeSelectionInterval(10, 10);
+        selection.setLeadSelectionIndex(2);
+        selection.setLeadSelectionIndex(30);
+        selection.setLeadSelectionIndex(5);
+
+        if (selection.getMinSelectionIndex()!=5
+                || selection.getMaxSelectionIndex()!=5) {
+            throw new RuntimeException("DefaultListSelectionModel: breaks SINGLE_SELECTION "
+                    + "in setLeadSelectionIndex()");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/DefaultListSelectionModel/4177723/bug4177723.java b/test/jdk/javax/swing/DefaultListSelectionModel/4177723/bug4177723.java
new file mode 100644
index 00000000000..c247429dc19
--- /dev/null
+++ b/test/jdk/javax/swing/DefaultListSelectionModel/4177723/bug4177723.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4177723
+ * @summary ListSelectionEvents fired on model changes affecting JList selection
+ * @run main bug4177723
+ */
+
+import javax.swing.DefaultListModel;
+import javax.swing.JList;
+
+public class bug4177723 {
+    static int count = 0;
+
+    public static void main (String[] args) {
+        DefaultListModel model = new DefaultListModel();
+        for (int i = 0; i < 10; i++) {
+            model.addElement("item " + i);
+        }
+
+        JList list = new JList(model);
+        list.addListSelectionListener(e -> count++);
+
+        list.getSelectionModel().setSelectionInterval(3, 8);
+        model.removeRange(4, 7);
+        if (count != 2) {
+            throw new RuntimeException("ListSelectionEvent wasn't generated");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/ImageIcon/4827074/bug4827074.java b/test/jdk/javax/swing/ImageIcon/4827074/bug4827074.java
new file mode 100644
index 00000000000..44a80b52080
--- /dev/null
+++ b/test/jdk/javax/swing/ImageIcon/4827074/bug4827074.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4827074
+ * @summary ImageIcon serialization does not preload restored images
+ * @run main bug4827074
+ */
+
+import javax.swing.ImageIcon;
+import java.awt.Image;
+import java.awt.Panel;
+import java.awt.image.MemoryImageSource;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+public class bug4827074 extends Panel {
+
+    static ImageIcon testIcon = null;
+    private volatile static boolean passed = false;
+
+    public void init() {
+        testIcon = new TestImageIcon();
+        ImageIcon icon = saveAndLoad(testIcon);
+
+        if (!passed) {
+            throw new RuntimeException("Image was not loaded properly");
+        }
+    }
+
+    synchronized static void setPassed(boolean p) {
+        passed = p;
+    }
+
+    static ImageIcon saveAndLoad(ImageIcon ii) {
+        ImageIcon _ii = null;
+        try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ObjectOutputStream out = new ObjectOutputStream(baos);
+            out.writeObject(ii);
+            out.flush();
+            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+            ObjectInputStream in = new ObjectInputStream(bais);
+            _ii = (ImageIcon)in.readObject();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return _ii;
+    }
+
+    class TestImageIcon extends ImageIcon {
+        public TestImageIcon() {
+            super();
+            setImage(buildImage());
+        }
+
+        private Image buildImage() {
+            int w = 32, h = 32;
+            float halfW = w / 2 , halfH = h / 2;
+            int col = 0xff0000;
+            int[] pixels = new int[w * h];
+            for(int y = 0; y < h; y++) {
+                for(int x = 0; x < w; x++) {
+                    float cx = 1f - (float)x / halfW;
+                    float cy = 1f - (float)y / halfH;
+                    double ray = Math.sqrt(cx * cx + cy * cy);
+                    pixels[y * w + x] = ray < 1 ? col | (255 - (int)(ray * 255)) << 24:0;
+                }
+            }
+            MemoryImageSource mis = new MemoryImageSource(w, h, pixels, 0, w);
+            Image image = createImage(mis);
+            return image;
+        }
+
+        protected void loadImage(Image image) {
+            super.loadImage(image);
+            if (testIcon != null && image != testIcon.getImage()) {
+                setPassed(true);
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        bug4827074 bug = new bug4827074();
+        bug.init();
+    }
+}

From 9e00949a26fa881d0c6726be3ec27edd142e592c Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Wed, 20 Sep 2023 14:38:04 +0000
Subject: [PATCH 103/112] 8316427: Duplicated code for
 {obj,type}ArrayKlass::array_klass

Reviewed-by: dholmes, adinn
---
 src/hotspot/share/oops/arrayKlass.cpp     | 59 ++++++++++++++++++++++-
 src/hotspot/share/oops/arrayKlass.hpp     |  8 +++
 src/hotspot/share/oops/objArrayKlass.cpp  | 59 +----------------------
 src/hotspot/share/oops/objArrayKlass.hpp  |  8 ---
 src/hotspot/share/oops/typeArrayKlass.cpp | 59 +----------------------
 src/hotspot/share/oops/typeArrayKlass.hpp |  8 ---
 6 files changed, 68 insertions(+), 133 deletions(-)

diff --git a/src/hotspot/share/oops/arrayKlass.cpp b/src/hotspot/share/oops/arrayKlass.cpp
index ecc3da7bd5d..486f317dadd 100644
--- a/src/hotspot/share/oops/arrayKlass.cpp
+++ b/src/hotspot/share/oops/arrayKlass.cpp
@@ -33,7 +33,7 @@
 #include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
-#include "oops/arrayKlass.hpp"
+#include "oops/arrayKlass.inline.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
@@ -116,6 +116,63 @@ void ArrayKlass::complete_create_array_klass(ArrayKlass* k, Klass* super_klass,
   java_lang_Class::create_mirror(k, Handle(THREAD, k->class_loader()), Handle(THREAD, module), Handle(), Handle(), CHECK);
 }
 
+ArrayKlass* ArrayKlass::array_klass(int n, TRAPS) {
+
+  assert(dimension() <= n, "check order of chain");
+  int dim = dimension();
+  if (dim == n) return this;
+
+  // lock-free read needs acquire semantics
+  if (higher_dimension_acquire() == nullptr) {
+
+    ResourceMark rm(THREAD);
+    {
+      // Ensure atomic creation of higher dimensions
+      MutexLocker mu(THREAD, MultiArray_lock);
+
+      // Check if another thread beat us
+      if (higher_dimension() == nullptr) {
+
+        // Create multi-dim klass object and link them together
+        ObjArrayKlass* ak =
+          ObjArrayKlass::allocate_objArray_klass(class_loader_data(), dim + 1, this, CHECK_NULL);
+        ak->set_lower_dimension(this);
+        // use 'release' to pair with lock-free load
+        release_set_higher_dimension(ak);
+        assert(ak->is_objArray_klass(), "incorrect initialization of ObjArrayKlass");
+      }
+    }
+  }
+
+  ObjArrayKlass *ak = higher_dimension();
+  THREAD->check_possible_safepoint();
+  return ak->array_klass(n, THREAD);
+}
+
+ArrayKlass* ArrayKlass::array_klass_or_null(int n) {
+
+  assert(dimension() <= n, "check order of chain");
+  int dim = dimension();
+  if (dim == n) return this;
+
+  // lock-free read needs acquire semantics
+  if (higher_dimension_acquire() == nullptr) {
+    return nullptr;
+  }
+
+  ObjArrayKlass *ak = higher_dimension();
+  return ak->array_klass_or_null(n);
+}
+
+ArrayKlass* ArrayKlass::array_klass(TRAPS) {
+  return array_klass(dimension() +  1, THREAD);
+}
+
+ArrayKlass* ArrayKlass::array_klass_or_null() {
+  return array_klass_or_null(dimension() +  1);
+}
+
+
 GrowableArray<Klass*>* ArrayKlass::compute_secondary_supers(int num_extra_slots,
                                                             Array<InstanceKlass*>* transitive_interfaces) {
   // interfaces = { cloneable_klass, serializable_klass };
diff --git a/src/hotspot/share/oops/arrayKlass.hpp b/src/hotspot/share/oops/arrayKlass.hpp
index 2c6f401917b..b3d7ca5b32a 100644
--- a/src/hotspot/share/oops/arrayKlass.hpp
+++ b/src/hotspot/share/oops/arrayKlass.hpp
@@ -53,6 +53,14 @@ class ArrayKlass: public Klass {
   // Testing operation
   DEBUG_ONLY(bool is_array_klass_slow() const { return true; })
 
+  // Returns the ObjArrayKlass for n'th dimension.
+  ArrayKlass* array_klass(int n, TRAPS);
+  ArrayKlass* array_klass_or_null(int n);
+
+  // Returns the array class with this class as element type.
+  ArrayKlass* array_klass(TRAPS);
+  ArrayKlass* array_klass_or_null();
+
   // Instance variables
   int dimension() const                 { return _dimension;      }
   void set_dimension(int dimension)     { _dimension = dimension; }
diff --git a/src/hotspot/share/oops/objArrayKlass.cpp b/src/hotspot/share/oops/objArrayKlass.cpp
index 93695db4e3a..d7cba58b6b3 100644
--- a/src/hotspot/share/oops/objArrayKlass.cpp
+++ b/src/hotspot/share/oops/objArrayKlass.cpp
@@ -34,7 +34,7 @@
 #include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
-#include "oops/arrayKlass.inline.hpp"
+#include "oops/arrayKlass.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/objArrayKlass.inline.hpp"
@@ -304,63 +304,6 @@ void ObjArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d,
   }
 }
 
-
-ArrayKlass* ObjArrayKlass::array_klass(int n, TRAPS) {
-
-  assert(dimension() <= n, "check order of chain");
-  int dim = dimension();
-  if (dim == n) return this;
-
-  // lock-free read needs acquire semantics
-  if (higher_dimension_acquire() == nullptr) {
-
-    ResourceMark rm(THREAD);
-    {
-      // Ensure atomic creation of higher dimensions
-      MutexLocker mu(THREAD, MultiArray_lock);
-
-      // Check if another thread beat us
-      if (higher_dimension() == nullptr) {
-
-        // Create multi-dim klass object and link them together
-        ObjArrayKlass* ak =
-          ObjArrayKlass::allocate_objArray_klass(class_loader_data(), dim + 1, this, CHECK_NULL);
-        ak->set_lower_dimension(this);
-        // use 'release' to pair with lock-free load
-        release_set_higher_dimension(ak);
-        assert(ak->is_objArray_klass(), "incorrect initialization of ObjArrayKlass");
-      }
-    }
-  }
-
-  ObjArrayKlass *ak = higher_dimension();
-  THREAD->check_possible_safepoint();
-  return ak->array_klass(n, THREAD);
-}
-
-ArrayKlass* ObjArrayKlass::array_klass_or_null(int n) {
-
-  assert(dimension() <= n, "check order of chain");
-  int dim = dimension();
-  if (dim == n) return this;
-
-  // lock-free read needs acquire semantics
-  if (higher_dimension_acquire() == nullptr) {
-    return nullptr;
-  }
-
-  ObjArrayKlass *ak = higher_dimension();
-  return ak->array_klass_or_null(n);
-}
-
-ArrayKlass* ObjArrayKlass::array_klass(TRAPS) {
-  return array_klass(dimension() +  1, THREAD);
-}
-
-ArrayKlass* ObjArrayKlass::array_klass_or_null() {
-  return array_klass_or_null(dimension() +  1);
-}
-
 bool ObjArrayKlass::can_be_primary_super_slow() const {
   if (!bottom_klass()->can_be_primary_super())
     // array of interfaces
diff --git a/src/hotspot/share/oops/objArrayKlass.hpp b/src/hotspot/share/oops/objArrayKlass.hpp
index ea1c1482308..6cac60d6335 100644
--- a/src/hotspot/share/oops/objArrayKlass.hpp
+++ b/src/hotspot/share/oops/objArrayKlass.hpp
@@ -96,14 +96,6 @@ class ObjArrayKlass : public ArrayKlass {
                arrayOop d, size_t dst_offset,
                int length, TRAPS);
  public:
-  // Returns the ObjArrayKlass for n'th dimension.
-  virtual ArrayKlass* array_klass(int n, TRAPS);
-  virtual ArrayKlass* array_klass_or_null(int n);
-
-  // Returns the array class with this class as element type.
-  virtual ArrayKlass* array_klass(TRAPS);
-  virtual ArrayKlass* array_klass_or_null();
-
   static ObjArrayKlass* cast(Klass* k) {
     return const_cast<ObjArrayKlass*>(cast(const_cast<const Klass*>(k)));
   }
diff --git a/src/hotspot/share/oops/typeArrayKlass.cpp b/src/hotspot/share/oops/typeArrayKlass.cpp
index 842e37ef78e..38e28edd157 100644
--- a/src/hotspot/share/oops/typeArrayKlass.cpp
+++ b/src/hotspot/share/oops/typeArrayKlass.cpp
@@ -32,7 +32,7 @@
 #include "memory/metadataFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
-#include "oops/arrayKlass.inline.hpp"
+#include "oops/arrayKlass.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/objArrayKlass.hpp"
@@ -170,63 +170,6 @@ void TypeArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d, int dst_pos
   ArrayAccess<ARRAYCOPY_ATOMIC>::arraycopy<void>(s, src_offset, d, dst_offset, (size_t)length << l2es);
 }
 
-// create a klass of array holding typeArrays
-ArrayKlass* TypeArrayKlass::array_klass(int n, TRAPS) {
-  int dim = dimension();
-  assert(dim <= n, "check order of chain");
-    if (dim == n)
-      return this;
-
-  // lock-free read needs acquire semantics
-  if (higher_dimension_acquire() == nullptr) {
-
-    ResourceMark rm;
-    JavaThread *jt = THREAD;
-    {
-      // Atomic create higher dimension and link into list
-      MutexLocker mu(THREAD, MultiArray_lock);
-
-      if (higher_dimension() == nullptr) {
-        Klass* oak = ObjArrayKlass::allocate_objArray_klass(
-              class_loader_data(), dim + 1, this, CHECK_NULL);
-        ObjArrayKlass* h_ak = ObjArrayKlass::cast(oak);
-        h_ak->set_lower_dimension(this);
-        // use 'release' to pair with lock-free load
-        release_set_higher_dimension(h_ak);
-        assert(h_ak->is_objArray_klass(), "incorrect initialization of ObjArrayKlass");
-      }
-    }
-  }
-
-  ObjArrayKlass* h_ak = higher_dimension();
-  THREAD->check_possible_safepoint();
-  return h_ak->array_klass(n, THREAD);
-}
-
-// return existing klass of array holding typeArrays
-ArrayKlass* TypeArrayKlass::array_klass_or_null(int n) {
-  int dim = dimension();
-  assert(dim <= n, "check order of chain");
-    if (dim == n)
-      return this;
-
-  // lock-free read needs acquire semantics
-  if (higher_dimension_acquire() == nullptr) {
-    return nullptr;
-  }
-
-  ObjArrayKlass* h_ak = higher_dimension();
-  return h_ak->array_klass_or_null(n);
-}
-
-ArrayKlass* TypeArrayKlass::array_klass(TRAPS) {
-  return array_klass(dimension() +  1, THREAD);
-}
-
-ArrayKlass* TypeArrayKlass::array_klass_or_null() {
-  return array_klass_or_null(dimension() +  1);
-}
-
 size_t TypeArrayKlass::oop_size(oop obj) const {
   assert(obj->is_typeArray(),"must be a type array");
   typeArrayOop t = typeArrayOop(obj);
diff --git a/src/hotspot/share/oops/typeArrayKlass.hpp b/src/hotspot/share/oops/typeArrayKlass.hpp
index 47d235da212..ae23c5324af 100644
--- a/src/hotspot/share/oops/typeArrayKlass.hpp
+++ b/src/hotspot/share/oops/typeArrayKlass.hpp
@@ -94,14 +94,6 @@ class TypeArrayKlass : public ArrayKlass {
   inline void oop_oop_iterate_reverse(oop obj, OopClosureType* closure);
 
  public:
-  // Find n'th dimensional array
-  virtual ArrayKlass* array_klass(int n, TRAPS);
-  virtual ArrayKlass* array_klass_or_null(int n);
-
-  // Returns the array class with this class as element type
-  virtual ArrayKlass* array_klass(TRAPS);
-  virtual ArrayKlass* array_klass_or_null();
-
   static TypeArrayKlass* cast(Klass* k) {
     return const_cast<TypeArrayKlass*>(cast(const_cast<const Klass*>(k)));
   }

From 455cfae1e137ff3055b3cc858e8954f60bdf3147 Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Wed, 20 Sep 2023 15:27:27 +0000
Subject: [PATCH 104/112] 8315880: change LockingMode default from LM_LEGACY to
 LM_LIGHTWEIGHT

Reviewed-by: dholmes, rkennke, stefank
---
 src/hotspot/share/runtime/globals.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 4c2d19469ff..e7aef6841cd 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1986,11 +1986,11 @@ const int ObjectAlignmentInBytes = 8;
              "Mark all threads after a safepoint, and clear on a modify "   \
              "fence. Add cleanliness checks.")                              \
                                                                             \
-  product(int, LockingMode, LM_LEGACY,                                      \
+  product(int, LockingMode, LM_LIGHTWEIGHT,                                 \
           "Select locking mode: "                                           \
           "0: monitors only (LM_MONITOR), "                                 \
-          "1: monitors & legacy stack-locking (LM_LEGACY, default), "       \
-          "2: monitors & new lightweight locking (LM_LIGHTWEIGHT)")         \
+          "1: monitors & legacy stack-locking (LM_LEGACY), "                \
+          "2: monitors & new lightweight locking (LM_LIGHTWEIGHT, default)") \
           range(0, 2)                                                       \
                                                                             \
   product(uint, TrimNativeHeapInterval, 0, EXPERIMENTAL,                    \

From a021dbcb9e58ab60abfc8c46ff25f3aa8ce3cc9f Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Wed, 20 Sep 2023 16:19:37 +0000
Subject: [PATCH 105/112] 8316149: Open source several Swing JTree JViewport
 KeyboardManager tests

Reviewed-by: psadhukhan, tr
---
 test/jdk/javax/swing/JTree/bug4696499.java    | 105 ++++++++++++++++
 test/jdk/javax/swing/JTree/bug5039542.java    |  42 +++++++
 .../jdk/javax/swing/JViewport/bug4546474.java |  73 +++++++++++
 .../jdk/javax/swing/JViewport/bug4677611.java |  55 ++++++++
 .../swing/KeyboardManager/bug4345798.java     | 118 ++++++++++++++++++
 5 files changed, 393 insertions(+)
 create mode 100644 test/jdk/javax/swing/JTree/bug4696499.java
 create mode 100644 test/jdk/javax/swing/JTree/bug5039542.java
 create mode 100644 test/jdk/javax/swing/JViewport/bug4546474.java
 create mode 100644 test/jdk/javax/swing/JViewport/bug4677611.java
 create mode 100644 test/jdk/javax/swing/KeyboardManager/bug4345798.java

diff --git a/test/jdk/javax/swing/JTree/bug4696499.java b/test/jdk/javax/swing/JTree/bug4696499.java
new file mode 100644
index 00000000000..54e3aecd7cb
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug4696499.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4696499
+ * @summary new tree model asked about nodes of previous tree model
+ * @run main bug4696499
+ */
+
+import java.util.ArrayList;
+
+import javax.swing.JTree;
+import javax.swing.event.TreeModelListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+
+public class bug4696499 {
+    public static void main(String[] args) throws Exception {
+        JTree tree = new JTree();
+        TreeModel model = new MyModel();
+        tree.setModel(model);
+
+        tree.setSelectionRow(1);
+        model = new MyModel();
+        tree.setModel(model);
+    }
+}
+
+class MyModel implements TreeModel {
+    private Object root = "Root";
+    private ArrayList listeners = new ArrayList();
+    private TreeNode ONE;
+    static int next = 1;
+
+    MyModel() {
+        ONE = new DefaultMutableTreeNode(next);
+        next *= 2;
+    }
+
+    public void addTreeModelListener(TreeModelListener l) {
+        listeners.add(l);
+    }
+
+    public void removeTreeModelListener(TreeModelListener l) {
+        listeners.remove(l);
+    }
+
+    public void valueForPathChanged(TreePath tp, Object newValue) {
+    }
+
+    public Object getRoot() {
+        return root;
+    }
+
+    public boolean isLeaf(Object o) {
+        return o == ONE;
+    }
+
+    public int getIndexOfChild(Object parent, Object child) {
+        if (parent != root || child != ONE) {
+            throw new RuntimeException("This method is called with the child " +
+                    "of the previous tree model");
+        }
+        return 0;
+    }
+
+    public int getChildCount(Object o) {
+        if (o == root) {
+            return 1;
+        }
+        if (o == ONE) {
+            return 0;
+        }
+        throw new IllegalArgumentException(o.toString());
+    }
+
+    public Object getChild(Object o, int index) {
+        if (o != root || index != 0) {
+            throw new IllegalArgumentException(o + ", " + index);
+        }
+        return ONE;
+    }
+}
diff --git a/test/jdk/javax/swing/JTree/bug5039542.java b/test/jdk/javax/swing/JTree/bug5039542.java
new file mode 100644
index 00000000000..fd86bc9f65a
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug5039542.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 5039542
+ * @summary JTree's setToolTipText() doesn't work
+ * @run main bug5039542
+ */
+
+import javax.swing.JTree;
+
+public class bug5039542 {
+    public static void main(String[] args) throws Exception {
+        final String exampleStr = "TEST";
+        JTree tree = new JTree();
+        tree.setToolTipText(exampleStr);
+        if (tree.getToolTipText(null) != exampleStr) {
+            throw new RuntimeException("The default JTree tooltip text " +
+                    "have to be used if renderer doesn't provide it.");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JViewport/bug4546474.java b/test/jdk/javax/swing/JViewport/bug4546474.java
new file mode 100644
index 00000000000..2da74e0945b
--- /dev/null
+++ b/test/jdk/javax/swing/JViewport/bug4546474.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4546474
+ * @summary JScrollPane's always-visible scrollbars not updated when
+ * viewport is replaced
+ * @run main bug4546474
+ */
+
+import java.awt.Dimension;
+import java.awt.Robot;
+
+import javax.swing.JPanel;
+import javax.swing.JScrollBar;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+
+public class bug4546474 {
+    static JScrollPane scrollpane;
+    static JScrollBar sbar;
+    static volatile boolean viewChanged;
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JPanel panel = new JPanel();
+            panel.setPreferredSize(new Dimension(500, 500));
+            scrollpane = new JScrollPane(panel,
+                    JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+                    JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            sbar = scrollpane.getVerticalScrollBar();
+        });
+
+        Robot robot = new Robot();
+        robot.delay(500);
+        SwingUtilities.invokeAndWait(() -> {
+            sbar.addAdjustmentListener(e -> viewChanged = true);
+            scrollpane.setViewportView(null);
+        });
+        robot.delay(500);
+        if (!viewChanged) {
+            viewChanged = true;
+        }
+        robot.delay(500);
+
+        SwingUtilities.invokeAndWait(() -> {
+            if (sbar.getVisibleAmount() > 0) {
+                throw new RuntimeException("Vertical scrollbar is not " +
+                        "updated when viewport is replaced");
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JViewport/bug4677611.java b/test/jdk/javax/swing/JViewport/bug4677611.java
new file mode 100644
index 00000000000..c561ea0f164
--- /dev/null
+++ b/test/jdk/javax/swing/JViewport/bug4677611.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4677611
+ * @summary JViewport sets Opaque after UpdateUI (prevents UI delegates
+ * to determine look)
+ * @run main bug4677611
+ */
+
+import java.awt.Color;
+
+import javax.swing.JScrollPane;
+import javax.swing.JViewport;
+
+public class bug4677611 {
+    public static void main(String[] args) throws Exception {
+        JScrollPane sp = new JScrollPane();
+        JViewport vp = new MyViewport();
+        vp.setBackground(Color.blue);
+        sp.setViewport(vp);
+
+        if (vp.isOpaque()) {
+            throw new RuntimeException("JViewport shouldn't set Opaque " +
+                    "after update the UI");
+        }
+    }
+
+    static class MyViewport extends JViewport {
+        public void updateUI() {
+            setOpaque(false);
+            super.updateUI();
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/KeyboardManager/bug4345798.java b/test/jdk/javax/swing/KeyboardManager/bug4345798.java
new file mode 100644
index 00000000000..9fa2c3b49e1
--- /dev/null
+++ b/test/jdk/javax/swing/KeyboardManager/bug4345798.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4345798
+ * @summary Tests if Pressing enter to dismiss menu works when a JRootPane
+ * has a default button.
+ * @key headful
+ * @run main bug4345798
+ */
+
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JRootPane;
+import javax.swing.SwingUtilities;
+
+public class bug4345798 {
+    private static JFrame f;
+    private static JButton b;
+    private static JMenu menu;
+    private static volatile boolean passed = true;
+    private static volatile Point p;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                f = new JFrame("bug4345798");
+                JMenuBar mbar = new JMenuBar();
+                JMenuItem item = new JMenuItem("Open...");
+                menu = new JMenu("File");
+                item.addActionListener(new TestActionListener());
+                menu.add(item);
+                mbar.add(menu);
+
+                f.setJMenuBar(mbar);
+
+                b = new JButton("Default");
+                b.addActionListener(new TestActionListener());
+                f.getContentPane().add(b);
+                JRootPane rp = f.getRootPane();
+                rp.setDefaultButton(b);
+
+                f.setSize(200, 200);
+                f.setLocationRelativeTo(null);
+                f.setVisible(true);
+                b.requestFocus();
+            });
+
+            Robot robot = new Robot();
+            robot.setAutoDelay(100);
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> p = menu.getLocationOnScreen());
+            robot.mouseMove(p.x, p.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+            robot.keyPress(KeyEvent.VK_F10);
+            robot.keyRelease(KeyEvent.VK_F10);
+
+            robot.keyPress(KeyEvent.VK_DOWN);
+            robot.keyRelease(KeyEvent.VK_DOWN);
+
+            robot.keyPress(KeyEvent.VK_ENTER);
+            robot.keyRelease(KeyEvent.VK_ENTER);
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (f != null) {
+                    f.dispose();
+                }
+            });
+        }
+
+        if (!passed) {
+            throw new RuntimeException("Test failed.");
+        }
+    }
+
+    static class TestActionListener implements ActionListener {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            if (e.getSource() == b) {
+                passed = false;
+            }
+        }
+    }
+}

From 7c991cc567bfe8cfa56774c545de689ee20f699a Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Wed, 20 Sep 2023 17:39:57 +0000
Subject: [PATCH 106/112] 8296246: Update Unicode Data Files to Version 15.1.0

Reviewed-by: erikj, joehw, srl, rriggs
---
 make/ToolsJdk.gmk                             |   4 +-
 .../tools/generatecharacter/PropList.java     |   2 +-
 .../GenerateExtraProperties.java              | 169 ++++
 make/modules/java.base/Gensrc.gmk             |   1 +
 make/modules/java.base/gensrc/GensrcRegex.gmk |  46 ++
 .../share/classes/java/lang/Character.java    |  42 +-
 .../jdk/internal/util/regex/Grapheme.java     |  50 +-
 .../regex/IndicConjunctBreak.java.template    |  60 ++
 .../share/data/unicodedata/Blocks.txt         |   7 +-
 .../unicodedata/DerivedCoreProperties.txt     | 277 ++++++-
 .../data/unicodedata/NormalizationTest.txt    |   6 +-
 .../share/data/unicodedata/PropList.txt       |  78 +-
 .../data/unicodedata/PropertyValueAliases.txt |  38 +-
 .../share/data/unicodedata/ReadMe.txt         |  10 +-
 .../share/data/unicodedata/Scripts.txt        |  14 +-
 .../share/data/unicodedata/SpecialCasing.txt  |   6 +-
 .../share/data/unicodedata/UnicodeData.txt    |   7 +
 .../auxiliary/GraphemeBreakProperty.txt       |   6 +-
 .../auxiliary/GraphemeBreakTest.txt           | 727 ++++++++++++++++--
 .../data/unicodedata/emoji/emoji-data.txt     |   6 +-
 src/java.base/share/legal/unicode.md          | 183 ++---
 .../jdk/java/lang/Character/CharPropTest.java |  10 +-
 22 files changed, 1518 insertions(+), 231 deletions(-)
 create mode 100644 make/jdk/src/classes/build/tools/generateextraproperties/GenerateExtraProperties.java
 create mode 100644 make/modules/java.base/gensrc/GensrcRegex.gmk
 create mode 100644 src/java.base/share/classes/jdk/internal/util/regex/IndicConjunctBreak.java.template

diff --git a/make/ToolsJdk.gmk b/make/ToolsJdk.gmk
index 5147ffff699..b7310811f02 100644
--- a/make/ToolsJdk.gmk
+++ b/make/ToolsJdk.gmk
@@ -76,8 +76,8 @@ TOOL_GENERATECACERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_class
     -Dkeystore.pkcs12.macAlgorithm=NONE \
     build.tools.generatecacerts.GenerateCacerts
 
-TOOL_GENERATEEMOJIDATA = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    build.tools.generateemojidata.GenerateEmojiData
+TOOL_GENERATEEXTRAPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    build.tools.generateextraproperties.GenerateExtraProperties
 
 TOOL_MAKEZIPREPRODUCIBLE = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.makezipreproducible.MakeZipReproducible
diff --git a/make/jdk/src/classes/build/tools/generatecharacter/PropList.java b/make/jdk/src/classes/build/tools/generatecharacter/PropList.java
index 80110c5776c..8d354ab4d5f 100644
--- a/make/jdk/src/classes/build/tools/generatecharacter/PropList.java
+++ b/make/jdk/src/classes/build/tools/generatecharacter/PropList.java
@@ -64,7 +64,7 @@ private PropList(File file, int plane) throws IOException {
 
         int i, j;
         BufferedReader sbfr = new BufferedReader(new FileReader(file));
-        Matcher m = Pattern.compile("(\\p{XDigit}+)(?:\\.{2}(\\p{XDigit}+))?\\s*;\\s+(\\w+)\\s+#.*").matcher("");
+        Matcher m = Pattern.compile("(\\p{XDigit}+)(?:\\.{2}(\\p{XDigit}+))?\\s*;\\s+(\\w+)[;\\s].*").matcher("");
         String line = null;
         int lineNo = 0;
         while ((line = sbfr.readLine()) != null) {
diff --git a/make/jdk/src/classes/build/tools/generateextraproperties/GenerateExtraProperties.java b/make/jdk/src/classes/build/tools/generateextraproperties/GenerateExtraProperties.java
new file mode 100644
index 00000000000..db22f3b7862
--- /dev/null
+++ b/make/jdk/src/classes/build/tools/generateextraproperties/GenerateExtraProperties.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package build.tools.generateextraproperties;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Parses extra properties files of UCD, and replaces the placeholders in
+ * the given template source file with the generated conditions, then emits
+ * .java files. For example, if the properties file has:
+ * <blockquote>
+ *     0009..000D   ; Type (; Value)
+ *     0020         ; Type (; Value)
+ *     2000..200A   ; Type (; Value)
+ * </blockquote>
+ * and the template file contains
+ * <blockquote>
+ *     %%%Type(=Value)%%%
+ * </blockquote>
+ * then the generated .java file would have the following in place:
+ * <blockquote>
+ *     (cp >= 0x0009 && cp <= 0x000D) ||
+ *      cp == 0x0020 ||
+ *     (cp >= 0x2000 && cp <= 0x200A);
+ * </blockquote>
+ * Note that those in parentheses in the properties file and the
+ * template file are optional.
+ *
+ * Arguments to this utility:
+ *    args[0]: Full path string to the template file
+ *    args[1]: Full path string to the properties file
+ *    args[2]: Full path string to the generated .java file
+ *    args[3...]: Names of the property to generate the conditions
+ */
+public class GenerateExtraProperties {
+    public static void main(String[] args) {
+        var templateFile = Paths.get(args[0]);
+        var propertiesFile = Paths.get(args[1]);
+        var gensrcFile = Paths.get(args[2]);
+        var propertyNames = Arrays.copyOfRange(args, 3, args.length);
+        var replacementMap = new HashMap<String, String>();
+
+        try {
+            for (var propertyName: propertyNames) {
+                var pn = "; " + propertyName.replaceFirst("=", "; ");
+
+                List<Range> ranges = Files.lines(propertiesFile)
+                        .filter(Predicate.not(l -> l.startsWith("#") || l.isBlank()))
+                        .filter(l -> l.contains(pn))
+                        .map(l -> new Range(l.replaceFirst(" .*", "")))
+                        .sorted()
+                        .collect(ArrayList<Range>::new,
+                                (list, r) -> {
+                                    // collapsing consecutive pictographic ranges
+                                    int lastIndex = list.size() - 1;
+                                    if (lastIndex >= 0) {
+                                        Range lastRange = list.get(lastIndex);
+                                        if (lastRange.last + 1 == r.start) {
+                                            list.set(lastIndex, new Range(lastRange.start, r.last));
+                                            return;
+                                        }
+                                    }
+                                    list.add(r);
+                                },
+                                ArrayList<Range>::addAll);
+
+
+                replacementMap.put("%%%" + propertyName + "%%%",
+                        ranges.stream()
+                                .map(GenerateExtraProperties::rangeToString)
+                                .collect(Collectors.joining(" ||\n", "", ";")));
+            }
+
+            // Generate .java file
+            Files.write(gensrcFile,
+                    Files.lines(templateFile)
+                            .flatMap(l -> Stream.of(replacementMap.getOrDefault(l.trim(), l)))
+                            .collect(Collectors.toList()),
+                    StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    static String rangeToString(Range r) {
+        if (r.start == r.last) {
+            return (" ".repeat(12) + "cp == 0x" + toHexString(r.start));
+        } else if (r.start == r.last - 1) {
+            return " ".repeat(12) + "cp == 0x" + toHexString(r.start) + " ||\n" +
+                    " ".repeat(12) + "cp == 0x" + toHexString(r.last);
+        } else {
+            return " ".repeat(11) + "(cp >= 0x" + toHexString(r.start) +
+                    " && cp <= 0x" + toHexString(r.last) + ")";
+        }
+    }
+
+    static int toInt(String hexStr) {
+        return Integer.parseUnsignedInt(hexStr, 16);
+    }
+
+    static String toHexString(int cp) {
+        String ret = Integer.toUnsignedString(cp, 16).toUpperCase();
+        if (ret.length() < 4) {
+            ret = "0".repeat(4 - ret.length()) + ret;
+        }
+        return ret;
+    }
+
+    static class Range implements Comparable<Range> {
+        int start;
+        int last;
+
+        Range (int start, int last) {
+            this.start = start;
+            this.last = last;
+        }
+
+        Range (String input) {
+            input = input.replaceFirst("\\s#.*", "");
+            start = toInt(input.replaceFirst("[\\s\\.].*", ""));
+            last = input.contains("..") ?
+                    toInt(input.replaceFirst(".*\\.\\.", "")
+                            .replaceFirst(";.*", "").trim())
+                    : start;
+        }
+
+        @Override
+        public String toString() {
+            return "Start: " + toHexString(start) + ", Last: " + toHexString(last);
+        }
+
+        @Override
+        public int compareTo(Range other) {
+            return Integer.compare(start, other.start);
+        }
+    }
+}
\ No newline at end of file
diff --git a/make/modules/java.base/Gensrc.gmk b/make/modules/java.base/Gensrc.gmk
index 5d9a9bbcc22..acbd94fc275 100644
--- a/make/modules/java.base/Gensrc.gmk
+++ b/make/modules/java.base/Gensrc.gmk
@@ -35,6 +35,7 @@ include gensrc/GensrcExceptions.gmk
 include gensrc/GensrcVarHandles.gmk
 include gensrc/GensrcModuleLoaderMap.gmk
 include gensrc/GensrcScopedMemoryAccess.gmk
+include gensrc/GensrcRegex.gmk
 
 # GensrcLocaleData.gmk does not set TARGETS, so we must choose which targets
 # to include.
diff --git a/make/modules/java.base/gensrc/GensrcRegex.gmk b/make/modules/java.base/gensrc/GensrcRegex.gmk
new file mode 100644
index 00000000000..6384d36de59
--- /dev/null
+++ b/make/modules/java.base/gensrc/GensrcRegex.gmk
@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Rules to create java files under
+# $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/util/regex/
+#
+
+GENSRC_INDICCONJUNCTBREAK := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/util/regex/IndicConjunctBreak.java
+
+INDICCONJUNCTBREAKTEMP := $(MODULE_SRC)/share/classes/jdk/internal/util/regex/IndicConjunctBreak.java.template
+INDICCONJUNCTBREAKPROPS := $(MODULE_SRC)/share/data/unicodedata/DerivedCoreProperties.txt
+INDICCONJUNCTBREAKPARAMS := InCB=Linker InCB=Extend InCB=Consonant
+
+$(GENSRC_INDICCONJUNCTBREAK): $(BUILD_TOOLS_JDK) $(INDICCONJUNCTBREAKTEMP) $(INDICCONJUNCTBREAKPROPS)
+	$(call LogInfo, Generating $@)
+	$(call MakeTargetDir)
+	$(TOOL_GENERATEEXTRAPROPERTIES) \
+	    $(INDICCONJUNCTBREAKTEMP) \
+	    $(INDICCONJUNCTBREAKPROPS) \
+	    $(GENSRC_INDICCONJUNCTBREAK) \
+	    $(INDICCONJUNCTBREAKPARAMS)
+
+TARGETS += $(GENSRC_INDICCONJUNCTBREAK)
diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java
index d4399d2af6a..a829d71e113 100644
--- a/src/java.base/share/classes/java/lang/Character.java
+++ b/src/java.base/share/classes/java/lang/Character.java
@@ -63,7 +63,7 @@
  * from the Unicode Consortium at
  * <a href="http://www.unicode.org">http://www.unicode.org</a>.
  * <p>
- * Character information is based on the Unicode Standard, version 15.0.
+ * Character information is based on the Unicode Standard, version 15.1.
  * <p>
  * The Java platform has supported different versions of the Unicode
  * Standard over time. Upgrades to newer versions of the Unicode Standard
@@ -75,6 +75,8 @@
  *     <th scope="col">Unicode version</th></tr>
  * </thead>
  * <tbody>
+ * <tr><th scope="row" style="text-align:left">Java SE 22</th>
+ *     <td>Unicode 15.1</td></tr>
  * <tr><th scope="row" style="text-align:left">Java SE 20</th>
  *     <td>Unicode 15.0</td></tr>
  * <tr><th scope="row" style="text-align:left">Java SE 19</th>
@@ -744,7 +746,7 @@ public static final class UnicodeBlock extends Subset {
          * It should be adjusted whenever the Unicode Character Database
          * is upgraded.
          */
-        private static final int NUM_ENTITIES = 756;
+        private static final int NUM_ENTITIES = 759;
         private static Map<String, UnicodeBlock> map = HashMap.newHashMap(NUM_ENTITIES);
 
         /**
@@ -3611,6 +3613,16 @@ private UnicodeBlock(String idName, String... aliases) {
                              "CJK UNIFIED IDEOGRAPHS EXTENSION H",
                              "CJKUNIFIEDIDEOGRAPHSEXTENSIONH");
 
+        /**
+         * Constant for the "CJK Unified Ideographs Extension I" Unicode
+         * character block.
+         * @since 22
+         */
+        public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I =
+            new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I",
+                             "CJK UNIFIED IDEOGRAPHS EXTENSION I",
+                             "CJKUNIFIEDIDEOGRAPHSEXTENSIONI");
+
         private static final int[] blockStarts = {
             0x0000,   // 0000..007F; Basic Latin
             0x0080,   // 0080..00FF; Latin-1 Supplement
@@ -3978,7 +3990,8 @@ private UnicodeBlock(String idName, String... aliases) {
             0x2B740,  // 2B740..2B81F; CJK Unified Ideographs Extension D
             0x2B820,  // 2B820..2CEAF; CJK Unified Ideographs Extension E
             0x2CEB0,  // 2CEB0..2EBEF; CJK Unified Ideographs Extension F
-            0x2EBF0,  //               unassigned
+            0x2EBF0,  // 2EBF0..2EE5F; CJK Unified Ideographs Extension I
+            0x2EE60,  //               unassigned
             0x2F800,  // 2F800..2FA1F; CJK Compatibility Ideographs Supplement
             0x2FA20,  //               unassigned
             0x30000,  // 30000..3134F; CJK Unified Ideographs Extension G
@@ -4359,6 +4372,7 @@ private UnicodeBlock(String idName, String... aliases) {
             CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D,
             CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E,
             CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F,
+            CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I,
             null,
             CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT,
             null,
@@ -6057,9 +6071,7 @@ public static enum UnicodeScript {
             0x2EF4,   // 2EF4..2EFF; UNKNOWN
             0x2F00,   // 2F00..2FD5; HAN
             0x2FD6,   // 2FD6..2FEF; UNKNOWN
-            0x2FF0,   // 2FF0..2FFB; COMMON
-            0x2FFC,   // 2FFC..2FFF; UNKNOWN
-            0x3000,   // 3000..3004; COMMON
+            0x2FF0,   // 2FF0..3004; COMMON
             0x3005,   // 3005      ; HAN
             0x3006,   // 3006      ; COMMON
             0x3007,   // 3007      ; HAN
@@ -6088,7 +6100,8 @@ public static enum UnicodeScript {
             0x3190,   // 3190..319F; COMMON
             0x31A0,   // 31A0..31BF; BOPOMOFO
             0x31C0,   // 31C0..31E3; COMMON
-            0x31E4,   // 31E4..31EF; UNKNOWN
+            0x31E4,   // 31E4..31EE; UNKNOWN
+            0x31EF,   // 31EF      ; COMMON
             0x31F0,   // 31F0..31FF; KATAKANA
             0x3200,   // 3200..321E; HANGUL
             0x321F,   // 321F      ; UNKNOWN
@@ -7028,7 +7041,9 @@ public static enum UnicodeScript {
             0x2B820,  // 2B820..2CEA1; HAN
             0x2CEA2,  // 2CEA2..2CEAF; UNKNOWN
             0x2CEB0,  // 2CEB0..2EBE0; HAN
-            0x2EBE1,  // 2EBE1..2F7FF; UNKNOWN
+            0x2EBE1,  // 2EBE1..2EBEF; UNKNOWN
+            0x2EBF0,  // 2EBF0..2EE5D; HAN
+            0x2EE5E,  // 2EE5E..2F7FF; UNKNOWN
             0x2F800,  // 2F800..2FA1D; HAN
             0x2FA1E,  // 2FA1E..2FFFF; UNKNOWN
             0x30000,  // 30000..3134A; HAN
@@ -7717,9 +7732,7 @@ public static enum UnicodeScript {
             UNKNOWN,                  // 2EF4..2EFF
             HAN,                      // 2F00..2FD5
             UNKNOWN,                  // 2FD6..2FEF
-            COMMON,                   // 2FF0..2FFB
-            UNKNOWN,                  // 2FFC..2FFF
-            COMMON,                   // 3000..3004
+            COMMON,                   // 2FF0..3004
             HAN,                      // 3005
             COMMON,                   // 3006
             HAN,                      // 3007
@@ -7748,7 +7761,8 @@ public static enum UnicodeScript {
             COMMON,                   // 3190..319F
             BOPOMOFO,                 // 31A0..31BF
             COMMON,                   // 31C0..31E3
-            UNKNOWN,                  // 31E4..31EF
+            UNKNOWN,                  // 31E4..31EE
+            COMMON,                   // 31EF
             KATAKANA,                 // 31F0..31FF
             HANGUL,                   // 3200..321E
             UNKNOWN,                  // 321F
@@ -8688,7 +8702,9 @@ public static enum UnicodeScript {
             HAN,                      // 2B820..2CEA1
             UNKNOWN,                  // 2CEA2..2CEAF
             HAN,                      // 2CEB0..2EBE0
-            UNKNOWN,                  // 2EBE1..2F7FF
+            UNKNOWN,                  // 2EBE1..2EBEF
+            HAN,                      // 2EBF0..2EE5D
+            UNKNOWN,                  // 2EE5E..2F7FF
             HAN,                      // 2F800..2FA1D
             UNKNOWN,                  // 2FA1E..2FFFF
             HAN,                      // 30000..3134A
diff --git a/src/java.base/share/classes/jdk/internal/util/regex/Grapheme.java b/src/java.base/share/classes/jdk/internal/util/regex/Grapheme.java
index 68a28537cb3..ef392612929 100644
--- a/src/java.base/share/classes/jdk/internal/util/regex/Grapheme.java
+++ b/src/java.base/share/classes/jdk/internal/util/regex/Grapheme.java
@@ -35,9 +35,9 @@ public final class Grapheme {
      * <p>
      * See Unicode Standard Annex #29 Unicode Text Segmentation for the specification
      * for the extended grapheme cluster boundary rules. The following implementation
-     * is based on the annex for Unicode version 15.0.
-     * (http://www.unicode.org/reports/tr29/tr29-40.html)
+     * is based on the annex for Unicode version 15.1.
      *
+     * @spec http://www.unicode.org/reports/tr29/tr29-43.html
      * @param src the {@code CharSequence} to be scanned
      * @param off offset to start looking for the next boundary in the src
      * @param limit limit offset in the src (exclusive)
@@ -56,6 +56,15 @@ public static int nextBoundary(CharSequence src, int off, int limit) {
             int ch1 = Character.codePointAt(src, ret);
             int t1 = getType(ch1);
 
+            // GB9c
+            if (IndicConjunctBreak.isConsonant(ch0)) {
+                var advance = checkIndicConjunctBreak(src, ret, limit);
+                if (advance >= 0) {
+                    ret += advance;
+                    continue;
+                }
+            }
+
             if (gb11 && t0 == ZWJ && t1 == EXTENDED_PICTOGRAPHIC) {
                 // continue for gb11
             } else if (riCount % 2 == 1 && t0 == RI && t1 == RI) {
@@ -70,6 +79,7 @@ public static int nextBoundary(CharSequence src, int off, int limit) {
             }
 
             riCount += (t1 == RI) ? 1 : 0;
+            ch0 = ch1;
             t0 = t1;
 
             ret += Character.charCount(ch1);
@@ -283,4 +293,40 @@ static int getType(int cp) {
         }
         return OTHER;
     }
+
+    /**
+     * Checks for a possible GB9c Indic Conjunct Break sequence. If it is
+     * repetitive, e.g., Consonant1/Linker1/Consonant2/Linker2/Consonant3, only
+     * the first part of the sequence (Consonant1/Linker1/Consonant2) is
+     * recognized. The rest is analyzed in the next iteration of the grapheme
+     * cluster boundary search.
+     *
+     * @param src the source char sequence
+     * @param index the index that points to the starting Linking Consonant
+     * @param limit limit to the char sequence
+     * @return the advance in index if the indic conjunct break sequence
+     *      is found, it will be negative if the sequence is not found
+     */
+    private static int checkIndicConjunctBreak(CharSequence src, int index, int limit) {
+        boolean linkerFound = false;
+        int advance = 0;
+
+        while (index + advance < limit) {
+            int ch1 = Character.codePointAt(src, index + advance);
+            advance += Character.charCount(ch1);
+
+            if (IndicConjunctBreak.isLinker(ch1)) {
+                linkerFound = true;
+            } else if (IndicConjunctBreak.isConsonant(ch1)) {
+                if (linkerFound) {
+                    return advance;
+                } else {
+                    break;
+                }
+            } else if (!IndicConjunctBreak.isExtend(ch1)) {
+                break;
+            }
+        }
+        return -1;
+    }
 }
diff --git a/src/java.base/share/classes/jdk/internal/util/regex/IndicConjunctBreak.java.template b/src/java.base/share/classes/jdk/internal/util/regex/IndicConjunctBreak.java.template
new file mode 100644
index 00000000000..fc0e6605eca
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/util/regex/IndicConjunctBreak.java.template
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.util.regex;
+
+/**
+ * Helper class for supporting the GB9c rule in Unicode Text Segmentation TR29
+ *
+ * <blockquote>
+ * GB9c Do not break within certain combinations with Indic_Conjunct_Break (InCB)=Linker.
+ *
+ * \p{InCB=Consonant} [ \p{InCB=Extend} \p{InCB=Linker} ]* \p{InCB=Linker} [ \p{InCB=Extend} \p{InCB=Linker} ]* x \p{InCB=Consonant}*
+ * </blockquote>
+ *
+ * Code point conditions included in this class are derived from the "Derived Property: Indic_Conjunct_Break"
+ * section in DerivedCoreProperties.txt of the Unicode Character Database.
+ */
+final class IndicConjunctBreak {
+    static boolean isLinker(int cp) {
+        return
+%%%InCB=Linker%%%
+    }
+
+    static boolean isExtend(int cp) {
+        return
+%%%InCB=Extend%%%
+    }
+
+    static boolean isConsonant(int cp) {
+        // fast check - Devanagari to Malayalam
+        if (cp < 0x0900 || cp > 0x0D7F) {
+            return false;
+        }
+
+        return
+%%%InCB=Consonant%%%
+    }
+}
diff --git a/src/java.base/share/data/unicodedata/Blocks.txt b/src/java.base/share/data/unicodedata/Blocks.txt
index fbcf4526e5f..4060634e5e3 100644
--- a/src/java.base/share/data/unicodedata/Blocks.txt
+++ b/src/java.base/share/data/unicodedata/Blocks.txt
@@ -1,6 +1,6 @@
-# Blocks-15.0.0.txt
-# Date: 2022-01-28, 20:58:00 GMT [KW]
-# Copyright (c) 2022 Unicode, Inc.
+# Blocks-15.1.0.txt
+# Date: 2023-07-28, 15:47:20 GMT
+# Copyright (c) 2023 Unicode, Inc.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
@@ -352,6 +352,7 @@ FFF0..FFFF; Specials
 2B740..2B81F; CJK Unified Ideographs Extension D
 2B820..2CEAF; CJK Unified Ideographs Extension E
 2CEB0..2EBEF; CJK Unified Ideographs Extension F
+2EBF0..2EE5F; CJK Unified Ideographs Extension I
 2F800..2FA1F; CJK Compatibility Ideographs Supplement
 30000..3134F; CJK Unified Ideographs Extension G
 31350..323AF; CJK Unified Ideographs Extension H
diff --git a/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt b/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt
index 03059d68e7b..dcedbcdf776 100644
--- a/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt
+++ b/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt
@@ -1,6 +1,6 @@
-# DerivedCoreProperties-15.0.0.txt
-# Date: 2022-08-05, 22:17:05 GMT
-# Copyright (c) 2022 Unicode, Inc.
+# DerivedCoreProperties-15.1.0.txt
+# Date: 2023-08-07, 15:21:24 GMT
+# Copyright (c) 2023 Unicode, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
@@ -1397,11 +1397,12 @@ FFDA..FFDC    ; Alphabetic # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG
 2B740..2B81D  ; Alphabetic # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B820..2CEA1  ; Alphabetic # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
 2CEB0..2EBE0  ; Alphabetic # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
+2EBF0..2EE5D  ; Alphabetic # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; Alphabetic # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; Alphabetic # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
 31350..323AF  ; Alphabetic # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
 
-# Total code points: 137765
+# Total code points: 138387
 
 # ================================================
 
@@ -6853,11 +6854,12 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 2B740..2B81D  ; ID_Start # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B820..2CEA1  ; ID_Start # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
 2CEB0..2EBE0  ; ID_Start # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
+2EBF0..2EE5D  ; ID_Start # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; ID_Start # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; ID_Start # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
 31350..323AF  ; ID_Start # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
 
-# Total code points: 136345
+# Total code points: 136967
 
 # ================================================
 
@@ -7438,6 +7440,7 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 1FE0..1FEC    ; ID_Continue # L&  [13] GREEK SMALL LETTER UPSILON WITH VRACHY..GREEK CAPITAL LETTER RHO WITH DASIA
 1FF2..1FF4    ; ID_Continue # L&   [3] GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
 1FF6..1FFC    ; ID_Continue # L&   [7] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
+200C..200D    ; ID_Continue # Cf   [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER
 203F..2040    ; ID_Continue # Pc   [2] UNDERTIE..CHARACTER TIE
 2054          ; ID_Continue # Pc       INVERTED UNDERTIE
 2071          ; ID_Continue # Lm       SUPERSCRIPT LATIN SMALL LETTER I
@@ -7504,6 +7507,7 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 309D..309E    ; ID_Continue # Lm   [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK
 309F          ; ID_Continue # Lo       HIRAGANA DIGRAPH YORI
 30A1..30FA    ; ID_Continue # Lo  [90] KATAKANA LETTER SMALL A..KATAKANA LETTER VO
+30FB          ; ID_Continue # Po       KATAKANA MIDDLE DOT
 30FC..30FE    ; ID_Continue # Lm   [3] KATAKANA-HIRAGANA PROLONGED SOUND MARK..KATAKANA VOICED ITERATION MARK
 30FF          ; ID_Continue # Lo       KATAKANA DIGRAPH KOTO
 3105..312F    ; ID_Continue # Lo  [43] BOPOMOFO LETTER B..BOPOMOFO LETTER NN
@@ -7683,6 +7687,7 @@ FF10..FF19    ; ID_Continue # Nd  [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NIN
 FF21..FF3A    ; ID_Continue # L&  [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z
 FF3F          ; ID_Continue # Pc       FULLWIDTH LOW LINE
 FF41..FF5A    ; ID_Continue # L&  [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z
+FF65          ; ID_Continue # Po       HALFWIDTH KATAKANA MIDDLE DOT
 FF66..FF6F    ; ID_Continue # Lo  [10] HALFWIDTH KATAKANA LETTER WO..HALFWIDTH KATAKANA LETTER SMALL TU
 FF70          ; ID_Continue # Lm       HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
 FF71..FF9D    ; ID_Continue # Lo  [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAKANA LETTER N
@@ -8207,12 +8212,13 @@ FFDA..FFDC    ; ID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN
 2B740..2B81D  ; ID_Continue # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B820..2CEA1  ; ID_Continue # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
 2CEB0..2EBE0  ; ID_Continue # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
+2EBF0..2EE5D  ; ID_Continue # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; ID_Continue # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; ID_Continue # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
 31350..323AF  ; ID_Continue # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
 E0100..E01EF  ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
 
-# Total code points: 139482
+# Total code points: 140108
 
 # ================================================
 
@@ -8962,11 +8968,12 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 2B740..2B81D  ; XID_Start # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B820..2CEA1  ; XID_Start # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
 2CEB0..2EBE0  ; XID_Start # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
+2EBF0..2EE5D  ; XID_Start # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; XID_Start # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; XID_Start # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
 31350..323AF  ; XID_Start # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
 
-# Total code points: 136322
+# Total code points: 136944
 
 # ================================================
 
@@ -9543,6 +9550,7 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 1FE0..1FEC    ; XID_Continue # L&  [13] GREEK SMALL LETTER UPSILON WITH VRACHY..GREEK CAPITAL LETTER RHO WITH DASIA
 1FF2..1FF4    ; XID_Continue # L&   [3] GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
 1FF6..1FFC    ; XID_Continue # L&   [7] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
+200C..200D    ; XID_Continue # Cf   [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER
 203F..2040    ; XID_Continue # Pc   [2] UNDERTIE..CHARACTER TIE
 2054          ; XID_Continue # Pc       INVERTED UNDERTIE
 2071          ; XID_Continue # Lm       SUPERSCRIPT LATIN SMALL LETTER I
@@ -9608,6 +9616,7 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 309D..309E    ; XID_Continue # Lm   [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK
 309F          ; XID_Continue # Lo       HIRAGANA DIGRAPH YORI
 30A1..30FA    ; XID_Continue # Lo  [90] KATAKANA LETTER SMALL A..KATAKANA LETTER VO
+30FB          ; XID_Continue # Po       KATAKANA MIDDLE DOT
 30FC..30FE    ; XID_Continue # Lm   [3] KATAKANA-HIRAGANA PROLONGED SOUND MARK..KATAKANA VOICED ITERATION MARK
 30FF          ; XID_Continue # Lo       KATAKANA DIGRAPH KOTO
 3105..312F    ; XID_Continue # Lo  [43] BOPOMOFO LETTER B..BOPOMOFO LETTER NN
@@ -9793,6 +9802,7 @@ FF10..FF19    ; XID_Continue # Nd  [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NI
 FF21..FF3A    ; XID_Continue # L&  [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z
 FF3F          ; XID_Continue # Pc       FULLWIDTH LOW LINE
 FF41..FF5A    ; XID_Continue # L&  [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z
+FF65          ; XID_Continue # Po       HALFWIDTH KATAKANA MIDDLE DOT
 FF66..FF6F    ; XID_Continue # Lo  [10] HALFWIDTH KATAKANA LETTER WO..HALFWIDTH KATAKANA LETTER SMALL TU
 FF70          ; XID_Continue # Lm       HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
 FF71..FF9D    ; XID_Continue # Lo  [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAKANA LETTER N
@@ -10317,12 +10327,13 @@ FFDA..FFDC    ; XID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA
 2B740..2B81D  ; XID_Continue # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B820..2CEA1  ; XID_Continue # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
 2CEB0..2EBE0  ; XID_Continue # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
+2EBF0..2EE5D  ; XID_Continue # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; XID_Continue # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; XID_Continue # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
 31350..323AF  ; XID_Continue # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
 E0100..E01EF  ; XID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
 
-# Total code points: 139463
+# Total code points: 140089
 
 # ================================================
 
@@ -10335,6 +10346,15 @@ E0100..E01EF  ; XID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTO
 #  - FFF9..FFFB (Interlinear annotation format characters)
 #  - 13430..13440 (Egyptian hieroglyph format characters)
 #  - Prepended_Concatenation_Mark (Exceptional format characters that should be visible)
+#
+# There are currently no stability guarantees for DICP. However, the
+# values of DICP interact with the derivation of XID_Continue
+# and NFKC_CF, for which there are stability guarantees.
+# Maintainers of this property should note that in the
+# unlikely case that the DICP value changes for an existing character
+# which is also XID_Continue=Yes, then exceptions must be put
+# in place to ensure that the NFKC_CF mapping value for that
+# existing character does not change.
 
 00AD          ; Default_Ignorable_Code_Point # Cf       SOFT HYPHEN
 034F          ; Default_Ignorable_Code_Point # Mn       COMBINING GRAPHEME JOINER
@@ -11602,7 +11622,7 @@ E0100..E01EF  ; Grapheme_Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELE
 2E80..2E99    ; Grapheme_Base # So  [26] CJK RADICAL REPEAT..CJK RADICAL RAP
 2E9B..2EF3    ; Grapheme_Base # So  [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE
 2F00..2FD5    ; Grapheme_Base # So [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE
-2FF0..2FFB    ; Grapheme_Base # So  [12] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID
+2FF0..2FFF    ; Grapheme_Base # So  [16] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION
 3000          ; Grapheme_Base # Zs       IDEOGRAPHIC SPACE
 3001..3003    ; Grapheme_Base # Po   [3] IDEOGRAPHIC COMMA..DITTO MARK
 3004          ; Grapheme_Base # So       JAPANESE INDUSTRIAL STANDARD SYMBOL
@@ -11657,6 +11677,7 @@ E0100..E01EF  ; Grapheme_Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELE
 3196..319F    ; Grapheme_Base # So  [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK
 31A0..31BF    ; Grapheme_Base # Lo  [32] BOPOMOFO LETTER BU..BOPOMOFO LETTER AH
 31C0..31E3    ; Grapheme_Base # So  [36] CJK STROKE T..CJK STROKE Q
+31EF          ; Grapheme_Base # So       IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION
 31F0..31FF    ; Grapheme_Base # Lo  [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO
 3200..321E    ; Grapheme_Base # So  [31] PARENTHESIZED HANGUL KIYEOK..PARENTHESIZED KOREAN CHARACTER O HU
 3220..3229    ; Grapheme_Base # No  [10] PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN
@@ -12497,11 +12518,12 @@ FFFC..FFFD    ; Grapheme_Base # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEME
 2B740..2B81D  ; Grapheme_Base # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B820..2CEA1  ; Grapheme_Base # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
 2CEB0..2EBE0  ; Grapheme_Base # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
+2EBF0..2EE5D  ; Grapheme_Base # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; Grapheme_Base # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; Grapheme_Base # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
 31350..323AF  ; Grapheme_Base # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
 
-# Total code points: 146986
+# Total code points: 147613
 
 # ================================================
 
@@ -12572,4 +12594,239 @@ ABED          ; Grapheme_Link # Mn       MEETEI MAYEK APUN IYEK
 
 # Total code points: 65
 
+# ================================================
+
+# Derived Property: Indic_Conjunct_Break
+#  Generated from the Grapheme_Cluster_Break, Indic_Syllabic_Category,
+#  Canonical_Combining_Class, and Script properties as described in UAX #44:
+#  https://www.unicode.org/reports/tr44/.
+
+#  All code points not explicitly listed for Indic_Conjunct_Break
+#  have the value None.
+
+# @missing: 0000..10FFFF; InCB; None
+
+# ================================================
+
+# Indic_Conjunct_Break=Linker
+
+094D          ; InCB; Linker # Mn       DEVANAGARI SIGN VIRAMA
+09CD          ; InCB; Linker # Mn       BENGALI SIGN VIRAMA
+0ACD          ; InCB; Linker # Mn       GUJARATI SIGN VIRAMA
+0B4D          ; InCB; Linker # Mn       ORIYA SIGN VIRAMA
+0C4D          ; InCB; Linker # Mn       TELUGU SIGN VIRAMA
+0D4D          ; InCB; Linker # Mn       MALAYALAM SIGN VIRAMA
+
+# Total code points: 6
+
+# ================================================
+
+# Indic_Conjunct_Break=Consonant
+
+0915..0939    ; InCB; Consonant # Lo  [37] DEVANAGARI LETTER KA..DEVANAGARI LETTER HA
+0958..095F    ; InCB; Consonant # Lo   [8] DEVANAGARI LETTER QA..DEVANAGARI LETTER YYA
+0978..097F    ; InCB; Consonant # Lo   [8] DEVANAGARI LETTER MARWARI DDA..DEVANAGARI LETTER BBA
+0995..09A8    ; InCB; Consonant # Lo  [20] BENGALI LETTER KA..BENGALI LETTER NA
+09AA..09B0    ; InCB; Consonant # Lo   [7] BENGALI LETTER PA..BENGALI LETTER RA
+09B2          ; InCB; Consonant # Lo       BENGALI LETTER LA
+09B6..09B9    ; InCB; Consonant # Lo   [4] BENGALI LETTER SHA..BENGALI LETTER HA
+09DC..09DD    ; InCB; Consonant # Lo   [2] BENGALI LETTER RRA..BENGALI LETTER RHA
+09DF          ; InCB; Consonant # Lo       BENGALI LETTER YYA
+09F0..09F1    ; InCB; Consonant # Lo   [2] BENGALI LETTER RA WITH MIDDLE DIAGONAL..BENGALI LETTER RA WITH LOWER DIAGONAL
+0A95..0AA8    ; InCB; Consonant # Lo  [20] GUJARATI LETTER KA..GUJARATI LETTER NA
+0AAA..0AB0    ; InCB; Consonant # Lo   [7] GUJARATI LETTER PA..GUJARATI LETTER RA
+0AB2..0AB3    ; InCB; Consonant # Lo   [2] GUJARATI LETTER LA..GUJARATI LETTER LLA
+0AB5..0AB9    ; InCB; Consonant # Lo   [5] GUJARATI LETTER VA..GUJARATI LETTER HA
+0AF9          ; InCB; Consonant # Lo       GUJARATI LETTER ZHA
+0B15..0B28    ; InCB; Consonant # Lo  [20] ORIYA LETTER KA..ORIYA LETTER NA
+0B2A..0B30    ; InCB; Consonant # Lo   [7] ORIYA LETTER PA..ORIYA LETTER RA
+0B32..0B33    ; InCB; Consonant # Lo   [2] ORIYA LETTER LA..ORIYA LETTER LLA
+0B35..0B39    ; InCB; Consonant # Lo   [5] ORIYA LETTER VA..ORIYA LETTER HA
+0B5C..0B5D    ; InCB; Consonant # Lo   [2] ORIYA LETTER RRA..ORIYA LETTER RHA
+0B5F          ; InCB; Consonant # Lo       ORIYA LETTER YYA
+0B71          ; InCB; Consonant # Lo       ORIYA LETTER WA
+0C15..0C28    ; InCB; Consonant # Lo  [20] TELUGU LETTER KA..TELUGU LETTER NA
+0C2A..0C39    ; InCB; Consonant # Lo  [16] TELUGU LETTER PA..TELUGU LETTER HA
+0C58..0C5A    ; InCB; Consonant # Lo   [3] TELUGU LETTER TSA..TELUGU LETTER RRRA
+0D15..0D3A    ; InCB; Consonant # Lo  [38] MALAYALAM LETTER KA..MALAYALAM LETTER TTTA
+
+# Total code points: 240
+
+# ================================================
+
+# Indic_Conjunct_Break=Extend
+
+0300..034E    ; InCB; Extend # Mn  [79] COMBINING GRAVE ACCENT..COMBINING UPWARDS ARROW BELOW
+0350..036F    ; InCB; Extend # Mn  [32] COMBINING RIGHT ARROWHEAD ABOVE..COMBINING LATIN SMALL LETTER X
+0483..0487    ; InCB; Extend # Mn   [5] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC POKRYTIE
+0591..05BD    ; InCB; Extend # Mn  [45] HEBREW ACCENT ETNAHTA..HEBREW POINT METEG
+05BF          ; InCB; Extend # Mn       HEBREW POINT RAFE
+05C1..05C2    ; InCB; Extend # Mn   [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT
+05C4..05C5    ; InCB; Extend # Mn   [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT
+05C7          ; InCB; Extend # Mn       HEBREW POINT QAMATS QATAN
+0610..061A    ; InCB; Extend # Mn  [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA
+064B..065F    ; InCB; Extend # Mn  [21] ARABIC FATHATAN..ARABIC WAVY HAMZA BELOW
+0670          ; InCB; Extend # Mn       ARABIC LETTER SUPERSCRIPT ALEF
+06D6..06DC    ; InCB; Extend # Mn   [7] ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA..ARABIC SMALL HIGH SEEN
+06DF..06E4    ; InCB; Extend # Mn   [6] ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH MADDA
+06E7..06E8    ; InCB; Extend # Mn   [2] ARABIC SMALL HIGH YEH..ARABIC SMALL HIGH NOON
+06EA..06ED    ; InCB; Extend # Mn   [4] ARABIC EMPTY CENTRE LOW STOP..ARABIC SMALL LOW MEEM
+0711          ; InCB; Extend # Mn       SYRIAC LETTER SUPERSCRIPT ALAPH
+0730..074A    ; InCB; Extend # Mn  [27] SYRIAC PTHAHA ABOVE..SYRIAC BARREKH
+07EB..07F3    ; InCB; Extend # Mn   [9] NKO COMBINING SHORT HIGH TONE..NKO COMBINING DOUBLE DOT ABOVE
+07FD          ; InCB; Extend # Mn       NKO DANTAYALAN
+0816..0819    ; InCB; Extend # Mn   [4] SAMARITAN MARK IN..SAMARITAN MARK DAGESH
+081B..0823    ; InCB; Extend # Mn   [9] SAMARITAN MARK EPENTHETIC YUT..SAMARITAN VOWEL SIGN A
+0825..0827    ; InCB; Extend # Mn   [3] SAMARITAN VOWEL SIGN SHORT A..SAMARITAN VOWEL SIGN U
+0829..082D    ; InCB; Extend # Mn   [5] SAMARITAN VOWEL SIGN LONG I..SAMARITAN MARK NEQUDAA
+0859..085B    ; InCB; Extend # Mn   [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK
+0898..089F    ; InCB; Extend # Mn   [8] ARABIC SMALL HIGH WORD AL-JUZ..ARABIC HALF MADDA OVER MADDA
+08CA..08E1    ; InCB; Extend # Mn  [24] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH SIGN SAFHA
+08E3..08FF    ; InCB; Extend # Mn  [29] ARABIC TURNED DAMMA BELOW..ARABIC MARK SIDEWAYS NOON GHUNNA
+093C          ; InCB; Extend # Mn       DEVANAGARI SIGN NUKTA
+0951..0954    ; InCB; Extend # Mn   [4] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI ACUTE ACCENT
+09BC          ; InCB; Extend # Mn       BENGALI SIGN NUKTA
+09FE          ; InCB; Extend # Mn       BENGALI SANDHI MARK
+0A3C          ; InCB; Extend # Mn       GURMUKHI SIGN NUKTA
+0ABC          ; InCB; Extend # Mn       GUJARATI SIGN NUKTA
+0B3C          ; InCB; Extend # Mn       ORIYA SIGN NUKTA
+0C3C          ; InCB; Extend # Mn       TELUGU SIGN NUKTA
+0C55..0C56    ; InCB; Extend # Mn   [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK
+0CBC          ; InCB; Extend # Mn       KANNADA SIGN NUKTA
+0D3B..0D3C    ; InCB; Extend # Mn   [2] MALAYALAM SIGN VERTICAL BAR VIRAMA..MALAYALAM SIGN CIRCULAR VIRAMA
+0E38..0E3A    ; InCB; Extend # Mn   [3] THAI CHARACTER SARA U..THAI CHARACTER PHINTHU
+0E48..0E4B    ; InCB; Extend # Mn   [4] THAI CHARACTER MAI EK..THAI CHARACTER MAI CHATTAWA
+0EB8..0EBA    ; InCB; Extend # Mn   [3] LAO VOWEL SIGN U..LAO SIGN PALI VIRAMA
+0EC8..0ECB    ; InCB; Extend # Mn   [4] LAO TONE MAI EK..LAO TONE MAI CATAWA
+0F18..0F19    ; InCB; Extend # Mn   [2] TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS
+0F35          ; InCB; Extend # Mn       TIBETAN MARK NGAS BZUNG NYI ZLA
+0F37          ; InCB; Extend # Mn       TIBETAN MARK NGAS BZUNG SGOR RTAGS
+0F39          ; InCB; Extend # Mn       TIBETAN MARK TSA -PHRU
+0F71..0F72    ; InCB; Extend # Mn   [2] TIBETAN VOWEL SIGN AA..TIBETAN VOWEL SIGN I
+0F74          ; InCB; Extend # Mn       TIBETAN VOWEL SIGN U
+0F7A..0F7D    ; InCB; Extend # Mn   [4] TIBETAN VOWEL SIGN E..TIBETAN VOWEL SIGN OO
+0F80          ; InCB; Extend # Mn       TIBETAN VOWEL SIGN REVERSED I
+0F82..0F84    ; InCB; Extend # Mn   [3] TIBETAN SIGN NYI ZLA NAA DA..TIBETAN MARK HALANTA
+0F86..0F87    ; InCB; Extend # Mn   [2] TIBETAN SIGN LCI RTAGS..TIBETAN SIGN YANG RTAGS
+0FC6          ; InCB; Extend # Mn       TIBETAN SYMBOL PADMA GDAN
+1037          ; InCB; Extend # Mn       MYANMAR SIGN DOT BELOW
+1039..103A    ; InCB; Extend # Mn   [2] MYANMAR SIGN VIRAMA..MYANMAR SIGN ASAT
+108D          ; InCB; Extend # Mn       MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE
+135D..135F    ; InCB; Extend # Mn   [3] ETHIOPIC COMBINING GEMINATION AND VOWEL LENGTH MARK..ETHIOPIC COMBINING GEMINATION MARK
+1714          ; InCB; Extend # Mn       TAGALOG SIGN VIRAMA
+17D2          ; InCB; Extend # Mn       KHMER SIGN COENG
+17DD          ; InCB; Extend # Mn       KHMER SIGN ATTHACAN
+18A9          ; InCB; Extend # Mn       MONGOLIAN LETTER ALI GALI DAGALGA
+1939..193B    ; InCB; Extend # Mn   [3] LIMBU SIGN MUKPHRENG..LIMBU SIGN SA-I
+1A17..1A18    ; InCB; Extend # Mn   [2] BUGINESE VOWEL SIGN I..BUGINESE VOWEL SIGN U
+1A60          ; InCB; Extend # Mn       TAI THAM SIGN SAKOT
+1A75..1A7C    ; InCB; Extend # Mn   [8] TAI THAM SIGN TONE-1..TAI THAM SIGN KHUEN-LUE KARAN
+1A7F          ; InCB; Extend # Mn       TAI THAM COMBINING CRYPTOGRAMMIC DOT
+1AB0..1ABD    ; InCB; Extend # Mn  [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
+1ABF..1ACE    ; InCB; Extend # Mn  [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T
+1B34          ; InCB; Extend # Mn       BALINESE SIGN REREKAN
+1B6B..1B73    ; InCB; Extend # Mn   [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG
+1BAB          ; InCB; Extend # Mn       SUNDANESE SIGN VIRAMA
+1BE6          ; InCB; Extend # Mn       BATAK SIGN TOMPI
+1C37          ; InCB; Extend # Mn       LEPCHA SIGN NUKTA
+1CD0..1CD2    ; InCB; Extend # Mn   [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA
+1CD4..1CE0    ; InCB; Extend # Mn  [13] VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA
+1CE2..1CE8    ; InCB; Extend # Mn   [7] VEDIC SIGN VISARGA SVARITA..VEDIC SIGN VISARGA ANUDATTA WITH TAIL
+1CED          ; InCB; Extend # Mn       VEDIC SIGN TIRYAK
+1CF4          ; InCB; Extend # Mn       VEDIC TONE CANDRA ABOVE
+1CF8..1CF9    ; InCB; Extend # Mn   [2] VEDIC TONE RING ABOVE..VEDIC TONE DOUBLE RING ABOVE
+1DC0..1DFF    ; InCB; Extend # Mn  [64] COMBINING DOTTED GRAVE ACCENT..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
+200D          ; InCB; Extend # Cf       ZERO WIDTH JOINER
+20D0..20DC    ; InCB; Extend # Mn  [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE
+20E1          ; InCB; Extend # Mn       COMBINING LEFT RIGHT ARROW ABOVE
+20E5..20F0    ; InCB; Extend # Mn  [12] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING ASTERISK ABOVE
+2CEF..2CF1    ; InCB; Extend # Mn   [3] COPTIC COMBINING NI ABOVE..COPTIC COMBINING SPIRITUS LENIS
+2D7F          ; InCB; Extend # Mn       TIFINAGH CONSONANT JOINER
+2DE0..2DFF    ; InCB; Extend # Mn  [32] COMBINING CYRILLIC LETTER BE..COMBINING CYRILLIC LETTER IOTIFIED BIG YUS
+302A..302D    ; InCB; Extend # Mn   [4] IDEOGRAPHIC LEVEL TONE MARK..IDEOGRAPHIC ENTERING TONE MARK
+302E..302F    ; InCB; Extend # Mc   [2] HANGUL SINGLE DOT TONE MARK..HANGUL DOUBLE DOT TONE MARK
+3099..309A    ; InCB; Extend # Mn   [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+A66F          ; InCB; Extend # Mn       COMBINING CYRILLIC VZMET
+A674..A67D    ; InCB; Extend # Mn  [10] COMBINING CYRILLIC LETTER UKRAINIAN IE..COMBINING CYRILLIC PAYEROK
+A69E..A69F    ; InCB; Extend # Mn   [2] COMBINING CYRILLIC LETTER EF..COMBINING CYRILLIC LETTER IOTIFIED E
+A6F0..A6F1    ; InCB; Extend # Mn   [2] BAMUM COMBINING MARK KOQNDON..BAMUM COMBINING MARK TUKWENTIS
+A82C          ; InCB; Extend # Mn       SYLOTI NAGRI SIGN ALTERNATE HASANTA
+A8E0..A8F1    ; InCB; Extend # Mn  [18] COMBINING DEVANAGARI DIGIT ZERO..COMBINING DEVANAGARI SIGN AVAGRAHA
+A92B..A92D    ; InCB; Extend # Mn   [3] KAYAH LI TONE PLOPHU..KAYAH LI TONE CALYA PLOPHU
+A9B3          ; InCB; Extend # Mn       JAVANESE SIGN CECAK TELU
+AAB0          ; InCB; Extend # Mn       TAI VIET MAI KANG
+AAB2..AAB4    ; InCB; Extend # Mn   [3] TAI VIET VOWEL I..TAI VIET VOWEL U
+AAB7..AAB8    ; InCB; Extend # Mn   [2] TAI VIET MAI KHIT..TAI VIET VOWEL IA
+AABE..AABF    ; InCB; Extend # Mn   [2] TAI VIET VOWEL AM..TAI VIET TONE MAI EK
+AAC1          ; InCB; Extend # Mn       TAI VIET TONE MAI THO
+AAF6          ; InCB; Extend # Mn       MEETEI MAYEK VIRAMA
+ABED          ; InCB; Extend # Mn       MEETEI MAYEK APUN IYEK
+FB1E          ; InCB; Extend # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
+FE20..FE2F    ; InCB; Extend # Mn  [16] COMBINING LIGATURE LEFT HALF..COMBINING CYRILLIC TITLO RIGHT HALF
+101FD         ; InCB; Extend # Mn       PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE
+102E0         ; InCB; Extend # Mn       COPTIC EPACT THOUSANDS MARK
+10376..1037A  ; InCB; Extend # Mn   [5] COMBINING OLD PERMIC LETTER AN..COMBINING OLD PERMIC LETTER SII
+10A0D         ; InCB; Extend # Mn       KHAROSHTHI SIGN DOUBLE RING BELOW
+10A0F         ; InCB; Extend # Mn       KHAROSHTHI SIGN VISARGA
+10A38..10A3A  ; InCB; Extend # Mn   [3] KHAROSHTHI SIGN BAR ABOVE..KHAROSHTHI SIGN DOT BELOW
+10A3F         ; InCB; Extend # Mn       KHAROSHTHI VIRAMA
+10AE5..10AE6  ; InCB; Extend # Mn   [2] MANICHAEAN ABBREVIATION MARK ABOVE..MANICHAEAN ABBREVIATION MARK BELOW
+10D24..10D27  ; InCB; Extend # Mn   [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI
+10EAB..10EAC  ; InCB; Extend # Mn   [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK
+10EFD..10EFF  ; InCB; Extend # Mn   [3] ARABIC SMALL LOW WORD SAKTA..ARABIC SMALL LOW WORD MADDA
+10F46..10F50  ; InCB; Extend # Mn  [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW
+10F82..10F85  ; InCB; Extend # Mn   [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW
+11070         ; InCB; Extend # Mn       BRAHMI SIGN OLD TAMIL VIRAMA
+1107F         ; InCB; Extend # Mn       BRAHMI NUMBER JOINER
+110BA         ; InCB; Extend # Mn       KAITHI SIGN NUKTA
+11100..11102  ; InCB; Extend # Mn   [3] CHAKMA SIGN CANDRABINDU..CHAKMA SIGN VISARGA
+11133..11134  ; InCB; Extend # Mn   [2] CHAKMA VIRAMA..CHAKMA MAAYYAA
+11173         ; InCB; Extend # Mn       MAHAJANI SIGN NUKTA
+111CA         ; InCB; Extend # Mn       SHARADA SIGN NUKTA
+11236         ; InCB; Extend # Mn       KHOJKI SIGN NUKTA
+112E9..112EA  ; InCB; Extend # Mn   [2] KHUDAWADI SIGN NUKTA..KHUDAWADI SIGN VIRAMA
+1133B..1133C  ; InCB; Extend # Mn   [2] COMBINING BINDU BELOW..GRANTHA SIGN NUKTA
+11366..1136C  ; InCB; Extend # Mn   [7] COMBINING GRANTHA DIGIT ZERO..COMBINING GRANTHA DIGIT SIX
+11370..11374  ; InCB; Extend # Mn   [5] COMBINING GRANTHA LETTER A..COMBINING GRANTHA LETTER PA
+11446         ; InCB; Extend # Mn       NEWA SIGN NUKTA
+1145E         ; InCB; Extend # Mn       NEWA SANDHI MARK
+114C3         ; InCB; Extend # Mn       TIRHUTA SIGN NUKTA
+115C0         ; InCB; Extend # Mn       SIDDHAM SIGN NUKTA
+116B7         ; InCB; Extend # Mn       TAKRI SIGN NUKTA
+1172B         ; InCB; Extend # Mn       AHOM SIGN KILLER
+1183A         ; InCB; Extend # Mn       DOGRA SIGN NUKTA
+1193E         ; InCB; Extend # Mn       DIVES AKURU VIRAMA
+11943         ; InCB; Extend # Mn       DIVES AKURU SIGN NUKTA
+11A34         ; InCB; Extend # Mn       ZANABAZAR SQUARE SIGN VIRAMA
+11A47         ; InCB; Extend # Mn       ZANABAZAR SQUARE SUBJOINER
+11A99         ; InCB; Extend # Mn       SOYOMBO SUBJOINER
+11D42         ; InCB; Extend # Mn       MASARAM GONDI SIGN NUKTA
+11D44..11D45  ; InCB; Extend # Mn   [2] MASARAM GONDI SIGN HALANTA..MASARAM GONDI VIRAMA
+11D97         ; InCB; Extend # Mn       GUNJALA GONDI VIRAMA
+11F42         ; InCB; Extend # Mn       KAWI CONJOINER
+16AF0..16AF4  ; InCB; Extend # Mn   [5] BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE
+16B30..16B36  ; InCB; Extend # Mn   [7] PAHAWH HMONG MARK CIM TUB..PAHAWH HMONG MARK CIM TAUM
+1BC9E         ; InCB; Extend # Mn       DUPLOYAN DOUBLE MARK
+1D165         ; InCB; Extend # Mc       MUSICAL SYMBOL COMBINING STEM
+1D167..1D169  ; InCB; Extend # Mn   [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3
+1D16E..1D172  ; InCB; Extend # Mc   [5] MUSICAL SYMBOL COMBINING FLAG-1..MUSICAL SYMBOL COMBINING FLAG-5
+1D17B..1D182  ; InCB; Extend # Mn   [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE
+1D185..1D18B  ; InCB; Extend # Mn   [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE
+1D1AA..1D1AD  ; InCB; Extend # Mn   [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO
+1D242..1D244  ; InCB; Extend # Mn   [3] COMBINING GREEK MUSICAL TRISEME..COMBINING GREEK MUSICAL PENTASEME
+1E000..1E006  ; InCB; Extend # Mn   [7] COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE
+1E008..1E018  ; InCB; Extend # Mn  [17] COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU
+1E01B..1E021  ; InCB; Extend # Mn   [7] COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI
+1E023..1E024  ; InCB; Extend # Mn   [2] COMBINING GLAGOLITIC LETTER YU..COMBINING GLAGOLITIC LETTER SMALL YUS
+1E026..1E02A  ; InCB; Extend # Mn   [5] COMBINING GLAGOLITIC LETTER YO..COMBINING GLAGOLITIC LETTER FITA
+1E08F         ; InCB; Extend # Mn       COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+1E130..1E136  ; InCB; Extend # Mn   [7] NYIAKENG PUACHUE HMONG TONE-B..NYIAKENG PUACHUE HMONG TONE-D
+1E2AE         ; InCB; Extend # Mn       TOTO SIGN RISING TONE
+1E2EC..1E2EF  ; InCB; Extend # Mn   [4] WANCHO TONE TUP..WANCHO TONE KOINI
+1E4EC..1E4EF  ; InCB; Extend # Mn   [4] NAG MUNDARI SIGN MUHOR..NAG MUNDARI SIGN SUTUH
+1E8D0..1E8D6  ; InCB; Extend # Mn   [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS
+1E944..1E94A  ; InCB; Extend # Mn   [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA
+
+# Total code points: 884
+
 # EOF
diff --git a/src/java.base/share/data/unicodedata/NormalizationTest.txt b/src/java.base/share/data/unicodedata/NormalizationTest.txt
index 85cc2c9276a..968386d3672 100644
--- a/src/java.base/share/data/unicodedata/NormalizationTest.txt
+++ b/src/java.base/share/data/unicodedata/NormalizationTest.txt
@@ -1,6 +1,6 @@
-# NormalizationTest-15.0.0.txt
-# Date: 2022-04-02, 01:29:09 GMT
-# Copyright (c) 2022 Unicode, Inc.
+# NormalizationTest-15.1.0.txt
+# Date: 2023-01-05, 20:34:44 GMT
+# Copyright (c) 2023 Unicode, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
diff --git a/src/java.base/share/data/unicodedata/PropList.txt b/src/java.base/share/data/unicodedata/PropList.txt
index 86f92816a08..0b6964229f6 100644
--- a/src/java.base/share/data/unicodedata/PropList.txt
+++ b/src/java.base/share/data/unicodedata/PropList.txt
@@ -1,6 +1,6 @@
-# PropList-15.0.0.txt
-# Date: 2022-08-05, 22:17:16 GMT
-# Copyright (c) 2022 Unicode, Inc.
+# PropList-15.1.0.txt
+# Date: 2023-08-01, 21:56:53 GMT
+# Copyright (c) 2023 Unicode, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
@@ -856,11 +856,12 @@ FA70..FAD9    ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COM
 2B740..2B81D  ; Ideographic # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B820..2CEA1  ; Ideographic # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
 2CEB0..2EBE0  ; Ideographic # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
+2EBF0..2EE5D  ; Ideographic # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; Ideographic # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; Ideographic # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
 31350..323AF  ; Ideographic # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
 
-# Total code points: 105854
+# Total code points: 106476
 
 # ================================================
 
@@ -1241,9 +1242,10 @@ E0020..E007F  ; Other_Grapheme_Extend # Cf  [96] TAG SPACE..CANCEL TAG
 # ================================================
 
 2FF0..2FF1    ; IDS_Binary_Operator # So   [2] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW
-2FF4..2FFB    ; IDS_Binary_Operator # So   [8] IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID
+2FF4..2FFD    ; IDS_Binary_Operator # So  [10] IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND..IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER RIGHT
+31EF          ; IDS_Binary_Operator # So       IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION
 
-# Total code points: 10
+# Total code points: 13
 
 # ================================================
 
@@ -1253,6 +1255,12 @@ E0020..E007F  ; Other_Grapheme_Extend # Cf  [96] TAG SPACE..CANCEL TAG
 
 # ================================================
 
+2FFE..2FFF    ; IDS_Unary_Operator # So   [2] IDEOGRAPHIC DESCRIPTION CHARACTER HORIZONTAL REFLECTION..IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION
+
+# Total code points: 2
+
+# ================================================
+
 2E80..2E99    ; Radical # So  [26] CJK RADICAL REPEAT..CJK RADICAL RAP
 2E9B..2EF3    ; Radical # So  [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE
 2F00..2FD5    ; Radical # So [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE
@@ -1275,10 +1283,11 @@ FA27..FA29    ; Unified_Ideograph # Lo   [3] CJK COMPATIBILITY IDEOGRAPH-FA27..C
 2B740..2B81D  ; Unified_Ideograph # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B820..2CEA1  ; Unified_Ideograph # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
 2CEB0..2EBE0  ; Unified_Ideograph # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
+2EBF0..2EE5D  ; Unified_Ideograph # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 30000..3134A  ; Unified_Ideograph # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
 31350..323AF  ; Unified_Ideograph # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
 
-# Total code points: 97058
+# Total code points: 97680
 
 # ================================================
 
@@ -1376,8 +1385,58 @@ AABB..AABC    ; Logical_Order_Exception # Lo   [2] TAI VIET VOWEL AUE..TAI VIET
 0387          ; Other_ID_Continue # Po       GREEK ANO TELEIA
 1369..1371    ; Other_ID_Continue # No   [9] ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE
 19DA          ; Other_ID_Continue # No       NEW TAI LUE THAM DIGIT ONE
+200C..200D    ; Other_ID_Continue # Cf   [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER
+30FB          ; Other_ID_Continue # Po       KATAKANA MIDDLE DOT
+FF65          ; Other_ID_Continue # Po       HALFWIDTH KATAKANA MIDDLE DOT
 
-# Total code points: 12
+# Total code points: 16
+
+# ================================================
+
+00B2..00B3    ; ID_Compat_Math_Continue # No   [2] SUPERSCRIPT TWO..SUPERSCRIPT THREE
+00B9          ; ID_Compat_Math_Continue # No       SUPERSCRIPT ONE
+2070          ; ID_Compat_Math_Continue # No       SUPERSCRIPT ZERO
+2074..2079    ; ID_Compat_Math_Continue # No   [6] SUPERSCRIPT FOUR..SUPERSCRIPT NINE
+207A..207C    ; ID_Compat_Math_Continue # Sm   [3] SUPERSCRIPT PLUS SIGN..SUPERSCRIPT EQUALS SIGN
+207D          ; ID_Compat_Math_Continue # Ps       SUPERSCRIPT LEFT PARENTHESIS
+207E          ; ID_Compat_Math_Continue # Pe       SUPERSCRIPT RIGHT PARENTHESIS
+2080..2089    ; ID_Compat_Math_Continue # No  [10] SUBSCRIPT ZERO..SUBSCRIPT NINE
+208A..208C    ; ID_Compat_Math_Continue # Sm   [3] SUBSCRIPT PLUS SIGN..SUBSCRIPT EQUALS SIGN
+208D          ; ID_Compat_Math_Continue # Ps       SUBSCRIPT LEFT PARENTHESIS
+208E          ; ID_Compat_Math_Continue # Pe       SUBSCRIPT RIGHT PARENTHESIS
+2202          ; ID_Compat_Math_Continue # Sm       PARTIAL DIFFERENTIAL
+2207          ; ID_Compat_Math_Continue # Sm       NABLA
+221E          ; ID_Compat_Math_Continue # Sm       INFINITY
+1D6C1         ; ID_Compat_Math_Continue # Sm       MATHEMATICAL BOLD NABLA
+1D6DB         ; ID_Compat_Math_Continue # Sm       MATHEMATICAL BOLD PARTIAL DIFFERENTIAL
+1D6FB         ; ID_Compat_Math_Continue # Sm       MATHEMATICAL ITALIC NABLA
+1D715         ; ID_Compat_Math_Continue # Sm       MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL
+1D735         ; ID_Compat_Math_Continue # Sm       MATHEMATICAL BOLD ITALIC NABLA
+1D74F         ; ID_Compat_Math_Continue # Sm       MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL
+1D76F         ; ID_Compat_Math_Continue # Sm       MATHEMATICAL SANS-SERIF BOLD NABLA
+1D789         ; ID_Compat_Math_Continue # Sm       MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL
+1D7A9         ; ID_Compat_Math_Continue # Sm       MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA
+1D7C3         ; ID_Compat_Math_Continue # Sm       MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL
+
+# Total code points: 43
+
+# ================================================
+
+2202          ; ID_Compat_Math_Start # Sm       PARTIAL DIFFERENTIAL
+2207          ; ID_Compat_Math_Start # Sm       NABLA
+221E          ; ID_Compat_Math_Start # Sm       INFINITY
+1D6C1         ; ID_Compat_Math_Start # Sm       MATHEMATICAL BOLD NABLA
+1D6DB         ; ID_Compat_Math_Start # Sm       MATHEMATICAL BOLD PARTIAL DIFFERENTIAL
+1D6FB         ; ID_Compat_Math_Start # Sm       MATHEMATICAL ITALIC NABLA
+1D715         ; ID_Compat_Math_Start # Sm       MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL
+1D735         ; ID_Compat_Math_Start # Sm       MATHEMATICAL BOLD ITALIC NABLA
+1D74F         ; ID_Compat_Math_Start # Sm       MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL
+1D76F         ; ID_Compat_Math_Start # Sm       MATHEMATICAL SANS-SERIF BOLD NABLA
+1D789         ; ID_Compat_Math_Start # Sm       MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL
+1D7A9         ; ID_Compat_Math_Start # Sm       MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA
+1D7C3         ; ID_Compat_Math_Start # Sm       MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL
+
+# Total code points: 13
 
 # ================================================
 
@@ -1398,6 +1457,7 @@ AABB..AABC    ; Logical_Order_Exception # Lo   [2] TAI VIET VOWEL AUE..TAI VIET
 1367..1368    ; Sentence_Terminal # Po   [2] ETHIOPIC QUESTION MARK..ETHIOPIC PARAGRAPH SEPARATOR
 166E          ; Sentence_Terminal # Po       CANADIAN SYLLABICS FULL STOP
 1735..1736    ; Sentence_Terminal # Po   [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION
+17D4..17D5    ; Sentence_Terminal # Po   [2] KHMER SIGN KHAN..KHMER SIGN BARIYOOSAN
 1803          ; Sentence_Terminal # Po       MONGOLIAN FULL STOP
 1809          ; Sentence_Terminal # Po       MONGOLIAN MANCHU FULL STOP
 1944..1945    ; Sentence_Terminal # Po   [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK
@@ -1462,7 +1522,7 @@ FF61          ; Sentence_Terminal # Po       HALFWIDTH IDEOGRAPHIC FULL STOP
 1BC9F         ; Sentence_Terminal # Po       DUPLOYAN PUNCTUATION CHINOOK FULL STOP
 1DA88         ; Sentence_Terminal # Po       SIGNWRITING FULL STOP
 
-# Total code points: 154
+# Total code points: 156
 
 # ================================================
 
diff --git a/src/java.base/share/data/unicodedata/PropertyValueAliases.txt b/src/java.base/share/data/unicodedata/PropertyValueAliases.txt
index 4a7a48bb685..2aa856104ca 100644
--- a/src/java.base/share/data/unicodedata/PropertyValueAliases.txt
+++ b/src/java.base/share/data/unicodedata/PropertyValueAliases.txt
@@ -1,6 +1,6 @@
-# PropertyValueAliases-15.0.0.txt
-# Date: 2022-08-05, 23:42:17 GMT
-# Copyright (c) 2022 Unicode, Inc.
+# PropertyValueAliases-15.1.0.txt
+# Date: 2023-08-07, 15:21:34 GMT
+# Copyright (c) 2023 Unicode, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
@@ -91,6 +91,7 @@ age; 12.1                             ; V12_1
 age; 13.0                             ; V13_0
 age; 14.0                             ; V14_0
 age; 15.0                             ; V15_0
+age; 15.1                             ; V15_1
 age; NA                               ; Unassigned
 
 # Alphabetic (Alpha)
@@ -208,6 +209,7 @@ blk; CJK_Ext_E                        ; CJK_Unified_Ideographs_Extension_E
 blk; CJK_Ext_F                        ; CJK_Unified_Ideographs_Extension_F
 blk; CJK_Ext_G                        ; CJK_Unified_Ideographs_Extension_G
 blk; CJK_Ext_H                        ; CJK_Unified_Ideographs_Extension_H
+blk; CJK_Ext_I                        ; CJK_Unified_Ideographs_Extension_I
 blk; CJK_Radicals_Sup                 ; CJK_Radicals_Supplement
 blk; CJK_Strokes                      ; CJK_Strokes
 blk; CJK_Symbols                      ; CJK_Symbols_And_Punctuation
@@ -817,6 +819,21 @@ IDSB; Y                               ; Yes                              ; T
 IDST; N                               ; No                               ; F                                ; False
 IDST; Y                               ; Yes                              ; T                                ; True
 
+# IDS_Unary_Operator (IDSU)
+
+IDSU; N                               ; No                               ; F                                ; False
+IDSU; Y                               ; Yes                              ; T                                ; True
+
+# ID_Compat_Math_Continue (ID_Compat_Math_Continue)
+
+ID_Compat_Math_Continue; N            ; No                               ; F                                ; False
+ID_Compat_Math_Continue; Y            ; Yes                              ; T                                ; True
+
+# ID_Compat_Math_Start (ID_Compat_Math_Start)
+
+ID_Compat_Math_Start; N               ; No                               ; F                                ; False
+ID_Compat_Math_Start; Y               ; Yes                              ; T                                ; True
+
 # ID_Continue (IDC)
 
 IDC; N                                ; No                               ; F                                ; False
@@ -836,6 +853,13 @@ IDS; Y                                ; Yes                              ; T
 Ideo; N                               ; No                               ; F                                ; False
 Ideo; Y                               ; Yes                              ; T                                ; True
 
+# Indic_Conjunct_Break (InCB)
+
+InCB; Consonant                       ; Consonant
+InCB; Extend                          ; Extend
+InCB; Linker                          ; Linker
+InCB; None                            ; None
+
 # Indic_Positional_Category (InPC)
 
 InPC; Bottom                          ; Bottom
@@ -1074,7 +1098,10 @@ jt ; U                                ; Non_Joining
 # Line_Break (lb)
 
 lb ; AI                               ; Ambiguous
+lb ; AK                               ; Aksara
 lb ; AL                               ; Alphabetic
+lb ; AP                               ; Aksara_Prebase
+lb ; AS                               ; Aksara_Start
 lb ; B2                               ; Break_Both
 lb ; BA                               ; Break_After
 lb ; BB                               ; Break_Before
@@ -1112,6 +1139,8 @@ lb ; SA                               ; Complex_Context
 lb ; SG                               ; Surrogate
 lb ; SP                               ; Space
 lb ; SY                               ; Break_Symbols
+lb ; VF                               ; Virama_Final
+lb ; VI                               ; Virama
 lb ; WJ                               ; Word_Joiner
 lb ; XX                               ; Unknown
 lb ; ZW                               ; ZWSpace
@@ -1156,6 +1185,9 @@ NFKC_QC; M                            ; Maybe
 NFKC_QC; N                            ; No
 NFKC_QC; Y                            ; Yes
 
+# NFKC_Simple_Casefold (NFKC_SCF)
+
+
 # NFKD_Quick_Check (NFKD_QC)
 
 NFKD_QC; N                            ; No
diff --git a/src/java.base/share/data/unicodedata/ReadMe.txt b/src/java.base/share/data/unicodedata/ReadMe.txt
index a92019ce58d..7f7ef848b30 100644
--- a/src/java.base/share/data/unicodedata/ReadMe.txt
+++ b/src/java.base/share/data/unicodedata/ReadMe.txt
@@ -1,6 +1,6 @@
 # Unicode Character Database
-# Date: 2022-09-02
-# Copyright (c) 2022 Unicode, Inc.
+# Date: 2023-08-28
+# Copyright (c) 2023 Unicode, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
@@ -10,7 +10,7 @@
 # UAX #44, "Unicode Character Database"
 # UTS #51, "Unicode Emoji"
 #
-# The UAXes and UTS #51 can be accessed at https://www.unicode.org/versions/Unicode15.0.0/
+# The UAXes and UTS #51 can be accessed at https://www.unicode.org/versions/Unicode15.1.0/
 
-This directory contains the final data files
-for the Unicode Character Database, for Version 15.0.0 of the Unicode Standard.
+This directory contains final data files
+for the Unicode Character Database, for Version 15.1.0 of the Unicode Standard.
diff --git a/src/java.base/share/data/unicodedata/Scripts.txt b/src/java.base/share/data/unicodedata/Scripts.txt
index 601b0ccafc5..0722c27ccef 100644
--- a/src/java.base/share/data/unicodedata/Scripts.txt
+++ b/src/java.base/share/data/unicodedata/Scripts.txt
@@ -1,6 +1,6 @@
-# Scripts-15.0.0.txt
-# Date: 2022-04-26, 23:15:02 GMT
-# Copyright (c) 2022 Unicode, Inc.
+# Scripts-15.1.0.txt
+# Date: 2023-07-28, 16:01:07 GMT
+# Copyright (c) 2023 Unicode, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
@@ -357,7 +357,7 @@
 2E5B          ; Common # Ps       BOTTOM HALF LEFT PARENTHESIS
 2E5C          ; Common # Pe       BOTTOM HALF RIGHT PARENTHESIS
 2E5D          ; Common # Pd       OBLIQUE HYPHEN
-2FF0..2FFB    ; Common # So  [12] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID
+2FF0..2FFF    ; Common # So  [16] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION
 3000          ; Common # Zs       IDEOGRAPHIC SPACE
 3001..3003    ; Common # Po   [3] IDEOGRAPHIC COMMA..DITTO MARK
 3004          ; Common # So       JAPANESE INDUSTRIAL STANDARD SYMBOL
@@ -399,6 +399,7 @@
 3192..3195    ; Common # No   [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK
 3196..319F    ; Common # So  [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK
 31C0..31E3    ; Common # So  [36] CJK STROKE T..CJK STROKE Q
+31EF          ; Common # So       IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION
 3220..3229    ; Common # No  [10] PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN
 322A..3247    ; Common # So  [30] PARENTHESIZED IDEOGRAPH MOON..CIRCLED IDEOGRAPH KOTO
 3248..324F    ; Common # No   [8] CIRCLED NUMBER TEN ON BLACK SQUARE..CIRCLED NUMBER EIGHTY ON BLACK SQUARE
@@ -629,7 +630,7 @@ FFFC..FFFD    ; Common # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR
 E0001         ; Common # Cf       LANGUAGE TAG
 E0020..E007F  ; Common # Cf  [96] TAG SPACE..CANCEL TAG
 
-# Total code points: 8301
+# Total code points: 8306
 
 # ================================================
 
@@ -1593,11 +1594,12 @@ FA70..FAD9    ; Han # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILI
 2B740..2B81D  ; Han # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B820..2CEA1  ; Han # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
 2CEB0..2EBE0  ; Han # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
+2EBF0..2EE5D  ; Han # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; Han # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; Han # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
 31350..323AF  ; Han # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
 
-# Total code points: 98408
+# Total code points: 99030
 
 # ================================================
 
diff --git a/src/java.base/share/data/unicodedata/SpecialCasing.txt b/src/java.base/share/data/unicodedata/SpecialCasing.txt
index 6a07afdc168..3d6280f8488 100644
--- a/src/java.base/share/data/unicodedata/SpecialCasing.txt
+++ b/src/java.base/share/data/unicodedata/SpecialCasing.txt
@@ -1,6 +1,6 @@
-# SpecialCasing-15.0.0.txt
-# Date: 2022-02-02, 23:35:52 GMT
-# Copyright (c) 2022 Unicode, Inc.
+# SpecialCasing-15.1.0.txt
+# Date: 2023-01-05, 20:35:03 GMT
+# Copyright (c) 2023 Unicode, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
diff --git a/src/java.base/share/data/unicodedata/UnicodeData.txt b/src/java.base/share/data/unicodedata/UnicodeData.txt
index ea963a7162c..bdcc41850d7 100644
--- a/src/java.base/share/data/unicodedata/UnicodeData.txt
+++ b/src/java.base/share/data/unicodedata/UnicodeData.txt
@@ -11231,6 +11231,10 @@
 2FF9;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT;So;0;ON;;;;;N;;;;;
 2FFA;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT;So;0;ON;;;;;N;;;;;
 2FFB;IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID;So;0;ON;;;;;N;;;;;
+2FFC;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM RIGHT;So;0;ON;;;;;N;;;;;
+2FFD;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER RIGHT;So;0;ON;;;;;N;;;;;
+2FFE;IDEOGRAPHIC DESCRIPTION CHARACTER HORIZONTAL REFLECTION;So;0;ON;;;;;N;;;;;
+2FFF;IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION;So;0;ON;;;;;N;;;;;
 3000;IDEOGRAPHIC SPACE;Zs;0;WS;<wide> 0020;;;;N;;;;;
 3001;IDEOGRAPHIC COMMA;Po;0;ON;;;;;N;;;;;
 3002;IDEOGRAPHIC FULL STOP;Po;0;ON;;;;;N;IDEOGRAPHIC PERIOD;;;;
@@ -11705,6 +11709,7 @@
 31E1;CJK STROKE HZZZG;So;0;ON;;;;;N;;;;;
 31E2;CJK STROKE PG;So;0;ON;;;;;N;;;;;
 31E3;CJK STROKE Q;So;0;ON;;;;;N;;;;;
+31EF;IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION;So;0;ON;;;;;N;;;;;
 31F0;KATAKANA LETTER SMALL KU;Lo;0;L;;;;;N;;;;;
 31F1;KATAKANA LETTER SMALL SI;Lo;0;L;;;;;N;;;;;
 31F2;KATAKANA LETTER SMALL SU;Lo;0;L;;;;;N;;;;;
@@ -34035,6 +34040,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 2CEA1;<CJK Ideograph Extension E, Last>;Lo;0;L;;;;;N;;;;;
 2CEB0;<CJK Ideograph Extension F, First>;Lo;0;L;;;;;N;;;;;
 2EBE0;<CJK Ideograph Extension F, Last>;Lo;0;L;;;;;N;;;;;
+2EBF0;<CJK Ideograph Extension I, First>;Lo;0;L;;;;;N;;;;;
+2EE5D;<CJK Ideograph Extension I, Last>;Lo;0;L;;;;;N;;;;;
 2F800;CJK COMPATIBILITY IDEOGRAPH-2F800;Lo;0;L;4E3D;;;;N;;;;;
 2F801;CJK COMPATIBILITY IDEOGRAPH-2F801;Lo;0;L;4E38;;;;N;;;;;
 2F802;CJK COMPATIBILITY IDEOGRAPH-2F802;Lo;0;L;4E41;;;;N;;;;;
diff --git a/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt
index a10972a8acb..01a4ef02441 100644
--- a/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt
+++ b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt
@@ -1,6 +1,6 @@
-# GraphemeBreakProperty-15.0.0.txt
-# Date: 2022-04-27, 17:07:38 GMT
-# Copyright (c) 2022 Unicode, Inc.
+# GraphemeBreakProperty-15.1.0.txt
+# Date: 2023-01-05, 20:34:41 GMT
+# Copyright (c) 2023 Unicode, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
diff --git a/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt
index 08d572e0da2..29a3ecb360b 100644
--- a/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt
+++ b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt
@@ -1,6 +1,6 @@
-# GraphemeBreakTest-15.0.0.txt
-# Date: 2022-02-26, 00:38:37 GMT
-# Copyright (c) 2022 Unicode, Inc.
+# GraphemeBreakTest-15.1.0.txt
+# Date: 2023-08-07, 15:52:55 GMT
+# Copyright (c) 2023 Unicode, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
@@ -36,8 +36,8 @@
 ÷ 0020 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 0020 ÷ 0600 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 0020 × 0308 ÷ 0600 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0020 × 0903 ÷	#  ÷ [0.2] SPACE (Other) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0020 × 0308 × 0903 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0020 × 0A03 ÷	#  ÷ [0.2] SPACE (Other) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0020 × 0308 × 0A03 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 0020 ÷ 1100 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0020 × 0308 ÷ 1100 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0020 ÷ 1160 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -48,10 +48,24 @@
 ÷ 0020 × 0308 ÷ AC00 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 0020 ÷ AC01 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 0020 × 0308 ÷ AC01 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0020 × 0900 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0020 × 0308 × 0900 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0020 × 0903 ÷	#  ÷ [0.2] SPACE (Other) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0020 × 0308 × 0903 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0020 ÷ 0904 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0020 × 0308 ÷ 0904 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0020 ÷ 0D4E ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0020 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0020 ÷ 0915 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0020 × 0308 ÷ 0915 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 0020 ÷ 231A ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 0020 × 0308 ÷ 231A ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 0020 × 0300 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 0020 × 0308 × 0300 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0020 × 093C ÷	#  ÷ [0.2] SPACE (Other) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0020 × 0308 × 093C ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0020 × 094D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0020 × 0308 × 094D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 0020 × 200D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0020 × 0308 × 200D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0020 ÷ 0378 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -70,8 +84,8 @@
 ÷ 000D ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 000D ÷ 0600 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 000D ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 000D ÷ 0903 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 000D ÷ 0308 × 0903 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 000D ÷ 0A03 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 000D ÷ 0308 × 0A03 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 000D ÷ 1100 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 000D ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 000D ÷ 1160 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -82,10 +96,24 @@
 ÷ 000D ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 000D ÷ AC01 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 000D ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 000D ÷ 0900 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 000D ÷ 0308 × 0900 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 000D ÷ 0903 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 000D ÷ 0308 × 0903 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 000D ÷ 0904 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 0904 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 000D ÷ 0D4E ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 0D4E ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 000D ÷ 0915 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 0915 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 000D ÷ 231A ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 000D ÷ 0308 ÷ 231A ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 000D ÷ 0300 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 000D ÷ 0308 × 0300 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 000D ÷ 093C ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 000D ÷ 0308 × 093C ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 000D ÷ 094D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 000D ÷ 0308 × 094D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 000D ÷ 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 000D ÷ 0308 × 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 000D ÷ 0378 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
@@ -104,8 +132,8 @@
 ÷ 000A ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 000A ÷ 0600 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 000A ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 000A ÷ 0903 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 000A ÷ 0308 × 0903 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 000A ÷ 0A03 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 000A ÷ 0308 × 0A03 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 000A ÷ 1100 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 000A ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 000A ÷ 1160 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -116,10 +144,24 @@
 ÷ 000A ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 000A ÷ AC01 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 000A ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 000A ÷ 0900 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 000A ÷ 0308 × 0900 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 000A ÷ 0903 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 000A ÷ 0308 × 0903 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 000A ÷ 0904 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 0904 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 000A ÷ 0D4E ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 0D4E ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 000A ÷ 0915 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 0915 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 000A ÷ 231A ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 000A ÷ 0308 ÷ 231A ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 000A ÷ 0300 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 000A ÷ 0308 × 0300 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 000A ÷ 093C ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 000A ÷ 0308 × 093C ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 000A ÷ 094D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 000A ÷ 0308 × 094D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 000A ÷ 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 000A ÷ 0308 × 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 000A ÷ 0378 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
@@ -138,8 +180,8 @@
 ÷ 0001 ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 0001 ÷ 0600 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 0001 ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0001 ÷ 0903 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0001 ÷ 0308 × 0903 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0001 ÷ 0A03 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0001 ÷ 0308 × 0A03 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 0001 ÷ 1100 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0001 ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0001 ÷ 1160 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -150,10 +192,24 @@
 ÷ 0001 ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 0001 ÷ AC01 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 0001 ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0001 ÷ 0900 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0001 ÷ 0308 × 0900 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0001 ÷ 0903 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0001 ÷ 0308 × 0903 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0001 ÷ 0904 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 0904 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0001 ÷ 0D4E ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 0D4E ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0001 ÷ 0915 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 0915 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 0001 ÷ 231A ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 0001 ÷ 0308 ÷ 231A ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 0001 ÷ 0300 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 0001 ÷ 0308 × 0300 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0001 ÷ 093C ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0001 ÷ 0308 × 093C ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0001 ÷ 094D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0001 ÷ 0308 × 094D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 0001 ÷ 200D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0001 ÷ 0308 × 200D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0001 ÷ 0378 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
@@ -172,8 +228,8 @@
 ÷ 034F × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 034F ÷ 0600 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 034F × 0308 ÷ 0600 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 034F × 0903 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 034F × 0308 × 0903 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 034F × 0A03 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 034F × 0308 × 0A03 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 034F ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 034F × 0308 ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 034F ÷ 1160 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -184,10 +240,24 @@
 ÷ 034F × 0308 ÷ AC00 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 034F ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 034F × 0308 ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 034F × 0900 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 034F × 0308 × 0900 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 034F × 0903 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 034F × 0308 × 0903 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 034F ÷ 0904 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 034F × 0308 ÷ 0904 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 034F ÷ 0D4E ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 034F × 0308 ÷ 0D4E ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 034F ÷ 0915 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 034F × 0308 ÷ 0915 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 034F ÷ 231A ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 034F × 0308 ÷ 231A ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 034F × 0300 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 034F × 0308 × 0300 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 034F × 093C ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 034F × 0308 × 093C ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 034F × 094D ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 034F × 0308 × 094D ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 034F × 200D ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 034F × 0308 × 200D ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 034F ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -206,8 +276,8 @@
 ÷ 1F1E6 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 1F1E6 ÷ 0600 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 1F1E6 × 0308 ÷ 0600 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1F1E6 × 0903 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1F1E6 × 0308 × 0903 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1F1E6 × 0A03 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1F1E6 × 0308 × 0A03 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 1F1E6 ÷ 1100 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 1F1E6 × 0308 ÷ 1100 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 1F1E6 ÷ 1160 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -218,10 +288,24 @@
 ÷ 1F1E6 × 0308 ÷ AC00 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 1F1E6 ÷ AC01 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 1F1E6 × 0308 ÷ AC01 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 1F1E6 × 0900 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1F1E6 × 0308 × 0900 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1F1E6 × 0903 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1F1E6 × 0308 × 0903 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1F1E6 ÷ 0904 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 0904 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 1F1E6 ÷ 0D4E ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1F1E6 ÷ 0915 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 0915 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 1F1E6 ÷ 231A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 1F1E6 × 0308 ÷ 231A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 1F1E6 × 0300 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 1F1E6 × 0308 × 0300 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 1F1E6 × 093C ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 1F1E6 × 0308 × 093C ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 1F1E6 × 094D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 1F1E6 × 0308 × 094D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 1F1E6 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 1F1E6 × 0308 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 1F1E6 ÷ 0378 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -240,8 +324,8 @@
 ÷ 0600 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 0600 × 0600 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 0600 × 0308 ÷ 0600 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0600 × 0903 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0600 × 0308 × 0903 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0600 × 0A03 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0600 × 0308 × 0A03 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 0600 × 1100 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0600 × 0308 ÷ 1100 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0600 × 1160 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -252,48 +336,76 @@
 ÷ 0600 × 0308 ÷ AC00 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 0600 × AC01 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 0600 × 0308 ÷ AC01 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0600 × 0900 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0600 × 0308 × 0900 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0600 × 0903 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0600 × 0308 × 0903 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0600 × 0904 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0600 × 0308 ÷ 0904 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0600 × 0D4E ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0600 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0600 × 0915 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0600 × 0308 ÷ 0915 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 0600 × 231A ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] WATCH (ExtPict) ÷ [0.3]
 ÷ 0600 × 0308 ÷ 231A ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 0600 × 0300 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 0600 × 0308 × 0300 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0600 × 093C ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0600 × 0308 × 093C ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0600 × 094D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0600 × 0308 × 094D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 0600 × 200D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0600 × 0308 × 200D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0600 × 0378 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] <reserved-0378> (Other) ÷ [0.3]
 ÷ 0600 × 0308 ÷ 0378 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0903 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0903 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0903 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0903 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0903 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0903 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0903 × 034F ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
-÷ 0903 × 0308 × 034F ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
-÷ 0903 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0903 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0903 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0903 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0903 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0903 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0903 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0903 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0903 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0903 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0903 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0903 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0903 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0903 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0903 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0903 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0903 × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0903 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0903 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0903 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0903 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0903 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0A03 ÷ 0020 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 0020 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0A03 ÷ 000D ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 000D ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0A03 ÷ 000A ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 000A ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0A03 ÷ 0001 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 0001 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0A03 × 034F ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0A03 × 0308 × 034F ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0A03 ÷ 1F1E6 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0A03 ÷ 0600 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 0600 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0A03 × 0A03 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0A03 × 0308 × 0A03 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0A03 ÷ 1100 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 1100 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0A03 ÷ 1160 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 1160 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0A03 ÷ 11A8 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0A03 ÷ AC00 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0A03 × 0308 ÷ AC00 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0A03 ÷ AC01 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0A03 × 0308 ÷ AC01 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0A03 × 0900 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0A03 × 0308 × 0900 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0A03 × 0903 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0A03 × 0308 × 0903 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0A03 ÷ 0904 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 0904 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0A03 ÷ 0D4E ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0A03 ÷ 0915 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 0915 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0A03 ÷ 231A ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 231A ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0A03 × 0300 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0A03 × 0308 × 0300 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0A03 × 093C ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0A03 × 0308 × 093C ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0A03 × 094D ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0A03 × 0308 × 094D ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0A03 × 200D ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0A03 × 0308 × 200D ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0A03 ÷ 0378 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0A03 × 0308 ÷ 0378 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 1100 ÷ 0020 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 1100 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 1100 ÷ 000D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
@@ -308,8 +420,8 @@
 ÷ 1100 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 1100 ÷ 0600 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 1100 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1100 × 0903 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1100 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1100 × 0A03 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1100 × 0308 × 0A03 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 1100 × 1100 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 1100 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 1100 × 1160 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -320,10 +432,24 @@
 ÷ 1100 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 1100 × AC01 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 1100 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 1100 × 0900 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1100 × 0308 × 0900 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1100 × 0903 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1100 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1100 ÷ 0904 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 1100 × 0308 ÷ 0904 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 1100 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1100 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1100 ÷ 0915 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 1100 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 1100 ÷ 231A ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 1100 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 1100 × 0300 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 1100 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 1100 × 093C ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 1100 × 0308 × 093C ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 1100 × 094D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 1100 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 1100 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 1100 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 1100 ÷ 0378 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -342,8 +468,8 @@
 ÷ 1160 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 1160 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 1160 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1160 × 0903 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1160 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1160 × 0A03 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1160 × 0308 × 0A03 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 1160 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 1160 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 1160 × 1160 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [7.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -354,10 +480,24 @@
 ÷ 1160 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 1160 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 1160 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 1160 × 0900 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1160 × 0308 × 0900 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1160 × 0903 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1160 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1160 ÷ 0904 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 1160 × 0308 ÷ 0904 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 1160 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1160 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 1160 ÷ 0915 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 1160 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 1160 ÷ 231A ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 1160 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 1160 × 0300 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 1160 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 1160 × 093C ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 1160 × 0308 × 093C ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 1160 × 094D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 1160 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 1160 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 1160 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 1160 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -376,8 +516,8 @@
 ÷ 11A8 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 11A8 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 11A8 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 11A8 × 0903 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 11A8 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 11A8 × 0A03 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 11A8 × 0308 × 0A03 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 11A8 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 11A8 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 11A8 ÷ 1160 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -388,10 +528,24 @@
 ÷ 11A8 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 11A8 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 11A8 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 11A8 × 0900 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 11A8 × 0308 × 0900 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 11A8 × 0903 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 11A8 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 11A8 ÷ 0904 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 0904 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 11A8 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 11A8 ÷ 0915 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 11A8 ÷ 231A ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 11A8 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 11A8 × 0300 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 11A8 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 11A8 × 093C ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 11A8 × 0308 × 093C ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 11A8 × 094D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 11A8 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 11A8 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 11A8 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 11A8 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -410,8 +564,8 @@
 ÷ AC00 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ AC00 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ AC00 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ AC00 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ AC00 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ AC00 × 0A03 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ AC00 × 0308 × 0A03 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ AC00 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ AC00 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ AC00 × 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -422,10 +576,24 @@
 ÷ AC00 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ AC00 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ AC00 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ AC00 × 0900 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ AC00 × 0308 × 0900 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ AC00 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ AC00 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ AC00 ÷ 0904 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ AC00 × 0308 ÷ 0904 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ AC00 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ AC00 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ AC00 ÷ 0915 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ AC00 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ AC00 ÷ 231A ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ AC00 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ AC00 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ AC00 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ AC00 × 093C ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ AC00 × 0308 × 093C ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ AC00 × 094D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ AC00 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ AC00 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ AC00 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ AC00 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -444,8 +612,8 @@
 ÷ AC01 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ AC01 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ AC01 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ AC01 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ AC01 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ AC01 × 0A03 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ AC01 × 0308 × 0A03 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ AC01 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ AC01 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ AC01 ÷ 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -456,14 +624,268 @@
 ÷ AC01 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ AC01 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ AC01 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ AC01 × 0900 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ AC01 × 0308 × 0900 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ AC01 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ AC01 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ AC01 ÷ 0904 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ AC01 × 0308 ÷ 0904 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ AC01 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ AC01 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ AC01 ÷ 0915 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ AC01 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ AC01 ÷ 231A ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ AC01 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ AC01 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ AC01 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ AC01 × 093C ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ AC01 × 0308 × 093C ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ AC01 × 094D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ AC01 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ AC01 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ AC01 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ AC01 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ AC01 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0900 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0900 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0900 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0900 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0900 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0900 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0900 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0900 × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0900 × 034F ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0900 × 0308 × 034F ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0900 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0900 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0900 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0900 × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0900 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0900 × 0308 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0900 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0900 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0900 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0900 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0900 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0900 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0900 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0900 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0900 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0900 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0900 × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0900 × 0308 × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0900 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0900 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0900 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0900 × 0308 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0900 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0900 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0900 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0900 × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0900 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0900 × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0900 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0900 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0900 × 093C ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0900 × 0308 × 093C ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0900 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0900 × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0900 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0900 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0900 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0900 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0903 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0903 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0903 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0903 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0903 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0903 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0903 × 034F ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0903 × 0308 × 034F ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0903 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0903 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0903 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0903 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0903 × 0308 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0903 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0903 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0903 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0903 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0903 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0903 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0903 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0903 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0903 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0903 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0903 × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0903 × 0308 × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0903 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0903 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0903 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0903 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0903 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0903 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0903 × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0903 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0903 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0903 × 093C ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0903 × 0308 × 093C ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0903 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0903 × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0903 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0903 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0903 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0904 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0904 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0904 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0904 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0904 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0904 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0904 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0904 × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0904 × 034F ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0904 × 0308 × 034F ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0904 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0904 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0904 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0904 × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0904 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0904 × 0308 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0904 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0904 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0904 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0904 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0904 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0904 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0904 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0904 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0904 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0904 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0904 × 0900 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0904 × 0308 × 0900 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0904 × 0903 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0904 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0904 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0904 × 0308 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0904 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0904 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0904 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0904 × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0904 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0904 × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0904 × 0300 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0904 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0904 × 093C ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0904 × 0308 × 093C ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0904 × 094D ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0904 × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0904 × 200D ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0904 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0904 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0904 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0D4E × 0020 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] SPACE (Other) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 0020 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0D4E ÷ 000D ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 000D ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0D4E ÷ 000A ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 000A ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0D4E ÷ 0001 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 0001 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0D4E × 034F ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0D4E × 0308 × 034F ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0D4E × 1F1E6 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0D4E × 0600 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 0600 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0D4E × 0A03 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0D4E × 0308 × 0A03 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0D4E × 1100 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 1100 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0D4E × 1160 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 1160 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0D4E × 11A8 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 11A8 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0D4E × AC00 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0D4E × 0308 ÷ AC00 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0D4E × AC01 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0D4E × 0308 ÷ AC01 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0D4E × 0900 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0D4E × 0308 × 0900 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0D4E × 0903 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0D4E × 0308 × 0903 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0D4E × 0904 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 0904 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0D4E × 0D4E ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 0D4E ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0D4E × 0915 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 0915 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0D4E × 231A ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] WATCH (ExtPict) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 231A ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0D4E × 0300 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0D4E × 0308 × 0300 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0D4E × 093C ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0D4E × 0308 × 093C ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0D4E × 094D ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0D4E × 0308 × 094D ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0D4E × 200D ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0D4E × 0308 × 200D ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0D4E × 0378 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] <reserved-0378> (Other) ÷ [0.3]
+÷ 0D4E × 0308 ÷ 0378 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0915 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0915 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0915 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0915 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0915 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0915 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0915 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0915 × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0915 × 034F ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0915 × 0308 × 034F ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0915 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0915 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0915 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0915 × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0915 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0915 × 0308 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0915 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0915 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0915 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0915 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0915 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0915 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0915 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0915 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0915 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0915 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0915 × 0900 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0915 × 0308 × 0900 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0915 × 0903 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0915 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0915 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0915 × 0308 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0915 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0915 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0915 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0915 × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0915 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0915 × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0915 × 0300 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0915 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0915 × 093C ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0915 × 0308 × 093C ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0915 × 094D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0915 × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0915 × 200D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0915 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0915 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0915 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 231A ÷ 0020 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 231A × 0308 ÷ 0020 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 231A ÷ 000D ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
@@ -478,8 +900,8 @@
 ÷ 231A × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 231A ÷ 0600 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 231A × 0308 ÷ 0600 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 231A × 0903 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 231A × 0308 × 0903 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 231A × 0A03 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 231A × 0308 × 0A03 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 231A ÷ 1100 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 231A × 0308 ÷ 1100 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 231A ÷ 1160 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -490,10 +912,24 @@
 ÷ 231A × 0308 ÷ AC00 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 231A ÷ AC01 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 231A × 0308 ÷ AC01 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 231A × 0900 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 231A × 0308 × 0900 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 231A × 0903 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 231A × 0308 × 0903 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 231A ÷ 0904 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 231A × 0308 ÷ 0904 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 231A ÷ 0D4E ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 231A × 0308 ÷ 0D4E ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 231A ÷ 0915 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 231A × 0308 ÷ 0915 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 231A ÷ 231A ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 231A × 0308 ÷ 231A ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 231A × 0300 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 231A × 0308 × 0300 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 231A × 093C ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 231A × 0308 × 093C ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 231A × 094D ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 231A × 0308 × 094D ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 231A × 200D ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 231A × 0308 × 200D ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 231A ÷ 0378 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -512,8 +948,8 @@
 ÷ 0300 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 0300 ÷ 0600 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 0300 × 0308 ÷ 0600 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0300 × 0903 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0300 × 0308 × 0903 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0300 × 0A03 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0300 × 0308 × 0A03 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 0300 ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0300 × 0308 ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0300 ÷ 1160 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -524,14 +960,124 @@
 ÷ 0300 × 0308 ÷ AC00 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 0300 ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 0300 × 0308 ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0300 × 0900 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0300 × 0308 × 0900 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0300 × 0903 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0300 × 0308 × 0903 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0300 ÷ 0904 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0300 × 0308 ÷ 0904 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0300 ÷ 0D4E ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0300 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0300 ÷ 0915 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0300 × 0308 ÷ 0915 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 0300 ÷ 231A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 0300 × 0308 ÷ 231A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 0300 × 0300 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 0300 × 0308 × 0300 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0300 × 093C ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0300 × 0308 × 093C ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0300 × 094D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0300 × 0308 × 094D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 0300 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0300 × 0308 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0300 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 0300 × 0308 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 093C ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 093C × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 093C ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 093C × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 093C ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 093C × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 093C ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 093C × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 093C × 034F ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 093C × 0308 × 034F ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 093C ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 093C × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 093C ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 093C × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 093C × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 093C × 0308 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 093C ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 093C × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 093C ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 093C × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 093C ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 093C × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 093C ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 093C × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 093C ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 093C × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 093C × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 093C × 0308 × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 093C × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 093C × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 093C ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 093C × 0308 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 093C ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 093C × 0308 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 093C ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 093C × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 093C ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 093C × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 093C × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 093C × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 093C × 093C ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 093C × 0308 × 093C ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 093C × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 093C × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 093C × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 093C × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 093C ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 093C × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 094D ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 094D × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 094D ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 094D × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 094D ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 094D × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 094D ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 094D × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 094D × 034F ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 094D × 0308 × 034F ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 094D ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 094D × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 094D ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 094D × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 094D × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 094D × 0308 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 094D ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 094D × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 094D ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 094D × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 094D ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 094D × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 094D ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 094D × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 094D ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 094D × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 094D × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 094D × 0308 × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 094D × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 094D × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 094D ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 094D × 0308 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 094D ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 094D × 0308 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 094D ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 094D × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 094D ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 094D × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 094D × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 094D × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 094D × 093C ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 094D × 0308 × 093C ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 094D × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 094D × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 094D × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 094D × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 094D ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 094D × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 200D ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 200D × 0308 ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 200D ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
@@ -546,8 +1092,8 @@
 ÷ 200D × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 200D ÷ 0600 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 200D × 0308 ÷ 0600 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 200D × 0903 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 200D × 0308 × 0903 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 200D × 0A03 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 200D × 0308 × 0A03 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 200D ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 200D × 0308 ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 200D ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -558,10 +1104,24 @@
 ÷ 200D × 0308 ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 200D ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 200D × 0308 ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 200D × 0900 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 200D × 0308 × 0900 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 200D × 0903 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 200D × 0308 × 0903 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 200D ÷ 0904 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 200D × 0308 ÷ 0904 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 200D ÷ 0D4E ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 200D × 0308 ÷ 0D4E ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 200D ÷ 0915 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 200D × 0308 ÷ 0915 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 200D ÷ 231A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 200D × 0308 ÷ 231A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 200D × 0300 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 200D × 0308 × 0300 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 200D × 093C ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 200D × 0308 × 093C ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 200D × 094D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 200D × 0308 × 094D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 200D × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 200D × 0308 × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 200D ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -580,8 +1140,8 @@
 ÷ 0378 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 0378 ÷ 0600 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 0378 × 0308 ÷ 0600 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0378 × 0903 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0378 × 0308 × 0903 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0378 × 0A03 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0378 × 0308 × 0A03 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 0378 ÷ 1100 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0378 × 0308 ÷ 1100 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0378 ÷ 1160 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
@@ -592,10 +1152,24 @@
 ÷ 0378 × 0308 ÷ AC00 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 0378 ÷ AC01 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
 ÷ 0378 × 0308 ÷ AC01 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0378 × 0900 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0378 × 0308 × 0900 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0378 × 0903 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0378 × 0308 × 0903 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0378 ÷ 0904 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0378 × 0308 ÷ 0904 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
+÷ 0378 ÷ 0D4E ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0378 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
+÷ 0378 ÷ 0915 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0378 × 0308 ÷ 0915 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 ÷ 0378 ÷ 231A ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 0378 × 0308 ÷ 231A ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
 ÷ 0378 × 0300 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
 ÷ 0378 × 0308 × 0300 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0378 × 093C ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0378 × 0308 × 093C ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
+÷ 0378 × 094D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
+÷ 0378 × 0308 × 094D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
 ÷ 0378 × 200D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0378 × 0308 × 200D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0378 ÷ 0378 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -614,7 +1188,7 @@
 ÷ 0061 ÷ 1F1E6 × 1F1E7 ÷ 1F1E8 × 1F1E9 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER D (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
 ÷ 0061 × 200D ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0061 × 0308 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 0061 × 0903 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
+÷ 0061 × 0903 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
 ÷ 0061 ÷ 0600 × 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) × [9.2] LATIN SMALL LETTER B (Other) ÷ [0.3]
 ÷ 1F476 × 1F3FF ÷ 1F476 ÷	#  ÷ [0.2] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ÷ [999.0] BABY (ExtPict) ÷ [0.3]
 ÷ 0061 × 1F3FF ÷ 1F476 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ÷ [999.0] BABY (ExtPict) ÷ [0.3]
@@ -624,7 +1198,18 @@
 ÷ 0061 × 200D ÷ 1F6D1 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3]
 ÷ 2701 × 200D × 2701 ÷	#  ÷ [0.2] UPPER BLADE SCISSORS (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [11.0] UPPER BLADE SCISSORS (Other) ÷ [0.3]
 ÷ 0061 × 200D ÷ 2701 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] UPPER BLADE SCISSORS (Other) ÷ [0.3]
+÷ 0915 ÷ 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0915 × 094D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0915 × 094D × 094D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0915 × 094D × 200D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0915 × 093C × 200D × 094D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0915 × 093C × 094D × 200D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0915 × 094D × 0924 × 094D × 092F ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.3] DEVANAGARI LETTER YA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0915 × 094D ÷ 0061 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] LATIN SMALL LETTER A (Other) ÷ [0.3]
+÷ 0061 × 094D ÷ 0924 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 003F × 094D ÷ 0924 ÷	#  ÷ [0.2] QUESTION MARK (Other) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 0915 × 094D × 094D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
 #
-# Lines: 602
+# Lines: 1187
 #
 # EOF
diff --git a/src/java.base/share/data/unicodedata/emoji/emoji-data.txt b/src/java.base/share/data/unicodedata/emoji/emoji-data.txt
index bfe4004898c..b7083f84a29 100644
--- a/src/java.base/share/data/unicodedata/emoji/emoji-data.txt
+++ b/src/java.base/share/data/unicodedata/emoji/emoji-data.txt
@@ -1,11 +1,11 @@
 # emoji-data.txt
-# Date: 2022-08-02, 00:26:10 GMT
-# Copyright (c) 2022 Unicode, Inc.
+# Date: 2023-02-01, 02:22:54 GMT
+# Copyright (c) 2023 Unicode, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
 # Emoji Data for UTS #51
-# Used with Emoji Version 15.0 and subsequent minor revisions (if any)
+# Used with Emoji Version 15.1 and subsequent minor revisions (if any)
 #
 # For documentation and usage, see https://www.unicode.org/reports/tr51
 #
diff --git a/src/java.base/share/legal/unicode.md b/src/java.base/share/legal/unicode.md
index ced947a914e..a128f8a7b0e 100644
--- a/src/java.base/share/legal/unicode.md
+++ b/src/java.base/share/legal/unicode.md
@@ -1,103 +1,104 @@
-## The Unicode Standard, Unicode Character Database, Version 15.0.0
+## The Unicode Standard, Unicode Character Database, Version 15.1.0
 
 ### Unicode Character Database
 ```
 
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
-See Terms of Use for definitions of Unicode Inc.'s
-Data Files and Software.
-
-NOTICE TO USER: Carefully read the following legal agreement.
-BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
-DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
-YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
-TERMS AND CONDITIONS OF THIS AGREEMENT.
-IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
-THE DATA FILES OR SOFTWARE.
+UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2022 Unicode, Inc. All rights reserved.
-Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Unicode data files and any associated documentation
-(the "Data Files") or Unicode software and any associated documentation
-(the "Software") to deal in the Data Files or Software
-without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that either
-(a) this copyright and permission notice appear with all copies
-of the Data Files or Software, or
-(b) this copyright and permission notice appear in associated
-Documentation.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in these Data Files or Software without prior
-written authorization of the copyright holder.
-
-=== http://www.unicode.org/copyright.html content ===
-Unicode (R) Copyright and Terms of Use
+Copyright © 1991-2023 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
+
+
+------------------
+
+Unicode® Copyright and Terms of Use
 For the general privacy policy governing access to this site, see the  Unicode Privacy Policy.
 
-Unicode Copyright
-Copyright (C) 1991-2022 Unicode, Inc. All rights reserved.
-Definitions
-Unicode Data Files ("DATA FILES") include all data files under the directories:
-https://www.unicode.org/Public/
-https://www.unicode.org/reports/
-https://www.unicode.org/ivd/data/
-
-Unicode Data Files do not include PDF online code charts under the directory:
-https://www.unicode.org/Public/
-
-Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard
-or any source code or compiled code under the directories:
-https://www.unicode.org/Public/PROGRAMS/
-https://www.unicode.org/Public/cldr/
-http://site.icu-project.org/download/
-Terms of Use
-Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein.
-Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein.
-Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License.
-Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page.
-The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart.
-All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use.
-No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site.
-Modification is not permitted with respect to this document. All copies of this document must be verbatim.
-Restricted Rights Legend
-Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement.
-Warranties and Disclaimers
-This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time.
-If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase.
-EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
-Waiver of Damages
-In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives.
-Trademarks & Logos
-The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names.
-The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc.
-All third party trademarks referenced herein are the property of their respective owners.
-Miscellaneous
-Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum.
-Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.’s prior written consent.
-Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode’s net income.
-Severability.  If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect.
-Entire Agreement. This Agreement constitutes the entire agreement between the parties.
-
+    A. Unicode Copyright
+        Copyright © 1991-2023 Unicode, Inc. All rights reserved.
+
+    B. Definitions
+        Unicode Data Files ("DATA FILES") include all data files under the directories:
+        https://www.unicode.org/Public/
+        https://www.unicode.org/reports/
+        https://www.unicode.org/ivd/data/
+
+        Unicode Data Files do not include PDF online code charts under the directory:
+        https://www.unicode.org/Public/
+
+        Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard
+        or any source code or compiled code under the directories:
+        https://www.unicode.org/Public/PROGRAMS/
+        https://www.unicode.org/Public/cldr/
+        http://site.icu-project.org/download/
+
+    C. Terms of Use
+        1. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein.
+        2. Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein.
+        3. Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License.
+        4. Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page.
+        5. The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart.
+        6. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use.
+        7. No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site.
+        8. Modification is not permitted with respect to this document. All copies of this document must be verbatim.
+
+    D. Restricted Rights Legend
+        1. Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement.
+
+    E. Warranties and Disclaimers
+        1. This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time.
+        2. If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase.
+        3. EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
+
+    F. Waiver of Damages
+        1. In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives.
+
+    G. Trademarks & Logos
+        1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. "The Unicode Consortium" and "Unicode, Inc." are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.'s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names.
+        2. The Unicode Consortium Name and Trademark Usage Policy ("Trademark Policy") are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc.
+        All third party trademarks referenced herein are the property of their respective owners.
+
+    H. Miscellaneous
+        1. Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum.
+        2. Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.'s prior written consent.
+        3. Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode's net income.
+        4. Severability.  If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect.
+        5. Entire Agreement. This Agreement constitutes the entire agreement between the parties.
 
 ```
 
diff --git a/test/jdk/java/lang/Character/CharPropTest.java b/test/jdk/java/lang/Character/CharPropTest.java
index dbc97617d27..6764517e980 100644
--- a/test/jdk/java/lang/Character/CharPropTest.java
+++ b/test/jdk/java/lang/Character/CharPropTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8202771 8221431 8229831
+ * @bug 8202771 8221431 8229831 8296246
  * @summary Check j.l.Character.isDigit/isLetter/isLetterOrDigit/isSpaceChar
  * /isWhitespace/isTitleCase/isISOControl/isIdentifierIgnorable
  * /isJavaIdentifierStart/isJavaIdentifierPart/isUnicodeIdentifierStart
@@ -292,7 +292,11 @@ private static boolean isOtherIDContinue(int codePoint) {
         return codePoint == 0x00B7 ||
                codePoint == 0x0387 ||
               (codePoint >= 0x1369 && codePoint <= 0x1371) ||
-               codePoint == 0x19DA;
+               codePoint == 0x19DA ||
+               codePoint == 0x200C ||
+               codePoint == 0x200D ||
+               codePoint == 0x30FB ||
+               codePoint == 0xFF65;
     }
 
     private static void printDiff(int codePoint, String method, boolean actual, boolean expected) {

From 54028e779bb076a5ab1c03baa8ab89587252af4a Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Wed, 20 Sep 2023 18:13:45 +0000
Subject: [PATCH 107/112] 8316562:
 serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java times out after
 JDK-8314829

Reviewed-by: dholmes, kevinw, dcubed
---
 .../sa/jmap-hprof/JMapHProfLargeHeapTest.java | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java b/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
index 2ecb1d9bf41..ef31f325481 100644
--- a/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
@@ -25,11 +25,11 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.io.InputStreamReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.nio.CharBuffer;
 import java.util.Arrays;
-import java.util.Scanner;
 
 import jdk.test.lib.Asserts;
 import jdk.test.lib.JDKToolLauncher;
@@ -82,15 +82,22 @@ private static void testHProfFileFormat(String vmArgs, long heapSize,
         procBuilder.redirectError(ProcessBuilder.Redirect.INHERIT);
         Process largeHeapProc = procBuilder.start();
 
-        try (Scanner largeHeapScanner = new Scanner(
-                largeHeapProc.getInputStream());) {
+        try (BufferedReader r = new BufferedReader(
+                new InputStreamReader(largeHeapProc.getInputStream()))) {
             String pidstring = null;
-            if (!largeHeapScanner.hasNext()) {
-                throw new RuntimeException ("Test failed: could not open largeHeapScanner.");
+            while ((pidstring = r.readLine()) != null) {
+                // The output might contain different VM output, skip it while searching PID line.
+                if (pidstring.matches("PID\\[[0-9].*\\]")) {
+                    System.out.println("Found: " + pidstring);
+                    break;
+                } else {
+                    System.out.println("Ignoring: " + pidstring);
+                }
             }
-            while ((pidstring = largeHeapScanner.findInLine("PID\\[[0-9].*\\]")) == null) {
-                Thread.sleep(500);
+            if (pidstring == null) {
+                throw new RuntimeException("Not able to find string matching PID.");
             }
+
             int pid = Integer.parseInt(pidstring.substring(4,
                     pidstring.length() - 1));
             System.out.println("Extracted pid: " + pid);

From 3301fb1e8ad11d7de01a052e0a2d6178a7579ba6 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Wed, 20 Sep 2023 19:09:02 +0000
Subject: [PATCH 108/112] 8315869: UseHeavyMonitors not used

Reviewed-by: dcubed, alanb
---
 src/hotspot/share/runtime/arguments.cpp                  | 9 ---------
 src/hotspot/share/runtime/globals.hpp                    | 6 +-----
 .../jdk/java/lang/Thread/virtual/CarrierThreadWaits.java | 2 +-
 .../java/util/concurrent/ConcurrentHashMap/MapLoops.java | 2 +-
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 1112f4497c2..2d52fa29a0f 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -1911,15 +1911,6 @@ bool Arguments::check_vm_args_consistency() {
   }
 #endif
 
-  if (UseHeavyMonitors) {
-    if (FLAG_IS_CMDLINE(LockingMode) && LockingMode != LM_MONITOR) {
-      jio_fprintf(defaultStream::error_stream(),
-                  "Conflicting -XX:+UseHeavyMonitors and -XX:LockingMode=%d flags\n", LockingMode);
-      return false;
-    }
-    FLAG_SET_CMDLINE(LockingMode, LM_MONITOR);
-  }
-
 #if !defined(X86) && !defined(AARCH64) && !defined(PPC64) && !defined(RISCV64) && !defined(S390)
   if (LockingMode == LM_MONITOR) {
     jio_fprintf(defaultStream::error_stream(),
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index e7aef6841cd..6b96e109d11 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1059,13 +1059,9 @@ const int ObjectAlignmentInBytes = 8;
   product(bool, ErrorFileToStdout, false,                                   \
           "If true, error data is printed to stdout instead of a file")     \
                                                                             \
-  develop(bool, UseHeavyMonitors, false,                                    \
-          "(Deprecated) Use heavyweight instead of lightweight Java "       \
-          "monitors")                                                       \
-                                                                            \
   develop(bool, VerifyHeavyMonitors, false,                                 \
           "Checks that no stack locking happens when using "                \
-          "+UseHeavyMonitors")                                              \
+          "-XX:LockingMode=0 (LM_MONITOR)")                                 \
                                                                             \
   product(bool, PrintStringTableStatistics, false,                          \
           "print statistics about the StringTable and SymbolTable")         \
diff --git a/test/jdk/java/lang/Thread/virtual/CarrierThreadWaits.java b/test/jdk/java/lang/Thread/virtual/CarrierThreadWaits.java
index 371ecd92dd6..a94a5de3ce0 100644
--- a/test/jdk/java/lang/Thread/virtual/CarrierThreadWaits.java
+++ b/test/jdk/java/lang/Thread/virtual/CarrierThreadWaits.java
@@ -34,7 +34,7 @@
  * @test
  * @requires vm.continuations & vm.debug
  * @modules java.base/java.lang:+open
- * @run junit/othervm -XX:+UseHeavyMonitors CarrierThreadWaits
+ * @run junit/othervm -XX:LockingMode=0 CarrierThreadWaits
  */
 
 import java.lang.management.LockInfo;
diff --git a/test/jdk/java/util/concurrent/ConcurrentHashMap/MapLoops.java b/test/jdk/java/util/concurrent/ConcurrentHashMap/MapLoops.java
index eacfaeb0785..b8e9a1736c4 100644
--- a/test/jdk/java/util/concurrent/ConcurrentHashMap/MapLoops.java
+++ b/test/jdk/java/util/concurrent/ConcurrentHashMap/MapLoops.java
@@ -51,7 +51,7 @@
  * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch == "ppc64" | os.arch == "ppc64le" | os.arch == "riscv64" | os.arch == "s390x"
  * @requires vm.debug
  * @library /test/lib
- * @run main/othervm/timeout=1600 -XX:+UseHeavyMonitors -XX:+VerifyHeavyMonitors MapLoops
+ * @run main/othervm/timeout=1600 -XX:LockingMode=0 -XX:+VerifyHeavyMonitors MapLoops
  */
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;

From 3461c7b16549b2aa456fffad9d6abe7e1bfc7260 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 20 Sep 2023 20:36:16 +0000
Subject: [PATCH 109/112] 8316532: Native library copying in
 BuildMicrobenchmark.gmk cause dups on macOS

Reviewed-by: ihse, redestad
---
 make/test/BuildMicrobenchmark.gmk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk
index 0369b4e0bb3..d1013a89233 100644
--- a/make/test/BuildMicrobenchmark.gmk
+++ b/make/test/BuildMicrobenchmark.gmk
@@ -156,10 +156,10 @@ $(eval $(call SetupTestFilesCompilation, BUILD_MICROBENCHMARK_LIBRARIES, \
 
 # Setup copy of native dependencies to image output dir
 $(eval $(call SetupCopyFiles, COPY_MICROBENCHMARK_NATIVE, \
-    SRC := $(MICROBENCHMARK_NATIVE_OUTPUT), \
+    SRC := $(MICROBENCHMARK_NATIVE_OUTPUT)/lib, \
     DEST := $(MICROBENCHMARK_IMAGE_DIR)/native, \
-    FILES := $(BUILD_MICROBENCHMARK_LIBRARIES), \
-    FLATTEN := true, \
+    FILES := $(filter $(MICROBENCHMARK_NATIVE_OUTPUT)/lib/%, \
+        $(BUILD_MICROBENCHMARK_LIBRARIES)), \
 ))
 
 all: $(MICROBENCHMARK_JAR) $(BUILD_MICROBENCHMARK_LIBRARIES) $(COPY_MICROBENCHMARK_NATIVE)

From 5cacf212f066f5694d01f0891adfbe8b38660175 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Wed, 20 Sep 2023 20:42:31 +0000
Subject: [PATCH 110/112] 8316156: ByteArrayInputStream.transferTo causes
 MaxDirectMemorySize overflow

Reviewed-by: alanb
---
 .../classes/java/io/ByteArrayInputStream.java | 13 +++-
 .../ChunkedTransferTo.java                    | 72 +++++++++++++++++++
 2 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/java/io/ByteArrayInputStream/ChunkedTransferTo.java

diff --git a/src/java.base/share/classes/java/io/ByteArrayInputStream.java b/src/java.base/share/classes/java/io/ByteArrayInputStream.java
index 08a3ec982d1..e3e755361b6 100644
--- a/src/java.base/share/classes/java/io/ByteArrayInputStream.java
+++ b/src/java.base/share/classes/java/io/ByteArrayInputStream.java
@@ -44,6 +44,7 @@
  * @since   1.0
  */
 public class ByteArrayInputStream extends InputStream {
+    private static final int MAX_TRANSFER_SIZE = 128*1024;
 
     /**
      * An array of bytes that was provided
@@ -205,8 +206,16 @@ public int readNBytes(byte[] b, int off, int len) {
     @Override
     public synchronized long transferTo(OutputStream out) throws IOException {
         int len = count - pos;
-        out.write(buf, pos, len);
-        pos = count;
+        if (len > 0) {
+            int nwritten = 0;
+            while (nwritten < len) {
+                int nbyte = Integer.min(len - nwritten, MAX_TRANSFER_SIZE);
+                out.write(buf, pos, nbyte);
+                pos += nbyte;
+                nwritten += nbyte;
+            }
+            assert pos == count;
+        }
         return len;
     }
 
diff --git a/test/jdk/java/io/ByteArrayInputStream/ChunkedTransferTo.java b/test/jdk/java/io/ByteArrayInputStream/ChunkedTransferTo.java
new file mode 100644
index 00000000000..fc334dd7804
--- /dev/null
+++ b/test/jdk/java/io/ByteArrayInputStream/ChunkedTransferTo.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8316156
+ * @summary Ensure ByteArrayInputStream.transferTo does not cause direct memory
+ *          to overflow MaxDirectMemorySize
+ * @run junit/othervm -XX:MaxDirectMemorySize=5M ChunkedTransferTo
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.channels.Channels;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Random;
+
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+import static java.nio.file.StandardOpenOption.*;
+
+import org.junit.jupiter.api.Test;
+
+public class ChunkedTransferTo {
+    // this value must exceed MaxDirectMemorySize
+    private static final int SIZE = 10_000_000;
+
+    @Test
+    public void byteArrayInputStream() throws IOException {
+        byte[] src = new byte[SIZE];
+        Random rnd = new Random(System.nanoTime());
+        rnd.nextBytes(src);
+        try (ByteArrayInputStream bais = new ByteArrayInputStream(src)) {
+            Path target = Files.createTempFile("SNA", "FU");
+            FileChannel fc = FileChannel.open(target, CREATE, WRITE);
+            bais.transferTo(Channels.newOutputStream(fc));
+            byte[] dst = new byte[SIZE + 1];
+            try (FileInputStream fis = new FileInputStream(target.toFile())) {
+                int n = -1;
+                if ((n = fis.read(dst)) != SIZE)
+                    throw new RuntimeException(n + " != " + SIZE);
+            }
+            Files.delete(target);
+            if (!Arrays.equals(src, 0, SIZE, dst, 0, SIZE))
+                throw new RuntimeException("Arrays are not equal");
+        } catch (OutOfMemoryError oome) {
+            throw new RuntimeException(oome);
+        }
+    }
+}

From c04c9ea3615aad875ccb7e103e2d885b34cda7f6 Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Wed, 20 Sep 2023 22:11:27 +0000
Subject: [PATCH 111/112] 8316627: JViewport Test headless failure

Reviewed-by: dcubed, prr
---
 .../jdk/javax/swing/JViewport/bug4546474.java | 43 +++++--------------
 1 file changed, 10 insertions(+), 33 deletions(-)

diff --git a/test/jdk/javax/swing/JViewport/bug4546474.java b/test/jdk/javax/swing/JViewport/bug4546474.java
index 2da74e0945b..95e8fafef09 100644
--- a/test/jdk/javax/swing/JViewport/bug4546474.java
+++ b/test/jdk/javax/swing/JViewport/bug4546474.java
@@ -28,46 +28,23 @@
  * @run main bug4546474
  */
 
-import java.awt.Dimension;
-import java.awt.Robot;
-
 import javax.swing.JPanel;
 import javax.swing.JScrollBar;
 import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
 
 public class bug4546474 {
-    static JScrollPane scrollpane;
-    static JScrollBar sbar;
-    static volatile boolean viewChanged;
+    public static void main(String[] args) {
+        JPanel panel = new JPanel();
+        JScrollPane scrollpane = new JScrollPane(panel,
+                JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+                JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+        JScrollBar sbar = scrollpane.getVerticalScrollBar();
 
-    public static void main(String[] args) throws Exception {
-        SwingUtilities.invokeAndWait(() -> {
-            JPanel panel = new JPanel();
-            panel.setPreferredSize(new Dimension(500, 500));
-            scrollpane = new JScrollPane(panel,
-                    JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
-                    JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-            sbar = scrollpane.getVerticalScrollBar();
-        });
+        scrollpane.setViewportView(null);
 
-        Robot robot = new Robot();
-        robot.delay(500);
-        SwingUtilities.invokeAndWait(() -> {
-            sbar.addAdjustmentListener(e -> viewChanged = true);
-            scrollpane.setViewportView(null);
-        });
-        robot.delay(500);
-        if (!viewChanged) {
-            viewChanged = true;
+        if (sbar.getVisibleAmount() > 0) {
+            throw new RuntimeException("Vertical scrollbar is not " +
+                    "updated when viewport is replaced");
         }
-        robot.delay(500);
-
-        SwingUtilities.invokeAndWait(() -> {
-            if (sbar.getVisibleAmount() > 0) {
-                throw new RuntimeException("Vertical scrollbar is not " +
-                        "updated when viewport is replaced");
-            }
-        });
     }
 }

From 81ab496f370c6524729b657796bd3a5e0f6f7391 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 21 Sep 2023 12:24:51 +0000
Subject: [PATCH 112/112] 8316595: Alpine build fails after JDK-8314021

Reviewed-by: dholmes, yyang
---
 src/hotspot/os/linux/os_linux.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 11869b39854..019046c4f9b 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -4373,7 +4373,7 @@ jlong os::Linux::fast_thread_cpu_time(clockid_t clockid) {
 // the number of bytes written to out_fd is returned if transfer was successful
 // otherwise, returns -1 that implies an error
 jlong os::Linux::sendfile(int out_fd, int in_fd, jlong* offset, jlong count) {
-  return sendfile64(out_fd, in_fd, (off64_t*)offset, (size_t)count);
+  return ::sendfile64(out_fd, in_fd, (off64_t*)offset, (size_t)count);
 }
 
 // Determine if the vmid is the parent pid for a child in a PID namespace.